1 files changed, 161 insertions, 136 deletions
diff --git a/tde-i18n-th/messages/tdebase/tdeio_media.po b/tde-i18n-th/messages/tdebase/tdeio_media.po
index 9746542d9b2..83e30f51268 100644
--- a/tde-i18n-th/messages/tdebase/tdeio_media.po
+++ b/tde-i18n-th/messages/tdebase/tdeio_media.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: tdeio_media\n"
-"POT-Creation-Date: 2019-01-13 18:47+0100\n"
+"POT-Creation-Date: 2019-07-11 02:33+0200\n"
 "PO-Revision-Date: 2007-05-12 18:35+1000\n"
 "Last-Translator: Sahachart Anukulkitch <drrider@gmail.com>\n"
 "Language-Team: Thai <l10n@opentle.org>\n"
@@ -47,7 +47,6 @@ msgstr "ไม่รู้จัก"
 #: mediaimpl.cpp:88 mediaimpl.cpp:115 mediaimpl.cpp:141 mediaimpl.cpp:177
 #: mediaimpl.cpp:197 mediaimpl.cpp:218
 #: mounthelper/tdeio_media_mounthelper.cpp:50
-#: mounthelper/tdeio_media_mounthelper.cpp:256
 msgid "The TDE mediamanager is not running."
 msgstr "ตัวจัดการสื่อของ TDE ไม่ได้กำลังทำงานอยู่"
 
@@ -55,7 +54,7 @@ msgstr "ตัวจัดการสื่อของ TDE ไม่ได้�
 msgid "This media name already exists."
 msgstr "มีชื่อของสื่อนี้อยู่แล้ว"
 
-#: mediaimpl.cpp:230 mediaimpl.cpp:293
+#: mediaimpl.cpp:230 mediaimpl.cpp:297
 msgid "No such medium."
 msgstr "ไม่มีสื่อแบบนั้น"
 
@@ -63,113 +62,117 @@ msgstr "ไม่มีสื่อแบบนั้น"
 msgid "The drive is encrypted."
 msgstr ""
 
-#: mediaimpl.cpp:272 mediamanager/halbackend.cpp:1264
-#: mediamanager/halbackend.cpp:1273 mediamanager/halbackend.cpp:1663
-#: mediamanager/halbackend.cpp:1680 mediamanager/halbackend.cpp:1691
-#: mediamanager/halbackend.cpp:1793 mediamanager/halbackend.cpp:1801
-#: mediamanager/halbackend.cpp:1808 mediamanager/halbackend.cpp:1848
-#: mediamanager/halbackend.cpp:1854 mediamanager/halbackend.cpp:1861
-#: mounthelper/tdeio_media_mounthelper.cpp:58
-msgid "Internal Error"
-msgstr "ข้อผิดพลาดภายใน"
+#: mediaimpl.cpp:274 mediamanager/tdehardwarebackend.cpp:201
+#: mediamanager/tdehardwarebackend.cpp:252
+#: mounthelper/tdeio_media_mounthelper.cpp:202
+msgid "Unknown mount error."
+msgstr ""
 
 #: mediamanager/dialog.cpp:26 mounthelper/dialog.cpp:26
-msgid "Decrypt"
+msgid "Unlock"
 msgstr ""
 
-#: mediamanager/fstabbackend.cpp:104 mediamanager/fstabbackend.cpp:114
-#: mediamanager/halbackend.cpp:1595 mediamanager/halbackend.cpp:1617
-#: mediamanager/halbackend.cpp:1776 mediamanager/halbackend.cpp:1831
-#: mediamanager/tdehardwarebackend.cpp:1349
-#: mediamanager/tdehardwarebackend.cpp:1360
+#: mediamanager/fstabbackend.cpp:105 mediamanager/fstabbackend.cpp:120
+#: mediamanager/halbackend.cpp:1598 mediamanager/halbackend.cpp:1625
+#: mediamanager/halbackend.cpp:1808 mediamanager/halbackend.cpp:1877
+#: mediamanager/mediamanager.cpp:363 mediamanager/mediamanager.cpp:375
+#: mediamanager/mediamanager.cpp:387 mediamanager/mediamanager.cpp:399
+#: mediamanager/tdehardwarebackend.cpp:1363
+#: mediamanager/tdehardwarebackend.cpp:1378
 #, c-format
 msgid "No such medium: %1"
 msgstr "ไม่มีสื่อ: %1"
 
