Automated l10n update (.po files)

author: Timothy Pearson <kb9vqf@pearsoncomputing.net> 2014-09-29 03:08:03 -0500
committer: Timothy Pearson <kb9vqf@pearsoncomputing.net> 2014-09-29 03:08:03 -0500
commit: 242434109c14a494dee7738b9c343f5947d20506 (patch)
tree: ea25930767128361a7669f1a25a479a66ccdfbeb /tde-i18n-th/messages/tdepim
parent: 8819501c6a160b7ae106b1a968bc953b0f0bc465 (diff)
download: tde-i18n-242434109c14a494dee7738b9c343f5947d20506.tar.gz
tde-i18n-242434109c14a494dee7738b9c343f5947d20506.zip
22 files changed, 8991 insertions, 6893 deletions
diff --git a/tde-i18n-th/messages/tdepim/akregator.po b/tde-i18n-th/messages/tdepim/akregator.po
index 530b6afac53..834ce4ab1af 100644
--- a/tde-i18n-th/messages/tdepim/akregator.po
+++ b/tde-i18n-th/messages/tdepim/akregator.po
@@ -4,10 +4,11 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: akregator\n"
-"POT-Creation-Date: 2008-07-08 01:23+0200\n"
+"POT-Creation-Date: 2014-09-29 00:52-0500\n"
 "PO-Revision-Date: 2006-10-06 22:03+1000\n"
 "Last-Translator: Sahachart Anukulkitch <drrider@gmail.com>\n"
 "Language-Team: Thai <l10n@opentle.org>\n"
+"Language: th\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -25,7 +26,7 @@ msgid ""
 "Your emails"
 msgstr "drrider@gmail.com"
 
-#: aboutdata.cpp:32 akregator_part.cpp:946 articleviewer.cpp:396
+#: aboutdata.cpp:32 akregator_part.cpp:956 articleviewer.cpp:396
 msgid "Akregator"
 msgstr "Akregator"
 
@@ -190,25 +191,25 @@ msgid "Ma&rk All Feeds as Read"
 msgstr "ทำเ&ครื่องหมายว่าได้อ่านแหล่งป้อนข่าวทั้งหมดแล้ว"
 
 #. i18n: file akregator.kcfg line 9
-#: actionmanagerimpl.cpp:317 rc.cpp:312 rc.cpp:819
+#: actionmanagerimpl.cpp:317 rc.cpp:321 rc.cpp:675
 #, no-c-format
 msgid "Show Quick Filter"
 msgstr "แสดงที่กรองด่วน"
 
 #. i18n: file settings_browser.ui line 108
-#: actionmanagerimpl.cpp:320 rc.cpp:240 rc.cpp:255 rc.cpp:639 rc.cpp:654
+#: actionmanagerimpl.cpp:320 rc.cpp:246 rc.cpp:261 rc.cpp:651 rc.cpp:666
 #, no-c-format
 msgid "Open in Tab"
 msgstr "เปิดหน้าด้วยแท็บ"
 
 #. i18n: file settings_browser.ui line 113
-#: actionmanagerimpl.cpp:321 rc.cpp:243 rc.cpp:258 rc.cpp:642 rc.cpp:657
+#: actionmanagerimpl.cpp:321 rc.cpp:249 rc.cpp:264 rc.cpp:654 rc.cpp:669
 #, no-c-format
 msgid "Open in Background Tab"
 msgstr "เปิดหน้าในแท็บเบื้องหลัง"
 
 #. i18n: file settings_browser.ui line 118
-#: actionmanagerimpl.cpp:322 rc.cpp:246 rc.cpp:261 rc.cpp:645 rc.cpp:660
+#: actionmanagerimpl.cpp:322 rc.cpp:252 rc.cpp:267 rc.cpp:657 rc.cpp:672
 #, no-c-format
 msgid "Open in External Browser"
 msgstr "เปิดหน้าด้วยเบราว์เซอร์ภายนอก"
@@ -356,7 +357,7 @@ msgid "&Close Tab"
 msgstr "ปิด&แท็บ"
 
 #. i18n: file addfeedwidgetbase.ui line 16
-#: addfeeddialog.cpp:53 rc.cpp:48 rc.cpp:609
+#: addfeeddialog.cpp:53 rc.cpp:48 rc.cpp:621
 #, no-c-format
 msgid "Add Feed"
 msgstr "เพิ่มแหล่งป้อนข่าว"
@@ -391,34 +392,26 @@ msgid "Feeds"
 msgstr "แหล่งป้อนข่าว"
 
 #: akregator_part.cpp:366
-msgid "Akregator News"
-msgstr "ข่าว Akregator"
+msgid "Trinity Desktop News"
+msgstr ""
 
 #: akregator_part.cpp:371
-msgid "Akregator Blog"
-msgstr "บล็อก Akregator"
+msgid "LXer Linux News"
+msgstr ""
 
 #: akregator_part.cpp:376
-msgid "TDE Dot News"
-msgstr "TDE Dot News"
+msgid "Tuxmachines"
+msgstr ""
 
 #: akregator_part.cpp:381
-msgid "Planet TDE"
-msgstr "พลาเน็ต TDE"
-
-#: akregator_part.cpp:386
-msgid "TDE Apps"
-msgstr "TDE Apps"
-
-#: akregator_part.cpp:391
-msgid "TDE Look"
-msgstr "TDE Look"
+msgid "lwn.net"
+msgstr ""
 
-#: akregator_part.cpp:400
+#: akregator_part.cpp:390
 msgid "Opening Feed List..."
 msgstr "กำลังเปิดรายการแหล่งป้อนข่าว..."
 
-#: akregator_part.cpp:435
+#: akregator_part.cpp:425
 msgid ""
 "<qt>The standard feed list is corrupted (invalid XML). A backup was created:"
 "<p><b>%2</b></p></qt>"
@@ -427,11 +420,11 @@ msgstr ""
 "สร้างแฟ้มสำรองข้อมูล: "
 "<p><b>%2</b></p></qt>"
 
-#: akregator_part.cpp:435
+#: akregator_part.cpp:425
 msgid "XML Parsing Error"
 msgstr "ข้อผิดพลาดในการวิเคราะห์รูปแบบ XML"
 
-#: akregator_part.cpp:450
+#: akregator_part.cpp:440
 msgid ""
 "<qt>The standard feed list is corrupted (no valid OPML). A backup was created:"
 "<p><b>%2</b></p></qt>"
@@ -440,27 +433,27 @@ msgstr ""
 "สร้างแฟ้ม สำรองข้อมูล: "
 "<p><b>%2</b></p></qt>"
 
-#: akregator_part.cpp:450 akregator_part.cpp:642
+#: akregator_part.cpp:440 akregator_part.cpp:632
 msgid "OPML Parsing Error"
 msgstr "ข้อผิดพลาดในการวิเคราะห์รูปแบบ OPML"
 
-#: akregator_part.cpp:489
+#: akregator_part.cpp:479
 msgid "Access denied: cannot save feed list (%1)"
 msgstr "การเข้าถึงถูกปฎิเสธ: ไม่สามารถบันทึกรายการแหล่งป้อนข่าวได้ (%1)"
 
-#: akregator_part.cpp:489
+#: akregator_part.cpp:479
 msgid "Write error"
 msgstr "เกิดข้อผิดพลาดในการเขียน"
 
-#: akregator_part.cpp:593
+#: akregator_part.cpp:583
 msgid "Interesting"
 msgstr "น่าสนใจ"
 
-#: akregator_part.cpp:642
+#: akregator_part.cpp:632
 msgid "Could not import the file %1 (no valid OPML)"
 msgstr "ไม่สามารถนำเข้าแฟ้ม %1 ได้ (ไม่มี OPML ที่ถูกต้อง)"
 
-#: akregator_part.cpp:645
+#: akregator_part.cpp:635
 msgid ""
 "The file %1 could not be read, check if it exists or if it is readable for the "
 "current user."
@@ -468,36 +461,36 @@ msgstr ""
 "ไม่สามารถอ่านแฟ้ม %1 ได้ โปรดตรวจสอบว่ามีแฟ้มอยู่ หรือแฟ้มนั้นสามารถอ่านได้โดย "
 "ผู้ใช้ปัจจุบันหรือไม่"
 
-#: akregator_part.cpp:645
+#: akregator_part.cpp:635
 msgid "Read Error"
 msgstr "เกิดข้อผิดพลาดในการอ่าน"
 
-#: akregator_part.cpp:659
+#: akregator_part.cpp:649
 msgid "The file %1 already exists; do you want to overwrite it?"
 msgstr "แฟ้ม %1 นั้นมีอยู่แล้ว คุณต้องการที่จะเขียนทับปรือไม่?"
 
-#: akregator_part.cpp:661
+#: akregator_part.cpp:651
 msgid "Overwrite"
 msgstr "เขียนทับ"
 
-#: akregator_part.cpp:667
+#: akregator_part.cpp:657
 #, c-format
 msgid "Access denied: cannot write to file %1"
 msgstr "การเข้าถึงถูกปฏิเสธ: ไม่สามารถเขียนแฟ้ม %1 ได้"
 
-#: akregator_part.cpp:667
+#: akregator_part.cpp:657
 msgid "Write Error"
 msgstr "เกิดข้อผิดพลาดในการเขียน"
 
-#: akregator_part.cpp:696 akregator_part.cpp:706
+#: akregator_part.cpp:686 akregator_part.cpp:696
 msgid "OPML Outlines (*.opml, *.xml)"
 msgstr "รูปแบบ OPML (*.opml, *.xml)"
 
-#: akregator_part.cpp:697 akregator_part.cpp:707
+#: akregator_part.cpp:687 akregator_part.cpp:697
 msgid "All Files"
 msgstr "แฟ้มทั้งหมด"
 
-#: akregator_part.cpp:975
+#: akregator_part.cpp:985
 msgid ""
 "<qt>%1 already seems to be running on another display on this machine. <b>"
 "Running %2 more than once is not supported by the %3 backend and can cause the "
@@ -511,7 +504,7 @@ msgstr ""
 "คุณควรจะ ปิดการจัดเก็บบทความในตอนนี้ นอกจากคุณจะแน่ใจว่า %2 "
 "ไม่ได้กำลังทำงานอยู่</qt>"
 
-#: akregator_part.cpp:987
+#: akregator_part.cpp:997
 msgid ""
 "<qt>%1 seems to be running on another display on this machine. <b>"
 "Running %1 and %2 at the same time is not supported by the %3 backend and can "
@@ -525,7 +518,7 @@ msgstr ""
 "คุณควรจะปิดการจัดเก็บบทความในตอนนี้ นอกจากคุณจะแน่ใจว่า %2 "
 "ไม่ได้กำลังทำงานอยู่</qt>"
 
-#: akregator_part.cpp:998
+#: akregator_part.cpp:1008
 msgid ""
 "<qt>%1 already seems to be running on %2. <b>Running %1 more than once is not "
 "supported by the %3 backend and can cause the loss of archived articles and "
@@ -537,7 +530,7 @@ msgstr ""
 "และทำให้โปรแกรมพังตอนเริ่มงานได้ </b> คุณควรจะปิดการจัดเก็บบทความในตอนนี้ "
 "นอกจากคุณจะแน่ใจว่า มันไม่ได้กำลังทำงานบน %2 </qt>"
 
-#: akregator_part.cpp:1006
+#: akregator_part.cpp:1016
 msgid ""
 "<qt>%1 seems to be running on %3. <b>Running %1 and %2 at the same time is not "
 "supported by the %4 backend and can cause the loss of archived articles and "
@@ -549,11 +542,11 @@ msgstr ""
 "และโปรแกรมพัง ในตอนเริ่มต้นได้ </b> คุณควรจะปิดการจัดเก็บบทความในตอนนี้ "
 "นอกจากคุณจะแน่ใจว่า %1 ไม่ได้กำลังทำงานบน %3 </qt>"
 
-#: akregator_part.cpp:1018
+#: akregator_part.cpp:1028
 msgid "Force Access"
 msgstr "บังคับเข้า"
 
-#: akregator_part.cpp:1019
+#: akregator_part.cpp:1029
 msgid "Disable Archive"
 msgstr "ปิดการจัดเก็บ"
 
@@ -616,46 +609,46 @@ msgstr "รายการบทความ"
 msgid "Browsing area."
 msgstr "พื้นที่เรียกดู"
 
-#: akregator_view.cpp:320 akregator_view.cpp:789
+#: akregator_view.cpp:320 akregator_view.cpp:797
 msgid "Articles"
 msgstr "บทความ"
 
-#: akregator_view.cpp:510 main.cpp:70
+#: akregator_view.cpp:518 main.cpp:70
 msgid "Imported Folder"
 msgstr "โฟลเดอร์ที่นำเข้ามา"
 
-#: akregator_view.cpp:513
+#: akregator_view.cpp:521
 msgid "Add Imported Folder"
 msgstr "เพิ่มโฟลเดอร์ที่นำเข้ามา"
 
-#: akregator_view.cpp:513
+#: akregator_view.cpp:521
 msgid "Imported folder name:"
 msgstr "ชื่อของโฟลเดอร์ที่นำเข้า:"
 
-#: akregator_view.cpp:949
+#: akregator_view.cpp:957
 msgid "Add Folder"
 msgstr "เพิ่มโฟลเดอร์"
 
-#: akregator_view.cpp:949
+#: akregator_view.cpp:957
 msgid "Folder name:"
 msgstr "ชื่อโฟลเดอร์:"
 
-#: akregator_view.cpp:1065
+#: akregator_view.cpp:1073
 msgid "Fetching Feeds..."
 msgstr "กำลังดึงข้อมูลแหล่งป้อนข่าว..."
 
-#: akregator_view.cpp:1307
+#: akregator_view.cpp:1315
 msgid "<qt>Are you sure you want to delete article <b>%1</b>?</qt>"
 msgstr "<qt>คุณแน่ใจหรือว่าต้องการลบบทความ <b>%1</b>?</qt>"
 
-#: akregator_view.cpp:1311
+#: akregator_view.cpp:1319
 #, c-format
 msgid ""
 "_n: <qt>Are you sure you want to delete the selected article?</qt>\n"
 "<qt>Are you sure you want to delete the %n selected articles?</qt>"
 msgstr "<qt>คุณแน่ใจหรือว่าต้องการลบบทความที่เลือกจำนวน %n บทความ?</qt>"
 
-#: akregator_view.cpp:1315
+#: akregator_view.cpp:1323
 msgid "Delete Article"
 msgstr "ลบบทความ"
 
@@ -734,12 +727,13 @@ msgid "&Scroll Down"
 msgstr "&เลื่อนลง"
 
 #: articleviewer.cpp:381
+#, fuzzy
 msgid ""
 "_: %1: Akregator version; %2: help:// URL; %3: homepage URL; --- end of comment "
 "---\n"
 "<h2 style='margin-top: 0px;'>Welcome to Akregator %1</h2>"
-"<p>Akregator is an RSS feed aggregator for the K Desktop Environment. Feed "
-"aggregators provide a convenient way to browse different kinds of content, "
+"<p>Akregator is an RSS feed aggregator for the Trinity Desktop Environment. "
+"Feed aggregators provide a convenient way to browse different kinds of content, "
 "including news, blogs, and other content from online sites. Instead of checking "
 "all your favorite web sites manually for updates, Akregator collects the "
 "content for you.</p>"
@@ -764,7 +758,8 @@ msgstr ""
 "<p style='margin-bottom: 0px'>&nbsp; &nbsp; ทีมพัฒนา Akregator</p>\n"
 
 #: articleviewer.cpp:398
-msgid "An RSS feed reader for the K Desktop Environment."
+#, fuzzy
+msgid "An RSS feed reader for the Trinity Desktop Environment."
 msgstr "โปรแกรมอ่านแหล่งป้อนข่าว RSS สำหรับ TDE"
 
 #: articleviewer.cpp:428 articleviewer.cpp:429 articleviewer.cpp:524
@@ -798,13 +793,13 @@ msgid "Keep Enabled"
 msgstr "เปิดไว้"
 
 #. i18n: file settings_appearance.ui line 17
-#: configdialog.cpp:46 rc.cpp:159 rc.cpp:264 rc.cpp:486 rc.cpp:528
+#: configdialog.cpp:46 rc.cpp:159 rc.cpp:270 rc.cpp:852 rc.cpp:897
 #, no-c-format
 msgid "General"
 msgstr "ทั่วไป"
 
 #. i18n: file settings_advancedbase.ui line 28
-#: configdialog.cpp:47 rc.cpp:138 rc.cpp:189 rc.cpp:561 rc.cpp:786
+#: configdialog.cpp:47 rc.cpp:138 rc.cpp:195 rc.cpp:585 rc.cpp:960
 #, no-c-format
 msgid "Archive"
 msgstr "การจัดเก็บ"
@@ -863,7 +858,8 @@ msgstr ""
 "<center><img source=\"systray_shot\"></center></p></qt>"
 
 #: mainwindow.cpp:268
-msgid "Docking in System Tray"
+#, fuzzy
+msgid "TQt::Docking in System Tray"
 msgstr "เก็บลงไปที่ถาดระบบ"
 
 #: notificationmanager.cpp:79
@@ -957,7 +953,7 @@ msgid "Fetch aborted"
 msgstr "การดึงข้อมูลถูกยกเลิก"
 
 #. i18n: file propertieswidgetbase.ui line 16
-#: propertiesdialog.cpp:69 propertiesdialog.cpp:103 rc.cpp:60 rc.cpp:663
+#: propertiesdialog.cpp:69 propertiesdialog.cpp:103 rc.cpp:60 rc.cpp:498
 #, no-c-format
 msgid "Feed Properties"
 msgstr "คุณสมบัติของแหล่งป้อนข่าว"
@@ -968,607 +964,625 @@ msgid "Properties of %1"
 msgstr "คุณสมบัติของ %1"
 
 #. i18n: file akregator_part.rc line 29
-#: rc.cpp:9 rc.cpp:27 rc.cpp:45 rc.cpp:483 rc.cpp:591 rc.cpp:777
+#: rc.cpp:9 rc.cpp:27 rc.cpp:45 rc.cpp:579 rc.cpp:612 rc.cpp:942
 #, no-c-format
 msgid "&Go"
 msgstr "ไ&ปที่"
 
 #. i18n: file akregator_part.rc line 43
-#: rc.cpp:12 rc.cpp:780
+#: rc.cpp:12 rc.cpp:615
 #, no-c-format
 msgid "F&eed"
 msgstr "แ&หล่งป้อนข่าว"
 
 #. i18n: file akregator_part.rc line 56
-#: rc.cpp:15 rc.cpp:33 rc.cpp:597 rc.cpp:783
+#: rc.cpp:15 rc.cpp:33 rc.cpp:618 rc.cpp:948
 #, no-c-format
 msgid "&Article"
 msgstr "&บทความ"
 
 #. i18n: file akregator_shell.rc line 26
-#: rc.cpp:30 rc.cpp:594
+#: rc.cpp:30 rc.cpp:945
 #, no-c-format
 msgid "&Feed"
 msgstr "แหล่งป้&อนข่าว"
 
 #. i18n: file akregator_shell.rc line 52
-#: rc.cpp:42 rc.cpp:606
+#: rc.cpp:42 rc.cpp:957
 #, no-c-format
 msgid "Speech Toolbar"
 msgstr "แถบเครื่องมือเสียงพูด"
 
 #. i18n: file addfeedwidgetbase.ui line 95
-#: rc.cpp:51 rc.cpp:612
+#: rc.cpp:51 rc.cpp:624
 #, no-c-format
 msgid "Add New Source"
 msgstr "เพิ่มแหล่งใหม่"
 
 #. i18n: file addfeedwidgetbase.ui line 103
-#: rc.cpp:54 rc.cpp:615
+#: rc.cpp:54 rc.cpp:627
 #, no-c-format
 msgid "Feed &URL:"
 msgstr "ที่อยู่ &URL ของแหล่งป้อนข่าว:"
 
 #. i18n: file addfeedwidgetbase.ui line 118
-#: rc.cpp:57 rc.cpp:618
+#: rc.cpp:57 rc.cpp:630
 #, no-c-format
 msgid "Status"
 msgstr "สถานะ"
 
 #. i18n: file propertieswidgetbase.ui line 34
-#: rc.cpp:63 rc.cpp:666
+#: rc.cpp:63 rc.cpp:501
 #, no-c-format
 msgid "&General"
 msgstr "ทั่&วไป"
 
 #. i18n: file propertieswidgetbase.ui line 53
-#: rc.cpp:66 rc.cpp:669
+#: rc.cpp:66 rc.cpp:504
 #, no-c-format
 msgid "&URL:"
 msgstr "&URL:"
 
 #. i18n: file propertieswidgetbase.ui line 64
-#: rc.cpp:69 rc.cpp:672
+#: rc.cpp:69 rc.cpp:507
 #, no-c-format
 msgid "&Name:"
 msgstr "ชื่&อ:"
 
 #. i18n: file propertieswidgetbase.ui line 83
-#: rc.cpp:72 rc.cpp:675
+#: rc.cpp:72 rc.cpp:510
 #, no-c-format
 msgid "Display name of RSS column"
 msgstr "แสดงชื่อของคอลัมน์ RSS"
 
 #. i18n: file propertieswidgetbase.ui line 98
-#: rc.cpp:75 rc.cpp:678
+#: rc.cpp:75 rc.cpp:513
 #, no-c-format
 msgid "U&se a custom update interval"
 msgstr "ตั้งช่วงพัก&ระหว่างการปรับข้อมูลเอง"
 
 #. i18n: file propertieswidgetbase.ui line 134
-#: rc.cpp:78 rc.cpp:681
+#: rc.cpp:78 rc.cpp:516
 #, no-c-format
 msgid "Update &every:"
 msgstr "ปรับข้&อมูลทุกๆ:"
 
 #. i18n: file propertieswidgetbase.ui line 160
-#: rc.cpp:81 rc.cpp:684
+#: rc.cpp:81 rc.cpp:519
 #, no-c-format
 msgid "Minutes"
 msgstr "นาที"
 
 #. i18n: file propertieswidgetbase.ui line 165
-#: rc.cpp:84 rc.cpp:687
+#: rc.cpp:84 rc.cpp:522
 #, no-c-format
 msgid "Hours"
 msgstr "ชั่วโมง"
 
 #. i18n: file propertieswidgetbase.ui line 170
-#: rc.cpp:87 rc.cpp:690
+#: rc.cpp:87 rc.cpp:525
 #, no-c-format
 msgid "Days"
 msgstr "วัน"
 
 #. i18n: file propertieswidgetbase.ui line 175
-#: rc.cpp:90 rc.cpp:693
+#: rc.cpp:90 rc.cpp:528
 #, no-c-format
 msgid "Never"
 msgstr "ไม่ต้อง"
 
 #. i18n: file propertieswidgetbase.ui line 192
-#: rc.cpp:93 rc.cpp:696
+#: rc.cpp:93 rc.cpp:531
 #, no-c-format
 msgid "Notify when new articles arri&ve"
 msgstr "แจ้งเตือนเมื่อมีบ&ทความใหม่เข้ามา"
 
 #. i18n: file propertieswidgetbase.ui line 202
-#: rc.cpp:96 rc.cpp:699
+#: rc.cpp:96 rc.cpp:534
 #, no-c-format
 msgid "Ar&chive"
 msgstr "การจั&ดเก็บ"
 
 #. i18n: file propertieswidgetbase.ui line 233
-#: rc.cpp:99 rc.cpp:702
+#: rc.cpp:99 rc.cpp:537
 #, no-c-format
 msgid "&Keep all articles"
 msgstr "เก็บบทควา&มทั้งหมดไว้"
 
 #. i18n: file propertieswidgetbase.ui line 241
-#: rc.cpp:102 rc.cpp:705
+#: rc.cpp:102 rc.cpp:540
 #, no-c-format
 msgid "Limit archi&ve to:"
 msgstr "จำกัดการจัดเก็&บแค่:"
 
 #. i18n: file propertieswidgetbase.ui line 249
-#: rc.cpp:105 rc.cpp:708
+#: rc.cpp:105 rc.cpp:543
 #, no-c-format
 msgid "&Delete articles older than:"
 msgstr "&ลบบทความที่เก่ากว่า:"
 
 #. i18n: file propertieswidgetbase.ui line 260
-#: rc.cpp:108 rc.cpp:213 rc.cpp:711 rc.cpp:810
+#: rc.cpp:108 rc.cpp:219 rc.cpp:546 rc.cpp:984
 #, no-c-format
 msgid " days"
 msgstr " วัน"
 
 #. i18n: file propertieswidgetbase.ui line 263
-#: rc.cpp:111 rc.cpp:216 rc.cpp:714 rc.cpp:813
+#: rc.cpp:111 rc.cpp:222 rc.cpp:549 rc.cpp:987
 #, no-c-format
 msgid "1 day"
 msgstr "1 วัน"
 
 #. i18n: file propertieswidgetbase.ui line 317
-#: rc.cpp:114 rc.cpp:207 rc.cpp:717 rc.cpp:804
+#: rc.cpp:114 rc.cpp:213 rc.cpp:552 rc.cpp:978
 #, no-c-format
 msgid " articles"
 msgstr " บทความ"
 
 #. i18n: file propertieswidgetbase.ui line 320
-#: rc.cpp:117 rc.cpp:210 rc.cpp:720 rc.cpp:807
+#: rc.cpp:117 rc.cpp:216 rc.cpp:555 rc.cpp:981
 #, no-c-format
 msgid "1 article"
 msgstr "1 บทความ"
 
 #. i18n: file propertieswidgetbase.ui line 334
-#: rc.cpp:120 rc.cpp:723
+#: rc.cpp:120 rc.cpp:558
 #, no-c-format
 msgid "Di&sable archiving"
 msgstr "ปิด&การใช้งานการจัดเก็บ"
 
 #. i18n: file propertieswidgetbase.ui line 342
-#: rc.cpp:123 rc.cpp:726
+#: rc.cpp:123 rc.cpp:561
 #, no-c-format
 msgid "&Use default settings"
 msgstr "ใช้ค่าปริ&ยาย"
 
 #. i18n: file propertieswidgetbase.ui line 357
-#: rc.cpp:126 rc.cpp:729
+#: rc.cpp:126 rc.cpp:564
 #, no-c-format
 msgid "Adva&nced"
 msgstr "ขั้&นสูง"
 
 #. i18n: file propertieswidgetbase.ui line 376
-#: rc.cpp:129 rc.cpp:732
+#: rc.cpp:129 rc.cpp:567
 #, no-c-format
 msgid "Load the &full website when reading articles"
 msgstr "โหลดหน้&าเว็บเต็มๆ เมื่อเปิดบทความอ่าน"
 
 #. i18n: file propertieswidgetbase.ui line 384
-#: rc.cpp:132 rc.cpp:735
+#: rc.cpp:132 rc.cpp:570
 #, no-c-format
 msgid "Mar&k articles as read when they arrive"
 msgstr "&ทำเครื่องหมายว่าอ่านแล้วเมื่อบทความมาถึง"
 
 #. i18n: file settings_advancedbase.ui line 17
-#: rc.cpp:135 rc.cpp:558
+#: rc.cpp:135 rc.cpp:582
 #, no-c-format
 msgid "SettingsAdvanced"
 msgstr "การตั้งค่าขั้นสูง"
 
 #. i18n: file settings_advancedbase.ui line 39
-#: rc.cpp:141 rc.cpp:564
+#: rc.cpp:141 rc.cpp:588
 #, no-c-format
 msgid "Archive backend:"
 msgstr "โปรแกรมสำหรับจัดเก็บ:"
 
 #. i18n: file settings_advancedbase.ui line 52
-#: rc.cpp:144 rc.cpp:567
+#: rc.cpp:144 rc.cpp:591
 #, no-c-format
 msgid "&Configure..."
 msgstr "ปรับ&แต่ง..."
 
 #. i18n: file settings_advancedbase.ui line 62
-#: rc.cpp:147 rc.cpp:570
+#: rc.cpp:147 rc.cpp:594
 #, no-c-format
 msgid "Article List"
 msgstr "รายการบทความ"
 
 #. i18n: file settings_advancedbase.ui line 76
-#: rc.cpp:150 rc.cpp:573
+#: rc.cpp:150 rc.cpp:597
 #, no-c-format
 msgid " sec"
 msgstr " วินาที"
 
 #. i18n: file settings_advancedbase.ui line 104
-#: rc.cpp:153 rc.cpp:576
+#: rc.cpp:153 rc.cpp:600
 #, no-c-format
 msgid "Reset search bar when changing feeds"
 msgstr "ทำการล้างแถบค้นหาเมื่อเปลี่ยนแหล่งป้อนข่าว"
 
 #. i18n: file settings_advancedbase.ui line 118
-#: rc.cpp:156 rc.cpp:579
+#: rc.cpp:156 rc.cpp:603
 #, no-c-format
 msgid "Mar&k selected article read after"
 msgstr "&ทำเครื่องหมายบทความที่เลือกว่าอ่านแล้วหลังจาก"
 
 #. i18n: file settings_appearance.ui line 42
-#: rc.cpp:165 rc.cpp:534
+#: rc.cpp:165 rc.cpp:903
 #, no-c-format
 msgid "Minimum font size:"
 msgstr "ขนาดตัวอักษรที่เล็กที่สุด:"
 
 #. i18n: file settings_appearance.ui line 81
-#: rc.cpp:168 rc.cpp:537
+#: rc.cpp:168 rc.cpp:906
 #, no-c-format
 msgid "Medium font size:"
 msgstr "ขนาดตัวอักษรขนาดกลาง:"
 
 #. i18n: file settings_appearance.ui line 133
-#: rc.cpp:174 rc.cpp:543
+#: rc.cpp:174 rc.cpp:912
 #, no-c-format
 msgid "Standard font:"
 msgstr "แบบอักษรมาตรฐาน:"
 
 #. i18n: file settings_appearance.ui line 146
-#: rc.cpp:177 rc.cpp:546
+#: rc.cpp:177 rc.cpp:915
 #, no-c-format
 msgid "Fixed font:"
 msgstr "แบบอักษรความกว้างคงที่:"
 
 #. i18n: file settings_appearance.ui line 159
-#: rc.cpp:180 rc.cpp:549
+#: rc.cpp:180 rc.cpp:918
 #, no-c-format
 msgid "Serif font:"
 msgstr "แบบอักษร Serif:"
 
 #. i18n: file settings_appearance.ui line 172
-#: rc.cpp:183 rc.cpp:552
+#: rc.cpp:183 rc.cpp:921
 #, no-c-format
 msgid "Sans serif font:"
 msgstr "แบบอักษร San serif:"
 
 #. i18n: file settings_appearance.ui line 187
-#: rc.cpp:186 rc.cpp:555
+#: rc.cpp:186 rc.cpp:924
 #, no-c-format
 msgid "&Underline links"
 msgstr "ขี&ดเส้นใต้ลิงค์"
 
+#. i18n: file settings_appearance.ui line 195
+#: rc.cpp:189 rc.cpp:927
+#, no-c-format
+msgid "&Enable favicons"
+msgstr ""
+
+#. i18n: file settings_appearance.ui line 203
+#: rc.cpp:192 rc.cpp:930
+#, no-c-format
+msgid "Automatically load &images"
+msgstr ""
+
 #. i18n: file settings_archive.ui line 39
-#: rc.cpp:192 rc.cpp:789
+#: rc.cpp:198 rc.cpp:963
 #, no-c-format
 msgid "Default Archive Settings"
 msgstr "ค่าการจัดเก็บโดยปริยาย"
 
 #. i18n: file settings_archive.ui line 50
-#: rc.cpp:195 rc.cpp:792
+#: rc.cpp:201 rc.cpp:966
 #, no-c-format
 msgid "Keep all articles"
 msgstr "เก็บบทความทั้งหมด"
 
 #. i18n: file settings_archive.ui line 58
-#: rc.cpp:198 rc.cpp:795
+#: rc.cpp:204 rc.cpp:969
 #, no-c-format
 msgid "Limit feed archive size to:"
 msgstr "จำกัดขนาดการจัดเก็บของแหล่งป้อนข่าวแค่:"
 
 #. i18n: file settings_archive.ui line 66
-#: rc.cpp:201 rc.cpp:798
+#: rc.cpp:207 rc.cpp:972
 #, no-c-format
 msgid "Delete articles older than: "
 msgstr "ลบบทความที่เก่ากว่า: "
 
 #. i18n: file settings_archive.ui line 74
-#: rc.cpp:204 rc.cpp:801
+#: rc.cpp:210 rc.cpp:975
 #, no-c-format
 msgid "Disable archiving"
 msgstr "ปิดการใช้งานการจัดเก็บ"
 
 #. i18n: file settings_archive.ui line 133
-#: rc.cpp:219 rc.cpp:816
+#: rc.cpp:225 rc.cpp:990
 #, no-c-format
 msgid "Do not expire important articles"
 msgstr "ห้ามลบบทความสำคัญ"
 
 #. i18n: file settings_browser.ui line 17
-#: rc.cpp:222 rc.cpp:621
+#: rc.cpp:228 rc.cpp:633
 #, no-c-format
 msgid "ExternalBrowser"
 msgstr "เบราว์เซอร์ภายนอก"
 
 #. i18n: file settings_browser.ui line 31
-#: rc.cpp:225 rc.cpp:624
+#: rc.cpp:231 rc.cpp:636
 #, no-c-format
 msgid "For External Browsing"
 msgstr "สำหรับการเรียกดูด้วยเบราว์เซอร์ภายนอก"
 
 #. i18n: file settings_browser.ui line 45
-#: rc.cpp:228 rc.cpp:447 rc.cpp:627 rc.cpp:954
+#: rc.cpp:234 rc.cpp:462 rc.cpp:639 rc.cpp:816
 #, no-c-format
 msgid "Use default TDE web browser"
 msgstr "ใช้เว็บเบราว์เซอร์ปริยายของ TDE"
 
 #. i18n: file settings_browser.ui line 56
-#: rc.cpp:231 rc.cpp:453 rc.cpp:630 rc.cpp:960
+#: rc.cpp:237 rc.cpp:468 rc.cpp:642 rc.cpp:822
 #, no-c-format
 msgid "Use this command:"
 msgstr "ใช้คำสั่งนี้:"
 
 #. i18n: file settings_browser.ui line 67
-#: rc.cpp:234 rc.cpp:633
+#: rc.cpp:240 rc.cpp:645
 #, no-c-format
 msgid "firefox %u"
 msgstr "firefox %u"
 
 #. i18n: file settings_browser.ui line 77
-#: rc.cpp:237 rc.cpp:636
+#: rc.cpp:243 rc.cpp:648
 #, no-c-format
 msgid "Show tab close button on hover"
 msgstr "แสดงปุ่มปิดแท็บเมื่อวางตัวชี้เมาส์เหนือแท็บ"
 
 #. i18n: file settings_browser.ui line 146
-#: rc.cpp:249 rc.cpp:648
+#: rc.cpp:255 rc.cpp:660
 #, no-c-format
 msgid "Middle mouse click:"
 msgstr "คลิกด้วยเมาส์ปุ่มกลาง:"
 
 #. i18n: file settings_browser.ui line 162
-#: rc.cpp:252 rc.cpp:651
+#: rc.cpp:258 rc.cpp:663
 #, no-c-format
 msgid "Left mouse click:"
 msgstr "คลิกด้วยเมาส์ปุ่มซ้าย:"
 
 #. i18n: file settings_general.ui line 31
-#: rc.cpp:267 rc.cpp:489
+#: rc.cpp:273 rc.cpp:855
 #, no-c-format
 msgid "Global"
 msgstr "โดยรวม"
 
 #. i18n: file settings_general.ui line 42
-#: rc.cpp:270 rc.cpp:492
+#: rc.cpp:276 rc.cpp:858
 #, no-c-format
 msgid "&Use interval fetching"
 msgstr "ใช้ช่ว&งระหว่างการดึงข้อมูล"
 
 #. i18n: file settings_general.ui line 50
-#: rc.cpp:273 rc.cpp:495
+#: rc.cpp:279 rc.cpp:861
 #, no-c-format
 msgid "Use &notifications for all feeds"
 msgstr "ใช้การแจ้งเตือนสำ&หรับแหล่งป้อนข่าวทั้งหมด"
 
 #. i18n: file settings_general.ui line 56
-#: rc.cpp:276 rc.cpp:498
+#: rc.cpp:282 rc.cpp:864
 #, no-c-format
 msgid "Select this if you want to get notified when there are new articles."
 msgstr "เลือกที่นี่หากว่าคุณต้องการให้มีการแจ้งเตือนเมื่อมีบทความใหม่เข้ามา"
 
 #. i18n: file settings_general.ui line 64
-#: rc.cpp:279 rc.cpp:501
+#: rc.cpp:285 rc.cpp:867
 #, no-c-format
 msgid "Show tra&y icon"
 msgstr "แสดงไ&อคอนที่ถาดระบบ"
 
 #. i18n: file settings_general.ui line 75
-#: rc.cpp:282 rc.cpp:504
+#: rc.cpp:288 rc.cpp:870
 #, no-c-format
 msgid "Fetch feeds every:"
 msgstr "ดึงข้อมูลแหล่งป้อนข่าวทุกๆ"
 
 #. i18n: file settings_general.ui line 86
-#: rc.cpp:285 rc.cpp:507
+#: rc.cpp:291 rc.cpp:873
 #, no-c-format
 msgid " minutes"
 msgstr " นาที"
 
 #. i18n: file settings_general.ui line 89
-#: rc.cpp:288 rc.cpp:510
+#: rc.cpp:294 rc.cpp:876
 #, no-c-format
 msgid "1 minute"
 msgstr "1 นาที"
 
 #. i18n: file settings_general.ui line 108
-#: rc.cpp:291 rc.cpp:513
+#: rc.cpp:297 rc.cpp:879
 #, no-c-format
 msgid "Startup"
 msgstr "เริ่มโปรแกรม"
 
 #. i18n: file settings_general.ui line 119
-#: rc.cpp:294 rc.cpp:516
+#: rc.cpp:300 rc.cpp:882
 #, no-c-format
 msgid "Mark &all feeds as read on startup"
 msgstr "ทำเครื่องหมายแหล่งป้อนข่าวทั้งหม&ดว่าอ่านแล้วเมื่อเริ่มโปรแกรม"
 
 #. i18n: file settings_general.ui line 127
-#: rc.cpp:297 rc.cpp:519
+#: rc.cpp:303 rc.cpp:885
 #, no-c-format
 msgid "Fetch all fee&ds on startup"
 msgstr "ดึงข้อมูลแหล่งป้อนข่าวทั้งหมดเมื่อเริ่มโป&รแกรม"
 
-#. i18n: file settings_general.ui line 154
-#: rc.cpp:300 rc.cpp:522
+#. i18n: file settings_general.ui line 135
+#: rc.cpp:306 rc.cpp:888
+#, fuzzy, no-c-format
+msgid "Disable the &introduction page"
+msgstr "ปิดการใช้งานหน้าแนะนำ"
+
+#. i18n: file settings_general.ui line 162
+#: rc.cpp:309 rc.cpp:891
 #, no-c-format
 msgid "Network"
 msgstr "เครือข่าย"
 
-#. i18n: file settings_general.ui line 165
-#: rc.cpp:303 rc.cpp:525
+#. i18n: file settings_general.ui line 173
+#: rc.cpp:312 rc.cpp:894
 #, no-c-format
 msgid "Use the &browser cache (less network traffic)"
 msgstr "ใช้แคชของเบราว์เซอร์ (ช่วยลดปริมาณข้อมูลของเครือข่าย)"
 
 #. i18n: file tagpropertieswidgetbase.ui line 36
-#: rc.cpp:306 rc.cpp:738
+#: rc.cpp:315 rc.cpp:573
 #, no-c-format
 msgid "Title:"
 msgstr "ชื่อ:"
 
 #. i18n: file tagpropertieswidgetbase.ui line 76
-#: rc.cpp:309 rc.cpp:741
+#: rc.cpp:318 rc.cpp:576
 #, no-c-format
 msgid "Icon:"
 msgstr "ไอคอน:"
 
 #. i18n: file akregator.kcfg line 10
-#: rc.cpp:315 rc.cpp:822
+#: rc.cpp:324 rc.cpp:678
 #, no-c-format
 msgid "Show Quick Filter Bar"
 msgstr "แสดงแถบกรองด่วน"
 
 #. i18n: file akregator.kcfg line 14
-#: rc.cpp:318 rc.cpp:825
+#: rc.cpp:327 rc.cpp:681
 #, no-c-format
 msgid "Status Filter"
 msgstr "กรองสถานะ"
 
 #. i18n: file akregator.kcfg line 15
-#: rc.cpp:321 rc.cpp:828
+#: rc.cpp:330 rc.cpp:684
 #, no-c-format
 msgid "Stores the last status filter setting"
 msgstr "บันทึกการตั้งค่าการกรองสถานะครั้งสุดท้ายเอาไว้"
 
 #. i18n: file akregator.kcfg line 19
-#: rc.cpp:324 rc.cpp:831
+#: rc.cpp:333 rc.cpp:687
 #, no-c-format
 msgid "Text Filter"
 msgstr "กรองข้อความ"
 
 #. i18n: file akregator.kcfg line 20
-#: rc.cpp:327 rc.cpp:834
+#: rc.cpp:336 rc.cpp:690
 #, no-c-format
 msgid "Stores the last search line text"
 msgstr "บันทึกบรรทัดข้อความที่ค้นหาครั้งสุดท้ายเอาไว้"
 
 #. i18n: file akregator.kcfg line 23
-#: rc.cpp:330 rc.cpp:837
+#: rc.cpp:339 rc.cpp:693
 #, no-c-format
 msgid "View Mode"
 msgstr "โหมดมุมมอง"
 
 #. i18n: file akregator.kcfg line 24
-#: rc.cpp:333 rc.cpp:840
+#: rc.cpp:342 rc.cpp:696
 #, no-c-format
 msgid "Article display mode."
 msgstr "โหมดการแสดงบทความ"
 
 #. i18n: file akregator.kcfg line 28
-#: rc.cpp:336 rc.cpp:843
+#: rc.cpp:345 rc.cpp:699
 #, no-c-format
 msgid "Sizes for first splitter"
 msgstr "ขนาดของตัวแบ่งอันแรก"
 
 #. i18n: file akregator.kcfg line 29
-#: rc.cpp:339 rc.cpp:846
+#: rc.cpp:348 rc.cpp:702
 #, no-c-format
 msgid "First (usually vertical) splitter widget sizes."
 msgstr "ขนาดของวิดเจ็ตตัวแบ่งอันแรก (ตามปกติคือแนวตั้ง)"
 
 #. i18n: file akregator.kcfg line 33
-#: rc.cpp:342 rc.cpp:849
+#: rc.cpp:351 rc.cpp:705
 #, no-c-format
 msgid "Sizes for second splitter"
 msgstr "ขนาดของตัวแบ่งอันที่สอง"
 
 #. i18n: file akregator.kcfg line 34
-#: rc.cpp:345 rc.cpp:852
+#: rc.cpp:354 rc.cpp:708
 #, no-c-format
 msgid "Second (usually horizontal) splitter widget sizes."
 msgstr "ขนาดของวิดเจ็ตตัวแบ่งอันที่สอง (ตามปกติคือแนวขวาง)"
 
-#. i18n: file akregator.kcfg line 57
-#: rc.cpp:348 rc.cpp:855
+#. i18n: file akregator.kcfg line 61
+#: rc.cpp:357 rc.cpp:711
 #, no-c-format
 msgid "Archive Mode"
 msgstr "โหมดการจัดเก็บ"
 
-#. i18n: file akregator.kcfg line 61
-#: rc.cpp:351 rc.cpp:858
+#. i18n: file akregator.kcfg line 65
+#: rc.cpp:360 rc.cpp:714
 #, no-c-format
 msgid "Keep All Articles"
 msgstr "เก็บบทความทั้งหมด"
 
-#. i18n: file akregator.kcfg line 62
-#: rc.cpp:354 rc.cpp:861
+#. i18n: file akregator.kcfg line 66
+#: rc.cpp:363 rc.cpp:717
 #, no-c-format
 msgid "Save an unlimited number of articles."
 msgstr "จะบันทึกบทความไว้โดยไม่จำกัดจำนวน"
 
-#. i18n: file akregator.kcfg line 65
-#: rc.cpp:357 rc.cpp:864
+#. i18n: file akregator.kcfg line 69
+#: rc.cpp:366 rc.cpp:720
 #, no-c-format
 msgid "Limit Number of Articles"
 msgstr "จำกัดจำนวนของบทความ"
 
-#. i18n: file akregator.kcfg line 66
-#: rc.cpp:360 rc.cpp:867
+#. i18n: file akregator.kcfg line 70
+#: rc.cpp:369 rc.cpp:723
 #, no-c-format
 msgid "Limit the number of articles in a feed"
 msgstr "จะจำกัดจำนวนของบทความในแหล่งป้อนข่าวหนึ่งๆ"
 
-#. i18n: file akregator.kcfg line 69
-#: rc.cpp:363 rc.cpp:870
+#. i18n: file akregator.kcfg line 73
+#: rc.cpp:372 rc.cpp:726
 #, no-c-format
 msgid "Delete Expired Articles"
 msgstr "ลบบทความที่หมดอายุ"
 
-#. i18n: file akregator.kcfg line 70
-#: rc.cpp:366 rc.cpp:873
+#. i18n: file akregator.kcfg line 74
+#: rc.cpp:375 rc.cpp:729
 #, no-c-format
 msgid "Delete expired articles"
 msgstr "จะลบบทความที่หมดอายุออกไป"
 
-#. i18n: file akregator.kcfg line 73
-#: rc.cpp:369 rc.cpp:876
+#. i18n: file akregator.kcfg line 77
+#: rc.cpp:378 rc.cpp:732
 #, no-c-format
 msgid "Disable Archiving"
 msgstr "ปิดการใช้งานการจัดเก็บ"
 
-#. i18n: file akregator.kcfg line 74
-#: rc.cpp:372 rc.cpp:879
+#. i18n: file akregator.kcfg line 78
+#: rc.cpp:381 rc.cpp:735
 #, no-c-format
 msgid "Do not save any articles"
 msgstr "จะไม่ทำการบันทึกบทความ"
 
-#. i18n: file akregator.kcfg line 79
-#: rc.cpp:375 rc.cpp:882
+#. i18n: file akregator.kcfg line 83
+#: rc.cpp:384 rc.cpp:738
 #, no-c-format
 msgid "Expiry Age"
 msgstr "หมดอายุเมื่อ"
 
-#. i18n: file akregator.kcfg line 80
-#: rc.cpp:378 rc.cpp:885
+#. i18n: file akregator.kcfg line 84
+#: rc.cpp:387 rc.cpp:741
 #, no-c-format
 msgid "Default expiry age for articles in days."
 msgstr "อายุของบทความโดยปริยายก่อนทำการลบทิ้งในหน่วยวัน"
 
-#. i18n: file akregator.kcfg line 84
-#: rc.cpp:381 rc.cpp:888
+#. i18n: file akregator.kcfg line 88
+#: rc.cpp:390 rc.cpp:744
 #, no-c-format
 msgid "Article Limit"
 msgstr "จำกัดจำนวนบทความ"
 
-#. i18n: file akregator.kcfg line 85
-#: rc.cpp:384 rc.cpp:891
+#. i18n: file akregator.kcfg line 89
+#: rc.cpp:393 rc.cpp:747
 #, no-c-format
 msgid "Number of articles to keep per feed."
 msgstr "จำนวนของบทความต่อแหล่งป้อนข่าว"
 
-#. i18n: file akregator.kcfg line 89
-#: rc.cpp:387 rc.cpp:894
+#. i18n: file akregator.kcfg line 93
+#: rc.cpp:396 rc.cpp:750
 #, no-c-format
 msgid "Do Not Expire Important Articles"
 msgstr "ห้ามลบบทความสำคัญ"
 
-#. i18n: file akregator.kcfg line 90
-#: rc.cpp:390 rc.cpp:897
+#. i18n: file akregator.kcfg line 94
+#: rc.cpp:399 rc.cpp:753
 #, no-c-format
 msgid ""
 "When this option is enabled, articles you marked as important will not be "
@@ -1578,26 +1592,26 @@ msgstr ""
 "บทความที่คุณได้ทำเครื่องหมายไว้ว่าเป็นบทความสำคัญจะไม่ถูกลบทิ้ง "
 "เมื่อมีการจำกัดการจัดเก็บ ไม่ว่าจะด้วยอายุของบทความ หรือจำนวนบทความ"
 
-#. i18n: file akregator.kcfg line 96
-#: rc.cpp:393 rc.cpp:900
+#. i18n: file akregator.kcfg line 100
+#: rc.cpp:402 rc.cpp:756
 #, no-c-format
 msgid "Concurrent Fetches"
 msgstr "ดึงข้อมูลในเวลาเดียวกัน"
 
-#. i18n: file akregator.kcfg line 97
-#: rc.cpp:396 rc.cpp:903
+#. i18n: file akregator.kcfg line 101
+#: rc.cpp:405 rc.cpp:759
 #, no-c-format
 msgid "Number of concurrent fetches"
 msgstr "จำนวนการดึงข้อมูลในเวลาเดียวกัน"
 
-#. i18n: file akregator.kcfg line 101
-#: rc.cpp:399 rc.cpp:906
+#. i18n: file akregator.kcfg line 105
+#: rc.cpp:408 rc.cpp:762
 #, no-c-format
 msgid "Use HTML Cache"
 msgstr "ใช้แคช HTML"
 
-#. i18n: file akregator.kcfg line 102
-#: rc.cpp:402 rc.cpp:909
+#. i18n: file akregator.kcfg line 106
+#: rc.cpp:411 rc.cpp:765
 #, no-c-format
 msgid ""
 "Use the TDE-wide HTML cache settings when downloading feeds, to avoid "
@@ -1607,190 +1621,202 @@ msgstr ""
 "เพื่อหลีกเลี่ยงการรับส่งข้อมูลที่ไม่จำเป็น ในเครือข่าย "
 "ให้ปิดเมื่อจำเป็นเท่านั้น"
 
-#. i18n: file akregator.kcfg line 108
-#: rc.cpp:405 rc.cpp:912
+#. i18n: file akregator.kcfg line 112
+#: rc.cpp:414 rc.cpp:768
+#, fuzzy, no-c-format
+msgid "Disable the introduction page"
+msgstr "ปิดการใช้งานหน้าแนะนำ"
+
+#. i18n: file akregator.kcfg line 113
+#: rc.cpp:417 rc.cpp:771
+#, fuzzy, no-c-format
+msgid "Disable the introduction page."
+msgstr "ปิดการใช้งานหน้าแนะนำ"
+
+#. i18n: file akregator.kcfg line 117
+#: rc.cpp:420 rc.cpp:774
 #, no-c-format
 msgid "Fetch on startup"
 msgstr "ดึงข้อมูลเมื่อเริ่มโปรแกรม"
 
-#. i18n: file akregator.kcfg line 109
-#: rc.cpp:408 rc.cpp:915
+#. i18n: file akregator.kcfg line 118
+#: rc.cpp:423 rc.cpp:777
 #, no-c-format
 msgid "Fetch feedlist on startup."
 msgstr "ดึงข้อมูลรายการแหล่งป้อนข่าวเมื่อเริ่มโปรแกรม"
 
-#. i18n: file akregator.kcfg line 113
-#: rc.cpp:411 rc.cpp:918
+#. i18n: file akregator.kcfg line 122
+#: rc.cpp:426 rc.cpp:780
 #, no-c-format
 msgid "Mark all feeds as read on startup"
 msgstr "ทำเครื่องหมายแหล่งป้อนข่าวทั้งหมดว่าอ่านแล้วเมื่อเริ่ม"
 
-#. i18n: file akregator.kcfg line 114
-#: rc.cpp:414 rc.cpp:921
+#. i18n: file akregator.kcfg line 123
+#: rc.cpp:429 rc.cpp:783
 #, no-c-format
 msgid "Mark all feeds as read on startup."
 msgstr "ทำเครื่องหมายแหล่งป้อนข่าวทั้งหมดว่าอ่านแล้วเมื่อเริ่มโปรแกรม"
 
-#. i18n: file akregator.kcfg line 118
-#: rc.cpp:417 rc.cpp:924
+#. i18n: file akregator.kcfg line 127
+#: rc.cpp:432 rc.cpp:786
 #, no-c-format
 msgid "Use interval fetching"
 msgstr "ใช้การดึงข้อมูลเป็นช่วงๆ"
 
-#. i18n: file akregator.kcfg line 119
-#: rc.cpp:420 rc.cpp:927
+#. i18n: file akregator.kcfg line 128
+#: rc.cpp:435 rc.cpp:789
 #, no-c-format
 msgid "Fetch all feeds every %1 minutes."
 msgstr "ทำการดึงข้อมูลแหล่งป้อนข่าวทุกๆ %1 นาที"
 
-#. i18n: file akregator.kcfg line 123
-#: rc.cpp:423 rc.cpp:930
+#. i18n: file akregator.kcfg line 132
+#: rc.cpp:438 rc.cpp:792
 #, no-c-format
 msgid "Interval for autofetching"
 msgstr "ช่วงระหว่างการดึงข้อมูลอัตโนมัติ"
 
-#. i18n: file akregator.kcfg line 124
-#: rc.cpp:426 rc.cpp:933
+#. i18n: file akregator.kcfg line 133
+#: rc.cpp:441 rc.cpp:795
 #, no-c-format
 msgid "Interval for autofetching in minutes."
 msgstr "ช่วงเวลาระหว่างการดีงข้อมูลโดยอัตโนมัติเป็นหน่วยนาที"
 
-#. i18n: file akregator.kcfg line 128
-#: rc.cpp:429 rc.cpp:936
+#. i18n: file akregator.kcfg line 137
+#: rc.cpp:444 rc.cpp:798
 #, no-c-format
 msgid "Use notifications"
 msgstr "ใช้การแจ้งเตือน"
 
-#. i18n: file akregator.kcfg line 129
-#: rc.cpp:432 rc.cpp:939
+#. i18n: file akregator.kcfg line 138
+#: rc.cpp:447 rc.cpp:801
 #, no-c-format
 msgid "Specifies if the balloon notifications are used or not."
 msgstr "ระบุว่าจะให้ใช้บอลลูนสำหรับแจ้งเตือนหรือไม่"
 
-#. i18n: file akregator.kcfg line 133
-#: rc.cpp:435 rc.cpp:942
+#. i18n: file akregator.kcfg line 142
+#: rc.cpp:450 rc.cpp:804
 #, no-c-format
 msgid "Show tray icon"
 msgstr "แสดงไอคอนที่ถาดระบบ"
 
-#. i18n: file akregator.kcfg line 134
-#: rc.cpp:438 rc.cpp:945
+#. i18n: file akregator.kcfg line 143
+#: rc.cpp:453 rc.cpp:807
 #, no-c-format
 msgid "Specifies if the tray icon is shown or not."
 msgstr "ระบุว่าจะให้แสดงไอคอนที่ถาดระบบหรือไม่"
 
-#. i18n: file akregator.kcfg line 140
-#: rc.cpp:441 rc.cpp:948
+#. i18n: file akregator.kcfg line 149
+#: rc.cpp:456 rc.cpp:810
 #, no-c-format
 msgid "Show close buttons on tabs"
 msgstr "แสดงปุ่มปิดที่แท็บ"
 
-#. i18n: file akregator.kcfg line 141
-#: rc.cpp:444 rc.cpp:951
+#. i18n: file akregator.kcfg line 150
+#: rc.cpp:459 rc.cpp:813
 #, no-c-format
 msgid "Show close buttons on tabs instead of icons"
 msgstr "แสดงปุ่มสำหรับปิดแท็บ แทนที่จะแสดงไอคอน"
 
-#. i18n: file akregator.kcfg line 147
-#: rc.cpp:450 rc.cpp:957
+#. i18n: file akregator.kcfg line 156
+#: rc.cpp:465 rc.cpp:819
 #, no-c-format
 msgid "Use TDE web browser when opening in external browser."
 msgstr "ใช้เว็บเบราว์เซอร์ของ TDE เมื่อทำการเปิดหน้าด้วยเบราว์เซอร์ภายนอก"
 
-#. i18n: file akregator.kcfg line 152
-#: rc.cpp:456 rc.cpp:963
+#. i18n: file akregator.kcfg line 161
+#: rc.cpp:471 rc.cpp:825
 #, no-c-format
 msgid "Use the specified command when opening in external browser."
 msgstr "ใช้คำสั่งที่ระบุ เมื่อทำการเปิดหน้าด้วยเว็บเบราว์เซอร์ภายนอก"
 
-#. i18n: file akregator.kcfg line 156
-#: rc.cpp:459 rc.cpp:966
+#. i18n: file akregator.kcfg line 165
+#: rc.cpp:474 rc.cpp:828
 #, no-c-format
 msgid "Command to launch external browser.  URL will substitute for %u."
 msgstr "คำสั่งสำหรับเรียกใช้งานเบราว์เซอร์ภายนอก  %u ใช้แทนค่า URL"
 
-#. i18n: file akregator.kcfg line 160
-#: rc.cpp:462 rc.cpp:969
+#. i18n: file akregator.kcfg line 169
+#: rc.cpp:477 rc.cpp:831
 #, no-c-format
 msgid "What the click with left mouse button should do."
 msgstr "สิ่งที่จะให้ทำเมื่อคลิกปุ่มซ้ายของเมาส์"
 
-#. i18n: file akregator.kcfg line 169
-#: rc.cpp:465 rc.cpp:972
+#. i18n: file akregator.kcfg line 178
+#: rc.cpp:480 rc.cpp:834
 #, no-c-format
 msgid "What the click with middle mouse button should do."
 msgstr "สิ่งที่จะให้ทำเมื่อคลิกปุ่มกลางของเมาส์"
 
-#. i18n: file akregator.kcfg line 197
-#: rc.cpp:468 rc.cpp:975
+#. i18n: file akregator.kcfg line 206
+#: rc.cpp:483 rc.cpp:837
 #, no-c-format
 msgid "Archive Backend"
 msgstr "โปรแกรมสำหรับจัดเก็บ"
 
-#. i18n: file akregator.kcfg line 201
-#: rc.cpp:471 rc.cpp:978
+#. i18n: file akregator.kcfg line 210
+#: rc.cpp:486 rc.cpp:840
 #, no-c-format
 msgid "Whether to delay before marking an article as read upon selecting it."
 msgstr ""
 "จะให้มีการหน่วงเวลาก่อนทำเครื่องหมายบทความว่าอ่านแล้วหรือไม่ "
 "เมื่อมีการเลือกบทความ"
 
-#. i18n: file akregator.kcfg line 205
-#: rc.cpp:474 rc.cpp:981
+#. i18n: file akregator.kcfg line 214
+#: rc.cpp:489 rc.cpp:843
 #, no-c-format
 msgid ""
 "Configurable delay between selecting and article and it being marked as read."
 msgstr ""
 "ช่วงหน่วงเวลาที่ปรับแต่งได้ระหว่างการเลือกบทความ และการทำเครื่องหมายว่าอ่านแล้ว"
 
-#. i18n: file akregator.kcfg line 209
-#: rc.cpp:477 rc.cpp:984
+#. i18n: file akregator.kcfg line 218
+#: rc.cpp:492 rc.cpp:846
 #, no-c-format
 msgid "Resets the quick filter when changing feeds."
 msgstr "ล้างช่องกรองด่วนเมื่อมีการเปลี่ยนแหล่งป้อนข่าว"
 
-#. i18n: file akregator.kcfg line 214
-#: rc.cpp:480 rc.cpp:987
+#. i18n: file akregator.kcfg line 223
+#: rc.cpp:495 rc.cpp:849
 #, no-c-format
 msgid "Show Tagging GUI elements (unfinished)"
 msgstr "แสดงส่วนติดต่อผู้ใช้แบบกราฟิกสำหรับการใส่แท็ก (ยังไม่เสร็จ)"
 
-#. i18n: file ./mk4storage/mk4config.kcfg line 9
-#: rc.cpp:744
-#, no-c-format
-msgid "Commit Interval"
-msgstr "ช่วงเวลาระหว่างการ Commit"
-
-#. i18n: file ./mk4storage/mk4config.kcfg line 10
-#: rc.cpp:747
-#, no-c-format
-msgid "Commit interval in seconds for writing back changes"
-msgstr "ช่วงเวลาระหว่างการ Commitในหน่วยวินาที สำหรับการเขียนความเปลี่ยนแปลง"
-
-#. i18n: file ./mk4storage/mk4config.kcfg line 14
-#: rc.cpp:750
-#, no-c-format
-msgid "Path to archive"
-msgstr "พาธไปยังบทความที่จัดเก็บ"
-
 #. i18n: file ./mk4storage/mk4confwidgetbase.ui line 16
-#: rc.cpp:753
+#: rc.cpp:993
 #, no-c-format
 msgid "Metakit Settings"
 msgstr "การตั้งค่า Metakit"
 
 #. i18n: file ./mk4storage/mk4confwidgetbase.ui line 41
-#: rc.cpp:756
+#: rc.cpp:996
 #, no-c-format
 msgid "Use default location"
 msgstr "ใช้ที่ตั้งโดยปริยาย"
 
 #. i18n: file ./mk4storage/mk4confwidgetbase.ui line 60
-#: rc.cpp:759
+#: rc.cpp:999
 #, no-c-format
 msgid "Archive location:"
 msgstr "ที่เก็บบทความจัดเก็บ:"
 
+#. i18n: file ./mk4storage/mk4config.kcfg line 9
+#: rc.cpp:1011
+#, no-c-format
+msgid "Commit Interval"
+msgstr "ช่วงเวลาระหว่างการ Commit"
+
+#. i18n: file ./mk4storage/mk4config.kcfg line 10
+#: rc.cpp:1014
+#, no-c-format
+msgid "Commit interval in seconds for writing back changes"
+msgstr "ช่วงเวลาระหว่างการ Commitในหน่วยวินาที สำหรับการเขียนความเปลี่ยนแปลง"
+
+#. i18n: file ./mk4storage/mk4config.kcfg line 14
+#: rc.cpp:1017
+#, no-c-format
+msgid "Path to archive"
+msgstr "พาธไปยังบทความที่จัดเก็บ"
+
 #: searchbar.cpp:75
 msgid "S&earch:"
 msgstr "ค้&นหา:"
@@ -1855,7 +1881,7 @@ msgstr "คุณสมบัติแท็ก"
 msgid "Akregator - RSS Feed Reader"
 msgstr "Akregator - โปรแกรมอ่านแหล่งป้อนข่าว RSS"
 
-#: trayicon.cpp:134
+#: trayicon.cpp:146
 #, c-format
 msgid ""
 "_n: Akregator - 1 unread article\n"
@@ -1878,5 +1904,23 @@ msgstr "คัด&ลอกที่อยู่ของลิงค์"
 msgid "&Save Link As..."
 msgstr "บั&นทึกลิงค์เป็น..."
 
+#~ msgid "Akregator News"
+#~ msgstr "ข่าว Akregator"
+
+#~ msgid "Akregator Blog"
+#~ msgstr "บล็อก Akregator"
+
+#~ msgid "TDE Dot News"
+#~ msgstr "TDE Dot News"
+
+#~ msgid "Planet TDE"
+#~ msgstr "พลาเน็ต TDE"
+
+#~ msgid "TDE Apps"
+#~ msgstr "TDE Apps"
+
+#~ msgid "TDE Look"
+#~ msgstr "TDE Look"
+
 #~ msgid "Forward"
 #~ msgstr "ส่งต่อ"
diff --git a/tde-i18n-th/messages/tdepim/kaddressbook.po b/tde-i18n-th/messages/tdepim/kaddressbook.po
index 3a4ba1e8c44..55c5e9b2fa6 100644
--- a/tde-i18n-th/messages/tdepim/kaddressbook.po
+++ b/tde-i18n-th/messages/tdepim/kaddressbook.po
@@ -5,16 +5,17 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: kaddressbook\n"
-"POT-Creation-Date: 2008-08-19 01:19+0200\n"
+"POT-Creation-Date: 2014-09-29 00:52-0500\n"
 "PO-Revision-Date: 2005-12-01 17:32+0700\n"
 "Last-Translator: ถนอมทรัพย์ นพบูรณ์ <donga_n@yahoo.com>\n"
 "Language-Team: Thai <th@li.org>\n"
+"Language: th\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: KBabel 1.11\n"
 
-#: customfieldswidget.h:156
+#: customfieldswidget.h:159
 msgid "Custom Fields"
 msgstr "ช่องข้อมูลกำหนดเอง"
 
@@ -1026,7 +1027,7 @@ msgid ""
 "Address Types"
 msgstr "ประเภทที่อยู่"
 
-#: addresseeeditordialog.cpp:39 undocmds.cpp:197
+#: addresseeeditordialog.cpp:39 undocmds.cpp:213
 msgid "Edit Contact"
 msgstr ""
 
@@ -1034,7 +1035,7 @@ msgstr ""
 msgid "Edit Contact '%1'"
 msgstr ""
 
-#: addresseeeditorextension.cpp:68
+#: addresseeeditorextension.cpp:74
 msgid "Contact Editor"
 msgstr ""
 
@@ -1072,7 +1073,7 @@ msgstr ""
 msgid "Blog feed:"
 msgstr ""
 
-#: addresseeeditorwidget.cpp:292 tdeabcore.cpp:1356
+#: addresseeeditorwidget.cpp:292 kabcore.cpp:1418
 msgid "Select Categories..."
 msgstr "เลือกหมวดหมู่..."
 
@@ -1199,46 +1200,46 @@ msgstr "เวลา"
 msgid "Date & Time"
 msgstr "วันที่และเวลา"
 
-#: customfieldswidget.cpp:405
+#: customfieldswidget.cpp:433
 msgid "A field with the same name already exists, please choose another one."
 msgstr ""
 
-#: customfieldswidget.cpp:434
+#: customfieldswidget.cpp:462
 msgid "Remove Field"
 msgstr "ลบช่องข้อมูล"
 
-#: customfieldswidget.cpp:435
+#: customfieldswidget.cpp:463
 msgid "Select the field you want to remove:"
 msgstr "เลือกช่องข้อมูลที่คุณต้องการลบ:"
 
-#: customfieldswidget.cpp:466
+#: customfieldswidget.cpp:494
 msgid "Add Field..."
 msgstr "เพิ่มช่องข้อมูล..."
 
-#: customfieldswidget.cpp:469
+#: customfieldswidget.cpp:497
 msgid "Remove Field..."
 msgstr "ลบช่องข้อมูล..."
 
-#: distributionlisteditor.cpp:161
+#: distributionlisteditor.cpp:165
 msgid "Edit Distribution List"
 msgstr ""
 
-#: distributionlisteditor.cpp:170 filtereditdialog.cpp:122
+#: distributionlisteditor.cpp:174 filtereditdialog.cpp:122
 #: simpleaddresseeeditor.cpp:70
 msgid "Name:"
 msgstr "ชื่อ:"
 
-#: distributionlisteditor.cpp:180
+#: distributionlisteditor.cpp:184
 msgid "Distribution list members:"
 msgstr ""
 
-#: distributionlisteditor.cpp:259
+#: distributionlisteditor.cpp:264
 msgid ""
 "A distribution list with the name %1 already exists. Please choose another "
 "name."
 msgstr ""
 
-#: distributionlisteditor.cpp:259
+#: distributionlisteditor.cpp:264
 msgid "Name in Use"
 msgstr ""
 
@@ -1352,11 +1353,11 @@ msgstr ""
 msgid "Edit Address Book Filters"
 msgstr "แก้ไขตัวกรองสมุดที่อยู่"
 
-#: filtereditdialog.cpp:269
+#: features/resourceselection.cpp:187 filtereditdialog.cpp:269
 msgid "&Add..."
 msgstr "เพิ่ม..."
 
-#: filtereditdialog.cpp:270
+#: features/resourceselection.cpp:182 filtereditdialog.cpp:270
 msgid "&Edit..."
 msgstr "แก้ไข..."
 
@@ -1420,7 +1421,7 @@ msgstr ""
 msgid "Reset"
 msgstr "ตั้งค่าใหม่"
 
-#: imagewidget.cpp:258
+#: imagewidget.cpp:260
 msgid "Picture"
 msgstr "รูปภาพ"
 
@@ -1470,362 +1471,407 @@ msgstr "ที่อยู่ธุรกิจ"
 msgid "All Fields"
 msgstr "ช่องข้อมูลทั้งหมด"
 
-#: tdeabcore.cpp:115
+#: kabcore.cpp:117
 msgid "Unable to load '%1'."
 msgstr ""
 
-#: tdeabcore.cpp:121 ldapsearchdialog.cpp:95 ldapsearchdialog.cpp:307
+#: kabcore.cpp:123 ldapsearchdialog.cpp:95 ldapsearchdialog.cpp:307
 msgid "Department"
 msgstr "แผนก"
 
-#: tdeabcore.cpp:124
+#: kabcore.cpp:126
 msgid "Profession"
 msgstr "อาชีพ"
 
-#: tdeabcore.cpp:126
+#: kabcore.cpp:128
 msgid "Assistant's Name"
 msgstr "ชื่อที่ปรึกษา"
 
-#: tdeabcore.cpp:128
+#: kabcore.cpp:130
 msgid "Manager's Name"
 msgstr "ชื่อผู้จัดการ"
 
-#: tdeabcore.cpp:130
+#: kabcore.cpp:132
 msgid "Partner's Name"
 msgstr "ชื่อหุ้นส่วน"
 
-#: tdeabcore.cpp:132
+#: kabcore.cpp:134
 msgid "Office"
 msgstr "สำนักงาน"
 
-#: tdeabcore.cpp:134
+#: kabcore.cpp:136
 msgid "IM Address"
 msgstr ""
 
-#: tdeabcore.cpp:136
+#: kabcore.cpp:138
 msgid "Anniversary"
 msgstr "วันครบรอบ"
 
-#: tdeabcore.cpp:138
+#: kabcore.cpp:140
 msgid "Blog"
 msgstr ""
 
-#: tdeabcore.cpp:297
+#: kabcore.cpp:315
 msgid "KAddressBook"
 msgstr "KAddressBook : สมุดที่อยู่ - K"
 
-#: tdeabcore.cpp:298
+#: kabcore.cpp:316
 msgid "The TDE Address Book"
 msgstr "โปรแกรมสมุดที่อยู่สำหรับ TDE"
 
-#: tdeabcore.cpp:300
-msgid "(c) 1997-2005, The TDE PIM Team"
+#: kabcore.cpp:318
+#, fuzzy
+msgid ""
+"(c) 2008-2010, The Trinity Team\n"
+"(c) 1997-2005, The KDE PIM Team"
 msgstr "(c) 1997-2005, กลุ่มผู้พัฒนา TDE PIM"
 
-#: tdeabcore.cpp:301
+#: kabcore.cpp:319
 msgid "Current maintainer"
 msgstr "ผู้ดูแลปัจจุบัน"
 
-#: tdeabcore.cpp:302
+#: kabcore.cpp:320
+#, fuzzy
+msgid "Previous maintainer"
+msgstr "ผู้ดูแลปัจจุบัน"
+
+#: kabcore.cpp:321
 msgid "Original author"
 msgstr "ผู้เขียนแรกเริ่ม"
 
-#: tdeabcore.cpp:304
+#: kabcore.cpp:323
 msgid "Co-maintainer, libtdeabc port, CSV import/export"
 msgstr "ผู้ดูแลร่วม, พอร์ต libabc, นำเข้า/ส่งออกไปยัง CVS"
 
-#: tdeabcore.cpp:306
+#: kabcore.cpp:325
 msgid "GUI and framework redesign"
 msgstr "ออกแบบเฟรมเวิร์กและส่วนติดต่อผู้ใช้ใหม่"
 
-#: tdeabcore.cpp:308
+#: kabcore.cpp:327
 msgid "DCOP interface"
 msgstr "ส่วนติดต่อกับระบบ DCOP"
 
-#: tdeabcore.cpp:309
+#: kabcore.cpp:328
 msgid "Contact pinning"
 msgstr ""
 
-#: tdeabcore.cpp:310 tdeabcore.cpp:312
+#: kabcore.cpp:329 kabcore.cpp:331
 msgid "LDAP Lookup"
 msgstr "ค้นหาใน LDAP"
 
-#: tdeabcore.cpp:467
+#: kabcore.cpp:500
 #, c-format
 msgid ""
 "_n: Do you really want to delete this distribution list?\n"
 "Do you really want to delete these %n distribution lists?"
 msgstr ""
 
-#: tdeabcore.cpp:493
+#: kabcore.cpp:531
 #, c-format
 msgid ""
-"_n: Do you really want to delete this contact?\n"
-"Do you really want to delete these %n contacts?"
+"_n: <qt>Do you really want to delete this contact from your addressbook?"
+"<br><b>Note:</b>The contact will be also removed from all distribution "
+"lists.</qt>\n"
+"<qt>Do you really want to delete these %n contacts from your addressbook?"
+"<br><b>Note:</b>The contacts will be also removed from all distribution "
+"lists.</qt>"
 msgstr ""
 
-#: tdeabcore.cpp:589
+#: kabcore.cpp:638
 msgid "Please select only one contact."
 msgstr ""
 
-#: tdeabcore.cpp:593
+#: kabcore.cpp:642
 msgid ""
 "<qt>Do you really want to use <b>%1</b> as your new personal contact?</qt>"
 msgstr ""
 
-#: tdeabcore.cpp:594
+#: kabcore.cpp:643
 msgid "Use"
 msgstr "ใช้"
 
-#: tdeabcore.cpp:594
+#: kabcore.cpp:643
 msgid "Do Not Use"
 msgstr "ไม่ใช้"
 
-#: features/distributionlistwidget.cpp:266 tdeabcore.cpp:664
+#: features/distributionlistwidget.cpp:266 kabcore.cpp:717
 msgid "New Distribution List"
 msgstr ""
 
-#: tdeabcore.cpp:670
+#: kabcore.cpp:723
 msgid "New Distribution List (%1)"
 msgstr ""
 
-#: tdeabcore.cpp:859
+#: kabcore.cpp:900
 msgid "<qt>Unable to save address book <b>%1</b>.</qt>"
 msgstr ""
 
-#: tdeabcore.cpp:866
+#: kabcore.cpp:907
 msgid "<qt>Unable to get access for saving the address book <b>%1</b>.</qt>"
 msgstr ""
 
-#: tdeabcore.cpp:970
+#: kabcore.cpp:1021
 msgid ""
 "Your TDE installation is missing LDAP support, please ask your administrator or "
 "distributor for more information."
 msgstr ""
 
-#: tdeabcore.cpp:972
+#: kabcore.cpp:1023
 msgid "No LDAP IO Slave Available"
 msgstr ""
 
-#: tdeabcore.cpp:1008
+#: kabcore.cpp:1059
 msgid "Address Book"
 msgstr "สมุดที่อยู่"
 
-#: tdeabcore.cpp:1011
+#: kabcore.cpp:1062
 msgid "Print Addresses"
 msgstr "พิมพ์ที่อยู่"
 
-#: tdeabcore.cpp:1177 tdeabcore.cpp:1630
+#: kabcore.cpp:1228 kabcore.cpp:1731
 #, fuzzy
 msgid "Contacts"
 msgstr "หัวข้อ"
 
-#: tdeabcore.cpp:1258
+#: kabcore.cpp:1242
+msgid "Add contacts to the distribution list"
+msgstr ""
+
+#: kabcore.cpp:1244
+msgid ""
+"Click this button if you want to add more contacts to the current distribution "
+"list. You will be shown a dialog that allows to enter a list of existing "
+"contacts to this distribution list."
+msgstr ""
+
+#: kabcore.cpp:1256
+msgid "Remove contacts from the distribution list"
+msgstr ""
+
+#: kabcore.cpp:1258
+msgid ""
+"Click this button if you want to remove the selected contacts from the current "
+"distribution list."
+msgstr ""
+
+#: kabcore.cpp:1320
 #, fuzzy
 msgid "&Send Email to Contact..."
 msgstr "หัวข้อ"
 
-#: tdeabcore.cpp:1261
+#: kabcore.cpp:1323
 #, fuzzy
 msgid "Send a mail to all selected contacts."
 msgstr "หัวข้อ"
 
-#: tdeabcore.cpp:1262
+#: kabcore.cpp:1324
 msgid "Print a special number of contacts."
 msgstr ""
 
-#: tdeabcore.cpp:1266
+#: kabcore.cpp:1328
 msgid "Save all changes of the address book to the storage backend."
 msgstr ""
 
-#: tdeabcore.cpp:1268
+#: kabcore.cpp:1330
 msgid "&New Contact..."
 msgstr ""
 
-#: tdeabcore.cpp:1270
+#: kabcore.cpp:1332
 msgid ""
 "Create a new contact"
 "<p>You will be presented with a dialog where you can add all data about a "
 "person, including addresses and phone numbers."
 msgstr ""
 
-#: tdeabcore.cpp:1272
+#: kabcore.cpp:1334
 #, fuzzy
 msgid "&New Distribution List..."
 msgstr "รายการใหม่..."
 
-#: tdeabcore.cpp:1274
+#: kabcore.cpp:1336
 msgid ""
 "Create a new distribution list"
 "<p>You will be presented with a dialog where you can create a new distribution "
 "list."
 msgstr ""
 
-#: tdeabcore.cpp:1276
+#: kabcore.cpp:1338
 msgid "Send &Contact..."
 msgstr ""
 
-#: tdeabcore.cpp:1279
+#: kabcore.cpp:1341
 msgid "Send a mail with the selected contact as attachment."
 msgstr ""
 
-#: tdeabcore.cpp:1281
+#: kabcore.cpp:1343
 msgid "Chat &With..."
 msgstr ""
 
-#: tdeabcore.cpp:1284
+#: kabcore.cpp:1346
 #, fuzzy
 msgid "Start a chat with the selected contact."
 msgstr "หัวข้อ"
 
-#: tdeabcore.cpp:1286
+#: kabcore.cpp:1348
 msgid "&Edit Contact..."
 msgstr ""
 
-#: tdeabcore.cpp:1289
+#: kabcore.cpp:1351
 msgid ""
 "Edit a contact"
 "<p>You will be presented with a dialog where you can change all data about a "
 "person, including addresses and phone numbers."
 msgstr ""
 
-#: tdeabcore.cpp:1291
+#: kabcore.cpp:1353
 #, fuzzy
 msgid "&Merge Contacts"
 msgstr "หัวข้อ"
 
-#: tdeabcore.cpp:1300
+#: kabcore.cpp:1362
 msgid ""
 "Copy the currently selected contact(s) to system clipboard in vCard format."
 msgstr ""
 
-#: tdeabcore.cpp:1301
+#: kabcore.cpp:1363
 msgid ""
 "Cuts the currently selected contact(s) to system clipboard in vCard format."
 msgstr ""
 
-#: tdeabcore.cpp:1302
+#: kabcore.cpp:1364
 msgid "Paste the previously cut or copied contacts from clipboard."
 msgstr ""
 
-#: tdeabcore.cpp:1303
+#: kabcore.cpp:1365
 msgid "Selects all visible contacts from current view."
 msgstr ""
 
-#: tdeabcore.cpp:1307
+#: kabcore.cpp:1369
 msgid "&Delete Contact"
 msgstr ""
 
-#: tdeabcore.cpp:1310
+#: kabcore.cpp:1372
 #, fuzzy
 msgid "Delete all selected contacts."
 msgstr "หัวข้อ"
 
-#: tdeabcore.cpp:1313
+#: kabcore.cpp:1375
 #, fuzzy
 msgid "&Copy Contact To..."
 msgstr "หัวข้อ"
 
-#: tdeabcore.cpp:1316
+#: kabcore.cpp:1378
 msgid ""
 "Store a contact in a different Addressbook"
 "<p>You will be presented with a dialog where you can select a new storage place "
 "for this contact."
 msgstr ""
 
-#: tdeabcore.cpp:1319
+#: kabcore.cpp:1381
 #, fuzzy
 msgid "M&ove Contact To..."
 msgstr "หัวข้อ"
 
-#: tdeabcore.cpp:1325
+#: kabcore.cpp:1387
 msgid "Show Jump Bar"
 msgstr ""
 
-#: tdeabcore.cpp:1327
+#: kabcore.cpp:1389
 msgid "Toggle whether the jump button bar shall be visible."
 msgstr ""
 
-#: tdeabcore.cpp:1328
+#: kabcore.cpp:1390
 msgid "Hide Jump Bar"
 msgstr ""
 
-#: tdeabcore.cpp:1331
+#: kabcore.cpp:1393
 msgid "Show Details"
 msgstr "แสดงรายละเอียด"
 
-#: tdeabcore.cpp:1333
+#: kabcore.cpp:1395
 msgid "Toggle whether the details page shall be visible."
 msgstr ""
 
-#: tdeabcore.cpp:1334
+#: kabcore.cpp:1396
 msgid "Hide Details"
 msgstr "ซ่อนรายละเอียด"
 
-#: tdeabcore.cpp:1338
+#: kabcore.cpp:1400
 msgid "&Configure Address Book..."
 msgstr "ปรับแต่งสมุดที่อยู่..."
 
-#: tdeabcore.cpp:1344
+#: kabcore.cpp:1406
 msgid ""
 "You will be presented with a dialog, that offers you all possibilities to "
 "configure KAddressBook."
 msgstr ""
 
-#: tdeabcore.cpp:1347
+#: kabcore.cpp:1409
 msgid "&Lookup Addresses in LDAP Directory..."
 msgstr "ค้นหาที่อยู่ในสารบบของ LDAP..."
 
-#: tdeabcore.cpp:1349
+#: kabcore.cpp:1411
 msgid ""
 "Search for contacts on a LDAP server"
 "<p>You will be presented with a dialog, where you can search for contacts and "
 "select the ones you want to add to your local address book."
 msgstr ""
 
-#: tdeabcore.cpp:1351
+#: kabcore.cpp:1413
 msgid "Set as Personal Contact Data"
 msgstr ""
 
-#: tdeabcore.cpp:1354
+#: kabcore.cpp:1416
 msgid ""
 "Set the personal contact"
 "<p>The data of this contact will be used in many other TDE applications, so you "
 "do not have to input your personal data several times."
 msgstr ""
 
-#: tdeabcore.cpp:1359
+#: kabcore.cpp:1421
 msgid "Set the categories for all selected contacts."
 msgstr ""
 
-#: tdeabcore.cpp:1361
+#: kabcore.cpp:1423
 msgid "Clear Search Bar"
 msgstr ""
 
-#: tdeabcore.cpp:1364
+#: kabcore.cpp:1426
 msgid "Clear Search Bar<p>Clears the content of the quick search bar."
 msgstr ""
 
-#: tdeabcore.cpp:1438
+#: kabcore.cpp:1505
 msgid "Merge with existing categories?"
 msgstr ""
 
-#: tdeabcore.cpp:1439
+#: kabcore.cpp:1506
 msgid "Merge"
 msgstr ""
 
-#: tdeabcore.cpp:1439
+#: kabcore.cpp:1506
 msgid "Do Not Merge"
 msgstr ""
 
-#: tdeabcore.cpp:1490
+#: kabcore.cpp:1557
 #, c-format
 msgid ""
 "_n: %n contact matches\n"
 "%n contacts matching"
 msgstr ""
 
-#: tdeabcore.cpp:1630
+#: kabcore.cpp:1632
+msgid ""
+"_n: <qt>Do you really want to remove this contact from the %1 distribution "
+"list?"
+"<br><b>Note:</b>The contact will be not be removed from your addressbook nor "
+"from any other distribution list.</qt>\n"
+"<qt>Do you really want to remove these %n contacts from the %1 distribution "
+"list?"
+"<br><b>Note:</b>The contacts will be not be removed from your addressbook nor "
+"from any other distribution list.</qt>"
+msgstr ""
+
+#: kabcore.cpp:1732
 #, c-format
 msgid "Distribution List: %1"
 msgstr ""
@@ -1834,7 +1880,7 @@ msgstr ""
 msgid "Address Book Browser"
 msgstr ""
 
-#: kaddressbookmain.cpp:151
+#: kaddressbookmain.cpp:157
 msgid ""
 "You will be presented with a dialog, where you can configure the application "
 "wide shortcuts."
@@ -1856,7 +1902,7 @@ msgstr ""
 msgid "Select the key type:"
 msgstr ""
 
-#: keywidget.cpp:124 xxport/csv_xxport.cpp:68 xxport/ldif_xxport.cpp:117
+#: keywidget.cpp:124 xxport/csv_xxport.cpp:73 xxport/ldif_xxport.cpp:123
 msgid "<qt>Unable to open file <b>%1</b>.</qt>"
 msgstr ""
 
@@ -2008,18 +2054,18 @@ msgid ""
 "Imported from LDAP directory %1 on %2"
 msgstr ""
 
-#: ldapsearchdialog.cpp:588
+#: ldapsearchdialog.cpp:595
 #, c-format
 msgid ""
 "_n: The following contact was imported into your address book:\n"
 "The following %n contacts were imported into your address book:"
 msgstr ""
 
-#: ldapsearchdialog.cpp:603
+#: ldapsearchdialog.cpp:607
 msgid "Please select the contacts you want to add to the distribution list."
 msgstr ""
 
-#: ldapsearchdialog.cpp:603
+#: ldapsearchdialog.cpp:607
 msgid "No Contacts Selected"
 msgstr ""
 
@@ -2168,7 +2214,7 @@ msgid "Contact Toolbar"
 msgstr ""
 
 #. i18n: file editors/imaddressbase.ui line 24
-#: editors/imeditorwidget.cpp:369 rc.cpp:63
+#: editors/imeditorwidget.cpp:371 rc.cpp:63
 #, no-c-format
 msgid ""
 "_: Instant messaging\n"
@@ -2400,7 +2446,7 @@ msgstr ""
 #. i18n: file common/kaddressbook.kcfg line 34
 #: rc.cpp:174
 #, no-c-format
-msgid "Honor TDE single click"
+msgid "Honor KDE single click"
 msgstr ""
 
 #. i18n: file common/kaddressbook.kcfg line 59
@@ -2429,34 +2475,48 @@ msgstr ""
 msgid "Save only the URL to the sound file, not the whole object."
 msgstr ""
 
-#: undocmds.cpp:46
+#: undocmds.cpp:58
 #, fuzzy, c-format
 msgid ""
 "_n: Delete Contact\n"
 "Delete %n Contacts"
 msgstr "หัวข้อ"
 
-#: undocmds.cpp:97
+#: undocmds.cpp:111
 #, c-format
 msgid ""
 "_n: Paste Contact\n"
 "Paste %n Contacts"
 msgstr ""
 
-#: undocmds.cpp:153
+#: undocmds.cpp:167
 #, c-format
 msgid ""
 "_n: New Contact\n"
 "New %n Contacts"
 msgstr ""
 
-#: undocmds.cpp:222
+#: undocmds.cpp:244
 #, c-format
 msgid ""
 "_n: Cut Contact\n"
 "Cut %n Contacts"
 msgstr ""
 
+#: undocmds.cpp:310
+#, fuzzy, c-format
+msgid ""
+"_n: Copy Contact To\n"
+"Copy %n Contacts To"
+msgstr "หัวข้อ"
+
+#: undocmds.cpp:359
+#, fuzzy, c-format
+msgid ""
+"_n: Move Contact To\n"
+"Move %n Contacts To"
+msgstr "หัวข้อ"
+
 #: viewconfigurefieldspage.cpp:205
 msgid "Select Fields to Display"
 msgstr "เลือกช่องข้อมูลที่จะแสดง"
@@ -2501,7 +2561,7 @@ msgstr ""
 msgid "<qt>Are you sure that you want to delete the view <b>%1</b>?</qt>"
 msgstr ""
 
-#: editors/imeditorwidget.cpp:424 viewmanager.cpp:311
+#: editors/imeditorwidget.cpp:426 viewmanager.cpp:311
 msgid "Confirm Delete"
 msgstr "ยืนยันการลบ"
 
@@ -2520,65 +2580,65 @@ msgstr ""
 msgid "Do Not Import"
 msgstr ""
 
-#: viewmanager.cpp:538 views/configuretableviewdialog.cpp:123
+#: viewmanager.cpp:543 views/configuretableviewdialog.cpp:123
 #: xxport/csvimportdialog.cpp:419
 msgid "None"
 msgstr "ไม่มี"
 
-#: viewmanager.cpp:539
+#: viewmanager.cpp:544
 msgid "Unfiled"
 msgstr ""
 
-#: viewmanager.cpp:562
+#: viewmanager.cpp:567
 #, fuzzy
 msgid "Select View"
 msgstr "หัวข้อ"
 
-#: viewmanager.cpp:571
+#: viewmanager.cpp:576
 msgid "Modify View..."
 msgstr ""
 
-#: viewmanager.cpp:574
+#: viewmanager.cpp:579
 msgid ""
 "By pressing this button a dialog opens that allows you to modify the view of "
 "the addressbook. There you can add or remove fields that you want to be shown "
 "or hidden in the addressbook like the name for example."
 msgstr ""
 
-#: viewmanager.cpp:576
+#: viewmanager.cpp:581
 msgid "Add View..."
 msgstr ""
 
-#: viewmanager.cpp:579
+#: viewmanager.cpp:584
 msgid ""
 "You can add a new view by choosing one from the dialog that appears after "
 "pressing the button. You have to give the view a name, so that you can "
 "distinguish between the different views."
 msgstr ""
 
-#: viewmanager.cpp:581
+#: viewmanager.cpp:586
 msgid "Delete View"
 msgstr ""
 
-#: viewmanager.cpp:584
+#: viewmanager.cpp:589
 msgid ""
 "By pressing this button you can delete the actual view, which you have added "
 "before."
 msgstr ""
 
-#: viewmanager.cpp:586
+#: viewmanager.cpp:591
 msgid "Refresh View"
 msgstr ""
 
-#: viewmanager.cpp:589
+#: viewmanager.cpp:594
 msgid "The view will be refreshed by pressing this button."
 msgstr ""
 
-#: viewmanager.cpp:591
+#: viewmanager.cpp:596
 msgid "Edit &Filters..."
 msgstr "แก้ไขตัวกรอง..."
 
-#: viewmanager.cpp:594
+#: viewmanager.cpp:599
 msgid ""
 "Edit the contact filters"
 "<p>You will be presented with a dialog, where you can add, remove and edit "
@@ -2749,30 +2809,30 @@ msgid ""
 "Add Address"
 msgstr ""
 
-#: editors/imeditorwidget.cpp:423
+#: editors/imeditorwidget.cpp:425
 #, c-format
 msgid ""
 "_n: Do you really want to delete the selected address?\n"
 "Do you really want to delete the %n selected addresses?"
 msgstr ""
 
-#: features/distributionlistngwidget.cpp:111
+#: features/distributionlistngwidget.cpp:110
 msgid "Distribution List Editor NG"
 msgstr ""
 
-#: features/distributionlistngwidget.cpp:128
+#: features/distributionlistngwidget.cpp:127
 msgid "Distribution Lists"
 msgstr ""
 
-#: features/distributionlistngwidget.cpp:134
+#: features/distributionlistngwidget.cpp:133
 msgid "Add distribution list"
 msgstr ""
 
-#: features/distributionlistngwidget.cpp:140
+#: features/distributionlistngwidget.cpp:139
 msgid "Edit distribution list"
 msgstr ""
 
-#: features/distributionlistngwidget.cpp:146
+#: features/distributionlistngwidget.cpp:145
 msgid "Remove distribution list"
 msgstr ""
 
@@ -2781,6 +2841,7 @@ msgstr ""
 msgid "New Distribution List..."
 msgstr "รายการใหม่..."
 
+#: features/distributionlistngwidget.cpp:175
 #: features/distributionlistngwidget.cpp:236
 #, fuzzy
 msgid "All Contacts"
@@ -2858,42 +2919,42 @@ msgstr "ที่อยู่อีเมล"
 msgid "Preferred address"
 msgstr "ที่อยู่ที่กำหนด"
 
-#: features/resourceselection.cpp:166 features/resourceselection.cpp:374
-#: features/resourceselection.cpp:395
+#: features/resourceselection.cpp:172
+msgid "Re&load"
+msgstr ""
+
+#: features/resourceselection.cpp:224 features/resourceselection.cpp:494
+#: features/resourceselection.cpp:515
 msgid "Address Books"
 msgstr "สมุดที่อยู่"
 
-#: features/resourceselection.cpp:180
+#: features/resourceselection.cpp:238
 msgid "Add Address Book"
 msgstr "เพิ่มสมุดที่อยู่"
 
-#: features/resourceselection.cpp:181
+#: features/resourceselection.cpp:239
 msgid "Please select type of the new address book:"
 msgstr "โปรดเลือกประเภทของสมุดที่อยู่ใหม่:"
 
-#: features/resourceselection.cpp:191
+#: features/resourceselection.cpp:249
 msgid "<qt>Unable to create an address book of type <b>%1</b>.</qt>"
 msgstr ""
 
-#: features/resourceselection.cpp:196
-msgid "%1 address book"
-msgstr ""
-
-#: features/resourceselection.cpp:237
+#: features/resourceselection.cpp:300
 msgid "<qt>Do you really want to remove the address book <b>%1</b>?</qt>"
 msgstr ""
 
-#: features/resourceselection.cpp:380
+#: features/resourceselection.cpp:500
 #, fuzzy
 msgid "Add addressbook"
 msgstr "เพิ่มสมุดที่อยู่"
 
-#: features/resourceselection.cpp:385
+#: features/resourceselection.cpp:505
 #, fuzzy
 msgid "Edit addressbook settings"
 msgstr "แก้ไขตัวกรองสมุดที่อยู่"
 
-#: features/resourceselection.cpp:390
+#: features/resourceselection.cpp:510
 #, fuzzy
 msgid "Remove addressbook"
 msgstr "ที่อยู่ที่บ้าน"
@@ -3284,11 +3345,17 @@ msgstr ""
 msgid "Export CSV List..."
 msgstr ""
 
-#: xxport/csv_xxport.cpp:55 xxport/ldif_xxport.cpp:102
+#: xxport/csv_xxport.cpp:53 xxport/csvimportdialog.cpp:861
+#: xxport/ldif_xxport.cpp:100 xxport/vcard_xxport.cpp:296
+#: xxport/vcard_xxport.cpp:318
+msgid "Do you want to overwrite file \"%1\""
+msgstr ""
+
+#: xxport/csv_xxport.cpp:60 xxport/ldif_xxport.cpp:108
 msgid "<qt>Unable to open file <b>%1</b>.%2.</qt>"
 msgstr ""
 
-#: xxport/csv_xxport.cpp:76
+#: xxport/csv_xxport.cpp:81
 msgid "The contacts have been exported successfully."
 msgstr ""
 
@@ -3418,16 +3485,16 @@ msgstr "หัวข้อ"
 msgid "Please select a template, that matches the CSV file:"
 msgstr ""
 
-#: xxport/csvimportdialog.cpp:860
+#: xxport/csvimportdialog.cpp:864
 #, fuzzy
 msgid "Template Name"
 msgstr "หัวข้อ"
 
-#: xxport/csvimportdialog.cpp:860
+#: xxport/csvimportdialog.cpp:864
 msgid "Please enter a name for the template:"
 msgstr ""
 
-#: xxport/csvimportdialog.cpp:930
+#: xxport/csvimportdialog.cpp:934
 msgid "Cannot open input file."
 msgstr ""
 
@@ -3447,11 +3514,11 @@ msgstr ""
 msgid "Export to Mobile Phone..."
 msgstr ""
 
-#: xxport/gnokii_xxport.cpp:134 xxport/gnokii_xxport.cpp:824
+#: xxport/gnokii_xxport.cpp:134 xxport/gnokii_xxport.cpp:820
 msgid "Failed to initialize the gnokii library."
 msgstr ""
 
-#: xxport/gnokii_xxport.cpp:140 xxport/gnokii_xxport.cpp:853
+#: xxport/gnokii_xxport.cpp:140 xxport/gnokii_xxport.cpp:849
 msgid ""
 "<qt>"
 "<center>Mobile Phone interface initialization failed."
@@ -3464,42 +3531,42 @@ msgid ""
 "correct.</center></qt>"
 msgstr ""
 
-#: xxport/gnokii_xxport.cpp:179 xxport/gnokii_xxport.cpp:953
+#: xxport/gnokii_xxport.cpp:179 xxport/gnokii_xxport.cpp:949
 msgid "Mobile Phone information:"
 msgstr ""
 
-#: xxport/gnokii_xxport.cpp:180 xxport/gnokii_xxport.cpp:954
+#: xxport/gnokii_xxport.cpp:180 xxport/gnokii_xxport.cpp:950
 msgid "Manufacturer"
 msgstr ""
 
-#: xxport/gnokii_xxport.cpp:181 xxport/gnokii_xxport.cpp:955
+#: xxport/gnokii_xxport.cpp:181 xxport/gnokii_xxport.cpp:951
 msgid "Phone model"
 msgstr ""
 
-#: xxport/gnokii_xxport.cpp:182 xxport/gnokii_xxport.cpp:956
+#: xxport/gnokii_xxport.cpp:182 xxport/gnokii_xxport.cpp:952
 msgid "Revision"
 msgstr ""
 
-#: xxport/gnokii_xxport.cpp:183 xxport/gnokii_xxport.cpp:957
+#: xxport/gnokii_xxport.cpp:183 xxport/gnokii_xxport.cpp:953
 msgid "IMEI"
 msgstr ""
 
-#: xxport/gnokii_xxport.cpp:184 xxport/gnokii_xxport.cpp:958
+#: xxport/gnokii_xxport.cpp:184 xxport/gnokii_xxport.cpp:954
 msgid "Phonebook status"
 msgstr ""
 
-#: xxport/gnokii_xxport.cpp:185 xxport/gnokii_xxport.cpp:959
+#: xxport/gnokii_xxport.cpp:185 xxport/gnokii_xxport.cpp:955
 msgid "%1 out of %2 contacts used"
 msgstr ""
 
-#: xxport/gnokii_xxport.cpp:211 xxport/gnokii_xxport.cpp:995
+#: xxport/gnokii_xxport.cpp:211 xxport/gnokii_xxport.cpp:991
 msgid ""
 "<qt>Importing <b>%1</b> contacts from <b>%2</b> of the Mobile Phone."
 "<br>"
 "<br>%3</qt>"
 msgstr ""
 
-#: xxport/gnokii_xxport.cpp:532 xxport/gnokii_xxport.cpp:1327
+#: xxport/gnokii_xxport.cpp:532 xxport/gnokii_xxport.cpp:1323
 msgid ""
 "<qt>Please connect your Mobile Phone to your computer and press <b>Continue</b> "
 "to start importing the personal contacts."
@@ -3509,12 +3576,12 @@ msgid ""
 "KAddressbook will behave unresponsively.</qt>"
 msgstr ""
 
-#: xxport/gnokii_xxport.cpp:540 xxport/gnokii_xxport.cpp:1335
+#: xxport/gnokii_xxport.cpp:540 xxport/gnokii_xxport.cpp:1331
 msgid "Mobile Phone Import"
 msgstr ""
 
-#: xxport/gnokii_xxport.cpp:541 xxport/gnokii_xxport.cpp:590
-#: xxport/gnokii_xxport.cpp:1336 xxport/gnokii_xxport.cpp:1385
+#: xxport/gnokii_xxport.cpp:541 xxport/gnokii_xxport.cpp:588
+#: xxport/gnokii_xxport.cpp:1332 xxport/gnokii_xxport.cpp:1379
 msgid ""
 "<qt>"
 "<center>Establishing connection to the Mobile Phone."
@@ -3522,11 +3589,11 @@ msgid ""
 "<br>Please wait...</center></qt>"
 msgstr ""
 
-#: xxport/gnokii_xxport.cpp:564 xxport/gnokii_xxport.cpp:1359
+#: xxport/gnokii_xxport.cpp:562 xxport/gnokii_xxport.cpp:1353
 msgid "&Stop Import"
 msgstr ""
 
-#: xxport/gnokii_xxport.cpp:581 xxport/gnokii_xxport.cpp:1376
+#: xxport/gnokii_xxport.cpp:579 xxport/gnokii_xxport.cpp:1370
 msgid ""
 "<qt>Please connect your Mobile Phone to your computer and press <b>Continue</b> "
 "to start exporting the selected personal contacts."
@@ -3536,12 +3603,12 @@ msgid ""
 "KAddressbook will behave unresponsively.</qt>"
 msgstr ""
 
-#: xxport/gnokii_xxport.cpp:589 xxport/gnokii_xxport.cpp:773
-#: xxport/gnokii_xxport.cpp:1384 xxport/gnokii_xxport.cpp:1568
+#: xxport/gnokii_xxport.cpp:587 xxport/gnokii_xxport.cpp:769
+#: xxport/gnokii_xxport.cpp:1378 xxport/gnokii_xxport.cpp:1560
 msgid "Mobile Phone Export"
 msgstr ""
 
-#: xxport/gnokii_xxport.cpp:645 xxport/gnokii_xxport.cpp:1440
+#: xxport/gnokii_xxport.cpp:641 xxport/gnokii_xxport.cpp:1432
 msgid ""
 "<qt>Do you want the selected contacts to be <b>appended</b> "
 "to the current mobile phonebook or should they <b>replace</b> "
@@ -3552,30 +3619,30 @@ msgid ""
 "contacts will be available from inside your phone.</qt>"
 msgstr ""
 
-#: xxport/gnokii_xxport.cpp:651 xxport/gnokii_xxport.cpp:1446
+#: xxport/gnokii_xxport.cpp:647 xxport/gnokii_xxport.cpp:1438
 msgid "Export to Mobile Phone"
 msgstr ""
 
-#: xxport/gnokii_xxport.cpp:652 xxport/gnokii_xxport.cpp:1447
+#: xxport/gnokii_xxport.cpp:648 xxport/gnokii_xxport.cpp:1439
 msgid "&Append to Current Phonebook"
 msgstr ""
 
-#: xxport/gnokii_xxport.cpp:653 xxport/gnokii_xxport.cpp:1448
+#: xxport/gnokii_xxport.cpp:649 xxport/gnokii_xxport.cpp:1440
 msgid "&Replace Current Phonebook with New Contacts"
 msgstr ""
 
-#: xxport/gnokii_xxport.cpp:660 xxport/gnokii_xxport.cpp:1455
+#: xxport/gnokii_xxport.cpp:656 xxport/gnokii_xxport.cpp:1447
 msgid "&Stop Export"
 msgstr ""
 
-#: xxport/gnokii_xxport.cpp:661 xxport/gnokii_xxport.cpp:1456
+#: xxport/gnokii_xxport.cpp:657 xxport/gnokii_xxport.cpp:1448
 msgid ""
 "<qt>Exporting <b>%1</b> contacts to the <b>%2</b> of the Mobile Phone."
 "<br>"
 "<br>%3</qt>"
 msgstr ""
 
-#: xxport/gnokii_xxport.cpp:728 xxport/gnokii_xxport.cpp:1523
+#: xxport/gnokii_xxport.cpp:724 xxport/gnokii_xxport.cpp:1515
 msgid ""
 "<qt>"
 "<center>All selected contacts have been sucessfully copied to the Mobile Phone."
@@ -3584,15 +3651,15 @@ msgid ""
 "have been deleted.</center></qt>"
 msgstr ""
 
-#: xxport/gnokii_xxport.cpp:733 xxport/gnokii_xxport.cpp:1528
+#: xxport/gnokii_xxport.cpp:729 xxport/gnokii_xxport.cpp:1520
 msgid "&Stop Delete"
 msgstr ""
 
-#: xxport/gnokii_xxport.cpp:753 xxport/gnokii_xxport.cpp:1548
+#: xxport/gnokii_xxport.cpp:749 xxport/gnokii_xxport.cpp:1540
 msgid "Export to phone finished."
 msgstr ""
 
-#: xxport/gnokii_xxport.cpp:764 xxport/gnokii_xxport.cpp:1559
+#: xxport/gnokii_xxport.cpp:760 xxport/gnokii_xxport.cpp:1551
 msgid ""
 "<qt>The following contacts could not be exported to the Mobile Phone. Possible "
 "Reasons for this problem could be:"
@@ -3607,45 +3674,46 @@ msgid ""
 "above contacts.</qt>"
 msgstr ""
 
-#: xxport/gnokii_xxport.cpp:827
+#: xxport/gnokii_xxport.cpp:823
 msgid "Gnokii is not yet configured."
 msgstr ""
 
-#: xxport/gnokii_xxport.cpp:839
+#: xxport/gnokii_xxport.cpp:835
 msgid ""
 "Gnokii reports a 'Lock File Error'.\n"
 " Please exit all other running instances of gnokii, check if you have write "
 "permissions in the /var/lock directory and try again."
 msgstr ""
 
-#: xxport/gnokii_xxport.cpp:868
+#: xxport/gnokii_xxport.cpp:864
 msgid "Unknown"
 msgstr ""
 
-#: xxport/gnokii_xxport.cpp:965
+#: xxport/gnokii_xxport.cpp:961
 msgid "internal memory"
 msgstr ""
 
-#: xxport/gnokii_xxport.cpp:966
+#: xxport/gnokii_xxport.cpp:962
 msgid "SIM-card memory"
 msgstr ""
 
-#: xxport/gnokii_xxport.cpp:967
+#: xxport/gnokii_xxport.cpp:963
 msgid "unknown memory"
 msgstr ""
 
-#: xxport/gnokii_xxport.cpp:1586 xxport/gnokii_xxport.cpp:1594
+#: xxport/gnokii_xxport.cpp:1578 xxport/gnokii_xxport.cpp:1586
 msgid ""
 "Gnokii interface is not available.\n"
 "Please ask your distributor to add gnokii at compile time."
 msgstr ""
 
 #: xxport/kde2_xxport.cpp:45
-msgid "Import TDE 2 Addressbook..."
-msgstr ""
+#, fuzzy
+msgid "Import KDE 2 Addressbook..."
+msgstr "ปรับแต่งสมุดที่อยู่..."
 
 #: xxport/kde2_xxport.cpp:52
-msgid "<qt>Could not find a TDE 2 address book <b>%1</b>.</qt>"
+msgid "<qt>Could not find a KDE 2 address book <b>%1</b>.</qt>"
 msgstr ""
 
 #: xxport/kde2_xxport.cpp:57
@@ -3653,8 +3721,9 @@ msgid "Override previously imported entries?"
 msgstr ""
 
 #: xxport/kde2_xxport.cpp:58
-msgid "Import TDE 2 Addressbook"
-msgstr ""
+#, fuzzy
+msgid "Import KDE 2 Addressbook"
+msgstr "โปรแกรมสมุดที่อยู่สำหรับ TDE"
 
 #: xxport/ldif_xxport.cpp:56
 msgid "Import LDIF Addressbook..."
@@ -3704,82 +3773,82 @@ msgstr ""
 msgid "Export vCard 3.0..."
 msgstr ""
 
-#: xxport/vcard_xxport.cpp:125
+#: xxport/vcard_xxport.cpp:131
 msgid ""
 "You have selected a list of contacts, shall they be exported to several files?"
 msgstr ""
 
-#: xxport/vcard_xxport.cpp:128
+#: xxport/vcard_xxport.cpp:134
 msgid "Export to Several Files"
 msgstr ""
 
-#: xxport/vcard_xxport.cpp:128
+#: xxport/vcard_xxport.cpp:134
 msgid "Export to One File"
 msgstr ""
 
-#: xxport/vcard_xxport.cpp:190
+#: xxport/vcard_xxport.cpp:212
 msgid "Select vCard to Import"
 msgstr ""
 
-#: xxport/vcard_xxport.cpp:197
+#: xxport/vcard_xxport.cpp:219
 msgid "vCard Import Failed"
 msgstr ""
 
-#: xxport/vcard_xxport.cpp:213
+#: xxport/vcard_xxport.cpp:252
 msgid ""
 "<qt>When trying to read the vCard, there was an error opening the file '%1': "
 "%2</qt>"
 msgstr ""
 
-#: xxport/vcard_xxport.cpp:221
+#: xxport/vcard_xxport.cpp:260
 msgid "<qt>Unable to access vCard: %1</qt>"
 msgstr ""
 
-#: xxport/vcard_xxport.cpp:232
+#: xxport/vcard_xxport.cpp:271
 msgid "No contacts were imported, due to errors with the vCards."
 msgstr ""
 
-#: xxport/vcard_xxport.cpp:234
+#: xxport/vcard_xxport.cpp:273
 msgid "The vCard does not contain any contacts."
 msgstr ""
 
-#: xxport/vcard_xxport.cpp:402
+#: xxport/vcard_xxport.cpp:469
 msgid "Import vCard"
 msgstr ""
 
-#: xxport/vcard_xxport.cpp:409
+#: xxport/vcard_xxport.cpp:476
 msgid "Do you want to import this contact in your address book?"
 msgstr ""
 
-#: xxport/vcard_xxport.cpp:420
+#: xxport/vcard_xxport.cpp:487
 #, fuzzy
 msgid "Import All..."
 msgstr "หัวข้อ"
 
-#: xxport/vcard_xxport.cpp:475
+#: xxport/vcard_xxport.cpp:542
 #, fuzzy
 msgid "Select vCard Fields"
 msgstr "หัวข้อ"
 
-#: xxport/vcard_xxport.cpp:482
+#: xxport/vcard_xxport.cpp:549
 msgid "Select the fields which shall be exported in the vCard."
 msgstr ""
 
-#: xxport/vcard_xxport.cpp:485
+#: xxport/vcard_xxport.cpp:552
 msgid "Private fields"
 msgstr ""
 
-#: xxport/vcard_xxport.cpp:488
+#: xxport/vcard_xxport.cpp:555
 #, fuzzy
 msgid "Business fields"
 msgstr "ที่อยู่ธุรกิจ"
 
-#: xxport/vcard_xxport.cpp:491
+#: xxport/vcard_xxport.cpp:558
 #, fuzzy
 msgid "Other fields"
 msgstr "หัวข้อ"
 
-#: xxport/vcard_xxport.cpp:494
+#: xxport/vcard_xxport.cpp:561
 msgid "Encryption keys"
 msgstr ""
 
diff --git a/tde-i18n-th/messages/tdepim/karm.po b/tde-i18n-th/messages/tdepim/karm.po
index 27f9b137e7e..21f070dbc14 100644
--- a/tde-i18n-th/messages/tdepim/karm.po
+++ b/tde-i18n-th/messages/tdepim/karm.po
@@ -5,10 +5,11 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2008-04-21 01:46+0200\n"
+"POT-Creation-Date: 2014-09-29 00:52-0500\n"
 "PO-Revision-Date: 2002-03-20 13:08+0700\n"
 "Last-Translator: Thanomsub Noppaburana <donga_n@yahoo.com>\n"
 "Language-Team: Thai <th@li.org>\n"
+"Language: th\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/tde-i18n-th/messages/tdepim/kcmkontactnt.po b/tde-i18n-th/messages/tdepim/kcmkontactnt.po
index d7a92de89d5..ee120df8280 100644
--- a/tde-i18n-th/messages/tdepim/kcmkontactnt.po
+++ b/tde-i18n-th/messages/tdepim/kcmkontactnt.po
@@ -4,10 +4,11 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: kcmkontactnt\n"
-"POT-Creation-Date: 2006-03-20 03:58+0100\n"
+"POT-Creation-Date: 2014-09-29 00:52-0500\n"
 "PO-Revision-Date: 2005-12-01 16:53+0700\n"
 "Last-Translator: ถนอมทรัพย์ นพบูรณ์ <donga_n@yahoo.com>\n"
 "Language-Team: Thai <th@li.org>\n"
+"Language: th\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/tde-i18n-th/messages/tdepim/kmail.po b/tde-i18n-th/messages/tdepim/kmail.po
index 8f4b242593d..f6fe08ac01e 100644
--- a/tde-i18n-th/messages/tdepim/kmail.po
+++ b/tde-i18n-th/messages/tdepim/kmail.po
@@ -7,10 +7,11 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: kmail\n"
-"POT-Creation-Date: 2008-08-19 01:18+0200\n"
+"POT-Creation-Date: 2014-09-29 00:52-0500\n"
 "PO-Revision-Date: 2006-10-17 12:43+1000\n"
 "Last-Translator: Sahachart Anukulkitch <drrider@gmail.com>\n"
 "Language-Team: Thai <l10n@opentle.org>\n"
+"Language: th\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -100,7 +101,7 @@ msgstr "ลงบันทึกเวลาสำหรับจดหมาย
 msgid "multiple encryption keys per address"
 msgstr "ใช้กุญแจเข้ารหัสหลายดอกต่อที่อยู่หนึ่งที่อยู่"
 
-#: aboutdata.cpp:212 kmreaderwin.cpp:1336 kmstartup.cpp:148
+#: aboutdata.cpp:212 kmreaderwin.cpp:1300 kmstartup.cpp:149
 #: mailinglistpropertiesdialog.cpp:97
 msgid "KMail"
 msgstr "จัดการจดหมาย - K"
@@ -144,7 +145,8 @@ msgid "Locking Method"
 msgstr "วิธีการล็อค"
 
 #: accountdialog.cpp:368
-msgid "Procmail loc&kfile:"
+#, fuzzy
+msgid "Procmail loc&tdefile:"
 msgstr "แฟ้มล็อคของ Procmail:"
 
 #: accountdialog.cpp:380
@@ -198,7 +200,7 @@ msgid "Check inter&val:"
 msgstr "ช่วงระยะที่จะเช็ค:"
 
 #: accountdialog.cpp:438 accountdialog.cpp:537 accountdialog.cpp:741
-#: accountdialog.cpp:1059 configuredialog.cpp:2655
+#: accountdialog.cpp:1059 configuredialog.cpp:2733
 msgid " min"
 msgstr " นาที"
 
@@ -232,8 +234,8 @@ msgstr "รวมการตรวจสอบในคู่มือจดห
 msgid "Account Type: POP Account"
 msgstr "ประเภทบัญชีผู้ใช้: POP"
 
-#: accountdialog.cpp:582 accountdialog.cpp:851 configuredialog.cpp:2526
-#: identitydialog.cpp:109 kmfilterdlg.cpp:160 kmtransport.cpp:376
+#: accountdialog.cpp:582 accountdialog.cpp:851 configuredialog.cpp:2550
+#: identitydialog.cpp:112 kmfilterdlg.cpp:164 kmtransport.cpp:376
 msgid "&General"
 msgstr "ตัวเลือกทั่วไป"
 
@@ -330,7 +332,7 @@ msgstr "พิเศษ"
 msgid "Check &What the Server Supports"
 msgstr "ตรวจสอบว่า เซิร์ฟเวอร์สนับสนุนอะไรบ้าง"
 
-#: accountdialog.cpp:782 accountdialog.cpp:1097 kmheaders.cpp:137
+#: accountdialog.cpp:782 accountdialog.cpp:1097 kmheaders.cpp:140
 #: kmtransport.cpp:502
 msgid "Encryption"
 msgstr "การเข้ารหัส"
@@ -455,7 +457,8 @@ msgid "Sho&w hidden folders"
 msgstr "แสดงโฟลเดอร์ที่ซ่อนไว้ด้วย"
 
 #: accountdialog.cpp:987
-msgid "Show only s&ubscribed folders"
+#, fuzzy
+msgid "Show only serverside s&ubscribed folders"
 msgstr "แสดงเฉพาะโฟลเดอร์ที่บอกรับ"
 
 #: accountdialog.cpp:992
@@ -508,9 +511,9 @@ msgstr "การกรอง"
 msgid "<none>"
 msgstr "<ไม่มี>"
 
-#: accountdialog.cpp:1421 accountdialog.cpp:1428 kmfoldercachedimap.cpp:244
-#: kmfoldercachedimap.cpp:2085 kmfolderimap.cpp:204 kmfolderimap.cpp:907
-#: kmkernel.cpp:1374 subscriptiondialog.cpp:172
+#: accountdialog.cpp:1421 accountdialog.cpp:1428 kmfoldercachedimap.cpp:258
+#: kmfoldercachedimap.cpp:2255 kmfolderimap.cpp:200 kmfolderimap.cpp:901
+#: kmkernel.cpp:1424 subscriptiondialog.cpp:172
 msgid "inbox"
 msgstr "จดหมายเข้า"
 
@@ -577,7 +580,7 @@ msgid ""
 "the possibility to turn filtering messages on the server on."
 msgstr ""
 
-#: accountdialog.cpp:1734 vacationdialog.cpp:163
+#: accountdialog.cpp:1734 vacationdialog.cpp:76 vacationdialog.cpp:165
 msgid ""
 "_n:  day\n"
 " days"
@@ -619,12 +622,12 @@ msgstr "เทถังขยะทิ้ง"
 msgid "Edit Namespace '%1'"
 msgstr "แทนที่"
 
-#: accountmanager.cpp:101
+#: accountmanager.cpp:103
 #, c-format
 msgid "Account %1"
 msgstr "บัญชีผู้ใช้ %1"
 
-#: accountmanager.cpp:181
+#: accountmanager.cpp:183
 #, fuzzy
 msgid ""
 "Account %1 has no mailbox defined:\n"
@@ -635,24 +638,24 @@ msgstr ""
 "ยกเลิกการตรวจจดหมาย\n"
 "และโปรดตรวจสอบการตั้งค่าบัญชีผู้ใช้นี้ !"
 
-#: accountmanager.cpp:196
+#: accountmanager.cpp:226
 msgid "Checking account %1 for new mail"
 msgstr "กำลังตรวจจดหมายใหม่ของบัญชีผู้ใช้ %1"
 
-#: accountmanager.cpp:214 accountmanager.cpp:217 accountwizard.cpp:441
+#: accountmanager.cpp:244 accountmanager.cpp:247 accountwizard.cpp:441
 #: accountwizard.cpp:477
 msgid "Local Account"
 msgstr "บัญชีผู้ใช้ภายใน"
 
-#: accountmanager.cpp:220
+#: accountmanager.cpp:250
 msgid "POP Account"
 msgstr "บัญชีผู้ใช้ POP"
 
-#: accountmanager.cpp:223 accountmanager.cpp:225
+#: accountmanager.cpp:253 accountmanager.cpp:255
 msgid "IMAP Account"
 msgstr "บัญชีผู้ใช้ IMAP"
 
-#: accountmanager.cpp:308
+#: accountmanager.cpp:343
 msgid ""
 "You need to add an account in the network section of the settings in order to "
 "receive mail."
@@ -761,13 +764,13 @@ msgstr ""
 msgid "Server Information"
 msgstr "ข้อมูลของเซิร์ฟเวอร์"
 
-#. i18n: file customtemplates_base.ui line 248
-#: accountwizard.cpp:329 rc.cpp:212
+#. i18n: file customtemplates_base.ui line 302
+#: accountwizard.cpp:329 rc.cpp:221
 #, fuzzy, no-c-format
 msgid "None"
 msgstr "ไม่มี"
 
-#: accountwizard.cpp:384 configuredialog.cpp:792
+#: accountwizard.cpp:384 configuredialog.cpp:794
 msgid "Sendmail"
 msgstr "Sendmail"
 
@@ -775,13 +778,13 @@ msgstr "Sendmail"
 msgid "Check for supported security capabilities of %1..."
 msgstr ""
 
-#: actionscheduler.cpp:598 kmfiltermgr.cpp:152 kmfiltermgr.cpp:255
-#: kmfiltermgr.cpp:293
+#: actionscheduler.cpp:598 kmfiltermgr.cpp:150 kmfiltermgr.cpp:253
+#: kmfiltermgr.cpp:291
 msgid "<b>Evaluating filter rules:</b> "
 msgstr ""
 
-#: actionscheduler.cpp:605 kmfiltermgr.cpp:159 kmfiltermgr.cpp:262
-#: kmfiltermgr.cpp:299
+#: actionscheduler.cpp:605 kmfiltermgr.cpp:157 kmfiltermgr.cpp:260
+#: kmfiltermgr.cpp:297
 msgid "<b>Filter rules have matched.</b>"
 msgstr ""
 
@@ -790,114 +793,114 @@ msgstr ""
 msgid "<b>Applying filter action:</b> %1"
 msgstr ""
 
-#: antispamwizard.cpp:101
+#: antispamwizard.cpp:100
 msgid "Anti-Spam Wizard"
 msgstr ""
 
-#: antispamwizard.cpp:102
+#: antispamwizard.cpp:101
 msgid "Anti-Virus Wizard"
 msgstr ""
 
-#: antispamwizard.cpp:106
+#: antispamwizard.cpp:105
 msgid "Welcome to the KMail Anti-Spam Wizard"
 msgstr ""
 
-#: antispamwizard.cpp:107
+#: antispamwizard.cpp:106
 msgid "Welcome to the KMail Anti-Virus Wizard"
 msgstr ""
 
-#: antispamwizard.cpp:113
+#: antispamwizard.cpp:112
 msgid "Options to fine-tune the handling of spam messages"
 msgstr ""
 
-#: antispamwizard.cpp:119
+#: antispamwizard.cpp:118
 msgid "Options to fine-tune the handling of virus messages"
 msgstr ""
 
-#: antispamwizard.cpp:131
+#: antispamwizard.cpp:130
 msgid "Summary of changes to be made by this wizard"
 msgstr ""
 
-#: antispamwizard.cpp:200
+#: antispamwizard.cpp:199
 msgid "Virus handling"
 msgstr ""
 
-#: antispamwizard.cpp:284 antispamwizard.cpp:286 antispamwizard.cpp:572
+#: antispamwizard.cpp:283 antispamwizard.cpp:285 antispamwizard.cpp:577
 msgid "Spam handling"
 msgstr ""
 
-#: antispamwizard.cpp:325 antispamwizard.cpp:327 antispamwizard.cpp:585
+#: antispamwizard.cpp:324 antispamwizard.cpp:326 antispamwizard.cpp:590
 msgid "Semi spam (unsure) handling"
 msgstr ""
 
-#: antispamwizard.cpp:387 antispamwizard.cpp:389 antispamwizard.cpp:593
+#: antispamwizard.cpp:386 antispamwizard.cpp:388 antispamwizard.cpp:598
 msgid "Classify as spam"
 msgstr ""
 
-#: antispamwizard.cpp:419 antispamwizard.cpp:421 antispamwizard.cpp:595
+#: antispamwizard.cpp:418 antispamwizard.cpp:420 antispamwizard.cpp:600
 msgid "Classify as NOT spam"
 msgstr ""
 
-#: antispamwizard.cpp:493
+#: antispamwizard.cpp:498
 #, fuzzy
 msgid "Scanning for %1..."
 msgstr "ไม่สามารถเปิดโฟลเดอร์ %1 ได้"
 
-#: antispamwizard.cpp:524
+#: antispamwizard.cpp:529
 msgid "Scanning for anti-spam tools finished."
 msgstr ""
 
-#: antispamwizard.cpp:525
+#: antispamwizard.cpp:530
 msgid "Scanning for anti-virus tools finished."
 msgstr ""
 
-#: antispamwizard.cpp:528
+#: antispamwizard.cpp:533
 msgid ""
 "<p>No spam detection tools have been found. Install your spam detection "
 "software and re-run this wizard.</p>"
 msgstr ""
 
-#: antispamwizard.cpp:531
+#: antispamwizard.cpp:536
 msgid "Scanning complete. No anti-virus tools found."
 msgstr ""
 
-#: antispamwizard.cpp:555
+#: antispamwizard.cpp:560
 #, fuzzy
 msgid "<p>Messages classified as spam are marked as read."
 msgstr "ตั้งค่าจดหมายทั้งหมดในเธรดที่เลือกว่าเป็นจดหมายที่อ่านแล้ว"
 
-#: antispamwizard.cpp:557
+#: antispamwizard.cpp:562
 #, fuzzy
 msgid "<p>Messages classified as spam are not marked as read."
 msgstr "ตั้งค่าจดหมายทั้งหมดในเธรดที่เลือกว่าเป็นจดหมายที่อ่านแล้ว"
 
-#: antispamwizard.cpp:560
+#: antispamwizard.cpp:565
 msgid "<br>Spam messages are moved into the folder named <i>"
 msgstr ""
 
-#: antispamwizard.cpp:563
+#: antispamwizard.cpp:568
 msgid "<br>Spam messages are not moved into a certain folder.</p>"
 msgstr ""
 
-#: antispamwizard.cpp:587
+#: antispamwizard.cpp:592
 msgid "<p>The folder for messages classified as unsure (probably spam) is <i>"
 msgstr ""
 
-#: antispamwizard.cpp:600
+#: antispamwizard.cpp:605
 msgid "<p>The wizard will create the following filters:<ul>"
 msgstr ""
 
-#: antispamwizard.cpp:603
+#: antispamwizard.cpp:608
 msgid "<p>The wizard will replace the following filters:<ul>"
 msgstr ""
 
-#: antispamwizard.cpp:860
+#: antispamwizard.cpp:864
 msgid ""
 "The wizard will search for any tools to do spam detection\n"
 "and setup KMail to work with them."
 msgstr ""
 
-#: antispamwizard.cpp:864
+#: 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>"
@@ -912,37 +915,37 @@ msgid ""
 "former behavior."
 msgstr ""
 
-#: antispamwizard.cpp:915
+#: antispamwizard.cpp:919
 msgid ""
 "<p>Please select the tools to be used for the detection and go to the next "
 "page.</p>"
 msgstr ""
 
-#: antispamwizard.cpp:941
+#: antispamwizard.cpp:945
 #, fuzzy
 msgid "&Mark detected spam messages as read"
 msgstr "ตั้งค่าฉบับที่เลือกเป็นจดหมายที่อ่านแล้ว"
 
-#: antispamwizard.cpp:943
+#: antispamwizard.cpp:947
 #, fuzzy
 msgid "Mark messages which have been classified as spam as read."
 msgstr "ตั้งค่าจดหมายทั้งหมดในเธรดที่เลือกว่าเป็นจดหมายที่อ่านแล้ว"
 
-#: antispamwizard.cpp:946
+#: antispamwizard.cpp:950
 msgid "Move &known spam to:"
 msgstr ""
 
-#: antispamwizard.cpp:948
+#: antispamwizard.cpp:952
 msgid ""
 "The default folder for spam messages is the trash folder, but you may change "
 "that in the folder view below."
 msgstr ""
 
-#: antispamwizard.cpp:962
+#: antispamwizard.cpp:966
 msgid "Move &probable spam to:"
 msgstr ""
 
-#: antispamwizard.cpp:964
+#: antispamwizard.cpp:968
 msgid ""
 "The default folder is the inbox folder, but you may change that in the folder "
 "view below."
@@ -950,11 +953,11 @@ msgid ""
 "capable tool, you can't select a folder as well."
 msgstr ""
 
-#: antispamwizard.cpp:1064
+#: antispamwizard.cpp:1068
 msgid "Check messages using the anti-virus tools"
 msgstr ""
 
-#: antispamwizard.cpp:1066
+#: antispamwizard.cpp:1070
 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 "
@@ -962,30 +965,184 @@ msgid ""
 "special folder."
 msgstr ""
 
-#: antispamwizard.cpp:1072
+#: antispamwizard.cpp:1076
 #, fuzzy
 msgid "Move detected viral messages to the selected folder"
 msgstr "ทิ้งจดหมายทั้งหมดลงถังขยะ"
 
-#: antispamwizard.cpp:1074
+#: antispamwizard.cpp:1078
 msgid ""
 "A filter to detect messages classified as virus-infected and to move those "
 "messages into a predefined folder is created. The default folder is the trash "
 "folder, but you may change that in the folder view."
 msgstr ""
 
-#: antispamwizard.cpp:1080
+#: antispamwizard.cpp:1084
 #, fuzzy
 msgid "Additionally, mark detected viral messages as read"
 msgstr "ตั้งค่าฉบับที่เลือกเป็นจดหมายที่อ่านแล้ว"
 
-#: antispamwizard.cpp:1083
+#: antispamwizard.cpp:1087
 msgid ""
 "Mark messages which have been classified as virus-infected as read, as well as "
 "moving them to the selected folder."
 msgstr ""
 
-#: cachedimapjob.cpp:220 cachedimapjob.cpp:271 cachedimapjob.cpp:825
+#: archivefolderdialog.cpp:48
+msgid ""
+"_: Start of the filename for a mail archive file\n"
+"Archive"
+msgstr ""
+
+#: archivefolderdialog.cpp:53
+#, fuzzy
+msgid "Archive Folder"
+msgstr "สร้างโฟลเดอร์ใหม่..."
+
+#: archivefolderdialog.cpp:70 importarchivedialog.cpp:54
+#, fuzzy
+msgid "&Folder:"
+msgstr "โฟลเดอร์"
+
+#: archivefolderdialog.cpp:80
+#, fuzzy
+msgid "F&ormat:"
+msgstr "ธรรมดา:"
+
+#: archivefolderdialog.cpp:86
+msgid "Compressed Zip Archive (.zip)"
+msgstr ""
+
+#: archivefolderdialog.cpp:87
+msgid "Uncompressed Archive (.tar)"
+msgstr ""
+
+#: archivefolderdialog.cpp:88
+msgid "BZ2-Compressed Tar Archive (.tar.bz2)"
+msgstr ""
+
+#: archivefolderdialog.cpp:89
+msgid "GZ-Compressed Tar Archive (.tar.gz)"
+msgstr ""
+
+#: archivefolderdialog.cpp:96 importarchivedialog.cpp:61
+#, fuzzy
+msgid "&Archive File:"
+msgstr "แนบแฟ้ม"
+
+#: archivefolderdialog.cpp:111
+#, fuzzy
+msgid "&Delete folders after completion"
+msgstr "กำลังลบโฟลเดอร์ออกจากเซิร์ฟเวอร์"
+
+#: archivefolderdialog.cpp:161
+#, fuzzy
+msgid "Please select the folder that should be archived."
+msgstr "เลือกกุญแจสาธารณะที่จะแนบเข้าไปด้วย"
+
+#: archivefolderdialog.cpp:162
+#, fuzzy
+msgid "No folder selected"
+msgstr "ยังไม่มีการเลือกโฟลเดอร์"
+
+#: backupjob.cpp:123 importjob.cpp:89
+msgid "The operation was canceled by the user."
+msgstr ""
+
+#: backupjob.cpp:151
+#, fuzzy
+msgid "Failed to archive the folder '%1'."
+msgstr "ล้มเหลวในการสร้างโฟลเดอร์"
+
+#: backupjob.cpp:153
+#, fuzzy
+msgid "Archiving failed."
+msgstr "การรับส่งข้อมูลล้มเหลว"
+
+#: backupjob.cpp:163
+msgid "Unable to finalize the archive file."
+msgstr ""
+
+#: backupjob.cpp:168
+msgid "Archiving finished"
+msgstr ""
+
+#: backupjob.cpp:173
+msgid ""
+"Archiving folder '%1' successfully completed. The archive was written to the "
+"file '%2'."
+msgstr ""
+
+#: backupjob.cpp:177
+#, fuzzy
+msgid ""
+"_n: 1 message of size %1 was archived.\n"
+"%n messages with the total size of %1 were archived."
+msgstr "ประมวลผลแล้ว %n ฉบับ"
+
+#: backupjob.cpp:179
+#, c-format
+msgid "The archive file has a size of %1."
+msgstr ""
+
+#: backupjob.cpp:181
+msgid "Archiving finished."
+msgstr ""
+
+#: backupjob.cpp:216 backupjob.cpp:226
+#, fuzzy
+msgid "Unable to retrieve a message for folder '%1'."
+msgstr "ไม่สามารถเพิ่มจดหมายไปยังโฟลเดอร์: "
+
+#: backupjob.cpp:251
+#, fuzzy
+msgid "Internal error while trying to retrieve a message from folder '%1'."
+msgstr "มีข้อผิดพลาดขณะเขียนไปยังโฟลเดอร์ %1"
+
+#: backupjob.cpp:321
+#, fuzzy
+msgid "Failed to write a message into the archive folder '%1'."
+msgstr "ทิ้งจดหมายทั้งหมดลงถังขยะ"
+
+#: backupjob.cpp:360
+#, fuzzy
+msgid "Downloading a message in folder '%1' failed."
+msgstr "การอัพโหลดข้อมูลจดหมายล้มเหลว"
+
+#: backupjob.cpp:362
+#, fuzzy
+msgid "Downloading a message in the current folder failed."
+msgstr "ย่อเก็บเธรดทั้งหมดในโฟลเดอร์ปัจจุบัน"
+
+#: backupjob.cpp:391
+#, fuzzy, c-format
+msgid "Archiving folder %1"
+msgstr "กำลังรับข้อมูลโฟลเดอร์"
+
+#: backupjob.cpp:393 importjob.cpp:210
+#, fuzzy
+msgid "Unable to open folder '%1'."
+msgstr "ไม่รู้จักโฟลเดอร์ '%1'"
+
+#: backupjob.cpp:413
+msgid "Unable to create folder structure for folder '%1' within archive file."
+msgstr ""
+
+#: backupjob.cpp:425
+msgid "Unable to backup messages in folder '%1', the index file is corrupted."
+msgstr ""
+
+#: backupjob.cpp:483
+#, fuzzy
+msgid "Unable to open archive for writing."
+msgstr "ไม่สามารถตรวจสอบได้: ไม่พบกุญแจ"
+
+#: backupjob.cpp:489
+#, fuzzy
+msgid "Archiving"
+msgstr "การรับจดหมาย"
+
+#: cachedimapjob.cpp:220 cachedimapjob.cpp:271 cachedimapjob.cpp:886
 msgid "Error while deleting messages on the server: "
 msgstr "เกิดข้อผิดพลาดระหว่างลบจดหมายบนเซิร์ฟเวอร์: "
 
@@ -993,50 +1150,99 @@ msgstr "เกิดข้อผิดพลาดระหว่างลบจ
 msgid "Error while retrieving message on the server: "
 msgstr "เกิดข้อผิดพลาดระหว่างรับข้อมูลจดหมายบนเซิร์ฟเวอร์: "
 
-#: cachedimapjob.cpp:538
+#: cachedimapjob.cpp:541
 #, fuzzy
 msgid "Error while uploading folder"
 msgstr ""
 "มีข้อผิดพลาด ขณะอ่านแฟ้ม:\n"
 "%1"
 
-#: cachedimapjob.cpp:539
+#: cachedimapjob.cpp:542
 msgid "Could not make the folder <b>%1</b> on the server."
 msgstr "ไม่สามารถสร้างโฟลเดอร์ <b>%1</b> บนเซิร์ฟเวอร์ได้"
 
-#: cachedimapjob.cpp:540
+#: cachedimapjob.cpp:543
 msgid ""
 "This could be because you do not have permission to do this, or because the "
 "folder is already present on the server; the error message from the server "
 "communication is here:"
 msgstr ""
 
-#: cachedimapjob.cpp:626
+#: cachedimapjob.cpp:629
 msgid "Error while deleting folder %1 on the server: "
 msgstr "มีข้อผิดพลาดขณะลบโฟลเดอร์ %1 บนเซิร์ฟเวอร์:"
 
-#: cachedimapjob.cpp:679
+#: cachedimapjob.cpp:682
 msgid "Error while reading folder %1 on the server: "
 msgstr "มีข้อผิดพลาด ขณะอ่านโฟลเดอร์ %1 บนเซิร์ฟเวอร์:"
 
-#: cachedimapjob.cpp:794
+#: 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"
+"You can try to manually subscribe to the folder yourself.\n"
+"\n"
+"%2"
+msgstr ""
+
+#: cachedimapjob.cpp:857
 #, c-format
 msgid "Error while trying to rename folder %1"
 msgstr "มีข้อผิดพลาดขณะเขียนไปยังโฟลเดอร์ %1"
 
-#: callback.cpp:170
+#: callback.cpp:71
+msgid ""
+"<qt>The receiver of this invitation doesn't match any of your identities."
+"<br>Please select the transport which should be used to send your reply.</qt>"
+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>"
+msgstr ""
+
+#: callback.cpp:78
+#, fuzzy
+msgid "Select Transport"
+msgstr "ตั้งค่าการรับส่งข้อมูลไปยัง"
+
+#: callback.cpp:97
+#, fuzzy, c-format
+msgid "Declined: %1"
+msgstr " บรรทัด: %1 "
+
+#: callback.cpp:99
+#, c-format
+msgid "Tentative: %1"
+msgstr ""
+
+#: callback.cpp:101
+#, fuzzy, c-format
+msgid "Accepted: %1"
+msgstr "สิ่งที่แนบมาด้วย: "
+
+#: callback.cpp:103
+#, fuzzy, c-format
+msgid "Delegated: %1"
+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:"
+"<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:176
+#: callback.cpp:222
 msgid ""
 "<qt>Several of your identities match the receiver of this message,"
 "<br>please choose which of the following addresses is yours:"
 msgstr ""
 
-#: callback.cpp:183
+#: callback.cpp:233
 #, fuzzy
 msgid "Select Address"
 msgstr "เลือกที่อยู่อีเมล์"
@@ -1062,153 +1268,153 @@ msgstr "ทำโฟลเดอร์ \"%1\" ให้กระทัดรั�
 msgid "Error occurred while compacting \"%1\". Compaction aborted."
 msgstr ""
 
-#: configuredialog.cpp:155
+#: configuredialog.cpp:156
 msgid ""
 "<qt>"
 "<p>This setting has been fixed by your administrator.</p>"
 "<p>If you think this is an error, please contact him.</p></qt>"
 msgstr ""
 
-#: configuredialog.cpp:217
+#: configuredialog.cpp:218
 msgid "&Load Profile..."
 msgstr "โหลดโปรไฟล์..."
 
-#: configuredialog.cpp:305 simplestringlisteditor.cpp:85
+#: configuredialog.cpp:308 simplestringlisteditor.cpp:85
 msgid "&Add..."
 msgstr "เพิ่ม..."
 
-#: configuredialog.cpp:306 configuredialog.cpp:625 configuredialog.cpp:1096
-#: configuredialog.cpp:3165 simplestringlisteditor.cpp:108
+#: configuredialog.cpp:309 configuredialog.cpp:628 configuredialog.cpp:1102
+#: configuredialog.cpp:3278 simplestringlisteditor.cpp:108
 msgid "&Modify..."
 msgstr "แก้ไข..."
 
-#: configuredialog.cpp:307
+#: configuredialog.cpp:310
 msgid "&Rename"
 msgstr "เปลี่ยนชื่อ"
 
-#: configuredialog.cpp:308 configuredialog.cpp:3115 configuredialog.cpp:3164
+#: configuredialog.cpp:311 configuredialog.cpp:3228 configuredialog.cpp:3277
 msgid "Remo&ve"
 msgstr "ลบ"
 
-#: configuredialog.cpp:309
+#: configuredialog.cpp:312
 msgid "Set as &Default"
 msgstr "ตั้งเป็นค่าปริยาย"
 
-#: configuredialog.cpp:450
+#: configuredialog.cpp:453
 msgid "<qt>Do you really want to remove the identity named <b>%1</b>?</qt>"
 msgstr "<qt>คุณต้องการลบรายการแสดงตัว <b>%1</b> นี้ จริงหรือไม่ ?</qt>"
 
-#: configuredialog.cpp:452
+#: configuredialog.cpp:455
 msgid "Remove Identity"
 msgstr "ลบการแสดงตัว"
 
-#: configuredialog.cpp:493 configuredialog.cpp:3114
+#: configuredialog.cpp:496 configuredialog.cpp:3227
 msgid "Add..."
 msgstr "เพิ่ม..."
 
-#: configuredialog.cpp:495 configuredialog.cpp:3116
+#: configuredialog.cpp:498 configuredialog.cpp:3229
 msgid "Modify..."
 msgstr "แก้ไข..."
 
-#: configuredialog.cpp:499
+#: configuredialog.cpp:502
 msgid "Set as Default"
 msgstr "ตั้งเป็นค่าปริยาย"
 
-#: configuredialog.cpp:562
+#: configuredialog.cpp:565
 msgid "&Receiving"
 msgstr "การรับจดหมาย"
 
-#: configuredialog.cpp:570
+#: configuredialog.cpp:573
 msgid "&Sending"
 msgstr "การส่งจดหมาย"
 
-#: configuredialog.cpp:595
+#: configuredialog.cpp:598
 msgid "Outgoing accounts (add at least one):"
 msgstr "บัญชีผู้ใช้สำหรับส่งจดหมาย (ต้องมีอย่างน้อยหนึ่งตัว):"
 
-#. i18n: file customtemplates_base.ui line 99
-#: configuredialog.cpp:604 configuredialog.cpp:1074 configuredialog.cpp:3290
-#: distributionlistdialog.cpp:115 favoritefolderview.cpp:378
-#: kmcomposewin.cpp:366 rc.cpp:191 recipientspicker.cpp:389
+#. 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
 #, no-c-format
 msgid "Name"
 msgstr "ชื่อ"
 
-#. i18n: file customtemplates_base.ui line 88
-#: configuredialog.cpp:605 configuredialog.cpp:1075 kmcomposewin.cpp:369
-#: kmfilterdlg.cpp:214 kmmimeparttree.cpp:65 rc.cpp:188
+#. 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
 #, no-c-format
 msgid "Type"
 msgstr "ประเภท"
 
-#: configuredialog.cpp:618 configuredialog.cpp:1089 configuredialog.cpp:2836
-#: configuredialog.cpp:3087 configuredialog.cpp:3164 configuredialog.cpp:3498
+#: configuredialog.cpp:621 configuredialog.cpp:1095 configuredialog.cpp:2949
+#: configuredialog.cpp:3200 configuredialog.cpp:3277 configuredialog.cpp:3611
 msgid "A&dd..."
 msgstr "เพิ่ม..."
 
-#: configuredialog.cpp:633 configuredialog.cpp:1104
+#: configuredialog.cpp:636 configuredialog.cpp:1110
 msgid "R&emove"
 msgstr "ลบ"
 
-#: configuredialog.cpp:640
+#: configuredialog.cpp:643
 msgid "Set Default"
 msgstr "ตั้งเป็นค่าปริยาย"
 
-#: configuredialog.cpp:650
+#: configuredialog.cpp:653
 msgid "Common Options"
 msgstr "ตัวเลือกทั่วไป"
 
-#. i18n: file kmail.kcfg line 382
-#: configuredialog.cpp:658 rc.cpp:788
+#. i18n: file kmail.kcfg line 412
+#: configuredialog.cpp:661 rc.cpp:813
 #, no-c-format
 msgid "Confirm &before send"
 msgstr "ถามยืนยันก่อนทำการส่ง"
 
-#: configuredialog.cpp:666
+#: configuredialog.cpp:669
 msgid "Never Automatically"
 msgstr "ไม่ต้องทำอัตโนมัติ"
 
-#: configuredialog.cpp:667
+#: configuredialog.cpp:670
 msgid "On Manual Mail Checks"
 msgstr "เมื่อตรวจสอบจดหมายด้วยตนเอง"
 
-#: configuredialog.cpp:668
+#: configuredialog.cpp:671
 msgid "On All Mail Checks"
 msgstr "เมื่อตรวจสอบจดหมายทั้งหมด"
 
-#: configuredialog.cpp:676
+#: configuredialog.cpp:679
 msgid "Send Now"
 msgstr "ส่งเดี๋ยวนี้"
 
-#: configuredialog.cpp:677
+#: configuredialog.cpp:680
 msgid "Send Later"
 msgstr "ส่งภายหลัง"
 
-#: configuredialog.cpp:687
+#: configuredialog.cpp:690
 msgid "Allow 8-bit"
 msgstr "อนุญาตให้ใช้รหัส 8 บิต"
 
-#: configuredialog.cpp:688
+#: configuredialog.cpp:691
 msgid "MIME Compliant (Quoted Printable)"
 msgstr "ตามชนิดแฟ้ม MIME (เหมาะกับการพิมพ์)"
 
-#: configuredialog.cpp:701
+#: configuredialog.cpp:704
 msgid "Send &messages in outbox folder:"
 msgstr "ส่งจดหมายที่ค้างอยู่ในกล่องจดหมายออก:"
 
-#: configuredialog.cpp:709
+#: configuredialog.cpp:712
 msgid "Defa&ult send method:"
 msgstr "วิธีการส่งโดยปริยาย:"
 
-#: configuredialog.cpp:711
+#: configuredialog.cpp:714
 msgid "Message &property:"
 msgstr "คุณสมบัติจดหมาย:"
 
-#: configuredialog.cpp:713
+#: configuredialog.cpp:716
 msgid "Defaul&t domain:"
 msgstr "โดเมนปริยาย:"
 
-#: configuredialog.cpp:717
+#: configuredialog.cpp:720
 msgid ""
 "<qt>"
 "<p>The default domain is used to complete email addresses that only consist of "
@@ -1218,25 +1424,25 @@ msgstr ""
 "<p>โดเมนปริยายจะใช้สำหรับการเติมที่อยู่อีเมลให้สมบูรณ์โดยจะใช้ประกอบกับชื่อผู้ใช"
 "้</p></qt>"
 
-#: configuredialog.cpp:741
+#: configuredialog.cpp:744
 msgid ""
 "_: %1: name; %2: number appended to it to make it unique among a list of names\n"
 "%1 %2"
 msgstr "%1 %2"
 
-#: configuredialog.cpp:766 configuredialog.cpp:943 configuredialog.cpp:991
+#: configuredialog.cpp:769 configuredialog.cpp:950 configuredialog.cpp:997
 msgid "smtp (Default)"
 msgstr "smtp (ค่าปริยาย)"
 
-#: configuredialog.cpp:768 configuredialog.cpp:945 configuredialog.cpp:993
+#: configuredialog.cpp:771 configuredialog.cpp:952 configuredialog.cpp:999
 msgid "sendmail (Default)"
 msgstr "sendmail (ค่าปริยาย)"
 
-#: configuredialog.cpp:799 kmtransport.cpp:248
+#: configuredialog.cpp:801 kmtransport.cpp:248
 msgid "Add Transport"
 msgstr "เพิ่มการรับส่งจดหมาย"
 
-#: configuredialog.cpp:830
+#: 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 "
@@ -1244,387 +1450,378 @@ msgid ""
 "%1 (Default)"
 msgstr "%1 (ค่าปริยาย)"
 
-#: configuredialog.cpp:854
+#: configuredialog.cpp:856
 msgid "Modify Transport"
 msgstr "แก้ไขการรับส่งจดหมาย"
 
-#: configuredialog.cpp:890
+#: configuredialog.cpp:892
 #, c-format
 msgid ""
 "_n: This identity has been changed to use the modified transport:\n"
 "These %n identities have been changed to use the modified transport:"
 msgstr ""
 
-#: configuredialog.cpp:921
+#: configuredialog.cpp:927
 #, c-format
 msgid ""
 "_n: This identity has been changed to use the default transport:\n"
 "These %n identities have been changed to use the default transport:"
 msgstr ""
 
-#: configuredialog.cpp:1066
+#: configuredialog.cpp:1072
 msgid "Incoming accounts (add at least one):"
 msgstr "บัญชีผู้ใช้สำหรับรับจดหมาย (ต้องมีอย่างน้อยหนึ่งตัว):"
 
-#: configuredialog.cpp:1076 kmfolderseldlg.cpp:95 kmfoldertree.cpp:376
-#: searchwindow.cpp:230
+#: configuredialog.cpp:1082 kmfoldertree.cpp:397 searchwindow.cpp:229
+#: simplefoldertree.h:141
 msgid "Folder"
 msgstr "โฟลเดอร์"
 
-#: configuredialog.cpp:1112
+#: configuredialog.cpp:1118
 msgid "Chec&k mail on startup"
 msgstr "ตรวจจดหมายเมื่อเริ่มการทำงาน"
 
-#: configuredialog.cpp:1118
+#: configuredialog.cpp:1124
 msgid "New Mail Notification"
 msgstr "การแจ้งเตือนเมื่อมีจดหมายใหม่"
 
-#: configuredialog.cpp:1123
+#: configuredialog.cpp:1129
 msgid "&Beep"
 msgstr "ออด"
 
-#: configuredialog.cpp:1131
+#: configuredialog.cpp:1137
 msgid "Deta&iled new mail notification"
 msgstr "รายละเอียดการแจ้งเตือนเมื่อมีจดหมายใหม่"
 
-#: configuredialog.cpp:1135
+#: configuredialog.cpp:1141
 msgid "Show for each folder the number of newly arrived messages"
 msgstr "แสดงจำนวนของจดหมายใหม่ที่ได้รับสำหรับแต่ละโฟลเดอร์"
 
-#: configuredialog.cpp:1143
+#: configuredialog.cpp:1149
 msgid "Other Actio&ns"
 msgstr "การกระทำอื่น ๆ"
 
-#: configuredialog.cpp:1221
+#: configuredialog.cpp:1227
 msgid "Unknown account type selected"
 msgstr "ไม่รู้จักประเภทบัญชีผู้ใช้ที่เลือกไว้"
 
-#: configuredialog.cpp:1230
+#: configuredialog.cpp:1236
 msgid "Unable to create account"
 msgstr "ไม่สามารถสร้างบัญชีผู้ใช้ได้"
 
-#: configuredialog.cpp:1236 kmacctseldlg.cpp:36
+#: configuredialog.cpp:1242 kmacctseldlg.cpp:36
 msgid "Add Account"
 msgstr "เพิ่มบัญชีผู้ใช้"
 
-#: configuredialog.cpp:1288
+#: configuredialog.cpp:1294
 msgid "Unable to locate account"
 msgstr "ไม่สามารถหาตำแหน่งของบัญชีผู้ใช้ได้"
 
-#: configuredialog.cpp:1315
+#: configuredialog.cpp:1321
 msgid "Modify Account"
 msgstr "แก้ไขบัญชีผู้ใช้"
 
-#: configuredialog.cpp:1360 configuredialog.cpp:1440
+#: configuredialog.cpp:1366 configuredialog.cpp:1446
 msgid "<qt>Unable to locate account <b>%1</b>.</qt>"
 msgstr "<qt>ไม่สามารถหาตำแหน่งของบัญชีผู้ใช้ <b>%1</b> ได้</qt>"
 
-#: configuredialog.cpp:1491
+#: configuredialog.cpp:1497
 msgid "Color&s"
 msgstr "สี"
 
-#: configuredialog.cpp:1497
+#: configuredialog.cpp:1503
 msgid "La&yout"
 msgstr "รูปแบบการจัดวาง"
 
-#: configuredialog.cpp:1503
+#: configuredialog.cpp:1509
 msgid "M&essage List"
 msgstr "รายการจดหมาย"
 
-#: configuredialog.cpp:1509
+#: configuredialog.cpp:1515
 msgid "Message W&indow"
 msgstr "หน้าต่างจดหมาย"
 
-#: configuredialog.cpp:1515
+#: configuredialog.cpp:1521
 msgid "System &Tray"
 msgstr "ถาดระบบ"
 
-#: configuredialog.cpp:1531
+#: configuredialog.cpp:1537
 msgid "Message Body"
 msgstr "เนื้อความจดหมาย"
 
-#: configuredialog.cpp:1532
+#: configuredialog.cpp:1538
 msgid "Message List"
 msgstr "รายการจดหมาย"
 
-#: configuredialog.cpp:1533
+#: configuredialog.cpp:1539
 msgid "Message List - New Messages"
 msgstr "รายการจดหมาย - จดหมายใหม่"
 
-#: configuredialog.cpp:1534
+#: configuredialog.cpp:1540
 msgid "Message List - Unread Messages"
 msgstr "รายการจดหมาย - จดหมายที่ยังไม่ได้อ่าน"
 
-#: configuredialog.cpp:1535
+#: configuredialog.cpp:1541
 msgid "Message List - Important Messages"
 msgstr "รายการจดหมาย - จดหมายที่ไม่สำคัญ"
 
-#: configuredialog.cpp:1536
+#: configuredialog.cpp:1542
 msgid "Message List - Todo Messages"
 msgstr "รายการจดหมาย - จดหมาย สิ่งที่จะทำ"
 
-#: configuredialog.cpp:1537
+#: configuredialog.cpp:1543
 msgid "Message List - Date Field"
 msgstr "รายการจดหมาย - ช่องวันที่"
 
-#: configuredialog.cpp:1538 configuredialog.cpp:1859
+#: configuredialog.cpp:1544 configuredialog.cpp:1868
 msgid "Folder List"
 msgstr "รายการโฟลเดอร์"
 
-#: configuredialog.cpp:1539 configuredialog.cpp:1702
+#: configuredialog.cpp:1545 configuredialog.cpp:1708
 msgid "Quoted Text - First Level"
 msgstr "ข้อความที่อ้างถึง - ระดับที่หนึ่ง"
 
-#: configuredialog.cpp:1540 configuredialog.cpp:1703
+#: configuredialog.cpp:1546 configuredialog.cpp:1709
 msgid "Quoted Text - Second Level"
 msgstr "ข้อความที่อ้างถึง - ระดับที่สอง"
 
-#: configuredialog.cpp:1541 configuredialog.cpp:1704
+#: configuredialog.cpp:1547 configuredialog.cpp:1710
 msgid "Quoted Text - Third Level"
 msgstr "ข้อความที่อ้างถึง - ระดับที่สาม"
 
-#: configuredialog.cpp:1542
+#: configuredialog.cpp:1548
 msgid "Fixed Width Font"
 msgstr "ตัวอักษรความกว้างคงที่"
 
-#: configuredialog.cpp:1543 kmcomposewin.cpp:356
+#: configuredialog.cpp:1549 kmcomposewin.cpp:386
 msgid "Composer"
 msgstr "เขียนจดหมาย"
 
-#: configuredialog.cpp:1544
+#: configuredialog.cpp:1550
 msgid "Printing Output"
 msgstr "ส่งออกการพิมพ์"
 
-#: configuredialog.cpp:1559
+#: configuredialog.cpp:1565
 msgid "&Use custom fonts"
 msgstr "ใช้แบบอักษรที่กำหนดเอง"
 
-#: configuredialog.cpp:1575
+#: configuredialog.cpp:1581
 msgid "Apply &to:"
 msgstr "ปรับให้มีผลใช้กับ:"
 
-#: configuredialog.cpp:1699
+#: configuredialog.cpp:1705
 msgid "Composer Background"
 msgstr "พื้นหลังส่วนเขียนตัวจดหมาย"
 
-#: configuredialog.cpp:1700
+#: configuredialog.cpp:1706
 msgid "Alternative Background Color"
 msgstr "สีพื้นหลังอื่น ๆ"
 
-#: configuredialog.cpp:1701
+#: configuredialog.cpp:1707
 msgid "Normal Text"
 msgstr "ข้อความธรรมดา"
 
-#: configuredialog.cpp:1705
+#: configuredialog.cpp:1711
 msgid "Link"
 msgstr "ตำแหน่งเชื่อมโยง"
 
-#: configuredialog.cpp:1706
+#: configuredialog.cpp:1712
 msgid "Followed Link"
 msgstr "ตำแหน่งเชื่อมโยงที่เรียกไปแล้ว"
 
-#: configuredialog.cpp:1707
+#: configuredialog.cpp:1713
 msgid "Misspelled Words"
 msgstr "คำที่สะกดผิด"
 
 #. i18n: file templatesconfiguration_base.ui line 71
-#: configuredialog.cpp:1708 rc.cpp:444
+#: configuredialog.cpp:1714 rc.cpp:450
 #, no-c-format
 msgid "New Message"
 msgstr "จดหมายใหม่"
 
-#: configuredialog.cpp:1709
+#: configuredialog.cpp:1715
 msgid "Unread Message"
 msgstr "จดหมายที่ยังไม่ได้อ่าน"
 
-#: configuredialog.cpp:1710
+#: configuredialog.cpp:1716
 msgid "Important Message"
 msgstr "จดหมายที่สำคัญมาก"
 
-#: configuredialog.cpp:1711
+#: configuredialog.cpp:1717
 msgid "Todo Message"
 msgstr "จดหมายสิ่งที่จะทำ"
 
-#: configuredialog.cpp:1712
+#: configuredialog.cpp:1718
 msgid "OpenPGP Message - Encrypted"
 msgstr "จดหมายแบบ OpenPGP - มีการเข้ารหัสไว้"
 
-#: configuredialog.cpp:1713
+#: configuredialog.cpp:1719
 msgid "OpenPGP Message - Valid Signature with Trusted Key"
 msgstr "จดหมายแบบ OpenPGP - ลายเซ็นใช้ได้โดยมีกุญแจที่น่าเชื่อถือ"
 
-#: configuredialog.cpp:1714
+#: configuredialog.cpp:1720
 msgid "OpenPGP Message - Valid Signature with Untrusted Key"
 msgstr "จดหมายแบบ OpenPGP - ลายเซ็นใช้ได้โดยมีกุญแจที่ไม่น่าเชื่อถือ"
 
-#: configuredialog.cpp:1715
+#: configuredialog.cpp:1721
 msgid "OpenPGP Message - Unchecked Signature"
 msgstr "จดหมายแบบ OpenPGP - ยังไม่ได้ตรวจสอบลายเซ็น"
 
-#: configuredialog.cpp:1716
+#: configuredialog.cpp:1722
 msgid "OpenPGP Message - Bad Signature"
 msgstr "จดหมายแบบ OpenPGP - ลายเซ็นใช้ไม่ได้"
 
-#: configuredialog.cpp:1717
+#: configuredialog.cpp:1723
 msgid "Border Around Warning Prepending HTML Messages"
 msgstr "กรอบรอบส่วนแจ้งเตือนเนื้อหาจดหมาย HTML"
 
-#: configuredialog.cpp:1718
+#: configuredialog.cpp:1724
 msgid "Folder Name and Size When Close to Quota"
 msgstr ""
 
-#: configuredialog.cpp:1719
+#: configuredialog.cpp:1725
 msgid "HTML Status Bar Background - No HTML Message"
 msgstr "สีพื้นหลังแถบสถานะ HTML - ไม่ใช่จดหมายแบบ HTML"
 
-#: configuredialog.cpp:1720
+#: configuredialog.cpp:1726
 msgid "HTML Status Bar Foreground - No HTML Message"
 msgstr "สีพื้นหน้าแถบสถานะ HTML - ไม่ใช่จดหมายแบบ HTML"
 
-#: configuredialog.cpp:1721
+#: configuredialog.cpp:1727
 msgid "HTML Status Bar Background - HTML Message"
 msgstr "สีพื้นหลังแถบสถานะ HTML - จดหมายแบบ HTML"
 
-#: configuredialog.cpp:1722
+#: configuredialog.cpp:1728
 msgid "HTML Status Bar Foreground - HTML Message"
 msgstr "สีพื้นหน้าแถบสถานะ HTML - จดหมายแบบ HTML"
 
-#: configuredialog.cpp:1734
+#: configuredialog.cpp:1740
 msgid "&Use custom colors"
 msgstr "ใช้สีที่กำหนดเอง"
 
-#: configuredialog.cpp:1749
+#: configuredialog.cpp:1755
 msgid "Recycle colors on deep &quoting"
 msgstr "วนใช้สีกับข้อความที่อ้างถึงในระดับลึก"
 
-#: configuredialog.cpp:1757
+#: configuredialog.cpp:1763
 msgid "Close to quota threshold"
 msgstr ""
 
-#: configuredialog.cpp:1763
+#: configuredialog.cpp:1770
 #, c-format
 msgid "%"
 msgstr ""
 
-#: configuredialog.cpp:1855
+#: configuredialog.cpp:1864
 msgid "Lon&g folder list"
 msgstr "รายการโฟลเดอร์แบบยาว"
 
-#: configuredialog.cpp:1856
+#: configuredialog.cpp:1865
 msgid "Shor&t folder list"
 msgstr "รายการโฟลเดอร์แบบสั้น"
 
-#: configuredialog.cpp:1865
+#: configuredialog.cpp:1874
 msgid "Abo&ve the message pane"
 msgstr "อยู่เหนือช่องแสดงจดหมาย"
 
-#: configuredialog.cpp:1866
+#: configuredialog.cpp:1875
 msgid "&Below the message pane"
 msgstr "อยู่ใต้ช่องแสดงจดหมาย"
 
-#: configuredialog.cpp:1869
+#: configuredialog.cpp:1878
 msgid "Message Structure Viewer Placement"
 msgstr "การจัดวางตัวแสดงโครงสร้างจดหมาย"
 
-#: configuredialog.cpp:1874
+#: configuredialog.cpp:1883
 msgid "Show &never"
 msgstr "ไม่ต้องแสดงเลย"
 
-#: configuredialog.cpp:1875
+#: configuredialog.cpp:1884
 msgid "Show only for non-plaintext &messages"
 msgstr "แสดงเฉพาะกับจดหมายแบบข้อความธรรมดา"
 
-#: configuredialog.cpp:1876
+#: configuredialog.cpp:1885
 msgid "Show alway&s"
 msgstr "แสดงเสมอ"
 
-#: configuredialog.cpp:1879
+#: configuredialog.cpp:1888
 msgid "Message Structure Viewer"
 msgstr "ตัวแสดงโครงสร้างจดหมาย"
 
-#: configuredialog.cpp:1885
+#: configuredialog.cpp:1894
 msgid "&Do not show a message preview pane"
 msgstr "ไม่ต้องแสดงส่วนแสดงเนื้อหาจดหมาย"
 
-#: configuredialog.cpp:1886
+#: configuredialog.cpp:1895
 msgid "Show the message preview pane belo&w the message list"
 msgstr "แสดงส่วนแสดงเนื้อหาจดหมายใต้รายการจดหมาย"
 
-#: configuredialog.cpp:1887
+#: configuredialog.cpp:1896
 msgid "Show the message preview pane ne&xt to the message list"
 msgstr "แสดงส่วนแสดงเนื้อหาจดหมายถัดจากรายการจดหมาย"
 
-#: configuredialog.cpp:1890
+#: configuredialog.cpp:1899
 msgid "Message Preview Pane"
 msgstr "ส่วนแสดงเนื้อหาจดหมาย"
 
-#: configuredialog.cpp:1908
+#: configuredialog.cpp:1917
 #, fuzzy
 msgid "Show favorite folder view"
 msgstr "รายการโฟลเดอร์แบบสั้น"
 
-#: configuredialog.cpp:1912
-#, fuzzy
-msgid "Show folder quick search field"
-msgstr "แสดงแถบค้นหาด่วน"
-
-#: configuredialog.cpp:1983
+#: configuredialog.cpp:1986
 msgid "Sta&ndard format (%1)"
 msgstr "รูปแบบมาตรฐาน (%1)"
 
-#: configuredialog.cpp:1984
+#: configuredialog.cpp:1987
 msgid "Locali&zed format (%1)"
 msgstr "รูปแบบตามท้องถิ่น (%1)"
 
-#: configuredialog.cpp:1985
+#: configuredialog.cpp:1988
 msgid "Fancy for&mat (%1)"
 msgstr "รูปแบบแฟนซี (%1)"
 
-#: configuredialog.cpp:1986
+#: configuredialog.cpp:1989
 msgid "C&ustom format (Shift+F1 for help):"
 msgstr "รูปแบบกำหนดเอง (กด Shift+F1 เพื่อดูรายละเอียด):"
 
-#: configuredialog.cpp:2003
+#: configuredialog.cpp:2006
 msgid "General Options"
 msgstr "ตัวเลือกทั่วไป"
 
-#: configuredialog.cpp:2006
-msgid "Show Quick Search"
-msgstr "แสดงแถบค้นหาด่วน"
-
-#: configuredialog.cpp:2008
+#: configuredialog.cpp:2009
 msgid "Display messa&ge sizes"
 msgstr "แสดงขนาดจดหมายด้วย"
 
-#: configuredialog.cpp:2010
+#: configuredialog.cpp:2011
 msgid "Show crypto &icons"
 msgstr "แสดงไอคอนสื่อถึงการเข้ารหัส"
 
-#: configuredialog.cpp:2012
+#: configuredialog.cpp:2013
 msgid "Show attachment icon"
 msgstr "แสดงไอคอนสำหรับสิ่งที่แนบมาด้วย"
 
-#: configuredialog.cpp:2015
+#: configuredialog.cpp:2016
 msgid "&Threaded message list"
 msgstr "เธรดรายการจดหมาย"
 
-#: configuredialog.cpp:2033
+#: configuredialog.cpp:2032
 msgid "Threaded Message List Options"
 msgstr "ตัวเลือกการจัดเธรดรายการจดหมาย"
 
-#: configuredialog.cpp:2037
+#: configuredialog.cpp:2036
 msgid "Always &keep threads open"
 msgstr "คงเธรดที่เปิดไว้เสมอ"
 
-#: configuredialog.cpp:2040
+#: configuredialog.cpp:2039
 msgid "Threads default to o&pen"
 msgstr "ให้เปิดแสดงแบบเธรดเป็นค่าปริยาย"
 
-#: configuredialog.cpp:2043
+#: configuredialog.cpp:2042
 msgid "Threads default to closed"
 msgstr "ให้ปิดการแสดงแบบเธรดเป็นค่าปริยาย"
 
-#: configuredialog.cpp:2046
+#: configuredialog.cpp:2045
 msgid ""
 "Open threads that contain ne&w, unread or important messages and open watched "
 "threads."
@@ -1632,11 +1829,11 @@ msgstr ""
 "เปิดเธรดที่มีจดหมายใหม่, จดหมายที่ยังไม่ได้อ่าน หรือจดหมายที่สำคัญมาก "
 "และเปิดเธรดที่ต้องติดตามด้วย"
 
-#: configuredialog.cpp:2056
+#: configuredialog.cpp:2055
 msgid "Date Display"
 msgstr "แสดงวันที่"
 
-#: configuredialog.cpp:2073
+#: configuredialog.cpp:2072
 msgid ""
 "<qt>"
 "<p><strong>These expressions may be used for the date:</strong></p>"
@@ -1669,116 +1866,165 @@ msgid ""
 "<p><strong>All other input characters will be ignored.</strong></p></qt>"
 msgstr ""
 
-#: configuredialog.cpp:2187
+#: configuredialog.cpp:2185
 msgid ""
 "Changing the global threading setting will override all folder specific values."
 msgstr "กำลังเปลี่ยนการตั้งค่าทั่วไปของการทำเธรด ที่จะกำหนดใช้กับทุกโฟลเดอร์"
 
-#: configuredialog.cpp:2224
+#: configuredialog.cpp:2221
+msgid "Close message window after replying or forwarding"
+msgstr ""
+
+#: configuredialog.cpp:2225
 msgid "Show HTML stat&us bar"
 msgstr "แสดงแถบสถานะ HTML"
 
-#: configuredialog.cpp:2228
+#: configuredialog.cpp:2229
 msgid "Show s&pam status in fancy headers"
 msgstr "แสดงสถานะสแปมในส่วนหัวแบบแฟนซี"
 
-#. i18n: file kmail.kcfg line 541
-#: configuredialog.cpp:2232 rc.cpp:856
+#. i18n: file kmail.kcfg line 583
+#: configuredialog.cpp:2233 rc.cpp:890
 #, no-c-format
 msgid "Replace smileys by emoticons"
 msgstr "แทนที่การพิมพ์หน้ายิ้มด้วยไอคอนแสดงอารมณ์"
 
-#: configuredialog.cpp:2236
+#: configuredialog.cpp:2237
 msgid "Use smaller font for quoted text"
 msgstr "ใช้ตัวอักษรที่เล็กลงสำหรับข้อความที่อ้างถึง"
 
-#. i18n: file kmail.kcfg line 546
-#: configuredialog.cpp:2240 rc.cpp:862
+#. i18n: file kmail.kcfg line 588
+#: configuredialog.cpp:2241 rc.cpp:896
 #, no-c-format
 msgid "Show expand/collapse quote marks"
 msgstr "แสดงเครื่องหมายขยาย/ยุบส่วนที่อ้างถึง"
 
-#: configuredialog.cpp:2315
+#: configuredialog.cpp:2245
+msgid "Show current sender time"
+msgstr ""
+
+#: configuredialog.cpp:2262
+msgid ""
+"Close the standalone message window after replying or forwarding the message"
+msgstr ""
+
+#: configuredialog.cpp:2328
 msgid "Fallback ch&aracter encoding:"
 msgstr "ชุดรหัสภาษาสำหรับการใช้งานต่อเนื่อง:"
 
-#: configuredialog.cpp:2325 configuredialog.cpp:2382 kmreaderwin.cpp:650
+#: configuredialog.cpp:2338 configuredialog.cpp:2400 kmreaderwin.cpp:584
 msgid "Auto"
 msgstr "อัตโนมัติ"
 
-#: configuredialog.cpp:2336
+#: configuredialog.cpp:2349
 msgid "&Override character encoding:"
 msgstr "ชุดรหัสภาษาที่บังคับให้ใช้:"
 
-#. i18n: file kmail.kcfg line 103
-#: configuredialog.cpp:2462 rc.cpp:643
+#. i18n: file kmail.kcfg line 105
+#: configuredialog.cpp:2486 rc.cpp:649
 #, no-c-format
 msgid "Enable system tray icon"
 msgstr "เปิดใช้การแสดงไอคอนในถาดระบบ"
 
-#: configuredialog.cpp:2468
+#: configuredialog.cpp:2492
 msgid "System Tray Mode"
 msgstr "โหมดใช้ถาดระบบ"
 
-#: configuredialog.cpp:2476
+#: configuredialog.cpp:2500
 msgid "Always show KMail in system tray"
 msgstr "แสดงโปรแกรมจัดการจดหมาย - K ในถาดระบบเสมอ"
 
-#: configuredialog.cpp:2479
+#: configuredialog.cpp:2503
 msgid "Only show KMail in system tray if there are unread messages"
 msgstr ""
 "แสดงโปรแกรมจัดการจดหมาย - K ในถาดระบบเฉพาะเมื่อมีจดหมายที่ยังไม่ได้อ่าน"
 
-#: configuredialog.cpp:2539 identitydialog.cpp:384
+#: configuredialog.cpp:2563 identitydialog.cpp:408
 #, fuzzy
 msgid "&Templates"
 msgstr "แทนที่"
 
-#: configuredialog.cpp:2545
+#: configuredialog.cpp:2569
 msgid "&Custom Templates"
 msgstr ""
 
-#: configuredialog.cpp:2551
+#: configuredialog.cpp:2575
 msgid "&Subject"
 msgstr "เรื่อง"
 
-#: configuredialog.cpp:2558
+#: configuredialog.cpp:2582
 msgid "Cha&rset"
 msgstr "ชุดรหัสอักขระ"
 
-#: configuredialog.cpp:2564
+#: configuredialog.cpp:2588
 #, fuzzy
 msgid "H&eaders"
 msgstr "เพิ่มหัวจดหมาย"
 
-#: configuredialog.cpp:2570
+#: configuredialog.cpp:2594
 msgid ""
 "_: Config->Composer->Attachments\n"
 "A&ttachments"
 msgstr "สิ่งที่แนบมาด้วย"
 
-#: configuredialog.cpp:2654
+#: configuredialog.cpp:2633
+msgid ""
+"When replying, add quote signs in front of all lines of the quoted text,\n"
+"even when the line was created by adding an additional linebreak while\n"
+"word-wrapping the text."
+msgstr ""
+
+#: configuredialog.cpp:2643
+msgid ""
+"When replying, only quote the selected text instead of the complete message "
+"when there is text selected in the message window."
+msgstr ""
+
+#: configuredialog.cpp:2704
+msgid "Warn if too many recipients are specified"
+msgstr ""
+
+#: configuredialog.cpp:2716
+msgid "Warn if more than this many recipients are specified"
+msgstr ""
+
+#: configuredialog.cpp:2732
 msgid "No autosave"
 msgstr "ไม่ต้องบันทึกอัตโนมัติ"
 
-#: configuredialog.cpp:2661
+#: configuredialog.cpp:2741
+#, fuzzy
+msgid "Default Forwarding Type:"
+msgstr "โดเมนปริยาย:"
+
+#: configuredialog.cpp:2744
+#, fuzzy
+msgid "Inline"
+msgstr "แนบเข้าไป..."
+
+#: configuredialog.cpp:2745
+#, fuzzy
+msgid "As Attachment"
+msgstr "เปิดสิ่งที่แนบมาด้วยหรือไม่ ?"
+
+#: configuredialog.cpp:2753
 msgid "Configure Completion Order"
 msgstr "ปรับแต่งลำดับการทำให้สมบูรณ์"
 
-#: configuredialog.cpp:2669 kmlineeditspell.cpp:136
+#: configuredialog.cpp:2761 kmlineeditspell.cpp:159
 msgid "Edit Recent Addresses..."
 msgstr "แก้ไขที่อยู่ล่าสุด..."
 
-#: configuredialog.cpp:2676 kmedit.cpp:540
+#: configuredialog.cpp:2768 kmedit.cpp:633
 msgid "External Editor"
 msgstr "เครื่องมือแก้ไขข้อความภายนอก"
 
-#: configuredialog.cpp:2707
+#: configuredialog.cpp:2799
 #, c-format
 msgid "<b>%f</b> will be replaced with the filename to edit."
 msgstr "ตัวแปร <b>%f</b> จะถูกแทนที่ด้วยชื่อแฟ้มที่จะแก้ไข"
 
-#: configuredialog.cpp:2817
+#: configuredialog.cpp:2930
 msgid ""
 "<qt>The following placeholders are supported in the reply phrases:"
 "<br><b>%D</b>: date, <b>%S</b>: subject,"
@@ -1797,54 +2043,54 @@ msgstr ""
 "<br><b>%%</b>: เครื่องหมายเปอร์เซ็น, <b>%_</b>: ช่องว่าง, <b>%L</b>"
 ": จบบรรทัด</qt>"
 
-#: configuredialog.cpp:2830
+#: configuredialog.cpp:2943
 msgid "Lang&uage:"
 msgstr "ภาษา:"
 
-#: configuredialog.cpp:2839 configuredialog.cpp:3087 configuredialog.cpp:3303
-#: configuredialog.cpp:3498
+#: configuredialog.cpp:2952 configuredialog.cpp:3200 configuredialog.cpp:3416
+#: configuredialog.cpp:3611
 msgid "Re&move"
 msgstr "ลบ"
 
-#: configuredialog.cpp:2853
+#: configuredialog.cpp:2966
 msgid "Reply to se&nder:"
 msgstr "ตอบกลับไปยังผู้ส่ง:"
 
-#: configuredialog.cpp:2861
+#: configuredialog.cpp:2974
 msgid "Repl&y to all:"
 msgstr "ตอบกลับไปยังทั้งหมด:"
 
-#: configuredialog.cpp:2869
+#: configuredialog.cpp:2982
 msgid "&Forward:"
 msgstr "ส่งต่อ:"
 
 #. i18n: file templatesconfiguration_base.ui line 285
-#: configuredialog.cpp:2877 rc.cpp:459
+#: configuredialog.cpp:2990 rc.cpp:465
 #, no-c-format
 msgid "&Quote indicator:"
 msgstr "ตัวแสดงถึงส่วนที่อ้างถึง:"
 
-#: configuredialog.cpp:2922 kmmessage.cpp:3960
+#: configuredialog.cpp:3035 kmmessage.cpp:4048
 msgid "On %D, you wrote:"
 msgstr "เมื่อวันที่ %D คุณได้ส่งข้อความ:"
 
-#: configuredialog.cpp:2923 kmmessage.cpp:3962
+#: configuredialog.cpp:3036 kmmessage.cpp:4050
 msgid "On %D, %F wrote:"
 msgstr "เมื่อ %D, %F ได้ส่งข้อความ:"
 
-#: configuredialog.cpp:2924 kmmessage.cpp:3964
+#: configuredialog.cpp:3037 kmmessage.cpp:4052
 msgid "Forwarded Message"
 msgstr "ส่งต่อข้อความแล้ว"
 
-#: configuredialog.cpp:2925
+#: configuredialog.cpp:3038
 msgid ">%_"
 msgstr ">%_"
 
-#: configuredialog.cpp:3074
+#: configuredialog.cpp:3187
 msgid "Repl&y Subject Prefixes"
 msgstr "คำนำหน้าหัวเรื่องตอบกลับ"
 
-#: configuredialog.cpp:3078 configuredialog.cpp:3107
+#: configuredialog.cpp:3191 configuredialog.cpp:3220
 msgid ""
 "Recognize any sequence of the following prefixes\n"
 "(entries are case-insensitive regular expressions):"
@@ -1852,23 +2098,23 @@ msgstr ""
 "จัดลำดับเหตุการณ์ที่ต่อเนื่องโดยแทรกด้วยคำนำหน้าเหล่านี้\n"
 "(เงื่อนไขมีการพิจารณาตัวอักษรเล็ก/ใหญ่):"
 
-#: configuredialog.cpp:3088 configuredialog.cpp:3499
+#: configuredialog.cpp:3201 configuredialog.cpp:3612
 msgid "Mod&ify..."
 msgstr "แก้ไข..."
 
-#: configuredialog.cpp:3089
+#: configuredialog.cpp:3202
 msgid "Enter new reply prefix:"
 msgstr "เติมคำนำหน้าการตอบกลับใหม่:"
 
-#: configuredialog.cpp:3103
+#: configuredialog.cpp:3216
 msgid "For&ward Subject Prefixes"
 msgstr "คำนำหน้าหัวเรื่องที่ส่งต่อ"
 
-#: configuredialog.cpp:3117
+#: configuredialog.cpp:3230
 msgid "Enter new forward prefix:"
 msgstr "เติมคำนำหน้าการส่งต่อใหม่:"
 
-#: configuredialog.cpp:3156
+#: 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."
@@ -1876,57 +2122,57 @@ msgstr ""
 "รายการนี้จะใช้ตรวจสอบกับจดหมายออกจากบนลงล่างทุกฉบับ "
 "เพื่อหาชุดอักขระที่มีอักขระครบทุกตัวที่จดหมายต้องการ"
 
-#: configuredialog.cpp:3165
+#: configuredialog.cpp:3278
 msgid "Enter charset:"
 msgstr "เติมชุดรหัสอักขระ:"
 
-#: configuredialog.cpp:3171
+#: configuredialog.cpp:3284
 msgid "&Keep original charset when replying or forwarding (if possible)"
 msgstr "ใช้ชุดรหัสอักขระดั้งเดิมเมื่อมีการตอบกลับหรือมีการส่งต่อ (หากทำได้)"
 
-#: configuredialog.cpp:3205
+#: configuredialog.cpp:3318
 msgid "This charset is not supported."
 msgstr "ไม่สนับสนุนชุดรหัสอักขระนี้"
 
-#: configuredialog.cpp:3256
+#: configuredialog.cpp:3369
 msgid "&Use custom message-id suffix"
 msgstr "ต่อท้ายด้วยเลขจดหมายกำหนดเอง"
 
-#: configuredialog.cpp:3269
+#: configuredialog.cpp:3382
 msgid "Custom message-&id suffix:"
 msgstr "เลขจดหมายกำหนดเองที่จะใช้ต่อท้าย:"
 
-#: configuredialog.cpp:3283
+#: configuredialog.cpp:3396
 msgid "Define custom mime header fields:"
 msgstr "แท็กส่วนหัว mime ที่กำหนดเอง:"
 
-#: configuredialog.cpp:3291
+#: configuredialog.cpp:3404
 msgid "Value"
 msgstr "ค่า"
 
-#: configuredialog.cpp:3299
+#: configuredialog.cpp:3412
 msgid "Ne&w"
 msgstr "ใหม่"
 
 #. i18n: file folderpropertiesdialog.ui line 52
-#: configuredialog.cpp:3312 kmfolderdia.cpp:268 kmmsgpartdlg.cpp:110
-#: kmtransport.cpp:329 kmtransport.cpp:383 newfolderdialog.cpp:76 rc.cpp:224
-#: rc.cpp:399
+#: configuredialog.cpp:3425 kmfolderdia.cpp:269 kmmsgpartdlg.cpp:110
+#: kmtransport.cpp:329 kmtransport.cpp:383 newfolderdialog.cpp:80 rc.cpp:230
+#: rc.cpp:405
 #, no-c-format
 msgid "&Name:"
 msgstr "ชื่อ:"
 
-#: configuredialog.cpp:3321
+#: configuredialog.cpp:3434
 msgid "&Value:"
 msgstr "ค่า:"
 
-#. i18n: file kmail.kcfg line 359
-#: configuredialog.cpp:3468 rc.cpp:782
+#. i18n: file kmail.kcfg line 389
+#: configuredialog.cpp:3581 rc.cpp:807
 #, no-c-format
 msgid "Outlook-compatible attachment naming"
 msgstr "ตั้งชื่อสิ่งที่แนบมาด้วยให้ใช้กันได้กับ Outlook"
 
-#: configuredialog.cpp:3471
+#: configuredialog.cpp:3584
 msgid ""
 "Turn this option on to make Outlook(tm) understand attachment names containing "
 "non-English characters"
@@ -1934,29 +2180,29 @@ msgstr ""
 "เปิดใช้งานตัวเลือกนี้เพื่อให้โปรแกรม Outlook "
 "สามารถเข้าใจถึงชื่อสิ่งที่แนบมาด้วยที่ไม่ใช่ภาษาอังกฤษ"
 
-#: configuredialog.cpp:3482
+#: configuredialog.cpp:3595
 msgid "E&nable detection of missing attachments"
 msgstr "เปิดการตรวจสอบสิ่งที่แนบมาด้วยที่ผิดพลาด"
 
-#: configuredialog.cpp:3489
+#: configuredialog.cpp:3602
 msgid "Recognize any of the following key words as intention to attach a file:"
 msgstr "จำแนกส่วนของคีย์เวิร์ดต่อไปนี้เช่นเดียวกับการแนบแฟ้ม:"
 
-#: configuredialog.cpp:3500
+#: configuredialog.cpp:3613
 msgid "Enter new key word:"
 msgstr "เติมคีย์เวิร์ดใหม่:"
 
-#: configuredialog.cpp:3521 configuredialog.cpp:3522 kmcomposewin.cpp:2232
-#: kmcomposewin.cpp:2233
+#: configuredialog.cpp:3634 configuredialog.cpp:3635 kmcomposewin.cpp:2297
+#: kmcomposewin.cpp:2298
 msgid "attachment"
 msgstr "สิ่งที่แนบมาด้วย"
 
-#: configuredialog.cpp:3523 configuredialog.cpp:3524 kmcomposewin.cpp:2234
-#: kmcomposewin.cpp:2235
+#: configuredialog.cpp:3636 configuredialog.cpp:3637 kmcomposewin.cpp:2299
+#: kmcomposewin.cpp:2300
 msgid "attached"
 msgstr "แนบ"
 
-#: configuredialog.cpp:3542
+#: 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 "
@@ -1967,27 +2213,27 @@ msgid ""
 "option."
 msgstr ""
 
-#: configuredialog.cpp:3569
+#: configuredialog.cpp:3682
 msgid "&Reading"
 msgstr "การอ่านจดหมาย"
 
-#: configuredialog.cpp:3575
+#: configuredialog.cpp:3688
 msgid "Composing"
 msgstr "การเขียนจดหมาย"
 
-#: configuredialog.cpp:3581
+#: configuredialog.cpp:3694
 msgid "Warnings"
 msgstr "การแจ้งเตือน"
 
-#: configuredialog.cpp:3587
+#: configuredialog.cpp:3700
 msgid "S/MIME &Validation"
 msgstr "ความถูกต้องของ S/MIME"
 
-#: configuredialog.cpp:3593
+#: configuredialog.cpp:3706
 msgid "Crypto Backe&nds"
 msgstr "กลไกเข้ารหัส"
 
-#: configuredialog.cpp:3624
+#: configuredialog.cpp:3737
 msgid ""
 "<qt>"
 "<p>Messages sometimes come in both formats. This option controls whether you "
@@ -2020,7 +2266,7 @@ msgstr ""
 "<p><b>ข้อควรจำ:</b> คุณสามารถตั้งค่าตัวเลือกนี้สำหรับแต่ละโฟลเดอร์ ได้จากเมนู "
 "<i>โฟลเดอร์</i> ของหน้าต่างหลักจัดการจดหมาย K</p></qt>"
 
-#: configuredialog.cpp:3641
+#: configuredialog.cpp:3754
 #, fuzzy
 msgid ""
 "<qt>"
@@ -2047,7 +2293,7 @@ msgstr ""
 "ที่ไม่ได้รวมเข้ากับจดหมาย คุณสามารถเลือกตัวเลือกนี้ได้ แต่คุณอาจจะได้รับคำเตือน "
 "เกี่ยวกับปัญหาที่อาจจะเกิดขึ้น</p></qt>"
 
-#: configuredialog.cpp:3654
+#: configuredialog.cpp:3767
 msgid ""
 "<qt>"
 "<h3>Message Disposition Notification Policy</h3>"
@@ -2074,19 +2320,19 @@ msgid ""
 "customer relationship management, it has been made available.</li></ul></qt>"
 msgstr ""
 
-#: configuredialog.cpp:3687
+#: configuredialog.cpp:3800
 msgid "HTML Messages"
 msgstr "จดหมายแบบ HTML"
 
-#: configuredialog.cpp:3690
+#: configuredialog.cpp:3803
 msgid "Prefer H&TML to plain text"
 msgstr "แสดงจดหมาย HTML ในแบบข้อความธรรมดา"
 
-#: configuredialog.cpp:3694
+#: configuredialog.cpp:3807
 msgid "Allow messages to load e&xternal references from the Internet"
 msgstr "อนุญาตให้จดหมาย โหลดส่วนที่อ้างถึงจากเน็ตได้"
 
-#: configuredialog.cpp:3699
+#: 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 "
@@ -2099,62 +2345,62 @@ msgstr ""
 "และดู<a href=\"whatsthis:%2\">รายละเอียดเกี่ยวกับการอ้างถึงสิ่งที่อยู่ภายนอก</a>"
 "เพิ่มเติม"
 
-#: configuredialog.cpp:3711
+#: configuredialog.cpp:3824
 #, fuzzy
 msgid "Encrypted Messages"
 msgstr "จดหมายถูกเข้ารหัสไว้"
 
-#: configuredialog.cpp:3713
+#: configuredialog.cpp:3826
 #, fuzzy
 msgid "Attempt decryption of encrypted messages when viewing"
 msgstr "ทำการเข้ารหัสจดหมายหากสามารถทำได้โดยอัตโนมัติ"
 
-#: configuredialog.cpp:3718
+#: configuredialog.cpp:3831
 msgid "Message Disposition Notifications"
 msgstr ""
 
-#: configuredialog.cpp:3730
+#: configuredialog.cpp:3843
 msgid "Send policy:"
 msgstr "กฎการส่ง:"
 
-#: configuredialog.cpp:3732 kmmessage.cpp:1361 kmmessage.cpp:1368
+#: configuredialog.cpp:3845 kmmessage.cpp:1381 kmmessage.cpp:1388
 msgid "&Ignore"
 msgstr "ไม่สนใจ"
 
-#: configuredialog.cpp:3735
+#: configuredialog.cpp:3848
 msgid "As&k"
 msgstr "ให้ถามก่อน"
 
-#: configuredialog.cpp:3738
+#: configuredialog.cpp:3851
 msgid "&Deny"
 msgstr "ปฏิเสธ"
 
-#: configuredialog.cpp:3741
+#: configuredialog.cpp:3854
 msgid "Al&ways send"
 msgstr "ส่งเสมอ"
 
-#: configuredialog.cpp:3759
+#: configuredialog.cpp:3872
 msgid "Quote original message:"
 msgstr "อ้างถึงจดหมายต้นฉบับ:"
 
-#: configuredialog.cpp:3761
+#: configuredialog.cpp:3874
 msgid "Nothin&g"
 msgstr "ไม่มีอะไร"
 
-#: configuredialog.cpp:3764
+#: configuredialog.cpp:3877
 msgid "&Full message"
 msgstr "เต็มฉบับ"
 
-#: configuredialog.cpp:3767
+#: configuredialog.cpp:3880
 msgid "Onl&y headers"
 msgstr "เฉพาะส่วนหัว"
 
-#: configuredialog.cpp:3773
+#: configuredialog.cpp:3886
 #, fuzzy
 msgid "Do not send MDNs in response to encrypted messages"
 msgstr "แจ้งเตือนเมื่อพยายามส่งจดหมายที่ไม่ได้เข้ารหัสไว้"
 
-#: configuredialog.cpp:3777
+#: configuredialog.cpp:3890
 #, fuzzy
 msgid ""
 "<b>WARNING:</b> Unconditionally returning confirmations undermines your "
@@ -2163,132 +2409,146 @@ msgstr ""
 "<qt><b>คำเตือน:</b> การยอมรับโดยไม่มีเงื่อนไข อาจส่งผลต่อความปลอดภัย ใช้ "
 "\"นี่คืออะไร\" (หรือกด Shift-F1) เพื่อดูรายละเอียด</qt>"
 
-#: configuredialog.cpp:3786
+#: configuredialog.cpp:3899
 msgid "Certificate && Key Bundle Attachments"
 msgstr "ใบรับรองและการแนบกุญแจรวมไปในจดหมาย"
 
-#: configuredialog.cpp:3789
+#: configuredialog.cpp:3902
 msgid "Automatically import keys and certificates"
 msgstr "นำเข้ากุญแจและใบรับรองโดยอัตโนมัติ"
 
-#: configuredialog.cpp:3850
+#: configuredialog.cpp:3963
 msgid ""
 "Changing the global HTML setting will override all folder specific values."
 msgstr "การเปลี่ยนการตั้งค่า HTML ทั่วไป จะทำให้ทุกโฟลเดอร์ใช้ค่าที่กำหนดไว้"
 
-#: configuredialog.cpp:4138
+#: configuredialog.cpp:4251
 msgid "This option requires dirmngr >= 0.9.0"
 msgstr ""
 
 #. i18n: file smimeconfiguration.ui line 216
-#: configuredialog.cpp:4247 rc.cpp:347
+#: configuredialog.cpp:4360 rc.cpp:353
 #, no-c-format
 msgid "no proxy"
 msgstr ""
 
-#: configuredialog.cpp:4248
+#: configuredialog.cpp:4361
 msgid "(Current system setting: %1)"
 msgstr "(การตั้งค่าปัจจุบันของระบบ: %1)"
 
-#: configuredialog.cpp:4425
+#: configuredialog.cpp:4538
 msgid "&Folders"
 msgstr "โฟลเดอร์"
 
-#: configuredialog.cpp:4428
+#: configuredialog.cpp:4541
 msgid "&Groupware"
 msgstr "กรุ๊ปแวร์"
 
-#: configuredialog.cpp:4449
+#: configuredialog.cpp:4562
 msgid ""
 "_: Corresponds to Folder->Move All Messages to Trash\n"
 "Ask for co&nfirmation before moving all messages to trash"
 msgstr "ถามยืนยันก่อนทำการทิ้งจดหมายทั้งหมดลงถังขยะ"
 
-#: configuredialog.cpp:4456
+#: configuredialog.cpp:4569
 msgid "E&xclude important messages from expiry"
 msgstr "ไม่รวมจดหมายที่สำคัญมากไปเป็นจดหมายที่หมดอายุ"
 
-#: configuredialog.cpp:4467
+#: configuredialog.cpp:4580
 msgid ""
 "_: to be continued with \"do not loop\", \"loop in current folder\", and \"loop "
 "in all folders\".\n"
 "When trying to find unread messages:"
 msgstr "เมื่อพยายามค้นหาจดหมายที่ยังไม่ได้อ่าน:"
 
-#: configuredialog.cpp:4470
+#: configuredialog.cpp:4583
 msgid ""
 "_: continuation of \"When trying to find unread messages:\"\n"
 "Do not Loop"
 msgstr "ไม่ต้องวนรอบ"
 
-#: configuredialog.cpp:4472
+#: configuredialog.cpp:4585
 msgid ""
 "_: continuation of \"When trying to find unread messages:\"\n"
 "Loop in Current Folder"
 msgstr "วนรอบในโฟลเดอร์ปัจจุบัน"
 
-#: configuredialog.cpp:4474
+#: configuredialog.cpp:4587
 msgid ""
 "_: continuation of \"When trying to find unread messages:\"\n"
 "Loop in All Folders"
 msgstr "วนรอบในโฟลเดอร์ทั้งหมด"
 
-#: configuredialog.cpp:4487
+#: 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"
 "When entering a folder:"
 msgstr "เมื่อเข้าไปยังโฟลเดอร์:"
 
-#: configuredialog.cpp:4490
+#: configuredialog.cpp:4603
 msgid ""
 "_: continuation of \"When entering a folder:\"\n"
 "Jump to First New Message"
 msgstr "กระโดดไปยังจดหมายใหม่ฉบับแรก"
 
-#: configuredialog.cpp:4492
+#: configuredialog.cpp:4605
 msgid ""
 "_: continuation of \"When entering a folder:\"\n"
 "Jump to First Unread or New Message"
 msgstr "กระโดดไปยังจดหมายที่ยังไม่ได้อ่านหรือจดหมายใหม่ฉบับแรก"
 
-#: configuredialog.cpp:4494
+#: configuredialog.cpp:4607
 msgid ""
 "_: continuation of \"When entering a folder:\"\n"
 "Jump to Last Selected Message"
 msgstr "กระโดดไปยังจดหมายที่เลือกไว้ล่าสุด"
 
-#: configuredialog.cpp:4501
+#: configuredialog.cpp:4609
+#, fuzzy
+msgid ""
+"_: continuation of \"When entering a folder:\"\n"
+"Jump to Newest Message"
+msgstr "กระโดดไปยังจดหมายใหม่ฉบับแรก"
+
+#: configuredialog.cpp:4611
+#, fuzzy
+msgid ""
+"_: continuation of \"When entering a folder:\"\n"
+"Jump to Oldest Message"
+msgstr "กระโดดไปยังจดหมายใหม่ฉบับแรก"
+
+#: configuredialog.cpp:4618
 msgid "Mar&k selected message as read after"
 msgstr "ตั้งค่าว่าอ่านแล้วให้กับจดหมายที่เลือก"
 
-#: configuredialog.cpp:4505
+#: configuredialog.cpp:4622
 msgid " sec"
 msgstr " วินาที"
 
-#: configuredialog.cpp:4518
+#: configuredialog.cpp:4635
 msgid "Ask for action after &dragging messages to another folder"
 msgstr "ถามถึงสิ่งที่จะกระทำหลังจากลากจดหมายไปยังโฟลเดอร์อื่น ๆ"
 
-#: configuredialog.cpp:4529
+#: configuredialog.cpp:4646
 msgid ""
 "_: to be continued with \"flat files\" and \"directories\", resp.\n"
 "By default, &message folders on disk are:"
 msgstr "โดยปริยายแล้ว โฟลเดอร์จดหมายบนดิสก์จะเป็น:"
 
-#: configuredialog.cpp:4532
+#: configuredialog.cpp:4649
 msgid ""
 "_: continuation of \"By default, &message folders on disk are\"\n"
 "Flat Files (\"mbox\" format)"
 msgstr "แฟ้มธรรมดา (รูปแบบ \"mbox\")"
 
-#: configuredialog.cpp:4534
+#: configuredialog.cpp:4651
 msgid ""
 "_: continuation of \"By default, &message folders on disk are\"\n"
 "Directories (\"maildir\" format)"
 msgstr "ไดเร็กทอรี (รูปแบบ \"maildir\")"
 
-#: configuredialog.cpp:4537
+#: configuredialog.cpp:4654
 msgid ""
 "_: what's this help\n"
 "<qt>"
@@ -2303,37 +2563,37 @@ msgid ""
 "</qt>"
 msgstr ""
 
-#: configuredialog.cpp:4562
+#: configuredialog.cpp:4679
 msgid "Open this folder on startup:"
 msgstr "เปิดโฟลเดอร์นี้ไม่เริ่มการทำงาน:"
 
-#: configuredialog.cpp:4570
+#: configuredialog.cpp:4687
 msgid "Empty local &trash folder on program exit"
 msgstr "เทถังขยะภายในทิ้งเมื่อจบการทำงานของโปรแกรม"
 
-#: configuredialog.cpp:4578
+#: configuredialog.cpp:4695
 msgid "Enable full text &indexing"
 msgstr "เปิดการทำดัชนีค้นหาข้อความเต็มรูปแบบ"
 
-#: configuredialog.cpp:4588
+#: configuredialog.cpp:4705
 #, fuzzy
 msgid "Quota units: "
 msgstr "ตัวแสดงถึงส่วนที่อ้างถึง:"
 
-#: configuredialog.cpp:4590 quotajobs.h:86
+#: configuredialog.cpp:4707 quotajobs.h:86
 msgid "KB"
 msgstr ""
 
-#: configuredialog.cpp:4591 quotajobs.h:91
+#: configuredialog.cpp:4708 quotajobs.h:91
 #, fuzzy
 msgid "MB"
 msgstr " เมกะไบต์"
 
-#: configuredialog.cpp:4592 quotajobs.h:96
+#: configuredialog.cpp:4709 quotajobs.h:96
 msgid "GB"
 msgstr ""
 
-#: configuredialog.cpp:4601
+#: configuredialog.cpp:4718
 msgid ""
 "_: what's this help\n"
 "<qt>"
@@ -2351,7 +2611,7 @@ msgid ""
 "depending on which option is selected.</p></qt>"
 msgstr ""
 
-#: configuredialog.cpp:4618
+#: configuredialog.cpp:4735
 msgid ""
 "_: what's this help\n"
 "<qt>"
@@ -2364,149 +2624,158 @@ msgid ""
 "KMail while this operation is running.</p></qt>"
 msgstr ""
 
-#: configuredialog.cpp:4694
+#: configuredialog.cpp:4811
 msgid "&IMAP Resource Folder Options"
 msgstr ""
 
-#: configuredialog.cpp:4698
+#: configuredialog.cpp:4815
 msgid "&Enable IMAP resource functionality"
 msgstr ""
 
-#: configuredialog.cpp:4699
+#: configuredialog.cpp:4816
 msgid "This enables the IMAP storage for the Kontact applications"
 msgstr ""
 
-#: configuredialog.cpp:4712
+#: configuredialog.cpp:4829
 msgid "&Format used for the groupware folders:"
 msgstr ""
 
-#: configuredialog.cpp:4714
+#: configuredialog.cpp:4831
 msgid ""
 "Choose the format to use to store the contents of the groupware folders."
 msgstr ""
 
-#: configuredialog.cpp:4723
-msgid "Standard (Ical / Vcard)"
+#: configuredialog.cpp:4840
+msgid "Deprecated Kolab1 (iCal/vCard)"
 msgstr ""
 
-#: configuredialog.cpp:4723
-msgid "Kolab (XML)"
+#: configuredialog.cpp:4840
+msgid "Kolab2 (XML)"
 msgstr ""
 
-#: configuredialog.cpp:4731
+#: configuredialog.cpp:4848
 msgid "&Language of the groupware folders:"
 msgstr ""
 
-#: configuredialog.cpp:4734
+#: configuredialog.cpp:4851
 msgid "Set the language of the folder names"
 msgstr ""
 
-#: configuredialog.cpp:4743
+#: configuredialog.cpp:4860
 msgid "English"
 msgstr "อังกฤษ"
 
-#: configuredialog.cpp:4743
+#: configuredialog.cpp:4860
 msgid "German"
 msgstr "เยอรมัน"
 
-#: configuredialog.cpp:4743
+#: configuredialog.cpp:4860
 msgid "French"
 msgstr "ฝรั่งเศส"
 
-#: configuredialog.cpp:4743
+#: configuredialog.cpp:4860
 msgid "Dutch"
 msgstr "เนเธอร์แลนด์"
 
-#: configuredialog.cpp:4752
+#: configuredialog.cpp:4869
 msgid "Set the parent of the resource folders"
 msgstr ""
 
-#: configuredialog.cpp:4781
+#: configuredialog.cpp:4898
 msgid "&Hide groupware folders"
 msgstr ""
 
-#: configuredialog.cpp:4785
+#: configuredialog.cpp:4902
 msgid ""
 "When this is checked, you will not see the IMAP resource folders in the folder "
 "tree."
 msgstr ""
 
-#: configuredialog.cpp:4792
+#: configuredialog.cpp:4909
 msgid "&Only show groupware folders for this account"
 msgstr ""
 
-#: configuredialog.cpp:4796
+#: configuredialog.cpp:4913
 msgid ""
 "When this is checked, you will not see normal  mail folders in the folder tree "
 "for the account configured for groupware."
 msgstr ""
 
-#: configuredialog.cpp:4804
+#: configuredialog.cpp:4921
 msgid "Synchronize groupware changes immediately"
 msgstr ""
 
-#: configuredialog.cpp:4806
+#: configuredialog.cpp:4923
 msgid ""
 "Synchronize groupware changes in disconnected IMAP folders immediately when "
 "being online."
 msgstr ""
 
-#: configuredialog.cpp:4818
+#: configuredialog.cpp:4935
 msgid "Groupware Compatibility && Legacy Options"
 msgstr ""
 
-#: configuredialog.cpp:4823
+#: configuredialog.cpp:4940
 msgid "&Enable groupware functionality"
 msgstr ""
 
-#: configuredialog.cpp:4831
+#: configuredialog.cpp:4948
 msgid "Mangle From:/To: headers in replies to invitations"
 msgstr ""
 
-#: configuredialog.cpp:4832
+#: configuredialog.cpp:4949
 msgid ""
 "Turn this option on in order to make Outlook(tm) understand your answers to "
 "invitation replies"
 msgstr ""
 
-#: configuredialog.cpp:4837
+#: configuredialog.cpp:4954
 msgid "Send invitations in the mail body"
 msgstr ""
 
-#: configuredialog.cpp:4838
+#: configuredialog.cpp:4955
 msgid ""
 "Turn this option on in order to make Outlook(tm) understand your answers to "
 "invitations"
 msgstr ""
 
-#: configuredialog.cpp:4846
+#: configuredialog.cpp:4963
 #, fuzzy
 msgid "Exchange compatible invitation naming"
 msgstr "เข้ารหัสโดยใช้ OpenPGP โดยอัตโนมัติ"
 
-#. i18n: file kmail.kcfg line 183
-#: configuredialog.cpp:4847 rc.cpp:685
-#, no-c-format
+#: configuredialog.cpp:4964
 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."
+"Outlook(tm), when used in combination with a Microsoft Exchange server,\n"
+"has a problem understanding standards-compliant groupware e-mail.\n"
+"Turn this option on to send groupware invitations and replies in an Exchange "
+"compatible way."
+msgstr ""
+
+#. i18n: file kmail.kcfg line 190
+#: configuredialog.cpp:4970 rc.cpp:694
+#, 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."
 msgstr ""
 
-#. i18n: file kmail.kcfg line 188
-#: configuredialog.cpp:4853 rc.cpp:688
+#. i18n: file kmail.kcfg line 196
+#: configuredialog.cpp:4977 rc.cpp:700
 #, fuzzy, no-c-format
 msgid "Automatic invitation sending"
 msgstr "เข้ารหัสโดยใช้ OpenPGP โดยอัตโนมัติ"
 
-#: configuredialog.cpp:4854
+#: configuredialog.cpp:4978
 msgid ""
 "When this is on, the user will not see the mail composer window. Invitation "
 "mails are sent automatically"
 msgstr ""
 
-#: configuredialog.cpp:4867
+#: 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 "
@@ -2518,15 +2787,15 @@ msgid ""
 "be able to work with this.</qt>"
 msgstr ""
 
-#: configuredialog.cpp:4922
+#: configuredialog.cpp:5048
 msgid "<Choose a Folder>"
 msgstr "<เลือกโฟลเดอร์>"
 
-#: configuredialog.cpp:5026
+#: configuredialog.cpp:5154
 msgid "&Resource folders are subfolders of:"
 msgstr ""
 
-#: configuredialog.cpp:5029
+#: configuredialog.cpp:5157
 msgid "&Resource folders are in account:"
 msgstr ""
 
@@ -2595,35 +2864,35 @@ msgid ""
 "Not available"
 msgstr "ไม่มีอยู่"
 
-#: customtemplates.cpp:87
+#: customtemplates.cpp:100
 #, fuzzy
 msgid ""
 "_: Message->\n"
 "Universal"
 msgstr "ตอบกลับ"
 
-#: customtemplates.cpp:88 customtemplates.cpp:131
+#: customtemplates.cpp:101 customtemplates.cpp:180
 #, fuzzy
 msgid ""
 "_: Message->\n"
 "Reply"
 msgstr "ตอบกลับ"
 
-#: customtemplates.cpp:89 customtemplates.cpp:133
+#: customtemplates.cpp:102 customtemplates.cpp:182
 #, fuzzy
 msgid ""
 "_: Message->\n"
 "Reply to All"
 msgstr "ตอบกลับ"
 
-#: customtemplates.cpp:90 customtemplates.cpp:135
+#: customtemplates.cpp:103 customtemplates.cpp:184
 #, fuzzy
 msgid ""
 "_: Message->\n"
 "Forward"
 msgstr "ส่งต่อ"
 
-#: customtemplates.cpp:93
+#: customtemplates.cpp:106
 msgid ""
 "<qt>"
 "<p>Here you can add, edit, and delete custom message templates to use when you "
@@ -2638,213 +2907,235 @@ msgid ""
 "to <i>Universal</i> templates.</p></qt>"
 msgstr ""
 
-#: customtemplates.cpp:107 templatesconfiguration.cpp:105
+#: customtemplates.cpp:120 templatesconfiguration.cpp:105
 msgid "<a href=\"whatsthis:%1\">How does this work?</a>"
 msgstr ""
 
-#: customtemplates.cpp:137
+#: customtemplates.cpp:122
+#, fuzzy
+msgid "Additional recipients of the message when forwarding"
+msgstr "ทำการเข้ารหัสจดหมายหากสามารถทำได้โดยอัตโนมัติ"
+
+#: customtemplates.cpp:123
+msgid "Additional recipients who get a copy of the message when forwarding"
+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."
+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."
+msgstr ""
+
+#: customtemplates.cpp:186
 #, fuzzy
 msgid ""
 "_: Message->\n"
 "Unknown"
 msgstr "ส่งต่อ"
 
-#: customtemplates.cpp:347 customtemplates.cpp:364
+#: customtemplates.cpp:420 customtemplates.cpp:437
 msgid "Key Conflict"
 msgstr ""
 
-#: customtemplates.cpp:348
+#: customtemplates.cpp:421
 msgid ""
 "The selected shortcut is already used for another custom template, would you "
 "still like to continue with the assignment?"
 msgstr ""
 
-#: customtemplates.cpp:365
+#: customtemplates.cpp:438
 #, fuzzy
 msgid ""
 "The selected shortcut is already used, would you still like to continue with "
 "the assignment?"
 msgstr "ปุ่มพิมพ์ลัดที่เลือกถูกใช้งานอยู่แล้ว โปรดเลือกปุ่มพิมพ์อื่น"
 
-#: distributionlistdialog.cpp:96
+#: distributionlistdialog.cpp:97
 #, fuzzy
 msgid "Save Distribution List"
 msgstr "รายการผู้รวบรวมโปรแกรม"
 
-#: distributionlistdialog.cpp:97
+#: distributionlistdialog.cpp:98
 msgid "Save List"
 msgstr "บันทึกรายการ"
 
-#: distributionlistdialog.cpp:106
+#: distributionlistdialog.cpp:107
 msgid "Name:"
 msgstr "ชื่อ:"
 
-#: distributionlistdialog.cpp:116 recipientspicker.cpp:390
+#: distributionlistdialog.cpp:117 recipientspicker.cpp:390
 msgid "Email"
 msgstr "อีเมล:"
 
-#: distributionlistdialog.cpp:170
+#: distributionlistdialog.cpp:169
 msgid ""
 "There are no recipients in your list. First select some recipients, then try "
 "again."
 msgstr ""
 
-#: distributionlistdialog.cpp:185
+#: distributionlistdialog.cpp:184
 #, fuzzy
 msgid "New Distribution List"
 msgstr "รายการผู้รวบรวมโปรแกรม"
 
-#: distributionlistdialog.cpp:186
+#: distributionlistdialog.cpp:185
 msgid "Please enter name:"
 msgstr "โปรดเติมชื่อ:"
 
-#: distributionlistdialog.cpp:197
+#: distributionlistdialog.cpp:198
 msgid ""
 "<qt>Distribution list with the given name <b>%1</b> already exists. Please "
 "select a different name.</qt>"
 msgstr ""
 
-#: editorwatcher.cpp:86
+#: editorwatcher.cpp:76
 #, fuzzy
 msgid "Edit with:"
 msgstr "แก้ไขการแสดงตัว"
 
-#: editorwatcher.cpp:169
+#: editorwatcher.cpp:161
 msgid ""
-"KMail is unable to detect when the choosen 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:170
+#: editorwatcher.cpp:163
 #, fuzzy
 msgid "Unable to edit attachment"
 msgstr "ลบสิ่งที่แนบมาด้วย"
 
-#: encodingdetector.cpp:1250 encodingdetector.cpp:1352
+#: encodingdetector.cpp:1170 encodingdetector.cpp:1272
 msgid ""
 "_: @item Text character set\n"
 "Unicode"
 msgstr ""
 
-#: encodingdetector.cpp:1252 encodingdetector.cpp:1322
+#: encodingdetector.cpp:1172 encodingdetector.cpp:1242
 msgid ""
 "_: @item Text character set\n"
 "Cyrillic"
 msgstr ""
 
-#: encodingdetector.cpp:1254 encodingdetector.cpp:1337
+#: encodingdetector.cpp:1174 encodingdetector.cpp:1257
 msgid ""
 "_: @item Text character set\n"
 "Western European"
 msgstr ""
 
-#: encodingdetector.cpp:1256 encodingdetector.cpp:1319
+#: encodingdetector.cpp:1176 encodingdetector.cpp:1239
 msgid ""
 "_: @item Text character set\n"
 "Central European"
 msgstr ""
 
-#: encodingdetector.cpp:1258 encodingdetector.cpp:1325
+#: encodingdetector.cpp:1178 encodingdetector.cpp:1245
 msgid ""
 "_: @item Text character set\n"
 "Greek"
 msgstr ""
 
-#: encodingdetector.cpp:1260 encodingdetector.cpp:1328
+#: encodingdetector.cpp:1180 encodingdetector.cpp:1248
 msgid ""
 "_: @item Text character set\n"
 "Hebrew"
 msgstr ""
 
-#: encodingdetector.cpp:1262 encodingdetector.cpp:1334
+#: encodingdetector.cpp:1182 encodingdetector.cpp:1254
 msgid ""
 "_: @item Text character set\n"
 "Turkish"
 msgstr ""
 
-#: encodingdetector.cpp:1264 encodingdetector.cpp:1331
+#: encodingdetector.cpp:1184 encodingdetector.cpp:1251
 msgid ""
 "_: @item Text character set\n"
 "Japanese"
 msgstr ""
 
-#: encodingdetector.cpp:1266 encodingdetector.cpp:1316
+#: encodingdetector.cpp:1186 encodingdetector.cpp:1236
 msgid ""
 "_: @item Text character set\n"
 "Baltic"
 msgstr ""
 
-#: encodingdetector.cpp:1268 encodingdetector.cpp:1313
+#: encodingdetector.cpp:1188 encodingdetector.cpp:1233
 msgid ""
 "_: @item Text character set\n"
 "Arabic"
 msgstr ""
 
-#: encodingdetector.cpp:1340
+#: encodingdetector.cpp:1260
 msgid ""
 "_: @item Text character set\n"
 "Chinese Traditional"
 msgstr ""
 
-#: encodingdetector.cpp:1343
+#: encodingdetector.cpp:1263
 msgid ""
 "_: @item Text character set\n"
 "Chinese Simplified"
 msgstr ""
 
-#: encodingdetector.cpp:1346
+#: encodingdetector.cpp:1266
 msgid ""
 "_: @item Text character set\n"
 "Korean"
 msgstr ""
 
-#: encodingdetector.cpp:1349
+#: encodingdetector.cpp:1269
 msgid ""
 "_: @item Text character set\n"
 "Thai"
 msgstr ""
 
-#: expirejob.cpp:164
+#: expirejob.cpp:177
 msgid ""
 "_n: Removing 1 old message from folder %1...\n"
 "Removing %n old messages from folder %1..."
 msgstr ""
 
-#: expirejob.cpp:171
+#: expirejob.cpp:184
 msgid "Cannot expire messages from folder %1: destination folder %2 not found"
 msgstr ""
 
-#: expirejob.cpp:186
+#: expirejob.cpp:199
 msgid ""
 "_n: Moving 1 old message from folder %1 to folder %2...\n"
 "Moving %n old messages from folder %1 to folder %2..."
 msgstr ""
 
-#: expirejob.cpp:214
+#: expirejob.cpp:227
 msgid ""
 "_n: Removed 1 old message from folder %1.\n"
 "Removed %n old messages from folder %1."
 msgstr ""
 
-#: expirejob.cpp:220
+#: expirejob.cpp:233
 msgid ""
 "_n: Moved 1 old message from folder %1 to folder %2.\n"
 "Moved %n old messages from folder %1 to folder %2."
 msgstr ""
 
-#: expirejob.cpp:227
+#: expirejob.cpp:240
 msgid "Removing old messages from folder %1 failed."
 msgstr ""
 
-#: expirejob.cpp:231
+#: expirejob.cpp:244
 msgid "Moving old messages from folder %1 to folder %2 failed."
 msgstr ""
 
-#: expirejob.cpp:237
+#: expirejob.cpp:250
 msgid "Removing old messages from folder %1 was canceled."
 msgstr ""
 
-#: expirejob.cpp:241
+#: expirejob.cpp:254
 msgid "Moving old messages from folder %1 to folder %2 was canceled."
 msgstr ""
 
@@ -2885,87 +3176,104 @@ msgid ""
 "Note: Expiry action will be applied immediately after confirming settings."
 msgstr ""
 
-#: expirypropertiesdialog.cpp:163
+#: expirypropertiesdialog.cpp:167
 msgid "Please select a folder to expire messages into."
 msgstr "โปรดเลือกโฟลเดอร์ที่จะย้ายจดหมายที่หมดอายุไปไว้"
 
-#: expirypropertiesdialog.cpp:164
+#: expirypropertiesdialog.cpp:168
 msgid "No Folder Selected"
 msgstr "ยังไม่มีการเลือกโฟลเดอร์"
 
+#: expirypropertiesdialog.cpp:176
+#, fuzzy
+msgid ""
+"Please select a different folder than the current folder to expire message "
+"into."
+msgstr "โปรดเลือกโฟลเดอร์ที่จะย้ายจดหมายที่หมดอายุไปไว้"
+
+#: expirypropertiesdialog.cpp:178
+#, fuzzy
+msgid "Wrong Folder Selected"
+msgstr "ยังไม่มีการเลือกโฟลเดอร์"
+
 #: favoritefolderview.cpp:90
 #, fuzzy
 msgid "Favorite Folders"
 msgstr "สร้างโฟลเดอร์ใหม่..."
 
-#: favoritefolderview.cpp:326
+#: favoritefolderview.cpp:337 kmfoldertree.cpp:1190 kmmainwidget.cpp:2790
+msgid "&Assign Shortcut..."
+msgstr "กำหนดปุ่มพิมพ์ลัด..."
+
+#: favoritefolderview.cpp:338 kmfoldertree.cpp:1195
+msgid "Expire..."
+msgstr "หมดอายุ..."
+
+#: favoritefolderview.cpp:342
 #, fuzzy
 msgid "Remove From Favorites"
 msgstr "ลบอักขระอ้างถึง"
 
-#: favoritefolderview.cpp:328 favoritefolderview.cpp:378
+#: favoritefolderview.cpp:344 favoritefolderview.cpp:389
 #, fuzzy
 msgid "Rename Favorite"
 msgstr "เปลี่ยนชื่อตัวกรอง"
 
-#: favoritefolderview.cpp:337 kmfoldertree.cpp:1153 kmmainwidget.cpp:2767
-msgid "&Assign Shortcut..."
-msgstr "กำหนดปุ่มพิมพ์ลัด..."
-
-#: favoritefolderview.cpp:338 kmfoldertree.cpp:1158
-msgid "Expire..."
-msgstr "หมดอายุ..."
-
-#: favoritefolderview.cpp:341
+#: favoritefolderview.cpp:347
 #, fuzzy
 msgid "Add Favorite Folder..."
 msgstr "สร้างโฟลเดอร์ใหม่..."
 
-#: favoritefolderview.cpp:395
+#: favoritefolderview.cpp:406
 #, fuzzy
 msgid "Local Inbox"
 msgstr "กล่องจดหมายภายใน"
 
-#: favoritefolderview.cpp:397
+#: favoritefolderview.cpp:408
 #, c-format
 msgid "Inbox of %1"
 msgstr ""
 
-#: favoritefolderview.cpp:401
+#: favoritefolderview.cpp:412
 msgid "%1 on %2"
 msgstr ""
 
-#: favoritefolderview.cpp:403
+#: favoritefolderview.cpp:414
 msgid "%1 (local)"
 msgstr ""
 
-#: favoritefolderview.cpp:443
+#: favoritefolderview.cpp:454
 #, fuzzy
 msgid "Add Favorite Folder"
 msgstr "สร้างโฟลเดอร์ใหม่..."
 
-#: filterimporterexporter.cpp:51
+#: filterimporterexporter.cpp:50
 #, fuzzy
 msgid "Select Filters"
 msgstr "เลือกโฟลเดอร์"
 
-#: filterimporterexporter.cpp:58
+#: filterimporterexporter.cpp:61
 #, fuzzy
 msgid "Filters"
 msgstr "ตัวกรอง %1"
 
-#: filterimporterexporter.cpp:182
+#: filterimporterexporter.cpp:67
+#, fuzzy
+msgid "Unselect All"
+msgstr "เลือกข้อความทั้งหมด"
+
+#: filterimporterexporter.cpp:213
 #, fuzzy
 msgid "Import Filters"
 msgstr "สร้างตัวกรองใหม่"
 
-#: filterimporterexporter.cpp:189
+#: filterimporterexporter.cpp:220
 msgid ""
 "The selected file is not readable. Your file access permissions might be "
 "insufficient."
 msgstr ""
 
-#: filterimporterexporter.cpp:204
+#: filterimporterexporter.cpp:235
 #, fuzzy
 msgid "Export Filters"
 msgstr "การส่งออกกุญแจล้มเหลว"
@@ -3039,8 +3347,8 @@ msgstr ""
 "ไม่สามารถเขียนแฟ้ม %1 ได้:\n"
 "\"%2\" มีส่วนรายละเอียดที่ผิดพลาด"
 
-#: filterlogdlg.cpp:262 kmcommands.cpp:2706 kmcommands.cpp:2730
-#: kmmainwidget.cpp:1795 kmmainwidget.cpp:1812 urlhandlermanager.cpp:489
+#: filterlogdlg.cpp:262 kmcommands.cpp:2772 kmcommands.cpp:2796
+#: kmmainwidget.cpp:1772 kmmainwidget.cpp:1789 urlhandlermanager.cpp:556
 msgid "KMail Error"
 msgstr "ข้อผิดพลาดของ Kmail"
 
@@ -3085,76 +3393,92 @@ msgid ""
 "account on the server will tell you which one it is."
 msgstr ""
 
-#: folderdiaacltab.cpp:106 folderdiaacltab.cpp:341
+#: folderdiaacltab.cpp:103 recipientseditor.cpp:776
+msgid "Se&lect..."
+msgstr "เลือก..."
+
+#: folderdiaacltab.cpp:106 folderdiaacltab.cpp:340
 msgid "Permissions"
 msgstr "สิทธิ์ที่อนุญาต"
 
-#: folderdiaacltab.cpp:247
+#: folderdiaacltab.cpp:118
+msgid "<b>Note: </b>Renaming requires write permissions on the parent folder."
+msgstr ""
+
+#: folderdiaacltab.cpp:245
 msgid "Custom Permissions"
 msgstr "กำหนดสิทธิ์ที่อนุญาตเอง"
 
-#: folderdiaacltab.cpp:249
+#: folderdiaacltab.cpp:247
 msgid "Custom Permissions (%1)"
 msgstr "กำหนดสิทธิ์ที่อนุญาตเอง (%1)"
 
-#: folderdiaacltab.cpp:340
+#: folderdiaacltab.cpp:339
 msgid "User Id"
 msgstr "หมายเลขผู้ใช้"
 
-#: folderdiaacltab.cpp:352
+#: folderdiaacltab.cpp:351
 msgid "Add Entry..."
 msgstr "เพิ่มรายการ..."
 
-#: folderdiaacltab.cpp:353
+#: folderdiaacltab.cpp:352
 msgid "Modify Entry..."
 msgstr "แก้ไขรายการ..."
 
-#: folderdiaacltab.cpp:354
+#: folderdiaacltab.cpp:353
 msgid "Remove Entry"
 msgstr "ลบรายการ"
 
-#: folderdiaacltab.cpp:426
+#: folderdiaacltab.cpp:428
 msgid "Error retrieving user permissions."
 msgstr "เกิดข้อผิดพลาดในการรับข้อมูลสิทธิ์ที่อนุญาตของผู้ใช้"
 
-#: folderdiaacltab.cpp:431
-msgid "Information not retrieved from server yet, please use \"Check Mail\"."
+#: folderdiaacltab.cpp:430
+#, fuzzy
+msgid ""
+"You might not have enough permissions to see the permissions of this folder."
+msgstr "คุณยังไม่สิทธิ์ในการอ่าน/เขียนที่โฟลเดอร์ถังขยะของคุณ"
+
+#: folderdiaacltab.cpp:435
+msgid ""
+"Information not retrieved from server, you need to use \"Check Mail\" and have "
+"administrative privileges on the folder."
 msgstr ""
 
-#: folderdiaacltab.cpp:446 folderdiaquotatab.cpp:114
+#: folderdiaacltab.cpp:450 folderdiaquotatab.cpp:114
 msgid "Error: no IMAP account defined for this folder"
 msgstr ""
 
-#: folderdiaacltab.cpp:452 folderdiaquotatab.cpp:120
+#: folderdiaacltab.cpp:456 folderdiaquotatab.cpp:120
 msgid "Connecting to server %1, please wait..."
 msgstr "กำลังเชื่อมต่อไปยังเซิร์ฟเวอร์ %1, โปรดรอสักครู่..."
 
-#: folderdiaacltab.cpp:470 folderdiaquotatab.cpp:139
-#: kmfoldercachedimap.cpp:843
+#: folderdiaacltab.cpp:474 folderdiaquotatab.cpp:139
+#: kmfoldercachedimap.cpp:902
 #, c-format
 msgid "Error connecting to server %1"
 msgstr "เกิดข้อผิดพลาดในเชื่อมต่อกับเซิร์ฟเวอร์ %1"
 
-#: folderdiaacltab.cpp:490 folderdiaacltab.cpp:517
+#: folderdiaacltab.cpp:494 folderdiaacltab.cpp:522
 msgid "This IMAP server does not have support for access control lists (ACL)"
 msgstr ""
 
-#: folderdiaacltab.cpp:519
+#: folderdiaacltab.cpp:524
 #, c-format
 msgid ""
 "Error retrieving access control list (ACL) from server\n"
 "%1"
 msgstr ""
 
-#: folderdiaacltab.cpp:564
+#: folderdiaacltab.cpp:569
 msgid "Modify Permissions"
 msgstr "แก้ไขสิทธิ์ที่อนุญาต"
 
-#: folderdiaacltab.cpp:598
+#: folderdiaacltab.cpp:603
 msgid "Add Permissions"
 msgstr "เพิ่มสิทธิ์ที่อนุญาต"
 
-#: folderdiaacltab.cpp:631
+#: 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."
@@ -3187,8 +3511,8 @@ msgstr ""
 msgid "Select Folder"
 msgstr "เลือกโฟลเดอร์"
 
-#: folderrequester.cpp:95 kmcommands.cpp:1831 kmfoldermgr.cpp:45
-#: kmfoldertree.cpp:552
+#: folderrequester.cpp:95 kmcommands.cpp:1884 kmfoldermgr.cpp:45
+#: kmfoldertree.cpp:576
 msgid "Local Folders"
 msgstr "โฟลเดอร์ภายใน"
 
@@ -3217,7 +3541,7 @@ msgid ""
 "this folder.</qt>"
 msgstr ""
 
-#: foldershortcutdialog.cpp:91 kmfilterdlg.cpp:526 snippetdlg.cpp:93
+#: foldershortcutdialog.cpp:91 kmfilterdlg.cpp:530 snippetdlg.cpp:100
 msgid "The selected shortcut is already used, please select a different one."
 msgstr "ปุ่มพิมพ์ลัดที่เลือกถูกใช้งานอยู่แล้ว โปรดเลือกปุ่มพิมพ์อื่น"
 
@@ -3233,13 +3557,20 @@ msgstr "ทำสำเนาไว้ที่นี่"
 msgid "C&ancel"
 msgstr "ยกเลิก"
 
-#: headeritem.cpp:157 headeritem.cpp:164
+#: 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 "
+"reset to the main Inbox folder.</qt>"
+msgstr ""
+
+#: headeritem.cpp:179 headeritem.cpp:186
 msgid "Unknown"
 msgstr "ไม่ทราบ"
 
-#: headeritem.cpp:171 headerstyle.cpp:140 headerstyle.cpp:238
-#: headerstyle.cpp:442 headerstyle.cpp:625 headerstyle.cpp:778
-#: kmmainwidget.cpp:1057
+#: headeritem.cpp:193 headerstyle.cpp:141 headerstyle.cpp:240
+#: headerstyle.cpp:445 headerstyle.cpp:743 headerstyle.cpp:898
+#: kmmainwidget.cpp:1029
 msgid "No Subject"
 msgstr "ไม่มีชื่อเรื่อง"
 
@@ -3257,47 +3588,47 @@ msgstr ""
 msgid "Stat&us:"
 msgstr "สถานะ: "
 
-#: headerlistquicksearch.cpp:72
+#: headerlistquicksearch.cpp:73
 msgid "Any Status"
 msgstr "สถานะใด ๆ"
 
-#: headerlistquicksearch.cpp:91
+#: headerlistquicksearch.cpp:93
 #, fuzzy
 msgid "Open Full Search"
 msgstr "ลบการค้นหา"
 
-#: headerstyle.cpp:169 headerstyle.cpp:296 headerstyle.cpp:647
-#: headerstyle.cpp:860
+#: headerstyle.cpp:170 headerstyle.cpp:298 headerstyle.cpp:765
+#: headerstyle.cpp:974
 msgid "[vCard]"
 msgstr "[vCard]"
 
-#: headerstyle.cpp:174 headerstyle.cpp:314 headerstyle.cpp:672
-#: headerstyle.cpp:797
+#: headerstyle.cpp:175 headerstyle.cpp:316 headerstyle.cpp:790
+#: headerstyle.cpp:998
 msgid "CC: "
 msgstr "สำเนาถึง: "
 
-#: headerstyle.cpp:177 headerstyle.cpp:318 headerstyle.cpp:679
-#: headerstyle.cpp:800
+#: headerstyle.cpp:178 headerstyle.cpp:320 headerstyle.cpp:797
+#: headerstyle.cpp:1008
 msgid "BCC: "
 msgstr "ซ่อนสำเนาถึง: "
 
-#: headerstyle.cpp:272 headerstyle.cpp:685
+#: headerstyle.cpp:274 headerstyle.cpp:803
 msgid "Date: "
 msgstr "วันที่: "
 
-#: headerstyle.cpp:292 headerstyle.cpp:639 headerstyle.cpp:865
+#: headerstyle.cpp:294 headerstyle.cpp:757 headerstyle.cpp:979
 msgid "From: "
 msgstr "จาก: "
 
-#: headerstyle.cpp:310 headerstyle.cpp:665 headerstyle.cpp:873
+#: headerstyle.cpp:312 headerstyle.cpp:783 headerstyle.cpp:988
 msgid "To: "
 msgstr "ถึง: "
 
-#: headerstyle.cpp:322
+#: headerstyle.cpp:324
 msgid "Reply to: "
 msgstr "ตอบกลับไปยัง: "
 
-#: headerstyle.cpp:408
+#: headerstyle.cpp:410
 msgid ""
 "%1% probability of being spam.\n"
 "\n"
@@ -3305,24 +3636,47 @@ msgid ""
 "%2"
 msgstr ""
 
-#: headerstyle.cpp:609
+#: headerstyle.cpp:612
 msgid "Launch IM"
 msgstr ""
 
-#: headerstyle.cpp:642
+#: headerstyle.cpp:660
+msgid "Night"
+msgstr ""
+
+#: headerstyle.cpp:669
+#, fuzzy
+msgid "Morning"
+msgstr "การแจ้งเตือน"
+
+#: headerstyle.cpp:678
+#, fuzzy
+msgid "Afternoon"
+msgstr "หลังจาก"
+
+#: headerstyle.cpp:687
+msgid "Evening"
+msgstr ""
+
+#: headerstyle.cpp:724
+#, fuzzy
+msgid "Sender's Current Time:"
+msgstr "การแสดงตัวของผู้ส่ง:"
+
+#: headerstyle.cpp:760
 msgid "(resent from %1)"
 msgstr ""
 
-#: headerstyle.cpp:694
+#: headerstyle.cpp:812
 #, fuzzy
 msgid "User-Agent: "
 msgstr "ความเร่งด่วน"
 
-#: headerstyle.cpp:703
+#: headerstyle.cpp:821
 msgid "X-Mailer: "
 msgstr ""
 
-#: headerstyle.cpp:723
+#: headerstyle.cpp:843
 #, fuzzy
 msgid "Spam Status:"
 msgstr "สถานะ: "
@@ -3380,15 +3734,15 @@ msgstr ""
 "<br>M"
 "<br>L</b></qt>"
 
-#: identitydialog.cpp:90
+#: identitydialog.cpp:93
 msgid "Edit Identity"
 msgstr "แก้ไขการแสดงตัว"
 
-#: identitydialog.cpp:118
+#: identitydialog.cpp:121
 msgid "&Your name:"
 msgstr "ชื่อของคุณ:"
 
-#: identitydialog.cpp:120
+#: identitydialog.cpp:123
 msgid ""
 "<qt>"
 "<h3>Your name</h3>"
@@ -3398,11 +3752,11 @@ msgid ""
 "address.</p></qt>"
 msgstr ""
 
-#: identitydialog.cpp:132
+#: identitydialog.cpp:135
 msgid "Organi&zation:"
 msgstr "องค์กร:"
 
-#: identitydialog.cpp:134
+#: identitydialog.cpp:137
 msgid ""
 "<qt>"
 "<h3>Organization</h3>"
@@ -3411,38 +3765,65 @@ msgid ""
 "<p>It is safe (and normal) to leave this blank.</p></qt>"
 msgstr ""
 
-#: identitydialog.cpp:147
+#: identitydialog.cpp:149
 msgid "&Email address:"
 msgstr "ที่อยู่อีเมล:"
 
-#: identitydialog.cpp:149
+#: identitydialog.cpp:151
 msgid ""
 "<qt>"
 "<h3>Email address</h3>"
-"<p>This field should have your full email address.</p>"
+"<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:161
+#: identitydialog.cpp:165
+#, fuzzy
+msgid "Email a&liases:"
+msgstr "ที่อยู่อีเมล:"
+
+#: identitydialog.cpp:167
+msgid ""
+"<qt>"
+"<h3>Email aliases</h3>"
+"<p>This field contains alias addresses that should also be considered as "
+"belonging to this identity (as opposed to representing a different "
+"identity).</p>"
+"<p>Example:</p>"
+"<table>"
+"<tr>"
+"<th>Primary address:</th>"
+"<td>first.last@example.org</td></tr>"
+"<tr>"
+"<th>Aliases:</th>"
+"<td>first@example.org"
+"<br>last@example.org</td></tr></table>"
+"<p>Type one alias address per line.</p></qt>"
+msgstr ""
+
+#: identitydialog.cpp:185
 msgid "Cryptograph&y"
 msgstr "การเข้ารหัส"
 
-#: identitydialog.cpp:168 identitydialog.cpp:192 identitydialog.cpp:217
-#: identitydialog.cpp:243
+#: identitydialog.cpp:192 identitydialog.cpp:216 identitydialog.cpp:241
+#: identitydialog.cpp:267
 msgid "Chang&e..."
 msgstr "เปลี่ยน..."
 
-#: identitydialog.cpp:169
+#: identitydialog.cpp:193
 msgid "Your OpenPGP Signature Key"
 msgstr "กุญแจลายเซ็น OpenPGP ของคุณ"
 
-#: identitydialog.cpp:170
+#: identitydialog.cpp:194
 msgid ""
 "Select the OpenPGP key which should be used to digitally sign your messages."
 msgstr "เลือกกุญแจ OpenPGP ที่จะใช้ในการเซ็นจดหมายของคุณ และใช้ในการเข้ารหัส"
 
-#: identitydialog.cpp:174
+#: identitydialog.cpp:198
 msgid ""
 "<qt>"
 "<p>The OpenPGP key you choose here will be used to digitally sign messages. You "
@@ -3452,22 +3833,22 @@ msgid ""
 "<p>You can find out more about keys at <a>http://www.gnupg.org</a></p></qt>"
 msgstr ""
 
-#: identitydialog.cpp:181
+#: identitydialog.cpp:205
 msgid "OpenPGP signing key:"
 msgstr "กุญแจ OpenPGP สำหรับเซ็น:"
 
-#: identitydialog.cpp:193
+#: identitydialog.cpp:217
 msgid "Your OpenPGP Encryption Key"
 msgstr "กุญแจ OpenPGP ของคุณสำหรับเข้ารหัส"
 
-#: identitydialog.cpp:194
+#: 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."
 msgstr "เลือกกุญแจ OpenPGP ที่ควรใช้ในการเซ็นจดหมายของคุณ และใช้ในการเข้ารหัส"
 
-#: identitydialog.cpp:199
+#: identitydialog.cpp:223
 msgid ""
 "<qt>"
 "<p>The OpenPGP key you choose here will be used to encrypt messages to yourself "
@@ -3479,23 +3860,23 @@ msgid ""
 "<p>You can find out more about keys at <a>http://www.gnupg.org</a></qt>"
 msgstr ""
 
-#: identitydialog.cpp:206
+#: identitydialog.cpp:230
 msgid "OpenPGP encryption key:"
 msgstr "กุญแจ OpenPGP สำหรับใช้เข้ารหัส:"
 
-#: identitydialog.cpp:218
+#: identitydialog.cpp:242
 #, fuzzy
 msgid "Your S/MIME Signature Certificate"
 msgstr "ผิดพลาด: ไม่สามารถตรวจสอบลายเซ็นได้"
 
-#: identitydialog.cpp:219
+#: identitydialog.cpp:243
 #, fuzzy
 msgid ""
 "Select the S/MIME certificate which should be used to digitally sign your "
 "messages."
 msgstr "เลือกกุญแจ OpenPGP ที่ควรใช้ในการเซ็นจดหมายของคุณ และใช้ในการเข้ารหัส"
 
-#: identitydialog.cpp:223
+#: identitydialog.cpp:247
 msgid ""
 "<qt>"
 "<p>The S/MIME (X.509) certificate you choose here will be used to digitally "
@@ -3504,22 +3885,22 @@ msgid ""
 "emails using S/MIME; normal mail functions will not be affected.</p></qt>"
 msgstr ""
 
-#: identitydialog.cpp:228
+#: identitydialog.cpp:252
 #, fuzzy
 msgid "S/MIME signing certificate:"
 msgstr "การส่งใบรับรอง"
 
-#: identitydialog.cpp:244
+#: identitydialog.cpp:268
 msgid "Your S/MIME Encryption Certificate"
 msgstr ""
 
-#: identitydialog.cpp:245
+#: identitydialog.cpp:269
 msgid ""
 "Select the S/MIME certificate which should be used when encrypting to yourself "
 "and for the \"Attach My Certificate\" feature in the composer."
 msgstr ""
 
-#: identitydialog.cpp:250
+#: identitydialog.cpp:274
 msgid ""
 "<qt>"
 "<p>The S/MIME certificate you choose here will be used to encrypt messages to "
@@ -3529,24 +3910,24 @@ msgid ""
 "affected.</p></qt>"
 msgstr ""
 
-#: identitydialog.cpp:256
+#: identitydialog.cpp:280
 #, fuzzy
 msgid "S/MIME encryption certificate:"
 msgstr "เลือกใบรับรอง:"
 
-#: identitydialog.cpp:277
+#: identitydialog.cpp:301
 msgid "Preferred crypto message format:"
 msgstr "รูปแบบการเข้ารหัสจดหมาย:"
 
-#: identitydialog.cpp:290
+#: identitydialog.cpp:314
 msgid "&Advanced"
 msgstr "ตัวเลือกขั้นสูง"
 
-#: identitydialog.cpp:300
+#: identitydialog.cpp:324
 msgid "&Reply-To address:"
 msgstr "ที่อยู่สำหรับตอบกลับ:"
 
-#: identitydialog.cpp:302
+#: identitydialog.cpp:326
 msgid ""
 "<qt>"
 "<h3>Reply-To addresses</h3>"
@@ -3558,11 +3939,11 @@ msgid ""
 "<p>If in doubt, leave this field blank.</p></qt>"
 msgstr ""
 
-#: identitydialog.cpp:319
+#: identitydialog.cpp:343
 msgid "&BCC addresses:"
 msgstr "ที่อยู่ ซ่อนสำเนาถึง:"
 
-#: identitydialog.cpp:321
+#: identitydialog.cpp:345
 msgid ""
 "<qt>"
 "<h3>BCC (Blind Carbon Copy) addresses</h3>"
@@ -3575,50 +3956,55 @@ msgid ""
 "<p>If in doubt, leave this field blank.</p></qt>"
 msgstr ""
 
-#: identitydialog.cpp:337
+#: identitydialog.cpp:361
 msgid "D&ictionary:"
 msgstr "พจนานุกรม:"
 
-#: identitydialog.cpp:346
+#: identitydialog.cpp:370
 msgid "Sent-mail &folder:"
 msgstr "โฟลเดอร์จดหมายที่ส่งแล้ว:"
 
-#: identitydialog.cpp:355
+#: identitydialog.cpp:379
 msgid "&Drafts folder:"
 msgstr "โฟลเดอร์ฉบับร่าง:"
 
-#: identitydialog.cpp:364
+#: identitydialog.cpp:388
 #, fuzzy
 msgid "&Templates folder:"
 msgstr "โฟลเดอร์ถังขยะ:"
 
-#: identitydialog.cpp:369
+#: identitydialog.cpp:393
 msgid "Special &transport:"
 msgstr "การส่งถ่ายแบบพิเศษ:"
 
-#: identitydialog.cpp:386 kmfolderdia.cpp:717
+#: identitydialog.cpp:410 kmfolderdia.cpp:808
 #, fuzzy
 msgid "&Use custom message templates"
 msgstr "ต่อท้ายด้วยเลขจดหมายกำหนดเอง"
 
-#: identitydialog.cpp:392 kmfolderdia.cpp:725
+#: identitydialog.cpp:416 kmfolderdia.cpp:816
 msgid "&Copy global templates"
 msgstr ""
 
-#: identitydialog.cpp:407
+#: identitydialog.cpp:431
 msgid "&Signature"
 msgstr "ลายเซ็น"
 
-#: identitydialog.cpp:411
+#: identitydialog.cpp:435
 msgid "&Picture"
 msgstr "รูปภาพ"
 
-#: identitydialog.cpp:486 identitydialog.cpp:498 kmcomposewin.cpp:4004
+#: identitydialog.cpp:510 identitydialog.cpp:522 kmcomposewin.cpp:4117
 #, fuzzy
 msgid "Invalid Email Address"
 msgstr "เพิ่มที่อยู่อีเมล์"
 
-#: identitydialog.cpp:518
+#: identitydialog.cpp:530
+#, fuzzy
+msgid "Invalid Email Alias \"%1\""
+msgstr "เพิ่มที่อยู่อีเมล์"
+
+#: identitydialog.cpp:551
 msgid ""
 "One of the configured OpenPGP signing keys does not contain any user ID with "
 "the configured email address for this identity (%1).\n"
@@ -3626,13 +4012,13 @@ msgid ""
 "verify signatures made with this configuration."
 msgstr ""
 
-#: identitydialog.cpp:527
+#: identitydialog.cpp:560
 msgid ""
 "One of the configured OpenPGP encryption keys does not contain any user ID with "
 "the configured email address for this identity (%1)."
 msgstr ""
 
-#: identitydialog.cpp:534
+#: identitydialog.cpp:567
 msgid ""
 "One of the configured S/MIME signing certificates does not contain the "
 "configured email address for this identity (%1).\n"
@@ -3640,38 +4026,38 @@ msgid ""
 "verify signatures made with this configuration."
 msgstr ""
 
-#: identitydialog.cpp:543
+#: identitydialog.cpp:576
 msgid ""
 "One of the configured S/MIME encryption certificates does not contain the "
 "configured email address for this identity (%1)."
 msgstr ""
 
-#: identitydialog.cpp:551
+#: identitydialog.cpp:584
 #, fuzzy
 msgid "Email Address Not Found in Key/Certificates"
 msgstr "ที่อยู่อีเมล์ขององค์กรที่ออกใบรับรอง (CA) ที่จะออกใบรับรองให้"
 
-#: identitydialog.cpp:562
+#: identitydialog.cpp:595
 msgid "The signature file is not valid"
 msgstr "แฟ้มลายเซ็นใช้งานไม่ได้"
 
-#: identitydialog.cpp:582
+#: identitydialog.cpp:615
 msgid "Edit Identity \"%1\""
 msgstr "แก้ไขการแสดงตัว \"%1\""
 
-#: identitydialog.cpp:606
+#: identitydialog.cpp:640
 msgid ""
 "The custom sent-mail folder for identity \"%1\" does not exist (anymore); "
 "therefore, the default sent-mail folder will be used."
 msgstr ""
 
-#: identitydialog.cpp:617
+#: identitydialog.cpp:651
 msgid ""
 "The custom drafts folder for identity \"%1\" does not exist (anymore); "
 "therefore, the default drafts folder will be used."
 msgstr ""
 
-#: identitydialog.cpp:628
+#: identitydialog.cpp:662
 msgid ""
 "The custom templates folder for identity \"%1\" does not exist (anymore); "
 "therefore, the default templates folder will be used."
@@ -3692,99 +4078,99 @@ msgstr "ชื่อการแสดงตัว"
 msgid "Email Address"
 msgstr "ที่อยู่อีเมล"
 
-#: imapaccountbase.cpp:291 popaccount.cpp:154
+#: imapaccountbase.cpp:293 popaccount.cpp:154
 msgid "You need to supply a username and a password to access this mailbox."
 msgstr ""
 "คุณต้องกรอกข้อมูลชื่อผู้ใช้ และรหัสผ่านก่อน\n"
 "เพื่อเข้าใช้งานกล่องจดหมายนี้"
 
-#: imapaccountbase.cpp:296
+#: imapaccountbase.cpp:298
 msgid "Authorization Dialog"
 msgstr ""
 
-#: imapaccountbase.cpp:297 popaccount.cpp:155
+#: imapaccountbase.cpp:299 popaccount.cpp:155
 msgid "Account:"
 msgstr "บัญชีผู้ใช้:"
 
-#: imapaccountbase.cpp:318
+#: imapaccountbase.cpp:320
 #, c-format
 msgid "Could not start process for %1."
 msgstr "ไม่สามารถเริ่มโปรเซสสำหรับ %1 ได้"
 
-#: imapaccountbase.cpp:399
+#: imapaccountbase.cpp:403
 #, fuzzy
 msgid "Error while trying to subscribe to %1:"
 msgstr ""
 "มีข้อผิดพลาดขณะกำลังสร้างแฟ้ม `%1':\n"
 "%2"
 
-#: imapaccountbase.cpp:637
+#: imapaccountbase.cpp:645
 #, fuzzy
 msgid "Retrieving Namespaces"
 msgstr "ไปยังจดหมายเข้ามาใหม่"
 
-#: imapaccountbase.cpp:728
+#: imapaccountbase.cpp:736
 msgid ""
 "KMail has detected a prefix entry in the configuration of the account \"%1\" "
 "which is obsolete with the support of IMAP namespaces."
 msgstr ""
 
-#: imapaccountbase.cpp:742 imapaccountbase.cpp:756
+#: imapaccountbase.cpp:750 imapaccountbase.cpp:764
 msgid ""
 "The configuration was automatically migrated but you should check your account "
 "configuration."
 msgstr ""
 
-#: imapaccountbase.cpp:760
+#: imapaccountbase.cpp:768
 msgid ""
 "It was not possible to migrate your configuration automatically so please check "
 "your account configuration."
 msgstr ""
 
-#: imapaccountbase.cpp:874 imapaccountbase.cpp:875
+#: imapaccountbase.cpp:882 imapaccountbase.cpp:883
 #, fuzzy
 msgid "<unknown>"
 msgstr "ไม่รู้จัก"
 
-#: imapaccountbase.cpp:876
+#: imapaccountbase.cpp:884
 #, fuzzy
 msgid "Error while uploading message"
 msgstr ""
 "มีข้อผิดพลาด ขณะอ่านแฟ้ม:\n"
 "%1"
 
-#: imapaccountbase.cpp:878
+#: imapaccountbase.cpp:886
 msgid ""
 "Could not upload the message dated %1 from <i>%2</i> with subject <i>%3</i> "
 "to the server."
 msgstr ""
 
-#: imapaccountbase.cpp:880
+#: imapaccountbase.cpp:888
 #, fuzzy
 msgid "The destination folder was: <b>%1</b>."
 msgstr "โฟลเดอร์ปลายทาง:"
 
-#: imapaccountbase.cpp:882
+#: imapaccountbase.cpp:890
 msgid "The server reported:"
 msgstr ""
 
-#: imapaccountbase.cpp:892
+#: imapaccountbase.cpp:900
 #, fuzzy
 msgid "No detailed quota information available."
 msgstr "ไม่มีข้อมูลสถานะ"
 
-#: imapaccountbase.cpp:903
+#: imapaccountbase.cpp:911
 msgid "The folder is too close to its quota limit. (%1)"
 msgstr ""
 
-#: imapaccountbase.cpp:905
+#: 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."
 msgstr ""
 
-#: imapaccountbase.cpp:951
+#: imapaccountbase.cpp:959
 msgid ""
 "The connection to the server %1 was unexpectedly closed or timed out. It will "
 "be re-established automatically if possible."
@@ -3792,23 +4178,23 @@ msgstr ""
 "การเชื่อมต่อไปยังเซิร์ฟเวอร์ %1 ถูกยุติการเชื่อมต่ออย่างไม่คาดคิด "
 "หรืออาจจะหมดเวลาเชื่อมต่อ และจะพยายามทำการเชื่อมต่อใหม่หากเป็นไปได้"
 
-#: imapaccountbase.cpp:957
+#: imapaccountbase.cpp:965
 msgid "The connection to account %1 was broken."
 msgstr "การเชื่อมต่อสำหรับบัญชีผู้ใช้ %1 ถูกตัดขาด"
 
-#: imapaccountbase.cpp:960
+#: imapaccountbase.cpp:968
 msgid "The connection to account %1 timed out."
 msgstr "การเชื่อมต่อสำหรับบัญชีผู้ใช้ %1 หมดเวลาใช้งาน"
 
-#: imapaccountbase.cpp:1245
+#: imapaccountbase.cpp:1253
 msgid "Error while uploading status of messages to server: "
 msgstr "เกิดข้อผิดพลาดระหว่างอัพโหลดสถานะจดหมายไปยังเซิร์ฟเวอร์: "
 
-#: imapaccountbase.cpp:1290 listjob.cpp:118
+#: imapaccountbase.cpp:1298 listjob.cpp:118
 msgid "retrieving folders"
 msgstr "กำลังรับข้อมูลโฟลเดอร์"
 
-#: imapjob.cpp:153 kmfolderimap.cpp:496
+#: imapjob.cpp:153 kmfolderimap.cpp:490
 msgid "Uploading message data"
 msgstr "กำลังอัพโหลดข้อมูลจดหมาย"
 
@@ -3832,46 +4218,288 @@ msgstr "จดหมายที่มีชื่อเรื่อง: "
 msgid "Error while retrieving messages from the server."
 msgstr "เกิดข้อผิดพลาดระหว่างรับจดหมายจากเซิร์ฟเวอร์"
 
-#: imapjob.cpp:483
+#: imapjob.cpp:485
 msgid "Error while retrieving information on the structure of a message."
 msgstr "เกิดข้อผิดพลาดระหว่างรับข้อมูลบนโครงสร้างของจดหมาย"
 
-#: imapjob.cpp:541
+#: imapjob.cpp:543
 msgid "Uploading message data failed."
 msgstr "การอัพโหลดข้อมูลจดหมายล้มเหลว"
 
-#: imapjob.cpp:546
+#: imapjob.cpp:548
 msgid "Uploading message data completed."
 msgstr "การอัพโหลดข้อมูลจดหมายเสร็จเรียบร้อยแล้ว"
 
-#: imapjob.cpp:650
+#: imapjob.cpp:652
 msgid "Error while copying messages."
 msgstr "เกิดข้อผิดพลาดระหว่างคัดลอกจดหมาย"
 
-#: keyresolver.cpp:234
+#: importarchivedialog.cpp:36
+#, fuzzy
+msgid "Import Archive"
+msgstr "สร้างตัวกรองใหม่"
+
+#: importarchivedialog.cpp:87
+msgid "Please select an archive file that should be imported."
+msgstr ""
+
+#: importarchivedialog.cpp:88
+#, fuzzy
+msgid "No archive file selected"
+msgstr "ยังไม่มีการเลือกโฟลเดอร์"
+
+#: importarchivedialog.cpp:93
+#, fuzzy
+msgid "Please select the folder where the archive should be imported to."
+msgstr "โปรดเลือกโฟลเดอร์ที่จะย้ายจดหมายที่หมดอายุไปไว้"
+
+#: importarchivedialog.cpp:94
+#, fuzzy
+msgid "No target folder selected"
+msgstr "ยังไม่มีการเลือกโฟลเดอร์"
+
+#: importjob.cpp:80
+msgid "Importing the archive file '%1' into the folder '%2' succeeded."
+msgstr ""
+
+#: importjob.cpp:82
+#, fuzzy, c-format
+msgid ""
+"_n: 1 message was imported.\n"
+"%n messages were imported."
+msgstr "ประมวลผลแล้ว %n ฉบับ"
+
+#: importjob.cpp:83
+#, fuzzy
+msgid "Import finished."
+msgstr "สร้างตัวกรองใหม่"
+
+#: importjob.cpp:98
+#, fuzzy
+msgid "Failed to import the archive into folder '%1'."
+msgstr "ล้มเหลวในการสร้างโฟลเดอร์"
+
+#: importjob.cpp:105
+#, fuzzy
+msgid "Importing archive failed."
+msgstr "กำลังปรับปรุงแฟ้มแคช"
+
+#: importjob.cpp:114 importjob.cpp:287
+#, fuzzy
+msgid "Unable to create subfolder for folder '%1'."
+msgstr "ล้มเหลวในการสร้างโฟลเดอร์"
+
+#: importjob.cpp:214
+#, fuzzy, c-format
+msgid "Importing folder %1"
+msgstr "กำลังเปลี่ยนชื่อโฟลเดอร์"
+
+#: importjob.cpp:234
+#, fuzzy
+msgid "Failed to add a message to the folder '%1'."
+msgstr "ไม่สามารถเพิ่มจดหมายไปยังโฟลเดอร์: "
+
+#: importjob.cpp:254
+#, fuzzy
+msgid "Failed to upload a message to the IMAP server."
+msgstr "คงจดหมายที่ดึงข้อมูลแล้วไว้บนเซิร์ฟเวอร์"
+
+#: importjob.cpp:337
+msgid "Unexpected subdirectory named '%1'."
+msgstr ""
+
+#: importjob.cpp:371
+msgid "The file '%1' does not appear to be a valid archive."
+msgstr ""
+
+#: importjob.cpp:376
+msgid "Unable to open archive file '%1'"
+msgstr ""
+
+#: importjob.cpp:382
+msgid "Importing Archive"
+msgstr ""
+
+#: keyresolver.cpp:306
 msgid ""
 "One or more of your configured OpenPGP encryption keys or S/MIME certificates "
 "is not fully trusted for encryption."
 msgstr ""
 
-#: keyresolver.cpp:240
+#: 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."
+msgstr ""
+
+#: keyresolver.cpp:315
 msgid ""
 "\n"
 "The following keys are only marginally trusted: \n"
 msgstr ""
 
-#: keyresolver.cpp:244
+#: keyresolver.cpp:319
 msgid ""
 "\n"
 "The following keys or certificates have unknown trust level: \n"
 msgstr ""
 
-#: keyresolver.cpp:248
+#: keyresolver.cpp:323
+msgid ""
+"\n"
+"The following keys or certificates are <b>revoked</b>: \n"
+msgstr ""
+
+#: keyresolver.cpp:327
 #, fuzzy
 msgid "Not Fully Trusted Encryption Keys"
 msgstr "กุญแจการเข้ารหัสยังไม่มีการนิยาม"
 
-#: keyresolver.cpp:553
+#: 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>"
+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>"
+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>"
+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>"
+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>"
+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>"
+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>"
+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>"
+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>"
+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>"
+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>"
+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>"
+msgstr ""
+
+#: keyresolver.cpp:724
+#, fuzzy
+msgid "OpenPGP Key Expired"
+msgstr "กุญแจ OpenPGP 0x%1"
+
+#: keyresolver.cpp:725
+#, fuzzy
+msgid "S/MIME Certificate Expired"
+msgstr "การส่งใบรับรอง"
+
+#: keyresolver.cpp:750
 msgid ""
 "_n: "
 "<p>Your OpenPGP signing key</p><p align=center><b>%1</b> (KeyID 0x%2)</p>"
@@ -3880,7 +4508,7 @@ msgid ""
 "<p>expires in less than %n days.</p>"
 msgstr ""
 
-#: keyresolver.cpp:558
+#: keyresolver.cpp:755
 msgid ""
 "_n: "
 "<p>Your OpenPGP encryption key</p><p align=center><b>%1</b> (KeyID 0x%2)</p>"
@@ -3889,7 +4517,7 @@ msgid ""
 "<p>expires in less than %n days.</p>"
 msgstr ""
 
-#: keyresolver.cpp:563
+#: keyresolver.cpp:760
 msgid ""
 "_n: "
 "<p>The OpenPGP key for</p><p align=center><b>%1</b> (KeyID 0x%2)</p>"
@@ -3898,7 +4526,7 @@ msgid ""
 "<p>expires in less than %n days.</p>"
 msgstr ""
 
-#: keyresolver.cpp:573
+#: keyresolver.cpp:770
 msgid ""
 "_n: "
 "<p>The root certificate</p><p align=center><b>%3</b></p>"
@@ -3911,7 +4539,7 @@ msgid ""
 "<p>expires in less than %n days.</p>"
 msgstr ""
 
-#: keyresolver.cpp:580
+#: keyresolver.cpp:777
 msgid ""
 "_n: "
 "<p>The root certificate</p><p align=center><b>%3</b></p>"
@@ -3924,7 +4552,7 @@ msgid ""
 "<p>expires in less than %n days.</p>"
 msgstr ""
 
-#: keyresolver.cpp:587
+#: keyresolver.cpp:784
 msgid ""
 "_n: "
 "<p>The root certificate</p><p align=center><b>%3</b></p>"
@@ -3935,7 +4563,7 @@ msgid ""
 "<p>expires in less than %n days.</p>"
 msgstr ""
 
-#: keyresolver.cpp:595
+#: keyresolver.cpp:792
 msgid ""
 "_n: "
 "<p>The intermediate CA certificate</p><p align=center><b>%3</b></p>"
@@ -3948,7 +4576,7 @@ msgid ""
 "<p>expires in less than %n days.</p>"
 msgstr ""
 
-#: keyresolver.cpp:602
+#: keyresolver.cpp:799
 msgid ""
 "_n: "
 "<p>The intermediate CA certificate</p><p align=center><b>%3</b></p>"
@@ -3961,7 +4589,7 @@ msgid ""
 "<p>expires in less than %n days.</p>"
 msgstr ""
 
-#: keyresolver.cpp:609
+#: keyresolver.cpp:806
 msgid ""
 "_n: "
 "<p>The intermediate CA certificate</p><p align=center><b>%3</b></p>"
@@ -3972,7 +4600,7 @@ msgid ""
 "<p>expires in less than %n days.</p>"
 msgstr ""
 
-#: keyresolver.cpp:618
+#: keyresolver.cpp:815
 msgid ""
 "_n: "
 "<p>Your S/MIME signing certificate</p><p align=center><b>%1</b> "
@@ -3983,7 +4611,7 @@ msgid ""
 "<p>expires in less than %n days.</p>"
 msgstr ""
 
-#: keyresolver.cpp:623
+#: keyresolver.cpp:820
 msgid ""
 "_n: "
 "<p>Your S/MIME encryption certificate</p><p align=center><b>%1</b> "
@@ -3994,7 +4622,7 @@ msgid ""
 "<p>expires in less than %n days.</p>"
 msgstr ""
 
-#: keyresolver.cpp:628
+#: keyresolver.cpp:825
 msgid ""
 "_n: "
 "<p>The S/MIME certificate for</p><p align=center><b>%1</b> "
@@ -4005,16 +4633,16 @@ msgid ""
 "<p>expires in less than %n days.</p>"
 msgstr ""
 
-#: keyresolver.cpp:634
+#: keyresolver.cpp:832
 #, fuzzy
 msgid "OpenPGP Key Expires Soon"
 msgstr "กุญแจ OpenPGP 0x%1"
 
-#: keyresolver.cpp:635
+#: keyresolver.cpp:833
 msgid "S/MIME Certificate Expires Soon"
 msgstr ""
 
-#: keyresolver.cpp:668
+#: 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 "
@@ -4023,12 +4651,12 @@ msgid ""
 "prompted to specify the keys to use."
 msgstr ""
 
-#: keyresolver.cpp:676 keyresolver.cpp:989 keyresolver.cpp:1016
+#: keyresolver.cpp:875 keyresolver.cpp:1204 keyresolver.cpp:1231
 #, fuzzy
 msgid "Unusable Encryption Keys"
 msgstr "กุญแจการเข้ารหัสยังไม่มีการนิยาม"
 
-#: keyresolver.cpp:712
+#: keyresolver.cpp:911
 msgid ""
 "One or more of your configured OpenPGP signing keys or S/MIME signing "
 "certificates is not usable for signing. Please reconfigure your signing keys "
@@ -4037,12 +4665,12 @@ msgid ""
 "prompted to specify the keys to use."
 msgstr ""
 
-#: keyresolver.cpp:720 keyresolver.cpp:1043 keyresolver.cpp:1059
+#: keyresolver.cpp:919 keyresolver.cpp:1258 keyresolver.cpp:1274
 #, fuzzy
 msgid "Unusable Signing Keys"
 msgstr "ยังไม่ได้กำหนดกุญแจการเซ็น"
 
-#: keyresolver.cpp:980
+#: keyresolver.cpp:1195
 msgid ""
 "Examination of recipient's encryption preferences yielded that the message "
 "should be encrypted using OpenPGP, at least for some recipients;\n"
@@ -4052,7 +4680,7 @@ msgid ""
 "be able to read your own messages if you do so."
 msgstr ""
 
-#: keyresolver.cpp:1007
+#: 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"
@@ -4062,7 +4690,7 @@ msgid ""
 "be able to read your own messages if you do so."
 msgstr ""
 
-#: keyresolver.cpp:1037
+#: 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"
@@ -4070,11 +4698,11 @@ msgid ""
 "identity."
 msgstr ""
 
-#: keyresolver.cpp:1044
+#: keyresolver.cpp:1259
 msgid "Do Not OpenPGP-Sign"
 msgstr ""
 
-#: keyresolver.cpp:1053
+#: 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"
@@ -4082,109 +4710,111 @@ msgid ""
 "identity."
 msgstr ""
 
-#: keyresolver.cpp:1060
+#: keyresolver.cpp:1275
 msgid "Do Not S/MIME-Sign"
 msgstr ""
 
-#: keyresolver.cpp:1116
+#: keyresolver.cpp:1331
 msgid ""
 "Examination of recipient's signing preferences showed no common type of "
 "signature matching your available signing keys.\n"
 "Send message without signing?"
 msgstr ""
 
-#: keyresolver.cpp:1120
+#: keyresolver.cpp:1335
 #, fuzzy
 msgid "No signing possible"
 msgstr "ใช้สำหรับการเซ็น"
 
-#: keyresolver.cpp:1275
+#: keyresolver.cpp:1490
 msgid ""
 "You did not select an encryption key for yourself (encrypt to self). You will "
 "not be able to decrypt your own message if you encrypt it."
 msgstr ""
 
-#: keyresolver.cpp:1279 keyresolver.cpp:1303 keyresolver.cpp:1317
+#: keyresolver.cpp:1494 keyresolver.cpp:1518 keyresolver.cpp:1532
 #, fuzzy
 msgid "Missing Key Warning"
 msgstr "ไม่มีกุญแจสำหรับการเซ็น"
 
-#: keyresolver.cpp:1280 keyresolver.cpp:1318 messagecomposer.cpp:885
-#: messagecomposer.cpp:910 messagecomposer.cpp:957
+#: keyresolver.cpp:1495 keyresolver.cpp:1533 messagecomposer.cpp:883
+#: messagecomposer.cpp:908 messagecomposer.cpp:955
 msgid "&Encrypt"
 msgstr "เข้ารหัส"
 
-#: keyresolver.cpp:1296
+#: keyresolver.cpp:1511
 msgid ""
 "You did not select an encryption key for the recipient of this message; "
 "therefore, the message will not be encrypted."
 msgstr ""
 
-#: keyresolver.cpp:1299
+#: keyresolver.cpp:1514
 msgid ""
 "You did not select an encryption key for any of the recipients of this message; "
 "therefore, the message will not be encrypted."
 msgstr ""
 
-#: keyresolver.cpp:1304 messagecomposer.cpp:933
+#: keyresolver.cpp:1519 messagecomposer.cpp:931
 #, fuzzy
 msgid "Send &Unencrypted"
 msgstr "บันทึกแบบไม่เข้ารหัส"
 
-#: keyresolver.cpp:1309
+#: keyresolver.cpp:1524
 msgid ""
 "You did not select an encryption key for one of the recipients: this person "
 "will not be able to decrypt the message if you encrypt it."
 msgstr ""
 
-#: keyresolver.cpp:1312
+#: keyresolver.cpp:1527
 msgid ""
 "You did not select encryption keys for some of the recipients: these persons "
 "will not be able to decrypt the message if you encrypt it."
 msgstr ""
 
-#: keyresolver.cpp:1367
+#: keyresolver.cpp:1585
 #, fuzzy
 msgid "Encryption Key Selection"
 msgstr "ตั้งค่าการเข้ารหัส"
 
-#: keyresolver.cpp:1408
+#: keyresolver.cpp:1628
 msgid ""
-"_: if in your language something like 'key(s)' isn't possible please use the "
-"plural in the translation\n"
-"There is a problem with the encryption key(s) for \"%1\".\n"
+"_: if in your language something like 'certificate(s)' isn't possible please "
+"use the plural in the translation\n"
+"There is a problem with the encryption certificate(s) for \"%1\".\n"
 "\n"
-"Please re-select the key(s) which should be used for this recipient."
+"Please re-select the certificate(s) which should be used for this recipient."
 msgstr ""
 
-#: keyresolver.cpp:1452
+#: keyresolver.cpp:1678
 msgid ""
-"_: if in your language something like 'key(s)' isn't possible please use the "
-"plural in the translation\n"
-"No valid and trusted encryption key was found for \"%1\".\n"
-"\n"
-"Select the key(s) which should be used for this recipient."
+"_: if in your language something like 'certificate(s)' isn't possible please "
+"use the plural in the translation\n"
+"<qt>No valid and trusted encryption certificate was found for \"%1\"."
+"<br/>"
+"<br/>Select the certificate(s) which should be used for this recipient. If "
+"there is no suitable certificate in the list you can also search for external "
+"certificates by clicking the button: search for external certificates.</qt>"
 msgstr ""
 
-#: keyresolver.cpp:1459
+#: keyresolver.cpp:1687
 msgid ""
-"_: if in your language something like 'key(s)' isn't possible please use the "
-"plural in the translation\n"
-"More than one key matches \"%1\".\n"
+"_: if in your language something like 'certificate(s)' isn't possible please "
+"use the plural in the translation\n"
+"More than one certificate matches \"%1\".\n"
 "\n"
-"Select the key(s) which should be used for this recipient."
+"Select the certificate(s) which should be used for this recipient."
 msgstr ""
 
-#: keyresolver.cpp:1567
+#: keyresolver.cpp:1800
 msgid "Name Selection"
 msgstr ""
 
-#: keyresolver.cpp:1567
+#: keyresolver.cpp:1800
 #, fuzzy
 msgid "Which name shall the contact '%1' have in your addressbook?"
 msgstr "มีที่อยู่อีเมล์ '%1' ในสมุดที่อยู่ของคุณอยู่แล้ว"
 
-#: kmaccount.cpp:49 kmaccount.cpp:381 kmsender.cpp:538
+#: kmaccount.cpp:49 kmaccount.cpp:381 kmsender.cpp:539
 #, c-format
 msgid "Executing precommand %1"
 msgstr "กำลังประมวลผลคำสั่ง %1"
@@ -4218,12 +4848,12 @@ msgstr ""
 msgid "Checking account: %1"
 msgstr "กำลังตรวจจดหมายใหม่ของบัญชีผู้ใช้ %1"
 
-#: kmacctimap.cpp:398 kmfolderimap.cpp:858
+#: kmacctimap.cpp:398 kmfolderimap.cpp:852
 #, fuzzy
 msgid " completed"
 msgstr "ยังไม่มีการกำหนด"
 
-#: kmacctimap.cpp:607 kmheaders.cpp:1275
+#: kmacctimap.cpp:607 kmheaders.cpp:1313
 #, fuzzy
 msgid "Unable to process messages: "
 msgstr "ข้อผิดพลาดร้ายแรง: ไม่สามารถประมวผลจดหมายได้ (พื้นที่เต็มหรือเปล่า ?)"
@@ -4256,14 +4886,14 @@ msgstr "การสื่อสารล้มเหลว: ไม่สาม�
 msgid "Moving message %3 of %2 from %1."
 msgstr "กำลังย้ายจดหมาย %3 ของ %2 จาก %1"
 
-#: kmacctlocal.cpp:244
+#: kmacctlocal.cpp:245
 #, fuzzy
 msgid "<qt>Cannot remove mail from mailbox <b>%1</b>:<br>%2</qt>"
 msgstr ""
 "ไม่สามารถลบจดหมายจากกล่องจดหมาย `%1' ได้:\n"
 "%2"
 
-#: kmacctlocal.cpp:254
+#: kmacctlocal.cpp:255
 msgid ""
 "_n: Fetched 1 message from mailbox %1.\n"
 "Fetched %n messages from mailbox %1."
@@ -4305,123 +4935,138 @@ msgstr ""
 msgid "&Maildir mailbox"
 msgstr "ไดเร็กทอรี กล่องจดหมาย"
 
-#: kmailicalifaceimpl.cpp:90 kmfolderdia.cpp:448 newfolderdialog.cpp:125
+#: kmailicalifaceimpl.cpp:93 kmfolderdia.cpp:506 newfolderdialog.cpp:130
 msgid "Mail"
 msgstr "จดหมาย"
 
-#: kmailicalifaceimpl.cpp:91 kmfolderdia.cpp:449 newfolderdialog.cpp:126
+#: kmailicalifaceimpl.cpp:94 kmfolderdia.cpp:507 newfolderdialog.cpp:131
 msgid "Calendar"
 msgstr ""
 
-#: kmailicalifaceimpl.cpp:92 kmfolderdia.cpp:450 newfolderdialog.cpp:127
+#: kmailicalifaceimpl.cpp:95 kmfolderdia.cpp:508 newfolderdialog.cpp:132
 #, fuzzy
 msgid "Contacts"
 msgstr "เนื้อหา"
 
-#: kmailicalifaceimpl.cpp:93 kmfolderdia.cpp:451 newfolderdialog.cpp:128
+#: kmailicalifaceimpl.cpp:96 kmfolderdia.cpp:509 newfolderdialog.cpp:133
 #, fuzzy
 msgid "Notes"
 msgstr "บันทึกช่วยจำ:"
 
-#: kmailicalifaceimpl.cpp:94 kmfolderdia.cpp:452 newfolderdialog.cpp:129
+#: kmailicalifaceimpl.cpp:97 kmfolderdia.cpp:510 newfolderdialog.cpp:134
 msgid "Tasks"
 msgstr ""
 
-#: kmailicalifaceimpl.cpp:95 kmfolderdia.cpp:453 newfolderdialog.cpp:130
+#: kmailicalifaceimpl.cpp:98 kmfolderdia.cpp:511 newfolderdialog.cpp:135
 msgid "Journal"
 msgstr ""
 
-#: kmailicalifaceimpl.cpp:667
+#: kmailicalifaceimpl.cpp:684
 msgid "%1's %2"
 msgstr ""
 
-#: kmailicalifaceimpl.cpp:681
+#: kmailicalifaceimpl.cpp:700
 msgid "My %1 (%2)"
 msgstr ""
 
-#: kmailicalifaceimpl.cpp:685
+#: kmailicalifaceimpl.cpp:704 kmailicalifaceimpl.cpp:708
 #, c-format
 msgid "My %1"
 msgstr ""
 
-#: kmailicalifaceimpl.cpp:1726
+#: kmailicalifaceimpl.cpp:1777
 msgid ""
 "KMail will now create the required groupware folders as subfolders of %1; if "
 "you do not want this, cancel and the IMAP resource will be disabled"
 msgstr ""
 
-#: kmailicalifaceimpl.cpp:1736
+#: kmailicalifaceimpl.cpp:1787
 msgid "%1: no folder found. It will be created."
 msgstr ""
 
-#: kmailicalifaceimpl.cpp:1738
+#: kmailicalifaceimpl.cpp:1789
 msgid "%1: found folder %2. It will be set as the main groupware folder."
 msgstr ""
 
-#: kmailicalifaceimpl.cpp:1744
+#: kmailicalifaceimpl.cpp:1795
 msgid ""
 "<qt>KMail found the following groupware folders in %1 and needs to perform the "
 "following operations: %2"
 "<br>If you do not want this, cancel and the IMAP resource will be disabled"
 msgstr ""
 
-#: kmailicalifaceimpl.cpp:1751
+#: kmailicalifaceimpl.cpp:1802
 msgid "Standard Groupware Folders"
 msgstr ""
 
-#: kmailicalifaceimpl.cpp:1953
+#: kmailicalifaceimpl.cpp:1992
+#, fuzzy
+msgid "Default folder"
+msgstr "ลบโฟลเดอร์"
+
+#: kmailicalifaceimpl.cpp:1993
+msgid "There are multiple %1 default folders, please choose one:"
+msgstr ""
+
+#: kmailicalifaceimpl.cpp:2019
 #, fuzzy
 msgid "You do not have read/write permission to your %1 folder."
 msgstr "คุณยังไม่สิทธิ์ในการอ่าน/เขียนที่โฟลเดอร์จดหมายเข้าของคุณ"
 
-#: kmailicalifaceimpl.cpp:2007
+#: kmailicalifaceimpl.cpp:2073
 #, fuzzy
 msgid "You do not have read/write permission to your folder."
 msgstr "คุณยังไม่สิทธิ์ในการอ่าน/เขียนที่โฟลเดอร์จดหมายเข้าของคุณ"
 
-#: kmcommands.cpp:300
+#: kmcommands.cpp:304
 msgid "Please wait"
 msgstr "โปรดรอสักครู่"
 
-#: kmcommands.cpp:302 kmcommands.cpp:403
+#: kmcommands.cpp:306 kmcommands.cpp:407
 #, c-format
 msgid ""
 "_n: Please wait while the message is transferred\n"
 "Please wait while the %n messages are transferred"
 msgstr "โปรดรอขณะที่กำลังส่งถ่ายจดหมาย %n ฉบับ"
 
-#: kmcommands.cpp:594
+#: kmcommands.cpp:598
 msgid "Address copied to clipboard."
 msgstr "คัดลอกที่อยู่ไปยังคลิปบอร์ดแล้ว"
 
-#: kmcommands.cpp:601
+#: kmcommands.cpp:605
 msgid "URL copied to clipboard."
 msgstr "คัดลอก URL ไปยังคลิปบอร์ดแล้ว"
 
-#: kmcommands.cpp:638
+#: kmcommands.cpp:642
 #, fuzzy
 msgid "<qt>File <b>%1</b> exists.<br>Do you want to replace it?</qt>"
 msgstr ""
 "มีแฟ้ม %1 อยู่แล้ว\n"
 "คุณต้องการแทนที่มันหรือไม่ ?"
 
-#: kmcommands.cpp:639 kmcommands.cpp:939 kmkernel.cpp:1940
+#: kmcommands.cpp:643 kmcommands.cpp:966 kmkernel.cpp:2050
 msgid "Save to File"
 msgstr "บันทึกลงแฟ้ม"
 
-#: kmcommands.cpp:639 kmcommands.cpp:939 kmkernel.cpp:1940
+#: kmcommands.cpp:643 kmcommands.cpp:966 kmkernel.cpp:2050
 msgid "&Replace"
 msgstr "แทนที่"
 
-#: kmcommands.cpp:739
+#: kmcommands.cpp:743
 msgid "Message as Plain Text"
 msgstr "จดหมายเป็นข้อความธรรมดา"
 
-#: kmcommands.cpp:882
+#: kmcommands.cpp:775
+msgid ""
+"*.mbox|email messages (*.mbox)\n"
+"*|all files (*)"
+msgstr ""
+
+#: kmcommands.cpp:908
 msgid "The message was removed while saving it. It has not been saved."
 msgstr ""
 
-#: kmcommands.cpp:938 kmkernel.cpp:1939
+#: kmcommands.cpp:965 kmkernel.cpp:2049
 msgid ""
 "File %1 exists.\n"
 "Do you want to replace it?"
@@ -4429,20 +5074,20 @@ msgstr ""
 "มีแฟ้ม %1 อยู่แล้ว\n"
 "คุณต้องการแทนที่มันหรือไม่ ?"
 
-#: kmcommands.cpp:982
+#: kmcommands.cpp:1009
 #, fuzzy
 msgid "Open Message"
 msgstr "จดหมาย"
 
-#: kmcommands.cpp:1020 kmcommands.cpp:1048
+#: kmcommands.cpp:1047 kmcommands.cpp:1075
 msgid "The file does not contain a message."
 msgstr ""
 
-#: kmcommands.cpp:1066
+#: kmcommands.cpp:1093
 msgid "The file contains multiple messages. Only the first message is shown."
 msgstr ""
 
-#: kmcommands.cpp:1363
+#: kmcommands.cpp:1404
 #, fuzzy
 msgid ""
 "\n"
@@ -4458,95 +5103,95 @@ msgstr ""
 "\n"
 "--\n"
 
-#: kmcommands.cpp:1697 kmheaders.cpp:1407
+#: kmcommands.cpp:1750 kmheaders.cpp:1445
 #, fuzzy
 msgid "Filtering messages"
 msgstr "ลบจดหมาย"
 
-#: kmcommands.cpp:1705 kmheaders.cpp:1415
+#: kmcommands.cpp:1758 kmheaders.cpp:1453
 #, fuzzy
 msgid "Filtering message %1 of %2"
 msgstr "กำลังย้ายจดหมาย %3 ของ %2 จาก %1"
 
-#: kmcommands.cpp:1715
+#: kmcommands.cpp:1768
 #, fuzzy
 msgid "Not enough free disk space?"
 msgstr "พื้นที่บนดิสก์มีไม่เพียงพอ"
 
-#: kmcommands.cpp:1881 kmfoldertree.cpp:1891
+#: kmcommands.cpp:1934 kmfoldertree.cpp:1929
 #, fuzzy
 msgid "Move to This Folder"
 msgstr "ย้ายไปยังโฟลเดอร์นี้"
 
-#: kmcommands.cpp:1883 kmfoldertree.cpp:1893
+#: kmcommands.cpp:1936 kmfoldertree.cpp:1931
 #, fuzzy
 msgid "Copy to This Folder"
 msgstr "สำเนาไปยังโฟลเดอร์นี้"
 
-#: kmcommands.cpp:1959
+#: kmcommands.cpp:2012
 msgid "Corrupt IMAP cache detected in folder %1. Copying of messages aborted."
 msgstr ""
 
-#: kmcommands.cpp:2133
+#: kmcommands.cpp:2186
 #, fuzzy
 msgid "Moving messages"
 msgstr "ย้ายจดหมาย"
 
-#: kmcommands.cpp:2133
+#: kmcommands.cpp:2186
 #, fuzzy
 msgid "Deleting messages"
 msgstr "ลบจดหมาย"
 
-#: kmcommands.cpp:2406
+#: kmcommands.cpp:2471
 msgid "Opening URL..."
 msgstr "กำลังเปิด URL..."
 
-#: kmcommands.cpp:2413
+#: kmcommands.cpp:2478
 #, fuzzy
 msgid "<qt>Do you really want to execute <b>%1</b>?</qt>"
 msgstr "<qt>คุณต้องการลบรายการแสดงตัว <b>\"%1\"</b> จริงหรือไม่ ?</qt>"
 
-#: kmcommands.cpp:2414
+#: kmcommands.cpp:2479
 #, fuzzy
 msgid "Execute"
 msgstr "ประมวลผลคำสั่ง"
 
-#: kmcommands.cpp:2495
+#: kmcommands.cpp:2561
 #, fuzzy
 msgid "Found no attachments to save."
 msgstr "ไม่ให้แสดงสิ่งที่แนบมาด้วยในช่องเนื้อหาจดหมาย"
 
-#: kmcommands.cpp:2508
+#: kmcommands.cpp:2574
 #, fuzzy
 msgid "Save Attachments To"
 msgstr "บันทึกสิ่งที่แนบมาด้วยเป็น"
 
-#: kmcommands.cpp:2528
+#: kmcommands.cpp:2594
 msgid ""
 "_: filename for an unnamed attachment\n"
 "attachment.1"
 msgstr ""
 
-#: kmcommands.cpp:2556
+#: kmcommands.cpp:2622
 msgid ""
 "_: filename for the %1-th unnamed attachment\n"
 "attachment.%1"
 msgstr ""
 
-#: kmcommands.cpp:2595
+#: kmcommands.cpp:2661
 #, fuzzy
 msgid "A file named %1 already exists. Do you want to overwrite it?"
 msgstr "มีแฟ้มชื่อนี้อยู่แล้ว คุณต้องการเขียนทับมันหรือไม่ ?"
 
-#: kmcommands.cpp:2597
+#: kmcommands.cpp:2663
 msgid "File Already Exists"
 msgstr ""
 
-#: kmcommands.cpp:2597 util.h:211
+#: kmcommands.cpp:2663 util.h:211
 msgid "&Overwrite"
 msgstr ""
 
-#: kmcommands.cpp:2619
+#: kmcommands.cpp:2685
 #, fuzzy
 msgid ""
 "The part %1 of the message is encrypted. Do you want to keep the encryption "
@@ -4555,21 +5200,21 @@ msgstr ""
 "ส่วนนี้ของข้อความถูกเข้ารหัสไว้ คุณต้องการรักษาการเข้ารหัสนี้ "
 "เมื่อมีการบันทึกหรือไม่ ?"
 
-#: kmcommands.cpp:2621 kmcommands.cpp:2630
+#: kmcommands.cpp:2687 kmcommands.cpp:2696
 msgid "KMail Question"
 msgstr "คำถามของ KMail"
 
-#: kmcommands.cpp:2621
+#: kmcommands.cpp:2687
 #, fuzzy
 msgid "Keep Encryption"
 msgstr "การเข้ารหัส"
 
-#: kmcommands.cpp:2621 kmcommands.cpp:2630
+#: kmcommands.cpp:2687 kmcommands.cpp:2696
 #, fuzzy
 msgid "Do Not Keep"
 msgstr "ไม่เข้ารหัส"
 
-#: kmcommands.cpp:2628
+#: kmcommands.cpp:2694
 #, fuzzy
 msgid ""
 "The part %1 of the message is signed. Do you want to keep the signature when "
@@ -4578,213 +5223,242 @@ msgstr ""
 "ส่วนนี้ของจดหมายมีการเซ็นต์ไว้ คุณต้องการรักษาลายเซ็นนี้ไว้ "
 "เมื่อมีการบันทึกหรือไม่ ?"
 
-#: kmcommands.cpp:2630
+#: kmcommands.cpp:2696
 #, fuzzy
 msgid "Keep Signature"
 msgstr "ลายเซ็น"
 
-#: kmcommands.cpp:2703
+#: kmcommands.cpp:2769
 msgid ""
 "_: %2 is detailed error description\n"
 "Could not write the file %1:\n"
 "%2"
 msgstr ""
 
-#: kmcommands.cpp:2728
+#: kmcommands.cpp:2794
 #, fuzzy, c-format
 msgid "Could not write the file %1."
 msgstr "ไม่สามารถเขียนไปยังแฟ้มได้"
 
-#: kmcommands.cpp:2952
+#: kmcommands.cpp:3018
 msgid ""
 "There is no Address Book entry for this email address. Add them to the Address "
 "Book and then add instant messaging addresses using your preferred messaging "
 "client."
 msgstr ""
 
-#: kmcommands.cpp:2955
+#: kmcommands.cpp:3021
 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:3179 kmcomposewin.cpp:5128 objecttreeparser.cpp:1632
+#: kmcommands.cpp:3245 kmcomposewin.cpp:5317 objecttreeparser.cpp:1858
 msgid ""
 "Chiasmus backend does not offer the \"x-obtain-keys\" function. Please report "
 "this bug."
 msgstr ""
 
-#: kmcommands.cpp:3181 kmcommands.cpp:3186 kmcommands.cpp:3195
-#: kmcommands.cpp:3204 kmcommands.cpp:3222 kmcommands.cpp:3233
-#: kmcommands.cpp:3273 kmcomposewin.cpp:5130 kmcomposewin.cpp:5135
-#: kmcomposewin.cpp:5144 messagecomposer.cpp:558 messagecomposer.cpp:566
-#: messagecomposer.cpp:580 objecttreeparser.cpp:1638
+#: 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
+#: messagecomposer.cpp:581 objecttreeparser.cpp:1864
 msgid "Chiasmus Backend Error"
 msgstr ""
 
-#: kmcommands.cpp:3192 kmcomposewin.cpp:5141 objecttreeparser.cpp:1644
+#: kmcommands.cpp:3258 kmcomposewin.cpp:5330 objecttreeparser.cpp:1870
 msgid ""
 "Unexpected return value from Chiasmus backend: The \"x-obtain-keys\" function "
 "did not return a string list. Please report this bug."
 msgstr ""
 
-#: kmcommands.cpp:3201 kmcomposewin.cpp:5150 objecttreeparser.cpp:1652
+#: kmcommands.cpp:3267 kmcomposewin.cpp:5339 objecttreeparser.cpp:1878
 msgid ""
 "No keys have been found. Please check that a valid key path has been set in the "
 "Chiasmus configuration."
 msgstr ""
 
-#: kmcommands.cpp:3208 objecttreeparser.cpp:1659
+#: kmcommands.cpp:3274 objecttreeparser.cpp:1885
 #, fuzzy
 msgid "Chiasmus Decryption Key Selection"
 msgstr "ตั้งค่าการเข้ารหัส"
 
-#: kmcommands.cpp:3220 objecttreeparser.cpp:1671
+#: kmcommands.cpp:3286 objecttreeparser.cpp:1897
 msgid ""
 "Chiasmus backend does not offer the \"x-decrypt\" function. Please report this "
 "bug."
 msgstr ""
 
-#: kmcommands.cpp:3231 objecttreeparser.cpp:1679
+#: kmcommands.cpp:3297 objecttreeparser.cpp:1905
 msgid ""
 "The \"x-decrypt\" function does not accept the expected parameters. Please "
 "report this bug."
 msgstr ""
 
-#: kmcommands.cpp:3239 kmcommands.cpp:3265 objecttreeparser.cpp:1685
+#: kmcommands.cpp:3305 kmcommands.cpp:3331 objecttreeparser.cpp:1911
 msgid "Chiasmus Decryption Error"
 msgstr ""
 
-#: kmcommands.cpp:3270 objecttreeparser.cpp:1691
+#: kmcommands.cpp:3336 objecttreeparser.cpp:1917
 msgid ""
 "Unexpected return value from Chiasmus backend: The \"x-decrypt\" function did "
 "not return a byte array. Please report this bug."
 msgstr ""
 
-#: kmcommands.cpp:3425
-#, fuzzy
-msgid "This attachment has been deleted."
-msgstr "แสดงสิ่งที่แนบมาด้วยตามคำแนะนำของผู้ส่ง"
-
-#: kmcommands.cpp:3427
-msgid "The attachment '%1' has been deleted."
-msgstr ""
-
-#: kmcommands.cpp:3541
+#: kmcommands.cpp:3581
 msgid ""
 "From: %1\n"
 "To: %2\n"
 "Subject: %3"
 msgstr ""
 
-#: kmcommands.cpp:3551
+#: kmcommands.cpp:3591
 #, fuzzy, c-format
 msgid "Mail: %1"
 msgstr "จดหมาย"
 
-#: kmcomposewin.cpp:233
-msgid "Select email address(es)"
-msgstr "เลือกที่อยู่อีเมล์"
-
-#: kmcomposewin.cpp:286
-msgid "Sticky"
-msgstr "ปักหมุด"
-
-#: kmcomposewin.cpp:367 kmfoldertree.cpp:1681 kmheaders.cpp:138
-#: kmheaders.cpp:183 kmmainwidget.cpp:424 kmmainwidget.cpp:431
-#: kmmainwidget.cpp:438 kmmimeparttree.cpp:67 kmpopfiltercnfrmdlg.cpp:43
-msgid "Size"
-msgstr "ขนาด"
-
-#: kmcomposewin.cpp:368 kmmimeparttree.cpp:66
-msgid "Encoding"
-msgstr "ชุดรหัสอักขระ"
-
-#: kmcomposewin.cpp:375 kmcomposewin.cpp:3247
+#: kmcomposewin.cpp:207
 #, fuzzy
-msgid "Compress"
-msgstr "เขียนจดหมาย"
+msgid "Select an identity for this message"
+msgstr "เปิดใช้การแสดงผล HTML สำหรับจดหมายฉบับนี้"
 
-#: kmcomposewin.cpp:377
-msgid "Encrypt"
-msgstr "การเข้ารหัส"
+#: kmcomposewin.cpp:211
+msgid "Select the dictionary to use when spell-checking this message"
+msgstr ""
 
-#: kmcomposewin.cpp:379
-msgid "Sign"
-msgstr "เซ็น"
+#: kmcomposewin.cpp:216
+msgid "Select the sent-mail folder where a copy of this message will be saved"
+msgstr ""
 
-#: kmcomposewin.cpp:590 kmcomposewin.cpp:3616
-#, fuzzy
-msgid "Name of the attachment:"
-msgstr "ลบสิ่งที่แนบมาด้วย"
+#: kmcomposewin.cpp:220
+msgid "Select the outgoing account to use for sending this message"
+msgstr ""
 
-#: kmcomposewin.cpp:828
-msgid ""
-"Autosaving the message as %1 failed.\n"
-"Reason: %2"
+#: kmcomposewin.cpp:224
+msgid "Set the \"From:\" email address for this message"
 msgstr ""
 
-#: kmcomposewin.cpp:832
-msgid "Autosaving Failed"
+#: kmcomposewin.cpp:228
+msgid "Set the \"Reply-To:\" email address for this message"
 msgstr ""
 
-#: kmcomposewin.cpp:970
+#: kmcomposewin.cpp:248
+msgid "Select email address(es)"
+msgstr "เลือกที่อยู่อีเมล์"
+
+#: kmcomposewin.cpp:295
+#, fuzzy
+msgid "Set a subject for this message"
+msgstr "ตั้งชื่อเรื่องจดหมาย"
+
+#: kmcomposewin.cpp:297
 msgid "&Identity:"
 msgstr "การแสดงตัว:"
 
-#: kmcomposewin.cpp:974
+#: kmcomposewin.cpp:298
 msgid "&Dictionary:"
 msgstr "พจนานุกรม:"
 
-#: kmcomposewin.cpp:978
+#: kmcomposewin.cpp:299
 #, fuzzy
 msgid "&Sent-Mail folder:"
 msgstr "โฟลเดอร์จดหมายที่ส่งแล้ว:"
 
-#: kmcomposewin.cpp:982
+#: kmcomposewin.cpp:300
 #, fuzzy
 msgid "&Mail transport:"
 msgstr "เครื่องมือส่งจดหมาย:"
 
-#: kmcomposewin.cpp:986
+#: kmcomposewin.cpp:301
 msgid ""
 "_: sender address field\n"
 "&From:"
 msgstr ""
 
-#: kmcomposewin.cpp:992
+#: kmcomposewin.cpp:302
 msgid "&Reply to:"
 msgstr "ตอบกลับไปยัง:"
 
-#: kmcomposewin.cpp:1000
+#: kmcomposewin.cpp:303
+msgid "S&ubject:"
+msgstr "เรื่อง:"
+
+#: kmcomposewin.cpp:305
+msgid "Sticky"
+msgstr "ปักหมุด"
+
+#: kmcomposewin.cpp:308
+msgid "Use the selected value as your identity for future messages"
+msgstr ""
+
+#: kmcomposewin.cpp:311
+msgid "Use the selected value as your sent-mail folder for future messages"
+msgstr ""
+
+#: kmcomposewin.cpp:314
+msgid "Use the selected value as your outgoing account for future messages"
+msgstr ""
+
+#: kmcomposewin.cpp:317
+msgid "Use the selected value as your dictionary for future messages"
+msgstr ""
+
+#: kmcomposewin.cpp:398 kmfoldertree.cpp:1719 kmheaders.cpp:141
+#: kmheaders.cpp:187 kmmainwidget.cpp:416 kmmainwidget.cpp:423
+#: kmmainwidget.cpp:430 kmmimeparttree.cpp:67 kmpopfiltercnfrmdlg.cpp:43
+msgid "Size"
+msgstr "ขนาด"
+
+#: kmcomposewin.cpp:399 kmmimeparttree.cpp:66
+msgid "Encoding"
+msgstr "ชุดรหัสอักขระ"
+
+#: kmcomposewin.cpp:406 kmcomposewin.cpp:3327
+#, fuzzy
+msgid "Compress"
+msgstr "เขียนจดหมาย"
+
+#: kmcomposewin.cpp:408
+msgid "Encrypt"
+msgstr "การเข้ารหัส"
+
+#: kmcomposewin.cpp:410
+msgid "Sign"
+msgstr "เซ็น"
+
+#: kmcomposewin.cpp:621 kmcomposewin.cpp:3703
 #, fuzzy
+msgid "Name of the attachment:"
+msgstr "ลบสิ่งที่แนบมาด้วย"
+
+#: kmcomposewin.cpp:868
 msgid ""
-"_: recipient address field\n"
-"&To:"
-msgstr "แสดงที่อยู่ล่าสุด"
+"Autosaving the message as %1 failed.\n"
+"Reason: %2"
+msgstr ""
 
-#: kmcomposewin.cpp:1002
+#: kmcomposewin.cpp:872
+msgid "Autosaving Failed"
+msgstr ""
+
+#: kmcomposewin.cpp:1042
 #, fuzzy
 msgid "Primary Recipients"
 msgstr "<ผู้รับ>"
 
-#: kmcomposewin.cpp:1003
+#: kmcomposewin.cpp:1043
 msgid ""
 "<qt>The email addresses you put in this field receive a copy of the email.</qt>"
 msgstr ""
 
-#: kmcomposewin.cpp:1010
-#, fuzzy
-msgid "&Copy to (CC):"
-msgstr "สำเนาไปยัง"
-
-#: kmcomposewin.cpp:1012
+#: kmcomposewin.cpp:1052
 #, fuzzy
 msgid "Additional Recipients"
 msgstr "ผู้รับไม่ถูกต้อง"
 
-#: kmcomposewin.cpp:1013
+#: 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> "
@@ -4792,457 +5466,468 @@ msgid ""
 "(CC) is a listener, not the main recipient.</qt>"
 msgstr ""
 
-#: kmcomposewin.cpp:1025
-msgid "&Blind copy to (BCC):"
-msgstr ""
-
-#: kmcomposewin.cpp:1027
+#: kmcomposewin.cpp:1067
 #, fuzzy
 msgid "Hidden Recipients"
 msgstr "ผู้รับไม่ถูกต้อง"
 
-#: kmcomposewin.cpp:1028
+#: kmcomposewin.cpp:1068
 msgid ""
 "<qt>Essentially the same thing as the <b>Copy To:</b> "
 "field but differs in that all other recipients do not see who receives a blind "
 "copy.</qt>"
 msgstr ""
 
-#: kmcomposewin.cpp:1060
-msgid "S&ubject:"
-msgstr "เรื่อง:"
-
-#: kmcomposewin.cpp:1198 kmcomposewin.cpp:1220
+#: kmcomposewin.cpp:1236 kmcomposewin.cpp:1258
 msgid "&Send Mail"
 msgstr "ส่งจดหมาย"
 
-#: kmcomposewin.cpp:1202 kmcomposewin.cpp:1224
+#: kmcomposewin.cpp:1240 kmcomposewin.cpp:1262
 msgid "&Send Mail Via"
 msgstr "ส่งจดหมายผ่านทาง"
 
-#: kmcomposewin.cpp:1205 kmcomposewin.cpp:1214 kmcomposewin.cpp:4329
-#: redirectdialog.cpp:83
+#: kmcomposewin.cpp:1243 kmcomposewin.cpp:1252 kmcomposewin.cpp:4459
+#: redirectdialog.cpp:84
 msgid "Send &Later"
 msgstr "ส่งภายหลัง"
 
-#: kmcomposewin.cpp:1207 kmcomposewin.cpp:1217
+#: kmcomposewin.cpp:1245 kmcomposewin.cpp:1255
 msgid "Send &Later Via"
 msgstr "ส่งภายหลังผ่านทาง"
 
-#: kmcomposewin.cpp:1255
+#: kmcomposewin.cpp:1293
 #, fuzzy
 msgid "Save as &Draft"
 msgstr "บันทึกเป็นฉบับร่าง"
 
-#: kmcomposewin.cpp:1258
+#: kmcomposewin.cpp:1296
 #, fuzzy
 msgid "Save as &Template"
 msgstr "บันทึกเป็นฉบับร่าง"
 
-#: kmcomposewin.cpp:1261
+#: kmcomposewin.cpp:1299
 msgid "&Insert File..."
 msgstr "แทรกแฟ้ม..."
 
-#: kmcomposewin.cpp:1264
+#: kmcomposewin.cpp:1302
 msgid "&Insert File Recent"
 msgstr "แทรกแฟ้มที่ใช้ล่าสุด"
 
-#: kmcomposewin.cpp:1271
+#: kmcomposewin.cpp:1309
 msgid "&Address Book"
 msgstr "สมุดที่อยู่"
 
-#: kmcomposewin.cpp:1274
+#: kmcomposewin.cpp:1312
 msgid "&New Composer"
 msgstr "เครื่องมือเขียนจดหมายใหม่"
 
-#: kmcomposewin.cpp:1278
+#: kmcomposewin.cpp:1316
 msgid "New Main &Window"
 msgstr "เปิดหน้าต่างหลักใหม่"
 
-#: kmcomposewin.cpp:1283
+#: kmcomposewin.cpp:1321
 msgid "Select &Recipients..."
 msgstr "เลือกผู้รับ..."
 
-#: kmcomposewin.cpp:1285
+#: kmcomposewin.cpp:1323
 msgid "Save &Distribution List..."
 msgstr ""
 
-#: kmcomposewin.cpp:1307
+#: kmcomposewin.cpp:1345
 msgid "Pa&ste as Quotation"
 msgstr "วางเป็นส่วนที่อ้างถึง"
 
-#: kmcomposewin.cpp:1310
+#: kmcomposewin.cpp:1348
 msgid "Paste as Attac&hment"
 msgstr "วางเป็นสิ่งที่แนบมาด้วย"
 
-#: kmcomposewin.cpp:1313
+#: kmcomposewin.cpp:1351
 msgid "Add &Quote Characters"
 msgstr "เพิ่มอักขระอ้างถึง"
 
-#: kmcomposewin.cpp:1316
+#: kmcomposewin.cpp:1356
 msgid "Re&move Quote Characters"
 msgstr "ลบอักขระอ้างถึง"
 
-#: kmcomposewin.cpp:1320
+#: kmcomposewin.cpp:1362
 msgid "Cl&ean Spaces"
 msgstr "ล้างช่องว่าง"
 
-#. i18n: file kmail.kcfg line 341
-#: kmcomposewin.cpp:1323 kmreaderwin.cpp:683 rc.cpp:779
+#. i18n: file kmail.kcfg line 358
+#: kmcomposewin.cpp:1365 kmreaderwin.cpp:617 rc.cpp:795
 #, no-c-format
 msgid "Use Fi&xed Font"
 msgstr "ใช้ตัวอักษรความกว้างคงที่"
 
-#: kmcomposewin.cpp:1328
+#: kmcomposewin.cpp:1370
 msgid "&Urgent"
 msgstr "ความเร่งด่วน"
 
-#: kmcomposewin.cpp:1331
+#: kmcomposewin.cpp:1373
 msgid "&Request Disposition Notification"
 msgstr ""
 
-#: kmcomposewin.cpp:1336
+#: kmcomposewin.cpp:1378
 msgid "Se&t Encoding"
 msgstr "ตั้งค่าชุดรหัสอักขระ"
 
-#: kmcomposewin.cpp:1339
+#: kmcomposewin.cpp:1381
 msgid "&Wordwrap"
 msgstr "ตัดคำ"
 
-#: kmcomposewin.cpp:1344
+#: kmcomposewin.cpp:1386
 msgid "&Snippets"
 msgstr ""
 
-#: kmcomposewin.cpp:1350
+#: kmcomposewin.cpp:1392
 msgid "&Automatic Spellchecking"
 msgstr "ตรวจคำสะกดอัตโนมัติ"
 
-#: kmcomposewin.cpp:1360
+#: kmcomposewin.cpp:1402
 msgid "Auto-Detect"
 msgstr "ตรวจสอบอัตโนมัติ"
 
-#: kmcomposewin.cpp:1365
+#: kmcomposewin.cpp:1407
 msgid "Formatting (HTML)"
 msgstr "จัดรูปแบบ (HTML)"
 
-#: kmcomposewin.cpp:1369
+#: kmcomposewin.cpp:1411
 msgid "&All Fields"
 msgstr "ทุกช่องข้อมูล"
 
-#: kmcomposewin.cpp:1372
+#: kmcomposewin.cpp:1414
 msgid "&Identity"
 msgstr "การแสดงตัว"
 
-#: kmcomposewin.cpp:1375
+#: kmcomposewin.cpp:1417
 msgid "&Dictionary"
 msgstr "พจนานุกรม"
 
-#: kmcomposewin.cpp:1378
+#: kmcomposewin.cpp:1420
 msgid "&Sent-Mail Folder"
 msgstr "โฟลเดอร์จดหมายที่ส่งแล้ว"
 
-#: kmcomposewin.cpp:1381
+#: kmcomposewin.cpp:1423
 msgid "&Mail Transport"
 msgstr "เครื่องมือส่งจดหมาย"
 
-#: kmcomposewin.cpp:1384
+#: kmcomposewin.cpp:1426
 msgid "&From"
 msgstr "จาก"
 
-#: kmcomposewin.cpp:1387
+#: kmcomposewin.cpp:1429
 msgid "&Reply To"
 msgstr "ตอบกลับไปยัง"
 
-#: kmcomposewin.cpp:1391
+#: kmcomposewin.cpp:1433
 msgid "&To"
 msgstr "ถึง"
 
-#: kmcomposewin.cpp:1394
+#: kmcomposewin.cpp:1436
 msgid "&CC"
 msgstr "ทำสำเนา"
 
-#: kmcomposewin.cpp:1397
+#: kmcomposewin.cpp:1439
 msgid "&BCC"
 msgstr "ทำสำเนาซ่อน"
 
-#: kmcomposewin.cpp:1401
+#: kmcomposewin.cpp:1443
 msgid "S&ubject"
 msgstr "เรื่อง"
 
-#: kmcomposewin.cpp:1406
+#: kmcomposewin.cpp:1448
 msgid "Append S&ignature"
 msgstr "เพิ่มลายเซ็นต่อท้าย"
 
-#: kmcomposewin.cpp:1409
+#: kmcomposewin.cpp:1451
 #, fuzzy
 msgid "Prepend S&ignature"
 msgstr "เพิ่มลายเซ็นต่อท้าย"
 
-#: kmcomposewin.cpp:1413
+#: kmcomposewin.cpp:1455
 msgid "Insert Signature At C&ursor Position"
 msgstr ""
 
-#: kmcomposewin.cpp:1417
+#: kmcomposewin.cpp:1459
 msgid "Attach &Public Key..."
 msgstr "แนบกุญแจสาธารณะ..."
 
-#: kmcomposewin.cpp:1420
+#: kmcomposewin.cpp:1462
 msgid "Attach &My Public Key"
 msgstr "แนบกุญแจสาธารณะของฉัน"
 
-#: kmcomposewin.cpp:1423 kmcomposewin.cpp:2272
+#: kmcomposewin.cpp:1465 kmcomposewin.cpp:2337
 msgid "&Attach File..."
 msgstr "แนบแฟ้ม..."
 
-#: kmcomposewin.cpp:1426
+#: kmcomposewin.cpp:1468
 msgid "&Remove Attachment"
 msgstr "ลบสิ่งที่แนบมาด้วย"
 
-#: kmcomposewin.cpp:1429
+#: kmcomposewin.cpp:1471
 msgid "&Save Attachment As..."
 msgstr "บันทึกสิ่งที่แนบมาด้วยเป็น..."
 
-#: kmcomposewin.cpp:1432
+#: kmcomposewin.cpp:1474
 msgid "Attachment Pr&operties"
 msgstr "คุณสมบัติสิ่งที่แนบมาด้วย"
 
-#: kmcomposewin.cpp:1442
+#: kmcomposewin.cpp:1484
 msgid "&Spellchecker..."
 msgstr "ตรวจคำสะกด..."
 
-#: kmcomposewin.cpp:1446 kmcomposewin.cpp:1449
+#: kmcomposewin.cpp:1488 kmcomposewin.cpp:1491
 #, fuzzy
 msgid "Encrypt Message with Chiasmus..."
 msgstr "เข้ารหัสจดหมาย"
 
-#: kmcomposewin.cpp:1457
+#: kmcomposewin.cpp:1499
 msgid "&Encrypt Message"
 msgstr "เข้ารหัสจดหมาย"
 
-#: kmcomposewin.cpp:1460
+#: kmcomposewin.cpp:1502
 msgid "&Sign Message"
 msgstr "เซ็นจดหมาย"
 
-#: kmcomposewin.cpp:1507
+#: kmcomposewin.cpp:1549
 msgid "&Cryptographic Message Format"
 msgstr ""
 
-#: kmcomposewin.cpp:1515 kmcomposewin.cpp:4970
+#: kmcomposewin.cpp:1554
+msgid "Select a cryptographic format for this message"
+msgstr ""
+
+#: kmcomposewin.cpp:1558 kmcomposewin.cpp:5159
 msgid "Standard"
 msgstr "มาตรฐาน"
 
-#: kmcomposewin.cpp:1516 kmcomposewin.cpp:4972
+#: kmcomposewin.cpp:1559 kmcomposewin.cpp:5161
 msgid "Bulleted List (Disc)"
 msgstr ""
 
-#: kmcomposewin.cpp:1517 kmcomposewin.cpp:4974
+#: kmcomposewin.cpp:1560 kmcomposewin.cpp:5163
 msgid "Bulleted List (Circle)"
 msgstr ""
 
-#: kmcomposewin.cpp:1518 kmcomposewin.cpp:4976
+#: kmcomposewin.cpp:1561 kmcomposewin.cpp:5165
 msgid "Bulleted List (Square)"
 msgstr ""
 
-#: kmcomposewin.cpp:1519 kmcomposewin.cpp:4978
+#: kmcomposewin.cpp:1562 kmcomposewin.cpp:5167
 msgid "Ordered List (Decimal)"
 msgstr ""
 
-#: kmcomposewin.cpp:1520 kmcomposewin.cpp:4980
+#: kmcomposewin.cpp:1563 kmcomposewin.cpp:5169
 msgid "Ordered List (Alpha lower)"
 msgstr ""
 
-#: kmcomposewin.cpp:1521 kmcomposewin.cpp:4982
+#: kmcomposewin.cpp:1564 kmcomposewin.cpp:5171
 msgid "Ordered List (Alpha upper)"
 msgstr ""
 
-#: kmcomposewin.cpp:1523
+#: kmcomposewin.cpp:1566
 msgid "Select Style"
 msgstr "เลือกรูปแบบ"
 
-#: kmcomposewin.cpp:1537
+#: kmcomposewin.cpp:1569
+#, fuzzy
+msgid "Select a list style"
+msgstr "เลือกรูปแบบ"
+
+#: kmcomposewin.cpp:1574
+#, fuzzy
+msgid "Select a font"
+msgstr "เลือกข้อความทั้งหมด"
+
+#: kmcomposewin.cpp:1579
+#, fuzzy
+msgid "Select a font size"
+msgstr "เลือกคอลัมน์"
+
+#: kmcomposewin.cpp:1583
 msgid "Align Left"
 msgstr "จัดชิดด้านซ้าย"
 
-#: kmcomposewin.cpp:1541
+#: kmcomposewin.cpp:1587
 msgid "Align Right"
 msgstr "จัดชิดด้านขวา"
 
-#: kmcomposewin.cpp:1544
+#: kmcomposewin.cpp:1590
 msgid "Align Center"
 msgstr "จัดกึ่งกลาง"
 
-#: kmcomposewin.cpp:1547
+#: kmcomposewin.cpp:1593
 msgid "&Bold"
 msgstr "ตัวหนา"
 
-#: kmcomposewin.cpp:1550
+#: kmcomposewin.cpp:1596
 msgid "&Italic"
 msgstr "ตัวเอียง"
 
-#: kmcomposewin.cpp:1553
+#: kmcomposewin.cpp:1599
 msgid "&Underline"
 msgstr "ตัวขีดเส้นใต้"
 
-#: kmcomposewin.cpp:1556
+#: kmcomposewin.cpp:1602
 msgid "Reset Font Settings"
 msgstr "ปรับการตั้งค่าแบบอักษรเป็นค่าเดิม"
 
-#: kmcomposewin.cpp:1559
+#: kmcomposewin.cpp:1605
 msgid "Text Color..."
 msgstr "สีข้อความ..."
 
-#: kmcomposewin.cpp:1573
+#: kmcomposewin.cpp:1619
 #, fuzzy
 msgid "Configure KMail..."
 msgstr "ปรับแต่งโปรแกรมจัดการจดหมาย - K..."
 
-#: kmcomposewin.cpp:1582
+#: kmcomposewin.cpp:1628
 #, fuzzy
 msgid " Spellcheck: %1 "
 msgstr "เครื่องมือตรวจคำสะกด"
 
-#: kmcomposewin.cpp:1583 kmcomposewin.cpp:1597
+#: kmcomposewin.cpp:1629 kmcomposewin.cpp:1643
 msgid " Column: %1 "
 msgstr " คอลัมน: %1 "
 
-#: kmcomposewin.cpp:1584 kmcomposewin.cpp:1595
+#: kmcomposewin.cpp:1630 kmcomposewin.cpp:1641
 msgid " Line: %1 "
 msgstr " บรรทัด: %1 "
 
-#: kmcomposewin.cpp:2188
+#: kmcomposewin.cpp:2252
 #, fuzzy
 msgid "Re&save as Template"
 msgstr "บันทึกเป็นฉบับร่าง"
 
-#: kmcomposewin.cpp:2189
+#: kmcomposewin.cpp:2253
 msgid "&Save as Draft"
 msgstr "บันทึกเป็นฉบับร่าง"
 
-#: kmcomposewin.cpp:2191
+#: kmcomposewin.cpp:2255
 msgid ""
 "Resave this message in the Templates folder. It can then be used at a later "
 "time."
 msgstr ""
 
-#: kmcomposewin.cpp:2193
+#: kmcomposewin.cpp:2257
 msgid ""
 "Save this message in the Drafts folder. It can then be edited and sent at a "
 "later time."
 msgstr ""
 
-#: kmcomposewin.cpp:2197
+#: kmcomposewin.cpp:2261
 #, fuzzy
 msgid "Do you want to save the message for later or discard it?"
 msgstr "คุณต้องการละทิ้งการเขียนจดหมาย หรือจะบันทึกมันไว้เพื่อใช้ทีหลัง ?"
 
-#: kmcomposewin.cpp:2198
+#: kmcomposewin.cpp:2262
 #, fuzzy
 msgid "Close Composer"
 msgstr "เครื่องมือเขียนจดหมายใหม่"
 
-#: kmcomposewin.cpp:2268
+#: kmcomposewin.cpp:2333
 msgid ""
 "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 ""
 
-#: kmcomposewin.cpp:2271
+#: kmcomposewin.cpp:2336
 #, fuzzy
 msgid "File Attachment Reminder"
 msgstr "แสดงสิ่งที่แนบมาด้วย: "
 
-#: kmcomposewin.cpp:2273
+#: kmcomposewin.cpp:2338 kmcomposewin.cpp:4481
 #, fuzzy
 msgid "&Send as Is"
 msgstr "ทำการส่ง"
 
-#: kmcomposewin.cpp:2350
+#: kmcomposewin.cpp:2415
 msgid ""
 "<qt>"
 "<p>KMail could not recognize the location of the attachment (%1);</p>"
 "<p>you have to specify the full path if you wish to attach a file.</p></qt>"
 msgstr ""
 
-#: kmcomposewin.cpp:2359
+#: kmcomposewin.cpp:2424
 msgid ""
 "<qt>"
 "<p>Your administrator has disallowed attaching files bigger than %1 MB.</p>"
 msgstr ""
 
-#: kmcomposewin.cpp:2697
+#: kmcomposewin.cpp:2777
 msgid "Attach File"
 msgstr "แนบแฟ้ม"
 
 #. i18n: file kmcomposerui.rc line 68
-#: kmcomposewin.cpp:2698 rc.cpp:57
+#: kmcomposewin.cpp:2778 rc.cpp:57
 #, no-c-format
 msgid "&Attach"
 msgstr "แนบ"
 
-#: kmcomposewin.cpp:2878
+#: kmcomposewin.cpp:2959
 msgid "Insert File"
 msgstr "แทรกแฟ้ม"
 
-#: kmcomposewin.cpp:3048
+#: kmcomposewin.cpp:3129
 msgid ""
 "<qt>"
 "<p>An error occurred while trying to export the key from the backend:</p>"
 "<p><b>%1</b></p></qt>"
 msgstr ""
 
-#: kmcomposewin.cpp:3052
+#: kmcomposewin.cpp:3133
 msgid "Key Export Failed"
 msgstr "การส่งออกกุญแจล้มเหลว"
 
-#: kmcomposewin.cpp:3079
+#: kmcomposewin.cpp:3160
 msgid "Exporting key..."
 msgstr "กำลังส่งออกกุญแจ..."
 
-#: kmcomposewin.cpp:3090
+#: kmcomposewin.cpp:3171
 #, c-format
 msgid "OpenPGP key 0x%1"
 msgstr "กุญแจ OpenPGP 0x%1"
 
-#: kmcomposewin.cpp:3105
+#: kmcomposewin.cpp:3186
 msgid "Attach Public OpenPGP Key"
 msgstr "แนบกุญแจสาธารณะ OpenPGP"
 
-#: kmcomposewin.cpp:3106
+#: kmcomposewin.cpp:3187
 msgid "Select the public key which should be attached."
 msgstr "เลือกกุญแจสาธารณะที่จะแนบเข้าไปด้วย"
 
-#: kmcomposewin.cpp:3128 kmmimeparttree.cpp:137 kmreaderwin.cpp:1967
+#: kmcomposewin.cpp:3209 kmmimeparttree.cpp:135 kmreaderwin.cpp:2032
 msgid ""
 "_: to open\n"
 "Open"
 msgstr "เปิด"
 
-#: kmcomposewin.cpp:3130 kmmimeparttree.cpp:138 kmreaderwin.cpp:1968
+#: kmcomposewin.cpp:3211 kmmimeparttree.cpp:136 kmreaderwin.cpp:2033
 msgid "Open With..."
 msgstr "เปิดด้วย..."
 
-#: kmcomposewin.cpp:3132
+#: kmcomposewin.cpp:3213
 msgid ""
 "_: to view\n"
 "View"
 msgstr "แสดง"
 
-#: kmcomposewin.cpp:3135
+#: kmcomposewin.cpp:3216
 #, fuzzy
 msgid "Edit With..."
 msgstr "แก้ไข..."
 
-#: kmcomposewin.cpp:3143
+#: kmcomposewin.cpp:3224
 msgid "Add Attachment..."
 msgstr "เพิ่มสิ่งที่แนบมาด้วย..."
 
-#: kmcomposewin.cpp:3232 kmcomposewin.cpp:3240
+#: kmcomposewin.cpp:3312 kmcomposewin.cpp:3320
 #, fuzzy
 msgid "KMail could not compress the file."
 msgstr "ไม่สามารถเขียนไปยังแฟ้มได้"
 
-#: kmcomposewin.cpp:3246
+#: kmcomposewin.cpp:3326
 msgid ""
 "The compressed file is larger than the original. Do you want to keep the "
 "original one?"
@@ -5250,45 +5935,45 @@ msgstr ""
 "ส่วนนี้ของจดหมายมีการเซ็นต์ไว้ คุณต้องการคงลายเซ็นนี้ไว้ "
 "เมื่อมีการบันทึกหรือไม่ ?"
 
-#: kmcomposewin.cpp:3247
+#: kmcomposewin.cpp:3327
 msgid "Keep"
 msgstr "คงไว้"
 
-#: kmcomposewin.cpp:3313 kmcomposewin.cpp:3321
+#: kmcomposewin.cpp:3393 kmcomposewin.cpp:3401
 #, fuzzy
 msgid "KMail could not uncompress the file."
 msgstr "ไม่สามารถเขียนไปยังแฟ้มได้"
 
-#: kmcomposewin.cpp:3519
+#: kmcomposewin.cpp:3601
 msgid "Save Attachment As"
 msgstr "บันทึกสิ่งที่แนบมาด้วยเป็น"
 
-#: kmcomposewin.cpp:3769 kmedit.cpp:178
+#: kmcomposewin.cpp:3856 kmedit.cpp:178
 msgid "Add as Text"
 msgstr ""
 
-#: kmcomposewin.cpp:3770 kmedit.cpp:179
+#: kmcomposewin.cpp:3857 kmedit.cpp:179
 #, fuzzy
 msgid "Add as Attachment"
 msgstr "เพิ่มสิ่งที่แนบมาด้วย..."
 
-#: kmcomposewin.cpp:3771
+#: kmcomposewin.cpp:3858
 msgid ""
 "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:3773
+#: kmcomposewin.cpp:3860
 #, fuzzy
 msgid "Paste as text or attachment?"
 msgstr "วางเป็นสิ่งที่แนบมาด้วย"
 
-#: kmcomposewin.cpp:3848 kmfilterdlg.cpp:705 kmfolderdia.cpp:274
-#: kmfolderdia.cpp:632 kmfoldertree.cpp:1603 managesievescriptsdialog.cpp:280
+#: kmcomposewin.cpp:3935 kmfilterdlg.cpp:717 kmfolderdia.cpp:331
+#: kmfolderdia.cpp:710 kmfoldertree.cpp:1641 managesievescriptsdialog.cpp:302
 msgid "unnamed"
 msgstr "ยังไม่มีชื่อ"
 
-#: kmcomposewin.cpp:3873
+#: kmcomposewin.cpp:3961
 msgid ""
 "<qt>"
 "<p>You have requested that messages be encrypted to yourself, but the currently "
@@ -5297,11 +5982,11 @@ msgid ""
 "<p>Please select the key(s) to use in the identity configuration.</p></qt>"
 msgstr ""
 
-#: kmcomposewin.cpp:3880
+#: kmcomposewin.cpp:3968
 msgid "Undefined Encryption Key"
 msgstr "กุญแจการเข้ารหัสยังไม่มีการนิยาม"
 
-#: kmcomposewin.cpp:3924
+#: kmcomposewin.cpp:4015
 msgid ""
 "<qt>"
 "<p>In order to be able to sign this message you first have to define the "
@@ -5309,221 +5994,252 @@ msgid ""
 "<p>Please select the key to use in the identity configuration.</p></qt>"
 msgstr ""
 
-#: kmcomposewin.cpp:3931
+#: kmcomposewin.cpp:4022
 msgid "Undefined Signing Key"
 msgstr "ยังไม่ได้กำหนดกุญแจการเซ็น"
 
-#: kmcomposewin.cpp:4016
+#: kmcomposewin.cpp:4129
 msgid ""
 "KMail is currently in offline mode,your messages will be kept in the outbox "
 "until you go online."
 msgstr ""
 
-#: kmcomposewin.cpp:4018 kmkernel.cpp:1243
+#: kmcomposewin.cpp:4131 kmkernel.cpp:1285
 msgid "Online/Offline"
 msgstr "ออนไลน์/ออฟไลน์"
 
-#: kmcomposewin.cpp:4033
+#: kmcomposewin.cpp:4146
 msgid ""
 "You must enter your email address in the From: field. You should also set your "
 "email address for all identities, so that you do not have to enter it for each "
 "message."
 msgstr ""
 
-#: kmcomposewin.cpp:4044
+#: kmcomposewin.cpp:4157
 #, fuzzy
 msgid ""
 "You must specify at least one receiver,either in the To: field or as CC or as "
 "BCC."
 msgstr "คุณต้องระบุผู้รับอย่างน้อยหนึ่งตัวในช่อง ถึง:"
 
-#: kmcomposewin.cpp:4052
+#: kmcomposewin.cpp:4165
 #, fuzzy
 msgid "To field is missing.Send message anyway?"
 msgstr "คุณยังไม่ได้ระบุชื่อเรื่อง ทำการส่งหรือไม่ ?"
 
-#: kmcomposewin.cpp:4054
+#: kmcomposewin.cpp:4167
 #, fuzzy
 msgid "No To: specified"
 msgstr "ไม่ยังได้กำหนดชื่อเรื่อง"
 
-#: kmcomposewin.cpp:4079
+#: kmcomposewin.cpp:4192
 msgid "You did not specify a subject. Send message anyway?"
 msgstr "คุณยังไม่ได้ระบุชื่อเรื่อง ทำการส่งหรือไม่ ?"
 
-#: kmcomposewin.cpp:4081
+#: kmcomposewin.cpp:4194
 msgid "No Subject Specified"
 msgstr "ไม่ยังได้กำหนดชื่อเรื่อง"
 
-#: kmcomposewin.cpp:4082
+#: kmcomposewin.cpp:4195
 #, fuzzy
 msgid "S&end as Is"
 msgstr "ทำการส่ง"
 
-#: kmcomposewin.cpp:4083
+#: kmcomposewin.cpp:4196
 #, fuzzy
 msgid "&Specify the Subject"
 msgstr "ไม่ ให้กำหนดชื่อเรื่องก่อน"
 
-#: kmcomposewin.cpp:4121
+#: kmcomposewin.cpp:4234
 msgid "&Keep markup, do not sign/encrypt"
 msgstr ""
 
-#: kmcomposewin.cpp:4122
+#: kmcomposewin.cpp:4235
 msgid "&Keep markup, do not encrypt"
 msgstr ""
 
-#: kmcomposewin.cpp:4123
+#: kmcomposewin.cpp:4236
 msgid "&Keep markup, do not sign"
 msgstr ""
 
-#: kmcomposewin.cpp:4125
+#: kmcomposewin.cpp:4238
 #, fuzzy
 msgid "Sign/Encrypt (delete markup)"
 msgstr "ลายเซ็น/การเข้ารหัส"
 
-#: kmcomposewin.cpp:4126
+#: kmcomposewin.cpp:4239
 msgid "Encrypt (delete markup)"
 msgstr ""
 
-#: kmcomposewin.cpp:4127
+#: kmcomposewin.cpp:4240
 msgid "Sign (delete markup)"
 msgstr ""
 
-#: kmcomposewin.cpp:4129
+#: kmcomposewin.cpp:4242
 msgid ""
 "<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:4131
+#: kmcomposewin.cpp:4244
 #, fuzzy
 msgid "Sign/Encrypt Message?"
 msgstr "เข้ารหัสจดหมายหรือไม่ ?"
 
-#: kmcomposewin.cpp:4180
+#: kmcomposewin.cpp:4293
 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:4326
+#: kmcomposewin.cpp:4393 kmsender.cpp:114
+msgid "Please create an account for sending and try again."
+msgstr "โปรดสร้างบัญชีผู้ใช้งานสำหรับการส่ง แล้วลองใหม่อีกครั้ง"
+
+#: kmcomposewin.cpp:4456
 msgid "About to send email..."
 msgstr "เกี่ยวกับการส่งจดหมาย..."
 
-#: kmcomposewin.cpp:4327
+#: kmcomposewin.cpp:4457
 msgid "Send Confirmation"
 msgstr "ยืนยันการส่ง"
 
-#: kmcomposewin.cpp:4328 redirectdialog.cpp:82
+#: kmcomposewin.cpp:4458 redirectdialog.cpp:83
 msgid "&Send Now"
 msgstr "ส่งเดี๋ยวนี้"
 
-#: kmcomposewin.cpp:4549
+#: kmcomposewin.cpp:4479
+msgid ""
+"You are trying to send the mail to more than %1 recipients. Send message "
+"anyway?"
+msgstr ""
+
+#: kmcomposewin.cpp:4480
+#, fuzzy
+msgid "Too many receipients"
+msgstr "ไม่มีผู้รับ"
+
+#: kmcomposewin.cpp:4482
+#, fuzzy
+msgid "&Edit Recipients"
+msgstr "ผู้รับไม่ถูกต้อง"
+
+#: kmcomposewin.cpp:4728
 #, fuzzy
 msgid "Spellcheck: on"
 msgstr "เครื่องมือตรวจคำสะกด"
 
-#: kmcomposewin.cpp:4551
+#: kmcomposewin.cpp:4730
 #, fuzzy
 msgid "Spellcheck: off"
 msgstr "เครื่องมือตรวจคำสะกด"
 
-#: kmcomposewin.cpp:4608
+#: kmcomposewin.cpp:4787
 msgid " Spell check canceled."
 msgstr " การตรวจคำสะกดถูกยกเลิก"
 
-#: kmcomposewin.cpp:4611
+#: kmcomposewin.cpp:4790
 msgid " Spell check stopped."
 msgstr " หยุดตรวจคำสะกดแล้ว"
 
-#: kmcomposewin.cpp:4614
+#: kmcomposewin.cpp:4793
 msgid " Spell check complete."
 msgstr " ตรวจคำสะกดเรียบร้อยแล้ว"
 
-#: kmcomposewin.cpp:4798 kmcomposewin.cpp:4806
+#: kmcomposewin.cpp:4992 kmcomposewin.cpp:5000
 msgid "Spellchecker"
 msgstr "เครื่องมือตรวจคำสะกด"
 
-#: kmcomposewin.cpp:5115
+#: kmcomposewin.cpp:5304
 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."
 msgstr ""
 
-#: kmcomposewin.cpp:5119
+#: kmcomposewin.cpp:5308
 msgid ""
 "It looks as though libkleopatra was compiled without Chiasmus support. You "
 "might want to recompile libkleopatra with --enable-chiasmus."
 msgstr ""
 
-#: kmcomposewin.cpp:5122
+#: kmcomposewin.cpp:5311
 msgid "No Chiasmus Backend Configured"
 msgstr ""
 
-#: kmcomposewin.cpp:5153
+#: kmcomposewin.cpp:5342
 #, fuzzy
 msgid "No Chiasmus Keys Found"
 msgstr "ไม่พบลายเซ็น"
 
-#: kmcomposewin.cpp:5157
+#: kmcomposewin.cpp:5346
 #, fuzzy
 msgid "Chiasmus Encryption Key Selection"
 msgstr "ตั้งค่าการเข้ารหัส"
 
-#: kmcomposewin.cpp:5189
+#: kmcomposewin.cpp:5378
 #, fuzzy
 msgid "Message will be signed"
 msgstr "จดหมายถูกเซ็นกำกับโดย %1"
 
-#: kmcomposewin.cpp:5189
+#: kmcomposewin.cpp:5378
 #, fuzzy
 msgid "Message will not be signed"
 msgstr "จดหมายถูกเซ็นกำกับโดย %1"
 
-#: kmcomposewin.cpp:5190
+#: kmcomposewin.cpp:5379
 #, fuzzy
 msgid "Message will be encrypted"
 msgstr "จดหมายแบบ OpenPGP - มีการเข้ารหัสไว้"
 
-#: kmcomposewin.cpp:5190
+#: kmcomposewin.cpp:5379
 #, fuzzy
 msgid "Message will not be encrypted"
 msgstr "จดหมายที่มีชื่อเรื่อง: "
 
-#: kmedit.cpp:391
+#: kmedit.cpp:458
 msgid "Unable to start external editor."
 msgstr "ไม่สามารถเริ่มการทำงานเอดิเตอร์ภายนอกได้"
 
-#: kmedit.cpp:442
-msgid "Suggestions"
-msgstr ""
+#: kmedit.cpp:522
+#, fuzzy
+msgid "No Suggestions"
+msgstr "ปฏิบัติการของเซิร์ฟเวอร์"
+
+#: kmedit.cpp:529
+#, fuzzy
+msgid "Add to Dictionary"
+msgstr "พจนานุกรม"
 
-#: kmedit.cpp:494
+#: kmedit.cpp:530
+#, fuzzy
+msgid "Ignore All"
+msgstr "ไม่สนใจ"
+
+#: kmedit.cpp:587
 msgid "Automatic spellchecking is not possible on text with markup."
 msgstr ""
 
-#: kmedit.cpp:538
+#: kmedit.cpp:631
 msgid ""
 "The external editor is still running.\n"
 "Abort the external editor or leave it open?"
 msgstr ""
 
-#: kmedit.cpp:541
+#: kmedit.cpp:634
 msgid "Abort Editor"
 msgstr ""
 
-#: kmedit.cpp:541
+#: kmedit.cpp:634
 msgid "Leave Editor Open"
 msgstr ""
 
-#: kmedit.cpp:565
+#: kmedit.cpp:661
 msgid "Spellcheck - KMail"
 msgstr "ตรวจคำสะกด - KMail"
 
-#: kmedit.cpp:734
+#: kmedit.cpp:884
 msgid ""
 "ISpell/Aspell could not be started. Please make sure you have ISpell or Aspell "
 "properly configured and in your PATH."
@@ -5531,15 +6247,20 @@ msgstr ""
 "ไม่สามารถเริ่มการทำงาน ISpell ได้\n"
 " โปรดตรวจสอบว่า คุณได้ตั้งค่าพาธไปยัง ISpell ถูกต้องแล้ว"
 
-#: kmedit.cpp:743
+#: kmedit.cpp:893
 msgid "ISpell/Aspell seems to have crashed."
 msgstr "ดูเหมือนว่า ISpell/Aspell จะหยุดการทำงาน (แครช)"
 
-#: kmedit.cpp:752
+#: kmedit.cpp:902
 msgid "No misspellings encountered."
 msgstr ""
 
-#: kmfawidgets.cpp:102
+#: kmfawidgets.cpp:39
+#, fuzzy
+msgid "Open Address Book"
+msgstr "เปิดในสมุดที่อยู่"
+
+#: kmfawidgets.cpp:107
 #, fuzzy
 msgid "Select Sound File"
 msgstr "เลือกคอลัมน์"
@@ -5568,214 +6289,243 @@ msgstr ""
 " ในกฎการกรอง `%2'\n"
 "ทำต่อไปโดยไม่สนใจมัน"
 
-#: kmfilteraction.cpp:598
+#: kmfilteraction.cpp:601
 #, fuzzy
 msgid "Confirm Delivery"
 msgstr "ยืนยันการรับส่ง"
 
-#: kmfilteraction.cpp:634
+#: kmfilteraction.cpp:637
 #, fuzzy
 msgid "Set Transport To"
 msgstr "ตั้งค่าการรับส่งข้อมูลไปยัง"
 
-#: kmfilteraction.cpp:665
+#: kmfilteraction.cpp:668
 #, fuzzy
 msgid "Set Reply-To To"
 msgstr "ตั้งการตอบกลับเป็น"
 
-#: kmfilteraction.cpp:701
+#: kmfilteraction.cpp:704
 #, fuzzy
 msgid "Set Identity To"
 msgstr "ตั้งการแสดงตัวเป็น"
 
-#: kmfilteraction.cpp:784
+#: kmfilteraction.cpp:787
 #, fuzzy
 msgid "Mark As"
 msgstr "ทำเครื่องหมายเป็น"
 
-#: kmfilteraction.cpp:789
+#: kmfilteraction.cpp:792
 msgid ""
 "_: msg status\n"
 "Important"
 msgstr "สำคัญ"
 
-#: kmfilteraction.cpp:790
+#: kmfilteraction.cpp:793
 msgid ""
 "_: msg status\n"
 "Read"
 msgstr "อ่าน"
 
-#: kmfilteraction.cpp:791
+#: kmfilteraction.cpp:794
 msgid ""
 "_: msg status\n"
 "Unread"
 msgstr "ยังไม่ได้อ่าน"
 
-#: kmfilteraction.cpp:792
+#: kmfilteraction.cpp:795
 msgid ""
 "_: msg status\n"
 "Replied"
 msgstr "ตอบกลับแล้ว"
 
-#: kmfilteraction.cpp:793
+#: kmfilteraction.cpp:796
 msgid ""
 "_: msg status\n"
 "Forwarded"
 msgstr "ส่งต่อแล้ว"
 
-#: kmfilteraction.cpp:794
+#: kmfilteraction.cpp:797
 msgid ""
 "_: msg status\n"
 "Old"
 msgstr "เก่า"
 
-#: kmfilteraction.cpp:795
+#: kmfilteraction.cpp:798
 msgid ""
 "_: msg status\n"
 "New"
 msgstr "ใหม่"
 
-#: kmfilteraction.cpp:796
+#: kmfilteraction.cpp:799
 #, fuzzy
 msgid ""
 "_: msg status\n"
 "Watched"
 msgstr "อ่าน"
 
-#: kmfilteraction.cpp:797
+#: kmfilteraction.cpp:800
 #, fuzzy
 msgid ""
 "_: msg status\n"
 "Ignored"
 msgstr "ยังไม่ได้อ่าน"
 
-#: kmfilteraction.cpp:798
+#: kmfilteraction.cpp:801
 #, fuzzy
 msgid ""
 "_: msg status\n"
 "Spam"
 msgstr "อ่าน"
 
-#: kmfilteraction.cpp:799
+#: kmfilteraction.cpp:802
 #, fuzzy
 msgid ""
 "_: msg status\n"
 "Ham"
 msgstr "อ่าน"
 
-#: kmfilteraction.cpp:883
+#: kmfilteraction.cpp:886
 #, fuzzy
 msgid "Send Fake MDN"
 msgstr "ส่งภายหลัง"
 
-#: kmfilteraction.cpp:888
+#: kmfilteraction.cpp:891
 msgid ""
 "_: MDN type\n"
 "Ignore"
 msgstr ""
 
-#: kmfilteraction.cpp:889
+#: kmfilteraction.cpp:892
 #, fuzzy
 msgid ""
 "_: MDN type\n"
 "Displayed"
 msgstr "แสดงวันที่"
 
-#: kmfilteraction.cpp:890
+#: kmfilteraction.cpp:893
 msgid ""
 "_: MDN type\n"
 "Deleted"
 msgstr ""
 
-#: kmfilteraction.cpp:891
+#: kmfilteraction.cpp:894
 msgid ""
 "_: MDN type\n"
 "Dispatched"
 msgstr ""
 
-#: kmfilteraction.cpp:892
+#: kmfilteraction.cpp:895
 msgid ""
 "_: MDN type\n"
 "Processed"
 msgstr ""
 
-#: kmfilteraction.cpp:893
+#: kmfilteraction.cpp:896
 msgid ""
 "_: MDN type\n"
 "Denied"
 msgstr ""
 
-#: kmfilteraction.cpp:894
+#: kmfilteraction.cpp:897
 msgid ""
 "_: MDN type\n"
 "Failed"
 msgstr ""
 
-#: kmfilteraction.cpp:963
+#: kmfilteraction.cpp:966
 #, fuzzy
 msgid "Remove Header"
 msgstr "เอาหัวจดหมายออก"
 
-#: kmfilteraction.cpp:1036
+#: kmfilteraction.cpp:1039
 #, fuzzy
 msgid "Add Header"
 msgstr "เพิ่มหัวจดหมาย"
 
-#: kmfilteraction.cpp:1063
+#: kmfilteraction.cpp:1066
 #, fuzzy
 msgid "With value:"
 msgstr "ด้วยค่า"
 
-#: kmfilteraction.cpp:1177
+#: kmfilteraction.cpp:1180
 #, fuzzy
 msgid "Rewrite Header"
 msgstr "เขียนหัวจดหมายใหม่"
 
-#: kmfilteraction.cpp:1213
+#: kmfilteraction.cpp:1216
 #, fuzzy
 msgid "Replace:"
 msgstr "แทนที่"
 
-#: kmfilteraction.cpp:1220
+#: kmfilteraction.cpp:1223
 #, fuzzy
 msgid "With:"
 msgstr "ด้วย"
 
-#: kmfilteraction.cpp:1340
+#: kmfilteraction.cpp:1343
 #, fuzzy
 msgid "Move Into Folder"
 msgstr "ย้ายไปยังโฟลเดอร์นี้"
 
-#: kmfilteraction.cpp:1390
+#: kmfilteraction.cpp:1393
 #, fuzzy
 msgid "Copy Into Folder"
 msgstr "สำเนาไปยังโฟลเดอร์นี้"
 
-#: kmfilteraction.cpp:1452
+#: kmfilteraction.cpp:1467
 #, fuzzy
 msgid "Forward To"
 msgstr "ส่งต่อไปยัง..."
 
-#: kmfilteraction.cpp:1565
+#: kmfilteraction.cpp:1508
+msgid "The addressee the message will be forwarded to"
+msgstr ""
+
+#: kmfilteraction.cpp:1509
+msgid "The filter will forward the message to the addressee entered here."
+msgstr ""
+
+#: kmfilteraction.cpp:1515
+#, fuzzy
+msgid "Default Template"
+msgstr "บันทึกเป็นฉบับร่าง"
+
+#: kmfilteraction.cpp:1525
+msgid "The template used when forwarding"
+msgstr ""
+
+#: kmfilteraction.cpp:1526
+msgid "Set the forwarding template that will be used with this filter."
+msgstr ""
+
+#: kmfilteraction.cpp:1620
+msgid "Forward to %1 with default template "
+msgstr ""
+
+#: kmfilteraction.cpp:1622
+msgid "Forward to %1 with template %2"
+msgstr ""
+
+#: kmfilteraction.cpp:1643
 #, fuzzy
 msgid "Redirect To"
 msgstr "เด้งกลับไปยัง"
 
-#: kmfilteraction.cpp:1605
+#: kmfilteraction.cpp:1683
 #, fuzzy
 msgid "Execute Command"
 msgstr "ประมวลผลคำสั่ง"
 
-#: kmfilteraction.cpp:1702
+#: kmfilteraction.cpp:1780
 #, fuzzy
 msgid "Pipe Through"
 msgstr "ไปป์ไปยัง"
 
-#: kmfilteraction.cpp:1809
+#: kmfilteraction.cpp:1887
 msgid "Play Sound"
 msgstr ""
 
-#: kmfilterdlg.cpp:51
+#: kmfilterdlg.cpp:55
 msgid ""
 "<qt>"
 "<p>This is the list of defined filters. They are processed top-to-bottom.</p>"
@@ -5787,7 +6537,7 @@ msgstr ""
 "<p>คลิ้กที่ตัวกรองตัวใดตัวหนึ่ง เพื่อแก้ไขมัน โดยใช้ การควบคุม "
 "ที่อยู่ทางด้านขวาของไดอะล็อกซ์</p></qt>"
 
-#: kmfilterdlg.cpp:57
+#: kmfilterdlg.cpp:61
 #, fuzzy
 msgid ""
 "<qt>"
@@ -5804,7 +6554,7 @@ msgstr ""
 "<p>หากคุณเผลอกดปุ่มนี้ คุณสามารถยกเลิกได้ โดยกดที่ปุ่ม <em>ลบ</em> "
 "(ซึ่งอยู่ด้านขวา)</p></qt>"
 
-#: kmfilterdlg.cpp:64
+#: kmfilterdlg.cpp:68
 #, fuzzy
 msgid ""
 "<qt>"
@@ -5819,7 +6569,7 @@ msgstr ""
 "<p>หากคุณเผลอกดปุ่มนี้ คุณสามารถยกเลิกได้ โดยกดที่ปุ่ม <em>ลบ</em> "
 "(ซึ่งอยู่ด้านขวา)</p></qt>"
 
-#: kmfilterdlg.cpp:68
+#: kmfilterdlg.cpp:72
 #, fuzzy
 msgid ""
 "<qt>"
@@ -5835,7 +6585,7 @@ msgstr ""
 "แต่คุณก็สามารถจะออกจากกล่องโต้ตอบนี้ได้ โดย <em>ยกเลิก</em> "
 "เพื่อละทิ้งการเปลี่ยนแปลงที่ทำไว้</p></qt>"
 
-#: kmfilterdlg.cpp:75
+#: kmfilterdlg.cpp:79
 #, fuzzy
 msgid ""
 "<qt>"
@@ -5853,7 +6603,7 @@ msgstr ""
 "<p>หากคุณเผลอกดที่ปุ่มนี้ คุณสามารถเรียกคืนได้ โดยคลิ้กที่ปุ่ม <em>เลื่อนลง</em> "
 "(อยู่ทางด้านขวา)</p></qt>"
 
-#: kmfilterdlg.cpp:81
+#: kmfilterdlg.cpp:85
 #, fuzzy
 msgid ""
 "<qt>"
@@ -5873,7 +6623,7 @@ msgstr ""
 "<p>หากคุณเผลอกดที่ปุ่มนี้ คุณสามารถเรียกคืนได้ โดยคลิ้กที่ปุ่ม <em>เลื่อนลง</em> "
 "(อยู่ทางด้านขวา)</p></qt>"
 
-#: kmfilterdlg.cpp:89
+#: kmfilterdlg.cpp:93
 #, fuzzy
 msgid ""
 "<qt>"
@@ -5893,7 +6643,7 @@ msgstr ""
 "<p>หากคุณเผลอกดที่ปุ่มนี้ คุณสามารถเรียกคืนได้ โดยคลิ้กที่ปุ่ม <em>"
 "เลื่อนขึ้น</em> (อยู่ทางด้านซ้าย)</p></qt>"
 
-#: kmfilterdlg.cpp:97
+#: kmfilterdlg.cpp:101
 #, fuzzy
 msgid ""
 "<qt>"
@@ -5911,7 +6661,7 @@ msgstr ""
 "<p>หากคุณเผลอกดที่ปุ่มนี้ คุณสามารถเรียกคืนได้ โดยคลิ้กที่ปุ่ม <em>"
 "เลื่อนขึ้น</em> (อยู่ทางด้านซ้าย)</p></qt>"
 
-#: kmfilterdlg.cpp:103
+#: kmfilterdlg.cpp:107
 #, fuzzy
 msgid ""
 "<qt>"
@@ -5928,7 +6678,7 @@ msgstr ""
 "โดยคลิ้กที่ปุ่มนี้ แล้วเลือก <em>ล้าง</em> จากนั้นกด <em>ตกลง</em> "
 "ในกล่องโต้ตอบที่ปรากฎ</p></qt>"
 
-#: kmfilterdlg.cpp:110
+#: kmfilterdlg.cpp:114
 msgid ""
 "<qt>"
 "<p>Check this button to force the confirmation dialog to be displayed.</p>"
@@ -5939,134 +6689,139 @@ msgid ""
 "differently.</p></qt>"
 msgstr ""
 
-#: kmfilterdlg.cpp:129
+#: kmfilterdlg.cpp:133
 msgid "POP3 Filter Rules"
 msgstr "กฎการกรอง POP3"
 
-#: kmfilterdlg.cpp:129
+#: kmfilterdlg.cpp:133
 msgid "Filter Rules"
 msgstr "กฎการกรอง"
 
-#: kmfilterdlg.cpp:151
+#: kmfilterdlg.cpp:155
 msgid "Available Filters"
 msgstr "การกรองที่มี"
 
-#: kmfilterdlg.cpp:164
+#: kmfilterdlg.cpp:168
 #, fuzzy
 msgid "A&dvanced"
 msgstr "ตัวเลือกเพิ่มเติม"
 
-#: kmfilterdlg.cpp:171
+#: kmfilterdlg.cpp:175
 msgid "Filter Criteria"
 msgstr "กฏเกณฑ์การกรอง"
 
-#: kmfilterdlg.cpp:175
+#: kmfilterdlg.cpp:179
 msgid "Filter Action"
 msgstr "การกระทำเมื่อกรอง"
 
-#: kmfilterdlg.cpp:178
+#: kmfilterdlg.cpp:182
 msgid "Global Options"
 msgstr "ตัวเลือกทั่วไป"
 
-#: kmfilterdlg.cpp:179
+#: kmfilterdlg.cpp:183
 msgid "Always &show matched 'Download Later' messages in confirmation dialog"
 msgstr "ให้แสดงข้อความ 'ดาวน์โหลดทีหลัง' ในกล่องการยืนยันเสมอ"
 
-#: kmfilterdlg.cpp:184
+#: kmfilterdlg.cpp:188
 msgid "Filter Actions"
 msgstr "การกระทำเมื่อกรอง"
 
-#: kmfilterdlg.cpp:189
+#: kmfilterdlg.cpp:193
 msgid "Advanced Options"
 msgstr "ตัวเลือกเพิ่มเติม"
 
-#: kmfilterdlg.cpp:197
+#: kmfilterdlg.cpp:201
 #, fuzzy
 msgid "Apply this filter to incoming messages:"
 msgstr "ไปยังจดหมายเข้ามาใหม่"
 
-#: kmfilterdlg.cpp:201
+#: kmfilterdlg.cpp:205
 #, fuzzy
 msgid "from all accounts"
 msgstr "เพิ่มบัญชีผู้ใช้"
 
-#: kmfilterdlg.cpp:204
+#: kmfilterdlg.cpp:208
 msgid "from all but online IMAP accounts"
 msgstr ""
 
-#: kmfilterdlg.cpp:207
+#: kmfilterdlg.cpp:211
 msgid "from checked accounts only"
 msgstr ""
 
-#: kmfilterdlg.cpp:213
+#: kmfilterdlg.cpp:217
 msgid "Account Name"
 msgstr "ชื่อบัญชีผู้ใช้"
 
-#: kmfilterdlg.cpp:220
+#: kmfilterdlg.cpp:224
 #, fuzzy
 msgid "Apply this filter to &sent messages"
 msgstr "ปรับใช้ตัวกรองนี"
 
-#: kmfilterdlg.cpp:223
+#: kmfilterdlg.cpp:227
 msgid "Apply this filter on manual &filtering"
 msgstr "ปรับใช้ตัวกรองนี้เมื่อทำการกรองด้วยตนเอง"
 
-#: kmfilterdlg.cpp:226
+#: kmfilterdlg.cpp:230
 msgid "If this filter &matches, stop processing here"
 msgstr "หากพบที่เข้าข่ายในกฎการกรอง ให้หยุดการประมวลผลที่นี่"
 
-#: kmfilterdlg.cpp:230
+#: kmfilterdlg.cpp:234
 msgid "Add this filter to the Apply Filter menu"
 msgstr "เพิ่มตัวกรองไปยังเมนูตัวกรองที่จะปรับใช้"
 
-#: kmfilterdlg.cpp:232
+#: kmfilterdlg.cpp:236
 msgid "Shortcut:"
 msgstr "ปุ่มพิมพ์ลัด:"
 
-#: kmfilterdlg.cpp:238
+#: kmfilterdlg.cpp:242
 msgid "Additionally add this filter to the toolbar"
 msgstr "ทำการเพิ่มตัวกรองนี้ไปยังแถบเครื่องมือ"
 
-#: kmfilterdlg.cpp:243
+#: kmfilterdlg.cpp:247
 msgid "Icon for this filter:"
 msgstr "ภาพไอคอนสำหรับตัวกรองนี้:"
 
-#: kmfilterdlg.cpp:608
+#: kmfilterdlg.cpp:612
 msgid "Up"
 msgstr "เลื่อนขึ้น"
 
-#: kmfilterdlg.cpp:609
+#: kmfilterdlg.cpp:613
 msgid "Down"
 msgstr "เลื่อนลง"
 
-#: kmfilterdlg.cpp:628
+#: kmfilterdlg.cpp:632
 msgid "Rename..."
 msgstr "เปลี่ยนชื่อ..."
 
 #. i18n: file kmail_part.rc line 10
-#: kmfilterdlg.cpp:629 kmsearchpattern.h:219 rc.cpp:6 rc.cpp:72
+#: kmfilterdlg.cpp:633 kmsearchpattern.h:219 rc.cpp:6 rc.cpp:72
 #, no-c-format
 msgid "New"
 msgstr "ใหม่"
 
-#: kmfilterdlg.cpp:744
+#: kmfilterdlg.cpp:645
+#, fuzzy
+msgid "Select Source Folders"
+msgstr "เลือกปุ่มพิมพ์ลัดสำหรับโฟลเดอร์"
+
+#: kmfilterdlg.cpp:756
 msgid ""
 "At least one filter targets a folder on an online IMAP account. Such filters "
 "will only be applied when manually filtering and when filtering incoming online "
 "IMAP mail."
 msgstr ""
 
-#: kmfilterdlg.cpp:774
+#: kmfilterdlg.cpp:786
 msgid ""
 "The following filters have not been saved because they were invalid (e.g. "
 "containing no actions or no search rules)."
 msgstr ""
 
-#: kmfilterdlg.cpp:935
+#: kmfilterdlg.cpp:947
 msgid "Rename Filter"
 msgstr "เปลี่ยนชื่อตัวกรอง"
 
-#: kmfilterdlg.cpp:936
+#: kmfilterdlg.cpp:948
 msgid ""
 "Rename filter \"%1\" to:\n"
 "(leave the field empty for automatic naming)"
@@ -6074,19 +6829,24 @@ msgstr ""
 "เปลี่ยนชื่อตัวกรอง \"%1\" ไปเป็น:\n"
 "(ปล่อยว่างไว้หากต้องการให้เปลี่ยนชื่อให้อัตโนมัติ)"
 
-#: kmfilterdlg.cpp:1113
+#: kmfilterdlg.cpp:973
+#, fuzzy
+msgid "Select Folders to Filter"
+msgstr "เลือกโฟลเดอร์พร้อมกับโฟกัส"
+
+#: kmfilterdlg.cpp:1136
 msgid "Please select an action."
 msgstr "โปรดเลือกการกระทำก่อน"
 
-#: kmfilterdlg.cpp:1280
+#: kmfilterdlg.cpp:1303
 msgid "&Download mail"
 msgstr "ดาวน์โหลดจดหมาย"
 
-#: kmfilterdlg.cpp:1281
+#: kmfilterdlg.cpp:1304
 msgid "Download mail la&ter"
 msgstr "ดาวน์โหลดจดหมายภายหลัง"
 
-#: kmfilterdlg.cpp:1282
+#: kmfilterdlg.cpp:1305
 msgid "D&elete mail from server"
 msgstr "ลบจดหมายออกจากเซิร์ฟเวอร์ด้วย"
 
@@ -6094,10 +6854,28 @@ msgstr "ลบจดหมายออกจากเซิร์ฟเวอร
 msgid "<qt>Error while creating file <b>%1</b>:<br>%2</qt>"
 msgstr "<qt>เกิดข้อผิดพลาดขณะสร้างแฟ้ม <b>%1</b>:<br>%2</qt>"
 
-#: kmfolder.cpp:272
+#: kmfolder.cpp:276
 msgid "Failed to create folder"
 msgstr "ล้มเหลวในการสร้างโฟลเดอร์"
 
+#: kmfolder.cpp:907
+msgid ""
+"Folder names cannot contain the / (slash) character; please choose another "
+"folder name."
+msgstr ""
+
+#: kmfolder.cpp:913
+msgid ""
+"Folder names cannot start with a . (dot) character; please choose another "
+"folder name."
+msgstr ""
+
+#: kmfolder.cpp:932
+msgid ""
+"Your IMAP server does not allow the character '%1'; please choose another "
+"folder name."
+msgstr ""
+
 #: kmfoldercachedimap.cpp:107
 msgid "Troubleshooting IMAP Cache"
 msgstr ""
@@ -6147,29 +6925,29 @@ msgstr "ผู้อ่านทั้งหมดของโฟลเดอร
 msgid "Refresh &Cache"
 msgstr "ปรับปรุงแคชใหม่"
 
-#: kmfoldercachedimap.cpp:203
+#: kmfoldercachedimap.cpp:216
 msgid ""
 "The UID cache file for folder %1 could not be read. There could be a problem "
 "with file system permission, or it is corrupted."
 msgstr ""
 
-#: kmfoldercachedimap.cpp:452
+#: kmfoldercachedimap.cpp:488
 msgid ""
 "The UID cache file for folder %1 could not be written. There could be a problem "
 "with file system permission."
 msgstr ""
 
-#: kmfoldercachedimap.cpp:562
+#: kmfoldercachedimap.cpp:612
 msgid "You must synchronize with the server before renaming IMAP folders."
 msgstr ""
 
-#: kmfoldercachedimap.cpp:679
+#: kmfoldercachedimap.cpp:735
 msgid ""
 "No account setup for this folder.\n"
 "Please try running a sync before this."
 msgstr ""
 
-#: kmfoldercachedimap.cpp:683
+#: kmfoldercachedimap.cpp:739
 #, fuzzy
 msgid ""
 "Are you sure you want to refresh the IMAP cache of the folder %1 and all its "
@@ -6179,147 +6957,146 @@ msgstr ""
 "คุณแน่ใจหรือว่า ต้องการลบโฟลเดอร์ \"%1\" รวมทั้งโฟลเดอร์ย่อย "
 "และเนื้อหาทั้งหมดของมัน ?"
 
-#: kmfoldercachedimap.cpp:687 kmmainwidget.cpp:1352
+#: kmfoldercachedimap.cpp:743 kmmainwidget.cpp:1316
 msgid "Refresh IMAP Cache"
 msgstr "ปรับปรุงแคชของ IMAP ใหม่"
 
-#: kmfoldercachedimap.cpp:688 kmmainwidget.cpp:1352
+#: kmfoldercachedimap.cpp:744 kmmainwidget.cpp:1316
 msgid "&Refresh"
 msgstr "ปรับปรุง"
 
-#: kmfoldercachedimap.cpp:711
+#: kmfoldercachedimap.cpp:767
 msgid "The index of this folder has been recreated."
 msgstr "สร้างดัชนีสำหรับโฟลเดอร์นี้ใหม่อีกครั้งแล้ว"
 
-#: kmfoldercachedimap.cpp:721
+#: kmfoldercachedimap.cpp:777
 msgid ""
 "Folder %1 is not in initial sync state (state was %2). Do you want to reset it "
 "to initial sync state and sync anyway?"
 msgstr ""
 
-#: kmfoldercachedimap.cpp:721
+#: kmfoldercachedimap.cpp:777
 msgid "Reset && Sync"
 msgstr ""
 
-#: kmfoldercachedimap.cpp:741
+#: kmfoldercachedimap.cpp:798
 msgid "Synchronization skipped"
 msgstr ""
 
-#: kmfoldercachedimap.cpp:831
+#: kmfoldercachedimap.cpp:890
 msgid "Synchronizing"
 msgstr ""
 
-#: kmfoldercachedimap.cpp:850
+#: kmfoldercachedimap.cpp:909
 #, c-format
 msgid "Connecting to %1"
 msgstr "กำลังเชื่อมต่อไปยัง %1"
 
-#: kmfoldercachedimap.cpp:872
+#: kmfoldercachedimap.cpp:934
 msgid "Checking permissions"
 msgstr "กำลังตรวจสอบสิทธิ์ที่อนุญาต"
 
-#: kmfoldercachedimap.cpp:886
+#: kmfoldercachedimap.cpp:956
 msgid "Renaming folder"
 msgstr "กำลังเปลี่ยนชื่อโฟลเดอร์"
 
-#: kmfoldercachedimap.cpp:948
+#: kmfoldercachedimap.cpp:1021
 msgid "Retrieving folderlist"
 msgstr "กำลังรับรายการโฟลเดอร์"
 
-#: kmfoldercachedimap.cpp:952
+#: kmfoldercachedimap.cpp:1026
 msgid "Error while retrieving the folderlist"
 msgstr "เกิดข้อผิดพลาดระหว่างรับรายการโฟลเดอร์"
 
-#: kmfoldercachedimap.cpp:959
+#: kmfoldercachedimap.cpp:1035
 msgid "Retrieving subfolders"
 msgstr "กำลังรับรายการโฟลเดอร์ย่อย"
 
-#: kmfoldercachedimap.cpp:966
+#: kmfoldercachedimap.cpp:1043
 msgid "Deleting folders from server"
 msgstr "กำลังลบโฟลเดอร์ออกจากเซิร์ฟเวอร์"
 
-#: kmfoldercachedimap.cpp:981
+#: kmfoldercachedimap.cpp:1058
 msgid "Retrieving message list"
 msgstr "กำลังรับรายการจดหมาย"
 
-#: kmfoldercachedimap.cpp:994
+#: kmfoldercachedimap.cpp:1071
 msgid "No messages to delete..."
 msgstr "ไม่มีจดหมายที่จะลบ..."
 
-#: kmfoldercachedimap.cpp:1005
+#: kmfoldercachedimap.cpp:1082
 #, fuzzy
 msgid "Expunging deleted messages"
 msgstr "ให้จดหมายเก่าหมดอายุ..."
 
-#: kmfoldercachedimap.cpp:1019
-msgid "Retrieving new messages"
-msgstr "กำลังรับจดหมายใหม่"
+#: kmfoldercachedimap.cpp:1096
+#, fuzzy, c-format
+msgid ""
+"_n: Retrieving one new message\n"
+"Retrieving %n new messages"
+msgstr "จดหมายใหม่ %n ฉบับใน %1"
 
-#: kmfoldercachedimap.cpp:1031
+#: kmfoldercachedimap.cpp:1108
 msgid "No new messages from server"
 msgstr "ไม่มีจดหมายใหม่บนเซิร์ฟเวอร์"
 
-#: kmfoldercachedimap.cpp:1064
+#: kmfoldercachedimap.cpp:1141
 msgid "Checking annotation support"
 msgstr ""
 
-#: kmfoldercachedimap.cpp:1111
+#: kmfoldercachedimap.cpp:1191
 msgid "Retrieving annotations"
 msgstr ""
 
-#: kmfoldercachedimap.cpp:1133
+#: kmfoldercachedimap.cpp:1213
 msgid "Setting annotations"
 msgstr ""
 
-#: kmfoldercachedimap.cpp:1174
+#: kmfoldercachedimap.cpp:1260
 msgid "Setting permissions"
 msgstr "ตั้งค่าสิทธิ์ที่อนุญาต"
 
-#: kmfoldercachedimap.cpp:1193
+#: kmfoldercachedimap.cpp:1279
 msgid "Retrieving permissions"
 msgstr "กำลังรับค่าสิทธิ์ที่อนุญาต"
 
-#: kmfoldercachedimap.cpp:1203
+#: kmfoldercachedimap.cpp:1306
 #, fuzzy
 msgid "Getting quota information"
 msgstr "เกิดข้อผิดพลาดระหว่างขอข้อมูลของโฟลเดอร์"
 
-#: kmfoldercachedimap.cpp:1218
-msgid "Updating cache file"
-msgstr "กำลังปรับปรุงแฟ้มแคช"
-
-#: kmfoldercachedimap.cpp:1244
+#: kmfoldercachedimap.cpp:1321
 msgid "Synchronization done"
 msgstr ""
 
-#: kmfoldercachedimap.cpp:1326
+#: kmfoldercachedimap.cpp:1464
 msgid "Uploading messages to server"
 msgstr "กำลังอัพโหลดจดหมายไปยังเซิร์ฟเวอร์"
 
-#: kmfoldercachedimap.cpp:1342
+#: kmfoldercachedimap.cpp:1480
 msgid ""
 "<p>Your access rights to folder <b>%1</b> have been restricted, it will no "
 "longer be possible to add messages to this folder.</p>"
 msgstr ""
 
-#: kmfoldercachedimap.cpp:1344
+#: kmfoldercachedimap.cpp:1482
 msgid "Acces rights revoked"
 msgstr ""
 
-#: kmfoldercachedimap.cpp:1347 kmfoldercachedimap.cpp:1402
-#: kmfoldercachedimap.cpp:1447
+#: kmfoldercachedimap.cpp:1485 kmfoldercachedimap.cpp:1545
+#: kmfoldercachedimap.cpp:1596
 msgid "No messages to upload to server"
 msgstr "ไม่มีจดหมายที่จะอัพโหลดไปยังเซิร์ฟเวอร์"
 
-#: kmfoldercachedimap.cpp:1366 kmfoldercachedimap.cpp:1410
+#: kmfoldercachedimap.cpp:1504 kmfoldercachedimap.cpp:1553
 msgid "Uploading status of messages to server"
 msgstr "กำลังอัพโหลดสถานะของจดหมายไปยังเซิร์ฟเวอร์"
 
-#: kmfoldercachedimap.cpp:1490
+#: kmfoldercachedimap.cpp:1647
 msgid "Creating subfolders on server"
 msgstr "กำลังสร้างโฟลเดอร์ย่อยบนเซิร์ฟเวอร์"
 
-#: kmfoldercachedimap.cpp:1546
+#: kmfoldercachedimap.cpp:1707
 msgid ""
 "<qt>"
 "<p>Mails on the server in folder <b>%1</b> were deleted. Do you want to delete "
@@ -6327,58 +7104,58 @@ msgid ""
 "<br>UIDs: %2</p></qt>"
 msgstr ""
 
-#: kmfoldercachedimap.cpp:1558
+#: kmfoldercachedimap.cpp:1719
 msgid "Deleting removed messages from server"
 msgstr "กำลังลบจดหมายที่ถูกกำหนดให้ลบออกจากเซิร์ฟเวอร์"
 
-#: kmfoldercachedimap.cpp:1592
+#: kmfoldercachedimap.cpp:1758
 msgid "Checking folder validity"
 msgstr "กำลังตรวจสอบความถูกต้องของโฟลเดอร์"
 
-#: kmfoldercachedimap.cpp:1806
+#: kmfoldercachedimap.cpp:1972
 msgid "Folder listing failed in interesting ways."
 msgstr ""
 
-#: kmfoldercachedimap.cpp:1888
+#: kmfoldercachedimap.cpp:2058
 #, fuzzy, c-format
 msgid "Retrieving folders for namespace %1"
 msgstr "การตั้งค่าโฟลเดอร์"
 
-#: kmfoldercachedimap.cpp:2130
+#: kmfoldercachedimap.cpp:2300
 msgid ""
 "<qt>"
 "<p>It seems that the folder <b>%1</b> was deleted. Do you want to delete it "
 "from the server?</p></qt>"
 msgstr ""
 
-#: kmfoldercachedimap.cpp:2411
+#: kmfoldercachedimap.cpp:2597
 msgid "Aborted"
 msgstr "ยกเลิกแล้ว"
 
-#: kmfoldercachedimap.cpp:2592
+#: kmfoldercachedimap.cpp:2812
 msgid ""
 "The IMAP server %1 does not have support for IMAP annotations. The XML storage "
 "cannot be used on this server; please re-configure KMail differently."
 msgstr ""
 
-#: kmfoldercachedimap.cpp:2620
+#: kmfoldercachedimap.cpp:2840
 msgid ""
 "The IMAP server %1 doesn't have support for imap annotations. The XML storage "
 "cannot be used on this server, please re-configure KMail differently"
 msgstr ""
 
-#: kmfoldercachedimap.cpp:2729
+#: kmfoldercachedimap.cpp:2951
 #, fuzzy
 msgid "Error while setting annotation: "
 msgstr ""
 "มีข้อผิดพลาดขณะเขียนไปยังแฟ้ม:\n"
 "%1"
 
-#: kmfoldercachedimap.cpp:2857 kmfoldercachedimap.cpp:2860
+#: kmfoldercachedimap.cpp:3079 kmfoldercachedimap.cpp:3082
 msgid "lost+found"
 msgstr ""
 
-#: kmfoldercachedimap.cpp:2895
+#: 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 "
@@ -6387,11 +7164,11 @@ msgid ""
 "to avoid data loss.</p>"
 msgstr ""
 
-#: kmfoldercachedimap.cpp:2901
+#: kmfoldercachedimap.cpp:3123
 msgid "Insufficient access rights"
 msgstr ""
 
-#: kmfoldercachedimap.cpp:2907
+#: 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 "
@@ -6401,57 +7178,64 @@ msgid ""
 "<p>Do you want to move these messages to another folder now?</p>"
 msgstr ""
 
-#: kmfoldercachedimap.cpp:2914 kmkernel.cpp:1801
+#: kmfoldercachedimap.cpp:3136 kmkernel.cpp:1903
 msgid "Do Not Move"
 msgstr "ไม่ต้องย้าย"
 
-#: kmfoldercachedimap.cpp:2916
+#: kmfoldercachedimap.cpp:3138
 msgid "Move Messages to Folder"
 msgstr "ย้ายจดหมายไปยังโฟลเดอร์"
 
-#: kmfolderdia.cpp:83
+#: kmfolderdia.cpp:84
 msgid "Permissions (ACL)"
 msgstr "สิทธิ์ที่อนุญาต (แบบ ACL)"
 
 #. i18n: file folderpropertiesdialog.ui line 30
-#: kmfolderdia.cpp:121 rc.cpp:221 snippetwidget.cpp:119
+#: kmfolderdia.cpp:122 rc.cpp:227 snippetwidget.cpp:119
 #, fuzzy, no-c-format
 msgid "General"
 msgstr "ทั่วไป"
 
-#: kmfolderdia.cpp:124
+#: kmfolderdia.cpp:125
 msgid "Templates"
 msgstr ""
 
-#: kmfolderdia.cpp:133
+#: kmfolderdia.cpp:134
 msgid "Access Control"
 msgstr ""
 
-#: kmfolderdia.cpp:140
+#: kmfolderdia.cpp:141
 #, fuzzy
 msgid "Quota"
 msgstr "รวม"
 
+#: kmfolderdia.cpp:327
+msgid ""
+"Not enough permissions to rename this folder.\n"
+"The parent folder doesn't have write support.\n"
+"A sync is needed after changing the permissions."
+msgstr ""
+
 #. i18n: file folderpropertiesdialog.ui line 243
-#: kmfolderdia.cpp:299 rc.cpp:239
+#: kmfolderdia.cpp:356 rc.cpp:245
 #, no-c-format
 msgid "Use custom &icons"
 msgstr "ใช้ไอคอนที่กำหนดเอง"
 
-#: kmfolderdia.cpp:304
+#: kmfolderdia.cpp:361
 msgid "&Normal:"
 msgstr "ธรรมดา:"
 
-#: kmfolderdia.cpp:319
+#: kmfolderdia.cpp:376
 msgid "&Unread:"
 msgstr "ยังไม่ได้อ่าน:"
 
-#: kmfolderdia.cpp:356
+#: kmfolderdia.cpp:413
 #, fuzzy
 msgid "Act on new/unread mail in this folder"
 msgstr "ทำเครื่องหมายจดหมายในโฟลเดอร์นี้"
 
-#: kmfolderdia.cpp:358
+#: kmfolderdia.cpp:415
 msgid ""
 "<qt>"
 "<p>If this option is enabled then you will be notified about new/unread mail in "
@@ -6463,50 +7247,50 @@ msgid ""
 "new/unread mail in your trash and spam folder.</p></qt>"
 msgstr ""
 
-#: kmfolderdia.cpp:374
+#: kmfolderdia.cpp:431
 msgid "Include this folder in mail checks"
 msgstr "รวมโฟลเดอร์นี้ไว้ในการตรวจจดหมายด้วย"
 
-#: kmfolderdia.cpp:385
+#: kmfolderdia.cpp:442
 #, fuzzy
 msgid "Keep replies in this folder"
 msgstr "ให้จดหมายเก่าในโฟลเดอร์นี้หมดอายุ"
 
-#: kmfolderdia.cpp:387
+#: kmfolderdia.cpp:444
 msgid ""
 "Check this option if you want replies you write to mails in this folder to be "
 "put in this same folder after sending, instead of in the configured sent-mail "
 "folder."
 msgstr ""
 
-#: kmfolderdia.cpp:402
+#: kmfolderdia.cpp:459
 msgid "Show Sender/Receiver Column in List of Messages"
 msgstr "แสดงคอลัมน์ผู้ส่ง/ผู้รับในช่องแสดงรายการจดหมาย"
 
-#: kmfolderdia.cpp:404
+#: kmfolderdia.cpp:461
 msgid "Sho&w column:"
 msgstr "แสดงคอลัมน์:"
 
 #. i18n: file folderpropertiesdialog.ui line 520
-#: kmfolderdia.cpp:411 kmheaders.cpp:181 kmheaders.cpp:243 kmheaders.cpp:378
-#: kmheaders.cpp:549 kmheaders.cpp:765 kmpopfiltercnfrmdlg.cpp:40 rc.cpp:287
+#: kmfolderdia.cpp:468 kmheaders.cpp:185 kmheaders.cpp:248 kmheaders.cpp:392
+#: kmheaders.cpp:577 kmheaders.cpp:794 kmpopfiltercnfrmdlg.cpp:40 rc.cpp:293
 #, no-c-format
 msgid "Sender"
 msgstr "ผู้ส่ง"
 
 #. i18n: file folderpropertiesdialog.ui line 525
-#: kmfolderdia.cpp:412 kmheaders.cpp:139 kmheaders.cpp:184 kmheaders.cpp:240
-#: kmheaders.cpp:245 kmheaders.cpp:380 kmheaders.cpp:551 kmheaders.cpp:767
-#: kmpopfiltercnfrmdlg.cpp:41 rc.cpp:290
+#: 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
 #, no-c-format
 msgid "Receiver"
 msgstr "ผู้รับ"
 
-#: kmfolderdia.cpp:423
+#: kmfolderdia.cpp:480
 msgid "&Sender identity:"
 msgstr "การแสดงตัวของผู้ส่ง:"
 
-#: kmfolderdia.cpp:429
+#: 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 "
@@ -6515,15 +7299,15 @@ msgid ""
 "configuration dialog. (Settings -> Configure KMail)"
 msgstr ""
 
-#: kmfolderdia.cpp:442
+#: kmfolderdia.cpp:500
 msgid "&Folder contents:"
 msgstr "เนื้อหาในโฟลเดอร์:"
 
-#: kmfolderdia.cpp:475
+#: kmfolderdia.cpp:533
 msgid "Generate free/&busy and activate alarms for:"
 msgstr ""
 
-#: kmfolderdia.cpp:482
+#: kmfolderdia.cpp:540
 msgid ""
 "This setting defines which users sharing this folder should get \"busy\" "
 "periods in their freebusy lists and should see the alarms for the events or "
@@ -6539,28 +7323,39 @@ msgid ""
 "is not known who will go to those events."
 msgstr ""
 
-#: kmfolderdia.cpp:497
+#: kmfolderdia.cpp:555
 msgid "Nobody"
 msgstr "ไม่มีใคร"
 
-#: kmfolderdia.cpp:498
+#: kmfolderdia.cpp:556
 msgid "Admins of This Folder"
 msgstr "ผู้ดูแลโฟลเดอร์นี้"
 
-#: kmfolderdia.cpp:499
+#: kmfolderdia.cpp:557
 msgid "All Readers of This Folder"
 msgstr "ผู้อ่านทั้งหมดของโฟลเดอร์นี้"
 
-#: kmfolderdia.cpp:502
+#: kmfolderdia.cpp:560
 msgid ""
 "This setting allows you to disable alarms for folders shared by others. "
 msgstr ""
 
-#: kmfolderdia.cpp:506
-msgid "Block free/&busy and alarms locally"
+#: kmfolderdia.cpp:562
+msgid "Block alarms locally"
+msgstr ""
+
+#: kmfolderdia.cpp:576
+msgid "Share unread state with all users"
 msgstr ""
 
-#: kmfolderdia.cpp:585
+#: 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."
+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 "
@@ -6569,73 +7364,73 @@ msgid ""
 "groupware folders to be able to see it."
 msgstr ""
 
-#: kmfolderdir.cpp:184
+#: kmfolderdir.cpp:209
 msgid "<qt>Cannot enter folder <b>%1</b>.</qt>"
 msgstr "<qt>ไม่สามารถเปิดโฟลเดอร์ <b>%1</b> ได้</qt>"
 
-#: kmfolderdir.cpp:192
+#: kmfolderdir.cpp:217
 msgid "<qt>Folder <b>%1</b> is unreadable.</qt>"
 msgstr "<qt>ไม่สามารถอ่านโฟลเดอร์ <b>%1</b> ได้</qt>"
 
-#: kmfolderimap.cpp:251
+#: kmfolderimap.cpp:247
 #, fuzzy
 msgid "Removing folder"
 msgstr "กำลังเปลี่ยนชื่อโฟลเดอร์"
 
-#: kmfolderimap.cpp:252 searchjob.cpp:270
+#: kmfolderimap.cpp:248 searchjob.cpp:270
 #, c-format
 msgid "URL: %1"
 msgstr ""
 
-#: kmfolderimap.cpp:267
+#: kmfolderimap.cpp:263
 msgid "Error while removing a folder."
 msgstr "เกิดข้อผิดพลาดระหว่างการลบโฟลเดอร์"
 
-#: kmfolderimap.cpp:497
+#: kmfolderimap.cpp:491
 #, fuzzy, c-format
 msgid "Destination folder: %1"
 msgstr "โฟลเดอร์ปลายทาง:"
 
-#: kmfolderimap.cpp:1068
+#: kmfolderimap.cpp:1069
 #, fuzzy
 msgid "checking"
 msgstr "ชุดรหัสอักขระ"
 
-#: kmfolderimap.cpp:1118
+#: kmfolderimap.cpp:1119
 #, fuzzy
 msgid "Error while querying the server status."
 msgstr "เกิดข้อผิดพลาดระหว่างตรวจลายเซ็น"
 
-#: kmfolderimap.cpp:1233
+#: kmfolderimap.cpp:1234
 msgid "Retrieving message status"
 msgstr "กำลังรับสถานะของจดหมาย"
 
-#: kmfolderimap.cpp:1248 kmfolderimap.cpp:1343
+#: kmfolderimap.cpp:1249 kmfolderimap.cpp:1344
 msgid "Retrieving messages"
 msgstr "กำลังรับจดหมาย"
 
-#: kmfolderimap.cpp:1273
+#: kmfolderimap.cpp:1274
 #, c-format
 msgid "Error while listing the contents of the folder %1."
 msgstr "เกิดข้อผิดพลาดระหว่างเรียกเนื้อหาของโฟลเดอร์ %1"
 
-#: kmfolderimap.cpp:1694
+#: kmfolderimap.cpp:1695
 msgid "Error while retrieving messages."
 msgstr "เกิดข้อผิดพลาดระหว่างรับจดหมาย"
 
-#: kmfolderimap.cpp:1763
+#: kmfolderimap.cpp:1764
 msgid "Error while creating a folder."
 msgstr "เกิดข้อผิดพลาดระหว่างสร้างโฟลเดอร์"
 
-#: kmfolderimap.cpp:2130
+#: kmfolderimap.cpp:2131
 msgid "updating message counts"
 msgstr "กำลังปรับปรุงค่าจำนวนของจดหมาย"
 
-#: kmfolderimap.cpp:2154
+#: kmfolderimap.cpp:2155
 msgid "Error while getting folder information."
 msgstr "เกิดข้อผิดพลาดระหว่างขอข้อมูลของโฟลเดอร์"
 
-#: kmfolderindex.cpp:334
+#: kmfolderindex.cpp:369
 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, "
@@ -6646,19 +7441,19 @@ msgstr ""
 "แต่ข้อมูลบางตัว รวมทั้งสถานะปักธง อาจจะสูญหาย \n"
 "คุณต้องการลดรุ่นของแฟ้มดัชนีนี้หรือไม่ ?"
 
-#: kmfolderindex.cpp:337
+#: kmfolderindex.cpp:372
 msgid "Downgrade"
 msgstr ""
 
-#: kmfolderindex.cpp:337
+#: kmfolderindex.cpp:372
 msgid "Do Not Downgrade"
 msgstr ""
 
-#: kmfolderindex.cpp:491
+#: kmfolderindex.cpp:529
 #, fuzzy
 msgid ""
 "The mail index for '%1' is corrupted and will be regenerated now, but some "
-"information, including status flags, will be lost."
+"information, like status flags, might get lost."
 msgstr ""
 "ดัชนีจดหมายสำหรับ '%1' มาจาก KMail (%2) ที่ไม่ทราบรุ่น\n"
 "ดัชนีนี้ สามารถสร้างใหม่ได้ จากโฟลเดอร์จดหมายของคุณ \n"
@@ -6683,24 +7478,24 @@ msgstr ""
 msgid "Folder `%1' changed; recreating index."
 msgstr "โฟลเดอร์ `%1' มีการเปลี่ยนแปลง กำลังทำการสร้างดัชนีใหม่"
 
-#: kmfoldermaildir.cpp:252
+#: kmfoldermaildir.cpp:253
 #, fuzzy
 msgid "Could not sync maildir folder."
 msgstr "ไม่สามารถปรับโฟลเดอร์จดหมายได้"
 
-#: kmfoldermaildir.cpp:417
+#: kmfoldermaildir.cpp:418
 msgid "Message could not be added to the folder, possibly disk space is low."
 msgstr ""
 
-#: kmfoldermaildir.cpp:510
+#: kmfoldermaildir.cpp:514
 msgid "KMFolderMaildir::addMsg: abnormally terminating to prevent data loss."
 msgstr ""
 
-#: kmfoldermaildir.cpp:884 kmfoldermbox.cpp:794
+#: kmfoldermaildir.cpp:888 kmfoldermbox.cpp:799
 msgid "Writing index file"
 msgstr "กำลังเขียนแฟ้มดัชนี"
 
-#: kmfoldermaildir.cpp:892 kmfoldermbox.cpp:803
+#: kmfoldermaildir.cpp:896 kmfoldermbox.cpp:808
 #, fuzzy
 msgid ""
 "Your outbox contains messages which were most-likely not created by KMail;\n"
@@ -6709,7 +7504,7 @@ msgstr ""
 "กล่องจดหมายออกของคุณมีจดหมายที่ไม่ได้ถูกสร้างจาก Kmail โปรดลบมันจากที่นั่น "
 "หากคุณไม่ต้องการให้ Kmail ทำการส่งมันด้วย"
 
-#: kmfoldermbox.cpp:111
+#: kmfoldermbox.cpp:112
 msgid ""
 "Cannot open file \"%1\":\n"
 "%2"
@@ -6717,7 +7512,7 @@ msgstr ""
 "ไม่สามารถเปิดแฟ้ม: \"%1\" ได้:\n"
 "%2"
 
-#: kmfoldermbox.cpp:128
+#: kmfoldermbox.cpp:129
 msgid ""
 "<qt>"
 "<p>The index of folder '%2' seems to be out of date. To prevent message "
@@ -6728,38 +7523,38 @@ msgid ""
 "this problem from happening again.</p></qt>"
 msgstr ""
 
-#: kmfoldermbox.cpp:152 kmfoldermbox.cpp:158
+#: kmfoldermbox.cpp:153 kmfoldermbox.cpp:159
 msgid "Index Out of Date"
 msgstr "ดัชนีเก่าเกินไป"
 
-#: kmfoldermbox.cpp:165
+#: kmfoldermbox.cpp:166
 msgid "Folder `%1' changed. Recreating index."
 msgstr "โฟลเดอร์ `%1' มีการเปลี่ยนแปลง กำลังทำการสร้างดัชนีใหม่"
 
-#: kmfoldermbox.cpp:298
+#: kmfoldermbox.cpp:300
 msgid "Could not sync index file <b>%1</b>: %2"
 msgstr ""
 
-#: kmfoldermbox.cpp:298
+#: kmfoldermbox.cpp:300
 msgid "Internal error. Please copy down the details and report a bug."
 msgstr ""
 
-#: kmfoldermbox.cpp:597
+#: kmfoldermbox.cpp:602
 #, c-format
 msgid ""
 "_n: Creating index file: one message done\n"
 "Creating index file: %n messages done"
 msgstr "กำลังสร้างแฟ้มดัชนี: ทำเสร็จแล้ว %n ฉบับ"
 
-#: kmfoldermbox.cpp:1038
+#: kmfoldermbox.cpp:1043
 msgid "Could not add message to folder: "
 msgstr "ไม่สามารถเพิ่มจดหมายไปยังโฟลเดอร์: "
 
-#: kmfoldermbox.cpp:1119
+#: kmfoldermbox.cpp:1127
 msgid "Could not add message to folder:"
 msgstr "ไม่สามารถเพิ่มจดหมายไปยังโฟลเดอร์:"
 
-#: kmfoldermbox.cpp:1121
+#: kmfoldermbox.cpp:1129
 msgid "Could not add message to folder (No space left on device?)"
 msgstr ""
 "ไม่สามารถเพิ่มจดหมายไปยังโฟลเดอร์ได้ (มีเนื้อที่บนดิสก์เหลือเพียงพอหรือไม่ ?)"
@@ -6768,11 +7563,11 @@ msgstr ""
 msgid "Are you sure you want to expire old messages?"
 msgstr "คุณแน่ใจหรือไม่ ที่จะให้จดหมายเก่าหมดอายุ ?"
 
-#: kmfoldermgr.cpp:69 kmmainwidget.cpp:1366
+#: kmfoldermgr.cpp:69 kmmainwidget.cpp:1330
 msgid "Expire Old Messages?"
 msgstr "ให้จดหมายเก่าหมดอายุ ?"
 
-#: kmfoldermgr.cpp:69 kmmainwidget.cpp:1366
+#: kmfoldermgr.cpp:69 kmmainwidget.cpp:1330
 msgid "Expire"
 msgstr "หมดอายุ"
 
@@ -6782,13 +7577,13 @@ msgid ""
 "Please move the file out of the way."
 msgstr ""
 
-#: kmfoldermgr.cpp:153 kmkernel.cpp:1325
+#: kmfoldermgr.cpp:153 kmkernel.cpp:1368
 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:1317
+#: kmfoldermgr.cpp:163 kmkernel.cpp:1360
 msgid ""
 "KMail could not create folder '%1';\n"
 "please make sure that you can view and modify the content of the folder '%2'."
@@ -6805,7 +7600,7 @@ msgstr ""
 msgid "Could Not Create Folder"
 msgstr "ล้มเหลวในการสร้างโฟลเดอร์"
 
-#: kmfoldermgr.cpp:329 kmkernel.cpp:1611
+#: kmfoldermgr.cpp:329 kmkernel.cpp:1676
 msgid ""
 "Cannot create file `%1' in %2.\n"
 "KMail cannot start without it."
@@ -6813,228 +7608,232 @@ msgstr ""
 "ไม่สามารถสร้างแฟ้ม `%1' ใน %2 ได้\n"
 "ทำให้ KMail ไม่สามารถเริ่มการทำงานได้"
 
-#: kmfolderseldlg.cpp:96 kmfolderseldlg.cpp:380 kmfolderseldlg.cpp:414
-#: kmfolderseldlg.cpp:416
-msgid "Path"
-msgstr ""
-
-#: kmfolderseldlg.cpp:283 kmfolderseldlg.cpp:445 kmfolderseldlg.cpp:465
-#: kmfoldertree.cpp:1056 kmfoldertree.cpp:1077
+#: kmfolderseldlg.cpp:25 kmfolderseldlg.cpp:47 kmfoldertree.cpp:1091
+#: kmfoldertree.cpp:1112 treebase.cpp:99
 msgid "&New Subfolder..."
 msgstr "สร้างโฟลเดอร์ย่อยใหม่..."
 
-#: kmfolderseldlg.cpp:446 kmfolderseldlg.cpp:466
+#: kmfolderseldlg.cpp:26 kmfolderseldlg.cpp:48
 #, fuzzy
 msgid "Create a new subfolder under the currently selected folder"
 msgstr "คลิ้กเพื่อลบบริการที่เลือกไว้ในปัจจุบัน"
 
-#: kmfoldertree.cpp:386 kmheaders.cpp:128
+#: kmfolderseldlg.cpp:36 kmfolderseldlg.cpp:55
+msgid "You can start typing to filter the list of folders"
+msgstr ""
+
+#: kmfoldertree.cpp:407 kmheaders.cpp:130
 msgid "View Columns"
 msgstr "คอลัมน์แสดงผล"
 
-#: kmfoldertree.cpp:388
+#: kmfoldertree.cpp:409
 msgid "Unread Column"
 msgstr "คอลัมน์ที่ยังไม่อ่าน"
 
-#: kmfoldertree.cpp:389
+#: kmfoldertree.cpp:410
 msgid "Total Column"
 msgstr "คอลัมน์รวม"
 
-#: kmfoldertree.cpp:390
+#: kmfoldertree.cpp:411
 #, fuzzy
 msgid "Size Column"
 msgstr "คอลัมน์แสดงผล"
 
-#: kmfoldertree.cpp:567 kmfoldertree.cpp:1059
+#: kmfoldertree.cpp:591 kmfoldertree.cpp:1094
 msgid "Searches"
 msgstr "ค้นหา"
 
-#: kmfoldertree.cpp:884
+#: kmfoldertree.cpp:920
 msgid "<qt>Go to the next unread message in folder <b>%1</b>?</qt>"
 msgstr ""
 "<qt>ไปยังจดหมายที่ยังไม่ได้อ่านฉบับถัดไปในโฟลเดอร์ <b>%1</b> หรือไม่ ?</qt>"
 
-#: kmfoldertree.cpp:886
+#: kmfoldertree.cpp:922
 msgid "Go to Next Unread Message"
 msgstr "ไปยังจดหมายที่ยังไม่ได้อ่านฉบับถัดไป"
 
-#: kmfoldertree.cpp:887
+#: kmfoldertree.cpp:923
 msgid "Go To"
 msgstr "ไปยัง"
 
-#: kmfoldertree.cpp:887
+#: kmfoldertree.cpp:923
 msgid "Do Not Go To"
 msgstr "ไม่ต้องไปยัง"
 
-#: kmfoldertree.cpp:1057 kmmainwidget.cpp:2757
+#: kmfoldertree.cpp:1092 kmmainwidget.cpp:2780
 msgid "&New Folder..."
 msgstr "สร้างโฟลเดอร์ใหม่..."
 
-#: kmfoldertree.cpp:1068 kmmainwidget.cpp:2645
+#: kmfoldertree.cpp:1103 kmmainwidget.cpp:2668
 msgid "Check &Mail"
 msgstr "ตรวจจดหมาย"
 
-#: kmfoldertree.cpp:1084
+#: kmfoldertree.cpp:1119
 #, fuzzy
 msgid "&Copy Folder To"
 msgstr "ย้ายโฟลเดอร์ไปยัง"
 
-#: kmfoldertree.cpp:1090
+#: kmfoldertree.cpp:1125
 msgid "&Move Folder To"
 msgstr "ย้ายโฟลเดอร์ไปยัง"
 
-#: kmfoldertree.cpp:1104
+#: kmfoldertree.cpp:1141
 #, fuzzy
 msgid "Add to Favorite Folders"
 msgstr "ล้มเหลวในการสร้างโฟลเดอร์"
 
-#: kmfoldertree.cpp:1123
+#: kmfoldertree.cpp:1160
 #, fuzzy
-msgid "Subscription..."
+msgid "Serverside Subscription..."
 msgstr "รายละเอียด"
 
-#: kmfoldertree.cpp:1126
+#: kmfoldertree.cpp:1163
 #, fuzzy
 msgid "Local Subscription..."
 msgstr "รายละเอียด"
 
-#: kmfoldertree.cpp:1133
+#: kmfoldertree.cpp:1170
 msgid "Refresh Folder List"
 msgstr "ปรับปรุงรายการโฟลเดอร์ใหม่"
 
-#: kmfoldertree.cpp:1140 kmmainwidget.cpp:3737
+#: kmfoldertree.cpp:1177 kmmainwidget.cpp:3771
 msgid "&Troubleshoot IMAP Cache..."
 msgstr "แก้ไปปัญหาแคชของ IMAP..."
 
-#: kmfoldertree.cpp:1242
+#: kmfoldertree.cpp:1280
 msgid ""
-"<qt>Cannot create folder <b>%1</b> because of insufficient permissions on the "
-"server. If you think you should be able to create subfolders here, ask your "
+"<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:1657 kmmainwidget.cpp:420 kmmainwidget.cpp:427
-#: kmmainwidget.cpp:434 kmsearchpattern.h:220
+#: kmfoldertree.cpp:1695 kmmainwidget.cpp:412 kmmainwidget.cpp:419
+#: kmmainwidget.cpp:426 kmsearchpattern.h:220
 msgid "Unread"
 msgstr "ยังไม่ได้อ่าน"
 
-#: kmfoldertree.cpp:1670 kmmainwidget.cpp:422 kmmainwidget.cpp:429
-#: kmmainwidget.cpp:436
+#: kmfoldertree.cpp:1708 kmmainwidget.cpp:414 kmmainwidget.cpp:421
+#: kmmainwidget.cpp:428
 msgid "Total"
 msgstr "รวม"
 
-#: kmfoldertree.cpp:1951
+#: kmfoldertree.cpp:1989
 #, fuzzy
 msgid ""
 "<qt>Cannot move or copy folder <b>%1</b> here because a folder with the same "
 "name already exists.</qt>"
 msgstr "ล้มเหลวในการสร้างโฟลเดอร์ '%1', มีโฟลเดอร์นี้อยู่แล้ว"
 
-#: kmfoldertree.cpp:1961
+#: kmfoldertree.cpp:2000
 #, fuzzy
 msgid ""
 "<qt>Cannot move or copy folder <b>%1</b> because it is not completely copied "
 "itself.</qt>"
 msgstr "<qt>ไม่สามารถย้ายโฟลเดอร์ <b>%1</b> ไปยังโฟลเดอร์ย่อยภายในมันได้</qt>"
 
-#: kmfoldertree.cpp:1970
+#: kmfoldertree.cpp:2010
 #, fuzzy
 msgid ""
 "<qt>Cannot move or copy folder <b>%1</b> into a subfolder below itself.</qt>"
 msgstr "<qt>ไม่สามารถย้ายโฟลเดอร์ <b>%1</b> ไปยังโฟลเดอร์ย่อยภายในมันได้</qt>"
 
-#: kmfoldertree.cpp:2012
+#: kmfoldertree.cpp:2055
 msgid "Moving the selected folders is not possible"
 msgstr ""
 
-#: kmheaders.cpp:130
+#: kmheaders.cpp:132
 msgid "Status"
 msgstr "สถานะ"
 
-#: kmheaders.cpp:131 kmsearchpattern.h:218
+#: kmheaders.cpp:133 kmsearchpattern.h:218
 msgid "Important"
 msgstr "สำคัญมาก"
 
-#: kmheaders.cpp:132
+#: kmheaders.cpp:134
 msgid "Action Item"
 msgstr ""
 
-#: kmheaders.cpp:133
+#: kmheaders.cpp:135
 msgid "Attachment"
 msgstr "สิ่งที่แนบมาด้วย"
 
-#: kmheaders.cpp:134
+#: kmheaders.cpp:136 kmsearchpattern.h:233
+#, fuzzy
+msgid "Invitation"
+msgstr "ระบบเอกสาร"
+
+#: kmheaders.cpp:137
 msgid "Spam/Ham"
 msgstr ""
 
-#: kmheaders.cpp:135
+#: kmheaders.cpp:138
 msgid "Watched/Ignored"
 msgstr "ติดตามดู/ไม่สนใจ"
 
-#: kmheaders.cpp:136
+#: kmheaders.cpp:139
 msgid "Signature"
 msgstr "ลายเซ็น"
 
-#: kmheaders.cpp:180 kmheaders.cpp:775 kmheaders.cpp:2604
-#: kmpopfiltercnfrmdlg.cpp:39 searchwindow.cpp:224
-#: templatesinsertcommand.cpp:142 templatesinsertcommand.cpp:243
+#: kmheaders.cpp:184 kmheaders.cpp:804 kmheaders.cpp:2646
+#: kmpopfiltercnfrmdlg.cpp:39 kmsearchpatternedit.cpp:41 searchwindow.cpp:223
+#: templatesinsertcommand.cpp:145 templatesinsertcommand.cpp:246
 msgid "Subject"
 msgstr "เรื่อง"
 
-#: kmheaders.cpp:182 kmheaders.cpp:770 kmheaders.cpp:2599
-#: kmpopfiltercnfrmdlg.cpp:42 searchwindow.cpp:228
-#: templatesinsertcommand.cpp:66 templatesinsertcommand.cpp:167
+#: kmheaders.cpp:186 kmheaders.cpp:799 kmheaders.cpp:2641
+#: kmpopfiltercnfrmdlg.cpp:42 searchwindow.cpp:227
+#: templatesinsertcommand.cpp:66 templatesinsertcommand.cpp:170
 msgid "Date"
 msgstr "วันที่"
 
-#: kmheaders.cpp:772 kmheaders.cpp:2601
+#: kmheaders.cpp:801 kmheaders.cpp:2643
 #, fuzzy
 msgid "Order of Arrival"
 msgstr "วันที่ (เรียงตามที่ได้รับ)"
 
-#: kmheaders.cpp:777 kmheaders.cpp:2606
+#: kmheaders.cpp:806 kmheaders.cpp:2648
 msgid " (Status)"
 msgstr " (สถานะ)"
 
-#: kmheaders.cpp:1360
+#: kmheaders.cpp:1398
 #, c-format
 msgid ""
 "_n: 1 unsent\n"
 "%n unsent"
 msgstr "ยังไม่ได้ส่ง %n ฉบับ"
 
-#: kmheaders.cpp:1360
+#: kmheaders.cpp:1398
 msgid "0 unsent"
 msgstr "ยังไม่ได้ส่ง 0 ฉบับ"
 
-#: kmheaders.cpp:1362
+#: kmheaders.cpp:1400
 #, c-format
 msgid ""
 "_n: 1 unread\n"
 "%n unread"
 msgstr "ยังไม่ได้อ่าน %n ฉบับ"
 
-#: kmheaders.cpp:1362
+#: kmheaders.cpp:1400
 msgid "0 unread"
 msgstr "ยังไม่ได้อ่าน 0 ฉบับ"
 
-#: kmheaders.cpp:1364
+#: kmheaders.cpp:1402
 msgid ""
 "_n: 1 message, %1.\n"
 "%n messages, %1."
 msgstr "จดหมายทั้งหมด %n ฉบับ, %1"
 
-#: kmheaders.cpp:1365
+#: kmheaders.cpp:1403
 msgid "0 messages"
 msgstr "0 ฉบับ"
 
-#: kmheaders.cpp:1367
+#: kmheaders.cpp:1405
 msgid ""
 "_: %1 = n messages, m unread.\n"
 "%1 Folder is read-only."
 msgstr "%1 โฟลเดอร์อ่านได้อย่างเดียว"
 
-#: kmheaders.cpp:1560
+#: kmheaders.cpp:1598
 #, c-format
 msgid ""
 "_n: <qt>Do you really want to delete the selected message?"
@@ -7045,49 +7844,49 @@ msgstr ""
 "<qt>คุณแน่ใจหรือว่า ต้องการจะลบจดหมายที่เลือกไว้ทั้ง %n ฉบับนี้ ?"
 "<br>หากมันถูกลบไปแล้ว จะไม่สามารถกู้คืนมาได้ !</qt>"
 
-#: kmheaders.cpp:1562
+#: kmheaders.cpp:1600
 msgid "Delete Messages"
 msgstr "ลบจดหมาย"
 
-#: kmheaders.cpp:1562
+#: kmheaders.cpp:1600
 msgid "Delete Message"
 msgstr "ลบจดหมาย"
 
-#: kmheaders.cpp:1586
+#: kmheaders.cpp:1624
 msgid "Messages deleted successfully."
 msgstr "ลบจดหมายเรียบร้อยแล้ว"
 
-#: kmheaders.cpp:1586
+#: kmheaders.cpp:1624
 msgid "Messages moved successfully"
 msgstr "ย้ายจดหมายเรียบร้อยแล้ว"
 
-#: kmheaders.cpp:1609
+#: kmheaders.cpp:1647
 msgid "Deleting messages failed."
 msgstr "การลบจดหมายล้มเหลว"
 
-#: kmheaders.cpp:1609
+#: kmheaders.cpp:1647
 msgid "Moving messages failed."
 msgstr "การย้ายจดหมายล้มเหลว"
 
-#: kmheaders.cpp:1612
+#: kmheaders.cpp:1650
 msgid "Deleting messages canceled."
 msgstr "ยกเลิกการลบจดหมายแล้ว"
 
-#: kmheaders.cpp:1612
+#: kmheaders.cpp:1650
 msgid "Moving messages canceled."
 msgstr "ยกเลิกการย้ายจดหมายแล้ว"
 
-#: kmheaders.cpp:2431 kmmainwidget.cpp:2977 kmreadermainwin.cpp:470
-#: searchwindow.cpp:833
+#: kmheaders.cpp:2470 kmmainwidget.cpp:2989 kmreadermainwin.cpp:508
+#: searchwindow.cpp:856
 msgid "&Copy To"
 msgstr "ทำสำเนาไปยัง"
 
-#: kmheaders.cpp:2434 kmheaders.cpp:2440 kmmainwidget.cpp:2974
-#: searchwindow.cpp:834
+#: kmheaders.cpp:2473 kmheaders.cpp:2479 kmmainwidget.cpp:2986
+#: searchwindow.cpp:857
 msgid "&Move To"
 msgstr "ย้ายไปยัง"
 
-#: kmheaders.cpp:2774 kmheaders.cpp:2814
+#: kmheaders.cpp:2818 kmheaders.cpp:2858
 msgid ""
 "Failure modifying %1\n"
 "(No space left on device?)"
@@ -7095,85 +7894,97 @@ msgstr ""
 "ล้มเหลวในการแก้ไข %1\n"
 "(พื้นที่บนดิสก์มีพอหรือไม่ ?)"
 
-#: kmkernel.cpp:684
+#: kmkernel.cpp:712
 msgid "Certificate Signature Request"
 msgstr "ร้องขอลายเซ็นของใบรับรอง"
 
-#: kmkernel.cpp:687
+#: kmkernel.cpp:715
 msgid "Please create a certificate from attachment and return to sender."
 msgstr "โปรดสร้างใบรับรองจากสิ่งที่แนบมาด้วยและส่งกลับไปยังผู้ส่ง"
 
-#: kmkernel.cpp:1210
+#: kmkernel.cpp:1246
 msgid "KMail is set to be offline; all network jobs are suspended"
 msgstr ""
 
-#: kmkernel.cpp:1220
+#: kmkernel.cpp:1256
 msgid "KMail is set to be online; all network jobs resumed"
 msgstr ""
 
-#: kmkernel.cpp:1241
+#: kmkernel.cpp:1283
 msgid "KMail is currently in offline mode. How do you want to proceed?"
 msgstr ""
 
-#: kmkernel.cpp:1244 kmmainwidget.cpp:1899
+#: kmkernel.cpp:1286 kmmainwidget.cpp:1924
 msgid "Work Online"
 msgstr "ทำงานออนไลน์"
 
-#: kmkernel.cpp:1245 kmmainwidget.cpp:1897
+#: kmkernel.cpp:1287 kmmainwidget.cpp:1922
 msgid "Work Offline"
 msgstr "ทำงานออฟไลน์"
 
-#: kmkernel.cpp:1379
+#: kmkernel.cpp:1429
 msgid "You do not have read/write permission to your inbox folder."
 msgstr "คุณยังไม่สิทธิ์ในการอ่าน/เขียนที่โฟลเดอร์จดหมายเข้าของคุณ"
 
-#: kmkernel.cpp:1387
+#: kmkernel.cpp:1437
 msgid "outbox"
 msgstr "จดหมายออก"
 
-#: kmkernel.cpp:1389
+#: kmkernel.cpp:1439
 msgid "You do not have read/write permission to your outbox folder."
 msgstr "คุณยังไม่สิทธิ์ในการอ่าน/เขียนที่โฟลเดอร์จดหมายออกของคุณ"
 
-#: kmkernel.cpp:1406
+#: kmkernel.cpp:1456
 msgid "sent-mail"
 msgstr "จดหมายที่ส่งแล้ว"
 
-#: kmkernel.cpp:1408
+#: kmkernel.cpp:1458
 msgid "You do not have read/write permission to your sent-mail folder."
 msgstr "คุณยังไม่สิทธิ์ในการอ่าน/เขียนที่โฟลเดอร์จดหมายที่ส่งแล้วของคุณ"
 
-#: kmkernel.cpp:1415
+#: kmkernel.cpp:1465
 msgid "trash"
 msgstr "ถังขยะ"
 
-#: kmkernel.cpp:1417
+#: kmkernel.cpp:1467
 msgid "You do not have read/write permission to your trash folder."
 msgstr "คุณยังไม่สิทธิ์ในการอ่าน/เขียนที่โฟลเดอร์ถังขยะของคุณ"
 
-#: kmkernel.cpp:1424
+#: kmkernel.cpp:1474
 msgid "drafts"
 msgstr "ฉบับร่าง"
 
-#: kmkernel.cpp:1426
+#: kmkernel.cpp:1476
 msgid "You do not have read/write permission to your drafts folder."
 msgstr "คุณยังไม่สิทธิ์ในการอ่าน/เขียนที่โฟลเดอร์ฉบับร่างของคุณ"
 
-#: kmkernel.cpp:1435
+#: kmkernel.cpp:1485
 msgid "templates"
 msgstr ""
 
-#: kmkernel.cpp:1437
+#: kmkernel.cpp:1487
 #, fuzzy
 msgid "You do not have read/write permission to your templates folder."
 msgstr "คุณยังไม่สิทธิ์ในการอ่าน/เขียนที่โฟลเดอร์ถังขยะของคุณ"
 
-#: kmkernel.cpp:1480 searchwindow.cpp:255 searchwindow.cpp:490
-#: searchwindow.cpp:633
+#: kmkernel.cpp:1531 searchwindow.cpp:256 searchwindow.cpp:477
 msgid "Last Search"
 msgstr "ค้นหาล่าสุด"
 
-#: kmkernel.cpp:1777
+#: kmkernel.cpp:1716
+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"
+"Contact your administrator if this happens frequently.\n"
+"Some information, like status flags, might get lost."
+msgstr ""
+
+#: kmkernel.cpp:1721
+msgid "Problem with mail indices"
+msgstr ""
+
+#: kmkernel.cpp:1879
 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> "
@@ -7183,7 +7994,7 @@ msgid ""
 "<p><strong>Would you like %3 to move the mail files now?</strong></qt>"
 msgstr ""
 
-#: kmkernel.cpp:1789
+#: kmkernel.cpp:1891
 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> "
@@ -7192,11 +8003,11 @@ msgid ""
 "<p><strong>Would you like %3 to move the mail files now?</strong></qt>"
 msgstr ""
 
-#: kmkernel.cpp:1798
+#: kmkernel.cpp:1900
 msgid "Migrate Mail Files?"
 msgstr ""
 
-#: kmkernel.cpp:2023
+#: kmkernel.cpp:2135
 #, fuzzy
 msgid "KMail encountered a fatal error and will terminate now"
 msgstr ""
@@ -7205,7 +8016,7 @@ msgstr ""
 "ข้อผิดพลาดคือ:\n"
 "%1"
 
-#: kmkernel.cpp:2025
+#: kmkernel.cpp:2137
 #, c-format
 msgid ""
 "KMail encountered a fatal error and will terminate now.\n"
@@ -7217,125 +8028,125 @@ msgstr ""
 "ข้อผิดพลาดคือ:\n"
 "%1"
 
-#: kmkernel.cpp:2158 kmmainwidget.cpp:1176
+#: kmkernel.cpp:2270 kmmainwidget.cpp:1151
 msgid "Empty Trash"
 msgstr "เทถังขยะทิ้ง"
 
-#: kmkernel.cpp:2159
+#: kmkernel.cpp:2271
 msgid "Are you sure you want to empty the trash folders of all accounts?"
 msgstr "คุณแน่ใจหรือว่าต้องการจะเทถังขยะทิ้ง ?"
 
-#: kmlineeditspell.cpp:105
+#: kmlineeditspell.cpp:134
 msgid "vCard Import Failed"
 msgstr ""
 
-#: kmlineeditspell.cpp:116
+#: kmlineeditspell.cpp:135
 msgid "<qt>Unable to access <b>%1</b>.</qt>"
 msgstr "<qt>ไม่สามารถเรียกใช้ <b>%1</b> ได้</qt>"
 
-#: kmlineeditspell.cpp:168 recipientspicker.cpp:578
+#: kmlineeditspell.cpp:194 recipientspicker.cpp:578
 msgid "Recent Addresses"
 msgstr "ที่อยู่ล่าสุด"
 
-#: kmmainwidget.cpp:611
+#: kmmainwidget.cpp:601
 msgid "S&earch:"
 msgstr "ค้นหา:"
 
-#: kmmainwidget.cpp:674 kmmainwidget.cpp:1709
+#: kmmainwidget.cpp:664 kmmainwidget.cpp:1686
 msgid "Move Message to Folder"
 msgstr "ย้ายจดหมายไปยังโฟลเดอร์"
 
-#: kmmainwidget.cpp:679 kmmainwidget.cpp:1818
+#: kmmainwidget.cpp:669 kmmainwidget.cpp:1795
 msgid "Copy Message to Folder"
 msgstr "สำเนาจดหมายไปยังโฟลเดอร์"
 
-#: kmmainwidget.cpp:684 kmmainwidget.cpp:1697
+#: kmmainwidget.cpp:674 kmmainwidget.cpp:1674
 #, fuzzy
 msgid "Jump to Folder"
 msgstr "สำเนาไปยังโฟลเดอร์นี้"
 
-#: kmmainwidget.cpp:743
+#: kmmainwidget.cpp:717
 msgid "Remove Duplicate Messages"
 msgstr "ลบจดหมายฉบับที่ซ้ำกัน"
 
-#: kmmainwidget.cpp:748
+#: kmmainwidget.cpp:722
 msgid "Abort Current Operation"
 msgstr "ยกเลิกปฏิบัติการที่ทำอยู่ในปัจจุบัน"
 
-#: kmmainwidget.cpp:753
+#: kmmainwidget.cpp:727
 msgid "Focus on Next Folder"
 msgstr "โฟกัสไปยังโฟลเดอร์ถัดไป"
 
-#: kmmainwidget.cpp:758
+#: kmmainwidget.cpp:732
 msgid "Focus on Previous Folder"
 msgstr "โฟกัสไปยังโฟลเดอร์ก่อนหน้านี้"
 
-#: kmmainwidget.cpp:763
+#: kmmainwidget.cpp:737
 msgid "Select Folder with Focus"
 msgstr "เลือกโฟลเดอร์พร้อมกับโฟกัส"
 
-#: kmmainwidget.cpp:768
+#: kmmainwidget.cpp:742
 #, fuzzy
 msgid "Focus on Next Message"
 msgstr "โฟกัสไปยังโฟลเดอร์ถัดไป"
 
-#: kmmainwidget.cpp:773
+#: kmmainwidget.cpp:747
 #, fuzzy
 msgid "Focus on Previous Message"
 msgstr "โฟกัสไปยังโฟลเดอร์ก่อนหน้านี้"
 
-#: kmmainwidget.cpp:778
+#: kmmainwidget.cpp:752
 #, fuzzy
 msgid "Select Message with Focus"
 msgstr "เลือกโฟลเดอร์พร้อมกับโฟกัส"
 
-#: kmmainwidget.cpp:977
+#: kmmainwidget.cpp:951
 msgid ""
 "_n: 1 new message in %1\n"
 "%n new messages in %1"
 msgstr "จดหมายใหม่ %n ฉบับใน %1"
 
-#: kmmainwidget.cpp:993
+#: kmmainwidget.cpp:967
 msgid ""
 "_: %1 is a list of the number of new messages per folder\n"
 "<b>New mail arrived</b>"
 "<br>%1"
 msgstr "<b>ได้รับจดหมายใหม่</b><br>%1"
 
-#: kmmainwidget.cpp:997
+#: kmmainwidget.cpp:971
 msgid "New mail arrived"
 msgstr "ได้รับจดหมายใหม่"
 
-#: kmmainwidget.cpp:1128
+#: kmmainwidget.cpp:1100
 #, c-format
 msgid "Properties of Folder %1"
 msgstr "คุณสมบัติของโฟลเดอร์ %1"
 
-#: kmmainwidget.cpp:1149
+#: kmmainwidget.cpp:1124
 msgid "This folder does not have any expiry options set"
 msgstr "โฟลเดอร์นี้ ยังไม่ได้ตั้งค่าตัวเลือกการหมดอายุ"
 
-#: kmmainwidget.cpp:1157
+#: kmmainwidget.cpp:1132
 msgid "<qt>Are you sure you want to expire the folder <b>%1</b>?</qt>"
 msgstr "<qt>คุณแน่ใจหรือไม่ ที่จะให้โฟลเดอร์ <b>%1</b> หมดอายุ ?</qt>"
 
-#: kmmainwidget.cpp:1158
+#: kmmainwidget.cpp:1133
 msgid "Expire Folder"
 msgstr "โฟลเดอร์์หมดอายุ"
 
-#: kmmainwidget.cpp:1159
+#: kmmainwidget.cpp:1134
 msgid "&Expire"
 msgstr "หมดอายุ"
 
-#: kmmainwidget.cpp:1176
+#: kmmainwidget.cpp:1151
 msgid "Move to Trash"
 msgstr "ทิ้งลงถังขยะ"
 
-#: kmmainwidget.cpp:1178
+#: kmmainwidget.cpp:1153
 msgid "Are you sure you want to empty the trash folder?"
 msgstr "คุณแน่ใจหรือว่าต้องการจะเทถังขยะทิ้ง ?"
 
-#: kmmainwidget.cpp:1179
+#: kmmainwidget.cpp:1154
 msgid ""
 "<qt>Are you sure you want to move all messages from folder <b>%1</b> "
 "to the trash?</qt>"
@@ -7343,15 +8154,27 @@ msgstr ""
 "<qt>คุณแน่ใจหรือว่า ต้องการจะทิ้งจดหมายทั้งหมดจากโฟลเดอร์ <b>%1</b> "
 "ลงถังขยะ ?</qt>"
 
-#: kmmainwidget.cpp:1198
+#: kmmainwidget.cpp:1173
 msgid "Moved all messages to the trash"
 msgstr "ทิ้งจดหมายทั้งหมดลงถังขยะ"
 
-#: kmmainwidget.cpp:1220
+#: kmmainwidget.cpp:1200
+msgid ""
+"It is not possible to delete this folder right now because it is being "
+"syncronized. Please wait until the syncronization of this folder is complete "
+"and then try again."
+msgstr ""
+
+#: kmmainwidget.cpp:1203
+#, fuzzy
+msgid "Unable to delete folder"
+msgstr "ล้มเหลวในการสร้างโฟลเดอร์"
+
+#: kmmainwidget.cpp:1209
 msgid "Delete Search"
 msgstr "ลบการค้นหา"
 
-#: kmmainwidget.cpp:1221
+#: 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>"
@@ -7359,16 +8182,16 @@ msgstr ""
 "<qt>คุณแน่ใจหรือว่าต้องการจะลบการค้นหา <b>%1</b> ? "
 "<br>จดหมายที่แสดงอยู่ในผลการค้นหาจะยังคงอยู่ในโฟลเดอร์เดิมของมัน</qt>"
 
-#: kmmainwidget.cpp:1225
+#: kmmainwidget.cpp:1214
 msgid "Delete Folder"
 msgstr "ลบโฟลเดอร์"
 
-#: kmmainwidget.cpp:1228
+#: kmmainwidget.cpp:1217
 #, fuzzy
 msgid "<qt>Are you sure you want to delete the empty folder <b>%1</b>?</qt>"
 msgstr "<qt>คุณต้องการลบรายการแสดงตัว <b>\"%1\"</b> จริงหรือไม่ ?</qt>"
 
-#: kmmainwidget.cpp:1233
+#: kmmainwidget.cpp:1222
 #, fuzzy
 msgid ""
 "<qt>Are you sure you want to delete the empty folder <b>%1</b> "
@@ -7380,7 +8203,7 @@ msgstr ""
 "คุณแน่ใจหรือว่า ต้องการลบโฟลเดอร์ \"%1\" รวมทั้งโฟลเดอร์ย่อย "
 "และเนื้อหาทั้งหมดของมัน ?"
 
-#: kmmainwidget.cpp:1242
+#: kmmainwidget.cpp:1231
 #, fuzzy
 msgid ""
 "<qt>Are you sure you want to delete the folder <b>%1</b>"
@@ -7391,7 +8214,7 @@ msgstr ""
 "คุณแน่ใจหรือว่า ต้องการลบโฟลเดอร์ \"%1\" รวมทั้งโฟลเดอร์ย่อย "
 "และเนื้อหาทั้งหมดของมัน ?"
 
-#: kmmainwidget.cpp:1249
+#: kmmainwidget.cpp:1238
 #, fuzzy
 msgid ""
 "<qt>Are you sure you want to delete the folder <b>%1</b> "
@@ -7402,24 +8225,17 @@ msgstr ""
 "คุณแน่ใจหรือว่า ต้องการลบโฟลเดอร์ \"%1\" รวมทั้งโฟลเดอร์ย่อย "
 "และเนื้อหาทั้งหมดของมัน ?"
 
-#: kmmainwidget.cpp:1268
-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 "
-"reset to the main Inbox folder.</qt>"
-msgstr ""
-
-#: kmmainwidget.cpp:1349
+#: kmmainwidget.cpp:1313
 msgid ""
 "Are you sure you want to refresh the IMAP cache?\n"
 "This will remove all changes that you have done locally to your IMAP folders."
 msgstr ""
 
-#: kmmainwidget.cpp:1365
+#: kmmainwidget.cpp:1329
 msgid "Are you sure you want to expire all old messages?"
 msgstr "คุณแน่ใจหรือไม่ ที่จะให้จดหมายเก่าทั้งหมด หมดอายุ ?"
 
-#: kmmainwidget.cpp:1389
+#: 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 "
@@ -7428,15 +8244,15 @@ msgstr ""
 "การใช้ HTML ในจดหมาย อาจจะทำให้คุณได้รับ จดหมาย\n"
 "\"ขยะ\" และอาจทำให้ระบบของคุณ มีปัญหาเรื่องความปลอดภัยได้"
 
-#: kmmainwidget.cpp:1392 kmmainwidget.cpp:1416 kmsender.cpp:503
+#: kmmainwidget.cpp:1356 kmmainwidget.cpp:1380 kmsender.cpp:504
 msgid "Security Warning"
 msgstr "เตือนความปลอดภัย"
 
-#: kmmainwidget.cpp:1393
+#: kmmainwidget.cpp:1357
 msgid "Use HTML"
 msgstr "ใช้ HTML"
 
-#: kmmainwidget.cpp:1413
+#: kmmainwidget.cpp:1377
 #, fuzzy
 msgid ""
 "Loading external references in html mail will make you more vulnerable to "
@@ -7446,528 +8262,535 @@ msgstr ""
 "การใช้ HTML ในจดหมาย อาจจะทำให้คุณได้รับ จดหมาย\n"
 "\"ขยะ\" และอาจทำให้ระบบของคุณ มีปัญหาเรื่องความปลอดภัยได้"
 
-#: kmmainwidget.cpp:1417
+#: kmmainwidget.cpp:1381
 msgid "Load External References"
 msgstr "เรียกส่วนที่อ้างถึงจากภายนอก"
 
-#: kmmainwidget.cpp:1658
+#: kmmainwidget.cpp:1634
 msgid "Filter on Mailing-List..."
 msgstr "กรองบนรายการจดหมายเวียน..."
 
-#: kmmainwidget.cpp:1663
+#: kmmainwidget.cpp:1639
 msgid "Filter on Mailing-List %1..."
 msgstr "กรองบนจดหมายเวียน %1..."
 
-#: kmmainwidget.cpp:1761
+#: 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"
 "You can do this on the \"Filtering\" tab of the IMAP account configuration."
 msgstr ""
 
-#: kmmainwidget.cpp:1766
+#: kmmainwidget.cpp:1743
 msgid "No Server-Side Filtering Configured"
 msgstr ""
 
-#: kmmainwidget.cpp:1793
+#: kmmainwidget.cpp:1770
 #, fuzzy
-msgid "Could not start certificate manager; please check your installation."
+msgid ""
+"Could not start certificate manager 'kleopatra'; please check your "
+"installation."
 msgstr "ไม่สามารถเริ่มตัวจัดการใบรับรองได้ โปรดตรวจสอบการติดตั้งของคุณ !"
 
-#: kmmainwidget.cpp:1810
+#: kmmainwidget.cpp:1787
 #, fuzzy
 msgid ""
 "Could not start GnuPG LogViewer (kwatchgnupg); please check your installation."
 msgstr "ไม่สามารถเริ่มตัวจัดการใบรับรองได้ โปรดตรวจสอบการติดตั้งของคุณ !"
 
-#: kmmainwidget.cpp:2485
+#: kmmainwidget.cpp:2508
 msgid "Forward With Custom Template"
 msgstr ""
 
-#: kmmainwidget.cpp:2494
+#: kmmainwidget.cpp:2517
 #, fuzzy
 msgid "Reply With Custom Template"
 msgstr "ตอบกลับโดยไม่อ้างข้อความเดิม..."
 
-#: kmmainwidget.cpp:2502
+#: kmmainwidget.cpp:2525
 msgid "Reply to All With Custom Template"
 msgstr ""
 
-#: kmmainwidget.cpp:2597 kmmainwidget.cpp:2602 kmmainwidget.cpp:2607
+#: kmmainwidget.cpp:2620 kmmainwidget.cpp:2625 kmmainwidget.cpp:2630
 msgid "(no custom templates)"
 msgstr ""
 
-#: kmmainwidget.cpp:2622 kmmimeparttree.cpp:141
+#: kmmainwidget.cpp:2645 kmmimeparttree.cpp:139
 msgid "Save &As..."
 msgstr "บันทึกเป็น..."
 
-#: kmmainwidget.cpp:2629
+#: kmmainwidget.cpp:2652
 msgid "&Compact All Folders"
 msgstr "ทำทุกโฟลเดอร์ให้กะทัดรัด"
 
-#: kmmainwidget.cpp:2633
+#: kmmainwidget.cpp:2656
 msgid "&Expire All Folders"
 msgstr "ให้ทุกโฟลเดอร์หมดอายุ"
 
-#: kmmainwidget.cpp:2637
+#: kmmainwidget.cpp:2660
 msgid "&Refresh Local IMAP Cache"
 msgstr "ปรับปรุงแคช IMAP ภายในใหม่"
 
-#: kmmainwidget.cpp:2641
+#: kmmainwidget.cpp:2664
 msgid "Empty All &Trash Folders"
 msgstr "เทถังขยะทั้งหมดทิ้ง"
 
-#: kmmainwidget.cpp:2649
+#: kmmainwidget.cpp:2672
 #, fuzzy
 msgid "Check Mail in Favorite Folders"
 msgstr "ตรวจจดหมายในโฟลเดอร์นี้"
 
-#: kmmainwidget.cpp:2656
+#: kmmainwidget.cpp:2679
 msgid "Check Mail &In"
 msgstr "ตรวจจดหมายใน"
 
-#: kmmainwidget.cpp:2666
+#: kmmainwidget.cpp:2689
 msgid "&Send Queued Messages"
 msgstr "ส่งจดหมายไปยังคิว"
 
-#: kmmainwidget.cpp:2669
+#: kmmainwidget.cpp:2692
 #, fuzzy
 msgid "Online Status (unknown)"
 msgstr "สถานะการออนไลน์ (ไม่ทราบ)"
 
-#: kmmainwidget.cpp:2673
+#: kmmainwidget.cpp:2696
 msgid "Send Queued Messages Via"
 msgstr "ส่งจดหมายไปยังคิวผ่านทาง"
 
-#: kmmainwidget.cpp:2684
+#: kmmainwidget.cpp:2707
 msgid "&Address Book..."
 msgstr "สมุดที่อยู่..."
 
-#: kmmainwidget.cpp:2689
+#: kmmainwidget.cpp:2712
 msgid "Certificate Manager..."
 msgstr "จัดการใบรับรอง..."
 
-#: kmmainwidget.cpp:2694
+#: kmmainwidget.cpp:2717
 msgid "GnuPG Log Viewer..."
 msgstr "แสดงบันทึกการทำงานของ GnuPG..."
 
-#: kmmainwidget.cpp:2699
+#: kmmainwidget.cpp:2722
 msgid "&Import Messages..."
 msgstr "นำเข้าจดหมาย..."
 
-#: kmmainwidget.cpp:2704
+#: kmmainwidget.cpp:2727
 msgid "&Debug Sieve..."
 msgstr "แก้ไขสคริปต์ตัวกรอง..."
 
-#: kmmainwidget.cpp:2710
+#: kmmainwidget.cpp:2733
 msgid "Edit \"Out of Office\" Replies..."
 msgstr ""
 
-#: kmmainwidget.cpp:2716
+#: kmmainwidget.cpp:2739
 msgid "Filter &Log Viewer..."
 msgstr "แสดงบันทึกการทำงานของตัวกรอง..."
 
-#: kmmainwidget.cpp:2719
+#: kmmainwidget.cpp:2742
 msgid "&Anti-Spam Wizard..."
 msgstr "ตัวช่วยตั้งค่าการป้องกันสแปม..."
 
-#: kmmainwidget.cpp:2721
+#: kmmainwidget.cpp:2744
 msgid "&Anti-Virus Wizard..."
 msgstr "ตัวช่วยตั้งค่าการป้องกันไวรัส..."
 
-#: kmmainwidget.cpp:2725 kmreadermainwin.cpp:316
+#: kmmainwidget.cpp:2748 kmreadermainwin.cpp:367
 msgid "&Move to Trash"
 msgstr "ทิ้งลงถังขยะ"
 
-#: kmmainwidget.cpp:2726 kmreadermainwin.cpp:317
+#: kmmainwidget.cpp:2749 kmreadermainwin.cpp:368
 msgid "Move message to trashcan"
 msgstr "ทิ้งจดหมายทั้งหมดลงถังขยะ"
 
-#: kmmainwidget.cpp:2738
+#: kmmainwidget.cpp:2761
 msgid "M&ove Thread to Trash"
 msgstr "ทิ้งทั้งเธรดลงถังขยะ"
 
-#: kmmainwidget.cpp:2739
+#: kmmainwidget.cpp:2762
 msgid "Move thread to trashcan"
 msgstr "ทิ้งทั้งเธรดลงถังขยะ"
 
-#: kmmainwidget.cpp:2743
+#: kmmainwidget.cpp:2766
 msgid "Delete T&hread"
 msgstr "ลบทั้งเธรด"
 
-#: kmmainwidget.cpp:2747
+#: kmmainwidget.cpp:2770
 msgid "&Find Messages..."
 msgstr "ค้นหาจดหมาย..."
 
-#: kmmainwidget.cpp:2750
+#: kmmainwidget.cpp:2773
 msgid "&Find in Message..."
 msgstr "ค้นหาในจดหมาย..."
 
-#: kmmainwidget.cpp:2753
+#: kmmainwidget.cpp:2776
 msgid "Select &All Messages"
 msgstr "เลือกจดหมายทั้งหมด"
 
-#: kmmainwidget.cpp:2760
+#: kmmainwidget.cpp:2783
 msgid "&Properties"
 msgstr "คุณสมบัติ..."
 
-#: kmmainwidget.cpp:2763
+#: kmmainwidget.cpp:2786
 #, fuzzy
 msgid "&Mailing List Management..."
 msgstr "การจัดการจดหมายเวียน"
 
-#: kmmainwidget.cpp:2772
+#: kmmainwidget.cpp:2795
 msgid "Mark All Messages as &Read"
 msgstr "ตั้งค่าว่าอ่านแล้วให้จดหมายทั้งหมด"
 
-#: kmmainwidget.cpp:2775
+#: kmmainwidget.cpp:2798
 msgid "&Expiration Settings"
 msgstr "ตั้งค่าการหมดอายุของจดหมาย"
 
-#: kmmainwidget.cpp:2778
+#: kmmainwidget.cpp:2801
 #, fuzzy
 msgid "&Compact Folder"
 msgstr "ทำทุกโฟลเดอร์ให้กะทัดรัด"
 
-#: kmmainwidget.cpp:2781
+#: kmmainwidget.cpp:2804
 msgid "Check Mail &in This Folder"
 msgstr "ตรวจจดหมายในโฟลเดอร์นี้"
 
-#: kmmainwidget.cpp:2793
+#: kmmainwidget.cpp:2816
+#, fuzzy
+msgid "&Archive Folder..."
+msgstr "สร้างโฟลเดอร์ใหม่..."
+
+#: kmmainwidget.cpp:2820
 msgid "Prefer &HTML to Plain Text"
 msgstr "แสดง HTML แบบข้อความธรรมดา"
 
-#: kmmainwidget.cpp:2796
+#: kmmainwidget.cpp:2823
 msgid "Load E&xternal References"
 msgstr "เรียกส่วนที่อ้างถึงจากภายนอก"
 
-#: kmmainwidget.cpp:2799
+#: kmmainwidget.cpp:2826
 msgid "&Thread Messages"
 msgstr "แสดงจดหมายเป็นเธรด"
 
-#: kmmainwidget.cpp:2802
+#: kmmainwidget.cpp:2829
 msgid "Thread Messages also by &Subject"
 msgstr "แสดงจดหมายเป็นเธรดตามหัวเรื่อง"
 
-#: kmmainwidget.cpp:2805
+#: kmmainwidget.cpp:2832
 #, fuzzy
 msgid "Copy Folder"
 msgstr "สำเนาไปยังโฟลเดอร์นี้"
 
-#: kmmainwidget.cpp:2807
+#: kmmainwidget.cpp:2834
 #, fuzzy
 msgid "Cut Folder"
 msgstr "โฟลเดอร์"
 
-#: kmmainwidget.cpp:2809
+#: kmmainwidget.cpp:2836
 #, fuzzy
 msgid "Paste Folder"
 msgstr "สร้างโฟลเดอร์ใหม่..."
 
-#: kmmainwidget.cpp:2812
+#: kmmainwidget.cpp:2839
 #, fuzzy
 msgid "Copy Messages"
 msgstr " ฉบับ"
 
-#: kmmainwidget.cpp:2814
+#: kmmainwidget.cpp:2841
 #, fuzzy
 msgid "Cut Messages"
 msgstr " ฉบับ"
 
-#: kmmainwidget.cpp:2816
+#: kmmainwidget.cpp:2843
 #, fuzzy
 msgid "Paste Messages"
 msgstr "ลบจดหมาย"
 
-#: kmmainwidget.cpp:2820
+#: kmmainwidget.cpp:2847
 msgid "&New Message..."
 msgstr "เขียนจดหมายใหม่..."
 
-#: kmmainwidget.cpp:2823 kmmainwidget.cpp:2915
+#: kmmainwidget.cpp:2850 kmmainwidget.cpp:2927
 #, fuzzy
 msgid "New Message From &Template"
 msgstr "ไม่มีจดหมายใหม่บนเซิร์ฟเวอร์"
 
-#: kmmainwidget.cpp:2831
+#: kmmainwidget.cpp:2858
 msgid "New Message t&o Mailing-List..."
 msgstr "ส่งจดหมายใหม่ไปยังผู้รับจดหมายเวียน..."
 
-#: kmmainwidget.cpp:2836 kmreadermainwin.cpp:327 searchwindow.cpp:320
+#: kmmainwidget.cpp:2863 kmreadermainwin.cpp:378 searchwindow.cpp:321
 msgid ""
 "_: Message->\n"
 "&Forward"
 msgstr "ส่งต่อ"
 
-#: kmmainwidget.cpp:2840 kmreadermainwin.cpp:330 searchwindow.cpp:329
+#: kmmainwidget.cpp:2867 kmreadermainwin.cpp:381 searchwindow.cpp:330
 msgid "&Inline..."
 msgstr "แนบเข้าไป..."
 
-#: kmmainwidget.cpp:2846 kmreadermainwin.cpp:336 searchwindow.cpp:325
+#: kmmainwidget.cpp:2873 kmreadermainwin.cpp:387 searchwindow.cpp:326
 msgid ""
 "_: Message->Forward->\n"
 "As &Attachment..."
 msgstr "เป็นสิ่งที่ส่งมาด้วย"
 
-#: kmmainwidget.cpp:2852 kmreadermainwin.cpp:342 searchwindow.cpp:341
+#: kmmainwidget.cpp:2879 kmreadermainwin.cpp:393 searchwindow.cpp:342
 #, fuzzy
 msgid ""
 "_: Message->Forward->\n"
 "As Di&gest..."
 msgstr "เป็นสิ่งที่ส่งมาด้วย"
 
-#: kmmainwidget.cpp:2858 kmreadermainwin.cpp:348 searchwindow.cpp:346
+#: kmmainwidget.cpp:2885 kmreadermainwin.cpp:399 searchwindow.cpp:347
 msgid ""
 "_: Message->Forward->\n"
 "&Redirect..."
 msgstr "เปลี่ยนปลายทาง..."
 
-#: kmmainwidget.cpp:2885
+#: kmmainwidget.cpp:2897
 msgid "Send A&gain..."
 msgstr "ส่งอีกครั้ง..."
 
-#: kmmainwidget.cpp:2890
+#: kmmainwidget.cpp:2902
 msgid "&Create Filter"
 msgstr "สร้างตัวกรองใหม่"
 
-#: kmmainwidget.cpp:2893
+#: kmmainwidget.cpp:2905
 msgid "Filter on &Subject..."
 msgstr "กรองส่วนเรื่อง..."
 
-#: kmmainwidget.cpp:2898
+#: kmmainwidget.cpp:2910
 msgid "Filter on &From..."
 msgstr "กรองส่วนจาก..."
 
-#: kmmainwidget.cpp:2903
+#: kmmainwidget.cpp:2915
 msgid "Filter on &To..."
 msgstr "กรองส่วนถึง..."
 
-#: kmmainwidget.cpp:2908
+#: kmmainwidget.cpp:2920
 msgid "Filter on Mailing-&List..."
 msgstr "กรองบนรายการจดหมายเวียน..."
 
-#: kmmainwidget.cpp:2921
+#: kmmainwidget.cpp:2933
 msgid "Mark &Thread"
 msgstr "ทำเครื่องหมายเธรด"
 
-#: kmmainwidget.cpp:2924
+#: kmmainwidget.cpp:2936
 msgid "Mark Thread as &Read"
 msgstr "ตั้งค่าเธรดเป็นจดหมายที่อ่านแล้ว"
 
-#: kmmainwidget.cpp:2925
+#: kmmainwidget.cpp:2937
 msgid "Mark all messages in the selected thread as read"
 msgstr "ตั้งค่าจดหมายทั้งหมดในเธรดที่เลือกว่าเป็นจดหมายที่อ่านแล้ว"
 
-#: kmmainwidget.cpp:2930
+#: kmmainwidget.cpp:2942
 msgid "Mark Thread as &New"
 msgstr "ตั้งค่าเธรดเป็นจดหมายใหม่"
 
-#: kmmainwidget.cpp:2931
+#: kmmainwidget.cpp:2943
 msgid "Mark all messages in the selected thread as new"
 msgstr "ตั้งค่าจดหมายทั้งหมดในเธรดที่เลือกว่าเป็นจดหมายใหม่"
 
-#: kmmainwidget.cpp:2936
+#: kmmainwidget.cpp:2948
 msgid "Mark Thread as &Unread"
 msgstr "ตั้งค่าเธรดเป็นจดหมายที่ยังไม่ได้อ่าน"
 
-#: kmmainwidget.cpp:2937
+#: kmmainwidget.cpp:2949
 msgid "Mark all messages in the selected thread as unread"
 msgstr "ตั้งค่าจดหมายทั้งหมดในเธรดที่เลือกว่าเป็นจดหมายที่ยังไม่ได้อ่าน"
 
-#: kmmainwidget.cpp:2945
+#: kmmainwidget.cpp:2957
 msgid "Mark Thread as &Important"
 msgstr "ตั้งค่าเธรดเป็นจดหมายที่สำคัญมาก"
 
-#: kmmainwidget.cpp:2948
+#: kmmainwidget.cpp:2960
 msgid "Remove &Important Thread Mark"
 msgstr "ยกเลิกการตั้งค่าเธรดเป็นจดหมายที่สำคัญมาก"
 
-#: kmmainwidget.cpp:2951
+#: kmmainwidget.cpp:2963
 #, fuzzy
 msgid "Mark Thread as &Action Item"
 msgstr "ตั้งค่าเธรดเป็นจดหมายใหม่"
 
-#: kmmainwidget.cpp:2954
+#: kmmainwidget.cpp:2966
 #, fuzzy
 msgid "Remove &Action Item Thread Mark"
 msgstr "ยกเลิกการตั้งค่าเธรดเป็นจดหมายที่สำคัญมาก"
 
-#: kmmainwidget.cpp:2958
+#: kmmainwidget.cpp:2970
 msgid "&Watch Thread"
 msgstr "เธรดที่ต้องติดตาม"
 
-#: kmmainwidget.cpp:2962
+#: kmmainwidget.cpp:2974
 msgid "&Ignore Thread"
 msgstr "เธรดที่ไม่สนใจ"
 
-#: kmmainwidget.cpp:2970
+#: kmmainwidget.cpp:2982
 msgid "Save A&ttachments..."
 msgstr "บันทึกสิ่งที่แนบมาด้วย..."
 
-#: kmmainwidget.cpp:2980
+#: kmmainwidget.cpp:2992
 msgid "Appl&y All Filters"
 msgstr "ปรับใช้ตัวกรองทั้งหมด"
 
-#. i18n: file kmail_part.rc line 141
-#: kmmainwidget.cpp:2985 rc.cpp:30 rc.cpp:96
+#. i18n: file kmail_part.rc line 142
+#: kmmainwidget.cpp:2997 rc.cpp:30 rc.cpp:96
 #, no-c-format
 msgid "A&pply Filter"
 msgstr "ปรับใช้ตัวกรอง"
 
-#: kmmainwidget.cpp:2992
+#: kmmainwidget.cpp:3004
 msgid ""
 "_: View->\n"
 "&Unread Count"
 msgstr "จำนวนจดหมายที่ยังไม่อ่าน"
 
-#: kmmainwidget.cpp:2994
+#: kmmainwidget.cpp:3006
 #, fuzzy
 msgid "Choose how to display the count of unread messages"
 msgstr "ไปยังจดหมายที่ยังไม่ได้อ่านฉบับถัดไป"
 
-#: kmmainwidget.cpp:2996
+#: kmmainwidget.cpp:3008
 msgid ""
 "_: View->Unread Count\n"
 "View in &Separate Column"
 msgstr "แสดงเป็นอีกคอลัมน์"
 
-#: kmmainwidget.cpp:3002
+#: kmmainwidget.cpp:3014
 msgid ""
 "_: View->Unread Count\n"
 "View After &Folder Name"
 msgstr "แสดงต่อท้ายชื่อโฟลเดอร์"
 
-#: kmmainwidget.cpp:3009
+#: kmmainwidget.cpp:3021
 msgid ""
 "_: View->\n"
 "&Total Column"
 msgstr "คอลัมน์รวม"
 
-#: kmmainwidget.cpp:3012
+#: kmmainwidget.cpp:3024
 msgid ""
 "Toggle display of column showing the total number of messages in folders."
 msgstr "เปิด/ปิดการแสดงคอลัมน์ที่ใช้แสดงจำนวนรวมของจดหมายที่อยู่ในโฟลเดอร์"
 
-#: kmmainwidget.cpp:3014
+#: kmmainwidget.cpp:3026
 #, fuzzy
 msgid ""
 "_: View->\n"
 "&Size Column"
 msgstr "คอลัมน์รวม"
 
-#: kmmainwidget.cpp:3017
+#: kmmainwidget.cpp:3029
 #, fuzzy
 msgid "Toggle display of column showing the total size of messages in folders."
 msgstr "เปิด/ปิดการแสดงคอลัมน์ที่ใช้แสดงจำนวนรวมของจดหมายที่อยู่ในโฟลเดอร์"
 
-#: kmmainwidget.cpp:3020
+#: kmmainwidget.cpp:3032
 msgid ""
 "_: View->\n"
 "&Expand Thread"
 msgstr "ขยายเธรด"
 
-#: kmmainwidget.cpp:3021
+#: kmmainwidget.cpp:3033
 msgid "Expand the current thread"
 msgstr "ขยายเธรดปัจจุบัน"
 
-#: kmmainwidget.cpp:3026
+#: kmmainwidget.cpp:3038
 msgid ""
 "_: View->\n"
 "&Collapse Thread"
 msgstr "ย่อเก็บเธรด"
 
-#: kmmainwidget.cpp:3027
+#: kmmainwidget.cpp:3039
 msgid "Collapse the current thread"
 msgstr "ย่อเก็บเธรดปัจจุบัน"
 
-#: kmmainwidget.cpp:3032
+#: kmmainwidget.cpp:3044
 msgid ""
 "_: View->\n"
 "Ex&pand All Threads"
 msgstr "ขยายเธรดทั้งหมด"
 
-#: kmmainwidget.cpp:3033
+#: kmmainwidget.cpp:3045
 msgid "Expand all threads in the current folder"
 msgstr "ขยายเธรดทั้งหมดในโฟลเดอร์ปัจจุบัน"
 
-#: kmmainwidget.cpp:3038
+#: kmmainwidget.cpp:3050
 msgid ""
 "_: View->\n"
 "C&ollapse All Threads"
 msgstr "ย่อเก็บเธรดทั้งหมด"
 
-#: kmmainwidget.cpp:3039
+#: kmmainwidget.cpp:3051
 msgid "Collapse all threads in the current folder"
 msgstr "ย่อเก็บเธรดทั้งหมดในโฟลเดอร์ปัจจุบัน"
 
-#: kmmainwidget.cpp:3044 kmreadermainwin.cpp:322
+#: kmmainwidget.cpp:3056 kmreadermainwin.cpp:373
 msgid "&View Source"
 msgstr "แสดงต้นฉบับ"
 
-#: kmmainwidget.cpp:3048
+#: kmmainwidget.cpp:3060
 #, fuzzy
 msgid "&Display Message"
 msgstr "แสดงขนาดจดหมายด้วย"
 
-#: kmmainwidget.cpp:3054
+#: kmmainwidget.cpp:3066
 msgid "&Next Message"
 msgstr "ฉบับถัดไป"
 
-#: kmmainwidget.cpp:3055
+#: kmmainwidget.cpp:3067
 msgid "Go to the next message"
 msgstr "ไปยังจดหมายฉบับถัดไป"
 
-#: kmmainwidget.cpp:3059
+#: kmmainwidget.cpp:3071
 msgid "Next &Unread Message"
 msgstr "ฉบับที่ยังไม่ได้อ่านถัดไป"
 
-#: kmmainwidget.cpp:3061
+#: kmmainwidget.cpp:3073
 msgid "Go to the next unread message"
 msgstr "ไปยังจดหมายที่ยังไม่ได้อ่านฉบับถัดไป"
 
 #. i18n("Go to the next important message") ),
-#: kmmainwidget.cpp:3072
+#: kmmainwidget.cpp:3084
 msgid "&Previous Message"
 msgstr "ฉบับก่อนหน้านี้"
 
-#: kmmainwidget.cpp:3073
+#: kmmainwidget.cpp:3085
 msgid "Go to the previous message"
 msgstr "ไปยังจดหมายฉบับก่อนหน้านี้"
 
-#: kmmainwidget.cpp:3077
+#: kmmainwidget.cpp:3089
 msgid "Previous Unread &Message"
 msgstr "ฉบับที่ยังไม่ได้อ่านก่อนหน้านี้"
 
-#: kmmainwidget.cpp:3079
+#: kmmainwidget.cpp:3091
 msgid "Go to the previous unread message"
 msgstr "ไปยังจดหมายฉบับที่ยังไม่ได้อ่านก่อนหน้านี้"
 
-#: kmmainwidget.cpp:3091
+#: kmmainwidget.cpp:3103
 msgid "Next Unread &Folder"
 msgstr "โฟลเดอร์ที่ยังไม่อ่านตัวถัดไป"
 
-#: kmmainwidget.cpp:3092
+#: kmmainwidget.cpp:3104
 msgid "Go to the next folder with unread messages"
 msgstr "ไปยังโฟลเดอร์ถัดไปที่มีจดหมายที่ยังไม่ได้อ่าน"
 
-#: kmmainwidget.cpp:3100
+#: kmmainwidget.cpp:3112
 msgid "Previous Unread F&older"
 msgstr "โฟลเดอร์ที่ยังไม่อ่านตัวก่อนหน้านี้"
 
-#: kmmainwidget.cpp:3101
+#: kmmainwidget.cpp:3113
 msgid "Go to the previous folder with unread messages"
 msgstr "ไปยังโฟลเดอร์ก่อนหน้านี้ที่มีจดหมายที่ยังไม่ได้อ่าน"
 
-#: kmmainwidget.cpp:3108
+#: kmmainwidget.cpp:3120
 msgid ""
 "_: Go->\n"
 "Next Unread &Text"
 msgstr "ข้อความที่ยังไม่ได้อ่านถัดไป"
 
-#: kmmainwidget.cpp:3109
+#: kmmainwidget.cpp:3121
 msgid "Go to the next unread text"
 msgstr "ไปยังข้อความที่ยังไม่ได้อ่านตัวถัดไป"
 
-#: kmmainwidget.cpp:3110
+#: kmmainwidget.cpp:3122
 msgid ""
 "Scroll down current message. If at end of current message, go to next unread "
 "message."
@@ -7975,77 +8798,81 @@ msgstr ""
 "เลื่อนจดหมายฉบับปัจจุบันลง หากอยู่ที่ส่วนท้ายของฉบับปัจจุบันแล้ว "
 "ให้ไปยังฉบับที่ยังไม่ได้อ่านฉบับถัดไป"
 
-#: kmmainwidget.cpp:3117
+#: kmmainwidget.cpp:3129
+msgid "Show Quick Search"
+msgstr "แสดงแถบค้นหาด่วน"
+
+#: kmmainwidget.cpp:3136
 msgid "Configure &Filters..."
 msgstr "ปรับแต่งตัวกรอง..."
 
-#: kmmainwidget.cpp:3119
+#: kmmainwidget.cpp:3138
 msgid "Configure &POP Filters..."
 msgstr "ปรับแต่งตัวกรอง &POP..."
 
-#: kmmainwidget.cpp:3121
+#: kmmainwidget.cpp:3140
 msgid "Manage &Sieve Scripts..."
 msgstr "จัดการสคริปต์การกรอง..."
 
-#: kmmainwidget.cpp:3124
+#: kmmainwidget.cpp:3143
 msgid "KMail &Introduction"
 msgstr "แนะนำโปรแกรมจัดการจดหมาย - K"
 
-#: kmmainwidget.cpp:3125
+#: kmmainwidget.cpp:3144
 msgid "Display KMail's Welcome Page"
 msgstr "แสดงหน้าต้อนรับของโปรแกรมจัดการจดหมาย - K"
 
-#: kmmainwidget.cpp:3131
+#: kmmainwidget.cpp:3150
 msgid "Configure &Notifications..."
 msgstr "ปรับแต่งการแจ้งเตือน..."
 
-#: kmmainwidget.cpp:3136
+#: kmmainwidget.cpp:3155
 msgid "&Configure KMail..."
 msgstr "ปรับแต่งโปรแกรมจัดการจดหมาย - K..."
 
-#: kmmainwidget.cpp:3431
+#: kmmainwidget.cpp:3454
 msgid "E&mpty Trash"
 msgstr "เทถังขยะทิ้ง"
 
-#: kmmainwidget.cpp:3431
+#: kmmainwidget.cpp:3455
 msgid "&Move All Messages to Trash"
 msgstr "ทิ้งจดหมายทั้งหมดลงถังขยะ"
 
-#: kmmainwidget.cpp:3434
+#: kmmainwidget.cpp:3464
 msgid "&Delete Search"
 msgstr "ลบการค้นหา"
 
-#: kmmainwidget.cpp:3434
+#: kmmainwidget.cpp:3465
 msgid "&Delete Folder"
 msgstr "ลบโฟลเดอร์"
 
-#: kmmainwidget.cpp:3615
+#: kmmainwidget.cpp:3649
 #, c-format
 msgid ""
 "_n: Removed %n duplicate message.\n"
 "Removed %n duplicate messages."
 msgstr "ลบจดหมายที่ซ้ำกันทั้ง %n ฉบับแล้ว"
 
-#: kmmainwidget.cpp:3617
+#: kmmainwidget.cpp:3651
 msgid "No duplicate messages found."
 msgstr "ไม่พบจดหมายฉบับที่ซ้ำกัน"
 
-#: kmmainwidget.cpp:3687
+#: kmmainwidget.cpp:3721
 #, c-format
 msgid "Filter %1"
 msgstr "ตัวกรอง %1"
 
-#: kmmainwidget.cpp:3821
+#: kmmainwidget.cpp:3855
 #, fuzzy
 msgid "Subscription"
 msgstr "รายละเอียด"
 
-#: kmmainwidget.cpp:3838
+#: kmmainwidget.cpp:3872
 #, fuzzy
 msgid "Local Subscription"
 msgstr "รายละเอียด"
 
-#: kmmainwidget.cpp:3971
+#: kmmainwidget.cpp:4007
 msgid "Out of office reply active"
 msgstr ""
 
@@ -8057,7 +8884,7 @@ msgstr "เปิดหน้าต่างใหม่"
 msgid " Initializing..."
 msgstr " กำลังเริ่มการทำงาน..."
 
-#: kmmessage.cpp:1316
+#: kmmessage.cpp:1336
 msgid ""
 "This message contains a request to return a notification about your reception "
 "of the message.\n"
@@ -8065,7 +8892,7 @@ msgid ""
 "response."
 msgstr ""
 
-#: kmmessage.cpp:1321
+#: kmmessage.cpp:1341
 msgid ""
 "This message contains a request to send a notification about your reception of "
 "the message.\n"
@@ -8074,7 +8901,7 @@ msgid ""
 "You can either ignore the request or let KMail send a \"failed\" response."
 msgstr ""
 
-#: kmmessage.cpp:1328
+#: kmmessage.cpp:1348
 msgid ""
 "This message contains a request to send a notification about your reception of "
 "the message,\n"
@@ -8083,7 +8910,7 @@ msgid ""
 "response."
 msgstr ""
 
-#: kmmessage.cpp:1335
+#: kmmessage.cpp:1355
 msgid ""
 "This message contains a request to send a notification about your reception of "
 "the message,\n"
@@ -8092,7 +8919,7 @@ msgid ""
 "response."
 msgstr ""
 
-#: kmmessage.cpp:1341
+#: kmmessage.cpp:1361
 msgid ""
 "This message contains a request to send a notification about your reception of "
 "the message,\n"
@@ -8102,56 +8929,65 @@ msgid ""
 "response."
 msgstr ""
 
-#: kmmessage.cpp:1359 kmmessage.cpp:1366
+#: kmmessage.cpp:1379 kmmessage.cpp:1386
 msgid "Message Disposition Notification Request"
 msgstr ""
 
-#: kmmessage.cpp:1361
+#: kmmessage.cpp:1381
 #, fuzzy
 msgid "Send \"&denied\""
 msgstr "ส่งที่อยู่ในคิว"
 
-#: kmmessage.cpp:1361 kmmessage.cpp:1368
+#: kmmessage.cpp:1381 kmmessage.cpp:1388
 msgid "&Send"
 msgstr "ส่ง"
 
-#: kmmessage.cpp:1436
+#: kmmessage.cpp:1458
 msgid ""
 "Header \"Disposition-Notification-Options\" contained required, but unknown "
 "parameter"
 msgstr ""
 
-#: kmmessage.cpp:1628
+#: kmmessage.cpp:1650
 msgid "Receipt: "
 msgstr "ผู้รับ: "
 
-#: kmmessage.cpp:3128 urlhandlermanager.cpp:551
+#: kmmessage.cpp:3168 urlhandlermanager.cpp:692
 #, fuzzy, c-format
 msgid "Attachment: %1"
 msgstr "สิ่งที่แนบมาด้วย: "
 
-#: kmmimeparttree.cpp:139 kmreaderwin.cpp:1969
+#: kmmessage.cpp:3199
+#, fuzzy
+msgid "This attachment has been deleted."
+msgstr "แสดงสิ่งที่แนบมาด้วยตามคำแนะนำของผู้ส่ง"
+
+#: kmmessage.cpp:3201
+msgid "The attachment '%1' has been deleted."
+msgstr ""
+
+#: kmmimeparttree.cpp:137 kmreaderwin.cpp:2034
 msgid ""
 "_: to view something\n"
 "View"
 msgstr "แสดง"
 
-#: kmmimeparttree.cpp:147
+#: kmmimeparttree.cpp:145
 #, fuzzy
 msgid "Save All Attachments..."
 msgstr "ลบสิ่งที่แนบมาด้วยเป็น..."
 
-#: kmmimeparttree.cpp:154 kmreaderwin.cpp:1975 kmreaderwin.cpp:2626
+#: kmmimeparttree.cpp:152 kmreaderwin.cpp:2041 kmreaderwin.cpp:2805
 #, fuzzy
 msgid "Delete Attachment"
 msgstr "ลบสิ่งที่แนบมาด้วย"
 
-#: kmmimeparttree.cpp:157 kmreaderwin.cpp:1973 kmreaderwin.cpp:2638
+#: kmmimeparttree.cpp:155 kmreaderwin.cpp:2039 kmreaderwin.cpp:2861
 #, fuzzy
 msgid "Edit Attachment"
 msgstr "สิ่งที่แนบมาด้วย"
 
-#: kmmimeparttree.cpp:370
+#: kmmimeparttree.cpp:368
 msgid "Unspecified Binary Data"
 msgstr ""
 
@@ -8329,217 +9165,230 @@ msgstr "ไม่มีชื่อเรื่อง"
 msgid "unknown"
 msgstr "ไม่รู้จัก"
 
-#: kmreadermainwin.cpp:477 searchwindow.cpp:352
+#: kmreadermainwin.cpp:515 searchwindow.cpp:353
 #, fuzzy
 msgid "Save Attachments..."
 msgstr "ลบสิ่งที่แนบมาด้วยเป็น..."
 
-#: kmreaderwin.cpp:562
+#: kmreaderwin.cpp:489
 msgid ""
 "_: View->\n"
 "&Headers"
 msgstr "ส่วนหัว"
 
-#: kmreaderwin.cpp:563
+#: kmreaderwin.cpp:490
 msgid "Choose display style of message headers"
 msgstr "เลือกรูปแบบการแสดงหัวจดหมาย"
 
-#: kmreaderwin.cpp:568
+#: kmreaderwin.cpp:495
 #, fuzzy
 msgid ""
 "_: View->headers->\n"
 "&Enterprise Headers"
 msgstr "ส่วนหัวแบบสรุป"
 
-#: kmreaderwin.cpp:571
+#: kmreaderwin.cpp:498
 #, fuzzy
 msgid "Show the list of headers in Enterprise style"
 msgstr "แสดงรายการหัวจดหมายเป็นแบบสมัยใหม่"
 
-#: kmreaderwin.cpp:575
+#: kmreaderwin.cpp:502
 msgid ""
 "_: View->headers->\n"
 "&Fancy Headers"
 msgstr "ส่วนหัวแบบสมัยใหม่"
 
-#: kmreaderwin.cpp:578
+#: kmreaderwin.cpp:505
 msgid "Show the list of headers in a fancy format"
 msgstr "แสดงรายการหัวจดหมายเป็นแบบสมัยใหม่"
 
-#: kmreaderwin.cpp:582
+#: kmreaderwin.cpp:509
 msgid ""
 "_: View->headers->\n"
 "&Brief Headers"
 msgstr "ส่วนหัวแบบสรุป"
 
-#: kmreaderwin.cpp:585
+#: kmreaderwin.cpp:512
 msgid "Show brief list of message headers"
 msgstr "แสดงรายการหัวจดหมายแบบสรุป"
 
-#: kmreaderwin.cpp:589
+#: kmreaderwin.cpp:516
 msgid ""
 "_: View->headers->\n"
 "&Standard Headers"
 msgstr "ส่วนหัวมาตรฐาน"
 
-#: kmreaderwin.cpp:592
+#: kmreaderwin.cpp:519
 msgid "Show standard list of message headers"
 msgstr "แสดงรายการหัวจดหมายแบบมาตรฐาน"
 
-#: kmreaderwin.cpp:596
+#: kmreaderwin.cpp:523
 msgid ""
 "_: View->headers->\n"
 "&Long Headers"
 msgstr "ส่วนหัวแบบยาว"
 
-#: kmreaderwin.cpp:599
+#: kmreaderwin.cpp:526
 msgid "Show long list of message headers"
 msgstr "แสดงรายการหัวจดหมายแบบยาว"
 
-#: kmreaderwin.cpp:603
+#: kmreaderwin.cpp:530
 msgid ""
 "_: View->headers->\n"
 "&All Headers"
 msgstr "ส่วนหัวทั้งหมด"
 
-#: kmreaderwin.cpp:606
+#: kmreaderwin.cpp:533
 msgid "Show all message headers"
 msgstr "แสดงรายการหัวจดหมายทั้งหมด"
 
-#: kmreaderwin.cpp:612
+#: kmreaderwin.cpp:539
 msgid ""
 "_: View->\n"
 "&Attachments"
 msgstr "สิ่งที่แนบมาด้วย"
 
-#: kmreaderwin.cpp:613
+#: kmreaderwin.cpp:540
 msgid "Choose display style of attachments"
 msgstr "เลือกรูปแบบการแสดงสิ่งที่แนบมาด้วย"
 
-#: kmreaderwin.cpp:617
+#: kmreaderwin.cpp:544
 msgid ""
 "_: View->attachments->\n"
 "&As Icons"
 msgstr "เป็นไอคอน"
 
-#: kmreaderwin.cpp:620
+#: kmreaderwin.cpp:547
 msgid "Show all attachments as icons. Click to see them."
 msgstr "แสดงสิ่งที่แนบมาด้วยเป็นไอคอน คลิ้กเพื่อดูมัน"
 
-#: kmreaderwin.cpp:624
+#: kmreaderwin.cpp:551
 msgid ""
 "_: View->attachments->\n"
 "&Smart"
 msgstr "ตามแบบที่กำหนด"
 
-#: kmreaderwin.cpp:627
+#: kmreaderwin.cpp:554
 msgid "Show attachments as suggested by sender."
 msgstr "แสดงสิ่งที่แนบมาด้วยตามคำแนะนำของผู้ส่ง"
 
-#: kmreaderwin.cpp:631
+#: kmreaderwin.cpp:558
 msgid ""
 "_: View->attachments->\n"
 "&Inline"
 msgstr "แสดงในตัวจดหมาย"
 
-#: kmreaderwin.cpp:634
+#: kmreaderwin.cpp:561
 msgid "Show all attachments inline (if possible)"
 msgstr "แสดงสิ่งที่แนบมาด้วยในบรรทัดเนื้อหา (หากเป็นไปได้)"
 
-#: kmreaderwin.cpp:638
+#: kmreaderwin.cpp:565
 msgid ""
 "_: View->attachments->\n"
 "&Hide"
 msgstr "ซ่อน"
 
-#: kmreaderwin.cpp:641
+#: kmreaderwin.cpp:568
 #, fuzzy
 msgid "Do not show attachments in the message viewer"
 msgstr "ไม่ให้แสดงสิ่งที่แนบมาด้วยในช่องเนื้อหาจดหมาย"
 
-#: kmreaderwin.cpp:646
+#: kmreaderwin.cpp:572
+#, fuzzy
+msgid ""
+"_: View->attachments->\n"
+"In Header &Only"
+msgstr "ซ่อน"
+
+#: kmreaderwin.cpp:575
+#, fuzzy
+msgid "Show Attachments only in the header of the mail"
+msgstr "แสดงสิ่งที่แนบมาด้วยเป็นไอคอน คลิ้กเพื่อดูมัน"
+
+#: kmreaderwin.cpp:580
 msgid "&Set Encoding"
 msgstr "ตั้งค่าชุดรหัสอักขระ"
 
-#: kmreaderwin.cpp:654
+#: kmreaderwin.cpp:588
 #, fuzzy
 msgid "New Message To..."
 msgstr "เขียนจดหมายใหม่..."
 
-#: kmreaderwin.cpp:657
+#: kmreaderwin.cpp:591
 #, fuzzy
 msgid "Reply To..."
 msgstr "ส่งการตอบกลับไปยัง..."
 
-#: kmreaderwin.cpp:660
+#: kmreaderwin.cpp:594
 msgid "Forward To..."
 msgstr "ส่งต่อไปยัง..."
 
-#: kmreaderwin.cpp:663
+#: kmreaderwin.cpp:597
 msgid "Add to Address Book"
 msgstr "เพิ่มไว้ในสมุดที่อยู่"
 
-#: kmreaderwin.cpp:666
+#: kmreaderwin.cpp:600
 msgid "Open in Address Book"
 msgstr "เปิดในสมุดที่อยู่"
 
-#: kmreaderwin.cpp:670
+#: kmreaderwin.cpp:604
 msgid "Select All Text"
 msgstr "เลือกข้อความทั้งหมด"
 
-#: kmreaderwin.cpp:672
+#: kmreaderwin.cpp:606 kmreaderwin.cpp:1994
 msgid "Copy Link Address"
 msgstr "คัดลอกตำแหน่งเชื่อมโยง"
 
-#: kmreaderwin.cpp:674
+#: kmreaderwin.cpp:608
 msgid "Open URL"
 msgstr "เปิดตำแหน่ง URL"
 
-#: kmreaderwin.cpp:676
+#: kmreaderwin.cpp:610
 msgid "Bookmark This Link"
 msgstr "ทำคั่นหน้าตำแหน่งเชื่อมโยงนี้"
 
-#: kmreaderwin.cpp:680
+#: kmreaderwin.cpp:614
 msgid "Save Link As..."
 msgstr "บันทึกตำแหน่งเชื่อมโยงเป็น..."
 
-#: kmreaderwin.cpp:687
+#: kmreaderwin.cpp:621
 msgid "Chat &With..."
 msgstr "เปิดการสนทนาด้วย..."
 
-#: kmreaderwin.cpp:1294
+#: kmreaderwin.cpp:1258
 msgid "Full namespace support for IMAP"
 msgstr "รองรับ namespace สำหรับ IMAP อย่างเต็มรูปแบบ"
 
-#: kmreaderwin.cpp:1295
+#: kmreaderwin.cpp:1259
 msgid "Offline mode"
 msgstr "เปลี่ยนเป็นโหมดออฟไลน์ได้"
 
-#: kmreaderwin.cpp:1296
+#: kmreaderwin.cpp:1260
 msgid "Sieve script management and editing"
 msgstr "จัดการสคริปต์สำหรับกรองและทำการแก้ไขได้"
 
-#: kmreaderwin.cpp:1297
+#: kmreaderwin.cpp:1261
 msgid "Account specific filtering"
 msgstr "กรองบัญชีผู้ใช้ที่ระบุได้"
 
-#: kmreaderwin.cpp:1298
+#: kmreaderwin.cpp:1262
 msgid "Filtering of incoming mail for online IMAP accounts"
 msgstr "กรองจดหมายที่เข้ามาสำหรับใช้กับบัญชีผู้ใช้ IMAP แบบออนไลน์ได้"
 
-#: kmreaderwin.cpp:1299
+#: kmreaderwin.cpp:1263
 msgid "Online IMAP folders can be used when filtering into folders"
 msgstr "ใช้โฟลเดอร์ IMAP แบบออนไลน์ได้ขณะที่มีการใช้ตัวกรองกับโฟลเดอร์ได้"
 
-#: kmreaderwin.cpp:1300
+#: kmreaderwin.cpp:1264
 msgid "Automatically delete older mails on POP servers"
 msgstr "ลบจดหมายเก่าบนเซิร์ฟเวอร์ POP โดยอัตโนมัติ"
 
-#: kmreaderwin.cpp:1338
-msgid "The email client for the K Desktop Environment."
+#: kmreaderwin.cpp:1302
+#, fuzzy
+msgid "The email client for the Trinity Desktop Environment."
 msgstr "โปรแกรมจัดการจดหมายสำหรับใช้บนสภาพแวดล้อมพื้นที่ทำงาน K (TDE)"
 
-#: kmreaderwin.cpp:1346
+#: kmreaderwin.cpp:1310
 msgid ""
 "<h2 style='margin-top: 0px;'>Retrieving Folder Contents</h2>"
 "<p>Please wait . . .</p>&nbsp;"
@@ -8547,7 +9396,7 @@ msgstr ""
 "<h2 style='margin-top: 0px;'>กำลังรับข้อมูลเนื้อหาของโฟลเดอร์จดหมาย</h2>"
 "<p>กรุณารอสักครู่ . . .</p>&nbsp;"
 
-#: kmreaderwin.cpp:1354
+#: 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> "
@@ -8557,7 +9406,7 @@ msgstr ""
 "<p>โปรแกรมจัดการจดหมาย - K ทำงานอยู่ในโหมดออฟไลน์ <a href=\"kmail:goOnline\">"
 "คลิกที่นี่</a> เพื่อเปลี่ยนเป็นโหมดออนไลน์ . . .</p>&nbsp;"
 
-#: kmreaderwin.cpp:1371
+#: kmreaderwin.cpp:1335
 #, fuzzy
 msgid ""
 "_: %1: KMail version; %2: help:// URL; %3: homepage URL; %4: prior KMail "
@@ -8603,13 +9452,13 @@ msgstr ""
 "<p style='margin-bottom: 0px'>&nbsp; &nbsp; กลุ่มผู้พัฒนา KMail : "
 "โปรแกรมจัดการจดหมาย - K</p>"
 
-#: kmreaderwin.cpp:1394 kmreaderwin.cpp:1416
+#: kmreaderwin.cpp:1358 kmreaderwin.cpp:1380
 msgid ""
 "<li>%1</li>\n"
 msgstr ""
 "<li>%1</li>\n"
 
-#: kmreaderwin.cpp:1399
+#: kmreaderwin.cpp:1363
 msgid ""
 "<p>Please take a moment to fill in the KMail configuration panel at "
 "Settings-&gt;Configure KMail.\n"
@@ -8620,33 +9469,42 @@ msgstr ""
 "KMail\n"
 "คุณต้องใส่รายละเอียด อย่างน้อยก็ส่วนแสดงตัว และบัญชีผู้ใช้จดหมาย</p>\n"
 
-#: kmreaderwin.cpp:1411
+#: kmreaderwin.cpp:1375
 msgid ""
 "<p><span style='font-size:125%; font-weight:bold;'>Important changes</span> "
 "(compared to KMail %1):</p>\n"
 msgstr ""
 
-#: kmreaderwin.cpp:1555
+#: kmreaderwin.cpp:1518
 msgid "( body part )"
 msgstr "( ส่วนตัวจดหมาย )"
 
-#: kmreaderwin.cpp:1854
+#: kmreaderwin.cpp:1890
 #, fuzzy
 msgid "Could not send MDN."
 msgstr ""
 "ไม่สามารถอ่านแฟ้ม:\n"
 "%1 ได้"
 
-#: kmreaderwin.cpp:1978
+#: kmreaderwin.cpp:1992
+#, fuzzy
+msgid "Copy Email Address"
+msgstr "ที่อยู่อีเมล"
+
+#: kmreaderwin.cpp:2044
 msgid "Decrypt With Chiasmus..."
 msgstr ""
 
-#: kmreaderwin.cpp:2133 kmreaderwin.cpp:2169 kmreaderwin.cpp:2188
+#: kmreaderwin.cpp:2050
+msgid "Scroll To"
+msgstr ""
+
+#: kmreaderwin.cpp:2208 kmreaderwin.cpp:2244 kmreaderwin.cpp:2264
 #, c-format
 msgid "View Attachment: %1"
 msgstr "แสดงสิ่งที่แนบมาด้วย: %1"
 
-#: kmreaderwin.cpp:2181
+#: kmreaderwin.cpp:2257
 #, fuzzy, c-format
 msgid ""
 "_n: [KMail: Attachment contains binary data. Trying to show first character.]\n"
@@ -8656,15 +9514,15 @@ msgstr ""
 "[KMail: สิ่งที่แนบมาด้วย มีส่วนที่เป็นข้อมูลไบนารี กำลังพยายามแสดงอักขระ %1 "
 "ตัวแรก]"
 
-#: kmreaderwin.cpp:2277
+#: kmreaderwin.cpp:2353
 msgid "&Open with '%1'"
 msgstr "เปิดด้วย '%1'"
 
-#: kmreaderwin.cpp:2279
+#: kmreaderwin.cpp:2355
 msgid "&Open With..."
 msgstr "เปิดด้วย..."
 
-#: kmreaderwin.cpp:2281
+#: kmreaderwin.cpp:2357
 msgid ""
 "Open attachment '%1'?\n"
 "Note that opening an attachment may compromise your system's security."
@@ -8672,36 +9530,36 @@ msgstr ""
 "เปิดแฟ้มที่แนบมาด้วย '%1' หรือไม่ ?\n"
 "ควรจำไว้ว่าการเปิดสิ่งที่แนบมาด้วยบางตัวอาจส่งผลต่อความปลอดภัยของระบบได้"
 
-#: kmreaderwin.cpp:2286
+#: kmreaderwin.cpp:2362
 msgid "Open Attachment?"
 msgstr "เปิดสิ่งที่แนบมาด้วยหรือไม่ ?"
 
-#: kmreaderwin.cpp:2625
+#: kmreaderwin.cpp:2804
 msgid ""
 "Deleting an attachment might invalidate any digital signature on this message."
 msgstr ""
 
-#: kmreaderwin.cpp:2637
+#: kmreaderwin.cpp:2860
 msgid ""
 "Modifying an attachment might invalidate any digital signature on this message."
 msgstr ""
 
-#: kmreaderwin.cpp:2685
+#: kmreaderwin.cpp:2956
 #, fuzzy
 msgid "Attachments:"
 msgstr "สิ่งที่แนบมาด้วย"
 
-#: kmsearchpattern.cpp:898
+#: kmsearchpattern.cpp:913
 msgid ""
 "_: name used for a virgin filter\n"
 "unknown"
 msgstr "ไม่ทราบ"
 
-#: kmsearchpattern.cpp:904
+#: kmsearchpattern.cpp:919
 msgid "(match any of the following)"
 msgstr "(ถูกต้องตรงกันบางส่วนกับเงื่อนไขต่อไปนี้)"
 
-#: kmsearchpattern.cpp:906
+#: kmsearchpattern.cpp:921
 msgid "(match all of the following)"
 msgstr "(ถูกต้องตรงกันทั้งหมดกับเงื่อนไขต่อไปนี้)"
 
@@ -8740,27 +9598,46 @@ msgstr "<อายุ (เป็นวัน)>"
 msgid "Message Status"
 msgstr "รายการจดหมาย"
 
-#: kmsearchpatternedit.cpp:391
+#: kmsearchpatternedit.cpp:42
+#, fuzzy
+msgid "From"
+msgstr "จาก"
+
+#: kmsearchpatternedit.cpp:43 recipientseditor.cpp:100
+msgid "To"
+msgstr "ถึง"
+
+#: kmsearchpatternedit.cpp:44 recipientseditor.cpp:102
+msgid "CC"
+msgstr "สำเนาถึง"
+
+#: kmsearchpatternedit.cpp:45
+#, fuzzy
+msgid "Reply To"
+msgstr "ตอบกลับไปยัง"
+
+#: kmsearchpatternedit.cpp:46
+#, fuzzy
+msgid "Organization"
+msgstr "องค์กร:"
+
+#: kmsearchpatternedit.cpp:397
 msgid "Search Criteria"
 msgstr "เงื่อนไขค้นหา"
 
-#: kmsearchpatternedit.cpp:408
+#: kmsearchpatternedit.cpp:414
 msgid "Match a&ll of the following"
 msgstr "ถูกต้องตรงกันทั้งหมดกับต่อไปนี้"
 
-#: kmsearchpatternedit.cpp:409
+#: kmsearchpatternedit.cpp:415
 msgid "Match an&y of the following"
 msgstr "ถูกต้องตรงกันบางส่วนกับต่อไปนี้"
 
-#: kmsender.cpp:114
-msgid "Please create an account for sending and try again."
-msgstr "โปรดสร้างบัญชีผู้ใช้งานสำหรับการส่ง แล้วลองใหม่อีกครั้ง"
-
 #: kmsender.cpp:171
 msgid "Cannot add message to outbox folder"
 msgstr "ไม่สามารถเพิ่มจดหมายไปยังกล่องจดหมายออกได้"
 
-#: kmsender.cpp:373
+#: kmsender.cpp:374
 msgid ""
 "Critical error: Unable to process sent mail (out of space?)Moving failing "
 "message to \"sent-mail\" folder."
@@ -8768,7 +9645,7 @@ msgstr ""
 "ข้อผิดพลาดร้ายแรง: ไม่สามารถทำการส่งจดหมายได้ (พื้นที่เต็มหรือเปล่า ?) "
 "กำลังย้ายจดหมายที่ล้มเหลวไปยังโฟลเดอร์ \"จดหมายที่ส่ง\""
 
-#: kmsender.cpp:385
+#: kmsender.cpp:386
 msgid ""
 "Moving the sent message \"%1\" from the \"outbox\" to the \"sent-mail\" folder "
 "failed.\n"
@@ -8776,60 +9653,60 @@ msgid ""
 "the problem and move the message manually."
 msgstr ""
 
-#: kmsender.cpp:431
+#: kmsender.cpp:432
 msgid ""
 "It's not possible to send messages without specifying a sender address.\n"
 "Please set the email address of identity '%1' in the Identities section of the "
 "configuration dialog and then try again."
 msgstr ""
 
-#: kmsender.cpp:453
+#: kmsender.cpp:454
 #, c-format
 msgid ""
 "_n: %n queued message successfully sent.\n"
 "%n queued messages successfully sent."
 msgstr "ส่งไปไว้ยังคิวแล้ว %n ฉบับ"
 
-#: kmsender.cpp:456
+#: kmsender.cpp:457
 #, fuzzy
 msgid "%1 of %2 queued messages successfully sent."
 msgstr "ส่งไปไว้ยังคิวแล้ว %n ฉบับ"
 
-#: kmsender.cpp:471
+#: kmsender.cpp:472
 #, fuzzy
 msgid "Sending messages"
 msgstr "เซ็นเนื้อความจดหมาย"
 
-#: kmsender.cpp:472
+#: kmsender.cpp:473
 msgid "Initiating sender process..."
 msgstr "เริ่มโปรเซสการส่ง..."
 
-#: kmsender.cpp:502
+#: kmsender.cpp:503
 msgid ""
 "You have chosen to send all queued email using an unencrypted transport, do you "
 "want to continue? "
 msgstr ""
 
-#: kmsender.cpp:504
+#: kmsender.cpp:505
 #, fuzzy
 msgid "Send Unencrypted"
 msgstr "บันทึกแบบไม่เข้ารหัส"
 
-#: kmsender.cpp:556
+#: kmsender.cpp:557
 msgid "Unrecognized transport protocol. Unable to send message."
 msgstr "ไม่สามารถจัดการโปรโตคอลส่งถ่ายข้อมูลได้ ทำให้ไม่สามารถส่งจดหมายได้"
 
-#: kmsender.cpp:597
+#: kmsender.cpp:598
 msgid ""
 "_: %3: subject of message\n"
 "Sending message %1 of %2: %3"
 msgstr "กำลังส่งจดหมาย %1 จาก %2: %3"
 
-#: kmsender.cpp:616
+#: kmsender.cpp:617
 msgid "Failed to send (some) queued messages."
 msgstr "ล้มเหลวในการส่งจดหมายไปยัง(บาง)คิว"
 
-#: kmsender.cpp:693
+#: kmsender.cpp:694
 #, fuzzy
 msgid ""
 "Sending aborted:\n"
@@ -8849,12 +9726,12 @@ msgstr ""
 "โปรโตคอลรับส่งข้อมูลต่อไปนี้ จะถูกใช้:\n"
 "  %2"
 
-#: kmsender.cpp:701 kmsender.cpp:746
+#: kmsender.cpp:702 kmsender.cpp:747
 #, fuzzy
 msgid "Sending aborted."
 msgstr "ส่งภายหลัง"
 
-#: kmsender.cpp:719
+#: kmsender.cpp:720
 #, fuzzy
 msgid ""
 "<p>Sending failed:</p>"
@@ -8875,21 +9752,21 @@ msgstr ""
 "โปรโตคอลรับส่งข้อมูลต่อไปนี้ จะถูกใช้:\n"
 "  %2"
 
-#: kmsender.cpp:729
+#: kmsender.cpp:730
 msgid "Continue Sending"
 msgstr ""
 
-#: kmsender.cpp:729
+#: kmsender.cpp:730
 #, fuzzy
 msgid "&Continue Sending"
 msgstr "การส่ง"
 
-#: kmsender.cpp:730
+#: kmsender.cpp:731
 #, fuzzy
 msgid "&Abort Sending"
 msgstr "การส่ง"
 
-#: kmsender.cpp:732
+#: kmsender.cpp:733
 #, fuzzy
 msgid ""
 "Sending failed:\n"
@@ -8909,11 +9786,11 @@ msgstr ""
 "โปรโตคอลรับส่งข้อมูลต่อไปนี้ จะถูกใช้:\n"
 "  %2"
 
-#: kmsender.cpp:930
+#: kmsender.cpp:931
 msgid "Please specify a mailer program in the settings."
 msgstr "โปรดระบุโปรแกรมส่งจดหมายในส่วนการตั้งค่าก่อน"
 
-#: kmsender.cpp:931
+#: kmsender.cpp:932
 msgid ""
 "Sending failed:\n"
 "%1\n"
@@ -8932,70 +9809,70 @@ msgstr ""
 "โปรโตคอลรับส่งข้อมูลต่อไปนี้ จะถูกใช้:\n"
 "  %2"
 
-#: kmsender.cpp:979
+#: kmsender.cpp:980
 #, fuzzy, c-format
 msgid "Failed to execute mailer program %1"
 msgstr "ล้มเหลวในการประมวลผลโปรแกรมส่งจดหมาย"
 
-#: kmsender.cpp:1029
+#: kmsender.cpp:1030
 msgid "Sendmail exited abnormally."
 msgstr "Sendmail จบการทำงานแบบไม่ปกติ"
 
-#: kmsender.cpp:1099
+#: kmsender.cpp:1100
 msgid "You need to supply a username and a password to use this SMTP server."
 msgstr ""
 "คุณต้องกรอกข้อมูลชื่อผู้ใช้ และรหัสผ่านก่อน\n"
 "เพื่อเข้าใช้งานเซิร์ฟเวอร์ SMTP"
 
-#: kmstartup.cpp:197
+#: kmstartup.cpp:198
 msgid ""
 "%1 already seems to be running on another display on this machine. Running %2 "
 "more than once can cause the loss of mail. You should not start %1 unless you "
 "are sure that it is not already running."
 msgstr ""
 
-#: kmstartup.cpp:207
+#: kmstartup.cpp:208
 msgid ""
 "%1 seems to be running on another display on this machine. Running %1 and %2 at "
 "the same time can cause the loss of mail. You should not start %2 unless you "
 "are sure that %1 is not running."
 msgstr ""
 
-#: kmstartup.cpp:215
+#: kmstartup.cpp:216
 msgid ""
 "%1 already seems to be running on %2. Running %1 more than once can cause the "
 "loss of mail. You should not start %1 on this computer unless you are sure that "
 "it is not already running on %2."
 msgstr ""
 
-#: kmstartup.cpp:221
+#: kmstartup.cpp:222
 msgid ""
 "%1 seems to be running on %3. Running %1 and %2 at the same time can cause the "
 "loss of mail. You should not start %2 on this computer unless you are sure that "
 "%1 is not running on %3."
 msgstr ""
 
-#: kmstartup.cpp:231
+#: kmstartup.cpp:232
 #, fuzzy, c-format
 msgid "Start %1"
 msgstr "สถานะ: "
 
-#: kmstartup.cpp:232
+#: kmstartup.cpp:233
 #, fuzzy
 msgid "Exit"
 msgstr "แก้ไข"
 
-#: kmsystemtray.cpp:337
+#: kmsystemtray.cpp:357
 #, fuzzy
 msgid "New Messages In"
 msgstr "จดหมายใหม่"
 
-#: kmsystemtray.cpp:547
+#: kmsystemtray.cpp:567
 #, fuzzy
 msgid "There are no unread messages"
 msgstr "ไปยังจดหมายฉบับที่ยังไม่ได้อ่านก่อนหน้านี้"
 
-#: kmsystemtray.cpp:549
+#: kmsystemtray.cpp:569
 #, c-format
 msgid ""
 "_n: There is 1 unread message.\n"
@@ -9264,11 +10141,11 @@ msgstr "การกรองที่มี"
 msgid "Available Scripts"
 msgstr "การกรองที่มี"
 
-#: managesievescriptsdialog.cpp:116
+#: managesievescriptsdialog.cpp:121
 msgid "No Sieve URL configured"
 msgstr ""
 
-#: managesievescriptsdialog.cpp:135
+#: managesievescriptsdialog.cpp:140
 #, fuzzy
 msgid "Failed to fetch the list of scripts"
 msgstr ""
@@ -9276,50 +10153,55 @@ msgstr ""
 "%1:\n"
 "%2"
 
-#: managesievescriptsdialog.cpp:160
+#: managesievescriptsdialog.cpp:165
 #, fuzzy
 msgid "Delete Script"
 msgstr "ผู้รับไม่ถูกต้อง"
 
-#: managesievescriptsdialog.cpp:161
+#: managesievescriptsdialog.cpp:166
 #, fuzzy
 msgid "Edit Script..."
 msgstr "แก้ไข..."
 
-#: managesievescriptsdialog.cpp:164
+#: managesievescriptsdialog.cpp:167
+#, fuzzy
+msgid "Deactivate Script"
+msgstr "ผู้รับไม่ถูกต้อง"
+
+#: managesievescriptsdialog.cpp:170
 #, fuzzy
 msgid "New Script..."
 msgstr "รายละเอียด"
 
-#: managesievescriptsdialog.cpp:233
+#: managesievescriptsdialog.cpp:256
 msgid "Really delete script \"%1\" from the server?"
 msgstr ""
 
-#: managesievescriptsdialog.cpp:234
+#: managesievescriptsdialog.cpp:257
 #, fuzzy
 msgid "Delete Sieve Script Confirmation"
 msgstr "การยืนยันการส่งและอ่านจดหมาย"
 
-#: managesievescriptsdialog.cpp:278
+#: managesievescriptsdialog.cpp:300
 #, fuzzy
 msgid "New Sieve Script"
 msgstr "การกรองที่มี"
 
-#: managesievescriptsdialog.cpp:279
+#: managesievescriptsdialog.cpp:301
 #, fuzzy
 msgid "Please enter a name for the new Sieve script:"
 msgstr "โปรดระบุโปรแกรมส่งจดหมายในส่วนการตั้งค่าก่อน"
 
-#: managesievescriptsdialog.cpp:293
+#: managesievescriptsdialog.cpp:315
 #, fuzzy
 msgid "Edit Sieve Script"
 msgstr "การกรองที่มี"
 
-#: managesievescriptsdialog.cpp:337
+#: managesievescriptsdialog.cpp:367
 msgid "The Sieve script was successfully uploaded."
 msgstr ""
 
-#: managesievescriptsdialog.cpp:338
+#: managesievescriptsdialog.cpp:368
 msgid "Sieve Script Upload"
 msgstr ""
 
@@ -9329,7 +10211,7 @@ msgid ""
 "&Reply"
 msgstr "ตอบกลับ"
 
-#: messageactions.cpp:48 searchwindow.cpp:311
+#: messageactions.cpp:48 searchwindow.cpp:312
 msgid "&Reply..."
 msgstr "ตอบกลับ..."
 
@@ -9337,11 +10219,11 @@ msgstr "ตอบกลับ..."
 msgid "Reply to A&uthor..."
 msgstr "ตอบกลับไปยังผู้เขียน..."
 
-#: messageactions.cpp:58 searchwindow.cpp:313
+#: messageactions.cpp:58 searchwindow.cpp:314
 msgid "Reply to &All..."
 msgstr "ตอบกลับทั้งหมด..."
 
-#: messageactions.cpp:63 searchwindow.cpp:316
+#: messageactions.cpp:63 searchwindow.cpp:317
 msgid "Reply to Mailing-&List..."
 msgstr "ตอบกลับไปยังผู้รับจดหมายเวียน..."
 
@@ -9403,7 +10285,7 @@ msgstr "ลบการตั้งค่าให้จดหมายเป็
 msgid "&Edit Message"
 msgstr "แก้ไขจดหมาย"
 
-#: messagecomposer.cpp:222
+#: messagecomposer.cpp:223
 msgid ""
 "<qt>"
 "<p>Structuring information returned by the Crypto plug-in could not be "
@@ -9411,7 +10293,7 @@ msgid ""
 "<p>Please contact your system administrator.</p></qt>"
 msgstr ""
 
-#: messagecomposer.cpp:226
+#: messagecomposer.cpp:227
 msgid ""
 "<p>No active Crypto Plug-In was found and the built-in OpenPGP code did not run "
 "successfully.</p>"
@@ -9423,7 +10305,7 @@ msgid ""
 "Identity->Advanced tab.</li></ul>"
 msgstr ""
 
-#: messagecomposer.cpp:444
+#: messagecomposer.cpp:445
 msgid ""
 "No suitable encoding could be found for your message.\n"
 "Please set an encoding using the 'Options' menu."
@@ -9431,178 +10313,178 @@ msgstr ""
 "ไม่มีการเข้ารหัสที่เหมาะสมสำหรับจดหมายของคุณ\n"
 "โปรดตั้งการเข้ารหัสเอง โดยเลือกจากเมนู 'ตัวเลือก'"
 
-#: messagecomposer.cpp:556
+#: messagecomposer.cpp:557
 msgid ""
 "Chiasmus backend does not offer the \"x-encrypt\" function. Please report this "
 "bug."
 msgstr ""
 
-#: messagecomposer.cpp:564
+#: messagecomposer.cpp:565
 msgid ""
 "The \"x-encrypt\" function does not accept the expected parameters. Please "
 "report this bug."
 msgstr ""
 
-#: messagecomposer.cpp:572
+#: messagecomposer.cpp:573
 msgid "Chiasmus Encryption Error"
 msgstr ""
 
-#: messagecomposer.cpp:577
+#: messagecomposer.cpp:578
 msgid ""
 "Unexpected return value from Chiasmus backend: The \"x-encrypt\" function did "
 "not return a byte array. Please report this bug."
 msgstr ""
 
-#: messagecomposer.cpp:638
+#: messagecomposer.cpp:636
 msgid ""
 "The inline OpenPGP crypto message format does not support encryption or signing "
 "of attachments.\n"
 "Really use deprecated inline OpenPGP?"
 msgstr ""
 
-#: messagecomposer.cpp:642
+#: messagecomposer.cpp:640
 msgid "Insecure Message Format"
 msgstr ""
 
-#: messagecomposer.cpp:643
+#: messagecomposer.cpp:641
 #, fuzzy
 msgid "Use Inline OpenPGP"
 msgstr "ฝัง OpenPGP (มีอยู่ภายใน)"
 
-#: messagecomposer.cpp:644
+#: messagecomposer.cpp:642
 msgid "Use OpenPGP/MIME"
 msgstr ""
 
-#: messagecomposer.cpp:760
+#: messagecomposer.cpp:758
 msgid ""
 "Examination of the recipient's signing preferences yielded that you be asked "
 "whether or not to sign this message.\n"
 "Sign this message?"
 msgstr ""
 
-#: messagecomposer.cpp:765 messagecomposer.cpp:788
+#: messagecomposer.cpp:763 messagecomposer.cpp:786
 #, fuzzy
 msgid "Sign Message?"
 msgstr "เซ็นจดหมาย"
 
-#: messagecomposer.cpp:766 messagecomposer.cpp:789
+#: messagecomposer.cpp:764 messagecomposer.cpp:787
 msgid ""
 "_: to sign\n"
 "&Sign"
 msgstr ""
 
-#: messagecomposer.cpp:767 messagecomposer.cpp:790
+#: messagecomposer.cpp:765 messagecomposer.cpp:788
 msgid "Do &Not Sign"
 msgstr ""
 
-#: messagecomposer.cpp:784
+#: messagecomposer.cpp:782
 msgid ""
 "There are conflicting signing preferences for these recipients.\n"
 "Sign this message?"
 msgstr ""
 
-#: messagecomposer.cpp:806
+#: messagecomposer.cpp:804
 msgid ""
 "You have requested to sign this message, but no valid signing keys have been "
 "configured for this identity."
 msgstr ""
 
-#: messagecomposer.cpp:810
+#: messagecomposer.cpp:808
 msgid "Send Unsigned?"
 msgstr ""
 
-#: messagecomposer.cpp:811
+#: messagecomposer.cpp:809
 #, fuzzy
 msgid "Send &Unsigned"
 msgstr "ทำการส่ง"
 
-#: messagecomposer.cpp:826
+#: messagecomposer.cpp:824
 msgid ""
 "Some parts of this message will not be signed.\n"
 "Sending only partially signed messages might violate site policy.\n"
 "Sign all parts instead?"
 msgstr ""
 
-#: messagecomposer.cpp:829
+#: messagecomposer.cpp:827
 msgid ""
 "This message will not be signed.\n"
 "Sending unsigned message might violate site policy.\n"
 "Sign message instead?"
 msgstr ""
 
-#: messagecomposer.cpp:833
+#: messagecomposer.cpp:831
 msgid "&Sign All Parts"
 msgstr "เซ็นทุกส่วน"
 
-#: messagecomposer.cpp:833
+#: messagecomposer.cpp:831
 #, fuzzy
 msgid "&Sign"
 msgstr "เซ็น"
 
-#: messagecomposer.cpp:835
+#: messagecomposer.cpp:833
 #, fuzzy
 msgid "Unsigned-Message Warning"
 msgstr "คำเตือนเรื่องลายเซ็น"
 
-#: messagecomposer.cpp:837
+#: messagecomposer.cpp:835
 #, fuzzy
 msgid "Send &As Is"
 msgstr "ทำการส่ง"
 
-#: messagecomposer.cpp:875
+#: messagecomposer.cpp:873
 msgid ""
 "Valid trusted encryption keys were found for all recipients.\n"
 "Encrypt this message?"
 msgstr ""
 
-#: messagecomposer.cpp:877
+#: messagecomposer.cpp:875
 msgid ""
 "Examination of the recipient's encryption preferences yielded that you be asked "
 "whether or not to encrypt this message.\n"
 "Encrypt this message?"
 msgstr ""
 
-#: messagecomposer.cpp:882 messagecomposer.cpp:909
+#: messagecomposer.cpp:880 messagecomposer.cpp:907
 msgid "Encrypt Message?"
 msgstr "เข้ารหัสจดหมายหรือไม่ ?"
 
-#: messagecomposer.cpp:884
+#: messagecomposer.cpp:882
 #, fuzzy
 msgid "Sign && &Encrypt"
 msgstr "เซ็นและเข้ารหัส"
 
-#: messagecomposer.cpp:887 messagecomposer.cpp:962
+#: messagecomposer.cpp:885 messagecomposer.cpp:960
 msgid "&Sign Only"
 msgstr "เซ็นเท่านั้น"
 
-#: messagecomposer.cpp:888 messagecomposer.cpp:963
+#: messagecomposer.cpp:886 messagecomposer.cpp:961
 #, fuzzy
 msgid "&Send As-Is"
 msgstr "ใช่ ทำการส่งมัน"
 
-#: messagecomposer.cpp:905
+#: messagecomposer.cpp:903
 msgid ""
 "There are conflicting encryption preferences for these recipients.\n"
 "Encrypt this message?"
 msgstr ""
 
-#: messagecomposer.cpp:911
+#: messagecomposer.cpp:909
 #, fuzzy
 msgid "Do &Not Encrypt"
 msgstr "ไม่เข้ารหัส"
 
-#: messagecomposer.cpp:927
+#: messagecomposer.cpp:925
 msgid ""
 "You have requested to encrypt this message, and to encrypt a copy to yourself, "
 "but no valid trusted encryption keys have been configured for this identity."
 msgstr ""
 
-#: messagecomposer.cpp:932
+#: messagecomposer.cpp:930
 #, fuzzy
 msgid "Send Unencrypted?"
 msgstr "บันทึกแบบไม่เข้ารหัส"
 
-#: messagecomposer.cpp:948
+#: 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 "
@@ -9610,7 +10492,7 @@ msgid ""
 "Encrypt all parts instead?"
 msgstr ""
 
-#: messagecomposer.cpp:952
+#: messagecomposer.cpp:950
 msgid ""
 "This message will not be encrypted.\n"
 "Sending unencrypted messages might violate site policy and/or leak sensitive "
@@ -9618,16 +10500,16 @@ msgid ""
 "Encrypt messages instead?"
 msgstr ""
 
-#: messagecomposer.cpp:957
+#: messagecomposer.cpp:955
 msgid "&Encrypt All Parts"
 msgstr "เข้ารหัสทุกส่วน"
 
-#: messagecomposer.cpp:959
+#: messagecomposer.cpp:957
 #, fuzzy
 msgid "Unencrypted Message Warning"
 msgstr "จดหมายถูกเข้ารหัสไว้"
 
-#: messagecomposer.cpp:2040
+#: messagecomposer.cpp:2038
 msgid ""
 "<qt>"
 "<p>Error: The backend did not return any encoded data.</p>"
@@ -9635,7 +10517,7 @@ msgid ""
 "<br>%2</p></qt>"
 msgstr ""
 
-#: messagecomposer.cpp:2113
+#: messagecomposer.cpp:2111
 msgid ""
 "<qt>Not all characters fit into the chosen encoding."
 "<br>"
@@ -9644,73 +10526,79 @@ msgstr ""
 "<qt>มีอักขระบางตัว ไม่ใช่ชุดรหัสอักขระที่เลือกไว้"
 "<br>คุณต้องการทำการส่งจดหมายต่อไปหรือไม่ ?</qt>"
 
-#: messagecomposer.cpp:2115
+#: messagecomposer.cpp:2113
 #, fuzzy
 msgid "Some Characters Will Be Lost"
 msgstr "มีบางอักขระสูญหายไป"
 
-#: messagecomposer.cpp:2116
+#: messagecomposer.cpp:2114
 msgid "Lose Characters"
 msgstr ""
 
-#: messagecomposer.cpp:2116
+#: messagecomposer.cpp:2114
 #, fuzzy
 msgid "Change Encoding"
 msgstr "ตั้งค่าชุดรหัสอักขระ"
 
-#: messagecomposer.cpp:2164
+#: messagecomposer.cpp:2149
+msgid ""
+"This message could not be signed, since no valid signing keys have been found; "
+"this should actually never happen, please report this bug."
+msgstr ""
+
+#: messagecomposer.cpp:2168
 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:2185
+#: messagecomposer.cpp:2195
 msgid "GnuPG Audit Log for Signing Operation"
 msgstr ""
 
-#: messagecomposer.cpp:2190
+#: messagecomposer.cpp:2200
 msgid ""
 "The signing operation failed. Please make sure that the gpg-agent program is "
 "running."
 msgstr ""
 
-#: messagecomposer.cpp:2213
+#: messagecomposer.cpp:2223
 msgid ""
 "This message could not be encrypted, since the chosen backend does not seem to "
 "support encryption; this should actually never happen, please report this bug."
 msgstr ""
 
-#: messagecomposer.cpp:2233 messagecomposer.cpp:2278
+#: messagecomposer.cpp:2249 messagecomposer.cpp:2300
 msgid "GnuPG Audit Log for Encryption Operation"
 msgstr ""
 
-#: messagecomposer.cpp:2255
+#: messagecomposer.cpp:2271
 msgid ""
 "This message could not be signed and encrypted, since the chosen backend does "
 "not seem to support combined signing and encryption; this should actually never "
 "happen, please report this bug."
 msgstr ""
 
-#: newfolderdialog.cpp:58
+#: newfolderdialog.cpp:59
 #, fuzzy
 msgid "New Folder"
 msgstr "สร้างโฟลเดอร์ใหม่..."
 
-#: newfolderdialog.cpp:65
+#: newfolderdialog.cpp:69
 #, fuzzy, c-format
 msgid "New Subfolder of %1"
 msgstr "สร้างโฟลเดอร์ย่อยใหม่..."
 
-#: newfolderdialog.cpp:81
+#: newfolderdialog.cpp:85
 msgid "Enter a name for the new folder."
 msgstr ""
 
-#: newfolderdialog.cpp:92
+#: newfolderdialog.cpp:96
 #, fuzzy
 msgid "Mailbox &format:"
 msgstr "รูปแบบกล่องจดหมาย:"
 
-#: newfolderdialog.cpp:97
+#: 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 "
@@ -9718,145 +10606,131 @@ msgid ""
 "this option as-is."
 msgstr ""
 
-#: newfolderdialog.cpp:119
+#: newfolderdialog.cpp:124
 #, fuzzy
 msgid "Folder &contains:"
 msgstr "ไอคอนโฟลเดอร์"
 
-#: newfolderdialog.cpp:124
+#: newfolderdialog.cpp:129
 msgid ""
 "Select whether you want the new folder to be used for mail storage of for "
 "storage of groupware items such as tasks or notes. The default is mail. If you "
 "are unsure, leave this option as-is."
 msgstr ""
 
-#: newfolderdialog.cpp:160
+#: newfolderdialog.cpp:165
 #, fuzzy
 msgid "Namespace for &folder:"
 msgstr "ย้ายไปยังโฟลเดอร์"
 
-#: newfolderdialog.cpp:165
+#: newfolderdialog.cpp:170
 #, fuzzy
 msgid "Select the personal namespace the folder should be created in."
 msgstr "เลือกกุญแจสาธารณะที่จะแนบเข้าไปด้วย"
 
-#: newfolderdialog.cpp:188
+#: newfolderdialog.cpp:193
 #, fuzzy
 msgid "Please specify a name for the new folder."
 msgstr "โปรดระบุโปรแกรมส่งจดหมายในส่วนการตั้งค่าก่อน"
 
-#: newfolderdialog.cpp:189
+#: newfolderdialog.cpp:194
 #, fuzzy
 msgid "No Name Specified"
 msgstr "ไม่ยังได้กำหนดชื่อเรื่อง"
 
-#: newfolderdialog.cpp:198
-msgid ""
-"Folder names cannot contain the / (slash) character; please choose another "
-"folder name."
-msgstr ""
-
-#: newfolderdialog.cpp:204
-msgid ""
-"Folder names cannot start with a . (dot) character; please choose another "
-"folder name."
-msgstr ""
-
-#: newfolderdialog.cpp:223
-msgid ""
-"Your IMAP server does not allow the character '%1'; please choose another "
-"folder name."
-msgstr ""
-
-#: newfolderdialog.cpp:240
+#: newfolderdialog.cpp:216
 #, fuzzy
 msgid "<qt>Failed to create folder <b>%1</b>, folder already exists.</qt>"
 msgstr "ล้มเหลวในการสร้างโฟลเดอร์ '%1', มีโฟลเดอร์นี้อยู่แล้ว"
 
-#: newfolderdialog.cpp:246
+#: newfolderdialog.cpp:222
 msgid "<qt>Failed to create folder <b>%1</b>.</qt> "
 msgstr ""
 
-#: objecttreeparser.cpp:450
+#: objecttreeparser.cpp:490
 #, fuzzy
 msgid "Wrong Crypto Plug-In."
 msgstr "ปลั๊กอินเข้ารหัสไม่ถูกต้อง !"
 
-#: objecttreeparser.cpp:490 objecttreeparser.cpp:1909
+#: objecttreeparser.cpp:594 objecttreeparser.cpp:2130
 msgid "Different results for signatures"
 msgstr "ได้ผลลัพธ์ที่แตกต่างกันสำหรับลายเซ็น"
 
-#: objecttreeparser.cpp:573
+#: objecttreeparser.cpp:667
 msgid "The crypto engine returned no cleartext data."
 msgstr ""
 
-#: objecttreeparser.cpp:576 objecttreeparser.cpp:2350
-#: objecttreeparser.cpp:2393
+#: objecttreeparser.cpp:670 objecttreeparser.cpp:2594
+#: objecttreeparser.cpp:2637
 msgid "Status: "
 msgstr "สถานะ: "
 
-#: objecttreeparser.cpp:583
+#: objecttreeparser.cpp:677
 msgid "(unknown)"
 msgstr "(ไม่รู้จัก)"
 
-#: objecttreeparser.cpp:594 objecttreeparser.cpp:748
+#: objecttreeparser.cpp:688 objecttreeparser.cpp:903
 #, fuzzy
 msgid "Crypto plug-in \"%1\" is not initialized."
 msgstr "ปลั๊กอินเข้ารหัส %1 ไม่สามารถใช้ถอดรหัสจดหมายบางฉบับได้"
 
-#: objecttreeparser.cpp:598
+#: objecttreeparser.cpp:692
 #, fuzzy
 msgid "Crypto plug-in \"%1\" cannot verify signatures."
 msgstr "ปลั๊กอินเข้ารหัส %1 ไม่สามารถใช้ถอดรหัสจดหมายบางฉบับได้"
 
-#: objecttreeparser.cpp:603 objecttreeparser.cpp:756
+#: objecttreeparser.cpp:697 objecttreeparser.cpp:911
 #, fuzzy
 msgid "No appropriate crypto plug-in was found."
 msgstr "ไม่พบการตั้งค่าปลั๊กอินเข้ารหัส"
 
-#: objecttreeparser.cpp:606
+#: objecttreeparser.cpp:700
 msgid ""
 "_: %1 is either 'OpenPGP' or 'S/MIME'\n"
 "No %1 plug-in was found."
 msgstr ""
 
-#: objecttreeparser.cpp:610
+#: objecttreeparser.cpp:704
 #, fuzzy, c-format
 msgid ""
 "The message is signed, but the validity of the signature cannot be verified.<br "
 "/>Reason: %1"
 msgstr "ไม่สามารถตรวจสอบลายเซ็นได้"
 
-#: objecttreeparser.cpp:667
+#: objecttreeparser.cpp:737
+msgid "Encrypted data not shown"
+msgstr ""
+
+#: objecttreeparser.cpp:755
 #, fuzzy
 msgid "This message is encrypted."
 msgstr "จัดเก็บจดหมายเข้ารหัสที่ส่งแล้ว"
 
-#: objecttreeparser.cpp:672
+#: objecttreeparser.cpp:760
 #, fuzzy
 msgid "Decrypt Message"
 msgstr "เข้ารหัสจดหมาย"
 
-#: objecttreeparser.cpp:731 objecttreeparser.cpp:744 objecttreeparser.cpp:773
+#: objecttreeparser.cpp:886 objecttreeparser.cpp:899 objecttreeparser.cpp:928
 msgid "Encrypted data not shown."
 msgstr ""
 
-#: objecttreeparser.cpp:734
+#: objecttreeparser.cpp:889
 #, fuzzy
 msgid "Crypto plug-in \"%1\" could not decrypt the data."
 msgstr "ปลั๊กอินเข้ารหัส %1 ไม่สามารถถอดรหัสข้อมูลได้"
 
-#: objecttreeparser.cpp:737
+#: objecttreeparser.cpp:892
 #, c-format
 msgid "Error: %1"
 msgstr "ผิดพลาด: %1"
 
-#: objecttreeparser.cpp:752
+#: objecttreeparser.cpp:907
 #, fuzzy
 msgid "Crypto plug-in \"%1\" cannot decrypt messages."
 msgstr "ปลั๊กอินเข้ารหัส %1 ไม่สามารถใช้ถอดรหัสจดหมายบางฉบับได้"
 
-#: objecttreeparser.cpp:844
+#: objecttreeparser.cpp:1000
 #, fuzzy
 msgid ""
 "<b>Note:</b> This HTML message may contain external references to images etc. "
@@ -9869,7 +10743,7 @@ msgstr ""
 "หากคุณมั่นใจว่าเป็นจดหมายที่ส่งมาจากคนที่คุณเชื่อถือได้ คุณสามารถให้แสดงผล HTML "
 "อย่างเต็มรูปแบบได้ โดยการ <a href=\"kmail:showHTML\">คลิ้กที่นี่</a>."
 
-#: objecttreeparser.cpp:854
+#: objecttreeparser.cpp:1010
 #, fuzzy
 msgid ""
 "<b>Note:</b> This is an HTML message. For security reasons, only the raw HTML "
@@ -9882,228 +10756,254 @@ msgstr ""
 "หากคุณมั่นใจว่าเป็นจดหมายที่ส่งมาจากคนที่คุณเชื่อถือได้ คุณสามารถให้แสดงผล HTML "
 "อย่างเต็มรูปแบบได้ โดยการ <a href=\"kmail:showHTML\">คลิ้กที่นี่</a>."
 
-#: objecttreeparser.cpp:1451
+#: objecttreeparser.cpp:1227
+msgid ""
+"This message is a <i>Toltec</i> Groupware object, it can only be viewed with "
+"Microsoft Outlook in combination with the Toltec connector."
+msgstr ""
+
+#: objecttreeparser.cpp:1239
+#, fuzzy
+msgid "Show Raw Message"
+msgstr "ส่งต่อข้อความแล้ว"
+
+#: objecttreeparser.cpp:1658
 #, c-format
 msgid "Sorry, certificate could not be imported.<br>Reason: %1"
 msgstr ""
 
-#: objecttreeparser.cpp:1461
+#: objecttreeparser.cpp:1668
 #, fuzzy
 msgid "Sorry, no certificates were found in this message."
 msgstr "ใบรับรองที่ใช้สำหรับการเซ็นจดหมาย:"
 
-#: objecttreeparser.cpp:1464
+#: objecttreeparser.cpp:1671
 #, fuzzy
 msgid "Certificate import status:"
 msgstr "ตัวช่วยสร้างใบรับรอง"
 
-#: objecttreeparser.cpp:1467
+#: objecttreeparser.cpp:1674
 #, c-format
 msgid ""
 "_n: 1 new certificate was imported.\n"
 "%n new certificates were imported."
 msgstr ""
 
-#: objecttreeparser.cpp:1470
+#: objecttreeparser.cpp:1677
 #, c-format
 msgid ""
 "_n: 1 certificate was unchanged.\n"
 "%n certificates were unchanged."
 msgstr ""
 
-#: objecttreeparser.cpp:1473
+#: objecttreeparser.cpp:1680
 #, c-format
 msgid ""
 "_n: 1 new secret key was imported.\n"
 "%n new secret keys were imported."
 msgstr ""
 
-#: objecttreeparser.cpp:1476
+#: objecttreeparser.cpp:1683
 #, c-format
 msgid ""
 "_n: 1 secret key was unchanged.\n"
 "%n secret keys were unchanged."
 msgstr ""
 
-#: objecttreeparser.cpp:1485
+#: objecttreeparser.cpp:1692
 msgid "Sorry, no details on certificate import available."
 msgstr ""
 
-#: objecttreeparser.cpp:1488
+#: objecttreeparser.cpp:1695
 #, fuzzy
 msgid "Certificate import details:"
 msgstr "ตัวช่วยสร้างใบรับรอง"
 
-#: objecttreeparser.cpp:1491
+#: objecttreeparser.cpp:1698
 msgid "Failed: %1 (%2)"
 msgstr ""
 
-#: objecttreeparser.cpp:1496
+#: objecttreeparser.cpp:1703
 msgid "New or changed: %1 (secret key available)"
 msgstr ""
 
-#: objecttreeparser.cpp:1498
+#: objecttreeparser.cpp:1706
 #, c-format
 msgid "New or changed: %1"
 msgstr ""
 
-#: objecttreeparser.cpp:1891
+#: objecttreeparser.cpp:2112
 msgid "Error: Signature not verified"
 msgstr "ผิดพลาด: ไม่สามารถตรวจสอบลายเซ็นได้"
 
-#: objecttreeparser.cpp:1894
+#: objecttreeparser.cpp:2115
 msgid "Good signature"
 msgstr "ลายเซ็นใช้ได้"
 
-#: objecttreeparser.cpp:1897
+#: objecttreeparser.cpp:2118
 #, fuzzy
 msgid "<b>Bad</b> signature"
 msgstr "ลายเซ็นใช้ไม่ได้"
 
-#: objecttreeparser.cpp:1900
+#: objecttreeparser.cpp:2121
 msgid "No public key to verify the signature"
 msgstr "ไม่มีกุญแจสาธารณะสำหรับตรวจสอบลายเซ็น"
 
-#: objecttreeparser.cpp:1903
+#: objecttreeparser.cpp:2124
 msgid "No signature found"
 msgstr "ไม่พบลายเซ็น"
 
-#: objecttreeparser.cpp:1906
+#: objecttreeparser.cpp:2127
 msgid "Error verifying the signature"
 msgstr "เกิดข้อผิดพลาดระหว่างตรวจลายเซ็น"
 
-#: objecttreeparser.cpp:1929
+#: objecttreeparser.cpp:2150
 msgid "No status information available."
 msgstr "ไม่มีข้อมูลสถานะ"
 
-#: objecttreeparser.cpp:1936 objecttreeparser.cpp:2020
+#: objecttreeparser.cpp:2157 objecttreeparser.cpp:2241
 msgid "Good signature."
 msgstr "ลายเซ็นใช้ได้"
 
-#: objecttreeparser.cpp:1957
+#: objecttreeparser.cpp:2178
 msgid "One key has expired."
 msgstr "มีกุญแจหมดอายุหนึ่งตัว"
 
-#: objecttreeparser.cpp:1961
+#: objecttreeparser.cpp:2182
 msgid "The signature has expired."
 msgstr "ลายเซ็นหมดอายุ"
 
-#: objecttreeparser.cpp:1966
+#: objecttreeparser.cpp:2187
 msgid "Unable to verify: key missing."
 msgstr "ไม่สามารถตรวจสอบได้: ไม่พบกุญแจ"
 
-#: objecttreeparser.cpp:1973
+#: objecttreeparser.cpp:2194
 msgid "CRL not available."
 msgstr "ไม่มี CRL"
 
-#: objecttreeparser.cpp:1977
+#: objecttreeparser.cpp:2198
 msgid "Available CRL is too old."
 msgstr "CRL ที่มีอยู่เก่าเกินไป"
 
-#: objecttreeparser.cpp:1981
+#: objecttreeparser.cpp:2202
 msgid "A policy was not met."
 msgstr ""
 
-#: objecttreeparser.cpp:1985
+#: objecttreeparser.cpp:2206
 msgid "A system error occurred."
 msgstr "เกิดข้อผิดพลาดของระบบ"
 
-#: objecttreeparser.cpp:1996
+#: objecttreeparser.cpp:2217
 msgid "One key has been revoked."
 msgstr "มีกุญแจบางตัวถูกยกเลิก"
 
-#: objecttreeparser.cpp:2022
+#: objecttreeparser.cpp:2243
 #, fuzzy
 msgid "<b>Bad</b> signature."
 msgstr "ลายเซ็นใช้ไม่ได้"
 
-#: objecttreeparser.cpp:2049
+#: objecttreeparser.cpp:2270
 #, fuzzy
 msgid "Invalid signature."
 msgstr "เปิดใช้งานลายเซ็น"
 
-#: objecttreeparser.cpp:2051
+#: objecttreeparser.cpp:2272
 #, fuzzy
 msgid "Not enough information to check signature validity."
 msgstr "ข้อมูลสำหรับตรวจสอบลายเซ็นมีไม่เพียงพอ %1"
 
-#: objecttreeparser.cpp:2060
+#: objecttreeparser.cpp:2281
 #, fuzzy
 msgid "Signature is valid."
 msgstr "ลายเซ็น"
 
-#: objecttreeparser.cpp:2062
+#: objecttreeparser.cpp:2283
 msgid "Signed by <a href=\"mailto:%1\">%2</a>."
 msgstr ""
 
-#: objecttreeparser.cpp:2066
+#: objecttreeparser.cpp:2287
 msgid "Unknown signature state"
 msgstr ""
 
-#: objecttreeparser.cpp:2070
+#: objecttreeparser.cpp:2291
 #, fuzzy
 msgid "Show Details"
 msgstr "[รายละเอียด]"
 
-#: objecttreeparser.cpp:2082
+#: objecttreeparser.cpp:2308
 #, fuzzy
 msgid "No Audit Log available"
 msgstr "ไม่มีภาษาถูกติดตั้ง"
 
-#: objecttreeparser.cpp:2089
+#: objecttreeparser.cpp:2310
+#, fuzzy, c-format
+msgid "Error Retrieving Audit Log: %1"
+msgstr "เกิดข้อผิดพลาดระหว่างรับจดหมายจากเซิร์ฟเวอร์"
+
+#: objecttreeparser.cpp:2320
 msgid ""
 "_: The Audit Log is a detailed error log from the gnupg backend\n"
 "Show Audit Log"
 msgstr ""
 
-#: objecttreeparser.cpp:2097
+#: objecttreeparser.cpp:2331
 #, fuzzy
 msgid "Hide Details"
 msgstr "[รายละเอียด]"
 
-#: objecttreeparser.cpp:2124 objecttreeparser.cpp:2126
+#: objecttreeparser.cpp:2357 objecttreeparser.cpp:2359
 msgid "Encapsulated message"
 msgstr "เนื้อหาจดหมายที่มีการปกปิด"
 
-#: objecttreeparser.cpp:2135
+#: objecttreeparser.cpp:2368
+#, fuzzy
+msgid "Please wait while the message is being decrypted..."
+msgstr "จัดเก็บจดหมายเข้ารหัสที่ส่งแล้ว"
+
+#: objecttreeparser.cpp:2370
 msgid "Encrypted message"
 msgstr "จดหมายถูกเข้ารหัสไว้"
 
-#: objecttreeparser.cpp:2137
+#: objecttreeparser.cpp:2372
 msgid "Encrypted message (decryption not possible)"
 msgstr ""
 
-#: objecttreeparser.cpp:2139
+#: objecttreeparser.cpp:2374
 #, fuzzy, c-format
 msgid "Reason: %1"
 msgstr "เหตุผล:"
 
-#: objecttreeparser.cpp:2194
+#: objecttreeparser.cpp:2384
+#, fuzzy
+msgid "Please wait while the signature is being verified..."
+msgstr "ไม่สามารถตรวจสอบลายเซ็นได้"
+
+#: objecttreeparser.cpp:2438
 msgid "[Details]"
 msgstr "[รายละเอียด]"
 
-#: objecttreeparser.cpp:2233 objecttreeparser.cpp:2235
+#: objecttreeparser.cpp:2477 objecttreeparser.cpp:2479
 #, fuzzy
 msgid "certificate"
 msgstr "ใบรับรอง"
 
-#: objecttreeparser.cpp:2242 objecttreeparser.cpp:2267
+#: objecttreeparser.cpp:2486 objecttreeparser.cpp:2511
 msgid "Warning:"
 msgstr "คำเตือน:"
 
-#: objecttreeparser.cpp:2244
+#: objecttreeparser.cpp:2488
 msgid "Sender's mail address is not stored in the %1 used for signing."
 msgstr "ที่อยู่อีเมล์ของผู้ส่ง ไม่ได้เก็บอยู่ใน %1 ซึ่งใช้สำหรับการเซ็น"
 
-#: objecttreeparser.cpp:2247
+#: objecttreeparser.cpp:2491
 msgid "sender: "
 msgstr "ผู้ส่ง: "
 
-#: objecttreeparser.cpp:2250
+#: objecttreeparser.cpp:2494
 msgid "stored: "
 msgstr "ที่เก็บไว้: "
 
-#: objecttreeparser.cpp:2269
+#: objecttreeparser.cpp:2513
 #, fuzzy
 msgid ""
 "No mail address is stored in the %1 used for signing, so we cannot compare it "
@@ -10112,100 +11012,100 @@ msgstr ""
 "ไม่มีที่อยู่อีเมล์ที่ถูกเก็บไว้ใน %1 ซึ่งใช้สำหรับการเซ็น ดังนั้น "
 "เราจึงไม่สามารถเปรียบเทียบมันกับที่อยู่ผู้ส่ง &lt;%2&gt; ได้"
 
-#: objecttreeparser.cpp:2292
+#: objecttreeparser.cpp:2536
 #, c-format
 msgid "Not enough information to check signature. %1"
 msgstr "ข้อมูลสำหรับตรวจสอบลายเซ็นมีไม่เพียงพอ %1"
 
-#: objecttreeparser.cpp:2309 objecttreeparser.cpp:2387
+#: objecttreeparser.cpp:2553 objecttreeparser.cpp:2631
 msgid "Message was signed with unknown key."
 msgstr "จดหมายถูกเซ็นกำกับโดยกุญแจที่ไม่รู้จัก"
 
-#: objecttreeparser.cpp:2311 objecttreeparser.cpp:2425
-#: objecttreeparser.cpp:2469
+#: objecttreeparser.cpp:2555 objecttreeparser.cpp:2669
+#: objecttreeparser.cpp:2713
 #, c-format
 msgid "Message was signed by %1."
 msgstr "จดหมายถูกเซ็นกำกับโดย %1"
 
-#: objecttreeparser.cpp:2318 objecttreeparser.cpp:2327
-#: objecttreeparser.cpp:2338
+#: objecttreeparser.cpp:2562 objecttreeparser.cpp:2571
+#: objecttreeparser.cpp:2582
 #, c-format
 msgid "Message was signed with key %1."
 msgstr "จดหมายถูกเซ็นกำกับด้วยกุญแจ %1"
 
-#: objecttreeparser.cpp:2321
+#: objecttreeparser.cpp:2565
 #, fuzzy
 msgid "Message was signed on %1 with key %2."
 msgstr "จดหมายถูกเซ็นกำกับโดย %2 ด้วยกุญแจ %1"
 
-#: objecttreeparser.cpp:2330
+#: objecttreeparser.cpp:2574
 #, fuzzy
 msgid "Message was signed by %3 on %1 with key %2"
 msgstr "จดหมายถูกเซ็นกำกับโดย %2 ด้วยกุญแจ %1"
 
-#: objecttreeparser.cpp:2341
+#: objecttreeparser.cpp:2585
 msgid "Message was signed by %2 with key %1."
 msgstr "จดหมายถูกเซ็นกำกับโดย %2 ด้วยกุญแจ %1"
 
-#: objecttreeparser.cpp:2379
+#: objecttreeparser.cpp:2623
 #, fuzzy
 msgid "Message was signed on %1 with unknown key %2."
 msgstr "จดหมายถูกเซ็นกำกับด้วยกุญแจที่ไม่รู้จัก %1"
 
-#: objecttreeparser.cpp:2383
+#: objecttreeparser.cpp:2627
 #, c-format
 msgid "Message was signed with unknown key %1."
 msgstr "จดหมายถูกเซ็นกำกับด้วยกุญแจที่ไม่รู้จัก %1"
 
-#: objecttreeparser.cpp:2389
+#: objecttreeparser.cpp:2633
 msgid "The validity of the signature cannot be verified."
 msgstr "ไม่สามารถตรวจสอบลายเซ็นได้"
 
-#: objecttreeparser.cpp:2421 objecttreeparser.cpp:2465
+#: objecttreeparser.cpp:2665 objecttreeparser.cpp:2709
 msgid "Message was signed by %2 (Key ID: %1)."
 msgstr "จดหมายถูกเซ็นกำกับโดย %2 (หมายเลขกุญแจ: %1)"
 
-#: objecttreeparser.cpp:2431
+#: objecttreeparser.cpp:2675
 msgid "The signature is valid, but the key's validity is unknown."
 msgstr "ลายเซ็นใช้ได้ แต่ไม่รู้จักกุญแจที่ใช้ตรวจสอบ"
 
-#: objecttreeparser.cpp:2435
+#: objecttreeparser.cpp:2679
 msgid "The signature is valid and the key is marginally trusted."
 msgstr "ลายเซ็นใช้ได้ และกุญแจที่ใช้ตรวจสอบสามารถเชื่อถือได้"
 
-#: objecttreeparser.cpp:2439
+#: objecttreeparser.cpp:2683
 msgid "The signature is valid and the key is fully trusted."
 msgstr "ลายเซ็นใช้ได้ และกุญแจที่ใช้ตรวจสอบสามารถเชื่อถือได้มาก"
 
-#: objecttreeparser.cpp:2443
+#: objecttreeparser.cpp:2687
 msgid "The signature is valid and the key is ultimately trusted."
 msgstr "ลายเซ็นใช้ได้ และกุญแจที่ใช้ตรวจสอบสามารถเชื่อถือได้ที่สุด"
 
-#: objecttreeparser.cpp:2447
+#: objecttreeparser.cpp:2691
 msgid "The signature is valid, but the key is untrusted."
 msgstr "ลายเซ็นใช้ได้ แต่กุญแจที่ใช้ตรวจสอบไม่สามารถเชื่อถือได้"
 
-#: objecttreeparser.cpp:2471
+#: objecttreeparser.cpp:2715
 msgid "Warning: The signature is bad."
 msgstr "คำเตือน: ลายเซ็นไม่ดีจาก"
 
-#: objecttreeparser.cpp:2495
+#: objecttreeparser.cpp:2739
 msgid "End of signed message"
 msgstr "จบจดหมายที่มีลายเซ็น"
 
-#: objecttreeparser.cpp:2501
+#: objecttreeparser.cpp:2745
 msgid "End of encrypted message"
 msgstr "จบจดหมายที่ถูกเข้ารหัสไว้"
 
-#: objecttreeparser.cpp:2508
+#: objecttreeparser.cpp:2752
 msgid "End of encapsulated message"
 msgstr "จบจดหมายที่ถูกเข้ารหัสไว้"
 
-#: partNode.cpp:481
+#: partNode.cpp:505
 msgid "internal part"
 msgstr "ส่วนภายใน"
 
-#: partNode.cpp:483
+#: partNode.cpp:507
 msgid "body part"
 msgstr "ส่วนตัวเนื้่อความ"
 
@@ -10288,19 +11188,19 @@ msgstr "ไปยัง"
 msgid "F&older"
 msgstr "โฟลเดอร์"
 
-#. i18n: file kmail_part.rc line 115
+#. 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 121
+#. 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 127
+#. i18n: file kmail_part.rc line 128
 #: rc.cpp:27 rc.cpp:93 rc.cpp:126
 #, no-c-format
 msgid "&Forward"
@@ -10435,158 +11335,170 @@ msgstr ""
 msgid "Never sign/encrypt when sa&ving as draft"
 msgstr "ไม่ต้องเซ็น/เข้ารหัสเมื่อบันทึกเป็นจดหมายฉบับร่าง"
 
-#. i18n: file customtemplates_base.ui line 180
-#: rc.cpp:194
+#. 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 185
-#: rc.cpp:197
+#. i18n: file customtemplates_base.ui line 239
+#: rc.cpp:206
 #, fuzzy, no-c-format
 msgid "Reply"
 msgstr "ตอบกลับไปยัง"
 
-#. i18n: file customtemplates_base.ui line 190
-#: rc.cpp:200
+#. 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 195
-#: rc.cpp:203
+#. i18n: file customtemplates_base.ui line 249
+#: rc.cpp:212
 #, fuzzy, no-c-format
 msgid "Forward"
 msgstr "ส่งต่อ"
 
-#. i18n: file customtemplates_base.ui line 207
-#: rc.cpp:206
+#. i18n: file customtemplates_base.ui line 261
+#: rc.cpp:215
 #, fuzzy, no-c-format
 msgid "Shortc&ut:"
 msgstr "ปุ่มพิมพ์ลัด:"
 
-#. i18n: file customtemplates_base.ui line 229
-#: rc.cpp:209
+#. i18n: file customtemplates_base.ui line 283
+#: rc.cpp:218
 #, no-c-format
 msgid "&Template type:"
 msgstr ""
 
-#. i18n: file customtemplates_base.ui line 256
-#: rc.cpp:215 rc.cpp:456
-#, no-c-format
-msgid "How does this work?"
-msgstr ""
-
 #. i18n: file folderpropertiesdialog.ui line 16
-#: rc.cpp:218
+#: rc.cpp:224
 #, fuzzy, no-c-format
 msgid "Folder Properties"
 msgstr "ตำแหน่งโฟลเดอร์"
 
 #. i18n: file folderpropertiesdialog.ui line 63
-#: rc.cpp:227
+#: rc.cpp:233
 #, fuzzy, no-c-format
 msgid "Folder holds a &mailing list"
 msgstr "โฟลเดอร์เก็บจดหมายเวียน"
 
 #. i18n: file folderpropertiesdialog.ui line 91
-#: rc.cpp:230
+#: rc.cpp:236
 #, fuzzy, no-c-format
 msgid "List &address:"
 msgstr "ที่อยู่ทางไปรษณีย์:"
 
 #. i18n: file folderpropertiesdialog.ui line 122
-#: rc.cpp:233
+#: rc.cpp:239
 #, fuzzy, no-c-format
 msgid "N&ormal:"
 msgstr "ธรรมดา:"
 
 #. i18n: file folderpropertiesdialog.ui line 215
-#: rc.cpp:236
+#: rc.cpp:242
 #, fuzzy, no-c-format
 msgid "Unr&ead:"
 msgstr "ยังไม่ได้อ่าน:"
 
 #. i18n: file folderpropertiesdialog.ui line 269
-#: rc.cpp:242
+#: rc.cpp:248
 #, fuzzy, no-c-format
 msgid "Message Expiring"
 msgstr "ให้จดหมายเก่าหมดอายุ"
 
 #. i18n: file folderpropertiesdialog.ui line 283
-#: rc.cpp:245
+#: rc.cpp:251
 #, fuzzy, no-c-format
 msgid "E&xpire after:"
 msgstr "หมดอายุ"
 
 #. i18n: file folderpropertiesdialog.ui line 311
-#: rc.cpp:248
+#: rc.cpp:254
 #, fuzzy, no-c-format
 msgid "Expire &read messages"
 msgstr "ให้จดหมายเก่าหมดอายุ ?"
 
 #. i18n: file folderpropertiesdialog.ui line 339
-#: rc.cpp:251
+#: rc.cpp:257
 #, fuzzy, no-c-format
 msgid "Expire a&fter:"
 msgstr "โฟลเดอร์์หมดอายุ"
 
 #. i18n: file folderpropertiesdialog.ui line 350
-#: rc.cpp:254
+#: rc.cpp:260
 #, fuzzy, no-c-format
 msgid "Expire &unread messages"
 msgstr "ให้จดหมายเก่าหมดอายุ ?"
 
 #. i18n: file folderpropertiesdialog.ui line 384
-#: rc.cpp:257 rc.cpp:266
+#: rc.cpp:263 rc.cpp:272
 #, no-c-format
 msgid "Day(s)"
 msgstr "วัน"
 
 #. i18n: file folderpropertiesdialog.ui line 389
-#: rc.cpp:260 rc.cpp:269
+#: rc.cpp:266 rc.cpp:275
 #, no-c-format
 msgid "Week(s)"
 msgstr "สัปดาห์"
 
 #. i18n: file folderpropertiesdialog.ui line 394
-#: rc.cpp:263 rc.cpp:272
+#: rc.cpp:269 rc.cpp:278
 #, no-c-format
 msgid "Month(s)"
 msgstr "เดือน"
 
 #. i18n: file folderpropertiesdialog.ui line 451
-#: rc.cpp:275
+#: rc.cpp:281
 #, fuzzy, no-c-format
 msgid "Advanced"
 msgstr "ตัวเลือกเพิ่มเติม"
 
 #. i18n: file folderpropertiesdialog.ui line 462
-#: rc.cpp:278
+#: rc.cpp:284
 #, fuzzy, no-c-format
 msgid "Sender identit&y:"
 msgstr "การแสดงตัวใหม่:"
 
 #. i18n: file folderpropertiesdialog.ui line 483
-#: rc.cpp:281
+#: rc.cpp:287
 #, fuzzy, no-c-format
 msgid "&Storage format:"
 msgstr "ปรับเปลี่ยนรูปแบบวันที่ใหม่"
 
 #. i18n: file folderpropertiesdialog.ui line 494
-#: rc.cpp:284
+#: rc.cpp:290
 #, no-c-format
 msgid "&List displays:"
 msgstr ""
 
 #. i18n: file smimeconfiguration.ui line 24
-#: rc.cpp:293
+#: rc.cpp:299
 #, no-c-format
 msgid "Validate certificates using CRLs"
 msgstr ""
 
 #. i18n: file smimeconfiguration.ui line 30
-#: rc.cpp:296
+#: rc.cpp:302
 #, no-c-format
 msgid ""
 "If this option is selected, S/MIME certificates are validated using Certificate "
@@ -10594,13 +11506,13 @@ msgid ""
 msgstr ""
 
 #. i18n: file smimeconfiguration.ui line 38
-#: rc.cpp:299
+#: rc.cpp:305
 #, no-c-format
 msgid "Validate certificates online (OCSP)"
 msgstr ""
 
 #. i18n: file smimeconfiguration.ui line 41
-#: rc.cpp:302
+#: rc.cpp:308
 #, no-c-format
 msgid ""
 "If this option is selected, S/MIME certificates are validated online using the "
@@ -10609,19 +11521,19 @@ msgid ""
 msgstr ""
 
 #. i18n: file smimeconfiguration.ui line 49
-#: rc.cpp:305
+#: rc.cpp:311
 #, fuzzy, no-c-format
 msgid "Online Certificate Validation"
 msgstr "สร้างใบรับรอง"
 
 #. i18n: file smimeconfiguration.ui line 68
-#: rc.cpp:308
+#: rc.cpp:314
 #, no-c-format
 msgid "OCSP responder URL:"
 msgstr ""
 
 #. i18n: file smimeconfiguration.ui line 76
-#: rc.cpp:311
+#: rc.cpp:317
 #, no-c-format
 msgid ""
 "Enter here the address of the server for online validation of certificates "
@@ -10629,25 +11541,25 @@ msgid ""
 msgstr ""
 
 #. i18n: file smimeconfiguration.ui line 94
-#: rc.cpp:314
+#: rc.cpp:320
 #, fuzzy, no-c-format
 msgid "OCSP responder signature:"
 msgstr "ลายเซ็นใช้ได้"
 
 #. i18n: file smimeconfiguration.ui line 126
-#: rc.cpp:317
+#: rc.cpp:323
 #, fuzzy, no-c-format
 msgid "Ignore service URL of certificates"
 msgstr "หาใบรับรองอื่น ๆ"
 
 #. i18n: file smimeconfiguration.ui line 136
-#: rc.cpp:320
+#: rc.cpp:326
 #, fuzzy, no-c-format
 msgid "Do not check certificate policies"
 msgstr "อย่าส่งใบรับรอง"
 
 #. i18n: file smimeconfiguration.ui line 139
-#: rc.cpp:323
+#: rc.cpp:329
 #, no-c-format
 msgid ""
 "By default GnuPG uses the file ~/.gnupg/policies.txt to check if a certificate "
@@ -10655,13 +11567,13 @@ msgid ""
 msgstr ""
 
 #. i18n: file smimeconfiguration.ui line 147
-#: rc.cpp:326
+#: rc.cpp:332
 #, no-c-format
 msgid "Never consult a CRL"
 msgstr ""
 
 #. i18n: file smimeconfiguration.ui line 150
-#: rc.cpp:329
+#: rc.cpp:335
 #, no-c-format
 msgid ""
 "If this option is checked, Certificate Revocation Lists are never used to "
@@ -10669,13 +11581,13 @@ msgid ""
 msgstr ""
 
 #. i18n: file smimeconfiguration.ui line 158
-#: rc.cpp:332
+#: rc.cpp:338
 #, fuzzy, no-c-format
 msgid "Fetch missing issuer certificates"
 msgstr "เมื่อมีการเพิ่มใบรับรอง"
 
 #. i18n: file smimeconfiguration.ui line 161
-#: rc.cpp:335
+#: rc.cpp:341
 #, no-c-format
 msgid ""
 "If this option is checked, missing issuer certificates are fetched when "
@@ -10683,37 +11595,37 @@ msgid ""
 msgstr ""
 
 #. i18n: file smimeconfiguration.ui line 169
-#: rc.cpp:338
+#: rc.cpp:344
 #, no-c-format
 msgid "HTTP Requests"
 msgstr ""
 
 #. i18n: file smimeconfiguration.ui line 180
-#: rc.cpp:341
+#: rc.cpp:347
 #, no-c-format
 msgid "Do not perform any HTTP requests"
 msgstr ""
 
 #. i18n: file smimeconfiguration.ui line 183
-#: rc.cpp:344
+#: 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:350
+#: rc.cpp:356
 #, no-c-format
 msgid "Use this proxy for HTTP requests: "
 msgstr ""
 
 #. i18n: file smimeconfiguration.ui line 232
-#: rc.cpp:353
+#: rc.cpp:359
 #, no-c-format
 msgid "Use system HTTP proxy:"
 msgstr ""
 
 #. i18n: file smimeconfiguration.ui line 235
-#: rc.cpp:356
+#: rc.cpp:362
 #, no-c-format
 msgid ""
 "If this option is selected, the value of the HTTP proxy shown on the right "
@@ -10722,7 +11634,7 @@ msgid ""
 msgstr ""
 
 #. i18n: file smimeconfiguration.ui line 243
-#: rc.cpp:359
+#: rc.cpp:365
 #, no-c-format
 msgid ""
 "Enter here the location of your HTTP Proxy, which will be used for all HTTP "
@@ -10731,13 +11643,13 @@ msgid ""
 msgstr ""
 
 #. i18n: file smimeconfiguration.ui line 253
-#: rc.cpp:362
+#: rc.cpp:368
 #, no-c-format
 msgid "Ignore HTTP CRL distribution point of certificates"
 msgstr ""
 
 #. i18n: file smimeconfiguration.ui line 256
-#: rc.cpp:365
+#: rc.cpp:371
 #, no-c-format
 msgid ""
 "When looking for the location of a CRL, the to-be-tested certificate usually "
@@ -10748,31 +11660,31 @@ msgid ""
 msgstr ""
 
 #. i18n: file smimeconfiguration.ui line 268
-#: rc.cpp:368
+#: rc.cpp:374
 #, no-c-format
 msgid "LDAP Requests"
 msgstr ""
 
 #. i18n: file smimeconfiguration.ui line 279
-#: rc.cpp:371
+#: rc.cpp:377
 #, no-c-format
 msgid "Do not perform any LDAP requests"
 msgstr ""
 
 #. i18n: file smimeconfiguration.ui line 282
-#: rc.cpp:374
+#: 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:377
+#: rc.cpp:383
 #, no-c-format
 msgid "Ignore LDAP CRL distribution point of certificates"
 msgstr ""
 
 #. i18n: file smimeconfiguration.ui line 310
-#: rc.cpp:380
+#: rc.cpp:386
 #, no-c-format
 msgid ""
 "When looking for the location of a CRL, the to-be-tested certificate usually "
@@ -10783,13 +11695,13 @@ msgid ""
 msgstr ""
 
 #. i18n: file smimeconfiguration.ui line 326
-#: rc.cpp:383
+#: rc.cpp:389
 #, no-c-format
 msgid "Primary host for LDAP requests:"
 msgstr ""
 
 #. i18n: file smimeconfiguration.ui line 335
-#: rc.cpp:386
+#: rc.cpp:392
 #, no-c-format
 msgid ""
 "Entering a LDAP server here will make all LDAP requests go to that server "
@@ -10802,86 +11714,86 @@ msgid ""
 msgstr ""
 
 #. i18n: file snippetdlgbase.ui line 16
-#: rc.cpp:390
+#: rc.cpp:396
 #, no-c-format
 msgid "Add Snippet"
 msgstr ""
 
 #. i18n: file snippetdlgbase.ui line 52
-#: rc.cpp:393
+#: rc.cpp:399
 #, fuzzy, no-c-format
 msgid "&Add"
 msgstr "เพิ่ม..."
 
 #. i18n: file snippetdlgbase.ui line 111
-#: rc.cpp:402
+#: rc.cpp:408
 #, no-c-format
 msgid "&Snippet:"
 msgstr ""
 
 #. i18n: file snippetdlgbase.ui line 125
-#: rc.cpp:405
+#: rc.cpp:411
 #, fuzzy, no-c-format
 msgid "Group:"
 msgstr "กรุ๊ปแวร์"
 
 #. i18n: file snippetsettingsbase.ui line 16
-#: rc.cpp:408
+#: rc.cpp:414
 #, fuzzy, no-c-format
 msgid "Snippet Settings"
 msgstr "ปรับการตั้งค่าแบบอักษรเป็นค่าเดิม"
 
 #. i18n: file snippetsettingsbase.ui line 27
-#: rc.cpp:411
+#: rc.cpp:417
 #, no-c-format
 msgid "Tooltips"
 msgstr ""
 
 #. i18n: file snippetsettingsbase.ui line 38
-#: rc.cpp:414
+#: rc.cpp:420
 #, no-c-format
 msgid "Show snippet's text in &tooltip"
 msgstr ""
 
 #. i18n: file snippetsettingsbase.ui line 44
-#: rc.cpp:417
+#: 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:420
+#: rc.cpp:426
 #, no-c-format
 msgid "Variables"
 msgstr ""
 
 #. i18n: file snippetsettingsbase.ui line 82
-#: rc.cpp:423
+#: rc.cpp:429
 #, no-c-format
 msgid "Input Method for Variables"
 msgstr ""
 
 #. i18n: file snippetsettingsbase.ui line 93
-#: rc.cpp:426
+#: rc.cpp:432
 #, no-c-format
 msgid "Single dialog for each variable within a snippet"
 msgstr ""
 
 #. i18n: file snippetsettingsbase.ui line 102
-#: rc.cpp:429
+#: 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:432
+#: rc.cpp:438
 #, no-c-format
 msgid "One dialog for all variables within a snippet"
 msgstr ""
 
 #. i18n: file snippetsettingsbase.ui line 119
-#: rc.cpp:435
+#: rc.cpp:441
 #, no-c-format
 msgid ""
 "A single dialog will be displayed where you can enter the values for all "
@@ -10889,49 +11801,49 @@ msgid ""
 msgstr ""
 
 #. i18n: file snippetsettingsbase.ui line 137
-#: rc.cpp:438
+#: rc.cpp:444
 #, fuzzy, no-c-format
 msgid "Delimiter:"
 msgstr "ไม่จำกัด"
 
 #. i18n: file templatesconfiguration_base.ui line 30
-#: rc.cpp:441
+#: rc.cpp:447
 #, fuzzy, no-c-format
 msgid "TemplatesConfiguration"
 msgstr "ปรับแต่งลายเซ็น"
 
 #. i18n: file templatesconfiguration_base.ui line 129
-#: rc.cpp:447
+#: rc.cpp:453
 #, fuzzy, no-c-format
 msgid "Reply to Sender"
 msgstr "ตอบกลับไปยังผู้ส่ง:"
 
 #. i18n: file templatesconfiguration_base.ui line 172
-#: rc.cpp:450
+#: rc.cpp:456
 #, no-c-format
 msgid "Reply to All / Reply to List"
 msgstr ""
 
 #. i18n: file templatesconfiguration_base.ui line 215
-#: rc.cpp:453
+#: rc.cpp:459
 #, fuzzy, no-c-format
 msgid "Forward Message"
 msgstr "ส่งต่อข้อความแล้ว"
 
 #. i18n: file warningconfiguration.ui line 24
-#: rc.cpp:462
+#: rc.cpp:468
 #, no-c-format
 msgid "Warn when trying to send &unsigned messages"
 msgstr "แจ้งเตือนเมื่อพยายามจะส่งจดหมายที่ยังไม่ได้เซ็น"
 
 #. i18n: file warningconfiguration.ui line 30
-#: rc.cpp:465
+#: rc.cpp:471
 #, no-c-format
 msgid "Check to be warned when sending unsigned messages."
 msgstr "เลือกเพื่อให้มีการแจ้งเตือนเมื่อพยายามจะส่งจดหมายที่ยังไม่ได้เซ็น"
 
 #. i18n: file warningconfiguration.ui line 38
-#: rc.cpp:468
+#: rc.cpp:474
 #, no-c-format
 msgid ""
 "<qt>\n"
@@ -10944,19 +11856,19 @@ msgid ""
 msgstr ""
 
 #. i18n: file warningconfiguration.ui line 46
-#: rc.cpp:476
+#: rc.cpp:482
 #, no-c-format
 msgid "&Warn when trying to send unencrypted messages"
 msgstr "แจ้งเตือนเมื่อพยายามส่งจดหมายที่ไม่ได้เข้ารหัสไว้"
 
 #. i18n: file warningconfiguration.ui line 52
-#: rc.cpp:479
+#: rc.cpp:485
 #, no-c-format
 msgid "Check to be warned when sending unencrypted messages."
 msgstr "เช็คเพื่อให้มีการเตือนเมื่อมีการส่งจดหมายที่ไม่ได้เข้ารหัสไว้"
 
 #. i18n: file warningconfiguration.ui line 60
-#: rc.cpp:482
+#: rc.cpp:488
 #, no-c-format
 msgid ""
 "<qt>\n"
@@ -10969,19 +11881,19 @@ msgid ""
 msgstr ""
 
 #. i18n: file warningconfiguration.ui line 68
-#: rc.cpp:490
+#: 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:493
+#: 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:496
+#: rc.cpp:502
 #, no-c-format
 msgid ""
 "<qt>\n"
@@ -10994,38 +11906,38 @@ msgid ""
 msgstr ""
 
 #. i18n: file warningconfiguration.ui line 90
-#: rc.cpp:504
+#: 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:507
+#: rc.cpp:513
 #, fuzzy, no-c-format
 msgid "For signing"
 msgstr "ใช้สำหรับการเซ็น"
 
 #. i18n: file warningconfiguration.ui line 115
-#: rc.cpp:510
+#: rc.cpp:516
 #, fuzzy, no-c-format
 msgid "For encryption"
 msgstr "การเข้ารหัส"
 
 #. i18n: file warningconfiguration.ui line 126
-#: rc.cpp:513 rc.cpp:527 rc.cpp:541 rc.cpp:555 rc.cpp:569 rc.cpp:583
+#: 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:516 rc.cpp:530 rc.cpp:544 rc.cpp:558 rc.cpp:572 rc.cpp:586
+#: 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:519
+#: rc.cpp:525
 #, no-c-format
 msgid ""
 "<qt>\n"
@@ -11038,7 +11950,7 @@ msgid ""
 msgstr ""
 
 #. i18n: file warningconfiguration.ui line 174
-#: rc.cpp:533
+#: rc.cpp:539
 #, no-c-format
 msgid ""
 "<qt>\n"
@@ -11051,7 +11963,7 @@ msgid ""
 msgstr ""
 
 #. i18n: file warningconfiguration.ui line 202
-#: rc.cpp:547
+#: rc.cpp:553
 #, no-c-format
 msgid ""
 "<qt>\n"
@@ -11064,7 +11976,7 @@ msgid ""
 msgstr ""
 
 #. i18n: file warningconfiguration.ui line 230
-#: rc.cpp:561
+#: rc.cpp:567
 #, no-c-format
 msgid ""
 "<qt>\n"
@@ -11077,7 +11989,7 @@ msgid ""
 msgstr ""
 
 #. i18n: file warningconfiguration.ui line 258
-#: rc.cpp:575 rc.cpp:589
+#: rc.cpp:581 rc.cpp:595
 #, no-c-format
 msgid ""
 "<qt>\n"
@@ -11090,55 +12002,55 @@ msgid ""
 msgstr ""
 
 #. i18n: file warningconfiguration.ui line 294
-#: rc.cpp:597
+#: rc.cpp:603
 #, fuzzy, no-c-format
 msgid "For root certificates:"
 msgstr "หาใบรับรองอื่น ๆ"
 
 #. i18n: file warningconfiguration.ui line 305
-#: rc.cpp:600
+#: rc.cpp:606
 #, fuzzy, no-c-format
 msgid "For intermediate CA certificates:"
 msgstr "หาใบรับรองอื่น ๆ"
 
 #. i18n: file warningconfiguration.ui line 316
-#: rc.cpp:603
+#: rc.cpp:609
 #, fuzzy, no-c-format
 msgid "For end-user certificates/keys:"
 msgstr "อย่าส่งใบรับรอง"
 
 #. i18n: file warningconfiguration.ui line 388
-#: rc.cpp:606
+#: 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:609
+#: rc.cpp:615
 #, fuzzy, no-c-format
 msgid "Template content"
 msgstr "เนื้อหาในโฟลเดอร์:"
 
 #. i18n: file customtemplates_kfg.kcfg line 17
-#: rc.cpp:612
+#: rc.cpp:618
 #, no-c-format
 msgid "Template shortcut"
 msgstr ""
 
 #. i18n: file customtemplates_kfg.kcfg line 22
-#: rc.cpp:615
+#: rc.cpp:621
 #, no-c-format
 msgid "Template type"
 msgstr ""
 
-#. i18n: file kmail.kcfg line 59
-#: rc.cpp:618
+#. 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 60
-#: rc.cpp:621
+#. i18n: file kmail.kcfg line 62
+#: rc.cpp:627
 #, no-c-format
 msgid ""
 "<qt>"
@@ -11147,16 +12059,16 @@ msgid ""
 "automatically at all. </p></qt>"
 msgstr ""
 
-#. i18n: file kmail.kcfg line 70
-#: rc.cpp:624
+#. 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 71
-#: rc.cpp:627
+#. 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 "
@@ -11165,14 +12077,14 @@ msgid ""
 "folder."
 msgstr ""
 
-#. i18n: file kmail.kcfg line 76
-#: rc.cpp:630
+#. 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 85
-#: rc.cpp:633
+#. 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 "
@@ -11181,42 +12093,42 @@ msgid ""
 "set here."
 msgstr ""
 
-#. i18n: file kmail.kcfg line 91
-#: rc.cpp:637
+#. 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 99
-#: rc.cpp:640
+#. 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 107
-#: rc.cpp:646
+#. 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 115
-#: rc.cpp:649
+#. 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 119
-#: rc.cpp:652
+#. i18n: file kmail.kcfg line 121
+#: rc.cpp:658
 #, fuzzy, no-c-format
 msgid "Verbose new mail notification"
 msgstr "การแจ้งเตือนเมื่อมีจดหมายใหม่"
 
-#. i18n: file kmail.kcfg line 120
-#: rc.cpp:655
+#. 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 "
@@ -11224,40 +12136,40 @@ msgid ""
 "simple 'New mail arrived' message."
 msgstr ""
 
-#. i18n: file kmail.kcfg line 124
-#: rc.cpp:658
+#. i18n: file kmail.kcfg line 126
+#: rc.cpp:664
 #, no-c-format
 msgid "Specify e&ditor:"
 msgstr "เครื่องมือแก้ไขข้อความ: "
 
-#. i18n: file kmail.kcfg line 128
-#: rc.cpp:661
+#. 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 155
-#: rc.cpp:664
+#. 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 164
-#: rc.cpp:667
+#. i18n: file kmail.kcfg line 166
+#: rc.cpp:673
 #, no-c-format
 msgid "Enable groupware functionality"
 msgstr ""
 
-#. i18n: file kmail.kcfg line 170
-#: rc.cpp:670
+#. 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 171
-#: rc.cpp:673
+#. 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 "
@@ -11265,14 +12177,14 @@ msgid ""
 "with Outlook users not being able to get your replies, try setting this option."
 msgstr ""
 
-#. i18n: file kmail.kcfg line 176
-#: rc.cpp:676
+#. 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 177
-#: rc.cpp:679
+#. 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 "
@@ -11281,16 +12193,34 @@ msgid ""
 "option."
 msgstr ""
 
-#. i18n: file kmail.kcfg line 182
-#: rc.cpp:682
+#. 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 189
+#. 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 "
@@ -11298,22 +12228,38 @@ msgid ""
 "hand."
 msgstr ""
 
-#. i18n: file kmail.kcfg line 205
-#: rc.cpp:694
+#. 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 206
-#: rc.cpp:697
+#. 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 215
-#: rc.cpp:700
+#. 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 "
@@ -11322,16 +12268,16 @@ msgid ""
 "IMAP resource; this is done in the Trinity Control Center.</p>"
 msgstr ""
 
-#. i18n: file kmail.kcfg line 220
-#: rc.cpp:703
+#. 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 229
-#: rc.cpp:706
+#. i18n: file kmail.kcfg line 247
+#: rc.cpp:724
 #, no-c-format
 msgid ""
 "<p>If the account used for storing groupware information \"\n"
@@ -11342,8 +12288,8 @@ msgid ""
 "          \"mail via an additional online IMAP account.</p>"
 msgstr ""
 
-#. i18n: file kmail.kcfg line 233
-#: rc.cpp:712
+#. i18n: file kmail.kcfg line 251
+#: rc.cpp:730
 #, no-c-format
 msgid ""
 "<p>Choose the storage format of the groupware folders. "
@@ -11356,22 +12302,22 @@ msgid ""
 "Kolab server or a compatible solution.</li></ul></p>"
 msgstr ""
 
-#. i18n: file kmail.kcfg line 242
-#: rc.cpp:715
+#. 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 247
-#: rc.cpp:718
+#. 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 252
-#: rc.cpp:721
+#. 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 "
@@ -11382,102 +12328,90 @@ msgid ""
 "<p>So do not set this unless you have to.</p>"
 msgstr ""
 
-#. i18n: file kmail.kcfg line 258
-#: rc.cpp:724
-#, no-c-format
-msgid "Only filter mails received in disconnected IMAP inbox."
-msgstr ""
-
-#. i18n: file kmail.kcfg line 262
-#: rc.cpp:727
+#. 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 267
-#: rc.cpp:730
+#. 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 276
-#: rc.cpp:733
+#. 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 283
-#: rc.cpp:736
+#. 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 284
-#: rc.cpp:739
+#. 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 292
-#: rc.cpp:742
+#. i18n: file kmail.kcfg line 308
+#: rc.cpp:757
 #, no-c-format
 msgid "Show quick search line edit"
 msgstr ""
 
-#. i18n: file kmail.kcfg line 293
-#: rc.cpp:745
+#. 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 297
-#: rc.cpp:748
-#, no-c-format
-msgid "Show folder quick search line edit"
-msgstr ""
-
-#. i18n: file kmail.kcfg line 301
-#: rc.cpp:751
+#. i18n: file kmail.kcfg line 313
+#: rc.cpp:763
 #, no-c-format
 msgid "Hide local inbox if unused"
 msgstr ""
 
-#. i18n: file kmail.kcfg line 309
-#: rc.cpp:754
+#. i18n: file kmail.kcfg line 321
+#: rc.cpp:766
 #, no-c-format
 msgid "Forward Inline As Default."
 msgstr ""
 
-#. i18n: file kmail.kcfg line 313
-#: rc.cpp:757
+#. 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 316
-#: rc.cpp:760
+#. 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 320
-#: rc.cpp:763
+#. i18n: file kmail.kcfg line 332
+#: rc.cpp:775
 #, fuzzy, no-c-format
 msgid "A&utomatically insert signature"
 msgstr "เพิ่มลายเซ็นท้ายจดหมายอัตโนมัติ"
 
-#. i18n: file kmail.kcfg line 325
-#: rc.cpp:766
+#. 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 "
@@ -11485,44 +12419,67 @@ msgid ""
 "        "
 msgstr ""
 
-#. i18n: file kmail.kcfg line 329
-#: rc.cpp:770
+#. 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 333
-#: rc.cpp:773
+#. 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 337
-#: rc.cpp:776
+#. 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 360
-#: rc.cpp:785
+#. 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 386
-#: rc.cpp:791
+#. i18n: file kmail.kcfg line 416
+#: rc.cpp:816
 #, no-c-format
 msgid "Automatically request &message disposition notifications"
 msgstr ""
 
-#. i18n: file kmail.kcfg line 387
-#: rc.cpp:794
+#. i18n: file kmail.kcfg line 417
+#: rc.cpp:819
 #, no-c-format
 msgid ""
 "<qt>"
@@ -11533,28 +12490,28 @@ msgid ""
 "<em>Request Disposition Notification</em>.</p></qt>"
 msgstr ""
 
-#. i18n: file kmail.kcfg line 391
-#: rc.cpp:797
+#. i18n: file kmail.kcfg line 421
+#: rc.cpp:822
 #, no-c-format
 msgid "Use recent addresses for autocompletion"
 msgstr "ใช้ที่อยู่ล่าสุดสำหรับการทำให้สมบูรณ์"
 
-#. i18n: file kmail.kcfg line 392
-#: rc.cpp:800
+#. 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 413
-#: rc.cpp:803
+#. i18n: file kmail.kcfg line 443
+#: rc.cpp:828
 #, no-c-format
 msgid "Autosave interval:"
 msgstr "บันทึกอัตโนมัติทุกช่วงเวลา:"
 
-#. i18n: file kmail.kcfg line 414
-#: rc.cpp:806
+#. 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 "
@@ -11562,93 +12519,112 @@ msgid ""
 "setting it to the value 0."
 msgstr ""
 
-#. i18n: file kmail.kcfg line 418
-#: rc.cpp:809
+#. i18n: file kmail.kcfg line 448
+#: rc.cpp:834
 #, no-c-format
 msgid "Insert signatures above quoted text"
 msgstr ""
 
-#. i18n: file kmail.kcfg line 425
-#: rc.cpp:812
+#. 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 432
-#: rc.cpp:815
+#. 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 436
-#: rc.cpp:818
+#. i18n: file kmail.kcfg line 466
+#: rc.cpp:843
 #, no-c-format
 msgid "Use smart &quoting"
 msgstr "ใช้การอ้างถึงแบบฉลาด"
 
-#. i18n: file kmail.kcfg line 441
-#: rc.cpp:821
+#. 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 443
-#: rc.cpp:824
+#. 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 451
-#: rc.cpp:828
+#. i18n: file kmail.kcfg line 489
+#: rc.cpp:859
 #, fuzzy, no-c-format
 msgid "Type of recipients editor"
 msgstr "ไม่มีผู้รับ"
 
-#. i18n: file kmail.kcfg line 453
-#: rc.cpp:831
+#. 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 468
-#: rc.cpp:835
+#. 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 474
-#: rc.cpp:838
+#. 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 478
-#: rc.cpp:841
+#. 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 483
-#: rc.cpp:844
+#. 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 490
-#: rc.cpp:847
+#. 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 530
-#: rc.cpp:850
+#. 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 "
@@ -11658,88 +12634,102 @@ msgid ""
 "As a default the encoding configured for the whole system is used."
 msgstr ""
 
-#. i18n: file kmail.kcfg line 536
-#: rc.cpp:853
+#. 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 542
-#: rc.cpp:859
+#. 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 547
-#: rc.cpp:865
+#. 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 550
-#: rc.cpp:868
+#. i18n: file kmail.kcfg line 592
+#: rc.cpp:902
 #, no-c-format
 msgid "Automatic collapse level:"
 msgstr "ระดับการยุบอัตโนมัติ:"
 
-#. i18n: file kmail.kcfg line 558
-#: rc.cpp:871
+#. 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 559
-#: rc.cpp:874
+#. 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 570
-#: rc.cpp:877
+#. 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 571
-#: rc.cpp:880
+#. 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 576
-#: rc.cpp:883
+#. 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 580
-#: rc.cpp:886
+#. 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 585
-#: rc.cpp:889
+#. 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 599
-#: rc.cpp:892
+#. 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 600
-#: rc.cpp:895
+#. i18n: file kmail.kcfg line 648
+#: rc.cpp:935
 #, no-c-format
 msgid ""
 "Send Message Disposition Notifications with an empty sender string. Some "
@@ -11747,90 +12737,82 @@ msgid ""
 "problems sending MDNs, uncheck this option."
 msgstr ""
 
-#. i18n: file kmail.kcfg line 606
-#: rc.cpp:898
+#. 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 607
-#: rc.cpp:901
+#. 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 611
-#: rc.cpp:904
+#. 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 616
-#: rc.cpp:907
+#. i18n: file kmail.kcfg line 664
+#: rc.cpp:947
 #, no-c-format
 msgid "Message template for reply"
 msgstr ""
 
-#. i18n: file kmail.kcfg line 621
-#: rc.cpp:910
+#. 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 626
-#: rc.cpp:913
+#. i18n: file kmail.kcfg line 674
+#: rc.cpp:953
 #, no-c-format
 msgid "Message template for forward"
 msgstr ""
 
-#. i18n: file kmail.kcfg line 631
-#: rc.cpp:916
+#. i18n: file kmail.kcfg line 679
+#: rc.cpp:956
 #, fuzzy, no-c-format
 msgid "Quote characters"
 msgstr "เพิ่มอักขระอ้างถึง"
 
-#. i18n: file kmail.kcfg line 640
-#: rc.cpp:919
+#. 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 644
-#: rc.cpp:922
+#. 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 648
-#: rc.cpp:925
+#. 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 652
-#: rc.cpp:928
+#. 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 656
-#: rc.cpp:931
+#. i18n: file kmail.kcfg line 704
+#: rc.cpp:971
 #, no-c-format
 msgid ""
 "Check if there is still an active out-of-office reply configured when starting "
 "KMail."
 msgstr ""
 
-#: recipientseditor.cpp:100
-msgid "To"
-msgstr "ถึง"
-
-#: recipientseditor.cpp:102
-msgid "CC"
-msgstr "สำเนาถึง"
-
 #: recipientseditor.cpp:104
 msgid "BCC"
 msgstr "ซ่อนสำเนาถึง"
@@ -11843,51 +12825,51 @@ msgstr "<ยังไม่ระบุประเภทของผู้ร�
 msgid "Select type of recipient"
 msgstr "เลือกประเภทของผู้รับ"
 
-#: recipientseditor.cpp:181
+#: recipientseditor.cpp:163
+msgid "Set the list of email addresses to receive this message"
+msgstr ""
+
+#: recipientseditor.cpp:183
 msgid "Remove recipient line"
 msgstr "ลบบรรทัดผู้รับ"
 
-#: recipientseditor.cpp:737
+#: recipientseditor.cpp:739
 msgid "<b>To:</b><br/>"
 msgstr "<b>ถึง:</b><br/>"
 
-#: recipientseditor.cpp:738
+#: recipientseditor.cpp:740
 msgid "<b>CC:</b><br/>"
 msgstr "<b>สำเนาถึง:</b><br/>"
 
-#: recipientseditor.cpp:739
+#: recipientseditor.cpp:741
 msgid "<b>BCC:</b><br/>"
 msgstr "<b>ซ่อนสำเนาถึง:</b><br/>"
 
-#: recipientseditor.cpp:766
+#: recipientseditor.cpp:768
 msgid "Save List..."
 msgstr "บันทึกรายการ..."
 
-#: recipientseditor.cpp:772
+#: recipientseditor.cpp:774
 #, fuzzy
 msgid "Save recipients as distribution list"
 msgstr "รายการผู้รวบรวมโปรแกรม"
 
-#: recipientseditor.cpp:774
-msgid "Se&lect..."
-msgstr "เลือก..."
-
-#: recipientseditor.cpp:777
+#: recipientseditor.cpp:779
 msgid "Select recipients from address book"
 msgstr "เลือกผู้รับจากสมุดที่อยู่"
 
-#: recipientseditor.cpp:810
+#: recipientseditor.cpp:812
 msgid "No recipients"
 msgstr "ไม่มีผู้รับ"
 
-#: recipientseditor.cpp:811
+#: recipientseditor.cpp:813
 #, c-format
 msgid ""
 "_n: 1 recipient\n"
 "%n recipients"
 msgstr "ผู้รับ %n คน"
 
-#: recipientseditor.cpp:914
+#: recipientseditor.cpp:917
 msgid "Truncating recipients list to %1 of %2 entries."
 msgstr "ตัดรายการผู้รับเป็น %1 รายการ จาก %2 รายการ"
 
@@ -11976,11 +12958,11 @@ msgid ""
 "available addresses."
 msgstr ""
 
-#: redirectdialog.cpp:107
+#: redirectdialog.cpp:116
 msgid "You cannot redirect the message without an address."
 msgstr ""
 
-#: redirectdialog.cpp:108
+#: redirectdialog.cpp:117
 msgid "Empty Redirection Address"
 msgstr ""
 
@@ -12114,82 +13096,82 @@ msgstr "ค้นหาเฉพาะใน:"
 msgid "I&nclude sub-folders"
 msgstr "รวมโฟลเดอร์ย่อยด้วย"
 
-#: searchwindow.cpp:226
+#: searchwindow.cpp:225
 msgid "Sender/Receiver"
 msgstr "ผู้ส่ง/ผู้รับ"
 
-#: searchwindow.cpp:249
+#: searchwindow.cpp:250
 msgid "Search folder &name:"
 msgstr "ค้นโฟลเดอร์ชื่อ:"
 
-#: searchwindow.cpp:259
+#: searchwindow.cpp:260
 #, fuzzy
 msgid "Op&en Search Folder"
 msgstr "ลบการค้นหา"
 
-#: searchwindow.cpp:268
+#: searchwindow.cpp:269
 #, fuzzy
 msgid "Open &Message"
 msgstr "จดหมาย"
 
-#: searchwindow.cpp:274
+#: searchwindow.cpp:275
 msgid "AMiddleLengthText..."
 msgstr ""
 
-#: searchwindow.cpp:275
+#: searchwindow.cpp:276
 msgid "Ready."
 msgstr "พร้อม"
 
-#: searchwindow.cpp:356
+#: searchwindow.cpp:357
 msgid "Clear Selection"
 msgstr "ล้างส่วนการเลือก"
 
-#: searchwindow.cpp:415
+#: searchwindow.cpp:416
 #, fuzzy, c-format
 msgid ""
 "_n: %n message searched\n"
 "%n messages searched"
 msgstr "ประมวลผลแล้ว %n ฉบับ"
 
-#: searchwindow.cpp:418
+#: searchwindow.cpp:419
 #, fuzzy
 msgid "Done."
 msgstr "เรียบร้อยแล้ว"
 
-#: searchwindow.cpp:419
+#: searchwindow.cpp:420
 #, fuzzy
 msgid ""
 "_n: %n match in %1\n"
 "%n matches in %1"
 msgstr "พบทั้งสิ้น %n ที่ (%1)"
 
-#: searchwindow.cpp:422
+#: searchwindow.cpp:423
 #, fuzzy
 msgid "Search canceled."
 msgstr "ยกเลิกการค้นหาแล้ว"
 
-#: searchwindow.cpp:423
+#: searchwindow.cpp:424
 #, fuzzy
 msgid ""
 "_n: %n match so far in %1\n"
 "%n matches so far in %1"
 msgstr "พบทั้งสิ้น %n แห่ง (%1)"
 
-#: searchwindow.cpp:427
+#: searchwindow.cpp:428
 #, fuzzy, c-format
 msgid ""
 "_n: %n message\n"
 "%n messages"
 msgstr "จดหมายทั้งหมด %n ฉบับ, %1"
 
-#: searchwindow.cpp:428
+#: searchwindow.cpp:429
 #, c-format
 msgid ""
 "_n: %n match\n"
 "%n matches"
 msgstr "พบทั้งสิ้น %n ที่"
 
-#: searchwindow.cpp:429
+#: searchwindow.cpp:430
 #, fuzzy
 msgid "Searching in %1. %2 searched so far"
 msgstr "กำลังค้นหาใน %1 (จดหมาย %2)"
@@ -12220,19 +13202,19 @@ msgid ""
 "\n"
 msgstr ""
 
-#: sievedebugdialog.cpp:230
+#: sievedebugdialog.cpp:256
 msgid ""
 "Collecting data for account '%1'...\n"
 msgstr ""
 "กำลังรวบรวมข้อมูลสำหรับบัญชีผู้ใช้ '%1'...\n"
 
-#: sievedebugdialog.cpp:231
+#: sievedebugdialog.cpp:257
 msgid ""
 "------------------------------------------------------------\n"
 msgstr ""
 "------------------------------------------------------------\n"
 
-#: sievedebugdialog.cpp:239
+#: sievedebugdialog.cpp:265
 msgid ""
 "(Account does not support Sieve)\n"
 "\n"
@@ -12240,7 +13222,7 @@ msgstr ""
 "(บัญชีผู้ใช้ไม่รองรับสคริปต์กรอง)\n"
 "\n"
 
-#: sievedebugdialog.cpp:266
+#: sievedebugdialog.cpp:278
 msgid ""
 "(Account is not an IMAP account)\n"
 "\n"
@@ -12248,13 +13230,13 @@ msgstr ""
 "(บัญชีผู้ใช้ไม่ใช่แบบ IMAP)\n"
 "\n"
 
-#: sievedebugdialog.cpp:286
+#: sievedebugdialog.cpp:298
 msgid ""
 "Contents of script '%1':\n"
 msgstr ""
 "เนื้อหาของสคริปต์ '%1':\n"
 
-#: sievedebugdialog.cpp:321
+#: sievedebugdialog.cpp:320
 msgid ""
 "(This script is empty.)\n"
 "\n"
@@ -12262,7 +13244,7 @@ msgstr ""
 "(สคริปต์ว่างเปล่า)\n"
 "\n"
 
-#: sievedebugdialog.cpp:326
+#: sievedebugdialog.cpp:325
 msgid ""
 "------------------------------------------------------------\n"
 "%1\n"
@@ -12274,23 +13256,23 @@ msgstr ""
 "------------------------------------------------------------\n"
 "\n"
 
-#: sievedebugdialog.cpp:342
+#: sievedebugdialog.cpp:341
 msgid ""
 "Sieve capabilities:\n"
 msgstr ""
 "ความสามารถของสคริปต์กรอง:\n"
 
-#: sievedebugdialog.cpp:346
+#: sievedebugdialog.cpp:345
 msgid "(No special capabilities available)"
 msgstr "(ไม่มีคุณสมบัติพิเศษ)"
 
-#: sievedebugdialog.cpp:355
+#: sievedebugdialog.cpp:354
 msgid ""
 "Available Sieve scripts:\n"
 msgstr ""
 "สคริปต์กรองที่มีอยู่:\n"
 
-#: sievedebugdialog.cpp:359
+#: sievedebugdialog.cpp:358
 msgid ""
 "(No Sieve scripts available on this server)\n"
 "\n"
@@ -12298,7 +13280,7 @@ msgstr ""
 "(ไม่มีสคริปต์กรองบนเซิร์ฟเวอร์นี้)\n"
 "\n"
 
-#: sievedebugdialog.cpp:367
+#: sievedebugdialog.cpp:366
 msgid ""
 "Active script: %1\n"
 "\n"
@@ -12306,7 +13288,7 @@ msgstr ""
 "สคริปต์ที่ใช้อยู่: %1\n"
 "\n"
 
-#: sievedebugdialog.cpp:394 vacation.cpp:714
+#: sievedebugdialog.cpp:393 vacation.cpp:721
 msgid ""
 "Sieve script installed successfully on the server.\n"
 "Out of Office reply is now active."
@@ -12314,7 +13296,7 @@ msgstr ""
 "ติดตั้งสคริปต์กรองบนเซิร์ฟเวอร์เรียบร้อยแล้ว\n"
 "การตอบกลับ Out of Office ทำงานแล้ว"
 
-#: sievedebugdialog.cpp:396 vacation.cpp:716
+#: sievedebugdialog.cpp:395 vacation.cpp:723
 msgid ""
 "Sieve script installed successfully on the server.\n"
 "Out of Office reply has been deactivated."
@@ -12397,19 +13379,23 @@ msgstr "คำสั่งที่จะใช้:"
 msgid "New entry:"
 msgstr "รายการใหม่:"
 
-#: simplestringlisteditor.cpp:205
+#: simplestringlisteditor.cpp:214
 msgid "New Value"
 msgstr "ค่าใหม่"
 
-#: simplestringlisteditor.cpp:225
+#: simplestringlisteditor.cpp:235
 msgid "Change Value"
 msgstr "เปลี่ยนค่า"
 
-#: snippetdlg.cpp:71
+#: snippetdlg.cpp:78
 #, fuzzy
 msgid "Sh&ortcut:"
 msgstr "ปุ่มพิมพ์ลัด:"
 
+#: snippetitem.cpp:133 snippetwidget.cpp:171
+msgid "GROUP"
+msgstr ""
+
 #: snippetwidget.cpp:148
 #, c-format
 msgid "Snippet %1"
@@ -12494,8 +13480,8 @@ msgstr "ตั้งเป็นค่าปริยาย"
 
 #: subscriptiondialog.cpp:376
 msgid ""
-"Currently subscriptions are not used for server %1\n"
-"do you want to enable subscriptions?"
+"Currently subscriptions are not used for server. %1\n"
+"Do you want to enable subscriptions?"
 msgstr ""
 
 #: subscriptiondialog.cpp:378
@@ -12511,34 +13497,39 @@ msgstr "เปิดใช้"
 msgid "Do Not Enable"
 msgstr "ไม่เปิดใช้"
 
-#: templateparser.cpp:238 templateparser.cpp:271
+#: templateparser.cpp:263 templateparser.cpp:296
 #, fuzzy
 msgid "Cannot insert content from file %1: %2"
 msgstr ""
 "ไม่สามารถเปิดแฟ้ม: \"%1\" ได้:\n"
 "%2"
 
-#: templateparser.cpp:1009 templateparser.cpp:1013
+#: templateparser.cpp:970
+#, fuzzy, c-format
+msgid "Attachment %1"
+msgstr "สิ่งที่แนบมาด้วย: "
+
+#: templateparser.cpp:1150 templateparser.cpp:1154
 #, fuzzy
 msgid "Pipe command exit with status %1: %2"
 msgstr ""
 "คำสั่งจบการทำงานด้วยรหัส %1:\n"
 "%2"
 
-#: templateparser.cpp:1024 templateparser.cpp:1028
+#: templateparser.cpp:1165 templateparser.cpp:1169
 msgid "Pipe command killed by signal %1: %2"
 msgstr ""
 
-#: templateparser.cpp:1040
+#: templateparser.cpp:1181
 msgid "Pipe command did not finish within %1 seconds: %2"
 msgstr ""
 
-#: templateparser.cpp:1052 templateparser.cpp:1055
+#: templateparser.cpp:1193 templateparser.cpp:1196
 #, c-format
 msgid "Cannot write to process stdin: %1"
 msgstr ""
 
-#: templateparser.cpp:1063
+#: templateparser.cpp:1204
 #, c-format
 msgid "Cannot start pipe command from template: %1"
 msgstr ""
@@ -12588,56 +13579,64 @@ msgstr ""
 "------------------------------------------------------------\n"
 
 #: templatesconfiguration.cpp:392
+#, fuzzy
 msgid ""
 "%REM=\"Default forward template\"%-\n"
 "\n"
 "----------  %1  ----------\n"
 "\n"
 "Subject: %OFULLSUBJECT\n"
-"Date: %ODATE\n"
+"Date: %ODATE, %OTIMELONG\n"
 "From: %OFROMADDR\n"
-"To: %OTOADDR\n"
+"%OADDRESSEESADDR\n"
 "\n"
 "%TEXT\n"
 "-------------------------------------------------------\n"
 msgstr ""
+"------------------------------------------------------------\n"
 
 #: templatesconfiguration.cpp:511
 msgid ""
 "%REM=\"Default new message template\"%-\n"
-"%BLANK"
+"%BLANK\n"
+"%BLANK\n"
+"%BLANK\n"
 msgstr ""
 
-#: templatesconfiguration.cpp:518
+#: templatesconfiguration.cpp:520
 msgid ""
+"%CURSOR\n"
+"%BLANK\n"
 "%REM=\"Default reply template\"%-\n"
 "On %ODATEEN %OTIMELONGEN you wrote:\n"
 "%QUOTE\n"
-"%CURSOR\n"
 msgstr ""
 
-#: templatesconfiguration.cpp:527
+#: templatesconfiguration.cpp:530
 msgid ""
+"%CURSOR\n"
+"%BLANK\n"
 "%REM=\"Default reply all template\"%-\n"
 "On %ODATEEN %OTIMELONGEN %OFROMNAME wrote:\n"
 "%QUOTE\n"
-"%CURSOR\n"
 msgstr ""
 
-#: templatesconfiguration.cpp:536
+#: templatesconfiguration.cpp:541
+#, fuzzy
 msgid ""
 "%REM=\"Default forward template\"%-\n"
 "\n"
 "----------  Forwarded Message  ----------\n"
 "\n"
 "Subject: %OFULLSUBJECT\n"
-"Date: %ODATE\n"
+"Date: %ODATE, %OTIMELONG\n"
 "From: %OFROMADDR\n"
-"To: %OTOADDR\n"
+"%OADDRESSEESADDR\n"
 "\n"
 "%TEXT\n"
 "-------------------------------------------------------\n"
 msgstr ""
+"------------------------------------------------------------\n"
 
 #: templatesinsertcommand.cpp:37
 #, fuzzy
@@ -12664,166 +13663,171 @@ msgstr "จดหมายสิ่งที่จะทำ"
 msgid "Message Text as Is"
 msgstr "จดหมายเป็นข้อความธรรมดา"
 
-#: templatesinsertcommand.cpp:62 templatesinsertcommand.cpp:163
+#: templatesinsertcommand.cpp:62 templatesinsertcommand.cpp:166
 #, fuzzy
 msgid "Message Id"
 msgstr "เนื้อความจดหมาย"
 
-#: templatesinsertcommand.cpp:70 templatesinsertcommand.cpp:171
+#: templatesinsertcommand.cpp:70 templatesinsertcommand.cpp:174
 msgid "Date in Short Format"
 msgstr ""
 
-#: templatesinsertcommand.cpp:74 templatesinsertcommand.cpp:175
+#: templatesinsertcommand.cpp:74 templatesinsertcommand.cpp:178
 msgid "Date in C Locale"
 msgstr ""
 
-#: templatesinsertcommand.cpp:78 templatesinsertcommand.cpp:179
+#: templatesinsertcommand.cpp:78 templatesinsertcommand.cpp:182
 msgid "Day of Week"
 msgstr ""
 
-#: templatesinsertcommand.cpp:82 templatesinsertcommand.cpp:183
+#: templatesinsertcommand.cpp:82 templatesinsertcommand.cpp:186
 msgid "Time"
 msgstr ""
 
-#: templatesinsertcommand.cpp:86 templatesinsertcommand.cpp:187
+#: templatesinsertcommand.cpp:86 templatesinsertcommand.cpp:190
 msgid "Time in Long Format"
 msgstr ""
 
-#: templatesinsertcommand.cpp:90 templatesinsertcommand.cpp:191
+#: templatesinsertcommand.cpp:90 templatesinsertcommand.cpp:194
 msgid "Time in C Locale"
 msgstr ""
 
-#: templatesinsertcommand.cpp:94 templatesinsertcommand.cpp:195
+#: templatesinsertcommand.cpp:94 templatesinsertcommand.cpp:198
 #, fuzzy
 msgid "To Field Address"
 msgstr "ที่อยู่อีเมล"
 
-#: templatesinsertcommand.cpp:98 templatesinsertcommand.cpp:199
+#: templatesinsertcommand.cpp:98 templatesinsertcommand.cpp:202
 msgid "To Field Name"
 msgstr ""
 
-#: templatesinsertcommand.cpp:102 templatesinsertcommand.cpp:203
+#: templatesinsertcommand.cpp:102 templatesinsertcommand.cpp:206
 msgid "To Field First Name"
 msgstr ""
 
-#: templatesinsertcommand.cpp:106 templatesinsertcommand.cpp:207
+#: templatesinsertcommand.cpp:106 templatesinsertcommand.cpp:210
 msgid "To Field Last Name"
 msgstr ""
 
-#: templatesinsertcommand.cpp:110 templatesinsertcommand.cpp:211
+#: templatesinsertcommand.cpp:110 templatesinsertcommand.cpp:214
 #, fuzzy
 msgid "CC Field Address"
 msgstr "ที่อยู่อีเมล"
 
-#: templatesinsertcommand.cpp:114 templatesinsertcommand.cpp:215
+#: templatesinsertcommand.cpp:114 templatesinsertcommand.cpp:218
 msgid "CC Field Name"
 msgstr ""
 
-#: templatesinsertcommand.cpp:118 templatesinsertcommand.cpp:219
+#: templatesinsertcommand.cpp:118 templatesinsertcommand.cpp:222
 msgid "CC Field First Name"
 msgstr ""
 
-#: templatesinsertcommand.cpp:122 templatesinsertcommand.cpp:223
+#: templatesinsertcommand.cpp:122 templatesinsertcommand.cpp:226
 msgid "CC Field Last Name"
 msgstr ""
 
-#: templatesinsertcommand.cpp:126 templatesinsertcommand.cpp:227
+#: templatesinsertcommand.cpp:126 templatesinsertcommand.cpp:230
 #, fuzzy
 msgid "From Field Address"
 msgstr "ที่อยู่อีเมล"
 
-#: templatesinsertcommand.cpp:130 templatesinsertcommand.cpp:231
+#: templatesinsertcommand.cpp:130 templatesinsertcommand.cpp:234
 msgid "From Field Name"
 msgstr ""
 
-#: templatesinsertcommand.cpp:134 templatesinsertcommand.cpp:235
+#: templatesinsertcommand.cpp:134 templatesinsertcommand.cpp:238
 msgid "From Field First Name"
 msgstr ""
 
-#: templatesinsertcommand.cpp:138 templatesinsertcommand.cpp:239
+#: templatesinsertcommand.cpp:138 templatesinsertcommand.cpp:242
 msgid "From Field Last Name"
 msgstr ""
 
-#: templatesinsertcommand.cpp:146
+#: templatesinsertcommand.cpp:142
+#, fuzzy
+msgid "Addresses of all original recipients"
+msgstr "ผู้รับไม่ถูกต้อง"
+
+#: templatesinsertcommand.cpp:149
 #, fuzzy
 msgid "Quoted Headers"
 msgstr "เอาหัวจดหมายออก"
 
-#: templatesinsertcommand.cpp:150
+#: templatesinsertcommand.cpp:153
 #, fuzzy
 msgid "Headers as Is"
 msgstr "เพิ่มหัวจดหมาย"
 
-#: templatesinsertcommand.cpp:154 templatesinsertcommand.cpp:247
+#: templatesinsertcommand.cpp:157 templatesinsertcommand.cpp:250
 #, fuzzy
 msgid "Header Content"
 msgstr "เนื้อหาในโฟลเดอร์:"
 
-#: templatesinsertcommand.cpp:160
+#: templatesinsertcommand.cpp:163
 #, fuzzy
 msgid "Current Message"
 msgstr "จดหมาย"
 
-#: templatesinsertcommand.cpp:253
+#: templatesinsertcommand.cpp:256
 msgid "Process With External Programs"
 msgstr ""
 
-#: templatesinsertcommand.cpp:256
+#: templatesinsertcommand.cpp:259
 msgid "Insert Result of Command"
 msgstr ""
 
-#: templatesinsertcommand.cpp:260
+#: templatesinsertcommand.cpp:263
 msgid "Pipe Original Message Body and Insert Result as Quoted Text"
 msgstr ""
 
-#: templatesinsertcommand.cpp:264
+#: templatesinsertcommand.cpp:267
 msgid "Pipe Original Message Body and Insert Result as Is"
 msgstr ""
 
-#: templatesinsertcommand.cpp:268
+#: templatesinsertcommand.cpp:271
 msgid "Pipe Original Message with Headers and Insert Result as Is"
 msgstr ""
 
-#: templatesinsertcommand.cpp:272
+#: templatesinsertcommand.cpp:275
 msgid "Pipe Current Message Body and Insert Result as Is"
 msgstr ""
 
-#: templatesinsertcommand.cpp:276
+#: templatesinsertcommand.cpp:279
 msgid "Pipe Current Message Body and Replace with Result"
 msgstr ""
 
-#: templatesinsertcommand.cpp:285
+#: templatesinsertcommand.cpp:288
 msgid "Set Cursor Position"
 msgstr ""
 
-#: templatesinsertcommand.cpp:289
+#: templatesinsertcommand.cpp:292
 #, fuzzy
 msgid "Insert File Content"
 msgstr "แทรกแฟ้มที่ใช้ล่าสุด"
 
-#: templatesinsertcommand.cpp:293
+#: templatesinsertcommand.cpp:296
 msgid "DNL"
 msgstr ""
 
-#: templatesinsertcommand.cpp:297
+#: templatesinsertcommand.cpp:300
 msgid "Template Comment"
 msgstr ""
 
-#: templatesinsertcommand.cpp:301
+#: templatesinsertcommand.cpp:304
 #, fuzzy
 msgid "No Operation"
 msgstr "ปฏิบัติการของเซิร์ฟเวอร์"
 
-#: templatesinsertcommand.cpp:305
+#: templatesinsertcommand.cpp:308
 #, fuzzy
 msgid "Clear Generated Message"
 msgstr "ฉบับที่ยังไม่ได้อ่านถัดไป"
 
-#: templatesinsertcommand.cpp:309
+#: templatesinsertcommand.cpp:312
 msgid "Turn Debug On"
 msgstr ""
 
-#: templatesinsertcommand.cpp:313
+#: templatesinsertcommand.cpp:316
 msgid "Turn Debug Off"
 msgstr ""
 
@@ -12913,62 +13917,72 @@ msgstr ""
 msgid "There is nothing to undo."
 msgstr "ไม่มีรายการที่จะเลิกทำ"
 
-#: urlhandlermanager.cpp:422
+#: urlhandlermanager.cpp:482
 msgid "Turn on HTML rendering for this message."
 msgstr "เปิดใช้การแสดงผล HTML สำหรับจดหมายฉบับนี้"
 
-#: urlhandlermanager.cpp:424
+#: urlhandlermanager.cpp:484
 msgid "Load external references from the Internet for this message."
 msgstr "อนุญาตให้จดหมายโหลดส่วนที่อ้างถึงภายนอกจากอินเตอร์เน็ตได้"
 
-#: urlhandlermanager.cpp:426
+#: urlhandlermanager.cpp:486
 #, fuzzy
 msgid "Work online."
 msgstr "ทำงานออนไลน์"
 
-#: urlhandlermanager.cpp:428
+#: urlhandlermanager.cpp:488
 #, fuzzy
 msgid "Decrypt message."
 msgstr "จดหมายถูกเข้ารหัสไว้"
 
-#: urlhandlermanager.cpp:430
+#: urlhandlermanager.cpp:490
 #, fuzzy
 msgid "Show signature details."
 msgstr "ไม่พบลายเซ็น"
 
-#: urlhandlermanager.cpp:432
+#: urlhandlermanager.cpp:492
 #, fuzzy
 msgid "Hide signature details."
 msgstr "ลายเซ็นใช้ได้"
 
-#: urlhandlermanager.cpp:464
+#: urlhandlermanager.cpp:494
+#, fuzzy
+msgid "Hide attachment list"
+msgstr "บันทึกสิ่งที่แนบมาด้วยเป็น"
+
+#: urlhandlermanager.cpp:496
+#, fuzzy
+msgid "Show attachment list"
+msgstr "แสดงไอคอนสำหรับสิ่งที่แนบมาด้วย"
+
+#: urlhandlermanager.cpp:528
 msgid "Expand all quoted text."
 msgstr "ขยายส่วนที่อ้างถึงทั้งหมด"
 
-#: urlhandlermanager.cpp:466
+#: urlhandlermanager.cpp:531
 msgid "Collapse quoted text."
 msgstr "ยุบส่วนที่อ้างถึง"
 
-#: urlhandlermanager.cpp:487
+#: urlhandlermanager.cpp:554
 #, fuzzy
 msgid "Could not start certificate manager. Please check your installation."
 msgstr "ไม่สามารถเริ่มตัวจัดการใบรับรองได้ โปรดตรวจสอบการติดตั้งของคุณ !"
 
-#: urlhandlermanager.cpp:497
+#: urlhandlermanager.cpp:564
 #, c-format
 msgid "Show certificate 0x%1"
 msgstr "แสดงใบรับรอง 0x%1"
 
-#: urlhandlermanager.cpp:552
+#: urlhandlermanager.cpp:693
 #, fuzzy
 msgid "Attachment #%1 (unnamed)"
 msgstr "สิ่งที่แนบมาด้วย #1 (ยังไม่มีชื่อ)"
 
-#: urlhandlermanager.cpp:581
+#: urlhandlermanager.cpp:724
 msgid "Show GnuPG Audit Log for this operation"
 msgstr ""
 
-#: vacation.cpp:562
+#: vacation.cpp:566
 msgid ""
 "I am out of office till %1.\n"
 "\n"
@@ -12982,7 +13996,7 @@ msgid ""
 "-- <enter your name and email address here>\n"
 msgstr ""
 
-#: vacation.cpp:606
+#: vacation.cpp:612
 msgid ""
 "Your server did not list \"vacation\" in its list of supported Sieve "
 "extensions;\n"
@@ -12990,28 +14004,28 @@ msgid ""
 "Please contact you system administrator."
 msgstr ""
 
-#: vacation.cpp:616
+#: vacation.cpp:622
 msgid "Configure \"Out of Office\" Replies"
 msgstr ""
 
-#: vacation.cpp:626
+#: vacation.cpp:632
 msgid ""
 "Someone (probably you) changed the vacation script on the server.\n"
 "KMail is no longer able to determine the parameters for the autoreplies.\n"
 "Default values will be used."
 msgstr ""
 
-#: vacation.cpp:651
+#: vacation.cpp:657
 msgid ""
 "There is still an active out-of-office reply configured.\n"
 "Do you want to edit it?"
 msgstr ""
 
-#: vacation.cpp:652
+#: vacation.cpp:658
 msgid "Out-of-office reply still active"
 msgstr ""
 
-#: vacation.cpp:653
+#: vacation.cpp:659
 #, fuzzy
 msgid "Ignore"
 msgstr "ไม่สนใจ"
@@ -13025,45 +14039,45 @@ msgstr ""
 msgid "&Activate vacation notifications"
 msgstr "การแจ้งเตือนเมื่อมีจดหมายใหม่"
 
-#: vacationdialog.cpp:76
+#: vacationdialog.cpp:78
 #, fuzzy
 msgid "&Resend notification only after:"
 msgstr "โฟลเดอร์เป้าหมาย:"
 
-#: vacationdialog.cpp:82
+#: vacationdialog.cpp:84
 #, fuzzy
 msgid "&Send responses for these addresses:"
 msgstr "ส่งจดหมายไปยัง 'ที่อยู่'"
 
-#: vacationdialog.cpp:87
+#: vacationdialog.cpp:89
 #, fuzzy
 msgid "Do not send vacation replies to spam messages"
 msgstr "แจ้งเตือนเมื่อพยายามส่งจดหมายที่ไม่ได้เข้ารหัสไว้"
 
-#: vacationdialog.cpp:93
+#: vacationdialog.cpp:95
 msgid "Only react to mail coming from domain"
 msgstr ""
 
-#: vcardviewer.cpp:41
+#: vcardviewer.cpp:45
 #, fuzzy
 msgid "VCard Viewer"
 msgstr "ตัวแสดง VCard"
 
-#: vcardviewer.cpp:42
+#: vcardviewer.cpp:46
 msgid "&Import"
 msgstr "นำเข้า"
 
-#: vcardviewer.cpp:42
+#: vcardviewer.cpp:46
 #, fuzzy
 msgid "&Next Card"
 msgstr "ฉบับที่ยังไม่ได้อ่านถัดไป"
 
-#: vcardviewer.cpp:42
+#: vcardviewer.cpp:46
 #, fuzzy
 msgid "&Previous Card"
 msgstr "ฉบับก่อนหน้านี้"
 
-#: vcardviewer.cpp:62
+#: vcardviewer.cpp:70
 msgid "Failed to parse vCard."
 msgstr ""
 
@@ -13262,7 +14276,7 @@ msgstr ""
 msgid "To Do"
 msgstr "ถึง: "
 
-#: kmsearchpattern.h:233
+#: kmsearchpattern.h:234
 #, fuzzy
 msgid "Has Attachment"
 msgstr "เปิดสิ่งที่แนบมาด้วยหรือไม่ ?"
@@ -13271,6 +14285,11 @@ msgstr "เปิดสิ่งที่แนบมาด้วยหรือ
 msgid "%1 of %2 %3 used"
 msgstr ""
 
+#: simplefoldertree.h:142 simplefoldertree.h:202 simplefoldertree.h:236
+#: simplefoldertree.h:238
+msgid "Path"
+msgstr ""
+
 #: util.h:208
 #, fuzzy
 msgid ""
@@ -13282,6 +14301,23 @@ msgstr "มีแฟ้มชื่อนี้อยู่แล้ว คุ�
 msgid "Overwrite File?"
 msgstr "แทรกแฟ้ม"
 
+#, fuzzy
+#~ msgid "Show folder quick search field"
+#~ msgstr "แสดงแถบค้นหาด่วน"
+
+#, fuzzy
+#~ msgid ""
+#~ "_: recipient address field\n"
+#~ "&To:"
+#~ msgstr "แสดงที่อยู่ล่าสุด"
+
+#, fuzzy
+#~ msgid "&Copy to (CC):"
+#~ msgstr "สำเนาไปยัง"
+
+#~ msgid "Retrieving new messages"
+#~ msgstr "กำลังรับจดหมายใหม่"
+
 #~ msgid "Op&en"
 #~ msgstr "เปิด"
 
@@ -13494,9 +14530,6 @@ msgstr "แทรกแฟ้ม"
 #~ msgid "Always"
 #~ msgstr "เสมอ"
 
-#~ msgid "After"
-#~ msgstr "หลังจาก"
-
 #, fuzzy
 #~ msgid "Warn if CA certificate e&xpires in less than:"
 #~ msgstr "แจ้งเตือน หากองค์กรผู้ออกใบรับรองจะหมดอายุภายใน"
@@ -13505,10 +14538,6 @@ msgstr "แทรกแฟ้ม"
 #~ msgid "Warn if s&ignature certificate expires in less than:"
 #~ msgstr "แจ้งเตือนหากใบรับรองลายเซ็นจะหมดอายุภายใน"
 
-#, fuzzy
-#~ msgid "Warn if root certificate expires in &less than:"
-#~ msgstr "แจ้งเตือน หากรากของใบรับรองจะหมดอายุภายใน"
-
 #~ msgid "Warn if signer's email address is &not in certificate"
 #~ msgstr "แจ้งเตือนหากที่อยู่อีเมล์ของผู้เซ็นไม่อยู่ในใบรับรอง"
 
diff --git a/tde-i18n-th/messages/tdepim/kmail_text_calendar_plugin.po b/tde-i18n-th/messages/tdepim/kmail_text_calendar_plugin.po
index 23ca3dffc9b..2785736d427 100644
--- a/tde-i18n-th/messages/tdepim/kmail_text_calendar_plugin.po
+++ b/tde-i18n-th/messages/tdepim/kmail_text_calendar_plugin.po
@@ -4,94 +4,279 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: kmail_text_calendar_plugin\n"
-"POT-Creation-Date: 2008-08-19 01:19+0200\n"
+"POT-Creation-Date: 2014-09-29 00:52-0500\n"
 "PO-Revision-Date: 2006-10-17 12:56+1000\n"
 "Last-Translator: Sahachart Anukulkitch <drrider@gmail.com>\n"
 "Language-Team: Thai <l10n@opentle.org>\n"
+"Language: th\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: KBabel 1.11.4\n"
 
-#: text_calendar.cpp:326
+#: text_calendar.cpp:343
 #, fuzzy
 msgid "Incidence with no summary"
 msgstr "คำตอบ: เหตุการณ์ไม่มีข้อสรุป"
 
-#: text_calendar.cpp:330 text_calendar.cpp:341
+#: text_calendar.cpp:347
 #, c-format
 msgid "Answer: %1"
 msgstr "คำตอบ: %1"
 
-#: text_calendar.cpp:333
+#: text_calendar.cpp:350
 #, c-format
 msgid "Delegated: %1"
 msgstr ""
 
-#: text_calendar.cpp:336
+#: text_calendar.cpp:353
 #, c-format
 msgid "Forwarded: %1"
 msgstr ""
 
-#: text_calendar.cpp:386
+#: text_calendar.cpp:356
+#, c-format
+msgid "Declined Counter Proposal: %1"
+msgstr ""
+
+#: text_calendar.cpp:412
 msgid "Could not save file to KOrganizer"
 msgstr "ไม่สามารถบันทึกแฟ้มลง KOrganizer ได้"
 
-#: text_calendar.cpp:415 text_calendar.cpp:556
+#: text_calendar.cpp:437 text_calendar.cpp:443
+msgid "\"%1\" occurred already."
+msgstr ""
+
+#: text_calendar.cpp:439 text_calendar.cpp:456
+msgid "\"%1\" is currently in-progress."
+msgstr ""
+
+#: text_calendar.cpp:445
+msgid "\"%1\", happening all day today, is currently in-progress."
+msgstr ""
+
+#: text_calendar.cpp:454 text_calendar.cpp:466
+msgid "\"%1\" is past due."
+msgstr ""
+
+#: text_calendar.cpp:460
+msgid "\"%1\" has already started."
+msgstr ""
+
+#: text_calendar.cpp:469
+msgid "\"%1\", happening all-day today, is currently in-progress."
+msgstr ""
+
+#: text_calendar.cpp:474
+msgid "\"%1\", happening all day, has already started."
+msgstr ""
+
+#: text_calendar.cpp:486
+msgid "Do you still want to accept the invitation?"
+msgstr ""
+
+#: text_calendar.cpp:488
+msgid "Do you still want to accept the task?"
+msgstr ""
+
+#: text_calendar.cpp:492
+msgid "Do you still want to send conditional acceptance of the invitation?"
+msgstr ""
+
+#: text_calendar.cpp:494
+msgid "Do you still want to send conditional acceptance of the task?"
+msgstr ""
+
+#: text_calendar.cpp:497
+msgid "Do you still want to accept the counter proposal?"
+msgstr ""
+
+#: text_calendar.cpp:499
+msgid "Do you still want to send a counter proposal?"
+msgstr ""
+
+#: text_calendar.cpp:501
+msgid "Do you still want to send a decline response?"
+msgstr ""
+
+#: text_calendar.cpp:503
+msgid "Do you still want to decline the counter proposal?"
+msgstr ""
+
+#: text_calendar.cpp:505
+msgid "Do you still want to record this reponse in your calendar?"
+msgstr ""
+
+#: text_calendar.cpp:508
+msgid "Do you still want to delegate this invitation?"
+msgstr ""
+
+#: text_calendar.cpp:510
+msgid "Do you still want to delegate this task?"
+msgstr ""
+
+#: text_calendar.cpp:514
+msgid "Do you still want to forward this invitation?"
+msgstr ""
+
+#: text_calendar.cpp:516
+msgid "Do you still want to forward this task?"
+msgstr ""
+
+#: text_calendar.cpp:519
+msgid "Do you still want to check your calendar?"
+msgstr ""
+
+#: text_calendar.cpp:522
+msgid "Do you still want to record this invitation in your calendar?"
+msgstr ""
+
+#: text_calendar.cpp:524
+msgid "Do you still want to record this task in your calendar?"
+msgstr ""
+
+#: text_calendar.cpp:529
+msgid "%1?"
+msgstr ""
+
+#: text_calendar.cpp:534
+msgid ""
+"%1\n"
+"%2"
+msgstr ""
+
+#: text_calendar.cpp:556
 msgid "Reaction to Invitation"
 msgstr ""
 
-#. i18n("Decline Counter Proposal")
-#: text_calendar.cpp:416 text_calendar.cpp:557
+#: text_calendar.cpp:557 text_calendar.cpp:702
 msgid "Comment:"
 msgstr ""
 
-#: text_calendar.cpp:441
+#: text_calendar.cpp:587
 msgid "Delegation to organizer is not possible."
 msgstr ""
 
-#: text_calendar.cpp:648
-msgid "Accept incidence"
+#: text_calendar.cpp:701
+msgid "Decline Counter Proposal"
+msgstr ""
+
+#: text_calendar.cpp:734
+msgid ""
+"You have no writable calendar folders for invitations, so storing or saving a "
+"response will not be possible.\n"
+"Please create at least 1 writable events calendar and re-sync."
+msgstr ""
+
+#: text_calendar.cpp:754
+msgid ""
+"The calendar invitation stored in this email message is broken in some way. "
+"Unable to continue."
+msgstr ""
+
+#: text_calendar.cpp:808
+msgid ""
+"The organizer is not expecting a reply to this invitation but you can send them "
+"an email message if you desire.\n"
+"\n"
+"Would you like to send the organizer a message regarding this invitation?\n"
+"Press the [Cancel] button to cancel the recording operation."
+msgstr ""
+
+#: text_calendar.cpp:812
+#, fuzzy
+msgid "Send Email to Organizer"
+msgstr "ไม่สามารถบันทึกแฟ้มลง KOrganizer ได้"
+
+#: text_calendar.cpp:813
+msgid "Do Not Send"
+msgstr ""
+
+#: text_calendar.cpp:814
+msgid "Send EMail"
+msgstr ""
+
+#: text_calendar.cpp:823
+#, fuzzy, c-format
+msgid "Re: %1"
+msgstr "คำตอบ: %1"
+
+#: text_calendar.cpp:880
+msgid "Open Attachment"
+msgstr ""
+
+#: text_calendar.cpp:881
+msgid "Save Attachment As..."
+msgstr ""
+
+#: text_calendar.cpp:901
+#, fuzzy
+msgid "Accept invitation"
 msgstr "ยอมรับเหตุการณ์"
 
-#: text_calendar.cpp:650
-msgid "Accept incidence conditionally"
+#: text_calendar.cpp:903
+#, fuzzy
+msgid "Accept invitation conditionally"
 msgstr "ยอมรับเหตุการณ์แบบมีเงื่อนไข"
 
-#: text_calendar.cpp:655
+#: text_calendar.cpp:905
+msgid "Accept counter proposal"
+msgstr ""
+
+#: text_calendar.cpp:907
 msgid "Create a counter proposal..."
 msgstr ""
 
-#: text_calendar.cpp:657
+#: text_calendar.cpp:909
 msgid "Throw mail away"
 msgstr "ทิ้งจดหมายไป"
 
-#: text_calendar.cpp:659
-msgid "Decline incidence"
+#: text_calendar.cpp:911
+#, fuzzy
+msgid "Decline invitation"
 msgstr "ทิ้งเหตุการณ์"
 
-#: text_calendar.cpp:664
+#: text_calendar.cpp:913
+msgid "Decline counter proposal"
+msgstr ""
+
+#: text_calendar.cpp:915
 msgid "Check my calendar..."
 msgstr "ตรวจสอบปฏิทินของฉัน"
 
-#: text_calendar.cpp:666
-msgid "Enter incidence into my calendar"
+#: text_calendar.cpp:917
+#, fuzzy
+msgid "Record response into my calendar"
 msgstr "ใส่เหตุการณ์เข้าไปในปฏิทินของฉัน"
 
-#: text_calendar.cpp:668
+#: text_calendar.cpp:919
 #, fuzzy
-msgid "Delegate incidence"
+msgid "Record invitation into my calendar"
+msgstr "ใส่เหตุการณ์เข้าไปในปฏิทินของฉัน"
+
+#: text_calendar.cpp:921
+msgid "Move this invitation to my trash folder"
+msgstr ""
+
+#: text_calendar.cpp:923
+#, fuzzy
+msgid "Delegate invitation"
 msgstr "ทิ้งเหตุการณ์"
 
-#: text_calendar.cpp:670
+#: text_calendar.cpp:925
 #, fuzzy
-msgid "Forward incidence"
+msgid "Forward invitation"
 msgstr "ยอมรับเหตุการณ์"
 
-#: text_calendar.cpp:672
-msgid "Remove incidence from my calendar"
+#: text_calendar.cpp:927
+#, fuzzy
+msgid "Remove invitation from my calendar"
 msgstr "ลบเหตุการณ์ออกจากปฏิทินของฉัน"
 
+#: text_calendar.cpp:930
+msgid "Open attachment \"%1\""
+msgstr ""
+
 #: delegateselector.cpp:32
 msgid "Select delegate"
 msgstr ""
@@ -104,10 +289,10 @@ msgstr ""
 msgid "Keep me informed about status changes of this incidence."
 msgstr ""
 
-#: attendeeselector.cpp:31
+#: attendeeselector.cpp:32
 msgid "Select Attendees"
 msgstr ""
 
-#: attendeeselector.cpp:44
+#: attendeeselector.cpp:45
 msgid "Click to add a new attendee"
 msgstr ""
diff --git a/tde-i18n-th/messages/tdepim/kmail_text_vcard_plugin.po b/tde-i18n-th/messages/tdepim/kmail_text_vcard_plugin.po
index 3928da6bd26..95b447fc750 100644
--- a/tde-i18n-th/messages/tdepim/kmail_text_vcard_plugin.po
+++ b/tde-i18n-th/messages/tdepim/kmail_text_vcard_plugin.po
@@ -4,23 +4,53 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: kmail_text_vcard_plugin\n"
-"POT-Creation-Date: 2004-12-11 01:22+0100\n"
+"POT-Creation-Date: 2014-09-29 00:52-0500\n"
 "PO-Revision-Date: 2006-10-17 12:46+1000\n"
 "Last-Translator: Sahachart Anukulkitch <drrider@gmail.com>\n"
 "Language-Team: Thai <l10n@opentle.org>\n"
+"Language: th\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: KBabel 1.11.4\n"
 
-#: text_vcard.cpp:82
+#: text_vcard.cpp:93
 msgid "Attached business cards"
 msgstr "แนบนามบัตร"
 
-#: text_vcard.cpp:95
+#: text_vcard.cpp:106
 msgid "[Add this contact to the addressbook]"
 msgstr "[เพิ่มรายละเอียดการติดต่อเข้าไปในสมุดที่อยู่]"
 
-#: text_vcard.cpp:134
+#: text_vcard.cpp:176
+#, fuzzy
+msgid "View Business Card"
+msgstr "แนบนามบัตร"
+
+#: text_vcard.cpp:177
+#, fuzzy
+msgid "Save Business Card As..."
+msgstr "แนบนามบัตร"
+
+#: text_vcard.cpp:196
 msgid "Add this contact to the address book."
 msgstr "เพิ่มรายละเอียดการติดต่อนี้เข้าไปในสมุดที่อยู่"
+
+#: text_vcard.cpp:198
+#, fuzzy
+msgid "Add \"%1\" to the address book."
+msgstr "เพิ่มรายละเอียดการติดต่อนี้เข้าไปในสมุดที่อยู่"
+
+#: text_vcard.cpp:208
+#, fuzzy
+msgid "Failed to parse the business card."
+msgstr "แนบนามบัตร"
+
+#: text_vcard.cpp:225
+#, fuzzy
+msgid "Save Business Card"
+msgstr "แนบนามบัตร"
+
+#: text_vcard.cpp:230
+msgid "%1 already exists. Do you want to overwrite it?"
+msgstr ""
diff --git a/tde-i18n-th/messages/tdepim/kmailcvt.po b/tde-i18n-th/messages/tdepim/kmailcvt.po
index 7ed46dd17d5..222965d21c2 100644
--- a/tde-i18n-th/messages/tdepim/kmailcvt.po
+++ b/tde-i18n-th/messages/tdepim/kmailcvt.po
@@ -6,15 +6,28 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: kmailcvt\n"
-"POT-Creation-Date: 2007-12-11 01:17+0100\n"
+"POT-Creation-Date: 2014-09-29 00:52-0500\n"
 "PO-Revision-Date: 2006-11-10 19:45+1100\n"
 "Last-Translator: Sahachart Anukulkitch <drrider@gmail.com>\n"
 "Language-Team: Thai <l10n@opentle.org>\n"
+"Language: th\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: KBabel 1.11.4\n"
 
+#: _translatorinfo.cpp:1
+msgid ""
+"_: NAME OF TRANSLATORS\n"
+"Your names"
+msgstr "ถนอมทรัพย์ นพบูรณ์,สหชาติ อนุกูลกิจ"
+
+#: _translatorinfo.cpp:3
+msgid ""
+"_: EMAIL OF TRANSLATORS\n"
+"Your emails"
+msgstr "donga_n@yahoo.com,drrider@gmail.com"
+
 #: filter_mailapp.cxx:32
 msgid "Import From OS X Mail"
 msgstr "นำเข้าจากโปรแกรม Mail ใน OS X"
@@ -27,43 +40,43 @@ msgstr ""
 "<p><b>ตัวกรองการนำเข้าจากโปรแกรม Mail ใน OS X</b></p> "
 "<p>ตัวกรองนี้จะทำการนำเข้าอีเมลจากโปรแกรม Mail ใน Mac OS X ของแอปเปิล</p>"
 
-#: filter_evolution.cxx:58 filter_evolution_v2.cxx:66
-#: filter_kmail_maildir.cxx:57 filter_mailapp.cxx:53 filter_oe.cxx:61
-#: filter_opera.cxx:60 filter_outlook.cxx:45 filter_plain.cxx:45
+#: filter_evolution.cxx:57 filter_evolution_v2.cxx:66
+#: filter_kmail_maildir.cxx:57 filter_mailapp.cxx:52 filter_oe.cxx:60
+#: filter_opera.cxx:60 filter_outlook.cxx:44 filter_plain.cxx:44
 #: filter_pmail.cxx:56 filter_sylpheed.cxx:56 filter_thebat.cxx:62
 #: filter_thunderbird.cxx:65
 msgid "No directory selected."
 msgstr "ยังไม่ได้เลือกไดเร็กทอรี"
 
-#: filter_evolution.cxx:65 filter_evolution_v2.cxx:73
-#: filter_kmail_maildir.cxx:64 filter_mailapp.cxx:54 filter_opera.cxx:67
-#: filter_opera.cxx:152 filter_outlook.cxx:51 filter_sylpheed.cxx:63
+#: filter_evolution.cxx:64 filter_evolution_v2.cxx:73
+#: filter_kmail_maildir.cxx:64 filter_mailapp.cxx:53 filter_opera.cxx:67
+#: filter_opera.cxx:152 filter_outlook.cxx:50 filter_sylpheed.cxx:63
 #: filter_thebat.cxx:69 filter_thunderbird.cxx:72
 msgid "No files found for import."
 msgstr "ไม่พบแฟ้มสำหรับจะทำการนำเข้า"
 
-#: filter_evolution.cxx:125 filter_evolution_v2.cxx:160
-#: filter_kmail_maildir.cxx:128 filter_lnotes.cxx:89 filter_mailapp.cxx:63
-#: filter_mbox.cxx:55 filter_opera.cxx:87 filter_outlook.cxx:60
+#: filter_evolution.cxx:124 filter_evolution_v2.cxx:160
+#: filter_kmail_maildir.cxx:128 filter_lnotes.cxx:88 filter_mailapp.cxx:62
+#: filter_mbox.cxx:54 filter_opera.cxx:87 filter_outlook.cxx:59
 #: filter_pmail.cxx:165 filter_pmail.cxx:235 filter_pmail.cxx:253
 #: filter_pmail.cxx:294 filter_thebat.cxx:151 filter_thunderbird.cxx:161
 msgid "Unable to open %1, skipping"
 msgstr "ไม่สามารถเปิด %1 ได้, กำลังข้ามไป"
 
-#: filter_evolution.cxx:146 filter_mailapp.cxx:71 filter_mbox.cxx:61
-#: filter_opera.cxx:89 filter_outlook.cxx:58
+#: filter_evolution.cxx:145 filter_mailapp.cxx:70 filter_mbox.cxx:60
+#: filter_opera.cxx:89 filter_outlook.cxx:57
 msgid "Importing emails from %1..."
 msgstr "กำลังนำเข้าอีเมลจาก %1..."
 
-#: filter_evolution.cxx:77 filter_evolution_v2.cxx:90
-#: filter_kmail_maildir.cxx:83 filter_mailapp.cxx:127 filter_mbox.cxx:133
-#: filter_opera.cxx:141 filter_plain.cxx:81 filter_pmail.cxx:79
+#: filter_evolution.cxx:76 filter_evolution_v2.cxx:90
+#: filter_kmail_maildir.cxx:83 filter_mailapp.cxx:126 filter_mbox.cxx:132
+#: filter_opera.cxx:141 filter_plain.cxx:80 filter_pmail.cxx:79
 #: filter_sylpheed.cxx:78 filter_thebat.cxx:84 filter_thunderbird.cxx:99
 #, c-format
 msgid "Finished importing emails from %1"
 msgstr "การนำเข้าอีเมลจาก %1 เสร็จสิ้น"
 
-#: filter_mailapp.cxx:130 filter_mbox.cxx:136
+#: filter_mailapp.cxx:129 filter_mbox.cxx:135
 #, fuzzy
 msgid ""
 "_n: 1 duplicate message not imported to folder %1 in KMail\n"
@@ -71,82 +84,166 @@ msgid ""
 msgstr "ข้อความที่ซ้ำ %n ข้อความ จะไม่ถูกนำเข้าไปยังโฟลเดอร์ใน KMail"
 
 #: filter_evolution_v2.cxx:94 filter_kmail_maildir.cxx:87
-#: filter_mailapp.cxx:138 filter_mbox.cxx:139 filter_oe.cxx:103
-#: filter_opera.cxx:155 filter_plain.cxx:85 filter_sylpheed.cxx:82
+#: filter_mailapp.cxx:137 filter_mbox.cxx:138 filter_oe.cxx:102
+#: filter_opera.cxx:155 filter_plain.cxx:84 filter_sylpheed.cxx:82
 #: filter_thebat.cxx:88 filter_thunderbird.cxx:104
 msgid "Finished import, canceled by user."
 msgstr "การนำเข้าเสร็จสิ้น, ถูกยกเลิกโดยผู้ใช้"
 
-#: filter_thunderbird.cxx:28
-msgid "Import Thunderbird/Mozilla Local Mails and Folder Structure"
-msgstr "นำเข้าจดหมายบนเครื่องและโครงสร้างโฟลเดอร์ของ Thunderbird/Mozilla"
+#: filter_lnotes.cxx:30
+msgid "Import Lotus Notes Emails"
+msgstr "นำเข้าอีเมลของ Lotus Notes"
 
-#: filter_thunderbird.cxx:30
+#: filter_lnotes.cxx:32
 msgid ""
-"<p><b>Thunderbird/Mozilla import filter</b></p>"
-"<p>Select your base Thunderbird/Mozilla mailfolder (usually "
-"~/.thunderbird/*.default/Mail/Local Folders/).</p>"
-"<p><b>Note:</b> Never choose a Folder which <u>does not</u> "
-"contain mbox-files (for example, a maildir): if you do, you will get many new "
-"folders.</p>"
-"<p>Since it is possible to recreate the folder structure, the folders will be "
-"stored under: \"Thunderbird-Import\".</p>"
+"<p><b>Lotus Notes Structured Text mail import filter</b></p>"
+"<p>This filter will import Structured Text files from an exported Lotus Notes "
+"email client into KMail. Use this filter if you want to import mails from Lotus "
+"or other mailers that use the Lotus Notes Structured Text format.</p>"
+"<p><b>Note:</b> Since it is possible to recreate the folder structure, the "
+"imported messages will be stored in subfolders under: \"LNotes-Import\", in "
+"your local folder, named using the names of the files the messages came "
+"from.</p>"
 msgstr ""
-"<p><b>ตัวกรองการนำเข้า Thunderbird/Mozilla</b></p> "
-"<p>เลือกโฟลเดอร์เก็บจดหมายหลักในโปรแกรม Thunderbird/Mozilla ของคุณ (ตามปกติคือ "
-"~/.thunderbird/*.default/Mail/Local Folders/)</p> "
-"<p><b>ข้อสังเกต:</b> อย่าเลือกโฟลเดอร์ที่ <u>ไม่ได้</u> "
-"มีแฟ้ม mbox-file (ตัวอย่างเช่น maildir): หากคุณทำแบบนั้น "
-"คุณจะได้โฟลเดอร์ใหม่มามากมาย</p> "
-"<p>เพราะว่ามีความเป็นไปได้ในการสาร้างโครงสร้างโฟลเดอร์ใหม่ ดังนั้นโฟลเดอร์ต่างๆ "
-"จะถูกเก็บไว้ที่: \"Thunderbird-Import\"</p>"
+"<p><b>ตัวกรองการนำเข้าอีเมลข้อความในโครงสร้างของ Lotus Notes</b></p>"
+"<p>ตัวกรองนี้จะทำการนำเข้าแฟ้มข้อความที่มีโครงสร้างแบบที่ถูกส่งออกมาจาก Lotus "
+"Notes เข้ามาใน KMail. ใช้ตัวกรองนี้หากว่าคุณต้องการที่จะนำเข้าอีเมลจาก Lotus "
+"หรือโปรแกรมอีเมลอื่นที่ใช้รูปแบบข้อความโครงสร้างแบบ Lotus Notes</p>"
+"<p><b>ข้อสังเกต:</b> "
+"เนื่องจากมีความเป็นไปได้ที่จะมีการสร้างโครงสร้างโฟลเดอร์ขึ้นมาใหม่ "
+"ข้อความที่ถูกนำเข้ามาจะถูกเก็บเอาไว้ที่โฟลเดอร์ย่อยr: \"LNotes-Import\", "
+"ในโฟลเดอร์ ในเครื่องของคุณโดยใช้ชื่อของแฟ้มที่ข้อความนั้นมาจาก</p>"
 
-#: filter_evolution_v2.cxx:124 filter_thunderbird.cxx:94
-#: filter_thunderbird.cxx:129
-msgid "Start import file %1..."
-msgstr "เริ่มนำเข้าแฟ้ม %1..."
+#: filter_lnotes.cxx:55
+msgid "All Files (*)"
+msgstr "แฟ้มทั้งหมด(*)"
 
-#: filter_evolution.cxx:196 filter_evolution_v2.cxx:92
-#: filter_kmail_maildir.cxx:85 filter_opera.cxx:143 filter_outlook.cxx:59
-#: filter_plain.cxx:83 filter_sylpheed.cxx:80 filter_thebat.cxx:86
-#: filter_thunderbird.cxx:101
+#: filter_lnotes.cxx:64
+#, c-format
+msgid "Importing emails from %1"
+msgstr "กำลังนำเข้าอีเมลจาก %1"
+
+#: filter_lnotes.cxx:109 filter_pmail.cxx:279
 #, c-format
+msgid "Message %1"
+msgstr "ข้อความ %1"
+
+#: filter_pmail.cxx:31
+msgid "Import Folders From Pegasus-Mail"
+msgstr "นำเข้าโฟลเดอร์จาก Pegasus-Mail"
+
+#: filter_pmail.cxx:33
 msgid ""
-"_n: 1 duplicate message not imported\n"
-"%n duplicate messages not imported"
-msgstr "ข้อความซ้ำ %n ข้อความ ไม่ได้ถูกนำเข้า"
+"<p>Select the Pegasus-Mail directory on your system (containing *.CNM, *.PMM "
+"and *.MBX files). On many systems this is stored in C:\\pmail\\mail or "
+"C:\\pmail\\mail\\admin</p>"
+"<p><b>Note:</b> Since it is possible to recreate the folder structure, the "
+"folders will be stored under: \"PegasusMail-Import\".</p>"
+msgstr ""
+"<p>เลือกไดเร็คทอรีของ Pegasus-Mail บนระบบของคุณ (ต้องมีแฟ้ม *.CNM, *.PMM และ "
+"*.MBX อยู่) บนระบบส่วนมาก จะเก็บเอาไว้ที่ C:\\pmail\\mail หรือ "
+"C:\\pmail\\mail\\admin</p> "
+"<p><b>ข้อสังเกต:</b> "
+"เนื่องจากมีความเป็นไปได้ที่จะมีการสร้างโครงสร้างของโฟลเดอร์ใหม่ "
+"ดังนั้นโฟลเดอร์ต่างๆ จะถูกเก็บไว้ที่: \"PegasusMail-Import\"</p>"
+
+#: filter_opera.cxx:75 filter_outlook.cxx:45 filter_plain.cxx:51
+#: filter_pmail.cxx:61
+msgid "Counting files..."
+msgstr "กำลังนับแฟ้ม..."
 
-#: filters.cxx:145 filters.cxx:180
+#: filter_pmail.cxx:69
 msgid ""
-"<b>Fatal:</b> Unable to start KMail for DCOP communication. Make sure <i>"
-"kmail</i> is installed."
+"Cannot parse the folder structure; continuing import without subfolder support."
 msgstr ""
-"<b>ผิดพลาดรุนแรง</b>: ไม่สามารถเริ่มโปรแกรม KMail สำหรับติดต่อกับ DCOP ได้ "
-"โปรดตรวจดูว่า ได้ติดตั้ง <i>kmail</i> ไว้แล้ว"
+"ไม่สามารถวิเคราะห์โครงสร้างของโฟลเดอร์ได้; "
+"ทำการนำเข้าต่อไปโดยไม่มีการรองรับโฟลเดอร์ย่อย"
 
-#: filters.cxx:153 filters.cxx:188
-msgid "Cannot make folder %1 in KMail"
-msgstr "ไม่สามารถสร้างโฟลเดอร์ %1 ในโปรแกรม KMail ได้"
+#: filter_pmail.cxx:72
+msgid "Importing new mail files ('.cnm')..."
+msgstr "กำลังนำเข้าแฟ้มจดหมายใหม่ ('.cnm') ..."
 
-#: filters.cxx:156 filters.cxx:191
-msgid "Cannot add message to folder %1 in KMail"
-msgstr "ไม่สามารถเพิ่มข้อความเข้าไปในโฟลเดอร์ %1 ในโปรแกรม KMail ได้"
+#: filter_pmail.cxx:74
+msgid "Importing mail folders ('.pmm')..."
+msgstr "กำลังนำเข้าโฟลเดอร์จดหมาย ('.pmm') ..."
 
-#: filters.cxx:162 filters.cxx:194
-msgid "Error while adding message to folder %1 in KMail"
-msgstr "เกิดข้อผิดพลาดขณะเพิ่มข้อความเข้าไปในโฟลเดอร์ %1 ในโปรแกรม KMail"
+#: filter_pmail.cxx:76
+msgid "Importing 'UNIX' mail folders ('.mbx')..."
+msgstr "กำลังนำเข้าโฟลเดอร์จดหมายของ 'UNIX' ('.mbx') ..."
 
-#: _translatorinfo.cpp:1
+#: filter_pmail.cxx:175 filter_pmail.cxx:255
+#, c-format
+msgid "Importing %1"
+msgstr "กำลังนำเข้า %1"
+
+#: filter_pmail.cxx:290
+msgid "Parsing the folder structure..."
+msgstr "กำลังวิเคราะห์โครงสร้างโฟลเดอร์..."
+
+#: filter_outlook.cxx:28
+msgid "Import Outlook Emails"
+msgstr "นำเข้าอีเมลของ Outlook"
+
+#: filter_outlook.cxx:30
 msgid ""
-"_: NAME OF TRANSLATORS\n"
-"Your names"
-msgstr "ถนอมทรัพย์ นพบูรณ์,สหชาติ อนุกูลกิจ"
+"<p><b>Outlook email import filter</b></p>"
+"<p>This filter will import mails from a Outlook pst-file. You will need to "
+"locate the folder where the pst-file has been stored by searching for .pst "
+"files under: <i>C:\\Documents and Settings</i> in Windows 2000 or later</p>"
+"<p><b>Note:</b> Emails will be imported into a folder named after the account "
+"they came from, prefixed with OUTLOOK-</p>"
+msgstr ""
+"<p><b>ตัวกรองการนำเข้าอีเมลจาก Outlook</b></p>"
+"<p>ตัวกรองนี้จะทำการนำเข้าอีเมลจากแฟ้ม pst ของโปรแกรม Outlook "
+"คุณจำเป็นต้องระบุที่ตั้งของโฟลเดอร์ที่เก็บแฟ้ม pst อยู่ โดยการหาแฟ้ม .pst ที่: "
+"<i>C:\\Documents and Settings</i> ใน Windows 2000 หรือรุ่นหลังจากนี้</p>"
+"<p><b>ข้อสังเกต:</b> "
+"อีเมลจะถูกนำเข้าไปยังโฟลเดอร์ที่มีชื่อเดียวกันกับบัญชีที่มา แล้วนำหน้าด้วย "
+"OUTLOOK-</p>"
 
-#: _translatorinfo.cpp:3
+#: filter_outlook.cxx:46
+msgid "Counting mail..."
+msgstr "กำลังนับอีเมล..."
+
+#: filter_outlook.cxx:47
+msgid "Counting directories..."
+msgstr "กำลังนับไดเร็คทอรี..."
+
+#: filter_outlook.cxx:48
+msgid "Counting folders..."
+msgstr "กำลังนับโฟลเดอร์..."
+
+#: filter_opera.cxx:82 filter_outlook.cxx:49 filter_plain.cxx:55
+msgid "Importing new mail files..."
+msgstr "กำลังนำเข้าแฟ้มจดหมายใหม่..."
+
+#: filter_evolution.cxx:195 filter_evolution_v2.cxx:92
+#: filter_kmail_maildir.cxx:85 filter_opera.cxx:143 filter_outlook.cxx:58
+#: filter_plain.cxx:82 filter_sylpheed.cxx:80 filter_thebat.cxx:86
+#: filter_thunderbird.cxx:101
+#, c-format
 msgid ""
-"_: EMAIL OF TRANSLATORS\n"
-"Your emails"
-msgstr "donga_n@yahoo.com,drrider@gmail.com"
+"_n: 1 duplicate message not imported\n"
+"%n duplicate messages not imported"
+msgstr "ข้อความซ้ำ %n ข้อความ ไม่ได้ถูกนำเข้า"
+
+#: filter_evolution.cxx:31
+msgid "Import Evolution 1.x Local Mails and Folder Structure"
+msgstr "นำเข้าจดหมายในเครื่องและโครงสร้างโฟลเดอร์ของ Evolution 1.x"
+
+#: filter_evolution.cxx:33
+msgid ""
+"<p><b>Evolution 1.x import filter</b></p>"
+"<p>Select the base directory of Evolution's mails (usually "
+"~/evolution/local).</p>"
+"<p>Since it is possible to recreate the folder structure, the folders will be "
+"stored under: \"Evolution-Import\".</p>"
+msgstr ""
+"<p><b>ตัวกรองการนำเข้าจาก Evolution 1.x</b></p> "
+"<p>เลือกไดเร็คทอรีหลักของจดหมายของ Evolution (ตามปกติจะอยู่ที่ "
+"~/evolution/local)</p> "
+"<p>เนื่องจากมีความเป็นไปได้ที่จะมีการสร้างโครงสร้างโฟลเดอร์ขึ้นมาใหม่ "
+"ดังนั้นโฟลเดอร์ต่างๆ จะถูกเก็บไว้ที่: \"Evolution-Import\"</p>"
 
 #: filter_sylpheed.cxx:27
 msgid "Import Sylpheed Maildirs and Folder Structure"
@@ -175,157 +272,184 @@ msgid "Import folder %1..."
 msgstr "กำลังนำเข้าโฟลเดอร์ %1..."
 
 #: filter_kmail_maildir.cxx:206 filter_kmail_maildir.cxx:211
-#: filter_plain.cxx:68 filter_plain.cxx:72 filter_sylpheed.cxx:153
+#: filter_plain.cxx:67 filter_plain.cxx:71 filter_sylpheed.cxx:153
 #: filter_sylpheed.cxx:158
 #, c-format
 msgid "Could not import %1"
 msgstr "ไม่สามารถนำเข้า %1 ได้"
 
-#: main.cpp:33
-msgid "KMailCVT"
-msgstr "KMailCVT"
-
-#: main.cpp:34
-msgid "KMail Import Filters"
-msgstr "ตัวกรองสำหรับนำเข้าอีเมลของโปรแกรม KMail"
-
-#: main.cpp:35
-msgid "(c) 2000-2005, The KMailCVT developers"
-msgstr "สงวนลิขสิทธิ์ (c) 2000-2005, ผู้พัฒนา The KMailCVT"
-
-#: main.cpp:36
-msgid "Original author"
-msgstr "ผู้เขียนดั้งเดิม"
-
-#: main.cpp:37
-msgid "Maintainer & New filters"
-msgstr "ผู้ดูแล & ตัวกรองใหม่ๆ"
-
-#: main.cpp:38 main.cpp:39
-msgid "New GUI & cleanups"
-msgstr "ส่วนติดต่อผู้ใช้แบบกราฟิกส์แบบใหม่ & ทำความสะอาด"
-
-#: filter_evolution.cxx:31
-msgid "Import Evolution 1.x Local Mails and Folder Structure"
-msgstr "นำเข้าจดหมายในเครื่องและโครงสร้างโฟลเดอร์ของ Evolution 1.x"
+#: filter_evolution_v2.cxx:29
+msgid "Import Evolution 2.x Local Mails and Folder Structure"
+msgstr "นำเข้าเมลบนเครื่องและโครงสร้างโฟลเดอร์ของ Evolution 2.x"
 
-#: filter_evolution.cxx:33
+#: filter_evolution_v2.cxx:31
 msgid ""
-"<p><b>Evolution 1.x import filter</b></p>"
-"<p>Select the base directory of Evolution's mails (usually "
-"~/evolution/local).</p>"
+"<p><b>Evolution 2.x import filter</b></p>"
+"<p>Select the base directory of your local Evolution mailfolder (usually "
+"~/.evolution/mail/local/).</p>"
+"<p><b>Note:</b> Never choose a Folder which <u>does not</u> "
+"contain mbox-files (for example a maildir): if you do, you will get many new "
+"folders.</p>"
 "<p>Since it is possible to recreate the folder structure, the folders will be "
 "stored under: \"Evolution-Import\".</p>"
 msgstr ""
-"<p><b>ตัวกรองการนำเข้าจาก Evolution 1.x</b></p> "
-"<p>เลือกไดเร็คทอรีหลักของจดหมายของ Evolution (ตามปกติจะอยู่ที่ "
-"~/evolution/local)</p> "
-"<p>เนื่องจากมีความเป็นไปได้ที่จะมีการสร้างโครงสร้างโฟลเดอร์ขึ้นมาใหม่ "
-"ดังนั้นโฟลเดอร์ต่างๆ จะถูกเก็บไว้ที่: \"Evolution-Import\"</p>"
-
-#: filter_opera.cxx:28
-msgid "Import Opera Emails"
-msgstr "นำเข้าอีเมลจากโอเปร่า"
-
-#: filter_opera.cxx:30
-msgid ""
-"<p><b>Opera email import filter</b></p>"
-"<p>This filter will import mails from Opera mail folder. Use this filter if you "
-"want to import all mails within a account in the Opera maildir.</p>"
-"<p>Select the directory of the account (usually "
-"~/.opera/mail/store/account*).</p>"
-"<p><b>Note:</b> Emails will be imported into a folder named after the account "
-"they came from, prefixed with OPERA-</p>"
-msgstr ""
-"<p><b>ตัวกรองการนำเข้าอีเมลจากโอเปร่า</b></p> "
-"<p>ตัวกรองนี้จะทำการนำเข้าอีเมลจากโฟลเดอร์เก็บอีเมลของโอเปร่า ให้ใช้ตัวกรองนี้ "
-"หากคุณต้องการที่จะนำเข้าอีเมลทั้งหมดภายในบัญชีผู้ใช้ "
-"ในไดเร็คทอรีเก็บอีเมลของโอเปร่า</p> "
-"<p>เลือกไดเร็คทอรีของบัญชีผู้ใช้ (ตามปกติคือ ~/.opera/mail/store/account*)</p> "
-"<p><b>ข้อสังเกต:</b> "
-"อีเมลจะถูกนำเข้าสูโฟลเดอร์ที่ชื่อเหมือนกับบัญชีผู้ใช้ที่นำเข้ามา โดยจะมี OPERA- "
-"นำหน้าอยู่</p>"
+"<p><b>ตัวกรองการนำเข้า Evolution 2.x</b></p> "
+"<p>เลือกไดเร็คทอรีหลักของโฟลเดอร์เก็บอีเมลในโปรแกรม Evolution ของคุณ "
+"(ตามปกติคือ ~/.evolution/mail/local)</p> "
+"<p><b>ข้อสังเกต:</b> อย่าเลือกโฟบเดอร์ืั้ <u>ไม่มี</u> "
+"แฟ้ม mbox อยู่ (ตัวอย่างเช่น maildir) หากคุณทำแบบนั้น "
+"คุณจะมีโฟลเดอร์ใหม่มากมาย</p> "
+"<p>เนื่องจากมีความเป็นไปได้ที่จะมีการสร้างโครงสร้างโฟลเดอร์ใหม่ "
+"ดังนั้นโฟลเดอร์ต่างๆ จะจะถูกเก็บไว้ที่ \"Evolution-Import\"</p>"
 
-#: filter_opera.cxx:75 filter_outlook.cxx:46 filter_plain.cxx:52
-#: filter_pmail.cxx:61
-msgid "Counting files..."
-msgstr "กำลังนับแฟ้ม..."
+#: filter_evolution_v2.cxx:124 filter_thunderbird.cxx:94
+#: filter_thunderbird.cxx:129
+msgid "Start import file %1..."
+msgstr "เริ่มนำเข้าแฟ้ม %1..."
 
-#: filter_opera.cxx:82 filter_outlook.cxx:50 filter_plain.cxx:56
-msgid "Importing new mail files..."
-msgstr "กำลังนำเข้าแฟ้มจดหมายใหม่..."
+#: kselfilterpage.cpp:78
+msgid "<p><i>Written by %1.</i></p>"
+msgstr "<p><i>ถูกเขียนโดย %1.</i></p>"
 
-#: kmailcvt.cpp:26
+#: kmailcvt.cpp:28
 msgid "KMailCVT Import Tool"
 msgstr "เครื่องมือสำหรับนำเข้า KMailCVT"
 
-#: kmailcvt.cpp:29
+#: kmailcvt.cpp:31
 msgid "Step 1: Select Filter"
 msgstr "ขั้นที่ 1: เลือกตัวกรอง"
 
-#: kmailcvt.cpp:32
+#: kmailcvt.cpp:34
 msgid "Step 2: Importing..."
 msgstr "ขั้นที่ 2: กำลังนำเข้า..."
 
-#: kmailcvt.cpp:53
+#: kmailcvt.cpp:76
 msgid "Import in progress"
 msgstr "การนำเข้ากำลังดำเนินการอยู่"
 
-#: kmailcvt.cpp:56
+#: kmailcvt.cpp:79
 msgid "Import finished"
 msgstr "การนำเข้าเสร็จสิ้น"
 
-#: filter_pmail.cxx:31
-msgid "Import Folders From Pegasus-Mail"
-msgstr "นำเข้าโฟลเดอร์จาก Pegasus-Mail"
+#: filters.cxx:145 filters.cxx:180 filters.cxx:208
+msgid ""
+"<b>Fatal:</b> Unable to start KMail for DCOP communication. Make sure <i>"
+"kmail</i> is installed."
+msgstr ""
+"<b>ผิดพลาดรุนแรง</b>: ไม่สามารถเริ่มโปรแกรม KMail สำหรับติดต่อกับ DCOP ได้ "
+"โปรดตรวจดูว่า ได้ติดตั้ง <i>kmail</i> ไว้แล้ว"
 
-#: filter_pmail.cxx:33
+#: filters.cxx:153 filters.cxx:188
+msgid "Cannot make folder %1 in KMail"
+msgstr "ไม่สามารถสร้างโฟลเดอร์ %1 ในโปรแกรม KMail ได้"
+
+#: filters.cxx:156 filters.cxx:191
+msgid "Cannot add message to folder %1 in KMail"
+msgstr "ไม่สามารถเพิ่มข้อความเข้าไปในโฟลเดอร์ %1 ในโปรแกรม KMail ได้"
+
+#: filters.cxx:162 filters.cxx:194
+msgid "Error while adding message to folder %1 in KMail"
+msgstr "เกิดข้อผิดพลาดขณะเพิ่มข้อความเข้าไปในโฟลเดอร์ %1 ในโปรแกรม KMail"
+
+#: filter_mbox.cxx:28
+msgid "Import mbox Files (UNIX, Evolution)"
+msgstr "นำเข้าแฟ้ม mbox (UNIX, Evolution)"
+
+#: filter_mbox.cxx:30
 msgid ""
-"<p>Select the Pegasus-Mail directory on your system (containing *.CNM, *.PMM "
-"and *.MBX files). On many systems this is stored in C:\\pmail\\mail or "
-"C:\\pmail\\mail\\admin</p>"
-"<p><b>Note:</b> Since it is possible to recreate the folder structure, the "
-"folders will be stored under: \"PegasusMail-Import\".</p>"
+"<p><b>mbox import filter</b></p>"
+"<p>This filter will import mbox files into KMail. Use this filter if you want "
+"to import mails from Ximian Evolution or other mailers that use this "
+"traditional UNIX format.</p>"
+"<p><b>Note:</b> Emails will be imported into folders named after the file they "
+"came from, prefixed with MBOX-</p>"
 msgstr ""
-"<p>เลือกไดเร็คทอรีของ Pegasus-Mail บนระบบของคุณ (ต้องมีแฟ้ม *.CNM, *.PMM และ "
-"*.MBX อยู่) บนระบบส่วนมาก จะเก็บเอาไว้ที่ C:\\pmail\\mail หรือ "
-"C:\\pmail\\mail\\admin</p> "
-"<p><b>ข้อสังเกต:</b> "
-"เนื่องจากมีความเป็นไปได้ที่จะมีการสร้างโครงสร้างของโฟลเดอร์ใหม่ "
-"ดังนั้นโฟลเดอร์ต่างๆ จะถูกเก็บไว้ที่: \"PegasusMail-Import\"</p>"
+"<p><b>ตัวกรองการนำเข้า mbox</b></p> "
+"<p>ตัวกรองนี้จะทำการนำเข้าแฟ้ม mbox เข้ามาใน KMail ใช้ตัวกรองนี้หากคุณต้องการ "
+"ที่จะนำเข้าอีเมลจาก Ximian Evolution หรือโปรแกรมรับ-ส่งเมลอื่นๆ ที่ใช้รูปแบบ "
+"ดั้งเดิมของ UNIX </p> "
+"<p><b>ข้อสังเกต</b>อีเมลจะถูกนำเข้าสู่โฟลเดอร์ที่มีชื่อตามแฟ้มที่มา "
+"แล้วนำหน้าด้วย MBOX- </p>"
 
-#: filter_pmail.cxx:69
+#: filter_mbox.cxx:48
+msgid "mbox Files (*)"
+msgstr "แฟ้ม mbox (*)"
+
+#: filter_plain.cxx:27
+msgid "Import Plain Text Emails"
+msgstr "นำเข้าจดหมายข้อความธรรมดา"
+
+#: filter_plain.cxx:29
 msgid ""
-"Cannot parse the folder structure; continuing import without subfolder support."
+"<p>Select the directory containing the emails on your system. The emails are "
+"placed in a folder with the same name as the directory they were in, prefixed "
+"by PLAIN-</p>"
+"<p>This filter will import all .msg, .eml and .txt emails.</p>"
 msgstr ""
-"ไม่สามารถวิเคราะห์โครงสร้างของโฟลเดอร์ได้; "
-"ทำการนำเข้าต่อไปโดยไม่มีการรองรับโฟลเดอร์ย่อย"
+"<p>เลือกไดเร็คทอรีที่มีอีเมลบนระบบของคุณ "
+"แล้วอีเมลจะถูกใส่ไว้ในโฟลเดอร์ที่มีชื่อเดียวกับ ไดเร็คทอรีที่เก็บอีเมลไว้ "
+"โดยจะนำหนัาด้วย PLAIN-ฒฝยฬ "
+"<p>ตัวกรองนี้จะทำการนำเข้าอีเมลที่มีนามสกุล .msg, .eml และ .txt ทั้งหมด</p>"
 
-#: filter_pmail.cxx:72
-msgid "Importing new mail files ('.cnm')..."
-msgstr "กำลังนำเข้าแฟ้มจดหมายใหม่ ('.cnm') ..."
+#: filter_oe.cxx:40
+msgid "Import Outlook Express Emails"
+msgstr "นำเข้าอีเมล Outlook Express "
 
-#: filter_pmail.cxx:74
-msgid "Importing mail folders ('.pmm')..."
-msgstr "กำลังนำเข้าโฟลเดอร์จดหมาย ('.pmm') ..."
+#: filter_oe.cxx:42
+msgid ""
+"<p><b>Outlook Express 4/5/6 import filter</b></p>"
+"<p>You will need to locate the folder where the mailbox has been stored by "
+"searching for .dbx or .mbx files under "
+"<ul>"
+"<li><i>C:\\Windows\\Application Data</i> in Windows 9x"
+"<li><i>Documents and Settings</i> in Windows 2000 or later</ul></p>"
+"<p><b>Note:</b> Since it is possible to recreate the folder structure, the "
+"folders from Outlook Express 5 and 6 will be stored under: \"OE-Import\" in "
+"your local folder.</p>"
+msgstr ""
+"<p><b>ตัวกรองการนำเข้า Outlook Express 4/5/6</b></p>"
+"<p>คุณจำเป็นต้องทำการระบุโฟลเดอร์ที่เก็บกล่องจดหมายอยู่ โดยการค้นหาแฟ้มประเภท "
+".dbx หรือ .mbx จากใน"
+"<ul>"
+"<li><i>C:\\Windows\\Application Data</i> ใน Windows 9x"
+"<li><i>Documents and Settings</i> ใน Windows 2000 หรือรุ่นหลังจากนี้</ul></p>"
+"<p><b>ข้อสังเกต:</b> "
+"เนื่องจากมีความเป็นไปได้ที่จะมีการสร้างโครงสร้างโฟลเดอร์ใหม่, โฟลเดอร์ต่างๆ จาก "
+"Outlook Express 5 และ 6 จะถูกเก็บเอาไว้ที่: \"OE-Import\" ใน "
+"โฟลเดอร์ในเครื่องของคุณ</p>"
 
-#: filter_pmail.cxx:76
-msgid "Importing 'UNIX' mail folders ('.mbx')..."
-msgstr "กำลังนำเข้าโฟลเดอร์จดหมายของ 'UNIX' ('.mbx') ..."
+#: filter_oe.cxx:67
+#, c-format
+msgid "No Outlook Express mailboxes found in directory %1."
+msgstr "ไม่พบกล่องจดหมายของ Outlook Express ในไดเร็คทอรี %1"
 
-#: filter_pmail.cxx:175 filter_pmail.cxx:255
+#: filter_oe.cxx:82
+msgid "Import folder structure..."
+msgstr "นำเข้าโครงสร้างโฟลเดอร์..."
+
+#: filter_oe.cxx:101
+msgid "Finished importing Outlook Express emails"
+msgstr "การนำเข้าอีเมลจาก Outlook Express เสร็จสิ้น"
+
+#: filter_oe.cxx:119
 #, c-format
-msgid "Importing %1"
-msgstr "กำลังนำเข้า %1"
+msgid "Unable to open mailbox %1"
+msgstr "ไม่สามารถเปิดกล่องจดหมาย %1 ได้"
 
-#: filter_lnotes.cxx:110 filter_pmail.cxx:279
+#: filter_oe.cxx:130
 #, c-format
-msgid "Message %1"
-msgstr "ข้อความ %1"
+msgid "Importing OE4 Mailbox %1"
+msgstr "กำลังนำเข้ากล่องจดหมาย %1 ของ OE4"
 
-#: filter_pmail.cxx:290
-msgid "Parsing the folder structure..."
-msgstr "กำลังวิเคราะห์โครงสร้างโฟลเดอร์..."
+#: filter_oe.cxx:144
+#, c-format
+msgid "Importing OE5+ Mailbox %1"
+msgstr "กำลังนำเข้ากล่องจดหมาย %1 ของ OE5+"
+
+#: filter_oe.cxx:150
+#, c-format
+msgid "Importing OE5+ Folder file %1"
+msgstr "กำลังนำเข้าแฟ้มโฟลเดอร์ %1 ของ OE5+"
 
 #. i18n: file kimportpagedlg.ui line 91
 #: rc.cpp:3
@@ -401,29 +525,39 @@ msgstr ""
 msgid "Remove &duplicate messages during import"
 msgstr "&ลบข้อความที่ซ้ำกันออกไประหว่างการนำเข้า"
 
-#: filter_mbox.cxx:28
-msgid "Import mbox Files (UNIX, Evolution)"
-msgstr "นำเข้าแฟ้ม mbox (UNIX, Evolution)"
+#: filter_thebat.cxx:33
+msgid "Import The Bat! Mails and Folder Structure"
+msgstr "นำเข้าอีเมลและดครงสร้างโฟลเดอร์ของ Bat! Mail"
 
-#: filter_mbox.cxx:30
+#: filter_thebat.cxx:35
 msgid ""
-"<p><b>mbox import filter</b></p>"
-"<p>This filter will import mbox files into KMail. Use this filter if you want "
-"to import mails from Ximian Evolution or other mailers that use this "
-"traditional UNIX format.</p>"
-"<p><b>Note:</b> Emails will be imported into folders named after the file they "
-"came from, prefixed with MBOX-</p>"
+"<p><b>The Bat! import filter</b></p>"
+"<p>Select the base directory of the 'The Bat!' local mailfolder you want to "
+"import.</p>"
+"<p><b>Note:</b> This filter imports the *.tbb-files from 'The Bat!' local "
+"folder, e.g. from POP accounts, and not from IMAP/DIMAP accounts.</p>"
+"<p>Since it is possible to recreate the folder structure, the folders will be "
+"stored under: \"TheBat-Import\" in your local account.</p>"
 msgstr ""
-"<p><b>ตัวกรองการนำเข้า mbox</b></p> "
-"<p>ตัวกรองนี้จะทำการนำเข้าแฟ้ม mbox เข้ามาใน KMail ใช้ตัวกรองนี้หากคุณต้องการ "
-"ที่จะนำเข้าอีเมลจาก Ximian Evolution หรือโปรแกรมรับ-ส่งเมลอื่นๆ ที่ใช้รูปแบบ "
-"ดั้งเดิมของ UNIX </p> "
-"<p><b>ข้อสังเกต</b>อีเมลจะถูกนำเข้าสู่โฟลเดอร์ที่มีชื่อตามแฟ้มที่มา "
-"แล้วนำหน้าด้วย MBOX- </p>"
+"<p><b>ตัวกรองการนำเข้า The Bat!</b></p>"
+"<p>เลือกไดเร็คทอรีหลักของโฟลเดอร์เก็บอีเมลของ 'The Bat!'ที่คุณต้องการจะนำเข้า "
+"</p>"
+"<p><b>ข้อสังเกต:</b> ตัวกรองนี้จะทำการนำเข้าแฟ้ม *.tbb-files จากโฟลเดอร์ 'The "
+"Bat!' ต.ย.เช่น จากบัญชี POP, และไม่ใช่จากบัญชี IMAP/DIMAP</p>"
+"<p>เนื่องจากมีความเป็นไปได้ที่จะมีการสร้างโครงสร้างโฟลเดอร์ใหม่ โฟลเดอร์ต่างๆ "
+"จะถูกเก็บเอาไว้ที่: \"TheBat-Import\" ในบัญชีบนเครื่องของคุณ.</p>"
 
-#: filter_mbox.cxx:49
-msgid "mbox Files (*)"
-msgstr "แฟ้ม mbox (*)"
+#: filter_kmail_archive.cxx:24
+msgid "Import KMail Archive File"
+msgstr ""
+
+#: filter_kmail_archive.cxx:26
+msgid ""
+"<p><b>KMail Archive File Import Filter</b></p>"
+"<p>This filter will import archives files previously exported by KMail.</p>"
+"<p>Archive files contain a complete folder subtree compressed into a single "
+"file.</p>"
+msgstr ""
 
 #: filter_kmail_maildir.cxx:26
 msgid "Import KMail Maildirs and Folder Structure"
@@ -434,8 +568,8 @@ msgid ""
 "<p><b>KMail import filter</b></p>"
 "<p>Select the base directory of the KMail mailfolder you want to import.</p>"
 "<p><b>Note:</b> Never select your current local KMail maildir (usually ~/Mail "
-"or ~/.trinity/share/apps/kmail/mail ): in this case, KMailCVT may become stuck in a "
-"continuous loop. </p>"
+"or ~/.trinity/share/apps/kmail/mail ): in this case, KMailCVT may become stuck "
+"in a continuous loop. </p>"
 "<p>This filter does not import KMail mailfolders with mbox files.</p>"
 "<p>Since it is possible to recreate the folder structure, the folders will be "
 "stored under: \"KMail-Import\" in your local folder.</p>"
@@ -450,194 +584,73 @@ msgstr ""
 "ดังนั้นโฟลเดอร์ต่างๆ จะถูกเก็บไว้ที่: \"KMail-Import\" "
 "ในโฟลเดอร์บนเครื่องของคุณ"
 
-#: filter_evolution_v2.cxx:29
-msgid "Import Evolution 2.x Local Mails and Folder Structure"
-msgstr "นำเข้าเมลบนเครื่องและโครงสร้างโฟลเดอร์ของ Evolution 2.x"
+#: filter_thunderbird.cxx:28
+msgid "Import Thunderbird/Mozilla Local Mails and Folder Structure"
+msgstr "นำเข้าจดหมายบนเครื่องและโครงสร้างโฟลเดอร์ของ Thunderbird/Mozilla"
 
-#: filter_evolution_v2.cxx:31
+#: filter_thunderbird.cxx:30
 msgid ""
-"<p><b>Evolution 2.x import filter</b></p>"
-"<p>Select the base directory of your local Evolution mailfolder (usually "
-"~/.evolution/mail/local/).</p>"
+"<p><b>Thunderbird/Mozilla import filter</b></p>"
+"<p>Select your base Thunderbird/Mozilla mailfolder (usually "
+"~/.thunderbird/*.default/Mail/Local Folders/).</p>"
 "<p><b>Note:</b> Never choose a Folder which <u>does not</u> "
-"contain mbox-files (for example a maildir): if you do, you will get many new "
+"contain mbox-files (for example, a maildir): if you do, you will get many new "
 "folders.</p>"
 "<p>Since it is possible to recreate the folder structure, the folders will be "
-"stored under: \"Evolution-Import\".</p>"
-msgstr ""
-"<p><b>ตัวกรองการนำเข้า Evolution 2.x</b></p> "
-"<p>เลือกไดเร็คทอรีหลักของโฟลเดอร์เก็บอีเมลในโปรแกรม Evolution ของคุณ "
-"(ตามปกติคือ ~/.evolution/mail/local)</p> "
-"<p><b>ข้อสังเกต:</b> อย่าเลือกโฟบเดอร์ืั้ <u>ไม่มี</u> "
-"แฟ้ม mbox อยู่ (ตัวอย่างเช่น maildir) หากคุณทำแบบนั้น "
-"คุณจะมีโฟลเดอร์ใหม่มากมาย</p> "
-"<p>เนื่องจากมีความเป็นไปได้ที่จะมีการสร้างโครงสร้างโฟลเดอร์ใหม่ "
-"ดังนั้นโฟลเดอร์ต่างๆ จะจะถูกเก็บไว้ที่ \"Evolution-Import\"</p>"
-
-#: filter_oe.cxx:40
-msgid "Import Outlook Express Emails"
-msgstr "นำเข้าอีเมล Outlook Express "
-
-#: filter_oe.cxx:42
-msgid ""
-"<p><b>Outlook Express 4/5/6 import filter</b></p>"
-"<p>You will need to locate the folder where the mailbox has been stored by "
-"searching for .dbx or .mbx files under "
-"<ul>"
-"<li><i>C:\\Windows\\Application Data</i> in Windows 9x"
-"<li><i>Documents and Settings</i> in Windows 2000 or later</ul></p>"
-"<p><b>Note:</b> Since it is possible to recreate the folder structure, the "
-"folders from Outlook Express 5 and 6 will be stored under: \"OE-Import\" in "
-"your local folder.</p>"
-msgstr ""
-"<p><b>ตัวกรองการนำเข้า Outlook Express 4/5/6</b></p>"
-"<p>คุณจำเป็นต้องทำการระบุโฟลเดอร์ที่เก็บกล่องจดหมายอยู่ โดยการค้นหาแฟ้มประเภท "
-".dbx หรือ .mbx จากใน"
-"<ul>"
-"<li><i>C:\\Windows\\Application Data</i> ใน Windows 9x"
-"<li><i>Documents and Settings</i> ใน Windows 2000 หรือรุ่นหลังจากนี้</ul></p>"
-"<p><b>ข้อสังเกต:</b> "
-"เนื่องจากมีความเป็นไปได้ที่จะมีการสร้างโครงสร้างโฟลเดอร์ใหม่, โฟลเดอร์ต่างๆ จาก "
-"Outlook Express 5 และ 6 จะถูกเก็บเอาไว้ที่: \"OE-Import\" ใน "
-"โฟลเดอร์ในเครื่องของคุณ</p>"
-
-#: filter_oe.cxx:68
-#, c-format
-msgid "No Outlook Express mailboxes found in directory %1."
-msgstr "ไม่พบกล่องจดหมายของ Outlook Express ในไดเร็คทอรี %1"
-
-#: filter_oe.cxx:83
-msgid "Import folder structure..."
-msgstr "นำเข้าโครงสร้างโฟลเดอร์..."
-
-#: filter_oe.cxx:102
-msgid "Finished importing Outlook Express emails"
-msgstr "การนำเข้าอีเมลจาก Outlook Express เสร็จสิ้น"
-
-#: filter_oe.cxx:120
-#, c-format
-msgid "Unable to open mailbox %1"
-msgstr "ไม่สามารถเปิดกล่องจดหมาย %1 ได้"
-
-#: filter_oe.cxx:131
-#, c-format
-msgid "Importing OE4 Mailbox %1"
-msgstr "กำลังนำเข้ากล่องจดหมาย %1 ของ OE4"
-
-#: filter_oe.cxx:145
-#, c-format
-msgid "Importing OE5+ Mailbox %1"
-msgstr "กำลังนำเข้ากล่องจดหมาย %1 ของ OE5+"
-
-#: filter_oe.cxx:151
-#, c-format
-msgid "Importing OE5+ Folder file %1"
-msgstr "กำลังนำเข้าแฟ้มโฟลเดอร์ %1 ของ OE5+"
-
-#: filter_lnotes.cxx:30
-msgid "Import Lotus Notes Emails"
-msgstr "นำเข้าอีเมลของ Lotus Notes"
-
-#: filter_lnotes.cxx:32
-msgid ""
-"<p><b>Lotus Notes Structured Text mail import filter</b></p>"
-"<p>This filter will import Structured Text files from an exported Lotus Notes "
-"email client into KMail. Use this filter if you want to import mails from Lotus "
-"or other mailers that use the Lotus Notes Structured Text format.</p>"
-"<p><b>Note:</b> Since it is possible to recreate the folder structure, the "
-"imported messages will be stored in subfolders under: \"LNotes-Import\", in "
-"your local folder, named using the names of the files the messages came "
-"from.</p>"
-msgstr ""
-"<p><b>ตัวกรองการนำเข้าอีเมลข้อความในโครงสร้างของ Lotus Notes</b></p>"
-"<p>ตัวกรองนี้จะทำการนำเข้าแฟ้มข้อความที่มีโครงสร้างแบบที่ถูกส่งออกมาจาก Lotus "
-"Notes เข้ามาใน KMail. ใช้ตัวกรองนี้หากว่าคุณต้องการที่จะนำเข้าอีเมลจาก Lotus "
-"หรือโปรแกรมอีเมลอื่นที่ใช้รูปแบบข้อความโครงสร้างแบบ Lotus Notes</p>"
-"<p><b>ข้อสังเกต:</b> "
-"เนื่องจากมีความเป็นไปได้ที่จะมีการสร้างโครงสร้างโฟลเดอร์ขึ้นมาใหม่ "
-"ข้อความที่ถูกนำเข้ามาจะถูกเก็บเอาไว้ที่โฟลเดอร์ย่อยr: \"LNotes-Import\", "
-"ในโฟลเดอร์ ในเครื่องของคุณโดยใช้ชื่อของแฟ้มที่ข้อความนั้นมาจาก</p>"
-
-#: filter_lnotes.cxx:56
-msgid "All Files (*)"
-msgstr "แฟ้มทั้งหมด(*)"
-
-#: filter_lnotes.cxx:65
-#, c-format
-msgid "Importing emails from %1"
-msgstr "กำลังนำเข้าอีเมลจาก %1"
-
-#: filter_thebat.cxx:33
-msgid "Import The Bat! Mails and Folder Structure"
-msgstr "นำเข้าอีเมลและดครงสร้างโฟลเดอร์ของ Bat! Mail"
-
-#: filter_thebat.cxx:35
-msgid ""
-"<p><b>The Bat! import filter</b></p>"
-"<p>Select the base directory of the 'The Bat!' local mailfolder you want to "
-"import.</p>"
-"<p><b>Note:</b> This filter imports the *.tbb-files from 'The Bat!' local "
-"folder, e.g. from POP accounts, and not from IMAP/DIMAP accounts.</p>"
-"<p>Since it is possible to recreate the folder structure, the folders will be "
-"stored under: \"TheBat-Import\" in your local account.</p>"
+"stored under: \"Thunderbird-Import\".</p>"
 msgstr ""
-"<p><b>ตัวกรองการนำเข้า The Bat!</b></p>"
-"<p>เลือกไดเร็คทอรีหลักของโฟลเดอร์เก็บอีเมลของ 'The Bat!'ที่คุณต้องการจะนำเข้า "
-"</p>"
-"<p><b>ข้อสังเกต:</b> ตัวกรองนี้จะทำการนำเข้าแฟ้ม *.tbb-files จากโฟลเดอร์ 'The "
-"Bat!' ต.ย.เช่น จากบัญชี POP, และไม่ใช่จากบัญชี IMAP/DIMAP</p>"
-"<p>เนื่องจากมีความเป็นไปได้ที่จะมีการสร้างโครงสร้างโฟลเดอร์ใหม่ โฟลเดอร์ต่างๆ "
-"จะถูกเก็บเอาไว้ที่: \"TheBat-Import\" ในบัญชีบนเครื่องของคุณ.</p>"
-
-#: kselfilterpage.cpp:76
-msgid "<p><i>Written by %1.</i></p>"
-msgstr "<p><i>ถูกเขียนโดย %1.</i></p>"
+"<p><b>ตัวกรองการนำเข้า Thunderbird/Mozilla</b></p> "
+"<p>เลือกโฟลเดอร์เก็บจดหมายหลักในโปรแกรม Thunderbird/Mozilla ของคุณ (ตามปกติคือ "
+"~/.thunderbird/*.default/Mail/Local Folders/)</p> "
+"<p><b>ข้อสังเกต:</b> อย่าเลือกโฟลเดอร์ที่ <u>ไม่ได้</u> "
+"มีแฟ้ม mbox-file (ตัวอย่างเช่น maildir): หากคุณทำแบบนั้น "
+"คุณจะได้โฟลเดอร์ใหม่มามากมาย</p> "
+"<p>เพราะว่ามีความเป็นไปได้ในการสาร้างโครงสร้างโฟลเดอร์ใหม่ ดังนั้นโฟลเดอร์ต่างๆ "
+"จะถูกเก็บไว้ที่: \"Thunderbird-Import\"</p>"
 
-#: filter_outlook.cxx:28
-msgid "Import Outlook Emails"
-msgstr "นำเข้าอีเมลของ Outlook"
+#: filter_opera.cxx:28
+msgid "Import Opera Emails"
+msgstr "นำเข้าอีเมลจากโอเปร่า"
 
-#: filter_outlook.cxx:30
+#: filter_opera.cxx:30
 msgid ""
-"<p><b>Outlook email import filter</b></p>"
-"<p>This filter will import mails from a Outlook pst-file. You will need to "
-"locate the folder where the pst-file has been stored by searching for .pst "
-"files under: <i>C:\\Documents and Settings</i> in Windows 2000 or later</p>"
+"<p><b>Opera email import filter</b></p>"
+"<p>This filter will import mails from Opera mail folder. Use this filter if you "
+"want to import all mails within a account in the Opera maildir.</p>"
+"<p>Select the directory of the account (usually "
+"~/.opera/mail/store/account*).</p>"
 "<p><b>Note:</b> Emails will be imported into a folder named after the account "
-"they came from, prefixed with OUTLOOK-</p>"
+"they came from, prefixed with OPERA-</p>"
 msgstr ""
-"<p><b>ตัวกรองการนำเข้าอีเมลจาก Outlook</b></p>"
-"<p>ตัวกรองนี้จะทำการนำเข้าอีเมลจากแฟ้ม pst ของโปรแกรม Outlook "
-"คุณจำเป็นต้องระบุที่ตั้งของโฟลเดอร์ที่เก็บแฟ้ม pst อยู่ โดยการหาแฟ้ม .pst ที่: "
-"<i>C:\\Documents and Settings</i> ใน Windows 2000 หรือรุ่นหลังจากนี้</p>"
+"<p><b>ตัวกรองการนำเข้าอีเมลจากโอเปร่า</b></p> "
+"<p>ตัวกรองนี้จะทำการนำเข้าอีเมลจากโฟลเดอร์เก็บอีเมลของโอเปร่า ให้ใช้ตัวกรองนี้ "
+"หากคุณต้องการที่จะนำเข้าอีเมลทั้งหมดภายในบัญชีผู้ใช้ "
+"ในไดเร็คทอรีเก็บอีเมลของโอเปร่า</p> "
+"<p>เลือกไดเร็คทอรีของบัญชีผู้ใช้ (ตามปกติคือ ~/.opera/mail/store/account*)</p> "
 "<p><b>ข้อสังเกต:</b> "
-"อีเมลจะถูกนำเข้าไปยังโฟลเดอร์ที่มีชื่อเดียวกันกับบัญชีที่มา แล้วนำหน้าด้วย "
-"OUTLOOK-</p>"
+"อีเมลจะถูกนำเข้าสูโฟลเดอร์ที่ชื่อเหมือนกับบัญชีผู้ใช้ที่นำเข้ามา โดยจะมี OPERA- "
+"นำหน้าอยู่</p>"
 
-#: filter_outlook.cxx:47
-msgid "Counting mail..."
-msgstr "กำลังนับอีเมล..."
+#: main.cpp:33
+msgid "KMailCVT"
+msgstr "KMailCVT"
 
-#: filter_outlook.cxx:48
-msgid "Counting directories..."
-msgstr "กำลังนับไดเร็คทอรี..."
+#: main.cpp:34
+msgid "KMail Import Filters"
+msgstr "ตัวกรองสำหรับนำเข้าอีเมลของโปรแกรม KMail"
 
-#: filter_outlook.cxx:49
-msgid "Counting folders..."
-msgstr "กำลังนับโฟลเดอร์..."
+#: main.cpp:35
+msgid "(c) 2000-2005, The KMailCVT developers"
+msgstr "สงวนลิขสิทธิ์ (c) 2000-2005, ผู้พัฒนา The KMailCVT"
 
-#: filter_plain.cxx:27
-msgid "Import Plain Text Emails"
-msgstr "นำเข้าจดหมายข้อความธรรมดา"
+#: main.cpp:36
+msgid "Original author"
+msgstr "ผู้เขียนดั้งเดิม"
 
-#: filter_plain.cxx:29
-msgid ""
-"<p>Select the directory containing the emails on your system. The emails are "
-"placed in a folder with the same name as the directory they were in, prefixed "
-"by PLAIN-</p>"
-"<p>This filter will import all .msg, .eml and .txt emails.</p>"
-msgstr ""
-"<p>เลือกไดเร็คทอรีที่มีอีเมลบนระบบของคุณ "
-"แล้วอีเมลจะถูกใส่ไว้ในโฟลเดอร์ที่มีชื่อเดียวกับ ไดเร็คทอรีที่เก็บอีเมลไว้ "
-"โดยจะนำหนัาด้วย PLAIN-ฒฝยฬ "
-"<p>ตัวกรองนี้จะทำการนำเข้าอีเมลที่มีนามสกุล .msg, .eml และ .txt ทั้งหมด</p>"
+#: main.cpp:37
+msgid "Maintainer & New filters"
+msgstr "ผู้ดูแล & ตัวกรองใหม่ๆ"
+
+#: main.cpp:38 main.cpp:39
+msgid "New GUI & cleanups"
+msgstr "ส่วนติดต่อผู้ใช้แบบกราฟิกส์แบบใหม่ & ทำความสะอาด"
diff --git a/tde-i18n-th/messages/tdepim/knode.po b/tde-i18n-th/messages/tdepim/knode.po
index b9681329571..d92b9851f91 100644
--- a/tde-i18n-th/messages/tdepim/knode.po
+++ b/tde-i18n-th/messages/tdepim/knode.po
@@ -5,10 +5,11 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: knode\n"
-"POT-Creation-Date: 2008-07-22 01:18+0200\n"
+"POT-Creation-Date: 2014-09-29 00:52-0500\n"
 "PO-Revision-Date: 2003-03-10 10:59+0700\n"
 "Last-Translator: Thanomsub Noppaburana <donga_n@yahoo.com>\n"
 "Language-Team: Thai <th@li.org>\n"
+"Language: th\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -30,20 +31,20 @@ msgstr "donga_n@yahoo.com"
 msgid "Maintainer"
 msgstr "ผู้ดูแล"
 
-#: aboutdata.cpp:31
+#: aboutdata.cpp:31 aboutdata.cpp:32
 #, fuzzy
 msgid "Former maintainer"
 msgstr "ผู้ดูแล"
 
-#: aboutdata.cpp:45 knjobdata.cpp:120
+#: aboutdata.cpp:46 knjobdata.cpp:120
 msgid "KNode"
 msgstr "KNode"
 
-#: aboutdata.cpp:47
+#: aboutdata.cpp:48
 msgid "A newsreader for TDE"
 msgstr "โปรแกรมอ่านข่าวสำหรับ TDE"
 
-#: aboutdata.cpp:49
+#: aboutdata.cpp:50
 #, fuzzy
 msgid "Copyright (c) 1999-2005 the KNode authors"
 msgstr "สงวนลิขสิทธิ์ (c) 1999-2002 กลุ่มผู้เขียน KNode"
@@ -131,7 +132,7 @@ msgstr ""
 msgid "Chars&et"
 msgstr "ชุดรหัสอักขระ"
 
-#: articlewidget.cpp:196 articlewidget.cpp:1362
+#: articlewidget.cpp:196 articlewidget.cpp:1371
 msgid "Automatic"
 msgstr "อัตโนมัติ"
 
@@ -169,22 +170,22 @@ msgstr "เปิดสิ่งที่แนบมาด้วย"
 msgid "&Save Attachment As..."
 msgstr "บันทึกสิ่งที่แนบมาด้วย..."
 
-#: articlewidget.cpp:341
+#: articlewidget.cpp:345
 #, fuzzy
 msgid "Unable to load the article."
 msgstr "ไม่สามารถโหลดข่าวได้ !"
 
-#: articlewidget.cpp:373
+#: articlewidget.cpp:377
 #, fuzzy
 msgid "The article contains no data."
 msgstr "ข่าวไม่มีข้อมูลอยู่"
 
-#: articlewidget.cpp:400
+#: articlewidget.cpp:405
 #, fuzzy
 msgid "Unknown charset. Default charset is used instead."
 msgstr "ไม่รู้จักชุดรหัสอักขระ ! จะใช้ชุดรหัสอักขระโดยปริยายแทน"
 
-#: articlewidget.cpp:460
+#: articlewidget.cpp:465
 #, fuzzy
 msgid ""
 "<br/><b>This article has the MIME type &quot;message/partial&quot;, which KNode "
@@ -197,7 +198,7 @@ msgstr ""
 "<br> ดังนั้น คุณควรบันทึกข่าวนี้ให้เป็นแฟ้มข้อความก่อน "
 "แล้วจัดการแก้ไขมันด้วยตัวเอง</b></bodyblock></qt>"
 
-#: articlewidget.cpp:477
+#: articlewidget.cpp:482
 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 "
@@ -205,75 +206,75 @@ msgid ""
 "by clicking here</a>."
 msgstr ""
 
-#: articlewidget.cpp:523
+#: articlewidget.cpp:528
 #, fuzzy
 msgid "An error occurred."
 msgstr ""
 "เกิดความผิดพลาด:\n"
 "%1"
 
-#: articlewidget.cpp:656
+#: articlewidget.cpp:663
 msgid "References:"
 msgstr "อ้างถึง:"
 
-#: articlewidget.cpp:742
+#: articlewidget.cpp:750
 #, c-format
 msgid "Message was signed with unknown key 0x%1."
 msgstr "ข้อความถูกเซ็นด้วยกุญแจที่ไม่รู้จัก 0x%1"
 
-#: articlewidget.cpp:745
+#: articlewidget.cpp:753
 #, fuzzy
 msgid "The validity of the signature cannot be verified."
 msgstr "ไม่สามารถทำการตรวจสอบลายเซ็นต์ได้"
 
-#: articlewidget.cpp:763
+#: articlewidget.cpp:771
 msgid "Message was signed by %1 (Key ID: 0x%2)."
 msgstr "ข้อความถูกเซ็นโดย %1 (หมายเลขกุญแจ: 0x%2)."
 
-#: articlewidget.cpp:767
+#: articlewidget.cpp:775
 #, c-format
 msgid "Message was signed by %1."
 msgstr "ข้อความถูกเซ็นโดย %1"
 
-#: articlewidget.cpp:777
+#: articlewidget.cpp:785
 msgid "The signature is valid, but the key's validity is unknown."
 msgstr "ลายเซ็นใช้ได้ แต่ไม่รู้จักกุญแจที่ใช้เซ็นต์"
 
-#: articlewidget.cpp:781
+#: articlewidget.cpp:789
 msgid "The signature is valid and the key is marginally trusted."
 msgstr "ลายเซ็นใช้ได้ และกุญแจสามารถเชื่อถือได้"
 
-#: articlewidget.cpp:785
+#: articlewidget.cpp:793
 msgid "The signature is valid and the key is fully trusted."
 msgstr "ลายเซ็นใช้ได้ และกุญแจสามารถเชื่อถือได้มาก"
 
-#: articlewidget.cpp:789
+#: articlewidget.cpp:797
 msgid "The signature is valid and the key is ultimately trusted."
 msgstr "ลายเซ็นใช้ได้ และกุญแจสามารถเชื่อถือได้มากที่สุด"
 
-#: articlewidget.cpp:793
+#: articlewidget.cpp:801
 msgid "The signature is valid, but the key is untrusted."
 msgstr "ลายเซ็นใช้ได้ แต่กุญแจไม่สามารถเชื่อถือได้"
 
-#: articlewidget.cpp:797
+#: articlewidget.cpp:805
 msgid "Warning: The signature is bad."
 msgstr "คำเตือน: ลายเซ็นใช้ไม่ได้"
 
-#: articlewidget.cpp:814
+#: articlewidget.cpp:822
 #, fuzzy
 msgid "End of signed message"
 msgstr " กำลังส่งจดหมาย..."
 
-#: articlewidget.cpp:830
+#: articlewidget.cpp:838
 msgid "unnamed"
 msgstr "ยังไม่มีชื่อ"
 
-#: articlewidget.cpp:1024
+#: articlewidget.cpp:1032
 msgid ""
 "An error occurred while downloading the article source:\n"
 msgstr ""
 
-#: articlewidget.cpp:1380 kncomposer.cpp:1218
+#: articlewidget.cpp:1389 kncomposer.cpp:1218
 msgid "Select Charset"
 msgstr "เลือกชุดรหัสอักขระ"
 
@@ -1115,6 +1116,11 @@ msgstr "เพิ่ม"
 msgid "Suggestions"
 msgstr "คำถาม"
 
+#: kncomposer.cpp:2072
+#, fuzzy
+msgid "No Suggestions"
+msgstr "คำถาม"
+
 #: kncomposer.cpp:2498
 msgid "Type"
 msgstr "ประเภท"
@@ -2664,7 +2670,8 @@ msgid " Ready"
 msgstr " พร้อม"
 
 #: knmainwidget.cpp:354
-msgid "TDE News Reader"
+#, fuzzy
+msgid "KDE News Reader"
 msgstr "เครื่องมืออ่านข่าวของ TDE"
 
 #: knmainwidget.cpp:552
diff --git a/tde-i18n-th/messages/tdepim/knotes.po b/tde-i18n-th/messages/tdepim/knotes.po
index 3bd9aa702b6..1be10f749d2 100644
--- a/tde-i18n-th/messages/tdepim/knotes.po
+++ b/tde-i18n-th/messages/tdepim/knotes.po
@@ -6,10 +6,11 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: knotes\n"
-"POT-Creation-Date: 2008-01-26 01:19+0100\n"
+"POT-Creation-Date: 2014-09-29 00:52-0500\n"
 "PO-Revision-Date: 2006-10-06 22:11+1000\n"
 "Last-Translator: Sahachart Anukulkitch <drrider@gmail.com>\n"
 "Language-Team: Thai <l10n@opentle.org>\n"
+"Language: th\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -83,35 +84,35 @@ msgstr "ไปยังพื้นที่ทำงาน"
 msgid "Walk Through Notes"
 msgstr "บันทึกโดยละเอียด"
 
-#: knote.cpp:379
+#: knote.cpp:396
 msgid "<qt>Do you really want to delete note <b>%1</b>?</qt>"
 msgstr "<qt>คุณต้องการจะลบบันทึกช่วยจำ <b>%1</b> นี้จริงหรือไม่ ?</qt>"
 
-#: knote.cpp:380
+#: knote.cpp:397
 msgid "Confirm Delete"
 msgstr "ยืนยันการลบ"
 
-#: knote.cpp:690
+#: knote.cpp:711
 msgid "Please enter the new name:"
 msgstr "โปรดเติมชื่อใหม่:"
 
-#: knote.cpp:762
+#: knote.cpp:804
 msgid "Send \"%1\""
 msgstr "ส่ง \"%1\""
 
-#: knote.cpp:771
+#: knote.cpp:814
 msgid "The host cannot be empty."
 msgstr "ชื่อโฮสต์ไม่สามารถปล่อยว่างได้"
 
-#: knote.cpp:800
+#: knote.cpp:843
 msgid "Unable to start the mail process."
 msgstr "ไม่สามารถเริ่มโปรเซสจดหมายได้"
 
-#: knote.cpp:829
+#: knote.cpp:871
 msgid "Save note as plain text"
 msgstr "บันทึกบันทึกช่วยจำในแบบข้อความปกติ"
 
-#: knote.cpp:844
+#: knote.cpp:890
 msgid ""
 "<qt>A file named <b>%1</b> already exists."
 "<br>Are you sure you want to overwrite it?</qt>"
@@ -119,7 +120,7 @@ msgstr ""
 "<qt>มีแฟ้มที่ชื่อ <b>%1</b> อยู่แล้ว"
 "<br>คุณต้องการจะเขียนทับมันหรือไม่ ?</qt>"
 
-#: knote.cpp:933
+#: knote.cpp:981
 msgid "&All Desktops"
 msgstr "ทุกพื้นที่ทำงาน"
 
@@ -267,79 +268,87 @@ msgstr "&พอร์ต:"
 msgid "&Style:"
 msgstr "รูปแ&บบ:"
 
-#: knoteedit.cpp:69
+#: knoteedit.cpp:71
 msgid "Bold"
 msgstr "ตัวหนา"
 
-#: knoteedit.cpp:73
+#: knoteedit.cpp:75
 msgid "Underline"
 msgstr "ตัวขีดเส้นใต้"
 
-#: knoteedit.cpp:75
+#: knoteedit.cpp:77
 msgid "Strike Out"
 msgstr "ตัวขีดเส้นพาดกลาง"
 
-#: knoteedit.cpp:83
+#: knoteedit.cpp:85
 msgid "Align Left"
 msgstr "จัดเรียงชิดซ้าย"
 
-#: knoteedit.cpp:87
+#: knoteedit.cpp:89
 msgid "Align Center"
 msgstr "จัดเรียงกึ่งกลาง"
 
-#: knoteedit.cpp:90
+#: knoteedit.cpp:92
 msgid "Align Right"
 msgstr "จัดเรียงชิดขวา"
 
-#: knoteedit.cpp:93
+#: knoteedit.cpp:95
 msgid "Align Block"
 msgstr "กระจายเต็มความกว้าง"
 
-#: knoteedit.cpp:102
+#: knoteedit.cpp:104
 msgid "List"
 msgstr "รายการ"
 
-#: knoteedit.cpp:108
+#: knoteedit.cpp:110
 msgid "Superscript"
 msgstr "ตัวยก"
 
-#: knoteedit.cpp:111
+#: knoteedit.cpp:113
 msgid "Subscript"
 msgstr "ตัวห้อย"
 
-#: knoteedit.cpp:130
+#: knoteedit.cpp:132
 msgid "Text Color..."
 msgstr "สีข้อความ..."
 
-#: knoteedit.cpp:133
+#: knoteedit.cpp:135
 msgid "Text Font"
 msgstr "แบบอักษรของข้อความ"
 
-#: knoteedit.cpp:138
+#: knoteedit.cpp:140
 msgid "Text Size"
 msgstr "ขนาดของข้อความ"
 
+#: knoteedit.cpp:543
+msgid "Check Spelling..."
+msgstr ""
+
+#: knoteedit.cpp:550
+msgid "Allow Tabulations"
+msgstr ""
+
 #: knotehostdlg.cpp:53
 msgid "Hostname or IP address:"
 msgstr "ชื่อโฮสต์หรือหมายเลขไอพี:"
 
-#: knoteprinter.cpp:117
+#: knoteprinter.cpp:120
 #, c-format
 msgid "Print %1"
 msgstr "พิมพ์ %1"
 
-#: knoteprinter.cpp:133
+#: knoteprinter.cpp:136
 #, c-format
 msgid ""
 "_n: Print Note\n"
 "Print %n notes"
 msgstr ""
 
-#: knotesalarm.cpp:74
+#: knotesalarm.cpp:75
 msgid "The following notes triggered alarms:"
 msgstr "บันทึกช่วยจำต่อไปนี้ส่งสัญญาณให้แจ้งเตือน:"
 
-#: knotesalarm.cpp:74
+#: knotesalarm.cpp:75
 msgid "Alarm"
 msgstr "แจ้งเตือน"
 
@@ -371,11 +380,11 @@ msgstr "แสดงบันทึกช่วยจำทั้งหมด"
 msgid "Hide All Notes"
 msgstr "ซ่อนบันทึกช่วยจำทั้งหมด"
 
-#: knotesapp.cpp:544
+#: knotesapp.cpp:567
 msgid "Settings"
 msgstr "ตั้งค่า"
 
-#: knotesapp.cpp:686
+#: knotesapp.cpp:734
 msgid "No Notes"
 msgstr "ไม่มีบันทึกช่วยจำ"
 
@@ -407,7 +416,8 @@ msgid "Original KNotes Author"
 msgstr "ผู้เขียน KNotes แรกเริ่ม"
 
 #: main.cpp:104
-msgid "Ported KNotes to TDE 2"
+#, fuzzy
+msgid "Ported KNotes to KDE 2"
 msgstr "พอร์ต KNotes มายัง TDE 2"
 
 #: main.cpp:105
@@ -415,7 +425,8 @@ msgid "Network Interface"
 msgstr "อุปกรณ์เครือข่าย"
 
 #: main.cpp:106
-msgid "Started TDE Resource Framework Integration"
+#, fuzzy
+msgid "Started KDE Resource Framework Integration"
 msgstr "เริ่มรวมเฟรมเวอร์กทรัพยากรของ TDE"
 
 #: main.cpp:108
diff --git a/tde-i18n-th/messages/tdepim/kontact.po b/tde-i18n-th/messages/tdepim/kontact.po
index 1664afc3543..ca78f1b462b 100644
--- a/tde-i18n-th/messages/tdepim/kontact.po
+++ b/tde-i18n-th/messages/tdepim/kontact.po
@@ -4,10 +4,11 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: kontact\n"
-"POT-Creation-Date: 2008-07-24 01:19+0200\n"
+"POT-Creation-Date: 2014-09-29 00:52-0500\n"
 "PO-Revision-Date: 2005-11-29 16:11+0700\n"
 "Last-Translator: Thanomsub Noppaburana <donga_n@yahoo.com>\n"
 "Language-Team: Thai <th@li.org>\n"
+"Language: th\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -59,27 +60,27 @@ msgstr "<p><b>ผู้แปลภาษา:</b></p>"
 msgid "%1 License"
 msgstr "สัญญาอนุญาตสิทธิ์ของ %1"
 
-#: src/iconsidepane.cpp:456
+#: src/iconsidepane.cpp:447
 msgid "Icon Size"
 msgstr "ขนาดไอคอน"
 
-#: src/iconsidepane.cpp:457
+#: src/iconsidepane.cpp:448
 msgid "Large"
 msgstr "ใหญ่"
 
-#: src/iconsidepane.cpp:459
+#: src/iconsidepane.cpp:450
 msgid "Normal"
 msgstr "ปกติ"
 
-#: src/iconsidepane.cpp:461
+#: src/iconsidepane.cpp:452
 msgid "Small"
 msgstr "เล็ก"
 
-#: src/iconsidepane.cpp:467
+#: src/iconsidepane.cpp:458
 msgid "Show Icons"
 msgstr "แสดงไอคอน"
 
-#: src/iconsidepane.cpp:470
+#: src/iconsidepane.cpp:461
 msgid "Show Text"
 msgstr "แสดงข้อความ"
 
@@ -87,7 +88,7 @@ msgstr "แสดงข้อความ"
 msgid "kontactconfig"
 msgstr ""
 
-#: src/kcmkontact.cpp:92 src/mainwindow.cpp:292
+#: src/kcmkontact.cpp:92 src/mainwindow.cpp:301
 msgid "TDE Kontact"
 msgstr ""
 
@@ -95,96 +96,99 @@ msgstr ""
 msgid "(c), 2003 Cornelius Schumacher"
 msgstr "(c), 2003 Cornelius Schumacher"
 
-#: src/main.cpp:47
+#: src/main.cpp:48
 msgid "TDE personal information manager"
 msgstr "โปรแกรมจัดการข้อมูลส่วนบุคคลบน TDE"
 
-#: src/main.cpp:125
+#: src/main.cpp:147
 msgid "Kontact"
 msgstr "Kontact"
 
-#: src/main.cpp:126
+#: src/main.cpp:148
 #, fuzzy
-msgid "(C) 2001-2008 The Kontact developers"
+msgid ""
+"(C) 2008-2010 The Trinity Desktop Project\n"
+"(C) 2001-2008 The Kontact developers"
 msgstr "(C) 2001-2004 กลุ่มผู้พัฒนา Kontact"
 
-#: src/main.cpp:135
+#: src/main.cpp:157
 msgid "Original Author"
 msgstr "ผู้เขียนแรกเริ่ม"
 
-#: src/mainwindow.cpp:100
+#: src/mainwindow.cpp:101
 #, fuzzy
 msgid "Select Components ..."
 msgstr "เลือกส่วนประกอบ..."
 
-#: src/mainwindow.cpp:260
+#: src/mainwindow.cpp:139
+#, c-format
+msgid "Switch to plugin %1"
+msgstr ""
+
+#: src/mainwindow.cpp:269
 msgid ""
 "<h2 style='text-align:center; margin-top: 0px; margin-bottom: 0px'>%1</h2>"
 msgstr ""
 "<h2 style='text-align:center; margin-top: 0px; margin-bottom: 0px'>%1</h2>"
 
-#: src/mainwindow.cpp:261
+#: src/mainwindow.cpp:270
 msgid "Loading Kontact..."
 msgstr "กำลังโหลด Kontact..."
 
-#: src/mainwindow.cpp:271
+#: src/mainwindow.cpp:280
 msgid " Initializing..."
 msgstr " กำลังเริ่มการทำงาน..."
 
-#: src/mainwindow.cpp:293
+#: src/mainwindow.cpp:302
 msgid "Get Organized!"
 msgstr ""
 
-#: src/mainwindow.cpp:294
+#: src/mainwindow.cpp:303
 msgid "The TDE Personal Information Management Suite"
 msgstr "ชุดโปรแกรมจัดการข้อมูลส่วนบุคคลบน TDE"
 
-#: src/mainwindow.cpp:328
+#: src/mainwindow.cpp:337
 msgid "New"
 msgstr ""
 
-#: src/mainwindow.cpp:337
+#: src/mainwindow.cpp:346
 #, fuzzy
 msgid "Synchronize"
 msgstr "ขนาดไอคอน"
 
-#: src/mainwindow.cpp:341
+#: src/mainwindow.cpp:350
 msgid "Configure Kontact..."
 msgstr "ปรับแต่ง Kontact..."
 
-#: src/mainwindow.cpp:344
+#: src/mainwindow.cpp:353
 #, fuzzy
 msgid "Configure &Profiles..."
 msgstr "ปรับแต่งการแสดงหน้าสรุป..."
 
-#: src/mainwindow.cpp:347
+#: src/mainwindow.cpp:356
 msgid "&Kontact Introduction"
 msgstr "บทแนะนำ Kontact"
 
-#: src/mainwindow.cpp:349
+#: src/mainwindow.cpp:358
 msgid "&Tip of the Day"
 msgstr "เคล็ดลับประจำวัน"
 
-#: src/mainwindow.cpp:351
-msgid "&Request Feature..."
-msgstr "แจ้งคุณสมบัติที่ต้องการ..."
-
-#: src/mainwindow.cpp:683
+#: src/mainwindow.cpp:784
 msgid "Application is running standalone. Foregrounding..."
 msgstr ""
 
-#: src/mainwindow.cpp:695
+#: src/mainwindow.cpp:796
 #, c-format
 msgid "Cannot load part for %1."
 msgstr ""
 
-#: src/mainwindow.cpp:749
+#: src/mainwindow.cpp:851
 msgid ""
 "_: Plugin dependent window title\n"
 "%1 - Kontact"
 msgstr ""
 
-#: src/mainwindow.cpp:1062
+#: src/mainwindow.cpp:1170
 msgid ""
 "<h2 style='text-align:center; margin-top: 0px;'>Welcome to Kontact %1</h2>"
 "<p>%1</p><table align=\"center\">"
@@ -219,34 +223,34 @@ msgstr ""
 "<br><span id=\"subtext\"><nobr>%1</td></tr></table><p style=\"margin-bottom: "
 "0px\"> <a href=\"%1\">ข้ามบทแนะนำนี้</a></p>"
 
-#: src/mainwindow.cpp:1074
+#: src/mainwindow.cpp:1182
 msgid ""
 "Kontact handles your e-mail, addressbook, calendar, to-do list and more."
 msgstr ""
 "โปรแกรม Kontact ใช้สำหรับจัดการจดหมายอิเล็กทรอนิกส์, สมุดที่อยู่, ปฏิทิน, "
 "รายการสิ่งที่จะทำของคุณ และความสามารถอื่น ๆ อีกหลายอย่าง"
 
-#: src/mainwindow.cpp:1080
+#: src/mainwindow.cpp:1188
 msgid "Read Manual"
 msgstr "อ่านคู่มือการใช้งาน"
 
-#: src/mainwindow.cpp:1081
+#: src/mainwindow.cpp:1189
 msgid "Learn more about Kontact and its components"
 msgstr "ทำความรู้จัก Kontact และส่วนประกอบของมันให้มากขึ้น"
 
-#: src/mainwindow.cpp:1087
+#: src/mainwindow.cpp:1195
 msgid "Visit Kontact Website"
 msgstr "เยี่ยมชมเว็บไซต์ของ Kontact"
 
-#: src/mainwindow.cpp:1088
+#: src/mainwindow.cpp:1196
 msgid "Access online resources and tutorials"
 msgstr "เข้าใช้ทรัพยากรและบทแนะนำการใช้งานออนไลน์"
 
-#: src/mainwindow.cpp:1094
+#: src/mainwindow.cpp:1202
 msgid "Configure Kontact as Groupware Client"
 msgstr "ปรับแต่ง Kontact เป็นไคลเอนต์ Groupware"
 
-#: src/mainwindow.cpp:1095
+#: src/mainwindow.cpp:1203
 msgid "Prepare Kontact for use in corporate networks"
 msgstr "ตระเตียม Kontact สำหรับใช้งานในเครือข่ายขององค์กร"
 
@@ -365,6 +369,16 @@ msgstr "เริ่มการทำงานในโหมดย่อเป
 msgid "List all possible modules and exit"
 msgstr "แสดงรายการที่มีอยู่และจบการทำงาน"
 
+#: interfaces/uniqueapphandler.cpp:191
+#, fuzzy
+msgid "List all possible profiles and exit"
+msgstr "แสดงรายการที่มีอยู่และจบการทำงาน"
+
+#: interfaces/uniqueapphandler.cpp:192
+#, fuzzy
+msgid "Start with a specific Kontact profile"
+msgstr "เริ่มการทำงานด้วยโมดูล Kontact ที่กำหนด"
+
 #: plugins/akregator/akregator_plugin.cpp:57
 #: plugins/newsticker/kcmkontactknt.cpp:380
 msgid "New Feed..."
@@ -382,15 +396,15 @@ msgstr ""
 msgid "Synchronize Contacts"
 msgstr ""
 
-#: plugins/kaddressbook/kaddressbook_plugin.cpp:160
-#: plugins/korganizer/korganizerplugin.cpp:194
-#: plugins/korganizer/todoplugin.cpp:208
+#: plugins/kaddressbook/kaddressbook_plugin.cpp:159
+#: plugins/korganizer/korganizerplugin.cpp:219
+#: plugins/korganizer/todoplugin.cpp:210
 msgid "Drops of multiple mails are not supported."
 msgstr ""
 
-#: plugins/kaddressbook/kaddressbook_plugin.cpp:174
-#: plugins/korganizer/korganizerplugin.cpp:211
-#: plugins/korganizer/todoplugin.cpp:226
+#: plugins/kaddressbook/kaddressbook_plugin.cpp:173
+#: plugins/korganizer/korganizerplugin.cpp:236
+#: plugins/korganizer/todoplugin.cpp:228
 msgid "Cannot handle drop events of type '%1'."
 msgstr ""
 
@@ -586,21 +600,27 @@ msgstr "แสดงรายการสิ่งที่จะทำทั้
 msgid "Show today's to-dos only"
 msgstr "แสดงรายการสิ่งที่จะทำในวันนี้เท่านั้น"
 
-#: plugins/korganizer/korganizerplugin.cpp:63
+#: plugins/korganizer/korganizerplugin.cpp:67
 msgid "New Event..."
 msgstr "เหตุการณ์ใหม่..."
 
-#: plugins/korganizer/korganizerplugin.cpp:67
+#: plugins/korganizer/korganizerplugin.cpp:71
 msgid "Synchronize Calendar"
 msgstr ""
 
-#: plugins/korganizer/korganizerplugin.cpp:179
-#: plugins/korganizer/todoplugin.cpp:180
+#: plugins/korganizer/korganizerplugin.cpp:184
+#: plugins/korganizer/todoplugin.cpp:176
 msgid "Meeting"
 msgstr "ประชุม"
 
-#: plugins/korganizer/korganizerplugin.cpp:197
-#: plugins/korganizer/todoplugin.cpp:211
+#: plugins/korganizer/korganizerplugin.cpp:198
+#: plugins/korganizer/todoplugin.cpp:190
+#, fuzzy, c-format
+msgid "Note: %1"
+msgstr "อ่านบันทึกช่วยจำ: \"%1\""
+
+#: plugins/korganizer/korganizerplugin.cpp:222
+#: plugins/korganizer/todoplugin.cpp:213
 msgid ""
 "From: %1\n"
 "To: %2\n"
@@ -610,8 +630,8 @@ msgstr ""
 "ถึง: %2\n"
 "เรื่อง: %3"
 
-#: plugins/korganizer/korganizerplugin.cpp:205
-#: plugins/korganizer/todoplugin.cpp:220
+#: plugins/korganizer/korganizerplugin.cpp:230
+#: plugins/korganizer/todoplugin.cpp:222
 #, c-format
 msgid "Mail: %1"
 msgstr "จดหมาย: %1"
@@ -620,40 +640,40 @@ msgstr "จดหมาย: %1"
 msgid "Calendar"
 msgstr ""
 
-#: plugins/korganizer/summarywidget.cpp:173
+#: plugins/korganizer/summarywidget.cpp:164
 #: plugins/specialdates/sdsummarywidget.cpp:445
 msgid "Today"
 msgstr "วันนี้"
 
-#: plugins/korganizer/summarywidget.cpp:177
+#: plugins/korganizer/summarywidget.cpp:168
 #: plugins/specialdates/sdsummarywidget.cpp:447
 msgid "Tomorrow"
 msgstr "วันพรุ่งนี้"
 
-#: plugins/korganizer/summarywidget.cpp:236
+#: plugins/korganizer/summarywidget.cpp:227
 msgid ""
 "_: Time from - to\n"
 "%1 - %2"
 msgstr ""
 
-#: plugins/korganizer/summarywidget.cpp:252
+#: plugins/korganizer/summarywidget.cpp:243
 #, c-format
 msgid ""
 "_n: No appointments pending within the next day\n"
 "No appointments pending within the next %n days"
 msgstr "ไม่มีรายการนัดหมายในช่วง %n วันนี้"
 
-#: plugins/korganizer/summarywidget.cpp:281
+#: plugins/korganizer/summarywidget.cpp:272
 #, fuzzy
 msgid "&Edit Appointment..."
 msgstr "แก้ไขกำหนดนัดหมาย: \"%1\""
 
-#: plugins/korganizer/summarywidget.cpp:283
+#: plugins/korganizer/summarywidget.cpp:274
 #, fuzzy
 msgid "&Delete Appointment"
 msgstr "กำหนดนัดหมาย"
 
-#: plugins/korganizer/summarywidget.cpp:300
+#: plugins/korganizer/summarywidget.cpp:291
 msgid "Edit Appointment: \"%1\""
 msgstr "แก้ไขกำหนดนัดหมาย: \"%1\""
 
@@ -665,50 +685,45 @@ msgstr "เขียนรายการสิ่งที่จะทำให
 msgid "Synchronize To-do List"
 msgstr ""
 
-#: plugins/korganizer/todoplugin.cpp:192
-#, fuzzy, c-format
-msgid "Note: %1"
-msgstr "อ่านบันทึกช่วยจำ: \"%1\""
-
 #: plugins/korganizer/todosummarywidget.cpp:63
 #, fuzzy
 msgid "To-do"
 msgstr "สิ่งที่จะทำ"
 
-#: plugins/korganizer/todosummarywidget.cpp:117
+#: plugins/korganizer/todosummarywidget.cpp:116
 msgid "overdue"
 msgstr "เกินกำหนด"
 
-#: plugins/korganizer/todosummarywidget.cpp:125
+#: plugins/korganizer/todosummarywidget.cpp:124
 msgid "in progress"
 msgstr "อยู่ในระหว่างดำเนินการ"
 
-#: plugins/korganizer/todosummarywidget.cpp:131
+#: plugins/korganizer/todosummarywidget.cpp:130
 msgid "starts today"
 msgstr "เริ่มวันนี้"
 
-#: plugins/korganizer/todosummarywidget.cpp:137
+#: plugins/korganizer/todosummarywidget.cpp:136
 msgid "ends today"
 msgstr "สิ้นสุดวันนี้"
 
-#: plugins/korganizer/todosummarywidget.cpp:188
+#: plugins/korganizer/todosummarywidget.cpp:187
 msgid "No to-dos pending"
 msgstr "ไม่มีรายการสิ่งที่จะทำที่ค้างอยู่"
 
-#: plugins/korganizer/todosummarywidget.cpp:230
+#: plugins/korganizer/todosummarywidget.cpp:229
 #, fuzzy
 msgid "&Edit To-do..."
 msgstr "เขียนรายการสิ่งที่จะทำใหม่..."
 
-#: plugins/korganizer/todosummarywidget.cpp:232
+#: plugins/korganizer/todosummarywidget.cpp:231
 msgid "&Delete To-do"
 msgstr ""
 
-#: plugins/korganizer/todosummarywidget.cpp:236
+#: plugins/korganizer/todosummarywidget.cpp:235
 msgid "&Mark To-do Completed"
 msgstr ""
 
-#: plugins/korganizer/todosummarywidget.cpp:257
+#: plugins/korganizer/todosummarywidget.cpp:256
 msgid "Edit To-do: \"%1\""
 msgstr "แก้ไขรายการสิ่งที่จะทำ: \"%1\""
 
@@ -807,7 +822,7 @@ msgstr ""
 msgid "New News Feed"
 msgstr ""
 
-#: plugins/knotes/knotes_part_p.h:136 plugins/newsticker/kcmkontactknt.cpp:66
+#: plugins/knotes/knotes_part_p.h:137 plugins/newsticker/kcmkontactknt.cpp:66
 msgid "Name:"
 msgstr "ชื่อ:"
 
@@ -892,7 +907,7 @@ msgid "Copy URL to Clipboard"
 msgstr "คัดลอกตำแหน่ง URL ไปยังคลิปบอร์ด"
 
 #: plugins/specialdates/kcmsdsummary.cpp:90
-#: plugins/specialdates/specialdates_plugin.cpp:59
+#: plugins/specialdates/specialdates_plugin.cpp:61
 msgid "Special Dates Summary"
 msgstr "สรุปวันพิเศษ"
 
@@ -946,19 +961,19 @@ msgstr ""
 msgid "Active Calendar"
 msgstr ""
 
-#: plugins/specialdates/sdsummarywidget.cpp:289
+#: plugins/specialdates/sdsummarywidget.cpp:290
 msgid "BIRTHDAY"
 msgstr "วันเกิด"
 
-#: plugins/specialdates/sdsummarywidget.cpp:304
+#: plugins/specialdates/sdsummarywidget.cpp:305
 msgid "ANNIVERSARY"
 msgstr "วันครบรอบ"
 
-#: plugins/specialdates/sdsummarywidget.cpp:319
+#: plugins/specialdates/sdsummarywidget.cpp:320
 msgid "HOLIDAY"
 msgstr "วันหยุด"
 
-#: plugins/specialdates/sdsummarywidget.cpp:337
+#: plugins/specialdates/sdsummarywidget.cpp:338
 msgid "SPECIAL OCCASION"
 msgstr "โอกาสพิเศษ"
 
@@ -1015,12 +1030,12 @@ msgstr ""
 msgid "Mail to:\"%1\""
 msgstr "ส่งจดหมายถึง:\"%1\""
 
-#: plugins/specialdates/specialdates_plugin.cpp:61
+#: plugins/specialdates/specialdates_plugin.cpp:63
 msgid "Kontact Special Dates Summary"
 msgstr ""
 
-#: plugins/specialdates/specialdates_plugin.cpp:63
-msgid "(c) 2004-2005 The TDE PIM Team"
+#: plugins/specialdates/specialdates_plugin.cpp:65
+msgid "(c) 2004-2005 The KDE PIM Team"
 msgstr ""
 
 #: plugins/summary/kcmkontactsummary.cpp:98
@@ -1057,15 +1072,15 @@ msgstr ""
 msgid "Synchronize All"
 msgstr ""
 
-#: plugins/summary/summaryview_plugin.cpp:109
+#: plugins/summary/summaryview_plugin.cpp:112
 msgid "Kontact Summary"
 msgstr ""
 
-#: plugins/summary/summaryview_plugin.cpp:111
+#: plugins/summary/summaryview_plugin.cpp:114
 msgid "Kontact Summary View"
 msgstr ""
 
-#: plugins/summary/summaryview_plugin.cpp:113
+#: plugins/summary/summaryview_plugin.cpp:116
 msgid "(c) 2003 The Kontact developers"
 msgstr ""
 
@@ -1103,7 +1118,7 @@ msgstr "ข้อมูลภูมิอากาศ"
 msgid "Improvements and more code cleanups"
 msgstr ""
 
-#: plugins/knotes/knotes_part_p.h:121
+#: plugins/knotes/knotes_part_p.h:122
 msgid "Edit Note"
 msgstr "แก้ไขบันทึกช่วยจำ"
 
@@ -1119,6 +1134,9 @@ msgid ""
 "Your emails"
 msgstr "donga_n@yahoo.com"
 
+#~ msgid "&Request Feature..."
+#~ msgstr "แจ้งคุณสมบัติที่ต้องการ..."
+
 #~ msgid "New Messages"
 #~ msgstr "จดหมายใหม่"
 
diff --git a/tde-i18n-th/messages/tdepim/korganizer.po b/tde-i18n-th/messages/tdepim/korganizer.po
index 0b4e40250bf..ee9a8b9a79c 100644
--- a/tde-i18n-th/messages/tdepim/korganizer.po
+++ b/tde-i18n-th/messages/tdepim/korganizer.po
@@ -4,43 +4,29 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: korganizer\n"
-"POT-Creation-Date: 2008-08-19 01:19+0200\n"
+"POT-Creation-Date: 2014-09-29 00:52-0500\n"
 "PO-Revision-Date: 2005-11-29 23:27+0700\n"
 "Last-Translator: Thanomsub Noppaburana <donga_n@yahoo.com>\n"
 "Language-Team: Thai <th@li.org>\n"
+"Language: th\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: KBabel 1.11\n"
 
-#: actionmanager.cpp:467 actionmanager.cpp:1447 actionmanager.cpp:1475
-#: koeventpopupmenu.cpp:52 kotodoview.cpp:453
-msgid "&Show"
-msgstr "แสดง"
-
-#: actionmanager.cpp:470 actionmanager.cpp:1448 actionmanager.cpp:1476
-#: koeventpopupmenu.cpp:54 kotodoview.cpp:455 resourceview.cpp:599
-msgid "&Edit..."
-msgstr "แก้ไข..."
-
-#: koeventpopupmenu.cpp:76
-msgid "&Toggle Reminder"
-msgstr ""
-
-#: koeventpopupmenu.cpp:81
-msgid "&Dissociate This Occurrence"
-msgstr ""
-
-#: koeventpopupmenu.cpp:84
-msgid "&Dissociate Future Occurrences"
-msgstr ""
+#: _translatorinfo.cpp:1
+msgid ""
+"_: NAME OF TRANSLATORS\n"
+"Your names"
+msgstr "ถนอมทรัพย์ นพบูรณ์"
 
-#: koeventpopupmenu.cpp:88
-#, fuzzy
-msgid "Send as iCalendar..."
-msgstr "ปฏิทินใหม่"
+#: _translatorinfo.cpp:3
+msgid ""
+"_: EMAIL OF TRANSLATORS\n"
+"Your emails"
+msgstr "donga_n@yahoo.com"
 
-#: koeditordetails.cpp:194
+#: koeditordetails.cpp:192
 msgid ""
 "Displays information about current attendees. To edit an attendee, select it in "
 "this list and modify the values in the area below. Clicking on a column title "
@@ -49,853 +35,2118 @@ msgid ""
 msgstr ""
 
 #. i18n: file publishdialog_base.ui line 28
-#: koeditordetails.cpp:201 koprefsdialog.cpp:1063 rc.cpp:417 rc.cpp:1859
+#: koeditordetails.cpp:199 koprefsdialog.cpp:1106 rc.cpp:420 rc.cpp:2162
 #, no-c-format
 msgid "Name"
 msgstr "ชื่อ"
 
-#. i18n: file koeditoralarms_base.ui line 282
-#: koeditoralarms.cpp:89 koeditordetails.cpp:202 koprefsdialog.cpp:865
-#: rc.cpp:223 rc.cpp:420 rc.cpp:1862 rc.cpp:1937
+#. i18n: file koeditoralarms_base.ui line 288
+#: koeditoralarms.cpp:119 koeditordetails.cpp:200 koprefsdialog.cpp:903
+#: rc.cpp:223 rc.cpp:423 rc.cpp:2120 rc.cpp:2165
 #, no-c-format
 msgid "Email"
 msgstr "อีเมล"
 
-#: koeditordetails.cpp:203
+#: koeditordetails.cpp:201
 msgid "Role"
 msgstr ""
 
-#: koeditordetails.cpp:204
+#: koeditordetails.cpp:202
 msgid "Status"
 msgstr "สถานะ"
 
-#: koeditordetails.cpp:205
+#: koeditordetails.cpp:203
 msgid "RSVP"
 msgstr ""
 
-#: koeditordetails.cpp:206
+#: koeditordetails.cpp:204
 #, fuzzy
 msgid "Delegated to"
 msgstr "ลบ %1"
 
-#: koeditordetails.cpp:207
+#: koeditordetails.cpp:205
 #, fuzzy
 msgid "Delegated from"
 msgstr "ลบ %1"
 
-#: koeditordetails.cpp:311 koeditorfreebusy.cpp:760
+#: koeditordetails.cpp:331 koeditorfreebusy.cpp:785
 msgid ""
 "%1 does not look like a valid email address. Are you sure you want to invite "
 "this participant?"
 msgstr ""
 
-#: koeditordetails.cpp:313 koeditorfreebusy.cpp:762
+#: koeditordetails.cpp:333 koeditorfreebusy.cpp:787
 #, fuzzy
 msgid "Invalid email address"
 msgstr "ที่อยู่อีเมล"
 
-#: koviewmanager.cpp:334
-#, fuzzy
-msgid "Merged calendar"
-msgstr "ปฏิทินใหม่"
-
-#: koviewmanager.cpp:336
-msgid "Calendars Side by Side"
+#: koprefs.cpp:87
+msgid ""
+"_: Default export file\n"
+"calendar.html"
 msgstr ""
 
-#: filtereditdialog.cpp:51
-msgid "Edit Calendar Filters"
+#: koprefs.cpp:162
+msgid "Appointment"
+msgstr "กำหนดนัดหมาย"
+
+#: koprefs.cpp:162
+msgid "Business"
+msgstr "ธุรกิจ"
+
+#: koprefs.cpp:163
+msgid "Meeting"
+msgstr "ประชุม"
+
+#: koprefs.cpp:163
+msgid "Phone Call"
 msgstr ""
 
-#: filtereditdialog.cpp:99
-msgid "Press this button to define a new filter."
+#: koprefs.cpp:163
+msgid "Education"
+msgstr "การศึกษา"
+
+#: koprefs.cpp:164 printing/calprintpluginbase.cpp:286
+msgid "Holiday"
+msgstr "วันหยุด"
+
+#: koprefs.cpp:164
+msgid "Vacation"
+msgstr "วันพักร้อน"
+
+#: koprefs.cpp:164
+msgid "Special Occasion"
+msgstr "โอกาสพิเศษ"
+
+#: koprefs.cpp:165
+msgid "Personal"
 msgstr ""
 
-#: filtereditdialog.cpp:100
-msgid "Press this button to remove the currently active filter."
+#: koprefs.cpp:165
+msgid "Travel"
+msgstr "ท่องเที่ยว"
+
+#: koprefs.cpp:166
+msgid "Birthday"
+msgstr "วันเกิด"
+
+#: koeventviewer.cpp:63
+msgid "Open the message in KMail"
 msgstr ""
 
-#: filtereditdialog.cpp:189
+#: koeventviewer.cpp:65
 #, c-format
-msgid "New Filter %1"
+msgid "Send an email message to %1"
 msgstr ""
 
-#: filtereditdialog.cpp:201 koeditorattachments.cpp:377 koeventeditor.cpp:381
-#: kotodoeditor.cpp:327
-msgid "This item will be permanently deleted."
+#: koeventviewer.cpp:67
+msgid "Lookup the contact in KAddressbook"
 msgstr ""
 
-#: filtereditdialog.cpp:201
-msgid "Delete Confirmation"
+#: koeventviewer.cpp:73
+msgid "View attachment \"%1\""
 msgstr ""
 
-#: koeditorfreebusy.cpp:177
-#, fuzzy, c-format
-msgid "Location: %1"
-msgstr "ตำแหน่ง:"
+#: koeventviewer.cpp:76
+msgid "Launch a viewer on the link"
+msgstr ""
+
+#: koeventviewer.cpp:175
+msgid "Open Attachment"
+msgstr ""
+
+#: koeventviewer.cpp:176
+msgid "Save Attachment As..."
+msgstr ""
+
+#: koeventviewerdialog.cpp:33
+msgid "Event Viewer"
+msgstr ""
+
+#: aboutdata.cpp:32
+msgid "KOrganizer"
+msgstr ""
+
+#: aboutdata.cpp:33
+msgid "A Personal Organizer for TDE"
+msgstr ""
+
+#: aboutdata.cpp:41
+msgid "Current Developer/Maintainer"
+msgstr ""
+
+#: aboutdata.cpp:43
+msgid "Previous maintainer"
+msgstr ""
+
+#: aboutdata.cpp:45
+msgid "Co-Maintainer"
+msgstr ""
+
+#: aboutdata.cpp:47
+msgid "Original Author"
+msgstr ""
 
-#: koeditorfreebusy.cpp:229
+#: kdatenavigator.cpp:190
 msgid ""
-"Sets the zoom level on the Gantt chart. 'Hour' shows a range of several hours, "
-"'Day' shows a range of a few days, 'Week' shows a range of a few months, and "
-"'Month' shows a range of a few years, while 'Automatic' selects the range most "
-"appropriate for the current event or to-do."
+"_: start/end week number of line in date picker\n"
+"%1/%2"
 msgstr ""
 
-#: koeditorfreebusy.cpp:236
-msgid "Scale: "
+#: kotodoviewitem.cpp:140
+msgid "--"
 msgstr ""
 
-#: koeditorfreebusy.cpp:242
-msgid "Hour"
-msgstr "ชั่วโมง"
+#: koeditorgeneraljournal.cpp:63
+msgid "Sets the title of this journal."
+msgstr ""
 
-#: koeditorfreebusy.cpp:243
-msgid "Day"
-msgstr "วัน"
+#: koeditorgeneral.cpp:108 koeditorgeneraljournal.cpp:64
+msgid "T&itle:"
+msgstr ""
 
-#: koeditorfreebusy.cpp:244
-msgid "Week"
-msgstr "สัปดาห์"
+#: koeditorgeneraljournal.cpp:83
+msgid "&Date:"
+msgstr ""
 
-#: koeditorfreebusy.cpp:245
-msgid "Month"
-msgstr "เดือน"
+#: koeditorgeneraljournal.cpp:92
+msgid "&Time: "
+msgstr ""
 
-#: koeditorfreebusy.cpp:246
-msgid "Automatic"
-msgstr "อัตโนมัติ"
+#: koeditorgeneraljournal.cpp:198
+msgid "Please specify a valid date, for example '%1'."
+msgstr ""
 
-#: koeditorfreebusy.cpp:252
-msgid "Center on Start"
+#: plugins/datenums/configdialog.cpp:38
+msgid "Configure Day Numbers"
 msgstr ""
 
-#: koeditorfreebusy.cpp:254
-msgid "Centers the Gantt chart on the start time and day of this event."
+#: plugins/datenums/configdialog.cpp:45
+msgid "Show Date Number"
 msgstr ""
 
-#: koeditorfreebusy.cpp:261
-msgid "Pick Date"
+#: plugins/datenums/configdialog.cpp:48
+msgid "Show day number"
 msgstr ""
 
-#: koeditorfreebusy.cpp:263
-msgid "Moves the event to a date and time when all the attendees are free."
+#: plugins/datenums/configdialog.cpp:49
+msgid "Show days to end of year"
 msgstr ""
 
-#: koeditorfreebusy.cpp:272
+#: plugins/datenums/configdialog.cpp:50
+msgid "Show both"
+msgstr ""
+
+#: plugins/datenums/datenums.cpp:59
 msgid ""
-"Reloads Free/Busy data for all attendees from the corresponding servers."
+"_: dayOfYear / daysTillEndOfYear\n"
+"%1 / %2"
 msgstr ""
 
-#: koeditorfreebusy.cpp:279
+#: plugins/datenums/datenums.cpp:71
+msgid "This plugin provides numbers of days and weeks."
+msgstr ""
+
+#: plugins/hebrew/configdialog.cpp:29
+msgid "Configure Holidays"
+msgstr ""
+
+#: plugins/hebrew/configdialog.cpp:37
+msgid "Use Israeli holidays"
+msgstr ""
+
+#: plugins/hebrew/configdialog.cpp:41
+msgid "Show weekly parsha"
+msgstr ""
+
+#: plugins/hebrew/configdialog.cpp:45
+msgid "Show day of Omer"
+msgstr ""
+
+#: plugins/hebrew/configdialog.cpp:49
+msgid "Show Chol HaMoed"
+msgstr ""
+
+#: plugins/hebrew/holiday.cpp:63
 msgid ""
-"Shows the free/busy status of all attendees. Double-clicking on an attendees "
-"entry in the list will allow you to enter the location of their Free/Busy "
-"Information."
+"_: These are Jewish holidays and mostly do not have translations. They may have "
+"different spellings in your language; otherwise, just translate the sound to "
+"your characters\n"
+"Sh. HaHodesh"
 msgstr ""
 
-#: koeditorfreebusy.cpp:286
-msgid "Attendee"
+#: plugins/hebrew/holiday.cpp:69
+msgid "Erev Pesach"
 msgstr ""
 
-#: koeditorfreebusy.cpp:529
-msgid "The meeting already has suitable start/end times."
+#: plugins/hebrew/holiday.cpp:79
+msgid "Sh. HaGadol"
+msgstr ""
+
+#: plugins/hebrew/holiday.cpp:87
+msgid "Pesach"
 msgstr ""
 
-#: koeditorfreebusy.cpp:535
+#: plugins/hebrew/holiday.cpp:98 plugins/hebrew/holiday.cpp:262
+msgid "Chol Hamoed"
+msgstr ""
+
+#: plugins/hebrew/holiday.cpp:103
+msgid "Yom HaShoah"
+msgstr ""
+
+#: plugins/hebrew/holiday.cpp:127 plugins/hebrew/holiday.cpp:133
+#: plugins/hebrew/holiday.cpp:144
+msgid "Yom HaAtzmaut"
+msgstr ""
+
+#: plugins/hebrew/holiday.cpp:129 plugins/hebrew/holiday.cpp:142
+msgid "Yom HaZikaron"
+msgstr ""
+
+#: plugins/hebrew/holiday.cpp:151
+msgid "Yom Yerushalayim"
+msgstr ""
+
+#: plugins/hebrew/holiday.cpp:154
+msgid "Lag BaOmer"
+msgstr ""
+
+#: plugins/hebrew/holiday.cpp:179
+msgid "Erev Shavuot"
+msgstr ""
+
+#: plugins/hebrew/holiday.cpp:184
+msgid "Shavuot"
+msgstr ""
+
+#: plugins/hebrew/holiday.cpp:193
+msgid "Tzom Tammuz"
+msgstr ""
+
+#: plugins/hebrew/holiday.cpp:200
+msgid "Sh. Hazon"
+msgstr ""
+
+#: plugins/hebrew/holiday.cpp:202
+msgid "Sh. Nahamu"
+msgstr ""
+
+#: plugins/hebrew/holiday.cpp:206
+msgid "Tisha B'Av"
+msgstr ""
+
+#: plugins/hebrew/holiday.cpp:211
+msgid "S'lichot"
+msgstr ""
+
+#: plugins/hebrew/holiday.cpp:213
+msgid "Erev R.H."
+msgstr ""
+
+#: plugins/hebrew/holiday.cpp:221
+msgid "Rosh Hashana"
+msgstr ""
+
+#: plugins/hebrew/holiday.cpp:225 plugins/hebrew/holiday.cpp:238
+msgid "Sh. Shuvah"
+msgstr ""
+
+#: plugins/hebrew/holiday.cpp:227 plugins/hebrew/holiday.cpp:231
+msgid "Tzom Gedalia"
+msgstr ""
+
+#: plugins/hebrew/holiday.cpp:241
+msgid "Erev Y.K."
+msgstr ""
+
+#: plugins/hebrew/holiday.cpp:244
+msgid "Yom Kippur"
+msgstr ""
+
+#: plugins/hebrew/holiday.cpp:247
+msgid "Erev Sukkot"
+msgstr ""
+
+#: plugins/hebrew/holiday.cpp:253
+msgid "Sukkot"
+msgstr ""
+
+#: plugins/hebrew/holiday.cpp:265
+msgid "Hoshana Rabah"
+msgstr ""
+
+#: plugins/hebrew/holiday.cpp:268
+msgid "Shmini Atzeret"
+msgstr ""
+
+#: plugins/hebrew/holiday.cpp:272
+msgid "Simchat Torah"
+msgstr ""
+
+#: plugins/hebrew/holiday.cpp:281
+msgid "Erev Hanukah"
+msgstr ""
+
+#: plugins/hebrew/holiday.cpp:283 plugins/hebrew/holiday.cpp:289
+msgid "Hanukah"
+msgstr ""
+
+#: plugins/hebrew/holiday.cpp:293
+msgid "Tzom Tevet"
+msgstr ""
+
+#: plugins/hebrew/holiday.cpp:304 plugins/hebrew/holiday.cpp:312
+#: plugins/hebrew/holiday.cpp:316 plugins/hebrew/holiday.cpp:320
+msgid "Sh. Shirah"
+msgstr ""
+
+#: plugins/hebrew/holiday.cpp:317
+msgid "Tu B'Shvat"
+msgstr ""
+
+#: plugins/hebrew/holiday.cpp:330 plugins/hebrew/holiday.cpp:341
+#: plugins/hebrew/holiday.cpp:349
+msgid "Sh. Shekalim"
+msgstr ""
+
+#: plugins/hebrew/holiday.cpp:338
+msgid "Purim Katan"
+msgstr ""
+
+#: plugins/hebrew/holiday.cpp:356 plugins/hebrew/holiday.cpp:373
+msgid "Ta'anit Ester"
+msgstr ""
+
+#: plugins/hebrew/holiday.cpp:364 plugins/hebrew/holiday.cpp:368
+msgid "Sh. Zachor"
+msgstr ""
+
+#: plugins/hebrew/holiday.cpp:370
+msgid "Erev Purim"
+msgstr ""
+
+#: plugins/hebrew/holiday.cpp:376
+msgid "Purim"
+msgstr ""
+
+#: plugins/hebrew/holiday.cpp:380 plugins/hebrew/holiday.cpp:384
+msgid "Shushan Purim"
+msgstr ""
+
+#: plugins/hebrew/holiday.cpp:394
+msgid "Sh. Parah"
+msgstr ""
+
+#: plugins/hebrew/holiday.cpp:403
+msgid "Sh. HaHodesh"
+msgstr ""
+
+#: plugins/hebrew/holiday.cpp:428
+msgid " Omer"
+msgstr ""
+
+#: plugins/hebrew/parsha.cpp:33
 msgid ""
-"The meeting has been moved to\n"
-"Start: %1\n"
-"End: %2."
+"_: These are weekly readings and do not have translations. They may have "
+"different spellings in your language; otherwise, just translate the sound to "
+"your characters\n"
+"Bereshit"
 msgstr ""
 
-#: koeditorfreebusy.cpp:540
-msgid "No suitable date found."
+#: plugins/hebrew/parsha.cpp:33
+msgid "Noach"
+msgstr ""
+
+#: plugins/hebrew/parsha.cpp:33
+msgid "Lech L'cha"
+msgstr ""
+
+#: plugins/hebrew/parsha.cpp:34
+msgid "Vayera"
+msgstr ""
+
+#: plugins/hebrew/parsha.cpp:34
+msgid "Chaye Sarah"
 msgstr ""
 
-#: koeditorfreebusy.cpp:675
+#: plugins/hebrew/parsha.cpp:34
+msgid "Toldot"
+msgstr ""
+
+#: plugins/hebrew/parsha.cpp:35
+msgid "Vayetze"
+msgstr ""
+
+#: plugins/hebrew/parsha.cpp:35
+msgid "Vayishlach"
+msgstr ""
+
+#: plugins/hebrew/parsha.cpp:35
+msgid "Vayeshev"
+msgstr ""
+
+#: plugins/hebrew/parsha.cpp:36
+msgid "Miketz"
+msgstr ""
+
+#: plugins/hebrew/parsha.cpp:36
+msgid "Vayigash"
+msgstr ""
+
+#: plugins/hebrew/parsha.cpp:36
+msgid "Vayechi"
+msgstr ""
+
+#: plugins/hebrew/parsha.cpp:37
+msgid "Shemot"
+msgstr ""
+
+#: plugins/hebrew/parsha.cpp:37
+msgid "Vaera"
+msgstr ""
+
+#: plugins/hebrew/parsha.cpp:37
+msgid "Bo"
+msgstr ""
+
+#: plugins/hebrew/parsha.cpp:37
+msgid "Beshalach"
+msgstr ""
+
+#: plugins/hebrew/parsha.cpp:38
+msgid "Yitro"
+msgstr ""
+
+#: plugins/hebrew/parsha.cpp:38
+msgid "Mishpatim"
+msgstr ""
+
+#: plugins/hebrew/parsha.cpp:38
+msgid "Terumah"
+msgstr ""
+
+#: plugins/hebrew/parsha.cpp:39
+msgid "Tetzaveh"
+msgstr ""
+
+#: plugins/hebrew/parsha.cpp:39
+msgid "Ki Tisa"
+msgstr ""
+
+#: plugins/hebrew/parsha.cpp:39
+msgid "Vayakhel"
+msgstr ""
+
+#: plugins/hebrew/parsha.cpp:40
+msgid "Pekudei"
+msgstr ""
+
+#: plugins/hebrew/parsha.cpp:40
+msgid "Vayikra"
+msgstr ""
+
+#: plugins/hebrew/parsha.cpp:40
+msgid "Tzav"
+msgstr ""
+
+#: plugins/hebrew/parsha.cpp:41
+msgid "Shemini"
+msgstr ""
+
+#: plugins/hebrew/parsha.cpp:41
+msgid "Tazria"
+msgstr ""
+
+#: plugins/hebrew/parsha.cpp:41
+msgid "Metzora"
+msgstr ""
+
+#: plugins/hebrew/parsha.cpp:42
+msgid "Acharei Mot"
+msgstr ""
+
+#: plugins/hebrew/parsha.cpp:42
+msgid "Kedoshim"
+msgstr ""
+
+#: plugins/hebrew/parsha.cpp:42
+msgid "Emor"
+msgstr ""
+
+#: plugins/hebrew/parsha.cpp:43
+msgid "Behar"
+msgstr ""
+
+#: plugins/hebrew/parsha.cpp:43
+msgid "Bechukotai"
+msgstr ""
+
+#: plugins/hebrew/parsha.cpp:43
+msgid "Bemidbar"
+msgstr ""
+
+#: plugins/hebrew/parsha.cpp:44
+msgid "Naso"
+msgstr ""
+
+#: plugins/hebrew/parsha.cpp:44
+msgid "Behaalotcha"
+msgstr ""
+
+#: plugins/hebrew/parsha.cpp:44
+msgid "Shelach"
+msgstr ""
+
+#: plugins/hebrew/parsha.cpp:45
+msgid "Korach"
+msgstr ""
+
+#: plugins/hebrew/parsha.cpp:45
+msgid "Chukat"
+msgstr ""
+
+#: plugins/hebrew/parsha.cpp:45
+msgid "Balak"
+msgstr ""
+
+#: plugins/hebrew/parsha.cpp:46
+msgid "Pinchas"
+msgstr ""
+
+#: plugins/hebrew/parsha.cpp:46
+msgid "Matot"
+msgstr ""
+
+#: plugins/hebrew/parsha.cpp:46
+msgid "Masei"
+msgstr ""
+
+#: plugins/hebrew/parsha.cpp:47
+msgid "Devarim"
+msgstr ""
+
+#: plugins/hebrew/parsha.cpp:47
+msgid "Vaetchanan"
+msgstr ""
+
+#: plugins/hebrew/parsha.cpp:47
+msgid "Ekev"
+msgstr ""
+
+#: plugins/hebrew/parsha.cpp:48
+msgid "Reeh"
+msgstr ""
+
+#: plugins/hebrew/parsha.cpp:48
+msgid "Shoftim"
+msgstr ""
+
+#: plugins/hebrew/parsha.cpp:48
+msgid "Ki Tetze"
+msgstr ""
+
+#: plugins/hebrew/parsha.cpp:49
+msgid "Ki Tavo"
+msgstr ""
+
+#: plugins/hebrew/parsha.cpp:49
+msgid "Nitzavim"
+msgstr ""
+
+#: plugins/hebrew/parsha.cpp:49
+msgid "Vayelech"
+msgstr ""
+
+#: plugins/hebrew/parsha.cpp:50
+msgid "Haazinu"
+msgstr ""
+
+#: plugins/hebrew/hebrew.cpp:103
+msgid "This plugin provides the date in the Jewish calendar."
+msgstr ""
+
+#: plugins/printing/journal/journalprint.h:43
+msgid "Print &journal"
+msgstr ""
+
+#: plugins/printing/journal/journalprint.h:44
+msgid "Prints all journals for a given date range"
+msgstr ""
+
+#: plugins/printing/journal/journalprint.cpp:130
+msgid "Journal entries"
+msgstr ""
+
+#: plugins/printing/whatsnext/whatsnextprint.h:42
+msgid "Print What's Next"
+msgstr ""
+
+#: plugins/printing/whatsnext/whatsnextprint.h:43
+msgid "Prints a list of all upcoming events and todos."
+msgstr ""
+
+#: plugins/printing/list/listprint.h:42
+msgid "Print list"
+msgstr ""
+
+#: plugins/printing/list/listprint.h:43
+msgid "Prints a list of events and to-dos"
+msgstr ""
+
+#: plugins/printing/year/yearprint.h:42
+msgid "Print &Year"
+msgstr ""
+
+#: plugins/printing/year/yearprint.h:43
+msgid "Prints a calendar for an entire year"
+msgstr ""
+
+#: kowhatsnextview.cpp:283 plugins/printing/year/yearprint.cpp:175
 msgid ""
-"Of the %1 participants, %2 have accepted, %3 have tentatively accepted, and %4 "
-"have declined."
+"_: date from - to\n"
+"%1 - %2"
 msgstr ""
 
-#: koeditorfreebusy.cpp:898
+#: plugins/printing/year/yearprint.cpp:177
 msgid ""
-"You are changing the organiser of this event, who is also attending, do you "
-"want to change that attendee as well?"
+"_: date from -\n"
+"to\n"
+"%1 -\n"
+"%2"
 msgstr ""
 
-#: koeditorrecurrence.cpp:91
+#: plugins/exchange/exchange.cpp:109 plugins/exchange/exchange.cpp:145
+#: plugins/exchange/exchange.cpp:148 plugins/exchange/exchange.cpp:164
+#: plugins/exchange/exchange.cpp:168 plugins/exchange/exchange.cpp:222
+#: plugins/exchange/exchange.cpp:224 plugins/exchange/exchangeconfig.cpp:35
+#: plugins/exchange/exchangedialog.cpp:34
+msgid "Exchange Plugin"
+msgstr ""
+
+#: plugins/exchange/exchangedialog.cpp:39
+msgid "Start date:"
+msgstr ""
+
+#: plugins/exchange/exchangedialog.cpp:46
+msgid "End date:"
+msgstr ""
+
+#: plugins/exchange/exchange.cpp:72
+msgid "&Download..."
+msgstr ""
+
+#: plugins/exchange/exchange.cpp:75
+msgid "&Upload Event..."
+msgstr ""
+
+#: plugins/exchange/exchange.cpp:83
+msgid "De&lete Event"
+msgstr ""
+
+#: plugins/exchange/exchange.cpp:89
+msgid "&Configure..."
+msgstr ""
+
+#: plugins/exchange/exchange.cpp:104
 msgid ""
-"The number of the week from the beginning of the month on which this event or "
-"to-do should recur."
+"This plugin imports and export calendar events from/to a Microsoft Exchange "
+"2000 Server."
 msgstr ""
 
-#: koeditorrecurrence.cpp:95 koeditorrecurrence.cpp:259
-msgid "1st"
+#: plugins/exchange/exchange.cpp:145 plugins/exchange/exchange.cpp:164
+msgid "Please select an appointment."
 msgstr ""
 
-#: koeditorrecurrence.cpp:96 koeditorrecurrence.cpp:260
-msgid "2nd"
+#: plugins/exchange/exchange.cpp:148
+msgid "Exchange Upload is EXPERIMENTAL, you may lose data on this appointment!"
 msgstr ""
 
-#: koeditorrecurrence.cpp:97 koeditorrecurrence.cpp:261
-msgid "3rd"
+#: plugins/exchange/exchange.cpp:148
+msgid "&Upload"
 msgstr ""
 
-#: koeditorrecurrence.cpp:98 koeditorrecurrence.cpp:262
-msgid "4th"
+#: plugins/exchange/exchange.cpp:168
+msgid ""
+"Exchange Delete is EXPERIMENTAL, if this is a recurring event it will delete "
+"all instances!"
 msgstr ""
 
-#: koeditorrecurrence.cpp:99 koeditorrecurrence.cpp:263
-msgid "5th"
+#: plugins/exchange/exchange.cpp:195
+msgid "No Error"
 msgstr ""
 
-#: koeditorrecurrence.cpp:100 koeditorrecurrence.cpp:290
-msgid "Last"
+#: plugins/exchange/exchange.cpp:198
+msgid "The Exchange server could not be reached or returned an error."
 msgstr ""
 
-#: koeditorrecurrence.cpp:101 koeditorrecurrence.cpp:291
-msgid "2nd Last"
+#: plugins/exchange/exchange.cpp:201
+msgid "Server response could not be interpreted."
 msgstr ""
 
-#: koeditorrecurrence.cpp:102 koeditorrecurrence.cpp:292
-msgid "3rd Last"
+#: plugins/exchange/exchange.cpp:204
+msgid "Appointment data could not be interpreted."
 msgstr ""
 
-#: koeditorrecurrence.cpp:103 koeditorrecurrence.cpp:293
-msgid "4th Last"
+#: plugins/exchange/exchange.cpp:207
+msgid "This should not happen: trying to upload wrong type of event."
 msgstr ""
 
-#: koeditorrecurrence.cpp:104 koeditorrecurrence.cpp:294
-msgid "5th Last"
+#: plugins/exchange/exchange.cpp:210
+msgid "An error occurred trying to write an appointment to the server."
 msgstr ""
 
-#: koeditorrecurrence.cpp:112
-msgid "The weekday on which this event or to-do should recur."
+#: plugins/exchange/exchange.cpp:213
+msgid "Trying to delete an event that is not present on the server."
 msgstr ""
 
-#: koeditorrecurrence.cpp:126
-msgid "The month during which this event or to-do should recur."
+#: plugins/exchange/exchange.cpp:217
+msgid "Unknown Error"
 msgstr ""
 
-#: koeditorrecurrence.cpp:143
-msgid "Sets how often this event or to-do should recur."
+#: plugins/exchange/exchangeconfig.cpp:46
+msgid "Exchange server:"
 msgstr ""
 
-#: koeditorrecurrence.cpp:167 koeditorrecurrence.cpp:181
-#: koeditorrecurrence.cpp:232 koeditorrecurrence.cpp:405
-msgid "&Recur every"
+#: plugins/exchange/exchangeconfig.cpp:50
+msgid "Port:"
 msgstr ""
 
-#. i18n: file koeditoralarms_base.ui line 70
-#: koeditorgeneral.cpp:230 koeditorrecurrence.cpp:167
-#: korgac/alarmdialog.cpp:122 rc.cpp:178 rc.cpp:1892
+#: plugins/exchange/exchangeconfig.cpp:54
+msgid "User:"
+msgstr ""
+
+#. i18n: file kogroupwareprefspage.ui line 205
+#: plugins/exchange/exchangeconfig.cpp:59 rc.cpp:317 rc.cpp:1912
 #, no-c-format
-msgid "day(s)"
+msgid "Password:"
+msgstr "รหัสผ่าน:"
+
+#: plugins/exchange/exchangeconfig.cpp:63
+msgid "Determine mailbox automatically"
 msgstr ""
 
-#: koeditorrecurrence.cpp:181
-msgid "week(s) on:"
+#: plugins/exchange/exchangeconfig.cpp:68
+msgid "Mailbox URL:"
 msgstr ""
 
-#: koeditorrecurrence.cpp:199
-msgid "Day of the week on which this event or to-do should recur."
+#: plugins/timespanview/timespanview.cpp:54
+msgid "&Timespan"
 msgstr ""
 
-#: koeditorrecurrence.cpp:232
-msgid "month(s)"
+#: plugins/timespanview/timespanview.cpp:64
+msgid "This plugin provides a Gantt-like Timespan view."
 msgstr ""
 
-#: koeditorrecurrence.cpp:244
-msgid "&Recur on the"
+#: plugins/timespanview/timespanview.cpp:69
+msgid "Timespan View Plugin"
 msgstr ""
 
-#: koeditorrecurrence.cpp:249
-msgid ""
-"Sets a specific day of the month on which this event or to-do should recur."
+#: kolistview.cpp:208 korgac/alarmdialog.cpp:130 kotodoview.cpp:386
+#: plugins/timespanview/timespanwidget.cpp:51
+#: printing/calprintdefaultplugins.cpp:1212
+#: printing/calprintdefaultplugins.cpp:1296
+msgid "Summary"
+msgstr "สรุป"
+
+#: plugins/projectview/koprojectview.cpp:80
+#: plugins/timespanview/timespanwidget.cpp:65
+msgid "Zoom In"
 msgstr ""
 
-#: koeditorrecurrence.cpp:254 koeditorrecurrence.cpp:430
-msgid "The day of the month on which this event or to-do should recur."
+#: plugins/projectview/koprojectview.cpp:84
+#: plugins/timespanview/timespanwidget.cpp:69
+msgid "Zoom Out"
 msgstr ""
 
-#: koeditorrecurrence.cpp:264
-msgid "6th"
+#: plugins/timespanview/timespanwidget.cpp:73
+msgid "Center View"
 msgstr ""
 
-#: koeditorrecurrence.cpp:265
-msgid "7th"
+#: plugins/projectview/koprojectview.cpp:76
+msgid "Project View"
 msgstr ""
 
-#: koeditorrecurrence.cpp:266
-msgid "8th"
+#: plugins/projectview/koprojectview.cpp:88
+msgid "Select Mode"
 msgstr ""
 
-#: koeditorrecurrence.cpp:267
-msgid "9th"
+#: plugins/projectview/koprojectview.cpp:109
+msgid "main task"
 msgstr ""
 
-#: koeditorrecurrence.cpp:268
-msgid "10th"
+#: plugins/projectview/projectview.cpp:55
+msgid "&Project"
 msgstr ""
 
-#: koeditorrecurrence.cpp:269
-msgid "11th"
+#: plugins/projectview/projectview.cpp:65
+msgid "This plugin provides a Gantt diagram as project view."
 msgstr ""
 
-#: koeditorrecurrence.cpp:270
-msgid "12th"
+#: plugins/projectview/projectview.cpp:70
+msgid "Project View Plugin"
 msgstr ""
 
-#: koeditorrecurrence.cpp:271
-msgid "13th"
+#: calendarview.cpp:264
+msgid ""
+"<p><em>No Item Selected</em></p>"
+"<p>Select an event, to-do or journal entry to view its details here.</p>"
 msgstr ""
 
-#: koeditorrecurrence.cpp:272
-msgid "14th"
+#: calendarview.cpp:270
+msgid ""
+"View the details of events, journal entries or to-dos selected in KOrganizer's "
+"main view here."
 msgstr ""
 
-#: koeditorrecurrence.cpp:273
-msgid "15th"
+#: calendarview.cpp:456
+msgid "No calendars found, unable to merge the file into your calendar."
 msgstr ""
 
-#: koeditorrecurrence.cpp:274
-msgid "16th"
+#: calendarview.cpp:490
+msgid "Could not load calendar '%1'."
 msgstr ""
 
-#: koeditorrecurrence.cpp:275
-msgid "17th"
+#: calendarview.cpp:719
+msgid ""
+"The timezone setting was changed. Do you want to keep the absolute time of the "
+"items in your calendar, which will show them to be at a different time than "
+"before, or move them to be at the old time also in the new timezone?"
 msgstr ""
 
-#: koeditorrecurrence.cpp:276
-msgid "18th"
+#: calendarview.cpp:723
+msgid "Keep Absolute Times?"
 msgstr ""
 
-#: koeditorrecurrence.cpp:277
-msgid "19th"
+#: calendarview.cpp:724
+msgid "Keep Times"
 msgstr ""
 
-#: koeditorrecurrence.cpp:278
-msgid "20th"
+#: calendarview.cpp:725
+msgid "Move Times"
 msgstr ""
 
-#: koeditorrecurrence.cpp:279
-msgid "21st"
+#: calendarview.cpp:779
+msgid "To-do completed: %1 (%2)"
 msgstr ""
 
-#: koeditorrecurrence.cpp:280
-msgid "22nd"
+#: calendarview.cpp:790
+#, c-format
+msgid "Journal of %1"
 msgstr ""
 
-#: koeditorrecurrence.cpp:281
-msgid "23rd"
+#: calendarview.cpp:845
+msgid ""
+"The item \"%1\" is filtered by your current filter rules, so it will be hidden "
+"and not appear in the view."
 msgstr ""
 
-#: koeditorrecurrence.cpp:282
-msgid "24th"
+#: calendarview.cpp:848
+msgid "Filter Applied"
 msgstr ""
 
-#: koeditorrecurrence.cpp:283
-msgid "25th"
+#: calendarview.cpp:904
+msgid "The item \"%1\" will be permanently deleted."
 msgstr ""
 
-#: koeditorrecurrence.cpp:284
-msgid "26th"
+#: calendarview.cpp:905 calendarview.cpp:929 calendarview.cpp:966
+#: calendarview.cpp:2338 calendarview.cpp:2401 calendarview.cpp:2409
+#: koeventeditor.cpp:393 kojournaleditor.cpp:202 kotodoeditor.cpp:329
+msgid "KOrganizer Confirmation"
 msgstr ""
 
-#: koeditorrecurrence.cpp:285
-msgid "27th"
+#: calendarview.cpp:924
+msgid ""
+"The item \"%1\" has sub-to-dos. Do you want to cut just this item and make all "
+"its sub-to-dos independent, or cut the to-do with all its sub-to-dos?"
 msgstr ""
 
-#: koeditorrecurrence.cpp:286
-msgid "28th"
+#: calendarview.cpp:930
+msgid "Cut Only This"
 msgstr ""
 
-#: koeditorrecurrence.cpp:287
-msgid "29th"
+#: calendarview.cpp:931
+msgid "Cut All"
 msgstr ""
 
-#: koeditorrecurrence.cpp:288
-msgid "30th"
+#: calendarview.cpp:962
+msgid ""
+"The item \"%1\" has sub-to-dos. Do you want to copy just this item or copy the "
+"to-do with all its sub-to-dos?"
 msgstr ""
 
-#: koeditorrecurrence.cpp:289
-msgid "31st"
+#: calendarview.cpp:967
+msgid "Copy Only This"
 msgstr ""
 
-#: koeditorrecurrence.cpp:325
-msgid "day"
+#: calendarview.cpp:968
+#, fuzzy
+msgid "Copy All"
+msgstr "ทำสำเนาไปยัง"
+
+#: calendarview.cpp:1064
+msgid "Paste failed: unable to determine a valid target date."
 msgstr ""
 
-#: koeditorrecurrence.cpp:332
+#: calendarview.cpp:1394
 msgid ""
-"Sets a weekday and specific week in the month on which this event or to-do "
-"should recur"
+"Unable to turn sub-to-do into a top-level to-do, because it cannot be locked."
 msgstr ""
 
-#: koeditorrecurrence.cpp:405
-msgid "year(s)"
+#: calendarview.cpp:1419
+msgid "Make sub-to-dos independent"
 msgstr ""
 
-#: koeditorrecurrence.cpp:419
-msgid ""
-"_: part before XXX of 'Recur on day XXX of month YYY'\n"
-"&Recur on day "
+#: calendarview.cpp:1504
+msgid "Dissociate occurrence"
 msgstr ""
 
-#: koeditorrecurrence.cpp:421
-msgid "&Day "
+#: calendarview.cpp:1516
+msgid "Dissociating the occurrence failed."
 msgstr ""
 
-#: koeditorrecurrence.cpp:425
+#: calendarview.cpp:1517 calendarview.cpp:1547
+msgid "Dissociating Failed"
+msgstr ""
+
+#: calendarview.cpp:1538
+msgid "Dissociate future occurrences"
+msgstr ""
+
+#: calendarview.cpp:1546
+msgid "Dissociating the future occurrences failed."
+msgstr ""
+
+#: calendarview.cpp:1564 calendarview.cpp:1638 calendarview.cpp:1710
+msgid "No item selected."
+msgstr ""
+
+#: calendarview.cpp:1585 calendarview.cpp:1658
+msgid "The item information was successfully sent."
+msgstr ""
+
+#: calendarview.cpp:1586
+msgid "Publishing"
+msgstr ""
+
+#: calendarview.cpp:1588
+msgid "Unable to publish the item '%1'"
+msgstr ""
+
+#: calendarview.cpp:1639 calendarview.cpp:1659
+msgid "Forwarding"
+msgstr ""
+
+#: calendarview.cpp:1664
+msgid "Unable to forward the item '%1'"
+msgstr ""
+
+#: calendarview.cpp:1665
+msgid "Forwarding Error"
+msgstr ""
+
+#: calendarview.cpp:1688
+msgid "The free/busy information was successfully sent."
+msgstr ""
+
+#: calendarview.cpp:1689 calendarview.cpp:1732
+msgid "Sending Free/Busy"
+msgstr ""
+
+#: calendarview.cpp:1691
+msgid "Unable to publish the free/busy data."
+msgstr ""
+
+#: calendarview.cpp:1716
+msgid "The item has no attendees."
+msgstr ""
+
+#: calendarview.cpp:1728
 msgid ""
-"Sets a specific day in a specific month on which this event or to-do should "
-"recur."
+"The groupware message for item '%1'was successfully sent.\n"
+"Method: %2"
 msgstr ""
 
-#: koeditorrecurrence.cpp:434
+#: calendarview.cpp:1737
 msgid ""
-"_: part between XXX and YYY of 'Recur on day XXX of month YYY'\n"
-" &of "
+"_: Groupware message sending failed. %2 is "
+"request/reply/add/cancel/counter/etc.\n"
+"Unable to send the item '%1'.\n"
+"Method: %2"
 msgstr ""
 
-#: koeditorrecurrence.cpp:448
+#: calendarview.cpp:1812
+msgid "*.ics|ICalendars"
+msgstr ""
+
+#: calendarview.cpp:1820 calendarview.cpp:1848
+msgid "Do you want to overwrite %1?"
+msgstr ""
+
+#: calendarview.cpp:1833
+msgid "The journal entries can not be exported to a vCalendar file."
+msgstr ""
+
+#: calendarview.cpp:1834
+msgid "Data Loss Warning"
+msgstr ""
+
+#: actionmanager.cpp:996 calendarview.cpp:1834
+msgid "Proceed"
+msgstr ""
+
+#: calendarview.cpp:1839
+msgid "*.vcs|vCalendars"
+msgstr ""
+
+#: calendarview.cpp:1870
+msgid "&Previous Day"
+msgstr ""
+
+#: calendarview.cpp:1871
+msgid "&Next Day"
+msgstr ""
+
+#: calendarview.cpp:1873
+msgid "&Previous Week"
+msgstr ""
+
+#: calendarview.cpp:1874
+msgid "&Next Week"
+msgstr ""
+
+#: calendarview.cpp:1984 calendarview.cpp:2017
+msgid "No filter"
+msgstr ""
+
+#: calendarview.cpp:2215
+msgid "No resources found. We can not edit the item."
+msgstr ""
+
+#: calendarview.cpp:2333
 msgid ""
-"_: Part before XXX in 'Recur on NNN. WEEKDAY of MONTH', short version\n"
-"&On"
+"The item \"%1\" has sub-to-dos. Do you want to delete just this item and make "
+"all its sub-to-dos independent, or delete the to-do with all its sub-to-dos?"
 msgstr ""
 
-#: koeditorrecurrence.cpp:450
+#: calendarview.cpp:2339
+msgid "Delete Only This"
+msgstr ""
+
+#: calendarview.cpp:2342
+msgid "Deleting sub-to-dos"
+msgstr ""
+
+#: calendarview.cpp:2367
 msgid ""
-"_: Part before XXX in 'Recur on NNN. WEEKDAY of MONTH'\n"
-"&On the"
+"The item \"%1\" is marked read-only and cannot be deleted; it probably belongs "
+"to a read-only calendar resource."
 msgstr ""
 
-#: koeditorrecurrence.cpp:454
+#: calendarview.cpp:2371
+msgid "Removing not possible"
+msgstr ""
+
+#: calendarview.cpp:2398
 msgid ""
-"Sets a specific day in a specific week of a specific month on which this event "
-"or to-do should recur."
+"The calendar item \"%1\" recurs over multiple dates; are you sure you want to "
+"delete it and all its recurrences?"
 msgstr ""
 
-#: koeditorrecurrence.cpp:465
+#: calendarview.cpp:2404
 msgid ""
-"_: part between WEEKDAY and MONTH in 'Recur on NNN. WEEKDAY of MONTH'\n"
-" o&f "
+"The calendar item \"%1\" recurs over multiple dates. Do you want to delete only "
+"the current one on %2, only all future recurrences, or all its recurrences?"
 msgstr ""
 
-#: koeditorrecurrence.cpp:480
-msgid "Day #"
+#: calendarview.cpp:2409
+msgid "Delete C&urrent"
 msgstr ""
 
-#: koeditorrecurrence.cpp:482
-msgid "Recur on &day #"
+#: calendarview.cpp:2410
+msgid "Delete &Future"
 msgstr ""
 
-#: koeditorrecurrence.cpp:484
+#: calendarview.cpp:2411
+msgid "Delete &All"
+msgstr "ลบทั้งหมด"
+
+#: calendarview.cpp:2514
+msgid "Delete all completed to-dos?"
+msgstr ""
+
+#: calendarview.cpp:2514
+msgid "Purge To-dos"
+msgstr ""
+
+#: calendarview.cpp:2514
+msgid "Purge"
+msgstr ""
+
+#: calendarview.cpp:2518
+msgid "Purging completed to-dos"
+msgstr ""
+
+#: calendarview.cpp:2533
+msgid "Unable to purge to-dos with uncompleted children."
+msgstr ""
+
+#: calendarview.cpp:2534
+msgid "Delete To-do"
+msgstr ""
+
+#: calendarview.cpp:2545
+msgid "Unable to edit \"%1\" because it is locked by another process."
+msgstr ""
+
+#: calendarview.cpp:2579
+#, c-format
+msgid "Unable to copy the item to %1."
+msgstr ""
+
+#: calendarview.cpp:2580
+msgid "Copying Failed"
+msgstr ""
+
+#: calendarview.cpp:2623
+#, c-format
+msgid "Unable to move the item to %1."
+msgstr ""
+
+#: calendarview.cpp:2624
+msgid "Moving Failed"
+msgstr ""
+
+#: calendarview.cpp:2699
+msgid "Cutting Recurring Item"
+msgstr ""
+
+#: calendarview.cpp:2701
 msgid ""
-"Sets a specific day within the year on which this event or to-do should recur."
+"The item you try to cut is a recurring item. Do you want to cut only this "
+"single occurrence, only future items, or all items in the recurrence?"
 msgstr ""
 
-#: koeditorrecurrence.cpp:495
+#: calendarview.cpp:2706
+msgid "Copying Recurring Item"
+msgstr ""
+
+#: calendarview.cpp:2708
 msgid ""
-"_: part after NNN of 'Recur on day #NNN of the year'\n"
-" of the &year"
+"The item you try to copy is a recurring item. Do you want to copy only this "
+"single occurrence, only future items, or all items in the recurrence?"
 msgstr ""
 
-#: koeditorrecurrence.cpp:498
+#: calendarview.cpp:2712
+msgid "Changing Recurring Item"
+msgstr ""
+
+#: calendarview.cpp:2714
 msgid ""
-"_: part after NNN of 'Recur on day #NNN of the year', short version\n"
-" of the year"
+"The item you try to change is a recurring item. Shall the changes be applied "
+"only to this single occurrence, only to the future items, or to all items in "
+"the recurrence?"
 msgstr ""
 
-#: koeditorrecurrence.cpp:581
-msgid "E&xceptions"
+#: calendarview.cpp:2722
+msgid "Only &This Item"
 msgstr ""
 
-#: koeditorrecurrence.cpp:591
+#: calendarview.cpp:2722
+msgid "Only &Future Items"
+msgstr ""
+
+#: calendarview.cpp:2722
+msgid "&All Occurrences"
+msgstr ""
+
+#: calendarview.cpp:2738 koagenda.cpp:1123
+msgid "Dissociate event from recurrence"
+msgstr ""
+
+#: calendarview.cpp:2744
 msgid ""
-"A date that should be considered an exception to the recurrence rules for this "
-"event or to-do."
+"Unable to add the exception item to the calendar. No change will be done."
 msgstr ""
 
-#. i18n: file koeditoralarms_base.ui line 546
-#: koeditorrecurrence.cpp:596 rc.cpp:253 rc.cpp:1967
-#, no-c-format
-msgid "&Add"
+#: calendarview.cpp:2745 calendarview.cpp:2766
+msgid "Error Occurred"
+msgstr ""
+
+#: calendarview.cpp:2759
+msgid "Split future recurrences"
 msgstr ""
 
-#: koeditorrecurrence.cpp:598
+#: calendarview.cpp:2765
+msgid "Unable to add the future items to the calendar. No change will be done."
+msgstr ""
+
+#: koviewmanager.cpp:405
+#, fuzzy
+msgid "Merged calendar"
+msgstr "ปฏิทินใหม่"
+
+#: koviewmanager.cpp:407
+msgid "Calendars Side by Side"
+msgstr ""
+
+#: koeditorfreebusy.cpp:178
+msgid "Freebusy Period"
+msgstr ""
+
+#: koeditorfreebusy.cpp:181
+#, fuzzy
+msgid "Summary:"
+msgstr "สรุป"
+
+#: koeditorattachments.cpp:218 koeditorfreebusy.cpp:186
+#, fuzzy
+msgid "Location:"
+msgstr "ตำแหน่ง:"
+
+#: koeditorfreebusy.cpp:190
+#, fuzzy
+msgid "Start:"
+msgstr "เริ่มการทำงาน"
+
+#: koeditorfreebusy.cpp:193
+msgid "End:"
+msgstr ""
+
+#: koeditorfreebusy.cpp:247
 msgid ""
-"Add this date as an exception to the recurrence rules for this event or to-do."
+"Sets the zoom level on the Gantt chart. 'Hour' shows a range of several hours, "
+"'Day' shows a range of a few days, 'Week' shows a range of a few months, and "
+"'Month' shows a range of a few years, while 'Automatic' selects the range most "
+"appropriate for the current event or to-do."
 msgstr ""
 
-#: koeditorrecurrence.cpp:601
-msgid "&Change"
+#: koeditorfreebusy.cpp:254
+msgid "Scale: "
 msgstr ""
 
-#: koeditorrecurrence.cpp:603
-msgid "Replace the currently selected date with this date."
+#: koeditorfreebusy.cpp:260
+msgid "Hour"
+msgstr "ชั่วโมง"
+
+#: koeditorfreebusy.cpp:261
+msgid "Day"
+msgstr "วัน"
+
+#: koeditorfreebusy.cpp:262
+msgid "Week"
+msgstr "สัปดาห์"
+
+#: koeditorfreebusy.cpp:263
+msgid "Month"
+msgstr "เดือน"
+
+#: koeditorfreebusy.cpp:264
+msgid "Automatic"
+msgstr "อัตโนมัติ"
+
+#: koeditorfreebusy.cpp:270
+msgid "Center on Start"
+msgstr ""
+
+#: koeditorfreebusy.cpp:272
+msgid "Centers the Gantt chart on the start time and day of this event."
+msgstr ""
+
+#: koeditorfreebusy.cpp:279
+msgid "Pick Date"
 msgstr ""
 
-#: koeditorrecurrence.cpp:607
+#: koeditorfreebusy.cpp:281
+msgid "Moves the event to a date and time when all the attendees are free."
+msgstr ""
+
+#: koeditorfreebusy.cpp:290
 msgid ""
-"Delete the currently selected date from the list of dates that should be "
-"considered exceptions to the recurrence rules for this event or to-do."
+"Reloads Free/Busy data for all attendees from the corresponding servers."
 msgstr ""
 
-#: koeditorrecurrence.cpp:614
+#: koeditorfreebusy.cpp:297
 msgid ""
-"Displays current dates that are being considered exceptions to the recurrence "
-"rules for this event or to-do."
+"Shows the free/busy status of all attendees. Double-clicking on an attendees "
+"entry in the list will allow you to enter the location of their Free/Busy "
+"Information."
 msgstr ""
 
-#: koeditorrecurrence.cpp:678
-msgid "Edit Exceptions"
+#: koeditorfreebusy.cpp:304
+msgid "Attendee"
 msgstr ""
 
-#: koeditorrecurrence.cpp:702
-msgid "Recurrence Range"
+#: koeditorfreebusy.cpp:547
+msgid "The meeting already has suitable start/end times."
 msgstr ""
 
-#: koeditorrecurrence.cpp:705
+#: koeditorfreebusy.cpp:552
 msgid ""
-"Sets a range for which these recurrence rules will apply to this event or "
-"to-do."
+"<qt>The next available time slot for the meeting is:"
+"<br>Start: %1"
+"<br>End: %2"
+"<br>Would you like to move the meeting to this time slot?</qt>"
 msgstr ""
 
-#: koeditorrecurrence.cpp:713
-msgid "Begin on:"
+#: koeditorfreebusy.cpp:564
+msgid "No suitable date found."
 msgstr ""
 
-#: koeditorrecurrence.cpp:715
-msgid "The date on which the recurrences for this event or to-do should begin."
+#: koeditorfreebusy.cpp:700
+msgid ""
+"Of the %1 participants, %2 have accepted, %3 have tentatively accepted, and %4 "
+"have declined."
 msgstr ""
 
-#: koeditorrecurrence.cpp:722
-msgid "&No ending date"
+#: koeditorfreebusy.cpp:957
+msgid ""
+"You are changing the organiser of this event, who is also attending, do you "
+"want to change that attendee as well?"
 msgstr ""
 
-#: koeditorrecurrence.cpp:724
-msgid "Sets the event or to-do to recur forever."
+#: importdialog.cpp:41 previewdialog.cpp:53
+#, fuzzy
+msgid "Import Calendar/Event"
+msgstr "นำเข้าปฏิทิน..."
+
+#: importdialog.cpp:48
+msgid "Import calendar/event at '%1' into KOrganizer."
 msgstr ""
 
-#: koeditorrecurrence.cpp:731
-msgid "End &after"
+#: importdialog.cpp:57
+msgid "Add as new calendar"
 msgstr ""
 
-#: koeditorrecurrence.cpp:733
-msgid ""
-"Sets the event or to-do to stop recurring after a certain number of "
-"occurrences."
+#: importdialog.cpp:59
+msgid "Merge into existing calendar"
 msgstr ""
 
-#: koeditorrecurrence.cpp:738
-msgid "Number of times the event or to-do should recur before stopping."
+#: importdialog.cpp:62
+msgid "Open in separate window"
 msgstr ""
 
-#: koeditorrecurrence.cpp:744
-msgid "&occurrence(s)"
+#: actionmanager.cpp:255
+#, fuzzy
+msgid "Import &Event/Calendar (ICS-/VCS-File)..."
+msgstr "นำเข้าปฏิทิน..."
+
+#: actionmanager.cpp:257
+msgid "&Import From UNIX Ical tool (.calendar-File)"
 msgstr ""
 
-#: koeditorrecurrence.cpp:752
-msgid "End &on:"
+#: actionmanager.cpp:259
+msgid "Get &Hot New Stuff..."
 msgstr ""
 
-#: koeditorrecurrence.cpp:754
-msgid "Sets the event or to-do to stop recurring on a certain date."
+#: actionmanager.cpp:263
+msgid "Export &Web Page..."
 msgstr ""
 
-#: koeditorrecurrence.cpp:761
-msgid "Date after which the event or to-do should stop recurring"
+#: actionmanager.cpp:266
+msgid "&iCalendar..."
+msgstr ""
+
+#: actionmanager.cpp:269
+msgid "&vCalendar..."
+msgstr ""
+
+#: actionmanager.cpp:272
+msgid "Upload &Hot New Stuff..."
+msgstr ""
+
+#: actionmanager.cpp:278
+msgid "Archive O&ld Entries..."
+msgstr ""
+
+#: actionmanager.cpp:280
+msgid ""
+"_: delete completed to-dos\n"
+"Pur&ge Completed To-dos"
+msgstr ""
+
+#: actionmanager.cpp:338
+msgid "What's &Next"
 msgstr ""
 
-#: koeditorrecurrence.cpp:825
+#: actionmanager.cpp:342
+msgid "&Day"
+msgstr "วัน"
+
+#: actionmanager.cpp:351
 #, c-format
-msgid "Begins on: %1"
+msgid ""
+"_n: &Next Day\n"
+"Ne&xt %n Days"
 msgstr ""
 
-#: koeditorrecurrence.cpp:833
-msgid "Edit Recurrence Range"
+#: actionmanager.cpp:353
+msgid "W&ork Week"
+msgstr "สัปดาห์ทำงาน"
+
+#: actionmanager.cpp:357
+msgid "&Week"
+msgstr "สัปดาห์"
+
+#: actionmanager.cpp:361
+msgid "&Month"
+msgstr "เดือน"
+
+#: actionmanager.cpp:365
+msgid "&List"
+msgstr "รายการ"
+
+#: actionmanager.cpp:369
+msgid "&To-do List"
+msgstr "รายการสิ่งที่จะทำ"
+
+#: actionmanager.cpp:373
+msgid "&Journal"
 msgstr ""
 
-#: koeditorrecurrence.cpp:880
-msgid "Sets the type of recurrence this event or to-do should have."
+#: actionmanager.cpp:377
+msgid "&Timeline View"
 msgstr ""
 
-#: koeditorrecurrence.cpp:882
-msgid "Daily"
+#: actionmanager.cpp:383
+msgid "&Refresh"
 msgstr ""
 
-#: koeditorrecurrence.cpp:883
-msgid "Weekly"
+#: actionmanager.cpp:391
+msgid "F&ilter"
+msgstr "ตัวกรอง"
+
+#: actionmanager.cpp:406
+msgid "Zoom In Horizontally"
 msgstr ""
 
-#: koeditorrecurrence.cpp:884
-msgid "Monthly"
+#: actionmanager.cpp:409
+msgid "Zoom Out Horizontally"
 msgstr ""
 
-#: koeditorrecurrence.cpp:885
-msgid "Yearly"
+#: actionmanager.cpp:412
+msgid "Zoom In Vertically"
 msgstr ""
 
-#: koeditorrecurrence.cpp:897
-msgid "&Daily"
+#: actionmanager.cpp:415
+msgid "Zoom Out Vertically"
+msgstr ""
+
+#: actionmanager.cpp:424
+msgid "Go to &Today"
+msgstr ""
+
+#: actionmanager.cpp:428
+msgid "Go &Backward"
+msgstr ""
+
+#: actionmanager.cpp:440
+msgid "Go &Forward"
+msgstr ""
+
+#: actionmanager.cpp:450
+msgid "New E&vent..."
+msgstr ""
+
+#: actionmanager.cpp:454 kotodoview.cpp:464
+msgid "New &To-do..."
+msgstr "สร้างรายการสิ่งที่จะทำใหม่..."
+
+#: actionmanager.cpp:458 kotodoview.cpp:466
+msgid "New Su&b-to-do..."
+msgstr ""
+
+#: actionmanager.cpp:464
+msgid "New &Journal..."
+msgstr ""
+
+#: actionmanager.cpp:469 actionmanager.cpp:1461 actionmanager.cpp:1489
+#: koeventpopupmenu.cpp:53 kotodoview.cpp:454
+msgid "&Show"
+msgstr "แสดง"
+
+#: actionmanager.cpp:472 actionmanager.cpp:1462 actionmanager.cpp:1490
+#: koeventpopupmenu.cpp:55 kotodoview.cpp:456 resourceview.cpp:715
+msgid "&Edit..."
+msgstr "แก้ไข..."
+
+#: actionmanager.cpp:479
+msgid "&Make Sub-to-do Independent"
 msgstr ""
 
-#: koeditorrecurrence.cpp:899
+#: actionmanager.cpp:498
+msgid "&Publish Item Information..."
+msgstr ""
+
+#: actionmanager.cpp:503
+msgid "Send &Invitation to Attendees"
+msgstr ""
+
+#: actionmanager.cpp:511
+msgid "Re&quest Update"
+msgstr ""
+
+#: actionmanager.cpp:518
+msgid "Send &Cancelation to Attendees"
+msgstr ""
+
+#: actionmanager.cpp:525
+msgid "Send Status &Update"
+msgstr ""
+
+#: actionmanager.cpp:533
 msgid ""
-"Sets the event or to-do to recur daily according to the specified rules."
+"_: counter proposal\n"
+"Request Chan&ge"
 msgstr ""
 
-#: koeditorrecurrence.cpp:901
-msgid "&Weekly"
+#: actionmanager.cpp:540
+#, fuzzy
+msgid "&Send as iCalendar..."
+msgstr "ปรับแต่งปฏิทิน..."
+
+#: actionmanager.cpp:545
+msgid "&Mail Free Busy Information..."
 msgstr ""
 
-#: koeditorrecurrence.cpp:903
+#: actionmanager.cpp:550
+msgid "&Upload Free Busy Information"
+msgstr ""
+
+#: actionmanager.cpp:556
+msgid "&Addressbook"
+msgstr "สมุดที่อยู่"
+
+#: actionmanager.cpp:567
+msgid "Show Date Navigator"
+msgstr ""
+
+#: actionmanager.cpp:570
+msgid "Show To-do View"
+msgstr ""
+
+#: actionmanager.cpp:573
+msgid "Show Item Viewer"
+msgstr ""
+
+#: actionmanager.cpp:592
+msgid "Show Resource View"
+msgstr ""
+
+#: actionmanager.cpp:595
+msgid "Show &Resource Buttons"
+msgstr ""
+
+#: actionmanager.cpp:610
+msgid "Configure &Date && Time..."
+msgstr ""
+
+#: actionmanager.cpp:617
+msgid "Manage View &Filters..."
+msgstr ""
+
+#: actionmanager.cpp:620
+msgid "Manage C&ategories..."
+msgstr ""
+
+#: actionmanager.cpp:624
+msgid "&Configure Calendar..."
+msgstr "ปรับแต่งปฏิทิน..."
+
+#: actionmanager.cpp:649 actionmanager.cpp:651
+msgid "Filter: "
+msgstr "ตัวกรอง: "
+
+#: actionmanager.cpp:713 actionmanager.cpp:801 actionmanager.cpp:1191
+#: previewdialog.cpp:140
+msgid "*.vcs *.ics|Calendar Files"
+msgstr ""
+
+#: actionmanager.cpp:752
 msgid ""
-"Sets the event or to-do to recur weekly according to the specified rules."
+"You have no .calendar file in your home directory.\n"
+"Import cannot proceed.\n"
 msgstr ""
 
-#: koeditorrecurrence.cpp:905
-msgid "&Monthly"
+#: actionmanager.cpp:775
+msgid ""
+"KOrganizer successfully imported and merged your .calendar file from ical into "
+"the currently opened calendar."
 msgstr ""
 
-#: koeditorrecurrence.cpp:907
+#: actionmanager.cpp:781
 msgid ""
-"Sets the event or to-do to recur monthly according to the specified rules."
+"KOrganizer encountered some unknown fields while parsing your .calendar ical "
+"file, and had to discard them; please check to see that all your relevant data "
+"was correctly imported."
 msgstr ""
 
-#: koeditorrecurrence.cpp:909
-msgid "&Yearly"
+#: actionmanager.cpp:785
+msgid "ICal Import Successful with Warning"
 msgstr ""
 
-#: koeditorrecurrence.cpp:911
+#: actionmanager.cpp:788
 msgid ""
-"Sets the event or to-do to recur yearly according to the specified rules."
+"KOrganizer encountered an error parsing your .calendar file from ical; import "
+"has failed."
 msgstr ""
 
-#: koeditorrecurrence.cpp:973
-msgid "&Enable recurrence"
+#: actionmanager.cpp:792
+msgid ""
+"KOrganizer does not think that your .calendar file is a valid ical calendar; "
+"import has failed."
+msgstr ""
+
+#: actionmanager.cpp:874
+msgid "New calendar '%1'."
+msgstr ""
+
+#: actionmanager.cpp:909
+msgid "Cannot download calendar from '%1'."
+msgstr ""
+
+#: actionmanager.cpp:947
+msgid "Added calendar resource for URL '%1'."
+msgstr ""
+
+#: actionmanager.cpp:955
+msgid "Unable to create calendar resource '%1'."
+msgstr ""
+
+#: actionmanager.cpp:966
+msgid "Merged calendar '%1'."
+msgstr ""
+
+#: actionmanager.cpp:969
+msgid "Opened calendar '%1'."
 msgstr ""
 
-#: koeditorrecurrence.cpp:975
+#: actionmanager.cpp:994
 msgid ""
-"Enables recurrence for this event or to-do according to the specified rules."
+"Your calendar will be saved in iCalendar format. Use 'Export vCalendar' to save "
+"in vCalendar format."
 msgstr ""
 
-#: koeditorrecurrence.cpp:982
-msgid "Appointment Time "
+#: actionmanager.cpp:996
+msgid "Format Conversion"
 msgstr ""
 
-#: koeditorrecurrence.cpp:985
-msgid "Displays appointment time information."
+#: actionmanager.cpp:1020
+msgid "Cannot upload calendar to '%1'"
 msgstr ""
 
-#: koeditorrecurrence.cpp:1004
-msgid "Recurrence Rule"
+#: actionmanager.cpp:1033
+msgid "Saved calendar '%1'."
 msgstr ""
 
-#: koeditorrecurrence.cpp:1006
+#: actionmanager.cpp:1064
+msgid "Do you want to overwrite file \"%1\""
+msgstr ""
+
+#: actionmanager.cpp:1098
+msgid "Could not upload file."
+msgstr ""
+
+#: actionmanager.cpp:1139
+#, c-format
+msgid "Unable to save calendar to the file %1."
+msgstr ""
+
+#: actionmanager.cpp:1164
 msgid ""
-"Options concerning the type of recurrence this event or to-do should have."
+"The calendar has been modified.\n"
+"Do you want to save it?"
 msgstr ""
+"มีการแก้ไขปฏิทิน\n"
+"คุณต้องการทำการบันทึกมันหรือไม่ ?"
 
-#: koeditorrecurrence.cpp:1043
-msgid "Recurrence Range..."
+#: actionmanager.cpp:1267
+#, c-format
+msgid ""
+"_n: &Next Day\n"
+"&Next %n Days"
+msgstr ""
+
+#: actionmanager.cpp:1301
+msgid "Could not start control module for date and time format."
 msgstr ""
 
-#: koeditorrecurrence.cpp:1046 koeditorrecurrence.cpp:1063
+#: actionmanager.cpp:1447
+msgid "&Show Event"
+msgstr "แสดงเหตุการณ์"
+
+#: actionmanager.cpp:1448
+msgid "&Edit Event..."
+msgstr "แก้ไขเหตุการณ์..."
+
+#: actionmanager.cpp:1449
+msgid "&Delete Event"
+msgstr "ลบเหตุการณ์"
+
+#: actionmanager.cpp:1453
+msgid "&Show To-do"
+msgstr "แสดงรายการสิ่งที่จะทำ"
+
+#: actionmanager.cpp:1454
+msgid "&Edit To-do..."
+msgstr "แก้ไขรายการสิ่งที่จะทำ..."
+
+#: actionmanager.cpp:1455
+msgid "&Delete To-do"
+msgstr "ลบรายการสิ่งที่จะทำ"
+
+#: actionmanager.cpp:1579
 msgid ""
-"Options concerning the time range during which this event or to-do should "
-"recur."
+"\"%1\" is read-only. Please select a writable calendar before attempting to "
+"create a new item."
 msgstr ""
 
-#: koeditorrecurrence.cpp:1055
-msgid "Exceptions..."
+#: actionmanager.cpp:1582
+#, fuzzy
+msgid "Read-only calendar"
+msgstr "ปฏิทิน"
+
+#: actionmanager.cpp:1612
+msgid ""
+"You have no active, writable event folder so saving will not be possible.\n"
+"Please create or activate at least one writable event folder and try again."
 msgstr ""
 
-#: koeditorrecurrence.cpp:1395
+#: actionmanager.cpp:1616
 msgid ""
-"The end date '%1' of the recurrence must be after the start date '%2' of the "
-"event."
+"You have no active, writable to-do (task) folders so saving will not be "
+"possible.\n"
+"Please create or activate at least one writable to-do folder and try again."
 msgstr ""
 
-#: koeditorrecurrence.cpp:1409
+#: actionmanager.cpp:1620
 msgid ""
-"A weekly recurring event or task has to have at least one weekday associated "
-"with it."
+"You have no active, writable journal folder so saving will not be possible.\n"
+"Please create or activate at least one writable journal folder and try again."
 msgstr ""
 
-#: koeditorrecurrence.cpp:1443
-msgid "Recurrence"
+#: actionmanager.cpp:1624
+msgid ""
+"You have no active, writable calendar folder so saving will not be possible.\n"
+"Please create or activate at least one writable calendar folder and try again."
 msgstr ""
 
-#: koincidenceeditor.cpp:73
-msgid "&Templates..."
+#: actionmanager.cpp:1630
+#, fuzzy
+msgid "No writable calendar"
+msgstr "ปฏิทินใหม่"
+
+#: actionmanager.cpp:1671 actionmanager.cpp:1794
+msgid "Attach as &link"
 msgstr ""
 
-#: koincidenceeditor.cpp:86
-msgid "Atte&ndees"
+#: actionmanager.cpp:1672 actionmanager.cpp:1795
+msgid "Attach &inline"
 msgstr ""
 
-#: koincidenceeditor.cpp:88
+#: actionmanager.cpp:1673
+msgid "Attach inline &without attachments"
+msgstr ""
+
+#: actionmanager.cpp:1675 actionmanager.cpp:1797 koeditorattachments.cpp:601
+msgid "C&ancel"
+msgstr ""
+
+#: actionmanager.cpp:1705
+msgid "Removing attachments from an email might invalidate its signature."
+msgstr ""
+
+#: actionmanager.cpp:1706
+msgid "Remove Attachments"
+msgstr ""
+
+#: actionmanager.cpp:1895
+msgid "Undo (%1)"
+msgstr ""
+
+#: actionmanager.cpp:1907
+msgid "Redo (%1)"
+msgstr ""
+
+#: actionmanager.cpp:1919
 msgid ""
-"The Attendees tab allows you to Add or Remove Attendees to/from this event or "
-"to-do."
+"The calendar contains unsaved changes. Do you want to save them before exiting?"
 msgstr ""
 
-#: koincidenceeditor.cpp:172
-msgid "Unable to find template '%1'."
+#: actionmanager.cpp:1924
+msgid "Unable to save the calendar. Do you still want to close this window?"
 msgstr ""
 
-#: koincidenceeditor.cpp:177
-msgid "Error loading template file '%1'."
+#: actionmanager.cpp:1945
+msgid "Unable to exit. Saving still in progress."
+msgstr "กำลังทำการบันทึกอยู่ ยังไม่สามารถออกจากโปรแกรมได้"
+
+#: actionmanager.cpp:1984
+msgid ""
+"Saving of '%1' failed. Check that the resource is properly configured.\n"
+"Ignore problem and continue without saving or cancel save?"
 msgstr ""
 
-#: koincidenceeditor.cpp:376 koincidenceeditor.cpp:377
-msgid "Counter proposal"
+#: actionmanager.cpp:1987
+msgid "Save Error"
 msgstr ""
 
-#: koeditoralarms.cpp:83
-msgid "Reminder Dialog"
+#: actionmanager.cpp:2009
+msgid "URL '%1' is invalid."
 msgstr ""
 
-#. i18n: file koeditoralarms_base.ui line 271
-#: koeditoralarms.cpp:86 rc.cpp:220 rc.cpp:1934
-#, no-c-format
-msgid "Program"
+#: actionmanager.cpp:2025
+#, fuzzy
+msgid "Unable to open the calendar"
+msgstr "ไม่สามารถปรับแต่งโปรแกรมเสริมนี้ได้"
+
+#: archivedialog.cpp:55
+msgid "Archive/Delete Past Events and To-dos"
 msgstr ""
 
-#: koeditoralarms.cpp:92
-msgid "Audio"
+#: archivedialog.cpp:57
+msgid "&Archive"
 msgstr ""
 
-#: koeditoralarms.cpp:95 koprefsdialog.cpp:175
-msgid "Unknown"
+#: archivedialog.cpp:66
+msgid ""
+"Archiving saves old items into the given file and then deletes them in the "
+"current calendar. If the archive file already exists they will be added. (<a "
+"href=\"whatsthis:In order to add an archive to your calendar, use the "
+"&quot;Merge Calendar&quot; function. You can view an archive by opening it in "
+"KOrganizer like any other calendar. It is not saved in a special format, but as "
+"vCalendar.\">How to restore</a>)"
 msgstr ""
 
-#: koeditoralarms.cpp:106 printing/calprintdefaultplugins.cpp:310
+#: archivedialog.cpp:82
+msgid "Archive now items older than:"
+msgstr ""
+
+#: archivedialog.cpp:87
 msgid ""
-"_: N days/hours/minutes before/after the start/end\n"
-"%1 before the start"
+"The date before which items should be archived. All older events and to-dos "
+"will be saved and deleted, the newer (and events exactly on that date) will be "
+"kept."
+msgstr ""
+
+#: archivedialog.cpp:96
+msgid "Automaticall&y archive items older than:"
 msgstr ""
 
-#: koeditoralarms.cpp:109 printing/calprintdefaultplugins.cpp:313
+#: archivedialog.cpp:99
 msgid ""
-"_: N days/hours/minutes before/after the start/end\n"
-"%1 after the start"
+"If this feature is enabled, KOrganizer will regularly check if events and "
+"to-dos have to be archived; this means you will not need to use this dialog box "
+"again, except to change the settings."
 msgstr ""
 
-#: koeditoralarms.cpp:114 printing/calprintdefaultplugins.cpp:318
+#: archivedialog.cpp:107
 msgid ""
-"_: N days/hours/minutes before/after the start/end\n"
-"%1 before the end"
+"The age of the events and to-dos to archive. All older items will be saved and "
+"deleted, the newer will be kept."
+msgstr ""
+
+#: archivedialog.cpp:112
+msgid "Day(s)"
 msgstr ""
 
-#: koeditoralarms.cpp:117 printing/calprintdefaultplugins.cpp:321
+#: archivedialog.cpp:113
+msgid "Week(s)"
+msgstr ""
+
+#: archivedialog.cpp:114
+msgid "Month(s)"
+msgstr ""
+
+#: archivedialog.cpp:119
+msgid "Archive &file:"
+msgstr ""
+
+#: archivedialog.cpp:123
+msgid "*.ics|iCalendar Files"
+msgstr ""
+
+#: archivedialog.cpp:125
 msgid ""
-"_: N days/hours/minutes before/after the start/end\n"
-"%1 after the end"
+"The path of the archive. The events and to-dos will be added to the archive "
+"file, so any events that are already in the file will not be modified or "
+"deleted. You can later load or merge the file like any other calendar. It is "
+"not saved in a special format, it uses the iCalendar format. "
 msgstr ""
 
-#: koeditoralarms.cpp:126 printing/calprintdefaultplugins.cpp:330
-#, c-format
+#: archivedialog.cpp:134
+msgid "Type of Items to Archive"
+msgstr ""
+
+#. i18n: file ./plugins/printing/list/calprintlistconfig_base.ui line 141
+#: archivedialog.cpp:136 rc.cpp:990 searchdialog.cpp:72
+#, no-c-format
+msgid "&Events"
+msgstr ""
+
+#: archivedialog.cpp:137
+#, fuzzy
+msgid "Completed &To-dos"
+msgstr "ลบรายการสิ่งที่จะทำ"
+
+#: archivedialog.cpp:139
 msgid ""
-"_n: 1 day\n"
-"%n days"
+"Here you can select which items should be archived. Events are archived if they "
+"ended before the date given above; to-dos are archived if they were finished "
+"before the date."
 msgstr ""
 
-#: koeditoralarms.cpp:129 koeditorgeneralevent.cpp:432
-#: printing/calprintdefaultplugins.cpp:333
-#, c-format
+#: archivedialog.cpp:144
+msgid "&Delete only, do not save"
+msgstr ""
+
+#: archivedialog.cpp:147
 msgid ""
-"_n: 1 hour\n"
-"%n hours"
+"Select this option to delete old events and to-dos without saving them. It is "
+"not possible to recover the events later."
 msgstr ""
 
-#: koeditoralarms.cpp:132 koeditorgeneralevent.cpp:439
-#: printing/calprintdefaultplugins.cpp:336
-#, c-format
+#: archivedialog.cpp:211
 msgid ""
-"_n: 1 minute\n"
-"%n minutes"
+"The archive file name is not valid.\n"
 msgstr ""
 
-#: koeditoralarms.cpp:148
-msgid "Edit Reminders"
+#: koagendaview.cpp:320 koagendaview.cpp:815 multiagendaview.cpp:62
+msgid "All Day"
+msgstr "ทุกวัน"
+
+#: koeditorgeneralevent.cpp:99 koeditorgeneraltodo.cpp:100
+msgid "Date && Time"
+msgstr "วันที่และเวลา"
+
+#: koeditorgeneralevent.cpp:101
+msgid "Sets options related to the date and time of the event or to-do."
 msgstr ""
 
-#: koagendaitem.cpp:560
-msgid "Attendee \"%1\" added to the calendar item \"%2\""
+#: koeditorgeneralevent.cpp:111
+msgid "&Start:"
 msgstr ""
 
-#: koagendaitem.cpp:560
-msgid "Attendee added"
+#: koeditorgeneralevent.cpp:121
+msgid "&End:"
 msgstr ""
 
-#: koagendaitem.cpp:819 koagendaitem.cpp:917
-msgid "%1 - %2"
+#: koeditorgeneralevent.cpp:131
+#, fuzzy
+msgid "All-&day"
+msgstr "ทุกวัน"
+
+#: koeditorgeneralevent.cpp:150 koeditorgeneraltodo.cpp:157
+msgid "Recurrence:"
 msgstr ""
 
-#: koagendaitem.cpp:828
+#: koeditorgeneralevent.cpp:162 koeditorgeneraltodo.cpp:169
+#, fuzzy
+msgid "Reminder:"
+msgstr "ตัวแจ้งเตือน:"
+
+#: koeditorgeneralevent.cpp:182
+msgid "S&how time as:"
+msgstr ""
+
+#: koeditorgeneralevent.cpp:183
+msgid "Sets how this time will appear on your Free/Busy information."
+msgstr ""
+
+#: koeditorgeneralevent.cpp:190
+msgid "Busy"
+msgstr ""
+
+#: koeditorgeneralevent.cpp:191
+msgid "Free"
+msgstr ""
+
+#: koeditorgeneralevent.cpp:205
+msgid "You have not yet definitely responded to this invitation."
+msgstr ""
+
+#: kocounterdialog.cpp:37 koeditorgeneralevent.cpp:208
+msgid "Accept"
+msgstr "ยอมรับ"
+
+#: kocounterdialog.cpp:37 koeditorgeneralevent.cpp:212
+msgid "Decline"
+msgstr "ปฏิเสธ"
+
+#: koeditorgeneralevent.cpp:434 koeditorgeneralevent.cpp:448
+#: printing/calprintdefaultplugins.cpp:155
+msgid "Duration: "
+msgstr ""
+
+#: koeditorgeneralevent.cpp:435
 #, c-format
-msgid "- %1"
+msgid ""
+"_n: 1 Day\n"
+"%n Days"
 msgstr ""
 
-#: incidencechanger.cpp:61
+#: koeditoralarms.cpp:173 koeditorgeneralevent.cpp:450
+#: printing/calprintdefaultplugins.cpp:352
+#, c-format
 msgid ""
-"Some attendees were removed from the incidence. Shall cancel messages be sent "
-"to these attendees?"
+"_n: 1 hour\n"
+"%n hours"
 msgstr ""
 
-#: incidencechanger.cpp:63
-msgid "Attendees Removed"
+#: koeditorgeneralevent.cpp:454
+msgid ", "
 msgstr ""
 
-#: incidencechanger.cpp:63
-msgid "Send Messages"
+#: koeditoralarms.cpp:176 koeditorgeneralevent.cpp:457
+#: printing/calprintdefaultplugins.cpp:355
+#, c-format
+msgid ""
+"_n: 1 minute\n"
+"%n minutes"
 msgstr ""
 
-#: incidencechanger.cpp:63 kogroupware.cpp:279 kogroupware.cpp:291
-#: kogroupware.cpp:299
-msgid "Do Not Send"
+#: koeditorgeneralevent.cpp:465
+msgid ""
+"Shows the duration of the event or to-do with the current start and end dates "
+"and times."
 msgstr ""
 
-#: incidencechanger.cpp:344 kodialogmanager.cpp:113
-msgid "Unable to save %1 \"%2\"."
+#: koeditorgeneralevent.cpp:482
+msgid "From: %1   To: %2   %3"
 msgstr ""
 
-#: importdialog.cpp:41
-msgid "Import Calendar"
+#: koeditorgeneralevent.cpp:495
+msgid "Please specify a valid start time, for example '%1'."
 msgstr ""
 
-#: importdialog.cpp:48
-msgid "Import calendar at '%1' into KOrganizer."
+#: koeditorgeneralevent.cpp:502
+msgid "Please specify a valid end time, for example '%1'."
 msgstr ""
 
-#: importdialog.cpp:57
-msgid "Add as new calendar"
+#: koeditorgeneralevent.cpp:510
+msgid "Please specify a valid start date, for example '%1'."
 msgstr ""
 
-#: importdialog.cpp:59
-msgid "Merge into existing calendar"
+#: koeditorgeneralevent.cpp:517
+msgid "Please specify a valid end date, for example '%1'."
 msgstr ""
 
-#: importdialog.cpp:62
-msgid "Open in separate window"
+#: koeditorgeneralevent.cpp:533
+msgid ""
+"The event ends before it starts.\n"
+"Please correct dates and times."
 msgstr ""
 
-#: koprefsdialog.cpp:99
+#: koprefsdialog.cpp:103
 msgid "Saving Calendar"
 msgstr ""
 
-#: koprefsdialog.cpp:161
+#: koprefsdialog.cpp:165
 msgid "Timezone:"
 msgstr ""
 
 #. i18n: file korganizer.kcfg line 135
-#: koprefsdialog.cpp:162 rc.cpp:567 rc.cpp:1154
+#: koprefsdialog.cpp:166 rc.cpp:570 rc.cpp:1200
 #, no-c-format
 msgid ""
 "Select your timezone from the list of locations on this drop down box. If your "
@@ -903,145 +2154,161 @@ msgid ""
 "automatically adjust for daylight savings."
 msgstr ""
 
-#: koprefsdialog.cpp:206
+#: koeditoralarms.cpp:125 koeditorattachments.cpp:198 koprefsdialog.cpp:179
+msgid "Unknown"
+msgstr ""
+
+#: koprefsdialog.cpp:210
 msgid "[No selection]"
 msgstr ""
 
 #. i18n: file korganizer.kcfg line 138
-#: koprefsdialog.cpp:255 rc.cpp:570 rc.cpp:1157
+#: koprefsdialog.cpp:259 rc.cpp:573 rc.cpp:1203
 #, no-c-format
 msgid "Use holiday region:"
 msgstr ""
 
 #. i18n: file korganizer.kcfg line 139
-#: koprefsdialog.cpp:256 rc.cpp:573 rc.cpp:1160
+#: koprefsdialog.cpp:260 rc.cpp:576 rc.cpp:1206
 #, no-c-format
 msgid ""
 "Select from which region you want to use the holidays here. Defined holidays "
 "are shown as non-working days in the date navigator, the agenda view, etc."
 msgstr ""
 
-#: koprefsdialog.cpp:292
+#: koprefsdialog.cpp:296
 msgid "(None)"
 msgstr ""
 
-#: koprefsdialog.cpp:319
-msgid "1 minute"
-msgstr "1 นาที"
+#: koprefsdialog.cpp:323
+#, fuzzy
+msgid "Reminders"
+msgstr "ตัวแจ้งเตือน:"
 
-#: koprefsdialog.cpp:319
-msgid "5 minutes"
-msgstr "5 นาที"
+#: koprefsdialog.cpp:328
+msgid "Default reminder time:"
+msgstr "เวลาปริยายในการเตือน:"
 
-#: koprefsdialog.cpp:320
-msgid "10 minutes"
-msgstr "10 นาที"
+#. i18n: file koeditoralarms_base.ui line 66
+#: koeditorgeneral.cpp:232 koprefsdialog.cpp:335 korgac/alarmdialog.cpp:157
+#: rc.cpp:172 rc.cpp:2069
+#, no-c-format
+msgid "minute(s)"
+msgstr "นาที"
 
-#: koprefsdialog.cpp:320
-msgid "15 minutes"
-msgstr "15 นาที"
+#. i18n: file koeditoralarms_base.ui line 71
+#: koeditorgeneral.cpp:233 koprefsdialog.cpp:336 korgac/alarmdialog.cpp:158
+#: rc.cpp:175 rc.cpp:2072
+#, no-c-format
+msgid "hour(s)"
+msgstr "ชั่วโมง"
 
-#: koprefsdialog.cpp:321
-msgid "30 minutes"
-msgstr "30 นาที"
+#. i18n: file koeditoralarms_base.ui line 76
+#: koeditorgeneral.cpp:234 koeditorrecurrence.cpp:167 koprefsdialog.cpp:337
+#: korgac/alarmdialog.cpp:159 rc.cpp:178 rc.cpp:2075
+#, no-c-format
+msgid "day(s)"
+msgstr ""
 
-#: koprefsdialog.cpp:322
-msgid "Default reminder time:"
-msgstr "เวลาปริยายในการเตือน:"
+#: koprefsdialog.cpp:349
+msgid ""
+"*.ogg *.wav *.mp3 *.wma *.flac *.aiff *.raw *.au *.ra|Audio Files (*.ogg *.wav "
+"*.mp3 *.wma *.flac *.aiff *.raw *.au *.ra)"
+msgstr ""
 
-#: koprefsdialog.cpp:325 koprefsdialog.cpp:328
-msgid "Enter the default reminder time here."
-msgstr "เติมเวลาปริยายในการเตือนที่นี่"
+#: koprefsdialog.cpp:363
+msgid "Enable reminders by default:"
+msgstr ""
 
-#: koprefsdialog.cpp:336
+#: koprefsdialog.cpp:371
 msgid "Working Hours"
 msgstr "ชั่วโมงทำงาน"
 
-#: koprefsdialog.cpp:352
+#: koprefsdialog.cpp:387
 msgid ""
 "Check this box to make KOrganizer mark the working hours for this day of the "
 "week. If this is a work day for you, check this box, or the working hours will "
 "not be marked with color."
 msgstr ""
 
-#: koprefsdialog.cpp:473
+#: koprefsdialog.cpp:514
 msgid "Date Navigator"
 msgstr ""
 
-#: koprefsdialog.cpp:482
+#: koprefsdialog.cpp:524
 msgid "Agenda View"
 msgstr ""
 
-#: koprefsdialog.cpp:488
+#: koprefsdialog.cpp:530
 msgid ""
 "_: suffix in the hour size spin box\n"
 " pixel"
 msgstr ""
 
-#: koprefsdialog.cpp:495
+#: koprefsdialog.cpp:537
 msgid ""
 "_: suffix in the N days spin box\n"
 " days"
 msgstr ""
 
-#: koprefsdialog.cpp:520
+#: koprefsdialog.cpp:558
 msgid "Month View"
 msgstr ""
 
-#: koprefsdialog.cpp:532
+#: koprefsdialog.cpp:568
 msgid "To-do View"
 msgstr ""
 
-#: koprefsdialog.cpp:577 koprefsdialog.cpp:585
+#: koprefsdialog.cpp:613 koprefsdialog.cpp:621
 msgid "Event text"
 msgstr ""
 
 #. i18n: file filteredit_base.ui line 193
-#: kolistview.cpp:216 koprefsdialog.cpp:666 kotodoview.cpp:395 rc.cpp:141
-#: rc.cpp:2117
+#: kolistview.cpp:221 koprefsdialog.cpp:703 kotodoview.cpp:394 rc.cpp:141
+#: rc.cpp:2225
 #, no-c-format
 msgid "Categories"
 msgstr "หมวดหมู่"
 
-#: koprefsdialog.cpp:673
+#: koprefsdialog.cpp:711
 msgid ""
 "Select here the event category you want to modify. You can change the selected "
 "category color using the button below."
 msgstr ""
 
-#: koprefsdialog.cpp:680
+#: koprefsdialog.cpp:718
 msgid ""
 "Choose here the color of the event category selected using the combo box above."
 msgstr ""
 
-#: koprefsdialog.cpp:686
+#: koprefsdialog.cpp:724
 msgid "Resources"
 msgstr ""
 
-#: koprefsdialog.cpp:692
+#: koprefsdialog.cpp:730
 msgid ""
 "Select here resource you want to modify. You can change the selected resource "
 "color using the button below."
 msgstr ""
 
-#: koprefsdialog.cpp:699
+#: koprefsdialog.cpp:737
 msgid ""
 "Choose here the color of the resource selected using the combo box above."
 msgstr ""
 
-#: koprefsdialog.cpp:844
+#: koprefsdialog.cpp:882
 msgid "Scheduler Mail Client"
 msgstr ""
 
-#: koprefsdialog.cpp:847
+#: koprefsdialog.cpp:885
 msgid "Mail client"
 msgstr ""
 
-#: koprefsdialog.cpp:852
+#: koprefsdialog.cpp:890
 msgid "Additional email addresses:"
 msgstr ""
 
-#: koprefsdialog.cpp:853
+#: koprefsdialog.cpp:891
 msgid ""
 "Add, edit or remove additional e-mails addresses here. These email addresses "
 "are the ones you have in addition to the one set in personal preferences. If "
@@ -1049,270 +2316,206 @@ msgid ""
 "to list this address here so KOrganizer can recognize it as yours."
 msgstr ""
 
-#: koprefsdialog.cpp:868
+#: koprefsdialog.cpp:906
 msgid "Additional email address:"
 msgstr ""
 
-#: koprefsdialog.cpp:869
+#: koprefsdialog.cpp:907
 msgid ""
 "Edit additional e-mails addresses here. To edit an address select it from the "
 "list above or press the \"New\" button below. These email addresses are the "
 "ones you have in addition to the one set in personal preferences."
 msgstr ""
 
-#: koprefsdialog.cpp:881
+#: koprefsdialog.cpp:919
 msgid "New"
 msgstr ""
 
-#: koprefsdialog.cpp:882
+#: koprefsdialog.cpp:920
 msgid ""
 "Press this button to add a new entry to the additional e-mail addresses list. "
 "Use the edit box above to edit the new entry."
 msgstr ""
 
-#: koprefsdialog.cpp:929 publishdialog.cpp:102
+#: koprefsdialog.cpp:967 publishdialog.cpp:102
 msgid "(EmptyEmail)"
 msgstr ""
 
-#: koprefsdialog.cpp:1080
+#: koprefsdialog.cpp:1123
 msgid "Configure &Plugin..."
 msgstr "ปรับแต่งโปรแกรมเสริม..."
 
-#: koprefsdialog.cpp:1081
+#: koprefsdialog.cpp:1124
 msgid ""
 "This button allows you to configure the plugin that you have selected in the "
 "list above"
 msgstr ""
 
-#: koprefsdialog.cpp:1142
+#: koprefsdialog.cpp:1185
 msgid "Unable to configure this plugin"
 msgstr "ไม่สามารถปรับแต่งโปรแกรมเสริมนี้ได้"
 
-#: history.cpp:185
-#, c-format
-msgid "Delete %1"
-msgstr "ลบ %1"
-
-#: history.cpp:214
-#, c-format
-msgid "Add %1"
-msgstr "เพิ่ม %1"
-
-#: history.cpp:251
-#, c-format
-msgid "Edit %1"
-msgstr "แก้ไข %1"
-
-#: freebusymanager.cpp:228
-msgid ""
-"<qt>No URL configured for uploading your free/busy list. Please set it in "
-"KOrganizer's configuration dialog, on the \"Free/Busy\" page. "
-"<br>Contact your system administrator for the exact URL and the account "
-"details.</qt>"
-msgstr ""
-
-#: freebusymanager.cpp:232
-msgid "No Free/Busy Upload URL"
-msgstr ""
-
-#: freebusymanager.cpp:239
-msgid "<qt>The target URL '%1' provided is invalid.</qt>"
+#: searchdialog.cpp:49
+msgid "Find Events"
 msgstr ""
 
-#: freebusymanager.cpp:240
-msgid "Invalid URL"
+#: searchdialog.cpp:50
+msgid "&Find"
 msgstr ""
 
-#: freebusymanager.cpp:330
-msgid ""
-"<qt>The software could not upload your free/busy list to the URL '%1'. There "
-"might be a problem with the access rights, or you specified an incorrect URL. "
-"The system said: <em>%2</em>."
-"<br>Please check the URL or contact your system administrator.</qt>"
+#: searchdialog.cpp:62
+msgid "&Search for:"
 msgstr ""
 
-#: _translatorinfo.cpp:1
-msgid ""
-"_: NAME OF TRANSLATORS\n"
-"Your names"
-msgstr "ถนอมทรัพย์ นพบูรณ์"
-
-#: _translatorinfo.cpp:3
-msgid ""
-"_: EMAIL OF TRANSLATORS\n"
-"Your emails"
-msgstr "donga_n@yahoo.com"
-
-#: koeditorgeneral.cpp:104
-msgid "Owner:"
-msgstr "เจ้าของ:"
-
-#: koeditorgeneral.cpp:108
-msgid "Sets the Title of this event or to-do."
+#: searchdialog.cpp:70
+msgid "Search For"
 msgstr ""
 
-#: koeditorgeneral.cpp:109 koeditorgeneraljournal.cpp:63
-msgid "T&itle:"
+#: searchdialog.cpp:73
+msgid "To-&dos"
 msgstr ""
 
-#: koeditorgeneral.cpp:127
-msgid "Sets where the event or to-do will take place."
+#: searchdialog.cpp:74
+msgid "&Journal entries"
 msgstr ""
 
-#: koeditorgeneral.cpp:128
-msgid "&Location:"
-msgstr "ตำแหน่ง:"
-
-#: koeditorgeneral.cpp:144
-msgid ""
-"Allows you to select the categories that this event or to-do belongs to."
+#: exportwebdialog.cpp:143 searchdialog.cpp:79
+msgid "Date Range"
 msgstr ""
 
-#: koeditorgeneral.cpp:145
-#, fuzzy
-msgid "Categories:"
-msgstr "หมวดหมู่"
-
-#: koeditorgeneral.cpp:154
-#, fuzzy
-msgid "&Select..."
-msgstr "ลบ..."
-
-#: koeditorgeneral.cpp:164
-msgid "Acc&ess:"
+#: searchdialog.cpp:87
+msgid "Fr&om:"
 msgstr ""
 
-#: koeditorgeneral.cpp:165
-msgid ""
-"Sets whether the access to this event or to-do is restricted. Please note that "
-"KOrganizer currently does not use this setting, so the implementation of the "
-"restrictions will depend on the groupware server. This means that events or "
-"to-dos marked as private or confidential may be visible to others."
+#: searchdialog.cpp:91
+msgid "&To:"
 msgstr ""
 
-#: koeditorgeneral.cpp:186
-msgid ""
-"Sets the description for this event or to-do. This will be displayed in a "
-"reminder if one is set, as well as in a tooltip when you hover over the event."
+#: searchdialog.cpp:95
+msgid "E&vents have to be completely included"
 msgstr ""
 
-#: koeditorgeneral.cpp:210
-msgid "No reminders configured"
+#: searchdialog.cpp:98
+msgid "Include to-dos &without due date"
 msgstr ""
 
-#: koeditorgeneral.cpp:216
-msgid "&Reminder:"
-msgstr "ตัวแจ้งเตือน:"
-
-#: koeditorgeneral.cpp:218
-msgid "Activates a reminder for this event or to-do."
+#: searchdialog.cpp:102
+msgid "Search In"
 msgstr ""
 
-#: koeditorgeneral.cpp:220
-msgid "Sets how long before the event occurs the reminder will be triggered."
+#: searchdialog.cpp:105
+msgid "Su&mmaries"
 msgstr ""
 
-#. i18n: file koeditoralarms_base.ui line 60
-#: koeditorgeneral.cpp:228 korgac/alarmdialog.cpp:120 rc.cpp:172 rc.cpp:1886
-#, no-c-format
-msgid "minute(s)"
-msgstr "นาที"
-
-#. i18n: file koeditoralarms_base.ui line 65
-#: koeditorgeneral.cpp:229 korgac/alarmdialog.cpp:121 rc.cpp:175 rc.cpp:1889
-#, no-c-format
-msgid "hour(s)"
-msgstr "ชั่วโมง"
-
-#: koeditorgeneral.cpp:237
-msgid "Advanced"
+#: searchdialog.cpp:107
+msgid "Desc&riptions"
 msgstr ""
 
-#: koeditorgeneral.cpp:322 koeditorgeneral.cpp:399
-msgid "Owner: "
+#: searchdialog.cpp:108
+msgid "Cate&gories"
 msgstr ""
 
-#: koeditorgeneral.cpp:357
-#, c-format
+#: searchdialog.cpp:149
 msgid ""
-"_n: 1 advanced reminder configured\n"
-"%n advanced reminders configured"
+"Invalid search expression, cannot perform the search. Please enter a search "
+"expression using the wildcard characters '*' and '?' where needed."
 msgstr ""
 
-#: koeditorgeneral.cpp:384
-msgid "1 advanced reminder configured"
+#: searchdialog.cpp:162
+msgid "No events were found matching your search expression."
 msgstr ""
 
-#: koeditorgeneral.cpp:422
-#, fuzzy, c-format
-msgid "Calendar: %1"
-msgstr "ปฏิทิน"
-
-#: koeditorgeneral.cpp:496
-#, c-format
-msgid ""
-"_n: One attendee\n"
-"%n attendees"
+#: konewstuff.cpp:48
+msgid "Could not load calendar."
 msgstr ""
 
-#: koeditorgeneralevent.cpp:102 koeditorgeneraltodo.cpp:102
-msgid "Date && Time"
-msgstr "วันที่และเวลา"
+#: konewstuff.cpp:63
+msgid "The downloaded events will be merged into your current calendar."
+msgstr ""
 
-#: koeditorgeneraltodo.cpp:107
+#: koeditorgeneraltodo.cpp:105
 msgid "Sets options for due and start dates and times for this to-do."
 msgstr ""
 
-#: koeditorgeneraltodo.cpp:114
+#: koeditorgeneraltodo.cpp:112
 msgid "Sets the start date for this to-do"
 msgstr ""
 
-#: koeditorgeneraltodo.cpp:115
+#: koeditorgeneraltodo.cpp:113
 msgid "Sta&rt:"
 msgstr "เริ่ม:"
 
-#: koeditorgeneraltodo.cpp:128
+#: koeditorgeneraltodo.cpp:126
 msgid "Sets the start time for this to-do."
 msgstr ""
 
-#: koeditorgeneraltodo.cpp:132
+#: koeditorgeneraltodo.cpp:130
 msgid "Sets the due date for this to-do."
 msgstr ""
 
-#: koeditorgeneraltodo.cpp:133
+#: koeditorgeneraltodo.cpp:131
 msgid "&Due:"
 msgstr "ครบกำหนด:"
 
-#: koeditorgeneraltodo.cpp:148
+#: koeditorgeneraltodo.cpp:145
 msgid "Sets the due time for this to-do."
 msgstr ""
 
-#: koeditorgeneraltodo.cpp:152
+#: koeditorgeneraltodo.cpp:149
 msgid "Ti&me associated"
 msgstr ""
 
-#: koeditorgeneraltodo.cpp:154
+#: koeditorgeneraltodo.cpp:151
 msgid ""
 "Sets whether or not this to-do's start and due dates have times associated with "
 "them."
 msgstr ""
 
-#: koeditorgeneraltodo.cpp:172
-msgid "Sets the current completion status of this to-do as a percentage."
+#: koeditorgeneraltodo.cpp:189
+msgid "&Completed:"
+msgstr ""
+
+#: koeditorgeneraltodo.cpp:194
+msgid "Toggle between 0% and 100% complete"
+msgstr ""
+
+#: koeditorgeneraltodo.cpp:196
+#, c-format
+msgid ""
+"Click this checkbox to toggle the completed percentage of the to-do between 0% "
+"or 100%"
+msgstr ""
+
+#: koeditorgeneraltodo.cpp:204
+msgid "Select the completed percentage"
 msgstr ""
 
-#: koeditorgeneraltodo.cpp:178
+#: koeditorgeneraltodo.cpp:206
+msgid "Use this combobox to set the completion percentage of the to-do."
+msgstr ""
+
+#: koeditorgeneraltodo.cpp:209
 #, no-c-format
 msgid ""
 "_: Percent complete\n"
 "%1 %"
 msgstr ""
 
-#: koeditorgeneraltodo.cpp:184 koeditorgeneraltodo.cpp:544
-msgid "co&mpleted"
+#: koeditorgeneraltodo.cpp:215
+msgid ""
+"_: completed on\n"
+"on"
+msgstr ""
+
+#: koeditorgeneraltodo.cpp:230
+msgid "&Priority:"
+msgstr "ความสำคัญ:"
+
+#: koeditorgeneraltodo.cpp:235
+msgid "Set the priority of the to-do"
 msgstr ""
 
-#: koeditorgeneraltodo.cpp:197
+#: koeditorgeneraltodo.cpp:237
 msgid ""
 "Sets the priority of this to-do on a scale from one to nine, with one being the "
 "highest priority, five being a medium priority, and nine being the lowest. In "
@@ -1320,798 +2523,1203 @@ msgid ""
 "appropriate scale."
 msgstr ""
 
-#: koeditorgeneraltodo.cpp:203
-msgid "&Priority:"
-msgstr "ความสำคัญ:"
-
-#: koeditorgeneraltodo.cpp:207
+#: koeditorgeneraltodo.cpp:241
 msgid "unspecified"
 msgstr "ยังไม่กำหนด"
 
-#: koeditorgeneraltodo.cpp:208 kotodoview.cpp:417
+#: koeditorgeneraltodo.cpp:242 kotodoview.cpp:418
 msgid "1 (highest)"
 msgstr "1 (สูงสุด)"
 
-#: koeditorgeneraltodo.cpp:209 kotodoview.cpp:418
+#: koeditorgeneraltodo.cpp:243 kotodoview.cpp:419
 msgid "2"
 msgstr "2"
 
-#: koeditorgeneraltodo.cpp:210 kotodoview.cpp:419
+#: koeditorgeneraltodo.cpp:244 kotodoview.cpp:420
 msgid "3"
 msgstr "3"
 
-#: koeditorgeneraltodo.cpp:211 kotodoview.cpp:420
+#: koeditorgeneraltodo.cpp:245 kotodoview.cpp:421
 msgid "4"
 msgstr "4"
 
-#: koeditorgeneraltodo.cpp:212 kotodoview.cpp:421
+#: koeditorgeneraltodo.cpp:246 kotodoview.cpp:422
 msgid "5 (medium)"
 msgstr "5 (ปานกลาง)"
 
-#: koeditorgeneraltodo.cpp:213 kotodoview.cpp:422
+#: koeditorgeneraltodo.cpp:247 kotodoview.cpp:423
 msgid "6"
 msgstr "6"
 
-#: koeditorgeneraltodo.cpp:214 kotodoview.cpp:423
+#: koeditorgeneraltodo.cpp:248 kotodoview.cpp:424
 msgid "7"
 msgstr "7"
 
-#: koeditorgeneraltodo.cpp:215 kotodoview.cpp:424
+#: koeditorgeneraltodo.cpp:249 kotodoview.cpp:425
 msgid "8"
 msgstr "8"
 
-#: koeditorgeneraltodo.cpp:216 kotodoview.cpp:425
+#: koeditorgeneraltodo.cpp:250 kotodoview.cpp:426
 msgid "9 (lowest)"
 msgstr "9 (ต่ำสุด)"
 
-#: koeditorgeneraltodo.cpp:451
+#: koeditorgeneraltodo.cpp:492
 msgid "Please specify a valid due date."
 msgstr ""
 
-#: koeditorgeneraltodo.cpp:456
+#: koeditorgeneraltodo.cpp:497
 msgid "Please specify a valid due time."
 msgstr ""
 
-#: koeditorgeneraltodo.cpp:464
+#: koeditorgeneraltodo.cpp:505
 msgid "Please specify a valid start date."
 msgstr ""
 
-#: koeditorgeneraltodo.cpp:469
+#: koeditorgeneraltodo.cpp:510
 msgid "Please specify a valid start time."
 msgstr ""
 
-#: koeditorgeneraltodo.cpp:486
+#: koeditorgeneraltodo.cpp:527
 msgid "The start date cannot be after the due date."
 msgstr ""
 
-#: koeditorgeneraltodo.cpp:508
+#: koeditorgeneraltodo.cpp:572
 #, c-format
 msgid "Start: %1"
 msgstr "เริ่ม: %1"
 
-#: koeditorgeneraltodo.cpp:516
+#: koeditorgeneraltodo.cpp:580
 #, c-format
 msgid "   Due: %1"
 msgstr ""
 
-#: koeditorgeneraltodo.cpp:537
-msgid "co&mpleted on"
+#: exportwebdialog.cpp:73
+msgid "Export Calendar as Web Page"
 msgstr ""
 
-#: kogroupware.cpp:168
-#, c-format
-msgid "Error message: %1"
+#: exportwebdialog.cpp:131
+msgid ""
+"You are about to set all preferences to default values. All custom "
+"modifications will be lost."
 msgstr ""
 
-#: kogroupware.cpp:172
-msgid "Error while processing an invitation or update."
+#: exportwebdialog.cpp:132
+msgid "Setting Default Preferences"
 msgstr ""
 
-#: kogroupware.cpp:271
-msgid "event"
-msgstr "เหตุการณ์"
+#: exportwebdialog.cpp:133
+msgid "Reset to Defaults"
+msgstr ""
 
-#: kogroupware.cpp:272
-msgid "task"
+#: exportwebdialog.cpp:140 koeventeditor.cpp:122 kojournaleditor.cpp:76
+#: kotodoeditor.cpp:100
+msgid "General"
+msgstr ""
+
+#: exportwebdialog.cpp:148
+msgid "View Type"
 msgstr ""
 
-#: kogroupware.cpp:273
-msgid "journal entry"
+#: exportwebdialog.cpp:161
+msgid "Destination"
+msgstr ""
+
+#: exportwebdialog.cpp:178
+msgid "To-dos"
 msgstr ""
 
-#: kogroupware.cpp:275
+#: exportwebdialog.cpp:199
+msgid "Events"
+msgstr ""
+
+#: datenavigatorcontainer.cpp:52
 msgid ""
-"This %1 includes other people. Should email be sent out to the attendees?"
+"<qt>"
+"<p>Select the dates you want to display in KOrganizer's main view here. Hold "
+"down the mouse button to select more than one day.</p>"
+"<p>Press the top buttons to browse to the next / previous months or years.</p>"
+"<p>Each line shows a week. The number in the left column is the number of the "
+"week in the year. Press it to select the whole week.</p></qt>"
 msgstr ""
 
-#: kogroupware.cpp:279
-msgid "Group Scheduling Email"
+#: journalentry.cpp:92
+msgid "[Add Journal Entry]"
 msgstr ""
 
-#: kogroupware.cpp:279
-msgid "Send Email"
-msgstr "ส่งจดหมาย"
+#: journalentry.cpp:191
+msgid "Sets the Title of this journal entry."
+msgstr ""
 
-#: kogroupware.cpp:289
-msgid "Do you want to send a status update to the organizer of this task?"
+#: journalentry.cpp:193
+msgid "&Title: "
 msgstr ""
 
-#: kogroupware.cpp:291 kogroupware.cpp:299
-msgid "Send Update"
+#: journalentry.cpp:202
+msgid "Ti&me: "
+msgstr ""
+
+#: journalentry.cpp:208
+msgid "Determines whether this journal entry has a time associated with it"
+msgstr ""
+
+#: journalentry.cpp:210
+msgid "Sets the time associated with this journal entry"
+msgstr ""
+
+#: journalentry.cpp:217 journalentry.cpp:218
+msgid "Delete this journal entry"
 msgstr ""
 
-#: kogroupware.cpp:295
+#: journalentry.cpp:225
+msgid "Edit this journal entry"
+msgstr ""
+
+#: journalentry.cpp:226
+msgid "Opens an editor dialog for this journal entry"
+msgstr ""
+
+#: journalentry.cpp:234
+msgid "Print this journal entry"
+msgstr ""
+
+#: journalentry.cpp:235
+msgid "Opens the print dialog for this journal entry"
+msgstr ""
+
+#: koeditoralarms.cpp:113
+msgid "Reminder Dialog"
+msgstr ""
+
+#. i18n: file koeditoralarms_base.ui line 277
+#: koeditoralarms.cpp:116 rc.cpp:220 rc.cpp:2117
+#, no-c-format
+msgid "Program"
+msgstr ""
+
+#: koeditoralarms.cpp:122
+msgid "Audio"
+msgstr ""
+
+#: koeditoralarms.cpp:137 printing/calprintdefaultplugins.cpp:329
 msgid ""
-"Your status as an attendee of this event changed. Do you want to send a status "
-"update to the organizer of this event?"
+"_: N days/hours/minutes before/after the start/end\n"
+"%1 before the start"
 msgstr ""
 
-#: kogroupware.cpp:302
+#: koeditoralarms.cpp:141 printing/calprintdefaultplugins.cpp:332
 msgid ""
-"You are not the organizer of this event. Deleting it will bring your calendar "
-"out of sync with the organizers calendar. Do you really want to delete it?"
+"_: N days/hours/minutes before/after the start/end\n"
+"%1 after the start"
 msgstr ""
 
-#: kogroupware.cpp:307
+#: koeditoralarms.cpp:148
 msgid ""
-"You are not the organizer of this event. Editing it will bring your calendar "
-"out of sync with the organizers calendar. Do you really want to edit it?"
+"_: N days/hours/minutes before/after the due date\n"
+"%1 before the to-do is due"
 msgstr ""
 
-#: kogroupware.cpp:323
-msgid "<No summary given>"
+#: koeditoralarms.cpp:151 printing/calprintdefaultplugins.cpp:337
+msgid ""
+"_: N days/hours/minutes before/after the start/end\n"
+"%1 before the end"
 msgstr ""
 
-#: kogroupware.cpp:342 mailscheduler.cpp:89
+#: koeditoralarms.cpp:157
+msgid ""
+"_: N days/hours/minutes before/after the due date\n"
+"%1 after the to-do is due"
+msgstr ""
+
+#: koeditoralarms.cpp:160 printing/calprintdefaultplugins.cpp:340
+msgid ""
+"_: N days/hours/minutes before/after the start/end\n"
+"%1 after the end"
+msgstr ""
+
+#: koeditoralarms.cpp:170 printing/calprintdefaultplugins.cpp:349
 #, c-format
-msgid "Counter proposal: %1"
+msgid ""
+"_n: 1 day\n"
+"%n days"
 msgstr ""
 
-#: kogroupware.cpp:344
-msgid "Proposed new meeting time: %1 - %2"
+#: koeditoralarms.cpp:193
+#, fuzzy
+msgid "Advanced Reminders"
+msgstr "ตัวแจ้งเตือน:"
+
+#: koeditoralarms.cpp:204
+msgid ""
+"_: Add a new alarm to the alarm list.\n"
+"&Add"
 msgstr ""
 
-#: publishdialog.cpp:43
-msgid "Select Addresses"
-msgstr "เลือกที่อยู่"
+#: koeditoralarms.cpp:460
+#, fuzzy
+msgid "before the to-do starts"
+msgstr "ก่อนเริ่ม"
 
-#: publishdialog.cpp:101
-msgid "(EmptyName)"
+#: koeditoralarms.cpp:461
+#, fuzzy
+msgid "after the to-do starts"
+msgstr "หลังจากเริ่ม"
+
+#: koeditoralarms.cpp:462
+#, fuzzy
+msgid "before the to-do is due"
+msgstr "ก่อนสิ้นสุด"
+
+#: koeditoralarms.cpp:463
+#, fuzzy
+msgid "after the to-do is due"
+msgstr "หลังจากสิ้นสุด"
+
+#: koeditoralarms.cpp:466
+msgid "Select the reminder trigger relative to the start or due time"
+msgstr ""
+
+#: koeditoralarms.cpp:469
+msgid ""
+"Use this combobox to specify if you want the reminder to trigger before or "
+"after the start or due time."
 msgstr ""
 
-#: kocorehelper.cpp:43 kodaymatrix.cpp:283 komonthview.cpp:913
+#: kocorehelper.cpp:47 kodaymatrix.cpp:287 komonthview.cpp:1006
 msgid ""
 "_: delimiter for joining holiday names\n"
 ", "
 msgstr ""
 
-#: kolistview.cpp:205 korgac/alarmdialog.cpp:97 kotodoview.cpp:387
-#: plugins/timespanview/timespanwidget.cpp:51
-#: printing/calprintdefaultplugins.cpp:1003
-#: printing/calprintdefaultplugins.cpp:1085
-msgid "Summary"
-msgstr "สรุป"
+#: printing/calprintdefaultplugins.cpp:142
+#: printing/calprintdefaultplugins.cpp:171
+#: printing/calprintdefaultplugins.cpp:190
+#, fuzzy
+msgid "Start date: "
+msgstr "วันที่เริ่ม"
 
-#: kolistview.cpp:206 korgac/alarmdialog.cpp:81
-msgid "Reminder"
+#: printing/calprintdefaultplugins.cpp:146
+#: printing/calprintdefaultplugins.cpp:175
+#, fuzzy
+msgid "No start date"
+msgstr "วันที่เริ่ม"
+
+#: printing/calprintdefaultplugins.cpp:151
+#, fuzzy
+msgid "End date: "
+msgstr "วันที่สิ้นสุด"
+
+#: printing/calprintdefaultplugins.cpp:158
+#, c-format
+msgid ""
+"_n: 1 hour \n"
+"%n hours "
 msgstr ""
 
-#: kolistview.cpp:207 kotodoview.cpp:388
-msgid "Recurs"
+#: printing/calprintdefaultplugins.cpp:161
+#, c-format
+msgid ""
+"_n: 1 minute \n"
+"%n minutes "
 msgstr ""
 
-#: kolistview.cpp:208 printing/calprintdefaultplugins.cpp:1004
-msgid "Start Date"
-msgstr "วันที่เริ่ม"
+#: printing/calprintdefaultplugins.cpp:164
+#, fuzzy
+msgid "No end date"
+msgstr "วันที่สิ้นสุด"
 
-#: kolistview.cpp:210
-msgid "Start Time"
-msgstr "เวลาที่เริ่ม"
+#: printing/calprintdefaultplugins.cpp:180
+msgid "Due date: "
+msgstr ""
 
-#: kolistview.cpp:212
-msgid "End Date"
-msgstr "วันที่สิ้นสุด"
+#: printing/calprintdefaultplugins.cpp:184
+msgid "No due date"
+msgstr ""
 
-#: kolistview.cpp:214
-msgid "End Time"
-msgstr "เวลาสิ้นสุด"
+#: printing/calprintdefaultplugins.cpp:298
+msgid ""
+"_: except for listed dates\n"
+" except"
+msgstr ""
 
-#: eventarchiver.cpp:104
+#: printing/calprintdefaultplugins.cpp:306
+#, fuzzy
+msgid "Repeats: "
+msgstr "ทำซ้ำอีก:"
+
+#: printing/calprintdefaultplugins.cpp:313
+#, fuzzy
+msgid "No reminders"
+msgstr "ตัวแจ้งเตือน:"
+
+#: printing/calprintdefaultplugins.cpp:316
 #, c-format
-msgid "There are no items before %1"
+msgid ""
+"_n: Reminder: \n"
+"%n reminders: "
 msgstr ""
 
-#: eventarchiver.cpp:131
+#: printing/calprintdefaultplugins.cpp:359
+#: printing/calprintdefaultplugins.cpp:604
 msgid ""
-"Delete all items before %1 without saving?\n"
-"The following items will be deleted:"
+"_: Spacer for the joined list of categories\n"
+", "
 msgstr ""
 
-#: eventarchiver.cpp:134
-msgid "Delete Old Items"
-msgstr "ลบรายการเก่า"
+#: printing/calprintdefaultplugins.cpp:366
+msgid "Organizer: "
+msgstr ""
 
-#: eventarchiver.cpp:202
-#, c-format
-msgid "Cannot write archive file %1."
+#: printing/calprintdefaultplugins.cpp:376
+#, fuzzy
+msgid "Location: "
+msgstr "ตำแหน่ง:"
+
+#: printing/calprintdefaultplugins.cpp:435
+msgid "Description:"
 msgstr ""
 
-#: eventarchiver.cpp:211
-msgid "Cannot write archive to final destination."
+#: printing/calprintdefaultplugins.cpp:441
+msgid "Notes:"
 msgstr ""
 
-#: kotodoview.cpp:218
-msgid "Cannot move to-do to itself or a child of itself."
+#: printing/calprintdefaultplugins.cpp:454
+msgid "No Subitems"
 msgstr ""
 
-#: kotodoview.cpp:219
-msgid "Drop To-do"
+#: printing/calprintdefaultplugins.cpp:458
+msgid ""
+"_n: 1 Subitem:\n"
+"%1 Subitems:"
 msgstr ""
 
-#: kotodoview.cpp:231
-msgid "Unable to change to-do's parent, because the to-do cannot be locked."
+#: printing/calprintdefaultplugins.cpp:475
+msgid ""
+"_: no status\n"
+"none"
 msgstr ""
 
-#: kotodoview.cpp:279
+#: printing/calprintdefaultplugins.cpp:477
 msgid ""
-"Unable to add attendees to the to-do, because the to-do cannot be locked."
+"_: unknown status\n"
+"unknown"
 msgstr ""
 
-#: kotodoview.cpp:369
-msgid "To-dos:"
-msgstr "สิ่งที่จะทำ:"
+#: printing/calprintdefaultplugins.cpp:484
+#, fuzzy
+msgid ""
+"Start Date: %1\n"
+msgstr "วันที่เริ่ม"
 
-#: kotodoview.cpp:373
-msgid "Click to add a new to-do"
+#: printing/calprintdefaultplugins.cpp:489
+#, fuzzy
+msgid ""
+"Start Time: %1\n"
+msgstr "เวลาที่เริ่ม"
+
+#: printing/calprintdefaultplugins.cpp:496
+msgid ""
+"Due Date: %1\n"
 msgstr ""
 
-#: kotodoview.cpp:389 printing/calprintdefaultplugins.cpp:1006
-#: printing/calprintdefaultplugins.cpp:1077
-msgid "Priority"
-msgstr "ความสำคัญ"
+#: printing/calprintdefaultplugins.cpp:501
+msgid ""
+"_: subitem due time\n"
+"Due Time: %1\n"
+msgstr ""
 
-#: kotodoview.cpp:391 printing/calprintdefaultplugins.cpp:1092
-msgid "Complete"
+#: printing/calprintdefaultplugins.cpp:506
+msgid ""
+"_n: subitem counter\n"
+"%1: "
 msgstr ""
 
-#: kotodoview.cpp:393
-msgid "Due Date/Time"
+#: printing/calprintdefaultplugins.cpp:514
+msgid ""
+"_: subitem Status: statusString\n"
+"Status: %1\n"
 msgstr ""
 
-#: kotodoview.cpp:397
-msgid "Sort Id"
+#: printing/calprintdefaultplugins.cpp:517
+msgid ""
+"_: subitem Priority: N\n"
+"Priority: %1\n"
 msgstr ""
 
-#: kotodoview.cpp:416
+#: printing/calprintdefaultplugins.cpp:519
 msgid ""
-"_: Unspecified priority\n"
-"unspecified"
+"_: subitem Secrecy: secrecyString\n"
+"Secrecy: %1\n"
 msgstr ""
 
-#: actionmanager.cpp:452 kotodoview.cpp:463
-msgid "New &To-do..."
-msgstr "สร้างรายการสิ่งที่จะทำใหม่..."
+#: printing/calprintdefaultplugins.cpp:522
+msgid "Subitems:"
+msgstr ""
 
-#: actionmanager.cpp:456 kotodoview.cpp:465
-msgid "New Su&b-to-do..."
+#: printing/calprintdefaultplugins.cpp:532
+msgid "No Attachments"
 msgstr ""
 
-#: kotodoview.cpp:467
-msgid "&Make this To-do Independent"
+#: printing/calprintdefaultplugins.cpp:535
+msgid ""
+"_n: 1 Attachment:\n"
+"%1 Attachments:"
 msgstr ""
 
-#: kotodoview.cpp:469
-msgid "Make all Sub-to-dos &Independent"
+#: printing/calprintdefaultplugins.cpp:541
+msgid ""
+"_: Spacer for list of attachments\n"
+"  "
 msgstr ""
 
-#: kotodoview.cpp:472
-msgid "&Copy To"
-msgstr "ทำสำเนาไปยัง"
+#: printing/calprintdefaultplugins.cpp:555
+msgid "No Attendees"
+msgstr ""
 
-#: kotodoview.cpp:473
-msgid "&Move To"
-msgstr "ย้ายไปยัง"
+#: printing/calprintdefaultplugins.cpp:557
+#, c-format
+msgid ""
+"_n: 1 Attendee:\n"
+"%n Attendees:"
+msgstr ""
 
-#: kotodoview.cpp:475
+#: printing/calprintdefaultplugins.cpp:564
 msgid ""
-"_: delete completed to-dos\n"
-"Pur&ge Completed"
+"_: Formatting of an attendee: 'Name (Role): Status', e.g. 'Reinhold Kainhofer "
+"<reinhold@kainhofer.com> (Participant): Awaiting Response'\n"
+"%1 (%2): %3"
 msgstr ""
 
-#: kotodoview.cpp:484
-msgid "&New To-do..."
+#: printing/calprintdefaultplugins.cpp:568
+msgid "Attendees:"
 msgstr ""
 
-#: kotodoview.cpp:486
-msgid ""
-"_: delete completed to-dos\n"
-"&Purge Completed"
+#: printing/calprintdefaultplugins.cpp:575
+#, fuzzy, c-format
+msgid "Status: %1"
+msgstr "เริ่ม: %1"
+
+#: printing/calprintdefaultplugins.cpp:579
+#, fuzzy, c-format
+msgid "Secrecy: %1"
+msgstr "เริ่ม: %1"
+
+#: printing/calprintdefaultplugins.cpp:585
+msgid "Show as: Busy"
 msgstr ""
 
-#: koagendaview.cpp:290 koagendaview.cpp:771 multiagendaview.cpp:58
-msgid "All Day"
-msgstr "ทุกวัน"
+#: printing/calprintdefaultplugins.cpp:587
+msgid "Show as: Free"
+msgstr ""
 
-#: koagendaview.cpp:588
-msgid ""
-"_: short_weekday date (e.g. Mon 13)\n"
-"%1 %2"
+#: printing/calprintdefaultplugins.cpp:593
+msgid "This task is overdue!"
 msgstr ""
 
-#: koagendaview.cpp:1402
-msgid "Unable to modify this to-do, because it cannot be locked."
+#: printing/calprintdefaultplugins.cpp:599
+msgid "Settings: "
 msgstr ""
 
-#: kowhatsnextview.cpp:100
-msgid "What's Next?"
+#: printing/calprintdefaultplugins.cpp:603
+#, fuzzy
+msgid "Categories: "
+msgstr "หมวดหมู่"
+
+#: printing/calprintdefaultplugins.cpp:754
+msgid "Today's Events"
 msgstr ""
 
-#: kowhatsnextview.cpp:107
+#: printing/calprintdefaultplugins.cpp:776 printing/calprintpluginbase.cpp:986
+#: printing/calprintpluginbase.cpp:1010
 msgid ""
-"_: Date from - to\n"
-"%1 - %2"
+"_: summary, location\n"
+"%1, %2"
 msgstr ""
 
-#: kowhatsnextview.cpp:123
-msgid "Events:"
-msgstr "เหตุการณ์:"
+#: printing/calprintdefaultplugins.cpp:935
+msgid ""
+"_: date from-to\n"
+"%1 - %2"
+msgstr ""
 
-#: kowhatsnextview.cpp:159
-msgid "To-do:"
+#: printing/calprintdefaultplugins.cpp:937
+msgid ""
+"_: date from-\n"
+"to\n"
+"%1 -\n"
+"%2"
 msgstr ""
 
-#: kowhatsnextview.cpp:198 kowhatsnextview.cpp:219
-msgid "Events and to-dos that need a reply:"
+#: printing/calprintdefaultplugins.cpp:958
+msgid ""
+"_: date from - to (week number)\n"
+"%1 - %2 (Week %3)"
 msgstr ""
 
-#: kowhatsnextview.cpp:282 plugins/printing/year/yearprint.cpp:174
+#: printing/calprintdefaultplugins.cpp:960
 msgid ""
-"_: date from - to\n"
-"%1 - %2"
+"_: date from -\n"
+"to (week number)\n"
+"%1 -\n"
+"%2 (Week %3)"
 msgstr ""
 
-#: kowhatsnextview.cpp:287
+#: komonthview.cpp:978 printing/calprintdefaultplugins.cpp:1123
 msgid ""
-"_: date, from - to\n"
-"%1, %2 - %3"
+"_: monthname year\n"
+"%1 %2"
 msgstr ""
 
-#: kowhatsnextview.cpp:315
-msgid "  (Due: %1)"
+#: printing/calprintdefaultplugins.cpp:1213
+msgid "Start Date"
+msgstr "วันที่เริ่ม"
+
+#: printing/calprintdefaultplugins.cpp:1214
+msgid "Due Date"
 msgstr ""
 
-#: kocounterdialog.cpp:36
-msgid "Counter-Event Viewer"
+#: kotodoview.cpp:388 printing/calprintdefaultplugins.cpp:1215
+#: printing/calprintdefaultplugins.cpp:1289
+msgid "Priority"
+msgstr "ความสำคัญ"
+
+#: printing/calprintdefaultplugins.cpp:1216
+msgid "Percent Complete"
 msgstr ""
 
-#: kocounterdialog.cpp:37 koeditorgeneralevent.cpp:213
-msgid "Decline"
-msgstr "ปฏิเสธ"
+#: printing/calprintdefaultplugins.cpp:1222
+msgid "Ascending"
+msgstr ""
 
-#: kocounterdialog.cpp:37 koeditorgeneralevent.cpp:209
-msgid "Accept"
-msgstr "ยอมรับ"
+#: printing/calprintdefaultplugins.cpp:1223
+msgid "Descending"
+msgstr ""
 
-#: koprefs.cpp:87
-msgid ""
-"_: Default export file\n"
-"calendar.html"
+#: printing/calprintdefaultplugins.cpp:1232
+msgid "To-do list"
 msgstr ""
 
-#: koprefs.cpp:163
-msgid "Appointment"
-msgstr "กำหนดนัดหมาย"
+#: kotodoview.cpp:390 printing/calprintdefaultplugins.cpp:1303
+msgid "Complete"
+msgstr ""
 
-#: koprefs.cpp:163
-msgid "Business"
-msgstr "ธุรกิจ"
+#: printing/calprintdefaultplugins.cpp:1311
+msgid "Due"
+msgstr ""
 
-#: koprefs.cpp:164
-msgid "Meeting"
-msgstr "ประชุม"
+#: printing/calprinter.cpp:133
+msgid "Unable to print, no valid print style was returned."
+msgstr ""
 
-#: koprefs.cpp:164
-msgid "Phone Call"
+#: printing/calprinter.cpp:134
+msgid "Printing error"
 msgstr ""
 
-#: koprefs.cpp:164
-msgid "Education"
-msgstr "การศึกษา"
+#: printing/calprinter.cpp:155
+msgid "Print Calendar"
+msgstr ""
 
-#: koprefs.cpp:165 printing/calprintpluginbase.cpp:279
-msgid "Holiday"
-msgstr "วันหยุด"
+#: printing/calprinter.cpp:179
+msgid "Print Style"
+msgstr ""
 
-#: koprefs.cpp:165
-msgid "Vacation"
-msgstr "วันพักร้อน"
+#: printing/calprinter.cpp:193
+msgid "Page &orientation:"
+msgstr ""
 
-#: koprefs.cpp:165
-msgid "Special Occasion"
-msgstr "โอกาสพิเศษ"
+#: printing/calprinter.cpp:198
+msgid "Use Default Orientation of Selected Style"
+msgstr ""
 
-#: koprefs.cpp:166
-msgid "Personal"
+#: printing/calprinter.cpp:199
+msgid "Use Printer Default"
 msgstr ""
 
-#: koprefs.cpp:166
-msgid "Travel"
-msgstr "ท่องเที่ยว"
+#: printing/calprinter.cpp:237 printing/calprinter.cpp:239
+msgid "&Preview"
+msgstr ""
 
-#: koprefs.cpp:167
-msgid "Birthday"
-msgstr "วันเกิด"
+#: printing/cellitem.cpp:36
+msgid "<undefined>"
+msgstr ""
 
-#: calendarview.cpp:262
+#: printing/calprintpluginbase.cpp:142
+msgid "This printing style does not have any configuration options."
+msgstr ""
+
+#: printing/calprintpluginbase.cpp:563
+#, c-format
 msgid ""
-"<p><em>No Item Selected</em></p>"
-"<p>Select an event, to-do or journal entry to view its details here.</p>"
+"_: print date: formatted-datetime\n"
+"printed: %1"
 msgstr ""
 
-#: calendarview.cpp:268
+#: printing/calprintpluginbase.cpp:908
 msgid ""
-"View the details of events, journal entries or to-dos selected in KOrganizer's "
-"main view here."
+"_: starttime - endtime summary\n"
+"%1-%2 %3"
 msgstr ""
 
-#: calendarview.cpp:421
-msgid "Could not load calendar '%1'."
+#: printing/calprintpluginbase.cpp:914
+msgid ""
+"_: starttime - endtime summary, location\n"
+"%1-%2 %3, %4"
 msgstr ""
 
-#: calendarview.cpp:644
+#: printing/calprintpluginbase.cpp:935
 msgid ""
-"The timezone setting was changed. Do you want to keep the absolute time of the "
-"items in your calendar, which will show them to be at a different time than "
-"before, or move them to be at the old time also in the new timezone?"
+"_: weekday month date\n"
+"%1 %2 %3"
 msgstr ""
 
-#: calendarview.cpp:648
-msgid "Keep Absolute Times?"
+#: printing/calprintpluginbase.cpp:1018 printing/calprintpluginbase.cpp:1022
+msgid "%1 (Due: %2)"
 msgstr ""
 
-#: calendarview.cpp:649
-msgid "Keep Times"
+#: printing/calprintpluginbase.cpp:1029
+#, c-format
+msgid "To-do: %1"
 msgstr ""
 
-#: calendarview.cpp:650
-msgid "Move Times"
+#: printing/calprintpluginbase.cpp:1575
+msgid "%1%"
 msgstr ""
 
-#: calendarview.cpp:718
-msgid "To-do completed: %1 (%2)"
+#: printing/calprintpluginbase.cpp:1679
+msgid ""
+"_: Description - date\n"
+"%1 - %2"
 msgstr ""
 
-#: calendarview.cpp:729
+#: printing/calprintpluginbase.cpp:1700
 #, c-format
-msgid "Journal of %1"
+msgid "Person: %1"
+msgstr ""
+
+#: printing/calprintpluginbase.cpp:1701
+#, c-format
+msgid "%1"
 msgstr ""
 
-#: calendarview.cpp:782
+#: printing/calprintpluginbase.cpp:1719
 msgid ""
-"The item \"%1\" is filtered by your current filter rules, so it will be hidden "
-"and not appear in the view."
+"_: Date range: Month dayStart - dayEnd\n"
+"%1 %2 - %3"
 msgstr ""
 
-#: calendarview.cpp:785
-msgid "Filter Applied"
+#: printing/calprintpluginbase.cpp:1724
+msgid ""
+"_: Date range: monthStart dayStart - monthEnd dayEnd\n"
+"%1 %2 - %3 %4"
 msgstr ""
 
-#: calendarview.cpp:840
-msgid "The item \"%1\" will be permanently deleted."
+#: printing/calprintdefaultplugins.h:47
+msgid "Print &incidence"
 msgstr ""
 
-#: calendarview.cpp:841 calendarview.cpp:1979 calendarview.cpp:2041
-#: calendarview.cpp:2049 koeditorattachments.cpp:379 koeventeditor.cpp:382
-#: kojournaleditor.cpp:201 kotodoeditor.cpp:328
-msgid "KOrganizer Confirmation"
+#: printing/calprintdefaultplugins.h:51
+msgid "Prints an incidence on one page"
 msgstr ""
 
-#: calendarview.cpp:1164
-msgid ""
-"Unable to turn sub-to-do into a top-level to-do, because it cannot be locked."
+#: printing/calprintdefaultplugins.h:99
+msgid "Print da&y"
 msgstr ""
 
-#: calendarview.cpp:1187
-msgid "Make sub-to-dos independent"
+#: printing/calprintdefaultplugins.h:103
+msgid "Prints all events of a single day on one page"
 msgstr ""
 
-#: calendarview.cpp:1254
-msgid "Dissociate occurrence"
+#: printing/calprintdefaultplugins.h:136
+msgid "Print &week"
 msgstr ""
 
-#: calendarview.cpp:1264
-msgid "Dissociating the occurrence failed."
+#: printing/calprintdefaultplugins.h:140
+msgid "Prints all events of one week on one page"
 msgstr ""
 
-#: calendarview.cpp:1265 calendarview.cpp:1292
-msgid "Dissociating Failed"
+#: printing/calprintdefaultplugins.h:178
+msgid "Print mont&h"
 msgstr ""
 
-#: calendarview.cpp:1282
-msgid "Dissociate future occurrences"
+#: printing/calprintdefaultplugins.h:182
+msgid "Prints all events of one month on one page"
 msgstr ""
 
-#: calendarview.cpp:1291
-msgid "Dissociating the future occurrences failed."
+#: printing/calprintdefaultplugins.h:221
+msgid "Print to-&dos"
 msgstr ""
 
-#: calendarview.cpp:1309 calendarview.cpp:1380 calendarview.cpp:1441
-msgid "No item selected."
+#: printing/calprintdefaultplugins.h:225
+msgid "Prints all to-dos in a (tree-like) list"
 msgstr ""
 
-#: calendarview.cpp:1330 calendarview.cpp:1393
-msgid "The item information was successfully sent."
+#: komonthview.cpp:427
+msgid ""
+"_: 'Month day' for month view cells\n"
+"%1 %2"
 msgstr ""
 
-#: calendarview.cpp:1331
-msgid "Publishing"
+#: filtereditdialog.cpp:51
+msgid "Edit Calendar Filters"
 msgstr ""
 
-#: calendarview.cpp:1333
-msgid "Unable to publish the item '%1'"
+#: filtereditdialog.cpp:99
+msgid "Press this button to define a new filter."
 msgstr ""
 
-#: calendarview.cpp:1394
-msgid "Forwarding"
+#: filtereditdialog.cpp:100
+msgid "Press this button to remove the currently active filter."
 msgstr ""
 
-#: calendarview.cpp:1396
-msgid "Unable to forward the item '%1'"
+#: filtereditdialog.cpp:189
+#, c-format
+msgid "New Filter %1"
 msgstr ""
 
-#: calendarview.cpp:1419
-msgid "The free/busy information was successfully sent."
+#: filtereditdialog.cpp:201 koeventeditor.cpp:392 kotodoeditor.cpp:328
+msgid "This item will be permanently deleted."
 msgstr ""
 
-#: calendarview.cpp:1420 calendarview.cpp:1463
-msgid "Sending Free/Busy"
+#: filtereditdialog.cpp:201
+msgid "Delete Confirmation"
 msgstr ""
 
-#: calendarview.cpp:1422
-msgid "Unable to publish the free/busy data."
+#: timezone.cpp:39
+msgid "KOrganizer Timezone Test"
 msgstr ""
 
-#: calendarview.cpp:1447
-msgid "The item has no attendees."
+#: tips.cpp:3
+msgid ""
+"<p>...that you can synchronize your calendar data with the data on a Palm Pilot "
+"by using <a href=\"http://www.slac.com/pilone/kpilot_home\">KPilot</a>?\n"
+"</p>\n"
 msgstr ""
 
-#: calendarview.cpp:1459
+#: tips.cpp:9
 msgid ""
-"The groupware message for item '%1'was successfully sent.\n"
-"Method: %2"
+"<p>...that it is possible to show the current time in the calendar? Enable the "
+"current time line in the dialog which appears after selecting <b>Settings</b>"
+", <b>Configure KOrganizer...</b> from the menu bar.\n"
+"</p>\n"
 msgstr ""
 
-#: calendarview.cpp:1468
+#: tips.cpp:15
 msgid ""
-"_: Groupware message sending failed. %2 is "
-"request/reply/add/cancel/counter/etc.\n"
-"Unable to send the item '%1'.\n"
-"Method: %2"
+"<p>...that KOrganizer supports Microsoft Exchange? Add the <b>"
+"Microsoft&reg; Exchange 2000 resource</b> using the <b>Resource View</b> "
+"from the KOrganizer sidebar.\n"
+"</p>\n"
 msgstr ""
 
-#: calendarview.cpp:1541
-msgid "*.ics|ICalendars"
+#: tips.cpp:21
+msgid ""
+"<p>...that you can select whether the week starts on Monday or on Sunday in the "
+"Trinity Control Center? KOrganizer uses this setting. Look at Regional & "
+"Accessibility->Country/Region & Languages in the Trinity Control Center, or "
+"select <b>Settings</b>,\n"
+"<b>Configure Date & Time...</b> from the menu bar. Select the Time & Dates "
+"tab.\n"
+"</p>\n"
 msgstr ""
 
-#: calendarview.cpp:1554
-msgid "The journal entries can not be exported to a vCalendar file."
+#: tips.cpp:28
+msgid ""
+"<p>...that you can edit to-dos quickly by right clicking on the property you "
+"wish to change; like the priority, the category or the date?\n"
+"</p>\n"
 msgstr ""
 
-#: calendarview.cpp:1555
-msgid "Data Loss Warning"
+#: tips.cpp:34
+msgid ""
+"<p>...that you can view and edit a calendar from the shell with "
+"konsolekalendar? Run <b>konsolekalendar --help</b> for the available options.\n"
+"</p>\n"
 msgstr ""
 
-#: actionmanager.cpp:992 calendarview.cpp:1555
-msgid "Proceed"
+#: tips.cpp:40
+msgid ""
+"<p>...that your calender can display birthdays from your address book? It is "
+"even possible to set up reminders for them. To activate this, add the "
+"corresponding 'birthdays' resource to your calender.\n"
+"</p>\n"
 msgstr ""
 
-#: calendarview.cpp:1560
-msgid "*.vcs|vCalendars"
+#: tips.cpp:46
+msgid ""
+"<p>...that you can store your calendar on an FTP server? Use the standard file "
+"dialog to save the calendar to a URL like "
+"<b>ftp://username@ftpserver/filename</b>. You can make your calendar active and "
+"load and save it as if it were local, or add it permanently to your resources "
+"list, using the remote file resource. Just make sure that no two KOrganizer "
+"applications are working on the same file, at the same time.\n"
+"</p>\n"
 msgstr ""
 
-#: calendarview.cpp:1583
-msgid "&Previous Day"
+#: tips.cpp:52
+msgid ""
+"<p>...that you can create hierarchical to-dos by clicking with the right mouse "
+"button on an existing to-do and selecting <b>New Sub-to-do</b> "
+"from the context menu?\n"
+"</p>\n"
 msgstr ""
 
-#: calendarview.cpp:1584
-msgid "&Next Day"
+#: tips.cpp:58
+msgid ""
+"<p>...that a color can be assigned to each category? Events with a certain "
+"category will be shown in that color. You can assign these in the section <b>"
+"Colors</b> within the dialog which appears after selecting <b>Settings</b>, <b>"
+"Configure KOrganizer...</b> from the menu bar.\n"
+"</p>\n"
 msgstr ""
 
-#: calendarview.cpp:1586
-msgid "&Previous Week"
+#: tips.cpp:64
+msgid ""
+"<p>...that you can view and edit a calendar with Konqueror? Just click on the "
+"calendar file to make Konqueror open it.\n"
+"</p>\n"
 msgstr ""
 
-#: calendarview.cpp:1587
-msgid "&Next Week"
+#: tips.cpp:70
+msgid ""
+"<p>...that it is possible to add an attachment to an event or to-do? To do so, "
+"add a link to the <b>Attachments</b> tab within the <b>Edit Event</b> or <b>"
+"Edit To-do</b> dialog.\n"
+"</p>\n"
 msgstr ""
 
-#: calendarview.cpp:1683 calendarview.cpp:1716
-msgid "No filter"
+#: tips.cpp:76
+msgid ""
+"<p>...that you can export your calendar to HTML? Select <b>File</b>, <b>"
+"Export</b>, <b>Export Web Page...</b> from the menu bar to open the <b>"
+"Export calendar as web page</b> dialog.\n"
+"</p>\n"
 msgstr ""
 
-#: calendarview.cpp:1974
+#: tips.cpp:82
 msgid ""
-"The item \"%1\" has sub-to-dos. Do you want to delete just this item and make "
-"all its sub-to-dos independent, or delete the to-do with all its sub-to-dos?"
+"<p>...that you can purge completed to-dos in one step? Go to the <b>File</b> "
+"menu and choose <b>Purge Completed</b>.\n"
 msgstr ""
 
-#: calendarview.cpp:1980
-msgid "Delete Only This"
+#: tips.cpp:87
+msgid ""
+"<p>...that you can create a new sub-to-do by pasting a to-do while another one "
+"is selected?\n"
+"</p>\n"
 msgstr ""
 
-#: calendarview.cpp:1983
-msgid "Deleting sub-to-dos"
+#: freebusyurldialog.cpp:40
+msgid "Edit Free/Busy Location"
 msgstr ""
 
-#: calendarview.cpp:2007
+#: freebusyurldialog.cpp:68
+msgid "Location of Free/Busy information for %1 <%2>:"
+msgstr ""
+
+#: koattendeeeditor.cpp:73
 msgid ""
-"The item \"%1\" is marked read-only and cannot be deleted; it probably belongs "
-"to a read-only calendar resource."
+"Sets the identity corresponding to the organizer of this to-do or event. "
+"Identities can be set in the 'Personal' section of the KOrganizer "
+"configuration, or in the 'Security & Privacy'->'Password & User Account' "
+"section of the Trinity Control Center. In addition, identities are gathered "
+"from your KMail settings and from your address book. If you choose to set it "
+"globally for KDE in the Control Center, be sure to check 'Use email settings "
+"from Control Center' in the 'Personal' section of the KOrganizer configuration."
 msgstr ""
 
-#: calendarview.cpp:2011
-msgid "Removing not possible"
+#: koattendeeeditor.cpp:85 koattendeeeditor.cpp:292
+msgid "Identity as organizer:"
 msgstr ""
 
-#: calendarview.cpp:2038
+#: koattendeeeditor.cpp:99
 msgid ""
-"The calendar item \"%1\" recurs over multiple dates; are you sure you want to "
-"delete it and all its recurrences?"
+"Edits the name of the attendee selected in the list above, or adds a new "
+"attendee if there are no attendeesin the list."
+msgstr ""
+
+#: koattendeeeditor.cpp:104
+msgid "Na&me:"
+msgstr "ชื่อ:"
+
+#: koattendeeeditor.cpp:109
+msgid "Click to add a new attendee"
+msgstr ""
+
+#: koattendeeeditor.cpp:117
+msgid "Edits the role of the attendee selected in the list above."
 msgstr ""
 
-#: calendarview.cpp:2044
+#: koattendeeeditor.cpp:121
+msgid "Ro&le:"
+msgstr ""
+
+#: koattendeeeditor.cpp:135
 msgid ""
-"The calendar item \"%1\" recurs over multiple dates. Do you want to delete only "
-"the current one on %2, only all future recurrences, or all its recurrences?"
+"Edits the current attendance status of the attendee selected in the list above."
 msgstr ""
 
-#: calendarview.cpp:2049
-msgid "Delete C&urrent"
+#: koattendeeeditor.cpp:139
+msgid "Stat&us:"
+msgstr "สถานะ:"
+
+#: koattendeeeditor.cpp:162
+msgid ""
+"Edits whether to send an email to the attendee selected in the list above to "
+"request a response concerning attendance."
 msgstr ""
 
-#: calendarview.cpp:2050
-msgid "Delete &Future"
+#: koattendeeeditor.cpp:165
+msgid "Re&quest response"
 msgstr ""
 
-#: calendarview.cpp:2051
-msgid "Delete &All"
-msgstr "ลบทั้งหมด"
+#. i18n: file filteredit_base.ui line 29
+#: koattendeeeditor.cpp:172 rc.cpp:99 rc.cpp:432 rc.cpp:444 rc.cpp:1848
+#: rc.cpp:2174 rc.cpp:2183
+#, no-c-format
+msgid "&New"
+msgstr "สร้างใหม่"
 
-#: calendarview.cpp:2133
-msgid "Delete all completed to-dos?"
+#: koattendeeeditor.cpp:174
+msgid ""
+"Adds a new attendee to the list. Once the attendee is added, you will be able "
+"to edit the attendee's name, role, attendance status, and whether or not the "
+"attendee is required to respond to the invitation. To select an attendee from "
+"your addressbook, click the 'Select Addressee' button instead."
 msgstr ""
 
-#: calendarview.cpp:2133
-msgid "Purge To-dos"
+#: koattendeeeditor.cpp:186
+msgid "Removes the attendee selected in the list above."
 msgstr ""
 
-#: calendarview.cpp:2133
-msgid "Purge"
+#: koattendeeeditor.cpp:190
+msgid "Select Addressee..."
 msgstr ""
 
-#: calendarview.cpp:2137
-msgid "Purging completed to-dos"
+#: koattendeeeditor.cpp:193
+msgid "Opens your address book, allowing you to select new attendees from it."
 msgstr ""
 
-#: calendarview.cpp:2152
-msgid "Unable to purge to-dos with uncompleted children."
+#: koattendeeeditor.cpp:265
+msgid "Please edit the example attendee, before adding more."
 msgstr ""
 
-#: calendarview.cpp:2153
-msgid "Delete To-do"
+#: koattendeeeditor.cpp:272 koattendeeeditor.cpp:551
+msgid "Firstname Lastname"
+msgstr "ชื่อ นามสกุล"
+
+#: koattendeeeditor.cpp:273
+msgid "name"
+msgstr "ชื่อ"
+
+#: koattendeeeditor.cpp:312
+#, c-format
+msgid "Organizer: %1"
+msgstr ""
+
+#: koattendeeeditor.cpp:480
+#, fuzzy, c-format
+msgid "Delegated to %1"
+msgstr "ลบ %1"
+
+#: koattendeeeditor.cpp:482
+#, fuzzy, c-format
+msgid "Delegated from %1"
+msgstr "ลบ %1"
+
+#: koattendeeeditor.cpp:484
+#, fuzzy
+msgid "Not delegated"
+msgstr "วันที่เริ่ม"
+
+#: koeventeditor.cpp:124 koeventeditor.cpp:146
+msgid ""
+"The General tab allows you to set the most common options for the event."
+msgstr ""
+
+#: koeventeditor.cpp:135 kotodoeditor.cpp:112
+msgid "Details"
+msgstr ""
+
+#: koeventeditor.cpp:144 kojournaleditor.cpp:86 kotodoeditor.cpp:124
+msgid "&General"
+msgstr ""
+
+#. i18n: file ./printing/calprintincidenceconfig_base.ui line 59
+#: koeventeditor.cpp:182 rc.cpp:1650
+#, no-c-format
+msgid "&Attendees"
 msgstr ""
 
-#: calendarview.cpp:2168
-msgid "Unable to edit item: it is locked by another process."
+#: koeventeditor.cpp:184
+msgid ""
+"The Free/Busy tab allows you to see whether other attendees are free or busy "
+"during your event."
 msgstr ""
 
-#: calendarview.cpp:2201
+#: koeventeditor.cpp:208
+msgid "Edit Event"
+msgstr ""
+
+#: koeventeditor.cpp:216
+msgid "New Event"
+msgstr ""
+
+#: koeventeditor.cpp:277
+msgid ""
+"You didn't change the event, thus no counter proposal has been sent to the "
+"organizer."
+msgstr ""
+
+#: koeventeditor.cpp:277
+msgid "No changes"
+msgstr ""
+
+#: koeventeditor.cpp:288
 #, c-format
-msgid "Unable to copy the item to %1."
+msgid "My counter proposal for: %1"
 msgstr ""
 
-#: calendarview.cpp:2202
-msgid "Copying Failed"
+#: koeventeditor.cpp:401
+msgid "Template does not contain a valid event."
 msgstr ""
 
-#: calendarview.cpp:2243
+#: kogroupware.cpp:166
 #, c-format
-msgid "Unable to move the item to %1."
+msgid "Error message: %1"
 msgstr ""
 
-#: calendarview.cpp:2244
-msgid "Moving Failed"
+#: kogroupware.cpp:170
+msgid "Error while processing an invitation or update."
 msgstr ""
 
-#: komailclient.cpp:188
-msgid "No running instance of KMail found."
+#: kogroupware.cpp:285
+msgid ""
+"You changed the invitation \"%1\".\n"
+"Do you want to email the attendees an update message?"
 msgstr ""
 
-#: kdatenavigator.cpp:187
+#: kogroupware.cpp:292
 msgid ""
-"_: start/end week number of line in date picker\n"
-"%1/%2"
+"You removed the invitation \"%1\".\n"
+"Do you want to email the attendees that the event is canceled?"
 msgstr ""
 
-#: navigatorbar.cpp:71
-msgid "Previous year"
+#: kogroupware.cpp:296
+msgid ""
+"You removed the invitation \"%1\".\n"
+"Do you want to email the attendees that the todo is canceled?"
 msgstr ""
 
-#: navigatorbar.cpp:77
-msgid "Previous month"
+#: kogroupware.cpp:303
+msgid ""
+"The event \"%1\" includes other people.\n"
+"Do you want to email the invitation to the attendees?"
 msgstr ""
 
-#: navigatorbar.cpp:84
-msgid "Next month"
+#: kogroupware.cpp:307
+msgid ""
+"The todo \"%1\" includes other people.\n"
+"Do you want to email the invitation to the attendees?"
 msgstr ""
 
-#: navigatorbar.cpp:90
-msgid "Next year"
+#: kogroupware.cpp:311
+msgid ""
+"This incidence includes other people. Should an email be sent to the attendees?"
 msgstr ""
 
-#: navigatorbar.cpp:97
-msgid "Select a month"
+#: kogroupware.cpp:321 kogroupware.cpp:363
+msgid "Group Scheduling Email"
 msgstr ""
 
-#: komonthview.cpp:883 navigatorbar.cpp:161
-#: printing/calprintdefaultplugins.cpp:917
-msgid ""
-"_: monthname year\n"
-"%1 %2"
+#: kogroupware.cpp:322
+msgid "Send Email"
+msgstr "ส่งจดหมาย"
+
+#: incidencechanger.cpp:76 kogroupware.cpp:322 kogroupware.cpp:334
+#: kogroupware.cpp:341 kogroupware.cpp:364
+msgid "Do Not Send"
+msgstr ""
+
+#: kogroupware.cpp:332
+msgid "Do you want to send a status update to the organizer of this task?"
+msgstr ""
+
+#: kogroupware.cpp:334 kogroupware.cpp:341 kogroupware.cpp:364
+msgid "Send Update"
 msgstr ""
 
-#: datenavigatorcontainer.cpp:51
+#: kogroupware.cpp:338
 msgid ""
-"<qt>"
-"<p>Select the dates you want to display in KOrganizer's main view here. Hold "
-"down the mouse button to select more than one day.</p>"
-"<p>Press the top buttons to browse to the next / previous months or years.</p>"
-"<p>Each line shows a week. The number in the left column is the number of the "
-"week in the year. Press it to select the whole week.</p></qt>"
+"Your status as an attendee of this event changed. Do you want to send a status "
+"update to the event organizer?"
 msgstr ""
 
-#: journalentry.cpp:92
-msgid "[Add Journal Entry]"
+#: kogroupware.cpp:359
+msgid ""
+"You had previously accepted an invitation to this event. Do you want to send an "
+"updated response to the organizer declining the invitation?"
 msgstr ""
 
-#: journalentry.cpp:191
-msgid "Sets the Title of this journal entry."
+#: kogroupware.cpp:367
+msgid ""
+"You are not the organizer of this event. Editing it will bring your calendar "
+"out of sync with the organizer's calendar. Do you really want to edit it?"
 msgstr ""
 
-#: journalentry.cpp:193
-msgid "&Title: "
+#: kogroupware.cpp:384
+msgid "<No summary given>"
 msgstr ""
 
-#: journalentry.cpp:202
-msgid "Ti&me: "
+#: kogroupware.cpp:404 mailscheduler.cpp:89
+#, c-format
+msgid "Counter proposal: %1"
 msgstr ""
 
-#: journalentry.cpp:208
-msgid "Determines whether this journal entry has a time associated with it"
+#: kogroupware.cpp:406
+msgid "Proposed new meeting time: %1 - %2"
 msgstr ""
 
-#: journalentry.cpp:210
-msgid "Sets the time associated with this journal entry"
+#: statusdialog.cpp:41
+msgid "Set Your Status"
 msgstr ""
 
-#: journalentry.cpp:217 journalentry.cpp:218
-msgid "Delete this journal entry"
+#: statusdialog.cpp:49
+msgid "Set your status"
 msgstr ""
 
-#: journalentry.cpp:225
-msgid "Edit this journal entry"
+#: history.cpp:185
+#, c-format
+msgid "Delete %1"
+msgstr "ลบ %1"
+
+#: history.cpp:214
+#, c-format
+msgid "Add %1"
+msgstr "เพิ่ม %1"
+
+#: history.cpp:251
+#, c-format
+msgid "Edit %1"
+msgstr "แก้ไข %1"
+
+#: koeventpopupmenu.cpp:77
+msgid "&Toggle Reminder"
 msgstr ""
 
-#: journalentry.cpp:226
-msgid "Opens an editor dialog for this journal entry"
+#: koeventpopupmenu.cpp:82
+msgid "&Dissociate This Occurrence"
 msgstr ""
 
-#: journalentry.cpp:234
-msgid "Print this journal entry"
+#: koeventpopupmenu.cpp:85
+msgid "&Dissociate Future Occurrences"
 msgstr ""
 
-#: journalentry.cpp:235
-msgid "Opens the print dialog for this journal entry"
+#: koeventpopupmenu.cpp:89
+#, fuzzy
+msgid "Send as iCalendar..."
+msgstr "ปฏิทินใหม่"
+
+#: korgac/testalarmdlg.cpp:39
+msgid "TestKabc"
 msgstr ""
 
 #: korgac/alarmdockwindow.cpp:56 korgac/korgacmain.cpp:65
@@ -2127,7 +3735,7 @@ msgstr ""
 msgid "Suspend All"
 msgstr ""
 
-#: korgac/alarmdockwindow.cpp:68
+#: korgac/alarmdialog.cpp:104 korgac/alarmdockwindow.cpp:68
 msgid "Dismiss All"
 msgstr ""
 
@@ -2139,14 +3747,14 @@ msgstr ""
 msgid "Start Reminder Daemon at Login"
 msgstr ""
 
-#: korgac/alarmdockwindow.cpp:113
+#: korgac/alarmdockwindow.cpp:134
 #, c-format
 msgid ""
 "_n: There is 1 active reminder.\n"
 "There are %n active reminders."
 msgstr ""
 
-#: korgac/alarmdockwindow.cpp:180
+#: korgac/alarmdockwindow.cpp:201
 msgid ""
 "Do you want to start the KOrganizer reminder daemon at login (note that you "
 "will not get reminders whilst the daemon is not running)?"
@@ -2154,695 +3762,667 @@ msgstr ""
 "คุณต้องการเริ่มการทำงานบริการแจ้งเตือนของ KOrganizer เมื่อล็อกอินหรือไม่ "
 "(คุณจะไม่ได้รับการแจ้งเตือนหากบริการแจ้งเตือนไม่ได้ทำงานอยู่) ?"
 
-#: korgac/alarmdockwindow.cpp:182
+#: korgac/alarmdockwindow.cpp:203
 msgid "Close KOrganizer Reminder Daemon"
 msgstr "ปิดการทำงานบริการแจ้งเตือนของ KOrganizer"
 
-#: korgac/alarmdockwindow.cpp:183
+#: korgac/alarmdockwindow.cpp:204
 msgid "Start"
 msgstr "เริ่มการทำงาน"
 
-#: korgac/alarmdockwindow.cpp:183
+#: korgac/alarmdockwindow.cpp:204
 msgid "Do Not Start"
 msgstr "ไม่ต้องให้ทำงาน"
 
-#: korgac/testalarmdlg.cpp:37
-msgid "TestKabc"
-msgstr ""
-
-#: korgac/alarmdialog.cpp:82
-msgid "Dismiss all"
+#: kolistview.cpp:209 korgac/alarmdialog.cpp:102
+msgid "Reminder"
 msgstr ""
 
-#: koeditorgeneralevent.cpp:158 korgac/alarmdialog.cpp:82
+#: korgac/alarmdialog.cpp:104
 msgid "Edit..."
 msgstr "แก้ไข..."
 
-#: korgac/alarmdialog.cpp:82
-msgid "Suspend"
-msgstr ""
+#: korgac/alarmdialog.cpp:104
+#, fuzzy
+msgid "Dismiss Reminder"
+msgstr "ตัวแจ้งเตือน:"
 
-#: korgac/alarmdialog.cpp:86
-msgid "Dismiss"
+#: korgac/alarmdialog.cpp:116
+msgid "Suspend"
 msgstr ""
 
-#: korgac/alarmdialog.cpp:92
-msgid "The following events triggered reminders:"
+#: korgac/alarmdialog.cpp:122
+msgid "The following items triggered reminders:"
 msgstr ""
 
-#: korgac/alarmdialog.cpp:98 printing/calprintdefaultplugins.cpp:1100
-msgid "Due"
-msgstr ""
+#: korgac/alarmdialog.cpp:131
+#, fuzzy
+msgid "Date, Time"
+msgstr "วันที่และเวลา"
 
-#: korgac/alarmdialog.cpp:114
+#: korgac/alarmdialog.cpp:151
 msgid "Suspend &duration:"
 msgstr ""
 
-#: korgac/alarmdialog.cpp:123
+#: korgac/alarmdialog.cpp:160
 msgid "week(s)"
 msgstr "สัปดาห์"
 
-#: korgac/alarmdialog.cpp:251
-msgid "Could not start KOrganizer."
-msgstr "ไม่สามารถเริ่มการทำงานของ KOrganizer ได้"
-
-#: korganizer.cpp:290 kotimelineview.cpp:55 kotimelineview.cpp:123
-#: resourceview.cpp:227 resourceview.cpp:278
-msgid "Calendar"
-msgstr "ปฏิทิน"
-
-#: korganizer.cpp:298
-msgid "New Calendar"
-msgstr "ปฏิทินใหม่"
-
-#: korganizer.cpp:302
-msgid "read-only"
-msgstr "อ่านได้อย่างเดียว"
-
-#: freebusyurldialog.cpp:40
-msgid "Edit Free/Busy Location"
+#: koeditorgeneral.cpp:396 korgac/alarmdialog.cpp:190
+msgid ""
+"_: elipsis\n"
+"..."
 msgstr ""
 
-#: freebusyurldialog.cpp:68
-msgid "Location of Free/Busy information for %1 <%2>:"
+#: korgac/alarmdialog.cpp:330
+msgid "\"%1\" is a read-only item so modifications are not possible."
 msgstr ""
 
-#: koattendeeeditor.cpp:63
+#: korgac/alarmdialog.cpp:338
+#, fuzzy
+msgid "Could not start KOrganizer so editing is not possible."
+msgstr "ไม่สามารถเริ่มการทำงานของ KOrganizer ได้"
+
+#: korgac/alarmdialog.cpp:352
 msgid ""
-"Sets the identity corresponding to the organizer of this to-do or event. "
-"Identities can be set in the 'Personal' section of the KOrganizer "
-"configuration, or in the 'Security & Privacy'->'Password & User Account' "
-"section of the Trinity Control Center. In addition, identities are gathered from "
-"your KMail settings and from your address book. If you choose to set it "
-"globally for TDE in the Control Center, be sure to check 'Use email settings "
-"from Control Center' in the 'Personal' section of the KOrganizer configuration."
+"An internal KOrganizer error occurred attempting to start the incidence editor"
 msgstr ""
 
-#: koattendeeeditor.cpp:75 koattendeeeditor.cpp:283
-msgid "Identity as organizer:"
+#: koagendaview.cpp:629
+msgid ""
+"_: short_weekday date (e.g. Mon 13)\n"
+"%1 %2"
 msgstr ""
 
-#: koattendeeeditor.cpp:89
-msgid ""
-"Edits the name of the attendee selected in the list above, or adds a new "
-"attendee if there are no attendeesin the list."
+#: koagendaview.cpp:1569
+msgid "Unable to modify this to-do, because it cannot be locked."
 msgstr ""
 
-#: koattendeeeditor.cpp:94
-msgid "Na&me:"
-msgstr "ชื่อ:"
+#: koagendaview.cpp:1756 korganizer.cpp:290 kotimelineview.cpp:55
+#: kotimelineview.cpp:123 kotodoview.cpp:395 resourceview.cpp:270
+#: resourceview.cpp:321
+msgid "Calendar"
+msgstr "ปฏิทิน"
 
-#: koattendeeeditor.cpp:99
-msgid "Click to add a new attendee"
+#: koeditorrecurrence.cpp:91
+msgid ""
+"The number of the week from the beginning of the month on which this event or "
+"to-do should recur."
 msgstr ""
 
-#: koattendeeeditor.cpp:106
-msgid "Edits the role of the attendee selected in the list above."
+#: koeditorrecurrence.cpp:95 koeditorrecurrence.cpp:259
+msgid "1st"
 msgstr ""
 
-#: koattendeeeditor.cpp:110
-msgid "Ro&le:"
+#: koeditorrecurrence.cpp:96 koeditorrecurrence.cpp:260
+msgid "2nd"
 msgstr ""
 
-#: koattendeeeditor.cpp:124
-msgid ""
-"Edits the current attendance status of the attendee selected in the list above."
+#: koeditorrecurrence.cpp:97 koeditorrecurrence.cpp:261
+msgid "3rd"
 msgstr ""
 
-#: koattendeeeditor.cpp:128
-msgid "Stat&us:"
-msgstr "สถานะ:"
-
-#: koattendeeeditor.cpp:151
-msgid ""
-"Edits whether to send an email to the attendee selected in the list above to "
-"request a response concerning attendance."
+#: koeditorrecurrence.cpp:98 koeditorrecurrence.cpp:262
+msgid "4th"
 msgstr ""
 
-#: koattendeeeditor.cpp:154
-msgid "Re&quest response"
+#: koeditorrecurrence.cpp:99 koeditorrecurrence.cpp:263
+msgid "5th"
 msgstr ""
 
-#. i18n: file filteredit_base.ui line 29
-#: koattendeeeditor.cpp:161 rc.cpp:99 rc.cpp:429 rc.cpp:441 rc.cpp:1481
-#: rc.cpp:1871 rc.cpp:2075
-#, no-c-format
-msgid "&New"
-msgstr "สร้างใหม่"
-
-#: koattendeeeditor.cpp:163
-msgid ""
-"Adds a new attendee to the list. Once the attendee is added, you will be able "
-"to edit the attendee's name, role, attendance status, and whether or not the "
-"attendee is required to respond to the invitation. To select an attendee from "
-"your addressbook, click the 'Select Addressee' button instead."
+#: koeditorrecurrence.cpp:100 koeditorrecurrence.cpp:290
+msgid "Last"
 msgstr ""
 
-#: koattendeeeditor.cpp:175
-msgid "Removes the attendee selected in the list above."
+#: koeditorrecurrence.cpp:101 koeditorrecurrence.cpp:291
+msgid "2nd Last"
 msgstr ""
 
-#: koattendeeeditor.cpp:179
-msgid "Select Addressee..."
+#: koeditorrecurrence.cpp:102 koeditorrecurrence.cpp:292
+msgid "3rd Last"
 msgstr ""
 
-#: koattendeeeditor.cpp:182
-msgid "Opens your address book, allowing you to select new attendees from it."
+#: koeditorrecurrence.cpp:103 koeditorrecurrence.cpp:293
+msgid "4th Last"
 msgstr ""
 
-#: koattendeeeditor.cpp:263
-msgid "Firstname Lastname"
-msgstr "ชื่อ นามสกุล"
+#: koeditorrecurrence.cpp:104 koeditorrecurrence.cpp:294
+msgid "5th Last"
+msgstr ""
 
-#: koattendeeeditor.cpp:264
-msgid "name"
-msgstr "ชื่อ"
+#: koeditorrecurrence.cpp:112
+msgid "The weekday on which this event or to-do should recur."
+msgstr ""
 
-#: koattendeeeditor.cpp:303
-#, c-format
-msgid "Organizer: %1"
+#: koeditorrecurrence.cpp:126
+msgid "The month during which this event or to-do should recur."
 msgstr ""
 
-#: koattendeeeditor.cpp:399
-#, fuzzy, c-format
-msgid "Delegated to %1"
-msgstr "ลบ %1"
+#: koeditorrecurrence.cpp:143
+msgid "Sets how often this event or to-do should recur."
+msgstr ""
 
-#: koattendeeeditor.cpp:401
-#, fuzzy, c-format
-msgid "Delegated from %1"
-msgstr "ลบ %1"
+#: koeditorrecurrence.cpp:167 koeditorrecurrence.cpp:181
+#: koeditorrecurrence.cpp:232 koeditorrecurrence.cpp:405
+msgid "&Recur every"
+msgstr ""
 
-#: koattendeeeditor.cpp:403
-#, fuzzy
-msgid "Not delegated"
-msgstr "วันที่เริ่ม"
+#: koeditorrecurrence.cpp:181
+msgid "week(s) on:"
+msgstr ""
 
-#: kojournaleditor.cpp:47
-msgid "Edit Journal Entry"
+#: koeditorrecurrence.cpp:199
+msgid "Day of the week on which this event or to-do should recur."
 msgstr ""
 
-#: exportwebdialog.cpp:139 koeventeditor.cpp:122 kojournaleditor.cpp:74
-#: kotodoeditor.cpp:97
-msgid "General"
+#: koeditorrecurrence.cpp:232
+msgid "month(s)"
 msgstr ""
 
-#: koeventeditor.cpp:147 kojournaleditor.cpp:84 kotodoeditor.cpp:123
-msgid "&General"
+#: koeditorrecurrence.cpp:244
+msgid "&Recur on the"
 msgstr ""
 
-#: kojournaleditor.cpp:200
-msgid "This journal entry will be permanently deleted."
+#: koeditorrecurrence.cpp:249
+msgid ""
+"Sets a specific day of the month on which this event or to-do should recur."
 msgstr ""
 
-#: kojournaleditor.cpp:216
-msgid "Template does not contain a valid journal."
+#: koeditorrecurrence.cpp:254 koeditorrecurrence.cpp:430
+msgid "The day of the month on which this event or to-do should recur."
 msgstr ""
 
-#: actionmanager.cpp:253
-msgid "Import &Calendar..."
-msgstr "นำเข้าปฏิทิน..."
+#: koeditorrecurrence.cpp:264
+msgid "6th"
+msgstr ""
 
-#: actionmanager.cpp:255
-msgid "&Import From UNIX Ical tool"
+#: koeditorrecurrence.cpp:265
+msgid "7th"
 msgstr ""
 
-#: actionmanager.cpp:257
-msgid "Get &Hot New Stuff..."
+#: koeditorrecurrence.cpp:266
+msgid "8th"
 msgstr ""
 
-#: actionmanager.cpp:261
-msgid "Export &Web Page..."
+#: koeditorrecurrence.cpp:267
+msgid "9th"
 msgstr ""
 
-#: actionmanager.cpp:264
-msgid "&iCalendar..."
+#: koeditorrecurrence.cpp:268
+msgid "10th"
 msgstr ""
 
-#: actionmanager.cpp:267
-msgid "&vCalendar..."
+#: koeditorrecurrence.cpp:269
+msgid "11th"
 msgstr ""
 
-#: actionmanager.cpp:270
-msgid "Upload &Hot New Stuff..."
+#: koeditorrecurrence.cpp:270
+msgid "12th"
 msgstr ""
 
-#: actionmanager.cpp:276
-msgid "Archive O&ld Entries..."
+#: koeditorrecurrence.cpp:271
+msgid "13th"
 msgstr ""
 
-#: actionmanager.cpp:278
-msgid ""
-"_: delete completed to-dos\n"
-"Pur&ge Completed To-dos"
+#: koeditorrecurrence.cpp:272
+msgid "14th"
 msgstr ""
 
-#: actionmanager.cpp:336
-msgid "What's &Next"
+#: koeditorrecurrence.cpp:273
+msgid "15th"
 msgstr ""
 
-#: actionmanager.cpp:340
-msgid "&Day"
-msgstr "วัน"
+#: koeditorrecurrence.cpp:274
+msgid "16th"
+msgstr ""
 
-#: actionmanager.cpp:349
-#, c-format
-msgid ""
-"_n: &Next Day\n"
-"Ne&xt %n Days"
+#: koeditorrecurrence.cpp:275
+msgid "17th"
 msgstr ""
 
-#: actionmanager.cpp:351
-msgid "W&ork Week"
-msgstr "สัปดาห์ทำงาน"
+#: koeditorrecurrence.cpp:276
+msgid "18th"
+msgstr ""
 
-#: actionmanager.cpp:355
-msgid "&Week"
-msgstr "สัปดาห์"
+#: koeditorrecurrence.cpp:277
+msgid "19th"
+msgstr ""
 
-#: actionmanager.cpp:359
-msgid "&Month"
-msgstr "เดือน"
+#: koeditorrecurrence.cpp:278
+msgid "20th"
+msgstr ""
 
-#: actionmanager.cpp:363
-msgid "&List"
-msgstr "รายการ"
+#: koeditorrecurrence.cpp:279
+msgid "21st"
+msgstr ""
 
-#: actionmanager.cpp:367
-msgid "&To-do List"
-msgstr "รายการสิ่งที่จะทำ"
+#: koeditorrecurrence.cpp:280
+msgid "22nd"
+msgstr ""
 
-#: actionmanager.cpp:371
-msgid "&Journal"
+#: koeditorrecurrence.cpp:281
+msgid "23rd"
 msgstr ""
 
-#: actionmanager.cpp:375
-msgid "&Timeline View"
+#: koeditorrecurrence.cpp:282
+msgid "24th"
 msgstr ""
 
-#: actionmanager.cpp:381
-msgid "&Refresh"
+#: koeditorrecurrence.cpp:283
+msgid "25th"
 msgstr ""
 
-#: actionmanager.cpp:389
-msgid "F&ilter"
-msgstr "ตัวกรอง"
+#: koeditorrecurrence.cpp:284
+msgid "26th"
+msgstr ""
 
-#: actionmanager.cpp:404
-msgid "Zoom In Horizontally"
+#: koeditorrecurrence.cpp:285
+msgid "27th"
 msgstr ""
 
-#: actionmanager.cpp:407
-msgid "Zoom Out Horizontally"
+#: koeditorrecurrence.cpp:286
+msgid "28th"
 msgstr ""
 
-#: actionmanager.cpp:410
-msgid "Zoom In Vertically"
+#: koeditorrecurrence.cpp:287
+msgid "29th"
 msgstr ""
 
-#: actionmanager.cpp:413
-msgid "Zoom Out Vertically"
+#: koeditorrecurrence.cpp:288
+msgid "30th"
 msgstr ""
 
-#: actionmanager.cpp:422
-msgid "Go to &Today"
+#: koeditorrecurrence.cpp:289
+msgid "31st"
 msgstr ""
 
-#: actionmanager.cpp:426
-msgid "Go &Backward"
+#: koeditorrecurrence.cpp:325
+msgid "day"
 msgstr ""
 
-#: actionmanager.cpp:438
-msgid "Go &Forward"
+#: koeditorrecurrence.cpp:332
+msgid ""
+"Sets a weekday and specific week in the month on which this event or to-do "
+"should recur"
 msgstr ""
 
-#: actionmanager.cpp:448
-msgid "New E&vent..."
+#: koeditorrecurrence.cpp:405
+msgid "year(s)"
 msgstr ""
 
-#: actionmanager.cpp:462
-msgid "New &Journal..."
+#: koeditorrecurrence.cpp:419
+msgid ""
+"_: part before XXX of 'Recur on day XXX of month YYY'\n"
+"&Recur on day "
 msgstr ""
 
-#: actionmanager.cpp:477
-msgid "&Make Sub-to-do Independent"
+#: koeditorrecurrence.cpp:421
+msgid "&Day "
 msgstr ""
 
-#: actionmanager.cpp:496
-msgid "&Publish Item Information..."
+#: koeditorrecurrence.cpp:425
+msgid ""
+"Sets a specific day in a specific month on which this event or to-do should "
+"recur."
 msgstr ""
 
-#: actionmanager.cpp:501
-msgid "Send &Invitation to Attendees"
+#: koeditorrecurrence.cpp:434
+msgid ""
+"_: part between XXX and YYY of 'Recur on day XXX of month YYY'\n"
+" &of "
 msgstr ""
 
-#: actionmanager.cpp:508
-msgid "Re&quest Update"
+#: koeditorrecurrence.cpp:448
+msgid ""
+"_: Part before XXX in 'Recur on NNN. WEEKDAY of MONTH', short version\n"
+"&On"
 msgstr ""
 
-#: actionmanager.cpp:515
-msgid "Send &Cancelation to Attendees"
+#: koeditorrecurrence.cpp:450
+msgid ""
+"_: Part before XXX in 'Recur on NNN. WEEKDAY of MONTH'\n"
+"&On the"
 msgstr ""
 
-#: actionmanager.cpp:522
-msgid "Send Status &Update"
+#: koeditorrecurrence.cpp:454
+msgid ""
+"Sets a specific day in a specific week of a specific month on which this event "
+"or to-do should recur."
 msgstr ""
 
-#: actionmanager.cpp:529
+#: koeditorrecurrence.cpp:465
 msgid ""
-"_: counter proposal\n"
-"Request Chan&ge"
+"_: part between WEEKDAY and MONTH in 'Recur on NNN. WEEKDAY of MONTH'\n"
+" o&f "
 msgstr ""
 
-#: actionmanager.cpp:536
-#, fuzzy
-msgid "&Send as iCalendar..."
-msgstr "ปรับแต่งปฏิทิน..."
+#: koeditorrecurrence.cpp:480
+msgid "Day #"
+msgstr ""
 
-#: actionmanager.cpp:541
-msgid "&Mail Free Busy Information..."
+#: koeditorrecurrence.cpp:482
+msgid "Recur on &day #"
 msgstr ""
 
-#: actionmanager.cpp:546
-msgid "&Upload Free Busy Information"
+#: koeditorrecurrence.cpp:484
+msgid ""
+"Sets a specific day within the year on which this event or to-do should recur."
 msgstr ""
 
-#: actionmanager.cpp:552
-msgid "&Addressbook"
-msgstr "สมุดที่อยู่"
+#: koeditorrecurrence.cpp:495
+msgid ""
+"_: part after NNN of 'Recur on day #NNN of the year'\n"
+" of the &year"
+msgstr ""
 
-#: actionmanager.cpp:563
-msgid "Show Date Navigator"
+#: koeditorrecurrence.cpp:498
+msgid ""
+"_: part after NNN of 'Recur on day #NNN of the year', short version\n"
+" of the year"
 msgstr ""
 
-#: actionmanager.cpp:566
-msgid "Show To-do View"
+#: koeditorrecurrence.cpp:581
+msgid "E&xceptions"
 msgstr ""
 
-#: actionmanager.cpp:569
-msgid "Show Item Viewer"
+#: koeditorrecurrence.cpp:591
+msgid ""
+"A date that should be considered an exception to the recurrence rules for this "
+"event or to-do."
 msgstr ""
 
-#: actionmanager.cpp:588
-msgid "Show Resource View"
+#: koeditorrecurrence.cpp:597
+msgid ""
+"_: Add a new recurrence to the recurrence list\n"
+"&Add"
 msgstr ""
 
-#: actionmanager.cpp:591
-msgid "Show &Resource Buttons"
+#: koeditorrecurrence.cpp:599
+msgid ""
+"Add this date as an exception to the recurrence rules for this event or to-do."
 msgstr ""
 
-#: actionmanager.cpp:606
-msgid "Configure &Date && Time..."
+#: koeditorrecurrence.cpp:602
+msgid "&Change"
 msgstr ""
 
-#: actionmanager.cpp:613
-msgid "Manage View &Filters..."
+#: koeditorrecurrence.cpp:604
+msgid "Replace the currently selected date with this date."
 msgstr ""
 
-#: actionmanager.cpp:616
-msgid "Manage C&ategories..."
+#: koeditorrecurrence.cpp:608
+msgid ""
+"Delete the currently selected date from the list of dates that should be "
+"considered exceptions to the recurrence rules for this event or to-do."
 msgstr ""
 
-#: actionmanager.cpp:620
-msgid "&Configure Calendar..."
-msgstr "ปรับแต่งปฏิทิน..."
+#: koeditorrecurrence.cpp:615
+msgid ""
+"Displays current dates that are being considered exceptions to the recurrence "
+"rules for this event or to-do."
+msgstr ""
 
-#: actionmanager.cpp:645 actionmanager.cpp:647
-msgid "Filter: "
-msgstr "ตัวกรอง: "
+#: koeditorrecurrence.cpp:679
+msgid "Edit Exceptions"
+msgstr ""
 
-#: actionmanager.cpp:709 actionmanager.cpp:797 actionmanager.cpp:1182
-msgid "*.vcs *.ics|Calendar Files"
+#: koeditorrecurrence.cpp:703
+msgid "Recurrence Range"
 msgstr ""
 
-#: actionmanager.cpp:748
+#: koeditorrecurrence.cpp:706
 msgid ""
-"You have no ical file in your home directory.\n"
-"Import cannot proceed.\n"
+"Sets a range for which these recurrence rules will apply to this event or "
+"to-do."
 msgstr ""
 
-#: actionmanager.cpp:771
-msgid ""
-"KOrganizer successfully imported and merged your .calendar file from ical into "
-"the currently opened calendar."
+#: koeditorrecurrence.cpp:714
+msgid "Begin on:"
 msgstr ""
 
-#: actionmanager.cpp:777
-msgid ""
-"KOrganizer encountered some unknown fields while parsing your .calendar ical "
-"file, and had to discard them; please check to see that all your relevant data "
-"was correctly imported."
+#: koeditorrecurrence.cpp:716
+msgid "The date on which the recurrences for this event or to-do should begin."
 msgstr ""
 
-#: actionmanager.cpp:781
-msgid "ICal Import Successful with Warning"
+#: koeditorrecurrence.cpp:723
+msgid "&No ending date"
 msgstr ""
 
-#: actionmanager.cpp:784
-msgid ""
-"KOrganizer encountered an error parsing your .calendar file from ical; import "
-"has failed."
+#: koeditorrecurrence.cpp:725
+msgid "Sets the event or to-do to recur forever."
 msgstr ""
 
-#: actionmanager.cpp:788
+#: koeditorrecurrence.cpp:732
+msgid "End &after"
+msgstr ""
+
+#: koeditorrecurrence.cpp:734
 msgid ""
-"KOrganizer does not think that your .calendar file is a valid ical calendar; "
-"import has failed."
+"Sets the event or to-do to stop recurring after a certain number of "
+"occurrences."
 msgstr ""
 
-#: actionmanager.cpp:870
-msgid "New calendar '%1'."
+#: koeditorrecurrence.cpp:739
+msgid "Number of times the event or to-do should recur before stopping."
 msgstr ""
 
-#: actionmanager.cpp:905
-msgid "Cannot download calendar from '%1'."
+#: koeditorrecurrence.cpp:745
+msgid "&occurrence(s)"
 msgstr ""
 
-#: actionmanager.cpp:943
-msgid "Added calendar resource for URL '%1'."
+#: koeditorrecurrence.cpp:753
+msgid "End &on:"
 msgstr ""
 
-#: actionmanager.cpp:951
-msgid "Unable to create calendar resource '%1'."
+#: koeditorrecurrence.cpp:755
+msgid "Sets the event or to-do to stop recurring on a certain date."
 msgstr ""
 
-#: actionmanager.cpp:962
-msgid "Merged calendar '%1'."
+#: koeditorrecurrence.cpp:762
+msgid "Date after which the event or to-do should stop recurring"
 msgstr ""
 
-#: actionmanager.cpp:965
-msgid "Opened calendar '%1'."
+#: koeditorrecurrence.cpp:826
+#, c-format
+msgid "Begins on: %1"
 msgstr ""
 
-#: actionmanager.cpp:990
-msgid ""
-"Your calendar will be saved in iCalendar format. Use 'Export vCalendar' to save "
-"in vCalendar format."
+#: koeditorrecurrence.cpp:834
+msgid "Edit Recurrence Range"
 msgstr ""
 
-#: actionmanager.cpp:992
-msgid "Format Conversion"
+#: koeditorrecurrence.cpp:881
+msgid "Sets the type of recurrence this event or to-do should have."
 msgstr ""
 
-#: actionmanager.cpp:1016
-msgid "Cannot upload calendar to '%1'"
+#: koeditorrecurrence.cpp:883
+msgid "Daily"
 msgstr ""
 
-#: actionmanager.cpp:1029
-msgid "Saved calendar '%1'."
+#: koeditorrecurrence.cpp:884
+msgid "Weekly"
 msgstr ""
 
-#: actionmanager.cpp:1089
-msgid "Could not upload file."
+#: koeditorrecurrence.cpp:885
+msgid "Monthly"
 msgstr ""
 
-#: actionmanager.cpp:1130
-#, c-format
-msgid "Unable to save calendar to the file %1."
+#: koeditorrecurrence.cpp:886
+msgid "Yearly"
 msgstr ""
 
-#: actionmanager.cpp:1155
-msgid ""
-"The calendar has been modified.\n"
-"Do you want to save it?"
+#: koeditorrecurrence.cpp:898
+msgid "&Daily"
 msgstr ""
-"มีการแก้ไขปฏิทิน\n"
-"คุณต้องการทำการบันทึกมันหรือไม่ ?"
 
-#: actionmanager.cpp:1258
-#, c-format
+#: koeditorrecurrence.cpp:900
 msgid ""
-"_n: &Next Day\n"
-"&Next %n Days"
+"Sets the event or to-do to recur daily according to the specified rules."
 msgstr ""
 
-#: actionmanager.cpp:1292
-msgid "Could not start control module for date and time format."
+#: koeditorrecurrence.cpp:902
+msgid "&Weekly"
 msgstr ""
 
-#: actionmanager.cpp:1433
-msgid "&Show Event"
-msgstr "แสดงเหตุการณ์"
-
-#: actionmanager.cpp:1434
-msgid "&Edit Event..."
-msgstr "แก้ไขเหตุการณ์..."
-
-#: actionmanager.cpp:1435
-msgid "&Delete Event"
-msgstr "ลบเหตุการณ์"
+#: koeditorrecurrence.cpp:904
+msgid ""
+"Sets the event or to-do to recur weekly according to the specified rules."
+msgstr ""
 
-#: actionmanager.cpp:1439
-msgid "&Show To-do"
-msgstr "แสดงรายการสิ่งที่จะทำ"
+#: koeditorrecurrence.cpp:906
+msgid "&Monthly"
+msgstr ""
 
-#: actionmanager.cpp:1440
-msgid "&Edit To-do..."
-msgstr "แก้ไขรายการสิ่งที่จะทำ..."
+#: koeditorrecurrence.cpp:908
+msgid ""
+"Sets the event or to-do to recur monthly according to the specified rules."
+msgstr ""
 
-#: actionmanager.cpp:1441
-msgid "&Delete To-do"
-msgstr "ลบรายการสิ่งที่จะทำ"
+#: koeditorrecurrence.cpp:910
+msgid "&Yearly"
+msgstr ""
 
-#: actionmanager.cpp:1560 actionmanager.cpp:1675
-msgid "Attach as &link"
+#: koeditorrecurrence.cpp:912
+msgid ""
+"Sets the event or to-do to recur yearly according to the specified rules."
 msgstr ""
 
-#: actionmanager.cpp:1561 actionmanager.cpp:1676
-msgid "Attach &inline"
+#: koeditorrecurrence.cpp:974
+msgid "&Enable recurrence"
 msgstr ""
 
-#: actionmanager.cpp:1562
-msgid "Attach inline &without attachments"
+#: koeditorrecurrence.cpp:976
+msgid ""
+"Enables recurrence for this event or to-do according to the specified rules."
 msgstr ""
 
-#: actionmanager.cpp:1564 actionmanager.cpp:1678
-msgid "C&ancel"
+#: koeditorrecurrence.cpp:983
+msgid "Appointment Time "
 msgstr ""
 
-#: actionmanager.cpp:1594
-msgid "Removing attachments from an email might invalidate its signature."
+#: koeditorrecurrence.cpp:986
+msgid "Displays appointment time information."
 msgstr ""
 
-#: actionmanager.cpp:1595
-msgid "Remove Attachments"
+#: koeditorrecurrence.cpp:1005
+msgid "Recurrence Rule"
 msgstr ""
 
-#: actionmanager.cpp:1764
-msgid "Undo (%1)"
+#: koeditorrecurrence.cpp:1007
+msgid ""
+"Options concerning the type of recurrence this event or to-do should have."
 msgstr ""
 
-#: actionmanager.cpp:1776
-msgid "Redo (%1)"
+#: koeditorrecurrence.cpp:1044
+msgid "Recurrence Range..."
 msgstr ""
 
-#: actionmanager.cpp:1788
+#: koeditorrecurrence.cpp:1047 koeditorrecurrence.cpp:1064
 msgid ""
-"The calendar contains unsaved changes. Do you want to save them before exiting?"
+"Options concerning the time range during which this event or to-do should "
+"recur."
 msgstr ""
 
-#: actionmanager.cpp:1793
-msgid "Unable to save the calendar. Do you still want to close this window?"
+#: koeditorrecurrence.cpp:1056
+msgid "Exceptions..."
 msgstr ""
 
-#: actionmanager.cpp:1814
-msgid "Unable to exit. Saving still in progress."
-msgstr "กำลังทำการบันทึกอยู่ ยังไม่สามารถออกจากโปรแกรมได้"
-
-#: actionmanager.cpp:1853
+#: koeditorrecurrence.cpp:1396
 msgid ""
-"Saving of '%1' failed. Check that the resource is properly configured.\n"
-"Ignore problem and continue without saving or cancel save?"
+"The end date '%1' of the recurrence must be after the start date '%2' of the "
+"event."
 msgstr ""
 
-#: actionmanager.cpp:1856
-msgid "Save Error"
+#: koeditorrecurrence.cpp:1410
+msgid ""
+"A weekly recurring event or task has to have at least one weekday associated "
+"with it."
 msgstr ""
 
-#: actionmanager.cpp:1867
-msgid "URL '%1' is invalid."
+#: koeditorrecurrence.cpp:1637
+msgid "Recurrence"
 msgstr ""
 
 #. i18n: file korganizer_part.rc line 11
-#: rc.cpp:6 rc.cpp:54 rc.cpp:1496 rc.cpp:1544
+#: rc.cpp:6 rc.cpp:54 rc.cpp:1041 rc.cpp:2018
 #, no-c-format
 msgid "&Import"
 msgstr "นำเข้า"
 
 #. i18n: file korganizer_part.rc line 18
-#: rc.cpp:9 rc.cpp:57 rc.cpp:1499 rc.cpp:1547
+#: rc.cpp:9 rc.cpp:57 rc.cpp:1044 rc.cpp:2021
 #, no-c-format
 msgid "&Export"
 msgstr "ส่งออก"
 
 #. i18n: file korganizer_part.rc line 73
-#: rc.cpp:21 rc.cpp:69 rc.cpp:1511 rc.cpp:1559
+#: rc.cpp:21 rc.cpp:69 rc.cpp:1056 rc.cpp:2033
 #, no-c-format
 msgid "&Go"
 msgstr "ไปยัง"
 
 #. i18n: file korganizer_part.rc line 80
-#: rc.cpp:24 rc.cpp:72 rc.cpp:1514 rc.cpp:1562
+#: rc.cpp:24 rc.cpp:72 rc.cpp:1059 rc.cpp:2036
 #, no-c-format
 msgid "&Actions"
 msgstr "การกระทำ"
 
 #. i18n: file korganizer_part.rc line 95
-#: rc.cpp:27 rc.cpp:75 rc.cpp:1517 rc.cpp:1565
+#: rc.cpp:27 rc.cpp:75 rc.cpp:1062 rc.cpp:2039
 #, no-c-format
 msgid "S&chedule"
 msgstr ""
 
 #. i18n: file korganizer_part.rc line 108
-#: rc.cpp:33 rc.cpp:81 rc.cpp:1523 rc.cpp:1571
+#: rc.cpp:33 rc.cpp:81 rc.cpp:1068 rc.cpp:2045
 #, no-c-format
 msgid "&Sidebar"
 msgstr "แถบด้านข้าง"
 
 #. i18n: file korganizer_part.rc line 131
-#: rc.cpp:39 rc.cpp:87 rc.cpp:1529 rc.cpp:1577
+#: rc.cpp:39 rc.cpp:87 rc.cpp:1074 rc.cpp:2051
 #, no-c-format
 msgid "Main"
 msgstr ""
 
 #. i18n: file korganizer_part.rc line 140
-#: rc.cpp:42 rc.cpp:90 rc.cpp:1532 rc.cpp:1580
+#: rc.cpp:42 rc.cpp:90 rc.cpp:1077 rc.cpp:2054
 #, no-c-format
 msgid "Views"
 msgstr "มุมมอง"
 
 #. i18n: file korganizer_part.rc line 154
-#: rc.cpp:45 rc.cpp:93 rc.cpp:1535 rc.cpp:1583
+#: rc.cpp:45 rc.cpp:93 rc.cpp:1080 rc.cpp:2057
 #, no-c-format
 msgid "Schedule"
 msgstr ""
 
 #. i18n: file korganizer_part.rc line 160
-#: rc.cpp:48 rc.cpp:96 rc.cpp:1538 rc.cpp:1586
+#: rc.cpp:48 rc.cpp:96 rc.cpp:1083 rc.cpp:2060
 #, no-c-format
 msgid "Filters Toolbar"
 msgstr "แถบเครืองมือตัวกรอง"
 
 #. i18n: file filteredit_base.ui line 45
-#: rc.cpp:105 rc.cpp:2081
+#: rc.cpp:105 rc.cpp:2189
 #, no-c-format
 msgid "Filter Details"
 msgstr "รายละเอียดตัวกรอง"
 
 #. i18n: file filteredit_base.ui line 64
-#: rc.cpp:108 rc.cpp:423 rc.cpp:1865 rc.cpp:2084
+#: rc.cpp:108 rc.cpp:426 rc.cpp:2168 rc.cpp:2192
 #, no-c-format
 msgid "Name:"
 msgstr "ชื่อ:"
 
 #. i18n: file filteredit_base.ui line 79
-#: rc.cpp:111 rc.cpp:2087
+#: rc.cpp:111 rc.cpp:2195
 #, no-c-format
 msgid "Hide &recurring events and to-dos"
 msgstr ""
 
 #. i18n: file filteredit_base.ui line 82
-#: rc.cpp:114 rc.cpp:2090
+#: rc.cpp:114 rc.cpp:2198
 #, no-c-format
 msgid ""
 "Select this option if you do not want to show recurring events and to-dos in "
@@ -2851,13 +4431,13 @@ msgid ""
 msgstr ""
 
 #. i18n: file filteredit_base.ui line 90
-#: rc.cpp:117 rc.cpp:2093
+#: rc.cpp:117 rc.cpp:2201
 #, no-c-format
 msgid "Hide co&mpleted to-dos"
 msgstr ""
 
 #. i18n: file filteredit_base.ui line 93
-#: rc.cpp:120 rc.cpp:2096
+#: rc.cpp:120 rc.cpp:2204
 #, no-c-format
 msgid ""
 "If this box is checked, the filter will hide all to-do items from the list, "
@@ -2866,13 +4446,13 @@ msgid ""
 msgstr ""
 
 #. i18n: file filteredit_base.ui line 129
-#: rc.cpp:123 rc.cpp:2099
+#: rc.cpp:123 rc.cpp:2207
 #, no-c-format
 msgid "Days after completion:"
 msgstr ""
 
 #. i18n: file filteredit_base.ui line 135
-#: rc.cpp:126 rc.cpp:2102
+#: rc.cpp:126 rc.cpp:2210
 #, no-c-format
 msgid ""
 "This option will allow you to select which completed to-dos should be hidden. "
@@ -2881,13 +4461,13 @@ msgid ""
 msgstr ""
 
 #. i18n: file filteredit_base.ui line 152
-#: rc.cpp:129 rc.cpp:2105
+#: rc.cpp:129 rc.cpp:2213
 #, no-c-format
 msgid "Immediately"
 msgstr ""
 
 #. i18n: file filteredit_base.ui line 155
-#: rc.cpp:132 rc.cpp:2108
+#: rc.cpp:132 rc.cpp:2216
 #, no-c-format
 msgid ""
 "Here you can give the number of days a to-do item has to be completed to be "
@@ -2897,13 +4477,13 @@ msgid ""
 msgstr ""
 
 #. i18n: file filteredit_base.ui line 182
-#: rc.cpp:135 rc.cpp:2111
+#: rc.cpp:135 rc.cpp:2219
 #, no-c-format
 msgid "Hide &inactive to-dos"
 msgstr ""
 
 #. i18n: file filteredit_base.ui line 185
-#: rc.cpp:138 rc.cpp:2114
+#: rc.cpp:138 rc.cpp:2222
 #, no-c-format
 msgid ""
 "This option hides all to-dos from your list, where the start date has not been "
@@ -2911,13 +4491,13 @@ msgid ""
 msgstr ""
 
 #. i18n: file filteredit_base.ui line 235
-#: rc.cpp:144 rc.cpp:2120
+#: rc.cpp:144 rc.cpp:2228
 #, no-c-format
 msgid "Show all except selected"
 msgstr "แสดงทั้งหมดยกเว้นตัวที่เลือกไว้"
 
 #. i18n: file filteredit_base.ui line 244
-#: rc.cpp:147 rc.cpp:2123
+#: rc.cpp:147 rc.cpp:2231
 #, no-c-format
 msgid ""
 "When this option is enabled, this filter will show all items which do <i>not</i> "
@@ -2925,13 +4505,13 @@ msgid ""
 msgstr ""
 
 #. i18n: file filteredit_base.ui line 252
-#: rc.cpp:150 rc.cpp:2126
+#: rc.cpp:150 rc.cpp:2234
 #, no-c-format
 msgid "Show only selected"
 msgstr "แสดงเฉพาะตัวที่เลือกไว้"
 
 #. i18n: file filteredit_base.ui line 261
-#: rc.cpp:153 rc.cpp:2129
+#: rc.cpp:153 rc.cpp:2237
 #, no-c-format
 msgid ""
 "When this option is enabled, this filter will show all items containing at "
@@ -2939,19 +4519,19 @@ msgid ""
 msgstr ""
 
 #. i18n: file filteredit_base.ui line 269
-#: rc.cpp:156 rc.cpp:2132
+#: rc.cpp:156 rc.cpp:2240
 #, no-c-format
 msgid "Change..."
 msgstr "เปลี่ยน..."
 
 #. i18n: file filteredit_base.ui line 282
-#: rc.cpp:159 rc.cpp:2135
+#: rc.cpp:159 rc.cpp:2243
 #, no-c-format
 msgid "Hide to-dos not assigned to me"
 msgstr ""
 
 #. i18n: file filteredit_base.ui line 289
-#: rc.cpp:162 rc.cpp:2138
+#: rc.cpp:162 rc.cpp:2246
 #, no-c-format
 msgid ""
 "This option hides all to-dos from your list which are assigned to someone else."
@@ -2961,184 +4541,180 @@ msgid ""
 msgstr ""
 
 #. i18n: file koeditoralarms_base.ui line 16
-#: rc.cpp:166 rc.cpp:1880
+#: rc.cpp:166 rc.cpp:2063
 #, no-c-format
 msgid "Alarms"
 msgstr ""
 
 #. i18n: file koeditoralarms_base.ui line 30
-#: rc.cpp:169 rc.cpp:262 rc.cpp:1883 rc.cpp:1976
+#: rc.cpp:169 rc.cpp:259 rc.cpp:2066 rc.cpp:2156
 #, no-c-format
 msgid "Time Offset"
 msgstr ""
 
-#. i18n: file koeditoralarms_base.ui line 80
-#: rc.cpp:181 rc.cpp:1895
+#. i18n: file koeditoralarms_base.ui line 86
+#: koeditorgeneral.cpp:240 koeditorgeneral.cpp:439 koeditorgeneral.cpp:444
+#: rc.cpp:181 rc.cpp:2078
 #, fuzzy, no-c-format
 msgid "before the start"
 msgstr "ก่อนเริ่ม"
 
-#. i18n: file koeditoralarms_base.ui line 85
-#: rc.cpp:184 rc.cpp:1898
+#. i18n: file koeditoralarms_base.ui line 91
+#: rc.cpp:184 rc.cpp:2081
 #, fuzzy, no-c-format
 msgid "after the start"
 msgstr "หลังจากเริ่ม"
 
-#. i18n: file koeditoralarms_base.ui line 90
-#: rc.cpp:187 rc.cpp:1901
+#. i18n: file koeditoralarms_base.ui line 96
+#: rc.cpp:187 rc.cpp:2084
 #, fuzzy, no-c-format
 msgid "before the end"
 msgstr "ก่อนสิ้นสุด"
 
-#. i18n: file koeditoralarms_base.ui line 95
-#: rc.cpp:190 rc.cpp:1904
+#. i18n: file koeditoralarms_base.ui line 101
+#: rc.cpp:190 rc.cpp:2087
 #, fuzzy, no-c-format
 msgid "after the end"
 msgstr "หลังจากสิ้นสุด"
 
-#. i18n: file koeditoralarms_base.ui line 128
-#: rc.cpp:193 rc.cpp:1907
+#. i18n: file koeditoralarms_base.ui line 134
+#: rc.cpp:193 rc.cpp:2090
 #, no-c-format
 msgid "&How often:"
 msgstr "ความถี่:"
 
-#. i18n: file koeditoralarms_base.ui line 142
-#: rc.cpp:196 rc.cpp:1910
+#. i18n: file koeditoralarms_base.ui line 148
+#: rc.cpp:196 rc.cpp:2093
 #, no-c-format
 msgid " time(s)"
 msgstr " ครั้ง"
 
-#. i18n: file koeditoralarms_base.ui line 159
-#: rc.cpp:199 rc.cpp:1913
+#. i18n: file koeditoralarms_base.ui line 165
+#: rc.cpp:199 rc.cpp:2096
 #, no-c-format
 msgid "&Interval:"
 msgstr ""
 
-#. i18n: file koeditoralarms_base.ui line 178
-#: rc.cpp:202 rc.cpp:1916
+#. i18n: file koeditoralarms_base.ui line 184
+#: rc.cpp:202 rc.cpp:2099
 #, fuzzy, no-c-format
 msgid "&Repeat:"
 msgstr "ทำซ้ำอีก:"
 
-#. i18n: file koeditoralarms_base.ui line 189
-#: rc.cpp:205 rc.cpp:1919
+#. i18n: file koeditoralarms_base.ui line 195
+#: rc.cpp:205 rc.cpp:2102
 #, no-c-format
 msgid "every "
 msgstr "ทุก"
 
-#. i18n: file koeditoralarms_base.ui line 192
-#: rc.cpp:208 rc.cpp:1922
+#. i18n: file koeditoralarms_base.ui line 198
+#: rc.cpp:208 rc.cpp:2105
 #, fuzzy, no-c-format
 msgid " minute(s)"
 msgstr "นาที"
 
-#. i18n: file koeditoralarms_base.ui line 210
-#: rc.cpp:211 rc.cpp:259 rc.cpp:1925 rc.cpp:1973
+#. i18n: file koeditoralarms_base.ui line 216
+#: rc.cpp:211 rc.cpp:256 rc.cpp:2108 rc.cpp:2153
 #, no-c-format
 msgid "Type"
 msgstr "ประเภท"
 
-#. i18n: file koeditoralarms_base.ui line 252
-#: rc.cpp:214 rc.cpp:1928
+#. i18n: file koeditoralarms_base.ui line 258
+#: rc.cpp:214 rc.cpp:2111
 #, fuzzy, no-c-format
 msgid "&Reminder Dialog"
 msgstr "ตัวแจ้งเตือน:"
 
-#. i18n: file koeditoralarms_base.ui line 263
-#: rc.cpp:217 rc.cpp:1931
+#. i18n: file koeditoralarms_base.ui line 269
+#: rc.cpp:217 rc.cpp:2114
 #, no-c-format
 msgid "A&udio"
 msgstr ""
 
-#. i18n: file koeditoralarms_base.ui line 341
-#: rc.cpp:226 rc.cpp:1940
+#. i18n: file koeditoralarms_base.ui line 347
+#: rc.cpp:226 rc.cpp:2123
 #, fuzzy, no-c-format
 msgid "Reminder Dialog &text:"
 msgstr "ข้อความแจ้งเตือน:"
 
-#. i18n: file koeditoralarms_base.ui line 373
-#: rc.cpp:229 rc.cpp:1943
+#. i18n: file koeditoralarms_base.ui line 379
+#: rc.cpp:229 rc.cpp:2126
 #, fuzzy, no-c-format
 msgid "Audio &file:"
 msgstr "แฟ้มเสียง:"
 
-#. i18n: file koeditoralarms_base.ui line 384
-#: rc.cpp:232 rc.cpp:1946
+#. i18n: file koeditoralarms_base.ui line 390
+#: rc.cpp:232 rc.cpp:2129
 #, no-c-format
 msgid "audio/x-wav audio/x-mp3 application/ogg"
 msgstr ""
 
-#. i18n: file koeditoralarms_base.ui line 425
-#: rc.cpp:235 rc.cpp:1949
+#. i18n: file koeditoralarms_base.ui line 431
+#: rc.cpp:235 rc.cpp:2132
 #, no-c-format
 msgid "&Program file:"
 msgstr ""
 
-#. i18n: file koeditoralarms_base.ui line 436
-#: rc.cpp:238 rc.cpp:1952
+#. i18n: file koeditoralarms_base.ui line 442
+#: rc.cpp:238 rc.cpp:2135
 #, no-c-format
 msgid "*.*|All files"
 msgstr "*.*|แฟ้มทั้งหมด"
 
-#. i18n: file koeditoralarms_base.ui line 444
-#: rc.cpp:241 rc.cpp:1955
+#. i18n: file koeditoralarms_base.ui line 450
+#: rc.cpp:241 rc.cpp:2138
 #, no-c-format
 msgid "Program ar&guments:"
 msgstr ""
 
-#. i18n: file koeditoralarms_base.ui line 493
-#: rc.cpp:244 rc.cpp:1958
+#. i18n: file koeditoralarms_base.ui line 499
+#: rc.cpp:244 rc.cpp:2141
 #, no-c-format
 msgid "Email &message text:"
 msgstr ""
 
-#. i18n: file koeditoralarms_base.ui line 514
-#: rc.cpp:247 rc.cpp:1961
+#. i18n: file koeditoralarms_base.ui line 520
+#: rc.cpp:247 rc.cpp:2144
 #, fuzzy, no-c-format
 msgid "Email &address(es):"
 msgstr "ที่อยู่อีเมล"
 
-#. i18n: file koeditoralarms_base.ui line 538
-#: rc.cpp:250 rc.cpp:1964
-#, no-c-format
-msgid "&Remove..."
-msgstr "ลบ..."
-
-#. i18n: file koeditoralarms_base.ui line 554
-#: rc.cpp:256 rc.cpp:1970
+#. i18n: file koeditoralarms_base.ui line 560
+#: rc.cpp:253 rc.cpp:2150
 #, no-c-format
 msgid "D&uplicate"
 msgstr ""
 
-#. i18n: file koeditoralarms_base.ui line 599
-#: rc.cpp:265 rc.cpp:1979
+#. i18n: file koeditoralarms_base.ui line 605
+#: rc.cpp:262 rc.cpp:2159
 #, no-c-format
 msgid "Repeat"
 msgstr ""
 
 #. i18n: file kogroupwareprefspage.ui line 31
-#: rc.cpp:268 rc.cpp:891
+#: rc.cpp:265 rc.cpp:1860
 #, no-c-format
 msgid "P&ublish"
 msgstr ""
 
 #. i18n: file kogroupwareprefspage.ui line 42
-#: rc.cpp:271 rc.cpp:894
+#: rc.cpp:268 rc.cpp:1863
 #, no-c-format
 msgid ""
 "By publishing Free/Busy information, you allow others to take your calendar "
 "into account when inviting you for a meeting. Only the times you have already "
-"busy are published, not why they are busy."
+"busy are published, not why they are busy. For Kolab2 Server leave this "
+"disabled (the information is generated on the server)."
 msgstr ""
 
 #. i18n: file kogroupwareprefspage.ui line 53
-#: rc.cpp:274 rc.cpp:897
+#: rc.cpp:271 rc.cpp:1866
 #, no-c-format
 msgid "Publish your free/&busy information automatically"
 msgstr ""
 
 #. i18n: file kogroupwareprefspage.ui line 58
-#: rc.cpp:277 rc.cpp:900
+#: rc.cpp:274 rc.cpp:1869
 #, no-c-format
 msgid ""
 "Check this box to upload your Free/Busy information automatically.\n"
@@ -3150,13 +4726,13 @@ msgid ""
 msgstr ""
 
 #. i18n: file kogroupwareprefspage.ui line 74
-#: rc.cpp:282 rc.cpp:905
+#: rc.cpp:279 rc.cpp:1874
 #, no-c-format
 msgid "Minimum time between uploads (in minutes):"
 msgstr ""
 
 #. i18n: file kogroupwareprefspage.ui line 80
-#: rc.cpp:285 rc.cpp:288 rc.cpp:908 rc.cpp:911
+#: rc.cpp:282 rc.cpp:285 rc.cpp:1877 rc.cpp:1880
 #, no-c-format
 msgid ""
 "Configure minimum the interval of time in minutes between each upload here. "
@@ -3165,13 +4741,13 @@ msgid ""
 msgstr ""
 
 #. i18n: file kogroupwareprefspage.ui line 109
-#: rc.cpp:291 rc.cpp:914
+#: rc.cpp:288 rc.cpp:1883
 #, no-c-format
 msgid "Publish"
 msgstr ""
 
 #. i18n: file kogroupwareprefspage.ui line 115
-#: rc.cpp:294 rc.cpp:297 rc.cpp:303 rc.cpp:917 rc.cpp:920 rc.cpp:926
+#: rc.cpp:291 rc.cpp:294 rc.cpp:300 rc.cpp:1886 rc.cpp:1889 rc.cpp:1895
 #, no-c-format
 msgid ""
 "Configure the number of calendar days you wish to be published and available to "
@@ -3179,36 +4755,34 @@ msgid ""
 msgstr ""
 
 #. i18n: file kogroupwareprefspage.ui line 140
-#: rc.cpp:300 rc.cpp:923
+#: rc.cpp:297 rc.cpp:1892
 #, no-c-format
 msgid "days of free/busy information"
 msgstr ""
 
 #. i18n: file kogroupwareprefspage.ui line 170
-#: rc.cpp:306 rc.cpp:372 rc.cpp:929 rc.cpp:995
+#: rc.cpp:303 rc.cpp:367 rc.cpp:1898 rc.cpp:1962
 #, no-c-format
 msgid "Server Information"
 msgstr "ข้อมูลเซิร์ฟเวอร์"
 
-#. i18n: file kogroupwareprefspage.ui line 186
-#: rc.cpp:309 rc.cpp:346 rc.cpp:932 rc.cpp:969
+#. i18n: file kogroupwareprefspage.ui line 185
+#: rc.cpp:306 rc.cpp:342 rc.cpp:1901 rc.cpp:1937
 #, no-c-format
 msgid ""
 "Enter the URL for the server on which your Free/Busy information shall be "
 "published here.\n"
-"Ask the server administrator for this information.\n"
-"Here is a Kolab2 server URL example: "
-"\"webdavs://kolab2.com/freebusy/joe@kolab2.com.ifb\""
+"Ask the server administrator for this information."
 msgstr ""
 
-#. i18n: file kogroupwareprefspage.ui line 194
-#: rc.cpp:314 rc.cpp:937
+#. i18n: file kogroupwareprefspage.ui line 193
+#: rc.cpp:310 rc.cpp:1905
 #, no-c-format
 msgid "Remember p&assword"
 msgstr "จดจำรหัสผ่าน"
 
-#. i18n: file kogroupwareprefspage.ui line 198
-#: rc.cpp:317 rc.cpp:413 rc.cpp:940 rc.cpp:1036
+#. i18n: file kogroupwareprefspage.ui line 197
+#: rc.cpp:313 rc.cpp:416 rc.cpp:1908 rc.cpp:2011
 #, no-c-format
 msgid ""
 "Check this box to make KOrganizer remember your password and skip asking you "
@@ -3218,22 +4792,16 @@ msgid ""
 "configuration file."
 msgstr ""
 
-#. i18n: file kogroupwareprefspage.ui line 206
-#: plugins/exchange/exchangeconfig.cpp:59 rc.cpp:321 rc.cpp:944
-#, no-c-format
-msgid "Password:"
-msgstr "รหัสผ่าน:"
-
-#. i18n: file kogroupwareprefspage.ui line 212
-#: rc.cpp:324 rc.cpp:327 rc.cpp:404 rc.cpp:407 rc.cpp:947 rc.cpp:950
-#: rc.cpp:1027 rc.cpp:1030
+#. i18n: file kogroupwareprefspage.ui line 211
+#: rc.cpp:320 rc.cpp:323 rc.cpp:407 rc.cpp:410 rc.cpp:1915 rc.cpp:1918
+#: rc.cpp:2002 rc.cpp:2005
 #, no-c-format
 msgid "Enter your groupware server login password here."
 msgstr ""
 
-#. i18n: file kogroupwareprefspage.ui line 239
-#: rc.cpp:330 rc.cpp:338 rc.cpp:388 rc.cpp:396 rc.cpp:953 rc.cpp:961
-#: rc.cpp:1011 rc.cpp:1019
+#. i18n: file kogroupwareprefspage.ui line 238
+#: rc.cpp:326 rc.cpp:334 rc.cpp:391 rc.cpp:399 rc.cpp:1921 rc.cpp:1929
+#: rc.cpp:1986 rc.cpp:1994
 #, no-c-format
 msgid ""
 "Enter the login information relative to your account on the server here.\n"
@@ -3243,40 +4811,40 @@ msgid ""
 "also be different. In the last case enter your UID."
 msgstr ""
 
-#. i18n: file kogroupwareprefspage.ui line 247
-#: rc.cpp:335 rc.cpp:958
+#. i18n: file kogroupwareprefspage.ui line 246
+#: rc.cpp:331 rc.cpp:1926
 #, no-c-format
 msgid "Username:"
 msgstr "ชื่อผู้ใช้:"
 
-#. i18n: file kogroupwareprefspage.ui line 274
-#: rc.cpp:343 rc.cpp:375 rc.cpp:966 rc.cpp:998
+#. i18n: file kogroupwareprefspage.ui line 273
+#: rc.cpp:339 rc.cpp:370 rc.cpp:1934 rc.cpp:1965
 #, no-c-format
 msgid "Server URL:"
 msgstr "ตำแหน่ง URL ของเซิร์ฟเวอร์:"
 
-#. i18n: file kogroupwareprefspage.ui line 311
-#: rc.cpp:351 rc.cpp:974
+#. i18n: file kogroupwareprefspage.ui line 309
+#: rc.cpp:346 rc.cpp:1941
 #, no-c-format
 msgid "&Retrieve"
 msgstr ""
 
-#. i18n: file kogroupwareprefspage.ui line 322
-#: rc.cpp:354 rc.cpp:977
+#. i18n: file kogroupwareprefspage.ui line 320
+#: rc.cpp:349 rc.cpp:1944
 #, no-c-format
 msgid ""
 "By retrieving Free/Busy information that others have published, you can take "
 "their calendar into account when inviting them to a meeting."
 msgstr ""
 
-#. i18n: file kogroupwareprefspage.ui line 333
-#: rc.cpp:357 rc.cpp:980
+#. i18n: file kogroupwareprefspage.ui line 331
+#: rc.cpp:352 rc.cpp:1947
 #, no-c-format
 msgid "Retrieve other peoples' free/&busy information automatically"
 msgstr ""
 
-#. i18n: file kogroupwareprefspage.ui line 336
-#: rc.cpp:360 rc.cpp:983
+#. i18n: file kogroupwareprefspage.ui line 334
+#: rc.cpp:355 rc.cpp:1950
 #, no-c-format
 msgid ""
 "Check this box to retrieve other peoples' Free/Busy information automatically. "
@@ -3284,21 +4852,21 @@ msgid ""
 "possible."
 msgstr ""
 
-#. i18n: file kogroupwareprefspage.ui line 347
-#: rc.cpp:363 rc.cpp:986
+#. i18n: file kogroupwareprefspage.ui line 345
+#: rc.cpp:358 rc.cpp:1953
 #, no-c-format
 msgid "Use full email &address for retrieval"
 msgstr ""
 
-#. i18n: file kogroupwareprefspage.ui line 350
-#: rc.cpp:366 rc.cpp:989
+#. i18n: file kogroupwareprefspage.ui line 348
+#: rc.cpp:361 rc.cpp:1956
 #, no-c-format
 msgid ""
 "Set this to retrieve user@domain.ifb instead of user.ifb from the server"
 msgstr ""
 
-#. i18n: file kogroupwareprefspage.ui line 353
-#: rc.cpp:369 rc.cpp:992
+#. i18n: file kogroupwareprefspage.ui line 351
+#: rc.cpp:364 rc.cpp:1959
 #, no-c-format
 msgid ""
 "Check this box to download a free/busy file in the format \"user@domain.ifb\" "
@@ -3307,54 +4875,58 @@ msgid ""
 "you are not sure about how to configure this option."
 msgstr ""
 
-#. i18n: file kogroupwareprefspage.ui line 388
-#: rc.cpp:378 rc.cpp:383 rc.cpp:1001 rc.cpp:1006
+#. i18n: file kogroupwareprefspage.ui line 390
+#: rc.cpp:373 rc.cpp:382 rc.cpp:1968 rc.cpp:1977
 #, no-c-format
 msgid ""
 "Enter the URL for the server on which the Free/Busy information is published "
 "here.\n"
 "Ask the server administrator for this information.\n"
-"Here is a Kolab2 server URL example: \"webdavs://kolab2.com/freebusy/\""
+"Here is a Kolab2 Server URL example: \"https://kolab2.example.com/freebusy/\"\n"
+"Here is a generic server example: \"http://myserver.net/%u@%d/?internal.ics\"\n"
+"%u expands to the username, and %d expands to the domain name.\n"
+"Alternatively, you can specify a full path to the Free/Busy file,\n"
+"For example: \"https://kolab2.example.com/freebusy/user.xfb\""
 msgstr ""
 
-#. i18n: file kogroupwareprefspage.ui line 440
-#: rc.cpp:393 rc.cpp:1016
+#. i18n: file kogroupwareprefspage.ui line 446
+#: rc.cpp:396 rc.cpp:1991
 #, no-c-format
 msgid "User&name:"
 msgstr "ชื่อผู้ใช้:"
 
-#. i18n: file kogroupwareprefspage.ui line 456
-#: rc.cpp:401 rc.cpp:1024
+#. i18n: file kogroupwareprefspage.ui line 462
+#: rc.cpp:404 rc.cpp:1999
 #, no-c-format
 msgid "Passwor&d:"
 msgstr "รหัสผ่าน:"
 
-#. i18n: file kogroupwareprefspage.ui line 486
-#: rc.cpp:410 rc.cpp:1033
+#. i18n: file kogroupwareprefspage.ui line 492
+#: rc.cpp:413 rc.cpp:2008
 #, no-c-format
 msgid "Re&member password"
 msgstr "จดจำรหัสผ่าน"
 
 #. i18n: file publishdialog_base.ui line 65
-#: rc.cpp:426 rc.cpp:1868
+#: rc.cpp:429 rc.cpp:2171
 #, no-c-format
 msgid "Email:"
 msgstr "อีเมล:"
 
 #. i18n: file publishdialog_base.ui line 94
-#: rc.cpp:432 rc.cpp:1874
+#: rc.cpp:435 rc.cpp:2177
 #, no-c-format
 msgid "Select &Addressee..."
 msgstr ""
 
 #. i18n: file template_management_dialog_base.ui line 16
-#: rc.cpp:438 rc.cpp:1478
+#: rc.cpp:441 rc.cpp:1845
 #, no-c-format
 msgid "Template Management"
 msgstr ""
 
 #. i18n: file template_management_dialog_base.ui line 57
-#: rc.cpp:447 rc.cpp:1487
+#: rc.cpp:450 rc.cpp:1854
 #, no-c-format
 msgid ""
 "Select a template and click <b>Apply Template</b> to apply it to the current "
@@ -3363,19 +4935,19 @@ msgid ""
 msgstr ""
 
 #. i18n: file template_management_dialog_base.ui line 65
-#: rc.cpp:450 rc.cpp:1490 templatemanagementdialog.cpp:50
+#: rc.cpp:453 rc.cpp:1857 templatemanagementdialog.cpp:50
 #, no-c-format
 msgid "Apply Template"
 msgstr ""
 
 #. i18n: file korganizer.kcfg line 11
-#: rc.cpp:453 rc.cpp:1040
+#: rc.cpp:456 rc.cpp:1086
 #, no-c-format
 msgid "Enable automatic saving of manually opened calendar files"
 msgstr ""
 
 #. i18n: file korganizer.kcfg line 12
-#: rc.cpp:456 rc.cpp:1043
+#: rc.cpp:459 rc.cpp:1089
 #, no-c-format
 msgid ""
 "Check this box to save your calendar file automatically when you exit "
@@ -3385,13 +4957,13 @@ msgid ""
 msgstr ""
 
 #. i18n: file korganizer.kcfg line 16
-#: rc.cpp:459 rc.cpp:1046
+#: rc.cpp:462 rc.cpp:1092
 #, no-c-format
 msgid "Save &interval in minutes"
 msgstr ""
 
 #. i18n: file korganizer.kcfg line 17
-#: rc.cpp:462 rc.cpp:1049
+#: rc.cpp:465 rc.cpp:1095
 #, no-c-format
 msgid ""
 "Set the interval between automatic saving of calendar events in minutes here. "
@@ -3400,55 +4972,55 @@ msgid ""
 msgstr ""
 
 #. i18n: file korganizer.kcfg line 22
-#: rc.cpp:465 rc.cpp:1052
+#: rc.cpp:468 rc.cpp:1098
 #, no-c-format
 msgid "Confirm deletes"
 msgstr "ยืนยันการลบ"
 
 #. i18n: file korganizer.kcfg line 23
-#: rc.cpp:468 rc.cpp:1055
+#: rc.cpp:471 rc.cpp:1101
 #, no-c-format
 msgid "Check this box to display a confirmation dialog when deleting items."
 msgstr ""
 
 #. i18n: file korganizer.kcfg line 28
-#: rc.cpp:471 rc.cpp:1058
+#: rc.cpp:474 rc.cpp:1104
 #, no-c-format
 msgid "Archive events"
 msgstr ""
 
 #. i18n: file korganizer.kcfg line 32
-#: rc.cpp:474 rc.cpp:1061
+#: rc.cpp:477 rc.cpp:1107
 #, no-c-format
 msgid "Archive to-dos"
 msgstr ""
 
 #. i18n: file korganizer.kcfg line 37
-#: rc.cpp:477 rc.cpp:1064
+#: rc.cpp:480 rc.cpp:1110
 #, no-c-format
 msgid "Regularly archive events"
 msgstr ""
 
 #. i18n: file korganizer.kcfg line 41
-#: rc.cpp:480 rc.cpp:1067
+#: rc.cpp:483 rc.cpp:1113
 #, no-c-format
 msgid "What to do when archiving"
 msgstr ""
 
 #. i18n: file korganizer.kcfg line 44
-#: rc.cpp:483 rc.cpp:1070
+#: rc.cpp:486 rc.cpp:1116
 #, no-c-format
 msgid "Delete old events"
 msgstr "ลบเหตุการณ์เก่า"
 
 #. i18n: file korganizer.kcfg line 47
-#: rc.cpp:486 rc.cpp:1073
+#: rc.cpp:489 rc.cpp:1119
 #, no-c-format
 msgid "Archive old events to a separate file"
 msgstr ""
 
 #. i18n: file korganizer.kcfg line 53
-#: rc.cpp:489 rc.cpp:1076
+#: rc.cpp:492 rc.cpp:1122
 #, no-c-format
 msgid ""
 "If auto-archiving is enabled, events older than this amount will be archived. "
@@ -3456,43 +5028,43 @@ msgid ""
 msgstr ""
 
 #. i18n: file korganizer.kcfg line 57
-#: rc.cpp:492 rc.cpp:1079
+#: rc.cpp:495 rc.cpp:1125
 #, no-c-format
 msgid "The unit in which the expiry time is expressed."
 msgstr ""
 
 #. i18n: file korganizer.kcfg line 60
-#: rc.cpp:495 rc.cpp:1082
+#: rc.cpp:498 rc.cpp:1128
 #, no-c-format
 msgid "In days"
 msgstr ""
 
 #. i18n: file korganizer.kcfg line 63
-#: rc.cpp:498 rc.cpp:1085
+#: rc.cpp:501 rc.cpp:1131
 #, no-c-format
 msgid "In weeks"
 msgstr ""
 
 #. i18n: file korganizer.kcfg line 66
-#: rc.cpp:501 rc.cpp:1088
+#: rc.cpp:504 rc.cpp:1134
 #, no-c-format
 msgid "In months"
 msgstr ""
 
 #. i18n: file korganizer.kcfg line 72
-#: rc.cpp:504 rc.cpp:1091
+#: rc.cpp:507 rc.cpp:1137
 #, no-c-format
 msgid "URL of the file where old events should be archived"
 msgstr ""
 
 #. i18n: file korganizer.kcfg line 76
-#: rc.cpp:507 rc.cpp:1094
+#: rc.cpp:510 rc.cpp:1140
 #, no-c-format
 msgid "Export to HTML with every save"
 msgstr ""
 
 #. i18n: file korganizer.kcfg line 77
-#: rc.cpp:510 rc.cpp:1097
+#: rc.cpp:513 rc.cpp:1143
 #, no-c-format
 msgid ""
 "Check this box to export the calendar to an HTML-file every time you save it. "
@@ -3501,19 +5073,19 @@ msgid ""
 msgstr ""
 
 #. i18n: file korganizer.kcfg line 81
-#: rc.cpp:513 rc.cpp:1100
+#: rc.cpp:516 rc.cpp:1146
 #, no-c-format
 msgid "New Events, To-dos and Journal Entries Should"
 msgstr ""
 
 #. i18n: file korganizer.kcfg line 84
-#: rc.cpp:516 rc.cpp:1103
+#: rc.cpp:519 rc.cpp:1149
 #, no-c-format
 msgid "Be added to the standard resource"
 msgstr ""
 
 #. i18n: file korganizer.kcfg line 85
-#: rc.cpp:519 rc.cpp:1106
+#: rc.cpp:522 rc.cpp:1152
 #, no-c-format
 msgid ""
 "Select this option to always record new events, to-dos and journal entries "
@@ -3521,13 +5093,13 @@ msgid ""
 msgstr ""
 
 #. i18n: file korganizer.kcfg line 88
-#: rc.cpp:522 rc.cpp:1109
+#: rc.cpp:525 rc.cpp:1155
 #, no-c-format
 msgid "Be asked which resource to use"
 msgstr ""
 
 #. i18n: file korganizer.kcfg line 89
-#: rc.cpp:525 rc.cpp:1112
+#: rc.cpp:528 rc.cpp:1158
 #, no-c-format
 msgid ""
 "Select this option to choose the resource to be used to record the item each "
@@ -3537,13 +5109,13 @@ msgid ""
 msgstr ""
 
 #. i18n: file korganizer.kcfg line 98
-#: rc.cpp:528 rc.cpp:1115
+#: rc.cpp:531 rc.cpp:1161
 #, no-c-format
 msgid "Send copy to owner when mailing events"
 msgstr ""
 
 #. i18n: file korganizer.kcfg line 99
-#: rc.cpp:531 rc.cpp:1118
+#: rc.cpp:534 rc.cpp:1164
 #, no-c-format
 msgid ""
 "Check this box to get a copy of all e-mail messages that KOrganizer sends at "
@@ -3551,28 +5123,28 @@ msgid ""
 msgstr ""
 
 #. i18n: file korganizer.kcfg line 103
-#: rc.cpp:534 rc.cpp:1121
+#: rc.cpp:537 rc.cpp:1167
 #, no-c-format
 msgid "Use email settings from Control Center"
 msgstr ""
 
 #. i18n: file korganizer.kcfg line 104
-#: rc.cpp:537 rc.cpp:1124
+#: rc.cpp:540 rc.cpp:1170
 #, no-c-format
 msgid ""
 "Check this box to use the TDE-wide e-mail settings, which are defined using the "
-"Trinity Control Center &quot;Password & User Account&quot; Module. Uncheck this box "
-"to be able to specify your full name and e-mail."
+"Trinity Control Center &quot;Password & User Account&quot; Module. Uncheck this "
+"box to be able to specify your full name and e-mail."
 msgstr ""
 
 #. i18n: file korganizer.kcfg line 108
-#: rc.cpp:540 rc.cpp:1127
+#: rc.cpp:543 rc.cpp:1173
 #, no-c-format
 msgid "Full &name"
 msgstr "ชื่อเต็ม"
 
 #. i18n: file korganizer.kcfg line 109
-#: rc.cpp:543 rc.cpp:1130
+#: rc.cpp:546 rc.cpp:1176
 #, no-c-format
 msgid ""
 "Enter your full name here. This name will be displayed as \"Organizer\" in "
@@ -3580,13 +5152,13 @@ msgid ""
 msgstr ""
 
 #. i18n: file korganizer.kcfg line 113
-#: rc.cpp:546 rc.cpp:1133
+#: rc.cpp:549 rc.cpp:1179
 #, no-c-format
 msgid "E&mail address"
 msgstr "ที่อยู่อีเมล"
 
 #. i18n: file korganizer.kcfg line 114
-#: rc.cpp:549 rc.cpp:1136
+#: rc.cpp:552 rc.cpp:1182
 #, no-c-format
 msgid ""
 "Enter here your e-mail address. This e-mail address will be used to identify "
@@ -3594,19 +5166,19 @@ msgid ""
 msgstr ""
 
 #. i18n: file korganizer.kcfg line 118
-#: rc.cpp:552 rc.cpp:1139
+#: rc.cpp:555 rc.cpp:1185
 #, no-c-format
 msgid "Mail Client"
 msgstr ""
 
 #. i18n: file korganizer.kcfg line 121
-#: rc.cpp:555 rc.cpp:1142
+#: rc.cpp:558 rc.cpp:1188
 #, no-c-format
 msgid "KMail"
 msgstr ""
 
 #. i18n: file korganizer.kcfg line 122
-#: rc.cpp:558 rc.cpp:1145
+#: rc.cpp:561 rc.cpp:1191
 #, no-c-format
 msgid ""
 "Select this option to use KMail as the mail transport. The mail transport is "
@@ -3614,13 +5186,13 @@ msgid ""
 msgstr ""
 
 #. i18n: file korganizer.kcfg line 125
-#: rc.cpp:561 rc.cpp:1148
+#: rc.cpp:564 rc.cpp:1194
 #, no-c-format
 msgid "Sendmail"
 msgstr ""
 
 #. i18n: file korganizer.kcfg line 126
-#: rc.cpp:564 rc.cpp:1151
+#: rc.cpp:567 rc.cpp:1197
 #, no-c-format
 msgid ""
 "Select this option to use sendmail as the mail transport. The mail transport is "
@@ -3629,13 +5201,13 @@ msgid ""
 msgstr ""
 
 #. i18n: file korganizer.kcfg line 142
-#: rc.cpp:576 rc.cpp:1163
+#: rc.cpp:579 rc.cpp:1209
 #, no-c-format
 msgid "Default appointment time"
 msgstr ""
 
 #. i18n: file korganizer.kcfg line 143
-#: rc.cpp:579 rc.cpp:1166
+#: rc.cpp:582 rc.cpp:1212
 #, no-c-format
 msgid ""
 "Enter the default time for events here. The default is used if you do not "
@@ -3643,52 +5215,144 @@ msgid ""
 msgstr ""
 
 #. i18n: file korganizer.kcfg line 147
-#: rc.cpp:582 rc.cpp:1169
+#: rc.cpp:585 rc.cpp:1215
 #, no-c-format
 msgid "Default duration of new appointment (HH:MM)"
 msgstr ""
 
 #. i18n: file korganizer.kcfg line 148
-#: rc.cpp:585 rc.cpp:1172
+#: rc.cpp:588 rc.cpp:1218
 #, no-c-format
 msgid ""
 "Enter default duration for events here. The default is used if you do not "
 "supply an end time."
 msgstr ""
 
-#. i18n: file korganizer.kcfg line 152
-#: rc.cpp:588 rc.cpp:1175
+#. i18n: file korganizer.kcfg line 153
+#: rc.cpp:591 rc.cpp:1221
+#, fuzzy, no-c-format
+msgid "Default reminder time"
+msgstr "เวลาปริยายในการเตือน:"
+
+#. i18n: file korganizer.kcfg line 154
+#: rc.cpp:594 rc.cpp:1224
 #, no-c-format
-msgid "Default Reminder Time"
+msgid ""
+"Enter the default reminder time for all newly created items. The time unit is "
+"specified in the adjacent combobox."
 msgstr ""
 
-#. i18n: file korganizer.kcfg line 153
-#: rc.cpp:591 rc.cpp:1178
+#. i18n: file korganizer.kcfg line 155
+#: rc.cpp:597 rc.cpp:1227
+#, fuzzy, no-c-format
+msgid "Default time for reminders"
+msgstr "เวลาปริยายในการเตือน:"
+
+#. i18n: file korganizer.kcfg line 159
+#: rc.cpp:600 rc.cpp:1230
 #, no-c-format
-msgid "Enter the reminder time here."
+msgid ""
+"Enter the default reminder time units for all newly created items. The time is "
+"specified in the adjacent spinbox."
 msgstr ""
 
 #. i18n: file korganizer.kcfg line 160
-#: rc.cpp:594 rc.cpp:1181
+#: rc.cpp:603 rc.cpp:1233
+#, fuzzy, no-c-format
+msgid "Default time unit for reminders"
+msgstr "เวลาปริยายในการเตือน:"
+
+#. i18n: file korganizer.kcfg line 164
+#: rc.cpp:606 rc.cpp:1236
+#, no-c-format
+msgid "Enable a default sound file for audio reminders"
+msgstr ""
+
+#. i18n: file korganizer.kcfg line 165
+#: rc.cpp:609 rc.cpp:1239
+#, no-c-format
+msgid ""
+"Check this box if you want to enable the specified file to be used as the "
+"default sound file for new reminders. You can always specify another file in "
+"the Advanced Reminder accessible from the Event or To-do editors."
+msgstr ""
+
+#. i18n: file korganizer.kcfg line 169
+#: rc.cpp:612 rc.cpp:1242
+#, fuzzy, no-c-format
+msgid "Default audio file"
+msgstr "เวลาปริยายในการเตือน:"
+
+#. i18n: file korganizer.kcfg line 170
+#: rc.cpp:615 rc.cpp:1245
+#, no-c-format
+msgid ""
+"Set a file to be used as the default sound file for new reminders. You can "
+"always specify another file in the Advanced Reminder accessible from the Event "
+"or To-do editors."
+msgstr ""
+
+#. i18n: file korganizer.kcfg line 173
+#: rc.cpp:618 rc.cpp:1248
+#, no-c-format
+msgid "Enable reminders for new Events"
+msgstr ""
+
+#. i18n: file korganizer.kcfg line 174
+#: rc.cpp:621 rc.cpp:1251
+#, no-c-format
+msgid ""
+"Check this box if you want to enable reminders for all newly created Events. "
+"You can always turn-off the reminders in the Event editor dialog."
+msgstr ""
+
+#. i18n: file korganizer.kcfg line 175
+#: rc.cpp:624 rc.cpp:1254
+#, no-c-format
+msgid "By default, enable reminders for new events"
+msgstr ""
+
+#. i18n: file korganizer.kcfg line 179
+#: rc.cpp:627 rc.cpp:1257
+#, no-c-format
+msgid "Enable reminders for new To-dos"
+msgstr ""
+
+#. i18n: file korganizer.kcfg line 180
+#: rc.cpp:630 rc.cpp:1260
+#, no-c-format
+msgid ""
+"Check this box if you want to enable reminders for all newly created To-dos. "
+"You can always turn-off the reminders in the To-do editor dialog."
+msgstr ""
+
+#. i18n: file korganizer.kcfg line 181
+#: rc.cpp:633 rc.cpp:1263
+#, no-c-format
+msgid "By default, enable reminders for new to-dos"
+msgstr ""
+
+#. i18n: file korganizer.kcfg line 188
+#: rc.cpp:636 rc.cpp:1266
 #, no-c-format
 msgid "Hour size"
 msgstr ""
 
-#. i18n: file korganizer.kcfg line 161
-#: rc.cpp:597 rc.cpp:1184
+#. i18n: file korganizer.kcfg line 189
+#: rc.cpp:639 rc.cpp:1269
 #, no-c-format
 msgid ""
 "Select on this spin box the height of the hour rows in the schedule view."
 msgstr ""
 
-#. i18n: file korganizer.kcfg line 167
-#: rc.cpp:600 rc.cpp:1187
+#. i18n: file korganizer.kcfg line 195
+#: rc.cpp:642 rc.cpp:1272
 #, no-c-format
 msgid "Show events that recur daily in date navigator"
 msgstr ""
 
-#. i18n: file korganizer.kcfg line 168
-#: rc.cpp:603 rc.cpp:1190
+#. i18n: file korganizer.kcfg line 196
+#: rc.cpp:645 rc.cpp:1275
 #, no-c-format
 msgid ""
 "Check this box to show the days containing daily recurring events in bold "
@@ -3696,14 +5360,14 @@ msgid ""
 "(non daily recurring) events."
 msgstr ""
 
-#. i18n: file korganizer.kcfg line 172
-#: rc.cpp:606 rc.cpp:1193
+#. i18n: file korganizer.kcfg line 200
+#: rc.cpp:648 rc.cpp:1278
 #, no-c-format
 msgid "Show events that recur weekly in date navigator"
 msgstr ""
 
-#. i18n: file korganizer.kcfg line 173
-#: rc.cpp:609 rc.cpp:1196
+#. i18n: file korganizer.kcfg line 201
+#: rc.cpp:651 rc.cpp:1281
 #, no-c-format
 msgid ""
 "Check this box to show the days containing weekly recurring events in bold "
@@ -3711,56 +5375,70 @@ msgid ""
 "(non weekly recurring) events."
 msgstr ""
 
-#. i18n: file korganizer.kcfg line 177
-#: rc.cpp:612 rc.cpp:1199
+#. i18n: file korganizer.kcfg line 205
+#: rc.cpp:654 rc.cpp:1284
+#, no-c-format
+msgid "Week numbers select a work week when in work week view"
+msgstr ""
+
+#. i18n: file korganizer.kcfg line 206
+#: rc.cpp:657 rc.cpp:1287
+#, no-c-format
+msgid ""
+"Check this box to select a work week when clicking on date navigator's week "
+"numbers or uncheck it to chose the whole week."
+msgstr ""
+
+#. i18n: file korganizer.kcfg line 210
+#: rc.cpp:660 rc.cpp:1290
 #, no-c-format
 msgid "Enable tooltips displaying summary of events"
 msgstr ""
 
-#. i18n: file korganizer.kcfg line 178
-#: rc.cpp:615 rc.cpp:1202
+#. i18n: file korganizer.kcfg line 211
+#: rc.cpp:663 rc.cpp:1293
 #, no-c-format
 msgid ""
 "Check this box to display an event summary tooltip when hovering the mouse over "
 "an event."
 msgstr ""
 
-#. i18n: file korganizer.kcfg line 182
-#: rc.cpp:618 rc.cpp:1205
+#. i18n: file korganizer.kcfg line 215
+#: rc.cpp:666 rc.cpp:1296
 #, no-c-format
 msgid "Show to-dos in day, week and month views"
 msgstr ""
 
-#. i18n: file korganizer.kcfg line 183
-#: rc.cpp:621 rc.cpp:1208
+#. i18n: file korganizer.kcfg line 216
+#: rc.cpp:669 rc.cpp:1299
 #, no-c-format
 msgid ""
 "Check this box to display to-dos in the day, week, and month view. This is "
 "helpful when you have a lot of (recurring) to-dos."
 msgstr ""
 
-#. i18n: file korganizer.kcfg line 187
-#: rc.cpp:624 rc.cpp:1211
+#. i18n: file korganizer.kcfg line 220
+#: rc.cpp:672 rc.cpp:1302
 #, no-c-format
 msgid "Enable scrollbars in month view cells"
 msgstr ""
 
-#. i18n: file korganizer.kcfg line 188
-#: rc.cpp:627 rc.cpp:1214
+#. i18n: file korganizer.kcfg line 221
+#: rc.cpp:675 rc.cpp:1305
 #, no-c-format
 msgid ""
 "Check this box to display scrollbars when clicking on a cell in the month view; "
 "they will only appear when needed though."
 msgstr ""
 
-#. i18n: file korganizer.kcfg line 192
-#: rc.cpp:630 rc.cpp:1217
+#. i18n: file korganizer.kcfg line 225
+#: rc.cpp:678 rc.cpp:1308
 #, no-c-format
 msgid "Time range selection in agenda view starts event editor"
 msgstr ""
 
-#. i18n: file korganizer.kcfg line 193
-#: rc.cpp:633 rc.cpp:1220
+#. i18n: file korganizer.kcfg line 226
+#: rc.cpp:681 rc.cpp:1311
 #, no-c-format
 msgid ""
 "Check this box to start the event editor automatically when you select a time "
@@ -3768,182 +5446,168 @@ msgid ""
 "the start time to the end time of the event you are about to plan."
 msgstr ""
 
-#. i18n: file korganizer.kcfg line 198
-#: rc.cpp:636 rc.cpp:1223
+#. i18n: file korganizer.kcfg line 231
+#: rc.cpp:684 rc.cpp:1314
 #, no-c-format
 msgid "Show current-time (Marcus Bains) line"
 msgstr ""
 
-#. i18n: file korganizer.kcfg line 199
-#: rc.cpp:639 rc.cpp:1226
+#. i18n: file korganizer.kcfg line 232
+#: rc.cpp:687 rc.cpp:1317
 #, no-c-format
 msgid ""
 "Check this box to display a red line in the day or week view indicating the "
 "current-time line (Marcus Bains line)."
 msgstr ""
 
-#. i18n: file korganizer.kcfg line 203
-#: rc.cpp:642 rc.cpp:1229
+#. i18n: file korganizer.kcfg line 236
+#: rc.cpp:690 rc.cpp:1320
 #, no-c-format
 msgid "Show seconds on current-time line"
 msgstr ""
 
-#. i18n: file korganizer.kcfg line 204
-#: rc.cpp:645 rc.cpp:1232
+#. i18n: file korganizer.kcfg line 237
+#: rc.cpp:693 rc.cpp:1323
 #, no-c-format
 msgid "Check this box if you want to show seconds on the current-time line."
 msgstr ""
 
-#. i18n: file korganizer.kcfg line 209
-#: rc.cpp:648 rc.cpp:1235
+#. i18n: file korganizer.kcfg line 242
+#: rc.cpp:696 rc.cpp:1326
 #, no-c-format
 msgid "Colors used in agenda view"
 msgstr ""
 
-#. i18n: file korganizer.kcfg line 210
-#: rc.cpp:651 rc.cpp:1238
+#. i18n: file korganizer.kcfg line 243
+#: rc.cpp:699 rc.cpp:1329
 #, no-c-format
 msgid "Choose the colors of the agenda view items."
 msgstr ""
 
-#. i18n: file korganizer.kcfg line 213
-#: rc.cpp:654 rc.cpp:1241
+#. i18n: file korganizer.kcfg line 246
+#: rc.cpp:702 rc.cpp:756 rc.cpp:1332 rc.cpp:1386
 #, no-c-format
 msgid "Category inside, calendar outside"
 msgstr ""
 
-#. i18n: file korganizer.kcfg line 216
-#: rc.cpp:657 rc.cpp:1244
+#. i18n: file korganizer.kcfg line 249
+#: rc.cpp:705 rc.cpp:759 rc.cpp:1335 rc.cpp:1389
 #, no-c-format
 msgid "Calendar inside, category outside"
 msgstr ""
 
-#. i18n: file korganizer.kcfg line 219
-#: rc.cpp:660 rc.cpp:1247
+#. i18n: file korganizer.kcfg line 252
+#: rc.cpp:708 rc.cpp:762 rc.cpp:1338 rc.cpp:1392
 #, no-c-format
 msgid "Only category"
 msgstr ""
 
-#. i18n: file korganizer.kcfg line 222
-#: rc.cpp:663 rc.cpp:1250
+#. i18n: file korganizer.kcfg line 255
+#: rc.cpp:711 rc.cpp:765 rc.cpp:1341 rc.cpp:1395
 #, fuzzy, no-c-format
 msgid "Only calendar"
 msgstr "ปฏิทิน"
 
-#. i18n: file korganizer.kcfg line 229
-#: rc.cpp:666 rc.cpp:1253
+#. i18n: file korganizer.kcfg line 262
+#: rc.cpp:714 rc.cpp:1344
 #, no-c-format
 msgid "Agenda View Calendar Display"
 msgstr ""
 
-#. i18n: file korganizer.kcfg line 232
-#: rc.cpp:669 rc.cpp:1256
+#. i18n: file korganizer.kcfg line 265
+#: rc.cpp:717 rc.cpp:1347
 #, no-c-format
 msgid "Merge all calendars into one view"
 msgstr ""
 
-#. i18n: file korganizer.kcfg line 235
-#: rc.cpp:672 rc.cpp:1259
+#. i18n: file korganizer.kcfg line 268
+#: rc.cpp:720 rc.cpp:1350
 #, no-c-format
 msgid "Show calendars side by side"
 msgstr ""
 
-#. i18n: file korganizer.kcfg line 238
-#: rc.cpp:675 rc.cpp:1262
+#. i18n: file korganizer.kcfg line 271
+#: rc.cpp:723 rc.cpp:1353
 #, no-c-format
 msgid "Switch between views with tabs"
 msgstr ""
 
-#. i18n: file korganizer.kcfg line 247
-#: rc.cpp:678 rc.cpp:1265
+#. i18n: file korganizer.kcfg line 278
+#: rc.cpp:726 rc.cpp:1356
 #, no-c-format
 msgid "Day begins at"
 msgstr ""
 
-#. i18n: file korganizer.kcfg line 248
-#: rc.cpp:681 rc.cpp:1268
+#. i18n: file korganizer.kcfg line 279
+#: rc.cpp:729 rc.cpp:1359
 #, no-c-format
 msgid ""
 "Enter the start time for events here. This time should be the earliest time "
 "that you use for events, as it will be displayed at the top."
 msgstr ""
 
-#. i18n: file korganizer.kcfg line 253
-#: rc.cpp:684 rc.cpp:1271
+#. i18n: file korganizer.kcfg line 284
+#: rc.cpp:732 rc.cpp:1362
 #, no-c-format
 msgid "Daily starting hour"
 msgstr ""
 
-#. i18n: file korganizer.kcfg line 254
-#: rc.cpp:687 rc.cpp:1274
+#. i18n: file korganizer.kcfg line 285
+#: rc.cpp:735 rc.cpp:1365
 #, no-c-format
 msgid ""
 "Enter the start time for the working hours here. The working hours will be "
 "marked with color by KOrganizer."
 msgstr ""
 
-#. i18n: file korganizer.kcfg line 258
-#: rc.cpp:690 rc.cpp:1277
+#. i18n: file korganizer.kcfg line 289
+#: rc.cpp:738 rc.cpp:1368
 #, no-c-format
 msgid "Daily ending hour"
 msgstr ""
 
-#. i18n: file korganizer.kcfg line 259
-#: rc.cpp:693 rc.cpp:1280
+#. i18n: file korganizer.kcfg line 290
+#: rc.cpp:741 rc.cpp:1371
 #, no-c-format
 msgid ""
 "Enter the ending time for the working hours here. The working hours will be "
 "marked with color by KOrganizer."
 msgstr ""
 
-#. i18n: file korganizer.kcfg line 266
-#: rc.cpp:696 rc.cpp:1283
+#. i18n: file korganizer.kcfg line 297
+#: rc.cpp:744 rc.cpp:1374
 #, no-c-format
 msgid "Exclude holidays"
 msgstr ""
 
-#. i18n: file korganizer.kcfg line 267
-#: rc.cpp:699 rc.cpp:1286
+#. i18n: file korganizer.kcfg line 298
+#: rc.cpp:747 rc.cpp:1377
 #, no-c-format
 msgid ""
 "Check this box to prevent KOrganizer from marking the working hours on "
 "holidays."
 msgstr ""
 
-#. i18n: file korganizer.kcfg line 272
-#: rc.cpp:702 rc.cpp:1289
-#, no-c-format
-msgid "Month view uses category colors"
-msgstr ""
-
-#. i18n: file korganizer.kcfg line 273
-#: rc.cpp:705 rc.cpp:1292
+#. i18n: file korganizer.kcfg line 303
+#: rc.cpp:750 rc.cpp:1380
 #, no-c-format
-msgid ""
-"Check this box to make the month view use the category colors of an item."
+msgid "Colors used in month view"
 msgstr ""
 
-#. i18n: file korganizer.kcfg line 278
-#: rc.cpp:708 rc.cpp:1295
+#. i18n: file korganizer.kcfg line 304
+#: rc.cpp:753 rc.cpp:1383
 #, no-c-format
-msgid "Month view uses resource colors"
+msgid "Choose the colors of the month view items."
 msgstr ""
 
-#. i18n: file korganizer.kcfg line 279
-#: rc.cpp:711 rc.cpp:1298
-#, no-c-format
-msgid ""
-"Check this box to make the month view use the resource colors of an item."
-msgstr ""
-
-#. i18n: file korganizer.kcfg line 284
-#: rc.cpp:714 rc.cpp:1301
+#. i18n: file korganizer.kcfg line 323
+#: rc.cpp:768 rc.cpp:1398
 #, no-c-format
 msgid "Month view uses full window"
 msgstr ""
 
-#. i18n: file korganizer.kcfg line 285
-#: rc.cpp:717 rc.cpp:1304
+#. i18n: file korganizer.kcfg line 324
+#: rc.cpp:771 rc.cpp:1401
 #, no-c-format
 msgid ""
 "Check this box to use the full KOrganizer window when displaying the month "
@@ -3952,14 +5616,14 @@ msgid ""
 "resources list, will not be displayed."
 msgstr ""
 
-#. i18n: file korganizer.kcfg line 289
-#: rc.cpp:720 rc.cpp:1307
+#. i18n: file korganizer.kcfg line 328
+#: rc.cpp:774 rc.cpp:1404
 #, no-c-format
 msgid "To-do list view uses full window"
 msgstr ""
 
-#. i18n: file korganizer.kcfg line 290
-#: rc.cpp:723 rc.cpp:1310
+#. i18n: file korganizer.kcfg line 329
+#: rc.cpp:777 rc.cpp:1407
 #, no-c-format
 msgid ""
 "Check this box to use the full KOrganizer window when displaying the to-do list "
@@ -3968,28 +5632,28 @@ msgid ""
 "resources list, will not be displayed."
 msgstr ""
 
-#. i18n: file korganizer.kcfg line 295
-#: rc.cpp:726 rc.cpp:1313
+#. i18n: file korganizer.kcfg line 334
+#: rc.cpp:780 rc.cpp:1410
 #, no-c-format
 msgid "Record completed to-dos in journal entries"
 msgstr ""
 
-#. i18n: file korganizer.kcfg line 296
-#: rc.cpp:729 rc.cpp:1316
+#. i18n: file korganizer.kcfg line 335
+#: rc.cpp:783 rc.cpp:1413
 #, no-c-format
 msgid ""
 "Check this box to record the completion of a to-do in a new entry of your "
 "journal automatically."
 msgstr ""
 
-#. i18n: file korganizer.kcfg line 305
-#: rc.cpp:732 rc.cpp:1319
+#. i18n: file korganizer.kcfg line 344
+#: rc.cpp:786 rc.cpp:1416
 #, no-c-format
 msgid "Next x days"
 msgstr ""
 
-#. i18n: file korganizer.kcfg line 306
-#: rc.cpp:735 rc.cpp:1322
+#. i18n: file korganizer.kcfg line 345
+#: rc.cpp:789 rc.cpp:1419
 #, no-c-format
 msgid ""
 "Select on this spin box the number of &quot;x&quot; days to be displayed in the "
@@ -3997,14 +5661,14 @@ msgid ""
 "&quot;Next X Days&quot; menu item from the &quot;View&quot; menu."
 msgstr ""
 
-#. i18n: file korganizer.kcfg line 348
-#: rc.cpp:738 rc.cpp:1325
+#. i18n: file korganizer.kcfg line 387
+#: rc.cpp:792 rc.cpp:1422
 #, no-c-format
 msgid "Use Groupware communication"
 msgstr ""
 
-#. i18n: file korganizer.kcfg line 349
-#: rc.cpp:741 rc.cpp:1328
+#. i18n: file korganizer.kcfg line 388
+#: rc.cpp:795 rc.cpp:1425
 #, no-c-format
 msgid ""
 "Check this box to enable automatic generation of mails when creating, updating "
@@ -4013,111 +5677,111 @@ msgid ""
 "a TDE Kolab client)."
 msgstr ""
 
-#. i18n: file korganizer.kcfg line 357
-#: rc.cpp:744 rc.cpp:1331
+#. i18n: file korganizer.kcfg line 396
+#: rc.cpp:798 rc.cpp:1428
 #, no-c-format
 msgid "Send Outlook-like pseudo counter proposals"
 msgstr ""
 
-#. i18n: file korganizer.kcfg line 365
-#: rc.cpp:747 rc.cpp:1334
+#. i18n: file korganizer.kcfg line 404
+#: rc.cpp:801 rc.cpp:1431
 #, no-c-format
 msgid "Holiday color"
 msgstr ""
 
-#. i18n: file korganizer.kcfg line 366
-#: rc.cpp:750 rc.cpp:1337
+#. i18n: file korganizer.kcfg line 405
+#: rc.cpp:804 rc.cpp:1434
 #, no-c-format
 msgid ""
 "Select the holiday color here. The holiday color will be used for the holiday "
 "name in the month view and the holiday number in the date navigator."
 msgstr ""
 
-#. i18n: file korganizer.kcfg line 370
-#: rc.cpp:753 rc.cpp:1340
+#. i18n: file korganizer.kcfg line 409
+#: rc.cpp:807 rc.cpp:1437
 #, no-c-format
 msgid "Highlight color"
 msgstr ""
 
-#. i18n: file korganizer.kcfg line 371
-#: rc.cpp:756 rc.cpp:1343
+#. i18n: file korganizer.kcfg line 410
+#: rc.cpp:810 rc.cpp:1440
 #, no-c-format
 msgid ""
 "Select the highlight color here. The highlight color will be used for marking "
 "the currently selected area in your agenda and in the date navigator."
 msgstr ""
 
-#. i18n: file korganizer.kcfg line 375
-#: rc.cpp:759 rc.cpp:1346
+#. i18n: file korganizer.kcfg line 414
+#: rc.cpp:813 rc.cpp:1443
 #, no-c-format
 msgid "Agenda view background color"
 msgstr ""
 
-#. i18n: file korganizer.kcfg line 376
-#: rc.cpp:762 rc.cpp:1349
+#. i18n: file korganizer.kcfg line 415
+#: rc.cpp:816 rc.cpp:1446
 #, no-c-format
 msgid "Select the agenda view background color here."
 msgstr ""
 
-#. i18n: file korganizer.kcfg line 380
-#: rc.cpp:765 rc.cpp:1352
+#. i18n: file korganizer.kcfg line 419
+#: rc.cpp:819 rc.cpp:1449
 #, no-c-format
 msgid "Working hours color"
 msgstr ""
 
-#. i18n: file korganizer.kcfg line 381
-#: rc.cpp:768 rc.cpp:1355
+#. i18n: file korganizer.kcfg line 420
+#: rc.cpp:822 rc.cpp:1452
 #, no-c-format
 msgid "Select the working hours color for the agenda view here."
 msgstr ""
 
-#. i18n: file korganizer.kcfg line 385
-#: rc.cpp:771 rc.cpp:1358
+#. i18n: file korganizer.kcfg line 424
+#: rc.cpp:825 rc.cpp:1455
 #, no-c-format
 msgid "To-do due today color"
 msgstr ""
 
-#. i18n: file korganizer.kcfg line 386
-#: rc.cpp:774 rc.cpp:1361
+#. i18n: file korganizer.kcfg line 425
+#: rc.cpp:828 rc.cpp:1458
 #, no-c-format
 msgid "Select the to-do due today color here."
 msgstr ""
 
-#. i18n: file korganizer.kcfg line 390
-#: rc.cpp:777 rc.cpp:1364
+#. i18n: file korganizer.kcfg line 429
+#: rc.cpp:831 rc.cpp:1461
 #, no-c-format
 msgid "To-do overdue color"
 msgstr ""
 
-#. i18n: file korganizer.kcfg line 391
-#: rc.cpp:780 rc.cpp:1367
+#. i18n: file korganizer.kcfg line 430
+#: rc.cpp:834 rc.cpp:1464
 #, no-c-format
 msgid "Select the to-do overdue color here."
 msgstr ""
 
-#. i18n: file korganizer.kcfg line 395
-#: rc.cpp:783 rc.cpp:1370
+#. i18n: file korganizer.kcfg line 434
+#: rc.cpp:837 rc.cpp:1467
 #, no-c-format
-msgid "Default event color"
+msgid "\"No category\" color (for \"Only category\" drawing schemes)"
 msgstr ""
 
-#. i18n: file korganizer.kcfg line 396
-#: rc.cpp:786 rc.cpp:1373
+#. i18n: file korganizer.kcfg line 435
+#: rc.cpp:840 rc.cpp:1470
 #, no-c-format
 msgid ""
-"Select the default event color here. The default event color will be used for "
-"events categories in your agenda. Note that you can specify a separate color "
-"for each event category below."
+"Select a color to use for the \"no category\" or \"unset category\" situation, "
+"when an item does not belong to any category. This color is used when drawing "
+"items in the agenda or month views using the \"Only category\" scheme."
 msgstr ""
 
-#. i18n: file korganizer.kcfg line 414
-#: rc.cpp:789 rc.cpp:1376
+#. i18n: file korganizer.kcfg line 453
+#: rc.cpp:843 rc.cpp:1473
 #, no-c-format
 msgid "Time bar"
 msgstr ""
 
-#. i18n: file korganizer.kcfg line 415
-#: rc.cpp:792 rc.cpp:1379
+#. i18n: file korganizer.kcfg line 454
+#: rc.cpp:846 rc.cpp:1476
 #, no-c-format
 msgid ""
 "Press this button to configure the time bar font. The time bar is the widget "
@@ -4125,14 +5789,14 @@ msgid ""
 "Font&quot; dialog, allowing you to choose the hour font for the time bar."
 msgstr ""
 
-#. i18n: file korganizer.kcfg line 418
-#: rc.cpp:795 rc.cpp:1382
+#. i18n: file korganizer.kcfg line 457
+#: rc.cpp:849 rc.cpp:1479
 #, no-c-format
 msgid "Agenda view"
 msgstr ""
 
-#. i18n: file korganizer.kcfg line 419
-#: rc.cpp:798 rc.cpp:1385
+#. i18n: file korganizer.kcfg line 458
+#: rc.cpp:852 rc.cpp:1482
 #, no-c-format
 msgid ""
 "Press this button to configure the agenda view font. This button will open the "
@@ -4140,14 +5804,14 @@ msgid ""
 "in the agenda view."
 msgstr ""
 
-#. i18n: file korganizer.kcfg line 422
-#: rc.cpp:801 rc.cpp:1388
+#. i18n: file korganizer.kcfg line 461
+#: rc.cpp:855 rc.cpp:1485
 #, no-c-format
 msgid "Current-time line"
 msgstr ""
 
-#. i18n: file korganizer.kcfg line 423
-#: rc.cpp:804 rc.cpp:1391
+#. i18n: file korganizer.kcfg line 462
+#: rc.cpp:858 rc.cpp:1488
 #, no-c-format
 msgid ""
 "Press this button to configure the current-time line font. This button will "
@@ -4155,14 +5819,14 @@ msgid ""
 "the current-time line in the agenda view."
 msgstr ""
 
-#. i18n: file korganizer.kcfg line 426
-#: rc.cpp:807 rc.cpp:1394
+#. i18n: file korganizer.kcfg line 465
+#: rc.cpp:861 rc.cpp:1491
 #, no-c-format
 msgid "Month view"
 msgstr ""
 
-#. i18n: file korganizer.kcfg line 427
-#: rc.cpp:810 rc.cpp:1397
+#. i18n: file korganizer.kcfg line 466
+#: rc.cpp:864 rc.cpp:1494
 #, no-c-format
 msgid ""
 "Press this button to configure the month view font. This button will open the "
@@ -4170,56 +5834,56 @@ msgid ""
 "in the month view."
 msgstr ""
 
-#. i18n: file korganizer.kcfg line 445
-#: rc.cpp:813 rc.cpp:1400
+#. i18n: file korganizer.kcfg line 484
+#: rc.cpp:867 rc.cpp:1497
 #, no-c-format
 msgid "Free/Busy Publish URL"
 msgstr ""
 
-#. i18n: file korganizer.kcfg line 446
-#: rc.cpp:816 rc.cpp:1403
+#. i18n: file korganizer.kcfg line 485
+#: rc.cpp:870 rc.cpp:1500
 #, no-c-format
 msgid "URL for publishing free/busy information"
 msgstr ""
 
-#. i18n: file korganizer.kcfg line 449
-#: rc.cpp:819 rc.cpp:1406
+#. i18n: file korganizer.kcfg line 488
+#: rc.cpp:873 rc.cpp:1503
 #, no-c-format
 msgid "Free/Busy Publish Username"
 msgstr ""
 
-#. i18n: file korganizer.kcfg line 450
-#: rc.cpp:822 rc.cpp:1409
+#. i18n: file korganizer.kcfg line 489
+#: rc.cpp:876 rc.cpp:1506
 #, no-c-format
 msgid "Username for publishing free/busy information"
 msgstr ""
 
-#. i18n: file korganizer.kcfg line 453
-#: rc.cpp:825 rc.cpp:1412
+#. i18n: file korganizer.kcfg line 492
+#: rc.cpp:879 rc.cpp:1509
 #, no-c-format
 msgid "Free/Busy Publish Password"
 msgstr ""
 
-#. i18n: file korganizer.kcfg line 454
-#: rc.cpp:828 rc.cpp:1415
+#. i18n: file korganizer.kcfg line 493
+#: rc.cpp:882 rc.cpp:1512
 #, no-c-format
 msgid "Password for publishing free/busy information"
 msgstr ""
 
-#. i18n: file korganizer.kcfg line 461
-#: rc.cpp:831 rc.cpp:1418
+#. i18n: file korganizer.kcfg line 500
+#: rc.cpp:885 rc.cpp:1515
 #, no-c-format
 msgid "Enable Automatic Free/Busy Retrieval"
 msgstr ""
 
-#. i18n: file korganizer.kcfg line 466
-#: rc.cpp:834 rc.cpp:1421
+#. i18n: file korganizer.kcfg line 505
+#: rc.cpp:888 rc.cpp:1518
 #, no-c-format
 msgid "Check whether hostname and retrieval email address match"
 msgstr ""
 
-#. i18n: file korganizer.kcfg line 467
-#: rc.cpp:837 rc.cpp:1424
+#. i18n: file korganizer.kcfg line 506
+#: rc.cpp:891 rc.cpp:1521
 #, no-c-format
 msgid ""
 "With this setting you can configure whether the domain part of the free/busy "
@@ -4228,14 +5892,14 @@ msgid ""
 "joe@mydomain.com on the server www.yourdomain.com won't work."
 msgstr ""
 
-#. i18n: file korganizer.kcfg line 472
-#: rc.cpp:840 rc.cpp:1427
+#. i18n: file korganizer.kcfg line 511
+#: rc.cpp:894 rc.cpp:1524
 #, no-c-format
 msgid "Use full email address for retrieval"
 msgstr ""
 
-#. i18n: file korganizer.kcfg line 473
-#: rc.cpp:843 rc.cpp:1430
+#. i18n: file korganizer.kcfg line 512
+#: rc.cpp:897 rc.cpp:1527
 #, no-c-format
 msgid ""
 "With this setting, you can change the filename that will be fetched from the "
@@ -4244,352 +5908,370 @@ msgid ""
 "user.ifb, for example nn.ifb."
 msgstr ""
 
-#. i18n: file korganizer.kcfg line 478
-#: rc.cpp:846 rc.cpp:1433
+#. i18n: file korganizer.kcfg line 517
+#: rc.cpp:900 rc.cpp:1530
 #, no-c-format
 msgid "Free/Busy Retrieval URL"
 msgstr ""
 
-#. i18n: file korganizer.kcfg line 481
-#: rc.cpp:849 rc.cpp:1436
+#. i18n: file korganizer.kcfg line 520
+#: rc.cpp:903 rc.cpp:1533
 #, no-c-format
 msgid "Free/Busy Retrieval Username"
 msgstr ""
 
-#. i18n: file korganizer.kcfg line 484
-#: rc.cpp:852 rc.cpp:1439
+#. i18n: file korganizer.kcfg line 523
+#: rc.cpp:906 rc.cpp:1536
 #, no-c-format
 msgid "Free/Busy Retrieval Password"
 msgstr ""
 
-#. i18n: file korganizer.kcfg line 485
-#: rc.cpp:855 rc.cpp:1442
+#. i18n: file korganizer.kcfg line 524
+#: rc.cpp:909 rc.cpp:1539
 #, no-c-format
 msgid "Password for retrieving free/busy information"
 msgstr ""
 
-#. i18n: file korganizer.kcfg line 495
-#: rc.cpp:858 rc.cpp:1445
+#. i18n: file korganizer.kcfg line 534
+#: rc.cpp:912 rc.cpp:1542
 #, no-c-format
 msgid "Default email attachment method"
 msgstr ""
 
-#. i18n: file korganizer.kcfg line 496
-#: rc.cpp:861 rc.cpp:1448
+#. i18n: file korganizer.kcfg line 535
+#: rc.cpp:915 rc.cpp:1545
 #, no-c-format
 msgid "The default way of attaching dropped emails to an event"
 msgstr ""
 
-#. i18n: file korganizer.kcfg line 499
-#: rc.cpp:864 rc.cpp:882 rc.cpp:1451 rc.cpp:1469
+#. i18n: file korganizer.kcfg line 538
+#: rc.cpp:918 rc.cpp:936 rc.cpp:1548 rc.cpp:1566
 #, no-c-format
 msgid "Always ask"
 msgstr ""
 
-#. i18n: file korganizer.kcfg line 502
-#: rc.cpp:867 rc.cpp:885 rc.cpp:1454 rc.cpp:1472
+#. i18n: file korganizer.kcfg line 541
+#: rc.cpp:921 rc.cpp:939 rc.cpp:1551 rc.cpp:1569
 #, no-c-format
 msgid "Only attach link to message"
 msgstr ""
 
-#. i18n: file korganizer.kcfg line 505
-#: rc.cpp:870 rc.cpp:888 rc.cpp:1457 rc.cpp:1475
+#. i18n: file korganizer.kcfg line 544
+#: rc.cpp:924 rc.cpp:942 rc.cpp:1554 rc.cpp:1572
 #, no-c-format
 msgid "Attach complete message"
 msgstr ""
 
-#. i18n: file korganizer.kcfg line 508
-#: rc.cpp:873 rc.cpp:1460
+#. i18n: file korganizer.kcfg line 547
+#: rc.cpp:927 rc.cpp:1557
 #, no-c-format
 msgid "Attach message without attachments"
 msgstr ""
 
-#. i18n: file korganizer.kcfg line 514
-#: rc.cpp:876 rc.cpp:1463
+#. i18n: file korganizer.kcfg line 553
+#: rc.cpp:930 rc.cpp:1560
 #, no-c-format
 msgid "Default todo attachment method"
 msgstr ""
 
-#. i18n: file korganizer.kcfg line 515
-#: rc.cpp:879 rc.cpp:1466
+#. i18n: file korganizer.kcfg line 554
+#: rc.cpp:933 rc.cpp:1563
 #, no-c-format
 msgid "The default way of attaching dropped emails to a task"
 msgstr ""
 
-#. i18n: file ./printing/calprintdayconfig_base.ui line 32
-#: rc.cpp:1589 rc.cpp:1802 rc.cpp:1835
+#. i18n: file ./plugins/printing/journal/calprintjournalconfig_base.ui line 18
+#: rc.cpp:945
 #, no-c-format
-msgid "Include to-&dos that are due on the printed day(s)"
+msgid "CalPrintJournal_Base"
 msgstr ""
 
-#. i18n: file ./printing/calprintdayconfig_base.ui line 35
-#: rc.cpp:1592
+#. i18n: file ./plugins/printing/journal/calprintjournalconfig_base.ui line 32
+#: rc.cpp:948 rc.cpp:966 rc.cpp:978 rc.cpp:1665 rc.cpp:1737 rc.cpp:1794
 #, no-c-format
-msgid ""
-"You should check this option if you want to print to-dos which are due on one "
-"of the dates which are in the supplied date range."
+msgid "Date && Time Range"
 msgstr ""
 
-#. i18n: file ./printing/calprintdayconfig_base.ui line 43
-#: rc.cpp:1595 rc.cpp:1736 rc.cpp:1808 rc.cpp:1988 rc.cpp:2045 rc.cpp:2063
+#. i18n: file ./plugins/printing/journal/calprintjournalconfig_base.ui line 46
+#: rc.cpp:951
 #, no-c-format
-msgid "Date && Time Range"
+msgid "&All journal entries"
 msgstr ""
 
-#. i18n: file ./printing/calprintdayconfig_base.ui line 88
-#: rc.cpp:1598 rc.cpp:1664 rc.cpp:1739 rc.cpp:1991 rc.cpp:2054 rc.cpp:2066
+#. i18n: file ./plugins/printing/journal/calprintjournalconfig_base.ui line 60
+#: rc.cpp:954
+#, no-c-format
+msgid "Date &range:"
+msgstr ""
+
+#. i18n: file ./plugins/printing/journal/calprintjournalconfig_base.ui line 96
+#: rc.cpp:957 rc.cpp:969 rc.cpp:981 rc.cpp:1593 rc.cpp:1668 rc.cpp:1797
 #, no-c-format
 msgid "&Start date:"
 msgstr ""
 
-#. i18n: file ./printing/calprintdayconfig_base.ui line 94
-#: rc.cpp:1601 rc.cpp:1619 rc.cpp:1667
+#. i18n: file ./plugins/printing/journal/calprintjournalconfig_base.ui line 115
+#: rc.cpp:960 rc.cpp:972 rc.cpp:984 rc.cpp:1599 rc.cpp:1698 rc.cpp:1833
 #, no-c-format
-msgid ""
-"If you want to print more days at once, you can define a range of dates with "
-"this option and the <i>End date</i> option. This option is used to define the "
-"start date."
+msgid "&End date:"
 msgstr ""
 
-#. i18n: file ./printing/calprintdayconfig_base.ui line 102
-#: rc.cpp:1604 rc.cpp:1748
+#. i18n: file ./plugins/printing/whatsnext/calprintwhatsnextconfig_base.ui line 18
+#: rc.cpp:963
 #, no-c-format
-msgid "End ti&me:"
+msgid "CalPrintWhatsNext_Base"
 msgstr ""
 
-#. i18n: file ./printing/calprintdayconfig_base.ui line 108
-#: rc.cpp:1607
+#. i18n: file ./plugins/printing/list/calprintlistconfig_base.ui line 18
+#: rc.cpp:975
 #, no-c-format
-msgid ""
-"It is possible to print only those events which are inside a given timerange. "
-"With this time selection box you can define the end of this time range. The "
-"start time should be defined with the <i>Start time</i> "
-"option. Note you can automatically modify these settings if you check <i>"
-"Extend time range to include all events</i>."
+msgid "CalPrintList_Base"
 msgstr ""
 
-#. i18n: file ./printing/calprintdayconfig_base.ui line 126
-#: rc.cpp:1610
+#. i18n: file ./plugins/printing/list/calprintlistconfig_base.ui line 130
+#: rc.cpp:987
 #, no-c-format
-msgid ""
-"It's possible to print only those events which are inside a given timerange. "
-"With this time selection box you can define the end of this time range. The "
-"start time should be defined with the <i>Start time</i> "
-"option. Note you can automatically modify these settings if you check <i>"
-"Extend time range to include all events</i>."
+msgid "Print Incidences of Type"
 msgstr ""
 
-#. i18n: file ./printing/calprintdayconfig_base.ui line 134
-#: rc.cpp:1613
+#. i18n: file ./plugins/printing/list/calprintlistconfig_base.ui line 149
+#: rc.cpp:993
 #, no-c-format
-msgid "E&xtend time range to include all events"
+msgid "&To-dos"
 msgstr ""
 
-#. i18n: file ./printing/calprintdayconfig_base.ui line 137
-#: rc.cpp:1616
+#. i18n: file ./plugins/printing/list/calprintlistconfig_base.ui line 157
+#: rc.cpp:996
 #, no-c-format
-msgid ""
-"Check this option to automatically determine the required time range, so all "
-"events will be shown."
+msgid "&Journals"
 msgstr ""
 
-#. i18n: file ./printing/calprintdayconfig_base.ui line 166
-#: rc.cpp:1622
+#. i18n: file ./plugins/printing/year/calprintyearconfig_base.ui line 18
+#: rc.cpp:999
 #, no-c-format
-msgid ""
-"It's possible to print only those events which are inside a given timerange. "
-"With this time selection box you can define the start of this time range. The "
-"end time should be defined with the <i>End time</i> option. Note you can "
-"automatically modify these settings if you check <i>"
-"Extend time range to include all events</i>."
+msgid "CalPrintYear_Base"
 msgstr ""
 
-#. i18n: file ./printing/calprintdayconfig_base.ui line 174
-#: rc.cpp:1625 rc.cpp:1757
+#. i18n: file ./plugins/printing/year/calprintyearconfig_base.ui line 32
+#: rc.cpp:1002
 #, no-c-format
-msgid "Start &time:"
+msgid "Yearly print options"
 msgstr ""
 
-#. i18n: file ./printing/calprintdayconfig_base.ui line 180
-#: rc.cpp:1628
+#. i18n: file ./plugins/printing/year/calprintyearconfig_base.ui line 46
+#: rc.cpp:1005
 #, no-c-format
-msgid ""
-"It is possible to print only those events which are inside a given timerange. "
-"With this time selection box you can define the start of this time range. The "
-"end time should be defined with the <i>End time</i> option. Note you can "
-"automatically modify these settings if you check <i>"
-"Extend time range to include all events</i>."
+msgid "Print &Year:"
 msgstr ""
 
-#. i18n: file ./printing/calprintdayconfig_base.ui line 191
-#: rc.cpp:1631 rc.cpp:1637 rc.cpp:1673
+#. i18n: file ./plugins/printing/year/calprintyearconfig_base.ui line 57
+#: rc.cpp:1008
 #, no-c-format
-msgid ""
-"If you want to print more days at once, you can define a range of dates with "
-"this option and the <i>Start date</i> option. This option is used to define the "
-"end date."
+msgid "Number of &pages:"
 msgstr ""
 
-#. i18n: file ./printing/calprintdayconfig_base.ui line 199
-#: rc.cpp:1634 rc.cpp:1670 rc.cpp:1769 rc.cpp:1994 rc.cpp:2057 rc.cpp:2069
+#. i18n: file ./plugins/printing/year/calprintyearconfig_base.ui line 123
+#: rc.cpp:1011
 #, no-c-format
-msgid "&End date:"
+msgid "Display Options"
 msgstr ""
 
-#. i18n: file ./printing/calprintdayconfig_base.ui line 215
-#: rc.cpp:1640 rc.cpp:1727 rc.cpp:1775
+#. i18n: file ./plugins/printing/year/calprintyearconfig_base.ui line 134
+#: rc.cpp:1014
 #, no-c-format
-msgid "&Use colors"
+msgid "Show sub-day events as:"
 msgstr ""
 
-#. i18n: file ./printing/calprintdayconfig_base.ui line 218
-#: rc.cpp:1643 rc.cpp:1730
+#. i18n: file ./plugins/printing/year/calprintyearconfig_base.ui line 142
+#: rc.cpp:1017
 #, no-c-format
-msgid ""
-"If you want to use colors to distinguish certain categories on the print, check "
-"this option."
+msgid "Show holidays as:"
+msgstr ""
+
+#. i18n: file ./plugins/printing/year/calprintyearconfig_base.ui line 148
+#: rc.cpp:1020 rc.cpp:1026
+#, no-c-format
+msgid "Text"
+msgstr ""
+
+#. i18n: file ./plugins/printing/year/calprintyearconfig_base.ui line 153
+#: rc.cpp:1023 rc.cpp:1029
+#, no-c-format
+msgid "Time Boxes"
+msgstr ""
+
+#. i18n: file ./plugins/exchange/exchangeui.rc line 5
+#: rc.cpp:1032
+#, no-c-format
+msgid "Exchange"
 msgstr ""
 
 #. i18n: file ./printing/calprinttodoconfig_base.ui line 29
-#: rc.cpp:1646
+#: rc.cpp:1575
 #, no-c-format
 msgid "&Title:"
 msgstr ""
 
 #. i18n: file ./printing/calprinttodoconfig_base.ui line 40
-#: rc.cpp:1649
+#: rc.cpp:1578
 #, no-c-format
 msgid "To-do List"
 msgstr ""
 
 #. i18n: file ./printing/calprinttodoconfig_base.ui line 48
-#: rc.cpp:1652
+#: rc.cpp:1581
 #, no-c-format
 msgid "To-dos to Print"
 msgstr ""
 
 #. i18n: file ./printing/calprinttodoconfig_base.ui line 59
-#: rc.cpp:1655
+#: rc.cpp:1584
 #, no-c-format
 msgid "Print &all to-dos"
 msgstr ""
 
 #. i18n: file ./printing/calprinttodoconfig_base.ui line 73
-#: rc.cpp:1658
+#: rc.cpp:1587
 #, no-c-format
 msgid "Print &unfinished to-dos only"
 msgstr ""
 
 #. i18n: file ./printing/calprinttodoconfig_base.ui line 84
-#: rc.cpp:1661
+#: rc.cpp:1590
 #, no-c-format
 msgid "Print only to-dos due in the &range:"
 msgstr ""
 
+#. i18n: file ./printing/calprinttodoconfig_base.ui line 145
+#: rc.cpp:1596 rc.cpp:1800 rc.cpp:1818
+#, no-c-format
+msgid ""
+"If you want to print more days at once, you can define a range of dates with "
+"this option and the <i>End date</i> option. This option is used to define the "
+"start date."
+msgstr ""
+
+#. i18n: file ./printing/calprinttodoconfig_base.ui line 181
+#: rc.cpp:1602 rc.cpp:1830 rc.cpp:1836
+#, no-c-format
+msgid ""
+"If you want to print more days at once, you can define a range of dates with "
+"this option and the <i>Start date</i> option. This option is used to define the "
+"end date."
+msgstr ""
+
 #. i18n: file ./printing/calprinttodoconfig_base.ui line 210
-#: rc.cpp:1676 rc.cpp:1712
+#: rc.cpp:1605 rc.cpp:1641
 #, no-c-format
 msgid "Include Information"
 msgstr ""
 
 #. i18n: file ./printing/calprinttodoconfig_base.ui line 224
-#: rc.cpp:1679
+#: rc.cpp:1608
 #, no-c-format
 msgid "&Priority"
 msgstr ""
 
 #. i18n: file ./printing/calprinttodoconfig_base.ui line 235
-#: rc.cpp:1682
+#: rc.cpp:1611
 #, no-c-format
 msgid "&Description"
 msgstr ""
 
 #. i18n: file ./printing/calprinttodoconfig_base.ui line 246
-#: rc.cpp:1685
+#: rc.cpp:1614
 #, no-c-format
 msgid "Due date"
 msgstr ""
 
 #. i18n: file ./printing/calprinttodoconfig_base.ui line 260
-#: rc.cpp:1688
+#: rc.cpp:1617
 #, no-c-format
 msgid "Per&centage completed"
 msgstr ""
 
 #. i18n: file ./printing/calprinttodoconfig_base.ui line 290
-#: rc.cpp:1691
+#: rc.cpp:1620
 #, no-c-format
 msgid "Sorting Options"
 msgstr ""
 
 #. i18n: file ./printing/calprinttodoconfig_base.ui line 304
-#: rc.cpp:1694
+#: rc.cpp:1623
 #, no-c-format
 msgid "Sort field:"
 msgstr ""
 
 #. i18n: file ./printing/calprinttodoconfig_base.ui line 323
-#: rc.cpp:1697
+#: rc.cpp:1626
 #, no-c-format
 msgid "Sort direction:"
 msgstr ""
 
 #. i18n: file ./printing/calprinttodoconfig_base.ui line 375
-#: rc.cpp:1700
+#: rc.cpp:1629
 #, no-c-format
 msgid "Other Options"
 msgstr ""
 
 #. i18n: file ./printing/calprinttodoconfig_base.ui line 386
-#: rc.cpp:1703
+#: rc.cpp:1632
 #, no-c-format
 msgid "Co&nnect sub-to-dos with its parent"
 msgstr ""
 
 #. i18n: file ./printing/calprinttodoconfig_base.ui line 397
-#: rc.cpp:1706
+#: rc.cpp:1635
 #, no-c-format
 msgid "Strike &out completed to-do summaries"
 msgstr ""
 
 #. i18n: file ./printing/calprintincidenceconfig_base.ui line 18
-#: rc.cpp:1709
+#: rc.cpp:1638
 #, no-c-format
 msgid "CalPrintIncidence_Base"
 msgstr ""
 
 #. i18n: file ./printing/calprintincidenceconfig_base.ui line 43
-#: rc.cpp:1715
+#: rc.cpp:1644
 #, no-c-format
 msgid "Detai&ls (visiblility, secrecy, etc.)"
 msgstr ""
 
 #. i18n: file ./printing/calprintincidenceconfig_base.ui line 51
-#: rc.cpp:1718
+#: rc.cpp:1647
 #, no-c-format
 msgid "&Notes, Subitems"
 msgstr ""
 
-#. i18n: file ./printing/calprintincidenceconfig_base.ui line 59
-#: koeventeditor.cpp:197 rc.cpp:1721
+#. i18n: file ./printing/calprintincidenceconfig_base.ui line 67
+#: rc.cpp:1653
 #, no-c-format
-msgid "&Attendees"
+msgid "Attach&ments"
 msgstr ""
 
-#. i18n: file ./printing/calprintincidenceconfig_base.ui line 67
-#: rc.cpp:1724
+#. i18n: file ./printing/calprintincidenceconfig_base.ui line 77
+#: rc.cpp:1656 rc.cpp:1704 rc.cpp:1839
 #, no-c-format
-msgid "Attach&ments"
+msgid "&Use colors"
 msgstr ""
 
-#. i18n: file ./printing/calprintweekconfig_base.ui line 18
-#: rc.cpp:1733
+#. i18n: file ./printing/calprintincidenceconfig_base.ui line 80
+#: rc.cpp:1659 rc.cpp:1842
+#, no-c-format
+msgid ""
+"If you want to use colors to distinguish certain categories on the print, check "
+"this option."
+msgstr ""
+
+#. i18n: file ./printing/calprintweetdeconfig_base.ui line 18
+#: rc.cpp:1662
 #, no-c-format
 msgid "CalPrintWeek_Base"
 msgstr ""
 
-#. i18n: file ./printing/calprintweekconfig_base.ui line 83
-#: rc.cpp:1742 rc.cpp:1745
+#. i18n: file ./printing/calprintweetdeconfig_base.ui line 83
+#: rc.cpp:1671 rc.cpp:1674
 #, no-c-format
 msgid ""
 "Here you can choose which events should be printed based on their date. This "
@@ -4597,20 +6279,32 @@ msgid ""
 "End date</i> to enter the end date of the daterange."
 msgstr ""
 
-#. i18n: file ./printing/calprintweekconfig_base.ui line 108
-#: rc.cpp:1751 rc.cpp:1754
+#. i18n: file ./printing/calprintweetdeconfig_base.ui line 102
+#: rc.cpp:1677 rc.cpp:1803
+#, no-c-format
+msgid "End ti&me:"
+msgstr ""
+
+#. i18n: file ./printing/calprintweetdeconfig_base.ui line 108
+#: rc.cpp:1680 rc.cpp:1683
 #, no-c-format
 msgid "All events which start later than the given time will not be printed."
 msgstr ""
 
-#. i18n: file ./printing/calprintweekconfig_base.ui line 157
-#: rc.cpp:1760 rc.cpp:1763
+#. i18n: file ./printing/calprintweetdeconfig_base.ui line 151
+#: rc.cpp:1686 rc.cpp:1824
+#, no-c-format
+msgid "Start &time:"
+msgstr ""
+
+#. i18n: file ./printing/calprintweetdeconfig_base.ui line 157
+#: rc.cpp:1689 rc.cpp:1692
 #, no-c-format
 msgid "All events which start earlier than the given time will not be printed."
 msgstr ""
 
-#. i18n: file ./printing/calprintweekconfig_base.ui line 186
-#: rc.cpp:1766 rc.cpp:1772
+#. i18n: file ./printing/calprintweetdeconfig_base.ui line 186
+#: rc.cpp:1695 rc.cpp:1701
 #, no-c-format
 msgid ""
 "Here you can choose which events should be printed based on their date. This "
@@ -4618,41 +6312,41 @@ msgid ""
 "Start date</i> to enter the start date of the daterange."
 msgstr ""
 
-#. i18n: file ./printing/calprintweekconfig_base.ui line 213
-#: rc.cpp:1778
+#. i18n: file ./printing/calprintweetdeconfig_base.ui line 213
+#: rc.cpp:1707
 #, no-c-format
 msgid ""
 "The timetable view supports colors. If you want to make use of colors you "
 "should check this option. The category colors will be used."
 msgstr ""
 
-#. i18n: file ./printing/calprintweekconfig_base.ui line 221
-#: rc.cpp:1781
+#. i18n: file ./printing/calprintweetdeconfig_base.ui line 221
+#: rc.cpp:1710
 #, no-c-format
 msgid "Print Layout"
 msgstr ""
 
-#. i18n: file ./printing/calprintweekconfig_base.ui line 232
-#: rc.cpp:1784
+#. i18n: file ./printing/calprintweetdeconfig_base.ui line 232
+#: rc.cpp:1713
 #, no-c-format
 msgid "Print as &Filofax page"
 msgstr ""
 
-#. i18n: file ./printing/calprintweekconfig_base.ui line 238
-#: rc.cpp:1787
+#. i18n: file ./printing/calprintweetdeconfig_base.ui line 238
+#: rc.cpp:1716
 #, no-c-format
 msgid ""
 "The Filofax view prints one week per page, so all days have a large surface."
 msgstr ""
 
-#. i18n: file ./printing/calprintweekconfig_base.ui line 246
-#: rc.cpp:1790
+#. i18n: file ./printing/calprintweetdeconfig_base.ui line 246
+#: rc.cpp:1719
 #, no-c-format
 msgid "Print as &timetable view"
 msgstr ""
 
-#. i18n: file ./printing/calprintweekconfig_base.ui line 249
-#: rc.cpp:1793
+#. i18n: file ./printing/calprintweetdeconfig_base.ui line 249
+#: rc.cpp:1722
 #, no-c-format
 msgid ""
 "This view is similar to the weekview in KOrganizer. The week is printed in "
@@ -4660,14 +6354,14 @@ msgid ""
 "<i>Use Colors</i>."
 msgstr ""
 
-#. i18n: file ./printing/calprintweekconfig_base.ui line 257
-#: rc.cpp:1796
+#. i18n: file ./printing/calprintweetdeconfig_base.ui line 257
+#: rc.cpp:1725
 #, no-c-format
 msgid "Print as split week view"
 msgstr ""
 
-#. i18n: file ./printing/calprintweekconfig_base.ui line 260
-#: rc.cpp:1799
+#. i18n: file ./printing/calprintweetdeconfig_base.ui line 260
+#: rc.cpp:1728
 #, no-c-format
 msgid ""
 "This view is similar to the week view in KOrganizer. The only difference with "
@@ -4675,8 +6369,14 @@ msgid ""
 "split week view in portrait."
 msgstr ""
 
-#. i18n: file ./printing/calprintweekconfig_base.ui line 276
-#: rc.cpp:1805 rc.cpp:1838
+#. i18n: file ./printing/calprintweetdeconfig_base.ui line 273
+#: rc.cpp:1731 rc.cpp:1764 rc.cpp:1788
+#, no-c-format
+msgid "Include to-&dos that are due on the printed day(s)"
+msgstr ""
+
+#. i18n: file ./printing/calprintweetdeconfig_base.ui line 276
+#: rc.cpp:1734 rc.cpp:1767
 #, no-c-format
 msgid ""
 "Check this option if you want to have to-dos on the print, placed by their due "
@@ -4684,13 +6384,13 @@ msgid ""
 msgstr ""
 
 #. i18n: file ./printing/calprintmonthconfig_base.ui line 57
-#: rc.cpp:1811
+#: rc.cpp:1740
 #, no-c-format
 msgid "&Start month:"
 msgstr ""
 
 #. i18n: file ./printing/calprintmonthconfig_base.ui line 63
-#: rc.cpp:1814
+#: rc.cpp:1743
 #, no-c-format
 msgid ""
 "When you want to print more months at once, you can define a month range. This "
@@ -4699,7 +6399,7 @@ msgid ""
 msgstr ""
 
 #. i18n: file ./printing/calprintmonthconfig_base.ui line 71
-#: rc.cpp:1817 rc.cpp:1820
+#: rc.cpp:1746 rc.cpp:1749
 #, no-c-format
 msgid ""
 "When you want to print more months at once, you can define a month range. This "
@@ -4708,13 +6408,13 @@ msgid ""
 msgstr ""
 
 #. i18n: file ./printing/calprintmonthconfig_base.ui line 93
-#: rc.cpp:1823
+#: rc.cpp:1752
 #, no-c-format
 msgid "&End month:"
 msgstr ""
 
 #. i18n: file ./printing/calprintmonthconfig_base.ui line 99
-#: rc.cpp:1826 rc.cpp:1829 rc.cpp:1832
+#: rc.cpp:1755 rc.cpp:1758 rc.cpp:1761
 #, no-c-format
 msgid ""
 "When you want to print more months at once, you can define a month range. This "
@@ -4723,25 +6423,25 @@ msgid ""
 msgstr ""
 
 #. i18n: file ./printing/calprintmonthconfig_base.ui line 162
-#: rc.cpp:1841
+#: rc.cpp:1770
 #, no-c-format
 msgid "Print week &numbers"
 msgstr ""
 
 #. i18n: file ./printing/calprintmonthconfig_base.ui line 165
-#: rc.cpp:1844
+#: rc.cpp:1773
 #, no-c-format
 msgid "Enable this to print week numbers at the left of each row."
 msgstr ""
 
 #. i18n: file ./printing/calprintmonthconfig_base.ui line 173
-#: rc.cpp:1847
+#: rc.cpp:1776
 #, no-c-format
 msgid "Print daily re&curring to-dos and events"
 msgstr ""
 
 #. i18n: file ./printing/calprintmonthconfig_base.ui line 176
-#: rc.cpp:1850
+#: rc.cpp:1779
 #, no-c-format
 msgid ""
 "With this option it is possible to leave out the daily recurring to-dos and "
@@ -4750,1119 +6450,551 @@ msgid ""
 msgstr ""
 
 #. i18n: file ./printing/calprintmonthconfig_base.ui line 184
-#: rc.cpp:1853
+#: rc.cpp:1782
 #, no-c-format
 msgid "Print weekl&y recurring to-dos and events"
 msgstr ""
 
 #. i18n: file ./printing/calprintmonthconfig_base.ui line 187
-#: rc.cpp:1856
+#: rc.cpp:1785
 #, no-c-format
 msgid ""
 "Similar to \"Print daily recurring to-dos and events\". Weekly to-dos and "
 "events will be omitted when making a print of the selected month."
 msgstr ""
 
-#. i18n: file ./plugins/printing/list/calprintlistconfig_base.ui line 18
-#: rc.cpp:1985
-#, no-c-format
-msgid "CalPrintList_Base"
-msgstr ""
-
-#. i18n: file ./plugins/printing/list/calprintlistconfig_base.ui line 130
-#: rc.cpp:1997
-#, no-c-format
-msgid "Print Incidences of Type"
-msgstr ""
-
-#. i18n: file ./plugins/printing/list/calprintlistconfig_base.ui line 141
-#: archivedialog.cpp:136 rc.cpp:2000 searchdialog.cpp:72
-#, no-c-format
-msgid "&Events"
-msgstr ""
-
-#. i18n: file ./plugins/printing/list/calprintlistconfig_base.ui line 149
-#: archivedialog.cpp:137 rc.cpp:2003
-#, no-c-format
-msgid "&To-dos"
-msgstr ""
-
-#. i18n: file ./plugins/printing/list/calprintlistconfig_base.ui line 157
-#: rc.cpp:2006
-#, no-c-format
-msgid "&Journals"
-msgstr ""
-
-#. i18n: file ./plugins/printing/year/calprintyearconfig_base.ui line 18
-#: rc.cpp:2009
-#, no-c-format
-msgid "CalPrintYear_Base"
-msgstr ""
-
-#. i18n: file ./plugins/printing/year/calprintyearconfig_base.ui line 32
-#: rc.cpp:2012
-#, no-c-format
-msgid "Yearly print options"
-msgstr ""
-
-#. i18n: file ./plugins/printing/year/calprintyearconfig_base.ui line 46
-#: rc.cpp:2015
-#, no-c-format
-msgid "Print &Year:"
-msgstr ""
-
-#. i18n: file ./plugins/printing/year/calprintyearconfig_base.ui line 57
-#: rc.cpp:2018
-#, no-c-format
-msgid "Number of &pages:"
-msgstr ""
-
-#. i18n: file ./plugins/printing/year/calprintyearconfig_base.ui line 123
-#: rc.cpp:2021
-#, no-c-format
-msgid "Display Options"
-msgstr ""
-
-#. i18n: file ./plugins/printing/year/calprintyearconfig_base.ui line 134
-#: rc.cpp:2024
-#, no-c-format
-msgid "Show sub-day events as:"
-msgstr ""
-
-#. i18n: file ./plugins/printing/year/calprintyearconfig_base.ui line 142
-#: rc.cpp:2027
-#, no-c-format
-msgid "Show holidays as:"
-msgstr ""
-
-#. i18n: file ./plugins/printing/year/calprintyearconfig_base.ui line 148
-#: rc.cpp:2030 rc.cpp:2036
+#. i18n: file ./printing/calprintdayconfig_base.ui line 35
+#: rc.cpp:1791
 #, no-c-format
-msgid "Text"
+msgid ""
+"You should check this option if you want to print to-dos which are due on one "
+"of the dates which are in the supplied date range."
 msgstr ""
 
-#. i18n: file ./plugins/printing/year/calprintyearconfig_base.ui line 153
-#: rc.cpp:2033 rc.cpp:2039
+#. i18n: file ./printing/calprintdayconfig_base.ui line 108
+#: rc.cpp:1806
 #, no-c-format
-msgid "Time Boxes"
+msgid ""
+"It is possible to print only those events which are inside a given timerange. "
+"With this time selection box you can define the end of this time range. The "
+"start time should be defined with the <i>Start time</i> "
+"option. Note you can automatically modify these settings if you check <i>"
+"Extend time range to include all events</i>."
 msgstr ""
 
-#. i18n: file ./plugins/printing/journal/calprintjournalconfig_base.ui line 18
-#: rc.cpp:2042
+#. i18n: file ./printing/calprintdayconfig_base.ui line 126
+#: rc.cpp:1809
 #, no-c-format
-msgid "CalPrintJournal_Base"
+msgid ""
+"It's possible to print only those events which are inside a given timerange. "
+"With this time selection box you can define the end of this time range. The "
+"start time should be defined with the <i>Start time</i> "
+"option. Note you can automatically modify these settings if you check <i>"
+"Extend time range to include all events</i>."
 msgstr ""
 
-#. i18n: file ./plugins/printing/journal/calprintjournalconfig_base.ui line 46
-#: rc.cpp:2048
+#. i18n: file ./printing/calprintdayconfig_base.ui line 134
+#: rc.cpp:1812
 #, no-c-format
-msgid "&All journal entries"
+msgid "E&xtend time range to include all events"
 msgstr ""
 
-#. i18n: file ./plugins/printing/journal/calprintjournalconfig_base.ui line 60
-#: rc.cpp:2051
+#. i18n: file ./printing/calprintdayconfig_base.ui line 137
+#: rc.cpp:1815
 #, no-c-format
-msgid "Date &range:"
+msgid ""
+"Check this option to automatically determine the required time range, so all "
+"events will be shown."
 msgstr ""
 
-#. i18n: file ./plugins/printing/whatsnext/calprintwhatsnextconfig_base.ui line 18
-#: rc.cpp:2060
+#. i18n: file ./printing/calprintdayconfig_base.ui line 166
+#: rc.cpp:1821
 #, no-c-format
-msgid "CalPrintWhatsNext_Base"
+msgid ""
+"It's possible to print only those events which are inside a given timerange. "
+"With this time selection box you can define the start of this time range. The "
+"end time should be defined with the <i>End time</i> option. Note you can "
+"automatically modify these settings if you check <i>"
+"Extend time range to include all events</i>."
 msgstr ""
 
-#. i18n: file ./plugins/exchange/exchangeui.rc line 5
-#: rc.cpp:2072
+#. i18n: file ./printing/calprintdayconfig_base.ui line 180
+#: rc.cpp:1827
 #, no-c-format
-msgid "Exchange"
-msgstr ""
-
-#: konewstuff.cpp:48
-msgid "Could not load calendar."
+msgid ""
+"It is possible to print only those events which are inside a given timerange. "
+"With this time selection box you can define the start of this time range. The "
+"end time should be defined with the <i>End time</i> option. Note you can "
+"automatically modify these settings if you check <i>"
+"Extend time range to include all events</i>."
 msgstr ""
 
-#: konewstuff.cpp:63
-msgid "The downloaded events will be merged into your current calendar."
+#: koeditorgeneral.cpp:107
+msgid "Sets the Title of this event or to-do."
 msgstr ""
 
-#: koeditorattachments.cpp:107
-msgid "[Binary data]"
+#: koeditorgeneral.cpp:126
+msgid "Sets where the event or to-do will take place."
 msgstr ""
 
-#: koeditorattachments.cpp:194 printing/calprintdefaultplugins.cpp:417
-msgid "Attachments:"
-msgstr ""
+#: koeditorgeneral.cpp:127
+msgid "&Location:"
+msgstr "ตำแหน่ง:"
 
-#: koeditorattachments.cpp:199
+#: koeditorgeneral.cpp:143
 msgid ""
-"Displays a list of current items (files, mail, etc.) that have been associated "
-"with this event or to-do. "
+"Allows you to select the categories that this event or to-do belongs to."
 msgstr ""
 
-#: koeditorattachments.cpp:225
-msgid "&Attach File..."
-msgstr ""
+#: koeditorgeneral.cpp:144
+#, fuzzy
+msgid "Categories:"
+msgstr "หมวดหมู่"
 
-#: koeditorattachments.cpp:226
-msgid ""
-"Shows a dialog used to select an attachment to add to this event or to-do as "
-"link as inline data."
-msgstr ""
+#: koeditorgeneral.cpp:153
+#, fuzzy
+msgid "Select..."
+msgstr "ลบ..."
 
-#: koeditorattachments.cpp:229
-msgid "Attach &Link..."
+#: koeditorgeneral.cpp:163
+msgid "Acc&ess:"
 msgstr ""
 
-#: koeditorattachments.cpp:230
+#: koeditorgeneral.cpp:164
 msgid ""
-"Shows a dialog used to select an attachment to add to this event or to-do as "
-"link."
+"Sets whether the access to this event or to-do is restricted. Please note that "
+"KOrganizer currently does not use this setting, so the implementation of the "
+"restrictions will depend on the groupware server. This means that events or "
+"to-dos marked as private or confidential may be visible to others."
 msgstr ""
 
-#: koeditorattachments.cpp:243
+#: koeditorgeneral.cpp:185
 msgid ""
-"Removes the attachment selected in the list above from this event or to-do."
-msgstr ""
-
-#: koeditorattachments.cpp:272
-msgid "Do you want to link to the attachments, or include them in the event?"
-msgstr ""
-
-#: koeditorattachments.cpp:273
-msgid "Attach as link?"
+"Sets the description for this event or to-do. This will be displayed in a "
+"reminder if one is set, as well as in a tooltip when you hover over the event."
 msgstr ""
 
-#: koeditorattachments.cpp:273
-msgid "As Link"
+#: koeditorgeneral.cpp:202
+msgid "Enable reminders for this event or to-do."
 msgstr ""
 
-#: koeditorattachments.cpp:273
-msgid "As File"
-msgstr ""
+#: koeditorgeneral.cpp:203
+#, fuzzy
+msgid "Enable reminders"
+msgstr "ตัวแจ้งเตือน:"
 
-#: koeditorattachments.cpp:315 koeditorattachments.cpp:340
+#: koeditorgeneral.cpp:209
 msgid ""
-"URL (e.g. a web page) or file to be attached (only the link will be attached, "
-"not the file itself):"
-msgstr ""
-
-#: koeditorattachments.cpp:317 koeditorattachments.cpp:325
-#: koeditorattachments.cpp:348
-msgid "Add Attachment"
-msgstr ""
-
-#: koeditorattachments.cpp:342
-msgid "Edit Attachment"
-msgstr ""
-
-#: koeditorattachments.cpp:348
-msgid "File to be attached:"
-msgstr ""
-
-#: koeditorattachments.cpp:378
-msgid "The selected items will be permanently deleted."
-msgstr ""
-
-#: searchdialog.cpp:49
-msgid "Find Events"
-msgstr ""
-
-#: searchdialog.cpp:50
-msgid "&Find"
-msgstr ""
-
-#: searchdialog.cpp:62
-msgid "&Search for:"
-msgstr ""
-
-#: searchdialog.cpp:70
-msgid "Search For"
-msgstr ""
-
-#: searchdialog.cpp:73
-msgid "To-&dos"
-msgstr ""
-
-#: searchdialog.cpp:74
-msgid "&Journal entries"
-msgstr ""
-
-#: exportwebdialog.cpp:142 searchdialog.cpp:79
-msgid "Date Range"
-msgstr ""
-
-#: searchdialog.cpp:87
-msgid "Fr&om:"
-msgstr ""
-
-#: searchdialog.cpp:91
-msgid "&To:"
-msgstr ""
-
-#: searchdialog.cpp:95
-msgid "E&vents have to be completely included"
-msgstr ""
-
-#: searchdialog.cpp:98
-msgid "Include to-dos &without due date"
-msgstr ""
-
-#: searchdialog.cpp:102
-msgid "Search In"
-msgstr ""
-
-#: searchdialog.cpp:105
-msgid "Su&mmaries"
-msgstr ""
-
-#: searchdialog.cpp:107
-msgid "Desc&riptions"
+"Push this button to create an advanced set of reminders for this event or "
+"to-do."
 msgstr ""
 
-#: searchdialog.cpp:108
-msgid "Cate&gories"
+#: koeditorgeneral.cpp:211
+msgid "Set an advanced reminder"
 msgstr ""
 
-#: searchdialog.cpp:149
+#: koeditorgeneral.cpp:220
 msgid ""
-"Invalid search expression, cannot perform the search. Please enter a search "
-"expression using the wildcard characters '*' and '?' where needed."
+"Set the time before the event starts when the reminder will be triggered."
 msgstr ""
 
-#: searchdialog.cpp:162
-msgid "No events were found matching your search expression."
+#: koeditorgeneral.cpp:221
+msgid "Set the start time trigger offset"
 msgstr ""
 
-#: exportwebdialog.cpp:73
-msgid "Export Calendar as Web Page"
-msgstr ""
-
-#: exportwebdialog.cpp:130
+#: koeditorgeneral.cpp:223
 msgid ""
-"You are about to set all preferences to default values. All custom "
-"modifications will be lost."
-msgstr ""
-
-#: exportwebdialog.cpp:131
-msgid "Setting Default Preferences"
-msgstr ""
-
-#: exportwebdialog.cpp:132
-msgid "Reset to Defaults"
-msgstr ""
-
-#: exportwebdialog.cpp:147
-msgid "View Type"
-msgstr ""
-
-#: exportwebdialog.cpp:158
-msgid "Destination"
-msgstr ""
-
-#: exportwebdialog.cpp:175
-msgid "To-dos"
-msgstr ""
-
-#: exportwebdialog.cpp:196
-msgid "Events"
+"Set the time before the to-do is due when the reminder will be triggered."
 msgstr ""
 
-#: aboutdata.cpp:32
-msgid "KOrganizer"
+#: koeditorgeneral.cpp:224
+msgid "Set the due time trigger offset"
 msgstr ""
 
-#: aboutdata.cpp:33
-msgid "A Personal Organizer for TDE"
-msgstr ""
-
-#: aboutdata.cpp:40
-msgid "Current Maintainer"
-msgstr ""
-
-#: aboutdata.cpp:42
-msgid "Co-Maintainer"
-msgstr ""
-
-#: aboutdata.cpp:44
-msgid "Original Author"
-msgstr ""
-
-#: resourceview.cpp:234
+#: koeditorgeneral.cpp:242 koeditorgeneral.cpp:447
 #, fuzzy
-msgid "Add calendar"
-msgstr "ปฏิทิน"
+msgid "before the due time"
+msgstr "ก่อนสิ้นสุด"
 
-#: resourceview.cpp:236
-msgid ""
-"<qt>"
-"<p>Press this button to add a resource to KOrganizer.</p>"
-"<p>Events, journal entries and to-dos are retrieved and stored on resources. "
-"Available resources include groupware servers, local files, journal entries as "
-"blogs on a server, etc... </p>"
-"<p>If you have more than one active resource, when creating incidents you will "
-"either automatically use the default resource or be prompted to select the "
-"resource to use.</p></qt>"
+#: koeditorgeneral.cpp:429 koeditorgeneral.cpp:468
+#, c-format
+msgid "Triggers %1"
 msgstr ""
 
-#: resourceview.cpp:249
-msgid "Edit calendar settings"
-msgstr ""
+#: koeditorgeneral.cpp:500
+#, fuzzy, c-format
+msgid "Calendar: %1"
+msgstr "ปฏิทิน"
 
-#: resourceview.cpp:251
-msgid ""
-"Press this button to edit the resource currently selected on the KOrganizer "
-"resources list above."
+#: koeditorgeneral.cpp:582
+msgid "No attendees"
 msgstr ""
 
-#: resourceview.cpp:256
-#, fuzzy
-msgid "Remove calendar"
-msgstr "ปฏิทินใหม่"
-
-#: resourceview.cpp:258
+#: koeditorgeneral.cpp:584
+#, c-format
 msgid ""
-"Press this button to delete the resource currently selected on the KOrganizer "
-"resources list above."
+"_n: One attendee\n"
+"%n attendees"
 msgstr ""
 
-#: resourceview.cpp:266
+#: eventarchiver.cpp:101
 msgid ""
-"<qt>"
-"<p>Select on this list the active KOrganizer resources. Check the resource box "
-"to make it active. Press the \"Add...\" button below to add new resources to "
-"the list.</p>"
-"<p>Events, journal entries and to-dos are retrieved and stored on resources. "
-"Available resources include groupware servers, local files, journal entries as "
-"blogs on a server, etc...</p>"
-"<p>If you have more than one active resource, when creating incidents you will "
-"either automatically use the default resource or be prompted to select the "
-"resource to use.</p></qt>"
-msgstr ""
-
-#: resourceview.cpp:326
-msgid "Add Subresource"
-msgstr ""
-
-#: resourceview.cpp:327
-msgid "Please enter a name for the new subresource"
-msgstr ""
-
-#: resourceview.cpp:333
-msgid "<qt>Unable to create subresource <b>%1</b>.</qt>"
-msgstr ""
-
-#: resourceview.cpp:341
-msgid "Resource Configuration"
-msgstr ""
-
-#: resourceview.cpp:342
-msgid "Please select type of the new resource:"
-msgstr ""
-
-#: resourceview.cpp:352
-msgid "<qt>Unable to create resource of type <b>%1</b>.</qt>"
-msgstr ""
-
-#: resourceview.cpp:357
-msgid "%1 resource"
+"Unable to archive to-do \"%1\" because at least one of its sub-to-dos does not "
+"meet the archival requirements."
 msgstr ""
 
-#: resourceview.cpp:371
-msgid "Unable to create the resource."
+#: eventarchiver.cpp:103
+msgid "Archive To-do"
 msgstr ""
 
-#: resourceview.cpp:484
+#: eventarchiver.cpp:120
 msgid ""
-"<qt>Do you really want to remove the subresource <b>%1</b>"
-"? Note that its contents will be completely deleted. This operation cannot be "
-"undone. </qt>"
+"There are no incidences available to archive before the specified cut-off date "
+"%1. Archiving will not be performed."
 msgstr ""
 
-#: resourceview.cpp:487
-msgid "<qt>Do you really want to remove the resource <b>%1</b>?</qt>"
-msgstr ""
-
-#: resourceview.cpp:497
-msgid "You cannot delete your standard resource."
-msgstr ""
-
-#: resourceview.cpp:504
+#: eventarchiver.cpp:148
 msgid ""
-"<qt>Failed to remove the subresource <b>%1</b>. The reason could be that it is "
-"a built-in one which cannot be removed, or that the removal of the underlying "
-"storage folder failed.</qt>"
-msgstr ""
-
-#: resourceview.cpp:581
-msgid "Re&load"
-msgstr ""
-
-#: resourceview.cpp:589
-msgid "Show &Info"
-msgstr ""
-
-#: resourceview.cpp:593
-msgid "&Assign Color"
-msgstr ""
-
-#: resourceview.cpp:595
-msgid "&Disable Color"
-msgstr ""
-
-#: resourceview.cpp:596
-msgid "Resources Colors"
-msgstr ""
-
-#: resourceview.cpp:603
-msgid "Use as &Default Calendar"
-msgstr ""
-
-#: resourceview.cpp:609
-msgid "&Add..."
+"Delete all items before %1 without saving?\n"
+"The following items will be deleted:"
 msgstr ""
 
-#: printing/calprinter.cpp:133
-msgid "Unable to print, no valid print style was returned."
-msgstr ""
+#: eventarchiver.cpp:151
+msgid "Delete Old Items"
+msgstr "ลบรายการเก่า"
 
-#: printing/calprinter.cpp:134
-msgid "Printing error"
+#: eventarchiver.cpp:219
+#, c-format
+msgid "Cannot write archive file %1."
 msgstr ""
 
-#: printing/calprinter.cpp:155
-msgid "Print Calendar"
+#: eventarchiver.cpp:228
+msgid "Cannot write archive to final destination."
 msgstr ""
 
-#: printing/calprinter.cpp:179
-msgid "Print Style"
+#: korganizer_options.h:35
+msgid "Import the given calendars as new resources into the default calendar"
 msgstr ""
 
-#: printing/calprinter.cpp:193
-msgid "Page &orientation:"
+#: korganizer_options.h:37
+msgid ""
+"Merge the given calendars into the standard calendar (i.e. copy the events)"
 msgstr ""
 
-#: printing/calprinter.cpp:198
-msgid "Use Default Orientation of Selected Style"
+#: korganizer_options.h:39
+msgid "Open the given calendars in a new window"
 msgstr ""
 
-#: printing/calprinter.cpp:199
-msgid "Use Printer Default"
+#: korganizer_options.h:40
+msgid ""
+"Calendar files or urls. Unless -i, -o or -m is explicitly specified, the user "
+"will be asked whether to import, merge or open in a separate window."
 msgstr ""
 
-#: printing/calprinter.cpp:237 printing/calprinter.cpp:239
-msgid "&Preview"
+#: kolistview.cpp:212 kotodoview.cpp:387
+msgid "Recurs"
 msgstr ""
 
-#: printing/calprintdefaultplugins.cpp:134
-#: printing/calprintdefaultplugins.cpp:163
-#: printing/calprintdefaultplugins.cpp:182
-#, fuzzy
-msgid "Start date: "
-msgstr "วันที่เริ่ม"
-
-#: printing/calprintdefaultplugins.cpp:139
-#: printing/calprintdefaultplugins.cpp:168
+#: kolistview.cpp:215
 #, fuzzy
-msgid "No start date"
+msgid "Start Date/Time"
 msgstr "วันที่เริ่ม"
 
-#: printing/calprintdefaultplugins.cpp:144
+#: kolistview.cpp:218
 #, fuzzy
-msgid "End date: "
+msgid "End Date/Time"
 msgstr "วันที่สิ้นสุด"
 
-#: koeditorgeneralevent.cpp:416 koeditorgeneralevent.cpp:430
-#: printing/calprintdefaultplugins.cpp:147
-msgid "Duration: "
+#: korgplugins.cpp:37
+msgid "KOrgPlugins"
 msgstr ""
 
-#: printing/calprintdefaultplugins.cpp:150
-#, c-format
-msgid ""
-"_n: 1 hour \n"
-"%n hours "
+#: koeditorattachments.cpp:143
+msgid "[Binary data]"
 msgstr ""
 
-#: printing/calprintdefaultplugins.cpp:153
-#, c-format
-msgid ""
-"_n: 1 minute \n"
-"%n minutes "
+#: koeditorattachments.cpp:168 koeditorattachments.cpp:672
+msgid "Add Attachment"
 msgstr ""
 
-#: printing/calprintdefaultplugins.cpp:156
-#, fuzzy
-msgid "No end date"
-msgstr "วันที่สิ้นสุด"
-
-#: printing/calprintdefaultplugins.cpp:173
-msgid "Due date: "
+#: koeditorattachments.cpp:186
+msgid "Attachment name"
 msgstr ""
 
-#: printing/calprintdefaultplugins.cpp:176
-msgid "No due date"
+#: koeditorattachments.cpp:187
+msgid "Give the attachment a name"
 msgstr ""
 
-#: printing/calprintdefaultplugins.cpp:288
-#, fuzzy
-msgid "Repeats: "
-msgstr "ทำซ้ำอีก:"
-
-#: printing/calprintdefaultplugins.cpp:294
-#, fuzzy
-msgid "No reminders"
-msgstr "ตัวแจ้งเตือน:"
-
-#: printing/calprintdefaultplugins.cpp:297
-#, c-format
-msgid ""
-"_n: Reminder: \n"
-"%n reminders: "
+#: koeditorattachments.cpp:189
+msgid "Type any string you desire here for the name of the attachment"
 msgstr ""
 
-#: printing/calprintdefaultplugins.cpp:340
-#: printing/calprintdefaultplugins.cpp:475
-msgid ""
-"_: Spacer for the joined list of categories\n"
-", "
-msgstr ""
-
-#: printing/calprintdefaultplugins.cpp:347
-msgid "Organizer: "
-msgstr ""
-
-#: printing/calprintdefaultplugins.cpp:357
+#: koeditorattachments.cpp:195
 #, fuzzy
-msgid "Location: "
-msgstr "ตำแหน่ง:"
-
-#: printing/calprintdefaultplugins.cpp:392
-msgid "Description:"
-msgstr ""
-
-#: printing/calprintdefaultplugins.cpp:398
-msgid "Notes:"
-msgstr ""
+msgid "Type:"
+msgstr "ประเภท"
 
-#: printing/calprintdefaultplugins.cpp:408
-msgid "Subitems:"
+#: koeditorattachments.cpp:204
+msgid "Store attachment inline"
 msgstr ""
 
-#: printing/calprintdefaultplugins.cpp:426
-msgid "No Attendees"
+#: koeditorattachments.cpp:207
+msgid "Store the attachment file inside the calendar"
 msgstr ""
 
-#: printing/calprintdefaultplugins.cpp:428
-#, c-format
+#: koeditorattachments.cpp:210
 msgid ""
-"_n: 1 Attendee:\n"
-"%n Attendees:"
-msgstr ""
-
-#: printing/calprintdefaultplugins.cpp:435
-msgid ""
-"_: Formatting of an attendee: 'Name (Role): Status', e.g. 'Reinhold Kainhofer "
-"<reinhold@kainhofer.com> (Participant): Awaiting Response'\n"
-"%1 (%2): %3"
+"Checking this option will cause the attachment to be stored inside your "
+"calendar, which can take a lot of space depending on the size of the "
+"attachment. If this option is not checked, then only a link pointing to the "
+"attachment will be stored.  Do not use a link for attachments that change often "
+"or may be moved (or removed) from their current location."
 msgstr ""
 
-#: printing/calprintdefaultplugins.cpp:439
-msgid "Attendees:"
+#: koeditorattachments.cpp:221
+msgid "Provide a location for the attachment file"
 msgstr ""
 
-#: printing/calprintdefaultplugins.cpp:446
-#, fuzzy, c-format
-msgid "Status: %1"
-msgstr "เริ่ม: %1"
-
-#: printing/calprintdefaultplugins.cpp:450
-#, fuzzy, c-format
-msgid "Secrecy: %1"
-msgstr "เริ่ม: %1"
-
-#: printing/calprintdefaultplugins.cpp:456
-msgid "Show as: Busy"
+#: koeditorattachments.cpp:224
+msgid ""
+"Enter the path to the attachment file or use the file browser by pressing the "
+"adjacent button"
 msgstr ""
 
-#: printing/calprintdefaultplugins.cpp:458
-msgid "Show as: Free"
+#: koeditorattachments.cpp:234
+msgid "Size:"
 msgstr ""
 
-#: printing/calprintdefaultplugins.cpp:464
-msgid "This task is overdue!"
+#: koeditorattachments.cpp:258
+msgid "New attachment"
 msgstr ""
 
-#: printing/calprintdefaultplugins.cpp:470
-msgid "Settings: "
+#: koeditorattachments.cpp:457
+msgid "Attachments:"
 msgstr ""
 
-#: printing/calprintdefaultplugins.cpp:474
-#, fuzzy
-msgid "Categories: "
-msgstr "หมวดหมู่"
-
-#: printing/calprintdefaultplugins.cpp:741
+#: koeditorattachments.cpp:462
 msgid ""
-"_: date from-to\n"
-"%1 - %2"
+"Displays a list of current items (files, mail, etc.) that have been associated "
+"with this event or to-do. "
 msgstr ""
 
-#: printing/calprintdefaultplugins.cpp:743
-msgid ""
-"_: date from-\n"
-"to\n"
-"%1 -\n"
-"%2"
+#: koeditorattachments.cpp:474
+msgid "Add an attachment"
 msgstr ""
 
-#: printing/calprintdefaultplugins.cpp:760
+#: koeditorattachments.cpp:476
 msgid ""
-"_: date from - to (week number)\n"
-"%1 - %2 (Week %3)"
+"Shows a dialog used to select an attachment to add to this event or to-do as "
+"link or as inline data."
 msgstr ""
 
-#: printing/calprintdefaultplugins.cpp:762
+#: koeditorattachments.cpp:486
 msgid ""
-"_: date from -\n"
-"to (week number)\n"
-"%1 -\n"
-"%2 (Week %3)"
+"Removes the attachment selected in the list above from this event or to-do."
 msgstr ""
 
-#: printing/calprintdefaultplugins.cpp:1005
-msgid "Due Date"
+#: koeditorattachments.cpp:585
+msgid "&Link here"
 msgstr ""
 
-#: printing/calprintdefaultplugins.cpp:1007
-msgid "Percent Complete"
-msgstr ""
+#: koeditorattachments.cpp:593 koeditorattachments.cpp:596
+#, fuzzy
+msgid "&Copy Here"
+msgstr "ทำสำเนาไปยัง"
 
-#: printing/calprintdefaultplugins.cpp:1013
-msgid "Ascending"
+#: koeditorattachments.cpp:721
+msgid "<qt>Do you really want to remove these attachments?<p>%1</qt>"
 msgstr ""
 
-#: printing/calprintdefaultplugins.cpp:1014
-msgid "Descending"
-msgstr ""
+#: koeditorattachments.cpp:722
+#, fuzzy
+msgid "Remove Attachment?"
+msgstr "ปฏิทินใหม่"
 
-#: printing/calprintdefaultplugins.cpp:1023
-msgid "To-do list"
+#: koagendaitem.cpp:565
+msgid "Attendee \"%1\" added to the calendar item \"%2\""
 msgstr ""
 
-#: printing/calprintpluginbase.cpp:135
-msgid "This printing style does not have any configuration options."
+#: koagendaitem.cpp:565
+msgid "Attendee added"
 msgstr ""
 
-#: printing/calprintpluginbase.cpp:887
-msgid ""
-"_: weekday month date\n"
-"%1 %2 %3"
+#: koagendaitem.cpp:841 koagendaitem.cpp:939
+msgid "%1 - %2"
 msgstr ""
 
-#: printing/calprintpluginbase.cpp:949
+#: koagendaitem.cpp:850
 #, c-format
-msgid "To-do: %1"
+msgid "- %1"
 msgstr ""
 
-#: printing/calprintpluginbase.cpp:1495
-msgid "%1%"
+#: kowhatsnextview.cpp:101
+msgid "What's Next?"
 msgstr ""
 
-#: printing/calprintpluginbase.cpp:1599
+#: kowhatsnextview.cpp:108
 msgid ""
-"_: Description - date\n"
+"_: Date from - to\n"
 "%1 - %2"
 msgstr ""
 
-#: printing/calprintpluginbase.cpp:1620
-#, c-format
-msgid "Person: %1"
-msgstr ""
-
-#: printing/calprintpluginbase.cpp:1621
-#, c-format
-msgid "%1"
-msgstr ""
-
-#: printing/calprintpluginbase.cpp:1639
-msgid ""
-"_: Date range: Month dayStart - dayEnd\n"
-"%1 %2 - %3"
-msgstr ""
-
-#: printing/calprintpluginbase.cpp:1644
-msgid ""
-"_: Date range: monthStart dayStart - monthEnd dayEnd\n"
-"%1 %2 - %3 %4"
-msgstr ""
-
-#: printing/cellitem.cpp:36
-msgid "<undefined>"
-msgstr ""
-
-#: printing/calprintdefaultplugins.h:45
-msgid "Print &incidence"
-msgstr ""
-
-#: printing/calprintdefaultplugins.h:46
-msgid "Prints an incidence on one page"
-msgstr ""
-
-#: printing/calprintdefaultplugins.h:85
-msgid "Print da&y"
-msgstr ""
-
-#: printing/calprintdefaultplugins.h:86
-msgid "Prints all events of a single day on one page"
-msgstr ""
-
-#: printing/calprintdefaultplugins.h:110
-msgid "Print &week"
-msgstr ""
-
-#: printing/calprintdefaultplugins.h:111
-msgid "Prints all events of one week on one page"
-msgstr ""
-
-#: printing/calprintdefaultplugins.h:139
-msgid "Print mont&h"
-msgstr ""
-
-#: printing/calprintdefaultplugins.h:140
-msgid "Prints all events of one month on one page"
-msgstr ""
+#: kowhatsnextview.cpp:124
+msgid "Events:"
+msgstr "เหตุการณ์:"
 
-#: printing/calprintdefaultplugins.h:166
-msgid "Print to-&dos"
+#: kowhatsnextview.cpp:160
+msgid "To-do:"
 msgstr ""
 
-#: printing/calprintdefaultplugins.h:167
-msgid "Prints all to-dos in a (tree-like) list"
+#: kowhatsnextview.cpp:199 kowhatsnextview.cpp:220
+msgid "Events and to-dos that need a reply:"
 msgstr ""
 
-#: koeventeditor.cpp:124 koeventeditor.cpp:149
+#: kowhatsnextview.cpp:288
 msgid ""
-"The General tab allows you to set the most common options for the event."
-msgstr ""
-
-#: koeventeditor.cpp:138 kotodoeditor.cpp:109
-msgid "Details"
+"_: date, from - to\n"
+"%1, %2 - %3"
 msgstr ""
 
-#: koeventeditor.cpp:179 kotodoeditor.cpp:148
-msgid "Rec&urrence"
+#: kowhatsnextview.cpp:316
+msgid "  (Due: %1)"
 msgstr ""
 
-#: koeventeditor.cpp:182
-msgid ""
-"The Recurrence tab allows you to set options on how often this event recurs."
+#: navigatorbar.cpp:75
+msgid "Previous year"
 msgstr ""
 
-#: koeventeditor.cpp:199
-msgid ""
-"The Free/Busy tab allows you to see whether other attendees are free or busy "
-"during your event."
+#: navigatorbar.cpp:81
+msgid "Previous month"
 msgstr ""
 
-#: koeventeditor.cpp:219
-msgid "Edit Event"
+#: navigatorbar.cpp:88
+msgid "Next month"
 msgstr ""
 
-#: koeventeditor.cpp:227
-msgid "New Event"
+#: navigatorbar.cpp:94
+msgid "Next year"
 msgstr ""
 
-#: koeventeditor.cpp:285
-msgid ""
-"You didn't change the event, thus no counter proposal has been sent to the "
-"organizer."
+#: navigatorbar.cpp:101
+msgid "Select a month"
 msgstr ""
 
-#: koeventeditor.cpp:285
-msgid "No changes"
+#: navigatorbar.cpp:108
+msgid "Select a year"
 msgstr ""
 
-#: koeventeditor.cpp:295
+#: navigatorbar.cpp:177
 #, c-format
-msgid "My counter proposal for: %1"
-msgstr ""
-
-#: koeventeditor.cpp:390
-msgid "Template does not contain a valid event."
-msgstr ""
-
-#: timezone.cpp:39
-msgid "KOrganizer Timezone Test"
-msgstr ""
-
-#: kotodoeditor.cpp:173
-msgid "Edit To-do"
-msgstr ""
-
-#: kotodoeditor.cpp:182
-msgid "New To-do"
-msgstr ""
-
-#: kotodoeditor.cpp:343
-msgid "Template does not contain a valid to-do."
-msgstr ""
-
-#: stdcalendar.cpp:74
-msgid "Active Calendar"
-msgstr ""
-
-#: stdcalendar.cpp:83
-msgid "Default Calendar"
-msgstr ""
-
-#: stdcalendar.cpp:98
-msgid "Birthdays"
-msgstr ""
-
-#: statusdialog.cpp:41
-msgid "Set Your Status"
-msgstr ""
-
-#: statusdialog.cpp:49
-msgid "Set your status"
-msgstr ""
-
-#: kotodoviewitem.cpp:125
-msgid "--"
-msgstr ""
-
-#: korganizer_options.h:35
-msgid "Import the given calendars as new resources into the default calendar"
-msgstr ""
-
-#: korganizer_options.h:37
 msgid ""
-"Merge the given calendars into the standard calendar (i.e. copy the events)"
-msgstr ""
-
-#: korganizer_options.h:39
-msgid "Open the given calendars in a new window"
-msgstr ""
-
-#: korganizer_options.h:40
-msgid ""
-"Calendar files or urls. Unless -i, -o or -m is explicitly specified, the user "
-"will be asked whether to import, merge or open in a separate window."
-msgstr ""
-
-#: koeditorgeneralevent.cpp:104
-msgid "Sets options related to the date and time of the event or to-do."
-msgstr ""
-
-#: koeditorgeneralevent.cpp:114
-msgid "&Start:"
-msgstr ""
-
-#: koeditorgeneralevent.cpp:125
-msgid "&End:"
-msgstr ""
-
-#: koeditorgeneralevent.cpp:135
-#, fuzzy
-msgid "All-&day"
-msgstr "ทุกวัน"
-
-#: koeditorgeneralevent.cpp:163
-#, fuzzy
-msgid "Reminder:"
-msgstr "ตัวแจ้งเตือน:"
-
-#: koeditorgeneralevent.cpp:183
-msgid "S&how time as:"
-msgstr ""
-
-#: koeditorgeneralevent.cpp:184
-msgid "Sets how this time will appear on your Free/Busy information."
-msgstr ""
-
-#: koeditorgeneralevent.cpp:191
-msgid "Busy"
-msgstr ""
-
-#: koeditorgeneralevent.cpp:192
-msgid "Free"
-msgstr ""
-
-#: koeditorgeneralevent.cpp:206
-msgid "You have not yet definitely responded to this invitation."
+"_: monthname\n"
+"%1"
 msgstr ""
 
-#: koeditorgeneralevent.cpp:417
+#: navigatorbar.cpp:178
 #, c-format
 msgid ""
-"_n: 1 Day\n"
-"%n Days"
-msgstr ""
-
-#: koeditorgeneralevent.cpp:436
-msgid ", "
-msgstr ""
-
-#: koeditorgeneralevent.cpp:447
-msgid ""
-"Shows the duration of the event or to-do with the current start and end dates "
-"and times."
-msgstr ""
-
-#: koeditorgeneralevent.cpp:464
-msgid "From: %1   To: %2   %3"
+"_: 4 digit year\n"
+"%1"
 msgstr ""
 
-#: koeditorgeneralevent.cpp:477
-msgid "Please specify a valid start time, for example '%1'."
-msgstr ""
-
-#: koeditorgeneralevent.cpp:484
-msgid "Please specify a valid end time, for example '%1'."
-msgstr ""
-
-#: koeditorgeneralevent.cpp:492
-msgid "Please specify a valid start date, for example '%1'."
-msgstr ""
-
-#: koeditorgeneralevent.cpp:499
-msgid "Please specify a valid end date, for example '%1'."
-msgstr ""
+#: publishdialog.cpp:43
+msgid "Select Addresses"
+msgstr "เลือกที่อยู่"
 
-#: koeditorgeneralevent.cpp:513
-msgid ""
-"The event ends before it starts.\n"
-"Please correct dates and times."
+#: publishdialog.cpp:101
+msgid "(EmptyName)"
 msgstr ""
 
-#: koeventviewerdialog.cpp:33
-msgid "Event Viewer"
+#: kotodoview.cpp:216
+msgid "Cannot move to-do to itself or a child of itself."
 msgstr ""
 
-#: archivedialog.cpp:55
-msgid "Archive/Delete Past Events and To-dos"
+#: kotodoview.cpp:217
+msgid "Drop To-do"
 msgstr ""
 
-#: archivedialog.cpp:57
-msgid "&Archive"
+#: kotodoview.cpp:230
+msgid "Unable to change to-do's parent, because the to-do cannot be locked."
 msgstr ""
 
-#: archivedialog.cpp:66
+#: kotodoview.cpp:278
 msgid ""
-"Archiving saves old items into the given file and then deletes them in the "
-"current calendar. If the archive file already exists they will be added. (<a "
-"href=\"whatsthis:In order to add an archive to your calendar, use the "
-"&quot;Merge Calendar&quot; function. You can view an archive by opening it in "
-"KOrganizer like any other calendar. It is not saved in a special format, but as "
-"vCalendar.\">How to restore</a>)"
+"Unable to add attendees to the to-do, because the to-do cannot be locked."
 msgstr ""
 
-#: archivedialog.cpp:82
-msgid "Archive now items older than:"
-msgstr ""
+#: kotodoview.cpp:368
+msgid "To-dos:"
+msgstr "สิ่งที่จะทำ:"
 
-#: archivedialog.cpp:87
-msgid ""
-"The date before which items should be archived. All older events and to-dos "
-"will be saved and deleted, the newer (and events exactly on that date) will be "
-"kept."
+#: kotodoview.cpp:372
+msgid "Click to add a new to-do"
 msgstr ""
 
-#: archivedialog.cpp:96
-msgid "Automaticall&y archive items older than:"
+#: kotodoview.cpp:392
+msgid "Due Date/Time"
 msgstr ""
 
-#: archivedialog.cpp:99
-msgid ""
-"If this feature is enabled, KOrganizer will regularly check if events and "
-"to-dos have to be archived; this means you will not need to use this dialog box "
-"again, except to change the settings."
+#: kotodoview.cpp:397
+msgid "Sort Id"
 msgstr ""
 
-#: archivedialog.cpp:107
+#: kotodoview.cpp:417
 msgid ""
-"The age of the events and to-dos to archive. All older items will be saved and "
-"deleted, the newer will be kept."
-msgstr ""
-
-#: archivedialog.cpp:112
-msgid "Day(s)"
-msgstr ""
-
-#: archivedialog.cpp:113
-msgid "Week(s)"
-msgstr ""
-
-#: archivedialog.cpp:114
-msgid "Month(s)"
-msgstr ""
-
-#: archivedialog.cpp:119
-msgid "Archive &file:"
-msgstr ""
-
-#: archivedialog.cpp:123
-msgid "*.ics|iCalendar Files"
+"_: Unspecified priority\n"
+"unspecified"
 msgstr ""
 
-#: archivedialog.cpp:125
-msgid ""
-"The path of the archive. The events and to-dos will be added to the archive "
-"file, so any events that are already in the file will not be modified or "
-"deleted. You can later load or merge the file like any other calendar. It is "
-"not saved in a special format, it uses the iCalendar format. "
+#: kotodoview.cpp:468
+msgid "&Make this To-do Independent"
 msgstr ""
 
-#: archivedialog.cpp:134
-msgid "Type of Items to Archive"
+#: kotodoview.cpp:470
+msgid "Make all Sub-to-dos &Independent"
 msgstr ""
 
-#: archivedialog.cpp:139
-msgid ""
-"Here you can select which items should be archived. Events are archived if they "
-"ended before the date given above; to-dos are archived if they were finished "
-"before the date."
-msgstr ""
+#: kotodoview.cpp:473
+msgid "&Copy To"
+msgstr "ทำสำเนาไปยัง"
 
-#: archivedialog.cpp:144
-msgid "&Delete only, do not save"
-msgstr ""
+#: kotodoview.cpp:474
+msgid "&Move To"
+msgstr "ย้ายไปยัง"
 
-#: archivedialog.cpp:147
+#: kotodoview.cpp:476
 msgid ""
-"Select this option to delete old events and to-dos without saving them. It is "
-"not possible to recover the events later."
+"_: delete completed to-dos\n"
+"Pur&ge Completed"
 msgstr ""
 
-#: archivedialog.cpp:211
-msgid ""
-"The archive file name is not valid.\n"
+#: kotodoview.cpp:485
+msgid "&New To-do..."
 msgstr ""
 
-#: komonthview.cpp:349
+#: kotodoview.cpp:487
 msgid ""
-"_: 'Month day' for month view cells\n"
-"%1 %2"
-msgstr ""
-
-#: koeditorgeneraljournal.cpp:62
-msgid "Sets the title of this journal."
+"_: delete completed to-dos\n"
+"&Purge Completed"
 msgstr ""
 
-#: koeditorgeneraljournal.cpp:82
-msgid "&Date:"
-msgstr ""
+#: previewdialog.cpp:54
+#, fuzzy
+msgid "&Merge into existing calendar"
+msgstr "ปฏิทินใหม่"
 
-#: koeditorgeneraljournal.cpp:91
-msgid "&Time: "
-msgstr ""
+#: previewdialog.cpp:73
+#, fuzzy
+msgid "&Add as new calendar..."
+msgstr "ปรับแต่งปฏิทิน..."
 
-#: koeditorgeneraljournal.cpp:197
-msgid "Please specify a valid date, for example '%1'."
-msgstr ""
+#: previewdialog.cpp:75
+#, fuzzy
+msgid "&Add as new calendar"
+msgstr "ปฏิทิน"
 
-#: korgplugins.cpp:37
-msgid "KOrgPlugins"
+#: previewdialog.cpp:141
+msgid "Select path for new calendar"
 msgstr ""
 
 #: templatemanagementdialog.cpp:50
@@ -5893,828 +7025,367 @@ msgstr ""
 msgid "Overwrite"
 msgstr ""
 
-#: tips.cpp:3
+#: incidencechanger.cpp:74
 msgid ""
-"<p>...that you can synchronize your calendar data with the data on a Palm Pilot "
-"by using <a href=\"http://www.slac.com/pilone/kpilot_home\">KPilot</a>?\n"
-"</p>\n"
-msgstr ""
-
-#: tips.cpp:9
-msgid ""
-"<p>...that it is possible to show the current time in the calendar? Enable the "
-"current time line in the dialog which appears after selecting <b>Settings</b>"
-", <b>Configure KOrganizer...</b> from the menu bar.\n"
-"</p>\n"
-msgstr ""
-
-#: tips.cpp:15
-msgid ""
-"<p>...that KOrganizer supports Microsoft Exchange? Add the <b>"
-"Microsoft&reg; Exchange 2000 resource</b> using the <b>Resource View</b> "
-"from the KOrganizer sidebar.\n"
-"</p>\n"
-msgstr ""
-
-#: tips.cpp:21
-msgid ""
-"<p>...that you can select whether the week starts on Monday or on Sunday in the "
-"Trinity Control Center? KOrganizer uses this setting. Look at Regional & "
-"Accessibility->Country/Region & Languages in the Trinity Control Center, or select "
-"<b>Settings</b>,\n"
-"<b>Configure Date & Time...</b> from the menu bar. Select the Time & Dates "
-"tab.\n"
-"</p>\n"
+"Some attendees were removed from the incidence. Shall cancel messages be sent "
+"to these attendees?"
 msgstr ""
 
-#: tips.cpp:28
-msgid ""
-"<p>...that you can edit to-dos quickly by right clicking on the property you "
-"wish to change; like the priority, the category or the date?\n"
-"</p>\n"
+#: incidencechanger.cpp:76
+msgid "Attendees Removed"
 msgstr ""
 
-#: tips.cpp:34
-msgid ""
-"<p>...that you can view and edit a calendar from the shell with "
-"konsolekalendar? Run <b>konsolekalendar --help</b> for the available options.\n"
-"</p>\n"
+#: incidencechanger.cpp:76
+msgid "Send Messages"
 msgstr ""
 
-#: tips.cpp:40
-msgid ""
-"<p>...that you can import birthdays from your address book? There is a resource "
-"available which connects the birthdays to your calendar; it is even possible to "
-"set a reminder for each event.\n"
-"</p>\n"
+#: incidencechanger.cpp:388
+msgid "No calendars found, unable to save %1 \"%2\"."
 msgstr ""
 
-#: tips.cpp:46
-msgid ""
-"<p>...that you can store your calendar on an FTP server? Use the standard file "
-"dialog to save the calendar to a URL like "
-"<b>ftp://username@ftpserver/filename</b>. You can make your calendar active and "
-"load and save it as if it were local, or add it permanently to your resources "
-"list, using the remote file resource. Just make sure that no two KOrganizer "
-"applications are working on the same file, at the same time.\n"
-"</p>\n"
+#: incidencechanger.cpp:439 kodialogmanager.cpp:113
+msgid "Unable to save %1 \"%2\"."
 msgstr ""
 
-#: tips.cpp:52
-msgid ""
-"<p>...that you can create hierarchical to-dos by clicking with the right mouse "
-"button on an existing to-do and selecting <b>New Sub-to-do</b> "
-"from the context menu?\n"
-"</p>\n"
+#: incidencechanger.cpp:443
+msgid "Unable to save %1 \"%2\" to calendar %3."
 msgstr ""
 
-#: tips.cpp:58
+#: incidencechanger.cpp:461
 msgid ""
-"<p>...that a color can be assigned to each category? Events with a certain "
-"category will be shown in that color. You can assign these in the section <b>"
-"Colors</b> within the dialog which appears after selecting <b>Settings</b>, <b>"
-"Configure KOrganizer...</b> from the menu bar.\n"
-"</p>\n"
+"Attempt to send the scheduling message failed. Please check your Group "
+"Scheduling settings. Contact your system administrator for more help."
 msgstr ""
 
-#: tips.cpp:64
-msgid ""
-"<p>...that you can view and edit a calendar with Konqueror? Just click on the "
-"calendar file to make Konqueror open it.\n"
-"</p>\n"
+#: kojournaleditor.cpp:47
+msgid "Edit Journal Entry"
 msgstr ""
 
-#: tips.cpp:70
-msgid ""
-"<p>...that it is possible to add an attachment to an event or to-do? To do so, "
-"add a link to the <b>Attachments</b> tab within the <b>Edit Event</b> or <b>"
-"Edit To-do</b> dialog.\n"
-"</p>\n"
+#: kojournaleditor.cpp:201
+msgid "This journal entry will be permanently deleted."
 msgstr ""
 
-#: tips.cpp:76
-msgid ""
-"<p>...that you can export your calendar to HTML? Select <b>File</b>, <b>"
-"Export</b>, <b>Export Web Page...</b> from the menu bar to open the <b>"
-"Export calendar as web page</b> dialog.\n"
-"</p>\n"
+#: kojournaleditor.cpp:217
+msgid "Template does not contain a valid journal."
 msgstr ""
 
-#: tips.cpp:82
-msgid ""
-"<p>...that you can purge completed to-dos in one step? Go to the <b>File</b> "
-"menu and choose <b>Purge Completed</b>.\n"
+#: koagenda.cpp:946
+msgid "Unable to lock item for modification. You cannot make any changes."
 msgstr ""
 
-#: tips.cpp:87
-msgid ""
-"<p>...that you can create a new sub-to-do by pasting a to-do while another one "
-"is selected?\n"
-"</p>\n"
+#: koagenda.cpp:948
+msgid "Locking Failed"
 msgstr ""
 
-#: plugins/datenums/datenums.cpp:59
+#: freebusymanager.cpp:236
 msgid ""
-"_: dayOfYear / daysTillEndOfYear\n"
-"%1 / %2"
-msgstr ""
-
-#: plugins/datenums/datenums.cpp:71
-msgid "This plugin provides numbers of days and weeks."
-msgstr ""
-
-#: plugins/datenums/configdialog.cpp:38
-msgid "Configure Day Numbers"
-msgstr ""
-
-#: plugins/datenums/configdialog.cpp:45
-msgid "Show Date Number"
-msgstr ""
-
-#: plugins/datenums/configdialog.cpp:48
-msgid "Show day number"
-msgstr ""
-
-#: plugins/datenums/configdialog.cpp:49
-msgid "Show days to end of year"
-msgstr ""
-
-#: plugins/datenums/configdialog.cpp:50
-msgid "Show both"
-msgstr ""
-
-#: plugins/projectview/koprojectview.cpp:76
-msgid "Project View"
-msgstr ""
-
-#: plugins/projectview/koprojectview.cpp:80
-#: plugins/timespanview/timespanwidget.cpp:65
-msgid "Zoom In"
-msgstr ""
-
-#: plugins/projectview/koprojectview.cpp:84
-#: plugins/timespanview/timespanwidget.cpp:69
-msgid "Zoom Out"
-msgstr ""
-
-#: plugins/projectview/koprojectview.cpp:88
-msgid "Select Mode"
-msgstr ""
-
-#: plugins/projectview/koprojectview.cpp:109
-msgid "main task"
+"<qt>No URL configured for uploading your free/busy list. Please set it in "
+"KOrganizer's configuration dialog, on the \"Free/Busy\" page. "
+"<br>Contact your system administrator for the exact URL and the account "
+"details.</qt>"
 msgstr ""
 
-#: plugins/projectview/projectview.cpp:55
-msgid "&Project"
+#: freebusymanager.cpp:240
+msgid "No Free/Busy Upload URL"
 msgstr ""
 
-#: plugins/projectview/projectview.cpp:65
-msgid "This plugin provides a Gantt diagram as project view."
+#: freebusymanager.cpp:247
+msgid "<qt>The target URL '%1' provided is invalid.</qt>"
 msgstr ""
 
-#: plugins/projectview/projectview.cpp:70
-msgid "Project View Plugin"
+#: freebusymanager.cpp:248
+msgid "Invalid URL"
 msgstr ""
 
-#: plugins/hebrew/parsha.cpp:33
+#: freebusymanager.cpp:352
 msgid ""
-"_: These are weekly readings and do not have translations. They may have "
-"different spellings in your language; otherwise, just translate the sound to "
-"your characters\n"
-"Bereshit"
-msgstr ""
-
-#: plugins/hebrew/parsha.cpp:33
-msgid "Noach"
-msgstr ""
-
-#: plugins/hebrew/parsha.cpp:33
-msgid "Lech L'cha"
-msgstr ""
-
-#: plugins/hebrew/parsha.cpp:34
-msgid "Vayera"
-msgstr ""
-
-#: plugins/hebrew/parsha.cpp:34
-msgid "Chaye Sarah"
-msgstr ""
-
-#: plugins/hebrew/parsha.cpp:34
-msgid "Toldot"
-msgstr ""
-
-#: plugins/hebrew/parsha.cpp:35
-msgid "Vayetze"
-msgstr ""
-
-#: plugins/hebrew/parsha.cpp:35
-msgid "Vayishlach"
-msgstr ""
-
-#: plugins/hebrew/parsha.cpp:35
-msgid "Vayeshev"
-msgstr ""
-
-#: plugins/hebrew/parsha.cpp:36
-msgid "Miketz"
-msgstr ""
-
-#: plugins/hebrew/parsha.cpp:36
-msgid "Vayigash"
-msgstr ""
-
-#: plugins/hebrew/parsha.cpp:36
-msgid "Vayechi"
-msgstr ""
-
-#: plugins/hebrew/parsha.cpp:37
-msgid "Shemot"
-msgstr ""
-
-#: plugins/hebrew/parsha.cpp:37
-msgid "Vaera"
-msgstr ""
-
-#: plugins/hebrew/parsha.cpp:37
-msgid "Bo"
-msgstr ""
-
-#: plugins/hebrew/parsha.cpp:37
-msgid "Beshalach"
-msgstr ""
-
-#: plugins/hebrew/parsha.cpp:38
-msgid "Yitro"
-msgstr ""
-
-#: plugins/hebrew/parsha.cpp:38
-msgid "Mishpatim"
-msgstr ""
-
-#: plugins/hebrew/parsha.cpp:38
-msgid "Terumah"
-msgstr ""
-
-#: plugins/hebrew/parsha.cpp:39
-msgid "Tetzaveh"
-msgstr ""
-
-#: plugins/hebrew/parsha.cpp:39
-msgid "Ki Tisa"
-msgstr ""
-
-#: plugins/hebrew/parsha.cpp:39
-msgid "Vayakhel"
-msgstr ""
-
-#: plugins/hebrew/parsha.cpp:40
-msgid "Pekudei"
-msgstr ""
-
-#: plugins/hebrew/parsha.cpp:40
-msgid "Vayikra"
-msgstr ""
-
-#: plugins/hebrew/parsha.cpp:40
-msgid "Tzav"
-msgstr ""
-
-#: plugins/hebrew/parsha.cpp:41
-msgid "Shemini"
-msgstr ""
-
-#: plugins/hebrew/parsha.cpp:41
-msgid "Tazria"
-msgstr ""
-
-#: plugins/hebrew/parsha.cpp:41
-msgid "Metzora"
-msgstr ""
-
-#: plugins/hebrew/parsha.cpp:42
-msgid "Acharei Mot"
-msgstr ""
-
-#: plugins/hebrew/parsha.cpp:42
-msgid "Kedoshim"
-msgstr ""
-
-#: plugins/hebrew/parsha.cpp:42
-msgid "Emor"
-msgstr ""
-
-#: plugins/hebrew/parsha.cpp:43
-msgid "Behar"
-msgstr ""
-
-#: plugins/hebrew/parsha.cpp:43
-msgid "Bechukotai"
-msgstr ""
-
-#: plugins/hebrew/parsha.cpp:43
-msgid "Bemidbar"
-msgstr ""
-
-#: plugins/hebrew/parsha.cpp:44
-msgid "Naso"
-msgstr ""
-
-#: plugins/hebrew/parsha.cpp:44
-msgid "Behaalotcha"
-msgstr ""
-
-#: plugins/hebrew/parsha.cpp:44
-msgid "Shelach"
-msgstr ""
-
-#: plugins/hebrew/parsha.cpp:45
-msgid "Korach"
-msgstr ""
-
-#: plugins/hebrew/parsha.cpp:45
-msgid "Chukat"
-msgstr ""
-
-#: plugins/hebrew/parsha.cpp:45
-msgid "Balak"
-msgstr ""
-
-#: plugins/hebrew/parsha.cpp:46
-msgid "Pinchas"
-msgstr ""
-
-#: plugins/hebrew/parsha.cpp:46
-msgid "Matot"
-msgstr ""
-
-#: plugins/hebrew/parsha.cpp:46
-msgid "Masei"
+"<qt>The software could not upload your free/busy list to the URL '%1'. There "
+"might be a problem with the access rights, or you specified an incorrect URL. "
+"The system said: <em>%2</em>."
+"<br>Please check the URL or contact your system administrator.</qt>"
 msgstr ""
 
-#: plugins/hebrew/parsha.cpp:47
-msgid "Devarim"
+#: komailclient.cpp:247
+msgid "No running instance of KMail found."
 msgstr ""
 
-#: plugins/hebrew/parsha.cpp:47
-msgid "Vaetchanan"
+#: kotodoeditor.cpp:160
+msgid "Edit To-do"
 msgstr ""
 
-#: plugins/hebrew/parsha.cpp:47
-msgid "Ekev"
+#: kotodoeditor.cpp:169
+msgid "New To-do"
 msgstr ""
 
-#: plugins/hebrew/parsha.cpp:48
-msgid "Reeh"
+#: kotodoeditor.cpp:344
+msgid "Template does not contain a valid to-do."
 msgstr ""
 
-#: plugins/hebrew/parsha.cpp:48
-msgid "Shoftim"
+#: kocounterdialog.cpp:36
+msgid "Counter-Event Viewer"
 msgstr ""
 
-#: plugins/hebrew/parsha.cpp:48
-msgid "Ki Tetze"
-msgstr ""
+#: korganizer.cpp:298
+msgid "New Calendar"
+msgstr "ปฏิทินใหม่"
 
-#: plugins/hebrew/parsha.cpp:49
-msgid "Ki Tavo"
-msgstr ""
+#: korganizer.cpp:302
+msgid "read-only"
+msgstr "อ่านได้อย่างเดียว"
 
-#: plugins/hebrew/parsha.cpp:49
-msgid "Nitzavim"
+#: resourceview.cpp:73
+msgid "My %1 (%2)"
 msgstr ""
 
-#: plugins/hebrew/parsha.cpp:49
-msgid "Vayelech"
+#: resourceview.cpp:75 resourceview.cpp:78
+#, c-format
+msgid "My %1"
 msgstr ""
 
-#: plugins/hebrew/parsha.cpp:50
-msgid "Haazinu"
-msgstr ""
+#: resourceview.cpp:277
+#, fuzzy
+msgid "Add calendar"
+msgstr "ปฏิทิน"
 
-#: plugins/hebrew/holiday.cpp:63
+#: resourceview.cpp:279
 msgid ""
-"_: These are Jewish holidays and mostly do not have translations. They may have "
-"different spellings in your language; otherwise, just translate the sound to "
-"your characters\n"
-"Sh. HaHodesh"
-msgstr ""
-
-#: plugins/hebrew/holiday.cpp:69
-msgid "Erev Pesach"
-msgstr ""
-
-#: plugins/hebrew/holiday.cpp:79
-msgid "Sh. HaGadol"
-msgstr ""
-
-#: plugins/hebrew/holiday.cpp:87
-msgid "Pesach"
-msgstr ""
-
-#: plugins/hebrew/holiday.cpp:98 plugins/hebrew/holiday.cpp:262
-msgid "Chol Hamoed"
-msgstr ""
-
-#: plugins/hebrew/holiday.cpp:103
-msgid "Yom HaShoah"
-msgstr ""
-
-#: plugins/hebrew/holiday.cpp:127 plugins/hebrew/holiday.cpp:133
-#: plugins/hebrew/holiday.cpp:144
-msgid "Yom HaAtzmaut"
-msgstr ""
-
-#: plugins/hebrew/holiday.cpp:129 plugins/hebrew/holiday.cpp:142
-msgid "Yom HaZikaron"
-msgstr ""
-
-#: plugins/hebrew/holiday.cpp:151
-msgid "Yom Yerushalayim"
-msgstr ""
-
-#: plugins/hebrew/holiday.cpp:154
-msgid "Lag BaOmer"
-msgstr ""
-
-#: plugins/hebrew/holiday.cpp:179
-msgid "Erev Shavuot"
-msgstr ""
-
-#: plugins/hebrew/holiday.cpp:184
-msgid "Shavuot"
-msgstr ""
-
-#: plugins/hebrew/holiday.cpp:193
-msgid "Tzom Tammuz"
-msgstr ""
-
-#: plugins/hebrew/holiday.cpp:200
-msgid "Sh. Hazon"
-msgstr ""
-
-#: plugins/hebrew/holiday.cpp:202
-msgid "Sh. Nahamu"
-msgstr ""
-
-#: plugins/hebrew/holiday.cpp:206
-msgid "Tisha B'Av"
-msgstr ""
-
-#: plugins/hebrew/holiday.cpp:211
-msgid "S'lichot"
-msgstr ""
-
-#: plugins/hebrew/holiday.cpp:213
-msgid "Erev R.H."
-msgstr ""
-
-#: plugins/hebrew/holiday.cpp:221
-msgid "Rosh Hashana"
-msgstr ""
-
-#: plugins/hebrew/holiday.cpp:225 plugins/hebrew/holiday.cpp:238
-msgid "Sh. Shuvah"
-msgstr ""
-
-#: plugins/hebrew/holiday.cpp:227 plugins/hebrew/holiday.cpp:231
-msgid "Tzom Gedalia"
-msgstr ""
-
-#: plugins/hebrew/holiday.cpp:241
-msgid "Erev Y.K."
-msgstr ""
-
-#: plugins/hebrew/holiday.cpp:244
-msgid "Yom Kippur"
-msgstr ""
-
-#: plugins/hebrew/holiday.cpp:247
-msgid "Erev Sukkot"
-msgstr ""
-
-#: plugins/hebrew/holiday.cpp:253
-msgid "Sukkot"
-msgstr ""
-
-#: plugins/hebrew/holiday.cpp:265
-msgid "Hoshana Rabah"
-msgstr ""
-
-#: plugins/hebrew/holiday.cpp:268
-msgid "Shmini Atzeret"
-msgstr ""
-
-#: plugins/hebrew/holiday.cpp:272
-msgid "Simchat Torah"
-msgstr ""
-
-#: plugins/hebrew/holiday.cpp:281
-msgid "Erev Hanukah"
-msgstr ""
-
-#: plugins/hebrew/holiday.cpp:283 plugins/hebrew/holiday.cpp:289
-msgid "Hanukah"
-msgstr ""
-
-#: plugins/hebrew/holiday.cpp:293
-msgid "Tzom Tevet"
-msgstr ""
-
-#: plugins/hebrew/holiday.cpp:304 plugins/hebrew/holiday.cpp:312
-#: plugins/hebrew/holiday.cpp:316 plugins/hebrew/holiday.cpp:320
-msgid "Sh. Shirah"
-msgstr ""
-
-#: plugins/hebrew/holiday.cpp:317
-msgid "Tu B'Shvat"
-msgstr ""
-
-#: plugins/hebrew/holiday.cpp:330 plugins/hebrew/holiday.cpp:341
-#: plugins/hebrew/holiday.cpp:349
-msgid "Sh. Shekalim"
-msgstr ""
-
-#: plugins/hebrew/holiday.cpp:338
-msgid "Purim Katan"
-msgstr ""
-
-#: plugins/hebrew/holiday.cpp:356 plugins/hebrew/holiday.cpp:373
-msgid "Ta'anit Ester"
-msgstr ""
-
-#: plugins/hebrew/holiday.cpp:364 plugins/hebrew/holiday.cpp:368
-msgid "Sh. Zachor"
-msgstr ""
-
-#: plugins/hebrew/holiday.cpp:370
-msgid "Erev Purim"
-msgstr ""
-
-#: plugins/hebrew/holiday.cpp:376
-msgid "Purim"
-msgstr ""
-
-#: plugins/hebrew/holiday.cpp:380 plugins/hebrew/holiday.cpp:384
-msgid "Shushan Purim"
-msgstr ""
-
-#: plugins/hebrew/holiday.cpp:394
-msgid "Sh. Parah"
-msgstr ""
-
-#: plugins/hebrew/holiday.cpp:403
-msgid "Sh. HaHodesh"
-msgstr ""
-
-#: plugins/hebrew/holiday.cpp:428
-msgid " Omer"
+"<qt>"
+"<p>Press this button to add a resource to KOrganizer.</p>"
+"<p>Events, journal entries and to-dos are retrieved and stored on resources. "
+"Available resources include groupware servers, local files, journal entries as "
+"blogs on a server, etc... </p>"
+"<p>If you have more than one active resource, when creating incidents you will "
+"either automatically use the default resource or be prompted to select the "
+"resource to use.</p></qt>"
 msgstr ""
 
-#: plugins/hebrew/configdialog.cpp:29
-msgid "Configure Holidays"
+#: resourceview.cpp:292
+msgid "Edit calendar settings"
 msgstr ""
 
-#: plugins/hebrew/configdialog.cpp:37
-msgid "Use Israeli holidays"
+#: resourceview.cpp:294
+msgid ""
+"Press this button to edit the resource currently selected on the KOrganizer "
+"resources list above."
 msgstr ""
 
-#: plugins/hebrew/configdialog.cpp:41
-msgid "Show weekly parsha"
-msgstr ""
+#: resourceview.cpp:299
+#, fuzzy
+msgid "Remove calendar"
+msgstr "ปฏิทินใหม่"
 
-#: plugins/hebrew/configdialog.cpp:45
-msgid "Show day of Omer"
+#: resourceview.cpp:301
+msgid ""
+"Press this button to delete the resource currently selected on the KOrganizer "
+"resources list above."
 msgstr ""
 
-#: plugins/hebrew/configdialog.cpp:49
-msgid "Show Chol HaMoed"
+#: resourceview.cpp:309
+msgid ""
+"<qt>"
+"<p>Select on this list the active KOrganizer resources. Check the resource box "
+"to make it active. Press the \"Add...\" button below to add new resources to "
+"the list.</p>"
+"<p>Events, journal entries and to-dos are retrieved and stored on resources. "
+"Available resources include groupware servers, local files, journal entries as "
+"blogs on a server, etc...</p>"
+"<p>If you have more than one active resource, when creating incidents you will "
+"either automatically use the default resource or be prompted to select the "
+"resource to use.</p></qt>"
 msgstr ""
 
-#: plugins/hebrew/hebrew.cpp:103
-msgid "This plugin provides the date in the Jewish calendar."
+#: resourceview.cpp:370
+msgid "Add Subresource"
 msgstr ""
 
-#: plugins/timespanview/timespanview.cpp:54
-msgid "&Timespan"
+#: resourceview.cpp:371
+msgid "Please enter a name for the new subresource"
 msgstr ""
 
-#: plugins/timespanview/timespanview.cpp:64
-msgid "This plugin provides a Gantt-like Timespan view."
+#: resourceview.cpp:379
+msgid "<qt>Unable to create subresource <b>%1</b>.</qt>"
 msgstr ""
 
-#: plugins/timespanview/timespanview.cpp:69
-msgid "Timespan View Plugin"
+#: resourceview.cpp:387
+msgid "Resource Configuration"
 msgstr ""
 
-#: plugins/timespanview/timespanwidget.cpp:73
-msgid "Center View"
+#: resourceview.cpp:388
+msgid "Please select type of the new resource:"
 msgstr ""
 
-#: plugins/printing/list/listprint.h:42
-msgid "Print list"
+#: resourceview.cpp:401
+msgid "<qt>Unable to create resource of type <b>%1</b>.</qt>"
 msgstr ""
 
-#: plugins/printing/list/listprint.h:43
-msgid "Prints a list of events and to-dos"
+#: resourceview.cpp:417
+msgid "Unable to create the resource."
 msgstr ""
 
-#: plugins/printing/year/yearprint.cpp:176
+#: resourceview.cpp:542
 msgid ""
-"_: date from -\n"
-"to\n"
-"%1 -\n"
-"%2"
-msgstr ""
-
-#: plugins/printing/year/yearprint.h:42
-msgid "Print &Year"
-msgstr ""
-
-#: plugins/printing/year/yearprint.h:43
-msgid "Prints a calendar for an entire year"
+"<qt>You may not delete your standard calendar resource."
+"<p>You can change the standard calendar resource in the Trinity Control Center "
+"using the TDE Resource settings under the TDE Components area.</qt>"
 msgstr ""
 
-#: plugins/printing/journal/journalprint.h:43
-msgid "Print &journal"
-msgstr ""
-
-#: plugins/printing/journal/journalprint.h:44
-msgid "Prints all journals for a given date range"
-msgstr ""
-
-#: plugins/printing/journal/journalprint.cpp:126
-msgid "Journal entries"
+#: resourceview.cpp:552
+msgid ""
+"This is a groupware folder so you can always re-subscribe to the folder later "
+"as you desire."
 msgstr ""
 
-#: plugins/printing/whatsnext/whatsnextprint.h:42
-msgid "Print What's Next"
+#: resourceview.cpp:555
+msgid ""
+"The contents will not be removed so you can always re-add this calendar later "
+"as you desire."
 msgstr ""
 
-#: plugins/printing/whatsnext/whatsnextprint.h:43
-msgid "Prints a list of all upcoming events and todos."
+#: resourceview.cpp:562
+msgid ""
+"<qt>Do you really want to remove the calendar <b>%1</b>?"
+"<p><b>Note:</b> %2</qt>"
 msgstr ""
 
-#: plugins/exchange/exchange.cpp:109 plugins/exchange/exchange.cpp:145
-#: plugins/exchange/exchange.cpp:148 plugins/exchange/exchange.cpp:164
-#: plugins/exchange/exchange.cpp:168 plugins/exchange/exchange.cpp:222
-#: plugins/exchange/exchange.cpp:224 plugins/exchange/exchangeconfig.cpp:35
-#: plugins/exchange/exchangedialog.cpp:34
-msgid "Exchange Plugin"
+#: resourceview.cpp:573
+msgid ""
+"<qt>Failed to remove the subresource <b>%1</b>. The reason could be that it is "
+"a built-in one which cannot be removed, or that the removal of the underlying "
+"storage folder failed.</qt>"
 msgstr ""
 
-#: plugins/exchange/exchangeconfig.cpp:46
-msgid "Exchange server:"
+#: resourceview.cpp:601
+msgid "Cannot rename someone else's calendar folder."
 msgstr ""
 
-#: plugins/exchange/exchangeconfig.cpp:50
-msgid "Port:"
+#: resourceview.cpp:609
+msgid "Rename Subresource"
 msgstr ""
 
-#: plugins/exchange/exchangeconfig.cpp:54
-msgid "User:"
+#: resourceview.cpp:610
+msgid ""
+"<qt>Enter a new name for the subresource"
+"<p><b>Note:</b> the new name will take affect after the next sync.</qt>"
 msgstr ""
 
-#: plugins/exchange/exchangeconfig.cpp:63
-msgid "Determine mailbox automatically"
+#: resourceview.cpp:622
+msgid ""
+"Communication with KMail failed when attempting to change the folder name."
 msgstr ""
 
-#: plugins/exchange/exchangeconfig.cpp:68
-msgid "Mailbox URL:"
+#: resourceview.cpp:635
+msgid "<qt>Cannot edit the subresource <b>%1</b>.</qt>"
 msgstr ""
 
-#: plugins/exchange/exchangedialog.cpp:39
-msgid "Start date:"
+#: resourceview.cpp:691
+msgid "Re&load"
 msgstr ""
 
-#: plugins/exchange/exchangedialog.cpp:46
-msgid "End date:"
+#: resourceview.cpp:699
+msgid "Show &Info"
 msgstr ""
 
-#: plugins/exchange/exchange.cpp:72
-msgid "&Download..."
+#: resourceview.cpp:703
+msgid "&Assign Color"
 msgstr ""
 
-#: plugins/exchange/exchange.cpp:75
-msgid "&Upload Event..."
+#: resourceview.cpp:705
+msgid "&Disable Color"
 msgstr ""
 
-#: plugins/exchange/exchange.cpp:83
-msgid "De&lete Event"
+#: resourceview.cpp:706
+msgid "Resources Colors"
 msgstr ""
 
-#: plugins/exchange/exchange.cpp:89
-msgid "&Configure..."
-msgstr ""
+#: resourceview.cpp:712
+#, fuzzy
+msgid "&Rename..."
+msgstr "ลบ..."
 
-#: plugins/exchange/exchange.cpp:104
-msgid ""
-"This plugin imports and export calendar events from/to a Microsoft Exchange "
-"2000 Server."
+#: resourceview.cpp:720
+msgid "Use as &Default Calendar"
 msgstr ""
 
-#: plugins/exchange/exchange.cpp:145 plugins/exchange/exchange.cpp:164
-msgid "Please select an appointment."
+#: resourceview.cpp:726
+msgid "&Add..."
 msgstr ""
 
-#: plugins/exchange/exchange.cpp:148
-msgid "Exchange Upload is EXPERIMENTAL, you may lose data on this appointment!"
+#: koincidenceeditor.cpp:75
+msgid "&Templates..."
 msgstr ""
 
-#: plugins/exchange/exchange.cpp:148
-msgid "&Upload"
+#: koincidenceeditor.cpp:88
+msgid "Atte&ndees"
 msgstr ""
 
-#: plugins/exchange/exchange.cpp:168
+#: koincidenceeditor.cpp:90
 msgid ""
-"Exchange Delete is EXPERIMENTAL, if this is a recurring event it will delete "
-"all instances!"
-msgstr ""
-
-#: plugins/exchange/exchange.cpp:195
-msgid "No Error"
-msgstr ""
-
-#: plugins/exchange/exchange.cpp:198
-msgid "The Exchange server could not be reached or returned an error."
+"The Attendees tab allows you to Add or Remove Attendees to/from this event or "
+"to-do."
 msgstr ""
 
-#: plugins/exchange/exchange.cpp:201
-msgid "Server response could not be interpreted."
+#: koincidenceeditor.cpp:174
+msgid "Unable to find template '%1'."
 msgstr ""
 
-#: plugins/exchange/exchange.cpp:204
-msgid "Appointment data could not be interpreted."
+#: koincidenceeditor.cpp:179
+msgid "Error loading template file '%1'."
 msgstr ""
 
-#: plugins/exchange/exchange.cpp:207
-msgid "This should not happen: trying to upload wrong type of event."
-msgstr ""
+#: koincidenceeditor.cpp:394 koincidenceeditor.cpp:395
+#, fuzzy
+msgid "Create to-do"
+msgstr "ลบรายการสิ่งที่จะทำ"
 
-#: plugins/exchange/exchange.cpp:210
-msgid "An error occurred trying to write an appointment to the server."
+#: koincidenceeditor.cpp:404 koincidenceeditor.cpp:405
+msgid "Counter proposal"
 msgstr ""
 
-#: plugins/exchange/exchange.cpp:213
-msgid "Trying to delete an event that is not present on the server."
+#: stdcalendar.cpp:74
+msgid "Active Calendar"
 msgstr ""
 
-#: plugins/exchange/exchange.cpp:217
-msgid "Unknown Error"
+#: stdcalendar.cpp:83
+msgid "Default Calendar"
 msgstr ""
 
-#: koagenda.cpp:906
-msgid "Unable to lock item for modification. You cannot make any changes."
+#: stdcalendar.cpp:98
+msgid "Birthdays"
 msgstr ""
 
-#: koagenda.cpp:908
-msgid "Locking Failed"
-msgstr ""
+#, fuzzy
+#~ msgid "Location: %1"
+#~ msgstr "ตำแหน่ง:"
 
-#: koagenda.cpp:1054
-msgid ""
-"The item you try to change is a recurring item. Shall the changes be applied "
-"only to this single occurrence, only to the future items, or to all items in "
-"the recurrence?"
-msgstr ""
+#~ msgid "1 minute"
+#~ msgstr "1 นาที"
 
-#: koagenda.cpp:1057
-msgid "Changing Recurring Item"
-msgstr ""
+#~ msgid "5 minutes"
+#~ msgstr "5 นาที"
 
-#: koagenda.cpp:1058
-msgid "Only &This Item"
-msgstr ""
+#~ msgid "10 minutes"
+#~ msgstr "10 นาที"
 
-#: koagenda.cpp:1058
-msgid "Only &Future Items"
-msgstr ""
+#~ msgid "15 minutes"
+#~ msgstr "15 นาที"
 
-#: koagenda.cpp:1058
-msgid "&All Occurrences"
-msgstr ""
+#~ msgid "30 minutes"
+#~ msgstr "30 นาที"
 
-#: koagenda.cpp:1073
-msgid "Dissociate event from recurrence"
-msgstr ""
+#~ msgid "Enter the default reminder time here."
+#~ msgstr "เติมเวลาปริยายในการเตือนที่นี่"
 
-#: koagenda.cpp:1087
-msgid ""
-"Unable to add the exception item to the calendar. No change will be done."
-msgstr ""
+#~ msgid "Owner:"
+#~ msgstr "เจ้าของ:"
 
-#: koagenda.cpp:1088 koagenda.cpp:1115
-msgid "Error Occurred"
-msgstr ""
+#~ msgid "&Reminder:"
+#~ msgstr "ตัวแจ้งเตือน:"
 
-#: koagenda.cpp:1101
-msgid "Split future recurrences"
-msgstr ""
+#~ msgid "event"
+#~ msgstr "เหตุการณ์"
 
-#: koagenda.cpp:1114
-msgid "Unable to add the future items to the calendar. No change will be done."
-msgstr ""
+#~ msgid "End Time"
+#~ msgstr "เวลาสิ้นสุด"
 
 #~ msgid "Select Cate&gories..."
 #~ msgstr "เลือกหมวดหมู่..."
diff --git a/tde-i18n-th/messages/tdepim/korn.po b/tde-i18n-th/messages/tdepim/korn.po
index 25a7af5e5a3..b42708f082d 100644
--- a/tde-i18n-th/messages/tdepim/korn.po
+++ b/tde-i18n-th/messages/tdepim/korn.po
@@ -5,15 +5,29 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: korn\n"
-"POT-Creation-Date: 2008-07-08 01:22+0200\n"
+"POT-Creation-Date: 2014-09-29 00:52-0500\n"
 "PO-Revision-Date: 2003-03-10 10:59+0700\n"
 "Last-Translator: Thanomsub Noppaburana <donga_n@yahoo.com>\n"
 "Language-Team: Thai <th@li.org>\n"
+"Language: th\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: KBabel 1.0\n"
 
+#: maildir_proto.h:47 qmail_proto.cpp:38 qmail_proto.h:50
+#, fuzzy
+msgid "Path:"
+msgstr "พอร์ต:"
+
+#: mbox_proto.cpp:37 mbox_proto.h:44
+msgid "File:"
+msgstr ""
+
+#: process_proto.h:40
+msgid "Program: "
+msgstr ""
+
 #: tdeio_proto.h:97
 msgid "Server:"
 msgstr "เซิร์ฟเวอร์:"
@@ -34,7 +48,7 @@ msgstr "กล่องจดหมาย:"
 msgid "Password:"
 msgstr "รหัสผ่าน:"
 
-#: imap_proto.cpp:59 tdeio_proto.h:102 nntp_proto.cpp:43 pop3_proto.cpp:58
+#: imap_proto.cpp:59 nntp_proto.cpp:43 pop3_proto.cpp:58 tdeio_proto.h:102
 msgid "Save password"
 msgstr "บันทึกรหัสผ่าน"
 
@@ -43,19 +57,6 @@ msgstr "บันทึกรหัสผ่าน"
 msgid "Authentication:"
 msgstr "ใช้การตรวจสอบสิทธิ์ APOP"
 
-#: maildir_proto.h:47 qmail_proto.cpp:38 qmail_proto.h:50
-#, fuzzy
-msgid "Path:"
-msgstr "พอร์ต:"
-
-#: mbox_proto.cpp:37 mbox_proto.h:44
-msgid "File:"
-msgstr ""
-
-#: process_proto.h:40
-msgid "Program: "
-msgstr ""
-
 #: _translatorinfo.cpp:1
 msgid ""
 "_: NAME OF TRANSLATORS\n"
@@ -171,59 +172,6 @@ msgstr "รหัสผ่าน:"
 msgid "Authentication"
 msgstr "ใช้การตรวจสอบสิทธิ์ APOP"
 
-#: tdeio.cpp:211
-msgid "url is not valid"
-msgstr ""
-
-#: tdeio_count.cpp:89 tdeio_count.cpp:90
-#, c-format
-msgid "Not able to open a tdeio slave for %1."
-msgstr ""
-
-#: tdeio_count.cpp:204 tdeio_count.cpp:254
-msgid "Got unknown job; something must be wrong..."
-msgstr ""
-
-#: tdeio_count.cpp:210 tdeio_count.cpp:211
-#, c-format
-msgid "The next TDEIO-error occurred by counting: %1"
-msgstr ""
-
-#: tdeio_delete.cpp:110
-msgid "Could not get a connected slave; I cannot delete this way..."
-msgstr ""
-
-#: tdeio_delete.cpp:185
-#, c-format
-msgid "An error occurred when deleting email: %1."
-msgstr ""
-
-#: tdeio_read.cpp:77 tdeio_read.cpp:91
-msgid "Unknown job returned; I will try if this one will do... "
-msgstr ""
-
-#: tdeio_read.cpp:80
-#, c-format
-msgid "An error occurred when fetching the requested email: %1."
-msgstr ""
-
-#: tdeio_single_subject.cpp:128 tdeio_single_subject.cpp:137
-msgid "Got invalid job; something strange happened?"
-msgstr ""
-
-#: tdeio_single_subject.cpp:141
-msgid "Error when fetching %1: %2"
-msgstr ""
-
-#: tdeio_subjects.cpp:66
-msgid "Already a slave pending."
-msgstr ""
-
-#: tdeio_subjects.cpp:104 tdeio_subjects.cpp:105
-#, c-format
-msgid "Not able to open a tdeio-slave for %1."
-msgstr ""
-
 #: kmail_proto.cpp:199
 msgid "KMail name"
 msgstr ""
@@ -619,6 +567,59 @@ msgstr "แคพชัน:"
 msgid "Deleting mail; please wait...."
 msgstr ""
 
+#: tdeio.cpp:211
+msgid "url is not valid"
+msgstr ""
+
+#: tdeio_count.cpp:89 tdeio_count.cpp:90
+#, c-format
+msgid "Not able to open a tdeio slave for %1."
+msgstr ""
+
+#: tdeio_count.cpp:204 tdeio_count.cpp:254
+msgid "Got unknown job; something must be wrong..."
+msgstr ""
+
+#: tdeio_count.cpp:210 tdeio_count.cpp:211
+#, c-format
+msgid "The next TDEIO-error occurred by counting: %1"
+msgstr ""
+
+#: tdeio_delete.cpp:110
+msgid "Could not get a connected slave; I cannot delete this way..."
+msgstr ""
+
+#: tdeio_delete.cpp:185
+#, c-format
+msgid "An error occurred when deleting email: %1."
+msgstr ""
+
+#: tdeio_read.cpp:77 tdeio_read.cpp:91
+msgid "Unknown job returned; I will try if this one will do... "
+msgstr ""
+
+#: tdeio_read.cpp:80
+#, c-format
+msgid "An error occurred when fetching the requested email: %1."
+msgstr ""
+
+#: tdeio_single_subject.cpp:128 tdeio_single_subject.cpp:137
+msgid "Got invalid job; something strange happened?"
+msgstr ""
+
+#: tdeio_single_subject.cpp:141
+msgid "Error when fetching %1: %2"
+msgstr ""
+
+#: tdeio_subjects.cpp:66
+msgid "Already a slave pending."
+msgstr ""
+
+#: tdeio_subjects.cpp:104 tdeio_subjects.cpp:105
+#, c-format
+msgid "Not able to open a tdeio-slave for %1."
+msgstr ""
+
 #, fuzzy
 #~ msgid "No protocol specified"
 #~ msgstr "<ไม่ได้ระบุ>"
diff --git a/tde-i18n-th/messages/tdepim/kres_birthday.po b/tde-i18n-th/messages/tdepim/kres_birthday.po
index 8ad0e899d81..52825440490 100644
--- a/tde-i18n-th/messages/tdepim/kres_birthday.po
+++ b/tde-i18n-th/messages/tdepim/kres_birthday.po
@@ -4,47 +4,53 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: kres_birthday\n"
-"POT-Creation-Date: 2005-12-15 03:11+0100\n"
+"POT-Creation-Date: 2014-09-29 00:52-0500\n"
 "PO-Revision-Date: 2005-12-01 15:30+0700\n"
 "Last-Translator: ถนอมทรัพย์ นพบูรณ์ <donga_n@yahoo.com>\n"
 "Language-Team: Thai <th@li.org>\n"
+"Language: th\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: KBabel 1.11\n"
 
-#: resourcekabc.cpp:168
+#: resourcetdeabc.cpp:76
+#, fuzzy
+msgid "Birthdays"
+msgstr "วันเกิด"
+
+#: resourcetdeabc.cpp:172
 msgid "%1's birthday"
 msgstr "วันเกิดของ %1"
 
-#: resourcekabc.cpp:209
+#: resourcetdeabc.cpp:213
 msgid "Birthday"
 msgstr "วันเกิด"
 
-#: resourcekabc.cpp:267
+#: resourcetdeabc.cpp:279
 msgid ""
 "_: insert names of both spouses\n"
 "%1's & %2's anniversary"
 msgstr "วันครบรอบของ %1 และ %2"
 
-#: resourcekabc.cpp:269
+#: resourcetdeabc.cpp:282
 msgid ""
 "_: only one spouse in addressbook, insert the name\n"
 "%1's anniversary"
 msgstr "วันครบรอบของ %1"
 
-#: resourcekabc.cpp:314
+#: resourcetdeabc.cpp:327
 msgid "Anniversary"
 msgstr "วันครบรอบ"
 
-#: resourcekabcconfig.cpp:41
+#: resourcetdeabcconfig.cpp:41
 msgid "Set reminder"
 msgstr "ตั้งการแจ้งเตือน"
 
-#: resourcekabcconfig.cpp:45
+#: resourcetdeabcconfig.cpp:45
 msgid "Reminder before (in days):"
 msgstr "แจ้งเตือนล่วงหน้า (วัน):"
 
-#: resourcekabcconfig.cpp:55
+#: resourcetdeabcconfig.cpp:55
 msgid "Filter by categories"
 msgstr "กรองตามหมวดหมู่"
diff --git a/tde-i18n-th/messages/tdepim/kres_exchange.po b/tde-i18n-th/messages/tdepim/kres_exchange.po
index 58efff040fc..2de8f782644 100644
--- a/tde-i18n-th/messages/tdepim/kres_exchange.po
+++ b/tde-i18n-th/messages/tdepim/kres_exchange.po
@@ -4,15 +4,20 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: kres_exchange\n"
-"POT-Creation-Date: 2006-03-25 04:00+0100\n"
+"POT-Creation-Date: 2014-09-29 00:52-0500\n"
 "PO-Revision-Date: 2005-12-01 16:59+0700\n"
 "Last-Translator: ถนอมทรัพย์ นพบูรณ์ <donga_n@yahoo.com>\n"
 "Language-Team: Thai <th@li.org>\n"
+"Language: th\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: KBabel 1.11\n"
 
+#: resourceexchange.cpp:94
+msgid "Exchange Server"
+msgstr ""
+
 #: resourceexchangeconfig.cpp:42
 msgid "Host:"
 msgstr "โฮสต์:"
diff --git a/tde-i18n-th/messages/tdepim/kres_featureplan.po b/tde-i18n-th/messages/tdepim/kres_featureplan.po
index 4aa7ad65471..44febb272a9 100644
--- a/tde-i18n-th/messages/tdepim/kres_featureplan.po
+++ b/tde-i18n-th/messages/tdepim/kres_featureplan.po
@@ -4,10 +4,11 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: kres_featureplan\n"
-"POT-Creation-Date: 2005-01-16 01:25+0100\n"
+"POT-Creation-Date: 2014-09-29 00:52-0500\n"
 "PO-Revision-Date: 2005-12-01 16:56+0700\n"
 "Last-Translator: ถนอมทรัพย์ นพบูรณ์ <donga_n@yahoo.com>\n"
 "Language-Team: Thai <th@li.org>\n"
+"Language: th\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/tde-i18n-th/messages/tdepim/libkholidays.po b/tde-i18n-th/messages/tdepim/libkholidays.po
index 72a36fa3e6f..25535cdfac7 100644
--- a/tde-i18n-th/messages/tdepim/libkholidays.po
+++ b/tde-i18n-th/messages/tdepim/libkholidays.po
@@ -4,10 +4,11 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: libkholidays\n"
-"POT-Creation-Date: 2005-02-19 01:28+0100\n"
+"POT-Creation-Date: 2014-09-29 00:52-0500\n"
 "PO-Revision-Date: 2005-12-01 15:33+0700\n"
 "Last-Translator: ถนอมทรัพย์ นพบูรณ์ <donga_n@yahoo.com>\n"
 "Language-Team: Thai <th@li.org>\n"
+"Language: th\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/tde-i18n-th/messages/tdepim/libkmime.po b/tde-i18n-th/messages/tdepim/libkmime.po
index c1032a9ce96..a7d60898c1a 100644
--- a/tde-i18n-th/messages/tdepim/libkmime.po
+++ b/tde-i18n-th/messages/tdepim/libkmime.po
@@ -4,10 +4,11 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: libkmime\n"
-"POT-Creation-Date: 2008-04-25 05:30+0200\n"
+"POT-Creation-Date: 2014-09-29 00:52-0500\n"
 "PO-Revision-Date: 2006-10-17 13:35+1000\n"
 "Last-Translator: Sahachart Anukulkitch <drrider@gmail.com>\n"
 "Language-Team: Thai <l10n@opentle.org>\n"
+"Language: th\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -66,21 +67,21 @@ msgstr ""
 "${to} ด้วยหัวเรื่อง \"${subject}\" ล้มเหลว สาเหตุอยู่ในช่องที่มีหัวเรื่อง "
 "ล้มเหลว: ที่ด้านล่าง"
 
-#: kmime_util.cpp:665
+#: kmime_util.cpp:642
 msgid "unknown"
 msgstr "ไม่ทราบ"
 
-#: kmime_util.cpp:682
+#: kmime_util.cpp:659
 #, c-format
 msgid "Today %1"
 msgstr "วันนี้ %1"
 
-#: kmime_util.cpp:689
+#: kmime_util.cpp:666
 #, c-format
 msgid "Yesterday %1"
 msgstr "เมื่อวาน %1"
 
-#: kmime_util.cpp:697
+#: kmime_util.cpp:674
 msgid ""
 "_: 1. weekday, 2. time\n"
 "%1 %2"
diff --git a/tde-i18n-th/messages/tdepim/tdefile_ics.po b/tde-i18n-th/messages/tdepim/tdefile_ics.po
index b85626f1354..c3e134b2a49 100644
--- a/tde-i18n-th/messages/tdepim/tdefile_ics.po
+++ b/tde-i18n-th/messages/tdepim/tdefile_ics.po
@@ -4,10 +4,11 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: tdefile_ics\n"
-"POT-Creation-Date: 2004-10-12 01:17+0200\n"
+"POT-Creation-Date: 2014-09-29 00:52-0500\n"
 "PO-Revision-Date: 2005-12-01 15:15+0700\n"
 "Last-Translator: ถนอมทรัพย์ นพบูรณ์ <donga_n@yahoo.com>\n"
 "Language-Team: Thai <th@li.org>\n"
+"Language: th\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/tde-i18n-th/messages/tdepim/tdefile_rfc822.po b/tde-i18n-th/messages/tdepim/tdefile_rfc822.po
index 0c70424b9e6..02b8414d3e2 100644
--- a/tde-i18n-th/messages/tdepim/tdefile_rfc822.po
+++ b/tde-i18n-th/messages/tdepim/tdefile_rfc822.po
@@ -5,10 +5,11 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: tdefile_rfc822\n"
-"POT-Creation-Date: 2004-10-12 01:17+0200\n"
+"POT-Creation-Date: 2014-09-29 00:52-0500\n"
 "PO-Revision-Date: 2003-03-04 14:03+0700\n"
 "Last-Translator: Thanomsub Noppaburana <donga_n@yahoo.com>\n"
 "Language-Team: Thai <th@li.org>\n"
+"Language: th\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/tde-i18n-th/messages/tdepim/tdefile_vcf.po b/tde-i18n-th/messages/tdepim/tdefile_vcf.po
index 9838aaac14b..40db3e656f9 100644
--- a/tde-i18n-th/messages/tdepim/tdefile_vcf.po
+++ b/tde-i18n-th/messages/tdepim/tdefile_vcf.po
@@ -5,10 +5,11 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: tdefile_vcf\n"
-"POT-Creation-Date: 2008-01-07 01:17+0100\n"
+"POT-Creation-Date: 2014-09-29 00:52-0500\n"
 "PO-Revision-Date: 2005-12-01 15:19+0700\n"
 "Last-Translator: ถนอมทรัพย์ นพบูรณ์ <donga_n@yahoo.com>\n"
 "Language-Team: Thai <th@li.org>\n"
+"Language: th\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/tde-i18n-th/messages/tdepim/tdeio_imap4.po b/tde-i18n-th/messages/tdepim/tdeio_imap4.po
index 077256f8096..8f45e829e75 100644
--- a/tde-i18n-th/messages/tdepim/tdeio_imap4.po
+++ b/tde-i18n-th/messages/tdepim/tdeio_imap4.po
@@ -6,10 +6,11 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: tdeio_imap4\n"
-"POT-Creation-Date: 2008-01-26 01:19+0100\n"
+"POT-Creation-Date: 2014-09-29 00:52-0500\n"
 "PO-Revision-Date: 2005-12-01 15:27+0700\n"
 "Last-Translator: ถนอมทรัพย์ นพบูรณ์ <donga_n@yahoo.com>\n"
 "Language-Team: Thai <th@li.org>\n"
+"Language: th\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -106,11 +107,7 @@ msgid ""
 "%2"
 msgstr "การยกเลิกการบอกรับของโฟลเดอร์ %1 ล้มเหลว"
 
-#: imap4.cc:1783
-msgid "Unable to close mailbox."
-msgstr "ไม่สามารถปิดกล่องจดหมายได้"
-
-#: imap4.cc:2051
+#: imap4.cc:2052
 msgid ""
 "The server %1 supports neither IMAP4 nor IMAP4rev1.\n"
 "It identified itself with: %2"
@@ -118,7 +115,7 @@ msgstr ""
 "เซิร์ฟเวอร์ %1 ไม่สนับสนุนทั้ง IMAP4 หรือ IMAP4rev1\n"
 "มันแสดงตัวมันเองเป็น: %2"
 
-#: imap4.cc:2062
+#: imap4.cc:2063
 msgid ""
 "The server does not support TLS.\n"
 "Disable this security feature to connect unencrypted."
@@ -126,23 +123,23 @@ msgstr ""
 "เซิร์ฟเวอร์ไม่รองรับ TLS\n"
 "ยกเลิกคุณสมบัติความปลอดภัยนี้ เพื่อทำการเชื่อมต่อแบบไม่เข้ารหัส"
 
-#: imap4.cc:2087
+#: imap4.cc:2088
 msgid "Starting TLS failed."
 msgstr "การเริ่มการทำงาน TLS ล้มเหลว"
 
-#: imap4.cc:2096
+#: imap4.cc:2097
 msgid "LOGIN is disabled by the server."
 msgstr ""
 
-#: imap4.cc:2103
+#: imap4.cc:2104
 msgid "The authentication method %1 is not supported by the server."
 msgstr "เซิร์ฟเวอร์ไม่รองรับวิธีการตรวจสอบสิทธิ์ %1"
 
-#: imap4.cc:2119
+#: imap4.cc:2132
 msgid "Username and password for your IMAP account:"
 msgstr "ชื่อผู้ใช้และรหัสผ่านของบัญชีผู้ใช้ IMAP ของคุณ:"
 
-#: imap4.cc:2133
+#: imap4.cc:2146
 msgid ""
 "Unable to login. Probably the password is wrong.\n"
 "The server %1 replied:\n"
@@ -152,7 +149,7 @@ msgstr ""
 "โดยเซิร์ฟเวอร์ %1 แจ้งว่า:\n"
 "%2"
 
-#: imap4.cc:2140
+#: imap4.cc:2153
 msgid ""
 "Unable to authenticate via %1.\n"
 "The server %2 replied:\n"
@@ -162,10 +159,14 @@ msgstr ""
 "โดยเซิร์ฟเวอร์ %2 แจ้งว่า:\n"
 "%3"
 
-#: imap4.cc:2147
+#: imap4.cc:2160
 msgid "SASL authentication is not compiled into tdeio_imap4."
-msgstr "ไลบรารี tdeio_imap4 ไม่ได้ถูกคอมไพล์มาให้รองรับการตรวจสอบสิทธิ์แบบ SASL"
+msgstr ""
+"ไลบรารี tdeio_imap4 ไม่ได้ถูกคอมไพล์มาให้รองรับการตรวจสอบสิทธิ์แบบ SASL"
 
-#: imap4.cc:2691
+#: imap4.cc:2704
 msgid "Unable to open folder %1. The server replied: %2"
 msgstr "ไม่สามารถเปิดโฟลเดอร์ %1 ได้ โดยเซิร์ฟเวอร์ตอบกลับมาว่า: %2"
+
+#~ msgid "Unable to close mailbox."
+#~ msgstr "ไม่สามารถปิดกล่องจดหมายได้"
author	Timothy Pearson <kb9vqf@pearsoncomputing.net>	2014-09-29 03:08:03 -0500
committer	Timothy Pearson <kb9vqf@pearsoncomputing.net>	2014-09-29 03:08:03 -0500
commit	242434109c14a494dee7738b9c343f5947d20506 (patch)
tree	ea25930767128361a7669f1a25a479a66ccdfbeb /tde-i18n-th/messages/tdepim
parent	8819501c6a160b7ae106b1a968bc953b0f0bc465 (diff)
download	tde-i18n-242434109c14a494dee7738b9c343f5947d20506.tar.gz tde-i18n-242434109c14a494dee7738b9c343f5947d20506.zip