1 files changed, 237 insertions, 141 deletions
diff --git a/tde-i18n-th/messages/tdebase/tdeio_media.po b/tde-i18n-th/messages/tdebase/tdeio_media.po
index 21523782096..3f850e45460 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: 2020-09-09 18:58+0200\n"
+"POT-Creation-Date: 2020-10-17 08:51+0800\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"
@@ -44,27 +44,26 @@ msgstr "เปิดในหน้าต่างใหม่"
 msgid "Unknown"
 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
+#: mediaimpl.cpp:88 mediaimpl.cpp:115 mediaimpl.cpp:140 mediaimpl.cpp:176
+#: mediaimpl.cpp:196 mediaimpl.cpp:217
 msgid "The TDE mediamanager is not running."
 msgstr "ตัวจัดการสื่อของ TDE ไม่ได้กำลังทำงานอยู่"
 
-#: mediaimpl.cpp:187
+#: mediaimpl.cpp:186
 msgid "This media name already exists."
 msgstr "มีชื่อของสื่อนี้อยู่แล้ว"
 
-#: mediaimpl.cpp:230 mediaimpl.cpp:297
+#: mediaimpl.cpp:229 mediaimpl.cpp:296
 msgid "No such medium."
 msgstr "ไม่มีสื่อแบบนั้น"
 
-#: mediaimpl.cpp:238
+#: mediaimpl.cpp:237
 msgid "The drive is encrypted."
 msgstr ""
 
-#: mediaimpl.cpp:274 mediamanager/tdehardwarebackend.cpp:201
-#: mediamanager/tdehardwarebackend.cpp:252
-#: mounthelper/tdeio_media_mounthelper.cpp:202
+#: mediaimpl.cpp:273 mediamanager/tdehardwarebackend.cpp:191
+#: mediamanager/tdehardwarebackend.cpp:242
+#: mounthelper/tdeio_media_mounthelper.cpp:79
 msgid "Unknown mount error."
 msgstr ""
 
@@ -77,106 +76,107 @@ msgid "Unlock"
 msgstr ""
 
 #: mediamanager/fstabbackend.cpp:105 mediamanager/fstabbackend.cpp:120
-#: mediamanager/halbackend.cpp:1622 mediamanager/halbackend.cpp:1649
-#: mediamanager/halbackend.cpp:1832 mediamanager/halbackend.cpp:1901
-#: mediamanager/mediamanager.cpp:363 mediamanager/mediamanager.cpp:375
-#: mediamanager/mediamanager.cpp:387 mediamanager/mediamanager.cpp:399
-#: mediamanager/tdehardwarebackend.cpp:1364
-#: mediamanager/tdehardwarebackend.cpp:1379
+#: mediamanager/halbackend.cpp:1644 mediamanager/halbackend.cpp:1671
+#: mediamanager/halbackend.cpp:1858 mediamanager/halbackend.cpp:1932
+#: mediamanager/mediamanager.cpp:356 mediamanager/mediamanager.cpp:368
+#: mediamanager/mediamanager.cpp:380 mediamanager/mediamanager.cpp:392
+#: mediamanager/tdehardwarebackend.cpp:1312
+#: mediamanager/tdehardwarebackend.cpp:1326
+#: mediamanager/tdehardwarebackend.cpp:1442
+#: mediamanager/tdehardwarebackend.cpp:1491
 #, c-format
 msgid "No such medium: %1"
 msgstr "ไม่มีสื่อ: %1"
 
-#: mediamanager/fstabbackend.cpp:408
+#: mediamanager/fstabbackend.cpp:416
 msgid "CD Recorder"
 msgstr "เครื่องบันทึกซีดี"
 
-#: mediamanager/fstabbackend.cpp:414
+#: mediamanager/fstabbackend.cpp:422
 msgid "DVD"
 msgstr "ดีวีดี"
 
-#: mediamanager/fstabbackend.cpp:427
+#: mediamanager/fstabbackend.cpp:435
 msgid "CD-ROM"
 msgstr "ซีดีรอม"
 