-#: mediamanager/fstabbackend.cpp:398
+#: mediamanager/fstabbackend.cpp:408
 msgid "CD Recorder"
 msgstr "เครื่องบันทึกซีดี"
 
-#: mediamanager/fstabbackend.cpp:404
+#: mediamanager/fstabbackend.cpp:414
 msgid "DVD"
 msgstr "ดีวีดี"
 
-#: mediamanager/fstabbackend.cpp:415
+#: mediamanager/fstabbackend.cpp:425
 msgid "CD-ROM"
 msgstr "ซีดีรอม"
 
-#: mediamanager/fstabbackend.cpp:428
+#: mediamanager/fstabbackend.cpp:438
 msgid "Floppy"
 msgstr "ฟล็อบปี้"
 
-#: mediamanager/fstabbackend.cpp:436
+#: mediamanager/fstabbackend.cpp:446
 msgid "Zip Disk"
 msgstr "ดิสก์ Zip"
 
-#: mediamanager/fstabbackend.cpp:447
+#: mediamanager/fstabbackend.cpp:457
 msgid "Removable Device"
 msgstr "อุปกรณ์ถอดเสียบ"
 
-#: mediamanager/fstabbackend.cpp:452 mediamanager/fstabbackend.cpp:458
+#: mediamanager/fstabbackend.cpp:462 mediamanager/fstabbackend.cpp:468
 msgid "Remote Share"
 msgstr "การใช้งานร่วมกันระยะไกล"
 
-#: mediamanager/fstabbackend.cpp:463
+#: mediamanager/fstabbackend.cpp:473
 msgid "Hard Disk"
 msgstr "ฮาร์ดดิสก์"
 
-#: mediamanager/halbackend.cpp:749 mediamanager/tdehardwarebackend.cpp:805
+#: mediamanager/halbackend.cpp:744 mediamanager/tdehardwarebackend.cpp:808
 #, fuzzy
 msgid "Unknown Drive"
 msgstr "ไม่รู้จัก"
 
-#: mediamanager/halbackend.cpp:761 mediamanager/tdehardwarebackend.cpp:835
+#: mediamanager/halbackend.cpp:756 mediamanager/tdehardwarebackend.cpp:838
 #, fuzzy
 msgid "Floppy Drive"
 msgstr "ฟล็อบปี้"
 
-#: mediamanager/halbackend.cpp:769
+#: mediamanager/halbackend.cpp:764
 #, fuzzy
 msgid "Zip Drive"
 msgstr "ดิสก์ Zip"
 
-#: mediamanager/halbackend.cpp:839 mediamanager/tdehardwarebackend.cpp:892
+#: mediamanager/halbackend.cpp:834 mediamanager/tdehardwarebackend.cpp:895
 msgid "Camera"
 msgstr "กล้อง"
 
-#: mediamanager/halbackend.cpp:1221 mediamanager/halbackend.cpp:1247
+#: mediamanager/halbackend.cpp:1216 mediamanager/halbackend.cpp:1242
 msgid "Authenticate"
 msgstr ""
 
-#: mediamanager/halbackend.cpp:1222
+#: mediamanager/halbackend.cpp:1217
 msgid ""
 "<big><b>System policy prevents mounting internal media</b></big><br/"
 ">Authentication is required to perform this action. Please enter your "
 "password to verify."
 msgstr ""
 
