From d0c1243fde203d98bfac08d3a51cf531283dc7ac Mon Sep 17 00:00:00 2001
From: TDE Weblate <weblate@mirror.git.trinitydesktop.org>
Date: Sat, 17 Oct 2020 03:21:19 +0000
Subject: Update translation files

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

Translation: tdebase/tdeio_media
Translate-URL: https://mirror.git.trinitydesktop.org/weblate/projects/tdebase/tdeio_media/
---
 tde-i18n-af/messages/tdebase/tdeio_media.po        | 362 ++++++++++-------
 tde-i18n-ar/messages/tdebase/tdeio_media.po        | 368 +++++++++++-------
 tde-i18n-az/messages/tdebase/tdeio_media.po        | 354 ++++++++++-------
 tde-i18n-be/messages/tdebase/tdeio_media.po        | 363 ++++++++++-------
 tde-i18n-bg/messages/tdebase/tdeio_media.po        | 421 +++++++++++++-------
 tde-i18n-bn/messages/tdebase/tdeio_media.po        | 362 ++++++++++-------
 tde-i18n-br/messages/tdebase/tdeio_media.po        | 331 +++++++++-------
 tde-i18n-bs/messages/tdebase/tdeio_media.po        | 362 ++++++++++-------
 tde-i18n-ca/messages/tdebase/tdeio_media.po        | 378 +++++++++++-------
 tde-i18n-cs/messages/tdebase/tdeio_media.po        | 432 ++++++++++++++-------
 tde-i18n-csb/messages/tdebase/tdeio_media.po       | 382 +++++++++++-------
 tde-i18n-cy/messages/tdebase/tdeio_media.po        | 363 ++++++++++-------
 tde-i18n-da/messages/tdebase/tdeio_media.po        | 379 +++++++++++-------
 tde-i18n-de/messages/tdebase/tdeio_media.po        | 428 +++++++++++++-------
 tde-i18n-el/messages/tdebase/tdeio_media.po        | 381 +++++++++++-------
 tde-i18n-en_GB/messages/tdebase/tdeio_media.po     | 362 ++++++++++-------
 tde-i18n-eo/messages/tdebase/tdeio_media.po        | 379 +++++++++++-------
 tde-i18n-es/messages/tdebase/tdeio_media.po        | 402 ++++++++++++-------
 tde-i18n-et/messages/tdebase/tdeio_media.po        | 379 +++++++++++-------
 tde-i18n-eu/messages/tdebase/tdeio_media.po        | 363 ++++++++++-------
 tde-i18n-fa/messages/tdebase/tdeio_media.po        | 379 +++++++++++-------
 tde-i18n-fi/messages/tdebase/tdeio_media.po        | 378 +++++++++++-------
 tde-i18n-fr/messages/tdebase/tdeio_media.po        | 381 +++++++++++-------
 tde-i18n-fy/messages/tdebase/tdeio_media.po        | 381 +++++++++++-------
 tde-i18n-ga/messages/tdebase/tdeio_media.po        | 353 ++++++++++-------
 tde-i18n-gl/messages/tdebase/tdeio_media.po        | 363 ++++++++++-------
 tde-i18n-he/messages/tdebase/tdeio_media.po        | 365 ++++++++++-------
 tde-i18n-hi/messages/tdebase/tdeio_media.po        | 351 ++++++++++-------
 tde-i18n-hr/messages/tdebase/tdeio_media.po        | 354 ++++++++++-------
 tde-i18n-hu/messages/tdebase/tdeio_media.po        | 378 +++++++++++-------
 tde-i18n-is/messages/tdebase/tdeio_media.po        | 378 +++++++++++-------
 tde-i18n-it/messages/tdebase/tdeio_media.po        | 383 +++++++++++-------
 tde-i18n-ja/messages/tdebase/tdeio_media.po        | 379 +++++++++++-------
 tde-i18n-kk/messages/tdebase/tdeio_media.po        | 362 ++++++++++-------
 tde-i18n-km/messages/tdebase/tdeio_media.po        | 378 +++++++++++-------
 tde-i18n-ko/messages/tdebase/tdeio_media.po        | 362 ++++++++++-------
 tde-i18n-lt/messages/tdebase/tdeio_media.po        | 362 ++++++++++-------
 tde-i18n-mk/messages/tdebase/tdeio_media.po        | 380 +++++++++++-------
 tde-i18n-mn/messages/tdebase/tdeio_media.po        | 359 ++++++++++-------
 tde-i18n-ms/messages/tdebase/tdeio_media.po        | 365 ++++++++++-------
 tde-i18n-nb/messages/tdebase/tdeio_media.po        | 378 +++++++++++-------
 tde-i18n-nds/messages/tdebase/tdeio_media.po       | 378 +++++++++++-------
 tde-i18n-nl/messages/tdebase/tdeio_media.po        | 382 +++++++++++-------
 tde-i18n-nn/messages/tdebase/tdeio_media.po        | 378 +++++++++++-------
 tde-i18n-pa/messages/tdebase/tdeio_media.po        | 372 +++++++++++-------
 tde-i18n-pl/messages/tdebase/tdeio_media.po        | 427 +++++++++++++-------
 tde-i18n-pt/messages/tdebase/tdeio_media.po        | 380 +++++++++++-------
 tde-i18n-pt_BR/messages/tdebase/tdeio_media.po     | 381 +++++++++++-------
 tde-i18n-ro/messages/tdebase/tdeio_media.po        | 354 ++++++++++-------
 tde-i18n-ru/messages/tdebase/tdeio_media.po        | 391 ++++++++++++-------
 tde-i18n-rw/messages/tdebase/tdeio_media.po        | 363 ++++++++++-------
 tde-i18n-se/messages/tdebase/tdeio_media.po        | 364 ++++++++++-------
 tde-i18n-sk/messages/tdebase/tdeio_media.po        | 418 +++++++++++++-------
 tde-i18n-sl/messages/tdebase/tdeio_media.po        | 378 +++++++++++-------
 tde-i18n-sr/messages/tdebase/tdeio_media.po        | 378 +++++++++++-------
 tde-i18n-sr@Latn/messages/tdebase/tdeio_media.po   | 378 +++++++++++-------
 tde-i18n-ss/messages/tdebase/tdeio_media.po        | 359 ++++++++++-------
 tde-i18n-sv/messages/tdebase/tdeio_media.po        | 379 +++++++++++-------
 tde-i18n-ta/messages/tdebase/tdeio_media.po        | 358 ++++++++++-------
 tde-i18n-te/messages/tdebase/tdeio_media.po        | 329 +++++++++-------
 tde-i18n-tg/messages/tdebase/tdeio_media.po        | 342 +++++++++-------
 tde-i18n-th/messages/tdebase/tdeio_media.po        | 378 +++++++++++-------
 tde-i18n-tr/messages/tdebase/tdeio_media.po        | 378 +++++++++++-------
 tde-i18n-uk/messages/tdebase/tdeio_media.po        | 421 +++++++++++++-------
 tde-i18n-uz/messages/tdebase/tdeio_media.po        | 357 ++++++++++-------
 .../messages/tdebase/tdeio_media.po                | 357 ++++++++++-------
 tde-i18n-vi/messages/tdebase/tdeio_media.po        | 367 ++++++++++-------
 tde-i18n-zh_CN/messages/tdebase/tdeio_media.po     | 378 +++++++++++-------
 tde-i18n-zh_TW/messages/tdebase/tdeio_media.po     | 378 +++++++++++-------
 69 files changed, 16167 insertions(+), 9656 deletions(-)

diff --git a/tde-i18n-af/messages/tdebase/tdeio_media.po b/tde-i18n-af/messages/tdebase/tdeio_media.po
index 8d7d07dcb36..c55d062159b 100644
--- a/tde-i18n-af/messages/tdebase/tdeio_media.po
+++ b/tde-i18n-af/messages/tdebase/tdeio_media.po
@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: tdeio_media stable\n"
-"POT-Creation-Date: 2020-09-09 18:58+0200\n"
+"POT-Creation-Date: 2020-10-17 08:51+0800\n"
 "PO-Revision-Date: 2005-11-24 08:48+0200\n"
 "Last-Translator: Kobus Venter <kabousv@therugby.co.za>\n"
 "Language-Team: AFRIKAANS <translate-discuss-af@lists.sourceforge.net>\n"
@@ -43,27 +43,26 @@ msgstr "Maak oop in Nuwe Venster"
 msgid "Unknown"
 msgstr "Onbekend"
 
-#: 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 "Die TDE mediabestuur hardloop nie"
 
-#: mediaimpl.cpp:187
+#: mediaimpl.cpp:186
 msgid "This media name already exists."
 msgstr "Hierdie media naam bestaan reeds."
 
-#: 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 ""
 
@@ -76,389 +75,469 @@ 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 ""
 
-#: mediamanager/fstabbackend.cpp:408
+#: mediamanager/fstabbackend.cpp:416
 msgid "CD Recorder"
 msgstr "CD Opnemer"
 
-#: mediamanager/fstabbackend.cpp:414
+#: mediamanager/fstabbackend.cpp:422
 msgid "DVD"
 msgstr "DVD"
 
-#: mediamanager/fstabbackend.cpp:427
+#: mediamanager/fstabbackend.cpp:435
 msgid "CD-ROM"
 msgstr "CD-ROM"
 
-#: mediamanager/fstabbackend.cpp:440
+#: mediamanager/fstabbackend.cpp:448
 msgid "Floppy"
 msgstr "Sagteskyf"
 
-#: mediamanager/fstabbackend.cpp:448
+#: mediamanager/fstabbackend.cpp:456
 msgid "Zip Disk"
 msgstr "Zip Skyf"
 
-#: mediamanager/fstabbackend.cpp:459
+#: mediamanager/fstabbackend.cpp:467
 msgid "Removable Device"
 msgstr "Verwyderbare Toestel"
 
-#: mediamanager/fstabbackend.cpp:464 mediamanager/fstabbackend.cpp:470
+#: mediamanager/fstabbackend.cpp:472 mediamanager/fstabbackend.cpp:478
 msgid "Remote Share"
 msgstr "Verder weg Deel"
 
-#: mediamanager/fstabbackend.cpp:475
+#: mediamanager/fstabbackend.cpp:483
 msgid "Hard Disk"
 msgstr "Harde Skyf"
 
-#: mediamanager/halbackend.cpp:768 mediamanager/tdehardwarebackend.cpp:809
+#: mediamanager/halbackend.cpp:778 mediamanager/tdehardwarebackend.cpp:826
 #, fuzzy
 msgid "Unknown Drive"
 msgstr "Onbekend"
 
-#: mediamanager/halbackend.cpp:780 mediamanager/tdehardwarebackend.cpp:839
+#: mediamanager/halbackend.cpp:794 mediamanager/tdehardwarebackend.cpp:872
 #, fuzzy
 msgid "Floppy Drive"
 msgstr "Sagteskyf"
 
-#: mediamanager/halbackend.cpp:788
+#: mediamanager/halbackend.cpp:802
 #, fuzzy
 msgid "Zip Drive"
 msgstr "Zip Skyf"
 
-#: mediamanager/halbackend.cpp:858 mediamanager/tdehardwarebackend.cpp:896
+#: mediamanager/halbackend.cpp:877 mediamanager/tdehardwarebackend.cpp:930
 msgid "Camera"
 msgstr "Kamera"
 
-#: 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 "
 "before attempting to unmount the device again."
 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. "
 msgstr ""
 
-#: 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 ""
 
-#: 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 is nie 'n hegbare media."
+
+#: mediamanager/halbackend.cpp:1497 mediamanager/tdehardwarebackend.cpp:1225
+#: mounthelper/tdeio_media_mounthelper.cpp:68
+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 not a mountable media."
+msgid "%1 is already unmounted."
+msgstr "%1 is nie 'n hegbare media."
+
+#: 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
 msgid "Internal error"
 msgstr ""
 
-#: mediamanager/halbackend.cpp:1718
+#: mediamanager/halbackend.cpp:1745
 #, fuzzy
 #| msgid "Unknown"
 msgid "Unknown error"
 msgstr "Onbekend"
 
-#: 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 is nie 'n hegbare media."
+
+#: mediamanager/halbackend.cpp:1868 mediamanager/tdehardwarebackend.cpp:1452
+#: mounthelper/tdeio_media_mounthelper.cpp:127
+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
+msgid "%1 is already locked."
+msgstr ""
+
 #: mediamanager/mediamanager.cpp:248 mediamanager/mediamanager.cpp:275
+#: mediamanager/mediamanager.cpp:302 mediamanager/mediamanager.cpp:329
 msgid "Feature only available with the TDE hardware backend"
 msgstr ""
 
 #: 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 ""
 
 #: mediamanager/mediamanager.cpp:262 mediamanager/mediamanager.cpp:289
-#: mediamanager/mediamanager.cpp:320 mediamanager/mediamanager.cpp:350
+#: mediamanager/mediamanager.cpp:316 mediamanager/mediamanager.cpp:343
 msgid "Feature only available with HAL or TDE hardware backend"
 msgstr ""
 
-#: 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 "Verwyderbare Toestel"
 
-#: mediamanager/tdehardwarebackend.cpp:529
+#: mediamanager/tdehardwarebackend.cpp:532
 #, fuzzy
 msgid "Blank CD-ROM"
 msgstr "CD-ROM"
 
-#: 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 "CD-ROM"
 
-#: mediamanager/tdehardwarebackend.cpp:682
+#: mediamanager/tdehardwarebackend.cpp:702
 #, fuzzy
 msgid "Blank BLURAY-R"
 msgstr "CD-ROM"
 
-#: 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 Skyf"
 
-#: 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
 msgid ""
 "Programs still using the device have been detected. They are listed below. "
 "You have to close them or change their working directory before attempting "
 "to unmount the device again."
 msgstr ""
 
-#: mounthelper/tdeio_media_mounthelper.cpp:79
-msgid "%1 cannot be found."
-msgstr "%1 kon nie gevind word nie."
+#: mounthelper/tdeio_media_mounthelper.cpp:49
+#, fuzzy
+#| msgid "The TDE mediamanager is not running."
+msgid "The TDE mediamanager is not running.\n"
+msgstr "Die TDE mediabestuur hardloop nie"
 
-#: mounthelper/tdeio_media_mounthelper.cpp:87
-msgid "%1 is not a mountable media."
-msgstr "%1 is nie 'n hegbare media."
+#: 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 is nie 'n hegbare media."
+#: mounthelper/tdeio_media_mounthelper.cpp:87
+msgid "Try to unmount an unknown medium."
+msgstr ""
 
 #: mounthelper/tdeio_media_mounthelper.cpp:107
-msgid "%1 is already unlocked."
+msgid "Unknown unmount error."
 msgstr ""
 
-#: mounthelper/tdeio_media_mounthelper.cpp:139
-msgid "Unknown unmount error."
+#: mounthelper/tdeio_media_mounthelper.cpp:116
+msgid "Try to unlock an unknown medium."
 msgstr ""
 
-#: mounthelper/tdeio_media_mounthelper.cpp:246
-msgid "The device was successfully unmounted, but the tray could not be opened"
+#: mounthelper/tdeio_media_mounthelper.cpp:148
+msgid "Try to lock an unknown medium."
 msgstr ""
 
-#: mounthelper/tdeio_media_mounthelper.cpp:248
-msgid "The device was successfully unmounted, but could not be ejected"
+#: mounthelper/tdeio_media_mounthelper.cpp:173
+#, fuzzy
+#| msgid "Unknown"
+msgid "Unknown lock error."
+msgstr "Onbekend"
+
+#: mounthelper/tdeio_media_mounthelper.cpp:211
+msgid "Try to release holders from an unknown medium."
 msgstr ""
 
-#: mounthelper/tdeio_media_mounthelper.cpp:281
-msgid "Unknown decrypt error."
+#: 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 kon nie gevind word nie."
+
+#: mounthelper/tdeio_media_mounthelper.cpp:310
 #, fuzzy
-msgid "Decrypt given URL"
+msgid "%1 is not a mountable or encrypted media."
+msgstr "%1 is nie 'n hegbare media."
+
+#: mounthelper/tdeio_media_mounthelper.cpp:397
+#, fuzzy
+#| msgid "Unknown"
+msgid "Unknown unlock error."
+msgstr "Onbekend"
+
+#: mounthelper/tdeio_media_mounthelper.cpp:410
+#, fuzzy
+#| msgid "Unmount given URL"
+msgid "Mount given URL"
 msgstr "Ontheg gegewe Url"
 
-#: mounthelper/tdeio_media_mounthelper.cpp:296
+#: mounthelper/tdeio_media_mounthelper.cpp:411
 msgid "Unmount given URL"
 msgstr "Ontheg gegewe Url"
 
-#: mounthelper/tdeio_media_mounthelper.cpp:297
-msgid "Mount given URL (default)"
-msgstr "Heg gegewe Url (verstekwaarde)"
+#: mounthelper/tdeio_media_mounthelper.cpp:412
+#, fuzzy
+#| msgid "Unmount given URL"
+msgid "Unlock given URL"
+msgstr "Ontheg gegewe Url"
+
+#: mounthelper/tdeio_media_mounthelper.cpp:413
+#, fuzzy
+msgid "Lock given URL"
+msgstr "Ontheg gegewe Url"
 
-#: mounthelper/tdeio_media_mounthelper.cpp:298
-msgid "Eject given URL via tdeeject"
-msgstr "Haal gegewe URL uit deur tdeuithaal"
+#: mounthelper/tdeio_media_mounthelper.cpp:414
+#, fuzzy
+msgid "Eject given URL"
+msgstr "Ontheg gegewe Url"
 
-#: mounthelper/tdeio_media_mounthelper.cpp:299
-msgid "Unmount and Eject given URL (necessary for some USB devices)"
-msgstr "Ontheg en uithaal gegewe URL (noodsaaklik vir somige USN toestelle)"
+#: 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:/ URL om te heg/ontheg/uithaal/verwyder"
 
 #: propsdlgplugin/propertiespage.cpp:137
@@ -608,7 +687,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
@@ -828,6 +907,15 @@ msgstr ""
 msgid "Filesystem: iso9660"
 msgstr ""
 
+#~ msgid "Mount given URL (default)"
+#~ msgstr "Heg gegewe Url (verstekwaarde)"
+
+#~ msgid "Eject given URL via tdeeject"
+#~ msgstr "Haal gegewe URL uit deur tdeuithaal"
+
+#~ msgid "Unmount and Eject given URL (necessary for some USB devices)"
+#~ msgstr "Ontheg en uithaal gegewe URL (noodsaaklik vir somige USN toestelle)"
+
 #~ msgid ""
 #~ "\n"
 #~ "Please check that the disk is entered correctly."
diff --git a/tde-i18n-ar/messages/tdebase/tdeio_media.po b/tde-i18n-ar/messages/tdebase/tdeio_media.po
index 8dcab6ae154..27d5881f1c4 100644
--- a/tde-i18n-ar/messages/tdebase/tdeio_media.po
+++ b/tde-i18n-ar/messages/tdebase/tdeio_media.po
@@ -8,7 +8,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: 2006-12-12 19:25+0100\n"
 "Last-Translator: محمد سعد  Mohamed SAAD <metehyi@free.fr>\n"
 "Language-Team: Arabic <doc@arabeyes.org>\n"
@@ -46,27 +46,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 ""
 
@@ -79,392 +78,473 @@ 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 ""
 
-#: 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 "قرص مدمج CD-ROM"
 
-#: 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
 #, fuzzy
 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
 #, fuzzy
 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 "
 "before attempting to unmount the device again."
 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. "
 msgstr ""
 
-#: 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 ""
 
-#: 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
 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
 msgid "Feature only available with the TDE hardware backend"
 msgstr ""
 
 #: 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 ""
 
 #: mediamanager/mediamanager.cpp:262 mediamanager/mediamanager.cpp:289
-#: mediamanager/mediamanager.cpp:320 mediamanager/mediamanager.cpp:350
+#: mediamanager/mediamanager.cpp:316 mediamanager/mediamanager.cpp:343
 msgid "Feature only available with HAL or TDE hardware backend"
 msgstr ""
 
-#: 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 "قرص مدمج CD-ROM"
 
-#: 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 "قرص مدمج CD-ROM"
 
-#: mediamanager/tdehardwarebackend.cpp:682
+#: mediamanager/tdehardwarebackend.cpp:702
 #, fuzzy
 msgid "Blank BLURAY-R"
 msgstr "قرص مدمج CD-ROM"
 
-#: 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:1516
+msgid "Unable to lock the device."
 msgstr ""
 
-#: mediamanager/tdehardwarebackend.cpp:1578
+#: mediamanager/tdehardwarebackend.cpp:1623
 msgid ""
 "Programs still using the device have been detected. They are listed below. "
 "You have to close them or change their working directory before attempting "
 "to unmount the device again."
 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"
+#: 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"
+#: 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 "Decrypt given URL"
+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 "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:413
+#, fuzzy
+msgid "Lock given URL"
+msgstr "ألغي تركيب عنوان المورد المعطى"
 
-#: mounthelper/tdeio_media_mounthelper.cpp:298
-msgid "Eject given URL via tdeeject"
-msgstr "أقذف عنوان المورد المحدد بواسطة tdeeject"
+#: mounthelper/tdeio_media_mounthelper.cpp:414
+#, fuzzy
+msgid "Eject given URL"
+msgstr "ألغي تركيب عنوان المورد المعطى"
 
-#: mounthelper/tdeio_media_mounthelper.cpp:299
-msgid "Unmount and Eject given URL (necessary for some USB devices)"
-msgstr "أقذف و ألغي التركيب لعنوان المورد المحدد (ضروري لبعض أجهزة الـ USB )"
+#: 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:/ URL اللتي تريد تركيبها/الغاء تركيبها/قذفها/حذفها"
 
 #: propsdlgplugin/propertiespage.cpp:137
@@ -614,7 +694,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
@@ -834,6 +914,16 @@ msgstr ""
 msgid "Filesystem: iso9660"
 msgstr ""
 
+#~ msgid "Mount given URL (default)"
+#~ msgstr "ركّب عنوان المورد المعطى ( الإفتراضي )"
+
+#~ msgid "Eject given URL via tdeeject"
+#~ msgstr "أقذف عنوان المورد المحدد بواسطة tdeeject"
+
+#~ msgid "Unmount and Eject given URL (necessary for some USB devices)"
+#~ msgstr ""
+#~ "أقذف و ألغي التركيب لعنوان المورد المحدد (ضروري لبعض أجهزة الـ USB )"
+
 #~ msgid ""
 #~ "\n"
 #~ "Please check that the disk is entered correctly."
diff --git a/tde-i18n-az/messages/tdebase/tdeio_media.po b/tde-i18n-az/messages/tdebase/tdeio_media.po
index 9227a11a004..302a8edc45a 100644
--- a/tde-i18n-az/messages/tdebase/tdeio_media.po
+++ b/tde-i18n-az/messages/tdebase/tdeio_media.po
@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: tdeio_devices\n"
-"POT-Creation-Date: 2020-09-09 18:58+0200\n"
+"POT-Creation-Date: 2020-10-17 08:51+0800\n"
 "PO-Revision-Date: 2004-01-05 12:10+0200\n"
 "Last-Translator: Mətin Əmirov <metin@karegen.com>\n"
 "Language-Team: Azerbaijani Turkish <gnome@azitt.com>\n"
@@ -43,27 +43,26 @@ msgstr ""
 msgid "Unknown"
 msgstr "Namə'lum"
 
-#: 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 ""
 
-#: 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 ""
 
@@ -76,393 +75,467 @@ 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 ""
 
-#: mediamanager/fstabbackend.cpp:408
+#: mediamanager/fstabbackend.cpp:416
 msgid "CD Recorder"
 msgstr "CD Yazıcı"
 
-#: mediamanager/fstabbackend.cpp:414
+#: mediamanager/fstabbackend.cpp:422
 msgid "DVD"
 msgstr "DVD"
 
-#: mediamanager/fstabbackend.cpp:427
+#: mediamanager/fstabbackend.cpp:435
 msgid "CD-ROM"
 msgstr "CD-ROM"
 
-#: mediamanager/fstabbackend.cpp:440
+#: mediamanager/fstabbackend.cpp:448
 msgid "Floppy"
 msgstr "Floppi"
 
-#: mediamanager/fstabbackend.cpp:448
+#: mediamanager/fstabbackend.cpp:456
 msgid "Zip Disk"
 msgstr "Zip Diski"
 
-#: 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 "Uzaq Bölüşülmüş Sahə"
 
-#: mediamanager/fstabbackend.cpp:475
+#: mediamanager/fstabbackend.cpp:483
 #, fuzzy
 msgid "Hard Disk"
 msgstr "Sabit Disk"
 
-#: mediamanager/halbackend.cpp:768 mediamanager/tdehardwarebackend.cpp:809
+#: mediamanager/halbackend.cpp:778 mediamanager/tdehardwarebackend.cpp:826
 #, fuzzy
 msgid "Unknown Drive"
 msgstr "Namə'lum"
 
-#: mediamanager/halbackend.cpp:780 mediamanager/tdehardwarebackend.cpp:839
+#: mediamanager/halbackend.cpp:794 mediamanager/tdehardwarebackend.cpp:872
 #, fuzzy
 msgid "Floppy Drive"
 msgstr "Floppi"
 
-#: mediamanager/halbackend.cpp:788
+#: mediamanager/halbackend.cpp:802
 #, fuzzy
 msgid "Zip Drive"
 msgstr "Zip Diski"
 
-#: 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
 #, fuzzy
 msgid "Device is already mounted."
 msgstr "Avadanlıq bağlı deyil"
 
-#: 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 "
 "before attempting to unmount the device again."
 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. "
 msgstr ""
 
-#: 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 ""
 
-#: 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 ""
+
+#: mediamanager/halbackend.cpp:1497 mediamanager/tdehardwarebackend.cpp:1225
+#: mounthelper/tdeio_media_mounthelper.cpp:68
+#, fuzzy
+msgid "%1 is already mounted to %2."
+msgstr "Avadanlıq bağlı deyil"
+
+#: 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 "Avadanlıq bağlı deyil"
+
+#: 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
 msgid "Internal error"
 msgstr ""
 
-#: mediamanager/halbackend.cpp:1718
+#: mediamanager/halbackend.cpp:1745
 #, fuzzy
 #| msgid "Unknown"
 msgid "Unknown error"
 msgstr "Namə'lum"
 
-#: 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
+msgid "%1 is not an encrypted media."
+msgstr ""
+
+#: mediamanager/halbackend.cpp:1868 mediamanager/tdehardwarebackend.cpp:1452
+#: mounthelper/tdeio_media_mounthelper.cpp:127
+#, fuzzy
+msgid "%1 is already unlocked."
+msgstr "Avadanlıq bağlı deyil"
+
+#: 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 "Avadanlıq bağlı deyil"
+
 #: mediamanager/mediamanager.cpp:248 mediamanager/mediamanager.cpp:275
+#: mediamanager/mediamanager.cpp:302 mediamanager/mediamanager.cpp:329
 msgid "Feature only available with the TDE hardware backend"
 msgstr ""
 
 #: 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 ""
 
 #: mediamanager/mediamanager.cpp:262 mediamanager/mediamanager.cpp:289
-#: mediamanager/mediamanager.cpp:320 mediamanager/mediamanager.cpp:350
+#: mediamanager/mediamanager.cpp:316 mediamanager/mediamanager.cpp:343
 msgid "Feature only available with HAL or TDE hardware backend"
 msgstr ""
 
-#: mediamanager/tdehardwarebackend.cpp:484
-#: mediamanager/tdehardwarebackend.cpp:521
-#: mediamanager/tdehardwarebackend.cpp:754
+#: mediamanager/tdehardwarebackend.cpp:486
+#: mediamanager/tdehardwarebackend.cpp:523
+#: mediamanager/tdehardwarebackend.cpp:779
 msgid "%1 Removable Device"
 msgstr ""
 
-#: mediamanager/tdehardwarebackend.cpp:529
+#: mediamanager/tdehardwarebackend.cpp:532
 #, fuzzy
 msgid "Blank CD-ROM"
 msgstr "CD-ROM"
 
-#: 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 "CD-ROM"
 
-#: mediamanager/tdehardwarebackend.cpp:682
+#: mediamanager/tdehardwarebackend.cpp:702
 #, fuzzy
 msgid "Blank BLURAY-R"
 msgstr "CD-ROM"
 
-#: 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 Diski"
 
-#: 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:1516
+msgid "Unable to lock the device."
 msgstr ""
 
-#: mediamanager/tdehardwarebackend.cpp:1578
+#: mediamanager/tdehardwarebackend.cpp:1623
 msgid ""
 "Programs still using the device have been detected. They are listed below. "
 "You have to close them or change their working directory before attempting "
 "to unmount the device again."
 msgstr ""
 
-#: mounthelper/tdeio_media_mounthelper.cpp:79
-msgid "%1 cannot be found."
+#: mounthelper/tdeio_media_mounthelper.cpp:49
+msgid "The TDE mediamanager is not running.\n"
 msgstr ""
 
-#: mounthelper/tdeio_media_mounthelper.cpp:87
-msgid "%1 is not a mountable media."
+#: mounthelper/tdeio_media_mounthelper.cpp:59
+msgid "Try to mount an unknown medium."
 msgstr ""
 
-#: mounthelper/tdeio_media_mounthelper.cpp:101
-msgid "%1 is not an encrypted media."
+#: mounthelper/tdeio_media_mounthelper.cpp:87
+msgid "Try to unmount an unknown medium."
 msgstr ""
 
 #: mounthelper/tdeio_media_mounthelper.cpp:107
+msgid "Unknown unmount error."
+msgstr ""
+
+#: mounthelper/tdeio_media_mounthelper.cpp:116
+msgid "Try to unlock an unknown medium."
+msgstr ""
+
+#: mounthelper/tdeio_media_mounthelper.cpp:148
+msgid "Try to lock an unknown medium."
+msgstr ""
+
+#: mounthelper/tdeio_media_mounthelper.cpp:173
 #, fuzzy
-msgid "%1 is already unlocked."
-msgstr "Avadanlıq bağlı deyil"
+#| msgid "Unknown"
+msgid "Unknown lock error."
+msgstr "Namə'lum"
 
-#: mounthelper/tdeio_media_mounthelper.cpp:139
-msgid "Unknown unmount error."
+#: mounthelper/tdeio_media_mounthelper.cpp:211
+msgid "Try to release holders from an unknown medium."
 msgstr ""
 
-#: mounthelper/tdeio_media_mounthelper.cpp:246
-msgid "The device was successfully unmounted, but the tray could not be opened"
+#: mounthelper/tdeio_media_mounthelper.cpp:270
+msgid "Try to safe remove an unknown medium."
 msgstr ""
 
-#: mounthelper/tdeio_media_mounthelper.cpp:248
-msgid "The device was successfully unmounted, but could not be ejected"
+#: mounthelper/tdeio_media_mounthelper.cpp:302
+msgid "%1 cannot be found."
+msgstr ""
+
+#: mounthelper/tdeio_media_mounthelper.cpp:310
+msgid "%1 is not a mountable or encrypted media."
 msgstr ""
 
-#: mounthelper/tdeio_media_mounthelper.cpp:281
+#: mounthelper/tdeio_media_mounthelper.cpp:397
 #, fuzzy
-#| msgid "Unknown device %1"
-msgid "Unknown decrypt error."
-msgstr "Namə'lum avadanlıq %1"
+#| msgid "Unknown"
+msgid "Unknown unlock error."
+msgstr "Namə'lum"
 
-#: mounthelper/tdeio_media_mounthelper.cpp:295
+#: mounthelper/tdeio_media_mounthelper.cpp:410
 #, fuzzy
-msgid "Decrypt given URL"
+#| msgid "Unmount given URL"
+msgid "Mount given URL"
 msgstr "Bildirilən URL-ni Ayır"
 
-#: mounthelper/tdeio_media_mounthelper.cpp:296
+#: mounthelper/tdeio_media_mounthelper.cpp:411
 msgid "Unmount given URL"
 msgstr "Bildirilən URL-ni Ayır"
 
-#: mounthelper/tdeio_media_mounthelper.cpp:297
-msgid "Mount given URL (default)"
-msgstr "Bildirilən URL-ni Bağla (ön qurğulu)"
+#: mounthelper/tdeio_media_mounthelper.cpp:412
+#, fuzzy
+#| msgid "Unmount given URL"
+msgid "Unlock given URL"
+msgstr "Bildirilən URL-ni Ayır"
 
-#: mounthelper/tdeio_media_mounthelper.cpp:298
-msgid "Eject given URL via tdeeject"
-msgstr "Bildirilən URL-ni tdeeject ilə çıxart"
+#: mounthelper/tdeio_media_mounthelper.cpp:413
+#, fuzzy
+msgid "Lock given URL"
+msgstr "Bildirilən URL-ni Ayır"
 
-#: mounthelper/tdeio_media_mounthelper.cpp:299
-msgid "Unmount and Eject given URL (necessary for some USB devices)"
+#: mounthelper/tdeio_media_mounthelper.cpp:414
+#, fuzzy
+msgid "Eject given URL"
+msgstr "Bildirilən URL-ni Ayır"
+
+#: mounthelper/tdeio_media_mounthelper.cpp:415
+msgid "Safely remove (unmount and eject) given URL"
 msgstr ""
 
-#: mounthelper/tdeio_media_mounthelper.cpp:300
+#: 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 "devices:/ bağlanacaq/ayırılacaq/çıxarılacaq URL."
 
 #: propsdlgplugin/propertiespage.cpp:137
@@ -613,7 +686,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
@@ -833,6 +906,17 @@ msgstr ""
 msgid "Filesystem: iso9660"
 msgstr ""
 
+#, fuzzy
+#~| msgid "Unknown device %1"
+#~ msgid "Unknown decrypt error."
+#~ msgstr "Namə'lum avadanlıq %1"
+
+#~ msgid "Mount given URL (default)"
+#~ msgstr "Bildirilən URL-ni Bağla (ön qurğulu)"
+
+#~ msgid "Eject given URL via tdeeject"
+#~ msgstr "Bildirilən URL-ni tdeeject ilə çıxart"
+
 #~ msgid ""
 #~ "\n"
 #~ "Please check that the disk is entered correctly."
diff --git a/tde-i18n-be/messages/tdebase/tdeio_media.po b/tde-i18n-be/messages/tdebase/tdeio_media.po
index eee7e14ca7b..e0fda7ef23a 100644
--- a/tde-i18n-be/messages/tdebase/tdeio_media.po
+++ b/tde-i18n-be/messages/tdebase/tdeio_media.po
@@ -4,7 +4,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: 2006-05-17 13:01+0300\n"
 "Last-Translator: Ihar Hrachyshka <ihar.hrachyshka@gmail.com>\n"
 "Language-Team: Belarusian <kde-i18n-doc@kde.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,390 +76,469 @@ 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 ""
 
-#: mediamanager/fstabbackend.cpp:408
+#: mediamanager/fstabbackend.cpp:416
 msgid "CD Recorder"
 msgstr "Прылада запісу CD"
 
-#: mediamanager/fstabbackend.cpp:414
+#: mediamanager/fstabbackend.cpp:422
 msgid "DVD"
 msgstr "DVD"
 
-#: mediamanager/fstabbackend.cpp:427
+#: mediamanager/fstabbackend.cpp:435
 msgid "CD-ROM"
 msgstr "CD-ROM"
 
-#: 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 "
 "before attempting to unmount the device again."
 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. "
 msgstr ""
 
-#: 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 ""
 
-#: 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
+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 not a mountable media."
+msgid "%1 is already unmounted."
+msgstr "%1 не з'яўляецца носьбітам, які можна прымацаваць."
+
+#: 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
 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
+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
+msgid "%1 is already locked."
+msgstr ""
+
 #: mediamanager/mediamanager.cpp:248 mediamanager/mediamanager.cpp:275
+#: mediamanager/mediamanager.cpp:302 mediamanager/mediamanager.cpp:329
 msgid "Feature only available with the TDE hardware backend"
 msgstr ""
 
 #: 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 ""
 
 #: mediamanager/mediamanager.cpp:262 mediamanager/mediamanager.cpp:289
-#: mediamanager/mediamanager.cpp:320 mediamanager/mediamanager.cpp:350
+#: mediamanager/mediamanager.cpp:316 mediamanager/mediamanager.cpp:343
 msgid "Feature only available with HAL or TDE hardware backend"
 msgstr ""
 
-#: 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 "CD-ROM"
 
-#: 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 "CD-ROM"
 
-#: mediamanager/tdehardwarebackend.cpp:682
+#: mediamanager/tdehardwarebackend.cpp:702
 #, fuzzy
 msgid "Blank BLURAY-R"
 msgstr "CD-ROM"
 
-#: 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
 msgid ""
 "Programs still using the device have been detected. They are listed below. "
 "You have to close them or change their working directory before attempting "
 "to unmount the device again."
 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
-msgid "%1 is already unlocked."
+msgid "Unknown unmount error."
 msgstr ""
 
-#: mounthelper/tdeio_media_mounthelper.cpp:139
-msgid "Unknown unmount error."
+#: mounthelper/tdeio_media_mounthelper.cpp:116
+msgid "Try to unlock an unknown medium."
 msgstr ""
 
-#: mounthelper/tdeio_media_mounthelper.cpp:246
-msgid "The device was successfully unmounted, but the tray could not be opened"
+#: mounthelper/tdeio_media_mounthelper.cpp:148
+msgid "Try to lock an unknown medium."
 msgstr ""
 
-#: mounthelper/tdeio_media_mounthelper.cpp:248
-msgid "The device was successfully unmounted, but could not be ejected"
+#: 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:281
-msgid "Unknown decrypt error."
+#: 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 "Decrypt given URL"
+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 "Unmount given URL"
+msgid "Mount given URL"
 msgstr "Адмацаваць вызначаны URL"
 
-#: mounthelper/tdeio_media_mounthelper.cpp:296
+#: mounthelper/tdeio_media_mounthelper.cpp:411
 msgid "Unmount given URL"
 msgstr "Адмацаваць вызначаны URL"
 
-#: mounthelper/tdeio_media_mounthelper.cpp:297
-msgid "Mount given URL (default)"
-msgstr "Прымацаваць вызначаны URL (стандартнае)"
+#: mounthelper/tdeio_media_mounthelper.cpp:412
+#, fuzzy
+#| msgid "Unmount given URL"
+msgid "Unlock given URL"
+msgstr "Адмацаваць вызначаны URL"
+
+#: mounthelper/tdeio_media_mounthelper.cpp:413
+#, fuzzy
+msgid "Lock given URL"
+msgstr "Адмацаваць вызначаны URL"
 
-#: mounthelper/tdeio_media_mounthelper.cpp:298
-msgid "Eject given URL via tdeeject"
-msgstr "Вызваліць вызначаны URL праз tdeeject"
+#: mounthelper/tdeio_media_mounthelper.cpp:414
+#, fuzzy
+msgid "Eject given URL"
+msgstr "Адмацаваць вызначаны URL"
 
-#: mounthelper/tdeio_media_mounthelper.cpp:299
-msgid "Unmount and Eject given URL (necessary for some USB devices)"
+#: mounthelper/tdeio_media_mounthelper.cpp:415
+msgid "Safely remove (unmount and eject) given URL"
 msgstr ""
-"Адмацаваць і вызваліць вызначаны URL (неабходна для некаторых прыладаў USB)"
 
-#: 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 "URL media:/ для прымацавання/адмацавання/вызвалення/выдалення"
 
 #: propsdlgplugin/propertiespage.cpp:137
@@ -610,7 +688,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
@@ -830,6 +908,17 @@ msgstr ""
 msgid "Filesystem: iso9660"
 msgstr ""
 
+#~ msgid "Mount given URL (default)"
+#~ msgstr "Прымацаваць вызначаны URL (стандартнае)"
+
+#~ msgid "Eject given URL via tdeeject"
+#~ msgstr "Вызваліць вызначаны URL праз tdeeject"
+
+#~ msgid "Unmount and Eject given URL (necessary for some USB devices)"
+#~ msgstr ""
+#~ "Адмацаваць і вызваліць вызначаны URL (неабходна для некаторых прыладаў "
+#~ "USB)"
+
 #~ msgid ""
 #~ "\n"
 #~ "Please check that the disk is entered correctly."
diff --git a/tde-i18n-bg/messages/tdebase/tdeio_media.po b/tde-i18n-bg/messages/tdebase/tdeio_media.po
index 16dbacf1e4b..d3971b3a62f 100644
--- a/tde-i18n-bg/messages/tdebase/tdeio_media.po
+++ b/tde-i18n-bg/messages/tdebase/tdeio_media.po
@@ -9,7 +9,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: 2020-07-21 09:26+0000\n"
 "Last-Translator: Emanoil Kotsev <deloptes@gmail.com>\n"
 "Language-Team: Bulgarian <https://mirror.git.trinitydesktop.org/weblate/"
@@ -49,27 +49,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 "Мениджърът на мултимедийните носители не е стартиран."
 
-#: 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 "Неизвестна грешка на прикачването."
 
@@ -84,69 +83,71 @@ 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 "CD записвачка"
 
-#: mediamanager/fstabbackend.cpp:414
+#: mediamanager/fstabbackend.cpp:422
 msgid "DVD"
 msgstr "DVD"
 
-#: mediamanager/fstabbackend.cpp:427
+#: mediamanager/fstabbackend.cpp:435
 msgid "CD-ROM"
 msgstr "CD-ROM"
 
-#: 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
 msgid "Unknown Drive"
 msgstr "Неизвестно"
 
-#: mediamanager/halbackend.cpp:780 mediamanager/tdehardwarebackend.cpp:839
+#: mediamanager/halbackend.cpp:794 mediamanager/tdehardwarebackend.cpp:872
 msgid "Floppy Drive"
 msgstr "Флопи"
 
-#: mediamanager/halbackend.cpp:788
+#: mediamanager/halbackend.cpp:802
 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 "
@@ -156,7 +157,7 @@ msgstr ""
 "b></big><br/>Изисква се удостоверяване на самоличността за това действие. "
 "Моля въведете парола."
 
-#: 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 "
@@ -166,17 +167,16 @@ msgstr ""
 "други потребители</b></big><br/>Изисква се удостоверяване на самоличността "
 "за да бъде изпълнена операцията. Моля въведи паролата да удостовериш."
 
-#: 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>"
@@ -184,11 +184,11 @@ msgstr ""
 "Забранено<p>Моля провери дали:<br>1. Имаш права за достъп до устройството."
 "<br>2. Дали устройството фигурира в /etc/fstab.</p>"
 
-#: 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 "
@@ -198,17 +198,17 @@ 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. "
@@ -216,34 +216,56 @@ 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 "Възникна следната грешка при команда за демонтиране:"
 
-#: 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 unlocked."
+msgid "%1 is already mounted to %2."
+msgstr "%1 вече е отключено."
+
+#: 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 unlocked."
+msgid "%1 is already unmounted."
+msgstr "%1 вече е отключено."
+
+#: 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
 msgid "Internal error"
 msgstr "Вътрешна грешка"
 
-#: mediamanager/halbackend.cpp:1718
+#: mediamanager/halbackend.cpp:1745
 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>"
@@ -251,7 +273,7 @@ msgstr ""
 "Забранено<p>Увери се че:<br>1. Имаш права за достъп до устройството.<br>2. "
 "Това устройство е било първоначално прикачено чрез TDE.</p>"
 
-#: 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>"
@@ -259,164 +281,202 @@ msgstr ""
 "%1<p><b>Искаш ли на сила да спреш тези процеси?</b><br><i>Всички несъхранени "
 "данни ще изчезнат</i>"
 
-#: 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
+msgid "%1 is not an encrypted media."
+msgstr "Носителят %1 не е шифрован носител на данни."
+
+#: mediamanager/halbackend.cpp:1868 mediamanager/tdehardwarebackend.cpp:1452
+#: mounthelper/tdeio_media_mounthelper.cpp:127
+msgid "%1 is already unlocked."
+msgstr "%1 вече е отключено."
+
+#: 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 unlocked."
+msgid "%1 is already locked."
+msgstr "%1 вече е отключено."
+
 #: mediamanager/mediamanager.cpp:248 mediamanager/mediamanager.cpp:275
+#: mediamanager/mediamanager.cpp:302 mediamanager/mediamanager.cpp:329
 msgid "Feature only available with the TDE hardware backend"
 msgstr "Тази функция е налична само с управлението на хардуер в TDE"
 
 #: 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
 msgid "Feature only available with HAL or TDE hardware backend"
 msgstr "Тази функция е налична само с HAL или управлението на хардуера на TDE"
 
-#: mediamanager/tdehardwarebackend.cpp:484
-#: mediamanager/tdehardwarebackend.cpp:521
-#: mediamanager/tdehardwarebackend.cpp:754
+#: mediamanager/tdehardwarebackend.cpp:486
+#: mediamanager/tdehardwarebackend.cpp:523
+#: mediamanager/tdehardwarebackend.cpp:779
 msgid "%1 Removable Device"
 msgstr "Портативно устройство %1"
 
-#: mediamanager/tdehardwarebackend.cpp:529
+#: mediamanager/tdehardwarebackend.cpp:532
 msgid "Blank CD-ROM"
 msgstr "Празен CD-ROM"
 
-#: mediamanager/tdehardwarebackend.cpp:538
+#: mediamanager/tdehardwarebackend.cpp:542
 msgid "Blank CD-R"
 msgstr "Празен CD-R"
 
-#: mediamanager/tdehardwarebackend.cpp:547
+#: mediamanager/tdehardwarebackend.cpp:552
 msgid "Blank CD-RW"
 msgstr "Празен CD-RW"
 
-#: mediamanager/tdehardwarebackend.cpp:556
+#: mediamanager/tdehardwarebackend.cpp:562
 msgid "Blank Magneto-Optical CD"
 msgstr "Празен магнитнооптичен CD"
 
-#: mediamanager/tdehardwarebackend.cpp:565
+#: mediamanager/tdehardwarebackend.cpp:572
 msgid "Blank Mount Ranier CD-RW"
 msgstr "Празен Mount Ranier CD-RW"
 
-#: mediamanager/tdehardwarebackend.cpp:574
+#: mediamanager/tdehardwarebackend.cpp:582
 msgid "Blank Mount Ranier CD-RW-W"
 msgstr "Празен Mount Ranier CD-RW-W"
 
-#: mediamanager/tdehardwarebackend.cpp:583
+#: mediamanager/tdehardwarebackend.cpp:592
 msgid "Blank DVD-ROM"
 msgstr "Празни DVD-ROM"
 
-#: mediamanager/tdehardwarebackend.cpp:592
+#: mediamanager/tdehardwarebackend.cpp:602
 msgid "Blank DVD-RAM"
 msgstr "Празен DVD-RAM"
 
-#: mediamanager/tdehardwarebackend.cpp:601
+#: mediamanager/tdehardwarebackend.cpp:612
 msgid "Blank DVD-R"
 msgstr "Празен DVD-R"
 
-#: mediamanager/tdehardwarebackend.cpp:610
+#: mediamanager/tdehardwarebackend.cpp:622
 msgid "Blank DVD-RW"
 msgstr "Празен DVD-RW"
 
-#: mediamanager/tdehardwarebackend.cpp:619
+#: mediamanager/tdehardwarebackend.cpp:632
 msgid "Blank Dual Layer DVD-R"
 msgstr "Празен Dual Layer DVD-R"
 
-#: mediamanager/tdehardwarebackend.cpp:628
+#: mediamanager/tdehardwarebackend.cpp:642
 msgid "Blank Dual Layer DVD-RW"
 msgstr "Празен Dual Layer DVD-RW"
 
-#: mediamanager/tdehardwarebackend.cpp:637
+#: mediamanager/tdehardwarebackend.cpp:652
 msgid "Blank DVD+R"
 msgstr "Празен DVD+R"
 
-#: mediamanager/tdehardwarebackend.cpp:646
+#: mediamanager/tdehardwarebackend.cpp:662
 msgid "Blank DVD+RW"
 msgstr "Празен DVD+RW"
 
-#: mediamanager/tdehardwarebackend.cpp:655
+#: mediamanager/tdehardwarebackend.cpp:672
 msgid "Blank Dual Layer DVD+R"
 msgstr "Празен Dual Layer DVD+R"
 
-#: mediamanager/tdehardwarebackend.cpp:664
+#: mediamanager/tdehardwarebackend.cpp:682
 msgid "Blank Dual Layer DVD+RW"
 msgstr "Празен Dual Layer DVD+RW"
 
-#: mediamanager/tdehardwarebackend.cpp:673
+#: mediamanager/tdehardwarebackend.cpp:692
 msgid "Blank BLURAY-ROM"
 msgstr "Празен BLURAY-ROM"
 
-#: mediamanager/tdehardwarebackend.cpp:682
+#: mediamanager/tdehardwarebackend.cpp:702
 msgid "Blank BLURAY-R"
 msgstr "Празен BLURAY-R"
 
-#: mediamanager/tdehardwarebackend.cpp:691
+#: mediamanager/tdehardwarebackend.cpp:712
 msgid "Blank BLURAY-RW"
 msgstr "Празен BLURAY-RW"
 
-#: mediamanager/tdehardwarebackend.cpp:700
+#: mediamanager/tdehardwarebackend.cpp:722
 msgid "Blank HDDVD-ROM"
 msgstr "Празен HDDVD-ROM"
 
-#: mediamanager/tdehardwarebackend.cpp:709
+#: mediamanager/tdehardwarebackend.cpp:732
 msgid "Blank HDDVD-R"
 msgstr "Празен HDDVD-R"
 
-#: mediamanager/tdehardwarebackend.cpp:718
+#: mediamanager/tdehardwarebackend.cpp:742
 msgid "Blank HDDVD-RW"
 msgstr "Празен HDDVD-RW"
 
-#: 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 "%1 вграден диск (%2)"
 
-#: mediamanager/tdehardwarebackend.cpp:853
+#: mediamanager/tdehardwarebackend.cpp:886
 msgid "%1 Zip Disk"
 msgstr "%1 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
+#, fuzzy, c-format
+#| msgid "Internal error. Couldn't find medium."
+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 "<p>Технически данни:<br>"
 
-#: mediamanager/tdehardwarebackend.cpp:1285
-msgid "Decryption aborted"
-msgstr "Разшифроването бе прекъсното"
-
-#: mediamanager/tdehardwarebackend.cpp:1444
+#: mediamanager/tdehardwarebackend.cpp:1396
+#, fuzzy
+#| 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>"
 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>"
+"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 ""
 "<qt>Устройството <b>%1</b> (%2) наречено <b>'%3'</b> и понастоящем прикачено "
 "към <b>%4</b> не може да бъде разкачено в момента.<p>%5<p><b>Искаш ли "
 "насислтвено да прекратиш тези процеси?</b><br><i>Всички несъхранени данни ще "
 "бъдат загубени</i>"
 
-#: mediamanager/tdehardwarebackend.cpp:1578
+#: mediamanager/tdehardwarebackend.cpp:1467
+#, fuzzy
+#| msgid "Unable to mount this device."
+msgid "Unable to unlock the device."
+msgstr "Не може да прикачи това устройство."
+
+#: mediamanager/tdehardwarebackend.cpp:1516
+#, fuzzy
+#| msgid "Unable to mount this device."
+msgid "Unable to lock the device."
+msgstr "Не може да прикачи това устройство."
+
+#: mediamanager/tdehardwarebackend.cpp:1623
 msgid ""
 "Programs still using the device have been detected. They are listed below. "
 "You have to close them or change their working directory before attempting "
@@ -426,60 +486,98 @@ 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 "Мениджърът на мултимедийните носители не е стартиран."
 
-#: 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
-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
-msgid "%1 is already unlocked."
-msgstr "%1 вече е отключено."
-
-#: 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:148
+msgid "Try to lock 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:173
+#, fuzzy
+#| msgid "Unknown mount error."
+msgid "Unknown lock error."
+msgstr "Неизвестна грешка на прикачването."
 
-#: mounthelper/tdeio_media_mounthelper.cpp:281
-msgid "Unknown decrypt error."
-msgstr "Непозната грешка при разшифроване."
+#: mounthelper/tdeio_media_mounthelper.cpp:211
+msgid "Try to release holders from an unknown medium."
+msgstr ""
 
-#: mounthelper/tdeio_media_mounthelper.cpp:295
-msgid "Decrypt given URL"
-msgstr "Разшифровай използвайки следния адрес"
+#: mounthelper/tdeio_media_mounthelper.cpp:270
+msgid "Try to safe remove an unknown medium."
+msgstr ""
+
+#: mounthelper/tdeio_media_mounthelper.cpp:302
+msgid "%1 cannot be found."
+msgstr "Не може да бъде намерено %1."
+
+#: mounthelper/tdeio_media_mounthelper.cpp:310
+#, fuzzy
+#| msgid "%1 is not an encrypted media."
+msgid "%1 is not a mountable or encrypted media."
+msgstr "Носителят %1 не е шифрован носител на данни."
+
+#: mounthelper/tdeio_media_mounthelper.cpp:397
+#, fuzzy
+#| msgid "Unknown unmount error."
+msgid "Unknown unlock error."
+msgstr "Непозната грешка при разкачване."
+
+#: mounthelper/tdeio_media_mounthelper.cpp:410
+#, fuzzy
+#| 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:413
+#, fuzzy
+#| msgid "Decrypt given URL"
+msgid "Lock given URL"
+msgstr "Разшифровай използвайки следния адрес"
 
-#: mounthelper/tdeio_media_mounthelper.cpp:298
-msgid "Eject given URL via tdeeject"
-msgstr "Изваждане на носителя чрез tdeeject"
+#: mounthelper/tdeio_media_mounthelper.cpp:414
+#, fuzzy
+#| msgid "Decrypt given URL"
+msgid "Eject given URL"
+msgstr "Разшифровай използвайки следния адрес"
 
-#: mounthelper/tdeio_media_mounthelper.cpp:299
-msgid "Unmount and Eject given URL (necessary for some USB devices)"
-msgstr "Демонтиране и изваждане на зададения адрес (за някои USB устройства)"
+#: 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
@@ -636,13 +734,16 @@ msgid "&Password:"
 msgstr "Парола:"
 
 #: mounthelper/unlockdialog.ui:109
-#, no-c-format
+#, fuzzy, no-c-format
+#| msgid ""
+#| "<p><b>%1</b> is an encrypted locked storage device.</p>\n"
+#| "<p>Please enter the password to unlock the storage device.</p>"
 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 ""
-"<p><b>%1</b> е шифрован носител на информация.</p>\n"
-"<p>Моля въведи парола, за да разшифроваш носителя..</p>"
+"<p><b>%1</b> е шифрован и заключен носител на информация.</p>\n"
+"<p>Въведи парола, за да отключиш носителя.</p>"
 
 #: propsdlgplugin/propertiespagegui.ui:16
 #, no-c-format
@@ -903,6 +1004,36 @@ msgstr "Смесено"
 msgid "Filesystem: iso9660"
 msgstr "Файлова система: iso9660"
 
+#~ msgid "Decryption aborted"
+#~ msgstr "Разшифроването бе прекъсното"
+
+#~ 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 "Unknown decrypt error."
+#~ msgstr "Непозната грешка при разшифроване."
+
+#~ msgid "Mount given URL (default)"
+#~ msgstr "Монтиране на носителя (по подразбиране)"
+
+#~ msgid "Eject given URL via tdeeject"
+#~ msgstr "Изваждане на носителя чрез tdeeject"
+
+#~ msgid "Unmount and Eject given URL (necessary for some USB devices)"
+#~ msgstr ""
+#~ "Демонтиране и изваждане на зададения адрес (за някои USB устройства)"
+
+#~ msgid ""
+#~ "<p><b>%1</b> is an encrypted storage device.</p>\n"
+#~ "<p>Please enter the password to decrypt the storage device.</p>"
+#~ msgstr ""
+#~ "<p><b>%1</b> е шифрован носител на информация.</p>\n"
+#~ "<p>Моля въведи парола, за да разшифроваш носителя..</p>"
+
 #, fuzzy
 #~ msgid "Permission denied"
 #~ msgstr "Отказан достъп"
diff --git a/tde-i18n-bn/messages/tdebase/tdeio_media.po b/tde-i18n-bn/messages/tdebase/tdeio_media.po
index 31abad706ea..7bdebdd8686 100644
--- a/tde-i18n-bn/messages/tdebase/tdeio_media.po
+++ b/tde-i18n-bn/messages/tdebase/tdeio_media.po
@@ -8,7 +8,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: 2006-01-04 14:16-0600\n"
 "Last-Translator: Deepayan Sarkar <deepayan@bengalinux.org>\n"
 "Language-Team: Bengali <kde-translation@bengalinux.org>\n"
@@ -46,27 +46,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 "কে.ডি.ই. মিডিয়া-ম্যানেজার চালু নেই।"
 
-#: 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 ""
 
@@ -79,390 +78,469 @@ 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 ""
 
-#: 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 "জীপ ডিস্ক"
 
-#: 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 "জীপ ডিস্ক"
 
-#: 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 "
 "before attempting to unmount the device again."
 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. "
 msgstr ""
 
-#: 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 ""
 
-#: 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
+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 not a mountable media."
+msgid "%1 is already unmounted."
+msgstr "%1 মিডিয়া মাউন্ট করা যায় না।"
+
+#: 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
 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
+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
+msgid "%1 is already locked."
+msgstr ""
+
 #: mediamanager/mediamanager.cpp:248 mediamanager/mediamanager.cpp:275
+#: mediamanager/mediamanager.cpp:302 mediamanager/mediamanager.cpp:329
 msgid "Feature only available with the TDE hardware backend"
 msgstr ""
 
 #: 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 ""
 
 #: mediamanager/mediamanager.cpp:262 mediamanager/mediamanager.cpp:289
-#: mediamanager/mediamanager.cpp:320 mediamanager/mediamanager.cpp:350
+#: mediamanager/mediamanager.cpp:316 mediamanager/mediamanager.cpp:343
 msgid "Feature only available with HAL or TDE hardware backend"
 msgstr ""
 
-#: 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 "জীপ ডিস্ক"
 
-#: 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
 msgid ""
 "Programs still using the device have been detected. They are listed below. "
 "You have to close them or change their working directory before attempting "
 "to unmount the device again."
 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 "কে.ডি.ই. মিডিয়া-ম্যানেজার চালু নেই।"
 
-#: 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
-msgid "%1 is already unlocked."
+msgid "Unknown unmount error."
 msgstr ""
 
-#: mounthelper/tdeio_media_mounthelper.cpp:139
-msgid "Unknown unmount error."
+#: mounthelper/tdeio_media_mounthelper.cpp:116
+msgid "Try to unlock an unknown medium."
 msgstr ""
 
-#: mounthelper/tdeio_media_mounthelper.cpp:246
-msgid "The device was successfully unmounted, but the tray could not be opened"
+#: mounthelper/tdeio_media_mounthelper.cpp:148
+msgid "Try to lock an unknown medium."
 msgstr ""
 
-#: mounthelper/tdeio_media_mounthelper.cpp:248
-msgid "The device was successfully unmounted, but could not be ejected"
+#: 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:281
-msgid "Unknown decrypt error."
+#: 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 "Decrypt given URL"
+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 "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:413
+#, fuzzy
+msgid "Lock given URL"
+msgstr "প্রদত্ত ইউ-আর-এল আনমাউন্ট করুন"
 
-#: mounthelper/tdeio_media_mounthelper.cpp:298
-msgid "Eject given URL via tdeeject"
-msgstr "প্রদত্ত ইউ-আর-এল tdeeject ব্যবহার করে বের করে দিন"
+#: mounthelper/tdeio_media_mounthelper.cpp:414
+#, fuzzy
+msgid "Eject given URL"
+msgstr "প্রদত্ত ইউ-আর-এল আনমাউন্ট করুন"
 
-#: mounthelper/tdeio_media_mounthelper.cpp:299
-msgid "Unmount and Eject given URL (necessary for some USB devices)"
+#: 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:/ মাউন্ট/আনমাউন্ট/বের করার ইউ-আর-এল(URL)"
 
 #: propsdlgplugin/propertiespage.cpp:137
@@ -612,7 +690,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
@@ -832,6 +910,16 @@ msgstr ""
 msgid "Filesystem: iso9660"
 msgstr ""
 
+#~ msgid "Mount given URL (default)"
+#~ msgstr "প্রদত্ত ইউ-আর-এল মাউন্ট করুন"
+
+#~ msgid "Eject given URL via tdeeject"
+#~ msgstr "প্রদত্ত ইউ-আর-এল tdeeject ব্যবহার করে বের করে দিন"
+
+#~ msgid "Unmount and Eject given URL (necessary for some USB devices)"
+#~ msgstr ""
+#~ "প্রদত্ত ইউ-আর-এল আনমাউন্ট এবং এজেক্ট করো (কিছু ইউ-এস-বি ডিভাইস-এর জন্য প্রয়োজনীয়)"
+
 #~ msgid ""
 #~ "\n"
 #~ "Please check that the disk is entered correctly."
diff --git a/tde-i18n-br/messages/tdebase/tdeio_media.po b/tde-i18n-br/messages/tdebase/tdeio_media.po
index ece53c2c919..1ffbde8bc8f 100644
--- a/tde-i18n-br/messages/tdebase/tdeio_media.po
+++ b/tde-i18n-br/messages/tdebase/tdeio_media.po
@@ -3,7 +3,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: all2.po\n"
-"POT-Creation-Date: 2020-09-09 18:58+0200\n"
+"POT-Creation-Date: 2020-10-17 08:51+0800\n"
 "PO-Revision-Date: 2004-09-20 15:44+0200\n"
 "Last-Translator: Thierry Vignaud <tvignaud@mandriva.com>\n"
 "Language-Team: br <LL@li.org>\n"
@@ -40,27 +40,26 @@ msgstr "Digeriñ en ur prenestr nevez"
 msgid "Unknown"
 msgstr "Dianav"
 
-#: 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 ""
 
-#: mediaimpl.cpp:187
+#: mediaimpl.cpp:186
 msgid "This media name already exists."
 msgstr "Endeo eo anv-vedia-mañ."
 
-#: mediaimpl.cpp:230 mediaimpl.cpp:297
+#: mediaimpl.cpp:229 mediaimpl.cpp:296
 msgid "No such medium."
 msgstr "Hevelep mediuml ebet."
 
-#: 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 ""
 
@@ -73,388 +72,458 @@ 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 ""
 
-#: mediamanager/fstabbackend.cpp:408
+#: mediamanager/fstabbackend.cpp:416
 msgid "CD Recorder"
 msgstr "Skriver CD"
 
-#: mediamanager/fstabbackend.cpp:414
+#: mediamanager/fstabbackend.cpp:422
 msgid "DVD"
 msgstr "DVD"
 
-#: mediamanager/fstabbackend.cpp:427
+#: mediamanager/fstabbackend.cpp:435
 msgid "CD-ROM"
 msgstr "CD-ROM"
 
-#: mediamanager/fstabbackend.cpp:440
+#: mediamanager/fstabbackend.cpp:448
 msgid "Floppy"
 msgstr "Plannedig"
 
-#: mediamanager/fstabbackend.cpp:448
+#: mediamanager/fstabbackend.cpp:456
 msgid "Zip Disk"
 msgstr "Pladenn Zip"
 
-#: mediamanager/fstabbackend.cpp:459
+#: mediamanager/fstabbackend.cpp:467
 msgid "Removable Device"
 msgstr "Trobarzhell a-bell"
 
-#: 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 "Pladenn"
 
-#: mediamanager/halbackend.cpp:768 mediamanager/tdehardwarebackend.cpp:809
+#: mediamanager/halbackend.cpp:778 mediamanager/tdehardwarebackend.cpp:826
 #, fuzzy
 msgid "Unknown Drive"
 msgstr "Dianav"
 
-#: mediamanager/halbackend.cpp:780 mediamanager/tdehardwarebackend.cpp:839
+#: mediamanager/halbackend.cpp:794 mediamanager/tdehardwarebackend.cpp:872
 #, fuzzy
 msgid "Floppy Drive"
 msgstr "Plannedig"
 
-#: mediamanager/halbackend.cpp:788
+#: mediamanager/halbackend.cpp:802
 #, fuzzy
 msgid "Zip Drive"
 msgstr "Pladenn Zip"
 
-#: mediamanager/halbackend.cpp:858 mediamanager/tdehardwarebackend.cpp:896
+#: mediamanager/halbackend.cpp:877 mediamanager/tdehardwarebackend.cpp:930
 msgid "Camera"
 msgstr "Kamera"
 
-#: 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 "Fazi diabarzh"
 
-#: 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 "
 "before attempting to unmount the device again."
 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. "
 msgstr ""
 
-#: 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 ""
 
-#: 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 ""
+
+#: mediamanager/halbackend.cpp:1497 mediamanager/tdehardwarebackend.cpp:1225
+#: mounthelper/tdeio_media_mounthelper.cpp:68
+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
+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 "Fazi diabarzh"
 
-#: mediamanager/halbackend.cpp:1718
+#: mediamanager/halbackend.cpp:1745
 #, fuzzy
 #| msgid "Unknown"
 msgid "Unknown error"
 msgstr "Dianav"
 
-#: 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
+msgid "%1 is not an encrypted media."
+msgstr ""
+
+#: mediamanager/halbackend.cpp:1868 mediamanager/tdehardwarebackend.cpp:1452
+#: mounthelper/tdeio_media_mounthelper.cpp:127
+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
+msgid "%1 is already locked."
+msgstr ""
+
 #: mediamanager/mediamanager.cpp:248 mediamanager/mediamanager.cpp:275
+#: mediamanager/mediamanager.cpp:302 mediamanager/mediamanager.cpp:329
 msgid "Feature only available with the TDE hardware backend"
 msgstr ""
 
 #: 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 ""
 
 #: mediamanager/mediamanager.cpp:262 mediamanager/mediamanager.cpp:289
-#: mediamanager/mediamanager.cpp:320 mediamanager/mediamanager.cpp:350
+#: mediamanager/mediamanager.cpp:316 mediamanager/mediamanager.cpp:343
 msgid "Feature only available with HAL or TDE hardware backend"
 msgstr ""
 
-#: 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 "Trobarzhell a-bell"
 
-#: mediamanager/tdehardwarebackend.cpp:529
+#: mediamanager/tdehardwarebackend.cpp:532
 #, fuzzy
 msgid "Blank CD-ROM"
 msgstr "CD-ROM"
 
-#: 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 "CD-ROM"
 
-#: mediamanager/tdehardwarebackend.cpp:682
+#: mediamanager/tdehardwarebackend.cpp:702
 #, fuzzy
 msgid "Blank BLURAY-R"
 msgstr "CD-ROM"
 
-#: 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 "Pladenn 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:1516
+msgid "Unable to lock the device."
 msgstr ""
 
-#: mediamanager/tdehardwarebackend.cpp:1578
+#: mediamanager/tdehardwarebackend.cpp:1623
 msgid ""
 "Programs still using the device have been detected. They are listed below. "
 "You have to close them or change their working directory before attempting "
 "to unmount the device again."
 msgstr ""
 
-#: mounthelper/tdeio_media_mounthelper.cpp:79
-msgid "%1 cannot be found."
-msgstr "N'eo ket bet kavet %1."
+#: mounthelper/tdeio_media_mounthelper.cpp:49
+msgid "The TDE mediamanager is not running.\n"
+msgstr ""
 
-#: mounthelper/tdeio_media_mounthelper.cpp:87
-msgid "%1 is not a mountable media."
+#: mounthelper/tdeio_media_mounthelper.cpp:59
+msgid "Try to mount an unknown medium."
 msgstr ""
 
-#: mounthelper/tdeio_media_mounthelper.cpp:101
-msgid "%1 is not an encrypted media."
+#: mounthelper/tdeio_media_mounthelper.cpp:87
+msgid "Try to unmount an unknown medium."
 msgstr ""
 
 #: mounthelper/tdeio_media_mounthelper.cpp:107
-msgid "%1 is already unlocked."
+msgid "Unknown unmount error."
 msgstr ""
 
-#: mounthelper/tdeio_media_mounthelper.cpp:139
-msgid "Unknown unmount error."
+#: mounthelper/tdeio_media_mounthelper.cpp:116
+msgid "Try to unlock an unknown medium."
 msgstr ""
 
-#: mounthelper/tdeio_media_mounthelper.cpp:246
-msgid "The device was successfully unmounted, but the tray could not be opened"
+#: mounthelper/tdeio_media_mounthelper.cpp:148
+msgid "Try to lock an unknown medium."
 msgstr ""
 
-#: mounthelper/tdeio_media_mounthelper.cpp:248
-msgid "The device was successfully unmounted, but could not be ejected"
+#: mounthelper/tdeio_media_mounthelper.cpp:173
+#, fuzzy
+#| msgid "Unknown"
+msgid "Unknown lock error."
+msgstr "Dianav"
+
+#: mounthelper/tdeio_media_mounthelper.cpp:211
+msgid "Try to release holders from an unknown medium."
 msgstr ""
 
-#: mounthelper/tdeio_media_mounthelper.cpp:281
-msgid "Unknown decrypt error."
+#: mounthelper/tdeio_media_mounthelper.cpp:270
+msgid "Try to safe remove an unknown medium."
 msgstr ""
 
-#: mounthelper/tdeio_media_mounthelper.cpp:295
-msgid "Decrypt given URL"
+#: mounthelper/tdeio_media_mounthelper.cpp:302
+msgid "%1 cannot be found."
+msgstr "N'eo ket bet kavet %1."
+
+#: mounthelper/tdeio_media_mounthelper.cpp:310
+msgid "%1 is not a mountable or encrypted media."
 msgstr ""
 
-#: mounthelper/tdeio_media_mounthelper.cpp:296
+#: mounthelper/tdeio_media_mounthelper.cpp:397
+#, fuzzy
+#| msgid "Unknown"
+msgid "Unknown unlock error."
+msgstr "Dianav"
+
+#: mounthelper/tdeio_media_mounthelper.cpp:410
+#, fuzzy
+#| msgid "Mount Point"
+msgid "Mount given URL"
+msgstr "Poent mountañ"
+
+#: mounthelper/tdeio_media_mounthelper.cpp:411
 msgid "Unmount given URL"
 msgstr ""
 
-#: mounthelper/tdeio_media_mounthelper.cpp:297
-msgid "Mount given URL (default)"
+#: mounthelper/tdeio_media_mounthelper.cpp:412
+msgid "Unlock given URL"
 msgstr ""
 
-#: mounthelper/tdeio_media_mounthelper.cpp:298
-msgid "Eject given URL via tdeeject"
+#: mounthelper/tdeio_media_mounthelper.cpp:413
+msgid "Lock given URL"
 msgstr ""
 
-#: mounthelper/tdeio_media_mounthelper.cpp:299
-msgid "Unmount and Eject given URL (necessary for some USB devices)"
+#: mounthelper/tdeio_media_mounthelper.cpp:414
+msgid "Eject given URL"
 msgstr ""
 
-#: mounthelper/tdeio_media_mounthelper.cpp:300
-msgid "media:/ URL to mount/unmount/eject/remove"
+#: mounthelper/tdeio_media_mounthelper.cpp:415
+msgid "Safely remove (unmount and eject) given URL"
+msgstr ""
+
+#: mounthelper/tdeio_media_mounthelper.cpp:416
+msgid "media:/URL to mount/unmount/unlock/lock/eject/remove"
 msgstr ""
 
 #: propsdlgplugin/propertiespage.cpp:137
@@ -603,7 +672,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
diff --git a/tde-i18n-bs/messages/tdebase/tdeio_media.po b/tde-i18n-bs/messages/tdebase/tdeio_media.po
index 67ae242abb1..a3f53a75549 100644
--- a/tde-i18n-bs/messages/tdebase/tdeio_media.po
+++ b/tde-i18n-bs/messages/tdebase/tdeio_media.po
@@ -5,7 +5,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: 2006-02-11 19:56+0100\n"
 "Last-Translator: Vedran Ljubovic <vljubovic@smartnet.ba>\n"
 "Language-Team: Bosnian <lokal@linux.org.ba>\n"
@@ -43,27 +43,26 @@ msgstr "Otvori novi prozor"
 msgid "Unknown"
 msgstr "Nepoznato"
 
-#: 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 "TDEov upravitelj medijima nije pokrenut."
 
-#: mediaimpl.cpp:187
+#: mediaimpl.cpp:186
 msgid "This media name already exists."
 msgstr "Ovaj naziv medija već postoji."
 
-#: 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 ""
 
@@ -76,389 +75,469 @@ 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 ""
 
-#: mediamanager/fstabbackend.cpp:408
+#: mediamanager/fstabbackend.cpp:416
 msgid "CD Recorder"
 msgstr "CD snimač"
 
-#: mediamanager/fstabbackend.cpp:414
+#: mediamanager/fstabbackend.cpp:422
 msgid "DVD"
 msgstr "DVD"
 
-#: mediamanager/fstabbackend.cpp:427
+#: mediamanager/fstabbackend.cpp:435
 msgid "CD-ROM"
 msgstr "CD-ROM"
 
-#: mediamanager/fstabbackend.cpp:440
+#: mediamanager/fstabbackend.cpp:448
 msgid "Floppy"
 msgstr "Disketa"
 
-#: mediamanager/fstabbackend.cpp:448
+#: mediamanager/fstabbackend.cpp:456
 msgid "Zip Disk"
 msgstr "Zip disk"
 
-#: mediamanager/fstabbackend.cpp:459
+#: mediamanager/fstabbackend.cpp:467
 msgid "Removable Device"
 msgstr "Izmjenjivi uređaj"
 
-#: mediamanager/fstabbackend.cpp:464 mediamanager/fstabbackend.cpp:470
+#: mediamanager/fstabbackend.cpp:472 mediamanager/fstabbackend.cpp:478
 msgid "Remote Share"
 msgstr "Dijeljeni resurs"
 
-#: mediamanager/fstabbackend.cpp:475
+#: mediamanager/fstabbackend.cpp:483
 msgid "Hard Disk"
 msgstr "Hard disk"
 
-#: mediamanager/halbackend.cpp:768 mediamanager/tdehardwarebackend.cpp:809
+#: mediamanager/halbackend.cpp:778 mediamanager/tdehardwarebackend.cpp:826
 #, fuzzy
 msgid "Unknown Drive"
 msgstr "Nepoznato"
 
-#: mediamanager/halbackend.cpp:780 mediamanager/tdehardwarebackend.cpp:839
+#: mediamanager/halbackend.cpp:794 mediamanager/tdehardwarebackend.cpp:872
 #, fuzzy
 msgid "Floppy Drive"
 msgstr "Disketa"
 
-#: mediamanager/halbackend.cpp:788
+#: mediamanager/halbackend.cpp:802
 #, fuzzy
 msgid "Zip Drive"
 msgstr "Zip disk"
 
-#: mediamanager/halbackend.cpp:858 mediamanager/tdehardwarebackend.cpp:896
+#: mediamanager/halbackend.cpp:877 mediamanager/tdehardwarebackend.cpp:930
 msgid "Camera"
 msgstr "Kamera"
 
-#: 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 "
 "before attempting to unmount the device again."
 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. "
 msgstr ""
 
-#: 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 ""
 
-#: 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 nije medij koji se može montirati."
+
+#: mediamanager/halbackend.cpp:1497 mediamanager/tdehardwarebackend.cpp:1225
+#: mounthelper/tdeio_media_mounthelper.cpp:68
+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 not a mountable media."
+msgid "%1 is already unmounted."
+msgstr "%1 nije medij koji se može montirati."
+
+#: 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
 msgid "Internal error"
 msgstr ""
 
-#: mediamanager/halbackend.cpp:1718
+#: mediamanager/halbackend.cpp:1745
 #, fuzzy
 #| msgid "Unknown"
 msgid "Unknown error"
 msgstr "Nepoznato"
 
-#: 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 nije medij koji se može montirati."
+
+#: mediamanager/halbackend.cpp:1868 mediamanager/tdehardwarebackend.cpp:1452
+#: mounthelper/tdeio_media_mounthelper.cpp:127
+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
+msgid "%1 is already locked."
+msgstr ""
+
 #: mediamanager/mediamanager.cpp:248 mediamanager/mediamanager.cpp:275
+#: mediamanager/mediamanager.cpp:302 mediamanager/mediamanager.cpp:329
 msgid "Feature only available with the TDE hardware backend"
 msgstr ""
 
 #: 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 ""
 
 #: mediamanager/mediamanager.cpp:262 mediamanager/mediamanager.cpp:289
-#: mediamanager/mediamanager.cpp:320 mediamanager/mediamanager.cpp:350
+#: mediamanager/mediamanager.cpp:316 mediamanager/mediamanager.cpp:343
 msgid "Feature only available with HAL or TDE hardware backend"
 msgstr ""
 
-#: 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 "Izmjenjivi uređaj"
 
-#: mediamanager/tdehardwarebackend.cpp:529
+#: mediamanager/tdehardwarebackend.cpp:532
 #, fuzzy
 msgid "Blank CD-ROM"
 msgstr "CD-ROM"
 
-#: 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 "CD-ROM"
 
-#: mediamanager/tdehardwarebackend.cpp:682
+#: mediamanager/tdehardwarebackend.cpp:702
 #, fuzzy
 msgid "Blank BLURAY-R"
 msgstr "CD-ROM"
 
-#: 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 disk"
 
-#: 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
 msgid ""
 "Programs still using the device have been detected. They are listed below. "
 "You have to close them or change their working directory before attempting "
 "to unmount the device again."
 msgstr ""
 
-#: mounthelper/tdeio_media_mounthelper.cpp:79
-msgid "%1 cannot be found."
-msgstr "Ne mogu naći %1."
+#: mounthelper/tdeio_media_mounthelper.cpp:49
+#, fuzzy
+#| msgid "The TDE mediamanager is not running."
+msgid "The TDE mediamanager is not running.\n"
+msgstr "TDEov upravitelj medijima nije pokrenut."
 
-#: mounthelper/tdeio_media_mounthelper.cpp:87
-msgid "%1 is not a mountable media."
-msgstr "%1 nije medij koji se može montirati."
+#: 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 nije medij koji se može montirati."
+#: mounthelper/tdeio_media_mounthelper.cpp:87
+msgid "Try to unmount an unknown medium."
+msgstr ""
 
 #: mounthelper/tdeio_media_mounthelper.cpp:107
-msgid "%1 is already unlocked."
+msgid "Unknown unmount error."
 msgstr ""
 
-#: mounthelper/tdeio_media_mounthelper.cpp:139
-msgid "Unknown unmount error."
+#: mounthelper/tdeio_media_mounthelper.cpp:116
+msgid "Try to unlock an unknown medium."
 msgstr ""
 
-#: mounthelper/tdeio_media_mounthelper.cpp:246
-msgid "The device was successfully unmounted, but the tray could not be opened"
+#: mounthelper/tdeio_media_mounthelper.cpp:148
+msgid "Try to lock an unknown medium."
 msgstr ""
 
-#: mounthelper/tdeio_media_mounthelper.cpp:248
-msgid "The device was successfully unmounted, but could not be ejected"
+#: mounthelper/tdeio_media_mounthelper.cpp:173
+#, fuzzy
+#| msgid "Unknown"
+msgid "Unknown lock error."
+msgstr "Nepoznato"
+
+#: mounthelper/tdeio_media_mounthelper.cpp:211
+msgid "Try to release holders from an unknown medium."
 msgstr ""
 
-#: mounthelper/tdeio_media_mounthelper.cpp:281
-msgid "Unknown decrypt error."
+#: 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 "Ne mogu naći %1."
+
+#: mounthelper/tdeio_media_mounthelper.cpp:310
 #, fuzzy
-msgid "Decrypt given URL"
+msgid "%1 is not a mountable or encrypted media."
+msgstr "%1 nije medij koji se može montirati."
+
+#: mounthelper/tdeio_media_mounthelper.cpp:397
+#, fuzzy
+#| msgid "Unknown"
+msgid "Unknown unlock error."
+msgstr "Nepoznato"
+
+#: mounthelper/tdeio_media_mounthelper.cpp:410
+#, fuzzy
+#| msgid "Unmount given URL"
+msgid "Mount given URL"
 msgstr "Demontiraj navedeni URL"
 
-#: mounthelper/tdeio_media_mounthelper.cpp:296
+#: mounthelper/tdeio_media_mounthelper.cpp:411
 msgid "Unmount given URL"
 msgstr "Demontiraj navedeni URL"
 
-#: mounthelper/tdeio_media_mounthelper.cpp:297
-msgid "Mount given URL (default)"
-msgstr "Montiraj navedeni URL (podrazumijevano)"
+#: mounthelper/tdeio_media_mounthelper.cpp:412
+#, fuzzy
+#| msgid "Unmount given URL"
+msgid "Unlock given URL"
+msgstr "Demontiraj navedeni URL"
+
+#: mounthelper/tdeio_media_mounthelper.cpp:413
+#, fuzzy
+msgid "Lock given URL"
+msgstr "Demontiraj navedeni URL"
 
-#: mounthelper/tdeio_media_mounthelper.cpp:298
-msgid "Eject given URL via tdeeject"
-msgstr "Izbaci dati URL koristeći tdeeject"
+#: mounthelper/tdeio_media_mounthelper.cpp:414
+#, fuzzy
+msgid "Eject given URL"
+msgstr "Demontiraj navedeni URL"
 
-#: mounthelper/tdeio_media_mounthelper.cpp:299
-msgid "Unmount and Eject given URL (necessary for some USB devices)"
-msgstr "Demontiraj i izbaci dati URL (potrebno za neke USB uređaje)"
+#: 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:/ URL za montiranje/demontiranje/izbacivanje/uklanjanje"
 
 #: propsdlgplugin/propertiespage.cpp:137
@@ -608,7 +687,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
@@ -828,6 +907,15 @@ msgstr ""
 msgid "Filesystem: iso9660"
 msgstr ""
 
+#~ msgid "Mount given URL (default)"
+#~ msgstr "Montiraj navedeni URL (podrazumijevano)"
+
+#~ msgid "Eject given URL via tdeeject"
+#~ msgstr "Izbaci dati URL koristeći tdeeject"
+
+#~ msgid "Unmount and Eject given URL (necessary for some USB devices)"
+#~ msgstr "Demontiraj i izbaci dati URL (potrebno za neke USB uređaje)"
+
 #~ msgid ""
 #~ "\n"
 #~ "Please check that the disk is entered correctly."
diff --git a/tde-i18n-ca/messages/tdebase/tdeio_media.po b/tde-i18n-ca/messages/tdebase/tdeio_media.po
index 19bb7810675..13a251bd1a3 100644
--- a/tde-i18n-ca/messages/tdebase/tdeio_media.po
+++ b/tde-i18n-ca/messages/tdebase/tdeio_media.po
@@ -7,7 +7,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-12-15 10:12+0100\n"
 "Last-Translator: Josep Ma. Ferrer <txemaq@gmail.com>\n"
 "Language-Team: Catalan <kde-i18n-ca@kde.org>\n"
@@ -45,27 +45,26 @@ msgstr "Obre a una finestra nova"
 msgid "Unknown"
 msgstr "Desconegut"
 
-#: 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 "El gestor de suports del TDE no s'està executant."
 
-#: mediaimpl.cpp:187
+#: mediaimpl.cpp:186
 msgid "This media name already exists."
 msgstr "Aquest nom de suport ja existeix."
 
-#: mediaimpl.cpp:230 mediaimpl.cpp:297
+#: mediaimpl.cpp:229 mediaimpl.cpp:296
 msgid "No such medium."
 msgstr "No hi és el suport."
 
-#: 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 ""
 
@@ -78,103 +77,104 @@ 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 "Aquest suport no hi és: %1"
 
-#: mediamanager/fstabbackend.cpp:408
+#: mediamanager/fstabbackend.cpp:416
 msgid "CD Recorder"
 msgstr "Gravadora CD"
 
-#: mediamanager/fstabbackend.cpp:414
+#: mediamanager/fstabbackend.cpp:422
 msgid "DVD"
 msgstr "DVD"
 
-#: mediamanager/fstabbackend.cpp:427
+#: mediamanager/fstabbackend.cpp:435
 msgid "CD-ROM"
 msgstr "CD-ROM"
 
-#: mediamanager/fstabbackend.cpp:440
+#: mediamanager/fstabbackend.cpp:448
 msgid "Floppy"
 msgstr "Disquetera"
 
-#: mediamanager/fstabbackend.cpp:448
+#: mediamanager/fstabbackend.cpp:456
 msgid "Zip Disk"
 msgstr "Disc zip"
 
-#: mediamanager/fstabbackend.cpp:459
+#: mediamanager/fstabbackend.cpp:467
 msgid "Removable Device"
 msgstr "Dispositiu extraïble"
 
-#: mediamanager/fstabbackend.cpp:464 mediamanager/fstabbackend.cpp:470
+#: mediamanager/fstabbackend.cpp:472 mediamanager/fstabbackend.cpp:478
 msgid "Remote Share"
 msgstr "Compartit remot"
 
-#: mediamanager/fstabbackend.cpp:475
+#: mediamanager/fstabbackend.cpp:483
 msgid "Hard Disk"
 msgstr "Disc dur"
 
-#: mediamanager/halbackend.cpp:768 mediamanager/tdehardwarebackend.cpp:809
+#: mediamanager/halbackend.cpp:778 mediamanager/tdehardwarebackend.cpp:826
 msgid "Unknown Drive"
 msgstr "Unitat desconeguda"
 
-#: mediamanager/halbackend.cpp:780 mediamanager/tdehardwarebackend.cpp:839
+#: mediamanager/halbackend.cpp:794 mediamanager/tdehardwarebackend.cpp:872
 msgid "Floppy Drive"
 msgstr "Unitat de disquet"
 
-#: mediamanager/halbackend.cpp:788
+#: mediamanager/halbackend.cpp:802
 msgid "Zip Drive"
 msgstr "Unitat zip"
 
-#: mediamanager/halbackend.cpp:858 mediamanager/tdehardwarebackend.cpp:896
+#: mediamanager/halbackend.cpp:877 mediamanager/tdehardwarebackend.cpp:930
 msgid "Camera"
 msgstr "Càmera"
 
-#: 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 "Error intern"
 
-#: mediamanager/halbackend.cpp:1303
+#: mediamanager/halbackend.cpp:1322
 msgid "Invalid filesystem type"
 msgstr "El tipus de sistema de fitxers no és vàlid"
 
-#: 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 "El dispositiu ja és muntat."
 
-#: 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 "
@@ -184,16 +184,16 @@ msgstr ""
 "sota. Heu de tancar-los o canviar-hi el directori de treball abans de tornar "
 "a provar de desmuntar el dispositiu."
 
-#: 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. "
@@ -201,209 +201,257 @@ msgstr ""
 "Malauradament, el dispositiu <b>%1</b> (%2) anomenat <b>'%3'</b> i muntat "
 "actualment a <b>%4</b> no s'ha pogut desmuntar. "
 
-#: 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 "El comandament umount ha retornat l'error següent:"
 
-#: 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 no és un suport muntable."
+
+#: mediamanager/halbackend.cpp:1497 mediamanager/tdehardwarebackend.cpp:1225
+#: mounthelper/tdeio_media_mounthelper.cpp:68
+#, fuzzy
+msgid "%1 is already mounted to %2."
+msgstr "El dispositiu ja és muntat."
+
+#: 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 "El dispositiu ja és muntat."
+
+#: 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 "Error intern"
 
-#: mediamanager/halbackend.cpp:1718
+#: mediamanager/halbackend.cpp:1745
 #, fuzzy
 #| msgid "Unknown"
 msgid "Unknown error"
 msgstr "Desconegut"
 
-#: mediamanager/halbackend.cpp:1772
+#: mediamanager/halbackend.cpp:1799
 msgid "Unmounting failed due to the following error:"
 msgstr "Ha fallat el desmuntat degut a l'error següent:"
 
-#: mediamanager/halbackend.cpp:1774
+#: mediamanager/halbackend.cpp:1801
 msgid "Device is Busy:"
 msgstr "El dispositiu està ocupat:"
 
-#: 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 no és un suport muntable."
+
+#: mediamanager/halbackend.cpp:1868 mediamanager/tdehardwarebackend.cpp:1452
+#: mounthelper/tdeio_media_mounthelper.cpp:127
+#, fuzzy
+msgid "%1 is already unlocked."
+msgstr "El dispositiu ja és muntat."
+
+#: 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 "El dispositiu ja és muntat."
+
 #: 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 "Aquesta característica només és disponible amb 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 "Aquesta característica només és disponible amb 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 "Aquesta característica només és disponible amb 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 "Dispositiu extraïble"
 
-#: mediamanager/tdehardwarebackend.cpp:529
+#: mediamanager/tdehardwarebackend.cpp:532
 #, fuzzy
 msgid "Blank CD-ROM"
 msgstr "CD-ROM"
 
-#: 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 "CD-ROM"
 
-#: mediamanager/tdehardwarebackend.cpp:682
+#: mediamanager/tdehardwarebackend.cpp:702
 #, fuzzy
 msgid "Blank BLURAY-R"
 msgstr "CD-ROM"
 
-#: 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 "Disc 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. "
@@ -414,65 +462,95 @@ msgstr ""
 "sota. Heu de tancar-los o canviar-hi el directori de treball abans de tornar "
 "a provar de desmuntar el dispositiu."
 
-#: mounthelper/tdeio_media_mounthelper.cpp:79
-msgid "%1 cannot be found."
-msgstr "No s'ha pogut trobar %1."
+#: mounthelper/tdeio_media_mounthelper.cpp:49
+#, fuzzy
+#| msgid "The TDE mediamanager is not running."
+msgid "The TDE mediamanager is not running.\n"
+msgstr "El gestor de suports del TDE no s'està executant."
 
-#: mounthelper/tdeio_media_mounthelper.cpp:87
-msgid "%1 is not a mountable media."
-msgstr "%1 no és un suport muntable."
+#: 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 no és un suport muntable."
+#: 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 "El dispositiu ja és muntat."
-
-#: 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"
+#: mounthelper/tdeio_media_mounthelper.cpp:116
+msgid "Try to unlock an unknown medium."
 msgstr ""
-"El dispositiu s'ha desmuntat amb èxit, però no s'ha pogut obrir la safata"
 
-#: mounthelper/tdeio_media_mounthelper.cpp:248
-msgid "The device was successfully unmounted, but could not be ejected"
-msgstr "El dispositiu s'ha desmuntat amb èxit, però no s'ha pogut expulsar"
+#: 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 "Desconegut"
+
+#: 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 "No s'ha pogut trobar %1."
+
+#: mounthelper/tdeio_media_mounthelper.cpp:310
 #, fuzzy
-msgid "Decrypt given URL"
+msgid "%1 is not a mountable or encrypted media."
+msgstr "%1 no és un suport muntable."
+
+#: mounthelper/tdeio_media_mounthelper.cpp:397
+#, fuzzy
+#| msgid "Unknown"
+msgid "Unknown unlock error."
+msgstr "Desconegut"
+
+#: mounthelper/tdeio_media_mounthelper.cpp:410
+#, fuzzy
+#| msgid "Unmount given URL"
+msgid "Mount given URL"
 msgstr "Desmunta un URL donat"
 
-#: mounthelper/tdeio_media_mounthelper.cpp:296
+#: mounthelper/tdeio_media_mounthelper.cpp:411
 msgid "Unmount given URL"
 msgstr "Desmunta un URL donat"
 
-#: mounthelper/tdeio_media_mounthelper.cpp:297
-msgid "Mount given URL (default)"
-msgstr "Munta l'URL donat (omissió)"
+#: mounthelper/tdeio_media_mounthelper.cpp:412
+#, fuzzy
+#| msgid "Unmount given URL"
+msgid "Unlock given URL"
+msgstr "Desmunta un URL donat"
+
+#: mounthelper/tdeio_media_mounthelper.cpp:413
+#, fuzzy
+msgid "Lock given URL"
+msgstr "Desmunta un URL donat"
 
-#: mounthelper/tdeio_media_mounthelper.cpp:298
-msgid "Eject given URL via tdeeject"
-msgstr "Expulsa l'URL donat via tdeeject"
+#: mounthelper/tdeio_media_mounthelper.cpp:414
+#, fuzzy
+msgid "Eject given URL"
+msgstr "Desmunta un URL donat"
 
-#: mounthelper/tdeio_media_mounthelper.cpp:299
-msgid "Unmount and Eject given URL (necessary for some USB devices)"
+#: mounthelper/tdeio_media_mounthelper.cpp:415
+msgid "Safely remove (unmount and eject) given URL"
 msgstr ""
-"Desmunta i expulsa l'URL donat (necessari per a alguns dispositius USB)"
 
-#: 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:/ URL per a muntar/desmuntar/expulsar/extreure"
 
 #: propsdlgplugin/propertiespage.cpp:137
@@ -621,7 +699,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
@@ -890,6 +968,24 @@ msgstr "Mesclat"
 msgid "Filesystem: iso9660"
 msgstr "Sistema de fitxers: iso9660"
 
+#~ msgid ""
+#~ "The device was successfully unmounted, but the tray could not be opened"
+#~ msgstr ""
+#~ "El dispositiu s'ha desmuntat amb èxit, però no s'ha pogut obrir la safata"
+
+#~ msgid "The device was successfully unmounted, but could not be ejected"
+#~ msgstr "El dispositiu s'ha desmuntat amb èxit, però no s'ha pogut expulsar"
+
+#~ msgid "Mount given URL (default)"
+#~ msgstr "Munta l'URL donat (omissió)"
+
+#~ msgid "Eject given URL via tdeeject"
+#~ msgstr "Expulsa l'URL donat via tdeeject"
+
+#~ msgid "Unmount and Eject given URL (necessary for some USB devices)"
+#~ msgstr ""
+#~ "Desmunta i expulsa l'URL donat (necessari per a alguns dispositius USB)"
+
 #, fuzzy
 #~ msgid "Permission denied"
 #~ msgstr "S'ha denegat el permís"
diff --git a/tde-i18n-cs/messages/tdebase/tdeio_media.po b/tde-i18n-cs/messages/tdebase/tdeio_media.po
index 94d1fb848bd..9a324c7d8ca 100644
--- a/tde-i18n-cs/messages/tdebase/tdeio_media.po
+++ b/tde-i18n-cs/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: 2020-09-20 13:17+0000\n"
 "Last-Translator: Slávek Banko <slavek.banko@axis.cz>\n"
 "Language-Team: Czech <https://mirror.git.trinitydesktop.org/weblate/projects/"
@@ -47,27 +47,26 @@ msgstr "Otevřít v novém okně"
 msgid "Unknown"
 msgstr "Neznámé"
 
-#: 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 "Správce médií TDE není spuštěn."
 
-#: mediaimpl.cpp:187
+#: mediaimpl.cpp:186
 msgid "This media name already exists."
 msgstr "Tento název média již existuje."
 
-#: mediaimpl.cpp:230 mediaimpl.cpp:297
+#: mediaimpl.cpp:229 mediaimpl.cpp:296
 msgid "No such medium."
 msgstr "Žádné takové médium."
 
-#: mediaimpl.cpp:238
+#: mediaimpl.cpp:237
 msgid "The drive is encrypted."
 msgstr "Disk je šifrovaný."
 
-#: 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 "Neznámá chyba při připojení."
 
@@ -80,69 +79,71 @@ msgid "Unlock"
 msgstr "Odemknout"
 
 #: 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 "Žádné takové médium: %1"
 
-#: mediamanager/fstabbackend.cpp:408
+#: mediamanager/fstabbackend.cpp:416
 msgid "CD Recorder"
 msgstr "Vypalovačka CD"
 
-#: mediamanager/fstabbackend.cpp:414
+#: mediamanager/fstabbackend.cpp:422
 msgid "DVD"
 msgstr "DVD"
 
-#: mediamanager/fstabbackend.cpp:427
+#: mediamanager/fstabbackend.cpp:435
 msgid "CD-ROM"
 msgstr "CD-ROM"
 
-#: mediamanager/fstabbackend.cpp:440
+#: mediamanager/fstabbackend.cpp:448
 msgid "Floppy"
 msgstr "Disketa"
 
-#: mediamanager/fstabbackend.cpp:448
+#: mediamanager/fstabbackend.cpp:456
 msgid "Zip Disk"
 msgstr "Zip disk"
 
-#: mediamanager/fstabbackend.cpp:459
+#: mediamanager/fstabbackend.cpp:467
 msgid "Removable Device"
 msgstr "Výměnné zařízení"
 
-#: mediamanager/fstabbackend.cpp:464 mediamanager/fstabbackend.cpp:470
+#: mediamanager/fstabbackend.cpp:472 mediamanager/fstabbackend.cpp:478
 msgid "Remote Share"
 msgstr "Vzdálený sdílený prostředek"
 
-#: mediamanager/fstabbackend.cpp:475
+#: mediamanager/fstabbackend.cpp:483
 msgid "Hard Disk"
 msgstr "Pevný disk"
 
-#: mediamanager/halbackend.cpp:768 mediamanager/tdehardwarebackend.cpp:809
+#: mediamanager/halbackend.cpp:778 mediamanager/tdehardwarebackend.cpp:826
 msgid "Unknown Drive"
 msgstr "Neznámá jednotka"
 
-#: mediamanager/halbackend.cpp:780 mediamanager/tdehardwarebackend.cpp:839
+#: mediamanager/halbackend.cpp:794 mediamanager/tdehardwarebackend.cpp:872
 msgid "Floppy Drive"
 msgstr "Disketa"
 
-#: mediamanager/halbackend.cpp:788
+#: mediamanager/halbackend.cpp:802
 msgid "Zip Drive"
 msgstr "Zip disk"
 
-#: mediamanager/halbackend.cpp:858 mediamanager/tdehardwarebackend.cpp:896
+#: mediamanager/halbackend.cpp:877 mediamanager/tdehardwarebackend.cpp:930
 msgid "Camera"
 msgstr "Kamera"
 
-#: mediamanager/halbackend.cpp:1240 mediamanager/halbackend.cpp:1266
+#: mediamanager/halbackend.cpp:1259 mediamanager/halbackend.cpp:1285
 msgid "Authenticate"
 msgstr "Ověřit"
 
-#: 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 "
@@ -151,7 +152,7 @@ msgstr ""
 "<big><b>Zásady systému zabraňují připojování interních médií</b></big><br/>K "
 "provedení této akce je vyžadováno ověření. Prosím, zadejte heslo pro ověření."
 
-#: 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 "
@@ -161,30 +162,29 @@ msgstr ""
 "uživateli</b></big><br/>K provedení této akce je vyžadováno ověření. Prosím, "
 "zadejte heslo pro ověření."
 
-#: 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 "Vnitřní chyba"
 
-#: mediamanager/halbackend.cpp:1303
+#: mediamanager/halbackend.cpp:1322
 msgid "Invalid filesystem type"
 msgstr "Nesprávný typ souborového systému"
 
-#: 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 ""
 "Přístup odmítnut<p>Zkontrolujte prosím, že:<br/>1. Máte oprávnění k přístupu "
-"k tomuto zařízení.<br/>2. Toto zařízení není uvedeno v souboru /etc/"
-"fstab.</p>"
+"k tomuto zařízení.<br/>2. Toto zařízení není uvedeno v souboru /etc/fstab.</"
+"p>"
 
-#: mediamanager/halbackend.cpp:1309
+#: mediamanager/halbackend.cpp:1328
 msgid "Device is already mounted."
 msgstr "Zařízení je již připojeno."
 
-#: 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 "
@@ -194,7 +194,7 @@ msgstr ""
 "vypsány níže. Je třeba je ukončit nebo změnit jejich pracovní adresář před "
 "dalším pokusem o odpojení zařízení."
 
-#: 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."
@@ -202,10 +202,10 @@ msgstr ""
 "Programy, které zařízení stále používaly, byly násilně ukončeny. Jsou "
 "uvedeny níže."
 
-#: 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. "
@@ -213,34 +213,56 @@ msgstr ""
 "Bohužel, zařízení <b>%1</b> (%2) pojmenované <b>‚%3‘</b> a právě připojené v "
 "<b>%4</b> nelze odpojit. "
 
-#: 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 "Tato chyba byla vrácena programem ‚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 není připojitelné médium."
+
+#: mediamanager/halbackend.cpp:1497 mediamanager/tdehardwarebackend.cpp:1225
+#: mounthelper/tdeio_media_mounthelper.cpp:68
+#, fuzzy
+#| msgid "%1 is already unlocked."
+msgid "%1 is already mounted to %2."
+msgstr "%1 je již odemčené."
+
+#: mediamanager/halbackend.cpp:1614
 msgid "Cannot mount encrypted locked drives!"
 msgstr "Nelze připojovat zamčené šifrované disky!"
 
-#: 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 unlocked."
+msgid "%1 is already unmounted."
+msgstr "%1 je již odemčené."
+
+#: 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
 msgid "Internal error"
 msgstr "Vnitřní chyba"
 
-#: mediamanager/halbackend.cpp:1718
+#: mediamanager/halbackend.cpp:1745
 msgid "Unknown error"
 msgstr "Neznámá chyba"
 
-#: mediamanager/halbackend.cpp:1772
+#: mediamanager/halbackend.cpp:1799
 msgid "Unmounting failed due to the following error:"
 msgstr "Odpojení selhalo kvůli této chybě:"
 
-#: mediamanager/halbackend.cpp:1774
+#: mediamanager/halbackend.cpp:1801
 msgid "Device is Busy:"
 msgstr "Zařízení je zaneprázdněné:"
 
-#: 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>"
@@ -248,7 +270,7 @@ msgstr ""
 "Přístup odmítnut<p>Zkontrolujte prosím, že:<br/>1. Máte oprávnění k přístupu "
 "k tomuto zařízení<br/>2. Toto zařízení bylo původně připojeno pomocí TDE.</p>"
 
-#: 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>"
@@ -256,163 +278,201 @@ msgstr ""
 "%1<p><b>Chcete tyto procesy násilně ukončit?</b><br/><i>Všechna neuložená "
 "data budou ztracena</i>"
 
-#: 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
+msgid "%1 is not an encrypted media."
+msgstr "%1 není šifrované médium."
+
+#: mediamanager/halbackend.cpp:1868 mediamanager/tdehardwarebackend.cpp:1452
+#: mounthelper/tdeio_media_mounthelper.cpp:127
+msgid "%1 is already unlocked."
+msgstr "%1 je již odemčené."
+
+#: mediamanager/halbackend.cpp:1907
 msgid "Wrong password"
 msgstr "Chybné heslo"
 
+#: mediamanager/halbackend.cpp:1942 mediamanager/tdehardwarebackend.cpp:1501
+#: mounthelper/tdeio_media_mounthelper.cpp:159
+#, fuzzy
+#| msgid "%1 is already unlocked."
+msgid "%1 is already locked."
+msgstr "%1 je již odemčené."
+
 #: mediamanager/mediamanager.cpp:248 mediamanager/mediamanager.cpp:275
+#: mediamanager/mediamanager.cpp:302 mediamanager/mediamanager.cpp:329
 msgid "Feature only available with the TDE hardware backend"
 msgstr "Funkce dostupná pouze s backendem TDE hardware"
 
 #: 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 "Funkce dostupná pouze v 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
 msgid "Feature only available with HAL or TDE hardware backend"
 msgstr "Funkce dostupná pouze s backendy HAL nebo TDE hardware"
 
-#: mediamanager/tdehardwarebackend.cpp:484
-#: mediamanager/tdehardwarebackend.cpp:521
-#: mediamanager/tdehardwarebackend.cpp:754
+#: mediamanager/tdehardwarebackend.cpp:486
+#: mediamanager/tdehardwarebackend.cpp:523
+#: mediamanager/tdehardwarebackend.cpp:779
 msgid "%1 Removable Device"
 msgstr "%1 výměnné zařízení"
 
-#: mediamanager/tdehardwarebackend.cpp:529
+#: mediamanager/tdehardwarebackend.cpp:532
 msgid "Blank CD-ROM"
 msgstr "Prázdný disk CD-ROM"
 
-#: mediamanager/tdehardwarebackend.cpp:538
+#: mediamanager/tdehardwarebackend.cpp:542
 msgid "Blank CD-R"
 msgstr "Prázdný disk CD-R"
 
-#: mediamanager/tdehardwarebackend.cpp:547
+#: mediamanager/tdehardwarebackend.cpp:552
 msgid "Blank CD-RW"
 msgstr "Prázdný disk CD-RW"
 
-#: mediamanager/tdehardwarebackend.cpp:556
+#: mediamanager/tdehardwarebackend.cpp:562
 msgid "Blank Magneto-Optical CD"
 msgstr "Prázdný disk Magneto-optické CD"
 
-#: mediamanager/tdehardwarebackend.cpp:565
+#: mediamanager/tdehardwarebackend.cpp:572
 msgid "Blank Mount Ranier CD-RW"
 msgstr "Prázdný disk Mount Ranier CD-RW"
 
-#: mediamanager/tdehardwarebackend.cpp:574
+#: mediamanager/tdehardwarebackend.cpp:582
 msgid "Blank Mount Ranier CD-RW-W"
 msgstr "Prázdný disk Mount Ranier CD-RW-W"
 
-#: mediamanager/tdehardwarebackend.cpp:583
+#: mediamanager/tdehardwarebackend.cpp:592
 msgid "Blank DVD-ROM"
 msgstr "Prázdný disk DVD-ROM"
 
-#: mediamanager/tdehardwarebackend.cpp:592
+#: mediamanager/tdehardwarebackend.cpp:602
 msgid "Blank DVD-RAM"
 msgstr "Prázdný disk DVD-RAM"
 
-#: mediamanager/tdehardwarebackend.cpp:601
+#: mediamanager/tdehardwarebackend.cpp:612
 msgid "Blank DVD-R"
 msgstr "Prázdný disk DVD-R"
 
-#: mediamanager/tdehardwarebackend.cpp:610
+#: mediamanager/tdehardwarebackend.cpp:622
 msgid "Blank DVD-RW"
 msgstr "Prázdný disk DVD-RW"
 
-#: mediamanager/tdehardwarebackend.cpp:619
+#: mediamanager/tdehardwarebackend.cpp:632
 msgid "Blank Dual Layer DVD-R"
 msgstr "Prázdný disk dvojvrstvého DVD-R"
 
-#: mediamanager/tdehardwarebackend.cpp:628
+#: mediamanager/tdehardwarebackend.cpp:642
 msgid "Blank Dual Layer DVD-RW"
 msgstr "Prázdný disk dvojvrstvého DVD-RW"
 
-#: mediamanager/tdehardwarebackend.cpp:637
+#: mediamanager/tdehardwarebackend.cpp:652
 msgid "Blank DVD+R"
 msgstr "Prázdný disk DVD+R"
 
-#: mediamanager/tdehardwarebackend.cpp:646
+#: mediamanager/tdehardwarebackend.cpp:662
 msgid "Blank DVD+RW"
 msgstr "Prázdný disk DVD+RW"
 
-#: mediamanager/tdehardwarebackend.cpp:655
+#: mediamanager/tdehardwarebackend.cpp:672
 msgid "Blank Dual Layer DVD+R"
 msgstr "Prázdný disk dvouvrstvého DVD+R"
 
-#: mediamanager/tdehardwarebackend.cpp:664
+#: mediamanager/tdehardwarebackend.cpp:682
 msgid "Blank Dual Layer DVD+RW"
 msgstr "Prázdný disk dvouvrstvého DVD+RW"
 
-#: mediamanager/tdehardwarebackend.cpp:673
+#: mediamanager/tdehardwarebackend.cpp:692
 msgid "Blank BLURAY-ROM"
 msgstr "Prázdný disk BLURAY-ROM"
 
-#: mediamanager/tdehardwarebackend.cpp:682
+#: mediamanager/tdehardwarebackend.cpp:702
 msgid "Blank BLURAY-R"
 msgstr "Prázdný disk BLURAY-R"
 
-#: mediamanager/tdehardwarebackend.cpp:691
+#: mediamanager/tdehardwarebackend.cpp:712
 msgid "Blank BLURAY-RW"
 msgstr "Prázdný disk BLURAY-RW"
 
-#: mediamanager/tdehardwarebackend.cpp:700
+#: mediamanager/tdehardwarebackend.cpp:722
 msgid "Blank HDDVD-ROM"
 msgstr "Prázdný disk HDDVD-ROM"
 
-#: mediamanager/tdehardwarebackend.cpp:709
+#: mediamanager/tdehardwarebackend.cpp:732
 msgid "Blank HDDVD-R"
 msgstr "Prázdný disk HDDVD-R"
 
-#: mediamanager/tdehardwarebackend.cpp:718
+#: mediamanager/tdehardwarebackend.cpp:742
 msgid "Blank HDDVD-RW"
 msgstr "Prázdný disk HDDVD-RW"
 
-#: mediamanager/tdehardwarebackend.cpp:725
+#: mediamanager/tdehardwarebackend.cpp:750
 msgid "Audio CD"
 msgstr "Zvukové CD"
 
-#: mediamanager/tdehardwarebackend.cpp:746
+#: mediamanager/tdehardwarebackend.cpp:771
 msgid "%1 Fixed Disk (%2)"
 msgstr "%1 pevný disk (%2)"
 
-#: mediamanager/tdehardwarebackend.cpp:853
+#: mediamanager/tdehardwarebackend.cpp:886
 msgid "%1 Zip Disk"
 msgstr "%1 zip disk"
 
-#: 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
+#, fuzzy, c-format
+#| msgid "Internal error. Couldn't find medium."
+msgid "Internal error. Couldn't find medium id %1."
 msgstr "Interní chyba. Médium nebylo nalezeno."
 
-#: mediamanager/tdehardwarebackend.cpp:1250
-#: mediamanager/tdehardwarebackend.cpp:1324
+#: mediamanager/tdehardwarebackend.cpp:1282
 msgid "Unable to mount this device."
 msgstr "Zařízení nelze připojit."
 
-#: 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 "<p>Technické detaily:<br/>"
 
-#: mediamanager/tdehardwarebackend.cpp:1285
-msgid "Decryption aborted"
-msgstr "Dešifrování bylo přerušeno"
-
-#: mediamanager/tdehardwarebackend.cpp:1444
+#: mediamanager/tdehardwarebackend.cpp:1396
+#, fuzzy
+#| 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>"
 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>"
+"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 ""
-"<qt>Zařízení <b>%1</b> (%2) s názvem <b>‚%3‘</b> a aktuálně připojené v "
-"<b>%4</b> nelze v tuto chvíli odpojit.<p>%5<p><b>Chcete tyto procesy násilně "
+"<qt>Zařízení <b>%1</b> (%2) s názvem <b>‚%3‘</b> a aktuálně připojené v <b>"
+"%4</b> nelze v tuto chvíli odpojit.<p>%5<p><b>Chcete tyto procesy násilně "
 "ukončit?</b><br/><i>Všechna neuložená data budou ztracena</i>"
 
-#: mediamanager/tdehardwarebackend.cpp:1578
+#: mediamanager/tdehardwarebackend.cpp:1467
+#, fuzzy
+#| msgid "Unable to mount this device."
+msgid "Unable to unlock the device."
+msgstr "Zařízení nelze připojit."
+
+#: mediamanager/tdehardwarebackend.cpp:1516
+#, fuzzy
+#| msgid "Unable to mount this device."
+msgid "Unable to lock the device."
+msgstr "Zařízení nelze připojit."
+
+#: mediamanager/tdehardwarebackend.cpp:1623
 msgid ""
 "Programs still using the device have been detected. They are listed below. "
 "You have to close them or change their working directory before attempting "
@@ -422,60 +482,98 @@ msgstr ""
 "níže. Je třeba je ukončit nebo změnit jejich pracovní adresář před dalším "
 "pokusem o odpojení zařízení."
 
-#: mounthelper/tdeio_media_mounthelper.cpp:79
-msgid "%1 cannot be found."
-msgstr "Nelze nalézt %1."
+#: mounthelper/tdeio_media_mounthelper.cpp:49
+#, fuzzy
+#| msgid "The TDE mediamanager is not running."
+msgid "The TDE mediamanager is not running.\n"
+msgstr "Správce médií TDE není spuštěn."
 
-#: mounthelper/tdeio_media_mounthelper.cpp:87
-msgid "%1 is not a mountable media."
-msgstr "%1 není připojitelné médium."
+#: mounthelper/tdeio_media_mounthelper.cpp:59
+msgid "Try to mount an unknown medium."
+msgstr ""
 
-#: mounthelper/tdeio_media_mounthelper.cpp:101
-msgid "%1 is not an encrypted media."
-msgstr "%1 není šifrované médium."
+#: mounthelper/tdeio_media_mounthelper.cpp:87
+msgid "Try to unmount an unknown medium."
+msgstr ""
 
 #: mounthelper/tdeio_media_mounthelper.cpp:107
-msgid "%1 is already unlocked."
-msgstr "%1 je již odemčené."
-
-#: mounthelper/tdeio_media_mounthelper.cpp:139
 msgid "Unknown unmount error."
 msgstr "Neznámá chyba při odpojení."
 
-#: mounthelper/tdeio_media_mounthelper.cpp:246
-msgid "The device was successfully unmounted, but the tray could not be opened"
-msgstr "Zařízení bylo úspěšně odpojeno, ale zásuvku nelze otevřít"
+#: mounthelper/tdeio_media_mounthelper.cpp:116
+msgid "Try to unlock an unknown medium."
+msgstr ""
+
+#: mounthelper/tdeio_media_mounthelper.cpp:148
+msgid "Try to lock an unknown medium."
+msgstr ""
 
-#: mounthelper/tdeio_media_mounthelper.cpp:248
-msgid "The device was successfully unmounted, but could not be ejected"
-msgstr "Zařízení bylo úspěšně odpojeno, ale nelze vysunout"
+#: mounthelper/tdeio_media_mounthelper.cpp:173
+#, fuzzy
+#| msgid "Unknown mount error."
+msgid "Unknown lock error."
+msgstr "Neznámá chyba při připojení."
 
-#: mounthelper/tdeio_media_mounthelper.cpp:281
-msgid "Unknown decrypt error."
-msgstr "Neznámá chyba při dešifrování."
+#: mounthelper/tdeio_media_mounthelper.cpp:211
+msgid "Try to release holders from an unknown medium."
+msgstr ""
 
-#: mounthelper/tdeio_media_mounthelper.cpp:295
-msgid "Decrypt given URL"
-msgstr "Dešifrovat dané URL"
+#: mounthelper/tdeio_media_mounthelper.cpp:270
+msgid "Try to safe remove an unknown medium."
+msgstr ""
+
+#: mounthelper/tdeio_media_mounthelper.cpp:302
+msgid "%1 cannot be found."
+msgstr "Nelze nalézt %1."
+
+#: mounthelper/tdeio_media_mounthelper.cpp:310
+#, fuzzy
+#| msgid "%1 is not an encrypted media."
+msgid "%1 is not a mountable or encrypted media."
+msgstr "%1 není šifrované médium."
+
+#: mounthelper/tdeio_media_mounthelper.cpp:397
+#, fuzzy
+#| msgid "Unknown unmount error."
+msgid "Unknown unlock error."
+msgstr "Neznámá chyba při odpojení."
+
+#: mounthelper/tdeio_media_mounthelper.cpp:410
+#, fuzzy
+#| msgid "Unmount given URL"
+msgid "Mount given URL"
+msgstr "Odpojit dané URL"
 
-#: mounthelper/tdeio_media_mounthelper.cpp:296
+#: mounthelper/tdeio_media_mounthelper.cpp:411
 msgid "Unmount given URL"
 msgstr "Odpojit dané URL"
 
-#: mounthelper/tdeio_media_mounthelper.cpp:297
-msgid "Mount given URL (default)"
-msgstr "Připojit dané URL (výchozí)"
+#: mounthelper/tdeio_media_mounthelper.cpp:412
+#, fuzzy
+#| msgid "Unmount given URL"
+msgid "Unlock given URL"
+msgstr "Odpojit dané URL"
+
+#: mounthelper/tdeio_media_mounthelper.cpp:413
+#, fuzzy
+#| msgid "Decrypt given URL"
+msgid "Lock given URL"
+msgstr "Dešifrovat dané URL"
 
-#: mounthelper/tdeio_media_mounthelper.cpp:298
-msgid "Eject given URL via tdeeject"
-msgstr "Vysunout dané URL pomocí ‚tdeeject‘"
+#: mounthelper/tdeio_media_mounthelper.cpp:414
+#, fuzzy
+#| msgid "Decrypt given URL"
+msgid "Eject given URL"
+msgstr "Dešifrovat dané URL"
 
-#: mounthelper/tdeio_media_mounthelper.cpp:299
-msgid "Unmount and Eject given URL (necessary for some USB devices)"
-msgstr "Odpojit a vysunout dané URL (nezbytné pro některá USB zařízení)"
+#: 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:/ URL k připojení/odpojení/vysunutí/odstranění"
 
 #: propsdlgplugin/propertiespage.cpp:137
@@ -633,13 +731,16 @@ msgid "&Password:"
 msgstr "&Heslo:"
 
 #: mounthelper/unlockdialog.ui:109
-#, no-c-format
+#, fuzzy, no-c-format
+#| msgid ""
+#| "<p><b>%1</b> is an encrypted locked storage device.</p>\n"
+#| "<p>Please enter the password to unlock the storage device.</p>"
 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 ""
-"<p><b>%1</b> je šifrované úložné zařízení.</p>\n"
-"<p>Zadejte, prosím, heslo pro dešifrování úložného zařízení.</p>"
+"<p><b>%1</b> je uzamčené šifrované úložné zařízení.</p>\n"
+"<p>Zadejte, prosím, heslo pro odemčení úložného zařízení.</p>"
 
 #: propsdlgplugin/propertiespagegui.ui:16
 #, no-c-format
@@ -857,8 +958,8 @@ msgid ""
 "all upper case."
 msgstr ""
 "<h2>Definují vytváření a zobrazení jmen souborů spadajících do 8.3 znaků. "
-"Pokud existuje dlouhé jméno souboru, bude se řídit zde zadanými "
-"pravidly.</h2>\n"
+"Pokud existuje dlouhé jméno souboru, bude se řídit zde zadanými pravidly.</"
+"h2>\n"
 "\n"
 "<h3><b>Malá</b></h3>\n"
 "Zobrazí krátké jméno s malými písmeny. Uloží dlouhé jméno, pokud není krátké "
@@ -901,6 +1002,35 @@ msgstr "Smíšené"
 msgid "Filesystem: iso9660"
 msgstr "Souborový systém: iso9660"
 
+#~ msgid "Decryption aborted"
+#~ msgstr "Dešifrování bylo přerušeno"
+
+#~ msgid ""
+#~ "The device was successfully unmounted, but the tray could not be opened"
+#~ msgstr "Zařízení bylo úspěšně odpojeno, ale zásuvku nelze otevřít"
+
+#~ msgid "The device was successfully unmounted, but could not be ejected"
+#~ msgstr "Zařízení bylo úspěšně odpojeno, ale nelze vysunout"
+
+#~ msgid "Unknown decrypt error."
+#~ msgstr "Neznámá chyba při dešifrování."
+
+#~ msgid "Mount given URL (default)"
+#~ msgstr "Připojit dané URL (výchozí)"
+
+#~ msgid "Eject given URL via tdeeject"
+#~ msgstr "Vysunout dané URL pomocí ‚tdeeject‘"
+
+#~ msgid "Unmount and Eject given URL (necessary for some USB devices)"
+#~ msgstr "Odpojit a vysunout dané URL (nezbytné pro některá USB zařízení)"
+
+#~ msgid ""
+#~ "<p><b>%1</b> is an encrypted storage device.</p>\n"
+#~ "<p>Please enter the password to decrypt the storage device.</p>"
+#~ msgstr ""
+#~ "<p><b>%1</b> je šifrované úložné zařízení.</p>\n"
+#~ "<p>Zadejte, prosím, heslo pro dešifrování úložného zařízení.</p>"
+
 #, fuzzy
 #~ msgid "Permission denied"
 #~ msgstr "Přístup nepovolen"
diff --git a/tde-i18n-csb/messages/tdebase/tdeio_media.po b/tde-i18n-csb/messages/tdebase/tdeio_media.po
index f573b9bf127..299630c83dd 100644
--- a/tde-i18n-csb/messages/tdebase/tdeio_media.po
+++ b/tde-i18n-csb/messages/tdebase/tdeio_media.po
@@ -4,7 +4,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-02-18 19:22+0100\n"
 "Last-Translator: Michôł Òstrowsczi <michol@linuxcsb.org>\n"
 "Language-Team: Kashubian\n"
@@ -44,27 +44,26 @@ msgstr "Òtemkni w nowim òknie"
 msgid "Unknown"
 msgstr "Nieznóny"
 
-#: 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 "Menadżera nie je zrëszonô."
 
-#: mediaimpl.cpp:187
+#: mediaimpl.cpp:186
 msgid "This media name already exists."
 msgstr "Pòdane miono medium ju je."
 
-#: mediaimpl.cpp:230 mediaimpl.cpp:297
+#: mediaimpl.cpp:229 mediaimpl.cpp:296
 msgid "No such medium."
 msgstr "Nie mô taczégò medium."
 
-#: 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 "Nié mô taczégò medium: %1"
 
-#: mediamanager/fstabbackend.cpp:408
+#: mediamanager/fstabbackend.cpp:416
 msgid "CD Recorder"
 msgstr "Nagrëwôrka CD"
 
-#: mediamanager/fstabbackend.cpp:414
+#: mediamanager/fstabbackend.cpp:422
 msgid "DVD"
 msgstr "DVD"
 
-#: mediamanager/fstabbackend.cpp:427
+#: mediamanager/fstabbackend.cpp:435
 msgid "CD-ROM"
 msgstr "CD-ROM"
 
-#: mediamanager/fstabbackend.cpp:440
+#: mediamanager/fstabbackend.cpp:448
 msgid "Floppy"
 msgstr "Diskietka"
 
-#: mediamanager/fstabbackend.cpp:448
+#: mediamanager/fstabbackend.cpp:456
 msgid "Zip Disk"
 msgstr "Disk ZIP"
 
-#: mediamanager/fstabbackend.cpp:459
+#: mediamanager/fstabbackend.cpp:467
 msgid "Removable Device"
 msgstr "Wëmieniowé ùrzãdzenié"
 
-#: mediamanager/fstabbackend.cpp:464 mediamanager/fstabbackend.cpp:470
+#: mediamanager/fstabbackend.cpp:472 mediamanager/fstabbackend.cpp:478
 msgid "Remote Share"
 msgstr "Daleczi dostónk"
 
-#: mediamanager/fstabbackend.cpp:475
+#: mediamanager/fstabbackend.cpp:483
 msgid "Hard Disk"
 msgstr "Cwiardi disk"
 
-#: mediamanager/halbackend.cpp:768 mediamanager/tdehardwarebackend.cpp:809
+#: mediamanager/halbackend.cpp:778 mediamanager/tdehardwarebackend.cpp:826
 #, fuzzy
 msgid "Unknown Drive"
 msgstr "Nieznóny"
 
-#: mediamanager/halbackend.cpp:780 mediamanager/tdehardwarebackend.cpp:839
+#: mediamanager/halbackend.cpp:794 mediamanager/tdehardwarebackend.cpp:872
 #, fuzzy
 msgid "Floppy Drive"
 msgstr "Diskietka"
 
-#: mediamanager/halbackend.cpp:788
+#: mediamanager/halbackend.cpp:802
 #, fuzzy
 msgid "Zip Drive"
 msgstr "Disk ZIP"
 
-#: mediamanager/halbackend.cpp:858 mediamanager/tdehardwarebackend.cpp:896
+#: mediamanager/halbackend.cpp:877 mediamanager/tdehardwarebackend.cpp:930
 msgid "Camera"
 msgstr "Òdjimny aparat"
 
-#: 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 "Bënowô fela"
 
-#: mediamanager/halbackend.cpp:1303
+#: mediamanager/halbackend.cpp:1322
 msgid "Invalid filesystem type"
 msgstr "Nieprawidłowô systema lopków"
 
-#: 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 "Ùrzãdzenié je ju zamòntowané."
 
-#: 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 ""
 "niżi wëpisóny. Je nót je wszëtczi zamknąc abò zmienic katalog, w jaczim "
 "dzejają ë tedë znowa spróbòwac òdmòntowac ùrzãdzenié."
 
-#: 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òdôj, le ùrzãdzenié <b>%1</b> (%2) ò mionie <b>'%3'</b> ë terô zamòntowóné "
 "w katalogù <b>%4</b> nie mòże bëc òdmòntowóné. "
 
-#: 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 "Na felô òsta zwróconô bez pòlét 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 nie je montowalnym medium."
+
+#: mediamanager/halbackend.cpp:1497 mediamanager/tdehardwarebackend.cpp:1225
+#: mounthelper/tdeio_media_mounthelper.cpp:68
+#, fuzzy
+msgid "%1 is already mounted to %2."
+msgstr "Ùrzãdzenié je ju zamòntowané."
+
+#: 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 "Ùrzãdzenié je ju zamòntowané."
+
+#: 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 "Bënowô fela"
 
-#: mediamanager/halbackend.cpp:1718
+#: mediamanager/halbackend.cpp:1745
 #, fuzzy
 #| msgid "Unknown"
 msgid "Unknown error"
 msgstr "Nieznóny"
 
-#: mediamanager/halbackend.cpp:1772
+#: mediamanager/halbackend.cpp:1799
 msgid "Unmounting failed due to the following error:"
 msgstr "Òdmòntowanié nie darzëło sã bez nã felã:"
 
-#: mediamanager/halbackend.cpp:1774
+#: mediamanager/halbackend.cpp:1801
 msgid "Device is Busy:"
 msgstr "Ùrzãdzenié je zajãti:"
 
-#: 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 nie je montowalnym medium."
+
+#: mediamanager/halbackend.cpp:1868 mediamanager/tdehardwarebackend.cpp:1452
+#: mounthelper/tdeio_media_mounthelper.cpp:127
+#, fuzzy
+msgid "%1 is already unlocked."
+msgstr "Ùrzãdzenié je ju zamòntowané."
+
+#: 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 "Ùrzãdzenié je ju zamòntowané."
+
 #: 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 "Swòjizna na przistãpnô je blós z 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 "Swòjizna na przistãpnô je blós z 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 "Swòjizna na przistãpnô je blós z 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 "Wëmieniowé ùrzãdzenié"
 
-#: mediamanager/tdehardwarebackend.cpp:529
+#: mediamanager/tdehardwarebackend.cpp:532
 #, fuzzy
 msgid "Blank CD-ROM"
 msgstr "CD-ROM"
 
-#: 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 "CD-ROM"
 
-#: mediamanager/tdehardwarebackend.cpp:682
+#: mediamanager/tdehardwarebackend.cpp:702
 #, fuzzy
 msgid "Blank BLURAY-R"
 msgstr "CD-ROM"
 
-#: 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 "Disk 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,65 +464,95 @@ msgstr ""
 "niżi wëpisóny. Je nót je wszëtczi zamknąc abò zmienic katalog, w jaczim "
 "dzejają ë tedë znowa spróbòwac òdmòntowac ùrzãdzenié."
 
-#: mounthelper/tdeio_media_mounthelper.cpp:79
-msgid "%1 cannot be found."
-msgstr "Nie mòże nalezc %1."
+#: mounthelper/tdeio_media_mounthelper.cpp:49
+#, fuzzy
+#| msgid "The TDE mediamanager is not running."
+msgid "The TDE mediamanager is not running.\n"
+msgstr "Menadżera nie je zrëszonô."
 
-#: mounthelper/tdeio_media_mounthelper.cpp:87
-msgid "%1 is not a mountable media."
-msgstr "%1 nie je montowalnym medium."
+#: 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 nie je montowalnym medium."
+#: 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 "Ùrzãdzenié je ju zamòntowané."
-
-#: 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"
+#: mounthelper/tdeio_media_mounthelper.cpp:116
+msgid "Try to unlock an unknown medium."
 msgstr ""
-"Ùrzãdzenié òsta ùdało òdmòntowané, le próba òtemkniãcô zabiérnika nie "
-"darzëła sã"
 
-#: mounthelper/tdeio_media_mounthelper.cpp:248
-msgid "The device was successfully unmounted, but could not be ejected"
-msgstr "Ùrzãdzenié òsta ùdało òdmòntowané, le nie darzëła so próba wësëniãcô"
+#: 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 "Nieznóny"
+
+#: 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 "Nie mòże nalezc %1."
+
+#: mounthelper/tdeio_media_mounthelper.cpp:310
+#, fuzzy
+msgid "%1 is not a mountable or encrypted media."
+msgstr "%1 nie je montowalnym medium."
+
+#: mounthelper/tdeio_media_mounthelper.cpp:397
+#, fuzzy
+#| msgid "Unknown"
+msgid "Unknown unlock error."
+msgstr "Nieznóny"
+
+#: mounthelper/tdeio_media_mounthelper.cpp:410
 #, fuzzy
-msgid "Decrypt given URL"
+#| msgid "Unmount given URL"
+msgid "Mount given URL"
 msgstr "Òdmontuje pòdany URL"
 
-#: mounthelper/tdeio_media_mounthelper.cpp:296
+#: mounthelper/tdeio_media_mounthelper.cpp:411
 msgid "Unmount given URL"
 msgstr "Òdmontuje pòdany URL"
 
-#: mounthelper/tdeio_media_mounthelper.cpp:297
-msgid "Mount given URL (default)"
-msgstr "Zamontuje pòdany URL (domëslno)"
+#: mounthelper/tdeio_media_mounthelper.cpp:412
+#, fuzzy
+#| msgid "Unmount given URL"
+msgid "Unlock given URL"
+msgstr "Òdmontuje pòdany URL"
 
-#: mounthelper/tdeio_media_mounthelper.cpp:298
-msgid "Eject given URL via tdeeject"
-msgstr "Wësënié pòdany URL, brëkùjąc tdeeject"
+#: mounthelper/tdeio_media_mounthelper.cpp:413
+#, fuzzy
+msgid "Lock given URL"
+msgstr "Òdmontuje pòdany URL"
 
-#: mounthelper/tdeio_media_mounthelper.cpp:299
-msgid "Unmount and Eject given URL (necessary for some USB devices)"
-msgstr "Òdmontuje ë wësënié pòdany URL (nót dlô niechtërnëch ùrzãdzeniów USB)"
+#: mounthelper/tdeio_media_mounthelper.cpp:414
+#, fuzzy
+msgid "Eject given URL"
+msgstr "Òdmontuje pòdany URL"
+
+#: 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 "URL media:/ do zamontowaniô/òdmontowaniô/wësëniãcô/rëmniãcô"
 
 #: propsdlgplugin/propertiespage.cpp:137
@@ -623,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
@@ -895,6 +973,26 @@ msgstr "Miészóny"
 msgid "Filesystem: iso9660"
 msgstr "Systema lopków: iso9660"
 
+#~ msgid ""
+#~ "The device was successfully unmounted, but the tray could not be opened"
+#~ msgstr ""
+#~ "Ùrzãdzenié òsta ùdało òdmòntowané, le próba òtemkniãcô zabiérnika nie "
+#~ "darzëła sã"
+
+#~ msgid "The device was successfully unmounted, but could not be ejected"
+#~ msgstr ""
+#~ "Ùrzãdzenié òsta ùdało òdmòntowané, le nie darzëła so próba wësëniãcô"
+
+#~ msgid "Mount given URL (default)"
+#~ msgstr "Zamontuje pòdany URL (domëslno)"
+
+#~ msgid "Eject given URL via tdeeject"
+#~ msgstr "Wësënié pòdany URL, brëkùjąc tdeeject"
+
+#~ msgid "Unmount and Eject given URL (necessary for some USB devices)"
+#~ msgstr ""
+#~ "Òdmontuje ë wësënié pòdany URL (nót dlô niechtërnëch ùrzãdzeniów USB)"
+
 #, fuzzy
 #~ msgid "Permission denied"
 #~ msgstr "Felënk przistãpù"
diff --git a/tde-i18n-cy/messages/tdebase/tdeio_media.po b/tde-i18n-cy/messages/tdebase/tdeio_media.po
index f7fec999676..485ce70320a 100644
--- a/tde-i18n-cy/messages/tdebase/tdeio_media.po
+++ b/tde-i18n-cy/messages/tdebase/tdeio_media.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: tdeio_devices\n"
-"POT-Creation-Date: 2020-09-09 18:58+0200\n"
+"POT-Creation-Date: 2020-10-17 08:51+0800\n"
 "PO-Revision-Date: 2003-12-28 11:06+0000\n"
 "Last-Translator: KD at KGyfieithu <kyfieithu@dotmon.com>\n"
 "Language-Team: Cymraeg <cy@li.org>\n"
@@ -44,27 +44,26 @@ msgstr "Agor mewn Ffenestr Newydd"
 msgid "Unknown"
 msgstr "Anhysbys"
 
-#: 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 ""
 
-#: 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,395 +76,470 @@ 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 ""
 
-#: mediamanager/fstabbackend.cpp:408
+#: mediamanager/fstabbackend.cpp:416
 msgid "CD Recorder"
 msgstr "Recordydd CD"
 
-#: mediamanager/fstabbackend.cpp:414
+#: mediamanager/fstabbackend.cpp:422
 msgid "DVD"
 msgstr "DVD"
 
-#: mediamanager/fstabbackend.cpp:427
+#: mediamanager/fstabbackend.cpp:435
 msgid "CD-ROM"
 msgstr "CDd-ROM"
 
-#: mediamanager/fstabbackend.cpp:440
+#: mediamanager/fstabbackend.cpp:448
 msgid "Floppy"
 msgstr "Llipa"
 
-#: mediamanager/fstabbackend.cpp:448
+#: mediamanager/fstabbackend.cpp:456
 msgid "Zip Disk"
 msgstr "Disg 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 "Rhaniad Pell"
 
-#: mediamanager/fstabbackend.cpp:475
+#: mediamanager/fstabbackend.cpp:483
 msgid "Hard Disk"
 msgstr "Disg"
 
-#: mediamanager/halbackend.cpp:768 mediamanager/tdehardwarebackend.cpp:809
+#: mediamanager/halbackend.cpp:778 mediamanager/tdehardwarebackend.cpp:826
 #, fuzzy
 msgid "Unknown Drive"
 msgstr "Anhysbys"
 
-#: mediamanager/halbackend.cpp:780 mediamanager/tdehardwarebackend.cpp:839
+#: mediamanager/halbackend.cpp:794 mediamanager/tdehardwarebackend.cpp:872
 #, fuzzy
 msgid "Floppy Drive"
 msgstr "Llipa"
 
-#: mediamanager/halbackend.cpp:788
+#: mediamanager/halbackend.cpp:802
 #, fuzzy
 msgid "Zip Drive"
 msgstr "Disg 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 "Gwall Mewnol"
 
-#: 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
 #, fuzzy
 msgid "Device is already mounted."
 msgstr "Dyfais heb ei osod"
 
-#: 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 "
 "before attempting to unmount the device again."
 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. "
 msgstr ""
 
-#: 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 ""
 
-#: 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
+#, fuzzy
+msgid "%1 is not a mountable media."
+msgstr "%1%2 (heb ei osod)"
+
+#: mediamanager/halbackend.cpp:1497 mediamanager/tdehardwarebackend.cpp:1225
+#: mounthelper/tdeio_media_mounthelper.cpp:68
+#, fuzzy
+msgid "%1 is already mounted to %2."
+msgstr "Dyfais heb ei osod"
+
+#: 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 "Dyfais heb ei osod"
+
+#: 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 "Gwall Mewnol"
 
-#: mediamanager/halbackend.cpp:1718
+#: mediamanager/halbackend.cpp:1745
 #, fuzzy
 #| msgid "Unknown"
 msgid "Unknown error"
 msgstr "Anhysbys"
 
-#: 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%2 (heb ei osod)"
+
+#: mediamanager/halbackend.cpp:1868 mediamanager/tdehardwarebackend.cpp:1452
+#: mounthelper/tdeio_media_mounthelper.cpp:127
+#, fuzzy
+msgid "%1 is already unlocked."
+msgstr "Dyfais heb ei osod"
+
+#: 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 "Dyfais heb ei osod"
+
 #: mediamanager/mediamanager.cpp:248 mediamanager/mediamanager.cpp:275
+#: mediamanager/mediamanager.cpp:302 mediamanager/mediamanager.cpp:329
 msgid "Feature only available with the TDE hardware backend"
 msgstr ""
 
 #: 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 ""
 
 #: mediamanager/mediamanager.cpp:262 mediamanager/mediamanager.cpp:289
-#: mediamanager/mediamanager.cpp:320 mediamanager/mediamanager.cpp:350
+#: mediamanager/mediamanager.cpp:316 mediamanager/mediamanager.cpp:343
 msgid "Feature only available with HAL or TDE hardware backend"
 msgstr ""
 
-#: mediamanager/tdehardwarebackend.cpp:484
-#: mediamanager/tdehardwarebackend.cpp:521
-#: mediamanager/tdehardwarebackend.cpp:754
+#: mediamanager/tdehardwarebackend.cpp:486
+#: mediamanager/tdehardwarebackend.cpp:523
+#: mediamanager/tdehardwarebackend.cpp:779
 msgid "%1 Removable Device"
 msgstr ""
 
-#: mediamanager/tdehardwarebackend.cpp:529
+#: mediamanager/tdehardwarebackend.cpp:532
 #, fuzzy
 msgid "Blank CD-ROM"
 msgstr "CDd-ROM"
 
-#: 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 "CDd-ROM"
 
-#: mediamanager/tdehardwarebackend.cpp:682
+#: mediamanager/tdehardwarebackend.cpp:702
 #, fuzzy
 msgid "Blank BLURAY-R"
 msgstr "CDd-ROM"
 
-#: 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 "Disg 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:1516
+msgid "Unable to lock the device."
 msgstr ""
 
-#: mediamanager/tdehardwarebackend.cpp:1578
+#: mediamanager/tdehardwarebackend.cpp:1623
 msgid ""
 "Programs still using the device have been detected. They are listed below. "
 "You have to close them or change their working directory before attempting "
 "to unmount the device again."
 msgstr ""
 
-#: mounthelper/tdeio_media_mounthelper.cpp:79
-msgid "%1 cannot be found."
+#: mounthelper/tdeio_media_mounthelper.cpp:49
+msgid "The TDE mediamanager is not running.\n"
 msgstr ""
 
-#: mounthelper/tdeio_media_mounthelper.cpp:87
-#, fuzzy
-msgid "%1 is not a mountable media."
-msgstr "%1%2 (heb ei osod)"
+#: 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%2 (heb ei osod)"
+#: mounthelper/tdeio_media_mounthelper.cpp:87
+msgid "Try to unmount an unknown medium."
+msgstr ""
 
 #: mounthelper/tdeio_media_mounthelper.cpp:107
+msgid "Unknown unmount error."
+msgstr ""
+
+#: mounthelper/tdeio_media_mounthelper.cpp:116
+msgid "Try to unlock an unknown medium."
+msgstr ""
+
+#: mounthelper/tdeio_media_mounthelper.cpp:148
+msgid "Try to lock an unknown medium."
+msgstr ""
+
+#: mounthelper/tdeio_media_mounthelper.cpp:173
 #, fuzzy
-msgid "%1 is already unlocked."
-msgstr "Dyfais heb ei osod"
+#| msgid "Unknown"
+msgid "Unknown lock error."
+msgstr "Anhysbys"
 
-#: mounthelper/tdeio_media_mounthelper.cpp:139
-msgid "Unknown unmount error."
+#: mounthelper/tdeio_media_mounthelper.cpp:211
+msgid "Try to release holders from an unknown medium."
 msgstr ""
 
-#: mounthelper/tdeio_media_mounthelper.cpp:246
-msgid "The device was successfully unmounted, but the tray could not be opened"
+#: mounthelper/tdeio_media_mounthelper.cpp:270
+msgid "Try to safe remove an unknown medium."
 msgstr ""
 
-#: mounthelper/tdeio_media_mounthelper.cpp:248
-msgid "The device was successfully unmounted, but could not be ejected"
+#: mounthelper/tdeio_media_mounthelper.cpp:302
+msgid "%1 cannot be found."
 msgstr ""
 
-#: mounthelper/tdeio_media_mounthelper.cpp:281
+#: mounthelper/tdeio_media_mounthelper.cpp:310
+#, fuzzy
+msgid "%1 is not a mountable or encrypted media."
+msgstr "%1%2 (heb ei osod)"
+
+#: mounthelper/tdeio_media_mounthelper.cpp:397
 #, fuzzy
-#| msgid "Unknown device %1"
-msgid "Unknown decrypt error."
-msgstr "Dyfais anhysbys %1"
+#| msgid "Unknown"
+msgid "Unknown unlock error."
+msgstr "Anhysbys"
 
-#: mounthelper/tdeio_media_mounthelper.cpp:295
+#: mounthelper/tdeio_media_mounthelper.cpp:410
 #, fuzzy
-msgid "Decrypt given URL"
+#| msgid "Unmount given URL"
+msgid "Mount given URL"
 msgstr "Datosod yr URL a roddwyd"
 
-#: mounthelper/tdeio_media_mounthelper.cpp:296
+#: mounthelper/tdeio_media_mounthelper.cpp:411
 msgid "Unmount given URL"
 msgstr "Datosod yr URL a roddwyd"
 
-#: mounthelper/tdeio_media_mounthelper.cpp:297
-msgid "Mount given URL (default)"
-msgstr "Gosod yr URL a roddwyd (rhagosod)"
+#: mounthelper/tdeio_media_mounthelper.cpp:412
+#, fuzzy
+#| msgid "Unmount given URL"
+msgid "Unlock given URL"
+msgstr "Datosod yr URL a roddwyd"
 
-#: mounthelper/tdeio_media_mounthelper.cpp:298
-msgid "Eject given URL via tdeeject"
-msgstr "Allfwrw'r URL a roddwyd drwy tdeeject"
+#: mounthelper/tdeio_media_mounthelper.cpp:413
+#, fuzzy
+msgid "Lock given URL"
+msgstr "Datosod yr URL a roddwyd"
 
-#: mounthelper/tdeio_media_mounthelper.cpp:299
-msgid "Unmount and Eject given URL (necessary for some USB devices)"
+#: mounthelper/tdeio_media_mounthelper.cpp:414
+#, fuzzy
+msgid "Eject given URL"
+msgstr "Datosod yr URL a roddwyd"
+
+#: mounthelper/tdeio_media_mounthelper.cpp:415
+msgid "Safely remove (unmount and eject) given URL"
 msgstr ""
 
-#: mounthelper/tdeio_media_mounthelper.cpp:300
+#: 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 "dyfeisiau:/ URL i'w osod/ddatosod/allfwrw."
 
 #: propsdlgplugin/propertiespage.cpp:137
@@ -616,7 +690,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
@@ -836,6 +910,17 @@ msgstr "Cymysg"
 msgid "Filesystem: iso9660"
 msgstr ""
 
+#, fuzzy
+#~| msgid "Unknown device %1"
+#~ msgid "Unknown decrypt error."
+#~ msgstr "Dyfais anhysbys %1"
+
+#~ msgid "Mount given URL (default)"
+#~ msgstr "Gosod yr URL a roddwyd (rhagosod)"
+
+#~ msgid "Eject given URL via tdeeject"
+#~ msgstr "Allfwrw'r URL a roddwyd drwy tdeeject"
+
 #~ msgid ""
 #~ "\n"
 #~ "Please check that the disk is entered correctly."
diff --git a/tde-i18n-da/messages/tdebase/tdeio_media.po b/tde-i18n-da/messages/tdebase/tdeio_media.po
index 79c8570e0f0..b875828fa1d 100644
--- a/tde-i18n-da/messages/tdebase/tdeio_media.po
+++ b/tde-i18n-da/messages/tdebase/tdeio_media.po
@@ -8,7 +8,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: 2008-01-06 01:41+0100\n"
 "Last-Translator: Martin Schlander <suse@linuxin.dk>\n"
 "Language-Team:  <dansk@dansk-gruppen.dk>\n"
@@ -46,27 +46,26 @@ msgstr "Åbn i nyt vindue"
 msgid "Unknown"
 msgstr "Ukendt"
 
-#: 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's mediehåndtering kører ikke."
 
-#: mediaimpl.cpp:187
+#: mediaimpl.cpp:186
 msgid "This media name already exists."
 msgstr "Dette medienavn findes allerede."
 
-#: mediaimpl.cpp:230 mediaimpl.cpp:297
+#: mediaimpl.cpp:229 mediaimpl.cpp:296
 msgid "No such medium."
 msgstr "Medie findes ikke."
 
-#: 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 ""
 
@@ -79,103 +78,104 @@ 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 "Medie findes ikke: %1"
 
-#: mediamanager/fstabbackend.cpp:408
+#: mediamanager/fstabbackend.cpp:416
 msgid "CD Recorder"
 msgstr "Cd-optager"
 
-#: mediamanager/fstabbackend.cpp:414
+#: mediamanager/fstabbackend.cpp:422
 msgid "DVD"
 msgstr "dvd"
 
-#: mediamanager/fstabbackend.cpp:427
+#: mediamanager/fstabbackend.cpp:435
 msgid "CD-ROM"
 msgstr "CD-ROM"
 
-#: mediamanager/fstabbackend.cpp:440
+#: mediamanager/fstabbackend.cpp:448
 msgid "Floppy"
 msgstr "Floppy"
 
-#: mediamanager/fstabbackend.cpp:448
+#: mediamanager/fstabbackend.cpp:456
 msgid "Zip Disk"
 msgstr "Zip-disk"
 
-#: mediamanager/fstabbackend.cpp:459
+#: mediamanager/fstabbackend.cpp:467
 msgid "Removable Device"
 msgstr "Enhed der kan fjernes"
 
-#: mediamanager/fstabbackend.cpp:464 mediamanager/fstabbackend.cpp:470
+#: mediamanager/fstabbackend.cpp:472 mediamanager/fstabbackend.cpp:478
 msgid "Remote Share"
 msgstr " Ekstern share"
 
-#: mediamanager/fstabbackend.cpp:475
+#: mediamanager/fstabbackend.cpp:483
 msgid "Hard Disk"
 msgstr "Harddisk"
 
-#: mediamanager/halbackend.cpp:768 mediamanager/tdehardwarebackend.cpp:809
+#: mediamanager/halbackend.cpp:778 mediamanager/tdehardwarebackend.cpp:826
 msgid "Unknown Drive"
 msgstr "Ukendt drev"
 
-#: mediamanager/halbackend.cpp:780 mediamanager/tdehardwarebackend.cpp:839
+#: mediamanager/halbackend.cpp:794 mediamanager/tdehardwarebackend.cpp:872
 msgid "Floppy Drive"
 msgstr "Diskettedrev"
 
-#: mediamanager/halbackend.cpp:788
+#: mediamanager/halbackend.cpp:802
 msgid "Zip Drive"
 msgstr "Zip-disk"
 
-#: mediamanager/halbackend.cpp:858 mediamanager/tdehardwarebackend.cpp:896
+#: mediamanager/halbackend.cpp:877 mediamanager/tdehardwarebackend.cpp:930
 msgid "Camera"
 msgstr "Kamera"
 
-#: 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 "Intern fejl"
 
-#: mediamanager/halbackend.cpp:1303
+#: mediamanager/halbackend.cpp:1322
 msgid "Invalid filesystem type"
 msgstr "Ugyldig filsystemtype"
 
-#: 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 "Enheden er allerede monteret."
 
-#: 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 "
@@ -185,16 +185,16 @@ msgstr ""
 "nedenfor. Du skal lukke dem eller ændre deres arbejdsmappe inden du forsøger "
 "at afmontere enheden igen."
 
-#: 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. "
@@ -202,209 +202,257 @@ msgstr ""
 "Desværre kunne enheden <b>%1</b> (%2) ved navn <b>'%3'</b> som for "
 "øjeblikket er monteret som <b>%4</b> ikke afmonteres."
 
-#: 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 "Følgende fejl returneredes af afmonteringskommandoen:"
 
-#: 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 er ikke et monterbart medie."
+
+#: mediamanager/halbackend.cpp:1497 mediamanager/tdehardwarebackend.cpp:1225
+#: mounthelper/tdeio_media_mounthelper.cpp:68
+#, fuzzy
+msgid "%1 is already mounted to %2."
+msgstr "Enheden er allerede monteret."
+
+#: 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 "Enheden er allerede monteret."
+
+#: 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 "Intern fejl"
 
-#: mediamanager/halbackend.cpp:1718
+#: mediamanager/halbackend.cpp:1745
 #, fuzzy
 #| msgid "Unknown"
 msgid "Unknown error"
 msgstr "Ukendt"
 
-#: mediamanager/halbackend.cpp:1772
+#: mediamanager/halbackend.cpp:1799
 msgid "Unmounting failed due to the following error:"
 msgstr "Afmontering mislykkedes på grund af følgende fejl:"
 
-#: mediamanager/halbackend.cpp:1774
+#: mediamanager/halbackend.cpp:1801
 msgid "Device is Busy:"
 msgstr "Enheden er optaget:"
 
-#: 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 er ikke et monterbart medie."
+
+#: mediamanager/halbackend.cpp:1868 mediamanager/tdehardwarebackend.cpp:1452
+#: mounthelper/tdeio_media_mounthelper.cpp:127
+#, fuzzy
+msgid "%1 is already unlocked."
+msgstr "Enheden er allerede monteret."
+
+#: 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 "Enheden er allerede monteret."
+
 #: 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 "Funktion kun tilgængelig med 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 "Funktion kun tilgængelig med 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 "Funktion kun tilgængelig med 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 "Enhed der kan fjernes"
 
-#: mediamanager/tdehardwarebackend.cpp:529
+#: mediamanager/tdehardwarebackend.cpp:532
 #, fuzzy
 msgid "Blank CD-ROM"
 msgstr "CD-ROM"
 
-#: 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 "CD-ROM"
 
-#: mediamanager/tdehardwarebackend.cpp:682
+#: mediamanager/tdehardwarebackend.cpp:702
 #, fuzzy
 msgid "Blank BLURAY-R"
 msgstr "CD-ROM"
 
-#: 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-disk"
 
-#: 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. "
@@ -415,63 +463,95 @@ msgstr ""
 "nedenfor. Du skal lukke dem eller ændre deres arbejdsmappe inden du forsøger "
 "at afmontere enheden igen."
 
-#: mounthelper/tdeio_media_mounthelper.cpp:79
-msgid "%1 cannot be found."
-msgstr "%1 kan ikke findes."
+#: mounthelper/tdeio_media_mounthelper.cpp:49
+#, fuzzy
+#| msgid "The TDE mediamanager is not running."
+msgid "The TDE mediamanager is not running.\n"
+msgstr "TDE's mediehåndtering kører ikke."
 
-#: mounthelper/tdeio_media_mounthelper.cpp:87
-msgid "%1 is not a mountable media."
-msgstr "%1 er ikke et monterbart medie."
+#: 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 er ikke et monterbart medie."
+#: 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 "Enheden er allerede monteret."
-
-#: 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 "Enheden blev afmonteret med godt resultat, men den kunne ikke åbnes"
+#: 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 "Enheden blev afmonteret med godt resultat, men kunne ikke skubbes ud"
+#: 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 "Ukendt"
+
+#: 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 kan ikke findes."
+
+#: mounthelper/tdeio_media_mounthelper.cpp:310
+#, fuzzy
+msgid "%1 is not a mountable or encrypted media."
+msgstr "%1 er ikke et monterbart medie."
+
+#: mounthelper/tdeio_media_mounthelper.cpp:397
+#, fuzzy
+#| msgid "Unknown"
+msgid "Unknown unlock error."
+msgstr "Ukendt"
+
+#: mounthelper/tdeio_media_mounthelper.cpp:410
 #, fuzzy
-msgid "Decrypt given URL"
+#| msgid "Unmount given URL"
+msgid "Mount given URL"
 msgstr "Afmontér givne URL"
 
-#: mounthelper/tdeio_media_mounthelper.cpp:296
+#: mounthelper/tdeio_media_mounthelper.cpp:411
 msgid "Unmount given URL"
 msgstr "Afmontér givne URL"
 
-#: mounthelper/tdeio_media_mounthelper.cpp:297
-msgid "Mount given URL (default)"
-msgstr "Montér givne URL (standard)"
+#: mounthelper/tdeio_media_mounthelper.cpp:412
+#, fuzzy
+#| msgid "Unmount given URL"
+msgid "Unlock given URL"
+msgstr "Afmontér givne URL"
 
-#: mounthelper/tdeio_media_mounthelper.cpp:298
-msgid "Eject given URL via tdeeject"
-msgstr "Skub givne URL ud via tdeeject"
+#: mounthelper/tdeio_media_mounthelper.cpp:413
+#, fuzzy
+msgid "Lock given URL"
+msgstr "Afmontér givne URL"
 
-#: mounthelper/tdeio_media_mounthelper.cpp:299
-msgid "Unmount and Eject given URL (necessary for some USB devices)"
-msgstr "Afmontér og skub given URL ud (nødvendig for visse USB-enheder)"
+#: mounthelper/tdeio_media_mounthelper.cpp:414
+#, fuzzy
+msgid "Eject given URL"
+msgstr "Afmontér givne URL"
+
+#: 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:/ URL at montere/afmontere/skubbe ud/fjerne"
 
 #: propsdlgplugin/propertiespage.cpp:137
@@ -620,7 +700,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
@@ -884,6 +964,23 @@ msgstr "Blandet"
 msgid "Filesystem: iso9660"
 msgstr "Filsystem: ISO-9660"
 
+#~ msgid ""
+#~ "The device was successfully unmounted, but the tray could not be opened"
+#~ msgstr "Enheden blev afmonteret med godt resultat, men den kunne ikke åbnes"
+
+#~ msgid "The device was successfully unmounted, but could not be ejected"
+#~ msgstr ""
+#~ "Enheden blev afmonteret med godt resultat, men kunne ikke skubbes ud"
+
+#~ msgid "Mount given URL (default)"
+#~ msgstr "Montér givne URL (standard)"
+
+#~ msgid "Eject given URL via tdeeject"
+#~ msgstr "Skub givne URL ud via tdeeject"
+
+#~ msgid "Unmount and Eject given URL (necessary for some USB devices)"
+#~ msgstr "Afmontér og skub given URL ud (nødvendig for visse USB-enheder)"
+
 #, fuzzy
 #~ msgid "Permission denied"
 #~ msgstr "Rettigheder nægtet"
diff --git a/tde-i18n-de/messages/tdebase/tdeio_media.po b/tde-i18n-de/messages/tdebase/tdeio_media.po
index 6bea5630e95..c4d9185f9dc 100644
--- a/tde-i18n-de/messages/tdebase/tdeio_media.po
+++ b/tde-i18n-de/messages/tdebase/tdeio_media.po
@@ -5,7 +5,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: 2020-01-22 02:07+0000\n"
 "Last-Translator: Chris <xchrisx@uber.space>\n"
 "Language-Team: German <https://mirror.git.trinitydesktop.org/weblate/"
@@ -45,27 +45,26 @@ msgstr "In neuem Fenster öffnen"
 msgid "Unknown"
 msgstr "Unbekannt"
 
-#: 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 "Die Medienverwaltung von TDE wurde nicht gestartet."
 
-#: mediaimpl.cpp:187
+#: mediaimpl.cpp:186
 msgid "This media name already exists."
 msgstr "Ein Medium mit diesem Namen existiert bereits."
 
-#: mediaimpl.cpp:230 mediaimpl.cpp:297
+#: mediaimpl.cpp:229 mediaimpl.cpp:296
 msgid "No such medium."
 msgstr "Kein solches Medium."
 
-#: mediaimpl.cpp:238
+#: mediaimpl.cpp:237
 msgid "The drive is encrypted."
 msgstr "Das Laufwerk ist verschlüsselt."
 
-#: 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 "Unbekannter Fehler beim Einbinden."
 
@@ -80,69 +79,71 @@ msgid "Unlock"
 msgstr "Entsperren"
 
 #: 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 "Kein solches Medium: %1"
 
-#: mediamanager/fstabbackend.cpp:408
+#: mediamanager/fstabbackend.cpp:416
 msgid "CD Recorder"
 msgstr "CD-Rekorder"
 
-#: mediamanager/fstabbackend.cpp:414
+#: mediamanager/fstabbackend.cpp:422
 msgid "DVD"
 msgstr "DVD"
 
-#: mediamanager/fstabbackend.cpp:427
+#: mediamanager/fstabbackend.cpp:435
 msgid "CD-ROM"
 msgstr "CD-ROM"
 
-#: mediamanager/fstabbackend.cpp:440
+#: mediamanager/fstabbackend.cpp:448
 msgid "Floppy"
 msgstr "Diskette"
 
-#: mediamanager/fstabbackend.cpp:448
+#: mediamanager/fstabbackend.cpp:456
 msgid "Zip Disk"
 msgstr "Zip-Diskette"
 
-#: mediamanager/fstabbackend.cpp:459
+#: mediamanager/fstabbackend.cpp:467
 msgid "Removable Device"
 msgstr "Wechselplatte"
 
-#: mediamanager/fstabbackend.cpp:464 mediamanager/fstabbackend.cpp:470
+#: mediamanager/fstabbackend.cpp:472 mediamanager/fstabbackend.cpp:478
 msgid "Remote Share"
 msgstr "Netzwerkfreigabe"
 
-#: mediamanager/fstabbackend.cpp:475
+#: mediamanager/fstabbackend.cpp:483
 msgid "Hard Disk"
 msgstr "Festplatte"
 
-#: mediamanager/halbackend.cpp:768 mediamanager/tdehardwarebackend.cpp:809
+#: mediamanager/halbackend.cpp:778 mediamanager/tdehardwarebackend.cpp:826
 msgid "Unknown Drive"
 msgstr "Unbekanntes Laufwerk"
 
-#: mediamanager/halbackend.cpp:780 mediamanager/tdehardwarebackend.cpp:839
+#: mediamanager/halbackend.cpp:794 mediamanager/tdehardwarebackend.cpp:872
 msgid "Floppy Drive"
 msgstr "Diskettenlaufwerk"
 
-#: mediamanager/halbackend.cpp:788
+#: mediamanager/halbackend.cpp:802
 msgid "Zip Drive"
 msgstr "Zip-Laufwerk"
 
-#: mediamanager/halbackend.cpp:858 mediamanager/tdehardwarebackend.cpp:896
+#: mediamanager/halbackend.cpp:877 mediamanager/tdehardwarebackend.cpp:930
 msgid "Camera"
 msgstr "Kamera"
 
-#: mediamanager/halbackend.cpp:1240 mediamanager/halbackend.cpp:1266
+#: mediamanager/halbackend.cpp:1259 mediamanager/halbackend.cpp:1285
 msgid "Authenticate"
 msgstr "Authentifizieren"
 
-#: 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 "
@@ -152,7 +153,7 @@ msgstr ""
 "big><br/>Authorisierung ist erforderlich um diese Aktion durchzuführen. "
 "Bitte geben Sie Ihr Passwort ein, um sich zu verifizieren."
 
-#: 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 "
@@ -163,17 +164,16 @@ msgstr ""
 "erforderlich um diese Aktion durchzuführen. Bitte geben Sie Ihr Passwort "
 "ein, um sich zu verifizieren."
 
-#: 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 "Interner Fehler"
 
-#: mediamanager/halbackend.cpp:1303
+#: mediamanager/halbackend.cpp:1322
 msgid "Invalid filesystem type"
 msgstr "Ungültiger Dateisystemtyp"
 
-#: 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>"
@@ -182,11 +182,11 @@ msgstr ""
 "Berechtigung haben, um auf dieses Geröt zuzugreifen.<br>2. Dieses Gerät "
 "nicht in der /etc/fstab gelistet ist.</p>"
 
-#: mediamanager/halbackend.cpp:1309
+#: mediamanager/halbackend.cpp:1328
 msgid "Device is already mounted."
 msgstr "Das Gerät ist bereits eingebunden."
 
-#: 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 "
@@ -196,7 +196,7 @@ msgstr ""
 "diese Programme schließen oder deren Arbeitsordner ändern, bevor Sie erneut "
 "probieren, die Geräteeinbindung zu lösen."
 
-#: 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."
@@ -204,10 +204,10 @@ msgstr ""
 "Programme welche noch immer that Gerät genutzt haben wurden erzwungen "
 "beendet. Sie sind unten aufgelistet."
 
-#: 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. "
@@ -215,39 +215,61 @@ msgstr ""
 "Leider lässt sich die Einbindung für das Gerät <b>%1</b> (%2) namens "
 "<b>'%3'</b> mit der Einbindung unter <b>%4</b> nicht lösen. "
 
-#: 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 ""
 "Der Befehl zum Lösen der Einbindung hat die folgende Fehlermeldung "
 "ausgegeben:"
 
-#: 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 ist kein Medium, das eingebunden werden kann."
+
+#: mediamanager/halbackend.cpp:1497 mediamanager/tdehardwarebackend.cpp:1225
+#: mounthelper/tdeio_media_mounthelper.cpp:68
+#, fuzzy
+#| msgid "%1 is already unlocked."
+msgid "%1 is already mounted to %2."
+msgstr "%1 ist bereits entsperrt."
+
+#: mediamanager/halbackend.cpp:1614
 msgid "Cannot mount encrypted locked drives!"
 msgstr ""
 "Einbinden verschlüsselter Laufwerke welche gesperrt sind nicht möglich!"
 
-#: 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 unlocked."
+msgid "%1 is already unmounted."
+msgstr "%1 ist bereits entsperrt."
+
+#: 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
 msgid "Internal error"
 msgstr "Interner Fehler"
 
-#: mediamanager/halbackend.cpp:1718
+#: mediamanager/halbackend.cpp:1745
 msgid "Unknown error"
 msgstr "Unbekannter Fehler"
 
-#: mediamanager/halbackend.cpp:1772
+#: mediamanager/halbackend.cpp:1799
 msgid "Unmounting failed due to the following error:"
 msgstr ""
 "Das Lösen der Geräteeinbindung ist aufgrund des folgenden Fehlers "
 "fehlgeschlagen:"
 
-#: mediamanager/halbackend.cpp:1774
+#: mediamanager/halbackend.cpp:1801
 msgid "Device is Busy:"
 msgstr "Gerät ist belegt:"
 
-#: 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>"
@@ -256,7 +278,7 @@ msgstr ""
 "haben auf das Gerät zuzugreifen.<br>2. Das Gerät ursprünglich unter TDE "
 "eingebunden wurde.</p>"
 
-#: 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>"
@@ -264,170 +286,208 @@ msgstr ""
 "%1<p><b>Möchten Sie das Beenden dieser Prozesse erzwingen?</b><br><i>Alle "
 "ungespeicherten Daten wären verloren.</i>"
 
-#: 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
+msgid "%1 is not an encrypted media."
+msgstr "%1 ist kein verschlüsseltes Medium."
+
+#: mediamanager/halbackend.cpp:1868 mediamanager/tdehardwarebackend.cpp:1452
+#: mounthelper/tdeio_media_mounthelper.cpp:127
+msgid "%1 is already unlocked."
+msgstr "%1 ist bereits entsperrt."
+
+#: mediamanager/halbackend.cpp:1907
 msgid "Wrong password"
 msgstr "Falsches Passwort"
 
+#: mediamanager/halbackend.cpp:1942 mediamanager/tdehardwarebackend.cpp:1501
+#: mounthelper/tdeio_media_mounthelper.cpp:159
+#, fuzzy
+#| msgid "%1 is already unlocked."
+msgid "%1 is already locked."
+msgstr "%1 ist bereits entsperrt."
+
 #: mediamanager/mediamanager.cpp:248 mediamanager/mediamanager.cpp:275
+#: mediamanager/mediamanager.cpp:302 mediamanager/mediamanager.cpp:329
 msgid "Feature only available with the TDE hardware backend"
 msgstr "Die Funktion ist nur mit dem TDE Hardware-Unterbau verfügbar."
 
 #: 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 "Die Funktion ist nur mit HAL verfügbar"
 
 #: mediamanager/mediamanager.cpp:262 mediamanager/mediamanager.cpp:289
-#: mediamanager/mediamanager.cpp:320 mediamanager/mediamanager.cpp:350
+#: mediamanager/mediamanager.cpp:316 mediamanager/mediamanager.cpp:343
 msgid "Feature only available with HAL or TDE hardware backend"
 msgstr "Die Funktion ist nur mit HAL oder dem TDE Hardware-Unterbau verfügbar."
 
-#: mediamanager/tdehardwarebackend.cpp:484
-#: mediamanager/tdehardwarebackend.cpp:521
-#: mediamanager/tdehardwarebackend.cpp:754
+#: mediamanager/tdehardwarebackend.cpp:486
+#: mediamanager/tdehardwarebackend.cpp:523
+#: mediamanager/tdehardwarebackend.cpp:779
 msgid "%1 Removable Device"
 msgstr "%1 Wechselmedium"
 
-#: mediamanager/tdehardwarebackend.cpp:529
+#: mediamanager/tdehardwarebackend.cpp:532
 msgid "Blank CD-ROM"
 msgstr "Leere CD-ROM"
 
-#: mediamanager/tdehardwarebackend.cpp:538
+#: mediamanager/tdehardwarebackend.cpp:542
 msgid "Blank CD-R"
 msgstr "Leere CD-R"
 
-#: mediamanager/tdehardwarebackend.cpp:547
+#: mediamanager/tdehardwarebackend.cpp:552
 msgid "Blank CD-RW"
 msgstr "Leere CD-RW"
 
-#: mediamanager/tdehardwarebackend.cpp:556
+#: mediamanager/tdehardwarebackend.cpp:562
 msgid "Blank Magneto-Optical CD"
 msgstr "Leere magnetisch-optische CD"
 
-#: mediamanager/tdehardwarebackend.cpp:565
+#: mediamanager/tdehardwarebackend.cpp:572
 msgid "Blank Mount Ranier CD-RW"
 msgstr "Leere Mount Ranier CD-RW"
 
-#: mediamanager/tdehardwarebackend.cpp:574
+#: mediamanager/tdehardwarebackend.cpp:582
 msgid "Blank Mount Ranier CD-RW-W"
 msgstr "Leere Mount Ranier CD-RW"
 
-#: mediamanager/tdehardwarebackend.cpp:583
+#: mediamanager/tdehardwarebackend.cpp:592
 msgid "Blank DVD-ROM"
 msgstr "Leere DVD-ROM"
 
-#: mediamanager/tdehardwarebackend.cpp:592
+#: mediamanager/tdehardwarebackend.cpp:602
 msgid "Blank DVD-RAM"
 msgstr "Leere DVD-RAM"
 
-#: mediamanager/tdehardwarebackend.cpp:601
+#: mediamanager/tdehardwarebackend.cpp:612
 msgid "Blank DVD-R"
 msgstr "Leere DVD-R"
 
-#: mediamanager/tdehardwarebackend.cpp:610
+#: mediamanager/tdehardwarebackend.cpp:622
 msgid "Blank DVD-RW"
 msgstr "Leere DVD-RW"
 
-#: mediamanager/tdehardwarebackend.cpp:619
+#: mediamanager/tdehardwarebackend.cpp:632
 msgid "Blank Dual Layer DVD-R"
 msgstr "Leere Doppelschicht DVD-R"
 
-#: mediamanager/tdehardwarebackend.cpp:628
+#: mediamanager/tdehardwarebackend.cpp:642
 msgid "Blank Dual Layer DVD-RW"
 msgstr "Leere Doppelschicht DVD-RW"
 
-#: mediamanager/tdehardwarebackend.cpp:637
+#: mediamanager/tdehardwarebackend.cpp:652
 msgid "Blank DVD+R"
 msgstr "Leere DVD+R"
 
-#: mediamanager/tdehardwarebackend.cpp:646
+#: mediamanager/tdehardwarebackend.cpp:662
 msgid "Blank DVD+RW"
 msgstr "Leere DVD+RW"
 
-#: mediamanager/tdehardwarebackend.cpp:655
+#: mediamanager/tdehardwarebackend.cpp:672
 msgid "Blank Dual Layer DVD+R"
 msgstr "Leere Doppelschicht DVD+R"
 
-#: mediamanager/tdehardwarebackend.cpp:664
+#: mediamanager/tdehardwarebackend.cpp:682
 msgid "Blank Dual Layer DVD+RW"
 msgstr "Leere Doppelschicht DVD+RW"
 
-#: mediamanager/tdehardwarebackend.cpp:673
+#: mediamanager/tdehardwarebackend.cpp:692
 #, fuzzy
 #| msgid "Blank BD-ROM"
 msgid "Blank BLURAY-ROM"
 msgstr "Leere BD-ROM"
 
-#: mediamanager/tdehardwarebackend.cpp:682
+#: mediamanager/tdehardwarebackend.cpp:702
 #, fuzzy
 #| msgid "Blank BD-R"
 msgid "Blank BLURAY-R"
 msgstr "Leere BD-R"
 
-#: mediamanager/tdehardwarebackend.cpp:691
+#: mediamanager/tdehardwarebackend.cpp:712
 #, fuzzy
 #| msgid "Blank BD-RW"
 msgid "Blank BLURAY-RW"
 msgstr "Leere BD-RW"
 
-#: mediamanager/tdehardwarebackend.cpp:700
+#: mediamanager/tdehardwarebackend.cpp:722
 msgid "Blank HDDVD-ROM"
 msgstr "Leere HDDVD-ROM"
 
-#: mediamanager/tdehardwarebackend.cpp:709
+#: mediamanager/tdehardwarebackend.cpp:732
 msgid "Blank HDDVD-R"
 msgstr "Leere HDDVD-R"
 
-#: mediamanager/tdehardwarebackend.cpp:718
+#: mediamanager/tdehardwarebackend.cpp:742
 msgid "Blank HDDVD-RW"
 msgstr "Leere HDDVD-RW"
 
-#: mediamanager/tdehardwarebackend.cpp:725
+#: mediamanager/tdehardwarebackend.cpp:750
 msgid "Audio CD"
 msgstr "Audio-CD"
 
-#: mediamanager/tdehardwarebackend.cpp:746
+#: mediamanager/tdehardwarebackend.cpp:771
 msgid "%1 Fixed Disk (%2)"
 msgstr "%1 Festplatte (%2)"
 
-#: mediamanager/tdehardwarebackend.cpp:853
+#: mediamanager/tdehardwarebackend.cpp:886
 msgid "%1 Zip Disk"
 msgstr "%1 Zip-Laufwerk"
 
-#: 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
+#, fuzzy, c-format
+#| msgid "Internal error. Couldn't find medium."
+msgid "Internal error. Couldn't find medium id %1."
 msgstr "Interner Fehler. Medium konnte nicht gefunden werden."
 
-#: mediamanager/tdehardwarebackend.cpp:1250
-#: mediamanager/tdehardwarebackend.cpp:1324
+#: mediamanager/tdehardwarebackend.cpp:1282
 msgid "Unable to mount this device."
 msgstr "Dieses Gerät kann nicht eingebunden werden."
 
-#: 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 "<p>Technische Details:<br>"
 
-#: mediamanager/tdehardwarebackend.cpp:1285
-msgid "Decryption aborted"
-msgstr "Entschlüsselung abgebrochen"
-
-#: mediamanager/tdehardwarebackend.cpp:1444
+#: mediamanager/tdehardwarebackend.cpp:1396
+#, fuzzy
+#| 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>"
 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>"
+"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 ""
 "<qt>Das Laufwerk <b>%1</b> (%2) genannt <b>'%3'</b> und aktuell eingebunden "
 "in <b>%4</b> kann zurzeit nicht ausgebunden werden.<p>%5<p><b>Möchten Sie "
 "das Beenden dieser Prozesse erzwingen?</b><br><i>Alle ungespeicherten Daten "
 "wären verloren</i>"
 
-#: mediamanager/tdehardwarebackend.cpp:1578
+#: mediamanager/tdehardwarebackend.cpp:1467
+#, fuzzy
+#| msgid "Unable to mount this device."
+msgid "Unable to unlock the device."
+msgstr "Dieses Gerät kann nicht eingebunden werden."
+
+#: mediamanager/tdehardwarebackend.cpp:1516
+#, fuzzy
+#| msgid "Unable to mount this device."
+msgid "Unable to lock the device."
+msgstr "Dieses Gerät kann nicht eingebunden werden."
+
+#: mediamanager/tdehardwarebackend.cpp:1623
 msgid ""
 "Programs still using the device have been detected. They are listed below. "
 "You have to close them or change their working directory before attempting "
@@ -437,66 +497,98 @@ msgstr ""
 "diese Programme schließen oder deren Arbeitsordner ändern, bevor Sie erneut "
 "probieren, die Geräteeinbindung zu lösen."
 
-#: mounthelper/tdeio_media_mounthelper.cpp:79
-msgid "%1 cannot be found."
-msgstr "%1 ist nicht auffindbar."
+#: mounthelper/tdeio_media_mounthelper.cpp:49
+#, fuzzy
+#| msgid "The TDE mediamanager is not running."
+msgid "The TDE mediamanager is not running.\n"
+msgstr "Die Medienverwaltung von TDE wurde nicht gestartet."
 
-#: mounthelper/tdeio_media_mounthelper.cpp:87
-msgid "%1 is not a mountable media."
-msgstr "%1 ist kein Medium, das eingebunden werden kann."
+#: mounthelper/tdeio_media_mounthelper.cpp:59
+msgid "Try to mount an unknown medium."
+msgstr ""
 
-#: mounthelper/tdeio_media_mounthelper.cpp:101
-msgid "%1 is not an encrypted media."
-msgstr "%1 ist kein verschlüsseltes Medium."
+#: mounthelper/tdeio_media_mounthelper.cpp:87
+msgid "Try to unmount an unknown medium."
+msgstr ""
 
 #: mounthelper/tdeio_media_mounthelper.cpp:107
-msgid "%1 is already unlocked."
-msgstr "%1 ist bereits entsperrt."
-
-#: mounthelper/tdeio_media_mounthelper.cpp:139
 msgid "Unknown unmount error."
 msgstr "Unbekannter Fehler beim Lösen der Einbindung."
 
-#: mounthelper/tdeio_media_mounthelper.cpp:246
-msgid "The device was successfully unmounted, but the tray could not be opened"
+#: mounthelper/tdeio_media_mounthelper.cpp:116
+msgid "Try to unlock an unknown medium."
 msgstr ""
-"Die Geräteeinbindung wurde erfolgreich gelöst, jedoch lässt sich die "
-"Schublade nicht öffnen."
 
-#: mounthelper/tdeio_media_mounthelper.cpp:248
-msgid "The device was successfully unmounted, but could not be ejected"
+#: mounthelper/tdeio_media_mounthelper.cpp:148
+msgid "Try to lock an unknown medium."
 msgstr ""
-"Die Geräteeinbindung wurde erfolgreich gelöst, jedoch lässt sich das Medium "
-"nicht auswerfen."
 
-#: mounthelper/tdeio_media_mounthelper.cpp:281
-msgid "Unknown decrypt error."
-msgstr "Unbekannter Fehler beim Entschlüsseln."
+#: mounthelper/tdeio_media_mounthelper.cpp:173
+#, fuzzy
+#| msgid "Unknown mount error."
+msgid "Unknown lock error."
+msgstr "Unbekannter Fehler beim Einbinden."
 
-#: mounthelper/tdeio_media_mounthelper.cpp:295
-msgid "Decrypt given URL"
-msgstr "Angegebene URL entschlüsseln"
+#: 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:302
+msgid "%1 cannot be found."
+msgstr "%1 ist nicht auffindbar."
 
-#: mounthelper/tdeio_media_mounthelper.cpp:296
+#: mounthelper/tdeio_media_mounthelper.cpp:310
+#, fuzzy
+#| msgid "%1 is not an encrypted media."
+msgid "%1 is not a mountable or encrypted media."
+msgstr "%1 ist kein verschlüsseltes Medium."
+
+#: mounthelper/tdeio_media_mounthelper.cpp:397
+#, fuzzy
+#| msgid "Unknown unmount error."
+msgid "Unknown unlock error."
+msgstr "Unbekannter Fehler beim Lösen der Einbindung."
+
+#: mounthelper/tdeio_media_mounthelper.cpp:410
+#, fuzzy
+#| msgid "Unmount given URL"
+msgid "Mount given URL"
+msgstr "Einbindung für angegebene Adresse lösen"
+
+#: mounthelper/tdeio_media_mounthelper.cpp:411
 msgid "Unmount given URL"
 msgstr "Einbindung für angegebene Adresse lösen"
 
-#: mounthelper/tdeio_media_mounthelper.cpp:297
-msgid "Mount given URL (default)"
-msgstr "Angegebene Adresse einbinden (Voreinstellung)"
+#: mounthelper/tdeio_media_mounthelper.cpp:412
+#, fuzzy
+#| msgid "Unmount given URL"
+msgid "Unlock given URL"
+msgstr "Einbindung für angegebene Adresse lösen"
 
-#: mounthelper/tdeio_media_mounthelper.cpp:298
-msgid "Eject given URL via tdeeject"
-msgstr "Angegebene Adresse mittels tdeeject auswerfen"
+#: mounthelper/tdeio_media_mounthelper.cpp:413
+#, fuzzy
+#| msgid "Decrypt given URL"
+msgid "Lock given URL"
+msgstr "Angegebene URL entschlüsseln"
+
+#: mounthelper/tdeio_media_mounthelper.cpp:414
+#, fuzzy
+#| msgid "Decrypt given URL"
+msgid "Eject given URL"
+msgstr "Angegebene URL entschlüsseln"
 
-#: mounthelper/tdeio_media_mounthelper.cpp:299
-msgid "Unmount and Eject given URL (necessary for some USB devices)"
+#: mounthelper/tdeio_media_mounthelper.cpp:415
+msgid "Safely remove (unmount and eject) given URL"
 msgstr ""
-"Lösen der Einbindung und anschließendes Auswerfen der angegebenen Adresse "
-"(nötig für einige USB-Geräte)"
 
-#: 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:/ URL zum Einbinden/Lösen/Auswerfen/Entfernen"
 
 #: propsdlgplugin/propertiespage.cpp:137
@@ -656,14 +748,16 @@ msgid "&Password:"
 msgstr "&Passwort:"
 
 #: mounthelper/unlockdialog.ui:109
-#, no-c-format
+#, fuzzy, no-c-format
+#| msgid ""
+#| "<p><b>%1</b> is an encrypted locked storage device.</p>\n"
+#| "<p>Please enter the password to unlock the storage device.</p>"
 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 ""
-"<p><b>%1</b> ist ein verschlüsseltes Speichermedium.</p>\n"
-"<p>Bitte geben Sie das Passwort ein, um das Speichermedium zu entschlüsseln."
-"</p>"
+"<p><b>%1</b> ist ein verschlüsseltes gesperrtes Speichermedium.</p>\n"
+"<p>Bitte geben Sie das Passwort ein, um das Speichermedium zu entsperren.</p>"
 
 #: propsdlgplugin/propertiespagegui.ui:16
 #, no-c-format
@@ -934,6 +1028,42 @@ msgstr "Gemischt"
 msgid "Filesystem: iso9660"
 msgstr "Dateisystem: ISO-9660"
 
+#~ msgid "Decryption aborted"
+#~ msgstr "Entschlüsselung abgebrochen"
+
+#~ msgid ""
+#~ "The device was successfully unmounted, but the tray could not be opened"
+#~ msgstr ""
+#~ "Die Geräteeinbindung wurde erfolgreich gelöst, jedoch lässt sich die "
+#~ "Schublade nicht öffnen."
+
+#~ msgid "The device was successfully unmounted, but could not be ejected"
+#~ msgstr ""
+#~ "Die Geräteeinbindung wurde erfolgreich gelöst, jedoch lässt sich das "
+#~ "Medium nicht auswerfen."
+
+#~ msgid "Unknown decrypt error."
+#~ msgstr "Unbekannter Fehler beim Entschlüsseln."
+
+#~ msgid "Mount given URL (default)"
+#~ msgstr "Angegebene Adresse einbinden (Voreinstellung)"
+
+#~ msgid "Eject given URL via tdeeject"
+#~ msgstr "Angegebene Adresse mittels tdeeject auswerfen"
+
+#~ msgid "Unmount and Eject given URL (necessary for some USB devices)"
+#~ msgstr ""
+#~ "Lösen der Einbindung und anschließendes Auswerfen der angegebenen Adresse "
+#~ "(nötig für einige USB-Geräte)"
+
+#~ msgid ""
+#~ "<p><b>%1</b> is an encrypted storage device.</p>\n"
+#~ "<p>Please enter the password to decrypt the storage device.</p>"
+#~ msgstr ""
+#~ "<p><b>%1</b> ist ein verschlüsseltes Speichermedium.</p>\n"
+#~ "<p>Bitte geben Sie das Passwort ein, um das Speichermedium zu "
+#~ "entschlüsseln.</p>"
+
 #~ msgid "Decrypt"
 #~ msgstr "Entschlüsseln"
 
diff --git a/tde-i18n-el/messages/tdebase/tdeio_media.po b/tde-i18n-el/messages/tdebase/tdeio_media.po
index 3b03b8cf447..5c05769bb2f 100644
--- a/tde-i18n-el/messages/tdebase/tdeio_media.po
+++ b/tde-i18n-el/messages/tdebase/tdeio_media.po
@@ -5,7 +5,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-11-28 16:47+0200\n"
 "Last-Translator: Spiros Georgaras <sng@hellug.gr>\n"
 "Language-Team: Greek <i18ngr@lists.hellug.gr>\n"
@@ -43,27 +43,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 ""
 
@@ -76,103 +75,104 @@ 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 "Εγγραφέας CD"
 
-#: mediamanager/fstabbackend.cpp:414
+#: mediamanager/fstabbackend.cpp:422
 msgid "DVD"
 msgstr "DVD"
 
-#: mediamanager/fstabbackend.cpp:427
+#: mediamanager/fstabbackend.cpp:435
 msgid "CD-ROM"
 msgstr "CD-ROM"
 
-#: 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
 msgid "Unknown Drive"
 msgstr "Άγνωστος οδηγός"
 
-#: mediamanager/halbackend.cpp:780 mediamanager/tdehardwarebackend.cpp:839
+#: mediamanager/halbackend.cpp:794 mediamanager/tdehardwarebackend.cpp:872
 msgid "Floppy Drive"
 msgstr "Οδηγός δισκέτας"
 
-#: mediamanager/halbackend.cpp:788
+#: mediamanager/halbackend.cpp:802
 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 "
@@ -182,16 +182,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. "
@@ -199,209 +199,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 "CD-ROM"
 
-#: 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 "CD-ROM"
 
-#: mediamanager/tdehardwarebackend.cpp:682
+#: mediamanager/tdehardwarebackend.cpp:702
 #, fuzzy
 msgid "Blank BLURAY-R"
 msgstr "CD-ROM"
 
-#: 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:1516
+msgid "Unable to lock the device."
 msgstr ""
 
-#: mediamanager/tdehardwarebackend.cpp:1578
+#: mediamanager/tdehardwarebackend.cpp:1623
 #, fuzzy
 msgid ""
 "Programs still using the device have been detected. They are listed below. "
@@ -412,67 +460,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"
+#: 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"
+#: 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 "Decrypt given URL"
+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 "Unmount given URL"
+msgid "Mount given URL"
 msgstr "Αποπροσάρτηση δοσμένου URL"
 
-#: mounthelper/tdeio_media_mounthelper.cpp:296
+#: mounthelper/tdeio_media_mounthelper.cpp:411
 msgid "Unmount given URL"
 msgstr "Αποπροσάρτηση δοσμένου URL"
 
-#: mounthelper/tdeio_media_mounthelper.cpp:297
-msgid "Mount given URL (default)"
-msgstr "Προσάρτηση δοσμένου URL (προκαθορισμένο)"
+#: mounthelper/tdeio_media_mounthelper.cpp:412
+#, fuzzy
+#| msgid "Unmount given URL"
+msgid "Unlock given URL"
+msgstr "Αποπροσάρτηση δοσμένου URL"
+
+#: mounthelper/tdeio_media_mounthelper.cpp:413
+#, fuzzy
+msgid "Lock given URL"
+msgstr "Αποπροσάρτηση δοσμένου URL"
 
-#: mounthelper/tdeio_media_mounthelper.cpp:298
-msgid "Eject given URL via tdeeject"
-msgstr "Εξαγωγή του δοσμένου URL μέσω του tdeeject"
+#: mounthelper/tdeio_media_mounthelper.cpp:414
+#, fuzzy
+msgid "Eject given URL"
+msgstr "Αποπροσάρτηση δοσμένου URL"
 
-#: mounthelper/tdeio_media_mounthelper.cpp:299
-msgid "Unmount and Eject given URL (necessary for some USB devices)"
+#: mounthelper/tdeio_media_mounthelper.cpp:415
+msgid "Safely remove (unmount and eject) given URL"
 msgstr ""
-"Αποπροσάρτηση και εξαγωγή του δοσμένου URL (απαραίτητο για μερικές συσκευές "
-"USB)"
 
-#: 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 "Η URL media:/ για προσάρτηση/αποπροσάρτηση/αφαίρεση μέσου/αφαίρεση"
 
 #: propsdlgplugin/propertiespage.cpp:137
@@ -621,7 +697,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
@@ -894,6 +970,27 @@ 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 "Προσάρτηση δοσμένου URL (προκαθορισμένο)"
+
+#~ 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 "Άρνηση πρόσβασης"
diff --git a/tde-i18n-en_GB/messages/tdebase/tdeio_media.po b/tde-i18n-en_GB/messages/tdebase/tdeio_media.po
index 42d7a8c1dbc..757af45695d 100644
--- a/tde-i18n-en_GB/messages/tdebase/tdeio_media.po
+++ b/tde-i18n-en_GB/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: 2005-11-04 14:19+0000\n"
 "Last-Translator: Malcolm Hunter <malcolm.hunter@gmx.co.uk>\n"
 "Language-Team: British English <kde-en-gb@kde.me.uk>\n"
@@ -44,27 +44,26 @@ msgstr "Open in New Window"
 msgid "Unknown"
 msgstr "Unknown"
 
-#: 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 "The TDE mediamanager is not running."
 
-#: mediaimpl.cpp:187
+#: mediaimpl.cpp:186
 msgid "This media name already exists."
 msgstr "This media name already exists."
 
-#: 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,389 +76,469 @@ 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 ""
 
-#: mediamanager/fstabbackend.cpp:408
+#: mediamanager/fstabbackend.cpp:416
 msgid "CD Recorder"
 msgstr "CD Recorder"
 
-#: mediamanager/fstabbackend.cpp:414
+#: mediamanager/fstabbackend.cpp:422
 msgid "DVD"
 msgstr "DVD"
 
-#: mediamanager/fstabbackend.cpp:427
+#: mediamanager/fstabbackend.cpp:435
 msgid "CD-ROM"
 msgstr "CD-ROM"
 
-#: mediamanager/fstabbackend.cpp:440
+#: mediamanager/fstabbackend.cpp:448
 msgid "Floppy"
 msgstr "Floppy"
 
-#: mediamanager/fstabbackend.cpp:448
+#: mediamanager/fstabbackend.cpp:456
 msgid "Zip Disk"
 msgstr "Zip Disk"
 
-#: mediamanager/fstabbackend.cpp:459
+#: mediamanager/fstabbackend.cpp:467
 msgid "Removable Device"
 msgstr "Removable Device"
 
-#: mediamanager/fstabbackend.cpp:464 mediamanager/fstabbackend.cpp:470
+#: mediamanager/fstabbackend.cpp:472 mediamanager/fstabbackend.cpp:478
 msgid "Remote Share"
 msgstr "Remote Share"
 
-#: mediamanager/fstabbackend.cpp:475
+#: mediamanager/fstabbackend.cpp:483
 msgid "Hard Disk"
 msgstr "Hard Disk"
 
-#: mediamanager/halbackend.cpp:768 mediamanager/tdehardwarebackend.cpp:809
+#: mediamanager/halbackend.cpp:778 mediamanager/tdehardwarebackend.cpp:826
 #, fuzzy
 msgid "Unknown Drive"
 msgstr "Unknown"
 
-#: mediamanager/halbackend.cpp:780 mediamanager/tdehardwarebackend.cpp:839
+#: mediamanager/halbackend.cpp:794 mediamanager/tdehardwarebackend.cpp:872
 #, fuzzy
 msgid "Floppy Drive"
 msgstr "Floppy"
 
-#: mediamanager/halbackend.cpp:788
+#: mediamanager/halbackend.cpp:802
 #, fuzzy
 msgid "Zip Drive"
 msgstr "Zip Disk"
 
-#: mediamanager/halbackend.cpp:858 mediamanager/tdehardwarebackend.cpp:896
+#: mediamanager/halbackend.cpp:877 mediamanager/tdehardwarebackend.cpp:930
 msgid "Camera"
 msgstr "Camera"
 
-#: 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 "
 "before attempting to unmount the device again."
 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. "
 msgstr ""
 
-#: 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 ""
 
-#: 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 is not a mountable media."
+
+#: mediamanager/halbackend.cpp:1497 mediamanager/tdehardwarebackend.cpp:1225
+#: mounthelper/tdeio_media_mounthelper.cpp:68
+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 not a mountable media."
+msgid "%1 is already unmounted."
+msgstr "%1 is not a mountable media."
+
+#: 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
 msgid "Internal error"
 msgstr ""
 
-#: mediamanager/halbackend.cpp:1718
+#: mediamanager/halbackend.cpp:1745
 #, fuzzy
 #| msgid "Unknown"
 msgid "Unknown error"
 msgstr "Unknown"
 
-#: 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 is not a mountable media."
+
+#: mediamanager/halbackend.cpp:1868 mediamanager/tdehardwarebackend.cpp:1452
+#: mounthelper/tdeio_media_mounthelper.cpp:127
+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
+msgid "%1 is already locked."
+msgstr ""
+
 #: mediamanager/mediamanager.cpp:248 mediamanager/mediamanager.cpp:275
+#: mediamanager/mediamanager.cpp:302 mediamanager/mediamanager.cpp:329
 msgid "Feature only available with the TDE hardware backend"
 msgstr ""
 
 #: 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 ""
 
 #: mediamanager/mediamanager.cpp:262 mediamanager/mediamanager.cpp:289
-#: mediamanager/mediamanager.cpp:320 mediamanager/mediamanager.cpp:350
+#: mediamanager/mediamanager.cpp:316 mediamanager/mediamanager.cpp:343
 msgid "Feature only available with HAL or TDE hardware backend"
 msgstr ""
 
-#: 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 "Removable Device"
 
-#: mediamanager/tdehardwarebackend.cpp:529
+#: mediamanager/tdehardwarebackend.cpp:532
 #, fuzzy
 msgid "Blank CD-ROM"
 msgstr "CD-ROM"
 
-#: 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 "CD-ROM"
 
-#: mediamanager/tdehardwarebackend.cpp:682
+#: mediamanager/tdehardwarebackend.cpp:702
 #, fuzzy
 msgid "Blank BLURAY-R"
 msgstr "CD-ROM"
 
-#: 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 Disk"
 
-#: 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
 msgid ""
 "Programs still using the device have been detected. They are listed below. "
 "You have to close them or change their working directory before attempting "
 "to unmount the device again."
 msgstr ""
 
-#: mounthelper/tdeio_media_mounthelper.cpp:79
-msgid "%1 cannot be found."
-msgstr "%1 cannot be found."
+#: mounthelper/tdeio_media_mounthelper.cpp:49
+#, fuzzy
+#| msgid "The TDE mediamanager is not running."
+msgid "The TDE mediamanager is not running.\n"
+msgstr "The TDE mediamanager is not running."
 
-#: mounthelper/tdeio_media_mounthelper.cpp:87
-msgid "%1 is not a mountable media."
-msgstr "%1 is not a mountable media."
+#: 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 is not a mountable media."
+#: mounthelper/tdeio_media_mounthelper.cpp:87
+msgid "Try to unmount an unknown medium."
+msgstr ""
 
 #: mounthelper/tdeio_media_mounthelper.cpp:107
-msgid "%1 is already unlocked."
+msgid "Unknown unmount error."
 msgstr ""
 
-#: mounthelper/tdeio_media_mounthelper.cpp:139
-msgid "Unknown unmount error."
+#: mounthelper/tdeio_media_mounthelper.cpp:116
+msgid "Try to unlock an unknown medium."
 msgstr ""
 
-#: mounthelper/tdeio_media_mounthelper.cpp:246
-msgid "The device was successfully unmounted, but the tray could not be opened"
+#: mounthelper/tdeio_media_mounthelper.cpp:148
+msgid "Try to lock an unknown medium."
 msgstr ""
 
-#: mounthelper/tdeio_media_mounthelper.cpp:248
-msgid "The device was successfully unmounted, but could not be ejected"
+#: mounthelper/tdeio_media_mounthelper.cpp:173
+#, fuzzy
+#| msgid "Unknown"
+msgid "Unknown lock error."
+msgstr "Unknown"
+
+#: mounthelper/tdeio_media_mounthelper.cpp:211
+msgid "Try to release holders from an unknown medium."
 msgstr ""
 
-#: mounthelper/tdeio_media_mounthelper.cpp:281
-msgid "Unknown decrypt error."
+#: 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 cannot be found."
+
+#: mounthelper/tdeio_media_mounthelper.cpp:310
 #, fuzzy
-msgid "Decrypt given URL"
+msgid "%1 is not a mountable or encrypted media."
+msgstr "%1 is not a mountable media."
+
+#: mounthelper/tdeio_media_mounthelper.cpp:397
+#, fuzzy
+#| msgid "Unknown"
+msgid "Unknown unlock error."
+msgstr "Unknown"
+
+#: mounthelper/tdeio_media_mounthelper.cpp:410
+#, fuzzy
+#| msgid "Unmount given URL"
+msgid "Mount given URL"
 msgstr "Unmount given URL"
 
-#: mounthelper/tdeio_media_mounthelper.cpp:296
+#: mounthelper/tdeio_media_mounthelper.cpp:411
 msgid "Unmount given URL"
 msgstr "Unmount given URL"
 
-#: mounthelper/tdeio_media_mounthelper.cpp:297
-msgid "Mount given URL (default)"
-msgstr "Mount given URL (default)"
+#: mounthelper/tdeio_media_mounthelper.cpp:412
+#, fuzzy
+#| msgid "Unmount given URL"
+msgid "Unlock given URL"
+msgstr "Unmount given URL"
+
+#: mounthelper/tdeio_media_mounthelper.cpp:413
+#, fuzzy
+msgid "Lock given URL"
+msgstr "Unmount given URL"
 
-#: mounthelper/tdeio_media_mounthelper.cpp:298
-msgid "Eject given URL via tdeeject"
-msgstr "Eject given URL via tdeeject"
+#: mounthelper/tdeio_media_mounthelper.cpp:414
+#, fuzzy
+msgid "Eject given URL"
+msgstr "Unmount given URL"
 
-#: mounthelper/tdeio_media_mounthelper.cpp:299
-msgid "Unmount and Eject given URL (necessary for some USB devices)"
-msgstr "Unmount and Eject given URL (necessary for some USB devices)"
+#: 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:/ URL to mount/unmount/eject/remove"
 
 #: propsdlgplugin/propertiespage.cpp:137
@@ -609,7 +688,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
@@ -829,6 +908,15 @@ msgstr ""
 msgid "Filesystem: iso9660"
 msgstr ""
 
+#~ msgid "Mount given URL (default)"
+#~ msgstr "Mount given URL (default)"
+
+#~ msgid "Eject given URL via tdeeject"
+#~ msgstr "Eject given URL via tdeeject"
+
+#~ msgid "Unmount and Eject given URL (necessary for some USB devices)"
+#~ msgstr "Unmount and Eject given URL (necessary for some USB devices)"
+
 #~ msgid ""
 #~ "\n"
 #~ "Please check that the disk is entered correctly."
diff --git a/tde-i18n-eo/messages/tdebase/tdeio_media.po b/tde-i18n-eo/messages/tdebase/tdeio_media.po
index 49acc36ac5b..cfa2de724b7 100644
--- a/tde-i18n-eo/messages/tdebase/tdeio_media.po
+++ b/tde-i18n-eo/messages/tdebase/tdeio_media.po
@@ -4,7 +4,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-04-03 13:27-0500\n"
 "Last-Translator: Cindy McKee <cfmckee@gmail.com>\n"
 "Language-Team: Esperanto <eo@li.org>\n"
@@ -42,27 +42,26 @@ msgstr "Malfermi en Nova Fenestro"
 msgid "Unknown"
 msgstr "Nekonata"
 
-#: 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 "La TDE datumportila administrilo ne estas lanĉita."
 
-#: mediaimpl.cpp:187
+#: mediaimpl.cpp:186
 msgid "This media name already exists."
 msgstr "Ĉi tiu datumportila nomo jam ekzistas."
 
-#: mediaimpl.cpp:230 mediaimpl.cpp:297
+#: mediaimpl.cpp:229 mediaimpl.cpp:296
 msgid "No such medium."
 msgstr "Nenia datumportilo."
 
-#: 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 ""
 
@@ -75,106 +74,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 "Nenia datumportilo: %1"
 
-#: mediamanager/fstabbackend.cpp:408
+#: mediamanager/fstabbackend.cpp:416
 msgid "CD Recorder"
 msgstr "LD Presilo"
 
-#: mediamanager/fstabbackend.cpp:414
+#: mediamanager/fstabbackend.cpp:422
 msgid "DVD"
 msgstr "DVD"
 
-#: mediamanager/fstabbackend.cpp:427
+#: mediamanager/fstabbackend.cpp:435
 msgid "CD-ROM"
 msgstr "Nurlegebla LD"
 
-#: mediamanager/fstabbackend.cpp:440
+#: mediamanager/fstabbackend.cpp:448
 msgid "Floppy"
 msgstr "Disketo"
 
-#: mediamanager/fstabbackend.cpp:448
+#: mediamanager/fstabbackend.cpp:456
 msgid "Zip Disk"
 msgstr "Zip-Disko"
 
-#: mediamanager/fstabbackend.cpp:459
+#: mediamanager/fstabbackend.cpp:467
 msgid "Removable Device"
 msgstr "Demetebla Disponaĵo"
 
-#: mediamanager/fstabbackend.cpp:464 mediamanager/fstabbackend.cpp:470
+#: mediamanager/fstabbackend.cpp:472 mediamanager/fstabbackend.cpp:478
 msgid "Remote Share"
 msgstr "Fora Opuzaĵo"
 
-#: mediamanager/fstabbackend.cpp:475
+#: mediamanager/fstabbackend.cpp:483
 msgid "Hard Disk"
 msgstr "Fiksita Disko"
 
-#: mediamanager/halbackend.cpp:768 mediamanager/tdehardwarebackend.cpp:809
+#: mediamanager/halbackend.cpp:778 mediamanager/tdehardwarebackend.cpp:826
 #, fuzzy
 msgid "Unknown Drive"
 msgstr "Nekonata"
 
-#: mediamanager/halbackend.cpp:780 mediamanager/tdehardwarebackend.cpp:839
+#: mediamanager/halbackend.cpp:794 mediamanager/tdehardwarebackend.cpp:872
 #, fuzzy
 msgid "Floppy Drive"
 msgstr "Disketo"
 
-#: mediamanager/halbackend.cpp:788
+#: mediamanager/halbackend.cpp:802
 #, fuzzy
 msgid "Zip Drive"
 msgstr "Zip-Disko"
 
-#: mediamanager/halbackend.cpp:858 mediamanager/tdehardwarebackend.cpp:896
+#: mediamanager/halbackend.cpp:877 mediamanager/tdehardwarebackend.cpp:930
 msgid "Camera"
 msgstr "Kamero"
 
-#: 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 "Interna Eraro"
 
-#: mediamanager/halbackend.cpp:1303
+#: mediamanager/halbackend.cpp:1322
 msgid "Invalid filesystem type"
 msgstr "Nevalida dosiersistema speco"
 
-#: 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 "Disponaĵo jam estas surmetita."
 
-#: 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 "
@@ -184,16 +184,16 @@ msgstr ""
 "devas aŭ fermi ilin aŭ ŝanĝi la kurantan dosierujon antaŭ ol vi povas demeti "
 "la disponaĵon."
 
-#: 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. "
@@ -201,209 +201,257 @@ msgstr ""
 "Malfeliĉe, la disponaĵo <b>%1</b> (%2) nomita <b>'%3'</b> kaj nune surmetita "
 "ĉe <b>%4</b> ne povis esti demetita."
 
-#: 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 "La jena eraro estis liverita de la demeta komando:"
 
-#: 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 ne estas surmetebla disponaĵo."
+
+#: mediamanager/halbackend.cpp:1497 mediamanager/tdehardwarebackend.cpp:1225
+#: mounthelper/tdeio_media_mounthelper.cpp:68
+#, fuzzy
+msgid "%1 is already mounted to %2."
+msgstr "Disponaĵo jam estas surmetita."
+
+#: 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 "Disponaĵo jam estas surmetita."
+
+#: 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 "Interna Eraro"
 
-#: mediamanager/halbackend.cpp:1718
+#: mediamanager/halbackend.cpp:1745
 #, fuzzy
 #| msgid "Unknown"
 msgid "Unknown error"
 msgstr "Nekonata"
 
-#: mediamanager/halbackend.cpp:1772
+#: mediamanager/halbackend.cpp:1799
 msgid "Unmounting failed due to the following error:"
 msgstr "La demeto malsuksecis pro la sekvanta eraro:"
 
-#: mediamanager/halbackend.cpp:1774
+#: mediamanager/halbackend.cpp:1801
 msgid "Device is Busy:"
 msgstr "Disponaĵo estas Okupata:"
 
-#: 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 ne estas surmetebla disponaĵo."
+
+#: mediamanager/halbackend.cpp:1868 mediamanager/tdehardwarebackend.cpp:1452
+#: mounthelper/tdeio_media_mounthelper.cpp:127
+#, fuzzy
+msgid "%1 is already unlocked."
+msgstr "Disponaĵo jam estas surmetita."
+
+#: 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 "Disponaĵo jam estas surmetita."
+
 #: 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 "Ebleco disponebla nur kun 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 "Ebleco disponebla nur kun 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 "Ebleco disponebla nur kun 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 "Demetebla Disponaĵo"
 
-#: mediamanager/tdehardwarebackend.cpp:529
+#: mediamanager/tdehardwarebackend.cpp:532
 #, fuzzy
 msgid "Blank CD-ROM"
 msgstr "Nurlegebla LD"
 
-#: 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 "Nurlegebla LD"
 
-#: mediamanager/tdehardwarebackend.cpp:682
+#: mediamanager/tdehardwarebackend.cpp:702
 #, fuzzy
 msgid "Blank BLURAY-R"
 msgstr "Nurlegebla LD"
 
-#: 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-Disko"
 
-#: 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. "
@@ -414,64 +462,95 @@ msgstr ""
 "devas aŭ fermi ilin aŭ ŝanĝi la kurantan dosierujon antaŭ ol vi povas demeti "
 "la disponaĵon."
 
-#: mounthelper/tdeio_media_mounthelper.cpp:79
-msgid "%1 cannot be found."
-msgstr "%1 ne povas esti trovita."
+#: mounthelper/tdeio_media_mounthelper.cpp:49
+#, fuzzy
+#| msgid "The TDE mediamanager is not running."
+msgid "The TDE mediamanager is not running.\n"
+msgstr "La TDE datumportila administrilo ne estas lanĉita."
 
-#: mounthelper/tdeio_media_mounthelper.cpp:87
-msgid "%1 is not a mountable media."
-msgstr "%1 ne estas surmetebla disponaĵo."
+#: 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 ne estas surmetebla disponaĵo."
+#: 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 "Disponaĵo jam estas surmetita."
-
-#: 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"
+#: mounthelper/tdeio_media_mounthelper.cpp:116
+msgid "Try to unlock an unknown medium."
 msgstr ""
-"La disponaĵo ja estis demetita, tamen la diskpleto ne povas esti malfermita"
 
-#: mounthelper/tdeio_media_mounthelper.cpp:248
-msgid "The device was successfully unmounted, but could not be ejected"
-msgstr "La disponaĵo ja estis demetita, tamen ne povis esti eligita"
+#: 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 "Nekonata"
+
+#: 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 ne povas esti trovita."
+
+#: mounthelper/tdeio_media_mounthelper.cpp:310
+#, fuzzy
+msgid "%1 is not a mountable or encrypted media."
+msgstr "%1 ne estas surmetebla disponaĵo."
+
+#: mounthelper/tdeio_media_mounthelper.cpp:397
+#, fuzzy
+#| msgid "Unknown"
+msgid "Unknown unlock error."
+msgstr "Nekonata"
+
+#: mounthelper/tdeio_media_mounthelper.cpp:410
 #, fuzzy
-msgid "Decrypt given URL"
+#| msgid "Unmount given URL"
+msgid "Mount given URL"
 msgstr "Demeti nomitan URL-on"
 
-#: mounthelper/tdeio_media_mounthelper.cpp:296
+#: mounthelper/tdeio_media_mounthelper.cpp:411
 msgid "Unmount given URL"
 msgstr "Demeti nomitan URL-on"
 
-#: mounthelper/tdeio_media_mounthelper.cpp:297
-msgid "Mount given URL (default)"
-msgstr "Surmeti nomitan URL-on (defaŭlta ago)"
+#: mounthelper/tdeio_media_mounthelper.cpp:412
+#, fuzzy
+#| msgid "Unmount given URL"
+msgid "Unlock given URL"
+msgstr "Demeti nomitan URL-on"
 
-#: mounthelper/tdeio_media_mounthelper.cpp:298
-msgid "Eject given URL via tdeeject"
-msgstr "Eligi nomitan URL-on per tdeeject"
+#: mounthelper/tdeio_media_mounthelper.cpp:413
+#, fuzzy
+msgid "Lock given URL"
+msgstr "Demeti nomitan URL-on"
 
-#: mounthelper/tdeio_media_mounthelper.cpp:299
-msgid "Unmount and Eject given URL (necessary for some USB devices)"
-msgstr "Demeti kaj Eligi nomitan URL-on (necesas por iom USB-datumportiloj)"
+#: mounthelper/tdeio_media_mounthelper.cpp:414
+#, fuzzy
+msgid "Eject given URL"
+msgstr "Demeti nomitan URL-on"
+
+#: 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:/ URL por surmeti/demeti/eligi/forigi"
 
 #: propsdlgplugin/propertiespage.cpp:137
@@ -620,7 +699,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
@@ -886,6 +965,24 @@ msgstr "Miksita"
 msgid "Filesystem: iso9660"
 msgstr "Dosiersistemo: iso9660"
 
+#~ msgid ""
+#~ "The device was successfully unmounted, but the tray could not be opened"
+#~ msgstr ""
+#~ "La disponaĵo ja estis demetita, tamen la diskpleto ne povas esti "
+#~ "malfermita"
+
+#~ msgid "The device was successfully unmounted, but could not be ejected"
+#~ msgstr "La disponaĵo ja estis demetita, tamen ne povis esti eligita"
+
+#~ msgid "Mount given URL (default)"
+#~ msgstr "Surmeti nomitan URL-on (defaŭlta ago)"
+
+#~ msgid "Eject given URL via tdeeject"
+#~ msgstr "Eligi nomitan URL-on per tdeeject"
+
+#~ msgid "Unmount and Eject given URL (necessary for some USB devices)"
+#~ msgstr "Demeti kaj Eligi nomitan URL-on (necesas por iom USB-datumportiloj)"
+
 #, fuzzy
 #~ msgid "Permission denied"
 #~ msgstr "Permesoj malpermesitaj"
diff --git a/tde-i18n-es/messages/tdebase/tdeio_media.po b/tde-i18n-es/messages/tdebase/tdeio_media.po
index 05232700240..28c25e1e90a 100644
--- a/tde-i18n-es/messages/tdebase/tdeio_media.po
+++ b/tde-i18n-es/messages/tdebase/tdeio_media.po
@@ -9,7 +9,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: 2020-05-11 19:22+0000\n"
 "Last-Translator: Sergio Ricardo Vicari <sercari@gmail.com>\n"
 "Language-Team: Spanish <https://mirror.git.trinitydesktop.org/weblate/"
@@ -49,27 +49,26 @@ msgstr "Abrir en una nueva ventana"
 msgid "Unknown"
 msgstr "Desconocido"
 
-#: 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 "El gestor de medios de TDE no está ejecutándose."
 
-#: mediaimpl.cpp:187
+#: mediaimpl.cpp:186
 msgid "This media name already exists."
 msgstr "El nombre de medio ya existe."
 
-#: mediaimpl.cpp:230 mediaimpl.cpp:297
+#: mediaimpl.cpp:229 mediaimpl.cpp:296
 msgid "No such medium."
 msgstr "No existe ese medio"
 
-#: mediaimpl.cpp:238
+#: mediaimpl.cpp:237
 msgid "The drive is encrypted."
 msgstr "La unidad está encriptada."
 
-#: 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 "Error de montaje desconocido."
 
@@ -84,103 +83,104 @@ 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 "No existe el medio: %1"
 
-#: mediamanager/fstabbackend.cpp:408
+#: mediamanager/fstabbackend.cpp:416
 msgid "CD Recorder"
 msgstr "Grabador de CD"
 
-#: mediamanager/fstabbackend.cpp:414
+#: mediamanager/fstabbackend.cpp:422
 msgid "DVD"
 msgstr "DVD"
 
-#: mediamanager/fstabbackend.cpp:427
+#: mediamanager/fstabbackend.cpp:435
 msgid "CD-ROM"
 msgstr "CD-ROM"
 
-#: mediamanager/fstabbackend.cpp:440
+#: mediamanager/fstabbackend.cpp:448
 msgid "Floppy"
 msgstr "Disquete"
 
-#: mediamanager/fstabbackend.cpp:448
+#: mediamanager/fstabbackend.cpp:456
 msgid "Zip Disk"
 msgstr "Disco Zip"
 
-#: mediamanager/fstabbackend.cpp:459
+#: mediamanager/fstabbackend.cpp:467
 msgid "Removable Device"
 msgstr "Dispositivo extraíble"
 
-#: mediamanager/fstabbackend.cpp:464 mediamanager/fstabbackend.cpp:470
+#: mediamanager/fstabbackend.cpp:472 mediamanager/fstabbackend.cpp:478
 msgid "Remote Share"
 msgstr "Recurso compartido remoto"
 
-#: mediamanager/fstabbackend.cpp:475
+#: mediamanager/fstabbackend.cpp:483
 msgid "Hard Disk"
 msgstr "Disco duro"
 
-#: mediamanager/halbackend.cpp:768 mediamanager/tdehardwarebackend.cpp:809
+#: mediamanager/halbackend.cpp:778 mediamanager/tdehardwarebackend.cpp:826
 msgid "Unknown Drive"
 msgstr "Unidad desconocida"
 
-#: mediamanager/halbackend.cpp:780 mediamanager/tdehardwarebackend.cpp:839
+#: mediamanager/halbackend.cpp:794 mediamanager/tdehardwarebackend.cpp:872
 msgid "Floppy Drive"
 msgstr "Disquetera"
 
-#: mediamanager/halbackend.cpp:788
+#: mediamanager/halbackend.cpp:802
 msgid "Zip Drive"
 msgstr "Unidad Zip"
 
-#: mediamanager/halbackend.cpp:858 mediamanager/tdehardwarebackend.cpp:896
+#: mediamanager/halbackend.cpp:877 mediamanager/tdehardwarebackend.cpp:930
 msgid "Camera"
 msgstr "Cámara"
 
-#: 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 "Error interno"
 
-#: mediamanager/halbackend.cpp:1303
+#: mediamanager/halbackend.cpp:1322
 msgid "Invalid filesystem type"
 msgstr "Tipo de sistema de archivos no válido"
 
-#: 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 "El dispositivo ya está montado."
 
-#: 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 "
@@ -190,16 +190,16 @@ msgstr ""
 "debajo. Tiene que elegirlos o cambiar su directorio de trabajo antes de "
 "intentar desmontar de nuevo el dispositivo."
 
-#: 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. "
@@ -207,209 +207,261 @@ msgstr ""
 "Desafortunadamente, el dispositivo <b>%1</b> (%2) denominado<b>'%3'</b> y "
 "actualmente montado en <b>%4</b> no se puede desmontar."
 
-#: 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 "El siguiente error fue devuelto por la orden 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 no es un medio que se pueda montar."
+
+#: mediamanager/halbackend.cpp:1497 mediamanager/tdehardwarebackend.cpp:1225
+#: mounthelper/tdeio_media_mounthelper.cpp:68
+#, fuzzy
+msgid "%1 is already mounted to %2."
+msgstr "El dispositivo ya está montado."
+
+#: 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 "El dispositivo ya está montado."
+
+#: 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 "Error interno"
 
-#: mediamanager/halbackend.cpp:1718
+#: mediamanager/halbackend.cpp:1745
 #, fuzzy
 #| msgid "Unknown"
 msgid "Unknown error"
 msgstr "Desconocido"
 
-#: mediamanager/halbackend.cpp:1772
+#: mediamanager/halbackend.cpp:1799
 msgid "Unmounting failed due to the following error:"
 msgstr "El desmontaje falló debido al siguiente error:"
 
-#: mediamanager/halbackend.cpp:1774
+#: mediamanager/halbackend.cpp:1801
 msgid "Device is Busy:"
 msgstr "El dispositivo está ocupado:"
 
-#: 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 no es un medio que se pueda montar."
+
+#: mediamanager/halbackend.cpp:1868 mediamanager/tdehardwarebackend.cpp:1452
+#: mounthelper/tdeio_media_mounthelper.cpp:127
+#, fuzzy
+msgid "%1 is already unlocked."
+msgstr "El dispositivo ya está montado."
+
+#: 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 "El dispositivo ya está montado."
+
 #: 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 "La función sólo está disponible con 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 "La función sólo está disponible con 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 "La función sólo está disponible con 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 "Dispositivo extraíble"
 
-#: mediamanager/tdehardwarebackend.cpp:529
+#: mediamanager/tdehardwarebackend.cpp:532
 #, fuzzy
 msgid "Blank CD-ROM"
 msgstr "CD-ROM"
 
-#: 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 "CD-ROM"
 
-#: mediamanager/tdehardwarebackend.cpp:682
+#: mediamanager/tdehardwarebackend.cpp:702
 #, fuzzy
 msgid "Blank BLURAY-R"
 msgstr "CD-ROM"
 
-#: 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 "Disco 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
-msgid "<p>Technical details:<br>"
-msgstr ""
-
 #: mediamanager/tdehardwarebackend.cpp:1285
-msgid "Decryption aborted"
+#: 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:1444
+#: mediamanager/tdehardwarebackend.cpp:1396
 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>"
+"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:1578
+#: mediamanager/tdehardwarebackend.cpp:1467
+#, fuzzy
+#| msgid "Decrypting Storage Device"
+msgid "Unable to unlock the device."
+msgstr "Descifrar dispositivo de almacenamiento"
+
+#: mediamanager/tdehardwarebackend.cpp:1516
+#, fuzzy
+#| msgid "Decrypting Storage Device"
+msgid "Unable to lock the device."
+msgstr "Descifrar dispositivo de almacenamiento"
+
+#: mediamanager/tdehardwarebackend.cpp:1623
 #, fuzzy
 msgid ""
 "Programs still using the device have been detected. They are listed below. "
@@ -420,65 +472,95 @@ msgstr ""
 "debajo. Tiene que elegirlos o cambiar su directorio de trabajo antes de "
 "intentar desmontar de nuevo el dispositivo."
 
-#: mounthelper/tdeio_media_mounthelper.cpp:79
-msgid "%1 cannot be found."
-msgstr "No se pudo encontrar %1."
+#: mounthelper/tdeio_media_mounthelper.cpp:49
+#, fuzzy
+#| msgid "The TDE mediamanager is not running."
+msgid "The TDE mediamanager is not running.\n"
+msgstr "El gestor de medios de TDE no está ejecutándose."
 
-#: mounthelper/tdeio_media_mounthelper.cpp:87
-msgid "%1 is not a mountable media."
-msgstr "%1 no es un medio que se pueda montar."
+#: 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 no es un medio que se pueda montar."
+#: 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 "El dispositivo ya está montado."
-
-#: 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"
+#: mounthelper/tdeio_media_mounthelper.cpp:116
+msgid "Try to unlock an unknown medium."
 msgstr ""
-"El dispositivo se desmontó correctamente, pero la bandeja no se pudo abrir"
 
-#: mounthelper/tdeio_media_mounthelper.cpp:248
-msgid "The device was successfully unmounted, but could not be ejected"
-msgstr "El dispositivo se desmontó correctamente, pero no se pudo expulsar"
+#: mounthelper/tdeio_media_mounthelper.cpp:148
+msgid "Try to lock an unknown medium."
+msgstr ""
+
+#: mounthelper/tdeio_media_mounthelper.cpp:173
+#, fuzzy
+#| msgid "Unknown mount error."
+msgid "Unknown lock error."
+msgstr "Error de montaje desconocido."
+
+#: mounthelper/tdeio_media_mounthelper.cpp:211
+msgid "Try to release holders from an unknown medium."
+msgstr ""
 
-#: mounthelper/tdeio_media_mounthelper.cpp:281
-msgid "Unknown decrypt error."
+#: 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 "No se pudo encontrar %1."
+
+#: mounthelper/tdeio_media_mounthelper.cpp:310
+#, fuzzy
+msgid "%1 is not a mountable or encrypted media."
+msgstr "%1 no es un medio que se pueda montar."
+
+#: mounthelper/tdeio_media_mounthelper.cpp:397
+#, fuzzy
+#| msgid "Unknown mount error."
+msgid "Unknown unlock error."
+msgstr "Error de montaje desconocido."
+
+#: mounthelper/tdeio_media_mounthelper.cpp:410
 #, fuzzy
-msgid "Decrypt given URL"
+#| msgid "Unmount given URL"
+msgid "Mount given URL"
 msgstr "Desmontar URL"
 
-#: mounthelper/tdeio_media_mounthelper.cpp:296
+#: mounthelper/tdeio_media_mounthelper.cpp:411
 msgid "Unmount given URL"
 msgstr "Desmontar URL"
 
-#: mounthelper/tdeio_media_mounthelper.cpp:297
-msgid "Mount given URL (default)"
-msgstr "Montar URL (predeterminado)"
+#: mounthelper/tdeio_media_mounthelper.cpp:412
+#, fuzzy
+#| msgid "Unmount given URL"
+msgid "Unlock given URL"
+msgstr "Desmontar URL"
+
+#: mounthelper/tdeio_media_mounthelper.cpp:413
+#, fuzzy
+msgid "Lock given URL"
+msgstr "Desmontar URL"
 
-#: mounthelper/tdeio_media_mounthelper.cpp:298
-msgid "Eject given URL via tdeeject"
-msgstr "Expulsar URL via tdeeject"
+#: mounthelper/tdeio_media_mounthelper.cpp:414
+#, fuzzy
+msgid "Eject given URL"
+msgstr "Desmontar URL"
 
-#: mounthelper/tdeio_media_mounthelper.cpp:299
-msgid "Unmount and Eject given URL (necessary for some USB devices)"
+#: mounthelper/tdeio_media_mounthelper.cpp:415
+msgid "Safely remove (unmount and eject) given URL"
 msgstr ""
-"Desmontar y expulsar la URL dada (necesario para algunos dispositivos USB)"
 
-#: 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:/ URL a montar/desmontar/expulsar/sacar"
 
 #: propsdlgplugin/propertiespage.cpp:137
@@ -636,13 +718,17 @@ msgid "&Password:"
 msgstr "&Contraseña:"
 
 #: mounthelper/unlockdialog.ui:109
-#, no-c-format
+#, fuzzy, no-c-format
+#| msgid ""
+#| "<p><b>%1</b> is an encrypted locked storage device.</p>\n"
+#| "<p>Please enter the password to unlock the storage device.</p>"
 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 ""
-"<p><b>%1</b> es un dispositivo de almacenamiento encriptado.</p>\n"
-"<p>Ingrese la contraseña para descifrar el dispositivo de almacenamiento.</p>"
+"<p><b>%1</b> es un dispositivo de almacenamiento bloqueado encriptado.</p>\n"
+"<p>Ingrese la contraseña para desbloquear el dispositivo de almacenamiento.</"
+"p>"
 
 #: propsdlgplugin/propertiespagegui.ui:16
 #, no-c-format
@@ -913,6 +999,32 @@ msgstr "Mixta"
 msgid "Filesystem: iso9660"
 msgstr "Sistema de archivos: iso9660"
 
+#~ msgid ""
+#~ "The device was successfully unmounted, but the tray could not be opened"
+#~ msgstr ""
+#~ "El dispositivo se desmontó correctamente, pero la bandeja no se pudo abrir"
+
+#~ msgid "The device was successfully unmounted, but could not be ejected"
+#~ msgstr "El dispositivo se desmontó correctamente, pero no se pudo expulsar"
+
+#~ msgid "Mount given URL (default)"
+#~ msgstr "Montar URL (predeterminado)"
+
+#~ msgid "Eject given URL via tdeeject"
+#~ msgstr "Expulsar URL via tdeeject"
+
+#~ msgid "Unmount and Eject given URL (necessary for some USB devices)"
+#~ msgstr ""
+#~ "Desmontar y expulsar la URL dada (necesario para algunos dispositivos USB)"
+
+#~ msgid ""
+#~ "<p><b>%1</b> is an encrypted storage device.</p>\n"
+#~ "<p>Please enter the password to decrypt the storage device.</p>"
+#~ msgstr ""
+#~ "<p><b>%1</b> es un dispositivo de almacenamiento encriptado.</p>\n"
+#~ "<p>Ingrese la contraseña para descifrar el dispositivo de almacenamiento."
+#~ "</p>"
+
 #, fuzzy
 #~ msgid "Permission denied"
 #~ msgstr "Permisos denegados"
diff --git a/tde-i18n-et/messages/tdebase/tdeio_media.po b/tde-i18n-et/messages/tdebase/tdeio_media.po
index 0cce8dadf77..3f89f4638ac 100644
--- a/tde-i18n-et/messages/tdebase/tdeio_media.po
+++ b/tde-i18n-et/messages/tdebase/tdeio_media.po
@@ -4,7 +4,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-11-25 16:29+0200\n"
 "Last-Translator: Marek Laane <bald@starman.ee>\n"
 "Language-Team: Estonian <kde-et@linux.ee>\n"
@@ -42,27 +42,26 @@ msgstr "Avamine uues aknas"
 msgid "Unknown"
 msgstr "Tundmatu"
 
-#: 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 andmekandjate haldur ei tööta."
 
-#: mediaimpl.cpp:187
+#: mediaimpl.cpp:186
 msgid "This media name already exists."
 msgstr "Sellise nimega andmekandja on juba olemas."
 
-#: mediaimpl.cpp:230 mediaimpl.cpp:297
+#: mediaimpl.cpp:229 mediaimpl.cpp:296
 msgid "No such medium."
 msgstr "Sellist andmekandjat pole."
 
-#: 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 ""
 
@@ -75,103 +74,104 @@ 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 "Sellist andmekandjat pole: %1"
 
-#: mediamanager/fstabbackend.cpp:408
+#: mediamanager/fstabbackend.cpp:416
 msgid "CD Recorder"
 msgstr "CD-kirjuti"
 
-#: mediamanager/fstabbackend.cpp:414
+#: mediamanager/fstabbackend.cpp:422
 msgid "DVD"
 msgstr "DVD"
 
-#: mediamanager/fstabbackend.cpp:427
+#: mediamanager/fstabbackend.cpp:435
 msgid "CD-ROM"
 msgstr "CD-ROM"
 
-#: mediamanager/fstabbackend.cpp:440
+#: mediamanager/fstabbackend.cpp:448
 msgid "Floppy"
 msgstr "Diskett"
 
-#: mediamanager/fstabbackend.cpp:448
+#: mediamanager/fstabbackend.cpp:456
 msgid "Zip Disk"
 msgstr "Zip-ketas"
 
-#: mediamanager/fstabbackend.cpp:459
+#: mediamanager/fstabbackend.cpp:467
 msgid "Removable Device"
 msgstr "Eemaldatav seade"
 
-#: mediamanager/fstabbackend.cpp:464 mediamanager/fstabbackend.cpp:470
+#: mediamanager/fstabbackend.cpp:472 mediamanager/fstabbackend.cpp:478
 msgid "Remote Share"
 msgstr "Võrguressurss"
 
-#: mediamanager/fstabbackend.cpp:475
+#: mediamanager/fstabbackend.cpp:483
 msgid "Hard Disk"
 msgstr "Kõvaketas"
 
-#: mediamanager/halbackend.cpp:768 mediamanager/tdehardwarebackend.cpp:809
+#: mediamanager/halbackend.cpp:778 mediamanager/tdehardwarebackend.cpp:826
 msgid "Unknown Drive"
 msgstr "Tundmatu seade"
 
-#: mediamanager/halbackend.cpp:780 mediamanager/tdehardwarebackend.cpp:839
+#: mediamanager/halbackend.cpp:794 mediamanager/tdehardwarebackend.cpp:872
 msgid "Floppy Drive"
 msgstr "Disketiseade"
 
-#: mediamanager/halbackend.cpp:788
+#: mediamanager/halbackend.cpp:802
 msgid "Zip Drive"
 msgstr "Zip-seade"
 
-#: mediamanager/halbackend.cpp:858 mediamanager/tdehardwarebackend.cpp:896
+#: mediamanager/halbackend.cpp:877 mediamanager/tdehardwarebackend.cpp:930
 msgid "Camera"
 msgstr "Kaamera"
 
-#: 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 "Sisemine viga"
 
-#: mediamanager/halbackend.cpp:1303
+#: mediamanager/halbackend.cpp:1322
 msgid "Invalid filesystem type"
 msgstr "Vigane failisüsteemi tüüp"
 
-#: 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 "Seade on juba ühendatud."
 
-#: 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 "
@@ -181,16 +181,16 @@ msgstr ""
 "allpool. Sul tuleb need sulgeda või muuta nende töökataloogi, enne kui "
 "proovid seadet uuesti lahutada."
 
-#: 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. "
@@ -198,209 +198,257 @@ msgstr ""
 "Kahjuks ei saa lahutada seadet <b>%1</b> (%2) nimega <b>'%3'</b>, mis on "
 "praegu ühendatud asukohta <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 "Käsk umount tagastas järgmise vea:"
 
-#: 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 ei ole ühendatav andmekandja."
+
+#: mediamanager/halbackend.cpp:1497 mediamanager/tdehardwarebackend.cpp:1225
+#: mounthelper/tdeio_media_mounthelper.cpp:68
+#, fuzzy
+msgid "%1 is already mounted to %2."
+msgstr "Seade on juba ühendatud."
+
+#: 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 "Seade on juba ühendatud."
+
+#: 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 "Sisemine viga"
 
-#: mediamanager/halbackend.cpp:1718
+#: mediamanager/halbackend.cpp:1745
 #, fuzzy
 #| msgid "Unknown"
 msgid "Unknown error"
 msgstr "Tundmatu"
 
-#: mediamanager/halbackend.cpp:1772
+#: mediamanager/halbackend.cpp:1799
 msgid "Unmounting failed due to the following error:"
 msgstr "Lahutamine ebaõnnestus järgmise vea tõttu:"
 
-#: mediamanager/halbackend.cpp:1774
+#: mediamanager/halbackend.cpp:1801
 msgid "Device is Busy:"
 msgstr "Seade on hõivatud"
 
-#: 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 ei ole ühendatav andmekandja."
+
+#: mediamanager/halbackend.cpp:1868 mediamanager/tdehardwarebackend.cpp:1452
+#: mounthelper/tdeio_media_mounthelper.cpp:127
+#, fuzzy
+msgid "%1 is already unlocked."
+msgstr "Seade on juba ühendatud."
+
+#: 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 "Seade on juba ühendatud."
+
 #: 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 "Seda omadust saab kasutada ainult HAL-i korral"
 
 #: 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 "Seda omadust saab kasutada ainult HAL-i korral"
 
 #: 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 "Seda omadust saab kasutada ainult HAL-i korral"
 
-#: 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 "Eemaldatav seade"
 
-#: mediamanager/tdehardwarebackend.cpp:529
+#: mediamanager/tdehardwarebackend.cpp:532
 #, fuzzy
 msgid "Blank CD-ROM"
 msgstr "CD-ROM"
 
-#: 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 "CD-ROM"
 
-#: mediamanager/tdehardwarebackend.cpp:682
+#: mediamanager/tdehardwarebackend.cpp:702
 #, fuzzy
 msgid "Blank BLURAY-R"
 msgstr "CD-ROM"
 
-#: 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-ketas"
 
-#: 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:1516
+msgid "Unable to lock the device."
 msgstr ""
 
-#: mediamanager/tdehardwarebackend.cpp:1578
+#: mediamanager/tdehardwarebackend.cpp:1623
 #, fuzzy
 msgid ""
 "Programs still using the device have been detected. They are listed below. "
@@ -411,63 +459,95 @@ msgstr ""
 "allpool. Sul tuleb need sulgeda või muuta nende töökataloogi, enne kui "
 "proovid seadet uuesti lahutada."
 
-#: mounthelper/tdeio_media_mounthelper.cpp:79
-msgid "%1 cannot be found."
-msgstr "%1 ei leitud."
+#: mounthelper/tdeio_media_mounthelper.cpp:49
+#, fuzzy
+#| msgid "The TDE mediamanager is not running."
+msgid "The TDE mediamanager is not running.\n"
+msgstr "TDE andmekandjate haldur ei tööta."
 
-#: mounthelper/tdeio_media_mounthelper.cpp:87
-msgid "%1 is not a mountable media."
-msgstr "%1 ei ole ühendatav andmekandja."
+#: 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 ei ole ühendatav andmekandja."
+#: 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 "Seade on juba ühendatud."
-
-#: 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 "Seade ühendati edukalt, aga sahtlit ei saa avada"
+#: mounthelper/tdeio_media_mounthelper.cpp:116
+msgid "Try to unlock an unknown medium."
+msgstr ""
+
+#: mounthelper/tdeio_media_mounthelper.cpp:148
+msgid "Try to lock an unknown medium."
+msgstr ""
+
+#: mounthelper/tdeio_media_mounthelper.cpp:173
+#, fuzzy
+#| msgid "Unknown"
+msgid "Unknown lock error."
+msgstr "Tundmatu"
 
-#: mounthelper/tdeio_media_mounthelper.cpp:248
-msgid "The device was successfully unmounted, but could not be ejected"
-msgstr "Seade lahutati edukalt, aga seda ei saa väljastada"
+#: mounthelper/tdeio_media_mounthelper.cpp:211
+msgid "Try to release holders from an unknown medium."
+msgstr ""
 
-#: mounthelper/tdeio_media_mounthelper.cpp:281
-msgid "Unknown decrypt error."
+#: 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 ei leitud."
+
+#: mounthelper/tdeio_media_mounthelper.cpp:310
+#, fuzzy
+msgid "%1 is not a mountable or encrypted media."
+msgstr "%1 ei ole ühendatav andmekandja."
+
+#: mounthelper/tdeio_media_mounthelper.cpp:397
 #, fuzzy
-msgid "Decrypt given URL"
+#| msgid "Unknown"
+msgid "Unknown unlock error."
+msgstr "Tundmatu"
+
+#: mounthelper/tdeio_media_mounthelper.cpp:410
+#, fuzzy
+#| msgid "Unmount given URL"
+msgid "Mount given URL"
 msgstr "Antud URL-i lahutamine"
 
-#: mounthelper/tdeio_media_mounthelper.cpp:296
+#: mounthelper/tdeio_media_mounthelper.cpp:411
 msgid "Unmount given URL"
 msgstr "Antud URL-i lahutamine"
 
-#: mounthelper/tdeio_media_mounthelper.cpp:297
-msgid "Mount given URL (default)"
-msgstr "Antud URL-i ühendamine (vaikimisi)"
+#: mounthelper/tdeio_media_mounthelper.cpp:412
+#, fuzzy
+#| msgid "Unmount given URL"
+msgid "Unlock given URL"
+msgstr "Antud URL-i lahutamine"
 
-#: mounthelper/tdeio_media_mounthelper.cpp:298
-msgid "Eject given URL via tdeeject"
-msgstr "Antud URL-i väljastamine tdeejectiga"
+#: mounthelper/tdeio_media_mounthelper.cpp:413
+#, fuzzy
+msgid "Lock given URL"
+msgstr "Antud URL-i lahutamine"
 
-#: mounthelper/tdeio_media_mounthelper.cpp:299
-msgid "Unmount and Eject given URL (necessary for some USB devices)"
-msgstr "Antud URL-i lahutamine ja väljastamine (vajalik mõne USB-seadme puhul)"
+#: mounthelper/tdeio_media_mounthelper.cpp:414
+#, fuzzy
+msgid "Eject given URL"
+msgstr "Antud URL-i lahutamine"
 
-#: mounthelper/tdeio_media_mounthelper.cpp:300
-msgid "media:/ URL to mount/unmount/eject/remove"
+#: mounthelper/tdeio_media_mounthelper.cpp:415
+msgid "Safely remove (unmount and eject) given URL"
+msgstr ""
+
+#: 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:/ URL ühendamiseks/lahutamiseks/väljastamiseks/eemaldamiseks"
 
 #: propsdlgplugin/propertiespage.cpp:137
@@ -616,7 +696,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
@@ -879,6 +959,23 @@ msgstr "Sega"
 msgid "Filesystem: iso9660"
 msgstr "Failisüsteem: iso9660"
 
+#~ msgid ""
+#~ "The device was successfully unmounted, but the tray could not be opened"
+#~ msgstr "Seade ühendati edukalt, aga sahtlit ei saa avada"
+
+#~ msgid "The device was successfully unmounted, but could not be ejected"
+#~ msgstr "Seade lahutati edukalt, aga seda ei saa väljastada"
+
+#~ msgid "Mount given URL (default)"
+#~ msgstr "Antud URL-i ühendamine (vaikimisi)"
+
+#~ msgid "Eject given URL via tdeeject"
+#~ msgstr "Antud URL-i väljastamine tdeejectiga"
+
+#~ msgid "Unmount and Eject given URL (necessary for some USB devices)"
+#~ msgstr ""
+#~ "Antud URL-i lahutamine ja väljastamine (vajalik mõne USB-seadme puhul)"
+
 #, fuzzy
 #~ msgid "Permission denied"
 #~ msgstr "Õigustest ei piisa"
diff --git a/tde-i18n-eu/messages/tdebase/tdeio_media.po b/tde-i18n-eu/messages/tdebase/tdeio_media.po
index 1e800c0c88f..037aa8333ee 100644
--- a/tde-i18n-eu/messages/tdebase/tdeio_media.po
+++ b/tde-i18n-eu/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: 2006-02-17 12:50+0100\n"
 "Last-Translator: marcos <marcos@euskalgnu.org>\n"
 "Language-Team: Basque <itzulpena@euskalgnu.org>\n"
@@ -44,27 +44,26 @@ msgstr "Ireki leiho berrian"
 msgid "Unknown"
 msgstr "Ezezaguna"
 
-#: 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 media kudeatzailea ez da abiarazi"
 
-#: mediaimpl.cpp:187
+#: mediaimpl.cpp:186
 msgid "This media name already exists."
 msgstr "Media izen hau lehendik dago."
 
-#: 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,389 +76,469 @@ 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 ""
 
-#: mediamanager/fstabbackend.cpp:408
+#: mediamanager/fstabbackend.cpp:416
 msgid "CD Recorder"
 msgstr "CD grabatzailea"
 
-#: mediamanager/fstabbackend.cpp:414
+#: mediamanager/fstabbackend.cpp:422
 msgid "DVD"
 msgstr "DVD"
 
-#: mediamanager/fstabbackend.cpp:427
+#: mediamanager/fstabbackend.cpp:435
 msgid "CD-ROM"
 msgstr "CD-ROM"
 
-#: mediamanager/fstabbackend.cpp:440
+#: mediamanager/fstabbackend.cpp:448
 msgid "Floppy"
 msgstr "Disketea"
 
-#: mediamanager/fstabbackend.cpp:448
+#: mediamanager/fstabbackend.cpp:456
 msgid "Zip Disk"
 msgstr "Zip diska"
 
-#: mediamanager/fstabbackend.cpp:459
+#: mediamanager/fstabbackend.cpp:467
 msgid "Removable Device"
 msgstr "Gailu aldagarria"
 
-#: mediamanager/fstabbackend.cpp:464 mediamanager/fstabbackend.cpp:470
+#: mediamanager/fstabbackend.cpp:472 mediamanager/fstabbackend.cpp:478
 msgid "Remote Share"
 msgstr "Urruneko partiketa"
 
-#: mediamanager/fstabbackend.cpp:475
+#: mediamanager/fstabbackend.cpp:483
 msgid "Hard Disk"
 msgstr "Diska gogorra"
 
-#: mediamanager/halbackend.cpp:768 mediamanager/tdehardwarebackend.cpp:809
+#: mediamanager/halbackend.cpp:778 mediamanager/tdehardwarebackend.cpp:826
 #, fuzzy
 msgid "Unknown Drive"
 msgstr "Ezezaguna"
 
-#: mediamanager/halbackend.cpp:780 mediamanager/tdehardwarebackend.cpp:839
+#: mediamanager/halbackend.cpp:794 mediamanager/tdehardwarebackend.cpp:872
 #, fuzzy
 msgid "Floppy Drive"
 msgstr "Disketea"
 
-#: mediamanager/halbackend.cpp:788
+#: mediamanager/halbackend.cpp:802
 #, fuzzy
 msgid "Zip Drive"
 msgstr "Zip diska"
 
-#: mediamanager/halbackend.cpp:858 mediamanager/tdehardwarebackend.cpp:896
+#: mediamanager/halbackend.cpp:877 mediamanager/tdehardwarebackend.cpp:930
 msgid "Camera"
 msgstr "Kamara"
 
-#: 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 "
 "before attempting to unmount the device again."
 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. "
 msgstr ""
 
-#: 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 ""
 
-#: 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 ezin da muntatu"
+
+#: mediamanager/halbackend.cpp:1497 mediamanager/tdehardwarebackend.cpp:1225
+#: mounthelper/tdeio_media_mounthelper.cpp:68
+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 not a mountable media."
+msgid "%1 is already unmounted."
+msgstr "%1 ezin da muntatu"
+
+#: 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
 msgid "Internal error"
 msgstr ""
 
-#: mediamanager/halbackend.cpp:1718
+#: mediamanager/halbackend.cpp:1745
 #, fuzzy
 #| msgid "Unknown"
 msgid "Unknown error"
 msgstr "Ezezaguna"
 
-#: 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 ezin da muntatu"
+
+#: mediamanager/halbackend.cpp:1868 mediamanager/tdehardwarebackend.cpp:1452
+#: mounthelper/tdeio_media_mounthelper.cpp:127
+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
+msgid "%1 is already locked."
+msgstr ""
+
 #: mediamanager/mediamanager.cpp:248 mediamanager/mediamanager.cpp:275
+#: mediamanager/mediamanager.cpp:302 mediamanager/mediamanager.cpp:329
 msgid "Feature only available with the TDE hardware backend"
 msgstr ""
 
 #: 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 ""
 
 #: mediamanager/mediamanager.cpp:262 mediamanager/mediamanager.cpp:289
-#: mediamanager/mediamanager.cpp:320 mediamanager/mediamanager.cpp:350
+#: mediamanager/mediamanager.cpp:316 mediamanager/mediamanager.cpp:343
 msgid "Feature only available with HAL or TDE hardware backend"
 msgstr ""
 
-#: 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 "Gailu aldagarria"
 
-#: mediamanager/tdehardwarebackend.cpp:529
+#: mediamanager/tdehardwarebackend.cpp:532
 #, fuzzy
 msgid "Blank CD-ROM"
 msgstr "CD-ROM"
 
-#: 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 "CD-ROM"
 
-#: mediamanager/tdehardwarebackend.cpp:682
+#: mediamanager/tdehardwarebackend.cpp:702
 #, fuzzy
 msgid "Blank BLURAY-R"
 msgstr "CD-ROM"
 
-#: 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 diska"
 
-#: 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
 msgid ""
 "Programs still using the device have been detected. They are listed below. "
 "You have to close them or change their working directory before attempting "
 "to unmount the device again."
 msgstr ""
 
-#: mounthelper/tdeio_media_mounthelper.cpp:79
-msgid "%1 cannot be found."
-msgstr "%1 ezin da aurkitu"
+#: mounthelper/tdeio_media_mounthelper.cpp:49
+#, fuzzy
+#| msgid "The TDE mediamanager is not running."
+msgid "The TDE mediamanager is not running.\n"
+msgstr "TDE media kudeatzailea ez da abiarazi"
 
-#: mounthelper/tdeio_media_mounthelper.cpp:87
-msgid "%1 is not a mountable media."
-msgstr "%1 ezin da muntatu"
+#: 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 ezin da muntatu"
+#: mounthelper/tdeio_media_mounthelper.cpp:87
+msgid "Try to unmount an unknown medium."
+msgstr ""
 
 #: mounthelper/tdeio_media_mounthelper.cpp:107
-msgid "%1 is already unlocked."
+msgid "Unknown unmount error."
 msgstr ""
 
-#: mounthelper/tdeio_media_mounthelper.cpp:139
-msgid "Unknown unmount error."
+#: mounthelper/tdeio_media_mounthelper.cpp:116
+msgid "Try to unlock an unknown medium."
 msgstr ""
 
-#: mounthelper/tdeio_media_mounthelper.cpp:246
-msgid "The device was successfully unmounted, but the tray could not be opened"
+#: mounthelper/tdeio_media_mounthelper.cpp:148
+msgid "Try to lock an unknown medium."
 msgstr ""
 
-#: mounthelper/tdeio_media_mounthelper.cpp:248
-msgid "The device was successfully unmounted, but could not be ejected"
+#: mounthelper/tdeio_media_mounthelper.cpp:173
+#, fuzzy
+#| msgid "Unknown"
+msgid "Unknown lock error."
+msgstr "Ezezaguna"
+
+#: mounthelper/tdeio_media_mounthelper.cpp:211
+msgid "Try to release holders from an unknown medium."
 msgstr ""
 
-#: mounthelper/tdeio_media_mounthelper.cpp:281
-msgid "Unknown decrypt error."
+#: 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 ezin da aurkitu"
+
+#: mounthelper/tdeio_media_mounthelper.cpp:310
+#, fuzzy
+msgid "%1 is not a mountable or encrypted media."
+msgstr "%1 ezin da muntatu"
+
+#: mounthelper/tdeio_media_mounthelper.cpp:397
+#, fuzzy
+#| msgid "Unknown"
+msgid "Unknown unlock error."
+msgstr "Ezezaguna"
+
+#: mounthelper/tdeio_media_mounthelper.cpp:410
 #, fuzzy
-msgid "Decrypt given URL"
+#| msgid "Unmount given URL"
+msgid "Mount given URL"
 msgstr "Desmuntatu emandako URLa"
 
-#: mounthelper/tdeio_media_mounthelper.cpp:296
+#: mounthelper/tdeio_media_mounthelper.cpp:411
 msgid "Unmount given URL"
 msgstr "Desmuntatu emandako URLa"
 
-#: mounthelper/tdeio_media_mounthelper.cpp:297
-msgid "Mount given URL (default)"
-msgstr "Muntatu emandako URLa (lehenetsia)"
+#: mounthelper/tdeio_media_mounthelper.cpp:412
+#, fuzzy
+#| msgid "Unmount given URL"
+msgid "Unlock given URL"
+msgstr "Desmuntatu emandako URLa"
 
-#: mounthelper/tdeio_media_mounthelper.cpp:298
-msgid "Eject given URL via tdeeject"
-msgstr "Kanporatu emandako URLa tdeeject-en bidez"
+#: mounthelper/tdeio_media_mounthelper.cpp:413
+#, fuzzy
+msgid "Lock given URL"
+msgstr "Desmuntatu emandako URLa"
 
-#: mounthelper/tdeio_media_mounthelper.cpp:299
-msgid "Unmount and Eject given URL (necessary for some USB devices)"
-msgstr "Desmuntatu eta egotzi emandako URLa (USB gailu batzuek behar dute hau)"
+#: mounthelper/tdeio_media_mounthelper.cpp:414
+#, fuzzy
+msgid "Eject given URL"
+msgstr "Desmuntatu emandako URLa"
+
+#: 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:/ montatu/desmonatu/egotzi/kentzeko URLa"
 
 #: propsdlgplugin/propertiespage.cpp:137
@@ -609,7 +688,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
@@ -829,6 +908,16 @@ msgstr ""
 msgid "Filesystem: iso9660"
 msgstr ""
 
+#~ msgid "Mount given URL (default)"
+#~ msgstr "Muntatu emandako URLa (lehenetsia)"
+
+#~ msgid "Eject given URL via tdeeject"
+#~ msgstr "Kanporatu emandako URLa tdeeject-en bidez"
+
+#~ msgid "Unmount and Eject given URL (necessary for some USB devices)"
+#~ msgstr ""
+#~ "Desmuntatu eta egotzi emandako URLa (USB gailu batzuek behar dute hau)"
+
 #~ msgid ""
 #~ "\n"
 #~ "Please check that the disk is entered correctly."
diff --git a/tde-i18n-fa/messages/tdebase/tdeio_media.po b/tde-i18n-fa/messages/tdebase/tdeio_media.po
index 58f95593102..ca97ea5449e 100644
--- a/tde-i18n-fa/messages/tdebase/tdeio_media.po
+++ b/tde-i18n-fa/messages/tdebase/tdeio_media.po
@@ -7,7 +7,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-02-04 11:04+0330\n"
 "Last-Translator: Nazanin Kazemi <kazemi@itland.ir>\n"
 "Language-Team: Persian <kde-i18n-fa@kde.org>\n"
@@ -46,27 +46,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 ""
 
@@ -79,106 +78,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 "دیسک فشرده"
 
-#: 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 "دیسک فشرده"
 
-#: 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 "
@@ -188,16 +188,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. "
@@ -205,209 +205,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 "خطای زیر با فرمان پیاده‌سازی بازگردانده شد:"
 
-#: 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 "دیسک فشرده"
 
-#: 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. "
@@ -418,64 +466,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:173
+#, fuzzy
+#| msgid "Unknown"
+msgid "Unknown lock error."
+msgstr "ناشناخته"
 
-#: mounthelper/tdeio_media_mounthelper.cpp:281
-msgid "Unknown decrypt error."
+#: mounthelper/tdeio_media_mounthelper.cpp:211
+msgid "Try to release holders from an unknown medium."
 msgstr ""
 
-#: mounthelper/tdeio_media_mounthelper.cpp:295
+#: mounthelper/tdeio_media_mounthelper.cpp:270
+msgid "Try to safe remove an unknown medium."
+msgstr ""
+
+#: mounthelper/tdeio_media_mounthelper.cpp:302
+msgid "%1 cannot be found."
+msgstr "%1 را نمی‌توان یافت."
+
+#: mounthelper/tdeio_media_mounthelper.cpp:310
 #, fuzzy
-msgid "Decrypt given URL"
+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 "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 "پس زدن نشانی وب داده‌شده از طریق 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)"
+#: 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
@@ -624,7 +703,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
@@ -889,6 +968,24 @@ 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 "پس زدن نشانی وب داده‌شده از طریق tdeeject"
+
+#~ msgid "Unmount and Eject given URL (necessary for some USB devices)"
+#~ msgstr ""
+#~ "پیاده کردن و پس زدن نشانی وب داده‌شده )لازم برای دستگاههای گذرگاه سریال "
+#~ "جهانی("
+
 #, fuzzy
 #~ msgid "Permission denied"
 #~ msgstr "مجوزها انکار شد"
diff --git a/tde-i18n-fi/messages/tdebase/tdeio_media.po b/tde-i18n-fi/messages/tdebase/tdeio_media.po
index fe5378db63a..42aab85ce80 100644
--- a/tde-i18n-fi/messages/tdebase/tdeio_media.po
+++ b/tde-i18n-fi/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: 2006-11-27 20:38+0200\n"
 "Last-Translator: Kim Enkovaara <kim.enkovaara@iki.fi>\n"
 "Language-Team: Finnish <kde-i18n-fi-discussion@lists.sourceforge.net>\n"
@@ -44,27 +44,26 @@ msgstr "Avaa uudessa ikkunassa"
 msgid "Unknown"
 msgstr "Tuntematon"
 
-#: 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 mediamanager ei ole käynnissä."
 
-#: mediaimpl.cpp:187
+#: mediaimpl.cpp:186
 msgid "This media name already exists."
 msgstr "Tämä tallennusvälinenimi on jo olemassa."
 
-#: mediaimpl.cpp:230 mediaimpl.cpp:297
+#: mediaimpl.cpp:229 mediaimpl.cpp:296
 msgid "No such medium."
 msgstr "Ei mediaa."
 
-#: 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 "Ei mediaa: %1"
 
-#: mediamanager/fstabbackend.cpp:408
+#: mediamanager/fstabbackend.cpp:416
 msgid "CD Recorder"
 msgstr "CD-äänittäjä"
 
-#: mediamanager/fstabbackend.cpp:414
+#: mediamanager/fstabbackend.cpp:422
 msgid "DVD"
 msgstr "DVD"
 
-#: mediamanager/fstabbackend.cpp:427
+#: mediamanager/fstabbackend.cpp:435
 msgid "CD-ROM"
 msgstr "CD-ROM"
 
-#: mediamanager/fstabbackend.cpp:440
+#: mediamanager/fstabbackend.cpp:448
 msgid "Floppy"
 msgstr "Levyke"
 
-#: mediamanager/fstabbackend.cpp:448
+#: mediamanager/fstabbackend.cpp:456
 msgid "Zip Disk"
 msgstr "Zip-levy"
 
-#: mediamanager/fstabbackend.cpp:459
+#: mediamanager/fstabbackend.cpp:467
 msgid "Removable Device"
 msgstr "Irroitettava laite"
 
-#: mediamanager/fstabbackend.cpp:464 mediamanager/fstabbackend.cpp:470
+#: mediamanager/fstabbackend.cpp:472 mediamanager/fstabbackend.cpp:478
 msgid "Remote Share"
 msgstr "Etäjakaminen"
 
-#: mediamanager/fstabbackend.cpp:475
+#: mediamanager/fstabbackend.cpp:483
 msgid "Hard Disk"
 msgstr "Kovalevy"
 
-#: mediamanager/halbackend.cpp:768 mediamanager/tdehardwarebackend.cpp:809
+#: mediamanager/halbackend.cpp:778 mediamanager/tdehardwarebackend.cpp:826
 #, fuzzy
 msgid "Unknown Drive"
 msgstr "Tuntematon"
 
-#: mediamanager/halbackend.cpp:780 mediamanager/tdehardwarebackend.cpp:839
+#: mediamanager/halbackend.cpp:794 mediamanager/tdehardwarebackend.cpp:872
 #, fuzzy
 msgid "Floppy Drive"
 msgstr "Levyke"
 
-#: mediamanager/halbackend.cpp:788
+#: mediamanager/halbackend.cpp:802
 #, fuzzy
 msgid "Zip Drive"
 msgstr "Zip-levy"
 
-#: mediamanager/halbackend.cpp:858 mediamanager/tdehardwarebackend.cpp:896
+#: mediamanager/halbackend.cpp:877 mediamanager/tdehardwarebackend.cpp:930
 msgid "Camera"
 msgstr "Kamera"
 
-#: 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 "Sisäinen virhe"
 
-#: mediamanager/halbackend.cpp:1303
+#: mediamanager/halbackend.cpp:1322
 msgid "Invalid filesystem type"
 msgstr "Epäkelpo tiedostojärjestelmän tyyppi"
 
-#: 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 "Laite on jo liitetty."
 
-#: 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 ""
 "listattu alla. Sinun pitää sulkea ohjelmat, tai vaihtaa niiden "
 "työhakemistoa, ennen kuin laite voidaan irroittaa."
 
-#: 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 ""
 "Valitettavasti laitetta <b>%1</b> (%2) nimeltään <b>'%3'</b> joka on "
 "liitetty pisteeseen <b>%4</b> ei voitu irrottaa. "
 
-#: 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-komento palautti seuraavan virheen:"
 
-#: 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 ei ole liitettävä media."
+
+#: mediamanager/halbackend.cpp:1497 mediamanager/tdehardwarebackend.cpp:1225
+#: mounthelper/tdeio_media_mounthelper.cpp:68
+#, fuzzy
+msgid "%1 is already mounted to %2."
+msgstr "Laite on jo liitetty."
+
+#: 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 "Laite on jo liitetty."
+
+#: 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 "Sisäinen virhe"
 
-#: mediamanager/halbackend.cpp:1718
+#: mediamanager/halbackend.cpp:1745
 #, fuzzy
 #| msgid "Unknown"
 msgid "Unknown error"
 msgstr "Tuntematon"
 
-#: mediamanager/halbackend.cpp:1772
+#: mediamanager/halbackend.cpp:1799
 msgid "Unmounting failed due to the following error:"
 msgstr "Irrottaminen epäonnistui, syy:"
 
-#: mediamanager/halbackend.cpp:1774
+#: mediamanager/halbackend.cpp:1801
 msgid "Device is Busy:"
 msgstr "Laite on varattu:"
 
-#: 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 ei ole liitettävä media."
+
+#: mediamanager/halbackend.cpp:1868 mediamanager/tdehardwarebackend.cpp:1452
+#: mounthelper/tdeio_media_mounthelper.cpp:127
+#, fuzzy
+msgid "%1 is already unlocked."
+msgstr "Laite on jo liitetty."
+
+#: 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 "Laite on jo liitetty."
+
 #: 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 "Toiminto on saatavilla vain, mikäli HAL on käytössä"
 
 #: 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 "Toiminto on saatavilla vain, mikäli HAL on käytössä"
 
 #: 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 "Toiminto on saatavilla vain, mikäli HAL on käytössä"
 
-#: 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 "Irroitettava laite"
 
-#: mediamanager/tdehardwarebackend.cpp:529
+#: mediamanager/tdehardwarebackend.cpp:532
 #, fuzzy
 msgid "Blank CD-ROM"
 msgstr "CD-ROM"
 
-#: 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 "CD-ROM"
 
-#: mediamanager/tdehardwarebackend.cpp:682
+#: mediamanager/tdehardwarebackend.cpp:702
 #, fuzzy
 msgid "Blank BLURAY-R"
 msgstr "CD-ROM"
 
-#: 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-levy"
 
-#: 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 ""
 "listattu alla. Sinun pitää sulkea ohjelmat, tai vaihtaa niiden "
 "työhakemistoa, ennen kuin laite voidaan irroittaa."
 
-#: mounthelper/tdeio_media_mounthelper.cpp:79
-msgid "%1 cannot be found."
-msgstr "%1 ei löydy."
+#: mounthelper/tdeio_media_mounthelper.cpp:49
+#, fuzzy
+#| msgid "The TDE mediamanager is not running."
+msgid "The TDE mediamanager is not running.\n"
+msgstr "TDE mediamanager ei ole käynnissä."
 
-#: mounthelper/tdeio_media_mounthelper.cpp:87
-msgid "%1 is not a mountable media."
-msgstr "%1 ei ole liitettävä media."
+#: 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 ei ole liitettävä media."
+#: 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 "Laite on jo liitetty."
-
-#: 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 "Laite on irrotettu, mutta kelkkaa ei voitu avata."
+#: mounthelper/tdeio_media_mounthelper.cpp:116
+msgid "Try to unlock an unknown medium."
+msgstr ""
+
+#: mounthelper/tdeio_media_mounthelper.cpp:148
+msgid "Try to lock an unknown medium."
+msgstr ""
+
+#: mounthelper/tdeio_media_mounthelper.cpp:173
+#, fuzzy
+#| msgid "Unknown"
+msgid "Unknown lock error."
+msgstr "Tuntematon"
 
-#: mounthelper/tdeio_media_mounthelper.cpp:248
-msgid "The device was successfully unmounted, but could not be ejected"
-msgstr "Laite on irrotettu, mutta mediaa ei voitu poistaa asemasta."
+#: mounthelper/tdeio_media_mounthelper.cpp:211
+msgid "Try to release holders from an unknown medium."
+msgstr ""
 
-#: mounthelper/tdeio_media_mounthelper.cpp:281
-msgid "Unknown decrypt error."
+#: 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 ei löydy."
+
+#: mounthelper/tdeio_media_mounthelper.cpp:310
 #, fuzzy
-msgid "Decrypt given URL"
+msgid "%1 is not a mountable or encrypted media."
+msgstr "%1 ei ole liitettävä media."
+
+#: mounthelper/tdeio_media_mounthelper.cpp:397
+#, fuzzy
+#| msgid "Unknown"
+msgid "Unknown unlock error."
+msgstr "Tuntematon"
+
+#: mounthelper/tdeio_media_mounthelper.cpp:410
+#, fuzzy
+#| msgid "Unmount given URL"
+msgid "Mount given URL"
 msgstr "Irroita annettu URL"
 
-#: mounthelper/tdeio_media_mounthelper.cpp:296
+#: mounthelper/tdeio_media_mounthelper.cpp:411
 msgid "Unmount given URL"
 msgstr "Irroita annettu URL"
 
-#: mounthelper/tdeio_media_mounthelper.cpp:297
-msgid "Mount given URL (default)"
-msgstr "Liitä annettu URL (oletus)"
+#: mounthelper/tdeio_media_mounthelper.cpp:412
+#, fuzzy
+#| msgid "Unmount given URL"
+msgid "Unlock given URL"
+msgstr "Irroita annettu URL"
 
-#: mounthelper/tdeio_media_mounthelper.cpp:298
-msgid "Eject given URL via tdeeject"
-msgstr "Poista annettu URL tdeejectillä"
+#: mounthelper/tdeio_media_mounthelper.cpp:413
+#, fuzzy
+msgid "Lock given URL"
+msgstr "Irroita annettu URL"
 
-#: mounthelper/tdeio_media_mounthelper.cpp:299
-msgid "Unmount and Eject given URL (necessary for some USB devices)"
-msgstr "Irroita ja poista annettu URL (tarpeen joillekin USB-laitteille)"
+#: mounthelper/tdeio_media_mounthelper.cpp:414
+#, fuzzy
+msgid "Eject given URL"
+msgstr "Irroita annettu URL"
 
-#: mounthelper/tdeio_media_mounthelper.cpp:300
-msgid "media:/ URL to mount/unmount/eject/remove"
+#: mounthelper/tdeio_media_mounthelper.cpp:415
+msgid "Safely remove (unmount and eject) given URL"
+msgstr ""
+
+#: 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:/liitettävä URL/irroitus/poisto (eject)/poisto"
 
 #: 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
@@ -888,6 +968,22 @@ msgstr "Sekalainen"
 msgid "Filesystem: iso9660"
 msgstr "Tiedostojärjestelmä: iso9660"
 
+#~ msgid ""
+#~ "The device was successfully unmounted, but the tray could not be opened"
+#~ msgstr "Laite on irrotettu, mutta kelkkaa ei voitu avata."
+
+#~ msgid "The device was successfully unmounted, but could not be ejected"
+#~ msgstr "Laite on irrotettu, mutta mediaa ei voitu poistaa asemasta."
+
+#~ msgid "Mount given URL (default)"
+#~ msgstr "Liitä annettu URL (oletus)"
+
+#~ msgid "Eject given URL via tdeeject"
+#~ msgstr "Poista annettu URL tdeejectillä"
+
+#~ msgid "Unmount and Eject given URL (necessary for some USB devices)"
+#~ msgstr "Irroita ja poista annettu URL (tarpeen joillekin USB-laitteille)"
+
 #, fuzzy
 #~ msgid "Permission denied"
 #~ msgstr "Ei oikeutta"
diff --git a/tde-i18n-fr/messages/tdebase/tdeio_media.po b/tde-i18n-fr/messages/tdebase/tdeio_media.po
index 5bb469653cb..e5fa1ac22f6 100644
--- a/tde-i18n-fr/messages/tdebase/tdeio_media.po
+++ b/tde-i18n-fr/messages/tdebase/tdeio_media.po
@@ -9,7 +9,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: 2008-08-05 16:46+0200\n"
 "Last-Translator: Pierre Buard <pierre.buard@gmail.com>\n"
 "Language-Team: Français <kde-francophone@kde.org>\n"
@@ -47,27 +47,26 @@ msgstr "Ouvrir dans une nouvelle fenêtre"
 msgid "Unknown"
 msgstr "Inconnu"
 
-#: 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 "Le gestionnaire de média de TDE n'est pas actif."
 
-#: mediaimpl.cpp:187
+#: mediaimpl.cpp:186
 msgid "This media name already exists."
 msgstr "Ce nom de média existe déjà."
 
-#: mediaimpl.cpp:230 mediaimpl.cpp:297
+#: mediaimpl.cpp:229 mediaimpl.cpp:296
 msgid "No such medium."
 msgstr "Support inexistant."
 
-#: 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 ""
 
@@ -80,103 +79,104 @@ 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 "Support inexistant : %1"
 
-#: mediamanager/fstabbackend.cpp:408
+#: mediamanager/fstabbackend.cpp:416
 msgid "CD Recorder"
 msgstr "Graveur de CD"
 
-#: mediamanager/fstabbackend.cpp:414
+#: mediamanager/fstabbackend.cpp:422
 msgid "DVD"
 msgstr "DVD"
 
-#: mediamanager/fstabbackend.cpp:427
+#: mediamanager/fstabbackend.cpp:435
 msgid "CD-ROM"
 msgstr "CD-ROM"
 
-#: mediamanager/fstabbackend.cpp:440
+#: mediamanager/fstabbackend.cpp:448
 msgid "Floppy"
 msgstr "Disquette"
 
-#: mediamanager/fstabbackend.cpp:448
+#: mediamanager/fstabbackend.cpp:456
 msgid "Zip Disk"
 msgstr "Disque Zip"
 
-#: mediamanager/fstabbackend.cpp:459
+#: mediamanager/fstabbackend.cpp:467
 msgid "Removable Device"
 msgstr "Périphérique amovible"
 
-#: mediamanager/fstabbackend.cpp:464 mediamanager/fstabbackend.cpp:470
+#: mediamanager/fstabbackend.cpp:472 mediamanager/fstabbackend.cpp:478
 msgid "Remote Share"
 msgstr "Partage distant"
 
-#: mediamanager/fstabbackend.cpp:475
+#: mediamanager/fstabbackend.cpp:483
 msgid "Hard Disk"
 msgstr "Disque dur"
 
-#: mediamanager/halbackend.cpp:768 mediamanager/tdehardwarebackend.cpp:809
+#: mediamanager/halbackend.cpp:778 mediamanager/tdehardwarebackend.cpp:826
 msgid "Unknown Drive"
 msgstr "Disque inconnu"
 
-#: mediamanager/halbackend.cpp:780 mediamanager/tdehardwarebackend.cpp:839
+#: mediamanager/halbackend.cpp:794 mediamanager/tdehardwarebackend.cpp:872
 msgid "Floppy Drive"
 msgstr "Lecteur de disquette"
 
-#: mediamanager/halbackend.cpp:788
+#: mediamanager/halbackend.cpp:802
 msgid "Zip Drive"
 msgstr "Disque Zip"
 
-#: mediamanager/halbackend.cpp:858 mediamanager/tdehardwarebackend.cpp:896
+#: mediamanager/halbackend.cpp:877 mediamanager/tdehardwarebackend.cpp:930
 msgid "Camera"
 msgstr "Appareil photo"
 
-#: 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 "Erreur interne"
 
-#: mediamanager/halbackend.cpp:1303
+#: mediamanager/halbackend.cpp:1322
 msgid "Invalid filesystem type"
 msgstr "Type de système de fichiers incorrect"
 
-#: 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 "Le périphérique est déjà monté."
 
-#: 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 ""
 "toujours le périphérique. Vous devez les fermer ou changer leur dossier de "
 "travail avant de libérer le périphérique."
 
-#: 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 ""
 "Malheureusement, le périphérique <b>%1</b> (%2) nommé <b>%3</b> et "
 "actuellement monté dans <b>%4</b> n'a pas pu être libéré."
 
-#: 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 "L'erreur suivante a été retournée par la commande de démontage :"
 
-#: 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 n'est pas un média montable."
+
+#: mediamanager/halbackend.cpp:1497 mediamanager/tdehardwarebackend.cpp:1225
+#: mounthelper/tdeio_media_mounthelper.cpp:68
+#, fuzzy
+msgid "%1 is already mounted to %2."
+msgstr "Le périphérique est déjà monté."
+
+#: 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 "Le périphérique est déjà monté."
+
+#: 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 "Erreur interne"
 
-#: mediamanager/halbackend.cpp:1718
+#: mediamanager/halbackend.cpp:1745
 #, fuzzy
 #| msgid "Unknown"
 msgid "Unknown error"
 msgstr "Inconnu"
 
-#: mediamanager/halbackend.cpp:1772
+#: mediamanager/halbackend.cpp:1799
 msgid "Unmounting failed due to the following error:"
 msgstr "Le démontage a échoué en raison de l'erreur suivante :"
 
-#: mediamanager/halbackend.cpp:1774
+#: mediamanager/halbackend.cpp:1801
 msgid "Device is Busy:"
 msgstr "Le périphérique est occupé :"
 
-#: 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 n'est pas un média montable."
+
+#: mediamanager/halbackend.cpp:1868 mediamanager/tdehardwarebackend.cpp:1452
+#: mounthelper/tdeio_media_mounthelper.cpp:127
+#, fuzzy
+msgid "%1 is already unlocked."
+msgstr "Le périphérique est déjà monté."
+
+#: 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 "Le périphérique est déjà monté."
+
 #: 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 "Fonction uniquement disponible avec 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 "Fonction uniquement disponible avec 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 "Fonction uniquement disponible avec 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 "Périphérique amovible"
 
-#: mediamanager/tdehardwarebackend.cpp:529
+#: mediamanager/tdehardwarebackend.cpp:532
 #, fuzzy
 msgid "Blank CD-ROM"
 msgstr "CD-ROM"
 
-#: 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 "CD-ROM"
 
-#: mediamanager/tdehardwarebackend.cpp:682
+#: mediamanager/tdehardwarebackend.cpp:702
 #, fuzzy
 msgid "Blank BLURAY-R"
 msgstr "CD-ROM"
 
-#: 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 "Disque 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:1516
+msgid "Unable to lock the device."
 msgstr ""
 
-#: mediamanager/tdehardwarebackend.cpp:1578
+#: mediamanager/tdehardwarebackend.cpp:1623
 #, fuzzy
 msgid ""
 "Programs still using the device have been detected. They are listed below. "
@@ -416,67 +464,95 @@ msgstr ""
 "toujours le périphérique. Vous devez les fermer ou changer leur dossier de "
 "travail avant de libérer le périphérique."
 
-#: mounthelper/tdeio_media_mounthelper.cpp:79
-msgid "%1 cannot be found."
-msgstr "%1 introuvable."
+#: mounthelper/tdeio_media_mounthelper.cpp:49
+#, fuzzy
+#| msgid "The TDE mediamanager is not running."
+msgid "The TDE mediamanager is not running.\n"
+msgstr "Le gestionnaire de média de TDE n'est pas actif."
 
-#: mounthelper/tdeio_media_mounthelper.cpp:87
-msgid "%1 is not a mountable media."
-msgstr "%1 n'est pas un média montable."
+#: 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 n'est pas un média montable."
+#: 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 "Le périphérique est déjà monté."
-
-#: 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"
+#: mounthelper/tdeio_media_mounthelper.cpp:116
+msgid "Try to unlock an unknown medium."
 msgstr ""
-"Le périphérique a été correctement libéré, mais le plateau n'a pas pu être "
-"ouvert."
 
-#: mounthelper/tdeio_media_mounthelper.cpp:248
-msgid "The device was successfully unmounted, but could not be ejected"
+#: mounthelper/tdeio_media_mounthelper.cpp:148
+msgid "Try to lock an unknown medium."
 msgstr ""
-"Le périphérique a été correctement libéré, mais n'a pas pu être retiré."
 
-#: mounthelper/tdeio_media_mounthelper.cpp:281
-msgid "Unknown decrypt error."
+#: mounthelper/tdeio_media_mounthelper.cpp:173
+#, fuzzy
+#| msgid "Unknown"
+msgid "Unknown lock error."
+msgstr "Inconnu"
+
+#: 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 introuvable."
+
+#: mounthelper/tdeio_media_mounthelper.cpp:310
 #, fuzzy
-msgid "Decrypt given URL"
+msgid "%1 is not a mountable or encrypted media."
+msgstr "%1 n'est pas un média montable."
+
+#: mounthelper/tdeio_media_mounthelper.cpp:397
+#, fuzzy
+#| msgid "Unknown"
+msgid "Unknown unlock error."
+msgstr "Inconnu"
+
+#: mounthelper/tdeio_media_mounthelper.cpp:410
+#, fuzzy
+#| msgid "Unmount given URL"
+msgid "Mount given URL"
 msgstr "Libérer l'URL indiquée"
 
-#: mounthelper/tdeio_media_mounthelper.cpp:296
+#: mounthelper/tdeio_media_mounthelper.cpp:411
 msgid "Unmount given URL"
 msgstr "Libérer l'URL indiquée"
 
-#: mounthelper/tdeio_media_mounthelper.cpp:297
-msgid "Mount given URL (default)"
-msgstr "Monter l'URL indiquée (par défaut)"
+#: mounthelper/tdeio_media_mounthelper.cpp:412
+#, fuzzy
+#| msgid "Unmount given URL"
+msgid "Unlock given URL"
+msgstr "Libérer l'URL indiquée"
+
+#: mounthelper/tdeio_media_mounthelper.cpp:413
+#, fuzzy
+msgid "Lock given URL"
+msgstr "Libérer l'URL indiquée"
 
-#: mounthelper/tdeio_media_mounthelper.cpp:298
-msgid "Eject given URL via tdeeject"
-msgstr "Retirer l'URL indiquée en utilisant tdeeject"
+#: mounthelper/tdeio_media_mounthelper.cpp:414
+#, fuzzy
+msgid "Eject given URL"
+msgstr "Libérer l'URL indiquée"
 
-#: mounthelper/tdeio_media_mounthelper.cpp:299
-msgid "Unmount and Eject given URL (necessary for some USB devices)"
+#: mounthelper/tdeio_media_mounthelper.cpp:415
+msgid "Safely remove (unmount and eject) given URL"
 msgstr ""
-"Libérer ou retirer l'URL donnée (nécessaire pour certains périphériques USB)"
 
-#: 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 "URL du « media:/ » à monter / libérer / retirer / supprimer"
 
 #: propsdlgplugin/propertiespage.cpp:137
@@ -625,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
@@ -893,6 +969,27 @@ msgstr "Mode mixte"
 msgid "Filesystem: iso9660"
 msgstr "Système de fichiers : iso9660"
 
+#~ msgid ""
+#~ "The device was successfully unmounted, but the tray could not be opened"
+#~ msgstr ""
+#~ "Le périphérique a été correctement libéré, mais le plateau n'a pas pu "
+#~ "être ouvert."
+
+#~ msgid "The device was successfully unmounted, but could not be ejected"
+#~ msgstr ""
+#~ "Le périphérique a été correctement libéré, mais n'a pas pu être retiré."
+
+#~ msgid "Mount given URL (default)"
+#~ msgstr "Monter l'URL indiquée (par défaut)"
+
+#~ msgid "Eject given URL via tdeeject"
+#~ msgstr "Retirer l'URL indiquée en utilisant tdeeject"
+
+#~ msgid "Unmount and Eject given URL (necessary for some USB devices)"
+#~ msgstr ""
+#~ "Libérer ou retirer l'URL donnée (nécessaire pour certains périphériques "
+#~ "USB)"
+
 #~ msgid "Decrypt"
 #~ msgstr "Décrypter"
 
diff --git a/tde-i18n-fy/messages/tdebase/tdeio_media.po b/tde-i18n-fy/messages/tdebase/tdeio_media.po
index 07e46703f27..38fdf2b93da 100644
--- a/tde-i18n-fy/messages/tdebase/tdeio_media.po
+++ b/tde-i18n-fy/messages/tdebase/tdeio_media.po
@@ -5,7 +5,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: 2006-12-20 16:24+0100\n"
 "Last-Translator: Berend Ytsma <berendy@bigfoot.com>\n"
 "Language-Team:  <nl@li.org>\n"
@@ -44,27 +44,26 @@ msgstr "Iepenje yn nij finster"
 msgid "Unknown"
 msgstr "Unbekend"
 
-#: 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 "De TDE-mediabehearder rint net"
 
-#: mediaimpl.cpp:187
+#: mediaimpl.cpp:186
 msgid "This media name already exists."
 msgstr "Dizze mediumnamme bestiet al."
 
-#: mediaimpl.cpp:230 mediaimpl.cpp:297
+#: mediaimpl.cpp:229 mediaimpl.cpp:296
 msgid "No such medium."
 msgstr "Net sa'n medium."
 
-#: 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 "Net sa'n medium: %1"
 
-#: mediamanager/fstabbackend.cpp:408
+#: mediamanager/fstabbackend.cpp:416
 msgid "CD Recorder"
 msgstr "kompaktskriuwskiif stasjon"
 
-#: mediamanager/fstabbackend.cpp:414
+#: mediamanager/fstabbackend.cpp:422
 msgid "DVD"
 msgstr "Dûbelskiif"
 
-#: mediamanager/fstabbackend.cpp:427
+#: mediamanager/fstabbackend.cpp:435
 msgid "CD-ROM"
 msgstr "Kompaktskiif"
 
-#: mediamanager/fstabbackend.cpp:440
+#: mediamanager/fstabbackend.cpp:448
 msgid "Floppy"
 msgstr "Slappe skiif"
 
-#: mediamanager/fstabbackend.cpp:448
+#: mediamanager/fstabbackend.cpp:456
 msgid "Zip Disk"
 msgstr "Zip-skiif"
 
-#: mediamanager/fstabbackend.cpp:459
+#: mediamanager/fstabbackend.cpp:467
 msgid "Removable Device"
 msgstr "Ferwiskselber apparaat"
 
-#: mediamanager/fstabbackend.cpp:464 mediamanager/fstabbackend.cpp:470
+#: mediamanager/fstabbackend.cpp:472 mediamanager/fstabbackend.cpp:478
 msgid "Remote Share"
 msgstr "Dielde boarne op ôfstân"
 
-#: mediamanager/fstabbackend.cpp:475
+#: mediamanager/fstabbackend.cpp:483
 msgid "Hard Disk"
 msgstr "Hurdeskiif"
 
-#: mediamanager/halbackend.cpp:768 mediamanager/tdehardwarebackend.cpp:809
+#: mediamanager/halbackend.cpp:778 mediamanager/tdehardwarebackend.cpp:826
 #, fuzzy
 msgid "Unknown Drive"
 msgstr "Unbekend"
 
-#: mediamanager/halbackend.cpp:780 mediamanager/tdehardwarebackend.cpp:839
+#: mediamanager/halbackend.cpp:794 mediamanager/tdehardwarebackend.cpp:872
 #, fuzzy
 msgid "Floppy Drive"
 msgstr "Slappe skiif"
 
-#: mediamanager/halbackend.cpp:788
+#: mediamanager/halbackend.cpp:802
 #, fuzzy
 msgid "Zip Drive"
 msgstr "Zip-skiif"
 
-#: mediamanager/halbackend.cpp:858 mediamanager/tdehardwarebackend.cpp:896
+#: mediamanager/halbackend.cpp:877 mediamanager/tdehardwarebackend.cpp:930
 msgid "Camera"
 msgstr "Kamera"
 
-#: 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 "Ynterne flater"
 
-#: mediamanager/halbackend.cpp:1303
+#: mediamanager/halbackend.cpp:1322
 msgid "Invalid filesystem type"
 msgstr "Unjildich triemsysteem type"
 
-#: 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 "Apparaat is al keppele"
 
-#: 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 ""
 "hjirûnder. Jo moatte se slute of har wurktafel feroareje foardat jo it "
 "apparaat wer keppelje."
 
-#: 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 ""
 "Spitigernôch, it apparaat <b>%1</b> (%2) neamd <b>'%3'</b> en no keppele op "
 "<b>%4</b> kin net ôfkeppele wurde."
 
-#: 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 "De neikommende flater kaam werom by it ôfkeppel kommando:"
 
-#: 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 is net in keppelber medium."
+
+#: mediamanager/halbackend.cpp:1497 mediamanager/tdehardwarebackend.cpp:1225
+#: mounthelper/tdeio_media_mounthelper.cpp:68
+#, fuzzy
+msgid "%1 is already mounted to %2."
+msgstr "Apparaat is al keppele"
+
+#: 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 "Apparaat is al keppele"
+
+#: 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 "Ynterne flater"
 
-#: mediamanager/halbackend.cpp:1718
+#: mediamanager/halbackend.cpp:1745
 #, fuzzy
 #| msgid "Unknown"
 msgid "Unknown error"
 msgstr "Unbekend"
 
-#: mediamanager/halbackend.cpp:1772
+#: mediamanager/halbackend.cpp:1799
 msgid "Unmounting failed due to the following error:"
 msgstr "Ofkeppeljen mislearre troch de neikommende flater:"
 
-#: mediamanager/halbackend.cpp:1774
+#: mediamanager/halbackend.cpp:1801
 msgid "Device is Busy:"
 msgstr "Apparaat is dwaande:"
 
-#: 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 is net in keppelber medium."
+
+#: mediamanager/halbackend.cpp:1868 mediamanager/tdehardwarebackend.cpp:1452
+#: mounthelper/tdeio_media_mounthelper.cpp:127
+#, fuzzy
+msgid "%1 is already unlocked."
+msgstr "Apparaat is al keppele"
+
+#: 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 "Apparaat is al keppele"
+
 #: 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 "Funskje allinne beskikber mei 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 "Funskje allinne beskikber mei 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 "Funskje allinne beskikber mei 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 "Ferwiskselber apparaat"
 
-#: mediamanager/tdehardwarebackend.cpp:529
+#: mediamanager/tdehardwarebackend.cpp:532
 #, fuzzy
 msgid "Blank CD-ROM"
 msgstr "Kompaktskiif"
 
-#: 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 "Kompaktskiif"
 
-#: mediamanager/tdehardwarebackend.cpp:682
+#: mediamanager/tdehardwarebackend.cpp:702
 #, fuzzy
 msgid "Blank BLURAY-R"
 msgstr "Kompaktskiif"
 
-#: 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-skiif"
 
-#: 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,66 +464,95 @@ msgstr ""
 "hjirûnder. Jo moatte se slute of har wurktafel feroareje foardat jo it "
 "apparaat wer keppelje."
 
-#: mounthelper/tdeio_media_mounthelper.cpp:79
-msgid "%1 cannot be found."
-msgstr "%1 is net fûn."
+#: mounthelper/tdeio_media_mounthelper.cpp:49
+#, fuzzy
+#| msgid "The TDE mediamanager is not running."
+msgid "The TDE mediamanager is not running.\n"
+msgstr "De TDE-mediabehearder rint net"
 
-#: mounthelper/tdeio_media_mounthelper.cpp:87
-msgid "%1 is not a mountable media."
-msgstr "%1 is net in keppelber medium."
+#: 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 is net in keppelber medium."
+#: 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 "Apparaat is al keppele"
-
-#: 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"
+#: mounthelper/tdeio_media_mounthelper.cpp:116
+msgid "Try to unlock an unknown medium."
+msgstr ""
+
+#: mounthelper/tdeio_media_mounthelper.cpp:148
+msgid "Try to lock an unknown medium."
 msgstr ""
-"It apparaat is mei sukses ôfkeppele, mar it systeemfak koe net iepene wurde"
 
-#: mounthelper/tdeio_media_mounthelper.cpp:248
-msgid "The device was successfully unmounted, but could not be ejected"
-msgstr "It apparaat is mei sukses ôfkeppele, mar koe net útsmiten wurde"
+#: mounthelper/tdeio_media_mounthelper.cpp:173
+#, fuzzy
+#| msgid "Unknown"
+msgid "Unknown lock error."
+msgstr "Unbekend"
 
-#: mounthelper/tdeio_media_mounthelper.cpp:281
-msgid "Unknown decrypt error."
+#: mounthelper/tdeio_media_mounthelper.cpp:211
+msgid "Try to release holders from an unknown medium."
 msgstr ""
 
-#: mounthelper/tdeio_media_mounthelper.cpp:295
+#: mounthelper/tdeio_media_mounthelper.cpp:270
+msgid "Try to safe remove an unknown medium."
+msgstr ""
+
+#: mounthelper/tdeio_media_mounthelper.cpp:302
+msgid "%1 cannot be found."
+msgstr "%1 is net fûn."
+
+#: mounthelper/tdeio_media_mounthelper.cpp:310
+#, fuzzy
+msgid "%1 is not a mountable or encrypted media."
+msgstr "%1 is net in keppelber medium."
+
+#: mounthelper/tdeio_media_mounthelper.cpp:397
 #, fuzzy
-msgid "Decrypt given URL"
+#| msgid "Unknown"
+msgid "Unknown unlock error."
+msgstr "Unbekend"
+
+#: mounthelper/tdeio_media_mounthelper.cpp:410
+#, fuzzy
+#| msgid "Unmount given URL"
+msgid "Mount given URL"
 msgstr "Opjûne URL-adres ôfkeppelje"
 
-#: mounthelper/tdeio_media_mounthelper.cpp:296
+#: mounthelper/tdeio_media_mounthelper.cpp:411
 msgid "Unmount given URL"
 msgstr "Opjûne URL-adres ôfkeppelje"
 
-#: mounthelper/tdeio_media_mounthelper.cpp:297
-msgid "Mount given URL (default)"
-msgstr "Opjûne URL-adres oankeppelje (standert)"
+#: mounthelper/tdeio_media_mounthelper.cpp:412
+#, fuzzy
+#| msgid "Unmount given URL"
+msgid "Unlock given URL"
+msgstr "Opjûne URL-adres ôfkeppelje"
 
-#: mounthelper/tdeio_media_mounthelper.cpp:298
-msgid "Eject given URL via tdeeject"
-msgstr "Opjûne URL-adres útsmite fia tdeeject"
+#: mounthelper/tdeio_media_mounthelper.cpp:413
+#, fuzzy
+msgid "Lock given URL"
+msgstr "Opjûne URL-adres ôfkeppelje"
+
+#: mounthelper/tdeio_media_mounthelper.cpp:414
+#, fuzzy
+msgid "Eject given URL"
+msgstr "Opjûne URL-adres ôfkeppelje"
 
-#: mounthelper/tdeio_media_mounthelper.cpp:299
-msgid "Unmount and Eject given URL (necessary for some USB devices)"
+#: mounthelper/tdeio_media_mounthelper.cpp:415
+msgid "Safely remove (unmount and eject) given URL"
 msgstr ""
-"Keppelt in opjûne URL-adres ôf en smyt dizze út(needsakelik by bepaalde USB-"
-"apparaten)"
 
-#: 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:/ URL-adres om oan te keppelje/út te smiten/fuort te smiten"
 
 #: propsdlgplugin/propertiespage.cpp:137
@@ -624,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
@@ -891,6 +968,26 @@ msgstr "Mingd"
 msgid "Filesystem: iso9660"
 msgstr "Triemsysteem: iso9660"
 
+#~ msgid ""
+#~ "The device was successfully unmounted, but the tray could not be opened"
+#~ msgstr ""
+#~ "It apparaat is mei sukses ôfkeppele, mar it systeemfak koe net iepene "
+#~ "wurde"
+
+#~ msgid "The device was successfully unmounted, but could not be ejected"
+#~ msgstr "It apparaat is mei sukses ôfkeppele, mar koe net útsmiten wurde"
+
+#~ msgid "Mount given URL (default)"
+#~ msgstr "Opjûne URL-adres oankeppelje (standert)"
+
+#~ msgid "Eject given URL via tdeeject"
+#~ msgstr "Opjûne URL-adres útsmite fia tdeeject"
+
+#~ msgid "Unmount and Eject given URL (necessary for some USB devices)"
+#~ msgstr ""
+#~ "Keppelt in opjûne URL-adres ôf en smyt dizze út(needsakelik by bepaalde "
+#~ "USB-apparaten)"
+
 #, fuzzy
 #~ msgid "Permission denied"
 #~ msgstr "Tagong wegere."
diff --git a/tde-i18n-ga/messages/tdebase/tdeio_media.po b/tde-i18n-ga/messages/tdebase/tdeio_media.po
index ccfb06e600e..00a35fe3019 100644
--- a/tde-i18n-ga/messages/tdebase/tdeio_media.po
+++ b/tde-i18n-ga/messages/tdebase/tdeio_media.po
@@ -1,7 +1,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: tdebase/tdeio_media.po\n"
-"POT-Creation-Date: 2020-09-09 18:58+0200\n"
+"POT-Creation-Date: 2020-10-17 08:51+0800\n"
 "PO-Revision-Date: 2004-12-03 14:52-0500\n"
 "Last-Translator: Kevin Patrick Scannell <scannell@SLU.EDU>\n"
 "Language-Team: ga <LL@li.org>\n"
@@ -38,27 +38,26 @@ msgstr "Oscail i bhFuinneog Nua"
 msgid "Unknown"
 msgstr "Anaithnid"
 
-#: 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 ""
 
-#: mediaimpl.cpp:187
+#: mediaimpl.cpp:186
 msgid "This media name already exists."
 msgstr "Tá an t-ainm meáin seo ann cheana."
 
-#: 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 ""
 
@@ -71,390 +70,466 @@ 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 ""
 
-#: mediamanager/fstabbackend.cpp:408
+#: mediamanager/fstabbackend.cpp:416
 msgid "CD Recorder"
 msgstr "Taifeadán CDanna"
 
-#: mediamanager/fstabbackend.cpp:414
+#: mediamanager/fstabbackend.cpp:422
 msgid "DVD"
 msgstr "DVD"
 
-#: mediamanager/fstabbackend.cpp:427
+#: mediamanager/fstabbackend.cpp:435
 msgid "CD-ROM"
 msgstr "CD-ROM"
 
-#: mediamanager/fstabbackend.cpp:440
+#: mediamanager/fstabbackend.cpp:448
 msgid "Floppy"
 msgstr "Diosca Flapach"
 
-#: mediamanager/fstabbackend.cpp:448
+#: mediamanager/fstabbackend.cpp:456
 msgid "Zip Disk"
 msgstr "Diosca Zip"
 
-#: mediamanager/fstabbackend.cpp:459
+#: mediamanager/fstabbackend.cpp:467
 msgid "Removable Device"
 msgstr "Gléas Inbhainte"
 
-#: mediamanager/fstabbackend.cpp:464 mediamanager/fstabbackend.cpp:470
+#: mediamanager/fstabbackend.cpp:472 mediamanager/fstabbackend.cpp:478
 msgid "Remote Share"
 msgstr "Comhroinnt Chianda"
 
-#: mediamanager/fstabbackend.cpp:475
+#: mediamanager/fstabbackend.cpp:483
 msgid "Hard Disk"
 msgstr "Diosca Crua"
 
-#: mediamanager/halbackend.cpp:768 mediamanager/tdehardwarebackend.cpp:809
+#: mediamanager/halbackend.cpp:778 mediamanager/tdehardwarebackend.cpp:826
 #, fuzzy
 msgid "Unknown Drive"
 msgstr "Anaithnid"
 
-#: mediamanager/halbackend.cpp:780 mediamanager/tdehardwarebackend.cpp:839
+#: mediamanager/halbackend.cpp:794 mediamanager/tdehardwarebackend.cpp:872
 #, fuzzy
 msgid "Floppy Drive"
 msgstr "Diosca Flapach"
 
-#: mediamanager/halbackend.cpp:788
+#: mediamanager/halbackend.cpp:802
 #, fuzzy
 msgid "Zip Drive"
 msgstr "Diosca Zip"
 
-#: mediamanager/halbackend.cpp:858 mediamanager/tdehardwarebackend.cpp:896
+#: mediamanager/halbackend.cpp:877 mediamanager/tdehardwarebackend.cpp:930
 msgid "Camera"
 msgstr "Ceamara"
 
-#: 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 "Earráid Inmheánach"
 
-#: 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 "
 "before attempting to unmount the device again."
 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. "
 msgstr ""
 
-#: 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 ""
 
-#: 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 "Níl %1 ina mheán infheistithe."
+
+#: mediamanager/halbackend.cpp:1497 mediamanager/tdehardwarebackend.cpp:1225
+#: mounthelper/tdeio_media_mounthelper.cpp:68
+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 not a mountable media."
+msgid "%1 is already unmounted."
+msgstr "Níl %1 ina mheán infheistithe."
+
+#: 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 "Earráid Inmheánach"
 
-#: mediamanager/halbackend.cpp:1718
+#: mediamanager/halbackend.cpp:1745
 #, fuzzy
 #| msgid "Unknown"
 msgid "Unknown error"
 msgstr "Anaithnid"
 
-#: 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 "Níl %1 ina mheán infheistithe."
+
+#: mediamanager/halbackend.cpp:1868 mediamanager/tdehardwarebackend.cpp:1452
+#: mounthelper/tdeio_media_mounthelper.cpp:127
+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
+msgid "%1 is already locked."
+msgstr ""
+
 #: mediamanager/mediamanager.cpp:248 mediamanager/mediamanager.cpp:275
+#: mediamanager/mediamanager.cpp:302 mediamanager/mediamanager.cpp:329
 msgid "Feature only available with the TDE hardware backend"
 msgstr ""
 
 #: 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 ""
 
 #: mediamanager/mediamanager.cpp:262 mediamanager/mediamanager.cpp:289
-#: mediamanager/mediamanager.cpp:320 mediamanager/mediamanager.cpp:350
+#: mediamanager/mediamanager.cpp:316 mediamanager/mediamanager.cpp:343
 msgid "Feature only available with HAL or TDE hardware backend"
 msgstr ""
 
-#: 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 "Gléas Inbhainte"
 
-#: mediamanager/tdehardwarebackend.cpp:529
+#: mediamanager/tdehardwarebackend.cpp:532
 #, fuzzy
 msgid "Blank CD-ROM"
 msgstr "CD-ROM"
 
-#: 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 "CD-ROM"
 
-#: mediamanager/tdehardwarebackend.cpp:682
+#: mediamanager/tdehardwarebackend.cpp:702
 #, fuzzy
 msgid "Blank BLURAY-R"
 msgstr "CD-ROM"
 
-#: 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 "Diosca 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
 msgid ""
 "Programs still using the device have been detected. They are listed below. "
 "You have to close them or change their working directory before attempting "
 "to unmount the device again."
 msgstr ""
 
-#: mounthelper/tdeio_media_mounthelper.cpp:79
-msgid "%1 cannot be found."
-msgstr "Níorbh fhéidir %1 a aimsiú."
+#: mounthelper/tdeio_media_mounthelper.cpp:49
+msgid "The TDE mediamanager is not running.\n"
+msgstr ""
 
-#: mounthelper/tdeio_media_mounthelper.cpp:87
-msgid "%1 is not a mountable media."
-msgstr "Níl %1 ina mheán infheistithe."
+#: 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 "Níl %1 ina mheán infheistithe."
+#: mounthelper/tdeio_media_mounthelper.cpp:87
+msgid "Try to unmount an unknown medium."
+msgstr ""
 
 #: mounthelper/tdeio_media_mounthelper.cpp:107
-msgid "%1 is already unlocked."
+msgid "Unknown unmount error."
 msgstr ""
 
-#: mounthelper/tdeio_media_mounthelper.cpp:139
-msgid "Unknown unmount error."
+#: mounthelper/tdeio_media_mounthelper.cpp:116
+msgid "Try to unlock an unknown medium."
 msgstr ""
 
-#: mounthelper/tdeio_media_mounthelper.cpp:246
-msgid "The device was successfully unmounted, but the tray could not be opened"
+#: mounthelper/tdeio_media_mounthelper.cpp:148
+msgid "Try to lock an unknown medium."
 msgstr ""
 
-#: mounthelper/tdeio_media_mounthelper.cpp:248
-msgid "The device was successfully unmounted, but could not be ejected"
+#: mounthelper/tdeio_media_mounthelper.cpp:173
+#, fuzzy
+#| msgid "Unknown"
+msgid "Unknown lock error."
+msgstr "Anaithnid"
+
+#: mounthelper/tdeio_media_mounthelper.cpp:211
+msgid "Try to release holders from an unknown medium."
 msgstr ""
 
-#: mounthelper/tdeio_media_mounthelper.cpp:281
-msgid "Unknown decrypt error."
+#: 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 "Níorbh fhéidir %1 a aimsiú."
+
+#: mounthelper/tdeio_media_mounthelper.cpp:310
 #, fuzzy
-msgid "Decrypt given URL"
+msgid "%1 is not a mountable or encrypted media."
+msgstr "Níl %1 ina mheán infheistithe."
+
+#: mounthelper/tdeio_media_mounthelper.cpp:397
+#, fuzzy
+#| msgid "Unknown"
+msgid "Unknown unlock error."
+msgstr "Anaithnid"
+
+#: mounthelper/tdeio_media_mounthelper.cpp:410
+#, fuzzy
+#| msgid "Unmount given URL"
+msgid "Mount given URL"
 msgstr "Dífheistigh an URL sonraithe"
 
-#: mounthelper/tdeio_media_mounthelper.cpp:296
+#: mounthelper/tdeio_media_mounthelper.cpp:411
 msgid "Unmount given URL"
 msgstr "Dífheistigh an URL sonraithe"
 
-#: mounthelper/tdeio_media_mounthelper.cpp:297
-msgid "Mount given URL (default)"
-msgstr "Feistigh an URL sonraithe (réamhshocrú)"
+#: mounthelper/tdeio_media_mounthelper.cpp:412
+#, fuzzy
+#| msgid "Unmount given URL"
+msgid "Unlock given URL"
+msgstr "Dífheistigh an URL sonraithe"
 
-#: mounthelper/tdeio_media_mounthelper.cpp:298
-msgid "Eject given URL via tdeeject"
-msgstr "Díchuir an URL sonraithe le tdeeject"
+#: mounthelper/tdeio_media_mounthelper.cpp:413
+#, fuzzy
+msgid "Lock given URL"
+msgstr "Dífheistigh an URL sonraithe"
+
+#: mounthelper/tdeio_media_mounthelper.cpp:414
+#, fuzzy
+msgid "Eject given URL"
+msgstr "Dífheistigh an URL sonraithe"
 
-#: mounthelper/tdeio_media_mounthelper.cpp:299
-msgid "Unmount and Eject given URL (necessary for some USB devices)"
+#: 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
+msgid "media:/URL to mount/unmount/unlock/lock/eject/remove"
 msgstr ""
 
 #: propsdlgplugin/propertiespage.cpp:137
@@ -603,7 +678,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
@@ -823,6 +898,12 @@ msgstr "Measctha"
 msgid "Filesystem: iso9660"
 msgstr ""
 
+#~ msgid "Mount given URL (default)"
+#~ msgstr "Feistigh an URL sonraithe (réamhshocrú)"
+
+#~ msgid "Eject given URL via tdeeject"
+#~ msgstr "Díchuir an URL sonraithe le tdeeject"
+
 #~ msgid ""
 #~ "\n"
 #~ "Please check that the disk is entered correctly."
diff --git a/tde-i18n-gl/messages/tdebase/tdeio_media.po b/tde-i18n-gl/messages/tdebase/tdeio_media.po
index 7e3271a7f1a..a317f560358 100644
--- a/tde-i18n-gl/messages/tdebase/tdeio_media.po
+++ b/tde-i18n-gl/messages/tdebase/tdeio_media.po
@@ -7,7 +7,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: 2006-05-24 00:07+0200\n"
 "Last-Translator: Xabi G. Feal <xabigf@gmx.net>\n"
 "Language-Team: Galician <trasno@ceu.fi.udc.es>\n"
@@ -45,27 +45,26 @@ msgstr "Abrir nunha Nova Fiestra"
 msgid "Unknown"
 msgstr "Descoñecido"
 
-#: 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 "O xestor de medios de TDE non se está a executar."
 
-#: mediaimpl.cpp:187
+#: mediaimpl.cpp:186
 msgid "This media name already exists."
 msgstr "Este nome do medio xa existe."
 
-#: 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 ""
 
@@ -78,390 +77,469 @@ 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 ""
 
-#: mediamanager/fstabbackend.cpp:408
+#: mediamanager/fstabbackend.cpp:416
 msgid "CD Recorder"
 msgstr "Grabadora de CD"
 
-#: mediamanager/fstabbackend.cpp:414
+#: mediamanager/fstabbackend.cpp:422
 msgid "DVD"
 msgstr "DVD"
 
-#: mediamanager/fstabbackend.cpp:427
+#: mediamanager/fstabbackend.cpp:435
 msgid "CD-ROM"
 msgstr "CD-ROM"
 
-#: mediamanager/fstabbackend.cpp:440
+#: mediamanager/fstabbackend.cpp:448
 msgid "Floppy"
 msgstr "Disquete"
 
-#: mediamanager/fstabbackend.cpp:448
+#: mediamanager/fstabbackend.cpp:456
 msgid "Zip Disk"
 msgstr "Disco Zip"
 
-#: mediamanager/fstabbackend.cpp:459
+#: mediamanager/fstabbackend.cpp:467
 msgid "Removable Device"
 msgstr "Dispositivo Extraíbel"
 
-#: mediamanager/fstabbackend.cpp:464 mediamanager/fstabbackend.cpp:470
+#: mediamanager/fstabbackend.cpp:472 mediamanager/fstabbackend.cpp:478
 msgid "Remote Share"
 msgstr "Compartición Remota"
 
-#: mediamanager/fstabbackend.cpp:475
+#: mediamanager/fstabbackend.cpp:483
 msgid "Hard Disk"
 msgstr "Disco Duro"
 
-#: mediamanager/halbackend.cpp:768 mediamanager/tdehardwarebackend.cpp:809
+#: mediamanager/halbackend.cpp:778 mediamanager/tdehardwarebackend.cpp:826
 #, fuzzy
 msgid "Unknown Drive"
 msgstr "Descoñecido"
 
-#: mediamanager/halbackend.cpp:780 mediamanager/tdehardwarebackend.cpp:839
+#: mediamanager/halbackend.cpp:794 mediamanager/tdehardwarebackend.cpp:872
 #, fuzzy
 msgid "Floppy Drive"
 msgstr "Disquete"
 
-#: mediamanager/halbackend.cpp:788
+#: mediamanager/halbackend.cpp:802
 #, fuzzy
 msgid "Zip Drive"
 msgstr "Disco Zip"
 
-#: mediamanager/halbackend.cpp:858 mediamanager/tdehardwarebackend.cpp:896
+#: mediamanager/halbackend.cpp:877 mediamanager/tdehardwarebackend.cpp:930
 msgid "Camera"
 msgstr "Cámara"
 
-#: 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 "
 "before attempting to unmount the device again."
 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. "
 msgstr ""
 
-#: 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 ""
 
-#: 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 non é un dispositivo montábel."
+
+#: mediamanager/halbackend.cpp:1497 mediamanager/tdehardwarebackend.cpp:1225
+#: mounthelper/tdeio_media_mounthelper.cpp:68
+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 not a mountable media."
+msgid "%1 is already unmounted."
+msgstr "%1 non é un dispositivo montábel."
+
+#: 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
 msgid "Internal error"
 msgstr ""
 
-#: mediamanager/halbackend.cpp:1718
+#: mediamanager/halbackend.cpp:1745
 #, fuzzy
 #| msgid "Unknown"
 msgid "Unknown error"
 msgstr "Descoñecido"
 
-#: 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 non é un dispositivo montábel."
+
+#: mediamanager/halbackend.cpp:1868 mediamanager/tdehardwarebackend.cpp:1452
+#: mounthelper/tdeio_media_mounthelper.cpp:127
+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
+msgid "%1 is already locked."
+msgstr ""
+
 #: mediamanager/mediamanager.cpp:248 mediamanager/mediamanager.cpp:275
+#: mediamanager/mediamanager.cpp:302 mediamanager/mediamanager.cpp:329
 msgid "Feature only available with the TDE hardware backend"
 msgstr ""
 
 #: 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 ""
 
 #: mediamanager/mediamanager.cpp:262 mediamanager/mediamanager.cpp:289
-#: mediamanager/mediamanager.cpp:320 mediamanager/mediamanager.cpp:350
+#: mediamanager/mediamanager.cpp:316 mediamanager/mediamanager.cpp:343
 msgid "Feature only available with HAL or TDE hardware backend"
 msgstr ""
 
-#: 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 "Dispositivo Extraíbel"
 
-#: mediamanager/tdehardwarebackend.cpp:529
+#: mediamanager/tdehardwarebackend.cpp:532
 #, fuzzy
 msgid "Blank CD-ROM"
 msgstr "CD-ROM"
 
-#: 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 "CD-ROM"
 
-#: mediamanager/tdehardwarebackend.cpp:682
+#: mediamanager/tdehardwarebackend.cpp:702
 #, fuzzy
 msgid "Blank BLURAY-R"
 msgstr "CD-ROM"
 
-#: 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 "Disco 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
 msgid ""
 "Programs still using the device have been detected. They are listed below. "
 "You have to close them or change their working directory before attempting "
 "to unmount the device again."
 msgstr ""
 
-#: mounthelper/tdeio_media_mounthelper.cpp:79
-msgid "%1 cannot be found."
-msgstr "%1 non se puido atopar."
+#: mounthelper/tdeio_media_mounthelper.cpp:49
+#, fuzzy
+#| msgid "The TDE mediamanager is not running."
+msgid "The TDE mediamanager is not running.\n"
+msgstr "O xestor de medios de TDE non se está a executar."
 
-#: mounthelper/tdeio_media_mounthelper.cpp:87
-msgid "%1 is not a mountable media."
-msgstr "%1 non é un dispositivo montábel."
+#: 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 non é un dispositivo montábel."
+#: mounthelper/tdeio_media_mounthelper.cpp:87
+msgid "Try to unmount an unknown medium."
+msgstr ""
 
 #: mounthelper/tdeio_media_mounthelper.cpp:107
-msgid "%1 is already unlocked."
+msgid "Unknown unmount error."
 msgstr ""
 
-#: mounthelper/tdeio_media_mounthelper.cpp:139
-msgid "Unknown unmount error."
+#: mounthelper/tdeio_media_mounthelper.cpp:116
+msgid "Try to unlock an unknown medium."
 msgstr ""
 
-#: mounthelper/tdeio_media_mounthelper.cpp:246
-msgid "The device was successfully unmounted, but the tray could not be opened"
+#: mounthelper/tdeio_media_mounthelper.cpp:148
+msgid "Try to lock an unknown medium."
 msgstr ""
 
-#: mounthelper/tdeio_media_mounthelper.cpp:248
-msgid "The device was successfully unmounted, but could not be ejected"
+#: mounthelper/tdeio_media_mounthelper.cpp:173
+#, fuzzy
+#| msgid "Unknown"
+msgid "Unknown lock error."
+msgstr "Descoñecido"
+
+#: mounthelper/tdeio_media_mounthelper.cpp:211
+msgid "Try to release holders from an unknown medium."
 msgstr ""
 
-#: mounthelper/tdeio_media_mounthelper.cpp:281
-msgid "Unknown decrypt error."
+#: 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 non se puido atopar."
+
+#: mounthelper/tdeio_media_mounthelper.cpp:310
 #, fuzzy
-msgid "Decrypt given URL"
+msgid "%1 is not a mountable or encrypted media."
+msgstr "%1 non é un dispositivo montábel."
+
+#: mounthelper/tdeio_media_mounthelper.cpp:397
+#, fuzzy
+#| msgid "Unknown"
+msgid "Unknown unlock error."
+msgstr "Descoñecido"
+
+#: mounthelper/tdeio_media_mounthelper.cpp:410
+#, fuzzy
+#| msgid "Unmount given URL"
+msgid "Mount given URL"
 msgstr "Desmontar a URL introducida"
 
-#: mounthelper/tdeio_media_mounthelper.cpp:296
+#: mounthelper/tdeio_media_mounthelper.cpp:411
 msgid "Unmount given URL"
 msgstr "Desmontar a URL introducida"
 
-#: mounthelper/tdeio_media_mounthelper.cpp:297
-msgid "Mount given URL (default)"
-msgstr "Montar a URL introducida (por defecto)"
+#: mounthelper/tdeio_media_mounthelper.cpp:412
+#, fuzzy
+#| msgid "Unmount given URL"
+msgid "Unlock given URL"
+msgstr "Desmontar a URL introducida"
+
+#: mounthelper/tdeio_media_mounthelper.cpp:413
+#, fuzzy
+msgid "Lock given URL"
+msgstr "Desmontar a URL introducida"
 
-#: mounthelper/tdeio_media_mounthelper.cpp:298
-msgid "Eject given URL via tdeeject"
-msgstr "Expulsar a URL introducida mediante tdeeject"
+#: mounthelper/tdeio_media_mounthelper.cpp:414
+#, fuzzy
+msgid "Eject given URL"
+msgstr "Desmontar a URL introducida"
 
-#: mounthelper/tdeio_media_mounthelper.cpp:299
-msgid "Unmount and Eject given URL (necessary for some USB devices)"
+#: mounthelper/tdeio_media_mounthelper.cpp:415
+msgid "Safely remove (unmount and eject) given URL"
 msgstr ""
-"Desmontar e Expulsar a URL fornecida (necesario para algúns dispositivos USB)"
 
-#: 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:/ URL para montar/desmontar/expulsar/borrar"
 
 #: propsdlgplugin/propertiespage.cpp:137
@@ -611,7 +689,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
@@ -831,6 +909,17 @@ msgstr ""
 msgid "Filesystem: iso9660"
 msgstr ""
 
+#~ msgid "Mount given URL (default)"
+#~ msgstr "Montar a URL introducida (por defecto)"
+
+#~ msgid "Eject given URL via tdeeject"
+#~ msgstr "Expulsar a URL introducida mediante tdeeject"
+
+#~ msgid "Unmount and Eject given URL (necessary for some USB devices)"
+#~ msgstr ""
+#~ "Desmontar e Expulsar a URL fornecida (necesario para algúns dispositivos "
+#~ "USB)"
+
 #~ msgid ""
 #~ "\n"
 #~ "Please check that the disk is entered correctly."
diff --git a/tde-i18n-he/messages/tdebase/tdeio_media.po b/tde-i18n-he/messages/tdebase/tdeio_media.po
index 6fe32f77d6f..aaae0a9b904 100644
--- a/tde-i18n-he/messages/tdebase/tdeio_media.po
+++ b/tde-i18n-he/messages/tdebase/tdeio_media.po
@@ -5,7 +5,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: 2006-10-12 21:07+0200\n"
 "Last-Translator: tahmar1900 <tahmar1900@gmail.com>\n"
 "Language-Team: hebrew <kde-il@yahoogroups.com>\n"
@@ -43,27 +43,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 ""
 
@@ -76,391 +75,470 @@ 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 ""
 
-#: mediamanager/fstabbackend.cpp:408
+#: mediamanager/fstabbackend.cpp:416
 msgid "CD Recorder"
 msgstr "צורב תקליטורים"
 
-#: mediamanager/fstabbackend.cpp:414
+#: mediamanager/fstabbackend.cpp:422
 msgid "DVD"
 msgstr "DVD"
 
-#: mediamanager/fstabbackend.cpp:427
+#: mediamanager/fstabbackend.cpp:435
 msgid "CD-ROM"
 msgstr "CD-ROM"
 
-#: 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 "
 "before attempting to unmount the device again."
 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. "
 msgstr ""
 
-#: 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 ""
 
-#: 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
 msgid "Feature only available with the TDE hardware backend"
 msgstr ""
 
 #: 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 ""
 
 #: mediamanager/mediamanager.cpp:262 mediamanager/mediamanager.cpp:289
-#: mediamanager/mediamanager.cpp:320 mediamanager/mediamanager.cpp:350
+#: mediamanager/mediamanager.cpp:316 mediamanager/mediamanager.cpp:343
 msgid "Feature only available with HAL or TDE hardware backend"
 msgstr ""
 
-#: 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 "CD-ROM"
 
-#: 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 "CD-ROM"
 
-#: mediamanager/tdehardwarebackend.cpp:682
+#: mediamanager/tdehardwarebackend.cpp:702
 #, fuzzy
 msgid "Blank BLURAY-R"
 msgstr "CD-ROM"
 
-#: 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
 msgid ""
 "Programs still using the device have been detected. They are listed below. "
 "You have to close them or change their working directory before attempting "
 "to unmount the device again."
 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"
+#: 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"
+#: mounthelper/tdeio_media_mounthelper.cpp:148
+msgid "Try to lock an unknown medium."
+msgstr ""
+
+#: 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:281
-msgid "Unknown decrypt error."
+#: 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 "בטל עגינת URL נתון"
 
-#: mounthelper/tdeio_media_mounthelper.cpp:296
+#: mounthelper/tdeio_media_mounthelper.cpp:411
 msgid "Unmount given URL"
 msgstr "בטל עגינת URL נתון"
 
-#: mounthelper/tdeio_media_mounthelper.cpp:297
-msgid "Mount given URL (default)"
-msgstr "עגון URL נתון (ברירת מחדל)"
+#: mounthelper/tdeio_media_mounthelper.cpp:412
+#, fuzzy
+#| msgid "Unmount given URL"
+msgid "Unlock given URL"
+msgstr "בטל עגינת URL נתון"
+
+#: mounthelper/tdeio_media_mounthelper.cpp:413
+#, fuzzy
+msgid "Lock given URL"
+msgstr "בטל עגינת URL נתון"
 
-#: mounthelper/tdeio_media_mounthelper.cpp:298
-msgid "Eject given URL via tdeeject"
-msgstr "הוצא URL נתון באמצעות tdeeject"
+#: mounthelper/tdeio_media_mounthelper.cpp:414
+#, fuzzy
+msgid "Eject given URL"
+msgstr "בטל עגינת URL נתון"
 
-#: 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: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
+msgid "media:/URL to mount/unmount/unlock/lock/eject/remove"
 msgstr ""
 
 #: propsdlgplugin/propertiespage.cpp:137
@@ -609,7 +687,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
@@ -831,6 +909,15 @@ msgstr "מעורב"
 msgid "Filesystem: iso9660"
 msgstr "מערכת קבצים:iso9660"
 
+#~ msgid "Mount given URL (default)"
+#~ msgstr "עגון URL נתון (ברירת מחדל)"
+
+#~ msgid "Eject given URL via tdeeject"
+#~ msgstr "הוצא URL נתון באמצעות tdeeject"
+
+#~ msgid "Unmount and Eject given URL (necessary for some USB devices)"
+#~ msgstr "בטל עגינה והוצא URL נתון (נחוץ עבור כמה התקני USB)"
+
 #~ msgid ""
 #~ "\n"
 #~ "Please check that the disk is entered correctly."
diff --git a/tde-i18n-hi/messages/tdebase/tdeio_media.po b/tde-i18n-hi/messages/tdebase/tdeio_media.po
index 075221c4b98..548f4244317 100644
--- a/tde-i18n-hi/messages/tdebase/tdeio_media.po
+++ b/tde-i18n-hi/messages/tdebase/tdeio_media.po
@@ -4,7 +4,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: 2005-01-03 12:53+0530\n"
 "Last-Translator: Ravishankar Shrivastava <raviratlami@gmail.com>\n"
 "Language-Team: indlinux-hindi <indlinux-hindi@lists.sourceforge.net>\n"
@@ -42,27 +42,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 "केडीई मीडिया प्रबंधक चल नहीं रहा है."
 
-#: 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 ""
 
@@ -75,387 +74,461 @@ 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 ""
 
-#: 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 "ज़िप डिस्क"
 
-#: 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
 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 "ज़िप डिस्क"
 
-#: 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 "
 "before attempting to unmount the device again."
 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. "
 msgstr ""
 
-#: 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 ""
 
-#: 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
+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 not a mountable media."
+msgid "%1 is already unmounted."
+msgstr "%1 माउन्ट किया जाने योग्य मीडिया नहीं है."
+
+#: 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
 msgid "Internal error"
 msgstr ""
 
-#: mediamanager/halbackend.cpp:1718
+#: mediamanager/halbackend.cpp:1745
 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
+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
+msgid "%1 is already locked."
+msgstr ""
+
 #: mediamanager/mediamanager.cpp:248 mediamanager/mediamanager.cpp:275
+#: mediamanager/mediamanager.cpp:302 mediamanager/mediamanager.cpp:329
 msgid "Feature only available with the TDE hardware backend"
 msgstr ""
 
 #: 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 ""
 
 #: mediamanager/mediamanager.cpp:262 mediamanager/mediamanager.cpp:289
-#: mediamanager/mediamanager.cpp:320 mediamanager/mediamanager.cpp:350
+#: mediamanager/mediamanager.cpp:316 mediamanager/mediamanager.cpp:343
 msgid "Feature only available with HAL or TDE hardware backend"
 msgstr ""
 
-#: 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 "ज़िप डिस्क"
 
-#: 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:1516
+msgid "Unable to lock the device."
 msgstr ""
 
-#: mediamanager/tdehardwarebackend.cpp:1578
+#: mediamanager/tdehardwarebackend.cpp:1623
 msgid ""
 "Programs still using the device have been detected. They are listed below. "
 "You have to close them or change their working directory before attempting "
 "to unmount the device again."
 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 "केडीई मीडिया प्रबंधक चल नहीं रहा है."
 
-#: 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
-msgid "%1 is already unlocked."
+msgid "Unknown unmount error."
 msgstr ""
 
-#: mounthelper/tdeio_media_mounthelper.cpp:139
-msgid "Unknown unmount error."
+#: mounthelper/tdeio_media_mounthelper.cpp:116
+msgid "Try to unlock an unknown medium."
+msgstr ""
+
+#: mounthelper/tdeio_media_mounthelper.cpp:148
+msgid "Try to lock an unknown medium."
+msgstr ""
+
+#: mounthelper/tdeio_media_mounthelper.cpp:173
+msgid "Unknown lock error."
 msgstr ""
 
-#: mounthelper/tdeio_media_mounthelper.cpp:246
-msgid "The device was successfully unmounted, but the tray could not be opened"
+#: mounthelper/tdeio_media_mounthelper.cpp:211
+msgid "Try to release holders from an unknown medium."
 msgstr ""
 
-#: mounthelper/tdeio_media_mounthelper.cpp:248
-msgid "The device was successfully unmounted, but could not be ejected"
+#: mounthelper/tdeio_media_mounthelper.cpp:270
+msgid "Try to safe remove an unknown medium."
 msgstr ""
 
-#: mounthelper/tdeio_media_mounthelper.cpp:281
-msgid "Unknown decrypt error."
+#: 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
+msgid "Unknown unlock error."
 msgstr ""
 
-#: mounthelper/tdeio_media_mounthelper.cpp:295
+#: 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 "tdeeject द्वारा दिए गए यूआरएल को बाहर करें"
+#: mounthelper/tdeio_media_mounthelper.cpp:413
+#, fuzzy
+msgid "Lock given URL"
+msgstr "दिए गए यूआरएल को अनमाउन्ट करें"
+
+#: mounthelper/tdeio_media_mounthelper.cpp:414
+#, fuzzy
+msgid "Eject given URL"
+msgstr "दिए गए यूआरएल को अनमाउन्ट करें"
 
-#: mounthelper/tdeio_media_mounthelper.cpp:299
-msgid "Unmount and Eject given URL (necessary for some USB devices)"
+#: mounthelper/tdeio_media_mounthelper.cpp:415
+msgid "Safely remove (unmount and eject) given URL"
 msgstr ""
 
-#: mounthelper/tdeio_media_mounthelper.cpp:300
+#: 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 "उपकरण:/ यूआरएल माउन्ट/अनमाउन्ट/बाहर हेतु."
 
 #: propsdlgplugin/propertiespage.cpp:137
@@ -605,7 +678,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
@@ -825,6 +898,12 @@ msgstr ""
 msgid "Filesystem: iso9660"
 msgstr ""
 
+#~ msgid "Mount given URL (default)"
+#~ msgstr "दिए गए यूआरएल को माउन्ट करें (डिफ़ॉल्ट)"
+
+#~ msgid "Eject given URL via tdeeject"
+#~ msgstr "tdeeject द्वारा दिए गए यूआरएल को बाहर करें"
+
 #~ msgid ""
 #~ "\n"
 #~ "Please check that the disk is entered correctly."
diff --git a/tde-i18n-hr/messages/tdebase/tdeio_media.po b/tde-i18n-hr/messages/tdebase/tdeio_media.po
index 88184e90748..2f6f21f6377 100644
--- a/tde-i18n-hr/messages/tdebase/tdeio_media.po
+++ b/tde-i18n-hr/messages/tdebase/tdeio_media.po
@@ -4,7 +4,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: tdeio_devices 0\n"
-"POT-Creation-Date: 2020-09-09 18:58+0200\n"
+"POT-Creation-Date: 2020-10-17 08:51+0800\n"
 "PO-Revision-Date: 2004-04-20 13:25+CEST\n"
 "Last-Translator: auto\n"
 "Language-Team: Croatian <lokalizacija@linux.hr>\n"
@@ -44,27 +44,26 @@ msgstr ""
 msgid "Unknown"
 msgstr "Napoznato"
 
-#: 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 ""
 
-#: 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,393 +76,467 @@ 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 ""
 
-#: mediamanager/fstabbackend.cpp:408
+#: mediamanager/fstabbackend.cpp:416
 msgid "CD Recorder"
 msgstr "CD Pržilica"
 
-#: mediamanager/fstabbackend.cpp:414
+#: mediamanager/fstabbackend.cpp:422
 msgid "DVD"
 msgstr "DVD"
 
-#: mediamanager/fstabbackend.cpp:427
+#: mediamanager/fstabbackend.cpp:435
 msgid "CD-ROM"
 msgstr "CD-ROM"
 
-#: mediamanager/fstabbackend.cpp:440
+#: mediamanager/fstabbackend.cpp:448
 msgid "Floppy"
 msgstr "Disketa"
 
-#: mediamanager/fstabbackend.cpp:448
+#: mediamanager/fstabbackend.cpp:456
 msgid "Zip Disk"
 msgstr "Zip Disk"
 
-#: 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 "Udaljeni resurs"
 
-#: mediamanager/fstabbackend.cpp:475
+#: mediamanager/fstabbackend.cpp:483
 #, fuzzy
 msgid "Hard Disk"
 msgstr "Hard disk"
 
-#: mediamanager/halbackend.cpp:768 mediamanager/tdehardwarebackend.cpp:809
+#: mediamanager/halbackend.cpp:778 mediamanager/tdehardwarebackend.cpp:826
 #, fuzzy
 msgid "Unknown Drive"
 msgstr "Napoznato"
 
-#: mediamanager/halbackend.cpp:780 mediamanager/tdehardwarebackend.cpp:839
+#: mediamanager/halbackend.cpp:794 mediamanager/tdehardwarebackend.cpp:872
 #, fuzzy
 msgid "Floppy Drive"
 msgstr "Disketa"
 
-#: mediamanager/halbackend.cpp:788
+#: mediamanager/halbackend.cpp:802
 #, fuzzy
 msgid "Zip Drive"
 msgstr "Zip Disk"
 
-#: 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
 #, fuzzy
 msgid "Device is already mounted."
 msgstr "Uređaj nije montiran"
 
-#: 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 "
 "before attempting to unmount the device again."
 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. "
 msgstr ""
 
-#: 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 ""
 
-#: 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 ""
+
+#: mediamanager/halbackend.cpp:1497 mediamanager/tdehardwarebackend.cpp:1225
+#: mounthelper/tdeio_media_mounthelper.cpp:68
+#, fuzzy
+msgid "%1 is already mounted to %2."
+msgstr "Uređaj nije montiran"
+
+#: 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 "Uređaj nije montiran"
+
+#: 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
 msgid "Internal error"
 msgstr ""
 
-#: mediamanager/halbackend.cpp:1718
+#: mediamanager/halbackend.cpp:1745
 #, fuzzy
 #| msgid "Unknown"
 msgid "Unknown error"
 msgstr "Napoznato"
 
-#: 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
+msgid "%1 is not an encrypted media."
+msgstr ""
+
+#: mediamanager/halbackend.cpp:1868 mediamanager/tdehardwarebackend.cpp:1452
+#: mounthelper/tdeio_media_mounthelper.cpp:127
+#, fuzzy
+msgid "%1 is already unlocked."
+msgstr "Uređaj nije montiran"
+
+#: 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 "Uređaj nije montiran"
+
 #: mediamanager/mediamanager.cpp:248 mediamanager/mediamanager.cpp:275
+#: mediamanager/mediamanager.cpp:302 mediamanager/mediamanager.cpp:329
 msgid "Feature only available with the TDE hardware backend"
 msgstr ""
 
 #: 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 ""
 
 #: mediamanager/mediamanager.cpp:262 mediamanager/mediamanager.cpp:289
-#: mediamanager/mediamanager.cpp:320 mediamanager/mediamanager.cpp:350
+#: mediamanager/mediamanager.cpp:316 mediamanager/mediamanager.cpp:343
 msgid "Feature only available with HAL or TDE hardware backend"
 msgstr ""
 
-#: mediamanager/tdehardwarebackend.cpp:484
-#: mediamanager/tdehardwarebackend.cpp:521
-#: mediamanager/tdehardwarebackend.cpp:754
+#: mediamanager/tdehardwarebackend.cpp:486
+#: mediamanager/tdehardwarebackend.cpp:523
+#: mediamanager/tdehardwarebackend.cpp:779
 msgid "%1 Removable Device"
 msgstr ""
 
-#: mediamanager/tdehardwarebackend.cpp:529
+#: mediamanager/tdehardwarebackend.cpp:532
 #, fuzzy
 msgid "Blank CD-ROM"
 msgstr "CD-ROM"
 
-#: 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 "CD-ROM"
 
-#: mediamanager/tdehardwarebackend.cpp:682
+#: mediamanager/tdehardwarebackend.cpp:702
 #, fuzzy
 msgid "Blank BLURAY-R"
 msgstr "CD-ROM"
 
-#: 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 Disk"
 
-#: 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
 msgid ""
 "Programs still using the device have been detected. They are listed below. "
 "You have to close them or change their working directory before attempting "
 "to unmount the device again."
 msgstr ""
 
-#: mounthelper/tdeio_media_mounthelper.cpp:79
-msgid "%1 cannot be found."
+#: mounthelper/tdeio_media_mounthelper.cpp:49
+msgid "The TDE mediamanager is not running.\n"
 msgstr ""
 
-#: mounthelper/tdeio_media_mounthelper.cpp:87
-msgid "%1 is not a mountable media."
+#: mounthelper/tdeio_media_mounthelper.cpp:59
+msgid "Try to mount an unknown medium."
 msgstr ""
 
-#: mounthelper/tdeio_media_mounthelper.cpp:101
-msgid "%1 is not an encrypted media."
+#: mounthelper/tdeio_media_mounthelper.cpp:87
+msgid "Try to unmount an unknown medium."
 msgstr ""
 
 #: mounthelper/tdeio_media_mounthelper.cpp:107
+msgid "Unknown unmount error."
+msgstr ""
+
+#: mounthelper/tdeio_media_mounthelper.cpp:116
+msgid "Try to unlock an unknown medium."
+msgstr ""
+
+#: mounthelper/tdeio_media_mounthelper.cpp:148
+msgid "Try to lock an unknown medium."
+msgstr ""
+
+#: mounthelper/tdeio_media_mounthelper.cpp:173
 #, fuzzy
-msgid "%1 is already unlocked."
-msgstr "Uređaj nije montiran"
+#| msgid "Unknown"
+msgid "Unknown lock error."
+msgstr "Napoznato"
 
-#: mounthelper/tdeio_media_mounthelper.cpp:139
-msgid "Unknown unmount error."
+#: 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:246
-msgid "The device was successfully unmounted, but the tray could not be opened"
+#: mounthelper/tdeio_media_mounthelper.cpp:302
+msgid "%1 cannot be found."
 msgstr ""
 
-#: mounthelper/tdeio_media_mounthelper.cpp:248
-msgid "The device was successfully unmounted, but could not be ejected"
+#: mounthelper/tdeio_media_mounthelper.cpp:310
+msgid "%1 is not a mountable or encrypted media."
 msgstr ""
 
-#: mounthelper/tdeio_media_mounthelper.cpp:281
+#: mounthelper/tdeio_media_mounthelper.cpp:397
 #, fuzzy
-#| msgid "Unknown device %1"
-msgid "Unknown decrypt error."
-msgstr "Nepoznati uređaj %1"
+#| msgid "Unknown"
+msgid "Unknown unlock error."
+msgstr "Napoznato"
 
-#: mounthelper/tdeio_media_mounthelper.cpp:295
+#: mounthelper/tdeio_media_mounthelper.cpp:410
 #, fuzzy
-msgid "Decrypt given URL"
+#| msgid "Unmount given URL"
+msgid "Mount given URL"
 msgstr "Demontiraj navedeni URL"
 
-#: mounthelper/tdeio_media_mounthelper.cpp:296
+#: mounthelper/tdeio_media_mounthelper.cpp:411
 msgid "Unmount given URL"
 msgstr "Demontiraj navedeni URL"
 
-#: mounthelper/tdeio_media_mounthelper.cpp:297
-msgid "Mount given URL (default)"
-msgstr "Montiraj navedeni URL (podrazumijevano)"
+#: mounthelper/tdeio_media_mounthelper.cpp:412
+#, fuzzy
+#| msgid "Unmount given URL"
+msgid "Unlock given URL"
+msgstr "Demontiraj navedeni URL"
 
-#: mounthelper/tdeio_media_mounthelper.cpp:298
-msgid "Eject given URL via tdeeject"
-msgstr "Izbaci navedeni URL preko tdeeject"
+#: mounthelper/tdeio_media_mounthelper.cpp:413
+#, fuzzy
+msgid "Lock given URL"
+msgstr "Demontiraj navedeni URL"
 
-#: mounthelper/tdeio_media_mounthelper.cpp:299
-msgid "Unmount and Eject given URL (necessary for some USB devices)"
+#: mounthelper/tdeio_media_mounthelper.cpp:414
+#, fuzzy
+msgid "Eject given URL"
+msgstr "Demontiraj navedeni URL"
+
+#: mounthelper/tdeio_media_mounthelper.cpp:415
+msgid "Safely remove (unmount and eject) given URL"
 msgstr ""
 
-#: mounthelper/tdeio_media_mounthelper.cpp:300
+#: 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 "uređaji:/ URL za montiranje/demontiranje/izbacivanje."
 
 #: propsdlgplugin/propertiespage.cpp:137
@@ -614,7 +687,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
@@ -834,6 +907,17 @@ msgstr ""
 msgid "Filesystem: iso9660"
 msgstr ""
 
+#, fuzzy
+#~| msgid "Unknown device %1"
+#~ msgid "Unknown decrypt error."
+#~ msgstr "Nepoznati uređaj %1"
+
+#~ msgid "Mount given URL (default)"
+#~ msgstr "Montiraj navedeni URL (podrazumijevano)"
+
+#~ msgid "Eject given URL via tdeeject"
+#~ msgstr "Izbaci navedeni URL preko tdeeject"
+
 #~ msgid ""
 #~ "\n"
 #~ "Please check that the disk is entered correctly."
diff --git a/tde-i18n-hu/messages/tdebase/tdeio_media.po b/tde-i18n-hu/messages/tdebase/tdeio_media.po
index fae25b3b970..7c3d7c3604c 100644
--- a/tde-i18n-hu/messages/tdebase/tdeio_media.po
+++ b/tde-i18n-hu/messages/tdebase/tdeio_media.po
@@ -4,7 +4,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: TDE 3.5\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-12-10 11:11+0100\n"
 "Last-Translator: Tamas Szanto <tszanto@interware.hu>\n"
 "Language-Team: Hungarian <kde-lista@sophia.jpte.hu>\n"
@@ -41,27 +41,26 @@ msgstr "Megnyitás új ablakban"
 msgid "Unknown"
 msgstr "Ismeretlen"
 
-#: 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 "A TDE médiakezelője nem fut."
 
-#: mediaimpl.cpp:187
+#: mediaimpl.cpp:186
 msgid "This media name already exists."
 msgstr "Már létezik ilyen nevű adathordozó."
 
-#: mediaimpl.cpp:230 mediaimpl.cpp:297
+#: mediaimpl.cpp:229 mediaimpl.cpp:296
 msgid "No such medium."
 msgstr "Nincs ilyen adathordozó."
 
-#: 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 ""
 
@@ -74,103 +73,104 @@ 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 "Nincs ilyen médium: %1"
 
-#: mediamanager/fstabbackend.cpp:408
+#: mediamanager/fstabbackend.cpp:416
 msgid "CD Recorder"
 msgstr "CD-író"
 
-#: mediamanager/fstabbackend.cpp:414
+#: mediamanager/fstabbackend.cpp:422
 msgid "DVD"
 msgstr "DVD"
 
-#: mediamanager/fstabbackend.cpp:427
+#: mediamanager/fstabbackend.cpp:435
 msgid "CD-ROM"
 msgstr "CD-meghajtó"
 
-#: mediamanager/fstabbackend.cpp:440
+#: mediamanager/fstabbackend.cpp:448
 msgid "Floppy"
 msgstr "Floppy"
 
-#: mediamanager/fstabbackend.cpp:448
+#: mediamanager/fstabbackend.cpp:456
 msgid "Zip Disk"
 msgstr "ZIP-lemez"
 
-#: mediamanager/fstabbackend.cpp:459
+#: mediamanager/fstabbackend.cpp:467
 msgid "Removable Device"
 msgstr "Cserélhető adathordozójú eszköz"
 
-#: mediamanager/fstabbackend.cpp:464 mediamanager/fstabbackend.cpp:470
+#: mediamanager/fstabbackend.cpp:472 mediamanager/fstabbackend.cpp:478
 msgid "Remote Share"
 msgstr "Távoli megosztás"
 
-#: mediamanager/fstabbackend.cpp:475
+#: mediamanager/fstabbackend.cpp:483
 msgid "Hard Disk"
 msgstr "Merevlemez"
 
-#: mediamanager/halbackend.cpp:768 mediamanager/tdehardwarebackend.cpp:809
+#: mediamanager/halbackend.cpp:778 mediamanager/tdehardwarebackend.cpp:826
 msgid "Unknown Drive"
 msgstr "Ismeretlen meghajtó"
 
-#: mediamanager/halbackend.cpp:780 mediamanager/tdehardwarebackend.cpp:839
+#: mediamanager/halbackend.cpp:794 mediamanager/tdehardwarebackend.cpp:872
 msgid "Floppy Drive"
 msgstr "Floppy"
 
-#: mediamanager/halbackend.cpp:788
+#: mediamanager/halbackend.cpp:802
 msgid "Zip Drive"
 msgstr "Zip-meghajtó"
 
-#: mediamanager/halbackend.cpp:858 mediamanager/tdehardwarebackend.cpp:896
+#: mediamanager/halbackend.cpp:877 mediamanager/tdehardwarebackend.cpp:930
 msgid "Camera"
 msgstr "Fényképezőgép"
 
-#: 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 "Belső hiba"
 
-#: mediamanager/halbackend.cpp:1303
+#: mediamanager/halbackend.cpp:1322
 msgid "Invalid filesystem type"
 msgstr "Érvénytelen fájlrendszer-típus"
 
-#: 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 "Az eszköz már fel van csatolva."
 
-#: 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 "
@@ -180,16 +180,16 @@ msgstr ""
 "vannak felsorolva). Zárja be őket vagy változtassa meg a munkakönyvtárukat, "
 "csak utána próbálja leválasztani az eszközt."
 
-#: 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. "
@@ -197,209 +197,257 @@ msgstr ""
 "A(z) <b>'%3'</b> nevű <b>%1</b> (%2) eszköz, melynek csatlakoztatási "
 "könyvtára <b>%4</b>, nem választható le. "
 
-#: 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 "Az alábbi hiba történt a leválasztási parancs kiadásakor:"
 
-#: 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 nem csatlakoztatható."
+
+#: mediamanager/halbackend.cpp:1497 mediamanager/tdehardwarebackend.cpp:1225
+#: mounthelper/tdeio_media_mounthelper.cpp:68
+#, fuzzy
+msgid "%1 is already mounted to %2."
+msgstr "Az eszköz már fel van csatolva."
+
+#: 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 "Az eszköz már fel van csatolva."
+
+#: 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 "Belső hiba"
 
-#: mediamanager/halbackend.cpp:1718
+#: mediamanager/halbackend.cpp:1745
 #, fuzzy
 #| msgid "Unknown"
 msgid "Unknown error"
 msgstr "Ismeretlen"
 
-#: mediamanager/halbackend.cpp:1772
+#: mediamanager/halbackend.cpp:1799
 msgid "Unmounting failed due to the following error:"
 msgstr "A leválasztás nem sikerült, a hiba oka:"
 
-#: mediamanager/halbackend.cpp:1774
+#: mediamanager/halbackend.cpp:1801
 msgid "Device is Busy:"
 msgstr "Az eszköz foglalt:"
 
-#: 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 nem csatlakoztatható."
+
+#: mediamanager/halbackend.cpp:1868 mediamanager/tdehardwarebackend.cpp:1452
+#: mounthelper/tdeio_media_mounthelper.cpp:127
+#, fuzzy
+msgid "%1 is already unlocked."
+msgstr "Az eszköz már fel van csatolva."
+
+#: 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 "Az eszköz már fel van csatolva."
+
 #: 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 "A funkció csak HAL-lal együtt használható"
 
 #: 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 "A funkció csak HAL-lal együtt használható"
 
 #: 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 "A funkció csak HAL-lal együtt használható"
 
-#: 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 "Cserélhető adathordozójú eszköz"
 
-#: mediamanager/tdehardwarebackend.cpp:529
+#: mediamanager/tdehardwarebackend.cpp:532
 #, fuzzy
 msgid "Blank CD-ROM"
 msgstr "CD-meghajtó"
 
-#: 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 "CD-meghajtó"
 
-#: mediamanager/tdehardwarebackend.cpp:682
+#: mediamanager/tdehardwarebackend.cpp:702
 #, fuzzy
 msgid "Blank BLURAY-R"
 msgstr "CD-meghajtó"
 
-#: 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-lemez"
 
-#: 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. "
@@ -410,64 +458,95 @@ msgstr ""
 "vannak felsorolva). Zárja be őket vagy változtassa meg a munkakönyvtárukat, "
 "csak utána próbálja leválasztani az eszközt."
 
-#: mounthelper/tdeio_media_mounthelper.cpp:79
-msgid "%1 cannot be found."
-msgstr "%1 nem található."
+#: mounthelper/tdeio_media_mounthelper.cpp:49
+#, fuzzy
+#| msgid "The TDE mediamanager is not running."
+msgid "The TDE mediamanager is not running.\n"
+msgstr "A TDE médiakezelője nem fut."
 
-#: mounthelper/tdeio_media_mounthelper.cpp:87
-msgid "%1 is not a mountable media."
-msgstr "%1 nem csatlakoztatható."
+#: 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 nem csatlakoztatható."
+#: 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 "Az eszköz már fel van csatolva."
-
-#: 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 "Az eszköz leválasztása sikerült, de a lemeztálca nem nyílt ki"
+#: 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 "Az eszköz leválasztása megtörtént, de a lemezt nem sikerült kilökni"
+#: mounthelper/tdeio_media_mounthelper.cpp:148
+msgid "Try to lock an unknown medium."
+msgstr ""
+
+#: mounthelper/tdeio_media_mounthelper.cpp:173
+#, fuzzy
+#| msgid "Unknown"
+msgid "Unknown lock error."
+msgstr "Ismeretlen"
 
-#: mounthelper/tdeio_media_mounthelper.cpp:281
-msgid "Unknown decrypt error."
+#: mounthelper/tdeio_media_mounthelper.cpp:211
+msgid "Try to release holders from an unknown medium."
 msgstr ""
 
-#: mounthelper/tdeio_media_mounthelper.cpp:295
+#: mounthelper/tdeio_media_mounthelper.cpp:270
+msgid "Try to safe remove an unknown medium."
+msgstr ""
+
+#: mounthelper/tdeio_media_mounthelper.cpp:302
+msgid "%1 cannot be found."
+msgstr "%1 nem található."
+
+#: mounthelper/tdeio_media_mounthelper.cpp:310
 #, fuzzy
-msgid "Decrypt given URL"
+msgid "%1 is not a mountable or encrypted media."
+msgstr "%1 nem csatlakoztatható."
+
+#: mounthelper/tdeio_media_mounthelper.cpp:397
+#, fuzzy
+#| msgid "Unknown"
+msgid "Unknown unlock error."
+msgstr "Ismeretlen"
+
+#: mounthelper/tdeio_media_mounthelper.cpp:410
+#, fuzzy
+#| msgid "Unmount given URL"
+msgid "Mount given URL"
 msgstr "Leválasztás (URL alapján)"
 
-#: mounthelper/tdeio_media_mounthelper.cpp:296
+#: mounthelper/tdeio_media_mounthelper.cpp:411
 msgid "Unmount given URL"
 msgstr "Leválasztás (URL alapján)"
 
-#: mounthelper/tdeio_media_mounthelper.cpp:297
-msgid "Mount given URL (default)"
-msgstr "Csatlakoztatás (URL alapján)"
+#: mounthelper/tdeio_media_mounthelper.cpp:412
+#, fuzzy
+#| msgid "Unmount given URL"
+msgid "Unlock given URL"
+msgstr "Leválasztás (URL alapján)"
 
-#: mounthelper/tdeio_media_mounthelper.cpp:298
-msgid "Eject given URL via tdeeject"
-msgstr "Adathordozó kiadása (URL alapján, a tdeeject-tel)"
+#: mounthelper/tdeio_media_mounthelper.cpp:413
+#, fuzzy
+msgid "Lock given URL"
+msgstr "Leválasztás (URL alapján)"
 
-#: mounthelper/tdeio_media_mounthelper.cpp:299
-msgid "Unmount and Eject given URL (necessary for some USB devices)"
+#: mounthelper/tdeio_media_mounthelper.cpp:414
+#, fuzzy
+msgid "Eject given URL"
+msgstr "Leválasztás (URL alapján)"
+
+#: mounthelper/tdeio_media_mounthelper.cpp:415
+msgid "Safely remove (unmount and eject) given URL"
 msgstr ""
-"Adott URL leválasztása és kiadása (bizonyos USB-s eszközökhöz szükséges)"
 
-#: 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:/ URL eszközök csatlakoztatáshoz/leválasztáshoz/kiadáshoz/"
 "eltávolításához"
@@ -618,7 +697,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
@@ -884,6 +963,23 @@ msgstr "Vegyes"
 msgid "Filesystem: iso9660"
 msgstr "Fájlrendszer: iso9660"
 
+#~ msgid ""
+#~ "The device was successfully unmounted, but the tray could not be opened"
+#~ msgstr "Az eszköz leválasztása sikerült, de a lemeztálca nem nyílt ki"
+
+#~ msgid "The device was successfully unmounted, but could not be ejected"
+#~ msgstr "Az eszköz leválasztása megtörtént, de a lemezt nem sikerült kilökni"
+
+#~ msgid "Mount given URL (default)"
+#~ msgstr "Csatlakoztatás (URL alapján)"
+
+#~ msgid "Eject given URL via tdeeject"
+#~ msgstr "Adathordozó kiadása (URL alapján, a tdeeject-tel)"
+
+#~ msgid "Unmount and Eject given URL (necessary for some USB devices)"
+#~ msgstr ""
+#~ "Adott URL leválasztása és kiadása (bizonyos USB-s eszközökhöz szükséges)"
+
 #, fuzzy
 #~ msgid "Permission denied"
 #~ msgstr "Hozzáférés megtagadva"
diff --git a/tde-i18n-is/messages/tdebase/tdeio_media.po b/tde-i18n-is/messages/tdebase/tdeio_media.po
index 7a090c581e3..e9725915505 100644
--- a/tde-i18n-is/messages/tdebase/tdeio_media.po
+++ b/tde-i18n-is/messages/tdebase/tdeio_media.po
@@ -5,7 +5,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: 2008-04-21 08:02+0000\n"
 "Last-Translator: Sveinn í Felli <sveinki@nett.is>\n"
 "Language-Team: Icelandic <kde-isl@molar.is>\n"
@@ -43,27 +43,26 @@ msgstr "Opna í nýjum glugga"
 msgid "Unknown"
 msgstr "Óþekkt"
 
-#: 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 miðilstjórinn er ekki keyrandi."
 
-#: mediaimpl.cpp:187
+#: mediaimpl.cpp:186
 msgid "This media name already exists."
 msgstr "Nafnið er þegar til."
 
-#: mediaimpl.cpp:230 mediaimpl.cpp:297
+#: mediaimpl.cpp:229 mediaimpl.cpp:296
 msgid "No such medium."
 msgstr "Enginn slikur miðill."
 
-#: 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 ""
 
@@ -76,103 +75,104 @@ 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 "Enginn slikur miðill: %1"
 
-#: mediamanager/fstabbackend.cpp:408
+#: mediamanager/fstabbackend.cpp:416
 msgid "CD Recorder"
 msgstr "CD brennari"
 
-#: mediamanager/fstabbackend.cpp:414
+#: mediamanager/fstabbackend.cpp:422
 msgid "DVD"
 msgstr "DVD"
 
-#: mediamanager/fstabbackend.cpp:427
+#: mediamanager/fstabbackend.cpp:435
 msgid "CD-ROM"
 msgstr "CD-ROM"
 
-#: mediamanager/fstabbackend.cpp:440
+#: mediamanager/fstabbackend.cpp:448
 msgid "Floppy"
 msgstr "Disklingadrif"
 
-#: mediamanager/fstabbackend.cpp:448
+#: mediamanager/fstabbackend.cpp:456
 msgid "Zip Disk"
 msgstr "Zip diskur"
 
-#: mediamanager/fstabbackend.cpp:459
+#: mediamanager/fstabbackend.cpp:467
 msgid "Removable Device"
 msgstr "Útskiptanlegt tæki"
 
-#: mediamanager/fstabbackend.cpp:464 mediamanager/fstabbackend.cpp:470
+#: mediamanager/fstabbackend.cpp:472 mediamanager/fstabbackend.cpp:478
 msgid "Remote Share"
 msgstr "Fjarlæg sameign"
 
-#: mediamanager/fstabbackend.cpp:475
+#: mediamanager/fstabbackend.cpp:483
 msgid "Hard Disk"
 msgstr "Harður diskur"
 
-#: mediamanager/halbackend.cpp:768 mediamanager/tdehardwarebackend.cpp:809
+#: mediamanager/halbackend.cpp:778 mediamanager/tdehardwarebackend.cpp:826
 msgid "Unknown Drive"
 msgstr "Óþekkt drif"
 
-#: mediamanager/halbackend.cpp:780 mediamanager/tdehardwarebackend.cpp:839
+#: mediamanager/halbackend.cpp:794 mediamanager/tdehardwarebackend.cpp:872
 msgid "Floppy Drive"
 msgstr "Disklingadrif"
 
-#: mediamanager/halbackend.cpp:788
+#: mediamanager/halbackend.cpp:802
 msgid "Zip Drive"
 msgstr "Zip drif"
 
-#: mediamanager/halbackend.cpp:858 mediamanager/tdehardwarebackend.cpp:896
+#: mediamanager/halbackend.cpp:877 mediamanager/tdehardwarebackend.cpp:930
 msgid "Camera"
 msgstr "Myndavél"
 
-#: 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 "Innri villa"
 
-#: mediamanager/halbackend.cpp:1303
+#: mediamanager/halbackend.cpp:1322
 msgid "Invalid filesystem type"
 msgstr "Ógild tegund skráarkerfis"
 
-#: 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 "Tækið er þegar tengt."
 
-#: 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 "
@@ -182,16 +182,16 @@ msgstr ""
 "upp hér að neðan. Þú ættir að loka þeim eða breyta vinnumöppu þeirra áður en "
 "þú reynir að aftengja tækið aftur."
 
-#: 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. "
@@ -199,209 +199,257 @@ msgstr ""
 "Því miður, ekki var unnt að aftengja tækið <b>%1</b> (%2) með heitinu "
 "<b>'%3'</b> sem tengt er á <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 "Eftirfarandi villa kom upp með aftengiskipuninni:"
 
-#: 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 er ekki tengjanlegur miðill."
+
+#: mediamanager/halbackend.cpp:1497 mediamanager/tdehardwarebackend.cpp:1225
+#: mounthelper/tdeio_media_mounthelper.cpp:68
+#, fuzzy
+msgid "%1 is already mounted to %2."
+msgstr "Tækið er þegar tengt."
+
+#: 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 "Tækið er þegar tengt."
+
+#: 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 "Innri villa"
 
-#: mediamanager/halbackend.cpp:1718
+#: mediamanager/halbackend.cpp:1745
 #, fuzzy
 #| msgid "Unknown"
 msgid "Unknown error"
 msgstr "Óþekkt"
 
-#: mediamanager/halbackend.cpp:1772
+#: mediamanager/halbackend.cpp:1799
 msgid "Unmounting failed due to the following error:"
 msgstr "Aftenging mistókst vegna eftirfarandi villu:"
 
-#: mediamanager/halbackend.cpp:1774
+#: mediamanager/halbackend.cpp:1801
 msgid "Device is Busy:"
 msgstr "Tækið er upptekið:"
 
-#: 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 er ekki tengjanlegur miðill."
+
+#: mediamanager/halbackend.cpp:1868 mediamanager/tdehardwarebackend.cpp:1452
+#: mounthelper/tdeio_media_mounthelper.cpp:127
+#, fuzzy
+msgid "%1 is already unlocked."
+msgstr "Tækið er þegar tengt."
+
+#: 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 "Tækið er þegar tengt."
+
 #: 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 "Aðgerð bara tiltæk með 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 "Aðgerð bara tiltæk með 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 "Aðgerð bara tiltæk með 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 "Útskiptanlegt tæki"
 
-#: mediamanager/tdehardwarebackend.cpp:529
+#: mediamanager/tdehardwarebackend.cpp:532
 #, fuzzy
 msgid "Blank CD-ROM"
 msgstr "CD-ROM"
 
-#: 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 "CD-ROM"
 
-#: mediamanager/tdehardwarebackend.cpp:682
+#: mediamanager/tdehardwarebackend.cpp:702
 #, fuzzy
 msgid "Blank BLURAY-R"
 msgstr "CD-ROM"
 
-#: 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 diskur"
 
-#: 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. "
@@ -412,63 +460,95 @@ msgstr ""
 "upp hér að neðan. Þú ættir að loka þeim eða breyta vinnumöppu þeirra áður en "
 "þú reynir að aftengja tækið aftur."
 
-#: mounthelper/tdeio_media_mounthelper.cpp:79
-msgid "%1 cannot be found."
-msgstr "%1 fannst ekki."
+#: mounthelper/tdeio_media_mounthelper.cpp:49
+#, fuzzy
+#| msgid "The TDE mediamanager is not running."
+msgid "The TDE mediamanager is not running.\n"
+msgstr "TDE miðilstjórinn er ekki keyrandi."
 
-#: mounthelper/tdeio_media_mounthelper.cpp:87
-msgid "%1 is not a mountable media."
-msgstr "%1 er ekki tengjanlegur miðill."
+#: 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 er ekki tengjanlegur miðill."
+#: 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 "Tækið er þegar tengt."
-
-#: 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 "Tækið var aftengt eðlilega, en ekki tókst að opna skúffu/bakka þess"
+#: 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 "Tækið var aftengt eðlilega, en ekki tókst að spýta út miðlinum"
+#: 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 "Óþekkt"
+
+#: 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 fannst ekki."
+
+#: mounthelper/tdeio_media_mounthelper.cpp:310
+#, fuzzy
+msgid "%1 is not a mountable or encrypted media."
+msgstr "%1 er ekki tengjanlegur miðill."
+
+#: mounthelper/tdeio_media_mounthelper.cpp:397
+#, fuzzy
+#| msgid "Unknown"
+msgid "Unknown unlock error."
+msgstr "Óþekkt"
+
+#: mounthelper/tdeio_media_mounthelper.cpp:410
 #, fuzzy
-msgid "Decrypt given URL"
+#| msgid "Unmount given URL"
+msgid "Mount given URL"
 msgstr "Aftengja slóðina"
 
-#: mounthelper/tdeio_media_mounthelper.cpp:296
+#: mounthelper/tdeio_media_mounthelper.cpp:411
 msgid "Unmount given URL"
 msgstr "Aftengja slóðina"
 
-#: mounthelper/tdeio_media_mounthelper.cpp:297
-msgid "Mount given URL (default)"
-msgstr "Tengja slóðina (sjálfgefið)"
+#: mounthelper/tdeio_media_mounthelper.cpp:412
+#, fuzzy
+#| msgid "Unmount given URL"
+msgid "Unlock given URL"
+msgstr "Aftengja slóðina"
 
-#: mounthelper/tdeio_media_mounthelper.cpp:298
-msgid "Eject given URL via tdeeject"
-msgstr "Henda út slóðinni með tdeeject"
+#: mounthelper/tdeio_media_mounthelper.cpp:413
+#, fuzzy
+msgid "Lock given URL"
+msgstr "Aftengja slóðina"
 
-#: mounthelper/tdeio_media_mounthelper.cpp:299
-msgid "Unmount and Eject given URL (necessary for some USB devices)"
-msgstr "Aftengja og henda út slóðinni (nauðsynlegt fyrir sum USB tæki)"
+#: mounthelper/tdeio_media_mounthelper.cpp:414
+#, fuzzy
+msgid "Eject given URL"
+msgstr "Aftengja slóðina"
+
+#: 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:/ slóð sem á að tengja/aftengja/henda út/fjarlægja"
 
 #: propsdlgplugin/propertiespage.cpp:137
@@ -617,7 +697,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
@@ -882,6 +962,22 @@ msgstr "Blandað"
 msgid "Filesystem: iso9660"
 msgstr "Skráarkerfi: iso9660"
 
+#~ msgid ""
+#~ "The device was successfully unmounted, but the tray could not be opened"
+#~ msgstr "Tækið var aftengt eðlilega, en ekki tókst að opna skúffu/bakka þess"
+
+#~ msgid "The device was successfully unmounted, but could not be ejected"
+#~ msgstr "Tækið var aftengt eðlilega, en ekki tókst að spýta út miðlinum"
+
+#~ msgid "Mount given URL (default)"
+#~ msgstr "Tengja slóðina (sjálfgefið)"
+
+#~ msgid "Eject given URL via tdeeject"
+#~ msgstr "Henda út slóðinni með tdeeject"
+
+#~ msgid "Unmount and Eject given URL (necessary for some USB devices)"
+#~ msgstr "Aftengja og henda út slóðinni (nauðsynlegt fyrir sum USB tæki)"
+
 #, fuzzy
 #~ msgid "Permission denied"
 #~ msgstr "Aðgangi hafnað"
diff --git a/tde-i18n-it/messages/tdebase/tdeio_media.po b/tde-i18n-it/messages/tdebase/tdeio_media.po
index 0c16740eb63..27a50c800cf 100644
--- a/tde-i18n-it/messages/tdebase/tdeio_media.po
+++ b/tde-i18n-it/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: 2008-02-05 15:18+0100\n"
 "Last-Translator: Dario Panico <Dareus_Persarumrex@fastwebnet.it>\n"
 "Language-Team: Italian <kde-i18n-it@kde.org>\n"
@@ -45,27 +45,26 @@ msgstr "Apri in una nuova finestra"
 msgid "Unknown"
 msgstr "Sconosciuto"
 
-#: 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 "Il gestore dei dispositivi di TDE non è in esecuzione."
 
-#: mediaimpl.cpp:187
+#: mediaimpl.cpp:186
 msgid "This media name already exists."
 msgstr "Il nome di questo supporto esiste già."
 
-#: mediaimpl.cpp:230 mediaimpl.cpp:297
+#: mediaimpl.cpp:229 mediaimpl.cpp:296
 msgid "No such medium."
 msgstr "Nessun supporto di questo tipo."
 
-#: 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 ""
 
@@ -78,103 +77,104 @@ 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 "Nessun supporto di questo tipo: %1"
 
-#: mediamanager/fstabbackend.cpp:408
+#: mediamanager/fstabbackend.cpp:416
 msgid "CD Recorder"
 msgstr "Masterizzatore CD"
 
-#: mediamanager/fstabbackend.cpp:414
+#: mediamanager/fstabbackend.cpp:422
 msgid "DVD"
 msgstr "DVD"
 
-#: mediamanager/fstabbackend.cpp:427
+#: mediamanager/fstabbackend.cpp:435
 msgid "CD-ROM"
 msgstr "Lettore CD"
 
-#: mediamanager/fstabbackend.cpp:440
+#: mediamanager/fstabbackend.cpp:448
 msgid "Floppy"
 msgstr "Dischetto"
 
-#: mediamanager/fstabbackend.cpp:448
+#: mediamanager/fstabbackend.cpp:456
 msgid "Zip Disk"
 msgstr "Disco Zip"
 
-#: mediamanager/fstabbackend.cpp:459
+#: mediamanager/fstabbackend.cpp:467
 msgid "Removable Device"
 msgstr "Disco rimovibile"
 
-#: mediamanager/fstabbackend.cpp:464 mediamanager/fstabbackend.cpp:470
+#: mediamanager/fstabbackend.cpp:472 mediamanager/fstabbackend.cpp:478
 msgid "Remote Share"
 msgstr "Condivisione remota"
 
-#: mediamanager/fstabbackend.cpp:475
+#: mediamanager/fstabbackend.cpp:483
 msgid "Hard Disk"
 msgstr "Disco rigido"
 
-#: mediamanager/halbackend.cpp:768 mediamanager/tdehardwarebackend.cpp:809
+#: mediamanager/halbackend.cpp:778 mediamanager/tdehardwarebackend.cpp:826
 msgid "Unknown Drive"
 msgstr "Unità sconosciuta"
 
-#: mediamanager/halbackend.cpp:780 mediamanager/tdehardwarebackend.cpp:839
+#: mediamanager/halbackend.cpp:794 mediamanager/tdehardwarebackend.cpp:872
 msgid "Floppy Drive"
 msgstr "Unità dischetti"
 
-#: mediamanager/halbackend.cpp:788
+#: mediamanager/halbackend.cpp:802
 msgid "Zip Drive"
 msgstr "Unità Zip"
 
-#: mediamanager/halbackend.cpp:858 mediamanager/tdehardwarebackend.cpp:896
+#: mediamanager/halbackend.cpp:877 mediamanager/tdehardwarebackend.cpp:930
 msgid "Camera"
 msgstr "Macchina fotografica"
 
-#: 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 "Errore interno"
 
-#: mediamanager/halbackend.cpp:1303
+#: mediamanager/halbackend.cpp:1322
 msgid "Invalid filesystem type"
 msgstr "Tipo di file system non valido"
 
-#: 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 "Il dispositivo è già montato."
 
-#: 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 "
@@ -184,16 +184,16 @@ msgstr ""
 "Sono elencati sotto. Devi chiuderli o cambiare la loro directory di lavoro "
 "prima di riprovare a smontare il dispositivo."
 
-#: 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. "
@@ -201,209 +201,257 @@ msgstr ""
 "Sfortunatamente, non è stato possibile smontare il dispositivo <b>%1</b> "
 "(%2) chiamato <b>'%3'</b> e montato in <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 "Il comando di smontaggio ha restituito il seguente errore:"
 
-#: 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 non è un supporto montabile."
+
+#: mediamanager/halbackend.cpp:1497 mediamanager/tdehardwarebackend.cpp:1225
+#: mounthelper/tdeio_media_mounthelper.cpp:68
+#, fuzzy
+msgid "%1 is already mounted to %2."
+msgstr "Il dispositivo è già montato."
+
+#: 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 "Il dispositivo è già montato."
+
+#: 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 "Errore interno"
 
-#: mediamanager/halbackend.cpp:1718
+#: mediamanager/halbackend.cpp:1745
 #, fuzzy
 #| msgid "Unknown"
 msgid "Unknown error"
 msgstr "Sconosciuto"
 
-#: mediamanager/halbackend.cpp:1772
+#: mediamanager/halbackend.cpp:1799
 msgid "Unmounting failed due to the following error:"
 msgstr "Lo smontaggio è fallito per il seguente motivo:"
 
-#: mediamanager/halbackend.cpp:1774
+#: mediamanager/halbackend.cpp:1801
 msgid "Device is Busy:"
 msgstr "Il dispositivo è occupato:"
 
-#: 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 non è un supporto montabile."
+
+#: mediamanager/halbackend.cpp:1868 mediamanager/tdehardwarebackend.cpp:1452
+#: mounthelper/tdeio_media_mounthelper.cpp:127
+#, fuzzy
+msgid "%1 is already unlocked."
+msgstr "Il dispositivo è già montato."
+
+#: 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 "Il dispositivo è già montato."
+
 #: 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 "Funzione disponibile solo con 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 "Funzione disponibile solo con 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 "Funzione disponibile solo con 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 "Disco rimovibile"
 
-#: mediamanager/tdehardwarebackend.cpp:529
+#: mediamanager/tdehardwarebackend.cpp:532
 #, fuzzy
 msgid "Blank CD-ROM"
 msgstr "Lettore CD"
 
-#: 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 "Lettore CD"
 
-#: mediamanager/tdehardwarebackend.cpp:682
+#: mediamanager/tdehardwarebackend.cpp:702
 #, fuzzy
 msgid "Blank BLURAY-R"
 msgstr "Lettore CD"
 
-#: 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 "Disco 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. "
@@ -414,67 +462,95 @@ msgstr ""
 "Sono elencati sotto. Devi chiuderli o cambiare la loro directory di lavoro "
 "prima di riprovare a smontare il dispositivo."
 
-#: mounthelper/tdeio_media_mounthelper.cpp:79
-msgid "%1 cannot be found."
-msgstr "Non è stato trovato %1."
+#: mounthelper/tdeio_media_mounthelper.cpp:49
+#, fuzzy
+#| msgid "The TDE mediamanager is not running."
+msgid "The TDE mediamanager is not running.\n"
+msgstr "Il gestore dei dispositivi di TDE non è in esecuzione."
 
-#: mounthelper/tdeio_media_mounthelper.cpp:87
-msgid "%1 is not a mountable media."
-msgstr "%1 non è un supporto montabile."
+#: 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 non è un supporto montabile."
+#: 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 "Il dispositivo è già montato."
-
-#: 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"
+#: mounthelper/tdeio_media_mounthelper.cpp:116
+msgid "Try to unlock an unknown medium."
 msgstr ""
-"Il dispositivo è stato smontato con successo, ma non è stato possibile "
-"aprire lo sportellino"
 
-#: mounthelper/tdeio_media_mounthelper.cpp:248
-msgid "The device was successfully unmounted, but could not be ejected"
+#: mounthelper/tdeio_media_mounthelper.cpp:148
+msgid "Try to lock an unknown medium."
 msgstr ""
-"Il dispositivo è stato smontato con successo, ma non è stato possibile "
-"espellerlo"
 
-#: mounthelper/tdeio_media_mounthelper.cpp:281
-msgid "Unknown decrypt error."
+#: mounthelper/tdeio_media_mounthelper.cpp:173
+#, fuzzy
+#| msgid "Unknown"
+msgid "Unknown lock error."
+msgstr "Sconosciuto"
+
+#: 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 "Non è stato trovato %1."
+
+#: mounthelper/tdeio_media_mounthelper.cpp:310
 #, fuzzy
-msgid "Decrypt given URL"
+msgid "%1 is not a mountable or encrypted media."
+msgstr "%1 non è un supporto montabile."
+
+#: mounthelper/tdeio_media_mounthelper.cpp:397
+#, fuzzy
+#| msgid "Unknown"
+msgid "Unknown unlock error."
+msgstr "Sconosciuto"
+
+#: mounthelper/tdeio_media_mounthelper.cpp:410
+#, fuzzy
+#| msgid "Unmount given URL"
+msgid "Mount given URL"
 msgstr "Smonta l'URL dato"
 
-#: mounthelper/tdeio_media_mounthelper.cpp:296
+#: mounthelper/tdeio_media_mounthelper.cpp:411
 msgid "Unmount given URL"
 msgstr "Smonta l'URL dato"
 
-#: mounthelper/tdeio_media_mounthelper.cpp:297
-msgid "Mount given URL (default)"
-msgstr "Monta l'URL dato (predefinito)"
+#: mounthelper/tdeio_media_mounthelper.cpp:412
+#, fuzzy
+#| msgid "Unmount given URL"
+msgid "Unlock given URL"
+msgstr "Smonta l'URL dato"
+
+#: mounthelper/tdeio_media_mounthelper.cpp:413
+#, fuzzy
+msgid "Lock given URL"
+msgstr "Smonta l'URL dato"
 
-#: mounthelper/tdeio_media_mounthelper.cpp:298
-msgid "Eject given URL via tdeeject"
-msgstr "Espelli l'URL dato attraverso tdeeject"
+#: mounthelper/tdeio_media_mounthelper.cpp:414
+#, fuzzy
+msgid "Eject given URL"
+msgstr "Smonta l'URL dato"
 
-#: mounthelper/tdeio_media_mounthelper.cpp:299
-msgid "Unmount and Eject given URL (necessary for some USB devices)"
-msgstr "Smonta ed espelli l'URL dato (necessario per alcune periferiche USB)"
+#: 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:/ URL da montare/smontare/espellere/rimuovere"
 
 #: propsdlgplugin/propertiespage.cpp:137
@@ -623,7 +699,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
@@ -893,6 +969,27 @@ msgstr "Misto"
 msgid "Filesystem: iso9660"
 msgstr "File system: iso9660"
 
+#~ msgid ""
+#~ "The device was successfully unmounted, but the tray could not be opened"
+#~ msgstr ""
+#~ "Il dispositivo è stato smontato con successo, ma non è stato possibile "
+#~ "aprire lo sportellino"
+
+#~ msgid "The device was successfully unmounted, but could not be ejected"
+#~ msgstr ""
+#~ "Il dispositivo è stato smontato con successo, ma non è stato possibile "
+#~ "espellerlo"
+
+#~ msgid "Mount given URL (default)"
+#~ msgstr "Monta l'URL dato (predefinito)"
+
+#~ msgid "Eject given URL via tdeeject"
+#~ msgstr "Espelli l'URL dato attraverso tdeeject"
+
+#~ msgid "Unmount and Eject given URL (necessary for some USB devices)"
+#~ msgstr ""
+#~ "Smonta ed espelli l'URL dato (necessario per alcune periferiche USB)"
+
 #, fuzzy
 #~ msgid "Permission denied"
 #~ msgstr "Autorizzazioni negate"
diff --git a/tde-i18n-ja/messages/tdebase/tdeio_media.po b/tde-i18n-ja/messages/tdebase/tdeio_media.po
index 46ea3ea1606..f7120f728a0 100644
--- a/tde-i18n-ja/messages/tdebase/tdeio_media.po
+++ b/tde-i18n-ja/messages/tdebase/tdeio_media.po
@@ -8,7 +8,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-12-06 23:00+0900\n"
 "Last-Translator: Yukiko Bando <ybando@k6.dion.ne.jp>\n"
 "Language-Team: Japanese <Kdeveloper@kde.gr.jp>\n"
@@ -46,27 +46,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 ""
 
@@ -79,103 +78,104 @@ 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 "CD レコーダ"
 
-#: mediamanager/fstabbackend.cpp:414
+#: mediamanager/fstabbackend.cpp:422
 msgid "DVD"
 msgstr "DVD"
 
-#: mediamanager/fstabbackend.cpp:427
+#: mediamanager/fstabbackend.cpp:435
 msgid "CD-ROM"
 msgstr "CD-ROM"
 
-#: 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
 msgid "Unknown Drive"
 msgstr "不明なドライブ"
 
-#: mediamanager/halbackend.cpp:780 mediamanager/tdehardwarebackend.cpp:839
+#: mediamanager/halbackend.cpp:794 mediamanager/tdehardwarebackend.cpp:872
 msgid "Floppy Drive"
 msgstr "フロッピードライブ"
 
-#: mediamanager/halbackend.cpp:788
+#: mediamanager/halbackend.cpp:802
 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 "
@@ -185,16 +185,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. "
@@ -202,209 +202,257 @@ msgstr ""
 "%4 にマウントされ、%3 と名付けられたデバイス %1 (%2) のマウントを解除できませ"
 "んでした。"
 
-#: 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 "CD-ROM"
 
-#: 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 "CD-ROM"
 
-#: mediamanager/tdehardwarebackend.cpp:682
+#: mediamanager/tdehardwarebackend.cpp:702
 #, fuzzy
 msgid "Blank BLURAY-R"
 msgstr "CD-ROM"
 
-#: 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. "
@@ -415,64 +463,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"
+#: 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 "指定した URL のマウントを解除"
 
-#: mounthelper/tdeio_media_mounthelper.cpp:296
+#: mounthelper/tdeio_media_mounthelper.cpp:411
 msgid "Unmount given URL"
 msgstr "指定した URL のマウントを解除"
 
-#: mounthelper/tdeio_media_mounthelper.cpp:297
-msgid "Mount given URL (default)"
-msgstr "指定した URL をマウント (標準)"
+#: mounthelper/tdeio_media_mounthelper.cpp:412
+#, fuzzy
+#| msgid "Unmount given URL"
+msgid "Unlock given URL"
+msgstr "指定した URL のマウントを解除"
 
-#: 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 "指定した URL のマウントを解除"
 
-#: 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 "指定した URL のマウントを解除"
+
+#: 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:/URL でマウント/マウント解除/取り出し/取り外し"
 
 #: propsdlgplugin/propertiespage.cpp:137
@@ -621,7 +700,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
@@ -889,6 +968,24 @@ 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 "指定した URL をマウント (標準)"
+
+#~ 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 "アクセス許可がありません"
diff --git a/tde-i18n-kk/messages/tdebase/tdeio_media.po b/tde-i18n-kk/messages/tdebase/tdeio_media.po
index 64dec3fe3d6..640763377c4 100644
--- a/tde-i18n-kk/messages/tdebase/tdeio_media.po
+++ b/tde-i18n-kk/messages/tdebase/tdeio_media.po
@@ -4,7 +4,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: 2006-11-20 10:27+0600\n"
 "Last-Translator: Sairan Kikkarin <sairan@computer.org>\n"
 "Language-Team: Kazakh\n"
@@ -43,27 +43,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 mediamanager жегілмеген."
 
-#: 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 ""
 
@@ -76,390 +75,469 @@ 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 ""
 
-#: mediamanager/fstabbackend.cpp:408
+#: mediamanager/fstabbackend.cpp:416
 msgid "CD Recorder"
 msgstr "Жазатын CD"
 
-#: mediamanager/fstabbackend.cpp:414
+#: mediamanager/fstabbackend.cpp:422
 msgid "DVD"
 msgstr "DVD"
 
-#: mediamanager/fstabbackend.cpp:427
+#: mediamanager/fstabbackend.cpp:435
 msgid "CD-ROM"
 msgstr "CD-ROM"
 
-#: 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 "
 "before attempting to unmount the device again."
 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. "
 msgstr ""
 
-#: 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 ""
 
-#: 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
+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 not a mountable media."
+msgid "%1 is already unmounted."
+msgstr "%1 тіркейтін тасушы емес."
+
+#: 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
 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
+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
+msgid "%1 is already locked."
+msgstr ""
+
 #: mediamanager/mediamanager.cpp:248 mediamanager/mediamanager.cpp:275
+#: mediamanager/mediamanager.cpp:302 mediamanager/mediamanager.cpp:329
 msgid "Feature only available with the TDE hardware backend"
 msgstr ""
 
 #: 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 ""
 
 #: mediamanager/mediamanager.cpp:262 mediamanager/mediamanager.cpp:289
-#: mediamanager/mediamanager.cpp:320 mediamanager/mediamanager.cpp:350
+#: mediamanager/mediamanager.cpp:316 mediamanager/mediamanager.cpp:343
 msgid "Feature only available with HAL or TDE hardware backend"
 msgstr ""
 
-#: 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 "CD-ROM"
 
-#: 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 "CD-ROM"
 
-#: mediamanager/tdehardwarebackend.cpp:682
+#: mediamanager/tdehardwarebackend.cpp:702
 #, fuzzy
 msgid "Blank BLURAY-R"
 msgstr "CD-ROM"
 
-#: 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:1516
+msgid "Unable to lock the device."
 msgstr ""
 
-#: mediamanager/tdehardwarebackend.cpp:1578
+#: mediamanager/tdehardwarebackend.cpp:1623
 msgid ""
 "Programs still using the device have been detected. They are listed below. "
 "You have to close them or change their working directory before attempting "
 "to unmount the device again."
 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 mediamanager жегілмеген."
 
-#: 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
-msgid "%1 is already unlocked."
+msgid "Unknown unmount error."
 msgstr ""
 
-#: mounthelper/tdeio_media_mounthelper.cpp:139
-msgid "Unknown unmount error."
+#: mounthelper/tdeio_media_mounthelper.cpp:116
+msgid "Try to unlock an unknown medium."
 msgstr ""
 
-#: mounthelper/tdeio_media_mounthelper.cpp:246
-msgid "The device was successfully unmounted, but the tray could not be opened"
+#: mounthelper/tdeio_media_mounthelper.cpp:148
+msgid "Try to lock an unknown medium."
 msgstr ""
 
-#: mounthelper/tdeio_media_mounthelper.cpp:248
-msgid "The device was successfully unmounted, but could not be ejected"
+#: 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:281
-msgid "Unknown decrypt error."
+#: 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 "Decrypt given URL"
+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 "Unmount given URL"
+msgid "Mount given URL"
 msgstr "URL бойынша тіркеуден шығару"
 
-#: mounthelper/tdeio_media_mounthelper.cpp:296
+#: mounthelper/tdeio_media_mounthelper.cpp:411
 msgid "Unmount given URL"
 msgstr "URL бойынша тіркеуден шығару"
 
-#: mounthelper/tdeio_media_mounthelper.cpp:297
-msgid "Mount given URL (default)"
-msgstr "URL бойынша тіркеу (әдеттегі)"
+#: mounthelper/tdeio_media_mounthelper.cpp:412
+#, fuzzy
+#| msgid "Unmount given URL"
+msgid "Unlock given URL"
+msgstr "URL бойынша тіркеуден шығару"
+
+#: mounthelper/tdeio_media_mounthelper.cpp:413
+#, fuzzy
+msgid "Lock given URL"
+msgstr "URL бойынша тіркеуден шығару"
 
-#: mounthelper/tdeio_media_mounthelper.cpp:298
-msgid "Eject given URL via tdeeject"
-msgstr "URL бойынша tdeeject арқылы алып-шығару"
+#: mounthelper/tdeio_media_mounthelper.cpp:414
+#, fuzzy
+msgid "Eject given URL"
+msgstr "URL бойынша тіркеуден шығару"
 
-#: mounthelper/tdeio_media_mounthelper.cpp:299
-msgid "Unmount and Eject given URL (necessary for some USB devices)"
+#: mounthelper/tdeio_media_mounthelper.cpp:415
+msgid "Safely remove (unmount and eject) given URL"
 msgstr ""
-"URL бойынша тіркеуден шығарып, алып-шығару (кейбір USB құрылғыларға қажет)"
 
-#: 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:/ URL"
 
 #: propsdlgplugin/propertiespage.cpp:137
@@ -609,7 +687,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
@@ -828,3 +906,13 @@ msgstr ""
 #, no-c-format
 msgid "Filesystem: iso9660"
 msgstr ""
+
+#~ msgid "Mount given URL (default)"
+#~ msgstr "URL бойынша тіркеу (әдеттегі)"
+
+#~ msgid "Eject given URL via tdeeject"
+#~ msgstr "URL бойынша tdeeject арқылы алып-шығару"
+
+#~ msgid "Unmount and Eject given URL (necessary for some USB devices)"
+#~ msgstr ""
+#~ "URL бойынша тіркеуден шығарып, алып-шығару (кейбір USB құрылғыларға қажет)"
diff --git a/tde-i18n-km/messages/tdebase/tdeio_media.po b/tde-i18n-km/messages/tdebase/tdeio_media.po
index 809e7f3f58f..b628051006b 100644
--- a/tde-i18n-km/messages/tdebase/tdeio_media.po
+++ b/tde-i18n-km/messages/tdebase/tdeio_media.po
@@ -4,7 +4,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: 2008-07-15 15:04+0700\n"
 "Last-Translator: Khoem Sokhem <khoemsokhem@khmeros.info>\n"
 "Language-Team: Khmer <en@li.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,103 +76,104 @@ 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 "ថាសហ្ស៊ីប"
 
-#: 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
 msgid "Unknown Drive"
 msgstr "មិន​ស្គាល់​ដ្រាយ"
 
-#: mediamanager/halbackend.cpp:780 mediamanager/tdehardwarebackend.cpp:839
+#: mediamanager/halbackend.cpp:794 mediamanager/tdehardwarebackend.cpp:872
 msgid "Floppy Drive"
 msgstr "ដ្រាយ​ថាសទន់"
 
-#: mediamanager/halbackend.cpp:788
+#: mediamanager/halbackend.cpp:802
 msgid "Zip Drive"
 msgstr "ដ្រាយ​ហ្ស៊ីប្ស៊ីប"
 
-#: 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 "
@@ -182,16 +182,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. "
@@ -199,209 +199,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 "បាន​ត្រឡប់​កំហុស​ដូច​ខាងក្រោម​ដោយ​ពាក្យ​បញ្ជា​អាន់​ម៉ោន ៖"
 
-#: 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 "ថាសហ្ស៊ីប"
 
-#: 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. "
@@ -411,63 +459,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 "អាន់ម៉ោន URL ដែល​បាន​ផ្ដល់ឲ្យ"
 
-#: mounthelper/tdeio_media_mounthelper.cpp:296
+#: mounthelper/tdeio_media_mounthelper.cpp:411
 msgid "Unmount given URL"
 msgstr "អាន់ម៉ោន URL ដែល​បាន​ផ្ដល់ឲ្យ"
 
-#: mounthelper/tdeio_media_mounthelper.cpp:297
-msgid "Mount given URL (default)"
-msgstr "ម៉ោន URL ដែល​បាន​ផ្ដល់​ឲ្យ (លំនាំដើម)"
+#: mounthelper/tdeio_media_mounthelper.cpp:412
+#, fuzzy
+#| msgid "Unmount given URL"
+msgid "Unlock given URL"
+msgstr "អាន់ម៉ោន URL ដែល​បាន​ផ្ដល់ឲ្យ"
 
-#: 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 "អាន់ម៉ោន URL ដែល​បាន​ផ្ដល់ឲ្យ"
 
-#: 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 "អាន់ម៉ោន URL ដែល​បាន​ផ្ដល់ឲ្យ"
+
+#: 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 "ឧបករណ៍​ផ្ទុក ៖/ URL ដែល​ត្រូវម៉ោន/អាន់ម៉ោន/​ច្រាន​ចោល/​យកចេញ"
 
 #: propsdlgplugin/propertiespage.cpp:137
@@ -616,7 +696,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
@@ -872,6 +952,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 "ម៉ោន URL ដែល​បាន​ផ្ដល់​ឲ្យ (លំនាំដើម)"
+
+#~ 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 "សិទ្ធិ​ត្រូវ​បាន​បដិសេធ ។"
diff --git a/tde-i18n-ko/messages/tdebase/tdeio_media.po b/tde-i18n-ko/messages/tdebase/tdeio_media.po
index d63327d7852..bc64eca2574 100644
--- a/tde-i18n-ko/messages/tdebase/tdeio_media.po
+++ b/tde-i18n-ko/messages/tdebase/tdeio_media.po
@@ -5,7 +5,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-12-04 19:38+0900\n"
 "Last-Translator: Sung-Jae, Cho <jachin@hanafos.com>\n"
 "Language-Team: Korean <jachin@hanafos.com>\n"
@@ -43,27 +43,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 ""
 
@@ -76,389 +75,469 @@ 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 ""
 
-#: mediamanager/fstabbackend.cpp:408
+#: mediamanager/fstabbackend.cpp:416
 msgid "CD Recorder"
 msgstr "CD 레코더"
 
-#: mediamanager/fstabbackend.cpp:414
+#: mediamanager/fstabbackend.cpp:422
 msgid "DVD"
 msgstr "DVD"
 
-#: mediamanager/fstabbackend.cpp:427
+#: mediamanager/fstabbackend.cpp:435
 msgid "CD-ROM"
 msgstr "CD-ROM"
 
-#: 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 "
 "before attempting to unmount the device again."
 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. "
 msgstr ""
 
-#: 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 ""
 
-#: 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
+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 not a mountable media."
+msgid "%1 is already unmounted."
+msgstr "%1은(는) 마운트 할 수 있는 미디어가 아닙니다."
+
+#: 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
 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
+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
+msgid "%1 is already locked."
+msgstr ""
+
 #: mediamanager/mediamanager.cpp:248 mediamanager/mediamanager.cpp:275
+#: mediamanager/mediamanager.cpp:302 mediamanager/mediamanager.cpp:329
 msgid "Feature only available with the TDE hardware backend"
 msgstr ""
 
 #: 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 ""
 
 #: mediamanager/mediamanager.cpp:262 mediamanager/mediamanager.cpp:289
-#: mediamanager/mediamanager.cpp:320 mediamanager/mediamanager.cpp:350
+#: mediamanager/mediamanager.cpp:316 mediamanager/mediamanager.cpp:343
 msgid "Feature only available with HAL or TDE hardware backend"
 msgstr ""
 
-#: 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 "CD-ROM"
 
-#: 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 "CD-ROM"
 
-#: mediamanager/tdehardwarebackend.cpp:682
+#: mediamanager/tdehardwarebackend.cpp:702
 #, fuzzy
 msgid "Blank BLURAY-R"
 msgstr "CD-ROM"
 
-#: 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
 msgid ""
 "Programs still using the device have been detected. They are listed below. "
 "You have to close them or change their working directory before attempting "
 "to unmount the device again."
 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
-msgid "%1 is already unlocked."
+msgid "Unknown unmount error."
 msgstr ""
 
-#: mounthelper/tdeio_media_mounthelper.cpp:139
-msgid "Unknown unmount error."
+#: mounthelper/tdeio_media_mounthelper.cpp:116
+msgid "Try to unlock an unknown medium."
 msgstr ""
 
-#: mounthelper/tdeio_media_mounthelper.cpp:246
-msgid "The device was successfully unmounted, but the tray could not be opened"
+#: mounthelper/tdeio_media_mounthelper.cpp:148
+msgid "Try to lock an unknown medium."
 msgstr ""
 
-#: mounthelper/tdeio_media_mounthelper.cpp:248
-msgid "The device was successfully unmounted, but could not be ejected"
+#: 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:281
-msgid "Unknown decrypt error."
+#: 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 "Decrypt given URL"
+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 "Unmount given URL"
+msgid "Mount given URL"
 msgstr "URL 언마운트"
 
-#: mounthelper/tdeio_media_mounthelper.cpp:296
+#: mounthelper/tdeio_media_mounthelper.cpp:411
 msgid "Unmount given URL"
 msgstr "URL 언마운트"
 
-#: mounthelper/tdeio_media_mounthelper.cpp:297
-msgid "Mount given URL (default)"
-msgstr "URL 마운트 (기본설정)"
+#: mounthelper/tdeio_media_mounthelper.cpp:412
+#, fuzzy
+#| msgid "Unmount given URL"
+msgid "Unlock given URL"
+msgstr "URL 언마운트"
+
+#: mounthelper/tdeio_media_mounthelper.cpp:413
+#, fuzzy
+msgid "Lock given URL"
+msgstr "URL 언마운트"
 
-#: mounthelper/tdeio_media_mounthelper.cpp:298
-msgid "Eject given URL via tdeeject"
-msgstr "URL을 Tdeeject로 꺼냄"
+#: mounthelper/tdeio_media_mounthelper.cpp:414
+#, fuzzy
+msgid "Eject given URL"
+msgstr "URL 언마운트"
 
-#: 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: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:/ URL을 마운트/마운트 해제/배출/제거"
 
 #: propsdlgplugin/propertiespage.cpp:137
@@ -608,7 +687,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
@@ -827,3 +906,12 @@ msgstr ""
 #, no-c-format
 msgid "Filesystem: iso9660"
 msgstr ""
+
+#~ msgid "Mount given URL (default)"
+#~ msgstr "URL 마운트 (기본설정)"
+
+#~ msgid "Eject given URL via tdeeject"
+#~ msgstr "URL을 Tdeeject로 꺼냄"
+
+#~ msgid "Unmount and Eject given URL (necessary for some USB devices)"
+#~ msgstr "URL 언마운트 및 배출(몇몇 USB 디바이스가 필요합니다.)"
diff --git a/tde-i18n-lt/messages/tdebase/tdeio_media.po b/tde-i18n-lt/messages/tdebase/tdeio_media.po
index 136eb11b0f6..6b7b3dec9a2 100644
--- a/tde-i18n-lt/messages/tdebase/tdeio_media.po
+++ b/tde-i18n-lt/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: 2005-09-20 07:27+0300\n"
 "Last-Translator: Donatas Glodenis <dgvirtual@akl.lt>\n"
 "Language-Team: Lithuanian <kde-i18n-lt@kde.org>\n"
@@ -46,27 +46,26 @@ msgstr "Atverti naujame lange"
 msgid "Unknown"
 msgstr "Nežinoma"
 
-#: 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 media tvarkyklė neveikia."
 
-#: mediaimpl.cpp:187
+#: mediaimpl.cpp:186
 msgid "This media name already exists."
 msgstr "Toks įrenginio pavadinimas jau yra."
 
-#: 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 ""
 
@@ -79,391 +78,470 @@ 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 ""
 
-#: mediamanager/fstabbackend.cpp:408
+#: mediamanager/fstabbackend.cpp:416
 msgid "CD Recorder"
 msgstr "CD rašymo įrenginys"
 
-#: mediamanager/fstabbackend.cpp:414
+#: mediamanager/fstabbackend.cpp:422
 msgid "DVD"
 msgstr "DVD"
 
-#: mediamanager/fstabbackend.cpp:427
+#: mediamanager/fstabbackend.cpp:435
 msgid "CD-ROM"
 msgstr "CD-ROM"
 
-#: mediamanager/fstabbackend.cpp:440
+#: mediamanager/fstabbackend.cpp:448
 msgid "Floppy"
 msgstr "Lankstus diskelis"
 
-#: mediamanager/fstabbackend.cpp:448
+#: mediamanager/fstabbackend.cpp:456
 msgid "Zip Disk"
 msgstr "Zip diskelis"
 
-#: mediamanager/fstabbackend.cpp:459
+#: mediamanager/fstabbackend.cpp:467
 msgid "Removable Device"
 msgstr "Pašalinamas įrenginys"
 
-#: mediamanager/fstabbackend.cpp:464 mediamanager/fstabbackend.cpp:470
+#: mediamanager/fstabbackend.cpp:472 mediamanager/fstabbackend.cpp:478
 msgid "Remote Share"
 msgstr "Nutolęs diskas"
 
-#: mediamanager/fstabbackend.cpp:475
+#: mediamanager/fstabbackend.cpp:483
 msgid "Hard Disk"
 msgstr "Kietas diskas"
 
-#: mediamanager/halbackend.cpp:768 mediamanager/tdehardwarebackend.cpp:809
+#: mediamanager/halbackend.cpp:778 mediamanager/tdehardwarebackend.cpp:826
 #, fuzzy
 msgid "Unknown Drive"
 msgstr "Nežinoma"
 
-#: mediamanager/halbackend.cpp:780 mediamanager/tdehardwarebackend.cpp:839
+#: mediamanager/halbackend.cpp:794 mediamanager/tdehardwarebackend.cpp:872
 #, fuzzy
 msgid "Floppy Drive"
 msgstr "Lankstus diskelis"
 
-#: mediamanager/halbackend.cpp:788
+#: mediamanager/halbackend.cpp:802
 #, fuzzy
 msgid "Zip Drive"
 msgstr "Zip diskelis"
 
-#: mediamanager/halbackend.cpp:858 mediamanager/tdehardwarebackend.cpp:896
+#: mediamanager/halbackend.cpp:877 mediamanager/tdehardwarebackend.cpp:930
 msgid "Camera"
 msgstr "Fotoaparatas"
 
-#: 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 "Vidinė klaida"
 
-#: 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 "
 "before attempting to unmount the device again."
 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. "
 msgstr ""
 
-#: 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 ""
 
-#: 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 nėra sumontuojamas saugojimo įrenginys."
+
+#: mediamanager/halbackend.cpp:1497 mediamanager/tdehardwarebackend.cpp:1225
+#: mounthelper/tdeio_media_mounthelper.cpp:68
+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 not a mountable media."
+msgid "%1 is already unmounted."
+msgstr "%1 nėra sumontuojamas saugojimo įrenginys."
+
+#: 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 "Vidinė klaida"
 
-#: mediamanager/halbackend.cpp:1718
+#: mediamanager/halbackend.cpp:1745
 #, fuzzy
 #| msgid "Unknown"
 msgid "Unknown error"
 msgstr "Nežinoma"
 
-#: 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 nėra sumontuojamas saugojimo įrenginys."
+
+#: mediamanager/halbackend.cpp:1868 mediamanager/tdehardwarebackend.cpp:1452
+#: mounthelper/tdeio_media_mounthelper.cpp:127
+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
+msgid "%1 is already locked."
+msgstr ""
+
 #: mediamanager/mediamanager.cpp:248 mediamanager/mediamanager.cpp:275
+#: mediamanager/mediamanager.cpp:302 mediamanager/mediamanager.cpp:329
 msgid "Feature only available with the TDE hardware backend"
 msgstr ""
 
 #: 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 ""
 
 #: mediamanager/mediamanager.cpp:262 mediamanager/mediamanager.cpp:289
-#: mediamanager/mediamanager.cpp:320 mediamanager/mediamanager.cpp:350
+#: mediamanager/mediamanager.cpp:316 mediamanager/mediamanager.cpp:343
 msgid "Feature only available with HAL or TDE hardware backend"
 msgstr ""
 
-#: 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 "Pašalinamas įrenginys"
 
-#: mediamanager/tdehardwarebackend.cpp:529
+#: mediamanager/tdehardwarebackend.cpp:532
 #, fuzzy
 msgid "Blank CD-ROM"
 msgstr "CD-ROM"
 
-#: 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 "CD-ROM"
 
-#: mediamanager/tdehardwarebackend.cpp:682
+#: mediamanager/tdehardwarebackend.cpp:702
 #, fuzzy
 msgid "Blank BLURAY-R"
 msgstr "CD-ROM"
 
-#: 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 diskelis"
 
-#: 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
 msgid ""
 "Programs still using the device have been detected. They are listed below. "
 "You have to close them or change their working directory before attempting "
 "to unmount the device again."
 msgstr ""
 
-#: mounthelper/tdeio_media_mounthelper.cpp:79
-msgid "%1 cannot be found."
-msgstr "Nepavyko rasti %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 media tvarkyklė neveikia."
 
-#: mounthelper/tdeio_media_mounthelper.cpp:87
-msgid "%1 is not a mountable media."
-msgstr "%1 nėra sumontuojamas saugojimo įrenginys."
+#: 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 nėra sumontuojamas saugojimo įrenginys."
+#: mounthelper/tdeio_media_mounthelper.cpp:87
+msgid "Try to unmount an unknown medium."
+msgstr ""
 
 #: mounthelper/tdeio_media_mounthelper.cpp:107
-msgid "%1 is already unlocked."
+msgid "Unknown unmount error."
 msgstr ""
 
-#: mounthelper/tdeio_media_mounthelper.cpp:139
-msgid "Unknown unmount error."
+#: mounthelper/tdeio_media_mounthelper.cpp:116
+msgid "Try to unlock an unknown medium."
 msgstr ""
 
-#: mounthelper/tdeio_media_mounthelper.cpp:246
-msgid "The device was successfully unmounted, but the tray could not be opened"
+#: mounthelper/tdeio_media_mounthelper.cpp:148
+msgid "Try to lock an unknown medium."
 msgstr ""
 
-#: mounthelper/tdeio_media_mounthelper.cpp:248
-msgid "The device was successfully unmounted, but could not be ejected"
+#: mounthelper/tdeio_media_mounthelper.cpp:173
+#, fuzzy
+#| msgid "Unknown"
+msgid "Unknown lock error."
+msgstr "Nežinoma"
+
+#: mounthelper/tdeio_media_mounthelper.cpp:211
+msgid "Try to release holders from an unknown medium."
 msgstr ""
 
-#: mounthelper/tdeio_media_mounthelper.cpp:281
-msgid "Unknown decrypt error."
+#: 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 "Nepavyko rasti %1."
+
+#: mounthelper/tdeio_media_mounthelper.cpp:310
 #, fuzzy
-msgid "Decrypt given URL"
+msgid "%1 is not a mountable or encrypted media."
+msgstr "%1 nėra sumontuojamas saugojimo įrenginys."
+
+#: mounthelper/tdeio_media_mounthelper.cpp:397
+#, fuzzy
+#| msgid "Unknown"
+msgid "Unknown unlock error."
+msgstr "Nežinoma"
+
+#: mounthelper/tdeio_media_mounthelper.cpp:410
+#, fuzzy
+#| msgid "Unmount given URL"
+msgid "Mount given URL"
 msgstr "Išmontuoti duotą URL"
 
-#: mounthelper/tdeio_media_mounthelper.cpp:296
+#: mounthelper/tdeio_media_mounthelper.cpp:411
 msgid "Unmount given URL"
 msgstr "Išmontuoti duotą URL"
 
-#: mounthelper/tdeio_media_mounthelper.cpp:297
-msgid "Mount given URL (default)"
-msgstr "Sumontuoti nurodytą URL (numatyta)"
+#: mounthelper/tdeio_media_mounthelper.cpp:412
+#, fuzzy
+#| msgid "Unmount given URL"
+msgid "Unlock given URL"
+msgstr "Išmontuoti duotą URL"
+
+#: mounthelper/tdeio_media_mounthelper.cpp:413
+#, fuzzy
+msgid "Lock given URL"
+msgstr "Išmontuoti duotą URL"
 
-#: mounthelper/tdeio_media_mounthelper.cpp:298
-msgid "Eject given URL via tdeeject"
-msgstr "Išstumti nurodytą URL su „tdeeject“"
+#: mounthelper/tdeio_media_mounthelper.cpp:414
+#, fuzzy
+msgid "Eject given URL"
+msgstr "Išmontuoti duotą URL"
 
-#: mounthelper/tdeio_media_mounthelper.cpp:299
-msgid "Unmount and Eject given URL (necessary for some USB devices)"
+#: mounthelper/tdeio_media_mounthelper.cpp:415
+msgid "Safely remove (unmount and eject) given URL"
 msgstr ""
-"Išmontuoti ir išstumti nurodytą URL (būtina kai kuriems USB įrenginiams)"
 
-#: 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:/  URL montavimui/išmontavimui/išstūmimui/pašalinimui"
 
 #: propsdlgplugin/propertiespage.cpp:137
@@ -613,7 +691,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
@@ -833,6 +911,16 @@ msgstr ""
 msgid "Filesystem: iso9660"
 msgstr ""
 
+#~ msgid "Mount given URL (default)"
+#~ msgstr "Sumontuoti nurodytą URL (numatyta)"
+
+#~ msgid "Eject given URL via tdeeject"
+#~ msgstr "Išstumti nurodytą URL su „tdeeject“"
+
+#~ msgid "Unmount and Eject given URL (necessary for some USB devices)"
+#~ msgstr ""
+#~ "Išmontuoti ir išstumti nurodytą URL (būtina kai kuriems USB įrenginiams)"
+
 #~ msgid ""
 #~ "\n"
 #~ "Please check that the disk is entered correctly."
diff --git a/tde-i18n-mk/messages/tdebase/tdeio_media.po b/tde-i18n-mk/messages/tdebase/tdeio_media.po
index 2923db2eb5b..503aefaafcc 100644
--- a/tde-i18n-mk/messages/tdebase/tdeio_media.po
+++ b/tde-i18n-mk/messages/tdebase/tdeio_media.po
@@ -5,7 +5,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-02-17 11:40+0100\n"
 "Last-Translator: Bozidar Proevski <bobibobi@freemail.com.mk>\n"
 "Language-Team: Macedonian <mkde-l10n@lists.sourceforge.net>\n"
@@ -43,27 +43,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 ""
 
@@ -76,106 +75,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 "CD-Снимач"
 
-#: mediamanager/fstabbackend.cpp:414
+#: mediamanager/fstabbackend.cpp:422
 msgid "DVD"
 msgstr "DVD"
 
-#: mediamanager/fstabbackend.cpp:427
+#: mediamanager/fstabbackend.cpp:435
 msgid "CD-ROM"
 msgstr "CD-ROM"
 
-#: 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 "
@@ -185,16 +185,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. "
@@ -202,209 +202,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 "CD-ROM"
 
-#: 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 "CD-ROM"
 
-#: mediamanager/tdehardwarebackend.cpp:682
+#: mediamanager/tdehardwarebackend.cpp:702
 #, fuzzy
 msgid "Blank BLURAY-R"
 msgstr "CD-ROM"
 
-#: 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. "
@@ -415,65 +463,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
-#, fuzzy
-msgid "The device was successfully unmounted, but the tray could not be opened"
+#: mounthelper/tdeio_media_mounthelper.cpp:116
+msgid "Try to unlock an unknown medium."
+msgstr ""
+
+#: mounthelper/tdeio_media_mounthelper.cpp:148
+msgid "Try to lock 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: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:281
-msgid "Unknown decrypt error."
+#: 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 "Decrypt given URL"
+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 "Unmount given URL"
+msgid "Mount given URL"
 msgstr "Одмонтирај го дадениот URL"
 
-#: mounthelper/tdeio_media_mounthelper.cpp:296
+#: mounthelper/tdeio_media_mounthelper.cpp:411
 msgid "Unmount given URL"
 msgstr "Одмонтирај го дадениот URL"
 
-#: mounthelper/tdeio_media_mounthelper.cpp:297
-msgid "Mount given URL (default)"
-msgstr "Монтирај го дадениот URL (стандардно)"
+#: mounthelper/tdeio_media_mounthelper.cpp:412
+#, fuzzy
+#| msgid "Unmount given URL"
+msgid "Unlock given URL"
+msgstr "Одмонтирај го дадениот URL"
 
-#: 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 "Одмонтирај го дадениот URL"
 
-#: 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 "Одмонтирај го дадениот URL"
 
-#: mounthelper/tdeio_media_mounthelper.cpp:300
-msgid "media:/ URL to mount/unmount/eject/remove"
+#: mounthelper/tdeio_media_mounthelper.cpp:415
+msgid "Safely remove (unmount and eject) given URL"
+msgstr ""
+
+#: 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 "URL media:/ за монтирање/одмонтирање/вадење/отстранување"
 
 #: propsdlgplugin/propertiespage.cpp:137
@@ -622,7 +700,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
@@ -870,6 +948,24 @@ msgstr "Мешано"
 msgid "Filesystem: iso9660"
 msgstr "Датотечен систем: iso9660"
 
+#, fuzzy
+#~ 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 "Монтирај го дадениот URL (стандардно)"
+
+#~ 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 "Нема привилегии"
diff --git a/tde-i18n-mn/messages/tdebase/tdeio_media.po b/tde-i18n-mn/messages/tdebase/tdeio_media.po
index 84f45d2806c..42eb28b9229 100644
--- a/tde-i18n-mn/messages/tdebase/tdeio_media.po
+++ b/tde-i18n-mn/messages/tdebase/tdeio_media.po
@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: tdeio_devices\n"
-"POT-Creation-Date: 2020-09-09 18:58+0200\n"
+"POT-Creation-Date: 2020-10-17 08:51+0800\n"
 "PO-Revision-Date: 2003-07-08 23:52+0200\n"
 "Last-Translator: Sanlig Badral <badral@openmn.org>\n"
 "Language-Team: Mongolian <openmn-kdemn@lists.sf.net>\n"
@@ -43,27 +43,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 ""
 
-#: 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 ""
 
@@ -76,393 +75,468 @@ 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 ""
 
-#: mediamanager/fstabbackend.cpp:408
+#: mediamanager/fstabbackend.cpp:416
 msgid "CD Recorder"
 msgstr "CD-Шарагч"
 
-#: mediamanager/fstabbackend.cpp:414
+#: mediamanager/fstabbackend.cpp:422
 msgid "DVD"
 msgstr ""
 
-#: mediamanager/fstabbackend.cpp:427
+#: mediamanager/fstabbackend.cpp:435
 msgid "CD-ROM"
 msgstr "CD-ROM"
 
-#: 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
 #, fuzzy
 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 "
 "before attempting to unmount the device again."
 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. "
 msgstr ""
 
-#: 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 ""
 
-#: 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
+#, fuzzy
+msgid "%1 is not a mountable media."
+msgstr "%1%2 (залгагдаагүй)"
+
+#: mediamanager/halbackend.cpp:1497 mediamanager/tdehardwarebackend.cpp:1225
+#: mounthelper/tdeio_media_mounthelper.cpp:68
+#, fuzzy
+#| msgid "%1%2 mounted at %3"
+msgid "%1 is already mounted to %2."
+msgstr "%1%2 -г %3 -т залгах"
+
+#: 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 "%1%2 (залгагдаагүй)"
+
+#: 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
 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%2 (залгагдаагүй)"
+
+#: mediamanager/halbackend.cpp:1868 mediamanager/tdehardwarebackend.cpp:1452
+#: mounthelper/tdeio_media_mounthelper.cpp:127
+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
+msgid "%1 is already locked."
+msgstr ""
+
 #: mediamanager/mediamanager.cpp:248 mediamanager/mediamanager.cpp:275
+#: mediamanager/mediamanager.cpp:302 mediamanager/mediamanager.cpp:329
 msgid "Feature only available with the TDE hardware backend"
 msgstr ""
 
 #: 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 ""
 
 #: mediamanager/mediamanager.cpp:262 mediamanager/mediamanager.cpp:289
-#: mediamanager/mediamanager.cpp:320 mediamanager/mediamanager.cpp:350
+#: mediamanager/mediamanager.cpp:316 mediamanager/mediamanager.cpp:343
 msgid "Feature only available with HAL or TDE hardware backend"
 msgstr ""
 
-#: mediamanager/tdehardwarebackend.cpp:484
-#: mediamanager/tdehardwarebackend.cpp:521
-#: mediamanager/tdehardwarebackend.cpp:754
+#: mediamanager/tdehardwarebackend.cpp:486
+#: mediamanager/tdehardwarebackend.cpp:523
+#: mediamanager/tdehardwarebackend.cpp:779
 msgid "%1 Removable Device"
 msgstr ""
 
-#: mediamanager/tdehardwarebackend.cpp:529
+#: mediamanager/tdehardwarebackend.cpp:532
 #, fuzzy
 msgid "Blank CD-ROM"
 msgstr "CD-ROM"
 
-#: 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 "CD-ROM"
 
-#: mediamanager/tdehardwarebackend.cpp:682
+#: mediamanager/tdehardwarebackend.cpp:702
 #, fuzzy
 msgid "Blank BLURAY-R"
 msgstr "CD-ROM"
 
-#: 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:1516
+msgid "Unable to lock the device."
 msgstr ""
 
-#: mediamanager/tdehardwarebackend.cpp:1578
+#: mediamanager/tdehardwarebackend.cpp:1623
 msgid ""
 "Programs still using the device have been detected. They are listed below. "
 "You have to close them or change their working directory before attempting "
 "to unmount the device again."
 msgstr ""
 
-#: mounthelper/tdeio_media_mounthelper.cpp:79
-msgid "%1 cannot be found."
+#: mounthelper/tdeio_media_mounthelper.cpp:49
+msgid "The TDE mediamanager is not running.\n"
 msgstr ""
 
-#: mounthelper/tdeio_media_mounthelper.cpp:87
-#, fuzzy
-msgid "%1 is not a mountable media."
-msgstr "%1%2 (залгагдаагүй)"
+#: 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%2 (залгагдаагүй)"
+#: mounthelper/tdeio_media_mounthelper.cpp:87
+msgid "Try to unmount an unknown medium."
+msgstr ""
 
 #: mounthelper/tdeio_media_mounthelper.cpp:107
-msgid "%1 is already unlocked."
+msgid "Unknown unmount error."
 msgstr ""
 
-#: mounthelper/tdeio_media_mounthelper.cpp:139
-msgid "Unknown unmount error."
+#: mounthelper/tdeio_media_mounthelper.cpp:116
+msgid "Try to unlock an unknown medium."
 msgstr ""
 
-#: mounthelper/tdeio_media_mounthelper.cpp:246
-msgid "The device was successfully unmounted, but the tray could not be opened"
+#: mounthelper/tdeio_media_mounthelper.cpp:148
+msgid "Try to lock an unknown medium."
 msgstr ""
 
-#: mounthelper/tdeio_media_mounthelper.cpp:248
-msgid "The device was successfully unmounted, but could not be ejected"
+#: 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:281
+#: mounthelper/tdeio_media_mounthelper.cpp:302
+msgid "%1 cannot be found."
+msgstr ""
+
+#: mounthelper/tdeio_media_mounthelper.cpp:310
 #, fuzzy
-msgid "Unknown decrypt error."
-msgstr "Танигдахгүй төхөөрөмж"
+msgid "%1 is not a mountable or encrypted media."
+msgstr "%1%2 (залгагдаагүй)"
 
-#: mounthelper/tdeio_media_mounthelper.cpp:295
+#: mounthelper/tdeio_media_mounthelper.cpp:397
 #, fuzzy
-msgid "Decrypt given URL"
+#| msgid "Unknown"
+msgid "Unknown unlock error."
+msgstr "Тодорхойгүй"
+
+#: mounthelper/tdeio_media_mounthelper.cpp:410
+#, fuzzy
+#| msgid "Unmount given URL"
+msgid "Mount given URL"
 msgstr "Өгсөн хаягаас (URL) салгах"
 
-#: mounthelper/tdeio_media_mounthelper.cpp:296
+#: mounthelper/tdeio_media_mounthelper.cpp:411
 msgid "Unmount given URL"
 msgstr "Өгсөн хаягаас (URL) салгах"
 
-#: mounthelper/tdeio_media_mounthelper.cpp:297
+#: mounthelper/tdeio_media_mounthelper.cpp:412
 #, fuzzy
-msgid "Mount given URL (default)"
-msgstr "Өгсөн хаягаас (URL) залгах (mounten). Стандарт:"
+#| msgid "Unmount given URL"
+msgid "Unlock given URL"
+msgstr "Өгсөн хаягаас (URL) салгах"
 
-#: mounthelper/tdeio_media_mounthelper.cpp:298
-msgid "Eject given URL via tdeeject"
-msgstr ""
+#: mounthelper/tdeio_media_mounthelper.cpp:413
+#, fuzzy
+msgid "Lock given URL"
+msgstr "Өгсөн хаягаас (URL) салгах"
+
+#: mounthelper/tdeio_media_mounthelper.cpp:414
+#, fuzzy
+msgid "Eject given URL"
+msgstr "Өгсөн хаягаас (URL) салгах"
 
-#: mounthelper/tdeio_media_mounthelper.cpp:299
-msgid "Unmount and Eject given URL (necessary for some USB devices)"
+#: mounthelper/tdeio_media_mounthelper.cpp:415
+msgid "Safely remove (unmount and eject) given URL"
 msgstr ""
 
-#: mounthelper/tdeio_media_mounthelper.cpp:300
+#: 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 "Төхөөрөмж:/ url (Хаяг)"
 
 #: propsdlgplugin/propertiespage.cpp:137
@@ -613,7 +687,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
@@ -833,6 +907,14 @@ msgstr ""
 msgid "Filesystem: iso9660"
 msgstr ""
 
+#, fuzzy
+#~ msgid "Unknown decrypt error."
+#~ msgstr "Танигдахгүй төхөөрөмж"
+
+#, fuzzy
+#~ msgid "Mount given URL (default)"
+#~ msgstr "Өгсөн хаягаас (URL) залгах (mounten). Стандарт:"
+
 #~ msgid "Device not accessible"
 #~ msgstr "Төрөөрөмж рүү хандах боломжгүй"
 
@@ -864,6 +946,3 @@ msgstr ""
 
 #~ msgid "could not execute [%1]"
 #~ msgstr "Ажиллуулах боломжгүй [%1]"
-
-#~ msgid "%1%2 mounted at %3"
-#~ msgstr "%1%2 -г %3 -т залгах"
diff --git a/tde-i18n-ms/messages/tdebase/tdeio_media.po b/tde-i18n-ms/messages/tdebase/tdeio_media.po
index 666262bf17b..5c05c4ed59d 100644
--- a/tde-i18n-ms/messages/tdebase/tdeio_media.po
+++ b/tde-i18n-ms/messages/tdebase/tdeio_media.po
@@ -5,7 +5,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: 2006-10-20 20:19+0800\n"
 "Last-Translator: Sharuzzaman Ahmat Raslan <sharuzzaman@myrealbox.com>\n"
 "Language-Team: Malay <translation-team-ms@lists.sourceforge.net>\n"
@@ -47,28 +47,27 @@ msgstr "Logmasuk baru di dalam tetingkap bersarang"
 msgid "Unknown"
 msgstr "Entah"
 
-#: 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 "Pengurus media TDE tidak berjalan."
 
-#: mediaimpl.cpp:187
+#: mediaimpl.cpp:186
 msgid "This media name already exists."
 msgstr "Nama media ini sudah wujud."
 
-#: mediaimpl.cpp:230 mediaimpl.cpp:297
+#: mediaimpl.cpp:229 mediaimpl.cpp:296
 #, fuzzy
 msgid "No such medium."
 msgstr "Tiada fail sedemikian"
 
-#: 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 ""
 
@@ -81,395 +80,473 @@ 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
 #, fuzzy, c-format
 msgid "No such medium: %1"
 msgstr "Tiada fail sedemikian"
 
-#: mediamanager/fstabbackend.cpp:408
+#: mediamanager/fstabbackend.cpp:416
 msgid "CD Recorder"
 msgstr "Perakam CD"
 
-#: mediamanager/fstabbackend.cpp:414
+#: mediamanager/fstabbackend.cpp:422
 msgid "DVD"
 msgstr "DVD"
 
-#: mediamanager/fstabbackend.cpp:427
+#: mediamanager/fstabbackend.cpp:435
 msgid "CD-ROM"
 msgstr "CD-ROM"
 
-#: mediamanager/fstabbackend.cpp:440
+#: mediamanager/fstabbackend.cpp:448
 msgid "Floppy"
 msgstr "Cakera Liut"
 
-#: mediamanager/fstabbackend.cpp:448
+#: mediamanager/fstabbackend.cpp:456
 msgid "Zip Disk"
 msgstr "Cakera Zip"
 
-#: mediamanager/fstabbackend.cpp:459
+#: mediamanager/fstabbackend.cpp:467
 msgid "Removable Device"
 msgstr "Peranti Boleh Buang"
 
-#: mediamanager/fstabbackend.cpp:464 mediamanager/fstabbackend.cpp:470
+#: mediamanager/fstabbackend.cpp:472 mediamanager/fstabbackend.cpp:478
 msgid "Remote Share"
 msgstr "Perkongsian Jauh"
 
-#: mediamanager/fstabbackend.cpp:475
+#: mediamanager/fstabbackend.cpp:483
 msgid "Hard Disk"
 msgstr "Cakera Keras"
 
-#: mediamanager/halbackend.cpp:768 mediamanager/tdehardwarebackend.cpp:809
+#: mediamanager/halbackend.cpp:778 mediamanager/tdehardwarebackend.cpp:826
 #, fuzzy
 msgid "Unknown Drive"
 msgstr "Entah"
 
-#: mediamanager/halbackend.cpp:780 mediamanager/tdehardwarebackend.cpp:839
+#: mediamanager/halbackend.cpp:794 mediamanager/tdehardwarebackend.cpp:872
 #, fuzzy
 msgid "Floppy Drive"
 msgstr "Cakera Liut"
 
-#: mediamanager/halbackend.cpp:788
+#: mediamanager/halbackend.cpp:802
 #, fuzzy
 msgid "Zip Drive"
 msgstr "Cakera Zip"
 
-#: mediamanager/halbackend.cpp:858 mediamanager/tdehardwarebackend.cpp:896
+#: mediamanager/halbackend.cpp:877 mediamanager/tdehardwarebackend.cpp:930
 msgid "Camera"
 msgstr "Kamera"
 
-#: 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
 #, fuzzy
 msgid "Internal Error"
 msgstr "Ralat dalaman.\n"
 
-#: mediamanager/halbackend.cpp:1303
+#: mediamanager/halbackend.cpp:1322
 #, fuzzy
 msgid "Invalid filesystem type"
 msgstr "jenis rentetan m tidak sah `%s'"
 
-#: 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
 #, fuzzy
 msgid "Device is already mounted."
 msgstr "Peranti '%s' telah digunakan dalam multipath '%s'"
 
-#: 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 "
 "before attempting to unmount the device again."
 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. "
 msgstr ""
 
-#: 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 ""
 
-#: 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 bukan media boleh lekap."
+
+#: mediamanager/halbackend.cpp:1497 mediamanager/tdehardwarebackend.cpp:1225
+#: mounthelper/tdeio_media_mounthelper.cpp:68
+#, fuzzy
+msgid "%1 is already mounted to %2."
+msgstr "Peranti '%s' telah digunakan dalam multipath '%s'"
+
+#: 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 "Peranti '%s' telah digunakan dalam multipath '%s'"
+
+#: 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 "Ralat dalaman.\n"
 
-#: mediamanager/halbackend.cpp:1718
+#: mediamanager/halbackend.cpp:1745
 #, fuzzy
 msgid "Unknown error"
 msgstr "Entah"
 
-#: 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
 #, fuzzy
 msgid "Device is Busy:"
 msgstr "Fail \"%s\" adalah sebuah fail peranti"
 
-#: 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 bukan media boleh lekap."
+
+#: mediamanager/halbackend.cpp:1868 mediamanager/tdehardwarebackend.cpp:1452
+#: mounthelper/tdeio_media_mounthelper.cpp:127
+#, fuzzy
+msgid "%1 is already unlocked."
+msgstr "Peranti '%s' telah digunakan dalam multipath '%s'"
+
+#: 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 "Peranti '%s' telah digunakan dalam multipath '%s'"
+
 #: mediamanager/mediamanager.cpp:248 mediamanager/mediamanager.cpp:275
+#: mediamanager/mediamanager.cpp:302 mediamanager/mediamanager.cpp:329
 msgid "Feature only available with the TDE hardware backend"
 msgstr ""
 
 #: 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 ""
 
 #: mediamanager/mediamanager.cpp:262 mediamanager/mediamanager.cpp:289
-#: mediamanager/mediamanager.cpp:320 mediamanager/mediamanager.cpp:350
+#: mediamanager/mediamanager.cpp:316 mediamanager/mediamanager.cpp:343
 msgid "Feature only available with HAL or TDE hardware backend"
 msgstr ""
 
-#: 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 "Peranti Boleh Buang"
 
-#: mediamanager/tdehardwarebackend.cpp:529
+#: mediamanager/tdehardwarebackend.cpp:532
 #, fuzzy
 msgid "Blank CD-ROM"
 msgstr "CD-ROM"
 
-#: 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 "CD-ROM"
 
-#: mediamanager/tdehardwarebackend.cpp:682
+#: mediamanager/tdehardwarebackend.cpp:702
 #, fuzzy
 msgid "Blank BLURAY-R"
 msgstr "CD-ROM"
 
-#: 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 "Cakera 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:1516
+msgid "Unable to lock the device."
 msgstr ""
 
-#: mediamanager/tdehardwarebackend.cpp:1578
+#: mediamanager/tdehardwarebackend.cpp:1623
 msgid ""
 "Programs still using the device have been detected. They are listed below. "
 "You have to close them or change their working directory before attempting "
 "to unmount the device again."
 msgstr ""
 
-#: mounthelper/tdeio_media_mounthelper.cpp:79
-msgid "%1 cannot be found."
-msgstr "%1 tidak dapat ditemui."
+#: mounthelper/tdeio_media_mounthelper.cpp:49
+#, fuzzy
+#| msgid "The TDE mediamanager is not running."
+msgid "The TDE mediamanager is not running.\n"
+msgstr "Pengurus media TDE tidak berjalan."
 
-#: mounthelper/tdeio_media_mounthelper.cpp:87
-msgid "%1 is not a mountable media."
-msgstr "%1 bukan media boleh lekap."
+#: 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 bukan media boleh lekap."
+#: 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 "Peranti '%s' telah digunakan dalam multipath '%s'"
-
-#: 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"
+#: 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"
+#: mounthelper/tdeio_media_mounthelper.cpp:148
+msgid "Try to lock an unknown medium."
+msgstr ""
+
+#: mounthelper/tdeio_media_mounthelper.cpp:173
+#, fuzzy
+msgid "Unknown lock error."
+msgstr "Entah"
+
+#: mounthelper/tdeio_media_mounthelper.cpp:211
+msgid "Try to release holders from an unknown medium."
 msgstr ""
 
-#: mounthelper/tdeio_media_mounthelper.cpp:281
-msgid "Unknown decrypt error."
+#: 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 tidak dapat ditemui."
+
+#: mounthelper/tdeio_media_mounthelper.cpp:310
 #, fuzzy
-msgid "Decrypt given URL"
+msgid "%1 is not a mountable or encrypted media."
+msgstr "%1 bukan media boleh lekap."
+
+#: mounthelper/tdeio_media_mounthelper.cpp:397
+#, fuzzy
+msgid "Unknown unlock error."
+msgstr "Entah"
+
+#: mounthelper/tdeio_media_mounthelper.cpp:410
+#, fuzzy
+#| msgid "Unmount given URL"
+msgid "Mount given URL"
 msgstr "Nyahlekap URL diberi"
 
-#: mounthelper/tdeio_media_mounthelper.cpp:296
+#: mounthelper/tdeio_media_mounthelper.cpp:411
 msgid "Unmount given URL"
 msgstr "Nyahlekap URL diberi"
 
-#: mounthelper/tdeio_media_mounthelper.cpp:297
-msgid "Mount given URL (default)"
-msgstr "Lekap URL diberi (default)"
+#: mounthelper/tdeio_media_mounthelper.cpp:412
+#, fuzzy
+#| msgid "Unmount given URL"
+msgid "Unlock given URL"
+msgstr "Nyahlekap URL diberi"
 
-#: mounthelper/tdeio_media_mounthelper.cpp:298
-msgid "Eject given URL via tdeeject"
-msgstr "Lenting URL diberi dengan tdeeject"
+#: mounthelper/tdeio_media_mounthelper.cpp:413
+#, fuzzy
+msgid "Lock given URL"
+msgstr "Nyahlekap URL diberi"
 
-#: mounthelper/tdeio_media_mounthelper.cpp:299
-msgid "Unmount and Eject given URL (necessary for some USB devices)"
+#: mounthelper/tdeio_media_mounthelper.cpp:414
+#, fuzzy
+msgid "Eject given URL"
+msgstr "Nyahlekap URL diberi"
+
+#: mounthelper/tdeio_media_mounthelper.cpp:415
+msgid "Safely remove (unmount and eject) given URL"
 msgstr ""
-"Nyahlekap dan Lenting URL yang diberi (perlu untuk sesetengah peranti USB)"
 
-#: 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:/ URL hendak dilekap/nyahlekap/lenting/buang"
 
 #: propsdlgplugin/propertiespage.cpp:137
@@ -620,7 +697,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
@@ -840,6 +917,16 @@ msgstr "Persekitaran Bercampur"
 msgid "Filesystem: iso9660"
 msgstr "Tiada sistemfail"
 
+#~ msgid "Mount given URL (default)"
+#~ msgstr "Lekap URL diberi (default)"
+
+#~ msgid "Eject given URL via tdeeject"
+#~ msgstr "Lenting URL diberi dengan tdeeject"
+
+#~ msgid "Unmount and Eject given URL (necessary for some USB devices)"
+#~ msgstr ""
+#~ "Nyahlekap dan Lenting URL yang diberi (perlu untuk sesetengah peranti USB)"
+
 #, fuzzy
 #~ msgid "Permission denied"
 #~ msgstr "tiada kebenaran"
diff --git a/tde-i18n-nb/messages/tdebase/tdeio_media.po b/tde-i18n-nb/messages/tdebase/tdeio_media.po
index 6b6cc6bcbed..d77978437bc 100644
--- a/tde-i18n-nb/messages/tdebase/tdeio_media.po
+++ b/tde-i18n-nb/messages/tdebase/tdeio_media.po
@@ -9,7 +9,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-02-03 10:56+0100\n"
 "Last-Translator: Espen Talberg <espental@gmail.com>\n"
 "Language-Team: Norwegian (Bokmål) <i18n-nb@lister.ping.uio.no>\n"
@@ -47,27 +47,26 @@ msgstr "Åpne i et nytt vindu."
 msgid "Unknown"
 msgstr "Ukjent"
 
-#: 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 "Mediehåndtereren i TDE kjører ikke."
 
-#: mediaimpl.cpp:187
+#: mediaimpl.cpp:186
 msgid "This media name already exists."
 msgstr "Dette medienavnet finnes allerede."
 
-#: mediaimpl.cpp:230 mediaimpl.cpp:297
+#: mediaimpl.cpp:229 mediaimpl.cpp:296
 msgid "No such medium."
 msgstr "Mediet finnes ikke."
 
-#: 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 ""
 
@@ -80,109 +79,110 @@ 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 "Mediet finnes ikke: %1"
 
-#: mediamanager/fstabbackend.cpp:408
+#: mediamanager/fstabbackend.cpp:416
 msgid "CD Recorder"
 msgstr "CD-brenner"
 
-#: mediamanager/fstabbackend.cpp:414
+#: mediamanager/fstabbackend.cpp:422
 msgid "DVD"
 msgstr "DVD"
 
-#: mediamanager/fstabbackend.cpp:427
+#: mediamanager/fstabbackend.cpp:435
 msgid "CD-ROM"
 msgstr "CD-spiller"
 
-#: mediamanager/fstabbackend.cpp:440
+#: mediamanager/fstabbackend.cpp:448
 msgid "Floppy"
 msgstr "Diskett"
 
-#: mediamanager/fstabbackend.cpp:448
+#: mediamanager/fstabbackend.cpp:456
 msgid "Zip Disk"
 msgstr "Zip-disk"
 
-#: mediamanager/fstabbackend.cpp:459
+#: mediamanager/fstabbackend.cpp:467
 msgid "Removable Device"
 msgstr "Flyttbar enhet"
 
-#: mediamanager/fstabbackend.cpp:464 mediamanager/fstabbackend.cpp:470
+#: mediamanager/fstabbackend.cpp:472 mediamanager/fstabbackend.cpp:478
 msgid "Remote Share"
 msgstr "Delt nettverksressurs"
 
-#: mediamanager/fstabbackend.cpp:475
+#: mediamanager/fstabbackend.cpp:483
 msgid "Hard Disk"
 msgstr "Harddisk"
 
 # | msgid "Unknown"
-#: mediamanager/halbackend.cpp:768 mediamanager/tdehardwarebackend.cpp:809
+#: mediamanager/halbackend.cpp:778 mediamanager/tdehardwarebackend.cpp:826
 #, fuzzy
 msgid "Unknown Drive"
 msgstr "Ukjent"
 
 # | msgid "Floppy"
-#: mediamanager/halbackend.cpp:780 mediamanager/tdehardwarebackend.cpp:839
+#: mediamanager/halbackend.cpp:794 mediamanager/tdehardwarebackend.cpp:872
 #, fuzzy
 msgid "Floppy Drive"
 msgstr "Diskett"
 
 # | msgid "Zip Disk"
-#: mediamanager/halbackend.cpp:788
+#: mediamanager/halbackend.cpp:802
 #, fuzzy
 msgid "Zip Drive"
 msgstr "Zip-disk"
 
-#: mediamanager/halbackend.cpp:858 mediamanager/tdehardwarebackend.cpp:896
+#: mediamanager/halbackend.cpp:877 mediamanager/tdehardwarebackend.cpp:930
 msgid "Camera"
 msgstr "Kamera"
 
-#: 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 "Intern feil"
 
-#: mediamanager/halbackend.cpp:1303
+#: mediamanager/halbackend.cpp:1322
 msgid "Invalid filesystem type"
 msgstr "Ugyldig filsystemtype"
 
-#: 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 "Enheten er allerede montert."
 
-#: 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 "
@@ -192,16 +192,16 @@ msgstr ""
 "lista nedenfor. Før en avmontering kan forsøkes igjen må du må lukke disse "
 "eller endre deres arbeidsmapper."
 
-#: 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. "
@@ -209,209 +209,257 @@ msgstr ""
 "Desverre, enheten <b>%1</b> (%2) navngitt <b>'%3'</b> og montert på <b>%4</"
 "b> kunne ikke avmonteres. "
 
-#: 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 "Følgende feil ble returnert av kommandoen for avmontering:"
 
-#: 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» er ikke et monterbart medium."
+
+#: mediamanager/halbackend.cpp:1497 mediamanager/tdehardwarebackend.cpp:1225
+#: mounthelper/tdeio_media_mounthelper.cpp:68
+#, fuzzy
+msgid "%1 is already mounted to %2."
+msgstr "Enheten er allerede montert."
+
+#: 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 "Enheten er allerede montert."
+
+#: 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 "Intern feil"
 
-#: mediamanager/halbackend.cpp:1718
+#: mediamanager/halbackend.cpp:1745
 #, fuzzy
 #| msgid "Unknown"
 msgid "Unknown error"
 msgstr "Ukjent"
 
-#: mediamanager/halbackend.cpp:1772
+#: mediamanager/halbackend.cpp:1799
 msgid "Unmounting failed due to the following error:"
 msgstr "Avmontering feilet på grunn av følgende feil:"
 
-#: mediamanager/halbackend.cpp:1774
+#: mediamanager/halbackend.cpp:1801
 msgid "Device is Busy:"
 msgstr "Enheten er opptatt:"
 
-#: 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» er ikke et monterbart medium."
+
+#: mediamanager/halbackend.cpp:1868 mediamanager/tdehardwarebackend.cpp:1452
+#: mounthelper/tdeio_media_mounthelper.cpp:127
+#, fuzzy
+msgid "%1 is already unlocked."
+msgstr "Enheten er allerede montert."
+
+#: 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 "Enheten er allerede montert."
+
 #: 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 "Funksjonen er kun tilgjengelig med 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 "Funksjonen er kun tilgjengelig med 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 "Funksjonen er kun tilgjengelig med 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 "Flyttbar enhet"
 
-#: mediamanager/tdehardwarebackend.cpp:529
+#: mediamanager/tdehardwarebackend.cpp:532
 #, fuzzy
 msgid "Blank CD-ROM"
 msgstr "CD-spiller"
 
-#: 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 "CD-spiller"
 
-#: mediamanager/tdehardwarebackend.cpp:682
+#: mediamanager/tdehardwarebackend.cpp:702
 #, fuzzy
 msgid "Blank BLURAY-R"
 msgstr "CD-spiller"
 
-#: 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-disk"
 
-#: 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. "
@@ -422,63 +470,95 @@ msgstr ""
 "lista nedenfor. Før en avmontering kan forsøkes igjen må du må lukke disse "
 "eller endre deres arbeidsmapper."
 
-#: mounthelper/tdeio_media_mounthelper.cpp:79
-msgid "%1 cannot be found."
-msgstr "Finner ikke «%1»."
+#: mounthelper/tdeio_media_mounthelper.cpp:49
+#, fuzzy
+#| msgid "The TDE mediamanager is not running."
+msgid "The TDE mediamanager is not running.\n"
+msgstr "Mediehåndtereren i TDE kjører ikke."
 
-#: mounthelper/tdeio_media_mounthelper.cpp:87
-msgid "%1 is not a mountable media."
-msgstr "«%1» er ikke et monterbart medium."
+#: 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» er ikke et monterbart medium."
+#: 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 "Enheten er allerede montert."
-
-#: 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 "Avmontering av enheten var vellykket, men skuffen kunne ikke åpnes"
+#: mounthelper/tdeio_media_mounthelper.cpp:116
+msgid "Try to unlock an unknown medium."
+msgstr ""
+
+#: mounthelper/tdeio_media_mounthelper.cpp:148
+msgid "Try to lock an unknown medium."
+msgstr ""
+
+#: mounthelper/tdeio_media_mounthelper.cpp:173
+#, fuzzy
+#| msgid "Unknown"
+msgid "Unknown lock error."
+msgstr "Ukjent"
 
-#: mounthelper/tdeio_media_mounthelper.cpp:248
-msgid "The device was successfully unmounted, but could not be ejected"
-msgstr "Avmontering av enheten var vellykket, men kunne ikke løses ut"
+#: mounthelper/tdeio_media_mounthelper.cpp:211
+msgid "Try to release holders from an unknown medium."
+msgstr ""
 
-#: mounthelper/tdeio_media_mounthelper.cpp:281
-msgid "Unknown decrypt error."
+#: 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 "Finner ikke «%1»."
+
+#: mounthelper/tdeio_media_mounthelper.cpp:310
 #, fuzzy
-msgid "Decrypt given URL"
+msgid "%1 is not a mountable or encrypted media."
+msgstr "«%1» er ikke et monterbart medium."
+
+#: mounthelper/tdeio_media_mounthelper.cpp:397
+#, fuzzy
+#| msgid "Unknown"
+msgid "Unknown unlock error."
+msgstr "Ukjent"
+
+#: mounthelper/tdeio_media_mounthelper.cpp:410
+#, fuzzy
+#| msgid "Unmount given URL"
+msgid "Mount given URL"
 msgstr "Avmonter URL"
 
-#: mounthelper/tdeio_media_mounthelper.cpp:296
+#: mounthelper/tdeio_media_mounthelper.cpp:411
 msgid "Unmount given URL"
 msgstr "Avmonter URL"
 
-#: mounthelper/tdeio_media_mounthelper.cpp:297
-msgid "Mount given URL (default)"
-msgstr "Monter URL (standard)"
+#: mounthelper/tdeio_media_mounthelper.cpp:412
+#, fuzzy
+#| msgid "Unmount given URL"
+msgid "Unlock given URL"
+msgstr "Avmonter URL"
 
-#: mounthelper/tdeio_media_mounthelper.cpp:298
-msgid "Eject given URL via tdeeject"
-msgstr "Løs ut URL med tdeeject"
+#: mounthelper/tdeio_media_mounthelper.cpp:413
+#, fuzzy
+msgid "Lock given URL"
+msgstr "Avmonter URL"
 
-#: mounthelper/tdeio_media_mounthelper.cpp:299
-msgid "Unmount and Eject given URL (necessary for some USB devices)"
-msgstr "Avmonter og løs ut valgt URL (nødvendig for enkelte USB-enheter)"
+#: mounthelper/tdeio_media_mounthelper.cpp:414
+#, fuzzy
+msgid "Eject given URL"
+msgstr "Avmonter URL"
 
-#: mounthelper/tdeio_media_mounthelper.cpp:300
-msgid "media:/ URL to mount/unmount/eject/remove"
+#: mounthelper/tdeio_media_mounthelper.cpp:415
+msgid "Safely remove (unmount and eject) given URL"
+msgstr ""
+
+#: 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:/-URL som skal monteres/avmonteres/løses ut/fjernes"
 
 #: propsdlgplugin/propertiespage.cpp:137
@@ -627,7 +707,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
@@ -891,6 +971,22 @@ msgstr "Blandet"
 msgid "Filesystem: iso9660"
 msgstr "Filsystem: iso9660"
 
+#~ msgid ""
+#~ "The device was successfully unmounted, but the tray could not be opened"
+#~ msgstr "Avmontering av enheten var vellykket, men skuffen kunne ikke åpnes"
+
+#~ msgid "The device was successfully unmounted, but could not be ejected"
+#~ msgstr "Avmontering av enheten var vellykket, men kunne ikke løses ut"
+
+#~ msgid "Mount given URL (default)"
+#~ msgstr "Monter URL (standard)"
+
+#~ msgid "Eject given URL via tdeeject"
+#~ msgstr "Løs ut URL med tdeeject"
+
+#~ msgid "Unmount and Eject given URL (necessary for some USB devices)"
+#~ msgstr "Avmonter og løs ut valgt URL (nødvendig for enkelte USB-enheter)"
+
 #, fuzzy
 #~ msgid "Permission denied"
 #~ msgstr "Utilstrekkelige rettigheter"
diff --git a/tde-i18n-nds/messages/tdebase/tdeio_media.po b/tde-i18n-nds/messages/tdebase/tdeio_media.po
index e39d0f367bc..869d6cf2541 100644
--- a/tde-i18n-nds/messages/tdebase/tdeio_media.po
+++ b/tde-i18n-nds/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-11-25 01:11+0100\n"
 "Last-Translator: Sönke Dibbern <s_dibbern@web.de>\n"
 "Language-Team: Low Saxon <kde-i18n-nds@kde.org>\n"
@@ -44,27 +44,26 @@ msgstr "Nieg Finster opmaken"
 msgid "Unknown"
 msgstr "Nich bekannt"
 
-#: 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 "De TDE-Medienpleger löppt nich."
 
-#: mediaimpl.cpp:187
+#: mediaimpl.cpp:186
 msgid "This media name already exists."
 msgstr "Dat gifft al en Medium mit dissen Naam."
 
-#: mediaimpl.cpp:230 mediaimpl.cpp:297
+#: mediaimpl.cpp:229 mediaimpl.cpp:296
 msgid "No such medium."
 msgstr "Dat gifft dit Medium nich."
 
-#: 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,103 +76,104 @@ 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 "Dat gifft dit Medium nich: %1"
 
-#: mediamanager/fstabbackend.cpp:408
+#: mediamanager/fstabbackend.cpp:416
 msgid "CD Recorder"
 msgstr "CD-Opnehmer"
 
-#: mediamanager/fstabbackend.cpp:414
+#: mediamanager/fstabbackend.cpp:422
 msgid "DVD"
 msgstr "DVD"
 
-#: mediamanager/fstabbackend.cpp:427
+#: mediamanager/fstabbackend.cpp:435
 msgid "CD-ROM"
 msgstr "CD-ROM"
 
-#: mediamanager/fstabbackend.cpp:440
+#: mediamanager/fstabbackend.cpp:448
 msgid "Floppy"
 msgstr "Diskett"
 
-#: mediamanager/fstabbackend.cpp:448
+#: mediamanager/fstabbackend.cpp:456
 msgid "Zip Disk"
 msgstr "Zip-Diskett"
 
-#: mediamanager/fstabbackend.cpp:459
+#: mediamanager/fstabbackend.cpp:467
 msgid "Removable Device"
 msgstr "Wesselreedschap"
 
-#: mediamanager/fstabbackend.cpp:464 mediamanager/fstabbackend.cpp:470
+#: mediamanager/fstabbackend.cpp:472 mediamanager/fstabbackend.cpp:478
 msgid "Remote Share"
 msgstr "Feern Freegaav"
 
-#: mediamanager/fstabbackend.cpp:475
+#: mediamanager/fstabbackend.cpp:483
 msgid "Hard Disk"
 msgstr "Fastplaat"
 
-#: mediamanager/halbackend.cpp:768 mediamanager/tdehardwarebackend.cpp:809
+#: mediamanager/halbackend.cpp:778 mediamanager/tdehardwarebackend.cpp:826
 msgid "Unknown Drive"
 msgstr "Nich begäng Loopwark"
 
-#: mediamanager/halbackend.cpp:780 mediamanager/tdehardwarebackend.cpp:839
+#: mediamanager/halbackend.cpp:794 mediamanager/tdehardwarebackend.cpp:872
 msgid "Floppy Drive"
 msgstr "Diskettenloopwark"
 
-#: mediamanager/halbackend.cpp:788
+#: mediamanager/halbackend.cpp:802
 msgid "Zip Drive"
 msgstr "Zip-Loopwark"
 
-#: mediamanager/halbackend.cpp:858 mediamanager/tdehardwarebackend.cpp:896
+#: mediamanager/halbackend.cpp:877 mediamanager/tdehardwarebackend.cpp:930
 msgid "Camera"
 msgstr "Kamera"
 
-#: 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 "Intern Fehler"
 
-#: mediamanager/halbackend.cpp:1303
+#: mediamanager/halbackend.cpp:1322
 msgid "Invalid filesystem type"
 msgstr "Leeg Dateisysteem-Typ"
 
-#: 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 "Reedschap is al inhangt"
 
-#: 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 "
@@ -183,16 +183,16 @@ msgstr ""
 "oplist. Maak se bitte to oder änner ehr Arbeitorner, ehr Du dat Afhangen vun "
 "de Reedschap nochmaal versöchst."
 
-#: 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. "
@@ -200,209 +200,257 @@ msgstr ""
 "Leider lett sik de Reedschap <b>%1</b> (%2) mit den Naam \"%3\", opstunns "
 "inhangt op <b>%4</b>, nich afhangen. "
 
-#: 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 "De Befehl \"umount\" hett dissen Fehler torüchgeven:"
 
-#: 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 is keen Medium, wat sik inhangen lett."
+
+#: mediamanager/halbackend.cpp:1497 mediamanager/tdehardwarebackend.cpp:1225
+#: mounthelper/tdeio_media_mounthelper.cpp:68
+#, fuzzy
+msgid "%1 is already mounted to %2."
+msgstr "Reedschap is al inhangt"
+
+#: 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 "Reedschap is al inhangt"
+
+#: 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 "Intern Fehler"
 
-#: mediamanager/halbackend.cpp:1718
+#: mediamanager/halbackend.cpp:1745
 #, fuzzy
 #| msgid "Unknown"
 msgid "Unknown error"
 msgstr "Nich bekannt"
 
-#: mediamanager/halbackend.cpp:1772
+#: mediamanager/halbackend.cpp:1799
 msgid "Unmounting failed due to the following error:"
 msgstr "Afhangen fehlslaan, wiel dat dissen Fehler geev:"
 
-#: mediamanager/halbackend.cpp:1774
+#: mediamanager/halbackend.cpp:1801
 msgid "Device is Busy:"
 msgstr "Reedschap hett to doon:"
 
-#: 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 is keen Medium, wat sik inhangen lett."
+
+#: mediamanager/halbackend.cpp:1868 mediamanager/tdehardwarebackend.cpp:1452
+#: mounthelper/tdeio_media_mounthelper.cpp:127
+#, fuzzy
+msgid "%1 is already unlocked."
+msgstr "Reedschap is al inhangt"
+
+#: 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 "Reedschap is al inhangt"
+
 #: 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 "Funkschoon bloots mit HAL verföögbor"
 
 #: 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 "Funkschoon bloots mit HAL verföögbor"
 
 #: 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 "Funkschoon bloots mit HAL verföögbor"
 
-#: 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 "Wesselreedschap"
 
-#: mediamanager/tdehardwarebackend.cpp:529
+#: mediamanager/tdehardwarebackend.cpp:532
 #, fuzzy
 msgid "Blank CD-ROM"
 msgstr "CD-ROM"
 
-#: 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 "CD-ROM"
 
-#: mediamanager/tdehardwarebackend.cpp:682
+#: mediamanager/tdehardwarebackend.cpp:702
 #, fuzzy
 msgid "Blank BLURAY-R"
 msgstr "CD-ROM"
 
-#: 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-Diskett"
 
-#: 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. "
@@ -413,64 +461,95 @@ msgstr ""
 "oplist. Maak se bitte to oder änner ehr Arbeitorner, ehr Du dat Afhangen vun "
 "de Reedschap nochmaal versöchst."
 
-#: mounthelper/tdeio_media_mounthelper.cpp:79
-msgid "%1 cannot be found."
-msgstr "%1 lett sik nich finnen."
+#: mounthelper/tdeio_media_mounthelper.cpp:49
+#, fuzzy
+#| msgid "The TDE mediamanager is not running."
+msgid "The TDE mediamanager is not running.\n"
+msgstr "De TDE-Medienpleger löppt nich."
 
-#: mounthelper/tdeio_media_mounthelper.cpp:87
-msgid "%1 is not a mountable media."
-msgstr "%1 is keen Medium, wat sik inhangen lett."
+#: 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 is keen Medium, wat sik inhangen lett."
+#: 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 "Reedschap is al inhangt"
-
-#: 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 "De Reedschap wöör afhangt, man de Schuuv lett sik nich opmaken."
+#: 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 "De Reedschap wöör afhangt, man se lett sik nich rutfohren"
+#: mounthelper/tdeio_media_mounthelper.cpp:148
+msgid "Try to lock an unknown medium."
+msgstr ""
+
+#: mounthelper/tdeio_media_mounthelper.cpp:173
+#, fuzzy
+#| msgid "Unknown"
+msgid "Unknown lock error."
+msgstr "Nich bekannt"
 
-#: mounthelper/tdeio_media_mounthelper.cpp:281
-msgid "Unknown decrypt error."
+#: mounthelper/tdeio_media_mounthelper.cpp:211
+msgid "Try to release holders from an unknown medium."
 msgstr ""
 
-#: mounthelper/tdeio_media_mounthelper.cpp:295
+#: mounthelper/tdeio_media_mounthelper.cpp:270
+msgid "Try to safe remove an unknown medium."
+msgstr ""
+
+#: mounthelper/tdeio_media_mounthelper.cpp:302
+msgid "%1 cannot be found."
+msgstr "%1 lett sik nich finnen."
+
+#: mounthelper/tdeio_media_mounthelper.cpp:310
 #, fuzzy
-msgid "Decrypt given URL"
+msgid "%1 is not a mountable or encrypted media."
+msgstr "%1 is keen Medium, wat sik inhangen lett."
+
+#: mounthelper/tdeio_media_mounthelper.cpp:397
+#, fuzzy
+#| msgid "Unknown"
+msgid "Unknown unlock error."
+msgstr "Nich bekannt"
+
+#: mounthelper/tdeio_media_mounthelper.cpp:410
+#, fuzzy
+#| msgid "Unmount given URL"
+msgid "Mount given URL"
 msgstr "Angeven URL afhangen"
 
-#: mounthelper/tdeio_media_mounthelper.cpp:296
+#: mounthelper/tdeio_media_mounthelper.cpp:411
 msgid "Unmount given URL"
 msgstr "Angeven URL afhangen"
 
-#: mounthelper/tdeio_media_mounthelper.cpp:297
-msgid "Mount given URL (default)"
-msgstr "Angeven URL inhangen (Standard)"
+#: mounthelper/tdeio_media_mounthelper.cpp:412
+#, fuzzy
+#| msgid "Unmount given URL"
+msgid "Unlock given URL"
+msgstr "Angeven URL afhangen"
 
-#: mounthelper/tdeio_media_mounthelper.cpp:298
-msgid "Eject given URL via tdeeject"
-msgstr "Angeven URL över tdeeject rutfohren"
+#: mounthelper/tdeio_media_mounthelper.cpp:413
+#, fuzzy
+msgid "Lock given URL"
+msgstr "Angeven URL afhangen"
 
-#: mounthelper/tdeio_media_mounthelper.cpp:299
-msgid "Unmount and Eject given URL (necessary for some USB devices)"
+#: mounthelper/tdeio_media_mounthelper.cpp:414
+#, fuzzy
+msgid "Eject given URL"
+msgstr "Angeven URL afhangen"
+
+#: mounthelper/tdeio_media_mounthelper.cpp:415
+msgid "Safely remove (unmount and eject) given URL"
 msgstr ""
-"Angeven URL afhangen un rutfohren (deit noot för en Reeg USB-Reedschappen)"
 
-#: 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:/-URL för't Inhangen / Afhangen / Rutfohren / Utkoppeln"
 
 #: propsdlgplugin/propertiespage.cpp:137
@@ -619,7 +698,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
@@ -885,6 +964,23 @@ msgstr "Mischt"
 msgid "Filesystem: iso9660"
 msgstr "Dateisysteem: ISO9660"
 
+#~ msgid ""
+#~ "The device was successfully unmounted, but the tray could not be opened"
+#~ msgstr "De Reedschap wöör afhangt, man de Schuuv lett sik nich opmaken."
+
+#~ msgid "The device was successfully unmounted, but could not be ejected"
+#~ msgstr "De Reedschap wöör afhangt, man se lett sik nich rutfohren"
+
+#~ msgid "Mount given URL (default)"
+#~ msgstr "Angeven URL inhangen (Standard)"
+
+#~ msgid "Eject given URL via tdeeject"
+#~ msgstr "Angeven URL över tdeeject rutfohren"
+
+#~ msgid "Unmount and Eject given URL (necessary for some USB devices)"
+#~ msgstr ""
+#~ "Angeven URL afhangen un rutfohren (deit noot för en Reeg USB-Reedschappen)"
+
 #, fuzzy
 #~ msgid "Permission denied"
 #~ msgstr "Keen Verlöven"
diff --git a/tde-i18n-nl/messages/tdebase/tdeio_media.po b/tde-i18n-nl/messages/tdebase/tdeio_media.po
index f33b9e5da71..2ad013ac7cc 100644
--- a/tde-i18n-nl/messages/tdebase/tdeio_media.po
+++ b/tde-i18n-nl/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: 2008-01-12 23:32+0100\n"
 "Last-Translator: Rinse de Vries <rinsedevries@kde.nl>\n"
 "Language-Team: Dutch <kde-i18n-nl@kde.org>\n"
@@ -45,27 +45,26 @@ msgstr "Openen in nieuw venster"
 msgid "Unknown"
 msgstr "Onbekend"
 
-#: 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 "De TDE-mediabeheerder draait niet."
 
-#: mediaimpl.cpp:187
+#: mediaimpl.cpp:186
 msgid "This media name already exists."
 msgstr "Deze mediumnaam bestaat al."
 
-#: mediaimpl.cpp:230 mediaimpl.cpp:297
+#: mediaimpl.cpp:229 mediaimpl.cpp:296
 msgid "No such medium."
 msgstr "Medium bestaat niet."
 
-#: 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 ""
 
@@ -78,103 +77,104 @@ 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 "Medium bestaat niet: %1"
 
-#: mediamanager/fstabbackend.cpp:408
+#: mediamanager/fstabbackend.cpp:416
 msgid "CD Recorder"
 msgstr "CD-recorder"
 
-#: mediamanager/fstabbackend.cpp:414
+#: mediamanager/fstabbackend.cpp:422
 msgid "DVD"
 msgstr "DVD"
 
-#: mediamanager/fstabbackend.cpp:427
+#: mediamanager/fstabbackend.cpp:435
 msgid "CD-ROM"
 msgstr "CD-ROM"
 
-#: mediamanager/fstabbackend.cpp:440
+#: mediamanager/fstabbackend.cpp:448
 msgid "Floppy"
 msgstr "Diskette"
 
-#: mediamanager/fstabbackend.cpp:448
+#: mediamanager/fstabbackend.cpp:456
 msgid "Zip Disk"
 msgstr "Zip-diskette"
 
-#: mediamanager/fstabbackend.cpp:459
+#: mediamanager/fstabbackend.cpp:467
 msgid "Removable Device"
 msgstr "Verwijderbaar apparaat"
 
-#: mediamanager/fstabbackend.cpp:464 mediamanager/fstabbackend.cpp:470
+#: mediamanager/fstabbackend.cpp:472 mediamanager/fstabbackend.cpp:478
 msgid "Remote Share"
 msgstr "Gedeelde bron op afstand"
 
-#: mediamanager/fstabbackend.cpp:475
+#: mediamanager/fstabbackend.cpp:483
 msgid "Hard Disk"
 msgstr "Harde schijf"
 
-#: mediamanager/halbackend.cpp:768 mediamanager/tdehardwarebackend.cpp:809
+#: mediamanager/halbackend.cpp:778 mediamanager/tdehardwarebackend.cpp:826
 msgid "Unknown Drive"
 msgstr "Onbekend station"
 
-#: mediamanager/halbackend.cpp:780 mediamanager/tdehardwarebackend.cpp:839
+#: mediamanager/halbackend.cpp:794 mediamanager/tdehardwarebackend.cpp:872
 msgid "Floppy Drive"
 msgstr "Diskettestation"
 
-#: mediamanager/halbackend.cpp:788
+#: mediamanager/halbackend.cpp:802
 msgid "Zip Drive"
 msgstr "Zip-station"
 
-#: mediamanager/halbackend.cpp:858 mediamanager/tdehardwarebackend.cpp:896
+#: mediamanager/halbackend.cpp:877 mediamanager/tdehardwarebackend.cpp:930
 msgid "Camera"
 msgstr "Camera"
 
-#: 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 "Interne fout"
 
-#: mediamanager/halbackend.cpp:1303
+#: mediamanager/halbackend.cpp:1322
 msgid "Invalid filesystem type"
 msgstr "Ongeldig bestandssysteemtype"
 
-#: 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 "Station is reeds aangekoppeld."
 
-#: 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 "
@@ -184,16 +184,16 @@ msgstr ""
 "apparaat. Deze worden hieronder getoond. U dient deze te sluiten of de "
 "werkmap te wijzigen alvorens u het apparaat kunt afkoppelen."
 
-#: 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. "
@@ -201,209 +201,257 @@ msgstr ""
 "Het apparaat <b>%1</b> (%2) genaamd <b>'%3'</b>, dat is aangekoppeld op <b>"
 "%4</b> kon niet worden afgekoppeld"
 
-#: 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 "Het umount-commando gaf de volgende foutmelding:"
 
-#: 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 is geen aankoppelbaar medium."
+
+#: mediamanager/halbackend.cpp:1497 mediamanager/tdehardwarebackend.cpp:1225
+#: mounthelper/tdeio_media_mounthelper.cpp:68
+#, fuzzy
+msgid "%1 is already mounted to %2."
+msgstr "Station is reeds aangekoppeld."
+
+#: 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 "Station is reeds aangekoppeld."
+
+#: 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 "Interne fout"
 
-#: mediamanager/halbackend.cpp:1718
+#: mediamanager/halbackend.cpp:1745
 #, fuzzy
 #| msgid "Unknown"
 msgid "Unknown error"
 msgstr "Onbekend"
 
-#: mediamanager/halbackend.cpp:1772
+#: mediamanager/halbackend.cpp:1799
 msgid "Unmounting failed due to the following error:"
 msgstr "Het afkoppelen is mislukt vanwege de volgende fout:"
 
-#: mediamanager/halbackend.cpp:1774
+#: mediamanager/halbackend.cpp:1801
 msgid "Device is Busy:"
 msgstr "Station is in gebruik:"
 
-#: 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 is geen aankoppelbaar medium."
+
+#: mediamanager/halbackend.cpp:1868 mediamanager/tdehardwarebackend.cpp:1452
+#: mounthelper/tdeio_media_mounthelper.cpp:127
+#, fuzzy
+msgid "%1 is already unlocked."
+msgstr "Station is reeds aangekoppeld."
+
+#: 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 "Station is reeds aangekoppeld."
+
 #: 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 "Functie alleen mogelijk met 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 "Functie alleen mogelijk met 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 "Functie alleen mogelijk met 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 "Verwijderbaar apparaat"
 
-#: mediamanager/tdehardwarebackend.cpp:529
+#: mediamanager/tdehardwarebackend.cpp:532
 #, fuzzy
 msgid "Blank CD-ROM"
 msgstr "CD-ROM"
 
-#: 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 "CD-ROM"
 
-#: mediamanager/tdehardwarebackend.cpp:682
+#: mediamanager/tdehardwarebackend.cpp:702
 #, fuzzy
 msgid "Blank BLURAY-R"
 msgstr "CD-ROM"
 
-#: 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-diskette"
 
-#: 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. "
@@ -414,66 +462,95 @@ msgstr ""
 "apparaat. Deze worden hieronder getoond. U dient deze te sluiten of de "
 "werkmap te wijzigen alvorens u het apparaat kunt afkoppelen."
 
-#: mounthelper/tdeio_media_mounthelper.cpp:79
-msgid "%1 cannot be found."
-msgstr "%1 is niet gevonden."
+#: mounthelper/tdeio_media_mounthelper.cpp:49
+#, fuzzy
+#| msgid "The TDE mediamanager is not running."
+msgid "The TDE mediamanager is not running.\n"
+msgstr "De TDE-mediabeheerder draait niet."
 
-#: mounthelper/tdeio_media_mounthelper.cpp:87
-msgid "%1 is not a mountable media."
-msgstr "%1 is geen aankoppelbaar medium."
+#: 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 is geen aankoppelbaar medium."
+#: 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 "Station is reeds aangekoppeld."
-
-#: 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"
+#: mounthelper/tdeio_media_mounthelper.cpp:116
+msgid "Try to unlock an unknown medium."
 msgstr ""
-"Het apparaat is succesvol afgekoppeld, maar de lade kon niet geopend worden"
 
-#: mounthelper/tdeio_media_mounthelper.cpp:248
-msgid "The device was successfully unmounted, but could not be ejected"
-msgstr "Het apparaat is succesvol afgekoppeld maar kon niet uitgeworpen worden"
+#: 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 "Onbekend"
+
+#: 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 is niet gevonden."
+
+#: mounthelper/tdeio_media_mounthelper.cpp:310
 #, fuzzy
-msgid "Decrypt given URL"
+msgid "%1 is not a mountable or encrypted media."
+msgstr "%1 is geen aankoppelbaar medium."
+
+#: mounthelper/tdeio_media_mounthelper.cpp:397
+#, fuzzy
+#| msgid "Unknown"
+msgid "Unknown unlock error."
+msgstr "Onbekend"
+
+#: mounthelper/tdeio_media_mounthelper.cpp:410
+#, fuzzy
+#| msgid "Unmount given URL"
+msgid "Mount given URL"
 msgstr "Opgegeven URL-adres afkoppelen"
 
-#: mounthelper/tdeio_media_mounthelper.cpp:296
+#: mounthelper/tdeio_media_mounthelper.cpp:411
 msgid "Unmount given URL"
 msgstr "Opgegeven URL-adres afkoppelen"
 
-#: mounthelper/tdeio_media_mounthelper.cpp:297
-msgid "Mount given URL (default)"
-msgstr "Opgegeven URL-adres aankoppelen (standaard)"
+#: mounthelper/tdeio_media_mounthelper.cpp:412
+#, fuzzy
+#| msgid "Unmount given URL"
+msgid "Unlock given URL"
+msgstr "Opgegeven URL-adres afkoppelen"
+
+#: mounthelper/tdeio_media_mounthelper.cpp:413
+#, fuzzy
+msgid "Lock given URL"
+msgstr "Opgegeven URL-adres afkoppelen"
 
-#: mounthelper/tdeio_media_mounthelper.cpp:298
-msgid "Eject given URL via tdeeject"
-msgstr "Opgegeven URL-adres uitwerpen via tdeeject"
+#: mounthelper/tdeio_media_mounthelper.cpp:414
+#, fuzzy
+msgid "Eject given URL"
+msgstr "Opgegeven URL-adres afkoppelen"
 
-#: mounthelper/tdeio_media_mounthelper.cpp:299
-msgid "Unmount and Eject given URL (necessary for some USB devices)"
+#: mounthelper/tdeio_media_mounthelper.cpp:415
+msgid "Safely remove (unmount and eject) given URL"
 msgstr ""
-"Koppelt een opgegeven URL-adres af en werpt deze uit (noodzakelijk bij "
-"bepaalde USB-apparaten)"
 
-#: 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:/ URL-adres om aan te koppelen/uit te werpen/verwijderen"
 
 #: propsdlgplugin/propertiespage.cpp:137
@@ -622,7 +699,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
@@ -889,6 +966,27 @@ msgstr "Gemixt"
 msgid "Filesystem: iso9660"
 msgstr "Bestandssysteem: iso9660"
 
+#~ msgid ""
+#~ "The device was successfully unmounted, but the tray could not be opened"
+#~ msgstr ""
+#~ "Het apparaat is succesvol afgekoppeld, maar de lade kon niet geopend "
+#~ "worden"
+
+#~ msgid "The device was successfully unmounted, but could not be ejected"
+#~ msgstr ""
+#~ "Het apparaat is succesvol afgekoppeld maar kon niet uitgeworpen worden"
+
+#~ msgid "Mount given URL (default)"
+#~ msgstr "Opgegeven URL-adres aankoppelen (standaard)"
+
+#~ msgid "Eject given URL via tdeeject"
+#~ msgstr "Opgegeven URL-adres uitwerpen via tdeeject"
+
+#~ msgid "Unmount and Eject given URL (necessary for some USB devices)"
+#~ msgstr ""
+#~ "Koppelt een opgegeven URL-adres af en werpt deze uit (noodzakelijk bij "
+#~ "bepaalde USB-apparaten)"
+
 #, fuzzy
 #~ msgid "Permission denied"
 #~ msgstr "Toegang geweigerd"
diff --git a/tde-i18n-nn/messages/tdebase/tdeio_media.po b/tde-i18n-nn/messages/tdebase/tdeio_media.po
index e3b3b56e562..b655b58e85f 100644
--- a/tde-i18n-nn/messages/tdebase/tdeio_media.po
+++ b/tde-i18n-nn/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-08-15 20:25+0200\n"
 "Last-Translator: Karl Ove Hufthammer <karl@huftis.org>\n"
 "Language-Team: Norwegian Nynorsk <nn@li.org>\n"
@@ -44,27 +44,26 @@ msgstr "Opna i nytt vindauge"
 msgid "Unknown"
 msgstr "Ukjend"
 
-#: 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 "Mediehandteraren i TDE køyrer ikkje."
 
-#: mediaimpl.cpp:187
+#: mediaimpl.cpp:186
 msgid "This media name already exists."
 msgstr "Dette medienamnet finst allereie."
 
-#: mediaimpl.cpp:230 mediaimpl.cpp:297
+#: mediaimpl.cpp:229 mediaimpl.cpp:296
 msgid "No such medium."
 msgstr "Mediet finst ikkje."
 
-#: 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,109 +76,110 @@ 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 "Mediet finst ikkje: %1"
 
-#: mediamanager/fstabbackend.cpp:408
+#: mediamanager/fstabbackend.cpp:416
 msgid "CD Recorder"
 msgstr "CD-opptakar"
 
-#: mediamanager/fstabbackend.cpp:414
+#: mediamanager/fstabbackend.cpp:422
 msgid "DVD"
 msgstr "DVD"
 
-#: mediamanager/fstabbackend.cpp:427
+#: mediamanager/fstabbackend.cpp:435
 msgid "CD-ROM"
 msgstr "CD-ROM"
 
-#: mediamanager/fstabbackend.cpp:440
+#: mediamanager/fstabbackend.cpp:448
 msgid "Floppy"
 msgstr "Diskett"
 
-#: mediamanager/fstabbackend.cpp:448
+#: mediamanager/fstabbackend.cpp:456
 msgid "Zip Disk"
 msgstr "Zip-disk"
 
-#: mediamanager/fstabbackend.cpp:459
+#: mediamanager/fstabbackend.cpp:467
 msgid "Removable Device"
 msgstr "Flyttbar eining"
 
-#: mediamanager/fstabbackend.cpp:464 mediamanager/fstabbackend.cpp:470
+#: mediamanager/fstabbackend.cpp:472 mediamanager/fstabbackend.cpp:478
 msgid "Remote Share"
 msgstr "Delt nettverksressurs"
 
-#: mediamanager/fstabbackend.cpp:475
+#: mediamanager/fstabbackend.cpp:483
 msgid "Hard Disk"
 msgstr "Harddisk"
 
 # | msgid "Unknown"
-#: mediamanager/halbackend.cpp:768 mediamanager/tdehardwarebackend.cpp:809
+#: mediamanager/halbackend.cpp:778 mediamanager/tdehardwarebackend.cpp:826
 #, fuzzy
 msgid "Unknown Drive"
 msgstr "Ukjend"
 
 # | msgid "Floppy"
-#: mediamanager/halbackend.cpp:780 mediamanager/tdehardwarebackend.cpp:839
+#: mediamanager/halbackend.cpp:794 mediamanager/tdehardwarebackend.cpp:872
 #, fuzzy
 msgid "Floppy Drive"
 msgstr "Diskett"
 
 # | msgid "Zip Disk"
-#: mediamanager/halbackend.cpp:788
+#: mediamanager/halbackend.cpp:802
 #, fuzzy
 msgid "Zip Drive"
 msgstr "Zip-disk"
 
-#: mediamanager/halbackend.cpp:858 mediamanager/tdehardwarebackend.cpp:896
+#: mediamanager/halbackend.cpp:877 mediamanager/tdehardwarebackend.cpp:930
 msgid "Camera"
 msgstr "Kamera"
 
-#: 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 "Intern feil"
 
-#: mediamanager/halbackend.cpp:1303
+#: mediamanager/halbackend.cpp:1322
 msgid "Invalid filesystem type"
 msgstr "Ugyldig filsystemtype"
 
-#: 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 "Eininga er montert frå før."
 
-#: 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 "
@@ -189,16 +189,16 @@ msgstr ""
 "nedanfor. Du må lukka dei, eller eventuelt endra arbeidsmappa deira, før du "
 "prøver å avmontera eininga."
 
-#: 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. "
@@ -206,209 +206,257 @@ msgstr ""
 "Klarte ikkje å avmontera eininga <b>%1</b> (%2) med namn <b>«%3»</b>. Denne "
 "er montert på <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»-kommandoen gav denne feilmeldinga:"
 
-#: 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» er ikkje eit monterbart medium."
+
+#: mediamanager/halbackend.cpp:1497 mediamanager/tdehardwarebackend.cpp:1225
+#: mounthelper/tdeio_media_mounthelper.cpp:68
+#, fuzzy
+msgid "%1 is already mounted to %2."
+msgstr "Eininga er montert frå før."
+
+#: 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 "Eininga er montert frå før."
+
+#: 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 "Intern feil"
 
-#: mediamanager/halbackend.cpp:1718
+#: mediamanager/halbackend.cpp:1745
 #, fuzzy
 #| msgid "Unknown"
 msgid "Unknown error"
 msgstr "Ukjend"
 
-#: mediamanager/halbackend.cpp:1772
+#: mediamanager/halbackend.cpp:1799
 msgid "Unmounting failed due to the following error:"
 msgstr "Feil under avmontering:"
 
-#: mediamanager/halbackend.cpp:1774
+#: mediamanager/halbackend.cpp:1801
 msgid "Device is Busy:"
 msgstr "Eininga er oppteken:"
 
-#: 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» er ikkje eit monterbart medium."
+
+#: mediamanager/halbackend.cpp:1868 mediamanager/tdehardwarebackend.cpp:1452
+#: mounthelper/tdeio_media_mounthelper.cpp:127
+#, fuzzy
+msgid "%1 is already unlocked."
+msgstr "Eininga er montert frå før."
+
+#: 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 "Eininga er montert frå før."
+
 #: 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 "Denne funksjonen kan berre brukast med 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 "Denne funksjonen kan berre brukast med 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 "Denne funksjonen kan berre brukast med 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 "Flyttbar eining"
 
-#: mediamanager/tdehardwarebackend.cpp:529
+#: mediamanager/tdehardwarebackend.cpp:532
 #, fuzzy
 msgid "Blank CD-ROM"
 msgstr "CD-ROM"
 
-#: 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 "CD-ROM"
 
-#: mediamanager/tdehardwarebackend.cpp:682
+#: mediamanager/tdehardwarebackend.cpp:702
 #, fuzzy
 msgid "Blank BLURAY-R"
 msgstr "CD-ROM"
 
-#: 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-disk"
 
-#: 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. "
@@ -419,63 +467,95 @@ msgstr ""
 "nedanfor. Du må lukka dei, eller eventuelt endra arbeidsmappa deira, før du "
 "prøver å avmontera eininga."
 
-#: mounthelper/tdeio_media_mounthelper.cpp:79
-msgid "%1 cannot be found."
-msgstr "Finn ikkje «%1»."
+#: mounthelper/tdeio_media_mounthelper.cpp:49
+#, fuzzy
+#| msgid "The TDE mediamanager is not running."
+msgid "The TDE mediamanager is not running.\n"
+msgstr "Mediehandteraren i TDE køyrer ikkje."
 
-#: mounthelper/tdeio_media_mounthelper.cpp:87
-msgid "%1 is not a mountable media."
-msgstr "«%1» er ikkje eit monterbart medium."
+#: 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» er ikkje eit monterbart medium."
+#: 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 "Eininga er montert frå før."
-
-#: 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 "Eininga vart avmontert, men klarte ikkje opna skuffa."
+#: 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 "Eininga vart avmontert, men klarte ikkje løysa ho ut."
+#: 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 "Ukjend"
+
+#: 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 "Finn ikkje «%1»."
+
+#: mounthelper/tdeio_media_mounthelper.cpp:310
+#, fuzzy
+msgid "%1 is not a mountable or encrypted media."
+msgstr "«%1» er ikkje eit monterbart medium."
+
+#: mounthelper/tdeio_media_mounthelper.cpp:397
+#, fuzzy
+#| msgid "Unknown"
+msgid "Unknown unlock error."
+msgstr "Ukjend"
+
+#: mounthelper/tdeio_media_mounthelper.cpp:410
 #, fuzzy
-msgid "Decrypt given URL"
+#| msgid "Unmount given URL"
+msgid "Mount given URL"
 msgstr "Avmonter URL"
 
-#: mounthelper/tdeio_media_mounthelper.cpp:296
+#: mounthelper/tdeio_media_mounthelper.cpp:411
 msgid "Unmount given URL"
 msgstr "Avmonter URL"
 
-#: mounthelper/tdeio_media_mounthelper.cpp:297
-msgid "Mount given URL (default)"
-msgstr "Monter URL (standard)"
+#: mounthelper/tdeio_media_mounthelper.cpp:412
+#, fuzzy
+#| msgid "Unmount given URL"
+msgid "Unlock given URL"
+msgstr "Avmonter URL"
 
-#: mounthelper/tdeio_media_mounthelper.cpp:298
-msgid "Eject given URL via tdeeject"
-msgstr "Løys ut URL med tdeeject"
+#: mounthelper/tdeio_media_mounthelper.cpp:413
+#, fuzzy
+msgid "Lock given URL"
+msgstr "Avmonter URL"
 
-#: mounthelper/tdeio_media_mounthelper.cpp:299
-msgid "Unmount and Eject given URL (necessary for some USB devices)"
-msgstr "Avmonter og løys ut vald URL (trengst for enkelte USB-einingar)"
+#: mounthelper/tdeio_media_mounthelper.cpp:414
+#, fuzzy
+msgid "Eject given URL"
+msgstr "Avmonter URL"
+
+#: 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:/-URL som skal monterast/avmonterast/løysast ut/fjernast"
 
 #: propsdlgplugin/propertiespage.cpp:137
@@ -624,7 +704,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
@@ -886,6 +966,22 @@ msgstr "Blanda"
 msgid "Filesystem: iso9660"
 msgstr "Filsystem: iso9660"
 
+#~ msgid ""
+#~ "The device was successfully unmounted, but the tray could not be opened"
+#~ msgstr "Eininga vart avmontert, men klarte ikkje opna skuffa."
+
+#~ msgid "The device was successfully unmounted, but could not be ejected"
+#~ msgstr "Eininga vart avmontert, men klarte ikkje løysa ho ut."
+
+#~ msgid "Mount given URL (default)"
+#~ msgstr "Monter URL (standard)"
+
+#~ msgid "Eject given URL via tdeeject"
+#~ msgstr "Løys ut URL med tdeeject"
+
+#~ msgid "Unmount and Eject given URL (necessary for some USB devices)"
+#~ msgstr "Avmonter og løys ut vald URL (trengst for enkelte USB-einingar)"
+
 #, fuzzy
 #~ msgid "Permission denied"
 #~ msgstr "Tilgang nekta"
diff --git a/tde-i18n-pa/messages/tdebase/tdeio_media.po b/tde-i18n-pa/messages/tdebase/tdeio_media.po
index 372b132fd87..68a385a6a86 100644
--- a/tde-i18n-pa/messages/tdebase/tdeio_media.po
+++ b/tde-i18n-pa/messages/tdebase/tdeio_media.po
@@ -7,7 +7,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-01 18:13+0530\n"
 "Last-Translator: A S Alam <aalam@users.sf.net>\n"
 "Language-Team: Punjabi <punjabi-l10n@lists.sf.net>\n"
@@ -47,27 +47,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 "ਕੇਡੀਈ ਮੀਡਿਆ-ਮੈਨੇਜਰ ਚੱਲ ਨਹੀਂ ਰਿਹਾ ਹੈ।"
 
-#: 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 ""
 
@@ -80,393 +79,474 @@ 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 "CD ਰਿਕਾਰਡਰ"
 
-#: mediamanager/fstabbackend.cpp:414
+#: mediamanager/fstabbackend.cpp:422
 msgid "DVD"
 msgstr "DVD"
 
-#: mediamanager/fstabbackend.cpp:427
+#: mediamanager/fstabbackend.cpp:435
 msgid "CD-ROM"
 msgstr "CD-ROM"
 
-#: mediamanager/fstabbackend.cpp:440
+#: mediamanager/fstabbackend.cpp:448
 msgid "Floppy"
 msgstr "ਫਲਾਪੀ"
 
-#: mediamanager/fstabbackend.cpp:448
+#: mediamanager/fstabbackend.cpp:456
 msgid "Zip Disk"
 msgstr "ਜ਼ਿਪ ਡਿਸਕ"
 
-#: 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 "ਜ਼ਿਪ ਡਿਸਕ"
 
-#: 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 "
 "before attempting to unmount the device again."
 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. "
 msgstr ""
 
-#: 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 "CD-ROM"
 
-#: 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 "CD-ROM"
 
-#: mediamanager/tdehardwarebackend.cpp:682
+#: mediamanager/tdehardwarebackend.cpp:702
 #, fuzzy
 msgid "Blank BLURAY-R"
 msgstr "CD-ROM"
 
-#: 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 "ਜ਼ਿਪ ਡਿਸਕ"
 
-#: 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
 msgid ""
 "Programs still using the device have been detected. They are listed below. "
 "You have to close them or change their working directory before attempting "
 "to unmount the device again."
 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 "ਕੇਡੀਈ ਮੀਡਿਆ-ਮੈਨੇਜਰ ਚੱਲ ਨਹੀਂ ਰਿਹਾ ਹੈ।"
 
-#: 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"
+#: 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 "Decrypt given URL"
+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 "Unmount given URL"
+msgid "Mount given URL"
 msgstr "ਦਿੱਤੇ URL ਨੂੰ ਅਨਮਾਊਟ ਕਰੋ"
 
-#: mounthelper/tdeio_media_mounthelper.cpp:296
+#: mounthelper/tdeio_media_mounthelper.cpp:411
 msgid "Unmount given URL"
 msgstr "ਦਿੱਤੇ URL ਨੂੰ ਅਨਮਾਊਟ ਕਰੋ"
 
-#: mounthelper/tdeio_media_mounthelper.cpp:297
-msgid "Mount given URL (default)"
-msgstr "ਦਿੱਤੇ URL ਨੂੰ ਮਾਊਟ ਕਰੋ (ਮੂਲ)"
+#: mounthelper/tdeio_media_mounthelper.cpp:412
+#, fuzzy
+#| msgid "Unmount given URL"
+msgid "Unlock given URL"
+msgstr "ਦਿੱਤੇ URL ਨੂੰ ਅਨਮਾਊਟ ਕਰੋ"
+
+#: mounthelper/tdeio_media_mounthelper.cpp:413
+#, fuzzy
+msgid "Lock given URL"
+msgstr "ਦਿੱਤੇ URL ਨੂੰ ਅਨਮਾਊਟ ਕਰੋ"
 
-#: mounthelper/tdeio_media_mounthelper.cpp:298
-msgid "Eject given URL via tdeeject"
-msgstr "ਦਿੱਤੇ URL ਨੂੰ ਕੇਡੀਈ-ਕੱਢੋ(tdeeject) ਰਾਹੀਂ ਕੱਢੋ"
+#: mounthelper/tdeio_media_mounthelper.cpp:414
+#, fuzzy
+msgid "Eject given URL"
+msgstr "ਦਿੱਤੇ URL ਨੂੰ ਅਨਮਾਊਟ ਕਰੋ"
 
-#: 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: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 "ਮਾਧਿਅਮ:/ URL ਨੂੰ ਮਾਊਟ/ਅਨ-ਮਾਊਟ/ਕੱਢੋ"
 
 #: propsdlgplugin/propertiespage.cpp:137
@@ -615,7 +695,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
@@ -835,6 +915,18 @@ msgstr "ਰਲਵਾਂ"
 msgid "Filesystem: iso9660"
 msgstr "ਫਾਇਲ ਸਿਸਟਮ: iso9660"
 
+#~ msgid "The device was successfully unmounted, but could not be ejected"
+#~ msgstr "ਜੰਤਰ ਠੀਕ ਤਰ੍ਹਾਂ ਅਣ-ਮਾਊਂਟ ਕੀਤਾ ਗਿਆ ਹੈ, ਪਰ ਬਾਹਰ ਨਹੀਂ ਕੱਢਿਆ ਜਾ ਸਕਿਆ"
+
+#~ msgid "Mount given URL (default)"
+#~ msgstr "ਦਿੱਤੇ URL ਨੂੰ ਮਾਊਟ ਕਰੋ (ਮੂਲ)"
+
+#~ 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 "ਅਧਿਕਾਰ ਪਾਬੰਦੀ ਹੈ"
diff --git a/tde-i18n-pl/messages/tdebase/tdeio_media.po b/tde-i18n-pl/messages/tdebase/tdeio_media.po
index 1780f5129b7..4a36abbb625 100644
--- a/tde-i18n-pl/messages/tdebase/tdeio_media.po
+++ b/tde-i18n-pl/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: 2020-08-21 15:31+0000\n"
 "Last-Translator: Jan Stolarek <jwstolarek@gmail.com>\n"
 "Language-Team: Polish <https://mirror.git.trinitydesktop.org/weblate/"
@@ -47,27 +47,26 @@ msgstr "Otwórz w nowym oknie"
 msgid "Unknown"
 msgstr "Nieznane"
 
-#: 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 "Menedżer nośników wymiennych TDE nie jest uruchomiony."
 
-#: mediaimpl.cpp:187
+#: mediaimpl.cpp:186
 msgid "This media name already exists."
 msgstr "Podana nazwa nośnika już istnieje."
 
-#: mediaimpl.cpp:230 mediaimpl.cpp:297
+#: mediaimpl.cpp:229 mediaimpl.cpp:296
 msgid "No such medium."
 msgstr "Nie ma takiego nośnika."
 
-#: mediaimpl.cpp:238
+#: mediaimpl.cpp:237
 msgid "The drive is encrypted."
 msgstr "Dysk jest zaszyfrowany."
 
-#: 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 "Nieokreślony błąd montowania."
 
@@ -82,69 +81,71 @@ msgid "Unlock"
 msgstr "Odblokuj"
 
 #: 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 "Nie ma takiego nośnika: %1"
 
-#: mediamanager/fstabbackend.cpp:408
+#: mediamanager/fstabbackend.cpp:416
 msgid "CD Recorder"
 msgstr "Nagrywarka CD"
 
-#: mediamanager/fstabbackend.cpp:414
+#: mediamanager/fstabbackend.cpp:422
 msgid "DVD"
 msgstr "DVD"
 
-#: mediamanager/fstabbackend.cpp:427
+#: mediamanager/fstabbackend.cpp:435
 msgid "CD-ROM"
 msgstr "CD-ROM"
 
-#: mediamanager/fstabbackend.cpp:440
+#: mediamanager/fstabbackend.cpp:448
 msgid "Floppy"
 msgstr "Dyskietka"
 
-#: mediamanager/fstabbackend.cpp:448
+#: mediamanager/fstabbackend.cpp:456
 msgid "Zip Disk"
 msgstr "Dysk ZIP"
 
-#: mediamanager/fstabbackend.cpp:459
+#: mediamanager/fstabbackend.cpp:467
 msgid "Removable Device"
 msgstr "Napęd wymienny"
 
-#: mediamanager/fstabbackend.cpp:464 mediamanager/fstabbackend.cpp:470
+#: mediamanager/fstabbackend.cpp:472 mediamanager/fstabbackend.cpp:478
 msgid "Remote Share"
 msgstr "Odległy zasób"
 
-#: mediamanager/fstabbackend.cpp:475
+#: mediamanager/fstabbackend.cpp:483
 msgid "Hard Disk"
 msgstr "Dysk twardy"
 
-#: mediamanager/halbackend.cpp:768 mediamanager/tdehardwarebackend.cpp:809
+#: mediamanager/halbackend.cpp:778 mediamanager/tdehardwarebackend.cpp:826
 msgid "Unknown Drive"
 msgstr "Nieznany napęd"
 
-#: mediamanager/halbackend.cpp:780 mediamanager/tdehardwarebackend.cpp:839
+#: mediamanager/halbackend.cpp:794 mediamanager/tdehardwarebackend.cpp:872
 msgid "Floppy Drive"
 msgstr "Dyskietka"
 
-#: mediamanager/halbackend.cpp:788
+#: mediamanager/halbackend.cpp:802
 msgid "Zip Drive"
 msgstr "Dysk ZIP"
 
-#: mediamanager/halbackend.cpp:858 mediamanager/tdehardwarebackend.cpp:896
+#: mediamanager/halbackend.cpp:877 mediamanager/tdehardwarebackend.cpp:930
 msgid "Camera"
 msgstr "Aparat fotograficzny"
 
-#: mediamanager/halbackend.cpp:1240 mediamanager/halbackend.cpp:1266
+#: mediamanager/halbackend.cpp:1259 mediamanager/halbackend.cpp:1285
 msgid "Authenticate"
 msgstr "Uwierzytelnij"
 
-#: 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 "
@@ -154,7 +155,7 @@ msgstr ""
 "big> <br/>Dla wykonania tej czynności niezbędne jest uwierzytelnienie. "
 "Proszę wprowadzić swoje hasło."
 
-#: 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 "
@@ -164,17 +165,16 @@ msgstr ""
 "przez innych użytkowników</b></big> Dla wykonania tej operacji niezbędne "
 "jest uwierzytelnienie. Proszę wprowadzić swoje hasło."
 
-#: 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 "Błąd wewnętrzny"
 
-#: mediamanager/halbackend.cpp:1303
+#: mediamanager/halbackend.cpp:1322
 msgid "Invalid filesystem type"
 msgstr "Nieprawidłowy system plików"
 
-#: 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>"
@@ -183,11 +183,11 @@ msgstr ""
 "dla dostępu do tego urządzenia. <br>2. To urządzenie nie posiada wpisu w /"
 "etc/fstab.</p>"
 
-#: mediamanager/halbackend.cpp:1309
+#: mediamanager/halbackend.cpp:1328
 msgid "Device is already mounted."
 msgstr "Urządzenie jest już zamontowane."
 
-#: 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 "
@@ -197,7 +197,7 @@ msgstr ""
 "pokazane poniżej. Musisz je wszystkie zamknąć lub zmienić katalog, w którym "
 "działają i wtedy możesz spróbować odmontować urządzenie ponownie."
 
-#: 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."
@@ -205,10 +205,10 @@ msgstr ""
 "Programy, które nadal używały urządzenia zostały zakończone. Programy te "
 "podano poniżej."
 
-#: 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. "
@@ -216,38 +216,60 @@ msgstr ""
 "Niestety, urządzenie <b>%1</b> (%2) o nazwie <b>'%3'</b> i obecnie "
 "zamontowane w katalogu <b>%4</b> nie może być odmontowane. "
 
-#: 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 "Następujący błąd został zwrócony przez polecenie 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 nie jest montowalnym nośnikiem."
+
+#: mediamanager/halbackend.cpp:1497 mediamanager/tdehardwarebackend.cpp:1225
+#: mounthelper/tdeio_media_mounthelper.cpp:68
+#, fuzzy
+#| msgid "%1 is already decrypted."
+msgid "%1 is already mounted to %2."
+msgstr "%1 jest już odszyfrowane."
+
+#: mediamanager/halbackend.cpp:1614
 #, fuzzy
 #| msgid "Cannot mount encrypted drives!"
 msgid "Cannot mount encrypted locked drives!"
 msgstr "Nie można zamontować zaszyfrowanego dysku!"
 
-#: 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 decrypted."
+msgid "%1 is already unmounted."
+msgstr "%1 jest już odszyfrowane."
+
+#: 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
 msgid "Internal error"
 msgstr "Błąd wewnętrzny"
 
-#: mediamanager/halbackend.cpp:1718
+#: mediamanager/halbackend.cpp:1745
 #, fuzzy
 #| msgid "Unknown"
 msgid "Unknown error"
 msgstr "Nieznane"
 
-#: mediamanager/halbackend.cpp:1772
+#: mediamanager/halbackend.cpp:1799
 msgid "Unmounting failed due to the following error:"
 msgstr "Odmontowywanie nie powiodło się z powodu następującego błędu:"
 
-#: mediamanager/halbackend.cpp:1774
+#: mediamanager/halbackend.cpp:1801
 msgid "Device is Busy:"
 msgstr "Urządzenie jest zajęte:"
 
-#: 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>"
@@ -256,7 +278,7 @@ msgstr ""
 "dostępu do tego urządzenia. <br>2. To urządzenie zostało zamontowane przy "
 "użyciu TDE.</p>"
 
-#: 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>"
@@ -264,169 +286,208 @@ msgstr ""
 "%1<p><b>Czy chcesz zakończyć te procesy?</b> <br><i>Niezapisane dane zostaną "
 "utracone</i>"
 
-#: 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
+msgid "%1 is not an encrypted media."
+msgstr "%1 nie jest szyfrowanym nośnikiem."
+
+#: mediamanager/halbackend.cpp:1868 mediamanager/tdehardwarebackend.cpp:1452
+#: mounthelper/tdeio_media_mounthelper.cpp:127
+#, fuzzy
+#| msgid "%1 is already decrypted."
+msgid "%1 is already unlocked."
+msgstr "%1 jest już odszyfrowane."
+
+#: mediamanager/halbackend.cpp:1907
 msgid "Wrong password"
 msgstr "Błędne hasło"
 
+#: mediamanager/halbackend.cpp:1942 mediamanager/tdehardwarebackend.cpp:1501
+#: mounthelper/tdeio_media_mounthelper.cpp:159
+#, fuzzy
+#| msgid "%1 is already decrypted."
+msgid "%1 is already locked."
+msgstr "%1 jest już odszyfrowane."
+
 #: mediamanager/mediamanager.cpp:248 mediamanager/mediamanager.cpp:275
+#: mediamanager/mediamanager.cpp:302 mediamanager/mediamanager.cpp:329
 msgid "Feature only available with the TDE hardware backend"
 msgstr "Właściwość ta dostępna jest jedynie z menedżerem sprzętu TDE"
 
 #: 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 "Właściwość ta dostępna jest jedynie z 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
 msgid "Feature only available with HAL or TDE hardware backend"
 msgstr "Właściwość ta dostępna jest jedynie z HAL lud menedżerem sprzętu TDE"
 
-#: mediamanager/tdehardwarebackend.cpp:484
-#: mediamanager/tdehardwarebackend.cpp:521
-#: mediamanager/tdehardwarebackend.cpp:754
+#: mediamanager/tdehardwarebackend.cpp:486
+#: mediamanager/tdehardwarebackend.cpp:523
+#: mediamanager/tdehardwarebackend.cpp:779
 msgid "%1 Removable Device"
 msgstr "%1 Napęd wymienny"
 
-#: mediamanager/tdehardwarebackend.cpp:529
+#: mediamanager/tdehardwarebackend.cpp:532
 msgid "Blank CD-ROM"
 msgstr "Czysty CD-ROM"
 
-#: mediamanager/tdehardwarebackend.cpp:538
+#: mediamanager/tdehardwarebackend.cpp:542
 msgid "Blank CD-R"
 msgstr "Czysty CD-R"
 
-#: mediamanager/tdehardwarebackend.cpp:547
+#: mediamanager/tdehardwarebackend.cpp:552
 msgid "Blank CD-RW"
 msgstr "Czysty CD-RW"
 
-#: mediamanager/tdehardwarebackend.cpp:556
+#: mediamanager/tdehardwarebackend.cpp:562
 msgid "Blank Magneto-Optical CD"
 msgstr "Czysty dysk magnetooptyczny"
 
-#: mediamanager/tdehardwarebackend.cpp:565
+#: mediamanager/tdehardwarebackend.cpp:572
 msgid "Blank Mount Ranier CD-RW"
 msgstr "Czysty Mount Ranier CD-RW"
 
-#: mediamanager/tdehardwarebackend.cpp:574
+#: mediamanager/tdehardwarebackend.cpp:582
 msgid "Blank Mount Ranier CD-RW-W"
 msgstr "Czysty Mount Ranier CD-RW-W"
 
-#: mediamanager/tdehardwarebackend.cpp:583
+#: mediamanager/tdehardwarebackend.cpp:592
 msgid "Blank DVD-ROM"
 msgstr "Czysty DVD-ROM"
 
-#: mediamanager/tdehardwarebackend.cpp:592
+#: mediamanager/tdehardwarebackend.cpp:602
 msgid "Blank DVD-RAM"
 msgstr "Czysty DVD-RAM"
 
-#: mediamanager/tdehardwarebackend.cpp:601
+#: mediamanager/tdehardwarebackend.cpp:612
 msgid "Blank DVD-R"
 msgstr "Czysty DVD-R"
 
-#: mediamanager/tdehardwarebackend.cpp:610
+#: mediamanager/tdehardwarebackend.cpp:622
 msgid "Blank DVD-RW"
 msgstr "Czysty DVD-RW"
 
-#: mediamanager/tdehardwarebackend.cpp:619
+#: mediamanager/tdehardwarebackend.cpp:632
 msgid "Blank Dual Layer DVD-R"
 msgstr "Czysty dwuwarstwowy DVD-R"
 
-#: mediamanager/tdehardwarebackend.cpp:628
+#: mediamanager/tdehardwarebackend.cpp:642
 msgid "Blank Dual Layer DVD-RW"
 msgstr "Czysty dwuwarstwowy DVD-RW"
 
-#: mediamanager/tdehardwarebackend.cpp:637
+#: mediamanager/tdehardwarebackend.cpp:652
 msgid "Blank DVD+R"
 msgstr "Czysty DVD+R"
 
-#: mediamanager/tdehardwarebackend.cpp:646
+#: mediamanager/tdehardwarebackend.cpp:662
 msgid "Blank DVD+RW"
 msgstr "Czysty DVD+RW"
 
-#: mediamanager/tdehardwarebackend.cpp:655
+#: mediamanager/tdehardwarebackend.cpp:672
 msgid "Blank Dual Layer DVD+R"
 msgstr "Czysty dwuwarstwowy DVD+R"
 
-#: mediamanager/tdehardwarebackend.cpp:664
+#: mediamanager/tdehardwarebackend.cpp:682
 msgid "Blank Dual Layer DVD+RW"
 msgstr "Czysty dwuwarstwowy DVD+RW"
 
-#: mediamanager/tdehardwarebackend.cpp:673
+#: mediamanager/tdehardwarebackend.cpp:692
 #, fuzzy
 #| msgid "Blank BD-ROM"
 msgid "Blank BLURAY-ROM"
 msgstr "Czysty BD-ROM"
 
-#: mediamanager/tdehardwarebackend.cpp:682
+#: mediamanager/tdehardwarebackend.cpp:702
 #, fuzzy
 #| msgid "Blank BD-R"
 msgid "Blank BLURAY-R"
 msgstr "Czysty BD-R"
 
-#: mediamanager/tdehardwarebackend.cpp:691
+#: mediamanager/tdehardwarebackend.cpp:712
 #, fuzzy
 #| msgid "Blank BD-RW"
 msgid "Blank BLURAY-RW"
 msgstr "Czysty BD-RW"
 
-#: mediamanager/tdehardwarebackend.cpp:700
+#: mediamanager/tdehardwarebackend.cpp:722
 msgid "Blank HDDVD-ROM"
 msgstr "Czysty HDDVD-ROM"
 
-#: mediamanager/tdehardwarebackend.cpp:709
+#: mediamanager/tdehardwarebackend.cpp:732
 msgid "Blank HDDVD-R"
 msgstr "Czysty HDDVD-R"
 
-#: mediamanager/tdehardwarebackend.cpp:718
+#: mediamanager/tdehardwarebackend.cpp:742
 msgid "Blank HDDVD-RW"
 msgstr "Czysty HDDVD-RW"
 
-#: mediamanager/tdehardwarebackend.cpp:725
+#: mediamanager/tdehardwarebackend.cpp:750
 msgid "Audio CD"
 msgstr "Audio CD"
 
-#: mediamanager/tdehardwarebackend.cpp:746
+#: mediamanager/tdehardwarebackend.cpp:771
 msgid "%1 Fixed Disk (%2)"
 msgstr "%1 Dysk Stały (%2)"
 
-#: mediamanager/tdehardwarebackend.cpp:853
+#: mediamanager/tdehardwarebackend.cpp:886
 msgid "%1 Zip Disk"
 msgstr "%1 Dysk 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 "<p>Informacje techniczne:<br>"
 
-#: mediamanager/tdehardwarebackend.cpp:1285
-msgid "Decryption aborted"
-msgstr "Odszyfrowywanie przerwane"
-
-#: mediamanager/tdehardwarebackend.cpp:1444
+#: mediamanager/tdehardwarebackend.cpp:1396
+#, fuzzy
+#| 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>"
 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>"
+"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 ""
 "<qt>Urządzenie <b>%1</b> (%2) o nazwie <b>'%3'</b> aktualnie zamontowane "
 "jako <b>%4</b> nie może być aktualnie odmontowane.<p>%5<p><b>Czy chcesz "
 "zakończyć te procesy?</b><br><i>Niezapisane dane zostaną utracone</i>"
 
-#: mediamanager/tdehardwarebackend.cpp:1578
+#: mediamanager/tdehardwarebackend.cpp:1467
+#, fuzzy
+#| msgid "Decrypting Storage Device"
+msgid "Unable to unlock the device."
+msgstr "Odszyfrowywanie nośnika"
+
+#: mediamanager/tdehardwarebackend.cpp:1516
+#, fuzzy
+#| msgid "Decrypting Storage Device"
+msgid "Unable to lock the device."
+msgstr "Odszyfrowywanie nośnika"
+
+#: mediamanager/tdehardwarebackend.cpp:1623
 msgid ""
 "Programs still using the device have been detected. They are listed below. "
 "You have to close them or change their working directory before attempting "
@@ -436,66 +497,98 @@ msgstr ""
 "poniżej. Musisz je wszystkie zamknąć lub zmienić katalog, w którym działają "
 "i wtedy możesz spróbować odmontować urządzenie ponownie."
 
-#: mounthelper/tdeio_media_mounthelper.cpp:79
-msgid "%1 cannot be found."
-msgstr "Nie można znaleźć %1."
+#: mounthelper/tdeio_media_mounthelper.cpp:49
+#, fuzzy
+#| msgid "The TDE mediamanager is not running."
+msgid "The TDE mediamanager is not running.\n"
+msgstr "Menedżer nośników wymiennych TDE nie jest uruchomiony."
 
-#: mounthelper/tdeio_media_mounthelper.cpp:87
-msgid "%1 is not a mountable media."
-msgstr "%1 nie jest montowalnym nośnikiem."
+#: mounthelper/tdeio_media_mounthelper.cpp:59
+msgid "Try to mount an unknown medium."
+msgstr ""
 
-#: mounthelper/tdeio_media_mounthelper.cpp:101
-msgid "%1 is not an encrypted media."
-msgstr "%1 nie jest szyfrowanym nośnikiem."
+#: 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 decrypted."
-msgid "%1 is already unlocked."
-msgstr "%1 jest już odszyfrowane."
-
-#: 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"
+#: mounthelper/tdeio_media_mounthelper.cpp:116
+msgid "Try to unlock an unknown medium."
 msgstr ""
-"Urządzenie zostało pomyślnie odmontowane, ale próba otworzenia tacki nie "
-"powiodła się."
 
-#: mounthelper/tdeio_media_mounthelper.cpp:248
-msgid "The device was successfully unmounted, but could not be ejected"
+#: mounthelper/tdeio_media_mounthelper.cpp:148
+msgid "Try to lock an unknown medium."
 msgstr ""
-"Urządzenie zostało pomyślnie odmontowane, ale nie powiodła się próba "
-"wysunięcia."
 
-#: mounthelper/tdeio_media_mounthelper.cpp:281
-msgid "Unknown decrypt error."
-msgstr "Nieznany błąd odszyfrowywania."
+#: mounthelper/tdeio_media_mounthelper.cpp:173
+#, fuzzy
+#| msgid "Unknown mount error."
+msgid "Unknown lock error."
+msgstr "Nieokreślony błąd montowania."
+
+#: mounthelper/tdeio_media_mounthelper.cpp:211
+msgid "Try to release holders from an unknown medium."
+msgstr ""
 
-#: mounthelper/tdeio_media_mounthelper.cpp:295
-msgid "Decrypt given URL"
-msgstr "Odszyfruj podany URL"
+#: mounthelper/tdeio_media_mounthelper.cpp:270
+msgid "Try to safe remove an unknown medium."
+msgstr ""
+
+#: mounthelper/tdeio_media_mounthelper.cpp:302
+msgid "%1 cannot be found."
+msgstr "Nie można znaleźć %1."
+
+#: mounthelper/tdeio_media_mounthelper.cpp:310
+#, fuzzy
+#| msgid "%1 is not an encrypted media."
+msgid "%1 is not a mountable or encrypted media."
+msgstr "%1 nie jest szyfrowanym nośnikiem."
+
+#: mounthelper/tdeio_media_mounthelper.cpp:397
+#, fuzzy
+#| msgid "Unknown mount error."
+msgid "Unknown unlock error."
+msgstr "Nieokreślony błąd montowania."
+
+#: mounthelper/tdeio_media_mounthelper.cpp:410
+#, fuzzy
+#| msgid "Unmount given URL"
+msgid "Mount given URL"
+msgstr "Odmontuj podany URL"
 
-#: mounthelper/tdeio_media_mounthelper.cpp:296
+#: mounthelper/tdeio_media_mounthelper.cpp:411
 msgid "Unmount given URL"
 msgstr "Odmontuj podany URL"
 
-#: mounthelper/tdeio_media_mounthelper.cpp:297
-msgid "Mount given URL (default)"
-msgstr "Zamontuj podany URL (domyślnie)"
+#: mounthelper/tdeio_media_mounthelper.cpp:412
+#, fuzzy
+#| msgid "Unmount given URL"
+msgid "Unlock given URL"
+msgstr "Odmontuj podany URL"
 
-#: mounthelper/tdeio_media_mounthelper.cpp:298
-msgid "Eject given URL via tdeeject"
-msgstr "Wysuń podany URL, używając tdeeject"
+#: mounthelper/tdeio_media_mounthelper.cpp:413
+#, fuzzy
+#| msgid "Decrypt given URL"
+msgid "Lock given URL"
+msgstr "Odszyfruj podany URL"
 
-#: mounthelper/tdeio_media_mounthelper.cpp:299
-msgid "Unmount and Eject given URL (necessary for some USB devices)"
-msgstr "Odmontuj i wysuń podany URL (potrzebne dla niektórych urządzeń USB)"
+#: mounthelper/tdeio_media_mounthelper.cpp:414
+#, fuzzy
+#| msgid "Decrypt given URL"
+msgid "Eject given URL"
+msgstr "Odszyfruj podany URL"
 
-#: mounthelper/tdeio_media_mounthelper.cpp:300
-msgid "media:/ URL to mount/unmount/eject/remove"
+#: mounthelper/tdeio_media_mounthelper.cpp:415
+msgid "Safely remove (unmount and eject) given URL"
+msgstr ""
+
+#: 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 "URL media:/ do zamontowania/odmontowania/wysunięcia/usunięcia"
 
 #: propsdlgplugin/propertiespage.cpp:137
@@ -653,13 +746,16 @@ msgid "&Password:"
 msgstr "&Hasło:"
 
 #: mounthelper/unlockdialog.ui:109
-#, no-c-format
+#, fuzzy, no-c-format
+#| msgid ""
+#| "<p><b>%1</b> is an encrypted locked storage device.</p>\n"
+#| "<p>Please enter the password to unlock the storage device.</p>"
 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 ""
-"<p><b>%1</b> jest zaszyfrowanym nośnikiem.</p>\n"
-"<p>Wprowadź hasło w celu odszyfrowania zawartości nośnika.</p>"
+"<p><b>%1</b> jest zablokowanym zaszyfrowanym nośnikiem wymiennym.</p>\n"
+"<p>Wpisz hasło w celu odblokowania nośnika.</p>"
 
 #: propsdlgplugin/propertiespagegui.ui:16
 #, no-c-format
@@ -930,6 +1026,39 @@ msgstr "Mieszane"
 msgid "Filesystem: iso9660"
 msgstr "System plików: iso-9660"
 
+#~ msgid "Decryption aborted"
+#~ msgstr "Odszyfrowywanie przerwane"
+
+#~ msgid ""
+#~ "The device was successfully unmounted, but the tray could not be opened"
+#~ msgstr ""
+#~ "Urządzenie zostało pomyślnie odmontowane, ale próba otworzenia tacki nie "
+#~ "powiodła się."
+
+#~ msgid "The device was successfully unmounted, but could not be ejected"
+#~ msgstr ""
+#~ "Urządzenie zostało pomyślnie odmontowane, ale nie powiodła się próba "
+#~ "wysunięcia."
+
+#~ msgid "Unknown decrypt error."
+#~ msgstr "Nieznany błąd odszyfrowywania."
+
+#~ msgid "Mount given URL (default)"
+#~ msgstr "Zamontuj podany URL (domyślnie)"
+
+#~ msgid "Eject given URL via tdeeject"
+#~ msgstr "Wysuń podany URL, używając tdeeject"
+
+#~ msgid "Unmount and Eject given URL (necessary for some USB devices)"
+#~ msgstr "Odmontuj i wysuń podany URL (potrzebne dla niektórych urządzeń USB)"
+
+#~ msgid ""
+#~ "<p><b>%1</b> is an encrypted storage device.</p>\n"
+#~ "<p>Please enter the password to decrypt the storage device.</p>"
+#~ msgstr ""
+#~ "<p><b>%1</b> jest zaszyfrowanym nośnikiem.</p>\n"
+#~ "<p>Wprowadź hasło w celu odszyfrowania zawartości nośnika.</p>"
+
 #~ msgid "Decrypt"
 #~ msgstr "Odszyfruj"
 
diff --git a/tde-i18n-pt/messages/tdebase/tdeio_media.po b/tde-i18n-pt/messages/tdebase/tdeio_media.po
index f4cb6ceca52..d6e5395054d 100644
--- a/tde-i18n-pt/messages/tdebase/tdeio_media.po
+++ b/tde-i18n-pt/messages/tdebase/tdeio_media.po
@@ -1,7 +1,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-11-23 08:46+0000\n"
 "Last-Translator: José Nuno Pires <jncp@netcabo.pt>\n"
 "Language-Team: pt <kde-i18n-pt@kde.org>\n"
@@ -42,27 +42,26 @@ msgstr "Abrir numa Nova Janela"
 msgid "Unknown"
 msgstr "Desconhecido"
 
-#: 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 "O gestor de media do TDE não está a correr."
 
-#: mediaimpl.cpp:187
+#: mediaimpl.cpp:186
 msgid "This media name already exists."
 msgstr "Este nome de dispositivo já existe."
 
-#: mediaimpl.cpp:230 mediaimpl.cpp:297
+#: mediaimpl.cpp:229 mediaimpl.cpp:296
 msgid "No such medium."
 msgstr "Não existe este suporte físico."
 
-#: 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 ""
 
@@ -75,103 +74,104 @@ 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 "Não existe este suporte físico: %1"
 
-#: mediamanager/fstabbackend.cpp:408
+#: mediamanager/fstabbackend.cpp:416
 msgid "CD Recorder"
 msgstr "Gravador de CDs"
 
-#: mediamanager/fstabbackend.cpp:414
+#: mediamanager/fstabbackend.cpp:422
 msgid "DVD"
 msgstr "DVD"
 
-#: mediamanager/fstabbackend.cpp:427
+#: mediamanager/fstabbackend.cpp:435
 msgid "CD-ROM"
 msgstr "CD-ROM"
 
-#: mediamanager/fstabbackend.cpp:440
+#: mediamanager/fstabbackend.cpp:448
 msgid "Floppy"
 msgstr "Disquete"
 
-#: mediamanager/fstabbackend.cpp:448
+#: mediamanager/fstabbackend.cpp:456
 msgid "Zip Disk"
 msgstr "Disco Zip"
 
-#: mediamanager/fstabbackend.cpp:459
+#: mediamanager/fstabbackend.cpp:467
 msgid "Removable Device"
 msgstr "Dispositivo Amovível"
 
-#: mediamanager/fstabbackend.cpp:464 mediamanager/fstabbackend.cpp:470
+#: mediamanager/fstabbackend.cpp:472 mediamanager/fstabbackend.cpp:478
 msgid "Remote Share"
 msgstr "Partilha Remota"
 
-#: mediamanager/fstabbackend.cpp:475
+#: mediamanager/fstabbackend.cpp:483
 msgid "Hard Disk"
 msgstr "Disco Rígido"
 
-#: mediamanager/halbackend.cpp:768 mediamanager/tdehardwarebackend.cpp:809
+#: mediamanager/halbackend.cpp:778 mediamanager/tdehardwarebackend.cpp:826
 msgid "Unknown Drive"
 msgstr "Unidade Desconhecida"
 
-#: mediamanager/halbackend.cpp:780 mediamanager/tdehardwarebackend.cpp:839
+#: mediamanager/halbackend.cpp:794 mediamanager/tdehardwarebackend.cpp:872
 msgid "Floppy Drive"
 msgstr "Unidade de Disquetes"
 
-#: mediamanager/halbackend.cpp:788
+#: mediamanager/halbackend.cpp:802
 msgid "Zip Drive"
 msgstr "Unidade ZIP"
 
-#: mediamanager/halbackend.cpp:858 mediamanager/tdehardwarebackend.cpp:896
+#: mediamanager/halbackend.cpp:877 mediamanager/tdehardwarebackend.cpp:930
 msgid "Camera"
 msgstr "Câmara"
 
-#: 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 "Erro Interno"
 
-#: mediamanager/halbackend.cpp:1303
+#: mediamanager/halbackend.cpp:1322
 msgid "Invalid filesystem type"
 msgstr "Tipo de sistema de ficheiros inválido"
 
-#: 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 "O dispositivo já está montado."
 
-#: 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 "
@@ -181,16 +181,16 @@ msgstr ""
 "Estes encontram-se abaixo. Terá de os fechar ou mudar a sua pasta de "
 "trabalho antes de tentar desmontar o dispositivo de novo."
 
-#: 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. "
@@ -198,209 +198,257 @@ msgstr ""
 "Infelizmente, o dispositivo <b>%1</b> (%2), chamado <b>'%3'</b> e montado de "
 "momento em <b>%4</b>, não pôde ser desmontado. "
 
-#: 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 "Foi devolvido o seguinte erro pelo comando '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 "Não é possível montar %1."
+
+#: mediamanager/halbackend.cpp:1497 mediamanager/tdehardwarebackend.cpp:1225
+#: mounthelper/tdeio_media_mounthelper.cpp:68
+#, fuzzy
+msgid "%1 is already mounted to %2."
+msgstr "O dispositivo já está montado."
+
+#: 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 "O dispositivo já está montado."
+
+#: 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 "Erro Interno"
 
-#: mediamanager/halbackend.cpp:1718
+#: mediamanager/halbackend.cpp:1745
 #, fuzzy
 #| msgid "Unknown"
 msgid "Unknown error"
 msgstr "Desconhecido"
 
-#: mediamanager/halbackend.cpp:1772
+#: mediamanager/halbackend.cpp:1799
 msgid "Unmounting failed due to the following error:"
 msgstr "A desmontagem falhou devido ao seguinte erro:"
 
-#: mediamanager/halbackend.cpp:1774
+#: mediamanager/halbackend.cpp:1801
 msgid "Device is Busy:"
 msgstr "O Dispositivo Está Ocupado:"
 
-#: 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 "Não é possível montar %1."
+
+#: mediamanager/halbackend.cpp:1868 mediamanager/tdehardwarebackend.cpp:1452
+#: mounthelper/tdeio_media_mounthelper.cpp:127
+#, fuzzy
+msgid "%1 is already unlocked."
+msgstr "O dispositivo já está montado."
+
+#: 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 "O dispositivo já está montado."
+
 #: 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 "A funcionalidade só está disponível com o 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 "A funcionalidade só está disponível com o 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 "A funcionalidade só está disponível com o 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 "Dispositivo Amovível"
 
-#: mediamanager/tdehardwarebackend.cpp:529
+#: mediamanager/tdehardwarebackend.cpp:532
 #, fuzzy
 msgid "Blank CD-ROM"
 msgstr "CD-ROM"
 
-#: 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 "CD-ROM"
 
-#: mediamanager/tdehardwarebackend.cpp:682
+#: mediamanager/tdehardwarebackend.cpp:702
 #, fuzzy
 msgid "Blank BLURAY-R"
 msgstr "CD-ROM"
 
-#: 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 "Disco 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:1516
+msgid "Unable to lock the device."
 msgstr ""
 
-#: mediamanager/tdehardwarebackend.cpp:1578
+#: mediamanager/tdehardwarebackend.cpp:1623
 #, fuzzy
 msgid ""
 "Programs still using the device have been detected. They are listed below. "
@@ -411,67 +459,95 @@ msgstr ""
 "Estes encontram-se abaixo. Terá de os fechar ou mudar a sua pasta de "
 "trabalho antes de tentar desmontar o dispositivo de novo."
 
-#: mounthelper/tdeio_media_mounthelper.cpp:79
-msgid "%1 cannot be found."
-msgstr "Não foi possível encontrar %1."
+#: mounthelper/tdeio_media_mounthelper.cpp:49
+#, fuzzy
+#| msgid "The TDE mediamanager is not running."
+msgid "The TDE mediamanager is not running.\n"
+msgstr "O gestor de media do TDE não está a correr."
 
-#: mounthelper/tdeio_media_mounthelper.cpp:87
-msgid "%1 is not a mountable media."
-msgstr "Não é possível montar %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 "Não é possível montar %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 "O dispositivo já está montado."
-
-#: 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"
+#: mounthelper/tdeio_media_mounthelper.cpp:116
+msgid "Try to unlock an unknown medium."
 msgstr ""
-"O dispositivo foi desmontado com sucesso, mas a bandeja não se conseguiu "
-"abrir"
 
-#: mounthelper/tdeio_media_mounthelper.cpp:248
-msgid "The device was successfully unmounted, but could not be ejected"
+#: mounthelper/tdeio_media_mounthelper.cpp:148
+msgid "Try to lock an unknown medium."
 msgstr ""
-"O dispositivo foi desmontado com sucesso, mas não conseguiu ser ejectado"
 
-#: mounthelper/tdeio_media_mounthelper.cpp:281
-msgid "Unknown decrypt error."
+#: mounthelper/tdeio_media_mounthelper.cpp:173
+#, fuzzy
+#| msgid "Unknown"
+msgid "Unknown lock error."
+msgstr "Desconhecido"
+
+#: 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 "Não foi possível encontrar %1."
+
+#: mounthelper/tdeio_media_mounthelper.cpp:310
 #, fuzzy
-msgid "Decrypt given URL"
+msgid "%1 is not a mountable or encrypted media."
+msgstr "Não é possível montar %1."
+
+#: mounthelper/tdeio_media_mounthelper.cpp:397
+#, fuzzy
+#| msgid "Unknown"
+msgid "Unknown unlock error."
+msgstr "Desconhecido"
+
+#: mounthelper/tdeio_media_mounthelper.cpp:410
+#, fuzzy
+#| msgid "Unmount given URL"
+msgid "Mount given URL"
 msgstr "Desmontar a URL dada"
 
-#: mounthelper/tdeio_media_mounthelper.cpp:296
+#: mounthelper/tdeio_media_mounthelper.cpp:411
 msgid "Unmount given URL"
 msgstr "Desmontar a URL dada"
 
-#: mounthelper/tdeio_media_mounthelper.cpp:297
-msgid "Mount given URL (default)"
-msgstr "Montar a URL dada (por omissão)"
+#: mounthelper/tdeio_media_mounthelper.cpp:412
+#, fuzzy
+#| msgid "Unmount given URL"
+msgid "Unlock given URL"
+msgstr "Desmontar a URL dada"
+
+#: mounthelper/tdeio_media_mounthelper.cpp:413
+#, fuzzy
+msgid "Lock given URL"
+msgstr "Desmontar a URL dada"
 
-#: mounthelper/tdeio_media_mounthelper.cpp:298
-msgid "Eject given URL via tdeeject"
-msgstr "Ejectar a URL dada via tdeeject"
+#: mounthelper/tdeio_media_mounthelper.cpp:414
+#, fuzzy
+msgid "Eject given URL"
+msgstr "Desmontar a URL dada"
 
-#: mounthelper/tdeio_media_mounthelper.cpp:299
-msgid "Unmount and Eject given URL (necessary for some USB devices)"
+#: mounthelper/tdeio_media_mounthelper.cpp:415
+msgid "Safely remove (unmount and eject) given URL"
 msgstr ""
-"Desmontar e Ejectar o URL dado (necessário para alguns dispositivos USB)"
 
-#: 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:/ URL a montar/desmontar/ejectar/remover"
 
 #: propsdlgplugin/propertiespage.cpp:137
@@ -620,7 +696,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
@@ -889,6 +965,26 @@ msgstr "Misto"
 msgid "Filesystem: iso9660"
 msgstr "Sistema de ficheiros: ISO9660"
 
+#~ msgid ""
+#~ "The device was successfully unmounted, but the tray could not be opened"
+#~ msgstr ""
+#~ "O dispositivo foi desmontado com sucesso, mas a bandeja não se conseguiu "
+#~ "abrir"
+
+#~ msgid "The device was successfully unmounted, but could not be ejected"
+#~ msgstr ""
+#~ "O dispositivo foi desmontado com sucesso, mas não conseguiu ser ejectado"
+
+#~ msgid "Mount given URL (default)"
+#~ msgstr "Montar a URL dada (por omissão)"
+
+#~ msgid "Eject given URL via tdeeject"
+#~ msgstr "Ejectar a URL dada via tdeeject"
+
+#~ msgid "Unmount and Eject given URL (necessary for some USB devices)"
+#~ msgstr ""
+#~ "Desmontar e Ejectar o URL dado (necessário para alguns dispositivos USB)"
+
 #, fuzzy
 #~ msgid "Permission denied"
 #~ msgstr "Permissões negadas"
diff --git a/tde-i18n-pt_BR/messages/tdebase/tdeio_media.po b/tde-i18n-pt_BR/messages/tdebase/tdeio_media.po
index 660f7a0db82..9a3d614809d 100644
--- a/tde-i18n-pt_BR/messages/tdebase/tdeio_media.po
+++ b/tde-i18n-pt_BR/messages/tdebase/tdeio_media.po
@@ -7,7 +7,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-03-31 20:15-0300\n"
 "Last-Translator: Diniz Bortolotto <diniz.bb@gmail.com>\n"
 "Language-Team: Brazilian Portuguese <kde-i18n-pt_br@kde.org>\n"
@@ -46,27 +46,26 @@ msgstr "Abrir em uma Nova Janela"
 msgid "Unknown"
 msgstr "Desconhecida"
 
-#: 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 "O gerenciador de mídia do TDE não está sendo executado."
 
-#: mediaimpl.cpp:187
+#: mediaimpl.cpp:186
 msgid "This media name already exists."
 msgstr "O nome desta mídia já existe."
 
-#: mediaimpl.cpp:230 mediaimpl.cpp:297
+#: mediaimpl.cpp:229 mediaimpl.cpp:296
 msgid "No such medium."
 msgstr "Mídia inexistente."
 
-#: 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 ""
 
@@ -79,106 +78,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 "Meio inexistente: %1"
 
-#: mediamanager/fstabbackend.cpp:408
+#: mediamanager/fstabbackend.cpp:416
 msgid "CD Recorder"
 msgstr "Gravador de CD"
 
-#: mediamanager/fstabbackend.cpp:414
+#: mediamanager/fstabbackend.cpp:422
 msgid "DVD"
 msgstr "DVD"
 
-#: mediamanager/fstabbackend.cpp:427
+#: mediamanager/fstabbackend.cpp:435
 msgid "CD-ROM"
 msgstr "CD-ROM"
 
-#: mediamanager/fstabbackend.cpp:440
+#: mediamanager/fstabbackend.cpp:448
 msgid "Floppy"
 msgstr "Disquete"
 
-#: mediamanager/fstabbackend.cpp:448
+#: mediamanager/fstabbackend.cpp:456
 msgid "Zip Disk"
 msgstr "Disco Zip"
 
-#: mediamanager/fstabbackend.cpp:459
+#: mediamanager/fstabbackend.cpp:467
 msgid "Removable Device"
 msgstr "Dispositivo Removível"
 
-#: mediamanager/fstabbackend.cpp:464 mediamanager/fstabbackend.cpp:470
+#: mediamanager/fstabbackend.cpp:472 mediamanager/fstabbackend.cpp:478
 msgid "Remote Share"
 msgstr "Compartilhamento Remoto"
 
-#: mediamanager/fstabbackend.cpp:475
+#: mediamanager/fstabbackend.cpp:483
 msgid "Hard Disk"
 msgstr "Disco rígido"
 
-#: mediamanager/halbackend.cpp:768 mediamanager/tdehardwarebackend.cpp:809
+#: mediamanager/halbackend.cpp:778 mediamanager/tdehardwarebackend.cpp:826
 #, fuzzy
 msgid "Unknown Drive"
 msgstr "Desconhecida"
 
-#: mediamanager/halbackend.cpp:780 mediamanager/tdehardwarebackend.cpp:839
+#: mediamanager/halbackend.cpp:794 mediamanager/tdehardwarebackend.cpp:872
 #, fuzzy
 msgid "Floppy Drive"
 msgstr "Disquete"
 
-#: mediamanager/halbackend.cpp:788
+#: mediamanager/halbackend.cpp:802
 #, fuzzy
 msgid "Zip Drive"
 msgstr "Disco Zip"
 
-#: mediamanager/halbackend.cpp:858 mediamanager/tdehardwarebackend.cpp:896
+#: mediamanager/halbackend.cpp:877 mediamanager/tdehardwarebackend.cpp:930
 msgid "Camera"
 msgstr "Câmera"
 
-#: 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 "Erro Interno"
 
-#: mediamanager/halbackend.cpp:1303
+#: mediamanager/halbackend.cpp:1322
 msgid "Invalid filesystem type"
 msgstr "Tipo de sistema de arquivos inválido"
 
-#: 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 "O dispositivo já está montado."
 
-#: 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 "
@@ -188,16 +188,16 @@ msgstr ""
 "estão listados abaixo. Você tem que fechá-los ou trocar seu diretório de "
 "trabalho antes de tentar desmontar o dispositivo novamente."
 
-#: 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. "
@@ -205,209 +205,257 @@ msgstr ""
 "Infelizmente, o dispositivo <b>%1</b> (%2) chamado <b>'%3'</b> e atualmente "
 "montado em <b>%4</b> não pôde ser desmontado. "
 
-#: 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 "O seguinte erro foi retornado pelo comando 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 não é uma mídia montável."
+
+#: mediamanager/halbackend.cpp:1497 mediamanager/tdehardwarebackend.cpp:1225
+#: mounthelper/tdeio_media_mounthelper.cpp:68
+#, fuzzy
+msgid "%1 is already mounted to %2."
+msgstr "O dispositivo já está montado."
+
+#: 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 "O dispositivo já está montado."
+
+#: 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 "Erro Interno"
 
-#: mediamanager/halbackend.cpp:1718
+#: mediamanager/halbackend.cpp:1745
 #, fuzzy
 #| msgid "Unknown"
 msgid "Unknown error"
 msgstr "Desconhecida"
 
-#: mediamanager/halbackend.cpp:1772
+#: mediamanager/halbackend.cpp:1799
 msgid "Unmounting failed due to the following error:"
 msgstr "A desmontagem falhou devido ao seguinte erro:"
 
-#: mediamanager/halbackend.cpp:1774
+#: mediamanager/halbackend.cpp:1801
 msgid "Device is Busy:"
 msgstr "O Dispositivo está Ocupado:"
 
-#: 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 não é uma mídia montável."
+
+#: mediamanager/halbackend.cpp:1868 mediamanager/tdehardwarebackend.cpp:1452
+#: mounthelper/tdeio_media_mounthelper.cpp:127
+#, fuzzy
+msgid "%1 is already unlocked."
+msgstr "O dispositivo já está montado."
+
+#: 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 "O dispositivo já está montado."
+
 #: 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 "Recurso disponível somente com o 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 "Recurso disponível somente com o 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 "Recurso disponível somente com o 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 "Dispositivo Removível"
 
-#: mediamanager/tdehardwarebackend.cpp:529
+#: mediamanager/tdehardwarebackend.cpp:532
 #, fuzzy
 msgid "Blank CD-ROM"
 msgstr "CD-ROM"
 
-#: 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 "CD-ROM"
 
-#: mediamanager/tdehardwarebackend.cpp:682
+#: mediamanager/tdehardwarebackend.cpp:702
 #, fuzzy
 msgid "Blank BLURAY-R"
 msgstr "CD-ROM"
 
-#: 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 "Disco 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. "
@@ -418,66 +466,95 @@ msgstr ""
 "estão listados abaixo. Você tem que fechá-los ou trocar seu diretório de "
 "trabalho antes de tentar desmontar o dispositivo novamente."
 
-#: mounthelper/tdeio_media_mounthelper.cpp:79
-msgid "%1 cannot be found."
-msgstr "%1 não pode ser encontrado."
+#: mounthelper/tdeio_media_mounthelper.cpp:49
+#, fuzzy
+#| msgid "The TDE mediamanager is not running."
+msgid "The TDE mediamanager is not running.\n"
+msgstr "O gerenciador de mídia do TDE não está sendo executado."
 
-#: mounthelper/tdeio_media_mounthelper.cpp:87
-msgid "%1 is not a mountable media."
-msgstr "%1 não é uma mídia montável."
+#: 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 não é uma mídia montável."
+#: 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 "O dispositivo já está montado."
-
-#: 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"
+#: mounthelper/tdeio_media_mounthelper.cpp:116
+msgid "Try to unlock an unknown medium."
 msgstr ""
-"O dispositivo foi desmontado com sucesso, mas a bandeja não pôde ser aberta"
 
-#: mounthelper/tdeio_media_mounthelper.cpp:248
-msgid "The device was successfully unmounted, but could not be ejected"
-msgstr "O dispositivo foi desmontado com sucesso, mas não pôde ser ejetado"
+#: 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 "Desconhecida"
+
+#: 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 não pode ser encontrado."
+
+#: mounthelper/tdeio_media_mounthelper.cpp:310
 #, fuzzy
-msgid "Decrypt given URL"
+msgid "%1 is not a mountable or encrypted media."
+msgstr "%1 não é uma mídia montável."
+
+#: mounthelper/tdeio_media_mounthelper.cpp:397
+#, fuzzy
+#| msgid "Unknown"
+msgid "Unknown unlock error."
+msgstr "Desconhecida"
+
+#: mounthelper/tdeio_media_mounthelper.cpp:410
+#, fuzzy
+#| msgid "Unmount given URL"
+msgid "Mount given URL"
 msgstr "Desmontar URL fornecida"
 
-#: mounthelper/tdeio_media_mounthelper.cpp:296
+#: mounthelper/tdeio_media_mounthelper.cpp:411
 msgid "Unmount given URL"
 msgstr "Desmontar URL fornecida"
 
-#: mounthelper/tdeio_media_mounthelper.cpp:297
-msgid "Mount given URL (default)"
-msgstr "Montar URL fornecida (padrão)"
+#: mounthelper/tdeio_media_mounthelper.cpp:412
+#, fuzzy
+#| msgid "Unmount given URL"
+msgid "Unlock given URL"
+msgstr "Desmontar URL fornecida"
+
+#: mounthelper/tdeio_media_mounthelper.cpp:413
+#, fuzzy
+msgid "Lock given URL"
+msgstr "Desmontar URL fornecida"
 
-#: mounthelper/tdeio_media_mounthelper.cpp:298
-msgid "Eject given URL via tdeeject"
-msgstr "Ejetar URL fornecida via tdeeject"
+#: mounthelper/tdeio_media_mounthelper.cpp:414
+#, fuzzy
+msgid "Eject given URL"
+msgstr "Desmontar URL fornecida"
 
-#: mounthelper/tdeio_media_mounthelper.cpp:299
-msgid "Unmount and Eject given URL (necessary for some USB devices)"
+#: mounthelper/tdeio_media_mounthelper.cpp:415
+msgid "Safely remove (unmount and eject) given URL"
 msgstr ""
-"Desmonta e ejeta o dispositivo fornecido (necessário para alguns "
-"dispositivos USB)"
 
-#: 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 "URL em media:/  para montar/desmonar/ejetar/remover"
 
 #: propsdlgplugin/propertiespage.cpp:137
@@ -626,7 +703,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
@@ -895,6 +972,26 @@ msgstr "Misto"
 msgid "Filesystem: iso9660"
 msgstr "Sistema de Arquivos: iso9660"
 
+#~ msgid ""
+#~ "The device was successfully unmounted, but the tray could not be opened"
+#~ msgstr ""
+#~ "O dispositivo foi desmontado com sucesso, mas a bandeja não pôde ser "
+#~ "aberta"
+
+#~ msgid "The device was successfully unmounted, but could not be ejected"
+#~ msgstr "O dispositivo foi desmontado com sucesso, mas não pôde ser ejetado"
+
+#~ msgid "Mount given URL (default)"
+#~ msgstr "Montar URL fornecida (padrão)"
+
+#~ msgid "Eject given URL via tdeeject"
+#~ msgstr "Ejetar URL fornecida via tdeeject"
+
+#~ msgid "Unmount and Eject given URL (necessary for some USB devices)"
+#~ msgstr ""
+#~ "Desmonta e ejeta o dispositivo fornecido (necessário para alguns "
+#~ "dispositivos USB)"
+
 #, fuzzy
 #~ msgid "Permission denied"
 #~ msgstr "Permissões negadas"
diff --git a/tde-i18n-ro/messages/tdebase/tdeio_media.po b/tde-i18n-ro/messages/tdebase/tdeio_media.po
index 98ec713b8af..c42d4d7e31a 100644
--- a/tde-i18n-ro/messages/tdebase/tdeio_media.po
+++ b/tde-i18n-ro/messages/tdebase/tdeio_media.po
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: tdeio_devices\n"
-"POT-Creation-Date: 2020-09-09 18:58+0200\n"
+"POT-Creation-Date: 2020-10-17 08:51+0800\n"
 "PO-Revision-Date: 2005-01-09 22:20+0200\n"
 "Last-Translator: Claudiu Costin <claudiuc@kde.org>\n"
 "Language-Team:  <en@li.org>\n"
@@ -45,28 +45,27 @@ msgstr ""
 msgid "Unknown"
 msgstr "Necunoscut"
 
-#: 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 ""
 
-#: mediaimpl.cpp:187
+#: mediaimpl.cpp:186
 #, fuzzy
 msgid "This media name already exists."
 msgstr "Acest nume de dispozitiv există deja"
 
-#: 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 ""
 
@@ -79,394 +78,468 @@ 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 ""
 
-#: mediamanager/fstabbackend.cpp:408
+#: mediamanager/fstabbackend.cpp:416
 msgid "CD Recorder"
 msgstr "CD Recorder"
 
-#: mediamanager/fstabbackend.cpp:414
+#: mediamanager/fstabbackend.cpp:422
 msgid "DVD"
 msgstr "DVD"
 
-#: mediamanager/fstabbackend.cpp:427
+#: mediamanager/fstabbackend.cpp:435
 msgid "CD-ROM"
 msgstr "CD-ROM"
 
-#: mediamanager/fstabbackend.cpp:440
+#: mediamanager/fstabbackend.cpp:448
 msgid "Floppy"
 msgstr "Floppy"
 
-#: mediamanager/fstabbackend.cpp:448
+#: mediamanager/fstabbackend.cpp:456
 msgid "Zip Disk"
 msgstr "Disc ZIP"
 
-#: mediamanager/fstabbackend.cpp:459
+#: mediamanager/fstabbackend.cpp:467
 msgid "Removable Device"
 msgstr "Dispozitiv amovibil"
 
-#: mediamanager/fstabbackend.cpp:464 mediamanager/fstabbackend.cpp:470
+#: mediamanager/fstabbackend.cpp:472 mediamanager/fstabbackend.cpp:478
 msgid "Remote Share"
 msgstr "Partajare distantă"
 
-#: mediamanager/fstabbackend.cpp:475
+#: mediamanager/fstabbackend.cpp:483
 #, fuzzy
 msgid "Hard Disk"
 msgstr "Hard Disc"
 
-#: mediamanager/halbackend.cpp:768 mediamanager/tdehardwarebackend.cpp:809
+#: mediamanager/halbackend.cpp:778 mediamanager/tdehardwarebackend.cpp:826
 #, fuzzy
 msgid "Unknown Drive"
 msgstr "Necunoscut"
 
-#: mediamanager/halbackend.cpp:780 mediamanager/tdehardwarebackend.cpp:839
+#: mediamanager/halbackend.cpp:794 mediamanager/tdehardwarebackend.cpp:872
 #, fuzzy
 msgid "Floppy Drive"
 msgstr "Floppy"
 
-#: mediamanager/halbackend.cpp:788
+#: mediamanager/halbackend.cpp:802
 #, fuzzy
 msgid "Zip Drive"
 msgstr "Disc 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
 #, fuzzy
 msgid "Device is already mounted."
 msgstr "Dispozitivul nu este montat"
 
-#: 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 "
 "before attempting to unmount the device again."
 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. "
 msgstr ""
 
-#: 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 ""
 
-#: 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 ""
+
+#: mediamanager/halbackend.cpp:1497 mediamanager/tdehardwarebackend.cpp:1225
+#: mounthelper/tdeio_media_mounthelper.cpp:68
+#, fuzzy
+msgid "%1 is already mounted to %2."
+msgstr "Dispozitivul nu este montat"
+
+#: 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 "Dispozitivul nu este montat"
+
+#: 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
 msgid "Internal error"
 msgstr ""
 
-#: mediamanager/halbackend.cpp:1718
+#: mediamanager/halbackend.cpp:1745
 #, fuzzy
 #| msgid "Unknown"
 msgid "Unknown error"
 msgstr "Necunoscut"
 
-#: 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
+msgid "%1 is not an encrypted media."
+msgstr ""
+
+#: mediamanager/halbackend.cpp:1868 mediamanager/tdehardwarebackend.cpp:1452
+#: mounthelper/tdeio_media_mounthelper.cpp:127
+#, fuzzy
+msgid "%1 is already unlocked."
+msgstr "Dispozitivul nu este montat"
+
+#: 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 "Dispozitivul nu este montat"
+
 #: mediamanager/mediamanager.cpp:248 mediamanager/mediamanager.cpp:275
+#: mediamanager/mediamanager.cpp:302 mediamanager/mediamanager.cpp:329
 msgid "Feature only available with the TDE hardware backend"
 msgstr ""
 
 #: 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 ""
 
 #: mediamanager/mediamanager.cpp:262 mediamanager/mediamanager.cpp:289
-#: mediamanager/mediamanager.cpp:320 mediamanager/mediamanager.cpp:350
+#: mediamanager/mediamanager.cpp:316 mediamanager/mediamanager.cpp:343
 msgid "Feature only available with HAL or TDE hardware backend"
 msgstr ""
 
-#: 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 "Dispozitiv amovibil"
 
-#: mediamanager/tdehardwarebackend.cpp:529
+#: mediamanager/tdehardwarebackend.cpp:532
 #, fuzzy
 msgid "Blank CD-ROM"
 msgstr "CD-ROM"
 
-#: 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 "CD-ROM"
 
-#: mediamanager/tdehardwarebackend.cpp:682
+#: mediamanager/tdehardwarebackend.cpp:702
 #, fuzzy
 msgid "Blank BLURAY-R"
 msgstr "CD-ROM"
 
-#: 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 "Disc 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:1516
+msgid "Unable to lock the device."
 msgstr ""
 
-#: mediamanager/tdehardwarebackend.cpp:1578
+#: mediamanager/tdehardwarebackend.cpp:1623
 msgid ""
 "Programs still using the device have been detected. They are listed below. "
 "You have to close them or change their working directory before attempting "
 "to unmount the device again."
 msgstr ""
 
-#: mounthelper/tdeio_media_mounthelper.cpp:79
-msgid "%1 cannot be found."
+#: mounthelper/tdeio_media_mounthelper.cpp:49
+msgid "The TDE mediamanager is not running.\n"
 msgstr ""
 
-#: mounthelper/tdeio_media_mounthelper.cpp:87
-msgid "%1 is not a mountable media."
+#: mounthelper/tdeio_media_mounthelper.cpp:59
+msgid "Try to mount an unknown medium."
 msgstr ""
 
-#: mounthelper/tdeio_media_mounthelper.cpp:101
-msgid "%1 is not an encrypted media."
+#: mounthelper/tdeio_media_mounthelper.cpp:87
+msgid "Try to unmount an unknown medium."
 msgstr ""
 
 #: mounthelper/tdeio_media_mounthelper.cpp:107
+msgid "Unknown unmount error."
+msgstr ""
+
+#: mounthelper/tdeio_media_mounthelper.cpp:116
+msgid "Try to unlock an unknown medium."
+msgstr ""
+
+#: mounthelper/tdeio_media_mounthelper.cpp:148
+msgid "Try to lock an unknown medium."
+msgstr ""
+
+#: mounthelper/tdeio_media_mounthelper.cpp:173
 #, fuzzy
-msgid "%1 is already unlocked."
-msgstr "Dispozitivul nu este montat"
+#| msgid "Unknown"
+msgid "Unknown lock error."
+msgstr "Necunoscut"
 
-#: mounthelper/tdeio_media_mounthelper.cpp:139
-msgid "Unknown unmount error."
+#: mounthelper/tdeio_media_mounthelper.cpp:211
+msgid "Try to release holders from an unknown medium."
 msgstr ""
 
-#: mounthelper/tdeio_media_mounthelper.cpp:246
-msgid "The device was successfully unmounted, but the tray could not be opened"
+#: mounthelper/tdeio_media_mounthelper.cpp:270
+msgid "Try to safe remove an unknown medium."
 msgstr ""
 
-#: mounthelper/tdeio_media_mounthelper.cpp:248
-msgid "The device was successfully unmounted, but could not be ejected"
+#: mounthelper/tdeio_media_mounthelper.cpp:302
+msgid "%1 cannot be found."
+msgstr ""
+
+#: mounthelper/tdeio_media_mounthelper.cpp:310
+msgid "%1 is not a mountable or encrypted media."
 msgstr ""
 
-#: mounthelper/tdeio_media_mounthelper.cpp:281
+#: mounthelper/tdeio_media_mounthelper.cpp:397
 #, fuzzy
-#| msgid "Unknown device %1"
-msgid "Unknown decrypt error."
-msgstr "Dispozitiv necunoscut %1"
+#| msgid "Unknown"
+msgid "Unknown unlock error."
+msgstr "Necunoscut"
 
-#: mounthelper/tdeio_media_mounthelper.cpp:295
+#: mounthelper/tdeio_media_mounthelper.cpp:410
 #, fuzzy
-msgid "Decrypt given URL"
+#| msgid "Unmount given URL"
+msgid "Mount given URL"
 msgstr "Demontează URL-ul dat"
 
-#: mounthelper/tdeio_media_mounthelper.cpp:296
+#: mounthelper/tdeio_media_mounthelper.cpp:411
 msgid "Unmount given URL"
 msgstr "Demontează URL-ul dat"
 
-#: mounthelper/tdeio_media_mounthelper.cpp:297
-msgid "Mount given URL (default)"
-msgstr "Montează URL-ul dat (implicit)"
+#: mounthelper/tdeio_media_mounthelper.cpp:412
+#, fuzzy
+#| msgid "Unmount given URL"
+msgid "Unlock given URL"
+msgstr "Demontează URL-ul dat"
 
-#: mounthelper/tdeio_media_mounthelper.cpp:298
-msgid "Eject given URL via tdeeject"
-msgstr "Ejectează URL-ul dat cu tdeeject"
+#: mounthelper/tdeio_media_mounthelper.cpp:413
+#, fuzzy
+msgid "Lock given URL"
+msgstr "Demontează URL-ul dat"
 
-#: mounthelper/tdeio_media_mounthelper.cpp:299
-msgid "Unmount and Eject given URL (necessary for some USB devices)"
+#: mounthelper/tdeio_media_mounthelper.cpp:414
+#, fuzzy
+msgid "Eject given URL"
+msgstr "Demontează URL-ul dat"
+
+#: mounthelper/tdeio_media_mounthelper.cpp:415
+msgid "Safely remove (unmount and eject) given URL"
 msgstr ""
 
-#: mounthelper/tdeio_media_mounthelper.cpp:300
+#: 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 "devices:/ URL de montat/demontat/ejectat"
 
 #: propsdlgplugin/propertiespage.cpp:137
@@ -619,7 +692,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
@@ -839,6 +912,17 @@ msgstr ""
 msgid "Filesystem: iso9660"
 msgstr ""
 
+#, fuzzy
+#~| msgid "Unknown device %1"
+#~ msgid "Unknown decrypt error."
+#~ msgstr "Dispozitiv necunoscut %1"
+
+#~ msgid "Mount given URL (default)"
+#~ msgstr "Montează URL-ul dat (implicit)"
+
+#~ msgid "Eject given URL via tdeeject"
+#~ msgstr "Ejectează URL-ul dat cu tdeeject"
+
 #~ msgid ""
 #~ "\n"
 #~ "Please check that the disk is entered correctly."
diff --git a/tde-i18n-ru/messages/tdebase/tdeio_media.po b/tde-i18n-ru/messages/tdebase/tdeio_media.po
index 7985014574b..fdabd762e39 100644
--- a/tde-i18n-ru/messages/tdebase/tdeio_media.po
+++ b/tde-i18n-ru/messages/tdebase/tdeio_media.po
@@ -9,7 +9,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: 2020-01-07 21:07+0000\n"
 "Last-Translator: Bogdan V. Kilin <bkilin@ya.ru>\n"
 "Language-Team: Russian <https://mirror.git.trinitydesktop.org/weblate/"
@@ -50,27 +50,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 mediamanager не запущен."
 
-#: 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 ""
 
@@ -83,69 +82,71 @@ 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 "Пишущий CD"
 
-#: mediamanager/fstabbackend.cpp:414
+#: mediamanager/fstabbackend.cpp:422
 msgid "DVD"
 msgstr "DVD"
 
-#: mediamanager/fstabbackend.cpp:427
+#: mediamanager/fstabbackend.cpp:435
 msgid "CD-ROM"
 msgstr "CD-ROM"
 
-#: 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
 msgid "Unknown Drive"
 msgstr "Неизвестный диск"
 
-#: mediamanager/halbackend.cpp:780 mediamanager/tdehardwarebackend.cpp:839
+#: mediamanager/halbackend.cpp:794 mediamanager/tdehardwarebackend.cpp:872
 msgid "Floppy Drive"
 msgstr "Дискета"
 
-#: mediamanager/halbackend.cpp:788
+#: mediamanager/halbackend.cpp:802
 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 "
@@ -155,7 +156,7 @@ msgstr ""
 "big><br/>Аутентификация требуется для осуществления этого действия. "
 "Пожалуйста введите ваш пароль для проверки."
 
-#: 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 "
@@ -165,17 +166,16 @@ msgstr ""
 "другими пользователями</b></big><br/>Аутентификация требуется для "
 "осуществления этого действия. Пожалуйста введите ваш пароль для проверки."
 
-#: 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
 #, fuzzy
 msgid ""
 "Permission denied<p>Please ensure that:<br>1. You have permission to access "
@@ -185,11 +185,11 @@ msgstr ""
 "доступа к этому устройству.<br>2. Этот узел устройства не указан в /etc/"
 "fstab.</p>"
 
-#: 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 "
@@ -199,7 +199,7 @@ 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."
@@ -207,10 +207,10 @@ 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. "
@@ -218,39 +218,61 @@ 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 "Произошла ошибка при отключении устройства:"
 
-#: 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 decrypted."
+msgid "%1 is already mounted to %2."
+msgstr "%1 уже расшифрован."
+
+#: mediamanager/halbackend.cpp:1614
 #, fuzzy
 #| msgid "Cannot mount encrypted drives!"
 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 decrypted."
+msgid "%1 is already unmounted."
+msgstr "%1 уже расшифрован."
+
+#: 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>"
@@ -259,7 +281,7 @@ msgstr ""
 "доступа к этому устройству.<br>2. Это устройство было смонтировано используя "
 "TDE.</p>"
 
-#: 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>"
@@ -267,170 +289,199 @@ msgstr ""
 "%1<p><b>Вы согласны принудительно прервать эти процессы?</b><br><i>Все "
 "несохранённые данные могут быть утеряны</i>"
 
-#: 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
+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 decrypted."
+msgid "%1 is already unlocked."
+msgstr "%1 уже расшифрован."
+
+#: 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 decrypted."
+msgid "%1 is already locked."
+msgstr "%1 уже расшифрован."
+
 #: 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 "CD-ROM"
 
-#: 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 "CD-ROM"
 
-#: mediamanager/tdehardwarebackend.cpp:682
+#: mediamanager/tdehardwarebackend.cpp:702
 #, fuzzy
 msgid "Blank BLURAY-R"
 msgstr "CD-ROM"
 
-#: 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
-msgid "<p>Technical details:<br>"
-msgstr ""
-
 #: mediamanager/tdehardwarebackend.cpp:1285
-msgid "Decryption aborted"
+#: 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:1444
+#: mediamanager/tdehardwarebackend.cpp:1396
 #, fuzzy
 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>"
+"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 ""
 "%1<p><b>Вы согласны принудительно прервать эти процессы?</b><br><i>Все "
 "несохранённые данные могут быть утеряны</i>"
 
-#: mediamanager/tdehardwarebackend.cpp:1578
+#: mediamanager/tdehardwarebackend.cpp:1467
+msgid "Unable to unlock the device."
+msgstr ""
+
+#: 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. "
@@ -441,64 +492,98 @@ 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 mediamanager не запущен."
 
-#: 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
-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 decrypted."
-msgid "%1 is already unlocked."
-msgstr "%1 уже расшифрован."
-
-#: 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:173
+#, fuzzy
+#| msgid "Unknown"
+msgid "Unknown lock error."
+msgstr "Нет данных"
 
-#: mounthelper/tdeio_media_mounthelper.cpp:281
-msgid "Unknown decrypt error."
+#: mounthelper/tdeio_media_mounthelper.cpp:211
+msgid "Try to release holders from an unknown medium."
 msgstr ""
 
-#: mounthelper/tdeio_media_mounthelper.cpp:295
-msgid "Decrypt given URL"
-msgstr "Расшифровать данный URL"
+#: mounthelper/tdeio_media_mounthelper.cpp:270
+msgid "Try to safe remove an unknown medium."
+msgstr ""
+
+#: mounthelper/tdeio_media_mounthelper.cpp:302
+msgid "%1 cannot be found."
+msgstr "Не удаётся найти %1."
+
+#: mounthelper/tdeio_media_mounthelper.cpp:310
+#, fuzzy
+#| msgid "%1 is not an encrypted media."
+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:296
+#: mounthelper/tdeio_media_mounthelper.cpp:410
+#, fuzzy
+#| msgid "Unmount given URL"
+msgid "Mount given URL"
+msgstr "Отключить по заданной точке"
+
+#: 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 "Извлечь с помощью tdeeject"
+#: mounthelper/tdeio_media_mounthelper.cpp:413
+#, fuzzy
+#| msgid "Decrypt given URL"
+msgid "Lock given URL"
+msgstr "Расшифровать данный URL"
+
+#: mounthelper/tdeio_media_mounthelper.cpp:414
+#, fuzzy
+#| msgid "Decrypt given URL"
+msgid "Eject given URL"
+msgstr "Расшифровать данный URL"
 
-#: mounthelper/tdeio_media_mounthelper.cpp:299
-msgid "Unmount and Eject given URL (necessary for some USB devices)"
+#: mounthelper/tdeio_media_mounthelper.cpp:415
+msgid "Safely remove (unmount and eject) given URL"
 msgstr ""
-"Отключить от файловой системы и извлечь (необходимо для некоторых устройств "
-"USB)"
 
-#: 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
@@ -647,7 +732,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
@@ -907,6 +992,24 @@ 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 "Извлечь с помощью tdeeject"
+
+#~ msgid "Unmount and Eject given URL (necessary for some USB devices)"
+#~ msgstr ""
+#~ "Отключить от файловой системы и извлечь (необходимо для некоторых "
+#~ "устройств USB)"
+
 #~ msgid "Decrypt"
 #~ msgstr "Расшифровать"
 
diff --git a/tde-i18n-rw/messages/tdebase/tdeio_media.po b/tde-i18n-rw/messages/tdebase/tdeio_media.po
index 209cf2bbb93..743becde9c4 100644
--- a/tde-i18n-rw/messages/tdebase/tdeio_media.po
+++ b/tde-i18n-rw/messages/tdebase/tdeio_media.po
@@ -15,7 +15,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: tdeio_media 3.4\n"
-"POT-Creation-Date: 2020-09-09 18:58+0200\n"
+"POT-Creation-Date: 2020-10-17 08:51+0800\n"
 "PO-Revision-Date: 2005-09-05 12:21-0800\n"
 "Last-Translator: Viateur <muvia@mail.rw>\n"
 "Language-Team: Kinyarwanda <translation-team-rw@lists.sourceforge.net>\n"
@@ -56,27 +56,26 @@ msgstr "Gufungurira mu idirishya rishya"
 msgid "Unknown"
 msgstr "Kitazwi"
 
-#: 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 mugenga-igihuza ntiri gukora"
 
-#: mediaimpl.cpp:187
+#: mediaimpl.cpp:186
 msgid "This media name already exists."
 msgstr "Izina ry'ibihuza risanzwemo."
 
-#: 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 ""
 
@@ -89,390 +88,469 @@ 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 ""
 
-#: mediamanager/fstabbackend.cpp:408
+#: mediamanager/fstabbackend.cpp:416
 msgid "CD Recorder"
 msgstr "Mubika CD"
 
-#: mediamanager/fstabbackend.cpp:414
+#: mediamanager/fstabbackend.cpp:422
 msgid "DVD"
 msgstr "DVD"
 
-#: mediamanager/fstabbackend.cpp:427
+#: mediamanager/fstabbackend.cpp:435
 msgid "CD-ROM"
 msgstr "CD-ROM"
 
-#: mediamanager/fstabbackend.cpp:440
+#: mediamanager/fstabbackend.cpp:448
 msgid "Floppy"
 msgstr "Disikete"
 
-#: mediamanager/fstabbackend.cpp:448
+#: mediamanager/fstabbackend.cpp:456
 msgid "Zip Disk"
 msgstr "Disiki Zip"
 
-#: mediamanager/fstabbackend.cpp:459
+#: mediamanager/fstabbackend.cpp:467
 msgid "Removable Device"
 msgstr "Apareye Zikurwamo"
 
-#: mediamanager/fstabbackend.cpp:464 mediamanager/fstabbackend.cpp:470
+#: mediamanager/fstabbackend.cpp:472 mediamanager/fstabbackend.cpp:478
 msgid "Remote Share"
 msgstr "Isangira rya Kure"
 
-#: mediamanager/fstabbackend.cpp:475
+#: mediamanager/fstabbackend.cpp:483
 msgid "Hard Disk"
 msgstr "Ububiko disiki"
 
-#: mediamanager/halbackend.cpp:768 mediamanager/tdehardwarebackend.cpp:809
+#: mediamanager/halbackend.cpp:778 mediamanager/tdehardwarebackend.cpp:826
 #, fuzzy
 msgid "Unknown Drive"
 msgstr "Kitazwi"
 
-#: mediamanager/halbackend.cpp:780 mediamanager/tdehardwarebackend.cpp:839
+#: mediamanager/halbackend.cpp:794 mediamanager/tdehardwarebackend.cpp:872
 #, fuzzy
 msgid "Floppy Drive"
 msgstr "Disikete"
 
-#: mediamanager/halbackend.cpp:788
+#: mediamanager/halbackend.cpp:802
 #, fuzzy
 msgid "Zip Drive"
 msgstr "Disiki Zip"
 
-#: mediamanager/halbackend.cpp:858 mediamanager/tdehardwarebackend.cpp:896
+#: mediamanager/halbackend.cpp:877 mediamanager/tdehardwarebackend.cpp:930
 msgid "Camera"
 msgstr "Kamera"
 
-#: 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 "
 "before attempting to unmount the device again."
 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. "
 msgstr ""
 
-#: 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 ""
 
-#: 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 ntabwo igihuza gishyirwamo. "
+
+#: mediamanager/halbackend.cpp:1497 mediamanager/tdehardwarebackend.cpp:1225
+#: mounthelper/tdeio_media_mounthelper.cpp:68
+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 not a mountable media."
+msgid "%1 is already unmounted."
+msgstr "%1 ntabwo igihuza gishyirwamo. "
+
+#: 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
 msgid "Internal error"
 msgstr ""
 
-#: mediamanager/halbackend.cpp:1718
+#: mediamanager/halbackend.cpp:1745
 #, fuzzy
 #| msgid "Unknown"
 msgid "Unknown error"
 msgstr "Kitazwi"
 
-#: 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 ntabwo igihuza gishyirwamo. "
+
+#: mediamanager/halbackend.cpp:1868 mediamanager/tdehardwarebackend.cpp:1452
+#: mounthelper/tdeio_media_mounthelper.cpp:127
+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
+msgid "%1 is already locked."
+msgstr ""
+
 #: mediamanager/mediamanager.cpp:248 mediamanager/mediamanager.cpp:275
+#: mediamanager/mediamanager.cpp:302 mediamanager/mediamanager.cpp:329
 msgid "Feature only available with the TDE hardware backend"
 msgstr ""
 
 #: 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 ""
 
 #: mediamanager/mediamanager.cpp:262 mediamanager/mediamanager.cpp:289
-#: mediamanager/mediamanager.cpp:320 mediamanager/mediamanager.cpp:350
+#: mediamanager/mediamanager.cpp:316 mediamanager/mediamanager.cpp:343
 msgid "Feature only available with HAL or TDE hardware backend"
 msgstr ""
 
-#: 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 "Apareye Zikurwamo"
 
-#: mediamanager/tdehardwarebackend.cpp:529
+#: mediamanager/tdehardwarebackend.cpp:532
 #, fuzzy
 msgid "Blank CD-ROM"
 msgstr "CD-ROM"
 
-#: 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 "CD-ROM"
 
-#: mediamanager/tdehardwarebackend.cpp:682
+#: mediamanager/tdehardwarebackend.cpp:702
 #, fuzzy
 msgid "Blank BLURAY-R"
 msgstr "CD-ROM"
 
-#: 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 "Disiki 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
 msgid ""
 "Programs still using the device have been detected. They are listed below. "
 "You have to close them or change their working directory before attempting "
 "to unmount the device again."
 msgstr ""
 
-#: mounthelper/tdeio_media_mounthelper.cpp:79
-msgid "%1 cannot be found."
-msgstr "%1 ntishoboye kuboneka. "
+#: mounthelper/tdeio_media_mounthelper.cpp:49
+#, fuzzy
+#| msgid "The TDE mediamanager is not running."
+msgid "The TDE mediamanager is not running.\n"
+msgstr "TDE mugenga-igihuza ntiri gukora"
 
-#: mounthelper/tdeio_media_mounthelper.cpp:87
-msgid "%1 is not a mountable media."
-msgstr "%1 ntabwo igihuza gishyirwamo. "
+#: 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 ntabwo igihuza gishyirwamo. "
+#: mounthelper/tdeio_media_mounthelper.cpp:87
+msgid "Try to unmount an unknown medium."
+msgstr ""
 
 #: mounthelper/tdeio_media_mounthelper.cpp:107
-msgid "%1 is already unlocked."
+msgid "Unknown unmount error."
 msgstr ""
 
-#: mounthelper/tdeio_media_mounthelper.cpp:139
-msgid "Unknown unmount error."
+#: mounthelper/tdeio_media_mounthelper.cpp:116
+msgid "Try to unlock an unknown medium."
 msgstr ""
 
-#: mounthelper/tdeio_media_mounthelper.cpp:246
-msgid "The device was successfully unmounted, but the tray could not be opened"
+#: mounthelper/tdeio_media_mounthelper.cpp:148
+msgid "Try to lock an unknown medium."
 msgstr ""
 
-#: mounthelper/tdeio_media_mounthelper.cpp:248
-msgid "The device was successfully unmounted, but could not be ejected"
+#: mounthelper/tdeio_media_mounthelper.cpp:173
+#, fuzzy
+#| msgid "Unknown"
+msgid "Unknown lock error."
+msgstr "Kitazwi"
+
+#: mounthelper/tdeio_media_mounthelper.cpp:211
+msgid "Try to release holders from an unknown medium."
 msgstr ""
 
-#: mounthelper/tdeio_media_mounthelper.cpp:281
-msgid "Unknown decrypt error."
+#: 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 ntishoboye kuboneka. "
+
+#: mounthelper/tdeio_media_mounthelper.cpp:310
 #, fuzzy
-msgid "Decrypt given URL"
+msgid "%1 is not a mountable or encrypted media."
+msgstr "%1 ntabwo igihuza gishyirwamo. "
+
+#: mounthelper/tdeio_media_mounthelper.cpp:397
+#, fuzzy
+#| msgid "Unknown"
+msgid "Unknown unlock error."
+msgstr "Kitazwi"
+
+#: mounthelper/tdeio_media_mounthelper.cpp:410
+#, fuzzy
+#| msgid "Unmount given URL"
+msgid "Mount given URL"
 msgstr "Gukuramo URL yatanzwe"
 
-#: mounthelper/tdeio_media_mounthelper.cpp:296
+#: mounthelper/tdeio_media_mounthelper.cpp:411
 msgid "Unmount given URL"
 msgstr "Gukuramo URL yatanzwe"
 
-#: mounthelper/tdeio_media_mounthelper.cpp:297
-msgid "Mount given URL (default)"
-msgstr "Gushyiramo URL yatanzwe (mburabuzi)"
+#: mounthelper/tdeio_media_mounthelper.cpp:412
+#, fuzzy
+#| msgid "Unmount given URL"
+msgid "Unlock given URL"
+msgstr "Gukuramo URL yatanzwe"
+
+#: mounthelper/tdeio_media_mounthelper.cpp:413
+#, fuzzy
+msgid "Lock given URL"
+msgstr "Gukuramo URL yatanzwe"
 
-#: mounthelper/tdeio_media_mounthelper.cpp:298
-msgid "Eject given URL via tdeeject"
-msgstr "Gusohora URL yatanzwe biturutse kuri tdeeject"
+#: mounthelper/tdeio_media_mounthelper.cpp:414
+#, fuzzy
+msgid "Eject given URL"
+msgstr "Gukuramo URL yatanzwe"
 
-#: mounthelper/tdeio_media_mounthelper.cpp:299
-msgid "Unmount and Eject given URL (necessary for some USB devices)"
+#: mounthelper/tdeio_media_mounthelper.cpp:415
+msgid "Safely remove (unmount and eject) given URL"
 msgstr ""
-"Gukuramo no Gusohora URL yatanzwe (ngombwa kuri apareye USB  zimwe na zimwe)"
 
-#: 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 "ibihuza:/ URL yo gushyiramo/gukuramo/gusohora/kuvanamo"
 
 #: propsdlgplugin/propertiespage.cpp:137
@@ -622,7 +700,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
@@ -842,6 +920,17 @@ msgstr ""
 msgid "Filesystem: iso9660"
 msgstr ""
 
+#~ msgid "Mount given URL (default)"
+#~ msgstr "Gushyiramo URL yatanzwe (mburabuzi)"
+
+#~ msgid "Eject given URL via tdeeject"
+#~ msgstr "Gusohora URL yatanzwe biturutse kuri tdeeject"
+
+#~ msgid "Unmount and Eject given URL (necessary for some USB devices)"
+#~ msgstr ""
+#~ "Gukuramo no Gusohora URL yatanzwe (ngombwa kuri apareye USB  zimwe na "
+#~ "zimwe)"
+
 #~ msgid ""
 #~ "\n"
 #~ "Please check that the disk is entered correctly."
diff --git a/tde-i18n-se/messages/tdebase/tdeio_media.po b/tde-i18n-se/messages/tdebase/tdeio_media.po
index 7499d6589f6..455a814b6bc 100644
--- a/tde-i18n-se/messages/tdebase/tdeio_media.po
+++ b/tde-i18n-se/messages/tdebase/tdeio_media.po
@@ -5,7 +5,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: 2005-10-28 15:44+0200\n"
 "Last-Translator: Børre Gaup <boerre@skolelinux.no>\n"
 "Language-Team: Northern Saami <i18n-sme@lister.ping.uio.no>\n"
@@ -43,27 +43,26 @@ msgstr "Raba ođđa láses"
 msgid "Unknown"
 msgstr "Amas"
 
-#: 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-mediagieđahalli ii leat jođus."
 
-#: mediaimpl.cpp:187
+#: mediaimpl.cpp:186
 msgid "This media name already exists."
 msgstr "Dát medianamma gávdno juo."
 
-#: 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 ""
 
@@ -76,394 +75,472 @@ 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 ""
 
-#: mediamanager/fstabbackend.cpp:408
+#: mediamanager/fstabbackend.cpp:416
 msgid "CD Recorder"
 msgstr "CD Recorder"
 
-#: mediamanager/fstabbackend.cpp:414
+#: mediamanager/fstabbackend.cpp:422
 msgid "DVD"
 msgstr "DVD"
 
-#: mediamanager/fstabbackend.cpp:427
+#: mediamanager/fstabbackend.cpp:435
 msgid "CD-ROM"
 msgstr "CD-ROM"
 
-#: mediamanager/fstabbackend.cpp:440
+#: mediamanager/fstabbackend.cpp:448
 msgid "Floppy"
 msgstr "Dipmaskearru"
 
-#: mediamanager/fstabbackend.cpp:448
+#: mediamanager/fstabbackend.cpp:456
 msgid "Zip Disk"
 msgstr "Zip-skearru"
 
-#: mediamanager/fstabbackend.cpp:459
+#: mediamanager/fstabbackend.cpp:467
 msgid "Removable Device"
 msgstr "Sirdehahtti ovttadat"
 
-#: mediamanager/fstabbackend.cpp:464 mediamanager/fstabbackend.cpp:470
+#: mediamanager/fstabbackend.cpp:472 mediamanager/fstabbackend.cpp:478
 msgid "Remote Share"
 msgstr "Juohkujuvvon fierbmeresursa"
 
-#: mediamanager/fstabbackend.cpp:475
+#: mediamanager/fstabbackend.cpp:483
 msgid "Hard Disk"
 msgstr "Garraskearru"
 
 # | msgid "Unknown"
-#: mediamanager/halbackend.cpp:768 mediamanager/tdehardwarebackend.cpp:809
+#: mediamanager/halbackend.cpp:778 mediamanager/tdehardwarebackend.cpp:826
 #, fuzzy
 msgid "Unknown Drive"
 msgstr "Amas"
 
 # | msgid "Floppy"
-#: mediamanager/halbackend.cpp:780 mediamanager/tdehardwarebackend.cpp:839
+#: mediamanager/halbackend.cpp:794 mediamanager/tdehardwarebackend.cpp:872
 #, fuzzy
 msgid "Floppy Drive"
 msgstr "Dipmaskearru"
 
 # | msgid "Zip Disk"
-#: mediamanager/halbackend.cpp:788
+#: mediamanager/halbackend.cpp:802
 #, fuzzy
 msgid "Zip Drive"
 msgstr "Zip-skearru"
 
-#: mediamanager/halbackend.cpp:858 mediamanager/tdehardwarebackend.cpp:896
+#: mediamanager/halbackend.cpp:877 mediamanager/tdehardwarebackend.cpp:930
 msgid "Camera"
 msgstr "Govvenapperáhta"
 
-#: 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 "
 "before attempting to unmount the device again."
 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. "
 msgstr ""
 
-#: 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 ""
 
-#: 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» ii leat čanahahtti media."
+
+#: mediamanager/halbackend.cpp:1497 mediamanager/tdehardwarebackend.cpp:1225
+#: mounthelper/tdeio_media_mounthelper.cpp:68
+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 not a mountable media."
+msgid "%1 is already unmounted."
+msgstr "«%1» ii leat čanahahtti media."
+
+#: 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
 msgid "Internal error"
 msgstr ""
 
-#: mediamanager/halbackend.cpp:1718
+#: mediamanager/halbackend.cpp:1745
 #, fuzzy
 #| msgid "Unknown"
 msgid "Unknown error"
 msgstr "Amas"
 
-#: 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» ii leat čanahahtti media."
+
+#: mediamanager/halbackend.cpp:1868 mediamanager/tdehardwarebackend.cpp:1452
+#: mounthelper/tdeio_media_mounthelper.cpp:127
+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
+msgid "%1 is already locked."
+msgstr ""
+
 #: mediamanager/mediamanager.cpp:248 mediamanager/mediamanager.cpp:275
+#: mediamanager/mediamanager.cpp:302 mediamanager/mediamanager.cpp:329
 msgid "Feature only available with the TDE hardware backend"
 msgstr ""
 
 #: 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 ""
 
 #: mediamanager/mediamanager.cpp:262 mediamanager/mediamanager.cpp:289
-#: mediamanager/mediamanager.cpp:320 mediamanager/mediamanager.cpp:350
+#: mediamanager/mediamanager.cpp:316 mediamanager/mediamanager.cpp:343
 msgid "Feature only available with HAL or TDE hardware backend"
 msgstr ""
 
-#: 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 "Sirdehahtti ovttadat"
 
-#: mediamanager/tdehardwarebackend.cpp:529
+#: mediamanager/tdehardwarebackend.cpp:532
 #, fuzzy
 msgid "Blank CD-ROM"
 msgstr "CD-ROM"
 
-#: 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 "CD-ROM"
 
-#: mediamanager/tdehardwarebackend.cpp:682
+#: mediamanager/tdehardwarebackend.cpp:702
 #, fuzzy
 msgid "Blank BLURAY-R"
 msgstr "CD-ROM"
 
-#: 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-skearru"
 
-#: 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
 msgid ""
 "Programs still using the device have been detected. They are listed below. "
 "You have to close them or change their working directory before attempting "
 "to unmount the device again."
 msgstr ""
 
-#: mounthelper/tdeio_media_mounthelper.cpp:79
-msgid "%1 cannot be found."
-msgstr "«%1» ii gávdnon."
+#: mounthelper/tdeio_media_mounthelper.cpp:49
+#, fuzzy
+#| msgid "The TDE mediamanager is not running."
+msgid "The TDE mediamanager is not running.\n"
+msgstr "TDE-mediagieđahalli ii leat jođus."
 
-#: mounthelper/tdeio_media_mounthelper.cpp:87
-msgid "%1 is not a mountable media."
-msgstr "«%1» ii leat čanahahtti media."
+#: 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» ii leat čanahahtti media."
+#: mounthelper/tdeio_media_mounthelper.cpp:87
+msgid "Try to unmount an unknown medium."
+msgstr ""
 
 #: mounthelper/tdeio_media_mounthelper.cpp:107
-msgid "%1 is already unlocked."
+msgid "Unknown unmount error."
 msgstr ""
 
-#: mounthelper/tdeio_media_mounthelper.cpp:139
-msgid "Unknown unmount error."
+#: mounthelper/tdeio_media_mounthelper.cpp:116
+msgid "Try to unlock an unknown medium."
 msgstr ""
 
-#: mounthelper/tdeio_media_mounthelper.cpp:246
-msgid "The device was successfully unmounted, but the tray could not be opened"
+#: mounthelper/tdeio_media_mounthelper.cpp:148
+msgid "Try to lock an unknown medium."
 msgstr ""
 
-#: mounthelper/tdeio_media_mounthelper.cpp:248
-msgid "The device was successfully unmounted, but could not be ejected"
+#: mounthelper/tdeio_media_mounthelper.cpp:173
+#, fuzzy
+#| msgid "Unknown"
+msgid "Unknown lock error."
+msgstr "Amas"
+
+#: mounthelper/tdeio_media_mounthelper.cpp:211
+msgid "Try to release holders from an unknown medium."
 msgstr ""
 
-#: mounthelper/tdeio_media_mounthelper.cpp:281
-msgid "Unknown decrypt error."
+#: 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» ii gávdnon."
+
+#: mounthelper/tdeio_media_mounthelper.cpp:310
 #, fuzzy
-msgid "Decrypt given URL"
+msgid "%1 is not a mountable or encrypted media."
+msgstr "«%1» ii leat čanahahtti media."
+
+#: mounthelper/tdeio_media_mounthelper.cpp:397
+#, fuzzy
+#| msgid "Unknown"
+msgid "Unknown unlock error."
+msgstr "Amas"
+
+#: mounthelper/tdeio_media_mounthelper.cpp:410
+#, fuzzy
+#| msgid "Unmount given URL"
+msgid "Mount given URL"
 msgstr "Gálgga addejuvvon URL:a"
 
-#: mounthelper/tdeio_media_mounthelper.cpp:296
+#: mounthelper/tdeio_media_mounthelper.cpp:411
 msgid "Unmount given URL"
 msgstr "Gálgga addejuvvon URL:a"
 
-#: mounthelper/tdeio_media_mounthelper.cpp:297
-msgid "Mount given URL (default)"
-msgstr "Čana addejuvvon URL:a (standárda)"
+#: mounthelper/tdeio_media_mounthelper.cpp:412
+#, fuzzy
+#| msgid "Unmount given URL"
+msgid "Unlock given URL"
+msgstr "Gálgga addejuvvon URL:a"
+
+#: mounthelper/tdeio_media_mounthelper.cpp:413
+#, fuzzy
+msgid "Lock given URL"
+msgstr "Gálgga addejuvvon URL:a"
 
-#: mounthelper/tdeio_media_mounthelper.cpp:298
-msgid "Eject given URL via tdeeject"
-msgstr "Bálkkes olggos URL:a tdeeject prográmmain"
+#: mounthelper/tdeio_media_mounthelper.cpp:414
+#, fuzzy
+msgid "Eject given URL"
+msgstr "Gálgga addejuvvon URL:a"
 
-#: mounthelper/tdeio_media_mounthelper.cpp:299
-msgid "Unmount and Eject given URL (necessary for some USB devices)"
+#: mounthelper/tdeio_media_mounthelper.cpp:415
+msgid "Safely remove (unmount and eject) given URL"
 msgstr ""
-"Gálgga ja bálgges olggos válljejuvvon URL:a (dárbbašuvvo muhton USB-"
-"ovttadagaid várás)"
 
-#: 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:/-URL:a maid áiggut čatnat/gálgat/bálkestit olggos"
 
 #: propsdlgplugin/propertiespage.cpp:137
@@ -613,7 +690,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
@@ -833,6 +910,17 @@ msgstr ""
 msgid "Filesystem: iso9660"
 msgstr ""
 
+#~ msgid "Mount given URL (default)"
+#~ msgstr "Čana addejuvvon URL:a (standárda)"
+
+#~ msgid "Eject given URL via tdeeject"
+#~ msgstr "Bálkkes olggos URL:a tdeeject prográmmain"
+
+#~ msgid "Unmount and Eject given URL (necessary for some USB devices)"
+#~ msgstr ""
+#~ "Gálgga ja bálgges olggos válljejuvvon URL:a (dárbbašuvvo muhton USB-"
+#~ "ovttadagaid várás)"
+
 #~ msgid ""
 #~ "\n"
 #~ "Please check that the disk is entered correctly."
diff --git a/tde-i18n-sk/messages/tdebase/tdeio_media.po b/tde-i18n-sk/messages/tdebase/tdeio_media.po
index c551c5625d1..cfdcc826e15 100644
--- a/tde-i18n-sk/messages/tdebase/tdeio_media.po
+++ b/tde-i18n-sk/messages/tdebase/tdeio_media.po
@@ -8,7 +8,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: 2020-02-05 16:07+0000\n"
 "Last-Translator: Marek Mlynar <marek.inq.mlynar@gmail.com>\n"
 "Language-Team: Slovak <https://mirror.git.trinitydesktop.org/weblate/"
@@ -48,27 +48,26 @@ msgstr "Otvoriť v novom okne"
 msgid "Unknown"
 msgstr "Neznáme"
 
-#: 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 "Správca médií TDE nebeží."
 
-#: mediaimpl.cpp:187
+#: mediaimpl.cpp:186
 msgid "This media name already exists."
 msgstr "Tento názov média už existuje."
 
-#: mediaimpl.cpp:230 mediaimpl.cpp:297
+#: mediaimpl.cpp:229 mediaimpl.cpp:296
 msgid "No such medium."
 msgstr "Médium neexistuje."
 
-#: mediaimpl.cpp:238
+#: mediaimpl.cpp:237
 msgid "The drive is encrypted."
 msgstr "Jednotka je šifrovaná."
 
-#: 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 "Neznáma chyba pripojenia."
 
@@ -83,69 +82,71 @@ msgid "Unlock"
 msgstr "Odomknúť"
 
 #: 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 "Médium %1 neexistuje"
 
-#: mediamanager/fstabbackend.cpp:408
+#: mediamanager/fstabbackend.cpp:416
 msgid "CD Recorder"
 msgstr "Vypaľovačka CD"
 
-#: mediamanager/fstabbackend.cpp:414
+#: mediamanager/fstabbackend.cpp:422
 msgid "DVD"
 msgstr "DVD"
 
-#: mediamanager/fstabbackend.cpp:427
+#: mediamanager/fstabbackend.cpp:435
 msgid "CD-ROM"
 msgstr "CD-ROM"
 
-#: mediamanager/fstabbackend.cpp:440
+#: mediamanager/fstabbackend.cpp:448
 msgid "Floppy"
 msgstr "Disketa"
 
-#: mediamanager/fstabbackend.cpp:448
+#: mediamanager/fstabbackend.cpp:456
 msgid "Zip Disk"
 msgstr "Zip Disk"
 
-#: mediamanager/fstabbackend.cpp:459
+#: mediamanager/fstabbackend.cpp:467
 msgid "Removable Device"
 msgstr "Odpojiteľné zariadenie"
 
-#: mediamanager/fstabbackend.cpp:464 mediamanager/fstabbackend.cpp:470
+#: mediamanager/fstabbackend.cpp:472 mediamanager/fstabbackend.cpp:478
 msgid "Remote Share"
 msgstr "Vzdialený zdieľaný prostriedok"
 
-#: mediamanager/fstabbackend.cpp:475
+#: mediamanager/fstabbackend.cpp:483
 msgid "Hard Disk"
 msgstr "Pevný disk"
 
-#: mediamanager/halbackend.cpp:768 mediamanager/tdehardwarebackend.cpp:809
+#: mediamanager/halbackend.cpp:778 mediamanager/tdehardwarebackend.cpp:826
 msgid "Unknown Drive"
 msgstr "Neznámy disk"
 
-#: mediamanager/halbackend.cpp:780 mediamanager/tdehardwarebackend.cpp:839
+#: mediamanager/halbackend.cpp:794 mediamanager/tdehardwarebackend.cpp:872
 msgid "Floppy Drive"
 msgstr "Disketová jednotka"
 
-#: mediamanager/halbackend.cpp:788
+#: mediamanager/halbackend.cpp:802
 msgid "Zip Drive"
 msgstr "Mechanika Zip"
 
-#: mediamanager/halbackend.cpp:858 mediamanager/tdehardwarebackend.cpp:896
+#: mediamanager/halbackend.cpp:877 mediamanager/tdehardwarebackend.cpp:930
 msgid "Camera"
 msgstr "Fotoaparát"
 
-#: mediamanager/halbackend.cpp:1240 mediamanager/halbackend.cpp:1266
+#: mediamanager/halbackend.cpp:1259 mediamanager/halbackend.cpp:1285
 msgid "Authenticate"
 msgstr "Overiť"
 
-#: 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 "
@@ -155,7 +156,7 @@ msgstr ""
 "vykonanie tejto akcie je potrebné overenie. Prosím vložte svoje heslo na "
 "overenie."
 
-#: 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 "
@@ -165,17 +166,16 @@ msgstr ""
 "používateľmi</b></big><br/>Na vykonanie tejto akcie je potrebné overenie. "
 "Prosím vložte svoje heslo na overenie."
 
-#: 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 "Vnútorná chyba"
 
-#: mediamanager/halbackend.cpp:1303
+#: mediamanager/halbackend.cpp:1322
 msgid "Invalid filesystem type"
 msgstr "Neplatný súborový systém"
 
-#: 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>"
@@ -184,11 +184,11 @@ msgstr ""
 "k tomuto zariadeniu.<br>2. Tento uzol zariadenia nie je uvedený v /etc/"
 "fstab. </p>"
 
-#: mediamanager/halbackend.cpp:1309
+#: mediamanager/halbackend.cpp:1328
 msgid "Device is already mounted."
 msgstr "Zariadenie je už pripojené."
 
-#: 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 "
@@ -198,7 +198,7 @@ msgstr ""
 "vymenované dolu. Buď ich ukončite alebo zmente ich pracovný priečinok "
 "predtým ako skúsite znova zariadenie odpojiť."
 
-#: 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."
@@ -206,10 +206,10 @@ msgstr ""
 "Programy, ktoré stále používali toto zariadenie, boli násilne ukončené. Sú "
 "uvedené nižšie."
 
-#: 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. "
@@ -217,34 +217,56 @@ msgstr ""
 "Bohužial zariadenie <b>%1</b> (%2) s menom <b>'%3'</b> a aktuálne pripojené "
 "do priečinku <b>%4</b> sa nedá odpojiť. "
 
-#: 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 "Príkaz odpojenia vrátil nasledujúcu chybu:"
 
-#: 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 nie je pripojiteľné médium."
+
+#: mediamanager/halbackend.cpp:1497 mediamanager/tdehardwarebackend.cpp:1225
+#: mounthelper/tdeio_media_mounthelper.cpp:68
+#, fuzzy
+#| msgid "%1 is already unlocked."
+msgid "%1 is already mounted to %2."
+msgstr "%1 je už pripojené."
+
+#: mediamanager/halbackend.cpp:1614
 msgid "Cannot mount encrypted locked drives!"
 msgstr "Nie je možné pripojiť šifrované uzamknuté disky!"
 
-#: 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 unlocked."
+msgid "%1 is already unmounted."
+msgstr "%1 je už pripojené."
+
+#: 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
 msgid "Internal error"
 msgstr "Vnútorná chyba"
 
-#: mediamanager/halbackend.cpp:1718
+#: mediamanager/halbackend.cpp:1745
 msgid "Unknown error"
 msgstr "Neznáma chyba"
 
-#: mediamanager/halbackend.cpp:1772
+#: mediamanager/halbackend.cpp:1799
 msgid "Unmounting failed due to the following error:"
 msgstr "Odpojenie zlyhalo z dôvodu nasledujúcej chyby:"
 
-#: mediamanager/halbackend.cpp:1774
+#: mediamanager/halbackend.cpp:1801
 msgid "Device is Busy:"
 msgstr "Zariadenie je zaneprázdnené:"
 
-#: 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>"
@@ -253,7 +275,7 @@ msgstr ""
 "tomuto zariadeniu.<br>2. Toto zariadenie bolo pôvodne pripojené pomocou TDE."
 "</p>"
 
-#: 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>"
@@ -261,169 +283,207 @@ msgstr ""
 "%1<p><b>Chcete tieto procesy násilne ukončiť?</b><br><i>Všetky neuložené "
 "údaje by sa stratili</i>"
 
-#: 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
+msgid "%1 is not an encrypted media."
+msgstr "%1 nie je šifrované médium."
+
+#: mediamanager/halbackend.cpp:1868 mediamanager/tdehardwarebackend.cpp:1452
+#: mounthelper/tdeio_media_mounthelper.cpp:127
+msgid "%1 is already unlocked."
+msgstr "%1 je už pripojené."
+
+#: mediamanager/halbackend.cpp:1907
 msgid "Wrong password"
 msgstr "Nesprávne heslo"
 
+#: mediamanager/halbackend.cpp:1942 mediamanager/tdehardwarebackend.cpp:1501
+#: mounthelper/tdeio_media_mounthelper.cpp:159
+#, fuzzy
+#| msgid "%1 is already unlocked."
+msgid "%1 is already locked."
+msgstr "%1 je už pripojené."
+
 #: mediamanager/mediamanager.cpp:248 mediamanager/mediamanager.cpp:275
+#: mediamanager/mediamanager.cpp:302 mediamanager/mediamanager.cpp:329
 msgid "Feature only available with the TDE hardware backend"
 msgstr "Vlastnosť dostupná len pomocou hardvérovej podpory TDE"
 
 #: 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 "Vlastnosť dostupná len pomocou 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
 msgid "Feature only available with HAL or TDE hardware backend"
 msgstr "Vlastnosť dostupná len pomocou HAL alebo hardvérovej podpory TDE"
 
-#: mediamanager/tdehardwarebackend.cpp:484
-#: mediamanager/tdehardwarebackend.cpp:521
-#: mediamanager/tdehardwarebackend.cpp:754
+#: mediamanager/tdehardwarebackend.cpp:486
+#: mediamanager/tdehardwarebackend.cpp:523
+#: mediamanager/tdehardwarebackend.cpp:779
 msgid "%1 Removable Device"
 msgstr "Odpojiteľné zariadenie %1"
 
-#: mediamanager/tdehardwarebackend.cpp:529
+#: mediamanager/tdehardwarebackend.cpp:532
 msgid "Blank CD-ROM"
 msgstr "Prázdne médium CD-ROM"
 
-#: mediamanager/tdehardwarebackend.cpp:538
+#: mediamanager/tdehardwarebackend.cpp:542
 msgid "Blank CD-R"
 msgstr "Prázdne médium CD-R"
 
-#: mediamanager/tdehardwarebackend.cpp:547
+#: mediamanager/tdehardwarebackend.cpp:552
 msgid "Blank CD-RW"
 msgstr "Prázdne médium CD-RW"
 
-#: mediamanager/tdehardwarebackend.cpp:556
+#: mediamanager/tdehardwarebackend.cpp:562
 msgid "Blank Magneto-Optical CD"
 msgstr "Prázdne Magneto-Optické CD médium"
 
-#: 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 "Prázdne médium Mount Ranier CD-RW-W"
 
-#: mediamanager/tdehardwarebackend.cpp:583
+#: mediamanager/tdehardwarebackend.cpp:592
 msgid "Blank DVD-ROM"
 msgstr "Prázdne médium DVD-ROM"
 
-#: mediamanager/tdehardwarebackend.cpp:592
+#: mediamanager/tdehardwarebackend.cpp:602
 msgid "Blank DVD-RAM"
 msgstr "Prázdne médium DVD-RAM"
 
-#: mediamanager/tdehardwarebackend.cpp:601
+#: mediamanager/tdehardwarebackend.cpp:612
 msgid "Blank DVD-R"
 msgstr "Prázdne médium DVD-R"
 
-#: mediamanager/tdehardwarebackend.cpp:610
+#: mediamanager/tdehardwarebackend.cpp:622
 msgid "Blank DVD-RW"
 msgstr "Prázdne médium DVD-RW"
 
-#: mediamanager/tdehardwarebackend.cpp:619
+#: mediamanager/tdehardwarebackend.cpp:632
 msgid "Blank Dual Layer DVD-R"
 msgstr "Prázdne dvojvrstvové médium DVD-R"
 
-#: mediamanager/tdehardwarebackend.cpp:628
+#: mediamanager/tdehardwarebackend.cpp:642
 msgid "Blank Dual Layer DVD-RW"
 msgstr "Prázdne dvojvrstvové médium DVD-RW"
 
-#: mediamanager/tdehardwarebackend.cpp:637
+#: mediamanager/tdehardwarebackend.cpp:652
 msgid "Blank DVD+R"
 msgstr "Prázdne médium DVD+R"
 
-#: mediamanager/tdehardwarebackend.cpp:646
+#: mediamanager/tdehardwarebackend.cpp:662
 msgid "Blank DVD+RW"
 msgstr "Prázdne médium DVD+RW"
 
-#: mediamanager/tdehardwarebackend.cpp:655
+#: mediamanager/tdehardwarebackend.cpp:672
 msgid "Blank Dual Layer DVD+R"
 msgstr "Prázdne dvojvrstvové médium DVD+R"
 
-#: mediamanager/tdehardwarebackend.cpp:664
+#: mediamanager/tdehardwarebackend.cpp:682
 msgid "Blank Dual Layer DVD+RW"
 msgstr "Prázdne dvojvrstvové médium DVD+RW"
 
-#: mediamanager/tdehardwarebackend.cpp:673
+#: mediamanager/tdehardwarebackend.cpp:692
 #, fuzzy
 #| msgid "Blank BD-ROM"
 msgid "Blank BLURAY-ROM"
 msgstr "Prázdne médium BD-ROM"
 
-#: mediamanager/tdehardwarebackend.cpp:682
+#: mediamanager/tdehardwarebackend.cpp:702
 #, fuzzy
 #| msgid "Blank BD-R"
 msgid "Blank BLURAY-R"
 msgstr "Prázdne médium BD-R"
 
-#: mediamanager/tdehardwarebackend.cpp:691
+#: mediamanager/tdehardwarebackend.cpp:712
 #, fuzzy
 #| msgid "Blank BD-RW"
 msgid "Blank BLURAY-RW"
 msgstr "Prázdne médium BD-RW"
 
-#: mediamanager/tdehardwarebackend.cpp:700
+#: mediamanager/tdehardwarebackend.cpp:722
 msgid "Blank HDDVD-ROM"
 msgstr "Prázdne médium HDDVD-ROM"
 
-#: mediamanager/tdehardwarebackend.cpp:709
+#: mediamanager/tdehardwarebackend.cpp:732
 msgid "Blank HDDVD-R"
 msgstr "Prázdne médium HDDVD-R"
 
-#: mediamanager/tdehardwarebackend.cpp:718
+#: mediamanager/tdehardwarebackend.cpp:742
 msgid "Blank HDDVD-RW"
 msgstr "Prázdne médium HDDVD-RW"
 
-#: mediamanager/tdehardwarebackend.cpp:725
+#: mediamanager/tdehardwarebackend.cpp:750
 msgid "Audio CD"
 msgstr "Zvykové CD"
 
-#: mediamanager/tdehardwarebackend.cpp:746
+#: mediamanager/tdehardwarebackend.cpp:771
 msgid "%1 Fixed Disk (%2)"
 msgstr "%1 Pevný disk (%2)"
 
-#: mediamanager/tdehardwarebackend.cpp:853
+#: mediamanager/tdehardwarebackend.cpp:886
 msgid "%1 Zip Disk"
 msgstr "Disk Zip %1"
 
-#: 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
+#, fuzzy, c-format
+#| msgid "Internal error. Couldn't find medium."
+msgid "Internal error. Couldn't find medium id %1."
 msgstr "Vnútorná chyba. Nepodarilo sa nájsť médium."
 
-#: mediamanager/tdehardwarebackend.cpp:1250
-#: mediamanager/tdehardwarebackend.cpp:1324
+#: mediamanager/tdehardwarebackend.cpp:1282
 msgid "Unable to mount this device."
 msgstr "Toto zariadenie sa nepodarilo pripojiť."
 
-#: 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 "<p>Technické podrobnosti:<br>"
 
-#: mediamanager/tdehardwarebackend.cpp:1285
-msgid "Decryption aborted"
-msgstr "Dešifrovanie bolo prerušené"
-
-#: mediamanager/tdehardwarebackend.cpp:1444
+#: mediamanager/tdehardwarebackend.cpp:1396
+#, fuzzy
+#| 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>"
 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>"
+"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 ""
 "<qt>Zariadenie <b>%1</b> (%2) s názvom <b>\"%3\"</b> momentálne pripojené k "
 "<b>%4</b> momentálne nie je možné odpojiť.<p>%5<p><b>Chcete násilne vynútiť "
 "ukončenie týchto procesov?</b><br><i>Všetky neuložené údaje sa stratia.</i>"
 
-#: mediamanager/tdehardwarebackend.cpp:1578
+#: mediamanager/tdehardwarebackend.cpp:1467
+#, fuzzy
+#| msgid "Unable to mount this device."
+msgid "Unable to unlock the device."
+msgstr "Toto zariadenie sa nepodarilo pripojiť."
+
+#: mediamanager/tdehardwarebackend.cpp:1516
+#, fuzzy
+#| msgid "Unable to mount this device."
+msgid "Unable to lock the device."
+msgstr "Toto zariadenie sa nepodarilo pripojiť."
+
+#: mediamanager/tdehardwarebackend.cpp:1623
 msgid ""
 "Programs still using the device have been detected. They are listed below. "
 "You have to close them or change their working directory before attempting "
@@ -433,60 +493,98 @@ msgstr ""
 "Pred opätovným odpojením zariadenia musíte ich zatvoriť, alebo zmeniť ich "
 "pracovný priečinok."
 
-#: mounthelper/tdeio_media_mounthelper.cpp:79
-msgid "%1 cannot be found."
-msgstr "%1 sa nedá nájsť."
+#: mounthelper/tdeio_media_mounthelper.cpp:49
+#, fuzzy
+#| msgid "The TDE mediamanager is not running."
+msgid "The TDE mediamanager is not running.\n"
+msgstr "Správca médií TDE nebeží."
 
-#: mounthelper/tdeio_media_mounthelper.cpp:87
-msgid "%1 is not a mountable media."
-msgstr "%1 nie je pripojiteľné médium."
+#: mounthelper/tdeio_media_mounthelper.cpp:59
+msgid "Try to mount an unknown medium."
+msgstr ""
 
-#: mounthelper/tdeio_media_mounthelper.cpp:101
-msgid "%1 is not an encrypted media."
-msgstr "%1 nie je šifrované médium."
+#: mounthelper/tdeio_media_mounthelper.cpp:87
+msgid "Try to unmount an unknown medium."
+msgstr ""
 
 #: mounthelper/tdeio_media_mounthelper.cpp:107
-msgid "%1 is already unlocked."
-msgstr "%1 je už pripojené."
-
-#: mounthelper/tdeio_media_mounthelper.cpp:139
 msgid "Unknown unmount error."
 msgstr "Neznáma chyba odpojenia."
 
-#: mounthelper/tdeio_media_mounthelper.cpp:246
-msgid "The device was successfully unmounted, but the tray could not be opened"
-msgstr "Zariadenie bolo úspešne odpojené, ale zásuvka sa nedá otvoriť"
+#: 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 "Zariadenie bolo úspešne odpojené, ale nedá sa vysunúť"
+#: mounthelper/tdeio_media_mounthelper.cpp:148
+msgid "Try to lock an unknown medium."
+msgstr ""
 
-#: mounthelper/tdeio_media_mounthelper.cpp:281
-msgid "Unknown decrypt error."
-msgstr "Neznáma chyba dešifrovania."
+#: mounthelper/tdeio_media_mounthelper.cpp:173
+#, fuzzy
+#| msgid "Unknown mount error."
+msgid "Unknown lock error."
+msgstr "Neznáma chyba pripojenia."
 
-#: mounthelper/tdeio_media_mounthelper.cpp:295
-msgid "Decrypt given URL"
-msgstr "Dešifrovať zadanú adresu URL"
+#: mounthelper/tdeio_media_mounthelper.cpp:211
+msgid "Try to release holders from an unknown medium."
+msgstr ""
 
-#: mounthelper/tdeio_media_mounthelper.cpp:296
+#: mounthelper/tdeio_media_mounthelper.cpp:270
+msgid "Try to safe remove an unknown medium."
+msgstr ""
+
+#: mounthelper/tdeio_media_mounthelper.cpp:302
+msgid "%1 cannot be found."
+msgstr "%1 sa nedá nájsť."
+
+#: mounthelper/tdeio_media_mounthelper.cpp:310
+#, fuzzy
+#| msgid "%1 is not an encrypted media."
+msgid "%1 is not a mountable or encrypted media."
+msgstr "%1 nie je šifrované médium."
+
+#: mounthelper/tdeio_media_mounthelper.cpp:397
+#, fuzzy
+#| msgid "Unknown unmount error."
+msgid "Unknown unlock error."
+msgstr "Neznáma chyba odpojenia."
+
+#: mounthelper/tdeio_media_mounthelper.cpp:410
+#, fuzzy
+#| msgid "Unmount given URL"
+msgid "Mount given URL"
+msgstr "Odpojiť zadanú URL"
+
+#: mounthelper/tdeio_media_mounthelper.cpp:411
 msgid "Unmount given URL"
 msgstr "Odpojiť zadanú URL"
 
-#: mounthelper/tdeio_media_mounthelper.cpp:297
-msgid "Mount given URL (default)"
-msgstr "Pripojiť zadanú URL (predvolene)"
+#: mounthelper/tdeio_media_mounthelper.cpp:412
+#, fuzzy
+#| msgid "Unmount given URL"
+msgid "Unlock given URL"
+msgstr "Odpojiť zadanú URL"
 
-#: mounthelper/tdeio_media_mounthelper.cpp:298
-msgid "Eject given URL via tdeeject"
-msgstr "Vysunúť zadanú URL pomocou tdeeject"
+#: mounthelper/tdeio_media_mounthelper.cpp:413
+#, fuzzy
+#| msgid "Decrypt given URL"
+msgid "Lock given URL"
+msgstr "Dešifrovať zadanú adresu URL"
 
-#: mounthelper/tdeio_media_mounthelper.cpp:299
-msgid "Unmount and Eject given URL (necessary for some USB devices)"
-msgstr "Odpojiť a vysunúť zadané URL (potrebné pre niektoré USB zariadenia)"
+#: mounthelper/tdeio_media_mounthelper.cpp:414
+#, fuzzy
+#| msgid "Decrypt given URL"
+msgid "Eject given URL"
+msgstr "Dešifrovať zadanú adresu URL"
 
-#: mounthelper/tdeio_media_mounthelper.cpp:300
-msgid "media:/ URL to mount/unmount/eject/remove"
+#: mounthelper/tdeio_media_mounthelper.cpp:415
+msgid "Safely remove (unmount and eject) given URL"
+msgstr ""
+
+#: 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:/ URL pre pripojenie/odpojenie/vysunutie/odstránenie"
 
 #: propsdlgplugin/propertiespage.cpp:137
@@ -644,12 +742,15 @@ msgid "&Password:"
 msgstr "&Heslo:"
 
 #: mounthelper/unlockdialog.ui:109
-#, no-c-format
+#, fuzzy, no-c-format
+#| msgid ""
+#| "<p><b>%1</b> is an encrypted locked storage device.</p>\n"
+#| "<p>Please enter the password to unlock the storage device.</p>"
 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 ""
-"<p><b>%1</b> je šifrované úložné zariadenie.</p>\n"
+"<p><b>%1</b>je šifrované uzamknuté úložné zariadenie.</p>\n"
 "<p>Prosím vložte heslo na odomknutie úložného zariadenia.</p>"
 
 #: propsdlgplugin/propertiespagegui.ui:16
@@ -915,6 +1016,35 @@ msgstr "Zmiešané"
 msgid "Filesystem: iso9660"
 msgstr "Súborový systém: iso9660"
 
+#~ msgid "Decryption aborted"
+#~ msgstr "Dešifrovanie bolo prerušené"
+
+#~ msgid ""
+#~ "The device was successfully unmounted, but the tray could not be opened"
+#~ msgstr "Zariadenie bolo úspešne odpojené, ale zásuvka sa nedá otvoriť"
+
+#~ msgid "The device was successfully unmounted, but could not be ejected"
+#~ msgstr "Zariadenie bolo úspešne odpojené, ale nedá sa vysunúť"
+
+#~ msgid "Unknown decrypt error."
+#~ msgstr "Neznáma chyba dešifrovania."
+
+#~ msgid "Mount given URL (default)"
+#~ msgstr "Pripojiť zadanú URL (predvolene)"
+
+#~ msgid "Eject given URL via tdeeject"
+#~ msgstr "Vysunúť zadanú URL pomocou tdeeject"
+
+#~ msgid "Unmount and Eject given URL (necessary for some USB devices)"
+#~ msgstr "Odpojiť a vysunúť zadané URL (potrebné pre niektoré USB zariadenia)"
+
+#~ msgid ""
+#~ "<p><b>%1</b> is an encrypted storage device.</p>\n"
+#~ "<p>Please enter the password to decrypt the storage device.</p>"
+#~ msgstr ""
+#~ "<p><b>%1</b> je šifrované úložné zariadenie.</p>\n"
+#~ "<p>Prosím vložte heslo na odomknutie úložného zariadenia.</p>"
+
 #, fuzzy
 #~ msgid "Permission denied"
 #~ msgstr "Prístup odmietnutý"
diff --git a/tde-i18n-sl/messages/tdebase/tdeio_media.po b/tde-i18n-sl/messages/tdebase/tdeio_media.po
index 54c91275af7..55f1892bdfb 100644
--- a/tde-i18n-sl/messages/tdebase/tdeio_media.po
+++ b/tde-i18n-sl/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: 2006-11-08 15:22+0100\n"
 "Last-Translator: Jure Repinc <jlp@holodeck1.com>\n"
 "Language-Team: Slovenian <sl@li.org>\n"
@@ -46,27 +46,26 @@ msgstr "Odpri v novem oknu"
 msgid "Unknown"
 msgstr "Neznano"
 
-#: 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 "Upravitelj nosilcev za TDE ne teče."
 
-#: mediaimpl.cpp:187
+#: mediaimpl.cpp:186
 msgid "This media name already exists."
 msgstr "To ime nosilca že obstaja."
 
-#: mediaimpl.cpp:230 mediaimpl.cpp:297
+#: mediaimpl.cpp:229 mediaimpl.cpp:296
 msgid "No such medium."
 msgstr "Takega nosilca ni."
 
-#: 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 ""
 
@@ -79,106 +78,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 "Tega nosilca ni: %1"
 
-#: mediamanager/fstabbackend.cpp:408
+#: mediamanager/fstabbackend.cpp:416
 msgid "CD Recorder"
 msgstr "Zapisovalnik CD-jev"
 
-#: mediamanager/fstabbackend.cpp:414
+#: mediamanager/fstabbackend.cpp:422
 msgid "DVD"
 msgstr "DVD"
 
-#: mediamanager/fstabbackend.cpp:427
+#: mediamanager/fstabbackend.cpp:435
 msgid "CD-ROM"
 msgstr "CD-ROM"
 
-#: mediamanager/fstabbackend.cpp:440
+#: mediamanager/fstabbackend.cpp:448
 msgid "Floppy"
 msgstr "Disketa"
 
-#: mediamanager/fstabbackend.cpp:448
+#: mediamanager/fstabbackend.cpp:456
 msgid "Zip Disk"
 msgstr "Disk Zip"
 
-#: mediamanager/fstabbackend.cpp:459
+#: mediamanager/fstabbackend.cpp:467
 msgid "Removable Device"
 msgstr "Izmenjevalna naprava"
 
-#: mediamanager/fstabbackend.cpp:464 mediamanager/fstabbackend.cpp:470
+#: mediamanager/fstabbackend.cpp:472 mediamanager/fstabbackend.cpp:478
 msgid "Remote Share"
 msgstr "Oddaljena souporaba"
 
-#: mediamanager/fstabbackend.cpp:475
+#: mediamanager/fstabbackend.cpp:483
 msgid "Hard Disk"
 msgstr "Trdi disk"
 
-#: mediamanager/halbackend.cpp:768 mediamanager/tdehardwarebackend.cpp:809
+#: mediamanager/halbackend.cpp:778 mediamanager/tdehardwarebackend.cpp:826
 #, fuzzy
 msgid "Unknown Drive"
 msgstr "Neznano"
 
-#: mediamanager/halbackend.cpp:780 mediamanager/tdehardwarebackend.cpp:839
+#: mediamanager/halbackend.cpp:794 mediamanager/tdehardwarebackend.cpp:872
 #, fuzzy
 msgid "Floppy Drive"
 msgstr "Disketa"
 
-#: mediamanager/halbackend.cpp:788
+#: mediamanager/halbackend.cpp:802
 #, fuzzy
 msgid "Zip Drive"
 msgstr "Disk Zip"
 
-#: mediamanager/halbackend.cpp:858 mediamanager/tdehardwarebackend.cpp:896
+#: mediamanager/halbackend.cpp:877 mediamanager/tdehardwarebackend.cpp:930
 msgid "Camera"
 msgstr "Kamera"
 
-#: 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 "Notranja napaka"
 
-#: mediamanager/halbackend.cpp:1303
+#: mediamanager/halbackend.cpp:1322
 msgid "Invalid filesystem type"
 msgstr "Neveljavna vrsta datotečnega sistema"
 
-#: 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 "Naprava je že priklopljena."
 
-#: 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 "
@@ -188,16 +188,16 @@ msgstr ""
 "programi so na spodnjem seznamu. Preden ponovno poskusite odklopiti napravo "
 "morate te programe zapreti ali pa spremeniti njihovo delovno mapo."
 
-#: 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. "
@@ -205,209 +205,257 @@ msgstr ""
 "Na žalost naprave <b>%1</b> (%2) z imenom <b>%3</b>, ki je trenutno "
 "priklopljena v mapo <b>%4</b>, ni moč odklopiti."
 
-#: 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 "Ukaz unmount je vrnil sledečo napako:"
 
-#: 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 ni priklopljiv medij."
+
+#: mediamanager/halbackend.cpp:1497 mediamanager/tdehardwarebackend.cpp:1225
+#: mounthelper/tdeio_media_mounthelper.cpp:68
+#, fuzzy
+msgid "%1 is already mounted to %2."
+msgstr "Naprava je že priklopljena."
+
+#: 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 "Naprava je že priklopljena."
+
+#: 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 "Notranja napaka"
 
-#: mediamanager/halbackend.cpp:1718
+#: mediamanager/halbackend.cpp:1745
 #, fuzzy
 #| msgid "Unknown"
 msgid "Unknown error"
 msgstr "Neznano"
 
-#: mediamanager/halbackend.cpp:1772
+#: mediamanager/halbackend.cpp:1799
 msgid "Unmounting failed due to the following error:"
 msgstr "Odklapljanje je spodletelo zaradi sledeče napake:"
 
-#: mediamanager/halbackend.cpp:1774
+#: mediamanager/halbackend.cpp:1801
 msgid "Device is Busy:"
 msgstr "Naprava je zaposlena:"
 
-#: 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 ni priklopljiv medij."
+
+#: mediamanager/halbackend.cpp:1868 mediamanager/tdehardwarebackend.cpp:1452
+#: mounthelper/tdeio_media_mounthelper.cpp:127
+#, fuzzy
+msgid "%1 is already unlocked."
+msgstr "Naprava je že priklopljena."
+
+#: 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 "Naprava je že priklopljena."
+
 #: 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 "Zmožnost je na voljo samo, če je nameščen 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 "Zmožnost je na voljo samo, če je nameščen 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 "Zmožnost je na voljo samo, če je nameščen 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 "Izmenjevalna naprava"
 
-#: mediamanager/tdehardwarebackend.cpp:529
+#: mediamanager/tdehardwarebackend.cpp:532
 #, fuzzy
 msgid "Blank CD-ROM"
 msgstr "CD-ROM"
 
-#: 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 "CD-ROM"
 
-#: mediamanager/tdehardwarebackend.cpp:682
+#: mediamanager/tdehardwarebackend.cpp:702
 #, fuzzy
 msgid "Blank BLURAY-R"
 msgstr "CD-ROM"
 
-#: 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 "Disk 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. "
@@ -418,63 +466,95 @@ msgstr ""
 "programi so na spodnjem seznamu. Preden ponovno poskusite odklopiti napravo "
 "morate te programe zapreti ali pa spremeniti njihovo delovno mapo."
 
-#: mounthelper/tdeio_media_mounthelper.cpp:79
-msgid "%1 cannot be found."
-msgstr "Ni moč najti %1."
+#: mounthelper/tdeio_media_mounthelper.cpp:49
+#, fuzzy
+#| msgid "The TDE mediamanager is not running."
+msgid "The TDE mediamanager is not running.\n"
+msgstr "Upravitelj nosilcev za TDE ne teče."
 
-#: mounthelper/tdeio_media_mounthelper.cpp:87
-msgid "%1 is not a mountable media."
-msgstr "%1 ni priklopljiv medij."
+#: 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 ni priklopljiv medij."
+#: 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 "Naprava je že priklopljena."
-
-#: 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 "Naprava je bila uspešno odklopljena, a pladnja ni bilo moč odpreti"
+#: 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 "Naprava je bila uspešno odklopljena, a je ni bilo moč izvreči"
+#: 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 "Neznano"
+
+#: 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 "Ni moč najti %1."
+
+#: mounthelper/tdeio_media_mounthelper.cpp:310
+#, fuzzy
+msgid "%1 is not a mountable or encrypted media."
+msgstr "%1 ni priklopljiv medij."
+
+#: mounthelper/tdeio_media_mounthelper.cpp:397
+#, fuzzy
+#| msgid "Unknown"
+msgid "Unknown unlock error."
+msgstr "Neznano"
+
+#: mounthelper/tdeio_media_mounthelper.cpp:410
 #, fuzzy
-msgid "Decrypt given URL"
+#| msgid "Unmount given URL"
+msgid "Mount given URL"
 msgstr "Odklopi podan URL"
 
-#: mounthelper/tdeio_media_mounthelper.cpp:296
+#: mounthelper/tdeio_media_mounthelper.cpp:411
 msgid "Unmount given URL"
 msgstr "Odklopi podan URL"
 
-#: mounthelper/tdeio_media_mounthelper.cpp:297
-msgid "Mount given URL (default)"
-msgstr "Priklopi podan URL (privzeto)"
+#: mounthelper/tdeio_media_mounthelper.cpp:412
+#, fuzzy
+#| msgid "Unmount given URL"
+msgid "Unlock given URL"
+msgstr "Odklopi podan URL"
 
-#: mounthelper/tdeio_media_mounthelper.cpp:298
-msgid "Eject given URL via tdeeject"
-msgstr "Izvrzi podan URL preko tdeeject"
+#: mounthelper/tdeio_media_mounthelper.cpp:413
+#, fuzzy
+msgid "Lock given URL"
+msgstr "Odklopi podan URL"
 
-#: mounthelper/tdeio_media_mounthelper.cpp:299
-msgid "Unmount and Eject given URL (necessary for some USB devices)"
-msgstr "Odklopi in izvrzi podan URL (potrebno za nekatere naprave USB)"
+#: mounthelper/tdeio_media_mounthelper.cpp:414
+#, fuzzy
+msgid "Eject given URL"
+msgstr "Odklopi podan URL"
+
+#: 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 "URL media:/ za priklop/odklop/izvrzitev/odstranitev"
 
 #: propsdlgplugin/propertiespage.cpp:137
@@ -623,7 +703,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
@@ -890,6 +970,22 @@ msgstr "Mešano"
 msgid "Filesystem: iso9660"
 msgstr "Datotečni sistem: iso9660"
 
+#~ msgid ""
+#~ "The device was successfully unmounted, but the tray could not be opened"
+#~ msgstr "Naprava je bila uspešno odklopljena, a pladnja ni bilo moč odpreti"
+
+#~ msgid "The device was successfully unmounted, but could not be ejected"
+#~ msgstr "Naprava je bila uspešno odklopljena, a je ni bilo moč izvreči"
+
+#~ msgid "Mount given URL (default)"
+#~ msgstr "Priklopi podan URL (privzeto)"
+
+#~ msgid "Eject given URL via tdeeject"
+#~ msgstr "Izvrzi podan URL preko tdeeject"
+
+#~ msgid "Unmount and Eject given URL (necessary for some USB devices)"
+#~ msgstr "Odklopi in izvrzi podan URL (potrebno za nekatere naprave USB)"
+
 #, fuzzy
 #~ msgid "Permission denied"
 #~ msgstr "Dovoljenje zavrnjeno"
diff --git a/tde-i18n-sr/messages/tdebase/tdeio_media.po b/tde-i18n-sr/messages/tdebase/tdeio_media.po
index f42a3b5c401..71e8e6a1531 100644
--- a/tde-i18n-sr/messages/tdebase/tdeio_media.po
+++ b/tde-i18n-sr/messages/tdebase/tdeio_media.po
@@ -4,7 +4,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-01-06 22:38+0100\n"
 "Last-Translator: Chusslove Illich <caslav.ilic@gmx.net>\n"
 "Language-Team: Serbian <kde-i18n-sr@kde.org>\n"
@@ -42,27 +42,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 ""
 
@@ -75,103 +74,104 @@ 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 "CD резач"
 
-#: mediamanager/fstabbackend.cpp:414
+#: mediamanager/fstabbackend.cpp:422
 msgid "DVD"
 msgstr "DVD"
 
-#: mediamanager/fstabbackend.cpp:427
+#: mediamanager/fstabbackend.cpp:435
 msgid "CD-ROM"
 msgstr "CD-ROM"
 
-#: 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
 msgid "Unknown Drive"
 msgstr "Непознат уређај"
 
-#: mediamanager/halbackend.cpp:780 mediamanager/tdehardwarebackend.cpp:839
+#: mediamanager/halbackend.cpp:794 mediamanager/tdehardwarebackend.cpp:872
 msgid "Floppy Drive"
 msgstr "Дискетни уређај"
 
-#: mediamanager/halbackend.cpp:788
+#: mediamanager/halbackend.cpp:802
 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 "
@@ -181,16 +181,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. "
@@ -198,209 +198,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 "CD-ROM"
 
-#: 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 "CD-ROM"
 
-#: mediamanager/tdehardwarebackend.cpp:682
+#: mediamanager/tdehardwarebackend.cpp:702
 #, fuzzy
 msgid "Blank BLURAY-R"
 msgstr "CD-ROM"
 
-#: 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. "
@@ -411,63 +459,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 "Демонтирај дати URL"
 
-#: mounthelper/tdeio_media_mounthelper.cpp:296
+#: mounthelper/tdeio_media_mounthelper.cpp:411
 msgid "Unmount given URL"
 msgstr "Демонтирај дати URL"
 
-#: mounthelper/tdeio_media_mounthelper.cpp:297
-msgid "Mount given URL (default)"
-msgstr "Монтирај дати URL (подразумевано)"
+#: mounthelper/tdeio_media_mounthelper.cpp:412
+#, fuzzy
+#| msgid "Unmount given URL"
+msgid "Unlock given URL"
+msgstr "Демонтирај дати URL"
 
-#: 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 "Демонтирај дати URL"
 
-#: 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 "Демонтирај дати URL"
+
+#: 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:/ URL за монтирање/демонтирање/избацивање/уклањање"
 
 #: propsdlgplugin/propertiespage.cpp:137
@@ -616,7 +696,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
@@ -881,6 +961,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 "Монтирај дати URL (подразумевано)"
+
+#~ 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 "Овлашћења одбијена"
diff --git a/tde-i18n-sr@Latn/messages/tdebase/tdeio_media.po b/tde-i18n-sr@Latn/messages/tdebase/tdeio_media.po
index 3262e7c29f5..2f9ca61abc2 100644
--- a/tde-i18n-sr@Latn/messages/tdebase/tdeio_media.po
+++ b/tde-i18n-sr@Latn/messages/tdebase/tdeio_media.po
@@ -4,7 +4,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-01-06 22:38+0100\n"
 "Last-Translator: Chusslove Illich <caslav.ilic@gmx.net>\n"
 "Language-Team: Serbian <kde-i18n-sr@kde.org>\n"
@@ -42,27 +42,26 @@ msgstr "Otvori u novom prozoru"
 msgid "Unknown"
 msgstr "Nepoznato"
 
-#: 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-ov menadžer medijuma nije pokrenut."
 
-#: mediaimpl.cpp:187
+#: mediaimpl.cpp:186
 msgid "This media name already exists."
 msgstr "Ovo ime medijuma već postoji."
 
-#: mediaimpl.cpp:230 mediaimpl.cpp:297
+#: mediaimpl.cpp:229 mediaimpl.cpp:296
 msgid "No such medium."
 msgstr "Nema takvog medijuma."
 
-#: 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 ""
 
@@ -75,103 +74,104 @@ 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 "Nema takvog medijuma: %1"
 
-#: mediamanager/fstabbackend.cpp:408
+#: mediamanager/fstabbackend.cpp:416
 msgid "CD Recorder"
 msgstr "CD rezač"
 
-#: mediamanager/fstabbackend.cpp:414
+#: mediamanager/fstabbackend.cpp:422
 msgid "DVD"
 msgstr "DVD"
 
-#: mediamanager/fstabbackend.cpp:427
+#: mediamanager/fstabbackend.cpp:435
 msgid "CD-ROM"
 msgstr "CD-ROM"
 
-#: mediamanager/fstabbackend.cpp:440
+#: mediamanager/fstabbackend.cpp:448
 msgid "Floppy"
 msgstr "Disketa"
 
-#: mediamanager/fstabbackend.cpp:448
+#: mediamanager/fstabbackend.cpp:456
 msgid "Zip Disk"
 msgstr "ZIP disketa"
 
-#: mediamanager/fstabbackend.cpp:459
+#: mediamanager/fstabbackend.cpp:467
 msgid "Removable Device"
 msgstr "Uklonjivi uređaj"
 
-#: mediamanager/fstabbackend.cpp:464 mediamanager/fstabbackend.cpp:470
+#: mediamanager/fstabbackend.cpp:472 mediamanager/fstabbackend.cpp:478
 msgid "Remote Share"
 msgstr "Udaljeno deljenje"
 
-#: mediamanager/fstabbackend.cpp:475
+#: mediamanager/fstabbackend.cpp:483
 msgid "Hard Disk"
 msgstr "Hard disk"
 
-#: mediamanager/halbackend.cpp:768 mediamanager/tdehardwarebackend.cpp:809
+#: mediamanager/halbackend.cpp:778 mediamanager/tdehardwarebackend.cpp:826
 msgid "Unknown Drive"
 msgstr "Nepoznat uređaj"
 
-#: mediamanager/halbackend.cpp:780 mediamanager/tdehardwarebackend.cpp:839
+#: mediamanager/halbackend.cpp:794 mediamanager/tdehardwarebackend.cpp:872
 msgid "Floppy Drive"
 msgstr "Disketni uređaj"
 
-#: mediamanager/halbackend.cpp:788
+#: mediamanager/halbackend.cpp:802
 msgid "Zip Drive"
 msgstr "ZIP uređaj"
 
-#: mediamanager/halbackend.cpp:858 mediamanager/tdehardwarebackend.cpp:896
+#: mediamanager/halbackend.cpp:877 mediamanager/tdehardwarebackend.cpp:930
 msgid "Camera"
 msgstr "Kamera"
 
-#: 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 "Unutrašnja greška"
 
-#: mediamanager/halbackend.cpp:1303
+#: mediamanager/halbackend.cpp:1322
 msgid "Invalid filesystem type"
 msgstr "Neispravan tip sistema fajlova"
 
-#: 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 "Uređaj je već montiran."
 
-#: 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 "
@@ -181,16 +181,16 @@ msgstr ""
 "su dole. Morate ih zatvoriti ili im promeniti radne fascikle pre nego što "
 "ponovo pokušate da demontirate uređaj."
 
-#: 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. "
@@ -198,209 +198,257 @@ msgstr ""
 "Nažalost, uređaj <b>%1</b> (%2) po imenu <b>„%3“</b> i trenutno montiran na "
 "<b>%4</b>, ne može da se demontira. "
 
-#: 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 "Naredba umount je vratila sledeću grešku:"
 
-#: 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 nije medijum koji se može montirati."
+
+#: mediamanager/halbackend.cpp:1497 mediamanager/tdehardwarebackend.cpp:1225
+#: mounthelper/tdeio_media_mounthelper.cpp:68
+#, fuzzy
+msgid "%1 is already mounted to %2."
+msgstr "Uređaj je već montiran."
+
+#: 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 "Uređaj je već montiran."
+
+#: 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 "Unutrašnja greška"
 
-#: mediamanager/halbackend.cpp:1718
+#: mediamanager/halbackend.cpp:1745
 #, fuzzy
 #| msgid "Unknown"
 msgid "Unknown error"
 msgstr "Nepoznato"
 
-#: mediamanager/halbackend.cpp:1772
+#: mediamanager/halbackend.cpp:1799
 msgid "Unmounting failed due to the following error:"
 msgstr "Demontiranje nije uspelo usled sledeće greške:"
 
-#: mediamanager/halbackend.cpp:1774
+#: mediamanager/halbackend.cpp:1801
 msgid "Device is Busy:"
 msgstr "Uređaj je zauzet:"
 
-#: 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 nije medijum koji se može montirati."
+
+#: mediamanager/halbackend.cpp:1868 mediamanager/tdehardwarebackend.cpp:1452
+#: mounthelper/tdeio_media_mounthelper.cpp:127
+#, fuzzy
+msgid "%1 is already unlocked."
+msgstr "Uređaj je već montiran."
+
+#: 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 "Uređaj je već montiran."
+
 #: 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 "Mogućnost dostupna samo uz 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 "Mogućnost dostupna samo uz 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 "Mogućnost dostupna samo uz 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 "Uklonjivi uređaj"
 
-#: mediamanager/tdehardwarebackend.cpp:529
+#: mediamanager/tdehardwarebackend.cpp:532
 #, fuzzy
 msgid "Blank CD-ROM"
 msgstr "CD-ROM"
 
-#: 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 "CD-ROM"
 
-#: mediamanager/tdehardwarebackend.cpp:682
+#: mediamanager/tdehardwarebackend.cpp:702
 #, fuzzy
 msgid "Blank BLURAY-R"
 msgstr "CD-ROM"
 
-#: 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 disketa"
 
-#: 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. "
@@ -411,63 +459,95 @@ msgstr ""
 "su dole. Morate ih zatvoriti ili im promeniti radne fascikle pre nego što "
 "ponovo pokušate da demontirate uređaj."
 
-#: mounthelper/tdeio_media_mounthelper.cpp:79
-msgid "%1 cannot be found."
-msgstr "%1 se ne može naći."
+#: mounthelper/tdeio_media_mounthelper.cpp:49
+#, fuzzy
+#| msgid "The TDE mediamanager is not running."
+msgid "The TDE mediamanager is not running.\n"
+msgstr "TDE-ov menadžer medijuma nije pokrenut."
 
-#: mounthelper/tdeio_media_mounthelper.cpp:87
-msgid "%1 is not a mountable media."
-msgstr "%1 nije medijum koji se može montirati."
+#: 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 nije medijum koji se može montirati."
+#: 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 "Uređaj je već montiran."
-
-#: 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 "Uređaj je uspešno demontiran, ali fioka nije mogla da se otvori"
+#: 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 "Uređaj je uspešno demontiran, ali nije mogao da se izbaci"
+#: 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 "Nepoznato"
+
+#: 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 se ne može naći."
+
+#: mounthelper/tdeio_media_mounthelper.cpp:310
+#, fuzzy
+msgid "%1 is not a mountable or encrypted media."
+msgstr "%1 nije medijum koji se može montirati."
+
+#: mounthelper/tdeio_media_mounthelper.cpp:397
+#, fuzzy
+#| msgid "Unknown"
+msgid "Unknown unlock error."
+msgstr "Nepoznato"
+
+#: mounthelper/tdeio_media_mounthelper.cpp:410
 #, fuzzy
-msgid "Decrypt given URL"
+#| msgid "Unmount given URL"
+msgid "Mount given URL"
 msgstr "Demontiraj dati URL"
 
-#: mounthelper/tdeio_media_mounthelper.cpp:296
+#: mounthelper/tdeio_media_mounthelper.cpp:411
 msgid "Unmount given URL"
 msgstr "Demontiraj dati URL"
 
-#: mounthelper/tdeio_media_mounthelper.cpp:297
-msgid "Mount given URL (default)"
-msgstr "Montiraj dati URL (podrazumevano)"
+#: mounthelper/tdeio_media_mounthelper.cpp:412
+#, fuzzy
+#| msgid "Unmount given URL"
+msgid "Unlock given URL"
+msgstr "Demontiraj dati URL"
 
-#: mounthelper/tdeio_media_mounthelper.cpp:298
-msgid "Eject given URL via tdeeject"
-msgstr "Izbaci dati URL pomoću tdeeject"
+#: mounthelper/tdeio_media_mounthelper.cpp:413
+#, fuzzy
+msgid "Lock given URL"
+msgstr "Demontiraj dati URL"
 
-#: mounthelper/tdeio_media_mounthelper.cpp:299
-msgid "Unmount and Eject given URL (necessary for some USB devices)"
-msgstr "Demontiraj i izbaci dati URL (neophodno za neke USB uređaje)"
+#: mounthelper/tdeio_media_mounthelper.cpp:414
+#, fuzzy
+msgid "Eject given URL"
+msgstr "Demontiraj dati URL"
+
+#: 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:/ URL za montiranje/demontiranje/izbacivanje/uklanjanje"
 
 #: propsdlgplugin/propertiespage.cpp:137
@@ -616,7 +696,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
@@ -881,6 +961,22 @@ msgstr "Mešano"
 msgid "Filesystem: iso9660"
 msgstr "Sistem fajlova: iso9660"
 
+#~ msgid ""
+#~ "The device was successfully unmounted, but the tray could not be opened"
+#~ msgstr "Uređaj je uspešno demontiran, ali fioka nije mogla da se otvori"
+
+#~ msgid "The device was successfully unmounted, but could not be ejected"
+#~ msgstr "Uređaj je uspešno demontiran, ali nije mogao da se izbaci"
+
+#~ msgid "Mount given URL (default)"
+#~ msgstr "Montiraj dati URL (podrazumevano)"
+
+#~ msgid "Eject given URL via tdeeject"
+#~ msgstr "Izbaci dati URL pomoću tdeeject"
+
+#~ msgid "Unmount and Eject given URL (necessary for some USB devices)"
+#~ msgstr "Demontiraj i izbaci dati URL (neophodno za neke USB uređaje)"
+
 #, fuzzy
 #~ msgid "Permission denied"
 #~ msgstr "Ovlašćenja odbijena"
diff --git a/tde-i18n-ss/messages/tdebase/tdeio_media.po b/tde-i18n-ss/messages/tdebase/tdeio_media.po
index 768b2bd848a..eb50b2f4565 100644
--- a/tde-i18n-ss/messages/tdebase/tdeio_media.po
+++ b/tde-i18n-ss/messages/tdebase/tdeio_media.po
@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: tdeio_devices\n"
-"POT-Creation-Date: 2020-09-09 18:58+0200\n"
+"POT-Creation-Date: 2020-10-17 08:51+0800\n"
 "PO-Revision-Date: 2002-11-09 21:10+0200\n"
 "Last-Translator: Adam Mathebula <adam@translate.org.za>\n"
 "Language-Team: Siswati <siswati@translate.org.za>\n"
@@ -43,27 +43,26 @@ msgstr ""
 msgid "Unknown"
 msgstr "ngatiwa"
 
-#: 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 ""
 
-#: 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 ""
 
@@ -76,393 +75,468 @@ 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 ""
 
-#: mediamanager/fstabbackend.cpp:408
+#: mediamanager/fstabbackend.cpp:416
 msgid "CD Recorder"
 msgstr "Sibhali sesma CD "
 
-#: mediamanager/fstabbackend.cpp:414
+#: mediamanager/fstabbackend.cpp:422
 msgid "DVD"
 msgstr ""
 
-#: mediamanager/fstabbackend.cpp:427
+#: mediamanager/fstabbackend.cpp:435
 msgid "CD-ROM"
 msgstr "CD-ROM"
 
-#: mediamanager/fstabbackend.cpp:440
+#: mediamanager/fstabbackend.cpp:448
 msgid "Floppy"
 msgstr "Floppy"
 
-#: mediamanager/fstabbackend.cpp:448
+#: mediamanager/fstabbackend.cpp:456
 msgid "Zip Disk"
 msgstr "I-diski ye 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 "Kwabelana lokubucalu"
 
-#: mediamanager/fstabbackend.cpp:475
+#: mediamanager/fstabbackend.cpp:483
 #, fuzzy
 msgid "Hard Disk"
 msgstr "I-Diski-lecinile"
 
-#: mediamanager/halbackend.cpp:768 mediamanager/tdehardwarebackend.cpp:809
+#: mediamanager/halbackend.cpp:778 mediamanager/tdehardwarebackend.cpp:826
 #, fuzzy
 msgid "Unknown Drive"
 msgstr "ngatiwa"
 
-#: mediamanager/halbackend.cpp:780 mediamanager/tdehardwarebackend.cpp:839
+#: mediamanager/halbackend.cpp:794 mediamanager/tdehardwarebackend.cpp:872
 #, fuzzy
 msgid "Floppy Drive"
 msgstr "Floppy"
 
-#: mediamanager/halbackend.cpp:788
+#: mediamanager/halbackend.cpp:802
 #, fuzzy
 msgid "Zip Drive"
 msgstr "I-diski ye 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 "
 "before attempting to unmount the device again."
 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. "
 msgstr ""
 
-#: 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 ""
 
-#: 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
+#, fuzzy
+msgid "%1 is not a mountable media."
+msgstr "%1%2 (ngakhuphukanga)"
+
+#: mediamanager/halbackend.cpp:1497 mediamanager/tdehardwarebackend.cpp:1225
+#: mounthelper/tdeio_media_mounthelper.cpp:68
+#, fuzzy
+#| msgid "%1%2 mounted at %3"
+msgid "%1 is already mounted to %2."
+msgstr "%1%2 khuphukele e %3"
+
+#: 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 "%1%2 (ngakhuphukanga)"
+
+#: 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
 msgid "Internal error"
 msgstr ""
 
-#: mediamanager/halbackend.cpp:1718
+#: mediamanager/halbackend.cpp:1745
 #, fuzzy
 #| msgid "Unknown"
 msgid "Unknown error"
 msgstr "ngatiwa"
 
-#: 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%2 (ngakhuphukanga)"
+
+#: mediamanager/halbackend.cpp:1868 mediamanager/tdehardwarebackend.cpp:1452
+#: mounthelper/tdeio_media_mounthelper.cpp:127
+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
+msgid "%1 is already locked."
+msgstr ""
+
 #: mediamanager/mediamanager.cpp:248 mediamanager/mediamanager.cpp:275
+#: mediamanager/mediamanager.cpp:302 mediamanager/mediamanager.cpp:329
 msgid "Feature only available with the TDE hardware backend"
 msgstr ""
 
 #: 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 ""
 
 #: mediamanager/mediamanager.cpp:262 mediamanager/mediamanager.cpp:289
-#: mediamanager/mediamanager.cpp:320 mediamanager/mediamanager.cpp:350
+#: mediamanager/mediamanager.cpp:316 mediamanager/mediamanager.cpp:343
 msgid "Feature only available with HAL or TDE hardware backend"
 msgstr ""
 
-#: mediamanager/tdehardwarebackend.cpp:484
-#: mediamanager/tdehardwarebackend.cpp:521
-#: mediamanager/tdehardwarebackend.cpp:754
+#: mediamanager/tdehardwarebackend.cpp:486
+#: mediamanager/tdehardwarebackend.cpp:523
+#: mediamanager/tdehardwarebackend.cpp:779
 msgid "%1 Removable Device"
 msgstr ""
 
-#: mediamanager/tdehardwarebackend.cpp:529
+#: mediamanager/tdehardwarebackend.cpp:532
 #, fuzzy
 msgid "Blank CD-ROM"
 msgstr "CD-ROM"
 
-#: 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 "CD-ROM"
 
-#: mediamanager/tdehardwarebackend.cpp:682
+#: mediamanager/tdehardwarebackend.cpp:702
 #, fuzzy
 msgid "Blank BLURAY-R"
 msgstr "CD-ROM"
 
-#: 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 "I-diski ye 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:1516
+msgid "Unable to lock the device."
 msgstr ""
 
-#: mediamanager/tdehardwarebackend.cpp:1578
+#: mediamanager/tdehardwarebackend.cpp:1623
 msgid ""
 "Programs still using the device have been detected. They are listed below. "
 "You have to close them or change their working directory before attempting "
 "to unmount the device again."
 msgstr ""
 
-#: mounthelper/tdeio_media_mounthelper.cpp:79
-msgid "%1 cannot be found."
+#: mounthelper/tdeio_media_mounthelper.cpp:49
+msgid "The TDE mediamanager is not running.\n"
 msgstr ""
 
-#: mounthelper/tdeio_media_mounthelper.cpp:87
-#, fuzzy
-msgid "%1 is not a mountable media."
-msgstr "%1%2 (ngakhuphukanga)"
+#: 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%2 (ngakhuphukanga)"
+#: mounthelper/tdeio_media_mounthelper.cpp:87
+msgid "Try to unmount an unknown medium."
+msgstr ""
 
 #: mounthelper/tdeio_media_mounthelper.cpp:107
-msgid "%1 is already unlocked."
+msgid "Unknown unmount error."
 msgstr ""
 
-#: mounthelper/tdeio_media_mounthelper.cpp:139
-msgid "Unknown unmount error."
+#: mounthelper/tdeio_media_mounthelper.cpp:116
+msgid "Try to unlock an unknown medium."
 msgstr ""
 
-#: mounthelper/tdeio_media_mounthelper.cpp:246
-msgid "The device was successfully unmounted, but the tray could not be opened"
+#: mounthelper/tdeio_media_mounthelper.cpp:148
+msgid "Try to lock an unknown medium."
 msgstr ""
 
-#: mounthelper/tdeio_media_mounthelper.cpp:248
-msgid "The device was successfully unmounted, but could not be ejected"
+#: mounthelper/tdeio_media_mounthelper.cpp:173
+#, fuzzy
+#| msgid "Unknown"
+msgid "Unknown lock error."
+msgstr "ngatiwa"
+
+#: 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:281
+#: mounthelper/tdeio_media_mounthelper.cpp:302
+msgid "%1 cannot be found."
+msgstr ""
+
+#: mounthelper/tdeio_media_mounthelper.cpp:310
 #, fuzzy
-msgid "Unknown decrypt error."
-msgstr "Sisetjentiswa lesingatiwa"
+msgid "%1 is not a mountable or encrypted media."
+msgstr "%1%2 (ngakhuphukanga)"
 
-#: mounthelper/tdeio_media_mounthelper.cpp:295
+#: mounthelper/tdeio_media_mounthelper.cpp:397
 #, fuzzy
-msgid "Decrypt given URL"
+#| msgid "Unknown"
+msgid "Unknown unlock error."
+msgstr "ngatiwa"
+
+#: mounthelper/tdeio_media_mounthelper.cpp:410
+#, fuzzy
+#| msgid "Unmount given URL"
+msgid "Mount given URL"
 msgstr "Kungakhuphuki lokuniketwe i-URL"
 
-#: mounthelper/tdeio_media_mounthelper.cpp:296
+#: mounthelper/tdeio_media_mounthelper.cpp:411
 msgid "Unmount given URL"
 msgstr "Kungakhuphuki lokuniketwe i-URL"
 
-#: mounthelper/tdeio_media_mounthelper.cpp:297
+#: mounthelper/tdeio_media_mounthelper.cpp:412
 #, fuzzy
-msgid "Mount given URL (default)"
-msgstr "Kukhuphuka kuniketiwe (kwehluleka"
+#| msgid "Unmount given URL"
+msgid "Unlock given URL"
+msgstr "Kungakhuphuki lokuniketwe i-URL"
 
-#: mounthelper/tdeio_media_mounthelper.cpp:298
-msgid "Eject given URL via tdeeject"
-msgstr ""
+#: mounthelper/tdeio_media_mounthelper.cpp:413
+#, fuzzy
+msgid "Lock given URL"
+msgstr "Kungakhuphuki lokuniketwe i-URL"
+
+#: mounthelper/tdeio_media_mounthelper.cpp:414
+#, fuzzy
+msgid "Eject given URL"
+msgstr "Kungakhuphuki lokuniketwe i-URL"
 
-#: mounthelper/tdeio_media_mounthelper.cpp:299
-msgid "Unmount and Eject given URL (necessary for some USB devices)"
+#: mounthelper/tdeio_media_mounthelper.cpp:415
+msgid "Safely remove (unmount and eject) given URL"
 msgstr ""
 
-#: mounthelper/tdeio_media_mounthelper.cpp:300
+#: 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 "sisetjentiswa:/ i-url lekufanele yikhuphuke/yingakhuphulwa."
 
 #: propsdlgplugin/propertiespage.cpp:137
@@ -613,7 +687,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
@@ -833,6 +907,14 @@ msgstr ""
 msgid "Filesystem: iso9660"
 msgstr ""
 
+#, fuzzy
+#~ msgid "Unknown decrypt error."
+#~ msgstr "Sisetjentiswa lesingatiwa"
+
+#, fuzzy
+#~ msgid "Mount given URL (default)"
+#~ msgstr "Kukhuphuka kuniketiwe (kwehluleka"
+
 #~ msgid "Device not accessible"
 #~ msgstr "Sisetjentiswa asitfolakali"
 
@@ -855,9 +937,6 @@ msgstr ""
 #~ msgid "My Computer"
 #~ msgstr "Ngcondvomshini wami"
 
-#~ msgid "%1%2 mounted at %3"
-#~ msgstr "%1%2 khuphukele e %3"
-
 #~ msgid "could not execute [%1]"
 #~ msgstr "Akukhonakalanga kuchuba [%1]"
 
diff --git a/tde-i18n-sv/messages/tdebase/tdeio_media.po b/tde-i18n-sv/messages/tdebase/tdeio_media.po
index 8b8569098c1..5b54764fd33 100644
--- a/tde-i18n-sv/messages/tdebase/tdeio_media.po
+++ b/tde-i18n-sv/messages/tdebase/tdeio_media.po
@@ -5,7 +5,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-11-23 16:52+0100\n"
 "Last-Translator: Stefan Asserhäll <stefan.asserhall@comhem.se>\n"
 "Language-Team: Swedish <sv@li.org>\n"
@@ -43,27 +43,26 @@ msgstr "Öppna i nytt fönster"
 msgid "Unknown"
 msgstr "Okänd"
 
-#: 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:s mediahanterare kör inte."
 
-#: mediaimpl.cpp:187
+#: mediaimpl.cpp:186
 msgid "This media name already exists."
 msgstr "Medianamnet finns redan."
 
-#: mediaimpl.cpp:230 mediaimpl.cpp:297
+#: mediaimpl.cpp:229 mediaimpl.cpp:296
 msgid "No such medium."
 msgstr "Medium finns inte."
 
-#: 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 ""
 
@@ -76,103 +75,104 @@ 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 "Medium finns inte: %1"
 
-#: mediamanager/fstabbackend.cpp:408
+#: mediamanager/fstabbackend.cpp:416
 msgid "CD Recorder"
 msgstr "Cd-brännare"
 
-#: mediamanager/fstabbackend.cpp:414
+#: mediamanager/fstabbackend.cpp:422
 msgid "DVD"
 msgstr "Dvd"
 
-#: mediamanager/fstabbackend.cpp:427
+#: mediamanager/fstabbackend.cpp:435
 msgid "CD-ROM"
 msgstr "Cd-rom"
 
-#: mediamanager/fstabbackend.cpp:440
+#: mediamanager/fstabbackend.cpp:448
 msgid "Floppy"
 msgstr "Diskett"
 
-#: mediamanager/fstabbackend.cpp:448
+#: mediamanager/fstabbackend.cpp:456
 msgid "Zip Disk"
 msgstr "Zip-diskett"
 
-#: mediamanager/fstabbackend.cpp:459
+#: mediamanager/fstabbackend.cpp:467
 msgid "Removable Device"
 msgstr "Flyttbar enhet"
 
-#: mediamanager/fstabbackend.cpp:464 mediamanager/fstabbackend.cpp:470
+#: mediamanager/fstabbackend.cpp:472 mediamanager/fstabbackend.cpp:478
 msgid "Remote Share"
 msgstr "Utdelad fjärrkatalog"
 
-#: mediamanager/fstabbackend.cpp:475
+#: mediamanager/fstabbackend.cpp:483
 msgid "Hard Disk"
 msgstr "Hårddisk"
 
-#: mediamanager/halbackend.cpp:768 mediamanager/tdehardwarebackend.cpp:809
+#: mediamanager/halbackend.cpp:778 mediamanager/tdehardwarebackend.cpp:826
 msgid "Unknown Drive"
 msgstr "Okänd enhet"
 
-#: mediamanager/halbackend.cpp:780 mediamanager/tdehardwarebackend.cpp:839
+#: mediamanager/halbackend.cpp:794 mediamanager/tdehardwarebackend.cpp:872
 msgid "Floppy Drive"
 msgstr "Diskett"
 
-#: mediamanager/halbackend.cpp:788
+#: mediamanager/halbackend.cpp:802
 msgid "Zip Drive"
 msgstr "Zip-diskett"
 
-#: mediamanager/halbackend.cpp:858 mediamanager/tdehardwarebackend.cpp:896
+#: mediamanager/halbackend.cpp:877 mediamanager/tdehardwarebackend.cpp:930
 msgid "Camera"
 msgstr "Kamera"
 
-#: 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 "Internt fel"
 
-#: mediamanager/halbackend.cpp:1303
+#: mediamanager/halbackend.cpp:1322
 msgid "Invalid filesystem type"
 msgstr "Felaktig filsystemtyp"
 
-#: 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 "Enheten är redan monterad."
 
-#: 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 "
@@ -182,16 +182,16 @@ msgstr ""
 "måste stänga dem eller ändra deras arbetskatalog innan du försöker avmontera "
 "enheten igen."
 
-#: 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. "
@@ -199,209 +199,257 @@ msgstr ""
 "Tyvärr kunde inte enheten <b>%1</b> (%2) vid namn <b>'%3'</b> för närvarande "
 "monterad som <b>%4</b> avmonteras."
 
-#: 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 "Följande fel returnerades av avmonteringskommandot:"
 
-#: 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 är inte ett monteringsbart media."
+
+#: mediamanager/halbackend.cpp:1497 mediamanager/tdehardwarebackend.cpp:1225
+#: mounthelper/tdeio_media_mounthelper.cpp:68
+#, fuzzy
+msgid "%1 is already mounted to %2."
+msgstr "Enheten är redan monterad."
+
+#: 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 "Enheten är redan monterad."
+
+#: 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 "Internt fel"
 
-#: mediamanager/halbackend.cpp:1718
+#: mediamanager/halbackend.cpp:1745
 #, fuzzy
 #| msgid "Unknown"
 msgid "Unknown error"
 msgstr "Okänd"
 
-#: mediamanager/halbackend.cpp:1772
+#: mediamanager/halbackend.cpp:1799
 msgid "Unmounting failed due to the following error:"
 msgstr "Avmontering misslyckades på grund av följande fel:"
 
-#: mediamanager/halbackend.cpp:1774
+#: mediamanager/halbackend.cpp:1801
 msgid "Device is Busy:"
 msgstr "Enheten är upptagen:"
 
-#: 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 är inte ett monteringsbart media."
+
+#: mediamanager/halbackend.cpp:1868 mediamanager/tdehardwarebackend.cpp:1452
+#: mounthelper/tdeio_media_mounthelper.cpp:127
+#, fuzzy
+msgid "%1 is already unlocked."
+msgstr "Enheten är redan monterad."
+
+#: 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 "Enheten är redan monterad."
+
 #: 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 "Funktionen är bara tillgänglig med 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 "Funktionen är bara tillgänglig med 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 "Funktionen är bara tillgänglig med 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 "Flyttbar enhet"
 
-#: mediamanager/tdehardwarebackend.cpp:529
+#: mediamanager/tdehardwarebackend.cpp:532
 #, fuzzy
 msgid "Blank CD-ROM"
 msgstr "Cd-rom"
 
-#: 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 "Cd-rom"
 
-#: mediamanager/tdehardwarebackend.cpp:682
+#: mediamanager/tdehardwarebackend.cpp:702
 #, fuzzy
 msgid "Blank BLURAY-R"
 msgstr "Cd-rom"
 
-#: 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-diskett"
 
-#: 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. "
@@ -412,64 +460,95 @@ msgstr ""
 "måste stänga dem eller ändra deras arbetskatalog innan du försöker avmontera "
 "enheten igen."
 
-#: mounthelper/tdeio_media_mounthelper.cpp:79
-msgid "%1 cannot be found."
-msgstr "%1 kan inte hittas."
+#: mounthelper/tdeio_media_mounthelper.cpp:49
+#, fuzzy
+#| msgid "The TDE mediamanager is not running."
+msgid "The TDE mediamanager is not running.\n"
+msgstr "TDE:s mediahanterare kör inte."
 
-#: mounthelper/tdeio_media_mounthelper.cpp:87
-msgid "%1 is not a mountable media."
-msgstr "%1 är inte ett monteringsbart media."
+#: 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 är inte ett monteringsbart media."
+#: 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 "Enheten är redan monterad."
-
-#: 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 "Enheten avmonterades med lyckat resultat, men den kunde inte öppnas"
+#: 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 "Enheten avmonterades med lyckat resultat, men kunde inte matas ut"
+#: mounthelper/tdeio_media_mounthelper.cpp:148
+msgid "Try to lock an unknown medium."
+msgstr ""
+
+#: mounthelper/tdeio_media_mounthelper.cpp:173
+#, fuzzy
+#| msgid "Unknown"
+msgid "Unknown lock error."
+msgstr "Okänd"
 
-#: mounthelper/tdeio_media_mounthelper.cpp:281
-msgid "Unknown decrypt error."
+#: mounthelper/tdeio_media_mounthelper.cpp:211
+msgid "Try to release holders from an unknown medium."
 msgstr ""
 
-#: mounthelper/tdeio_media_mounthelper.cpp:295
+#: mounthelper/tdeio_media_mounthelper.cpp:270
+msgid "Try to safe remove an unknown medium."
+msgstr ""
+
+#: mounthelper/tdeio_media_mounthelper.cpp:302
+msgid "%1 cannot be found."
+msgstr "%1 kan inte hittas."
+
+#: mounthelper/tdeio_media_mounthelper.cpp:310
 #, fuzzy
-msgid "Decrypt given URL"
+msgid "%1 is not a mountable or encrypted media."
+msgstr "%1 är inte ett monteringsbart media."
+
+#: mounthelper/tdeio_media_mounthelper.cpp:397
+#, fuzzy
+#| msgid "Unknown"
+msgid "Unknown unlock error."
+msgstr "Okänd"
+
+#: mounthelper/tdeio_media_mounthelper.cpp:410
+#, fuzzy
+#| msgid "Unmount given URL"
+msgid "Mount given URL"
 msgstr "Avmontera angiven enhet"
 
-#: mounthelper/tdeio_media_mounthelper.cpp:296
+#: mounthelper/tdeio_media_mounthelper.cpp:411
 msgid "Unmount given URL"
 msgstr "Avmontera angiven enhet"
 
-#: mounthelper/tdeio_media_mounthelper.cpp:297
-msgid "Mount given URL (default)"
-msgstr "Montera angiven webbadress (förval)"
+#: mounthelper/tdeio_media_mounthelper.cpp:412
+#, fuzzy
+#| msgid "Unmount given URL"
+msgid "Unlock given URL"
+msgstr "Avmontera angiven enhet"
 
-#: mounthelper/tdeio_media_mounthelper.cpp:298
-msgid "Eject given URL via tdeeject"
-msgstr "Mata ut angiven webbadress via tdeeject"
+#: mounthelper/tdeio_media_mounthelper.cpp:413
+#, fuzzy
+msgid "Lock given URL"
+msgstr "Avmontera angiven enhet"
 
-#: mounthelper/tdeio_media_mounthelper.cpp:299
-msgid "Unmount and Eject given URL (necessary for some USB devices)"
+#: mounthelper/tdeio_media_mounthelper.cpp:414
+#, fuzzy
+msgid "Eject given URL"
+msgstr "Avmontera angiven enhet"
+
+#: mounthelper/tdeio_media_mounthelper.cpp:415
+msgid "Safely remove (unmount and eject) given URL"
 msgstr ""
-"Avmontera och mata ut angiven webbadress (nödvändigt för vissa USB-enheter)"
 
-#: 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:/ webbadress för att montera, avmontera, mata ut eller koppla ur"
 
 #: propsdlgplugin/propertiespage.cpp:137
@@ -618,7 +697,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
@@ -882,6 +961,24 @@ msgstr "Blandat"
 msgid "Filesystem: iso9660"
 msgstr "Filsystem: ISO-9660"
 
+#~ msgid ""
+#~ "The device was successfully unmounted, but the tray could not be opened"
+#~ msgstr "Enheten avmonterades med lyckat resultat, men den kunde inte öppnas"
+
+#~ msgid "The device was successfully unmounted, but could not be ejected"
+#~ msgstr "Enheten avmonterades med lyckat resultat, men kunde inte matas ut"
+
+#~ msgid "Mount given URL (default)"
+#~ msgstr "Montera angiven webbadress (förval)"
+
+#~ msgid "Eject given URL via tdeeject"
+#~ msgstr "Mata ut angiven webbadress via tdeeject"
+
+#~ msgid "Unmount and Eject given URL (necessary for some USB devices)"
+#~ msgstr ""
+#~ "Avmontera och mata ut angiven webbadress (nödvändigt för vissa USB-"
+#~ "enheter)"
+
 #, fuzzy
 #~ msgid "Permission denied"
 #~ msgstr "Rättigheter saknas"
diff --git a/tde-i18n-ta/messages/tdebase/tdeio_media.po b/tde-i18n-ta/messages/tdebase/tdeio_media.po
index 37ec4fa0367..f3b5484df73 100644
--- a/tde-i18n-ta/messages/tdebase/tdeio_media.po
+++ b/tde-i18n-ta/messages/tdebase/tdeio_media.po
@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2020-09-09 18:58+0200\n"
+"POT-Creation-Date: 2020-10-17 08:51+0800\n"
 "PO-Revision-Date: 2005-02-14 05:39-0800\n"
 "Last-Translator: Tamil PC <tamilpc@ambalam.com>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -42,27 +42,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 "கேடியி மீடியா மேலாளர் இயங்கவில்லை."
 
-#: 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 ""
 
@@ -75,386 +74,462 @@ 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 ""
 
-#: 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 "ஜிப் வட்டு"
 
-#: 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
 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 "ஜிப் வட்டு"
 
-#: 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 "
 "before attempting to unmount the device again."
 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. "
 msgstr ""
 
-#: 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 ""
 
-#: 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
+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 not a mountable media."
+msgid "%1 is already unmounted."
+msgstr "%1 என்பது ஏற்றக்கூடிய மீடியா இல்லை."
+
+#: 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
 msgid "Internal error"
 msgstr ""
 
-#: mediamanager/halbackend.cpp:1718
+#: mediamanager/halbackend.cpp:1745
 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
+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
+msgid "%1 is already locked."
+msgstr ""
+
 #: mediamanager/mediamanager.cpp:248 mediamanager/mediamanager.cpp:275
+#: mediamanager/mediamanager.cpp:302 mediamanager/mediamanager.cpp:329
 msgid "Feature only available with the TDE hardware backend"
 msgstr ""
 
 #: 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 ""
 
 #: mediamanager/mediamanager.cpp:262 mediamanager/mediamanager.cpp:289
-#: mediamanager/mediamanager.cpp:320 mediamanager/mediamanager.cpp:350
+#: mediamanager/mediamanager.cpp:316 mediamanager/mediamanager.cpp:343
 msgid "Feature only available with HAL or TDE hardware backend"
 msgstr ""
 
-#: 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 "ஜிப் வட்டு"
 
-#: 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
 msgid ""
 "Programs still using the device have been detected. They are listed below. "
 "You have to close them or change their working directory before attempting "
 "to unmount the device again."
 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 "கேடியி மீடியா மேலாளர் இயங்கவில்லை."
 
-#: 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
-msgid "%1 is already unlocked."
+msgid "Unknown unmount error."
 msgstr ""
 
-#: mounthelper/tdeio_media_mounthelper.cpp:139
-msgid "Unknown unmount error."
+#: mounthelper/tdeio_media_mounthelper.cpp:116
+msgid "Try to unlock an unknown medium."
+msgstr ""
+
+#: mounthelper/tdeio_media_mounthelper.cpp:148
+msgid "Try to lock an unknown medium."
 msgstr ""
 
-#: mounthelper/tdeio_media_mounthelper.cpp:246
-msgid "The device was successfully unmounted, but the tray could not be opened"
+#: mounthelper/tdeio_media_mounthelper.cpp:173
+msgid "Unknown lock error."
 msgstr ""
 
-#: mounthelper/tdeio_media_mounthelper.cpp:248
-msgid "The device was successfully unmounted, but could not be ejected"
+#: mounthelper/tdeio_media_mounthelper.cpp:211
+msgid "Try to release holders from an unknown medium."
 msgstr ""
 
-#: mounthelper/tdeio_media_mounthelper.cpp:281
-msgid "Unknown decrypt error."
+#: 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 "Decrypt given URL"
+msgid "%1 is not a mountable or encrypted media."
+msgstr "%1 என்பது ஏற்றக்கூடிய மீடியா இல்லை."
+
+#: mounthelper/tdeio_media_mounthelper.cpp:397
+msgid "Unknown unlock error."
+msgstr ""
+
+#: mounthelper/tdeio_media_mounthelper.cpp:410
+#, fuzzy
+#| 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 "கொடுக்கப்பட்ட வலைமனையை கேடியிவெளியேற்று வழியாக வெளியேற்று"
+#: 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 "கொடுக்கப்பட்ட வலைமனையை இறக்கி வெளியேற்று (சில யுஎஸ்பி சாதனங்களுக்கு அவசியம்)"
+#: 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 "மீடியா:/ ஏற்ற/இறக்க/வெளியேற்ற/நீக்கவேண்டிய வலைமனை"
 
 #: propsdlgplugin/propertiespage.cpp:137
@@ -604,7 +679,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
@@ -824,6 +899,15 @@ msgstr ""
 msgid "Filesystem: iso9660"
 msgstr ""
 
+#~ msgid "Mount given URL (default)"
+#~ msgstr "கொடுக்கப்பட்ட வலைமனையை ஏற்று (முன்னிருப்பு)"
+
+#~ msgid "Eject given URL via tdeeject"
+#~ msgstr "கொடுக்கப்பட்ட வலைமனையை கேடியிவெளியேற்று வழியாக வெளியேற்று"
+
+#~ msgid "Unmount and Eject given URL (necessary for some USB devices)"
+#~ msgstr "கொடுக்கப்பட்ட வலைமனையை இறக்கி வெளியேற்று (சில யுஎஸ்பி சாதனங்களுக்கு அவசியம்)"
+
 #~ msgid ""
 #~ "\n"
 #~ "Please check that the disk is entered correctly."
diff --git a/tde-i18n-te/messages/tdebase/tdeio_media.po b/tde-i18n-te/messages/tdebase/tdeio_media.po
index 103e5b24958..baf13f9ee25 100644
--- a/tde-i18n-te/messages/tdebase/tdeio_media.po
+++ b/tde-i18n-te/messages/tdebase/tdeio_media.po
@@ -4,7 +4,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-03-10 13:26+0000\n"
 "Last-Translator: Vijay Kiran Kamuju <infyquest@gmail.com>\n"
 "Language-Team: Telugu <indlinux-telugu@lists.sourceforge.net>\n"
@@ -42,27 +42,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 ""
 
-#: 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 ""
 
@@ -75,388 +74,456 @@ 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 "జిప్ డిస్క్"
 
-#: 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 "జిప్ డిస్క్"
 
-#: 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 "
 "before attempting to unmount the device again."
 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. "
 msgstr ""
 
-#: 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 ""
 
-#: 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 ""
+
+#: mediamanager/halbackend.cpp:1497 mediamanager/tdehardwarebackend.cpp:1225
+#: mounthelper/tdeio_media_mounthelper.cpp:68
+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
+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
+msgid "%1 is not an encrypted media."
+msgstr ""
+
+#: mediamanager/halbackend.cpp:1868 mediamanager/tdehardwarebackend.cpp:1452
+#: mounthelper/tdeio_media_mounthelper.cpp:127
+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
+msgid "%1 is already locked."
+msgstr ""
+
 #: mediamanager/mediamanager.cpp:248 mediamanager/mediamanager.cpp:275
+#: mediamanager/mediamanager.cpp:302 mediamanager/mediamanager.cpp:329
 msgid "Feature only available with the TDE hardware backend"
 msgstr ""
 
 #: 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 ""
 
 #: mediamanager/mediamanager.cpp:262 mediamanager/mediamanager.cpp:289
-#: mediamanager/mediamanager.cpp:320 mediamanager/mediamanager.cpp:350
+#: mediamanager/mediamanager.cpp:316 mediamanager/mediamanager.cpp:343
 msgid "Feature only available with HAL or TDE hardware backend"
 msgstr ""
 
-#: 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 "జిప్ డిస్క్"
 
-#: 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:1516
+msgid "Unable to lock the device."
 msgstr ""
 
-#: mediamanager/tdehardwarebackend.cpp:1578
+#: mediamanager/tdehardwarebackend.cpp:1623
 msgid ""
 "Programs still using the device have been detected. They are listed below. "
 "You have to close them or change their working directory before attempting "
 "to unmount the device again."
 msgstr ""
 
-#: mounthelper/tdeio_media_mounthelper.cpp:79
-msgid "%1 cannot be found."
-msgstr "%1 కనపడుట లేదు"
+#: mounthelper/tdeio_media_mounthelper.cpp:49
+msgid "The TDE mediamanager is not running.\n"
+msgstr ""
 
-#: mounthelper/tdeio_media_mounthelper.cpp:87
-msgid "%1 is not a mountable media."
+#: mounthelper/tdeio_media_mounthelper.cpp:59
+msgid "Try to mount an unknown medium."
 msgstr ""
 
-#: mounthelper/tdeio_media_mounthelper.cpp:101
-msgid "%1 is not an encrypted media."
+#: mounthelper/tdeio_media_mounthelper.cpp:87
+msgid "Try to unmount an unknown medium."
 msgstr ""
 
 #: mounthelper/tdeio_media_mounthelper.cpp:107
-msgid "%1 is already unlocked."
+msgid "Unknown unmount error."
 msgstr ""
 
-#: mounthelper/tdeio_media_mounthelper.cpp:139
-msgid "Unknown unmount error."
+#: mounthelper/tdeio_media_mounthelper.cpp:116
+msgid "Try to unlock an unknown medium."
+msgstr ""
+
+#: mounthelper/tdeio_media_mounthelper.cpp:148
+msgid "Try to lock an unknown medium."
 msgstr ""
 
-#: mounthelper/tdeio_media_mounthelper.cpp:246
-msgid "The device was successfully unmounted, but the tray could not be opened"
+#: 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:248
-msgid "The device was successfully unmounted, but could not be ejected"
+#: mounthelper/tdeio_media_mounthelper.cpp:270
+msgid "Try to safe remove an unknown medium."
 msgstr ""
 
-#: mounthelper/tdeio_media_mounthelper.cpp:281
-msgid "Unknown decrypt error."
+#: mounthelper/tdeio_media_mounthelper.cpp:302
+msgid "%1 cannot be found."
+msgstr "%1 కనపడుట లేదు"
+
+#: mounthelper/tdeio_media_mounthelper.cpp:310
+msgid "%1 is not a mountable or encrypted media."
 msgstr ""
 
-#: mounthelper/tdeio_media_mounthelper.cpp:295
-msgid "Decrypt given URL"
+#: mounthelper/tdeio_media_mounthelper.cpp:397
+#, fuzzy
+#| msgid "Unknown"
+msgid "Unknown unlock error."
+msgstr "తెలియనిది"
+
+#: mounthelper/tdeio_media_mounthelper.cpp:410
+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)"
+#: mounthelper/tdeio_media_mounthelper.cpp:412
+msgid "Unlock given URL"
 msgstr ""
 
-#: mounthelper/tdeio_media_mounthelper.cpp:298
-msgid "Eject given URL via tdeeject"
+#: mounthelper/tdeio_media_mounthelper.cpp:413
+msgid "Lock given URL"
 msgstr ""
 
-#: mounthelper/tdeio_media_mounthelper.cpp:299
-msgid "Unmount and Eject given URL (necessary for some USB devices)"
+#: mounthelper/tdeio_media_mounthelper.cpp:414
+msgid "Eject given URL"
 msgstr ""
 
-#: mounthelper/tdeio_media_mounthelper.cpp:300
-msgid "media:/ URL to mount/unmount/eject/remove"
+#: mounthelper/tdeio_media_mounthelper.cpp:415
+msgid "Safely remove (unmount and eject) given URL"
+msgstr ""
+
+#: mounthelper/tdeio_media_mounthelper.cpp:416
+msgid "media:/URL to mount/unmount/unlock/lock/eject/remove"
 msgstr ""
 
 #: propsdlgplugin/propertiespage.cpp:137
@@ -605,7 +672,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
diff --git a/tde-i18n-tg/messages/tdebase/tdeio_media.po b/tde-i18n-tg/messages/tdebase/tdeio_media.po
index 7dfd4467069..028ca72add9 100644
--- a/tde-i18n-tg/messages/tdebase/tdeio_media.po
+++ b/tde-i18n-tg/messages/tdebase/tdeio_media.po
@@ -10,7 +10,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: 2005-09-16 15:48+0500\n"
 "Last-Translator: Victor Ibragimov <youth_opportunities@tajikngo.org>\n"
 "Language-Team: Tajik\n"
@@ -48,27 +48,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 ""
 
-#: 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 ""
 
@@ -81,389 +80,462 @@ 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 ""
 
-#: mediamanager/fstabbackend.cpp:408
+#: mediamanager/fstabbackend.cpp:416
 msgid "CD Recorder"
 msgstr "Сабткунаки Диски Фишурда"
 
-#: mediamanager/fstabbackend.cpp:414
+#: mediamanager/fstabbackend.cpp:422
 msgid "DVD"
 msgstr "DVD"
 
-#: mediamanager/fstabbackend.cpp:427
+#: mediamanager/fstabbackend.cpp:435
 msgid "CD-ROM"
 msgstr "CD-ROM"
 
-#: mediamanager/fstabbackend.cpp:440
+#: mediamanager/fstabbackend.cpp:448
 msgid "Floppy"
 msgstr "Дискета"
 
-#: mediamanager/fstabbackend.cpp:448
+#: mediamanager/fstabbackend.cpp:456
 msgid "Zip Disk"
 msgstr "Диски Фаврӣ"
 
-#: 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
 #, fuzzy
 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 "Диски Фаврӣ"
 
-#: 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 "
 "before attempting to unmount the device again."
 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. "
 msgstr ""
 
-#: 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 ""
 
-#: 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 ""
+
+#: mediamanager/halbackend.cpp:1497 mediamanager/tdehardwarebackend.cpp:1225
+#: mounthelper/tdeio_media_mounthelper.cpp:68
+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
+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
 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
+msgid "%1 is not an encrypted media."
+msgstr ""
+
+#: mediamanager/halbackend.cpp:1868 mediamanager/tdehardwarebackend.cpp:1452
+#: mounthelper/tdeio_media_mounthelper.cpp:127
+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
+msgid "%1 is already locked."
+msgstr ""
+
 #: mediamanager/mediamanager.cpp:248 mediamanager/mediamanager.cpp:275
+#: mediamanager/mediamanager.cpp:302 mediamanager/mediamanager.cpp:329
 msgid "Feature only available with the TDE hardware backend"
 msgstr ""
 
 #: 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 ""
 
 #: mediamanager/mediamanager.cpp:262 mediamanager/mediamanager.cpp:289
-#: mediamanager/mediamanager.cpp:320 mediamanager/mediamanager.cpp:350
+#: mediamanager/mediamanager.cpp:316 mediamanager/mediamanager.cpp:343
 msgid "Feature only available with HAL or TDE hardware backend"
 msgstr ""
 
-#: mediamanager/tdehardwarebackend.cpp:484
-#: mediamanager/tdehardwarebackend.cpp:521
-#: mediamanager/tdehardwarebackend.cpp:754
+#: mediamanager/tdehardwarebackend.cpp:486
+#: mediamanager/tdehardwarebackend.cpp:523
+#: mediamanager/tdehardwarebackend.cpp:779
 msgid "%1 Removable Device"
 msgstr ""
 
-#: mediamanager/tdehardwarebackend.cpp:529
+#: mediamanager/tdehardwarebackend.cpp:532
 #, fuzzy
 msgid "Blank CD-ROM"
 msgstr "CD-ROM"
 
-#: 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 "CD-ROM"
 
-#: mediamanager/tdehardwarebackend.cpp:682
+#: mediamanager/tdehardwarebackend.cpp:702
 #, fuzzy
 msgid "Blank BLURAY-R"
 msgstr "CD-ROM"
 
-#: 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 "Диски Фаврӣ"
 
-#: 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
 msgid ""
 "Programs still using the device have been detected. They are listed below. "
 "You have to close them or change their working directory before attempting "
 "to unmount the device again."
 msgstr ""
 
-#: mounthelper/tdeio_media_mounthelper.cpp:79
-msgid "%1 cannot be found."
+#: mounthelper/tdeio_media_mounthelper.cpp:49
+msgid "The TDE mediamanager is not running.\n"
 msgstr ""
 
-#: mounthelper/tdeio_media_mounthelper.cpp:87
-msgid "%1 is not a mountable media."
+#: mounthelper/tdeio_media_mounthelper.cpp:59
+msgid "Try to mount an unknown medium."
 msgstr ""
 
-#: mounthelper/tdeio_media_mounthelper.cpp:101
-msgid "%1 is not an encrypted media."
+#: mounthelper/tdeio_media_mounthelper.cpp:87
+msgid "Try to unmount an unknown medium."
 msgstr ""
 
 #: mounthelper/tdeio_media_mounthelper.cpp:107
-msgid "%1 is already unlocked."
+msgid "Unknown unmount error."
 msgstr ""
 
-#: mounthelper/tdeio_media_mounthelper.cpp:139
-msgid "Unknown unmount error."
+#: mounthelper/tdeio_media_mounthelper.cpp:116
+msgid "Try to unlock an unknown medium."
+msgstr ""
+
+#: mounthelper/tdeio_media_mounthelper.cpp:148
+msgid "Try to lock an unknown medium."
+msgstr ""
+
+#: 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:246
-msgid "The device was successfully unmounted, but the tray could not be opened"
+#: mounthelper/tdeio_media_mounthelper.cpp:270
+msgid "Try to safe remove an unknown medium."
 msgstr ""
 
-#: mounthelper/tdeio_media_mounthelper.cpp:248
-msgid "The device was successfully unmounted, but could not be ejected"
+#: mounthelper/tdeio_media_mounthelper.cpp:302
+msgid "%1 cannot be found."
 msgstr ""
 
-#: mounthelper/tdeio_media_mounthelper.cpp:281
-msgid "Unknown decrypt error."
+#: mounthelper/tdeio_media_mounthelper.cpp:310
+msgid "%1 is not a mountable or encrypted media."
 msgstr ""
 
-#: mounthelper/tdeio_media_mounthelper.cpp:295
+#: 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 "URL-ро таҷзия кунед"
 
-#: mounthelper/tdeio_media_mounthelper.cpp:296
+#: mounthelper/tdeio_media_mounthelper.cpp:411
 msgid "Unmount given URL"
 msgstr "URL-ро таҷзия кунед"
 
-#: mounthelper/tdeio_media_mounthelper.cpp:297
-msgid "Mount given URL (default)"
-msgstr "URL-ро насб кунед (бо нобаёнӣ)"
+#: mounthelper/tdeio_media_mounthelper.cpp:412
+#, fuzzy
+#| msgid "Unmount given URL"
+msgid "Unlock given URL"
+msgstr "URL-ро таҷзия кунед"
 
-#: mounthelper/tdeio_media_mounthelper.cpp:298
-msgid "Eject given URL via tdeeject"
-msgstr "Ба воситаи tdeeject URL-ро рад кунед"
+#: mounthelper/tdeio_media_mounthelper.cpp:413
+#, fuzzy
+msgid "Lock given URL"
+msgstr "URL-ро таҷзия кунед"
+
+#: mounthelper/tdeio_media_mounthelper.cpp:414
+#, fuzzy
+msgid "Eject given URL"
+msgstr "URL-ро таҷзия кунед"
 
-#: mounthelper/tdeio_media_mounthelper.cpp:299
-msgid "Unmount and Eject given URL (necessary for some USB devices)"
+#: mounthelper/tdeio_media_mounthelper.cpp:415
+msgid "Safely remove (unmount and eject) given URL"
 msgstr ""
 
-#: mounthelper/tdeio_media_mounthelper.cpp:300
+#: 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 "дастгоҳҳо:/ URL барои насб кардан/таҷзия кардан/рад кардан."
 
 #: propsdlgplugin/propertiespage.cpp:137
@@ -614,7 +686,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
@@ -834,6 +906,12 @@ msgstr ""
 msgid "Filesystem: iso9660"
 msgstr ""
 
+#~ msgid "Mount given URL (default)"
+#~ msgstr "URL-ро насб кунед (бо нобаёнӣ)"
+
+#~ msgid "Eject given URL via tdeeject"
+#~ msgstr "Ба воситаи tdeeject URL-ро рад кунед"
+
 #~ msgid ""
 #~ "\n"
 #~ "Please check that the disk is entered correctly."
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 "สิทธิ์อนุญาตถูกปฏิเสธ"
diff --git a/tde-i18n-tr/messages/tdebase/tdeio_media.po b/tde-i18n-tr/messages/tdebase/tdeio_media.po
index 9638944738a..255ee9a6fa3 100644
--- a/tde-i18n-tr/messages/tdebase/tdeio_media.po
+++ b/tde-i18n-tr/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-26 05:41+0300\n"
 "Last-Translator: Serdar Soytetir <tulliana@gmail.com>\n"
 "Language-Team:  <tr@li.org>\n"
@@ -44,27 +44,26 @@ msgstr "Yeni Pencerede Aç"
 msgid "Unknown"
 msgstr "Bilinmeyen"
 
-#: 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 ortam yöneticisi çalışmıyor."
 
-#: mediaimpl.cpp:187
+#: mediaimpl.cpp:186
 msgid "This media name already exists."
 msgstr "Bu ortam adı mevcut."
 
-#: mediaimpl.cpp:230 mediaimpl.cpp:297
+#: mediaimpl.cpp:229 mediaimpl.cpp:296
 msgid "No such medium."
 msgstr "Böyle bir ortam yok."
 
-#: 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,393 +76,474 @@ 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 "Böyle bir ortam yok: %1"
 
-#: mediamanager/fstabbackend.cpp:408
+#: mediamanager/fstabbackend.cpp:416
 msgid "CD Recorder"
 msgstr "CD Kayıt Aygıtı"
 
-#: mediamanager/fstabbackend.cpp:414
+#: mediamanager/fstabbackend.cpp:422
 msgid "DVD"
 msgstr "DVD"
 
-#: mediamanager/fstabbackend.cpp:427
+#: mediamanager/fstabbackend.cpp:435
 msgid "CD-ROM"
 msgstr "CD-ROM"
 
-#: mediamanager/fstabbackend.cpp:440
+#: mediamanager/fstabbackend.cpp:448
 msgid "Floppy"
 msgstr "Disket"
 
-#: mediamanager/fstabbackend.cpp:448
+#: mediamanager/fstabbackend.cpp:456
 msgid "Zip Disk"
 msgstr "Zip Diski"
 
-#: mediamanager/fstabbackend.cpp:459
+#: mediamanager/fstabbackend.cpp:467
 msgid "Removable Device"
 msgstr "Çıkartılabilir Aygıt"
 
-#: mediamanager/fstabbackend.cpp:464 mediamanager/fstabbackend.cpp:470
+#: mediamanager/fstabbackend.cpp:472 mediamanager/fstabbackend.cpp:478
 msgid "Remote Share"
 msgstr "Uzak Paylaşım"
 
-#: mediamanager/fstabbackend.cpp:475
+#: mediamanager/fstabbackend.cpp:483
 msgid "Hard Disk"
 msgstr "Sabit Disk"
 
-#: mediamanager/halbackend.cpp:768 mediamanager/tdehardwarebackend.cpp:809
+#: mediamanager/halbackend.cpp:778 mediamanager/tdehardwarebackend.cpp:826
 #, fuzzy
 msgid "Unknown Drive"
 msgstr "Bilinmeyen"
 
-#: mediamanager/halbackend.cpp:780 mediamanager/tdehardwarebackend.cpp:839
+#: mediamanager/halbackend.cpp:794 mediamanager/tdehardwarebackend.cpp:872
 #, fuzzy
 msgid "Floppy Drive"
 msgstr "Disket"
 
-#: mediamanager/halbackend.cpp:788
+#: mediamanager/halbackend.cpp:802
 #, fuzzy
 msgid "Zip Drive"
 msgstr "Zip Diski"
 
-#: mediamanager/halbackend.cpp:858 mediamanager/tdehardwarebackend.cpp:896
+#: mediamanager/halbackend.cpp:877 mediamanager/tdehardwarebackend.cpp:930
 msgid "Camera"
 msgstr "Kamera"
 
-#: 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 "İç Hata"
 
-#: mediamanager/halbackend.cpp:1303
+#: mediamanager/halbackend.cpp:1322
 msgid "Invalid filesystem type"
 msgstr "Geçersiz dosya sistemi tipi"
 
-#: 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 "Aygıt zaten bağlı."
 
-#: 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 "
 "before attempting to unmount the device again."
 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. "
 msgstr ""
 
-#: 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 komutu şu hata ile döndü:"
 
-#: 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 bağlanabilir bir ortam değil."
+
+#: mediamanager/halbackend.cpp:1497 mediamanager/tdehardwarebackend.cpp:1225
+#: mounthelper/tdeio_media_mounthelper.cpp:68
+#, fuzzy
+msgid "%1 is already mounted to %2."
+msgstr "Aygıt zaten bağlı."
+
+#: 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 "Aygıt zaten bağlı."
+
+#: 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 "İç Hata"
 
-#: mediamanager/halbackend.cpp:1718
+#: mediamanager/halbackend.cpp:1745
 #, fuzzy
 #| msgid "Unknown"
 msgid "Unknown error"
 msgstr "Bilinmeyen"
 
-#: mediamanager/halbackend.cpp:1772
+#: mediamanager/halbackend.cpp:1799
 msgid "Unmounting failed due to the following error:"
 msgstr "Ayırma işlemi başarısız oldu, şu hata oluştu:"
 
-#: mediamanager/halbackend.cpp:1774
+#: mediamanager/halbackend.cpp:1801
 msgid "Device is Busy:"
 msgstr "Aygıt Meşgul:"
 
-#: 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 bağlanabilir bir ortam değil."
+
+#: mediamanager/halbackend.cpp:1868 mediamanager/tdehardwarebackend.cpp:1452
+#: mounthelper/tdeio_media_mounthelper.cpp:127
+#, fuzzy
+msgid "%1 is already unlocked."
+msgstr "Aygıt zaten bağlı."
+
+#: 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 "Aygıt zaten bağlı."
+
 #: 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 "Bu özellik sadece HAL ile kullanılabilir"
 
 #: 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 "Bu özellik sadece HAL ile kullanılabilir"
 
 #: 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 "Bu özellik sadece HAL ile kullanılabilir"
 
-#: 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 "Çıkartılabilir Aygıt"
 
-#: mediamanager/tdehardwarebackend.cpp:529
+#: mediamanager/tdehardwarebackend.cpp:532
 #, fuzzy
 msgid "Blank CD-ROM"
 msgstr "CD-ROM"
 
-#: 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 "CD-ROM"
 
-#: mediamanager/tdehardwarebackend.cpp:682
+#: mediamanager/tdehardwarebackend.cpp:702
 #, fuzzy
 msgid "Blank BLURAY-R"
 msgstr "CD-ROM"
 
-#: 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 Diski"
 
-#: 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
 msgid ""
 "Programs still using the device have been detected. They are listed below. "
 "You have to close them or change their working directory before attempting "
 "to unmount the device again."
 msgstr ""
 
-#: mounthelper/tdeio_media_mounthelper.cpp:79
-msgid "%1 cannot be found."
-msgstr "%1 bulunamadı."
+#: mounthelper/tdeio_media_mounthelper.cpp:49
+#, fuzzy
+#| msgid "The TDE mediamanager is not running."
+msgid "The TDE mediamanager is not running.\n"
+msgstr "TDE ortam yöneticisi çalışmıyor."
 
-#: mounthelper/tdeio_media_mounthelper.cpp:87
-msgid "%1 is not a mountable media."
-msgstr "%1 bağlanabilir bir ortam değil."
+#: 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 bağlanabilir bir ortam değil."
+#: 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 "Aygıt zaten bağlı."
-
-#: 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 "Aygıt başarılı şekilde ayrıldı, fakat çekmece açılamadı"
+#: 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 "Aygıt başarılı şekilde ayrıldı, fakat çıkarılamadı"
+#: 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 "Bilinmeyen"
+
+#: 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 bulunamadı."
+
+#: mounthelper/tdeio_media_mounthelper.cpp:310
+#, fuzzy
+msgid "%1 is not a mountable or encrypted media."
+msgstr "%1 bağlanabilir bir ortam değil."
+
+#: mounthelper/tdeio_media_mounthelper.cpp:397
+#, fuzzy
+#| msgid "Unknown"
+msgid "Unknown unlock error."
+msgstr "Bilinmeyen"
+
+#: mounthelper/tdeio_media_mounthelper.cpp:410
 #, fuzzy
-msgid "Decrypt given URL"
+#| msgid "Unmount given URL"
+msgid "Mount given URL"
 msgstr "Verilen adresi ayır"
 
-#: mounthelper/tdeio_media_mounthelper.cpp:296
+#: mounthelper/tdeio_media_mounthelper.cpp:411
 msgid "Unmount given URL"
 msgstr "Verilen adresi ayır"
 
-#: mounthelper/tdeio_media_mounthelper.cpp:297
-msgid "Mount given URL (default)"
-msgstr "Verilen adresi bağla (öntanımlı)"
+#: mounthelper/tdeio_media_mounthelper.cpp:412
+#, fuzzy
+#| msgid "Unmount given URL"
+msgid "Unlock given URL"
+msgstr "Verilen adresi ayır"
 
-#: mounthelper/tdeio_media_mounthelper.cpp:298
-msgid "Eject given URL via tdeeject"
-msgstr "Verilen URL'yi tdeeject ile çıkar"
+#: mounthelper/tdeio_media_mounthelper.cpp:413
+#, fuzzy
+msgid "Lock given URL"
+msgstr "Verilen adresi ayır"
 
-#: mounthelper/tdeio_media_mounthelper.cpp:299
-msgid "Unmount and Eject given URL (necessary for some USB devices)"
-msgstr "Verilen URL'yi Ayır ve Çıkar (bazı USB aygıtlar için gerekli)"
+#: mounthelper/tdeio_media_mounthelper.cpp:414
+#, fuzzy
+msgid "Eject given URL"
+msgstr "Verilen adresi ayır"
+
+#: 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:/ bağlama/ayırma/çıkarma/silme için URL"
 
 #: propsdlgplugin/propertiespage.cpp:137
@@ -612,7 +692,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
@@ -832,6 +912,22 @@ msgstr "Karışık"
 msgid "Filesystem: iso9660"
 msgstr "Dosya sistemi: iso9660"
 
+#~ msgid ""
+#~ "The device was successfully unmounted, but the tray could not be opened"
+#~ msgstr "Aygıt başarılı şekilde ayrıldı, fakat çekmece açılamadı"
+
+#~ msgid "The device was successfully unmounted, but could not be ejected"
+#~ msgstr "Aygıt başarılı şekilde ayrıldı, fakat çıkarılamadı"
+
+#~ msgid "Mount given URL (default)"
+#~ msgstr "Verilen adresi bağla (öntanımlı)"
+
+#~ msgid "Eject given URL via tdeeject"
+#~ msgstr "Verilen URL'yi tdeeject ile çıkar"
+
+#~ msgid "Unmount and Eject given URL (necessary for some USB devices)"
+#~ msgstr "Verilen URL'yi Ayır ve Çıkar (bazı USB aygıtlar için gerekli)"
+
 #, fuzzy
 #~ msgid "Permission denied"
 #~ msgstr "İzin verilmedi"
diff --git a/tde-i18n-uk/messages/tdebase/tdeio_media.po b/tde-i18n-uk/messages/tdebase/tdeio_media.po
index f389c04bbd9..8349a5c6b97 100644
--- a/tde-i18n-uk/messages/tdebase/tdeio_media.po
+++ b/tde-i18n-uk/messages/tdebase/tdeio_media.po
@@ -10,7 +10,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: 2020-07-20 14:34+0000\n"
 "Last-Translator: Roman Savochenko <roman@oscada.org>\n"
 "Language-Team: Ukrainian <https://mirror.git.trinitydesktop.org/weblate/"
@@ -51,27 +51,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 "Менеджер роботи з носіями інформації не запущено."
 
-#: 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 "Невідома помилка монтування."
 
@@ -86,69 +85,71 @@ 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 "DVD"
 
-#: 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
 msgid "Unknown Drive"
 msgstr "Невідомий Диск"
 
-#: mediamanager/halbackend.cpp:780 mediamanager/tdehardwarebackend.cpp:839
+#: mediamanager/halbackend.cpp:794 mediamanager/tdehardwarebackend.cpp:872
 msgid "Floppy Drive"
 msgstr "Дискета"
 
-#: mediamanager/halbackend.cpp:788
+#: mediamanager/halbackend.cpp:802
 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 "
@@ -158,7 +159,7 @@ 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 "
@@ -168,17 +169,16 @@ msgstr ""
 "користуваами</b></big><br/>Аутентифікація потрібна для здійснення цієї дії. "
 "Будь ласка введіть ваш пароль для перевірки."
 
-#: 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>"
@@ -187,11 +187,11 @@ msgstr ""
 "доступу до цього пристрою.<br>2. Цей вузол пристрою не вказано у /etc/fstab."
 "</p>"
 
-#: 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 "
@@ -201,7 +201,7 @@ 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."
@@ -209,10 +209,10 @@ 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. "
@@ -220,34 +220,56 @@ 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 unlocked."
+msgid "%1 is already mounted to %2."
+msgstr "%1 вже розблоковано."
+
+#: 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 unlocked."
+msgid "%1 is already unmounted."
+msgstr "%1 вже розблоковано."
+
+#: 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
 msgid "Internal error"
 msgstr "Внутрішня помилка"
 
-#: mediamanager/halbackend.cpp:1718
+#: mediamanager/halbackend.cpp:1745
 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>"
@@ -256,7 +278,7 @@ msgstr ""
 "доступу до цього пристрою.<br>2. Цей пристрій було змонтовано за допомогою "
 "TDE.</p>"
 
-#: 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>"
@@ -264,163 +286,201 @@ msgstr ""
 "%1<p><b>Ви згодні примусово перервати ці процеси?</b><br><i>Всі незбережені "
 "дані можуть бути втрачені</i>"
 
-#: 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
+msgid "%1 is not an encrypted media."
+msgstr "%1 незашифрований пристрій."
+
+#: mediamanager/halbackend.cpp:1868 mediamanager/tdehardwarebackend.cpp:1452
+#: mounthelper/tdeio_media_mounthelper.cpp:127
+msgid "%1 is already unlocked."
+msgstr "%1 вже розблоковано."
+
+#: 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 unlocked."
+msgid "%1 is already locked."
+msgstr "%1 вже розблоковано."
+
 #: mediamanager/mediamanager.cpp:248 mediamanager/mediamanager.cpp:275
+#: mediamanager/mediamanager.cpp:302 mediamanager/mediamanager.cpp:329
 msgid "Feature only available with the TDE hardware backend"
 msgstr "Функціональність доступна лише з рушієм обладнання TDE"
 
 #: 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
 msgid "Feature only available with HAL or TDE hardware backend"
 msgstr "Функціональність доступна лише із HAL та рушієм обладнання TDE"
 
-#: mediamanager/tdehardwarebackend.cpp:484
-#: mediamanager/tdehardwarebackend.cpp:521
-#: mediamanager/tdehardwarebackend.cpp:754
+#: mediamanager/tdehardwarebackend.cpp:486
+#: mediamanager/tdehardwarebackend.cpp:523
+#: mediamanager/tdehardwarebackend.cpp:779
 msgid "%1 Removable Device"
 msgstr "%1 Змінний Пристрій"
 
-#: mediamanager/tdehardwarebackend.cpp:529
+#: mediamanager/tdehardwarebackend.cpp:532
 msgid "Blank CD-ROM"
 msgstr "Порожній CD-ROM"
 
-#: mediamanager/tdehardwarebackend.cpp:538
+#: mediamanager/tdehardwarebackend.cpp:542
 msgid "Blank CD-R"
 msgstr "Порожній CD-R"
 
-#: mediamanager/tdehardwarebackend.cpp:547
+#: mediamanager/tdehardwarebackend.cpp:552
 msgid "Blank CD-RW"
 msgstr "Порожній CD-RW"
 
-#: mediamanager/tdehardwarebackend.cpp:556
+#: mediamanager/tdehardwarebackend.cpp:562
 msgid "Blank Magneto-Optical CD"
 msgstr "Порожній Магніто-Оптичний CD"
 
-#: mediamanager/tdehardwarebackend.cpp:565
+#: mediamanager/tdehardwarebackend.cpp:572
 msgid "Blank Mount Ranier CD-RW"
 msgstr "Порожній Монтовано Ranier CD-RW"
 
-#: mediamanager/tdehardwarebackend.cpp:574
+#: mediamanager/tdehardwarebackend.cpp:582
 msgid "Blank Mount Ranier CD-RW-W"
 msgstr "Порожній Монтовано Ranier CD-RW-W"
 
-#: mediamanager/tdehardwarebackend.cpp:583
+#: mediamanager/tdehardwarebackend.cpp:592
 msgid "Blank DVD-ROM"
 msgstr "Порожній DVD-ROM"
 
-#: mediamanager/tdehardwarebackend.cpp:592
+#: mediamanager/tdehardwarebackend.cpp:602
 msgid "Blank DVD-RAM"
 msgstr "Порожній DVD-RAM"
 
-#: mediamanager/tdehardwarebackend.cpp:601
+#: mediamanager/tdehardwarebackend.cpp:612
 msgid "Blank DVD-R"
 msgstr "Порожній DVD-R"
 
-#: mediamanager/tdehardwarebackend.cpp:610
+#: mediamanager/tdehardwarebackend.cpp:622
 msgid "Blank DVD-RW"
 msgstr "Порожній DVD-RW"
 
-#: mediamanager/tdehardwarebackend.cpp:619
+#: mediamanager/tdehardwarebackend.cpp:632
 msgid "Blank Dual Layer DVD-R"
 msgstr "Порожній Дво-Шаровий DVD-R"
 
-#: mediamanager/tdehardwarebackend.cpp:628
+#: mediamanager/tdehardwarebackend.cpp:642
 msgid "Blank Dual Layer DVD-RW"
 msgstr "Порожній Дво-Шаровий DVD-RW"
 
-#: mediamanager/tdehardwarebackend.cpp:637
+#: mediamanager/tdehardwarebackend.cpp:652
 msgid "Blank DVD+R"
 msgstr "Порожній DVD+R"
 
-#: mediamanager/tdehardwarebackend.cpp:646
+#: mediamanager/tdehardwarebackend.cpp:662
 msgid "Blank DVD+RW"
 msgstr "Порожній DVD+RW"
 
-#: mediamanager/tdehardwarebackend.cpp:655
+#: mediamanager/tdehardwarebackend.cpp:672
 msgid "Blank Dual Layer DVD+R"
 msgstr "Порожній Дво-Шаровий DVD+R"
 
-#: mediamanager/tdehardwarebackend.cpp:664
+#: mediamanager/tdehardwarebackend.cpp:682
 msgid "Blank Dual Layer DVD+RW"
 msgstr "Порожній Дво-Шаровий DVD+RW"
 
-#: mediamanager/tdehardwarebackend.cpp:673
+#: mediamanager/tdehardwarebackend.cpp:692
 msgid "Blank BLURAY-ROM"
 msgstr "Порожній BLURAY-ROM"
 
-#: mediamanager/tdehardwarebackend.cpp:682
+#: mediamanager/tdehardwarebackend.cpp:702
 msgid "Blank BLURAY-R"
 msgstr "Порожній BLURAY-R"
 
-#: mediamanager/tdehardwarebackend.cpp:691
+#: mediamanager/tdehardwarebackend.cpp:712
 msgid "Blank BLURAY-RW"
 msgstr "Порожній BLURAY-RW"
 
-#: mediamanager/tdehardwarebackend.cpp:700
+#: mediamanager/tdehardwarebackend.cpp:722
 msgid "Blank HDDVD-ROM"
 msgstr "Порожній HDDVD-ROM"
 
-#: mediamanager/tdehardwarebackend.cpp:709
+#: mediamanager/tdehardwarebackend.cpp:732
 msgid "Blank HDDVD-R"
 msgstr "Порожній HDDVD-R"
 
-#: mediamanager/tdehardwarebackend.cpp:718
+#: mediamanager/tdehardwarebackend.cpp:742
 msgid "Blank HDDVD-RW"
 msgstr "Порожній HDDVD-RW"
 
-#: mediamanager/tdehardwarebackend.cpp:725
+#: mediamanager/tdehardwarebackend.cpp:750
 msgid "Audio CD"
 msgstr "Аудіо CD"
 
-#: mediamanager/tdehardwarebackend.cpp:746
+#: mediamanager/tdehardwarebackend.cpp:771
 msgid "%1 Fixed Disk (%2)"
 msgstr "%1 Фіксований Диск (%2)"
 
-#: mediamanager/tdehardwarebackend.cpp:853
+#: mediamanager/tdehardwarebackend.cpp:886
 msgid "%1 Zip Disk"
 msgstr "%1 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
+#, fuzzy, c-format
+#| msgid "Internal error. Couldn't find medium."
+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 "<p>Технічні деталі:<br>"
 
-#: mediamanager/tdehardwarebackend.cpp:1285
-msgid "Decryption aborted"
-msgstr "Дешифрування перервано"
-
-#: mediamanager/tdehardwarebackend.cpp:1444
+#: mediamanager/tdehardwarebackend.cpp:1396
+#, fuzzy
+#| 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>"
 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>"
+"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 ""
 "<qt>Пристрій <b>%1</b> (%2) названий <b>'%3'</b> та наразі змонтований до <b>"
 "%4</b> не може наразі бути демонтовано.<p>%5<p><b>Не хотіли-б ви примусово "
 "перервати цей процес?</b><br><i>Всі незбережені файли буде втрачено</i>"
 
-#: mediamanager/tdehardwarebackend.cpp:1578
+#: mediamanager/tdehardwarebackend.cpp:1467
+#, fuzzy
+#| msgid "Unable to mount this device."
+msgid "Unable to unlock the device."
+msgstr "Неможливо змонтувати пристрій."
+
+#: mediamanager/tdehardwarebackend.cpp:1516
+#, fuzzy
+#| msgid "Unable to mount this device."
+msgid "Unable to lock the device."
+msgstr "Неможливо змонтувати пристрій."
+
+#: mediamanager/tdehardwarebackend.cpp:1623
 msgid ""
 "Programs still using the device have been detected. They are listed below. "
 "You have to close them or change their working directory before attempting "
@@ -430,61 +490,98 @@ 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 "Менеджер роботи з носіями інформації не запущено."
 
-#: 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
-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
-msgid "%1 is already unlocked."
-msgstr "%1 вже розблоковано."
-
-#: 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."
-msgstr "Невідома помилка дешифрування."
+#: mounthelper/tdeio_media_mounthelper.cpp:173
+#, fuzzy
+#| msgid "Unknown mount error."
+msgid "Unknown lock error."
+msgstr "Невідома помилка монтування."
 
-#: mounthelper/tdeio_media_mounthelper.cpp:295
-msgid "Decrypt given URL"
-msgstr "Розшифрувати цей URL"
+#: mounthelper/tdeio_media_mounthelper.cpp:211
+msgid "Try to release holders from an unknown medium."
+msgstr ""
 
-#: mounthelper/tdeio_media_mounthelper.cpp:296
+#: mounthelper/tdeio_media_mounthelper.cpp:270
+msgid "Try to safe remove an unknown medium."
+msgstr ""
+
+#: mounthelper/tdeio_media_mounthelper.cpp:302
+msgid "%1 cannot be found."
+msgstr "Не вдається знайти %1."
+
+#: mounthelper/tdeio_media_mounthelper.cpp:310
+#, fuzzy
+#| msgid "%1 is not an encrypted media."
+msgid "%1 is not a mountable or encrypted media."
+msgstr "%1 незашифрований пристрій."
+
+#: mounthelper/tdeio_media_mounthelper.cpp:397
+#, fuzzy
+#| msgid "Unknown unmount error."
+msgid "Unknown unlock error."
+msgstr "Невідома помилка демонтування."
+
+#: mounthelper/tdeio_media_mounthelper.cpp:410
+#, fuzzy
+#| msgid "Unmount given URL"
+msgid "Mount given URL"
+msgstr "Демонтувати вказану адресу (URL)"
+
+#: mounthelper/tdeio_media_mounthelper.cpp:411
 msgid "Unmount given URL"
 msgstr "Демонтувати вказану адресу (URL)"
 
-#: mounthelper/tdeio_media_mounthelper.cpp:297
-msgid "Mount given URL (default)"
-msgstr "Змонтувати вказану URL (типове)"
+#: mounthelper/tdeio_media_mounthelper.cpp:412
+#, fuzzy
+#| msgid "Unmount given URL"
+msgid "Unlock given URL"
+msgstr "Демонтувати вказану адресу (URL)"
 
-#: mounthelper/tdeio_media_mounthelper.cpp:298
-msgid "Eject given URL via tdeeject"
-msgstr "Виштовхнути наведений URL за допомогою tdeeject"
+#: mounthelper/tdeio_media_mounthelper.cpp:413
+#, fuzzy
+#| msgid "Decrypt given URL"
+msgid "Lock given URL"
+msgstr "Розшифрувати цей URL"
 
-#: mounthelper/tdeio_media_mounthelper.cpp:299
-msgid "Unmount and Eject given URL (necessary for some USB devices)"
+#: mounthelper/tdeio_media_mounthelper.cpp:414
+#, fuzzy
+#| msgid "Decrypt given URL"
+msgid "Eject given URL"
+msgstr "Розшифрувати цей URL"
+
+#: mounthelper/tdeio_media_mounthelper.cpp:415
+msgid "Safely remove (unmount and eject) given URL"
 msgstr ""
-"Демонтувати і виштовхнути вказаний URL (необхідне для деяких пристроїв USB)"
 
-#: 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:/ URL для монтування/демонтування/виштовхування/вилучення"
 
 #: propsdlgplugin/propertiespage.cpp:137
@@ -642,13 +739,16 @@ msgid "&Password:"
 msgstr "&Пароль:"
 
 #: mounthelper/unlockdialog.ui:109
-#, no-c-format
+#, fuzzy, no-c-format
+#| msgid ""
+#| "<p><b>%1</b> is an encrypted locked storage device.</p>\n"
+#| "<p>Please enter the password to unlock the storage device.</p>"
 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 ""
-"<p><b>%1</b> це зашифрований пристрій зберігання.</p>\n"
-"<p>Будь-ласка введіть пароль для дешифрування пристрою зберігання.</p>"
+"<p><b>%1</b> це зашифрований блокований пристрій зберігання.</p>\n"
+"<p>Будь-ласка введіть пароль для розблокування пристрою зберігання.</p>"
 
 #: propsdlgplugin/propertiespagegui.ui:16
 #, no-c-format
@@ -911,6 +1011,37 @@ msgstr "Змішаний"
 msgid "Filesystem: iso9660"
 msgstr "Файлова система: iso9660"
 
+#~ msgid "Decryption aborted"
+#~ msgstr "Дешифрування перервано"
+
+#~ 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 "Unknown decrypt error."
+#~ msgstr "Невідома помилка дешифрування."
+
+#~ msgid "Mount given URL (default)"
+#~ msgstr "Змонтувати вказану URL (типове)"
+
+#~ msgid "Eject given URL via tdeeject"
+#~ msgstr "Виштовхнути наведений URL за допомогою tdeeject"
+
+#~ msgid "Unmount and Eject given URL (necessary for some USB devices)"
+#~ msgstr ""
+#~ "Демонтувати і виштовхнути вказаний URL (необхідне для деяких пристроїв "
+#~ "USB)"
+
+#~ msgid ""
+#~ "<p><b>%1</b> is an encrypted storage device.</p>\n"
+#~ "<p>Please enter the password to decrypt the storage device.</p>"
+#~ msgstr ""
+#~ "<p><b>%1</b> це зашифрований пристрій зберігання.</p>\n"
+#~ "<p>Будь-ласка введіть пароль для дешифрування пристрою зберігання.</p>"
+
 #~ msgid "Decrypt"
 #~ msgstr "Розшифрувати"
 
diff --git a/tde-i18n-uz/messages/tdebase/tdeio_media.po b/tde-i18n-uz/messages/tdebase/tdeio_media.po
index 3d410521a6e..3c3f8a91fe6 100644
--- a/tde-i18n-uz/messages/tdebase/tdeio_media.po
+++ b/tde-i18n-uz/messages/tdebase/tdeio_media.po
@@ -7,7 +7,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: 2008-04-11 21:35+0200\n"
 "Last-Translator: Mashrab Kuvatov <kmashrab@uni-bremen.de>\n"
 "Language-Team: Uzbek <floss-uz-l10n@googlegroups.com>\n"
@@ -45,27 +45,26 @@ msgstr "Yangi oynada ochish"
 msgid "Unknown"
 msgstr "Nomaʼlum"
 
-#: 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 saqlash uskunalar boshqaruvchisi ishga tushmagan."
 
-#: mediaimpl.cpp:187
+#: mediaimpl.cpp:186
 msgid "This media name already exists."
 msgstr "Maʼlumot tashuvchining nomi allaqachon mavjud."
 
-#: 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 ""
 
@@ -78,390 +77,469 @@ 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 ""
 
-#: mediamanager/fstabbackend.cpp:408
+#: mediamanager/fstabbackend.cpp:416
 msgid "CD Recorder"
 msgstr "Kompakt-disk yozuvchi"
 
-#: mediamanager/fstabbackend.cpp:414
+#: mediamanager/fstabbackend.cpp:422
 msgid "DVD"
 msgstr "DVD"
 
-#: mediamanager/fstabbackend.cpp:427
+#: mediamanager/fstabbackend.cpp:435
 msgid "CD-ROM"
 msgstr "Kompakt-disk"
 
-#: mediamanager/fstabbackend.cpp:440
+#: mediamanager/fstabbackend.cpp:448
 msgid "Floppy"
 msgstr "Disket"
 
-#: mediamanager/fstabbackend.cpp:448
+#: mediamanager/fstabbackend.cpp:456
 msgid "Zip Disk"
 msgstr "ZIP-disk"
 
-#: mediamanager/fstabbackend.cpp:459
+#: mediamanager/fstabbackend.cpp:467
 msgid "Removable Device"
 msgstr "Olinadigan uskuna"
 
-#: 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 "Qattiq disk"
 
-#: mediamanager/halbackend.cpp:768 mediamanager/tdehardwarebackend.cpp:809
+#: mediamanager/halbackend.cpp:778 mediamanager/tdehardwarebackend.cpp:826
 msgid "Unknown Drive"
 msgstr "Nomaʼlum"
 
-#: mediamanager/halbackend.cpp:780 mediamanager/tdehardwarebackend.cpp:839
+#: mediamanager/halbackend.cpp:794 mediamanager/tdehardwarebackend.cpp:872
 msgid "Floppy Drive"
 msgstr "Disket"
 
-#: mediamanager/halbackend.cpp:788
+#: mediamanager/halbackend.cpp:802
 msgid "Zip Drive"
 msgstr "ZIP-disk"
 
-#: mediamanager/halbackend.cpp:858 mediamanager/tdehardwarebackend.cpp:896
+#: mediamanager/halbackend.cpp:877 mediamanager/tdehardwarebackend.cpp:930
 msgid "Camera"
 msgstr "Fotoaparat"
 
-#: 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 "Ichki xato"
 
-#: mediamanager/halbackend.cpp:1303
+#: mediamanager/halbackend.cpp:1322
 msgid "Invalid filesystem type"
 msgstr "Fayl tizimining turi notoʻgʻri"
 
-#: 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 "Uskuna allaqachon ulangan."
 
-#: 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 "
 "before attempting to unmount the device again."
 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. "
 msgstr ""
 
-#: 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 ""
 
-#: 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 - ulanadigan uskuna emas."
+
+#: mediamanager/halbackend.cpp:1497 mediamanager/tdehardwarebackend.cpp:1225
+#: mounthelper/tdeio_media_mounthelper.cpp:68
+#, fuzzy
+msgid "%1 is already mounted to %2."
+msgstr "Uskuna allaqachon ulangan."
+
+#: 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 "Uskuna allaqachon ulangan."
+
+#: 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 "Ichki xato"
 
-#: mediamanager/halbackend.cpp:1718
+#: mediamanager/halbackend.cpp:1745
 #, fuzzy
 #| msgid "Unknown"
 msgid "Unknown error"
 msgstr "Nomaʼlum"
 
-#: 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 "Uskuna band:"
 
-#: 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 - ulanadigan uskuna emas."
+
+#: mediamanager/halbackend.cpp:1868 mediamanager/tdehardwarebackend.cpp:1452
+#: mounthelper/tdeio_media_mounthelper.cpp:127
+#, fuzzy
+msgid "%1 is already unlocked."
+msgstr "Uskuna allaqachon ulangan."
+
+#: 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 "Uskuna allaqachon ulangan."
+
 #: 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 "Bu imkoniyat faqat HAL bilan ishlaydi"
 
 #: 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 "Bu imkoniyat faqat HAL bilan ishlaydi"
 
 #: 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 "Bu imkoniyat faqat HAL bilan ishlaydi"
 
-#: 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 "Olinadigan uskuna"
 
-#: mediamanager/tdehardwarebackend.cpp:529
+#: mediamanager/tdehardwarebackend.cpp:532
 #, fuzzy
 msgid "Blank CD-ROM"
 msgstr "Kompakt-disk"
 
-#: 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 "Kompakt-disk"
 
-#: mediamanager/tdehardwarebackend.cpp:682
+#: mediamanager/tdehardwarebackend.cpp:702
 #, fuzzy
 msgid "Blank BLURAY-R"
 msgstr "Kompakt-disk"
 
-#: 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-disk"
 
-#: 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
 msgid ""
 "Programs still using the device have been detected. They are listed below. "
 "You have to close them or change their working directory before attempting "
 "to unmount the device again."
 msgstr ""
 
-#: mounthelper/tdeio_media_mounthelper.cpp:79
-msgid "%1 cannot be found."
-msgstr "%1 topilmadi."
+#: mounthelper/tdeio_media_mounthelper.cpp:49
+#, fuzzy
+#| msgid "The TDE mediamanager is not running."
+msgid "The TDE mediamanager is not running.\n"
+msgstr "TDE saqlash uskunalar boshqaruvchisi ishga tushmagan."
 
-#: mounthelper/tdeio_media_mounthelper.cpp:87
-msgid "%1 is not a mountable media."
-msgstr "%1 - ulanadigan uskuna emas."
+#: 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 - ulanadigan uskuna emas."
+#: 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 "Uskuna allaqachon ulangan."
-
-#: 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"
+#: mounthelper/tdeio_media_mounthelper.cpp:116
+msgid "Try to unlock an unknown medium."
+msgstr ""
+
+#: mounthelper/tdeio_media_mounthelper.cpp:148
+msgid "Try to lock an unknown medium."
 msgstr ""
 
-#: mounthelper/tdeio_media_mounthelper.cpp:248
-msgid "The device was successfully unmounted, but could not be ejected"
+#: mounthelper/tdeio_media_mounthelper.cpp:173
+#, fuzzy
+#| msgid "Unknown"
+msgid "Unknown lock error."
+msgstr "Nomaʼlum"
+
+#: mounthelper/tdeio_media_mounthelper.cpp:211
+msgid "Try to release holders from an unknown medium."
 msgstr ""
 
-#: mounthelper/tdeio_media_mounthelper.cpp:281
-msgid "Unknown decrypt error."
+#: 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 topilmadi."
+
+#: mounthelper/tdeio_media_mounthelper.cpp:310
+#, fuzzy
+msgid "%1 is not a mountable or encrypted media."
+msgstr "%1 - ulanadigan uskuna emas."
+
+#: mounthelper/tdeio_media_mounthelper.cpp:397
 #, fuzzy
-msgid "Decrypt given URL"
+#| msgid "Unknown"
+msgid "Unknown unlock error."
+msgstr "Nomaʼlum"
+
+#: mounthelper/tdeio_media_mounthelper.cpp:410
+#, fuzzy
+#| msgid "Unmount given URL"
+msgid "Mount given URL"
 msgstr "Koʻrsatilgan URL'ni uzish"
 
-#: mounthelper/tdeio_media_mounthelper.cpp:296
+#: mounthelper/tdeio_media_mounthelper.cpp:411
 msgid "Unmount given URL"
 msgstr "Koʻrsatilgan URL'ni uzish"
 
-#: mounthelper/tdeio_media_mounthelper.cpp:297
-msgid "Mount given URL (default)"
-msgstr "Koʻrsatilgan URL'ni ulash (andoza)"
+#: mounthelper/tdeio_media_mounthelper.cpp:412
+#, fuzzy
+#| msgid "Unmount given URL"
+msgid "Unlock given URL"
+msgstr "Koʻrsatilgan URL'ni uzish"
 
-#: mounthelper/tdeio_media_mounthelper.cpp:298
-msgid "Eject given URL via tdeeject"
-msgstr ""
+#: mounthelper/tdeio_media_mounthelper.cpp:413
+#, fuzzy
+msgid "Lock given URL"
+msgstr "Koʻrsatilgan URL'ni uzish"
 
-#: mounthelper/tdeio_media_mounthelper.cpp:299
-msgid "Unmount and Eject given URL (necessary for some USB devices)"
+#: mounthelper/tdeio_media_mounthelper.cpp:414
+#, fuzzy
+msgid "Eject given URL"
+msgstr "Koʻrsatilgan URL'ni uzish"
+
+#: 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
+msgid "media:/URL to mount/unmount/unlock/lock/eject/remove"
 msgstr ""
 
 #: propsdlgplugin/propertiespage.cpp:137
@@ -610,7 +688,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
@@ -830,6 +908,9 @@ msgstr "Aralash"
 msgid "Filesystem: iso9660"
 msgstr "Fayl tizimi: ISO9660"
 
+#~ msgid "Mount given URL (default)"
+#~ msgstr "Koʻrsatilgan URL'ni ulash (andoza)"
+
 #, fuzzy
 #~ msgid "Permission denied"
 #~ msgstr "Ruxsat yoʻq"
diff --git a/tde-i18n-uz@cyrillic/messages/tdebase/tdeio_media.po b/tde-i18n-uz@cyrillic/messages/tdebase/tdeio_media.po
index b7b5db2086d..711f127dd22 100644
--- a/tde-i18n-uz@cyrillic/messages/tdebase/tdeio_media.po
+++ b/tde-i18n-uz@cyrillic/messages/tdebase/tdeio_media.po
@@ -7,7 +7,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: 2008-04-11 21:35+0200\n"
 "Last-Translator: Mashrab Kuvatov <kmashrab@uni-bremen.de>\n"
 "Language-Team: Uzbek <floss-uz-l10n@googlegroups.com>\n"
@@ -45,27 +45,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 ""
 
@@ -78,390 +77,469 @@ 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 ""
 
-#: mediamanager/fstabbackend.cpp:408
+#: mediamanager/fstabbackend.cpp:416
 msgid "CD Recorder"
 msgstr "Компакт-диск ёзувчи"
 
-#: mediamanager/fstabbackend.cpp:414
+#: mediamanager/fstabbackend.cpp:422
 msgid "DVD"
 msgstr "DVD"
 
-#: 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
 msgid "Unknown Drive"
 msgstr "Номаълум"
 
-#: mediamanager/halbackend.cpp:780 mediamanager/tdehardwarebackend.cpp:839
+#: mediamanager/halbackend.cpp:794 mediamanager/tdehardwarebackend.cpp:872
 msgid "Floppy Drive"
 msgstr "Дискет"
 
-#: mediamanager/halbackend.cpp:788
+#: mediamanager/halbackend.cpp:802
 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 "
 "before attempting to unmount the device again."
 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. "
 msgstr ""
 
-#: 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 ""
 
-#: 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
 msgid ""
 "Programs still using the device have been detected. They are listed below. "
 "You have to close them or change their working directory before attempting "
 "to unmount the device again."
 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"
+#: mounthelper/tdeio_media_mounthelper.cpp:116
+msgid "Try to unlock an unknown medium."
+msgstr ""
+
+#: mounthelper/tdeio_media_mounthelper.cpp:148
+msgid "Try to lock an unknown medium."
 msgstr ""
 
-#: mounthelper/tdeio_media_mounthelper.cpp:248
-msgid "The device was successfully unmounted, but could not be ejected"
+#: 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:281
-msgid "Unknown decrypt error."
+#: 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 "Decrypt given URL"
+#| msgid "Unknown"
+msgid "Unknown unlock error."
+msgstr "Номаълум"
+
+#: mounthelper/tdeio_media_mounthelper.cpp:410
+#, fuzzy
+#| msgid "Unmount given URL"
+msgid "Mount given URL"
 msgstr "Кўрсатилган URL'ни узиш"
 
-#: mounthelper/tdeio_media_mounthelper.cpp:296
+#: mounthelper/tdeio_media_mounthelper.cpp:411
 msgid "Unmount given URL"
 msgstr "Кўрсатилган URL'ни узиш"
 
-#: mounthelper/tdeio_media_mounthelper.cpp:297
-msgid "Mount given URL (default)"
-msgstr "Кўрсатилган URL'ни улаш (андоза)"
+#: mounthelper/tdeio_media_mounthelper.cpp:412
+#, fuzzy
+#| msgid "Unmount given URL"
+msgid "Unlock given URL"
+msgstr "Кўрсатилган URL'ни узиш"
 
-#: mounthelper/tdeio_media_mounthelper.cpp:298
-msgid "Eject given URL via tdeeject"
-msgstr ""
+#: mounthelper/tdeio_media_mounthelper.cpp:413
+#, fuzzy
+msgid "Lock given URL"
+msgstr "Кўрсатилган URL'ни узиш"
 
-#: mounthelper/tdeio_media_mounthelper.cpp:299
-msgid "Unmount and Eject given URL (necessary for some USB devices)"
+#: mounthelper/tdeio_media_mounthelper.cpp:414
+#, fuzzy
+msgid "Eject given URL"
+msgstr "Кўрсатилган URL'ни узиш"
+
+#: 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
+msgid "media:/URL to mount/unmount/unlock/lock/eject/remove"
 msgstr ""
 
 #: propsdlgplugin/propertiespage.cpp:137
@@ -610,7 +688,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
@@ -830,6 +908,9 @@ msgstr "Аралаш"
 msgid "Filesystem: iso9660"
 msgstr "Файл тизими: ISO9660"
 
+#~ msgid "Mount given URL (default)"
+#~ msgstr "Кўрсатилган URL'ни улаш (андоза)"
+
 #, fuzzy
 #~ msgid "Permission denied"
 #~ msgstr "Рухсат йўқ"
diff --git a/tde-i18n-vi/messages/tdebase/tdeio_media.po b/tde-i18n-vi/messages/tdebase/tdeio_media.po
index bd6d3686be2..2abf4a3044f 100644
--- a/tde-i18n-vi/messages/tdebase/tdeio_media.po
+++ b/tde-i18n-vi/messages/tdebase/tdeio_media.po
@@ -5,7 +5,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: 2006-07-04 22:53+0930\n"
 "Last-Translator: Phan Vĩnh Thịnh <teppi82@gmail.com>\n"
 "Language-Team: Vietnamese <kde-l10n-vi@kde.org>\n"
@@ -44,28 +44,27 @@ msgstr "Mở trong cửa sổ mới"
 msgid "Unknown"
 msgstr "Không rõ"
 
-#: 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 "Trình quản lý vật chứa TDE chưa chạy."
 
-#: mediaimpl.cpp:187
+#: mediaimpl.cpp:186
 msgid "This media name already exists."
 msgstr "Đã có tên vật chứa này."
 
-#: mediaimpl.cpp:230 mediaimpl.cpp:297
+#: mediaimpl.cpp:229 mediaimpl.cpp:296
 #, fuzzy
 msgid "No such medium."
 msgstr "Không có vật chứa như vậy: %1"
 
-#: 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 ""
 
@@ -78,393 +77,474 @@ 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 "Không có vật chứa như vậy: %1"
 
-#: mediamanager/fstabbackend.cpp:408
+#: mediamanager/fstabbackend.cpp:416
 msgid "CD Recorder"
 msgstr "Đầu ghi CD"
 
-#: mediamanager/fstabbackend.cpp:414
+#: mediamanager/fstabbackend.cpp:422
 msgid "DVD"
 msgstr "DVD"
 
-#: mediamanager/fstabbackend.cpp:427
+#: mediamanager/fstabbackend.cpp:435
 msgid "CD-ROM"
 msgstr "Ổ CD"
 
-#: mediamanager/fstabbackend.cpp:440
+#: mediamanager/fstabbackend.cpp:448
 msgid "Floppy"
 msgstr "Đĩa mềm"
 
-#: mediamanager/fstabbackend.cpp:448
+#: mediamanager/fstabbackend.cpp:456
 msgid "Zip Disk"
 msgstr "Đĩa Zip"
 
-#: mediamanager/fstabbackend.cpp:459
+#: mediamanager/fstabbackend.cpp:467
 msgid "Removable Device"
 msgstr "Thiết bị rời"
 
-#: mediamanager/fstabbackend.cpp:464 mediamanager/fstabbackend.cpp:470
+#: mediamanager/fstabbackend.cpp:472 mediamanager/fstabbackend.cpp:478
 msgid "Remote Share"
 msgstr "Chia sẻ ở xa"
 
-#: mediamanager/fstabbackend.cpp:475
+#: mediamanager/fstabbackend.cpp:483
 msgid "Hard Disk"
 msgstr "Đĩa cứng"
 
-#: mediamanager/halbackend.cpp:768 mediamanager/tdehardwarebackend.cpp:809
+#: mediamanager/halbackend.cpp:778 mediamanager/tdehardwarebackend.cpp:826
 #, fuzzy
 msgid "Unknown Drive"
 msgstr "Không rõ"
 
-#: mediamanager/halbackend.cpp:780 mediamanager/tdehardwarebackend.cpp:839
+#: mediamanager/halbackend.cpp:794 mediamanager/tdehardwarebackend.cpp:872
 #, fuzzy
 msgid "Floppy Drive"
 msgstr "Đĩa mềm"
 
-#: mediamanager/halbackend.cpp:788
+#: mediamanager/halbackend.cpp:802
 #, fuzzy
 msgid "Zip Drive"
 msgstr "Đĩa Zip"
 
-#: mediamanager/halbackend.cpp:858 mediamanager/tdehardwarebackend.cpp:896
+#: mediamanager/halbackend.cpp:877 mediamanager/tdehardwarebackend.cpp:930
 msgid "Camera"
 msgstr "Máy ảnh"
 
-#: 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 "Lỗi nội bộ"
 
-#: mediamanager/halbackend.cpp:1303
+#: mediamanager/halbackend.cpp:1322
 msgid "Invalid filesystem type"
 msgstr "Kiểu hệ thống tập tin không hợp lệ"
 
-#: 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 "Thiết bị đã được lắp."
 
-#: 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 "
 "before attempting to unmount the device again."
 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. "
 msgstr ""
 
-#: 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 ""
 
-#: 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 không phải là một vật chứa có thể gắn."
+
+#: mediamanager/halbackend.cpp:1497 mediamanager/tdehardwarebackend.cpp:1225
+#: mounthelper/tdeio_media_mounthelper.cpp:68
+#, fuzzy
+msgid "%1 is already mounted to %2."
+msgstr "Thiết bị đã được lắp."
+
+#: 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 "Thiết bị đã được lắp."
+
+#: 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 "Lỗi nội bộ"
 
-#: mediamanager/halbackend.cpp:1718
+#: mediamanager/halbackend.cpp:1745
 #, fuzzy
 #| msgid "Unknown"
 msgid "Unknown error"
 msgstr "Không rõ"
 
-#: 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 "Thiết bị đang bận:"
 
-#: 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 không phải là một vật chứa có thể gắn."
+
+#: mediamanager/halbackend.cpp:1868 mediamanager/tdehardwarebackend.cpp:1452
+#: mounthelper/tdeio_media_mounthelper.cpp:127
+#, fuzzy
+msgid "%1 is already unlocked."
+msgstr "Thiết bị đã được lắp."
+
+#: 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 "Thiết bị đã được lắp."
+
 #: 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 "Tính này này sẵn sàng chỉ với 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 "Tính này này sẵn sàng chỉ với 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 "Tính này này sẵn sàng chỉ với 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 "Thiết bị rời"
 
-#: mediamanager/tdehardwarebackend.cpp:529
+#: mediamanager/tdehardwarebackend.cpp:532
 #, fuzzy
 msgid "Blank CD-ROM"
 msgstr "Ổ CD"
 
-#: 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 "Ổ CD"
 
-#: mediamanager/tdehardwarebackend.cpp:682
+#: mediamanager/tdehardwarebackend.cpp:702
 #, fuzzy
 msgid "Blank BLURAY-R"
 msgstr "Ổ CD"
 
-#: 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 "Đĩa 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:1516
+msgid "Unable to lock the device."
 msgstr ""
 
-#: mediamanager/tdehardwarebackend.cpp:1578
+#: mediamanager/tdehardwarebackend.cpp:1623
 msgid ""
 "Programs still using the device have been detected. They are listed below. "
 "You have to close them or change their working directory before attempting "
 "to unmount the device again."
 msgstr ""
 
-#: mounthelper/tdeio_media_mounthelper.cpp:79
-msgid "%1 cannot be found."
-msgstr "Không tìm thấy %1."
+#: mounthelper/tdeio_media_mounthelper.cpp:49
+#, fuzzy
+#| msgid "The TDE mediamanager is not running."
+msgid "The TDE mediamanager is not running.\n"
+msgstr "Trình quản lý vật chứa TDE chưa chạy."
 
-#: mounthelper/tdeio_media_mounthelper.cpp:87
-msgid "%1 is not a mountable media."
-msgstr "%1 không phải là một vật chứa có thể gắn."
+#: 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 không phải là một vật chứa có thể gắn."
+#: 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 "Thiết bị đã được lắp."
-
-#: 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"
+#: mounthelper/tdeio_media_mounthelper.cpp:116
+msgid "Try to unlock an unknown medium."
+msgstr ""
+
+#: mounthelper/tdeio_media_mounthelper.cpp:148
+msgid "Try to lock an unknown medium."
 msgstr ""
 
-#: mounthelper/tdeio_media_mounthelper.cpp:248
-msgid "The device was successfully unmounted, but could not be ejected"
+#: mounthelper/tdeio_media_mounthelper.cpp:173
+#, fuzzy
+#| msgid "Unknown"
+msgid "Unknown lock error."
+msgstr "Không rõ"
+
+#: mounthelper/tdeio_media_mounthelper.cpp:211
+msgid "Try to release holders from an unknown medium."
 msgstr ""
 
-#: mounthelper/tdeio_media_mounthelper.cpp:281
-msgid "Unknown decrypt error."
+#: 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 "Không tìm thấy %1."
+
+#: mounthelper/tdeio_media_mounthelper.cpp:310
 #, fuzzy
-msgid "Decrypt given URL"
+msgid "%1 is not a mountable or encrypted media."
+msgstr "%1 không phải là một vật chứa có thể gắn."
+
+#: mounthelper/tdeio_media_mounthelper.cpp:397
+#, fuzzy
+#| msgid "Unknown"
+msgid "Unknown unlock error."
+msgstr "Không rõ"
+
+#: mounthelper/tdeio_media_mounthelper.cpp:410
+#, fuzzy
+#| msgid "Unmount given URL"
+msgid "Mount given URL"
 msgstr "Bỏ gắn URL đưa ra."
 
-#: mounthelper/tdeio_media_mounthelper.cpp:296
+#: mounthelper/tdeio_media_mounthelper.cpp:411
 msgid "Unmount given URL"
 msgstr "Bỏ gắn URL đưa ra."
 
-#: mounthelper/tdeio_media_mounthelper.cpp:297
-msgid "Mount given URL (default)"
-msgstr "Gắn URL đưa ra (mặc định)"
+#: mounthelper/tdeio_media_mounthelper.cpp:412
+#, fuzzy
+#| msgid "Unmount given URL"
+msgid "Unlock given URL"
+msgstr "Bỏ gắn URL đưa ra."
+
+#: mounthelper/tdeio_media_mounthelper.cpp:413
+#, fuzzy
+msgid "Lock given URL"
+msgstr "Bỏ gắn URL đưa ra."
 
-#: mounthelper/tdeio_media_mounthelper.cpp:298
-msgid "Eject given URL via tdeeject"
-msgstr "Đẩy URL chỉ ra bằng tdeeject"
+#: mounthelper/tdeio_media_mounthelper.cpp:414
+#, fuzzy
+msgid "Eject given URL"
+msgstr "Bỏ gắn URL đưa ra."
 
-#: mounthelper/tdeio_media_mounthelper.cpp:299
-msgid "Unmount and Eject given URL (necessary for some USB devices)"
-msgstr "Bỏ gắn và nhả ra URL đã chỉ (cần cho một số thiết bị USB)"
+#: 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 "Địa chỉ URL media:/ để gắn/bỏ gắn/nhả ra/xóa bỏ"
 
 #: propsdlgplugin/propertiespage.cpp:137
@@ -613,7 +693,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,15 @@ msgstr "Đa hệ thống"
 msgid "Filesystem: iso9660"
 msgstr "Hệ thống tập tin: iso9660"
 
+#~ msgid "Mount given URL (default)"
+#~ msgstr "Gắn URL đưa ra (mặc định)"
+
+#~ msgid "Eject given URL via tdeeject"
+#~ msgstr "Đẩy URL chỉ ra bằng tdeeject"
+
+#~ msgid "Unmount and Eject given URL (necessary for some USB devices)"
+#~ msgstr "Bỏ gắn và nhả ra URL đã chỉ (cần cho một số thiết bị USB)"
+
 #, fuzzy
 #~ msgid "Permission denied"
 #~ msgstr "Quyền bị từ chối"
diff --git a/tde-i18n-zh_CN/messages/tdebase/tdeio_media.po b/tde-i18n-zh_CN/messages/tdebase/tdeio_media.po
index be8a7d3fbb0..e5b6fc2a423 100644
--- a/tde-i18n-zh_CN/messages/tdebase/tdeio_media.po
+++ b/tde-i18n-zh_CN/messages/tdebase/tdeio_media.po
@@ -4,7 +4,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: 2005-08-09 13:07+0800\n"
 "Last-Translator: Funda Wang <fundawang@linux.net.cn>\n"
 "Language-Team: zh_CN <i18n-translation@lists.linux.net.cn>\n"
@@ -41,27 +41,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 ""
 
@@ -74,106 +73,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 "CD 刻录机"
 
-#: mediamanager/fstabbackend.cpp:414
+#: mediamanager/fstabbackend.cpp:422
 msgid "DVD"
 msgstr "DVD"
 
-#: mediamanager/fstabbackend.cpp:427
+#: mediamanager/fstabbackend.cpp:435
 msgid "CD-ROM"
 msgstr "CD-ROM"
 
-#: 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 "
@@ -182,225 +182,273 @@ 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. "
 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 "CD-ROM"
 
-#: 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 "CD-ROM"
 
-#: mediamanager/tdehardwarebackend.cpp:682
+#: mediamanager/tdehardwarebackend.cpp:702
 #, fuzzy
 msgid "Blank BLURAY-R"
 msgstr "CD-ROM"
 
-#: 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. "
@@ -410,63 +458,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:148
+msgid "Try to lock an unknown medium."
+msgstr ""
+
+#: mounthelper/tdeio_media_mounthelper.cpp:173
+#, fuzzy
+#| msgid "Unknown"
+msgid "Unknown lock error."
+msgstr "未知"
 
-#: mounthelper/tdeio_media_mounthelper.cpp:248
-msgid "The device was successfully unmounted, but could not be ejected"
-msgstr "设备已经成功卸载，但尚未弹出"
+#: mounthelper/tdeio_media_mounthelper.cpp:211
+msgid "Try to release holders from an unknown medium."
+msgstr ""
 
-#: mounthelper/tdeio_media_mounthelper.cpp:281
-msgid "Unknown decrypt error."
+#: 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 "Decrypt given URL"
+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 "Unmount given URL"
+msgid "Mount given URL"
 msgstr "卸载给出的 URL"
 
-#: mounthelper/tdeio_media_mounthelper.cpp:296
+#: mounthelper/tdeio_media_mounthelper.cpp:411
 msgid "Unmount given URL"
 msgstr "卸载给出的 URL"
 
-#: mounthelper/tdeio_media_mounthelper.cpp:297
-msgid "Mount given URL (default)"
-msgstr "挂载给定的 URL(默认)"
+#: mounthelper/tdeio_media_mounthelper.cpp:412
+#, fuzzy
+#| msgid "Unmount given URL"
+msgid "Unlock given URL"
+msgstr "卸载给出的 URL"
 
-#: mounthelper/tdeio_media_mounthelper.cpp:298
-msgid "Eject given URL via tdeeject"
-msgstr "通过 tdeeject 弹出给定 URL"
+#: mounthelper/tdeio_media_mounthelper.cpp:413
+#, fuzzy
+msgid "Lock given URL"
+msgstr "卸载给出的 URL"
 
-#: 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 "卸载给出的 URL"
 
-#: mounthelper/tdeio_media_mounthelper.cpp:300
-msgid "media:/ URL to mount/unmount/eject/remove"
+#: mounthelper/tdeio_media_mounthelper.cpp:415
+msgid "Safely remove (unmount and eject) given URL"
+msgstr ""
+
+#: 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:/ URL"
 
 #: propsdlgplugin/propertiespage.cpp:137
@@ -615,7 +695,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
@@ -866,6 +946,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 "挂载给定的 URL(默认)"
+
+#~ msgid "Eject given URL via tdeeject"
+#~ msgstr "通过 tdeeject 弹出给定 URL"
+
+#~ msgid "Unmount and Eject given URL (necessary for some USB devices)"
+#~ msgstr "卸载并弹出给定的 URL(某些 USB 设备需要)"
+
 #, fuzzy
 #~ msgid "Permission denied"
 #~ msgstr "拒绝许可权限"
diff --git a/tde-i18n-zh_TW/messages/tdebase/tdeio_media.po b/tde-i18n-zh_TW/messages/tdebase/tdeio_media.po
index d40317a9517..4f1b65e4546 100644
--- a/tde-i18n-zh_TW/messages/tdebase/tdeio_media.po
+++ b/tde-i18n-zh_TW/messages/tdebase/tdeio_media.po
@@ -7,7 +7,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-11-26 15:09+0800\n"
 "Last-Translator: Chih-Wei Huang <cwhuang@linux.org.tw>\n"
 "Language-Team: Chinese Traditional <zh-l10n@linux.org.tw>\n"
@@ -45,27 +45,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 ""
 
@@ -78,103 +77,104 @@ 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 "DVD-ROM"
 
-#: 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
 msgid "Unknown Drive"
 msgstr "不明磁碟機"
 
-#: mediamanager/halbackend.cpp:780 mediamanager/tdehardwarebackend.cpp:839
+#: mediamanager/halbackend.cpp:794 mediamanager/tdehardwarebackend.cpp:872
 msgid "Floppy Drive"
 msgstr "軟碟機"
 
-#: mediamanager/halbackend.cpp:788
+#: mediamanager/halbackend.cpp:802
 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 "
@@ -183,225 +183,273 @@ 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. "
 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 "卸載時發生以下錯誤："
 
-#: 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. "
@@ -411,63 +459,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 "卸載指定的URL位置"
 
-#: mounthelper/tdeio_media_mounthelper.cpp:296
+#: mounthelper/tdeio_media_mounthelper.cpp:411
 msgid "Unmount given URL"
 msgstr "卸載指定的URL位置"
 
-#: mounthelper/tdeio_media_mounthelper.cpp:297
-msgid "Mount given URL (default)"
-msgstr "掛載指定的URL位置(預設)"
+#: mounthelper/tdeio_media_mounthelper.cpp:412
+#, fuzzy
+#| msgid "Unmount given URL"
+msgid "Unlock given URL"
+msgstr "卸載指定的URL位置"
 
-#: mounthelper/tdeio_media_mounthelper.cpp:298
-msgid "Eject given URL via tdeeject"
-msgstr "以tdeeject退出指定的URL位置"
+#: mounthelper/tdeio_media_mounthelper.cpp:413
+#, fuzzy
+msgid "Lock given URL"
+msgstr "卸載指定的URL位置"
 
-#: 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 "卸載指定的URL位置"
+
+#: 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:/ URL"
 
 #: propsdlgplugin/propertiespage.cpp:137
@@ -616,7 +696,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
@@ -864,6 +944,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 "掛載指定的URL位置(預設)"
+
+#~ msgid "Eject given URL via tdeeject"
+#~ msgstr "以tdeeject退出指定的URL位置"
+
+#~ msgid "Unmount and Eject given URL (necessary for some USB devices)"
+#~ msgstr "卸載及跳出指定的URL位置（某些USB裝置需要這樣做）"
+
 #, fuzzy
 #~ msgid "Permission denied"
 #~ msgstr "權限被拒"
-- 
cgit v1.2.3