-#: mediamanager/fstabbackend.cpp:440
+#: mediamanager/fstabbackend.cpp:448
 msgid "Floppy"
 msgstr "ฟล็อบปี้"
 
-#: mediamanager/fstabbackend.cpp:448
+#: mediamanager/fstabbackend.cpp:456
 msgid "Zip Disk"
 msgstr "ดิสก์ Zip"
 
-#: mediamanager/fstabbackend.cpp:459
+#: mediamanager/fstabbackend.cpp:467
 msgid "Removable Device"
 msgstr "อุปกรณ์ถอดเสียบ"
 
-#: mediamanager/fstabbackend.cpp:464 mediamanager/fstabbackend.cpp:470
+#: mediamanager/fstabbackend.cpp:472 mediamanager/fstabbackend.cpp:478
 msgid "Remote Share"
 msgstr "การใช้งานร่วมกันระยะไกล"
 
-#: mediamanager/fstabbackend.cpp:475
+#: mediamanager/fstabbackend.cpp:483
 msgid "Hard Disk"
 msgstr "ฮาร์ดดิสก์"
 
-#: mediamanager/halbackend.cpp:768 mediamanager/tdehardwarebackend.cpp:809
+#: mediamanager/halbackend.cpp:778 mediamanager/tdehardwarebackend.cpp:826
 #, fuzzy
 msgid "Unknown Drive"
 msgstr "ไม่รู้จัก"
 
-#: mediamanager/halbackend.cpp:780 mediamanager/tdehardwarebackend.cpp:839
+#: mediamanager/halbackend.cpp:794 mediamanager/tdehardwarebackend.cpp:872
 #, fuzzy
 msgid "Floppy Drive"
 msgstr "ฟล็อบปี้"
 
-#: mediamanager/halbackend.cpp:788
+#: mediamanager/halbackend.cpp:802
 #, fuzzy
 msgid "Zip Drive"
 msgstr "ดิสก์ Zip"
 
-#: mediamanager/halbackend.cpp:858 mediamanager/tdehardwarebackend.cpp:896
+#: mediamanager/halbackend.cpp:877 mediamanager/tdehardwarebackend.cpp:930
 msgid "Camera"
 msgstr "กล้อง"
 
-#: mediamanager/halbackend.cpp:1240 mediamanager/halbackend.cpp:1266
+#: mediamanager/halbackend.cpp:1259 mediamanager/halbackend.cpp:1285
 msgid "Authenticate"
 msgstr ""
 
-#: mediamanager/halbackend.cpp:1241
+#: mediamanager/halbackend.cpp:1260
 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:1267
+#: mediamanager/halbackend.cpp:1286
 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:1283 mediamanager/halbackend.cpp:1292
-#: mediamanager/halbackend.cpp:1873 mediamanager/halbackend.cpp:1940
-#: mounthelper/tdeio_media_mounthelper.cpp:58
+#: mediamanager/halbackend.cpp:1302 mediamanager/halbackend.cpp:1311
+#: mediamanager/halbackend.cpp:1904 mediamanager/halbackend.cpp:1976
 msgid "Internal Error"
 msgstr "ข้อผิดพลาดภายใน"
 
-#: mediamanager/halbackend.cpp:1303
+#: mediamanager/halbackend.cpp:1322
 msgid "Invalid filesystem type"
 msgstr "ชนิดของระบบแฟ้มไม่ถูกต้อง"
 
-#: mediamanager/halbackend.cpp:1305
+#: mediamanager/halbackend.cpp:1324
 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:1309
+#: mediamanager/halbackend.cpp:1328
 msgid "Device is already mounted."
 msgstr "อุปกรณ์ถูกเมานท์อยู่แล้ว"
 
-#: mediamanager/halbackend.cpp:1359
+#: mediamanager/halbackend.cpp:1378
 msgid ""
 "Moreover, programs still using the device have been detected. They are "
 "listed below. You have to close them or change their working directory "