-#: mediamanager/halbackend.cpp:1248
+#: mediamanager/halbackend.cpp:1243
 msgid ""
 "<big><b>System policy prevents unmounting media mounted by other users</b></"
 "big><br/>Authentication is required to perform this action. Please enter "
 "your password to verify."
 msgstr ""
 
-#: mediamanager/halbackend.cpp:1284
+#: mediamanager/halbackend.cpp:1259 mediamanager/halbackend.cpp:1268
+#: mediamanager/halbackend.cpp:1849 mediamanager/halbackend.cpp:1916
+#: mounthelper/tdeio_media_mounthelper.cpp:58
+msgid "Internal Error"
+msgstr "ข้อผิดพลาดภายใน"
+
+#: mediamanager/halbackend.cpp:1279
 msgid "Invalid filesystem type"
 msgstr "ชนิดของระบบแฟ้มไม่ถูกต้อง"
 
-#: mediamanager/halbackend.cpp:1286
+#: mediamanager/halbackend.cpp:1281
 msgid ""
 "Permission denied<p>Please ensure that:<br>1. You have permission to access "
 "this device.<br>2. This device node is not listed in /etc/fstab.</p>"
 msgstr ""
 
-#: mediamanager/halbackend.cpp:1290
+#: mediamanager/halbackend.cpp:1285
 msgid "Device is already mounted."
 msgstr "อุปกรณ์ถูกเมานท์อยู่แล้ว"
 
-#: mediamanager/halbackend.cpp:1340
+#: mediamanager/halbackend.cpp:1335
 msgid ""
 "Moreover, programs still using the device have been detected. They are "
 "listed below. You have to close them or change their working directory "
@@ -179,16 +182,16 @@ msgstr ""
 "คุณต้องปิดโปรแกรมเหล่านั้นก่อน หรือไม่ก็เปลี่ยนไดเร็คทอรีที่ใช้งานอยู่ไปที่อื่น "
 "ก่อนที่จะทำการเลิกเมานท์อุปกรณ์อีกครั้ง"
 
-#: mediamanager/halbackend.cpp:1381 mediamanager/tdehardwarebackend.cpp:1588
+#: mediamanager/halbackend.cpp:1376 mediamanager/tdehardwarebackend.cpp:1618
 msgid ""
 "Programs that were still using the device have been forcibly terminated. "
 "They are listed below."
 msgstr ""
 
-#: mediamanager/halbackend.cpp:1402 mediamanager/halbackend.cpp:1715
-#: mediamanager/tdehardwarebackend.cpp:1406
-#: mediamanager/tdehardwarebackend.cpp:1424
-#: mediamanager/tdehardwarebackend.cpp:1464
+#: mediamanager/halbackend.cpp:1397 mediamanager/halbackend.cpp:1742
+#: mediamanager/tdehardwarebackend.cpp:1430
+#: mediamanager/tdehardwarebackend.cpp:1452
+#: mediamanager/tdehardwarebackend.cpp:1494
 msgid ""
 "Unfortunately, the device <b>%1</b> (%2) named <b>'%3'</b> and currently "
 "mounted at <b>%4</b> could not be unmounted. "
@@ -196,196 +199,199 @@ msgstr ""
 "อุปกรณ์ <b>%1</b> (%2) ที่ชื่อ <b>'%3'</b> และกำลังเมานท์อยู่ที่ <b>%4</b> "
 "ไม่สามารถเลิกเมานท์ได้"
 
-#: mediamanager/halbackend.cpp:1408 mediamanager/tdehardwarebackend.cpp:1470
+#: mediamanager/halbackend.cpp:1403 mediamanager/tdehardwarebackend.cpp:1500
 msgid "The following error was returned by umount command:"
 msgstr "คำสั่ง umount คืนค่าความผิดพลาดต่อไปนี้กลับมา:"
 
