Update translation files

Updated by Update PO files to match POT (msgmerge) hook in Weblate.

(cherry picked from commit a918eaefa793d634f54348f710d691e05d892b69)

1 files changed, 2992 insertions, 3353 deletions

diff --git a/tde-i18n-th/messages/tdepim/kmail.po b/tde-i18n-th/messages/tdepim/kmail.po
index a062bfc3bba..e914a4a1126 100644
--- a/tde-i18n-th/messages/tdepim/kmail.po
+++ b/tde-i18n-th/messages/tdepim/kmail.po
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: kmail\n"
-"POT-Creation-Date: 2014-11-05 10:17-0600\n"
+"POT-Creation-Date: 2018-12-13 20:33+0100\n"
 "PO-Revision-Date: 2006-10-17 12:43+1000\n"
 "Last-Translator: Sahachart Anukulkitch <[email protected]>\n"
 "Language-Team: Thai <[email protected]>\n"
@@ -17,13 +17,13 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: KBabel 1.11.4\n"
 
-#: _translatorinfo.cpp:1
+#: _translatorinfo:1
 msgid ""
 "_: NAME OF TRANSLATORS\n"
 "Your names"
 msgstr "ถนอมทรัพย์ นพบูรณ์,สหชาติ อนุกูลกิจ"
 
-#: _translatorinfo.cpp:3
+#: _translatorinfo:2
 msgid ""
 "_: EMAIL OF TRANSLATORS\n"
 "Your emails"
@@ -170,6 +170,12 @@ msgstr "ไม่มี (โปรดใช้อย่างระมัดร�
 msgid "Account for semiautomatic resource handling"
 msgstr ""
 
+#: accountdialog.cpp:403 accountdialog.cpp:504 accountdialog.cpp:686
+#: accountdialog.cpp:1022
+#, fuzzy
+msgid "Clear"
+msgstr "ลบอดีต"
+
 #: accountdialog.cpp:405 accountdialog.cpp:509 accountdialog.cpp:691
 #: accountdialog.cpp:1027
 msgid "Delete all allocations for the resource represented by this account."
@@ -245,13 +251,13 @@ msgstr "ล็อกอิน:"
 
 #: accountdialog.cpp:596 accountdialog.cpp:866
 msgid ""
-"Your Internet Service Provider gave you a <em>user name</em> "
-"which is used to authenticate you with their servers. It usually is the first "
-"part of your email address (the part before <em>@</em>)."
+"Your Internet Service Provider gave you a <em>user name</em> which is used "
+"to authenticate you with their servers. It usually is the first part of your "
+"email address (the part before <em>@</em>)."
 msgstr ""
 "ผู้ให้บริการอินเตอร์เน็ตของคุณจะให้ <em>ชื่อผู้ใช้งาน</em> "
-"ที่ใช้ในการตรวจสอบสิทธิ์กับเซิร์ฟเวอร์ของเขา ซึ่งมันมักจะเป็นส่วนแรก "
-"ของที่อยู่จดหมายของคุณ (ส่วนที่อยู่ก่อนเครื่องหมาย <em>@</em> )"
+"ที่ใช้ในการตรวจสอบสิทธิ์กับเซิร์ฟเวอร์ของเขา ซึ่งมันมักจะเป็นส่วนแรก ของที่อยู่จดหมายของคุณ "
+"(ส่วนที่อยู่ก่อนเครื่องหมาย <em>@</em> )"
 
 #: accountdialog.cpp:602 accountdialog.cpp:873 kmtransport.cpp:446
 msgid "P&assword:"
@@ -272,12 +278,12 @@ msgstr "เก็บรหัสผ่าน POP ไว้ด้วย"
 #: accountdialog.cpp:628 accountdialog.cpp:962 kmtransport.cpp:459
 msgid ""
 "Check this option to have KMail store the password.\n"
-"If TDEWallet is available the password will be stored there which is considered "
-"safe.\n"
-"However, if TDEWallet is not available, the password will be stored in KMail's "
-"configuration file. The password is stored in an obfuscated format, but should "
-"not be considered secure from decryption efforts if access to the configuration "
-"file is obtained."
+"If TDEWallet is available the password will be stored there which is "
+"considered safe.\n"
+"However, if TDEWallet is not available, the password will be stored in "
+"KMail's configuration file. The password is stored in an obfuscated format, "
+"but should not be considered secure from decryption efforts if access to the "
+"configuration file is obtained."
 msgstr ""
 
 #: accountdialog.cpp:640
@@ -306,8 +312,9 @@ msgstr "กรองจดหมายหากมีขนาดใหญ่เ
 
 #: accountdialog.cpp:726
 msgid ""
-"If you select this option, POP Filters will be used to decide what to do with "
-"messages. You can then select to download, delete or keep them on the server."
+"If you select this option, POP Filters will be used to decide what to do "
+"with messages. You can then select to download, delete or keep them on the "
+"server."
 msgstr ""
 "หากเลือกตัวเลือกนี้ ตัวกรองของ POP จะพิจารณาว่า จะทำอะไรกับจดหมายบ้าง "
 "คุณสามารถเลือกที่จะดาวน์โหลด, ลบหรือเก็บจดหมายไว้ที่เซิร์ฟเวอร์ก็ได้"
@@ -359,13 +366,15 @@ msgstr "ล้างข้อความ"
 
 #: accountdialog.cpp:800 accountdialog.cpp:1114 kmtransport.cpp:516
 msgid ""
-"_: Please translate this authentication method only if you have a good reason\n"
+"_: Please translate this authentication method only if you have a good "
+"reason\n"
 "&LOGIN"
 msgstr "ล็อ&กอิน"
 
 #: accountdialog.cpp:803 accountdialog.cpp:1117 kmtransport.cpp:519
 msgid ""
-"_: Please translate this authentication method only if you have a good reason\n"
+"_: Please translate this authentication method only if you have a good "
+"reason\n"
 "&PLAIN"
 msgstr "ข้อ&ความธรรมดา"
 
@@ -408,9 +417,9 @@ msgstr ""
 #: accountdialog.cpp:902
 msgid ""
 "Here you see the different namespaces that your IMAP server supports.Each "
-"namespace represents a prefix that separates groups of folders.Namespaces allow "
-"KMail for example to display your personal folders and shared folders in one "
-"account."
+"namespace represents a prefix that separates groups of folders.Namespaces "
+"allow KMail for example to display your personal folders and shared folders "
+"in one account."
 msgstr ""
 
 #: accountdialog.cpp:914
@@ -472,9 +481,9 @@ msgstr ""
 
 #: accountdialog.cpp:1001
 msgid ""
-"Activate this to load attachments not automatically when you select the email "
-"but only when you click on the attachment. This way also big emails are shown "
-"instantly."
+"Activate this to load attachments not automatically when you select the "
+"email but only when you click on the attachment. This way also big emails "
+"are shown instantly."
 msgstr ""
 
 #: accountdialog.cpp:1009
@@ -513,7 +522,7 @@ msgstr "<ไม่มี>"
 
 #: accountdialog.cpp:1421 accountdialog.cpp:1428 kmfoldercachedimap.cpp:258
 #: kmfoldercachedimap.cpp:2255 kmfolderimap.cpp:200 kmfolderimap.cpp:901
-#: kmkernel.cpp:1436 subscriptiondialog.cpp:172
+#: kmkernel.cpp:1439 subscriptiondialog.cpp:172
 msgid "inbox"
 msgstr "จดหมายเข้า"
 
@@ -521,28 +530,29 @@ msgstr "จดหมายเข้า"
 msgid ""
 "The server does not seem to support unique message numbers, but this is a "
 "requirement for leaving messages on the server.\n"
-"Since some servers do not correctly announce their capabilities you still have "
-"the possibility to turn leaving fetched messages on the server on."
+"Since some servers do not correctly announce their capabilities you still "
+"have the possibility to turn leaving fetched messages on the server on."
 msgstr ""
 
 #: accountdialog.cpp:1470
 msgid ""
 "The server does not seem to support fetching message headers, but this is a "
 "requirement for filtering messages on the server.\n"
-"Since some servers do not correctly announce their capabilities you still have "
-"the possibility to turn filtering messages on the server on."
+"Since some servers do not correctly announce their capabilities you still "
+"have the possibility to turn filtering messages on the server on."
 msgstr ""
 
 #: accountdialog.cpp:1485
 msgid ""
-"Please note that this feature can cause some POP3 servers that do not support "
-"pipelining to send corrupted mail;\n"
+"Please note that this feature can cause some POP3 servers that do not "
+"support pipelining to send corrupted mail;\n"
 "this is configurable, though, because some servers support pipelining but do "
 "not announce their capabilities. To check whether your POP3 server announces "
 "pipelining support use the \"Check What the Server Supports\" button at the "
 "bottom of the dialog;\n"
-"if your server does not announce it, but you want more speed, then you should "
-"do some testing first by sending yourself a batch of mail and downloading it."
+"if your server does not announce it, but you want more speed, then you "
+"should do some testing first by sending yourself a batch of mail and "
+"downloading it."
 msgstr ""
 
 #: accountdialog.cpp:1538 accountdialog.cpp:1557
@@ -552,23 +562,23 @@ msgstr "โปรดระบุโปรแกรมส่งจดหมาย
 
 #: accountdialog.cpp:1640
 msgid ""
-"The server does not seem to support pipelining; therefore, this option has been "
-"disabled.\n"
-"Since some servers do not correctly announce their capabilities you still have "
-"the possibility to turn pipelining on. But please note that this feature can "
-"cause some POP servers that do not support pipelining to send corrupt messages. "
-"So before using this feature with important mail you should first test it by "
-"sending yourself a larger number of test messages which you all download in one "
-"go from the POP server."
+"The server does not seem to support pipelining; therefore, this option has "
+"been disabled.\n"
+"Since some servers do not correctly announce their capabilities you still "
+"have the possibility to turn pipelining on. But please note that this "
+"feature can cause some POP servers that do not support pipelining to send "
+"corrupt messages. So before using this feature with important mail you "
+"should first test it by sending yourself a larger number of test messages "
+"which you all download in one go from the POP server."
 msgstr ""
 
 #: accountdialog.cpp:1659
 msgid ""
 "The server does not seem to support unique message numbers, but this is a "
-"requirement for leaving messages on the server; therefore, this option has been "
-"disabled.\n"
-"Since some servers do not correctly announce their capabilities you still have "
-"the possibility to turn leaving fetched messages on the server on."
+"requirement for leaving messages on the server; therefore, this option has "
+"been disabled.\n"
+"Since some servers do not correctly announce their capabilities you still "
+"have the possibility to turn leaving fetched messages on the server on."
 msgstr ""
 
 #: accountdialog.cpp:1672
@@ -576,8 +586,8 @@ msgid ""
 "The server does not seem to support fetching message headers, but this is a "
 "requirement for filtering messages on the server; therefore, this option has "
 "been disabled.\n"
-"Since some servers do not correctly announce their capabilities you still have "
-"the possibility to turn filtering messages on the server on."
+"Since some servers do not correctly announce their capabilities you still "
+"have the possibility to turn filtering messages on the server on."
 msgstr ""
 
 #: accountdialog.cpp:1734 vacationdialog.cpp:76 vacationdialog.cpp:165
@@ -657,8 +667,8 @@ msgstr "บัญชีผู้ใช้ IMAP"
 
 #: accountmanager.cpp:343
 msgid ""
-"You need to add an account in the network section of the settings in order to "
-"receive mail."
+"You need to add an account in the network section of the settings in order "
+"to receive mail."
 msgstr ""
 "คุณต้องการเพิ่มบัญชีผู้ใช้ในส่วนของเครือข่าย\n"
 "ของการตั้งค่าลำดับที่จะให้รับจดหมาย"
@@ -699,9 +709,9 @@ msgstr "ยินดีต้อนรับสู่โปรแกรมจั
 
 #: accountwizard.cpp:195
 msgid ""
-"<qt>It seems you have started KMail for the first time. You can use this wizard "
-"to setup your mail accounts. Just enter the connection data that you received "
-"from your email provider into the following pages.</qt>"
+"<qt>It seems you have started KMail for the first time. You can use this "
+"wizard to setup your mail accounts. Just enter the connection data that you "
+"received from your email provider into the following pages.</qt>"
 msgstr ""
 
 #: accountwizard.cpp:200
@@ -764,8 +774,7 @@ msgstr ""
 msgid "Server Information"
 msgstr "ข้อมูลของเซิร์ฟเวอร์"
 
-#. i18n: file customtemplates_base.ui line 302
-#: accountwizard.cpp:329 rc.cpp:221
+#: accountwizard.cpp:329 customtemplates_base.ui:302
 #, fuzzy, no-c-format
 msgid "None"
 msgstr "ไม่มี"
@@ -902,17 +911,16 @@ msgstr ""
 
 #: antispamwizard.cpp:868
 msgid ""
-"<p>Here you can get some assistance in setting up KMail's filter rules to use "
-"some commonly-known anti-virus tools.</p>"
-"<p>The wizard can detect those tools on your computer as well as create filter "
-"rules to classify messages using these tools and to separate messages "
-"containing viruses. The wizard will not take any existing filter rules into "
-"consideration: it will always append the new rules.</p>"
-"<p><b>Warning:</b> As KMail appears to be frozen during the scan of the "
-"messages for viruses, you may encounter problems with the responsiveness of "
-"KMail because anti-virus tool operations are usually time consuming; please "
-"consider deleting the filter rules created by the wizard to get back to the "
-"former behavior."
+"<p>Here you can get some assistance in setting up KMail's filter rules to "
+"use some commonly-known anti-virus tools.</p><p>The wizard can detect those "
+"tools on your computer as well as create filter rules to classify messages "
+"using these tools and to separate messages containing viruses. The wizard "
+"will not take any existing filter rules into consideration: it will always "
+"append the new rules.</p><p><b>Warning:</b> As KMail appears to be frozen "
+"during the scan of the messages for viruses, you may encounter problems with "
+"the responsiveness of KMail because anti-virus tool operations are usually "
+"time consuming; please consider deleting the filter rules created by the "
+"wizard to get back to the former behavior."
 msgstr ""
 
 #: antispamwizard.cpp:919
@@ -947,10 +955,9 @@ msgstr ""
 
 #: antispamwizard.cpp:968
 msgid ""
-"The default folder is the inbox folder, but you may change that in the folder "
-"view below."
-"<p>Not all tools support a classification as unsure. If you haven't selected a "
-"capable tool, you can't select a folder as well."
+"The default folder is the inbox folder, but you may change that in the "
+"folder view below.<p>Not all tools support a classification as unsure. If "
+"you haven't selected a capable tool, you can't select a folder as well."
 msgstr ""
 
 #: antispamwizard.cpp:1068
@@ -961,8 +968,8 @@ msgstr ""
 msgid ""
 "Let the anti-virus tools check your messages. The wizard will create "
 "appropriate filters. The messages are usually marked by the tools so that "
-"following filters can react on this and, for example, move virus messages to a "
-"special folder."
+"following filters can react on this and, for example, move virus messages to "
+"a special folder."
 msgstr ""
 
 #: antispamwizard.cpp:1076
@@ -973,8 +980,8 @@ msgstr "ทิ้งจดหมายทั้งหมดลงถังขย
 #: antispamwizard.cpp:1078
 msgid ""
 "A filter to detect messages classified as virus-infected and to move those "
-"messages into a predefined folder is created. The default folder is the trash "
-"folder, but you may change that in the folder view."
+"messages into a predefined folder is created. The default folder is the "
+"trash folder, but you may change that in the folder view."
 msgstr ""
 
 #: antispamwizard.cpp:1084
@@ -984,8 +991,8 @@ msgstr "ตั้งค่าฉบับที่เลือกเป็นจ
 
 #: antispamwizard.cpp:1087
 msgid ""
-"Mark messages which have been classified as virus-infected as read, as well as "
-"moving them to the selected folder."
+"Mark messages which have been classified as virus-infected as read, as well "
+"as moving them to the selected folder."
 msgstr ""
 
 #: archivefolderdialog.cpp:48
@@ -1179,8 +1186,8 @@ msgstr "มีข้อผิดพลาด ขณะอ่านโฟลเ�
 #: cachedimapjob.cpp:811
 msgid ""
 "Error while trying to subscribe to the renamed folder %1.\n"
-"Renaming itself was successful, but the renamed folder might disappear from the "
-"folder list after the next sync since it is unsubscribed on the server.\n"
+"Renaming itself was successful, but the renamed folder might disappear from "
+"the folder list after the next sync since it is unsubscribed on the server.\n"
 "You can try to manually subscribe to the folder yourself.\n"
 "\n"
 "%2"
@@ -1200,8 +1207,8 @@ msgstr ""
 #: callback.cpp:74
 msgid ""
 "<qt>The identity matching the receiver of this invitation doesn't have an "
-"associated transport configured."
-"<br>Please select the transport which should be used to send your reply.</qt>"
+"associated transport configured.<br>Please select the transport which should "
+"be used to send your reply.</qt>"
 msgstr ""
 
 #: callback.cpp:78
@@ -1231,15 +1238,15 @@ msgstr "ลบ"
 
 #: callback.cpp:216
 msgid ""
-"<qt>None of your identities match the receiver of this message,"
-"<br>please choose which of the following addresses is yours, if any, or select "
-"one of your identities to use in the reply:"
+"<qt>None of your identities match the receiver of this message,<br>please "
+"choose which of the following addresses is yours, if any, or select one of "
+"your identities to use in the reply:"
 msgstr ""
 
 #: callback.cpp:222
 msgid ""
-"<qt>Several of your identities match the receiver of this message,"
-"<br>please choose which of the following addresses is yours:"
+"<qt>Several of your identities match the receiver of this message,<br>please "
+"choose which of the following addresses is yours:"
 msgstr ""
 
 #: callback.cpp:233
@@ -1270,15 +1277,19 @@ msgstr ""
 
 #: configuredialog.cpp:156
 msgid ""
-"<qt>"
-"<p>This setting has been fixed by your administrator.</p>"
-"<p>If you think this is an error, please contact him.</p></qt>"
+"<qt><p>This setting has been fixed by your administrator.</p><p>If you think "
+"this is an error, please contact him.</p></qt>"
 msgstr ""
 
 #: configuredialog.cpp:218
 msgid "&Load Profile..."
 msgstr "โหลดโปรไฟล์..."
 
+#: configuredialog.cpp:219
+#, fuzzy
+msgid "Configure"
+msgstr "ปรับแต่งโปรแกรมจัดการจดหมาย - K..."
+
 #: configuredialog.cpp:308 simplestringlisteditor.cpp:85
 msgid "&Add..."
 msgstr "เพิ่ม..."
@@ -1308,6 +1319,11 @@ msgstr "<qt>คุณต้องการลบรายการแสดง�
 msgid "Remove Identity"
 msgstr "ลบการแสดงตัว"
 
+#: configuredialog.cpp:456 simplestringlisteditor.cpp:96 snippetwidget.cpp:550
+#, fuzzy
+msgid "&Remove"
+msgstr "ลบ"
+
 #: configuredialog.cpp:496 configuredialog.cpp:3227
 msgid "Add..."
 msgstr "เพิ่ม..."
@@ -1316,6 +1332,11 @@ msgstr "เพิ่ม..."
 msgid "Modify..."
 msgstr "แก้ไข..."
 
+#: configuredialog.cpp:500 folderdiaacltab.cpp:636 kmcomposewin.cpp:3218
+#, fuzzy
+msgid "Remove"
+msgstr "ลบ"
+
 #: configuredialog.cpp:502
 msgid "Set as Default"
 msgstr "ตั้งเป็นค่าปริยาย"
@@ -1332,17 +1353,15 @@ msgstr "การส่งจดหมาย"
 msgid "Outgoing accounts (add at least one):"
 msgstr "บัญชีผู้ใช้สำหรับส่งจดหมาย (ต้องมีอย่างน้อยหนึ่งตัว):"
 
-#. i18n: file customtemplates_base.ui line 89
 #: configuredialog.cpp:607 configuredialog.cpp:1080 configuredialog.cpp:3403
-#: distributionlistdialog.cpp:116 favoritefolderview.cpp:389
-#: kmcomposewin.cpp:397 rc.cpp:191 recipientspicker.cpp:389
+#: customtemplates_base.ui:89 distributionlistdialog.cpp:116
+#: favoritefolderview.cpp:389 kmcomposewin.cpp:397 recipientspicker.cpp:389
 #, no-c-format
 msgid "Name"
 msgstr "ชื่อ"
 
-#. i18n: file customtemplates_base.ui line 78
-#: configuredialog.cpp:608 configuredialog.cpp:1081 kmcomposewin.cpp:400
-#: kmfilterdlg.cpp:218 kmmimeparttree.cpp:65 rc.cpp:188
+#: configuredialog.cpp:608 configuredialog.cpp:1081 customtemplates_base.ui:78
+#: kmcomposewin.cpp:400 kmfilterdlg.cpp:218 kmmimeparttree.cpp:65
 #, no-c-format
 msgid "Type"
 msgstr "ประเภท"
@@ -1364,8 +1383,7 @@ msgstr "ตั้งเป็นค่าปริยาย"
 msgid "Common Options"
 msgstr "ตัวเลือกทั่วไป"
 
-#. i18n: file kmail.kcfg line 412
-#: configuredialog.cpp:661 rc.cpp:813
+#: configuredialog.cpp:661 kmail.kcfg:412
 #, no-c-format
 msgid "Confirm &before send"
 msgstr "ถามยืนยันก่อนทำการส่ง"
@@ -1416,17 +1434,15 @@ msgstr "โดเมนปริยาย:"
 
 #: configuredialog.cpp:720
 msgid ""
-"<qt>"
-"<p>The default domain is used to complete email addresses that only consist of "
-"the user's name.</p></qt>"
+"<qt><p>The default domain is used to complete email addresses that only "
+"consist of the user's name.</p></qt>"
 msgstr ""
-"<qt>"
-"<p>โดเมนปริยายจะใช้สำหรับการเติมที่อยู่อีเมลให้สมบูรณ์โดยจะใช้ประกอบกับชื่อผู้ใช"
-"้</p></qt>"
+"<qt><p>โดเมนปริยายจะใช้สำหรับการเติมที่อยู่อีเมลให้สมบูรณ์โดยจะใช้ประกอบกับชื่อผู้ใช้</p></qt>"
 
 #: configuredialog.cpp:744
 msgid ""
-"_: %1: name; %2: number appended to it to make it unique among a list of names\n"
+"_: %1: name; %2: number appended to it to make it unique among a list of "
+"names\n"
 "%1 %2"
 msgstr "%1 %2"
 
@@ -1444,9 +1460,9 @@ msgstr "เพิ่มการรับส่งจดหมาย"
 
 #: configuredialog.cpp:832
 msgid ""
-"_: %1: type of transport. Result used in Configure->Accounts->"
-"Sending listview, \"type\" column, first row, to indicate that this is the "
-"default transport\n"
+"_: %1: type of transport. Result used in Configure->Accounts->Sending "
+"listview, \"type\" column, first row, to indicate that this is the default "
+"transport\n"
 "%1 (Default)"
 msgstr "%1 (ค่าปริยาย)"
 
@@ -1525,6 +1541,10 @@ msgstr "แก้ไขบัญชีผู้ใช้"
 msgid "<qt>Unable to locate account <b>%1</b>.</qt>"
 msgstr "<qt>ไม่สามารถหาตำแหน่งของบัญชีผู้ใช้ <b>%1</b> ได้</qt>"
 
+#: configuredialog.cpp:1491
+msgid "&Fonts"
+msgstr ""
+
 #: configuredialog.cpp:1497
 msgid "Color&s"
 msgstr "สี"
@@ -1633,8 +1653,7 @@ msgstr "ตำแหน่งเชื่อมโยงที่เรียก
 msgid "Misspelled Words"
 msgstr "คำที่สะกดผิด"
 
-#. i18n: file templatesconfiguration_base.ui line 71
-#: configuredialog.cpp:1714 rc.cpp:450
+#: configuredialog.cpp:1714 templatesconfiguration_base.ui:71
 #, no-c-format
 msgid "New Message"
 msgstr "จดหมายใหม่"
@@ -1823,11 +1842,10 @@ msgstr "ให้ปิดการแสดงแบบเธรดเป็น
 
 #: configuredialog.cpp:2045
 msgid ""
-"Open threads that contain ne&w, unread or important messages and open watched "
-"threads."
+"Open threads that contain ne&w, unread or important messages and open "
+"watched threads."
 msgstr ""
-"เปิดเธรดที่มีจดหมายใหม่, จดหมายที่ยังไม่ได้อ่าน หรือจดหมายที่สำคัญมาก "
-"และเปิดเธรดที่ต้องติดตามด้วย"
+"เปิดเธรดที่มีจดหมายใหม่, จดหมายที่ยังไม่ได้อ่าน หรือจดหมายที่สำคัญมาก และเปิดเธรดที่ต้องติดตามด้วย"
 
 #: configuredialog.cpp:2055
 msgid "Date Display"
@@ -1835,40 +1853,33 @@ msgstr "แสดงวันที่"
 
 #: configuredialog.cpp:2072
 msgid ""
-"<qt>"
-"<p><strong>These expressions may be used for the date:</strong></p>"
-"<ul>"
-"<li>d - the day as a number without a leading zero (1-31)</li>"
-"<li>dd - the day as a number with a leading zero (01-31)</li>"
-"<li>ddd - the abbreviated day name (Mon - Sun)</li>"
-"<li>dddd - the long day name (Monday - Sunday)</li>"
-"<li>M - the month as a number without a leading zero (1-12)</li>"
-"<li>MM - the month as a number with a leading zero (01-12)</li>"
-"<li>MMM - the abbreviated month name (Jan - Dec)</li>"
-"<li>MMMM - the long month name (January - December)</li>"
-"<li>yy - the year as a two digit number (00-99)</li>"
-"<li>yyyy - the year as a four digit number (0000-9999)</li></ul>"
-"<p><strong>These expressions may be used for the time:</string></p> "
-"<ul>"
-"<li>h - the hour without a leading zero (0-23 or 1-12 if AM/PM display)</li>"
-"<li>hh - the hour with a leading zero (00-23 or 01-12 if AM/PM display)</li>"
-"<li>m - the minutes without a leading zero (0-59)</li>"
-"<li>mm - the minutes with a leading zero (00-59)</li>"
-"<li>s - the seconds without a leading zero (0-59)</li>"
-"<li>ss - the seconds with a leading zero (00-59)</li>"
-"<li>z - the milliseconds without leading zeroes (0-999)</li>"
-"<li>zzz - the milliseconds with leading zeroes (000-999)</li>"
-"<li>AP - switch to AM/PM display. AP will be replaced by either \"AM\" or "
-"\"PM\".</li>"
-"<li>ap - switch to AM/PM display. ap will be replaced by either \"am\" or "
-"\"pm\".</li>"
-"<li>Z - time zone in numeric form (-0500)</li></ul>"
-"<p><strong>All other input characters will be ignored.</strong></p></qt>"
+"<qt><p><strong>These expressions may be used for the date:</strong></"
+"p><ul><li>d - the day as a number without a leading zero (1-31)</li><li>dd - "
+"the day as a number with a leading zero (01-31)</li><li>ddd - the "
+"abbreviated day name (Mon - Sun)</li><li>dddd - the long day name (Monday - "
+"Sunday)</li><li>M - the month as a number without a leading zero (1-12)</"
+"li><li>MM - the month as a number with a leading zero (01-12)</li><li>MMM - "
+"the abbreviated month name (Jan - Dec)</li><li>MMMM - the long month name "
+"(January - December)</li><li>yy - the year as a two digit number (00-99)</"
+"li><li>yyyy - the year as a four digit number (0000-9999)</li></"
+"ul><p><strong>These expressions may be used for the time:</string></p> "
+"<ul><li>h - the hour without a leading zero (0-23 or 1-12 if AM/PM display)</"
+"li><li>hh - the hour with a leading zero (00-23 or 01-12 if AM/PM display)</"
+"li><li>m - the minutes without a leading zero (0-59)</li><li>mm - the "
+"minutes with a leading zero (00-59)</li><li>s - the seconds without a "
+"leading zero (0-59)</li><li>ss - the seconds with a leading zero (00-59)</"
+"li><li>z - the milliseconds without leading zeroes (0-999)</li><li>zzz - the "
+"milliseconds with leading zeroes (000-999)</li><li>AP - switch to AM/PM "
+"display. AP will be replaced by either \"AM\" or \"PM\".</li><li>ap - switch "
+"to AM/PM display. ap will be replaced by either \"am\" or \"pm\".</li><li>Z "
+"- time zone in numeric form (-0500)</li></ul><p><strong>All other input "
+"characters will be ignored.</strong></p></qt>"
 msgstr ""
 
 #: configuredialog.cpp:2185
 msgid ""
-"Changing the global threading setting will override all folder specific values."
+"Changing the global threading setting will override all folder specific "
+"values."
 msgstr "กำลังเปลี่ยนการตั้งค่าทั่วไปของการทำเธรด ที่จะกำหนดใช้กับทุกโฟลเดอร์"
 
 #: configuredialog.cpp:2221
@@ -1883,8 +1894,7 @@ msgstr "แสดงแถบสถานะ HTML"
 msgid "Show s&pam status in fancy headers"
 msgstr "แสดงสถานะสแปมในส่วนหัวแบบแฟนซี"
 
-#. i18n: file kmail.kcfg line 583
-#: configuredialog.cpp:2233 rc.cpp:890
+#: configuredialog.cpp:2233 kmail.kcfg:583
 #, no-c-format
 msgid "Replace smileys by emoticons"
 msgstr "แทนที่การพิมพ์หน้ายิ้มด้วยไอคอนแสดงอารมณ์"
@@ -1893,8 +1903,7 @@ msgstr "แทนที่การพิมพ์หน้ายิ้มด้
 msgid "Use smaller font for quoted text"
 msgstr "ใช้ตัวอักษรที่เล็กลงสำหรับข้อความที่อ้างถึง"
 
-#. i18n: file kmail.kcfg line 588
-#: configuredialog.cpp:2241 rc.cpp:896
+#: configuredialog.cpp:2241 kmail.kcfg:588
 #, no-c-format
 msgid "Show expand/collapse quote marks"
 msgstr "แสดงเครื่องหมายขยาย/ยุบส่วนที่อ้างถึง"
@@ -1920,8 +1929,7 @@ msgstr "อัตโนมัติ"
 msgid "&Override character encoding:"
 msgstr "ชุดรหัสภาษาที่บังคับให้ใช้:"
 
-#. i18n: file kmail.kcfg line 105
-#: configuredialog.cpp:2486 rc.cpp:649
+#: configuredialog.cpp:2486 kmail.kcfg:105
 #, no-c-format
 msgid "Enable system tray icon"
 msgstr "เปิดใช้การแสดงไอคอนในถาดระบบ"
@@ -1936,8 +1944,7 @@ msgstr "แสดงโปรแกรมจัดการจดหมาย -
 
 #: configuredialog.cpp:2503
 msgid "Only show KMail in system tray if there are unread messages"
-msgstr ""
-"แสดงโปรแกรมจัดการจดหมาย - K ในถาดระบบเฉพาะเมื่อมีจดหมายที่ยังไม่ได้อ่าน"
+msgstr "แสดงโปรแกรมจัดการจดหมาย - K ในถาดระบบเฉพาะเมื่อมีจดหมายที่ยังไม่ได้อ่าน"
 
 #: configuredialog.cpp:2563 identitydialog.cpp:408
 #, fuzzy
@@ -2026,22 +2033,18 @@ msgstr "ตัวแปร <b>%f</b> จะถูกแทนที่ด้ว�
 
 #: configuredialog.cpp:2930
 msgid ""
-"<qt>The following placeholders are supported in the reply phrases:"
-"<br><b>%D</b>: date, <b>%S</b>: subject,"
-"<br><b>%e</b>: sender's address, <b>%F</b>: sender's name, <b>%f</b>"
-": sender's initials,"
-"<br><b>%T</b>: recipient's name, <b>%t</b>: recipient's name and address,"
-"<br><b>%C</b>: carbon copy names, <b>%c</b>: carbon copy names and addresses,"
-"<br><b>%%</b>: percent sign, <b>%_</b>: space, <b>%L</b>: linebreak</qt>"
-msgstr ""
-"<qt>สนับสนุนการใช้ตัวแปรในสำนวน/กลุ่มคำต่อไปนี้:"
-"<br><b>%D</b>: วันที่, <b>%S</b>: เรื่อง,"
-"<br><b>%e</b>: ที่อยู่ผู้ส่ง, <b>%F</b>: ชื่อผู้ส่ง, <b>%f</b>"
-": คำนำหน้าชื่อผู้ส่ง,"
-"<br><b>%T</b>: ชื่อผู้รับ, <b>%t</b>: ชื่อผู้รับและที่อยู่"
-"<br><b>%C</b>: ชื่อผู้รับสำเนา, <b>%c</b>: ชื่อผู้รับสำเนาและที่อยู่,"
-"<br><b>%%</b>: เครื่องหมายเปอร์เซ็น, <b>%_</b>: ช่องว่าง, <b>%L</b>"
-": จบบรรทัด</qt>"
+"<qt>The following placeholders are supported in the reply phrases:<br><b>%D</"
+"b>: date, <b>%S</b>: subject,<br><b>%e</b>: sender's address, <b>%F</b>: "
+"sender's name, <b>%f</b>: sender's initials,<br><b>%T</b>: recipient's name, "
+"<b>%t</b>: recipient's name and address,<br><b>%C</b>: carbon copy names, <b>"
+"%c</b>: carbon copy names and addresses,<br><b>%%</b>: percent sign, <b>%_</"
+"b>: space, <b>%L</b>: linebreak</qt>"
+msgstr ""
+"<qt>สนับสนุนการใช้ตัวแปรในสำนวน/กลุ่มคำต่อไปนี้:<br><b>%D</b>: วันที่, <b>%S</b>: เรื่อง,"
+"<br><b>%e</b>: ที่อยู่ผู้ส่ง, <b>%F</b>: ชื่อผู้ส่ง, <b>%f</b>: คำนำหน้าชื่อผู้ส่ง,<br><b>%T</"
+"b>: ชื่อผู้รับ, <b>%t</b>: ชื่อผู้รับและที่อยู่<br><b>%C</b>: ชื่อผู้รับสำเนา, <b>%c</b>: "
+"ชื่อผู้รับสำเนาและที่อยู่,<br><b>%%</b>: เครื่องหมายเปอร์เซ็น, <b>%_</b>: ช่องว่าง, <b>%L</"
+"b>: จบบรรทัด</qt>"
 
 #: configuredialog.cpp:2943
 msgid "Lang&uage:"
@@ -2064,21 +2067,20 @@ msgstr "ตอบกลับไปยังทั้งหมด:"
 msgid "&Forward:"
 msgstr "ส่งต่อ:"
 
-#. i18n: file templatesconfiguration_base.ui line 285
-#: configuredialog.cpp:2990 rc.cpp:465
+#: configuredialog.cpp:2990 templatesconfiguration_base.ui:285
 #, no-c-format
 msgid "&Quote indicator:"
 msgstr "ตัวแสดงถึงส่วนที่อ้างถึง:"
 
-#: configuredialog.cpp:3035 kmmessage.cpp:4048
+#: configuredialog.cpp:3035 kmmessage.cpp:4051
 msgid "On %D, you wrote:"
 msgstr "เมื่อวันที่ %D คุณได้ส่งข้อความ:"
 
-#: configuredialog.cpp:3036 kmmessage.cpp:4050
+#: configuredialog.cpp:3036 kmmessage.cpp:4053
 msgid "On %D, %F wrote:"
 msgstr "เมื่อ %D, %F ได้ส่งข้อความ:"
 
-#: configuredialog.cpp:3037 kmmessage.cpp:4052
+#: configuredialog.cpp:3037 kmmessage.cpp:4055
 msgid "Forwarded Message"
 msgstr "ส่งต่อข้อความแล้ว"
 
@@ -2116,8 +2118,8 @@ msgstr "เติมคำนำหน้าการส่งต่อใหม
 
 #: configuredialog.cpp:3269
 msgid ""
-"This list is checked for every outgoing message from the top to the bottom for "
-"a charset that contains all required characters."
+"This list is checked for every outgoing message from the top to the bottom "
+"for a charset that contains all required characters."
 msgstr ""
 "รายการนี้จะใช้ตรวจสอบกับจดหมายออกจากบนลงล่างทุกฉบับ "
 "เพื่อหาชุดอักขระที่มีอักขระครบทุกตัวที่จดหมายต้องการ"
@@ -2154,10 +2156,9 @@ msgstr "ค่า"
 msgid "Ne&w"
 msgstr "ใหม่"
 
-#. i18n: file folderpropertiesdialog.ui line 52
-#: configuredialog.cpp:3425 kmfolderdia.cpp:269 kmmsgpartdlg.cpp:110
-#: kmtransport.cpp:329 kmtransport.cpp:383 newfolderdialog.cpp:80 rc.cpp:230
-#: rc.cpp:405
+#: configuredialog.cpp:3425 folderpropertiesdialog.ui:52 kmfolderdia.cpp:269
+#: kmmsgpartdlg.cpp:110 kmtransport.cpp:329 kmtransport.cpp:383
+#: newfolderdialog.cpp:80 snippetdlgbase.ui:100
 #, no-c-format
 msgid "&Name:"
 msgstr "ชื่อ:"
@@ -2166,19 +2167,17 @@ msgstr "ชื่อ:"
 msgid "&Value:"
 msgstr "ค่า:"
 
-#. i18n: file kmail.kcfg line 389
-#: configuredialog.cpp:3581 rc.cpp:807
+#: configuredialog.cpp:3581 kmail.kcfg:389
 #, no-c-format
 msgid "Outlook-compatible attachment naming"
 msgstr "ตั้งชื่อสิ่งที่แนบมาด้วยให้ใช้กันได้กับ Outlook"
 
 #: configuredialog.cpp:3584
 msgid ""
-"Turn this option on to make Outlook(tm) understand attachment names containing "
-"non-English characters"
+"Turn this option on to make Outlook(tm) understand attachment names "
+"containing non-English characters"
 msgstr ""
-"เปิดใช้งานตัวเลือกนี้เพื่อให้โปรแกรม Outlook "
-"สามารถเข้าใจถึงชื่อสิ่งที่แนบมาด้วยที่ไม่ใช่ภาษาอังกฤษ"
+"เปิดใช้งานตัวเลือกนี้เพื่อให้โปรแกรม Outlook สามารถเข้าใจถึงชื่อสิ่งที่แนบมาด้วยที่ไม่ใช่ภาษาอังกฤษ"
 
 #: configuredialog.cpp:3595
 msgid "E&nable detection of missing attachments"
@@ -2204,13 +2203,13 @@ msgstr "แนบ"
 
 #: configuredialog.cpp:3655
 msgid ""
-"You have chosen to encode attachment names containing non-English characters in "
-"a way that is understood by Outlook(tm) and other mail clients that do not "
-"support standard-compliant encoded attachment names.\n"
-"Note that KMail may create non-standard compliant messages, and consequently it "
-"is possible that your messages will not be understood by standard-compliant "
-"mail clients; so, unless you have no other choice, you should not enable this "
-"option."
+"You have chosen to encode attachment names containing non-English characters "
+"in a way that is understood by Outlook(tm) and other mail clients that do "
+"not support standard-compliant encoded attachment names.\n"
+"Note that KMail may create non-standard compliant messages, and consequently "
+"it is possible that your messages will not be understood by standard-"
+"compliant mail clients; so, unless you have no other choice, you should not "
+"enable this option."
 msgstr ""
 
 #: configuredialog.cpp:3682
@@ -2235,89 +2234,74 @@ msgstr "กลไกเข้ารหัส"
 
 #: configuredialog.cpp:3737
 msgid ""
-"<qt>"
-"<p>Messages sometimes come in both formats. This option controls whether you "
-"want the HTML part or the plain text part to be displayed.</p>"
-"<p>Displaying the HTML part makes the message look better, but at the same time "
-"increases the risk of security holes being exploited.</p>"
-"<p>Displaying the plain text part loses much of the message's formatting, but "
-"makes it almost <em>impossible</em> to exploit security holes in the HTML "
-"renderer (Konqueror).</p>"
-"<p>The option below guards against one common misuse of HTML messages, but it "
-"cannot guard against security issues that were not known at the time this "
-"version of KMail was written.</p>"
-"<p>It is therefore advisable to <em>not</em> prefer HTML to plain text.</p>"
-"<p><b>Note:</b> You can set this option on a per-folder basis from the <i>"
-"Folder</i> menu of KMail's main window.</p></qt>"
-msgstr ""
-"<qt>"
-"<p>บางครั้ง อีเมล์ก็มาเป็นรูปแบบทั้งคู่ ตัวเลือกนี้ "
-"จะทำให้คุณสามารถเลือกที่จะแสดง HTML เป็นบางส่วน หรือเป็นข้อความธรรมดาบางส่วน "
-"</p>"
-"<p>การแสดงผลเป็น HTML นั้น จะทำให้อ่านได้ง่ายและดูดีกว่า "
-"แต่บางครั้งก็เพิ่มความเสี่ยงในเรื่องความปลอดภัยของระบบเช่นกัน </p>"
-"<p>ส่วนการแสดงผลเป็นข้อความธรรมดานั้น จะทำให้สูญเสียเนื้อความบางส่วนไป "
-"แต่มันก็<em>ไม่มีปัญหา</em> ในเรื่องความปลอดภัยบนระบบของคุณ เหมือน การแสดงผลแบบ "
-"HTML (คอนเควอร์เรอร์)</p>"
-"<p>ตัวเลือกด้านล่างนี้ จะป้องกันการแสดงผลจดหมายในรูปแบบ HTML "
-"แต่มันไม่ได้ป้องกัน หากมีปัญหาความปลอดภัย ซึ่งไม่สามารถทราบได้ ใน KMail "
-"รุ่นนี้</p>"
-"<p> แต่ถึงอย่างไร ก็ขอแนะนำ ่ให้แสดงเนื้อหา HTML เป็นข้อความธรรมดา</p> "
-"<p><b>ข้อควรจำ:</b> คุณสามารถตั้งค่าตัวเลือกนี้สำหรับแต่ละโฟลเดอร์ ได้จากเมนู "
-"<i>โฟลเดอร์</i> ของหน้าต่างหลักจัดการจดหมาย K</p></qt>"
+"<qt><p>Messages sometimes come in both formats. This option controls whether "
+"you want the HTML part or the plain text part to be displayed.</"
+"p><p>Displaying the HTML part makes the message look better, but at the same "
+"time increases the risk of security holes being exploited.</p><p>Displaying "
+"the plain text part loses much of the message's formatting, but makes it "
+"almost <em>impossible</em> to exploit security holes in the HTML renderer "
+"(Konqueror).</p><p>The option below guards against one common misuse of HTML "
+"messages, but it cannot guard against security issues that were not known at "
+"the time this version of KMail was written.</p><p>It is therefore advisable "
+"to <em>not</em> prefer HTML to plain text.</p><p><b>Note:</b> You can set "
+"this option on a per-folder basis from the <i>Folder</i> menu of KMail's "
+"main window.</p></qt>"
+msgstr ""
+"<qt><p>บางครั้ง อีเมล์ก็มาเป็นรูปแบบทั้งคู่ ตัวเลือกนี้ จะทำให้คุณสามารถเลือกที่จะแสดง HTML "
+"เป็นบางส่วน หรือเป็นข้อความธรรมดาบางส่วน </p><p>การแสดงผลเป็น HTML นั้น "
+"จะทำให้อ่านได้ง่ายและดูดีกว่า แต่บางครั้งก็เพิ่มความเสี่ยงในเรื่องความปลอดภัยของระบบเช่นกัน </"
+"p><p>ส่วนการแสดงผลเป็นข้อความธรรมดานั้น จะทำให้สูญเสียเนื้อความบางส่วนไป "
+"แต่มันก็<em>ไม่มีปัญหา</em> ในเรื่องความปลอดภัยบนระบบของคุณ เหมือน การแสดงผลแบบ HTML "
+"(คอนเควอร์เรอร์)</p><p>ตัวเลือกด้านล่างนี้ จะป้องกันการแสดงผลจดหมายในรูปแบบ HTML "
+"แต่มันไม่ได้ป้องกัน หากมีปัญหาความปลอดภัย ซึ่งไม่สามารถทราบได้ ใน KMail รุ่นนี้</p><p> "
+"แต่ถึงอย่างไร ก็ขอแนะนำ ่ให้แสดงเนื้อหา HTML เป็นข้อความธรรมดา</p> <p><b>ข้อควรจำ:</b> "
+"คุณสามารถตั้งค่าตัวเลือกนี้สำหรับแต่ละโฟลเดอร์ ได้จากเมนู <i>โฟลเดอร์</i> "
+"ของหน้าต่างหลักจัดการจดหมาย K</p></qt>"
 
 #: configuredialog.cpp:3754
 #, fuzzy
 msgid ""
-"<qt>"
-"<p>Some mail advertisements are in HTML and contain references to, for example, "
-"images that the advertisers employ to find out that you have read their message "
-"(&quot;web bugs&quot;).</p>"
-"<p>There is no valid reason to load images off the Internet like this, since "
-"the sender can always attach the required images directly to the message.</p>"
-"<p>To guard from such a misuse of the HTML displaying feature of KMail, this "
-"option is <em>disabled</em> by default.</p>"
-"<p>However, if you wish to, for example, view images in HTML messages that were "
-"not attached to it, you can enable this option, but you should be aware of the "
-"possible problem.</p></qt>"
-msgstr ""
-"<qt>"
-"<p>จดหมายบางฉบับ จะมีโฆษณา ซึ่งมาในรูปแบบ HTML "
-"และจะมีส่วนอ้างอิงไปยังรูปภาพที่ใช้โฆษณา เพื่อให้แน่ใจว่าคุณได้อ่านโฆษณาแล้ว "
-"(\"web bugs\")</p>"
-"<p>มันไม่มีความจำเป็นเลยที่จะต้องเรียกรูปภาพจากเน็ต "
-"ทั้งที่ผู้ส่งสามารถรวมมันเข้าไปในเนื้อหาจดหมายได้โดยตรง</p>"
-"<p> เพื่อป้องกันการแสดงผลส่วน HTML ที่เกี่ยวกับโฆษณาใน kmail ตัวเลือกเหล่านี้ "
-"คือ <em>ปิดการใช้งาน</em>โดยปริยาย</p>"
-"<p>อย่างไรก็ตาม หากคุณต้องการ เช่น แสดงภาพในจดหมายแบบ HTML "
-"ที่ไม่ได้รวมเข้ากับจดหมาย คุณสามารถเลือกตัวเลือกนี้ได้ แต่คุณอาจจะได้รับคำเตือน "
-"เกี่ยวกับปัญหาที่อาจจะเกิดขึ้น</p></qt>"
+"<qt><p>Some mail advertisements are in HTML and contain references to, for "
+"example, images that the advertisers employ to find out that you have read "
+"their message (&quot;web bugs&quot;).</p><p>There is no valid reason to load "
+"images off the Internet like this, since the sender can always attach the "
+"required images directly to the message.</p><p>To guard from such a misuse "
+"of the HTML displaying feature of KMail, this option is <em>disabled</em> by "
+"default.</p><p>However, if you wish to, for example, view images in HTML "
+"messages that were not attached to it, you can enable this option, but you "
+"should be aware of the possible problem.</p></qt>"
+msgstr ""
+"<qt><p>จดหมายบางฉบับ จะมีโฆษณา ซึ่งมาในรูปแบบ HTML "
+"และจะมีส่วนอ้างอิงไปยังรูปภาพที่ใช้โฆษณา เพื่อให้แน่ใจว่าคุณได้อ่านโฆษณาแล้ว (\"web bugs\")</"
+"p><p>มันไม่มีความจำเป็นเลยที่จะต้องเรียกรูปภาพจากเน็ต "
+"ทั้งที่ผู้ส่งสามารถรวมมันเข้าไปในเนื้อหาจดหมายได้โดยตรง</p><p> เพื่อป้องกันการแสดงผลส่วน HTML "
+"ที่เกี่ยวกับโฆษณาใน kmail ตัวเลือกเหล่านี้ คือ <em>ปิดการใช้งาน</em>โดยปริยาย</"
+"p><p>อย่างไรก็ตาม หากคุณต้องการ เช่น แสดงภาพในจดหมายแบบ HTML ที่ไม่ได้รวมเข้ากับจดหมาย "
+"คุณสามารถเลือกตัวเลือกนี้ได้ แต่คุณอาจจะได้รับคำเตือน เกี่ยวกับปัญหาที่อาจจะเกิดขึ้น</p></qt>"
 
 #: configuredialog.cpp:3767
 msgid ""
-"<qt>"
-"<h3>Message Disposition Notification Policy</h3>"
-"<p>MDNs are a generalization of what is commonly called <b>read receipt</b>"
-". The message author requests a disposition notification to be sent and the "
-"receiver's mail program generates a reply from which the author can learn what "
-"happened to his message. Common disposition types include <b>displayed</b> "
-"(i.e. read), <b>deleted</b> and <b>dispatched</b> (e.g. forwarded).</p>"
-"<p>The following options are available to control KMail's sending of MDNs:</p>"
-"<ul>"
-"<li><em>Ignore</em>: Ignores any request for disposition notifications. No MDN "
-"will ever be sent automatically (recommended).</li>"
-"<li><em>Ask</em>: Answers requests only after asking the user for permission. "
-"This way, you can send MDNs for selected messages while denying or ignoring "
-"them for others.</li>"
-"<li><em>Deny</em>: Always sends a <b>denied</b> notification. This is only <em>"
-"slightly</em> better than always sending MDNs. The author will still know that "
-"the messages has been acted upon, he just cannot tell whether it was deleted or "
-"read etc.</li>"
-"<li><em>Always send</em>: Always sends the requested disposition notification. "
-"That means that the author of the message gets to know when the message was "
-"acted upon and, in addition, what happened to it (displayed, deleted, etc.). "
-"This option is strongly discouraged, but since it makes much sense e.g. for "
-"customer relationship management, it has been made available.</li></ul></qt>"
+"<qt><h3>Message Disposition Notification Policy</h3><p>MDNs are a "
+"generalization of what is commonly called <b>read receipt</b>. The message "
+"author requests a disposition notification to be sent and the receiver's "
+"mail program generates a reply from which the author can learn what happened "
+"to his message. Common disposition types include <b>displayed</b> (i.e. "
+"read), <b>deleted</b> and <b>dispatched</b> (e.g. forwarded).</p><p>The "
+"following options are available to control KMail's sending of MDNs:</"
+"p><ul><li><em>Ignore</em>: Ignores any request for disposition "
+"notifications. No MDN will ever be sent automatically (recommended).</"
+"li><li><em>Ask</em>: Answers requests only after asking the user for "
+"permission. This way, you can send MDNs for selected messages while denying "
+"or ignoring them for others.</li><li><em>Deny</em>: Always sends a "
+"<b>denied</b> notification. This is only <em>slightly</em> better than "
+"always sending MDNs. The author will still know that the messages has been "
+"acted upon, he just cannot tell whether it was deleted or read etc.</"
+"li><li><em>Always send</em>: Always sends the requested disposition "
+"notification. That means that the author of the message gets to know when "
+"the message was acted upon and, in addition, what happened to it (displayed, "
+"deleted, etc.). This option is strongly discouraged, but since it makes much "
+"sense e.g. for customer relationship management, it has been made available."
+"</li></ul></qt>"
 msgstr ""
 
 #: configuredialog.cpp:3800
@@ -2334,16 +2318,15 @@ msgstr "อนุญาตให้จดหมาย โหลดส่วน�
 
 #: configuredialog.cpp:3812
 msgid ""
-"<b>WARNING:</b> Allowing HTML in email may increase the risk that your system "
-"will be compromised by present and anticipated security exploits. <a "
-"href=\"whatsthis:%1\">More about HTML mails...</a> <a href=\"whatsthis:%2\">"
-"More about external references...</a>"
+"<b>WARNING:</b> Allowing HTML in email may increase the risk that your "
+"system will be compromised by present and anticipated security exploits. <a "
+"href=\"whatsthis:%1\">More about HTML mails...</a> <a href=\"whatsthis:"
+"%2\">More about external references...</a>"
 msgstr ""
 "<b>คำเตือน:</b> การเปิดใช้ภาษา HTML ในจดหมาย "
-"อาจจะเป็นการเพิ่มความเสี่ยงต่อความปลอดภัยของระบบ หากระบบของคุณมีช่องโหว่ "
-"โปรดดู<a href=\"whatsthis:%1\">เกี่ยวกับจดหมายแบบ HTML</a> "
-"และดู<a href=\"whatsthis:%2\">รายละเอียดเกี่ยวกับการอ้างถึงสิ่งที่อยู่ภายนอก</a>"
-"เพิ่มเติม"
+"อาจจะเป็นการเพิ่มความเสี่ยงต่อความปลอดภัยของระบบ หากระบบของคุณมีช่องโหว่ โปรดดู<a href="
+"\"whatsthis:%1\">เกี่ยวกับจดหมายแบบ HTML</a> และดู<a href=\"whatsthis:"
+"%2\">รายละเอียดเกี่ยวกับการอ้างถึงสิ่งที่อยู่ภายนอก</a>เพิ่มเติม"
 
 #: configuredialog.cpp:3824
 #, fuzzy
@@ -2406,8 +2389,8 @@ msgid ""
 "<b>WARNING:</b> Unconditionally returning confirmations undermines your "
 "privacy. <a href=\"whatsthis:%1\">More...</a>"
 msgstr ""
-"<qt><b>คำเตือน:</b> การยอมรับโดยไม่มีเงื่อนไข อาจส่งผลต่อความปลอดภัย ใช้ "
-"\"นี่คืออะไร\" (หรือกด Shift-F1) เพื่อดูรายละเอียด</qt>"
+"<qt><b>คำเตือน:</b> การยอมรับโดยไม่มีเงื่อนไข อาจส่งผลต่อความปลอดภัย ใช้ \"นี่คืออะไร"
+"\" (หรือกด Shift-F1) เพื่อดูรายละเอียด</qt>"
 
 #: configuredialog.cpp:3899
 msgid "Certificate && Key Bundle Attachments"
@@ -2426,8 +2409,7 @@ msgstr "การเปลี่ยนการตั้งค่า HTML ทั
 msgid "This option requires dirmngr >= 0.9.0"
 msgstr ""
 
-#. i18n: file smimeconfiguration.ui line 216
-#: configuredialog.cpp:4360 rc.cpp:353
+#: configuredialog.cpp:4360 smimeconfiguration.ui:216
 #, no-c-format
 msgid "no proxy"
 msgstr ""
@@ -2456,8 +2438,8 @@ msgstr "ไม่รวมจดหมายที่สำคัญมากไ
 
 #: configuredialog.cpp:4580
 msgid ""
-"_: to be continued with \"do not loop\", \"loop in current folder\", and \"loop "
-"in all folders\".\n"
+"_: to be continued with \"do not loop\", \"loop in current folder\", and "
+"\"loop in all folders\".\n"
 "When trying to find unread messages:"
 msgstr "เมื่อพยายามค้นหาจดหมายที่ยังไม่ได้อ่าน:"
 
@@ -2481,8 +2463,8 @@ msgstr "วนรอบในโฟลเดอร์ทั้งหมด"
 
 #: configuredialog.cpp:4600
 msgid ""
-"_: to be continued with \"jump to first new message\", \"jump to first unread "
-"or new message\",and \"jump to last selected message\".\n"
+"_: to be continued with \"jump to first new message\", \"jump to first "
+"unread or new message\",and \"jump to last selected message\".\n"
 "When entering a folder:"
 msgstr "เมื่อเข้าไปยังโฟลเดอร์:"
 
@@ -2551,16 +2533,14 @@ msgstr "ไดเร็กทอรี (รูปแบบ \"maildir\")"
 #: configuredialog.cpp:4654
 msgid ""
 "_: what's this help\n"
-"<qt>"
-"<p>This selects which mailbox format will be the default for local folders:</p>"
-"<p><b>mbox:</b> KMail's mail folders are represented by a single file each. "
-"Individual messages are separated from each other by a line starting with "
-"\"From \". This saves space on disk, but may be less robust, e.g. when moving "
-"messages between folders.</p>"
-"<p><b>maildir:</b> KMail's mail folders are represented by real folders on "
-"disk. Individual messages are separate files. This may waste a bit of space on "
-"disk, but should be more robust, e.g. when moving messages between folders.</p>"
-"</qt>"
+"<qt><p>This selects which mailbox format will be the default for local "
+"folders:</p><p><b>mbox:</b> KMail's mail folders are represented by a single "
+"file each. Individual messages are separated from each other by a line "
+"starting with \"From \". This saves space on disk, but may be less robust, e."
+"g. when moving messages between folders.</p><p><b>maildir:</b> KMail's mail "
+"folders are represented by real folders on disk. Individual messages are "
+"separate files. This may waste a bit of space on disk, but should be more "
+"robust, e.g. when moving messages between folders.</p></qt>"
 msgstr ""
 
 #: configuredialog.cpp:4679
@@ -2596,32 +2576,27 @@ msgstr ""
 #: configuredialog.cpp:4718
 msgid ""
 "_: what's this help\n"
-"<qt>"
-"<p>When jumping to the next unread message, it may occur that no more unread "
-"messages are below the current message.</p>"
-"<p><b>Do not loop:</b> The search will stop at the last message in the current "
-"folder.</p>"
-"<p><b>Loop in current folder:</b> The search will continue at the top of the "
-"message list, but not go to another folder.</p>"
-"<p><b>Loop in all folders:</b> The search will continue at the top of the "
-"message list. If no unread messages are found it will then continue to the next "
-"folder.</p>"
-"<p>Similarly, when searching for the previous unread message, the search will "
-"start from the bottom of the message list and continue to the previous folder "
-"depending on which option is selected.</p></qt>"
+"<qt><p>When jumping to the next unread message, it may occur that no more "
+"unread messages are below the current message.</p><p><b>Do not loop:</b> The "
+"search will stop at the last message in the current folder.</p><p><b>Loop in "
+"current folder:</b> The search will continue at the top of the message list, "
+"but not go to another folder.</p><p><b>Loop in all folders:</b> The search "
+"will continue at the top of the message list. If no unread messages are "
+"found it will then continue to the next folder.</p><p>Similarly, when "
+"searching for the previous unread message, the search will start from the "
+"bottom of the message list and continue to the previous folder depending on "
+"which option is selected.</p></qt>"
 msgstr ""
 
 #: configuredialog.cpp:4735
 msgid ""
 "_: what's this help\n"
-"<qt>"
-"<p>Full text indexing allows very fast searches on the content of your "
-"messages. When enabled, the search dialog will work very fast. Also, the search "
-"tool bar will select messages based on content.</p>"
-"<p>It takes up a certain amount of disk space (about half the disk space for "
-"the messages).</p>"
-"<p>After enabling, the index will need to be built, but you can continue to use "
-"KMail while this operation is running.</p></qt>"
+"<qt><p>Full text indexing allows very fast searches on the content of your "
+"messages. When enabled, the search dialog will work very fast. Also, the "
+"search tool bar will select messages based on content.</p><p>It takes up a "
+"certain amount of disk space (about half the disk space for the messages).</"
+"p><p>After enabling, the index will need to be built, but you can continue "
+"to use KMail while this operation is running.</p></qt>"
 msgstr ""
 
 #: configuredialog.cpp:4811
@@ -2687,8 +2662,8 @@ msgstr ""
 
 #: configuredialog.cpp:4902
 msgid ""
-"When this is checked, you will not see the IMAP resource folders in the folder "
-"tree."
+"When this is checked, you will not see the IMAP resource folders in the "
+"folder tree."
 msgstr ""
 
 #: configuredialog.cpp:4909
@@ -2697,8 +2672,8 @@ msgstr ""
 
 #: configuredialog.cpp:4913
 msgid ""
-"When this is checked, you will not see normal  mail folders in the folder tree "
-"for the account configured for groupware."
+"When this is checked, you will not see normal  mail folders in the folder "
+"tree for the account configured for groupware."
 msgstr ""
 
 #: configuredialog.cpp:4921
@@ -2752,19 +2727,18 @@ msgid ""
 "compatible way."
 msgstr ""
 
-#. i18n: file kmail.kcfg line 190
-#: configuredialog.cpp:4970 rc.cpp:694
+#: configuredialog.cpp:4970 kmail.kcfg:190
 #, fuzzy, no-c-format
 msgid "Outlook compatible invitation reply comments"
 msgstr "ตั้งชื่อสิ่งที่แนบมาด้วยให้ใช้กันได้กับ Outlook"
 
 #: configuredialog.cpp:4971
 msgid ""
-"Send invitation reply comments in a way that Microsoft Outlook(tm) understands."
+"Send invitation reply comments in a way that Microsoft Outlook(tm) "
+"understands."
 msgstr ""
 
-#. i18n: file kmail.kcfg line 196
-#: configuredialog.cpp:4977 rc.cpp:700
+#: configuredialog.cpp:4977 kmail.kcfg:196
 #, fuzzy, no-c-format
 msgid "Automatic invitation sending"
 msgstr "เข้ารหัสโดยใช้ OpenPGP โดยอัตโนมัติ"
@@ -2777,14 +2751,14 @@ msgstr ""
 
 #: configuredialog.cpp:4991
 msgid ""
-"<qt>Invitations are normally sent as attachments to a mail. This switch changes "
-"the invitation mails to be sent in the text of the mail instead; this is "
-"necessary to send invitations and replies to Microsoft Outlook."
+"<qt>Invitations are normally sent as attachments to a mail. This switch "
+"changes the invitation mails to be sent in the text of the mail instead; "
+"this is necessary to send invitations and replies to Microsoft Outlook."
 "<br>But, when you do this, you no longer get descriptive text that mail "
-"programs can read; so, to people who have email programs that do not understand "
-"the invitations, the resulting messages look very odd."
-"<br>People that have email programs that do understand invitations will still "
-"be able to work with this.</qt>"
+"programs can read; so, to people who have email programs that do not "
+"understand the invitations, the resulting messages look very odd.<br>People "
+"that have email programs that do understand invitations will still be able "
+"to work with this.</qt>"
 msgstr ""
 
 #: configuredialog.cpp:5048
@@ -2894,17 +2868,16 @@ msgstr "ส่งต่อ"
 
 #: customtemplates.cpp:106
 msgid ""
-"<qt>"
-"<p>Here you can add, edit, and delete custom message templates to use when you "
-"compose a reply or forwarding message. Create the custom template by selecting "
-"it using the right mouse  button menu or toolbar menu. Also, you can bind a "
-"keyboard combination to the template for faster operations.</p>"
-"<p>Message templates support substitution commands by simple typing them or "
-"selecting them from menu <i>Insert command</i>.</p>"
-"<p>There are four types of custom templates: used to <i>Reply</i>, <i>"
-"Reply to All</i>, <i>Forward</i>, and <i>Universal</i> "
-"which can be used for all kind of operations. You cannot bind keyboard shortcut "
-"to <i>Universal</i> templates.</p></qt>"
+"<qt><p>Here you can add, edit, and delete custom message templates to use "
+"when you compose a reply or forwarding message. Create the custom template "
+"by selecting it using the right mouse  button menu or toolbar menu. Also, "
+"you can bind a keyboard combination to the template for faster operations.</"
+"p><p>Message templates support substitution commands by simple typing them "
+"or selecting them from menu <i>Insert command</i>.</p><p>There are four "
+"types of custom templates: used to <i>Reply</i>, <i>Reply to All</i>, "
+"<i>Forward</i>, and <i>Universal</i> which can be used for all kind of "
+"operations. You cannot bind keyboard shortcut to <i>Universal</i> templates."
+"</p></qt>"
 msgstr ""
 
 #: customtemplates.cpp:120 templatesconfiguration.cpp:105
@@ -2922,15 +2895,15 @@ msgstr ""
 
 #: customtemplates.cpp:124
 msgid ""
-"When using this template for forwarding, the default recipients are those you "
-"enter here. This is a comma-separated list of mail addresses."
+"When using this template for forwarding, the default recipients are those "
+"you enter here. This is a comma-separated list of mail addresses."
 msgstr ""
 
 #: customtemplates.cpp:125
 msgid ""
-"When using this template for forwarding, the recipients you enter here will by "
-"default get a copy of this message. This is a comma-separated list of mail "
-"addresses."
+"When using this template for forwarding, the recipients you enter here will "
+"by default get a copy of this message. This is a comma-separated list of "
+"mail addresses."
 msgstr ""
 
 #: customtemplates.cpp:186
@@ -3002,8 +2975,8 @@ msgstr "แก้ไขการแสดงตัว"
 
 #: editorwatcher.cpp:161
 msgid ""
-"KMail is unable to detect when the chosen editor is closed. To avoid data loss, "
-"editing the attachment will be aborted."
+"KMail is unable to detect when the chosen editor is closed. To avoid data "
+"loss, editing the attachment will be aborted."
 msgstr ""
 
 #: editorwatcher.cpp:163
@@ -3257,6 +3230,11 @@ msgstr "เลือกโฟลเดอร์"
 msgid "Filters"
 msgstr "ตัวกรอง %1"
 
+#: filterimporterexporter.cpp:65
+#, fuzzy
+msgid "Select All"
+msgstr "เลือกข้อความทั้งหมด"
+
 #: filterimporterexporter.cpp:67
 #, fuzzy
 msgid "Unselect All"
@@ -3289,8 +3267,8 @@ msgstr "หาใบรับรองอื่น ๆ"
 
 #: filterlogdlg.cpp:79
 msgid ""
-"You can turn logging of filter activities on and off here. Of course, log data "
-"is collected and shown only when logging is turned on. "
+"You can turn logging of filter activities on and off here. Of course, log "
+"data is collected and shown only when logging is turned on. "
 msgstr ""
 
 #: filterlogdlg.cpp:83
@@ -3308,10 +3286,11 @@ msgstr ""
 
 #: filterlogdlg.cpp:105
 msgid ""
-"You can control the feedback in the log concerning the evaluation of the filter "
-"rules of applied filters: having this option checked will give detailed "
-"feedback for each single filter rule; alternatively, only feedback about the "
-"result of the evaluation of all rules of a single filter will be given."
+"You can control the feedback in the log concerning the evaluation of the "
+"filter rules of applied filters: having this option checked will give "
+"detailed feedback for each single filter rule; alternatively, only feedback "
+"about the result of the evaluation of all rules of a single filter will be "
+"given."
 msgstr ""
 
 #: filterlogdlg.cpp:112
@@ -3333,10 +3312,10 @@ msgstr "ไม่จำกัด"
 
 #: filterlogdlg.cpp:144
 msgid ""
-"Collecting log data uses memory to temporarily store the log data; here you can "
-"limit the maximum amount of memory to be used: if the size of the collected log "
-"data exceeds this limit then the oldest data will be discarded until the limit "
-"is no longer exceeded. "
+"Collecting log data uses memory to temporarily store the log data; here you "
+"can limit the maximum amount of memory to be used: if the size of the "
+"collected log data exceeds this limit then the oldest data will be discarded "
+"until the limit is no longer exceeded. "
 msgstr ""
 
 #: filterlogdlg.cpp:258
@@ -3347,7 +3326,7 @@ msgstr ""
 "ไม่สามารถเขียนแฟ้ม %1 ได้:\n"
 "\"%2\" มีส่วนรายละเอียดที่ผิดพลาด"
 
-#: filterlogdlg.cpp:262 kmcommands.cpp:2772 kmcommands.cpp:2796
+#: filterlogdlg.cpp:262 kmcommands.cpp:2769 kmcommands.cpp:2793
 #: kmmainwidget.cpp:1772 kmmainwidget.cpp:1789 urlhandlermanager.cpp:556
 msgid "KMail Error"
 msgstr "ข้อผิดพลาดของ Kmail"
@@ -3388,9 +3367,9 @@ msgstr "ส่วนแสดงตัวผู้ใช้:"
 
 #: folderdiaacltab.cpp:101
 msgid ""
-"The User Identifier is the login of the user on the IMAP server. This can be a "
-"simple user name or the full email address of the user; the login for your own "
-"account on the server will tell you which one it is."
+"The User Identifier is the login of the user on the IMAP server. This can be "
+"a simple user name or the full email address of the user; the login for your "
+"own account on the server will tell you which one it is."
 msgstr ""
 
 #: folderdiaacltab.cpp:103 recipientseditor.cpp:776
@@ -3441,8 +3420,8 @@ msgstr "คุณยังไม่สิทธิ์ในการอ่าน
 
 #: folderdiaacltab.cpp:435
 msgid ""
-"Information not retrieved from server, you need to use \"Check Mail\" and have "
-"administrative privileges on the folder."
+"Information not retrieved from server, you need to use \"Check Mail\" and "
+"have administrative privileges on the folder."
 msgstr ""
 
 #: folderdiaacltab.cpp:450 folderdiaquotatab.cpp:114
@@ -3453,8 +3432,7 @@ msgstr ""
 msgid "Connecting to server %1, please wait..."
 msgstr "กำลังเชื่อมต่อไปยังเซิร์ฟเวอร์ %1, โปรดรอสักครู่..."
 
-#: folderdiaacltab.cpp:474 folderdiaquotatab.cpp:139
-#: kmfoldercachedimap.cpp:902
+#: folderdiaacltab.cpp:474 folderdiaquotatab.cpp:139 kmfoldercachedimap.cpp:902
 #, c-format
 msgid "Error connecting to server %1"
 msgstr "เกิดข้อผิดพลาดในเชื่อมต่อกับเซิร์ฟเวอร์ %1"
@@ -3480,8 +3458,8 @@ msgstr "เพิ่มสิทธิ์ที่อนุญาต"
 
 #: folderdiaacltab.cpp:636
 msgid ""
-"Do you really want to remove your own permissions for this folder? You will not "
-"be able to access it afterwards."
+"Do you really want to remove your own permissions for this folder? You will "
+"not be able to access it afterwards."
 msgstr ""
 
 #: folderdiaquotatab.cpp:163 folderdiaquotatab.cpp:177
@@ -3511,7 +3489,7 @@ msgstr ""
 msgid "Select Folder"
 msgstr "เลือกโฟลเดอร์"
 
-#: folderrequester.cpp:95 kmcommands.cpp:1884 kmfoldermgr.cpp:45
+#: folderrequester.cpp:95 kmcommands.cpp:1881 kmfoldermgr.cpp:45
 #: kmfoldertree.cpp:576
 msgid "Local Folders"
 msgstr "โฟลเดอร์ภายใน"
@@ -3536,9 +3514,9 @@ msgstr "เลือกปุ่มพิมพ์ลัดสำหรับโ
 
 #: foldershortcutdialog.cpp:65
 msgid ""
-"<qt>To choose a key or a combination of keys which select the current folder, "
-"click the button below and then press the key(s) you wish to associate with "
-"this folder.</qt>"
+"<qt>To choose a key or a combination of keys which select the current "
+"folder, click the button below and then press the key(s) you wish to "
+"associate with this folder.</qt>"
 msgstr ""
 
 #: foldershortcutdialog.cpp:91 kmfilterdlg.cpp:530 snippetdlg.cpp:100
@@ -3559,11 +3537,20 @@ msgstr "ยกเลิก"
 
 #: folderutil.cpp:93
 msgid ""
-"<qt>The folder you deleted was associated with the account <b>%1</b> "
-"which delivered mail into it. The folder the account delivers new mail into was "
+"<qt>The folder you deleted was associated with the account <b>%1</b> which "
+"delivered mail into it. The folder the account delivers new mail into was "
 "reset to the main Inbox folder.</qt>"
 msgstr ""
 
+#: folderviewtooltip.h:34
+msgid "<qt><b>%1</b><br>Total: %2<br>Unread: %3<br>Size: %4"
+msgstr ""
+
+#: folderviewtooltip.h:43
+#, c-format
+msgid "<br>Quota: %1"
+msgstr ""
+
 #: headeritem.cpp:179 headeritem.cpp:186
 msgid "Unknown"
 msgstr "ไม่ทราบ"
@@ -3683,56 +3670,16 @@ msgstr "สถานะ: "
 
 #: htmlstatusbar.cpp:91
 msgid ""
-"<qt><b>"
-"<br>H"
-"<br>T"
-"<br>M"
-"<br>L"
-"<br> "
-"<br>M"
-"<br>e"
-"<br>s"
-"<br>s"
-"<br>a"
-"<br>g"
-"<br>e</b></qt>"
+"<qt><b><br>H<br>T<br>M<br>L<br> <br>M<br>e<br>s<br>s<br>a<br>g<br>e</b></qt>"
 msgstr "<qt><b><br>จ<br>ด<br>ห<br>ม<br>า<br>ย<br><br>H<br>T<br>M<br>L</b></qt>"
 
 #: htmlstatusbar.cpp:94
 msgid ""
-"<qt>"
-"<br>N"
-"<br>o"
-"<br> "
-"<br>H"
-"<br>T"
-"<br>M"
-"<br>L"
-"<br> "
-"<br>M"
-"<br>e"
-"<br>s"
-"<br>s"
-"<br>a"
-"<br>g"
-"<br>e</qt>"
-msgstr ""
-"<qt><b>"
-"<br>ไ"
-"<br>ม่"
-"<br>ใ"
-"<br>ช่"
-"<br>จ"
-"<br>ด"
-"<br>ห"
-"<br>ม"
-"<br>า"
-"<br>ย"
-"<br>"
-"<br>H"
-"<br>T"
-"<br>M"
-"<br>L</b></qt>"
+"<qt><br>N<br>o<br> <br>H<br>T<br>M<br>L<br> "
+"<br>M<br>e<br>s<br>s<br>a<br>g<br>e</qt>"
+msgstr ""
+"<qt><b><br>ไ<br>ม่<br>ใ<br>ช่<br>จ<br>ด<br>ห<br>ม<br>า<br>ย<br><br>H<br>T<br>M<br>L</"
+"b></qt>"
 
 #: identitydialog.cpp:93
 msgid "Edit Identity"
@@ -3744,12 +3691,9 @@ msgstr "ชื่อของคุณ:"
 
 #: identitydialog.cpp:123
 msgid ""
-"<qt>"
-"<h3>Your name</h3>"
-"<p>This field should contain your name as you would like it to appear in the "
-"email header that is sent out;</p>"
-"<p>if you leave this blank your real name will not appear, only the email "
-"address.</p></qt>"
+"<qt><h3>Your name</h3><p>This field should contain your name as you would "
+"like it to appear in the email header that is sent out;</p><p>if you leave "
+"this blank your real name will not appear, only the email address.</p></qt>"
 msgstr ""
 
 #: identitydialog.cpp:135
@@ -3758,11 +3702,9 @@ msgstr "องค์กร:"
 
 #: identitydialog.cpp:137
 msgid ""
-"<qt>"
-"<h3>Organization</h3>"
-"<p>This field should have the name of your organization if you'd like it to be "
-"shown in the email header that is sent out.</p>"
-"<p>It is safe (and normal) to leave this blank.</p></qt>"
+"<qt><h3>Organization</h3><p>This field should have the name of your "
+"organization if you'd like it to be shown in the email header that is sent "
+"out.</p><p>It is safe (and normal) to leave this blank.</p></qt>"
 msgstr ""
 
 #: identitydialog.cpp:149
@@ -3771,14 +3713,11 @@ msgstr "ที่อยู่อีเมล:"
 
 #: identitydialog.cpp:151
 msgid ""
-"<qt>"
-"<h3>Email address</h3>"
-"<p>This field should have your full email address</p>"
-"<p>This address is the primary one, used for all outgoing mail. If you have "
-"more than one address, either create a new identity, or add additional alias "
-"addresses in the field below.</p>"
-"<p>If you leave this blank, or get it wrong, people will have trouble replying "
-"to you.</p></qt>"
+"<qt><h3>Email address</h3><p>This field should have your full email address</"
+"p><p>This address is the primary one, used for all outgoing mail. If you "
+"have more than one address, either create a new identity, or add additional "
+"alias addresses in the field below.</p><p>If you leave this blank, or get it "
+"wrong, people will have trouble replying to you.</p></qt>"
 msgstr ""
 
 #: identitydialog.cpp:165
@@ -3788,21 +3727,12 @@ msgstr "ที่อยู่อีเมล:"
 
 #: identitydialog.cpp:167
 msgid ""
-"<qt>"
-"<h3>Email aliases</h3>"
-"<p>This field contains alias addresses that should also be considered as "
-"belonging to this identity (as opposed to representing a different "
-"identity).</p>"
-"<p>Example:</p>"
-"<table>"
-"<tr>"
-"<th>Primary address:</th>"
-"<td>[email protected]</td></tr>"
-"<tr>"
-"<th>Aliases:</th>"
-"<td>[email protected]"
-"<br>[email protected]</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>[email protected]</td></tr><tr><th>Aliases:</"
+"th><td>[email protected]<br>[email protected]</td></tr></table><p>Type one "
+"alias address per line.</p></qt>"
 msgstr ""
 
 #: identitydialog.cpp:185
@@ -3825,12 +3755,11 @@ msgstr "เลือกกุญแจ OpenPGP ที่จะใช้ในก
 
 #: identitydialog.cpp:198
 msgid ""
-"<qt>"
-"<p>The OpenPGP key you choose here will be used to digitally sign messages. You "
-"can also use GnuPG keys.</p>"
-"<p>You can leave this blank, but KMail will not be able to digitally sign "
-"emails using OpenPGP; normal mail functions will not be affected.</p>"
-"<p>You can find out more about keys at <a>http://www.gnupg.org</a></p></qt>"
+"<qt><p>The OpenPGP key you choose here will be used to digitally sign "
+"messages. You can also use GnuPG keys.</p><p>You can leave this blank, but "
+"KMail will not be able to digitally sign emails using OpenPGP; normal mail "
+"functions will not be affected.</p><p>You can find out more about keys at "
+"<a>http://www.gnupg.org</a></p></qt>"
 msgstr ""
 
 #: identitydialog.cpp:205
@@ -3844,20 +3773,18 @@ msgstr "กุญแจ OpenPGP ของคุณสำหรับเข้า
 #: identitydialog.cpp:218
 #, fuzzy
 msgid ""
-"Select the OpenPGP key which should be used when encrypting to yourself and for "
-"the \"Attach My Public Key\" feature in the composer."
+"Select the OpenPGP key which should be used when encrypting to yourself and "
+"for the \"Attach My Public Key\" feature in the composer."
 msgstr "เลือกกุญแจ OpenPGP ที่ควรใช้ในการเซ็นจดหมายของคุณ และใช้ในการเข้ารหัส"
 
 #: identitydialog.cpp:223
 msgid ""
-"<qt>"
-"<p>The OpenPGP key you choose here will be used to encrypt messages to yourself "
-"and for the \"Attach My Public Key\" feature in the composer. You can also use "
-"GnuPG keys.</p>"
-"<p>You can leave this blank, but KMail will not be able to encrypt copies of "
-"outgoing messages to you using OpenPGP; normal mail functions will not be "
-"affected.</p>"
-"<p>You can find out more about keys at <a>http://www.gnupg.org</a></qt>"
+"<qt><p>The OpenPGP key you choose here will be used to encrypt messages to "
+"yourself and for the \"Attach My Public Key\" feature in the composer. You "
+"can also use GnuPG keys.</p><p>You can leave this blank, but KMail will not "
+"be able to encrypt copies of outgoing messages to you using OpenPGP; normal "
+"mail functions will not be affected.</p><p>You can find out more about keys "
+"at <a>http://www.gnupg.org</a></qt>"
 msgstr ""
 
 #: identitydialog.cpp:230
@@ -3878,11 +3805,10 @@ msgstr "เลือกกุญแจ OpenPGP ที่ควรใช้ใน
 
 #: identitydialog.cpp:247
 msgid ""
-"<qt>"
-"<p>The S/MIME (X.509) certificate you choose here will be used to digitally "
-"sign messages.</p>"
-"<p>You can leave this blank, but KMail will not be able to digitally sign "
-"emails using S/MIME; normal mail functions will not be affected.</p></qt>"
+"<qt><p>The S/MIME (X.509) certificate you choose here will be used to "
+"digitally sign messages.</p><p>You can leave this blank, but KMail will not "
+"be able to digitally sign emails using S/MIME; normal mail functions will "
+"not be affected.</p></qt>"
 msgstr ""
 
 #: identitydialog.cpp:252
@@ -3896,18 +3822,17 @@ msgstr ""
 
 #: identitydialog.cpp:269
 msgid ""
-"Select the S/MIME certificate which should be used when encrypting to yourself "
-"and for the \"Attach My Certificate\" feature in the composer."
+"Select the S/MIME certificate which should be used when encrypting to "
+"yourself and for the \"Attach My Certificate\" feature in the composer."
 msgstr ""
 
 #: identitydialog.cpp:274
 msgid ""
-"<qt>"
-"<p>The S/MIME certificate you choose here will be used to encrypt messages to "
-"yourself and for the \"Attach My Certificate\" feature in the composer.</p>"
-"<p>You can leave this blank, but KMail will not be able to encrypt copies of "
-"outgoing messages to you using S/MIME; normal mail functions will not be "
-"affected.</p></qt>"
+"<qt><p>The S/MIME certificate you choose here will be used to encrypt "
+"messages to yourself and for the \"Attach My Certificate\" feature in the "
+"composer.</p><p>You can leave this blank, but KMail will not be able to "
+"encrypt copies of outgoing messages to you using S/MIME; normal mail "
+"functions will not be affected.</p></qt>"
 msgstr ""
 
 #: identitydialog.cpp:280
@@ -3929,14 +3854,12 @@ msgstr "ที่อยู่สำหรับตอบกลับ:"
 
 #: identitydialog.cpp:326
 msgid ""
-"<qt>"
-"<h3>Reply-To addresses</h3>"
-"<p>This sets the <tt>Reply-to:</tt> header to contain a different email address "
-"to the normal <tt>From:</tt> address.</p>"
-"<p>This can be useful when you have a group of people working together in "
-"similar roles. For example, you might want any emails sent to have your email "
-"in the <tt>From:</tt> field, but any responses to go to a group address.</p>"
-"<p>If in doubt, leave this field blank.</p></qt>"
+"<qt><h3>Reply-To addresses</h3><p>This sets the <tt>Reply-to:</tt> header to "
+"contain a different email address to the normal <tt>From:</tt> address.</"
+"p><p>This can be useful when you have a group of people working together in "
+"similar roles. For example, you might want any emails sent to have your "
+"email in the <tt>From:</tt> field, but any responses to go to a group "
+"address.</p><p>If in doubt, leave this field blank.</p></qt>"
 msgstr ""
 
 #: identitydialog.cpp:343
@@ -3945,15 +3868,12 @@ msgstr "ที่อยู่ ซ่อนสำเนาถึง:"
 
 #: identitydialog.cpp:345
 msgid ""
-"<qt>"
-"<h3>BCC (Blind Carbon Copy) addresses</h3>"
-"<p>The addresses that you enter here will be added to each outgoing mail that "
-"is sent with this identity. They will not be visible to other recipients.</p>"
-"<p>This is commonly used to send a copy of each sent message to another account "
-"of yours.</p>"
-"<p>To specify more than one address, use commas to separate the list of BCC "
-"recipients.</p>"
-"<p>If in doubt, leave this field blank.</p></qt>"
+"<qt><h3>BCC (Blind Carbon Copy) addresses</h3><p>The addresses that you "
+"enter here will be added to each outgoing mail that is sent with this "
+"identity. They will not be visible to other recipients.</p><p>This is "
+"commonly used to send a copy of each sent message to another account of "
+"yours.</p><p>To specify more than one address, use commas to separate the "
+"list of BCC recipients.</p><p>If in doubt, leave this field blank.</p></qt>"
 msgstr ""
 
 #: identitydialog.cpp:361
@@ -3994,7 +3914,7 @@ msgstr "ลายเซ็น"
 msgid "&Picture"
 msgstr "รูปภาพ"
 
-#: identitydialog.cpp:510 identitydialog.cpp:522 kmcomposewin.cpp:4117
+#: identitydialog.cpp:510 identitydialog.cpp:522 kmcomposewin.cpp:4116
 #, fuzzy
 msgid "Invalid Email Address"
 msgstr "เพิ่มที่อยู่อีเมล์"
@@ -4014,8 +3934,8 @@ msgstr ""
 
 #: identitydialog.cpp:560
 msgid ""
-"One of the configured OpenPGP encryption keys does not contain any user ID with "
-"the configured email address for this identity (%1)."
+"One of the configured OpenPGP encryption keys does not contain any user ID "
+"with the configured email address for this identity (%1)."
 msgstr ""
 
 #: identitydialog.cpp:567
@@ -4065,8 +3985,8 @@ msgstr ""
 
 #: identitylistview.cpp:85
 msgid ""
-"_: %1: identity name. Used in the config dialog, section Identity, to indicate "
-"the default identity\n"
+"_: %1: identity name. Used in the config dialog, section Identity, to "
+"indicate the default identity\n"
 "%1 (Default)"
 msgstr "%1 (ค่าปริยาย)"
 
@@ -4117,14 +4037,14 @@ msgstr ""
 
 #: imapaccountbase.cpp:750 imapaccountbase.cpp:764
 msgid ""
-"The configuration was automatically migrated but you should check your account "
-"configuration."
+"The configuration was automatically migrated but you should check your "
+"account configuration."
 msgstr ""
 
 #: imapaccountbase.cpp:768
 msgid ""
-"It was not possible to migrate your configuration automatically so please check "
-"your account configuration."
+"It was not possible to migrate your configuration automatically so please "
+"check your account configuration."
 msgstr ""
 
 #: imapaccountbase.cpp:882 imapaccountbase.cpp:883
@@ -4166,17 +4086,22 @@ msgstr ""
 #: imapaccountbase.cpp:913
 msgid ""
 "\n"
-"Since you do not have write privileges on this folder, please ask the owner of "
-"the folder to free up some space in it."
+"Since you do not have write privileges on this folder, please ask the owner "
+"of the folder to free up some space in it."
 msgstr ""
 
+#: imapaccountbase.cpp:955 kmservertest.cpp:171
+#, fuzzy
+msgid "Error"
+msgstr "ผิดพลาด: %1"
+
 #: imapaccountbase.cpp:959
 msgid ""
-"The connection to the server %1 was unexpectedly closed or timed out. It will "
-"be re-established automatically if possible."
+"The connection to the server %1 was unexpectedly closed or timed out. It "
+"will be re-established automatically if possible."
 msgstr ""
-"การเชื่อมต่อไปยังเซิร์ฟเวอร์ %1 ถูกยุติการเชื่อมต่ออย่างไม่คาดคิด "
-"หรืออาจจะหมดเวลาเชื่อมต่อ และจะพยายามทำการเชื่อมต่อใหม่หากเป็นไปได้"
+"การเชื่อมต่อไปยังเซิร์ฟเวอร์ %1 ถูกยุติการเชื่อมต่ออย่างไม่คาดคิด หรืออาจจะหมดเวลาเชื่อมต่อ "
+"และจะพยายามทำการเชื่อมต่อใหม่หากเป็นไปได้"
 
 #: imapaccountbase.cpp:965
 msgid "The connection to account %1 was broken."
@@ -4322,14 +4247,14 @@ msgstr ""
 
 #: keyresolver.cpp:306
 msgid ""
-"One or more of your configured OpenPGP encryption keys or S/MIME certificates "
-"is not fully trusted for encryption."
+"One or more of your configured OpenPGP encryption keys or S/MIME "
+"certificates is not fully trusted for encryption."
 msgstr ""
 
 #: keyresolver.cpp:309
 msgid ""
-"One or more of the OpenPGP encryption keys or S/MIME certificates for recipient "
-"\"%1\" is not fully trusted for encryption."
+"One or more of the OpenPGP encryption keys or S/MIME certificates for "
+"recipient \"%1\" is not fully trusted for encryption."
 msgstr ""
 
 #: keyresolver.cpp:315
@@ -4357,136 +4282,110 @@ msgstr "กุญแจการเข้ารหัสยังไม่มี
 
 #: keyresolver.cpp:642
 msgid ""
-"_n: "
-"<p>Your OpenPGP signing key</p><p align=center><b>%1</b> (KeyID 0x%2)</p>"
-"<p>expired less than a day ago.</p>\n"
-"<p>Your OpenPGP signing key</p><p align=center><b>%1</b> (KeyID 0x%2)</p>"
-"<p>expired %n days ago.</p>"
+"_n: <p>Your OpenPGP signing key</p><p align=center><b>%1</b> (KeyID 0x%2)</"
+"p><p>expired less than a day ago.</p>\n"
+"<p>Your OpenPGP signing key</p><p align=center><b>%1</b> (KeyID 0x%2)</"
+"p><p>expired %n days ago.</p>"
 msgstr ""
 
 #: keyresolver.cpp:647
 msgid ""
-"_n: "
-"<p>Your OpenPGP encryption key</p><p align=center><b>%1</b> (KeyID 0x%2)</p>"
-"<p>expired less than a day ago.</p>\n"
-"<p>Your OpenPGP encryption key</p><p align=center><b>%1</b> (KeyID 0x%2)</p>"
-"<p>expired %n days ago.</p>"
+"_n: <p>Your OpenPGP encryption key</p><p align=center><b>%1</b> (KeyID 0x"
+"%2)</p><p>expired less than a day ago.</p>\n"
+"<p>Your OpenPGP encryption key</p><p align=center><b>%1</b> (KeyID 0x%2)</"
+"p><p>expired %n days ago.</p>"
 msgstr ""
 
 #: keyresolver.cpp:652
 msgid ""
-"_n: "
-"<p>The OpenPGP key for</p><p align=center><b>%1</b> (KeyID 0x%2)</p>"
-"<p>expired less than a day ago.</p>\n"
-"<p>The OpenPGP key for</p><p align=center><b>%1</b> (KeyID 0x%2)</p>"
-"<p>expired %n days ago.</p>"
+"_n: <p>The OpenPGP key for</p><p align=center><b>%1</b> (KeyID 0x%2)</"
+"p><p>expired less than a day ago.</p>\n"
+"<p>The OpenPGP key for</p><p align=center><b>%1</b> (KeyID 0x%2)</"
+"p><p>expired %n days ago.</p>"
 msgstr ""
 
 #: keyresolver.cpp:662
 msgid ""
-"_n: "
-"<p>The root certificate</p><p align=center><b>%3</b></p>"
-"<p>for your S/MIME signing certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expired less than a day ago.</p>\n"
-"<p>The root certificate</p><p align=center><b>%3</b></p>"
-"<p>for your S/MIME signing certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expired %n days ago.</p>"
+"_n: <p>The root certificate</p><p align=center><b>%3</b></p><p>for your S/"
+"MIME signing certificate</p><p align=center><b>%1</b> (serial number %2)</"
+"p><p>expired less than a day ago.</p>\n"
+"<p>The root certificate</p><p align=center><b>%3</b></p><p>for your S/MIME "
+"signing certificate</p><p align=center><b>%1</b> (serial number %2)</"
+"p><p>expired %n days ago.</p>"
 msgstr ""
 
 #: keyresolver.cpp:669
 msgid ""
-"_n: "
-"<p>The root certificate</p><p align=center><b>%3</b></p>"
-"<p>for your S/MIME encryption certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expired less than a day ago.</p>\n"
-"<p>The root certificate</p><p align=center><b>%3</b></p>"
-"<p>for your S/MIME encryption certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expired %n days ago.</p>"
+"_n: <p>The root certificate</p><p align=center><b>%3</b></p><p>for your S/"
+"MIME encryption certificate</p><p align=center><b>%1</b> (serial number %2)</"
+"p><p>expired less than a day ago.</p>\n"
+"<p>The root certificate</p><p align=center><b>%3</b></p><p>for your S/MIME "
+"encryption certificate</p><p align=center><b>%1</b> (serial number %2)</"
+"p><p>expired %n days ago.</p>"
 msgstr ""
 
 #: keyresolver.cpp:676
 msgid ""
-"_n: "
-"<p>The root certificate</p><p align=center><b>%3</b></p>"
-"<p>for S/MIME certificate</p><p align=center><b>%1</b> (serial number %2)</p>"
-"<p>expired less than a day ago.</p>\n"
-"<p>The root certificate</p><p align=center><b>%3</b></p>"
-"<p>for S/MIME certificate</p><p align=center><b>%1</b> (serial number %2)</p>"
-"<p>expired %n days ago.</p>"
+"_n: <p>The root certificate</p><p align=center><b>%3</b></p><p>for S/MIME "
+"certificate</p><p align=center><b>%1</b> (serial number %2)</p><p>expired "
+"less than a day ago.</p>\n"
+"<p>The root certificate</p><p align=center><b>%3</b></p><p>for S/MIME "
+"certificate</p><p align=center><b>%1</b> (serial number %2)</p><p>expired %n "
+"days ago.</p>"
 msgstr ""
 
 #: keyresolver.cpp:684
 msgid ""
-"_n: "
-"<p>The intermediate CA certificate</p><p align=center><b>%3</b></p>"
-"<p>for your S/MIME signing certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expired less than a day ago.</p>\n"
-"<p>The intermediate CA certificate</p><p align=center><b>%3</b></p>"
-"<p>for your S/MIME signing certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expired %n days ago.</p>"
+"_n: <p>The intermediate CA certificate</p><p align=center><b>%3</b></"
+"p><p>for your S/MIME signing certificate</p><p align=center><b>%1</b> "
+"(serial number %2)</p><p>expired less than a day ago.</p>\n"
+"<p>The intermediate CA certificate</p><p align=center><b>%3</b></p><p>for "
+"your S/MIME signing certificate</p><p align=center><b>%1</b> (serial number "
+"%2)</p><p>expired %n days ago.</p>"
 msgstr ""
 
 #: keyresolver.cpp:691
 msgid ""
-"_n: "
-"<p>The intermediate CA certificate</p><p align=center><b>%3</b></p>"
-"<p>for your S/MIME encryption certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expired less than a day ago.</p>\n"
-"<p>The intermediate CA certificate</p><p align=center><b>%3</b></p>"
-"<p>for your S/MIME encryption certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expired %n days ago.</p>"
+"_n: <p>The intermediate CA certificate</p><p align=center><b>%3</b></"
+"p><p>for your S/MIME encryption certificate</p><p align=center><b>%1</b> "
+"(serial number %2)</p><p>expired less than a day ago.</p>\n"
+"<p>The intermediate CA certificate</p><p align=center><b>%3</b></p><p>for "
+"your S/MIME encryption certificate</p><p align=center><b>%1</b> (serial "
+"number %2)</p><p>expired %n days ago.</p>"
 msgstr ""
 
 #: keyresolver.cpp:698
 msgid ""
-"_n: "
-"<p>The intermediate CA certificate</p><p align=center><b>%3</b></p>"
-"<p>for S/MIME certificate</p><p align=center><b>%1</b> (serial number %2)</p>"
-"<p>expired less than a day ago.</p>\n"
-"<p>The intermediate CA certificate</p><p align=center><b>%3</b></p>"
-"<p>for S/MIME certificate</p><p align=center><b>%1</b> (serial number %2)</p>"
-"<p>expired %n days ago.</p>"
+"_n: <p>The intermediate CA certificate</p><p align=center><b>%3</b></"
+"p><p>for S/MIME certificate</p><p align=center><b>%1</b> (serial number %2)</"
+"p><p>expired less than a day ago.</p>\n"
+"<p>The intermediate CA certificate</p><p align=center><b>%3</b></p><p>for S/"
+"MIME certificate</p><p align=center><b>%1</b> (serial number %2)</"
+"p><p>expired %n days ago.</p>"
 msgstr ""
 
 #: keyresolver.cpp:707
 msgid ""
-"_n: "
-"<p>Your S/MIME signing certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expired less than a day ago.</p>\n"
-"<p>Your S/MIME signing certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expired %n days ago.</p>"
+"_n: <p>Your S/MIME signing certificate</p><p align=center><b>%1</b> (serial "
+"number %2)</p><p>expired less than a day ago.</p>\n"
+"<p>Your S/MIME signing certificate</p><p align=center><b>%1</b> (serial "
+"number %2)</p><p>expired %n days ago.</p>"
 msgstr ""
 
 #: keyresolver.cpp:712
 msgid ""
-"_n: "
-"<p>Your S/MIME encryption certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expired less than a day ago.</p>\n"
-"<p>Your S/MIME encryption certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expired %n days ago.</p>"
+"_n: <p>Your S/MIME encryption certificate</p><p align=center><b>%1</b> "
+"(serial number %2)</p><p>expired less than a day ago.</p>\n"
+"<p>Your S/MIME encryption certificate</p><p align=center><b>%1</b> (serial "
+"number %2)</p><p>expired %n days ago.</p>"
 msgstr ""
 
 #: keyresolver.cpp:717
 msgid ""
-"_n: "
-"<p>The S/MIME certificate for</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expired less than a day ago.</p>\n"
-"<p>The S/MIME certificate for</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expired %n days ago.</p>"
+"_n: <p>The S/MIME certificate for</p><p align=center><b>%1</b> (serial "
+"number %2)</p><p>expired less than a day ago.</p>\n"
+"<p>The S/MIME certificate for</p><p align=center><b>%1</b> (serial number "
+"%2)</p><p>expired %n days ago.</p>"
 msgstr ""
 
 #: keyresolver.cpp:724
@@ -4501,136 +4400,110 @@ msgstr "การส่งใบรับรอง"
 
 #: keyresolver.cpp:750
 msgid ""
-"_n: "
-"<p>Your OpenPGP signing key</p><p align=center><b>%1</b> (KeyID 0x%2)</p>"
-"<p>expires in less than a day.</p>\n"
-"<p>Your OpenPGP signing key</p><p align=center><b>%1</b> (KeyID 0x%2)</p>"
-"<p>expires in less than %n days.</p>"
+"_n: <p>Your OpenPGP signing key</p><p align=center><b>%1</b> (KeyID 0x%2)</"
+"p><p>expires in less than a day.</p>\n"
+"<p>Your OpenPGP signing key</p><p align=center><b>%1</b> (KeyID 0x%2)</"
+"p><p>expires in less than %n days.</p>"
 msgstr ""
 
 #: keyresolver.cpp:755
 msgid ""
-"_n: "
-"<p>Your OpenPGP encryption key</p><p align=center><b>%1</b> (KeyID 0x%2)</p>"
-"<p>expires in less than a day.</p>\n"
-"<p>Your OpenPGP encryption key</p><p align=center><b>%1</b> (KeyID 0x%2)</p>"
-"<p>expires in less than %n days.</p>"
+"_n: <p>Your OpenPGP encryption key</p><p align=center><b>%1</b> (KeyID 0x"
+"%2)</p><p>expires in less than a day.</p>\n"
+"<p>Your OpenPGP encryption key</p><p align=center><b>%1</b> (KeyID 0x%2)</"
+"p><p>expires in less than %n days.</p>"
 msgstr ""
 
 #: keyresolver.cpp:760
 msgid ""
-"_n: "
-"<p>The OpenPGP key for</p><p align=center><b>%1</b> (KeyID 0x%2)</p>"
-"<p>expires in less than a day.</p>\n"
-"<p>The OpenPGP key for</p><p align=center><b>%1</b> (KeyID 0x%2)</p>"
-"<p>expires in less than %n days.</p>"
+"_n: <p>The OpenPGP key for</p><p align=center><b>%1</b> (KeyID 0x%2)</"
+"p><p>expires in less than a day.</p>\n"
+"<p>The OpenPGP key for</p><p align=center><b>%1</b> (KeyID 0x%2)</"
+"p><p>expires in less than %n days.</p>"
 msgstr ""
 
 #: keyresolver.cpp:770
 msgid ""
-"_n: "
-"<p>The root certificate</p><p align=center><b>%3</b></p>"
-"<p>for your S/MIME signing certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expires in less than a day.</p>\n"
-"<p>The root certificate</p><p align=center><b>%3</b></p>"
-"<p>for your S/MIME signing certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expires in less than %n days.</p>"
+"_n: <p>The root certificate</p><p align=center><b>%3</b></p><p>for your S/"
+"MIME signing certificate</p><p align=center><b>%1</b> (serial number %2)</"
+"p><p>expires in less than a day.</p>\n"
+"<p>The root certificate</p><p align=center><b>%3</b></p><p>for your S/MIME "
+"signing certificate</p><p align=center><b>%1</b> (serial number %2)</"
+"p><p>expires in less than %n days.</p>"
 msgstr ""
 
 #: keyresolver.cpp:777
 msgid ""
-"_n: "
-"<p>The root certificate</p><p align=center><b>%3</b></p>"
-"<p>for your S/MIME encryption certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expires in less than a day.</p>\n"
-"<p>The root certificate</p><p align=center><b>%3</b></p>"
-"<p>for your S/MIME encryption certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expires in less than %n days.</p>"
+"_n: <p>The root certificate</p><p align=center><b>%3</b></p><p>for your S/"
+"MIME encryption certificate</p><p align=center><b>%1</b> (serial number %2)</"
+"p><p>expires in less than a day.</p>\n"
+"<p>The root certificate</p><p align=center><b>%3</b></p><p>for your S/MIME "
+"encryption certificate</p><p align=center><b>%1</b> (serial number %2)</"
+"p><p>expires in less than %n days.</p>"
 msgstr ""
 
 #: keyresolver.cpp:784
 msgid ""
-"_n: "
-"<p>The root certificate</p><p align=center><b>%3</b></p>"
-"<p>for S/MIME certificate</p><p align=center><b>%1</b> (serial number %2)</p>"
-"<p>expires in less than a day.</p>\n"
-"<p>The root certificate</p><p align=center><b>%3</b></p>"
-"<p>for S/MIME certificate</p><p align=center><b>%1</b> (serial number %2)</p>"
-"<p>expires in less than %n days.</p>"
+"_n: <p>The root certificate</p><p align=center><b>%3</b></p><p>for S/MIME "
+"certificate</p><p align=center><b>%1</b> (serial number %2)</p><p>expires in "
+"less than a day.</p>\n"
+"<p>The root certificate</p><p align=center><b>%3</b></p><p>for S/MIME "
+"certificate</p><p align=center><b>%1</b> (serial number %2)</p><p>expires in "
+"less than %n days.</p>"
 msgstr ""
 
 #: keyresolver.cpp:792
 msgid ""
-"_n: "
-"<p>The intermediate CA certificate</p><p align=center><b>%3</b></p>"
-"<p>for your S/MIME signing certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expires in less than a day.</p>\n"
-"<p>The intermediate CA certificate</p><p align=center><b>%3</b></p>"
-"<p>for your S/MIME signing certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expires in less than %n days.</p>"
+"_n: <p>The intermediate CA certificate</p><p align=center><b>%3</b></"
+"p><p>for your S/MIME signing certificate</p><p align=center><b>%1</b> "
+"(serial number %2)</p><p>expires in less than a day.</p>\n"
+"<p>The intermediate CA certificate</p><p align=center><b>%3</b></p><p>for "
+"your S/MIME signing certificate</p><p align=center><b>%1</b> (serial number "
+"%2)</p><p>expires in less than %n days.</p>"
 msgstr ""
 
 #: keyresolver.cpp:799
 msgid ""
-"_n: "
-"<p>The intermediate CA certificate</p><p align=center><b>%3</b></p>"
-"<p>for your S/MIME encryption certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expires in less than a day.</p>\n"
-"<p>The intermediate CA certificate</p><p align=center><b>%3</b></p>"
-"<p>for your S/MIME encryption certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expires in less than %n days.</p>"
+"_n: <p>The intermediate CA certificate</p><p align=center><b>%3</b></"
+"p><p>for your S/MIME encryption certificate</p><p align=center><b>%1</b> "
+"(serial number %2)</p><p>expires in less than a day.</p>\n"
+"<p>The intermediate CA certificate</p><p align=center><b>%3</b></p><p>for "
+"your S/MIME encryption certificate</p><p align=center><b>%1</b> (serial "
+"number %2)</p><p>expires in less than %n days.</p>"
 msgstr ""
 
 #: keyresolver.cpp:806
 msgid ""
-"_n: "
-"<p>The intermediate CA certificate</p><p align=center><b>%3</b></p>"
-"<p>for S/MIME certificate</p><p align=center><b>%1</b> (serial number %2)</p>"
-"<p>expires in less than a day.</p>\n"
-"<p>The intermediate CA certificate</p><p align=center><b>%3</b></p>"
-"<p>for S/MIME certificate</p><p align=center><b>%1</b> (serial number %2)</p>"
-"<p>expires in less than %n days.</p>"
+"_n: <p>The intermediate CA certificate</p><p align=center><b>%3</b></"
+"p><p>for S/MIME certificate</p><p align=center><b>%1</b> (serial number %2)</"
+"p><p>expires in less than a day.</p>\n"
+"<p>The intermediate CA certificate</p><p align=center><b>%3</b></p><p>for S/"
+"MIME certificate</p><p align=center><b>%1</b> (serial number %2)</"
+"p><p>expires in less than %n days.</p>"
 msgstr ""
 
 #: keyresolver.cpp:815
 msgid ""
-"_n: "
-"<p>Your S/MIME signing certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expires in less than a day.</p>\n"
-"<p>Your S/MIME signing certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expires in less than %n days.</p>"
+"_n: <p>Your S/MIME signing certificate</p><p align=center><b>%1</b> (serial "
+"number %2)</p><p>expires in less than a day.</p>\n"
+"<p>Your S/MIME signing certificate</p><p align=center><b>%1</b> (serial "
+"number %2)</p><p>expires in less than %n days.</p>"
 msgstr ""
 
 #: keyresolver.cpp:820
 msgid ""
-"_n: "
-"<p>Your S/MIME encryption certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expires in less than a day.</p>\n"
-"<p>Your S/MIME encryption certificate</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expires in less than %n days.</p>"
+"_n: <p>Your S/MIME encryption certificate</p><p align=center><b>%1</b> "
+"(serial number %2)</p><p>expires in less than a day.</p>\n"
+"<p>Your S/MIME encryption certificate</p><p align=center><b>%1</b> (serial "
+"number %2)</p><p>expires in less than %n days.</p>"
 msgstr ""
 
 #: keyresolver.cpp:825
 msgid ""
-"_n: "
-"<p>The S/MIME certificate for</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expires in less than a day.</p>\n"
-"<p>The S/MIME certificate for</p><p align=center><b>%1</b> "
-"(serial number %2)</p>"
-"<p>expires in less than %n days.</p>"
+"_n: <p>The S/MIME certificate for</p><p align=center><b>%1</b> (serial "
+"number %2)</p><p>expires in less than a day.</p>\n"
+"<p>The S/MIME certificate for</p><p align=center><b>%1</b> (serial number "
+"%2)</p><p>expires in less than %n days.</p>"
 msgstr ""
 
 #: keyresolver.cpp:832
@@ -4644,9 +4517,10 @@ msgstr ""
 
 #: keyresolver.cpp:867
 msgid ""
-"One or more of your configured OpenPGP encryption keys or S/MIME certificates "
-"is not usable for encryption. Please reconfigure your encryption keys and "
-"certificates for this identity in the identity configuration dialog.\n"
+"One or more of your configured OpenPGP encryption keys or S/MIME "
+"certificates is not usable for encryption. Please reconfigure your "
+"encryption keys and certificates for this identity in the identity "
+"configuration dialog.\n"
 "If you choose to continue, and the keys are needed later on, you will be "
 "prompted to specify the keys to use."
 msgstr ""
@@ -4674,26 +4548,26 @@ msgstr "ยังไม่ได้กำหนดกุญแจการเซ
 msgid ""
 "Examination of recipient's encryption preferences yielded that the message "
 "should be encrypted using OpenPGP, at least for some recipients;\n"
-"however, you have not configured valid trusted OpenPGP encryption keys for this "
-"identity.\n"
-"You may continue without encrypting to yourself, but be aware that you will not "
-"be able to read your own messages if you do so."
+"however, you have not configured valid trusted OpenPGP encryption keys for "
+"this identity.\n"
+"You may continue without encrypting to yourself, but be aware that you will "
+"not be able to read your own messages if you do so."
 msgstr ""
 
 #: keyresolver.cpp:1222
 msgid ""
 "Examination of recipient's encryption preferences yielded that the message "
 "should be encrypted using S/MIME, at least for some recipients;\n"
-"however, you have not configured valid S/MIME encryption certificates for this "
-"identity.\n"
-"You may continue without encrypting to yourself, but be aware that you will not "
-"be able to read your own messages if you do so."
+"however, you have not configured valid S/MIME encryption certificates for "
+"this identity.\n"
+"You may continue without encrypting to yourself, but be aware that you will "
+"not be able to read your own messages if you do so."
 msgstr ""
 
 #: keyresolver.cpp:1252
 msgid ""
-"Examination of recipient's signing preferences yielded that the message should "
-"be signed using OpenPGP, at least for some recipients;\n"
+"Examination of recipient's signing preferences yielded that the message "
+"should be signed using OpenPGP, at least for some recipients;\n"
 "however, you have not configured valid OpenPGP signing certificates for this "
 "identity."
 msgstr ""
@@ -4704,8 +4578,8 @@ msgstr ""
 
 #: keyresolver.cpp:1268
 msgid ""
-"Examination of recipient's signing preferences yielded that the message should "
-"be signed using S/MIME, at least for some recipients;\n"
+"Examination of recipient's signing preferences yielded that the message "
+"should be signed using S/MIME, at least for some recipients;\n"
 "however, you have not configured valid S/MIME signing certificates for this "
 "identity."
 msgstr ""
@@ -4728,8 +4602,8 @@ msgstr "ใช้สำหรับการเซ็น"
 
 #: keyresolver.cpp:1490
 msgid ""
-"You did not select an encryption key for yourself (encrypt to self). You will "
-"not be able to decrypt your own message if you encrypt it."
+"You did not select an encryption key for yourself (encrypt to self). You "
+"will not be able to decrypt your own message if you encrypt it."
 msgstr ""
 
 #: keyresolver.cpp:1494 keyresolver.cpp:1518 keyresolver.cpp:1532
@@ -4750,8 +4624,8 @@ msgstr ""
 
 #: keyresolver.cpp:1514
 msgid ""
-"You did not select an encryption key for any of the recipients of this message; "
-"therefore, the message will not be encrypted."
+"You did not select an encryption key for any of the recipients of this "
+"message; therefore, the message will not be encrypted."
 msgstr ""
 
 #: keyresolver.cpp:1519 messagecomposer.cpp:931
@@ -4789,11 +4663,11 @@ msgstr ""
 msgid ""
 "_: if in your language something like 'certificate(s)' isn't possible please "
 "use the plural in the translation\n"
-"<qt>No valid and trusted encryption certificate was found for \"%1\"."
-"<br/>"
-"<br/>Select the certificate(s) which should be used for this recipient. If "
-"there is no suitable certificate in the list you can also search for external "
-"certificates by clicking the button: search for external certificates.</qt>"
+"<qt>No valid and trusted encryption certificate was found for \"%1\".<br/"
+"><br/>Select the certificate(s) which should be used for this recipient. If "
+"there is no suitable certificate in the list you can also search for "
+"external certificates by clicking the button: search for external "
+"certificates.</qt>"
 msgstr ""
 
 #: keyresolver.cpp:1687
@@ -4838,10 +4712,8 @@ msgid "Critical error: Unable to collect mail: "
 msgstr "ข้อผิดพลาดร้ายแรง: ไม่สามารถเก็บจดหมายไว้ได้ (พื้นที่เต็มหรือเปล่า ?)"
 
 #: kmaccount.cpp:277
-msgid ""
-"Failed to add message:\n"
-msgstr ""
-"ล้มเหลวในการเพิ่มจดหมาย:\n"
+msgid "Failed to add message:\n"
+msgstr "ล้มเหลวในการเพิ่มจดหมาย:\n"
 
 #: kmacctimap.cpp:300
 #, fuzzy, c-format
@@ -4935,6 +4807,50 @@ msgstr ""
 msgid "&Maildir mailbox"
 msgstr "ไดเร็กทอรี กล่องจดหมาย"
 
+#: kmail_options.h:11
+msgid "Set subject of message"
+msgstr "ตั้งชื่อเรื่องจดหมาย"
+
+#: kmail_options.h:13
+msgid "Send CC: to 'address'"
+msgstr "ส่ง สำเนาถึง: ไปยัง 'ที่อยู่'"
+
+#: kmail_options.h:15
+msgid "Send BCC: to 'address'"
+msgstr "ส่ง ซ่อนสำเนาถึง: ไปยัง 'ที่อยู่'"
+
+#: kmail_options.h:17
+msgid "Add 'header' to message"
+msgstr "เพิ่ม 'ส่วนหัว' ไปยังจดหมาย"
+
+#: kmail_options.h:18
+msgid "Read message body from 'file'"
+msgstr "อ่านเนื้อความจดหมายจาก 'แฟ้ม'"
+
+#: kmail_options.h:19
+msgid "Set body of message"
+msgstr "ตั้งค่าเนื้อความจดหมาย"
+
+#: kmail_options.h:20
+msgid "Add an attachment to the mail. This can be repeated"
+msgstr "เพิ่มสิ่งที่แนบมาด้วยไปยังจดหมาย ซึ่งสามารถทำซ้ำได้อีก"
+
+#: kmail_options.h:21
+msgid "Only check for new mail"
+msgstr "ตรวจจดหมายใหม่เท่านั้น"
+
+#: kmail_options.h:22
+msgid "Only open composer window"
+msgstr "เปิดหน้าต่างเขียนจดหมายเท่านั้น"
+
+#: kmail_options.h:23
+msgid "View the given message file"
+msgstr "แสดงแฟ้มจดหมายที่ให้"
+
+#: kmail_options.h:24
+msgid "Send message to 'address' resp. attach the file the 'URL' points to"
+msgstr ""
+
 #: kmailicalifaceimpl.cpp:93 kmfolderdia.cpp:506 newfolderdialog.cpp:130
 msgid "Mail"
 msgstr "จดหมาย"
@@ -4990,9 +4906,9 @@ msgstr ""
 
 #: kmailicalifaceimpl.cpp:1795
 msgid ""
-"<qt>KMail found the following groupware folders in %1 and needs to perform the "
-"following operations: %2"
-"<br>If you do not want this, cancel and the IMAP resource will be disabled"
+"<qt>KMail found the following groupware folders in %1 and needs to perform "
+"the following operations: %2<br>If you do not want this, cancel and the IMAP "
+"resource will be disabled"
 msgstr ""
 
 #: kmailicalifaceimpl.cpp:1802
@@ -5044,11 +4960,11 @@ msgstr ""
 "มีแฟ้ม %1 อยู่แล้ว\n"
 "คุณต้องการแทนที่มันหรือไม่ ?"
 
-#: kmcommands.cpp:643 kmcommands.cpp:966 kmkernel.cpp:2062
+#: kmcommands.cpp:643 kmcommands.cpp:966 kmkernel.cpp:2065
 msgid "Save to File"
 msgstr "บันทึกลงแฟ้ม"
 
-#: kmcommands.cpp:643 kmcommands.cpp:966 kmkernel.cpp:2062
+#: kmcommands.cpp:643 kmcommands.cpp:966 kmkernel.cpp:2065
 msgid "&Replace"
 msgstr "แทนที่"
 
@@ -5066,7 +4982,7 @@ msgstr ""
 msgid "The message was removed while saving it. It has not been saved."
 msgstr ""
 
-#: kmcommands.cpp:965 kmkernel.cpp:2061
+#: kmcommands.cpp:965 kmkernel.cpp:2064
 msgid ""
 "File %1 exists.\n"
 "Do you want to replace it?"
@@ -5087,234 +5003,229 @@ msgstr ""
 msgid "The file contains multiple messages. Only the first message is shown."
 msgstr ""
 
-#: kmcommands.cpp:1404
+#: kmcommands.cpp:1401
 #, fuzzy
 msgid ""
 "\n"
-"This is a MIME digest forward. The content of the message is contained in the "
-"attachment(s).\n"
+"This is a MIME digest forward. The content of the message is contained in "
+"the attachment(s).\n"
 "\n"
 "\n"
 msgstr ""
 "\n"
-"นี่เป็นการส่งต่อ โดยแยกเป็นแบบ MIME ซึ่งเนื้อหาของจดหมายจะถูกบรรจุไว้ใน "
-"ส่ิงที่แนบไปด้วย\n"
+"นี่เป็นการส่งต่อ โดยแยกเป็นแบบ MIME ซึ่งเนื้อหาของจดหมายจะถูกบรรจุไว้ใน ส่ิงที่แนบไปด้วย\n"
 "\n"
 "\n"
 "--\n"
 
-#: kmcommands.cpp:1750 kmheaders.cpp:1445
+#: kmcommands.cpp:1747 kmheaders.cpp:1445
 #, fuzzy
 msgid "Filtering messages"
 msgstr "ลบจดหมาย"
 
-#: kmcommands.cpp:1758 kmheaders.cpp:1453
+#: kmcommands.cpp:1755 kmheaders.cpp:1453
 #, fuzzy
 msgid "Filtering message %1 of %2"
 msgstr "กำลังย้ายจดหมาย %3 ของ %2 จาก %1"
 
-#: kmcommands.cpp:1768
+#: kmcommands.cpp:1765
 #, fuzzy
 msgid "Not enough free disk space?"
 msgstr "พื้นที่บนดิสก์มีไม่เพียงพอ"
 
-#: kmcommands.cpp:1934 kmfoldertree.cpp:1929
+#: kmcommands.cpp:1931 kmfoldertree.cpp:1929
 #, fuzzy
 msgid "Move to This Folder"
 msgstr "ย้ายไปยังโฟลเดอร์นี้"
 
-#: kmcommands.cpp:1936 kmfoldertree.cpp:1931
+#: kmcommands.cpp:1933 kmfoldertree.cpp:1931
 #, fuzzy
 msgid "Copy to This Folder"
 msgstr "สำเนาไปยังโฟลเดอร์นี้"
 
-#: kmcommands.cpp:2012
+#: kmcommands.cpp:2009
 msgid "Corrupt IMAP cache detected in folder %1. Copying of messages aborted."
 msgstr ""
 
-#: kmcommands.cpp:2186
+#: kmcommands.cpp:2183
 #, fuzzy
 msgid "Moving messages"
 msgstr "ย้ายจดหมาย"
 
-#: kmcommands.cpp:2186
+#: kmcommands.cpp:2183
 #, fuzzy
 msgid "Deleting messages"
 msgstr "ลบจดหมาย"
 
-#: kmcommands.cpp:2471
+#: kmcommands.cpp:2468
 msgid "Opening URL..."
 msgstr "กำลังเปิด URL..."
 
-#: kmcommands.cpp:2478
+#: kmcommands.cpp:2475
 #, fuzzy
 msgid "<qt>Do you really want to execute <b>%1</b>?</qt>"
 msgstr "<qt>คุณต้องการลบรายการแสดงตัว <b>\"%1\"</b> จริงหรือไม่ ?</qt>"
 
-#: kmcommands.cpp:2479
+#: kmcommands.cpp:2476
 #, fuzzy
 msgid "Execute"
 msgstr "ประมวลผลคำสั่ง"
 
-#: kmcommands.cpp:2561
+#: kmcommands.cpp:2558
 #, fuzzy
 msgid "Found no attachments to save."
 msgstr "ไม่ให้แสดงสิ่งที่แนบมาด้วยในช่องเนื้อหาจดหมาย"
 
-#: kmcommands.cpp:2574
+#: kmcommands.cpp:2571
 #, fuzzy
 msgid "Save Attachments To"
 msgstr "บันทึกสิ่งที่แนบมาด้วยเป็น"
 
-#: kmcommands.cpp:2594
+#: kmcommands.cpp:2591
 msgid ""
 "_: filename for an unnamed attachment\n"
 "attachment.1"
 msgstr ""
 
-#: kmcommands.cpp:2622
+#: kmcommands.cpp:2619
 msgid ""
 "_: filename for the %1-th unnamed attachment\n"
 "attachment.%1"
 msgstr ""
 
-#: kmcommands.cpp:2661
+#: kmcommands.cpp:2658
 #, fuzzy
 msgid "A file named %1 already exists. Do you want to overwrite it?"
 msgstr "มีแฟ้มชื่อนี้อยู่แล้ว คุณต้องการเขียนทับมันหรือไม่ ?"
 
-#: kmcommands.cpp:2663
+#: kmcommands.cpp:2660
 msgid "File Already Exists"
 msgstr ""
 
-#: kmcommands.cpp:2663 util.h:211
+#: kmcommands.cpp:2660 util.h:211
 msgid "&Overwrite"
 msgstr ""
 
-#: kmcommands.cpp:2685
+#: kmcommands.cpp:2682
 #, fuzzy
 msgid ""
 "The part %1 of the message is encrypted. Do you want to keep the encryption "
 "when saving?"
-msgstr ""
-"ส่วนนี้ของข้อความถูกเข้ารหัสไว้ คุณต้องการรักษาการเข้ารหัสนี้ "
-"เมื่อมีการบันทึกหรือไม่ ?"
+msgstr "ส่วนนี้ของข้อความถูกเข้ารหัสไว้ คุณต้องการรักษาการเข้ารหัสนี้ เมื่อมีการบันทึกหรือไม่ ?"
 
-#: kmcommands.cpp:2687 kmcommands.cpp:2696
+#: kmcommands.cpp:2684 kmcommands.cpp:2693
 msgid "KMail Question"
 msgstr "คำถามของ KMail"
 
-#: kmcommands.cpp:2687
+#: kmcommands.cpp:2684
 #, fuzzy
 msgid "Keep Encryption"
 msgstr "การเข้ารหัส"
 
-#: kmcommands.cpp:2687 kmcommands.cpp:2696
+#: kmcommands.cpp:2684 kmcommands.cpp:2693
 #, fuzzy
 msgid "Do Not Keep"
 msgstr "ไม่เข้ารหัส"
 
-#: kmcommands.cpp:2694
+#: kmcommands.cpp:2691
 #, fuzzy
 msgid ""
 "The part %1 of the message is signed. Do you want to keep the signature when "
 "saving?"
-msgstr ""
-"ส่วนนี้ของจดหมายมีการเซ็นต์ไว้ คุณต้องการรักษาลายเซ็นนี้ไว้ "
-"เมื่อมีการบันทึกหรือไม่ ?"
+msgstr "ส่วนนี้ของจดหมายมีการเซ็นต์ไว้ คุณต้องการรักษาลายเซ็นนี้ไว้ เมื่อมีการบันทึกหรือไม่ ?"
 
-#: kmcommands.cpp:2696
+#: kmcommands.cpp:2693
 #, fuzzy
 msgid "Keep Signature"
 msgstr "ลายเซ็น"
 
-#: kmcommands.cpp:2769
+#: kmcommands.cpp:2766
 msgid ""
 "_: %2 is detailed error description\n"
 "Could not write the file %1:\n"
 "%2"
 msgstr ""
 
-#: kmcommands.cpp:2794
+#: kmcommands.cpp:2791
 #, fuzzy, c-format
 msgid "Could not write the file %1."
 msgstr "ไม่สามารถเขียนไปยังแฟ้มได้"
 
-#: kmcommands.cpp:3018
+#: kmcommands.cpp:3017
 msgid ""
-"There is no Address Book entry for this email address. Add them to the Address "
-"Book and then add instant messaging addresses using your preferred messaging "
-"client."
+"There is no Address Book entry for this email address. Add them to the "
+"Address Book and then add instant messaging addresses using your preferred "
+"messaging client."
 msgstr ""
 
-#: kmcommands.cpp:3021
+#: kmcommands.cpp:3020
 msgid ""
 "More than one Address Book entry uses this email address:\n"
 " %1\n"
 " it is not possible to determine who to chat with."
 msgstr ""
 
-#: kmcommands.cpp:3245 kmcomposewin.cpp:5317 objecttreeparser.cpp:1858
+#: kmcommands.cpp:3244 kmcomposewin.cpp:5316 objecttreeparser.cpp:1858
 msgid ""
-"Chiasmus backend does not offer the \"x-obtain-keys\" function. Please report "
-"this bug."
+"Chiasmus backend does not offer the \"x-obtain-keys\" function. Please "
+"report this bug."
 msgstr ""
 
-#: kmcommands.cpp:3247 kmcommands.cpp:3252 kmcommands.cpp:3261
-#: kmcommands.cpp:3270 kmcommands.cpp:3288 kmcommands.cpp:3299
-#: kmcommands.cpp:3339 kmcomposewin.cpp:5319 kmcomposewin.cpp:5324
-#: kmcomposewin.cpp:5333 messagecomposer.cpp:559 messagecomposer.cpp:567
+#: kmcommands.cpp:3246 kmcommands.cpp:3251 kmcommands.cpp:3260
+#: kmcommands.cpp:3269 kmcommands.cpp:3287 kmcommands.cpp:3298
+#: kmcommands.cpp:3338 kmcomposewin.cpp:5318 kmcomposewin.cpp:5323
+#: kmcomposewin.cpp:5332 messagecomposer.cpp:559 messagecomposer.cpp:567
 #: messagecomposer.cpp:581 objecttreeparser.cpp:1864
 msgid "Chiasmus Backend Error"
 msgstr ""
 
-#: kmcommands.cpp:3258 kmcomposewin.cpp:5330 objecttreeparser.cpp:1870
+#: kmcommands.cpp:3257 kmcomposewin.cpp:5329 objecttreeparser.cpp:1870
 msgid ""
-"Unexpected return value from Chiasmus backend: The \"x-obtain-keys\" function "
-"did not return a string list. Please report this bug."
+"Unexpected return value from Chiasmus backend: The \"x-obtain-keys\" "
+"function did not return a string list. Please report this bug."
 msgstr ""
 
-#: kmcommands.cpp:3267 kmcomposewin.cpp:5339 objecttreeparser.cpp:1878
+#: kmcommands.cpp:3266 kmcomposewin.cpp:5338 objecttreeparser.cpp:1878
 msgid ""
-"No keys have been found. Please check that a valid key path has been set in the "
-"Chiasmus configuration."
+"No keys have been found. Please check that a valid key path has been set in "
+"the Chiasmus configuration."
 msgstr ""
 
-#: kmcommands.cpp:3274 objecttreeparser.cpp:1885
+#: kmcommands.cpp:3273 objecttreeparser.cpp:1885
 #, fuzzy
 msgid "Chiasmus Decryption Key Selection"
 msgstr "ตั้งค่าการเข้ารหัส"
 
-#: kmcommands.cpp:3286 objecttreeparser.cpp:1897
+#: kmcommands.cpp:3285 objecttreeparser.cpp:1897
 msgid ""
-"Chiasmus backend does not offer the \"x-decrypt\" function. Please report this "
-"bug."
+"Chiasmus backend does not offer the \"x-decrypt\" function. Please report "
+"this bug."
 msgstr ""
 
-#: kmcommands.cpp:3297 objecttreeparser.cpp:1905
+#: kmcommands.cpp:3296 objecttreeparser.cpp:1905
 msgid ""
 "The \"x-decrypt\" function does not accept the expected parameters. Please "
 "report this bug."
 msgstr ""
 
-#: kmcommands.cpp:3305 kmcommands.cpp:3331 objecttreeparser.cpp:1911
+#: kmcommands.cpp:3304 kmcommands.cpp:3330 objecttreeparser.cpp:1911
 msgid "Chiasmus Decryption Error"
 msgstr ""
 
-#: kmcommands.cpp:3336 objecttreeparser.cpp:1917
+#: kmcommands.cpp:3335 objecttreeparser.cpp:1917
 msgid ""
-"Unexpected return value from Chiasmus backend: The \"x-decrypt\" function did "
-"not return a byte array. Please report this bug."
+"Unexpected return value from Chiasmus backend: The \"x-decrypt\" function "
+"did not return a byte array. Please report this bug."
 msgstr ""
 
-#: kmcommands.cpp:3581
+#: kmcommands.cpp:3580
 msgid ""
 "From: %1\n"
 "To: %2\n"
 "Subject: %3"
 msgstr ""
 
-#: kmcommands.cpp:3591
+#: kmcommands.cpp:3590
 #, fuzzy, c-format
 msgid "Mail: %1"
 msgstr "จดหมาย"
@@ -5415,7 +5326,7 @@ msgstr "ขนาด"
 msgid "Encoding"
 msgstr "ชุดรหัสอักขระ"
 
-#: kmcomposewin.cpp:406 kmcomposewin.cpp:3327
+#: kmcomposewin.cpp:406 kmcomposewin.cpp:3326
 #, fuzzy
 msgid "Compress"
 msgstr "เขียนจดหมาย"
@@ -5428,7 +5339,7 @@ msgstr "การเข้ารหัส"
 msgid "Sign"
 msgstr "เซ็น"
 
-#: kmcomposewin.cpp:621 kmcomposewin.cpp:3703
+#: kmcomposewin.cpp:621 kmcomposewin.cpp:3702
 #, fuzzy
 msgid "Name of the attachment:"
 msgstr "ลบสิ่งที่แนบมาด้วย"
@@ -5450,7 +5361,8 @@ msgstr "<ผู้รับ>"
 
 #: kmcomposewin.cpp:1043
 msgid ""
-"<qt>The email addresses you put in this field receive a copy of the email.</qt>"
+"<qt>The email addresses you put in this field receive a copy of the email.</"
+"qt>"
 msgstr ""
 
 #: kmcomposewin.cpp:1052
@@ -5461,9 +5373,9 @@ msgstr "ผู้รับไม่ถูกต้อง"
 #: kmcomposewin.cpp:1053
 msgid ""
 "<qt>The email addresses you put in this field receive a copy of the email. "
-"Technically it is the same thing as putting all the addresses in the <b>To:</b> "
-"field but differs in that it usually symbolises the receiver of the Carbon Copy "
-"(CC) is a listener, not the main recipient.</qt>"
+"Technically it is the same thing as putting all the addresses in the <b>To:</"
+"b> field but differs in that it usually symbolises the receiver of the "
+"Carbon Copy (CC) is a listener, not the main recipient.</qt>"
 msgstr ""
 
 #: kmcomposewin.cpp:1067
@@ -5473,9 +5385,8 @@ msgstr "ผู้รับไม่ถูกต้อง"
 
 #: kmcomposewin.cpp:1068
 msgid ""
-"<qt>Essentially the same thing as the <b>Copy To:</b> "
-"field but differs in that all other recipients do not see who receives a blind "
-"copy.</qt>"
+"<qt>Essentially the same thing as the <b>Copy To:</b> field but differs in "
+"that all other recipients do not see who receives a blind copy.</qt>"
 msgstr ""
 
 #: kmcomposewin.cpp:1236 kmcomposewin.cpp:1258
@@ -5486,7 +5397,7 @@ msgstr "ส่งจดหมาย"
 msgid "&Send Mail Via"
 msgstr "ส่งจดหมายผ่านทาง"
 
-#: kmcomposewin.cpp:1243 kmcomposewin.cpp:1252 kmcomposewin.cpp:4459
+#: kmcomposewin.cpp:1243 kmcomposewin.cpp:1252 kmcomposewin.cpp:4458
 #: redirectdialog.cpp:84
 msgid "Send &Later"
 msgstr "ส่งภายหลัง"
@@ -5553,8 +5464,7 @@ msgstr "ลบอักขระอ้างถึง"
 msgid "Cl&ean Spaces"
 msgstr "ล้างช่องว่าง"
 
-#. i18n: file kmail.kcfg line 358
-#: kmcomposewin.cpp:1365 kmreaderwin.cpp:617 rc.cpp:795
+#: kmail.kcfg:358 kmcomposewin.cpp:1365 kmreaderwin.cpp:617
 #, no-c-format
 msgid "Use Fi&xed Font"
 msgstr "ใช้ตัวอักษรความกว้างคงที่"
@@ -5697,31 +5607,31 @@ msgstr ""
 msgid "Select a cryptographic format for this message"
 msgstr ""
 
-#: kmcomposewin.cpp:1558 kmcomposewin.cpp:5159
+#: kmcomposewin.cpp:1558 kmcomposewin.cpp:5158
 msgid "Standard"
 msgstr "มาตรฐาน"
 
-#: kmcomposewin.cpp:1559 kmcomposewin.cpp:5161
+#: kmcomposewin.cpp:1559 kmcomposewin.cpp:5160
 msgid "Bulleted List (Disc)"
 msgstr ""
 
-#: kmcomposewin.cpp:1560 kmcomposewin.cpp:5163
+#: kmcomposewin.cpp:1560 kmcomposewin.cpp:5162
 msgid "Bulleted List (Circle)"
 msgstr ""
 
-#: kmcomposewin.cpp:1561 kmcomposewin.cpp:5165
+#: kmcomposewin.cpp:1561 kmcomposewin.cpp:5164
 msgid "Bulleted List (Square)"
 msgstr ""
 
-#: kmcomposewin.cpp:1562 kmcomposewin.cpp:5167
+#: kmcomposewin.cpp:1562 kmcomposewin.cpp:5166
 msgid "Ordered List (Decimal)"
 msgstr ""
 
-#: kmcomposewin.cpp:1563 kmcomposewin.cpp:5169
+#: kmcomposewin.cpp:1563 kmcomposewin.cpp:5168
 msgid "Ordered List (Alpha lower)"
 msgstr ""
 
-#: kmcomposewin.cpp:1564 kmcomposewin.cpp:5171
+#: kmcomposewin.cpp:1564 kmcomposewin.cpp:5170
 msgid "Ordered List (Alpha upper)"
 msgstr ""
 
@@ -5827,8 +5737,8 @@ msgstr "เครื่องมือเขียนจดหมายใหม
 
 #: kmcomposewin.cpp:2333
 msgid ""
-"The message you have composed seems to refer to an attached file but you have "
-"not attached anything.\n"
+"The message you have composed seems to refer to an attached file but you "
+"have not attached anything.\n"
 "Do you want to attach a file to your message?"
 msgstr ""
 
@@ -5837,43 +5747,45 @@ msgstr ""
 msgid "File Attachment Reminder"
 msgstr "แสดงสิ่งที่แนบมาด้วย: "
 
-#: kmcomposewin.cpp:2338 kmcomposewin.cpp:4481
+#: kmcomposewin.cpp:2338 kmcomposewin.cpp:4480
 #, fuzzy
 msgid "&Send as Is"
 msgstr "ทำการส่ง"
 
 #: kmcomposewin.cpp:2415
 msgid ""
-"<qt>"
-"<p>KMail could not recognize the location of the attachment (%1);</p>"
-"<p>you have to specify the full path if you wish to attach a file.</p></qt>"
+"<qt><p>KMail could not recognize the location of the attachment (%1);</"
+"p><p>you have to specify the full path if you wish to attach a file.</p></qt>"
 msgstr ""
 
 #: kmcomposewin.cpp:2424
 msgid ""
-"<qt>"
-"<p>Your administrator has disallowed attaching files bigger than %1 MB.</p>"
+"<qt><p>Your administrator has disallowed attaching files bigger than %1 MB.</"
+"p>"
 msgstr ""
 
 #: kmcomposewin.cpp:2777
 msgid "Attach File"
 msgstr "แนบแฟ้ม"
 
-#. i18n: file kmcomposerui.rc line 68
-#: kmcomposewin.cpp:2778 rc.cpp:57
+#: kmcomposerui.rc:68 kmcomposewin.cpp:2778
 #, no-c-format
 msgid "&Attach"
 msgstr "แนบ"
 
+#: kmcomposewin.cpp:2958
+#, fuzzy
+msgid "&Insert"
+msgstr "แทรกแฟ้ม"
+
 #: kmcomposewin.cpp:2959
 msgid "Insert File"
 msgstr "แทรกแฟ้ม"
 
 #: kmcomposewin.cpp:3129
 msgid ""
-"<qt>"
-"<p>An error occurred while trying to export the key from the backend:</p>"
-"<p><b>%1</b></p></qt>"
+"<qt><p>An error occurred while trying to export the key from the backend:</"
+"p><p><b>%1</b></p></qt>"
 msgstr ""
 
 #: kmcomposewin.cpp:3133
@@ -5913,287 +5825,297 @@ msgid ""
 "View"
 msgstr "แสดง"
 
+#: kmcomposewin.cpp:3215 kmreaderwin.cpp:2861 vacation.cpp:659
+#, fuzzy
+msgid "Edit"
+msgstr "แก้ไข..."
+
 #: kmcomposewin.cpp:3216
 #, fuzzy
 msgid "Edit With..."
 msgstr "แก้ไข..."
 
+#: kmcomposewin.cpp:3219 kmreaderwin.cpp:2035
+#, fuzzy
+msgid "Save As..."
+msgstr "บันทึกเป็น..."
+
+#: kmcomposewin.cpp:3221 kmmimeparttree.cpp:159 kmreaderwin.cpp:2045
+#, fuzzy
+msgid "Properties"
+msgstr "คุณสมบัติ..."
+
 #: kmcomposewin.cpp:3224
 msgid "Add Attachment..."
 msgstr "เพิ่มสิ่งที่แนบมาด้วย..."
 
-#: kmcomposewin.cpp:3312 kmcomposewin.cpp:3320
+#: kmcomposewin.cpp:3311 kmcomposewin.cpp:3319
 #, fuzzy
 msgid "KMail could not compress the file."
 msgstr "ไม่สามารถเขียนไปยังแฟ้มได้"
 
-#: kmcomposewin.cpp:3326
+#: kmcomposewin.cpp:3325
 msgid ""
 "The compressed file is larger than the original. Do you want to keep the "
 "original one?"
-msgstr ""
-"ส่วนนี้ของจดหมายมีการเซ็นต์ไว้ คุณต้องการคงลายเซ็นนี้ไว้ "
-"เมื่อมีการบันทึกหรือไม่ ?"
+msgstr "ส่วนนี้ของจดหมายมีการเซ็นต์ไว้ คุณต้องการคงลายเซ็นนี้ไว้ เมื่อมีการบันทึกหรือไม่ ?"
 
-#: kmcomposewin.cpp:3327
+#: kmcomposewin.cpp:3326
 msgid "Keep"
 msgstr "คงไว้"
 
-#: kmcomposewin.cpp:3393 kmcomposewin.cpp:3401
+#: kmcomposewin.cpp:3392 kmcomposewin.cpp:3400
 #, fuzzy
 msgid "KMail could not uncompress the file."
 msgstr "ไม่สามารถเขียนไปยังแฟ้มได้"
 
-#: kmcomposewin.cpp:3601
+#: kmcomposewin.cpp:3600
 msgid "Save Attachment As"
 msgstr "บันทึกสิ่งที่แนบมาด้วยเป็น"
 
-#: kmcomposewin.cpp:3856 kmedit.cpp:178
+#: kmcomposewin.cpp:3855 kmedit.cpp:178
 msgid "Add as Text"
 msgstr ""
 
-#: kmcomposewin.cpp:3857 kmedit.cpp:179
+#: kmcomposewin.cpp:3856 kmedit.cpp:179
 #, fuzzy
 msgid "Add as Attachment"
 msgstr "เพิ่มสิ่งที่แนบมาด้วย..."
 
-#: kmcomposewin.cpp:3858
+#: kmcomposewin.cpp:3857
 msgid ""
-"Please select whether you want to insert the content as text into the editor, "
-"or append the referenced file as an attachment."
+"Please select whether you want to insert the content as text into the "
+"editor, or append the referenced file as an attachment."
 msgstr ""
 
-#: kmcomposewin.cpp:3860
+#: kmcomposewin.cpp:3859
 #, fuzzy
 msgid "Paste as text or attachment?"
 msgstr "วางเป็นสิ่งที่แนบมาด้วย"
 
-#: kmcomposewin.cpp:3935 kmfilterdlg.cpp:717 kmfolderdia.cpp:331
+#: kmcomposewin.cpp:3934 kmfilterdlg.cpp:717 kmfolderdia.cpp:331
 #: kmfolderdia.cpp:710 kmfoldertree.cpp:1641 managesievescriptsdialog.cpp:302
 msgid "unnamed"
 msgstr "ยังไม่มีชื่อ"
 
-#: kmcomposewin.cpp:3961
+#: kmcomposewin.cpp:3960
 msgid ""
-"<qt>"
-"<p>You have requested that messages be encrypted to yourself, but the currently "
-"selected identity does not define an (OpenPGP or S/MIME) encryption key to use "
-"for this.</p>"
-"<p>Please select the key(s) to use in the identity configuration.</p></qt>"
+"<qt><p>You have requested that messages be encrypted to yourself, but the "
+"currently selected identity does not define an (OpenPGP or S/MIME) "
+"encryption key to use for this.</p><p>Please select the key(s) to use in the "
+"identity configuration.</p></qt>"
 msgstr ""
 
-#: kmcomposewin.cpp:3968
+#: kmcomposewin.cpp:3967
 msgid "Undefined Encryption Key"
 msgstr "กุญแจการเข้ารหัสยังไม่มีการนิยาม"
 
-#: kmcomposewin.cpp:4015
+#: kmcomposewin.cpp:4014
 msgid ""
-"<qt>"
-"<p>In order to be able to sign this message you first have to define the "
-"(OpenPGP or S/MIME) signing key to use.</p>"
-"<p>Please select the key to use in the identity configuration.</p></qt>"
+"<qt><p>In order to be able to sign this message you first have to define the "
+"(OpenPGP or S/MIME) signing key to use.</p><p>Please select the key to use "
+"in the identity configuration.</p></qt>"
 msgstr ""
 
-#: kmcomposewin.cpp:4022
+#: kmcomposewin.cpp:4021
 msgid "Undefined Signing Key"
 msgstr "ยังไม่ได้กำหนดกุญแจการเซ็น"
 
-#: kmcomposewin.cpp:4129
+#: kmcomposewin.cpp:4128
 msgid ""
 "KMail is currently in offline mode,your messages will be kept in the outbox "
 "until you go online."
 msgstr ""
 
-#: kmcomposewin.cpp:4131 kmkernel.cpp:1297
+#: kmcomposewin.cpp:4130 kmkernel.cpp:1300
 msgid "Online/Offline"
 msgstr "ออนไลน์/ออฟไลน์"
 
-#: kmcomposewin.cpp:4146
+#: kmcomposewin.cpp:4145
 msgid ""
-"You must enter your email address in the From: field. You should also set your "
-"email address for all identities, so that you do not have to enter it for each "
-"message."
+"You must enter your email address in the From: field. You should also set "
+"your email address for all identities, so that you do not have to enter it "
+"for each message."
 msgstr ""
 
-#: kmcomposewin.cpp:4157
+#: kmcomposewin.cpp:4156
 #, fuzzy
 msgid ""
-"You must specify at least one receiver,either in the To: field or as CC or as "
-"BCC."
+"You must specify at least one receiver,either in the To: field or as CC or "
+"as BCC."
 msgstr "คุณต้องระบุผู้รับอย่างน้อยหนึ่งตัวในช่อง ถึง:"
 
-#: kmcomposewin.cpp:4165
+#: kmcomposewin.cpp:4164
 #, fuzzy
 msgid "To field is missing.Send message anyway?"
 msgstr "คุณยังไม่ได้ระบุชื่อเรื่อง ทำการส่งหรือไม่ ?"
 
-#: kmcomposewin.cpp:4167
+#: kmcomposewin.cpp:4166
 #, fuzzy
 msgid "No To: specified"
 msgstr "ไม่ยังได้กำหนดชื่อเรื่อง"
 
-#: kmcomposewin.cpp:4192
+#: kmcomposewin.cpp:4191
 msgid "You did not specify a subject. Send message anyway?"
 msgstr "คุณยังไม่ได้ระบุชื่อเรื่อง ทำการส่งหรือไม่ ?"
 
-#: kmcomposewin.cpp:4194
+#: kmcomposewin.cpp:4193
 msgid "No Subject Specified"
 msgstr "ไม่ยังได้กำหนดชื่อเรื่อง"
 
-#: kmcomposewin.cpp:4195
+#: kmcomposewin.cpp:4194
 #, fuzzy
 msgid "S&end as Is"
 msgstr "ทำการส่ง"
 
-#: kmcomposewin.cpp:4196
+#: kmcomposewin.cpp:4195
 #, fuzzy
 msgid "&Specify the Subject"
 msgstr "ไม่ ให้กำหนดชื่อเรื่องก่อน"
 
-#: kmcomposewin.cpp:4234
+#: kmcomposewin.cpp:4233
 msgid "&Keep markup, do not sign/encrypt"
 msgstr ""
 
-#: kmcomposewin.cpp:4235
+#: kmcomposewin.cpp:4234
 msgid "&Keep markup, do not encrypt"
 msgstr ""
 
-#: kmcomposewin.cpp:4236
+#: kmcomposewin.cpp:4235
 msgid "&Keep markup, do not sign"
 msgstr ""
 
-#: kmcomposewin.cpp:4238
+#: kmcomposewin.cpp:4237
 #, fuzzy
 msgid "Sign/Encrypt (delete markup)"
 msgstr "ลายเซ็น/การเข้ารหัส"
 
-#: kmcomposewin.cpp:4239
+#: kmcomposewin.cpp:4238
 msgid "Encrypt (delete markup)"
 msgstr ""
 
-#: kmcomposewin.cpp:4240
+#: kmcomposewin.cpp:4239
 msgid "Sign (delete markup)"
 msgstr ""
 
-#: kmcomposewin.cpp:4242
+#: kmcomposewin.cpp:4241
 msgid ""
-"<qt>"
-"<p>Inline signing/encrypting of HTML messages is not possible;</p>"
-"<p>do you want to delete your markup?</p></qt>"
+"<qt><p>Inline signing/encrypting of HTML messages is not possible;</p><p>do "
+"you want to delete your markup?</p></qt>"
 msgstr ""
 
-#: kmcomposewin.cpp:4244
+#: kmcomposewin.cpp:4243
 #, fuzzy
 msgid "Sign/Encrypt Message?"
 msgstr "เข้ารหัสจดหมายหรือไม่ ?"
 
-#: kmcomposewin.cpp:4293
+#: kmcomposewin.cpp:4292
 msgid ""
 "The custom drafts or templates folder for identify \"%1\" does not exist "
 "(anymore); therefore, the default drafts or templates folder will be used."
 msgstr ""
 
-#: kmcomposewin.cpp:4393 kmsender.cpp:114
+#: kmcomposewin.cpp:4392 kmsender.cpp:114
 msgid "Please create an account for sending and try again."
 msgstr "โปรดสร้างบัญชีผู้ใช้งานสำหรับการส่ง แล้วลองใหม่อีกครั้ง"
 
-#: kmcomposewin.cpp:4456
+#: kmcomposewin.cpp:4455
 msgid "About to send email..."
 msgstr "เกี่ยวกับการส่งจดหมาย..."
 
-#: kmcomposewin.cpp:4457
+#: kmcomposewin.cpp:4456
 msgid "Send Confirmation"
 msgstr "ยืนยันการส่ง"
 
-#: kmcomposewin.cpp:4458 redirectdialog.cpp:83
+#: kmcomposewin.cpp:4457 redirectdialog.cpp:83
 msgid "&Send Now"
 msgstr "ส่งเดี๋ยวนี้"
 
-#: kmcomposewin.cpp:4479
+#: kmcomposewin.cpp:4478
 msgid ""
 "You are trying to send the mail to more than %1 recipients. Send message "
 "anyway?"
 msgstr ""
 
-#: kmcomposewin.cpp:4480
+#: kmcomposewin.cpp:4479
 #, fuzzy
 msgid "Too many receipients"
 msgstr "ไม่มีผู้รับ"
 
-#: kmcomposewin.cpp:4482
+#: kmcomposewin.cpp:4481
 #, fuzzy
 msgid "&Edit Recipients"
 msgstr "ผู้รับไม่ถูกต้อง"
 
-#: kmcomposewin.cpp:4728
+#: kmcomposewin.cpp:4727
 #, fuzzy
 msgid "Spellcheck: on"
 msgstr "เครื่องมือตรวจคำสะกด"
 
-#: kmcomposewin.cpp:4730
+#: kmcomposewin.cpp:4729
 #, fuzzy
 msgid "Spellcheck: off"
 msgstr "เครื่องมือตรวจคำสะกด"
 
-#: kmcomposewin.cpp:4787
+#: kmcomposewin.cpp:4786
 msgid " Spell check canceled."
 msgstr " การตรวจคำสะกดถูกยกเลิก"
 
-#: kmcomposewin.cpp:4790
+#: kmcomposewin.cpp:4789
 msgid " Spell check stopped."
 msgstr " หยุดตรวจคำสะกดแล้ว"
 
-#: kmcomposewin.cpp:4793
+#: kmcomposewin.cpp:4792
 msgid " Spell check complete."
 msgstr " ตรวจคำสะกดเรียบร้อยแล้ว"
 
-#: kmcomposewin.cpp:4992 kmcomposewin.cpp:5000
+#: kmcomposewin.cpp:4991 kmcomposewin.cpp:4999
 msgid "Spellchecker"
 msgstr "เครื่องมือตรวจคำสะกด"
 
-#: kmcomposewin.cpp:5304
+#: kmcomposewin.cpp:5303
 msgid ""
 "Please configure a Crypto Backend to use for Chiasmus encryption first.\n"
-"You can do this in the Crypto Backends tab of the configure dialog's Security "
-"page."
+"You can do this in the Crypto Backends tab of the configure dialog's "
+"Security page."
 msgstr ""
 
-#: kmcomposewin.cpp:5308
+#: kmcomposewin.cpp:5307
 msgid ""
 "It looks as though libkleopatra was compiled without Chiasmus support. You "
 "might want to recompile libkleopatra with --enable-chiasmus."
 msgstr ""
 
-#: kmcomposewin.cpp:5311
+#: kmcomposewin.cpp:5310
 msgid "No Chiasmus Backend Configured"
 msgstr ""
 
-#: kmcomposewin.cpp:5342
+#: kmcomposewin.cpp:5341
 #, fuzzy
 msgid "No Chiasmus Keys Found"
 msgstr "ไม่พบลายเซ็น"
 
-#: kmcomposewin.cpp:5346
+#: kmcomposewin.cpp:5345
 #, fuzzy
 msgid "Chiasmus Encryption Key Selection"
 msgstr "ตั้งค่าการเข้ารหัส"
 
-#: kmcomposewin.cpp:5378
+#: kmcomposewin.cpp:5377
 #, fuzzy
 msgid "Message will be signed"
 msgstr "จดหมายถูกเซ็นกำกับโดย %1"
 
-#: kmcomposewin.cpp:5378
+#: kmcomposewin.cpp:5377
 #, fuzzy
 msgid "Message will not be signed"
 msgstr "จดหมายถูกเซ็นกำกับโดย %1"
 
-#: kmcomposewin.cpp:5379
+#: kmcomposewin.cpp:5378
 #, fuzzy
 msgid "Message will be encrypted"
 msgstr "จดหมายแบบ OpenPGP - มีการเข้ารหัสไว้"
 
-#: kmcomposewin.cpp:5379
+#: kmcomposewin.cpp:5378
 #, fuzzy
 msgid "Message will not be encrypted"
 msgstr "จดหมายที่มีชื่อเรื่อง: "
@@ -6241,8 +6163,8 @@ msgstr "ตรวจคำสะกด - KMail"
 
 #: kmedit.cpp:884
 msgid ""
-"ISpell/Aspell could not be started. Please make sure you have ISpell or Aspell "
-"properly configured and in your PATH."
+"ISpell/Aspell could not be started. Please make sure you have ISpell or "
+"Aspell properly configured and in your PATH."
 msgstr ""
 "ไม่สามารถเริ่มการทำงาน ISpell ได้\n"
 " โปรดตรวจสอบว่า คุณได้ตั้งค่าพาธไปยัง ISpell ถูกต้องแล้ว"
@@ -6281,9 +6203,8 @@ msgstr "มีการกระทำเมื่อกรองมากเก
 #: kmfilter.cpp:289
 #, fuzzy
 msgid ""
-"<qt>Unknown filter action <b>%1</b>"
-"<br>in filter rule <b>%2</b>."
-"<br>Ignoring it.</qt>"
+"<qt>Unknown filter action <b>%1</b><br>in filter rule <b>%2</b>.<br>Ignoring "
+"it.</qt>"
 msgstr ""
 "ไม่รู้จักการกระทำเมื่อกรอง `%1'\n"
 " ในกฎการกรอง `%2'\n"
@@ -6527,165 +6448,128 @@ msgstr ""
 
 #: kmfilterdlg.cpp:55
 msgid ""
-"<qt>"
-"<p>This is the list of defined filters. They are processed top-to-bottom.</p>"
-"<p>Click on any filter to edit it using the controls in the right-hand half of "
-"the dialog.</p></qt>"
+"<qt><p>This is the list of defined filters. They are processed top-to-bottom."
+"</p><p>Click on any filter to edit it using the controls in the right-hand "
+"half of the dialog.</p></qt>"
 msgstr ""
-"<qt>"
-"<p>นี่เป็นรายการของตัวกรองที่กำหนดไว้ ซึ่งจะถูกประมวลผล 'จากบนลงล่าง'</p>"
-"<p>คลิ้กที่ตัวกรองตัวใดตัวหนึ่ง เพื่อแก้ไขมัน โดยใช้ การควบคุม "
-"ที่อยู่ทางด้านขวาของไดอะล็อกซ์</p></qt>"
+"<qt><p>นี่เป็นรายการของตัวกรองที่กำหนดไว้ ซึ่งจะถูกประมวลผล 'จากบนลงล่าง'</"
+"p><p>คลิ้กที่ตัวกรองตัวใดตัวหนึ่ง เพื่อแก้ไขมัน โดยใช้ การควบคุม ที่อยู่ทางด้านขวาของไดอะล็อกซ์</"
+"p></qt>"
 
 #: kmfilterdlg.cpp:61
 #, fuzzy
 msgid ""
-"<qt>"
-"<p>Click this button to create a new filter.</p>"
-"<p>The filter will be inserted just before the currently-selected one, but you "
-"can always change that later on.</p>"
-"<p>If you have clicked this button accidentally, you can undo this by clicking "
-"on the <em>Delete</em> button.</p></qt>"
+"<qt><p>Click this button to create a new filter.</p><p>The filter will be "
+"inserted just before the currently-selected one, but you can always change "
+"that later on.</p><p>If you have clicked this button accidentally, you can "
+"undo this by clicking on the <em>Delete</em> button.</p></qt>"
 msgstr ""
-"<qt>"
-"<p>คลิ้กที่ปุ่มนี้ เพื่อสร้างตัวกรองใหม่</p>"
-"<p>โดยมันจะแทรก ตัวที่เลือกไว้ในปัจจุบัน แต่คุณก็สามารถเปลี่ยนมันได้ในภายหลัง "
-"</p>"
-"<p>หากคุณเผลอกดปุ่มนี้ คุณสามารถยกเลิกได้ โดยกดที่ปุ่ม <em>ลบ</em> "
-"(ซึ่งอยู่ด้านขวา)</p></qt>"
+"<qt><p>คลิ้กที่ปุ่มนี้ เพื่อสร้างตัวกรองใหม่</p><p>โดยมันจะแทรก ตัวที่เลือกไว้ในปัจจุบัน "
+"แต่คุณก็สามารถเปลี่ยนมันได้ในภายหลัง </p><p>หากคุณเผลอกดปุ่มนี้ คุณสามารถยกเลิกได้ โดยกดที่ปุ่ม "
+"<em>ลบ</em> (ซึ่งอยู่ด้านขวา)</p></qt>"
 
 #: kmfilterdlg.cpp:68
 #, fuzzy
 msgid ""
-"<qt>"
-"<p>Click this button to copy a filter.</p>"
-"<p>If you have clicked this button accidentally, you can undo this by clicking "
-"on the <em>Delete</em> button.</p></qt>"
+"<qt><p>Click this button to copy a filter.</p><p>If you have clicked this "
+"button accidentally, you can undo this by clicking on the <em>Delete</em> "
+"button.</p></qt>"
 msgstr ""
-"<qt>"
-"<p>คลิ้กที่ปุ่มนี้ เพื่อสร้างตัวกรองใหม่</p>"
-"<p>โดยมันจะแทรก ตัวที่เลือกไว้ในปัจจุบัน แต่คุณก็สามารถเปลี่ยนมันได้ในภายหลัง "
-"</p>"
-"<p>หากคุณเผลอกดปุ่มนี้ คุณสามารถยกเลิกได้ โดยกดที่ปุ่ม <em>ลบ</em> "
-"(ซึ่งอยู่ด้านขวา)</p></qt>"
+"<qt><p>คลิ้กที่ปุ่มนี้ เพื่อสร้างตัวกรองใหม่</p><p>โดยมันจะแทรก ตัวที่เลือกไว้ในปัจจุบัน "
+"แต่คุณก็สามารถเปลี่ยนมันได้ในภายหลัง </p><p>หากคุณเผลอกดปุ่มนี้ คุณสามารถยกเลิกได้ โดยกดที่ปุ่ม "
+"<em>ลบ</em> (ซึ่งอยู่ด้านขวา)</p></qt>"
 
 #: kmfilterdlg.cpp:72
 #, fuzzy
 msgid ""
-"<qt>"
-"<p>Click this button to <em>delete</em> the currently-selected filter from the "
-"list above.</p>"
-"<p>There is no way to get the filter back once it is deleted, but you can "
-"always leave the dialog by clicking <em>Cancel</em> to discard the changes "
-"made.</p></qt>"
+"<qt><p>Click this button to <em>delete</em> the currently-selected filter "
+"from the list above.</p><p>There is no way to get the filter back once it is "
+"deleted, but you can always leave the dialog by clicking <em>Cancel</em> to "
+"discard the changes made.</p></qt>"
 msgstr ""
-"<qt>"
-"<p>คลิ้กปุ่มนี้ เพื่อ <em>ลบ</em> ตัวกรองที่เลือกไว้ จากรายการด้านบน</p>"
-"<p>ซึ่งหากมันถูกลบแล้ว ก็จะไม่สามารถเรียกมันกลับมาได้ "
-"แต่คุณก็สามารถจะออกจากกล่องโต้ตอบนี้ได้ โดย <em>ยกเลิก</em> "
-"เพื่อละทิ้งการเปลี่ยนแปลงที่ทำไว้</p></qt>"
+"<qt><p>คลิ้กปุ่มนี้ เพื่อ <em>ลบ</em> ตัวกรองที่เลือกไว้ จากรายการด้านบน</"
+"p><p>ซึ่งหากมันถูกลบแล้ว ก็จะไม่สามารถเรียกมันกลับมาได้ แต่คุณก็สามารถจะออกจากกล่องโต้ตอบนี้ได้ "
+"โดย <em>ยกเลิก</em> เพื่อละทิ้งการเปลี่ยนแปลงที่ทำไว้</p></qt>"
 
 #: kmfilterdlg.cpp:79
 #, fuzzy
 msgid ""
-"<qt>"
-"<p>Click this button to move the currently-selected filter to the <em>top</em> "
-"of the list above.</p>"
-"<p>This is useful since the order of the filters in the list determines the "
-"order in which they are tried on messages: The topmost filter gets tried "
-"first.</p></qt>"
+"<qt><p>Click this button to move the currently-selected filter to the "
+"<em>top</em> of the list above.</p><p>This is useful since the order of the "
+"filters in the list determines the order in which they are tried on "
+"messages: The topmost filter gets tried first.</p></qt>"
 msgstr ""
-"<qt>"
-"<p>คลิ้กปุ่มนี้ เพื่อให้รายการตัวกรองที่เลือกไว้ <em>เลื่อนขึ้น</em> "
-"ไปหนึ่งระดับในรายการด้านบน</p>"
-"<p>ใช้เพื่อจัดลำดับตัวกรองในรายการ ในการเลือกลำดับของการจัดการข้อความที่ได้รับ: "
-"ตัวกรองบนสุด จะถูกเรียกใช้ก่อน</p>"
-"<p>หากคุณเผลอกดที่ปุ่มนี้ คุณสามารถเรียกคืนได้ โดยคลิ้กที่ปุ่ม <em>เลื่อนลง</em> "
+"<qt><p>คลิ้กปุ่มนี้ เพื่อให้รายการตัวกรองที่เลือกไว้ <em>เลื่อนขึ้น</em> "
+"ไปหนึ่งระดับในรายการด้านบน</p><p>ใช้เพื่อจัดลำดับตัวกรองในรายการ "
+"ในการเลือกลำดับของการจัดการข้อความที่ได้รับ: ตัวกรองบนสุด จะถูกเรียกใช้ก่อน</"
+"p><p>หากคุณเผลอกดที่ปุ่มนี้ คุณสามารถเรียกคืนได้ โดยคลิ้กที่ปุ่ม <em>เลื่อนลง</em> "
 "(อยู่ทางด้านขวา)</p></qt>"
 
 #: kmfilterdlg.cpp:85
 #, fuzzy
 msgid ""
-"<qt>"
-"<p>Click this button to move the currently-selected filter <em>up</em> "
-"one in the list above.</p>"
-"<p>This is useful since the order of the filters in the list determines the "
-"order in which they are tried on messages: The topmost filter gets tried "
-"first.</p>"
-"<p>If you have clicked this button accidentally, you can undo this by clicking "
-"on the <em>Down</em> button.</p></qt>"
-msgstr ""
-"<qt>"
-"<p>คลิ้กปุ่มนี้ เพื่อให้รายการตัวกรองที่เลือกไว้ <em>เลื่อนขึ้น</em> "
-"ไปหนึ่งระดับในรายการด้านบน</p>"
-"<p>ใช้เพื่อจัดลำดับตัวกรองในรายการ ในการเลือกลำดับของการจัดการข้อความที่ได้รับ: "
-"ตัวกรองบนสุด จะถูกเรียกใช้ก่อน</p>"
-"<p>หากคุณเผลอกดที่ปุ่มนี้ คุณสามารถเรียกคืนได้ โดยคลิ้กที่ปุ่ม <em>เลื่อนลง</em> "
+"<qt><p>Click this button to move the currently-selected filter <em>up</em> "
+"one in the list above.</p><p>This is useful since the order of the filters "
+"in the list determines the order in which they are tried on messages: The "
+"topmost filter gets tried first.</p><p>If you have clicked this button "
+"accidentally, you can undo this by clicking on the <em>Down</em> button.</"
+"p></qt>"
+msgstr ""
+"<qt><p>คลิ้กปุ่มนี้ เพื่อให้รายการตัวกรองที่เลือกไว้ <em>เลื่อนขึ้น</em> "
+"ไปหนึ่งระดับในรายการด้านบน</p><p>ใช้เพื่อจัดลำดับตัวกรองในรายการ "
+"ในการเลือกลำดับของการจัดการข้อความที่ได้รับ: ตัวกรองบนสุด จะถูกเรียกใช้ก่อน</"
+"p><p>หากคุณเผลอกดที่ปุ่มนี้ คุณสามารถเรียกคืนได้ โดยคลิ้กที่ปุ่ม <em>เลื่อนลง</em> "
 "(อยู่ทางด้านขวา)</p></qt>"
 
 #: kmfilterdlg.cpp:93
 #, fuzzy
 msgid ""
-"<qt>"
-"<p>Click this button to move the currently-selected filter <em>down</em> "
-"one in the list above.</p>"
-"<p>This is useful since the order of the filters in the list determines the "
-"order in which they are tried on messages: The topmost filter gets tried "
-"first.</p>"
-"<p>If you have clicked this button accidentally, you can undo this by clicking "
-"on the <em>Up</em> button.</p></qt>"
+"<qt><p>Click this button to move the currently-selected filter <em>down</em> "
+"one in the list above.</p><p>This is useful since the order of the filters "
+"in the list determines the order in which they are tried on messages: The "
+"topmost filter gets tried first.</p><p>If you have clicked this button "
+"accidentally, you can undo this by clicking on the <em>Up</em> button.</p></"
+"qt>"
 msgstr ""
-"<qt>"
-"<p>คลิ้กปุ่มนี้ เพื่อให้รายการตัวกรองที่เลือกไว้ <em>เลื่อนลง</em> "
-"หนึ่งระดับในรายการด้านบน</p>"
-"<p>ใช้เพื่อจัดลำดับตัวกรองในรายการ ในการเลือกลำดับของการจัดการข้อความที่ได้รับ: "
-"ตัวกรองบนสุด จะถูกเรียกใช้ก่อน</p>"
-"<p>หากคุณเผลอกดที่ปุ่มนี้ คุณสามารถเรียกคืนได้ โดยคลิ้กที่ปุ่ม <em>"
-"เลื่อนขึ้น</em> (อยู่ทางด้านซ้าย)</p></qt>"
+"<qt><p>คลิ้กปุ่มนี้ เพื่อให้รายการตัวกรองที่เลือกไว้ <em>เลื่อนลง</em> หนึ่งระดับในรายการด้านบน</"
+"p><p>ใช้เพื่อจัดลำดับตัวกรองในรายการ ในการเลือกลำดับของการจัดการข้อความที่ได้รับ: "
+"ตัวกรองบนสุด จะถูกเรียกใช้ก่อน</p><p>หากคุณเผลอกดที่ปุ่มนี้ คุณสามารถเรียกคืนได้ โดยคลิ้กที่ปุ่ม "
+"<em>เลื่อนขึ้น</em> (อยู่ทางด้านซ้าย)</p></qt>"
 
 #: kmfilterdlg.cpp:101
 #, fuzzy
 msgid ""
-"<qt>"
-"<p>Click this button to move the currently-selected filter to the <em>"
-"bottom</em> of the list above.</p>"
-"<p>This is useful since the order of the filters in the list determines the "
-"order in which they are tried on messages: The topmost filter gets tried "
-"first.</p></qt>"
+"<qt><p>Click this button to move the currently-selected filter to the "
+"<em>bottom</em> of the list above.</p><p>This is useful since the order of "
+"the filters in the list determines the order in which they are tried on "
+"messages: The topmost filter gets tried first.</p></qt>"
 msgstr ""
-"<qt>"
-"<p>คลิ้กปุ่มนี้ เพื่อให้รายการตัวกรองที่เลือกไว้ <em>เลื่อนลง</em> "
-"หนึ่งระดับในรายการด้านบน</p>"
-"<p>ใช้เพื่อจัดลำดับตัวกรองในรายการ ในการเลือกลำดับของการจัดการข้อความที่ได้รับ: "
-"ตัวกรองบนสุด จะถูกเรียกใช้ก่อน</p>"
-"<p>หากคุณเผลอกดที่ปุ่มนี้ คุณสามารถเรียกคืนได้ โดยคลิ้กที่ปุ่ม <em>"
-"เลื่อนขึ้น</em> (อยู่ทางด้านซ้าย)</p></qt>"
+"<qt><p>คลิ้กปุ่มนี้ เพื่อให้รายการตัวกรองที่เลือกไว้ <em>เลื่อนลง</em> หนึ่งระดับในรายการด้านบน</"
+"p><p>ใช้เพื่อจัดลำดับตัวกรองในรายการ ในการเลือกลำดับของการจัดการข้อความที่ได้รับ: "
+"ตัวกรองบนสุด จะถูกเรียกใช้ก่อน</p><p>หากคุณเผลอกดที่ปุ่มนี้ คุณสามารถเรียกคืนได้ โดยคลิ้กที่ปุ่ม "
+"<em>เลื่อนขึ้น</em> (อยู่ทางด้านซ้าย)</p></qt>"
 
 #: kmfilterdlg.cpp:107
 #, fuzzy
 msgid ""
-"<qt>"
-"<p>Click this button to rename the currently-selected filter.</p>"
-"<p>Filters are named automatically, as long as they start with \"&lt;\".</p>"
-"<p>If you have renamed a filter accidentally and want automatic naming back, "
-"click this button and select <em>Clear</em> followed by <em>OK</em> "
-"in the appearing dialog.</p></qt>"
+"<qt><p>Click this button to rename the currently-selected filter.</"
+"p><p>Filters are named automatically, as long as they start with \"&lt;\".</"
+"p><p>If you have renamed a filter accidentally and want automatic naming "
+"back, click this button and select <em>Clear</em> followed by <em>OK</em> in "
+"the appearing dialog.</p></qt>"
 msgstr ""
-"<qt>"
-"<p>คลิ้กที่ปุ่มนี้ เพื่อเปลี่ยนชื่อตัวกรองที่เลือกไว้ในปัจจุบัน </p>"
-"<p>ปกติแล้ว ตัวกรองจะถูกกำหนดชื่อโดยอัตโนมัติ หากมันเริ่มด้วย \"<<\"</p>"
-"<p>หากคุณเผลอเปลี่ยนชื่อมัน คุณสามารถกลับไปให้มัน ใช้ชื่ออัตโนมัติได้ "
-"โดยคลิ้กที่ปุ่มนี้ แล้วเลือก <em>ล้าง</em> จากนั้นกด <em>ตกลง</em> "
-"ในกล่องโต้ตอบที่ปรากฎ</p></qt>"
+"<qt><p>คลิ้กที่ปุ่มนี้ เพื่อเปลี่ยนชื่อตัวกรองที่เลือกไว้ในปัจจุบัน </p><p>ปกติแล้ว "
+"ตัวกรองจะถูกกำหนดชื่อโดยอัตโนมัติ หากมันเริ่มด้วย \"<<\"</p><p>หากคุณเผลอเปลี่ยนชื่อมัน "
+"คุณสามารถกลับไปให้มัน ใช้ชื่ออัตโนมัติได้ โดยคลิ้กที่ปุ่มนี้ แล้วเลือก <em>ล้าง</em> จากนั้นกด "
+"<em>ตกลง</em> ในกล่องโต้ตอบที่ปรากฎ</p></qt>"
 
 #: kmfilterdlg.cpp:114
 msgid ""
-"<qt>"
-"<p>Check this button to force the confirmation dialog to be displayed.</p>"
-"<p>This is useful if you have defined a ruleset that tags messages to be "
+"<qt><p>Check this button to force the confirmation dialog to be displayed.</"
+"p><p>This is useful if you have defined a ruleset that tags messages to be "
 "downloaded later. Without the possibility to force the dialog popup, these "
-"messages could never be downloaded if no other large messages were waiting on "
-"the server, or if you wanted to change the ruleset to tag the messages "
+"messages could never be downloaded if no other large messages were waiting "
+"on the server, or if you wanted to change the ruleset to tag the messages "
 "differently.</p></qt>"
 msgstr ""
 
@@ -6697,6 +6581,16 @@ msgstr "กฎการกรอง POP3"
 msgid "Filter Rules"
 msgstr "กฎการกรอง"
 
+#: kmfilterdlg.cpp:140
+#, fuzzy
+msgid "Import"
+msgstr "นำเข้า"
+
+#: kmfilterdlg.cpp:141
+#, fuzzy
+msgid "Export"
+msgstr "นำเข้า"
+
 #: kmfilterdlg.cpp:155
 msgid "Available Filters"
 msgstr "การกรองที่มี"
@@ -6781,6 +6675,11 @@ msgstr "ทำการเพิ่มตัวกรองนี้ไปยั
 msgid "Icon for this filter:"
 msgstr "ภาพไอคอนสำหรับตัวกรองนี้:"
 
+#: kmfilterdlg.cpp:611
+#, fuzzy
+msgid "Top"
+msgstr "ถึง"
+
 #: kmfilterdlg.cpp:612
 msgid "Up"
 msgstr "เลื่อนขึ้น"
@@ -6789,16 +6688,29 @@ msgstr "เลื่อนขึ้น"
 msgid "Down"
 msgstr "เลื่อนลง"
 
+#: kmfilterdlg.cpp:614
+msgid "Bottom"
+msgstr ""
+
 #: kmfilterdlg.cpp:632
 msgid "Rename..."
 msgstr "เปลี่ยนชื่อ..."
 
-#. i18n: file kmail_part.rc line 10
-#: kmfilterdlg.cpp:633 kmsearchpattern.h:219 rc.cpp:6 rc.cpp:72
+#: kmail_part.rc:10 kmfilterdlg.cpp:633 kmmainwin.rc:10 kmsearchpattern.h:219
 #, no-c-format
 msgid "New"
 msgstr "ใหม่"
 
+#: kmfilterdlg.cpp:634 kmmimeparttree.cpp:150 kmreaderwin.cpp:2036
+#, fuzzy
+msgid "Copy"
+msgstr "ทำสำเนาไปยัง"
+
+#: kmfilterdlg.cpp:635
+#, fuzzy
+msgid "Delete"
+msgstr "ลบ"
+
 #: kmfilterdlg.cpp:645
 #, fuzzy
 msgid "Select Source Folders"
@@ -6807,8 +6719,8 @@ msgstr "เลือกปุ่มพิมพ์ลัดสำหรับโ
 #: kmfilterdlg.cpp:756
 msgid ""
 "At least one filter targets a folder on an online IMAP account. Such filters "
-"will only be applied when manually filtering and when filtering incoming online "
-"IMAP mail."
+"will only be applied when manually filtering and when filtering incoming "
+"online IMAP mail."
 msgstr ""
 
 #: kmfilterdlg.cpp:786
@@ -6882,19 +6794,16 @@ msgstr ""
 
 #: kmfoldercachedimap.cpp:122
 msgid ""
-"_: "
-"<p><b>Troubleshooting the IMAP cache.</b></p>"
-"<p>If you have problems with synchronizing an IMAP folder, you should first try "
-"rebuilding the index file. This will take some time to rebuild, but will not "
-"cause any problems.</p>"
-"<p>If that is not enough, you can try refreshing the IMAP cache. If you do "
+"_: <p><b>Troubleshooting the IMAP cache.</b></p><p>If you have problems with "
+"synchronizing an IMAP folder, you should first try rebuilding the index "
+"file. This will take some time to rebuild, but will not cause any problems.</"
+"p><p>If that is not enough, you can try refreshing the IMAP cache. If you do "
 "this, you will loose all your local changes for this folder and all its "
 "subfolders.</p>\n"
-"<p><b>Troubleshooting the IMAP cache.</b></p>"
-"<p>If you have problems with synchronizing an IMAP folder, you should first try "
-"rebuilding the index file. This will take some time to rebuild, but will not "
-"cause any problems.</p>"
-"<p>If that is not enough, you can try refreshing the IMAP cache. If you do "
+"<p><b>Troubleshooting the IMAP cache.</b></p><p>If you have problems with "
+"synchronizing an IMAP folder, you should first try rebuilding the index "
+"file. This will take some time to rebuild, but will not cause any problems.</"
+"p><p>If that is not enough, you can try refreshing the IMAP cache. If you do "
 "this, you will lose all your local changes for this folder and all its "
 "subfolders.</p>"
 msgstr ""
@@ -6933,8 +6842,8 @@ msgstr ""
 
 #: kmfoldercachedimap.cpp:488
 msgid ""
-"The UID cache file for folder %1 could not be written. There could be a problem "
-"with file system permission."
+"The UID cache file for folder %1 could not be written. There could be a "
+"problem with file system permission."
 msgstr ""
 
 #: kmfoldercachedimap.cpp:612
@@ -6954,8 +6863,7 @@ msgid ""
 "subfolders?\n"
 "This will remove all changes you have done locally to your folders."
 msgstr ""
-"คุณแน่ใจหรือว่า ต้องการลบโฟลเดอร์ \"%1\" รวมทั้งโฟลเดอร์ย่อย "
-"และเนื้อหาทั้งหมดของมัน ?"
+"คุณแน่ใจหรือว่า ต้องการลบโฟลเดอร์ \"%1\" รวมทั้งโฟลเดอร์ย่อย และเนื้อหาทั้งหมดของมัน ?"
 
 #: kmfoldercachedimap.cpp:743 kmmainwidget.cpp:1316
 msgid "Refresh IMAP Cache"
@@ -6971,8 +6879,8 @@ msgstr "สร้างดัชนีสำหรับโฟลเดอร์
 
 #: kmfoldercachedimap.cpp:777
 msgid ""
-"Folder %1 is not in initial sync state (state was %2). Do you want to reset it "
-"to initial sync state and sync anyway?"
+"Folder %1 is not in initial sync state (state was %2). Do you want to reset "
+"it to initial sync state and sync anyway?"
 msgstr ""
 
 #: kmfoldercachedimap.cpp:777
@@ -7098,10 +7006,8 @@ msgstr "กำลังสร้างโฟลเดอร์ย่อยบน
 
 #: kmfoldercachedimap.cpp:1707
 msgid ""
-"<qt>"
-"<p>Mails on the server in folder <b>%1</b> were deleted. Do you want to delete "
-"them locally?"
-"<br>UIDs: %2</p></qt>"
+"<qt><p>Mails on the server in folder <b>%1</b> were deleted. Do you want to "
+"delete them locally?<br>UIDs: %2</p></qt>"
 msgstr ""
 
 #: kmfoldercachedimap.cpp:1719
@@ -7123,9 +7029,8 @@ msgstr "การตั้งค่าโฟลเดอร์"
 
 #: kmfoldercachedimap.cpp:2300
 msgid ""
-"<qt>"
-"<p>It seems that the folder <b>%1</b> was deleted. Do you want to delete it "
-"from the server?</p></qt>"
+"<qt><p>It seems that the folder <b>%1</b> was deleted. Do you want to delete "
+"it from the server?</p></qt>"
 msgstr ""
 
 #: kmfoldercachedimap.cpp:2597
@@ -7134,14 +7039,14 @@ msgstr "ยกเลิกแล้ว"
 
 #: kmfoldercachedimap.cpp:2812
 msgid ""
-"The IMAP server %1 does not have support for IMAP annotations. The XML storage "
-"cannot be used on this server; please re-configure KMail differently."
+"The IMAP server %1 does not have support for IMAP annotations. The XML "
+"storage cannot be used on this server; please re-configure KMail differently."
 msgstr ""
 
 #: kmfoldercachedimap.cpp:2840
 msgid ""
-"The IMAP server %1 doesn't have support for imap annotations. The XML storage "
-"cannot be used on this server, please re-configure KMail differently"
+"The IMAP server %1 doesn't have support for imap annotations. The XML "
+"storage cannot be used on this server, please re-configure KMail differently"
 msgstr ""
 
 #: kmfoldercachedimap.cpp:2951
@@ -7157,11 +7062,11 @@ msgstr ""
 
 #: kmfoldercachedimap.cpp:3117
 msgid ""
-"<p>There are new messages in folder <b>%1</b>, which have not been uploaded to "
-"the server yet, but the folder has been deleted on the server or you do not "
-"have sufficient access rights on the folder to upload them.</p>"
-"<p>All affected messages will therefore be moved to <b>%2</b> "
-"to avoid data loss.</p>"
+"<p>There are new messages in folder <b>%1</b>, which have not been uploaded "
+"to the server yet, but the folder has been deleted on the server or you do "
+"not have sufficient access rights on the folder to upload them.</p><p>All "
+"affected messages will therefore be moved to <b>%2</b> to avoid data loss.</"
+"p>"
 msgstr ""
 
 #: kmfoldercachedimap.cpp:3123
@@ -7170,15 +7075,20 @@ msgstr ""
 
 #: kmfoldercachedimap.cpp:3129
 msgid ""
-"<p>There are new messages in this folder (%1), which have not been uploaded to "
-"the server yet, but the folder has been deleted on the server or you do not "
-"have sufficient access rights on the folder now to upload them. Please contact "
-"your administrator to allow upload of new messages to you, or move them out of "
-"this folder.</p> "
-"<p>Do you want to move these messages to another folder now?</p>"
+"<p>There are new messages in this folder (%1), which have not been uploaded "
+"to the server yet, but the folder has been deleted on the server or you do "
+"not have sufficient access rights on the folder now to upload them. Please "
+"contact your administrator to allow upload of new messages to you, or move "
+"them out of this folder.</p> <p>Do you want to move these messages to "
+"another folder now?</p>"
 msgstr ""
 
-#: kmfoldercachedimap.cpp:3136 kmkernel.cpp:1915
+#: kmfoldercachedimap.cpp:3136 kmkernel.cpp:1916
+#, fuzzy
+msgid "Move"
+msgstr "ย้ายไปยัง:"
+
+#: kmfoldercachedimap.cpp:3136 kmkernel.cpp:1918
 msgid "Do Not Move"
 msgstr "ไม่ต้องย้าย"
 
@@ -7190,8 +7100,7 @@ msgstr "ย้ายจดหมายไปยังโฟลเดอร์"
 msgid "Permissions (ACL)"
 msgstr "สิทธิ์ที่อนุญาต (แบบ ACL)"
 
-#. i18n: file folderpropertiesdialog.ui line 30
-#: kmfolderdia.cpp:122 rc.cpp:227 snippetwidget.cpp:119
+#: folderpropertiesdialog.ui:30 kmfolderdia.cpp:122 snippetwidget.cpp:119
 #, fuzzy, no-c-format
 msgid "General"
 msgstr "ทั่วไป"
@@ -7216,8 +7125,7 @@ msgid ""
 "A sync is needed after changing the permissions."
 msgstr ""
 
-#. i18n: file folderpropertiesdialog.ui line 243
-#: kmfolderdia.cpp:356 rc.cpp:245
+#: folderpropertiesdialog.ui:243 kmfolderdia.cpp:356
 #, no-c-format
 msgid "Use custom &icons"
 msgstr "ใช้ไอคอนที่กำหนดเอง"
@@ -7237,14 +7145,13 @@ msgstr "ทำเครื่องหมายจดหมายในโฟล
 
 #: kmfolderdia.cpp:415
 msgid ""
-"<qt>"
-"<p>If this option is enabled then you will be notified about new/unread mail in "
-"this folder. Moreover, going to the next/previous folder with unread messages "
-"will stop at this folder.</p>"
-"<p>Uncheck this option if you do not want to be notified about new/unread mail "
-"in this folder and if you want this folder to be skipped when going to the "
-"next/previous folder with unread messages. This is useful for ignoring any "
-"new/unread mail in your trash and spam folder.</p></qt>"
+"<qt><p>If this option is enabled then you will be notified about new/unread "
+"mail in this folder. Moreover, going to the next/previous folder with unread "
+"messages will stop at this folder.</p><p>Uncheck this option if you do not "
+"want to be notified about new/unread mail in this folder and if you want "
+"this folder to be skipped when going to the next/previous folder with unread "
+"messages. This is useful for ignoring any new/unread mail in your trash and "
+"spam folder.</p></qt>"
 msgstr ""
 
 #: kmfolderdia.cpp:431
@@ -7258,9 +7165,9 @@ msgstr "ให้จดหมายเก่าในโฟลเดอร์น
 
 #: kmfolderdia.cpp:444
 msgid ""
-"Check this option if you want replies you write to mails in this folder to be "
-"put in this same folder after sending, instead of in the configured sent-mail "
-"folder."
+"Check this option if you want replies you write to mails in this folder to "
+"be put in this same folder after sending, instead of in the configured sent-"
+"mail folder."
 msgstr ""
 
 #: kmfolderdia.cpp:459
@@ -7271,17 +7178,21 @@ msgstr "แสดงคอลัมน์ผู้ส่ง/ผู้รับ�
 msgid "Sho&w column:"
 msgstr "แสดงคอลัมน์:"
 
-#. i18n: file folderpropertiesdialog.ui line 520
-#: kmfolderdia.cpp:468 kmheaders.cpp:185 kmheaders.cpp:248 kmheaders.cpp:392
-#: kmheaders.cpp:577 kmheaders.cpp:794 kmpopfiltercnfrmdlg.cpp:40 rc.cpp:293
+#: kmfolderdia.cpp:467
+#, fuzzy
+msgid "Default"
+msgstr "ตั้งเป็นค่าปริยาย"
+
+#: folderpropertiesdialog.ui:520 kmfolderdia.cpp:468 kmheaders.cpp:185
+#: kmheaders.cpp:248 kmheaders.cpp:392 kmheaders.cpp:577 kmheaders.cpp:794
+#: kmpopfiltercnfrmdlg.cpp:40
 #, no-c-format
 msgid "Sender"
 msgstr "ผู้ส่ง"
 
-#. i18n: file folderpropertiesdialog.ui line 525
-#: kmfolderdia.cpp:469 kmheaders.cpp:142 kmheaders.cpp:188 kmheaders.cpp:245
-#: kmheaders.cpp:250 kmheaders.cpp:394 kmheaders.cpp:579 kmheaders.cpp:796
-#: kmpopfiltercnfrmdlg.cpp:41 rc.cpp:296
+#: folderpropertiesdialog.ui:525 kmfolderdia.cpp:469 kmheaders.cpp:142
+#: kmheaders.cpp:188 kmheaders.cpp:245 kmheaders.cpp:250 kmheaders.cpp:394
+#: kmheaders.cpp:579 kmheaders.cpp:796 kmpopfiltercnfrmdlg.cpp:41
 #, no-c-format
 msgid "Receiver"
 msgstr "ผู้รับ"
@@ -7292,11 +7203,11 @@ msgstr "การแสดงตัวของผู้ส่ง:"
 
 #: kmfolderdia.cpp:486
 msgid ""
-"Select the sender identity to be used when writing new mail or replying to mail "
-"in this folder. This means that if you are in one of your work folders, you can "
-"make KMail use the corresponding sender email address, signature and signing or "
-"encryption keys automatically. Identities can be set up in the main "
-"configuration dialog. (Settings -> Configure KMail)"
+"Select the sender identity to be used when writing new mail or replying to "
+"mail in this folder. This means that if you are in one of your work folders, "
+"you can make KMail use the corresponding sender email address, signature and "
+"signing or encryption keys automatically. Identities can be set up in the "
+"main configuration dialog. (Settings -> Configure KMail)"
 msgstr ""
 
 #: kmfolderdia.cpp:500
@@ -7315,12 +7226,12 @@ msgid ""
 "(for tasks, this setting is only used for alarms).\n"
 "\n"
 "Example use cases: if the boss shares a folder with his secretary, only the "
-"boss should be marked as busy for his meetings, so he should select \"Admins\", "
-"since the secretary has no admin rights on the folder.\n"
-"On the other hand if a working group shares a Calendar for group meetings, all "
-"readers of the folders should be marked as busy for meetings.\n"
-"A company-wide folder with optional events in it would use \"Nobody\" since it "
-"is not known who will go to those events."
+"boss should be marked as busy for his meetings, so he should select \"Admins"
+"\", since the secretary has no admin rights on the folder.\n"
+"On the other hand if a working group shares a Calendar for group meetings, "
+"all readers of the folders should be marked as busy for meetings.\n"
+"A company-wide folder with optional events in it would use \"Nobody\" since "
+"it is not known who will go to those events."
 msgstr ""
 
 #: kmfolderdia.cpp:555
@@ -7351,17 +7262,17 @@ msgstr ""
 #: kmfolderdia.cpp:579
 msgid ""
 "If enabled, the unread state of messages in this folder will be the same for "
-"all users having access to this folders. If disabled (the default), every user "
-"with access to this folder has her own unread state."
+"all users having access to this folders. If disabled (the default), every "
+"user with access to this folder has her own unread state."
 msgstr ""
 
 #: kmfolderdia.cpp:661
 msgid ""
 "You have configured this folder to contain groupware information and the "
-"general configuration option to hide groupware folders is set. That means that "
-"this folder will disappear once the configuration dialog is closed. If you want "
-"to remove the folder again, you will need to temporarily disable hiding of "
-"groupware folders to be able to see it."
+"general configuration option to hide groupware folders is set. That means "
+"that this folder will disappear once the configuration dialog is closed. If "
+"you want to remove the folder again, you will need to temporarily disable "
+"hiding of groupware folders to be able to see it."
 msgstr ""
 
 #: kmfolderdir.cpp:209
@@ -7434,7 +7345,8 @@ msgstr "เกิดข้อผิดพลาดระหว่างขอข
 msgid ""
 "The mail index for '%1' is from an unknown version of KMail (%2).\n"
 "This index can be regenerated from your mail folder, but some information, "
-"including status flags, may be lost. Do you wish to downgrade your index file?"
+"including status flags, may be lost. Do you wish to downgrade your index "
+"file?"
 msgstr ""
 "ดัชนีจดหมายสำหรับ '%1' มาจาก KMail (%2) ที่ไม่ทราบรุ่น\n"
 "ดัชนีนี้ สามารถสร้างใหม่ได้ จากโฟลเดอร์จดหมายของคุณ \n"
@@ -7467,11 +7379,10 @@ msgstr ""
 #: kmfoldermaildir.cpp:92
 #, fuzzy
 msgid ""
-"Error opening %1; either this is not a valid maildir folder, or you do not have "
-"sufficient access permissions."
+"Error opening %1; either this is not a valid maildir folder, or you do not "
+"have sufficient access permissions."
 msgstr ""
-"เกิดข้อผิดพลาดระหว่างเปิด %1 "
-"อาจเป็นไปได้ว่ามันไม่ได้เป็นไดเร็กทอรีจดหมายที่ถูกต้อง "
+"เกิดข้อผิดพลาดระหว่างเปิด %1 อาจเป็นไปได้ว่ามันไม่ได้เป็นไดเร็กทอรีจดหมายที่ถูกต้อง "
 "หรือคุณอาจจะยังไม่มีสิทธิ์เข้าใช้งานมัน"
 
 #: kmfoldermaildir.cpp:124
@@ -7501,8 +7412,8 @@ msgid ""
 "Your outbox contains messages which were most-likely not created by KMail;\n"
 "please remove them from there if you do not want KMail to send them."
 msgstr ""
-"กล่องจดหมายออกของคุณมีจดหมายที่ไม่ได้ถูกสร้างจาก Kmail โปรดลบมันจากที่นั่น "
-"หากคุณไม่ต้องการให้ Kmail ทำการส่งมันด้วย"
+"กล่องจดหมายออกของคุณมีจดหมายที่ไม่ได้ถูกสร้างจาก Kmail โปรดลบมันจากที่นั่น หากคุณไม่ต้องการให้ "
+"Kmail ทำการส่งมันด้วย"
 
 #: kmfoldermbox.cpp:112
 msgid ""
@@ -7514,13 +7425,11 @@ msgstr ""
 
 #: kmfoldermbox.cpp:129
 msgid ""
-"<qt>"
-"<p>The index of folder '%2' seems to be out of date. To prevent message "
+"<qt><p>The index of folder '%2' seems to be out of date. To prevent message "
 "corruption the index will be regenerated. As a result deleted messages might "
-"reappear and status flags might be lost.</p>"
-"<p>Please read the corresponding entry in the <a href=\"%1\">"
-"FAQ section of the manual of KMail</a> for information about how to prevent "
-"this problem from happening again.</p></qt>"
+"reappear and status flags might be lost.</p><p>Please read the corresponding "
+"entry in the <a href=\"%1\">FAQ section of the manual of KMail</a> for "
+"information about how to prevent this problem from happening again.</p></qt>"
 msgstr ""
 
 #: kmfoldermbox.cpp:153 kmfoldermbox.cpp:159
@@ -7556,8 +7465,7 @@ msgstr "ไม่สามารถเพิ่มจดหมายไปยั
 
 #: kmfoldermbox.cpp:1129
 msgid "Could not add message to folder (No space left on device?)"
-msgstr ""
-"ไม่สามารถเพิ่มจดหมายไปยังโฟลเดอร์ได้ (มีเนื้อที่บนดิสก์เหลือเพียงพอหรือไม่ ?)"
+msgstr "ไม่สามารถเพิ่มจดหมายไปยังโฟลเดอร์ได้ (มีเนื้อที่บนดิสก์เหลือเพียงพอหรือไม่ ?)"
 
 #: kmfoldermgr.cpp:68
 msgid "Are you sure you want to expire old messages?"
@@ -7577,13 +7485,13 @@ msgid ""
 "Please move the file out of the way."
 msgstr ""
 
-#: kmfoldermgr.cpp:153 kmkernel.cpp:1380
+#: kmfoldermgr.cpp:153 kmkernel.cpp:1383
 msgid ""
 "The permissions of the folder '%1' are incorrect;\n"
 "please make sure that you can view and modify the content of this folder."
 msgstr ""
 
-#: kmfoldermgr.cpp:163 kmkernel.cpp:1372
+#: kmfoldermgr.cpp:163 kmkernel.cpp:1375
 msgid ""
 "KMail could not create folder '%1';\n"
 "please make sure that you can view and modify the content of the folder '%2'."
@@ -7591,8 +7499,8 @@ msgstr ""
 
 #: kmfoldermgr.cpp:200
 msgid ""
-"A folder with the same name has been deleted since the last mail check.You need "
-"to check mails first before creating another folder with the same name."
+"A folder with the same name has been deleted since the last mail check.You "
+"need to check mails first before creating another folder with the same name."
 msgstr ""
 
 #: kmfoldermgr.cpp:202
@@ -7600,7 +7508,7 @@ msgstr ""
 msgid "Could Not Create Folder"
 msgstr "ล้มเหลวในการสร้างโฟลเดอร์"
 
-#: kmfoldermgr.cpp:329 kmkernel.cpp:1688
+#: kmfoldermgr.cpp:329 kmkernel.cpp:1691
 msgid ""
 "Cannot create file `%1' in %2.\n"
 "KMail cannot start without it."
@@ -7645,8 +7553,7 @@ msgstr "ค้นหา"
 
 #: kmfoldertree.cpp:920
 msgid "<qt>Go to the next unread message in folder <b>%1</b>?</qt>"
-msgstr ""
-"<qt>ไปยังจดหมายที่ยังไม่ได้อ่านฉบับถัดไปในโฟลเดอร์ <b>%1</b> หรือไม่ ?</qt>"
+msgstr "<qt>ไปยังจดหมายที่ยังไม่ได้อ่านฉบับถัดไปในโฟลเดอร์ <b>%1</b> หรือไม่ ?</qt>"
 
 #: kmfoldertree.cpp:922
 msgid "Go to Next Unread Message"
@@ -7702,9 +7609,9 @@ msgstr "แก้ไปปัญหาแคชของ IMAP..."
 
 #: kmfoldertree.cpp:1280
 msgid ""
-"<qt>Cannot create folder under <b>%1</b> because of insufficient permissions on "
-"the server. If you think you should be able to create subfolders here, ask your "
-"administrator to grant you rights to do so.</qt> "
+"<qt>Cannot create folder under <b>%1</b> because of insufficient permissions "
+"on the server. If you think you should be able to create subfolders here, "
+"ask your administrator to grant you rights to do so.</qt> "
 msgstr ""
 
 #: kmfoldertree.cpp:1695 kmmainwidget.cpp:412 kmmainwidget.cpp:419
@@ -7836,13 +7743,13 @@ msgstr "%1 โฟลเดอร์อ่านได้อย่างเดี
 #: kmheaders.cpp:1598
 #, c-format
 msgid ""
-"_n: <qt>Do you really want to delete the selected message?"
-"<br>Once deleted, it cannot be restored.</qt>\n"
-"<qt>Do you really want to delete the %n selected messages?"
-"<br>Once deleted, they cannot be restored.</qt>"
+"_n: <qt>Do you really want to delete the selected message?<br>Once deleted, "
+"it cannot be restored.</qt>\n"
+"<qt>Do you really want to delete the %n selected messages?<br>Once deleted, "
+"they cannot be restored.</qt>"
 msgstr ""
-"<qt>คุณแน่ใจหรือว่า ต้องการจะลบจดหมายที่เลือกไว้ทั้ง %n ฉบับนี้ ?"
-"<br>หากมันถูกลบไปแล้ว จะไม่สามารถกู้คืนมาได้ !</qt>"
+"<qt>คุณแน่ใจหรือว่า ต้องการจะลบจดหมายที่เลือกไว้ทั้ง %n ฉบับนี้ ?<br>หากมันถูกลบไปแล้ว "
+"จะไม่สามารถกู้คืนมาได้ !</qt>"
 
 #: kmheaders.cpp:1600
 msgid "Delete Messages"
@@ -7894,145 +7801,142 @@ msgstr ""
 "ล้มเหลวในการแก้ไข %1\n"
 "(พื้นที่บนดิสก์มีพอหรือไม่ ?)"
 
-#: kmkernel.cpp:724
+#: kmkernel.cpp:727
 msgid "Certificate Signature Request"
 msgstr "ร้องขอลายเซ็นของใบรับรอง"
 
-#: kmkernel.cpp:727
+#: kmkernel.cpp:730
 msgid "Please create a certificate from attachment and return to sender."
 msgstr "โปรดสร้างใบรับรองจากสิ่งที่แนบมาด้วยและส่งกลับไปยังผู้ส่ง"
 
-#: kmkernel.cpp:1258
+#: kmkernel.cpp:1261
 msgid "KMail is set to be offline; all network jobs are suspended"
 msgstr ""
 
-#: kmkernel.cpp:1268
+#: kmkernel.cpp:1271
 msgid "KMail is set to be online; all network jobs resumed"
 msgstr ""
 
-#: kmkernel.cpp:1295
+#: kmkernel.cpp:1298
 msgid "KMail is currently in offline mode. How do you want to proceed?"
 msgstr ""
 
-#: kmkernel.cpp:1298 kmmainwidget.cpp:1924
+#: kmkernel.cpp:1301 kmmainwidget.cpp:1924
 msgid "Work Online"
 msgstr "ทำงานออนไลน์"
 
-#: kmkernel.cpp:1299 kmmainwidget.cpp:1922
+#: kmkernel.cpp:1302 kmmainwidget.cpp:1922
 msgid "Work Offline"
 msgstr "ทำงานออฟไลน์"
 
-#: kmkernel.cpp:1441
+#: kmkernel.cpp:1444
 msgid "You do not have read/write permission to your inbox folder."
 msgstr "คุณยังไม่สิทธิ์ในการอ่าน/เขียนที่โฟลเดอร์จดหมายเข้าของคุณ"
 
-#: kmkernel.cpp:1449
+#: kmkernel.cpp:1452
 msgid "outbox"
 msgstr "จดหมายออก"
 
-#: kmkernel.cpp:1451
+#: kmkernel.cpp:1454
 msgid "You do not have read/write permission to your outbox folder."
 msgstr "คุณยังไม่สิทธิ์ในการอ่าน/เขียนที่โฟลเดอร์จดหมายออกของคุณ"
 
-#: kmkernel.cpp:1468
+#: kmkernel.cpp:1471
 msgid "sent-mail"
 msgstr "จดหมายที่ส่งแล้ว"
 
-#: kmkernel.cpp:1470
+#: kmkernel.cpp:1473
 msgid "You do not have read/write permission to your sent-mail folder."
 msgstr "คุณยังไม่สิทธิ์ในการอ่าน/เขียนที่โฟลเดอร์จดหมายที่ส่งแล้วของคุณ"
 
-#: kmkernel.cpp:1477
+#: kmkernel.cpp:1480
 msgid "trash"
 msgstr "ถังขยะ"
 
-#: kmkernel.cpp:1479
+#: kmkernel.cpp:1482
 msgid "You do not have read/write permission to your trash folder."
 msgstr "คุณยังไม่สิทธิ์ในการอ่าน/เขียนที่โฟลเดอร์ถังขยะของคุณ"
 
-#: kmkernel.cpp:1486
+#: kmkernel.cpp:1489
 msgid "drafts"
 msgstr "ฉบับร่าง"
 
-#: kmkernel.cpp:1488
+#: kmkernel.cpp:1491
 msgid "You do not have read/write permission to your drafts folder."
 msgstr "คุณยังไม่สิทธิ์ในการอ่าน/เขียนที่โฟลเดอร์ฉบับร่างของคุณ"
 
-#: kmkernel.cpp:1497
+#: kmkernel.cpp:1500
 msgid "templates"
 msgstr ""
 
-#: kmkernel.cpp:1499
+#: kmkernel.cpp:1502
 #, fuzzy
 msgid "You do not have read/write permission to your templates folder."
 msgstr "คุณยังไม่สิทธิ์ในการอ่าน/เขียนที่โฟลเดอร์ถังขยะของคุณ"
 
-#: kmkernel.cpp:1543 searchwindow.cpp:256 searchwindow.cpp:477
+#: kmkernel.cpp:1546 searchwindow.cpp:256 searchwindow.cpp:477
 msgid "Last Search"
 msgstr "ค้นหาล่าสุด"
 
-#: kmkernel.cpp:1728
+#: kmkernel.cpp:1731
 msgid ""
 "There is a problem with the mail index of the following folders, the indices "
 "will now be regenerated.\n"
-"This can happen because the index files are out of date, missing or corrupted.\n"
+"This can happen because the index files are out of date, missing or "
+"corrupted.\n"
 "Contact your administrator if this happens frequently.\n"
 "Some information, like status flags, might get lost."
 msgstr ""
 
-#: kmkernel.cpp:1733
+#: kmkernel.cpp:1736
 msgid "Problem with mail indices"
 msgstr ""
 
-#: kmkernel.cpp:1891
+#: kmkernel.cpp:1894
 msgid ""
 "_: %1-%3 is the application name, %4-%7 are folder path\n"
-"<qt>The <i>%4</i> folder exists. %1 now uses the <i>%5</i> "
-"folder for its messages."
-"<p>%2 can move the contents of <i>%6<i> into this folder for you, though this "
-"may replace any existing files with the same name in <i>%7</i>."
+"<qt>The <i>%4</i> folder exists. %1 now uses the <i>%5</i> folder for its "
+"messages.<p>%2 can move the contents of <i>%6<i> into this folder for you, "
+"though this may replace any existing files with the same name in <i>%7</i>."
 "<p><strong>Would you like %3 to move the mail files now?</strong></qt>"
 msgstr ""
 
-#: kmkernel.cpp:1903
+#: kmkernel.cpp:1906
 msgid ""
 "_: %1-%3 is the application name, %4-%6 are folder path\n"
-"<qt>The <i>%4</i> folder exists. %1 now uses the <i>%5</i> "
-"folder for its messages. %2 can move the contents of <i>%6</i> "
-"into this folder for you."
+"<qt>The <i>%4</i> folder exists. %1 now uses the <i>%5</i> folder for its "
+"messages. %2 can move the contents of <i>%6</i> into this folder for you."
 "<p><strong>Would you like %3 to move the mail files now?</strong></qt>"
 msgstr ""
 
-#: kmkernel.cpp:1912
+#: kmkernel.cpp:1915
 msgid "Migrate Mail Files?"
 msgstr ""
 
-#: kmkernel.cpp:2147
+#: kmkernel.cpp:2150
 #, fuzzy
 msgid "KMail encountered a fatal error and will terminate now"
 msgstr ""
-"เกิดข้อผิดพลาดอย่างร้ายแรงภายในโปรแกรมจัดการจดหมาย - K "
-"และจะทำการยุติโปรแกรมเดี๋ยวนี้\n"
+"เกิดข้อผิดพลาดอย่างร้ายแรงภายในโปรแกรมจัดการจดหมาย - K และจะทำการยุติโปรแกรมเดี๋ยวนี้\n"
 "ข้อผิดพลาดคือ:\n"
 "%1"
 
-#: kmkernel.cpp:2149
+#: kmkernel.cpp:2152
 #, c-format
 msgid ""
 "KMail encountered a fatal error and will terminate now.\n"
 "The error was:\n"
 "%1"
 msgstr ""
-"เกิดข้อผิดพลาดอย่างร้ายแรงภายในโปรแกรมจัดการจดหมาย - K "
-"และจะทำการยุติโปรแกรมเดี๋ยวนี้\n"
+"เกิดข้อผิดพลาดอย่างร้ายแรงภายในโปรแกรมจัดการจดหมาย - K และจะทำการยุติโปรแกรมเดี๋ยวนี้\n"
 "ข้อผิดพลาดคือ:\n"
 "%1"
 
-#: kmkernel.cpp:2282 kmmainwidget.cpp:1151
+#: kmkernel.cpp:2285 kmmainwidget.cpp:1151
 msgid "Empty Trash"
 msgstr "เทถังขยะทิ้ง"
 
-#: kmkernel.cpp:2283
+#: kmkernel.cpp:2286
 msgid "Are you sure you want to empty the trash folders of all accounts?"
 msgstr "คุณแน่ใจหรือว่าต้องการจะเทถังขยะทิ้ง ?"
 
@@ -8109,8 +8013,7 @@ msgstr "จดหมายใหม่ %n ฉบับใน %1"
 #: kmmainwidget.cpp:967
 msgid ""
 "_: %1 is a list of the number of new messages per folder\n"
-"<b>New mail arrived</b>"
-"<br>%1"
+"<b>New mail arrived</b><br>%1"
 msgstr "<b>ได้รับจดหมายใหม่</b><br>%1"
 
 #: kmmainwidget.cpp:971
@@ -8148,11 +8051,10 @@ msgstr "คุณแน่ใจหรือว่าต้องการจะ
 
 #: kmmainwidget.cpp:1154
 msgid ""
-"<qt>Are you sure you want to move all messages from folder <b>%1</b> "
-"to the trash?</qt>"
+"<qt>Are you sure you want to move all messages from folder <b>%1</b> to the "
+"trash?</qt>"
 msgstr ""
-"<qt>คุณแน่ใจหรือว่า ต้องการจะทิ้งจดหมายทั้งหมดจากโฟลเดอร์ <b>%1</b> "
-"ลงถังขยะ ?</qt>"
+"<qt>คุณแน่ใจหรือว่า ต้องการจะทิ้งจดหมายทั้งหมดจากโฟลเดอร์ <b>%1</b> ลงถังขยะ ?</qt>"
 
 #: kmmainwidget.cpp:1173
 msgid "Moved all messages to the trash"
@@ -8176,8 +8078,8 @@ msgstr "ลบการค้นหา"
 
 #: kmmainwidget.cpp:1210
 msgid ""
-"<qt>Are you sure you want to delete the search <b>%1</b>?"
-"<br>Any messages it shows will still be available in their original folder.</qt>"
+"<qt>Are you sure you want to delete the search <b>%1</b>?<br>Any messages it "
+"shows will still be available in their original folder.</qt>"
 msgstr ""
 "<qt>คุณแน่ใจหรือว่าต้องการจะลบการค้นหา <b>%1</b> ? "
 "<br>จดหมายที่แสดงอยู่ในผลการค้นหาจะยังคงอยู่ในโฟลเดอร์เดิมของมัน</qt>"
@@ -8194,36 +8096,36 @@ msgstr "<qt>คุณต้องการลบรายการแสดง�
 #: kmmainwidget.cpp:1222
 #, fuzzy
 msgid ""
-"<qt>Are you sure you want to delete the empty folder <b>%1</b> "
-"and all its subfolders? Those subfolders might not be empty and their contents "
-"will be discarded as well. "
-"<p><b>Beware</b> that discarded messages are not saved into your Trash folder "
-"and are permanently deleted.</qt>"
+"<qt>Are you sure you want to delete the empty folder <b>%1</b> and all its "
+"subfolders? Those subfolders might not be empty and their contents will be "
+"discarded as well. <p><b>Beware</b> that discarded messages are not saved "
+"into your Trash folder and are permanently deleted.</qt>"
 msgstr ""
-"คุณแน่ใจหรือว่า ต้องการลบโฟลเดอร์ \"%1\" รวมทั้งโฟลเดอร์ย่อย "
-"และเนื้อหาทั้งหมดของมัน ?"
+"คุณแน่ใจหรือว่า ต้องการลบโฟลเดอร์ \"%1\" รวมทั้งโฟลเดอร์ย่อย และเนื้อหาทั้งหมดของมัน ?"
 
 #: kmmainwidget.cpp:1231
 #, fuzzy
 msgid ""
-"<qt>Are you sure you want to delete the folder <b>%1</b>"
-", discarding its contents? "
-"<p><b>Beware</b> that discarded messages are not saved into your Trash folder "
-"and are permanently deleted.</qt>"
+"<qt>Are you sure you want to delete the folder <b>%1</b>, discarding its "
+"contents? <p><b>Beware</b> that discarded messages are not saved into your "
+"Trash folder and are permanently deleted.</qt>"
 msgstr ""
-"คุณแน่ใจหรือว่า ต้องการลบโฟลเดอร์ \"%1\" รวมทั้งโฟลเดอร์ย่อย "
-"และเนื้อหาทั้งหมดของมัน ?"
+"คุณแน่ใจหรือว่า ต้องการลบโฟลเดอร์ \"%1\" รวมทั้งโฟลเดอร์ย่อย และเนื้อหาทั้งหมดของมัน ?"
 
 #: kmmainwidget.cpp:1238
 #, fuzzy
 msgid ""
-"<qt>Are you sure you want to delete the folder <b>%1</b> "
-"and all its subfolders, discarding their contents? "
-"<p><b>Beware</b> that discarded messages are not saved into your Trash folder "
-"and are permanently deleted.</qt>"
+"<qt>Are you sure you want to delete the folder <b>%1</b> and all its "
+"subfolders, discarding their contents? <p><b>Beware</b> that discarded "
+"messages are not saved into your Trash folder and are permanently deleted.</"
+"qt>"
 msgstr ""
-"คุณแน่ใจหรือว่า ต้องการลบโฟลเดอร์ \"%1\" รวมทั้งโฟลเดอร์ย่อย "
-"และเนื้อหาทั้งหมดของมัน ?"
+"คุณแน่ใจหรือว่า ต้องการลบโฟลเดอร์ \"%1\" รวมทั้งโฟลเดอร์ย่อย และเนื้อหาทั้งหมดของมัน ?"
+
+#: kmmainwidget.cpp:1248 kmmainwidget.cpp:2757
+#, fuzzy
+msgid "&Delete"
+msgstr "ลบ"
 
 #: kmmainwidget.cpp:1313
 msgid ""
@@ -8237,9 +8139,9 @@ msgstr "คุณแน่ใจหรือไม่ ที่จะให้�
 
 #: kmmainwidget.cpp:1353
 msgid ""
-"Use of HTML in mail will make you more vulnerable to \"spam\" and may increase "
-"the likelihood that your system will be compromised by other present and "
-"anticipated security exploits."
+"Use of HTML in mail will make you more vulnerable to \"spam\" and may "
+"increase the likelihood that your system will be compromised by other "
+"present and anticipated security exploits."
 msgstr ""
 "การใช้ HTML ในจดหมาย อาจจะทำให้คุณได้รับ จดหมาย\n"
 "\"ขยะ\" และอาจทำให้ระบบของคุณ มีปัญหาเรื่องความปลอดภัยได้"
@@ -8256,8 +8158,8 @@ msgstr "ใช้ HTML"
 #, fuzzy
 msgid ""
 "Loading external references in html mail will make you more vulnerable to "
-"\"spam\" and may increase the likelihood that your system will be compromised "
-"by other present and anticipated security exploits."
+"\"spam\" and may increase the likelihood that your system will be "
+"compromised by other present and anticipated security exploits."
 msgstr ""
 "การใช้ HTML ในจดหมาย อาจจะทำให้คุณได้รับ จดหมาย\n"
 "\"ขยะ\" และอาจทำให้ระบบของคุณ มีปัญหาเรื่องความปลอดภัยได้"
@@ -8276,8 +8178,8 @@ msgstr "กรองบนจดหมายเวียน %1..."
 
 #: kmmainwidget.cpp:1738
 msgid ""
-"KMail's Out of Office Reply functionality relies on server-side filtering. You "
-"have not yet configured an IMAP server for this.\n"
+"KMail's Out of Office Reply functionality relies on server-side filtering. "
+"You have not yet configured an IMAP server for this.\n"
 "You can do this on the \"Filtering\" tab of the IMAP account configuration."
 msgstr ""
 
@@ -8295,7 +8197,8 @@ msgstr "ไม่สามารถเริ่มตัวจัดการใ
 #: kmmainwidget.cpp:1787
 #, fuzzy
 msgid ""
-"Could not start GnuPG LogViewer (kwatchgnupg); please check your installation."
+"Could not start GnuPG LogViewer (kwatchgnupg); please check your "
+"installation."
 msgstr "ไม่สามารถเริ่มตัวจัดการใบรับรองได้ โปรดตรวจสอบการติดตั้งของคุณ !"
 
 #: kmmainwidget.cpp:2508
@@ -8630,8 +8533,7 @@ msgstr "บันทึกสิ่งที่แนบมาด้วย..."
 msgid "Appl&y All Filters"
 msgstr "ปรับใช้ตัวกรองทั้งหมด"
 
-#. i18n: file kmail_part.rc line 142
-#: kmmainwidget.cpp:2997 rc.cpp:30 rc.cpp:96
+#: kmail_part.rc:142 kmmainwidget.cpp:2997 kmmainwin.rc:145
 #, no-c-format
 msgid "A&pply Filter"
 msgstr "ปรับใช้ตัวกรอง"
@@ -8747,7 +8649,6 @@ msgstr "ฉบับที่ยังไม่ได้อ่านถัดไ
 msgid "Go to the next unread message"
 msgstr "ไปยังจดหมายที่ยังไม่ได้อ่านฉบับถัดไป"
 
-#. i18n("Go to the next important message") ),
 #: kmmainwidget.cpp:3084
 msgid "&Previous Message"
 msgstr "ฉบับก่อนหน้านี้"
@@ -8795,8 +8696,7 @@ msgid ""
 "Scroll down current message. If at end of current message, go to next unread "
 "message."
 msgstr ""
-"เลื่อนจดหมายฉบับปัจจุบันลง หากอยู่ที่ส่วนท้ายของฉบับปัจจุบันแล้ว "
-"ให้ไปยังฉบับที่ยังไม่ได้อ่านฉบับถัดไป"
+"เลื่อนจดหมายฉบับปัจจุบันลง หากอยู่ที่ส่วนท้ายของฉบับปัจจุบันแล้ว ให้ไปยังฉบับที่ยังไม่ได้อ่านฉบับถัดไป"
 
 #: kmmainwidget.cpp:3129
 msgid "Show Quick Search"
@@ -8886,25 +8786,25 @@ msgstr " กำลังเริ่มการทำงาน..."
 
 #: kmmessage.cpp:1336
 msgid ""
-"This message contains a request to return a notification about your reception "
-"of the message.\n"
+"This message contains a request to return a notification about your "
+"reception of the message.\n"
 "You can either ignore the request or let KMail send a \"denied\" or normal "
 "response."
 msgstr ""
 
 #: kmmessage.cpp:1341
 msgid ""
-"This message contains a request to send a notification about your reception of "
-"the message.\n"
-"It contains a processing instruction that is marked as \"required\", but which "
-"is unknown to KMail.\n"
+"This message contains a request to send a notification about your reception "
+"of the message.\n"
+"It contains a processing instruction that is marked as \"required\", but "
+"which is unknown to KMail.\n"
 "You can either ignore the request or let KMail send a \"failed\" response."
 msgstr ""
 
 #: kmmessage.cpp:1348
 msgid ""
-"This message contains a request to send a notification about your reception of "
-"the message,\n"
+"This message contains a request to send a notification about your reception "
+"of the message,\n"
 "but it is requested to send the notification to more than one address.\n"
 "You can either ignore the request or let KMail send a \"denied\" or normal "
 "response."
@@ -8912,8 +8812,8 @@ msgstr ""
 
 #: kmmessage.cpp:1355
 msgid ""
-"This message contains a request to send a notification about your reception of "
-"the message,\n"
+"This message contains a request to send a notification about your reception "
+"of the message,\n"
 "but there is no return-path set.\n"
 "You can either ignore the request or let KMail send a \"denied\" or normal "
 "response."
@@ -8921,8 +8821,8 @@ msgstr ""
 
 #: kmmessage.cpp:1361
 msgid ""
-"This message contains a request to send a notification about your reception of "
-"the message,\n"
+"This message contains a request to send a notification about your reception "
+"of the message,\n"
 "but the return-path address differs from the address the notification was "
 "requested to be sent to.\n"
 "You can either ignore the request or let KMail send a \"denied\" or normal "
@@ -8952,17 +8852,17 @@ msgstr ""
 msgid "Receipt: "
 msgstr "ผู้รับ: "
 
-#: kmmessage.cpp:3168 urlhandlermanager.cpp:692
+#: kmmessage.cpp:3171 urlhandlermanager.cpp:692
 #, fuzzy, c-format
 msgid "Attachment: %1"
 msgstr "สิ่งที่แนบมาด้วย: "
 
-#: kmmessage.cpp:3199
+#: kmmessage.cpp:3202
 #, fuzzy
 msgid "This attachment has been deleted."
 msgstr "แสดงสิ่งที่แนบมาด้วยตามคำแนะนำของผู้ส่ง"
 
-#: kmmessage.cpp:3201
+#: kmmessage.cpp:3204
 msgid "The attachment '%1' has been deleted."
 msgstr ""
 
@@ -9013,29 +8913,26 @@ msgstr "คุณสมบัติส่วนของจดหมาย"
 
 #: kmmsgpartdlg.cpp:88
 msgid ""
-"<qt>"
-"<p>The <em>MIME type</em> of the file:</p>"
-"<p>normally, you do not need to touch this setting, since the type of the file "
-"is automatically checked; but, sometimes, %1 may not detect the type correctly "
-"-- here is where you can fix that.</p></qt>"
+"<qt><p>The <em>MIME type</em> of the file:</p><p>normally, you do not need "
+"to touch this setting, since the type of the file is automatically checked; "
+"but, sometimes, %1 may not detect the type correctly -- here is where you "
+"can fix that.</p></qt>"
 msgstr ""
 
 #: kmmsgpartdlg.cpp:100
 msgid ""
-"<qt>"
-"<p>The size of the part:</p>"
-"<p>sometimes, %1 will only give an estimated size here, because calculating the "
-"exact size would take too much time; when this is the case, it will be made "
-"visible by adding \"(est.)\" to the size displayed.</p></qt>"
+"<qt><p>The size of the part:</p><p>sometimes, %1 will only give an estimated "
+"size here, because calculating the exact size would take too much time; when "
+"this is the case, it will be made visible by adding \"(est.)\" to the size "
+"displayed.</p></qt>"
 msgstr ""
 
 #: kmmsgpartdlg.cpp:114
 msgid ""
-"<qt>"
-"<p>The file name of the part:</p>"
-"<p>although this defaults to the name of the attached file, it does not specify "
-"the file to be attached; rather, it suggests a file name to be used by the "
-"recipient's mail agent when saving the part to disk.</p></qt>"
+"<qt><p>The file name of the part:</p><p>although this defaults to the name "
+"of the attached file, it does not specify the file to be attached; rather, "
+"it suggests a file name to be used by the recipient's mail agent when saving "
+"the part to disk.</p></qt>"
 msgstr ""
 
 #: kmmsgpartdlg.cpp:124
@@ -9044,11 +8941,10 @@ msgstr "รายละเอียด:"
 
 #: kmmsgpartdlg.cpp:128
 msgid ""
-"<qt>"
-"<p>A description of the part:</p>"
-"<p>this is just an informational description of the part, much like the Subject "
-"is for the whole message; most mail agents will show this information in their "
-"message previews alongside the attachment's icon.</p></qt>"
+"<qt><p>A description of the part:</p><p>this is just an informational "
+"description of the part, much like the Subject is for the whole message; "
+"most mail agents will show this information in their message previews "
+"alongside the attachment's icon.</p></qt>"
 msgstr ""
 
 #: kmmsgpartdlg.cpp:139
@@ -9057,14 +8953,13 @@ msgstr "ชุดรหัสอักขระ:"
 
 #: kmmsgpartdlg.cpp:143
 msgid ""
-"<qt>"
-"<p>The transport encoding of this part:</p>"
-"<p>normally, you do not need to change this, since %1 will use a decent default "
-"encoding, depending on the MIME type; yet, sometimes, you can significantly "
-"reduce the size of the resulting message, e.g. if a PostScript file does not "
-"contain binary data, but consists of pure text -- in this case, choosing "
-"\"quoted-printable\" over the default \"base64\" will save up to 25% in "
-"resulting message size.</p></qt>"
+"<qt><p>The transport encoding of this part:</p><p>normally, you do not need "
+"to change this, since %1 will use a decent default encoding, depending on "
+"the MIME type; yet, sometimes, you can significantly reduce the size of the "
+"resulting message, e.g. if a PostScript file does not contain binary data, "
+"but consists of pure text -- in this case, choosing \"quoted-printable\" "
+"over the default \"base64\" will save up to 25% in resulting message size.</"
+"p></qt>"
 msgstr ""
 
 #: kmmsgpartdlg.cpp:156
@@ -9073,13 +8968,11 @@ msgstr "แสดงคำแนะนำอัตโนมัติ"
 
 #: kmmsgpartdlg.cpp:159
 msgid ""
-"<qt>"
-"<p>Check this option if you want to suggest to the recipient the automatic "
-"(inline) display of this part in the message preview, instead of the default "
-"icon view;</p>"
-"<p>technically, this is carried out by setting this part's <em>"
-"Content-Disposition</em> header field to \"inline\" instead of the default "
-"\"attachment\".</p></qt>"
+"<qt><p>Check this option if you want to suggest to the recipient the "
+"automatic (inline) display of this part in the message preview, instead of "
+"the default icon view;</p><p>technically, this is carried out by setting "
+"this part's <em>Content-Disposition</em> header field to \"inline\" instead "
+"of the default \"attachment\".</p></qt>"
 msgstr ""
 
 #: kmmsgpartdlg.cpp:168
@@ -9089,14 +8982,12 @@ msgstr "เซ็นส่วนนี้"
 #: kmmsgpartdlg.cpp:171
 #, fuzzy
 msgid ""
-"<qt>"
-"<p>Check this option if you want this message part to be signed;</p>"
-"<p>the signature will be made with the key that you associated with the "
+"<qt><p>Check this option if you want this message part to be signed;</"
+"p><p>the signature will be made with the key that you associated with the "
 "currently-selected identity.</p></qt>"
 msgstr ""
-"<qt>"
-"<p>เลือกตัวเลือกนี้ เพื่อให้ส่วนนี้ของจดหมายถูกเข้ารหัส</p>"
-"<p>ส่วนนี้จะถูกเข้ารหัสเพื่อใช้ส่งไปยังผู้รับจดหมายนี้</p></qt>"
+"<qt><p>เลือกตัวเลือกนี้ เพื่อให้ส่วนนี้ของจดหมายถูกเข้ารหัส</"
+"p><p>ส่วนนี้จะถูกเข้ารหัสเพื่อใช้ส่งไปยังผู้รับจดหมายนี้</p></qt>"
 
 #: kmmsgpartdlg.cpp:178
 msgid "Encr&ypt this part"
@@ -9105,13 +8996,11 @@ msgstr "เข้ารหัสจดหมายส่วนนี้"
 #: kmmsgpartdlg.cpp:181
 #, fuzzy
 msgid ""
-"<qt>"
-"<p>Check this option if you want this message part to be encrypted;</p>"
-"<p>the part will be encrypted for the recipients of this message</p></qt>"
+"<qt><p>Check this option if you want this message part to be encrypted;</"
+"p><p>the part will be encrypted for the recipients of this message</p></qt>"
 msgstr ""
-"<qt>"
-"<p>เลือกตัวเลือกนี้ เพื่อให้ส่วนนี้ของจดหมายถูกเข้ารหัส</p>"
-"<p>ส่วนนี้จะถูกเข้ารหัสเพื่อใช้ส่งไปยังผู้รับจดหมายนี้</p></qt>"
+"<qt><p>เลือกตัวเลือกนี้ เพื่อให้ส่วนนี้ของจดหมายถูกเข้ารหัส</"
+"p><p>ส่วนนี้จะถูกเข้ารหัสเพื่อใช้ส่งไปยังผู้รับจดหมายนี้</p></qt>"
 
 #: kmmsgpartdlg.cpp:224
 msgid ""
@@ -9126,15 +9015,13 @@ msgstr "ตัวกรอง POP ของ KMail"
 
 #: kmpopfiltercnfrmdlg.cpp:293
 msgid ""
-"Messages to filter found on POP Account: <b>%1</b>"
-"<p>The messages shown exceed the maximum size limit you defined for this "
-"account."
-"<br>You can select what you want to do with them by checking the appropriate "
-"button."
+"Messages to filter found on POP Account: <b>%1</b><p>The messages shown "
+"exceed the maximum size limit you defined for this account.<br>You can "
+"select what you want to do with them by checking the appropriate button."
 msgstr ""
-"พบจดหมายที่กรองบนบัญชีผู้ใช้แบบ POP: <b>%1</b>"
-"<p>จดหมายที่แสดงอยู่นี้ มีขนาดใหญ่กว่าขนาดใหญ่สุดที่จำกัดไว้สำหรับบัญชีนี้"
-"<br>คุณสามารถเลือกว่า ต้องการจะให้ทำอะไรกับจดหมาย โดยการเลือกปุ่มนี้"
+"พบจดหมายที่กรองบนบัญชีผู้ใช้แบบ POP: <b>%1</b><p>จดหมายที่แสดงอยู่นี้ "
+"มีขนาดใหญ่กว่าขนาดใหญ่สุดที่จำกัดไว้สำหรับบัญชีนี้<br>คุณสามารถเลือกว่า "
+"ต้องการจะให้ทำอะไรกับจดหมาย โดยการเลือกปุ่มนี้"
 
 #: kmpopfiltercnfrmdlg.cpp:298
 msgid "Messages Exceeding Size"
@@ -9390,21 +9277,20 @@ msgstr "โปรแกรมจัดการจดหมายสำหรั
 
 #: kmreaderwin.cpp:1310
 msgid ""
-"<h2 style='margin-top: 0px;'>Retrieving Folder Contents</h2>"
-"<p>Please wait . . .</p>&nbsp;"
+"<h2 style='margin-top: 0px;'>Retrieving Folder Contents</h2><p>Please "
+"wait . . .</p>&nbsp;"
 msgstr ""
-"<h2 style='margin-top: 0px;'>กำลังรับข้อมูลเนื้อหาของโฟลเดอร์จดหมาย</h2>"
-"<p>กรุณารอสักครู่ . . .</p>&nbsp;"
+"<h2 style='margin-top: 0px;'>กำลังรับข้อมูลเนื้อหาของโฟลเดอร์จดหมาย</"
+"h2><p>กรุณารอสักครู่ . . .</p>&nbsp;"
 
 #: kmreaderwin.cpp:1318
 msgid ""
-"<h2 style='margin-top: 0px;'>Offline</h2>"
-"<p>KMail is currently in offline mode. Click <a href=\"kmail:goOnline\">here</a> "
-"to go online . . .</p>&nbsp;"
+"<h2 style='margin-top: 0px;'>Offline</h2><p>KMail is currently in offline "
+"mode. Click <a href=\"kmail:goOnline\">here</a> to go online . . .</p>&nbsp;"
 msgstr ""
-"<h2 style='margin-top: 0px;'>ออฟไลน์</h2>"
-"<p>โปรแกรมจัดการจดหมาย - K ทำงานอยู่ในโหมดออฟไลน์ <a href=\"kmail:goOnline\">"
-"คลิกที่นี่</a> เพื่อเปลี่ยนเป็นโหมดออนไลน์ . . .</p>&nbsp;"
+"<h2 style='margin-top: 0px;'>ออฟไลน์</h2><p>โปรแกรมจัดการจดหมาย - K "
+"ทำงานอยู่ในโหมดออฟไลน์ <a href=\"kmail:goOnline\">คลิกที่นี่</a> "
+"เพื่อเปลี่ยนเป็นโหมดออนไลน์ . . .</p>&nbsp;"
 
 #: kmreaderwin.cpp:1335
 #, fuzzy
@@ -9413,18 +9299,17 @@ msgid ""
 "version; %5: prior TDE version; %6: generated list of new features; %7: "
 "First-time user text (only shown on first start); %8: generated list of "
 "important changes; --- end of comment ---\n"
-"<h2 style='margin-top: 0px;'>Welcome to KMail %1</h2>"
-"<p>KMail is the email client for the K Desktop Environment. It is designed to "
-"be fully compatible with Internet mailing standards including MIME, SMTP, POP3 "
-"and IMAP.</p>\n"
-"<ul>"
-"<li>KMail has many powerful features which are described in the <a href=\"%2\">"
-"documentation</a></li>\n"
-"<li>The <a href=\"%3\">KMail homepage</A> offers information about new versions "
-"of KMail</li></ul>\n"
+"<h2 style='margin-top: 0px;'>Welcome to KMail %1</h2><p>KMail is the email "
+"client for the Trinity Desktop Environment. It is designed to be fully "
+"compatible with Internet mailing standards including MIME, SMTP, POP3 and "
+"IMAP.</p>\n"
+"<ul><li>KMail has many powerful features which are described in the <a href="
+"\"%2\">documentation</a></li>\n"
+"<li>The <a href=\"%3\">KMail (TDE) homepage</A> offers information about new "
+"versions of KMail</li></ul>\n"
 "%8\n"
-"<p>Some of the new features in this release of KMail include (compared to KMail "
-"%4, which is part of TDE %5):</p>\n"
+"<p>Some of the new features in this release of KMail include (compared to "
+"KMail %4, which is part of TDE %5):</p>\n"
 "<ul>\n"
 "%6</ul>\n"
 "%7\n"
@@ -9435,15 +9320,14 @@ msgstr ""
 "<h2 style='margin-top: 0px;'>ยินดีต้อนรับสู่โปรแกรมจัดการจดหมาย - K รุ่น %1</h2> "
 "<p>โปรแกรมจัดการจดหมาย - K เป็นโปรแกรมสำหรับอ่าน/เขียนและจัดการจดหมาย "
 "สำหรับสภาพแวดล้อมพื้นที่ทำงาน K (TDE) "
-"ซึ่งถูกออกแบบมาให้เหมาะกับการใช้งานกับจดหมายมาตรฐานบนอินเตอร์เน็ต รวมทั้งรูปแบบ "
-"MIME, SMTP, POP3 และ IMAP</p>\n"
-"<ul>"
-"<li>โปรแกรมจัดการจดหมาย - K นั้น มีคุณสมบัติมากมายซึ่งได้อธิบายไว้ใน<a "
-"href=\"%2\">เอกสาร</a></li>\n"
+"ซึ่งถูกออกแบบมาให้เหมาะกับการใช้งานกับจดหมายมาตรฐานบนอินเตอร์เน็ต รวมทั้งรูปแบบ MIME, "
+"SMTP, POP3 และ IMAP</p>\n"
+"<ul><li>โปรแกรมจัดการจดหมาย - K นั้น มีคุณสมบัติมากมายซึ่งได้อธิบายไว้ใน<a href="
+"\"%2\">เอกสาร</a></li>\n"
 "<li>ลองแวะมาเยี่ยมที่<a href=\"%3\">โฮมเพจของโปรแกรมจัดการจดหมาย - K</a> "
 "เพื่อติดตามการพัฒนารวมถึงข้อมูลของโปรแกรมจัดการจดหมาย - K รุ่นใหม่</li></ul>\n"
-"<p>คุณสมบัติใหม่ในโปรแกรมจัดการจดหมาย - K รุ่นนี้ (โดยเปรียบเทียบกับ "
-"โปรแกรมจัดการจดหมาย - K %4 ซึ่งเป็นส่วนหนึ่งของ TDE %5):</p>\n"
+"<p>คุณสมบัติใหม่ในโปรแกรมจัดการจดหมาย - K รุ่นนี้ (โดยเปรียบเทียบกับ โปรแกรมจัดการจดหมาย "
+"- K %4 ซึ่งเป็นส่วนหนึ่งของ TDE %5):</p>\n"
 "<ul>\n"
 "%6</ul>\n"
 "%7\n"
@@ -9453,20 +9337,17 @@ msgstr ""
 "โปรแกรมจัดการจดหมาย - K</p>"
 
 #: kmreaderwin.cpp:1358 kmreaderwin.cpp:1380
-msgid ""
-"<li>%1</li>\n"
-msgstr ""
-"<li>%1</li>\n"
+msgid "<li>%1</li>\n"
+msgstr "<li>%1</li>\n"
 
 #: kmreaderwin.cpp:1363
 msgid ""
-"<p>Please take a moment to fill in the KMail configuration panel at "
-"Settings-&gt;Configure KMail.\n"
+"<p>Please take a moment to fill in the KMail configuration panel at Settings-"
+"&gt;Configure KMail.\n"
 "You need to create at least a default identity and an incoming as well as "
 "outgoing mail account.</p>\n"
 msgstr ""
-"<p>โปรดสละเวลาสักครู่ เพื่อปรับแต่งพาเนลของ KMail ที่ ตั้งค่า-&gt;ปรับแต่ง "
-"KMail\n"
+"<p>โปรดสละเวลาสักครู่ เพื่อปรับแต่งพาเนลของ KMail ที่ ตั้งค่า-&gt;ปรับแต่ง KMail\n"
 "คุณต้องใส่รายละเอียด อย่างน้อยก็ส่วนแสดงตัว และบัญชีผู้ใช้จดหมาย</p>\n"
 
 #: kmreaderwin.cpp:1375
@@ -9507,12 +9388,12 @@ msgstr "แสดงสิ่งที่แนบมาด้วย: %1"
 #: kmreaderwin.cpp:2257
 #, fuzzy, c-format
 msgid ""
-"_n: [KMail: Attachment contains binary data. Trying to show first character.]\n"
+"_n: [KMail: Attachment contains binary data. Trying to show first "
+"character.]\n"
 "[KMail: Attachment contains binary data. Trying to show first %n characters.]"
 msgstr ""
 "\n"
-"[KMail: สิ่งที่แนบมาด้วย มีส่วนที่เป็นข้อมูลไบนารี กำลังพยายามแสดงอักขระ %1 "
-"ตัวแรก]"
+"[KMail: สิ่งที่แนบมาด้วย มีส่วนที่เป็นข้อมูลไบนารี กำลังพยายามแสดงอักขระ %1 ตัวแรก]"
 
 #: kmreaderwin.cpp:2353
 msgid "&Open with '%1'"
@@ -9536,12 +9417,14 @@ msgstr "เปิดสิ่งที่แนบมาด้วยหรือ
 
 #: kmreaderwin.cpp:2804
 msgid ""
-"Deleting an attachment might invalidate any digital signature on this message."
+"Deleting an attachment might invalidate any digital signature on this "
+"message."
 msgstr ""
 
 #: kmreaderwin.cpp:2860
 msgid ""
-"Modifying an attachment might invalidate any digital signature on this message."
+"Modifying an attachment might invalidate any digital signature on this "
+"message."
 msgstr ""
 
 #: kmreaderwin.cpp:2956
@@ -9563,6 +9446,67 @@ msgstr "(ถูกต้องตรงกันบางส่วนกับ�
 msgid "(match all of the following)"
 msgstr "(ถูกต้องตรงกันทั้งหมดกับเงื่อนไขต่อไปนี้)"
 
+#: kmsearchpattern.h:221
+#, fuzzy
+msgid "Read"
+msgstr "อ่านแล้ว"
+
+#: kmsearchpattern.h:222
+msgid "Old"
+msgstr ""
+
+#: kmsearchpattern.h:223
+#, fuzzy
+msgid "Deleted"
+msgstr "ลบ"
+
+#: kmsearchpattern.h:224
+#, fuzzy
+msgid "Replied"
+msgstr "ตอบกลับแล้ว"
+
+#: kmsearchpattern.h:225
+#, fuzzy
+msgid "Forwarded"
+msgstr "ส่งต่อ:"
+
+#: kmsearchpattern.h:226
+#, fuzzy
+msgid "Queued"
+msgstr "อยู่ในคิวแล้ว"
+
+#: kmsearchpattern.h:227
+#, fuzzy
+msgid "Sent"
+msgstr "ส่งแล้ว"
+
+#: kmsearchpattern.h:228
+msgid "Watched"
+msgstr ""
+
+#: kmsearchpattern.h:229
+#, fuzzy
+msgid "Ignored"
+msgstr "ยังไม่ได้อ่าน"
+
+#: kmsearchpattern.h:230
+msgid "Spam"
+msgstr ""
+
+#: kmsearchpattern.h:231
+msgid "Ham"
+msgstr ""
+
+#: kmsearchpattern.h:232
+#, fuzzy
+msgid "To Do"
+msgstr "ถึง: "
+
+#: kmsearchpattern.h:234
+#, fuzzy
+msgid "Has Attachment"
+msgstr "เปิดสิ่งที่แนบมาด้วยหรือไม่ ?"
+
 #: kmsearchpatternedit.cpp:34
 #, fuzzy
 msgid "Complete Message"
@@ -9647,17 +9591,17 @@ msgstr ""
 
 #: kmsender.cpp:386
 msgid ""
-"Moving the sent message \"%1\" from the \"outbox\" to the \"sent-mail\" folder "
-"failed.\n"
-"Possible reasons are lack of disk space or write permission. Please try to fix "
-"the problem and move the message manually."
+"Moving the sent message \"%1\" from the \"outbox\" to the \"sent-mail\" "
+"folder failed.\n"
+"Possible reasons are lack of disk space or write permission. Please try to "
+"fix the problem and move the message manually."
 msgstr ""
 
 #: kmsender.cpp:432
 msgid ""
 "It's not possible to send messages without specifying a sender address.\n"
-"Please set the email address of identity '%1' in the Identities section of the "
-"configuration dialog and then try again."
+"Please set the email address of identity '%1' in the Identities section of "
+"the configuration dialog and then try again."
 msgstr ""
 
 #: kmsender.cpp:454
@@ -9683,8 +9627,8 @@ msgstr "เริ่มโปรเซสการส่ง..."
 
 #: kmsender.cpp:503
 msgid ""
-"You have chosen to send all queued email using an unencrypted transport, do you "
-"want to continue? "
+"You have chosen to send all queued email using an unencrypted transport, do "
+"you want to continue? "
 msgstr ""
 
 #: kmsender.cpp:505
@@ -9711,8 +9655,9 @@ msgstr "ล้มเหลวในการส่งจดหมายไปย
 msgid ""
 "Sending aborted:\n"
 "%1\n"
-"The message will stay in the 'outbox' folder until you either fix the problem "
-"(e.g. a broken address) or remove the message from the 'outbox' folder.\n"
+"The message will stay in the 'outbox' folder until you either fix the "
+"problem (e.g. a broken address) or remove the message from the 'outbox' "
+"folder.\n"
 "The following transport protocol was used:\n"
 "  %2"
 msgstr ""
@@ -9734,13 +9679,11 @@ msgstr "ส่งภายหลัง"
 #: kmsender.cpp:720
 #, fuzzy
 msgid ""
-"<p>Sending failed:</p>"
-"<p>%1</p>"
-"<p>The message will stay in the 'outbox' folder until you either fix the "
-"problem (e.g. a broken address) or remove the message from the 'outbox' "
-"folder.</p>"
-"<p>The following transport protocol was used:  %2</p>"
-"<p>Do you want me to continue sending the remaining messages?</p>"
+"<p>Sending failed:</p><p>%1</p><p>The message will stay in the 'outbox' "
+"folder until you either fix the problem (e.g. a broken address) or remove "
+"the message from the 'outbox' folder.</p><p>The following transport protocol "
+"was used:  %2</p><p>Do you want me to continue sending the remaining "
+"messages?</p>"
 msgstr ""
 "การส่งล้มเหลว:\n"
 "%1\n"
@@ -9771,8 +9714,9 @@ msgstr "การส่ง"
 msgid ""
 "Sending failed:\n"
 "%1\n"
-"The message will stay in the 'outbox' folder until you either fix the problem "
-"(e.g. a broken address) or remove the message from the 'outbox' folder.\n"
+"The message will stay in the 'outbox' folder until you either fix the "
+"problem (e.g. a broken address) or remove the message from the 'outbox' "
+"folder.\n"
 "The following transport protocol was used:\n"
 " %2"
 msgstr ""
@@ -9826,30 +9770,30 @@ msgstr ""
 
 #: kmstartup.cpp:198
 msgid ""
-"%1 already seems to be running on another display on this machine. Running %2 "
-"more than once can cause the loss of mail. You should not start %1 unless you "
-"are sure that it is not already running."
+"%1 already seems to be running on another display on this machine. Running "
+"%2 more than once can cause the loss of mail. You should not start %1 unless "
+"you are sure that it is not already running."
 msgstr ""
 
 #: kmstartup.cpp:208
 msgid ""
-"%1 seems to be running on another display on this machine. Running %1 and %2 at "
-"the same time can cause the loss of mail. You should not start %2 unless you "
-"are sure that %1 is not running."
+"%1 seems to be running on another display on this machine. Running %1 and %2 "
+"at the same time can cause the loss of mail. You should not start %2 unless "
+"you are sure that %1 is not running."
 msgstr ""
 
 #: kmstartup.cpp:216
 msgid ""
-"%1 already seems to be running on %2. Running %1 more than once can cause the "
-"loss of mail. You should not start %1 on this computer unless you are sure that "
-"it is not already running on %2."
+"%1 already seems to be running on %2. Running %1 more than once can cause "
+"the loss of mail. You should not start %1 on this computer unless you are "
+"sure that it is not already running on %2."
 msgstr ""
 
 #: kmstartup.cpp:222
 msgid ""
-"%1 seems to be running on %3. Running %1 and %2 at the same time can cause the "
-"loss of mail. You should not start %2 on this computer unless you are sure that "
-"%1 is not running on %3."
+"%1 seems to be running on %3. Running %1 and %2 at the same time can cause "
+"the loss of mail. You should not start %2 on this computer unless you are "
+"sure that %1 is not running on %3."
 msgstr ""
 
 #: kmstartup.cpp:232
@@ -9862,6 +9806,10 @@ msgstr "สถานะ: "
 msgid "Exit"
 msgstr "แก้ไข"
 
+#: kmsystemtray.cpp:136
+msgid "&Quit"
+msgstr ""
+
 #: kmsystemtray.cpp:357
 #, fuzzy
 msgid "New Messages In"
@@ -9888,8 +9836,9 @@ msgid ""
 "TDEWallet is not available. It is strongly recommended to use TDEWallet for "
 "managing your passwords.\n"
 "However, KMail can store the password in its configuration file instead. The "
-"password is stored in an obfuscated format, but should not be considered secure "
-"from decryption efforts if access to the configuration file is obtained.\n"
+"password is stored in an obfuscated format, but should not be considered "
+"secure from decryption efforts if access to the configuration file is "
+"obtained.\n"
 "Do you want to store the password for account '%1' in the configuration file?"
 msgstr ""
 
@@ -9950,8 +9899,7 @@ msgstr "ชื่อโดเมนหรือหมายเลขไอพี
 #: kmtransport.cpp:406
 msgid ""
 "The port number that the SMTP server is listening on. The default port is 25."
-msgstr ""
-"หมายเลขพอร์ตที่เซิร์ฟเวอร์ SMTP รอรับการเชื่อมต่ออยู่ ซึ่งค่าปริยายคือ 25"
+msgstr "หมายเลขพอร์ตที่เซิร์ฟเวอร์ SMTP รอรับการเชื่อมต่ออยู่ ซึ่งค่าปริยายคือ 25"
 
 #: kmtransport.cpp:411
 msgid "Preco&mmand:"
@@ -9969,8 +9917,8 @@ msgstr "เซิร์ฟเวอร์ต้องการตรวจสอ
 
 #: kmtransport.cpp:429
 msgid ""
-"Check this option if your SMTP server requires authentication before accepting "
-"mail. This is known as 'Authenticated SMTP' or simply ASMTP."
+"Check this option if your SMTP server requires authentication before "
+"accepting mail. This is known as 'Authenticated SMTP' or simply ASMTP."
 msgstr ""
 
 #: kmtransport.cpp:442
@@ -9992,10 +9940,9 @@ msgstr "ส่งชื่อโฮสต์ที่กำหนดเองไ
 
 #: kmtransport.cpp:478
 msgid ""
-"Check this option to have KMail use a custom hostname when identifying itself "
-"to the mail server."
-"<p>This is useful when your system's hostname may not be set correctly or to "
-"mask your system's true hostname."
+"Check this option to have KMail use a custom hostname when identifying "
+"itself to the mail server.<p>This is useful when your system's hostname may "
+"not be set correctly or to mask your system's true hostname."
 msgstr ""
 
 #: kmtransport.cpp:485
@@ -10027,8 +9974,8 @@ msgstr "อนุญาตให้ใช้เฉพาะแฟ้มภาย
 #: kmtransport.cpp:786
 #, fuzzy
 msgid ""
-"The Host field cannot be empty. Please  enter the name or the IP address of the "
-"SMTP server."
+"The Host field cannot be empty. Please  enter the name or the IP address of "
+"the SMTP server."
 msgstr "ชื่อโดเมนหรือหมายเลขไอพีของเซิร์ฟเวอร์ SMTP"
 
 #: kmtransport.cpp:788
@@ -10045,10 +9992,10 @@ msgstr ""
 
 #: localsubscriptiondialog.cpp:120
 msgid ""
-"Locally unsubscribing from folders will remove all information that is present "
-"locally about those folders. The folders will not be changed on the server. "
-"Press cancel now if you want to make sure all local changes have been written "
-"to the server by checking mail first."
+"Locally unsubscribing from folders will remove all information that is "
+"present locally about those folders. The folders will not be changed on the "
+"server. Press cancel now if you want to make sure all local changes have "
+"been written to the server by checking mail first."
 msgstr ""
 
 #: localsubscriptiondialog.cpp:124
@@ -10287,22 +10234,18 @@ msgstr "แก้ไขจดหมาย"
 
 #: messagecomposer.cpp:223
 msgid ""
-"<qt>"
-"<p>Structuring information returned by the Crypto plug-in could not be "
-"processed correctly; the plug-in might be damaged.</p>"
-"<p>Please contact your system administrator.</p></qt>"
+"<qt><p>Structuring information returned by the Crypto plug-in could not be "
+"processed correctly; the plug-in might be damaged.</p><p>Please contact your "
+"system administrator.</p></qt>"
 msgstr ""
 
 #: messagecomposer.cpp:227
 msgid ""
-"<p>No active Crypto Plug-In was found and the built-in OpenPGP code did not run "
-"successfully.</p>"
-"<p>You can do two things to change this:</p>"
-"<ul>"
-"<li><em>either</em> activate a Plug-In using the Settings->Configure KMail->"
-"Plug-In dialog.</li>"
-"<li><em>or</em> specify traditional OpenPGP settings on the same dialog's "
-"Identity->Advanced tab.</li></ul>"
+"<p>No active Crypto Plug-In was found and the built-in OpenPGP code did not "
+"run successfully.</p><p>You can do two things to change this:</"
+"p><ul><li><em>either</em> activate a Plug-In using the Settings->Configure "
+"KMail->Plug-In dialog.</li><li><em>or</em> specify traditional OpenPGP "
+"settings on the same dialog's Identity->Advanced tab.</li></ul>"
 msgstr ""
 
 #: messagecomposer.cpp:445
@@ -10315,8 +10258,8 @@ msgstr ""
 
 #: messagecomposer.cpp:557
 msgid ""
-"Chiasmus backend does not offer the \"x-encrypt\" function. Please report this "
-"bug."
+"Chiasmus backend does not offer the \"x-encrypt\" function. Please report "
+"this bug."
 msgstr ""
 
 #: messagecomposer.cpp:565
@@ -10331,14 +10274,14 @@ msgstr ""
 
 #: messagecomposer.cpp:578
 msgid ""
-"Unexpected return value from Chiasmus backend: The \"x-encrypt\" function did "
-"not return a byte array. Please report this bug."
+"Unexpected return value from Chiasmus backend: The \"x-encrypt\" function "
+"did not return a byte array. Please report this bug."
 msgstr ""
 
 #: messagecomposer.cpp:636
 msgid ""
-"The inline OpenPGP crypto message format does not support encryption or signing "
-"of attachments.\n"
+"The inline OpenPGP crypto message format does not support encryption or "
+"signing of attachments.\n"
 "Really use deprecated inline OpenPGP?"
 msgstr ""
 
@@ -10439,8 +10382,8 @@ msgstr ""
 
 #: messagecomposer.cpp:875
 msgid ""
-"Examination of the recipient's encryption preferences yielded that you be asked "
-"whether or not to encrypt this message.\n"
+"Examination of the recipient's encryption preferences yielded that you be "
+"asked whether or not to encrypt this message.\n"
 "Encrypt this message?"
 msgstr ""
 
@@ -10475,8 +10418,9 @@ msgstr "ไม่เข้ารหัส"
 
 #: messagecomposer.cpp:925
 msgid ""
-"You have requested to encrypt this message, and to encrypt a copy to yourself, "
-"but no valid trusted encryption keys have been configured for this identity."
+"You have requested to encrypt this message, and to encrypt a copy to "
+"yourself, but no valid trusted encryption keys have been configured for this "
+"identity."
 msgstr ""
 
 #: messagecomposer.cpp:930
@@ -10487,8 +10431,8 @@ msgstr "บันทึกแบบไม่เข้ารหัส"
 #: messagecomposer.cpp:946
 msgid ""
 "Some parts of this message will not be encrypted.\n"
-"Sending only partially encrypted messages might violate site policy and/or leak "
-"sensitive information.\n"
+"Sending only partially encrypted messages might violate site policy and/or "
+"leak sensitive information.\n"
 "Encrypt all parts instead?"
 msgstr ""
 
@@ -10509,74 +10453,72 @@ msgstr "เข้ารหัสทุกส่วน"
 msgid "Unencrypted Message Warning"
 msgstr "จดหมายถูกเข้ารหัสไว้"
 
-#: messagecomposer.cpp:2038
+#: messagecomposer.cpp:2040
 msgid ""
-"<qt>"
-"<p>Error: The backend did not return any encoded data.</p>"
-"<p>Please report this bug:"
-"<br>%2</p></qt>"
+"<qt><p>Error: The backend did not return any encoded data.</p><p>Please "
+"report this bug:<br>%2</p></qt>"
 msgstr ""
 
-#: messagecomposer.cpp:2111
+#: messagecomposer.cpp:2113
 msgid ""
-"<qt>Not all characters fit into the chosen encoding."
-"<br>"
-"<br>Send the message anyway?</qt>"
+"<qt>Not all characters fit into the chosen encoding.<br><br>Send the message "
+"anyway?</qt>"
 msgstr ""
-"<qt>มีอักขระบางตัว ไม่ใช่ชุดรหัสอักขระที่เลือกไว้"
-"<br>คุณต้องการทำการส่งจดหมายต่อไปหรือไม่ ?</qt>"
+"<qt>มีอักขระบางตัว ไม่ใช่ชุดรหัสอักขระที่เลือกไว้<br>คุณต้องการทำการส่งจดหมายต่อไปหรือไม่ ?</"
+"qt>"
 
-#: messagecomposer.cpp:2113
+#: messagecomposer.cpp:2115
 #, fuzzy
 msgid "Some Characters Will Be Lost"
 msgstr "มีบางอักขระสูญหายไป"
 
-#: messagecomposer.cpp:2114
+#: messagecomposer.cpp:2116
 msgid "Lose Characters"
 msgstr ""
 
-#: messagecomposer.cpp:2114
+#: messagecomposer.cpp:2116
 #, fuzzy
 msgid "Change Encoding"
 msgstr "ตั้งค่าชุดรหัสอักขระ"
 
-#: messagecomposer.cpp:2149
+#: messagecomposer.cpp:2151
 msgid ""
-"This message could not be signed, since no valid signing keys have been found; "
-"this should actually never happen, please report this bug."
+"This message could not be signed, since no valid signing keys have been "
+"found; this should actually never happen, please report this bug."
 msgstr ""
 
-#: messagecomposer.cpp:2168
+#: messagecomposer.cpp:2170
 msgid ""
 "This message could not be signed, since the chosen backend does not seem to "
 "support signing; this should actually never happen, please report this bug."
 msgstr ""
 
-#: messagecomposer.cpp:2195
+#: messagecomposer.cpp:2197
 msgid "GnuPG Audit Log for Signing Operation"
 msgstr ""
 
-#: messagecomposer.cpp:2200
+#: messagecomposer.cpp:2202
 msgid ""
 "The signing operation failed. Please make sure that the gpg-agent program is "
 "running."
 msgstr ""
 
-#: messagecomposer.cpp:2223
+#: messagecomposer.cpp:2225
 msgid ""
-"This message could not be encrypted, since the chosen backend does not seem to "
-"support encryption; this should actually never happen, please report this bug."
+"This message could not be encrypted, since the chosen backend does not seem "
+"to support encryption; this should actually never happen, please report this "
+"bug."
 msgstr ""
 
-#: messagecomposer.cpp:2249 messagecomposer.cpp:2300
+#: messagecomposer.cpp:2251 messagecomposer.cpp:2302
 msgid "GnuPG Audit Log for Encryption Operation"
 msgstr ""
 
-#: messagecomposer.cpp:2271
+#: messagecomposer.cpp:2273
 msgid ""
-"This message could not be signed and encrypted, since the chosen backend does "
-"not seem to support combined signing and encryption; this should actually never "
-"happen, please report this bug."
+"This message could not be signed and encrypted, since the chosen backend "
+"does not seem to support combined signing and encryption; this should "
+"actually never happen, please report this bug."
 msgstr ""
 
 #: newfolderdialog.cpp:59
@@ -10600,10 +10542,10 @@ msgstr "รูปแบบกล่องจดหมาย:"
 
 #: newfolderdialog.cpp:101
 msgid ""
-"Select whether you want to store the messages in this folder as one file per  "
-"message (maildir) or as one big file (mbox). KMail uses maildir by default and "
-"this only needs to be changed in rare circumstances. If you are unsure, leave "
-"this option as-is."
+"Select whether you want to store the messages in this folder as one file "
+"per  message (maildir) or as one big file (mbox). KMail uses maildir by "
+"default and this only needs to be changed in rare circumstances. If you are "
+"unsure, leave this option as-is."
 msgstr ""
 
 #: newfolderdialog.cpp:124
@@ -10614,8 +10556,8 @@ msgstr "ไอคอนโฟลเดอร์"
 #: newfolderdialog.cpp:129
 msgid ""
 "Select whether you want the new folder to be used for mail storage of for "
-"storage of groupware items such as tasks or notes. The default is mail. If you "
-"are unsure, leave this option as-is."
+"storage of groupware items such as tasks or notes. The default is mail. If "
+"you are unsure, leave this option as-is."
 msgstr ""
 
 #: newfolderdialog.cpp:165
@@ -10660,8 +10602,7 @@ msgstr "ได้ผลลัพธ์ที่แตกต่างกันส
 msgid "The crypto engine returned no cleartext data."
 msgstr ""
 
-#: objecttreeparser.cpp:670 objecttreeparser.cpp:2594
-#: objecttreeparser.cpp:2637
+#: objecttreeparser.cpp:670 objecttreeparser.cpp:2594 objecttreeparser.cpp:2637
 msgid "Status: "
 msgstr "สถานะ: "
 
@@ -10693,8 +10634,8 @@ msgstr ""
 #: objecttreeparser.cpp:704
 #, fuzzy, c-format
 msgid ""
-"The message is signed, but the validity of the signature cannot be verified.<br "
-"/>Reason: %1"
+"The message is signed, but the validity of the signature cannot be verified."
+"<br />Reason: %1"
 msgstr "ไม่สามารถตรวจสอบลายเซ็นได้"
 
 #: objecttreeparser.cpp:737
@@ -10733,27 +10674,25 @@ msgstr "ปลั๊กอินเข้ารหัส %1 ไม่สาม�
 #: objecttreeparser.cpp:1000
 #, fuzzy
 msgid ""
-"<b>Note:</b> This HTML message may contain external references to images etc. "
-"For security/privacy reasons external references are not loaded. If you trust "
-"the sender of this message then you can load the external references for this "
-"message <a href=\"kmail:loadExternal\">by clicking here</a>."
+"<b>Note:</b> This HTML message may contain external references to images "
+"etc. For security/privacy reasons external references are not loaded. If you "
+"trust the sender of this message then you can load the external references "
+"for this message <a href=\"kmail:loadExternal\">by clicking here</a>."
 msgstr ""
-"<b>คำแนะนำ:</b> นี่เป็นจดหมายแบบ HTML โดยเพื่อความปลอดภัย "
-"จะแสดงเฉพาะส่วนที่เป็น HTML แท้ ๆ เท่านั้น "
-"หากคุณมั่นใจว่าเป็นจดหมายที่ส่งมาจากคนที่คุณเชื่อถือได้ คุณสามารถให้แสดงผล HTML "
+"<b>คำแนะนำ:</b> นี่เป็นจดหมายแบบ HTML โดยเพื่อความปลอดภัย จะแสดงเฉพาะส่วนที่เป็น HTML "
+"แท้ ๆ เท่านั้น หากคุณมั่นใจว่าเป็นจดหมายที่ส่งมาจากคนที่คุณเชื่อถือได้ คุณสามารถให้แสดงผล HTML "
 "อย่างเต็มรูปแบบได้ โดยการ <a href=\"kmail:showHTML\">คลิ้กที่นี่</a>."
 
 #: objecttreeparser.cpp:1010
 #, fuzzy
 msgid ""
-"<b>Note:</b> This is an HTML message. For security reasons, only the raw HTML "
-"code is shown. If you trust the sender of this message then you can activate "
-"formatted HTML display for this message <a href=\"kmail:showHTML\">"
-"by clicking here</a>."
+"<b>Note:</b> This is an HTML message. For security reasons, only the raw "
+"HTML code is shown. If you trust the sender of this message then you can "
+"activate formatted HTML display for this message <a href=\"kmail:showHTML"
+"\">by clicking here</a>."
 msgstr ""
-"<b>คำแนะนำ:</b> นี่เป็นจดหมายแบบ HTML โดยเพื่อความปลอดภัย "
-"จะแสดงเฉพาะส่วนที่เป็น HTML แท้ ๆ เท่านั้น "
-"หากคุณมั่นใจว่าเป็นจดหมายที่ส่งมาจากคนที่คุณเชื่อถือได้ คุณสามารถให้แสดงผล HTML "
+"<b>คำแนะนำ:</b> นี่เป็นจดหมายแบบ HTML โดยเพื่อความปลอดภัย จะแสดงเฉพาะส่วนที่เป็น HTML "
+"แท้ ๆ เท่านั้น หากคุณมั่นใจว่าเป็นจดหมายที่ส่งมาจากคนที่คุณเชื่อถือได้ คุณสามารถให้แสดงผล HTML "
 "อย่างเต็มรูปแบบได้ โดยการ <a href=\"kmail:showHTML\">คลิ้กที่นี่</a>."
 
 #: objecttreeparser.cpp:1227
@@ -11006,8 +10945,8 @@ msgstr "ที่เก็บไว้: "
 #: objecttreeparser.cpp:2513
 #, fuzzy
 msgid ""
-"No mail address is stored in the %1 used for signing, so we cannot compare it "
-"to the sender's address %2."
+"No mail address is stored in the %1 used for signing, so we cannot compare "
+"it to the sender's address %2."
 msgstr ""
 "ไม่มีที่อยู่อีเมล์ที่ถูกเก็บไว้ใน %1 ซึ่งใช้สำหรับการเซ็น ดังนั้น "
 "เราจึงไม่สามารถเปรียบเทียบมันกับที่อยู่ผู้ส่ง &lt;%2&gt; ได้"
@@ -11129,10 +11068,11 @@ msgstr "ข้อความผิดพลาดจาก Kioslave"
 
 #: popaccount.cpp:495
 msgid ""
-"Your POP3 server (Account: %1) does not support the UIDL command: this command "
-"is required to determine, in a reliable way, which of the mails on the server "
-"KMail has already seen before;\n"
-"the feature to leave the mails on the server will therefore not work properly."
+"Your POP3 server (Account: %1) does not support the UIDL command: this "
+"command is required to determine, in a reliable way, which of the mails on "
+"the server KMail has already seen before;\n"
+"the feature to leave the mails on the server will therefore not work "
+"properly."
 msgstr ""
 
 #: popaccount.cpp:752
@@ -11150,9 +11090,9 @@ msgstr ""
 #: popaccount.cpp:905
 #, fuzzy
 msgid ""
-"Fetching message %1 of %2 (%3 of %4 KB) for %5@%6 (%7 KB remain on the server)."
-msgstr ""
-"กำลังดึงจดหมาย %1 จาก %2 (%3 จาก %4 KB) จาก %5 (คงเหลือบนเซิร์ฟเวอร์ %6 KB)"
+"Fetching message %1 of %2 (%3 of %4 KB) for %5@%6 (%7 KB remain on the "
+"server)."
+msgstr "กำลังดึงจดหมาย %1 จาก %2 (%3 จาก %4 KB) จาก %5 (คงเหลือบนเซิร์ฟเวอร์ %6 KB)"
 
 #: popaccount.cpp:912
 #, fuzzy
@@ -11170,1647 +11110,14 @@ msgstr "การตอบกลับของเซิร์ฟเวอร์
 
 #: popaccount.cpp:1026
 msgid ""
-"Your server does not support the TOP command. Therefore it is not possible to "
-"fetch the headers of large emails first, before downloading them."
+"Your server does not support the TOP command. Therefore it is not possible "
+"to fetch the headers of large emails first, before downloading them."
 msgstr ""
 "เซิร์ฟเวอร์ของคุณไม่สนับสนุนคำสั่ง TOP ซึ่งจะทำให้ไม่สามารถดึง "
 "หัวจดหมายออกจากจดหมายขนาดใหญ่ก่อนได้ ก่อนที่จะทำการดาวน์โหลดมัน"
 
-#. i18n: file kmail_part.rc line 80
-#: rc.cpp:15 rc.cpp:81
-#, no-c-format
-msgid "&Go"
-msgstr "ไปยัง"
-
-#. i18n: file kmail_part.rc line 92
-#: rc.cpp:18 rc.cpp:84
-#, no-c-format
-msgid "F&older"
-msgstr "โฟลเดอร์"
-
-#. i18n: file kmail_part.rc line 116
-#: rc.cpp:21 rc.cpp:45 rc.cpp:87 rc.cpp:120
-#, no-c-format
-msgid "&Message"
-msgstr "จดหมาย"
-
-#. i18n: file kmail_part.rc line 122
-#: rc.cpp:24 rc.cpp:90 rc.cpp:123
-#, no-c-format
-msgid "Reply Special"
-msgstr "ตอบกลับแบบพิเศษ"
-
-#. i18n: file kmail_part.rc line 128
-#: rc.cpp:27 rc.cpp:93 rc.cpp:126
-#, no-c-format
-msgid "&Forward"
-msgstr "ส่งต่อ"
-
-#. i18n: file kmcomposerui.rc line 102
-#: rc.cpp:66
-#, no-c-format
-msgid "HTML Toolbar"
-msgstr "แถบเครื่องมือ HTML"
-
-#. i18n: file composercryptoconfiguration.ui line 24
-#: rc.cpp:135
-#, no-c-format
-msgid "Signing"
-msgstr "ลงลายเซ็น"
-
-#. i18n: file composercryptoconfiguration.ui line 35
-#: rc.cpp:138
-#, no-c-format
-msgid "&Automatically sign messages"
-msgstr "เซ็นจดหมายโดยอัตโนมัติ"
-
-#. i18n: file composercryptoconfiguration.ui line 38
-#: rc.cpp:141
-#, no-c-format
-msgid ""
-"When this option is enabled, all messages you send will be signed by default; "
-"of course, it is still possible to disable signing for each message "
-"individually."
-msgstr ""
-
-#. i18n: file composercryptoconfiguration.ui line 48
-#: rc.cpp:144
-#, no-c-format
-msgid "Encrypting"
-msgstr "การเข้ารหัส"
-
-#. i18n: file composercryptoconfiguration.ui line 59
-#: rc.cpp:147
-#, no-c-format
-msgid ""
-"When encrypting emails, always also encr&ypt to the certificate of my own "
-"identity"
-msgstr ""
-
-#. i18n: file composercryptoconfiguration.ui line 62
-#: rc.cpp:150
-#, no-c-format
-msgid ""
-"When this option is enabled, the message/file will not only be encrypted with "
-"the receiver's public key, but also with your key. This will enable you to "
-"decrypt the message/file at a later time. This is generally a good idea."
-msgstr ""
-
-#. i18n: file composercryptoconfiguration.ui line 70
-#: rc.cpp:153
-#, no-c-format
-msgid "Show s&igned/encrypted text after composing"
-msgstr "แสดงข้อความลายเซ็น/การเข้ารหัสหลังจากเขียนจดหมาย"
-
-#. i18n: file composercryptoconfiguration.ui line 73
-#: rc.cpp:156
-#, no-c-format
-msgid ""
-"When this option is enabled, the signed/encrypted text will be shown in a "
-"separate window, enabling you to know how it will look before it is sent. This "
-"is a good idea when you are verifying that your encryption system works."
-msgstr ""
-
-#. i18n: file composercryptoconfiguration.ui line 81
-#: rc.cpp:159
-#, no-c-format
-msgid "Store sent messages encry&pted"
-msgstr "จัดเก็บจดหมายเข้ารหัสที่ส่งแล้ว"
-
-#. i18n: file composercryptoconfiguration.ui line 87
-#: rc.cpp:162
-#, no-c-format
-msgid "Check to store messages encrypted "
-msgstr "เลือกเพื่อให้มีการจัดเก็บจดหมายที่เข้ารหัสไว้"
-
-#. i18n: file composercryptoconfiguration.ui line 95
-#: rc.cpp:165
-#, no-c-format
-msgid ""
-"<qt>\n"
-"<h1>Store Messages Encrypted</h1>\n"
-"When this box is checked, sent messages are stored encrypted like they were "
-"sent. This is not recommended, as you will not be able to read the messages any "
-"longer if a necessary certificate expires.\n"
-"<p>\n"
-"However, there may be local rules that require you to turn this option on. When "
-"in doubt, check with your local administrator.\n"
-"</qt>"
-msgstr ""
-
-#. i18n: file composercryptoconfiguration.ui line 103
-#: rc.cpp:173
-#, no-c-format
-msgid "Always show the encryption keys &for approval"
-msgstr "แสดงกุญแจเข้ารหัสสำหรับการอนุญาตเสมอ"
-
-#. i18n: file composercryptoconfiguration.ui line 106
-#: rc.cpp:176
-#, no-c-format
-msgid ""
-"When this option is enabled, the application will always show you a list of "
-"public keys from which you can choose the one it will use for encryption. If it "
-"is off, the application will only show the dialog if it cannot find the right "
-"key or if there are several which could be used."
-msgstr ""
-
-#. i18n: file composercryptoconfiguration.ui line 114
-#: rc.cpp:179
-#, no-c-format
-msgid "Automatically encrypt &messages whenever possible"
-msgstr "ทำการเข้ารหัสจดหมายหากสามารถทำได้โดยอัตโนมัติ"
-
-#. i18n: file composercryptoconfiguration.ui line 117
-#: rc.cpp:182
-#, no-c-format
-msgid ""
-"When this option is enabled, every message you send will be encrypted whenever "
-"encryption is possible and desired; of course, it is still possible to disable "
-"the automatic encryption for each message individually."
-msgstr ""
-
-#. i18n: file composercryptoconfiguration.ui line 125
-#: rc.cpp:185
-#, no-c-format
-msgid "Never sign/encrypt when sa&ving as draft"
-msgstr "ไม่ต้องเซ็น/เข้ารหัสเมื่อบันทึกเป็นจดหมายฉบับร่าง"
-
-#. i18n: file customtemplates_base.ui line 118
-#: rc.cpp:194 rc.cpp:462
-#, no-c-format
-msgid "How does this work?"
-msgstr ""
-
-#. i18n: file customtemplates_base.ui line 169
-#: rc.cpp:197 templateparser.cpp:417
-#, fuzzy, no-c-format
-msgid "To:"
-msgstr "ถึง: "
-
-#. i18n: file customtemplates_base.ui line 177
-#: rc.cpp:200 templateparser.cpp:421
-#, fuzzy, no-c-format
-msgid "CC:"
-msgstr "สำเนาถึง: "
-
-#. i18n: file customtemplates_base.ui line 234
-#: rc.cpp:203
-#, fuzzy, no-c-format
-msgid "Universal"
-msgstr "ทั่วไป"
-
-#. i18n: file customtemplates_base.ui line 239
-#: rc.cpp:206
-#, fuzzy, no-c-format
-msgid "Reply"
-msgstr "ตอบกลับไปยัง"
-
-#. i18n: file customtemplates_base.ui line 244
-#: rc.cpp:209
-#, fuzzy, no-c-format
-msgid "Reply to All"
-msgstr "ตอบกลับทั้งหมด..."
-
-#. i18n: file customtemplates_base.ui line 249
-#: rc.cpp:212
-#, fuzzy, no-c-format
-msgid "Forward"
-msgstr "ส่งต่อ"
-
-#. i18n: file customtemplates_base.ui line 261
-#: rc.cpp:215
-#, fuzzy, no-c-format
-msgid "Shortc&ut:"
-msgstr "ปุ่มพิมพ์ลัด:"
-
-#. i18n: file customtemplates_base.ui line 283
-#: rc.cpp:218
-#, no-c-format
-msgid "&Template type:"
-msgstr ""
-
-#. i18n: file folderpropertiesdialog.ui line 16
-#: rc.cpp:224
-#, fuzzy, no-c-format
-msgid "Folder Properties"
-msgstr "ตำแหน่งโฟลเดอร์"
-
-#. i18n: file folderpropertiesdialog.ui line 63
-#: rc.cpp:233
-#, fuzzy, no-c-format
-msgid "Folder holds a &mailing list"
-msgstr "โฟลเดอร์เก็บจดหมายเวียน"
-
-#. i18n: file folderpropertiesdialog.ui line 91
-#: rc.cpp:236
-#, fuzzy, no-c-format
-msgid "List &address:"
-msgstr "ที่อยู่ทางไปรษณีย์:"
-
-#. i18n: file folderpropertiesdialog.ui line 122
-#: rc.cpp:239
-#, fuzzy, no-c-format
-msgid "N&ormal:"
-msgstr "ธรรมดา:"
-
-#. i18n: file folderpropertiesdialog.ui line 215
-#: rc.cpp:242
-#, fuzzy, no-c-format
-msgid "Unr&ead:"
-msgstr "ยังไม่ได้อ่าน:"
-
-#. i18n: file folderpropertiesdialog.ui line 269
-#: rc.cpp:248
-#, fuzzy, no-c-format
-msgid "Message Expiring"
-msgstr "ให้จดหมายเก่าหมดอายุ"
-
-#. i18n: file folderpropertiesdialog.ui line 283
-#: rc.cpp:251
-#, fuzzy, no-c-format
-msgid "E&xpire after:"
-msgstr "หมดอายุ"
-
-#. i18n: file folderpropertiesdialog.ui line 311
-#: rc.cpp:254
-#, fuzzy, no-c-format
-msgid "Expire &read messages"
-msgstr "ให้จดหมายเก่าหมดอายุ ?"
-
-#. i18n: file folderpropertiesdialog.ui line 339
-#: rc.cpp:257
-#, fuzzy, no-c-format
-msgid "Expire a&fter:"
-msgstr "โฟลเดอร์์หมดอายุ"
-
-#. i18n: file folderpropertiesdialog.ui line 350
-#: rc.cpp:260
-#, fuzzy, no-c-format
-msgid "Expire &unread messages"
-msgstr "ให้จดหมายเก่าหมดอายุ ?"
-
-#. i18n: file folderpropertiesdialog.ui line 384
-#: rc.cpp:263 rc.cpp:272
-#, no-c-format
-msgid "Day(s)"
-msgstr "วัน"
-
-#. i18n: file folderpropertiesdialog.ui line 389
-#: rc.cpp:266 rc.cpp:275
-#, no-c-format
-msgid "Week(s)"
-msgstr "สัปดาห์"
-
-#. i18n: file folderpropertiesdialog.ui line 394
-#: rc.cpp:269 rc.cpp:278
-#, no-c-format
-msgid "Month(s)"
-msgstr "เดือน"
-
-#. i18n: file folderpropertiesdialog.ui line 451
-#: rc.cpp:281
-#, fuzzy, no-c-format
-msgid "Advanced"
-msgstr "ตัวเลือกเพิ่มเติม"
-
-#. i18n: file folderpropertiesdialog.ui line 462
-#: rc.cpp:284
-#, fuzzy, no-c-format
-msgid "Sender identit&y:"
-msgstr "การแสดงตัวใหม่:"
-
-#. i18n: file folderpropertiesdialog.ui line 483
-#: rc.cpp:287
-#, fuzzy, no-c-format
-msgid "&Storage format:"
-msgstr "ปรับเปลี่ยนรูปแบบวันที่ใหม่"
-
-#. i18n: file folderpropertiesdialog.ui line 494
-#: rc.cpp:290
-#, no-c-format
-msgid "&List displays:"
-msgstr ""
-
-#. i18n: file smimeconfiguration.ui line 24
-#: rc.cpp:299
-#, no-c-format
-msgid "Validate certificates using CRLs"
-msgstr ""
-
-#. i18n: file smimeconfiguration.ui line 30
-#: rc.cpp:302
-#, no-c-format
-msgid ""
-"If this option is selected, S/MIME certificates are validated using Certificate "
-"Revocation Lists (CRLs)."
-msgstr ""
-
-#. i18n: file smimeconfiguration.ui line 38
-#: rc.cpp:305
-#, no-c-format
-msgid "Validate certificates online (OCSP)"
-msgstr ""
-
-#. i18n: file smimeconfiguration.ui line 41
-#: rc.cpp:308
-#, no-c-format
-msgid ""
-"If this option is selected, S/MIME certificates are validated online using the "
-"Online Certificates Status Protocol (OCSP). Fill in the URL of the OCSP "
-"responder below."
-msgstr ""
-
-#. i18n: file smimeconfiguration.ui line 49
-#: rc.cpp:311
-#, fuzzy, no-c-format
-msgid "Online Certificate Validation"
-msgstr "สร้างใบรับรอง"
-
-#. i18n: file smimeconfiguration.ui line 68
-#: rc.cpp:314
-#, no-c-format
-msgid "OCSP responder URL:"
-msgstr ""
-
-#. i18n: file smimeconfiguration.ui line 76
-#: rc.cpp:317
-#, no-c-format
-msgid ""
-"Enter here the address of the server for online validation of certificates "
-"(OCSP responder). The URL is usually starting with http://."
-msgstr ""
-
-#. i18n: file smimeconfiguration.ui line 94
-#: rc.cpp:320
-#, fuzzy, no-c-format
-msgid "OCSP responder signature:"
-msgstr "ลายเซ็นใช้ได้"
-
-#. i18n: file smimeconfiguration.ui line 126
-#: rc.cpp:323
-#, fuzzy, no-c-format
-msgid "Ignore service URL of certificates"
-msgstr "หาใบรับรองอื่น ๆ"
-
-#. i18n: file smimeconfiguration.ui line 136
-#: rc.cpp:326
-#, fuzzy, no-c-format
-msgid "Do not check certificate policies"
-msgstr "อย่าส่งใบรับรอง"
-
-#. i18n: file smimeconfiguration.ui line 139
-#: rc.cpp:329
-#, no-c-format
-msgid ""
-"By default GnuPG uses the file ~/.gnupg/policies.txt to check if a certificate "
-"policy is allowed. If this option is selected, policies are not checked."
-msgstr ""
-
-#. i18n: file smimeconfiguration.ui line 147
-#: rc.cpp:332
-#, no-c-format
-msgid "Never consult a CRL"
-msgstr ""
-
-#. i18n: file smimeconfiguration.ui line 150
-#: rc.cpp:335
-#, no-c-format
-msgid ""
-"If this option is checked, Certificate Revocation Lists are never used to "
-"validate S/MIME certificates."
-msgstr ""
-
-#. i18n: file smimeconfiguration.ui line 158
-#: rc.cpp:338
-#, fuzzy, no-c-format
-msgid "Fetch missing issuer certificates"
-msgstr "เมื่อมีการเพิ่มใบรับรอง"
-
-#. i18n: file smimeconfiguration.ui line 161
-#: rc.cpp:341
-#, no-c-format
-msgid ""
-"If this option is checked, missing issuer certificates are fetched when "
-"necessary (this applies to both validation methods, CRLs and OCSP)"
-msgstr ""
-
-#. i18n: file smimeconfiguration.ui line 169
-#: rc.cpp:344
-#, no-c-format
-msgid "HTTP Requests"
-msgstr ""
-
-#. i18n: file smimeconfiguration.ui line 180
-#: rc.cpp:347
-#, no-c-format
-msgid "Do not perform any HTTP requests"
-msgstr ""
-
-#. i18n: file smimeconfiguration.ui line 183
-#: rc.cpp:350
-#, no-c-format
-msgid "Entirely disables the use of HTTP for S/MIME."
-msgstr ""
-
-#. i18n: file smimeconfiguration.ui line 224
-#: rc.cpp:356
-#, no-c-format
-msgid "Use this proxy for HTTP requests: "
-msgstr ""
-
-#. i18n: file smimeconfiguration.ui line 232
-#: rc.cpp:359
-#, no-c-format
-msgid "Use system HTTP proxy:"
-msgstr ""
-
-#. i18n: file smimeconfiguration.ui line 235
-#: rc.cpp:362
-#, no-c-format
-msgid ""
-"If this option is selected, the value of the HTTP proxy shown on the right "
-"(which comes from the environment variable http_proxy) will be used for any "
-"HTTP request."
-msgstr ""
-
-#. i18n: file smimeconfiguration.ui line 243
-#: rc.cpp:365
-#, no-c-format
-msgid ""
-"Enter here the location of your HTTP Proxy, which will be used for all HTTP "
-"requests relating to S/MIME. The syntax is host:port, for instance "
-"myproxy.nowhere.com:3128."
-msgstr ""
-
-#. i18n: file smimeconfiguration.ui line 253
-#: rc.cpp:368
-#, no-c-format
-msgid "Ignore HTTP CRL distribution point of certificates"
-msgstr ""
-
-#. i18n: file smimeconfiguration.ui line 256
-#: rc.cpp:371
-#, no-c-format
-msgid ""
-"When looking for the location of a CRL, the to-be-tested certificate usually "
-"contains what are known as \"CRL Distribution Point\" (DP) entries, which are "
-"URLs describing the way to access the URL. The first found DP entry is used.  "
-"With this option all entries using the HTTP scheme are ignored when looking for "
-"a suitable DP."
-msgstr ""
-
-#. i18n: file smimeconfiguration.ui line 268
-#: rc.cpp:374
-#, no-c-format
-msgid "LDAP Requests"
-msgstr ""
-
-#. i18n: file smimeconfiguration.ui line 279
-#: rc.cpp:377
-#, no-c-format
-msgid "Do not perform any LDAP requests"
-msgstr ""
-
-#. i18n: file smimeconfiguration.ui line 282
-#: rc.cpp:380
-#, no-c-format
-msgid "Entirely disables the use of LDAP for S/MIME."
-msgstr ""
-
-#. i18n: file smimeconfiguration.ui line 307
-#: rc.cpp:383
-#, no-c-format
-msgid "Ignore LDAP CRL distribution point of certificates"
-msgstr ""
-
-#. i18n: file smimeconfiguration.ui line 310
-#: rc.cpp:386
-#, no-c-format
-msgid ""
-"When looking for the location of a CRL, the to-be-tested certificate usually "
-"contains what are known as \"CRL Distribution Point\" (DP) entries, which are "
-"URLs describing the way to access the URL. The first found DP entry is used.  "
-"With this option all entries using the LDAP scheme are ignored when looking for "
-"a suitable DP."
-msgstr ""
-
-#. i18n: file smimeconfiguration.ui line 326
-#: rc.cpp:389
-#, no-c-format
-msgid "Primary host for LDAP requests:"
-msgstr ""
-
-#. i18n: file smimeconfiguration.ui line 335
-#: rc.cpp:392
-#, no-c-format
-msgid ""
-"Entering a LDAP server here will make all LDAP requests go to that server "
-"first. More precisely, this setting overrides any specified host and port part "
-"in a LDAP URL and will also be used if host and port have been omitted from the "
-"URL. Other LDAP servers will be used only if the connection to the \"proxy\" "
-"failed.\n"
-"The syntax is \"HOST\" or \"HOST:PORT\". If PORT is omitted, port 389 (standard "
-"LDAP port) is used."
-msgstr ""
-
-#. i18n: file snippetdlgbase.ui line 16
-#: rc.cpp:396
-#, no-c-format
-msgid "Add Snippet"
-msgstr ""
-
-#. i18n: file snippetdlgbase.ui line 52
-#: rc.cpp:399
-#, fuzzy, no-c-format
-msgid "&Add"
-msgstr "เพิ่ม..."
-
-#. i18n: file snippetdlgbase.ui line 111
-#: rc.cpp:408
-#, no-c-format
-msgid "&Snippet:"
-msgstr ""
-
-#. i18n: file snippetdlgbase.ui line 125
-#: rc.cpp:411
-#, fuzzy, no-c-format
-msgid "Group:"
-msgstr "กรุ๊ปแวร์"
-
-#. i18n: file snippetsettingsbase.ui line 16
-#: rc.cpp:414
-#, fuzzy, no-c-format
-msgid "Snippet Settings"
-msgstr "ปรับการตั้งค่าแบบอักษรเป็นค่าเดิม"
-
-#. i18n: file snippetsettingsbase.ui line 27
-#: rc.cpp:417
-#, no-c-format
-msgid "Tooltips"
-msgstr ""
-
-#. i18n: file snippetsettingsbase.ui line 38
-#: rc.cpp:420
-#, no-c-format
-msgid "Show snippet's text in &tooltip"
-msgstr ""
-
-#. i18n: file snippetsettingsbase.ui line 44
-#: rc.cpp:423
-#, no-c-format
-msgid ""
-"Decides if a tooltip should be shown containing text from the bookmarked line"
-msgstr ""
-
-#. i18n: file snippetsettingsbase.ui line 71
-#: rc.cpp:426
-#, no-c-format
-msgid "Variables"
-msgstr ""
-
-#. i18n: file snippetsettingsbase.ui line 82
-#: rc.cpp:429
-#, no-c-format
-msgid "Input Method for Variables"
-msgstr ""
-
-#. i18n: file snippetsettingsbase.ui line 93
-#: rc.cpp:432
-#, no-c-format
-msgid "Single dialog for each variable within a snippet"
-msgstr ""
-
-#. i18n: file snippetsettingsbase.ui line 102
-#: rc.cpp:435
-#, no-c-format
-msgid "An input dialog will be displayed for every variable within a snippet"
-msgstr ""
-
-#. i18n: file snippetsettingsbase.ui line 110
-#: rc.cpp:438
-#, no-c-format
-msgid "One dialog for all variables within a snippet"
-msgstr ""
-
-#. i18n: file snippetsettingsbase.ui line 119
-#: rc.cpp:441
-#, no-c-format
-msgid ""
-"A single dialog will be displayed where you can enter the values for all "
-"variables within a snippet"
-msgstr ""
-
-#. i18n: file snippetsettingsbase.ui line 137
-#: rc.cpp:444
-#, fuzzy, no-c-format
-msgid "Delimiter:"
-msgstr "ไม่จำกัด"
-
-#. i18n: file templatesconfiguration_base.ui line 30
-#: rc.cpp:447
-#, fuzzy, no-c-format
-msgid "TemplatesConfiguration"
-msgstr "ปรับแต่งลายเซ็น"
-
-#. i18n: file templatesconfiguration_base.ui line 129
-#: rc.cpp:453
-#, fuzzy, no-c-format
-msgid "Reply to Sender"
-msgstr "ตอบกลับไปยังผู้ส่ง:"
-
-#. i18n: file templatesconfiguration_base.ui line 172
-#: rc.cpp:456
-#, no-c-format
-msgid "Reply to All / Reply to List"
-msgstr ""
-
-#. i18n: file templatesconfiguration_base.ui line 215
-#: rc.cpp:459
-#, fuzzy, no-c-format
-msgid "Forward Message"
-msgstr "ส่งต่อข้อความแล้ว"
-
-#. i18n: file warningconfiguration.ui line 24
-#: rc.cpp:468
-#, no-c-format
-msgid "Warn when trying to send &unsigned messages"
-msgstr "แจ้งเตือนเมื่อพยายามจะส่งจดหมายที่ยังไม่ได้เซ็น"
-
-#. i18n: file warningconfiguration.ui line 30
-#: rc.cpp:471
-#, no-c-format
-msgid "Check to be warned when sending unsigned messages."
-msgstr "เลือกเพื่อให้มีการแจ้งเตือนเมื่อพยายามจะส่งจดหมายที่ยังไม่ได้เซ็น"
-
-#. i18n: file warningconfiguration.ui line 38
-#: rc.cpp:474
-#, no-c-format
-msgid ""
-"<qt>\n"
-"<h1>Warn When Trying To Send Unsigned Messages</h1>\n"
-"If this box is checked, you will be warned when you try to send parts of or the "
-"whole message unsigned.\n"
-"<p>\n"
-"It is recommended to leave this option turned on for maximum integrity.\n"
-"</qt>"
-msgstr ""
-
-#. i18n: file warningconfiguration.ui line 46
-#: rc.cpp:482
-#, no-c-format
-msgid "&Warn when trying to send unencrypted messages"
-msgstr "แจ้งเตือนเมื่อพยายามส่งจดหมายที่ไม่ได้เข้ารหัสไว้"
-
-#. i18n: file warningconfiguration.ui line 52
-#: rc.cpp:485
-#, no-c-format
-msgid "Check to be warned when sending unencrypted messages."
-msgstr "เช็คเพื่อให้มีการเตือนเมื่อมีการส่งจดหมายที่ไม่ได้เข้ารหัสไว้"
-
-#. i18n: file warningconfiguration.ui line 60
-#: rc.cpp:488
-#, no-c-format
-msgid ""
-"<qt>\n"
-"<h1>Warn When Trying To Send Unencrypted Messages</h1>\n"
-"If this box is checked, you will be warned when you try to send parts of or the "
-"whole message unencrypted.\n"
-"<p>\n"
-"It is recommended to leave this option turned on for maximum integrity.\n"
-"</qt>"
-msgstr ""
-
-#. i18n: file warningconfiguration.ui line 68
-#: rc.cpp:496
-#, fuzzy, no-c-format
-msgid "Warn if &Receiver's Email Address is Not in Certificate"
-msgstr "แจ้งเตือนหากที่อยู่อีเมล์ของผู้เซ็นไม่อยู่ในใบรับรอง"
-
-#. i18n: file warningconfiguration.ui line 74
-#: rc.cpp:499
-#, no-c-format
-msgid "Check to be warned if the address is not in the certificate"
-msgstr ""
-
-#. i18n: file warningconfiguration.ui line 82
-#: rc.cpp:502
-#, no-c-format
-msgid ""
-"<qt>\n"
-"<h1>Warn If Receiver's Email Address Is Not In Certificate</h1>\n"
-"If this option is checked, a warning is issued if the email address of the "
-"receiver is not contained in the certificate used for encrypting.\n"
-"<p>\n"
-"It is recommended to leave this option turned on for maximum security.\n"
-"</qt>"
-msgstr ""
-
-#. i18n: file warningconfiguration.ui line 90
-#: rc.cpp:510
-#, fuzzy, no-c-format
-msgid "Warn if certificates/keys expire soon (configure thresholds below)"
-msgstr "แจ้งเตือน หากองค์กรผู้ออกใบรับรองจะหมดอายุภายใน"
-
-#. i18n: file warningconfiguration.ui line 104
-#: rc.cpp:513
-#, fuzzy, no-c-format
-msgid "For signing"
-msgstr "ใช้สำหรับการเซ็น"
-
-#. i18n: file warningconfiguration.ui line 115
-#: rc.cpp:516
-#, fuzzy, no-c-format
-msgid "For encryption"
-msgstr "การเข้ารหัส"
-
-#. i18n: file warningconfiguration.ui line 126
-#: rc.cpp:519 rc.cpp:533 rc.cpp:547 rc.cpp:561 rc.cpp:575 rc.cpp:589
-#: rulewidgethandlermanager.cpp:1437
-#, no-c-format
-msgid " days"
-msgstr " วัน"
-
-#. i18n: file warningconfiguration.ui line 138
-#: rc.cpp:522 rc.cpp:536 rc.cpp:550 rc.cpp:564 rc.cpp:578 rc.cpp:592
-#, no-c-format
-msgid "Select the number of days here"
-msgstr "เลือกจำนวนของวันที่นี่"
-
-#. i18n: file warningconfiguration.ui line 146
-#: rc.cpp:525
-#, no-c-format
-msgid ""
-"<qt>\n"
-"<h1>Warn If Signature Certificate Expires</h1>\n"
-"Select the minimum number of days the signature certificate should be valid "
-"without issuing a warning.\n"
-"<p>\n"
-"The recommended SPHINX setting is 14 days.\n"
-"</qt>"
-msgstr ""
-
-#. i18n: file warningconfiguration.ui line 174
-#: rc.cpp:539
-#, no-c-format
-msgid ""
-"<qt>\n"
-"<h1>Warn If Encryption Certificate Expires</h1>\n"
-"Select the minimum number of days the encryption certificate should be valid "
-"without issuing a warning.\n"
-"<p>\n"
-"The recommended SPHINX setting is 14 days.\n"
-"</qt>"
-msgstr ""
-
-#. i18n: file warningconfiguration.ui line 202
-#: rc.cpp:553
-#, no-c-format
-msgid ""
-"<qt>\n"
-"<h1>Warn If A Certificate In The Chain Expires</h1>\n"
-"Select the minimum number of days all certificates in the chain should be valid "
-"without issuing a warning.\n"
-"<p>\n"
-"The recommended SPHINX setting is 14 days.\n"
-"</qt>"
-msgstr ""
-
-#. i18n: file warningconfiguration.ui line 230
-#: rc.cpp:567
-#, no-c-format
-msgid ""
-"<qt>\n"
-"<h1>Warn If CA Certificate Expires</h1>\n"
-"Select the minimum number of days the CA certificate should be valid without "
-"issuing a warning.\n"
-"<p>\n"
-"The recommended SPHINX setting is 14 days.\n"
-"</qt>"
-msgstr ""
-
-#. i18n: file warningconfiguration.ui line 258
-#: rc.cpp:581 rc.cpp:595
-#, no-c-format
-msgid ""
-"<qt>\n"
-"<h1>Warn If Root Certificate Expires</h1>\n"
-"Select the minimum number of days the root certificate should be valid without "
-"issuing a warning.\n"
-"<p>\n"
-"The recommended SPHINX setting is 14 days.\n"
-"</qt>"
-msgstr ""
-
-#. i18n: file warningconfiguration.ui line 294
-#: rc.cpp:603
-#, fuzzy, no-c-format
-msgid "For root certificates:"
-msgstr "หาใบรับรองอื่น ๆ"
-
-#. i18n: file warningconfiguration.ui line 305
-#: rc.cpp:606
-#, fuzzy, no-c-format
-msgid "For intermediate CA certificates:"
-msgstr "หาใบรับรองอื่น ๆ"
-
-#. i18n: file warningconfiguration.ui line 316
-#: rc.cpp:609
-#, fuzzy, no-c-format
-msgid "For end-user certificates/keys:"
-msgstr "อย่าส่งใบรับรอง"
-
-#. i18n: file warningconfiguration.ui line 388
-#: rc.cpp:612
-#, no-c-format
-msgid "Re-enable All \"Don't Ask Again\" Warnings"
-msgstr ""
-
-#. i18n: file customtemplates_kfg.kcfg line 12
-#: rc.cpp:615
-#, fuzzy, no-c-format
-msgid "Template content"
-msgstr "เนื้อหาในโฟลเดอร์:"
-
-#. i18n: file customtemplates_kfg.kcfg line 17
-#: rc.cpp:618
-#, no-c-format
-msgid "Template shortcut"
-msgstr ""
-
-#. i18n: file customtemplates_kfg.kcfg line 22
-#: rc.cpp:621
-#, no-c-format
-msgid "Template type"
-msgstr ""
-
-#. i18n: file kmail.kcfg line 61
-#: rc.cpp:624
-#, no-c-format
-msgid "Send queued mail on mail check"
-msgstr ""
-
-#. i18n: file kmail.kcfg line 62
-#: rc.cpp:627
-#, no-c-format
-msgid ""
-"<qt>"
-"<p>Select whether you want KMail to send all messages in the outbox on manual "
-"or all mail checks, or whether you do not want messages to be sent "
-"automatically at all. </p></qt>"
-msgstr ""
-
-#. i18n: file kmail.kcfg line 72
-#: rc.cpp:630
-#, no-c-format
-msgid ""
-"Automatically move non-synced mails from folders with insufficient access "
-"rights"
-msgstr ""
-
-#. i18n: file kmail.kcfg line 73
-#: rc.cpp:633
-#, no-c-format
-msgid ""
-"If there are new messages in a folder, which have not been uploaded to the "
-"server yet, but you do not have sufficient access rights on the folder now to "
-"upload them, these messages will automatically be moved into a lost and found "
-"folder."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 78
-#: rc.cpp:636
-#, no-c-format
-msgid "Allow local flags in read-only folders"
-msgstr ""
-
-#. i18n: file kmail.kcfg line 87
-#: rc.cpp:639
-#, no-c-format
-msgid ""
-"This setting allows administrators to set a minimum delay between two mail "
-"checks.\"\n"
-"           \"The user will not be able to choose a value smaller than the value "
-"set here."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 93
-#: rc.cpp:643
-#, no-c-format
-msgid "The most recently selected folder in the folder selection dialog."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 101
-#: rc.cpp:646
-#, no-c-format
-msgid ""
-"Disregard the users umask setting and use \"read-write for the user only\" "
-"instead"
-msgstr ""
-
-#. i18n: file kmail.kcfg line 109
-#: rc.cpp:652
-#, no-c-format
-msgid "Policy for showing the system tray icon"
-msgstr ""
-
-#. i18n: file kmail.kcfg line 117
-#: rc.cpp:655
-#, no-c-format
-msgid ""
-"Close the application when the mainwindow is closed, even if there is a system "
-"tray icon active."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 121
-#: rc.cpp:658
-#, fuzzy, no-c-format
-msgid "Verbose new mail notification"
-msgstr "การแจ้งเตือนเมื่อมีจดหมายใหม่"
-
-#. i18n: file kmail.kcfg line 122
-#: rc.cpp:661
-#, no-c-format
-msgid ""
-"If this option is enabled then for each folder the number of newly arrived "
-"messages is shown in the new mail notification; otherwise, you will only get a "
-"simple 'New mail arrived' message."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 126
-#: rc.cpp:664
-#, no-c-format
-msgid "Specify e&ditor:"
-msgstr "เครื่องมือแก้ไขข้อความ: "
-
-#. i18n: file kmail.kcfg line 130
-#: rc.cpp:667
-#, no-c-format
-msgid "Use e&xternal editor instead of composer"
-msgstr "ใช้เครื่องมือแก้ไขข้อความภายนอกแทนเครื่องมือเขียนจดหมายมาตรฐาน"
-
-#. i18n: file kmail.kcfg line 157
-#: rc.cpp:670
-#, no-c-format
-msgid ""
-"The threshold for when to warn the user that a folder is nearing its quota "
-"limit."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 166
-#: rc.cpp:673
-#, no-c-format
-msgid "Enable groupware functionality"
-msgstr ""
-
-#. i18n: file kmail.kcfg line 172
-#: rc.cpp:676
-#, no-c-format
-msgid "Mangle From:/To: headers in replies to replies"
-msgstr ""
-
-#. i18n: file kmail.kcfg line 173
-#: rc.cpp:679
-#, no-c-format
-msgid ""
-"Microsoft Outlook has a number of shortcomings in its implementation of the "
-"iCalendar standard; this option works around one of them. If you have problems "
-"with Outlook users not being able to get your replies, try setting this option."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 178
-#: rc.cpp:682
-#, no-c-format
-msgid "Send groupware invitations in the mail body"
-msgstr ""
-
-#. i18n: file kmail.kcfg line 179
-#: rc.cpp:685
-#, no-c-format
-msgid ""
-"Microsoft Outlook has a number of shortcomings  in its implementation of the "
-"iCalendar standard; this option works around one of them. If you have problems "
-"with Outlook users not being able to get your invitations, try setting this "
-"option."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 184
-#: rc.cpp:688
-#, fuzzy, no-c-format
-msgid "Exchange compatible invitations naming"
-msgstr "เข้ารหัสโดยใช้ OpenPGP โดยอัตโนมัติ"
-
-#. i18n: file kmail.kcfg line 185
-#: rc.cpp:691
-#, no-c-format
-msgid ""
-"Microsoft Outlook, when used in combination with a Microsoft Exchange server, "
-"has a problem understanding standards-compliant groupware e-mail. Turn this "
-"option on to send groupware invitations in a way that Microsoft Exchange "
-"understands."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 191
-#: rc.cpp:697
-#, no-c-format
-msgid ""
-"When replying to invitations, send the reply comment in way that Microsoft "
-"Outlook understands."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 197
-#: rc.cpp:703
-#, no-c-format
-msgid ""
-"When this is checked, you will not see the mail composer window. Instead, all "
-"invitation mails are sent automatically. If you want to see the mail before "
-"sending it, you can uncheck this option. However, be aware that the text in the "
-"composer window is in iCalendar syntax, and you should not try modifying it by "
-"hand."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 213
-#: rc.cpp:706
-#, no-c-format
-msgid "Delete invitation emails after the reply to them has been sent"
-msgstr ""
-
-#. i18n: file kmail.kcfg line 214
-#: rc.cpp:709
-#, no-c-format
-msgid ""
-"When this is checked, received invitation emails that have been replied to will "
-"be moved to the Trash folder, once the reply has been successfully sent."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 219
-#: rc.cpp:712
-#, no-c-format
-msgid ""
-"When encountering a Toltec scheduling message, display a custom replacement "
-"text for it."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 224
-#: rc.cpp:715
-#, no-c-format
-msgid ""
-"The text that will be displayed as a replacement when encountering Toltec "
-"scheduling messages."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 233
-#: rc.cpp:718
-#, no-c-format
-msgid ""
-"<p>Enabling this makes it possible to store the entries from the Kontact "
-"applications (KOrganizer, KAddressBook, and KNotes.)</p>"
-"<p>If you want to set this option you must also set the applications to use the "
-"IMAP resource; this is done in the Trinity Control Center.</p>"
-msgstr ""
-
-#. i18n: file kmail.kcfg line 238
-#: rc.cpp:721
-#, no-c-format
-msgid ""
-"<p>Usually you will not have any reason to see the folders that hold the IMAP "
-"resources. But if you need to see them, you can set that here.</p>"
-msgstr ""
-
-#. i18n: file kmail.kcfg line 247
-#: rc.cpp:724
-#, no-c-format
-msgid ""
-"<p>If the account used for storing groupware information \"\n"
-"          \"is not used to manage normal mail, set this option to make KMail "
-"only \"\n"
-"          \"show groupware folders in it. This is useful if you are handling "
-"regular \"\n"
-"          \"mail via an additional online IMAP account.</p>"
-msgstr ""
-
-#. i18n: file kmail.kcfg line 251
-#: rc.cpp:730
-#, no-c-format
-msgid ""
-"<p>Choose the storage format of the groupware folders. "
-"<ul>"
-"<li>The default format is to use the ical (for calendar folders) and vcard (for "
-"addressbook folders) standards. This format makes all Kontact features "
-"available.</li>"
-"<li>The Kolab XML format uses a custom model that matches more closely the one "
-"used in Outlook. This format gives better Outlook compatibility, when using a "
-"Kolab server or a compatible solution.</li></ul></p>"
-msgstr ""
-
-#. i18n: file kmail.kcfg line 260
-#: rc.cpp:733
-#, no-c-format
-msgid ""
-"<p>This chooses the parent of the IMAP resource folders.</p>"
-"<p>By default, the Kolab server sets the IMAP inbox to be the parent.</p>"
-msgstr ""
-
-#. i18n: file kmail.kcfg line 265
-#: rc.cpp:736
-#, no-c-format
-msgid "<p>This is the ID of the account holding the IMAP resource folders.</p>"
-msgstr ""
-
-#. i18n: file kmail.kcfg line 270
-#: rc.cpp:739
-#, no-c-format
-msgid ""
-"<p>If you want to set the folder names of the IMAP storage to your local "
-"language, you can choose between these available languages.</p>"
-"<p> Please note, that the only reason to do so is for compatibility with "
-"Microsoft Outlook. It is considered a bad idea to set this, since it makes "
-"changing languages impossible. </p>"
-"<p>So do not set this unless you have to.</p>"
-msgstr ""
-
-#. i18n: file kmail.kcfg line 276
-#: rc.cpp:742
-#, no-c-format
-msgid "Also filter new mails received in groupware folders."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 283
-#: rc.cpp:745
-#, no-c-format
-msgid ""
-"Synchronize groupware changes in DIMAP folders immediately when being online."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 292
-#: rc.cpp:748
-#, no-c-format
-msgid ""
-"This value is used to decide whether the KMail Introduction should be "
-"displayed."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 299
-#: rc.cpp:751
-#, no-c-format
-msgid "Maximal number of connections per host"
-msgstr ""
-
-#. i18n: file kmail.kcfg line 300
-#: rc.cpp:754
-#, no-c-format
-msgid ""
-"This can be used to restrict the number of connections per host while checking "
-"for new mail. By default the number of connections is unlimited (0)."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 308
-#: rc.cpp:757
-#, no-c-format
-msgid "Show quick search line edit"
-msgstr ""
-
-#. i18n: file kmail.kcfg line 309
-#: rc.cpp:760
-#, no-c-format
-msgid ""
-"This option enables or disables the search line edit above the message list "
-"which can be used to quickly search the information shown in the message list."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 313
-#: rc.cpp:763
-#, no-c-format
-msgid "Hide local inbox if unused"
-msgstr ""
-
-#. i18n: file kmail.kcfg line 321
-#: rc.cpp:766
-#, no-c-format
-msgid "Forward Inline As Default."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 325
-#: rc.cpp:769
-#, no-c-format
-msgid ""
-"Allow the semicolon charactor (';') to be used as separator in the message "
-"composer."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 328
-#: rc.cpp:772
-#, fuzzy, no-c-format
-msgid "Keep original charset when replying or forwarding if possible"
-msgstr ""
-"ใช้ชุดรหัสอักขระปริยายของเจ้าของ เมื่อมีการตอบกลับหรือมีการส่งต่อ (หากทำได้)"
-
-#. i18n: file kmail.kcfg line 332
-#: rc.cpp:775
-#, fuzzy, no-c-format
-msgid "A&utomatically insert signature"
-msgstr "เพิ่มลายเซ็นท้ายจดหมายอัตโนมัติ"
-
-#. i18n: file kmail.kcfg line 337
-#: rc.cpp:778
-#, no-c-format
-msgid ""
-"Remember this identity, so that it will be used in future composer windows as "
-"well.\n"
-"        "
-msgstr ""
-
-#. i18n: file kmail.kcfg line 341
-#: rc.cpp:782
-#, no-c-format
-msgid ""
-"Remember this folder for sent items, so that it will be used in future composer "
-"windows as well."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 345
-#: rc.cpp:785
-#, no-c-format
-msgid ""
-"Remember this mail transport, so that it will be used in future composer "
-"windows as well."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 350
-#: rc.cpp:788
-#, no-c-format
-msgid ""
-"Remember this dictionary, so that it will be used in future composer windows as "
-"well.\n"
-"        "
-msgstr ""
-
-#. i18n: file kmail.kcfg line 354
-#: rc.cpp:792
-#, no-c-format
-msgid "Word &wrap at column:"
-msgstr "ตัดคำที่คอลัมน์:"
-
-#. i18n: file kmail.kcfg line 368
-#: rc.cpp:798
-#, fuzzy, no-c-format
-msgid "Warn if the number of recipients is larger than"
-msgstr "แจ้งเตือน หากรากของใบรับรองจะหมดอายุภายใน"
-
-#. i18n: file kmail.kcfg line 370
-#: rc.cpp:801 rc.cpp:804
-#, no-c-format
-msgid ""
-"If the number of recipients is larger than this value, KMail will warn and ask "
-"for a confirmation before sending the mail. The warning can be turned off."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 390
-#: rc.cpp:810
-#, no-c-format
-msgid ""
-"Turn this option on to make Outlook &#8482; understand attachment names "
-"containing non-English characters"
-msgstr ""
-
-#. i18n: file kmail.kcfg line 416
-#: rc.cpp:816
-#, no-c-format
-msgid "Automatically request &message disposition notifications"
-msgstr ""
-
-#. i18n: file kmail.kcfg line 417
-#: rc.cpp:819
-#, no-c-format
-msgid ""
-"<qt>"
-"<p>Enable this option if you want KMail to request Message Disposition "
-"Notifications (MDNs) for each of your outgoing messages.</p>"
-"<p>This option only affects the default; you can still enable or disable MDN "
-"requesting on a per-message basis in the composer, menu item <em>Options</em>->"
-"<em>Request Disposition Notification</em>.</p></qt>"
-msgstr ""
-
-#. i18n: file kmail.kcfg line 421
-#: rc.cpp:822
-#, no-c-format
-msgid "Use recent addresses for autocompletion"
-msgstr "ใช้ที่อยู่ล่าสุดสำหรับการทำให้สมบูรณ์"
-
-#. i18n: file kmail.kcfg line 422
-#: rc.cpp:825
-#, no-c-format
-msgid ""
-"Disable this option if you do not want recently used addresses to appear in the "
-"autocompletion list in the composer's address fields."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 443
-#: rc.cpp:828
-#, no-c-format
-msgid "Autosave interval:"
-msgstr "บันทึกอัตโนมัติทุกช่วงเวลา:"
-
-#. i18n: file kmail.kcfg line 444
-#: rc.cpp:831
-#, no-c-format
-msgid ""
-"A backup copy of the text in the composer window can be created regularly. The "
-"interval used to create the backups is set here. You can disable autosaving by "
-"setting it to the value 0."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 448
-#: rc.cpp:834
-#, no-c-format
-msgid "Insert signatures above quoted text"
-msgstr ""
-
-#. i18n: file kmail.kcfg line 455
-#: rc.cpp:837
-#, no-c-format
-msgid "Replace recognized prefi&x with \"Re:\""
-msgstr "แทนที่คำนำหน้าที่เลือกด้วย  \"Re:\""
-
-#. i18n: file kmail.kcfg line 462
-#: rc.cpp:840
-#, no-c-format
-msgid "Replace recognized prefix with \"&Fwd:\""
-msgstr "แทนที่คำนำหน้าที่เลือกด้วย \"&Fwd:\""
-
-#. i18n: file kmail.kcfg line 466
-#: rc.cpp:843
-#, no-c-format
-msgid "Use smart &quoting"
-msgstr "ใช้การอ้างถึงแบบฉลาด"
-
-#. i18n: file kmail.kcfg line 470
-#: rc.cpp:846
-#, fuzzy, no-c-format
-msgid "Remove the signature when replying"
-msgstr "ลายเซ็นหมดอายุ"
-
-#. i18n: file kmail.kcfg line 474
-#: rc.cpp:849
-#, no-c-format
-msgid "Only quote selected text when replying"
-msgstr ""
-
-#. i18n: file kmail.kcfg line 479
-#: rc.cpp:852
-#, no-c-format
-msgid "Type of addressee selector"
-msgstr ""
-
-#. i18n: file kmail.kcfg line 481
-#: rc.cpp:855
-#, no-c-format
-msgid ""
-"Sets the type of the dialog for selecting recipients for To,\n"
-"        CC and BCC."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 489
-#: rc.cpp:859
-#, fuzzy, no-c-format
-msgid "Type of recipients editor"
-msgstr "ไม่มีผู้รับ"
-
-#. i18n: file kmail.kcfg line 491
-#: rc.cpp:862
-#, no-c-format
-msgid ""
-"Sets the type of the recipients editor for editing To,\n"
-"        CC and BCC."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 506
-#: rc.cpp:866
-#, fuzzy, no-c-format
-msgid "Maximum number of recipient editor lines."
-msgstr "ไม่มีผู้รับ"
-
-#. i18n: file kmail.kcfg line 512
-#: rc.cpp:869
-#, no-c-format
-msgid ""
-"List of message part types to strip off mails that are being forwarded inline."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 516
-#: rc.cpp:872
-#, no-c-format
-msgid "The maximum size in MB that email attachments are allowed to have."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 521
-#: rc.cpp:875
-#, no-c-format
-msgid "Show the Text Snippet Management and Insertion Panel in the composer."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 528
-#: rc.cpp:878
-#, no-c-format
-msgid ""
-"Show the GnuPG Audit Log even after crypto operations that completed "
-"successfully."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 557
-#: rc.cpp:881
-#, fuzzy, no-c-format
-msgid "Close message window after replying or forwarding the message."
-msgstr ""
-"ใช้ชุดรหัสอักขระปริยายของเจ้าของ เมื่อมีการตอบกลับหรือมีการส่งต่อ (หากทำได้)"
-
-#. i18n: file kmail.kcfg line 572
-#: rc.cpp:884
-#, no-c-format
-msgid ""
-"Some emails, especially those generated automatically, do not specify the "
-"character encoding which needs to be used to properly display them. In such "
-"cases a fallback character encoding will be used, which you can configure here. "
-"Set it to the character encoding most commonly used in your part of the world. "
-"As a default the encoding configured for the whole system is used."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 578
-#: rc.cpp:887
-#, no-c-format
-msgid ""
-"Changing this from its default 'Auto' will force the use of the specified "
-"encoding for all emails, regardless of what they specify themselves."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 584
-#: rc.cpp:893
-#, no-c-format
-msgid ""
-"Enable this if you want smileys like :-) appearing in the message text to be "
-"replaced by emoticons (small pictures)."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 589
-#: rc.cpp:899
-#, no-c-format
-msgid ""
-"Enable this option to show different levels of quoted text. Disable to hide the "
-"levels of quoted text."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 592
-#: rc.cpp:902
-#, no-c-format
-msgid "Automatic collapse level:"
-msgstr "ระดับการยุบอัตโนมัติ:"
-
-#. i18n: file kmail.kcfg line 600
-#: rc.cpp:905
-#, no-c-format
-msgid "Reduce font size for quoted text"
-msgstr "ลดขนาดอักษรสำหรับส่วนข้อความที่อ้างถึง"
-
-#. i18n: file kmail.kcfg line 601
-#: rc.cpp:908
-#, no-c-format
-msgid "Enable this option to show quoted text with a smaller font."
-msgstr "เปิดใช้ตัวเลือกนี้เพื่อให้แสดงส่วนที่อ้างถึงด้วยตัวอักษรขนาดเล็กลง"
-
-#. i18n: file kmail.kcfg line 612
-#: rc.cpp:911
-#, fuzzy, no-c-format
-msgid "Show current message sender time"
-msgstr "จัดเก็บจดหมายเข้ารหัสที่ส่งแล้ว"
-
-#. i18n: file kmail.kcfg line 613
-#: rc.cpp:914
-#, no-c-format
-msgid ""
-"Enable this if you like to know what time of day are now in sender location "
-"(calculated from sender time zone)."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 618
-#: rc.cpp:917
-#, fuzzy, no-c-format
-msgid "Show user agent in fancy headers"
-msgstr "แสดงสถานะสแปมในส่วนหัวแบบแฟนซี"
-
-#. i18n: file kmail.kcfg line 619
-#: rc.cpp:920
-#, no-c-format
-msgid ""
-"Enable this option to get the User-Agent and X-Mailer header lines displayed "
-"when using fancy headers."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 624
-#: rc.cpp:923
-#, no-c-format
-msgid "Allow to delete attachments of existing mails."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 628
-#: rc.cpp:926
-#, no-c-format
-msgid "Allow to edit attachments of existing mails."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 633
-#: rc.cpp:929
-#, no-c-format
-msgid "Always decrypt messages when viewing or ask befor decrypting"
-msgstr ""
-
-#. i18n: file kmail.kcfg line 647
-#: rc.cpp:932
-#, no-c-format
-msgid "Send Message Disposition Notifications with an empty sender."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 648
-#: rc.cpp:935
-#, no-c-format
-msgid ""
-"Send Message Disposition Notifications with an empty sender string. Some "
-"servers might be configure to reject such messages, so if you are experiencing "
-"problems sending MDNs, uncheck this option."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 654
-#: rc.cpp:938
-#, no-c-format
-msgid "Phrases has been converted to templates"
-msgstr ""
-
-#. i18n: file kmail.kcfg line 655
-#: rc.cpp:941
-#, no-c-format
-msgid "Old phrases have been converted to templates"
-msgstr ""
-
-#. i18n: file kmail.kcfg line 659
-#: rc.cpp:944
-#, fuzzy, no-c-format
-msgid "Message template for new message"
-msgstr "รายการจดหมาย - จดหมายใหม่"
-
-#. i18n: file kmail.kcfg line 664
-#: rc.cpp:947
-#, no-c-format
-msgid "Message template for reply"
-msgstr ""
-
-#. i18n: file kmail.kcfg line 669
-#: rc.cpp:950
-#, no-c-format
-msgid "Message template for reply to all"
-msgstr ""
-
-#. i18n: file kmail.kcfg line 674
-#: rc.cpp:953
-#, no-c-format
-msgid "Message template for forward"
-msgstr ""
-
-#. i18n: file kmail.kcfg line 679
-#: rc.cpp:956
-#, fuzzy, no-c-format
-msgid "Quote characters"
-msgstr "เพิ่มอักขระอ้างถึง"
-
-#. i18n: file kmail.kcfg line 688
-#: rc.cpp:959
-#, no-c-format
-msgid "Allow out-of-office settings to to be changeable by the user."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 692
-#: rc.cpp:962
-#, no-c-format
-msgid ""
-"Allow users to upload out-of-office sieve scripts, but disallow them changin "
-"any settings, such as the domain to react to and the spam reaction switch."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 696
-#: rc.cpp:965
-#, no-c-format
-msgid "Send out-of-office replies to mails coming from this domain only."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 700
-#: rc.cpp:968
-#, no-c-format
-msgid "Allow out-of-office replies to be sent to messages marked as SPAM."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 704
-#: rc.cpp:971
-#, no-c-format
-msgid ""
-"Check if there is still an active out-of-office reply configured when starting "
-"KMail."
+#: quotajobs.h:76
+msgid "%1 of %2 %3 used"
 msgstr ""
 
 #: recipientseditor.cpp:104
@@ -12918,6 +11225,11 @@ msgstr "เพิ่มในส่วนสำเนาถึง"
 msgid "Add as BCC"
 msgstr "เพิ่มในส่วนซ่อนสำเนาถึง"
 
+#: recipientspicker.cpp:425 snippetdlgbase.ui:60
+#, fuzzy, no-c-format
+msgid "&Cancel"
+msgstr "ยกเลิก"
+
 #: recipientspicker.cpp:467 snippetwidget.cpp:173 snippetwidget.cpp:174
 #: snippetwidget.cpp:291
 msgid "All"
@@ -12934,10 +11246,10 @@ msgstr "เลือกผู้รับ"
 
 #: recipientspicker.cpp:784
 msgid ""
-"_n: You selected 1 recipient. The maximum supported number of recipients is %1. "
-"Please adapt the selection.\n"
-"You selected %n recipients. The maximum supported number of recipients is %1. "
-"Please adapt the selection."
+"_n: You selected 1 recipient. The maximum supported number of recipients is "
+"%1. Please adapt the selection.\n"
+"You selected %n recipients. The maximum supported number of recipients is "
+"%1. Please adapt the selection."
 msgstr ""
 
 #: redirectdialog.cpp:57
@@ -12954,8 +11266,8 @@ msgstr "ใช้กล่องการเลือกที่อยู่"
 
 #: redirectdialog.cpp:73
 msgid ""
-"This button opens a separate dialog where you can select recipients out of all "
-"available addresses."
+"This button opens a separate dialog where you can select recipients out of "
+"all available addresses."
 msgstr ""
 
 #: redirectdialog.cpp:116
@@ -13058,10 +11370,19 @@ msgstr "มากกว่าหรือเท่ากับ"
 msgid " bytes"
 msgstr " ไบต์"
 
+#: rulewidgethandlermanager.cpp:1437 warningconfiguration.ui:126
+#: warningconfiguration.ui:154 warningconfiguration.ui:182
+#: warningconfiguration.ui:210 warningconfiguration.ui:238
+#: warningconfiguration.ui:266
+#, no-c-format
+msgid " days"
+msgstr " วัน"
+
 #: searchjob.cpp:253
 msgid ""
-"To execute your search all messages of the folder %1 have to be downloaded from "
-"the server. This may take some time. Do you want to continue your search?"
+"To execute your search all messages of the folder %1 have to be downloaded "
+"from the server. This may take some time. Do you want to continue your "
+"search?"
 msgstr ""
 
 #: searchjob.cpp:257
@@ -13203,16 +11524,12 @@ msgid ""
 msgstr ""
 
 #: sievedebugdialog.cpp:256
-msgid ""
-"Collecting data for account '%1'...\n"
-msgstr ""
-"กำลังรวบรวมข้อมูลสำหรับบัญชีผู้ใช้ '%1'...\n"
+msgid "Collecting data for account '%1'...\n"
+msgstr "กำลังรวบรวมข้อมูลสำหรับบัญชีผู้ใช้ '%1'...\n"
 
 #: sievedebugdialog.cpp:257
-msgid ""
-"------------------------------------------------------------\n"
-msgstr ""
-"------------------------------------------------------------\n"
+msgid "------------------------------------------------------------\n"
+msgstr "------------------------------------------------------------\n"
 
 #: sievedebugdialog.cpp:265
 msgid ""
@@ -13231,10 +11548,8 @@ msgstr ""
 "\n"
 
 #: sievedebugdialog.cpp:298
-msgid ""
-"Contents of script '%1':\n"
-msgstr ""
-"เนื้อหาของสคริปต์ '%1':\n"
+msgid "Contents of script '%1':\n"
+msgstr "เนื้อหาของสคริปต์ '%1':\n"
 
 #: sievedebugdialog.cpp:320
 msgid ""
@@ -13257,20 +11572,16 @@ msgstr ""
 "\n"
 
 #: sievedebugdialog.cpp:341
-msgid ""
-"Sieve capabilities:\n"
-msgstr ""
-"ความสามารถของสคริปต์กรอง:\n"
+msgid "Sieve capabilities:\n"
+msgstr "ความสามารถของสคริปต์กรอง:\n"
 
 #: sievedebugdialog.cpp:345
 msgid "(No special capabilities available)"
 msgstr "(ไม่มีคุณสมบัติพิเศษ)"
 
 #: sievedebugdialog.cpp:354
-msgid ""
-"Available Sieve scripts:\n"
-msgstr ""
-"สคริปต์กรองที่มีอยู่:\n"
+msgid "Available Sieve scripts:\n"
+msgstr "สคริปต์กรองที่มีอยู่:\n"
 
 #: sievedebugdialog.cpp:358
 msgid ""
@@ -13346,8 +11657,8 @@ msgstr "กรอกลายเซ็นที่ต้องการใช้
 
 #: signatureconfigurator.cpp:122
 msgid ""
-"Use this requester to specify a text file that contains your signature. It will "
-"be read every time you create a new mail or append a new signature."
+"Use this requester to specify a text file that contains your signature. It "
+"will be read every time you create a new mail or append a new signature."
 msgstr ""
 
 #: signatureconfigurator.cpp:126
@@ -13364,17 +11675,22 @@ msgstr "เปิดแฟ้มที่ระบุในเครื่อง
 
 #: signatureconfigurator.cpp:149
 msgid ""
-"You can add an arbitrary command here, either with or without path depending on "
-"whether or not the command is in your Path. For every new mail, KMail will "
-"execute the command and use what it outputs (to standard output) as a "
-"signature. Usual commands for use with this mechanism are \"fortune\" or \"ksig "
-"-random\"."
+"You can add an arbitrary command here, either with or without path depending "
+"on whether or not the command is in your Path. For every new mail, KMail "
+"will execute the command and use what it outputs (to standard output) as a "
+"signature. Usual commands for use with this mechanism are \"fortune\" or "
+"\"ksig -random\"."
 msgstr ""
 
 #: signatureconfigurator.cpp:155
 msgid "S&pecify command:"
 msgstr "คำสั่งที่จะใช้:"
 
+#: simplefoldertree.h:142 simplefoldertree.h:202 simplefoldertree.h:236
+#: simplefoldertree.h:238
+msgid "Path"
+msgstr ""
+
 #: simplestringlisteditor.cpp:70
 msgid "New entry:"
 msgstr "รายการใหม่:"
@@ -13411,6 +11727,11 @@ msgstr "เพิ่มบัญชีผู้ใช้"
 msgid "Do you really want to remove this group and all its snippets?"
 msgstr "<qt>คุณต้องการลบรายการแสดงตัว <b>%1</b> นี้ จริงหรือไม่ ?</qt>"
 
+#: snippetwidget.cpp:240 snippetwidget.cpp:288
+#, fuzzy
+msgid "&Apply"
+msgstr "ปรับให้มีผลใช้กับ:"
+
 #: snippetwidget.cpp:242
 #, fuzzy
 msgid "Edit Snippet"
@@ -13425,6 +11746,10 @@ msgstr ""
 msgid "Edit &group..."
 msgstr "แก้ไข..."
 
+#: snippetwidget.cpp:547
+msgid "&Paste"
+msgstr ""
+
 #: snippetwidget.cpp:548
 #, fuzzy
 msgid "&Edit..."
@@ -13464,9 +11789,9 @@ msgstr ""
 
 #: snippetwidget.cpp:702 snippetwidget.cpp:819
 msgid ""
-"If you enable this option, the value entered to the right will be saved. If you "
-"use the same variable later, even in another snippet, the value entered to the "
-"right will be the default value for that variable."
+"If you enable this option, the value entered to the right will be saved. If "
+"you use the same variable later, even in another snippet, the value entered "
+"to the right will be the default value for that variable."
 msgstr ""
 
 #: snippetwidget.cpp:802
@@ -13504,6 +11829,16 @@ msgstr ""
 "ไม่สามารถเปิดแฟ้ม: \"%1\" ได้:\n"
 "%2"
 
+#: customtemplates_base.ui:169 templateparser.cpp:417
+#, fuzzy, no-c-format
+msgid "To:"
+msgstr "ถึง: "
+
+#: customtemplates_base.ui:177 templateparser.cpp:421
+#, fuzzy, no-c-format
+msgid "CC:"
+msgstr "สำเนาถึง: "
+
 #: templateparser.cpp:970
 #, fuzzy, c-format
 msgid "Attachment %1"
@@ -13536,36 +11871,32 @@ msgstr ""
 
 #: templatesconfiguration.cpp:70
 msgid ""
-"<qt>"
-"<p>Here you can create message templates to use when you compose new messages "
-"or replies, or when you forward messages.</p>"
-"<p>The message templates support substitution commands by simple typing them or "
-"selecting them from menu <i>Insert command</i>.</p>"
-"<p>Templates specified here are folder-specific. They override both global "
-"templates and per-identity templates if they are specified.</p></qt>"
+"<qt><p>Here you can create message templates to use when you compose new "
+"messages or replies, or when you forward messages.</p><p>The message "
+"templates support substitution commands by simple typing them or selecting "
+"them from menu <i>Insert command</i>.</p><p>Templates specified here are "
+"folder-specific. They override both global templates and per-identity "
+"templates if they are specified.</p></qt>"
 msgstr ""
 
 #: templatesconfiguration.cpp:82
 msgid ""
-"<qt>"
-"<p>Here you can create message templates to use when you compose new messages "
-"or replies, or when you forward messages.</p>"
-"<p>The message templates support substitution commands by simple typing them or "
-"selecting them from menu <i>Insert command</i>.</p>"
-"<p>Templates specified here are mail identity-wide. They override global "
-"templates and are being overridden by per-folder templates if they are "
-"specified.</p></qt>"
+"<qt><p>Here you can create message templates to use when you compose new "
+"messages or replies, or when you forward messages.</p><p>The message "
+"templates support substitution commands by simple typing them or selecting "
+"them from menu <i>Insert command</i>.</p><p>Templates specified here are "
+"mail identity-wide. They override global templates and are being overridden "
+"by per-folder templates if they are specified.</p></qt>"
 msgstr ""
 
 #: templatesconfiguration.cpp:94
 msgid ""
-"<qt>"
-"<p>Here you can create message templates to use when you compose new messages "
-"or replies, or when you forward messages.</p>"
-"<p>The message templates support substitution commands by simple typing them or "
-"selecting them from menu <i>Insert command</i>.</p>"
-"<p>This is a global (default) template. They can be overridden by per-identity "
-"templates and by per-folder templates if they are specified.</p></qt>"
+"<qt><p>Here you can create message templates to use when you compose new "
+"messages or replies, or when you forward messages.</p><p>The message "
+"templates support substitution commands by simple typing them or selecting "
+"them from menu <i>Insert command</i>.</p><p>This is a global (default) "
+"template. They can be overridden by per-identity templates and by per-folder "
+"templates if they are specified.</p></qt>"
 msgstr ""
 
 #: templatesconfiguration.cpp:343
@@ -13575,8 +11906,7 @@ msgid ""
 "----------  %1  ----------\n"
 "%TEXT\n"
 "-------------------------------------------------------\n"
-msgstr ""
-"------------------------------------------------------------\n"
+msgstr "------------------------------------------------------------\n"
 
 #: templatesconfiguration.cpp:392
 #, fuzzy
@@ -13592,8 +11922,7 @@ msgid ""
 "\n"
 "%TEXT\n"
 "-------------------------------------------------------\n"
-msgstr ""
-"------------------------------------------------------------\n"
+msgstr "------------------------------------------------------------\n"
 
 #: templatesconfiguration.cpp:511
 msgid ""
@@ -13635,8 +11964,7 @@ msgid ""
 "\n"
 "%TEXT\n"
 "-------------------------------------------------------\n"
-msgstr ""
-"------------------------------------------------------------\n"
+msgstr "------------------------------------------------------------\n"
 
 #: templatesinsertcommand.cpp:37
 #, fuzzy
@@ -13796,6 +12124,10 @@ msgstr ""
 msgid "Pipe Current Message Body and Replace with Result"
 msgstr ""
 
+#: templatesinsertcommand.cpp:285
+msgid "Miscellaneous"
+msgstr ""
+
 #: templatesinsertcommand.cpp:288
 msgid "Set Cursor Position"
 msgstr ""
@@ -13831,88 +12163,6 @@ msgstr ""
 msgid "Turn Debug Off"
 msgstr ""
 
-#: tips.cpp:3
-msgid ""
-"<p>...that you can go to the next and previous message by using the\n"
-"right and left arrow keys respectively?</p>\n"
-msgstr ""
-
-#: tips.cpp:9
-#, fuzzy
-msgid ""
-"<p>...that you can rapidly create filters on sender, recipient,\n"
-"subject and mailing lists with <em>Tools-&gt;Create&nbsp;Filter</em>?</p>\n"
-msgstr ""
-"\n"
-"<p>...คุณสามารถสร้างตัวกรองของผู้ส่ง, ผู้รับ, ชื่อเรื่อง และรายการจดหมายเวียน\n"
-"ได้อย่างรวดเร็ว โดยเลือกจาก <em>เครื่องมือ->สร้างตัวกรองใหม่</em> ?</p>\n"
-
-#: tips.cpp:15
-msgid ""
-"<p>...that you can get rid of the &quot;[mailing list name]&quot;\n"
-"added to the subject of some mailing lists by using the <em>rewrite\n"
-"header</em> filter action? Just use\n"
-"<pre>rewrite header &quot;Subject&quot;\n"
-"   replace &quot;\\s*\\[mailing list name\\]\\s*&quot;\n"
-"   with &quot;&quot;</pre>\n"
-"</p>\n"
-msgstr ""
-
-#: tips.cpp:26
-msgid ""
-"<p>...that you can associate mailing lists with folders in the\n"
-"<em>Folder-&gt;Mailing List Management</em> dialog? You can then use\n"
-"<em>Message-&gt;New&nbsp;Message&nbsp;to&nbsp;Mailing&nbsp;List...</em>\n"
-"to open the composer with the mailing list address preset.\n"
-"Alternatively, you can click with the middle mouse button on the folder.</p>\n"
-msgstr ""
-
-#: tips.cpp:35
-#, fuzzy
-msgid ""
-"<p>...that you can assign custom icons to each folder individually?\n"
-"See <em>Folder-&gt;Properties</em></p>\n"
-msgstr ""
-"<p>...คุณสามารถกำหนดไอคอนสำหรับแต่ละโฟลเดอร์ของคุณเองได้ ?\n"
-"ดูที่ <em>โฟลเดอร์->คุณสมบัติ...</em></p>\n"
-
-#: tips.cpp:41
-msgid ""
-"<p>...that KMail can show a color bar indicating the type of message\n"
-"(Plain text/HTML/OpenPGP) currently displayed?</p>\n"
-"<p>This thwarts attempts to fake successful signature verification by\n"
-"sending HTML mails mimicking KMail's signature status frames.</p>\n"
-msgstr ""
-
-#: tips.cpp:49
-msgid ""
-"<p>...that you can filter on any header by simply entering its name\n"
-"in the first edit field of a search rule?</p>\n"
-msgstr ""
-"<p>...คุณสามารถจะทำการกรองจดหมายได้จากส่วนหัว \n"
-"ด้วยการเติมชื่อของมันในช่องกรอกข้อมูลช่องแรกของกฏการค้นหา ?</p>\n"
-
-#: tips.cpp:55
-msgid ""
-"<p>...that you can filter out HTML only messages with the rule\n"
-"<pre>&quot;Content-type&quot; contains &quot;text/html&quot;?</pre>\n"
-"</p>\n"
-msgstr ""
-"<p>...คุณสามารถจะกรองให้แสดงจดหมาย HTML เฉพาะฉบับที่เข้ากับกฏเท่านั้นได้\n"
-"<pre>&quot;Content-type&quot; บรรจุ &quot;text/html&quot;?</pre>\n"
-"</p>\n"
-
-#: tips.cpp:62
-msgid ""
-"<p>...that when replying, only the selected part of the message is quoted?</p>\n"
-"<p>If nothing is selected, the full message is quoted.</p>\n"
-"<p>This even works with text of attachments when\n"
-"<em>View-&gt;Attachments-&gt;Inline</em> is selected.</p>\n"
-"<p>This feature is available with all reply commands except\n"
-"<em>Message-&gt;Reply Without Quote</em>.</p>\n"
-"<p align=\"right\"><em>contributed by David F. Newman</em></p>\n"
-msgstr ""
-
 #: undostack.cpp:110
 msgid "There is nothing to undo."
 msgstr "ไม่มีรายการที่จะเลิกทำ"
@@ -13982,6 +12232,17 @@ msgstr "สิ่งที่แนบมาด้วย #1 (ยังไม่�
 msgid "Show GnuPG Audit Log for this operation"
 msgstr ""
 
+#: util.h:208
+#, fuzzy
+msgid ""
+"A file named \"%1\" already exists. Are you sure you want to overwrite it?"
+msgstr "มีแฟ้มชื่อนี้อยู่แล้ว คุณต้องการเขียนทับมันหรือไม่ ?"
+
+#: util.h:210
+#, fuzzy
+msgid "Overwrite File?"
+msgstr "แทรกแฟ้ม"
+
 #: vacation.cpp:566
 msgid ""
 "I am out of office till %1.\n"
@@ -14087,9 +12348,9 @@ msgstr "ส่งรูปภาพไปพร้อมกับจดหมา
 
 #: xfaceconfigurator.cpp:93
 msgid ""
-"Check this box if you want KMail to add a so-called X-Face header to messages "
-"written with this identity. An X-Face is a small (48x48 pixels) black and white "
-"image that some mail clients are able to display."
+"Check this box if you want KMail to add a so-called X-Face header to "
+"messages written with this identity. An X-Face is a small (48x48 pixels) "
+"black and white image that some mail clients are able to display."
 msgstr ""
 
 #: xfaceconfigurator.cpp:100
@@ -14118,9 +12379,9 @@ msgstr "เลือกแฟ้ม..."
 
 #: xfaceconfigurator.cpp:149
 msgid ""
-"Use this to select an image file to create the picture from. The image should "
-"be of high contrast and nearly quadratic shape. A light background helps "
-"improve the result."
+"Use this to select an image file to create the picture from. The image "
+"should be of high contrast and nearly quadratic shape. A light background "
+"helps improve the result."
 msgstr ""
 
 #: xfaceconfigurator.cpp:156
@@ -14129,20 +12390,19 @@ msgstr "ใช้จากสมุดที่อยู่"
 
 #: xfaceconfigurator.cpp:158
 msgid ""
-"You can use a scaled-down version of the picture you have set in your address "
-"book entry."
+"You can use a scaled-down version of the picture you have set in your "
+"address book entry."
 msgstr ""
 
 #: xfaceconfigurator.cpp:164
 msgid ""
-"<qt>KMail can send a small (48x48 pixels), low-quality, monochrome picture with "
-"every message. For example, this could be a picture of you or a glyph. It is "
-"shown in the recipient's mail client (if supported)."
+"<qt>KMail can send a small (48x48 pixels), low-quality, monochrome picture "
+"with every message. For example, this could be a picture of you or a glyph. "
+"It is shown in the recipient's mail client (if supported)."
 msgstr ""
 "<qt>โปรแกรมจัดการจดหมาย - K สามารถส่งรูปภาพขนาดเล็ก (48x48 พิกเซล), คุณภาพต่ำ, "
-"และเป็นภาพขาวดำ ไปพร้อมกับจดหมายทุกฉบับได้ ตัวอย่างเช่น "
-"นี่อาจจะเป็นภาพหรือสัญลักษณ์ของคุณ ซึ่งจะถูกแสดงในโปรแกรมอ่านจดหมายของผู้รับ "
-"(ถ้าโปรมแกรมของผู้รับรองรับคุณสมบัตินี้)"
+"และเป็นภาพขาวดำ ไปพร้อมกับจดหมายทุกฉบับได้ ตัวอย่างเช่น นี่อาจจะเป็นภาพหรือสัญลักษณ์ของคุณ "
+"ซึ่งจะถูกแสดงในโปรแกรมอ่านจดหมายของผู้รับ (ถ้าโปรมแกรมของผู้รับรองรับคุณสมบัตินี้)"
 
 #: xfaceconfigurator.cpp:180
 msgid "Use this field to enter an arbitrary X-Face string."
@@ -14150,8 +12410,8 @@ msgstr ""
 
 #: xfaceconfigurator.cpp:184
 msgid ""
-"Examples are available at <a href=\"http://www.xs4all.nl/~ace/X-Faces/\">"
-"http://www.xs4all.nl/~ace/X-Faces/</a>."
+"Examples are available at <a href=\"http://www.xs4all.nl/~ace/X-Faces/"
+"\">http://www.xs4all.nl/~ace/X-Faces/</a>."
 msgstr ""
 
 #: xfaceconfigurator.cpp:248 xfaceconfigurator.cpp:257
@@ -14167,139 +12427,1521 @@ msgstr "ไม่มีรูปภาพ"
 msgid "You do not have your own contact defined in the address book."
 msgstr "คุณยังไม่มีการกำหนดที่อยู่ติดต่อของคุณเองในสมุดที่อยู่"
 
-#: folderviewtooltip.h:34
-msgid "<qt><b>%1</b><br>Total: %2<br>Unread: %3<br>Size: %4"
+#: composercryptoconfiguration.ui:24
+#, no-c-format
+msgid "Signing"
+msgstr "ลงลายเซ็น"
+
+#: composercryptoconfiguration.ui:35
+#, no-c-format
+msgid "&Automatically sign messages"
+msgstr "เซ็นจดหมายโดยอัตโนมัติ"
+
+#: composercryptoconfiguration.ui:38
+#, no-c-format
+msgid ""
+"When this option is enabled, all messages you send will be signed by "
+"default; of course, it is still possible to disable signing for each message "
+"individually."
 msgstr ""
 
-#: folderviewtooltip.h:43
-#, c-format
-msgid "<br>Quota: %1"
+#: composercryptoconfiguration.ui:48
+#, no-c-format
+msgid "Encrypting"
+msgstr "การเข้ารหัส"
+
+#: composercryptoconfiguration.ui:59
+#, no-c-format
+msgid ""
+"When encrypting emails, always also encr&ypt to the certificate of my own "
+"identity"
 msgstr ""
 
-#: kmail_options.h:11
-msgid "Set subject of message"
-msgstr "ตั้งชื่อเรื่องจดหมาย"
+#: composercryptoconfiguration.ui:62
+#, no-c-format
+msgid ""
+"When this option is enabled, the message/file will not only be encrypted "
+"with the receiver's public key, but also with your key. This will enable you "
+"to decrypt the message/file at a later time. This is generally a good idea."
+msgstr ""
 
-#: kmail_options.h:13
-msgid "Send CC: to 'address'"
-msgstr "ส่ง สำเนาถึง: ไปยัง 'ที่อยู่'"
+#: composercryptoconfiguration.ui:70
+#, no-c-format
+msgid "Show s&igned/encrypted text after composing"
+msgstr "แสดงข้อความลายเซ็น/การเข้ารหัสหลังจากเขียนจดหมาย"
 
-#: kmail_options.h:15
-msgid "Send BCC: to 'address'"
-msgstr "ส่ง ซ่อนสำเนาถึง: ไปยัง 'ที่อยู่'"
+#: composercryptoconfiguration.ui:73
+#, no-c-format
+msgid ""
+"When this option is enabled, the signed/encrypted text will be shown in a "
+"separate window, enabling you to know how it will look before it is sent. "
+"This is a good idea when you are verifying that your encryption system works."
+msgstr ""
 
-#: kmail_options.h:17
-msgid "Add 'header' to message"
-msgstr "เพิ่ม 'ส่วนหัว' ไปยังจดหมาย"
+#: composercryptoconfiguration.ui:81
+#, no-c-format
+msgid "Store sent messages encry&pted"
+msgstr "จัดเก็บจดหมายเข้ารหัสที่ส่งแล้ว"
 
-#: kmail_options.h:18
-msgid "Read message body from 'file'"
-msgstr "อ่านเนื้อความจดหมายจาก 'แฟ้ม'"
+#: composercryptoconfiguration.ui:87
+#, no-c-format
+msgid "Check to store messages encrypted "
+msgstr "เลือกเพื่อให้มีการจัดเก็บจดหมายที่เข้ารหัสไว้"
 
-#: kmail_options.h:19
-msgid "Set body of message"
-msgstr "ตั้งค่าเนื้อความจดหมาย"
+#: composercryptoconfiguration.ui:90
+#, no-c-format
+msgid ""
+"<qt>\n"
+"<h1>Store Messages Encrypted</h1>\n"
+"When this box is checked, sent messages are stored encrypted like they were "
+"sent. This is not recommended, as you will not be able to read the messages "
+"any longer if a necessary certificate expires.\n"
+"<p>\n"
+"However, there may be local rules that require you to turn this option on. "
+"When in doubt, check with your local administrator.\n"
+"</qt>"
+msgstr ""
 
-#: kmail_options.h:20
-msgid "Add an attachment to the mail. This can be repeated"
-msgstr "เพิ่มสิ่งที่แนบมาด้วยไปยังจดหมาย ซึ่งสามารถทำซ้ำได้อีก"
+#: composercryptoconfiguration.ui:103
+#, no-c-format
+msgid "Always show the encryption keys &for approval"
+msgstr "แสดงกุญแจเข้ารหัสสำหรับการอนุญาตเสมอ"
 
-#: kmail_options.h:21
-msgid "Only check for new mail"
-msgstr "ตรวจจดหมายใหม่เท่านั้น"
+#: composercryptoconfiguration.ui:106
+#, no-c-format
+msgid ""
+"When this option is enabled, the application will always show you a list of "
+"public keys from which you can choose the one it will use for encryption. If "
+"it is off, the application will only show the dialog if it cannot find the "
+"right key or if there are several which could be used."
+msgstr ""
 
-#: kmail_options.h:22
-msgid "Only open composer window"
-msgstr "เปิดหน้าต่างเขียนจดหมายเท่านั้น"
+#: composercryptoconfiguration.ui:114
+#, no-c-format
+msgid "Automatically encrypt &messages whenever possible"
+msgstr "ทำการเข้ารหัสจดหมายหากสามารถทำได้โดยอัตโนมัติ"
 
-#: kmail_options.h:23
-msgid "View the given message file"
-msgstr "แสดงแฟ้มจดหมายที่ให้"
+#: composercryptoconfiguration.ui:117
+#, no-c-format
+msgid ""
+"When this option is enabled, every message you send will be encrypted "
+"whenever encryption is possible and desired; of course, it is still possible "
+"to disable the automatic encryption for each message individually."
+msgstr ""
 
-#: kmail_options.h:24
-msgid "Send message to 'address' resp. attach the file the 'URL' points to"
+#: composercryptoconfiguration.ui:125
+#, no-c-format
+msgid "Never sign/encrypt when sa&ving as draft"
+msgstr "ไม่ต้องเซ็น/เข้ารหัสเมื่อบันทึกเป็นจดหมายฉบับร่าง"
+
+#: customtemplates_base.ui:118 templatesconfiguration_base.ui:256
+#, no-c-format
+msgid "How does this work?"
 msgstr ""
 
-#: kmsearchpattern.h:221
-#, fuzzy
-msgid "Read"
-msgstr "อ่านแล้ว"
+#: customtemplates_base.ui:234
+#, fuzzy, no-c-format
+msgid "Universal"
+msgstr "ทั่วไป"
 
-#: kmsearchpattern.h:222
-msgid "Old"
+#: customtemplates_base.ui:239
+#, fuzzy, no-c-format
+msgid "Reply"
+msgstr "ตอบกลับไปยัง"
+
+#: customtemplates_base.ui:244
+#, fuzzy, no-c-format
+msgid "Reply to All"
+msgstr "ตอบกลับทั้งหมด..."
+
+#: customtemplates_base.ui:249
+#, fuzzy, no-c-format
+msgid "Forward"
+msgstr "ส่งต่อ"
+
+#: customtemplates_base.ui:261
+#, fuzzy, no-c-format
+msgid "Shortc&ut:"
+msgstr "ปุ่มพิมพ์ลัด:"
+
+#: customtemplates_base.ui:283
+#, no-c-format
+msgid "&Template type:"
 msgstr ""
 
-#: kmsearchpattern.h:223
-#, fuzzy
-msgid "Deleted"
-msgstr "ลบ"
+#: customtemplates_kfg.kcfg:12
+#, fuzzy, no-c-format
+msgid "Template content"
+msgstr "เนื้อหาในโฟลเดอร์:"
 
-#: kmsearchpattern.h:224
-#, fuzzy
-msgid "Replied"
-msgstr "ตอบกลับแล้ว"
+#: customtemplates_kfg.kcfg:17
+#, no-c-format
+msgid "Template shortcut"
+msgstr ""
 
-#: kmsearchpattern.h:225
-#, fuzzy
-msgid "Forwarded"
-msgstr "ส่งต่อ:"
+#: customtemplates_kfg.kcfg:22
+#, no-c-format
+msgid "Template type"
+msgstr ""
 
-#: kmsearchpattern.h:226
-#, fuzzy
-msgid "Queued"
-msgstr "อยู่ในคิวแล้ว"
+#: folderpropertiesdialog.ui:16
+#, fuzzy, no-c-format
+msgid "Folder Properties"
+msgstr "ตำแหน่งโฟลเดอร์"
 
-#: kmsearchpattern.h:227
-#, fuzzy
-msgid "Sent"
-msgstr "ส่งแล้ว"
+#: folderpropertiesdialog.ui:63
+#, fuzzy, no-c-format
+msgid "Folder holds a &mailing list"
+msgstr "โฟลเดอร์เก็บจดหมายเวียน"
 
-#: kmsearchpattern.h:228
-msgid "Watched"
+#: folderpropertiesdialog.ui:91
+#, fuzzy, no-c-format
+msgid "List &address:"
+msgstr "ที่อยู่ทางไปรษณีย์:"
+
+#: folderpropertiesdialog.ui:122
+#, fuzzy, no-c-format
+msgid "N&ormal:"
+msgstr "ธรรมดา:"
+
+#: folderpropertiesdialog.ui:215
+#, fuzzy, no-c-format
+msgid "Unr&ead:"
+msgstr "ยังไม่ได้อ่าน:"
+
+#: folderpropertiesdialog.ui:269
+#, fuzzy, no-c-format
+msgid "Message Expiring"
+msgstr "ให้จดหมายเก่าหมดอายุ"
+
+#: folderpropertiesdialog.ui:283
+#, fuzzy, no-c-format
+msgid "E&xpire after:"
+msgstr "หมดอายุ"
+
+#: folderpropertiesdialog.ui:311
+#, fuzzy, no-c-format
+msgid "Expire &read messages"
+msgstr "ให้จดหมายเก่าหมดอายุ ?"
+
+#: folderpropertiesdialog.ui:339
+#, fuzzy, no-c-format
+msgid "Expire a&fter:"
+msgstr "โฟลเดอร์์หมดอายุ"
+
+#: folderpropertiesdialog.ui:350
+#, fuzzy, no-c-format
+msgid "Expire &unread messages"
+msgstr "ให้จดหมายเก่าหมดอายุ ?"
+
+#: folderpropertiesdialog.ui:384 folderpropertiesdialog.ui:407
+#, no-c-format
+msgid "Day(s)"
+msgstr "วัน"
+
+#: folderpropertiesdialog.ui:389 folderpropertiesdialog.ui:412
+#, no-c-format
+msgid "Week(s)"
+msgstr "สัปดาห์"
+
+#: folderpropertiesdialog.ui:394 folderpropertiesdialog.ui:417
+#, no-c-format
+msgid "Month(s)"
+msgstr "เดือน"
+
+#: folderpropertiesdialog.ui:451
+#, fuzzy, no-c-format
+msgid "Advanced"
+msgstr "ตัวเลือกเพิ่มเติม"
+
+#: folderpropertiesdialog.ui:462
+#, fuzzy, no-c-format
+msgid "Sender identit&y:"
+msgstr "การแสดงตัวใหม่:"
+
+#: folderpropertiesdialog.ui:483
+#, fuzzy, no-c-format
+msgid "&Storage format:"
+msgstr "ปรับเปลี่ยนรูปแบบวันที่ใหม่"
+
+#: folderpropertiesdialog.ui:494
+#, no-c-format
+msgid "&List displays:"
 msgstr ""
 
-#: kmsearchpattern.h:229
-#, fuzzy
-msgid "Ignored"
-msgstr "ยังไม่ได้อ่าน"
+#: kmail.kcfg:61
+#, no-c-format
+msgid "Send queued mail on mail check"
+msgstr ""
 
-#: kmsearchpattern.h:230
-msgid "Spam"
+#: kmail.kcfg:62
+#, no-c-format
+msgid ""
+"<qt><p>Select whether you want KMail to send all messages in the outbox on "
+"manual or all mail checks, or whether you do not want messages to be sent "
+"automatically at all. </p></qt>"
 msgstr ""
 
-#: kmsearchpattern.h:231
-msgid "Ham"
+#: kmail.kcfg:72
+#, no-c-format
+msgid ""
+"Automatically move non-synced mails from folders with insufficient access "
+"rights"
 msgstr ""
 
-#: kmsearchpattern.h:232
-#, fuzzy
-msgid "To Do"
-msgstr "ถึง: "
+#: kmail.kcfg:73
+#, no-c-format
+msgid ""
+"If there are new messages in a folder, which have not been uploaded to the "
+"server yet, but you do not have sufficient access rights on the folder now "
+"to upload them, these messages will automatically be moved into a lost and "
+"found folder."
+msgstr ""
 
-#: kmsearchpattern.h:234
-#, fuzzy
-msgid "Has Attachment"
-msgstr "เปิดสิ่งที่แนบมาด้วยหรือไม่ ?"
+#: kmail.kcfg:78
+#, no-c-format
+msgid "Allow local flags in read-only folders"
+msgstr ""
 
-#: quotajobs.h:76
-msgid "%1 of %2 %3 used"
+#: kmail.kcfg:86
+#, no-c-format
+msgid ""
+"This setting allows administrators to set a minimum delay between two mail "
+"checks.\"\n"
+"           \"The user will not be able to choose a value smaller than the "
+"value set here."
 msgstr ""
 
-#: simplefoldertree.h:142 simplefoldertree.h:202 simplefoldertree.h:236
-#: simplefoldertree.h:238
-msgid "Path"
+#: kmail.kcfg:93
+#, no-c-format
+msgid "The most recently selected folder in the folder selection dialog."
 msgstr ""
 
-#: util.h:208
+#: kmail.kcfg:101
+#, no-c-format
+msgid ""
+"Disregard the users umask setting and use \"read-write for the user only\" "
+"instead"
+msgstr ""
+
+#: kmail.kcfg:109
+#, no-c-format
+msgid "Policy for showing the system tray icon"
+msgstr ""
+
+#: kmail.kcfg:117
+#, no-c-format
+msgid ""
+"Close the application when the mainwindow is closed, even if there is a "
+"system tray icon active."
+msgstr ""
+
+#: kmail.kcfg:121
+#, fuzzy, no-c-format
+msgid "Verbose new mail notification"
+msgstr "การแจ้งเตือนเมื่อมีจดหมายใหม่"
+
+#: kmail.kcfg:122
+#, no-c-format
+msgid ""
+"If this option is enabled then for each folder the number of newly arrived "
+"messages is shown in the new mail notification; otherwise, you will only get "
+"a simple 'New mail arrived' message."
+msgstr ""
+
+#: kmail.kcfg:126
+#, no-c-format
+msgid "Specify e&ditor:"
+msgstr "เครื่องมือแก้ไขข้อความ: "
+
+#: kmail.kcfg:130
+#, no-c-format
+msgid "Use e&xternal editor instead of composer"
+msgstr "ใช้เครื่องมือแก้ไขข้อความภายนอกแทนเครื่องมือเขียนจดหมายมาตรฐาน"
+
+#: kmail.kcfg:157
+#, no-c-format
+msgid ""
+"The threshold for when to warn the user that a folder is nearing its quota "
+"limit."
+msgstr ""
+
+#: kmail.kcfg:166
+#, no-c-format
+msgid "Enable groupware functionality"
+msgstr ""
+
+#: kmail.kcfg:172
+#, no-c-format
+msgid "Mangle From:/To: headers in replies to replies"
+msgstr ""
+
+#: kmail.kcfg:173
+#, no-c-format
+msgid ""
+"Microsoft Outlook has a number of shortcomings in its implementation of the "
+"iCalendar standard; this option works around one of them. If you have "
+"problems with Outlook users not being able to get your replies, try setting "
+"this option."
+msgstr ""
+
+#: kmail.kcfg:178
+#, no-c-format
+msgid "Send groupware invitations in the mail body"
+msgstr ""
+
+#: kmail.kcfg:179
+#, no-c-format
+msgid ""
+"Microsoft Outlook has a number of shortcomings  in its implementation of the "
+"iCalendar standard; this option works around one of them. If you have "
+"problems with Outlook users not being able to get your invitations, try "
+"setting this option."
+msgstr ""
+
+#: kmail.kcfg:184
+#, fuzzy, no-c-format
+msgid "Exchange compatible invitations naming"
+msgstr "เข้ารหัสโดยใช้ OpenPGP โดยอัตโนมัติ"
+
+#: kmail.kcfg:185
+#, no-c-format
+msgid ""
+"Microsoft Outlook, when used in combination with a Microsoft Exchange "
+"server, has a problem understanding standards-compliant groupware e-mail. "
+"Turn this option on to send groupware invitations in a way that Microsoft "
+"Exchange understands."
+msgstr ""
+
+#: kmail.kcfg:191
+#, no-c-format
+msgid ""
+"When replying to invitations, send the reply comment in way that Microsoft "
+"Outlook understands."
+msgstr ""
+
+#: kmail.kcfg:197
+#, no-c-format
+msgid ""
+"When this is checked, you will not see the mail composer window. Instead, "
+"all invitation mails are sent automatically. If you want to see the mail "
+"before sending it, you can uncheck this option. However, be aware that the "
+"text in the composer window is in iCalendar syntax, and you should not try "
+"modifying it by hand."
+msgstr ""
+
+#: kmail.kcfg:213
+#, no-c-format
+msgid "Delete invitation emails after the reply to them has been sent"
+msgstr ""
+
+#: kmail.kcfg:214
+#, no-c-format
+msgid ""
+"When this is checked, received invitation emails that have been replied to "
+"will be moved to the Trash folder, once the reply has been successfully sent."
+msgstr ""
+
+#: kmail.kcfg:219
+#, no-c-format
+msgid ""
+"When encountering a Toltec scheduling message, display a custom replacement "
+"text for it."
+msgstr ""
+
+#: kmail.kcfg:224
+#, no-c-format
+msgid ""
+"The text that will be displayed as a replacement when encountering Toltec "
+"scheduling messages."
+msgstr ""
+
+#: kmail.kcfg:233
+#, no-c-format
+msgid ""
+"<p>Enabling this makes it possible to store the entries from the Kontact "
+"applications (KOrganizer, KAddressBook, and KNotes.)</p><p>If you want to "
+"set this option you must also set the applications to use the IMAP resource; "
+"this is done in the Trinity Control Center.</p>"
+msgstr ""
+
+#: kmail.kcfg:238
+#, no-c-format
+msgid ""
+"<p>Usually you will not have any reason to see the folders that hold the "
+"IMAP resources. But if you need to see them, you can set that here.</p>"
+msgstr ""
+
+#: kmail.kcfg:244
+#, no-c-format
+msgid ""
+"<p>If the account used for storing groupware information \"\n"
+"          \"is not used to manage normal mail, set this option to make KMail "
+"only \"\n"
+"          \"show groupware folders in it. This is useful if you are handling "
+"regular \"\n"
+"          \"mail via an additional online IMAP account.</p>"
+msgstr ""
+
+#: kmail.kcfg:251
+#, no-c-format
+msgid ""
+"<p>Choose the storage format of the groupware folders. <ul><li>The default "
+"format is to use the ical (for calendar folders) and vcard (for addressbook "
+"folders) standards. This format makes all Kontact features available.</"
+"li><li>The Kolab XML format uses a custom model that matches more closely "
+"the one used in Outlook. This format gives better Outlook compatibility, "
+"when using a Kolab server or a compatible solution.</li></ul></p>"
+msgstr ""
+
+#: kmail.kcfg:260
+#, no-c-format
+msgid ""
+"<p>This chooses the parent of the IMAP resource folders.</p><p>By default, "
+"the Kolab server sets the IMAP inbox to be the parent.</p>"
+msgstr ""
+
+#: kmail.kcfg:265
+#, no-c-format
+msgid "<p>This is the ID of the account holding the IMAP resource folders.</p>"
+msgstr ""
+
+#: kmail.kcfg:270
+#, no-c-format
+msgid ""
+"<p>If you want to set the folder names of the IMAP storage to your local "
+"language, you can choose between these available languages.</p><p> Please "
+"note, that the only reason to do so is for compatibility with Microsoft "
+"Outlook. It is considered a bad idea to set this, since it makes changing "
+"languages impossible. </p><p>So do not set this unless you have to.</p>"
+msgstr ""
+
+#: kmail.kcfg:276
+#, no-c-format
+msgid "Also filter new mails received in groupware folders."
+msgstr ""
+
+#: kmail.kcfg:283
+#, no-c-format
+msgid ""
+"Synchronize groupware changes in DIMAP folders immediately when being online."
+msgstr ""
+
+#: kmail.kcfg:292
+#, no-c-format
+msgid ""
+"This value is used to decide whether the KMail Introduction should be "
+"displayed."
+msgstr ""
+
+#: kmail.kcfg:299
+#, no-c-format
+msgid "Maximal number of connections per host"
+msgstr ""
+
+#: kmail.kcfg:300
+#, no-c-format
+msgid ""
+"This can be used to restrict the number of connections per host while "
+"checking for new mail. By default the number of connections is unlimited (0)."
+msgstr ""
+
+#: kmail.kcfg:308
+#, no-c-format
+msgid "Show quick search line edit"
+msgstr ""
+
+#: kmail.kcfg:309
+#, no-c-format
+msgid ""
+"This option enables or disables the search line edit above the message list "
+"which can be used to quickly search the information shown in the message "
+"list."
+msgstr ""
+
+#: kmail.kcfg:313
+#, no-c-format
+msgid "Hide local inbox if unused"
+msgstr ""
+
+#: kmail.kcfg:321
+#, no-c-format
+msgid "Forward Inline As Default."
+msgstr ""
+
+#: kmail.kcfg:325
+#, no-c-format
+msgid ""
+"Allow the semicolon charactor (';') to be used as separator in the message "
+"composer."
+msgstr ""
+
+#: kmail.kcfg:328
+#, fuzzy, no-c-format
+msgid "Keep original charset when replying or forwarding if possible"
+msgstr "ใช้ชุดรหัสอักขระปริยายของเจ้าของ เมื่อมีการตอบกลับหรือมีการส่งต่อ (หากทำได้)"
+
+#: kmail.kcfg:332
+#, fuzzy, no-c-format
+msgid "A&utomatically insert signature"
+msgstr "เพิ่มลายเซ็นท้ายจดหมายอัตโนมัติ"
+
+#: kmail.kcfg:336
+#, no-c-format
+msgid ""
+"Remember this identity, so that it will be used in future composer windows "
+"as well.\n"
+"        "
+msgstr ""
+
+#: kmail.kcfg:341
+#, no-c-format
+msgid ""
+"Remember this folder for sent items, so that it will be used in future "
+"composer windows as well."
+msgstr ""
+
+#: kmail.kcfg:345
+#, no-c-format
+msgid ""
+"Remember this mail transport, so that it will be used in future composer "
+"windows as well."
+msgstr ""
+
+#: kmail.kcfg:349
+#, no-c-format
+msgid ""
+"Remember this dictionary, so that it will be used in future composer windows "
+"as well.\n"
+"        "
+msgstr ""
+
+#: kmail.kcfg:354
+#, no-c-format
+msgid "Word &wrap at column:"
+msgstr "ตัดคำที่คอลัมน์:"
+
+#: kmail.kcfg:368
+#, fuzzy, no-c-format
+msgid "Warn if the number of recipients is larger than"
+msgstr "แจ้งเตือน หากรากของใบรับรองจะหมดอายุภายใน"
+
+#: kmail.kcfg:370 kmail.kcfg:377
+#, no-c-format
+msgid ""
+"If the number of recipients is larger than this value, KMail will warn and "
+"ask for a confirmation before sending the mail. The warning can be turned "
+"off."
+msgstr ""
+
+#: kmail.kcfg:390
+#, no-c-format
+msgid ""
+"Turn this option on to make Outlook &#8482; understand attachment names "
+"containing non-English characters"
+msgstr ""
+
+#: kmail.kcfg:416
+#, no-c-format
+msgid "Automatically request &message disposition notifications"
+msgstr ""
+
+#: kmail.kcfg:417
+#, no-c-format
+msgid ""
+"<qt><p>Enable this option if you want KMail to request Message Disposition "
+"Notifications (MDNs) for each of your outgoing messages.</p><p>This option "
+"only affects the default; you can still enable or disable MDN requesting on "
+"a per-message basis in the composer, menu item <em>Options</em>-><em>Request "
+"Disposition Notification</em>.</p></qt>"
+msgstr ""
+
+#: kmail.kcfg:421
+#, no-c-format
+msgid "Use recent addresses for autocompletion"
+msgstr "ใช้ที่อยู่ล่าสุดสำหรับการทำให้สมบูรณ์"
+
+#: kmail.kcfg:422
+#, no-c-format
+msgid ""
+"Disable this option if you do not want recently used addresses to appear in "
+"the autocompletion list in the composer's address fields."
+msgstr ""
+
+#: kmail.kcfg:443
+#, no-c-format
+msgid "Autosave interval:"
+msgstr "บันทึกอัตโนมัติทุกช่วงเวลา:"
+
+#: kmail.kcfg:444
+#, no-c-format
+msgid ""
+"A backup copy of the text in the composer window can be created regularly. "
+"The interval used to create the backups is set here. You can disable "
+"autosaving by setting it to the value 0."
+msgstr ""
+
+#: kmail.kcfg:448
+#, no-c-format
+msgid "Insert signatures above quoted text"
+msgstr ""
+
+#: kmail.kcfg:455
+#, no-c-format
+msgid "Replace recognized prefi&x with \"Re:\""
+msgstr "แทนที่คำนำหน้าที่เลือกด้วย  \"Re:\""
+
+#: kmail.kcfg:462
+#, no-c-format
+msgid "Replace recognized prefix with \"&Fwd:\""
+msgstr "แทนที่คำนำหน้าที่เลือกด้วย \"&Fwd:\""
+
+#: kmail.kcfg:466
+#, no-c-format
+msgid "Use smart &quoting"
+msgstr "ใช้การอ้างถึงแบบฉลาด"
+
+#: kmail.kcfg:470
+#, fuzzy, no-c-format
+msgid "Remove the signature when replying"
+msgstr "ลายเซ็นหมดอายุ"
+
+#: kmail.kcfg:474
+#, no-c-format
+msgid "Only quote selected text when replying"
+msgstr ""
+
+#: kmail.kcfg:479
+#, no-c-format
+msgid "Type of addressee selector"
+msgstr ""
+
+#: kmail.kcfg:480
+#, no-c-format
+msgid ""
+"Sets the type of the dialog for selecting recipients for To,\n"
+"        CC and BCC."
+msgstr ""
+
+#: kmail.kcfg:489
+#, fuzzy, no-c-format
+msgid "Type of recipients editor"
+msgstr "ไม่มีผู้รับ"
+
+#: kmail.kcfg:490
+#, no-c-format
+msgid ""
+"Sets the type of the recipients editor for editing To,\n"
+"        CC and BCC."
+msgstr ""
+
+#: kmail.kcfg:506
+#, fuzzy, no-c-format
+msgid "Maximum number of recipient editor lines."
+msgstr "ไม่มีผู้รับ"
+
+#: kmail.kcfg:512
+#, no-c-format
+msgid ""
+"List of message part types to strip off mails that are being forwarded "
+"inline."
+msgstr ""
+
+#: kmail.kcfg:516
+#, no-c-format
+msgid "The maximum size in MB that email attachments are allowed to have."
+msgstr ""
+
+#: kmail.kcfg:521
+#, no-c-format
+msgid "Show the Text Snippet Management and Insertion Panel in the composer."
+msgstr ""
+
+#: kmail.kcfg:528
+#, no-c-format
+msgid ""
+"Show the GnuPG Audit Log even after crypto operations that completed "
+"successfully."
+msgstr ""
+
+#: kmail.kcfg:557
+#, fuzzy, no-c-format
+msgid "Close message window after replying or forwarding the message."
+msgstr "ใช้ชุดรหัสอักขระปริยายของเจ้าของ เมื่อมีการตอบกลับหรือมีการส่งต่อ (หากทำได้)"
+
+#: kmail.kcfg:572
+#, no-c-format
+msgid ""
+"Some emails, especially those generated automatically, do not specify the "
+"character encoding which needs to be used to properly display them. In such "
+"cases a fallback character encoding will be used, which you can configure "
+"here. Set it to the character encoding most commonly used in your part of "
+"the world. As a default the encoding configured for the whole system is used."
+msgstr ""
+
+#: kmail.kcfg:578
+#, no-c-format
+msgid ""
+"Changing this from its default 'Auto' will force the use of the specified "
+"encoding for all emails, regardless of what they specify themselves."
+msgstr ""
+
+#: kmail.kcfg:584
+#, no-c-format
+msgid ""
+"Enable this if you want smileys like :-) appearing in the message text to be "
+"replaced by emoticons (small pictures)."
+msgstr ""
+
+#: kmail.kcfg:589
+#, no-c-format
+msgid ""
+"Enable this option to show different levels of quoted text. Disable to hide "
+"the levels of quoted text."
+msgstr ""
+
+#: kmail.kcfg:592
+#, no-c-format
+msgid "Automatic collapse level:"
+msgstr "ระดับการยุบอัตโนมัติ:"
+
+#: kmail.kcfg:600
+#, no-c-format
+msgid "Reduce font size for quoted text"
+msgstr "ลดขนาดอักษรสำหรับส่วนข้อความที่อ้างถึง"
+
+#: kmail.kcfg:601
+#, no-c-format
+msgid "Enable this option to show quoted text with a smaller font."
+msgstr "เปิดใช้ตัวเลือกนี้เพื่อให้แสดงส่วนที่อ้างถึงด้วยตัวอักษรขนาดเล็กลง"
+
+#: kmail.kcfg:612
+#, fuzzy, no-c-format
+msgid "Show current message sender time"
+msgstr "จัดเก็บจดหมายเข้ารหัสที่ส่งแล้ว"
+
+#: kmail.kcfg:613
+#, no-c-format
+msgid ""
+"Enable this if you like to know what time of day are now in sender location "
+"(calculated from sender time zone)."
+msgstr ""
+
+#: kmail.kcfg:618
+#, fuzzy, no-c-format
+msgid "Show user agent in fancy headers"
+msgstr "แสดงสถานะสแปมในส่วนหัวแบบแฟนซี"
+
+#: kmail.kcfg:619
+#, no-c-format
+msgid ""
+"Enable this option to get the User-Agent and X-Mailer header lines displayed "
+"when using fancy headers."
+msgstr ""
+
+#: kmail.kcfg:624
+#, no-c-format
+msgid "Allow to delete attachments of existing mails."
+msgstr ""
+
+#: kmail.kcfg:628
+#, no-c-format
+msgid "Allow to edit attachments of existing mails."
+msgstr ""
+
+#: kmail.kcfg:633
+#, no-c-format
+msgid "Always decrypt messages when viewing or ask befor decrypting"
+msgstr ""
+
+#: kmail.kcfg:647
+#, no-c-format
+msgid "Send Message Disposition Notifications with an empty sender."
+msgstr ""
+
+#: kmail.kcfg:648
+#, no-c-format
+msgid ""
+"Send Message Disposition Notifications with an empty sender string. Some "
+"servers might be configure to reject such messages, so if you are "
+"experiencing problems sending MDNs, uncheck this option."
+msgstr ""
+
+#: kmail.kcfg:654
+#, no-c-format
+msgid "Phrases has been converted to templates"
+msgstr ""
+
+#: kmail.kcfg:655
+#, no-c-format
+msgid "Old phrases have been converted to templates"
+msgstr ""
+
+#: kmail.kcfg:659
+#, fuzzy, no-c-format
+msgid "Message template for new message"
+msgstr "รายการจดหมาย - จดหมายใหม่"
+
+#: kmail.kcfg:664
+#, no-c-format
+msgid "Message template for reply"
+msgstr ""
+
+#: kmail.kcfg:669
+#, no-c-format
+msgid "Message template for reply to all"
+msgstr ""
+
+#: kmail.kcfg:674
+#, no-c-format
+msgid "Message template for forward"
+msgstr ""
+
+#: kmail.kcfg:679
+#, fuzzy, no-c-format
+msgid "Quote characters"
+msgstr "เพิ่มอักขระอ้างถึง"
+
+#: kmail.kcfg:688
+#, no-c-format
+msgid "Allow out-of-office settings to to be changeable by the user."
+msgstr ""
+
+#: kmail.kcfg:692
+#, no-c-format
+msgid ""
+"Allow users to upload out-of-office sieve scripts, but disallow them changin "
+"any settings, such as the domain to react to and the spam reaction switch."
+msgstr ""
+
+#: kmail.kcfg:696
+#, no-c-format
+msgid "Send out-of-office replies to mails coming from this domain only."
+msgstr ""
+
+#: kmail.kcfg:700
+#, no-c-format
+msgid "Allow out-of-office replies to be sent to messages marked as SPAM."
+msgstr ""
+
+#: kmail.kcfg:704
+#, no-c-format
+msgid ""
+"Check if there is still an active out-of-office reply configured when "
+"starting KMail."
+msgstr ""
+
+#: kmail_part.rc:8 kmmainwin.rc:8 kmreadermainwin.rc:5
+#, fuzzy, no-c-format
+msgid "&File"
+msgstr "แก้ไขแฟ้ม"
+
+#: kmail_part.rc:38 kmcomposerui.rc:22 kmmainwin.rc:41 kmreadermainwin.rc:13
+#, fuzzy, no-c-format
+msgid "&Edit"
+msgstr "แก้ไข..."
+
+#: kmail_part.rc:62 kmcomposerui.rc:49 kmmainwin.rc:65 kmreadermainwin.rc:18
+#, no-c-format
+msgid "&View"
+msgstr ""
+
+#: kmail_part.rc:80 kmmainwin.rc:83
+#, no-c-format
+msgid "&Go"
+msgstr "ไปยัง"
+
+#: kmail_part.rc:92 kmmainwin.rc:95
+#, no-c-format
+msgid "F&older"
+msgstr "โฟลเดอร์"
+
+#: kmail_part.rc:116 kmcomposerui.rc:4 kmmainwin.rc:119 kmreadermainwin.rc:28
+#, no-c-format
+msgid "&Message"
+msgstr "จดหมาย"
+
+#: kmail_part.rc:122 kmmainwin.rc:125 kmreadermainwin.rc:35
+#, no-c-format
+msgid "Reply Special"
+msgstr "ตอบกลับแบบพิเศษ"
+
+#: kmail_part.rc:128 kmmainwin.rc:131 kmreadermainwin.rc:41
+#, no-c-format
+msgid "&Forward"
+msgstr "ส่งต่อ"
+
+#: kmail_part.rc:150 kmmainwin.rc:153
+#, no-c-format
+msgid "&Tools"
+msgstr ""
+
+#: kmail_part.rc:163 kmcomposerui.rc:84 kmmainwin.rc:169 kmreadermainwin.rc:54
+#, fuzzy, no-c-format
+msgid "&Settings"
+msgstr "ปรับการตั้งค่าแบบอักษรเป็นค่าเดิม"
+
+#: kmail_part.rc:176 kmmainwin.rc:182
+#, no-c-format
+msgid "&Help"
+msgstr ""
+
+#: kmail_part.rc:181 kmcomposerui.rc:88 kmmainwin.rc:187 kmreadermainwin.rc:63
+#, fuzzy, no-c-format
+msgid "Main Toolbar"
+msgstr "แถบเครื่องมือ HTML"
+
+#: kmcomposerui.rc:34
+#, fuzzy, no-c-format
+msgid "&Options"
+msgstr "ตัวเลือกทั่วไป"
+
+#: kmcomposerui.rc:102
+#, no-c-format
+msgid "HTML Toolbar"
+msgstr "แถบเครื่องมือ HTML"
+
+#: smimeconfiguration.ui:24
+#, no-c-format
+msgid "Validate certificates using CRLs"
+msgstr ""
+
+#: smimeconfiguration.ui:30
+#, no-c-format
+msgid ""
+"If this option is selected, S/MIME certificates are validated using "
+"Certificate Revocation Lists (CRLs)."
+msgstr ""
+
+#: smimeconfiguration.ui:38
+#, no-c-format
+msgid "Validate certificates online (OCSP)"
+msgstr ""
+
+#: smimeconfiguration.ui:41
+#, no-c-format
+msgid ""
+"If this option is selected, S/MIME certificates are validated online using "
+"the Online Certificates Status Protocol (OCSP). Fill in the URL of the OCSP "
+"responder below."
+msgstr ""
+
+#: smimeconfiguration.ui:49
+#, fuzzy, no-c-format
+msgid "Online Certificate Validation"
+msgstr "สร้างใบรับรอง"
+
+#: smimeconfiguration.ui:68
+#, no-c-format
+msgid "OCSP responder URL:"
+msgstr ""
+
+#: smimeconfiguration.ui:76
+#, no-c-format
+msgid ""
+"Enter here the address of the server for online validation of certificates "
+"(OCSP responder). The URL is usually starting with http://."
+msgstr ""
+
+#: smimeconfiguration.ui:94
+#, fuzzy, no-c-format
+msgid "OCSP responder signature:"
+msgstr "ลายเซ็นใช้ได้"
+
+#: smimeconfiguration.ui:126
+#, fuzzy, no-c-format
+msgid "Ignore service URL of certificates"
+msgstr "หาใบรับรองอื่น ๆ"
+
+#: smimeconfiguration.ui:136
+#, fuzzy, no-c-format
+msgid "Do not check certificate policies"
+msgstr "อย่าส่งใบรับรอง"
+
+#: smimeconfiguration.ui:139
+#, no-c-format
+msgid ""
+"By default GnuPG uses the file ~/.gnupg/policies.txt to check if a "
+"certificate policy is allowed. If this option is selected, policies are not "
+"checked."
+msgstr ""
+
+#: smimeconfiguration.ui:147
+#, no-c-format
+msgid "Never consult a CRL"
+msgstr ""
+
+#: smimeconfiguration.ui:150
+#, no-c-format
+msgid ""
+"If this option is checked, Certificate Revocation Lists are never used to "
+"validate S/MIME certificates."
+msgstr ""
+
+#: smimeconfiguration.ui:158
+#, fuzzy, no-c-format
+msgid "Fetch missing issuer certificates"
+msgstr "เมื่อมีการเพิ่มใบรับรอง"
+
+#: smimeconfiguration.ui:161
+#, no-c-format
+msgid ""
+"If this option is checked, missing issuer certificates are fetched when "
+"necessary (this applies to both validation methods, CRLs and OCSP)"
+msgstr ""
+
+#: smimeconfiguration.ui:169
+#, no-c-format
+msgid "HTTP Requests"
+msgstr ""
+
+#: smimeconfiguration.ui:180
+#, no-c-format
+msgid "Do not perform any HTTP requests"
+msgstr ""
+
+#: smimeconfiguration.ui:183
+#, no-c-format
+msgid "Entirely disables the use of HTTP for S/MIME."
+msgstr ""
+
+#: smimeconfiguration.ui:224
+#, no-c-format
+msgid "Use this proxy for HTTP requests: "
+msgstr ""
+
+#: smimeconfiguration.ui:232
+#, no-c-format
+msgid "Use system HTTP proxy:"
+msgstr ""
+
+#: smimeconfiguration.ui:235
+#, no-c-format
+msgid ""
+"If this option is selected, the value of the HTTP proxy shown on the right "
+"(which comes from the environment variable http_proxy) will be used for any "
+"HTTP request."
+msgstr ""
+
+#: smimeconfiguration.ui:243
+#, no-c-format
+msgid ""
+"Enter here the location of your HTTP Proxy, which will be used for all HTTP "
+"requests relating to S/MIME. The syntax is host:port, for instance myproxy."
+"nowhere.com:3128."
+msgstr ""
+
+#: smimeconfiguration.ui:253
+#, no-c-format
+msgid "Ignore HTTP CRL distribution point of certificates"
+msgstr ""
+
+#: smimeconfiguration.ui:256
+#, no-c-format
+msgid ""
+"When looking for the location of a CRL, the to-be-tested certificate usually "
+"contains what are known as \"CRL Distribution Point\" (DP) entries, which "
+"are URLs describing the way to access the URL. The first found DP entry is "
+"used.  With this option all entries using the HTTP scheme are ignored when "
+"looking for a suitable DP."
+msgstr ""
+
+#: smimeconfiguration.ui:268
+#, no-c-format
+msgid "LDAP Requests"
+msgstr ""
+
+#: smimeconfiguration.ui:279
+#, no-c-format
+msgid "Do not perform any LDAP requests"
+msgstr ""
+
+#: smimeconfiguration.ui:282
+#, no-c-format
+msgid "Entirely disables the use of LDAP for S/MIME."
+msgstr ""
+
+#: smimeconfiguration.ui:307
+#, no-c-format
+msgid "Ignore LDAP CRL distribution point of certificates"
+msgstr ""
+
+#: smimeconfiguration.ui:310
+#, no-c-format
+msgid ""
+"When looking for the location of a CRL, the to-be-tested certificate usually "
+"contains what are known as \"CRL Distribution Point\" (DP) entries, which "
+"are URLs describing the way to access the URL. The first found DP entry is "
+"used.  With this option all entries using the LDAP scheme are ignored when "
+"looking for a suitable DP."
+msgstr ""
+
+#: smimeconfiguration.ui:326
+#, no-c-format
+msgid "Primary host for LDAP requests:"
+msgstr ""
+
+#: smimeconfiguration.ui:334
+#, no-c-format
+msgid ""
+"Entering a LDAP server here will make all LDAP requests go to that server "
+"first. More precisely, this setting overrides any specified host and port "
+"part in a LDAP URL and will also be used if host and port have been omitted "
+"from the URL. Other LDAP servers will be used only if the connection to the "
+"\"proxy\" failed.\n"
+"The syntax is \"HOST\" or \"HOST:PORT\". If PORT is omitted, port 389 "
+"(standard LDAP port) is used."
+msgstr ""
+
+#: snippetdlgbase.ui:16
+#, no-c-format
+msgid "Add Snippet"
+msgstr ""
+
+#: snippetdlgbase.ui:52
+#, fuzzy, no-c-format
+msgid "&Add"
+msgstr "เพิ่ม..."
+
+#: snippetdlgbase.ui:111
+#, no-c-format
+msgid "&Snippet:"
+msgstr ""
+
+#: snippetdlgbase.ui:125
+#, fuzzy, no-c-format
+msgid "Group:"
+msgstr "กรุ๊ปแวร์"
+
+#: snippetsettingsbase.ui:16
+#, fuzzy, no-c-format
+msgid "Snippet Settings"
+msgstr "ปรับการตั้งค่าแบบอักษรเป็นค่าเดิม"
+
+#: snippetsettingsbase.ui:27
+#, no-c-format
+msgid "Tooltips"
+msgstr ""
+
+#: snippetsettingsbase.ui:38
+#, no-c-format
+msgid "Show snippet's text in &tooltip"
+msgstr ""
+
+#: snippetsettingsbase.ui:44
+#, no-c-format
+msgid ""
+"Decides if a tooltip should be shown containing text from the bookmarked line"
+msgstr ""
+
+#: snippetsettingsbase.ui:71
+#, no-c-format
+msgid "Variables"
+msgstr ""
+
+#: snippetsettingsbase.ui:82
+#, no-c-format
+msgid "Input Method for Variables"
+msgstr ""
+
+#: snippetsettingsbase.ui:93
+#, no-c-format
+msgid "Single dialog for each variable within a snippet"
+msgstr ""
+
+#: snippetsettingsbase.ui:102
+#, no-c-format
+msgid "An input dialog will be displayed for every variable within a snippet"
+msgstr ""
+
+#: snippetsettingsbase.ui:110
+#, no-c-format
+msgid "One dialog for all variables within a snippet"
+msgstr ""
+
+#: snippetsettingsbase.ui:119
+#, no-c-format
+msgid ""
+"A single dialog will be displayed where you can enter the values for all "
+"variables within a snippet"
+msgstr ""
+
+#: snippetsettingsbase.ui:137
+#, fuzzy, no-c-format
+msgid "Delimiter:"
+msgstr "ไม่จำกัด"
+
+#: templatesconfiguration_base.ui:30
+#, fuzzy, no-c-format
+msgid "TemplatesConfiguration"
+msgstr "ปรับแต่งลายเซ็น"
+
+#: templatesconfiguration_base.ui:129
+#, fuzzy, no-c-format
+msgid "Reply to Sender"
+msgstr "ตอบกลับไปยังผู้ส่ง:"
+
+#: templatesconfiguration_base.ui:172
+#, no-c-format
+msgid "Reply to All / Reply to List"
+msgstr ""
+
+#: templatesconfiguration_base.ui:215
+#, fuzzy, no-c-format
+msgid "Forward Message"
+msgstr "ส่งต่อข้อความแล้ว"
+
+#: warningconfiguration.ui:24
+#, no-c-format
+msgid "Warn when trying to send &unsigned messages"
+msgstr "แจ้งเตือนเมื่อพยายามจะส่งจดหมายที่ยังไม่ได้เซ็น"
+
+#: warningconfiguration.ui:30
+#, no-c-format
+msgid "Check to be warned when sending unsigned messages."
+msgstr "เลือกเพื่อให้มีการแจ้งเตือนเมื่อพยายามจะส่งจดหมายที่ยังไม่ได้เซ็น"
+
+#: warningconfiguration.ui:33
+#, no-c-format
+msgid ""
+"<qt>\n"
+"<h1>Warn When Trying To Send Unsigned Messages</h1>\n"
+"If this box is checked, you will be warned when you try to send parts of or "
+"the whole message unsigned.\n"
+"<p>\n"
+"It is recommended to leave this option turned on for maximum integrity.\n"
+"</qt>"
+msgstr ""
+
+#: warningconfiguration.ui:46
+#, no-c-format
+msgid "&Warn when trying to send unencrypted messages"
+msgstr "แจ้งเตือนเมื่อพยายามส่งจดหมายที่ไม่ได้เข้ารหัสไว้"
+
+#: warningconfiguration.ui:52
+#, no-c-format
+msgid "Check to be warned when sending unencrypted messages."
+msgstr "เช็คเพื่อให้มีการเตือนเมื่อมีการส่งจดหมายที่ไม่ได้เข้ารหัสไว้"
+
+#: warningconfiguration.ui:55
+#, no-c-format
+msgid ""
+"<qt>\n"
+"<h1>Warn When Trying To Send Unencrypted Messages</h1>\n"
+"If this box is checked, you will be warned when you try to send parts of or "
+"the whole message unencrypted.\n"
+"<p>\n"
+"It is recommended to leave this option turned on for maximum integrity.\n"
+"</qt>"
+msgstr ""
+
+#: warningconfiguration.ui:68
+#, fuzzy, no-c-format
+msgid "Warn if &Receiver's Email Address is Not in Certificate"
+msgstr "แจ้งเตือนหากที่อยู่อีเมล์ของผู้เซ็นไม่อยู่ในใบรับรอง"
+
+#: warningconfiguration.ui:74
+#, no-c-format
+msgid "Check to be warned if the address is not in the certificate"
+msgstr ""
+
+#: warningconfiguration.ui:77
+#, no-c-format
+msgid ""
+"<qt>\n"
+"<h1>Warn If Receiver's Email Address Is Not In Certificate</h1>\n"
+"If this option is checked, a warning is issued if the email address of the "
+"receiver is not contained in the certificate used for encrypting.\n"
+"<p>\n"
+"It is recommended to leave this option turned on for maximum security.\n"
+"</qt>"
+msgstr ""
+
+#: warningconfiguration.ui:90
+#, fuzzy, no-c-format
+msgid "Warn if certificates/keys expire soon (configure thresholds below)"
+msgstr "แจ้งเตือน หากองค์กรผู้ออกใบรับรองจะหมดอายุภายใน"
+
+#: warningconfiguration.ui:104
+#, fuzzy, no-c-format
+msgid "For signing"
+msgstr "ใช้สำหรับการเซ็น"
+
+#: warningconfiguration.ui:115
+#, fuzzy, no-c-format
+msgid "For encryption"
+msgstr "การเข้ารหัส"
+
+#: warningconfiguration.ui:138 warningconfiguration.ui:166
+#: warningconfiguration.ui:194 warningconfiguration.ui:222
+#: warningconfiguration.ui:250 warningconfiguration.ui:278
+#, no-c-format
+msgid "Select the number of days here"
+msgstr "เลือกจำนวนของวันที่นี่"
+
+#: warningconfiguration.ui:141
+#, no-c-format
+msgid ""
+"<qt>\n"
+"<h1>Warn If Signature Certificate Expires</h1>\n"
+"Select the minimum number of days the signature certificate should be valid "
+"without issuing a warning.\n"
+"<p>\n"
+"The recommended SPHINX setting is 14 days.\n"
+"</qt>"
+msgstr ""
+
+#: warningconfiguration.ui:169
+#, no-c-format
+msgid ""
+"<qt>\n"
+"<h1>Warn If Encryption Certificate Expires</h1>\n"
+"Select the minimum number of days the encryption certificate should be valid "
+"without issuing a warning.\n"
+"<p>\n"
+"The recommended SPHINX setting is 14 days.\n"
+"</qt>"
+msgstr ""
+
+#: warningconfiguration.ui:197
+#, no-c-format
+msgid ""
+"<qt>\n"
+"<h1>Warn If A Certificate In The Chain Expires</h1>\n"
+"Select the minimum number of days all certificates in the chain should be "
+"valid without issuing a warning.\n"
+"<p>\n"
+"The recommended SPHINX setting is 14 days.\n"
+"</qt>"
+msgstr ""
+
+#: warningconfiguration.ui:225
+#, no-c-format
+msgid ""
+"<qt>\n"
+"<h1>Warn If CA Certificate Expires</h1>\n"
+"Select the minimum number of days the CA certificate should be valid without "
+"issuing a warning.\n"
+"<p>\n"
+"The recommended SPHINX setting is 14 days.\n"
+"</qt>"
+msgstr ""
+
+#: warningconfiguration.ui:253 warningconfiguration.ui:281
+#, no-c-format
+msgid ""
+"<qt>\n"
+"<h1>Warn If Root Certificate Expires</h1>\n"
+"Select the minimum number of days the root certificate should be valid "
+"without issuing a warning.\n"
+"<p>\n"
+"The recommended SPHINX setting is 14 days.\n"
+"</qt>"
+msgstr ""
+
+#: warningconfiguration.ui:294
+#, fuzzy, no-c-format
+msgid "For root certificates:"
+msgstr "หาใบรับรองอื่น ๆ"
+
+#: warningconfiguration.ui:305
+#, fuzzy, no-c-format
+msgid "For intermediate CA certificates:"
+msgstr "หาใบรับรองอื่น ๆ"
+
+#: warningconfiguration.ui:316
+#, fuzzy, no-c-format
+msgid "For end-user certificates/keys:"
+msgstr "อย่าส่งใบรับรอง"
+
+#: warningconfiguration.ui:388
+#, no-c-format
+msgid "Re-enable All \"Don't Ask Again\" Warnings"
+msgstr ""
+
+#: tips:3
+msgid ""
+"<p>...that you can go to the next and previous message by using the\n"
+"right and left arrow keys respectively?</p>\n"
+msgstr ""
+
+#: tips:10
 #, fuzzy
 msgid ""
-"A file named \"%1\" already exists. Are you sure you want to overwrite it?"
-msgstr "มีแฟ้มชื่อนี้อยู่แล้ว คุณต้องการเขียนทับมันหรือไม่ ?"
+"<p>...that you can rapidly create filters on sender, recipient,\n"
+"subject and mailing lists with <em>Tools-&gt;Create&nbsp;Filter</em>?</p>\n"
+msgstr ""
+"\n"
+"<p>...คุณสามารถสร้างตัวกรองของผู้ส่ง, ผู้รับ, ชื่อเรื่อง และรายการจดหมายเวียน\n"
+"ได้อย่างรวดเร็ว โดยเลือกจาก <em>เครื่องมือ->สร้างตัวกรองใหม่</em> ?</p>\n"
 
-#: util.h:210
+#: tips:17
+msgid ""
+"<p>...that you can get rid of the &quot;[mailing list name]&quot;\n"
+"added to the subject of some mailing lists by using the <em>rewrite\n"
+"header</em> filter action? Just use\n"
+"<pre>rewrite header &quot;Subject&quot;\n"
+"   replace &quot;\\s*\\[mailing list name\\]\\s*&quot;\n"
+"   with &quot;&quot;</pre>\n"
+"</p>\n"
+msgstr ""
+
+#: tips:29
+msgid ""
+"<p>...that you can associate mailing lists with folders in the\n"
+"<em>Folder-&gt;Mailing List Management</em> dialog? You can then use\n"
+"<em>Message-&gt;New&nbsp;Message&nbsp;to&nbsp;Mailing&nbsp;List...</em>\n"
+"to open the composer with the mailing list address preset.\n"
+"Alternatively, you can click with the middle mouse button on the folder.</"
+"p>\n"
+msgstr ""
+
+#: tips:39
 #, fuzzy
-msgid "Overwrite File?"
-msgstr "แทรกแฟ้ม"
+msgid ""
+"<p>...that you can assign custom icons to each folder individually?\n"
+"See <em>Folder-&gt;Properties</em></p>\n"
+msgstr ""
+"<p>...คุณสามารถกำหนดไอคอนสำหรับแต่ละโฟลเดอร์ของคุณเองได้ ?\n"
+"ดูที่ <em>โฟลเดอร์->คุณสมบัติ...</em></p>\n"
+
+#: tips:46
+msgid ""
+"<p>...that KMail can show a color bar indicating the type of message\n"
+"(Plain text/HTML/OpenPGP) currently displayed?</p>\n"
+"<p>This thwarts attempts to fake successful signature verification by\n"
+"sending HTML mails mimicking KMail's signature status frames.</p>\n"
+msgstr ""
+
+#: tips:55
+msgid ""
+"<p>...that you can filter on any header by simply entering its name\n"
+"in the first edit field of a search rule?</p>\n"
+msgstr ""
+"<p>...คุณสามารถจะทำการกรองจดหมายได้จากส่วนหัว \n"
+"ด้วยการเติมชื่อของมันในช่องกรอกข้อมูลช่องแรกของกฏการค้นหา ?</p>\n"
+
+#: tips:62
+msgid ""
+"<p>...that you can filter out HTML only messages with the rule\n"
+"<pre>&quot;Content-type&quot; contains &quot;text/html&quot;?</pre>\n"
+"</p>\n"
+msgstr ""
+"<p>...คุณสามารถจะกรองให้แสดงจดหมาย HTML เฉพาะฉบับที่เข้ากับกฏเท่านั้นได้\n"
+"<pre>&quot;Content-type&quot; บรรจุ &quot;text/html&quot;?</pre>\n"
+"</p>\n"
+
+#: tips:70
+msgid ""
+"<p>...that when replying, only the selected part of the message is quoted?</"
+"p>\n"
+"<p>If nothing is selected, the full message is quoted.</p>\n"
+"<p>This even works with text of attachments when\n"
+"<em>View-&gt;Attachments-&gt;Inline</em> is selected.</p>\n"
+"<p>This feature is available with all reply commands except\n"
+"<em>Message-&gt;Reply Without Quote</em>.</p>\n"
+"<p align=\"right\"><em>contributed by David F. Newman</em></p>\n"
+msgstr ""
 
 #, fuzzy
 #~ msgid "Show folder quick search field"
@@ -14489,7 +14131,8 @@ msgstr "แทรกแฟ้ม"
 #~ msgstr "เลือกเพื่อไม่ให้มีการเซ็นจดหมายเป็นค่าปริยาย"
 
 #, fuzzy
-#~ msgid "The signature certificate is configured on the <em>Certificates</em> page."
+#~ msgid ""
+#~ "The signature certificate is configured on the <em>Certificates</em> page."
 #~ msgstr "ใบรับรองลายเซ็น ถูกปรับแต่งบนหน้า <em>ใบรับรอง</em> !"
 
 #~ msgid "Selects the signature algorithm"
@@ -14569,10 +14212,6 @@ msgstr "แทรกแฟ้ม"
 #~ msgstr "เก็บไว้ในโฟลเดอร์ฉบับร่าง"
 
 #, fuzzy
-#~ msgid "Configure KMail"
-#~ msgstr "ปรับแต่งโปรแกรมจัดการจดหมาย - K..."
-
-#, fuzzy
 #~ msgid "Go Online"
 #~ msgstr "ทำงานออนไลน์"