@@ -186,16 +186,16 @@ msgstr ""
 "คุณต้องปิดโปรแกรมเหล่านั้นก่อน หรือไม่ก็เปลี่ยนไดเร็คทอรีที่ใช้งานอยู่ไปที่อื่น "
 "ก่อนที่จะทำการเลิกเมานท์อุปกรณ์อีกครั้ง"
 
-#: mediamanager/halbackend.cpp:1400 mediamanager/tdehardwarebackend.cpp:1619
+#: mediamanager/halbackend.cpp:1419 mediamanager/tdehardwarebackend.cpp:1664
 msgid ""
 "Programs that were still using the device have been forcibly terminated. "
 "They are listed below."
 msgstr ""
 
-#: mediamanager/halbackend.cpp:1421 mediamanager/halbackend.cpp:1766
-#: mediamanager/tdehardwarebackend.cpp:1431
-#: mediamanager/tdehardwarebackend.cpp:1453
-#: mediamanager/tdehardwarebackend.cpp:1495
+#: mediamanager/halbackend.cpp:1439 mediamanager/halbackend.cpp:1793
+#: mediamanager/tdehardwarebackend.cpp:1383
+#: mediamanager/tdehardwarebackend.cpp:1405
+#: mediamanager/tdehardwarebackend.cpp:1541
 msgid ""
 "Unfortunately, the device <b>%1</b> (%2) named <b>'%3'</b> and currently "
 "mounted at <b>%4</b> could not be unmounted. "
@@ -203,209 +203,257 @@ msgstr ""
 "อุปกรณ์ <b>%1</b> (%2) ที่ชื่อ <b>'%3'</b> และกำลังเมานท์อยู่ที่ <b>%4</b> "
 "ไม่สามารถเลิกเมานท์ได้"
 
-#: mediamanager/halbackend.cpp:1427 mediamanager/tdehardwarebackend.cpp:1501
+#: mediamanager/halbackend.cpp:1445 mediamanager/tdehardwarebackend.cpp:1547
 msgid "The following error was returned by umount command:"
 msgstr "คำสั่ง umount คืนค่าความผิดพลาดต่อไปนี้กลับมา:"
 
-#: mediamanager/halbackend.cpp:1591 mediamanager/tdehardwarebackend.cpp:1323
+#: mediamanager/halbackend.cpp:1492 mediamanager/halbackend.cpp:1676
+#: mediamanager/tdehardwarebackend.cpp:1220
+#: mediamanager/tdehardwarebackend.cpp:1331
+#: mounthelper/tdeio_media_mounthelper.cpp:64
+#: mounthelper/tdeio_media_mounthelper.cpp:92
+msgid "%1 is not a mountable media."
+msgstr "%1 ไม่ใช่สื่อที่จะเมานท์ได้"
+
+#: mediamanager/halbackend.cpp:1497 mediamanager/tdehardwarebackend.cpp:1225
+#: mounthelper/tdeio_media_mounthelper.cpp:68
+#, fuzzy
+msgid "%1 is already mounted to %2."
+msgstr "อุปกรณ์ถูกเมานท์อยู่แล้ว"
+
+#: mediamanager/halbackend.cpp:1614
 msgid "Cannot mount encrypted locked drives!"
 msgstr ""
 
-#: mediamanager/halbackend.cpp:1706 mediamanager/halbackend.cpp:1727
-#: mediamanager/halbackend.cpp:1740 mediamanager/halbackend.cpp:1854
-#: mediamanager/halbackend.cpp:1864 mediamanager/halbackend.cpp:1923
-#: mediamanager/halbackend.cpp:1931
+#: mediamanager/halbackend.cpp:1681 mediamanager/tdehardwarebackend.cpp:1336
+#: mounthelper/tdeio_media_mounthelper.cpp:96
+#, fuzzy
+msgid "%1 is already unmounted."
+msgstr "อุปกรณ์ถูกเมานท์อยู่แล้ว"
+
+#: mediamanager/halbackend.cpp:1733 mediamanager/halbackend.cpp:1754
+#: mediamanager/halbackend.cpp:1767 mediamanager/halbackend.cpp:1885
+#: mediamanager/halbackend.cpp:1895 mediamanager/halbackend.cpp:1959
+#: mediamanager/halbackend.cpp:1967
 #, fuzzy
 msgid "Internal error"
 msgstr "ข้อผิดพลาดภายใน"
 