-#: mediamanager/halbackend.cpp:1478
+#: mediamanager/halbackend.cpp:1567 mediamanager/tdehardwarebackend.cpp:1322
+msgid "Cannot mount encrypted locked drives!"
+msgstr ""
+
+#: mediamanager/halbackend.cpp:1682 mediamanager/halbackend.cpp:1703
+#: mediamanager/halbackend.cpp:1716 mediamanager/halbackend.cpp:1830
+#: mediamanager/halbackend.cpp:1840 mediamanager/halbackend.cpp:1899
+#: mediamanager/halbackend.cpp:1907
 #, fuzzy
-msgid "Permission denied"
-msgstr "สิทธิ์อนุญาตถูกปฏิเสธ"
+msgid "Internal error"
+msgstr "ข้อผิดพลาดภายใน"
 
-#: mediamanager/halbackend.cpp:1562 mediamanager/tdehardwarebackend.cpp:1232
-msgid "Cannot mount encrypted drives!"
-msgstr ""
+#: mediamanager/halbackend.cpp:1694
+#, fuzzy
+#| msgid "Unknown"
+msgid "Unknown error"
+msgstr "ไม่รู้จัก"
 
-#: mediamanager/halbackend.cpp:1721
+#: mediamanager/halbackend.cpp:1748
 msgid "Unmounting failed due to the following error:"
 msgstr "การเลิกเมานท์ล้มเหลวเนื่องจากข้อผิดพลาดต่อไปนี้:"
 
-#: mediamanager/halbackend.cpp:1723
+#: mediamanager/halbackend.cpp:1750
 msgid "Device is Busy:"
 msgstr "อุปกรณ์ไม่ว่าง"
 
-#: mediamanager/halbackend.cpp:1727
+#: mediamanager/halbackend.cpp:1754
 msgid ""
 "Permission denied<p>Please ensure that:<br>1. You have permission to access "
 "this device.<br>2. This device was originally mounted using TDE.</p>"
 msgstr ""
 
-#: mediamanager/halbackend.cpp:1739
+#: mediamanager/halbackend.cpp:1766
 msgid ""
 "%1<p><b>Would you like to forcibly terminate these processes?</b><br><i>All "
 "unsaved data would be lost</i>"
 msgstr ""
 
-#: mediamanager/halbackend.cpp:1811
+#: mediamanager/halbackend.cpp:1852
 msgid "Wrong password"
 msgstr ""
 
-#: mediamanager/mediamanager.cpp:247 mediamanager/mediamanager.cpp:266
-#: mediamanager/mediamanager.cpp:285 mediamanager/mediamanager.cpp:293
-#: mediamanager/mediamanager.cpp:302 mediamanager/mediamanager.cpp:310
-msgid "Feature only available with HAL"
-msgstr "ความสามารถนี้มีกับ HAL เท่านั้น"
-
-#: mediamanager/mediamanager.cpp:252
+#: mediamanager/mediamanager.cpp:248 mediamanager/mediamanager.cpp:275
 #, fuzzy
 msgid "Feature only available with the TDE hardware backend"
 msgstr "ความสามารถนี้มีกับ HAL เท่านั้น"
 
-#: mediamanager/mediamanager.cpp:256 mediamanager/mediamanager.cpp:271
-#: mediamanager/mediamanager.cpp:275
+#: mediamanager/mediamanager.cpp:255 mediamanager/mediamanager.cpp:282
+#: mediamanager/mediamanager.cpp:312 mediamanager/mediamanager.cpp:343
+msgid "Feature only available with HAL"
+msgstr "ความสามารถนี้มีกับ HAL เท่านั้น"
+
+#: mediamanager/mediamanager.cpp:262 mediamanager/mediamanager.cpp:289
+#: mediamanager/mediamanager.cpp:320 mediamanager/mediamanager.cpp:350
 #, fuzzy
 msgid "Feature only available with HAL or TDE hardware backend"
 msgstr "ความสามารถนี้มีกับ HAL เท่านั้น"
 
