Update translation files

Updated by Update PO files to match POT (msgmerge) hook in Weblate.
author: TDE Weblate <weblate@mirror.git.trinitydesktop.org> 2018-12-15 19:53:48 +0000
committer: TDE Weblate <weblate@mirror.git.trinitydesktop.org> 2018-12-15 19:53:48 +0000
commit: a918eaefa793d634f54348f710d691e05d892b69 (patch)
tree: 45080f1d56514744384ea99af8cd58613dfe6fca /tde-i18n-pa
parent: fe313f84a17b2e98e4b7e8207c419534a7dca4ac (diff)
download: tde-i18n-a918eaefa793d634f54348f710d691e05d892b69.tar.gz
tde-i18n-a918eaefa793d634f54348f710d691e05d892b69.zip
1 files changed, 2945 insertions, 3278 deletions
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"
author	TDE Weblate <weblate@mirror.git.trinitydesktop.org>	2018-12-15 19:53:48 +0000
committer	TDE Weblate <weblate@mirror.git.trinitydesktop.org>	2018-12-15 19:53:48 +0000
commit	a918eaefa793d634f54348f710d691e05d892b69 (patch)
tree	45080f1d56514744384ea99af8cd58613dfe6fca /tde-i18n-pa
parent	fe313f84a17b2e98e4b7e8207c419534a7dca4ac (diff)
download	tde-i18n-a918eaefa793d634f54348f710d691e05d892b69.tar.gz tde-i18n-a918eaefa793d634f54348f710d691e05d892b69.zip