-#: mediamanager/halbackend.cpp:1718
+#: mediamanager/halbackend.cpp:1745
 #, fuzzy
 #| msgid "Unknown"
 msgid "Unknown error"
 msgstr "ไม่รู้จัก"
 
-#: mediamanager/halbackend.cpp:1772
+#: mediamanager/halbackend.cpp:1799
 msgid "Unmounting failed due to the following error:"
 msgstr "การเลิกเมานท์ล้มเหลวเนื่องจากข้อผิดพลาดต่อไปนี้:"
 
-#: mediamanager/halbackend.cpp:1774
+#: mediamanager/halbackend.cpp:1801
 msgid "Device is Busy:"
 msgstr "อุปกรณ์ไม่ว่าง"
 
-#: mediamanager/halbackend.cpp:1778
+#: mediamanager/halbackend.cpp:1805
 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:1790
+#: mediamanager/halbackend.cpp:1817
 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:1876
+#: mediamanager/halbackend.cpp:1863 mediamanager/halbackend.cpp:1937
+#: mediamanager/tdehardwarebackend.cpp:1447
+#: mediamanager/tdehardwarebackend.cpp:1496
+#: mounthelper/tdeio_media_mounthelper.cpp:122
+#: mounthelper/tdeio_media_mounthelper.cpp:154
+#, fuzzy
+msgid "%1 is not an encrypted media."
+msgstr "%1 ไม่ใช่สื่อที่จะเมานท์ได้"
+
+#: mediamanager/halbackend.cpp:1868 mediamanager/tdehardwarebackend.cpp:1452
+#: mounthelper/tdeio_media_mounthelper.cpp:127
+#, fuzzy
+msgid "%1 is already unlocked."
+msgstr "อุปกรณ์ถูกเมานท์อยู่แล้ว"
+
+#: mediamanager/halbackend.cpp:1907
 msgid "Wrong password"
 msgstr ""
 
+#: mediamanager/halbackend.cpp:1942 mediamanager/tdehardwarebackend.cpp:1501
+#: mounthelper/tdeio_media_mounthelper.cpp:159
+#, fuzzy
+msgid "%1 is already locked."
+msgstr "อุปกรณ์ถูกเมานท์อยู่แล้ว"
+
 #: mediamanager/mediamanager.cpp:248 mediamanager/mediamanager.cpp:275
+#: mediamanager/mediamanager.cpp:302 mediamanager/mediamanager.cpp:329
 #, fuzzy
 msgid "Feature only available with the TDE hardware backend"
 msgstr "ความสามารถนี้มีกับ HAL เท่านั้น"
 
 #: mediamanager/mediamanager.cpp:255 mediamanager/mediamanager.cpp:282
-#: mediamanager/mediamanager.cpp:312 mediamanager/mediamanager.cpp:343
+#: mediamanager/mediamanager.cpp:309 mediamanager/mediamanager.cpp:336
 msgid "Feature only available with HAL"
 msgstr "ความสามารถนี้มีกับ HAL เท่านั้น"
 
 #: mediamanager/mediamanager.cpp:262 mediamanager/mediamanager.cpp:289
-#: mediamanager/mediamanager.cpp:320 mediamanager/mediamanager.cpp:350
+#: mediamanager/mediamanager.cpp:316 mediamanager/mediamanager.cpp:343
 #, fuzzy
 msgid "Feature only available with HAL or TDE hardware backend"
 msgstr "ความสามารถนี้มีกับ HAL เท่านั้น"
 