-#: mediamanager/tdehardwarebackend.cpp:480
-#: mediamanager/tdehardwarebackend.cpp:517
-#: mediamanager/tdehardwarebackend.cpp:750
+#: mediamanager/tdehardwarebackend.cpp:483
+#: mediamanager/tdehardwarebackend.cpp:520
+#: mediamanager/tdehardwarebackend.cpp:753
 #, fuzzy
 msgid "%1 Removable Device"
 msgstr "อุปกรณ์ถอดเสียบ"
 
-#: mediamanager/tdehardwarebackend.cpp:525
+#: mediamanager/tdehardwarebackend.cpp:528
 #, fuzzy
 msgid "Blank CD-ROM"
 msgstr "ซีดีรอม"
 
-#: mediamanager/tdehardwarebackend.cpp:534
+#: mediamanager/tdehardwarebackend.cpp:537
 msgid "Blank CD-R"
 msgstr ""
 
-#: mediamanager/tdehardwarebackend.cpp:543
+#: mediamanager/tdehardwarebackend.cpp:546
 msgid "Blank CD-RW"
 msgstr ""
 
-#: mediamanager/tdehardwarebackend.cpp:552
+#: mediamanager/tdehardwarebackend.cpp:555
 msgid "Blank Magneto-Optical CD"
 msgstr ""
 
-#: mediamanager/tdehardwarebackend.cpp:561
+#: mediamanager/tdehardwarebackend.cpp:564
 msgid "Blank Mount Ranier CD-RW"
 msgstr ""
 
-#: mediamanager/tdehardwarebackend.cpp:570
+#: mediamanager/tdehardwarebackend.cpp:573
 msgid "Blank Mount Ranier CD-RW-W"
 msgstr ""
 
-#: mediamanager/tdehardwarebackend.cpp:579
+#: mediamanager/tdehardwarebackend.cpp:582
 msgid "Blank DVD-ROM"
 msgstr ""
 
-#: mediamanager/tdehardwarebackend.cpp:588
+#: mediamanager/tdehardwarebackend.cpp:591
 msgid "Blank DVD-RAM"
 msgstr ""
 
-#: mediamanager/tdehardwarebackend.cpp:597
+#: mediamanager/tdehardwarebackend.cpp:600
 msgid "Blank DVD-R"
 msgstr ""
 
-#: mediamanager/tdehardwarebackend.cpp:606
+#: mediamanager/tdehardwarebackend.cpp:609
 msgid "Blank DVD-RW"
 msgstr ""
 
-#: mediamanager/tdehardwarebackend.cpp:615
+#: mediamanager/tdehardwarebackend.cpp:618
 msgid "Blank Dual Layer DVD-R"
 msgstr ""
 
-#: mediamanager/tdehardwarebackend.cpp:624
+#: mediamanager/tdehardwarebackend.cpp:627
 msgid "Blank Dual Layer DVD-RW"
 msgstr ""
 
-#: mediamanager/tdehardwarebackend.cpp:633
+#: mediamanager/tdehardwarebackend.cpp:636
 msgid "Blank DVD+R"
 msgstr ""
 
-#: mediamanager/tdehardwarebackend.cpp:642
+#: mediamanager/tdehardwarebackend.cpp:645
 msgid "Blank DVD+RW"
 msgstr ""
 
-#: mediamanager/tdehardwarebackend.cpp:651
+#: mediamanager/tdehardwarebackend.cpp:654
 msgid "Blank Dual Layer DVD+R"
 msgstr ""
 
-#: mediamanager/tdehardwarebackend.cpp:660
+#: mediamanager/tdehardwarebackend.cpp:663
 msgid "Blank Dual Layer DVD+RW"
 msgstr ""
 
-#: mediamanager/tdehardwarebackend.cpp:669
+#: mediamanager/tdehardwarebackend.cpp:672
 msgid "Blank BD-ROM"
 msgstr ""
 
-#: mediamanager/tdehardwarebackend.cpp:678
+#: mediamanager/tdehardwarebackend.cpp:681
 msgid "Blank BD-R"
 msgstr ""
 
-#: mediamanager/tdehardwarebackend.cpp:687
+#: mediamanager/tdehardwarebackend.cpp:690
 msgid "Blank BD-RW"
 msgstr ""
 
-#: mediamanager/tdehardwarebackend.cpp:696
+#: mediamanager/tdehardwarebackend.cpp:699
 msgid "Blank HDDVD-ROM"
 msgstr ""
 
-#: mediamanager/tdehardwarebackend.cpp:705
+#: mediamanager/tdehardwarebackend.cpp:708
 msgid "Blank HDDVD-R"
 msgstr ""
 
-#: mediamanager/tdehardwarebackend.cpp:714
+#: mediamanager/tdehardwarebackend.cpp:717
 msgid "Blank HDDVD-RW"
 msgstr ""
 
-#: mediamanager/tdehardwarebackend.cpp:721
+#: mediamanager/tdehardwarebackend.cpp:724
 msgid "Audio CD"
 msgstr ""
 
-#: mediamanager/tdehardwarebackend.cpp:742
+#: mediamanager/tdehardwarebackend.cpp:745
 msgid "%1 Fixed Disk (%2)"
 msgstr ""
 
-#: mediamanager/tdehardwarebackend.cpp:849
+#: mediamanager/tdehardwarebackend.cpp:852
 #, fuzzy
 msgid "%1 Zip Disk"
 msgstr "ดิสก์ Zip"
 
-#: mediamanager/tdehardwarebackend.cpp:1212
-#: mediamanager/tdehardwarebackend.cpp:1392
-#, fuzzy
-msgid "Internal error"
-msgstr "ข้อผิดพลาดภายใน"
+#: mediamanager/tdehardwarebackend.cpp:1224
+#: mediamanager/tdehardwarebackend.cpp:1417
+msgid "Internal error. Couldn't find medium."
+msgstr ""
 
-#: mediamanager/tdehardwarebackend.cpp:1239
-msgid ""
-"<qt>Unable to mount this device.<p>Potential reasons include:<br>Improper "
-"device and/or user privilege level<br>Corrupt data on storage device"
+#: mediamanager/tdehardwarebackend.cpp:1249
+#: mediamanager/tdehardwarebackend.cpp:1323
+msgid "Unable to mount this device."
 msgstr ""
 
-#: mediamanager/tdehardwarebackend.cpp:1241
-#: mediamanager/tdehardwarebackend.cpp:1316
-#: mediamanager/tdehardwarebackend.cpp:1408
-#: mediamanager/tdehardwarebackend.cpp:1426
+#: mediamanager/tdehardwarebackend.cpp:1252
+#: mediamanager/tdehardwarebackend.cpp:1326
+#: mediamanager/tdehardwarebackend.cpp:1435
+#: mediamanager/tdehardwarebackend.cpp:1457
 msgid "<p>Technical details:<br>"
 msgstr ""
 
-#: mediamanager/tdehardwarebackend.cpp:1314
-msgid ""
-"<qt>Unable to mount this device.<p>Potential reasons include:<br>Improper "
-"device and/or user privilege level<br>Corrupt data on storage "
-"device<br>Incorrect encryption password"
+#: mediamanager/tdehardwarebackend.cpp:1284
+msgid "Decryption aborted"
 msgstr ""
 
-#: mediamanager/tdehardwarebackend.cpp:1420
+#: mediamanager/tdehardwarebackend.cpp:1443
 msgid ""
 "<qt>The device <b>%1</b> (%2) named <b>'%3'</b> and currently mounted at <b>"
 "%4</b> can not be unmounted at this time.<p>%5<p><b>Would you like to "
@@ -393,7 +399,7 @@ msgid ""
 "lost</i>"
 msgstr ""
 
-#: mediamanager/tdehardwarebackend.cpp:1547
+#: mediamanager/tdehardwarebackend.cpp:1577
 #, fuzzy
 msgid ""
 "Programs still using the device have been detected. They are listed below. "
@@ -408,7 +414,7 @@ msgstr ""
 msgid "%1 cannot be found."
 msgstr "ไม่พบ %1"
 