-#: mediamanager/tdehardwarebackend.cpp:484
-#: mediamanager/tdehardwarebackend.cpp:521
-#: mediamanager/tdehardwarebackend.cpp:754
+#: mediamanager/tdehardwarebackend.cpp:486
+#: mediamanager/tdehardwarebackend.cpp:523
+#: mediamanager/tdehardwarebackend.cpp:779
 #, fuzzy
 msgid "%1 Removable Device"
 msgstr "อุปกรณ์ถอดเสียบ"
 
-#: mediamanager/tdehardwarebackend.cpp:529
+#: mediamanager/tdehardwarebackend.cpp:532
 #, fuzzy
 msgid "Blank CD-ROM"
 msgstr "ซีดีรอม"
 
-#: mediamanager/tdehardwarebackend.cpp:538
+#: mediamanager/tdehardwarebackend.cpp:542
 msgid "Blank CD-R"
 msgstr ""
 
-#: mediamanager/tdehardwarebackend.cpp:547
+#: mediamanager/tdehardwarebackend.cpp:552
 msgid "Blank CD-RW"
 msgstr ""
 
-#: mediamanager/tdehardwarebackend.cpp:556
+#: mediamanager/tdehardwarebackend.cpp:562
 msgid "Blank Magneto-Optical CD"
 msgstr ""
 
-#: mediamanager/tdehardwarebackend.cpp:565
+#: mediamanager/tdehardwarebackend.cpp:572
 msgid "Blank Mount Ranier CD-RW"
 msgstr ""
 
-#: mediamanager/tdehardwarebackend.cpp:574
+#: mediamanager/tdehardwarebackend.cpp:582
 msgid "Blank Mount Ranier CD-RW-W"
 msgstr ""
 
-#: mediamanager/tdehardwarebackend.cpp:583
+#: mediamanager/tdehardwarebackend.cpp:592
 msgid "Blank DVD-ROM"
 msgstr ""
 
-#: mediamanager/tdehardwarebackend.cpp:592
+#: mediamanager/tdehardwarebackend.cpp:602
 msgid "Blank DVD-RAM"
 msgstr ""
 
-#: mediamanager/tdehardwarebackend.cpp:601
+#: mediamanager/tdehardwarebackend.cpp:612
 msgid "Blank DVD-R"
 msgstr ""
 
-#: mediamanager/tdehardwarebackend.cpp:610
+#: mediamanager/tdehardwarebackend.cpp:622
 msgid "Blank DVD-RW"
 msgstr ""
 
-#: mediamanager/tdehardwarebackend.cpp:619
+#: mediamanager/tdehardwarebackend.cpp:632
 msgid "Blank Dual Layer DVD-R"
 msgstr ""
 
-#: mediamanager/tdehardwarebackend.cpp:628
+#: mediamanager/tdehardwarebackend.cpp:642
 msgid "Blank Dual Layer DVD-RW"
 msgstr ""
 
-#: mediamanager/tdehardwarebackend.cpp:637
+#: mediamanager/tdehardwarebackend.cpp:652
 msgid "Blank DVD+R"
 msgstr ""
 
-#: mediamanager/tdehardwarebackend.cpp:646
+#: mediamanager/tdehardwarebackend.cpp:662
 msgid "Blank DVD+RW"
 msgstr ""
 
-#: mediamanager/tdehardwarebackend.cpp:655
+#: mediamanager/tdehardwarebackend.cpp:672
 msgid "Blank Dual Layer DVD+R"
 msgstr ""
 
-#: mediamanager/tdehardwarebackend.cpp:664
+#: mediamanager/tdehardwarebackend.cpp:682
 msgid "Blank Dual Layer DVD+RW"
 msgstr ""
 
-#: mediamanager/tdehardwarebackend.cpp:673
+#: mediamanager/tdehardwarebackend.cpp:692
 #, fuzzy
 msgid "Blank BLURAY-ROM"
 msgstr "ซีดีรอม"
 