-#: mounthelper/tdeio_media_mounthelper.cpp:86
+#: mounthelper/tdeio_media_mounthelper.cpp:87
 msgid "%1 is not a mountable media."
 msgstr "%1 ไม่ใช่สื่อที่จะเมานท์ได้"
 
@@ -419,39 +425,47 @@ msgstr "%1 ไม่ใช่สื่อที่จะเมานท์ได
 
 #: mounthelper/tdeio_media_mounthelper.cpp:107
 #, fuzzy
-msgid "%1 is already decrypted."
+msgid "%1 is already unlocked."
 msgstr "อุปกรณ์ถูกเมานท์อยู่แล้ว"
 
-#: mounthelper/tdeio_media_mounthelper.cpp:228
+#: mounthelper/tdeio_media_mounthelper.cpp:139
+msgid "Unknown unmount error."
+msgstr ""
+
+#: mounthelper/tdeio_media_mounthelper.cpp:246
 msgid "The device was successfully unmounted, but the tray could not be opened"
 msgstr "การเลิกเมานท์อุปกรณ์สำเร็จ แต่ไม่สามารถเปิดถาดได้"
 
-#: mounthelper/tdeio_media_mounthelper.cpp:230
+#: mounthelper/tdeio_media_mounthelper.cpp:248
 msgid "The device was successfully unmounted, but could not be ejected"
 msgstr "การเลิกเมานท์อุปกรณ์สำเร็จ แต่ไม่สามารถเอาสื่อออกได้"
 
-#: mounthelper/tdeio_media_mounthelper.cpp:275
+#: mounthelper/tdeio_media_mounthelper.cpp:281
+msgid "Unknown decrypt error."
+msgstr ""
+
+#: mounthelper/tdeio_media_mounthelper.cpp:295
 #, fuzzy
 msgid "Decrypt given URL"
 msgstr "ยกเลิกเมานท์ตำแหน่งที่กำหนด"
 
-#: mounthelper/tdeio_media_mounthelper.cpp:276
+#: mounthelper/tdeio_media_mounthelper.cpp:296
 msgid "Unmount given URL"
 msgstr "ยกเลิกเมานท์ตำแหน่งที่กำหนด"
 
-#: mounthelper/tdeio_media_mounthelper.cpp:277
+#: mounthelper/tdeio_media_mounthelper.cpp:297
 msgid "Mount given URL (default)"
 msgstr "เมานท์ตำแหน่งที่กำหนด (ค่าปริยาย)"
 
-#: mounthelper/tdeio_media_mounthelper.cpp:278
+#: mounthelper/tdeio_media_mounthelper.cpp:298
 msgid "Eject given URL via tdeeject"
 msgstr "เอาแผ่นที่ URL ที่กำหนดออกผ่าน tdeeject"
 
-#: mounthelper/tdeio_media_mounthelper.cpp:279
+#: mounthelper/tdeio_media_mounthelper.cpp:299
 msgid "Unmount and Eject given URL (necessary for some USB devices)"
 msgstr "ให้เลิกเมานท์และเอาแผ่นที่ URL ที่กำหนดออก (จำเป็นสำหรับอุปกรณ์ USB บางตัว)"
 
-#: mounthelper/tdeio_media_mounthelper.cpp:280
+#: mounthelper/tdeio_media_mounthelper.cpp:300
 msgid "media:/ URL to mount/unmount/eject/remove"
 msgstr "ตำแหน่ง media:/ เพื่อเมานท์/ยกเลิกเมานท์/เอาแผ่นออก/ถอดอุปกรณ์ออก"
 
@@ -472,43 +486,43 @@ msgstr "การบันทึกความเปลี่ยนแปลง
 msgid "&Mounting"
 msgstr "เ&มานท์"
 
-#: tdefile-plugin/tdefilemediaplugin.cpp:190
+#: tdefile-plugin/tdefilemediaplugin.cpp:184
 msgid "Medium Information"
 msgstr "ข้อมูลของสื่อ"
 
-#: tdefile-plugin/tdefilemediaplugin.cpp:193
+#: tdefile-plugin/tdefilemediaplugin.cpp:187
 msgid "Free"
 msgstr "ว่าง"
 
-#: tdefile-plugin/tdefilemediaplugin.cpp:196
+#: tdefile-plugin/tdefilemediaplugin.cpp:190
 msgid "Used"
 msgstr "ใช้ไป"
 
-#: tdefile-plugin/tdefilemediaplugin.cpp:199
+#: tdefile-plugin/tdefilemediaplugin.cpp:193
 msgid "Total"
 msgstr "ทั้งหมด"
 
-#: tdefile-plugin/tdefilemediaplugin.cpp:202
+#: tdefile-plugin/tdefilemediaplugin.cpp:196
 msgid "Base URL"
 msgstr "URL พื้นฐาน"
 
-#: tdefile-plugin/tdefilemediaplugin.cpp:203
+#: tdefile-plugin/tdefilemediaplugin.cpp:197
 msgid "Mount Point"
 msgstr "จุดเมานท์"
 
-#: tdefile-plugin/tdefilemediaplugin.cpp:204
+#: tdefile-plugin/tdefilemediaplugin.cpp:198
 msgid "Device Node"
 msgstr "โหนดอุปกรณ์"
 
-#: tdefile-plugin/tdefilemediaplugin.cpp:206
+#: tdefile-plugin/tdefilemediaplugin.cpp:200
 msgid "Medium Summary"
 msgstr "ข้อมูลสรุปของสือ"
 
-#: tdefile-plugin/tdefilemediaplugin.cpp:208
+#: tdefile-plugin/tdefilemediaplugin.cpp:202
 msgid "Usage"
 msgstr "ใช้ไป"
 
-#: tdefile-plugin/tdefilemediaplugin.cpp:210
+#: tdefile-plugin/tdefilemediaplugin.cpp:204
 msgid "Bar Graph"
 msgstr "กราฟแท่ง"
 
@@ -580,23 +594,30 @@ msgid ""
 "devices are plugged in."
 msgstr ""
 
-#: mediamanager/decryptdialog.ui:24 mounthelper/decryptdialog.ui:24
+#: mediamanager/unlockdialog.ui:24 mounthelper/unlockdialog.ui:24
 #, no-c-format
 msgid "Decrypting Storage Device"
 msgstr ""
 
-#: mediamanager/decryptdialog.ui:109 mounthelper/decryptdialog.ui:109
+#: mediamanager/unlockdialog.ui:109
 #, no-c-format
 msgid ""
-"<p><b>%1</b> is an encrypted storage device.</p>\n"
-"<p>Please enter the password to decrypt the storage device.</p>"
+"<p><b>%1</b> is an encrypted locked storage device.</p>\n"
+"<p>Please enter the password to unlock the storage device.</p>"
 msgstr ""
 
-#: mediamanager/decryptdialog.ui:131 mounthelper/decryptdialog.ui:131
+#: mediamanager/unlockdialog.ui:131 mounthelper/unlockdialog.ui:131
 #, no-c-format
 msgid "&Password:"
 msgstr ""
 
+#: mounthelper/unlockdialog.ui:109
+#, no-c-format
+msgid ""
+"<p><b>%1</b> is an encrypted storage device.</p>\n"
+"<p>Please enter the password to decrypt the storage device.</p>"
+msgstr ""
+
 #: propsdlgplugin/propertiespagegui.ui:16
 #, no-c-format
 msgid "PropertiesPageGUI"
@@ -849,3 +870,7 @@ msgstr "ผสมกัน"
 #, no-c-format
 msgid "Filesystem: iso9660"
 msgstr "ระบบแฟ้ม: iso9660"
+
+#, fuzzy
+#~ msgid "Permission denied"
+#~ msgstr "สิทธิ์อนุญาตถูกปฏิเสธ"