-#: mediamanager/tdehardwarebackend.cpp:682
+#: mediamanager/tdehardwarebackend.cpp:702
 #, fuzzy
 msgid "Blank BLURAY-R"
 msgstr "ซีดีรอม"
 
-#: mediamanager/tdehardwarebackend.cpp:691
+#: mediamanager/tdehardwarebackend.cpp:712
 msgid "Blank BLURAY-RW"
 msgstr ""
 
-#: mediamanager/tdehardwarebackend.cpp:700
+#: mediamanager/tdehardwarebackend.cpp:722
 msgid "Blank HDDVD-ROM"
 msgstr ""
 
-#: mediamanager/tdehardwarebackend.cpp:709
+#: mediamanager/tdehardwarebackend.cpp:732
 msgid "Blank HDDVD-R"
 msgstr ""
 
-#: mediamanager/tdehardwarebackend.cpp:718
+#: mediamanager/tdehardwarebackend.cpp:742
 msgid "Blank HDDVD-RW"
 msgstr ""
 
-#: mediamanager/tdehardwarebackend.cpp:725
+#: mediamanager/tdehardwarebackend.cpp:750
 msgid "Audio CD"
 msgstr ""
 
-#: mediamanager/tdehardwarebackend.cpp:746
+#: mediamanager/tdehardwarebackend.cpp:771
 msgid "%1 Fixed Disk (%2)"
 msgstr ""
 
-#: mediamanager/tdehardwarebackend.cpp:853
+#: mediamanager/tdehardwarebackend.cpp:886
 #, fuzzy
 msgid "%1 Zip Disk"
 msgstr "ดิสก์ Zip"
 
-#: mediamanager/tdehardwarebackend.cpp:1225
-#: mediamanager/tdehardwarebackend.cpp:1418
-msgid "Internal error. Couldn't find medium."
+#: mediamanager/tdehardwarebackend.cpp:1259
+#: mediamanager/tdehardwarebackend.cpp:1370
+#: mediamanager/tdehardwarebackend.cpp:1460
+#: mediamanager/tdehardwarebackend.cpp:1509
+#, c-format
+msgid "Internal error. Couldn't find medium id %1."
 msgstr ""
 
-#: mediamanager/tdehardwarebackend.cpp:1250
-#: mediamanager/tdehardwarebackend.cpp:1324
+#: mediamanager/tdehardwarebackend.cpp:1282
 msgid "Unable to mount this device."
 msgstr ""
 
-#: mediamanager/tdehardwarebackend.cpp:1253
-#: mediamanager/tdehardwarebackend.cpp:1327
-#: mediamanager/tdehardwarebackend.cpp:1436
-#: mediamanager/tdehardwarebackend.cpp:1458
+#: mediamanager/tdehardwarebackend.cpp:1285
+#: mediamanager/tdehardwarebackend.cpp:1388
+#: mediamanager/tdehardwarebackend.cpp:1410
+#: mediamanager/tdehardwarebackend.cpp:1470
+#: mediamanager/tdehardwarebackend.cpp:1519
 msgid "<p>Technical details:<br>"
 msgstr ""
 
-#: mediamanager/tdehardwarebackend.cpp:1285
-msgid "Decryption aborted"
+#: mediamanager/tdehardwarebackend.cpp:1396
+msgid ""
+"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 forcibly "
+"terminate these processes?</b><br><i>All unsaved data would be lost</i>"
 msgstr ""
 
-#: mediamanager/tdehardwarebackend.cpp:1444
-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 "
-"forcibly terminate these processes?</b><br><i>All unsaved data would be "
-"lost</i>"
+#: mediamanager/tdehardwarebackend.cpp:1467
+msgid "Unable to unlock the device."
 msgstr ""
 
-#: mediamanager/tdehardwarebackend.cpp:1578
+#: mediamanager/tdehardwarebackend.cpp:1516
+msgid "Unable to lock the device."
+msgstr ""
+
+#: mediamanager/tdehardwarebackend.cpp:1623
 #, fuzzy
 msgid ""
 "Programs still using the device have been detected. They are listed below. "
@@ -416,63 +464,95 @@ msgstr ""
 "คุณต้องปิดโปรแกรมเหล่านั้นก่อน หรือไม่ก็เปลี่ยนไดเร็คทอรีที่ใช้งานอยู่ไปที่อื่น "
 "ก่อนที่จะทำการเลิกเมานท์อุปกรณ์อีกครั้ง"
 
-#: mounthelper/tdeio_media_mounthelper.cpp:79
-msgid "%1 cannot be found."
-msgstr "ไม่พบ %1"
+#: mounthelper/tdeio_media_mounthelper.cpp:49
+#, fuzzy
+#| msgid "The TDE mediamanager is not running."
+msgid "The TDE mediamanager is not running.\n"
+msgstr "ตัวจัดการสื่อของ TDE ไม่ได้กำลังทำงานอยู่"
 
-#: mounthelper/tdeio_media_mounthelper.cpp:87
-msgid "%1 is not a mountable media."
-msgstr "%1 ไม่ใช่สื่อที่จะเมานท์ได้"
+#: mounthelper/tdeio_media_mounthelper.cpp:59
+msgid "Try to mount an unknown medium."
+msgstr ""
 
-#: mounthelper/tdeio_media_mounthelper.cpp:101
-#, fuzzy
-msgid "%1 is not an encrypted media."
-msgstr "%1 ไม่ใช่สื่อที่จะเมานท์ได้"
+#: mounthelper/tdeio_media_mounthelper.cpp:87
+msgid "Try to unmount an unknown medium."
+msgstr ""
 
 #: mounthelper/tdeio_media_mounthelper.cpp:107
-#, fuzzy
-msgid "%1 is already unlocked."
-msgstr "อุปกรณ์ถูกเมานท์อยู่แล้ว"
-
-#: 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:116
+msgid "Try to unlock an unknown medium."
+msgstr ""
 
-#: mounthelper/tdeio_media_mounthelper.cpp:248
-msgid "The device was successfully unmounted, but could not be ejected"
-msgstr "การเลิกเมานท์อุปกรณ์สำเร็จ แต่ไม่สามารถเอาสื่อออกได้"
+#: mounthelper/tdeio_media_mounthelper.cpp:148
+msgid "Try to lock an unknown medium."
+msgstr ""
 
-#: mounthelper/tdeio_media_mounthelper.cpp:281
-msgid "Unknown decrypt error."
+#: mounthelper/tdeio_media_mounthelper.cpp:173
+#, fuzzy
+#| msgid "Unknown"
+msgid "Unknown lock error."
+msgstr "ไม่รู้จัก"
+
+#: mounthelper/tdeio_media_mounthelper.cpp:211
+msgid "Try to release holders from an unknown medium."
+msgstr ""
+
+#: mounthelper/tdeio_media_mounthelper.cpp:270
+msgid "Try to safe remove an unknown medium."
 msgstr ""
 
-#: mounthelper/tdeio_media_mounthelper.cpp:295
+#: mounthelper/tdeio_media_mounthelper.cpp:302
+msgid "%1 cannot be found."
+msgstr "ไม่พบ %1"
+
+#: mounthelper/tdeio_media_mounthelper.cpp:310
+#, fuzzy
+msgid "%1 is not a mountable or encrypted media."
+msgstr "%1 ไม่ใช่สื่อที่จะเมานท์ได้"
+
+#: mounthelper/tdeio_media_mounthelper.cpp:397
+#, fuzzy
+#| msgid "Unknown"
+msgid "Unknown unlock error."
+msgstr "ไม่รู้จัก"
+
+#: mounthelper/tdeio_media_mounthelper.cpp:410
 #, fuzzy
-msgid "Decrypt given URL"
+#| msgid "Unmount given URL"
+msgid "Mount given URL"
 msgstr "ยกเลิกเมานท์ตำแหน่งที่กำหนด"
 
-#: mounthelper/tdeio_media_mounthelper.cpp:296
+#: mounthelper/tdeio_media_mounthelper.cpp:411
 msgid "Unmount given URL"
 msgstr "ยกเลิกเมานท์ตำแหน่งที่กำหนด"
 
-#: mounthelper/tdeio_media_mounthelper.cpp:297
-msgid "Mount given URL (default)"
-msgstr "เมานท์ตำแหน่งที่กำหนด (ค่าปริยาย)"
+#: mounthelper/tdeio_media_mounthelper.cpp:412
+#, fuzzy
+#| msgid "Unmount given URL"
+msgid "Unlock given URL"
+msgstr "ยกเลิกเมานท์ตำแหน่งที่กำหนด"
 
-#: mounthelper/tdeio_media_mounthelper.cpp:298
-msgid "Eject given URL via tdeeject"
-msgstr "เอาแผ่นที่ URL ที่กำหนดออกผ่าน tdeeject"
+#: mounthelper/tdeio_media_mounthelper.cpp:413
+#, fuzzy
+msgid "Lock given URL"
+msgstr "ยกเลิกเมานท์ตำแหน่งที่กำหนด"
 
-#: 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:414
+#, fuzzy
+msgid "Eject given URL"
+msgstr "ยกเลิกเมานท์ตำแหน่งที่กำหนด"
+
+#: mounthelper/tdeio_media_mounthelper.cpp:415
+msgid "Safely remove (unmount and eject) given URL"
+msgstr ""
 
-#: mounthelper/tdeio_media_mounthelper.cpp:300
-msgid "media:/ URL to mount/unmount/eject/remove"
+#: mounthelper/tdeio_media_mounthelper.cpp:416
+#, fuzzy
+#| msgid "media:/ URL to mount/unmount/eject/remove"
+msgid "media:/URL to mount/unmount/unlock/lock/eject/remove"
 msgstr "ตำแหน่ง media:/ เพื่อเมานท์/ยกเลิกเมานท์/เอาแผ่นออก/ถอดอุปกรณ์ออก"
 
 #: propsdlgplugin/propertiespage.cpp:137
@@ -621,7 +701,7 @@ msgstr ""
 #, 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>Please enter the password to unlock the storage device.</p>"
 msgstr ""
 
 #: propsdlgplugin/propertiespagegui.ui:16
@@ -877,6 +957,22 @@ msgstr "ผสมกัน"
 msgid "Filesystem: iso9660"
 msgstr "ระบบแฟ้ม: iso9660"
 
+#~ msgid ""
+#~ "The device was successfully unmounted, but the tray could not be opened"
+#~ msgstr "การเลิกเมานท์อุปกรณ์สำเร็จ แต่ไม่สามารถเปิดถาดได้"
+
+#~ msgid "The device was successfully unmounted, but could not be ejected"
+#~ msgstr "การเลิกเมานท์อุปกรณ์สำเร็จ แต่ไม่สามารถเอาสื่อออกได้"
+
+#~ msgid "Mount given URL (default)"
+#~ msgstr "เมานท์ตำแหน่งที่กำหนด (ค่าปริยาย)"
+
+#~ msgid "Eject given URL via tdeeject"
+#~ msgstr "เอาแผ่นที่ URL ที่กำหนดออกผ่าน tdeeject"
+
+#~ msgid "Unmount and Eject given URL (necessary for some USB devices)"
+#~ msgstr "ให้เลิกเมานท์และเอาแผ่นที่ URL ที่กำหนดออก (จำเป็นสำหรับอุปกรณ์ USB บางตัว)"
+
 #, fuzzy
 #~ msgid "Permission denied"
 #~ msgstr "สิทธิ์อนุญาตถูกปฏิเสธ"