summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTDE Weblate <weblate@mirror.git.trinitydesktop.org>2019-07-11 01:03:05 +0000
committerTDE Weblate <weblate@mirror.git.trinitydesktop.org>2019-07-11 01:03:05 +0000
commit69ef6f4d9bfae6a432127213cc83f93d0ebe0f28 (patch)
tree1c9eded9d377ca531d4f9bd476137dca3c019f46
parentc825ee5ee804ef1ce7b32b5c1ba5ec4925335f43 (diff)
downloadtde-i18n-69ef6f4d9bfae6a432127213cc83f93d0ebe0f28.tar.gz
tde-i18n-69ef6f4d9bfae6a432127213cc83f93d0ebe0f28.zip
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/
-rw-r--r--tde-i18n-af/messages/tdebase/tdeio_media.po282
-rw-r--r--tde-i18n-ar/messages/tdebase/tdeio_media.po282
-rw-r--r--tde-i18n-az/messages/tdebase/tdeio_media.po287
-rw-r--r--tde-i18n-be/messages/tdebase/tdeio_media.po282
-rw-r--r--tde-i18n-bg/messages/tdebase/tdeio_media.po297
-rw-r--r--tde-i18n-bn/messages/tdebase/tdeio_media.po282
-rw-r--r--tde-i18n-br/messages/tdebase/tdeio_media.po290
-rw-r--r--tde-i18n-bs/messages/tdebase/tdeio_media.po282
-rw-r--r--tde-i18n-ca/messages/tdebase/tdeio_media.po297
-rw-r--r--tde-i18n-cs/messages/tdebase/tdeio_media.po297
-rw-r--r--tde-i18n-csb/messages/tdebase/tdeio_media.po297
-rw-r--r--tde-i18n-cy/messages/tdebase/tdeio_media.po295
-rw-r--r--tde-i18n-da/messages/tdebase/tdeio_media.po297
-rw-r--r--tde-i18n-de/messages/tdebase/tdeio_media.po351
-rw-r--r--tde-i18n-el/messages/tdebase/tdeio_media.po297
-rw-r--r--tde-i18n-en_GB/messages/tdebase/tdeio_media.po282
-rw-r--r--tde-i18n-eo/messages/tdebase/tdeio_media.po297
-rw-r--r--tde-i18n-es/messages/tdebase/tdeio_media.po297
-rw-r--r--tde-i18n-et/messages/tdebase/tdeio_media.po297
-rw-r--r--tde-i18n-eu/messages/tdebase/tdeio_media.po282
-rw-r--r--tde-i18n-fa/messages/tdebase/tdeio_media.po297
-rw-r--r--tde-i18n-fi/messages/tdebase/tdeio_media.po297
-rw-r--r--tde-i18n-fr/messages/tdebase/tdeio_media.po304
-rw-r--r--tde-i18n-fy/messages/tdebase/tdeio_media.po297
-rw-r--r--tde-i18n-ga/messages/tdebase/tdeio_media.po290
-rw-r--r--tde-i18n-gl/messages/tdebase/tdeio_media.po282
-rw-r--r--tde-i18n-he/messages/tdebase/tdeio_media.po290
-rw-r--r--tde-i18n-hi/messages/tdebase/tdeio_media.po280
-rw-r--r--tde-i18n-hr/messages/tdebase/tdeio_media.po287
-rw-r--r--tde-i18n-hu/messages/tdebase/tdeio_media.po297
-rw-r--r--tde-i18n-is/messages/tdebase/tdeio_media.po297
-rw-r--r--tde-i18n-it/messages/tdebase/tdeio_media.po297
-rw-r--r--tde-i18n-ja/messages/tdebase/tdeio_media.po297
-rw-r--r--tde-i18n-kk/messages/tdebase/tdeio_media.po282
-rw-r--r--tde-i18n-km/messages/tdebase/tdeio_media.po297
-rw-r--r--tde-i18n-ko/messages/tdebase/tdeio_media.po282
-rw-r--r--tde-i18n-lt/messages/tdebase/tdeio_media.po290
-rw-r--r--tde-i18n-mk/messages/tdebase/tdeio_media.po297
-rw-r--r--tde-i18n-mn/messages/tdebase/tdeio_media.po287
-rw-r--r--tde-i18n-ms/messages/tdebase/tdeio_media.po296
-rw-r--r--tde-i18n-nb/messages/tdebase/tdeio_media.po297
-rw-r--r--tde-i18n-nds/messages/tdebase/tdeio_media.po297
-rw-r--r--tde-i18n-nl/messages/tdebase/tdeio_media.po297
-rw-r--r--tde-i18n-nn/messages/tdebase/tdeio_media.po297
-rw-r--r--tde-i18n-pa/messages/tdebase/tdeio_media.po297
-rw-r--r--tde-i18n-pl/messages/tdebase/tdeio_media.po329
-rw-r--r--tde-i18n-pt/messages/tdebase/tdeio_media.po297
-rw-r--r--tde-i18n-pt_BR/messages/tdebase/tdeio_media.po297
-rw-r--r--tde-i18n-ro/messages/tdebase/tdeio_media.po287
-rw-r--r--tde-i18n-ru/messages/tdebase/tdeio_media.po308
-rw-r--r--tde-i18n-rw/messages/tdebase/tdeio_media.po282
-rw-r--r--tde-i18n-se/messages/tdebase/tdeio_media.po282
-rw-r--r--tde-i18n-sk/messages/tdebase/tdeio_media.po297
-rw-r--r--tde-i18n-sl/messages/tdebase/tdeio_media.po297
-rw-r--r--tde-i18n-sr/messages/tdebase/tdeio_media.po297
-rw-r--r--tde-i18n-sr@Latn/messages/tdebase/tdeio_media.po297
-rw-r--r--tde-i18n-ss/messages/tdebase/tdeio_media.po287
-rw-r--r--tde-i18n-sv/messages/tdebase/tdeio_media.po297
-rw-r--r--tde-i18n-ta/messages/tdebase/tdeio_media.po280
-rw-r--r--tde-i18n-te/messages/tdebase/tdeio_media.po290
-rw-r--r--tde-i18n-tg/messages/tdebase/tdeio_media.po282
-rw-r--r--tde-i18n-th/messages/tdebase/tdeio_media.po297
-rw-r--r--tde-i18n-tr/messages/tdebase/tdeio_media.po297
-rw-r--r--tde-i18n-uk/messages/tdebase/tdeio_media.po308
-rw-r--r--tde-i18n-uz/messages/tdebase/tdeio_media.po297
-rw-r--r--tde-i18n-uz@cyrillic/messages/tdebase/tdeio_media.po297
-rw-r--r--tde-i18n-vi/messages/tdebase/tdeio_media.po297
-rw-r--r--tde-i18n-zh_CN/messages/tdebase/tdeio_media.po297
-rw-r--r--tde-i18n-zh_TW/messages/tdebase/tdeio_media.po297
69 files changed, 10992 insertions, 9299 deletions
diff --git a/tde-i18n-af/messages/tdebase/tdeio_media.po b/tde-i18n-af/messages/tdebase/tdeio_media.po
index c0c819e9c64..77bdd85c61e 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: 2019-01-13 18:47+0100\n"
+"POT-Creation-Date: 2019-07-11 02:33+0200\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"
@@ -46,7 +46,6 @@ 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
-#: mounthelper/tdeio_media_mounthelper.cpp:256
msgid "The TDE mediamanager is not running."
msgstr "Die TDE mediabestuur hardloop nie"
@@ -54,7 +53,7 @@ msgstr "Die TDE mediabestuur hardloop nie"
msgid "This media name already exists."
msgstr "Hierdie media naam bestaan reeds."
-#: mediaimpl.cpp:230 mediaimpl.cpp:293
+#: mediaimpl.cpp:230 mediaimpl.cpp:297
msgid "No such medium."
msgstr ""
@@ -62,320 +61,328 @@ msgstr ""
msgid "The drive is encrypted."
msgstr ""
-#: mediaimpl.cpp:272 mediamanager/halbackend.cpp:1264
-#: mediamanager/halbackend.cpp:1273 mediamanager/halbackend.cpp:1663
-#: mediamanager/halbackend.cpp:1680 mediamanager/halbackend.cpp:1691
-#: mediamanager/halbackend.cpp:1793 mediamanager/halbackend.cpp:1801
-#: mediamanager/halbackend.cpp:1808 mediamanager/halbackend.cpp:1848
-#: mediamanager/halbackend.cpp:1854 mediamanager/halbackend.cpp:1861
-#: mounthelper/tdeio_media_mounthelper.cpp:58
-msgid "Internal Error"
+#: mediaimpl.cpp:274 mediamanager/tdehardwarebackend.cpp:201
+#: mediamanager/tdehardwarebackend.cpp:252
+#: mounthelper/tdeio_media_mounthelper.cpp:202
+msgid "Unknown mount error."
msgstr ""
#: mediamanager/dialog.cpp:26 mounthelper/dialog.cpp:26
-msgid "Decrypt"
+msgid "Unlock"
msgstr ""
-#: mediamanager/fstabbackend.cpp:104 mediamanager/fstabbackend.cpp:114
-#: mediamanager/halbackend.cpp:1595 mediamanager/halbackend.cpp:1617
-#: mediamanager/halbackend.cpp:1776 mediamanager/halbackend.cpp:1831
-#: mediamanager/tdehardwarebackend.cpp:1349
-#: mediamanager/tdehardwarebackend.cpp:1360
+#: mediamanager/fstabbackend.cpp:105 mediamanager/fstabbackend.cpp:120
+#: mediamanager/halbackend.cpp:1598 mediamanager/halbackend.cpp:1625
+#: mediamanager/halbackend.cpp:1808 mediamanager/halbackend.cpp:1877
+#: mediamanager/mediamanager.cpp:363 mediamanager/mediamanager.cpp:375
+#: mediamanager/mediamanager.cpp:387 mediamanager/mediamanager.cpp:399
+#: mediamanager/tdehardwarebackend.cpp:1363
+#: mediamanager/tdehardwarebackend.cpp:1378
#, c-format
msgid "No such medium: %1"
msgstr ""
-#: mediamanager/fstabbackend.cpp:398
+#: mediamanager/fstabbackend.cpp:408
msgid "CD Recorder"
msgstr "CD Opnemer"
-#: mediamanager/fstabbackend.cpp:404
+#: mediamanager/fstabbackend.cpp:414
msgid "DVD"
msgstr "DVD"
-#: mediamanager/fstabbackend.cpp:415
+#: mediamanager/fstabbackend.cpp:425
msgid "CD-ROM"
msgstr "CD-ROM"
-#: mediamanager/fstabbackend.cpp:428
+#: mediamanager/fstabbackend.cpp:438
msgid "Floppy"
msgstr "Sagteskyf"
-#: mediamanager/fstabbackend.cpp:436
+#: mediamanager/fstabbackend.cpp:446
msgid "Zip Disk"
msgstr "Zip Skyf"
-#: mediamanager/fstabbackend.cpp:447
+#: mediamanager/fstabbackend.cpp:457
msgid "Removable Device"
msgstr "Verwyderbare Toestel"
-#: mediamanager/fstabbackend.cpp:452 mediamanager/fstabbackend.cpp:458
+#: mediamanager/fstabbackend.cpp:462 mediamanager/fstabbackend.cpp:468
msgid "Remote Share"
msgstr "Verder weg Deel"
-#: mediamanager/fstabbackend.cpp:463
+#: mediamanager/fstabbackend.cpp:473
msgid "Hard Disk"
msgstr "Harde Skyf"
-#: mediamanager/halbackend.cpp:749 mediamanager/tdehardwarebackend.cpp:805
+#: mediamanager/halbackend.cpp:744 mediamanager/tdehardwarebackend.cpp:808
#, fuzzy
msgid "Unknown Drive"
msgstr "Onbekend"
-#: mediamanager/halbackend.cpp:761 mediamanager/tdehardwarebackend.cpp:835
+#: mediamanager/halbackend.cpp:756 mediamanager/tdehardwarebackend.cpp:838
#, fuzzy
msgid "Floppy Drive"
msgstr "Sagteskyf"
-#: mediamanager/halbackend.cpp:769
+#: mediamanager/halbackend.cpp:764
#, fuzzy
msgid "Zip Drive"
msgstr "Zip Skyf"
-#: mediamanager/halbackend.cpp:839 mediamanager/tdehardwarebackend.cpp:892
+#: mediamanager/halbackend.cpp:834 mediamanager/tdehardwarebackend.cpp:895
msgid "Camera"
msgstr "Kamera"
-#: mediamanager/halbackend.cpp:1221 mediamanager/halbackend.cpp:1247
+#: mediamanager/halbackend.cpp:1216 mediamanager/halbackend.cpp:1242
msgid "Authenticate"
msgstr ""
-#: mediamanager/halbackend.cpp:1222
+#: mediamanager/halbackend.cpp:1217
msgid ""
"<big><b>System policy prevents mounting internal media</b></big><br/"
">Authentication is required to perform this action. Please enter your "
"password to verify."
msgstr ""
-#: mediamanager/halbackend.cpp:1248
+#: mediamanager/halbackend.cpp:1243
msgid ""
"<big><b>System policy prevents unmounting media mounted by other users</b></"
"big><br/>Authentication is required to perform this action. Please enter "
"your password to verify."
msgstr ""
-#: mediamanager/halbackend.cpp:1284
+#: mediamanager/halbackend.cpp:1259 mediamanager/halbackend.cpp:1268
+#: mediamanager/halbackend.cpp:1849 mediamanager/halbackend.cpp:1916
+#: mounthelper/tdeio_media_mounthelper.cpp:58
+msgid "Internal Error"
+msgstr ""
+
+#: mediamanager/halbackend.cpp:1279
msgid "Invalid filesystem type"
msgstr ""
-#: mediamanager/halbackend.cpp:1286
+#: mediamanager/halbackend.cpp:1281
msgid ""
"Permission denied<p>Please ensure that:<br>1. You have permission to access "
"this device.<br>2. This device node is not listed in /etc/fstab.</p>"
msgstr ""
-#: mediamanager/halbackend.cpp:1290
+#: mediamanager/halbackend.cpp:1285
msgid "Device is already mounted."
msgstr ""
-#: mediamanager/halbackend.cpp:1340
+#: mediamanager/halbackend.cpp:1335
msgid ""
"Moreover, programs still using the device have been detected. They are "
"listed below. You have to close them or change their working directory "
"before attempting to unmount the device again."
msgstr ""
-#: mediamanager/halbackend.cpp:1381 mediamanager/tdehardwarebackend.cpp:1588
+#: mediamanager/halbackend.cpp:1376 mediamanager/tdehardwarebackend.cpp:1618
msgid ""
"Programs that were still using the device have been forcibly terminated. "
"They are listed below."
msgstr ""
-#: mediamanager/halbackend.cpp:1402 mediamanager/halbackend.cpp:1715
-#: mediamanager/tdehardwarebackend.cpp:1406
-#: mediamanager/tdehardwarebackend.cpp:1424
-#: mediamanager/tdehardwarebackend.cpp:1464
+#: mediamanager/halbackend.cpp:1397 mediamanager/halbackend.cpp:1742
+#: mediamanager/tdehardwarebackend.cpp:1430
+#: mediamanager/tdehardwarebackend.cpp:1452
+#: mediamanager/tdehardwarebackend.cpp:1494
msgid ""
"Unfortunately, the device <b>%1</b> (%2) named <b>'%3'</b> and currently "
"mounted at <b>%4</b> could not be unmounted. "
msgstr ""
-#: mediamanager/halbackend.cpp:1408 mediamanager/tdehardwarebackend.cpp:1470
+#: mediamanager/halbackend.cpp:1403 mediamanager/tdehardwarebackend.cpp:1500
msgid "The following error was returned by umount command:"
msgstr ""
-#: mediamanager/halbackend.cpp:1478
-msgid "Permission denied"
+#: mediamanager/halbackend.cpp:1567 mediamanager/tdehardwarebackend.cpp:1322
+msgid "Cannot mount encrypted locked drives!"
msgstr ""
-#: mediamanager/halbackend.cpp:1562 mediamanager/tdehardwarebackend.cpp:1232
-msgid "Cannot mount encrypted drives!"
+#: mediamanager/halbackend.cpp:1682 mediamanager/halbackend.cpp:1703
+#: mediamanager/halbackend.cpp:1716 mediamanager/halbackend.cpp:1830
+#: mediamanager/halbackend.cpp:1840 mediamanager/halbackend.cpp:1899
+#: mediamanager/halbackend.cpp:1907
+msgid "Internal error"
msgstr ""
-#: mediamanager/halbackend.cpp:1721
+#: mediamanager/halbackend.cpp:1694
+#, fuzzy
+#| msgid "Unknown"
+msgid "Unknown error"
+msgstr "Onbekend"
+
+#: mediamanager/halbackend.cpp:1748
msgid "Unmounting failed due to the following error:"
msgstr ""
-#: mediamanager/halbackend.cpp:1723
+#: mediamanager/halbackend.cpp:1750
msgid "Device is Busy:"
msgstr ""
-#: mediamanager/halbackend.cpp:1727
+#: mediamanager/halbackend.cpp:1754
msgid ""
"Permission denied<p>Please ensure that:<br>1. You have permission to access "
"this device.<br>2. This device was originally mounted using TDE.</p>"
msgstr ""
-#: mediamanager/halbackend.cpp:1739
+#: mediamanager/halbackend.cpp:1766
msgid ""
"%1<p><b>Would you like to forcibly terminate these processes?</b><br><i>All "
"unsaved data would be lost</i>"
msgstr ""
-#: mediamanager/halbackend.cpp:1811
+#: mediamanager/halbackend.cpp:1852
msgid "Wrong password"
msgstr ""
-#: mediamanager/mediamanager.cpp:247 mediamanager/mediamanager.cpp:266
-#: mediamanager/mediamanager.cpp:285 mediamanager/mediamanager.cpp:293
-#: mediamanager/mediamanager.cpp:302 mediamanager/mediamanager.cpp:310
-msgid "Feature only available with HAL"
+#: mediamanager/mediamanager.cpp:248 mediamanager/mediamanager.cpp:275
+msgid "Feature only available with the TDE hardware backend"
msgstr ""
-#: mediamanager/mediamanager.cpp:252
-msgid "Feature only available with the TDE hardware backend"
+#: mediamanager/mediamanager.cpp:255 mediamanager/mediamanager.cpp:282
+#: mediamanager/mediamanager.cpp:312 mediamanager/mediamanager.cpp:343
+msgid "Feature only available with HAL"
msgstr ""
-#: mediamanager/mediamanager.cpp:256 mediamanager/mediamanager.cpp:271
-#: mediamanager/mediamanager.cpp:275
+#: mediamanager/mediamanager.cpp:262 mediamanager/mediamanager.cpp:289
+#: mediamanager/mediamanager.cpp:320 mediamanager/mediamanager.cpp:350
msgid "Feature only available with HAL or TDE hardware backend"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:480
-#: mediamanager/tdehardwarebackend.cpp:517
-#: mediamanager/tdehardwarebackend.cpp:750
+#: mediamanager/tdehardwarebackend.cpp:483
+#: mediamanager/tdehardwarebackend.cpp:520
+#: mediamanager/tdehardwarebackend.cpp:753
#, fuzzy
msgid "%1 Removable Device"
msgstr "Verwyderbare Toestel"
-#: mediamanager/tdehardwarebackend.cpp:525
+#: mediamanager/tdehardwarebackend.cpp:528
#, fuzzy
msgid "Blank CD-ROM"
msgstr "CD-ROM"
-#: mediamanager/tdehardwarebackend.cpp:534
+#: mediamanager/tdehardwarebackend.cpp:537
msgid "Blank CD-R"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:543
+#: mediamanager/tdehardwarebackend.cpp:546
msgid "Blank CD-RW"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:552
+#: mediamanager/tdehardwarebackend.cpp:555
msgid "Blank Magneto-Optical CD"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:561
+#: mediamanager/tdehardwarebackend.cpp:564
msgid "Blank Mount Ranier CD-RW"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:570
+#: mediamanager/tdehardwarebackend.cpp:573
msgid "Blank Mount Ranier CD-RW-W"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:579
+#: mediamanager/tdehardwarebackend.cpp:582
msgid "Blank DVD-ROM"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:588
+#: mediamanager/tdehardwarebackend.cpp:591
msgid "Blank DVD-RAM"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:597
+#: mediamanager/tdehardwarebackend.cpp:600
msgid "Blank DVD-R"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:606
+#: mediamanager/tdehardwarebackend.cpp:609
msgid "Blank DVD-RW"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:615
+#: mediamanager/tdehardwarebackend.cpp:618
msgid "Blank Dual Layer DVD-R"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:624
+#: mediamanager/tdehardwarebackend.cpp:627
msgid "Blank Dual Layer DVD-RW"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:633
+#: mediamanager/tdehardwarebackend.cpp:636
msgid "Blank DVD+R"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:642
+#: mediamanager/tdehardwarebackend.cpp:645
msgid "Blank DVD+RW"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:651
+#: mediamanager/tdehardwarebackend.cpp:654
msgid "Blank Dual Layer DVD+R"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:660
+#: mediamanager/tdehardwarebackend.cpp:663
msgid "Blank Dual Layer DVD+RW"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:669
+#: mediamanager/tdehardwarebackend.cpp:672
msgid "Blank BD-ROM"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:678
+#: mediamanager/tdehardwarebackend.cpp:681
msgid "Blank BD-R"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:687
+#: mediamanager/tdehardwarebackend.cpp:690
msgid "Blank BD-RW"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:696
+#: mediamanager/tdehardwarebackend.cpp:699
msgid "Blank HDDVD-ROM"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:705
+#: mediamanager/tdehardwarebackend.cpp:708
msgid "Blank HDDVD-R"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:714
+#: mediamanager/tdehardwarebackend.cpp:717
msgid "Blank HDDVD-RW"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:721
+#: mediamanager/tdehardwarebackend.cpp:724
msgid "Audio CD"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:742
+#: mediamanager/tdehardwarebackend.cpp:745
msgid "%1 Fixed Disk (%2)"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:849
+#: mediamanager/tdehardwarebackend.cpp:852
#, fuzzy
msgid "%1 Zip Disk"
msgstr "Zip Skyf"
-#: mediamanager/tdehardwarebackend.cpp:1212
-#: mediamanager/tdehardwarebackend.cpp:1392
-msgid "Internal error"
+#: mediamanager/tdehardwarebackend.cpp:1224
+#: mediamanager/tdehardwarebackend.cpp:1417
+msgid "Internal error. Couldn't find medium."
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:1239
-msgid ""
-"<qt>Unable to mount this device.<p>Potential reasons include:<br>Improper "
-"device and/or user privilege level<br>Corrupt data on storage device"
+#: mediamanager/tdehardwarebackend.cpp:1249
+#: mediamanager/tdehardwarebackend.cpp:1323
+msgid "Unable to mount this device."
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:1241
-#: mediamanager/tdehardwarebackend.cpp:1316
-#: mediamanager/tdehardwarebackend.cpp:1408
-#: mediamanager/tdehardwarebackend.cpp:1426
+#: mediamanager/tdehardwarebackend.cpp:1252
+#: mediamanager/tdehardwarebackend.cpp:1326
+#: mediamanager/tdehardwarebackend.cpp:1435
+#: mediamanager/tdehardwarebackend.cpp:1457
msgid "<p>Technical details:<br>"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:1314
-msgid ""
-"<qt>Unable to mount this device.<p>Potential reasons include:<br>Improper "
-"device and/or user privilege level<br>Corrupt data on storage "
-"device<br>Incorrect encryption password"
+#: mediamanager/tdehardwarebackend.cpp:1284
+msgid "Decryption aborted"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:1420
+#: mediamanager/tdehardwarebackend.cpp:1443
msgid ""
"<qt>The device <b>%1</b> (%2) named <b>'%3'</b> and currently mounted at <b>"
"%4</b> can not be unmounted at this time.<p>%5<p><b>Would you like to "
@@ -383,7 +390,7 @@ msgid ""
"lost</i>"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:1547
+#: mediamanager/tdehardwarebackend.cpp:1577
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 "
@@ -394,7 +401,7 @@ msgstr ""
msgid "%1 cannot be found."
msgstr "%1 kon nie gevind word nie."
-#: mounthelper/tdeio_media_mounthelper.cpp:86
+#: mounthelper/tdeio_media_mounthelper.cpp:87
msgid "%1 is not a mountable media."
msgstr "%1 is nie 'n hegbare media."
@@ -404,39 +411,47 @@ msgid "%1 is not an encrypted media."
msgstr "%1 is nie 'n hegbare media."
#: mounthelper/tdeio_media_mounthelper.cpp:107
-msgid "%1 is already decrypted."
+msgid "%1 is already unlocked."
msgstr ""
-#: mounthelper/tdeio_media_mounthelper.cpp:228
+#: mounthelper/tdeio_media_mounthelper.cpp:139
+msgid "Unknown unmount error."
+msgstr ""
+
+#: mounthelper/tdeio_media_mounthelper.cpp:246
msgid "The device was successfully unmounted, but the tray could not be opened"
msgstr ""
-#: mounthelper/tdeio_media_mounthelper.cpp:230
+#: mounthelper/tdeio_media_mounthelper.cpp:248
msgid "The device was successfully unmounted, but could not be ejected"
msgstr ""
-#: mounthelper/tdeio_media_mounthelper.cpp:275
+#: mounthelper/tdeio_media_mounthelper.cpp:281
+msgid "Unknown decrypt error."
+msgstr ""
+
+#: mounthelper/tdeio_media_mounthelper.cpp:295
#, fuzzy
msgid "Decrypt given URL"
msgstr "Ontheg gegewe Url"
-#: mounthelper/tdeio_media_mounthelper.cpp:276
+#: mounthelper/tdeio_media_mounthelper.cpp:296
msgid "Unmount given URL"
msgstr "Ontheg gegewe Url"
-#: mounthelper/tdeio_media_mounthelper.cpp:277
+#: mounthelper/tdeio_media_mounthelper.cpp:297
msgid "Mount given URL (default)"
msgstr "Heg gegewe Url (verstekwaarde)"
-#: mounthelper/tdeio_media_mounthelper.cpp:278
+#: mounthelper/tdeio_media_mounthelper.cpp:298
msgid "Eject given URL via tdeeject"
msgstr "Haal gegewe URL uit deur tdeuithaal"
-#: mounthelper/tdeio_media_mounthelper.cpp:279
+#: 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:280
+#: mounthelper/tdeio_media_mounthelper.cpp:300
msgid "media:/ URL to mount/unmount/eject/remove"
msgstr "media:/ URL om te heg/ontheg/uithaal/verwyder"
@@ -458,43 +473,43 @@ msgstr ""
msgid "&Mounting"
msgstr "Heg punt"
-#: tdefile-plugin/tdefilemediaplugin.cpp:190
+#: tdefile-plugin/tdefilemediaplugin.cpp:184
msgid "Medium Information"
msgstr "medium Informasie"
-#: tdefile-plugin/tdefilemediaplugin.cpp:193
+#: tdefile-plugin/tdefilemediaplugin.cpp:187
msgid "Free"
msgstr "Gratis"
-#: tdefile-plugin/tdefilemediaplugin.cpp:196
+#: tdefile-plugin/tdefilemediaplugin.cpp:190
msgid "Used"
msgstr "Gebruik"
-#: tdefile-plugin/tdefilemediaplugin.cpp:199
+#: tdefile-plugin/tdefilemediaplugin.cpp:193
msgid "Total"
msgstr "Totaal"
-#: tdefile-plugin/tdefilemediaplugin.cpp:202
+#: tdefile-plugin/tdefilemediaplugin.cpp:196
msgid "Base URL"
msgstr "Basis URL"
-#: tdefile-plugin/tdefilemediaplugin.cpp:203
+#: tdefile-plugin/tdefilemediaplugin.cpp:197
msgid "Mount Point"
msgstr "Heg punt"
-#: tdefile-plugin/tdefilemediaplugin.cpp:204
+#: tdefile-plugin/tdefilemediaplugin.cpp:198
msgid "Device Node"
msgstr "Toestel Node"
-#: tdefile-plugin/tdefilemediaplugin.cpp:206
+#: tdefile-plugin/tdefilemediaplugin.cpp:200
msgid "Medium Summary"
msgstr "Medium Opsomming"
-#: tdefile-plugin/tdefilemediaplugin.cpp:208
+#: tdefile-plugin/tdefilemediaplugin.cpp:202
msgid "Usage"
msgstr "Gebruik"
-#: tdefile-plugin/tdefilemediaplugin.cpp:210
+#: tdefile-plugin/tdefilemediaplugin.cpp:204
msgid "Bar Graph"
msgstr "Bar grafieka"
@@ -566,23 +581,30 @@ msgid ""
"devices are plugged in."
msgstr ""
-#: mediamanager/decryptdialog.ui:24 mounthelper/decryptdialog.ui:24
+#: mediamanager/unlockdialog.ui:24 mounthelper/unlockdialog.ui:24
#, no-c-format
msgid "Decrypting Storage Device"
msgstr ""
-#: mediamanager/decryptdialog.ui:109 mounthelper/decryptdialog.ui:109
+#: mediamanager/unlockdialog.ui:109
#, no-c-format
msgid ""
-"<p><b>%1</b> is an encrypted storage device.</p>\n"
-"<p>Please enter the password to decrypt the storage device.</p>"
+"<p><b>%1</b> is an encrypted locked storage device.</p>\n"
+"<p>Please enter the password to unlock the storage device.</p>"
msgstr ""
-#: mediamanager/decryptdialog.ui:131 mounthelper/decryptdialog.ui:131
+#: mediamanager/unlockdialog.ui:131 mounthelper/unlockdialog.ui:131
#, no-c-format
msgid "&Password:"
msgstr ""
+#: mounthelper/unlockdialog.ui:109
+#, no-c-format
+msgid ""
+"<p><b>%1</b> is an encrypted storage device.</p>\n"
+"<p>Please enter the password to decrypt the storage device.</p>"
+msgstr ""
+
#: propsdlgplugin/propertiespagegui.ui:16
#, no-c-format
msgid "PropertiesPageGUI"
diff --git a/tde-i18n-ar/messages/tdebase/tdeio_media.po b/tde-i18n-ar/messages/tdebase/tdeio_media.po
index 92a9a89fe54..2f7f758fb30 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: 2019-01-13 18:47+0100\n"
+"POT-Creation-Date: 2019-07-11 02:33+0200\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"
@@ -49,7 +49,6 @@ msgstr "غير معروف"
#: mediaimpl.cpp:88 mediaimpl.cpp:115 mediaimpl.cpp:141 mediaimpl.cpp:177
#: mediaimpl.cpp:197 mediaimpl.cpp:218
#: mounthelper/tdeio_media_mounthelper.cpp:50
-#: mounthelper/tdeio_media_mounthelper.cpp:256
msgid "The TDE mediamanager is not running."
msgstr "مسيًر الوسائط TDE غير شغال."
@@ -57,7 +56,7 @@ msgstr "مسيًر الوسائط TDE غير شغال."
msgid "This media name already exists."
msgstr "إسم هذه الوسائط موجود مسبقا."
-#: mediaimpl.cpp:230 mediaimpl.cpp:293
+#: mediaimpl.cpp:230 mediaimpl.cpp:297
msgid "No such medium."
msgstr ""
@@ -65,322 +64,330 @@ msgstr ""
msgid "The drive is encrypted."
msgstr ""
-#: mediaimpl.cpp:272 mediamanager/halbackend.cpp:1264
-#: mediamanager/halbackend.cpp:1273 mediamanager/halbackend.cpp:1663
-#: mediamanager/halbackend.cpp:1680 mediamanager/halbackend.cpp:1691
-#: mediamanager/halbackend.cpp:1793 mediamanager/halbackend.cpp:1801
-#: mediamanager/halbackend.cpp:1808 mediamanager/halbackend.cpp:1848
-#: mediamanager/halbackend.cpp:1854 mediamanager/halbackend.cpp:1861
-#: mounthelper/tdeio_media_mounthelper.cpp:58
-msgid "Internal Error"
+#: mediaimpl.cpp:274 mediamanager/tdehardwarebackend.cpp:201
+#: mediamanager/tdehardwarebackend.cpp:252
+#: mounthelper/tdeio_media_mounthelper.cpp:202
+msgid "Unknown mount error."
msgstr ""
#: mediamanager/dialog.cpp:26 mounthelper/dialog.cpp:26
-msgid "Decrypt"
+msgid "Unlock"
msgstr ""
-#: mediamanager/fstabbackend.cpp:104 mediamanager/fstabbackend.cpp:114
-#: mediamanager/halbackend.cpp:1595 mediamanager/halbackend.cpp:1617
-#: mediamanager/halbackend.cpp:1776 mediamanager/halbackend.cpp:1831
-#: mediamanager/tdehardwarebackend.cpp:1349
-#: mediamanager/tdehardwarebackend.cpp:1360
+#: mediamanager/fstabbackend.cpp:105 mediamanager/fstabbackend.cpp:120
+#: mediamanager/halbackend.cpp:1598 mediamanager/halbackend.cpp:1625
+#: mediamanager/halbackend.cpp:1808 mediamanager/halbackend.cpp:1877
+#: mediamanager/mediamanager.cpp:363 mediamanager/mediamanager.cpp:375
+#: mediamanager/mediamanager.cpp:387 mediamanager/mediamanager.cpp:399
+#: mediamanager/tdehardwarebackend.cpp:1363
+#: mediamanager/tdehardwarebackend.cpp:1378
#, c-format
msgid "No such medium: %1"
msgstr ""
-#: mediamanager/fstabbackend.cpp:398
+#: mediamanager/fstabbackend.cpp:408
msgid "CD Recorder"
msgstr "مسجل أقراص مدمجة"
-#: mediamanager/fstabbackend.cpp:404
+#: mediamanager/fstabbackend.cpp:414
msgid "DVD"
msgstr "قرص رقمي مرئي"
-#: mediamanager/fstabbackend.cpp:415
+#: mediamanager/fstabbackend.cpp:425
msgid "CD-ROM"
msgstr "قرص مدمج CD-ROM"
-#: mediamanager/fstabbackend.cpp:428
+#: mediamanager/fstabbackend.cpp:438
msgid "Floppy"
msgstr "قرص مرن"
-#: mediamanager/fstabbackend.cpp:436
+#: mediamanager/fstabbackend.cpp:446
msgid "Zip Disk"
msgstr "قرص Zip"
-#: mediamanager/fstabbackend.cpp:447
+#: mediamanager/fstabbackend.cpp:457
msgid "Removable Device"
msgstr "جهاز قابل للازالة"
-#: mediamanager/fstabbackend.cpp:452 mediamanager/fstabbackend.cpp:458
+#: mediamanager/fstabbackend.cpp:462 mediamanager/fstabbackend.cpp:468
msgid "Remote Share"
msgstr "مشاركة بعيدة"
-#: mediamanager/fstabbackend.cpp:463
+#: mediamanager/fstabbackend.cpp:473
#, fuzzy
msgid "Hard Disk"
msgstr "قرص صلب"
-#: mediamanager/halbackend.cpp:749 mediamanager/tdehardwarebackend.cpp:805
+#: mediamanager/halbackend.cpp:744 mediamanager/tdehardwarebackend.cpp:808
#, fuzzy
msgid "Unknown Drive"
msgstr "غير معروف"
-#: mediamanager/halbackend.cpp:761 mediamanager/tdehardwarebackend.cpp:835
+#: mediamanager/halbackend.cpp:756 mediamanager/tdehardwarebackend.cpp:838
#, fuzzy
msgid "Floppy Drive"
msgstr "قرص مرن"
-#: mediamanager/halbackend.cpp:769
+#: mediamanager/halbackend.cpp:764
#, fuzzy
msgid "Zip Drive"
msgstr "قرص Zip"
-#: mediamanager/halbackend.cpp:839 mediamanager/tdehardwarebackend.cpp:892
+#: mediamanager/halbackend.cpp:834 mediamanager/tdehardwarebackend.cpp:895
msgid "Camera"
msgstr "آلة تصوير"
-#: mediamanager/halbackend.cpp:1221 mediamanager/halbackend.cpp:1247
+#: mediamanager/halbackend.cpp:1216 mediamanager/halbackend.cpp:1242
msgid "Authenticate"
msgstr ""
-#: mediamanager/halbackend.cpp:1222
+#: mediamanager/halbackend.cpp:1217
msgid ""
"<big><b>System policy prevents mounting internal media</b></big><br/"
">Authentication is required to perform this action. Please enter your "
"password to verify."
msgstr ""
-#: mediamanager/halbackend.cpp:1248
+#: mediamanager/halbackend.cpp:1243
msgid ""
"<big><b>System policy prevents unmounting media mounted by other users</b></"
"big><br/>Authentication is required to perform this action. Please enter "
"your password to verify."
msgstr ""
-#: mediamanager/halbackend.cpp:1284
+#: mediamanager/halbackend.cpp:1259 mediamanager/halbackend.cpp:1268
+#: mediamanager/halbackend.cpp:1849 mediamanager/halbackend.cpp:1916
+#: mounthelper/tdeio_media_mounthelper.cpp:58
+msgid "Internal Error"
+msgstr ""
+
+#: mediamanager/halbackend.cpp:1279
msgid "Invalid filesystem type"
msgstr ""
-#: mediamanager/halbackend.cpp:1286
+#: mediamanager/halbackend.cpp:1281
msgid ""
"Permission denied<p>Please ensure that:<br>1. You have permission to access "
"this device.<br>2. This device node is not listed in /etc/fstab.</p>"
msgstr ""
-#: mediamanager/halbackend.cpp:1290
+#: mediamanager/halbackend.cpp:1285
#, fuzzy
msgid "Device is already mounted."
msgstr "لم يتم تحميل الجهاز"
-#: mediamanager/halbackend.cpp:1340
+#: mediamanager/halbackend.cpp:1335
msgid ""
"Moreover, programs still using the device have been detected. They are "
"listed below. You have to close them or change their working directory "
"before attempting to unmount the device again."
msgstr ""
-#: mediamanager/halbackend.cpp:1381 mediamanager/tdehardwarebackend.cpp:1588
+#: mediamanager/halbackend.cpp:1376 mediamanager/tdehardwarebackend.cpp:1618
msgid ""
"Programs that were still using the device have been forcibly terminated. "
"They are listed below."
msgstr ""
-#: mediamanager/halbackend.cpp:1402 mediamanager/halbackend.cpp:1715
-#: mediamanager/tdehardwarebackend.cpp:1406
-#: mediamanager/tdehardwarebackend.cpp:1424
-#: mediamanager/tdehardwarebackend.cpp:1464
+#: mediamanager/halbackend.cpp:1397 mediamanager/halbackend.cpp:1742
+#: mediamanager/tdehardwarebackend.cpp:1430
+#: mediamanager/tdehardwarebackend.cpp:1452
+#: mediamanager/tdehardwarebackend.cpp:1494
msgid ""
"Unfortunately, the device <b>%1</b> (%2) named <b>'%3'</b> and currently "
"mounted at <b>%4</b> could not be unmounted. "
msgstr ""
-#: mediamanager/halbackend.cpp:1408 mediamanager/tdehardwarebackend.cpp:1470
+#: mediamanager/halbackend.cpp:1403 mediamanager/tdehardwarebackend.cpp:1500
msgid "The following error was returned by umount command:"
msgstr ""
-#: mediamanager/halbackend.cpp:1478
-msgid "Permission denied"
+#: mediamanager/halbackend.cpp:1567 mediamanager/tdehardwarebackend.cpp:1322
+msgid "Cannot mount encrypted locked drives!"
msgstr ""
-#: mediamanager/halbackend.cpp:1562 mediamanager/tdehardwarebackend.cpp:1232
-msgid "Cannot mount encrypted drives!"
+#: mediamanager/halbackend.cpp:1682 mediamanager/halbackend.cpp:1703
+#: mediamanager/halbackend.cpp:1716 mediamanager/halbackend.cpp:1830
+#: mediamanager/halbackend.cpp:1840 mediamanager/halbackend.cpp:1899
+#: mediamanager/halbackend.cpp:1907
+msgid "Internal error"
msgstr ""
-#: mediamanager/halbackend.cpp:1721
+#: mediamanager/halbackend.cpp:1694
+#, fuzzy
+#| msgid "Unknown"
+msgid "Unknown error"
+msgstr "غير معروف"
+
+#: mediamanager/halbackend.cpp:1748
msgid "Unmounting failed due to the following error:"
msgstr ""
-#: mediamanager/halbackend.cpp:1723
+#: mediamanager/halbackend.cpp:1750
msgid "Device is Busy:"
msgstr ""
-#: mediamanager/halbackend.cpp:1727
+#: mediamanager/halbackend.cpp:1754
msgid ""
"Permission denied<p>Please ensure that:<br>1. You have permission to access "
"this device.<br>2. This device was originally mounted using TDE.</p>"
msgstr ""
-#: mediamanager/halbackend.cpp:1739
+#: mediamanager/halbackend.cpp:1766
msgid ""
"%1<p><b>Would you like to forcibly terminate these processes?</b><br><i>All "
"unsaved data would be lost</i>"
msgstr ""
-#: mediamanager/halbackend.cpp:1811
+#: mediamanager/halbackend.cpp:1852
msgid "Wrong password"
msgstr ""
-#: mediamanager/mediamanager.cpp:247 mediamanager/mediamanager.cpp:266
-#: mediamanager/mediamanager.cpp:285 mediamanager/mediamanager.cpp:293
-#: mediamanager/mediamanager.cpp:302 mediamanager/mediamanager.cpp:310
-msgid "Feature only available with HAL"
+#: mediamanager/mediamanager.cpp:248 mediamanager/mediamanager.cpp:275
+msgid "Feature only available with the TDE hardware backend"
msgstr ""
-#: mediamanager/mediamanager.cpp:252
-msgid "Feature only available with the TDE hardware backend"
+#: mediamanager/mediamanager.cpp:255 mediamanager/mediamanager.cpp:282
+#: mediamanager/mediamanager.cpp:312 mediamanager/mediamanager.cpp:343
+msgid "Feature only available with HAL"
msgstr ""
-#: mediamanager/mediamanager.cpp:256 mediamanager/mediamanager.cpp:271
-#: mediamanager/mediamanager.cpp:275
+#: mediamanager/mediamanager.cpp:262 mediamanager/mediamanager.cpp:289
+#: mediamanager/mediamanager.cpp:320 mediamanager/mediamanager.cpp:350
msgid "Feature only available with HAL or TDE hardware backend"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:480
-#: mediamanager/tdehardwarebackend.cpp:517
-#: mediamanager/tdehardwarebackend.cpp:750
+#: mediamanager/tdehardwarebackend.cpp:483
+#: mediamanager/tdehardwarebackend.cpp:520
+#: mediamanager/tdehardwarebackend.cpp:753
#, fuzzy
msgid "%1 Removable Device"
msgstr "جهاز قابل للازالة"
-#: mediamanager/tdehardwarebackend.cpp:525
+#: mediamanager/tdehardwarebackend.cpp:528
#, fuzzy
msgid "Blank CD-ROM"
msgstr "قرص مدمج CD-ROM"
-#: mediamanager/tdehardwarebackend.cpp:534
+#: mediamanager/tdehardwarebackend.cpp:537
msgid "Blank CD-R"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:543
+#: mediamanager/tdehardwarebackend.cpp:546
msgid "Blank CD-RW"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:552
+#: mediamanager/tdehardwarebackend.cpp:555
msgid "Blank Magneto-Optical CD"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:561
+#: mediamanager/tdehardwarebackend.cpp:564
msgid "Blank Mount Ranier CD-RW"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:570
+#: mediamanager/tdehardwarebackend.cpp:573
msgid "Blank Mount Ranier CD-RW-W"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:579
+#: mediamanager/tdehardwarebackend.cpp:582
msgid "Blank DVD-ROM"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:588
+#: mediamanager/tdehardwarebackend.cpp:591
msgid "Blank DVD-RAM"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:597
+#: mediamanager/tdehardwarebackend.cpp:600
msgid "Blank DVD-R"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:606
+#: mediamanager/tdehardwarebackend.cpp:609
msgid "Blank DVD-RW"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:615
+#: mediamanager/tdehardwarebackend.cpp:618
msgid "Blank Dual Layer DVD-R"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:624
+#: mediamanager/tdehardwarebackend.cpp:627
msgid "Blank Dual Layer DVD-RW"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:633
+#: mediamanager/tdehardwarebackend.cpp:636
msgid "Blank DVD+R"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:642
+#: mediamanager/tdehardwarebackend.cpp:645
msgid "Blank DVD+RW"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:651
+#: mediamanager/tdehardwarebackend.cpp:654
msgid "Blank Dual Layer DVD+R"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:660
+#: mediamanager/tdehardwarebackend.cpp:663
msgid "Blank Dual Layer DVD+RW"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:669
+#: mediamanager/tdehardwarebackend.cpp:672
msgid "Blank BD-ROM"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:678
+#: mediamanager/tdehardwarebackend.cpp:681
msgid "Blank BD-R"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:687
+#: mediamanager/tdehardwarebackend.cpp:690
msgid "Blank BD-RW"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:696
+#: mediamanager/tdehardwarebackend.cpp:699
msgid "Blank HDDVD-ROM"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:705
+#: mediamanager/tdehardwarebackend.cpp:708
msgid "Blank HDDVD-R"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:714
+#: mediamanager/tdehardwarebackend.cpp:717
msgid "Blank HDDVD-RW"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:721
+#: mediamanager/tdehardwarebackend.cpp:724
msgid "Audio CD"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:742
+#: mediamanager/tdehardwarebackend.cpp:745
msgid "%1 Fixed Disk (%2)"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:849
+#: mediamanager/tdehardwarebackend.cpp:852
#, fuzzy
msgid "%1 Zip Disk"
msgstr "قرص Zip"
-#: mediamanager/tdehardwarebackend.cpp:1212
-#: mediamanager/tdehardwarebackend.cpp:1392
-msgid "Internal error"
+#: mediamanager/tdehardwarebackend.cpp:1224
+#: mediamanager/tdehardwarebackend.cpp:1417
+msgid "Internal error. Couldn't find medium."
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:1239
-msgid ""
-"<qt>Unable to mount this device.<p>Potential reasons include:<br>Improper "
-"device and/or user privilege level<br>Corrupt data on storage device"
+#: mediamanager/tdehardwarebackend.cpp:1249
+#: mediamanager/tdehardwarebackend.cpp:1323
+msgid "Unable to mount this device."
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:1241
-#: mediamanager/tdehardwarebackend.cpp:1316
-#: mediamanager/tdehardwarebackend.cpp:1408
-#: mediamanager/tdehardwarebackend.cpp:1426
+#: mediamanager/tdehardwarebackend.cpp:1252
+#: mediamanager/tdehardwarebackend.cpp:1326
+#: mediamanager/tdehardwarebackend.cpp:1435
+#: mediamanager/tdehardwarebackend.cpp:1457
msgid "<p>Technical details:<br>"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:1314
-msgid ""
-"<qt>Unable to mount this device.<p>Potential reasons include:<br>Improper "
-"device and/or user privilege level<br>Corrupt data on storage "
-"device<br>Incorrect encryption password"
+#: mediamanager/tdehardwarebackend.cpp:1284
+msgid "Decryption aborted"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:1420
+#: mediamanager/tdehardwarebackend.cpp:1443
msgid ""
"<qt>The device <b>%1</b> (%2) named <b>'%3'</b> and currently mounted at <b>"
"%4</b> can not be unmounted at this time.<p>%5<p><b>Would you like to "
@@ -388,7 +395,7 @@ msgid ""
"lost</i>"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:1547
+#: mediamanager/tdehardwarebackend.cpp:1577
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 "
@@ -399,7 +406,7 @@ msgstr ""
msgid "%1 cannot be found."
msgstr "لا يمكن العثور على %1."
-#: mounthelper/tdeio_media_mounthelper.cpp:86
+#: mounthelper/tdeio_media_mounthelper.cpp:87
msgid "%1 is not a mountable media."
msgstr "الوسائط %1 ليست قابلة للتركيب."
@@ -410,39 +417,47 @@ msgstr "الوسائط %1 ليست قابلة للتركيب."
#: mounthelper/tdeio_media_mounthelper.cpp:107
#, fuzzy
-msgid "%1 is already decrypted."
+msgid "%1 is already unlocked."
msgstr "لم يتم تحميل الجهاز"
-#: mounthelper/tdeio_media_mounthelper.cpp:228
+#: mounthelper/tdeio_media_mounthelper.cpp:139
+msgid "Unknown unmount error."
+msgstr ""
+
+#: mounthelper/tdeio_media_mounthelper.cpp:246
msgid "The device was successfully unmounted, but the tray could not be opened"
msgstr ""
-#: mounthelper/tdeio_media_mounthelper.cpp:230
+#: mounthelper/tdeio_media_mounthelper.cpp:248
msgid "The device was successfully unmounted, but could not be ejected"
msgstr ""
-#: mounthelper/tdeio_media_mounthelper.cpp:275
+#: mounthelper/tdeio_media_mounthelper.cpp:281
+msgid "Unknown decrypt error."
+msgstr ""
+
+#: mounthelper/tdeio_media_mounthelper.cpp:295
#, fuzzy
msgid "Decrypt given URL"
msgstr "ألغي تركيب عنوان المورد المعطى"
-#: mounthelper/tdeio_media_mounthelper.cpp:276
+#: mounthelper/tdeio_media_mounthelper.cpp:296
msgid "Unmount given URL"
msgstr "ألغي تركيب عنوان المورد المعطى"
-#: mounthelper/tdeio_media_mounthelper.cpp:277
+#: mounthelper/tdeio_media_mounthelper.cpp:297
msgid "Mount given URL (default)"
msgstr "ركّب عنوان المورد المعطى ( الإفتراضي )"
-#: mounthelper/tdeio_media_mounthelper.cpp:278
+#: mounthelper/tdeio_media_mounthelper.cpp:298
msgid "Eject given URL via tdeeject"
msgstr "أقذف عنوان المورد المحدد بواسطة tdeeject"
-#: mounthelper/tdeio_media_mounthelper.cpp:279
+#: mounthelper/tdeio_media_mounthelper.cpp:299
msgid "Unmount and Eject given URL (necessary for some USB devices)"
msgstr "أقذف و ألغي التركيب لعنوان المورد المحدد (ضروري لبعض أجهزة الـ USB )"
-#: mounthelper/tdeio_media_mounthelper.cpp:280
+#: mounthelper/tdeio_media_mounthelper.cpp:300
msgid "media:/ URL to mount/unmount/eject/remove"
msgstr "media:/ URL اللتي تريد تركيبها/الغاء تركيبها/قذفها/حذفها"
@@ -464,43 +479,43 @@ msgstr ""
msgid "&Mounting"
msgstr "نقطة التركيب"
-#: tdefile-plugin/tdefilemediaplugin.cpp:190
+#: tdefile-plugin/tdefilemediaplugin.cpp:184
msgid "Medium Information"
msgstr "معلومات عن الوسيطة"
-#: tdefile-plugin/tdefilemediaplugin.cpp:193
+#: tdefile-plugin/tdefilemediaplugin.cpp:187
msgid "Free"
msgstr "الحجم الفارغ"
-#: tdefile-plugin/tdefilemediaplugin.cpp:196
+#: tdefile-plugin/tdefilemediaplugin.cpp:190
msgid "Used"
msgstr "المُستعمل"
-#: tdefile-plugin/tdefilemediaplugin.cpp:199
+#: tdefile-plugin/tdefilemediaplugin.cpp:193
msgid "Total"
msgstr "المجموع"
-#: tdefile-plugin/tdefilemediaplugin.cpp:202
+#: tdefile-plugin/tdefilemediaplugin.cpp:196
msgid "Base URL"
msgstr "عنوان المورد الأساسي"
-#: tdefile-plugin/tdefilemediaplugin.cpp:203
+#: tdefile-plugin/tdefilemediaplugin.cpp:197
msgid "Mount Point"
msgstr "نقطة التركيب"
-#: tdefile-plugin/tdefilemediaplugin.cpp:204
+#: tdefile-plugin/tdefilemediaplugin.cpp:198
msgid "Device Node"
msgstr "عقدة تركيب الجهاز"
-#: tdefile-plugin/tdefilemediaplugin.cpp:206
+#: tdefile-plugin/tdefilemediaplugin.cpp:200
msgid "Medium Summary"
msgstr "ملخًص الوسيطة"
-#: tdefile-plugin/tdefilemediaplugin.cpp:208
+#: tdefile-plugin/tdefilemediaplugin.cpp:202
msgid "Usage"
msgstr "الإستعمال"
-#: tdefile-plugin/tdefilemediaplugin.cpp:210
+#: tdefile-plugin/tdefilemediaplugin.cpp:204
msgid "Bar Graph"
msgstr ""
@@ -572,23 +587,30 @@ msgid ""
"devices are plugged in."
msgstr ""
-#: mediamanager/decryptdialog.ui:24 mounthelper/decryptdialog.ui:24
+#: mediamanager/unlockdialog.ui:24 mounthelper/unlockdialog.ui:24
#, no-c-format
msgid "Decrypting Storage Device"
msgstr ""
-#: mediamanager/decryptdialog.ui:109 mounthelper/decryptdialog.ui:109
+#: mediamanager/unlockdialog.ui:109
#, no-c-format
msgid ""
-"<p><b>%1</b> is an encrypted storage device.</p>\n"
-"<p>Please enter the password to decrypt the storage device.</p>"
+"<p><b>%1</b> is an encrypted locked storage device.</p>\n"
+"<p>Please enter the password to unlock the storage device.</p>"
msgstr ""
-#: mediamanager/decryptdialog.ui:131 mounthelper/decryptdialog.ui:131
+#: mediamanager/unlockdialog.ui:131 mounthelper/unlockdialog.ui:131
#, no-c-format
msgid "&Password:"
msgstr ""
+#: mounthelper/unlockdialog.ui:109
+#, no-c-format
+msgid ""
+"<p><b>%1</b> is an encrypted storage device.</p>\n"
+"<p>Please enter the password to decrypt the storage device.</p>"
+msgstr ""
+
#: propsdlgplugin/propertiespagegui.ui:16
#, no-c-format
msgid "PropertiesPageGUI"
diff --git a/tde-i18n-az/messages/tdebase/tdeio_media.po b/tde-i18n-az/messages/tdebase/tdeio_media.po
index 08bc1f0af52..65b3793648a 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: 2019-01-13 18:47+0100\n"
+"POT-Creation-Date: 2019-07-11 02:33+0200\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"
@@ -46,7 +46,6 @@ 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
-#: mounthelper/tdeio_media_mounthelper.cpp:256
msgid "The TDE mediamanager is not running."
msgstr ""
@@ -54,7 +53,7 @@ msgstr ""
msgid "This media name already exists."
msgstr ""
-#: mediaimpl.cpp:230 mediaimpl.cpp:293
+#: mediaimpl.cpp:230 mediaimpl.cpp:297
msgid "No such medium."
msgstr ""
@@ -62,321 +61,329 @@ msgstr ""
msgid "The drive is encrypted."
msgstr ""
-#: mediaimpl.cpp:272 mediamanager/halbackend.cpp:1264
-#: mediamanager/halbackend.cpp:1273 mediamanager/halbackend.cpp:1663
-#: mediamanager/halbackend.cpp:1680 mediamanager/halbackend.cpp:1691
-#: mediamanager/halbackend.cpp:1793 mediamanager/halbackend.cpp:1801
-#: mediamanager/halbackend.cpp:1808 mediamanager/halbackend.cpp:1848
-#: mediamanager/halbackend.cpp:1854 mediamanager/halbackend.cpp:1861
-#: mounthelper/tdeio_media_mounthelper.cpp:58
-msgid "Internal Error"
+#: mediaimpl.cpp:274 mediamanager/tdehardwarebackend.cpp:201
+#: mediamanager/tdehardwarebackend.cpp:252
+#: mounthelper/tdeio_media_mounthelper.cpp:202
+msgid "Unknown mount error."
msgstr ""
#: mediamanager/dialog.cpp:26 mounthelper/dialog.cpp:26
-msgid "Decrypt"
+msgid "Unlock"
msgstr ""
-#: mediamanager/fstabbackend.cpp:104 mediamanager/fstabbackend.cpp:114
-#: mediamanager/halbackend.cpp:1595 mediamanager/halbackend.cpp:1617
-#: mediamanager/halbackend.cpp:1776 mediamanager/halbackend.cpp:1831
-#: mediamanager/tdehardwarebackend.cpp:1349
-#: mediamanager/tdehardwarebackend.cpp:1360
+#: mediamanager/fstabbackend.cpp:105 mediamanager/fstabbackend.cpp:120
+#: mediamanager/halbackend.cpp:1598 mediamanager/halbackend.cpp:1625
+#: mediamanager/halbackend.cpp:1808 mediamanager/halbackend.cpp:1877
+#: mediamanager/mediamanager.cpp:363 mediamanager/mediamanager.cpp:375
+#: mediamanager/mediamanager.cpp:387 mediamanager/mediamanager.cpp:399
+#: mediamanager/tdehardwarebackend.cpp:1363
+#: mediamanager/tdehardwarebackend.cpp:1378
#, c-format
msgid "No such medium: %1"
msgstr ""
-#: mediamanager/fstabbackend.cpp:398
+#: mediamanager/fstabbackend.cpp:408
msgid "CD Recorder"
msgstr "CD Yazıcı"
-#: mediamanager/fstabbackend.cpp:404
+#: mediamanager/fstabbackend.cpp:414
msgid "DVD"
msgstr "DVD"
-#: mediamanager/fstabbackend.cpp:415
+#: mediamanager/fstabbackend.cpp:425
msgid "CD-ROM"
msgstr "CD-ROM"
-#: mediamanager/fstabbackend.cpp:428
+#: mediamanager/fstabbackend.cpp:438
msgid "Floppy"
msgstr "Floppi"
-#: mediamanager/fstabbackend.cpp:436
+#: mediamanager/fstabbackend.cpp:446
msgid "Zip Disk"
msgstr "Zip Diski"
-#: mediamanager/fstabbackend.cpp:447
+#: mediamanager/fstabbackend.cpp:457
msgid "Removable Device"
msgstr ""
-#: mediamanager/fstabbackend.cpp:452 mediamanager/fstabbackend.cpp:458
+#: mediamanager/fstabbackend.cpp:462 mediamanager/fstabbackend.cpp:468
msgid "Remote Share"
msgstr "Uzaq Bölüşülmüş Sahə"
-#: mediamanager/fstabbackend.cpp:463
+#: mediamanager/fstabbackend.cpp:473
#, fuzzy
msgid "Hard Disk"
msgstr "Sabit Disk"
-#: mediamanager/halbackend.cpp:749 mediamanager/tdehardwarebackend.cpp:805
+#: mediamanager/halbackend.cpp:744 mediamanager/tdehardwarebackend.cpp:808
#, fuzzy
msgid "Unknown Drive"
msgstr "Namə'lum"
-#: mediamanager/halbackend.cpp:761 mediamanager/tdehardwarebackend.cpp:835
+#: mediamanager/halbackend.cpp:756 mediamanager/tdehardwarebackend.cpp:838
#, fuzzy
msgid "Floppy Drive"
msgstr "Floppi"
-#: mediamanager/halbackend.cpp:769
+#: mediamanager/halbackend.cpp:764
#, fuzzy
msgid "Zip Drive"
msgstr "Zip Diski"
-#: mediamanager/halbackend.cpp:839 mediamanager/tdehardwarebackend.cpp:892
+#: mediamanager/halbackend.cpp:834 mediamanager/tdehardwarebackend.cpp:895
msgid "Camera"
msgstr ""
-#: mediamanager/halbackend.cpp:1221 mediamanager/halbackend.cpp:1247
+#: mediamanager/halbackend.cpp:1216 mediamanager/halbackend.cpp:1242
msgid "Authenticate"
msgstr ""
-#: mediamanager/halbackend.cpp:1222
+#: mediamanager/halbackend.cpp:1217
msgid ""
"<big><b>System policy prevents mounting internal media</b></big><br/"
">Authentication is required to perform this action. Please enter your "
"password to verify."
msgstr ""
-#: mediamanager/halbackend.cpp:1248
+#: mediamanager/halbackend.cpp:1243
msgid ""
"<big><b>System policy prevents unmounting media mounted by other users</b></"
"big><br/>Authentication is required to perform this action. Please enter "
"your password to verify."
msgstr ""
-#: mediamanager/halbackend.cpp:1284
+#: mediamanager/halbackend.cpp:1259 mediamanager/halbackend.cpp:1268
+#: mediamanager/halbackend.cpp:1849 mediamanager/halbackend.cpp:1916
+#: mounthelper/tdeio_media_mounthelper.cpp:58
+msgid "Internal Error"
+msgstr ""
+
+#: mediamanager/halbackend.cpp:1279
msgid "Invalid filesystem type"
msgstr ""
-#: mediamanager/halbackend.cpp:1286
+#: mediamanager/halbackend.cpp:1281
msgid ""
"Permission denied<p>Please ensure that:<br>1. You have permission to access "
"this device.<br>2. This device node is not listed in /etc/fstab.</p>"
msgstr ""
-#: mediamanager/halbackend.cpp:1290
+#: mediamanager/halbackend.cpp:1285
#, fuzzy
msgid "Device is already mounted."
msgstr "Avadanlıq bağlı deyil"
-#: mediamanager/halbackend.cpp:1340
+#: mediamanager/halbackend.cpp:1335
msgid ""
"Moreover, programs still using the device have been detected. They are "
"listed below. You have to close them or change their working directory "
"before attempting to unmount the device again."
msgstr ""
-#: mediamanager/halbackend.cpp:1381 mediamanager/tdehardwarebackend.cpp:1588
+#: mediamanager/halbackend.cpp:1376 mediamanager/tdehardwarebackend.cpp:1618
msgid ""
"Programs that were still using the device have been forcibly terminated. "
"They are listed below."
msgstr ""
-#: mediamanager/halbackend.cpp:1402 mediamanager/halbackend.cpp:1715
-#: mediamanager/tdehardwarebackend.cpp:1406
-#: mediamanager/tdehardwarebackend.cpp:1424
-#: mediamanager/tdehardwarebackend.cpp:1464
+#: mediamanager/halbackend.cpp:1397 mediamanager/halbackend.cpp:1742
+#: mediamanager/tdehardwarebackend.cpp:1430
+#: mediamanager/tdehardwarebackend.cpp:1452
+#: mediamanager/tdehardwarebackend.cpp:1494
msgid ""
"Unfortunately, the device <b>%1</b> (%2) named <b>'%3'</b> and currently "
"mounted at <b>%4</b> could not be unmounted. "
msgstr ""
-#: mediamanager/halbackend.cpp:1408 mediamanager/tdehardwarebackend.cpp:1470
+#: mediamanager/halbackend.cpp:1403 mediamanager/tdehardwarebackend.cpp:1500
msgid "The following error was returned by umount command:"
msgstr ""
-#: mediamanager/halbackend.cpp:1478
-msgid "Permission denied"
+#: mediamanager/halbackend.cpp:1567 mediamanager/tdehardwarebackend.cpp:1322
+msgid "Cannot mount encrypted locked drives!"
msgstr ""
-#: mediamanager/halbackend.cpp:1562 mediamanager/tdehardwarebackend.cpp:1232
-msgid "Cannot mount encrypted drives!"
+#: mediamanager/halbackend.cpp:1682 mediamanager/halbackend.cpp:1703
+#: mediamanager/halbackend.cpp:1716 mediamanager/halbackend.cpp:1830
+#: mediamanager/halbackend.cpp:1840 mediamanager/halbackend.cpp:1899
+#: mediamanager/halbackend.cpp:1907
+msgid "Internal error"
msgstr ""
-#: mediamanager/halbackend.cpp:1721
+#: mediamanager/halbackend.cpp:1694
+#, fuzzy
+#| msgid "Unknown"
+msgid "Unknown error"
+msgstr "Namə'lum"
+
+#: mediamanager/halbackend.cpp:1748
msgid "Unmounting failed due to the following error:"
msgstr ""
-#: mediamanager/halbackend.cpp:1723
+#: mediamanager/halbackend.cpp:1750
msgid "Device is Busy:"
msgstr ""
-#: mediamanager/halbackend.cpp:1727
+#: mediamanager/halbackend.cpp:1754
msgid ""
"Permission denied<p>Please ensure that:<br>1. You have permission to access "
"this device.<br>2. This device was originally mounted using TDE.</p>"
msgstr ""
-#: mediamanager/halbackend.cpp:1739
+#: mediamanager/halbackend.cpp:1766
msgid ""
"%1<p><b>Would you like to forcibly terminate these processes?</b><br><i>All "
"unsaved data would be lost</i>"
msgstr ""
-#: mediamanager/halbackend.cpp:1811
+#: mediamanager/halbackend.cpp:1852
msgid "Wrong password"
msgstr ""
-#: mediamanager/mediamanager.cpp:247 mediamanager/mediamanager.cpp:266
-#: mediamanager/mediamanager.cpp:285 mediamanager/mediamanager.cpp:293
-#: mediamanager/mediamanager.cpp:302 mediamanager/mediamanager.cpp:310
-msgid "Feature only available with HAL"
+#: mediamanager/mediamanager.cpp:248 mediamanager/mediamanager.cpp:275
+msgid "Feature only available with the TDE hardware backend"
msgstr ""
-#: mediamanager/mediamanager.cpp:252
-msgid "Feature only available with the TDE hardware backend"
+#: mediamanager/mediamanager.cpp:255 mediamanager/mediamanager.cpp:282
+#: mediamanager/mediamanager.cpp:312 mediamanager/mediamanager.cpp:343
+msgid "Feature only available with HAL"
msgstr ""
-#: mediamanager/mediamanager.cpp:256 mediamanager/mediamanager.cpp:271
-#: mediamanager/mediamanager.cpp:275
+#: mediamanager/mediamanager.cpp:262 mediamanager/mediamanager.cpp:289
+#: mediamanager/mediamanager.cpp:320 mediamanager/mediamanager.cpp:350
msgid "Feature only available with HAL or TDE hardware backend"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:480
-#: mediamanager/tdehardwarebackend.cpp:517
-#: mediamanager/tdehardwarebackend.cpp:750
+#: mediamanager/tdehardwarebackend.cpp:483
+#: mediamanager/tdehardwarebackend.cpp:520
+#: mediamanager/tdehardwarebackend.cpp:753
msgid "%1 Removable Device"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:525
+#: mediamanager/tdehardwarebackend.cpp:528
#, fuzzy
msgid "Blank CD-ROM"
msgstr "CD-ROM"
-#: mediamanager/tdehardwarebackend.cpp:534
+#: mediamanager/tdehardwarebackend.cpp:537
msgid "Blank CD-R"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:543
+#: mediamanager/tdehardwarebackend.cpp:546
msgid "Blank CD-RW"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:552
+#: mediamanager/tdehardwarebackend.cpp:555
msgid "Blank Magneto-Optical CD"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:561
+#: mediamanager/tdehardwarebackend.cpp:564
msgid "Blank Mount Ranier CD-RW"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:570
+#: mediamanager/tdehardwarebackend.cpp:573
msgid "Blank Mount Ranier CD-RW-W"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:579
+#: mediamanager/tdehardwarebackend.cpp:582
msgid "Blank DVD-ROM"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:588
+#: mediamanager/tdehardwarebackend.cpp:591
msgid "Blank DVD-RAM"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:597
+#: mediamanager/tdehardwarebackend.cpp:600
msgid "Blank DVD-R"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:606
+#: mediamanager/tdehardwarebackend.cpp:609
msgid "Blank DVD-RW"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:615
+#: mediamanager/tdehardwarebackend.cpp:618
msgid "Blank Dual Layer DVD-R"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:624
+#: mediamanager/tdehardwarebackend.cpp:627
msgid "Blank Dual Layer DVD-RW"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:633
+#: mediamanager/tdehardwarebackend.cpp:636
msgid "Blank DVD+R"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:642
+#: mediamanager/tdehardwarebackend.cpp:645
msgid "Blank DVD+RW"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:651
+#: mediamanager/tdehardwarebackend.cpp:654
msgid "Blank Dual Layer DVD+R"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:660
+#: mediamanager/tdehardwarebackend.cpp:663
msgid "Blank Dual Layer DVD+RW"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:669
+#: mediamanager/tdehardwarebackend.cpp:672
msgid "Blank BD-ROM"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:678
+#: mediamanager/tdehardwarebackend.cpp:681
msgid "Blank BD-R"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:687
+#: mediamanager/tdehardwarebackend.cpp:690
msgid "Blank BD-RW"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:696
+#: mediamanager/tdehardwarebackend.cpp:699
msgid "Blank HDDVD-ROM"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:705
+#: mediamanager/tdehardwarebackend.cpp:708
msgid "Blank HDDVD-R"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:714
+#: mediamanager/tdehardwarebackend.cpp:717
msgid "Blank HDDVD-RW"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:721
+#: mediamanager/tdehardwarebackend.cpp:724
msgid "Audio CD"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:742
+#: mediamanager/tdehardwarebackend.cpp:745
msgid "%1 Fixed Disk (%2)"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:849
+#: mediamanager/tdehardwarebackend.cpp:852
#, fuzzy
msgid "%1 Zip Disk"
msgstr "Zip Diski"
-#: mediamanager/tdehardwarebackend.cpp:1212
-#: mediamanager/tdehardwarebackend.cpp:1392
-msgid "Internal error"
+#: mediamanager/tdehardwarebackend.cpp:1224
+#: mediamanager/tdehardwarebackend.cpp:1417
+msgid "Internal error. Couldn't find medium."
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:1239
-msgid ""
-"<qt>Unable to mount this device.<p>Potential reasons include:<br>Improper "
-"device and/or user privilege level<br>Corrupt data on storage device"
+#: mediamanager/tdehardwarebackend.cpp:1249
+#: mediamanager/tdehardwarebackend.cpp:1323
+msgid "Unable to mount this device."
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:1241
-#: mediamanager/tdehardwarebackend.cpp:1316
-#: mediamanager/tdehardwarebackend.cpp:1408
-#: mediamanager/tdehardwarebackend.cpp:1426
+#: mediamanager/tdehardwarebackend.cpp:1252
+#: mediamanager/tdehardwarebackend.cpp:1326
+#: mediamanager/tdehardwarebackend.cpp:1435
+#: mediamanager/tdehardwarebackend.cpp:1457
msgid "<p>Technical details:<br>"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:1314
-msgid ""
-"<qt>Unable to mount this device.<p>Potential reasons include:<br>Improper "
-"device and/or user privilege level<br>Corrupt data on storage "
-"device<br>Incorrect encryption password"
+#: mediamanager/tdehardwarebackend.cpp:1284
+msgid "Decryption aborted"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:1420
+#: mediamanager/tdehardwarebackend.cpp:1443
msgid ""
"<qt>The device <b>%1</b> (%2) named <b>'%3'</b> and currently mounted at <b>"
"%4</b> can not be unmounted at this time.<p>%5<p><b>Would you like to "
@@ -384,7 +391,7 @@ msgid ""
"lost</i>"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:1547
+#: mediamanager/tdehardwarebackend.cpp:1577
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 "
@@ -395,7 +402,7 @@ msgstr ""
msgid "%1 cannot be found."
msgstr ""
-#: mounthelper/tdeio_media_mounthelper.cpp:86
+#: mounthelper/tdeio_media_mounthelper.cpp:87
msgid "%1 is not a mountable media."
msgstr ""
@@ -405,39 +412,49 @@ msgstr ""
#: mounthelper/tdeio_media_mounthelper.cpp:107
#, fuzzy
-msgid "%1 is already decrypted."
+msgid "%1 is already unlocked."
msgstr "Avadanlıq bağlı deyil"
-#: mounthelper/tdeio_media_mounthelper.cpp:228
+#: mounthelper/tdeio_media_mounthelper.cpp:139
+msgid "Unknown unmount error."
+msgstr ""
+
+#: mounthelper/tdeio_media_mounthelper.cpp:246
msgid "The device was successfully unmounted, but the tray could not be opened"
msgstr ""
-#: mounthelper/tdeio_media_mounthelper.cpp:230
+#: mounthelper/tdeio_media_mounthelper.cpp:248
msgid "The device was successfully unmounted, but could not be ejected"
msgstr ""
-#: mounthelper/tdeio_media_mounthelper.cpp:275
+#: mounthelper/tdeio_media_mounthelper.cpp:281
+#, fuzzy
+#| msgid "Unknown device %1"
+msgid "Unknown decrypt error."
+msgstr "Namə'lum avadanlıq %1"
+
+#: mounthelper/tdeio_media_mounthelper.cpp:295
#, fuzzy
msgid "Decrypt given URL"
msgstr "Bildirilən URL-ni Ayır"
-#: mounthelper/tdeio_media_mounthelper.cpp:276
+#: mounthelper/tdeio_media_mounthelper.cpp:296
msgid "Unmount given URL"
msgstr "Bildirilən URL-ni Ayır"
-#: mounthelper/tdeio_media_mounthelper.cpp:277
+#: 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:278
+#: 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:279
+#: mounthelper/tdeio_media_mounthelper.cpp:299
msgid "Unmount and Eject given URL (necessary for some USB devices)"
msgstr ""
-#: mounthelper/tdeio_media_mounthelper.cpp:280
+#: mounthelper/tdeio_media_mounthelper.cpp:300
#, fuzzy
msgid "media:/ URL to mount/unmount/eject/remove"
msgstr "devices:/ bağlanacaq/ayırılacaq/çıxarılacaq URL."
@@ -459,45 +476,45 @@ msgstr ""
msgid "&Mounting"
msgstr ""
-#: tdefile-plugin/tdefilemediaplugin.cpp:190
+#: tdefile-plugin/tdefilemediaplugin.cpp:184
#, fuzzy
msgid "Medium Information"
msgstr "Avadanlıq bağlı deyil"
-#: tdefile-plugin/tdefilemediaplugin.cpp:193
+#: tdefile-plugin/tdefilemediaplugin.cpp:187
msgid "Free"
msgstr ""
-#: tdefile-plugin/tdefilemediaplugin.cpp:196
+#: tdefile-plugin/tdefilemediaplugin.cpp:190
msgid "Used"
msgstr ""
-#: tdefile-plugin/tdefilemediaplugin.cpp:199
+#: tdefile-plugin/tdefilemediaplugin.cpp:193
msgid "Total"
msgstr ""
-#: tdefile-plugin/tdefilemediaplugin.cpp:202
+#: tdefile-plugin/tdefilemediaplugin.cpp:196
msgid "Base URL"
msgstr ""
-#: tdefile-plugin/tdefilemediaplugin.cpp:203
+#: tdefile-plugin/tdefilemediaplugin.cpp:197
msgid "Mount Point"
msgstr ""
-#: tdefile-plugin/tdefilemediaplugin.cpp:204
+#: tdefile-plugin/tdefilemediaplugin.cpp:198
#, fuzzy
msgid "Device Node"
msgstr "Avadanlıqlar"
-#: tdefile-plugin/tdefilemediaplugin.cpp:206
+#: tdefile-plugin/tdefilemediaplugin.cpp:200
msgid "Medium Summary"
msgstr ""
-#: tdefile-plugin/tdefilemediaplugin.cpp:208
+#: tdefile-plugin/tdefilemediaplugin.cpp:202
msgid "Usage"
msgstr ""
-#: tdefile-plugin/tdefilemediaplugin.cpp:210
+#: tdefile-plugin/tdefilemediaplugin.cpp:204
msgid "Bar Graph"
msgstr ""
@@ -569,23 +586,30 @@ msgid ""
"devices are plugged in."
msgstr ""
-#: mediamanager/decryptdialog.ui:24 mounthelper/decryptdialog.ui:24
+#: mediamanager/unlockdialog.ui:24 mounthelper/unlockdialog.ui:24
#, no-c-format
msgid "Decrypting Storage Device"
msgstr ""
-#: mediamanager/decryptdialog.ui:109 mounthelper/decryptdialog.ui:109
+#: mediamanager/unlockdialog.ui:109
#, no-c-format
msgid ""
-"<p><b>%1</b> is an encrypted storage device.</p>\n"
-"<p>Please enter the password to decrypt the storage device.</p>"
+"<p><b>%1</b> is an encrypted locked storage device.</p>\n"
+"<p>Please enter the password to unlock the storage device.</p>"
msgstr ""
-#: mediamanager/decryptdialog.ui:131 mounthelper/decryptdialog.ui:131
+#: mediamanager/unlockdialog.ui:131 mounthelper/unlockdialog.ui:131
#, no-c-format
msgid "&Password:"
msgstr ""
+#: mounthelper/unlockdialog.ui:109
+#, no-c-format
+msgid ""
+"<p><b>%1</b> is an encrypted storage device.</p>\n"
+"<p>Please enter the password to decrypt the storage device.</p>"
+msgstr ""
+
#: propsdlgplugin/propertiespagegui.ui:16
#, no-c-format
msgid "PropertiesPageGUI"
@@ -818,9 +842,6 @@ msgstr ""
#~ "\n"
#~ "Xahiş edirik, diskin düzgün daxil edildiyini yoxlayın ."
-#~ msgid "Unknown device %1"
-#~ msgstr "Namə'lum avadanlıq %1"
-
#~ msgid "Device not accessible"
#~ msgstr "Avadanlığa yetişilə bilmir"
diff --git a/tde-i18n-be/messages/tdebase/tdeio_media.po b/tde-i18n-be/messages/tdebase/tdeio_media.po
index e1aff9a222a..ce3464e8231 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: 2019-01-13 18:47+0100\n"
+"POT-Creation-Date: 2019-07-11 02:33+0200\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"
@@ -47,7 +47,6 @@ msgstr "Невядома"
#: mediaimpl.cpp:88 mediaimpl.cpp:115 mediaimpl.cpp:141 mediaimpl.cpp:177
#: mediaimpl.cpp:197 mediaimpl.cpp:218
#: mounthelper/tdeio_media_mounthelper.cpp:50
-#: mounthelper/tdeio_media_mounthelper.cpp:256
msgid "The TDE mediamanager is not running."
msgstr "Кіраўнік носьбітаў TDE не запушчаны."
@@ -55,7 +54,7 @@ msgstr "Кіраўнік носьбітаў TDE не запушчаны."
msgid "This media name already exists."
msgstr "Такая назва носьбіта ўжо існуе."
-#: mediaimpl.cpp:230 mediaimpl.cpp:293
+#: mediaimpl.cpp:230 mediaimpl.cpp:297
msgid "No such medium."
msgstr ""
@@ -63,320 +62,328 @@ msgstr ""
msgid "The drive is encrypted."
msgstr ""
-#: mediaimpl.cpp:272 mediamanager/halbackend.cpp:1264
-#: mediamanager/halbackend.cpp:1273 mediamanager/halbackend.cpp:1663
-#: mediamanager/halbackend.cpp:1680 mediamanager/halbackend.cpp:1691
-#: mediamanager/halbackend.cpp:1793 mediamanager/halbackend.cpp:1801
-#: mediamanager/halbackend.cpp:1808 mediamanager/halbackend.cpp:1848
-#: mediamanager/halbackend.cpp:1854 mediamanager/halbackend.cpp:1861
-#: mounthelper/tdeio_media_mounthelper.cpp:58
-msgid "Internal Error"
+#: mediaimpl.cpp:274 mediamanager/tdehardwarebackend.cpp:201
+#: mediamanager/tdehardwarebackend.cpp:252
+#: mounthelper/tdeio_media_mounthelper.cpp:202
+msgid "Unknown mount error."
msgstr ""
#: mediamanager/dialog.cpp:26 mounthelper/dialog.cpp:26
-msgid "Decrypt"
+msgid "Unlock"
msgstr ""
-#: mediamanager/fstabbackend.cpp:104 mediamanager/fstabbackend.cpp:114
-#: mediamanager/halbackend.cpp:1595 mediamanager/halbackend.cpp:1617
-#: mediamanager/halbackend.cpp:1776 mediamanager/halbackend.cpp:1831
-#: mediamanager/tdehardwarebackend.cpp:1349
-#: mediamanager/tdehardwarebackend.cpp:1360
+#: mediamanager/fstabbackend.cpp:105 mediamanager/fstabbackend.cpp:120
+#: mediamanager/halbackend.cpp:1598 mediamanager/halbackend.cpp:1625
+#: mediamanager/halbackend.cpp:1808 mediamanager/halbackend.cpp:1877
+#: mediamanager/mediamanager.cpp:363 mediamanager/mediamanager.cpp:375
+#: mediamanager/mediamanager.cpp:387 mediamanager/mediamanager.cpp:399
+#: mediamanager/tdehardwarebackend.cpp:1363
+#: mediamanager/tdehardwarebackend.cpp:1378
#, c-format
msgid "No such medium: %1"
msgstr ""
-#: mediamanager/fstabbackend.cpp:398
+#: mediamanager/fstabbackend.cpp:408
msgid "CD Recorder"
msgstr "Прылада запісу CD"
-#: mediamanager/fstabbackend.cpp:404
+#: mediamanager/fstabbackend.cpp:414
msgid "DVD"
msgstr "DVD"
-#: mediamanager/fstabbackend.cpp:415
+#: mediamanager/fstabbackend.cpp:425
msgid "CD-ROM"
msgstr "CD-ROM"
-#: mediamanager/fstabbackend.cpp:428
+#: mediamanager/fstabbackend.cpp:438
msgid "Floppy"
msgstr "Дыскета"
-#: mediamanager/fstabbackend.cpp:436
+#: mediamanager/fstabbackend.cpp:446
msgid "Zip Disk"
msgstr "Дыск Zip"
-#: mediamanager/fstabbackend.cpp:447
+#: mediamanager/fstabbackend.cpp:457
msgid "Removable Device"
msgstr "Прылада са зменнымі носьбітамі"
-#: mediamanager/fstabbackend.cpp:452 mediamanager/fstabbackend.cpp:458
+#: mediamanager/fstabbackend.cpp:462 mediamanager/fstabbackend.cpp:468
msgid "Remote Share"
msgstr "Аддалены агульны рэсурс"
-#: mediamanager/fstabbackend.cpp:463
+#: mediamanager/fstabbackend.cpp:473
msgid "Hard Disk"
msgstr "Жорсткі дыск"
-#: mediamanager/halbackend.cpp:749 mediamanager/tdehardwarebackend.cpp:805
+#: mediamanager/halbackend.cpp:744 mediamanager/tdehardwarebackend.cpp:808
#, fuzzy
msgid "Unknown Drive"
msgstr "Невядома"
-#: mediamanager/halbackend.cpp:761 mediamanager/tdehardwarebackend.cpp:835
+#: mediamanager/halbackend.cpp:756 mediamanager/tdehardwarebackend.cpp:838
#, fuzzy
msgid "Floppy Drive"
msgstr "Дыскета"
-#: mediamanager/halbackend.cpp:769
+#: mediamanager/halbackend.cpp:764
#, fuzzy
msgid "Zip Drive"
msgstr "Дыск Zip"
-#: mediamanager/halbackend.cpp:839 mediamanager/tdehardwarebackend.cpp:892
+#: mediamanager/halbackend.cpp:834 mediamanager/tdehardwarebackend.cpp:895
msgid "Camera"
msgstr "Камера"
-#: mediamanager/halbackend.cpp:1221 mediamanager/halbackend.cpp:1247
+#: mediamanager/halbackend.cpp:1216 mediamanager/halbackend.cpp:1242
msgid "Authenticate"
msgstr ""
-#: mediamanager/halbackend.cpp:1222
+#: mediamanager/halbackend.cpp:1217
msgid ""
"<big><b>System policy prevents mounting internal media</b></big><br/"
">Authentication is required to perform this action. Please enter your "
"password to verify."
msgstr ""
-#: mediamanager/halbackend.cpp:1248
+#: mediamanager/halbackend.cpp:1243
msgid ""
"<big><b>System policy prevents unmounting media mounted by other users</b></"
"big><br/>Authentication is required to perform this action. Please enter "
"your password to verify."
msgstr ""
-#: mediamanager/halbackend.cpp:1284
+#: mediamanager/halbackend.cpp:1259 mediamanager/halbackend.cpp:1268
+#: mediamanager/halbackend.cpp:1849 mediamanager/halbackend.cpp:1916
+#: mounthelper/tdeio_media_mounthelper.cpp:58
+msgid "Internal Error"
+msgstr ""
+
+#: mediamanager/halbackend.cpp:1279
msgid "Invalid filesystem type"
msgstr ""
-#: mediamanager/halbackend.cpp:1286
+#: mediamanager/halbackend.cpp:1281
msgid ""
"Permission denied<p>Please ensure that:<br>1. You have permission to access "
"this device.<br>2. This device node is not listed in /etc/fstab.</p>"
msgstr ""
-#: mediamanager/halbackend.cpp:1290
+#: mediamanager/halbackend.cpp:1285
msgid "Device is already mounted."
msgstr ""
-#: mediamanager/halbackend.cpp:1340
+#: mediamanager/halbackend.cpp:1335
msgid ""
"Moreover, programs still using the device have been detected. They are "
"listed below. You have to close them or change their working directory "
"before attempting to unmount the device again."
msgstr ""
-#: mediamanager/halbackend.cpp:1381 mediamanager/tdehardwarebackend.cpp:1588
+#: mediamanager/halbackend.cpp:1376 mediamanager/tdehardwarebackend.cpp:1618
msgid ""
"Programs that were still using the device have been forcibly terminated. "
"They are listed below."
msgstr ""
-#: mediamanager/halbackend.cpp:1402 mediamanager/halbackend.cpp:1715
-#: mediamanager/tdehardwarebackend.cpp:1406
-#: mediamanager/tdehardwarebackend.cpp:1424
-#: mediamanager/tdehardwarebackend.cpp:1464
+#: mediamanager/halbackend.cpp:1397 mediamanager/halbackend.cpp:1742
+#: mediamanager/tdehardwarebackend.cpp:1430
+#: mediamanager/tdehardwarebackend.cpp:1452
+#: mediamanager/tdehardwarebackend.cpp:1494
msgid ""
"Unfortunately, the device <b>%1</b> (%2) named <b>'%3'</b> and currently "
"mounted at <b>%4</b> could not be unmounted. "
msgstr ""
-#: mediamanager/halbackend.cpp:1408 mediamanager/tdehardwarebackend.cpp:1470
+#: mediamanager/halbackend.cpp:1403 mediamanager/tdehardwarebackend.cpp:1500
msgid "The following error was returned by umount command:"
msgstr ""
-#: mediamanager/halbackend.cpp:1478
-msgid "Permission denied"
+#: mediamanager/halbackend.cpp:1567 mediamanager/tdehardwarebackend.cpp:1322
+msgid "Cannot mount encrypted locked drives!"
msgstr ""
-#: mediamanager/halbackend.cpp:1562 mediamanager/tdehardwarebackend.cpp:1232
-msgid "Cannot mount encrypted drives!"
+#: mediamanager/halbackend.cpp:1682 mediamanager/halbackend.cpp:1703
+#: mediamanager/halbackend.cpp:1716 mediamanager/halbackend.cpp:1830
+#: mediamanager/halbackend.cpp:1840 mediamanager/halbackend.cpp:1899
+#: mediamanager/halbackend.cpp:1907
+msgid "Internal error"
msgstr ""
-#: mediamanager/halbackend.cpp:1721
+#: mediamanager/halbackend.cpp:1694
+#, fuzzy
+#| msgid "Unknown"
+msgid "Unknown error"
+msgstr "Невядома"
+
+#: mediamanager/halbackend.cpp:1748
msgid "Unmounting failed due to the following error:"
msgstr ""
-#: mediamanager/halbackend.cpp:1723
+#: mediamanager/halbackend.cpp:1750
msgid "Device is Busy:"
msgstr ""
-#: mediamanager/halbackend.cpp:1727
+#: mediamanager/halbackend.cpp:1754
msgid ""
"Permission denied<p>Please ensure that:<br>1. You have permission to access "
"this device.<br>2. This device was originally mounted using TDE.</p>"
msgstr ""
-#: mediamanager/halbackend.cpp:1739
+#: mediamanager/halbackend.cpp:1766
msgid ""
"%1<p><b>Would you like to forcibly terminate these processes?</b><br><i>All "
"unsaved data would be lost</i>"
msgstr ""
-#: mediamanager/halbackend.cpp:1811
+#: mediamanager/halbackend.cpp:1852
msgid "Wrong password"
msgstr ""
-#: mediamanager/mediamanager.cpp:247 mediamanager/mediamanager.cpp:266
-#: mediamanager/mediamanager.cpp:285 mediamanager/mediamanager.cpp:293
-#: mediamanager/mediamanager.cpp:302 mediamanager/mediamanager.cpp:310
-msgid "Feature only available with HAL"
+#: mediamanager/mediamanager.cpp:248 mediamanager/mediamanager.cpp:275
+msgid "Feature only available with the TDE hardware backend"
msgstr ""
-#: mediamanager/mediamanager.cpp:252
-msgid "Feature only available with the TDE hardware backend"
+#: mediamanager/mediamanager.cpp:255 mediamanager/mediamanager.cpp:282
+#: mediamanager/mediamanager.cpp:312 mediamanager/mediamanager.cpp:343
+msgid "Feature only available with HAL"
msgstr ""
-#: mediamanager/mediamanager.cpp:256 mediamanager/mediamanager.cpp:271
-#: mediamanager/mediamanager.cpp:275
+#: mediamanager/mediamanager.cpp:262 mediamanager/mediamanager.cpp:289
+#: mediamanager/mediamanager.cpp:320 mediamanager/mediamanager.cpp:350
msgid "Feature only available with HAL or TDE hardware backend"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:480
-#: mediamanager/tdehardwarebackend.cpp:517
-#: mediamanager/tdehardwarebackend.cpp:750
+#: mediamanager/tdehardwarebackend.cpp:483
+#: mediamanager/tdehardwarebackend.cpp:520
+#: mediamanager/tdehardwarebackend.cpp:753
#, fuzzy
msgid "%1 Removable Device"
msgstr "Прылада са зменнымі носьбітамі"
-#: mediamanager/tdehardwarebackend.cpp:525
+#: mediamanager/tdehardwarebackend.cpp:528
#, fuzzy
msgid "Blank CD-ROM"
msgstr "CD-ROM"
-#: mediamanager/tdehardwarebackend.cpp:534
+#: mediamanager/tdehardwarebackend.cpp:537
msgid "Blank CD-R"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:543
+#: mediamanager/tdehardwarebackend.cpp:546
msgid "Blank CD-RW"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:552
+#: mediamanager/tdehardwarebackend.cpp:555
msgid "Blank Magneto-Optical CD"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:561
+#: mediamanager/tdehardwarebackend.cpp:564
msgid "Blank Mount Ranier CD-RW"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:570
+#: mediamanager/tdehardwarebackend.cpp:573
msgid "Blank Mount Ranier CD-RW-W"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:579
+#: mediamanager/tdehardwarebackend.cpp:582
msgid "Blank DVD-ROM"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:588
+#: mediamanager/tdehardwarebackend.cpp:591
msgid "Blank DVD-RAM"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:597
+#: mediamanager/tdehardwarebackend.cpp:600
msgid "Blank DVD-R"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:606
+#: mediamanager/tdehardwarebackend.cpp:609
msgid "Blank DVD-RW"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:615
+#: mediamanager/tdehardwarebackend.cpp:618
msgid "Blank Dual Layer DVD-R"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:624
+#: mediamanager/tdehardwarebackend.cpp:627
msgid "Blank Dual Layer DVD-RW"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:633
+#: mediamanager/tdehardwarebackend.cpp:636
msgid "Blank DVD+R"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:642
+#: mediamanager/tdehardwarebackend.cpp:645
msgid "Blank DVD+RW"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:651
+#: mediamanager/tdehardwarebackend.cpp:654
msgid "Blank Dual Layer DVD+R"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:660
+#: mediamanager/tdehardwarebackend.cpp:663
msgid "Blank Dual Layer DVD+RW"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:669
+#: mediamanager/tdehardwarebackend.cpp:672
msgid "Blank BD-ROM"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:678
+#: mediamanager/tdehardwarebackend.cpp:681
msgid "Blank BD-R"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:687
+#: mediamanager/tdehardwarebackend.cpp:690
msgid "Blank BD-RW"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:696
+#: mediamanager/tdehardwarebackend.cpp:699
msgid "Blank HDDVD-ROM"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:705
+#: mediamanager/tdehardwarebackend.cpp:708
msgid "Blank HDDVD-R"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:714
+#: mediamanager/tdehardwarebackend.cpp:717
msgid "Blank HDDVD-RW"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:721
+#: mediamanager/tdehardwarebackend.cpp:724
msgid "Audio CD"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:742
+#: mediamanager/tdehardwarebackend.cpp:745
msgid "%1 Fixed Disk (%2)"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:849
+#: mediamanager/tdehardwarebackend.cpp:852
#, fuzzy
msgid "%1 Zip Disk"
msgstr "Дыск Zip"
-#: mediamanager/tdehardwarebackend.cpp:1212
-#: mediamanager/tdehardwarebackend.cpp:1392
-msgid "Internal error"
+#: mediamanager/tdehardwarebackend.cpp:1224
+#: mediamanager/tdehardwarebackend.cpp:1417
+msgid "Internal error. Couldn't find medium."
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:1239
-msgid ""
-"<qt>Unable to mount this device.<p>Potential reasons include:<br>Improper "
-"device and/or user privilege level<br>Corrupt data on storage device"
+#: mediamanager/tdehardwarebackend.cpp:1249
+#: mediamanager/tdehardwarebackend.cpp:1323
+msgid "Unable to mount this device."
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:1241
-#: mediamanager/tdehardwarebackend.cpp:1316
-#: mediamanager/tdehardwarebackend.cpp:1408
-#: mediamanager/tdehardwarebackend.cpp:1426
+#: mediamanager/tdehardwarebackend.cpp:1252
+#: mediamanager/tdehardwarebackend.cpp:1326
+#: mediamanager/tdehardwarebackend.cpp:1435
+#: mediamanager/tdehardwarebackend.cpp:1457
msgid "<p>Technical details:<br>"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:1314
-msgid ""
-"<qt>Unable to mount this device.<p>Potential reasons include:<br>Improper "
-"device and/or user privilege level<br>Corrupt data on storage "
-"device<br>Incorrect encryption password"
+#: mediamanager/tdehardwarebackend.cpp:1284
+msgid "Decryption aborted"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:1420
+#: mediamanager/tdehardwarebackend.cpp:1443
msgid ""
"<qt>The device <b>%1</b> (%2) named <b>'%3'</b> and currently mounted at <b>"
"%4</b> can not be unmounted at this time.<p>%5<p><b>Would you like to "
@@ -384,7 +391,7 @@ msgid ""
"lost</i>"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:1547
+#: mediamanager/tdehardwarebackend.cpp:1577
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 "
@@ -395,7 +402,7 @@ msgstr ""
msgid "%1 cannot be found."
msgstr "Немагчыма знайсці %1."
-#: mounthelper/tdeio_media_mounthelper.cpp:86
+#: mounthelper/tdeio_media_mounthelper.cpp:87
msgid "%1 is not a mountable media."
msgstr "%1 не з'яўляецца носьбітам, які можна прымацаваць."
@@ -405,40 +412,48 @@ msgid "%1 is not an encrypted media."
msgstr "%1 не з'яўляецца носьбітам, які можна прымацаваць."
#: mounthelper/tdeio_media_mounthelper.cpp:107
-msgid "%1 is already decrypted."
+msgid "%1 is already unlocked."
msgstr ""
-#: mounthelper/tdeio_media_mounthelper.cpp:228
+#: mounthelper/tdeio_media_mounthelper.cpp:139
+msgid "Unknown unmount error."
+msgstr ""
+
+#: mounthelper/tdeio_media_mounthelper.cpp:246
msgid "The device was successfully unmounted, but the tray could not be opened"
msgstr ""
-#: mounthelper/tdeio_media_mounthelper.cpp:230
+#: mounthelper/tdeio_media_mounthelper.cpp:248
msgid "The device was successfully unmounted, but could not be ejected"
msgstr ""
-#: mounthelper/tdeio_media_mounthelper.cpp:275
+#: mounthelper/tdeio_media_mounthelper.cpp:281
+msgid "Unknown decrypt error."
+msgstr ""
+
+#: mounthelper/tdeio_media_mounthelper.cpp:295
#, fuzzy
msgid "Decrypt given URL"
msgstr "Адмацаваць вызначаны URL"
-#: mounthelper/tdeio_media_mounthelper.cpp:276
+#: mounthelper/tdeio_media_mounthelper.cpp:296
msgid "Unmount given URL"
msgstr "Адмацаваць вызначаны URL"
-#: mounthelper/tdeio_media_mounthelper.cpp:277
+#: mounthelper/tdeio_media_mounthelper.cpp:297
msgid "Mount given URL (default)"
msgstr "Прымацаваць вызначаны URL (стандартнае)"
-#: mounthelper/tdeio_media_mounthelper.cpp:278
+#: mounthelper/tdeio_media_mounthelper.cpp:298
msgid "Eject given URL via tdeeject"
msgstr "Вызваліць вызначаны URL праз tdeeject"
-#: mounthelper/tdeio_media_mounthelper.cpp:279
+#: mounthelper/tdeio_media_mounthelper.cpp:299
msgid "Unmount and Eject given URL (necessary for some USB devices)"
msgstr ""
"Адмацаваць і вызваліць вызначаны URL (неабходна для некаторых прыладаў USB)"
-#: mounthelper/tdeio_media_mounthelper.cpp:280
+#: mounthelper/tdeio_media_mounthelper.cpp:300
msgid "media:/ URL to mount/unmount/eject/remove"
msgstr "URL media:/ для прымацавання/адмацавання/вызвалення/выдалення"
@@ -460,43 +475,43 @@ msgstr ""
msgid "&Mounting"
msgstr "Пункт мацавання"
-#: tdefile-plugin/tdefilemediaplugin.cpp:190
+#: tdefile-plugin/tdefilemediaplugin.cpp:184
msgid "Medium Information"
msgstr "Інфармацыя аб носьбіце"
-#: tdefile-plugin/tdefilemediaplugin.cpp:193
+#: tdefile-plugin/tdefilemediaplugin.cpp:187
msgid "Free"
msgstr "Вольна"
-#: tdefile-plugin/tdefilemediaplugin.cpp:196
+#: tdefile-plugin/tdefilemediaplugin.cpp:190
msgid "Used"
msgstr "Ужыта"
-#: tdefile-plugin/tdefilemediaplugin.cpp:199
+#: tdefile-plugin/tdefilemediaplugin.cpp:193
msgid "Total"
msgstr "Агулам"
-#: tdefile-plugin/tdefilemediaplugin.cpp:202
+#: tdefile-plugin/tdefilemediaplugin.cpp:196
msgid "Base URL"
msgstr "Базавы URL"
-#: tdefile-plugin/tdefilemediaplugin.cpp:203
+#: tdefile-plugin/tdefilemediaplugin.cpp:197
msgid "Mount Point"
msgstr "Пункт мацавання"
-#: tdefile-plugin/tdefilemediaplugin.cpp:204
+#: tdefile-plugin/tdefilemediaplugin.cpp:198
msgid "Device Node"
msgstr "Нумар прылады"
-#: tdefile-plugin/tdefilemediaplugin.cpp:206
+#: tdefile-plugin/tdefilemediaplugin.cpp:200
msgid "Medium Summary"
msgstr "Апісанне носьбіта"
-#: tdefile-plugin/tdefilemediaplugin.cpp:208
+#: tdefile-plugin/tdefilemediaplugin.cpp:202
msgid "Usage"
msgstr "Выкарыстанне"
-#: tdefile-plugin/tdefilemediaplugin.cpp:210
+#: tdefile-plugin/tdefilemediaplugin.cpp:204
msgid "Bar Graph"
msgstr "Размеркаванне"
@@ -568,23 +583,30 @@ msgid ""
"devices are plugged in."
msgstr ""
-#: mediamanager/decryptdialog.ui:24 mounthelper/decryptdialog.ui:24
+#: mediamanager/unlockdialog.ui:24 mounthelper/unlockdialog.ui:24
#, no-c-format
msgid "Decrypting Storage Device"
msgstr ""
-#: mediamanager/decryptdialog.ui:109 mounthelper/decryptdialog.ui:109
+#: mediamanager/unlockdialog.ui:109
#, no-c-format
msgid ""
-"<p><b>%1</b> is an encrypted storage device.</p>\n"
-"<p>Please enter the password to decrypt the storage device.</p>"
+"<p><b>%1</b> is an encrypted locked storage device.</p>\n"
+"<p>Please enter the password to unlock the storage device.</p>"
msgstr ""
-#: mediamanager/decryptdialog.ui:131 mounthelper/decryptdialog.ui:131
+#: mediamanager/unlockdialog.ui:131 mounthelper/unlockdialog.ui:131
#, no-c-format
msgid "&Password:"
msgstr ""
+#: mounthelper/unlockdialog.ui:109
+#, no-c-format
+msgid ""
+"<p><b>%1</b> is an encrypted storage device.</p>\n"
+"<p>Please enter the password to decrypt the storage device.</p>"
+msgstr ""
+
#: propsdlgplugin/propertiespagegui.ui:16
#, no-c-format
msgid "PropertiesPageGUI"
diff --git a/tde-i18n-bg/messages/tdebase/tdeio_media.po b/tde-i18n-bg/messages/tdebase/tdeio_media.po
index 4bd8f86adb4..7d5cd18994d 100644
--- a/tde-i18n-bg/messages/tdebase/tdeio_media.po
+++ b/tde-i18n-bg/messages/tdebase/tdeio_media.po
@@ -8,7 +8,7 @@
msgid ""
msgstr ""
"Project-Id-Version: tdeio_media\n"
-"POT-Creation-Date: 2019-01-13 18:47+0100\n"
+"POT-Creation-Date: 2019-07-11 02:33+0200\n"
"PO-Revision-Date: 2008-08-13 16:05+0000\n"
"Last-Translator: Zlatko Popov <zlatkopopov@fsa-bg.org>\n"
"Language-Team: Bulgarian <dict@fsa-bg.org>\n"
@@ -49,7 +49,6 @@ msgstr "Неизвестно"
#: mediaimpl.cpp:88 mediaimpl.cpp:115 mediaimpl.cpp:141 mediaimpl.cpp:177
#: mediaimpl.cpp:197 mediaimpl.cpp:218
#: mounthelper/tdeio_media_mounthelper.cpp:50
-#: mounthelper/tdeio_media_mounthelper.cpp:256
msgid "The TDE mediamanager is not running."
msgstr "Мениджърът на мултимедийните носители не е стартиран."
@@ -57,7 +56,7 @@ msgstr "Мениджърът на мултимедийните носители
msgid "This media name already exists."
msgstr "Вече има такова име на носителя."
-#: mediaimpl.cpp:230 mediaimpl.cpp:293
+#: mediaimpl.cpp:230 mediaimpl.cpp:297
msgid "No such medium."
msgstr "Няма такъв носител."
@@ -65,110 +64,114 @@ msgstr "Няма такъв носител."
msgid "The drive is encrypted."
msgstr ""
-#: mediaimpl.cpp:272 mediamanager/halbackend.cpp:1264
-#: mediamanager/halbackend.cpp:1273 mediamanager/halbackend.cpp:1663
-#: mediamanager/halbackend.cpp:1680 mediamanager/halbackend.cpp:1691
-#: mediamanager/halbackend.cpp:1793 mediamanager/halbackend.cpp:1801
-#: mediamanager/halbackend.cpp:1808 mediamanager/halbackend.cpp:1848
-#: mediamanager/halbackend.cpp:1854 mediamanager/halbackend.cpp:1861
-#: mounthelper/tdeio_media_mounthelper.cpp:58
-msgid "Internal Error"
-msgstr "Вътрешна грешка"
+#: mediaimpl.cpp:274 mediamanager/tdehardwarebackend.cpp:201
+#: mediamanager/tdehardwarebackend.cpp:252
+#: mounthelper/tdeio_media_mounthelper.cpp:202
+msgid "Unknown mount error."
+msgstr ""
#: mediamanager/dialog.cpp:26 mounthelper/dialog.cpp:26
-msgid "Decrypt"
+msgid "Unlock"
msgstr ""
-#: mediamanager/fstabbackend.cpp:104 mediamanager/fstabbackend.cpp:114
-#: mediamanager/halbackend.cpp:1595 mediamanager/halbackend.cpp:1617
-#: mediamanager/halbackend.cpp:1776 mediamanager/halbackend.cpp:1831
-#: mediamanager/tdehardwarebackend.cpp:1349
-#: mediamanager/tdehardwarebackend.cpp:1360
+#: mediamanager/fstabbackend.cpp:105 mediamanager/fstabbackend.cpp:120
+#: mediamanager/halbackend.cpp:1598 mediamanager/halbackend.cpp:1625
+#: mediamanager/halbackend.cpp:1808 mediamanager/halbackend.cpp:1877
+#: mediamanager/mediamanager.cpp:363 mediamanager/mediamanager.cpp:375
+#: mediamanager/mediamanager.cpp:387 mediamanager/mediamanager.cpp:399
+#: mediamanager/tdehardwarebackend.cpp:1363
+#: mediamanager/tdehardwarebackend.cpp:1378
#, c-format
msgid "No such medium: %1"
msgstr "Няма такъв носител: %1"
-#: mediamanager/fstabbackend.cpp:398
+#: mediamanager/fstabbackend.cpp:408
msgid "CD Recorder"
msgstr "CD записвачка"
-#: mediamanager/fstabbackend.cpp:404
+#: mediamanager/fstabbackend.cpp:414
msgid "DVD"
msgstr "DVD"
-#: mediamanager/fstabbackend.cpp:415
+#: mediamanager/fstabbackend.cpp:425
msgid "CD-ROM"
msgstr "CD-ROM"
-#: mediamanager/fstabbackend.cpp:428
+#: mediamanager/fstabbackend.cpp:438
msgid "Floppy"
msgstr "Флопи"
-#: mediamanager/fstabbackend.cpp:436
+#: mediamanager/fstabbackend.cpp:446
msgid "Zip Disk"
msgstr "Zip Disk"
-#: mediamanager/fstabbackend.cpp:447
+#: mediamanager/fstabbackend.cpp:457
msgid "Removable Device"
msgstr "Портативно устройство"
-#: mediamanager/fstabbackend.cpp:452 mediamanager/fstabbackend.cpp:458
+#: mediamanager/fstabbackend.cpp:462 mediamanager/fstabbackend.cpp:468
msgid "Remote Share"
msgstr "Отдалечено споделяне"
-#: mediamanager/fstabbackend.cpp:463
+#: mediamanager/fstabbackend.cpp:473
msgid "Hard Disk"
msgstr "Твърд диск"
-#: mediamanager/halbackend.cpp:749 mediamanager/tdehardwarebackend.cpp:805
+#: mediamanager/halbackend.cpp:744 mediamanager/tdehardwarebackend.cpp:808
msgid "Unknown Drive"
msgstr "Неизвестно"
-#: mediamanager/halbackend.cpp:761 mediamanager/tdehardwarebackend.cpp:835
+#: mediamanager/halbackend.cpp:756 mediamanager/tdehardwarebackend.cpp:838
msgid "Floppy Drive"
msgstr "Флопи"
-#: mediamanager/halbackend.cpp:769
+#: mediamanager/halbackend.cpp:764
msgid "Zip Drive"
msgstr "Zip диск"
-#: mediamanager/halbackend.cpp:839 mediamanager/tdehardwarebackend.cpp:892
+#: mediamanager/halbackend.cpp:834 mediamanager/tdehardwarebackend.cpp:895
msgid "Camera"
msgstr "Камера"
-#: mediamanager/halbackend.cpp:1221 mediamanager/halbackend.cpp:1247
+#: mediamanager/halbackend.cpp:1216 mediamanager/halbackend.cpp:1242
msgid "Authenticate"
msgstr ""
-#: mediamanager/halbackend.cpp:1222
+#: mediamanager/halbackend.cpp:1217
msgid ""
"<big><b>System policy prevents mounting internal media</b></big><br/"
">Authentication is required to perform this action. Please enter your "
"password to verify."
msgstr ""
-#: mediamanager/halbackend.cpp:1248
+#: mediamanager/halbackend.cpp:1243
msgid ""
"<big><b>System policy prevents unmounting media mounted by other users</b></"
"big><br/>Authentication is required to perform this action. Please enter "
"your password to verify."
msgstr ""
-#: mediamanager/halbackend.cpp:1284
+#: mediamanager/halbackend.cpp:1259 mediamanager/halbackend.cpp:1268
+#: mediamanager/halbackend.cpp:1849 mediamanager/halbackend.cpp:1916
+#: mounthelper/tdeio_media_mounthelper.cpp:58
+msgid "Internal Error"
+msgstr "Вътрешна грешка"
+
+#: mediamanager/halbackend.cpp:1279
msgid "Invalid filesystem type"
msgstr "Невалиден тип файлова система"
-#: mediamanager/halbackend.cpp:1286
+#: mediamanager/halbackend.cpp:1281
msgid ""
"Permission denied<p>Please ensure that:<br>1. You have permission to access "
"this device.<br>2. This device node is not listed in /etc/fstab.</p>"
msgstr ""
-#: mediamanager/halbackend.cpp:1290
+#: mediamanager/halbackend.cpp:1285
msgid "Device is already mounted."
msgstr "Устройството вече е монтирано."
-#: mediamanager/halbackend.cpp:1340
+#: mediamanager/halbackend.cpp:1335
msgid ""
"Moreover, programs still using the device have been detected. They are "
"listed below. You have to close them or change their working directory "
@@ -178,16 +181,16 @@ msgstr ""
"Трябва да ги затворите, за да промените работната директория преди отново да "
"се опитате да демонтирате устройството."
-#: mediamanager/halbackend.cpp:1381 mediamanager/tdehardwarebackend.cpp:1588
+#: mediamanager/halbackend.cpp:1376 mediamanager/tdehardwarebackend.cpp:1618
msgid ""
"Programs that were still using the device have been forcibly terminated. "
"They are listed below."
msgstr ""
-#: mediamanager/halbackend.cpp:1402 mediamanager/halbackend.cpp:1715
-#: mediamanager/tdehardwarebackend.cpp:1406
-#: mediamanager/tdehardwarebackend.cpp:1424
-#: mediamanager/tdehardwarebackend.cpp:1464
+#: mediamanager/halbackend.cpp:1397 mediamanager/halbackend.cpp:1742
+#: mediamanager/tdehardwarebackend.cpp:1430
+#: mediamanager/tdehardwarebackend.cpp:1452
+#: mediamanager/tdehardwarebackend.cpp:1494
msgid ""
"Unfortunately, the device <b>%1</b> (%2) named <b>'%3'</b> and currently "
"mounted at <b>%4</b> could not be unmounted. "
@@ -195,196 +198,199 @@ msgstr ""
"Устройство <b>%1</b> (%2) е именувано <b>\"%3\"</b> и е монтирано в <b>%4</"
"b>. Не може да бъде демонтирано. "
-#: mediamanager/halbackend.cpp:1408 mediamanager/tdehardwarebackend.cpp:1470
+#: mediamanager/halbackend.cpp:1403 mediamanager/tdehardwarebackend.cpp:1500
msgid "The following error was returned by umount command:"
msgstr "Възникна следната грешка при команда за демонтиране:"
-#: mediamanager/halbackend.cpp:1478
+#: mediamanager/halbackend.cpp:1567 mediamanager/tdehardwarebackend.cpp:1322
+msgid "Cannot mount encrypted locked drives!"
+msgstr ""
+
+#: mediamanager/halbackend.cpp:1682 mediamanager/halbackend.cpp:1703
+#: mediamanager/halbackend.cpp:1716 mediamanager/halbackend.cpp:1830
+#: mediamanager/halbackend.cpp:1840 mediamanager/halbackend.cpp:1899
+#: mediamanager/halbackend.cpp:1907
#, fuzzy
-msgid "Permission denied"
-msgstr "Отказан достъп"
+msgid "Internal error"
+msgstr "Вътрешна грешка"
-#: mediamanager/halbackend.cpp:1562 mediamanager/tdehardwarebackend.cpp:1232
-msgid "Cannot mount encrypted drives!"
-msgstr ""
+#: mediamanager/halbackend.cpp:1694
+#, fuzzy
+#| msgid "Unknown"
+msgid "Unknown error"
+msgstr "Неизвестно"
-#: mediamanager/halbackend.cpp:1721
+#: mediamanager/halbackend.cpp:1748
msgid "Unmounting failed due to the following error:"
msgstr "Демонтирането беше неуспешно. Грешка:"
-#: mediamanager/halbackend.cpp:1723
+#: mediamanager/halbackend.cpp:1750
msgid "Device is Busy:"
msgstr "Заето устройство:"
-#: mediamanager/halbackend.cpp:1727
+#: mediamanager/halbackend.cpp:1754
msgid ""
"Permission denied<p>Please ensure that:<br>1. You have permission to access "
"this device.<br>2. This device was originally mounted using TDE.</p>"
msgstr ""
-#: mediamanager/halbackend.cpp:1739
+#: mediamanager/halbackend.cpp:1766
msgid ""
"%1<p><b>Would you like to forcibly terminate these processes?</b><br><i>All "
"unsaved data would be lost</i>"
msgstr ""
-#: mediamanager/halbackend.cpp:1811
+#: mediamanager/halbackend.cpp:1852
msgid "Wrong password"
msgstr ""
-#: mediamanager/mediamanager.cpp:247 mediamanager/mediamanager.cpp:266
-#: mediamanager/mediamanager.cpp:285 mediamanager/mediamanager.cpp:293
-#: mediamanager/mediamanager.cpp:302 mediamanager/mediamanager.cpp:310
-msgid "Feature only available with HAL"
-msgstr "Тази функция е налична само с HAL"
-
-#: mediamanager/mediamanager.cpp:252
+#: mediamanager/mediamanager.cpp:248 mediamanager/mediamanager.cpp:275
#, fuzzy
msgid "Feature only available with the TDE hardware backend"
msgstr "Тази функция е налична само с HAL"
-#: mediamanager/mediamanager.cpp:256 mediamanager/mediamanager.cpp:271
-#: mediamanager/mediamanager.cpp:275
+#: mediamanager/mediamanager.cpp:255 mediamanager/mediamanager.cpp:282
+#: mediamanager/mediamanager.cpp:312 mediamanager/mediamanager.cpp:343
+msgid "Feature only available with HAL"
+msgstr "Тази функция е налична само с HAL"
+
+#: mediamanager/mediamanager.cpp:262 mediamanager/mediamanager.cpp:289
+#: mediamanager/mediamanager.cpp:320 mediamanager/mediamanager.cpp:350
#, fuzzy
msgid "Feature only available with HAL or TDE hardware backend"
msgstr "Тази функция е налична само с HAL"
-#: mediamanager/tdehardwarebackend.cpp:480
-#: mediamanager/tdehardwarebackend.cpp:517
-#: mediamanager/tdehardwarebackend.cpp:750
+#: mediamanager/tdehardwarebackend.cpp:483
+#: mediamanager/tdehardwarebackend.cpp:520
+#: mediamanager/tdehardwarebackend.cpp:753
#, fuzzy
msgid "%1 Removable Device"
msgstr "Портативно устройство"
-#: mediamanager/tdehardwarebackend.cpp:525
+#: mediamanager/tdehardwarebackend.cpp:528
#, fuzzy
msgid "Blank CD-ROM"
msgstr "CD-ROM"
-#: mediamanager/tdehardwarebackend.cpp:534
+#: mediamanager/tdehardwarebackend.cpp:537
msgid "Blank CD-R"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:543
+#: mediamanager/tdehardwarebackend.cpp:546
msgid "Blank CD-RW"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:552
+#: mediamanager/tdehardwarebackend.cpp:555
msgid "Blank Magneto-Optical CD"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:561
+#: mediamanager/tdehardwarebackend.cpp:564
msgid "Blank Mount Ranier CD-RW"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:570
+#: mediamanager/tdehardwarebackend.cpp:573
msgid "Blank Mount Ranier CD-RW-W"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:579
+#: mediamanager/tdehardwarebackend.cpp:582
msgid "Blank DVD-ROM"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:588
+#: mediamanager/tdehardwarebackend.cpp:591
msgid "Blank DVD-RAM"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:597
+#: mediamanager/tdehardwarebackend.cpp:600
msgid "Blank DVD-R"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:606
+#: mediamanager/tdehardwarebackend.cpp:609
msgid "Blank DVD-RW"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:615
+#: mediamanager/tdehardwarebackend.cpp:618
msgid "Blank Dual Layer DVD-R"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:624
+#: mediamanager/tdehardwarebackend.cpp:627
msgid "Blank Dual Layer DVD-RW"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:633
+#: mediamanager/tdehardwarebackend.cpp:636
msgid "Blank DVD+R"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:642
+#: mediamanager/tdehardwarebackend.cpp:645
msgid "Blank DVD+RW"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:651
+#: mediamanager/tdehardwarebackend.cpp:654
msgid "Blank Dual Layer DVD+R"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:660
+#: mediamanager/tdehardwarebackend.cpp:663
msgid "Blank Dual Layer DVD+RW"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:669
+#: mediamanager/tdehardwarebackend.cpp:672
msgid "Blank BD-ROM"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:678
+#: mediamanager/tdehardwarebackend.cpp:681
msgid "Blank BD-R"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:687
+#: mediamanager/tdehardwarebackend.cpp:690
msgid "Blank BD-RW"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:696
+#: mediamanager/tdehardwarebackend.cpp:699
msgid "Blank HDDVD-ROM"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:705
+#: mediamanager/tdehardwarebackend.cpp:708
msgid "Blank HDDVD-R"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:714
+#: mediamanager/tdehardwarebackend.cpp:717
msgid "Blank HDDVD-RW"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:721
+#: mediamanager/tdehardwarebackend.cpp:724
msgid "Audio CD"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:742
+#: mediamanager/tdehardwarebackend.cpp:745
msgid "%1 Fixed Disk (%2)"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:849
+#: mediamanager/tdehardwarebackend.cpp:852
#, fuzzy
msgid "%1 Zip Disk"
msgstr "Zip Disk"
-#: mediamanager/tdehardwarebackend.cpp:1212
-#: mediamanager/tdehardwarebackend.cpp:1392
-#, fuzzy
-msgid "Internal error"
-msgstr "Вътрешна грешка"
+#: mediamanager/tdehardwarebackend.cpp:1224
+#: mediamanager/tdehardwarebackend.cpp:1417
+msgid "Internal error. Couldn't find medium."
+msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:1239
-msgid ""
-"<qt>Unable to mount this device.<p>Potential reasons include:<br>Improper "
-"device and/or user privilege level<br>Corrupt data on storage device"
+#: mediamanager/tdehardwarebackend.cpp:1249
+#: mediamanager/tdehardwarebackend.cpp:1323
+msgid "Unable to mount this device."
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:1241
-#: mediamanager/tdehardwarebackend.cpp:1316
-#: mediamanager/tdehardwarebackend.cpp:1408
-#: mediamanager/tdehardwarebackend.cpp:1426
+#: mediamanager/tdehardwarebackend.cpp:1252
+#: mediamanager/tdehardwarebackend.cpp:1326
+#: mediamanager/tdehardwarebackend.cpp:1435
+#: mediamanager/tdehardwarebackend.cpp:1457
msgid "<p>Technical details:<br>"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:1314
-msgid ""
-"<qt>Unable to mount this device.<p>Potential reasons include:<br>Improper "
-"device and/or user privilege level<br>Corrupt data on storage "
-"device<br>Incorrect encryption password"
+#: mediamanager/tdehardwarebackend.cpp:1284
+msgid "Decryption aborted"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:1420
+#: mediamanager/tdehardwarebackend.cpp:1443
msgid ""
"<qt>The device <b>%1</b> (%2) named <b>'%3'</b> and currently mounted at <b>"
"%4</b> can not be unmounted at this time.<p>%5<p><b>Would you like to "
@@ -392,7 +398,7 @@ msgid ""
"lost</i>"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:1547
+#: mediamanager/tdehardwarebackend.cpp:1577
#, fuzzy
msgid ""
"Programs still using the device have been detected. They are listed below. "
@@ -407,7 +413,7 @@ msgstr ""
msgid "%1 cannot be found."
msgstr "Не може да бъде намерено %1."
-#: mounthelper/tdeio_media_mounthelper.cpp:86
+#: mounthelper/tdeio_media_mounthelper.cpp:87
msgid "%1 is not a mountable media."
msgstr "Носителят %1 не е преносим мултимедиен носител."
@@ -418,39 +424,47 @@ msgstr "Носителят %1 не е преносим мултимедиен н
#: mounthelper/tdeio_media_mounthelper.cpp:107
#, fuzzy
-msgid "%1 is already decrypted."
+msgid "%1 is already unlocked."
msgstr "Устройството вече е монтирано."
-#: mounthelper/tdeio_media_mounthelper.cpp:228
+#: mounthelper/tdeio_media_mounthelper.cpp:139
+msgid "Unknown unmount error."
+msgstr ""
+
+#: mounthelper/tdeio_media_mounthelper.cpp:246
msgid "The device was successfully unmounted, but the tray could not be opened"
msgstr "Устройството беше демонтирано, но треят не може да бъде отворен"
-#: mounthelper/tdeio_media_mounthelper.cpp:230
+#: mounthelper/tdeio_media_mounthelper.cpp:248
msgid "The device was successfully unmounted, but could not be ejected"
msgstr "Устройството беше демонтирано, но изваждането беше неуспешно"
-#: mounthelper/tdeio_media_mounthelper.cpp:275
+#: mounthelper/tdeio_media_mounthelper.cpp:281
+msgid "Unknown decrypt error."
+msgstr ""
+
+#: mounthelper/tdeio_media_mounthelper.cpp:295
#, fuzzy
msgid "Decrypt given URL"
msgstr "Демонтиране на носителя"
-#: mounthelper/tdeio_media_mounthelper.cpp:276
+#: mounthelper/tdeio_media_mounthelper.cpp:296
msgid "Unmount given URL"
msgstr "Демонтиране на носителя"
-#: mounthelper/tdeio_media_mounthelper.cpp:277
+#: mounthelper/tdeio_media_mounthelper.cpp:297
msgid "Mount given URL (default)"
msgstr "Монтиране на носителя (по подразбиране)"
-#: mounthelper/tdeio_media_mounthelper.cpp:278
+#: mounthelper/tdeio_media_mounthelper.cpp:298
msgid "Eject given URL via tdeeject"
msgstr "Изваждане на носителя чрез tdeeject"
-#: mounthelper/tdeio_media_mounthelper.cpp:279
+#: mounthelper/tdeio_media_mounthelper.cpp:299
msgid "Unmount and Eject given URL (necessary for some USB devices)"
msgstr "Демонтиране и изваждане на зададения адрес (за някои USB устройства)"
-#: mounthelper/tdeio_media_mounthelper.cpp:280
+#: mounthelper/tdeio_media_mounthelper.cpp:300
msgid "media:/ URL to mount/unmount/eject/remove"
msgstr "Адрес media:/ за монтиране/демонтиране/изваждане"
@@ -471,43 +485,43 @@ msgstr "Неуспешен запис на промените"
msgid "&Mounting"
msgstr "&Монтиране"
-#: tdefile-plugin/tdefilemediaplugin.cpp:190
+#: tdefile-plugin/tdefilemediaplugin.cpp:184
msgid "Medium Information"
msgstr "Информация за носителя"
-#: tdefile-plugin/tdefilemediaplugin.cpp:193
+#: tdefile-plugin/tdefilemediaplugin.cpp:187
msgid "Free"
msgstr "Свободно"
-#: tdefile-plugin/tdefilemediaplugin.cpp:196
+#: tdefile-plugin/tdefilemediaplugin.cpp:190
msgid "Used"
msgstr "Заето"
-#: tdefile-plugin/tdefilemediaplugin.cpp:199
+#: tdefile-plugin/tdefilemediaplugin.cpp:193
msgid "Total"
msgstr "Общо"
-#: tdefile-plugin/tdefilemediaplugin.cpp:202
+#: tdefile-plugin/tdefilemediaplugin.cpp:196
msgid "Base URL"
msgstr "Базов адрес"
-#: tdefile-plugin/tdefilemediaplugin.cpp:203
+#: tdefile-plugin/tdefilemediaplugin.cpp:197
msgid "Mount Point"
msgstr "Точка на монтиране"
-#: tdefile-plugin/tdefilemediaplugin.cpp:204
+#: tdefile-plugin/tdefilemediaplugin.cpp:198
msgid "Device Node"
msgstr "Възел на устройството"
-#: tdefile-plugin/tdefilemediaplugin.cpp:206
+#: tdefile-plugin/tdefilemediaplugin.cpp:200
msgid "Medium Summary"
msgstr "Резюме на носителя"
-#: tdefile-plugin/tdefilemediaplugin.cpp:208
+#: tdefile-plugin/tdefilemediaplugin.cpp:202
msgid "Usage"
msgstr "Използване"
-#: tdefile-plugin/tdefilemediaplugin.cpp:210
+#: tdefile-plugin/tdefilemediaplugin.cpp:204
msgid "Bar Graph"
msgstr "Графика"
@@ -579,23 +593,30 @@ msgid ""
"devices are plugged in."
msgstr ""
-#: mediamanager/decryptdialog.ui:24 mounthelper/decryptdialog.ui:24
+#: mediamanager/unlockdialog.ui:24 mounthelper/unlockdialog.ui:24
#, no-c-format
msgid "Decrypting Storage Device"
msgstr ""
-#: mediamanager/decryptdialog.ui:109 mounthelper/decryptdialog.ui:109
+#: mediamanager/unlockdialog.ui:109
#, no-c-format
msgid ""
-"<p><b>%1</b> is an encrypted storage device.</p>\n"
-"<p>Please enter the password to decrypt the storage device.</p>"
+"<p><b>%1</b> is an encrypted locked storage device.</p>\n"
+"<p>Please enter the password to unlock the storage device.</p>"
msgstr ""
-#: mediamanager/decryptdialog.ui:131 mounthelper/decryptdialog.ui:131
+#: mediamanager/unlockdialog.ui:131 mounthelper/unlockdialog.ui:131
#, no-c-format
msgid "&Password:"
msgstr ""
+#: mounthelper/unlockdialog.ui:109
+#, no-c-format
+msgid ""
+"<p><b>%1</b> is an encrypted storage device.</p>\n"
+"<p>Please enter the password to decrypt the storage device.</p>"
+msgstr ""
+
#: propsdlgplugin/propertiespagegui.ui:16
#, no-c-format
msgid "PropertiesPageGUI"
@@ -854,3 +875,7 @@ msgstr "Смесено"
#, no-c-format
msgid "Filesystem: iso9660"
msgstr "Файлова система: iso9660"
+
+#, 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 6b69522fd43..e797d4ffa4c 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: 2019-01-13 18:47+0100\n"
+"POT-Creation-Date: 2019-07-11 02:33+0200\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"
@@ -49,7 +49,6 @@ msgstr "অচেনা"
#: mediaimpl.cpp:88 mediaimpl.cpp:115 mediaimpl.cpp:141 mediaimpl.cpp:177
#: mediaimpl.cpp:197 mediaimpl.cpp:218
#: mounthelper/tdeio_media_mounthelper.cpp:50
-#: mounthelper/tdeio_media_mounthelper.cpp:256
msgid "The TDE mediamanager is not running."
msgstr "কে.ডি.ই. মিডিয়া-ম্যানেজার চালু নেই।"
@@ -57,7 +56,7 @@ msgstr "কে.ডি.ই. মিডিয়া-ম্যানেজার চা
msgid "This media name already exists."
msgstr "এই নামের মিডিয়া আগে থেকেই আছে।"
-#: mediaimpl.cpp:230 mediaimpl.cpp:293
+#: mediaimpl.cpp:230 mediaimpl.cpp:297
msgid "No such medium."
msgstr ""
@@ -65,320 +64,328 @@ msgstr ""
msgid "The drive is encrypted."
msgstr ""
-#: mediaimpl.cpp:272 mediamanager/halbackend.cpp:1264
-#: mediamanager/halbackend.cpp:1273 mediamanager/halbackend.cpp:1663
-#: mediamanager/halbackend.cpp:1680 mediamanager/halbackend.cpp:1691
-#: mediamanager/halbackend.cpp:1793 mediamanager/halbackend.cpp:1801
-#: mediamanager/halbackend.cpp:1808 mediamanager/halbackend.cpp:1848
-#: mediamanager/halbackend.cpp:1854 mediamanager/halbackend.cpp:1861
-#: mounthelper/tdeio_media_mounthelper.cpp:58
-msgid "Internal Error"
+#: mediaimpl.cpp:274 mediamanager/tdehardwarebackend.cpp:201
+#: mediamanager/tdehardwarebackend.cpp:252
+#: mounthelper/tdeio_media_mounthelper.cpp:202
+msgid "Unknown mount error."
msgstr ""
#: mediamanager/dialog.cpp:26 mounthelper/dialog.cpp:26
-msgid "Decrypt"
+msgid "Unlock"
msgstr ""
-#: mediamanager/fstabbackend.cpp:104 mediamanager/fstabbackend.cpp:114
-#: mediamanager/halbackend.cpp:1595 mediamanager/halbackend.cpp:1617
-#: mediamanager/halbackend.cpp:1776 mediamanager/halbackend.cpp:1831
-#: mediamanager/tdehardwarebackend.cpp:1349
-#: mediamanager/tdehardwarebackend.cpp:1360
+#: mediamanager/fstabbackend.cpp:105 mediamanager/fstabbackend.cpp:120
+#: mediamanager/halbackend.cpp:1598 mediamanager/halbackend.cpp:1625
+#: mediamanager/halbackend.cpp:1808 mediamanager/halbackend.cpp:1877
+#: mediamanager/mediamanager.cpp:363 mediamanager/mediamanager.cpp:375
+#: mediamanager/mediamanager.cpp:387 mediamanager/mediamanager.cpp:399
+#: mediamanager/tdehardwarebackend.cpp:1363
+#: mediamanager/tdehardwarebackend.cpp:1378
#, c-format
msgid "No such medium: %1"
msgstr ""
-#: mediamanager/fstabbackend.cpp:398
+#: mediamanager/fstabbackend.cpp:408
msgid "CD Recorder"
msgstr "সিডি রেকর্ডার"
-#: mediamanager/fstabbackend.cpp:404
+#: mediamanager/fstabbackend.cpp:414
msgid "DVD"
msgstr "ডিভিডি"
-#: mediamanager/fstabbackend.cpp:415
+#: mediamanager/fstabbackend.cpp:425
msgid "CD-ROM"
msgstr "সিডি-রম"
-#: mediamanager/fstabbackend.cpp:428
+#: mediamanager/fstabbackend.cpp:438
msgid "Floppy"
msgstr "ফ্লপি"
-#: mediamanager/fstabbackend.cpp:436
+#: mediamanager/fstabbackend.cpp:446
msgid "Zip Disk"
msgstr "জীপ ডিস্ক"
-#: mediamanager/fstabbackend.cpp:447
+#: mediamanager/fstabbackend.cpp:457
msgid "Removable Device"
msgstr "অপসারণযোগ্য ডিভাইস"
-#: mediamanager/fstabbackend.cpp:452 mediamanager/fstabbackend.cpp:458
+#: mediamanager/fstabbackend.cpp:462 mediamanager/fstabbackend.cpp:468
msgid "Remote Share"
msgstr "রিমোট শেয়ার"
-#: mediamanager/fstabbackend.cpp:463
+#: mediamanager/fstabbackend.cpp:473
msgid "Hard Disk"
msgstr "হার্ড ডিস্ক"
-#: mediamanager/halbackend.cpp:749 mediamanager/tdehardwarebackend.cpp:805
+#: mediamanager/halbackend.cpp:744 mediamanager/tdehardwarebackend.cpp:808
#, fuzzy
msgid "Unknown Drive"
msgstr "অচেনা"
-#: mediamanager/halbackend.cpp:761 mediamanager/tdehardwarebackend.cpp:835
+#: mediamanager/halbackend.cpp:756 mediamanager/tdehardwarebackend.cpp:838
#, fuzzy
msgid "Floppy Drive"
msgstr "ফ্লপি"
-#: mediamanager/halbackend.cpp:769
+#: mediamanager/halbackend.cpp:764
#, fuzzy
msgid "Zip Drive"
msgstr "জীপ ডিস্ক"
-#: mediamanager/halbackend.cpp:839 mediamanager/tdehardwarebackend.cpp:892
+#: mediamanager/halbackend.cpp:834 mediamanager/tdehardwarebackend.cpp:895
msgid "Camera"
msgstr "ক্যামেরা"
-#: mediamanager/halbackend.cpp:1221 mediamanager/halbackend.cpp:1247
+#: mediamanager/halbackend.cpp:1216 mediamanager/halbackend.cpp:1242
msgid "Authenticate"
msgstr ""
-#: mediamanager/halbackend.cpp:1222
+#: mediamanager/halbackend.cpp:1217
msgid ""
"<big><b>System policy prevents mounting internal media</b></big><br/"
">Authentication is required to perform this action. Please enter your "
"password to verify."
msgstr ""
-#: mediamanager/halbackend.cpp:1248
+#: mediamanager/halbackend.cpp:1243
msgid ""
"<big><b>System policy prevents unmounting media mounted by other users</b></"
"big><br/>Authentication is required to perform this action. Please enter "
"your password to verify."
msgstr ""
-#: mediamanager/halbackend.cpp:1284
+#: mediamanager/halbackend.cpp:1259 mediamanager/halbackend.cpp:1268
+#: mediamanager/halbackend.cpp:1849 mediamanager/halbackend.cpp:1916
+#: mounthelper/tdeio_media_mounthelper.cpp:58
+msgid "Internal Error"
+msgstr ""
+
+#: mediamanager/halbackend.cpp:1279
msgid "Invalid filesystem type"
msgstr ""
-#: mediamanager/halbackend.cpp:1286
+#: mediamanager/halbackend.cpp:1281
msgid ""
"Permission denied<p>Please ensure that:<br>1. You have permission to access "
"this device.<br>2. This device node is not listed in /etc/fstab.</p>"
msgstr ""
-#: mediamanager/halbackend.cpp:1290
+#: mediamanager/halbackend.cpp:1285
msgid "Device is already mounted."
msgstr ""
-#: mediamanager/halbackend.cpp:1340
+#: mediamanager/halbackend.cpp:1335
msgid ""
"Moreover, programs still using the device have been detected. They are "
"listed below. You have to close them or change their working directory "
"before attempting to unmount the device again."
msgstr ""
-#: mediamanager/halbackend.cpp:1381 mediamanager/tdehardwarebackend.cpp:1588
+#: mediamanager/halbackend.cpp:1376 mediamanager/tdehardwarebackend.cpp:1618
msgid ""
"Programs that were still using the device have been forcibly terminated. "
"They are listed below."
msgstr ""
-#: mediamanager/halbackend.cpp:1402 mediamanager/halbackend.cpp:1715
-#: mediamanager/tdehardwarebackend.cpp:1406
-#: mediamanager/tdehardwarebackend.cpp:1424
-#: mediamanager/tdehardwarebackend.cpp:1464
+#: mediamanager/halbackend.cpp:1397 mediamanager/halbackend.cpp:1742
+#: mediamanager/tdehardwarebackend.cpp:1430
+#: mediamanager/tdehardwarebackend.cpp:1452
+#: mediamanager/tdehardwarebackend.cpp:1494
msgid ""
"Unfortunately, the device <b>%1</b> (%2) named <b>'%3'</b> and currently "
"mounted at <b>%4</b> could not be unmounted. "
msgstr ""
-#: mediamanager/halbackend.cpp:1408 mediamanager/tdehardwarebackend.cpp:1470
+#: mediamanager/halbackend.cpp:1403 mediamanager/tdehardwarebackend.cpp:1500
msgid "The following error was returned by umount command:"
msgstr ""
-#: mediamanager/halbackend.cpp:1478
-msgid "Permission denied"
+#: mediamanager/halbackend.cpp:1567 mediamanager/tdehardwarebackend.cpp:1322
+msgid "Cannot mount encrypted locked drives!"
msgstr ""
-#: mediamanager/halbackend.cpp:1562 mediamanager/tdehardwarebackend.cpp:1232
-msgid "Cannot mount encrypted drives!"
+#: mediamanager/halbackend.cpp:1682 mediamanager/halbackend.cpp:1703
+#: mediamanager/halbackend.cpp:1716 mediamanager/halbackend.cpp:1830
+#: mediamanager/halbackend.cpp:1840 mediamanager/halbackend.cpp:1899
+#: mediamanager/halbackend.cpp:1907
+msgid "Internal error"
msgstr ""
-#: mediamanager/halbackend.cpp:1721
+#: mediamanager/halbackend.cpp:1694
+#, fuzzy
+#| msgid "Unknown"
+msgid "Unknown error"
+msgstr "অচেনা"
+
+#: mediamanager/halbackend.cpp:1748
msgid "Unmounting failed due to the following error:"
msgstr ""
-#: mediamanager/halbackend.cpp:1723
+#: mediamanager/halbackend.cpp:1750
msgid "Device is Busy:"
msgstr ""
-#: mediamanager/halbackend.cpp:1727
+#: mediamanager/halbackend.cpp:1754
msgid ""
"Permission denied<p>Please ensure that:<br>1. You have permission to access "
"this device.<br>2. This device was originally mounted using TDE.</p>"
msgstr ""
-#: mediamanager/halbackend.cpp:1739
+#: mediamanager/halbackend.cpp:1766
msgid ""
"%1<p><b>Would you like to forcibly terminate these processes?</b><br><i>All "
"unsaved data would be lost</i>"
msgstr ""
-#: mediamanager/halbackend.cpp:1811
+#: mediamanager/halbackend.cpp:1852
msgid "Wrong password"
msgstr ""
-#: mediamanager/mediamanager.cpp:247 mediamanager/mediamanager.cpp:266
-#: mediamanager/mediamanager.cpp:285 mediamanager/mediamanager.cpp:293
-#: mediamanager/mediamanager.cpp:302 mediamanager/mediamanager.cpp:310
-msgid "Feature only available with HAL"
+#: mediamanager/mediamanager.cpp:248 mediamanager/mediamanager.cpp:275
+msgid "Feature only available with the TDE hardware backend"
msgstr ""
-#: mediamanager/mediamanager.cpp:252
-msgid "Feature only available with the TDE hardware backend"
+#: mediamanager/mediamanager.cpp:255 mediamanager/mediamanager.cpp:282
+#: mediamanager/mediamanager.cpp:312 mediamanager/mediamanager.cpp:343
+msgid "Feature only available with HAL"
msgstr ""
-#: mediamanager/mediamanager.cpp:256 mediamanager/mediamanager.cpp:271
-#: mediamanager/mediamanager.cpp:275
+#: mediamanager/mediamanager.cpp:262 mediamanager/mediamanager.cpp:289
+#: mediamanager/mediamanager.cpp:320 mediamanager/mediamanager.cpp:350
msgid "Feature only available with HAL or TDE hardware backend"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:480
-#: mediamanager/tdehardwarebackend.cpp:517
-#: mediamanager/tdehardwarebackend.cpp:750
+#: mediamanager/tdehardwarebackend.cpp:483
+#: mediamanager/tdehardwarebackend.cpp:520
+#: mediamanager/tdehardwarebackend.cpp:753
#, fuzzy
msgid "%1 Removable Device"
msgstr "অপসারণযোগ্য ডিভাইস"
-#: mediamanager/tdehardwarebackend.cpp:525
+#: mediamanager/tdehardwarebackend.cpp:528
#, fuzzy
msgid "Blank CD-ROM"
msgstr "সিডি-রম"
-#: mediamanager/tdehardwarebackend.cpp:534
+#: mediamanager/tdehardwarebackend.cpp:537
msgid "Blank CD-R"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:543
+#: mediamanager/tdehardwarebackend.cpp:546
msgid "Blank CD-RW"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:552
+#: mediamanager/tdehardwarebackend.cpp:555
msgid "Blank Magneto-Optical CD"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:561
+#: mediamanager/tdehardwarebackend.cpp:564
msgid "Blank Mount Ranier CD-RW"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:570
+#: mediamanager/tdehardwarebackend.cpp:573
msgid "Blank Mount Ranier CD-RW-W"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:579
+#: mediamanager/tdehardwarebackend.cpp:582
msgid "Blank DVD-ROM"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:588
+#: mediamanager/tdehardwarebackend.cpp:591
msgid "Blank DVD-RAM"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:597
+#: mediamanager/tdehardwarebackend.cpp:600
msgid "Blank DVD-R"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:606
+#: mediamanager/tdehardwarebackend.cpp:609
msgid "Blank DVD-RW"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:615
+#: mediamanager/tdehardwarebackend.cpp:618
msgid "Blank Dual Layer DVD-R"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:624
+#: mediamanager/tdehardwarebackend.cpp:627
msgid "Blank Dual Layer DVD-RW"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:633
+#: mediamanager/tdehardwarebackend.cpp:636
msgid "Blank DVD+R"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:642
+#: mediamanager/tdehardwarebackend.cpp:645
msgid "Blank DVD+RW"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:651
+#: mediamanager/tdehardwarebackend.cpp:654
msgid "Blank Dual Layer DVD+R"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:660
+#: mediamanager/tdehardwarebackend.cpp:663
msgid "Blank Dual Layer DVD+RW"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:669
+#: mediamanager/tdehardwarebackend.cpp:672
msgid "Blank BD-ROM"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:678
+#: mediamanager/tdehardwarebackend.cpp:681
msgid "Blank BD-R"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:687
+#: mediamanager/tdehardwarebackend.cpp:690
msgid "Blank BD-RW"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:696
+#: mediamanager/tdehardwarebackend.cpp:699
msgid "Blank HDDVD-ROM"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:705
+#: mediamanager/tdehardwarebackend.cpp:708
msgid "Blank HDDVD-R"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:714
+#: mediamanager/tdehardwarebackend.cpp:717
msgid "Blank HDDVD-RW"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:721
+#: mediamanager/tdehardwarebackend.cpp:724
msgid "Audio CD"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:742
+#: mediamanager/tdehardwarebackend.cpp:745
msgid "%1 Fixed Disk (%2)"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:849
+#: mediamanager/tdehardwarebackend.cpp:852
#, fuzzy
msgid "%1 Zip Disk"
msgstr "জীপ ডিস্ক"
-#: mediamanager/tdehardwarebackend.cpp:1212
-#: mediamanager/tdehardwarebackend.cpp:1392
-msgid "Internal error"
+#: mediamanager/tdehardwarebackend.cpp:1224
+#: mediamanager/tdehardwarebackend.cpp:1417
+msgid "Internal error. Couldn't find medium."
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:1239
-msgid ""
-"<qt>Unable to mount this device.<p>Potential reasons include:<br>Improper "
-"device and/or user privilege level<br>Corrupt data on storage device"
+#: mediamanager/tdehardwarebackend.cpp:1249
+#: mediamanager/tdehardwarebackend.cpp:1323
+msgid "Unable to mount this device."
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:1241
-#: mediamanager/tdehardwarebackend.cpp:1316
-#: mediamanager/tdehardwarebackend.cpp:1408
-#: mediamanager/tdehardwarebackend.cpp:1426
+#: mediamanager/tdehardwarebackend.cpp:1252
+#: mediamanager/tdehardwarebackend.cpp:1326
+#: mediamanager/tdehardwarebackend.cpp:1435
+#: mediamanager/tdehardwarebackend.cpp:1457
msgid "<p>Technical details:<br>"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:1314
-msgid ""
-"<qt>Unable to mount this device.<p>Potential reasons include:<br>Improper "
-"device and/or user privilege level<br>Corrupt data on storage "
-"device<br>Incorrect encryption password"
+#: mediamanager/tdehardwarebackend.cpp:1284
+msgid "Decryption aborted"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:1420
+#: mediamanager/tdehardwarebackend.cpp:1443
msgid ""
"<qt>The device <b>%1</b> (%2) named <b>'%3'</b> and currently mounted at <b>"
"%4</b> can not be unmounted at this time.<p>%5<p><b>Would you like to "
@@ -386,7 +393,7 @@ msgid ""
"lost</i>"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:1547
+#: mediamanager/tdehardwarebackend.cpp:1577
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 "
@@ -397,7 +404,7 @@ msgstr ""
msgid "%1 cannot be found."
msgstr "%1 পাওয়া যায়নি।"
-#: mounthelper/tdeio_media_mounthelper.cpp:86
+#: mounthelper/tdeio_media_mounthelper.cpp:87
msgid "%1 is not a mountable media."
msgstr "%1 মিডিয়া মাউন্ট করা যায় না।"
@@ -407,40 +414,48 @@ msgid "%1 is not an encrypted media."
msgstr "%1 মিডিয়া মাউন্ট করা যায় না।"
#: mounthelper/tdeio_media_mounthelper.cpp:107
-msgid "%1 is already decrypted."
+msgid "%1 is already unlocked."
msgstr ""
-#: mounthelper/tdeio_media_mounthelper.cpp:228
+#: mounthelper/tdeio_media_mounthelper.cpp:139
+msgid "Unknown unmount error."
+msgstr ""
+
+#: mounthelper/tdeio_media_mounthelper.cpp:246
msgid "The device was successfully unmounted, but the tray could not be opened"
msgstr ""
-#: mounthelper/tdeio_media_mounthelper.cpp:230
+#: mounthelper/tdeio_media_mounthelper.cpp:248
msgid "The device was successfully unmounted, but could not be ejected"
msgstr ""
-#: mounthelper/tdeio_media_mounthelper.cpp:275
+#: mounthelper/tdeio_media_mounthelper.cpp:281
+msgid "Unknown decrypt error."
+msgstr ""
+
+#: mounthelper/tdeio_media_mounthelper.cpp:295
#, fuzzy
msgid "Decrypt given URL"
msgstr "প্রদত্ত ইউ-আর-এল আনমাউন্ট করুন"
-#: mounthelper/tdeio_media_mounthelper.cpp:276
+#: mounthelper/tdeio_media_mounthelper.cpp:296
msgid "Unmount given URL"
msgstr "প্রদত্ত ইউ-আর-এল আনমাউন্ট করুন"
-#: mounthelper/tdeio_media_mounthelper.cpp:277
+#: mounthelper/tdeio_media_mounthelper.cpp:297
msgid "Mount given URL (default)"
msgstr "প্রদত্ত ইউ-আর-এল মাউন্ট করুন"
-#: mounthelper/tdeio_media_mounthelper.cpp:278
+#: mounthelper/tdeio_media_mounthelper.cpp:298
msgid "Eject given URL via tdeeject"
msgstr "প্রদত্ত ইউ-আর-এল tdeeject ব্যবহার করে বের করে দিন"
-#: mounthelper/tdeio_media_mounthelper.cpp:279
+#: mounthelper/tdeio_media_mounthelper.cpp:299
msgid "Unmount and Eject given URL (necessary for some USB devices)"
msgstr ""
"প্রদত্ত ইউ-আর-এল আনমাউন্ট এবং এজেক্ট করো (কিছু ইউ-এস-বি ডিভাইস-এর জন্য প্রয়োজনীয়)"
-#: mounthelper/tdeio_media_mounthelper.cpp:280
+#: mounthelper/tdeio_media_mounthelper.cpp:300
msgid "media:/ URL to mount/unmount/eject/remove"
msgstr "media:/ মাউন্ট/আনমাউন্ট/বের করার ইউ-আর-এল(URL)"
@@ -462,43 +477,43 @@ msgstr ""
msgid "&Mounting"
msgstr "মাউন্ট পয়েন্ট"
-#: tdefile-plugin/tdefilemediaplugin.cpp:190
+#: tdefile-plugin/tdefilemediaplugin.cpp:184
msgid "Medium Information"
msgstr "মিডিয়াম তথ্য"
-#: tdefile-plugin/tdefilemediaplugin.cpp:193
+#: tdefile-plugin/tdefilemediaplugin.cpp:187
msgid "Free"
msgstr "ফাঁকা"
-#: tdefile-plugin/tdefilemediaplugin.cpp:196
+#: tdefile-plugin/tdefilemediaplugin.cpp:190
msgid "Used"
msgstr "ব্যবহৃত"
-#: tdefile-plugin/tdefilemediaplugin.cpp:199
+#: tdefile-plugin/tdefilemediaplugin.cpp:193
msgid "Total"
msgstr "মোট"
-#: tdefile-plugin/tdefilemediaplugin.cpp:202
+#: tdefile-plugin/tdefilemediaplugin.cpp:196
msgid "Base URL"
msgstr "বেস ইউ-আর-এল"
-#: tdefile-plugin/tdefilemediaplugin.cpp:203
+#: tdefile-plugin/tdefilemediaplugin.cpp:197
msgid "Mount Point"
msgstr "মাউন্ট পয়েন্ট"
-#: tdefile-plugin/tdefilemediaplugin.cpp:204
+#: tdefile-plugin/tdefilemediaplugin.cpp:198
msgid "Device Node"
msgstr "ডিভাইস নোড"
-#: tdefile-plugin/tdefilemediaplugin.cpp:206
+#: tdefile-plugin/tdefilemediaplugin.cpp:200
msgid "Medium Summary"
msgstr "মিডিয়াম সারাংশ"
-#: tdefile-plugin/tdefilemediaplugin.cpp:208
+#: tdefile-plugin/tdefilemediaplugin.cpp:202
msgid "Usage"
msgstr "ব্যবহার"
-#: tdefile-plugin/tdefilemediaplugin.cpp:210
+#: tdefile-plugin/tdefilemediaplugin.cpp:204
msgid "Bar Graph"
msgstr "বার গ্রাফ"
@@ -570,23 +585,30 @@ msgid ""
"devices are plugged in."
msgstr ""
-#: mediamanager/decryptdialog.ui:24 mounthelper/decryptdialog.ui:24
+#: mediamanager/unlockdialog.ui:24 mounthelper/unlockdialog.ui:24
#, no-c-format
msgid "Decrypting Storage Device"
msgstr ""
-#: mediamanager/decryptdialog.ui:109 mounthelper/decryptdialog.ui:109
+#: mediamanager/unlockdialog.ui:109
#, no-c-format
msgid ""
-"<p><b>%1</b> is an encrypted storage device.</p>\n"
-"<p>Please enter the password to decrypt the storage device.</p>"
+"<p><b>%1</b> is an encrypted locked storage device.</p>\n"
+"<p>Please enter the password to unlock the storage device.</p>"
msgstr ""
-#: mediamanager/decryptdialog.ui:131 mounthelper/decryptdialog.ui:131
+#: mediamanager/unlockdialog.ui:131 mounthelper/unlockdialog.ui:131
#, no-c-format
msgid "&Password:"
msgstr ""
+#: mounthelper/unlockdialog.ui:109
+#, no-c-format
+msgid ""
+"<p><b>%1</b> is an encrypted storage device.</p>\n"
+"<p>Please enter the password to decrypt the storage device.</p>"
+msgstr ""
+
#: propsdlgplugin/propertiespagegui.ui:16
#, no-c-format
msgid "PropertiesPageGUI"
diff --git a/tde-i18n-br/messages/tdebase/tdeio_media.po b/tde-i18n-br/messages/tdebase/tdeio_media.po
index eaf2ee62f87..07cff2b8093 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: 2019-01-13 18:47+0100\n"
+"POT-Creation-Date: 2019-07-11 02:33+0200\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"
@@ -43,7 +43,6 @@ 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
-#: mounthelper/tdeio_media_mounthelper.cpp:256
msgid "The TDE mediamanager is not running."
msgstr ""
@@ -51,7 +50,7 @@ msgstr ""
msgid "This media name already exists."
msgstr "Endeo eo anv-vedia-mañ."
-#: mediaimpl.cpp:230 mediaimpl.cpp:293
+#: mediaimpl.cpp:230 mediaimpl.cpp:297
msgid "No such medium."
msgstr "Hevelep mediuml ebet."
@@ -59,321 +58,329 @@ msgstr "Hevelep mediuml ebet."
msgid "The drive is encrypted."
msgstr ""
-#: mediaimpl.cpp:272 mediamanager/halbackend.cpp:1264
-#: mediamanager/halbackend.cpp:1273 mediamanager/halbackend.cpp:1663
-#: mediamanager/halbackend.cpp:1680 mediamanager/halbackend.cpp:1691
-#: mediamanager/halbackend.cpp:1793 mediamanager/halbackend.cpp:1801
-#: mediamanager/halbackend.cpp:1808 mediamanager/halbackend.cpp:1848
-#: mediamanager/halbackend.cpp:1854 mediamanager/halbackend.cpp:1861
-#: mounthelper/tdeio_media_mounthelper.cpp:58
-msgid "Internal Error"
-msgstr "Fazi diabarzh"
+#: mediaimpl.cpp:274 mediamanager/tdehardwarebackend.cpp:201
+#: mediamanager/tdehardwarebackend.cpp:252
+#: mounthelper/tdeio_media_mounthelper.cpp:202
+msgid "Unknown mount error."
+msgstr ""
#: mediamanager/dialog.cpp:26 mounthelper/dialog.cpp:26
-msgid "Decrypt"
+msgid "Unlock"
msgstr ""
-#: mediamanager/fstabbackend.cpp:104 mediamanager/fstabbackend.cpp:114
-#: mediamanager/halbackend.cpp:1595 mediamanager/halbackend.cpp:1617
-#: mediamanager/halbackend.cpp:1776 mediamanager/halbackend.cpp:1831
-#: mediamanager/tdehardwarebackend.cpp:1349
-#: mediamanager/tdehardwarebackend.cpp:1360
+#: mediamanager/fstabbackend.cpp:105 mediamanager/fstabbackend.cpp:120
+#: mediamanager/halbackend.cpp:1598 mediamanager/halbackend.cpp:1625
+#: mediamanager/halbackend.cpp:1808 mediamanager/halbackend.cpp:1877
+#: mediamanager/mediamanager.cpp:363 mediamanager/mediamanager.cpp:375
+#: mediamanager/mediamanager.cpp:387 mediamanager/mediamanager.cpp:399
+#: mediamanager/tdehardwarebackend.cpp:1363
+#: mediamanager/tdehardwarebackend.cpp:1378
#, c-format
msgid "No such medium: %1"
msgstr ""
-#: mediamanager/fstabbackend.cpp:398
+#: mediamanager/fstabbackend.cpp:408
msgid "CD Recorder"
msgstr "Skriver CD"
-#: mediamanager/fstabbackend.cpp:404
+#: mediamanager/fstabbackend.cpp:414
msgid "DVD"
msgstr "DVD"
-#: mediamanager/fstabbackend.cpp:415
+#: mediamanager/fstabbackend.cpp:425
msgid "CD-ROM"
msgstr "CD-ROM"
-#: mediamanager/fstabbackend.cpp:428
+#: mediamanager/fstabbackend.cpp:438
msgid "Floppy"
msgstr "Plannedig"
-#: mediamanager/fstabbackend.cpp:436
+#: mediamanager/fstabbackend.cpp:446
msgid "Zip Disk"
msgstr "Pladenn Zip"
-#: mediamanager/fstabbackend.cpp:447
+#: mediamanager/fstabbackend.cpp:457
msgid "Removable Device"
msgstr "Trobarzhell a-bell"
-#: mediamanager/fstabbackend.cpp:452 mediamanager/fstabbackend.cpp:458
+#: mediamanager/fstabbackend.cpp:462 mediamanager/fstabbackend.cpp:468
msgid "Remote Share"
msgstr ""
-#: mediamanager/fstabbackend.cpp:463
+#: mediamanager/fstabbackend.cpp:473
msgid "Hard Disk"
msgstr "Pladenn"
-#: mediamanager/halbackend.cpp:749 mediamanager/tdehardwarebackend.cpp:805
+#: mediamanager/halbackend.cpp:744 mediamanager/tdehardwarebackend.cpp:808
#, fuzzy
msgid "Unknown Drive"
msgstr "Dianav"
-#: mediamanager/halbackend.cpp:761 mediamanager/tdehardwarebackend.cpp:835
+#: mediamanager/halbackend.cpp:756 mediamanager/tdehardwarebackend.cpp:838
#, fuzzy
msgid "Floppy Drive"
msgstr "Plannedig"
-#: mediamanager/halbackend.cpp:769
+#: mediamanager/halbackend.cpp:764
#, fuzzy
msgid "Zip Drive"
msgstr "Pladenn Zip"
-#: mediamanager/halbackend.cpp:839 mediamanager/tdehardwarebackend.cpp:892
+#: mediamanager/halbackend.cpp:834 mediamanager/tdehardwarebackend.cpp:895
msgid "Camera"
msgstr "Kamera"
-#: mediamanager/halbackend.cpp:1221 mediamanager/halbackend.cpp:1247
+#: mediamanager/halbackend.cpp:1216 mediamanager/halbackend.cpp:1242
msgid "Authenticate"
msgstr ""
-#: mediamanager/halbackend.cpp:1222
+#: mediamanager/halbackend.cpp:1217
msgid ""
"<big><b>System policy prevents mounting internal media</b></big><br/"
">Authentication is required to perform this action. Please enter your "
"password to verify."
msgstr ""
-#: mediamanager/halbackend.cpp:1248
+#: mediamanager/halbackend.cpp:1243
msgid ""
"<big><b>System policy prevents unmounting media mounted by other users</b></"
"big><br/>Authentication is required to perform this action. Please enter "
"your password to verify."
msgstr ""
-#: mediamanager/halbackend.cpp:1284
+#: mediamanager/halbackend.cpp:1259 mediamanager/halbackend.cpp:1268
+#: mediamanager/halbackend.cpp:1849 mediamanager/halbackend.cpp:1916
+#: mounthelper/tdeio_media_mounthelper.cpp:58
+msgid "Internal Error"
+msgstr "Fazi diabarzh"
+
+#: mediamanager/halbackend.cpp:1279
msgid "Invalid filesystem type"
msgstr ""
-#: mediamanager/halbackend.cpp:1286
+#: mediamanager/halbackend.cpp:1281
msgid ""
"Permission denied<p>Please ensure that:<br>1. You have permission to access "
"this device.<br>2. This device node is not listed in /etc/fstab.</p>"
msgstr ""
-#: mediamanager/halbackend.cpp:1290
+#: mediamanager/halbackend.cpp:1285
msgid "Device is already mounted."
msgstr ""
-#: mediamanager/halbackend.cpp:1340
+#: mediamanager/halbackend.cpp:1335
msgid ""
"Moreover, programs still using the device have been detected. They are "
"listed below. You have to close them or change their working directory "
"before attempting to unmount the device again."
msgstr ""
-#: mediamanager/halbackend.cpp:1381 mediamanager/tdehardwarebackend.cpp:1588
+#: mediamanager/halbackend.cpp:1376 mediamanager/tdehardwarebackend.cpp:1618
msgid ""
"Programs that were still using the device have been forcibly terminated. "
"They are listed below."
msgstr ""
-#: mediamanager/halbackend.cpp:1402 mediamanager/halbackend.cpp:1715
-#: mediamanager/tdehardwarebackend.cpp:1406
-#: mediamanager/tdehardwarebackend.cpp:1424
-#: mediamanager/tdehardwarebackend.cpp:1464
+#: mediamanager/halbackend.cpp:1397 mediamanager/halbackend.cpp:1742
+#: mediamanager/tdehardwarebackend.cpp:1430
+#: mediamanager/tdehardwarebackend.cpp:1452
+#: mediamanager/tdehardwarebackend.cpp:1494
msgid ""
"Unfortunately, the device <b>%1</b> (%2) named <b>'%3'</b> and currently "
"mounted at <b>%4</b> could not be unmounted. "
msgstr ""
-#: mediamanager/halbackend.cpp:1408 mediamanager/tdehardwarebackend.cpp:1470
+#: mediamanager/halbackend.cpp:1403 mediamanager/tdehardwarebackend.cpp:1500
msgid "The following error was returned by umount command:"
msgstr ""
-#: mediamanager/halbackend.cpp:1478
-msgid "Permission denied"
+#: mediamanager/halbackend.cpp:1567 mediamanager/tdehardwarebackend.cpp:1322
+msgid "Cannot mount encrypted locked drives!"
msgstr ""
-#: mediamanager/halbackend.cpp:1562 mediamanager/tdehardwarebackend.cpp:1232
-msgid "Cannot mount encrypted drives!"
-msgstr ""
+#: mediamanager/halbackend.cpp:1682 mediamanager/halbackend.cpp:1703
+#: mediamanager/halbackend.cpp:1716 mediamanager/halbackend.cpp:1830
+#: mediamanager/halbackend.cpp:1840 mediamanager/halbackend.cpp:1899
+#: mediamanager/halbackend.cpp:1907
+#, fuzzy
+msgid "Internal error"
+msgstr "Fazi diabarzh"
-#: mediamanager/halbackend.cpp:1721
+#: mediamanager/halbackend.cpp:1694
+#, fuzzy
+#| msgid "Unknown"
+msgid "Unknown error"
+msgstr "Dianav"
+
+#: mediamanager/halbackend.cpp:1748
msgid "Unmounting failed due to the following error:"
msgstr ""
-#: mediamanager/halbackend.cpp:1723
+#: mediamanager/halbackend.cpp:1750
msgid "Device is Busy:"
msgstr ""
-#: mediamanager/halbackend.cpp:1727
+#: mediamanager/halbackend.cpp:1754
msgid ""
"Permission denied<p>Please ensure that:<br>1. You have permission to access "
"this device.<br>2. This device was originally mounted using TDE.</p>"
msgstr ""
-#: mediamanager/halbackend.cpp:1739
+#: mediamanager/halbackend.cpp:1766
msgid ""
"%1<p><b>Would you like to forcibly terminate these processes?</b><br><i>All "
"unsaved data would be lost</i>"
msgstr ""
-#: mediamanager/halbackend.cpp:1811
+#: mediamanager/halbackend.cpp:1852
msgid "Wrong password"
msgstr ""
-#: mediamanager/mediamanager.cpp:247 mediamanager/mediamanager.cpp:266
-#: mediamanager/mediamanager.cpp:285 mediamanager/mediamanager.cpp:293
-#: mediamanager/mediamanager.cpp:302 mediamanager/mediamanager.cpp:310
-msgid "Feature only available with HAL"
+#: mediamanager/mediamanager.cpp:248 mediamanager/mediamanager.cpp:275
+msgid "Feature only available with the TDE hardware backend"
msgstr ""
-#: mediamanager/mediamanager.cpp:252
-msgid "Feature only available with the TDE hardware backend"
+#: mediamanager/mediamanager.cpp:255 mediamanager/mediamanager.cpp:282
+#: mediamanager/mediamanager.cpp:312 mediamanager/mediamanager.cpp:343
+msgid "Feature only available with HAL"
msgstr ""
-#: mediamanager/mediamanager.cpp:256 mediamanager/mediamanager.cpp:271
-#: mediamanager/mediamanager.cpp:275
+#: mediamanager/mediamanager.cpp:262 mediamanager/mediamanager.cpp:289
+#: mediamanager/mediamanager.cpp:320 mediamanager/mediamanager.cpp:350
msgid "Feature only available with HAL or TDE hardware backend"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:480
-#: mediamanager/tdehardwarebackend.cpp:517
-#: mediamanager/tdehardwarebackend.cpp:750
+#: mediamanager/tdehardwarebackend.cpp:483
+#: mediamanager/tdehardwarebackend.cpp:520
+#: mediamanager/tdehardwarebackend.cpp:753
#, fuzzy
msgid "%1 Removable Device"
msgstr "Trobarzhell a-bell"
-#: mediamanager/tdehardwarebackend.cpp:525
+#: mediamanager/tdehardwarebackend.cpp:528
#, fuzzy
msgid "Blank CD-ROM"
msgstr "CD-ROM"
-#: mediamanager/tdehardwarebackend.cpp:534
+#: mediamanager/tdehardwarebackend.cpp:537
msgid "Blank CD-R"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:543
+#: mediamanager/tdehardwarebackend.cpp:546
msgid "Blank CD-RW"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:552
+#: mediamanager/tdehardwarebackend.cpp:555
msgid "Blank Magneto-Optical CD"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:561
+#: mediamanager/tdehardwarebackend.cpp:564
msgid "Blank Mount Ranier CD-RW"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:570
+#: mediamanager/tdehardwarebackend.cpp:573
msgid "Blank Mount Ranier CD-RW-W"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:579
+#: mediamanager/tdehardwarebackend.cpp:582
msgid "Blank DVD-ROM"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:588
+#: mediamanager/tdehardwarebackend.cpp:591
msgid "Blank DVD-RAM"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:597
+#: mediamanager/tdehardwarebackend.cpp:600
msgid "Blank DVD-R"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:606
+#: mediamanager/tdehardwarebackend.cpp:609
msgid "Blank DVD-RW"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:615
+#: mediamanager/tdehardwarebackend.cpp:618
msgid "Blank Dual Layer DVD-R"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:624
+#: mediamanager/tdehardwarebackend.cpp:627
msgid "Blank Dual Layer DVD-RW"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:633
+#: mediamanager/tdehardwarebackend.cpp:636
msgid "Blank DVD+R"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:642
+#: mediamanager/tdehardwarebackend.cpp:645
msgid "Blank DVD+RW"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:651
+#: mediamanager/tdehardwarebackend.cpp:654
msgid "Blank Dual Layer DVD+R"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:660
+#: mediamanager/tdehardwarebackend.cpp:663
msgid "Blank Dual Layer DVD+RW"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:669
+#: mediamanager/tdehardwarebackend.cpp:672
msgid "Blank BD-ROM"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:678
+#: mediamanager/tdehardwarebackend.cpp:681
msgid "Blank BD-R"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:687
+#: mediamanager/tdehardwarebackend.cpp:690
msgid "Blank BD-RW"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:696
+#: mediamanager/tdehardwarebackend.cpp:699
msgid "Blank HDDVD-ROM"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:705
+#: mediamanager/tdehardwarebackend.cpp:708
msgid "Blank HDDVD-R"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:714
+#: mediamanager/tdehardwarebackend.cpp:717
msgid "Blank HDDVD-RW"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:721
+#: mediamanager/tdehardwarebackend.cpp:724
msgid "Audio CD"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:742
+#: mediamanager/tdehardwarebackend.cpp:745
msgid "%1 Fixed Disk (%2)"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:849
+#: mediamanager/tdehardwarebackend.cpp:852
#, fuzzy
msgid "%1 Zip Disk"
msgstr "Pladenn Zip"
-#: mediamanager/tdehardwarebackend.cpp:1212
-#: mediamanager/tdehardwarebackend.cpp:1392
-#, fuzzy
-msgid "Internal error"
-msgstr "Fazi diabarzh"
+#: mediamanager/tdehardwarebackend.cpp:1224
+#: mediamanager/tdehardwarebackend.cpp:1417
+msgid "Internal error. Couldn't find medium."
+msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:1239
-msgid ""
-"<qt>Unable to mount this device.<p>Potential reasons include:<br>Improper "
-"device and/or user privilege level<br>Corrupt data on storage device"
+#: mediamanager/tdehardwarebackend.cpp:1249
+#: mediamanager/tdehardwarebackend.cpp:1323
+msgid "Unable to mount this device."
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:1241
-#: mediamanager/tdehardwarebackend.cpp:1316
-#: mediamanager/tdehardwarebackend.cpp:1408
-#: mediamanager/tdehardwarebackend.cpp:1426
+#: mediamanager/tdehardwarebackend.cpp:1252
+#: mediamanager/tdehardwarebackend.cpp:1326
+#: mediamanager/tdehardwarebackend.cpp:1435
+#: mediamanager/tdehardwarebackend.cpp:1457
msgid "<p>Technical details:<br>"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:1314
-msgid ""
-"<qt>Unable to mount this device.<p>Potential reasons include:<br>Improper "
-"device and/or user privilege level<br>Corrupt data on storage "
-"device<br>Incorrect encryption password"
+#: mediamanager/tdehardwarebackend.cpp:1284
+msgid "Decryption aborted"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:1420
+#: mediamanager/tdehardwarebackend.cpp:1443
msgid ""
"<qt>The device <b>%1</b> (%2) named <b>'%3'</b> and currently mounted at <b>"
"%4</b> can not be unmounted at this time.<p>%5<p><b>Would you like to "
@@ -381,7 +388,7 @@ msgid ""
"lost</i>"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:1547
+#: mediamanager/tdehardwarebackend.cpp:1577
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 "
@@ -392,7 +399,7 @@ msgstr ""
msgid "%1 cannot be found."
msgstr "N'eo ket bet kavet %1."
-#: mounthelper/tdeio_media_mounthelper.cpp:86
+#: mounthelper/tdeio_media_mounthelper.cpp:87
msgid "%1 is not a mountable media."
msgstr ""
@@ -401,38 +408,46 @@ msgid "%1 is not an encrypted media."
msgstr ""
#: mounthelper/tdeio_media_mounthelper.cpp:107
-msgid "%1 is already decrypted."
+msgid "%1 is already unlocked."
+msgstr ""
+
+#: mounthelper/tdeio_media_mounthelper.cpp:139
+msgid "Unknown unmount error."
msgstr ""
-#: mounthelper/tdeio_media_mounthelper.cpp:228
+#: mounthelper/tdeio_media_mounthelper.cpp:246
msgid "The device was successfully unmounted, but the tray could not be opened"
msgstr ""
-#: mounthelper/tdeio_media_mounthelper.cpp:230
+#: mounthelper/tdeio_media_mounthelper.cpp:248
msgid "The device was successfully unmounted, but could not be ejected"
msgstr ""
-#: mounthelper/tdeio_media_mounthelper.cpp:275
+#: mounthelper/tdeio_media_mounthelper.cpp:281
+msgid "Unknown decrypt error."
+msgstr ""
+
+#: mounthelper/tdeio_media_mounthelper.cpp:295
msgid "Decrypt given URL"
msgstr ""
-#: mounthelper/tdeio_media_mounthelper.cpp:276
+#: mounthelper/tdeio_media_mounthelper.cpp:296
msgid "Unmount given URL"
msgstr ""
-#: mounthelper/tdeio_media_mounthelper.cpp:277
+#: mounthelper/tdeio_media_mounthelper.cpp:297
msgid "Mount given URL (default)"
msgstr ""
-#: mounthelper/tdeio_media_mounthelper.cpp:278
+#: mounthelper/tdeio_media_mounthelper.cpp:298
msgid "Eject given URL via tdeeject"
msgstr ""
-#: mounthelper/tdeio_media_mounthelper.cpp:279
+#: mounthelper/tdeio_media_mounthelper.cpp:299
msgid "Unmount and Eject given URL (necessary for some USB devices)"
msgstr ""
-#: mounthelper/tdeio_media_mounthelper.cpp:280
+#: mounthelper/tdeio_media_mounthelper.cpp:300
msgid "media:/ URL to mount/unmount/eject/remove"
msgstr ""
@@ -453,43 +468,43 @@ msgstr ""
msgid "&Mounting"
msgstr "Emaon o &vountañ"
-#: tdefile-plugin/tdefilemediaplugin.cpp:190
+#: tdefile-plugin/tdefilemediaplugin.cpp:184
msgid "Medium Information"
msgstr ""
-#: tdefile-plugin/tdefilemediaplugin.cpp:193
+#: tdefile-plugin/tdefilemediaplugin.cpp:187
msgid "Free"
msgstr "Dieub"
-#: tdefile-plugin/tdefilemediaplugin.cpp:196
+#: tdefile-plugin/tdefilemediaplugin.cpp:190
msgid "Used"
msgstr "Implijet"
-#: tdefile-plugin/tdefilemediaplugin.cpp:199
+#: tdefile-plugin/tdefilemediaplugin.cpp:193
msgid "Total"
msgstr "Hollek"
-#: tdefile-plugin/tdefilemediaplugin.cpp:202
+#: tdefile-plugin/tdefilemediaplugin.cpp:196
msgid "Base URL"
msgstr "URL diazez"
-#: tdefile-plugin/tdefilemediaplugin.cpp:203
+#: tdefile-plugin/tdefilemediaplugin.cpp:197
msgid "Mount Point"
msgstr "Poent mountañ"
-#: tdefile-plugin/tdefilemediaplugin.cpp:204
+#: tdefile-plugin/tdefilemediaplugin.cpp:198
msgid "Device Node"
msgstr "Skoulm an drobarzhell"
-#: tdefile-plugin/tdefilemediaplugin.cpp:206
+#: tdefile-plugin/tdefilemediaplugin.cpp:200
msgid "Medium Summary"
msgstr ""
-#: tdefile-plugin/tdefilemediaplugin.cpp:208
+#: tdefile-plugin/tdefilemediaplugin.cpp:202
msgid "Usage"
msgstr "Arveriadur"
-#: tdefile-plugin/tdefilemediaplugin.cpp:210
+#: tdefile-plugin/tdefilemediaplugin.cpp:204
msgid "Bar Graph"
msgstr ""
@@ -561,23 +576,30 @@ msgid ""
"devices are plugged in."
msgstr ""
-#: mediamanager/decryptdialog.ui:24 mounthelper/decryptdialog.ui:24
+#: mediamanager/unlockdialog.ui:24 mounthelper/unlockdialog.ui:24
#, no-c-format
msgid "Decrypting Storage Device"
msgstr ""
-#: mediamanager/decryptdialog.ui:109 mounthelper/decryptdialog.ui:109
+#: mediamanager/unlockdialog.ui:109
#, no-c-format
msgid ""
-"<p><b>%1</b> is an encrypted storage device.</p>\n"
-"<p>Please enter the password to decrypt the storage device.</p>"
+"<p><b>%1</b> is an encrypted locked storage device.</p>\n"
+"<p>Please enter the password to unlock the storage device.</p>"
msgstr ""
-#: mediamanager/decryptdialog.ui:131 mounthelper/decryptdialog.ui:131
+#: mediamanager/unlockdialog.ui:131 mounthelper/unlockdialog.ui:131
#, no-c-format
msgid "&Password:"
msgstr ""
+#: mounthelper/unlockdialog.ui:109
+#, no-c-format
+msgid ""
+"<p><b>%1</b> is an encrypted storage device.</p>\n"
+"<p>Please enter the password to decrypt the storage device.</p>"
+msgstr ""
+
#: propsdlgplugin/propertiespagegui.ui:16
#, no-c-format
msgid "PropertiesPageGUI"
diff --git a/tde-i18n-bs/messages/tdebase/tdeio_media.po b/tde-i18n-bs/messages/tdebase/tdeio_media.po
index 7b877ec4dac..6a76a094b82 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: 2019-01-13 18:47+0100\n"
+"POT-Creation-Date: 2019-07-11 02:33+0200\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"
@@ -46,7 +46,6 @@ 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
-#: mounthelper/tdeio_media_mounthelper.cpp:256
msgid "The TDE mediamanager is not running."
msgstr "TDEov upravitelj medijima nije pokrenut."
@@ -54,7 +53,7 @@ msgstr "TDEov upravitelj medijima nije pokrenut."
msgid "This media name already exists."
msgstr "Ovaj naziv medija već postoji."
-#: mediaimpl.cpp:230 mediaimpl.cpp:293
+#: mediaimpl.cpp:230 mediaimpl.cpp:297
msgid "No such medium."
msgstr ""
@@ -62,320 +61,328 @@ msgstr ""
msgid "The drive is encrypted."
msgstr ""
-#: mediaimpl.cpp:272 mediamanager/halbackend.cpp:1264
-#: mediamanager/halbackend.cpp:1273 mediamanager/halbackend.cpp:1663
-#: mediamanager/halbackend.cpp:1680 mediamanager/halbackend.cpp:1691
-#: mediamanager/halbackend.cpp:1793 mediamanager/halbackend.cpp:1801
-#: mediamanager/halbackend.cpp:1808 mediamanager/halbackend.cpp:1848
-#: mediamanager/halbackend.cpp:1854 mediamanager/halbackend.cpp:1861
-#: mounthelper/tdeio_media_mounthelper.cpp:58
-msgid "Internal Error"
+#: mediaimpl.cpp:274 mediamanager/tdehardwarebackend.cpp:201
+#: mediamanager/tdehardwarebackend.cpp:252
+#: mounthelper/tdeio_media_mounthelper.cpp:202
+msgid "Unknown mount error."
msgstr ""
#: mediamanager/dialog.cpp:26 mounthelper/dialog.cpp:26
-msgid "Decrypt"
+msgid "Unlock"
msgstr ""
-#: mediamanager/fstabbackend.cpp:104 mediamanager/fstabbackend.cpp:114
-#: mediamanager/halbackend.cpp:1595 mediamanager/halbackend.cpp:1617
-#: mediamanager/halbackend.cpp:1776 mediamanager/halbackend.cpp:1831
-#: mediamanager/tdehardwarebackend.cpp:1349
-#: mediamanager/tdehardwarebackend.cpp:1360
+#: mediamanager/fstabbackend.cpp:105 mediamanager/fstabbackend.cpp:120
+#: mediamanager/halbackend.cpp:1598 mediamanager/halbackend.cpp:1625
+#: mediamanager/halbackend.cpp:1808 mediamanager/halbackend.cpp:1877
+#: mediamanager/mediamanager.cpp:363 mediamanager/mediamanager.cpp:375
+#: mediamanager/mediamanager.cpp:387 mediamanager/mediamanager.cpp:399
+#: mediamanager/tdehardwarebackend.cpp:1363
+#: mediamanager/tdehardwarebackend.cpp:1378
#, c-format
msgid "No such medium: %1"
msgstr ""
-#: mediamanager/fstabbackend.cpp:398
+#: mediamanager/fstabbackend.cpp:408
msgid "CD Recorder"
msgstr "CD snimač"
-#: mediamanager/fstabbackend.cpp:404
+#: mediamanager/fstabbackend.cpp:414
msgid "DVD"
msgstr "DVD"
-#: mediamanager/fstabbackend.cpp:415
+#: mediamanager/fstabbackend.cpp:425
msgid "CD-ROM"
msgstr "CD-ROM"
-#: mediamanager/fstabbackend.cpp:428
+#: mediamanager/fstabbackend.cpp:438
msgid "Floppy"
msgstr "Disketa"
-#: mediamanager/fstabbackend.cpp:436
+#: mediamanager/fstabbackend.cpp:446
msgid "Zip Disk"
msgstr "Zip disk"
-#: mediamanager/fstabbackend.cpp:447
+#: mediamanager/fstabbackend.cpp:457
msgid "Removable Device"
msgstr "Izmjenjivi uređaj"
-#: mediamanager/fstabbackend.cpp:452 mediamanager/fstabbackend.cpp:458
+#: mediamanager/fstabbackend.cpp:462 mediamanager/fstabbackend.cpp:468
msgid "Remote Share"
msgstr "Dijeljeni resurs"
-#: mediamanager/fstabbackend.cpp:463
+#: mediamanager/fstabbackend.cpp:473
msgid "Hard Disk"
msgstr "Hard disk"
-#: mediamanager/halbackend.cpp:749 mediamanager/tdehardwarebackend.cpp:805
+#: mediamanager/halbackend.cpp:744 mediamanager/tdehardwarebackend.cpp:808
#, fuzzy
msgid "Unknown Drive"
msgstr "Nepoznato"
-#: mediamanager/halbackend.cpp:761 mediamanager/tdehardwarebackend.cpp:835
+#: mediamanager/halbackend.cpp:756 mediamanager/tdehardwarebackend.cpp:838
#, fuzzy
msgid "Floppy Drive"
msgstr "Disketa"
-#: mediamanager/halbackend.cpp:769
+#: mediamanager/halbackend.cpp:764
#, fuzzy
msgid "Zip Drive"
msgstr "Zip disk"
-#: mediamanager/halbackend.cpp:839 mediamanager/tdehardwarebackend.cpp:892
+#: mediamanager/halbackend.cpp:834 mediamanager/tdehardwarebackend.cpp:895
msgid "Camera"
msgstr "Kamera"
-#: mediamanager/halbackend.cpp:1221 mediamanager/halbackend.cpp:1247
+#: mediamanager/halbackend.cpp:1216 mediamanager/halbackend.cpp:1242
msgid "Authenticate"
msgstr ""
-#: mediamanager/halbackend.cpp:1222
+#: mediamanager/halbackend.cpp:1217
msgid ""
"<big><b>System policy prevents mounting internal media</b></big><br/"
">Authentication is required to perform this action. Please enter your "
"password to verify."
msgstr ""
-#: mediamanager/halbackend.cpp:1248
+#: mediamanager/halbackend.cpp:1243
msgid ""
"<big><b>System policy prevents unmounting media mounted by other users</b></"
"big><br/>Authentication is required to perform this action. Please enter "
"your password to verify."
msgstr ""
-#: mediamanager/halbackend.cpp:1284
+#: mediamanager/halbackend.cpp:1259 mediamanager/halbackend.cpp:1268
+#: mediamanager/halbackend.cpp:1849 mediamanager/halbackend.cpp:1916
+#: mounthelper/tdeio_media_mounthelper.cpp:58
+msgid "Internal Error"
+msgstr ""
+
+#: mediamanager/halbackend.cpp:1279
msgid "Invalid filesystem type"
msgstr ""
-#: mediamanager/halbackend.cpp:1286
+#: mediamanager/halbackend.cpp:1281
msgid ""
"Permission denied<p>Please ensure that:<br>1. You have permission to access "
"this device.<br>2. This device node is not listed in /etc/fstab.</p>"
msgstr ""
-#: mediamanager/halbackend.cpp:1290
+#: mediamanager/halbackend.cpp:1285
msgid "Device is already mounted."
msgstr ""
-#: mediamanager/halbackend.cpp:1340
+#: mediamanager/halbackend.cpp:1335
msgid ""
"Moreover, programs still using the device have been detected. They are "
"listed below. You have to close them or change their working directory "
"before attempting to unmount the device again."
msgstr ""
-#: mediamanager/halbackend.cpp:1381 mediamanager/tdehardwarebackend.cpp:1588
+#: mediamanager/halbackend.cpp:1376 mediamanager/tdehardwarebackend.cpp:1618
msgid ""
"Programs that were still using the device have been forcibly terminated. "
"They are listed below."
msgstr ""
-#: mediamanager/halbackend.cpp:1402 mediamanager/halbackend.cpp:1715
-#: mediamanager/tdehardwarebackend.cpp:1406
-#: mediamanager/tdehardwarebackend.cpp:1424
-#: mediamanager/tdehardwarebackend.cpp:1464
+#: mediamanager/halbackend.cpp:1397 mediamanager/halbackend.cpp:1742
+#: mediamanager/tdehardwarebackend.cpp:1430
+#: mediamanager/tdehardwarebackend.cpp:1452
+#: mediamanager/tdehardwarebackend.cpp:1494
msgid ""
"Unfortunately, the device <b>%1</b> (%2) named <b>'%3'</b> and currently "
"mounted at <b>%4</b> could not be unmounted. "
msgstr ""
-#: mediamanager/halbackend.cpp:1408 mediamanager/tdehardwarebackend.cpp:1470
+#: mediamanager/halbackend.cpp:1403 mediamanager/tdehardwarebackend.cpp:1500
msgid "The following error was returned by umount command:"
msgstr ""
-#: mediamanager/halbackend.cpp:1478
-msgid "Permission denied"
+#: mediamanager/halbackend.cpp:1567 mediamanager/tdehardwarebackend.cpp:1322
+msgid "Cannot mount encrypted locked drives!"
msgstr ""
-#: mediamanager/halbackend.cpp:1562 mediamanager/tdehardwarebackend.cpp:1232
-msgid "Cannot mount encrypted drives!"
+#: mediamanager/halbackend.cpp:1682 mediamanager/halbackend.cpp:1703
+#: mediamanager/halbackend.cpp:1716 mediamanager/halbackend.cpp:1830
+#: mediamanager/halbackend.cpp:1840 mediamanager/halbackend.cpp:1899
+#: mediamanager/halbackend.cpp:1907
+msgid "Internal error"
msgstr ""
-#: mediamanager/halbackend.cpp:1721
+#: mediamanager/halbackend.cpp:1694
+#, fuzzy
+#| msgid "Unknown"
+msgid "Unknown error"
+msgstr "Nepoznato"
+
+#: mediamanager/halbackend.cpp:1748
msgid "Unmounting failed due to the following error:"
msgstr ""
-#: mediamanager/halbackend.cpp:1723
+#: mediamanager/halbackend.cpp:1750
msgid "Device is Busy:"
msgstr ""
-#: mediamanager/halbackend.cpp:1727
+#: mediamanager/halbackend.cpp:1754
msgid ""
"Permission denied<p>Please ensure that:<br>1. You have permission to access "
"this device.<br>2. This device was originally mounted using TDE.</p>"
msgstr ""
-#: mediamanager/halbackend.cpp:1739
+#: mediamanager/halbackend.cpp:1766
msgid ""
"%1<p><b>Would you like to forcibly terminate these processes?</b><br><i>All "
"unsaved data would be lost</i>"
msgstr ""
-#: mediamanager/halbackend.cpp:1811
+#: mediamanager/halbackend.cpp:1852
msgid "Wrong password"
msgstr ""
-#: mediamanager/mediamanager.cpp:247 mediamanager/mediamanager.cpp:266
-#: mediamanager/mediamanager.cpp:285 mediamanager/mediamanager.cpp:293
-#: mediamanager/mediamanager.cpp:302 mediamanager/mediamanager.cpp:310
-msgid "Feature only available with HAL"
+#: mediamanager/mediamanager.cpp:248 mediamanager/mediamanager.cpp:275
+msgid "Feature only available with the TDE hardware backend"
msgstr ""
-#: mediamanager/mediamanager.cpp:252
-msgid "Feature only available with the TDE hardware backend"
+#: mediamanager/mediamanager.cpp:255 mediamanager/mediamanager.cpp:282
+#: mediamanager/mediamanager.cpp:312 mediamanager/mediamanager.cpp:343
+msgid "Feature only available with HAL"
msgstr ""
-#: mediamanager/mediamanager.cpp:256 mediamanager/mediamanager.cpp:271
-#: mediamanager/mediamanager.cpp:275
+#: mediamanager/mediamanager.cpp:262 mediamanager/mediamanager.cpp:289
+#: mediamanager/mediamanager.cpp:320 mediamanager/mediamanager.cpp:350
msgid "Feature only available with HAL or TDE hardware backend"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:480
-#: mediamanager/tdehardwarebackend.cpp:517
-#: mediamanager/tdehardwarebackend.cpp:750
+#: mediamanager/tdehardwarebackend.cpp:483
+#: mediamanager/tdehardwarebackend.cpp:520
+#: mediamanager/tdehardwarebackend.cpp:753
#, fuzzy
msgid "%1 Removable Device"
msgstr "Izmjenjivi uređaj"
-#: mediamanager/tdehardwarebackend.cpp:525
+#: mediamanager/tdehardwarebackend.cpp:528
#, fuzzy
msgid "Blank CD-ROM"
msgstr "CD-ROM"
-#: mediamanager/tdehardwarebackend.cpp:534
+#: mediamanager/tdehardwarebackend.cpp:537
msgid "Blank CD-R"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:543
+#: mediamanager/tdehardwarebackend.cpp:546
msgid "Blank CD-RW"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:552
+#: mediamanager/tdehardwarebackend.cpp:555
msgid "Blank Magneto-Optical CD"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:561
+#: mediamanager/tdehardwarebackend.cpp:564
msgid "Blank Mount Ranier CD-RW"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:570
+#: mediamanager/tdehardwarebackend.cpp:573
msgid "Blank Mount Ranier CD-RW-W"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:579
+#: mediamanager/tdehardwarebackend.cpp:582
msgid "Blank DVD-ROM"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:588
+#: mediamanager/tdehardwarebackend.cpp:591
msgid "Blank DVD-RAM"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:597
+#: mediamanager/tdehardwarebackend.cpp:600
msgid "Blank DVD-R"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:606
+#: mediamanager/tdehardwarebackend.cpp:609
msgid "Blank DVD-RW"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:615
+#: mediamanager/tdehardwarebackend.cpp:618
msgid "Blank Dual Layer DVD-R"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:624
+#: mediamanager/tdehardwarebackend.cpp:627
msgid "Blank Dual Layer DVD-RW"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:633
+#: mediamanager/tdehardwarebackend.cpp:636
msgid "Blank DVD+R"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:642
+#: mediamanager/tdehardwarebackend.cpp:645
msgid "Blank DVD+RW"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:651
+#: mediamanager/tdehardwarebackend.cpp:654
msgid "Blank Dual Layer DVD+R"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:660
+#: mediamanager/tdehardwarebackend.cpp:663
msgid "Blank Dual Layer DVD+RW"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:669
+#: mediamanager/tdehardwarebackend.cpp:672
msgid "Blank BD-ROM"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:678
+#: mediamanager/tdehardwarebackend.cpp:681
msgid "Blank BD-R"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:687
+#: mediamanager/tdehardwarebackend.cpp:690
msgid "Blank BD-RW"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:696
+#: mediamanager/tdehardwarebackend.cpp:699
msgid "Blank HDDVD-ROM"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:705
+#: mediamanager/tdehardwarebackend.cpp:708
msgid "Blank HDDVD-R"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:714
+#: mediamanager/tdehardwarebackend.cpp:717
msgid "Blank HDDVD-RW"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:721
+#: mediamanager/tdehardwarebackend.cpp:724
msgid "Audio CD"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:742
+#: mediamanager/tdehardwarebackend.cpp:745
msgid "%1 Fixed Disk (%2)"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:849
+#: mediamanager/tdehardwarebackend.cpp:852
#, fuzzy
msgid "%1 Zip Disk"
msgstr "Zip disk"
-#: mediamanager/tdehardwarebackend.cpp:1212
-#: mediamanager/tdehardwarebackend.cpp:1392
-msgid "Internal error"
+#: mediamanager/tdehardwarebackend.cpp:1224
+#: mediamanager/tdehardwarebackend.cpp:1417
+msgid "Internal error. Couldn't find medium."
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:1239
-msgid ""
-"<qt>Unable to mount this device.<p>Potential reasons include:<br>Improper "
-"device and/or user privilege level<br>Corrupt data on storage device"
+#: mediamanager/tdehardwarebackend.cpp:1249
+#: mediamanager/tdehardwarebackend.cpp:1323
+msgid "Unable to mount this device."
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:1241
-#: mediamanager/tdehardwarebackend.cpp:1316
-#: mediamanager/tdehardwarebackend.cpp:1408
-#: mediamanager/tdehardwarebackend.cpp:1426
+#: mediamanager/tdehardwarebackend.cpp:1252
+#: mediamanager/tdehardwarebackend.cpp:1326
+#: mediamanager/tdehardwarebackend.cpp:1435
+#: mediamanager/tdehardwarebackend.cpp:1457
msgid "<p>Technical details:<br>"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:1314
-msgid ""
-"<qt>Unable to mount this device.<p>Potential reasons include:<br>Improper "
-"device and/or user privilege level<br>Corrupt data on storage "
-"device<br>Incorrect encryption password"
+#: mediamanager/tdehardwarebackend.cpp:1284
+msgid "Decryption aborted"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:1420
+#: mediamanager/tdehardwarebackend.cpp:1443
msgid ""
"<qt>The device <b>%1</b> (%2) named <b>'%3'</b> and currently mounted at <b>"
"%4</b> can not be unmounted at this time.<p>%5<p><b>Would you like to "
@@ -383,7 +390,7 @@ msgid ""
"lost</i>"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:1547
+#: mediamanager/tdehardwarebackend.cpp:1577
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 "
@@ -394,7 +401,7 @@ msgstr ""
msgid "%1 cannot be found."
msgstr "Ne mogu naći %1."
-#: mounthelper/tdeio_media_mounthelper.cpp:86
+#: mounthelper/tdeio_media_mounthelper.cpp:87
msgid "%1 is not a mountable media."
msgstr "%1 nije medij koji se može montirati."
@@ -404,39 +411,47 @@ msgid "%1 is not an encrypted media."
msgstr "%1 nije medij koji se može montirati."
#: mounthelper/tdeio_media_mounthelper.cpp:107
-msgid "%1 is already decrypted."
+msgid "%1 is already unlocked."
msgstr ""
-#: mounthelper/tdeio_media_mounthelper.cpp:228
+#: mounthelper/tdeio_media_mounthelper.cpp:139
+msgid "Unknown unmount error."
+msgstr ""
+
+#: mounthelper/tdeio_media_mounthelper.cpp:246
msgid "The device was successfully unmounted, but the tray could not be opened"
msgstr ""
-#: mounthelper/tdeio_media_mounthelper.cpp:230
+#: mounthelper/tdeio_media_mounthelper.cpp:248
msgid "The device was successfully unmounted, but could not be ejected"
msgstr ""
-#: mounthelper/tdeio_media_mounthelper.cpp:275
+#: mounthelper/tdeio_media_mounthelper.cpp:281
+msgid "Unknown decrypt error."
+msgstr ""
+
+#: mounthelper/tdeio_media_mounthelper.cpp:295
#, fuzzy
msgid "Decrypt given URL"
msgstr "Demontiraj navedeni URL"
-#: mounthelper/tdeio_media_mounthelper.cpp:276
+#: mounthelper/tdeio_media_mounthelper.cpp:296
msgid "Unmount given URL"
msgstr "Demontiraj navedeni URL"
-#: mounthelper/tdeio_media_mounthelper.cpp:277
+#: mounthelper/tdeio_media_mounthelper.cpp:297
msgid "Mount given URL (default)"
msgstr "Montiraj navedeni URL (podrazumijevano)"
-#: mounthelper/tdeio_media_mounthelper.cpp:278
+#: mounthelper/tdeio_media_mounthelper.cpp:298
msgid "Eject given URL via tdeeject"
msgstr "Izbaci dati URL koristeći tdeeject"
-#: mounthelper/tdeio_media_mounthelper.cpp:279
+#: mounthelper/tdeio_media_mounthelper.cpp:299
msgid "Unmount and Eject given URL (necessary for some USB devices)"
msgstr "Demontiraj i izbaci dati URL (potrebno za neke USB uređaje)"
-#: mounthelper/tdeio_media_mounthelper.cpp:280
+#: mounthelper/tdeio_media_mounthelper.cpp:300
msgid "media:/ URL to mount/unmount/eject/remove"
msgstr "media:/ URL za montiranje/demontiranje/izbacivanje/uklanjanje"
@@ -458,43 +473,43 @@ msgstr ""
msgid "&Mounting"
msgstr "Mjesto montiranja"
-#: tdefile-plugin/tdefilemediaplugin.cpp:190
+#: tdefile-plugin/tdefilemediaplugin.cpp:184
msgid "Medium Information"
msgstr "Informacije o mediju"
-#: tdefile-plugin/tdefilemediaplugin.cpp:193
+#: tdefile-plugin/tdefilemediaplugin.cpp:187
msgid "Free"
msgstr "Slobodno"
-#: tdefile-plugin/tdefilemediaplugin.cpp:196
+#: tdefile-plugin/tdefilemediaplugin.cpp:190
msgid "Used"
msgstr "Iskorišteno"
-#: tdefile-plugin/tdefilemediaplugin.cpp:199
+#: tdefile-plugin/tdefilemediaplugin.cpp:193
msgid "Total"
msgstr "Ukupno"
-#: tdefile-plugin/tdefilemediaplugin.cpp:202
+#: tdefile-plugin/tdefilemediaplugin.cpp:196
msgid "Base URL"
msgstr "Osnovni URL"
-#: tdefile-plugin/tdefilemediaplugin.cpp:203
+#: tdefile-plugin/tdefilemediaplugin.cpp:197
msgid "Mount Point"
msgstr "Mjesto montiranja"
-#: tdefile-plugin/tdefilemediaplugin.cpp:204
+#: tdefile-plugin/tdefilemediaplugin.cpp:198
msgid "Device Node"
msgstr "Čvor uređaja"
-#: tdefile-plugin/tdefilemediaplugin.cpp:206
+#: tdefile-plugin/tdefilemediaplugin.cpp:200
msgid "Medium Summary"
msgstr "Sažetak medija"
-#: tdefile-plugin/tdefilemediaplugin.cpp:208
+#: tdefile-plugin/tdefilemediaplugin.cpp:202
msgid "Usage"
msgstr "Upotrebljeno"
-#: tdefile-plugin/tdefilemediaplugin.cpp:210
+#: tdefile-plugin/tdefilemediaplugin.cpp:204
msgid "Bar Graph"
msgstr "Grafikon"
@@ -566,23 +581,30 @@ msgid ""
"devices are plugged in."
msgstr ""
-#: mediamanager/decryptdialog.ui:24 mounthelper/decryptdialog.ui:24
+#: mediamanager/unlockdialog.ui:24 mounthelper/unlockdialog.ui:24
#, no-c-format
msgid "Decrypting Storage Device"
msgstr ""
-#: mediamanager/decryptdialog.ui:109 mounthelper/decryptdialog.ui:109
+#: mediamanager/unlockdialog.ui:109
#, no-c-format
msgid ""
-"<p><b>%1</b> is an encrypted storage device.</p>\n"
-"<p>Please enter the password to decrypt the storage device.</p>"
+"<p><b>%1</b> is an encrypted locked storage device.</p>\n"
+"<p>Please enter the password to unlock the storage device.</p>"
msgstr ""
-#: mediamanager/decryptdialog.ui:131 mounthelper/decryptdialog.ui:131
+#: mediamanager/unlockdialog.ui:131 mounthelper/unlockdialog.ui:131
#, no-c-format
msgid "&Password:"
msgstr ""
+#: mounthelper/unlockdialog.ui:109
+#, no-c-format
+msgid ""
+"<p><b>%1</b> is an encrypted storage device.</p>\n"
+"<p>Please enter the password to decrypt the storage device.</p>"
+msgstr ""
+
#: propsdlgplugin/propertiespagegui.ui:16
#, no-c-format
msgid "PropertiesPageGUI"
diff --git a/tde-i18n-ca/messages/tdebase/tdeio_media.po b/tde-i18n-ca/messages/tdebase/tdeio_media.po
index d33ee619f0a..defb5cd99ae 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: 2019-01-13 18:47+0100\n"
+"POT-Creation-Date: 2019-07-11 02:33+0200\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"
@@ -48,7 +48,6 @@ 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
-#: mounthelper/tdeio_media_mounthelper.cpp:256
msgid "The TDE mediamanager is not running."
msgstr "El gestor de suports del TDE no s'està executant."
@@ -56,7 +55,7 @@ msgstr "El gestor de suports del TDE no s'està executant."
msgid "This media name already exists."
msgstr "Aquest nom de suport ja existeix."
-#: mediaimpl.cpp:230 mediaimpl.cpp:293
+#: mediaimpl.cpp:230 mediaimpl.cpp:297
msgid "No such medium."
msgstr "No hi és el suport."
@@ -64,110 +63,114 @@ msgstr "No hi és el suport."
msgid "The drive is encrypted."
msgstr ""
-#: mediaimpl.cpp:272 mediamanager/halbackend.cpp:1264
-#: mediamanager/halbackend.cpp:1273 mediamanager/halbackend.cpp:1663
-#: mediamanager/halbackend.cpp:1680 mediamanager/halbackend.cpp:1691
-#: mediamanager/halbackend.cpp:1793 mediamanager/halbackend.cpp:1801
-#: mediamanager/halbackend.cpp:1808 mediamanager/halbackend.cpp:1848
-#: mediamanager/halbackend.cpp:1854 mediamanager/halbackend.cpp:1861
-#: mounthelper/tdeio_media_mounthelper.cpp:58
-msgid "Internal Error"
-msgstr "Error intern"
+#: mediaimpl.cpp:274 mediamanager/tdehardwarebackend.cpp:201
+#: mediamanager/tdehardwarebackend.cpp:252
+#: mounthelper/tdeio_media_mounthelper.cpp:202
+msgid "Unknown mount error."
+msgstr ""
#: mediamanager/dialog.cpp:26 mounthelper/dialog.cpp:26
-msgid "Decrypt"
+msgid "Unlock"
msgstr ""
-#: mediamanager/fstabbackend.cpp:104 mediamanager/fstabbackend.cpp:114
-#: mediamanager/halbackend.cpp:1595 mediamanager/halbackend.cpp:1617
-#: mediamanager/halbackend.cpp:1776 mediamanager/halbackend.cpp:1831
-#: mediamanager/tdehardwarebackend.cpp:1349
-#: mediamanager/tdehardwarebackend.cpp:1360
+#: mediamanager/fstabbackend.cpp:105 mediamanager/fstabbackend.cpp:120
+#: mediamanager/halbackend.cpp:1598 mediamanager/halbackend.cpp:1625
+#: mediamanager/halbackend.cpp:1808 mediamanager/halbackend.cpp:1877
+#: mediamanager/mediamanager.cpp:363 mediamanager/mediamanager.cpp:375
+#: mediamanager/mediamanager.cpp:387 mediamanager/mediamanager.cpp:399
+#: mediamanager/tdehardwarebackend.cpp:1363
+#: mediamanager/tdehardwarebackend.cpp:1378
#, c-format
msgid "No such medium: %1"
msgstr "Aquest suport no hi és: %1"
-#: mediamanager/fstabbackend.cpp:398
+#: mediamanager/fstabbackend.cpp:408
msgid "CD Recorder"
msgstr "Gravadora CD"
-#: mediamanager/fstabbackend.cpp:404
+#: mediamanager/fstabbackend.cpp:414
msgid "DVD"
msgstr "DVD"
-#: mediamanager/fstabbackend.cpp:415
+#: mediamanager/fstabbackend.cpp:425
msgid "CD-ROM"
msgstr "CD-ROM"
-#: mediamanager/fstabbackend.cpp:428
+#: mediamanager/fstabbackend.cpp:438
msgid "Floppy"
msgstr "Disquetera"
-#: mediamanager/fstabbackend.cpp:436
+#: mediamanager/fstabbackend.cpp:446
msgid "Zip Disk"
msgstr "Disc zip"
-#: mediamanager/fstabbackend.cpp:447
+#: mediamanager/fstabbackend.cpp:457
msgid "Removable Device"
msgstr "Dispositiu extraïble"
-#: mediamanager/fstabbackend.cpp:452 mediamanager/fstabbackend.cpp:458
+#: mediamanager/fstabbackend.cpp:462 mediamanager/fstabbackend.cpp:468
msgid "Remote Share"
msgstr "Compartit remot"
-#: mediamanager/fstabbackend.cpp:463
+#: mediamanager/fstabbackend.cpp:473
msgid "Hard Disk"
msgstr "Disc dur"
-#: mediamanager/halbackend.cpp:749 mediamanager/tdehardwarebackend.cpp:805
+#: mediamanager/halbackend.cpp:744 mediamanager/tdehardwarebackend.cpp:808
msgid "Unknown Drive"
msgstr "Unitat desconeguda"
-#: mediamanager/halbackend.cpp:761 mediamanager/tdehardwarebackend.cpp:835
+#: mediamanager/halbackend.cpp:756 mediamanager/tdehardwarebackend.cpp:838
msgid "Floppy Drive"
msgstr "Unitat de disquet"
-#: mediamanager/halbackend.cpp:769
+#: mediamanager/halbackend.cpp:764
msgid "Zip Drive"
msgstr "Unitat zip"
-#: mediamanager/halbackend.cpp:839 mediamanager/tdehardwarebackend.cpp:892
+#: mediamanager/halbackend.cpp:834 mediamanager/tdehardwarebackend.cpp:895
msgid "Camera"
msgstr "Càmera"
-#: mediamanager/halbackend.cpp:1221 mediamanager/halbackend.cpp:1247
+#: mediamanager/halbackend.cpp:1216 mediamanager/halbackend.cpp:1242
msgid "Authenticate"
msgstr ""
-#: mediamanager/halbackend.cpp:1222
+#: mediamanager/halbackend.cpp:1217
msgid ""
"<big><b>System policy prevents mounting internal media</b></big><br/"
">Authentication is required to perform this action. Please enter your "
"password to verify."
msgstr ""
-#: mediamanager/halbackend.cpp:1248
+#: mediamanager/halbackend.cpp:1243
msgid ""
"<big><b>System policy prevents unmounting media mounted by other users</b></"
"big><br/>Authentication is required to perform this action. Please enter "
"your password to verify."
msgstr ""
-#: mediamanager/halbackend.cpp:1284
+#: mediamanager/halbackend.cpp:1259 mediamanager/halbackend.cpp:1268
+#: mediamanager/halbackend.cpp:1849 mediamanager/halbackend.cpp:1916
+#: mounthelper/tdeio_media_mounthelper.cpp:58
+msgid "Internal Error"
+msgstr "Error intern"
+
+#: mediamanager/halbackend.cpp:1279
msgid "Invalid filesystem type"
msgstr "El tipus de sistema de fitxers no és vàlid"
-#: mediamanager/halbackend.cpp:1286
+#: mediamanager/halbackend.cpp:1281
msgid ""
"Permission denied<p>Please ensure that:<br>1. You have permission to access "
"this device.<br>2. This device node is not listed in /etc/fstab.</p>"
msgstr ""
-#: mediamanager/halbackend.cpp:1290
+#: mediamanager/halbackend.cpp:1285
msgid "Device is already mounted."
msgstr "El dispositiu ja és muntat."
-#: mediamanager/halbackend.cpp:1340
+#: mediamanager/halbackend.cpp:1335
msgid ""
"Moreover, programs still using the device have been detected. They are "
"listed below. You have to close them or change their working directory "
@@ -177,16 +180,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:1381 mediamanager/tdehardwarebackend.cpp:1588
+#: mediamanager/halbackend.cpp:1376 mediamanager/tdehardwarebackend.cpp:1618
msgid ""
"Programs that were still using the device have been forcibly terminated. "
"They are listed below."
msgstr ""
-#: mediamanager/halbackend.cpp:1402 mediamanager/halbackend.cpp:1715
-#: mediamanager/tdehardwarebackend.cpp:1406
-#: mediamanager/tdehardwarebackend.cpp:1424
-#: mediamanager/tdehardwarebackend.cpp:1464
+#: mediamanager/halbackend.cpp:1397 mediamanager/halbackend.cpp:1742
+#: mediamanager/tdehardwarebackend.cpp:1430
+#: mediamanager/tdehardwarebackend.cpp:1452
+#: mediamanager/tdehardwarebackend.cpp:1494
msgid ""
"Unfortunately, the device <b>%1</b> (%2) named <b>'%3'</b> and currently "
"mounted at <b>%4</b> could not be unmounted. "
@@ -194,196 +197,199 @@ 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:1408 mediamanager/tdehardwarebackend.cpp:1470
+#: mediamanager/halbackend.cpp:1403 mediamanager/tdehardwarebackend.cpp:1500
msgid "The following error was returned by umount command:"
msgstr "El comandament umount ha retornat l'error següent:"
-#: mediamanager/halbackend.cpp:1478
+#: mediamanager/halbackend.cpp:1567 mediamanager/tdehardwarebackend.cpp:1322
+msgid "Cannot mount encrypted locked drives!"
+msgstr ""
+
+#: mediamanager/halbackend.cpp:1682 mediamanager/halbackend.cpp:1703
+#: mediamanager/halbackend.cpp:1716 mediamanager/halbackend.cpp:1830
+#: mediamanager/halbackend.cpp:1840 mediamanager/halbackend.cpp:1899
+#: mediamanager/halbackend.cpp:1907
#, fuzzy
-msgid "Permission denied"
-msgstr "S'ha denegat el permís"
+msgid "Internal error"
+msgstr "Error intern"
-#: mediamanager/halbackend.cpp:1562 mediamanager/tdehardwarebackend.cpp:1232
-msgid "Cannot mount encrypted drives!"
-msgstr ""
+#: mediamanager/halbackend.cpp:1694
+#, fuzzy
+#| msgid "Unknown"
+msgid "Unknown error"
+msgstr "Desconegut"
-#: mediamanager/halbackend.cpp:1721
+#: mediamanager/halbackend.cpp:1748
msgid "Unmounting failed due to the following error:"
msgstr "Ha fallat el desmuntat degut a l'error següent:"
-#: mediamanager/halbackend.cpp:1723
+#: mediamanager/halbackend.cpp:1750
msgid "Device is Busy:"
msgstr "El dispositiu està ocupat:"
-#: mediamanager/halbackend.cpp:1727
+#: mediamanager/halbackend.cpp:1754
msgid ""
"Permission denied<p>Please ensure that:<br>1. You have permission to access "
"this device.<br>2. This device was originally mounted using TDE.</p>"
msgstr ""
-#: mediamanager/halbackend.cpp:1739
+#: mediamanager/halbackend.cpp:1766
msgid ""
"%1<p><b>Would you like to forcibly terminate these processes?</b><br><i>All "
"unsaved data would be lost</i>"
msgstr ""
-#: mediamanager/halbackend.cpp:1811
+#: mediamanager/halbackend.cpp:1852
msgid "Wrong password"
msgstr ""
-#: mediamanager/mediamanager.cpp:247 mediamanager/mediamanager.cpp:266
-#: mediamanager/mediamanager.cpp:285 mediamanager/mediamanager.cpp:293
-#: mediamanager/mediamanager.cpp:302 mediamanager/mediamanager.cpp:310
-msgid "Feature only available with HAL"
-msgstr "Aquesta característica només és disponible amb HAL"
-
-#: mediamanager/mediamanager.cpp:252
+#: mediamanager/mediamanager.cpp:248 mediamanager/mediamanager.cpp:275
#, fuzzy
msgid "Feature only available with the TDE hardware backend"
msgstr "Aquesta característica només és disponible amb HAL"
-#: mediamanager/mediamanager.cpp:256 mediamanager/mediamanager.cpp:271
-#: mediamanager/mediamanager.cpp:275
+#: mediamanager/mediamanager.cpp:255 mediamanager/mediamanager.cpp:282
+#: mediamanager/mediamanager.cpp:312 mediamanager/mediamanager.cpp:343
+msgid "Feature only available with HAL"
+msgstr "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
#, fuzzy
msgid "Feature only available with HAL or TDE hardware backend"
msgstr "Aquesta característica només és disponible amb HAL"
-#: mediamanager/tdehardwarebackend.cpp:480
-#: mediamanager/tdehardwarebackend.cpp:517
-#: mediamanager/tdehardwarebackend.cpp:750
+#: mediamanager/tdehardwarebackend.cpp:483
+#: mediamanager/tdehardwarebackend.cpp:520
+#: mediamanager/tdehardwarebackend.cpp:753
#, fuzzy
msgid "%1 Removable Device"
msgstr "Dispositiu extraïble"
-#: mediamanager/tdehardwarebackend.cpp:525
+#: mediamanager/tdehardwarebackend.cpp:528
#, fuzzy
msgid "Blank CD-ROM"
msgstr "CD-ROM"
-#: mediamanager/tdehardwarebackend.cpp:534
+#: mediamanager/tdehardwarebackend.cpp:537
msgid "Blank CD-R"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:543
+#: mediamanager/tdehardwarebackend.cpp:546
msgid "Blank CD-RW"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:552
+#: mediamanager/tdehardwarebackend.cpp:555
msgid "Blank Magneto-Optical CD"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:561
+#: mediamanager/tdehardwarebackend.cpp:564
msgid "Blank Mount Ranier CD-RW"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:570
+#: mediamanager/tdehardwarebackend.cpp:573
msgid "Blank Mount Ranier CD-RW-W"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:579
+#: mediamanager/tdehardwarebackend.cpp:582
msgid "Blank DVD-ROM"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:588
+#: mediamanager/tdehardwarebackend.cpp:591
msgid "Blank DVD-RAM"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:597
+#: mediamanager/tdehardwarebackend.cpp:600
msgid "Blank DVD-R"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:606
+#: mediamanager/tdehardwarebackend.cpp:609
msgid "Blank DVD-RW"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:615
+#: mediamanager/tdehardwarebackend.cpp:618
msgid "Blank Dual Layer DVD-R"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:624
+#: mediamanager/tdehardwarebackend.cpp:627
msgid "Blank Dual Layer DVD-RW"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:633
+#: mediamanager/tdehardwarebackend.cpp:636
msgid "Blank DVD+R"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:642
+#: mediamanager/tdehardwarebackend.cpp:645
msgid "Blank DVD+RW"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:651
+#: mediamanager/tdehardwarebackend.cpp:654
msgid "Blank Dual Layer DVD+R"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:660
+#: mediamanager/tdehardwarebackend.cpp:663
msgid "Blank Dual Layer DVD+RW"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:669
+#: mediamanager/tdehardwarebackend.cpp:672
msgid "Blank BD-ROM"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:678
+#: mediamanager/tdehardwarebackend.cpp:681
msgid "Blank BD-R"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:687
+#: mediamanager/tdehardwarebackend.cpp:690
msgid "Blank BD-RW"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:696
+#: mediamanager/tdehardwarebackend.cpp:699
msgid "Blank HDDVD-ROM"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:705
+#: mediamanager/tdehardwarebackend.cpp:708
msgid "Blank HDDVD-R"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:714
+#: mediamanager/tdehardwarebackend.cpp:717
msgid "Blank HDDVD-RW"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:721
+#: mediamanager/tdehardwarebackend.cpp:724
msgid "Audio CD"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:742
+#: mediamanager/tdehardwarebackend.cpp:745
msgid "%1 Fixed Disk (%2)"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:849
+#: mediamanager/tdehardwarebackend.cpp:852
#, fuzzy
msgid "%1 Zip Disk"
msgstr "Disc zip"
-#: mediamanager/tdehardwarebackend.cpp:1212
-#: mediamanager/tdehardwarebackend.cpp:1392
-#, fuzzy
-msgid "Internal error"
-msgstr "Error intern"
+#: mediamanager/tdehardwarebackend.cpp:1224
+#: mediamanager/tdehardwarebackend.cpp:1417
+msgid "Internal error. Couldn't find medium."
+msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:1239
-msgid ""
-"<qt>Unable to mount this device.<p>Potential reasons include:<br>Improper "
-"device and/or user privilege level<br>Corrupt data on storage device"
+#: mediamanager/tdehardwarebackend.cpp:1249
+#: mediamanager/tdehardwarebackend.cpp:1323
+msgid "Unable to mount this device."
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:1241
-#: mediamanager/tdehardwarebackend.cpp:1316
-#: mediamanager/tdehardwarebackend.cpp:1408
-#: mediamanager/tdehardwarebackend.cpp:1426
+#: mediamanager/tdehardwarebackend.cpp:1252
+#: mediamanager/tdehardwarebackend.cpp:1326
+#: mediamanager/tdehardwarebackend.cpp:1435
+#: mediamanager/tdehardwarebackend.cpp:1457
msgid "<p>Technical details:<br>"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:1314
-msgid ""
-"<qt>Unable to mount this device.<p>Potential reasons include:<br>Improper "
-"device and/or user privilege level<br>Corrupt data on storage "
-"device<br>Incorrect encryption password"
+#: mediamanager/tdehardwarebackend.cpp:1284
+msgid "Decryption aborted"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:1420
+#: mediamanager/tdehardwarebackend.cpp:1443
msgid ""
"<qt>The device <b>%1</b> (%2) named <b>'%3'</b> and currently mounted at <b>"
"%4</b> can not be unmounted at this time.<p>%5<p><b>Would you like to "
@@ -391,7 +397,7 @@ msgid ""
"lost</i>"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:1547
+#: mediamanager/tdehardwarebackend.cpp:1577
#, fuzzy
msgid ""
"Programs still using the device have been detected. They are listed below. "
@@ -406,7 +412,7 @@ msgstr ""
msgid "%1 cannot be found."
msgstr "No s'ha pogut trobar %1."
-#: mounthelper/tdeio_media_mounthelper.cpp:86
+#: mounthelper/tdeio_media_mounthelper.cpp:87
msgid "%1 is not a mountable media."
msgstr "%1 no és un suport muntable."
@@ -417,41 +423,49 @@ msgstr "%1 no és un suport muntable."
#: mounthelper/tdeio_media_mounthelper.cpp:107
#, fuzzy
-msgid "%1 is already decrypted."
+msgid "%1 is already unlocked."
msgstr "El dispositiu ja és muntat."
-#: mounthelper/tdeio_media_mounthelper.cpp:228
+#: mounthelper/tdeio_media_mounthelper.cpp:139
+msgid "Unknown unmount error."
+msgstr ""
+
+#: mounthelper/tdeio_media_mounthelper.cpp:246
msgid "The device was successfully unmounted, but the tray could not be opened"
msgstr ""
"El dispositiu s'ha desmuntat amb èxit, però no s'ha pogut obrir la safata"
-#: mounthelper/tdeio_media_mounthelper.cpp:230
+#: 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:275
+#: mounthelper/tdeio_media_mounthelper.cpp:281
+msgid "Unknown decrypt error."
+msgstr ""
+
+#: mounthelper/tdeio_media_mounthelper.cpp:295
#, fuzzy
msgid "Decrypt given URL"
msgstr "Desmunta un URL donat"
-#: mounthelper/tdeio_media_mounthelper.cpp:276
+#: mounthelper/tdeio_media_mounthelper.cpp:296
msgid "Unmount given URL"
msgstr "Desmunta un URL donat"
-#: mounthelper/tdeio_media_mounthelper.cpp:277
+#: mounthelper/tdeio_media_mounthelper.cpp:297
msgid "Mount given URL (default)"
msgstr "Munta l'URL donat (omissió)"
-#: mounthelper/tdeio_media_mounthelper.cpp:278
+#: mounthelper/tdeio_media_mounthelper.cpp:298
msgid "Eject given URL via tdeeject"
msgstr "Expulsa l'URL donat via tdeeject"
-#: mounthelper/tdeio_media_mounthelper.cpp:279
+#: mounthelper/tdeio_media_mounthelper.cpp:299
msgid "Unmount and Eject given URL (necessary for some USB devices)"
msgstr ""
"Desmunta i expulsa l'URL donat (necessari per a alguns dispositius USB)"
-#: mounthelper/tdeio_media_mounthelper.cpp:280
+#: mounthelper/tdeio_media_mounthelper.cpp:300
msgid "media:/ URL to mount/unmount/eject/remove"
msgstr "media:/ URL per a muntar/desmuntar/expulsar/extreure"
@@ -472,43 +486,43 @@ msgstr "Ha fallat el desat dels canvis"
msgid "&Mounting"
msgstr "&Muntatge"
-#: tdefile-plugin/tdefilemediaplugin.cpp:190
+#: tdefile-plugin/tdefilemediaplugin.cpp:184
msgid "Medium Information"
msgstr "Informació del suport"
-#: tdefile-plugin/tdefilemediaplugin.cpp:193
+#: tdefile-plugin/tdefilemediaplugin.cpp:187
msgid "Free"
msgstr "Lliure"
-#: tdefile-plugin/tdefilemediaplugin.cpp:196
+#: tdefile-plugin/tdefilemediaplugin.cpp:190
msgid "Used"
msgstr "Usat"
-#: tdefile-plugin/tdefilemediaplugin.cpp:199
+#: tdefile-plugin/tdefilemediaplugin.cpp:193
msgid "Total"
msgstr "Total"
-#: tdefile-plugin/tdefilemediaplugin.cpp:202
+#: tdefile-plugin/tdefilemediaplugin.cpp:196
msgid "Base URL"
msgstr "URL base"
-#: tdefile-plugin/tdefilemediaplugin.cpp:203
+#: tdefile-plugin/tdefilemediaplugin.cpp:197
msgid "Mount Point"
msgstr "Punt de muntatge"
-#: tdefile-plugin/tdefilemediaplugin.cpp:204
+#: tdefile-plugin/tdefilemediaplugin.cpp:198
msgid "Device Node"
msgstr "Node del dispositiu"
-#: tdefile-plugin/tdefilemediaplugin.cpp:206
+#: tdefile-plugin/tdefilemediaplugin.cpp:200
msgid "Medium Summary"
msgstr "Resum del suport"
-#: tdefile-plugin/tdefilemediaplugin.cpp:208
+#: tdefile-plugin/tdefilemediaplugin.cpp:202
msgid "Usage"
msgstr "Ús"
-#: tdefile-plugin/tdefilemediaplugin.cpp:210
+#: tdefile-plugin/tdefilemediaplugin.cpp:204
msgid "Bar Graph"
msgstr "Gràfic de barres"
@@ -580,23 +594,30 @@ msgid ""
"devices are plugged in."
msgstr ""
-#: mediamanager/decryptdialog.ui:24 mounthelper/decryptdialog.ui:24
+#: mediamanager/unlockdialog.ui:24 mounthelper/unlockdialog.ui:24
#, no-c-format
msgid "Decrypting Storage Device"
msgstr ""
-#: mediamanager/decryptdialog.ui:109 mounthelper/decryptdialog.ui:109
+#: mediamanager/unlockdialog.ui:109
#, no-c-format
msgid ""
-"<p><b>%1</b> is an encrypted storage device.</p>\n"
-"<p>Please enter the password to decrypt the storage device.</p>"
+"<p><b>%1</b> is an encrypted locked storage device.</p>\n"
+"<p>Please enter the password to unlock the storage device.</p>"
msgstr ""
-#: mediamanager/decryptdialog.ui:131 mounthelper/decryptdialog.ui:131
+#: mediamanager/unlockdialog.ui:131 mounthelper/unlockdialog.ui:131
#, no-c-format
msgid "&Password:"
msgstr ""
+#: mounthelper/unlockdialog.ui:109
+#, no-c-format
+msgid ""
+"<p><b>%1</b> is an encrypted storage device.</p>\n"
+"<p>Please enter the password to decrypt the storage device.</p>"
+msgstr ""
+
#: propsdlgplugin/propertiespagegui.ui:16
#, no-c-format
msgid "PropertiesPageGUI"
@@ -862,3 +883,7 @@ msgstr "Mesclat"
#, no-c-format
msgid "Filesystem: iso9660"
msgstr "Sistema de fitxers: iso9660"
+
+#, 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 5360b46f850..b5b3d85a03d 100644
--- a/tde-i18n-cs/messages/tdebase/tdeio_media.po
+++ b/tde-i18n-cs/messages/tdebase/tdeio_media.po
@@ -5,7 +5,7 @@
msgid ""
msgstr ""
"Project-Id-Version: tdeio_media\n"
-"POT-Creation-Date: 2019-01-13 18:47+0100\n"
+"POT-Creation-Date: 2019-07-11 02:33+0200\n"
"PO-Revision-Date: 2006-11-09 16:46+0100\n"
"Last-Translator: Lukáš Tinkl <lukas@kde.org>\n"
"Language-Team: Czech <cs@li.org>\n"
@@ -48,7 +48,6 @@ 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
-#: mounthelper/tdeio_media_mounthelper.cpp:256
msgid "The TDE mediamanager is not running."
msgstr "Správce médií TDE není spuštěn."
@@ -56,7 +55,7 @@ msgstr "Správce médií TDE není spuštěn."
msgid "This media name already exists."
msgstr "Tento název média již existuje."
-#: mediaimpl.cpp:230 mediaimpl.cpp:293
+#: mediaimpl.cpp:230 mediaimpl.cpp:297
msgid "No such medium."
msgstr "Žádné takové médium"
@@ -64,113 +63,117 @@ msgstr "Žádné takové médium"
msgid "The drive is encrypted."
msgstr ""
-#: mediaimpl.cpp:272 mediamanager/halbackend.cpp:1264
-#: mediamanager/halbackend.cpp:1273 mediamanager/halbackend.cpp:1663
-#: mediamanager/halbackend.cpp:1680 mediamanager/halbackend.cpp:1691
-#: mediamanager/halbackend.cpp:1793 mediamanager/halbackend.cpp:1801
-#: mediamanager/halbackend.cpp:1808 mediamanager/halbackend.cpp:1848
-#: mediamanager/halbackend.cpp:1854 mediamanager/halbackend.cpp:1861
-#: mounthelper/tdeio_media_mounthelper.cpp:58
-msgid "Internal Error"
-msgstr "Vnitřní chyba"
+#: mediaimpl.cpp:274 mediamanager/tdehardwarebackend.cpp:201
+#: mediamanager/tdehardwarebackend.cpp:252
+#: mounthelper/tdeio_media_mounthelper.cpp:202
+msgid "Unknown mount error."
+msgstr ""
#: mediamanager/dialog.cpp:26 mounthelper/dialog.cpp:26
-msgid "Decrypt"
+msgid "Unlock"
msgstr ""
-#: mediamanager/fstabbackend.cpp:104 mediamanager/fstabbackend.cpp:114
-#: mediamanager/halbackend.cpp:1595 mediamanager/halbackend.cpp:1617
-#: mediamanager/halbackend.cpp:1776 mediamanager/halbackend.cpp:1831
-#: mediamanager/tdehardwarebackend.cpp:1349
-#: mediamanager/tdehardwarebackend.cpp:1360
+#: mediamanager/fstabbackend.cpp:105 mediamanager/fstabbackend.cpp:120
+#: mediamanager/halbackend.cpp:1598 mediamanager/halbackend.cpp:1625
+#: mediamanager/halbackend.cpp:1808 mediamanager/halbackend.cpp:1877
+#: mediamanager/mediamanager.cpp:363 mediamanager/mediamanager.cpp:375
+#: mediamanager/mediamanager.cpp:387 mediamanager/mediamanager.cpp:399
+#: mediamanager/tdehardwarebackend.cpp:1363
+#: mediamanager/tdehardwarebackend.cpp:1378
#, c-format
msgid "No such medium: %1"
msgstr "Žádné médium: %1"
-#: mediamanager/fstabbackend.cpp:398
+#: mediamanager/fstabbackend.cpp:408
msgid "CD Recorder"
msgstr "Vypalovačka CD"
-#: mediamanager/fstabbackend.cpp:404
+#: mediamanager/fstabbackend.cpp:414
msgid "DVD"
msgstr "DVD"
-#: mediamanager/fstabbackend.cpp:415
+#: mediamanager/fstabbackend.cpp:425
msgid "CD-ROM"
msgstr "CD-ROM"
-#: mediamanager/fstabbackend.cpp:428
+#: mediamanager/fstabbackend.cpp:438
msgid "Floppy"
msgstr "Disketa"
-#: mediamanager/fstabbackend.cpp:436
+#: mediamanager/fstabbackend.cpp:446
msgid "Zip Disk"
msgstr "Zip disk"
-#: mediamanager/fstabbackend.cpp:447
+#: mediamanager/fstabbackend.cpp:457
msgid "Removable Device"
msgstr "Výměnné zařízení"
-#: mediamanager/fstabbackend.cpp:452 mediamanager/fstabbackend.cpp:458
+#: mediamanager/fstabbackend.cpp:462 mediamanager/fstabbackend.cpp:468
msgid "Remote Share"
msgstr "Vzdálený sdílený prostředek"
-#: mediamanager/fstabbackend.cpp:463
+#: mediamanager/fstabbackend.cpp:473
msgid "Hard Disk"
msgstr "Pevný disk"
-#: mediamanager/halbackend.cpp:749 mediamanager/tdehardwarebackend.cpp:805
+#: mediamanager/halbackend.cpp:744 mediamanager/tdehardwarebackend.cpp:808
#, fuzzy
msgid "Unknown Drive"
msgstr "Neznámé"
-#: mediamanager/halbackend.cpp:761 mediamanager/tdehardwarebackend.cpp:835
+#: mediamanager/halbackend.cpp:756 mediamanager/tdehardwarebackend.cpp:838
#, fuzzy
msgid "Floppy Drive"
msgstr "Disketa"
-#: mediamanager/halbackend.cpp:769
+#: mediamanager/halbackend.cpp:764
#, fuzzy
msgid "Zip Drive"
msgstr "Zip disk"
-#: mediamanager/halbackend.cpp:839 mediamanager/tdehardwarebackend.cpp:892
+#: mediamanager/halbackend.cpp:834 mediamanager/tdehardwarebackend.cpp:895
msgid "Camera"
msgstr "Kamera"
-#: mediamanager/halbackend.cpp:1221 mediamanager/halbackend.cpp:1247
+#: mediamanager/halbackend.cpp:1216 mediamanager/halbackend.cpp:1242
msgid "Authenticate"
msgstr ""
-#: mediamanager/halbackend.cpp:1222
+#: mediamanager/halbackend.cpp:1217
msgid ""
"<big><b>System policy prevents mounting internal media</b></big><br/"
">Authentication is required to perform this action. Please enter your "
"password to verify."
msgstr ""
-#: mediamanager/halbackend.cpp:1248
+#: mediamanager/halbackend.cpp:1243
msgid ""
"<big><b>System policy prevents unmounting media mounted by other users</b></"
"big><br/>Authentication is required to perform this action. Please enter "
"your password to verify."
msgstr ""
-#: mediamanager/halbackend.cpp:1284
+#: mediamanager/halbackend.cpp:1259 mediamanager/halbackend.cpp:1268
+#: mediamanager/halbackend.cpp:1849 mediamanager/halbackend.cpp:1916
+#: mounthelper/tdeio_media_mounthelper.cpp:58
+msgid "Internal Error"
+msgstr "Vnitřní chyba"
+
+#: mediamanager/halbackend.cpp:1279
msgid "Invalid filesystem type"
msgstr "Nesprávný typ souborového systému"
-#: mediamanager/halbackend.cpp:1286
+#: mediamanager/halbackend.cpp:1281
msgid ""
"Permission denied<p>Please ensure that:<br>1. You have permission to access "
"this device.<br>2. This device node is not listed in /etc/fstab.</p>"
msgstr ""
-#: mediamanager/halbackend.cpp:1290
+#: mediamanager/halbackend.cpp:1285
msgid "Device is already mounted."
msgstr "Zařízení je již připojeno."
-#: mediamanager/halbackend.cpp:1340
+#: mediamanager/halbackend.cpp:1335
msgid ""
"Moreover, programs still using the device have been detected. They are "
"listed below. You have to close them or change their working directory "
@@ -180,16 +183,16 @@ 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:1381 mediamanager/tdehardwarebackend.cpp:1588
+#: mediamanager/halbackend.cpp:1376 mediamanager/tdehardwarebackend.cpp:1618
msgid ""
"Programs that were still using the device have been forcibly terminated. "
"They are listed below."
msgstr ""
-#: mediamanager/halbackend.cpp:1402 mediamanager/halbackend.cpp:1715
-#: mediamanager/tdehardwarebackend.cpp:1406
-#: mediamanager/tdehardwarebackend.cpp:1424
-#: mediamanager/tdehardwarebackend.cpp:1464
+#: mediamanager/halbackend.cpp:1397 mediamanager/halbackend.cpp:1742
+#: mediamanager/tdehardwarebackend.cpp:1430
+#: mediamanager/tdehardwarebackend.cpp:1452
+#: mediamanager/tdehardwarebackend.cpp:1494
msgid ""
"Unfortunately, the device <b>%1</b> (%2) named <b>'%3'</b> and currently "
"mounted at <b>%4</b> could not be unmounted. "
@@ -197,196 +200,199 @@ 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:1408 mediamanager/tdehardwarebackend.cpp:1470
+#: mediamanager/halbackend.cpp:1403 mediamanager/tdehardwarebackend.cpp:1500
msgid "The following error was returned by umount command:"
msgstr "Tato chyba byla vrácena programem 'umount':"
-#: mediamanager/halbackend.cpp:1478
+#: mediamanager/halbackend.cpp:1567 mediamanager/tdehardwarebackend.cpp:1322
+msgid "Cannot mount encrypted locked drives!"
+msgstr ""
+
+#: mediamanager/halbackend.cpp:1682 mediamanager/halbackend.cpp:1703
+#: mediamanager/halbackend.cpp:1716 mediamanager/halbackend.cpp:1830
+#: mediamanager/halbackend.cpp:1840 mediamanager/halbackend.cpp:1899
+#: mediamanager/halbackend.cpp:1907
#, fuzzy
-msgid "Permission denied"
-msgstr "Přístup nepovolen"
+msgid "Internal error"
+msgstr "Vnitřní chyba"
-#: mediamanager/halbackend.cpp:1562 mediamanager/tdehardwarebackend.cpp:1232
-msgid "Cannot mount encrypted drives!"
-msgstr ""
+#: mediamanager/halbackend.cpp:1694
+#, fuzzy
+#| msgid "Unknown"
+msgid "Unknown error"
+msgstr "Neznámé"
-#: mediamanager/halbackend.cpp:1721
+#: mediamanager/halbackend.cpp:1748
msgid "Unmounting failed due to the following error:"
msgstr "Odpojení selhalo kvůli této chybě:"
-#: mediamanager/halbackend.cpp:1723
+#: mediamanager/halbackend.cpp:1750
msgid "Device is Busy:"
msgstr "Zařízení je zaneprázdněné:"
-#: mediamanager/halbackend.cpp:1727
+#: mediamanager/halbackend.cpp:1754
msgid ""
"Permission denied<p>Please ensure that:<br>1. You have permission to access "
"this device.<br>2. This device was originally mounted using TDE.</p>"
msgstr ""
-#: mediamanager/halbackend.cpp:1739
+#: mediamanager/halbackend.cpp:1766
msgid ""
"%1<p><b>Would you like to forcibly terminate these processes?</b><br><i>All "
"unsaved data would be lost</i>"
msgstr ""
-#: mediamanager/halbackend.cpp:1811
+#: mediamanager/halbackend.cpp:1852
msgid "Wrong password"
msgstr ""
-#: mediamanager/mediamanager.cpp:247 mediamanager/mediamanager.cpp:266
-#: mediamanager/mediamanager.cpp:285 mediamanager/mediamanager.cpp:293
-#: mediamanager/mediamanager.cpp:302 mediamanager/mediamanager.cpp:310
-msgid "Feature only available with HAL"
-msgstr "Funkce dostupná pouze v HAL"
-
-#: mediamanager/mediamanager.cpp:252
+#: mediamanager/mediamanager.cpp:248 mediamanager/mediamanager.cpp:275
#, fuzzy
msgid "Feature only available with the TDE hardware backend"
msgstr "Funkce dostupná pouze v HAL"
-#: mediamanager/mediamanager.cpp:256 mediamanager/mediamanager.cpp:271
-#: mediamanager/mediamanager.cpp:275
+#: mediamanager/mediamanager.cpp:255 mediamanager/mediamanager.cpp:282
+#: mediamanager/mediamanager.cpp:312 mediamanager/mediamanager.cpp:343
+msgid "Feature only available with HAL"
+msgstr "Funkce dostupná pouze v HAL"
+
+#: mediamanager/mediamanager.cpp:262 mediamanager/mediamanager.cpp:289
+#: mediamanager/mediamanager.cpp:320 mediamanager/mediamanager.cpp:350
#, fuzzy
msgid "Feature only available with HAL or TDE hardware backend"
msgstr "Funkce dostupná pouze v HAL"
-#: mediamanager/tdehardwarebackend.cpp:480
-#: mediamanager/tdehardwarebackend.cpp:517
-#: mediamanager/tdehardwarebackend.cpp:750
+#: mediamanager/tdehardwarebackend.cpp:483
+#: mediamanager/tdehardwarebackend.cpp:520
+#: mediamanager/tdehardwarebackend.cpp:753
#, fuzzy
msgid "%1 Removable Device"
msgstr "Výměnné zařízení"
-#: mediamanager/tdehardwarebackend.cpp:525
+#: mediamanager/tdehardwarebackend.cpp:528
#, fuzzy
msgid "Blank CD-ROM"
msgstr "CD-ROM"
-#: mediamanager/tdehardwarebackend.cpp:534
+#: mediamanager/tdehardwarebackend.cpp:537
msgid "Blank CD-R"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:543
+#: mediamanager/tdehardwarebackend.cpp:546
msgid "Blank CD-RW"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:552
+#: mediamanager/tdehardwarebackend.cpp:555
msgid "Blank Magneto-Optical CD"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:561
+#: mediamanager/tdehardwarebackend.cpp:564
msgid "Blank Mount Ranier CD-RW"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:570
+#: mediamanager/tdehardwarebackend.cpp:573
msgid "Blank Mount Ranier CD-RW-W"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:579
+#: mediamanager/tdehardwarebackend.cpp:582
msgid "Blank DVD-ROM"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:588
+#: mediamanager/tdehardwarebackend.cpp:591
msgid "Blank DVD-RAM"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:597
+#: mediamanager/tdehardwarebackend.cpp:600
msgid "Blank DVD-R"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:606
+#: mediamanager/tdehardwarebackend.cpp:609
msgid "Blank DVD-RW"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:615
+#: mediamanager/tdehardwarebackend.cpp:618
msgid "Blank Dual Layer DVD-R"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:624
+#: mediamanager/tdehardwarebackend.cpp:627
msgid "Blank Dual Layer DVD-RW"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:633
+#: mediamanager/tdehardwarebackend.cpp:636
msgid "Blank DVD+R"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:642
+#: mediamanager/tdehardwarebackend.cpp:645
msgid "Blank DVD+RW"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:651
+#: mediamanager/tdehardwarebackend.cpp:654
msgid "Blank Dual Layer DVD+R"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:660
+#: mediamanager/tdehardwarebackend.cpp:663
msgid "Blank Dual Layer DVD+RW"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:669
+#: mediamanager/tdehardwarebackend.cpp:672
msgid "Blank BD-ROM"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:678
+#: mediamanager/tdehardwarebackend.cpp:681
msgid "Blank BD-R"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:687
+#: mediamanager/tdehardwarebackend.cpp:690
msgid "Blank BD-RW"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:696
+#: mediamanager/tdehardwarebackend.cpp:699
msgid "Blank HDDVD-ROM"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:705
+#: mediamanager/tdehardwarebackend.cpp:708
msgid "Blank HDDVD-R"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:714
+#: mediamanager/tdehardwarebackend.cpp:717
msgid "Blank HDDVD-RW"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:721
+#: mediamanager/tdehardwarebackend.cpp:724
msgid "Audio CD"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:742
+#: mediamanager/tdehardwarebackend.cpp:745
msgid "%1 Fixed Disk (%2)"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:849
+#: mediamanager/tdehardwarebackend.cpp:852
#, fuzzy
msgid "%1 Zip Disk"
msgstr "Zip disk"
-#: mediamanager/tdehardwarebackend.cpp:1212
-#: mediamanager/tdehardwarebackend.cpp:1392
-#, fuzzy
-msgid "Internal error"
-msgstr "Vnitřní chyba"
+#: mediamanager/tdehardwarebackend.cpp:1224
+#: mediamanager/tdehardwarebackend.cpp:1417
+msgid "Internal error. Couldn't find medium."
+msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:1239
-msgid ""
-"<qt>Unable to mount this device.<p>Potential reasons include:<br>Improper "
-"device and/or user privilege level<br>Corrupt data on storage device"
+#: mediamanager/tdehardwarebackend.cpp:1249
+#: mediamanager/tdehardwarebackend.cpp:1323
+msgid "Unable to mount this device."
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:1241
-#: mediamanager/tdehardwarebackend.cpp:1316
-#: mediamanager/tdehardwarebackend.cpp:1408
-#: mediamanager/tdehardwarebackend.cpp:1426
+#: mediamanager/tdehardwarebackend.cpp:1252
+#: mediamanager/tdehardwarebackend.cpp:1326
+#: mediamanager/tdehardwarebackend.cpp:1435
+#: mediamanager/tdehardwarebackend.cpp:1457
msgid "<p>Technical details:<br>"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:1314
-msgid ""
-"<qt>Unable to mount this device.<p>Potential reasons include:<br>Improper "
-"device and/or user privilege level<br>Corrupt data on storage "
-"device<br>Incorrect encryption password"
+#: mediamanager/tdehardwarebackend.cpp:1284
+msgid "Decryption aborted"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:1420
+#: mediamanager/tdehardwarebackend.cpp:1443
msgid ""
"<qt>The device <b>%1</b> (%2) named <b>'%3'</b> and currently mounted at <b>"
"%4</b> can not be unmounted at this time.<p>%5<p><b>Would you like to "
@@ -394,7 +400,7 @@ msgid ""
"lost</i>"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:1547
+#: mediamanager/tdehardwarebackend.cpp:1577
#, fuzzy
msgid ""
"Programs still using the device have been detected. They are listed below. "
@@ -409,7 +415,7 @@ msgstr ""
msgid "%1 cannot be found."
msgstr "Nelze nalézt %1."
-#: mounthelper/tdeio_media_mounthelper.cpp:86
+#: mounthelper/tdeio_media_mounthelper.cpp:87
msgid "%1 is not a mountable media."
msgstr "%1 není připojitelné médium."
@@ -420,39 +426,47 @@ msgstr "%1 není připojitelné médium."
#: mounthelper/tdeio_media_mounthelper.cpp:107
#, fuzzy
-msgid "%1 is already decrypted."
+msgid "%1 is already unlocked."
msgstr "Zařízení je již připojeno."
-#: mounthelper/tdeio_media_mounthelper.cpp:228
+#: mounthelper/tdeio_media_mounthelper.cpp:139
+msgid "Unknown unmount error."
+msgstr ""
+
+#: mounthelper/tdeio_media_mounthelper.cpp:246
msgid "The device was successfully unmounted, but the tray could not be opened"
msgstr "Zařízení bylo úspěšně odpojeno, ale zásuvku nelze otevřít"
-#: mounthelper/tdeio_media_mounthelper.cpp:230
+#: 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:275
+#: mounthelper/tdeio_media_mounthelper.cpp:281
+msgid "Unknown decrypt error."
+msgstr ""
+
+#: mounthelper/tdeio_media_mounthelper.cpp:295
#, fuzzy
msgid "Decrypt given URL"
msgstr "Odpojit dané URL"
-#: mounthelper/tdeio_media_mounthelper.cpp:276
+#: mounthelper/tdeio_media_mounthelper.cpp:296
msgid "Unmount given URL"
msgstr "Odpojit dané URL"
-#: mounthelper/tdeio_media_mounthelper.cpp:277
+#: mounthelper/tdeio_media_mounthelper.cpp:297
msgid "Mount given URL (default)"
msgstr "Připojit dané URL (výchozí)"
-#: mounthelper/tdeio_media_mounthelper.cpp:278
+#: mounthelper/tdeio_media_mounthelper.cpp:298
msgid "Eject given URL via tdeeject"
msgstr "Vysunout pomocí 'tdeeject'"
-#: mounthelper/tdeio_media_mounthelper.cpp:279
+#: mounthelper/tdeio_media_mounthelper.cpp:299
msgid "Unmount and Eject given URL (necessary for some USB devices)"
msgstr "Odpojit a vysunout dané URL (nezbytné pro některá USB zařízení)"
-#: mounthelper/tdeio_media_mounthelper.cpp:280
+#: mounthelper/tdeio_media_mounthelper.cpp:300
msgid "media:/ URL to mount/unmount/eject/remove"
msgstr "media:/ URL k připojení/odpojení/vysunutí/odstranění"
@@ -473,43 +487,43 @@ msgstr "Uložení změn selhalo"
msgid "&Mounting"
msgstr "&Připojení"
-#: tdefile-plugin/tdefilemediaplugin.cpp:190
+#: tdefile-plugin/tdefilemediaplugin.cpp:184
msgid "Medium Information"
msgstr "Informace o médiu"
-#: tdefile-plugin/tdefilemediaplugin.cpp:193
+#: tdefile-plugin/tdefilemediaplugin.cpp:187
msgid "Free"
msgstr "Volné"
-#: tdefile-plugin/tdefilemediaplugin.cpp:196
+#: tdefile-plugin/tdefilemediaplugin.cpp:190
msgid "Used"
msgstr "Použité"
-#: tdefile-plugin/tdefilemediaplugin.cpp:199
+#: tdefile-plugin/tdefilemediaplugin.cpp:193
msgid "Total"
msgstr "Celkem"
-#: tdefile-plugin/tdefilemediaplugin.cpp:202
+#: tdefile-plugin/tdefilemediaplugin.cpp:196
msgid "Base URL"
msgstr "Základní URL"
-#: tdefile-plugin/tdefilemediaplugin.cpp:203
+#: tdefile-plugin/tdefilemediaplugin.cpp:197
msgid "Mount Point"
msgstr "Místo připojení"
-#: tdefile-plugin/tdefilemediaplugin.cpp:204
+#: tdefile-plugin/tdefilemediaplugin.cpp:198
msgid "Device Node"
msgstr "Uzel zařízení"
-#: tdefile-plugin/tdefilemediaplugin.cpp:206
+#: tdefile-plugin/tdefilemediaplugin.cpp:200
msgid "Medium Summary"
msgstr "Souhrn média"
-#: tdefile-plugin/tdefilemediaplugin.cpp:208
+#: tdefile-plugin/tdefilemediaplugin.cpp:202
msgid "Usage"
msgstr "Využití"
-#: tdefile-plugin/tdefilemediaplugin.cpp:210
+#: tdefile-plugin/tdefilemediaplugin.cpp:204
msgid "Bar Graph"
msgstr "Sloupcový graf"
@@ -581,23 +595,30 @@ msgid ""
"devices are plugged in."
msgstr ""
-#: mediamanager/decryptdialog.ui:24 mounthelper/decryptdialog.ui:24
+#: mediamanager/unlockdialog.ui:24 mounthelper/unlockdialog.ui:24
#, no-c-format
msgid "Decrypting Storage Device"
msgstr ""
-#: mediamanager/decryptdialog.ui:109 mounthelper/decryptdialog.ui:109
+#: mediamanager/unlockdialog.ui:109
#, no-c-format
msgid ""
-"<p><b>%1</b> is an encrypted storage device.</p>\n"
-"<p>Please enter the password to decrypt the storage device.</p>"
+"<p><b>%1</b> is an encrypted locked storage device.</p>\n"
+"<p>Please enter the password to unlock the storage device.</p>"
msgstr ""
-#: mediamanager/decryptdialog.ui:131 mounthelper/decryptdialog.ui:131
+#: mediamanager/unlockdialog.ui:131 mounthelper/unlockdialog.ui:131
#, no-c-format
msgid "&Password:"
msgstr ""
+#: mounthelper/unlockdialog.ui:109
+#, no-c-format
+msgid ""
+"<p><b>%1</b> is an encrypted storage device.</p>\n"
+"<p>Please enter the password to decrypt the storage device.</p>"
+msgstr ""
+
#: propsdlgplugin/propertiespagegui.ui:16
#, no-c-format
msgid "PropertiesPageGUI"
@@ -853,3 +874,7 @@ msgstr "Smíšené"
#, no-c-format
msgid "Filesystem: iso9660"
msgstr "Souborový systém: iso9660"
+
+#, 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 86032c876e1..752ef00c1ce 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: 2019-01-13 18:47+0100\n"
+"POT-Creation-Date: 2019-07-11 02:33+0200\n"
"PO-Revision-Date: 2007-02-18 19:22+0100\n"
"Last-Translator: Michôł Òstrowsczi <michol@linuxcsb.org>\n"
"Language-Team: Kashubian\n"
@@ -47,7 +47,6 @@ 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
-#: mounthelper/tdeio_media_mounthelper.cpp:256
msgid "The TDE mediamanager is not running."
msgstr "Menadżera nie je zrëszonô."
@@ -55,7 +54,7 @@ msgstr "Menadżera nie je zrëszonô."
msgid "This media name already exists."
msgstr "Pòdane miono medium ju je."
-#: mediaimpl.cpp:230 mediaimpl.cpp:293
+#: mediaimpl.cpp:230 mediaimpl.cpp:297
msgid "No such medium."
msgstr "Nie mô taczégò medium."
@@ -63,113 +62,117 @@ msgstr "Nie mô taczégò medium."
msgid "The drive is encrypted."
msgstr ""
-#: mediaimpl.cpp:272 mediamanager/halbackend.cpp:1264
-#: mediamanager/halbackend.cpp:1273 mediamanager/halbackend.cpp:1663
-#: mediamanager/halbackend.cpp:1680 mediamanager/halbackend.cpp:1691
-#: mediamanager/halbackend.cpp:1793 mediamanager/halbackend.cpp:1801
-#: mediamanager/halbackend.cpp:1808 mediamanager/halbackend.cpp:1848
-#: mediamanager/halbackend.cpp:1854 mediamanager/halbackend.cpp:1861
-#: mounthelper/tdeio_media_mounthelper.cpp:58
-msgid "Internal Error"
-msgstr "Bënowô fela"
+#: mediaimpl.cpp:274 mediamanager/tdehardwarebackend.cpp:201
+#: mediamanager/tdehardwarebackend.cpp:252
+#: mounthelper/tdeio_media_mounthelper.cpp:202
+msgid "Unknown mount error."
+msgstr ""
#: mediamanager/dialog.cpp:26 mounthelper/dialog.cpp:26
-msgid "Decrypt"
+msgid "Unlock"
msgstr ""
-#: mediamanager/fstabbackend.cpp:104 mediamanager/fstabbackend.cpp:114
-#: mediamanager/halbackend.cpp:1595 mediamanager/halbackend.cpp:1617
-#: mediamanager/halbackend.cpp:1776 mediamanager/halbackend.cpp:1831
-#: mediamanager/tdehardwarebackend.cpp:1349
-#: mediamanager/tdehardwarebackend.cpp:1360
+#: mediamanager/fstabbackend.cpp:105 mediamanager/fstabbackend.cpp:120
+#: mediamanager/halbackend.cpp:1598 mediamanager/halbackend.cpp:1625
+#: mediamanager/halbackend.cpp:1808 mediamanager/halbackend.cpp:1877
+#: mediamanager/mediamanager.cpp:363 mediamanager/mediamanager.cpp:375
+#: mediamanager/mediamanager.cpp:387 mediamanager/mediamanager.cpp:399
+#: mediamanager/tdehardwarebackend.cpp:1363
+#: mediamanager/tdehardwarebackend.cpp:1378
#, c-format
msgid "No such medium: %1"
msgstr "Nié mô taczégò medium: %1"
-#: mediamanager/fstabbackend.cpp:398
+#: mediamanager/fstabbackend.cpp:408
msgid "CD Recorder"
msgstr "Nagrëwôrka CD"
-#: mediamanager/fstabbackend.cpp:404
+#: mediamanager/fstabbackend.cpp:414
msgid "DVD"
msgstr "DVD"
-#: mediamanager/fstabbackend.cpp:415
+#: mediamanager/fstabbackend.cpp:425
msgid "CD-ROM"
msgstr "CD-ROM"
-#: mediamanager/fstabbackend.cpp:428
+#: mediamanager/fstabbackend.cpp:438
msgid "Floppy"
msgstr "Diskietka"
-#: mediamanager/fstabbackend.cpp:436
+#: mediamanager/fstabbackend.cpp:446
msgid "Zip Disk"
msgstr "Disk ZIP"
-#: mediamanager/fstabbackend.cpp:447
+#: mediamanager/fstabbackend.cpp:457
msgid "Removable Device"
msgstr "Wëmieniowé ùrzãdzenié"
-#: mediamanager/fstabbackend.cpp:452 mediamanager/fstabbackend.cpp:458
+#: mediamanager/fstabbackend.cpp:462 mediamanager/fstabbackend.cpp:468
msgid "Remote Share"
msgstr "Daleczi dostónk"
-#: mediamanager/fstabbackend.cpp:463
+#: mediamanager/fstabbackend.cpp:473
msgid "Hard Disk"
msgstr "Cwiardi disk"
-#: mediamanager/halbackend.cpp:749 mediamanager/tdehardwarebackend.cpp:805
+#: mediamanager/halbackend.cpp:744 mediamanager/tdehardwarebackend.cpp:808
#, fuzzy
msgid "Unknown Drive"
msgstr "Nieznóny"
-#: mediamanager/halbackend.cpp:761 mediamanager/tdehardwarebackend.cpp:835
+#: mediamanager/halbackend.cpp:756 mediamanager/tdehardwarebackend.cpp:838
#, fuzzy
msgid "Floppy Drive"
msgstr "Diskietka"
-#: mediamanager/halbackend.cpp:769
+#: mediamanager/halbackend.cpp:764
#, fuzzy
msgid "Zip Drive"
msgstr "Disk ZIP"
-#: mediamanager/halbackend.cpp:839 mediamanager/tdehardwarebackend.cpp:892
+#: mediamanager/halbackend.cpp:834 mediamanager/tdehardwarebackend.cpp:895
msgid "Camera"
msgstr "Òdjimny aparat"
-#: mediamanager/halbackend.cpp:1221 mediamanager/halbackend.cpp:1247
+#: mediamanager/halbackend.cpp:1216 mediamanager/halbackend.cpp:1242
msgid "Authenticate"
msgstr ""
-#: mediamanager/halbackend.cpp:1222
+#: mediamanager/halbackend.cpp:1217
msgid ""
"<big><b>System policy prevents mounting internal media</b></big><br/"
">Authentication is required to perform this action. Please enter your "
"password to verify."
msgstr ""
-#: mediamanager/halbackend.cpp:1248
+#: mediamanager/halbackend.cpp:1243
msgid ""
"<big><b>System policy prevents unmounting media mounted by other users</b></"
"big><br/>Authentication is required to perform this action. Please enter "
"your password to verify."
msgstr ""
-#: mediamanager/halbackend.cpp:1284
+#: mediamanager/halbackend.cpp:1259 mediamanager/halbackend.cpp:1268
+#: mediamanager/halbackend.cpp:1849 mediamanager/halbackend.cpp:1916
+#: mounthelper/tdeio_media_mounthelper.cpp:58
+msgid "Internal Error"
+msgstr "Bënowô fela"
+
+#: mediamanager/halbackend.cpp:1279
msgid "Invalid filesystem type"
msgstr "Nieprawidłowô systema lopków"
-#: mediamanager/halbackend.cpp:1286
+#: mediamanager/halbackend.cpp:1281
msgid ""
"Permission denied<p>Please ensure that:<br>1. You have permission to access "
"this device.<br>2. This device node is not listed in /etc/fstab.</p>"
msgstr ""
-#: mediamanager/halbackend.cpp:1290
+#: mediamanager/halbackend.cpp:1285
msgid "Device is already mounted."
msgstr "Ùrzãdzenié je ju zamòntowané."
-#: mediamanager/halbackend.cpp:1340
+#: mediamanager/halbackend.cpp:1335
msgid ""
"Moreover, programs still using the device have been detected. They are "
"listed below. You have to close them or change their working directory "
@@ -179,16 +182,16 @@ msgstr ""
"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:1381 mediamanager/tdehardwarebackend.cpp:1588
+#: mediamanager/halbackend.cpp:1376 mediamanager/tdehardwarebackend.cpp:1618
msgid ""
"Programs that were still using the device have been forcibly terminated. "
"They are listed below."
msgstr ""
-#: mediamanager/halbackend.cpp:1402 mediamanager/halbackend.cpp:1715
-#: mediamanager/tdehardwarebackend.cpp:1406
-#: mediamanager/tdehardwarebackend.cpp:1424
-#: mediamanager/tdehardwarebackend.cpp:1464
+#: mediamanager/halbackend.cpp:1397 mediamanager/halbackend.cpp:1742
+#: mediamanager/tdehardwarebackend.cpp:1430
+#: mediamanager/tdehardwarebackend.cpp:1452
+#: mediamanager/tdehardwarebackend.cpp:1494
msgid ""
"Unfortunately, the device <b>%1</b> (%2) named <b>'%3'</b> and currently "
"mounted at <b>%4</b> could not be unmounted. "
@@ -196,196 +199,199 @@ msgstr ""
"Bò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:1408 mediamanager/tdehardwarebackend.cpp:1470
+#: mediamanager/halbackend.cpp:1403 mediamanager/tdehardwarebackend.cpp:1500
msgid "The following error was returned by umount command:"
msgstr "Na felô òsta zwróconô bez pòlét umount:"
-#: mediamanager/halbackend.cpp:1478
+#: mediamanager/halbackend.cpp:1567 mediamanager/tdehardwarebackend.cpp:1322
+msgid "Cannot mount encrypted locked drives!"
+msgstr ""
+
+#: mediamanager/halbackend.cpp:1682 mediamanager/halbackend.cpp:1703
+#: mediamanager/halbackend.cpp:1716 mediamanager/halbackend.cpp:1830
+#: mediamanager/halbackend.cpp:1840 mediamanager/halbackend.cpp:1899
+#: mediamanager/halbackend.cpp:1907
#, fuzzy
-msgid "Permission denied"
-msgstr "Felënk przistãpù"
+msgid "Internal error"
+msgstr "Bënowô fela"
-#: mediamanager/halbackend.cpp:1562 mediamanager/tdehardwarebackend.cpp:1232
-msgid "Cannot mount encrypted drives!"
-msgstr ""
+#: mediamanager/halbackend.cpp:1694
+#, fuzzy
+#| msgid "Unknown"
+msgid "Unknown error"
+msgstr "Nieznóny"
-#: mediamanager/halbackend.cpp:1721
+#: mediamanager/halbackend.cpp:1748
msgid "Unmounting failed due to the following error:"
msgstr "Òdmòntowanié nie darzëło sã bez nã felã:"
-#: mediamanager/halbackend.cpp:1723
+#: mediamanager/halbackend.cpp:1750
msgid "Device is Busy:"
msgstr "Ùrzãdzenié je zajãti:"
-#: mediamanager/halbackend.cpp:1727
+#: mediamanager/halbackend.cpp:1754
msgid ""
"Permission denied<p>Please ensure that:<br>1. You have permission to access "
"this device.<br>2. This device was originally mounted using TDE.</p>"
msgstr ""
-#: mediamanager/halbackend.cpp:1739
+#: mediamanager/halbackend.cpp:1766
msgid ""
"%1<p><b>Would you like to forcibly terminate these processes?</b><br><i>All "
"unsaved data would be lost</i>"
msgstr ""
-#: mediamanager/halbackend.cpp:1811
+#: mediamanager/halbackend.cpp:1852
msgid "Wrong password"
msgstr ""
-#: mediamanager/mediamanager.cpp:247 mediamanager/mediamanager.cpp:266
-#: mediamanager/mediamanager.cpp:285 mediamanager/mediamanager.cpp:293
-#: mediamanager/mediamanager.cpp:302 mediamanager/mediamanager.cpp:310
-msgid "Feature only available with HAL"
-msgstr "Swòjizna na przistãpnô je blós z HAL"
-
-#: mediamanager/mediamanager.cpp:252
+#: mediamanager/mediamanager.cpp:248 mediamanager/mediamanager.cpp:275
#, fuzzy
msgid "Feature only available with the TDE hardware backend"
msgstr "Swòjizna na przistãpnô je blós z HAL"
-#: mediamanager/mediamanager.cpp:256 mediamanager/mediamanager.cpp:271
-#: mediamanager/mediamanager.cpp:275
+#: mediamanager/mediamanager.cpp:255 mediamanager/mediamanager.cpp:282
+#: mediamanager/mediamanager.cpp:312 mediamanager/mediamanager.cpp:343
+msgid "Feature only available with HAL"
+msgstr "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
#, 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:480
-#: mediamanager/tdehardwarebackend.cpp:517
-#: mediamanager/tdehardwarebackend.cpp:750
+#: mediamanager/tdehardwarebackend.cpp:483
+#: mediamanager/tdehardwarebackend.cpp:520
+#: mediamanager/tdehardwarebackend.cpp:753
#, fuzzy
msgid "%1 Removable Device"
msgstr "Wëmieniowé ùrzãdzenié"
-#: mediamanager/tdehardwarebackend.cpp:525
+#: mediamanager/tdehardwarebackend.cpp:528
#, fuzzy
msgid "Blank CD-ROM"
msgstr "CD-ROM"
-#: mediamanager/tdehardwarebackend.cpp:534
+#: mediamanager/tdehardwarebackend.cpp:537
msgid "Blank CD-R"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:543
+#: mediamanager/tdehardwarebackend.cpp:546
msgid "Blank CD-RW"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:552
+#: mediamanager/tdehardwarebackend.cpp:555
msgid "Blank Magneto-Optical CD"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:561
+#: mediamanager/tdehardwarebackend.cpp:564
msgid "Blank Mount Ranier CD-RW"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:570
+#: mediamanager/tdehardwarebackend.cpp:573
msgid "Blank Mount Ranier CD-RW-W"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:579
+#: mediamanager/tdehardwarebackend.cpp:582
msgid "Blank DVD-ROM"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:588
+#: mediamanager/tdehardwarebackend.cpp:591
msgid "Blank DVD-RAM"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:597
+#: mediamanager/tdehardwarebackend.cpp:600
msgid "Blank DVD-R"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:606
+#: mediamanager/tdehardwarebackend.cpp:609
msgid "Blank DVD-RW"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:615
+#: mediamanager/tdehardwarebackend.cpp:618
msgid "Blank Dual Layer DVD-R"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:624
+#: mediamanager/tdehardwarebackend.cpp:627
msgid "Blank Dual Layer DVD-RW"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:633
+#: mediamanager/tdehardwarebackend.cpp:636
msgid "Blank DVD+R"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:642
+#: mediamanager/tdehardwarebackend.cpp:645
msgid "Blank DVD+RW"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:651
+#: mediamanager/tdehardwarebackend.cpp:654
msgid "Blank Dual Layer DVD+R"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:660
+#: mediamanager/tdehardwarebackend.cpp:663
msgid "Blank Dual Layer DVD+RW"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:669
+#: mediamanager/tdehardwarebackend.cpp:672
msgid "Blank BD-ROM"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:678
+#: mediamanager/tdehardwarebackend.cpp:681
msgid "Blank BD-R"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:687
+#: mediamanager/tdehardwarebackend.cpp:690
msgid "Blank BD-RW"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:696
+#: mediamanager/tdehardwarebackend.cpp:699
msgid "Blank HDDVD-ROM"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:705
+#: mediamanager/tdehardwarebackend.cpp:708
msgid "Blank HDDVD-R"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:714
+#: mediamanager/tdehardwarebackend.cpp:717
msgid "Blank HDDVD-RW"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:721
+#: mediamanager/tdehardwarebackend.cpp:724
msgid "Audio CD"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:742
+#: mediamanager/tdehardwarebackend.cpp:745
msgid "%1 Fixed Disk (%2)"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:849
+#: mediamanager/tdehardwarebackend.cpp:852
#, fuzzy
msgid "%1 Zip Disk"
msgstr "Disk ZIP"
-#: mediamanager/tdehardwarebackend.cpp:1212
-#: mediamanager/tdehardwarebackend.cpp:1392
-#, fuzzy
-msgid "Internal error"
-msgstr "Bënowô fela"
+#: mediamanager/tdehardwarebackend.cpp:1224
+#: mediamanager/tdehardwarebackend.cpp:1417
+msgid "Internal error. Couldn't find medium."
+msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:1239
-msgid ""
-"<qt>Unable to mount this device.<p>Potential reasons include:<br>Improper "
-"device and/or user privilege level<br>Corrupt data on storage device"
+#: mediamanager/tdehardwarebackend.cpp:1249
+#: mediamanager/tdehardwarebackend.cpp:1323
+msgid "Unable to mount this device."
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:1241
-#: mediamanager/tdehardwarebackend.cpp:1316
-#: mediamanager/tdehardwarebackend.cpp:1408
-#: mediamanager/tdehardwarebackend.cpp:1426
+#: mediamanager/tdehardwarebackend.cpp:1252
+#: mediamanager/tdehardwarebackend.cpp:1326
+#: mediamanager/tdehardwarebackend.cpp:1435
+#: mediamanager/tdehardwarebackend.cpp:1457
msgid "<p>Technical details:<br>"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:1314
-msgid ""
-"<qt>Unable to mount this device.<p>Potential reasons include:<br>Improper "
-"device and/or user privilege level<br>Corrupt data on storage "
-"device<br>Incorrect encryption password"
+#: mediamanager/tdehardwarebackend.cpp:1284
+msgid "Decryption aborted"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:1420
+#: mediamanager/tdehardwarebackend.cpp:1443
msgid ""
"<qt>The device <b>%1</b> (%2) named <b>'%3'</b> and currently mounted at <b>"
"%4</b> can not be unmounted at this time.<p>%5<p><b>Would you like to "
@@ -393,7 +399,7 @@ msgid ""
"lost</i>"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:1547
+#: mediamanager/tdehardwarebackend.cpp:1577
#, fuzzy
msgid ""
"Programs still using the device have been detected. They are listed below. "
@@ -408,7 +414,7 @@ msgstr ""
msgid "%1 cannot be found."
msgstr "Nie mòże nalezc %1."
-#: mounthelper/tdeio_media_mounthelper.cpp:86
+#: mounthelper/tdeio_media_mounthelper.cpp:87
msgid "%1 is not a mountable media."
msgstr "%1 nie je montowalnym medium."
@@ -419,41 +425,49 @@ msgstr "%1 nie je montowalnym medium."
#: mounthelper/tdeio_media_mounthelper.cpp:107
#, fuzzy
-msgid "%1 is already decrypted."
+msgid "%1 is already unlocked."
msgstr "Ùrzãdzenié je ju zamòntowané."
-#: mounthelper/tdeio_media_mounthelper.cpp:228
+#: mounthelper/tdeio_media_mounthelper.cpp:139
+msgid "Unknown unmount error."
+msgstr ""
+
+#: mounthelper/tdeio_media_mounthelper.cpp:246
msgid "The device was successfully unmounted, but the tray could not be opened"
msgstr ""
"Ùrzãdzenié òsta ùdało òdmòntowané, le próba òtemkniãcô zabiérnika nie "
"darzëła sã"
-#: mounthelper/tdeio_media_mounthelper.cpp:230
+#: 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:275
+#: mounthelper/tdeio_media_mounthelper.cpp:281
+msgid "Unknown decrypt error."
+msgstr ""
+
+#: mounthelper/tdeio_media_mounthelper.cpp:295
#, fuzzy
msgid "Decrypt given URL"
msgstr "Òdmontuje pòdany URL"
-#: mounthelper/tdeio_media_mounthelper.cpp:276
+#: mounthelper/tdeio_media_mounthelper.cpp:296
msgid "Unmount given URL"
msgstr "Òdmontuje pòdany URL"
-#: mounthelper/tdeio_media_mounthelper.cpp:277
+#: mounthelper/tdeio_media_mounthelper.cpp:297
msgid "Mount given URL (default)"
msgstr "Zamontuje pòdany URL (domëslno)"
-#: mounthelper/tdeio_media_mounthelper.cpp:278
+#: 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:279
+#: 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:280
+#: mounthelper/tdeio_media_mounthelper.cpp:300
msgid "media:/ URL to mount/unmount/eject/remove"
msgstr "URL media:/ do zamontowaniô/òdmontowaniô/wësëniãcô/rëmniãcô"
@@ -474,43 +488,43 @@ msgstr "Zapisanié zmian nie darzëło sã"
msgid "&Mounting"
msgstr "&Mòntowanié"
-#: tdefile-plugin/tdefilemediaplugin.cpp:190
+#: tdefile-plugin/tdefilemediaplugin.cpp:184
msgid "Medium Information"
msgstr "Wëdowiédzô ò medium"
-#: tdefile-plugin/tdefilemediaplugin.cpp:193
+#: tdefile-plugin/tdefilemediaplugin.cpp:187
msgid "Free"
msgstr "Wòlne"
-#: tdefile-plugin/tdefilemediaplugin.cpp:196
+#: tdefile-plugin/tdefilemediaplugin.cpp:190
msgid "Used"
msgstr "Zajãté"
-#: tdefile-plugin/tdefilemediaplugin.cpp:199
+#: tdefile-plugin/tdefilemediaplugin.cpp:193
msgid "Total"
msgstr "Całowno"
-#: tdefile-plugin/tdefilemediaplugin.cpp:202
+#: tdefile-plugin/tdefilemediaplugin.cpp:196
msgid "Base URL"
msgstr "Bazowi URL"
-#: tdefile-plugin/tdefilemediaplugin.cpp:203
+#: tdefile-plugin/tdefilemediaplugin.cpp:197
msgid "Mount Point"
msgstr "Pùnkt montowaniô"
-#: tdefile-plugin/tdefilemediaplugin.cpp:204
+#: tdefile-plugin/tdefilemediaplugin.cpp:198
msgid "Device Node"
msgstr "Ùrzãdzenié"
-#: tdefile-plugin/tdefilemediaplugin.cpp:206
+#: tdefile-plugin/tdefilemediaplugin.cpp:200
msgid "Medium Summary"
msgstr "Pòdrëchòwanié medium"
-#: tdefile-plugin/tdefilemediaplugin.cpp:208
+#: tdefile-plugin/tdefilemediaplugin.cpp:202
msgid "Usage"
msgstr "Zbrëkòwanié"
-#: tdefile-plugin/tdefilemediaplugin.cpp:210
+#: tdefile-plugin/tdefilemediaplugin.cpp:204
msgid "Bar Graph"
msgstr "Stołpkòwô dijagrama"
@@ -582,23 +596,30 @@ msgid ""
"devices are plugged in."
msgstr ""
-#: mediamanager/decryptdialog.ui:24 mounthelper/decryptdialog.ui:24
+#: mediamanager/unlockdialog.ui:24 mounthelper/unlockdialog.ui:24
#, no-c-format
msgid "Decrypting Storage Device"
msgstr ""
-#: mediamanager/decryptdialog.ui:109 mounthelper/decryptdialog.ui:109
+#: mediamanager/unlockdialog.ui:109
#, no-c-format
msgid ""
-"<p><b>%1</b> is an encrypted storage device.</p>\n"
-"<p>Please enter the password to decrypt the storage device.</p>"
+"<p><b>%1</b> is an encrypted locked storage device.</p>\n"
+"<p>Please enter the password to unlock the storage device.</p>"
msgstr ""
-#: mediamanager/decryptdialog.ui:131 mounthelper/decryptdialog.ui:131
+#: mediamanager/unlockdialog.ui:131 mounthelper/unlockdialog.ui:131
#, no-c-format
msgid "&Password:"
msgstr ""
+#: mounthelper/unlockdialog.ui:109
+#, no-c-format
+msgid ""
+"<p><b>%1</b> is an encrypted storage device.</p>\n"
+"<p>Please enter the password to decrypt the storage device.</p>"
+msgstr ""
+
#: propsdlgplugin/propertiespagegui.ui:16
#, no-c-format
msgid "PropertiesPageGUI"
@@ -867,3 +888,7 @@ msgstr "Miészóny"
#, no-c-format
msgid "Filesystem: iso9660"
msgstr "Systema lopków: iso9660"
+
+#, 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 35c72a730d0..4c1df296bd7 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: 2019-01-13 18:47+0100\n"
+"POT-Creation-Date: 2019-07-11 02:33+0200\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"
@@ -47,7 +47,6 @@ 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
-#: mounthelper/tdeio_media_mounthelper.cpp:256
msgid "The TDE mediamanager is not running."
msgstr ""
@@ -55,7 +54,7 @@ msgstr ""
msgid "This media name already exists."
msgstr ""
-#: mediaimpl.cpp:230 mediaimpl.cpp:293
+#: mediaimpl.cpp:230 mediaimpl.cpp:297
msgid "No such medium."
msgstr ""
@@ -63,321 +62,329 @@ msgstr ""
msgid "The drive is encrypted."
msgstr ""
-#: mediaimpl.cpp:272 mediamanager/halbackend.cpp:1264
-#: mediamanager/halbackend.cpp:1273 mediamanager/halbackend.cpp:1663
-#: mediamanager/halbackend.cpp:1680 mediamanager/halbackend.cpp:1691
-#: mediamanager/halbackend.cpp:1793 mediamanager/halbackend.cpp:1801
-#: mediamanager/halbackend.cpp:1808 mediamanager/halbackend.cpp:1848
-#: mediamanager/halbackend.cpp:1854 mediamanager/halbackend.cpp:1861
-#: mounthelper/tdeio_media_mounthelper.cpp:58
-msgid "Internal Error"
-msgstr "Gwall Mewnol"
+#: mediaimpl.cpp:274 mediamanager/tdehardwarebackend.cpp:201
+#: mediamanager/tdehardwarebackend.cpp:252
+#: mounthelper/tdeio_media_mounthelper.cpp:202
+msgid "Unknown mount error."
+msgstr ""
#: mediamanager/dialog.cpp:26 mounthelper/dialog.cpp:26
-msgid "Decrypt"
+msgid "Unlock"
msgstr ""
-#: mediamanager/fstabbackend.cpp:104 mediamanager/fstabbackend.cpp:114
-#: mediamanager/halbackend.cpp:1595 mediamanager/halbackend.cpp:1617
-#: mediamanager/halbackend.cpp:1776 mediamanager/halbackend.cpp:1831
-#: mediamanager/tdehardwarebackend.cpp:1349
-#: mediamanager/tdehardwarebackend.cpp:1360
+#: mediamanager/fstabbackend.cpp:105 mediamanager/fstabbackend.cpp:120
+#: mediamanager/halbackend.cpp:1598 mediamanager/halbackend.cpp:1625
+#: mediamanager/halbackend.cpp:1808 mediamanager/halbackend.cpp:1877
+#: mediamanager/mediamanager.cpp:363 mediamanager/mediamanager.cpp:375
+#: mediamanager/mediamanager.cpp:387 mediamanager/mediamanager.cpp:399
+#: mediamanager/tdehardwarebackend.cpp:1363
+#: mediamanager/tdehardwarebackend.cpp:1378
#, c-format
msgid "No such medium: %1"
msgstr ""
-#: mediamanager/fstabbackend.cpp:398
+#: mediamanager/fstabbackend.cpp:408
msgid "CD Recorder"
msgstr "Recordydd CD"
-#: mediamanager/fstabbackend.cpp:404
+#: mediamanager/fstabbackend.cpp:414
msgid "DVD"
msgstr "DVD"
-#: mediamanager/fstabbackend.cpp:415
+#: mediamanager/fstabbackend.cpp:425
msgid "CD-ROM"
msgstr "CDd-ROM"
-#: mediamanager/fstabbackend.cpp:428
+#: mediamanager/fstabbackend.cpp:438
msgid "Floppy"
msgstr "Llipa"
-#: mediamanager/fstabbackend.cpp:436
+#: mediamanager/fstabbackend.cpp:446
msgid "Zip Disk"
msgstr "Disg Zip"
-#: mediamanager/fstabbackend.cpp:447
+#: mediamanager/fstabbackend.cpp:457
msgid "Removable Device"
msgstr ""
-#: mediamanager/fstabbackend.cpp:452 mediamanager/fstabbackend.cpp:458
+#: mediamanager/fstabbackend.cpp:462 mediamanager/fstabbackend.cpp:468
msgid "Remote Share"
msgstr "Rhaniad Pell"
-#: mediamanager/fstabbackend.cpp:463
+#: mediamanager/fstabbackend.cpp:473
msgid "Hard Disk"
msgstr "Disg"
-#: mediamanager/halbackend.cpp:749 mediamanager/tdehardwarebackend.cpp:805
+#: mediamanager/halbackend.cpp:744 mediamanager/tdehardwarebackend.cpp:808
#, fuzzy
msgid "Unknown Drive"
msgstr "Anhysbys"
-#: mediamanager/halbackend.cpp:761 mediamanager/tdehardwarebackend.cpp:835
+#: mediamanager/halbackend.cpp:756 mediamanager/tdehardwarebackend.cpp:838
#, fuzzy
msgid "Floppy Drive"
msgstr "Llipa"
-#: mediamanager/halbackend.cpp:769
+#: mediamanager/halbackend.cpp:764
#, fuzzy
msgid "Zip Drive"
msgstr "Disg Zip"
-#: mediamanager/halbackend.cpp:839 mediamanager/tdehardwarebackend.cpp:892
+#: mediamanager/halbackend.cpp:834 mediamanager/tdehardwarebackend.cpp:895
msgid "Camera"
msgstr ""
-#: mediamanager/halbackend.cpp:1221 mediamanager/halbackend.cpp:1247
+#: mediamanager/halbackend.cpp:1216 mediamanager/halbackend.cpp:1242
msgid "Authenticate"
msgstr ""
-#: mediamanager/halbackend.cpp:1222
+#: mediamanager/halbackend.cpp:1217
msgid ""
"<big><b>System policy prevents mounting internal media</b></big><br/"
">Authentication is required to perform this action. Please enter your "
"password to verify."
msgstr ""
-#: mediamanager/halbackend.cpp:1248
+#: mediamanager/halbackend.cpp:1243
msgid ""
"<big><b>System policy prevents unmounting media mounted by other users</b></"
"big><br/>Authentication is required to perform this action. Please enter "
"your password to verify."
msgstr ""
-#: mediamanager/halbackend.cpp:1284
+#: mediamanager/halbackend.cpp:1259 mediamanager/halbackend.cpp:1268
+#: mediamanager/halbackend.cpp:1849 mediamanager/halbackend.cpp:1916
+#: mounthelper/tdeio_media_mounthelper.cpp:58
+msgid "Internal Error"
+msgstr "Gwall Mewnol"
+
+#: mediamanager/halbackend.cpp:1279
msgid "Invalid filesystem type"
msgstr ""
-#: mediamanager/halbackend.cpp:1286
+#: mediamanager/halbackend.cpp:1281
msgid ""
"Permission denied<p>Please ensure that:<br>1. You have permission to access "
"this device.<br>2. This device node is not listed in /etc/fstab.</p>"
msgstr ""
-#: mediamanager/halbackend.cpp:1290
+#: mediamanager/halbackend.cpp:1285
#, fuzzy
msgid "Device is already mounted."
msgstr "Dyfais heb ei osod"
-#: mediamanager/halbackend.cpp:1340
+#: mediamanager/halbackend.cpp:1335
msgid ""
"Moreover, programs still using the device have been detected. They are "
"listed below. You have to close them or change their working directory "
"before attempting to unmount the device again."
msgstr ""
-#: mediamanager/halbackend.cpp:1381 mediamanager/tdehardwarebackend.cpp:1588
+#: mediamanager/halbackend.cpp:1376 mediamanager/tdehardwarebackend.cpp:1618
msgid ""
"Programs that were still using the device have been forcibly terminated. "
"They are listed below."
msgstr ""
-#: mediamanager/halbackend.cpp:1402 mediamanager/halbackend.cpp:1715
-#: mediamanager/tdehardwarebackend.cpp:1406
-#: mediamanager/tdehardwarebackend.cpp:1424
-#: mediamanager/tdehardwarebackend.cpp:1464
+#: mediamanager/halbackend.cpp:1397 mediamanager/halbackend.cpp:1742
+#: mediamanager/tdehardwarebackend.cpp:1430
+#: mediamanager/tdehardwarebackend.cpp:1452
+#: mediamanager/tdehardwarebackend.cpp:1494
msgid ""
"Unfortunately, the device <b>%1</b> (%2) named <b>'%3'</b> and currently "
"mounted at <b>%4</b> could not be unmounted. "
msgstr ""
-#: mediamanager/halbackend.cpp:1408 mediamanager/tdehardwarebackend.cpp:1470
+#: mediamanager/halbackend.cpp:1403 mediamanager/tdehardwarebackend.cpp:1500
msgid "The following error was returned by umount command:"
msgstr ""
-#: mediamanager/halbackend.cpp:1478
-msgid "Permission denied"
+#: mediamanager/halbackend.cpp:1567 mediamanager/tdehardwarebackend.cpp:1322
+msgid "Cannot mount encrypted locked drives!"
msgstr ""
-#: mediamanager/halbackend.cpp:1562 mediamanager/tdehardwarebackend.cpp:1232
-msgid "Cannot mount encrypted drives!"
-msgstr ""
+#: mediamanager/halbackend.cpp:1682 mediamanager/halbackend.cpp:1703
+#: mediamanager/halbackend.cpp:1716 mediamanager/halbackend.cpp:1830
+#: mediamanager/halbackend.cpp:1840 mediamanager/halbackend.cpp:1899
+#: mediamanager/halbackend.cpp:1907
+#, fuzzy
+msgid "Internal error"
+msgstr "Gwall Mewnol"
-#: mediamanager/halbackend.cpp:1721
+#: mediamanager/halbackend.cpp:1694
+#, fuzzy
+#| msgid "Unknown"
+msgid "Unknown error"
+msgstr "Anhysbys"
+
+#: mediamanager/halbackend.cpp:1748
msgid "Unmounting failed due to the following error:"
msgstr ""
-#: mediamanager/halbackend.cpp:1723
+#: mediamanager/halbackend.cpp:1750
msgid "Device is Busy:"
msgstr ""
-#: mediamanager/halbackend.cpp:1727
+#: mediamanager/halbackend.cpp:1754
msgid ""
"Permission denied<p>Please ensure that:<br>1. You have permission to access "
"this device.<br>2. This device was originally mounted using TDE.</p>"
msgstr ""
-#: mediamanager/halbackend.cpp:1739
+#: mediamanager/halbackend.cpp:1766
msgid ""
"%1<p><b>Would you like to forcibly terminate these processes?</b><br><i>All "
"unsaved data would be lost</i>"
msgstr ""
-#: mediamanager/halbackend.cpp:1811
+#: mediamanager/halbackend.cpp:1852
msgid "Wrong password"
msgstr ""
-#: mediamanager/mediamanager.cpp:247 mediamanager/mediamanager.cpp:266
-#: mediamanager/mediamanager.cpp:285 mediamanager/mediamanager.cpp:293
-#: mediamanager/mediamanager.cpp:302 mediamanager/mediamanager.cpp:310
-msgid "Feature only available with HAL"
+#: mediamanager/mediamanager.cpp:248 mediamanager/mediamanager.cpp:275
+msgid "Feature only available with the TDE hardware backend"
msgstr ""
-#: mediamanager/mediamanager.cpp:252
-msgid "Feature only available with the TDE hardware backend"
+#: mediamanager/mediamanager.cpp:255 mediamanager/mediamanager.cpp:282
+#: mediamanager/mediamanager.cpp:312 mediamanager/mediamanager.cpp:343
+msgid "Feature only available with HAL"
msgstr ""
-#: mediamanager/mediamanager.cpp:256 mediamanager/mediamanager.cpp:271
-#: mediamanager/mediamanager.cpp:275
+#: mediamanager/mediamanager.cpp:262 mediamanager/mediamanager.cpp:289
+#: mediamanager/mediamanager.cpp:320 mediamanager/mediamanager.cpp:350
msgid "Feature only available with HAL or TDE hardware backend"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:480
-#: mediamanager/tdehardwarebackend.cpp:517
-#: mediamanager/tdehardwarebackend.cpp:750
+#: mediamanager/tdehardwarebackend.cpp:483
+#: mediamanager/tdehardwarebackend.cpp:520
+#: mediamanager/tdehardwarebackend.cpp:753
msgid "%1 Removable Device"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:525
+#: mediamanager/tdehardwarebackend.cpp:528
#, fuzzy
msgid "Blank CD-ROM"
msgstr "CDd-ROM"
-#: mediamanager/tdehardwarebackend.cpp:534
+#: mediamanager/tdehardwarebackend.cpp:537
msgid "Blank CD-R"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:543
+#: mediamanager/tdehardwarebackend.cpp:546
msgid "Blank CD-RW"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:552
+#: mediamanager/tdehardwarebackend.cpp:555
msgid "Blank Magneto-Optical CD"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:561
+#: mediamanager/tdehardwarebackend.cpp:564
msgid "Blank Mount Ranier CD-RW"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:570
+#: mediamanager/tdehardwarebackend.cpp:573
msgid "Blank Mount Ranier CD-RW-W"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:579
+#: mediamanager/tdehardwarebackend.cpp:582
msgid "Blank DVD-ROM"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:588
+#: mediamanager/tdehardwarebackend.cpp:591
msgid "Blank DVD-RAM"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:597
+#: mediamanager/tdehardwarebackend.cpp:600
msgid "Blank DVD-R"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:606
+#: mediamanager/tdehardwarebackend.cpp:609
msgid "Blank DVD-RW"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:615
+#: mediamanager/tdehardwarebackend.cpp:618
msgid "Blank Dual Layer DVD-R"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:624
+#: mediamanager/tdehardwarebackend.cpp:627
msgid "Blank Dual Layer DVD-RW"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:633
+#: mediamanager/tdehardwarebackend.cpp:636
msgid "Blank DVD+R"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:642
+#: mediamanager/tdehardwarebackend.cpp:645
msgid "Blank DVD+RW"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:651
+#: mediamanager/tdehardwarebackend.cpp:654
msgid "Blank Dual Layer DVD+R"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:660
+#: mediamanager/tdehardwarebackend.cpp:663
msgid "Blank Dual Layer DVD+RW"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:669
+#: mediamanager/tdehardwarebackend.cpp:672
msgid "Blank BD-ROM"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:678
+#: mediamanager/tdehardwarebackend.cpp:681
msgid "Blank BD-R"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:687
+#: mediamanager/tdehardwarebackend.cpp:690
msgid "Blank BD-RW"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:696
+#: mediamanager/tdehardwarebackend.cpp:699
msgid "Blank HDDVD-ROM"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:705
+#: mediamanager/tdehardwarebackend.cpp:708
msgid "Blank HDDVD-R"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:714
+#: mediamanager/tdehardwarebackend.cpp:717
msgid "Blank HDDVD-RW"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:721
+#: mediamanager/tdehardwarebackend.cpp:724
msgid "Audio CD"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:742
+#: mediamanager/tdehardwarebackend.cpp:745
msgid "%1 Fixed Disk (%2)"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:849
+#: mediamanager/tdehardwarebackend.cpp:852
#, fuzzy
msgid "%1 Zip Disk"
msgstr "Disg Zip"
-#: mediamanager/tdehardwarebackend.cpp:1212
-#: mediamanager/tdehardwarebackend.cpp:1392
-#, fuzzy
-msgid "Internal error"
-msgstr "Gwall Mewnol"
+#: mediamanager/tdehardwarebackend.cpp:1224
+#: mediamanager/tdehardwarebackend.cpp:1417
+msgid "Internal error. Couldn't find medium."
+msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:1239
-msgid ""
-"<qt>Unable to mount this device.<p>Potential reasons include:<br>Improper "
-"device and/or user privilege level<br>Corrupt data on storage device"
+#: mediamanager/tdehardwarebackend.cpp:1249
+#: mediamanager/tdehardwarebackend.cpp:1323
+msgid "Unable to mount this device."
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:1241
-#: mediamanager/tdehardwarebackend.cpp:1316
-#: mediamanager/tdehardwarebackend.cpp:1408
-#: mediamanager/tdehardwarebackend.cpp:1426
+#: mediamanager/tdehardwarebackend.cpp:1252
+#: mediamanager/tdehardwarebackend.cpp:1326
+#: mediamanager/tdehardwarebackend.cpp:1435
+#: mediamanager/tdehardwarebackend.cpp:1457
msgid "<p>Technical details:<br>"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:1314
-msgid ""
-"<qt>Unable to mount this device.<p>Potential reasons include:<br>Improper "
-"device and/or user privilege level<br>Corrupt data on storage "
-"device<br>Incorrect encryption password"
+#: mediamanager/tdehardwarebackend.cpp:1284
+msgid "Decryption aborted"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:1420
+#: mediamanager/tdehardwarebackend.cpp:1443
msgid ""
"<qt>The device <b>%1</b> (%2) named <b>'%3'</b> and currently mounted at <b>"
"%4</b> can not be unmounted at this time.<p>%5<p><b>Would you like to "
@@ -385,7 +392,7 @@ msgid ""
"lost</i>"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:1547
+#: mediamanager/tdehardwarebackend.cpp:1577
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 "
@@ -396,7 +403,7 @@ msgstr ""
msgid "%1 cannot be found."
msgstr ""
-#: mounthelper/tdeio_media_mounthelper.cpp:86
+#: mounthelper/tdeio_media_mounthelper.cpp:87
#, fuzzy
msgid "%1 is not a mountable media."
msgstr "%1%2 (heb ei osod)"
@@ -408,39 +415,49 @@ msgstr "%1%2 (heb ei osod)"
#: mounthelper/tdeio_media_mounthelper.cpp:107
#, fuzzy
-msgid "%1 is already decrypted."
+msgid "%1 is already unlocked."
msgstr "Dyfais heb ei osod"
-#: mounthelper/tdeio_media_mounthelper.cpp:228
+#: mounthelper/tdeio_media_mounthelper.cpp:139
+msgid "Unknown unmount error."
+msgstr ""
+
+#: mounthelper/tdeio_media_mounthelper.cpp:246
msgid "The device was successfully unmounted, but the tray could not be opened"
msgstr ""
-#: mounthelper/tdeio_media_mounthelper.cpp:230
+#: mounthelper/tdeio_media_mounthelper.cpp:248
msgid "The device was successfully unmounted, but could not be ejected"
msgstr ""
-#: mounthelper/tdeio_media_mounthelper.cpp:275
+#: mounthelper/tdeio_media_mounthelper.cpp:281
+#, fuzzy
+#| msgid "Unknown device %1"
+msgid "Unknown decrypt error."
+msgstr "Dyfais anhysbys %1"
+
+#: mounthelper/tdeio_media_mounthelper.cpp:295
#, fuzzy
msgid "Decrypt given URL"
msgstr "Datosod yr URL a roddwyd"
-#: mounthelper/tdeio_media_mounthelper.cpp:276
+#: mounthelper/tdeio_media_mounthelper.cpp:296
msgid "Unmount given URL"
msgstr "Datosod yr URL a roddwyd"
-#: mounthelper/tdeio_media_mounthelper.cpp:277
+#: mounthelper/tdeio_media_mounthelper.cpp:297
msgid "Mount given URL (default)"
msgstr "Gosod yr URL a roddwyd (rhagosod)"
-#: mounthelper/tdeio_media_mounthelper.cpp:278
+#: 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:279
+#: mounthelper/tdeio_media_mounthelper.cpp:299
msgid "Unmount and Eject given URL (necessary for some USB devices)"
msgstr ""
-#: mounthelper/tdeio_media_mounthelper.cpp:280
+#: mounthelper/tdeio_media_mounthelper.cpp:300
#, fuzzy
msgid "media:/ URL to mount/unmount/eject/remove"
msgstr "dyfeisiau:/ URL i'w osod/ddatosod/allfwrw."
@@ -462,45 +479,45 @@ msgstr ""
msgid "&Mounting"
msgstr "&Gosod"
-#: tdefile-plugin/tdefilemediaplugin.cpp:190
+#: tdefile-plugin/tdefilemediaplugin.cpp:184
#, fuzzy
msgid "Medium Information"
msgstr "Gwybodaeth am y Ddyfais"
-#: tdefile-plugin/tdefilemediaplugin.cpp:193
+#: tdefile-plugin/tdefilemediaplugin.cpp:187
msgid "Free"
msgstr "Rhydd"
-#: tdefile-plugin/tdefilemediaplugin.cpp:196
+#: tdefile-plugin/tdefilemediaplugin.cpp:190
msgid "Used"
msgstr "Defnyddiwyd"
-#: tdefile-plugin/tdefilemediaplugin.cpp:199
+#: tdefile-plugin/tdefilemediaplugin.cpp:193
msgid "Total"
msgstr "Cyfanswm"
-#: tdefile-plugin/tdefilemediaplugin.cpp:202
+#: tdefile-plugin/tdefilemediaplugin.cpp:196
msgid "Base URL"
msgstr "URL Sylfaenol"
-#: tdefile-plugin/tdefilemediaplugin.cpp:203
+#: tdefile-plugin/tdefilemediaplugin.cpp:197
msgid "Mount Point"
msgstr "Man Clymu"
-#: tdefile-plugin/tdefilemediaplugin.cpp:204
+#: tdefile-plugin/tdefilemediaplugin.cpp:198
#, fuzzy
msgid "Device Node"
msgstr "Dyfeisiau"
-#: tdefile-plugin/tdefilemediaplugin.cpp:206
+#: tdefile-plugin/tdefilemediaplugin.cpp:200
msgid "Medium Summary"
msgstr ""
-#: tdefile-plugin/tdefilemediaplugin.cpp:208
+#: tdefile-plugin/tdefilemediaplugin.cpp:202
msgid "Usage"
msgstr ""
-#: tdefile-plugin/tdefilemediaplugin.cpp:210
+#: tdefile-plugin/tdefilemediaplugin.cpp:204
msgid "Bar Graph"
msgstr ""
@@ -572,23 +589,30 @@ msgid ""
"devices are plugged in."
msgstr ""
-#: mediamanager/decryptdialog.ui:24 mounthelper/decryptdialog.ui:24
+#: mediamanager/unlockdialog.ui:24 mounthelper/unlockdialog.ui:24
#, no-c-format
msgid "Decrypting Storage Device"
msgstr ""
-#: mediamanager/decryptdialog.ui:109 mounthelper/decryptdialog.ui:109
+#: mediamanager/unlockdialog.ui:109
#, no-c-format
msgid ""
-"<p><b>%1</b> is an encrypted storage device.</p>\n"
-"<p>Please enter the password to decrypt the storage device.</p>"
+"<p><b>%1</b> is an encrypted locked storage device.</p>\n"
+"<p>Please enter the password to unlock the storage device.</p>"
msgstr ""
-#: mediamanager/decryptdialog.ui:131 mounthelper/decryptdialog.ui:131
+#: mediamanager/unlockdialog.ui:131 mounthelper/unlockdialog.ui:131
#, no-c-format
msgid "&Password:"
msgstr ""
+#: mounthelper/unlockdialog.ui:109
+#, no-c-format
+msgid ""
+"<p><b>%1</b> is an encrypted storage device.</p>\n"
+"<p>Please enter the password to decrypt the storage device.</p>"
+msgstr ""
+
#: propsdlgplugin/propertiespagegui.ui:16
#, no-c-format
msgid "PropertiesPageGUI"
@@ -821,9 +845,6 @@ msgstr ""
#~ "\n"
#~ "Gwiriwch bod y ddisg wedi'i mewnosod yn gywir os gwelwch yn dda."
-#~ msgid "Unknown device %1"
-#~ msgstr "Dyfais anhysbys %1"
-
#~ msgid "Device not accessible"
#~ msgstr "Dyfais yn anghyrchadwy"
diff --git a/tde-i18n-da/messages/tdebase/tdeio_media.po b/tde-i18n-da/messages/tdebase/tdeio_media.po
index 439bd670948..6cefa51bfd2 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: 2019-01-13 18:47+0100\n"
+"POT-Creation-Date: 2019-07-11 02:33+0200\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"
@@ -49,7 +49,6 @@ 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
-#: mounthelper/tdeio_media_mounthelper.cpp:256
msgid "The TDE mediamanager is not running."
msgstr "TDE's mediehåndtering kører ikke."
@@ -57,7 +56,7 @@ msgstr "TDE's mediehåndtering kører ikke."
msgid "This media name already exists."
msgstr "Dette medienavn findes allerede."
-#: mediaimpl.cpp:230 mediaimpl.cpp:293
+#: mediaimpl.cpp:230 mediaimpl.cpp:297
msgid "No such medium."
msgstr "Medie findes ikke."
@@ -65,110 +64,114 @@ msgstr "Medie findes ikke."
msgid "The drive is encrypted."
msgstr ""
-#: mediaimpl.cpp:272 mediamanager/halbackend.cpp:1264
-#: mediamanager/halbackend.cpp:1273 mediamanager/halbackend.cpp:1663
-#: mediamanager/halbackend.cpp:1680 mediamanager/halbackend.cpp:1691
-#: mediamanager/halbackend.cpp:1793 mediamanager/halbackend.cpp:1801
-#: mediamanager/halbackend.cpp:1808 mediamanager/halbackend.cpp:1848
-#: mediamanager/halbackend.cpp:1854 mediamanager/halbackend.cpp:1861
-#: mounthelper/tdeio_media_mounthelper.cpp:58
-msgid "Internal Error"
-msgstr "Intern fejl"
+#: mediaimpl.cpp:274 mediamanager/tdehardwarebackend.cpp:201
+#: mediamanager/tdehardwarebackend.cpp:252
+#: mounthelper/tdeio_media_mounthelper.cpp:202
+msgid "Unknown mount error."
+msgstr ""
#: mediamanager/dialog.cpp:26 mounthelper/dialog.cpp:26
-msgid "Decrypt"
+msgid "Unlock"
msgstr ""
-#: mediamanager/fstabbackend.cpp:104 mediamanager/fstabbackend.cpp:114
-#: mediamanager/halbackend.cpp:1595 mediamanager/halbackend.cpp:1617
-#: mediamanager/halbackend.cpp:1776 mediamanager/halbackend.cpp:1831
-#: mediamanager/tdehardwarebackend.cpp:1349
-#: mediamanager/tdehardwarebackend.cpp:1360
+#: mediamanager/fstabbackend.cpp:105 mediamanager/fstabbackend.cpp:120
+#: mediamanager/halbackend.cpp:1598 mediamanager/halbackend.cpp:1625
+#: mediamanager/halbackend.cpp:1808 mediamanager/halbackend.cpp:1877
+#: mediamanager/mediamanager.cpp:363 mediamanager/mediamanager.cpp:375
+#: mediamanager/mediamanager.cpp:387 mediamanager/mediamanager.cpp:399
+#: mediamanager/tdehardwarebackend.cpp:1363
+#: mediamanager/tdehardwarebackend.cpp:1378
#, c-format
msgid "No such medium: %1"
msgstr "Medie findes ikke: %1"
-#: mediamanager/fstabbackend.cpp:398
+#: mediamanager/fstabbackend.cpp:408
msgid "CD Recorder"
msgstr "Cd-optager"
-#: mediamanager/fstabbackend.cpp:404
+#: mediamanager/fstabbackend.cpp:414
msgid "DVD"
msgstr "dvd"
-#: mediamanager/fstabbackend.cpp:415
+#: mediamanager/fstabbackend.cpp:425
msgid "CD-ROM"
msgstr "CD-ROM"
-#: mediamanager/fstabbackend.cpp:428
+#: mediamanager/fstabbackend.cpp:438
msgid "Floppy"
msgstr "Floppy"
-#: mediamanager/fstabbackend.cpp:436
+#: mediamanager/fstabbackend.cpp:446
msgid "Zip Disk"
msgstr "Zip-disk"
-#: mediamanager/fstabbackend.cpp:447
+#: mediamanager/fstabbackend.cpp:457
msgid "Removable Device"
msgstr "Enhed der kan fjernes"
-#: mediamanager/fstabbackend.cpp:452 mediamanager/fstabbackend.cpp:458
+#: mediamanager/fstabbackend.cpp:462 mediamanager/fstabbackend.cpp:468
msgid "Remote Share"
msgstr " Ekstern share"
-#: mediamanager/fstabbackend.cpp:463
+#: mediamanager/fstabbackend.cpp:473
msgid "Hard Disk"
msgstr "Harddisk"
-#: mediamanager/halbackend.cpp:749 mediamanager/tdehardwarebackend.cpp:805
+#: mediamanager/halbackend.cpp:744 mediamanager/tdehardwarebackend.cpp:808
msgid "Unknown Drive"
msgstr "Ukendt drev"
-#: mediamanager/halbackend.cpp:761 mediamanager/tdehardwarebackend.cpp:835
+#: mediamanager/halbackend.cpp:756 mediamanager/tdehardwarebackend.cpp:838
msgid "Floppy Drive"
msgstr "Diskettedrev"
-#: mediamanager/halbackend.cpp:769
+#: mediamanager/halbackend.cpp:764
msgid "Zip Drive"
msgstr "Zip-disk"
-#: mediamanager/halbackend.cpp:839 mediamanager/tdehardwarebackend.cpp:892
+#: mediamanager/halbackend.cpp:834 mediamanager/tdehardwarebackend.cpp:895
msgid "Camera"
msgstr "Kamera"
-#: mediamanager/halbackend.cpp:1221 mediamanager/halbackend.cpp:1247
+#: mediamanager/halbackend.cpp:1216 mediamanager/halbackend.cpp:1242
msgid "Authenticate"
msgstr ""
-#: mediamanager/halbackend.cpp:1222
+#: mediamanager/halbackend.cpp:1217
msgid ""
"<big><b>System policy prevents mounting internal media</b></big><br/"
">Authentication is required to perform this action. Please enter your "
"password to verify."
msgstr ""
-#: mediamanager/halbackend.cpp:1248
+#: mediamanager/halbackend.cpp:1243
msgid ""
"<big><b>System policy prevents unmounting media mounted by other users</b></"
"big><br/>Authentication is required to perform this action. Please enter "
"your password to verify."
msgstr ""
-#: mediamanager/halbackend.cpp:1284
+#: mediamanager/halbackend.cpp:1259 mediamanager/halbackend.cpp:1268
+#: mediamanager/halbackend.cpp:1849 mediamanager/halbackend.cpp:1916
+#: mounthelper/tdeio_media_mounthelper.cpp:58
+msgid "Internal Error"
+msgstr "Intern fejl"
+
+#: mediamanager/halbackend.cpp:1279
msgid "Invalid filesystem type"
msgstr "Ugyldig filsystemtype"
-#: mediamanager/halbackend.cpp:1286
+#: mediamanager/halbackend.cpp:1281
msgid ""
"Permission denied<p>Please ensure that:<br>1. You have permission to access "
"this device.<br>2. This device node is not listed in /etc/fstab.</p>"
msgstr ""
-#: mediamanager/halbackend.cpp:1290
+#: mediamanager/halbackend.cpp:1285
msgid "Device is already mounted."
msgstr "Enheden er allerede monteret."
-#: mediamanager/halbackend.cpp:1340
+#: mediamanager/halbackend.cpp:1335
msgid ""
"Moreover, programs still using the device have been detected. They are "
"listed below. You have to close them or change their working directory "
@@ -178,16 +181,16 @@ msgstr ""
"nedenfor. Du skal lukke dem eller ændre deres arbejdsmappe inden du forsøger "
"at afmontere enheden igen."
-#: mediamanager/halbackend.cpp:1381 mediamanager/tdehardwarebackend.cpp:1588
+#: mediamanager/halbackend.cpp:1376 mediamanager/tdehardwarebackend.cpp:1618
msgid ""
"Programs that were still using the device have been forcibly terminated. "
"They are listed below."
msgstr ""
-#: mediamanager/halbackend.cpp:1402 mediamanager/halbackend.cpp:1715
-#: mediamanager/tdehardwarebackend.cpp:1406
-#: mediamanager/tdehardwarebackend.cpp:1424
-#: mediamanager/tdehardwarebackend.cpp:1464
+#: mediamanager/halbackend.cpp:1397 mediamanager/halbackend.cpp:1742
+#: mediamanager/tdehardwarebackend.cpp:1430
+#: mediamanager/tdehardwarebackend.cpp:1452
+#: mediamanager/tdehardwarebackend.cpp:1494
msgid ""
"Unfortunately, the device <b>%1</b> (%2) named <b>'%3'</b> and currently "
"mounted at <b>%4</b> could not be unmounted. "
@@ -195,196 +198,199 @@ 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:1408 mediamanager/tdehardwarebackend.cpp:1470
+#: mediamanager/halbackend.cpp:1403 mediamanager/tdehardwarebackend.cpp:1500
msgid "The following error was returned by umount command:"
msgstr "Følgende fejl returneredes af afmonteringskommandoen:"
-#: mediamanager/halbackend.cpp:1478
+#: mediamanager/halbackend.cpp:1567 mediamanager/tdehardwarebackend.cpp:1322
+msgid "Cannot mount encrypted locked drives!"
+msgstr ""
+
+#: mediamanager/halbackend.cpp:1682 mediamanager/halbackend.cpp:1703
+#: mediamanager/halbackend.cpp:1716 mediamanager/halbackend.cpp:1830
+#: mediamanager/halbackend.cpp:1840 mediamanager/halbackend.cpp:1899
+#: mediamanager/halbackend.cpp:1907
#, fuzzy
-msgid "Permission denied"
-msgstr "Rettigheder nægtet"
+msgid "Internal error"
+msgstr "Intern fejl"
-#: mediamanager/halbackend.cpp:1562 mediamanager/tdehardwarebackend.cpp:1232
-msgid "Cannot mount encrypted drives!"
-msgstr ""
+#: mediamanager/halbackend.cpp:1694
+#, fuzzy
+#| msgid "Unknown"
+msgid "Unknown error"
+msgstr "Ukendt"
-#: mediamanager/halbackend.cpp:1721
+#: mediamanager/halbackend.cpp:1748
msgid "Unmounting failed due to the following error:"
msgstr "Afmontering mislykkedes på grund af følgende fejl:"
-#: mediamanager/halbackend.cpp:1723
+#: mediamanager/halbackend.cpp:1750
msgid "Device is Busy:"
msgstr "Enheden er optaget:"
-#: mediamanager/halbackend.cpp:1727
+#: mediamanager/halbackend.cpp:1754
msgid ""
"Permission denied<p>Please ensure that:<br>1. You have permission to access "
"this device.<br>2. This device was originally mounted using TDE.</p>"
msgstr ""
-#: mediamanager/halbackend.cpp:1739
+#: mediamanager/halbackend.cpp:1766
msgid ""
"%1<p><b>Would you like to forcibly terminate these processes?</b><br><i>All "
"unsaved data would be lost</i>"
msgstr ""
-#: mediamanager/halbackend.cpp:1811
+#: mediamanager/halbackend.cpp:1852
msgid "Wrong password"
msgstr ""
-#: mediamanager/mediamanager.cpp:247 mediamanager/mediamanager.cpp:266
-#: mediamanager/mediamanager.cpp:285 mediamanager/mediamanager.cpp:293
-#: mediamanager/mediamanager.cpp:302 mediamanager/mediamanager.cpp:310
-msgid "Feature only available with HAL"
-msgstr "Funktion kun tilgængelig med HAL"
-
-#: mediamanager/mediamanager.cpp:252
+#: mediamanager/mediamanager.cpp:248 mediamanager/mediamanager.cpp:275
#, fuzzy
msgid "Feature only available with the TDE hardware backend"
msgstr "Funktion kun tilgængelig med HAL"
-#: mediamanager/mediamanager.cpp:256 mediamanager/mediamanager.cpp:271
-#: mediamanager/mediamanager.cpp:275
+#: mediamanager/mediamanager.cpp:255 mediamanager/mediamanager.cpp:282
+#: mediamanager/mediamanager.cpp:312 mediamanager/mediamanager.cpp:343
+msgid "Feature only available with HAL"
+msgstr "Funktion kun tilgængelig med HAL"
+
+#: mediamanager/mediamanager.cpp:262 mediamanager/mediamanager.cpp:289
+#: mediamanager/mediamanager.cpp:320 mediamanager/mediamanager.cpp:350
#, fuzzy
msgid "Feature only available with HAL or TDE hardware backend"
msgstr "Funktion kun tilgængelig med HAL"
-#: mediamanager/tdehardwarebackend.cpp:480
-#: mediamanager/tdehardwarebackend.cpp:517
-#: mediamanager/tdehardwarebackend.cpp:750
+#: mediamanager/tdehardwarebackend.cpp:483
+#: mediamanager/tdehardwarebackend.cpp:520
+#: mediamanager/tdehardwarebackend.cpp:753
#, fuzzy
msgid "%1 Removable Device"
msgstr "Enhed der kan fjernes"
-#: mediamanager/tdehardwarebackend.cpp:525
+#: mediamanager/tdehardwarebackend.cpp:528
#, fuzzy
msgid "Blank CD-ROM"
msgstr "CD-ROM"
-#: mediamanager/tdehardwarebackend.cpp:534
+#: mediamanager/tdehardwarebackend.cpp:537
msgid "Blank CD-R"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:543
+#: mediamanager/tdehardwarebackend.cpp:546
msgid "Blank CD-RW"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:552
+#: mediamanager/tdehardwarebackend.cpp:555
msgid "Blank Magneto-Optical CD"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:561
+#: mediamanager/tdehardwarebackend.cpp:564
msgid "Blank Mount Ranier CD-RW"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:570
+#: mediamanager/tdehardwarebackend.cpp:573
msgid "Blank Mount Ranier CD-RW-W"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:579
+#: mediamanager/tdehardwarebackend.cpp:582
msgid "Blank DVD-ROM"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:588
+#: mediamanager/tdehardwarebackend.cpp:591
msgid "Blank DVD-RAM"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:597
+#: mediamanager/tdehardwarebackend.cpp:600
msgid "Blank DVD-R"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:606
+#: mediamanager/tdehardwarebackend.cpp:609
msgid "Blank DVD-RW"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:615
+#: mediamanager/tdehardwarebackend.cpp:618
msgid "Blank Dual Layer DVD-R"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:624
+#: mediamanager/tdehardwarebackend.cpp:627
msgid "Blank Dual Layer DVD-RW"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:633
+#: mediamanager/tdehardwarebackend.cpp:636
msgid "Blank DVD+R"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:642
+#: mediamanager/tdehardwarebackend.cpp:645
msgid "Blank DVD+RW"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:651
+#: mediamanager/tdehardwarebackend.cpp:654
msgid "Blank Dual Layer DVD+R"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:660
+#: mediamanager/tdehardwarebackend.cpp:663
msgid "Blank Dual Layer DVD+RW"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:669
+#: mediamanager/tdehardwarebackend.cpp:672
msgid "Blank BD-ROM"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:678
+#: mediamanager/tdehardwarebackend.cpp:681
msgid "Blank BD-R"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:687
+#: mediamanager/tdehardwarebackend.cpp:690
msgid "Blank BD-RW"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:696
+#: mediamanager/tdehardwarebackend.cpp:699
msgid "Blank HDDVD-ROM"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:705
+#: mediamanager/tdehardwarebackend.cpp:708
msgid "Blank HDDVD-R"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:714
+#: mediamanager/tdehardwarebackend.cpp:717
msgid "Blank HDDVD-RW"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:721
+#: mediamanager/tdehardwarebackend.cpp:724
msgid "Audio CD"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:742
+#: mediamanager/tdehardwarebackend.cpp:745
msgid "%1 Fixed Disk (%2)"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:849
+#: mediamanager/tdehardwarebackend.cpp:852
#, fuzzy
msgid "%1 Zip Disk"
msgstr "Zip-disk"
-#: mediamanager/tdehardwarebackend.cpp:1212
-#: mediamanager/tdehardwarebackend.cpp:1392
-#, fuzzy
-msgid "Internal error"
-msgstr "Intern fejl"
+#: mediamanager/tdehardwarebackend.cpp:1224
+#: mediamanager/tdehardwarebackend.cpp:1417
+msgid "Internal error. Couldn't find medium."
+msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:1239
-msgid ""
-"<qt>Unable to mount this device.<p>Potential reasons include:<br>Improper "
-"device and/or user privilege level<br>Corrupt data on storage device"
+#: mediamanager/tdehardwarebackend.cpp:1249
+#: mediamanager/tdehardwarebackend.cpp:1323
+msgid "Unable to mount this device."
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:1241
-#: mediamanager/tdehardwarebackend.cpp:1316
-#: mediamanager/tdehardwarebackend.cpp:1408
-#: mediamanager/tdehardwarebackend.cpp:1426
+#: mediamanager/tdehardwarebackend.cpp:1252
+#: mediamanager/tdehardwarebackend.cpp:1326
+#: mediamanager/tdehardwarebackend.cpp:1435
+#: mediamanager/tdehardwarebackend.cpp:1457
msgid "<p>Technical details:<br>"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:1314
-msgid ""
-"<qt>Unable to mount this device.<p>Potential reasons include:<br>Improper "
-"device and/or user privilege level<br>Corrupt data on storage "
-"device<br>Incorrect encryption password"
+#: mediamanager/tdehardwarebackend.cpp:1284
+msgid "Decryption aborted"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:1420
+#: mediamanager/tdehardwarebackend.cpp:1443
msgid ""
"<qt>The device <b>%1</b> (%2) named <b>'%3'</b> and currently mounted at <b>"
"%4</b> can not be unmounted at this time.<p>%5<p><b>Would you like to "
@@ -392,7 +398,7 @@ msgid ""
"lost</i>"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:1547
+#: mediamanager/tdehardwarebackend.cpp:1577
#, fuzzy
msgid ""
"Programs still using the device have been detected. They are listed below. "
@@ -407,7 +413,7 @@ msgstr ""
msgid "%1 cannot be found."
msgstr "%1 kan ikke findes."
-#: mounthelper/tdeio_media_mounthelper.cpp:86
+#: mounthelper/tdeio_media_mounthelper.cpp:87
msgid "%1 is not a mountable media."
msgstr "%1 er ikke et monterbart medie."
@@ -418,39 +424,47 @@ msgstr "%1 er ikke et monterbart medie."
#: mounthelper/tdeio_media_mounthelper.cpp:107
#, fuzzy
-msgid "%1 is already decrypted."
+msgid "%1 is already unlocked."
msgstr "Enheden er allerede monteret."
-#: mounthelper/tdeio_media_mounthelper.cpp:228
+#: mounthelper/tdeio_media_mounthelper.cpp:139
+msgid "Unknown unmount error."
+msgstr ""
+
+#: mounthelper/tdeio_media_mounthelper.cpp:246
msgid "The device was successfully unmounted, but the tray could not be opened"
msgstr "Enheden blev afmonteret med godt resultat, men den kunne ikke åbnes"
-#: mounthelper/tdeio_media_mounthelper.cpp:230
+#: 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:275
+#: mounthelper/tdeio_media_mounthelper.cpp:281
+msgid "Unknown decrypt error."
+msgstr ""
+
+#: mounthelper/tdeio_media_mounthelper.cpp:295
#, fuzzy
msgid "Decrypt given URL"
msgstr "Afmontér givne URL"
-#: mounthelper/tdeio_media_mounthelper.cpp:276
+#: mounthelper/tdeio_media_mounthelper.cpp:296
msgid "Unmount given URL"
msgstr "Afmontér givne URL"
-#: mounthelper/tdeio_media_mounthelper.cpp:277
+#: mounthelper/tdeio_media_mounthelper.cpp:297
msgid "Mount given URL (default)"
msgstr "Montér givne URL (standard)"
-#: mounthelper/tdeio_media_mounthelper.cpp:278
+#: mounthelper/tdeio_media_mounthelper.cpp:298
msgid "Eject given URL via tdeeject"
msgstr "Skub givne URL ud via tdeeject"
-#: mounthelper/tdeio_media_mounthelper.cpp:279
+#: mounthelper/tdeio_media_mounthelper.cpp:299
msgid "Unmount and Eject given URL (necessary for some USB devices)"
msgstr "Afmontér og skub given URL ud (nødvendig for visse USB-enheder)"
-#: mounthelper/tdeio_media_mounthelper.cpp:280
+#: mounthelper/tdeio_media_mounthelper.cpp:300
msgid "media:/ URL to mount/unmount/eject/remove"
msgstr "media:/ URL at montere/afmontere/skubbe ud/fjerne"
@@ -471,43 +485,43 @@ msgstr "Mislykkedes at gemme ændringer"
msgid "&Mounting"
msgstr "&Monterer"
-#: tdefile-plugin/tdefilemediaplugin.cpp:190
+#: tdefile-plugin/tdefilemediaplugin.cpp:184
msgid "Medium Information"
msgstr "Medie-Information"
-#: tdefile-plugin/tdefilemediaplugin.cpp:193
+#: tdefile-plugin/tdefilemediaplugin.cpp:187
msgid "Free"
msgstr "Ledig"
-#: tdefile-plugin/tdefilemediaplugin.cpp:196
+#: tdefile-plugin/tdefilemediaplugin.cpp:190
msgid "Used"
msgstr "Brugt"
-#: tdefile-plugin/tdefilemediaplugin.cpp:199
+#: tdefile-plugin/tdefilemediaplugin.cpp:193
msgid "Total"
msgstr "I alt"
-#: tdefile-plugin/tdefilemediaplugin.cpp:202
+#: tdefile-plugin/tdefilemediaplugin.cpp:196
msgid "Base URL"
msgstr "Basis-URL"
-#: tdefile-plugin/tdefilemediaplugin.cpp:203
+#: tdefile-plugin/tdefilemediaplugin.cpp:197
msgid "Mount Point"
msgstr "Monteringspunkt"
-#: tdefile-plugin/tdefilemediaplugin.cpp:204
+#: tdefile-plugin/tdefilemediaplugin.cpp:198
msgid "Device Node"
msgstr "Enhedsknude"
-#: tdefile-plugin/tdefilemediaplugin.cpp:206
+#: tdefile-plugin/tdefilemediaplugin.cpp:200
msgid "Medium Summary"
msgstr "Medie-sammendrag"
-#: tdefile-plugin/tdefilemediaplugin.cpp:208
+#: tdefile-plugin/tdefilemediaplugin.cpp:202
msgid "Usage"
msgstr "Brug"
-#: tdefile-plugin/tdefilemediaplugin.cpp:210
+#: tdefile-plugin/tdefilemediaplugin.cpp:204
msgid "Bar Graph"
msgstr "Bjælkegraf"
@@ -579,23 +593,30 @@ msgid ""
"devices are plugged in."
msgstr ""
-#: mediamanager/decryptdialog.ui:24 mounthelper/decryptdialog.ui:24
+#: mediamanager/unlockdialog.ui:24 mounthelper/unlockdialog.ui:24
#, no-c-format
msgid "Decrypting Storage Device"
msgstr ""
-#: mediamanager/decryptdialog.ui:109 mounthelper/decryptdialog.ui:109
+#: mediamanager/unlockdialog.ui:109
#, no-c-format
msgid ""
-"<p><b>%1</b> is an encrypted storage device.</p>\n"
-"<p>Please enter the password to decrypt the storage device.</p>"
+"<p><b>%1</b> is an encrypted locked storage device.</p>\n"
+"<p>Please enter the password to unlock the storage device.</p>"
msgstr ""
-#: mediamanager/decryptdialog.ui:131 mounthelper/decryptdialog.ui:131
+#: mediamanager/unlockdialog.ui:131 mounthelper/unlockdialog.ui:131
#, no-c-format
msgid "&Password:"
msgstr ""
+#: mounthelper/unlockdialog.ui:109
+#, no-c-format
+msgid ""
+"<p><b>%1</b> is an encrypted storage device.</p>\n"
+"<p>Please enter the password to decrypt the storage device.</p>"
+msgstr ""
+
#: propsdlgplugin/propertiespagegui.ui:16
#, no-c-format
msgid "PropertiesPageGUI"
@@ -856,3 +877,7 @@ msgstr "Blandet"
#, no-c-format
msgid "Filesystem: iso9660"
msgstr "Filsystem: ISO-9660"
+
+#, 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 137b280bf1a..15e369abc9f 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: 2019-01-13 18:47+0100\n"
+"POT-Creation-Date: 2019-07-11 02:33+0200\n"
"PO-Revision-Date: 2019-07-08 15:40+0000\n"
"Last-Translator: Chris <xchrisx@uber.space>\n"
"Language-Team: German <https://mirror.git.trinitydesktop.org/weblate/"
@@ -48,7 +48,6 @@ 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
-#: mounthelper/tdeio_media_mounthelper.cpp:256
msgid "The TDE mediamanager is not running."
msgstr "Die Medienverwaltung von TDE wurde nicht gestartet."
@@ -56,7 +55,7 @@ msgstr "Die Medienverwaltung von TDE wurde nicht gestartet."
msgid "This media name already exists."
msgstr "Ein Medium mit diesem Namen existiert bereits."
-#: mediaimpl.cpp:230 mediaimpl.cpp:293
+#: mediaimpl.cpp:230 mediaimpl.cpp:297
msgid "No such medium."
msgstr "Kein solches Medium."
@@ -64,92 +63,90 @@ msgstr "Kein solches Medium."
msgid "The drive is encrypted."
msgstr "Das Laufwerk ist verschlüsselt."
-#: mediaimpl.cpp:272 mediamanager/halbackend.cpp:1264
-#: mediamanager/halbackend.cpp:1273 mediamanager/halbackend.cpp:1663
-#: mediamanager/halbackend.cpp:1680 mediamanager/halbackend.cpp:1691
-#: mediamanager/halbackend.cpp:1793 mediamanager/halbackend.cpp:1801
-#: mediamanager/halbackend.cpp:1808 mediamanager/halbackend.cpp:1848
-#: mediamanager/halbackend.cpp:1854 mediamanager/halbackend.cpp:1861
-#: mounthelper/tdeio_media_mounthelper.cpp:58
-msgid "Internal Error"
-msgstr "Interner Fehler"
+#: mediaimpl.cpp:274 mediamanager/tdehardwarebackend.cpp:201
+#: mediamanager/tdehardwarebackend.cpp:252
+#: mounthelper/tdeio_media_mounthelper.cpp:202
+msgid "Unknown mount error."
+msgstr ""
#: mediamanager/dialog.cpp:26 mounthelper/dialog.cpp:26
-msgid "Decrypt"
-msgstr "Entschlüsseln"
-
-#: mediamanager/fstabbackend.cpp:104 mediamanager/fstabbackend.cpp:114
-#: mediamanager/halbackend.cpp:1595 mediamanager/halbackend.cpp:1617
-#: mediamanager/halbackend.cpp:1776 mediamanager/halbackend.cpp:1831
-#: mediamanager/tdehardwarebackend.cpp:1349
-#: mediamanager/tdehardwarebackend.cpp:1360
+msgid "Unlock"
+msgstr ""
+
+#: mediamanager/fstabbackend.cpp:105 mediamanager/fstabbackend.cpp:120
+#: mediamanager/halbackend.cpp:1598 mediamanager/halbackend.cpp:1625
+#: mediamanager/halbackend.cpp:1808 mediamanager/halbackend.cpp:1877
+#: mediamanager/mediamanager.cpp:363 mediamanager/mediamanager.cpp:375
+#: mediamanager/mediamanager.cpp:387 mediamanager/mediamanager.cpp:399
+#: mediamanager/tdehardwarebackend.cpp:1363
+#: mediamanager/tdehardwarebackend.cpp:1378
#, c-format
msgid "No such medium: %1"
msgstr "Kein solches Medium: %1"
-#: mediamanager/fstabbackend.cpp:398
+#: mediamanager/fstabbackend.cpp:408
msgid "CD Recorder"
msgstr "CD-Rekorder"
-#: mediamanager/fstabbackend.cpp:404
+#: mediamanager/fstabbackend.cpp:414
msgid "DVD"
msgstr "DVD"
-#: mediamanager/fstabbackend.cpp:415
+#: mediamanager/fstabbackend.cpp:425
msgid "CD-ROM"
msgstr "CD-ROM"
-#: mediamanager/fstabbackend.cpp:428
+#: mediamanager/fstabbackend.cpp:438
msgid "Floppy"
msgstr "Diskette"
-#: mediamanager/fstabbackend.cpp:436
+#: mediamanager/fstabbackend.cpp:446
msgid "Zip Disk"
msgstr "Zip-Diskette"
-#: mediamanager/fstabbackend.cpp:447
+#: mediamanager/fstabbackend.cpp:457
msgid "Removable Device"
msgstr "Wechselplatte"
-#: mediamanager/fstabbackend.cpp:452 mediamanager/fstabbackend.cpp:458
+#: mediamanager/fstabbackend.cpp:462 mediamanager/fstabbackend.cpp:468
msgid "Remote Share"
msgstr "Netzwerkfreigabe"
-#: mediamanager/fstabbackend.cpp:463
+#: mediamanager/fstabbackend.cpp:473
msgid "Hard Disk"
msgstr "Festplatte"
-#: mediamanager/halbackend.cpp:749 mediamanager/tdehardwarebackend.cpp:805
+#: mediamanager/halbackend.cpp:744 mediamanager/tdehardwarebackend.cpp:808
msgid "Unknown Drive"
msgstr "Unbekanntes Laufwerk"
-#: mediamanager/halbackend.cpp:761 mediamanager/tdehardwarebackend.cpp:835
+#: mediamanager/halbackend.cpp:756 mediamanager/tdehardwarebackend.cpp:838
msgid "Floppy Drive"
msgstr "Diskettenlaufwerk"
-#: mediamanager/halbackend.cpp:769
+#: mediamanager/halbackend.cpp:764
msgid "Zip Drive"
msgstr "Zip-Laufwerk"
-#: mediamanager/halbackend.cpp:839 mediamanager/tdehardwarebackend.cpp:892
+#: mediamanager/halbackend.cpp:834 mediamanager/tdehardwarebackend.cpp:895
msgid "Camera"
msgstr "Kamera"
-#: mediamanager/halbackend.cpp:1221 mediamanager/halbackend.cpp:1247
+#: mediamanager/halbackend.cpp:1216 mediamanager/halbackend.cpp:1242
msgid "Authenticate"
msgstr "Authentifizieren"
-#: mediamanager/halbackend.cpp:1222
+#: mediamanager/halbackend.cpp:1217
msgid ""
"<big><b>System policy prevents mounting internal media</b></big><br/"
">Authentication is required to perform this action. Please enter your "
"password to verify."
msgstr ""
-"<big><b>Systemrichtlinie verhindert das Einbinden interner Medien</b></big><"
-"br/>Authorisierung ist erforderlich um diese Aktion durchzuführen. Bitte "
-"geben Sie Ihr Passwort ein, um sich zu verifizieren."
+"<big><b>Systemrichtlinie verhindert das Einbinden interner Medien</b></"
+"big><br/>Authorisierung ist erforderlich um diese Aktion durchzuführen. "
+"Bitte geben Sie Ihr Passwort ein, um sich zu verifizieren."
-#: mediamanager/halbackend.cpp:1248
+#: mediamanager/halbackend.cpp:1243
msgid ""
"<big><b>System policy prevents unmounting media mounted by other users</b></"
"big><br/>Authentication is required to perform this action. Please enter "
@@ -160,11 +157,17 @@ msgstr ""
"erforderlich um diese Aktion durchzuführen. Bitte geben Sie Ihr Passwort "
"ein, um sich zu verifizieren."
-#: mediamanager/halbackend.cpp:1284
+#: mediamanager/halbackend.cpp:1259 mediamanager/halbackend.cpp:1268
+#: mediamanager/halbackend.cpp:1849 mediamanager/halbackend.cpp:1916
+#: mounthelper/tdeio_media_mounthelper.cpp:58
+msgid "Internal Error"
+msgstr "Interner Fehler"
+
+#: mediamanager/halbackend.cpp:1279
msgid "Invalid filesystem type"
msgstr "Ungültiger Dateisystemtyp"
-#: mediamanager/halbackend.cpp:1286
+#: mediamanager/halbackend.cpp:1281
msgid ""
"Permission denied<p>Please ensure that:<br>1. You have permission to access "
"this device.<br>2. This device node is not listed in /etc/fstab.</p>"
@@ -173,11 +176,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:1290
+#: mediamanager/halbackend.cpp:1285
msgid "Device is already mounted."
msgstr "Das Gerät ist bereits eingebunden."
-#: mediamanager/halbackend.cpp:1340
+#: mediamanager/halbackend.cpp:1335
msgid ""
"Moreover, programs still using the device have been detected. They are "
"listed below. You have to close them or change their working directory "
@@ -187,7 +190,7 @@ msgstr ""
"diese Programme schließen oder deren Arbeitsordner ändern, bevor Sie erneut "
"probieren, die Geräteeinbindung zu lösen."
-#: mediamanager/halbackend.cpp:1381 mediamanager/tdehardwarebackend.cpp:1588
+#: mediamanager/halbackend.cpp:1376 mediamanager/tdehardwarebackend.cpp:1618
msgid ""
"Programs that were still using the device have been forcibly terminated. "
"They are listed below."
@@ -195,10 +198,10 @@ msgstr ""
"Programme welche noch immer that Gerät genutzt haben wurden erzwungen "
"beendet. Sie sind unten aufgelistet."
-#: mediamanager/halbackend.cpp:1402 mediamanager/halbackend.cpp:1715
-#: mediamanager/tdehardwarebackend.cpp:1406
-#: mediamanager/tdehardwarebackend.cpp:1424
-#: mediamanager/tdehardwarebackend.cpp:1464
+#: mediamanager/halbackend.cpp:1397 mediamanager/halbackend.cpp:1742
+#: mediamanager/tdehardwarebackend.cpp:1430
+#: mediamanager/tdehardwarebackend.cpp:1452
+#: mediamanager/tdehardwarebackend.cpp:1494
msgid ""
"Unfortunately, the device <b>%1</b> (%2) named <b>'%3'</b> and currently "
"mounted at <b>%4</b> could not be unmounted. "
@@ -206,29 +209,40 @@ 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:1408 mediamanager/tdehardwarebackend.cpp:1470
+#: mediamanager/halbackend.cpp:1403 mediamanager/tdehardwarebackend.cpp:1500
msgid "The following error was returned by umount command:"
msgstr "Der umount-Befehl hat die folgende Fehlermeldung ausgegeben:"
-#: mediamanager/halbackend.cpp:1478
-msgid "Permission denied"
-msgstr "Berechtigung verweigert"
-
-#: mediamanager/halbackend.cpp:1562 mediamanager/tdehardwarebackend.cpp:1232
-msgid "Cannot mount encrypted drives!"
+#: mediamanager/halbackend.cpp:1567 mediamanager/tdehardwarebackend.cpp:1322
+#, fuzzy
+#| msgid "Cannot mount encrypted drives!"
+msgid "Cannot mount encrypted locked drives!"
msgstr "Einbinden verschlüsselter Laufwerke nicht möglich!"
-#: mediamanager/halbackend.cpp:1721
+#: mediamanager/halbackend.cpp:1682 mediamanager/halbackend.cpp:1703
+#: mediamanager/halbackend.cpp:1716 mediamanager/halbackend.cpp:1830
+#: mediamanager/halbackend.cpp:1840 mediamanager/halbackend.cpp:1899
+#: mediamanager/halbackend.cpp:1907
+msgid "Internal error"
+msgstr "Interner Fehler"
+
+#: mediamanager/halbackend.cpp:1694
+#, fuzzy
+#| msgid "Unknown"
+msgid "Unknown error"
+msgstr "Unbekannt"
+
+#: mediamanager/halbackend.cpp:1748
msgid "Unmounting failed due to the following error:"
msgstr ""
"Das Lösen der Geräteeinbindung ist aufgrund des folgenden Fehlers "
"fehlgeschlagen:"
-#: mediamanager/halbackend.cpp:1723
+#: mediamanager/halbackend.cpp:1750
msgid "Device is Busy:"
msgstr "Gerät ist belegt:"
-#: mediamanager/halbackend.cpp:1727
+#: mediamanager/halbackend.cpp:1754
msgid ""
"Permission denied<p>Please ensure that:<br>1. You have permission to access "
"this device.<br>2. This device was originally mounted using TDE.</p>"
@@ -237,7 +251,7 @@ msgstr ""
"haben auf das Gerät zuzugreifen.<br>2. Das Gerät ursprünglich unter TDE "
"eingebunden wurde.</p>"
-#: mediamanager/halbackend.cpp:1739
+#: mediamanager/halbackend.cpp:1766
msgid ""
"%1<p><b>Would you like to forcibly terminate these processes?</b><br><i>All "
"unsaved data would be lost</i>"
@@ -245,163 +259,154 @@ 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:1811
+#: mediamanager/halbackend.cpp:1852
msgid "Wrong password"
msgstr "Falsches Passwort"
-#: mediamanager/mediamanager.cpp:247 mediamanager/mediamanager.cpp:266
-#: mediamanager/mediamanager.cpp:285 mediamanager/mediamanager.cpp:293
-#: mediamanager/mediamanager.cpp:302 mediamanager/mediamanager.cpp:310
-msgid "Feature only available with HAL"
-msgstr "Die Funktion ist nur mit HAL verfügbar"
-
-#: mediamanager/mediamanager.cpp:252
+#: mediamanager/mediamanager.cpp:248 mediamanager/mediamanager.cpp:275
msgid "Feature only available with the TDE hardware backend"
msgstr "Die Funktion ist nur mit dem TDE Hardware-Unterbau verfügbar."
-#: mediamanager/mediamanager.cpp:256 mediamanager/mediamanager.cpp:271
-#: mediamanager/mediamanager.cpp:275
+#: mediamanager/mediamanager.cpp:255 mediamanager/mediamanager.cpp:282
+#: mediamanager/mediamanager.cpp:312 mediamanager/mediamanager.cpp:343
+msgid "Feature only available with HAL"
+msgstr "Die Funktion ist nur mit HAL verfügbar"
+
+#: mediamanager/mediamanager.cpp:262 mediamanager/mediamanager.cpp:289
+#: mediamanager/mediamanager.cpp:320 mediamanager/mediamanager.cpp:350
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:480
-#: mediamanager/tdehardwarebackend.cpp:517
-#: mediamanager/tdehardwarebackend.cpp:750
+#: mediamanager/tdehardwarebackend.cpp:483
+#: mediamanager/tdehardwarebackend.cpp:520
+#: mediamanager/tdehardwarebackend.cpp:753
msgid "%1 Removable Device"
msgstr "%1 Wechselmedium"
-#: mediamanager/tdehardwarebackend.cpp:525
+#: mediamanager/tdehardwarebackend.cpp:528
msgid "Blank CD-ROM"
msgstr "Leere CD-ROM"
-#: mediamanager/tdehardwarebackend.cpp:534
+#: mediamanager/tdehardwarebackend.cpp:537
msgid "Blank CD-R"
msgstr "Leere CD-R"
-#: mediamanager/tdehardwarebackend.cpp:543
+#: mediamanager/tdehardwarebackend.cpp:546
msgid "Blank CD-RW"
msgstr "Leere CD-RW"
-#: mediamanager/tdehardwarebackend.cpp:552
+#: mediamanager/tdehardwarebackend.cpp:555
msgid "Blank Magneto-Optical CD"
msgstr "Leere magnetisch-optische CD"
-#: mediamanager/tdehardwarebackend.cpp:561
+#: mediamanager/tdehardwarebackend.cpp:564
msgid "Blank Mount Ranier CD-RW"
msgstr "Leere Mount Ranier CD-RW"
-#: mediamanager/tdehardwarebackend.cpp:570
+#: mediamanager/tdehardwarebackend.cpp:573
msgid "Blank Mount Ranier CD-RW-W"
msgstr "Leere Mount Ranier CD-RW"
-#: mediamanager/tdehardwarebackend.cpp:579
+#: mediamanager/tdehardwarebackend.cpp:582
msgid "Blank DVD-ROM"
msgstr "Leere DVD-ROM"
-#: mediamanager/tdehardwarebackend.cpp:588
+#: mediamanager/tdehardwarebackend.cpp:591
msgid "Blank DVD-RAM"
msgstr "Leere DVD-RAM"
-#: mediamanager/tdehardwarebackend.cpp:597
+#: mediamanager/tdehardwarebackend.cpp:600
msgid "Blank DVD-R"
msgstr "Leere DVD-R"
-#: mediamanager/tdehardwarebackend.cpp:606
+#: mediamanager/tdehardwarebackend.cpp:609
msgid "Blank DVD-RW"
msgstr "Leere DVD-RW"
-#: mediamanager/tdehardwarebackend.cpp:615
+#: mediamanager/tdehardwarebackend.cpp:618
msgid "Blank Dual Layer DVD-R"
msgstr "Leere Doppelschicht DVD-R"
-#: mediamanager/tdehardwarebackend.cpp:624
+#: mediamanager/tdehardwarebackend.cpp:627
msgid "Blank Dual Layer DVD-RW"
msgstr "Leere Doppelschicht DVD-RW"
-#: mediamanager/tdehardwarebackend.cpp:633
+#: mediamanager/tdehardwarebackend.cpp:636
msgid "Blank DVD+R"
msgstr "Leere DVD+R"
-#: mediamanager/tdehardwarebackend.cpp:642
+#: mediamanager/tdehardwarebackend.cpp:645
msgid "Blank DVD+RW"
msgstr "Leere DVD+RW"
-#: mediamanager/tdehardwarebackend.cpp:651
+#: mediamanager/tdehardwarebackend.cpp:654
msgid "Blank Dual Layer DVD+R"
msgstr "Leere Doppelschicht DVD+R"
-#: mediamanager/tdehardwarebackend.cpp:660
+#: mediamanager/tdehardwarebackend.cpp:663
msgid "Blank Dual Layer DVD+RW"
msgstr "Leere Doppelschicht DVD+RW"
-#: mediamanager/tdehardwarebackend.cpp:669
+#: mediamanager/tdehardwarebackend.cpp:672
msgid "Blank BD-ROM"
msgstr "Leere BD-ROM"
-#: mediamanager/tdehardwarebackend.cpp:678
+#: mediamanager/tdehardwarebackend.cpp:681
msgid "Blank BD-R"
msgstr "Leere BD-R"
-#: mediamanager/tdehardwarebackend.cpp:687
+#: mediamanager/tdehardwarebackend.cpp:690
msgid "Blank BD-RW"
msgstr "Leere BD-RW"
-#: mediamanager/tdehardwarebackend.cpp:696
+#: mediamanager/tdehardwarebackend.cpp:699
msgid "Blank HDDVD-ROM"
msgstr "Leere HDDVD-ROM"
-#: mediamanager/tdehardwarebackend.cpp:705
+#: mediamanager/tdehardwarebackend.cpp:708
msgid "Blank HDDVD-R"
msgstr "Leere HDDVD-R"
-#: mediamanager/tdehardwarebackend.cpp:714
+#: mediamanager/tdehardwarebackend.cpp:717
msgid "Blank HDDVD-RW"
msgstr "Leere HDDVD-RW"
-#: mediamanager/tdehardwarebackend.cpp:721
+#: mediamanager/tdehardwarebackend.cpp:724
msgid "Audio CD"
msgstr "Musik CD"
-#: mediamanager/tdehardwarebackend.cpp:742
+#: mediamanager/tdehardwarebackend.cpp:745
msgid "%1 Fixed Disk (%2)"
msgstr "%1 Festplatte (%2)"
-#: mediamanager/tdehardwarebackend.cpp:849
+#: mediamanager/tdehardwarebackend.cpp:852
msgid "%1 Zip Disk"
msgstr "%1 Zip-Laufwerk"
-#: mediamanager/tdehardwarebackend.cpp:1212
-#: mediamanager/tdehardwarebackend.cpp:1392
-msgid "Internal error"
-msgstr "Interner Fehler"
+#: mediamanager/tdehardwarebackend.cpp:1224
+#: mediamanager/tdehardwarebackend.cpp:1417
+msgid "Internal error. Couldn't find medium."
+msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:1239
-msgid ""
-"<qt>Unable to mount this device.<p>Potential reasons include:<br>Improper "
-"device and/or user privilege level<br>Corrupt data on storage device"
+#: mediamanager/tdehardwarebackend.cpp:1249
+#: mediamanager/tdehardwarebackend.cpp:1323
+msgid "Unable to mount this device."
msgstr ""
-"<qt>Einbinden des Laufwerks nicht möglich.<p>Mögliche Gründe könnten "
-"sein:<br>Unsauberes Gerät und/oder Benutzer-Berechtigungsstufe<br>"
-"Beschädigte Daten auf dem Datenspeicher"
-#: mediamanager/tdehardwarebackend.cpp:1241
-#: mediamanager/tdehardwarebackend.cpp:1316
-#: mediamanager/tdehardwarebackend.cpp:1408
-#: mediamanager/tdehardwarebackend.cpp:1426
+#: mediamanager/tdehardwarebackend.cpp:1252
+#: mediamanager/tdehardwarebackend.cpp:1326
+#: mediamanager/tdehardwarebackend.cpp:1435
+#: mediamanager/tdehardwarebackend.cpp:1457
msgid "<p>Technical details:<br>"
msgstr "<p>Technische Details:<br>"
-#: mediamanager/tdehardwarebackend.cpp:1314
-msgid ""
-"<qt>Unable to mount this device.<p>Potential reasons include:<br>Improper "
-"device and/or user privilege level<br>Corrupt data on storage "
-"device<br>Incorrect encryption password"
-msgstr ""
-"<qt>Einbinden des Laufwerks nicht möglich.<p>Mögliche Gründe könnten "
-"sein:<br>Unsauberes Gerät und/oder Benutzer-Berechtigungsstufe<br>"
-"Beschädigte Daten auf dem Datenspeicher<br>Falsches Entschlüsselungs-Passwort"
+#: mediamanager/tdehardwarebackend.cpp:1284
+#, fuzzy
+#| msgid "Decrypting Storage Device"
+msgid "Decryption aborted"
+msgstr "Speichermedium entschlüsseln"
-#: mediamanager/tdehardwarebackend.cpp:1420
+#: mediamanager/tdehardwarebackend.cpp:1443
msgid ""
"<qt>The device <b>%1</b> (%2) named <b>'%3'</b> and currently mounted at <b>"
"%4</b> can not be unmounted at this time.<p>%5<p><b>Would you like to "
@@ -413,7 +418,7 @@ msgstr ""
"das Beenden dieser Prozesse erzwingen?</b><br><i>Alle ungespeicherten Daten "
"wären verloren</i>"
-#: mediamanager/tdehardwarebackend.cpp:1547
+#: mediamanager/tdehardwarebackend.cpp:1577
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 "
@@ -427,7 +432,7 @@ msgstr ""
msgid "%1 cannot be found."
msgstr "%1 ist nicht auffindbar."
-#: mounthelper/tdeio_media_mounthelper.cpp:86
+#: mounthelper/tdeio_media_mounthelper.cpp:87
msgid "%1 is not a mountable media."
msgstr "%1 ist kein Medium, das eingebunden werden kann."
@@ -436,44 +441,54 @@ msgid "%1 is not an encrypted media."
msgstr "%1 ist kein verschlüsseltes Medium."
#: mounthelper/tdeio_media_mounthelper.cpp:107
-msgid "%1 is already decrypted."
+#, fuzzy
+#| msgid "%1 is already decrypted."
+msgid "%1 is already unlocked."
msgstr "%1 ist bereits entschlüsselt."
-#: mounthelper/tdeio_media_mounthelper.cpp:228
+#: mounthelper/tdeio_media_mounthelper.cpp:139
+msgid "Unknown unmount error."
+msgstr ""
+
+#: mounthelper/tdeio_media_mounthelper.cpp:246
msgid "The device was successfully unmounted, but the tray could not be opened"
msgstr ""
"Die Geräteeinbindung wurde erfolgreich gelöst, jedoch lässt sich die "
"Schublade nicht öffnen."
-#: mounthelper/tdeio_media_mounthelper.cpp:230
+#: mounthelper/tdeio_media_mounthelper.cpp:248
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."
-#: mounthelper/tdeio_media_mounthelper.cpp:275
+#: mounthelper/tdeio_media_mounthelper.cpp:281
+msgid "Unknown decrypt error."
+msgstr ""
+
+#: mounthelper/tdeio_media_mounthelper.cpp:295
msgid "Decrypt given URL"
msgstr "Angegebene URL entschlüsseln"
-#: mounthelper/tdeio_media_mounthelper.cpp:276
+#: mounthelper/tdeio_media_mounthelper.cpp:296
msgid "Unmount given URL"
msgstr "Einbindung für angegebene Adresse lösen."
-#: mounthelper/tdeio_media_mounthelper.cpp:277
+#: mounthelper/tdeio_media_mounthelper.cpp:297
msgid "Mount given URL (default)"
msgstr "Angegebene Adresse einbinden (Voreinstellung)"
-#: mounthelper/tdeio_media_mounthelper.cpp:278
+#: mounthelper/tdeio_media_mounthelper.cpp:298
msgid "Eject given URL via tdeeject"
msgstr "Angegebene Adresse mittels tdeeject auswerfen."
-#: mounthelper/tdeio_media_mounthelper.cpp:279
+#: mounthelper/tdeio_media_mounthelper.cpp:299
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)."
-#: mounthelper/tdeio_media_mounthelper.cpp:280
+#: mounthelper/tdeio_media_mounthelper.cpp:300
msgid "media:/ URL to mount/unmount/eject/remove"
msgstr "media:/ URL zum Einbinden/Lösen/Auswerfen/Entfernen"
@@ -494,43 +509,43 @@ msgstr "Fehler beim Speichern der Änderungen"
msgid "&Mounting"
msgstr "&Einbinden"
-#: tdefile-plugin/tdefilemediaplugin.cpp:190
+#: tdefile-plugin/tdefilemediaplugin.cpp:184
msgid "Medium Information"
msgstr "Medium-Information"
-#: tdefile-plugin/tdefilemediaplugin.cpp:193
+#: tdefile-plugin/tdefilemediaplugin.cpp:187
msgid "Free"
msgstr "Frei"
-#: tdefile-plugin/tdefilemediaplugin.cpp:196
+#: tdefile-plugin/tdefilemediaplugin.cpp:190
msgid "Used"
msgstr "Benutzt"
-#: tdefile-plugin/tdefilemediaplugin.cpp:199
+#: tdefile-plugin/tdefilemediaplugin.cpp:193
msgid "Total"
msgstr "Gesamt"
-#: tdefile-plugin/tdefilemediaplugin.cpp:202
+#: tdefile-plugin/tdefilemediaplugin.cpp:196
msgid "Base URL"
msgstr "Basis-Adresse"
-#: tdefile-plugin/tdefilemediaplugin.cpp:203
+#: tdefile-plugin/tdefilemediaplugin.cpp:197
msgid "Mount Point"
msgstr "Mountpunkt"
-#: tdefile-plugin/tdefilemediaplugin.cpp:204
+#: tdefile-plugin/tdefilemediaplugin.cpp:198
msgid "Device Node"
msgstr "Gerätedatei"
-#: tdefile-plugin/tdefilemediaplugin.cpp:206
+#: tdefile-plugin/tdefilemediaplugin.cpp:200
msgid "Medium Summary"
msgstr "Medium-Kurzinfo"
-#: tdefile-plugin/tdefilemediaplugin.cpp:208
+#: tdefile-plugin/tdefilemediaplugin.cpp:202
msgid "Usage"
msgstr "Verwendung"
-#: tdefile-plugin/tdefilemediaplugin.cpp:210
+#: tdefile-plugin/tdefilemediaplugin.cpp:204
msgid "Bar Graph"
msgstr "Balkengraphik"
@@ -614,26 +629,39 @@ msgstr ""
"Deaktivieren Sie dieses, wenn Sie keine Aktionsbenachrichtigungs-"
"Anforderungen erzeugt haben möchten, wenn Geräte eingesteckt werden."
-#: mediamanager/decryptdialog.ui:24 mounthelper/decryptdialog.ui:24
+#: mediamanager/unlockdialog.ui:24 mounthelper/unlockdialog.ui:24
#, no-c-format
msgid "Decrypting Storage Device"
msgstr "Speichermedium entschlüsseln"
-#: mediamanager/decryptdialog.ui:109 mounthelper/decryptdialog.ui:109
-#, no-c-format
+#: mediamanager/unlockdialog.ui:109
+#, fuzzy, 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>"
msgid ""
-"<p><b>%1</b> is an encrypted storage device.</p>\n"
-"<p>Please enter the password to decrypt the storage device.</p>"
+"<p><b>%1</b> is an encrypted locked storage device.</p>\n"
+"<p>Please enter the password to unlock the storage device.</p>"
msgstr ""
"<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>Bitte geben Sie das Passwort ein, um das Speichermedium zu entschlüsseln."
+"</p>"
-#: mediamanager/decryptdialog.ui:131 mounthelper/decryptdialog.ui:131
+#: mediamanager/unlockdialog.ui:131 mounthelper/unlockdialog.ui:131
#, no-c-format
msgid "&Password:"
msgstr "&Passwort:"
+#: mounthelper/unlockdialog.ui:109
+#, no-c-format
+msgid ""
+"<p><b>%1</b> is an encrypted storage device.</p>\n"
+"<p>Please enter the password to decrypt the storage device.</p>"
+msgstr ""
+"<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>"
+
#: propsdlgplugin/propertiespagegui.ui:16
#, no-c-format
msgid "PropertiesPageGUI"
@@ -902,3 +930,26 @@ msgstr "Gemischt"
#, no-c-format
msgid "Filesystem: iso9660"
msgstr "Dateisystem: ISO-9660"
+
+#~ msgid "Decrypt"
+#~ msgstr "Entschlüsseln"
+
+#~ msgid "Permission denied"
+#~ msgstr "Berechtigung verweigert"
+
+#~ msgid ""
+#~ "<qt>Unable to mount this device.<p>Potential reasons include:<br>Improper "
+#~ "device and/or user privilege level<br>Corrupt data on storage device"
+#~ msgstr ""
+#~ "<qt>Einbinden des Laufwerks nicht möglich.<p>Mögliche Gründe könnten sein:"
+#~ "<br>Unsauberes Gerät und/oder Benutzer-Berechtigungsstufe<br>Beschädigte "
+#~ "Daten auf dem Datenspeicher"
+
+#~ msgid ""
+#~ "<qt>Unable to mount this device.<p>Potential reasons include:<br>Improper "
+#~ "device and/or user privilege level<br>Corrupt data on storage "
+#~ "device<br>Incorrect encryption password"
+#~ msgstr ""
+#~ "<qt>Einbinden des Laufwerks nicht möglich.<p>Mögliche Gründe könnten sein:"
+#~ "<br>Unsauberes Gerät und/oder Benutzer-Berechtigungsstufe<br>Beschädigte "
+#~ "Daten auf dem Datenspeicher<br>Falsches Entschlüsselungs-Passwort"
diff --git a/tde-i18n-el/messages/tdebase/tdeio_media.po b/tde-i18n-el/messages/tdebase/tdeio_media.po
index 18c65b6d5d1..9d731568ab6 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: 2019-01-13 18:47+0100\n"
+"POT-Creation-Date: 2019-07-11 02:33+0200\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"
@@ -46,7 +46,6 @@ msgstr "Άγνωστο"
#: mediaimpl.cpp:88 mediaimpl.cpp:115 mediaimpl.cpp:141 mediaimpl.cpp:177
#: mediaimpl.cpp:197 mediaimpl.cpp:218
#: mounthelper/tdeio_media_mounthelper.cpp:50
-#: mounthelper/tdeio_media_mounthelper.cpp:256
msgid "The TDE mediamanager is not running."
msgstr "Ο διαχειριστής μέσων του TDE δεν εκτελείται."
@@ -54,7 +53,7 @@ msgstr "Ο διαχειριστής μέσων του TDE δεν εκτελεί
msgid "This media name already exists."
msgstr "Αυτό το όνομα συσκευής υπάρχει ήδη."
-#: mediaimpl.cpp:230 mediaimpl.cpp:293
+#: mediaimpl.cpp:230 mediaimpl.cpp:297
msgid "No such medium."
msgstr "Δεν υπάρχει τέτοιο μέσο."
@@ -62,110 +61,114 @@ msgstr "Δεν υπάρχει τέτοιο μέσο."
msgid "The drive is encrypted."
msgstr ""
-#: mediaimpl.cpp:272 mediamanager/halbackend.cpp:1264
-#: mediamanager/halbackend.cpp:1273 mediamanager/halbackend.cpp:1663
-#: mediamanager/halbackend.cpp:1680 mediamanager/halbackend.cpp:1691
-#: mediamanager/halbackend.cpp:1793 mediamanager/halbackend.cpp:1801
-#: mediamanager/halbackend.cpp:1808 mediamanager/halbackend.cpp:1848
-#: mediamanager/halbackend.cpp:1854 mediamanager/halbackend.cpp:1861
-#: mounthelper/tdeio_media_mounthelper.cpp:58
-msgid "Internal Error"
-msgstr "Εσωτερικό σφάλμα"
+#: mediaimpl.cpp:274 mediamanager/tdehardwarebackend.cpp:201
+#: mediamanager/tdehardwarebackend.cpp:252
+#: mounthelper/tdeio_media_mounthelper.cpp:202
+msgid "Unknown mount error."
+msgstr ""
#: mediamanager/dialog.cpp:26 mounthelper/dialog.cpp:26
-msgid "Decrypt"
+msgid "Unlock"
msgstr ""
-#: mediamanager/fstabbackend.cpp:104 mediamanager/fstabbackend.cpp:114
-#: mediamanager/halbackend.cpp:1595 mediamanager/halbackend.cpp:1617
-#: mediamanager/halbackend.cpp:1776 mediamanager/halbackend.cpp:1831
-#: mediamanager/tdehardwarebackend.cpp:1349
-#: mediamanager/tdehardwarebackend.cpp:1360
+#: mediamanager/fstabbackend.cpp:105 mediamanager/fstabbackend.cpp:120
+#: mediamanager/halbackend.cpp:1598 mediamanager/halbackend.cpp:1625
+#: mediamanager/halbackend.cpp:1808 mediamanager/halbackend.cpp:1877
+#: mediamanager/mediamanager.cpp:363 mediamanager/mediamanager.cpp:375
+#: mediamanager/mediamanager.cpp:387 mediamanager/mediamanager.cpp:399
+#: mediamanager/tdehardwarebackend.cpp:1363
+#: mediamanager/tdehardwarebackend.cpp:1378
#, c-format
msgid "No such medium: %1"
msgstr "Αυτό το μέσο δεν υπάρχει: %1"
-#: mediamanager/fstabbackend.cpp:398
+#: mediamanager/fstabbackend.cpp:408
msgid "CD Recorder"
msgstr "Εγγραφέας CD"
-#: mediamanager/fstabbackend.cpp:404
+#: mediamanager/fstabbackend.cpp:414
msgid "DVD"
msgstr "DVD"
-#: mediamanager/fstabbackend.cpp:415
+#: mediamanager/fstabbackend.cpp:425
msgid "CD-ROM"
msgstr "CD-ROM"
-#: mediamanager/fstabbackend.cpp:428
+#: mediamanager/fstabbackend.cpp:438
msgid "Floppy"
msgstr "Δισκέτα"
-#: mediamanager/fstabbackend.cpp:436
+#: mediamanager/fstabbackend.cpp:446
msgid "Zip Disk"
msgstr "Δίσκος zip"
-#: mediamanager/fstabbackend.cpp:447
+#: mediamanager/fstabbackend.cpp:457
msgid "Removable Device"
msgstr "Αφαιρούμενη συσκευή"
-#: mediamanager/fstabbackend.cpp:452 mediamanager/fstabbackend.cpp:458
+#: mediamanager/fstabbackend.cpp:462 mediamanager/fstabbackend.cpp:468
msgid "Remote Share"
msgstr "Απομακρυσμένο κοινόχρηστο"
-#: mediamanager/fstabbackend.cpp:463
+#: mediamanager/fstabbackend.cpp:473
msgid "Hard Disk"
msgstr "Σκληρός δίσκος"
-#: mediamanager/halbackend.cpp:749 mediamanager/tdehardwarebackend.cpp:805
+#: mediamanager/halbackend.cpp:744 mediamanager/tdehardwarebackend.cpp:808
msgid "Unknown Drive"
msgstr "Άγνωστος οδηγός"
-#: mediamanager/halbackend.cpp:761 mediamanager/tdehardwarebackend.cpp:835
+#: mediamanager/halbackend.cpp:756 mediamanager/tdehardwarebackend.cpp:838
msgid "Floppy Drive"
msgstr "Οδηγός δισκέτας"
-#: mediamanager/halbackend.cpp:769
+#: mediamanager/halbackend.cpp:764
msgid "Zip Drive"
msgstr "Δίσκος zip"
-#: mediamanager/halbackend.cpp:839 mediamanager/tdehardwarebackend.cpp:892
+#: mediamanager/halbackend.cpp:834 mediamanager/tdehardwarebackend.cpp:895
msgid "Camera"
msgstr "Κάμερα"
-#: mediamanager/halbackend.cpp:1221 mediamanager/halbackend.cpp:1247
+#: mediamanager/halbackend.cpp:1216 mediamanager/halbackend.cpp:1242
msgid "Authenticate"
msgstr ""
-#: mediamanager/halbackend.cpp:1222
+#: mediamanager/halbackend.cpp:1217
msgid ""
"<big><b>System policy prevents mounting internal media</b></big><br/"
">Authentication is required to perform this action. Please enter your "
"password to verify."
msgstr ""
-#: mediamanager/halbackend.cpp:1248
+#: mediamanager/halbackend.cpp:1243
msgid ""
"<big><b>System policy prevents unmounting media mounted by other users</b></"
"big><br/>Authentication is required to perform this action. Please enter "
"your password to verify."
msgstr ""
-#: mediamanager/halbackend.cpp:1284
+#: mediamanager/halbackend.cpp:1259 mediamanager/halbackend.cpp:1268
+#: mediamanager/halbackend.cpp:1849 mediamanager/halbackend.cpp:1916
+#: mounthelper/tdeio_media_mounthelper.cpp:58
+msgid "Internal Error"
+msgstr "Εσωτερικό σφάλμα"
+
+#: mediamanager/halbackend.cpp:1279
msgid "Invalid filesystem type"
msgstr "Μη έγκυρος τύπος συστήματος αρχείων"
-#: mediamanager/halbackend.cpp:1286
+#: mediamanager/halbackend.cpp:1281
msgid ""
"Permission denied<p>Please ensure that:<br>1. You have permission to access "
"this device.<br>2. This device node is not listed in /etc/fstab.</p>"
msgstr ""
-#: mediamanager/halbackend.cpp:1290
+#: mediamanager/halbackend.cpp:1285
msgid "Device is already mounted."
msgstr "Η συσκευή έχει προσαρτηθεί ήδη."
-#: mediamanager/halbackend.cpp:1340
+#: mediamanager/halbackend.cpp:1335
msgid ""
"Moreover, programs still using the device have been detected. They are "
"listed below. You have to close them or change their working directory "
@@ -175,16 +178,16 @@ msgstr ""
"εμφανίζονται παρακάτω. Θα πρέπει να τα κλείσετε ή να αλλάξετε τον κατάλογο "
"εργασίας τους πριν προσπαθήσετε και πάλι να αποπροσαρτήσετε τη συσκευή."
-#: mediamanager/halbackend.cpp:1381 mediamanager/tdehardwarebackend.cpp:1588
+#: mediamanager/halbackend.cpp:1376 mediamanager/tdehardwarebackend.cpp:1618
msgid ""
"Programs that were still using the device have been forcibly terminated. "
"They are listed below."
msgstr ""
-#: mediamanager/halbackend.cpp:1402 mediamanager/halbackend.cpp:1715
-#: mediamanager/tdehardwarebackend.cpp:1406
-#: mediamanager/tdehardwarebackend.cpp:1424
-#: mediamanager/tdehardwarebackend.cpp:1464
+#: mediamanager/halbackend.cpp:1397 mediamanager/halbackend.cpp:1742
+#: mediamanager/tdehardwarebackend.cpp:1430
+#: mediamanager/tdehardwarebackend.cpp:1452
+#: mediamanager/tdehardwarebackend.cpp:1494
msgid ""
"Unfortunately, the device <b>%1</b> (%2) named <b>'%3'</b> and currently "
"mounted at <b>%4</b> could not be unmounted. "
@@ -192,196 +195,199 @@ msgstr ""
"Δυστυχώς, η συσκευή <b>%1</b> (%2) με όνομα <b>'%3'</b> που είναι "
"προσαρτημένη στο <b>%4</b>, δεν μπόρεσε να αποπροσαρτηθεί. "
-#: mediamanager/halbackend.cpp:1408 mediamanager/tdehardwarebackend.cpp:1470
+#: mediamanager/halbackend.cpp:1403 mediamanager/tdehardwarebackend.cpp:1500
msgid "The following error was returned by umount command:"
msgstr "Η εντολή umount επέστρεψε το ακόλουθο σφάλμα:"
-#: mediamanager/halbackend.cpp:1478
+#: mediamanager/halbackend.cpp:1567 mediamanager/tdehardwarebackend.cpp:1322
+msgid "Cannot mount encrypted locked drives!"
+msgstr ""
+
+#: mediamanager/halbackend.cpp:1682 mediamanager/halbackend.cpp:1703
+#: mediamanager/halbackend.cpp:1716 mediamanager/halbackend.cpp:1830
+#: mediamanager/halbackend.cpp:1840 mediamanager/halbackend.cpp:1899
+#: mediamanager/halbackend.cpp:1907
#, fuzzy
-msgid "Permission denied"
-msgstr "Άρνηση πρόσβασης"
+msgid "Internal error"
+msgstr "Εσωτερικό σφάλμα"
-#: mediamanager/halbackend.cpp:1562 mediamanager/tdehardwarebackend.cpp:1232
-msgid "Cannot mount encrypted drives!"
-msgstr ""
+#: mediamanager/halbackend.cpp:1694
+#, fuzzy
+#| msgid "Unknown"
+msgid "Unknown error"
+msgstr "Άγνωστο"
-#: mediamanager/halbackend.cpp:1721
+#: mediamanager/halbackend.cpp:1748
msgid "Unmounting failed due to the following error:"
msgstr "Η αποπροσάρτηση απέτυχε λόγω του ακόλουθου σφάλματος:"
-#: mediamanager/halbackend.cpp:1723
+#: mediamanager/halbackend.cpp:1750
msgid "Device is Busy:"
msgstr "Η συσκευή είναι απασχολημένη:"
-#: mediamanager/halbackend.cpp:1727
+#: mediamanager/halbackend.cpp:1754
msgid ""
"Permission denied<p>Please ensure that:<br>1. You have permission to access "
"this device.<br>2. This device was originally mounted using TDE.</p>"
msgstr ""
-#: mediamanager/halbackend.cpp:1739
+#: mediamanager/halbackend.cpp:1766
msgid ""
"%1<p><b>Would you like to forcibly terminate these processes?</b><br><i>All "
"unsaved data would be lost</i>"
msgstr ""
-#: mediamanager/halbackend.cpp:1811
+#: mediamanager/halbackend.cpp:1852
msgid "Wrong password"
msgstr ""
-#: mediamanager/mediamanager.cpp:247 mediamanager/mediamanager.cpp:266
-#: mediamanager/mediamanager.cpp:285 mediamanager/mediamanager.cpp:293
-#: mediamanager/mediamanager.cpp:302 mediamanager/mediamanager.cpp:310
-msgid "Feature only available with HAL"
-msgstr "Το χαρακτηριστικό είναι διαθέσιμο μόνο μέσω του HAL"
-
-#: mediamanager/mediamanager.cpp:252
+#: mediamanager/mediamanager.cpp:248 mediamanager/mediamanager.cpp:275
#, fuzzy
msgid "Feature only available with the TDE hardware backend"
msgstr "Το χαρακτηριστικό είναι διαθέσιμο μόνο μέσω του HAL"
-#: mediamanager/mediamanager.cpp:256 mediamanager/mediamanager.cpp:271
-#: mediamanager/mediamanager.cpp:275
+#: mediamanager/mediamanager.cpp:255 mediamanager/mediamanager.cpp:282
+#: mediamanager/mediamanager.cpp:312 mediamanager/mediamanager.cpp:343
+msgid "Feature only available with HAL"
+msgstr "Το χαρακτηριστικό είναι διαθέσιμο μόνο μέσω του HAL"
+
+#: mediamanager/mediamanager.cpp:262 mediamanager/mediamanager.cpp:289
+#: mediamanager/mediamanager.cpp:320 mediamanager/mediamanager.cpp:350
#, fuzzy
msgid "Feature only available with HAL or TDE hardware backend"
msgstr "Το χαρακτηριστικό είναι διαθέσιμο μόνο μέσω του HAL"
-#: mediamanager/tdehardwarebackend.cpp:480
-#: mediamanager/tdehardwarebackend.cpp:517
-#: mediamanager/tdehardwarebackend.cpp:750
+#: mediamanager/tdehardwarebackend.cpp:483
+#: mediamanager/tdehardwarebackend.cpp:520
+#: mediamanager/tdehardwarebackend.cpp:753
#, fuzzy
msgid "%1 Removable Device"
msgstr "Αφαιρούμενη συσκευή"
-#: mediamanager/tdehardwarebackend.cpp:525
+#: mediamanager/tdehardwarebackend.cpp:528
#, fuzzy
msgid "Blank CD-ROM"
msgstr "CD-ROM"
-#: mediamanager/tdehardwarebackend.cpp:534
+#: mediamanager/tdehardwarebackend.cpp:537
msgid "Blank CD-R"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:543
+#: mediamanager/tdehardwarebackend.cpp:546
msgid "Blank CD-RW"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:552
+#: mediamanager/tdehardwarebackend.cpp:555
msgid "Blank Magneto-Optical CD"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:561
+#: mediamanager/tdehardwarebackend.cpp:564
msgid "Blank Mount Ranier CD-RW"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:570
+#: mediamanager/tdehardwarebackend.cpp:573
msgid "Blank Mount Ranier CD-RW-W"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:579
+#: mediamanager/tdehardwarebackend.cpp:582
msgid "Blank DVD-ROM"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:588
+#: mediamanager/tdehardwarebackend.cpp:591
msgid "Blank DVD-RAM"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:597
+#: mediamanager/tdehardwarebackend.cpp:600
msgid "Blank DVD-R"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:606
+#: mediamanager/tdehardwarebackend.cpp:609
msgid "Blank DVD-RW"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:615
+#: mediamanager/tdehardwarebackend.cpp:618
msgid "Blank Dual Layer DVD-R"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:624
+#: mediamanager/tdehardwarebackend.cpp:627
msgid "Blank Dual Layer DVD-RW"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:633
+#: mediamanager/tdehardwarebackend.cpp:636
msgid "Blank DVD+R"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:642
+#: mediamanager/tdehardwarebackend.cpp:645
msgid "Blank DVD+RW"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:651
+#: mediamanager/tdehardwarebackend.cpp:654
msgid "Blank Dual Layer DVD+R"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:660
+#: mediamanager/tdehardwarebackend.cpp:663
msgid "Blank Dual Layer DVD+RW"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:669
+#: mediamanager/tdehardwarebackend.cpp:672
msgid "Blank BD-ROM"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:678
+#: mediamanager/tdehardwarebackend.cpp:681
msgid "Blank BD-R"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:687
+#: mediamanager/tdehardwarebackend.cpp:690
msgid "Blank BD-RW"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:696
+#: mediamanager/tdehardwarebackend.cpp:699
msgid "Blank HDDVD-ROM"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:705
+#: mediamanager/tdehardwarebackend.cpp:708
msgid "Blank HDDVD-R"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:714
+#: mediamanager/tdehardwarebackend.cpp:717
msgid "Blank HDDVD-RW"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:721
+#: mediamanager/tdehardwarebackend.cpp:724
msgid "Audio CD"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:742
+#: mediamanager/tdehardwarebackend.cpp:745
msgid "%1 Fixed Disk (%2)"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:849
+#: mediamanager/tdehardwarebackend.cpp:852
#, fuzzy
msgid "%1 Zip Disk"
msgstr "Δίσκος zip"
-#: mediamanager/tdehardwarebackend.cpp:1212
-#: mediamanager/tdehardwarebackend.cpp:1392
-#, fuzzy
-msgid "Internal error"
-msgstr "Εσωτερικό σφάλμα"
+#: mediamanager/tdehardwarebackend.cpp:1224
+#: mediamanager/tdehardwarebackend.cpp:1417
+msgid "Internal error. Couldn't find medium."
+msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:1239
-msgid ""
-"<qt>Unable to mount this device.<p>Potential reasons include:<br>Improper "
-"device and/or user privilege level<br>Corrupt data on storage device"
+#: mediamanager/tdehardwarebackend.cpp:1249
+#: mediamanager/tdehardwarebackend.cpp:1323
+msgid "Unable to mount this device."
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:1241
-#: mediamanager/tdehardwarebackend.cpp:1316
-#: mediamanager/tdehardwarebackend.cpp:1408
-#: mediamanager/tdehardwarebackend.cpp:1426
+#: mediamanager/tdehardwarebackend.cpp:1252
+#: mediamanager/tdehardwarebackend.cpp:1326
+#: mediamanager/tdehardwarebackend.cpp:1435
+#: mediamanager/tdehardwarebackend.cpp:1457
msgid "<p>Technical details:<br>"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:1314
-msgid ""
-"<qt>Unable to mount this device.<p>Potential reasons include:<br>Improper "
-"device and/or user privilege level<br>Corrupt data on storage "
-"device<br>Incorrect encryption password"
+#: mediamanager/tdehardwarebackend.cpp:1284
+msgid "Decryption aborted"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:1420
+#: mediamanager/tdehardwarebackend.cpp:1443
msgid ""
"<qt>The device <b>%1</b> (%2) named <b>'%3'</b> and currently mounted at <b>"
"%4</b> can not be unmounted at this time.<p>%5<p><b>Would you like to "
@@ -389,7 +395,7 @@ msgid ""
"lost</i>"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:1547
+#: mediamanager/tdehardwarebackend.cpp:1577
#, fuzzy
msgid ""
"Programs still using the device have been detected. They are listed below. "
@@ -404,7 +410,7 @@ msgstr ""
msgid "%1 cannot be found."
msgstr "Το %1δεν μπορεί να βρεθεί."
-#: mounthelper/tdeio_media_mounthelper.cpp:86
+#: mounthelper/tdeio_media_mounthelper.cpp:87
msgid "%1 is not a mountable media."
msgstr "Το %1 δεν είναι μια συσκευή που μπορεί να προσαρτηθεί."
@@ -415,43 +421,51 @@ msgstr "Το %1 δεν είναι μια συσκευή που μπορεί να
#: mounthelper/tdeio_media_mounthelper.cpp:107
#, fuzzy
-msgid "%1 is already decrypted."
+msgid "%1 is already unlocked."
msgstr "Η συσκευή έχει προσαρτηθεί ήδη."
-#: mounthelper/tdeio_media_mounthelper.cpp:228
+#: mounthelper/tdeio_media_mounthelper.cpp:139
+msgid "Unknown unmount error."
+msgstr ""
+
+#: mounthelper/tdeio_media_mounthelper.cpp:246
msgid "The device was successfully unmounted, but the tray could not be opened"
msgstr ""
"Η συσκευή αποπροσαρτήθηκε με επιτυχία, αλλά δεν μπόρεσε να ανοίξει ο οδηγός"
-#: mounthelper/tdeio_media_mounthelper.cpp:230
+#: mounthelper/tdeio_media_mounthelper.cpp:248
msgid "The device was successfully unmounted, but could not be ejected"
msgstr ""
"Η συσκευή αποπροσαρτήθηκε με επιτυχία, αλλά δεν ήταν δυνατή η εξαγωγή της"
-#: mounthelper/tdeio_media_mounthelper.cpp:275
+#: mounthelper/tdeio_media_mounthelper.cpp:281
+msgid "Unknown decrypt error."
+msgstr ""
+
+#: mounthelper/tdeio_media_mounthelper.cpp:295
#, fuzzy
msgid "Decrypt given URL"
msgstr "Αποπροσάρτηση δοσμένου URL"
-#: mounthelper/tdeio_media_mounthelper.cpp:276
+#: mounthelper/tdeio_media_mounthelper.cpp:296
msgid "Unmount given URL"
msgstr "Αποπροσάρτηση δοσμένου URL"
-#: mounthelper/tdeio_media_mounthelper.cpp:277
+#: mounthelper/tdeio_media_mounthelper.cpp:297
msgid "Mount given URL (default)"
msgstr "Προσάρτηση δοσμένου URL (προκαθορισμένο)"
-#: mounthelper/tdeio_media_mounthelper.cpp:278
+#: mounthelper/tdeio_media_mounthelper.cpp:298
msgid "Eject given URL via tdeeject"
msgstr "Εξαγωγή του δοσμένου URL μέσω του tdeeject"
-#: mounthelper/tdeio_media_mounthelper.cpp:279
+#: mounthelper/tdeio_media_mounthelper.cpp:299
msgid "Unmount and Eject given URL (necessary for some USB devices)"
msgstr ""
"Αποπροσάρτηση και εξαγωγή του δοσμένου URL (απαραίτητο για μερικές συσκευές "
"USB)"
-#: mounthelper/tdeio_media_mounthelper.cpp:280
+#: mounthelper/tdeio_media_mounthelper.cpp:300
msgid "media:/ URL to mount/unmount/eject/remove"
msgstr "Η URL media:/ για προσάρτηση/αποπροσάρτηση/αφαίρεση μέσου/αφαίρεση"
@@ -472,43 +486,43 @@ msgstr "Η αποθήκευση των αλλαγών απέτυχε"
msgid "&Mounting"
msgstr "&Προσάρτηση"
-#: tdefile-plugin/tdefilemediaplugin.cpp:190
+#: tdefile-plugin/tdefilemediaplugin.cpp:184
msgid "Medium Information"
msgstr "Πληροφορίες μέσου"
-#: tdefile-plugin/tdefilemediaplugin.cpp:193
+#: tdefile-plugin/tdefilemediaplugin.cpp:187
msgid "Free"
msgstr "Ελεύθερο"
-#: tdefile-plugin/tdefilemediaplugin.cpp:196
+#: tdefile-plugin/tdefilemediaplugin.cpp:190
msgid "Used"
msgstr "Χρησιμοποιημένο"
-#: tdefile-plugin/tdefilemediaplugin.cpp:199
+#: tdefile-plugin/tdefilemediaplugin.cpp:193
msgid "Total"
msgstr "Σύνολο"
-#: tdefile-plugin/tdefilemediaplugin.cpp:202
+#: tdefile-plugin/tdefilemediaplugin.cpp:196
msgid "Base URL"
msgstr "Βασικό URL"
-#: tdefile-plugin/tdefilemediaplugin.cpp:203
+#: tdefile-plugin/tdefilemediaplugin.cpp:197
msgid "Mount Point"
msgstr "Σημείο προσάρτησης"
-#: tdefile-plugin/tdefilemediaplugin.cpp:204
+#: tdefile-plugin/tdefilemediaplugin.cpp:198
msgid "Device Node"
msgstr "Κόμβος συσκευής"
-#: tdefile-plugin/tdefilemediaplugin.cpp:206
+#: tdefile-plugin/tdefilemediaplugin.cpp:200
msgid "Medium Summary"
msgstr "Περίληψη μέσου"
-#: tdefile-plugin/tdefilemediaplugin.cpp:208
+#: tdefile-plugin/tdefilemediaplugin.cpp:202
msgid "Usage"
msgstr "Χρήση"
-#: tdefile-plugin/tdefilemediaplugin.cpp:210
+#: tdefile-plugin/tdefilemediaplugin.cpp:204
msgid "Bar Graph"
msgstr "Ραβδόγραμμα"
@@ -580,23 +594,30 @@ msgid ""
"devices are plugged in."
msgstr ""
-#: mediamanager/decryptdialog.ui:24 mounthelper/decryptdialog.ui:24
+#: mediamanager/unlockdialog.ui:24 mounthelper/unlockdialog.ui:24
#, no-c-format
msgid "Decrypting Storage Device"
msgstr ""
-#: mediamanager/decryptdialog.ui:109 mounthelper/decryptdialog.ui:109
+#: mediamanager/unlockdialog.ui:109
#, no-c-format
msgid ""
-"<p><b>%1</b> is an encrypted storage device.</p>\n"
-"<p>Please enter the password to decrypt the storage device.</p>"
+"<p><b>%1</b> is an encrypted locked storage device.</p>\n"
+"<p>Please enter the password to unlock the storage device.</p>"
msgstr ""
-#: mediamanager/decryptdialog.ui:131 mounthelper/decryptdialog.ui:131
+#: mediamanager/unlockdialog.ui:131 mounthelper/unlockdialog.ui:131
#, no-c-format
msgid "&Password:"
msgstr ""
+#: mounthelper/unlockdialog.ui:109
+#, no-c-format
+msgid ""
+"<p><b>%1</b> is an encrypted storage device.</p>\n"
+"<p>Please enter the password to decrypt the storage device.</p>"
+msgstr ""
+
#: propsdlgplugin/propertiespagegui.ui:16
#, no-c-format
msgid "PropertiesPageGUI"
@@ -866,3 +887,7 @@ msgstr "Μικτά"
#, no-c-format
msgid "Filesystem: iso9660"
msgstr "Σύστημα αρχείων: iso9660"
+
+#, 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 b44f747c2d4..f03c9ebf8f4 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: 2019-01-13 18:47+0100\n"
+"POT-Creation-Date: 2019-07-11 02:33+0200\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"
@@ -47,7 +47,6 @@ 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
-#: mounthelper/tdeio_media_mounthelper.cpp:256
msgid "The TDE mediamanager is not running."
msgstr "The TDE mediamanager is not running."
@@ -55,7 +54,7 @@ msgstr "The TDE mediamanager is not running."
msgid "This media name already exists."
msgstr "This media name already exists."
-#: mediaimpl.cpp:230 mediaimpl.cpp:293
+#: mediaimpl.cpp:230 mediaimpl.cpp:297
msgid "No such medium."
msgstr ""
@@ -63,320 +62,328 @@ msgstr ""
msgid "The drive is encrypted."
msgstr ""
-#: mediaimpl.cpp:272 mediamanager/halbackend.cpp:1264
-#: mediamanager/halbackend.cpp:1273 mediamanager/halbackend.cpp:1663
-#: mediamanager/halbackend.cpp:1680 mediamanager/halbackend.cpp:1691
-#: mediamanager/halbackend.cpp:1793 mediamanager/halbackend.cpp:1801
-#: mediamanager/halbackend.cpp:1808 mediamanager/halbackend.cpp:1848
-#: mediamanager/halbackend.cpp:1854 mediamanager/halbackend.cpp:1861
-#: mounthelper/tdeio_media_mounthelper.cpp:58
-msgid "Internal Error"
+#: mediaimpl.cpp:274 mediamanager/tdehardwarebackend.cpp:201
+#: mediamanager/tdehardwarebackend.cpp:252
+#: mounthelper/tdeio_media_mounthelper.cpp:202
+msgid "Unknown mount error."
msgstr ""
#: mediamanager/dialog.cpp:26 mounthelper/dialog.cpp:26
-msgid "Decrypt"
+msgid "Unlock"
msgstr ""
-#: mediamanager/fstabbackend.cpp:104 mediamanager/fstabbackend.cpp:114
-#: mediamanager/halbackend.cpp:1595 mediamanager/halbackend.cpp:1617
-#: mediamanager/halbackend.cpp:1776 mediamanager/halbackend.cpp:1831
-#: mediamanager/tdehardwarebackend.cpp:1349
-#: mediamanager/tdehardwarebackend.cpp:1360
+#: mediamanager/fstabbackend.cpp:105 mediamanager/fstabbackend.cpp:120
+#: mediamanager/halbackend.cpp:1598 mediamanager/halbackend.cpp:1625
+#: mediamanager/halbackend.cpp:1808 mediamanager/halbackend.cpp:1877
+#: mediamanager/mediamanager.cpp:363 mediamanager/mediamanager.cpp:375
+#: mediamanager/mediamanager.cpp:387 mediamanager/mediamanager.cpp:399
+#: mediamanager/tdehardwarebackend.cpp:1363
+#: mediamanager/tdehardwarebackend.cpp:1378
#, c-format
msgid "No such medium: %1"
msgstr ""
-#: mediamanager/fstabbackend.cpp:398
+#: mediamanager/fstabbackend.cpp:408
msgid "CD Recorder"
msgstr "CD Recorder"
-#: mediamanager/fstabbackend.cpp:404
+#: mediamanager/fstabbackend.cpp:414
msgid "DVD"
msgstr "DVD"
-#: mediamanager/fstabbackend.cpp:415
+#: mediamanager/fstabbackend.cpp:425
msgid "CD-ROM"
msgstr "CD-ROM"
-#: mediamanager/fstabbackend.cpp:428
+#: mediamanager/fstabbackend.cpp:438
msgid "Floppy"
msgstr "Floppy"
-#: mediamanager/fstabbackend.cpp:436
+#: mediamanager/fstabbackend.cpp:446
msgid "Zip Disk"
msgstr "Zip Disk"
-#: mediamanager/fstabbackend.cpp:447
+#: mediamanager/fstabbackend.cpp:457
msgid "Removable Device"
msgstr "Removable Device"
-#: mediamanager/fstabbackend.cpp:452 mediamanager/fstabbackend.cpp:458
+#: mediamanager/fstabbackend.cpp:462 mediamanager/fstabbackend.cpp:468
msgid "Remote Share"
msgstr "Remote Share"
-#: mediamanager/fstabbackend.cpp:463
+#: mediamanager/fstabbackend.cpp:473
msgid "Hard Disk"
msgstr "Hard Disk"
-#: mediamanager/halbackend.cpp:749 mediamanager/tdehardwarebackend.cpp:805
+#: mediamanager/halbackend.cpp:744 mediamanager/tdehardwarebackend.cpp:808
#, fuzzy
msgid "Unknown Drive"
msgstr "Unknown"
-#: mediamanager/halbackend.cpp:761 mediamanager/tdehardwarebackend.cpp:835
+#: mediamanager/halbackend.cpp:756 mediamanager/tdehardwarebackend.cpp:838
#, fuzzy
msgid "Floppy Drive"
msgstr "Floppy"
-#: mediamanager/halbackend.cpp:769
+#: mediamanager/halbackend.cpp:764
#, fuzzy
msgid "Zip Drive"
msgstr "Zip Disk"
-#: mediamanager/halbackend.cpp:839 mediamanager/tdehardwarebackend.cpp:892
+#: mediamanager/halbackend.cpp:834 mediamanager/tdehardwarebackend.cpp:895
msgid "Camera"
msgstr "Camera"
-#: mediamanager/halbackend.cpp:1221 mediamanager/halbackend.cpp:1247
+#: mediamanager/halbackend.cpp:1216 mediamanager/halbackend.cpp:1242
msgid "Authenticate"
msgstr ""
-#: mediamanager/halbackend.cpp:1222
+#: mediamanager/halbackend.cpp:1217
msgid ""
"<big><b>System policy prevents mounting internal media</b></big><br/"
">Authentication is required to perform this action. Please enter your "
"password to verify."
msgstr ""
-#: mediamanager/halbackend.cpp:1248
+#: mediamanager/halbackend.cpp:1243
msgid ""
"<big><b>System policy prevents unmounting media mounted by other users</b></"
"big><br/>Authentication is required to perform this action. Please enter "
"your password to verify."
msgstr ""
-#: mediamanager/halbackend.cpp:1284
+#: mediamanager/halbackend.cpp:1259 mediamanager/halbackend.cpp:1268
+#: mediamanager/halbackend.cpp:1849 mediamanager/halbackend.cpp:1916
+#: mounthelper/tdeio_media_mounthelper.cpp:58
+msgid "Internal Error"
+msgstr ""
+
+#: mediamanager/halbackend.cpp:1279
msgid "Invalid filesystem type"
msgstr ""
-#: mediamanager/halbackend.cpp:1286
+#: mediamanager/halbackend.cpp:1281
msgid ""
"Permission denied<p>Please ensure that:<br>1. You have permission to access "
"this device.<br>2. This device node is not listed in /etc/fstab.</p>"
msgstr ""
-#: mediamanager/halbackend.cpp:1290
+#: mediamanager/halbackend.cpp:1285
msgid "Device is already mounted."
msgstr ""
-#: mediamanager/halbackend.cpp:1340
+#: mediamanager/halbackend.cpp:1335
msgid ""
"Moreover, programs still using the device have been detected. They are "
"listed below. You have to close them or change their working directory "
"before attempting to unmount the device again."
msgstr ""
-#: mediamanager/halbackend.cpp:1381 mediamanager/tdehardwarebackend.cpp:1588
+#: mediamanager/halbackend.cpp:1376 mediamanager/tdehardwarebackend.cpp:1618
msgid ""
"Programs that were still using the device have been forcibly terminated. "
"They are listed below."
msgstr ""
-#: mediamanager/halbackend.cpp:1402 mediamanager/halbackend.cpp:1715
-#: mediamanager/tdehardwarebackend.cpp:1406
-#: mediamanager/tdehardwarebackend.cpp:1424
-#: mediamanager/tdehardwarebackend.cpp:1464
+#: mediamanager/halbackend.cpp:1397 mediamanager/halbackend.cpp:1742
+#: mediamanager/tdehardwarebackend.cpp:1430
+#: mediamanager/tdehardwarebackend.cpp:1452
+#: mediamanager/tdehardwarebackend.cpp:1494
msgid ""
"Unfortunately, the device <b>%1</b> (%2) named <b>'%3'</b> and currently "
"mounted at <b>%4</b> could not be unmounted. "
msgstr ""
-#: mediamanager/halbackend.cpp:1408 mediamanager/tdehardwarebackend.cpp:1470
+#: mediamanager/halbackend.cpp:1403 mediamanager/tdehardwarebackend.cpp:1500
msgid "The following error was returned by umount command:"
msgstr ""
-#: mediamanager/halbackend.cpp:1478
-msgid "Permission denied"
+#: mediamanager/halbackend.cpp:1567 mediamanager/tdehardwarebackend.cpp:1322
+msgid "Cannot mount encrypted locked drives!"
msgstr ""
-#: mediamanager/halbackend.cpp:1562 mediamanager/tdehardwarebackend.cpp:1232
-msgid "Cannot mount encrypted drives!"
+#: mediamanager/halbackend.cpp:1682 mediamanager/halbackend.cpp:1703
+#: mediamanager/halbackend.cpp:1716 mediamanager/halbackend.cpp:1830
+#: mediamanager/halbackend.cpp:1840 mediamanager/halbackend.cpp:1899
+#: mediamanager/halbackend.cpp:1907
+msgid "Internal error"
msgstr ""
-#: mediamanager/halbackend.cpp:1721
+#: mediamanager/halbackend.cpp:1694
+#, fuzzy
+#| msgid "Unknown"
+msgid "Unknown error"
+msgstr "Unknown"
+
+#: mediamanager/halbackend.cpp:1748
msgid "Unmounting failed due to the following error:"
msgstr ""
-#: mediamanager/halbackend.cpp:1723
+#: mediamanager/halbackend.cpp:1750
msgid "Device is Busy:"
msgstr ""
-#: mediamanager/halbackend.cpp:1727
+#: mediamanager/halbackend.cpp:1754
msgid ""
"Permission denied<p>Please ensure that:<br>1. You have permission to access "
"this device.<br>2. This device was originally mounted using TDE.</p>"
msgstr ""
-#: mediamanager/halbackend.cpp:1739
+#: mediamanager/halbackend.cpp:1766
msgid ""
"%1<p><b>Would you like to forcibly terminate these processes?</b><br><i>All "
"unsaved data would be lost</i>"
msgstr ""
-#: mediamanager/halbackend.cpp:1811
+#: mediamanager/halbackend.cpp:1852
msgid "Wrong password"
msgstr ""
-#: mediamanager/mediamanager.cpp:247 mediamanager/mediamanager.cpp:266
-#: mediamanager/mediamanager.cpp:285 mediamanager/mediamanager.cpp:293
-#: mediamanager/mediamanager.cpp:302 mediamanager/mediamanager.cpp:310
-msgid "Feature only available with HAL"
+#: mediamanager/mediamanager.cpp:248 mediamanager/mediamanager.cpp:275
+msgid "Feature only available with the TDE hardware backend"
msgstr ""
-#: mediamanager/mediamanager.cpp:252
-msgid "Feature only available with the TDE hardware backend"
+#: mediamanager/mediamanager.cpp:255 mediamanager/mediamanager.cpp:282
+#: mediamanager/mediamanager.cpp:312 mediamanager/mediamanager.cpp:343
+msgid "Feature only available with HAL"
msgstr ""
-#: mediamanager/mediamanager.cpp:256 mediamanager/mediamanager.cpp:271
-#: mediamanager/mediamanager.cpp:275
+#: mediamanager/mediamanager.cpp:262 mediamanager/mediamanager.cpp:289
+#: mediamanager/mediamanager.cpp:320 mediamanager/mediamanager.cpp:350
msgid "Feature only available with HAL or TDE hardware backend"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:480
-#: mediamanager/tdehardwarebackend.cpp:517
-#: mediamanager/tdehardwarebackend.cpp:750
+#: mediamanager/tdehardwarebackend.cpp:483
+#: mediamanager/tdehardwarebackend.cpp:520
+#: mediamanager/tdehardwarebackend.cpp:753
#, fuzzy
msgid "%1 Removable Device"
msgstr "Removable Device"
-#: mediamanager/tdehardwarebackend.cpp:525
+#: mediamanager/tdehardwarebackend.cpp:528
#, fuzzy
msgid "Blank CD-ROM"
msgstr "CD-ROM"
-#: mediamanager/tdehardwarebackend.cpp:534
+#: mediamanager/tdehardwarebackend.cpp:537
msgid "Blank CD-R"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:543
+#: mediamanager/tdehardwarebackend.cpp:546
msgid "Blank CD-RW"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:552
+#: mediamanager/tdehardwarebackend.cpp:555
msgid "Blank Magneto-Optical CD"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:561
+#: mediamanager/tdehardwarebackend.cpp:564
msgid "Blank Mount Ranier CD-RW"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:570
+#: mediamanager/tdehardwarebackend.cpp:573
msgid "Blank Mount Ranier CD-RW-W"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:579
+#: mediamanager/tdehardwarebackend.cpp:582
msgid "Blank DVD-ROM"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:588
+#: mediamanager/tdehardwarebackend.cpp:591
msgid "Blank DVD-RAM"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:597
+#: mediamanager/tdehardwarebackend.cpp:600
msgid "Blank DVD-R"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:606
+#: mediamanager/tdehardwarebackend.cpp:609
msgid "Blank DVD-RW"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:615
+#: mediamanager/tdehardwarebackend.cpp:618
msgid "Blank Dual Layer DVD-R"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:624
+#: mediamanager/tdehardwarebackend.cpp:627
msgid "Blank Dual Layer DVD-RW"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:633
+#: mediamanager/tdehardwarebackend.cpp:636
msgid "Blank DVD+R"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:642
+#: mediamanager/tdehardwarebackend.cpp:645
msgid "Blank DVD+RW"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:651
+#: mediamanager/tdehardwarebackend.cpp:654
msgid "Blank Dual Layer DVD+R"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:660
+#: mediamanager/tdehardwarebackend.cpp:663
msgid "Blank Dual Layer DVD+RW"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:669
+#: mediamanager/tdehardwarebackend.cpp:672
msgid "Blank BD-ROM"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:678
+#: mediamanager/tdehardwarebackend.cpp:681
msgid "Blank BD-R"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:687
+#: mediamanager/tdehardwarebackend.cpp:690
msgid "Blank BD-RW"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:696
+#: mediamanager/tdehardwarebackend.cpp:699
msgid "Blank HDDVD-ROM"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:705
+#: mediamanager/tdehardwarebackend.cpp:708
msgid "Blank HDDVD-R"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:714
+#: mediamanager/tdehardwarebackend.cpp:717
msgid "Blank HDDVD-RW"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:721
+#: mediamanager/tdehardwarebackend.cpp:724
msgid "Audio CD"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:742
+#: mediamanager/tdehardwarebackend.cpp:745
msgid "%1 Fixed Disk (%2)"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:849
+#: mediamanager/tdehardwarebackend.cpp:852
#, fuzzy
msgid "%1 Zip Disk"
msgstr "Zip Disk"
-#: mediamanager/tdehardwarebackend.cpp:1212
-#: mediamanager/tdehardwarebackend.cpp:1392
-msgid "Internal error"
+#: mediamanager/tdehardwarebackend.cpp:1224
+#: mediamanager/tdehardwarebackend.cpp:1417
+msgid "Internal error. Couldn't find medium."
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:1239
-msgid ""
-"<qt>Unable to mount this device.<p>Potential reasons include:<br>Improper "
-"device and/or user privilege level<br>Corrupt data on storage device"
+#: mediamanager/tdehardwarebackend.cpp:1249
+#: mediamanager/tdehardwarebackend.cpp:1323
+msgid "Unable to mount this device."
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:1241
-#: mediamanager/tdehardwarebackend.cpp:1316
-#: mediamanager/tdehardwarebackend.cpp:1408
-#: mediamanager/tdehardwarebackend.cpp:1426
+#: mediamanager/tdehardwarebackend.cpp:1252
+#: mediamanager/tdehardwarebackend.cpp:1326
+#: mediamanager/tdehardwarebackend.cpp:1435
+#: mediamanager/tdehardwarebackend.cpp:1457
msgid "<p>Technical details:<br>"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:1314
-msgid ""
-"<qt>Unable to mount this device.<p>Potential reasons include:<br>Improper "
-"device and/or user privilege level<br>Corrupt data on storage "
-"device<br>Incorrect encryption password"
+#: mediamanager/tdehardwarebackend.cpp:1284
+msgid "Decryption aborted"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:1420
+#: mediamanager/tdehardwarebackend.cpp:1443
msgid ""
"<qt>The device <b>%1</b> (%2) named <b>'%3'</b> and currently mounted at <b>"
"%4</b> can not be unmounted at this time.<p>%5<p><b>Would you like to "
@@ -384,7 +391,7 @@ msgid ""
"lost</i>"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:1547
+#: mediamanager/tdehardwarebackend.cpp:1577
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 "
@@ -395,7 +402,7 @@ msgstr ""
msgid "%1 cannot be found."
msgstr "%1 cannot be found."
-#: mounthelper/tdeio_media_mounthelper.cpp:86
+#: mounthelper/tdeio_media_mounthelper.cpp:87
msgid "%1 is not a mountable media."
msgstr "%1 is not a mountable media."
@@ -405,39 +412,47 @@ msgid "%1 is not an encrypted media."
msgstr "%1 is not a mountable media."
#: mounthelper/tdeio_media_mounthelper.cpp:107
-msgid "%1 is already decrypted."
+msgid "%1 is already unlocked."
msgstr ""
-#: mounthelper/tdeio_media_mounthelper.cpp:228
+#: mounthelper/tdeio_media_mounthelper.cpp:139
+msgid "Unknown unmount error."
+msgstr ""
+
+#: mounthelper/tdeio_media_mounthelper.cpp:246
msgid "The device was successfully unmounted, but the tray could not be opened"
msgstr ""
-#: mounthelper/tdeio_media_mounthelper.cpp:230
+#: mounthelper/tdeio_media_mounthelper.cpp:248
msgid "The device was successfully unmounted, but could not be ejected"
msgstr ""
-#: mounthelper/tdeio_media_mounthelper.cpp:275
+#: mounthelper/tdeio_media_mounthelper.cpp:281
+msgid "Unknown decrypt error."
+msgstr ""
+
+#: mounthelper/tdeio_media_mounthelper.cpp:295
#, fuzzy
msgid "Decrypt given URL"
msgstr "Unmount given URL"
-#: mounthelper/tdeio_media_mounthelper.cpp:276
+#: mounthelper/tdeio_media_mounthelper.cpp:296
msgid "Unmount given URL"
msgstr "Unmount given URL"
-#: mounthelper/tdeio_media_mounthelper.cpp:277
+#: mounthelper/tdeio_media_mounthelper.cpp:297
msgid "Mount given URL (default)"
msgstr "Mount given URL (default)"
-#: mounthelper/tdeio_media_mounthelper.cpp:278
+#: mounthelper/tdeio_media_mounthelper.cpp:298
msgid "Eject given URL via tdeeject"
msgstr "Eject given URL via tdeeject"
-#: mounthelper/tdeio_media_mounthelper.cpp:279
+#: mounthelper/tdeio_media_mounthelper.cpp:299
msgid "Unmount and Eject given URL (necessary for some USB devices)"
msgstr "Unmount and Eject given URL (necessary for some USB devices)"
-#: mounthelper/tdeio_media_mounthelper.cpp:280
+#: mounthelper/tdeio_media_mounthelper.cpp:300
msgid "media:/ URL to mount/unmount/eject/remove"
msgstr "media:/ URL to mount/unmount/eject/remove"
@@ -459,43 +474,43 @@ msgstr ""
msgid "&Mounting"
msgstr "Mount Point"
-#: tdefile-plugin/tdefilemediaplugin.cpp:190
+#: tdefile-plugin/tdefilemediaplugin.cpp:184
msgid "Medium Information"
msgstr "Medium Information"
-#: tdefile-plugin/tdefilemediaplugin.cpp:193
+#: tdefile-plugin/tdefilemediaplugin.cpp:187
msgid "Free"
msgstr "Free"
-#: tdefile-plugin/tdefilemediaplugin.cpp:196
+#: tdefile-plugin/tdefilemediaplugin.cpp:190
msgid "Used"
msgstr "Used"
-#: tdefile-plugin/tdefilemediaplugin.cpp:199
+#: tdefile-plugin/tdefilemediaplugin.cpp:193
msgid "Total"
msgstr "Total"
-#: tdefile-plugin/tdefilemediaplugin.cpp:202
+#: tdefile-plugin/tdefilemediaplugin.cpp:196
msgid "Base URL"
msgstr "Base URL"
-#: tdefile-plugin/tdefilemediaplugin.cpp:203
+#: tdefile-plugin/tdefilemediaplugin.cpp:197
msgid "Mount Point"
msgstr "Mount Point"
-#: tdefile-plugin/tdefilemediaplugin.cpp:204
+#: tdefile-plugin/tdefilemediaplugin.cpp:198
msgid "Device Node"
msgstr "Device Node"
-#: tdefile-plugin/tdefilemediaplugin.cpp:206
+#: tdefile-plugin/tdefilemediaplugin.cpp:200
msgid "Medium Summary"
msgstr "Medium Summary"
-#: tdefile-plugin/tdefilemediaplugin.cpp:208
+#: tdefile-plugin/tdefilemediaplugin.cpp:202
msgid "Usage"
msgstr "Usage"
-#: tdefile-plugin/tdefilemediaplugin.cpp:210
+#: tdefile-plugin/tdefilemediaplugin.cpp:204
msgid "Bar Graph"
msgstr "Bar Graph"
@@ -567,23 +582,30 @@ msgid ""
"devices are plugged in."
msgstr ""
-#: mediamanager/decryptdialog.ui:24 mounthelper/decryptdialog.ui:24
+#: mediamanager/unlockdialog.ui:24 mounthelper/unlockdialog.ui:24
#, no-c-format
msgid "Decrypting Storage Device"
msgstr ""
-#: mediamanager/decryptdialog.ui:109 mounthelper/decryptdialog.ui:109
+#: mediamanager/unlockdialog.ui:109
#, no-c-format
msgid ""
-"<p><b>%1</b> is an encrypted storage device.</p>\n"
-"<p>Please enter the password to decrypt the storage device.</p>"
+"<p><b>%1</b> is an encrypted locked storage device.</p>\n"
+"<p>Please enter the password to unlock the storage device.</p>"
msgstr ""
-#: mediamanager/decryptdialog.ui:131 mounthelper/decryptdialog.ui:131
+#: mediamanager/unlockdialog.ui:131 mounthelper/unlockdialog.ui:131
#, no-c-format
msgid "&Password:"
msgstr ""
+#: mounthelper/unlockdialog.ui:109
+#, no-c-format
+msgid ""
+"<p><b>%1</b> is an encrypted storage device.</p>\n"
+"<p>Please enter the password to decrypt the storage device.</p>"
+msgstr ""
+
#: propsdlgplugin/propertiespagegui.ui:16
#, no-c-format
msgid "PropertiesPageGUI"
diff --git a/tde-i18n-eo/messages/tdebase/tdeio_media.po b/tde-i18n-eo/messages/tdebase/tdeio_media.po
index 29d29195cb0..0697160eecf 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: 2019-01-13 18:47+0100\n"
+"POT-Creation-Date: 2019-07-11 02:33+0200\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"
@@ -45,7 +45,6 @@ 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
-#: mounthelper/tdeio_media_mounthelper.cpp:256
msgid "The TDE mediamanager is not running."
msgstr "La TDE datumportila administrilo ne estas lanĉita."
@@ -53,7 +52,7 @@ msgstr "La TDE datumportila administrilo ne estas lanĉita."
msgid "This media name already exists."
msgstr "Ĉi tiu datumportila nomo jam ekzistas."
-#: mediaimpl.cpp:230 mediaimpl.cpp:293
+#: mediaimpl.cpp:230 mediaimpl.cpp:297
msgid "No such medium."
msgstr "Nenia datumportilo."
@@ -61,113 +60,117 @@ msgstr "Nenia datumportilo."
msgid "The drive is encrypted."
msgstr ""
-#: mediaimpl.cpp:272 mediamanager/halbackend.cpp:1264
-#: mediamanager/halbackend.cpp:1273 mediamanager/halbackend.cpp:1663
-#: mediamanager/halbackend.cpp:1680 mediamanager/halbackend.cpp:1691
-#: mediamanager/halbackend.cpp:1793 mediamanager/halbackend.cpp:1801
-#: mediamanager/halbackend.cpp:1808 mediamanager/halbackend.cpp:1848
-#: mediamanager/halbackend.cpp:1854 mediamanager/halbackend.cpp:1861
-#: mounthelper/tdeio_media_mounthelper.cpp:58
-msgid "Internal Error"
-msgstr "Interna Eraro"
+#: mediaimpl.cpp:274 mediamanager/tdehardwarebackend.cpp:201
+#: mediamanager/tdehardwarebackend.cpp:252
+#: mounthelper/tdeio_media_mounthelper.cpp:202
+msgid "Unknown mount error."
+msgstr ""
#: mediamanager/dialog.cpp:26 mounthelper/dialog.cpp:26
-msgid "Decrypt"
+msgid "Unlock"
msgstr ""
-#: mediamanager/fstabbackend.cpp:104 mediamanager/fstabbackend.cpp:114
-#: mediamanager/halbackend.cpp:1595 mediamanager/halbackend.cpp:1617
-#: mediamanager/halbackend.cpp:1776 mediamanager/halbackend.cpp:1831
-#: mediamanager/tdehardwarebackend.cpp:1349
-#: mediamanager/tdehardwarebackend.cpp:1360
+#: mediamanager/fstabbackend.cpp:105 mediamanager/fstabbackend.cpp:120
+#: mediamanager/halbackend.cpp:1598 mediamanager/halbackend.cpp:1625
+#: mediamanager/halbackend.cpp:1808 mediamanager/halbackend.cpp:1877
+#: mediamanager/mediamanager.cpp:363 mediamanager/mediamanager.cpp:375
+#: mediamanager/mediamanager.cpp:387 mediamanager/mediamanager.cpp:399
+#: mediamanager/tdehardwarebackend.cpp:1363
+#: mediamanager/tdehardwarebackend.cpp:1378
#, c-format
msgid "No such medium: %1"
msgstr "Nenia datumportilo: %1"
-#: mediamanager/fstabbackend.cpp:398
+#: mediamanager/fstabbackend.cpp:408
msgid "CD Recorder"
msgstr "LD Presilo"
-#: mediamanager/fstabbackend.cpp:404
+#: mediamanager/fstabbackend.cpp:414
msgid "DVD"
msgstr "DVD"
-#: mediamanager/fstabbackend.cpp:415
+#: mediamanager/fstabbackend.cpp:425
msgid "CD-ROM"
msgstr "Nurlegebla LD"
-#: mediamanager/fstabbackend.cpp:428
+#: mediamanager/fstabbackend.cpp:438
msgid "Floppy"
msgstr "Disketo"
-#: mediamanager/fstabbackend.cpp:436
+#: mediamanager/fstabbackend.cpp:446
msgid "Zip Disk"
msgstr "Zip-Disko"
-#: mediamanager/fstabbackend.cpp:447
+#: mediamanager/fstabbackend.cpp:457
msgid "Removable Device"
msgstr "Demetebla Disponaĵo"
-#: mediamanager/fstabbackend.cpp:452 mediamanager/fstabbackend.cpp:458
+#: mediamanager/fstabbackend.cpp:462 mediamanager/fstabbackend.cpp:468
msgid "Remote Share"
msgstr "Fora Opuzaĵo"
-#: mediamanager/fstabbackend.cpp:463
+#: mediamanager/fstabbackend.cpp:473
msgid "Hard Disk"
msgstr "Fiksita Disko"
-#: mediamanager/halbackend.cpp:749 mediamanager/tdehardwarebackend.cpp:805
+#: mediamanager/halbackend.cpp:744 mediamanager/tdehardwarebackend.cpp:808
#, fuzzy
msgid "Unknown Drive"
msgstr "Nekonata"
-#: mediamanager/halbackend.cpp:761 mediamanager/tdehardwarebackend.cpp:835
+#: mediamanager/halbackend.cpp:756 mediamanager/tdehardwarebackend.cpp:838
#, fuzzy
msgid "Floppy Drive"
msgstr "Disketo"
-#: mediamanager/halbackend.cpp:769
+#: mediamanager/halbackend.cpp:764
#, fuzzy
msgid "Zip Drive"
msgstr "Zip-Disko"
-#: mediamanager/halbackend.cpp:839 mediamanager/tdehardwarebackend.cpp:892
+#: mediamanager/halbackend.cpp:834 mediamanager/tdehardwarebackend.cpp:895
msgid "Camera"
msgstr "Kamero"
-#: mediamanager/halbackend.cpp:1221 mediamanager/halbackend.cpp:1247
+#: mediamanager/halbackend.cpp:1216 mediamanager/halbackend.cpp:1242
msgid "Authenticate"
msgstr ""
-#: mediamanager/halbackend.cpp:1222
+#: mediamanager/halbackend.cpp:1217
msgid ""
"<big><b>System policy prevents mounting internal media</b></big><br/"
">Authentication is required to perform this action. Please enter your "
"password to verify."
msgstr ""
-#: mediamanager/halbackend.cpp:1248
+#: mediamanager/halbackend.cpp:1243
msgid ""
"<big><b>System policy prevents unmounting media mounted by other users</b></"
"big><br/>Authentication is required to perform this action. Please enter "
"your password to verify."
msgstr ""
-#: mediamanager/halbackend.cpp:1284
+#: mediamanager/halbackend.cpp:1259 mediamanager/halbackend.cpp:1268
+#: mediamanager/halbackend.cpp:1849 mediamanager/halbackend.cpp:1916
+#: mounthelper/tdeio_media_mounthelper.cpp:58
+msgid "Internal Error"
+msgstr "Interna Eraro"
+
+#: mediamanager/halbackend.cpp:1279
msgid "Invalid filesystem type"
msgstr "Nevalida dosiersistema speco"
-#: mediamanager/halbackend.cpp:1286
+#: mediamanager/halbackend.cpp:1281
msgid ""
"Permission denied<p>Please ensure that:<br>1. You have permission to access "
"this device.<br>2. This device node is not listed in /etc/fstab.</p>"
msgstr ""
-#: mediamanager/halbackend.cpp:1290
+#: mediamanager/halbackend.cpp:1285
msgid "Device is already mounted."
msgstr "Disponaĵo jam estas surmetita."
-#: mediamanager/halbackend.cpp:1340
+#: mediamanager/halbackend.cpp:1335
msgid ""
"Moreover, programs still using the device have been detected. They are "
"listed below. You have to close them or change their working directory "
@@ -177,16 +180,16 @@ msgstr ""
"devas aŭ fermi ilin aŭ ŝanĝi la kurantan dosierujon antaŭ ol vi povas demeti "
"la disponaĵon."
-#: mediamanager/halbackend.cpp:1381 mediamanager/tdehardwarebackend.cpp:1588
+#: mediamanager/halbackend.cpp:1376 mediamanager/tdehardwarebackend.cpp:1618
msgid ""
"Programs that were still using the device have been forcibly terminated. "
"They are listed below."
msgstr ""
-#: mediamanager/halbackend.cpp:1402 mediamanager/halbackend.cpp:1715
-#: mediamanager/tdehardwarebackend.cpp:1406
-#: mediamanager/tdehardwarebackend.cpp:1424
-#: mediamanager/tdehardwarebackend.cpp:1464
+#: mediamanager/halbackend.cpp:1397 mediamanager/halbackend.cpp:1742
+#: mediamanager/tdehardwarebackend.cpp:1430
+#: mediamanager/tdehardwarebackend.cpp:1452
+#: mediamanager/tdehardwarebackend.cpp:1494
msgid ""
"Unfortunately, the device <b>%1</b> (%2) named <b>'%3'</b> and currently "
"mounted at <b>%4</b> could not be unmounted. "
@@ -194,196 +197,199 @@ 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:1408 mediamanager/tdehardwarebackend.cpp:1470
+#: mediamanager/halbackend.cpp:1403 mediamanager/tdehardwarebackend.cpp:1500
msgid "The following error was returned by umount command:"
msgstr "La jena eraro estis liverita de la demeta komando:"
-#: mediamanager/halbackend.cpp:1478
+#: mediamanager/halbackend.cpp:1567 mediamanager/tdehardwarebackend.cpp:1322
+msgid "Cannot mount encrypted locked drives!"
+msgstr ""
+
+#: mediamanager/halbackend.cpp:1682 mediamanager/halbackend.cpp:1703
+#: mediamanager/halbackend.cpp:1716 mediamanager/halbackend.cpp:1830
+#: mediamanager/halbackend.cpp:1840 mediamanager/halbackend.cpp:1899
+#: mediamanager/halbackend.cpp:1907
#, fuzzy
-msgid "Permission denied"
-msgstr "Permesoj malpermesitaj"
+msgid "Internal error"
+msgstr "Interna Eraro"
-#: mediamanager/halbackend.cpp:1562 mediamanager/tdehardwarebackend.cpp:1232
-msgid "Cannot mount encrypted drives!"
-msgstr ""
+#: mediamanager/halbackend.cpp:1694
+#, fuzzy
+#| msgid "Unknown"
+msgid "Unknown error"
+msgstr "Nekonata"
-#: mediamanager/halbackend.cpp:1721
+#: mediamanager/halbackend.cpp:1748
msgid "Unmounting failed due to the following error:"
msgstr "La demeto malsuksecis pro la sekvanta eraro:"
-#: mediamanager/halbackend.cpp:1723
+#: mediamanager/halbackend.cpp:1750
msgid "Device is Busy:"
msgstr "Disponaĵo estas Okupata:"
-#: mediamanager/halbackend.cpp:1727
+#: mediamanager/halbackend.cpp:1754
msgid ""
"Permission denied<p>Please ensure that:<br>1. You have permission to access "
"this device.<br>2. This device was originally mounted using TDE.</p>"
msgstr ""
-#: mediamanager/halbackend.cpp:1739
+#: mediamanager/halbackend.cpp:1766
msgid ""
"%1<p><b>Would you like to forcibly terminate these processes?</b><br><i>All "
"unsaved data would be lost</i>"
msgstr ""
-#: mediamanager/halbackend.cpp:1811
+#: mediamanager/halbackend.cpp:1852
msgid "Wrong password"
msgstr ""
-#: mediamanager/mediamanager.cpp:247 mediamanager/mediamanager.cpp:266
-#: mediamanager/mediamanager.cpp:285 mediamanager/mediamanager.cpp:293
-#: mediamanager/mediamanager.cpp:302 mediamanager/mediamanager.cpp:310
-msgid "Feature only available with HAL"
-msgstr "Ebleco disponebla nur kun HAL"
-
-#: mediamanager/mediamanager.cpp:252
+#: mediamanager/mediamanager.cpp:248 mediamanager/mediamanager.cpp:275
#, fuzzy
msgid "Feature only available with the TDE hardware backend"
msgstr "Ebleco disponebla nur kun HAL"
-#: mediamanager/mediamanager.cpp:256 mediamanager/mediamanager.cpp:271
-#: mediamanager/mediamanager.cpp:275
+#: mediamanager/mediamanager.cpp:255 mediamanager/mediamanager.cpp:282
+#: mediamanager/mediamanager.cpp:312 mediamanager/mediamanager.cpp:343
+msgid "Feature only available with HAL"
+msgstr "Ebleco disponebla nur kun HAL"
+
+#: mediamanager/mediamanager.cpp:262 mediamanager/mediamanager.cpp:289
+#: mediamanager/mediamanager.cpp:320 mediamanager/mediamanager.cpp:350
#, fuzzy
msgid "Feature only available with HAL or TDE hardware backend"
msgstr "Ebleco disponebla nur kun HAL"
-#: mediamanager/tdehardwarebackend.cpp:480
-#: mediamanager/tdehardwarebackend.cpp:517
-#: mediamanager/tdehardwarebackend.cpp:750
+#: mediamanager/tdehardwarebackend.cpp:483
+#: mediamanager/tdehardwarebackend.cpp:520
+#: mediamanager/tdehardwarebackend.cpp:753
#, fuzzy
msgid "%1 Removable Device"
msgstr "Demetebla Disponaĵo"
-#: mediamanager/tdehardwarebackend.cpp:525
+#: mediamanager/tdehardwarebackend.cpp:528
#, fuzzy
msgid "Blank CD-ROM"
msgstr "Nurlegebla LD"
-#: mediamanager/tdehardwarebackend.cpp:534
+#: mediamanager/tdehardwarebackend.cpp:537
msgid "Blank CD-R"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:543
+#: mediamanager/tdehardwarebackend.cpp:546
msgid "Blank CD-RW"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:552
+#: mediamanager/tdehardwarebackend.cpp:555
msgid "Blank Magneto-Optical CD"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:561
+#: mediamanager/tdehardwarebackend.cpp:564
msgid "Blank Mount Ranier CD-RW"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:570
+#: mediamanager/tdehardwarebackend.cpp:573
msgid "Blank Mount Ranier CD-RW-W"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:579
+#: mediamanager/tdehardwarebackend.cpp:582
msgid "Blank DVD-ROM"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:588
+#: mediamanager/tdehardwarebackend.cpp:591
msgid "Blank DVD-RAM"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:597
+#: mediamanager/tdehardwarebackend.cpp:600
msgid "Blank DVD-R"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:606
+#: mediamanager/tdehardwarebackend.cpp:609
msgid "Blank DVD-RW"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:615
+#: mediamanager/tdehardwarebackend.cpp:618
msgid "Blank Dual Layer DVD-R"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:624
+#: mediamanager/tdehardwarebackend.cpp:627
msgid "Blank Dual Layer DVD-RW"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:633
+#: mediamanager/tdehardwarebackend.cpp:636
msgid "Blank DVD+R"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:642
+#: mediamanager/tdehardwarebackend.cpp:645
msgid "Blank DVD+RW"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:651
+#: mediamanager/tdehardwarebackend.cpp:654
msgid "Blank Dual Layer DVD+R"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:660
+#: mediamanager/tdehardwarebackend.cpp:663
msgid "Blank Dual Layer DVD+RW"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:669
+#: mediamanager/tdehardwarebackend.cpp:672
msgid "Blank BD-ROM"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:678
+#: mediamanager/tdehardwarebackend.cpp:681
msgid "Blank BD-R"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:687
+#: mediamanager/tdehardwarebackend.cpp:690
msgid "Blank BD-RW"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:696
+#: mediamanager/tdehardwarebackend.cpp:699
msgid "Blank HDDVD-ROM"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:705
+#: mediamanager/tdehardwarebackend.cpp:708
msgid "Blank HDDVD-R"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:714
+#: mediamanager/tdehardwarebackend.cpp:717
msgid "Blank HDDVD-RW"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:721
+#: mediamanager/tdehardwarebackend.cpp:724
msgid "Audio CD"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:742
+#: mediamanager/tdehardwarebackend.cpp:745
msgid "%1 Fixed Disk (%2)"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:849
+#: mediamanager/tdehardwarebackend.cpp:852
#, fuzzy
msgid "%1 Zip Disk"
msgstr "Zip-Disko"
-#: mediamanager/tdehardwarebackend.cpp:1212
-#: mediamanager/tdehardwarebackend.cpp:1392
-#, fuzzy
-msgid "Internal error"
-msgstr "Interna Eraro"
+#: mediamanager/tdehardwarebackend.cpp:1224
+#: mediamanager/tdehardwarebackend.cpp:1417
+msgid "Internal error. Couldn't find medium."
+msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:1239
-msgid ""
-"<qt>Unable to mount this device.<p>Potential reasons include:<br>Improper "
-"device and/or user privilege level<br>Corrupt data on storage device"
+#: mediamanager/tdehardwarebackend.cpp:1249
+#: mediamanager/tdehardwarebackend.cpp:1323
+msgid "Unable to mount this device."
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:1241
-#: mediamanager/tdehardwarebackend.cpp:1316
-#: mediamanager/tdehardwarebackend.cpp:1408
-#: mediamanager/tdehardwarebackend.cpp:1426
+#: mediamanager/tdehardwarebackend.cpp:1252
+#: mediamanager/tdehardwarebackend.cpp:1326
+#: mediamanager/tdehardwarebackend.cpp:1435
+#: mediamanager/tdehardwarebackend.cpp:1457
msgid "<p>Technical details:<br>"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:1314
-msgid ""
-"<qt>Unable to mount this device.<p>Potential reasons include:<br>Improper "
-"device and/or user privilege level<br>Corrupt data on storage "
-"device<br>Incorrect encryption password"
+#: mediamanager/tdehardwarebackend.cpp:1284
+msgid "Decryption aborted"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:1420
+#: mediamanager/tdehardwarebackend.cpp:1443
msgid ""
"<qt>The device <b>%1</b> (%2) named <b>'%3'</b> and currently mounted at <b>"
"%4</b> can not be unmounted at this time.<p>%5<p><b>Would you like to "
@@ -391,7 +397,7 @@ msgid ""
"lost</i>"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:1547
+#: mediamanager/tdehardwarebackend.cpp:1577
#, fuzzy
msgid ""
"Programs still using the device have been detected. They are listed below. "
@@ -406,7 +412,7 @@ msgstr ""
msgid "%1 cannot be found."
msgstr "%1 ne povas esti trovita."
-#: mounthelper/tdeio_media_mounthelper.cpp:86
+#: mounthelper/tdeio_media_mounthelper.cpp:87
msgid "%1 is not a mountable media."
msgstr "%1 ne estas surmetebla disponaĵo."
@@ -417,40 +423,48 @@ msgstr "%1 ne estas surmetebla disponaĵo."
#: mounthelper/tdeio_media_mounthelper.cpp:107
#, fuzzy
-msgid "%1 is already decrypted."
+msgid "%1 is already unlocked."
msgstr "Disponaĵo jam estas surmetita."
-#: mounthelper/tdeio_media_mounthelper.cpp:228
+#: mounthelper/tdeio_media_mounthelper.cpp:139
+msgid "Unknown unmount error."
+msgstr ""
+
+#: mounthelper/tdeio_media_mounthelper.cpp:246
msgid "The device was successfully unmounted, but the tray could not be opened"
msgstr ""
"La disponaĵo ja estis demetita, tamen la diskpleto ne povas esti malfermita"
-#: mounthelper/tdeio_media_mounthelper.cpp:230
+#: 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:275
+#: mounthelper/tdeio_media_mounthelper.cpp:281
+msgid "Unknown decrypt error."
+msgstr ""
+
+#: mounthelper/tdeio_media_mounthelper.cpp:295
#, fuzzy
msgid "Decrypt given URL"
msgstr "Demeti nomitan URL-on"
-#: mounthelper/tdeio_media_mounthelper.cpp:276
+#: mounthelper/tdeio_media_mounthelper.cpp:296
msgid "Unmount given URL"
msgstr "Demeti nomitan URL-on"
-#: mounthelper/tdeio_media_mounthelper.cpp:277
+#: mounthelper/tdeio_media_mounthelper.cpp:297
msgid "Mount given URL (default)"
msgstr "Surmeti nomitan URL-on (defaŭlta ago)"
-#: mounthelper/tdeio_media_mounthelper.cpp:278
+#: mounthelper/tdeio_media_mounthelper.cpp:298
msgid "Eject given URL via tdeeject"
msgstr "Eligi nomitan URL-on per tdeeject"
-#: mounthelper/tdeio_media_mounthelper.cpp:279
+#: mounthelper/tdeio_media_mounthelper.cpp:299
msgid "Unmount and Eject given URL (necessary for some USB devices)"
msgstr "Demeti kaj Eligi nomitan URL-on (necesas por iom USB-datumportiloj)"
-#: mounthelper/tdeio_media_mounthelper.cpp:280
+#: mounthelper/tdeio_media_mounthelper.cpp:300
msgid "media:/ URL to mount/unmount/eject/remove"
msgstr "media:/ URL por surmeti/demeti/eligi/forigi"
@@ -471,43 +485,43 @@ msgstr "Malsukcesis konservi la ŝanĝojn"
msgid "&Mounting"
msgstr "&Surmeto"
-#: tdefile-plugin/tdefilemediaplugin.cpp:190
+#: tdefile-plugin/tdefilemediaplugin.cpp:184
msgid "Medium Information"
msgstr "Datumportila Informo"
-#: tdefile-plugin/tdefilemediaplugin.cpp:193
+#: tdefile-plugin/tdefilemediaplugin.cpp:187
msgid "Free"
msgstr "Disponebla"
-#: tdefile-plugin/tdefilemediaplugin.cpp:196
+#: tdefile-plugin/tdefilemediaplugin.cpp:190
msgid "Used"
msgstr "Plena"
-#: tdefile-plugin/tdefilemediaplugin.cpp:199
+#: tdefile-plugin/tdefilemediaplugin.cpp:193
msgid "Total"
msgstr "Ĉioma"
-#: tdefile-plugin/tdefilemediaplugin.cpp:202
+#: tdefile-plugin/tdefilemediaplugin.cpp:196
msgid "Base URL"
msgstr "Baza URL"
-#: tdefile-plugin/tdefilemediaplugin.cpp:203
+#: tdefile-plugin/tdefilemediaplugin.cpp:197
msgid "Mount Point"
msgstr "Surmetingo"
-#: tdefile-plugin/tdefilemediaplugin.cpp:204
+#: tdefile-plugin/tdefilemediaplugin.cpp:198
msgid "Device Node"
msgstr "Disponaĵa Nodo"
-#: tdefile-plugin/tdefilemediaplugin.cpp:206
+#: tdefile-plugin/tdefilemediaplugin.cpp:200
msgid "Medium Summary"
msgstr "Datumportila Resumo"
-#: tdefile-plugin/tdefilemediaplugin.cpp:208
+#: tdefile-plugin/tdefilemediaplugin.cpp:202
msgid "Usage"
msgstr "Uzado"
-#: tdefile-plugin/tdefilemediaplugin.cpp:210
+#: tdefile-plugin/tdefilemediaplugin.cpp:204
msgid "Bar Graph"
msgstr "Bastona Diagramo"
@@ -579,23 +593,30 @@ msgid ""
"devices are plugged in."
msgstr ""
-#: mediamanager/decryptdialog.ui:24 mounthelper/decryptdialog.ui:24
+#: mediamanager/unlockdialog.ui:24 mounthelper/unlockdialog.ui:24
#, no-c-format
msgid "Decrypting Storage Device"
msgstr ""
-#: mediamanager/decryptdialog.ui:109 mounthelper/decryptdialog.ui:109
+#: mediamanager/unlockdialog.ui:109
#, no-c-format
msgid ""
-"<p><b>%1</b> is an encrypted storage device.</p>\n"
-"<p>Please enter the password to decrypt the storage device.</p>"
+"<p><b>%1</b> is an encrypted locked storage device.</p>\n"
+"<p>Please enter the password to unlock the storage device.</p>"
msgstr ""
-#: mediamanager/decryptdialog.ui:131 mounthelper/decryptdialog.ui:131
+#: mediamanager/unlockdialog.ui:131 mounthelper/unlockdialog.ui:131
#, no-c-format
msgid "&Password:"
msgstr ""
+#: mounthelper/unlockdialog.ui:109
+#, no-c-format
+msgid ""
+"<p><b>%1</b> is an encrypted storage device.</p>\n"
+"<p>Please enter the password to decrypt the storage device.</p>"
+msgstr ""
+
#: propsdlgplugin/propertiespagegui.ui:16
#, no-c-format
msgid "PropertiesPageGUI"
@@ -858,3 +879,7 @@ msgstr "Miksita"
#, no-c-format
msgid "Filesystem: iso9660"
msgstr "Dosiersistemo: iso9660"
+
+#, 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 fa7cc2682d2..3188f722252 100644
--- a/tde-i18n-es/messages/tdebase/tdeio_media.po
+++ b/tde-i18n-es/messages/tdebase/tdeio_media.po
@@ -8,7 +8,7 @@
msgid ""
msgstr ""
"Project-Id-Version: tdeio_media\n"
-"POT-Creation-Date: 2019-01-13 18:47+0100\n"
+"POT-Creation-Date: 2019-07-11 02:33+0200\n"
"PO-Revision-Date: 2007-12-02 01:09+0100\n"
"Last-Translator: Eloy Cuadra <ecuadra@eloihr.net>\n"
"Language-Team: Spanish <kde-es@kybs.de>\n"
@@ -49,7 +49,6 @@ 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
-#: mounthelper/tdeio_media_mounthelper.cpp:256
msgid "The TDE mediamanager is not running."
msgstr "El gestor de medios de TDE no está ejecutándose."
@@ -57,7 +56,7 @@ msgstr "El gestor de medios de TDE no está ejecutándose."
msgid "This media name already exists."
msgstr "El nombre de medio ya existe."
-#: mediaimpl.cpp:230 mediaimpl.cpp:293
+#: mediaimpl.cpp:230 mediaimpl.cpp:297
msgid "No such medium."
msgstr "No existe ese medio"
@@ -65,110 +64,114 @@ msgstr "No existe ese medio"
msgid "The drive is encrypted."
msgstr ""
-#: mediaimpl.cpp:272 mediamanager/halbackend.cpp:1264
-#: mediamanager/halbackend.cpp:1273 mediamanager/halbackend.cpp:1663
-#: mediamanager/halbackend.cpp:1680 mediamanager/halbackend.cpp:1691
-#: mediamanager/halbackend.cpp:1793 mediamanager/halbackend.cpp:1801
-#: mediamanager/halbackend.cpp:1808 mediamanager/halbackend.cpp:1848
-#: mediamanager/halbackend.cpp:1854 mediamanager/halbackend.cpp:1861
-#: mounthelper/tdeio_media_mounthelper.cpp:58
-msgid "Internal Error"
-msgstr "Error interno"
+#: mediaimpl.cpp:274 mediamanager/tdehardwarebackend.cpp:201
+#: mediamanager/tdehardwarebackend.cpp:252
+#: mounthelper/tdeio_media_mounthelper.cpp:202
+msgid "Unknown mount error."
+msgstr ""
#: mediamanager/dialog.cpp:26 mounthelper/dialog.cpp:26
-msgid "Decrypt"
+msgid "Unlock"
msgstr ""
-#: mediamanager/fstabbackend.cpp:104 mediamanager/fstabbackend.cpp:114
-#: mediamanager/halbackend.cpp:1595 mediamanager/halbackend.cpp:1617
-#: mediamanager/halbackend.cpp:1776 mediamanager/halbackend.cpp:1831
-#: mediamanager/tdehardwarebackend.cpp:1349
-#: mediamanager/tdehardwarebackend.cpp:1360
+#: mediamanager/fstabbackend.cpp:105 mediamanager/fstabbackend.cpp:120
+#: mediamanager/halbackend.cpp:1598 mediamanager/halbackend.cpp:1625
+#: mediamanager/halbackend.cpp:1808 mediamanager/halbackend.cpp:1877
+#: mediamanager/mediamanager.cpp:363 mediamanager/mediamanager.cpp:375
+#: mediamanager/mediamanager.cpp:387 mediamanager/mediamanager.cpp:399
+#: mediamanager/tdehardwarebackend.cpp:1363
+#: mediamanager/tdehardwarebackend.cpp:1378
#, c-format
msgid "No such medium: %1"
msgstr "No existe el medio: %1"
-#: mediamanager/fstabbackend.cpp:398
+#: mediamanager/fstabbackend.cpp:408
msgid "CD Recorder"
msgstr "Grabador de CD"
-#: mediamanager/fstabbackend.cpp:404
+#: mediamanager/fstabbackend.cpp:414
msgid "DVD"
msgstr "DVD"
-#: mediamanager/fstabbackend.cpp:415
+#: mediamanager/fstabbackend.cpp:425
msgid "CD-ROM"
msgstr "CD-ROM"
-#: mediamanager/fstabbackend.cpp:428
+#: mediamanager/fstabbackend.cpp:438
msgid "Floppy"
msgstr "Disquete"
-#: mediamanager/fstabbackend.cpp:436
+#: mediamanager/fstabbackend.cpp:446
msgid "Zip Disk"
msgstr "Disco Zip"
-#: mediamanager/fstabbackend.cpp:447
+#: mediamanager/fstabbackend.cpp:457
msgid "Removable Device"
msgstr "Dispositivo extraíble"
-#: mediamanager/fstabbackend.cpp:452 mediamanager/fstabbackend.cpp:458
+#: mediamanager/fstabbackend.cpp:462 mediamanager/fstabbackend.cpp:468
msgid "Remote Share"
msgstr "Recurso compartido remoto"
-#: mediamanager/fstabbackend.cpp:463
+#: mediamanager/fstabbackend.cpp:473
msgid "Hard Disk"
msgstr "Disco duro"
-#: mediamanager/halbackend.cpp:749 mediamanager/tdehardwarebackend.cpp:805
+#: mediamanager/halbackend.cpp:744 mediamanager/tdehardwarebackend.cpp:808
msgid "Unknown Drive"
msgstr "Unidad desconocida"
-#: mediamanager/halbackend.cpp:761 mediamanager/tdehardwarebackend.cpp:835
+#: mediamanager/halbackend.cpp:756 mediamanager/tdehardwarebackend.cpp:838
msgid "Floppy Drive"
msgstr "Disquetera"
-#: mediamanager/halbackend.cpp:769
+#: mediamanager/halbackend.cpp:764
msgid "Zip Drive"
msgstr "Unidad Zip"
-#: mediamanager/halbackend.cpp:839 mediamanager/tdehardwarebackend.cpp:892
+#: mediamanager/halbackend.cpp:834 mediamanager/tdehardwarebackend.cpp:895
msgid "Camera"
msgstr "Cámara"
-#: mediamanager/halbackend.cpp:1221 mediamanager/halbackend.cpp:1247
+#: mediamanager/halbackend.cpp:1216 mediamanager/halbackend.cpp:1242
msgid "Authenticate"
msgstr ""
-#: mediamanager/halbackend.cpp:1222
+#: mediamanager/halbackend.cpp:1217
msgid ""
"<big><b>System policy prevents mounting internal media</b></big><br/"
">Authentication is required to perform this action. Please enter your "
"password to verify."
msgstr ""
-#: mediamanager/halbackend.cpp:1248
+#: mediamanager/halbackend.cpp:1243
msgid ""
"<big><b>System policy prevents unmounting media mounted by other users</b></"
"big><br/>Authentication is required to perform this action. Please enter "
"your password to verify."
msgstr ""
-#: mediamanager/halbackend.cpp:1284
+#: mediamanager/halbackend.cpp:1259 mediamanager/halbackend.cpp:1268
+#: mediamanager/halbackend.cpp:1849 mediamanager/halbackend.cpp:1916
+#: mounthelper/tdeio_media_mounthelper.cpp:58
+msgid "Internal Error"
+msgstr "Error interno"
+
+#: mediamanager/halbackend.cpp:1279
msgid "Invalid filesystem type"
msgstr "Tipo de sistema de archivos no válido"
-#: mediamanager/halbackend.cpp:1286
+#: mediamanager/halbackend.cpp:1281
msgid ""
"Permission denied<p>Please ensure that:<br>1. You have permission to access "
"this device.<br>2. This device node is not listed in /etc/fstab.</p>"
msgstr ""
-#: mediamanager/halbackend.cpp:1290
+#: mediamanager/halbackend.cpp:1285
msgid "Device is already mounted."
msgstr "El dispositivo ya está montado."
-#: mediamanager/halbackend.cpp:1340
+#: mediamanager/halbackend.cpp:1335
msgid ""
"Moreover, programs still using the device have been detected. They are "
"listed below. You have to close them or change their working directory "
@@ -178,16 +181,16 @@ msgstr ""
"debajo. Tiene que elegirlos o cambiar su directorio de trabajo antes de "
"intentar desmontar de nuevo el dispositivo."
-#: mediamanager/halbackend.cpp:1381 mediamanager/tdehardwarebackend.cpp:1588
+#: mediamanager/halbackend.cpp:1376 mediamanager/tdehardwarebackend.cpp:1618
msgid ""
"Programs that were still using the device have been forcibly terminated. "
"They are listed below."
msgstr ""
-#: mediamanager/halbackend.cpp:1402 mediamanager/halbackend.cpp:1715
-#: mediamanager/tdehardwarebackend.cpp:1406
-#: mediamanager/tdehardwarebackend.cpp:1424
-#: mediamanager/tdehardwarebackend.cpp:1464
+#: mediamanager/halbackend.cpp:1397 mediamanager/halbackend.cpp:1742
+#: mediamanager/tdehardwarebackend.cpp:1430
+#: mediamanager/tdehardwarebackend.cpp:1452
+#: mediamanager/tdehardwarebackend.cpp:1494
msgid ""
"Unfortunately, the device <b>%1</b> (%2) named <b>'%3'</b> and currently "
"mounted at <b>%4</b> could not be unmounted. "
@@ -195,196 +198,199 @@ 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:1408 mediamanager/tdehardwarebackend.cpp:1470
+#: mediamanager/halbackend.cpp:1403 mediamanager/tdehardwarebackend.cpp:1500
msgid "The following error was returned by umount command:"
msgstr "El siguiente error fue devuelto por la orden umount:"
-#: mediamanager/halbackend.cpp:1478
+#: mediamanager/halbackend.cpp:1567 mediamanager/tdehardwarebackend.cpp:1322
+msgid "Cannot mount encrypted locked drives!"
+msgstr ""
+
+#: mediamanager/halbackend.cpp:1682 mediamanager/halbackend.cpp:1703
+#: mediamanager/halbackend.cpp:1716 mediamanager/halbackend.cpp:1830
+#: mediamanager/halbackend.cpp:1840 mediamanager/halbackend.cpp:1899
+#: mediamanager/halbackend.cpp:1907
#, fuzzy
-msgid "Permission denied"
-msgstr "Permisos denegados"
+msgid "Internal error"
+msgstr "Error interno"
-#: mediamanager/halbackend.cpp:1562 mediamanager/tdehardwarebackend.cpp:1232
-msgid "Cannot mount encrypted drives!"
-msgstr ""
+#: mediamanager/halbackend.cpp:1694
+#, fuzzy
+#| msgid "Unknown"
+msgid "Unknown error"
+msgstr "Desconocido"
-#: mediamanager/halbackend.cpp:1721
+#: mediamanager/halbackend.cpp:1748
msgid "Unmounting failed due to the following error:"
msgstr "El desmontaje falló debido al siguiente error:"
-#: mediamanager/halbackend.cpp:1723
+#: mediamanager/halbackend.cpp:1750
msgid "Device is Busy:"
msgstr "El dispositivo está ocupado:"
-#: mediamanager/halbackend.cpp:1727
+#: mediamanager/halbackend.cpp:1754
msgid ""
"Permission denied<p>Please ensure that:<br>1. You have permission to access "
"this device.<br>2. This device was originally mounted using TDE.</p>"
msgstr ""
-#: mediamanager/halbackend.cpp:1739
+#: mediamanager/halbackend.cpp:1766
msgid ""
"%1<p><b>Would you like to forcibly terminate these processes?</b><br><i>All "
"unsaved data would be lost</i>"
msgstr ""
-#: mediamanager/halbackend.cpp:1811
+#: mediamanager/halbackend.cpp:1852
msgid "Wrong password"
msgstr ""
-#: mediamanager/mediamanager.cpp:247 mediamanager/mediamanager.cpp:266
-#: mediamanager/mediamanager.cpp:285 mediamanager/mediamanager.cpp:293
-#: mediamanager/mediamanager.cpp:302 mediamanager/mediamanager.cpp:310
-msgid "Feature only available with HAL"
-msgstr "La función sólo está disponible con HAL"
-
-#: mediamanager/mediamanager.cpp:252
+#: mediamanager/mediamanager.cpp:248 mediamanager/mediamanager.cpp:275
#, fuzzy
msgid "Feature only available with the TDE hardware backend"
msgstr "La función sólo está disponible con HAL"
-#: mediamanager/mediamanager.cpp:256 mediamanager/mediamanager.cpp:271
-#: mediamanager/mediamanager.cpp:275
+#: mediamanager/mediamanager.cpp:255 mediamanager/mediamanager.cpp:282
+#: mediamanager/mediamanager.cpp:312 mediamanager/mediamanager.cpp:343
+msgid "Feature only available with HAL"
+msgstr "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
#, fuzzy
msgid "Feature only available with HAL or TDE hardware backend"
msgstr "La función sólo está disponible con HAL"
-#: mediamanager/tdehardwarebackend.cpp:480
-#: mediamanager/tdehardwarebackend.cpp:517
-#: mediamanager/tdehardwarebackend.cpp:750
+#: mediamanager/tdehardwarebackend.cpp:483
+#: mediamanager/tdehardwarebackend.cpp:520
+#: mediamanager/tdehardwarebackend.cpp:753
#, fuzzy
msgid "%1 Removable Device"
msgstr "Dispositivo extraíble"
-#: mediamanager/tdehardwarebackend.cpp:525
+#: mediamanager/tdehardwarebackend.cpp:528
#, fuzzy
msgid "Blank CD-ROM"
msgstr "CD-ROM"
-#: mediamanager/tdehardwarebackend.cpp:534
+#: mediamanager/tdehardwarebackend.cpp:537
msgid "Blank CD-R"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:543
+#: mediamanager/tdehardwarebackend.cpp:546
msgid "Blank CD-RW"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:552
+#: mediamanager/tdehardwarebackend.cpp:555
msgid "Blank Magneto-Optical CD"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:561
+#: mediamanager/tdehardwarebackend.cpp:564
msgid "Blank Mount Ranier CD-RW"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:570
+#: mediamanager/tdehardwarebackend.cpp:573
msgid "Blank Mount Ranier CD-RW-W"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:579
+#: mediamanager/tdehardwarebackend.cpp:582
msgid "Blank DVD-ROM"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:588
+#: mediamanager/tdehardwarebackend.cpp:591
msgid "Blank DVD-RAM"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:597
+#: mediamanager/tdehardwarebackend.cpp:600
msgid "Blank DVD-R"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:606
+#: mediamanager/tdehardwarebackend.cpp:609
msgid "Blank DVD-RW"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:615
+#: mediamanager/tdehardwarebackend.cpp:618
msgid "Blank Dual Layer DVD-R"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:624
+#: mediamanager/tdehardwarebackend.cpp:627
msgid "Blank Dual Layer DVD-RW"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:633
+#: mediamanager/tdehardwarebackend.cpp:636
msgid "Blank DVD+R"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:642
+#: mediamanager/tdehardwarebackend.cpp:645
msgid "Blank DVD+RW"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:651
+#: mediamanager/tdehardwarebackend.cpp:654
msgid "Blank Dual Layer DVD+R"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:660
+#: mediamanager/tdehardwarebackend.cpp:663
msgid "Blank Dual Layer DVD+RW"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:669
+#: mediamanager/tdehardwarebackend.cpp:672
msgid "Blank BD-ROM"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:678
+#: mediamanager/tdehardwarebackend.cpp:681
msgid "Blank BD-R"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:687
+#: mediamanager/tdehardwarebackend.cpp:690
msgid "Blank BD-RW"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:696
+#: mediamanager/tdehardwarebackend.cpp:699
msgid "Blank HDDVD-ROM"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:705
+#: mediamanager/tdehardwarebackend.cpp:708
msgid "Blank HDDVD-R"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:714
+#: mediamanager/tdehardwarebackend.cpp:717
msgid "Blank HDDVD-RW"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:721
+#: mediamanager/tdehardwarebackend.cpp:724
msgid "Audio CD"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:742
+#: mediamanager/tdehardwarebackend.cpp:745
msgid "%1 Fixed Disk (%2)"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:849
+#: mediamanager/tdehardwarebackend.cpp:852
#, fuzzy
msgid "%1 Zip Disk"
msgstr "Disco Zip"
-#: mediamanager/tdehardwarebackend.cpp:1212
-#: mediamanager/tdehardwarebackend.cpp:1392
-#, fuzzy
-msgid "Internal error"
-msgstr "Error interno"
+#: mediamanager/tdehardwarebackend.cpp:1224
+#: mediamanager/tdehardwarebackend.cpp:1417
+msgid "Internal error. Couldn't find medium."
+msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:1239
-msgid ""
-"<qt>Unable to mount this device.<p>Potential reasons include:<br>Improper "
-"device and/or user privilege level<br>Corrupt data on storage device"
+#: mediamanager/tdehardwarebackend.cpp:1249
+#: mediamanager/tdehardwarebackend.cpp:1323
+msgid "Unable to mount this device."
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:1241
-#: mediamanager/tdehardwarebackend.cpp:1316
-#: mediamanager/tdehardwarebackend.cpp:1408
-#: mediamanager/tdehardwarebackend.cpp:1426
+#: mediamanager/tdehardwarebackend.cpp:1252
+#: mediamanager/tdehardwarebackend.cpp:1326
+#: mediamanager/tdehardwarebackend.cpp:1435
+#: mediamanager/tdehardwarebackend.cpp:1457
msgid "<p>Technical details:<br>"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:1314
-msgid ""
-"<qt>Unable to mount this device.<p>Potential reasons include:<br>Improper "
-"device and/or user privilege level<br>Corrupt data on storage "
-"device<br>Incorrect encryption password"
+#: mediamanager/tdehardwarebackend.cpp:1284
+msgid "Decryption aborted"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:1420
+#: mediamanager/tdehardwarebackend.cpp:1443
msgid ""
"<qt>The device <b>%1</b> (%2) named <b>'%3'</b> and currently mounted at <b>"
"%4</b> can not be unmounted at this time.<p>%5<p><b>Would you like to "
@@ -392,7 +398,7 @@ msgid ""
"lost</i>"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:1547
+#: mediamanager/tdehardwarebackend.cpp:1577
#, fuzzy
msgid ""
"Programs still using the device have been detected. They are listed below. "
@@ -407,7 +413,7 @@ msgstr ""
msgid "%1 cannot be found."
msgstr "No se pudo encontrar %1."
-#: mounthelper/tdeio_media_mounthelper.cpp:86
+#: mounthelper/tdeio_media_mounthelper.cpp:87
msgid "%1 is not a mountable media."
msgstr "%1 no es un medio que se pueda montar."
@@ -418,41 +424,49 @@ msgstr "%1 no es un medio que se pueda montar."
#: mounthelper/tdeio_media_mounthelper.cpp:107
#, fuzzy
-msgid "%1 is already decrypted."
+msgid "%1 is already unlocked."
msgstr "El dispositivo ya está montado."
-#: mounthelper/tdeio_media_mounthelper.cpp:228
+#: mounthelper/tdeio_media_mounthelper.cpp:139
+msgid "Unknown unmount error."
+msgstr ""
+
+#: mounthelper/tdeio_media_mounthelper.cpp:246
msgid "The device was successfully unmounted, but the tray could not be opened"
msgstr ""
"El dispositivo se desmontó correctamente, pero la bandeja no se pudo abrir"
-#: mounthelper/tdeio_media_mounthelper.cpp:230
+#: 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:275
+#: mounthelper/tdeio_media_mounthelper.cpp:281
+msgid "Unknown decrypt error."
+msgstr ""
+
+#: mounthelper/tdeio_media_mounthelper.cpp:295
#, fuzzy
msgid "Decrypt given URL"
msgstr "Desmontar URL"
-#: mounthelper/tdeio_media_mounthelper.cpp:276
+#: mounthelper/tdeio_media_mounthelper.cpp:296
msgid "Unmount given URL"
msgstr "Desmontar URL"
-#: mounthelper/tdeio_media_mounthelper.cpp:277
+#: mounthelper/tdeio_media_mounthelper.cpp:297
msgid "Mount given URL (default)"
msgstr "Montar URL (predeterminado)"
-#: mounthelper/tdeio_media_mounthelper.cpp:278
+#: mounthelper/tdeio_media_mounthelper.cpp:298
msgid "Eject given URL via tdeeject"
msgstr "Expulsar URL via tdeeject"
-#: mounthelper/tdeio_media_mounthelper.cpp:279
+#: mounthelper/tdeio_media_mounthelper.cpp:299
msgid "Unmount and Eject given URL (necessary for some USB devices)"
msgstr ""
"Desmontar y expulsar la URL dada (necesario para algunos dispositivos USB)"
-#: mounthelper/tdeio_media_mounthelper.cpp:280
+#: mounthelper/tdeio_media_mounthelper.cpp:300
msgid "media:/ URL to mount/unmount/eject/remove"
msgstr "media:/ URL a montar/desmontar/expulsar/sacar"
@@ -473,43 +487,43 @@ msgstr "Error al guardar los cambios"
msgid "&Mounting"
msgstr "&Montando"
-#: tdefile-plugin/tdefilemediaplugin.cpp:190
+#: tdefile-plugin/tdefilemediaplugin.cpp:184
msgid "Medium Information"
msgstr "Información del medio"
-#: tdefile-plugin/tdefilemediaplugin.cpp:193
+#: tdefile-plugin/tdefilemediaplugin.cpp:187
msgid "Free"
msgstr "Libre"
-#: tdefile-plugin/tdefilemediaplugin.cpp:196
+#: tdefile-plugin/tdefilemediaplugin.cpp:190
msgid "Used"
msgstr "Usado"
-#: tdefile-plugin/tdefilemediaplugin.cpp:199
+#: tdefile-plugin/tdefilemediaplugin.cpp:193
msgid "Total"
msgstr "Total"
-#: tdefile-plugin/tdefilemediaplugin.cpp:202
+#: tdefile-plugin/tdefilemediaplugin.cpp:196
msgid "Base URL"
msgstr "URL base"
-#: tdefile-plugin/tdefilemediaplugin.cpp:203
+#: tdefile-plugin/tdefilemediaplugin.cpp:197
msgid "Mount Point"
msgstr "Punto de montaje"
-#: tdefile-plugin/tdefilemediaplugin.cpp:204
+#: tdefile-plugin/tdefilemediaplugin.cpp:198
msgid "Device Node"
msgstr "Nodo de dispositivo"
-#: tdefile-plugin/tdefilemediaplugin.cpp:206
+#: tdefile-plugin/tdefilemediaplugin.cpp:200
msgid "Medium Summary"
msgstr "Resumen"
-#: tdefile-plugin/tdefilemediaplugin.cpp:208
+#: tdefile-plugin/tdefilemediaplugin.cpp:202
msgid "Usage"
msgstr "Uso"
-#: tdefile-plugin/tdefilemediaplugin.cpp:210
+#: tdefile-plugin/tdefilemediaplugin.cpp:204
msgid "Bar Graph"
msgstr "Barra gráfica"
@@ -581,23 +595,30 @@ msgid ""
"devices are plugged in."
msgstr ""
-#: mediamanager/decryptdialog.ui:24 mounthelper/decryptdialog.ui:24
+#: mediamanager/unlockdialog.ui:24 mounthelper/unlockdialog.ui:24
#, no-c-format
msgid "Decrypting Storage Device"
msgstr ""
-#: mediamanager/decryptdialog.ui:109 mounthelper/decryptdialog.ui:109
+#: mediamanager/unlockdialog.ui:109
#, no-c-format
msgid ""
-"<p><b>%1</b> is an encrypted storage device.</p>\n"
-"<p>Please enter the password to decrypt the storage device.</p>"
+"<p><b>%1</b> is an encrypted locked storage device.</p>\n"
+"<p>Please enter the password to unlock the storage device.</p>"
msgstr ""
-#: mediamanager/decryptdialog.ui:131 mounthelper/decryptdialog.ui:131
+#: mediamanager/unlockdialog.ui:131 mounthelper/unlockdialog.ui:131
#, no-c-format
msgid "&Password:"
msgstr ""
+#: mounthelper/unlockdialog.ui:109
+#, no-c-format
+msgid ""
+"<p><b>%1</b> is an encrypted storage device.</p>\n"
+"<p>Please enter the password to decrypt the storage device.</p>"
+msgstr ""
+
#: propsdlgplugin/propertiespagegui.ui:16
#, no-c-format
msgid "PropertiesPageGUI"
@@ -866,3 +887,7 @@ msgstr "Mixta"
#, no-c-format
msgid "Filesystem: iso9660"
msgstr "Sistema de archivos: iso9660"
+
+#, 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 c40171decc6..76b7a2433fc 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: 2019-01-13 18:47+0100\n"
+"POT-Creation-Date: 2019-07-11 02:33+0200\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"
@@ -45,7 +45,6 @@ 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
-#: mounthelper/tdeio_media_mounthelper.cpp:256
msgid "The TDE mediamanager is not running."
msgstr "TDE andmekandjate haldur ei tööta."
@@ -53,7 +52,7 @@ msgstr "TDE andmekandjate haldur ei tööta."
msgid "This media name already exists."
msgstr "Sellise nimega andmekandja on juba olemas."
-#: mediaimpl.cpp:230 mediaimpl.cpp:293
+#: mediaimpl.cpp:230 mediaimpl.cpp:297
msgid "No such medium."
msgstr "Sellist andmekandjat pole."
@@ -61,110 +60,114 @@ msgstr "Sellist andmekandjat pole."
msgid "The drive is encrypted."
msgstr ""
-#: mediaimpl.cpp:272 mediamanager/halbackend.cpp:1264
-#: mediamanager/halbackend.cpp:1273 mediamanager/halbackend.cpp:1663
-#: mediamanager/halbackend.cpp:1680 mediamanager/halbackend.cpp:1691
-#: mediamanager/halbackend.cpp:1793 mediamanager/halbackend.cpp:1801
-#: mediamanager/halbackend.cpp:1808 mediamanager/halbackend.cpp:1848
-#: mediamanager/halbackend.cpp:1854 mediamanager/halbackend.cpp:1861
-#: mounthelper/tdeio_media_mounthelper.cpp:58
-msgid "Internal Error"
-msgstr "Sisemine viga"
+#: mediaimpl.cpp:274 mediamanager/tdehardwarebackend.cpp:201
+#: mediamanager/tdehardwarebackend.cpp:252
+#: mounthelper/tdeio_media_mounthelper.cpp:202
+msgid "Unknown mount error."
+msgstr ""
#: mediamanager/dialog.cpp:26 mounthelper/dialog.cpp:26
-msgid "Decrypt"
+msgid "Unlock"
msgstr ""
-#: mediamanager/fstabbackend.cpp:104 mediamanager/fstabbackend.cpp:114
-#: mediamanager/halbackend.cpp:1595 mediamanager/halbackend.cpp:1617
-#: mediamanager/halbackend.cpp:1776 mediamanager/halbackend.cpp:1831
-#: mediamanager/tdehardwarebackend.cpp:1349
-#: mediamanager/tdehardwarebackend.cpp:1360
+#: mediamanager/fstabbackend.cpp:105 mediamanager/fstabbackend.cpp:120
+#: mediamanager/halbackend.cpp:1598 mediamanager/halbackend.cpp:1625
+#: mediamanager/halbackend.cpp:1808 mediamanager/halbackend.cpp:1877
+#: mediamanager/mediamanager.cpp:363 mediamanager/mediamanager.cpp:375
+#: mediamanager/mediamanager.cpp:387 mediamanager/mediamanager.cpp:399
+#: mediamanager/tdehardwarebackend.cpp:1363
+#: mediamanager/tdehardwarebackend.cpp:1378
#, c-format
msgid "No such medium: %1"
msgstr "Sellist andmekandjat pole: %1"
-#: mediamanager/fstabbackend.cpp:398
+#: mediamanager/fstabbackend.cpp:408
msgid "CD Recorder"
msgstr "CD-kirjuti"
-#: mediamanager/fstabbackend.cpp:404
+#: mediamanager/fstabbackend.cpp:414
msgid "DVD"
msgstr "DVD"
-#: mediamanager/fstabbackend.cpp:415
+#: mediamanager/fstabbackend.cpp:425
msgid "CD-ROM"
msgstr "CD-ROM"
-#: mediamanager/fstabbackend.cpp:428
+#: mediamanager/fstabbackend.cpp:438
msgid "Floppy"
msgstr "Diskett"
-#: mediamanager/fstabbackend.cpp:436
+#: mediamanager/fstabbackend.cpp:446
msgid "Zip Disk"
msgstr "Zip-ketas"
-#: mediamanager/fstabbackend.cpp:447
+#: mediamanager/fstabbackend.cpp:457
msgid "Removable Device"
msgstr "Eemaldatav seade"
-#: mediamanager/fstabbackend.cpp:452 mediamanager/fstabbackend.cpp:458
+#: mediamanager/fstabbackend.cpp:462 mediamanager/fstabbackend.cpp:468
msgid "Remote Share"
msgstr "Võrguressurss"
-#: mediamanager/fstabbackend.cpp:463
+#: mediamanager/fstabbackend.cpp:473
msgid "Hard Disk"
msgstr "Kõvaketas"
-#: mediamanager/halbackend.cpp:749 mediamanager/tdehardwarebackend.cpp:805
+#: mediamanager/halbackend.cpp:744 mediamanager/tdehardwarebackend.cpp:808
msgid "Unknown Drive"
msgstr "Tundmatu seade"
-#: mediamanager/halbackend.cpp:761 mediamanager/tdehardwarebackend.cpp:835
+#: mediamanager/halbackend.cpp:756 mediamanager/tdehardwarebackend.cpp:838
msgid "Floppy Drive"
msgstr "Disketiseade"
-#: mediamanager/halbackend.cpp:769
+#: mediamanager/halbackend.cpp:764
msgid "Zip Drive"
msgstr "Zip-seade"
-#: mediamanager/halbackend.cpp:839 mediamanager/tdehardwarebackend.cpp:892
+#: mediamanager/halbackend.cpp:834 mediamanager/tdehardwarebackend.cpp:895
msgid "Camera"
msgstr "Kaamera"
-#: mediamanager/halbackend.cpp:1221 mediamanager/halbackend.cpp:1247
+#: mediamanager/halbackend.cpp:1216 mediamanager/halbackend.cpp:1242
msgid "Authenticate"
msgstr ""
-#: mediamanager/halbackend.cpp:1222
+#: mediamanager/halbackend.cpp:1217
msgid ""
"<big><b>System policy prevents mounting internal media</b></big><br/"
">Authentication is required to perform this action. Please enter your "
"password to verify."
msgstr ""
-#: mediamanager/halbackend.cpp:1248
+#: mediamanager/halbackend.cpp:1243
msgid ""
"<big><b>System policy prevents unmounting media mounted by other users</b></"
"big><br/>Authentication is required to perform this action. Please enter "
"your password to verify."
msgstr ""
-#: mediamanager/halbackend.cpp:1284
+#: mediamanager/halbackend.cpp:1259 mediamanager/halbackend.cpp:1268
+#: mediamanager/halbackend.cpp:1849 mediamanager/halbackend.cpp:1916
+#: mounthelper/tdeio_media_mounthelper.cpp:58
+msgid "Internal Error"
+msgstr "Sisemine viga"
+
+#: mediamanager/halbackend.cpp:1279
msgid "Invalid filesystem type"
msgstr "Vigane failisüsteemi tüüp"
-#: mediamanager/halbackend.cpp:1286
+#: mediamanager/halbackend.cpp:1281
msgid ""
"Permission denied<p>Please ensure that:<br>1. You have permission to access "
"this device.<br>2. This device node is not listed in /etc/fstab.</p>"
msgstr ""
-#: mediamanager/halbackend.cpp:1290
+#: mediamanager/halbackend.cpp:1285
msgid "Device is already mounted."
msgstr "Seade on juba ühendatud."
-#: mediamanager/halbackend.cpp:1340
+#: mediamanager/halbackend.cpp:1335
msgid ""
"Moreover, programs still using the device have been detected. They are "
"listed below. You have to close them or change their working directory "
@@ -174,16 +177,16 @@ msgstr ""
"allpool. Sul tuleb need sulgeda või muuta nende töökataloogi, enne kui "
"proovid seadet uuesti lahutada."
-#: mediamanager/halbackend.cpp:1381 mediamanager/tdehardwarebackend.cpp:1588
+#: mediamanager/halbackend.cpp:1376 mediamanager/tdehardwarebackend.cpp:1618
msgid ""
"Programs that were still using the device have been forcibly terminated. "
"They are listed below."
msgstr ""
-#: mediamanager/halbackend.cpp:1402 mediamanager/halbackend.cpp:1715
-#: mediamanager/tdehardwarebackend.cpp:1406
-#: mediamanager/tdehardwarebackend.cpp:1424
-#: mediamanager/tdehardwarebackend.cpp:1464
+#: mediamanager/halbackend.cpp:1397 mediamanager/halbackend.cpp:1742
+#: mediamanager/tdehardwarebackend.cpp:1430
+#: mediamanager/tdehardwarebackend.cpp:1452
+#: mediamanager/tdehardwarebackend.cpp:1494
msgid ""
"Unfortunately, the device <b>%1</b> (%2) named <b>'%3'</b> and currently "
"mounted at <b>%4</b> could not be unmounted. "
@@ -191,196 +194,199 @@ 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:1408 mediamanager/tdehardwarebackend.cpp:1470
+#: mediamanager/halbackend.cpp:1403 mediamanager/tdehardwarebackend.cpp:1500
msgid "The following error was returned by umount command:"
msgstr "Käsk umount tagastas järgmise vea:"
-#: mediamanager/halbackend.cpp:1478
+#: mediamanager/halbackend.cpp:1567 mediamanager/tdehardwarebackend.cpp:1322
+msgid "Cannot mount encrypted locked drives!"
+msgstr ""
+
+#: mediamanager/halbackend.cpp:1682 mediamanager/halbackend.cpp:1703
+#: mediamanager/halbackend.cpp:1716 mediamanager/halbackend.cpp:1830
+#: mediamanager/halbackend.cpp:1840 mediamanager/halbackend.cpp:1899
+#: mediamanager/halbackend.cpp:1907
#, fuzzy
-msgid "Permission denied"
-msgstr "Õigustest ei piisa"
+msgid "Internal error"
+msgstr "Sisemine viga"
-#: mediamanager/halbackend.cpp:1562 mediamanager/tdehardwarebackend.cpp:1232
-msgid "Cannot mount encrypted drives!"
-msgstr ""
+#: mediamanager/halbackend.cpp:1694
+#, fuzzy
+#| msgid "Unknown"
+msgid "Unknown error"
+msgstr "Tundmatu"
-#: mediamanager/halbackend.cpp:1721
+#: mediamanager/halbackend.cpp:1748
msgid "Unmounting failed due to the following error:"
msgstr "Lahutamine ebaõnnestus järgmise vea tõttu:"
-#: mediamanager/halbackend.cpp:1723
+#: mediamanager/halbackend.cpp:1750
msgid "Device is Busy:"
msgstr "Seade on hõivatud"
-#: mediamanager/halbackend.cpp:1727
+#: mediamanager/halbackend.cpp:1754
msgid ""
"Permission denied<p>Please ensure that:<br>1. You have permission to access "
"this device.<br>2. This device was originally mounted using TDE.</p>"
msgstr ""
-#: mediamanager/halbackend.cpp:1739
+#: mediamanager/halbackend.cpp:1766
msgid ""
"%1<p><b>Would you like to forcibly terminate these processes?</b><br><i>All "
"unsaved data would be lost</i>"
msgstr ""
-#: mediamanager/halbackend.cpp:1811
+#: mediamanager/halbackend.cpp:1852
msgid "Wrong password"
msgstr ""
-#: mediamanager/mediamanager.cpp:247 mediamanager/mediamanager.cpp:266
-#: mediamanager/mediamanager.cpp:285 mediamanager/mediamanager.cpp:293
-#: mediamanager/mediamanager.cpp:302 mediamanager/mediamanager.cpp:310
-msgid "Feature only available with HAL"
-msgstr "Seda omadust saab kasutada ainult HAL-i korral"
-
-#: mediamanager/mediamanager.cpp:252
+#: mediamanager/mediamanager.cpp:248 mediamanager/mediamanager.cpp:275
#, fuzzy
msgid "Feature only available with the TDE hardware backend"
msgstr "Seda omadust saab kasutada ainult HAL-i korral"
-#: mediamanager/mediamanager.cpp:256 mediamanager/mediamanager.cpp:271
-#: mediamanager/mediamanager.cpp:275
+#: mediamanager/mediamanager.cpp:255 mediamanager/mediamanager.cpp:282
+#: mediamanager/mediamanager.cpp:312 mediamanager/mediamanager.cpp:343
+msgid "Feature only available with HAL"
+msgstr "Seda omadust saab kasutada ainult HAL-i korral"
+
+#: mediamanager/mediamanager.cpp:262 mediamanager/mediamanager.cpp:289
+#: mediamanager/mediamanager.cpp:320 mediamanager/mediamanager.cpp:350
#, fuzzy
msgid "Feature only available with HAL or TDE hardware backend"
msgstr "Seda omadust saab kasutada ainult HAL-i korral"
-#: mediamanager/tdehardwarebackend.cpp:480
-#: mediamanager/tdehardwarebackend.cpp:517
-#: mediamanager/tdehardwarebackend.cpp:750
+#: mediamanager/tdehardwarebackend.cpp:483
+#: mediamanager/tdehardwarebackend.cpp:520
+#: mediamanager/tdehardwarebackend.cpp:753
#, fuzzy
msgid "%1 Removable Device"
msgstr "Eemaldatav seade"
-#: mediamanager/tdehardwarebackend.cpp:525
+#: mediamanager/tdehardwarebackend.cpp:528
#, fuzzy
msgid "Blank CD-ROM"
msgstr "CD-ROM"
-#: mediamanager/tdehardwarebackend.cpp:534
+#: mediamanager/tdehardwarebackend.cpp:537
msgid "Blank CD-R"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:543
+#: mediamanager/tdehardwarebackend.cpp:546
msgid "Blank CD-RW"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:552
+#: mediamanager/tdehardwarebackend.cpp:555
msgid "Blank Magneto-Optical CD"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:561
+#: mediamanager/tdehardwarebackend.cpp:564
msgid "Blank Mount Ranier CD-RW"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:570
+#: mediamanager/tdehardwarebackend.cpp:573
msgid "Blank Mount Ranier CD-RW-W"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:579
+#: mediamanager/tdehardwarebackend.cpp:582
msgid "Blank DVD-ROM"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:588
+#: mediamanager/tdehardwarebackend.cpp:591
msgid "Blank DVD-RAM"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:597
+#: mediamanager/tdehardwarebackend.cpp:600
msgid "Blank DVD-R"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:606
+#: mediamanager/tdehardwarebackend.cpp:609
msgid "Blank DVD-RW"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:615
+#: mediamanager/tdehardwarebackend.cpp:618
msgid "Blank Dual Layer DVD-R"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:624
+#: mediamanager/tdehardwarebackend.cpp:627
msgid "Blank Dual Layer DVD-RW"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:633
+#: mediamanager/tdehardwarebackend.cpp:636
msgid "Blank DVD+R"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:642
+#: mediamanager/tdehardwarebackend.cpp:645
msgid "Blank DVD+RW"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:651
+#: mediamanager/tdehardwarebackend.cpp:654
msgid "Blank Dual Layer DVD+R"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:660
+#: mediamanager/tdehardwarebackend.cpp:663
msgid "Blank Dual Layer DVD+RW"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:669
+#: mediamanager/tdehardwarebackend.cpp:672
msgid "Blank BD-ROM"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:678
+#: mediamanager/tdehardwarebackend.cpp:681
msgid "Blank BD-R"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:687
+#: mediamanager/tdehardwarebackend.cpp:690
msgid "Blank BD-RW"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:696
+#: mediamanager/tdehardwarebackend.cpp:699
msgid "Blank HDDVD-ROM"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:705
+#: mediamanager/tdehardwarebackend.cpp:708
msgid "Blank HDDVD-R"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:714
+#: mediamanager/tdehardwarebackend.cpp:717
msgid "Blank HDDVD-RW"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:721
+#: mediamanager/tdehardwarebackend.cpp:724
msgid "Audio CD"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:742
+#: mediamanager/tdehardwarebackend.cpp:745
msgid "%1 Fixed Disk (%2)"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:849
+#: mediamanager/tdehardwarebackend.cpp:852
#, fuzzy
msgid "%1 Zip Disk"
msgstr "Zip-ketas"
-#: mediamanager/tdehardwarebackend.cpp:1212
-#: mediamanager/tdehardwarebackend.cpp:1392
-#, fuzzy
-msgid "Internal error"
-msgstr "Sisemine viga"
+#: mediamanager/tdehardwarebackend.cpp:1224
+#: mediamanager/tdehardwarebackend.cpp:1417
+msgid "Internal error. Couldn't find medium."
+msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:1239
-msgid ""
-"<qt>Unable to mount this device.<p>Potential reasons include:<br>Improper "
-"device and/or user privilege level<br>Corrupt data on storage device"
+#: mediamanager/tdehardwarebackend.cpp:1249
+#: mediamanager/tdehardwarebackend.cpp:1323
+msgid "Unable to mount this device."
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:1241
-#: mediamanager/tdehardwarebackend.cpp:1316
-#: mediamanager/tdehardwarebackend.cpp:1408
-#: mediamanager/tdehardwarebackend.cpp:1426
+#: mediamanager/tdehardwarebackend.cpp:1252
+#: mediamanager/tdehardwarebackend.cpp:1326
+#: mediamanager/tdehardwarebackend.cpp:1435
+#: mediamanager/tdehardwarebackend.cpp:1457
msgid "<p>Technical details:<br>"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:1314
-msgid ""
-"<qt>Unable to mount this device.<p>Potential reasons include:<br>Improper "
-"device and/or user privilege level<br>Corrupt data on storage "
-"device<br>Incorrect encryption password"
+#: mediamanager/tdehardwarebackend.cpp:1284
+msgid "Decryption aborted"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:1420
+#: mediamanager/tdehardwarebackend.cpp:1443
msgid ""
"<qt>The device <b>%1</b> (%2) named <b>'%3'</b> and currently mounted at <b>"
"%4</b> can not be unmounted at this time.<p>%5<p><b>Would you like to "
@@ -388,7 +394,7 @@ msgid ""
"lost</i>"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:1547
+#: mediamanager/tdehardwarebackend.cpp:1577
#, fuzzy
msgid ""
"Programs still using the device have been detected. They are listed below. "
@@ -403,7 +409,7 @@ msgstr ""
msgid "%1 cannot be found."
msgstr "%1 ei leitud."
-#: mounthelper/tdeio_media_mounthelper.cpp:86
+#: mounthelper/tdeio_media_mounthelper.cpp:87
msgid "%1 is not a mountable media."
msgstr "%1 ei ole ühendatav andmekandja."
@@ -414,39 +420,47 @@ msgstr "%1 ei ole ühendatav andmekandja."
#: mounthelper/tdeio_media_mounthelper.cpp:107
#, fuzzy
-msgid "%1 is already decrypted."
+msgid "%1 is already unlocked."
msgstr "Seade on juba ühendatud."
-#: mounthelper/tdeio_media_mounthelper.cpp:228
+#: mounthelper/tdeio_media_mounthelper.cpp:139
+msgid "Unknown unmount error."
+msgstr ""
+
+#: mounthelper/tdeio_media_mounthelper.cpp:246
msgid "The device was successfully unmounted, but the tray could not be opened"
msgstr "Seade ühendati edukalt, aga sahtlit ei saa avada"
-#: mounthelper/tdeio_media_mounthelper.cpp:230
+#: 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:275
+#: mounthelper/tdeio_media_mounthelper.cpp:281
+msgid "Unknown decrypt error."
+msgstr ""
+
+#: mounthelper/tdeio_media_mounthelper.cpp:295
#, fuzzy
msgid "Decrypt given URL"
msgstr "Antud URL-i lahutamine"
-#: mounthelper/tdeio_media_mounthelper.cpp:276
+#: mounthelper/tdeio_media_mounthelper.cpp:296
msgid "Unmount given URL"
msgstr "Antud URL-i lahutamine"
-#: mounthelper/tdeio_media_mounthelper.cpp:277
+#: mounthelper/tdeio_media_mounthelper.cpp:297
msgid "Mount given URL (default)"
msgstr "Antud URL-i ühendamine (vaikimisi)"
-#: mounthelper/tdeio_media_mounthelper.cpp:278
+#: mounthelper/tdeio_media_mounthelper.cpp:298
msgid "Eject given URL via tdeeject"
msgstr "Antud URL-i väljastamine tdeejectiga"
-#: mounthelper/tdeio_media_mounthelper.cpp:279
+#: 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:280
+#: mounthelper/tdeio_media_mounthelper.cpp:300
msgid "media:/ URL to mount/unmount/eject/remove"
msgstr "media:/ URL ühendamiseks/lahutamiseks/väljastamiseks/eemaldamiseks"
@@ -467,43 +481,43 @@ msgstr "Muudatuste salvestamine ebaõnnestus"
msgid "&Mounting"
msgstr "Ü&hendamine"
-#: tdefile-plugin/tdefilemediaplugin.cpp:190
+#: tdefile-plugin/tdefilemediaplugin.cpp:184
msgid "Medium Information"
msgstr "Andmekandja info"
-#: tdefile-plugin/tdefilemediaplugin.cpp:193
+#: tdefile-plugin/tdefilemediaplugin.cpp:187
msgid "Free"
msgstr "Vaba"
-#: tdefile-plugin/tdefilemediaplugin.cpp:196
+#: tdefile-plugin/tdefilemediaplugin.cpp:190
msgid "Used"
msgstr "Kasutatud"
-#: tdefile-plugin/tdefilemediaplugin.cpp:199
+#: tdefile-plugin/tdefilemediaplugin.cpp:193
msgid "Total"
msgstr "Kokku"
-#: tdefile-plugin/tdefilemediaplugin.cpp:202
+#: tdefile-plugin/tdefilemediaplugin.cpp:196
msgid "Base URL"
msgstr "Baas-URL"
-#: tdefile-plugin/tdefilemediaplugin.cpp:203
+#: tdefile-plugin/tdefilemediaplugin.cpp:197
msgid "Mount Point"
msgstr "Ühenduspunkt"
-#: tdefile-plugin/tdefilemediaplugin.cpp:204
+#: tdefile-plugin/tdefilemediaplugin.cpp:198
msgid "Device Node"
msgstr "Seadmesõlm"
-#: tdefile-plugin/tdefilemediaplugin.cpp:206
+#: tdefile-plugin/tdefilemediaplugin.cpp:200
msgid "Medium Summary"
msgstr "Andmekandja kokkuvõte"
-#: tdefile-plugin/tdefilemediaplugin.cpp:208
+#: tdefile-plugin/tdefilemediaplugin.cpp:202
msgid "Usage"
msgstr "Kasutus"
-#: tdefile-plugin/tdefilemediaplugin.cpp:210
+#: tdefile-plugin/tdefilemediaplugin.cpp:204
msgid "Bar Graph"
msgstr "Tulpgraafik"
@@ -575,23 +589,30 @@ msgid ""
"devices are plugged in."
msgstr ""
-#: mediamanager/decryptdialog.ui:24 mounthelper/decryptdialog.ui:24
+#: mediamanager/unlockdialog.ui:24 mounthelper/unlockdialog.ui:24
#, no-c-format
msgid "Decrypting Storage Device"
msgstr ""
-#: mediamanager/decryptdialog.ui:109 mounthelper/decryptdialog.ui:109
+#: mediamanager/unlockdialog.ui:109
#, no-c-format
msgid ""
-"<p><b>%1</b> is an encrypted storage device.</p>\n"
-"<p>Please enter the password to decrypt the storage device.</p>"
+"<p><b>%1</b> is an encrypted locked storage device.</p>\n"
+"<p>Please enter the password to unlock the storage device.</p>"
msgstr ""
-#: mediamanager/decryptdialog.ui:131 mounthelper/decryptdialog.ui:131
+#: mediamanager/unlockdialog.ui:131 mounthelper/unlockdialog.ui:131
#, no-c-format
msgid "&Password:"
msgstr ""
+#: mounthelper/unlockdialog.ui:109
+#, no-c-format
+msgid ""
+"<p><b>%1</b> is an encrypted storage device.</p>\n"
+"<p>Please enter the password to decrypt the storage device.</p>"
+msgstr ""
+
#: propsdlgplugin/propertiespagegui.ui:16
#, no-c-format
msgid "PropertiesPageGUI"
@@ -852,6 +873,10 @@ msgstr "Sega"
msgid "Filesystem: iso9660"
msgstr "Failisüsteem: iso9660"
+#, fuzzy
+#~ msgid "Permission denied"
+#~ msgstr "Õigustest ei piisa"
+
#~ msgid ""
#~ "\n"
#~ "Please check that the disk is entered correctly."
diff --git a/tde-i18n-eu/messages/tdebase/tdeio_media.po b/tde-i18n-eu/messages/tdebase/tdeio_media.po
index 4fcdbd793a3..bb05d46f667 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: 2019-01-13 18:47+0100\n"
+"POT-Creation-Date: 2019-07-11 02:33+0200\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"
@@ -47,7 +47,6 @@ 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
-#: mounthelper/tdeio_media_mounthelper.cpp:256
msgid "The TDE mediamanager is not running."
msgstr "TDE media kudeatzailea ez da abiarazi"
@@ -55,7 +54,7 @@ msgstr "TDE media kudeatzailea ez da abiarazi"
msgid "This media name already exists."
msgstr "Media izen hau lehendik dago."
-#: mediaimpl.cpp:230 mediaimpl.cpp:293
+#: mediaimpl.cpp:230 mediaimpl.cpp:297
msgid "No such medium."
msgstr ""
@@ -63,320 +62,328 @@ msgstr ""
msgid "The drive is encrypted."
msgstr ""
-#: mediaimpl.cpp:272 mediamanager/halbackend.cpp:1264
-#: mediamanager/halbackend.cpp:1273 mediamanager/halbackend.cpp:1663
-#: mediamanager/halbackend.cpp:1680 mediamanager/halbackend.cpp:1691
-#: mediamanager/halbackend.cpp:1793 mediamanager/halbackend.cpp:1801
-#: mediamanager/halbackend.cpp:1808 mediamanager/halbackend.cpp:1848
-#: mediamanager/halbackend.cpp:1854 mediamanager/halbackend.cpp:1861
-#: mounthelper/tdeio_media_mounthelper.cpp:58
-msgid "Internal Error"
+#: mediaimpl.cpp:274 mediamanager/tdehardwarebackend.cpp:201
+#: mediamanager/tdehardwarebackend.cpp:252
+#: mounthelper/tdeio_media_mounthelper.cpp:202
+msgid "Unknown mount error."
msgstr ""
#: mediamanager/dialog.cpp:26 mounthelper/dialog.cpp:26
-msgid "Decrypt"
+msgid "Unlock"
msgstr ""
-#: mediamanager/fstabbackend.cpp:104 mediamanager/fstabbackend.cpp:114
-#: mediamanager/halbackend.cpp:1595 mediamanager/halbackend.cpp:1617
-#: mediamanager/halbackend.cpp:1776 mediamanager/halbackend.cpp:1831
-#: mediamanager/tdehardwarebackend.cpp:1349
-#: mediamanager/tdehardwarebackend.cpp:1360
+#: mediamanager/fstabbackend.cpp:105 mediamanager/fstabbackend.cpp:120
+#: mediamanager/halbackend.cpp:1598 mediamanager/halbackend.cpp:1625
+#: mediamanager/halbackend.cpp:1808 mediamanager/halbackend.cpp:1877
+#: mediamanager/mediamanager.cpp:363 mediamanager/mediamanager.cpp:375
+#: mediamanager/mediamanager.cpp:387 mediamanager/mediamanager.cpp:399
+#: mediamanager/tdehardwarebackend.cpp:1363
+#: mediamanager/tdehardwarebackend.cpp:1378
#, c-format
msgid "No such medium: %1"
msgstr ""
-#: mediamanager/fstabbackend.cpp:398
+#: mediamanager/fstabbackend.cpp:408
msgid "CD Recorder"
msgstr "CD grabatzailea"
-#: mediamanager/fstabbackend.cpp:404
+#: mediamanager/fstabbackend.cpp:414
msgid "DVD"
msgstr "DVD"
-#: mediamanager/fstabbackend.cpp:415
+#: mediamanager/fstabbackend.cpp:425
msgid "CD-ROM"
msgstr "CD-ROM"
-#: mediamanager/fstabbackend.cpp:428
+#: mediamanager/fstabbackend.cpp:438
msgid "Floppy"
msgstr "Disketea"
-#: mediamanager/fstabbackend.cpp:436
+#: mediamanager/fstabbackend.cpp:446
msgid "Zip Disk"
msgstr "Zip diska"
-#: mediamanager/fstabbackend.cpp:447
+#: mediamanager/fstabbackend.cpp:457
msgid "Removable Device"
msgstr "Gailu aldagarria"
-#: mediamanager/fstabbackend.cpp:452 mediamanager/fstabbackend.cpp:458
+#: mediamanager/fstabbackend.cpp:462 mediamanager/fstabbackend.cpp:468
msgid "Remote Share"
msgstr "Urruneko partiketa"
-#: mediamanager/fstabbackend.cpp:463
+#: mediamanager/fstabbackend.cpp:473
msgid "Hard Disk"
msgstr "Diska gogorra"
-#: mediamanager/halbackend.cpp:749 mediamanager/tdehardwarebackend.cpp:805
+#: mediamanager/halbackend.cpp:744 mediamanager/tdehardwarebackend.cpp:808
#, fuzzy
msgid "Unknown Drive"
msgstr "Ezezaguna"
-#: mediamanager/halbackend.cpp:761 mediamanager/tdehardwarebackend.cpp:835
+#: mediamanager/halbackend.cpp:756 mediamanager/tdehardwarebackend.cpp:838
#, fuzzy
msgid "Floppy Drive"
msgstr "Disketea"
-#: mediamanager/halbackend.cpp:769
+#: mediamanager/halbackend.cpp:764
#, fuzzy
msgid "Zip Drive"
msgstr "Zip diska"
-#: mediamanager/halbackend.cpp:839 mediamanager/tdehardwarebackend.cpp:892
+#: mediamanager/halbackend.cpp:834 mediamanager/tdehardwarebackend.cpp:895
msgid "Camera"
msgstr "Kamara"
-#: mediamanager/halbackend.cpp:1221 mediamanager/halbackend.cpp:1247
+#: mediamanager/halbackend.cpp:1216 mediamanager/halbackend.cpp:1242
msgid "Authenticate"
msgstr ""
-#: mediamanager/halbackend.cpp:1222
+#: mediamanager/halbackend.cpp:1217
msgid ""
"<big><b>System policy prevents mounting internal media</b></big><br/"
">Authentication is required to perform this action. Please enter your "
"password to verify."
msgstr ""
-#: mediamanager/halbackend.cpp:1248
+#: mediamanager/halbackend.cpp:1243
msgid ""
"<big><b>System policy prevents unmounting media mounted by other users</b></"
"big><br/>Authentication is required to perform this action. Please enter "
"your password to verify."
msgstr ""
-#: mediamanager/halbackend.cpp:1284
+#: mediamanager/halbackend.cpp:1259 mediamanager/halbackend.cpp:1268
+#: mediamanager/halbackend.cpp:1849 mediamanager/halbackend.cpp:1916
+#: mounthelper/tdeio_media_mounthelper.cpp:58
+msgid "Internal Error"
+msgstr ""
+
+#: mediamanager/halbackend.cpp:1279
msgid "Invalid filesystem type"
msgstr ""
-#: mediamanager/halbackend.cpp:1286
+#: mediamanager/halbackend.cpp:1281
msgid ""
"Permission denied<p>Please ensure that:<br>1. You have permission to access "
"this device.<br>2. This device node is not listed in /etc/fstab.</p>"
msgstr ""
-#: mediamanager/halbackend.cpp:1290
+#: mediamanager/halbackend.cpp:1285
msgid "Device is already mounted."
msgstr ""
-#: mediamanager/halbackend.cpp:1340
+#: mediamanager/halbackend.cpp:1335
msgid ""
"Moreover, programs still using the device have been detected. They are "
"listed below. You have to close them or change their working directory "
"before attempting to unmount the device again."
msgstr ""
-#: mediamanager/halbackend.cpp:1381 mediamanager/tdehardwarebackend.cpp:1588
+#: mediamanager/halbackend.cpp:1376 mediamanager/tdehardwarebackend.cpp:1618
msgid ""
"Programs that were still using the device have been forcibly terminated. "
"They are listed below."
msgstr ""
-#: mediamanager/halbackend.cpp:1402 mediamanager/halbackend.cpp:1715
-#: mediamanager/tdehardwarebackend.cpp:1406
-#: mediamanager/tdehardwarebackend.cpp:1424
-#: mediamanager/tdehardwarebackend.cpp:1464
+#: mediamanager/halbackend.cpp:1397 mediamanager/halbackend.cpp:1742
+#: mediamanager/tdehardwarebackend.cpp:1430
+#: mediamanager/tdehardwarebackend.cpp:1452
+#: mediamanager/tdehardwarebackend.cpp:1494
msgid ""
"Unfortunately, the device <b>%1</b> (%2) named <b>'%3'</b> and currently "
"mounted at <b>%4</b> could not be unmounted. "
msgstr ""
-#: mediamanager/halbackend.cpp:1408 mediamanager/tdehardwarebackend.cpp:1470
+#: mediamanager/halbackend.cpp:1403 mediamanager/tdehardwarebackend.cpp:1500
msgid "The following error was returned by umount command:"
msgstr ""
-#: mediamanager/halbackend.cpp:1478
-msgid "Permission denied"
+#: mediamanager/halbackend.cpp:1567 mediamanager/tdehardwarebackend.cpp:1322
+msgid "Cannot mount encrypted locked drives!"
msgstr ""
-#: mediamanager/halbackend.cpp:1562 mediamanager/tdehardwarebackend.cpp:1232
-msgid "Cannot mount encrypted drives!"
+#: mediamanager/halbackend.cpp:1682 mediamanager/halbackend.cpp:1703
+#: mediamanager/halbackend.cpp:1716 mediamanager/halbackend.cpp:1830
+#: mediamanager/halbackend.cpp:1840 mediamanager/halbackend.cpp:1899
+#: mediamanager/halbackend.cpp:1907
+msgid "Internal error"
msgstr ""
-#: mediamanager/halbackend.cpp:1721
+#: mediamanager/halbackend.cpp:1694
+#, fuzzy
+#| msgid "Unknown"
+msgid "Unknown error"
+msgstr "Ezezaguna"
+
+#: mediamanager/halbackend.cpp:1748
msgid "Unmounting failed due to the following error:"
msgstr ""
-#: mediamanager/halbackend.cpp:1723
+#: mediamanager/halbackend.cpp:1750
msgid "Device is Busy:"
msgstr ""
-#: mediamanager/halbackend.cpp:1727
+#: mediamanager/halbackend.cpp:1754
msgid ""
"Permission denied<p>Please ensure that:<br>1. You have permission to access "
"this device.<br>2. This device was originally mounted using TDE.</p>"
msgstr ""
-#: mediamanager/halbackend.cpp:1739
+#: mediamanager/halbackend.cpp:1766
msgid ""
"%1<p><b>Would you like to forcibly terminate these processes?</b><br><i>All "
"unsaved data would be lost</i>"
msgstr ""
-#: mediamanager/halbackend.cpp:1811
+#: mediamanager/halbackend.cpp:1852
msgid "Wrong password"
msgstr ""
-#: mediamanager/mediamanager.cpp:247 mediamanager/mediamanager.cpp:266
-#: mediamanager/mediamanager.cpp:285 mediamanager/mediamanager.cpp:293
-#: mediamanager/mediamanager.cpp:302 mediamanager/mediamanager.cpp:310
-msgid "Feature only available with HAL"
+#: mediamanager/mediamanager.cpp:248 mediamanager/mediamanager.cpp:275
+msgid "Feature only available with the TDE hardware backend"
msgstr ""
-#: mediamanager/mediamanager.cpp:252
-msgid "Feature only available with the TDE hardware backend"
+#: mediamanager/mediamanager.cpp:255 mediamanager/mediamanager.cpp:282
+#: mediamanager/mediamanager.cpp:312 mediamanager/mediamanager.cpp:343
+msgid "Feature only available with HAL"
msgstr ""
-#: mediamanager/mediamanager.cpp:256 mediamanager/mediamanager.cpp:271
-#: mediamanager/mediamanager.cpp:275
+#: mediamanager/mediamanager.cpp:262 mediamanager/mediamanager.cpp:289
+#: mediamanager/mediamanager.cpp:320 mediamanager/mediamanager.cpp:350
msgid "Feature only available with HAL or TDE hardware backend"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:480
-#: mediamanager/tdehardwarebackend.cpp:517
-#: mediamanager/tdehardwarebackend.cpp:750
+#: mediamanager/tdehardwarebackend.cpp:483
+#: mediamanager/tdehardwarebackend.cpp:520
+#: mediamanager/tdehardwarebackend.cpp:753
#, fuzzy
msgid "%1 Removable Device"
msgstr "Gailu aldagarria"
-#: mediamanager/tdehardwarebackend.cpp:525
+#: mediamanager/tdehardwarebackend.cpp:528
#, fuzzy
msgid "Blank CD-ROM"
msgstr "CD-ROM"
-#: mediamanager/tdehardwarebackend.cpp:534
+#: mediamanager/tdehardwarebackend.cpp:537
msgid "Blank CD-R"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:543
+#: mediamanager/tdehardwarebackend.cpp:546
msgid "Blank CD-RW"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:552
+#: mediamanager/tdehardwarebackend.cpp:555
msgid "Blank Magneto-Optical CD"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:561
+#: mediamanager/tdehardwarebackend.cpp:564
msgid "Blank Mount Ranier CD-RW"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:570
+#: mediamanager/tdehardwarebackend.cpp:573
msgid "Blank Mount Ranier CD-RW-W"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:579
+#: mediamanager/tdehardwarebackend.cpp:582
msgid "Blank DVD-ROM"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:588
+#: mediamanager/tdehardwarebackend.cpp:591
msgid "Blank DVD-RAM"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:597
+#: mediamanager/tdehardwarebackend.cpp:600
msgid "Blank DVD-R"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:606
+#: mediamanager/tdehardwarebackend.cpp:609
msgid "Blank DVD-RW"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:615
+#: mediamanager/tdehardwarebackend.cpp:618
msgid "Blank Dual Layer DVD-R"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:624
+#: mediamanager/tdehardwarebackend.cpp:627
msgid "Blank Dual Layer DVD-RW"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:633
+#: mediamanager/tdehardwarebackend.cpp:636
msgid "Blank DVD+R"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:642
+#: mediamanager/tdehardwarebackend.cpp:645
msgid "Blank DVD+RW"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:651
+#: mediamanager/tdehardwarebackend.cpp:654
msgid "Blank Dual Layer DVD+R"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:660
+#: mediamanager/tdehardwarebackend.cpp:663
msgid "Blank Dual Layer DVD+RW"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:669
+#: mediamanager/tdehardwarebackend.cpp:672
msgid "Blank BD-ROM"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:678
+#: mediamanager/tdehardwarebackend.cpp:681
msgid "Blank BD-R"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:687
+#: mediamanager/tdehardwarebackend.cpp:690
msgid "Blank BD-RW"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:696
+#: mediamanager/tdehardwarebackend.cpp:699
msgid "Blank HDDVD-ROM"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:705
+#: mediamanager/tdehardwarebackend.cpp:708
msgid "Blank HDDVD-R"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:714
+#: mediamanager/tdehardwarebackend.cpp:717
msgid "Blank HDDVD-RW"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:721
+#: mediamanager/tdehardwarebackend.cpp:724
msgid "Audio CD"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:742
+#: mediamanager/tdehardwarebackend.cpp:745
msgid "%1 Fixed Disk (%2)"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:849
+#: mediamanager/tdehardwarebackend.cpp:852
#, fuzzy
msgid "%1 Zip Disk"
msgstr "Zip diska"
-#: mediamanager/tdehardwarebackend.cpp:1212
-#: mediamanager/tdehardwarebackend.cpp:1392
-msgid "Internal error"
+#: mediamanager/tdehardwarebackend.cpp:1224
+#: mediamanager/tdehardwarebackend.cpp:1417
+msgid "Internal error. Couldn't find medium."
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:1239
-msgid ""
-"<qt>Unable to mount this device.<p>Potential reasons include:<br>Improper "
-"device and/or user privilege level<br>Corrupt data on storage device"
+#: mediamanager/tdehardwarebackend.cpp:1249
+#: mediamanager/tdehardwarebackend.cpp:1323
+msgid "Unable to mount this device."
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:1241
-#: mediamanager/tdehardwarebackend.cpp:1316
-#: mediamanager/tdehardwarebackend.cpp:1408
-#: mediamanager/tdehardwarebackend.cpp:1426
+#: mediamanager/tdehardwarebackend.cpp:1252
+#: mediamanager/tdehardwarebackend.cpp:1326
+#: mediamanager/tdehardwarebackend.cpp:1435
+#: mediamanager/tdehardwarebackend.cpp:1457
msgid "<p>Technical details:<br>"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:1314
-msgid ""
-"<qt>Unable to mount this device.<p>Potential reasons include:<br>Improper "
-"device and/or user privilege level<br>Corrupt data on storage "
-"device<br>Incorrect encryption password"
+#: mediamanager/tdehardwarebackend.cpp:1284
+msgid "Decryption aborted"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:1420
+#: mediamanager/tdehardwarebackend.cpp:1443
msgid ""
"<qt>The device <b>%1</b> (%2) named <b>'%3'</b> and currently mounted at <b>"
"%4</b> can not be unmounted at this time.<p>%5<p><b>Would you like to "
@@ -384,7 +391,7 @@ msgid ""
"lost</i>"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:1547
+#: mediamanager/tdehardwarebackend.cpp:1577
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 "
@@ -395,7 +402,7 @@ msgstr ""
msgid "%1 cannot be found."
msgstr "%1 ezin da aurkitu"
-#: mounthelper/tdeio_media_mounthelper.cpp:86
+#: mounthelper/tdeio_media_mounthelper.cpp:87
msgid "%1 is not a mountable media."
msgstr "%1 ezin da muntatu"
@@ -405,39 +412,47 @@ msgid "%1 is not an encrypted media."
msgstr "%1 ezin da muntatu"
#: mounthelper/tdeio_media_mounthelper.cpp:107
-msgid "%1 is already decrypted."
+msgid "%1 is already unlocked."
msgstr ""
-#: mounthelper/tdeio_media_mounthelper.cpp:228
+#: mounthelper/tdeio_media_mounthelper.cpp:139
+msgid "Unknown unmount error."
+msgstr ""
+
+#: mounthelper/tdeio_media_mounthelper.cpp:246
msgid "The device was successfully unmounted, but the tray could not be opened"
msgstr ""
-#: mounthelper/tdeio_media_mounthelper.cpp:230
+#: mounthelper/tdeio_media_mounthelper.cpp:248
msgid "The device was successfully unmounted, but could not be ejected"
msgstr ""
-#: mounthelper/tdeio_media_mounthelper.cpp:275
+#: mounthelper/tdeio_media_mounthelper.cpp:281
+msgid "Unknown decrypt error."
+msgstr ""
+
+#: mounthelper/tdeio_media_mounthelper.cpp:295
#, fuzzy
msgid "Decrypt given URL"
msgstr "Desmuntatu emandako URLa"
-#: mounthelper/tdeio_media_mounthelper.cpp:276
+#: mounthelper/tdeio_media_mounthelper.cpp:296
msgid "Unmount given URL"
msgstr "Desmuntatu emandako URLa"
-#: mounthelper/tdeio_media_mounthelper.cpp:277
+#: mounthelper/tdeio_media_mounthelper.cpp:297
msgid "Mount given URL (default)"
msgstr "Muntatu emandako URLa (lehenetsia)"
-#: mounthelper/tdeio_media_mounthelper.cpp:278
+#: mounthelper/tdeio_media_mounthelper.cpp:298
msgid "Eject given URL via tdeeject"
msgstr "Kanporatu emandako URLa tdeeject-en bidez"
-#: mounthelper/tdeio_media_mounthelper.cpp:279
+#: 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:280
+#: mounthelper/tdeio_media_mounthelper.cpp:300
msgid "media:/ URL to mount/unmount/eject/remove"
msgstr "media:/ montatu/desmonatu/egotzi/kentzeko URLa"
@@ -459,43 +474,43 @@ msgstr ""
msgid "&Mounting"
msgstr "Muntatze-puntua"
-#: tdefile-plugin/tdefilemediaplugin.cpp:190
+#: tdefile-plugin/tdefilemediaplugin.cpp:184
msgid "Medium Information"
msgstr "Mediaren informazioa"
-#: tdefile-plugin/tdefilemediaplugin.cpp:193
+#: tdefile-plugin/tdefilemediaplugin.cpp:187
msgid "Free"
msgstr "Erabili gabea"
-#: tdefile-plugin/tdefilemediaplugin.cpp:196
+#: tdefile-plugin/tdefilemediaplugin.cpp:190
msgid "Used"
msgstr "Erabilia"
-#: tdefile-plugin/tdefilemediaplugin.cpp:199
+#: tdefile-plugin/tdefilemediaplugin.cpp:193
msgid "Total"
msgstr "Osotara"
-#: tdefile-plugin/tdefilemediaplugin.cpp:202
+#: tdefile-plugin/tdefilemediaplugin.cpp:196
msgid "Base URL"
msgstr "Hasierako URLa"
-#: tdefile-plugin/tdefilemediaplugin.cpp:203
+#: tdefile-plugin/tdefilemediaplugin.cpp:197
msgid "Mount Point"
msgstr "Muntatze-puntua"
-#: tdefile-plugin/tdefilemediaplugin.cpp:204
+#: tdefile-plugin/tdefilemediaplugin.cpp:198
msgid "Device Node"
msgstr "Gailu nodoa"
-#: tdefile-plugin/tdefilemediaplugin.cpp:206
+#: tdefile-plugin/tdefilemediaplugin.cpp:200
msgid "Medium Summary"
msgstr "Mediaren laburpena"
-#: tdefile-plugin/tdefilemediaplugin.cpp:208
+#: tdefile-plugin/tdefilemediaplugin.cpp:202
msgid "Usage"
msgstr "Erabilera"
-#: tdefile-plugin/tdefilemediaplugin.cpp:210
+#: tdefile-plugin/tdefilemediaplugin.cpp:204
msgid "Bar Graph"
msgstr "Barrako grafikoa"
@@ -567,23 +582,30 @@ msgid ""
"devices are plugged in."
msgstr ""
-#: mediamanager/decryptdialog.ui:24 mounthelper/decryptdialog.ui:24
+#: mediamanager/unlockdialog.ui:24 mounthelper/unlockdialog.ui:24
#, no-c-format
msgid "Decrypting Storage Device"
msgstr ""
-#: mediamanager/decryptdialog.ui:109 mounthelper/decryptdialog.ui:109
+#: mediamanager/unlockdialog.ui:109
#, no-c-format
msgid ""
-"<p><b>%1</b> is an encrypted storage device.</p>\n"
-"<p>Please enter the password to decrypt the storage device.</p>"
+"<p><b>%1</b> is an encrypted locked storage device.</p>\n"
+"<p>Please enter the password to unlock the storage device.</p>"
msgstr ""
-#: mediamanager/decryptdialog.ui:131 mounthelper/decryptdialog.ui:131
+#: mediamanager/unlockdialog.ui:131 mounthelper/unlockdialog.ui:131
#, no-c-format
msgid "&Password:"
msgstr ""
+#: mounthelper/unlockdialog.ui:109
+#, no-c-format
+msgid ""
+"<p><b>%1</b> is an encrypted storage device.</p>\n"
+"<p>Please enter the password to decrypt the storage device.</p>"
+msgstr ""
+
#: propsdlgplugin/propertiespagegui.ui:16
#, no-c-format
msgid "PropertiesPageGUI"
diff --git a/tde-i18n-fa/messages/tdebase/tdeio_media.po b/tde-i18n-fa/messages/tdebase/tdeio_media.po
index 1f59905e154..1f3a7600a1c 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: 2019-01-13 18:47+0100\n"
+"POT-Creation-Date: 2019-07-11 02:33+0200\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"
@@ -49,7 +49,6 @@ msgstr "ناشناخته"
#: mediaimpl.cpp:88 mediaimpl.cpp:115 mediaimpl.cpp:141 mediaimpl.cpp:177
#: mediaimpl.cpp:197 mediaimpl.cpp:218
#: mounthelper/tdeio_media_mounthelper.cpp:50
-#: mounthelper/tdeio_media_mounthelper.cpp:256
msgid "The TDE mediamanager is not running."
msgstr "مدیر رسانۀ TDE در حال اجرا نیست."
@@ -57,7 +56,7 @@ msgstr "مدیر رسانۀ TDE در حال اجرا نیست."
msgid "This media name already exists."
msgstr "نام رسانه، از قبل موجود است."
-#: mediaimpl.cpp:230 mediaimpl.cpp:293
+#: mediaimpl.cpp:230 mediaimpl.cpp:297
msgid "No such medium."
msgstr "چنین رسانه‌ای وجود ندارد."
@@ -65,113 +64,117 @@ msgstr "چنین رسانه‌ای وجود ندارد."
msgid "The drive is encrypted."
msgstr ""
-#: mediaimpl.cpp:272 mediamanager/halbackend.cpp:1264
-#: mediamanager/halbackend.cpp:1273 mediamanager/halbackend.cpp:1663
-#: mediamanager/halbackend.cpp:1680 mediamanager/halbackend.cpp:1691
-#: mediamanager/halbackend.cpp:1793 mediamanager/halbackend.cpp:1801
-#: mediamanager/halbackend.cpp:1808 mediamanager/halbackend.cpp:1848
-#: mediamanager/halbackend.cpp:1854 mediamanager/halbackend.cpp:1861
-#: mounthelper/tdeio_media_mounthelper.cpp:58
-msgid "Internal Error"
-msgstr "خطای درونی"
+#: mediaimpl.cpp:274 mediamanager/tdehardwarebackend.cpp:201
+#: mediamanager/tdehardwarebackend.cpp:252
+#: mounthelper/tdeio_media_mounthelper.cpp:202
+msgid "Unknown mount error."
+msgstr ""
#: mediamanager/dialog.cpp:26 mounthelper/dialog.cpp:26
-msgid "Decrypt"
+msgid "Unlock"
msgstr ""
-#: mediamanager/fstabbackend.cpp:104 mediamanager/fstabbackend.cpp:114
-#: mediamanager/halbackend.cpp:1595 mediamanager/halbackend.cpp:1617
-#: mediamanager/halbackend.cpp:1776 mediamanager/halbackend.cpp:1831
-#: mediamanager/tdehardwarebackend.cpp:1349
-#: mediamanager/tdehardwarebackend.cpp:1360
+#: mediamanager/fstabbackend.cpp:105 mediamanager/fstabbackend.cpp:120
+#: mediamanager/halbackend.cpp:1598 mediamanager/halbackend.cpp:1625
+#: mediamanager/halbackend.cpp:1808 mediamanager/halbackend.cpp:1877
+#: mediamanager/mediamanager.cpp:363 mediamanager/mediamanager.cpp:375
+#: mediamanager/mediamanager.cpp:387 mediamanager/mediamanager.cpp:399
+#: mediamanager/tdehardwarebackend.cpp:1363
+#: mediamanager/tdehardwarebackend.cpp:1378
#, c-format
msgid "No such medium: %1"
msgstr "چنین رسانه‌ای وجود ندارد: %1"
-#: mediamanager/fstabbackend.cpp:398
+#: mediamanager/fstabbackend.cpp:408
msgid "CD Recorder"
msgstr "ضبط‌کنندۀ دیسک فشرده"
-#: mediamanager/fstabbackend.cpp:404
+#: mediamanager/fstabbackend.cpp:414
msgid "DVD"
msgstr ""
-#: mediamanager/fstabbackend.cpp:415
+#: mediamanager/fstabbackend.cpp:425
msgid "CD-ROM"
msgstr "دیسک فشرده"
-#: mediamanager/fstabbackend.cpp:428
+#: mediamanager/fstabbackend.cpp:438
msgid "Floppy"
msgstr "فلاپی"
-#: mediamanager/fstabbackend.cpp:436
+#: mediamanager/fstabbackend.cpp:446
msgid "Zip Disk"
msgstr "دیسک فشرده"
-#: mediamanager/fstabbackend.cpp:447
+#: mediamanager/fstabbackend.cpp:457
msgid "Removable Device"
msgstr "دستگاه برداشتنی"
-#: mediamanager/fstabbackend.cpp:452 mediamanager/fstabbackend.cpp:458
+#: mediamanager/fstabbackend.cpp:462 mediamanager/fstabbackend.cpp:468
msgid "Remote Share"
msgstr "مشترک دور"
-#: mediamanager/fstabbackend.cpp:463
+#: mediamanager/fstabbackend.cpp:473
msgid "Hard Disk"
msgstr "دیسک سخت"
-#: mediamanager/halbackend.cpp:749 mediamanager/tdehardwarebackend.cpp:805
+#: mediamanager/halbackend.cpp:744 mediamanager/tdehardwarebackend.cpp:808
#, fuzzy
msgid "Unknown Drive"
msgstr "ناشناخته"
-#: mediamanager/halbackend.cpp:761 mediamanager/tdehardwarebackend.cpp:835
+#: mediamanager/halbackend.cpp:756 mediamanager/tdehardwarebackend.cpp:838
#, fuzzy
msgid "Floppy Drive"
msgstr "فلاپی"
-#: mediamanager/halbackend.cpp:769
+#: mediamanager/halbackend.cpp:764
#, fuzzy
msgid "Zip Drive"
msgstr "دیسک فشرده"
-#: mediamanager/halbackend.cpp:839 mediamanager/tdehardwarebackend.cpp:892
+#: mediamanager/halbackend.cpp:834 mediamanager/tdehardwarebackend.cpp:895
msgid "Camera"
msgstr "دوربین"
-#: mediamanager/halbackend.cpp:1221 mediamanager/halbackend.cpp:1247
+#: mediamanager/halbackend.cpp:1216 mediamanager/halbackend.cpp:1242
msgid "Authenticate"
msgstr ""
-#: mediamanager/halbackend.cpp:1222
+#: mediamanager/halbackend.cpp:1217
msgid ""
"<big><b>System policy prevents mounting internal media</b></big><br/"
">Authentication is required to perform this action. Please enter your "
"password to verify."
msgstr ""
-#: mediamanager/halbackend.cpp:1248
+#: mediamanager/halbackend.cpp:1243
msgid ""
"<big><b>System policy prevents unmounting media mounted by other users</b></"
"big><br/>Authentication is required to perform this action. Please enter "
"your password to verify."
msgstr ""
-#: mediamanager/halbackend.cpp:1284
+#: mediamanager/halbackend.cpp:1259 mediamanager/halbackend.cpp:1268
+#: mediamanager/halbackend.cpp:1849 mediamanager/halbackend.cpp:1916
+#: mounthelper/tdeio_media_mounthelper.cpp:58
+msgid "Internal Error"
+msgstr "خطای درونی"
+
+#: mediamanager/halbackend.cpp:1279
msgid "Invalid filesystem type"
msgstr "نوع سیستم پروندۀ نامعتبر"
-#: mediamanager/halbackend.cpp:1286
+#: mediamanager/halbackend.cpp:1281
msgid ""
"Permission denied<p>Please ensure that:<br>1. You have permission to access "
"this device.<br>2. This device node is not listed in /etc/fstab.</p>"
msgstr ""
-#: mediamanager/halbackend.cpp:1290
+#: mediamanager/halbackend.cpp:1285
msgid "Device is already mounted."
msgstr "دستگاه از قبل سوار می‌شود."
-#: mediamanager/halbackend.cpp:1340
+#: mediamanager/halbackend.cpp:1335
msgid ""
"Moreover, programs still using the device have been detected. They are "
"listed below. You have to close them or change their working directory "
@@ -181,16 +184,16 @@ msgstr ""
"آنها در زیر فهرست می‌شوند. قبل از تلاش برای پیاده کردن مجدد دستگاه باید آنها "
"را ببندید یا فهرست راهنمای کاریشان را تغییر دهید."
-#: mediamanager/halbackend.cpp:1381 mediamanager/tdehardwarebackend.cpp:1588
+#: mediamanager/halbackend.cpp:1376 mediamanager/tdehardwarebackend.cpp:1618
msgid ""
"Programs that were still using the device have been forcibly terminated. "
"They are listed below."
msgstr ""
-#: mediamanager/halbackend.cpp:1402 mediamanager/halbackend.cpp:1715
-#: mediamanager/tdehardwarebackend.cpp:1406
-#: mediamanager/tdehardwarebackend.cpp:1424
-#: mediamanager/tdehardwarebackend.cpp:1464
+#: mediamanager/halbackend.cpp:1397 mediamanager/halbackend.cpp:1742
+#: mediamanager/tdehardwarebackend.cpp:1430
+#: mediamanager/tdehardwarebackend.cpp:1452
+#: mediamanager/tdehardwarebackend.cpp:1494
msgid ""
"Unfortunately, the device <b>%1</b> (%2) named <b>'%3'</b> and currently "
"mounted at <b>%4</b> could not be unmounted. "
@@ -198,196 +201,199 @@ msgstr ""
"متأسفانه، دستگاه <b>%1</b> )%2( که <b>'%3'</b> نامیده شد و اخیراً در <b>%4</"
"b> سوار شد، نتوانست پیاده شود."
-#: mediamanager/halbackend.cpp:1408 mediamanager/tdehardwarebackend.cpp:1470
+#: mediamanager/halbackend.cpp:1403 mediamanager/tdehardwarebackend.cpp:1500
msgid "The following error was returned by umount command:"
msgstr "خطای زیر با فرمان پیاده‌سازی بازگردانده شد:"
-#: mediamanager/halbackend.cpp:1478
+#: mediamanager/halbackend.cpp:1567 mediamanager/tdehardwarebackend.cpp:1322
+msgid "Cannot mount encrypted locked drives!"
+msgstr ""
+
+#: mediamanager/halbackend.cpp:1682 mediamanager/halbackend.cpp:1703
+#: mediamanager/halbackend.cpp:1716 mediamanager/halbackend.cpp:1830
+#: mediamanager/halbackend.cpp:1840 mediamanager/halbackend.cpp:1899
+#: mediamanager/halbackend.cpp:1907
#, fuzzy
-msgid "Permission denied"
-msgstr "مجوزها انکار شد"
+msgid "Internal error"
+msgstr "خطای درونی"
-#: mediamanager/halbackend.cpp:1562 mediamanager/tdehardwarebackend.cpp:1232
-msgid "Cannot mount encrypted drives!"
-msgstr ""
+#: mediamanager/halbackend.cpp:1694
+#, fuzzy
+#| msgid "Unknown"
+msgid "Unknown error"
+msgstr "ناشناخته"
-#: mediamanager/halbackend.cpp:1721
+#: mediamanager/halbackend.cpp:1748
msgid "Unmounting failed due to the following error:"
msgstr "خرابی در پیاده کردن به علت خطای زیر:"
-#: mediamanager/halbackend.cpp:1723
+#: mediamanager/halbackend.cpp:1750
msgid "Device is Busy:"
msgstr "دستگاه مشغول است:"
-#: mediamanager/halbackend.cpp:1727
+#: mediamanager/halbackend.cpp:1754
msgid ""
"Permission denied<p>Please ensure that:<br>1. You have permission to access "
"this device.<br>2. This device was originally mounted using TDE.</p>"
msgstr ""
-#: mediamanager/halbackend.cpp:1739
+#: mediamanager/halbackend.cpp:1766
msgid ""
"%1<p><b>Would you like to forcibly terminate these processes?</b><br><i>All "
"unsaved data would be lost</i>"
msgstr ""
-#: mediamanager/halbackend.cpp:1811
+#: mediamanager/halbackend.cpp:1852
msgid "Wrong password"
msgstr ""
-#: mediamanager/mediamanager.cpp:247 mediamanager/mediamanager.cpp:266
-#: mediamanager/mediamanager.cpp:285 mediamanager/mediamanager.cpp:293
-#: mediamanager/mediamanager.cpp:302 mediamanager/mediamanager.cpp:310
-msgid "Feature only available with HAL"
-msgstr "ویژگی فقط توسط HAL در دسترس است"
-
-#: mediamanager/mediamanager.cpp:252
+#: mediamanager/mediamanager.cpp:248 mediamanager/mediamanager.cpp:275
#, fuzzy
msgid "Feature only available with the TDE hardware backend"
msgstr "ویژگی فقط توسط HAL در دسترس است"
-#: mediamanager/mediamanager.cpp:256 mediamanager/mediamanager.cpp:271
-#: mediamanager/mediamanager.cpp:275
+#: mediamanager/mediamanager.cpp:255 mediamanager/mediamanager.cpp:282
+#: mediamanager/mediamanager.cpp:312 mediamanager/mediamanager.cpp:343
+msgid "Feature only available with HAL"
+msgstr "ویژگی فقط توسط HAL در دسترس است"
+
+#: mediamanager/mediamanager.cpp:262 mediamanager/mediamanager.cpp:289
+#: mediamanager/mediamanager.cpp:320 mediamanager/mediamanager.cpp:350
#, fuzzy
msgid "Feature only available with HAL or TDE hardware backend"
msgstr "ویژگی فقط توسط HAL در دسترس است"
-#: mediamanager/tdehardwarebackend.cpp:480
-#: mediamanager/tdehardwarebackend.cpp:517
-#: mediamanager/tdehardwarebackend.cpp:750
+#: mediamanager/tdehardwarebackend.cpp:483
+#: mediamanager/tdehardwarebackend.cpp:520
+#: mediamanager/tdehardwarebackend.cpp:753
#, fuzzy
msgid "%1 Removable Device"
msgstr "دستگاه برداشتنی"
-#: mediamanager/tdehardwarebackend.cpp:525
+#: mediamanager/tdehardwarebackend.cpp:528
#, fuzzy
msgid "Blank CD-ROM"
msgstr "دیسک فشرده"
-#: mediamanager/tdehardwarebackend.cpp:534
+#: mediamanager/tdehardwarebackend.cpp:537
msgid "Blank CD-R"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:543
+#: mediamanager/tdehardwarebackend.cpp:546
msgid "Blank CD-RW"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:552
+#: mediamanager/tdehardwarebackend.cpp:555
msgid "Blank Magneto-Optical CD"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:561
+#: mediamanager/tdehardwarebackend.cpp:564
msgid "Blank Mount Ranier CD-RW"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:570
+#: mediamanager/tdehardwarebackend.cpp:573
msgid "Blank Mount Ranier CD-RW-W"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:579
+#: mediamanager/tdehardwarebackend.cpp:582
msgid "Blank DVD-ROM"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:588
+#: mediamanager/tdehardwarebackend.cpp:591
msgid "Blank DVD-RAM"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:597
+#: mediamanager/tdehardwarebackend.cpp:600
msgid "Blank DVD-R"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:606
+#: mediamanager/tdehardwarebackend.cpp:609
msgid "Blank DVD-RW"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:615
+#: mediamanager/tdehardwarebackend.cpp:618
msgid "Blank Dual Layer DVD-R"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:624
+#: mediamanager/tdehardwarebackend.cpp:627
msgid "Blank Dual Layer DVD-RW"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:633
+#: mediamanager/tdehardwarebackend.cpp:636
msgid "Blank DVD+R"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:642
+#: mediamanager/tdehardwarebackend.cpp:645
msgid "Blank DVD+RW"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:651
+#: mediamanager/tdehardwarebackend.cpp:654
msgid "Blank Dual Layer DVD+R"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:660
+#: mediamanager/tdehardwarebackend.cpp:663
msgid "Blank Dual Layer DVD+RW"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:669
+#: mediamanager/tdehardwarebackend.cpp:672
msgid "Blank BD-ROM"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:678
+#: mediamanager/tdehardwarebackend.cpp:681
msgid "Blank BD-R"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:687
+#: mediamanager/tdehardwarebackend.cpp:690
msgid "Blank BD-RW"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:696
+#: mediamanager/tdehardwarebackend.cpp:699
msgid "Blank HDDVD-ROM"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:705
+#: mediamanager/tdehardwarebackend.cpp:708
msgid "Blank HDDVD-R"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:714
+#: mediamanager/tdehardwarebackend.cpp:717
msgid "Blank HDDVD-RW"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:721
+#: mediamanager/tdehardwarebackend.cpp:724
msgid "Audio CD"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:742
+#: mediamanager/tdehardwarebackend.cpp:745
msgid "%1 Fixed Disk (%2)"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:849
+#: mediamanager/tdehardwarebackend.cpp:852
#, fuzzy
msgid "%1 Zip Disk"
msgstr "دیسک فشرده"
-#: mediamanager/tdehardwarebackend.cpp:1212
-#: mediamanager/tdehardwarebackend.cpp:1392
-#, fuzzy
-msgid "Internal error"
-msgstr "خطای درونی"
+#: mediamanager/tdehardwarebackend.cpp:1224
+#: mediamanager/tdehardwarebackend.cpp:1417
+msgid "Internal error. Couldn't find medium."
+msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:1239
-msgid ""
-"<qt>Unable to mount this device.<p>Potential reasons include:<br>Improper "
-"device and/or user privilege level<br>Corrupt data on storage device"
+#: mediamanager/tdehardwarebackend.cpp:1249
+#: mediamanager/tdehardwarebackend.cpp:1323
+msgid "Unable to mount this device."
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:1241
-#: mediamanager/tdehardwarebackend.cpp:1316
-#: mediamanager/tdehardwarebackend.cpp:1408
-#: mediamanager/tdehardwarebackend.cpp:1426
+#: mediamanager/tdehardwarebackend.cpp:1252
+#: mediamanager/tdehardwarebackend.cpp:1326
+#: mediamanager/tdehardwarebackend.cpp:1435
+#: mediamanager/tdehardwarebackend.cpp:1457
msgid "<p>Technical details:<br>"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:1314
-msgid ""
-"<qt>Unable to mount this device.<p>Potential reasons include:<br>Improper "
-"device and/or user privilege level<br>Corrupt data on storage "
-"device<br>Incorrect encryption password"
+#: mediamanager/tdehardwarebackend.cpp:1284
+msgid "Decryption aborted"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:1420
+#: mediamanager/tdehardwarebackend.cpp:1443
msgid ""
"<qt>The device <b>%1</b> (%2) named <b>'%3'</b> and currently mounted at <b>"
"%4</b> can not be unmounted at this time.<p>%5<p><b>Would you like to "
@@ -395,7 +401,7 @@ msgid ""
"lost</i>"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:1547
+#: mediamanager/tdehardwarebackend.cpp:1577
#, fuzzy
msgid ""
"Programs still using the device have been detected. They are listed below. "
@@ -410,7 +416,7 @@ msgstr ""
msgid "%1 cannot be found."
msgstr "%1 را نمی‌توان یافت."
-#: mounthelper/tdeio_media_mounthelper.cpp:86
+#: mounthelper/tdeio_media_mounthelper.cpp:87
msgid "%1 is not a mountable media."
msgstr "%1 یک رسانۀ سوار شدنی نیست."
@@ -421,40 +427,48 @@ msgstr "%1 یک رسانۀ سوار شدنی نیست."
#: mounthelper/tdeio_media_mounthelper.cpp:107
#, fuzzy
-msgid "%1 is already decrypted."
+msgid "%1 is already unlocked."
msgstr "دستگاه از قبل سوار می‌شود."
-#: mounthelper/tdeio_media_mounthelper.cpp:228
+#: mounthelper/tdeio_media_mounthelper.cpp:139
+msgid "Unknown unmount error."
+msgstr ""
+
+#: mounthelper/tdeio_media_mounthelper.cpp:246
msgid "The device was successfully unmounted, but the tray could not be opened"
msgstr "دستگاه با موفقیت پیاده شد، اما نتوانست باز شود"
-#: mounthelper/tdeio_media_mounthelper.cpp:230
+#: mounthelper/tdeio_media_mounthelper.cpp:248
msgid "The device was successfully unmounted, but could not be ejected"
msgstr "دستگاه با موفقیت پیاده شد، اما نتوانست پس زده شود"
-#: mounthelper/tdeio_media_mounthelper.cpp:275
+#: mounthelper/tdeio_media_mounthelper.cpp:281
+msgid "Unknown decrypt error."
+msgstr ""
+
+#: mounthelper/tdeio_media_mounthelper.cpp:295
#, fuzzy
msgid "Decrypt given URL"
msgstr "پیاده کردن نشانی وب داده‌شده"
-#: mounthelper/tdeio_media_mounthelper.cpp:276
+#: mounthelper/tdeio_media_mounthelper.cpp:296
msgid "Unmount given URL"
msgstr "پیاده کردن نشانی وب داده‌شده"
-#: mounthelper/tdeio_media_mounthelper.cpp:277
+#: mounthelper/tdeio_media_mounthelper.cpp:297
msgid "Mount given URL (default)"
msgstr "سوار کردن نشانی وب داده‌شده )پیش‌فرض("
-#: mounthelper/tdeio_media_mounthelper.cpp:278
+#: mounthelper/tdeio_media_mounthelper.cpp:298
msgid "Eject given URL via tdeeject"
msgstr "پس زدن نشانی وب داده‌شده از طریق tdeeject"
-#: mounthelper/tdeio_media_mounthelper.cpp:279
+#: mounthelper/tdeio_media_mounthelper.cpp:299
msgid "Unmount and Eject given URL (necessary for some USB devices)"
msgstr ""
"پیاده کردن و پس زدن نشانی وب داده‌شده )لازم برای دستگاههای گذرگاه سریال جهانی("
-#: mounthelper/tdeio_media_mounthelper.cpp:280
+#: mounthelper/tdeio_media_mounthelper.cpp:300
msgid "media:/ URL to mount/unmount/eject/remove"
msgstr "media:/ نشانی وب برای سوار کردن/پیاده کردن/پس زدن/حذف"
@@ -475,43 +489,43 @@ msgstr "خرابی در ذخیرۀ تغییرات"
msgid "&Mounting"
msgstr "&سوار کردن‌"
-#: tdefile-plugin/tdefilemediaplugin.cpp:190
+#: tdefile-plugin/tdefilemediaplugin.cpp:184
msgid "Medium Information"
msgstr "اطلاعات رسانه"
-#: tdefile-plugin/tdefilemediaplugin.cpp:193
+#: tdefile-plugin/tdefilemediaplugin.cpp:187
msgid "Free"
msgstr "آزاد"
-#: tdefile-plugin/tdefilemediaplugin.cpp:196
+#: tdefile-plugin/tdefilemediaplugin.cpp:190
msgid "Used"
msgstr "استفاده‌شده"
-#: tdefile-plugin/tdefilemediaplugin.cpp:199
+#: tdefile-plugin/tdefilemediaplugin.cpp:193
msgid "Total"
msgstr "کل"
-#: tdefile-plugin/tdefilemediaplugin.cpp:202
+#: tdefile-plugin/tdefilemediaplugin.cpp:196
msgid "Base URL"
msgstr "نشانی وب پایه"
-#: tdefile-plugin/tdefilemediaplugin.cpp:203
+#: tdefile-plugin/tdefilemediaplugin.cpp:197
msgid "Mount Point"
msgstr "نقطۀ سوار کردن"
-#: tdefile-plugin/tdefilemediaplugin.cpp:204
+#: tdefile-plugin/tdefilemediaplugin.cpp:198
msgid "Device Node"
msgstr "گرۀ دستگاه"
-#: tdefile-plugin/tdefilemediaplugin.cpp:206
+#: tdefile-plugin/tdefilemediaplugin.cpp:200
msgid "Medium Summary"
msgstr "خلاصۀ رسانه"
-#: tdefile-plugin/tdefilemediaplugin.cpp:208
+#: tdefile-plugin/tdefilemediaplugin.cpp:202
msgid "Usage"
msgstr "کاربرد"
-#: tdefile-plugin/tdefilemediaplugin.cpp:210
+#: tdefile-plugin/tdefilemediaplugin.cpp:204
msgid "Bar Graph"
msgstr "گراف میله‌ای"
@@ -583,23 +597,30 @@ msgid ""
"devices are plugged in."
msgstr ""
-#: mediamanager/decryptdialog.ui:24 mounthelper/decryptdialog.ui:24
+#: mediamanager/unlockdialog.ui:24 mounthelper/unlockdialog.ui:24
#, no-c-format
msgid "Decrypting Storage Device"
msgstr ""
-#: mediamanager/decryptdialog.ui:109 mounthelper/decryptdialog.ui:109
+#: mediamanager/unlockdialog.ui:109
#, no-c-format
msgid ""
-"<p><b>%1</b> is an encrypted storage device.</p>\n"
-"<p>Please enter the password to decrypt the storage device.</p>"
+"<p><b>%1</b> is an encrypted locked storage device.</p>\n"
+"<p>Please enter the password to unlock the storage device.</p>"
msgstr ""
-#: mediamanager/decryptdialog.ui:131 mounthelper/decryptdialog.ui:131
+#: mediamanager/unlockdialog.ui:131 mounthelper/unlockdialog.ui:131
#, no-c-format
msgid "&Password:"
msgstr ""
+#: mounthelper/unlockdialog.ui:109
+#, no-c-format
+msgid ""
+"<p><b>%1</b> is an encrypted storage device.</p>\n"
+"<p>Please enter the password to decrypt the storage device.</p>"
+msgstr ""
+
#: propsdlgplugin/propertiespagegui.ui:16
#, no-c-format
msgid "PropertiesPageGUI"
@@ -861,3 +882,7 @@ msgstr "مخلوط"
#, no-c-format
msgid "Filesystem: iso9660"
msgstr "سیستم پرونده: iso9660"
+
+#, 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 ab03fa44846..e97a3e69190 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: 2019-01-13 18:47+0100\n"
+"POT-Creation-Date: 2019-07-11 02:33+0200\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"
@@ -47,7 +47,6 @@ 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
-#: mounthelper/tdeio_media_mounthelper.cpp:256
msgid "The TDE mediamanager is not running."
msgstr "TDE mediamanager ei ole käynnissä."
@@ -55,7 +54,7 @@ msgstr "TDE mediamanager ei ole käynnissä."
msgid "This media name already exists."
msgstr "Tämä tallennusvälinenimi on jo olemassa."
-#: mediaimpl.cpp:230 mediaimpl.cpp:293
+#: mediaimpl.cpp:230 mediaimpl.cpp:297
msgid "No such medium."
msgstr "Ei mediaa."
@@ -63,113 +62,117 @@ msgstr "Ei mediaa."
msgid "The drive is encrypted."
msgstr ""
-#: mediaimpl.cpp:272 mediamanager/halbackend.cpp:1264
-#: mediamanager/halbackend.cpp:1273 mediamanager/halbackend.cpp:1663
-#: mediamanager/halbackend.cpp:1680 mediamanager/halbackend.cpp:1691
-#: mediamanager/halbackend.cpp:1793 mediamanager/halbackend.cpp:1801
-#: mediamanager/halbackend.cpp:1808 mediamanager/halbackend.cpp:1848
-#: mediamanager/halbackend.cpp:1854 mediamanager/halbackend.cpp:1861
-#: mounthelper/tdeio_media_mounthelper.cpp:58
-msgid "Internal Error"
-msgstr "Sisäinen virhe"
+#: mediaimpl.cpp:274 mediamanager/tdehardwarebackend.cpp:201
+#: mediamanager/tdehardwarebackend.cpp:252
+#: mounthelper/tdeio_media_mounthelper.cpp:202
+msgid "Unknown mount error."
+msgstr ""
#: mediamanager/dialog.cpp:26 mounthelper/dialog.cpp:26
-msgid "Decrypt"
+msgid "Unlock"
msgstr ""
-#: mediamanager/fstabbackend.cpp:104 mediamanager/fstabbackend.cpp:114
-#: mediamanager/halbackend.cpp:1595 mediamanager/halbackend.cpp:1617
-#: mediamanager/halbackend.cpp:1776 mediamanager/halbackend.cpp:1831
-#: mediamanager/tdehardwarebackend.cpp:1349
-#: mediamanager/tdehardwarebackend.cpp:1360
+#: mediamanager/fstabbackend.cpp:105 mediamanager/fstabbackend.cpp:120
+#: mediamanager/halbackend.cpp:1598 mediamanager/halbackend.cpp:1625
+#: mediamanager/halbackend.cpp:1808 mediamanager/halbackend.cpp:1877
+#: mediamanager/mediamanager.cpp:363 mediamanager/mediamanager.cpp:375
+#: mediamanager/mediamanager.cpp:387 mediamanager/mediamanager.cpp:399
+#: mediamanager/tdehardwarebackend.cpp:1363
+#: mediamanager/tdehardwarebackend.cpp:1378
#, c-format
msgid "No such medium: %1"
msgstr "Ei mediaa: %1"
-#: mediamanager/fstabbackend.cpp:398
+#: mediamanager/fstabbackend.cpp:408
msgid "CD Recorder"
msgstr "CD-äänittäjä"
-#: mediamanager/fstabbackend.cpp:404
+#: mediamanager/fstabbackend.cpp:414
msgid "DVD"
msgstr "DVD"
-#: mediamanager/fstabbackend.cpp:415
+#: mediamanager/fstabbackend.cpp:425
msgid "CD-ROM"
msgstr "CD-ROM"
-#: mediamanager/fstabbackend.cpp:428
+#: mediamanager/fstabbackend.cpp:438
msgid "Floppy"
msgstr "Levyke"
-#: mediamanager/fstabbackend.cpp:436
+#: mediamanager/fstabbackend.cpp:446
msgid "Zip Disk"
msgstr "Zip-levy"
-#: mediamanager/fstabbackend.cpp:447
+#: mediamanager/fstabbackend.cpp:457
msgid "Removable Device"
msgstr "Irroitettava laite"
-#: mediamanager/fstabbackend.cpp:452 mediamanager/fstabbackend.cpp:458
+#: mediamanager/fstabbackend.cpp:462 mediamanager/fstabbackend.cpp:468
msgid "Remote Share"
msgstr "Etäjakaminen"
-#: mediamanager/fstabbackend.cpp:463
+#: mediamanager/fstabbackend.cpp:473
msgid "Hard Disk"
msgstr "Kovalevy"
-#: mediamanager/halbackend.cpp:749 mediamanager/tdehardwarebackend.cpp:805
+#: mediamanager/halbackend.cpp:744 mediamanager/tdehardwarebackend.cpp:808
#, fuzzy
msgid "Unknown Drive"
msgstr "Tuntematon"
-#: mediamanager/halbackend.cpp:761 mediamanager/tdehardwarebackend.cpp:835
+#: mediamanager/halbackend.cpp:756 mediamanager/tdehardwarebackend.cpp:838
#, fuzzy
msgid "Floppy Drive"
msgstr "Levyke"
-#: mediamanager/halbackend.cpp:769
+#: mediamanager/halbackend.cpp:764
#, fuzzy
msgid "Zip Drive"
msgstr "Zip-levy"
-#: mediamanager/halbackend.cpp:839 mediamanager/tdehardwarebackend.cpp:892
+#: mediamanager/halbackend.cpp:834 mediamanager/tdehardwarebackend.cpp:895
msgid "Camera"
msgstr "Kamera"
-#: mediamanager/halbackend.cpp:1221 mediamanager/halbackend.cpp:1247
+#: mediamanager/halbackend.cpp:1216 mediamanager/halbackend.cpp:1242
msgid "Authenticate"
msgstr ""
-#: mediamanager/halbackend.cpp:1222
+#: mediamanager/halbackend.cpp:1217
msgid ""
"<big><b>System policy prevents mounting internal media</b></big><br/"
">Authentication is required to perform this action. Please enter your "
"password to verify."
msgstr ""
-#: mediamanager/halbackend.cpp:1248
+#: mediamanager/halbackend.cpp:1243
msgid ""
"<big><b>System policy prevents unmounting media mounted by other users</b></"
"big><br/>Authentication is required to perform this action. Please enter "
"your password to verify."
msgstr ""
-#: mediamanager/halbackend.cpp:1284
+#: mediamanager/halbackend.cpp:1259 mediamanager/halbackend.cpp:1268
+#: mediamanager/halbackend.cpp:1849 mediamanager/halbackend.cpp:1916
+#: mounthelper/tdeio_media_mounthelper.cpp:58
+msgid "Internal Error"
+msgstr "Sisäinen virhe"
+
+#: mediamanager/halbackend.cpp:1279
msgid "Invalid filesystem type"
msgstr "Epäkelpo tiedostojärjestelmän tyyppi"
-#: mediamanager/halbackend.cpp:1286
+#: mediamanager/halbackend.cpp:1281
msgid ""
"Permission denied<p>Please ensure that:<br>1. You have permission to access "
"this device.<br>2. This device node is not listed in /etc/fstab.</p>"
msgstr ""
-#: mediamanager/halbackend.cpp:1290
+#: mediamanager/halbackend.cpp:1285
msgid "Device is already mounted."
msgstr "Laite on jo liitetty."
-#: mediamanager/halbackend.cpp:1340
+#: mediamanager/halbackend.cpp:1335
msgid ""
"Moreover, programs still using the device have been detected. They are "
"listed below. You have to close them or change their working directory "
@@ -179,16 +182,16 @@ msgstr ""
"listattu alla. Sinun pitää sulkea ohjelmat, tai vaihtaa niiden "
"työhakemistoa, ennen kuin laite voidaan irroittaa."
-#: mediamanager/halbackend.cpp:1381 mediamanager/tdehardwarebackend.cpp:1588
+#: mediamanager/halbackend.cpp:1376 mediamanager/tdehardwarebackend.cpp:1618
msgid ""
"Programs that were still using the device have been forcibly terminated. "
"They are listed below."
msgstr ""
-#: mediamanager/halbackend.cpp:1402 mediamanager/halbackend.cpp:1715
-#: mediamanager/tdehardwarebackend.cpp:1406
-#: mediamanager/tdehardwarebackend.cpp:1424
-#: mediamanager/tdehardwarebackend.cpp:1464
+#: mediamanager/halbackend.cpp:1397 mediamanager/halbackend.cpp:1742
+#: mediamanager/tdehardwarebackend.cpp:1430
+#: mediamanager/tdehardwarebackend.cpp:1452
+#: mediamanager/tdehardwarebackend.cpp:1494
msgid ""
"Unfortunately, the device <b>%1</b> (%2) named <b>'%3'</b> and currently "
"mounted at <b>%4</b> could not be unmounted. "
@@ -196,196 +199,199 @@ msgstr ""
"Valitettavasti laitetta <b>%1</b> (%2) nimeltään <b>'%3'</b> joka on "
"liitetty pisteeseen <b>%4</b> ei voitu irrottaa. "
-#: mediamanager/halbackend.cpp:1408 mediamanager/tdehardwarebackend.cpp:1470
+#: mediamanager/halbackend.cpp:1403 mediamanager/tdehardwarebackend.cpp:1500
msgid "The following error was returned by umount command:"
msgstr "umount-komento palautti seuraavan virheen:"
-#: mediamanager/halbackend.cpp:1478
+#: mediamanager/halbackend.cpp:1567 mediamanager/tdehardwarebackend.cpp:1322
+msgid "Cannot mount encrypted locked drives!"
+msgstr ""
+
+#: mediamanager/halbackend.cpp:1682 mediamanager/halbackend.cpp:1703
+#: mediamanager/halbackend.cpp:1716 mediamanager/halbackend.cpp:1830
+#: mediamanager/halbackend.cpp:1840 mediamanager/halbackend.cpp:1899
+#: mediamanager/halbackend.cpp:1907
#, fuzzy
-msgid "Permission denied"
-msgstr "Ei oikeutta"
+msgid "Internal error"
+msgstr "Sisäinen virhe"
-#: mediamanager/halbackend.cpp:1562 mediamanager/tdehardwarebackend.cpp:1232
-msgid "Cannot mount encrypted drives!"
-msgstr ""
+#: mediamanager/halbackend.cpp:1694
+#, fuzzy
+#| msgid "Unknown"
+msgid "Unknown error"
+msgstr "Tuntematon"
-#: mediamanager/halbackend.cpp:1721
+#: mediamanager/halbackend.cpp:1748
msgid "Unmounting failed due to the following error:"
msgstr "Irrottaminen epäonnistui, syy:"
-#: mediamanager/halbackend.cpp:1723
+#: mediamanager/halbackend.cpp:1750
msgid "Device is Busy:"
msgstr "Laite on varattu:"
-#: mediamanager/halbackend.cpp:1727
+#: mediamanager/halbackend.cpp:1754
msgid ""
"Permission denied<p>Please ensure that:<br>1. You have permission to access "
"this device.<br>2. This device was originally mounted using TDE.</p>"
msgstr ""
-#: mediamanager/halbackend.cpp:1739
+#: mediamanager/halbackend.cpp:1766
msgid ""
"%1<p><b>Would you like to forcibly terminate these processes?</b><br><i>All "
"unsaved data would be lost</i>"
msgstr ""
-#: mediamanager/halbackend.cpp:1811
+#: mediamanager/halbackend.cpp:1852
msgid "Wrong password"
msgstr ""
-#: mediamanager/mediamanager.cpp:247 mediamanager/mediamanager.cpp:266
-#: mediamanager/mediamanager.cpp:285 mediamanager/mediamanager.cpp:293
-#: mediamanager/mediamanager.cpp:302 mediamanager/mediamanager.cpp:310
-msgid "Feature only available with HAL"
-msgstr "Toiminto on saatavilla vain, mikäli HAL on käytössä"
-
-#: mediamanager/mediamanager.cpp:252
+#: mediamanager/mediamanager.cpp:248 mediamanager/mediamanager.cpp:275
#, 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:256 mediamanager/mediamanager.cpp:271
-#: mediamanager/mediamanager.cpp:275
+#: mediamanager/mediamanager.cpp:255 mediamanager/mediamanager.cpp:282
+#: mediamanager/mediamanager.cpp:312 mediamanager/mediamanager.cpp:343
+msgid "Feature only available with HAL"
+msgstr "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
#, 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:480
-#: mediamanager/tdehardwarebackend.cpp:517
-#: mediamanager/tdehardwarebackend.cpp:750
+#: mediamanager/tdehardwarebackend.cpp:483
+#: mediamanager/tdehardwarebackend.cpp:520
+#: mediamanager/tdehardwarebackend.cpp:753
#, fuzzy
msgid "%1 Removable Device"
msgstr "Irroitettava laite"
-#: mediamanager/tdehardwarebackend.cpp:525
+#: mediamanager/tdehardwarebackend.cpp:528
#, fuzzy
msgid "Blank CD-ROM"
msgstr "CD-ROM"
-#: mediamanager/tdehardwarebackend.cpp:534
+#: mediamanager/tdehardwarebackend.cpp:537
msgid "Blank CD-R"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:543
+#: mediamanager/tdehardwarebackend.cpp:546
msgid "Blank CD-RW"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:552
+#: mediamanager/tdehardwarebackend.cpp:555
msgid "Blank Magneto-Optical CD"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:561
+#: mediamanager/tdehardwarebackend.cpp:564
msgid "Blank Mount Ranier CD-RW"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:570
+#: mediamanager/tdehardwarebackend.cpp:573
msgid "Blank Mount Ranier CD-RW-W"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:579
+#: mediamanager/tdehardwarebackend.cpp:582
msgid "Blank DVD-ROM"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:588
+#: mediamanager/tdehardwarebackend.cpp:591
msgid "Blank DVD-RAM"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:597
+#: mediamanager/tdehardwarebackend.cpp:600
msgid "Blank DVD-R"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:606
+#: mediamanager/tdehardwarebackend.cpp:609
msgid "Blank DVD-RW"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:615
+#: mediamanager/tdehardwarebackend.cpp:618
msgid "Blank Dual Layer DVD-R"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:624
+#: mediamanager/tdehardwarebackend.cpp:627
msgid "Blank Dual Layer DVD-RW"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:633
+#: mediamanager/tdehardwarebackend.cpp:636
msgid "Blank DVD+R"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:642
+#: mediamanager/tdehardwarebackend.cpp:645
msgid "Blank DVD+RW"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:651
+#: mediamanager/tdehardwarebackend.cpp:654
msgid "Blank Dual Layer DVD+R"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:660
+#: mediamanager/tdehardwarebackend.cpp:663
msgid "Blank Dual Layer DVD+RW"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:669
+#: mediamanager/tdehardwarebackend.cpp:672
msgid "Blank BD-ROM"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:678
+#: mediamanager/tdehardwarebackend.cpp:681
msgid "Blank BD-R"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:687
+#: mediamanager/tdehardwarebackend.cpp:690
msgid "Blank BD-RW"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:696
+#: mediamanager/tdehardwarebackend.cpp:699
msgid "Blank HDDVD-ROM"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:705
+#: mediamanager/tdehardwarebackend.cpp:708
msgid "Blank HDDVD-R"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:714
+#: mediamanager/tdehardwarebackend.cpp:717
msgid "Blank HDDVD-RW"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:721
+#: mediamanager/tdehardwarebackend.cpp:724
msgid "Audio CD"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:742
+#: mediamanager/tdehardwarebackend.cpp:745
msgid "%1 Fixed Disk (%2)"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:849
+#: mediamanager/tdehardwarebackend.cpp:852
#, fuzzy
msgid "%1 Zip Disk"
msgstr "Zip-levy"
-#: mediamanager/tdehardwarebackend.cpp:1212
-#: mediamanager/tdehardwarebackend.cpp:1392
-#, fuzzy
-msgid "Internal error"
-msgstr "Sisäinen virhe"
+#: mediamanager/tdehardwarebackend.cpp:1224
+#: mediamanager/tdehardwarebackend.cpp:1417
+msgid "Internal error. Couldn't find medium."
+msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:1239
-msgid ""
-"<qt>Unable to mount this device.<p>Potential reasons include:<br>Improper "
-"device and/or user privilege level<br>Corrupt data on storage device"
+#: mediamanager/tdehardwarebackend.cpp:1249
+#: mediamanager/tdehardwarebackend.cpp:1323
+msgid "Unable to mount this device."
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:1241
-#: mediamanager/tdehardwarebackend.cpp:1316
-#: mediamanager/tdehardwarebackend.cpp:1408
-#: mediamanager/tdehardwarebackend.cpp:1426
+#: mediamanager/tdehardwarebackend.cpp:1252
+#: mediamanager/tdehardwarebackend.cpp:1326
+#: mediamanager/tdehardwarebackend.cpp:1435
+#: mediamanager/tdehardwarebackend.cpp:1457
msgid "<p>Technical details:<br>"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:1314
-msgid ""
-"<qt>Unable to mount this device.<p>Potential reasons include:<br>Improper "
-"device and/or user privilege level<br>Corrupt data on storage "
-"device<br>Incorrect encryption password"
+#: mediamanager/tdehardwarebackend.cpp:1284
+msgid "Decryption aborted"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:1420
+#: mediamanager/tdehardwarebackend.cpp:1443
msgid ""
"<qt>The device <b>%1</b> (%2) named <b>'%3'</b> and currently mounted at <b>"
"%4</b> can not be unmounted at this time.<p>%5<p><b>Would you like to "
@@ -393,7 +399,7 @@ msgid ""
"lost</i>"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:1547
+#: mediamanager/tdehardwarebackend.cpp:1577
#, fuzzy
msgid ""
"Programs still using the device have been detected. They are listed below. "
@@ -408,7 +414,7 @@ msgstr ""
msgid "%1 cannot be found."
msgstr "%1 ei löydy."
-#: mounthelper/tdeio_media_mounthelper.cpp:86
+#: mounthelper/tdeio_media_mounthelper.cpp:87
msgid "%1 is not a mountable media."
msgstr "%1 ei ole liitettävä media."
@@ -419,39 +425,47 @@ msgstr "%1 ei ole liitettävä media."
#: mounthelper/tdeio_media_mounthelper.cpp:107
#, fuzzy
-msgid "%1 is already decrypted."
+msgid "%1 is already unlocked."
msgstr "Laite on jo liitetty."
-#: mounthelper/tdeio_media_mounthelper.cpp:228
+#: mounthelper/tdeio_media_mounthelper.cpp:139
+msgid "Unknown unmount error."
+msgstr ""
+
+#: mounthelper/tdeio_media_mounthelper.cpp:246
msgid "The device was successfully unmounted, but the tray could not be opened"
msgstr "Laite on irrotettu, mutta kelkkaa ei voitu avata."
-#: mounthelper/tdeio_media_mounthelper.cpp:230
+#: 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:275
+#: mounthelper/tdeio_media_mounthelper.cpp:281
+msgid "Unknown decrypt error."
+msgstr ""
+
+#: mounthelper/tdeio_media_mounthelper.cpp:295
#, fuzzy
msgid "Decrypt given URL"
msgstr "Irroita annettu URL"
-#: mounthelper/tdeio_media_mounthelper.cpp:276
+#: mounthelper/tdeio_media_mounthelper.cpp:296
msgid "Unmount given URL"
msgstr "Irroita annettu URL"
-#: mounthelper/tdeio_media_mounthelper.cpp:277
+#: mounthelper/tdeio_media_mounthelper.cpp:297
msgid "Mount given URL (default)"
msgstr "Liitä annettu URL (oletus)"
-#: mounthelper/tdeio_media_mounthelper.cpp:278
+#: mounthelper/tdeio_media_mounthelper.cpp:298
msgid "Eject given URL via tdeeject"
msgstr "Poista annettu URL tdeejectillä"
-#: mounthelper/tdeio_media_mounthelper.cpp:279
+#: 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:280
+#: mounthelper/tdeio_media_mounthelper.cpp:300
msgid "media:/ URL to mount/unmount/eject/remove"
msgstr "media:/liitettävä URL/irroitus/poisto (eject)/poisto"
@@ -472,43 +486,43 @@ msgstr "Muutosten tallennus epäonnistui"
msgid "&Mounting"
msgstr "&Liitospiste"
-#: tdefile-plugin/tdefilemediaplugin.cpp:190
+#: tdefile-plugin/tdefilemediaplugin.cpp:184
msgid "Medium Information"
msgstr "Tallennusvälineiden tiedot"
-#: tdefile-plugin/tdefilemediaplugin.cpp:193
+#: tdefile-plugin/tdefilemediaplugin.cpp:187
msgid "Free"
msgstr "Vapaa"
-#: tdefile-plugin/tdefilemediaplugin.cpp:196
+#: tdefile-plugin/tdefilemediaplugin.cpp:190
msgid "Used"
msgstr "Käytetty"
-#: tdefile-plugin/tdefilemediaplugin.cpp:199
+#: tdefile-plugin/tdefilemediaplugin.cpp:193
msgid "Total"
msgstr "Kaikkiaan"
-#: tdefile-plugin/tdefilemediaplugin.cpp:202
+#: tdefile-plugin/tdefilemediaplugin.cpp:196
msgid "Base URL"
msgstr "Kanta-URL"
-#: tdefile-plugin/tdefilemediaplugin.cpp:203
+#: tdefile-plugin/tdefilemediaplugin.cpp:197
msgid "Mount Point"
msgstr "Liitospiste"
-#: tdefile-plugin/tdefilemediaplugin.cpp:204
+#: tdefile-plugin/tdefilemediaplugin.cpp:198
msgid "Device Node"
msgstr "Laitesolmu"
-#: tdefile-plugin/tdefilemediaplugin.cpp:206
+#: tdefile-plugin/tdefilemediaplugin.cpp:200
msgid "Medium Summary"
msgstr "Tallennusvälineiden tietojen yhdistelmä"
-#: tdefile-plugin/tdefilemediaplugin.cpp:208
+#: tdefile-plugin/tdefilemediaplugin.cpp:202
msgid "Usage"
msgstr "Käyttö"
-#: tdefile-plugin/tdefilemediaplugin.cpp:210
+#: tdefile-plugin/tdefilemediaplugin.cpp:204
msgid "Bar Graph"
msgstr "Pylväsdiagrammi"
@@ -580,23 +594,30 @@ msgid ""
"devices are plugged in."
msgstr ""
-#: mediamanager/decryptdialog.ui:24 mounthelper/decryptdialog.ui:24
+#: mediamanager/unlockdialog.ui:24 mounthelper/unlockdialog.ui:24
#, no-c-format
msgid "Decrypting Storage Device"
msgstr ""
-#: mediamanager/decryptdialog.ui:109 mounthelper/decryptdialog.ui:109
+#: mediamanager/unlockdialog.ui:109
#, no-c-format
msgid ""
-"<p><b>%1</b> is an encrypted storage device.</p>\n"
-"<p>Please enter the password to decrypt the storage device.</p>"
+"<p><b>%1</b> is an encrypted locked storage device.</p>\n"
+"<p>Please enter the password to unlock the storage device.</p>"
msgstr ""
-#: mediamanager/decryptdialog.ui:131 mounthelper/decryptdialog.ui:131
+#: mediamanager/unlockdialog.ui:131 mounthelper/unlockdialog.ui:131
#, no-c-format
msgid "&Password:"
msgstr ""
+#: mounthelper/unlockdialog.ui:109
+#, no-c-format
+msgid ""
+"<p><b>%1</b> is an encrypted storage device.</p>\n"
+"<p>Please enter the password to decrypt the storage device.</p>"
+msgstr ""
+
#: propsdlgplugin/propertiespagegui.ui:16
#, no-c-format
msgid "PropertiesPageGUI"
@@ -861,6 +882,10 @@ msgstr "Sekalainen"
msgid "Filesystem: iso9660"
msgstr "Tiedostojärjestelmä: iso9660"
+#, fuzzy
+#~ msgid "Permission denied"
+#~ msgstr "Ei oikeutta"
+
#~ msgid ""
#~ "\n"
#~ "Please check that the disk is entered correctly."
diff --git a/tde-i18n-fr/messages/tdebase/tdeio_media.po b/tde-i18n-fr/messages/tdebase/tdeio_media.po
index 8572bd2e84b..16c73b2176d 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: 2019-01-13 18:47+0100\n"
+"POT-Creation-Date: 2019-07-11 02:33+0200\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"
@@ -50,7 +50,6 @@ 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
-#: mounthelper/tdeio_media_mounthelper.cpp:256
msgid "The TDE mediamanager is not running."
msgstr "Le gestionnaire de média de TDE n'est pas actif."
@@ -58,7 +57,7 @@ msgstr "Le gestionnaire de média de TDE n'est pas actif."
msgid "This media name already exists."
msgstr "Ce nom de média existe déjà."
-#: mediaimpl.cpp:230 mediaimpl.cpp:293
+#: mediaimpl.cpp:230 mediaimpl.cpp:297
msgid "No such medium."
msgstr "Support inexistant."
@@ -66,110 +65,114 @@ msgstr "Support inexistant."
msgid "The drive is encrypted."
msgstr ""
-#: mediaimpl.cpp:272 mediamanager/halbackend.cpp:1264
-#: mediamanager/halbackend.cpp:1273 mediamanager/halbackend.cpp:1663
-#: mediamanager/halbackend.cpp:1680 mediamanager/halbackend.cpp:1691
-#: mediamanager/halbackend.cpp:1793 mediamanager/halbackend.cpp:1801
-#: mediamanager/halbackend.cpp:1808 mediamanager/halbackend.cpp:1848
-#: mediamanager/halbackend.cpp:1854 mediamanager/halbackend.cpp:1861
-#: mounthelper/tdeio_media_mounthelper.cpp:58
-msgid "Internal Error"
-msgstr "Erreur interne"
+#: mediaimpl.cpp:274 mediamanager/tdehardwarebackend.cpp:201
+#: mediamanager/tdehardwarebackend.cpp:252
+#: mounthelper/tdeio_media_mounthelper.cpp:202
+msgid "Unknown mount error."
+msgstr ""
#: mediamanager/dialog.cpp:26 mounthelper/dialog.cpp:26
-msgid "Decrypt"
-msgstr "Décrypter"
-
-#: mediamanager/fstabbackend.cpp:104 mediamanager/fstabbackend.cpp:114
-#: mediamanager/halbackend.cpp:1595 mediamanager/halbackend.cpp:1617
-#: mediamanager/halbackend.cpp:1776 mediamanager/halbackend.cpp:1831
-#: mediamanager/tdehardwarebackend.cpp:1349
-#: mediamanager/tdehardwarebackend.cpp:1360
+msgid "Unlock"
+msgstr ""
+
+#: mediamanager/fstabbackend.cpp:105 mediamanager/fstabbackend.cpp:120
+#: mediamanager/halbackend.cpp:1598 mediamanager/halbackend.cpp:1625
+#: mediamanager/halbackend.cpp:1808 mediamanager/halbackend.cpp:1877
+#: mediamanager/mediamanager.cpp:363 mediamanager/mediamanager.cpp:375
+#: mediamanager/mediamanager.cpp:387 mediamanager/mediamanager.cpp:399
+#: mediamanager/tdehardwarebackend.cpp:1363
+#: mediamanager/tdehardwarebackend.cpp:1378
#, c-format
msgid "No such medium: %1"
msgstr "Support inexistant : %1"
-#: mediamanager/fstabbackend.cpp:398
+#: mediamanager/fstabbackend.cpp:408
msgid "CD Recorder"
msgstr "Graveur de CD"
-#: mediamanager/fstabbackend.cpp:404
+#: mediamanager/fstabbackend.cpp:414
msgid "DVD"
msgstr "DVD"
-#: mediamanager/fstabbackend.cpp:415
+#: mediamanager/fstabbackend.cpp:425
msgid "CD-ROM"
msgstr "CD-ROM"
-#: mediamanager/fstabbackend.cpp:428
+#: mediamanager/fstabbackend.cpp:438
msgid "Floppy"
msgstr "Disquette"
-#: mediamanager/fstabbackend.cpp:436
+#: mediamanager/fstabbackend.cpp:446
msgid "Zip Disk"
msgstr "Disque Zip"
-#: mediamanager/fstabbackend.cpp:447
+#: mediamanager/fstabbackend.cpp:457
msgid "Removable Device"
msgstr "Périphérique amovible"
-#: mediamanager/fstabbackend.cpp:452 mediamanager/fstabbackend.cpp:458
+#: mediamanager/fstabbackend.cpp:462 mediamanager/fstabbackend.cpp:468
msgid "Remote Share"
msgstr "Partage distant"
-#: mediamanager/fstabbackend.cpp:463
+#: mediamanager/fstabbackend.cpp:473
msgid "Hard Disk"
msgstr "Disque dur"
-#: mediamanager/halbackend.cpp:749 mediamanager/tdehardwarebackend.cpp:805
+#: mediamanager/halbackend.cpp:744 mediamanager/tdehardwarebackend.cpp:808
msgid "Unknown Drive"
msgstr "Disque inconnu"
-#: mediamanager/halbackend.cpp:761 mediamanager/tdehardwarebackend.cpp:835
+#: mediamanager/halbackend.cpp:756 mediamanager/tdehardwarebackend.cpp:838
msgid "Floppy Drive"
msgstr "Lecteur de disquette"
-#: mediamanager/halbackend.cpp:769
+#: mediamanager/halbackend.cpp:764
msgid "Zip Drive"
msgstr "Disque Zip"
-#: mediamanager/halbackend.cpp:839 mediamanager/tdehardwarebackend.cpp:892
+#: mediamanager/halbackend.cpp:834 mediamanager/tdehardwarebackend.cpp:895
msgid "Camera"
msgstr "Appareil photo"
-#: mediamanager/halbackend.cpp:1221 mediamanager/halbackend.cpp:1247
+#: mediamanager/halbackend.cpp:1216 mediamanager/halbackend.cpp:1242
msgid "Authenticate"
msgstr ""
-#: mediamanager/halbackend.cpp:1222
+#: mediamanager/halbackend.cpp:1217
msgid ""
"<big><b>System policy prevents mounting internal media</b></big><br/"
">Authentication is required to perform this action. Please enter your "
"password to verify."
msgstr ""
-#: mediamanager/halbackend.cpp:1248
+#: mediamanager/halbackend.cpp:1243
msgid ""
"<big><b>System policy prevents unmounting media mounted by other users</b></"
"big><br/>Authentication is required to perform this action. Please enter "
"your password to verify."
msgstr ""
-#: mediamanager/halbackend.cpp:1284
+#: mediamanager/halbackend.cpp:1259 mediamanager/halbackend.cpp:1268
+#: mediamanager/halbackend.cpp:1849 mediamanager/halbackend.cpp:1916
+#: mounthelper/tdeio_media_mounthelper.cpp:58
+msgid "Internal Error"
+msgstr "Erreur interne"
+
+#: mediamanager/halbackend.cpp:1279
msgid "Invalid filesystem type"
msgstr "Type de système de fichiers incorrect"
-#: mediamanager/halbackend.cpp:1286
+#: mediamanager/halbackend.cpp:1281
msgid ""
"Permission denied<p>Please ensure that:<br>1. You have permission to access "
"this device.<br>2. This device node is not listed in /etc/fstab.</p>"
msgstr ""
-#: mediamanager/halbackend.cpp:1290
+#: mediamanager/halbackend.cpp:1285
msgid "Device is already mounted."
msgstr "Le périphérique est déjà monté."
-#: mediamanager/halbackend.cpp:1340
+#: mediamanager/halbackend.cpp:1335
msgid ""
"Moreover, programs still using the device have been detected. They are "
"listed below. You have to close them or change their working directory "
@@ -179,16 +182,16 @@ msgstr ""
"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:1381 mediamanager/tdehardwarebackend.cpp:1588
+#: mediamanager/halbackend.cpp:1376 mediamanager/tdehardwarebackend.cpp:1618
msgid ""
"Programs that were still using the device have been forcibly terminated. "
"They are listed below."
msgstr ""
-#: mediamanager/halbackend.cpp:1402 mediamanager/halbackend.cpp:1715
-#: mediamanager/tdehardwarebackend.cpp:1406
-#: mediamanager/tdehardwarebackend.cpp:1424
-#: mediamanager/tdehardwarebackend.cpp:1464
+#: mediamanager/halbackend.cpp:1397 mediamanager/halbackend.cpp:1742
+#: mediamanager/tdehardwarebackend.cpp:1430
+#: mediamanager/tdehardwarebackend.cpp:1452
+#: mediamanager/tdehardwarebackend.cpp:1494
msgid ""
"Unfortunately, the device <b>%1</b> (%2) named <b>'%3'</b> and currently "
"mounted at <b>%4</b> could not be unmounted. "
@@ -196,196 +199,199 @@ msgstr ""
"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:1408 mediamanager/tdehardwarebackend.cpp:1470
+#: mediamanager/halbackend.cpp:1403 mediamanager/tdehardwarebackend.cpp:1500
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:1478
+#: mediamanager/halbackend.cpp:1567 mediamanager/tdehardwarebackend.cpp:1322
+msgid "Cannot mount encrypted locked drives!"
+msgstr ""
+
+#: mediamanager/halbackend.cpp:1682 mediamanager/halbackend.cpp:1703
+#: mediamanager/halbackend.cpp:1716 mediamanager/halbackend.cpp:1830
+#: mediamanager/halbackend.cpp:1840 mediamanager/halbackend.cpp:1899
+#: mediamanager/halbackend.cpp:1907
#, fuzzy
-msgid "Permission denied"
-msgstr "Autorisations refusées"
+msgid "Internal error"
+msgstr "Erreur interne"
-#: mediamanager/halbackend.cpp:1562 mediamanager/tdehardwarebackend.cpp:1232
-msgid "Cannot mount encrypted drives!"
-msgstr ""
+#: mediamanager/halbackend.cpp:1694
+#, fuzzy
+#| msgid "Unknown"
+msgid "Unknown error"
+msgstr "Inconnu"
-#: mediamanager/halbackend.cpp:1721
+#: mediamanager/halbackend.cpp:1748
msgid "Unmounting failed due to the following error:"
msgstr "Le démontage a échoué en raison de l'erreur suivante :"
-#: mediamanager/halbackend.cpp:1723
+#: mediamanager/halbackend.cpp:1750
msgid "Device is Busy:"
msgstr "Le périphérique est occupé :"
-#: mediamanager/halbackend.cpp:1727
+#: mediamanager/halbackend.cpp:1754
msgid ""
"Permission denied<p>Please ensure that:<br>1. You have permission to access "
"this device.<br>2. This device was originally mounted using TDE.</p>"
msgstr ""
-#: mediamanager/halbackend.cpp:1739
+#: mediamanager/halbackend.cpp:1766
msgid ""
"%1<p><b>Would you like to forcibly terminate these processes?</b><br><i>All "
"unsaved data would be lost</i>"
msgstr ""
-#: mediamanager/halbackend.cpp:1811
+#: mediamanager/halbackend.cpp:1852
msgid "Wrong password"
msgstr ""
-#: mediamanager/mediamanager.cpp:247 mediamanager/mediamanager.cpp:266
-#: mediamanager/mediamanager.cpp:285 mediamanager/mediamanager.cpp:293
-#: mediamanager/mediamanager.cpp:302 mediamanager/mediamanager.cpp:310
-msgid "Feature only available with HAL"
-msgstr "Fonction uniquement disponible avec HAL"
-
-#: mediamanager/mediamanager.cpp:252
+#: mediamanager/mediamanager.cpp:248 mediamanager/mediamanager.cpp:275
#, fuzzy
msgid "Feature only available with the TDE hardware backend"
msgstr "Fonction uniquement disponible avec HAL"
-#: mediamanager/mediamanager.cpp:256 mediamanager/mediamanager.cpp:271
-#: mediamanager/mediamanager.cpp:275
+#: mediamanager/mediamanager.cpp:255 mediamanager/mediamanager.cpp:282
+#: mediamanager/mediamanager.cpp:312 mediamanager/mediamanager.cpp:343
+msgid "Feature only available with HAL"
+msgstr "Fonction uniquement disponible avec HAL"
+
+#: mediamanager/mediamanager.cpp:262 mediamanager/mediamanager.cpp:289
+#: mediamanager/mediamanager.cpp:320 mediamanager/mediamanager.cpp:350
#, fuzzy
msgid "Feature only available with HAL or TDE hardware backend"
msgstr "Fonction uniquement disponible avec HAL"
-#: mediamanager/tdehardwarebackend.cpp:480
-#: mediamanager/tdehardwarebackend.cpp:517
-#: mediamanager/tdehardwarebackend.cpp:750
+#: mediamanager/tdehardwarebackend.cpp:483
+#: mediamanager/tdehardwarebackend.cpp:520
+#: mediamanager/tdehardwarebackend.cpp:753
#, fuzzy
msgid "%1 Removable Device"
msgstr "Périphérique amovible"
-#: mediamanager/tdehardwarebackend.cpp:525
+#: mediamanager/tdehardwarebackend.cpp:528
#, fuzzy
msgid "Blank CD-ROM"
msgstr "CD-ROM"
-#: mediamanager/tdehardwarebackend.cpp:534
+#: mediamanager/tdehardwarebackend.cpp:537
msgid "Blank CD-R"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:543
+#: mediamanager/tdehardwarebackend.cpp:546
msgid "Blank CD-RW"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:552
+#: mediamanager/tdehardwarebackend.cpp:555
msgid "Blank Magneto-Optical CD"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:561
+#: mediamanager/tdehardwarebackend.cpp:564
msgid "Blank Mount Ranier CD-RW"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:570
+#: mediamanager/tdehardwarebackend.cpp:573
msgid "Blank Mount Ranier CD-RW-W"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:579
+#: mediamanager/tdehardwarebackend.cpp:582
msgid "Blank DVD-ROM"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:588
+#: mediamanager/tdehardwarebackend.cpp:591
msgid "Blank DVD-RAM"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:597
+#: mediamanager/tdehardwarebackend.cpp:600
msgid "Blank DVD-R"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:606
+#: mediamanager/tdehardwarebackend.cpp:609
msgid "Blank DVD-RW"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:615
+#: mediamanager/tdehardwarebackend.cpp:618
msgid "Blank Dual Layer DVD-R"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:624
+#: mediamanager/tdehardwarebackend.cpp:627
msgid "Blank Dual Layer DVD-RW"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:633
+#: mediamanager/tdehardwarebackend.cpp:636
msgid "Blank DVD+R"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:642
+#: mediamanager/tdehardwarebackend.cpp:645
msgid "Blank DVD+RW"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:651
+#: mediamanager/tdehardwarebackend.cpp:654
msgid "Blank Dual Layer DVD+R"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:660
+#: mediamanager/tdehardwarebackend.cpp:663
msgid "Blank Dual Layer DVD+RW"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:669
+#: mediamanager/tdehardwarebackend.cpp:672
msgid "Blank BD-ROM"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:678
+#: mediamanager/tdehardwarebackend.cpp:681
msgid "Blank BD-R"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:687
+#: mediamanager/tdehardwarebackend.cpp:690
msgid "Blank BD-RW"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:696
+#: mediamanager/tdehardwarebackend.cpp:699
msgid "Blank HDDVD-ROM"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:705
+#: mediamanager/tdehardwarebackend.cpp:708
msgid "Blank HDDVD-R"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:714
+#: mediamanager/tdehardwarebackend.cpp:717
msgid "Blank HDDVD-RW"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:721
+#: mediamanager/tdehardwarebackend.cpp:724
msgid "Audio CD"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:742
+#: mediamanager/tdehardwarebackend.cpp:745
msgid "%1 Fixed Disk (%2)"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:849
+#: mediamanager/tdehardwarebackend.cpp:852
#, fuzzy
msgid "%1 Zip Disk"
msgstr "Disque Zip"
-#: mediamanager/tdehardwarebackend.cpp:1212
-#: mediamanager/tdehardwarebackend.cpp:1392
-#, fuzzy
-msgid "Internal error"
-msgstr "Erreur interne"
+#: mediamanager/tdehardwarebackend.cpp:1224
+#: mediamanager/tdehardwarebackend.cpp:1417
+msgid "Internal error. Couldn't find medium."
+msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:1239
-msgid ""
-"<qt>Unable to mount this device.<p>Potential reasons include:<br>Improper "
-"device and/or user privilege level<br>Corrupt data on storage device"
+#: mediamanager/tdehardwarebackend.cpp:1249
+#: mediamanager/tdehardwarebackend.cpp:1323
+msgid "Unable to mount this device."
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:1241
-#: mediamanager/tdehardwarebackend.cpp:1316
-#: mediamanager/tdehardwarebackend.cpp:1408
-#: mediamanager/tdehardwarebackend.cpp:1426
+#: mediamanager/tdehardwarebackend.cpp:1252
+#: mediamanager/tdehardwarebackend.cpp:1326
+#: mediamanager/tdehardwarebackend.cpp:1435
+#: mediamanager/tdehardwarebackend.cpp:1457
msgid "<p>Technical details:<br>"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:1314
-msgid ""
-"<qt>Unable to mount this device.<p>Potential reasons include:<br>Improper "
-"device and/or user privilege level<br>Corrupt data on storage "
-"device<br>Incorrect encryption password"
+#: mediamanager/tdehardwarebackend.cpp:1284
+msgid "Decryption aborted"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:1420
+#: mediamanager/tdehardwarebackend.cpp:1443
msgid ""
"<qt>The device <b>%1</b> (%2) named <b>'%3'</b> and currently mounted at <b>"
"%4</b> can not be unmounted at this time.<p>%5<p><b>Would you like to "
@@ -393,7 +399,7 @@ msgid ""
"lost</i>"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:1547
+#: mediamanager/tdehardwarebackend.cpp:1577
#, fuzzy
msgid ""
"Programs still using the device have been detected. They are listed below. "
@@ -408,7 +414,7 @@ msgstr ""
msgid "%1 cannot be found."
msgstr "%1 introuvable."
-#: mounthelper/tdeio_media_mounthelper.cpp:86
+#: mounthelper/tdeio_media_mounthelper.cpp:87
msgid "%1 is not a mountable media."
msgstr "%1 n'est pas un média montable."
@@ -419,43 +425,51 @@ msgstr "%1 n'est pas un média montable."
#: mounthelper/tdeio_media_mounthelper.cpp:107
#, fuzzy
-msgid "%1 is already decrypted."
+msgid "%1 is already unlocked."
msgstr "Le périphérique est déjà monté."
-#: mounthelper/tdeio_media_mounthelper.cpp:228
+#: mounthelper/tdeio_media_mounthelper.cpp:139
+msgid "Unknown unmount error."
+msgstr ""
+
+#: mounthelper/tdeio_media_mounthelper.cpp:246
msgid "The device was successfully unmounted, but the tray could not be opened"
msgstr ""
"Le périphérique a été correctement libéré, mais le plateau n'a pas pu être "
"ouvert."
-#: mounthelper/tdeio_media_mounthelper.cpp:230
+#: mounthelper/tdeio_media_mounthelper.cpp:248
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é."
-#: mounthelper/tdeio_media_mounthelper.cpp:275
+#: mounthelper/tdeio_media_mounthelper.cpp:281
+msgid "Unknown decrypt error."
+msgstr ""
+
+#: mounthelper/tdeio_media_mounthelper.cpp:295
#, fuzzy
msgid "Decrypt given URL"
msgstr "Libérer l'URL indiquée"
-#: mounthelper/tdeio_media_mounthelper.cpp:276
+#: mounthelper/tdeio_media_mounthelper.cpp:296
msgid "Unmount given URL"
msgstr "Libérer l'URL indiquée"
-#: mounthelper/tdeio_media_mounthelper.cpp:277
+#: 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:278
+#: 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:279
+#: mounthelper/tdeio_media_mounthelper.cpp:299
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)"
-#: mounthelper/tdeio_media_mounthelper.cpp:280
+#: mounthelper/tdeio_media_mounthelper.cpp:300
msgid "media:/ URL to mount/unmount/eject/remove"
msgstr "URL du « media:/ » à monter / libérer / retirer / supprimer"
@@ -476,43 +490,43 @@ msgstr "Échec de l'enregistrement des modifications"
msgid "&Mounting"
msgstr "&Montage"
-#: tdefile-plugin/tdefilemediaplugin.cpp:190
+#: tdefile-plugin/tdefilemediaplugin.cpp:184
msgid "Medium Information"
msgstr "Informations sur le média"
-#: tdefile-plugin/tdefilemediaplugin.cpp:193
+#: tdefile-plugin/tdefilemediaplugin.cpp:187
msgid "Free"
msgstr "Libre"
-#: tdefile-plugin/tdefilemediaplugin.cpp:196
+#: tdefile-plugin/tdefilemediaplugin.cpp:190
msgid "Used"
msgstr "Utilisé"
-#: tdefile-plugin/tdefilemediaplugin.cpp:199
+#: tdefile-plugin/tdefilemediaplugin.cpp:193
msgid "Total"
msgstr "Total"
-#: tdefile-plugin/tdefilemediaplugin.cpp:202
+#: tdefile-plugin/tdefilemediaplugin.cpp:196
msgid "Base URL"
msgstr "URL de base"
-#: tdefile-plugin/tdefilemediaplugin.cpp:203
+#: tdefile-plugin/tdefilemediaplugin.cpp:197
msgid "Mount Point"
msgstr "Point de montage"
-#: tdefile-plugin/tdefilemediaplugin.cpp:204
+#: tdefile-plugin/tdefilemediaplugin.cpp:198
msgid "Device Node"
msgstr "Périphérique"
-#: tdefile-plugin/tdefilemediaplugin.cpp:206
+#: tdefile-plugin/tdefilemediaplugin.cpp:200
msgid "Medium Summary"
msgstr "Résumé du média"
-#: tdefile-plugin/tdefilemediaplugin.cpp:208
+#: tdefile-plugin/tdefilemediaplugin.cpp:202
msgid "Usage"
msgstr "Utilisation"
-#: tdefile-plugin/tdefilemediaplugin.cpp:210
+#: tdefile-plugin/tdefilemediaplugin.cpp:204
msgid "Bar Graph"
msgstr "Graphique en barre"
@@ -584,23 +598,30 @@ msgid ""
"devices are plugged in."
msgstr ""
-#: mediamanager/decryptdialog.ui:24 mounthelper/decryptdialog.ui:24
+#: mediamanager/unlockdialog.ui:24 mounthelper/unlockdialog.ui:24
#, no-c-format
msgid "Decrypting Storage Device"
msgstr ""
-#: mediamanager/decryptdialog.ui:109 mounthelper/decryptdialog.ui:109
+#: mediamanager/unlockdialog.ui:109
#, no-c-format
msgid ""
-"<p><b>%1</b> is an encrypted storage device.</p>\n"
-"<p>Please enter the password to decrypt the storage device.</p>"
+"<p><b>%1</b> is an encrypted locked storage device.</p>\n"
+"<p>Please enter the password to unlock the storage device.</p>"
msgstr ""
-#: mediamanager/decryptdialog.ui:131 mounthelper/decryptdialog.ui:131
+#: mediamanager/unlockdialog.ui:131 mounthelper/unlockdialog.ui:131
#, no-c-format
msgid "&Password:"
msgstr ""
+#: mounthelper/unlockdialog.ui:109
+#, no-c-format
+msgid ""
+"<p><b>%1</b> is an encrypted storage device.</p>\n"
+"<p>Please enter the password to decrypt the storage device.</p>"
+msgstr ""
+
#: propsdlgplugin/propertiespagegui.ui:16
#, no-c-format
msgid "PropertiesPageGUI"
@@ -865,3 +886,10 @@ msgstr "Mode mixte"
#, no-c-format
msgid "Filesystem: iso9660"
msgstr "Système de fichiers : iso9660"
+
+#~ msgid "Decrypt"
+#~ msgstr "Décrypter"
+
+#, fuzzy
+#~ msgid "Permission denied"
+#~ msgstr "Autorisations refusées"
diff --git a/tde-i18n-fy/messages/tdebase/tdeio_media.po b/tde-i18n-fy/messages/tdebase/tdeio_media.po
index 67031d10ece..b6d86c492c4 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: 2019-01-13 18:47+0100\n"
+"POT-Creation-Date: 2019-07-11 02:33+0200\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"
@@ -47,7 +47,6 @@ 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
-#: mounthelper/tdeio_media_mounthelper.cpp:256
msgid "The TDE mediamanager is not running."
msgstr "De TDE-mediabehearder rint net"
@@ -55,7 +54,7 @@ msgstr "De TDE-mediabehearder rint net"
msgid "This media name already exists."
msgstr "Dizze mediumnamme bestiet al."
-#: mediaimpl.cpp:230 mediaimpl.cpp:293
+#: mediaimpl.cpp:230 mediaimpl.cpp:297
msgid "No such medium."
msgstr "Net sa'n medium."
@@ -63,113 +62,117 @@ msgstr "Net sa'n medium."
msgid "The drive is encrypted."
msgstr ""
-#: mediaimpl.cpp:272 mediamanager/halbackend.cpp:1264
-#: mediamanager/halbackend.cpp:1273 mediamanager/halbackend.cpp:1663
-#: mediamanager/halbackend.cpp:1680 mediamanager/halbackend.cpp:1691
-#: mediamanager/halbackend.cpp:1793 mediamanager/halbackend.cpp:1801
-#: mediamanager/halbackend.cpp:1808 mediamanager/halbackend.cpp:1848
-#: mediamanager/halbackend.cpp:1854 mediamanager/halbackend.cpp:1861
-#: mounthelper/tdeio_media_mounthelper.cpp:58
-msgid "Internal Error"
-msgstr "Ynterne flater"
+#: mediaimpl.cpp:274 mediamanager/tdehardwarebackend.cpp:201
+#: mediamanager/tdehardwarebackend.cpp:252
+#: mounthelper/tdeio_media_mounthelper.cpp:202
+msgid "Unknown mount error."
+msgstr ""
#: mediamanager/dialog.cpp:26 mounthelper/dialog.cpp:26
-msgid "Decrypt"
+msgid "Unlock"
msgstr ""
-#: mediamanager/fstabbackend.cpp:104 mediamanager/fstabbackend.cpp:114
-#: mediamanager/halbackend.cpp:1595 mediamanager/halbackend.cpp:1617
-#: mediamanager/halbackend.cpp:1776 mediamanager/halbackend.cpp:1831
-#: mediamanager/tdehardwarebackend.cpp:1349
-#: mediamanager/tdehardwarebackend.cpp:1360
+#: mediamanager/fstabbackend.cpp:105 mediamanager/fstabbackend.cpp:120
+#: mediamanager/halbackend.cpp:1598 mediamanager/halbackend.cpp:1625
+#: mediamanager/halbackend.cpp:1808 mediamanager/halbackend.cpp:1877
+#: mediamanager/mediamanager.cpp:363 mediamanager/mediamanager.cpp:375
+#: mediamanager/mediamanager.cpp:387 mediamanager/mediamanager.cpp:399
+#: mediamanager/tdehardwarebackend.cpp:1363
+#: mediamanager/tdehardwarebackend.cpp:1378
#, c-format
msgid "No such medium: %1"
msgstr "Net sa'n medium: %1"
-#: mediamanager/fstabbackend.cpp:398
+#: mediamanager/fstabbackend.cpp:408
msgid "CD Recorder"
msgstr "kompaktskriuwskiif stasjon"
-#: mediamanager/fstabbackend.cpp:404
+#: mediamanager/fstabbackend.cpp:414
msgid "DVD"
msgstr "Dûbelskiif"
-#: mediamanager/fstabbackend.cpp:415
+#: mediamanager/fstabbackend.cpp:425
msgid "CD-ROM"
msgstr "Kompaktskiif"
-#: mediamanager/fstabbackend.cpp:428
+#: mediamanager/fstabbackend.cpp:438
msgid "Floppy"
msgstr "Slappe skiif"
-#: mediamanager/fstabbackend.cpp:436
+#: mediamanager/fstabbackend.cpp:446
msgid "Zip Disk"
msgstr "Zip-skiif"
-#: mediamanager/fstabbackend.cpp:447
+#: mediamanager/fstabbackend.cpp:457
msgid "Removable Device"
msgstr "Ferwiskselber apparaat"
-#: mediamanager/fstabbackend.cpp:452 mediamanager/fstabbackend.cpp:458
+#: mediamanager/fstabbackend.cpp:462 mediamanager/fstabbackend.cpp:468
msgid "Remote Share"
msgstr "Dielde boarne op ôfstân"
-#: mediamanager/fstabbackend.cpp:463
+#: mediamanager/fstabbackend.cpp:473
msgid "Hard Disk"
msgstr "Hurdeskiif"
-#: mediamanager/halbackend.cpp:749 mediamanager/tdehardwarebackend.cpp:805
+#: mediamanager/halbackend.cpp:744 mediamanager/tdehardwarebackend.cpp:808
#, fuzzy
msgid "Unknown Drive"
msgstr "Unbekend"
-#: mediamanager/halbackend.cpp:761 mediamanager/tdehardwarebackend.cpp:835
+#: mediamanager/halbackend.cpp:756 mediamanager/tdehardwarebackend.cpp:838
#, fuzzy
msgid "Floppy Drive"
msgstr "Slappe skiif"
-#: mediamanager/halbackend.cpp:769
+#: mediamanager/halbackend.cpp:764
#, fuzzy
msgid "Zip Drive"
msgstr "Zip-skiif"
-#: mediamanager/halbackend.cpp:839 mediamanager/tdehardwarebackend.cpp:892
+#: mediamanager/halbackend.cpp:834 mediamanager/tdehardwarebackend.cpp:895
msgid "Camera"
msgstr "Kamera"
-#: mediamanager/halbackend.cpp:1221 mediamanager/halbackend.cpp:1247
+#: mediamanager/halbackend.cpp:1216 mediamanager/halbackend.cpp:1242
msgid "Authenticate"
msgstr ""
-#: mediamanager/halbackend.cpp:1222
+#: mediamanager/halbackend.cpp:1217
msgid ""
"<big><b>System policy prevents mounting internal media</b></big><br/"
">Authentication is required to perform this action. Please enter your "
"password to verify."
msgstr ""
-#: mediamanager/halbackend.cpp:1248
+#: mediamanager/halbackend.cpp:1243
msgid ""
"<big><b>System policy prevents unmounting media mounted by other users</b></"
"big><br/>Authentication is required to perform this action. Please enter "
"your password to verify."
msgstr ""
-#: mediamanager/halbackend.cpp:1284
+#: mediamanager/halbackend.cpp:1259 mediamanager/halbackend.cpp:1268
+#: mediamanager/halbackend.cpp:1849 mediamanager/halbackend.cpp:1916
+#: mounthelper/tdeio_media_mounthelper.cpp:58
+msgid "Internal Error"
+msgstr "Ynterne flater"
+
+#: mediamanager/halbackend.cpp:1279
msgid "Invalid filesystem type"
msgstr "Unjildich triemsysteem type"
-#: mediamanager/halbackend.cpp:1286
+#: mediamanager/halbackend.cpp:1281
msgid ""
"Permission denied<p>Please ensure that:<br>1. You have permission to access "
"this device.<br>2. This device node is not listed in /etc/fstab.</p>"
msgstr ""
-#: mediamanager/halbackend.cpp:1290
+#: mediamanager/halbackend.cpp:1285
msgid "Device is already mounted."
msgstr "Apparaat is al keppele"
-#: mediamanager/halbackend.cpp:1340
+#: mediamanager/halbackend.cpp:1335
msgid ""
"Moreover, programs still using the device have been detected. They are "
"listed below. You have to close them or change their working directory "
@@ -179,16 +182,16 @@ msgstr ""
"hjirûnder. Jo moatte se slute of har wurktafel feroareje foardat jo it "
"apparaat wer keppelje."
-#: mediamanager/halbackend.cpp:1381 mediamanager/tdehardwarebackend.cpp:1588
+#: mediamanager/halbackend.cpp:1376 mediamanager/tdehardwarebackend.cpp:1618
msgid ""
"Programs that were still using the device have been forcibly terminated. "
"They are listed below."
msgstr ""
-#: mediamanager/halbackend.cpp:1402 mediamanager/halbackend.cpp:1715
-#: mediamanager/tdehardwarebackend.cpp:1406
-#: mediamanager/tdehardwarebackend.cpp:1424
-#: mediamanager/tdehardwarebackend.cpp:1464
+#: mediamanager/halbackend.cpp:1397 mediamanager/halbackend.cpp:1742
+#: mediamanager/tdehardwarebackend.cpp:1430
+#: mediamanager/tdehardwarebackend.cpp:1452
+#: mediamanager/tdehardwarebackend.cpp:1494
msgid ""
"Unfortunately, the device <b>%1</b> (%2) named <b>'%3'</b> and currently "
"mounted at <b>%4</b> could not be unmounted. "
@@ -196,196 +199,199 @@ msgstr ""
"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:1408 mediamanager/tdehardwarebackend.cpp:1470
+#: mediamanager/halbackend.cpp:1403 mediamanager/tdehardwarebackend.cpp:1500
msgid "The following error was returned by umount command:"
msgstr "De neikommende flater kaam werom by it ôfkeppel kommando:"
-#: mediamanager/halbackend.cpp:1478
+#: mediamanager/halbackend.cpp:1567 mediamanager/tdehardwarebackend.cpp:1322
+msgid "Cannot mount encrypted locked drives!"
+msgstr ""
+
+#: mediamanager/halbackend.cpp:1682 mediamanager/halbackend.cpp:1703
+#: mediamanager/halbackend.cpp:1716 mediamanager/halbackend.cpp:1830
+#: mediamanager/halbackend.cpp:1840 mediamanager/halbackend.cpp:1899
+#: mediamanager/halbackend.cpp:1907
#, fuzzy
-msgid "Permission denied"
-msgstr "Tagong wegere."
+msgid "Internal error"
+msgstr "Ynterne flater"
-#: mediamanager/halbackend.cpp:1562 mediamanager/tdehardwarebackend.cpp:1232
-msgid "Cannot mount encrypted drives!"
-msgstr ""
+#: mediamanager/halbackend.cpp:1694
+#, fuzzy
+#| msgid "Unknown"
+msgid "Unknown error"
+msgstr "Unbekend"
-#: mediamanager/halbackend.cpp:1721
+#: mediamanager/halbackend.cpp:1748
msgid "Unmounting failed due to the following error:"
msgstr "Ofkeppeljen mislearre troch de neikommende flater:"
-#: mediamanager/halbackend.cpp:1723
+#: mediamanager/halbackend.cpp:1750
msgid "Device is Busy:"
msgstr "Apparaat is dwaande:"
-#: mediamanager/halbackend.cpp:1727
+#: mediamanager/halbackend.cpp:1754
msgid ""
"Permission denied<p>Please ensure that:<br>1. You have permission to access "
"this device.<br>2. This device was originally mounted using TDE.</p>"
msgstr ""
-#: mediamanager/halbackend.cpp:1739
+#: mediamanager/halbackend.cpp:1766
msgid ""
"%1<p><b>Would you like to forcibly terminate these processes?</b><br><i>All "
"unsaved data would be lost</i>"
msgstr ""
-#: mediamanager/halbackend.cpp:1811
+#: mediamanager/halbackend.cpp:1852
msgid "Wrong password"
msgstr ""
-#: mediamanager/mediamanager.cpp:247 mediamanager/mediamanager.cpp:266
-#: mediamanager/mediamanager.cpp:285 mediamanager/mediamanager.cpp:293
-#: mediamanager/mediamanager.cpp:302 mediamanager/mediamanager.cpp:310
-msgid "Feature only available with HAL"
-msgstr "Funskje allinne beskikber mei HAL"
-
-#: mediamanager/mediamanager.cpp:252
+#: mediamanager/mediamanager.cpp:248 mediamanager/mediamanager.cpp:275
#, fuzzy
msgid "Feature only available with the TDE hardware backend"
msgstr "Funskje allinne beskikber mei HAL"
-#: mediamanager/mediamanager.cpp:256 mediamanager/mediamanager.cpp:271
-#: mediamanager/mediamanager.cpp:275
+#: mediamanager/mediamanager.cpp:255 mediamanager/mediamanager.cpp:282
+#: mediamanager/mediamanager.cpp:312 mediamanager/mediamanager.cpp:343
+msgid "Feature only available with HAL"
+msgstr "Funskje allinne beskikber mei HAL"
+
+#: mediamanager/mediamanager.cpp:262 mediamanager/mediamanager.cpp:289
+#: mediamanager/mediamanager.cpp:320 mediamanager/mediamanager.cpp:350
#, fuzzy
msgid "Feature only available with HAL or TDE hardware backend"
msgstr "Funskje allinne beskikber mei HAL"
-#: mediamanager/tdehardwarebackend.cpp:480
-#: mediamanager/tdehardwarebackend.cpp:517
-#: mediamanager/tdehardwarebackend.cpp:750
+#: mediamanager/tdehardwarebackend.cpp:483
+#: mediamanager/tdehardwarebackend.cpp:520
+#: mediamanager/tdehardwarebackend.cpp:753
#, fuzzy
msgid "%1 Removable Device"
msgstr "Ferwiskselber apparaat"
-#: mediamanager/tdehardwarebackend.cpp:525
+#: mediamanager/tdehardwarebackend.cpp:528
#, fuzzy
msgid "Blank CD-ROM"
msgstr "Kompaktskiif"
-#: mediamanager/tdehardwarebackend.cpp:534
+#: mediamanager/tdehardwarebackend.cpp:537
msgid "Blank CD-R"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:543
+#: mediamanager/tdehardwarebackend.cpp:546
msgid "Blank CD-RW"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:552
+#: mediamanager/tdehardwarebackend.cpp:555
msgid "Blank Magneto-Optical CD"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:561
+#: mediamanager/tdehardwarebackend.cpp:564
msgid "Blank Mount Ranier CD-RW"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:570
+#: mediamanager/tdehardwarebackend.cpp:573
msgid "Blank Mount Ranier CD-RW-W"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:579
+#: mediamanager/tdehardwarebackend.cpp:582
msgid "Blank DVD-ROM"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:588
+#: mediamanager/tdehardwarebackend.cpp:591
msgid "Blank DVD-RAM"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:597
+#: mediamanager/tdehardwarebackend.cpp:600
msgid "Blank DVD-R"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:606
+#: mediamanager/tdehardwarebackend.cpp:609
msgid "Blank DVD-RW"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:615
+#: mediamanager/tdehardwarebackend.cpp:618
msgid "Blank Dual Layer DVD-R"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:624
+#: mediamanager/tdehardwarebackend.cpp:627
msgid "Blank Dual Layer DVD-RW"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:633
+#: mediamanager/tdehardwarebackend.cpp:636
msgid "Blank DVD+R"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:642
+#: mediamanager/tdehardwarebackend.cpp:645
msgid "Blank DVD+RW"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:651
+#: mediamanager/tdehardwarebackend.cpp:654
msgid "Blank Dual Layer DVD+R"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:660
+#: mediamanager/tdehardwarebackend.cpp:663
msgid "Blank Dual Layer DVD+RW"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:669
+#: mediamanager/tdehardwarebackend.cpp:672
msgid "Blank BD-ROM"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:678
+#: mediamanager/tdehardwarebackend.cpp:681
msgid "Blank BD-R"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:687
+#: mediamanager/tdehardwarebackend.cpp:690
msgid "Blank BD-RW"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:696
+#: mediamanager/tdehardwarebackend.cpp:699
msgid "Blank HDDVD-ROM"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:705
+#: mediamanager/tdehardwarebackend.cpp:708
msgid "Blank HDDVD-R"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:714
+#: mediamanager/tdehardwarebackend.cpp:717
msgid "Blank HDDVD-RW"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:721
+#: mediamanager/tdehardwarebackend.cpp:724
msgid "Audio CD"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:742
+#: mediamanager/tdehardwarebackend.cpp:745
msgid "%1 Fixed Disk (%2)"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:849
+#: mediamanager/tdehardwarebackend.cpp:852
#, fuzzy
msgid "%1 Zip Disk"
msgstr "Zip-skiif"
-#: mediamanager/tdehardwarebackend.cpp:1212
-#: mediamanager/tdehardwarebackend.cpp:1392
-#, fuzzy
-msgid "Internal error"
-msgstr "Ynterne flater"
+#: mediamanager/tdehardwarebackend.cpp:1224
+#: mediamanager/tdehardwarebackend.cpp:1417
+msgid "Internal error. Couldn't find medium."
+msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:1239
-msgid ""
-"<qt>Unable to mount this device.<p>Potential reasons include:<br>Improper "
-"device and/or user privilege level<br>Corrupt data on storage device"
+#: mediamanager/tdehardwarebackend.cpp:1249
+#: mediamanager/tdehardwarebackend.cpp:1323
+msgid "Unable to mount this device."
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:1241
-#: mediamanager/tdehardwarebackend.cpp:1316
-#: mediamanager/tdehardwarebackend.cpp:1408
-#: mediamanager/tdehardwarebackend.cpp:1426
+#: mediamanager/tdehardwarebackend.cpp:1252
+#: mediamanager/tdehardwarebackend.cpp:1326
+#: mediamanager/tdehardwarebackend.cpp:1435
+#: mediamanager/tdehardwarebackend.cpp:1457
msgid "<p>Technical details:<br>"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:1314
-msgid ""
-"<qt>Unable to mount this device.<p>Potential reasons include:<br>Improper "
-"device and/or user privilege level<br>Corrupt data on storage "
-"device<br>Incorrect encryption password"
+#: mediamanager/tdehardwarebackend.cpp:1284
+msgid "Decryption aborted"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:1420
+#: mediamanager/tdehardwarebackend.cpp:1443
msgid ""
"<qt>The device <b>%1</b> (%2) named <b>'%3'</b> and currently mounted at <b>"
"%4</b> can not be unmounted at this time.<p>%5<p><b>Would you like to "
@@ -393,7 +399,7 @@ msgid ""
"lost</i>"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:1547
+#: mediamanager/tdehardwarebackend.cpp:1577
#, fuzzy
msgid ""
"Programs still using the device have been detected. They are listed below. "
@@ -408,7 +414,7 @@ msgstr ""
msgid "%1 cannot be found."
msgstr "%1 is net fûn."
-#: mounthelper/tdeio_media_mounthelper.cpp:86
+#: mounthelper/tdeio_media_mounthelper.cpp:87
msgid "%1 is not a mountable media."
msgstr "%1 is net in keppelber medium."
@@ -419,42 +425,50 @@ msgstr "%1 is net in keppelber medium."
#: mounthelper/tdeio_media_mounthelper.cpp:107
#, fuzzy
-msgid "%1 is already decrypted."
+msgid "%1 is already unlocked."
msgstr "Apparaat is al keppele"
-#: mounthelper/tdeio_media_mounthelper.cpp:228
+#: mounthelper/tdeio_media_mounthelper.cpp:139
+msgid "Unknown unmount error."
+msgstr ""
+
+#: mounthelper/tdeio_media_mounthelper.cpp:246
msgid "The device was successfully unmounted, but the tray could not be opened"
msgstr ""
"It apparaat is mei sukses ôfkeppele, mar it systeemfak koe net iepene wurde"
-#: mounthelper/tdeio_media_mounthelper.cpp:230
+#: 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:275
+#: mounthelper/tdeio_media_mounthelper.cpp:281
+msgid "Unknown decrypt error."
+msgstr ""
+
+#: mounthelper/tdeio_media_mounthelper.cpp:295
#, fuzzy
msgid "Decrypt given URL"
msgstr "Opjûne URL-adres ôfkeppelje"
-#: mounthelper/tdeio_media_mounthelper.cpp:276
+#: mounthelper/tdeio_media_mounthelper.cpp:296
msgid "Unmount given URL"
msgstr "Opjûne URL-adres ôfkeppelje"
-#: mounthelper/tdeio_media_mounthelper.cpp:277
+#: mounthelper/tdeio_media_mounthelper.cpp:297
msgid "Mount given URL (default)"
msgstr "Opjûne URL-adres oankeppelje (standert)"
-#: mounthelper/tdeio_media_mounthelper.cpp:278
+#: 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:279
+#: mounthelper/tdeio_media_mounthelper.cpp:299
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)"
-#: mounthelper/tdeio_media_mounthelper.cpp:280
+#: mounthelper/tdeio_media_mounthelper.cpp:300
msgid "media:/ URL to mount/unmount/eject/remove"
msgstr "media:/ URL-adres om oan te keppelje/út te smiten/fuort te smiten"
@@ -475,43 +489,43 @@ msgstr "It bewarjen fan de feroarings is mislearre"
msgid "&Mounting"
msgstr "&Keppelje"
-#: tdefile-plugin/tdefilemediaplugin.cpp:190
+#: tdefile-plugin/tdefilemediaplugin.cpp:184
msgid "Medium Information"
msgstr "Mediumynformaasje"
-#: tdefile-plugin/tdefilemediaplugin.cpp:193
+#: tdefile-plugin/tdefilemediaplugin.cpp:187
msgid "Free"
msgstr "Frij"
-#: tdefile-plugin/tdefilemediaplugin.cpp:196
+#: tdefile-plugin/tdefilemediaplugin.cpp:190
msgid "Used"
msgstr "Brûkt"
-#: tdefile-plugin/tdefilemediaplugin.cpp:199
+#: tdefile-plugin/tdefilemediaplugin.cpp:193
msgid "Total"
msgstr "Totaal"
-#: tdefile-plugin/tdefilemediaplugin.cpp:202
+#: tdefile-plugin/tdefilemediaplugin.cpp:196
msgid "Base URL"
msgstr "Basis URL-adres"
-#: tdefile-plugin/tdefilemediaplugin.cpp:203
+#: tdefile-plugin/tdefilemediaplugin.cpp:197
msgid "Mount Point"
msgstr "Oankeppelpunt"
-#: tdefile-plugin/tdefilemediaplugin.cpp:204
+#: tdefile-plugin/tdefilemediaplugin.cpp:198
msgid "Device Node"
msgstr "Apparaatknooppunt"
-#: tdefile-plugin/tdefilemediaplugin.cpp:206
+#: tdefile-plugin/tdefilemediaplugin.cpp:200
msgid "Medium Summary"
msgstr "Gearfetting fan medium"
-#: tdefile-plugin/tdefilemediaplugin.cpp:208
+#: tdefile-plugin/tdefilemediaplugin.cpp:202
msgid "Usage"
msgstr "Gebrûk"
-#: tdefile-plugin/tdefilemediaplugin.cpp:210
+#: tdefile-plugin/tdefilemediaplugin.cpp:204
msgid "Bar Graph"
msgstr "Balkgrafyk"
@@ -583,23 +597,30 @@ msgid ""
"devices are plugged in."
msgstr ""
-#: mediamanager/decryptdialog.ui:24 mounthelper/decryptdialog.ui:24
+#: mediamanager/unlockdialog.ui:24 mounthelper/unlockdialog.ui:24
#, no-c-format
msgid "Decrypting Storage Device"
msgstr ""
-#: mediamanager/decryptdialog.ui:109 mounthelper/decryptdialog.ui:109
+#: mediamanager/unlockdialog.ui:109
#, no-c-format
msgid ""
-"<p><b>%1</b> is an encrypted storage device.</p>\n"
-"<p>Please enter the password to decrypt the storage device.</p>"
+"<p><b>%1</b> is an encrypted locked storage device.</p>\n"
+"<p>Please enter the password to unlock the storage device.</p>"
msgstr ""
-#: mediamanager/decryptdialog.ui:131 mounthelper/decryptdialog.ui:131
+#: mediamanager/unlockdialog.ui:131 mounthelper/unlockdialog.ui:131
#, no-c-format
msgid "&Password:"
msgstr ""
+#: mounthelper/unlockdialog.ui:109
+#, no-c-format
+msgid ""
+"<p><b>%1</b> is an encrypted storage device.</p>\n"
+"<p>Please enter the password to decrypt the storage device.</p>"
+msgstr ""
+
#: propsdlgplugin/propertiespagegui.ui:16
#, no-c-format
msgid "PropertiesPageGUI"
@@ -864,6 +885,10 @@ msgstr "Mingd"
msgid "Filesystem: iso9660"
msgstr "Triemsysteem: iso9660"
+#, fuzzy
+#~ msgid "Permission denied"
+#~ msgstr "Tagong wegere."
+
#~ msgid ""
#~ "\n"
#~ "Please check that the disk is entered correctly."
diff --git a/tde-i18n-ga/messages/tdebase/tdeio_media.po b/tde-i18n-ga/messages/tdebase/tdeio_media.po
index 25cb5cea72f..07f8e4fa873 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: 2019-01-13 18:47+0100\n"
+"POT-Creation-Date: 2019-07-11 02:33+0200\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"
@@ -41,7 +41,6 @@ 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
-#: mounthelper/tdeio_media_mounthelper.cpp:256
msgid "The TDE mediamanager is not running."
msgstr ""
@@ -49,7 +48,7 @@ msgstr ""
msgid "This media name already exists."
msgstr "Tá an t-ainm meáin seo ann cheana."
-#: mediaimpl.cpp:230 mediaimpl.cpp:293
+#: mediaimpl.cpp:230 mediaimpl.cpp:297
msgid "No such medium."
msgstr ""
@@ -57,321 +56,329 @@ msgstr ""
msgid "The drive is encrypted."
msgstr ""
-#: mediaimpl.cpp:272 mediamanager/halbackend.cpp:1264
-#: mediamanager/halbackend.cpp:1273 mediamanager/halbackend.cpp:1663
-#: mediamanager/halbackend.cpp:1680 mediamanager/halbackend.cpp:1691
-#: mediamanager/halbackend.cpp:1793 mediamanager/halbackend.cpp:1801
-#: mediamanager/halbackend.cpp:1808 mediamanager/halbackend.cpp:1848
-#: mediamanager/halbackend.cpp:1854 mediamanager/halbackend.cpp:1861
-#: mounthelper/tdeio_media_mounthelper.cpp:58
-msgid "Internal Error"
-msgstr "Earráid Inmheánach"
+#: mediaimpl.cpp:274 mediamanager/tdehardwarebackend.cpp:201
+#: mediamanager/tdehardwarebackend.cpp:252
+#: mounthelper/tdeio_media_mounthelper.cpp:202
+msgid "Unknown mount error."
+msgstr ""
#: mediamanager/dialog.cpp:26 mounthelper/dialog.cpp:26
-msgid "Decrypt"
+msgid "Unlock"
msgstr ""
-#: mediamanager/fstabbackend.cpp:104 mediamanager/fstabbackend.cpp:114
-#: mediamanager/halbackend.cpp:1595 mediamanager/halbackend.cpp:1617
-#: mediamanager/halbackend.cpp:1776 mediamanager/halbackend.cpp:1831
-#: mediamanager/tdehardwarebackend.cpp:1349
-#: mediamanager/tdehardwarebackend.cpp:1360
+#: mediamanager/fstabbackend.cpp:105 mediamanager/fstabbackend.cpp:120
+#: mediamanager/halbackend.cpp:1598 mediamanager/halbackend.cpp:1625
+#: mediamanager/halbackend.cpp:1808 mediamanager/halbackend.cpp:1877
+#: mediamanager/mediamanager.cpp:363 mediamanager/mediamanager.cpp:375
+#: mediamanager/mediamanager.cpp:387 mediamanager/mediamanager.cpp:399
+#: mediamanager/tdehardwarebackend.cpp:1363
+#: mediamanager/tdehardwarebackend.cpp:1378
#, c-format
msgid "No such medium: %1"
msgstr ""
-#: mediamanager/fstabbackend.cpp:398
+#: mediamanager/fstabbackend.cpp:408
msgid "CD Recorder"
msgstr "Taifeadán CDanna"
-#: mediamanager/fstabbackend.cpp:404
+#: mediamanager/fstabbackend.cpp:414
msgid "DVD"
msgstr "DVD"
-#: mediamanager/fstabbackend.cpp:415
+#: mediamanager/fstabbackend.cpp:425
msgid "CD-ROM"
msgstr "CD-ROM"
-#: mediamanager/fstabbackend.cpp:428
+#: mediamanager/fstabbackend.cpp:438
msgid "Floppy"
msgstr "Diosca Flapach"
-#: mediamanager/fstabbackend.cpp:436
+#: mediamanager/fstabbackend.cpp:446
msgid "Zip Disk"
msgstr "Diosca Zip"
-#: mediamanager/fstabbackend.cpp:447
+#: mediamanager/fstabbackend.cpp:457
msgid "Removable Device"
msgstr "Gléas Inbhainte"
-#: mediamanager/fstabbackend.cpp:452 mediamanager/fstabbackend.cpp:458
+#: mediamanager/fstabbackend.cpp:462 mediamanager/fstabbackend.cpp:468
msgid "Remote Share"
msgstr "Comhroinnt Chianda"
-#: mediamanager/fstabbackend.cpp:463
+#: mediamanager/fstabbackend.cpp:473
msgid "Hard Disk"
msgstr "Diosca Crua"
-#: mediamanager/halbackend.cpp:749 mediamanager/tdehardwarebackend.cpp:805
+#: mediamanager/halbackend.cpp:744 mediamanager/tdehardwarebackend.cpp:808
#, fuzzy
msgid "Unknown Drive"
msgstr "Anaithnid"
-#: mediamanager/halbackend.cpp:761 mediamanager/tdehardwarebackend.cpp:835
+#: mediamanager/halbackend.cpp:756 mediamanager/tdehardwarebackend.cpp:838
#, fuzzy
msgid "Floppy Drive"
msgstr "Diosca Flapach"
-#: mediamanager/halbackend.cpp:769
+#: mediamanager/halbackend.cpp:764
#, fuzzy
msgid "Zip Drive"
msgstr "Diosca Zip"
-#: mediamanager/halbackend.cpp:839 mediamanager/tdehardwarebackend.cpp:892
+#: mediamanager/halbackend.cpp:834 mediamanager/tdehardwarebackend.cpp:895
msgid "Camera"
msgstr "Ceamara"
-#: mediamanager/halbackend.cpp:1221 mediamanager/halbackend.cpp:1247
+#: mediamanager/halbackend.cpp:1216 mediamanager/halbackend.cpp:1242
msgid "Authenticate"
msgstr ""
-#: mediamanager/halbackend.cpp:1222
+#: mediamanager/halbackend.cpp:1217
msgid ""
"<big><b>System policy prevents mounting internal media</b></big><br/"
">Authentication is required to perform this action. Please enter your "
"password to verify."
msgstr ""
-#: mediamanager/halbackend.cpp:1248
+#: mediamanager/halbackend.cpp:1243
msgid ""
"<big><b>System policy prevents unmounting media mounted by other users</b></"
"big><br/>Authentication is required to perform this action. Please enter "
"your password to verify."
msgstr ""
-#: mediamanager/halbackend.cpp:1284
+#: mediamanager/halbackend.cpp:1259 mediamanager/halbackend.cpp:1268
+#: mediamanager/halbackend.cpp:1849 mediamanager/halbackend.cpp:1916
+#: mounthelper/tdeio_media_mounthelper.cpp:58
+msgid "Internal Error"
+msgstr "Earráid Inmheánach"
+
+#: mediamanager/halbackend.cpp:1279
msgid "Invalid filesystem type"
msgstr ""
-#: mediamanager/halbackend.cpp:1286
+#: mediamanager/halbackend.cpp:1281
msgid ""
"Permission denied<p>Please ensure that:<br>1. You have permission to access "
"this device.<br>2. This device node is not listed in /etc/fstab.</p>"
msgstr ""
-#: mediamanager/halbackend.cpp:1290
+#: mediamanager/halbackend.cpp:1285
msgid "Device is already mounted."
msgstr ""
-#: mediamanager/halbackend.cpp:1340
+#: mediamanager/halbackend.cpp:1335
msgid ""
"Moreover, programs still using the device have been detected. They are "
"listed below. You have to close them or change their working directory "
"before attempting to unmount the device again."
msgstr ""
-#: mediamanager/halbackend.cpp:1381 mediamanager/tdehardwarebackend.cpp:1588
+#: mediamanager/halbackend.cpp:1376 mediamanager/tdehardwarebackend.cpp:1618
msgid ""
"Programs that were still using the device have been forcibly terminated. "
"They are listed below."
msgstr ""
-#: mediamanager/halbackend.cpp:1402 mediamanager/halbackend.cpp:1715
-#: mediamanager/tdehardwarebackend.cpp:1406
-#: mediamanager/tdehardwarebackend.cpp:1424
-#: mediamanager/tdehardwarebackend.cpp:1464
+#: mediamanager/halbackend.cpp:1397 mediamanager/halbackend.cpp:1742
+#: mediamanager/tdehardwarebackend.cpp:1430
+#: mediamanager/tdehardwarebackend.cpp:1452
+#: mediamanager/tdehardwarebackend.cpp:1494
msgid ""
"Unfortunately, the device <b>%1</b> (%2) named <b>'%3'</b> and currently "
"mounted at <b>%4</b> could not be unmounted. "
msgstr ""
-#: mediamanager/halbackend.cpp:1408 mediamanager/tdehardwarebackend.cpp:1470
+#: mediamanager/halbackend.cpp:1403 mediamanager/tdehardwarebackend.cpp:1500
msgid "The following error was returned by umount command:"
msgstr ""
-#: mediamanager/halbackend.cpp:1478
-msgid "Permission denied"
+#: mediamanager/halbackend.cpp:1567 mediamanager/tdehardwarebackend.cpp:1322
+msgid "Cannot mount encrypted locked drives!"
msgstr ""
-#: mediamanager/halbackend.cpp:1562 mediamanager/tdehardwarebackend.cpp:1232
-msgid "Cannot mount encrypted drives!"
-msgstr ""
+#: mediamanager/halbackend.cpp:1682 mediamanager/halbackend.cpp:1703
+#: mediamanager/halbackend.cpp:1716 mediamanager/halbackend.cpp:1830
+#: mediamanager/halbackend.cpp:1840 mediamanager/halbackend.cpp:1899
+#: mediamanager/halbackend.cpp:1907
+#, fuzzy
+msgid "Internal error"
+msgstr "Earráid Inmheánach"
-#: mediamanager/halbackend.cpp:1721
+#: mediamanager/halbackend.cpp:1694
+#, fuzzy
+#| msgid "Unknown"
+msgid "Unknown error"
+msgstr "Anaithnid"
+
+#: mediamanager/halbackend.cpp:1748
msgid "Unmounting failed due to the following error:"
msgstr ""
-#: mediamanager/halbackend.cpp:1723
+#: mediamanager/halbackend.cpp:1750
msgid "Device is Busy:"
msgstr ""
-#: mediamanager/halbackend.cpp:1727
+#: mediamanager/halbackend.cpp:1754
msgid ""
"Permission denied<p>Please ensure that:<br>1. You have permission to access "
"this device.<br>2. This device was originally mounted using TDE.</p>"
msgstr ""
-#: mediamanager/halbackend.cpp:1739
+#: mediamanager/halbackend.cpp:1766
msgid ""
"%1<p><b>Would you like to forcibly terminate these processes?</b><br><i>All "
"unsaved data would be lost</i>"
msgstr ""
-#: mediamanager/halbackend.cpp:1811
+#: mediamanager/halbackend.cpp:1852
msgid "Wrong password"
msgstr ""
-#: mediamanager/mediamanager.cpp:247 mediamanager/mediamanager.cpp:266
-#: mediamanager/mediamanager.cpp:285 mediamanager/mediamanager.cpp:293
-#: mediamanager/mediamanager.cpp:302 mediamanager/mediamanager.cpp:310
-msgid "Feature only available with HAL"
+#: mediamanager/mediamanager.cpp:248 mediamanager/mediamanager.cpp:275
+msgid "Feature only available with the TDE hardware backend"
msgstr ""
-#: mediamanager/mediamanager.cpp:252
-msgid "Feature only available with the TDE hardware backend"
+#: mediamanager/mediamanager.cpp:255 mediamanager/mediamanager.cpp:282
+#: mediamanager/mediamanager.cpp:312 mediamanager/mediamanager.cpp:343
+msgid "Feature only available with HAL"
msgstr ""
-#: mediamanager/mediamanager.cpp:256 mediamanager/mediamanager.cpp:271
-#: mediamanager/mediamanager.cpp:275
+#: mediamanager/mediamanager.cpp:262 mediamanager/mediamanager.cpp:289
+#: mediamanager/mediamanager.cpp:320 mediamanager/mediamanager.cpp:350
msgid "Feature only available with HAL or TDE hardware backend"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:480
-#: mediamanager/tdehardwarebackend.cpp:517
-#: mediamanager/tdehardwarebackend.cpp:750
+#: mediamanager/tdehardwarebackend.cpp:483
+#: mediamanager/tdehardwarebackend.cpp:520
+#: mediamanager/tdehardwarebackend.cpp:753
#, fuzzy
msgid "%1 Removable Device"
msgstr "Gléas Inbhainte"
-#: mediamanager/tdehardwarebackend.cpp:525
+#: mediamanager/tdehardwarebackend.cpp:528
#, fuzzy
msgid "Blank CD-ROM"
msgstr "CD-ROM"
-#: mediamanager/tdehardwarebackend.cpp:534
+#: mediamanager/tdehardwarebackend.cpp:537
msgid "Blank CD-R"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:543
+#: mediamanager/tdehardwarebackend.cpp:546
msgid "Blank CD-RW"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:552
+#: mediamanager/tdehardwarebackend.cpp:555
msgid "Blank Magneto-Optical CD"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:561
+#: mediamanager/tdehardwarebackend.cpp:564
msgid "Blank Mount Ranier CD-RW"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:570
+#: mediamanager/tdehardwarebackend.cpp:573
msgid "Blank Mount Ranier CD-RW-W"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:579
+#: mediamanager/tdehardwarebackend.cpp:582
msgid "Blank DVD-ROM"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:588
+#: mediamanager/tdehardwarebackend.cpp:591
msgid "Blank DVD-RAM"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:597
+#: mediamanager/tdehardwarebackend.cpp:600
msgid "Blank DVD-R"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:606
+#: mediamanager/tdehardwarebackend.cpp:609
msgid "Blank DVD-RW"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:615
+#: mediamanager/tdehardwarebackend.cpp:618
msgid "Blank Dual Layer DVD-R"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:624
+#: mediamanager/tdehardwarebackend.cpp:627
msgid "Blank Dual Layer DVD-RW"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:633
+#: mediamanager/tdehardwarebackend.cpp:636
msgid "Blank DVD+R"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:642
+#: mediamanager/tdehardwarebackend.cpp:645
msgid "Blank DVD+RW"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:651
+#: mediamanager/tdehardwarebackend.cpp:654
msgid "Blank Dual Layer DVD+R"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:660
+#: mediamanager/tdehardwarebackend.cpp:663
msgid "Blank Dual Layer DVD+RW"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:669
+#: mediamanager/tdehardwarebackend.cpp:672
msgid "Blank BD-ROM"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:678
+#: mediamanager/tdehardwarebackend.cpp:681
msgid "Blank BD-R"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:687
+#: mediamanager/tdehardwarebackend.cpp:690
msgid "Blank BD-RW"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:696
+#: mediamanager/tdehardwarebackend.cpp:699
msgid "Blank HDDVD-ROM"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:705
+#: mediamanager/tdehardwarebackend.cpp:708
msgid "Blank HDDVD-R"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:714
+#: mediamanager/tdehardwarebackend.cpp:717
msgid "Blank HDDVD-RW"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:721
+#: mediamanager/tdehardwarebackend.cpp:724
msgid "Audio CD"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:742
+#: mediamanager/tdehardwarebackend.cpp:745
msgid "%1 Fixed Disk (%2)"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:849
+#: mediamanager/tdehardwarebackend.cpp:852
#, fuzzy
msgid "%1 Zip Disk"
msgstr "Diosca Zip"
-#: mediamanager/tdehardwarebackend.cpp:1212
-#: mediamanager/tdehardwarebackend.cpp:1392
-#, fuzzy
-msgid "Internal error"
-msgstr "Earráid Inmheánach"
+#: mediamanager/tdehardwarebackend.cpp:1224
+#: mediamanager/tdehardwarebackend.cpp:1417
+msgid "Internal error. Couldn't find medium."
+msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:1239
-msgid ""
-"<qt>Unable to mount this device.<p>Potential reasons include:<br>Improper "
-"device and/or user privilege level<br>Corrupt data on storage device"
+#: mediamanager/tdehardwarebackend.cpp:1249
+#: mediamanager/tdehardwarebackend.cpp:1323
+msgid "Unable to mount this device."
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:1241
-#: mediamanager/tdehardwarebackend.cpp:1316
-#: mediamanager/tdehardwarebackend.cpp:1408
-#: mediamanager/tdehardwarebackend.cpp:1426
+#: mediamanager/tdehardwarebackend.cpp:1252
+#: mediamanager/tdehardwarebackend.cpp:1326
+#: mediamanager/tdehardwarebackend.cpp:1435
+#: mediamanager/tdehardwarebackend.cpp:1457
msgid "<p>Technical details:<br>"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:1314
-msgid ""
-"<qt>Unable to mount this device.<p>Potential reasons include:<br>Improper "
-"device and/or user privilege level<br>Corrupt data on storage "
-"device<br>Incorrect encryption password"
+#: mediamanager/tdehardwarebackend.cpp:1284
+msgid "Decryption aborted"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:1420
+#: mediamanager/tdehardwarebackend.cpp:1443
msgid ""
"<qt>The device <b>%1</b> (%2) named <b>'%3'</b> and currently mounted at <b>"
"%4</b> can not be unmounted at this time.<p>%5<p><b>Would you like to "
@@ -379,7 +386,7 @@ msgid ""
"lost</i>"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:1547
+#: mediamanager/tdehardwarebackend.cpp:1577
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 "
@@ -390,7 +397,7 @@ msgstr ""
msgid "%1 cannot be found."
msgstr "Níorbh fhéidir %1 a aimsiú."
-#: mounthelper/tdeio_media_mounthelper.cpp:86
+#: mounthelper/tdeio_media_mounthelper.cpp:87
msgid "%1 is not a mountable media."
msgstr "Níl %1 ina mheán infheistithe."
@@ -400,39 +407,47 @@ msgid "%1 is not an encrypted media."
msgstr "Níl %1 ina mheán infheistithe."
#: mounthelper/tdeio_media_mounthelper.cpp:107
-msgid "%1 is already decrypted."
+msgid "%1 is already unlocked."
+msgstr ""
+
+#: mounthelper/tdeio_media_mounthelper.cpp:139
+msgid "Unknown unmount error."
msgstr ""
-#: mounthelper/tdeio_media_mounthelper.cpp:228
+#: mounthelper/tdeio_media_mounthelper.cpp:246
msgid "The device was successfully unmounted, but the tray could not be opened"
msgstr ""
-#: mounthelper/tdeio_media_mounthelper.cpp:230
+#: mounthelper/tdeio_media_mounthelper.cpp:248
msgid "The device was successfully unmounted, but could not be ejected"
msgstr ""
-#: mounthelper/tdeio_media_mounthelper.cpp:275
+#: mounthelper/tdeio_media_mounthelper.cpp:281
+msgid "Unknown decrypt error."
+msgstr ""
+
+#: mounthelper/tdeio_media_mounthelper.cpp:295
#, fuzzy
msgid "Decrypt given URL"
msgstr "Dífheistigh an URL sonraithe"
-#: mounthelper/tdeio_media_mounthelper.cpp:276
+#: mounthelper/tdeio_media_mounthelper.cpp:296
msgid "Unmount given URL"
msgstr "Dífheistigh an URL sonraithe"
-#: mounthelper/tdeio_media_mounthelper.cpp:277
+#: mounthelper/tdeio_media_mounthelper.cpp:297
msgid "Mount given URL (default)"
msgstr "Feistigh an URL sonraithe (réamhshocrú)"
-#: mounthelper/tdeio_media_mounthelper.cpp:278
+#: 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:279
+#: mounthelper/tdeio_media_mounthelper.cpp:299
msgid "Unmount and Eject given URL (necessary for some USB devices)"
msgstr ""
-#: mounthelper/tdeio_media_mounthelper.cpp:280
+#: mounthelper/tdeio_media_mounthelper.cpp:300
msgid "media:/ URL to mount/unmount/eject/remove"
msgstr ""
@@ -453,43 +468,43 @@ msgstr ""
msgid "&Mounting"
msgstr ""
-#: tdefile-plugin/tdefilemediaplugin.cpp:190
+#: tdefile-plugin/tdefilemediaplugin.cpp:184
msgid "Medium Information"
msgstr "Eolas faoin Mheán"
-#: tdefile-plugin/tdefilemediaplugin.cpp:193
+#: tdefile-plugin/tdefilemediaplugin.cpp:187
msgid "Free"
msgstr "Saor"
-#: tdefile-plugin/tdefilemediaplugin.cpp:196
+#: tdefile-plugin/tdefilemediaplugin.cpp:190
msgid "Used"
msgstr "Úsáidte"
-#: tdefile-plugin/tdefilemediaplugin.cpp:199
+#: tdefile-plugin/tdefilemediaplugin.cpp:193
msgid "Total"
msgstr "Iomlán"
-#: tdefile-plugin/tdefilemediaplugin.cpp:202
+#: tdefile-plugin/tdefilemediaplugin.cpp:196
msgid "Base URL"
msgstr "URL bunaidh"
-#: tdefile-plugin/tdefilemediaplugin.cpp:203
+#: tdefile-plugin/tdefilemediaplugin.cpp:197
msgid "Mount Point"
msgstr "Pointe Feistithe"
-#: tdefile-plugin/tdefilemediaplugin.cpp:204
+#: tdefile-plugin/tdefilemediaplugin.cpp:198
msgid "Device Node"
msgstr "Nód Gléis"
-#: tdefile-plugin/tdefilemediaplugin.cpp:206
+#: tdefile-plugin/tdefilemediaplugin.cpp:200
msgid "Medium Summary"
msgstr "Achoimre ar Mheán"
-#: tdefile-plugin/tdefilemediaplugin.cpp:208
+#: tdefile-plugin/tdefilemediaplugin.cpp:202
msgid "Usage"
msgstr "Úsáid"
-#: tdefile-plugin/tdefilemediaplugin.cpp:210
+#: tdefile-plugin/tdefilemediaplugin.cpp:204
msgid "Bar Graph"
msgstr "Barraghraf"
@@ -561,23 +576,30 @@ msgid ""
"devices are plugged in."
msgstr ""
-#: mediamanager/decryptdialog.ui:24 mounthelper/decryptdialog.ui:24
+#: mediamanager/unlockdialog.ui:24 mounthelper/unlockdialog.ui:24
#, no-c-format
msgid "Decrypting Storage Device"
msgstr ""
-#: mediamanager/decryptdialog.ui:109 mounthelper/decryptdialog.ui:109
+#: mediamanager/unlockdialog.ui:109
#, no-c-format
msgid ""
-"<p><b>%1</b> is an encrypted storage device.</p>\n"
-"<p>Please enter the password to decrypt the storage device.</p>"
+"<p><b>%1</b> is an encrypted locked storage device.</p>\n"
+"<p>Please enter the password to unlock the storage device.</p>"
msgstr ""
-#: mediamanager/decryptdialog.ui:131 mounthelper/decryptdialog.ui:131
+#: mediamanager/unlockdialog.ui:131 mounthelper/unlockdialog.ui:131
#, no-c-format
msgid "&Password:"
msgstr ""
+#: mounthelper/unlockdialog.ui:109
+#, no-c-format
+msgid ""
+"<p><b>%1</b> is an encrypted storage device.</p>\n"
+"<p>Please enter the password to decrypt the storage device.</p>"
+msgstr ""
+
#: propsdlgplugin/propertiespagegui.ui:16
#, no-c-format
msgid "PropertiesPageGUI"
diff --git a/tde-i18n-gl/messages/tdebase/tdeio_media.po b/tde-i18n-gl/messages/tdebase/tdeio_media.po
index 2e03b4290dc..ec9f848739a 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: 2019-01-13 18:47+0100\n"
+"POT-Creation-Date: 2019-07-11 02:33+0200\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"
@@ -48,7 +48,6 @@ 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
-#: mounthelper/tdeio_media_mounthelper.cpp:256
msgid "The TDE mediamanager is not running."
msgstr "O xestor de medios de TDE non se está a executar."
@@ -56,7 +55,7 @@ msgstr "O xestor de medios de TDE non se está a executar."
msgid "This media name already exists."
msgstr "Este nome do medio xa existe."
-#: mediaimpl.cpp:230 mediaimpl.cpp:293
+#: mediaimpl.cpp:230 mediaimpl.cpp:297
msgid "No such medium."
msgstr ""
@@ -64,320 +63,328 @@ msgstr ""
msgid "The drive is encrypted."
msgstr ""
-#: mediaimpl.cpp:272 mediamanager/halbackend.cpp:1264
-#: mediamanager/halbackend.cpp:1273 mediamanager/halbackend.cpp:1663
-#: mediamanager/halbackend.cpp:1680 mediamanager/halbackend.cpp:1691
-#: mediamanager/halbackend.cpp:1793 mediamanager/halbackend.cpp:1801
-#: mediamanager/halbackend.cpp:1808 mediamanager/halbackend.cpp:1848
-#: mediamanager/halbackend.cpp:1854 mediamanager/halbackend.cpp:1861
-#: mounthelper/tdeio_media_mounthelper.cpp:58
-msgid "Internal Error"
+#: mediaimpl.cpp:274 mediamanager/tdehardwarebackend.cpp:201
+#: mediamanager/tdehardwarebackend.cpp:252
+#: mounthelper/tdeio_media_mounthelper.cpp:202
+msgid "Unknown mount error."
msgstr ""
#: mediamanager/dialog.cpp:26 mounthelper/dialog.cpp:26
-msgid "Decrypt"
+msgid "Unlock"
msgstr ""
-#: mediamanager/fstabbackend.cpp:104 mediamanager/fstabbackend.cpp:114
-#: mediamanager/halbackend.cpp:1595 mediamanager/halbackend.cpp:1617
-#: mediamanager/halbackend.cpp:1776 mediamanager/halbackend.cpp:1831
-#: mediamanager/tdehardwarebackend.cpp:1349
-#: mediamanager/tdehardwarebackend.cpp:1360
+#: mediamanager/fstabbackend.cpp:105 mediamanager/fstabbackend.cpp:120
+#: mediamanager/halbackend.cpp:1598 mediamanager/halbackend.cpp:1625
+#: mediamanager/halbackend.cpp:1808 mediamanager/halbackend.cpp:1877
+#: mediamanager/mediamanager.cpp:363 mediamanager/mediamanager.cpp:375
+#: mediamanager/mediamanager.cpp:387 mediamanager/mediamanager.cpp:399
+#: mediamanager/tdehardwarebackend.cpp:1363
+#: mediamanager/tdehardwarebackend.cpp:1378
#, c-format
msgid "No such medium: %1"
msgstr ""
-#: mediamanager/fstabbackend.cpp:398
+#: mediamanager/fstabbackend.cpp:408
msgid "CD Recorder"
msgstr "Grabadora de CD"
-#: mediamanager/fstabbackend.cpp:404
+#: mediamanager/fstabbackend.cpp:414
msgid "DVD"
msgstr "DVD"
-#: mediamanager/fstabbackend.cpp:415
+#: mediamanager/fstabbackend.cpp:425
msgid "CD-ROM"
msgstr "CD-ROM"
-#: mediamanager/fstabbackend.cpp:428
+#: mediamanager/fstabbackend.cpp:438
msgid "Floppy"
msgstr "Disquete"
-#: mediamanager/fstabbackend.cpp:436
+#: mediamanager/fstabbackend.cpp:446
msgid "Zip Disk"
msgstr "Disco Zip"
-#: mediamanager/fstabbackend.cpp:447
+#: mediamanager/fstabbackend.cpp:457
msgid "Removable Device"
msgstr "Dispositivo Extraíbel"
-#: mediamanager/fstabbackend.cpp:452 mediamanager/fstabbackend.cpp:458
+#: mediamanager/fstabbackend.cpp:462 mediamanager/fstabbackend.cpp:468
msgid "Remote Share"
msgstr "Compartición Remota"
-#: mediamanager/fstabbackend.cpp:463
+#: mediamanager/fstabbackend.cpp:473
msgid "Hard Disk"
msgstr "Disco Duro"
-#: mediamanager/halbackend.cpp:749 mediamanager/tdehardwarebackend.cpp:805
+#: mediamanager/halbackend.cpp:744 mediamanager/tdehardwarebackend.cpp:808
#, fuzzy
msgid "Unknown Drive"
msgstr "Descoñecido"
-#: mediamanager/halbackend.cpp:761 mediamanager/tdehardwarebackend.cpp:835
+#: mediamanager/halbackend.cpp:756 mediamanager/tdehardwarebackend.cpp:838
#, fuzzy
msgid "Floppy Drive"
msgstr "Disquete"
-#: mediamanager/halbackend.cpp:769
+#: mediamanager/halbackend.cpp:764
#, fuzzy
msgid "Zip Drive"
msgstr "Disco Zip"
-#: mediamanager/halbackend.cpp:839 mediamanager/tdehardwarebackend.cpp:892
+#: mediamanager/halbackend.cpp:834 mediamanager/tdehardwarebackend.cpp:895
msgid "Camera"
msgstr "Cámara"
-#: mediamanager/halbackend.cpp:1221 mediamanager/halbackend.cpp:1247
+#: mediamanager/halbackend.cpp:1216 mediamanager/halbackend.cpp:1242
msgid "Authenticate"
msgstr ""
-#: mediamanager/halbackend.cpp:1222
+#: mediamanager/halbackend.cpp:1217
msgid ""
"<big><b>System policy prevents mounting internal media</b></big><br/"
">Authentication is required to perform this action. Please enter your "
"password to verify."
msgstr ""
-#: mediamanager/halbackend.cpp:1248
+#: mediamanager/halbackend.cpp:1243
msgid ""
"<big><b>System policy prevents unmounting media mounted by other users</b></"
"big><br/>Authentication is required to perform this action. Please enter "
"your password to verify."
msgstr ""
-#: mediamanager/halbackend.cpp:1284
+#: mediamanager/halbackend.cpp:1259 mediamanager/halbackend.cpp:1268
+#: mediamanager/halbackend.cpp:1849 mediamanager/halbackend.cpp:1916
+#: mounthelper/tdeio_media_mounthelper.cpp:58
+msgid "Internal Error"
+msgstr ""
+
+#: mediamanager/halbackend.cpp:1279
msgid "Invalid filesystem type"
msgstr ""
-#: mediamanager/halbackend.cpp:1286
+#: mediamanager/halbackend.cpp:1281
msgid ""
"Permission denied<p>Please ensure that:<br>1. You have permission to access "
"this device.<br>2. This device node is not listed in /etc/fstab.</p>"
msgstr ""
-#: mediamanager/halbackend.cpp:1290
+#: mediamanager/halbackend.cpp:1285
msgid "Device is already mounted."
msgstr ""
-#: mediamanager/halbackend.cpp:1340
+#: mediamanager/halbackend.cpp:1335
msgid ""
"Moreover, programs still using the device have been detected. They are "
"listed below. You have to close them or change their working directory "
"before attempting to unmount the device again."
msgstr ""
-#: mediamanager/halbackend.cpp:1381 mediamanager/tdehardwarebackend.cpp:1588
+#: mediamanager/halbackend.cpp:1376 mediamanager/tdehardwarebackend.cpp:1618
msgid ""
"Programs that were still using the device have been forcibly terminated. "
"They are listed below."
msgstr ""
-#: mediamanager/halbackend.cpp:1402 mediamanager/halbackend.cpp:1715
-#: mediamanager/tdehardwarebackend.cpp:1406
-#: mediamanager/tdehardwarebackend.cpp:1424
-#: mediamanager/tdehardwarebackend.cpp:1464
+#: mediamanager/halbackend.cpp:1397 mediamanager/halbackend.cpp:1742
+#: mediamanager/tdehardwarebackend.cpp:1430
+#: mediamanager/tdehardwarebackend.cpp:1452
+#: mediamanager/tdehardwarebackend.cpp:1494
msgid ""
"Unfortunately, the device <b>%1</b> (%2) named <b>'%3'</b> and currently "
"mounted at <b>%4</b> could not be unmounted. "
msgstr ""
-#: mediamanager/halbackend.cpp:1408 mediamanager/tdehardwarebackend.cpp:1470
+#: mediamanager/halbackend.cpp:1403 mediamanager/tdehardwarebackend.cpp:1500
msgid "The following error was returned by umount command:"
msgstr ""
-#: mediamanager/halbackend.cpp:1478
-msgid "Permission denied"
+#: mediamanager/halbackend.cpp:1567 mediamanager/tdehardwarebackend.cpp:1322
+msgid "Cannot mount encrypted locked drives!"
msgstr ""
-#: mediamanager/halbackend.cpp:1562 mediamanager/tdehardwarebackend.cpp:1232
-msgid "Cannot mount encrypted drives!"
+#: mediamanager/halbackend.cpp:1682 mediamanager/halbackend.cpp:1703
+#: mediamanager/halbackend.cpp:1716 mediamanager/halbackend.cpp:1830
+#: mediamanager/halbackend.cpp:1840 mediamanager/halbackend.cpp:1899
+#: mediamanager/halbackend.cpp:1907
+msgid "Internal error"
msgstr ""
-#: mediamanager/halbackend.cpp:1721
+#: mediamanager/halbackend.cpp:1694
+#, fuzzy
+#| msgid "Unknown"
+msgid "Unknown error"
+msgstr "Descoñecido"
+
+#: mediamanager/halbackend.cpp:1748
msgid "Unmounting failed due to the following error:"
msgstr ""
-#: mediamanager/halbackend.cpp:1723
+#: mediamanager/halbackend.cpp:1750
msgid "Device is Busy:"
msgstr ""
-#: mediamanager/halbackend.cpp:1727
+#: mediamanager/halbackend.cpp:1754
msgid ""
"Permission denied<p>Please ensure that:<br>1. You have permission to access "
"this device.<br>2. This device was originally mounted using TDE.</p>"
msgstr ""
-#: mediamanager/halbackend.cpp:1739
+#: mediamanager/halbackend.cpp:1766
msgid ""
"%1<p><b>Would you like to forcibly terminate these processes?</b><br><i>All "
"unsaved data would be lost</i>"
msgstr ""
-#: mediamanager/halbackend.cpp:1811
+#: mediamanager/halbackend.cpp:1852
msgid "Wrong password"
msgstr ""
-#: mediamanager/mediamanager.cpp:247 mediamanager/mediamanager.cpp:266
-#: mediamanager/mediamanager.cpp:285 mediamanager/mediamanager.cpp:293
-#: mediamanager/mediamanager.cpp:302 mediamanager/mediamanager.cpp:310
-msgid "Feature only available with HAL"
+#: mediamanager/mediamanager.cpp:248 mediamanager/mediamanager.cpp:275
+msgid "Feature only available with the TDE hardware backend"
msgstr ""
-#: mediamanager/mediamanager.cpp:252
-msgid "Feature only available with the TDE hardware backend"
+#: mediamanager/mediamanager.cpp:255 mediamanager/mediamanager.cpp:282
+#: mediamanager/mediamanager.cpp:312 mediamanager/mediamanager.cpp:343
+msgid "Feature only available with HAL"
msgstr ""
-#: mediamanager/mediamanager.cpp:256 mediamanager/mediamanager.cpp:271
-#: mediamanager/mediamanager.cpp:275
+#: mediamanager/mediamanager.cpp:262 mediamanager/mediamanager.cpp:289
+#: mediamanager/mediamanager.cpp:320 mediamanager/mediamanager.cpp:350
msgid "Feature only available with HAL or TDE hardware backend"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:480
-#: mediamanager/tdehardwarebackend.cpp:517
-#: mediamanager/tdehardwarebackend.cpp:750
+#: mediamanager/tdehardwarebackend.cpp:483
+#: mediamanager/tdehardwarebackend.cpp:520
+#: mediamanager/tdehardwarebackend.cpp:753
#, fuzzy
msgid "%1 Removable Device"
msgstr "Dispositivo Extraíbel"
-#: mediamanager/tdehardwarebackend.cpp:525
+#: mediamanager/tdehardwarebackend.cpp:528
#, fuzzy
msgid "Blank CD-ROM"
msgstr "CD-ROM"
-#: mediamanager/tdehardwarebackend.cpp:534
+#: mediamanager/tdehardwarebackend.cpp:537
msgid "Blank CD-R"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:543
+#: mediamanager/tdehardwarebackend.cpp:546
msgid "Blank CD-RW"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:552
+#: mediamanager/tdehardwarebackend.cpp:555
msgid "Blank Magneto-Optical CD"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:561
+#: mediamanager/tdehardwarebackend.cpp:564
msgid "Blank Mount Ranier CD-RW"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:570
+#: mediamanager/tdehardwarebackend.cpp:573
msgid "Blank Mount Ranier CD-RW-W"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:579
+#: mediamanager/tdehardwarebackend.cpp:582
msgid "Blank DVD-ROM"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:588
+#: mediamanager/tdehardwarebackend.cpp:591
msgid "Blank DVD-RAM"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:597
+#: mediamanager/tdehardwarebackend.cpp:600
msgid "Blank DVD-R"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:606
+#: mediamanager/tdehardwarebackend.cpp:609
msgid "Blank DVD-RW"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:615
+#: mediamanager/tdehardwarebackend.cpp:618
msgid "Blank Dual Layer DVD-R"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:624
+#: mediamanager/tdehardwarebackend.cpp:627
msgid "Blank Dual Layer DVD-RW"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:633
+#: mediamanager/tdehardwarebackend.cpp:636
msgid "Blank DVD+R"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:642
+#: mediamanager/tdehardwarebackend.cpp:645
msgid "Blank DVD+RW"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:651
+#: mediamanager/tdehardwarebackend.cpp:654
msgid "Blank Dual Layer DVD+R"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:660
+#: mediamanager/tdehardwarebackend.cpp:663
msgid "Blank Dual Layer DVD+RW"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:669
+#: mediamanager/tdehardwarebackend.cpp:672
msgid "Blank BD-ROM"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:678
+#: mediamanager/tdehardwarebackend.cpp:681
msgid "Blank BD-R"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:687
+#: mediamanager/tdehardwarebackend.cpp:690
msgid "Blank BD-RW"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:696
+#: mediamanager/tdehardwarebackend.cpp:699
msgid "Blank HDDVD-ROM"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:705
+#: mediamanager/tdehardwarebackend.cpp:708
msgid "Blank HDDVD-R"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:714
+#: mediamanager/tdehardwarebackend.cpp:717
msgid "Blank HDDVD-RW"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:721
+#: mediamanager/tdehardwarebackend.cpp:724
msgid "Audio CD"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:742
+#: mediamanager/tdehardwarebackend.cpp:745
msgid "%1 Fixed Disk (%2)"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:849
+#: mediamanager/tdehardwarebackend.cpp:852
#, fuzzy
msgid "%1 Zip Disk"
msgstr "Disco Zip"
-#: mediamanager/tdehardwarebackend.cpp:1212
-#: mediamanager/tdehardwarebackend.cpp:1392
-msgid "Internal error"
+#: mediamanager/tdehardwarebackend.cpp:1224
+#: mediamanager/tdehardwarebackend.cpp:1417
+msgid "Internal error. Couldn't find medium."
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:1239
-msgid ""
-"<qt>Unable to mount this device.<p>Potential reasons include:<br>Improper "
-"device and/or user privilege level<br>Corrupt data on storage device"
+#: mediamanager/tdehardwarebackend.cpp:1249
+#: mediamanager/tdehardwarebackend.cpp:1323
+msgid "Unable to mount this device."
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:1241
-#: mediamanager/tdehardwarebackend.cpp:1316
-#: mediamanager/tdehardwarebackend.cpp:1408
-#: mediamanager/tdehardwarebackend.cpp:1426
+#: mediamanager/tdehardwarebackend.cpp:1252
+#: mediamanager/tdehardwarebackend.cpp:1326
+#: mediamanager/tdehardwarebackend.cpp:1435
+#: mediamanager/tdehardwarebackend.cpp:1457
msgid "<p>Technical details:<br>"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:1314
-msgid ""
-"<qt>Unable to mount this device.<p>Potential reasons include:<br>Improper "
-"device and/or user privilege level<br>Corrupt data on storage "
-"device<br>Incorrect encryption password"
+#: mediamanager/tdehardwarebackend.cpp:1284
+msgid "Decryption aborted"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:1420
+#: mediamanager/tdehardwarebackend.cpp:1443
msgid ""
"<qt>The device <b>%1</b> (%2) named <b>'%3'</b> and currently mounted at <b>"
"%4</b> can not be unmounted at this time.<p>%5<p><b>Would you like to "
@@ -385,7 +392,7 @@ msgid ""
"lost</i>"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:1547
+#: mediamanager/tdehardwarebackend.cpp:1577
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 "
@@ -396,7 +403,7 @@ msgstr ""
msgid "%1 cannot be found."
msgstr "%1 non se puido atopar."
-#: mounthelper/tdeio_media_mounthelper.cpp:86
+#: mounthelper/tdeio_media_mounthelper.cpp:87
msgid "%1 is not a mountable media."
msgstr "%1 non é un dispositivo montábel."
@@ -406,40 +413,48 @@ msgid "%1 is not an encrypted media."
msgstr "%1 non é un dispositivo montábel."
#: mounthelper/tdeio_media_mounthelper.cpp:107
-msgid "%1 is already decrypted."
+msgid "%1 is already unlocked."
msgstr ""
-#: mounthelper/tdeio_media_mounthelper.cpp:228
+#: mounthelper/tdeio_media_mounthelper.cpp:139
+msgid "Unknown unmount error."
+msgstr ""
+
+#: mounthelper/tdeio_media_mounthelper.cpp:246
msgid "The device was successfully unmounted, but the tray could not be opened"
msgstr ""
-#: mounthelper/tdeio_media_mounthelper.cpp:230
+#: mounthelper/tdeio_media_mounthelper.cpp:248
msgid "The device was successfully unmounted, but could not be ejected"
msgstr ""
-#: mounthelper/tdeio_media_mounthelper.cpp:275
+#: mounthelper/tdeio_media_mounthelper.cpp:281
+msgid "Unknown decrypt error."
+msgstr ""
+
+#: mounthelper/tdeio_media_mounthelper.cpp:295
#, fuzzy
msgid "Decrypt given URL"
msgstr "Desmontar a URL introducida"
-#: mounthelper/tdeio_media_mounthelper.cpp:276
+#: mounthelper/tdeio_media_mounthelper.cpp:296
msgid "Unmount given URL"
msgstr "Desmontar a URL introducida"
-#: mounthelper/tdeio_media_mounthelper.cpp:277
+#: mounthelper/tdeio_media_mounthelper.cpp:297
msgid "Mount given URL (default)"
msgstr "Montar a URL introducida (por defecto)"
-#: mounthelper/tdeio_media_mounthelper.cpp:278
+#: mounthelper/tdeio_media_mounthelper.cpp:298
msgid "Eject given URL via tdeeject"
msgstr "Expulsar a URL introducida mediante tdeeject"
-#: mounthelper/tdeio_media_mounthelper.cpp:279
+#: mounthelper/tdeio_media_mounthelper.cpp:299
msgid "Unmount and Eject given URL (necessary for some USB devices)"
msgstr ""
"Desmontar e Expulsar a URL fornecida (necesario para algúns dispositivos USB)"
-#: mounthelper/tdeio_media_mounthelper.cpp:280
+#: mounthelper/tdeio_media_mounthelper.cpp:300
msgid "media:/ URL to mount/unmount/eject/remove"
msgstr "media:/ URL para montar/desmontar/expulsar/borrar"
@@ -461,43 +476,43 @@ msgstr ""
msgid "&Mounting"
msgstr "Punto de Montaxe"
-#: tdefile-plugin/tdefilemediaplugin.cpp:190
+#: tdefile-plugin/tdefilemediaplugin.cpp:184
msgid "Medium Information"
msgstr "Información do Medio"
-#: tdefile-plugin/tdefilemediaplugin.cpp:193
+#: tdefile-plugin/tdefilemediaplugin.cpp:187
msgid "Free"
msgstr "Libre"
-#: tdefile-plugin/tdefilemediaplugin.cpp:196
+#: tdefile-plugin/tdefilemediaplugin.cpp:190
msgid "Used"
msgstr "Empregada"
-#: tdefile-plugin/tdefilemediaplugin.cpp:199
+#: tdefile-plugin/tdefilemediaplugin.cpp:193
msgid "Total"
msgstr "Total"
-#: tdefile-plugin/tdefilemediaplugin.cpp:202
+#: tdefile-plugin/tdefilemediaplugin.cpp:196
msgid "Base URL"
msgstr "URL Base"
-#: tdefile-plugin/tdefilemediaplugin.cpp:203
+#: tdefile-plugin/tdefilemediaplugin.cpp:197
msgid "Mount Point"
msgstr "Punto de Montaxe"
-#: tdefile-plugin/tdefilemediaplugin.cpp:204
+#: tdefile-plugin/tdefilemediaplugin.cpp:198
msgid "Device Node"
msgstr "Dispositivo de Nodos"
-#: tdefile-plugin/tdefilemediaplugin.cpp:206
+#: tdefile-plugin/tdefilemediaplugin.cpp:200
msgid "Medium Summary"
msgstr "Resumo do Medio"
-#: tdefile-plugin/tdefilemediaplugin.cpp:208
+#: tdefile-plugin/tdefilemediaplugin.cpp:202
msgid "Usage"
msgstr "Emprego"
-#: tdefile-plugin/tdefilemediaplugin.cpp:210
+#: tdefile-plugin/tdefilemediaplugin.cpp:204
msgid "Bar Graph"
msgstr "Gráfico de Barras"
@@ -569,23 +584,30 @@ msgid ""
"devices are plugged in."
msgstr ""
-#: mediamanager/decryptdialog.ui:24 mounthelper/decryptdialog.ui:24
+#: mediamanager/unlockdialog.ui:24 mounthelper/unlockdialog.ui:24
#, no-c-format
msgid "Decrypting Storage Device"
msgstr ""
-#: mediamanager/decryptdialog.ui:109 mounthelper/decryptdialog.ui:109
+#: mediamanager/unlockdialog.ui:109
#, no-c-format
msgid ""
-"<p><b>%1</b> is an encrypted storage device.</p>\n"
-"<p>Please enter the password to decrypt the storage device.</p>"
+"<p><b>%1</b> is an encrypted locked storage device.</p>\n"
+"<p>Please enter the password to unlock the storage device.</p>"
msgstr ""
-#: mediamanager/decryptdialog.ui:131 mounthelper/decryptdialog.ui:131
+#: mediamanager/unlockdialog.ui:131 mounthelper/unlockdialog.ui:131
#, no-c-format
msgid "&Password:"
msgstr ""
+#: mounthelper/unlockdialog.ui:109
+#, no-c-format
+msgid ""
+"<p><b>%1</b> is an encrypted storage device.</p>\n"
+"<p>Please enter the password to decrypt the storage device.</p>"
+msgstr ""
+
#: propsdlgplugin/propertiespagegui.ui:16
#, no-c-format
msgid "PropertiesPageGUI"
diff --git a/tde-i18n-he/messages/tdebase/tdeio_media.po b/tde-i18n-he/messages/tdebase/tdeio_media.po
index b422f98d841..d200064b887 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: 2019-01-13 18:47+0100\n"
+"POT-Creation-Date: 2019-07-11 02:33+0200\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"
@@ -46,7 +46,6 @@ msgstr "לא ידוע"
#: mediaimpl.cpp:88 mediaimpl.cpp:115 mediaimpl.cpp:141 mediaimpl.cpp:177
#: mediaimpl.cpp:197 mediaimpl.cpp:218
#: mounthelper/tdeio_media_mounthelper.cpp:50
-#: mounthelper/tdeio_media_mounthelper.cpp:256
msgid "The TDE mediamanager is not running."
msgstr "מנהל המדיה של TDE אינו פועל."
@@ -54,7 +53,7 @@ msgstr "מנהל המדיה של TDE אינו פועל."
msgid "This media name already exists."
msgstr "שם המדיה כבר קיים."
-#: mediaimpl.cpp:230 mediaimpl.cpp:293
+#: mediaimpl.cpp:230 mediaimpl.cpp:297
msgid "No such medium."
msgstr ""
@@ -62,321 +61,329 @@ msgstr ""
msgid "The drive is encrypted."
msgstr ""
-#: mediaimpl.cpp:272 mediamanager/halbackend.cpp:1264
-#: mediamanager/halbackend.cpp:1273 mediamanager/halbackend.cpp:1663
-#: mediamanager/halbackend.cpp:1680 mediamanager/halbackend.cpp:1691
-#: mediamanager/halbackend.cpp:1793 mediamanager/halbackend.cpp:1801
-#: mediamanager/halbackend.cpp:1808 mediamanager/halbackend.cpp:1848
-#: mediamanager/halbackend.cpp:1854 mediamanager/halbackend.cpp:1861
-#: mounthelper/tdeio_media_mounthelper.cpp:58
-msgid "Internal Error"
-msgstr "שגיאה פנימית"
+#: mediaimpl.cpp:274 mediamanager/tdehardwarebackend.cpp:201
+#: mediamanager/tdehardwarebackend.cpp:252
+#: mounthelper/tdeio_media_mounthelper.cpp:202
+msgid "Unknown mount error."
+msgstr ""
#: mediamanager/dialog.cpp:26 mounthelper/dialog.cpp:26
-msgid "Decrypt"
+msgid "Unlock"
msgstr ""
-#: mediamanager/fstabbackend.cpp:104 mediamanager/fstabbackend.cpp:114
-#: mediamanager/halbackend.cpp:1595 mediamanager/halbackend.cpp:1617
-#: mediamanager/halbackend.cpp:1776 mediamanager/halbackend.cpp:1831
-#: mediamanager/tdehardwarebackend.cpp:1349
-#: mediamanager/tdehardwarebackend.cpp:1360
+#: mediamanager/fstabbackend.cpp:105 mediamanager/fstabbackend.cpp:120
+#: mediamanager/halbackend.cpp:1598 mediamanager/halbackend.cpp:1625
+#: mediamanager/halbackend.cpp:1808 mediamanager/halbackend.cpp:1877
+#: mediamanager/mediamanager.cpp:363 mediamanager/mediamanager.cpp:375
+#: mediamanager/mediamanager.cpp:387 mediamanager/mediamanager.cpp:399
+#: mediamanager/tdehardwarebackend.cpp:1363
+#: mediamanager/tdehardwarebackend.cpp:1378
#, c-format
msgid "No such medium: %1"
msgstr ""
-#: mediamanager/fstabbackend.cpp:398
+#: mediamanager/fstabbackend.cpp:408
msgid "CD Recorder"
msgstr "צורב תקליטורים"
-#: mediamanager/fstabbackend.cpp:404
+#: mediamanager/fstabbackend.cpp:414
msgid "DVD"
msgstr "DVD"
-#: mediamanager/fstabbackend.cpp:415
+#: mediamanager/fstabbackend.cpp:425
msgid "CD-ROM"
msgstr "CD-ROM"
-#: mediamanager/fstabbackend.cpp:428
+#: mediamanager/fstabbackend.cpp:438
msgid "Floppy"
msgstr "דיסקט"
-#: mediamanager/fstabbackend.cpp:436
+#: mediamanager/fstabbackend.cpp:446
msgid "Zip Disk"
msgstr "דיסק Zip"
-#: mediamanager/fstabbackend.cpp:447
+#: mediamanager/fstabbackend.cpp:457
msgid "Removable Device"
msgstr "התקן ניתן להסרה"
-#: mediamanager/fstabbackend.cpp:452 mediamanager/fstabbackend.cpp:458
+#: mediamanager/fstabbackend.cpp:462 mediamanager/fstabbackend.cpp:468
msgid "Remote Share"
msgstr "שיתוף מרוחק"
-#: mediamanager/fstabbackend.cpp:463
+#: mediamanager/fstabbackend.cpp:473
msgid "Hard Disk"
msgstr "כונן קשיח"
-#: mediamanager/halbackend.cpp:749 mediamanager/tdehardwarebackend.cpp:805
+#: mediamanager/halbackend.cpp:744 mediamanager/tdehardwarebackend.cpp:808
#, fuzzy
msgid "Unknown Drive"
msgstr "לא ידוע"
-#: mediamanager/halbackend.cpp:761 mediamanager/tdehardwarebackend.cpp:835
+#: mediamanager/halbackend.cpp:756 mediamanager/tdehardwarebackend.cpp:838
#, fuzzy
msgid "Floppy Drive"
msgstr "דיסקט"
-#: mediamanager/halbackend.cpp:769
+#: mediamanager/halbackend.cpp:764
#, fuzzy
msgid "Zip Drive"
msgstr "דיסק Zip"
-#: mediamanager/halbackend.cpp:839 mediamanager/tdehardwarebackend.cpp:892
+#: mediamanager/halbackend.cpp:834 mediamanager/tdehardwarebackend.cpp:895
msgid "Camera"
msgstr "מצלמה"
-#: mediamanager/halbackend.cpp:1221 mediamanager/halbackend.cpp:1247
+#: mediamanager/halbackend.cpp:1216 mediamanager/halbackend.cpp:1242
msgid "Authenticate"
msgstr ""
-#: mediamanager/halbackend.cpp:1222
+#: mediamanager/halbackend.cpp:1217
msgid ""
"<big><b>System policy prevents mounting internal media</b></big><br/"
">Authentication is required to perform this action. Please enter your "
"password to verify."
msgstr ""
-#: mediamanager/halbackend.cpp:1248
+#: mediamanager/halbackend.cpp:1243
msgid ""
"<big><b>System policy prevents unmounting media mounted by other users</b></"
"big><br/>Authentication is required to perform this action. Please enter "
"your password to verify."
msgstr ""
-#: mediamanager/halbackend.cpp:1284
+#: mediamanager/halbackend.cpp:1259 mediamanager/halbackend.cpp:1268
+#: mediamanager/halbackend.cpp:1849 mediamanager/halbackend.cpp:1916
+#: mounthelper/tdeio_media_mounthelper.cpp:58
+msgid "Internal Error"
+msgstr "שגיאה פנימית"
+
+#: mediamanager/halbackend.cpp:1279
msgid "Invalid filesystem type"
msgstr "סוג מערכת קבצים שגוי"
-#: mediamanager/halbackend.cpp:1286
+#: mediamanager/halbackend.cpp:1281
msgid ""
"Permission denied<p>Please ensure that:<br>1. You have permission to access "
"this device.<br>2. This device node is not listed in /etc/fstab.</p>"
msgstr ""
-#: mediamanager/halbackend.cpp:1290
+#: mediamanager/halbackend.cpp:1285
msgid "Device is already mounted."
msgstr "ההתקן כבר מעוגן."
-#: mediamanager/halbackend.cpp:1340
+#: mediamanager/halbackend.cpp:1335
msgid ""
"Moreover, programs still using the device have been detected. They are "
"listed below. You have to close them or change their working directory "
"before attempting to unmount the device again."
msgstr ""
-#: mediamanager/halbackend.cpp:1381 mediamanager/tdehardwarebackend.cpp:1588
+#: mediamanager/halbackend.cpp:1376 mediamanager/tdehardwarebackend.cpp:1618
msgid ""
"Programs that were still using the device have been forcibly terminated. "
"They are listed below."
msgstr ""
-#: mediamanager/halbackend.cpp:1402 mediamanager/halbackend.cpp:1715
-#: mediamanager/tdehardwarebackend.cpp:1406
-#: mediamanager/tdehardwarebackend.cpp:1424
-#: mediamanager/tdehardwarebackend.cpp:1464
+#: mediamanager/halbackend.cpp:1397 mediamanager/halbackend.cpp:1742
+#: mediamanager/tdehardwarebackend.cpp:1430
+#: mediamanager/tdehardwarebackend.cpp:1452
+#: mediamanager/tdehardwarebackend.cpp:1494
msgid ""
"Unfortunately, the device <b>%1</b> (%2) named <b>'%3'</b> and currently "
"mounted at <b>%4</b> could not be unmounted. "
msgstr ""
-#: mediamanager/halbackend.cpp:1408 mediamanager/tdehardwarebackend.cpp:1470
+#: mediamanager/halbackend.cpp:1403 mediamanager/tdehardwarebackend.cpp:1500
msgid "The following error was returned by umount command:"
msgstr ""
-#: mediamanager/halbackend.cpp:1478
-msgid "Permission denied"
+#: mediamanager/halbackend.cpp:1567 mediamanager/tdehardwarebackend.cpp:1322
+msgid "Cannot mount encrypted locked drives!"
msgstr ""
-#: mediamanager/halbackend.cpp:1562 mediamanager/tdehardwarebackend.cpp:1232
-msgid "Cannot mount encrypted drives!"
-msgstr ""
+#: mediamanager/halbackend.cpp:1682 mediamanager/halbackend.cpp:1703
+#: mediamanager/halbackend.cpp:1716 mediamanager/halbackend.cpp:1830
+#: mediamanager/halbackend.cpp:1840 mediamanager/halbackend.cpp:1899
+#: mediamanager/halbackend.cpp:1907
+#, fuzzy
+msgid "Internal error"
+msgstr "שגיאה פנימית"
-#: mediamanager/halbackend.cpp:1721
+#: mediamanager/halbackend.cpp:1694
+#, fuzzy
+#| msgid "Unknown"
+msgid "Unknown error"
+msgstr "לא ידוע"
+
+#: mediamanager/halbackend.cpp:1748
msgid "Unmounting failed due to the following error:"
msgstr ""
-#: mediamanager/halbackend.cpp:1723
+#: mediamanager/halbackend.cpp:1750
msgid "Device is Busy:"
msgstr "ההתקן עסוק:"
-#: mediamanager/halbackend.cpp:1727
+#: mediamanager/halbackend.cpp:1754
msgid ""
"Permission denied<p>Please ensure that:<br>1. You have permission to access "
"this device.<br>2. This device was originally mounted using TDE.</p>"
msgstr ""
-#: mediamanager/halbackend.cpp:1739
+#: mediamanager/halbackend.cpp:1766
msgid ""
"%1<p><b>Would you like to forcibly terminate these processes?</b><br><i>All "
"unsaved data would be lost</i>"
msgstr ""
-#: mediamanager/halbackend.cpp:1811
+#: mediamanager/halbackend.cpp:1852
msgid "Wrong password"
msgstr ""
-#: mediamanager/mediamanager.cpp:247 mediamanager/mediamanager.cpp:266
-#: mediamanager/mediamanager.cpp:285 mediamanager/mediamanager.cpp:293
-#: mediamanager/mediamanager.cpp:302 mediamanager/mediamanager.cpp:310
-msgid "Feature only available with HAL"
+#: mediamanager/mediamanager.cpp:248 mediamanager/mediamanager.cpp:275
+msgid "Feature only available with the TDE hardware backend"
msgstr ""
-#: mediamanager/mediamanager.cpp:252
-msgid "Feature only available with the TDE hardware backend"
+#: mediamanager/mediamanager.cpp:255 mediamanager/mediamanager.cpp:282
+#: mediamanager/mediamanager.cpp:312 mediamanager/mediamanager.cpp:343
+msgid "Feature only available with HAL"
msgstr ""
-#: mediamanager/mediamanager.cpp:256 mediamanager/mediamanager.cpp:271
-#: mediamanager/mediamanager.cpp:275
+#: mediamanager/mediamanager.cpp:262 mediamanager/mediamanager.cpp:289
+#: mediamanager/mediamanager.cpp:320 mediamanager/mediamanager.cpp:350
msgid "Feature only available with HAL or TDE hardware backend"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:480
-#: mediamanager/tdehardwarebackend.cpp:517
-#: mediamanager/tdehardwarebackend.cpp:750
+#: mediamanager/tdehardwarebackend.cpp:483
+#: mediamanager/tdehardwarebackend.cpp:520
+#: mediamanager/tdehardwarebackend.cpp:753
#, fuzzy
msgid "%1 Removable Device"
msgstr "התקן ניתן להסרה"
-#: mediamanager/tdehardwarebackend.cpp:525
+#: mediamanager/tdehardwarebackend.cpp:528
#, fuzzy
msgid "Blank CD-ROM"
msgstr "CD-ROM"
-#: mediamanager/tdehardwarebackend.cpp:534
+#: mediamanager/tdehardwarebackend.cpp:537
msgid "Blank CD-R"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:543
+#: mediamanager/tdehardwarebackend.cpp:546
msgid "Blank CD-RW"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:552
+#: mediamanager/tdehardwarebackend.cpp:555
msgid "Blank Magneto-Optical CD"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:561
+#: mediamanager/tdehardwarebackend.cpp:564
msgid "Blank Mount Ranier CD-RW"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:570
+#: mediamanager/tdehardwarebackend.cpp:573
msgid "Blank Mount Ranier CD-RW-W"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:579
+#: mediamanager/tdehardwarebackend.cpp:582
msgid "Blank DVD-ROM"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:588
+#: mediamanager/tdehardwarebackend.cpp:591
msgid "Blank DVD-RAM"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:597
+#: mediamanager/tdehardwarebackend.cpp:600
msgid "Blank DVD-R"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:606
+#: mediamanager/tdehardwarebackend.cpp:609
msgid "Blank DVD-RW"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:615
+#: mediamanager/tdehardwarebackend.cpp:618
msgid "Blank Dual Layer DVD-R"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:624
+#: mediamanager/tdehardwarebackend.cpp:627
msgid "Blank Dual Layer DVD-RW"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:633
+#: mediamanager/tdehardwarebackend.cpp:636
msgid "Blank DVD+R"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:642
+#: mediamanager/tdehardwarebackend.cpp:645
msgid "Blank DVD+RW"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:651
+#: mediamanager/tdehardwarebackend.cpp:654
msgid "Blank Dual Layer DVD+R"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:660
+#: mediamanager/tdehardwarebackend.cpp:663
msgid "Blank Dual Layer DVD+RW"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:669
+#: mediamanager/tdehardwarebackend.cpp:672
msgid "Blank BD-ROM"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:678
+#: mediamanager/tdehardwarebackend.cpp:681
msgid "Blank BD-R"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:687
+#: mediamanager/tdehardwarebackend.cpp:690
msgid "Blank BD-RW"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:696
+#: mediamanager/tdehardwarebackend.cpp:699
msgid "Blank HDDVD-ROM"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:705
+#: mediamanager/tdehardwarebackend.cpp:708
msgid "Blank HDDVD-R"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:714
+#: mediamanager/tdehardwarebackend.cpp:717
msgid "Blank HDDVD-RW"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:721
+#: mediamanager/tdehardwarebackend.cpp:724
msgid "Audio CD"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:742
+#: mediamanager/tdehardwarebackend.cpp:745
msgid "%1 Fixed Disk (%2)"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:849
+#: mediamanager/tdehardwarebackend.cpp:852
#, fuzzy
msgid "%1 Zip Disk"
msgstr "דיסק Zip"
-#: mediamanager/tdehardwarebackend.cpp:1212
-#: mediamanager/tdehardwarebackend.cpp:1392
-#, fuzzy
-msgid "Internal error"
-msgstr "שגיאה פנימית"
+#: mediamanager/tdehardwarebackend.cpp:1224
+#: mediamanager/tdehardwarebackend.cpp:1417
+msgid "Internal error. Couldn't find medium."
+msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:1239
-msgid ""
-"<qt>Unable to mount this device.<p>Potential reasons include:<br>Improper "
-"device and/or user privilege level<br>Corrupt data on storage device"
+#: mediamanager/tdehardwarebackend.cpp:1249
+#: mediamanager/tdehardwarebackend.cpp:1323
+msgid "Unable to mount this device."
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:1241
-#: mediamanager/tdehardwarebackend.cpp:1316
-#: mediamanager/tdehardwarebackend.cpp:1408
-#: mediamanager/tdehardwarebackend.cpp:1426
+#: mediamanager/tdehardwarebackend.cpp:1252
+#: mediamanager/tdehardwarebackend.cpp:1326
+#: mediamanager/tdehardwarebackend.cpp:1435
+#: mediamanager/tdehardwarebackend.cpp:1457
msgid "<p>Technical details:<br>"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:1314
-msgid ""
-"<qt>Unable to mount this device.<p>Potential reasons include:<br>Improper "
-"device and/or user privilege level<br>Corrupt data on storage "
-"device<br>Incorrect encryption password"
+#: mediamanager/tdehardwarebackend.cpp:1284
+msgid "Decryption aborted"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:1420
+#: mediamanager/tdehardwarebackend.cpp:1443
msgid ""
"<qt>The device <b>%1</b> (%2) named <b>'%3'</b> and currently mounted at <b>"
"%4</b> can not be unmounted at this time.<p>%5<p><b>Would you like to "
@@ -384,7 +391,7 @@ msgid ""
"lost</i>"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:1547
+#: mediamanager/tdehardwarebackend.cpp:1577
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 "
@@ -395,7 +402,7 @@ msgstr ""
msgid "%1 cannot be found."
msgstr "לא ניתן למצא את %1."
-#: mounthelper/tdeio_media_mounthelper.cpp:86
+#: mounthelper/tdeio_media_mounthelper.cpp:87
msgid "%1 is not a mountable media."
msgstr "%1 הוא לא מדיה ניתנת לעגינה."
@@ -406,39 +413,47 @@ msgstr "%1 הוא לא מדיה ניתנת לעגינה."
#: mounthelper/tdeio_media_mounthelper.cpp:107
#, fuzzy
-msgid "%1 is already decrypted."
+msgid "%1 is already unlocked."
msgstr "ההתקן כבר מעוגן."
-#: mounthelper/tdeio_media_mounthelper.cpp:228
+#: mounthelper/tdeio_media_mounthelper.cpp:139
+msgid "Unknown unmount error."
+msgstr ""
+
+#: mounthelper/tdeio_media_mounthelper.cpp:246
msgid "The device was successfully unmounted, but the tray could not be opened"
msgstr ""
-#: mounthelper/tdeio_media_mounthelper.cpp:230
+#: mounthelper/tdeio_media_mounthelper.cpp:248
msgid "The device was successfully unmounted, but could not be ejected"
msgstr ""
-#: mounthelper/tdeio_media_mounthelper.cpp:275
+#: mounthelper/tdeio_media_mounthelper.cpp:281
+msgid "Unknown decrypt error."
+msgstr ""
+
+#: mounthelper/tdeio_media_mounthelper.cpp:295
#, fuzzy
msgid "Decrypt given URL"
msgstr "בטל עגינת URL נתון"
-#: mounthelper/tdeio_media_mounthelper.cpp:276
+#: mounthelper/tdeio_media_mounthelper.cpp:296
msgid "Unmount given URL"
msgstr "בטל עגינת URL נתון"
-#: mounthelper/tdeio_media_mounthelper.cpp:277
+#: mounthelper/tdeio_media_mounthelper.cpp:297
msgid "Mount given URL (default)"
msgstr "עגון URL נתון (ברירת מחדל)"
-#: mounthelper/tdeio_media_mounthelper.cpp:278
+#: mounthelper/tdeio_media_mounthelper.cpp:298
msgid "Eject given URL via tdeeject"
msgstr "הוצא URL נתון באמצעות tdeeject"
-#: mounthelper/tdeio_media_mounthelper.cpp:279
+#: mounthelper/tdeio_media_mounthelper.cpp:299
msgid "Unmount and Eject given URL (necessary for some USB devices)"
msgstr "בטל עגינה והוצא URL נתון (נחוץ עבור כמה התקני USB)"
-#: mounthelper/tdeio_media_mounthelper.cpp:280
+#: mounthelper/tdeio_media_mounthelper.cpp:300
msgid "media:/ URL to mount/unmount/eject/remove"
msgstr ""
@@ -459,43 +474,43 @@ msgstr ""
msgid "&Mounting"
msgstr "&מעגן"
-#: tdefile-plugin/tdefilemediaplugin.cpp:190
+#: tdefile-plugin/tdefilemediaplugin.cpp:184
msgid "Medium Information"
msgstr "מידע מדיום"
-#: tdefile-plugin/tdefilemediaplugin.cpp:193
+#: tdefile-plugin/tdefilemediaplugin.cpp:187
msgid "Free"
msgstr "חופשי"
-#: tdefile-plugin/tdefilemediaplugin.cpp:196
+#: tdefile-plugin/tdefilemediaplugin.cpp:190
msgid "Used"
msgstr "בשימוש"
-#: tdefile-plugin/tdefilemediaplugin.cpp:199
+#: tdefile-plugin/tdefilemediaplugin.cpp:193
msgid "Total"
msgstr "סך הכל"
-#: tdefile-plugin/tdefilemediaplugin.cpp:202
+#: tdefile-plugin/tdefilemediaplugin.cpp:196
msgid "Base URL"
msgstr "כתובת בסיסית"
-#: tdefile-plugin/tdefilemediaplugin.cpp:203
+#: tdefile-plugin/tdefilemediaplugin.cpp:197
msgid "Mount Point"
msgstr "נקודת עגינה"
-#: tdefile-plugin/tdefilemediaplugin.cpp:204
+#: tdefile-plugin/tdefilemediaplugin.cpp:198
msgid "Device Node"
msgstr ""
-#: tdefile-plugin/tdefilemediaplugin.cpp:206
+#: tdefile-plugin/tdefilemediaplugin.cpp:200
msgid "Medium Summary"
msgstr ""
-#: tdefile-plugin/tdefilemediaplugin.cpp:208
+#: tdefile-plugin/tdefilemediaplugin.cpp:202
msgid "Usage"
msgstr "שימוש"
-#: tdefile-plugin/tdefilemediaplugin.cpp:210
+#: tdefile-plugin/tdefilemediaplugin.cpp:204
msgid "Bar Graph"
msgstr "גרף עמודות"
@@ -567,23 +582,30 @@ msgid ""
"devices are plugged in."
msgstr ""
-#: mediamanager/decryptdialog.ui:24 mounthelper/decryptdialog.ui:24
+#: mediamanager/unlockdialog.ui:24 mounthelper/unlockdialog.ui:24
#, no-c-format
msgid "Decrypting Storage Device"
msgstr ""
-#: mediamanager/decryptdialog.ui:109 mounthelper/decryptdialog.ui:109
+#: mediamanager/unlockdialog.ui:109
#, no-c-format
msgid ""
-"<p><b>%1</b> is an encrypted storage device.</p>\n"
-"<p>Please enter the password to decrypt the storage device.</p>"
+"<p><b>%1</b> is an encrypted locked storage device.</p>\n"
+"<p>Please enter the password to unlock the storage device.</p>"
msgstr ""
-#: mediamanager/decryptdialog.ui:131 mounthelper/decryptdialog.ui:131
+#: mediamanager/unlockdialog.ui:131 mounthelper/unlockdialog.ui:131
#, no-c-format
msgid "&Password:"
msgstr ""
+#: mounthelper/unlockdialog.ui:109
+#, no-c-format
+msgid ""
+"<p><b>%1</b> is an encrypted storage device.</p>\n"
+"<p>Please enter the password to decrypt the storage device.</p>"
+msgstr ""
+
#: propsdlgplugin/propertiespagegui.ui:16
#, no-c-format
msgid "PropertiesPageGUI"
diff --git a/tde-i18n-hi/messages/tdebase/tdeio_media.po b/tde-i18n-hi/messages/tdebase/tdeio_media.po
index a9199256fe4..8c5ed677bae 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: 2019-01-13 18:47+0100\n"
+"POT-Creation-Date: 2019-07-11 02:33+0200\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"
@@ -45,7 +45,6 @@ msgstr ""
#: mediaimpl.cpp:88 mediaimpl.cpp:115 mediaimpl.cpp:141 mediaimpl.cpp:177
#: mediaimpl.cpp:197 mediaimpl.cpp:218
#: mounthelper/tdeio_media_mounthelper.cpp:50
-#: mounthelper/tdeio_media_mounthelper.cpp:256
msgid "The TDE mediamanager is not running."
msgstr "केडीई मीडिया प्रबंधक चल नहीं रहा है."
@@ -53,7 +52,7 @@ msgstr "केडीई मीडिया प्रबंधक चल नह
msgid "This media name already exists."
msgstr "इस नाम का मीडिया पहले से ही मौजूद है"
-#: mediaimpl.cpp:230 mediaimpl.cpp:293
+#: mediaimpl.cpp:230 mediaimpl.cpp:297
msgid "No such medium."
msgstr ""
@@ -61,319 +60,325 @@ msgstr ""
msgid "The drive is encrypted."
msgstr ""
-#: mediaimpl.cpp:272 mediamanager/halbackend.cpp:1264
-#: mediamanager/halbackend.cpp:1273 mediamanager/halbackend.cpp:1663
-#: mediamanager/halbackend.cpp:1680 mediamanager/halbackend.cpp:1691
-#: mediamanager/halbackend.cpp:1793 mediamanager/halbackend.cpp:1801
-#: mediamanager/halbackend.cpp:1808 mediamanager/halbackend.cpp:1848
-#: mediamanager/halbackend.cpp:1854 mediamanager/halbackend.cpp:1861
-#: mounthelper/tdeio_media_mounthelper.cpp:58
-msgid "Internal Error"
+#: mediaimpl.cpp:274 mediamanager/tdehardwarebackend.cpp:201
+#: mediamanager/tdehardwarebackend.cpp:252
+#: mounthelper/tdeio_media_mounthelper.cpp:202
+msgid "Unknown mount error."
msgstr ""
#: mediamanager/dialog.cpp:26 mounthelper/dialog.cpp:26
-msgid "Decrypt"
+msgid "Unlock"
msgstr ""
-#: mediamanager/fstabbackend.cpp:104 mediamanager/fstabbackend.cpp:114
-#: mediamanager/halbackend.cpp:1595 mediamanager/halbackend.cpp:1617
-#: mediamanager/halbackend.cpp:1776 mediamanager/halbackend.cpp:1831
-#: mediamanager/tdehardwarebackend.cpp:1349
-#: mediamanager/tdehardwarebackend.cpp:1360
+#: mediamanager/fstabbackend.cpp:105 mediamanager/fstabbackend.cpp:120
+#: mediamanager/halbackend.cpp:1598 mediamanager/halbackend.cpp:1625
+#: mediamanager/halbackend.cpp:1808 mediamanager/halbackend.cpp:1877
+#: mediamanager/mediamanager.cpp:363 mediamanager/mediamanager.cpp:375
+#: mediamanager/mediamanager.cpp:387 mediamanager/mediamanager.cpp:399
+#: mediamanager/tdehardwarebackend.cpp:1363
+#: mediamanager/tdehardwarebackend.cpp:1378
#, c-format
msgid "No such medium: %1"
msgstr ""
-#: mediamanager/fstabbackend.cpp:398
+#: mediamanager/fstabbackend.cpp:408
msgid "CD Recorder"
msgstr "सीडी रेकॉर्डर"
-#: mediamanager/fstabbackend.cpp:404
+#: mediamanager/fstabbackend.cpp:414
msgid "DVD"
msgstr "डीवीडी"
-#: mediamanager/fstabbackend.cpp:415
+#: mediamanager/fstabbackend.cpp:425
msgid "CD-ROM"
msgstr "सीडी-रॉम"
-#: mediamanager/fstabbackend.cpp:428
+#: mediamanager/fstabbackend.cpp:438
msgid "Floppy"
msgstr "फ़्लॉपी"
-#: mediamanager/fstabbackend.cpp:436
+#: mediamanager/fstabbackend.cpp:446
msgid "Zip Disk"
msgstr "ज़िप डिस्क"
-#: mediamanager/fstabbackend.cpp:447
+#: mediamanager/fstabbackend.cpp:457
msgid "Removable Device"
msgstr "अलग किए जा सकने वाले उपकरण"
-#: mediamanager/fstabbackend.cpp:452 mediamanager/fstabbackend.cpp:458
+#: mediamanager/fstabbackend.cpp:462 mediamanager/fstabbackend.cpp:468
msgid "Remote Share"
msgstr "रिमोट साझा"
-#: mediamanager/fstabbackend.cpp:463
+#: mediamanager/fstabbackend.cpp:473
msgid "Hard Disk"
msgstr "हार्ड डिस्क"
-#: mediamanager/halbackend.cpp:749 mediamanager/tdehardwarebackend.cpp:805
+#: mediamanager/halbackend.cpp:744 mediamanager/tdehardwarebackend.cpp:808
msgid "Unknown Drive"
msgstr ""
-#: mediamanager/halbackend.cpp:761 mediamanager/tdehardwarebackend.cpp:835
+#: mediamanager/halbackend.cpp:756 mediamanager/tdehardwarebackend.cpp:838
#, fuzzy
msgid "Floppy Drive"
msgstr "फ़्लॉपी"
-#: mediamanager/halbackend.cpp:769
+#: mediamanager/halbackend.cpp:764
#, fuzzy
msgid "Zip Drive"
msgstr "ज़िप डिस्क"
-#: mediamanager/halbackend.cpp:839 mediamanager/tdehardwarebackend.cpp:892
+#: mediamanager/halbackend.cpp:834 mediamanager/tdehardwarebackend.cpp:895
msgid "Camera"
msgstr ""
-#: mediamanager/halbackend.cpp:1221 mediamanager/halbackend.cpp:1247
+#: mediamanager/halbackend.cpp:1216 mediamanager/halbackend.cpp:1242
msgid "Authenticate"
msgstr ""
-#: mediamanager/halbackend.cpp:1222
+#: mediamanager/halbackend.cpp:1217
msgid ""
"<big><b>System policy prevents mounting internal media</b></big><br/"
">Authentication is required to perform this action. Please enter your "
"password to verify."
msgstr ""
-#: mediamanager/halbackend.cpp:1248
+#: mediamanager/halbackend.cpp:1243
msgid ""
"<big><b>System policy prevents unmounting media mounted by other users</b></"
"big><br/>Authentication is required to perform this action. Please enter "
"your password to verify."
msgstr ""
-#: mediamanager/halbackend.cpp:1284
+#: mediamanager/halbackend.cpp:1259 mediamanager/halbackend.cpp:1268
+#: mediamanager/halbackend.cpp:1849 mediamanager/halbackend.cpp:1916
+#: mounthelper/tdeio_media_mounthelper.cpp:58
+msgid "Internal Error"
+msgstr ""
+
+#: mediamanager/halbackend.cpp:1279
msgid "Invalid filesystem type"
msgstr ""
-#: mediamanager/halbackend.cpp:1286
+#: mediamanager/halbackend.cpp:1281
msgid ""
"Permission denied<p>Please ensure that:<br>1. You have permission to access "
"this device.<br>2. This device node is not listed in /etc/fstab.</p>"
msgstr ""
-#: mediamanager/halbackend.cpp:1290
+#: mediamanager/halbackend.cpp:1285
msgid "Device is already mounted."
msgstr ""
-#: mediamanager/halbackend.cpp:1340
+#: mediamanager/halbackend.cpp:1335
msgid ""
"Moreover, programs still using the device have been detected. They are "
"listed below. You have to close them or change their working directory "
"before attempting to unmount the device again."
msgstr ""
-#: mediamanager/halbackend.cpp:1381 mediamanager/tdehardwarebackend.cpp:1588
+#: mediamanager/halbackend.cpp:1376 mediamanager/tdehardwarebackend.cpp:1618
msgid ""
"Programs that were still using the device have been forcibly terminated. "
"They are listed below."
msgstr ""
-#: mediamanager/halbackend.cpp:1402 mediamanager/halbackend.cpp:1715
-#: mediamanager/tdehardwarebackend.cpp:1406
-#: mediamanager/tdehardwarebackend.cpp:1424
-#: mediamanager/tdehardwarebackend.cpp:1464
+#: mediamanager/halbackend.cpp:1397 mediamanager/halbackend.cpp:1742
+#: mediamanager/tdehardwarebackend.cpp:1430
+#: mediamanager/tdehardwarebackend.cpp:1452
+#: mediamanager/tdehardwarebackend.cpp:1494
msgid ""
"Unfortunately, the device <b>%1</b> (%2) named <b>'%3'</b> and currently "
"mounted at <b>%4</b> could not be unmounted. "
msgstr ""
-#: mediamanager/halbackend.cpp:1408 mediamanager/tdehardwarebackend.cpp:1470
+#: mediamanager/halbackend.cpp:1403 mediamanager/tdehardwarebackend.cpp:1500
msgid "The following error was returned by umount command:"
msgstr ""
-#: mediamanager/halbackend.cpp:1478
-msgid "Permission denied"
+#: mediamanager/halbackend.cpp:1567 mediamanager/tdehardwarebackend.cpp:1322
+msgid "Cannot mount encrypted locked drives!"
msgstr ""
-#: mediamanager/halbackend.cpp:1562 mediamanager/tdehardwarebackend.cpp:1232
-msgid "Cannot mount encrypted drives!"
+#: mediamanager/halbackend.cpp:1682 mediamanager/halbackend.cpp:1703
+#: mediamanager/halbackend.cpp:1716 mediamanager/halbackend.cpp:1830
+#: mediamanager/halbackend.cpp:1840 mediamanager/halbackend.cpp:1899
+#: mediamanager/halbackend.cpp:1907
+msgid "Internal error"
msgstr ""
-#: mediamanager/halbackend.cpp:1721
+#: mediamanager/halbackend.cpp:1694
+msgid "Unknown error"
+msgstr ""
+
+#: mediamanager/halbackend.cpp:1748
msgid "Unmounting failed due to the following error:"
msgstr ""
-#: mediamanager/halbackend.cpp:1723
+#: mediamanager/halbackend.cpp:1750
msgid "Device is Busy:"
msgstr ""
-#: mediamanager/halbackend.cpp:1727
+#: mediamanager/halbackend.cpp:1754
msgid ""
"Permission denied<p>Please ensure that:<br>1. You have permission to access "
"this device.<br>2. This device was originally mounted using TDE.</p>"
msgstr ""
-#: mediamanager/halbackend.cpp:1739
+#: mediamanager/halbackend.cpp:1766
msgid ""
"%1<p><b>Would you like to forcibly terminate these processes?</b><br><i>All "
"unsaved data would be lost</i>"
msgstr ""
-#: mediamanager/halbackend.cpp:1811
+#: mediamanager/halbackend.cpp:1852
msgid "Wrong password"
msgstr ""
-#: mediamanager/mediamanager.cpp:247 mediamanager/mediamanager.cpp:266
-#: mediamanager/mediamanager.cpp:285 mediamanager/mediamanager.cpp:293
-#: mediamanager/mediamanager.cpp:302 mediamanager/mediamanager.cpp:310
-msgid "Feature only available with HAL"
+#: mediamanager/mediamanager.cpp:248 mediamanager/mediamanager.cpp:275
+msgid "Feature only available with the TDE hardware backend"
msgstr ""
-#: mediamanager/mediamanager.cpp:252
-msgid "Feature only available with the TDE hardware backend"
+#: mediamanager/mediamanager.cpp:255 mediamanager/mediamanager.cpp:282
+#: mediamanager/mediamanager.cpp:312 mediamanager/mediamanager.cpp:343
+msgid "Feature only available with HAL"
msgstr ""
-#: mediamanager/mediamanager.cpp:256 mediamanager/mediamanager.cpp:271
-#: mediamanager/mediamanager.cpp:275
+#: mediamanager/mediamanager.cpp:262 mediamanager/mediamanager.cpp:289
+#: mediamanager/mediamanager.cpp:320 mediamanager/mediamanager.cpp:350
msgid "Feature only available with HAL or TDE hardware backend"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:480
-#: mediamanager/tdehardwarebackend.cpp:517
-#: mediamanager/tdehardwarebackend.cpp:750
+#: mediamanager/tdehardwarebackend.cpp:483
+#: mediamanager/tdehardwarebackend.cpp:520
+#: mediamanager/tdehardwarebackend.cpp:753
#, fuzzy
msgid "%1 Removable Device"
msgstr "अलग किए जा सकने वाले उपकरण"
-#: mediamanager/tdehardwarebackend.cpp:525
+#: mediamanager/tdehardwarebackend.cpp:528
#, fuzzy
msgid "Blank CD-ROM"
msgstr "सीडी-रॉम"
-#: mediamanager/tdehardwarebackend.cpp:534
+#: mediamanager/tdehardwarebackend.cpp:537
msgid "Blank CD-R"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:543
+#: mediamanager/tdehardwarebackend.cpp:546
msgid "Blank CD-RW"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:552
+#: mediamanager/tdehardwarebackend.cpp:555
msgid "Blank Magneto-Optical CD"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:561
+#: mediamanager/tdehardwarebackend.cpp:564
msgid "Blank Mount Ranier CD-RW"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:570
+#: mediamanager/tdehardwarebackend.cpp:573
msgid "Blank Mount Ranier CD-RW-W"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:579
+#: mediamanager/tdehardwarebackend.cpp:582
msgid "Blank DVD-ROM"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:588
+#: mediamanager/tdehardwarebackend.cpp:591
msgid "Blank DVD-RAM"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:597
+#: mediamanager/tdehardwarebackend.cpp:600
msgid "Blank DVD-R"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:606
+#: mediamanager/tdehardwarebackend.cpp:609
msgid "Blank DVD-RW"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:615
+#: mediamanager/tdehardwarebackend.cpp:618
msgid "Blank Dual Layer DVD-R"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:624
+#: mediamanager/tdehardwarebackend.cpp:627
msgid "Blank Dual Layer DVD-RW"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:633
+#: mediamanager/tdehardwarebackend.cpp:636
msgid "Blank DVD+R"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:642
+#: mediamanager/tdehardwarebackend.cpp:645
msgid "Blank DVD+RW"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:651
+#: mediamanager/tdehardwarebackend.cpp:654
msgid "Blank Dual Layer DVD+R"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:660
+#: mediamanager/tdehardwarebackend.cpp:663
msgid "Blank Dual Layer DVD+RW"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:669
+#: mediamanager/tdehardwarebackend.cpp:672
msgid "Blank BD-ROM"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:678
+#: mediamanager/tdehardwarebackend.cpp:681
msgid "Blank BD-R"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:687
+#: mediamanager/tdehardwarebackend.cpp:690
msgid "Blank BD-RW"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:696
+#: mediamanager/tdehardwarebackend.cpp:699
msgid "Blank HDDVD-ROM"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:705
+#: mediamanager/tdehardwarebackend.cpp:708
msgid "Blank HDDVD-R"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:714
+#: mediamanager/tdehardwarebackend.cpp:717
msgid "Blank HDDVD-RW"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:721
+#: mediamanager/tdehardwarebackend.cpp:724
msgid "Audio CD"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:742
+#: mediamanager/tdehardwarebackend.cpp:745
msgid "%1 Fixed Disk (%2)"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:849
+#: mediamanager/tdehardwarebackend.cpp:852
#, fuzzy
msgid "%1 Zip Disk"
msgstr "ज़िप डिस्क"
-#: mediamanager/tdehardwarebackend.cpp:1212
-#: mediamanager/tdehardwarebackend.cpp:1392
-msgid "Internal error"
+#: mediamanager/tdehardwarebackend.cpp:1224
+#: mediamanager/tdehardwarebackend.cpp:1417
+msgid "Internal error. Couldn't find medium."
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:1239
-msgid ""
-"<qt>Unable to mount this device.<p>Potential reasons include:<br>Improper "
-"device and/or user privilege level<br>Corrupt data on storage device"
+#: mediamanager/tdehardwarebackend.cpp:1249
+#: mediamanager/tdehardwarebackend.cpp:1323
+msgid "Unable to mount this device."
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:1241
-#: mediamanager/tdehardwarebackend.cpp:1316
-#: mediamanager/tdehardwarebackend.cpp:1408
-#: mediamanager/tdehardwarebackend.cpp:1426
+#: mediamanager/tdehardwarebackend.cpp:1252
+#: mediamanager/tdehardwarebackend.cpp:1326
+#: mediamanager/tdehardwarebackend.cpp:1435
+#: mediamanager/tdehardwarebackend.cpp:1457
msgid "<p>Technical details:<br>"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:1314
-msgid ""
-"<qt>Unable to mount this device.<p>Potential reasons include:<br>Improper "
-"device and/or user privilege level<br>Corrupt data on storage "
-"device<br>Incorrect encryption password"
+#: mediamanager/tdehardwarebackend.cpp:1284
+msgid "Decryption aborted"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:1420
+#: mediamanager/tdehardwarebackend.cpp:1443
msgid ""
"<qt>The device <b>%1</b> (%2) named <b>'%3'</b> and currently mounted at <b>"
"%4</b> can not be unmounted at this time.<p>%5<p><b>Would you like to "
@@ -381,7 +386,7 @@ msgid ""
"lost</i>"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:1547
+#: mediamanager/tdehardwarebackend.cpp:1577
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 "
@@ -392,7 +397,7 @@ msgstr ""
msgid "%1 cannot be found."
msgstr "%1 नहीं मिला."
-#: mounthelper/tdeio_media_mounthelper.cpp:86
+#: mounthelper/tdeio_media_mounthelper.cpp:87
msgid "%1 is not a mountable media."
msgstr "%1 माउन्ट किया जाने योग्य मीडिया नहीं है."
@@ -402,39 +407,47 @@ msgid "%1 is not an encrypted media."
msgstr "%1 माउन्ट किया जाने योग्य मीडिया नहीं है."
#: mounthelper/tdeio_media_mounthelper.cpp:107
-msgid "%1 is already decrypted."
+msgid "%1 is already unlocked."
+msgstr ""
+
+#: mounthelper/tdeio_media_mounthelper.cpp:139
+msgid "Unknown unmount error."
msgstr ""
-#: mounthelper/tdeio_media_mounthelper.cpp:228
+#: mounthelper/tdeio_media_mounthelper.cpp:246
msgid "The device was successfully unmounted, but the tray could not be opened"
msgstr ""
-#: mounthelper/tdeio_media_mounthelper.cpp:230
+#: mounthelper/tdeio_media_mounthelper.cpp:248
msgid "The device was successfully unmounted, but could not be ejected"
msgstr ""
-#: mounthelper/tdeio_media_mounthelper.cpp:275
+#: mounthelper/tdeio_media_mounthelper.cpp:281
+msgid "Unknown decrypt error."
+msgstr ""
+
+#: mounthelper/tdeio_media_mounthelper.cpp:295
#, fuzzy
msgid "Decrypt given URL"
msgstr "दिए गए यूआरएल को अनमाउन्ट करें"
-#: mounthelper/tdeio_media_mounthelper.cpp:276
+#: mounthelper/tdeio_media_mounthelper.cpp:296
msgid "Unmount given URL"
msgstr "दिए गए यूआरएल को अनमाउन्ट करें"
-#: mounthelper/tdeio_media_mounthelper.cpp:277
+#: mounthelper/tdeio_media_mounthelper.cpp:297
msgid "Mount given URL (default)"
msgstr "दिए गए यूआरएल को माउन्ट करें (डिफ़ॉल्ट)"
-#: mounthelper/tdeio_media_mounthelper.cpp:278
+#: mounthelper/tdeio_media_mounthelper.cpp:298
msgid "Eject given URL via tdeeject"
msgstr "tdeeject द्वारा दिए गए यूआरएल को बाहर करें"
-#: mounthelper/tdeio_media_mounthelper.cpp:279
+#: mounthelper/tdeio_media_mounthelper.cpp:299
msgid "Unmount and Eject given URL (necessary for some USB devices)"
msgstr ""
-#: mounthelper/tdeio_media_mounthelper.cpp:280
+#: mounthelper/tdeio_media_mounthelper.cpp:300
#, fuzzy
msgid "media:/ URL to mount/unmount/eject/remove"
msgstr "उपकरण:/ यूआरएल माउन्ट/अनमाउन्ट/बाहर हेतु."
@@ -456,43 +469,43 @@ msgstr ""
msgid "&Mounting"
msgstr ""
-#: tdefile-plugin/tdefilemediaplugin.cpp:190
+#: tdefile-plugin/tdefilemediaplugin.cpp:184
msgid "Medium Information"
msgstr "मीडियम जानकारी"
-#: tdefile-plugin/tdefilemediaplugin.cpp:193
+#: tdefile-plugin/tdefilemediaplugin.cpp:187
msgid "Free"
msgstr "मुक्त"
-#: tdefile-plugin/tdefilemediaplugin.cpp:196
+#: tdefile-plugin/tdefilemediaplugin.cpp:190
msgid "Used"
msgstr "उपयोग में"
-#: tdefile-plugin/tdefilemediaplugin.cpp:199
+#: tdefile-plugin/tdefilemediaplugin.cpp:193
msgid "Total"
msgstr "योग"
-#: tdefile-plugin/tdefilemediaplugin.cpp:202
+#: tdefile-plugin/tdefilemediaplugin.cpp:196
msgid "Base URL"
msgstr ""
-#: tdefile-plugin/tdefilemediaplugin.cpp:203
+#: tdefile-plugin/tdefilemediaplugin.cpp:197
msgid "Mount Point"
msgstr ""
-#: tdefile-plugin/tdefilemediaplugin.cpp:204
+#: tdefile-plugin/tdefilemediaplugin.cpp:198
msgid "Device Node"
msgstr ""
-#: tdefile-plugin/tdefilemediaplugin.cpp:206
+#: tdefile-plugin/tdefilemediaplugin.cpp:200
msgid "Medium Summary"
msgstr "मीडियम सारांश"
-#: tdefile-plugin/tdefilemediaplugin.cpp:208
+#: tdefile-plugin/tdefilemediaplugin.cpp:202
msgid "Usage"
msgstr "उपयोग"
-#: tdefile-plugin/tdefilemediaplugin.cpp:210
+#: tdefile-plugin/tdefilemediaplugin.cpp:204
#, fuzzy
msgid "Bar Graph"
msgstr "बार ग्राफ"
@@ -565,23 +578,30 @@ msgid ""
"devices are plugged in."
msgstr ""
-#: mediamanager/decryptdialog.ui:24 mounthelper/decryptdialog.ui:24
+#: mediamanager/unlockdialog.ui:24 mounthelper/unlockdialog.ui:24
#, no-c-format
msgid "Decrypting Storage Device"
msgstr ""
-#: mediamanager/decryptdialog.ui:109 mounthelper/decryptdialog.ui:109
+#: mediamanager/unlockdialog.ui:109
#, no-c-format
msgid ""
-"<p><b>%1</b> is an encrypted storage device.</p>\n"
-"<p>Please enter the password to decrypt the storage device.</p>"
+"<p><b>%1</b> is an encrypted locked storage device.</p>\n"
+"<p>Please enter the password to unlock the storage device.</p>"
msgstr ""
-#: mediamanager/decryptdialog.ui:131 mounthelper/decryptdialog.ui:131
+#: mediamanager/unlockdialog.ui:131 mounthelper/unlockdialog.ui:131
#, no-c-format
msgid "&Password:"
msgstr ""
+#: mounthelper/unlockdialog.ui:109
+#, no-c-format
+msgid ""
+"<p><b>%1</b> is an encrypted storage device.</p>\n"
+"<p>Please enter the password to decrypt the storage device.</p>"
+msgstr ""
+
#: propsdlgplugin/propertiespagegui.ui:16
#, no-c-format
msgid "PropertiesPageGUI"
diff --git a/tde-i18n-hr/messages/tdebase/tdeio_media.po b/tde-i18n-hr/messages/tdebase/tdeio_media.po
index dc2d5cf4034..8cf01b9905c 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: 2019-01-13 18:47+0100\n"
+"POT-Creation-Date: 2019-07-11 02:33+0200\n"
"PO-Revision-Date: 2004-04-20 13:25+CEST\n"
"Last-Translator: auto\n"
"Language-Team: Croatian <lokalizacija@linux.hr>\n"
@@ -47,7 +47,6 @@ 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
-#: mounthelper/tdeio_media_mounthelper.cpp:256
msgid "The TDE mediamanager is not running."
msgstr ""
@@ -55,7 +54,7 @@ msgstr ""
msgid "This media name already exists."
msgstr ""
-#: mediaimpl.cpp:230 mediaimpl.cpp:293
+#: mediaimpl.cpp:230 mediaimpl.cpp:297
msgid "No such medium."
msgstr ""
@@ -63,321 +62,329 @@ msgstr ""
msgid "The drive is encrypted."
msgstr ""
-#: mediaimpl.cpp:272 mediamanager/halbackend.cpp:1264
-#: mediamanager/halbackend.cpp:1273 mediamanager/halbackend.cpp:1663
-#: mediamanager/halbackend.cpp:1680 mediamanager/halbackend.cpp:1691
-#: mediamanager/halbackend.cpp:1793 mediamanager/halbackend.cpp:1801
-#: mediamanager/halbackend.cpp:1808 mediamanager/halbackend.cpp:1848
-#: mediamanager/halbackend.cpp:1854 mediamanager/halbackend.cpp:1861
-#: mounthelper/tdeio_media_mounthelper.cpp:58
-msgid "Internal Error"
+#: mediaimpl.cpp:274 mediamanager/tdehardwarebackend.cpp:201
+#: mediamanager/tdehardwarebackend.cpp:252
+#: mounthelper/tdeio_media_mounthelper.cpp:202
+msgid "Unknown mount error."
msgstr ""
#: mediamanager/dialog.cpp:26 mounthelper/dialog.cpp:26
-msgid "Decrypt"
+msgid "Unlock"
msgstr ""
-#: mediamanager/fstabbackend.cpp:104 mediamanager/fstabbackend.cpp:114
-#: mediamanager/halbackend.cpp:1595 mediamanager/halbackend.cpp:1617
-#: mediamanager/halbackend.cpp:1776 mediamanager/halbackend.cpp:1831
-#: mediamanager/tdehardwarebackend.cpp:1349
-#: mediamanager/tdehardwarebackend.cpp:1360
+#: mediamanager/fstabbackend.cpp:105 mediamanager/fstabbackend.cpp:120
+#: mediamanager/halbackend.cpp:1598 mediamanager/halbackend.cpp:1625
+#: mediamanager/halbackend.cpp:1808 mediamanager/halbackend.cpp:1877
+#: mediamanager/mediamanager.cpp:363 mediamanager/mediamanager.cpp:375
+#: mediamanager/mediamanager.cpp:387 mediamanager/mediamanager.cpp:399
+#: mediamanager/tdehardwarebackend.cpp:1363
+#: mediamanager/tdehardwarebackend.cpp:1378
#, c-format
msgid "No such medium: %1"
msgstr ""
-#: mediamanager/fstabbackend.cpp:398
+#: mediamanager/fstabbackend.cpp:408
msgid "CD Recorder"
msgstr "CD Pržilica"
-#: mediamanager/fstabbackend.cpp:404
+#: mediamanager/fstabbackend.cpp:414
msgid "DVD"
msgstr "DVD"
-#: mediamanager/fstabbackend.cpp:415
+#: mediamanager/fstabbackend.cpp:425
msgid "CD-ROM"
msgstr "CD-ROM"
-#: mediamanager/fstabbackend.cpp:428
+#: mediamanager/fstabbackend.cpp:438
msgid "Floppy"
msgstr "Disketa"
-#: mediamanager/fstabbackend.cpp:436
+#: mediamanager/fstabbackend.cpp:446
msgid "Zip Disk"
msgstr "Zip Disk"
-#: mediamanager/fstabbackend.cpp:447
+#: mediamanager/fstabbackend.cpp:457
msgid "Removable Device"
msgstr ""
-#: mediamanager/fstabbackend.cpp:452 mediamanager/fstabbackend.cpp:458
+#: mediamanager/fstabbackend.cpp:462 mediamanager/fstabbackend.cpp:468
msgid "Remote Share"
msgstr "Udaljeni resurs"
-#: mediamanager/fstabbackend.cpp:463
+#: mediamanager/fstabbackend.cpp:473
#, fuzzy
msgid "Hard Disk"
msgstr "Hard disk"
-#: mediamanager/halbackend.cpp:749 mediamanager/tdehardwarebackend.cpp:805
+#: mediamanager/halbackend.cpp:744 mediamanager/tdehardwarebackend.cpp:808
#, fuzzy
msgid "Unknown Drive"
msgstr "Napoznato"
-#: mediamanager/halbackend.cpp:761 mediamanager/tdehardwarebackend.cpp:835
+#: mediamanager/halbackend.cpp:756 mediamanager/tdehardwarebackend.cpp:838
#, fuzzy
msgid "Floppy Drive"
msgstr "Disketa"
-#: mediamanager/halbackend.cpp:769
+#: mediamanager/halbackend.cpp:764
#, fuzzy
msgid "Zip Drive"
msgstr "Zip Disk"
-#: mediamanager/halbackend.cpp:839 mediamanager/tdehardwarebackend.cpp:892
+#: mediamanager/halbackend.cpp:834 mediamanager/tdehardwarebackend.cpp:895
msgid "Camera"
msgstr ""
-#: mediamanager/halbackend.cpp:1221 mediamanager/halbackend.cpp:1247
+#: mediamanager/halbackend.cpp:1216 mediamanager/halbackend.cpp:1242
msgid "Authenticate"
msgstr ""
-#: mediamanager/halbackend.cpp:1222
+#: mediamanager/halbackend.cpp:1217
msgid ""
"<big><b>System policy prevents mounting internal media</b></big><br/"
">Authentication is required to perform this action. Please enter your "
"password to verify."
msgstr ""
-#: mediamanager/halbackend.cpp:1248
+#: mediamanager/halbackend.cpp:1243
msgid ""
"<big><b>System policy prevents unmounting media mounted by other users</b></"
"big><br/>Authentication is required to perform this action. Please enter "
"your password to verify."
msgstr ""
-#: mediamanager/halbackend.cpp:1284
+#: mediamanager/halbackend.cpp:1259 mediamanager/halbackend.cpp:1268
+#: mediamanager/halbackend.cpp:1849 mediamanager/halbackend.cpp:1916
+#: mounthelper/tdeio_media_mounthelper.cpp:58
+msgid "Internal Error"
+msgstr ""
+
+#: mediamanager/halbackend.cpp:1279
msgid "Invalid filesystem type"
msgstr ""
-#: mediamanager/halbackend.cpp:1286
+#: mediamanager/halbackend.cpp:1281
msgid ""
"Permission denied<p>Please ensure that:<br>1. You have permission to access "
"this device.<br>2. This device node is not listed in /etc/fstab.</p>"
msgstr ""
-#: mediamanager/halbackend.cpp:1290
+#: mediamanager/halbackend.cpp:1285
#, fuzzy
msgid "Device is already mounted."
msgstr "Uređaj nije montiran"
-#: mediamanager/halbackend.cpp:1340
+#: mediamanager/halbackend.cpp:1335
msgid ""
"Moreover, programs still using the device have been detected. They are "
"listed below. You have to close them or change their working directory "
"before attempting to unmount the device again."
msgstr ""
-#: mediamanager/halbackend.cpp:1381 mediamanager/tdehardwarebackend.cpp:1588
+#: mediamanager/halbackend.cpp:1376 mediamanager/tdehardwarebackend.cpp:1618
msgid ""
"Programs that were still using the device have been forcibly terminated. "
"They are listed below."
msgstr ""
-#: mediamanager/halbackend.cpp:1402 mediamanager/halbackend.cpp:1715
-#: mediamanager/tdehardwarebackend.cpp:1406
-#: mediamanager/tdehardwarebackend.cpp:1424
-#: mediamanager/tdehardwarebackend.cpp:1464
+#: mediamanager/halbackend.cpp:1397 mediamanager/halbackend.cpp:1742
+#: mediamanager/tdehardwarebackend.cpp:1430
+#: mediamanager/tdehardwarebackend.cpp:1452
+#: mediamanager/tdehardwarebackend.cpp:1494
msgid ""
"Unfortunately, the device <b>%1</b> (%2) named <b>'%3'</b> and currently "
"mounted at <b>%4</b> could not be unmounted. "
msgstr ""
-#: mediamanager/halbackend.cpp:1408 mediamanager/tdehardwarebackend.cpp:1470
+#: mediamanager/halbackend.cpp:1403 mediamanager/tdehardwarebackend.cpp:1500
msgid "The following error was returned by umount command:"
msgstr ""
-#: mediamanager/halbackend.cpp:1478
-msgid "Permission denied"
+#: mediamanager/halbackend.cpp:1567 mediamanager/tdehardwarebackend.cpp:1322
+msgid "Cannot mount encrypted locked drives!"
msgstr ""
-#: mediamanager/halbackend.cpp:1562 mediamanager/tdehardwarebackend.cpp:1232
-msgid "Cannot mount encrypted drives!"
+#: mediamanager/halbackend.cpp:1682 mediamanager/halbackend.cpp:1703
+#: mediamanager/halbackend.cpp:1716 mediamanager/halbackend.cpp:1830
+#: mediamanager/halbackend.cpp:1840 mediamanager/halbackend.cpp:1899
+#: mediamanager/halbackend.cpp:1907
+msgid "Internal error"
msgstr ""
-#: mediamanager/halbackend.cpp:1721
+#: mediamanager/halbackend.cpp:1694
+#, fuzzy
+#| msgid "Unknown"
+msgid "Unknown error"
+msgstr "Napoznato"
+
+#: mediamanager/halbackend.cpp:1748
msgid "Unmounting failed due to the following error:"
msgstr ""
-#: mediamanager/halbackend.cpp:1723
+#: mediamanager/halbackend.cpp:1750
msgid "Device is Busy:"
msgstr ""
-#: mediamanager/halbackend.cpp:1727
+#: mediamanager/halbackend.cpp:1754
msgid ""
"Permission denied<p>Please ensure that:<br>1. You have permission to access "
"this device.<br>2. This device was originally mounted using TDE.</p>"
msgstr ""
-#: mediamanager/halbackend.cpp:1739
+#: mediamanager/halbackend.cpp:1766
msgid ""
"%1<p><b>Would you like to forcibly terminate these processes?</b><br><i>All "
"unsaved data would be lost</i>"
msgstr ""
-#: mediamanager/halbackend.cpp:1811
+#: mediamanager/halbackend.cpp:1852
msgid "Wrong password"
msgstr ""
-#: mediamanager/mediamanager.cpp:247 mediamanager/mediamanager.cpp:266
-#: mediamanager/mediamanager.cpp:285 mediamanager/mediamanager.cpp:293
-#: mediamanager/mediamanager.cpp:302 mediamanager/mediamanager.cpp:310
-msgid "Feature only available with HAL"
+#: mediamanager/mediamanager.cpp:248 mediamanager/mediamanager.cpp:275
+msgid "Feature only available with the TDE hardware backend"
msgstr ""
-#: mediamanager/mediamanager.cpp:252
-msgid "Feature only available with the TDE hardware backend"
+#: mediamanager/mediamanager.cpp:255 mediamanager/mediamanager.cpp:282
+#: mediamanager/mediamanager.cpp:312 mediamanager/mediamanager.cpp:343
+msgid "Feature only available with HAL"
msgstr ""
-#: mediamanager/mediamanager.cpp:256 mediamanager/mediamanager.cpp:271
-#: mediamanager/mediamanager.cpp:275
+#: mediamanager/mediamanager.cpp:262 mediamanager/mediamanager.cpp:289
+#: mediamanager/mediamanager.cpp:320 mediamanager/mediamanager.cpp:350
msgid "Feature only available with HAL or TDE hardware backend"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:480
-#: mediamanager/tdehardwarebackend.cpp:517
-#: mediamanager/tdehardwarebackend.cpp:750
+#: mediamanager/tdehardwarebackend.cpp:483
+#: mediamanager/tdehardwarebackend.cpp:520
+#: mediamanager/tdehardwarebackend.cpp:753
msgid "%1 Removable Device"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:525
+#: mediamanager/tdehardwarebackend.cpp:528
#, fuzzy
msgid "Blank CD-ROM"
msgstr "CD-ROM"
-#: mediamanager/tdehardwarebackend.cpp:534
+#: mediamanager/tdehardwarebackend.cpp:537
msgid "Blank CD-R"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:543
+#: mediamanager/tdehardwarebackend.cpp:546
msgid "Blank CD-RW"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:552
+#: mediamanager/tdehardwarebackend.cpp:555
msgid "Blank Magneto-Optical CD"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:561
+#: mediamanager/tdehardwarebackend.cpp:564
msgid "Blank Mount Ranier CD-RW"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:570
+#: mediamanager/tdehardwarebackend.cpp:573
msgid "Blank Mount Ranier CD-RW-W"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:579
+#: mediamanager/tdehardwarebackend.cpp:582
msgid "Blank DVD-ROM"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:588
+#: mediamanager/tdehardwarebackend.cpp:591
msgid "Blank DVD-RAM"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:597
+#: mediamanager/tdehardwarebackend.cpp:600
msgid "Blank DVD-R"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:606
+#: mediamanager/tdehardwarebackend.cpp:609
msgid "Blank DVD-RW"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:615
+#: mediamanager/tdehardwarebackend.cpp:618
msgid "Blank Dual Layer DVD-R"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:624
+#: mediamanager/tdehardwarebackend.cpp:627
msgid "Blank Dual Layer DVD-RW"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:633
+#: mediamanager/tdehardwarebackend.cpp:636
msgid "Blank DVD+R"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:642
+#: mediamanager/tdehardwarebackend.cpp:645
msgid "Blank DVD+RW"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:651
+#: mediamanager/tdehardwarebackend.cpp:654
msgid "Blank Dual Layer DVD+R"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:660
+#: mediamanager/tdehardwarebackend.cpp:663
msgid "Blank Dual Layer DVD+RW"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:669
+#: mediamanager/tdehardwarebackend.cpp:672
msgid "Blank BD-ROM"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:678
+#: mediamanager/tdehardwarebackend.cpp:681
msgid "Blank BD-R"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:687
+#: mediamanager/tdehardwarebackend.cpp:690
msgid "Blank BD-RW"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:696
+#: mediamanager/tdehardwarebackend.cpp:699
msgid "Blank HDDVD-ROM"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:705
+#: mediamanager/tdehardwarebackend.cpp:708
msgid "Blank HDDVD-R"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:714
+#: mediamanager/tdehardwarebackend.cpp:717
msgid "Blank HDDVD-RW"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:721
+#: mediamanager/tdehardwarebackend.cpp:724
msgid "Audio CD"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:742
+#: mediamanager/tdehardwarebackend.cpp:745
msgid "%1 Fixed Disk (%2)"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:849
+#: mediamanager/tdehardwarebackend.cpp:852
#, fuzzy
msgid "%1 Zip Disk"
msgstr "Zip Disk"
-#: mediamanager/tdehardwarebackend.cpp:1212
-#: mediamanager/tdehardwarebackend.cpp:1392
-msgid "Internal error"
+#: mediamanager/tdehardwarebackend.cpp:1224
+#: mediamanager/tdehardwarebackend.cpp:1417
+msgid "Internal error. Couldn't find medium."
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:1239
-msgid ""
-"<qt>Unable to mount this device.<p>Potential reasons include:<br>Improper "
-"device and/or user privilege level<br>Corrupt data on storage device"
+#: mediamanager/tdehardwarebackend.cpp:1249
+#: mediamanager/tdehardwarebackend.cpp:1323
+msgid "Unable to mount this device."
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:1241
-#: mediamanager/tdehardwarebackend.cpp:1316
-#: mediamanager/tdehardwarebackend.cpp:1408
-#: mediamanager/tdehardwarebackend.cpp:1426
+#: mediamanager/tdehardwarebackend.cpp:1252
+#: mediamanager/tdehardwarebackend.cpp:1326
+#: mediamanager/tdehardwarebackend.cpp:1435
+#: mediamanager/tdehardwarebackend.cpp:1457
msgid "<p>Technical details:<br>"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:1314
-msgid ""
-"<qt>Unable to mount this device.<p>Potential reasons include:<br>Improper "
-"device and/or user privilege level<br>Corrupt data on storage "
-"device<br>Incorrect encryption password"
+#: mediamanager/tdehardwarebackend.cpp:1284
+msgid "Decryption aborted"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:1420
+#: mediamanager/tdehardwarebackend.cpp:1443
msgid ""
"<qt>The device <b>%1</b> (%2) named <b>'%3'</b> and currently mounted at <b>"
"%4</b> can not be unmounted at this time.<p>%5<p><b>Would you like to "
@@ -385,7 +392,7 @@ msgid ""
"lost</i>"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:1547
+#: mediamanager/tdehardwarebackend.cpp:1577
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 "
@@ -396,7 +403,7 @@ msgstr ""
msgid "%1 cannot be found."
msgstr ""
-#: mounthelper/tdeio_media_mounthelper.cpp:86
+#: mounthelper/tdeio_media_mounthelper.cpp:87
msgid "%1 is not a mountable media."
msgstr ""
@@ -406,39 +413,49 @@ msgstr ""
#: mounthelper/tdeio_media_mounthelper.cpp:107
#, fuzzy
-msgid "%1 is already decrypted."
+msgid "%1 is already unlocked."
msgstr "Uređaj nije montiran"
-#: mounthelper/tdeio_media_mounthelper.cpp:228
+#: mounthelper/tdeio_media_mounthelper.cpp:139
+msgid "Unknown unmount error."
+msgstr ""
+
+#: mounthelper/tdeio_media_mounthelper.cpp:246
msgid "The device was successfully unmounted, but the tray could not be opened"
msgstr ""
-#: mounthelper/tdeio_media_mounthelper.cpp:230
+#: mounthelper/tdeio_media_mounthelper.cpp:248
msgid "The device was successfully unmounted, but could not be ejected"
msgstr ""
-#: mounthelper/tdeio_media_mounthelper.cpp:275
+#: mounthelper/tdeio_media_mounthelper.cpp:281
+#, fuzzy
+#| msgid "Unknown device %1"
+msgid "Unknown decrypt error."
+msgstr "Nepoznati uređaj %1"
+
+#: mounthelper/tdeio_media_mounthelper.cpp:295
#, fuzzy
msgid "Decrypt given URL"
msgstr "Demontiraj navedeni URL"
-#: mounthelper/tdeio_media_mounthelper.cpp:276
+#: mounthelper/tdeio_media_mounthelper.cpp:296
msgid "Unmount given URL"
msgstr "Demontiraj navedeni URL"
-#: mounthelper/tdeio_media_mounthelper.cpp:277
+#: mounthelper/tdeio_media_mounthelper.cpp:297
msgid "Mount given URL (default)"
msgstr "Montiraj navedeni URL (podrazumijevano)"
-#: mounthelper/tdeio_media_mounthelper.cpp:278
+#: mounthelper/tdeio_media_mounthelper.cpp:298
msgid "Eject given URL via tdeeject"
msgstr "Izbaci navedeni URL preko tdeeject"
-#: mounthelper/tdeio_media_mounthelper.cpp:279
+#: mounthelper/tdeio_media_mounthelper.cpp:299
msgid "Unmount and Eject given URL (necessary for some USB devices)"
msgstr ""
-#: mounthelper/tdeio_media_mounthelper.cpp:280
+#: mounthelper/tdeio_media_mounthelper.cpp:300
#, fuzzy
msgid "media:/ URL to mount/unmount/eject/remove"
msgstr "uređaji:/ URL za montiranje/demontiranje/izbacivanje."
@@ -460,45 +477,45 @@ msgstr ""
msgid "&Mounting"
msgstr ""
-#: tdefile-plugin/tdefilemediaplugin.cpp:190
+#: tdefile-plugin/tdefilemediaplugin.cpp:184
#, fuzzy
msgid "Medium Information"
msgstr "Uređaj nije montiran"
-#: tdefile-plugin/tdefilemediaplugin.cpp:193
+#: tdefile-plugin/tdefilemediaplugin.cpp:187
msgid "Free"
msgstr ""
-#: tdefile-plugin/tdefilemediaplugin.cpp:196
+#: tdefile-plugin/tdefilemediaplugin.cpp:190
msgid "Used"
msgstr ""
-#: tdefile-plugin/tdefilemediaplugin.cpp:199
+#: tdefile-plugin/tdefilemediaplugin.cpp:193
msgid "Total"
msgstr ""
-#: tdefile-plugin/tdefilemediaplugin.cpp:202
+#: tdefile-plugin/tdefilemediaplugin.cpp:196
msgid "Base URL"
msgstr ""
-#: tdefile-plugin/tdefilemediaplugin.cpp:203
+#: tdefile-plugin/tdefilemediaplugin.cpp:197
msgid "Mount Point"
msgstr ""
-#: tdefile-plugin/tdefilemediaplugin.cpp:204
+#: tdefile-plugin/tdefilemediaplugin.cpp:198
#, fuzzy
msgid "Device Node"
msgstr "Uređaji"
-#: tdefile-plugin/tdefilemediaplugin.cpp:206
+#: tdefile-plugin/tdefilemediaplugin.cpp:200
msgid "Medium Summary"
msgstr ""
-#: tdefile-plugin/tdefilemediaplugin.cpp:208
+#: tdefile-plugin/tdefilemediaplugin.cpp:202
msgid "Usage"
msgstr ""
-#: tdefile-plugin/tdefilemediaplugin.cpp:210
+#: tdefile-plugin/tdefilemediaplugin.cpp:204
msgid "Bar Graph"
msgstr ""
@@ -570,23 +587,30 @@ msgid ""
"devices are plugged in."
msgstr ""
-#: mediamanager/decryptdialog.ui:24 mounthelper/decryptdialog.ui:24
+#: mediamanager/unlockdialog.ui:24 mounthelper/unlockdialog.ui:24
#, no-c-format
msgid "Decrypting Storage Device"
msgstr ""
-#: mediamanager/decryptdialog.ui:109 mounthelper/decryptdialog.ui:109
+#: mediamanager/unlockdialog.ui:109
#, no-c-format
msgid ""
-"<p><b>%1</b> is an encrypted storage device.</p>\n"
-"<p>Please enter the password to decrypt the storage device.</p>"
+"<p><b>%1</b> is an encrypted locked storage device.</p>\n"
+"<p>Please enter the password to unlock the storage device.</p>"
msgstr ""
-#: mediamanager/decryptdialog.ui:131 mounthelper/decryptdialog.ui:131
+#: mediamanager/unlockdialog.ui:131 mounthelper/unlockdialog.ui:131
#, no-c-format
msgid "&Password:"
msgstr ""
+#: mounthelper/unlockdialog.ui:109
+#, no-c-format
+msgid ""
+"<p><b>%1</b> is an encrypted storage device.</p>\n"
+"<p>Please enter the password to decrypt the storage device.</p>"
+msgstr ""
+
#: propsdlgplugin/propertiespagegui.ui:16
#, no-c-format
msgid "PropertiesPageGUI"
@@ -819,9 +843,6 @@ msgstr ""
#~ "\n"
#~ "Provjerite je li disketa ispravno ubačena."
-#~ msgid "Unknown device %1"
-#~ msgstr "Nepoznati uređaj %1"
-
#~ msgid "Device not accessible"
#~ msgstr "Uređaj nije dostupan"
diff --git a/tde-i18n-hu/messages/tdebase/tdeio_media.po b/tde-i18n-hu/messages/tdebase/tdeio_media.po
index 2e61ccdb643..b45c5d3199b 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: 2019-01-13 18:47+0100\n"
+"POT-Creation-Date: 2019-07-11 02:33+0200\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"
@@ -44,7 +44,6 @@ 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
-#: mounthelper/tdeio_media_mounthelper.cpp:256
msgid "The TDE mediamanager is not running."
msgstr "A TDE médiakezelője nem fut."
@@ -52,7 +51,7 @@ msgstr "A TDE médiakezelője nem fut."
msgid "This media name already exists."
msgstr "Már létezik ilyen nevű adathordozó."
-#: mediaimpl.cpp:230 mediaimpl.cpp:293
+#: mediaimpl.cpp:230 mediaimpl.cpp:297
msgid "No such medium."
msgstr "Nincs ilyen adathordozó."
@@ -60,110 +59,114 @@ msgstr "Nincs ilyen adathordozó."
msgid "The drive is encrypted."
msgstr ""
-#: mediaimpl.cpp:272 mediamanager/halbackend.cpp:1264
-#: mediamanager/halbackend.cpp:1273 mediamanager/halbackend.cpp:1663
-#: mediamanager/halbackend.cpp:1680 mediamanager/halbackend.cpp:1691
-#: mediamanager/halbackend.cpp:1793 mediamanager/halbackend.cpp:1801
-#: mediamanager/halbackend.cpp:1808 mediamanager/halbackend.cpp:1848
-#: mediamanager/halbackend.cpp:1854 mediamanager/halbackend.cpp:1861
-#: mounthelper/tdeio_media_mounthelper.cpp:58
-msgid "Internal Error"
-msgstr "Belső hiba"
+#: mediaimpl.cpp:274 mediamanager/tdehardwarebackend.cpp:201
+#: mediamanager/tdehardwarebackend.cpp:252
+#: mounthelper/tdeio_media_mounthelper.cpp:202
+msgid "Unknown mount error."
+msgstr ""
#: mediamanager/dialog.cpp:26 mounthelper/dialog.cpp:26
-msgid "Decrypt"
+msgid "Unlock"
msgstr ""
-#: mediamanager/fstabbackend.cpp:104 mediamanager/fstabbackend.cpp:114
-#: mediamanager/halbackend.cpp:1595 mediamanager/halbackend.cpp:1617
-#: mediamanager/halbackend.cpp:1776 mediamanager/halbackend.cpp:1831
-#: mediamanager/tdehardwarebackend.cpp:1349
-#: mediamanager/tdehardwarebackend.cpp:1360
+#: mediamanager/fstabbackend.cpp:105 mediamanager/fstabbackend.cpp:120
+#: mediamanager/halbackend.cpp:1598 mediamanager/halbackend.cpp:1625
+#: mediamanager/halbackend.cpp:1808 mediamanager/halbackend.cpp:1877
+#: mediamanager/mediamanager.cpp:363 mediamanager/mediamanager.cpp:375
+#: mediamanager/mediamanager.cpp:387 mediamanager/mediamanager.cpp:399
+#: mediamanager/tdehardwarebackend.cpp:1363
+#: mediamanager/tdehardwarebackend.cpp:1378
#, c-format
msgid "No such medium: %1"
msgstr "Nincs ilyen médium: %1"
-#: mediamanager/fstabbackend.cpp:398
+#: mediamanager/fstabbackend.cpp:408
msgid "CD Recorder"
msgstr "CD-író"
-#: mediamanager/fstabbackend.cpp:404
+#: mediamanager/fstabbackend.cpp:414
msgid "DVD"
msgstr "DVD"
-#: mediamanager/fstabbackend.cpp:415
+#: mediamanager/fstabbackend.cpp:425
msgid "CD-ROM"
msgstr "CD-meghajtó"
-#: mediamanager/fstabbackend.cpp:428
+#: mediamanager/fstabbackend.cpp:438
msgid "Floppy"
msgstr "Floppy"
-#: mediamanager/fstabbackend.cpp:436
+#: mediamanager/fstabbackend.cpp:446
msgid "Zip Disk"
msgstr "ZIP-lemez"
-#: mediamanager/fstabbackend.cpp:447
+#: mediamanager/fstabbackend.cpp:457
msgid "Removable Device"
msgstr "Cserélhető adathordozójú eszköz"
-#: mediamanager/fstabbackend.cpp:452 mediamanager/fstabbackend.cpp:458
+#: mediamanager/fstabbackend.cpp:462 mediamanager/fstabbackend.cpp:468
msgid "Remote Share"
msgstr "Távoli megosztás"
-#: mediamanager/fstabbackend.cpp:463
+#: mediamanager/fstabbackend.cpp:473
msgid "Hard Disk"
msgstr "Merevlemez"
-#: mediamanager/halbackend.cpp:749 mediamanager/tdehardwarebackend.cpp:805
+#: mediamanager/halbackend.cpp:744 mediamanager/tdehardwarebackend.cpp:808
msgid "Unknown Drive"
msgstr "Ismeretlen meghajtó"
-#: mediamanager/halbackend.cpp:761 mediamanager/tdehardwarebackend.cpp:835
+#: mediamanager/halbackend.cpp:756 mediamanager/tdehardwarebackend.cpp:838
msgid "Floppy Drive"
msgstr "Floppy"
-#: mediamanager/halbackend.cpp:769
+#: mediamanager/halbackend.cpp:764
msgid "Zip Drive"
msgstr "Zip-meghajtó"
-#: mediamanager/halbackend.cpp:839 mediamanager/tdehardwarebackend.cpp:892
+#: mediamanager/halbackend.cpp:834 mediamanager/tdehardwarebackend.cpp:895
msgid "Camera"
msgstr "Fényképezőgép"
-#: mediamanager/halbackend.cpp:1221 mediamanager/halbackend.cpp:1247
+#: mediamanager/halbackend.cpp:1216 mediamanager/halbackend.cpp:1242
msgid "Authenticate"
msgstr ""
-#: mediamanager/halbackend.cpp:1222
+#: mediamanager/halbackend.cpp:1217
msgid ""
"<big><b>System policy prevents mounting internal media</b></big><br/"
">Authentication is required to perform this action. Please enter your "
"password to verify."
msgstr ""
-#: mediamanager/halbackend.cpp:1248
+#: mediamanager/halbackend.cpp:1243
msgid ""
"<big><b>System policy prevents unmounting media mounted by other users</b></"
"big><br/>Authentication is required to perform this action. Please enter "
"your password to verify."
msgstr ""
-#: mediamanager/halbackend.cpp:1284
+#: mediamanager/halbackend.cpp:1259 mediamanager/halbackend.cpp:1268
+#: mediamanager/halbackend.cpp:1849 mediamanager/halbackend.cpp:1916
+#: mounthelper/tdeio_media_mounthelper.cpp:58
+msgid "Internal Error"
+msgstr "Belső hiba"
+
+#: mediamanager/halbackend.cpp:1279
msgid "Invalid filesystem type"
msgstr "Érvénytelen fájlrendszer-típus"
-#: mediamanager/halbackend.cpp:1286
+#: mediamanager/halbackend.cpp:1281
msgid ""
"Permission denied<p>Please ensure that:<br>1. You have permission to access "
"this device.<br>2. This device node is not listed in /etc/fstab.</p>"
msgstr ""
-#: mediamanager/halbackend.cpp:1290
+#: mediamanager/halbackend.cpp:1285
msgid "Device is already mounted."
msgstr "Az eszköz már fel van csatolva."
-#: mediamanager/halbackend.cpp:1340
+#: mediamanager/halbackend.cpp:1335
msgid ""
"Moreover, programs still using the device have been detected. They are "
"listed below. You have to close them or change their working directory "
@@ -173,16 +176,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:1381 mediamanager/tdehardwarebackend.cpp:1588
+#: mediamanager/halbackend.cpp:1376 mediamanager/tdehardwarebackend.cpp:1618
msgid ""
"Programs that were still using the device have been forcibly terminated. "
"They are listed below."
msgstr ""
-#: mediamanager/halbackend.cpp:1402 mediamanager/halbackend.cpp:1715
-#: mediamanager/tdehardwarebackend.cpp:1406
-#: mediamanager/tdehardwarebackend.cpp:1424
-#: mediamanager/tdehardwarebackend.cpp:1464
+#: mediamanager/halbackend.cpp:1397 mediamanager/halbackend.cpp:1742
+#: mediamanager/tdehardwarebackend.cpp:1430
+#: mediamanager/tdehardwarebackend.cpp:1452
+#: mediamanager/tdehardwarebackend.cpp:1494
msgid ""
"Unfortunately, the device <b>%1</b> (%2) named <b>'%3'</b> and currently "
"mounted at <b>%4</b> could not be unmounted. "
@@ -190,196 +193,199 @@ 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:1408 mediamanager/tdehardwarebackend.cpp:1470
+#: mediamanager/halbackend.cpp:1403 mediamanager/tdehardwarebackend.cpp:1500
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:1478
+#: mediamanager/halbackend.cpp:1567 mediamanager/tdehardwarebackend.cpp:1322
+msgid "Cannot mount encrypted locked drives!"
+msgstr ""
+
+#: mediamanager/halbackend.cpp:1682 mediamanager/halbackend.cpp:1703
+#: mediamanager/halbackend.cpp:1716 mediamanager/halbackend.cpp:1830
+#: mediamanager/halbackend.cpp:1840 mediamanager/halbackend.cpp:1899
+#: mediamanager/halbackend.cpp:1907
#, fuzzy
-msgid "Permission denied"
-msgstr "Hozzáférés megtagadva"
+msgid "Internal error"
+msgstr "Belső hiba"
-#: mediamanager/halbackend.cpp:1562 mediamanager/tdehardwarebackend.cpp:1232
-msgid "Cannot mount encrypted drives!"
-msgstr ""
+#: mediamanager/halbackend.cpp:1694
+#, fuzzy
+#| msgid "Unknown"
+msgid "Unknown error"
+msgstr "Ismeretlen"
-#: mediamanager/halbackend.cpp:1721
+#: mediamanager/halbackend.cpp:1748
msgid "Unmounting failed due to the following error:"
msgstr "A leválasztás nem sikerült, a hiba oka:"
-#: mediamanager/halbackend.cpp:1723
+#: mediamanager/halbackend.cpp:1750
msgid "Device is Busy:"
msgstr "Az eszköz foglalt:"
-#: mediamanager/halbackend.cpp:1727
+#: mediamanager/halbackend.cpp:1754
msgid ""
"Permission denied<p>Please ensure that:<br>1. You have permission to access "
"this device.<br>2. This device was originally mounted using TDE.</p>"
msgstr ""
-#: mediamanager/halbackend.cpp:1739
+#: mediamanager/halbackend.cpp:1766
msgid ""
"%1<p><b>Would you like to forcibly terminate these processes?</b><br><i>All "
"unsaved data would be lost</i>"
msgstr ""
-#: mediamanager/halbackend.cpp:1811
+#: mediamanager/halbackend.cpp:1852
msgid "Wrong password"
msgstr ""
-#: mediamanager/mediamanager.cpp:247 mediamanager/mediamanager.cpp:266
-#: mediamanager/mediamanager.cpp:285 mediamanager/mediamanager.cpp:293
-#: mediamanager/mediamanager.cpp:302 mediamanager/mediamanager.cpp:310
-msgid "Feature only available with HAL"
-msgstr "A funkció csak HAL-lal együtt használható"
-
-#: mediamanager/mediamanager.cpp:252
+#: mediamanager/mediamanager.cpp:248 mediamanager/mediamanager.cpp:275
#, fuzzy
msgid "Feature only available with the TDE hardware backend"
msgstr "A funkció csak HAL-lal együtt használható"
-#: mediamanager/mediamanager.cpp:256 mediamanager/mediamanager.cpp:271
-#: mediamanager/mediamanager.cpp:275
+#: mediamanager/mediamanager.cpp:255 mediamanager/mediamanager.cpp:282
+#: mediamanager/mediamanager.cpp:312 mediamanager/mediamanager.cpp:343
+msgid "Feature only available with HAL"
+msgstr "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
#, fuzzy
msgid "Feature only available with HAL or TDE hardware backend"
msgstr "A funkció csak HAL-lal együtt használható"
-#: mediamanager/tdehardwarebackend.cpp:480
-#: mediamanager/tdehardwarebackend.cpp:517
-#: mediamanager/tdehardwarebackend.cpp:750
+#: mediamanager/tdehardwarebackend.cpp:483
+#: mediamanager/tdehardwarebackend.cpp:520
+#: mediamanager/tdehardwarebackend.cpp:753
#, fuzzy
msgid "%1 Removable Device"
msgstr "Cserélhető adathordozójú eszköz"
-#: mediamanager/tdehardwarebackend.cpp:525
+#: mediamanager/tdehardwarebackend.cpp:528
#, fuzzy
msgid "Blank CD-ROM"
msgstr "CD-meghajtó"
-#: mediamanager/tdehardwarebackend.cpp:534
+#: mediamanager/tdehardwarebackend.cpp:537
msgid "Blank CD-R"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:543
+#: mediamanager/tdehardwarebackend.cpp:546
msgid "Blank CD-RW"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:552
+#: mediamanager/tdehardwarebackend.cpp:555
msgid "Blank Magneto-Optical CD"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:561
+#: mediamanager/tdehardwarebackend.cpp:564
msgid "Blank Mount Ranier CD-RW"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:570
+#: mediamanager/tdehardwarebackend.cpp:573
msgid "Blank Mount Ranier CD-RW-W"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:579
+#: mediamanager/tdehardwarebackend.cpp:582
msgid "Blank DVD-ROM"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:588
+#: mediamanager/tdehardwarebackend.cpp:591
msgid "Blank DVD-RAM"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:597
+#: mediamanager/tdehardwarebackend.cpp:600
msgid "Blank DVD-R"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:606
+#: mediamanager/tdehardwarebackend.cpp:609
msgid "Blank DVD-RW"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:615
+#: mediamanager/tdehardwarebackend.cpp:618
msgid "Blank Dual Layer DVD-R"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:624
+#: mediamanager/tdehardwarebackend.cpp:627
msgid "Blank Dual Layer DVD-RW"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:633
+#: mediamanager/tdehardwarebackend.cpp:636
msgid "Blank DVD+R"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:642
+#: mediamanager/tdehardwarebackend.cpp:645
msgid "Blank DVD+RW"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:651
+#: mediamanager/tdehardwarebackend.cpp:654
msgid "Blank Dual Layer DVD+R"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:660
+#: mediamanager/tdehardwarebackend.cpp:663
msgid "Blank Dual Layer DVD+RW"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:669
+#: mediamanager/tdehardwarebackend.cpp:672
msgid "Blank BD-ROM"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:678
+#: mediamanager/tdehardwarebackend.cpp:681
msgid "Blank BD-R"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:687
+#: mediamanager/tdehardwarebackend.cpp:690
msgid "Blank BD-RW"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:696
+#: mediamanager/tdehardwarebackend.cpp:699
msgid "Blank HDDVD-ROM"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:705
+#: mediamanager/tdehardwarebackend.cpp:708
msgid "Blank HDDVD-R"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:714
+#: mediamanager/tdehardwarebackend.cpp:717
msgid "Blank HDDVD-RW"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:721
+#: mediamanager/tdehardwarebackend.cpp:724
msgid "Audio CD"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:742
+#: mediamanager/tdehardwarebackend.cpp:745
msgid "%1 Fixed Disk (%2)"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:849
+#: mediamanager/tdehardwarebackend.cpp:852
#, fuzzy
msgid "%1 Zip Disk"
msgstr "ZIP-lemez"
-#: mediamanager/tdehardwarebackend.cpp:1212
-#: mediamanager/tdehardwarebackend.cpp:1392
-#, fuzzy
-msgid "Internal error"
-msgstr "Belső hiba"
+#: mediamanager/tdehardwarebackend.cpp:1224
+#: mediamanager/tdehardwarebackend.cpp:1417
+msgid "Internal error. Couldn't find medium."
+msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:1239
-msgid ""
-"<qt>Unable to mount this device.<p>Potential reasons include:<br>Improper "
-"device and/or user privilege level<br>Corrupt data on storage device"
+#: mediamanager/tdehardwarebackend.cpp:1249
+#: mediamanager/tdehardwarebackend.cpp:1323
+msgid "Unable to mount this device."
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:1241
-#: mediamanager/tdehardwarebackend.cpp:1316
-#: mediamanager/tdehardwarebackend.cpp:1408
-#: mediamanager/tdehardwarebackend.cpp:1426
+#: mediamanager/tdehardwarebackend.cpp:1252
+#: mediamanager/tdehardwarebackend.cpp:1326
+#: mediamanager/tdehardwarebackend.cpp:1435
+#: mediamanager/tdehardwarebackend.cpp:1457
msgid "<p>Technical details:<br>"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:1314
-msgid ""
-"<qt>Unable to mount this device.<p>Potential reasons include:<br>Improper "
-"device and/or user privilege level<br>Corrupt data on storage "
-"device<br>Incorrect encryption password"
+#: mediamanager/tdehardwarebackend.cpp:1284
+msgid "Decryption aborted"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:1420
+#: mediamanager/tdehardwarebackend.cpp:1443
msgid ""
"<qt>The device <b>%1</b> (%2) named <b>'%3'</b> and currently mounted at <b>"
"%4</b> can not be unmounted at this time.<p>%5<p><b>Would you like to "
@@ -387,7 +393,7 @@ msgid ""
"lost</i>"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:1547
+#: mediamanager/tdehardwarebackend.cpp:1577
#, fuzzy
msgid ""
"Programs still using the device have been detected. They are listed below. "
@@ -402,7 +408,7 @@ msgstr ""
msgid "%1 cannot be found."
msgstr "%1 nem található."
-#: mounthelper/tdeio_media_mounthelper.cpp:86
+#: mounthelper/tdeio_media_mounthelper.cpp:87
msgid "%1 is not a mountable media."
msgstr "%1 nem csatlakoztatható."
@@ -413,40 +419,48 @@ msgstr "%1 nem csatlakoztatható."
#: mounthelper/tdeio_media_mounthelper.cpp:107
#, fuzzy
-msgid "%1 is already decrypted."
+msgid "%1 is already unlocked."
msgstr "Az eszköz már fel van csatolva."
-#: mounthelper/tdeio_media_mounthelper.cpp:228
+#: mounthelper/tdeio_media_mounthelper.cpp:139
+msgid "Unknown unmount error."
+msgstr ""
+
+#: mounthelper/tdeio_media_mounthelper.cpp:246
msgid "The device was successfully unmounted, but the tray could not be opened"
msgstr "Az eszköz leválasztása sikerült, de a lemeztálca nem nyílt ki"
-#: mounthelper/tdeio_media_mounthelper.cpp:230
+#: 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:275
+#: mounthelper/tdeio_media_mounthelper.cpp:281
+msgid "Unknown decrypt error."
+msgstr ""
+
+#: mounthelper/tdeio_media_mounthelper.cpp:295
#, fuzzy
msgid "Decrypt given URL"
msgstr "Leválasztás (URL alapján)"
-#: mounthelper/tdeio_media_mounthelper.cpp:276
+#: mounthelper/tdeio_media_mounthelper.cpp:296
msgid "Unmount given URL"
msgstr "Leválasztás (URL alapján)"
-#: mounthelper/tdeio_media_mounthelper.cpp:277
+#: mounthelper/tdeio_media_mounthelper.cpp:297
msgid "Mount given URL (default)"
msgstr "Csatlakoztatás (URL alapján)"
-#: mounthelper/tdeio_media_mounthelper.cpp:278
+#: 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:279
+#: mounthelper/tdeio_media_mounthelper.cpp:299
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)"
-#: mounthelper/tdeio_media_mounthelper.cpp:280
+#: mounthelper/tdeio_media_mounthelper.cpp:300
msgid "media:/ URL to mount/unmount/eject/remove"
msgstr ""
"media:/ URL eszközök csatlakoztatáshoz/leválasztáshoz/kiadáshoz/"
@@ -469,43 +483,43 @@ msgstr "A mentések módosítása nem sikerült"
msgid "&Mounting"
msgstr "&Csatlakoztatás"
-#: tdefile-plugin/tdefilemediaplugin.cpp:190
+#: tdefile-plugin/tdefilemediaplugin.cpp:184
msgid "Medium Information"
msgstr "Az adathordozó jellemzői"
-#: tdefile-plugin/tdefilemediaplugin.cpp:193
+#: tdefile-plugin/tdefilemediaplugin.cpp:187
msgid "Free"
msgstr "Szabad"
-#: tdefile-plugin/tdefilemediaplugin.cpp:196
+#: tdefile-plugin/tdefilemediaplugin.cpp:190
msgid "Used"
msgstr "Felhasznált"
-#: tdefile-plugin/tdefilemediaplugin.cpp:199
+#: tdefile-plugin/tdefilemediaplugin.cpp:193
msgid "Total"
msgstr "Összes"
-#: tdefile-plugin/tdefilemediaplugin.cpp:202
+#: tdefile-plugin/tdefilemediaplugin.cpp:196
msgid "Base URL"
msgstr "Alap URL"
-#: tdefile-plugin/tdefilemediaplugin.cpp:203
+#: tdefile-plugin/tdefilemediaplugin.cpp:197
msgid "Mount Point"
msgstr "Csatlakoztatási pont"
-#: tdefile-plugin/tdefilemediaplugin.cpp:204
+#: tdefile-plugin/tdefilemediaplugin.cpp:198
msgid "Device Node"
msgstr "Eszközpont"
-#: tdefile-plugin/tdefilemediaplugin.cpp:206
+#: tdefile-plugin/tdefilemediaplugin.cpp:200
msgid "Medium Summary"
msgstr "Az adathordozó adatai"
-#: tdefile-plugin/tdefilemediaplugin.cpp:208
+#: tdefile-plugin/tdefilemediaplugin.cpp:202
msgid "Usage"
msgstr "Kihasználtság"
-#: tdefile-plugin/tdefilemediaplugin.cpp:210
+#: tdefile-plugin/tdefilemediaplugin.cpp:204
msgid "Bar Graph"
msgstr "Oszlopdiagram"
@@ -577,23 +591,30 @@ msgid ""
"devices are plugged in."
msgstr ""
-#: mediamanager/decryptdialog.ui:24 mounthelper/decryptdialog.ui:24
+#: mediamanager/unlockdialog.ui:24 mounthelper/unlockdialog.ui:24
#, no-c-format
msgid "Decrypting Storage Device"
msgstr ""
-#: mediamanager/decryptdialog.ui:109 mounthelper/decryptdialog.ui:109
+#: mediamanager/unlockdialog.ui:109
#, no-c-format
msgid ""
-"<p><b>%1</b> is an encrypted storage device.</p>\n"
-"<p>Please enter the password to decrypt the storage device.</p>"
+"<p><b>%1</b> is an encrypted locked storage device.</p>\n"
+"<p>Please enter the password to unlock the storage device.</p>"
msgstr ""
-#: mediamanager/decryptdialog.ui:131 mounthelper/decryptdialog.ui:131
+#: mediamanager/unlockdialog.ui:131 mounthelper/unlockdialog.ui:131
#, no-c-format
msgid "&Password:"
msgstr ""
+#: mounthelper/unlockdialog.ui:109
+#, no-c-format
+msgid ""
+"<p><b>%1</b> is an encrypted storage device.</p>\n"
+"<p>Please enter the password to decrypt the storage device.</p>"
+msgstr ""
+
#: propsdlgplugin/propertiespagegui.ui:16
#, no-c-format
msgid "PropertiesPageGUI"
@@ -856,3 +877,7 @@ msgstr "Vegyes"
#, no-c-format
msgid "Filesystem: iso9660"
msgstr "Fájlrendszer: iso9660"
+
+#, 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 c1601b9949a..0e39e5701dc 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: 2019-01-13 18:47+0100\n"
+"POT-Creation-Date: 2019-07-11 02:33+0200\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"
@@ -46,7 +46,6 @@ 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
-#: mounthelper/tdeio_media_mounthelper.cpp:256
msgid "The TDE mediamanager is not running."
msgstr "TDE miðilstjórinn er ekki keyrandi."
@@ -54,7 +53,7 @@ msgstr "TDE miðilstjórinn er ekki keyrandi."
msgid "This media name already exists."
msgstr "Nafnið er þegar til."
-#: mediaimpl.cpp:230 mediaimpl.cpp:293
+#: mediaimpl.cpp:230 mediaimpl.cpp:297
msgid "No such medium."
msgstr "Enginn slikur miðill."
@@ -62,110 +61,114 @@ msgstr "Enginn slikur miðill."
msgid "The drive is encrypted."
msgstr ""
-#: mediaimpl.cpp:272 mediamanager/halbackend.cpp:1264
-#: mediamanager/halbackend.cpp:1273 mediamanager/halbackend.cpp:1663
-#: mediamanager/halbackend.cpp:1680 mediamanager/halbackend.cpp:1691
-#: mediamanager/halbackend.cpp:1793 mediamanager/halbackend.cpp:1801
-#: mediamanager/halbackend.cpp:1808 mediamanager/halbackend.cpp:1848
-#: mediamanager/halbackend.cpp:1854 mediamanager/halbackend.cpp:1861
-#: mounthelper/tdeio_media_mounthelper.cpp:58
-msgid "Internal Error"
-msgstr "Innri villa"
+#: mediaimpl.cpp:274 mediamanager/tdehardwarebackend.cpp:201
+#: mediamanager/tdehardwarebackend.cpp:252
+#: mounthelper/tdeio_media_mounthelper.cpp:202
+msgid "Unknown mount error."
+msgstr ""
#: mediamanager/dialog.cpp:26 mounthelper/dialog.cpp:26
-msgid "Decrypt"
+msgid "Unlock"
msgstr ""
-#: mediamanager/fstabbackend.cpp:104 mediamanager/fstabbackend.cpp:114
-#: mediamanager/halbackend.cpp:1595 mediamanager/halbackend.cpp:1617
-#: mediamanager/halbackend.cpp:1776 mediamanager/halbackend.cpp:1831
-#: mediamanager/tdehardwarebackend.cpp:1349
-#: mediamanager/tdehardwarebackend.cpp:1360
+#: mediamanager/fstabbackend.cpp:105 mediamanager/fstabbackend.cpp:120
+#: mediamanager/halbackend.cpp:1598 mediamanager/halbackend.cpp:1625
+#: mediamanager/halbackend.cpp:1808 mediamanager/halbackend.cpp:1877
+#: mediamanager/mediamanager.cpp:363 mediamanager/mediamanager.cpp:375
+#: mediamanager/mediamanager.cpp:387 mediamanager/mediamanager.cpp:399
+#: mediamanager/tdehardwarebackend.cpp:1363
+#: mediamanager/tdehardwarebackend.cpp:1378
#, c-format
msgid "No such medium: %1"
msgstr "Enginn slikur miðill: %1"
-#: mediamanager/fstabbackend.cpp:398
+#: mediamanager/fstabbackend.cpp:408
msgid "CD Recorder"
msgstr "CD brennari"
-#: mediamanager/fstabbackend.cpp:404
+#: mediamanager/fstabbackend.cpp:414
msgid "DVD"
msgstr "DVD"
-#: mediamanager/fstabbackend.cpp:415
+#: mediamanager/fstabbackend.cpp:425
msgid "CD-ROM"
msgstr "CD-ROM"
-#: mediamanager/fstabbackend.cpp:428
+#: mediamanager/fstabbackend.cpp:438
msgid "Floppy"
msgstr "Disklingadrif"
-#: mediamanager/fstabbackend.cpp:436
+#: mediamanager/fstabbackend.cpp:446
msgid "Zip Disk"
msgstr "Zip diskur"
-#: mediamanager/fstabbackend.cpp:447
+#: mediamanager/fstabbackend.cpp:457
msgid "Removable Device"
msgstr "Útskiptanlegt tæki"
-#: mediamanager/fstabbackend.cpp:452 mediamanager/fstabbackend.cpp:458
+#: mediamanager/fstabbackend.cpp:462 mediamanager/fstabbackend.cpp:468
msgid "Remote Share"
msgstr "Fjarlæg sameign"
-#: mediamanager/fstabbackend.cpp:463
+#: mediamanager/fstabbackend.cpp:473
msgid "Hard Disk"
msgstr "Harður diskur"
-#: mediamanager/halbackend.cpp:749 mediamanager/tdehardwarebackend.cpp:805
+#: mediamanager/halbackend.cpp:744 mediamanager/tdehardwarebackend.cpp:808
msgid "Unknown Drive"
msgstr "Óþekkt drif"
-#: mediamanager/halbackend.cpp:761 mediamanager/tdehardwarebackend.cpp:835
+#: mediamanager/halbackend.cpp:756 mediamanager/tdehardwarebackend.cpp:838
msgid "Floppy Drive"
msgstr "Disklingadrif"
-#: mediamanager/halbackend.cpp:769
+#: mediamanager/halbackend.cpp:764
msgid "Zip Drive"
msgstr "Zip drif"
-#: mediamanager/halbackend.cpp:839 mediamanager/tdehardwarebackend.cpp:892
+#: mediamanager/halbackend.cpp:834 mediamanager/tdehardwarebackend.cpp:895
msgid "Camera"
msgstr "Myndavél"
-#: mediamanager/halbackend.cpp:1221 mediamanager/halbackend.cpp:1247
+#: mediamanager/halbackend.cpp:1216 mediamanager/halbackend.cpp:1242
msgid "Authenticate"
msgstr ""
-#: mediamanager/halbackend.cpp:1222
+#: mediamanager/halbackend.cpp:1217
msgid ""
"<big><b>System policy prevents mounting internal media</b></big><br/"
">Authentication is required to perform this action. Please enter your "
"password to verify."
msgstr ""
-#: mediamanager/halbackend.cpp:1248
+#: mediamanager/halbackend.cpp:1243
msgid ""
"<big><b>System policy prevents unmounting media mounted by other users</b></"
"big><br/>Authentication is required to perform this action. Please enter "
"your password to verify."
msgstr ""
-#: mediamanager/halbackend.cpp:1284
+#: mediamanager/halbackend.cpp:1259 mediamanager/halbackend.cpp:1268
+#: mediamanager/halbackend.cpp:1849 mediamanager/halbackend.cpp:1916
+#: mounthelper/tdeio_media_mounthelper.cpp:58
+msgid "Internal Error"
+msgstr "Innri villa"
+
+#: mediamanager/halbackend.cpp:1279
msgid "Invalid filesystem type"
msgstr "Ógild tegund skráarkerfis"
-#: mediamanager/halbackend.cpp:1286
+#: mediamanager/halbackend.cpp:1281
msgid ""
"Permission denied<p>Please ensure that:<br>1. You have permission to access "
"this device.<br>2. This device node is not listed in /etc/fstab.</p>"
msgstr ""
-#: mediamanager/halbackend.cpp:1290
+#: mediamanager/halbackend.cpp:1285
msgid "Device is already mounted."
msgstr "Tækið er þegar tengt."
-#: mediamanager/halbackend.cpp:1340
+#: mediamanager/halbackend.cpp:1335
msgid ""
"Moreover, programs still using the device have been detected. They are "
"listed below. You have to close them or change their working directory "
@@ -175,16 +178,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:1381 mediamanager/tdehardwarebackend.cpp:1588
+#: mediamanager/halbackend.cpp:1376 mediamanager/tdehardwarebackend.cpp:1618
msgid ""
"Programs that were still using the device have been forcibly terminated. "
"They are listed below."
msgstr ""
-#: mediamanager/halbackend.cpp:1402 mediamanager/halbackend.cpp:1715
-#: mediamanager/tdehardwarebackend.cpp:1406
-#: mediamanager/tdehardwarebackend.cpp:1424
-#: mediamanager/tdehardwarebackend.cpp:1464
+#: mediamanager/halbackend.cpp:1397 mediamanager/halbackend.cpp:1742
+#: mediamanager/tdehardwarebackend.cpp:1430
+#: mediamanager/tdehardwarebackend.cpp:1452
+#: mediamanager/tdehardwarebackend.cpp:1494
msgid ""
"Unfortunately, the device <b>%1</b> (%2) named <b>'%3'</b> and currently "
"mounted at <b>%4</b> could not be unmounted. "
@@ -192,196 +195,199 @@ 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:1408 mediamanager/tdehardwarebackend.cpp:1470
+#: mediamanager/halbackend.cpp:1403 mediamanager/tdehardwarebackend.cpp:1500
msgid "The following error was returned by umount command:"
msgstr "Eftirfarandi villa kom upp með aftengiskipuninni:"
-#: mediamanager/halbackend.cpp:1478
+#: mediamanager/halbackend.cpp:1567 mediamanager/tdehardwarebackend.cpp:1322
+msgid "Cannot mount encrypted locked drives!"
+msgstr ""
+
+#: mediamanager/halbackend.cpp:1682 mediamanager/halbackend.cpp:1703
+#: mediamanager/halbackend.cpp:1716 mediamanager/halbackend.cpp:1830
+#: mediamanager/halbackend.cpp:1840 mediamanager/halbackend.cpp:1899
+#: mediamanager/halbackend.cpp:1907
#, fuzzy
-msgid "Permission denied"
-msgstr "Aðgangi hafnað"
+msgid "Internal error"
+msgstr "Innri villa"
-#: mediamanager/halbackend.cpp:1562 mediamanager/tdehardwarebackend.cpp:1232
-msgid "Cannot mount encrypted drives!"
-msgstr ""
+#: mediamanager/halbackend.cpp:1694
+#, fuzzy
+#| msgid "Unknown"
+msgid "Unknown error"
+msgstr "Óþekkt"
-#: mediamanager/halbackend.cpp:1721
+#: mediamanager/halbackend.cpp:1748
msgid "Unmounting failed due to the following error:"
msgstr "Aftenging mistókst vegna eftirfarandi villu:"
-#: mediamanager/halbackend.cpp:1723
+#: mediamanager/halbackend.cpp:1750
msgid "Device is Busy:"
msgstr "Tækið er upptekið:"
-#: mediamanager/halbackend.cpp:1727
+#: mediamanager/halbackend.cpp:1754
msgid ""
"Permission denied<p>Please ensure that:<br>1. You have permission to access "
"this device.<br>2. This device was originally mounted using TDE.</p>"
msgstr ""
-#: mediamanager/halbackend.cpp:1739
+#: mediamanager/halbackend.cpp:1766
msgid ""
"%1<p><b>Would you like to forcibly terminate these processes?</b><br><i>All "
"unsaved data would be lost</i>"
msgstr ""
-#: mediamanager/halbackend.cpp:1811
+#: mediamanager/halbackend.cpp:1852
msgid "Wrong password"
msgstr ""
-#: mediamanager/mediamanager.cpp:247 mediamanager/mediamanager.cpp:266
-#: mediamanager/mediamanager.cpp:285 mediamanager/mediamanager.cpp:293
-#: mediamanager/mediamanager.cpp:302 mediamanager/mediamanager.cpp:310
-msgid "Feature only available with HAL"
-msgstr "Aðgerð bara tiltæk með HAL"
-
-#: mediamanager/mediamanager.cpp:252
+#: mediamanager/mediamanager.cpp:248 mediamanager/mediamanager.cpp:275
#, fuzzy
msgid "Feature only available with the TDE hardware backend"
msgstr "Aðgerð bara tiltæk með HAL"
-#: mediamanager/mediamanager.cpp:256 mediamanager/mediamanager.cpp:271
-#: mediamanager/mediamanager.cpp:275
+#: mediamanager/mediamanager.cpp:255 mediamanager/mediamanager.cpp:282
+#: mediamanager/mediamanager.cpp:312 mediamanager/mediamanager.cpp:343
+msgid "Feature only available with HAL"
+msgstr "Aðgerð bara tiltæk með HAL"
+
+#: mediamanager/mediamanager.cpp:262 mediamanager/mediamanager.cpp:289
+#: mediamanager/mediamanager.cpp:320 mediamanager/mediamanager.cpp:350
#, fuzzy
msgid "Feature only available with HAL or TDE hardware backend"
msgstr "Aðgerð bara tiltæk með HAL"
-#: mediamanager/tdehardwarebackend.cpp:480
-#: mediamanager/tdehardwarebackend.cpp:517
-#: mediamanager/tdehardwarebackend.cpp:750
+#: mediamanager/tdehardwarebackend.cpp:483
+#: mediamanager/tdehardwarebackend.cpp:520
+#: mediamanager/tdehardwarebackend.cpp:753
#, fuzzy
msgid "%1 Removable Device"
msgstr "Útskiptanlegt tæki"
-#: mediamanager/tdehardwarebackend.cpp:525
+#: mediamanager/tdehardwarebackend.cpp:528
#, fuzzy
msgid "Blank CD-ROM"
msgstr "CD-ROM"
-#: mediamanager/tdehardwarebackend.cpp:534
+#: mediamanager/tdehardwarebackend.cpp:537
msgid "Blank CD-R"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:543
+#: mediamanager/tdehardwarebackend.cpp:546
msgid "Blank CD-RW"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:552
+#: mediamanager/tdehardwarebackend.cpp:555
msgid "Blank Magneto-Optical CD"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:561
+#: mediamanager/tdehardwarebackend.cpp:564
msgid "Blank Mount Ranier CD-RW"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:570
+#: mediamanager/tdehardwarebackend.cpp:573
msgid "Blank Mount Ranier CD-RW-W"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:579
+#: mediamanager/tdehardwarebackend.cpp:582
msgid "Blank DVD-ROM"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:588
+#: mediamanager/tdehardwarebackend.cpp:591
msgid "Blank DVD-RAM"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:597
+#: mediamanager/tdehardwarebackend.cpp:600
msgid "Blank DVD-R"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:606
+#: mediamanager/tdehardwarebackend.cpp:609
msgid "Blank DVD-RW"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:615
+#: mediamanager/tdehardwarebackend.cpp:618
msgid "Blank Dual Layer DVD-R"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:624
+#: mediamanager/tdehardwarebackend.cpp:627
msgid "Blank Dual Layer DVD-RW"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:633
+#: mediamanager/tdehardwarebackend.cpp:636
msgid "Blank DVD+R"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:642
+#: mediamanager/tdehardwarebackend.cpp:645
msgid "Blank DVD+RW"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:651
+#: mediamanager/tdehardwarebackend.cpp:654
msgid "Blank Dual Layer DVD+R"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:660
+#: mediamanager/tdehardwarebackend.cpp:663
msgid "Blank Dual Layer DVD+RW"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:669
+#: mediamanager/tdehardwarebackend.cpp:672
msgid "Blank BD-ROM"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:678
+#: mediamanager/tdehardwarebackend.cpp:681
msgid "Blank BD-R"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:687
+#: mediamanager/tdehardwarebackend.cpp:690
msgid "Blank BD-RW"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:696
+#: mediamanager/tdehardwarebackend.cpp:699
msgid "Blank HDDVD-ROM"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:705
+#: mediamanager/tdehardwarebackend.cpp:708
msgid "Blank HDDVD-R"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:714
+#: mediamanager/tdehardwarebackend.cpp:717
msgid "Blank HDDVD-RW"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:721
+#: mediamanager/tdehardwarebackend.cpp:724
msgid "Audio CD"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:742
+#: mediamanager/tdehardwarebackend.cpp:745
msgid "%1 Fixed Disk (%2)"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:849
+#: mediamanager/tdehardwarebackend.cpp:852
#, fuzzy
msgid "%1 Zip Disk"
msgstr "Zip diskur"
-#: mediamanager/tdehardwarebackend.cpp:1212
-#: mediamanager/tdehardwarebackend.cpp:1392
-#, fuzzy
-msgid "Internal error"
-msgstr "Innri villa"
+#: mediamanager/tdehardwarebackend.cpp:1224
+#: mediamanager/tdehardwarebackend.cpp:1417
+msgid "Internal error. Couldn't find medium."
+msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:1239
-msgid ""
-"<qt>Unable to mount this device.<p>Potential reasons include:<br>Improper "
-"device and/or user privilege level<br>Corrupt data on storage device"
+#: mediamanager/tdehardwarebackend.cpp:1249
+#: mediamanager/tdehardwarebackend.cpp:1323
+msgid "Unable to mount this device."
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:1241
-#: mediamanager/tdehardwarebackend.cpp:1316
-#: mediamanager/tdehardwarebackend.cpp:1408
-#: mediamanager/tdehardwarebackend.cpp:1426
+#: mediamanager/tdehardwarebackend.cpp:1252
+#: mediamanager/tdehardwarebackend.cpp:1326
+#: mediamanager/tdehardwarebackend.cpp:1435
+#: mediamanager/tdehardwarebackend.cpp:1457
msgid "<p>Technical details:<br>"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:1314
-msgid ""
-"<qt>Unable to mount this device.<p>Potential reasons include:<br>Improper "
-"device and/or user privilege level<br>Corrupt data on storage "
-"device<br>Incorrect encryption password"
+#: mediamanager/tdehardwarebackend.cpp:1284
+msgid "Decryption aborted"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:1420
+#: mediamanager/tdehardwarebackend.cpp:1443
msgid ""
"<qt>The device <b>%1</b> (%2) named <b>'%3'</b> and currently mounted at <b>"
"%4</b> can not be unmounted at this time.<p>%5<p><b>Would you like to "
@@ -389,7 +395,7 @@ msgid ""
"lost</i>"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:1547
+#: mediamanager/tdehardwarebackend.cpp:1577
#, fuzzy
msgid ""
"Programs still using the device have been detected. They are listed below. "
@@ -404,7 +410,7 @@ msgstr ""
msgid "%1 cannot be found."
msgstr "%1 fannst ekki."
-#: mounthelper/tdeio_media_mounthelper.cpp:86
+#: mounthelper/tdeio_media_mounthelper.cpp:87
msgid "%1 is not a mountable media."
msgstr "%1 er ekki tengjanlegur miðill."
@@ -415,39 +421,47 @@ msgstr "%1 er ekki tengjanlegur miðill."
#: mounthelper/tdeio_media_mounthelper.cpp:107
#, fuzzy
-msgid "%1 is already decrypted."
+msgid "%1 is already unlocked."
msgstr "Tækið er þegar tengt."
-#: mounthelper/tdeio_media_mounthelper.cpp:228
+#: mounthelper/tdeio_media_mounthelper.cpp:139
+msgid "Unknown unmount error."
+msgstr ""
+
+#: mounthelper/tdeio_media_mounthelper.cpp:246
msgid "The device was successfully unmounted, but the tray could not be opened"
msgstr "Tækið var aftengt eðlilega, en ekki tókst að opna skúffu/bakka þess"
-#: mounthelper/tdeio_media_mounthelper.cpp:230
+#: 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:275
+#: mounthelper/tdeio_media_mounthelper.cpp:281
+msgid "Unknown decrypt error."
+msgstr ""
+
+#: mounthelper/tdeio_media_mounthelper.cpp:295
#, fuzzy
msgid "Decrypt given URL"
msgstr "Aftengja slóðina"
-#: mounthelper/tdeio_media_mounthelper.cpp:276
+#: mounthelper/tdeio_media_mounthelper.cpp:296
msgid "Unmount given URL"
msgstr "Aftengja slóðina"
-#: mounthelper/tdeio_media_mounthelper.cpp:277
+#: mounthelper/tdeio_media_mounthelper.cpp:297
msgid "Mount given URL (default)"
msgstr "Tengja slóðina (sjálfgefið)"
-#: mounthelper/tdeio_media_mounthelper.cpp:278
+#: mounthelper/tdeio_media_mounthelper.cpp:298
msgid "Eject given URL via tdeeject"
msgstr "Henda út slóðinni með tdeeject"
-#: mounthelper/tdeio_media_mounthelper.cpp:279
+#: mounthelper/tdeio_media_mounthelper.cpp:299
msgid "Unmount and Eject given URL (necessary for some USB devices)"
msgstr "Aftengja og henda út slóðinni (nauðsynlegt fyrir sum USB tæki)"
-#: mounthelper/tdeio_media_mounthelper.cpp:280
+#: mounthelper/tdeio_media_mounthelper.cpp:300
msgid "media:/ URL to mount/unmount/eject/remove"
msgstr "media:/ slóð sem á að tengja/aftengja/henda út/fjarlægja"
@@ -468,43 +482,43 @@ msgstr "Tókst ekki að vista breytingarnar"
msgid "&Mounting"
msgstr "&Tengi"
-#: tdefile-plugin/tdefilemediaplugin.cpp:190
+#: tdefile-plugin/tdefilemediaplugin.cpp:184
msgid "Medium Information"
msgstr "Miðil upplýsingar"
-#: tdefile-plugin/tdefilemediaplugin.cpp:193
+#: tdefile-plugin/tdefilemediaplugin.cpp:187
msgid "Free"
msgstr "Laust"
-#: tdefile-plugin/tdefilemediaplugin.cpp:196
+#: tdefile-plugin/tdefilemediaplugin.cpp:190
msgid "Used"
msgstr "Notað"
-#: tdefile-plugin/tdefilemediaplugin.cpp:199
+#: tdefile-plugin/tdefilemediaplugin.cpp:193
msgid "Total"
msgstr "Samtals"
-#: tdefile-plugin/tdefilemediaplugin.cpp:202
+#: tdefile-plugin/tdefilemediaplugin.cpp:196
msgid "Base URL"
msgstr "Grunnslóð"
-#: tdefile-plugin/tdefilemediaplugin.cpp:203
+#: tdefile-plugin/tdefilemediaplugin.cpp:197
msgid "Mount Point"
msgstr "Tengipunktur"
-#: tdefile-plugin/tdefilemediaplugin.cpp:204
+#: tdefile-plugin/tdefilemediaplugin.cpp:198
msgid "Device Node"
msgstr "Tækjahnúður"
-#: tdefile-plugin/tdefilemediaplugin.cpp:206
+#: tdefile-plugin/tdefilemediaplugin.cpp:200
msgid "Medium Summary"
msgstr "Miðilsyfirlit"
-#: tdefile-plugin/tdefilemediaplugin.cpp:208
+#: tdefile-plugin/tdefilemediaplugin.cpp:202
msgid "Usage"
msgstr "Notkun"
-#: tdefile-plugin/tdefilemediaplugin.cpp:210
+#: tdefile-plugin/tdefilemediaplugin.cpp:204
msgid "Bar Graph"
msgstr "Súlurit"
@@ -576,23 +590,30 @@ msgid ""
"devices are plugged in."
msgstr ""
-#: mediamanager/decryptdialog.ui:24 mounthelper/decryptdialog.ui:24
+#: mediamanager/unlockdialog.ui:24 mounthelper/unlockdialog.ui:24
#, no-c-format
msgid "Decrypting Storage Device"
msgstr ""
-#: mediamanager/decryptdialog.ui:109 mounthelper/decryptdialog.ui:109
+#: mediamanager/unlockdialog.ui:109
#, no-c-format
msgid ""
-"<p><b>%1</b> is an encrypted storage device.</p>\n"
-"<p>Please enter the password to decrypt the storage device.</p>"
+"<p><b>%1</b> is an encrypted locked storage device.</p>\n"
+"<p>Please enter the password to unlock the storage device.</p>"
msgstr ""
-#: mediamanager/decryptdialog.ui:131 mounthelper/decryptdialog.ui:131
+#: mediamanager/unlockdialog.ui:131 mounthelper/unlockdialog.ui:131
#, no-c-format
msgid "&Password:"
msgstr ""
+#: mounthelper/unlockdialog.ui:109
+#, no-c-format
+msgid ""
+"<p><b>%1</b> is an encrypted storage device.</p>\n"
+"<p>Please enter the password to decrypt the storage device.</p>"
+msgstr ""
+
#: propsdlgplugin/propertiespagegui.ui:16
#, no-c-format
msgid "PropertiesPageGUI"
@@ -854,3 +875,7 @@ msgstr "Blandað"
#, no-c-format
msgid "Filesystem: iso9660"
msgstr "Skráarkerfi: iso9660"
+
+#, 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 66eb76bc3f4..57c50203307 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: 2019-01-13 18:47+0100\n"
+"POT-Creation-Date: 2019-07-11 02:33+0200\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"
@@ -48,7 +48,6 @@ 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
-#: mounthelper/tdeio_media_mounthelper.cpp:256
msgid "The TDE mediamanager is not running."
msgstr "Il gestore dei dispositivi di TDE non è in esecuzione."
@@ -56,7 +55,7 @@ msgstr "Il gestore dei dispositivi di TDE non è in esecuzione."
msgid "This media name already exists."
msgstr "Il nome di questo supporto esiste già."
-#: mediaimpl.cpp:230 mediaimpl.cpp:293
+#: mediaimpl.cpp:230 mediaimpl.cpp:297
msgid "No such medium."
msgstr "Nessun supporto di questo tipo."
@@ -64,110 +63,114 @@ msgstr "Nessun supporto di questo tipo."
msgid "The drive is encrypted."
msgstr ""
-#: mediaimpl.cpp:272 mediamanager/halbackend.cpp:1264
-#: mediamanager/halbackend.cpp:1273 mediamanager/halbackend.cpp:1663
-#: mediamanager/halbackend.cpp:1680 mediamanager/halbackend.cpp:1691
-#: mediamanager/halbackend.cpp:1793 mediamanager/halbackend.cpp:1801
-#: mediamanager/halbackend.cpp:1808 mediamanager/halbackend.cpp:1848
-#: mediamanager/halbackend.cpp:1854 mediamanager/halbackend.cpp:1861
-#: mounthelper/tdeio_media_mounthelper.cpp:58
-msgid "Internal Error"
-msgstr "Errore interno"
+#: mediaimpl.cpp:274 mediamanager/tdehardwarebackend.cpp:201
+#: mediamanager/tdehardwarebackend.cpp:252
+#: mounthelper/tdeio_media_mounthelper.cpp:202
+msgid "Unknown mount error."
+msgstr ""
#: mediamanager/dialog.cpp:26 mounthelper/dialog.cpp:26
-msgid "Decrypt"
+msgid "Unlock"
msgstr ""
-#: mediamanager/fstabbackend.cpp:104 mediamanager/fstabbackend.cpp:114
-#: mediamanager/halbackend.cpp:1595 mediamanager/halbackend.cpp:1617
-#: mediamanager/halbackend.cpp:1776 mediamanager/halbackend.cpp:1831
-#: mediamanager/tdehardwarebackend.cpp:1349
-#: mediamanager/tdehardwarebackend.cpp:1360
+#: mediamanager/fstabbackend.cpp:105 mediamanager/fstabbackend.cpp:120
+#: mediamanager/halbackend.cpp:1598 mediamanager/halbackend.cpp:1625
+#: mediamanager/halbackend.cpp:1808 mediamanager/halbackend.cpp:1877
+#: mediamanager/mediamanager.cpp:363 mediamanager/mediamanager.cpp:375
+#: mediamanager/mediamanager.cpp:387 mediamanager/mediamanager.cpp:399
+#: mediamanager/tdehardwarebackend.cpp:1363
+#: mediamanager/tdehardwarebackend.cpp:1378
#, c-format
msgid "No such medium: %1"
msgstr "Nessun supporto di questo tipo: %1"
-#: mediamanager/fstabbackend.cpp:398
+#: mediamanager/fstabbackend.cpp:408
msgid "CD Recorder"
msgstr "Masterizzatore CD"
-#: mediamanager/fstabbackend.cpp:404
+#: mediamanager/fstabbackend.cpp:414
msgid "DVD"
msgstr "DVD"
-#: mediamanager/fstabbackend.cpp:415
+#: mediamanager/fstabbackend.cpp:425
msgid "CD-ROM"
msgstr "Lettore CD"
-#: mediamanager/fstabbackend.cpp:428
+#: mediamanager/fstabbackend.cpp:438
msgid "Floppy"
msgstr "Dischetto"
-#: mediamanager/fstabbackend.cpp:436
+#: mediamanager/fstabbackend.cpp:446
msgid "Zip Disk"
msgstr "Disco Zip"
-#: mediamanager/fstabbackend.cpp:447
+#: mediamanager/fstabbackend.cpp:457
msgid "Removable Device"
msgstr "Disco rimovibile"
-#: mediamanager/fstabbackend.cpp:452 mediamanager/fstabbackend.cpp:458
+#: mediamanager/fstabbackend.cpp:462 mediamanager/fstabbackend.cpp:468
msgid "Remote Share"
msgstr "Condivisione remota"
-#: mediamanager/fstabbackend.cpp:463
+#: mediamanager/fstabbackend.cpp:473
msgid "Hard Disk"
msgstr "Disco rigido"
-#: mediamanager/halbackend.cpp:749 mediamanager/tdehardwarebackend.cpp:805
+#: mediamanager/halbackend.cpp:744 mediamanager/tdehardwarebackend.cpp:808
msgid "Unknown Drive"
msgstr "Unità sconosciuta"
-#: mediamanager/halbackend.cpp:761 mediamanager/tdehardwarebackend.cpp:835
+#: mediamanager/halbackend.cpp:756 mediamanager/tdehardwarebackend.cpp:838
msgid "Floppy Drive"
msgstr "Unità dischetti"
-#: mediamanager/halbackend.cpp:769
+#: mediamanager/halbackend.cpp:764
msgid "Zip Drive"
msgstr "Unità Zip"
-#: mediamanager/halbackend.cpp:839 mediamanager/tdehardwarebackend.cpp:892
+#: mediamanager/halbackend.cpp:834 mediamanager/tdehardwarebackend.cpp:895
msgid "Camera"
msgstr "Macchina fotografica"
-#: mediamanager/halbackend.cpp:1221 mediamanager/halbackend.cpp:1247
+#: mediamanager/halbackend.cpp:1216 mediamanager/halbackend.cpp:1242
msgid "Authenticate"
msgstr ""
-#: mediamanager/halbackend.cpp:1222
+#: mediamanager/halbackend.cpp:1217
msgid ""
"<big><b>System policy prevents mounting internal media</b></big><br/"
">Authentication is required to perform this action. Please enter your "
"password to verify."
msgstr ""
-#: mediamanager/halbackend.cpp:1248
+#: mediamanager/halbackend.cpp:1243
msgid ""
"<big><b>System policy prevents unmounting media mounted by other users</b></"
"big><br/>Authentication is required to perform this action. Please enter "
"your password to verify."
msgstr ""
-#: mediamanager/halbackend.cpp:1284
+#: mediamanager/halbackend.cpp:1259 mediamanager/halbackend.cpp:1268
+#: mediamanager/halbackend.cpp:1849 mediamanager/halbackend.cpp:1916
+#: mounthelper/tdeio_media_mounthelper.cpp:58
+msgid "Internal Error"
+msgstr "Errore interno"
+
+#: mediamanager/halbackend.cpp:1279
msgid "Invalid filesystem type"
msgstr "Tipo di file system non valido"
-#: mediamanager/halbackend.cpp:1286
+#: mediamanager/halbackend.cpp:1281
msgid ""
"Permission denied<p>Please ensure that:<br>1. You have permission to access "
"this device.<br>2. This device node is not listed in /etc/fstab.</p>"
msgstr ""
-#: mediamanager/halbackend.cpp:1290
+#: mediamanager/halbackend.cpp:1285
msgid "Device is already mounted."
msgstr "Il dispositivo è già montato."
-#: mediamanager/halbackend.cpp:1340
+#: mediamanager/halbackend.cpp:1335
msgid ""
"Moreover, programs still using the device have been detected. They are "
"listed below. You have to close them or change their working directory "
@@ -177,16 +180,16 @@ msgstr ""
"Sono elencati sotto. Devi chiuderli o cambiare la loro directory di lavoro "
"prima di riprovare a smontare il dispositivo."
-#: mediamanager/halbackend.cpp:1381 mediamanager/tdehardwarebackend.cpp:1588
+#: mediamanager/halbackend.cpp:1376 mediamanager/tdehardwarebackend.cpp:1618
msgid ""
"Programs that were still using the device have been forcibly terminated. "
"They are listed below."
msgstr ""
-#: mediamanager/halbackend.cpp:1402 mediamanager/halbackend.cpp:1715
-#: mediamanager/tdehardwarebackend.cpp:1406
-#: mediamanager/tdehardwarebackend.cpp:1424
-#: mediamanager/tdehardwarebackend.cpp:1464
+#: mediamanager/halbackend.cpp:1397 mediamanager/halbackend.cpp:1742
+#: mediamanager/tdehardwarebackend.cpp:1430
+#: mediamanager/tdehardwarebackend.cpp:1452
+#: mediamanager/tdehardwarebackend.cpp:1494
msgid ""
"Unfortunately, the device <b>%1</b> (%2) named <b>'%3'</b> and currently "
"mounted at <b>%4</b> could not be unmounted. "
@@ -194,196 +197,199 @@ 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:1408 mediamanager/tdehardwarebackend.cpp:1470
+#: mediamanager/halbackend.cpp:1403 mediamanager/tdehardwarebackend.cpp:1500
msgid "The following error was returned by umount command:"
msgstr "Il comando di smontaggio ha restituito il seguente errore:"
-#: mediamanager/halbackend.cpp:1478
+#: mediamanager/halbackend.cpp:1567 mediamanager/tdehardwarebackend.cpp:1322
+msgid "Cannot mount encrypted locked drives!"
+msgstr ""
+
+#: mediamanager/halbackend.cpp:1682 mediamanager/halbackend.cpp:1703
+#: mediamanager/halbackend.cpp:1716 mediamanager/halbackend.cpp:1830
+#: mediamanager/halbackend.cpp:1840 mediamanager/halbackend.cpp:1899
+#: mediamanager/halbackend.cpp:1907
#, fuzzy
-msgid "Permission denied"
-msgstr "Autorizzazioni negate"
+msgid "Internal error"
+msgstr "Errore interno"
-#: mediamanager/halbackend.cpp:1562 mediamanager/tdehardwarebackend.cpp:1232
-msgid "Cannot mount encrypted drives!"
-msgstr ""
+#: mediamanager/halbackend.cpp:1694
+#, fuzzy
+#| msgid "Unknown"
+msgid "Unknown error"
+msgstr "Sconosciuto"
-#: mediamanager/halbackend.cpp:1721
+#: mediamanager/halbackend.cpp:1748
msgid "Unmounting failed due to the following error:"
msgstr "Lo smontaggio è fallito per il seguente motivo:"
-#: mediamanager/halbackend.cpp:1723
+#: mediamanager/halbackend.cpp:1750
msgid "Device is Busy:"
msgstr "Il dispositivo è occupato:"
-#: mediamanager/halbackend.cpp:1727
+#: mediamanager/halbackend.cpp:1754
msgid ""
"Permission denied<p>Please ensure that:<br>1. You have permission to access "
"this device.<br>2. This device was originally mounted using TDE.</p>"
msgstr ""
-#: mediamanager/halbackend.cpp:1739
+#: mediamanager/halbackend.cpp:1766
msgid ""
"%1<p><b>Would you like to forcibly terminate these processes?</b><br><i>All "
"unsaved data would be lost</i>"
msgstr ""
-#: mediamanager/halbackend.cpp:1811
+#: mediamanager/halbackend.cpp:1852
msgid "Wrong password"
msgstr ""
-#: mediamanager/mediamanager.cpp:247 mediamanager/mediamanager.cpp:266
-#: mediamanager/mediamanager.cpp:285 mediamanager/mediamanager.cpp:293
-#: mediamanager/mediamanager.cpp:302 mediamanager/mediamanager.cpp:310
-msgid "Feature only available with HAL"
-msgstr "Funzione disponibile solo con HAL"
-
-#: mediamanager/mediamanager.cpp:252
+#: mediamanager/mediamanager.cpp:248 mediamanager/mediamanager.cpp:275
#, fuzzy
msgid "Feature only available with the TDE hardware backend"
msgstr "Funzione disponibile solo con HAL"
-#: mediamanager/mediamanager.cpp:256 mediamanager/mediamanager.cpp:271
-#: mediamanager/mediamanager.cpp:275
+#: mediamanager/mediamanager.cpp:255 mediamanager/mediamanager.cpp:282
+#: mediamanager/mediamanager.cpp:312 mediamanager/mediamanager.cpp:343
+msgid "Feature only available with HAL"
+msgstr "Funzione disponibile solo con HAL"
+
+#: mediamanager/mediamanager.cpp:262 mediamanager/mediamanager.cpp:289
+#: mediamanager/mediamanager.cpp:320 mediamanager/mediamanager.cpp:350
#, fuzzy
msgid "Feature only available with HAL or TDE hardware backend"
msgstr "Funzione disponibile solo con HAL"
-#: mediamanager/tdehardwarebackend.cpp:480
-#: mediamanager/tdehardwarebackend.cpp:517
-#: mediamanager/tdehardwarebackend.cpp:750
+#: mediamanager/tdehardwarebackend.cpp:483
+#: mediamanager/tdehardwarebackend.cpp:520
+#: mediamanager/tdehardwarebackend.cpp:753
#, fuzzy
msgid "%1 Removable Device"
msgstr "Disco rimovibile"
-#: mediamanager/tdehardwarebackend.cpp:525
+#: mediamanager/tdehardwarebackend.cpp:528
#, fuzzy
msgid "Blank CD-ROM"
msgstr "Lettore CD"
-#: mediamanager/tdehardwarebackend.cpp:534
+#: mediamanager/tdehardwarebackend.cpp:537
msgid "Blank CD-R"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:543
+#: mediamanager/tdehardwarebackend.cpp:546
msgid "Blank CD-RW"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:552
+#: mediamanager/tdehardwarebackend.cpp:555
msgid "Blank Magneto-Optical CD"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:561
+#: mediamanager/tdehardwarebackend.cpp:564
msgid "Blank Mount Ranier CD-RW"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:570
+#: mediamanager/tdehardwarebackend.cpp:573
msgid "Blank Mount Ranier CD-RW-W"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:579
+#: mediamanager/tdehardwarebackend.cpp:582
msgid "Blank DVD-ROM"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:588
+#: mediamanager/tdehardwarebackend.cpp:591
msgid "Blank DVD-RAM"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:597
+#: mediamanager/tdehardwarebackend.cpp:600
msgid "Blank DVD-R"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:606
+#: mediamanager/tdehardwarebackend.cpp:609
msgid "Blank DVD-RW"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:615
+#: mediamanager/tdehardwarebackend.cpp:618
msgid "Blank Dual Layer DVD-R"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:624
+#: mediamanager/tdehardwarebackend.cpp:627
msgid "Blank Dual Layer DVD-RW"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:633
+#: mediamanager/tdehardwarebackend.cpp:636
msgid "Blank DVD+R"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:642
+#: mediamanager/tdehardwarebackend.cpp:645
msgid "Blank DVD+RW"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:651
+#: mediamanager/tdehardwarebackend.cpp:654
msgid "Blank Dual Layer DVD+R"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:660
+#: mediamanager/tdehardwarebackend.cpp:663
msgid "Blank Dual Layer DVD+RW"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:669
+#: mediamanager/tdehardwarebackend.cpp:672
msgid "Blank BD-ROM"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:678
+#: mediamanager/tdehardwarebackend.cpp:681
msgid "Blank BD-R"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:687
+#: mediamanager/tdehardwarebackend.cpp:690
msgid "Blank BD-RW"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:696
+#: mediamanager/tdehardwarebackend.cpp:699
msgid "Blank HDDVD-ROM"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:705
+#: mediamanager/tdehardwarebackend.cpp:708
msgid "Blank HDDVD-R"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:714
+#: mediamanager/tdehardwarebackend.cpp:717
msgid "Blank HDDVD-RW"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:721
+#: mediamanager/tdehardwarebackend.cpp:724
msgid "Audio CD"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:742
+#: mediamanager/tdehardwarebackend.cpp:745
msgid "%1 Fixed Disk (%2)"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:849
+#: mediamanager/tdehardwarebackend.cpp:852
#, fuzzy
msgid "%1 Zip Disk"
msgstr "Disco Zip"
-#: mediamanager/tdehardwarebackend.cpp:1212
-#: mediamanager/tdehardwarebackend.cpp:1392
-#, fuzzy
-msgid "Internal error"
-msgstr "Errore interno"
+#: mediamanager/tdehardwarebackend.cpp:1224
+#: mediamanager/tdehardwarebackend.cpp:1417
+msgid "Internal error. Couldn't find medium."
+msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:1239
-msgid ""
-"<qt>Unable to mount this device.<p>Potential reasons include:<br>Improper "
-"device and/or user privilege level<br>Corrupt data on storage device"
+#: mediamanager/tdehardwarebackend.cpp:1249
+#: mediamanager/tdehardwarebackend.cpp:1323
+msgid "Unable to mount this device."
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:1241
-#: mediamanager/tdehardwarebackend.cpp:1316
-#: mediamanager/tdehardwarebackend.cpp:1408
-#: mediamanager/tdehardwarebackend.cpp:1426
+#: mediamanager/tdehardwarebackend.cpp:1252
+#: mediamanager/tdehardwarebackend.cpp:1326
+#: mediamanager/tdehardwarebackend.cpp:1435
+#: mediamanager/tdehardwarebackend.cpp:1457
msgid "<p>Technical details:<br>"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:1314
-msgid ""
-"<qt>Unable to mount this device.<p>Potential reasons include:<br>Improper "
-"device and/or user privilege level<br>Corrupt data on storage "
-"device<br>Incorrect encryption password"
+#: mediamanager/tdehardwarebackend.cpp:1284
+msgid "Decryption aborted"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:1420
+#: mediamanager/tdehardwarebackend.cpp:1443
msgid ""
"<qt>The device <b>%1</b> (%2) named <b>'%3'</b> and currently mounted at <b>"
"%4</b> can not be unmounted at this time.<p>%5<p><b>Would you like to "
@@ -391,7 +397,7 @@ msgid ""
"lost</i>"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:1547
+#: mediamanager/tdehardwarebackend.cpp:1577
#, fuzzy
msgid ""
"Programs still using the device have been detected. They are listed below. "
@@ -406,7 +412,7 @@ msgstr ""
msgid "%1 cannot be found."
msgstr "Non è stato trovato %1."
-#: mounthelper/tdeio_media_mounthelper.cpp:86
+#: mounthelper/tdeio_media_mounthelper.cpp:87
msgid "%1 is not a mountable media."
msgstr "%1 non è un supporto montabile."
@@ -417,43 +423,51 @@ msgstr "%1 non è un supporto montabile."
#: mounthelper/tdeio_media_mounthelper.cpp:107
#, fuzzy
-msgid "%1 is already decrypted."
+msgid "%1 is already unlocked."
msgstr "Il dispositivo è già montato."
-#: mounthelper/tdeio_media_mounthelper.cpp:228
+#: mounthelper/tdeio_media_mounthelper.cpp:139
+msgid "Unknown unmount error."
+msgstr ""
+
+#: mounthelper/tdeio_media_mounthelper.cpp:246
msgid "The device was successfully unmounted, but the tray could not be opened"
msgstr ""
"Il dispositivo è stato smontato con successo, ma non è stato possibile "
"aprire lo sportellino"
-#: mounthelper/tdeio_media_mounthelper.cpp:230
+#: mounthelper/tdeio_media_mounthelper.cpp:248
msgid "The device was successfully unmounted, but could not be ejected"
msgstr ""
"Il dispositivo è stato smontato con successo, ma non è stato possibile "
"espellerlo"
-#: mounthelper/tdeio_media_mounthelper.cpp:275
+#: mounthelper/tdeio_media_mounthelper.cpp:281
+msgid "Unknown decrypt error."
+msgstr ""
+
+#: mounthelper/tdeio_media_mounthelper.cpp:295
#, fuzzy
msgid "Decrypt given URL"
msgstr "Smonta l'URL dato"
-#: mounthelper/tdeio_media_mounthelper.cpp:276
+#: mounthelper/tdeio_media_mounthelper.cpp:296
msgid "Unmount given URL"
msgstr "Smonta l'URL dato"
-#: mounthelper/tdeio_media_mounthelper.cpp:277
+#: mounthelper/tdeio_media_mounthelper.cpp:297
msgid "Mount given URL (default)"
msgstr "Monta l'URL dato (predefinito)"
-#: mounthelper/tdeio_media_mounthelper.cpp:278
+#: mounthelper/tdeio_media_mounthelper.cpp:298
msgid "Eject given URL via tdeeject"
msgstr "Espelli l'URL dato attraverso tdeeject"
-#: mounthelper/tdeio_media_mounthelper.cpp:279
+#: mounthelper/tdeio_media_mounthelper.cpp:299
msgid "Unmount and Eject given URL (necessary for some USB devices)"
msgstr "Smonta ed espelli l'URL dato (necessario per alcune periferiche USB)"
-#: mounthelper/tdeio_media_mounthelper.cpp:280
+#: mounthelper/tdeio_media_mounthelper.cpp:300
msgid "media:/ URL to mount/unmount/eject/remove"
msgstr "media:/ URL da montare/smontare/espellere/rimuovere"
@@ -474,43 +488,43 @@ msgstr "Impossibile salvare le modifiche"
msgid "&Mounting"
msgstr "&Montaggio"
-#: tdefile-plugin/tdefilemediaplugin.cpp:190
+#: tdefile-plugin/tdefilemediaplugin.cpp:184
msgid "Medium Information"
msgstr "Informazioni supporto"
-#: tdefile-plugin/tdefilemediaplugin.cpp:193
+#: tdefile-plugin/tdefilemediaplugin.cpp:187
msgid "Free"
msgstr "Libero"
-#: tdefile-plugin/tdefilemediaplugin.cpp:196
+#: tdefile-plugin/tdefilemediaplugin.cpp:190
msgid "Used"
msgstr "Utilizzato"
-#: tdefile-plugin/tdefilemediaplugin.cpp:199
+#: tdefile-plugin/tdefilemediaplugin.cpp:193
msgid "Total"
msgstr "Totale"
-#: tdefile-plugin/tdefilemediaplugin.cpp:202
+#: tdefile-plugin/tdefilemediaplugin.cpp:196
msgid "Base URL"
msgstr "URL base"
-#: tdefile-plugin/tdefilemediaplugin.cpp:203
+#: tdefile-plugin/tdefilemediaplugin.cpp:197
msgid "Mount Point"
msgstr "Punto montaggio"
-#: tdefile-plugin/tdefilemediaplugin.cpp:204
+#: tdefile-plugin/tdefilemediaplugin.cpp:198
msgid "Device Node"
msgstr "Nodo dispositivo"
-#: tdefile-plugin/tdefilemediaplugin.cpp:206
+#: tdefile-plugin/tdefilemediaplugin.cpp:200
msgid "Medium Summary"
msgstr "Riassunto sul supporto"
-#: tdefile-plugin/tdefilemediaplugin.cpp:208
+#: tdefile-plugin/tdefilemediaplugin.cpp:202
msgid "Usage"
msgstr "Utilizzo"
-#: tdefile-plugin/tdefilemediaplugin.cpp:210
+#: tdefile-plugin/tdefilemediaplugin.cpp:204
msgid "Bar Graph"
msgstr "Grafico a barre"
@@ -582,23 +596,30 @@ msgid ""
"devices are plugged in."
msgstr ""
-#: mediamanager/decryptdialog.ui:24 mounthelper/decryptdialog.ui:24
+#: mediamanager/unlockdialog.ui:24 mounthelper/unlockdialog.ui:24
#, no-c-format
msgid "Decrypting Storage Device"
msgstr ""
-#: mediamanager/decryptdialog.ui:109 mounthelper/decryptdialog.ui:109
+#: mediamanager/unlockdialog.ui:109
#, no-c-format
msgid ""
-"<p><b>%1</b> is an encrypted storage device.</p>\n"
-"<p>Please enter the password to decrypt the storage device.</p>"
+"<p><b>%1</b> is an encrypted locked storage device.</p>\n"
+"<p>Please enter the password to unlock the storage device.</p>"
msgstr ""
-#: mediamanager/decryptdialog.ui:131 mounthelper/decryptdialog.ui:131
+#: mediamanager/unlockdialog.ui:131 mounthelper/unlockdialog.ui:131
#, no-c-format
msgid "&Password:"
msgstr ""
+#: mounthelper/unlockdialog.ui:109
+#, no-c-format
+msgid ""
+"<p><b>%1</b> is an encrypted storage device.</p>\n"
+"<p>Please enter the password to decrypt the storage device.</p>"
+msgstr ""
+
#: propsdlgplugin/propertiespagegui.ui:16
#, no-c-format
msgid "PropertiesPageGUI"
@@ -865,3 +886,7 @@ msgstr "Misto"
#, no-c-format
msgid "Filesystem: iso9660"
msgstr "File system: iso9660"
+
+#, 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 fe6a7f48088..03cc2128ca1 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: 2019-01-13 18:47+0100\n"
+"POT-Creation-Date: 2019-07-11 02:33+0200\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"
@@ -49,7 +49,6 @@ msgstr "不明"
#: mediaimpl.cpp:88 mediaimpl.cpp:115 mediaimpl.cpp:141 mediaimpl.cpp:177
#: mediaimpl.cpp:197 mediaimpl.cpp:218
#: mounthelper/tdeio_media_mounthelper.cpp:50
-#: mounthelper/tdeio_media_mounthelper.cpp:256
msgid "The TDE mediamanager is not running."
msgstr "TDE メディアマネージャが起動されていません。"
@@ -57,7 +56,7 @@ msgstr "TDE メディアマネージャが起動されていません。"
msgid "This media name already exists."
msgstr "メディア名が既に存在します。"
-#: mediaimpl.cpp:230 mediaimpl.cpp:293
+#: mediaimpl.cpp:230 mediaimpl.cpp:297
msgid "No such medium."
msgstr "該当するメディアがありません。"
@@ -65,110 +64,114 @@ msgstr "該当するメディアがありません。"
msgid "The drive is encrypted."
msgstr ""
-#: mediaimpl.cpp:272 mediamanager/halbackend.cpp:1264
-#: mediamanager/halbackend.cpp:1273 mediamanager/halbackend.cpp:1663
-#: mediamanager/halbackend.cpp:1680 mediamanager/halbackend.cpp:1691
-#: mediamanager/halbackend.cpp:1793 mediamanager/halbackend.cpp:1801
-#: mediamanager/halbackend.cpp:1808 mediamanager/halbackend.cpp:1848
-#: mediamanager/halbackend.cpp:1854 mediamanager/halbackend.cpp:1861
-#: mounthelper/tdeio_media_mounthelper.cpp:58
-msgid "Internal Error"
-msgstr "内部エラー"
+#: mediaimpl.cpp:274 mediamanager/tdehardwarebackend.cpp:201
+#: mediamanager/tdehardwarebackend.cpp:252
+#: mounthelper/tdeio_media_mounthelper.cpp:202
+msgid "Unknown mount error."
+msgstr ""
#: mediamanager/dialog.cpp:26 mounthelper/dialog.cpp:26
-msgid "Decrypt"
+msgid "Unlock"
msgstr ""
-#: mediamanager/fstabbackend.cpp:104 mediamanager/fstabbackend.cpp:114
-#: mediamanager/halbackend.cpp:1595 mediamanager/halbackend.cpp:1617
-#: mediamanager/halbackend.cpp:1776 mediamanager/halbackend.cpp:1831
-#: mediamanager/tdehardwarebackend.cpp:1349
-#: mediamanager/tdehardwarebackend.cpp:1360
+#: mediamanager/fstabbackend.cpp:105 mediamanager/fstabbackend.cpp:120
+#: mediamanager/halbackend.cpp:1598 mediamanager/halbackend.cpp:1625
+#: mediamanager/halbackend.cpp:1808 mediamanager/halbackend.cpp:1877
+#: mediamanager/mediamanager.cpp:363 mediamanager/mediamanager.cpp:375
+#: mediamanager/mediamanager.cpp:387 mediamanager/mediamanager.cpp:399
+#: mediamanager/tdehardwarebackend.cpp:1363
+#: mediamanager/tdehardwarebackend.cpp:1378
#, c-format
msgid "No such medium: %1"
msgstr "該当メディアなし: %1"
-#: mediamanager/fstabbackend.cpp:398
+#: mediamanager/fstabbackend.cpp:408
msgid "CD Recorder"
msgstr "CD レコーダ"
-#: mediamanager/fstabbackend.cpp:404
+#: mediamanager/fstabbackend.cpp:414
msgid "DVD"
msgstr "DVD"
-#: mediamanager/fstabbackend.cpp:415
+#: mediamanager/fstabbackend.cpp:425
msgid "CD-ROM"
msgstr "CD-ROM"
-#: mediamanager/fstabbackend.cpp:428
+#: mediamanager/fstabbackend.cpp:438
msgid "Floppy"
msgstr "フロッピー"
-#: mediamanager/fstabbackend.cpp:436
+#: mediamanager/fstabbackend.cpp:446
msgid "Zip Disk"
msgstr "Zip ディスク"
-#: mediamanager/fstabbackend.cpp:447
+#: mediamanager/fstabbackend.cpp:457
msgid "Removable Device"
msgstr "取り外し可能デバイス"
-#: mediamanager/fstabbackend.cpp:452 mediamanager/fstabbackend.cpp:458
+#: mediamanager/fstabbackend.cpp:462 mediamanager/fstabbackend.cpp:468
msgid "Remote Share"
msgstr "リモートシェア"
-#: mediamanager/fstabbackend.cpp:463
+#: mediamanager/fstabbackend.cpp:473
msgid "Hard Disk"
msgstr "ハードディスク"
-#: mediamanager/halbackend.cpp:749 mediamanager/tdehardwarebackend.cpp:805
+#: mediamanager/halbackend.cpp:744 mediamanager/tdehardwarebackend.cpp:808
msgid "Unknown Drive"
msgstr "不明なドライブ"
-#: mediamanager/halbackend.cpp:761 mediamanager/tdehardwarebackend.cpp:835
+#: mediamanager/halbackend.cpp:756 mediamanager/tdehardwarebackend.cpp:838
msgid "Floppy Drive"
msgstr "フロッピードライブ"
-#: mediamanager/halbackend.cpp:769
+#: mediamanager/halbackend.cpp:764
msgid "Zip Drive"
msgstr "Zip ドライブ"
-#: mediamanager/halbackend.cpp:839 mediamanager/tdehardwarebackend.cpp:892
+#: mediamanager/halbackend.cpp:834 mediamanager/tdehardwarebackend.cpp:895
msgid "Camera"
msgstr "カメラ"
-#: mediamanager/halbackend.cpp:1221 mediamanager/halbackend.cpp:1247
+#: mediamanager/halbackend.cpp:1216 mediamanager/halbackend.cpp:1242
msgid "Authenticate"
msgstr ""
-#: mediamanager/halbackend.cpp:1222
+#: mediamanager/halbackend.cpp:1217
msgid ""
"<big><b>System policy prevents mounting internal media</b></big><br/"
">Authentication is required to perform this action. Please enter your "
"password to verify."
msgstr ""
-#: mediamanager/halbackend.cpp:1248
+#: mediamanager/halbackend.cpp:1243
msgid ""
"<big><b>System policy prevents unmounting media mounted by other users</b></"
"big><br/>Authentication is required to perform this action. Please enter "
"your password to verify."
msgstr ""
-#: mediamanager/halbackend.cpp:1284
+#: mediamanager/halbackend.cpp:1259 mediamanager/halbackend.cpp:1268
+#: mediamanager/halbackend.cpp:1849 mediamanager/halbackend.cpp:1916
+#: mounthelper/tdeio_media_mounthelper.cpp:58
+msgid "Internal Error"
+msgstr "内部エラー"
+
+#: mediamanager/halbackend.cpp:1279
msgid "Invalid filesystem type"
msgstr "無効なファイルシステムタイプ"
-#: mediamanager/halbackend.cpp:1286
+#: mediamanager/halbackend.cpp:1281
msgid ""
"Permission denied<p>Please ensure that:<br>1. You have permission to access "
"this device.<br>2. This device node is not listed in /etc/fstab.</p>"
msgstr ""
-#: mediamanager/halbackend.cpp:1290
+#: mediamanager/halbackend.cpp:1285
msgid "Device is already mounted."
msgstr "デバイスは既にマウントされています。"
-#: mediamanager/halbackend.cpp:1340
+#: mediamanager/halbackend.cpp:1335
msgid ""
"Moreover, programs still using the device have been detected. They are "
"listed below. You have to close them or change their working directory "
@@ -178,16 +181,16 @@ msgstr ""
"プログラムを終了するか、ワークディレクトリを変更した後でデバイスのマウントを"
"解除してみてください。"
-#: mediamanager/halbackend.cpp:1381 mediamanager/tdehardwarebackend.cpp:1588
+#: mediamanager/halbackend.cpp:1376 mediamanager/tdehardwarebackend.cpp:1618
msgid ""
"Programs that were still using the device have been forcibly terminated. "
"They are listed below."
msgstr ""
-#: mediamanager/halbackend.cpp:1402 mediamanager/halbackend.cpp:1715
-#: mediamanager/tdehardwarebackend.cpp:1406
-#: mediamanager/tdehardwarebackend.cpp:1424
-#: mediamanager/tdehardwarebackend.cpp:1464
+#: mediamanager/halbackend.cpp:1397 mediamanager/halbackend.cpp:1742
+#: mediamanager/tdehardwarebackend.cpp:1430
+#: mediamanager/tdehardwarebackend.cpp:1452
+#: mediamanager/tdehardwarebackend.cpp:1494
msgid ""
"Unfortunately, the device <b>%1</b> (%2) named <b>'%3'</b> and currently "
"mounted at <b>%4</b> could not be unmounted. "
@@ -195,196 +198,199 @@ msgstr ""
"%4 にマウントされ、%3 と名付けられたデバイス %1 (%2) のマウントを解除できませ"
"んでした。"
-#: mediamanager/halbackend.cpp:1408 mediamanager/tdehardwarebackend.cpp:1470
+#: mediamanager/halbackend.cpp:1403 mediamanager/tdehardwarebackend.cpp:1500
msgid "The following error was returned by umount command:"
msgstr "umount コマンドが次のエラー返してきました:"
-#: mediamanager/halbackend.cpp:1478
+#: mediamanager/halbackend.cpp:1567 mediamanager/tdehardwarebackend.cpp:1322
+msgid "Cannot mount encrypted locked drives!"
+msgstr ""
+
+#: mediamanager/halbackend.cpp:1682 mediamanager/halbackend.cpp:1703
+#: mediamanager/halbackend.cpp:1716 mediamanager/halbackend.cpp:1830
+#: mediamanager/halbackend.cpp:1840 mediamanager/halbackend.cpp:1899
+#: mediamanager/halbackend.cpp:1907
#, fuzzy
-msgid "Permission denied"
-msgstr "アクセス許可がありません"
+msgid "Internal error"
+msgstr "内部エラー"
-#: mediamanager/halbackend.cpp:1562 mediamanager/tdehardwarebackend.cpp:1232
-msgid "Cannot mount encrypted drives!"
-msgstr ""
+#: mediamanager/halbackend.cpp:1694
+#, fuzzy
+#| msgid "Unknown"
+msgid "Unknown error"
+msgstr "不明"
-#: mediamanager/halbackend.cpp:1721
+#: mediamanager/halbackend.cpp:1748
msgid "Unmounting failed due to the following error:"
msgstr "マウント解除でエラー:"
-#: mediamanager/halbackend.cpp:1723
+#: mediamanager/halbackend.cpp:1750
msgid "Device is Busy:"
msgstr "デバイスは使用中です:"
-#: mediamanager/halbackend.cpp:1727
+#: mediamanager/halbackend.cpp:1754
msgid ""
"Permission denied<p>Please ensure that:<br>1. You have permission to access "
"this device.<br>2. This device was originally mounted using TDE.</p>"
msgstr ""
-#: mediamanager/halbackend.cpp:1739
+#: mediamanager/halbackend.cpp:1766
msgid ""
"%1<p><b>Would you like to forcibly terminate these processes?</b><br><i>All "
"unsaved data would be lost</i>"
msgstr ""
-#: mediamanager/halbackend.cpp:1811
+#: mediamanager/halbackend.cpp:1852
msgid "Wrong password"
msgstr ""
-#: mediamanager/mediamanager.cpp:247 mediamanager/mediamanager.cpp:266
-#: mediamanager/mediamanager.cpp:285 mediamanager/mediamanager.cpp:293
-#: mediamanager/mediamanager.cpp:302 mediamanager/mediamanager.cpp:310
-msgid "Feature only available with HAL"
-msgstr "HAL でのみ利用可能な機能"
-
-#: mediamanager/mediamanager.cpp:252
+#: mediamanager/mediamanager.cpp:248 mediamanager/mediamanager.cpp:275
#, fuzzy
msgid "Feature only available with the TDE hardware backend"
msgstr "HAL でのみ利用可能な機能"
-#: mediamanager/mediamanager.cpp:256 mediamanager/mediamanager.cpp:271
-#: mediamanager/mediamanager.cpp:275
+#: mediamanager/mediamanager.cpp:255 mediamanager/mediamanager.cpp:282
+#: mediamanager/mediamanager.cpp:312 mediamanager/mediamanager.cpp:343
+msgid "Feature only available with HAL"
+msgstr "HAL でのみ利用可能な機能"
+
+#: mediamanager/mediamanager.cpp:262 mediamanager/mediamanager.cpp:289
+#: mediamanager/mediamanager.cpp:320 mediamanager/mediamanager.cpp:350
#, fuzzy
msgid "Feature only available with HAL or TDE hardware backend"
msgstr "HAL でのみ利用可能な機能"
-#: mediamanager/tdehardwarebackend.cpp:480
-#: mediamanager/tdehardwarebackend.cpp:517
-#: mediamanager/tdehardwarebackend.cpp:750
+#: mediamanager/tdehardwarebackend.cpp:483
+#: mediamanager/tdehardwarebackend.cpp:520
+#: mediamanager/tdehardwarebackend.cpp:753
#, fuzzy
msgid "%1 Removable Device"
msgstr "取り外し可能デバイス"
-#: mediamanager/tdehardwarebackend.cpp:525
+#: mediamanager/tdehardwarebackend.cpp:528
#, fuzzy
msgid "Blank CD-ROM"
msgstr "CD-ROM"
-#: mediamanager/tdehardwarebackend.cpp:534
+#: mediamanager/tdehardwarebackend.cpp:537
msgid "Blank CD-R"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:543
+#: mediamanager/tdehardwarebackend.cpp:546
msgid "Blank CD-RW"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:552
+#: mediamanager/tdehardwarebackend.cpp:555
msgid "Blank Magneto-Optical CD"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:561
+#: mediamanager/tdehardwarebackend.cpp:564
msgid "Blank Mount Ranier CD-RW"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:570
+#: mediamanager/tdehardwarebackend.cpp:573
msgid "Blank Mount Ranier CD-RW-W"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:579
+#: mediamanager/tdehardwarebackend.cpp:582
msgid "Blank DVD-ROM"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:588
+#: mediamanager/tdehardwarebackend.cpp:591
msgid "Blank DVD-RAM"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:597
+#: mediamanager/tdehardwarebackend.cpp:600
msgid "Blank DVD-R"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:606
+#: mediamanager/tdehardwarebackend.cpp:609
msgid "Blank DVD-RW"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:615
+#: mediamanager/tdehardwarebackend.cpp:618
msgid "Blank Dual Layer DVD-R"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:624
+#: mediamanager/tdehardwarebackend.cpp:627
msgid "Blank Dual Layer DVD-RW"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:633
+#: mediamanager/tdehardwarebackend.cpp:636
msgid "Blank DVD+R"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:642
+#: mediamanager/tdehardwarebackend.cpp:645
msgid "Blank DVD+RW"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:651
+#: mediamanager/tdehardwarebackend.cpp:654
msgid "Blank Dual Layer DVD+R"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:660
+#: mediamanager/tdehardwarebackend.cpp:663
msgid "Blank Dual Layer DVD+RW"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:669
+#: mediamanager/tdehardwarebackend.cpp:672
msgid "Blank BD-ROM"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:678
+#: mediamanager/tdehardwarebackend.cpp:681
msgid "Blank BD-R"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:687
+#: mediamanager/tdehardwarebackend.cpp:690
msgid "Blank BD-RW"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:696
+#: mediamanager/tdehardwarebackend.cpp:699
msgid "Blank HDDVD-ROM"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:705
+#: mediamanager/tdehardwarebackend.cpp:708
msgid "Blank HDDVD-R"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:714
+#: mediamanager/tdehardwarebackend.cpp:717
msgid "Blank HDDVD-RW"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:721
+#: mediamanager/tdehardwarebackend.cpp:724
msgid "Audio CD"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:742
+#: mediamanager/tdehardwarebackend.cpp:745
msgid "%1 Fixed Disk (%2)"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:849
+#: mediamanager/tdehardwarebackend.cpp:852
#, fuzzy
msgid "%1 Zip Disk"
msgstr "Zip ディスク"
-#: mediamanager/tdehardwarebackend.cpp:1212
-#: mediamanager/tdehardwarebackend.cpp:1392
-#, fuzzy
-msgid "Internal error"
-msgstr "内部エラー"
+#: mediamanager/tdehardwarebackend.cpp:1224
+#: mediamanager/tdehardwarebackend.cpp:1417
+msgid "Internal error. Couldn't find medium."
+msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:1239
-msgid ""
-"<qt>Unable to mount this device.<p>Potential reasons include:<br>Improper "
-"device and/or user privilege level<br>Corrupt data on storage device"
+#: mediamanager/tdehardwarebackend.cpp:1249
+#: mediamanager/tdehardwarebackend.cpp:1323
+msgid "Unable to mount this device."
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:1241
-#: mediamanager/tdehardwarebackend.cpp:1316
-#: mediamanager/tdehardwarebackend.cpp:1408
-#: mediamanager/tdehardwarebackend.cpp:1426
+#: mediamanager/tdehardwarebackend.cpp:1252
+#: mediamanager/tdehardwarebackend.cpp:1326
+#: mediamanager/tdehardwarebackend.cpp:1435
+#: mediamanager/tdehardwarebackend.cpp:1457
msgid "<p>Technical details:<br>"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:1314
-msgid ""
-"<qt>Unable to mount this device.<p>Potential reasons include:<br>Improper "
-"device and/or user privilege level<br>Corrupt data on storage "
-"device<br>Incorrect encryption password"
+#: mediamanager/tdehardwarebackend.cpp:1284
+msgid "Decryption aborted"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:1420
+#: mediamanager/tdehardwarebackend.cpp:1443
msgid ""
"<qt>The device <b>%1</b> (%2) named <b>'%3'</b> and currently mounted at <b>"
"%4</b> can not be unmounted at this time.<p>%5<p><b>Would you like to "
@@ -392,7 +398,7 @@ msgid ""
"lost</i>"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:1547
+#: mediamanager/tdehardwarebackend.cpp:1577
#, fuzzy
msgid ""
"Programs still using the device have been detected. They are listed below. "
@@ -407,7 +413,7 @@ msgstr ""
msgid "%1 cannot be found."
msgstr "%1 が見つかりません。"
-#: mounthelper/tdeio_media_mounthelper.cpp:86
+#: mounthelper/tdeio_media_mounthelper.cpp:87
msgid "%1 is not a mountable media."
msgstr "%1 はマウント可能なメディアではありません。"
@@ -418,40 +424,48 @@ msgstr "%1 はマウント可能なメディアではありません。"
#: mounthelper/tdeio_media_mounthelper.cpp:107
#, fuzzy
-msgid "%1 is already decrypted."
+msgid "%1 is already unlocked."
msgstr "デバイスは既にマウントされています。"
-#: mounthelper/tdeio_media_mounthelper.cpp:228
+#: mounthelper/tdeio_media_mounthelper.cpp:139
+msgid "Unknown unmount error."
+msgstr ""
+
+#: mounthelper/tdeio_media_mounthelper.cpp:246
msgid "The device was successfully unmounted, but the tray could not be opened"
msgstr ""
"デバイスのマウントを解除しましたが、トレイを開けることができませんでした。"
-#: mounthelper/tdeio_media_mounthelper.cpp:230
+#: mounthelper/tdeio_media_mounthelper.cpp:248
msgid "The device was successfully unmounted, but could not be ejected"
msgstr "デバイスのマウントを解除しましたが、取り出すことができませんでした。"
-#: mounthelper/tdeio_media_mounthelper.cpp:275
+#: mounthelper/tdeio_media_mounthelper.cpp:281
+msgid "Unknown decrypt error."
+msgstr ""
+
+#: mounthelper/tdeio_media_mounthelper.cpp:295
#, fuzzy
msgid "Decrypt given URL"
msgstr "指定した URL のマウントを解除"
-#: mounthelper/tdeio_media_mounthelper.cpp:276
+#: mounthelper/tdeio_media_mounthelper.cpp:296
msgid "Unmount given URL"
msgstr "指定した URL のマウントを解除"
-#: mounthelper/tdeio_media_mounthelper.cpp:277
+#: mounthelper/tdeio_media_mounthelper.cpp:297
msgid "Mount given URL (default)"
msgstr "指定した URL をマウント (標準)"
-#: mounthelper/tdeio_media_mounthelper.cpp:278
+#: mounthelper/tdeio_media_mounthelper.cpp:298
msgid "Eject given URL via tdeeject"
msgstr "指定した URL を取り出す (tdeeject を使用)"
-#: mounthelper/tdeio_media_mounthelper.cpp:279
+#: mounthelper/tdeio_media_mounthelper.cpp:299
msgid "Unmount and Eject given URL (necessary for some USB devices)"
msgstr "指定した URL のマウントを解除し取り出す (一部 USB デバイスで必要)"
-#: mounthelper/tdeio_media_mounthelper.cpp:280
+#: mounthelper/tdeio_media_mounthelper.cpp:300
msgid "media:/ URL to mount/unmount/eject/remove"
msgstr "media:/URL でマウント/マウント解除/取り出し/取り外し"
@@ -472,43 +486,43 @@ msgstr "変更の保存に失敗しまた"
msgid "&Mounting"
msgstr "マウント(&M)"
-#: tdefile-plugin/tdefilemediaplugin.cpp:190
+#: tdefile-plugin/tdefilemediaplugin.cpp:184
msgid "Medium Information"
msgstr "メディア情報"
-#: tdefile-plugin/tdefilemediaplugin.cpp:193
+#: tdefile-plugin/tdefilemediaplugin.cpp:187
msgid "Free"
msgstr "未使用"
-#: tdefile-plugin/tdefilemediaplugin.cpp:196
+#: tdefile-plugin/tdefilemediaplugin.cpp:190
msgid "Used"
msgstr "使用中"
-#: tdefile-plugin/tdefilemediaplugin.cpp:199
+#: tdefile-plugin/tdefilemediaplugin.cpp:193
msgid "Total"
msgstr "合計"
-#: tdefile-plugin/tdefilemediaplugin.cpp:202
+#: tdefile-plugin/tdefilemediaplugin.cpp:196
msgid "Base URL"
msgstr "ベース URL"
-#: tdefile-plugin/tdefilemediaplugin.cpp:203
+#: tdefile-plugin/tdefilemediaplugin.cpp:197
msgid "Mount Point"
msgstr "マウントポイント"
-#: tdefile-plugin/tdefilemediaplugin.cpp:204
+#: tdefile-plugin/tdefilemediaplugin.cpp:198
msgid "Device Node"
msgstr "デバイスノード"
-#: tdefile-plugin/tdefilemediaplugin.cpp:206
+#: tdefile-plugin/tdefilemediaplugin.cpp:200
msgid "Medium Summary"
msgstr "メディア概要"
-#: tdefile-plugin/tdefilemediaplugin.cpp:208
+#: tdefile-plugin/tdefilemediaplugin.cpp:202
msgid "Usage"
msgstr "使用状況"
-#: tdefile-plugin/tdefilemediaplugin.cpp:210
+#: tdefile-plugin/tdefilemediaplugin.cpp:204
msgid "Bar Graph"
msgstr "棒グラフ"
@@ -580,23 +594,30 @@ msgid ""
"devices are plugged in."
msgstr ""
-#: mediamanager/decryptdialog.ui:24 mounthelper/decryptdialog.ui:24
+#: mediamanager/unlockdialog.ui:24 mounthelper/unlockdialog.ui:24
#, no-c-format
msgid "Decrypting Storage Device"
msgstr ""
-#: mediamanager/decryptdialog.ui:109 mounthelper/decryptdialog.ui:109
+#: mediamanager/unlockdialog.ui:109
#, no-c-format
msgid ""
-"<p><b>%1</b> is an encrypted storage device.</p>\n"
-"<p>Please enter the password to decrypt the storage device.</p>"
+"<p><b>%1</b> is an encrypted locked storage device.</p>\n"
+"<p>Please enter the password to unlock the storage device.</p>"
msgstr ""
-#: mediamanager/decryptdialog.ui:131 mounthelper/decryptdialog.ui:131
+#: mediamanager/unlockdialog.ui:131 mounthelper/unlockdialog.ui:131
#, no-c-format
msgid "&Password:"
msgstr ""
+#: mounthelper/unlockdialog.ui:109
+#, no-c-format
+msgid ""
+"<p><b>%1</b> is an encrypted storage device.</p>\n"
+"<p>Please enter the password to decrypt the storage device.</p>"
+msgstr ""
+
#: propsdlgplugin/propertiespagegui.ui:16
#, no-c-format
msgid "PropertiesPageGUI"
@@ -861,3 +882,7 @@ msgstr "混合"
#, no-c-format
msgid "Filesystem: iso9660"
msgstr "ファイルシステム: iso9660"
+
+#, 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 3c641bd3250..4b6003bb9f0 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: 2019-01-13 18:47+0100\n"
+"POT-Creation-Date: 2019-07-11 02:33+0200\n"
"PO-Revision-Date: 2006-11-20 10:27+0600\n"
"Last-Translator: Sairan Kikkarin <sairan@computer.org>\n"
"Language-Team: Kazakh\n"
@@ -46,7 +46,6 @@ msgstr "Беймәлім"
#: mediaimpl.cpp:88 mediaimpl.cpp:115 mediaimpl.cpp:141 mediaimpl.cpp:177
#: mediaimpl.cpp:197 mediaimpl.cpp:218
#: mounthelper/tdeio_media_mounthelper.cpp:50
-#: mounthelper/tdeio_media_mounthelper.cpp:256
msgid "The TDE mediamanager is not running."
msgstr "TDE mediamanager жегілмеген."
@@ -54,7 +53,7 @@ msgstr "TDE mediamanager жегілмеген."
msgid "This media name already exists."
msgstr "Былай аталған тасушысы бар ғой."
-#: mediaimpl.cpp:230 mediaimpl.cpp:293
+#: mediaimpl.cpp:230 mediaimpl.cpp:297
msgid "No such medium."
msgstr ""
@@ -62,320 +61,328 @@ msgstr ""
msgid "The drive is encrypted."
msgstr ""
-#: mediaimpl.cpp:272 mediamanager/halbackend.cpp:1264
-#: mediamanager/halbackend.cpp:1273 mediamanager/halbackend.cpp:1663
-#: mediamanager/halbackend.cpp:1680 mediamanager/halbackend.cpp:1691
-#: mediamanager/halbackend.cpp:1793 mediamanager/halbackend.cpp:1801
-#: mediamanager/halbackend.cpp:1808 mediamanager/halbackend.cpp:1848
-#: mediamanager/halbackend.cpp:1854 mediamanager/halbackend.cpp:1861
-#: mounthelper/tdeio_media_mounthelper.cpp:58
-msgid "Internal Error"
+#: mediaimpl.cpp:274 mediamanager/tdehardwarebackend.cpp:201
+#: mediamanager/tdehardwarebackend.cpp:252
+#: mounthelper/tdeio_media_mounthelper.cpp:202
+msgid "Unknown mount error."
msgstr ""
#: mediamanager/dialog.cpp:26 mounthelper/dialog.cpp:26
-msgid "Decrypt"
+msgid "Unlock"
msgstr ""
-#: mediamanager/fstabbackend.cpp:104 mediamanager/fstabbackend.cpp:114
-#: mediamanager/halbackend.cpp:1595 mediamanager/halbackend.cpp:1617
-#: mediamanager/halbackend.cpp:1776 mediamanager/halbackend.cpp:1831
-#: mediamanager/tdehardwarebackend.cpp:1349
-#: mediamanager/tdehardwarebackend.cpp:1360
+#: mediamanager/fstabbackend.cpp:105 mediamanager/fstabbackend.cpp:120
+#: mediamanager/halbackend.cpp:1598 mediamanager/halbackend.cpp:1625
+#: mediamanager/halbackend.cpp:1808 mediamanager/halbackend.cpp:1877
+#: mediamanager/mediamanager.cpp:363 mediamanager/mediamanager.cpp:375
+#: mediamanager/mediamanager.cpp:387 mediamanager/mediamanager.cpp:399
+#: mediamanager/tdehardwarebackend.cpp:1363
+#: mediamanager/tdehardwarebackend.cpp:1378
#, c-format
msgid "No such medium: %1"
msgstr ""
-#: mediamanager/fstabbackend.cpp:398
+#: mediamanager/fstabbackend.cpp:408
msgid "CD Recorder"
msgstr "Жазатын CD"
-#: mediamanager/fstabbackend.cpp:404
+#: mediamanager/fstabbackend.cpp:414
msgid "DVD"
msgstr "DVD"
-#: mediamanager/fstabbackend.cpp:415
+#: mediamanager/fstabbackend.cpp:425
msgid "CD-ROM"
msgstr "CD-ROM"
-#: mediamanager/fstabbackend.cpp:428
+#: mediamanager/fstabbackend.cpp:438
msgid "Floppy"
msgstr "Иілгіш дискі"
-#: mediamanager/fstabbackend.cpp:436
+#: mediamanager/fstabbackend.cpp:446
msgid "Zip Disk"
msgstr "Zip дискі"
-#: mediamanager/fstabbackend.cpp:447
+#: mediamanager/fstabbackend.cpp:457
msgid "Removable Device"
msgstr "Ауыстырмалы құрылғы"
-#: mediamanager/fstabbackend.cpp:452 mediamanager/fstabbackend.cpp:458
+#: mediamanager/fstabbackend.cpp:462 mediamanager/fstabbackend.cpp:468
msgid "Remote Share"
msgstr "Қашықтағы ресурс"
-#: mediamanager/fstabbackend.cpp:463
+#: mediamanager/fstabbackend.cpp:473
msgid "Hard Disk"
msgstr "Қатқыл дискі"
-#: mediamanager/halbackend.cpp:749 mediamanager/tdehardwarebackend.cpp:805
+#: mediamanager/halbackend.cpp:744 mediamanager/tdehardwarebackend.cpp:808
#, fuzzy
msgid "Unknown Drive"
msgstr "Беймәлім"
-#: mediamanager/halbackend.cpp:761 mediamanager/tdehardwarebackend.cpp:835
+#: mediamanager/halbackend.cpp:756 mediamanager/tdehardwarebackend.cpp:838
#, fuzzy
msgid "Floppy Drive"
msgstr "Иілгіш дискі"
-#: mediamanager/halbackend.cpp:769
+#: mediamanager/halbackend.cpp:764
#, fuzzy
msgid "Zip Drive"
msgstr "Zip дискі"
-#: mediamanager/halbackend.cpp:839 mediamanager/tdehardwarebackend.cpp:892
+#: mediamanager/halbackend.cpp:834 mediamanager/tdehardwarebackend.cpp:895
msgid "Camera"
msgstr "Фотокамера"
-#: mediamanager/halbackend.cpp:1221 mediamanager/halbackend.cpp:1247
+#: mediamanager/halbackend.cpp:1216 mediamanager/halbackend.cpp:1242
msgid "Authenticate"
msgstr ""
-#: mediamanager/halbackend.cpp:1222
+#: mediamanager/halbackend.cpp:1217
msgid ""
"<big><b>System policy prevents mounting internal media</b></big><br/"
">Authentication is required to perform this action. Please enter your "
"password to verify."
msgstr ""
-#: mediamanager/halbackend.cpp:1248
+#: mediamanager/halbackend.cpp:1243
msgid ""
"<big><b>System policy prevents unmounting media mounted by other users</b></"
"big><br/>Authentication is required to perform this action. Please enter "
"your password to verify."
msgstr ""
-#: mediamanager/halbackend.cpp:1284
+#: mediamanager/halbackend.cpp:1259 mediamanager/halbackend.cpp:1268
+#: mediamanager/halbackend.cpp:1849 mediamanager/halbackend.cpp:1916
+#: mounthelper/tdeio_media_mounthelper.cpp:58
+msgid "Internal Error"
+msgstr ""
+
+#: mediamanager/halbackend.cpp:1279
msgid "Invalid filesystem type"
msgstr ""
-#: mediamanager/halbackend.cpp:1286
+#: mediamanager/halbackend.cpp:1281
msgid ""
"Permission denied<p>Please ensure that:<br>1. You have permission to access "
"this device.<br>2. This device node is not listed in /etc/fstab.</p>"
msgstr ""
-#: mediamanager/halbackend.cpp:1290
+#: mediamanager/halbackend.cpp:1285
msgid "Device is already mounted."
msgstr ""
-#: mediamanager/halbackend.cpp:1340
+#: mediamanager/halbackend.cpp:1335
msgid ""
"Moreover, programs still using the device have been detected. They are "
"listed below. You have to close them or change their working directory "
"before attempting to unmount the device again."
msgstr ""
-#: mediamanager/halbackend.cpp:1381 mediamanager/tdehardwarebackend.cpp:1588
+#: mediamanager/halbackend.cpp:1376 mediamanager/tdehardwarebackend.cpp:1618
msgid ""
"Programs that were still using the device have been forcibly terminated. "
"They are listed below."
msgstr ""
-#: mediamanager/halbackend.cpp:1402 mediamanager/halbackend.cpp:1715
-#: mediamanager/tdehardwarebackend.cpp:1406
-#: mediamanager/tdehardwarebackend.cpp:1424
-#: mediamanager/tdehardwarebackend.cpp:1464
+#: mediamanager/halbackend.cpp:1397 mediamanager/halbackend.cpp:1742
+#: mediamanager/tdehardwarebackend.cpp:1430
+#: mediamanager/tdehardwarebackend.cpp:1452
+#: mediamanager/tdehardwarebackend.cpp:1494
msgid ""
"Unfortunately, the device <b>%1</b> (%2) named <b>'%3'</b> and currently "
"mounted at <b>%4</b> could not be unmounted. "
msgstr ""
-#: mediamanager/halbackend.cpp:1408 mediamanager/tdehardwarebackend.cpp:1470
+#: mediamanager/halbackend.cpp:1403 mediamanager/tdehardwarebackend.cpp:1500
msgid "The following error was returned by umount command:"
msgstr ""
-#: mediamanager/halbackend.cpp:1478
-msgid "Permission denied"
+#: mediamanager/halbackend.cpp:1567 mediamanager/tdehardwarebackend.cpp:1322
+msgid "Cannot mount encrypted locked drives!"
msgstr ""
-#: mediamanager/halbackend.cpp:1562 mediamanager/tdehardwarebackend.cpp:1232
-msgid "Cannot mount encrypted drives!"
+#: mediamanager/halbackend.cpp:1682 mediamanager/halbackend.cpp:1703
+#: mediamanager/halbackend.cpp:1716 mediamanager/halbackend.cpp:1830
+#: mediamanager/halbackend.cpp:1840 mediamanager/halbackend.cpp:1899
+#: mediamanager/halbackend.cpp:1907
+msgid "Internal error"
msgstr ""
-#: mediamanager/halbackend.cpp:1721
+#: mediamanager/halbackend.cpp:1694
+#, fuzzy
+#| msgid "Unknown"
+msgid "Unknown error"
+msgstr "Беймәлім"
+
+#: mediamanager/halbackend.cpp:1748
msgid "Unmounting failed due to the following error:"
msgstr ""
-#: mediamanager/halbackend.cpp:1723
+#: mediamanager/halbackend.cpp:1750
msgid "Device is Busy:"
msgstr ""
-#: mediamanager/halbackend.cpp:1727
+#: mediamanager/halbackend.cpp:1754
msgid ""
"Permission denied<p>Please ensure that:<br>1. You have permission to access "
"this device.<br>2. This device was originally mounted using TDE.</p>"
msgstr ""
-#: mediamanager/halbackend.cpp:1739
+#: mediamanager/halbackend.cpp:1766
msgid ""
"%1<p><b>Would you like to forcibly terminate these processes?</b><br><i>All "
"unsaved data would be lost</i>"
msgstr ""
-#: mediamanager/halbackend.cpp:1811
+#: mediamanager/halbackend.cpp:1852
msgid "Wrong password"
msgstr ""
-#: mediamanager/mediamanager.cpp:247 mediamanager/mediamanager.cpp:266
-#: mediamanager/mediamanager.cpp:285 mediamanager/mediamanager.cpp:293
-#: mediamanager/mediamanager.cpp:302 mediamanager/mediamanager.cpp:310
-msgid "Feature only available with HAL"
+#: mediamanager/mediamanager.cpp:248 mediamanager/mediamanager.cpp:275
+msgid "Feature only available with the TDE hardware backend"
msgstr ""
-#: mediamanager/mediamanager.cpp:252
-msgid "Feature only available with the TDE hardware backend"
+#: mediamanager/mediamanager.cpp:255 mediamanager/mediamanager.cpp:282
+#: mediamanager/mediamanager.cpp:312 mediamanager/mediamanager.cpp:343
+msgid "Feature only available with HAL"
msgstr ""
-#: mediamanager/mediamanager.cpp:256 mediamanager/mediamanager.cpp:271
-#: mediamanager/mediamanager.cpp:275
+#: mediamanager/mediamanager.cpp:262 mediamanager/mediamanager.cpp:289
+#: mediamanager/mediamanager.cpp:320 mediamanager/mediamanager.cpp:350
msgid "Feature only available with HAL or TDE hardware backend"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:480
-#: mediamanager/tdehardwarebackend.cpp:517
-#: mediamanager/tdehardwarebackend.cpp:750
+#: mediamanager/tdehardwarebackend.cpp:483
+#: mediamanager/tdehardwarebackend.cpp:520
+#: mediamanager/tdehardwarebackend.cpp:753
#, fuzzy
msgid "%1 Removable Device"
msgstr "Ауыстырмалы құрылғы"
-#: mediamanager/tdehardwarebackend.cpp:525
+#: mediamanager/tdehardwarebackend.cpp:528
#, fuzzy
msgid "Blank CD-ROM"
msgstr "CD-ROM"
-#: mediamanager/tdehardwarebackend.cpp:534
+#: mediamanager/tdehardwarebackend.cpp:537
msgid "Blank CD-R"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:543
+#: mediamanager/tdehardwarebackend.cpp:546
msgid "Blank CD-RW"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:552
+#: mediamanager/tdehardwarebackend.cpp:555
msgid "Blank Magneto-Optical CD"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:561
+#: mediamanager/tdehardwarebackend.cpp:564
msgid "Blank Mount Ranier CD-RW"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:570
+#: mediamanager/tdehardwarebackend.cpp:573
msgid "Blank Mount Ranier CD-RW-W"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:579
+#: mediamanager/tdehardwarebackend.cpp:582
msgid "Blank DVD-ROM"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:588
+#: mediamanager/tdehardwarebackend.cpp:591
msgid "Blank DVD-RAM"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:597
+#: mediamanager/tdehardwarebackend.cpp:600
msgid "Blank DVD-R"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:606
+#: mediamanager/tdehardwarebackend.cpp:609
msgid "Blank DVD-RW"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:615
+#: mediamanager/tdehardwarebackend.cpp:618
msgid "Blank Dual Layer DVD-R"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:624
+#: mediamanager/tdehardwarebackend.cpp:627
msgid "Blank Dual Layer DVD-RW"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:633
+#: mediamanager/tdehardwarebackend.cpp:636
msgid "Blank DVD+R"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:642
+#: mediamanager/tdehardwarebackend.cpp:645
msgid "Blank DVD+RW"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:651
+#: mediamanager/tdehardwarebackend.cpp:654
msgid "Blank Dual Layer DVD+R"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:660
+#: mediamanager/tdehardwarebackend.cpp:663
msgid "Blank Dual Layer DVD+RW"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:669
+#: mediamanager/tdehardwarebackend.cpp:672
msgid "Blank BD-ROM"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:678
+#: mediamanager/tdehardwarebackend.cpp:681
msgid "Blank BD-R"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:687
+#: mediamanager/tdehardwarebackend.cpp:690
msgid "Blank BD-RW"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:696
+#: mediamanager/tdehardwarebackend.cpp:699
msgid "Blank HDDVD-ROM"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:705
+#: mediamanager/tdehardwarebackend.cpp:708
msgid "Blank HDDVD-R"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:714
+#: mediamanager/tdehardwarebackend.cpp:717
msgid "Blank HDDVD-RW"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:721
+#: mediamanager/tdehardwarebackend.cpp:724
msgid "Audio CD"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:742
+#: mediamanager/tdehardwarebackend.cpp:745
msgid "%1 Fixed Disk (%2)"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:849
+#: mediamanager/tdehardwarebackend.cpp:852
#, fuzzy
msgid "%1 Zip Disk"
msgstr "Zip дискі"
-#: mediamanager/tdehardwarebackend.cpp:1212
-#: mediamanager/tdehardwarebackend.cpp:1392
-msgid "Internal error"
+#: mediamanager/tdehardwarebackend.cpp:1224
+#: mediamanager/tdehardwarebackend.cpp:1417
+msgid "Internal error. Couldn't find medium."
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:1239
-msgid ""
-"<qt>Unable to mount this device.<p>Potential reasons include:<br>Improper "
-"device and/or user privilege level<br>Corrupt data on storage device"
+#: mediamanager/tdehardwarebackend.cpp:1249
+#: mediamanager/tdehardwarebackend.cpp:1323
+msgid "Unable to mount this device."
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:1241
-#: mediamanager/tdehardwarebackend.cpp:1316
-#: mediamanager/tdehardwarebackend.cpp:1408
-#: mediamanager/tdehardwarebackend.cpp:1426
+#: mediamanager/tdehardwarebackend.cpp:1252
+#: mediamanager/tdehardwarebackend.cpp:1326
+#: mediamanager/tdehardwarebackend.cpp:1435
+#: mediamanager/tdehardwarebackend.cpp:1457
msgid "<p>Technical details:<br>"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:1314
-msgid ""
-"<qt>Unable to mount this device.<p>Potential reasons include:<br>Improper "
-"device and/or user privilege level<br>Corrupt data on storage "
-"device<br>Incorrect encryption password"
+#: mediamanager/tdehardwarebackend.cpp:1284
+msgid "Decryption aborted"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:1420
+#: mediamanager/tdehardwarebackend.cpp:1443
msgid ""
"<qt>The device <b>%1</b> (%2) named <b>'%3'</b> and currently mounted at <b>"
"%4</b> can not be unmounted at this time.<p>%5<p><b>Would you like to "
@@ -383,7 +390,7 @@ msgid ""
"lost</i>"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:1547
+#: mediamanager/tdehardwarebackend.cpp:1577
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 "
@@ -394,7 +401,7 @@ msgstr ""
msgid "%1 cannot be found."
msgstr "%1 деген табылмады."
-#: mounthelper/tdeio_media_mounthelper.cpp:86
+#: mounthelper/tdeio_media_mounthelper.cpp:87
msgid "%1 is not a mountable media."
msgstr "%1 тіркейтін тасушы емес."
@@ -404,40 +411,48 @@ msgid "%1 is not an encrypted media."
msgstr "%1 тіркейтін тасушы емес."
#: mounthelper/tdeio_media_mounthelper.cpp:107
-msgid "%1 is already decrypted."
+msgid "%1 is already unlocked."
msgstr ""
-#: mounthelper/tdeio_media_mounthelper.cpp:228
+#: mounthelper/tdeio_media_mounthelper.cpp:139
+msgid "Unknown unmount error."
+msgstr ""
+
+#: mounthelper/tdeio_media_mounthelper.cpp:246
msgid "The device was successfully unmounted, but the tray could not be opened"
msgstr ""
-#: mounthelper/tdeio_media_mounthelper.cpp:230
+#: mounthelper/tdeio_media_mounthelper.cpp:248
msgid "The device was successfully unmounted, but could not be ejected"
msgstr ""
-#: mounthelper/tdeio_media_mounthelper.cpp:275
+#: mounthelper/tdeio_media_mounthelper.cpp:281
+msgid "Unknown decrypt error."
+msgstr ""
+
+#: mounthelper/tdeio_media_mounthelper.cpp:295
#, fuzzy
msgid "Decrypt given URL"
msgstr "URL бойынша тіркеуден шығару"
-#: mounthelper/tdeio_media_mounthelper.cpp:276
+#: mounthelper/tdeio_media_mounthelper.cpp:296
msgid "Unmount given URL"
msgstr "URL бойынша тіркеуден шығару"
-#: mounthelper/tdeio_media_mounthelper.cpp:277
+#: mounthelper/tdeio_media_mounthelper.cpp:297
msgid "Mount given URL (default)"
msgstr "URL бойынша тіркеу (әдеттегі)"
-#: mounthelper/tdeio_media_mounthelper.cpp:278
+#: mounthelper/tdeio_media_mounthelper.cpp:298
msgid "Eject given URL via tdeeject"
msgstr "URL бойынша tdeeject арқылы алып-шығару"
-#: mounthelper/tdeio_media_mounthelper.cpp:279
+#: mounthelper/tdeio_media_mounthelper.cpp:299
msgid "Unmount and Eject given URL (necessary for some USB devices)"
msgstr ""
"URL бойынша тіркеуден шығарып, алып-шығару (кейбір USB құрылғыларға қажет)"
-#: mounthelper/tdeio_media_mounthelper.cpp:280
+#: mounthelper/tdeio_media_mounthelper.cpp:300
msgid "media:/ URL to mount/unmount/eject/remove"
msgstr "тіркеу/тіркеуден шығару/алып-шығару/алып тастау үшін media:/ URL"
@@ -459,43 +474,43 @@ msgstr ""
msgid "&Mounting"
msgstr "Тіркеу нүктесі"
-#: tdefile-plugin/tdefilemediaplugin.cpp:190
+#: tdefile-plugin/tdefilemediaplugin.cpp:184
msgid "Medium Information"
msgstr "Тасушының мәліметі"
-#: tdefile-plugin/tdefilemediaplugin.cpp:193
+#: tdefile-plugin/tdefilemediaplugin.cpp:187
msgid "Free"
msgstr "Бос"
-#: tdefile-plugin/tdefilemediaplugin.cpp:196
+#: tdefile-plugin/tdefilemediaplugin.cpp:190
msgid "Used"
msgstr "Пайдалануда"
-#: tdefile-plugin/tdefilemediaplugin.cpp:199
+#: tdefile-plugin/tdefilemediaplugin.cpp:193
msgid "Total"
msgstr "Жалпы"
-#: tdefile-plugin/tdefilemediaplugin.cpp:202
+#: tdefile-plugin/tdefilemediaplugin.cpp:196
msgid "Base URL"
msgstr "Негізгі URL"
-#: tdefile-plugin/tdefilemediaplugin.cpp:203
+#: tdefile-plugin/tdefilemediaplugin.cpp:197
msgid "Mount Point"
msgstr "Тіркеу нүктесі"
-#: tdefile-plugin/tdefilemediaplugin.cpp:204
+#: tdefile-plugin/tdefilemediaplugin.cpp:198
msgid "Device Node"
msgstr "Құрылғының көзі"
-#: tdefile-plugin/tdefilemediaplugin.cpp:206
+#: tdefile-plugin/tdefilemediaplugin.cpp:200
msgid "Medium Summary"
msgstr "Тасушының мәліметі"
-#: tdefile-plugin/tdefilemediaplugin.cpp:208
+#: tdefile-plugin/tdefilemediaplugin.cpp:202
msgid "Usage"
msgstr "Қолданыста"
-#: tdefile-plugin/tdefilemediaplugin.cpp:210
+#: tdefile-plugin/tdefilemediaplugin.cpp:204
msgid "Bar Graph"
msgstr "Жолақты диаграммасы"
@@ -567,23 +582,30 @@ msgid ""
"devices are plugged in."
msgstr ""
-#: mediamanager/decryptdialog.ui:24 mounthelper/decryptdialog.ui:24
+#: mediamanager/unlockdialog.ui:24 mounthelper/unlockdialog.ui:24
#, no-c-format
msgid "Decrypting Storage Device"
msgstr ""
-#: mediamanager/decryptdialog.ui:109 mounthelper/decryptdialog.ui:109
+#: mediamanager/unlockdialog.ui:109
#, no-c-format
msgid ""
-"<p><b>%1</b> is an encrypted storage device.</p>\n"
-"<p>Please enter the password to decrypt the storage device.</p>"
+"<p><b>%1</b> is an encrypted locked storage device.</p>\n"
+"<p>Please enter the password to unlock the storage device.</p>"
msgstr ""
-#: mediamanager/decryptdialog.ui:131 mounthelper/decryptdialog.ui:131
+#: mediamanager/unlockdialog.ui:131 mounthelper/unlockdialog.ui:131
#, no-c-format
msgid "&Password:"
msgstr ""
+#: mounthelper/unlockdialog.ui:109
+#, no-c-format
+msgid ""
+"<p><b>%1</b> is an encrypted storage device.</p>\n"
+"<p>Please enter the password to decrypt the storage device.</p>"
+msgstr ""
+
#: propsdlgplugin/propertiespagegui.ui:16
#, no-c-format
msgid "PropertiesPageGUI"
diff --git a/tde-i18n-km/messages/tdebase/tdeio_media.po b/tde-i18n-km/messages/tdebase/tdeio_media.po
index 68a0f1965b5..60bac2baf90 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: 2019-01-13 18:47+0100\n"
+"POT-Creation-Date: 2019-07-11 02:33+0200\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"
@@ -47,7 +47,6 @@ msgstr "មិន​ស្គាល់"
#: mediaimpl.cpp:88 mediaimpl.cpp:115 mediaimpl.cpp:141 mediaimpl.cpp:177
#: mediaimpl.cpp:197 mediaimpl.cpp:218
#: mounthelper/tdeio_media_mounthelper.cpp:50
-#: mounthelper/tdeio_media_mounthelper.cpp:256
msgid "The TDE mediamanager is not running."
msgstr "កម្មវិធី​គ្រប់​គ្រង​ឧបករណ៍​ផ្ទុក​របស់ TDE មិន​កំពុង​រត់​ឡើយ ។"
@@ -55,7 +54,7 @@ msgstr "កម្មវិធី​គ្រប់​គ្រង​ឧបករ
msgid "This media name already exists."
msgstr "ឈ្មោះ​ឧបករណ៍​ផ្ទុក​នេះ​មាន​រួច​ហើយ​ ។"
-#: mediaimpl.cpp:230 mediaimpl.cpp:293
+#: mediaimpl.cpp:230 mediaimpl.cpp:297
msgid "No such medium."
msgstr "គ្មាន​ឧបករណ៍​ផ្ទុក​ដូច​នេះ​ឡើយ"
@@ -63,110 +62,114 @@ msgstr "គ្មាន​ឧបករណ៍​ផ្ទុក​ដូច​ន
msgid "The drive is encrypted."
msgstr ""
-#: mediaimpl.cpp:272 mediamanager/halbackend.cpp:1264
-#: mediamanager/halbackend.cpp:1273 mediamanager/halbackend.cpp:1663
-#: mediamanager/halbackend.cpp:1680 mediamanager/halbackend.cpp:1691
-#: mediamanager/halbackend.cpp:1793 mediamanager/halbackend.cpp:1801
-#: mediamanager/halbackend.cpp:1808 mediamanager/halbackend.cpp:1848
-#: mediamanager/halbackend.cpp:1854 mediamanager/halbackend.cpp:1861
-#: mounthelper/tdeio_media_mounthelper.cpp:58
-msgid "Internal Error"
-msgstr "កំហុស​ខាង​ក្នុង"
+#: mediaimpl.cpp:274 mediamanager/tdehardwarebackend.cpp:201
+#: mediamanager/tdehardwarebackend.cpp:252
+#: mounthelper/tdeio_media_mounthelper.cpp:202
+msgid "Unknown mount error."
+msgstr ""
#: mediamanager/dialog.cpp:26 mounthelper/dialog.cpp:26
-msgid "Decrypt"
+msgid "Unlock"
msgstr ""
-#: mediamanager/fstabbackend.cpp:104 mediamanager/fstabbackend.cpp:114
-#: mediamanager/halbackend.cpp:1595 mediamanager/halbackend.cpp:1617
-#: mediamanager/halbackend.cpp:1776 mediamanager/halbackend.cpp:1831
-#: mediamanager/tdehardwarebackend.cpp:1349
-#: mediamanager/tdehardwarebackend.cpp:1360
+#: mediamanager/fstabbackend.cpp:105 mediamanager/fstabbackend.cpp:120
+#: mediamanager/halbackend.cpp:1598 mediamanager/halbackend.cpp:1625
+#: mediamanager/halbackend.cpp:1808 mediamanager/halbackend.cpp:1877
+#: mediamanager/mediamanager.cpp:363 mediamanager/mediamanager.cpp:375
+#: mediamanager/mediamanager.cpp:387 mediamanager/mediamanager.cpp:399
+#: mediamanager/tdehardwarebackend.cpp:1363
+#: mediamanager/tdehardwarebackend.cpp:1378
#, c-format
msgid "No such medium: %1"
msgstr "គ្មាន​ឧបករណ៍​ផ្ទុក​នេះ​ឡើយ ៖ %1"
-#: mediamanager/fstabbackend.cpp:398
+#: mediamanager/fstabbackend.cpp:408
msgid "CD Recorder"
msgstr "ឧបករណ៍​ថត​ស៊ីឌី"
-#: mediamanager/fstabbackend.cpp:404
+#: mediamanager/fstabbackend.cpp:414
msgid "DVD"
msgstr "ឌីវីឌី"
-#: mediamanager/fstabbackend.cpp:415
+#: mediamanager/fstabbackend.cpp:425
msgid "CD-ROM"
msgstr "ស៊ីឌីរ៉ូម"
-#: mediamanager/fstabbackend.cpp:428
+#: mediamanager/fstabbackend.cpp:438
msgid "Floppy"
msgstr "ថាស​ទន់"
-#: mediamanager/fstabbackend.cpp:436
+#: mediamanager/fstabbackend.cpp:446
msgid "Zip Disk"
msgstr "ថាសហ្ស៊ីប"
-#: mediamanager/fstabbackend.cpp:447
+#: mediamanager/fstabbackend.cpp:457
msgid "Removable Device"
msgstr "ឧបករណ៍​ដែល​អាច​យក​ចេញ"
-#: mediamanager/fstabbackend.cpp:452 mediamanager/fstabbackend.cpp:458
+#: mediamanager/fstabbackend.cpp:462 mediamanager/fstabbackend.cpp:468
msgid "Remote Share"
msgstr "ការ​ចែក​រំលែក​ពី​ចម្ងាយ"
-#: mediamanager/fstabbackend.cpp:463
+#: mediamanager/fstabbackend.cpp:473
msgid "Hard Disk"
msgstr "ថាស​រឹង"
-#: mediamanager/halbackend.cpp:749 mediamanager/tdehardwarebackend.cpp:805
+#: mediamanager/halbackend.cpp:744 mediamanager/tdehardwarebackend.cpp:808
msgid "Unknown Drive"
msgstr "មិន​ស្គាល់​ដ្រាយ"
-#: mediamanager/halbackend.cpp:761 mediamanager/tdehardwarebackend.cpp:835
+#: mediamanager/halbackend.cpp:756 mediamanager/tdehardwarebackend.cpp:838
msgid "Floppy Drive"
msgstr "ដ្រាយ​ថាសទន់"
-#: mediamanager/halbackend.cpp:769
+#: mediamanager/halbackend.cpp:764
msgid "Zip Drive"
msgstr "ដ្រាយ​ហ្ស៊ីប្ស៊ីប"
-#: mediamanager/halbackend.cpp:839 mediamanager/tdehardwarebackend.cpp:892
+#: mediamanager/halbackend.cpp:834 mediamanager/tdehardwarebackend.cpp:895
msgid "Camera"
msgstr "ម៉ាស៊ីនថត"
-#: mediamanager/halbackend.cpp:1221 mediamanager/halbackend.cpp:1247
+#: mediamanager/halbackend.cpp:1216 mediamanager/halbackend.cpp:1242
msgid "Authenticate"
msgstr ""
-#: mediamanager/halbackend.cpp:1222
+#: mediamanager/halbackend.cpp:1217
msgid ""
"<big><b>System policy prevents mounting internal media</b></big><br/"
">Authentication is required to perform this action. Please enter your "
"password to verify."
msgstr ""
-#: mediamanager/halbackend.cpp:1248
+#: mediamanager/halbackend.cpp:1243
msgid ""
"<big><b>System policy prevents unmounting media mounted by other users</b></"
"big><br/>Authentication is required to perform this action. Please enter "
"your password to verify."
msgstr ""
-#: mediamanager/halbackend.cpp:1284
+#: mediamanager/halbackend.cpp:1259 mediamanager/halbackend.cpp:1268
+#: mediamanager/halbackend.cpp:1849 mediamanager/halbackend.cpp:1916
+#: mounthelper/tdeio_media_mounthelper.cpp:58
+msgid "Internal Error"
+msgstr "កំហុស​ខាង​ក្នុង"
+
+#: mediamanager/halbackend.cpp:1279
msgid "Invalid filesystem type"
msgstr "ប្រភេទ​ប្រព័ន្ធ​ឯកសារ​មិន​ត្រឹមត្រូវ"
-#: mediamanager/halbackend.cpp:1286
+#: mediamanager/halbackend.cpp:1281
msgid ""
"Permission denied<p>Please ensure that:<br>1. You have permission to access "
"this device.<br>2. This device node is not listed in /etc/fstab.</p>"
msgstr ""
-#: mediamanager/halbackend.cpp:1290
+#: mediamanager/halbackend.cpp:1285
msgid "Device is already mounted."
msgstr "ឧបករណ៍​ត្រូវ​បាន​ម៉ោន​រួច​ហើយ ។"
-#: mediamanager/halbackend.cpp:1340
+#: mediamanager/halbackend.cpp:1335
msgid ""
"Moreover, programs still using the device have been detected. They are "
"listed below. You have to close them or change their working directory "
@@ -175,16 +178,16 @@ msgstr ""
"លើស​ពីនេះ​ទៀត កម្មវិធី​គឺ​នៅតែ​ប្រើ​ឧបករណ៍​ដែលបាន​រកឃើញ ។ ពួក​វា​ត្រូវបាន​រាយ​នៅខាងក្រោម ។ អ្នក​ត្រូវ​តែ​"
"បិទ​ពួកវា​ ឬ ផ្លាស់ប្ដូរ​ថតការងារ​របស់​ពួកវា​មុនពេល​អាន់ម៉ោន​ឧបករណ៍​ម្ដង​ទៀត ។"
-#: mediamanager/halbackend.cpp:1381 mediamanager/tdehardwarebackend.cpp:1588
+#: mediamanager/halbackend.cpp:1376 mediamanager/tdehardwarebackend.cpp:1618
msgid ""
"Programs that were still using the device have been forcibly terminated. "
"They are listed below."
msgstr ""
-#: mediamanager/halbackend.cpp:1402 mediamanager/halbackend.cpp:1715
-#: mediamanager/tdehardwarebackend.cpp:1406
-#: mediamanager/tdehardwarebackend.cpp:1424
-#: mediamanager/tdehardwarebackend.cpp:1464
+#: mediamanager/halbackend.cpp:1397 mediamanager/halbackend.cpp:1742
+#: mediamanager/tdehardwarebackend.cpp:1430
+#: mediamanager/tdehardwarebackend.cpp:1452
+#: mediamanager/tdehardwarebackend.cpp:1494
msgid ""
"Unfortunately, the device <b>%1</b> (%2) named <b>'%3'</b> and currently "
"mounted at <b>%4</b> could not be unmounted. "
@@ -192,196 +195,199 @@ msgstr ""
"ជា​អកុសល ឧបករណ៍ <b>%1</b> (%2) មាន​ឈ្មោះ <b>'%3'</b> ហើយ បច្ចុប្បន្ន​អ្វី​ដែលបាន​ម៉ោន​នៅ <b>"
"%4</b> គឺ មិន​អាច​អាន់​ម៉ោន​បាន​ទេ ។ "
-#: mediamanager/halbackend.cpp:1408 mediamanager/tdehardwarebackend.cpp:1470
+#: mediamanager/halbackend.cpp:1403 mediamanager/tdehardwarebackend.cpp:1500
msgid "The following error was returned by umount command:"
msgstr "បាន​ត្រឡប់​កំហុស​ដូច​ខាងក្រោម​ដោយ​ពាក្យ​បញ្ជា​អាន់​ម៉ោន ៖"
-#: mediamanager/halbackend.cpp:1478
+#: mediamanager/halbackend.cpp:1567 mediamanager/tdehardwarebackend.cpp:1322
+msgid "Cannot mount encrypted locked drives!"
+msgstr ""
+
+#: mediamanager/halbackend.cpp:1682 mediamanager/halbackend.cpp:1703
+#: mediamanager/halbackend.cpp:1716 mediamanager/halbackend.cpp:1830
+#: mediamanager/halbackend.cpp:1840 mediamanager/halbackend.cpp:1899
+#: mediamanager/halbackend.cpp:1907
#, fuzzy
-msgid "Permission denied"
-msgstr "សិទ្ធិ​ត្រូវ​បាន​បដិសេធ ។"
+msgid "Internal error"
+msgstr "កំហុស​ខាង​ក្នុង"
-#: mediamanager/halbackend.cpp:1562 mediamanager/tdehardwarebackend.cpp:1232
-msgid "Cannot mount encrypted drives!"
-msgstr ""
+#: mediamanager/halbackend.cpp:1694
+#, fuzzy
+#| msgid "Unknown"
+msgid "Unknown error"
+msgstr "មិន​ស្គាល់"
-#: mediamanager/halbackend.cpp:1721
+#: mediamanager/halbackend.cpp:1748
msgid "Unmounting failed due to the following error:"
msgstr "ការ​អាន់​ម៉ោន​បាន​បរាជ័យ គឺ​ដោយសារ​កំហុស​ដូច​តទៅ​នេះ ៖"
-#: mediamanager/halbackend.cpp:1723
+#: mediamanager/halbackend.cpp:1750
msgid "Device is Busy:"
msgstr "ឧបករណ៍​រវល់ ៖"
-#: mediamanager/halbackend.cpp:1727
+#: mediamanager/halbackend.cpp:1754
msgid ""
"Permission denied<p>Please ensure that:<br>1. You have permission to access "
"this device.<br>2. This device was originally mounted using TDE.</p>"
msgstr ""
-#: mediamanager/halbackend.cpp:1739
+#: mediamanager/halbackend.cpp:1766
msgid ""
"%1<p><b>Would you like to forcibly terminate these processes?</b><br><i>All "
"unsaved data would be lost</i>"
msgstr ""
-#: mediamanager/halbackend.cpp:1811
+#: mediamanager/halbackend.cpp:1852
msgid "Wrong password"
msgstr ""
-#: mediamanager/mediamanager.cpp:247 mediamanager/mediamanager.cpp:266
-#: mediamanager/mediamanager.cpp:285 mediamanager/mediamanager.cpp:293
-#: mediamanager/mediamanager.cpp:302 mediamanager/mediamanager.cpp:310
-msgid "Feature only available with HAL"
-msgstr "លក្ខណៈ​ពិសេស​អាច​ប្រើ​បាន​តែ​ជា​មួយ HAL ប៉ុណ្ណោះ"
-
-#: mediamanager/mediamanager.cpp:252
+#: mediamanager/mediamanager.cpp:248 mediamanager/mediamanager.cpp:275
#, fuzzy
msgid "Feature only available with the TDE hardware backend"
msgstr "លក្ខណៈ​ពិសេស​អាច​ប្រើ​បាន​តែ​ជា​មួយ HAL ប៉ុណ្ណោះ"
-#: mediamanager/mediamanager.cpp:256 mediamanager/mediamanager.cpp:271
-#: mediamanager/mediamanager.cpp:275
+#: mediamanager/mediamanager.cpp:255 mediamanager/mediamanager.cpp:282
+#: mediamanager/mediamanager.cpp:312 mediamanager/mediamanager.cpp:343
+msgid "Feature only available with HAL"
+msgstr "លក្ខណៈ​ពិសេស​អាច​ប្រើ​បាន​តែ​ជា​មួយ HAL ប៉ុណ្ណោះ"
+
+#: mediamanager/mediamanager.cpp:262 mediamanager/mediamanager.cpp:289
+#: mediamanager/mediamanager.cpp:320 mediamanager/mediamanager.cpp:350
#, fuzzy
msgid "Feature only available with HAL or TDE hardware backend"
msgstr "លក្ខណៈ​ពិសេស​អាច​ប្រើ​បាន​តែ​ជា​មួយ HAL ប៉ុណ្ណោះ"
-#: mediamanager/tdehardwarebackend.cpp:480
-#: mediamanager/tdehardwarebackend.cpp:517
-#: mediamanager/tdehardwarebackend.cpp:750
+#: mediamanager/tdehardwarebackend.cpp:483
+#: mediamanager/tdehardwarebackend.cpp:520
+#: mediamanager/tdehardwarebackend.cpp:753
#, fuzzy
msgid "%1 Removable Device"
msgstr "ឧបករណ៍​ដែល​អាច​យក​ចេញ"
-#: mediamanager/tdehardwarebackend.cpp:525
+#: mediamanager/tdehardwarebackend.cpp:528
#, fuzzy
msgid "Blank CD-ROM"
msgstr "ស៊ីឌីរ៉ូម"
-#: mediamanager/tdehardwarebackend.cpp:534
+#: mediamanager/tdehardwarebackend.cpp:537
msgid "Blank CD-R"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:543
+#: mediamanager/tdehardwarebackend.cpp:546
msgid "Blank CD-RW"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:552
+#: mediamanager/tdehardwarebackend.cpp:555
msgid "Blank Magneto-Optical CD"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:561
+#: mediamanager/tdehardwarebackend.cpp:564
msgid "Blank Mount Ranier CD-RW"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:570
+#: mediamanager/tdehardwarebackend.cpp:573
msgid "Blank Mount Ranier CD-RW-W"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:579
+#: mediamanager/tdehardwarebackend.cpp:582
msgid "Blank DVD-ROM"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:588
+#: mediamanager/tdehardwarebackend.cpp:591
msgid "Blank DVD-RAM"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:597
+#: mediamanager/tdehardwarebackend.cpp:600
msgid "Blank DVD-R"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:606
+#: mediamanager/tdehardwarebackend.cpp:609
msgid "Blank DVD-RW"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:615
+#: mediamanager/tdehardwarebackend.cpp:618
msgid "Blank Dual Layer DVD-R"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:624
+#: mediamanager/tdehardwarebackend.cpp:627
msgid "Blank Dual Layer DVD-RW"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:633
+#: mediamanager/tdehardwarebackend.cpp:636
msgid "Blank DVD+R"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:642
+#: mediamanager/tdehardwarebackend.cpp:645
msgid "Blank DVD+RW"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:651
+#: mediamanager/tdehardwarebackend.cpp:654
msgid "Blank Dual Layer DVD+R"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:660
+#: mediamanager/tdehardwarebackend.cpp:663
msgid "Blank Dual Layer DVD+RW"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:669
+#: mediamanager/tdehardwarebackend.cpp:672
msgid "Blank BD-ROM"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:678
+#: mediamanager/tdehardwarebackend.cpp:681
msgid "Blank BD-R"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:687
+#: mediamanager/tdehardwarebackend.cpp:690
msgid "Blank BD-RW"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:696
+#: mediamanager/tdehardwarebackend.cpp:699
msgid "Blank HDDVD-ROM"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:705
+#: mediamanager/tdehardwarebackend.cpp:708
msgid "Blank HDDVD-R"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:714
+#: mediamanager/tdehardwarebackend.cpp:717
msgid "Blank HDDVD-RW"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:721
+#: mediamanager/tdehardwarebackend.cpp:724
msgid "Audio CD"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:742
+#: mediamanager/tdehardwarebackend.cpp:745
msgid "%1 Fixed Disk (%2)"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:849
+#: mediamanager/tdehardwarebackend.cpp:852
#, fuzzy
msgid "%1 Zip Disk"
msgstr "ថាសហ្ស៊ីប"
-#: mediamanager/tdehardwarebackend.cpp:1212
-#: mediamanager/tdehardwarebackend.cpp:1392
-#, fuzzy
-msgid "Internal error"
-msgstr "កំហុស​ខាង​ក្នុង"
+#: mediamanager/tdehardwarebackend.cpp:1224
+#: mediamanager/tdehardwarebackend.cpp:1417
+msgid "Internal error. Couldn't find medium."
+msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:1239
-msgid ""
-"<qt>Unable to mount this device.<p>Potential reasons include:<br>Improper "
-"device and/or user privilege level<br>Corrupt data on storage device"
+#: mediamanager/tdehardwarebackend.cpp:1249
+#: mediamanager/tdehardwarebackend.cpp:1323
+msgid "Unable to mount this device."
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:1241
-#: mediamanager/tdehardwarebackend.cpp:1316
-#: mediamanager/tdehardwarebackend.cpp:1408
-#: mediamanager/tdehardwarebackend.cpp:1426
+#: mediamanager/tdehardwarebackend.cpp:1252
+#: mediamanager/tdehardwarebackend.cpp:1326
+#: mediamanager/tdehardwarebackend.cpp:1435
+#: mediamanager/tdehardwarebackend.cpp:1457
msgid "<p>Technical details:<br>"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:1314
-msgid ""
-"<qt>Unable to mount this device.<p>Potential reasons include:<br>Improper "
-"device and/or user privilege level<br>Corrupt data on storage "
-"device<br>Incorrect encryption password"
+#: mediamanager/tdehardwarebackend.cpp:1284
+msgid "Decryption aborted"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:1420
+#: mediamanager/tdehardwarebackend.cpp:1443
msgid ""
"<qt>The device <b>%1</b> (%2) named <b>'%3'</b> and currently mounted at <b>"
"%4</b> can not be unmounted at this time.<p>%5<p><b>Would you like to "
@@ -389,7 +395,7 @@ msgid ""
"lost</i>"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:1547
+#: mediamanager/tdehardwarebackend.cpp:1577
#, fuzzy
msgid ""
"Programs still using the device have been detected. They are listed below. "
@@ -403,7 +409,7 @@ msgstr ""
msgid "%1 cannot be found."
msgstr "រក​មិន​ឃើញ %1 ។"
-#: mounthelper/tdeio_media_mounthelper.cpp:86
+#: mounthelper/tdeio_media_mounthelper.cpp:87
msgid "%1 is not a mountable media."
msgstr "%1 មិន​មែន​ជា​ឧបករណ៍​ផ្ទុក​ដែល​អាចម៉ោន​បាន ។"
@@ -414,39 +420,47 @@ msgstr "%1 មិន​មែន​ជា​ឧបករណ៍​ផ្ទុក
#: mounthelper/tdeio_media_mounthelper.cpp:107
#, fuzzy
-msgid "%1 is already decrypted."
+msgid "%1 is already unlocked."
msgstr "ឧបករណ៍​ត្រូវ​បាន​ម៉ោន​រួច​ហើយ ។"
-#: mounthelper/tdeio_media_mounthelper.cpp:228
+#: mounthelper/tdeio_media_mounthelper.cpp:139
+msgid "Unknown unmount error."
+msgstr ""
+
+#: mounthelper/tdeio_media_mounthelper.cpp:246
msgid "The device was successfully unmounted, but the tray could not be opened"
msgstr "បាន​អាន់​ម៉ោន​ឧបករណ៍​ដោយ​​ជោគ​ជ័យ ប៉ុន្តែ​មិន​អាច​បើក​ថាស​បាន​ទេ"
-#: mounthelper/tdeio_media_mounthelper.cpp:230
+#: mounthelper/tdeio_media_mounthelper.cpp:248
msgid "The device was successfully unmounted, but could not be ejected"
msgstr "បាន​អាន់ម៉ោន​ឧបករណ៍​ដោយ​ជោគ​ជ័យ ប៉ុន្តែ​មិន​អាច​ច្រាន​ចេញ​បានទេ"
-#: mounthelper/tdeio_media_mounthelper.cpp:275
+#: mounthelper/tdeio_media_mounthelper.cpp:281
+msgid "Unknown decrypt error."
+msgstr ""
+
+#: mounthelper/tdeio_media_mounthelper.cpp:295
#, fuzzy
msgid "Decrypt given URL"
msgstr "អាន់ម៉ោន URL ដែល​បាន​ផ្ដល់ឲ្យ"
-#: mounthelper/tdeio_media_mounthelper.cpp:276
+#: mounthelper/tdeio_media_mounthelper.cpp:296
msgid "Unmount given URL"
msgstr "អាន់ម៉ោន URL ដែល​បាន​ផ្ដល់ឲ្យ"
-#: mounthelper/tdeio_media_mounthelper.cpp:277
+#: mounthelper/tdeio_media_mounthelper.cpp:297
msgid "Mount given URL (default)"
msgstr "ម៉ោន URL ដែល​បាន​ផ្ដល់​ឲ្យ (លំនាំដើម)"
-#: mounthelper/tdeio_media_mounthelper.cpp:278
+#: mounthelper/tdeio_media_mounthelper.cpp:298
msgid "Eject given URL via tdeeject"
msgstr "ច្រាន​ចោល URL ដែល​បាន​ផ្ដល់​ឲ្យ​តាម​រយៈ tdeeject"
-#: mounthelper/tdeio_media_mounthelper.cpp:279
+#: mounthelper/tdeio_media_mounthelper.cpp:299
msgid "Unmount and Eject given URL (necessary for some USB devices)"
msgstr "អាន់ម៉ោន និង​ច្រានចោល URL ដែល​បាន​ផ្ដល់​ឲ្យ (ចាំបាច់​ចំពោះឧបករណ៍ USB ខ្លះ)"
-#: mounthelper/tdeio_media_mounthelper.cpp:280
+#: mounthelper/tdeio_media_mounthelper.cpp:300
msgid "media:/ URL to mount/unmount/eject/remove"
msgstr "ឧបករណ៍​ផ្ទុក ៖/ URL ដែល​ត្រូវម៉ោន/អាន់ម៉ោន/​ច្រាន​ចោល/​យកចេញ"
@@ -467,43 +481,43 @@ msgstr "រក្សាទុក​ការ​ផ្លាស់ប្ដូរ
msgid "&Mounting"
msgstr "ការ​ម៉ោន"
-#: tdefile-plugin/tdefilemediaplugin.cpp:190
+#: tdefile-plugin/tdefilemediaplugin.cpp:184
msgid "Medium Information"
msgstr "ព័ត៌មានរបស់ឧបករណ៍​ផ្ទុក"
-#: tdefile-plugin/tdefilemediaplugin.cpp:193
+#: tdefile-plugin/tdefilemediaplugin.cpp:187
msgid "Free"
msgstr "ទំនេរ"
-#: tdefile-plugin/tdefilemediaplugin.cpp:196
+#: tdefile-plugin/tdefilemediaplugin.cpp:190
msgid "Used"
msgstr "បាន​ប្រើ"
-#: tdefile-plugin/tdefilemediaplugin.cpp:199
+#: tdefile-plugin/tdefilemediaplugin.cpp:193
msgid "Total"
msgstr "សរុប"
-#: tdefile-plugin/tdefilemediaplugin.cpp:202
+#: tdefile-plugin/tdefilemediaplugin.cpp:196
msgid "Base URL"
msgstr "URL គោល"
-#: tdefile-plugin/tdefilemediaplugin.cpp:203
+#: tdefile-plugin/tdefilemediaplugin.cpp:197
msgid "Mount Point"
msgstr "ចំណុច​ម៉ោន"
-#: tdefile-plugin/tdefilemediaplugin.cpp:204
+#: tdefile-plugin/tdefilemediaplugin.cpp:198
msgid "Device Node"
msgstr "ថ្នាំង​ឧបករណ៍"
-#: tdefile-plugin/tdefilemediaplugin.cpp:206
+#: tdefile-plugin/tdefilemediaplugin.cpp:200
msgid "Medium Summary"
msgstr "ការ​សង្ខេបអំពីឧបករណ៍​ផ្ទុក"
-#: tdefile-plugin/tdefilemediaplugin.cpp:208
+#: tdefile-plugin/tdefilemediaplugin.cpp:202
msgid "Usage"
msgstr "ការប្រើប្រាស់"
-#: tdefile-plugin/tdefilemediaplugin.cpp:210
+#: tdefile-plugin/tdefilemediaplugin.cpp:204
msgid "Bar Graph"
msgstr "របារ​ក្រាហ្វិក"
@@ -575,23 +589,30 @@ msgid ""
"devices are plugged in."
msgstr ""
-#: mediamanager/decryptdialog.ui:24 mounthelper/decryptdialog.ui:24
+#: mediamanager/unlockdialog.ui:24 mounthelper/unlockdialog.ui:24
#, no-c-format
msgid "Decrypting Storage Device"
msgstr ""
-#: mediamanager/decryptdialog.ui:109 mounthelper/decryptdialog.ui:109
+#: mediamanager/unlockdialog.ui:109
#, no-c-format
msgid ""
-"<p><b>%1</b> is an encrypted storage device.</p>\n"
-"<p>Please enter the password to decrypt the storage device.</p>"
+"<p><b>%1</b> is an encrypted locked storage device.</p>\n"
+"<p>Please enter the password to unlock the storage device.</p>"
msgstr ""
-#: mediamanager/decryptdialog.ui:131 mounthelper/decryptdialog.ui:131
+#: mediamanager/unlockdialog.ui:131 mounthelper/unlockdialog.ui:131
#, no-c-format
msgid "&Password:"
msgstr ""
+#: mounthelper/unlockdialog.ui:109
+#, no-c-format
+msgid ""
+"<p><b>%1</b> is an encrypted storage device.</p>\n"
+"<p>Please enter the password to decrypt the storage device.</p>"
+msgstr ""
+
#: propsdlgplugin/propertiespagegui.ui:16
#, no-c-format
msgid "PropertiesPageGUI"
@@ -844,3 +865,7 @@ msgstr "បាន​លាយ"
#, no-c-format
msgid "Filesystem: iso9660"
msgstr "ប្រព័ន្ធ​ឯកសារ ៖ iso9660"
+
+#, 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 b916008b04e..9f74eca3fb6 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: 2019-01-13 18:47+0100\n"
+"POT-Creation-Date: 2019-07-11 02:33+0200\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"
@@ -46,7 +46,6 @@ msgstr "알 수 없음"
#: mediaimpl.cpp:88 mediaimpl.cpp:115 mediaimpl.cpp:141 mediaimpl.cpp:177
#: mediaimpl.cpp:197 mediaimpl.cpp:218
#: mounthelper/tdeio_media_mounthelper.cpp:50
-#: mounthelper/tdeio_media_mounthelper.cpp:256
msgid "The TDE mediamanager is not running."
msgstr "TDE 미디어 매니저가 실행 중이지 않습니다."
@@ -54,7 +53,7 @@ msgstr "TDE 미디어 매니저가 실행 중이지 않습니다."
msgid "This media name already exists."
msgstr "이 미디어 이름이 이미 존재합니다."
-#: mediaimpl.cpp:230 mediaimpl.cpp:293
+#: mediaimpl.cpp:230 mediaimpl.cpp:297
msgid "No such medium."
msgstr ""
@@ -62,320 +61,328 @@ msgstr ""
msgid "The drive is encrypted."
msgstr ""
-#: mediaimpl.cpp:272 mediamanager/halbackend.cpp:1264
-#: mediamanager/halbackend.cpp:1273 mediamanager/halbackend.cpp:1663
-#: mediamanager/halbackend.cpp:1680 mediamanager/halbackend.cpp:1691
-#: mediamanager/halbackend.cpp:1793 mediamanager/halbackend.cpp:1801
-#: mediamanager/halbackend.cpp:1808 mediamanager/halbackend.cpp:1848
-#: mediamanager/halbackend.cpp:1854 mediamanager/halbackend.cpp:1861
-#: mounthelper/tdeio_media_mounthelper.cpp:58
-msgid "Internal Error"
+#: mediaimpl.cpp:274 mediamanager/tdehardwarebackend.cpp:201
+#: mediamanager/tdehardwarebackend.cpp:252
+#: mounthelper/tdeio_media_mounthelper.cpp:202
+msgid "Unknown mount error."
msgstr ""
#: mediamanager/dialog.cpp:26 mounthelper/dialog.cpp:26
-msgid "Decrypt"
+msgid "Unlock"
msgstr ""
-#: mediamanager/fstabbackend.cpp:104 mediamanager/fstabbackend.cpp:114
-#: mediamanager/halbackend.cpp:1595 mediamanager/halbackend.cpp:1617
-#: mediamanager/halbackend.cpp:1776 mediamanager/halbackend.cpp:1831
-#: mediamanager/tdehardwarebackend.cpp:1349
-#: mediamanager/tdehardwarebackend.cpp:1360
+#: mediamanager/fstabbackend.cpp:105 mediamanager/fstabbackend.cpp:120
+#: mediamanager/halbackend.cpp:1598 mediamanager/halbackend.cpp:1625
+#: mediamanager/halbackend.cpp:1808 mediamanager/halbackend.cpp:1877
+#: mediamanager/mediamanager.cpp:363 mediamanager/mediamanager.cpp:375
+#: mediamanager/mediamanager.cpp:387 mediamanager/mediamanager.cpp:399
+#: mediamanager/tdehardwarebackend.cpp:1363
+#: mediamanager/tdehardwarebackend.cpp:1378
#, c-format
msgid "No such medium: %1"
msgstr ""
-#: mediamanager/fstabbackend.cpp:398
+#: mediamanager/fstabbackend.cpp:408
msgid "CD Recorder"
msgstr "CD 레코더"
-#: mediamanager/fstabbackend.cpp:404
+#: mediamanager/fstabbackend.cpp:414
msgid "DVD"
msgstr "DVD"
-#: mediamanager/fstabbackend.cpp:415
+#: mediamanager/fstabbackend.cpp:425
msgid "CD-ROM"
msgstr "CD-ROM"
-#: mediamanager/fstabbackend.cpp:428
+#: mediamanager/fstabbackend.cpp:438
msgid "Floppy"
msgstr "플로피"
-#: mediamanager/fstabbackend.cpp:436
+#: mediamanager/fstabbackend.cpp:446
msgid "Zip Disk"
msgstr "Zip 디스크"
-#: mediamanager/fstabbackend.cpp:447
+#: mediamanager/fstabbackend.cpp:457
msgid "Removable Device"
msgstr "이동가능 장치"
-#: mediamanager/fstabbackend.cpp:452 mediamanager/fstabbackend.cpp:458
+#: mediamanager/fstabbackend.cpp:462 mediamanager/fstabbackend.cpp:468
msgid "Remote Share"
msgstr "원격 공유"
-#: mediamanager/fstabbackend.cpp:463
+#: mediamanager/fstabbackend.cpp:473
msgid "Hard Disk"
msgstr "하드 디스크"
-#: mediamanager/halbackend.cpp:749 mediamanager/tdehardwarebackend.cpp:805
+#: mediamanager/halbackend.cpp:744 mediamanager/tdehardwarebackend.cpp:808
#, fuzzy
msgid "Unknown Drive"
msgstr "알 수 없음"
-#: mediamanager/halbackend.cpp:761 mediamanager/tdehardwarebackend.cpp:835
+#: mediamanager/halbackend.cpp:756 mediamanager/tdehardwarebackend.cpp:838
#, fuzzy
msgid "Floppy Drive"
msgstr "플로피"
-#: mediamanager/halbackend.cpp:769
+#: mediamanager/halbackend.cpp:764
#, fuzzy
msgid "Zip Drive"
msgstr "Zip 디스크"
-#: mediamanager/halbackend.cpp:839 mediamanager/tdehardwarebackend.cpp:892
+#: mediamanager/halbackend.cpp:834 mediamanager/tdehardwarebackend.cpp:895
msgid "Camera"
msgstr "카메라"
-#: mediamanager/halbackend.cpp:1221 mediamanager/halbackend.cpp:1247
+#: mediamanager/halbackend.cpp:1216 mediamanager/halbackend.cpp:1242
msgid "Authenticate"
msgstr ""
-#: mediamanager/halbackend.cpp:1222
+#: mediamanager/halbackend.cpp:1217
msgid ""
"<big><b>System policy prevents mounting internal media</b></big><br/"
">Authentication is required to perform this action. Please enter your "
"password to verify."
msgstr ""
-#: mediamanager/halbackend.cpp:1248
+#: mediamanager/halbackend.cpp:1243
msgid ""
"<big><b>System policy prevents unmounting media mounted by other users</b></"
"big><br/>Authentication is required to perform this action. Please enter "
"your password to verify."
msgstr ""
-#: mediamanager/halbackend.cpp:1284
+#: mediamanager/halbackend.cpp:1259 mediamanager/halbackend.cpp:1268
+#: mediamanager/halbackend.cpp:1849 mediamanager/halbackend.cpp:1916
+#: mounthelper/tdeio_media_mounthelper.cpp:58
+msgid "Internal Error"
+msgstr ""
+
+#: mediamanager/halbackend.cpp:1279
msgid "Invalid filesystem type"
msgstr ""
-#: mediamanager/halbackend.cpp:1286
+#: mediamanager/halbackend.cpp:1281
msgid ""
"Permission denied<p>Please ensure that:<br>1. You have permission to access "
"this device.<br>2. This device node is not listed in /etc/fstab.</p>"
msgstr ""
-#: mediamanager/halbackend.cpp:1290
+#: mediamanager/halbackend.cpp:1285
msgid "Device is already mounted."
msgstr ""
-#: mediamanager/halbackend.cpp:1340
+#: mediamanager/halbackend.cpp:1335
msgid ""
"Moreover, programs still using the device have been detected. They are "
"listed below. You have to close them or change their working directory "
"before attempting to unmount the device again."
msgstr ""
-#: mediamanager/halbackend.cpp:1381 mediamanager/tdehardwarebackend.cpp:1588
+#: mediamanager/halbackend.cpp:1376 mediamanager/tdehardwarebackend.cpp:1618
msgid ""
"Programs that were still using the device have been forcibly terminated. "
"They are listed below."
msgstr ""
-#: mediamanager/halbackend.cpp:1402 mediamanager/halbackend.cpp:1715
-#: mediamanager/tdehardwarebackend.cpp:1406
-#: mediamanager/tdehardwarebackend.cpp:1424
-#: mediamanager/tdehardwarebackend.cpp:1464
+#: mediamanager/halbackend.cpp:1397 mediamanager/halbackend.cpp:1742
+#: mediamanager/tdehardwarebackend.cpp:1430
+#: mediamanager/tdehardwarebackend.cpp:1452
+#: mediamanager/tdehardwarebackend.cpp:1494
msgid ""
"Unfortunately, the device <b>%1</b> (%2) named <b>'%3'</b> and currently "
"mounted at <b>%4</b> could not be unmounted. "
msgstr ""
-#: mediamanager/halbackend.cpp:1408 mediamanager/tdehardwarebackend.cpp:1470
+#: mediamanager/halbackend.cpp:1403 mediamanager/tdehardwarebackend.cpp:1500
msgid "The following error was returned by umount command:"
msgstr ""
-#: mediamanager/halbackend.cpp:1478
-msgid "Permission denied"
+#: mediamanager/halbackend.cpp:1567 mediamanager/tdehardwarebackend.cpp:1322
+msgid "Cannot mount encrypted locked drives!"
msgstr ""
-#: mediamanager/halbackend.cpp:1562 mediamanager/tdehardwarebackend.cpp:1232
-msgid "Cannot mount encrypted drives!"
+#: mediamanager/halbackend.cpp:1682 mediamanager/halbackend.cpp:1703
+#: mediamanager/halbackend.cpp:1716 mediamanager/halbackend.cpp:1830
+#: mediamanager/halbackend.cpp:1840 mediamanager/halbackend.cpp:1899
+#: mediamanager/halbackend.cpp:1907
+msgid "Internal error"
msgstr ""
-#: mediamanager/halbackend.cpp:1721
+#: mediamanager/halbackend.cpp:1694
+#, fuzzy
+#| msgid "Unknown"
+msgid "Unknown error"
+msgstr "알 수 없음"
+
+#: mediamanager/halbackend.cpp:1748
msgid "Unmounting failed due to the following error:"
msgstr ""
-#: mediamanager/halbackend.cpp:1723
+#: mediamanager/halbackend.cpp:1750
msgid "Device is Busy:"
msgstr ""
-#: mediamanager/halbackend.cpp:1727
+#: mediamanager/halbackend.cpp:1754
msgid ""
"Permission denied<p>Please ensure that:<br>1. You have permission to access "
"this device.<br>2. This device was originally mounted using TDE.</p>"
msgstr ""
-#: mediamanager/halbackend.cpp:1739
+#: mediamanager/halbackend.cpp:1766
msgid ""
"%1<p><b>Would you like to forcibly terminate these processes?</b><br><i>All "
"unsaved data would be lost</i>"
msgstr ""
-#: mediamanager/halbackend.cpp:1811
+#: mediamanager/halbackend.cpp:1852
msgid "Wrong password"
msgstr ""
-#: mediamanager/mediamanager.cpp:247 mediamanager/mediamanager.cpp:266
-#: mediamanager/mediamanager.cpp:285 mediamanager/mediamanager.cpp:293
-#: mediamanager/mediamanager.cpp:302 mediamanager/mediamanager.cpp:310
-msgid "Feature only available with HAL"
+#: mediamanager/mediamanager.cpp:248 mediamanager/mediamanager.cpp:275
+msgid "Feature only available with the TDE hardware backend"
msgstr ""
-#: mediamanager/mediamanager.cpp:252
-msgid "Feature only available with the TDE hardware backend"
+#: mediamanager/mediamanager.cpp:255 mediamanager/mediamanager.cpp:282
+#: mediamanager/mediamanager.cpp:312 mediamanager/mediamanager.cpp:343
+msgid "Feature only available with HAL"
msgstr ""
-#: mediamanager/mediamanager.cpp:256 mediamanager/mediamanager.cpp:271
-#: mediamanager/mediamanager.cpp:275
+#: mediamanager/mediamanager.cpp:262 mediamanager/mediamanager.cpp:289
+#: mediamanager/mediamanager.cpp:320 mediamanager/mediamanager.cpp:350
msgid "Feature only available with HAL or TDE hardware backend"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:480
-#: mediamanager/tdehardwarebackend.cpp:517
-#: mediamanager/tdehardwarebackend.cpp:750
+#: mediamanager/tdehardwarebackend.cpp:483
+#: mediamanager/tdehardwarebackend.cpp:520
+#: mediamanager/tdehardwarebackend.cpp:753
#, fuzzy
msgid "%1 Removable Device"
msgstr "이동가능 장치"
-#: mediamanager/tdehardwarebackend.cpp:525
+#: mediamanager/tdehardwarebackend.cpp:528
#, fuzzy
msgid "Blank CD-ROM"
msgstr "CD-ROM"
-#: mediamanager/tdehardwarebackend.cpp:534
+#: mediamanager/tdehardwarebackend.cpp:537
msgid "Blank CD-R"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:543
+#: mediamanager/tdehardwarebackend.cpp:546
msgid "Blank CD-RW"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:552
+#: mediamanager/tdehardwarebackend.cpp:555
msgid "Blank Magneto-Optical CD"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:561
+#: mediamanager/tdehardwarebackend.cpp:564
msgid "Blank Mount Ranier CD-RW"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:570
+#: mediamanager/tdehardwarebackend.cpp:573
msgid "Blank Mount Ranier CD-RW-W"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:579
+#: mediamanager/tdehardwarebackend.cpp:582
msgid "Blank DVD-ROM"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:588
+#: mediamanager/tdehardwarebackend.cpp:591
msgid "Blank DVD-RAM"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:597
+#: mediamanager/tdehardwarebackend.cpp:600
msgid "Blank DVD-R"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:606
+#: mediamanager/tdehardwarebackend.cpp:609
msgid "Blank DVD-RW"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:615
+#: mediamanager/tdehardwarebackend.cpp:618
msgid "Blank Dual Layer DVD-R"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:624
+#: mediamanager/tdehardwarebackend.cpp:627
msgid "Blank Dual Layer DVD-RW"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:633
+#: mediamanager/tdehardwarebackend.cpp:636
msgid "Blank DVD+R"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:642
+#: mediamanager/tdehardwarebackend.cpp:645
msgid "Blank DVD+RW"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:651
+#: mediamanager/tdehardwarebackend.cpp:654
msgid "Blank Dual Layer DVD+R"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:660
+#: mediamanager/tdehardwarebackend.cpp:663
msgid "Blank Dual Layer DVD+RW"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:669
+#: mediamanager/tdehardwarebackend.cpp:672
msgid "Blank BD-ROM"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:678
+#: mediamanager/tdehardwarebackend.cpp:681
msgid "Blank BD-R"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:687
+#: mediamanager/tdehardwarebackend.cpp:690
msgid "Blank BD-RW"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:696
+#: mediamanager/tdehardwarebackend.cpp:699
msgid "Blank HDDVD-ROM"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:705
+#: mediamanager/tdehardwarebackend.cpp:708
msgid "Blank HDDVD-R"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:714
+#: mediamanager/tdehardwarebackend.cpp:717
msgid "Blank HDDVD-RW"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:721
+#: mediamanager/tdehardwarebackend.cpp:724
msgid "Audio CD"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:742
+#: mediamanager/tdehardwarebackend.cpp:745
msgid "%1 Fixed Disk (%2)"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:849
+#: mediamanager/tdehardwarebackend.cpp:852
#, fuzzy
msgid "%1 Zip Disk"
msgstr "Zip 디스크"
-#: mediamanager/tdehardwarebackend.cpp:1212
-#: mediamanager/tdehardwarebackend.cpp:1392
-msgid "Internal error"
+#: mediamanager/tdehardwarebackend.cpp:1224
+#: mediamanager/tdehardwarebackend.cpp:1417
+msgid "Internal error. Couldn't find medium."
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:1239
-msgid ""
-"<qt>Unable to mount this device.<p>Potential reasons include:<br>Improper "
-"device and/or user privilege level<br>Corrupt data on storage device"
+#: mediamanager/tdehardwarebackend.cpp:1249
+#: mediamanager/tdehardwarebackend.cpp:1323
+msgid "Unable to mount this device."
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:1241
-#: mediamanager/tdehardwarebackend.cpp:1316
-#: mediamanager/tdehardwarebackend.cpp:1408
-#: mediamanager/tdehardwarebackend.cpp:1426
+#: mediamanager/tdehardwarebackend.cpp:1252
+#: mediamanager/tdehardwarebackend.cpp:1326
+#: mediamanager/tdehardwarebackend.cpp:1435
+#: mediamanager/tdehardwarebackend.cpp:1457
msgid "<p>Technical details:<br>"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:1314
-msgid ""
-"<qt>Unable to mount this device.<p>Potential reasons include:<br>Improper "
-"device and/or user privilege level<br>Corrupt data on storage "
-"device<br>Incorrect encryption password"
+#: mediamanager/tdehardwarebackend.cpp:1284
+msgid "Decryption aborted"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:1420
+#: mediamanager/tdehardwarebackend.cpp:1443
msgid ""
"<qt>The device <b>%1</b> (%2) named <b>'%3'</b> and currently mounted at <b>"
"%4</b> can not be unmounted at this time.<p>%5<p><b>Would you like to "
@@ -383,7 +390,7 @@ msgid ""
"lost</i>"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:1547
+#: mediamanager/tdehardwarebackend.cpp:1577
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 "
@@ -394,7 +401,7 @@ msgstr ""
msgid "%1 cannot be found."
msgstr "%1을(를) 찾을 수 없습니다."
-#: mounthelper/tdeio_media_mounthelper.cpp:86
+#: mounthelper/tdeio_media_mounthelper.cpp:87
msgid "%1 is not a mountable media."
msgstr "%1은(는) 마운트 할 수 있는 미디어가 아닙니다."
@@ -404,39 +411,47 @@ msgid "%1 is not an encrypted media."
msgstr "%1은(는) 마운트 할 수 있는 미디어가 아닙니다."
#: mounthelper/tdeio_media_mounthelper.cpp:107
-msgid "%1 is already decrypted."
+msgid "%1 is already unlocked."
msgstr ""
-#: mounthelper/tdeio_media_mounthelper.cpp:228
+#: mounthelper/tdeio_media_mounthelper.cpp:139
+msgid "Unknown unmount error."
+msgstr ""
+
+#: mounthelper/tdeio_media_mounthelper.cpp:246
msgid "The device was successfully unmounted, but the tray could not be opened"
msgstr ""
-#: mounthelper/tdeio_media_mounthelper.cpp:230
+#: mounthelper/tdeio_media_mounthelper.cpp:248
msgid "The device was successfully unmounted, but could not be ejected"
msgstr ""
-#: mounthelper/tdeio_media_mounthelper.cpp:275
+#: mounthelper/tdeio_media_mounthelper.cpp:281
+msgid "Unknown decrypt error."
+msgstr ""
+
+#: mounthelper/tdeio_media_mounthelper.cpp:295
#, fuzzy
msgid "Decrypt given URL"
msgstr "URL 언마운트"
-#: mounthelper/tdeio_media_mounthelper.cpp:276
+#: mounthelper/tdeio_media_mounthelper.cpp:296
msgid "Unmount given URL"
msgstr "URL 언마운트"
-#: mounthelper/tdeio_media_mounthelper.cpp:277
+#: mounthelper/tdeio_media_mounthelper.cpp:297
msgid "Mount given URL (default)"
msgstr "URL 마운트 (기본설정)"
-#: mounthelper/tdeio_media_mounthelper.cpp:278
+#: mounthelper/tdeio_media_mounthelper.cpp:298
msgid "Eject given URL via tdeeject"
msgstr "URL을 Tdeeject로 꺼냄"
-#: mounthelper/tdeio_media_mounthelper.cpp:279
+#: mounthelper/tdeio_media_mounthelper.cpp:299
msgid "Unmount and Eject given URL (necessary for some USB devices)"
msgstr "URL 언마운트 및 배출(몇몇 USB 디바이스가 필요합니다.)"
-#: mounthelper/tdeio_media_mounthelper.cpp:280
+#: mounthelper/tdeio_media_mounthelper.cpp:300
msgid "media:/ URL to mount/unmount/eject/remove"
msgstr "media:/ URL을 마운트/마운트 해제/배출/제거"
@@ -458,43 +473,43 @@ msgstr ""
msgid "&Mounting"
msgstr "마운트 지점"
-#: tdefile-plugin/tdefilemediaplugin.cpp:190
+#: tdefile-plugin/tdefilemediaplugin.cpp:184
msgid "Medium Information"
msgstr "미디어 정보"
-#: tdefile-plugin/tdefilemediaplugin.cpp:193
+#: tdefile-plugin/tdefilemediaplugin.cpp:187
msgid "Free"
msgstr "여유 공간"
-#: tdefile-plugin/tdefilemediaplugin.cpp:196
+#: tdefile-plugin/tdefilemediaplugin.cpp:190
msgid "Used"
msgstr "사용 공간"
-#: tdefile-plugin/tdefilemediaplugin.cpp:199
+#: tdefile-plugin/tdefilemediaplugin.cpp:193
msgid "Total"
msgstr "전체 공간"
-#: tdefile-plugin/tdefilemediaplugin.cpp:202
+#: tdefile-plugin/tdefilemediaplugin.cpp:196
msgid "Base URL"
msgstr "기본 URL"
-#: tdefile-plugin/tdefilemediaplugin.cpp:203
+#: tdefile-plugin/tdefilemediaplugin.cpp:197
msgid "Mount Point"
msgstr "마운트 지점"
-#: tdefile-plugin/tdefilemediaplugin.cpp:204
+#: tdefile-plugin/tdefilemediaplugin.cpp:198
msgid "Device Node"
msgstr "장치 노드"
-#: tdefile-plugin/tdefilemediaplugin.cpp:206
+#: tdefile-plugin/tdefilemediaplugin.cpp:200
msgid "Medium Summary"
msgstr "미디어 요약"
-#: tdefile-plugin/tdefilemediaplugin.cpp:208
+#: tdefile-plugin/tdefilemediaplugin.cpp:202
msgid "Usage"
msgstr "사용량"
-#: tdefile-plugin/tdefilemediaplugin.cpp:210
+#: tdefile-plugin/tdefilemediaplugin.cpp:204
msgid "Bar Graph"
msgstr "막대 그래프"
@@ -566,23 +581,30 @@ msgid ""
"devices are plugged in."
msgstr ""
-#: mediamanager/decryptdialog.ui:24 mounthelper/decryptdialog.ui:24
+#: mediamanager/unlockdialog.ui:24 mounthelper/unlockdialog.ui:24
#, no-c-format
msgid "Decrypting Storage Device"
msgstr ""
-#: mediamanager/decryptdialog.ui:109 mounthelper/decryptdialog.ui:109
+#: mediamanager/unlockdialog.ui:109
#, no-c-format
msgid ""
-"<p><b>%1</b> is an encrypted storage device.</p>\n"
-"<p>Please enter the password to decrypt the storage device.</p>"
+"<p><b>%1</b> is an encrypted locked storage device.</p>\n"
+"<p>Please enter the password to unlock the storage device.</p>"
msgstr ""
-#: mediamanager/decryptdialog.ui:131 mounthelper/decryptdialog.ui:131
+#: mediamanager/unlockdialog.ui:131 mounthelper/unlockdialog.ui:131
#, no-c-format
msgid "&Password:"
msgstr ""
+#: mounthelper/unlockdialog.ui:109
+#, no-c-format
+msgid ""
+"<p><b>%1</b> is an encrypted storage device.</p>\n"
+"<p>Please enter the password to decrypt the storage device.</p>"
+msgstr ""
+
#: propsdlgplugin/propertiespagegui.ui:16
#, no-c-format
msgid "PropertiesPageGUI"
diff --git a/tde-i18n-lt/messages/tdebase/tdeio_media.po b/tde-i18n-lt/messages/tdebase/tdeio_media.po
index a91e96c0735..6307a431f67 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: 2019-01-13 18:47+0100\n"
+"POT-Creation-Date: 2019-07-11 02:33+0200\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"
@@ -49,7 +49,6 @@ 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
-#: mounthelper/tdeio_media_mounthelper.cpp:256
msgid "The TDE mediamanager is not running."
msgstr "TDE media tvarkyklė neveikia."
@@ -57,7 +56,7 @@ msgstr "TDE media tvarkyklė neveikia."
msgid "This media name already exists."
msgstr "Toks įrenginio pavadinimas jau yra."
-#: mediaimpl.cpp:230 mediaimpl.cpp:293
+#: mediaimpl.cpp:230 mediaimpl.cpp:297
msgid "No such medium."
msgstr ""
@@ -65,321 +64,329 @@ msgstr ""
msgid "The drive is encrypted."
msgstr ""
-#: mediaimpl.cpp:272 mediamanager/halbackend.cpp:1264
-#: mediamanager/halbackend.cpp:1273 mediamanager/halbackend.cpp:1663
-#: mediamanager/halbackend.cpp:1680 mediamanager/halbackend.cpp:1691
-#: mediamanager/halbackend.cpp:1793 mediamanager/halbackend.cpp:1801
-#: mediamanager/halbackend.cpp:1808 mediamanager/halbackend.cpp:1848
-#: mediamanager/halbackend.cpp:1854 mediamanager/halbackend.cpp:1861
-#: mounthelper/tdeio_media_mounthelper.cpp:58
-msgid "Internal Error"
-msgstr "Vidinė klaida"
+#: mediaimpl.cpp:274 mediamanager/tdehardwarebackend.cpp:201
+#: mediamanager/tdehardwarebackend.cpp:252
+#: mounthelper/tdeio_media_mounthelper.cpp:202
+msgid "Unknown mount error."
+msgstr ""
#: mediamanager/dialog.cpp:26 mounthelper/dialog.cpp:26
-msgid "Decrypt"
+msgid "Unlock"
msgstr ""
-#: mediamanager/fstabbackend.cpp:104 mediamanager/fstabbackend.cpp:114
-#: mediamanager/halbackend.cpp:1595 mediamanager/halbackend.cpp:1617
-#: mediamanager/halbackend.cpp:1776 mediamanager/halbackend.cpp:1831
-#: mediamanager/tdehardwarebackend.cpp:1349
-#: mediamanager/tdehardwarebackend.cpp:1360
+#: mediamanager/fstabbackend.cpp:105 mediamanager/fstabbackend.cpp:120
+#: mediamanager/halbackend.cpp:1598 mediamanager/halbackend.cpp:1625
+#: mediamanager/halbackend.cpp:1808 mediamanager/halbackend.cpp:1877
+#: mediamanager/mediamanager.cpp:363 mediamanager/mediamanager.cpp:375
+#: mediamanager/mediamanager.cpp:387 mediamanager/mediamanager.cpp:399
+#: mediamanager/tdehardwarebackend.cpp:1363
+#: mediamanager/tdehardwarebackend.cpp:1378
#, c-format
msgid "No such medium: %1"
msgstr ""
-#: mediamanager/fstabbackend.cpp:398
+#: mediamanager/fstabbackend.cpp:408
msgid "CD Recorder"
msgstr "CD rašymo įrenginys"
-#: mediamanager/fstabbackend.cpp:404
+#: mediamanager/fstabbackend.cpp:414
msgid "DVD"
msgstr "DVD"
-#: mediamanager/fstabbackend.cpp:415
+#: mediamanager/fstabbackend.cpp:425
msgid "CD-ROM"
msgstr "CD-ROM"
-#: mediamanager/fstabbackend.cpp:428
+#: mediamanager/fstabbackend.cpp:438
msgid "Floppy"
msgstr "Lankstus diskelis"
-#: mediamanager/fstabbackend.cpp:436
+#: mediamanager/fstabbackend.cpp:446
msgid "Zip Disk"
msgstr "Zip diskelis"
-#: mediamanager/fstabbackend.cpp:447
+#: mediamanager/fstabbackend.cpp:457
msgid "Removable Device"
msgstr "Pašalinamas įrenginys"
-#: mediamanager/fstabbackend.cpp:452 mediamanager/fstabbackend.cpp:458
+#: mediamanager/fstabbackend.cpp:462 mediamanager/fstabbackend.cpp:468
msgid "Remote Share"
msgstr "Nutolęs diskas"
-#: mediamanager/fstabbackend.cpp:463
+#: mediamanager/fstabbackend.cpp:473
msgid "Hard Disk"
msgstr "Kietas diskas"
-#: mediamanager/halbackend.cpp:749 mediamanager/tdehardwarebackend.cpp:805
+#: mediamanager/halbackend.cpp:744 mediamanager/tdehardwarebackend.cpp:808
#, fuzzy
msgid "Unknown Drive"
msgstr "Nežinoma"
-#: mediamanager/halbackend.cpp:761 mediamanager/tdehardwarebackend.cpp:835
+#: mediamanager/halbackend.cpp:756 mediamanager/tdehardwarebackend.cpp:838
#, fuzzy
msgid "Floppy Drive"
msgstr "Lankstus diskelis"
-#: mediamanager/halbackend.cpp:769
+#: mediamanager/halbackend.cpp:764
#, fuzzy
msgid "Zip Drive"
msgstr "Zip diskelis"
-#: mediamanager/halbackend.cpp:839 mediamanager/tdehardwarebackend.cpp:892
+#: mediamanager/halbackend.cpp:834 mediamanager/tdehardwarebackend.cpp:895
msgid "Camera"
msgstr "Fotoaparatas"
-#: mediamanager/halbackend.cpp:1221 mediamanager/halbackend.cpp:1247
+#: mediamanager/halbackend.cpp:1216 mediamanager/halbackend.cpp:1242
msgid "Authenticate"
msgstr ""
-#: mediamanager/halbackend.cpp:1222
+#: mediamanager/halbackend.cpp:1217
msgid ""
"<big><b>System policy prevents mounting internal media</b></big><br/"
">Authentication is required to perform this action. Please enter your "
"password to verify."
msgstr ""
-#: mediamanager/halbackend.cpp:1248
+#: mediamanager/halbackend.cpp:1243
msgid ""
"<big><b>System policy prevents unmounting media mounted by other users</b></"
"big><br/>Authentication is required to perform this action. Please enter "
"your password to verify."
msgstr ""
-#: mediamanager/halbackend.cpp:1284
+#: mediamanager/halbackend.cpp:1259 mediamanager/halbackend.cpp:1268
+#: mediamanager/halbackend.cpp:1849 mediamanager/halbackend.cpp:1916
+#: mounthelper/tdeio_media_mounthelper.cpp:58
+msgid "Internal Error"
+msgstr "Vidinė klaida"
+
+#: mediamanager/halbackend.cpp:1279
msgid "Invalid filesystem type"
msgstr ""
-#: mediamanager/halbackend.cpp:1286
+#: mediamanager/halbackend.cpp:1281
msgid ""
"Permission denied<p>Please ensure that:<br>1. You have permission to access "
"this device.<br>2. This device node is not listed in /etc/fstab.</p>"
msgstr ""
-#: mediamanager/halbackend.cpp:1290
+#: mediamanager/halbackend.cpp:1285
msgid "Device is already mounted."
msgstr ""
-#: mediamanager/halbackend.cpp:1340
+#: mediamanager/halbackend.cpp:1335
msgid ""
"Moreover, programs still using the device have been detected. They are "
"listed below. You have to close them or change their working directory "
"before attempting to unmount the device again."
msgstr ""
-#: mediamanager/halbackend.cpp:1381 mediamanager/tdehardwarebackend.cpp:1588
+#: mediamanager/halbackend.cpp:1376 mediamanager/tdehardwarebackend.cpp:1618
msgid ""
"Programs that were still using the device have been forcibly terminated. "
"They are listed below."
msgstr ""
-#: mediamanager/halbackend.cpp:1402 mediamanager/halbackend.cpp:1715
-#: mediamanager/tdehardwarebackend.cpp:1406
-#: mediamanager/tdehardwarebackend.cpp:1424
-#: mediamanager/tdehardwarebackend.cpp:1464
+#: mediamanager/halbackend.cpp:1397 mediamanager/halbackend.cpp:1742
+#: mediamanager/tdehardwarebackend.cpp:1430
+#: mediamanager/tdehardwarebackend.cpp:1452
+#: mediamanager/tdehardwarebackend.cpp:1494
msgid ""
"Unfortunately, the device <b>%1</b> (%2) named <b>'%3'</b> and currently "
"mounted at <b>%4</b> could not be unmounted. "
msgstr ""
-#: mediamanager/halbackend.cpp:1408 mediamanager/tdehardwarebackend.cpp:1470
+#: mediamanager/halbackend.cpp:1403 mediamanager/tdehardwarebackend.cpp:1500
msgid "The following error was returned by umount command:"
msgstr ""
-#: mediamanager/halbackend.cpp:1478
-msgid "Permission denied"
+#: mediamanager/halbackend.cpp:1567 mediamanager/tdehardwarebackend.cpp:1322
+msgid "Cannot mount encrypted locked drives!"
msgstr ""
-#: mediamanager/halbackend.cpp:1562 mediamanager/tdehardwarebackend.cpp:1232
-msgid "Cannot mount encrypted drives!"
-msgstr ""
+#: mediamanager/halbackend.cpp:1682 mediamanager/halbackend.cpp:1703
+#: mediamanager/halbackend.cpp:1716 mediamanager/halbackend.cpp:1830
+#: mediamanager/halbackend.cpp:1840 mediamanager/halbackend.cpp:1899
+#: mediamanager/halbackend.cpp:1907
+#, fuzzy
+msgid "Internal error"
+msgstr "Vidinė klaida"
-#: mediamanager/halbackend.cpp:1721
+#: mediamanager/halbackend.cpp:1694
+#, fuzzy
+#| msgid "Unknown"
+msgid "Unknown error"
+msgstr "Nežinoma"
+
+#: mediamanager/halbackend.cpp:1748
msgid "Unmounting failed due to the following error:"
msgstr ""
-#: mediamanager/halbackend.cpp:1723
+#: mediamanager/halbackend.cpp:1750
msgid "Device is Busy:"
msgstr ""
-#: mediamanager/halbackend.cpp:1727
+#: mediamanager/halbackend.cpp:1754
msgid ""
"Permission denied<p>Please ensure that:<br>1. You have permission to access "
"this device.<br>2. This device was originally mounted using TDE.</p>"
msgstr ""
-#: mediamanager/halbackend.cpp:1739
+#: mediamanager/halbackend.cpp:1766
msgid ""
"%1<p><b>Would you like to forcibly terminate these processes?</b><br><i>All "
"unsaved data would be lost</i>"
msgstr ""
-#: mediamanager/halbackend.cpp:1811
+#: mediamanager/halbackend.cpp:1852
msgid "Wrong password"
msgstr ""
-#: mediamanager/mediamanager.cpp:247 mediamanager/mediamanager.cpp:266
-#: mediamanager/mediamanager.cpp:285 mediamanager/mediamanager.cpp:293
-#: mediamanager/mediamanager.cpp:302 mediamanager/mediamanager.cpp:310
-msgid "Feature only available with HAL"
+#: mediamanager/mediamanager.cpp:248 mediamanager/mediamanager.cpp:275
+msgid "Feature only available with the TDE hardware backend"
msgstr ""
-#: mediamanager/mediamanager.cpp:252
-msgid "Feature only available with the TDE hardware backend"
+#: mediamanager/mediamanager.cpp:255 mediamanager/mediamanager.cpp:282
+#: mediamanager/mediamanager.cpp:312 mediamanager/mediamanager.cpp:343
+msgid "Feature only available with HAL"
msgstr ""
-#: mediamanager/mediamanager.cpp:256 mediamanager/mediamanager.cpp:271
-#: mediamanager/mediamanager.cpp:275
+#: mediamanager/mediamanager.cpp:262 mediamanager/mediamanager.cpp:289
+#: mediamanager/mediamanager.cpp:320 mediamanager/mediamanager.cpp:350
msgid "Feature only available with HAL or TDE hardware backend"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:480
-#: mediamanager/tdehardwarebackend.cpp:517
-#: mediamanager/tdehardwarebackend.cpp:750
+#: mediamanager/tdehardwarebackend.cpp:483
+#: mediamanager/tdehardwarebackend.cpp:520
+#: mediamanager/tdehardwarebackend.cpp:753
#, fuzzy
msgid "%1 Removable Device"
msgstr "Pašalinamas įrenginys"
-#: mediamanager/tdehardwarebackend.cpp:525
+#: mediamanager/tdehardwarebackend.cpp:528
#, fuzzy
msgid "Blank CD-ROM"
msgstr "CD-ROM"
-#: mediamanager/tdehardwarebackend.cpp:534
+#: mediamanager/tdehardwarebackend.cpp:537
msgid "Blank CD-R"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:543
+#: mediamanager/tdehardwarebackend.cpp:546
msgid "Blank CD-RW"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:552
+#: mediamanager/tdehardwarebackend.cpp:555
msgid "Blank Magneto-Optical CD"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:561
+#: mediamanager/tdehardwarebackend.cpp:564
msgid "Blank Mount Ranier CD-RW"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:570
+#: mediamanager/tdehardwarebackend.cpp:573
msgid "Blank Mount Ranier CD-RW-W"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:579
+#: mediamanager/tdehardwarebackend.cpp:582
msgid "Blank DVD-ROM"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:588
+#: mediamanager/tdehardwarebackend.cpp:591
msgid "Blank DVD-RAM"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:597
+#: mediamanager/tdehardwarebackend.cpp:600
msgid "Blank DVD-R"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:606
+#: mediamanager/tdehardwarebackend.cpp:609
msgid "Blank DVD-RW"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:615
+#: mediamanager/tdehardwarebackend.cpp:618
msgid "Blank Dual Layer DVD-R"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:624
+#: mediamanager/tdehardwarebackend.cpp:627
msgid "Blank Dual Layer DVD-RW"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:633
+#: mediamanager/tdehardwarebackend.cpp:636
msgid "Blank DVD+R"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:642
+#: mediamanager/tdehardwarebackend.cpp:645
msgid "Blank DVD+RW"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:651
+#: mediamanager/tdehardwarebackend.cpp:654
msgid "Blank Dual Layer DVD+R"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:660
+#: mediamanager/tdehardwarebackend.cpp:663
msgid "Blank Dual Layer DVD+RW"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:669
+#: mediamanager/tdehardwarebackend.cpp:672
msgid "Blank BD-ROM"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:678
+#: mediamanager/tdehardwarebackend.cpp:681
msgid "Blank BD-R"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:687
+#: mediamanager/tdehardwarebackend.cpp:690
msgid "Blank BD-RW"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:696
+#: mediamanager/tdehardwarebackend.cpp:699
msgid "Blank HDDVD-ROM"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:705
+#: mediamanager/tdehardwarebackend.cpp:708
msgid "Blank HDDVD-R"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:714
+#: mediamanager/tdehardwarebackend.cpp:717
msgid "Blank HDDVD-RW"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:721
+#: mediamanager/tdehardwarebackend.cpp:724
msgid "Audio CD"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:742
+#: mediamanager/tdehardwarebackend.cpp:745
msgid "%1 Fixed Disk (%2)"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:849
+#: mediamanager/tdehardwarebackend.cpp:852
#, fuzzy
msgid "%1 Zip Disk"
msgstr "Zip diskelis"
-#: mediamanager/tdehardwarebackend.cpp:1212
-#: mediamanager/tdehardwarebackend.cpp:1392
-#, fuzzy
-msgid "Internal error"
-msgstr "Vidinė klaida"
+#: mediamanager/tdehardwarebackend.cpp:1224
+#: mediamanager/tdehardwarebackend.cpp:1417
+msgid "Internal error. Couldn't find medium."
+msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:1239
-msgid ""
-"<qt>Unable to mount this device.<p>Potential reasons include:<br>Improper "
-"device and/or user privilege level<br>Corrupt data on storage device"
+#: mediamanager/tdehardwarebackend.cpp:1249
+#: mediamanager/tdehardwarebackend.cpp:1323
+msgid "Unable to mount this device."
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:1241
-#: mediamanager/tdehardwarebackend.cpp:1316
-#: mediamanager/tdehardwarebackend.cpp:1408
-#: mediamanager/tdehardwarebackend.cpp:1426
+#: mediamanager/tdehardwarebackend.cpp:1252
+#: mediamanager/tdehardwarebackend.cpp:1326
+#: mediamanager/tdehardwarebackend.cpp:1435
+#: mediamanager/tdehardwarebackend.cpp:1457
msgid "<p>Technical details:<br>"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:1314
-msgid ""
-"<qt>Unable to mount this device.<p>Potential reasons include:<br>Improper "
-"device and/or user privilege level<br>Corrupt data on storage "
-"device<br>Incorrect encryption password"
+#: mediamanager/tdehardwarebackend.cpp:1284
+msgid "Decryption aborted"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:1420
+#: mediamanager/tdehardwarebackend.cpp:1443
msgid ""
"<qt>The device <b>%1</b> (%2) named <b>'%3'</b> and currently mounted at <b>"
"%4</b> can not be unmounted at this time.<p>%5<p><b>Would you like to "
@@ -387,7 +394,7 @@ msgid ""
"lost</i>"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:1547
+#: mediamanager/tdehardwarebackend.cpp:1577
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 "
@@ -398,7 +405,7 @@ msgstr ""
msgid "%1 cannot be found."
msgstr "Nepavyko rasti %1."
-#: mounthelper/tdeio_media_mounthelper.cpp:86
+#: mounthelper/tdeio_media_mounthelper.cpp:87
msgid "%1 is not a mountable media."
msgstr "%1 nėra sumontuojamas saugojimo įrenginys."
@@ -408,40 +415,48 @@ msgid "%1 is not an encrypted media."
msgstr "%1 nėra sumontuojamas saugojimo įrenginys."
#: mounthelper/tdeio_media_mounthelper.cpp:107
-msgid "%1 is already decrypted."
+msgid "%1 is already unlocked."
+msgstr ""
+
+#: mounthelper/tdeio_media_mounthelper.cpp:139
+msgid "Unknown unmount error."
msgstr ""
-#: mounthelper/tdeio_media_mounthelper.cpp:228
+#: mounthelper/tdeio_media_mounthelper.cpp:246
msgid "The device was successfully unmounted, but the tray could not be opened"
msgstr ""
-#: mounthelper/tdeio_media_mounthelper.cpp:230
+#: mounthelper/tdeio_media_mounthelper.cpp:248
msgid "The device was successfully unmounted, but could not be ejected"
msgstr ""
-#: mounthelper/tdeio_media_mounthelper.cpp:275
+#: mounthelper/tdeio_media_mounthelper.cpp:281
+msgid "Unknown decrypt error."
+msgstr ""
+
+#: mounthelper/tdeio_media_mounthelper.cpp:295
#, fuzzy
msgid "Decrypt given URL"
msgstr "Išmontuoti duotą URL"
-#: mounthelper/tdeio_media_mounthelper.cpp:276
+#: mounthelper/tdeio_media_mounthelper.cpp:296
msgid "Unmount given URL"
msgstr "Išmontuoti duotą URL"
-#: mounthelper/tdeio_media_mounthelper.cpp:277
+#: mounthelper/tdeio_media_mounthelper.cpp:297
msgid "Mount given URL (default)"
msgstr "Sumontuoti nurodytą URL (numatyta)"
-#: mounthelper/tdeio_media_mounthelper.cpp:278
+#: mounthelper/tdeio_media_mounthelper.cpp:298
msgid "Eject given URL via tdeeject"
msgstr "Išstumti nurodytą URL su „tdeeject“"
-#: mounthelper/tdeio_media_mounthelper.cpp:279
+#: mounthelper/tdeio_media_mounthelper.cpp:299
msgid "Unmount and Eject given URL (necessary for some USB devices)"
msgstr ""
"Išmontuoti ir išstumti nurodytą URL (būtina kai kuriems USB įrenginiams)"
-#: mounthelper/tdeio_media_mounthelper.cpp:280
+#: mounthelper/tdeio_media_mounthelper.cpp:300
msgid "media:/ URL to mount/unmount/eject/remove"
msgstr "media:/ URL montavimui/išmontavimui/išstūmimui/pašalinimui"
@@ -463,43 +478,43 @@ msgstr ""
msgid "&Mounting"
msgstr "Montavimo taškas"
-#: tdefile-plugin/tdefilemediaplugin.cpp:190
+#: tdefile-plugin/tdefilemediaplugin.cpp:184
msgid "Medium Information"
msgstr "Įrenginio informacija"
-#: tdefile-plugin/tdefilemediaplugin.cpp:193
+#: tdefile-plugin/tdefilemediaplugin.cpp:187
msgid "Free"
msgstr "Laisvas"
-#: tdefile-plugin/tdefilemediaplugin.cpp:196
+#: tdefile-plugin/tdefilemediaplugin.cpp:190
msgid "Used"
msgstr "Naudojamas"
-#: tdefile-plugin/tdefilemediaplugin.cpp:199
+#: tdefile-plugin/tdefilemediaplugin.cpp:193
msgid "Total"
msgstr "Iš viso"
-#: tdefile-plugin/tdefilemediaplugin.cpp:202
+#: tdefile-plugin/tdefilemediaplugin.cpp:196
msgid "Base URL"
msgstr "Pagrindinis URL"
-#: tdefile-plugin/tdefilemediaplugin.cpp:203
+#: tdefile-plugin/tdefilemediaplugin.cpp:197
msgid "Mount Point"
msgstr "Montavimo taškas"
-#: tdefile-plugin/tdefilemediaplugin.cpp:204
+#: tdefile-plugin/tdefilemediaplugin.cpp:198
msgid "Device Node"
msgstr "Įrenginio"
-#: tdefile-plugin/tdefilemediaplugin.cpp:206
+#: tdefile-plugin/tdefilemediaplugin.cpp:200
msgid "Medium Summary"
msgstr "Įrenginio santrauka"
-#: tdefile-plugin/tdefilemediaplugin.cpp:208
+#: tdefile-plugin/tdefilemediaplugin.cpp:202
msgid "Usage"
msgstr "Panaudojimas"
-#: tdefile-plugin/tdefilemediaplugin.cpp:210
+#: tdefile-plugin/tdefilemediaplugin.cpp:204
msgid "Bar Graph"
msgstr "Stulpelių grafikas"
@@ -571,23 +586,30 @@ msgid ""
"devices are plugged in."
msgstr ""
-#: mediamanager/decryptdialog.ui:24 mounthelper/decryptdialog.ui:24
+#: mediamanager/unlockdialog.ui:24 mounthelper/unlockdialog.ui:24
#, no-c-format
msgid "Decrypting Storage Device"
msgstr ""
-#: mediamanager/decryptdialog.ui:109 mounthelper/decryptdialog.ui:109
+#: mediamanager/unlockdialog.ui:109
#, no-c-format
msgid ""
-"<p><b>%1</b> is an encrypted storage device.</p>\n"
-"<p>Please enter the password to decrypt the storage device.</p>"
+"<p><b>%1</b> is an encrypted locked storage device.</p>\n"
+"<p>Please enter the password to unlock the storage device.</p>"
msgstr ""
-#: mediamanager/decryptdialog.ui:131 mounthelper/decryptdialog.ui:131
+#: mediamanager/unlockdialog.ui:131 mounthelper/unlockdialog.ui:131
#, no-c-format
msgid "&Password:"
msgstr ""
+#: mounthelper/unlockdialog.ui:109
+#, no-c-format
+msgid ""
+"<p><b>%1</b> is an encrypted storage device.</p>\n"
+"<p>Please enter the password to decrypt the storage device.</p>"
+msgstr ""
+
#: propsdlgplugin/propertiespagegui.ui:16
#, no-c-format
msgid "PropertiesPageGUI"
diff --git a/tde-i18n-mk/messages/tdebase/tdeio_media.po b/tde-i18n-mk/messages/tdebase/tdeio_media.po
index 4b714baadd8..1cda4942628 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: 2019-01-13 18:47+0100\n"
+"POT-Creation-Date: 2019-07-11 02:33+0200\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"
@@ -46,7 +46,6 @@ msgstr "Непознато"
#: mediaimpl.cpp:88 mediaimpl.cpp:115 mediaimpl.cpp:141 mediaimpl.cpp:177
#: mediaimpl.cpp:197 mediaimpl.cpp:218
#: mounthelper/tdeio_media_mounthelper.cpp:50
-#: mounthelper/tdeio_media_mounthelper.cpp:256
msgid "The TDE mediamanager is not running."
msgstr "Менаџерот за мултимедиа на TDE не работи."
@@ -54,7 +53,7 @@ msgstr "Менаџерот за мултимедиа на TDE не работи.
msgid "This media name already exists."
msgstr "Ова име на носач веќе постои."
-#: mediaimpl.cpp:230 mediaimpl.cpp:293
+#: mediaimpl.cpp:230 mediaimpl.cpp:297
msgid "No such medium."
msgstr "Нема таков медиум."
@@ -62,113 +61,117 @@ msgstr "Нема таков медиум."
msgid "The drive is encrypted."
msgstr ""
-#: mediaimpl.cpp:272 mediamanager/halbackend.cpp:1264
-#: mediamanager/halbackend.cpp:1273 mediamanager/halbackend.cpp:1663
-#: mediamanager/halbackend.cpp:1680 mediamanager/halbackend.cpp:1691
-#: mediamanager/halbackend.cpp:1793 mediamanager/halbackend.cpp:1801
-#: mediamanager/halbackend.cpp:1808 mediamanager/halbackend.cpp:1848
-#: mediamanager/halbackend.cpp:1854 mediamanager/halbackend.cpp:1861
-#: mounthelper/tdeio_media_mounthelper.cpp:58
-msgid "Internal Error"
-msgstr "Внатрешна грешка"
+#: mediaimpl.cpp:274 mediamanager/tdehardwarebackend.cpp:201
+#: mediamanager/tdehardwarebackend.cpp:252
+#: mounthelper/tdeio_media_mounthelper.cpp:202
+msgid "Unknown mount error."
+msgstr ""
#: mediamanager/dialog.cpp:26 mounthelper/dialog.cpp:26
-msgid "Decrypt"
+msgid "Unlock"
msgstr ""
-#: mediamanager/fstabbackend.cpp:104 mediamanager/fstabbackend.cpp:114
-#: mediamanager/halbackend.cpp:1595 mediamanager/halbackend.cpp:1617
-#: mediamanager/halbackend.cpp:1776 mediamanager/halbackend.cpp:1831
-#: mediamanager/tdehardwarebackend.cpp:1349
-#: mediamanager/tdehardwarebackend.cpp:1360
+#: mediamanager/fstabbackend.cpp:105 mediamanager/fstabbackend.cpp:120
+#: mediamanager/halbackend.cpp:1598 mediamanager/halbackend.cpp:1625
+#: mediamanager/halbackend.cpp:1808 mediamanager/halbackend.cpp:1877
+#: mediamanager/mediamanager.cpp:363 mediamanager/mediamanager.cpp:375
+#: mediamanager/mediamanager.cpp:387 mediamanager/mediamanager.cpp:399
+#: mediamanager/tdehardwarebackend.cpp:1363
+#: mediamanager/tdehardwarebackend.cpp:1378
#, c-format
msgid "No such medium: %1"
msgstr "Нема таков медиум: %1"
-#: mediamanager/fstabbackend.cpp:398
+#: mediamanager/fstabbackend.cpp:408
msgid "CD Recorder"
msgstr "CD-Снимач"
-#: mediamanager/fstabbackend.cpp:404
+#: mediamanager/fstabbackend.cpp:414
msgid "DVD"
msgstr "DVD"
-#: mediamanager/fstabbackend.cpp:415
+#: mediamanager/fstabbackend.cpp:425
msgid "CD-ROM"
msgstr "CD-ROM"
-#: mediamanager/fstabbackend.cpp:428
+#: mediamanager/fstabbackend.cpp:438
msgid "Floppy"
msgstr "Дискета"
-#: mediamanager/fstabbackend.cpp:436
+#: mediamanager/fstabbackend.cpp:446
msgid "Zip Disk"
msgstr "Zip-дискета"
-#: mediamanager/fstabbackend.cpp:447
+#: mediamanager/fstabbackend.cpp:457
msgid "Removable Device"
msgstr "Подвижен носач"
-#: mediamanager/fstabbackend.cpp:452 mediamanager/fstabbackend.cpp:458
+#: mediamanager/fstabbackend.cpp:462 mediamanager/fstabbackend.cpp:468
msgid "Remote Share"
msgstr "Оддалечен деллив ресурс"
-#: mediamanager/fstabbackend.cpp:463
+#: mediamanager/fstabbackend.cpp:473
msgid "Hard Disk"
msgstr "Тврд диск"
-#: mediamanager/halbackend.cpp:749 mediamanager/tdehardwarebackend.cpp:805
+#: mediamanager/halbackend.cpp:744 mediamanager/tdehardwarebackend.cpp:808
#, fuzzy
msgid "Unknown Drive"
msgstr "Непознато"
-#: mediamanager/halbackend.cpp:761 mediamanager/tdehardwarebackend.cpp:835
+#: mediamanager/halbackend.cpp:756 mediamanager/tdehardwarebackend.cpp:838
#, fuzzy
msgid "Floppy Drive"
msgstr "Дискета"
-#: mediamanager/halbackend.cpp:769
+#: mediamanager/halbackend.cpp:764
#, fuzzy
msgid "Zip Drive"
msgstr "Zip-дискета"
-#: mediamanager/halbackend.cpp:839 mediamanager/tdehardwarebackend.cpp:892
+#: mediamanager/halbackend.cpp:834 mediamanager/tdehardwarebackend.cpp:895
msgid "Camera"
msgstr "Камера"
-#: mediamanager/halbackend.cpp:1221 mediamanager/halbackend.cpp:1247
+#: mediamanager/halbackend.cpp:1216 mediamanager/halbackend.cpp:1242
msgid "Authenticate"
msgstr ""
-#: mediamanager/halbackend.cpp:1222
+#: mediamanager/halbackend.cpp:1217
msgid ""
"<big><b>System policy prevents mounting internal media</b></big><br/"
">Authentication is required to perform this action. Please enter your "
"password to verify."
msgstr ""
-#: mediamanager/halbackend.cpp:1248
+#: mediamanager/halbackend.cpp:1243
msgid ""
"<big><b>System policy prevents unmounting media mounted by other users</b></"
"big><br/>Authentication is required to perform this action. Please enter "
"your password to verify."
msgstr ""
-#: mediamanager/halbackend.cpp:1284
+#: mediamanager/halbackend.cpp:1259 mediamanager/halbackend.cpp:1268
+#: mediamanager/halbackend.cpp:1849 mediamanager/halbackend.cpp:1916
+#: mounthelper/tdeio_media_mounthelper.cpp:58
+msgid "Internal Error"
+msgstr "Внатрешна грешка"
+
+#: mediamanager/halbackend.cpp:1279
msgid "Invalid filesystem type"
msgstr "Невалиден тип на датотечен систем"
-#: mediamanager/halbackend.cpp:1286
+#: mediamanager/halbackend.cpp:1281
msgid ""
"Permission denied<p>Please ensure that:<br>1. You have permission to access "
"this device.<br>2. This device node is not listed in /etc/fstab.</p>"
msgstr ""
-#: mediamanager/halbackend.cpp:1290
+#: mediamanager/halbackend.cpp:1285
msgid "Device is already mounted."
msgstr "Уредот е веќе монтиран."
-#: mediamanager/halbackend.cpp:1340
+#: mediamanager/halbackend.cpp:1335
msgid ""
"Moreover, programs still using the device have been detected. They are "
"listed below. You have to close them or change their working directory "
@@ -178,16 +181,16 @@ msgstr ""
"наведени подолу. Треба или да ги затворите или да ги измените нивните "
"работни папки пред повторно да се обидете да го одмонтирате уредот."
-#: mediamanager/halbackend.cpp:1381 mediamanager/tdehardwarebackend.cpp:1588
+#: mediamanager/halbackend.cpp:1376 mediamanager/tdehardwarebackend.cpp:1618
msgid ""
"Programs that were still using the device have been forcibly terminated. "
"They are listed below."
msgstr ""
-#: mediamanager/halbackend.cpp:1402 mediamanager/halbackend.cpp:1715
-#: mediamanager/tdehardwarebackend.cpp:1406
-#: mediamanager/tdehardwarebackend.cpp:1424
-#: mediamanager/tdehardwarebackend.cpp:1464
+#: mediamanager/halbackend.cpp:1397 mediamanager/halbackend.cpp:1742
+#: mediamanager/tdehardwarebackend.cpp:1430
+#: mediamanager/tdehardwarebackend.cpp:1452
+#: mediamanager/tdehardwarebackend.cpp:1494
msgid ""
"Unfortunately, the device <b>%1</b> (%2) named <b>'%3'</b> and currently "
"mounted at <b>%4</b> could not be unmounted. "
@@ -195,196 +198,199 @@ msgstr ""
"За жал, уредот <b>%1</b>, (%2) именуван <b>„%3“</b> и тековно монтиран на <b>"
"%4</b>, не можеше да биде одмонтиран. "
-#: mediamanager/halbackend.cpp:1408 mediamanager/tdehardwarebackend.cpp:1470
+#: mediamanager/halbackend.cpp:1403 mediamanager/tdehardwarebackend.cpp:1500
msgid "The following error was returned by umount command:"
msgstr "Следната грешка беше вратена од наредбата „umount“:"
-#: mediamanager/halbackend.cpp:1478
+#: mediamanager/halbackend.cpp:1567 mediamanager/tdehardwarebackend.cpp:1322
+msgid "Cannot mount encrypted locked drives!"
+msgstr ""
+
+#: mediamanager/halbackend.cpp:1682 mediamanager/halbackend.cpp:1703
+#: mediamanager/halbackend.cpp:1716 mediamanager/halbackend.cpp:1830
+#: mediamanager/halbackend.cpp:1840 mediamanager/halbackend.cpp:1899
+#: mediamanager/halbackend.cpp:1907
#, fuzzy
-msgid "Permission denied"
-msgstr "Нема привилегии"
+msgid "Internal error"
+msgstr "Внатрешна грешка"
-#: mediamanager/halbackend.cpp:1562 mediamanager/tdehardwarebackend.cpp:1232
-msgid "Cannot mount encrypted drives!"
-msgstr ""
+#: mediamanager/halbackend.cpp:1694
+#, fuzzy
+#| msgid "Unknown"
+msgid "Unknown error"
+msgstr "Непознато"
-#: mediamanager/halbackend.cpp:1721
+#: mediamanager/halbackend.cpp:1748
msgid "Unmounting failed due to the following error:"
msgstr "Одмонтирањето не успеа поради следната грешка:"
-#: mediamanager/halbackend.cpp:1723
+#: mediamanager/halbackend.cpp:1750
msgid "Device is Busy:"
msgstr "Уредот е зафатен:"
-#: mediamanager/halbackend.cpp:1727
+#: mediamanager/halbackend.cpp:1754
msgid ""
"Permission denied<p>Please ensure that:<br>1. You have permission to access "
"this device.<br>2. This device was originally mounted using TDE.</p>"
msgstr ""
-#: mediamanager/halbackend.cpp:1739
+#: mediamanager/halbackend.cpp:1766
msgid ""
"%1<p><b>Would you like to forcibly terminate these processes?</b><br><i>All "
"unsaved data would be lost</i>"
msgstr ""
-#: mediamanager/halbackend.cpp:1811
+#: mediamanager/halbackend.cpp:1852
msgid "Wrong password"
msgstr ""
-#: mediamanager/mediamanager.cpp:247 mediamanager/mediamanager.cpp:266
-#: mediamanager/mediamanager.cpp:285 mediamanager/mediamanager.cpp:293
-#: mediamanager/mediamanager.cpp:302 mediamanager/mediamanager.cpp:310
-msgid "Feature only available with HAL"
-msgstr "Карактеристиката е достапна само со HAL"
-
-#: mediamanager/mediamanager.cpp:252
+#: mediamanager/mediamanager.cpp:248 mediamanager/mediamanager.cpp:275
#, fuzzy
msgid "Feature only available with the TDE hardware backend"
msgstr "Карактеристиката е достапна само со HAL"
-#: mediamanager/mediamanager.cpp:256 mediamanager/mediamanager.cpp:271
-#: mediamanager/mediamanager.cpp:275
+#: mediamanager/mediamanager.cpp:255 mediamanager/mediamanager.cpp:282
+#: mediamanager/mediamanager.cpp:312 mediamanager/mediamanager.cpp:343
+msgid "Feature only available with HAL"
+msgstr "Карактеристиката е достапна само со HAL"
+
+#: mediamanager/mediamanager.cpp:262 mediamanager/mediamanager.cpp:289
+#: mediamanager/mediamanager.cpp:320 mediamanager/mediamanager.cpp:350
#, fuzzy
msgid "Feature only available with HAL or TDE hardware backend"
msgstr "Карактеристиката е достапна само со HAL"
-#: mediamanager/tdehardwarebackend.cpp:480
-#: mediamanager/tdehardwarebackend.cpp:517
-#: mediamanager/tdehardwarebackend.cpp:750
+#: mediamanager/tdehardwarebackend.cpp:483
+#: mediamanager/tdehardwarebackend.cpp:520
+#: mediamanager/tdehardwarebackend.cpp:753
#, fuzzy
msgid "%1 Removable Device"
msgstr "Подвижен носач"
-#: mediamanager/tdehardwarebackend.cpp:525
+#: mediamanager/tdehardwarebackend.cpp:528
#, fuzzy
msgid "Blank CD-ROM"
msgstr "CD-ROM"
-#: mediamanager/tdehardwarebackend.cpp:534
+#: mediamanager/tdehardwarebackend.cpp:537
msgid "Blank CD-R"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:543
+#: mediamanager/tdehardwarebackend.cpp:546
msgid "Blank CD-RW"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:552
+#: mediamanager/tdehardwarebackend.cpp:555
msgid "Blank Magneto-Optical CD"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:561
+#: mediamanager/tdehardwarebackend.cpp:564
msgid "Blank Mount Ranier CD-RW"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:570
+#: mediamanager/tdehardwarebackend.cpp:573
msgid "Blank Mount Ranier CD-RW-W"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:579
+#: mediamanager/tdehardwarebackend.cpp:582
msgid "Blank DVD-ROM"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:588
+#: mediamanager/tdehardwarebackend.cpp:591
msgid "Blank DVD-RAM"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:597
+#: mediamanager/tdehardwarebackend.cpp:600
msgid "Blank DVD-R"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:606
+#: mediamanager/tdehardwarebackend.cpp:609
msgid "Blank DVD-RW"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:615
+#: mediamanager/tdehardwarebackend.cpp:618
msgid "Blank Dual Layer DVD-R"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:624
+#: mediamanager/tdehardwarebackend.cpp:627
msgid "Blank Dual Layer DVD-RW"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:633
+#: mediamanager/tdehardwarebackend.cpp:636
msgid "Blank DVD+R"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:642
+#: mediamanager/tdehardwarebackend.cpp:645
msgid "Blank DVD+RW"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:651
+#: mediamanager/tdehardwarebackend.cpp:654
msgid "Blank Dual Layer DVD+R"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:660
+#: mediamanager/tdehardwarebackend.cpp:663
msgid "Blank Dual Layer DVD+RW"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:669
+#: mediamanager/tdehardwarebackend.cpp:672
msgid "Blank BD-ROM"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:678
+#: mediamanager/tdehardwarebackend.cpp:681
msgid "Blank BD-R"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:687
+#: mediamanager/tdehardwarebackend.cpp:690
msgid "Blank BD-RW"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:696
+#: mediamanager/tdehardwarebackend.cpp:699
msgid "Blank HDDVD-ROM"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:705
+#: mediamanager/tdehardwarebackend.cpp:708
msgid "Blank HDDVD-R"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:714
+#: mediamanager/tdehardwarebackend.cpp:717
msgid "Blank HDDVD-RW"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:721
+#: mediamanager/tdehardwarebackend.cpp:724
msgid "Audio CD"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:742
+#: mediamanager/tdehardwarebackend.cpp:745
msgid "%1 Fixed Disk (%2)"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:849
+#: mediamanager/tdehardwarebackend.cpp:852
#, fuzzy
msgid "%1 Zip Disk"
msgstr "Zip-дискета"
-#: mediamanager/tdehardwarebackend.cpp:1212
-#: mediamanager/tdehardwarebackend.cpp:1392
-#, fuzzy
-msgid "Internal error"
-msgstr "Внатрешна грешка"
+#: mediamanager/tdehardwarebackend.cpp:1224
+#: mediamanager/tdehardwarebackend.cpp:1417
+msgid "Internal error. Couldn't find medium."
+msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:1239
-msgid ""
-"<qt>Unable to mount this device.<p>Potential reasons include:<br>Improper "
-"device and/or user privilege level<br>Corrupt data on storage device"
+#: mediamanager/tdehardwarebackend.cpp:1249
+#: mediamanager/tdehardwarebackend.cpp:1323
+msgid "Unable to mount this device."
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:1241
-#: mediamanager/tdehardwarebackend.cpp:1316
-#: mediamanager/tdehardwarebackend.cpp:1408
-#: mediamanager/tdehardwarebackend.cpp:1426
+#: mediamanager/tdehardwarebackend.cpp:1252
+#: mediamanager/tdehardwarebackend.cpp:1326
+#: mediamanager/tdehardwarebackend.cpp:1435
+#: mediamanager/tdehardwarebackend.cpp:1457
msgid "<p>Technical details:<br>"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:1314
-msgid ""
-"<qt>Unable to mount this device.<p>Potential reasons include:<br>Improper "
-"device and/or user privilege level<br>Corrupt data on storage "
-"device<br>Incorrect encryption password"
+#: mediamanager/tdehardwarebackend.cpp:1284
+msgid "Decryption aborted"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:1420
+#: mediamanager/tdehardwarebackend.cpp:1443
msgid ""
"<qt>The device <b>%1</b> (%2) named <b>'%3'</b> and currently mounted at <b>"
"%4</b> can not be unmounted at this time.<p>%5<p><b>Would you like to "
@@ -392,7 +398,7 @@ msgid ""
"lost</i>"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:1547
+#: mediamanager/tdehardwarebackend.cpp:1577
#, fuzzy
msgid ""
"Programs still using the device have been detected. They are listed below. "
@@ -407,7 +413,7 @@ msgstr ""
msgid "%1 cannot be found."
msgstr "%1 не може да биде пронајдено."
-#: mounthelper/tdeio_media_mounthelper.cpp:86
+#: mounthelper/tdeio_media_mounthelper.cpp:87
msgid "%1 is not a mountable media."
msgstr "%1 не е носач за монтирање."
@@ -418,41 +424,49 @@ msgstr "%1 не е носач за монтирање."
#: mounthelper/tdeio_media_mounthelper.cpp:107
#, fuzzy
-msgid "%1 is already decrypted."
+msgid "%1 is already unlocked."
msgstr "Уредот е веќе монтиран."
-#: mounthelper/tdeio_media_mounthelper.cpp:228
+#: mounthelper/tdeio_media_mounthelper.cpp:139
+msgid "Unknown unmount error."
+msgstr ""
+
+#: mounthelper/tdeio_media_mounthelper.cpp:246
#, fuzzy
msgid "The device was successfully unmounted, but the tray could not be opened"
msgstr ""
"Уредот беше успешно одмонтиран, но вратичката не можеше да биде отворена"
-#: mounthelper/tdeio_media_mounthelper.cpp:230
+#: mounthelper/tdeio_media_mounthelper.cpp:248
msgid "The device was successfully unmounted, but could not be ejected"
msgstr "Уредот беше успешно одмонтиран, но не можеше да биде изваден"
-#: mounthelper/tdeio_media_mounthelper.cpp:275
+#: mounthelper/tdeio_media_mounthelper.cpp:281
+msgid "Unknown decrypt error."
+msgstr ""
+
+#: mounthelper/tdeio_media_mounthelper.cpp:295
#, fuzzy
msgid "Decrypt given URL"
msgstr "Одмонтирај го дадениот URL"
-#: mounthelper/tdeio_media_mounthelper.cpp:276
+#: mounthelper/tdeio_media_mounthelper.cpp:296
msgid "Unmount given URL"
msgstr "Одмонтирај го дадениот URL"
-#: mounthelper/tdeio_media_mounthelper.cpp:277
+#: mounthelper/tdeio_media_mounthelper.cpp:297
msgid "Mount given URL (default)"
msgstr "Монтирај го дадениот URL (стандардно)"
-#: mounthelper/tdeio_media_mounthelper.cpp:278
+#: mounthelper/tdeio_media_mounthelper.cpp:298
msgid "Eject given URL via tdeeject"
msgstr "Извади го зададениот URL преку tdeeject"
-#: mounthelper/tdeio_media_mounthelper.cpp:279
+#: mounthelper/tdeio_media_mounthelper.cpp:299
msgid "Unmount and Eject given URL (necessary for some USB devices)"
msgstr "Одмонтирај и извади го зададениот URL (потребно за некои USB-уреди)"
-#: mounthelper/tdeio_media_mounthelper.cpp:280
+#: mounthelper/tdeio_media_mounthelper.cpp:300
msgid "media:/ URL to mount/unmount/eject/remove"
msgstr "URL media:/ за монтирање/одмонтирање/вадење/отстранување"
@@ -473,43 +487,43 @@ msgstr "Зачувувањето на промените не успеа"
msgid "&Mounting"
msgstr "&Монтирам"
-#: tdefile-plugin/tdefilemediaplugin.cpp:190
+#: tdefile-plugin/tdefilemediaplugin.cpp:184
msgid "Medium Information"
msgstr "Информација за носачот"
-#: tdefile-plugin/tdefilemediaplugin.cpp:193
+#: tdefile-plugin/tdefilemediaplugin.cpp:187
msgid "Free"
msgstr "Слободен"
-#: tdefile-plugin/tdefilemediaplugin.cpp:196
+#: tdefile-plugin/tdefilemediaplugin.cpp:190
msgid "Used"
msgstr "Зафатен"
-#: tdefile-plugin/tdefilemediaplugin.cpp:199
+#: tdefile-plugin/tdefilemediaplugin.cpp:193
msgid "Total"
msgstr "Вкупно"
-#: tdefile-plugin/tdefilemediaplugin.cpp:202
+#: tdefile-plugin/tdefilemediaplugin.cpp:196
msgid "Base URL"
msgstr "Базен URL"
-#: tdefile-plugin/tdefilemediaplugin.cpp:203
+#: tdefile-plugin/tdefilemediaplugin.cpp:197
msgid "Mount Point"
msgstr "Точка на монтирање"
-#: tdefile-plugin/tdefilemediaplugin.cpp:204
+#: tdefile-plugin/tdefilemediaplugin.cpp:198
msgid "Device Node"
msgstr "Јазол на уредот"
-#: tdefile-plugin/tdefilemediaplugin.cpp:206
+#: tdefile-plugin/tdefilemediaplugin.cpp:200
msgid "Medium Summary"
msgstr "Преглед на носачот"
-#: tdefile-plugin/tdefilemediaplugin.cpp:208
+#: tdefile-plugin/tdefilemediaplugin.cpp:202
msgid "Usage"
msgstr "Користење"
-#: tdefile-plugin/tdefilemediaplugin.cpp:210
+#: tdefile-plugin/tdefilemediaplugin.cpp:204
msgid "Bar Graph"
msgstr "Графикон"
@@ -581,23 +595,30 @@ msgid ""
"devices are plugged in."
msgstr ""
-#: mediamanager/decryptdialog.ui:24 mounthelper/decryptdialog.ui:24
+#: mediamanager/unlockdialog.ui:24 mounthelper/unlockdialog.ui:24
#, no-c-format
msgid "Decrypting Storage Device"
msgstr ""
-#: mediamanager/decryptdialog.ui:109 mounthelper/decryptdialog.ui:109
+#: mediamanager/unlockdialog.ui:109
#, no-c-format
msgid ""
-"<p><b>%1</b> is an encrypted storage device.</p>\n"
-"<p>Please enter the password to decrypt the storage device.</p>"
+"<p><b>%1</b> is an encrypted locked storage device.</p>\n"
+"<p>Please enter the password to unlock the storage device.</p>"
msgstr ""
-#: mediamanager/decryptdialog.ui:131 mounthelper/decryptdialog.ui:131
+#: mediamanager/unlockdialog.ui:131 mounthelper/unlockdialog.ui:131
#, no-c-format
msgid "&Password:"
msgstr ""
+#: mounthelper/unlockdialog.ui:109
+#, no-c-format
+msgid ""
+"<p><b>%1</b> is an encrypted storage device.</p>\n"
+"<p>Please enter the password to decrypt the storage device.</p>"
+msgstr ""
+
#: propsdlgplugin/propertiespagegui.ui:16
#, no-c-format
msgid "PropertiesPageGUI"
@@ -842,3 +863,7 @@ msgstr "Мешано"
#, no-c-format
msgid "Filesystem: iso9660"
msgstr "Датотечен систем: iso9660"
+
+#, 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 651ba2c2d1b..0a9e1d5e017 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: 2019-01-13 18:47+0100\n"
+"POT-Creation-Date: 2019-07-11 02:33+0200\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"
@@ -46,7 +46,6 @@ msgstr "Тодорхойгүй"
#: mediaimpl.cpp:88 mediaimpl.cpp:115 mediaimpl.cpp:141 mediaimpl.cpp:177
#: mediaimpl.cpp:197 mediaimpl.cpp:218
#: mounthelper/tdeio_media_mounthelper.cpp:50
-#: mounthelper/tdeio_media_mounthelper.cpp:256
msgid "The TDE mediamanager is not running."
msgstr ""
@@ -54,7 +53,7 @@ msgstr ""
msgid "This media name already exists."
msgstr ""
-#: mediaimpl.cpp:230 mediaimpl.cpp:293
+#: mediaimpl.cpp:230 mediaimpl.cpp:297
msgid "No such medium."
msgstr ""
@@ -62,320 +61,328 @@ msgstr ""
msgid "The drive is encrypted."
msgstr ""
-#: mediaimpl.cpp:272 mediamanager/halbackend.cpp:1264
-#: mediamanager/halbackend.cpp:1273 mediamanager/halbackend.cpp:1663
-#: mediamanager/halbackend.cpp:1680 mediamanager/halbackend.cpp:1691
-#: mediamanager/halbackend.cpp:1793 mediamanager/halbackend.cpp:1801
-#: mediamanager/halbackend.cpp:1808 mediamanager/halbackend.cpp:1848
-#: mediamanager/halbackend.cpp:1854 mediamanager/halbackend.cpp:1861
-#: mounthelper/tdeio_media_mounthelper.cpp:58
-msgid "Internal Error"
+#: mediaimpl.cpp:274 mediamanager/tdehardwarebackend.cpp:201
+#: mediamanager/tdehardwarebackend.cpp:252
+#: mounthelper/tdeio_media_mounthelper.cpp:202
+msgid "Unknown mount error."
msgstr ""
#: mediamanager/dialog.cpp:26 mounthelper/dialog.cpp:26
-msgid "Decrypt"
+msgid "Unlock"
msgstr ""
-#: mediamanager/fstabbackend.cpp:104 mediamanager/fstabbackend.cpp:114
-#: mediamanager/halbackend.cpp:1595 mediamanager/halbackend.cpp:1617
-#: mediamanager/halbackend.cpp:1776 mediamanager/halbackend.cpp:1831
-#: mediamanager/tdehardwarebackend.cpp:1349
-#: mediamanager/tdehardwarebackend.cpp:1360
+#: mediamanager/fstabbackend.cpp:105 mediamanager/fstabbackend.cpp:120
+#: mediamanager/halbackend.cpp:1598 mediamanager/halbackend.cpp:1625
+#: mediamanager/halbackend.cpp:1808 mediamanager/halbackend.cpp:1877
+#: mediamanager/mediamanager.cpp:363 mediamanager/mediamanager.cpp:375
+#: mediamanager/mediamanager.cpp:387 mediamanager/mediamanager.cpp:399
+#: mediamanager/tdehardwarebackend.cpp:1363
+#: mediamanager/tdehardwarebackend.cpp:1378
#, c-format
msgid "No such medium: %1"
msgstr ""
-#: mediamanager/fstabbackend.cpp:398
+#: mediamanager/fstabbackend.cpp:408
msgid "CD Recorder"
msgstr "CD-Шарагч"
-#: mediamanager/fstabbackend.cpp:404
+#: mediamanager/fstabbackend.cpp:414
msgid "DVD"
msgstr ""
-#: mediamanager/fstabbackend.cpp:415
+#: mediamanager/fstabbackend.cpp:425
msgid "CD-ROM"
msgstr "CD-ROM"
-#: mediamanager/fstabbackend.cpp:428
+#: mediamanager/fstabbackend.cpp:438
msgid "Floppy"
msgstr "Уян диск"
-#: mediamanager/fstabbackend.cpp:436
+#: mediamanager/fstabbackend.cpp:446
msgid "Zip Disk"
msgstr "Zip-диск"
-#: mediamanager/fstabbackend.cpp:447
+#: mediamanager/fstabbackend.cpp:457
msgid "Removable Device"
msgstr ""
-#: mediamanager/fstabbackend.cpp:452 mediamanager/fstabbackend.cpp:458
+#: mediamanager/fstabbackend.cpp:462 mediamanager/fstabbackend.cpp:468
msgid "Remote Share"
msgstr "Гадаад нөөц"
-#: mediamanager/fstabbackend.cpp:463
+#: mediamanager/fstabbackend.cpp:473
#, fuzzy
msgid "Hard Disk"
msgstr "Хатуу диск"
-#: mediamanager/halbackend.cpp:749 mediamanager/tdehardwarebackend.cpp:805
+#: mediamanager/halbackend.cpp:744 mediamanager/tdehardwarebackend.cpp:808
#, fuzzy
msgid "Unknown Drive"
msgstr "Тодорхойгүй"
-#: mediamanager/halbackend.cpp:761 mediamanager/tdehardwarebackend.cpp:835
+#: mediamanager/halbackend.cpp:756 mediamanager/tdehardwarebackend.cpp:838
#, fuzzy
msgid "Floppy Drive"
msgstr "Уян диск"
-#: mediamanager/halbackend.cpp:769
+#: mediamanager/halbackend.cpp:764
#, fuzzy
msgid "Zip Drive"
msgstr "Zip-диск"
-#: mediamanager/halbackend.cpp:839 mediamanager/tdehardwarebackend.cpp:892
+#: mediamanager/halbackend.cpp:834 mediamanager/tdehardwarebackend.cpp:895
msgid "Camera"
msgstr ""
-#: mediamanager/halbackend.cpp:1221 mediamanager/halbackend.cpp:1247
+#: mediamanager/halbackend.cpp:1216 mediamanager/halbackend.cpp:1242
msgid "Authenticate"
msgstr ""
-#: mediamanager/halbackend.cpp:1222
+#: mediamanager/halbackend.cpp:1217
msgid ""
"<big><b>System policy prevents mounting internal media</b></big><br/"
">Authentication is required to perform this action. Please enter your "
"password to verify."
msgstr ""
-#: mediamanager/halbackend.cpp:1248
+#: mediamanager/halbackend.cpp:1243
msgid ""
"<big><b>System policy prevents unmounting media mounted by other users</b></"
"big><br/>Authentication is required to perform this action. Please enter "
"your password to verify."
msgstr ""
-#: mediamanager/halbackend.cpp:1284
+#: mediamanager/halbackend.cpp:1259 mediamanager/halbackend.cpp:1268
+#: mediamanager/halbackend.cpp:1849 mediamanager/halbackend.cpp:1916
+#: mounthelper/tdeio_media_mounthelper.cpp:58
+msgid "Internal Error"
+msgstr ""
+
+#: mediamanager/halbackend.cpp:1279
msgid "Invalid filesystem type"
msgstr ""
-#: mediamanager/halbackend.cpp:1286
+#: mediamanager/halbackend.cpp:1281
msgid ""
"Permission denied<p>Please ensure that:<br>1. You have permission to access "
"this device.<br>2. This device node is not listed in /etc/fstab.</p>"
msgstr ""
-#: mediamanager/halbackend.cpp:1290
+#: mediamanager/halbackend.cpp:1285
msgid "Device is already mounted."
msgstr ""
-#: mediamanager/halbackend.cpp:1340
+#: mediamanager/halbackend.cpp:1335
msgid ""
"Moreover, programs still using the device have been detected. They are "
"listed below. You have to close them or change their working directory "
"before attempting to unmount the device again."
msgstr ""
-#: mediamanager/halbackend.cpp:1381 mediamanager/tdehardwarebackend.cpp:1588
+#: mediamanager/halbackend.cpp:1376 mediamanager/tdehardwarebackend.cpp:1618
msgid ""
"Programs that were still using the device have been forcibly terminated. "
"They are listed below."
msgstr ""
-#: mediamanager/halbackend.cpp:1402 mediamanager/halbackend.cpp:1715
-#: mediamanager/tdehardwarebackend.cpp:1406
-#: mediamanager/tdehardwarebackend.cpp:1424
-#: mediamanager/tdehardwarebackend.cpp:1464
+#: mediamanager/halbackend.cpp:1397 mediamanager/halbackend.cpp:1742
+#: mediamanager/tdehardwarebackend.cpp:1430
+#: mediamanager/tdehardwarebackend.cpp:1452
+#: mediamanager/tdehardwarebackend.cpp:1494
msgid ""
"Unfortunately, the device <b>%1</b> (%2) named <b>'%3'</b> and currently "
"mounted at <b>%4</b> could not be unmounted. "
msgstr ""
-#: mediamanager/halbackend.cpp:1408 mediamanager/tdehardwarebackend.cpp:1470
+#: mediamanager/halbackend.cpp:1403 mediamanager/tdehardwarebackend.cpp:1500
msgid "The following error was returned by umount command:"
msgstr ""
-#: mediamanager/halbackend.cpp:1478
-msgid "Permission denied"
+#: mediamanager/halbackend.cpp:1567 mediamanager/tdehardwarebackend.cpp:1322
+msgid "Cannot mount encrypted locked drives!"
msgstr ""
-#: mediamanager/halbackend.cpp:1562 mediamanager/tdehardwarebackend.cpp:1232
-msgid "Cannot mount encrypted drives!"
+#: mediamanager/halbackend.cpp:1682 mediamanager/halbackend.cpp:1703
+#: mediamanager/halbackend.cpp:1716 mediamanager/halbackend.cpp:1830
+#: mediamanager/halbackend.cpp:1840 mediamanager/halbackend.cpp:1899
+#: mediamanager/halbackend.cpp:1907
+msgid "Internal error"
msgstr ""
-#: mediamanager/halbackend.cpp:1721
+#: mediamanager/halbackend.cpp:1694
+#, fuzzy
+#| msgid "Unknown"
+msgid "Unknown error"
+msgstr "Тодорхойгүй"
+
+#: mediamanager/halbackend.cpp:1748
msgid "Unmounting failed due to the following error:"
msgstr ""
-#: mediamanager/halbackend.cpp:1723
+#: mediamanager/halbackend.cpp:1750
msgid "Device is Busy:"
msgstr ""
-#: mediamanager/halbackend.cpp:1727
+#: mediamanager/halbackend.cpp:1754
msgid ""
"Permission denied<p>Please ensure that:<br>1. You have permission to access "
"this device.<br>2. This device was originally mounted using TDE.</p>"
msgstr ""
-#: mediamanager/halbackend.cpp:1739
+#: mediamanager/halbackend.cpp:1766
msgid ""
"%1<p><b>Would you like to forcibly terminate these processes?</b><br><i>All "
"unsaved data would be lost</i>"
msgstr ""
-#: mediamanager/halbackend.cpp:1811
+#: mediamanager/halbackend.cpp:1852
msgid "Wrong password"
msgstr ""
-#: mediamanager/mediamanager.cpp:247 mediamanager/mediamanager.cpp:266
-#: mediamanager/mediamanager.cpp:285 mediamanager/mediamanager.cpp:293
-#: mediamanager/mediamanager.cpp:302 mediamanager/mediamanager.cpp:310
-msgid "Feature only available with HAL"
+#: mediamanager/mediamanager.cpp:248 mediamanager/mediamanager.cpp:275
+msgid "Feature only available with the TDE hardware backend"
msgstr ""
-#: mediamanager/mediamanager.cpp:252
-msgid "Feature only available with the TDE hardware backend"
+#: mediamanager/mediamanager.cpp:255 mediamanager/mediamanager.cpp:282
+#: mediamanager/mediamanager.cpp:312 mediamanager/mediamanager.cpp:343
+msgid "Feature only available with HAL"
msgstr ""
-#: mediamanager/mediamanager.cpp:256 mediamanager/mediamanager.cpp:271
-#: mediamanager/mediamanager.cpp:275
+#: mediamanager/mediamanager.cpp:262 mediamanager/mediamanager.cpp:289
+#: mediamanager/mediamanager.cpp:320 mediamanager/mediamanager.cpp:350
msgid "Feature only available with HAL or TDE hardware backend"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:480
-#: mediamanager/tdehardwarebackend.cpp:517
-#: mediamanager/tdehardwarebackend.cpp:750
+#: mediamanager/tdehardwarebackend.cpp:483
+#: mediamanager/tdehardwarebackend.cpp:520
+#: mediamanager/tdehardwarebackend.cpp:753
msgid "%1 Removable Device"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:525
+#: mediamanager/tdehardwarebackend.cpp:528
#, fuzzy
msgid "Blank CD-ROM"
msgstr "CD-ROM"
-#: mediamanager/tdehardwarebackend.cpp:534
+#: mediamanager/tdehardwarebackend.cpp:537
msgid "Blank CD-R"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:543
+#: mediamanager/tdehardwarebackend.cpp:546
msgid "Blank CD-RW"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:552
+#: mediamanager/tdehardwarebackend.cpp:555
msgid "Blank Magneto-Optical CD"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:561
+#: mediamanager/tdehardwarebackend.cpp:564
msgid "Blank Mount Ranier CD-RW"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:570
+#: mediamanager/tdehardwarebackend.cpp:573
msgid "Blank Mount Ranier CD-RW-W"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:579
+#: mediamanager/tdehardwarebackend.cpp:582
msgid "Blank DVD-ROM"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:588
+#: mediamanager/tdehardwarebackend.cpp:591
msgid "Blank DVD-RAM"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:597
+#: mediamanager/tdehardwarebackend.cpp:600
msgid "Blank DVD-R"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:606
+#: mediamanager/tdehardwarebackend.cpp:609
msgid "Blank DVD-RW"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:615
+#: mediamanager/tdehardwarebackend.cpp:618
msgid "Blank Dual Layer DVD-R"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:624
+#: mediamanager/tdehardwarebackend.cpp:627
msgid "Blank Dual Layer DVD-RW"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:633
+#: mediamanager/tdehardwarebackend.cpp:636
msgid "Blank DVD+R"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:642
+#: mediamanager/tdehardwarebackend.cpp:645
msgid "Blank DVD+RW"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:651
+#: mediamanager/tdehardwarebackend.cpp:654
msgid "Blank Dual Layer DVD+R"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:660
+#: mediamanager/tdehardwarebackend.cpp:663
msgid "Blank Dual Layer DVD+RW"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:669
+#: mediamanager/tdehardwarebackend.cpp:672
msgid "Blank BD-ROM"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:678
+#: mediamanager/tdehardwarebackend.cpp:681
msgid "Blank BD-R"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:687
+#: mediamanager/tdehardwarebackend.cpp:690
msgid "Blank BD-RW"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:696
+#: mediamanager/tdehardwarebackend.cpp:699
msgid "Blank HDDVD-ROM"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:705
+#: mediamanager/tdehardwarebackend.cpp:708
msgid "Blank HDDVD-R"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:714
+#: mediamanager/tdehardwarebackend.cpp:717
msgid "Blank HDDVD-RW"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:721
+#: mediamanager/tdehardwarebackend.cpp:724
msgid "Audio CD"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:742
+#: mediamanager/tdehardwarebackend.cpp:745
msgid "%1 Fixed Disk (%2)"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:849
+#: mediamanager/tdehardwarebackend.cpp:852
#, fuzzy
msgid "%1 Zip Disk"
msgstr "Zip-диск"
-#: mediamanager/tdehardwarebackend.cpp:1212
-#: mediamanager/tdehardwarebackend.cpp:1392
-msgid "Internal error"
+#: mediamanager/tdehardwarebackend.cpp:1224
+#: mediamanager/tdehardwarebackend.cpp:1417
+msgid "Internal error. Couldn't find medium."
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:1239
-msgid ""
-"<qt>Unable to mount this device.<p>Potential reasons include:<br>Improper "
-"device and/or user privilege level<br>Corrupt data on storage device"
+#: mediamanager/tdehardwarebackend.cpp:1249
+#: mediamanager/tdehardwarebackend.cpp:1323
+msgid "Unable to mount this device."
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:1241
-#: mediamanager/tdehardwarebackend.cpp:1316
-#: mediamanager/tdehardwarebackend.cpp:1408
-#: mediamanager/tdehardwarebackend.cpp:1426
+#: mediamanager/tdehardwarebackend.cpp:1252
+#: mediamanager/tdehardwarebackend.cpp:1326
+#: mediamanager/tdehardwarebackend.cpp:1435
+#: mediamanager/tdehardwarebackend.cpp:1457
msgid "<p>Technical details:<br>"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:1314
-msgid ""
-"<qt>Unable to mount this device.<p>Potential reasons include:<br>Improper "
-"device and/or user privilege level<br>Corrupt data on storage "
-"device<br>Incorrect encryption password"
+#: mediamanager/tdehardwarebackend.cpp:1284
+msgid "Decryption aborted"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:1420
+#: mediamanager/tdehardwarebackend.cpp:1443
msgid ""
"<qt>The device <b>%1</b> (%2) named <b>'%3'</b> and currently mounted at <b>"
"%4</b> can not be unmounted at this time.<p>%5<p><b>Would you like to "
@@ -383,7 +390,7 @@ msgid ""
"lost</i>"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:1547
+#: mediamanager/tdehardwarebackend.cpp:1577
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 "
@@ -394,7 +401,7 @@ msgstr ""
msgid "%1 cannot be found."
msgstr ""
-#: mounthelper/tdeio_media_mounthelper.cpp:86
+#: mounthelper/tdeio_media_mounthelper.cpp:87
#, fuzzy
msgid "%1 is not a mountable media."
msgstr "%1%2 (залгагдаагүй)"
@@ -405,40 +412,49 @@ msgid "%1 is not an encrypted media."
msgstr "%1%2 (залгагдаагүй)"
#: mounthelper/tdeio_media_mounthelper.cpp:107
-msgid "%1 is already decrypted."
+msgid "%1 is already unlocked."
+msgstr ""
+
+#: mounthelper/tdeio_media_mounthelper.cpp:139
+msgid "Unknown unmount error."
msgstr ""
-#: mounthelper/tdeio_media_mounthelper.cpp:228
+#: mounthelper/tdeio_media_mounthelper.cpp:246
msgid "The device was successfully unmounted, but the tray could not be opened"
msgstr ""
-#: mounthelper/tdeio_media_mounthelper.cpp:230
+#: mounthelper/tdeio_media_mounthelper.cpp:248
msgid "The device was successfully unmounted, but could not be ejected"
msgstr ""
-#: mounthelper/tdeio_media_mounthelper.cpp:275
+#: mounthelper/tdeio_media_mounthelper.cpp:281
+#, fuzzy
+msgid "Unknown decrypt error."
+msgstr "Танигдахгүй төхөөрөмж"
+
+#: mounthelper/tdeio_media_mounthelper.cpp:295
#, fuzzy
msgid "Decrypt given URL"
msgstr "Өгсөн хаягаас (URL) салгах"
-#: mounthelper/tdeio_media_mounthelper.cpp:276
+#: mounthelper/tdeio_media_mounthelper.cpp:296
msgid "Unmount given URL"
msgstr "Өгсөн хаягаас (URL) салгах"
-#: mounthelper/tdeio_media_mounthelper.cpp:277
+#: mounthelper/tdeio_media_mounthelper.cpp:297
#, fuzzy
msgid "Mount given URL (default)"
msgstr "Өгсөн хаягаас (URL) залгах (mounten). Стандарт:"
-#: mounthelper/tdeio_media_mounthelper.cpp:278
+#: mounthelper/tdeio_media_mounthelper.cpp:298
msgid "Eject given URL via tdeeject"
msgstr ""
-#: mounthelper/tdeio_media_mounthelper.cpp:279
+#: mounthelper/tdeio_media_mounthelper.cpp:299
msgid "Unmount and Eject given URL (necessary for some USB devices)"
msgstr ""
-#: mounthelper/tdeio_media_mounthelper.cpp:280
+#: mounthelper/tdeio_media_mounthelper.cpp:300
#, fuzzy
msgid "media:/ URL to mount/unmount/eject/remove"
msgstr "Төхөөрөмж:/ url (Хаяг)"
@@ -460,45 +476,45 @@ msgstr ""
msgid "&Mounting"
msgstr ""
-#: tdefile-plugin/tdefilemediaplugin.cpp:190
+#: tdefile-plugin/tdefilemediaplugin.cpp:184
#, fuzzy
msgid "Medium Information"
msgstr "Төрөөрөмж залгагдаагүй байна."
-#: tdefile-plugin/tdefilemediaplugin.cpp:193
+#: tdefile-plugin/tdefilemediaplugin.cpp:187
msgid "Free"
msgstr ""
-#: tdefile-plugin/tdefilemediaplugin.cpp:196
+#: tdefile-plugin/tdefilemediaplugin.cpp:190
msgid "Used"
msgstr ""
-#: tdefile-plugin/tdefilemediaplugin.cpp:199
+#: tdefile-plugin/tdefilemediaplugin.cpp:193
msgid "Total"
msgstr ""
-#: tdefile-plugin/tdefilemediaplugin.cpp:202
+#: tdefile-plugin/tdefilemediaplugin.cpp:196
msgid "Base URL"
msgstr ""
-#: tdefile-plugin/tdefilemediaplugin.cpp:203
+#: tdefile-plugin/tdefilemediaplugin.cpp:197
msgid "Mount Point"
msgstr ""
-#: tdefile-plugin/tdefilemediaplugin.cpp:204
+#: tdefile-plugin/tdefilemediaplugin.cpp:198
#, fuzzy
msgid "Device Node"
msgstr "Төрөөрөмж залгагдаагүй байна."
-#: tdefile-plugin/tdefilemediaplugin.cpp:206
+#: tdefile-plugin/tdefilemediaplugin.cpp:200
msgid "Medium Summary"
msgstr ""
-#: tdefile-plugin/tdefilemediaplugin.cpp:208
+#: tdefile-plugin/tdefilemediaplugin.cpp:202
msgid "Usage"
msgstr ""
-#: tdefile-plugin/tdefilemediaplugin.cpp:210
+#: tdefile-plugin/tdefilemediaplugin.cpp:204
msgid "Bar Graph"
msgstr ""
@@ -570,23 +586,30 @@ msgid ""
"devices are plugged in."
msgstr ""
-#: mediamanager/decryptdialog.ui:24 mounthelper/decryptdialog.ui:24
+#: mediamanager/unlockdialog.ui:24 mounthelper/unlockdialog.ui:24
#, no-c-format
msgid "Decrypting Storage Device"
msgstr ""
-#: mediamanager/decryptdialog.ui:109 mounthelper/decryptdialog.ui:109
+#: mediamanager/unlockdialog.ui:109
#, no-c-format
msgid ""
-"<p><b>%1</b> is an encrypted storage device.</p>\n"
-"<p>Please enter the password to decrypt the storage device.</p>"
+"<p><b>%1</b> is an encrypted locked storage device.</p>\n"
+"<p>Please enter the password to unlock the storage device.</p>"
msgstr ""
-#: mediamanager/decryptdialog.ui:131 mounthelper/decryptdialog.ui:131
+#: mediamanager/unlockdialog.ui:131 mounthelper/unlockdialog.ui:131
#, no-c-format
msgid "&Password:"
msgstr ""
+#: mounthelper/unlockdialog.ui:109
+#, no-c-format
+msgid ""
+"<p><b>%1</b> is an encrypted storage device.</p>\n"
+"<p>Please enter the password to decrypt the storage device.</p>"
+msgstr ""
+
#: propsdlgplugin/propertiespagegui.ui:16
#, no-c-format
msgid "PropertiesPageGUI"
@@ -804,10 +827,6 @@ msgstr ""
msgid "Filesystem: iso9660"
msgstr ""
-#, fuzzy
-#~ msgid "Unknown device %1"
-#~ msgstr "Танигдахгүй төхөөрөмж"
-
#~ msgid "Device not accessible"
#~ msgstr "Төрөөрөмж рүү хандах боломжгүй"
diff --git a/tde-i18n-ms/messages/tdebase/tdeio_media.po b/tde-i18n-ms/messages/tdebase/tdeio_media.po
index 87958dd62dd..82122967d15 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: 2019-01-13 18:47+0100\n"
+"POT-Creation-Date: 2019-07-11 02:33+0200\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"
@@ -50,7 +50,6 @@ 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
-#: mounthelper/tdeio_media_mounthelper.cpp:256
msgid "The TDE mediamanager is not running."
msgstr "Pengurus media TDE tidak berjalan."
@@ -58,7 +57,7 @@ msgstr "Pengurus media TDE tidak berjalan."
msgid "This media name already exists."
msgstr "Nama media ini sudah wujud."
-#: mediaimpl.cpp:230 mediaimpl.cpp:293
+#: mediaimpl.cpp:230 mediaimpl.cpp:297
#, fuzzy
msgid "No such medium."
msgstr "Tiada fail sedemikian"
@@ -67,326 +66,332 @@ msgstr "Tiada fail sedemikian"
msgid "The drive is encrypted."
msgstr ""
-#: mediaimpl.cpp:272 mediamanager/halbackend.cpp:1264
-#: mediamanager/halbackend.cpp:1273 mediamanager/halbackend.cpp:1663
-#: mediamanager/halbackend.cpp:1680 mediamanager/halbackend.cpp:1691
-#: mediamanager/halbackend.cpp:1793 mediamanager/halbackend.cpp:1801
-#: mediamanager/halbackend.cpp:1808 mediamanager/halbackend.cpp:1848
-#: mediamanager/halbackend.cpp:1854 mediamanager/halbackend.cpp:1861
-#: mounthelper/tdeio_media_mounthelper.cpp:58
-#, fuzzy
-msgid "Internal Error"
-msgstr "Ralat dalaman.\n"
+#: mediaimpl.cpp:274 mediamanager/tdehardwarebackend.cpp:201
+#: mediamanager/tdehardwarebackend.cpp:252
+#: mounthelper/tdeio_media_mounthelper.cpp:202
+msgid "Unknown mount error."
+msgstr ""
#: mediamanager/dialog.cpp:26 mounthelper/dialog.cpp:26
-msgid "Decrypt"
+msgid "Unlock"
msgstr ""
-#: mediamanager/fstabbackend.cpp:104 mediamanager/fstabbackend.cpp:114
-#: mediamanager/halbackend.cpp:1595 mediamanager/halbackend.cpp:1617
-#: mediamanager/halbackend.cpp:1776 mediamanager/halbackend.cpp:1831
-#: mediamanager/tdehardwarebackend.cpp:1349
-#: mediamanager/tdehardwarebackend.cpp:1360
+#: mediamanager/fstabbackend.cpp:105 mediamanager/fstabbackend.cpp:120
+#: mediamanager/halbackend.cpp:1598 mediamanager/halbackend.cpp:1625
+#: mediamanager/halbackend.cpp:1808 mediamanager/halbackend.cpp:1877
+#: mediamanager/mediamanager.cpp:363 mediamanager/mediamanager.cpp:375
+#: mediamanager/mediamanager.cpp:387 mediamanager/mediamanager.cpp:399
+#: mediamanager/tdehardwarebackend.cpp:1363
+#: mediamanager/tdehardwarebackend.cpp:1378
#, fuzzy, c-format
msgid "No such medium: %1"
msgstr "Tiada fail sedemikian"
-#: mediamanager/fstabbackend.cpp:398
+#: mediamanager/fstabbackend.cpp:408
msgid "CD Recorder"
msgstr "Perakam CD"
-#: mediamanager/fstabbackend.cpp:404
+#: mediamanager/fstabbackend.cpp:414
msgid "DVD"
msgstr "DVD"
-#: mediamanager/fstabbackend.cpp:415
+#: mediamanager/fstabbackend.cpp:425
msgid "CD-ROM"
msgstr "CD-ROM"
-#: mediamanager/fstabbackend.cpp:428
+#: mediamanager/fstabbackend.cpp:438
msgid "Floppy"
msgstr "Cakera Liut"
-#: mediamanager/fstabbackend.cpp:436
+#: mediamanager/fstabbackend.cpp:446
msgid "Zip Disk"
msgstr "Cakera Zip"
-#: mediamanager/fstabbackend.cpp:447
+#: mediamanager/fstabbackend.cpp:457
msgid "Removable Device"
msgstr "Peranti Boleh Buang"
-#: mediamanager/fstabbackend.cpp:452 mediamanager/fstabbackend.cpp:458
+#: mediamanager/fstabbackend.cpp:462 mediamanager/fstabbackend.cpp:468
msgid "Remote Share"
msgstr "Perkongsian Jauh"
-#: mediamanager/fstabbackend.cpp:463
+#: mediamanager/fstabbackend.cpp:473
msgid "Hard Disk"
msgstr "Cakera Keras"
-#: mediamanager/halbackend.cpp:749 mediamanager/tdehardwarebackend.cpp:805
+#: mediamanager/halbackend.cpp:744 mediamanager/tdehardwarebackend.cpp:808
#, fuzzy
msgid "Unknown Drive"
msgstr "Entah"
-#: mediamanager/halbackend.cpp:761 mediamanager/tdehardwarebackend.cpp:835
+#: mediamanager/halbackend.cpp:756 mediamanager/tdehardwarebackend.cpp:838
#, fuzzy
msgid "Floppy Drive"
msgstr "Cakera Liut"
-#: mediamanager/halbackend.cpp:769
+#: mediamanager/halbackend.cpp:764
#, fuzzy
msgid "Zip Drive"
msgstr "Cakera Zip"
-#: mediamanager/halbackend.cpp:839 mediamanager/tdehardwarebackend.cpp:892
+#: mediamanager/halbackend.cpp:834 mediamanager/tdehardwarebackend.cpp:895
msgid "Camera"
msgstr "Kamera"
-#: mediamanager/halbackend.cpp:1221 mediamanager/halbackend.cpp:1247
+#: mediamanager/halbackend.cpp:1216 mediamanager/halbackend.cpp:1242
msgid "Authenticate"
msgstr ""
-#: mediamanager/halbackend.cpp:1222
+#: mediamanager/halbackend.cpp:1217
msgid ""
"<big><b>System policy prevents mounting internal media</b></big><br/"
">Authentication is required to perform this action. Please enter your "
"password to verify."
msgstr ""
-#: mediamanager/halbackend.cpp:1248
+#: mediamanager/halbackend.cpp:1243
msgid ""
"<big><b>System policy prevents unmounting media mounted by other users</b></"
"big><br/>Authentication is required to perform this action. Please enter "
"your password to verify."
msgstr ""
-#: mediamanager/halbackend.cpp:1284
+#: mediamanager/halbackend.cpp:1259 mediamanager/halbackend.cpp:1268
+#: mediamanager/halbackend.cpp:1849 mediamanager/halbackend.cpp:1916
+#: mounthelper/tdeio_media_mounthelper.cpp:58
+#, fuzzy
+msgid "Internal Error"
+msgstr "Ralat dalaman.\n"
+
+#: mediamanager/halbackend.cpp:1279
#, fuzzy
msgid "Invalid filesystem type"
msgstr "jenis rentetan m tidak sah `%s'"
-#: mediamanager/halbackend.cpp:1286
+#: mediamanager/halbackend.cpp:1281
msgid ""
"Permission denied<p>Please ensure that:<br>1. You have permission to access "
"this device.<br>2. This device node is not listed in /etc/fstab.</p>"
msgstr ""
-#: mediamanager/halbackend.cpp:1290
+#: mediamanager/halbackend.cpp:1285
#, fuzzy
msgid "Device is already mounted."
msgstr "Peranti '%s' telah digunakan dalam multipath '%s'"
-#: mediamanager/halbackend.cpp:1340
+#: mediamanager/halbackend.cpp:1335
msgid ""
"Moreover, programs still using the device have been detected. They are "
"listed below. You have to close them or change their working directory "
"before attempting to unmount the device again."
msgstr ""
-#: mediamanager/halbackend.cpp:1381 mediamanager/tdehardwarebackend.cpp:1588
+#: mediamanager/halbackend.cpp:1376 mediamanager/tdehardwarebackend.cpp:1618
msgid ""
"Programs that were still using the device have been forcibly terminated. "
"They are listed below."
msgstr ""
-#: mediamanager/halbackend.cpp:1402 mediamanager/halbackend.cpp:1715
-#: mediamanager/tdehardwarebackend.cpp:1406
-#: mediamanager/tdehardwarebackend.cpp:1424
-#: mediamanager/tdehardwarebackend.cpp:1464
+#: mediamanager/halbackend.cpp:1397 mediamanager/halbackend.cpp:1742
+#: mediamanager/tdehardwarebackend.cpp:1430
+#: mediamanager/tdehardwarebackend.cpp:1452
+#: mediamanager/tdehardwarebackend.cpp:1494
msgid ""
"Unfortunately, the device <b>%1</b> (%2) named <b>'%3'</b> and currently "
"mounted at <b>%4</b> could not be unmounted. "
msgstr ""
-#: mediamanager/halbackend.cpp:1408 mediamanager/tdehardwarebackend.cpp:1470
+#: mediamanager/halbackend.cpp:1403 mediamanager/tdehardwarebackend.cpp:1500
msgid "The following error was returned by umount command:"
msgstr ""
-#: mediamanager/halbackend.cpp:1478
+#: mediamanager/halbackend.cpp:1567 mediamanager/tdehardwarebackend.cpp:1322
+msgid "Cannot mount encrypted locked drives!"
+msgstr ""
+
+#: mediamanager/halbackend.cpp:1682 mediamanager/halbackend.cpp:1703
+#: mediamanager/halbackend.cpp:1716 mediamanager/halbackend.cpp:1830
+#: mediamanager/halbackend.cpp:1840 mediamanager/halbackend.cpp:1899
+#: mediamanager/halbackend.cpp:1907
#, fuzzy
-msgid "Permission denied"
-msgstr "tiada kebenaran"
+msgid "Internal error"
+msgstr "Ralat dalaman.\n"
-#: mediamanager/halbackend.cpp:1562 mediamanager/tdehardwarebackend.cpp:1232
-msgid "Cannot mount encrypted drives!"
-msgstr ""
+#: mediamanager/halbackend.cpp:1694
+#, fuzzy
+msgid "Unknown error"
+msgstr "Entah"
-#: mediamanager/halbackend.cpp:1721
+#: mediamanager/halbackend.cpp:1748
msgid "Unmounting failed due to the following error:"
msgstr ""
-#: mediamanager/halbackend.cpp:1723
+#: mediamanager/halbackend.cpp:1750
#, fuzzy
msgid "Device is Busy:"
msgstr "Fail \"%s\" adalah sebuah fail peranti"
-#: mediamanager/halbackend.cpp:1727
+#: mediamanager/halbackend.cpp:1754
msgid ""
"Permission denied<p>Please ensure that:<br>1. You have permission to access "
"this device.<br>2. This device was originally mounted using TDE.</p>"
msgstr ""
-#: mediamanager/halbackend.cpp:1739
+#: mediamanager/halbackend.cpp:1766
msgid ""
"%1<p><b>Would you like to forcibly terminate these processes?</b><br><i>All "
"unsaved data would be lost</i>"
msgstr ""
-#: mediamanager/halbackend.cpp:1811
+#: mediamanager/halbackend.cpp:1852
msgid "Wrong password"
msgstr ""
-#: mediamanager/mediamanager.cpp:247 mediamanager/mediamanager.cpp:266
-#: mediamanager/mediamanager.cpp:285 mediamanager/mediamanager.cpp:293
-#: mediamanager/mediamanager.cpp:302 mediamanager/mediamanager.cpp:310
-msgid "Feature only available with HAL"
+#: mediamanager/mediamanager.cpp:248 mediamanager/mediamanager.cpp:275
+msgid "Feature only available with the TDE hardware backend"
msgstr ""
-#: mediamanager/mediamanager.cpp:252
-msgid "Feature only available with the TDE hardware backend"
+#: mediamanager/mediamanager.cpp:255 mediamanager/mediamanager.cpp:282
+#: mediamanager/mediamanager.cpp:312 mediamanager/mediamanager.cpp:343
+msgid "Feature only available with HAL"
msgstr ""
-#: mediamanager/mediamanager.cpp:256 mediamanager/mediamanager.cpp:271
-#: mediamanager/mediamanager.cpp:275
+#: mediamanager/mediamanager.cpp:262 mediamanager/mediamanager.cpp:289
+#: mediamanager/mediamanager.cpp:320 mediamanager/mediamanager.cpp:350
msgid "Feature only available with HAL or TDE hardware backend"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:480
-#: mediamanager/tdehardwarebackend.cpp:517
-#: mediamanager/tdehardwarebackend.cpp:750
+#: mediamanager/tdehardwarebackend.cpp:483
+#: mediamanager/tdehardwarebackend.cpp:520
+#: mediamanager/tdehardwarebackend.cpp:753
#, fuzzy
msgid "%1 Removable Device"
msgstr "Peranti Boleh Buang"
-#: mediamanager/tdehardwarebackend.cpp:525
+#: mediamanager/tdehardwarebackend.cpp:528
#, fuzzy
msgid "Blank CD-ROM"
msgstr "CD-ROM"
-#: mediamanager/tdehardwarebackend.cpp:534
+#: mediamanager/tdehardwarebackend.cpp:537
msgid "Blank CD-R"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:543
+#: mediamanager/tdehardwarebackend.cpp:546
msgid "Blank CD-RW"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:552
+#: mediamanager/tdehardwarebackend.cpp:555
msgid "Blank Magneto-Optical CD"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:561
+#: mediamanager/tdehardwarebackend.cpp:564
msgid "Blank Mount Ranier CD-RW"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:570
+#: mediamanager/tdehardwarebackend.cpp:573
msgid "Blank Mount Ranier CD-RW-W"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:579
+#: mediamanager/tdehardwarebackend.cpp:582
msgid "Blank DVD-ROM"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:588
+#: mediamanager/tdehardwarebackend.cpp:591
msgid "Blank DVD-RAM"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:597
+#: mediamanager/tdehardwarebackend.cpp:600
msgid "Blank DVD-R"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:606
+#: mediamanager/tdehardwarebackend.cpp:609
msgid "Blank DVD-RW"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:615
+#: mediamanager/tdehardwarebackend.cpp:618
msgid "Blank Dual Layer DVD-R"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:624
+#: mediamanager/tdehardwarebackend.cpp:627
msgid "Blank Dual Layer DVD-RW"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:633
+#: mediamanager/tdehardwarebackend.cpp:636
msgid "Blank DVD+R"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:642
+#: mediamanager/tdehardwarebackend.cpp:645
msgid "Blank DVD+RW"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:651
+#: mediamanager/tdehardwarebackend.cpp:654
msgid "Blank Dual Layer DVD+R"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:660
+#: mediamanager/tdehardwarebackend.cpp:663
msgid "Blank Dual Layer DVD+RW"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:669
+#: mediamanager/tdehardwarebackend.cpp:672
msgid "Blank BD-ROM"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:678
+#: mediamanager/tdehardwarebackend.cpp:681
msgid "Blank BD-R"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:687
+#: mediamanager/tdehardwarebackend.cpp:690
msgid "Blank BD-RW"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:696
+#: mediamanager/tdehardwarebackend.cpp:699
msgid "Blank HDDVD-ROM"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:705
+#: mediamanager/tdehardwarebackend.cpp:708
msgid "Blank HDDVD-R"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:714
+#: mediamanager/tdehardwarebackend.cpp:717
msgid "Blank HDDVD-RW"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:721
+#: mediamanager/tdehardwarebackend.cpp:724
msgid "Audio CD"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:742
+#: mediamanager/tdehardwarebackend.cpp:745
msgid "%1 Fixed Disk (%2)"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:849
+#: mediamanager/tdehardwarebackend.cpp:852
#, fuzzy
msgid "%1 Zip Disk"
msgstr "Cakera Zip"
-#: mediamanager/tdehardwarebackend.cpp:1212
-#: mediamanager/tdehardwarebackend.cpp:1392
-#, fuzzy
-msgid "Internal error"
-msgstr "Ralat dalaman.\n"
+#: mediamanager/tdehardwarebackend.cpp:1224
+#: mediamanager/tdehardwarebackend.cpp:1417
+msgid "Internal error. Couldn't find medium."
+msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:1239
-msgid ""
-"<qt>Unable to mount this device.<p>Potential reasons include:<br>Improper "
-"device and/or user privilege level<br>Corrupt data on storage device"
+#: mediamanager/tdehardwarebackend.cpp:1249
+#: mediamanager/tdehardwarebackend.cpp:1323
+msgid "Unable to mount this device."
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:1241
-#: mediamanager/tdehardwarebackend.cpp:1316
-#: mediamanager/tdehardwarebackend.cpp:1408
-#: mediamanager/tdehardwarebackend.cpp:1426
+#: mediamanager/tdehardwarebackend.cpp:1252
+#: mediamanager/tdehardwarebackend.cpp:1326
+#: mediamanager/tdehardwarebackend.cpp:1435
+#: mediamanager/tdehardwarebackend.cpp:1457
msgid "<p>Technical details:<br>"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:1314
-msgid ""
-"<qt>Unable to mount this device.<p>Potential reasons include:<br>Improper "
-"device and/or user privilege level<br>Corrupt data on storage "
-"device<br>Incorrect encryption password"
+#: mediamanager/tdehardwarebackend.cpp:1284
+msgid "Decryption aborted"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:1420
+#: mediamanager/tdehardwarebackend.cpp:1443
msgid ""
"<qt>The device <b>%1</b> (%2) named <b>'%3'</b> and currently mounted at <b>"
"%4</b> can not be unmounted at this time.<p>%5<p><b>Would you like to "
@@ -394,7 +399,7 @@ msgid ""
"lost</i>"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:1547
+#: mediamanager/tdehardwarebackend.cpp:1577
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 "
@@ -405,7 +410,7 @@ msgstr ""
msgid "%1 cannot be found."
msgstr "%1 tidak dapat ditemui."
-#: mounthelper/tdeio_media_mounthelper.cpp:86
+#: mounthelper/tdeio_media_mounthelper.cpp:87
msgid "%1 is not a mountable media."
msgstr "%1 bukan media boleh lekap."
@@ -416,40 +421,48 @@ msgstr "%1 bukan media boleh lekap."
#: mounthelper/tdeio_media_mounthelper.cpp:107
#, fuzzy
-msgid "%1 is already decrypted."
+msgid "%1 is already unlocked."
msgstr "Peranti '%s' telah digunakan dalam multipath '%s'"
-#: mounthelper/tdeio_media_mounthelper.cpp:228
+#: mounthelper/tdeio_media_mounthelper.cpp:139
+msgid "Unknown unmount error."
+msgstr ""
+
+#: mounthelper/tdeio_media_mounthelper.cpp:246
msgid "The device was successfully unmounted, but the tray could not be opened"
msgstr ""
-#: mounthelper/tdeio_media_mounthelper.cpp:230
+#: mounthelper/tdeio_media_mounthelper.cpp:248
msgid "The device was successfully unmounted, but could not be ejected"
msgstr ""
-#: mounthelper/tdeio_media_mounthelper.cpp:275
+#: mounthelper/tdeio_media_mounthelper.cpp:281
+msgid "Unknown decrypt error."
+msgstr ""
+
+#: mounthelper/tdeio_media_mounthelper.cpp:295
#, fuzzy
msgid "Decrypt given URL"
msgstr "Nyahlekap URL diberi"
-#: mounthelper/tdeio_media_mounthelper.cpp:276
+#: mounthelper/tdeio_media_mounthelper.cpp:296
msgid "Unmount given URL"
msgstr "Nyahlekap URL diberi"
-#: mounthelper/tdeio_media_mounthelper.cpp:277
+#: mounthelper/tdeio_media_mounthelper.cpp:297
msgid "Mount given URL (default)"
msgstr "Lekap URL diberi (default)"
-#: mounthelper/tdeio_media_mounthelper.cpp:278
+#: mounthelper/tdeio_media_mounthelper.cpp:298
msgid "Eject given URL via tdeeject"
msgstr "Lenting URL diberi dengan tdeeject"
-#: mounthelper/tdeio_media_mounthelper.cpp:279
+#: mounthelper/tdeio_media_mounthelper.cpp:299
msgid "Unmount and Eject given URL (necessary for some USB devices)"
msgstr ""
"Nyahlekap dan Lenting URL yang diberi (perlu untuk sesetengah peranti USB)"
-#: mounthelper/tdeio_media_mounthelper.cpp:280
+#: mounthelper/tdeio_media_mounthelper.cpp:300
msgid "media:/ URL to mount/unmount/eject/remove"
msgstr "media:/ URL hendak dilekap/nyahlekap/lenting/buang"
@@ -472,43 +485,43 @@ msgstr "Keluar tanpa simpan perubahan?"
msgid "&Mounting"
msgstr "melekapkan "
-#: tdefile-plugin/tdefilemediaplugin.cpp:190
+#: tdefile-plugin/tdefilemediaplugin.cpp:184
msgid "Medium Information"
msgstr "Maklumat Media"
-#: tdefile-plugin/tdefilemediaplugin.cpp:193
+#: tdefile-plugin/tdefilemediaplugin.cpp:187
msgid "Free"
msgstr "Belum Diguna"
-#: tdefile-plugin/tdefilemediaplugin.cpp:196
+#: tdefile-plugin/tdefilemediaplugin.cpp:190
msgid "Used"
msgstr "Sudah Diguna"
-#: tdefile-plugin/tdefilemediaplugin.cpp:199
+#: tdefile-plugin/tdefilemediaplugin.cpp:193
msgid "Total"
msgstr "Jumlah"
-#: tdefile-plugin/tdefilemediaplugin.cpp:202
+#: tdefile-plugin/tdefilemediaplugin.cpp:196
msgid "Base URL"
msgstr "URL Asas"
-#: tdefile-plugin/tdefilemediaplugin.cpp:203
+#: tdefile-plugin/tdefilemediaplugin.cpp:197
msgid "Mount Point"
msgstr "Lekapkan Titik"
-#: tdefile-plugin/tdefilemediaplugin.cpp:204
+#: tdefile-plugin/tdefilemediaplugin.cpp:198
msgid "Device Node"
msgstr "Nod Peranti"
-#: tdefile-plugin/tdefilemediaplugin.cpp:206
+#: tdefile-plugin/tdefilemediaplugin.cpp:200
msgid "Medium Summary"
msgstr "Ringkasan Media"
-#: tdefile-plugin/tdefilemediaplugin.cpp:208
+#: tdefile-plugin/tdefilemediaplugin.cpp:202
msgid "Usage"
msgstr "Penggunaan"
-#: tdefile-plugin/tdefilemediaplugin.cpp:210
+#: tdefile-plugin/tdefilemediaplugin.cpp:204
msgid "Bar Graph"
msgstr "Graf Bar"
@@ -580,23 +593,30 @@ msgid ""
"devices are plugged in."
msgstr ""
-#: mediamanager/decryptdialog.ui:24 mounthelper/decryptdialog.ui:24
+#: mediamanager/unlockdialog.ui:24 mounthelper/unlockdialog.ui:24
#, no-c-format
msgid "Decrypting Storage Device"
msgstr ""
-#: mediamanager/decryptdialog.ui:109 mounthelper/decryptdialog.ui:109
+#: mediamanager/unlockdialog.ui:109
#, no-c-format
msgid ""
-"<p><b>%1</b> is an encrypted storage device.</p>\n"
-"<p>Please enter the password to decrypt the storage device.</p>"
+"<p><b>%1</b> is an encrypted locked storage device.</p>\n"
+"<p>Please enter the password to unlock the storage device.</p>"
msgstr ""
-#: mediamanager/decryptdialog.ui:131 mounthelper/decryptdialog.ui:131
+#: mediamanager/unlockdialog.ui:131 mounthelper/unlockdialog.ui:131
#, no-c-format
msgid "&Password:"
msgstr ""
+#: mounthelper/unlockdialog.ui:109
+#, no-c-format
+msgid ""
+"<p><b>%1</b> is an encrypted storage device.</p>\n"
+"<p>Please enter the password to decrypt the storage device.</p>"
+msgstr ""
+
#: propsdlgplugin/propertiespagegui.ui:16
#, no-c-format
msgid "PropertiesPageGUI"
@@ -814,6 +834,10 @@ msgstr "Persekitaran Bercampur"
msgid "Filesystem: iso9660"
msgstr "Tiada sistemfail"
+#, fuzzy
+#~ msgid "Permission denied"
+#~ msgstr "tiada kebenaran"
+
#~ msgid ""
#~ "\n"
#~ "Please check that the disk is entered correctly."
diff --git a/tde-i18n-nb/messages/tdebase/tdeio_media.po b/tde-i18n-nb/messages/tdebase/tdeio_media.po
index 270eb978b96..9d0a1f8fda8 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: 2019-01-13 18:47+0100\n"
+"POT-Creation-Date: 2019-07-11 02:33+0200\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"
@@ -50,7 +50,6 @@ 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
-#: mounthelper/tdeio_media_mounthelper.cpp:256
msgid "The TDE mediamanager is not running."
msgstr "Mediehåndtereren i TDE kjører ikke."
@@ -58,7 +57,7 @@ msgstr "Mediehåndtereren i TDE kjører ikke."
msgid "This media name already exists."
msgstr "Dette medienavnet finnes allerede."
-#: mediaimpl.cpp:230 mediaimpl.cpp:293
+#: mediaimpl.cpp:230 mediaimpl.cpp:297
msgid "No such medium."
msgstr "Mediet finnes ikke."
@@ -66,116 +65,120 @@ msgstr "Mediet finnes ikke."
msgid "The drive is encrypted."
msgstr ""
-#: mediaimpl.cpp:272 mediamanager/halbackend.cpp:1264
-#: mediamanager/halbackend.cpp:1273 mediamanager/halbackend.cpp:1663
-#: mediamanager/halbackend.cpp:1680 mediamanager/halbackend.cpp:1691
-#: mediamanager/halbackend.cpp:1793 mediamanager/halbackend.cpp:1801
-#: mediamanager/halbackend.cpp:1808 mediamanager/halbackend.cpp:1848
-#: mediamanager/halbackend.cpp:1854 mediamanager/halbackend.cpp:1861
-#: mounthelper/tdeio_media_mounthelper.cpp:58
-msgid "Internal Error"
-msgstr "Intern feil"
+#: mediaimpl.cpp:274 mediamanager/tdehardwarebackend.cpp:201
+#: mediamanager/tdehardwarebackend.cpp:252
+#: mounthelper/tdeio_media_mounthelper.cpp:202
+msgid "Unknown mount error."
+msgstr ""
#: mediamanager/dialog.cpp:26 mounthelper/dialog.cpp:26
-msgid "Decrypt"
+msgid "Unlock"
msgstr ""
-#: mediamanager/fstabbackend.cpp:104 mediamanager/fstabbackend.cpp:114
-#: mediamanager/halbackend.cpp:1595 mediamanager/halbackend.cpp:1617
-#: mediamanager/halbackend.cpp:1776 mediamanager/halbackend.cpp:1831
-#: mediamanager/tdehardwarebackend.cpp:1349
-#: mediamanager/tdehardwarebackend.cpp:1360
+#: mediamanager/fstabbackend.cpp:105 mediamanager/fstabbackend.cpp:120
+#: mediamanager/halbackend.cpp:1598 mediamanager/halbackend.cpp:1625
+#: mediamanager/halbackend.cpp:1808 mediamanager/halbackend.cpp:1877
+#: mediamanager/mediamanager.cpp:363 mediamanager/mediamanager.cpp:375
+#: mediamanager/mediamanager.cpp:387 mediamanager/mediamanager.cpp:399
+#: mediamanager/tdehardwarebackend.cpp:1363
+#: mediamanager/tdehardwarebackend.cpp:1378
#, c-format
msgid "No such medium: %1"
msgstr "Mediet finnes ikke: %1"
-#: mediamanager/fstabbackend.cpp:398
+#: mediamanager/fstabbackend.cpp:408
msgid "CD Recorder"
msgstr "CD-brenner"
-#: mediamanager/fstabbackend.cpp:404
+#: mediamanager/fstabbackend.cpp:414
msgid "DVD"
msgstr "DVD"
-#: mediamanager/fstabbackend.cpp:415
+#: mediamanager/fstabbackend.cpp:425
msgid "CD-ROM"
msgstr "CD-spiller"
-#: mediamanager/fstabbackend.cpp:428
+#: mediamanager/fstabbackend.cpp:438
msgid "Floppy"
msgstr "Diskett"
-#: mediamanager/fstabbackend.cpp:436
+#: mediamanager/fstabbackend.cpp:446
msgid "Zip Disk"
msgstr "Zip-disk"
-#: mediamanager/fstabbackend.cpp:447
+#: mediamanager/fstabbackend.cpp:457
msgid "Removable Device"
msgstr "Flyttbar enhet"
-#: mediamanager/fstabbackend.cpp:452 mediamanager/fstabbackend.cpp:458
+#: mediamanager/fstabbackend.cpp:462 mediamanager/fstabbackend.cpp:468
msgid "Remote Share"
msgstr "Delt nettverksressurs"
-#: mediamanager/fstabbackend.cpp:463
+#: mediamanager/fstabbackend.cpp:473
msgid "Hard Disk"
msgstr "Harddisk"
# | msgid "Unknown"
-#: mediamanager/halbackend.cpp:749 mediamanager/tdehardwarebackend.cpp:805
+#: mediamanager/halbackend.cpp:744 mediamanager/tdehardwarebackend.cpp:808
#, fuzzy
msgid "Unknown Drive"
msgstr "Ukjent"
# | msgid "Floppy"
-#: mediamanager/halbackend.cpp:761 mediamanager/tdehardwarebackend.cpp:835
+#: mediamanager/halbackend.cpp:756 mediamanager/tdehardwarebackend.cpp:838
#, fuzzy
msgid "Floppy Drive"
msgstr "Diskett"
# | msgid "Zip Disk"
-#: mediamanager/halbackend.cpp:769
+#: mediamanager/halbackend.cpp:764
#, fuzzy
msgid "Zip Drive"
msgstr "Zip-disk"
-#: mediamanager/halbackend.cpp:839 mediamanager/tdehardwarebackend.cpp:892
+#: mediamanager/halbackend.cpp:834 mediamanager/tdehardwarebackend.cpp:895
msgid "Camera"
msgstr "Kamera"
-#: mediamanager/halbackend.cpp:1221 mediamanager/halbackend.cpp:1247
+#: mediamanager/halbackend.cpp:1216 mediamanager/halbackend.cpp:1242
msgid "Authenticate"
msgstr ""
-#: mediamanager/halbackend.cpp:1222
+#: mediamanager/halbackend.cpp:1217
msgid ""
"<big><b>System policy prevents mounting internal media</b></big><br/"
">Authentication is required to perform this action. Please enter your "
"password to verify."
msgstr ""
-#: mediamanager/halbackend.cpp:1248
+#: mediamanager/halbackend.cpp:1243
msgid ""
"<big><b>System policy prevents unmounting media mounted by other users</b></"
"big><br/>Authentication is required to perform this action. Please enter "
"your password to verify."
msgstr ""
-#: mediamanager/halbackend.cpp:1284
+#: mediamanager/halbackend.cpp:1259 mediamanager/halbackend.cpp:1268
+#: mediamanager/halbackend.cpp:1849 mediamanager/halbackend.cpp:1916
+#: mounthelper/tdeio_media_mounthelper.cpp:58
+msgid "Internal Error"
+msgstr "Intern feil"
+
+#: mediamanager/halbackend.cpp:1279
msgid "Invalid filesystem type"
msgstr "Ugyldig filsystemtype"
-#: mediamanager/halbackend.cpp:1286
+#: mediamanager/halbackend.cpp:1281
msgid ""
"Permission denied<p>Please ensure that:<br>1. You have permission to access "
"this device.<br>2. This device node is not listed in /etc/fstab.</p>"
msgstr ""
-#: mediamanager/halbackend.cpp:1290
+#: mediamanager/halbackend.cpp:1285
msgid "Device is already mounted."
msgstr "Enheten er allerede montert."
-#: mediamanager/halbackend.cpp:1340
+#: mediamanager/halbackend.cpp:1335
msgid ""
"Moreover, programs still using the device have been detected. They are "
"listed below. You have to close them or change their working directory "
@@ -185,16 +188,16 @@ msgstr ""
"lista nedenfor. Før en avmontering kan forsøkes igjen må du må lukke disse "
"eller endre deres arbeidsmapper."
-#: mediamanager/halbackend.cpp:1381 mediamanager/tdehardwarebackend.cpp:1588
+#: mediamanager/halbackend.cpp:1376 mediamanager/tdehardwarebackend.cpp:1618
msgid ""
"Programs that were still using the device have been forcibly terminated. "
"They are listed below."
msgstr ""
-#: mediamanager/halbackend.cpp:1402 mediamanager/halbackend.cpp:1715
-#: mediamanager/tdehardwarebackend.cpp:1406
-#: mediamanager/tdehardwarebackend.cpp:1424
-#: mediamanager/tdehardwarebackend.cpp:1464
+#: mediamanager/halbackend.cpp:1397 mediamanager/halbackend.cpp:1742
+#: mediamanager/tdehardwarebackend.cpp:1430
+#: mediamanager/tdehardwarebackend.cpp:1452
+#: mediamanager/tdehardwarebackend.cpp:1494
msgid ""
"Unfortunately, the device <b>%1</b> (%2) named <b>'%3'</b> and currently "
"mounted at <b>%4</b> could not be unmounted. "
@@ -202,196 +205,199 @@ msgstr ""
"Desverre, enheten <b>%1</b> (%2) navngitt <b>'%3'</b> og montert på <b>%4</"
"b> kunne ikke avmonteres. "
-#: mediamanager/halbackend.cpp:1408 mediamanager/tdehardwarebackend.cpp:1470
+#: mediamanager/halbackend.cpp:1403 mediamanager/tdehardwarebackend.cpp:1500
msgid "The following error was returned by umount command:"
msgstr "Følgende feil ble returnert av kommandoen for avmontering:"
-#: mediamanager/halbackend.cpp:1478
+#: mediamanager/halbackend.cpp:1567 mediamanager/tdehardwarebackend.cpp:1322
+msgid "Cannot mount encrypted locked drives!"
+msgstr ""
+
+#: mediamanager/halbackend.cpp:1682 mediamanager/halbackend.cpp:1703
+#: mediamanager/halbackend.cpp:1716 mediamanager/halbackend.cpp:1830
+#: mediamanager/halbackend.cpp:1840 mediamanager/halbackend.cpp:1899
+#: mediamanager/halbackend.cpp:1907
#, fuzzy
-msgid "Permission denied"
-msgstr "Utilstrekkelige rettigheter"
+msgid "Internal error"
+msgstr "Intern feil"
-#: mediamanager/halbackend.cpp:1562 mediamanager/tdehardwarebackend.cpp:1232
-msgid "Cannot mount encrypted drives!"
-msgstr ""
+#: mediamanager/halbackend.cpp:1694
+#, fuzzy
+#| msgid "Unknown"
+msgid "Unknown error"
+msgstr "Ukjent"
-#: mediamanager/halbackend.cpp:1721
+#: mediamanager/halbackend.cpp:1748
msgid "Unmounting failed due to the following error:"
msgstr "Avmontering feilet på grunn av følgende feil:"
-#: mediamanager/halbackend.cpp:1723
+#: mediamanager/halbackend.cpp:1750
msgid "Device is Busy:"
msgstr "Enheten er opptatt:"
-#: mediamanager/halbackend.cpp:1727
+#: mediamanager/halbackend.cpp:1754
msgid ""
"Permission denied<p>Please ensure that:<br>1. You have permission to access "
"this device.<br>2. This device was originally mounted using TDE.</p>"
msgstr ""
-#: mediamanager/halbackend.cpp:1739
+#: mediamanager/halbackend.cpp:1766
msgid ""
"%1<p><b>Would you like to forcibly terminate these processes?</b><br><i>All "
"unsaved data would be lost</i>"
msgstr ""
-#: mediamanager/halbackend.cpp:1811
+#: mediamanager/halbackend.cpp:1852
msgid "Wrong password"
msgstr ""
-#: mediamanager/mediamanager.cpp:247 mediamanager/mediamanager.cpp:266
-#: mediamanager/mediamanager.cpp:285 mediamanager/mediamanager.cpp:293
-#: mediamanager/mediamanager.cpp:302 mediamanager/mediamanager.cpp:310
-msgid "Feature only available with HAL"
-msgstr "Funksjonen er kun tilgjengelig med HAL"
-
-#: mediamanager/mediamanager.cpp:252
+#: mediamanager/mediamanager.cpp:248 mediamanager/mediamanager.cpp:275
#, fuzzy
msgid "Feature only available with the TDE hardware backend"
msgstr "Funksjonen er kun tilgjengelig med HAL"
-#: mediamanager/mediamanager.cpp:256 mediamanager/mediamanager.cpp:271
-#: mediamanager/mediamanager.cpp:275
+#: mediamanager/mediamanager.cpp:255 mediamanager/mediamanager.cpp:282
+#: mediamanager/mediamanager.cpp:312 mediamanager/mediamanager.cpp:343
+msgid "Feature only available with HAL"
+msgstr "Funksjonen er kun tilgjengelig med HAL"
+
+#: mediamanager/mediamanager.cpp:262 mediamanager/mediamanager.cpp:289
+#: mediamanager/mediamanager.cpp:320 mediamanager/mediamanager.cpp:350
#, fuzzy
msgid "Feature only available with HAL or TDE hardware backend"
msgstr "Funksjonen er kun tilgjengelig med HAL"
-#: mediamanager/tdehardwarebackend.cpp:480
-#: mediamanager/tdehardwarebackend.cpp:517
-#: mediamanager/tdehardwarebackend.cpp:750
+#: mediamanager/tdehardwarebackend.cpp:483
+#: mediamanager/tdehardwarebackend.cpp:520
+#: mediamanager/tdehardwarebackend.cpp:753
#, fuzzy
msgid "%1 Removable Device"
msgstr "Flyttbar enhet"
-#: mediamanager/tdehardwarebackend.cpp:525
+#: mediamanager/tdehardwarebackend.cpp:528
#, fuzzy
msgid "Blank CD-ROM"
msgstr "CD-spiller"
-#: mediamanager/tdehardwarebackend.cpp:534
+#: mediamanager/tdehardwarebackend.cpp:537
msgid "Blank CD-R"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:543
+#: mediamanager/tdehardwarebackend.cpp:546
msgid "Blank CD-RW"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:552
+#: mediamanager/tdehardwarebackend.cpp:555
msgid "Blank Magneto-Optical CD"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:561
+#: mediamanager/tdehardwarebackend.cpp:564
msgid "Blank Mount Ranier CD-RW"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:570
+#: mediamanager/tdehardwarebackend.cpp:573
msgid "Blank Mount Ranier CD-RW-W"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:579
+#: mediamanager/tdehardwarebackend.cpp:582
msgid "Blank DVD-ROM"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:588
+#: mediamanager/tdehardwarebackend.cpp:591
msgid "Blank DVD-RAM"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:597
+#: mediamanager/tdehardwarebackend.cpp:600
msgid "Blank DVD-R"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:606
+#: mediamanager/tdehardwarebackend.cpp:609
msgid "Blank DVD-RW"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:615
+#: mediamanager/tdehardwarebackend.cpp:618
msgid "Blank Dual Layer DVD-R"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:624
+#: mediamanager/tdehardwarebackend.cpp:627
msgid "Blank Dual Layer DVD-RW"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:633
+#: mediamanager/tdehardwarebackend.cpp:636
msgid "Blank DVD+R"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:642
+#: mediamanager/tdehardwarebackend.cpp:645
msgid "Blank DVD+RW"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:651
+#: mediamanager/tdehardwarebackend.cpp:654
msgid "Blank Dual Layer DVD+R"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:660
+#: mediamanager/tdehardwarebackend.cpp:663
msgid "Blank Dual Layer DVD+RW"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:669
+#: mediamanager/tdehardwarebackend.cpp:672
msgid "Blank BD-ROM"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:678
+#: mediamanager/tdehardwarebackend.cpp:681
msgid "Blank BD-R"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:687
+#: mediamanager/tdehardwarebackend.cpp:690
msgid "Blank BD-RW"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:696
+#: mediamanager/tdehardwarebackend.cpp:699
msgid "Blank HDDVD-ROM"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:705
+#: mediamanager/tdehardwarebackend.cpp:708
msgid "Blank HDDVD-R"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:714
+#: mediamanager/tdehardwarebackend.cpp:717
msgid "Blank HDDVD-RW"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:721
+#: mediamanager/tdehardwarebackend.cpp:724
msgid "Audio CD"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:742
+#: mediamanager/tdehardwarebackend.cpp:745
msgid "%1 Fixed Disk (%2)"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:849
+#: mediamanager/tdehardwarebackend.cpp:852
#, fuzzy
msgid "%1 Zip Disk"
msgstr "Zip-disk"
-#: mediamanager/tdehardwarebackend.cpp:1212
-#: mediamanager/tdehardwarebackend.cpp:1392
-#, fuzzy
-msgid "Internal error"
-msgstr "Intern feil"
+#: mediamanager/tdehardwarebackend.cpp:1224
+#: mediamanager/tdehardwarebackend.cpp:1417
+msgid "Internal error. Couldn't find medium."
+msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:1239
-msgid ""
-"<qt>Unable to mount this device.<p>Potential reasons include:<br>Improper "
-"device and/or user privilege level<br>Corrupt data on storage device"
+#: mediamanager/tdehardwarebackend.cpp:1249
+#: mediamanager/tdehardwarebackend.cpp:1323
+msgid "Unable to mount this device."
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:1241
-#: mediamanager/tdehardwarebackend.cpp:1316
-#: mediamanager/tdehardwarebackend.cpp:1408
-#: mediamanager/tdehardwarebackend.cpp:1426
+#: mediamanager/tdehardwarebackend.cpp:1252
+#: mediamanager/tdehardwarebackend.cpp:1326
+#: mediamanager/tdehardwarebackend.cpp:1435
+#: mediamanager/tdehardwarebackend.cpp:1457
msgid "<p>Technical details:<br>"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:1314
-msgid ""
-"<qt>Unable to mount this device.<p>Potential reasons include:<br>Improper "
-"device and/or user privilege level<br>Corrupt data on storage "
-"device<br>Incorrect encryption password"
+#: mediamanager/tdehardwarebackend.cpp:1284
+msgid "Decryption aborted"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:1420
+#: mediamanager/tdehardwarebackend.cpp:1443
msgid ""
"<qt>The device <b>%1</b> (%2) named <b>'%3'</b> and currently mounted at <b>"
"%4</b> can not be unmounted at this time.<p>%5<p><b>Would you like to "
@@ -399,7 +405,7 @@ msgid ""
"lost</i>"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:1547
+#: mediamanager/tdehardwarebackend.cpp:1577
#, fuzzy
msgid ""
"Programs still using the device have been detected. They are listed below. "
@@ -414,7 +420,7 @@ msgstr ""
msgid "%1 cannot be found."
msgstr "Finner ikke «%1»."
-#: mounthelper/tdeio_media_mounthelper.cpp:86
+#: mounthelper/tdeio_media_mounthelper.cpp:87
msgid "%1 is not a mountable media."
msgstr "«%1» er ikke et monterbart medium."
@@ -425,39 +431,47 @@ msgstr "«%1» er ikke et monterbart medium."
#: mounthelper/tdeio_media_mounthelper.cpp:107
#, fuzzy
-msgid "%1 is already decrypted."
+msgid "%1 is already unlocked."
msgstr "Enheten er allerede montert."
-#: mounthelper/tdeio_media_mounthelper.cpp:228
+#: mounthelper/tdeio_media_mounthelper.cpp:139
+msgid "Unknown unmount error."
+msgstr ""
+
+#: mounthelper/tdeio_media_mounthelper.cpp:246
msgid "The device was successfully unmounted, but the tray could not be opened"
msgstr "Avmontering av enheten var vellykket, men skuffen kunne ikke åpnes"
-#: mounthelper/tdeio_media_mounthelper.cpp:230
+#: 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:275
+#: mounthelper/tdeio_media_mounthelper.cpp:281
+msgid "Unknown decrypt error."
+msgstr ""
+
+#: mounthelper/tdeio_media_mounthelper.cpp:295
#, fuzzy
msgid "Decrypt given URL"
msgstr "Avmonter URL"
-#: mounthelper/tdeio_media_mounthelper.cpp:276
+#: mounthelper/tdeio_media_mounthelper.cpp:296
msgid "Unmount given URL"
msgstr "Avmonter URL"
-#: mounthelper/tdeio_media_mounthelper.cpp:277
+#: mounthelper/tdeio_media_mounthelper.cpp:297
msgid "Mount given URL (default)"
msgstr "Monter URL (standard)"
-#: mounthelper/tdeio_media_mounthelper.cpp:278
+#: mounthelper/tdeio_media_mounthelper.cpp:298
msgid "Eject given URL via tdeeject"
msgstr "Løs ut URL med tdeeject"
-#: mounthelper/tdeio_media_mounthelper.cpp:279
+#: mounthelper/tdeio_media_mounthelper.cpp:299
msgid "Unmount and Eject given URL (necessary for some USB devices)"
msgstr "Avmonter og løs ut valgt URL (nødvendig for enkelte USB-enheter)"
-#: mounthelper/tdeio_media_mounthelper.cpp:280
+#: mounthelper/tdeio_media_mounthelper.cpp:300
msgid "media:/ URL to mount/unmount/eject/remove"
msgstr "media:/-URL som skal monteres/avmonteres/løses ut/fjernes"
@@ -478,43 +492,43 @@ msgstr "Endringene kunne ikke lagres"
msgid "&Mounting"
msgstr "&Monterer"
-#: tdefile-plugin/tdefilemediaplugin.cpp:190
+#: tdefile-plugin/tdefilemediaplugin.cpp:184
msgid "Medium Information"
msgstr "Medieinformasjon"
-#: tdefile-plugin/tdefilemediaplugin.cpp:193
+#: tdefile-plugin/tdefilemediaplugin.cpp:187
msgid "Free"
msgstr "Ledig"
-#: tdefile-plugin/tdefilemediaplugin.cpp:196
+#: tdefile-plugin/tdefilemediaplugin.cpp:190
msgid "Used"
msgstr "Brukt"
-#: tdefile-plugin/tdefilemediaplugin.cpp:199
+#: tdefile-plugin/tdefilemediaplugin.cpp:193
msgid "Total"
msgstr "Totalt"
-#: tdefile-plugin/tdefilemediaplugin.cpp:202
+#: tdefile-plugin/tdefilemediaplugin.cpp:196
msgid "Base URL"
msgstr "Baseadresse"
-#: tdefile-plugin/tdefilemediaplugin.cpp:203
+#: tdefile-plugin/tdefilemediaplugin.cpp:197
msgid "Mount Point"
msgstr "Monteringspunkt"
-#: tdefile-plugin/tdefilemediaplugin.cpp:204
+#: tdefile-plugin/tdefilemediaplugin.cpp:198
msgid "Device Node"
msgstr "Enhetspunkt"
-#: tdefile-plugin/tdefilemediaplugin.cpp:206
+#: tdefile-plugin/tdefilemediaplugin.cpp:200
msgid "Medium Summary"
msgstr "Mediesammendrag"
-#: tdefile-plugin/tdefilemediaplugin.cpp:208
+#: tdefile-plugin/tdefilemediaplugin.cpp:202
msgid "Usage"
msgstr "Bruk"
-#: tdefile-plugin/tdefilemediaplugin.cpp:210
+#: tdefile-plugin/tdefilemediaplugin.cpp:204
msgid "Bar Graph"
msgstr "Søylediagram"
@@ -586,23 +600,30 @@ msgid ""
"devices are plugged in."
msgstr ""
-#: mediamanager/decryptdialog.ui:24 mounthelper/decryptdialog.ui:24
+#: mediamanager/unlockdialog.ui:24 mounthelper/unlockdialog.ui:24
#, no-c-format
msgid "Decrypting Storage Device"
msgstr ""
-#: mediamanager/decryptdialog.ui:109 mounthelper/decryptdialog.ui:109
+#: mediamanager/unlockdialog.ui:109
#, no-c-format
msgid ""
-"<p><b>%1</b> is an encrypted storage device.</p>\n"
-"<p>Please enter the password to decrypt the storage device.</p>"
+"<p><b>%1</b> is an encrypted locked storage device.</p>\n"
+"<p>Please enter the password to unlock the storage device.</p>"
msgstr ""
-#: mediamanager/decryptdialog.ui:131 mounthelper/decryptdialog.ui:131
+#: mediamanager/unlockdialog.ui:131 mounthelper/unlockdialog.ui:131
#, no-c-format
msgid "&Password:"
msgstr ""
+#: mounthelper/unlockdialog.ui:109
+#, no-c-format
+msgid ""
+"<p><b>%1</b> is an encrypted storage device.</p>\n"
+"<p>Please enter the password to decrypt the storage device.</p>"
+msgstr ""
+
#: propsdlgplugin/propertiespagegui.ui:16
#, no-c-format
msgid "PropertiesPageGUI"
@@ -864,6 +885,10 @@ msgstr "Blandet"
msgid "Filesystem: iso9660"
msgstr "Filsystem: iso9660"
+#, fuzzy
+#~ msgid "Permission denied"
+#~ msgstr "Utilstrekkelige rettigheter"
+
#~ msgid ""
#~ "\n"
#~ "Please check that the disk is entered correctly."
diff --git a/tde-i18n-nds/messages/tdebase/tdeio_media.po b/tde-i18n-nds/messages/tdebase/tdeio_media.po
index 1f380cb85e0..3861bc5c115 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: 2019-01-13 18:47+0100\n"
+"POT-Creation-Date: 2019-07-11 02:33+0200\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"
@@ -47,7 +47,6 @@ 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
-#: mounthelper/tdeio_media_mounthelper.cpp:256
msgid "The TDE mediamanager is not running."
msgstr "De TDE-Medienpleger löppt nich."
@@ -55,7 +54,7 @@ msgstr "De TDE-Medienpleger löppt nich."
msgid "This media name already exists."
msgstr "Dat gifft al en Medium mit dissen Naam."
-#: mediaimpl.cpp:230 mediaimpl.cpp:293
+#: mediaimpl.cpp:230 mediaimpl.cpp:297
msgid "No such medium."
msgstr "Dat gifft dit Medium nich."
@@ -63,110 +62,114 @@ msgstr "Dat gifft dit Medium nich."
msgid "The drive is encrypted."
msgstr ""
-#: mediaimpl.cpp:272 mediamanager/halbackend.cpp:1264
-#: mediamanager/halbackend.cpp:1273 mediamanager/halbackend.cpp:1663
-#: mediamanager/halbackend.cpp:1680 mediamanager/halbackend.cpp:1691
-#: mediamanager/halbackend.cpp:1793 mediamanager/halbackend.cpp:1801
-#: mediamanager/halbackend.cpp:1808 mediamanager/halbackend.cpp:1848
-#: mediamanager/halbackend.cpp:1854 mediamanager/halbackend.cpp:1861
-#: mounthelper/tdeio_media_mounthelper.cpp:58
-msgid "Internal Error"
-msgstr "Intern Fehler"
+#: mediaimpl.cpp:274 mediamanager/tdehardwarebackend.cpp:201
+#: mediamanager/tdehardwarebackend.cpp:252
+#: mounthelper/tdeio_media_mounthelper.cpp:202
+msgid "Unknown mount error."
+msgstr ""
#: mediamanager/dialog.cpp:26 mounthelper/dialog.cpp:26
-msgid "Decrypt"
+msgid "Unlock"
msgstr ""
-#: mediamanager/fstabbackend.cpp:104 mediamanager/fstabbackend.cpp:114
-#: mediamanager/halbackend.cpp:1595 mediamanager/halbackend.cpp:1617
-#: mediamanager/halbackend.cpp:1776 mediamanager/halbackend.cpp:1831
-#: mediamanager/tdehardwarebackend.cpp:1349
-#: mediamanager/tdehardwarebackend.cpp:1360
+#: mediamanager/fstabbackend.cpp:105 mediamanager/fstabbackend.cpp:120
+#: mediamanager/halbackend.cpp:1598 mediamanager/halbackend.cpp:1625
+#: mediamanager/halbackend.cpp:1808 mediamanager/halbackend.cpp:1877
+#: mediamanager/mediamanager.cpp:363 mediamanager/mediamanager.cpp:375
+#: mediamanager/mediamanager.cpp:387 mediamanager/mediamanager.cpp:399
+#: mediamanager/tdehardwarebackend.cpp:1363
+#: mediamanager/tdehardwarebackend.cpp:1378
#, c-format
msgid "No such medium: %1"
msgstr "Dat gifft dit Medium nich: %1"
-#: mediamanager/fstabbackend.cpp:398
+#: mediamanager/fstabbackend.cpp:408
msgid "CD Recorder"
msgstr "CD-Opnehmer"
-#: mediamanager/fstabbackend.cpp:404
+#: mediamanager/fstabbackend.cpp:414
msgid "DVD"
msgstr "DVD"
-#: mediamanager/fstabbackend.cpp:415
+#: mediamanager/fstabbackend.cpp:425
msgid "CD-ROM"
msgstr "CD-ROM"
-#: mediamanager/fstabbackend.cpp:428
+#: mediamanager/fstabbackend.cpp:438
msgid "Floppy"
msgstr "Diskett"
-#: mediamanager/fstabbackend.cpp:436
+#: mediamanager/fstabbackend.cpp:446
msgid "Zip Disk"
msgstr "Zip-Diskett"
-#: mediamanager/fstabbackend.cpp:447
+#: mediamanager/fstabbackend.cpp:457
msgid "Removable Device"
msgstr "Wesselreedschap"
-#: mediamanager/fstabbackend.cpp:452 mediamanager/fstabbackend.cpp:458
+#: mediamanager/fstabbackend.cpp:462 mediamanager/fstabbackend.cpp:468
msgid "Remote Share"
msgstr "Feern Freegaav"
-#: mediamanager/fstabbackend.cpp:463
+#: mediamanager/fstabbackend.cpp:473
msgid "Hard Disk"
msgstr "Fastplaat"
-#: mediamanager/halbackend.cpp:749 mediamanager/tdehardwarebackend.cpp:805
+#: mediamanager/halbackend.cpp:744 mediamanager/tdehardwarebackend.cpp:808
msgid "Unknown Drive"
msgstr "Nich begäng Loopwark"
-#: mediamanager/halbackend.cpp:761 mediamanager/tdehardwarebackend.cpp:835
+#: mediamanager/halbackend.cpp:756 mediamanager/tdehardwarebackend.cpp:838
msgid "Floppy Drive"
msgstr "Diskettenloopwark"
-#: mediamanager/halbackend.cpp:769
+#: mediamanager/halbackend.cpp:764
msgid "Zip Drive"
msgstr "Zip-Loopwark"
-#: mediamanager/halbackend.cpp:839 mediamanager/tdehardwarebackend.cpp:892
+#: mediamanager/halbackend.cpp:834 mediamanager/tdehardwarebackend.cpp:895
msgid "Camera"
msgstr "Kamera"
-#: mediamanager/halbackend.cpp:1221 mediamanager/halbackend.cpp:1247
+#: mediamanager/halbackend.cpp:1216 mediamanager/halbackend.cpp:1242
msgid "Authenticate"
msgstr ""
-#: mediamanager/halbackend.cpp:1222
+#: mediamanager/halbackend.cpp:1217
msgid ""
"<big><b>System policy prevents mounting internal media</b></big><br/"
">Authentication is required to perform this action. Please enter your "
"password to verify."
msgstr ""
-#: mediamanager/halbackend.cpp:1248
+#: mediamanager/halbackend.cpp:1243
msgid ""
"<big><b>System policy prevents unmounting media mounted by other users</b></"
"big><br/>Authentication is required to perform this action. Please enter "
"your password to verify."
msgstr ""
-#: mediamanager/halbackend.cpp:1284
+#: mediamanager/halbackend.cpp:1259 mediamanager/halbackend.cpp:1268
+#: mediamanager/halbackend.cpp:1849 mediamanager/halbackend.cpp:1916
+#: mounthelper/tdeio_media_mounthelper.cpp:58
+msgid "Internal Error"
+msgstr "Intern Fehler"
+
+#: mediamanager/halbackend.cpp:1279
msgid "Invalid filesystem type"
msgstr "Leeg Dateisysteem-Typ"
-#: mediamanager/halbackend.cpp:1286
+#: mediamanager/halbackend.cpp:1281
msgid ""
"Permission denied<p>Please ensure that:<br>1. You have permission to access "
"this device.<br>2. This device node is not listed in /etc/fstab.</p>"
msgstr ""
-#: mediamanager/halbackend.cpp:1290
+#: mediamanager/halbackend.cpp:1285
msgid "Device is already mounted."
msgstr "Reedschap is al inhangt"
-#: mediamanager/halbackend.cpp:1340
+#: mediamanager/halbackend.cpp:1335
msgid ""
"Moreover, programs still using the device have been detected. They are "
"listed below. You have to close them or change their working directory "
@@ -176,16 +179,16 @@ msgstr ""
"oplist. Maak se bitte to oder änner ehr Arbeitorner, ehr Du dat Afhangen vun "
"de Reedschap nochmaal versöchst."
-#: mediamanager/halbackend.cpp:1381 mediamanager/tdehardwarebackend.cpp:1588
+#: mediamanager/halbackend.cpp:1376 mediamanager/tdehardwarebackend.cpp:1618
msgid ""
"Programs that were still using the device have been forcibly terminated. "
"They are listed below."
msgstr ""
-#: mediamanager/halbackend.cpp:1402 mediamanager/halbackend.cpp:1715
-#: mediamanager/tdehardwarebackend.cpp:1406
-#: mediamanager/tdehardwarebackend.cpp:1424
-#: mediamanager/tdehardwarebackend.cpp:1464
+#: mediamanager/halbackend.cpp:1397 mediamanager/halbackend.cpp:1742
+#: mediamanager/tdehardwarebackend.cpp:1430
+#: mediamanager/tdehardwarebackend.cpp:1452
+#: mediamanager/tdehardwarebackend.cpp:1494
msgid ""
"Unfortunately, the device <b>%1</b> (%2) named <b>'%3'</b> and currently "
"mounted at <b>%4</b> could not be unmounted. "
@@ -193,196 +196,199 @@ 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:1408 mediamanager/tdehardwarebackend.cpp:1470
+#: mediamanager/halbackend.cpp:1403 mediamanager/tdehardwarebackend.cpp:1500
msgid "The following error was returned by umount command:"
msgstr "De Befehl \"umount\" hett dissen Fehler torüchgeven:"
-#: mediamanager/halbackend.cpp:1478
+#: mediamanager/halbackend.cpp:1567 mediamanager/tdehardwarebackend.cpp:1322
+msgid "Cannot mount encrypted locked drives!"
+msgstr ""
+
+#: mediamanager/halbackend.cpp:1682 mediamanager/halbackend.cpp:1703
+#: mediamanager/halbackend.cpp:1716 mediamanager/halbackend.cpp:1830
+#: mediamanager/halbackend.cpp:1840 mediamanager/halbackend.cpp:1899
+#: mediamanager/halbackend.cpp:1907
#, fuzzy
-msgid "Permission denied"
-msgstr "Keen Verlöven"
+msgid "Internal error"
+msgstr "Intern Fehler"
-#: mediamanager/halbackend.cpp:1562 mediamanager/tdehardwarebackend.cpp:1232
-msgid "Cannot mount encrypted drives!"
-msgstr ""
+#: mediamanager/halbackend.cpp:1694
+#, fuzzy
+#| msgid "Unknown"
+msgid "Unknown error"
+msgstr "Nich bekannt"
-#: mediamanager/halbackend.cpp:1721
+#: mediamanager/halbackend.cpp:1748
msgid "Unmounting failed due to the following error:"
msgstr "Afhangen fehlslaan, wiel dat dissen Fehler geev:"
-#: mediamanager/halbackend.cpp:1723
+#: mediamanager/halbackend.cpp:1750
msgid "Device is Busy:"
msgstr "Reedschap hett to doon:"
-#: mediamanager/halbackend.cpp:1727
+#: mediamanager/halbackend.cpp:1754
msgid ""
"Permission denied<p>Please ensure that:<br>1. You have permission to access "
"this device.<br>2. This device was originally mounted using TDE.</p>"
msgstr ""
-#: mediamanager/halbackend.cpp:1739
+#: mediamanager/halbackend.cpp:1766
msgid ""
"%1<p><b>Would you like to forcibly terminate these processes?</b><br><i>All "
"unsaved data would be lost</i>"
msgstr ""
-#: mediamanager/halbackend.cpp:1811
+#: mediamanager/halbackend.cpp:1852
msgid "Wrong password"
msgstr ""
-#: mediamanager/mediamanager.cpp:247 mediamanager/mediamanager.cpp:266
-#: mediamanager/mediamanager.cpp:285 mediamanager/mediamanager.cpp:293
-#: mediamanager/mediamanager.cpp:302 mediamanager/mediamanager.cpp:310
-msgid "Feature only available with HAL"
-msgstr "Funkschoon bloots mit HAL verföögbor"
-
-#: mediamanager/mediamanager.cpp:252
+#: mediamanager/mediamanager.cpp:248 mediamanager/mediamanager.cpp:275
#, fuzzy
msgid "Feature only available with the TDE hardware backend"
msgstr "Funkschoon bloots mit HAL verföögbor"
-#: mediamanager/mediamanager.cpp:256 mediamanager/mediamanager.cpp:271
-#: mediamanager/mediamanager.cpp:275
+#: mediamanager/mediamanager.cpp:255 mediamanager/mediamanager.cpp:282
+#: mediamanager/mediamanager.cpp:312 mediamanager/mediamanager.cpp:343
+msgid "Feature only available with HAL"
+msgstr "Funkschoon bloots mit HAL verföögbor"
+
+#: mediamanager/mediamanager.cpp:262 mediamanager/mediamanager.cpp:289
+#: mediamanager/mediamanager.cpp:320 mediamanager/mediamanager.cpp:350
#, fuzzy
msgid "Feature only available with HAL or TDE hardware backend"
msgstr "Funkschoon bloots mit HAL verföögbor"
-#: mediamanager/tdehardwarebackend.cpp:480
-#: mediamanager/tdehardwarebackend.cpp:517
-#: mediamanager/tdehardwarebackend.cpp:750
+#: mediamanager/tdehardwarebackend.cpp:483
+#: mediamanager/tdehardwarebackend.cpp:520
+#: mediamanager/tdehardwarebackend.cpp:753
#, fuzzy
msgid "%1 Removable Device"
msgstr "Wesselreedschap"
-#: mediamanager/tdehardwarebackend.cpp:525
+#: mediamanager/tdehardwarebackend.cpp:528
#, fuzzy
msgid "Blank CD-ROM"
msgstr "CD-ROM"
-#: mediamanager/tdehardwarebackend.cpp:534
+#: mediamanager/tdehardwarebackend.cpp:537
msgid "Blank CD-R"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:543
+#: mediamanager/tdehardwarebackend.cpp:546
msgid "Blank CD-RW"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:552
+#: mediamanager/tdehardwarebackend.cpp:555
msgid "Blank Magneto-Optical CD"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:561
+#: mediamanager/tdehardwarebackend.cpp:564
msgid "Blank Mount Ranier CD-RW"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:570
+#: mediamanager/tdehardwarebackend.cpp:573
msgid "Blank Mount Ranier CD-RW-W"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:579
+#: mediamanager/tdehardwarebackend.cpp:582
msgid "Blank DVD-ROM"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:588
+#: mediamanager/tdehardwarebackend.cpp:591
msgid "Blank DVD-RAM"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:597
+#: mediamanager/tdehardwarebackend.cpp:600
msgid "Blank DVD-R"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:606
+#: mediamanager/tdehardwarebackend.cpp:609
msgid "Blank DVD-RW"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:615
+#: mediamanager/tdehardwarebackend.cpp:618
msgid "Blank Dual Layer DVD-R"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:624
+#: mediamanager/tdehardwarebackend.cpp:627
msgid "Blank Dual Layer DVD-RW"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:633
+#: mediamanager/tdehardwarebackend.cpp:636
msgid "Blank DVD+R"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:642
+#: mediamanager/tdehardwarebackend.cpp:645
msgid "Blank DVD+RW"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:651
+#: mediamanager/tdehardwarebackend.cpp:654
msgid "Blank Dual Layer DVD+R"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:660
+#: mediamanager/tdehardwarebackend.cpp:663
msgid "Blank Dual Layer DVD+RW"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:669
+#: mediamanager/tdehardwarebackend.cpp:672
msgid "Blank BD-ROM"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:678
+#: mediamanager/tdehardwarebackend.cpp:681
msgid "Blank BD-R"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:687
+#: mediamanager/tdehardwarebackend.cpp:690
msgid "Blank BD-RW"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:696
+#: mediamanager/tdehardwarebackend.cpp:699
msgid "Blank HDDVD-ROM"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:705
+#: mediamanager/tdehardwarebackend.cpp:708
msgid "Blank HDDVD-R"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:714
+#: mediamanager/tdehardwarebackend.cpp:717
msgid "Blank HDDVD-RW"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:721
+#: mediamanager/tdehardwarebackend.cpp:724
msgid "Audio CD"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:742
+#: mediamanager/tdehardwarebackend.cpp:745
msgid "%1 Fixed Disk (%2)"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:849
+#: mediamanager/tdehardwarebackend.cpp:852
#, fuzzy
msgid "%1 Zip Disk"
msgstr "Zip-Diskett"
-#: mediamanager/tdehardwarebackend.cpp:1212
-#: mediamanager/tdehardwarebackend.cpp:1392
-#, fuzzy
-msgid "Internal error"
-msgstr "Intern Fehler"
+#: mediamanager/tdehardwarebackend.cpp:1224
+#: mediamanager/tdehardwarebackend.cpp:1417
+msgid "Internal error. Couldn't find medium."
+msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:1239
-msgid ""
-"<qt>Unable to mount this device.<p>Potential reasons include:<br>Improper "
-"device and/or user privilege level<br>Corrupt data on storage device"
+#: mediamanager/tdehardwarebackend.cpp:1249
+#: mediamanager/tdehardwarebackend.cpp:1323
+msgid "Unable to mount this device."
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:1241
-#: mediamanager/tdehardwarebackend.cpp:1316
-#: mediamanager/tdehardwarebackend.cpp:1408
-#: mediamanager/tdehardwarebackend.cpp:1426
+#: mediamanager/tdehardwarebackend.cpp:1252
+#: mediamanager/tdehardwarebackend.cpp:1326
+#: mediamanager/tdehardwarebackend.cpp:1435
+#: mediamanager/tdehardwarebackend.cpp:1457
msgid "<p>Technical details:<br>"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:1314
-msgid ""
-"<qt>Unable to mount this device.<p>Potential reasons include:<br>Improper "
-"device and/or user privilege level<br>Corrupt data on storage "
-"device<br>Incorrect encryption password"
+#: mediamanager/tdehardwarebackend.cpp:1284
+msgid "Decryption aborted"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:1420
+#: mediamanager/tdehardwarebackend.cpp:1443
msgid ""
"<qt>The device <b>%1</b> (%2) named <b>'%3'</b> and currently mounted at <b>"
"%4</b> can not be unmounted at this time.<p>%5<p><b>Would you like to "
@@ -390,7 +396,7 @@ msgid ""
"lost</i>"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:1547
+#: mediamanager/tdehardwarebackend.cpp:1577
#, fuzzy
msgid ""
"Programs still using the device have been detected. They are listed below. "
@@ -405,7 +411,7 @@ msgstr ""
msgid "%1 cannot be found."
msgstr "%1 lett sik nich finnen."
-#: mounthelper/tdeio_media_mounthelper.cpp:86
+#: mounthelper/tdeio_media_mounthelper.cpp:87
msgid "%1 is not a mountable media."
msgstr "%1 is keen Medium, wat sik inhangen lett."
@@ -416,40 +422,48 @@ msgstr "%1 is keen Medium, wat sik inhangen lett."
#: mounthelper/tdeio_media_mounthelper.cpp:107
#, fuzzy
-msgid "%1 is already decrypted."
+msgid "%1 is already unlocked."
msgstr "Reedschap is al inhangt"
-#: mounthelper/tdeio_media_mounthelper.cpp:228
+#: mounthelper/tdeio_media_mounthelper.cpp:139
+msgid "Unknown unmount error."
+msgstr ""
+
+#: mounthelper/tdeio_media_mounthelper.cpp:246
msgid "The device was successfully unmounted, but the tray could not be opened"
msgstr "De Reedschap wöör afhangt, man de Schuuv lett sik nich opmaken."
-#: mounthelper/tdeio_media_mounthelper.cpp:230
+#: 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:275
+#: mounthelper/tdeio_media_mounthelper.cpp:281
+msgid "Unknown decrypt error."
+msgstr ""
+
+#: mounthelper/tdeio_media_mounthelper.cpp:295
#, fuzzy
msgid "Decrypt given URL"
msgstr "Angeven URL afhangen"
-#: mounthelper/tdeio_media_mounthelper.cpp:276
+#: mounthelper/tdeio_media_mounthelper.cpp:296
msgid "Unmount given URL"
msgstr "Angeven URL afhangen"
-#: mounthelper/tdeio_media_mounthelper.cpp:277
+#: mounthelper/tdeio_media_mounthelper.cpp:297
msgid "Mount given URL (default)"
msgstr "Angeven URL inhangen (Standard)"
-#: mounthelper/tdeio_media_mounthelper.cpp:278
+#: mounthelper/tdeio_media_mounthelper.cpp:298
msgid "Eject given URL via tdeeject"
msgstr "Angeven URL över tdeeject rutfohren"
-#: mounthelper/tdeio_media_mounthelper.cpp:279
+#: mounthelper/tdeio_media_mounthelper.cpp:299
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)"
-#: mounthelper/tdeio_media_mounthelper.cpp:280
+#: mounthelper/tdeio_media_mounthelper.cpp:300
msgid "media:/ URL to mount/unmount/eject/remove"
msgstr "media:/-URL för't Inhangen / Afhangen / Rutfohren / Utkoppeln"
@@ -470,43 +484,43 @@ msgstr "Sekern vun de Ännern fehlslaan"
msgid "&Mounting"
msgstr "&Inhangen"
-#: tdefile-plugin/tdefilemediaplugin.cpp:190
+#: tdefile-plugin/tdefilemediaplugin.cpp:184
msgid "Medium Information"
msgstr "Medium-Informatschonen"
-#: tdefile-plugin/tdefilemediaplugin.cpp:193
+#: tdefile-plugin/tdefilemediaplugin.cpp:187
msgid "Free"
msgstr "Free"
-#: tdefile-plugin/tdefilemediaplugin.cpp:196
+#: tdefile-plugin/tdefilemediaplugin.cpp:190
msgid "Used"
msgstr "Bruukt"
-#: tdefile-plugin/tdefilemediaplugin.cpp:199
+#: tdefile-plugin/tdefilemediaplugin.cpp:193
msgid "Total"
msgstr "Tosamen"
-#: tdefile-plugin/tdefilemediaplugin.cpp:202
+#: tdefile-plugin/tdefilemediaplugin.cpp:196
msgid "Base URL"
msgstr "Basis-URL"
-#: tdefile-plugin/tdefilemediaplugin.cpp:203
+#: tdefile-plugin/tdefilemediaplugin.cpp:197
msgid "Mount Point"
msgstr "Inhangt op"
-#: tdefile-plugin/tdefilemediaplugin.cpp:204
+#: tdefile-plugin/tdefilemediaplugin.cpp:198
msgid "Device Node"
msgstr "Reedschapdatei"
-#: tdefile-plugin/tdefilemediaplugin.cpp:206
+#: tdefile-plugin/tdefilemediaplugin.cpp:200
msgid "Medium Summary"
msgstr "Medium-Tosamenfaten"
-#: tdefile-plugin/tdefilemediaplugin.cpp:208
+#: tdefile-plugin/tdefilemediaplugin.cpp:202
msgid "Usage"
msgstr "Bruuk"
-#: tdefile-plugin/tdefilemediaplugin.cpp:210
+#: tdefile-plugin/tdefilemediaplugin.cpp:204
msgid "Bar Graph"
msgstr "Balkengrafik"
@@ -578,23 +592,30 @@ msgid ""
"devices are plugged in."
msgstr ""
-#: mediamanager/decryptdialog.ui:24 mounthelper/decryptdialog.ui:24
+#: mediamanager/unlockdialog.ui:24 mounthelper/unlockdialog.ui:24
#, no-c-format
msgid "Decrypting Storage Device"
msgstr ""
-#: mediamanager/decryptdialog.ui:109 mounthelper/decryptdialog.ui:109
+#: mediamanager/unlockdialog.ui:109
#, no-c-format
msgid ""
-"<p><b>%1</b> is an encrypted storage device.</p>\n"
-"<p>Please enter the password to decrypt the storage device.</p>"
+"<p><b>%1</b> is an encrypted locked storage device.</p>\n"
+"<p>Please enter the password to unlock the storage device.</p>"
msgstr ""
-#: mediamanager/decryptdialog.ui:131 mounthelper/decryptdialog.ui:131
+#: mediamanager/unlockdialog.ui:131 mounthelper/unlockdialog.ui:131
#, no-c-format
msgid "&Password:"
msgstr ""
+#: mounthelper/unlockdialog.ui:109
+#, no-c-format
+msgid ""
+"<p><b>%1</b> is an encrypted storage device.</p>\n"
+"<p>Please enter the password to decrypt the storage device.</p>"
+msgstr ""
+
#: propsdlgplugin/propertiespagegui.ui:16
#, no-c-format
msgid "PropertiesPageGUI"
@@ -857,3 +878,7 @@ msgstr "Mischt"
#, no-c-format
msgid "Filesystem: iso9660"
msgstr "Dateisysteem: ISO9660"
+
+#, 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 9dafe370a53..948c03bab31 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: 2019-01-13 18:47+0100\n"
+"POT-Creation-Date: 2019-07-11 02:33+0200\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"
@@ -48,7 +48,6 @@ 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
-#: mounthelper/tdeio_media_mounthelper.cpp:256
msgid "The TDE mediamanager is not running."
msgstr "De TDE-mediabeheerder draait niet."
@@ -56,7 +55,7 @@ msgstr "De TDE-mediabeheerder draait niet."
msgid "This media name already exists."
msgstr "Deze mediumnaam bestaat al."
-#: mediaimpl.cpp:230 mediaimpl.cpp:293
+#: mediaimpl.cpp:230 mediaimpl.cpp:297
msgid "No such medium."
msgstr "Medium bestaat niet."
@@ -64,110 +63,114 @@ msgstr "Medium bestaat niet."
msgid "The drive is encrypted."
msgstr ""
-#: mediaimpl.cpp:272 mediamanager/halbackend.cpp:1264
-#: mediamanager/halbackend.cpp:1273 mediamanager/halbackend.cpp:1663
-#: mediamanager/halbackend.cpp:1680 mediamanager/halbackend.cpp:1691
-#: mediamanager/halbackend.cpp:1793 mediamanager/halbackend.cpp:1801
-#: mediamanager/halbackend.cpp:1808 mediamanager/halbackend.cpp:1848
-#: mediamanager/halbackend.cpp:1854 mediamanager/halbackend.cpp:1861
-#: mounthelper/tdeio_media_mounthelper.cpp:58
-msgid "Internal Error"
-msgstr "Interne fout"
+#: mediaimpl.cpp:274 mediamanager/tdehardwarebackend.cpp:201
+#: mediamanager/tdehardwarebackend.cpp:252
+#: mounthelper/tdeio_media_mounthelper.cpp:202
+msgid "Unknown mount error."
+msgstr ""
#: mediamanager/dialog.cpp:26 mounthelper/dialog.cpp:26
-msgid "Decrypt"
+msgid "Unlock"
msgstr ""
-#: mediamanager/fstabbackend.cpp:104 mediamanager/fstabbackend.cpp:114
-#: mediamanager/halbackend.cpp:1595 mediamanager/halbackend.cpp:1617
-#: mediamanager/halbackend.cpp:1776 mediamanager/halbackend.cpp:1831
-#: mediamanager/tdehardwarebackend.cpp:1349
-#: mediamanager/tdehardwarebackend.cpp:1360
+#: mediamanager/fstabbackend.cpp:105 mediamanager/fstabbackend.cpp:120
+#: mediamanager/halbackend.cpp:1598 mediamanager/halbackend.cpp:1625
+#: mediamanager/halbackend.cpp:1808 mediamanager/halbackend.cpp:1877
+#: mediamanager/mediamanager.cpp:363 mediamanager/mediamanager.cpp:375
+#: mediamanager/mediamanager.cpp:387 mediamanager/mediamanager.cpp:399
+#: mediamanager/tdehardwarebackend.cpp:1363
+#: mediamanager/tdehardwarebackend.cpp:1378
#, c-format
msgid "No such medium: %1"
msgstr "Medium bestaat niet: %1"
-#: mediamanager/fstabbackend.cpp:398
+#: mediamanager/fstabbackend.cpp:408
msgid "CD Recorder"
msgstr "CD-recorder"
-#: mediamanager/fstabbackend.cpp:404
+#: mediamanager/fstabbackend.cpp:414
msgid "DVD"
msgstr "DVD"
-#: mediamanager/fstabbackend.cpp:415
+#: mediamanager/fstabbackend.cpp:425
msgid "CD-ROM"
msgstr "CD-ROM"
-#: mediamanager/fstabbackend.cpp:428
+#: mediamanager/fstabbackend.cpp:438
msgid "Floppy"
msgstr "Diskette"
-#: mediamanager/fstabbackend.cpp:436
+#: mediamanager/fstabbackend.cpp:446
msgid "Zip Disk"
msgstr "Zip-diskette"
-#: mediamanager/fstabbackend.cpp:447
+#: mediamanager/fstabbackend.cpp:457
msgid "Removable Device"
msgstr "Verwijderbaar apparaat"
-#: mediamanager/fstabbackend.cpp:452 mediamanager/fstabbackend.cpp:458
+#: mediamanager/fstabbackend.cpp:462 mediamanager/fstabbackend.cpp:468
msgid "Remote Share"
msgstr "Gedeelde bron op afstand"
-#: mediamanager/fstabbackend.cpp:463
+#: mediamanager/fstabbackend.cpp:473
msgid "Hard Disk"
msgstr "Harde schijf"
-#: mediamanager/halbackend.cpp:749 mediamanager/tdehardwarebackend.cpp:805
+#: mediamanager/halbackend.cpp:744 mediamanager/tdehardwarebackend.cpp:808
msgid "Unknown Drive"
msgstr "Onbekend station"
-#: mediamanager/halbackend.cpp:761 mediamanager/tdehardwarebackend.cpp:835
+#: mediamanager/halbackend.cpp:756 mediamanager/tdehardwarebackend.cpp:838
msgid "Floppy Drive"
msgstr "Diskettestation"
-#: mediamanager/halbackend.cpp:769
+#: mediamanager/halbackend.cpp:764
msgid "Zip Drive"
msgstr "Zip-station"
-#: mediamanager/halbackend.cpp:839 mediamanager/tdehardwarebackend.cpp:892
+#: mediamanager/halbackend.cpp:834 mediamanager/tdehardwarebackend.cpp:895
msgid "Camera"
msgstr "Camera"
-#: mediamanager/halbackend.cpp:1221 mediamanager/halbackend.cpp:1247
+#: mediamanager/halbackend.cpp:1216 mediamanager/halbackend.cpp:1242
msgid "Authenticate"
msgstr ""
-#: mediamanager/halbackend.cpp:1222
+#: mediamanager/halbackend.cpp:1217
msgid ""
"<big><b>System policy prevents mounting internal media</b></big><br/"
">Authentication is required to perform this action. Please enter your "
"password to verify."
msgstr ""
-#: mediamanager/halbackend.cpp:1248
+#: mediamanager/halbackend.cpp:1243
msgid ""
"<big><b>System policy prevents unmounting media mounted by other users</b></"
"big><br/>Authentication is required to perform this action. Please enter "
"your password to verify."
msgstr ""
-#: mediamanager/halbackend.cpp:1284
+#: mediamanager/halbackend.cpp:1259 mediamanager/halbackend.cpp:1268
+#: mediamanager/halbackend.cpp:1849 mediamanager/halbackend.cpp:1916
+#: mounthelper/tdeio_media_mounthelper.cpp:58
+msgid "Internal Error"
+msgstr "Interne fout"
+
+#: mediamanager/halbackend.cpp:1279
msgid "Invalid filesystem type"
msgstr "Ongeldig bestandssysteemtype"
-#: mediamanager/halbackend.cpp:1286
+#: mediamanager/halbackend.cpp:1281
msgid ""
"Permission denied<p>Please ensure that:<br>1. You have permission to access "
"this device.<br>2. This device node is not listed in /etc/fstab.</p>"
msgstr ""
-#: mediamanager/halbackend.cpp:1290
+#: mediamanager/halbackend.cpp:1285
msgid "Device is already mounted."
msgstr "Station is reeds aangekoppeld."
-#: mediamanager/halbackend.cpp:1340
+#: mediamanager/halbackend.cpp:1335
msgid ""
"Moreover, programs still using the device have been detected. They are "
"listed below. You have to close them or change their working directory "
@@ -177,16 +180,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:1381 mediamanager/tdehardwarebackend.cpp:1588
+#: mediamanager/halbackend.cpp:1376 mediamanager/tdehardwarebackend.cpp:1618
msgid ""
"Programs that were still using the device have been forcibly terminated. "
"They are listed below."
msgstr ""
-#: mediamanager/halbackend.cpp:1402 mediamanager/halbackend.cpp:1715
-#: mediamanager/tdehardwarebackend.cpp:1406
-#: mediamanager/tdehardwarebackend.cpp:1424
-#: mediamanager/tdehardwarebackend.cpp:1464
+#: mediamanager/halbackend.cpp:1397 mediamanager/halbackend.cpp:1742
+#: mediamanager/tdehardwarebackend.cpp:1430
+#: mediamanager/tdehardwarebackend.cpp:1452
+#: mediamanager/tdehardwarebackend.cpp:1494
msgid ""
"Unfortunately, the device <b>%1</b> (%2) named <b>'%3'</b> and currently "
"mounted at <b>%4</b> could not be unmounted. "
@@ -194,196 +197,199 @@ 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:1408 mediamanager/tdehardwarebackend.cpp:1470
+#: mediamanager/halbackend.cpp:1403 mediamanager/tdehardwarebackend.cpp:1500
msgid "The following error was returned by umount command:"
msgstr "Het umount-commando gaf de volgende foutmelding:"
-#: mediamanager/halbackend.cpp:1478
+#: mediamanager/halbackend.cpp:1567 mediamanager/tdehardwarebackend.cpp:1322
+msgid "Cannot mount encrypted locked drives!"
+msgstr ""
+
+#: mediamanager/halbackend.cpp:1682 mediamanager/halbackend.cpp:1703
+#: mediamanager/halbackend.cpp:1716 mediamanager/halbackend.cpp:1830
+#: mediamanager/halbackend.cpp:1840 mediamanager/halbackend.cpp:1899
+#: mediamanager/halbackend.cpp:1907
#, fuzzy
-msgid "Permission denied"
-msgstr "Toegang geweigerd"
+msgid "Internal error"
+msgstr "Interne fout"
-#: mediamanager/halbackend.cpp:1562 mediamanager/tdehardwarebackend.cpp:1232
-msgid "Cannot mount encrypted drives!"
-msgstr ""
+#: mediamanager/halbackend.cpp:1694
+#, fuzzy
+#| msgid "Unknown"
+msgid "Unknown error"
+msgstr "Onbekend"
-#: mediamanager/halbackend.cpp:1721
+#: mediamanager/halbackend.cpp:1748
msgid "Unmounting failed due to the following error:"
msgstr "Het afkoppelen is mislukt vanwege de volgende fout:"
-#: mediamanager/halbackend.cpp:1723
+#: mediamanager/halbackend.cpp:1750
msgid "Device is Busy:"
msgstr "Station is in gebruik:"
-#: mediamanager/halbackend.cpp:1727
+#: mediamanager/halbackend.cpp:1754
msgid ""
"Permission denied<p>Please ensure that:<br>1. You have permission to access "
"this device.<br>2. This device was originally mounted using TDE.</p>"
msgstr ""
-#: mediamanager/halbackend.cpp:1739
+#: mediamanager/halbackend.cpp:1766
msgid ""
"%1<p><b>Would you like to forcibly terminate these processes?</b><br><i>All "
"unsaved data would be lost</i>"
msgstr ""
-#: mediamanager/halbackend.cpp:1811
+#: mediamanager/halbackend.cpp:1852
msgid "Wrong password"
msgstr ""
-#: mediamanager/mediamanager.cpp:247 mediamanager/mediamanager.cpp:266
-#: mediamanager/mediamanager.cpp:285 mediamanager/mediamanager.cpp:293
-#: mediamanager/mediamanager.cpp:302 mediamanager/mediamanager.cpp:310
-msgid "Feature only available with HAL"
-msgstr "Functie alleen mogelijk met HAL"
-
-#: mediamanager/mediamanager.cpp:252
+#: mediamanager/mediamanager.cpp:248 mediamanager/mediamanager.cpp:275
#, fuzzy
msgid "Feature only available with the TDE hardware backend"
msgstr "Functie alleen mogelijk met HAL"
-#: mediamanager/mediamanager.cpp:256 mediamanager/mediamanager.cpp:271
-#: mediamanager/mediamanager.cpp:275
+#: mediamanager/mediamanager.cpp:255 mediamanager/mediamanager.cpp:282
+#: mediamanager/mediamanager.cpp:312 mediamanager/mediamanager.cpp:343
+msgid "Feature only available with HAL"
+msgstr "Functie alleen mogelijk met HAL"
+
+#: mediamanager/mediamanager.cpp:262 mediamanager/mediamanager.cpp:289
+#: mediamanager/mediamanager.cpp:320 mediamanager/mediamanager.cpp:350
#, fuzzy
msgid "Feature only available with HAL or TDE hardware backend"
msgstr "Functie alleen mogelijk met HAL"
-#: mediamanager/tdehardwarebackend.cpp:480
-#: mediamanager/tdehardwarebackend.cpp:517
-#: mediamanager/tdehardwarebackend.cpp:750
+#: mediamanager/tdehardwarebackend.cpp:483
+#: mediamanager/tdehardwarebackend.cpp:520
+#: mediamanager/tdehardwarebackend.cpp:753
#, fuzzy
msgid "%1 Removable Device"
msgstr "Verwijderbaar apparaat"
-#: mediamanager/tdehardwarebackend.cpp:525
+#: mediamanager/tdehardwarebackend.cpp:528
#, fuzzy
msgid "Blank CD-ROM"
msgstr "CD-ROM"
-#: mediamanager/tdehardwarebackend.cpp:534
+#: mediamanager/tdehardwarebackend.cpp:537
msgid "Blank CD-R"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:543
+#: mediamanager/tdehardwarebackend.cpp:546
msgid "Blank CD-RW"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:552
+#: mediamanager/tdehardwarebackend.cpp:555
msgid "Blank Magneto-Optical CD"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:561
+#: mediamanager/tdehardwarebackend.cpp:564
msgid "Blank Mount Ranier CD-RW"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:570
+#: mediamanager/tdehardwarebackend.cpp:573
msgid "Blank Mount Ranier CD-RW-W"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:579
+#: mediamanager/tdehardwarebackend.cpp:582
msgid "Blank DVD-ROM"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:588
+#: mediamanager/tdehardwarebackend.cpp:591
msgid "Blank DVD-RAM"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:597
+#: mediamanager/tdehardwarebackend.cpp:600
msgid "Blank DVD-R"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:606
+#: mediamanager/tdehardwarebackend.cpp:609
msgid "Blank DVD-RW"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:615
+#: mediamanager/tdehardwarebackend.cpp:618
msgid "Blank Dual Layer DVD-R"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:624
+#: mediamanager/tdehardwarebackend.cpp:627
msgid "Blank Dual Layer DVD-RW"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:633
+#: mediamanager/tdehardwarebackend.cpp:636
msgid "Blank DVD+R"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:642
+#: mediamanager/tdehardwarebackend.cpp:645
msgid "Blank DVD+RW"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:651
+#: mediamanager/tdehardwarebackend.cpp:654
msgid "Blank Dual Layer DVD+R"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:660
+#: mediamanager/tdehardwarebackend.cpp:663
msgid "Blank Dual Layer DVD+RW"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:669
+#: mediamanager/tdehardwarebackend.cpp:672
msgid "Blank BD-ROM"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:678
+#: mediamanager/tdehardwarebackend.cpp:681
msgid "Blank BD-R"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:687
+#: mediamanager/tdehardwarebackend.cpp:690
msgid "Blank BD-RW"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:696
+#: mediamanager/tdehardwarebackend.cpp:699
msgid "Blank HDDVD-ROM"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:705
+#: mediamanager/tdehardwarebackend.cpp:708
msgid "Blank HDDVD-R"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:714
+#: mediamanager/tdehardwarebackend.cpp:717
msgid "Blank HDDVD-RW"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:721
+#: mediamanager/tdehardwarebackend.cpp:724
msgid "Audio CD"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:742
+#: mediamanager/tdehardwarebackend.cpp:745
msgid "%1 Fixed Disk (%2)"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:849
+#: mediamanager/tdehardwarebackend.cpp:852
#, fuzzy
msgid "%1 Zip Disk"
msgstr "Zip-diskette"
-#: mediamanager/tdehardwarebackend.cpp:1212
-#: mediamanager/tdehardwarebackend.cpp:1392
-#, fuzzy
-msgid "Internal error"
-msgstr "Interne fout"
+#: mediamanager/tdehardwarebackend.cpp:1224
+#: mediamanager/tdehardwarebackend.cpp:1417
+msgid "Internal error. Couldn't find medium."
+msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:1239
-msgid ""
-"<qt>Unable to mount this device.<p>Potential reasons include:<br>Improper "
-"device and/or user privilege level<br>Corrupt data on storage device"
+#: mediamanager/tdehardwarebackend.cpp:1249
+#: mediamanager/tdehardwarebackend.cpp:1323
+msgid "Unable to mount this device."
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:1241
-#: mediamanager/tdehardwarebackend.cpp:1316
-#: mediamanager/tdehardwarebackend.cpp:1408
-#: mediamanager/tdehardwarebackend.cpp:1426
+#: mediamanager/tdehardwarebackend.cpp:1252
+#: mediamanager/tdehardwarebackend.cpp:1326
+#: mediamanager/tdehardwarebackend.cpp:1435
+#: mediamanager/tdehardwarebackend.cpp:1457
msgid "<p>Technical details:<br>"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:1314
-msgid ""
-"<qt>Unable to mount this device.<p>Potential reasons include:<br>Improper "
-"device and/or user privilege level<br>Corrupt data on storage "
-"device<br>Incorrect encryption password"
+#: mediamanager/tdehardwarebackend.cpp:1284
+msgid "Decryption aborted"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:1420
+#: mediamanager/tdehardwarebackend.cpp:1443
msgid ""
"<qt>The device <b>%1</b> (%2) named <b>'%3'</b> and currently mounted at <b>"
"%4</b> can not be unmounted at this time.<p>%5<p><b>Would you like to "
@@ -391,7 +397,7 @@ msgid ""
"lost</i>"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:1547
+#: mediamanager/tdehardwarebackend.cpp:1577
#, fuzzy
msgid ""
"Programs still using the device have been detected. They are listed below. "
@@ -406,7 +412,7 @@ msgstr ""
msgid "%1 cannot be found."
msgstr "%1 is niet gevonden."
-#: mounthelper/tdeio_media_mounthelper.cpp:86
+#: mounthelper/tdeio_media_mounthelper.cpp:87
msgid "%1 is not a mountable media."
msgstr "%1 is geen aankoppelbaar medium."
@@ -417,42 +423,50 @@ msgstr "%1 is geen aankoppelbaar medium."
#: mounthelper/tdeio_media_mounthelper.cpp:107
#, fuzzy
-msgid "%1 is already decrypted."
+msgid "%1 is already unlocked."
msgstr "Station is reeds aangekoppeld."
-#: mounthelper/tdeio_media_mounthelper.cpp:228
+#: mounthelper/tdeio_media_mounthelper.cpp:139
+msgid "Unknown unmount error."
+msgstr ""
+
+#: mounthelper/tdeio_media_mounthelper.cpp:246
msgid "The device was successfully unmounted, but the tray could not be opened"
msgstr ""
"Het apparaat is succesvol afgekoppeld, maar de lade kon niet geopend worden"
-#: mounthelper/tdeio_media_mounthelper.cpp:230
+#: 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:275
+#: mounthelper/tdeio_media_mounthelper.cpp:281
+msgid "Unknown decrypt error."
+msgstr ""
+
+#: mounthelper/tdeio_media_mounthelper.cpp:295
#, fuzzy
msgid "Decrypt given URL"
msgstr "Opgegeven URL-adres afkoppelen"
-#: mounthelper/tdeio_media_mounthelper.cpp:276
+#: mounthelper/tdeio_media_mounthelper.cpp:296
msgid "Unmount given URL"
msgstr "Opgegeven URL-adres afkoppelen"
-#: mounthelper/tdeio_media_mounthelper.cpp:277
+#: mounthelper/tdeio_media_mounthelper.cpp:297
msgid "Mount given URL (default)"
msgstr "Opgegeven URL-adres aankoppelen (standaard)"
-#: mounthelper/tdeio_media_mounthelper.cpp:278
+#: mounthelper/tdeio_media_mounthelper.cpp:298
msgid "Eject given URL via tdeeject"
msgstr "Opgegeven URL-adres uitwerpen via tdeeject"
-#: mounthelper/tdeio_media_mounthelper.cpp:279
+#: mounthelper/tdeio_media_mounthelper.cpp:299
msgid "Unmount and Eject given URL (necessary for some USB devices)"
msgstr ""
"Koppelt een opgegeven URL-adres af en werpt deze uit (noodzakelijk bij "
"bepaalde USB-apparaten)"
-#: mounthelper/tdeio_media_mounthelper.cpp:280
+#: mounthelper/tdeio_media_mounthelper.cpp:300
msgid "media:/ URL to mount/unmount/eject/remove"
msgstr "media:/ URL-adres om aan te koppelen/uit te werpen/verwijderen"
@@ -473,43 +487,43 @@ msgstr "Het opslaan van de wijzigingen is mislukt"
msgid "&Mounting"
msgstr "&Aankoppelen"
-#: tdefile-plugin/tdefilemediaplugin.cpp:190
+#: tdefile-plugin/tdefilemediaplugin.cpp:184
msgid "Medium Information"
msgstr "Mediuminformatie"
-#: tdefile-plugin/tdefilemediaplugin.cpp:193
+#: tdefile-plugin/tdefilemediaplugin.cpp:187
msgid "Free"
msgstr "Vrij"
-#: tdefile-plugin/tdefilemediaplugin.cpp:196
+#: tdefile-plugin/tdefilemediaplugin.cpp:190
msgid "Used"
msgstr "Gebruikt"
-#: tdefile-plugin/tdefilemediaplugin.cpp:199
+#: tdefile-plugin/tdefilemediaplugin.cpp:193
msgid "Total"
msgstr "Totaal"
-#: tdefile-plugin/tdefilemediaplugin.cpp:202
+#: tdefile-plugin/tdefilemediaplugin.cpp:196
msgid "Base URL"
msgstr "Basis-URL-adres"
-#: tdefile-plugin/tdefilemediaplugin.cpp:203
+#: tdefile-plugin/tdefilemediaplugin.cpp:197
msgid "Mount Point"
msgstr "Aankoppelpunt"
-#: tdefile-plugin/tdefilemediaplugin.cpp:204
+#: tdefile-plugin/tdefilemediaplugin.cpp:198
msgid "Device Node"
msgstr "Apparaatknooppunt"
-#: tdefile-plugin/tdefilemediaplugin.cpp:206
+#: tdefile-plugin/tdefilemediaplugin.cpp:200
msgid "Medium Summary"
msgstr "Samenvatting van medium"
-#: tdefile-plugin/tdefilemediaplugin.cpp:208
+#: tdefile-plugin/tdefilemediaplugin.cpp:202
msgid "Usage"
msgstr "Gebruik"
-#: tdefile-plugin/tdefilemediaplugin.cpp:210
+#: tdefile-plugin/tdefilemediaplugin.cpp:204
msgid "Bar Graph"
msgstr "Balkgrafiek"
@@ -581,23 +595,30 @@ msgid ""
"devices are plugged in."
msgstr ""
-#: mediamanager/decryptdialog.ui:24 mounthelper/decryptdialog.ui:24
+#: mediamanager/unlockdialog.ui:24 mounthelper/unlockdialog.ui:24
#, no-c-format
msgid "Decrypting Storage Device"
msgstr ""
-#: mediamanager/decryptdialog.ui:109 mounthelper/decryptdialog.ui:109
+#: mediamanager/unlockdialog.ui:109
#, no-c-format
msgid ""
-"<p><b>%1</b> is an encrypted storage device.</p>\n"
-"<p>Please enter the password to decrypt the storage device.</p>"
+"<p><b>%1</b> is an encrypted locked storage device.</p>\n"
+"<p>Please enter the password to unlock the storage device.</p>"
msgstr ""
-#: mediamanager/decryptdialog.ui:131 mounthelper/decryptdialog.ui:131
+#: mediamanager/unlockdialog.ui:131 mounthelper/unlockdialog.ui:131
#, no-c-format
msgid "&Password:"
msgstr ""
+#: mounthelper/unlockdialog.ui:109
+#, no-c-format
+msgid ""
+"<p><b>%1</b> is an encrypted storage device.</p>\n"
+"<p>Please enter the password to decrypt the storage device.</p>"
+msgstr ""
+
#: propsdlgplugin/propertiespagegui.ui:16
#, no-c-format
msgid "PropertiesPageGUI"
@@ -861,3 +882,7 @@ msgstr "Gemixt"
#, no-c-format
msgid "Filesystem: iso9660"
msgstr "Bestandssysteem: iso9660"
+
+#, 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 606254a3fc5..fa4237a7fe8 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: 2019-01-13 18:47+0100\n"
+"POT-Creation-Date: 2019-07-11 02:33+0200\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"
@@ -47,7 +47,6 @@ 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
-#: mounthelper/tdeio_media_mounthelper.cpp:256
msgid "The TDE mediamanager is not running."
msgstr "Mediehandteraren i TDE køyrer ikkje."
@@ -55,7 +54,7 @@ msgstr "Mediehandteraren i TDE køyrer ikkje."
msgid "This media name already exists."
msgstr "Dette medienamnet finst allereie."
-#: mediaimpl.cpp:230 mediaimpl.cpp:293
+#: mediaimpl.cpp:230 mediaimpl.cpp:297
msgid "No such medium."
msgstr "Mediet finst ikkje."
@@ -63,116 +62,120 @@ msgstr "Mediet finst ikkje."
msgid "The drive is encrypted."
msgstr ""
-#: mediaimpl.cpp:272 mediamanager/halbackend.cpp:1264
-#: mediamanager/halbackend.cpp:1273 mediamanager/halbackend.cpp:1663
-#: mediamanager/halbackend.cpp:1680 mediamanager/halbackend.cpp:1691
-#: mediamanager/halbackend.cpp:1793 mediamanager/halbackend.cpp:1801
-#: mediamanager/halbackend.cpp:1808 mediamanager/halbackend.cpp:1848
-#: mediamanager/halbackend.cpp:1854 mediamanager/halbackend.cpp:1861
-#: mounthelper/tdeio_media_mounthelper.cpp:58
-msgid "Internal Error"
-msgstr "Intern feil"
+#: mediaimpl.cpp:274 mediamanager/tdehardwarebackend.cpp:201
+#: mediamanager/tdehardwarebackend.cpp:252
+#: mounthelper/tdeio_media_mounthelper.cpp:202
+msgid "Unknown mount error."
+msgstr ""
#: mediamanager/dialog.cpp:26 mounthelper/dialog.cpp:26
-msgid "Decrypt"
+msgid "Unlock"
msgstr ""
-#: mediamanager/fstabbackend.cpp:104 mediamanager/fstabbackend.cpp:114
-#: mediamanager/halbackend.cpp:1595 mediamanager/halbackend.cpp:1617
-#: mediamanager/halbackend.cpp:1776 mediamanager/halbackend.cpp:1831
-#: mediamanager/tdehardwarebackend.cpp:1349
-#: mediamanager/tdehardwarebackend.cpp:1360
+#: mediamanager/fstabbackend.cpp:105 mediamanager/fstabbackend.cpp:120
+#: mediamanager/halbackend.cpp:1598 mediamanager/halbackend.cpp:1625
+#: mediamanager/halbackend.cpp:1808 mediamanager/halbackend.cpp:1877
+#: mediamanager/mediamanager.cpp:363 mediamanager/mediamanager.cpp:375
+#: mediamanager/mediamanager.cpp:387 mediamanager/mediamanager.cpp:399
+#: mediamanager/tdehardwarebackend.cpp:1363
+#: mediamanager/tdehardwarebackend.cpp:1378
#, c-format
msgid "No such medium: %1"
msgstr "Mediet finst ikkje: %1"
-#: mediamanager/fstabbackend.cpp:398
+#: mediamanager/fstabbackend.cpp:408
msgid "CD Recorder"
msgstr "CD-opptakar"
-#: mediamanager/fstabbackend.cpp:404
+#: mediamanager/fstabbackend.cpp:414
msgid "DVD"
msgstr "DVD"
-#: mediamanager/fstabbackend.cpp:415
+#: mediamanager/fstabbackend.cpp:425
msgid "CD-ROM"
msgstr "CD-ROM"
-#: mediamanager/fstabbackend.cpp:428
+#: mediamanager/fstabbackend.cpp:438
msgid "Floppy"
msgstr "Diskett"
-#: mediamanager/fstabbackend.cpp:436
+#: mediamanager/fstabbackend.cpp:446
msgid "Zip Disk"
msgstr "Zip-disk"
-#: mediamanager/fstabbackend.cpp:447
+#: mediamanager/fstabbackend.cpp:457
msgid "Removable Device"
msgstr "Flyttbar eining"
-#: mediamanager/fstabbackend.cpp:452 mediamanager/fstabbackend.cpp:458
+#: mediamanager/fstabbackend.cpp:462 mediamanager/fstabbackend.cpp:468
msgid "Remote Share"
msgstr "Delt nettverksressurs"
-#: mediamanager/fstabbackend.cpp:463
+#: mediamanager/fstabbackend.cpp:473
msgid "Hard Disk"
msgstr "Harddisk"
# | msgid "Unknown"
-#: mediamanager/halbackend.cpp:749 mediamanager/tdehardwarebackend.cpp:805
+#: mediamanager/halbackend.cpp:744 mediamanager/tdehardwarebackend.cpp:808
#, fuzzy
msgid "Unknown Drive"
msgstr "Ukjend"
# | msgid "Floppy"
-#: mediamanager/halbackend.cpp:761 mediamanager/tdehardwarebackend.cpp:835
+#: mediamanager/halbackend.cpp:756 mediamanager/tdehardwarebackend.cpp:838
#, fuzzy
msgid "Floppy Drive"
msgstr "Diskett"
# | msgid "Zip Disk"
-#: mediamanager/halbackend.cpp:769
+#: mediamanager/halbackend.cpp:764
#, fuzzy
msgid "Zip Drive"
msgstr "Zip-disk"
-#: mediamanager/halbackend.cpp:839 mediamanager/tdehardwarebackend.cpp:892
+#: mediamanager/halbackend.cpp:834 mediamanager/tdehardwarebackend.cpp:895
msgid "Camera"
msgstr "Kamera"
-#: mediamanager/halbackend.cpp:1221 mediamanager/halbackend.cpp:1247
+#: mediamanager/halbackend.cpp:1216 mediamanager/halbackend.cpp:1242
msgid "Authenticate"
msgstr ""
-#: mediamanager/halbackend.cpp:1222
+#: mediamanager/halbackend.cpp:1217
msgid ""
"<big><b>System policy prevents mounting internal media</b></big><br/"
">Authentication is required to perform this action. Please enter your "
"password to verify."
msgstr ""
-#: mediamanager/halbackend.cpp:1248
+#: mediamanager/halbackend.cpp:1243
msgid ""
"<big><b>System policy prevents unmounting media mounted by other users</b></"
"big><br/>Authentication is required to perform this action. Please enter "
"your password to verify."
msgstr ""
-#: mediamanager/halbackend.cpp:1284
+#: mediamanager/halbackend.cpp:1259 mediamanager/halbackend.cpp:1268
+#: mediamanager/halbackend.cpp:1849 mediamanager/halbackend.cpp:1916
+#: mounthelper/tdeio_media_mounthelper.cpp:58
+msgid "Internal Error"
+msgstr "Intern feil"
+
+#: mediamanager/halbackend.cpp:1279
msgid "Invalid filesystem type"
msgstr "Ugyldig filsystemtype"
-#: mediamanager/halbackend.cpp:1286
+#: mediamanager/halbackend.cpp:1281
msgid ""
"Permission denied<p>Please ensure that:<br>1. You have permission to access "
"this device.<br>2. This device node is not listed in /etc/fstab.</p>"
msgstr ""
-#: mediamanager/halbackend.cpp:1290
+#: mediamanager/halbackend.cpp:1285
msgid "Device is already mounted."
msgstr "Eininga er montert frå før."
-#: mediamanager/halbackend.cpp:1340
+#: mediamanager/halbackend.cpp:1335
msgid ""
"Moreover, programs still using the device have been detected. They are "
"listed below. You have to close them or change their working directory "
@@ -182,16 +185,16 @@ msgstr ""
"nedanfor. Du må lukka dei, eller eventuelt endra arbeidsmappa deira, før du "
"prøver å avmontera eininga."
-#: mediamanager/halbackend.cpp:1381 mediamanager/tdehardwarebackend.cpp:1588
+#: mediamanager/halbackend.cpp:1376 mediamanager/tdehardwarebackend.cpp:1618
msgid ""
"Programs that were still using the device have been forcibly terminated. "
"They are listed below."
msgstr ""
-#: mediamanager/halbackend.cpp:1402 mediamanager/halbackend.cpp:1715
-#: mediamanager/tdehardwarebackend.cpp:1406
-#: mediamanager/tdehardwarebackend.cpp:1424
-#: mediamanager/tdehardwarebackend.cpp:1464
+#: mediamanager/halbackend.cpp:1397 mediamanager/halbackend.cpp:1742
+#: mediamanager/tdehardwarebackend.cpp:1430
+#: mediamanager/tdehardwarebackend.cpp:1452
+#: mediamanager/tdehardwarebackend.cpp:1494
msgid ""
"Unfortunately, the device <b>%1</b> (%2) named <b>'%3'</b> and currently "
"mounted at <b>%4</b> could not be unmounted. "
@@ -199,196 +202,199 @@ msgstr ""
"Klarte ikkje å avmontera eininga <b>%1</b> (%2) med namn <b>«%3»</b>. Denne "
"er montert på <b>%4</b>. "
-#: mediamanager/halbackend.cpp:1408 mediamanager/tdehardwarebackend.cpp:1470
+#: mediamanager/halbackend.cpp:1403 mediamanager/tdehardwarebackend.cpp:1500
msgid "The following error was returned by umount command:"
msgstr "«umount»-kommandoen gav denne feilmeldinga:"
-#: mediamanager/halbackend.cpp:1478
+#: mediamanager/halbackend.cpp:1567 mediamanager/tdehardwarebackend.cpp:1322
+msgid "Cannot mount encrypted locked drives!"
+msgstr ""
+
+#: mediamanager/halbackend.cpp:1682 mediamanager/halbackend.cpp:1703
+#: mediamanager/halbackend.cpp:1716 mediamanager/halbackend.cpp:1830
+#: mediamanager/halbackend.cpp:1840 mediamanager/halbackend.cpp:1899
+#: mediamanager/halbackend.cpp:1907
#, fuzzy
-msgid "Permission denied"
-msgstr "Tilgang nekta"
+msgid "Internal error"
+msgstr "Intern feil"
-#: mediamanager/halbackend.cpp:1562 mediamanager/tdehardwarebackend.cpp:1232
-msgid "Cannot mount encrypted drives!"
-msgstr ""
+#: mediamanager/halbackend.cpp:1694
+#, fuzzy
+#| msgid "Unknown"
+msgid "Unknown error"
+msgstr "Ukjend"
-#: mediamanager/halbackend.cpp:1721
+#: mediamanager/halbackend.cpp:1748
msgid "Unmounting failed due to the following error:"
msgstr "Feil under avmontering:"
-#: mediamanager/halbackend.cpp:1723
+#: mediamanager/halbackend.cpp:1750
msgid "Device is Busy:"
msgstr "Eininga er oppteken:"
-#: mediamanager/halbackend.cpp:1727
+#: mediamanager/halbackend.cpp:1754
msgid ""
"Permission denied<p>Please ensure that:<br>1. You have permission to access "
"this device.<br>2. This device was originally mounted using TDE.</p>"
msgstr ""
-#: mediamanager/halbackend.cpp:1739
+#: mediamanager/halbackend.cpp:1766
msgid ""
"%1<p><b>Would you like to forcibly terminate these processes?</b><br><i>All "
"unsaved data would be lost</i>"
msgstr ""
-#: mediamanager/halbackend.cpp:1811
+#: mediamanager/halbackend.cpp:1852
msgid "Wrong password"
msgstr ""
-#: mediamanager/mediamanager.cpp:247 mediamanager/mediamanager.cpp:266
-#: mediamanager/mediamanager.cpp:285 mediamanager/mediamanager.cpp:293
-#: mediamanager/mediamanager.cpp:302 mediamanager/mediamanager.cpp:310
-msgid "Feature only available with HAL"
-msgstr "Denne funksjonen kan berre brukast med HAL"
-
-#: mediamanager/mediamanager.cpp:252
+#: mediamanager/mediamanager.cpp:248 mediamanager/mediamanager.cpp:275
#, fuzzy
msgid "Feature only available with the TDE hardware backend"
msgstr "Denne funksjonen kan berre brukast med HAL"
-#: mediamanager/mediamanager.cpp:256 mediamanager/mediamanager.cpp:271
-#: mediamanager/mediamanager.cpp:275
+#: mediamanager/mediamanager.cpp:255 mediamanager/mediamanager.cpp:282
+#: mediamanager/mediamanager.cpp:312 mediamanager/mediamanager.cpp:343
+msgid "Feature only available with HAL"
+msgstr "Denne funksjonen kan berre brukast med HAL"
+
+#: mediamanager/mediamanager.cpp:262 mediamanager/mediamanager.cpp:289
+#: mediamanager/mediamanager.cpp:320 mediamanager/mediamanager.cpp:350
#, fuzzy
msgid "Feature only available with HAL or TDE hardware backend"
msgstr "Denne funksjonen kan berre brukast med HAL"
-#: mediamanager/tdehardwarebackend.cpp:480
-#: mediamanager/tdehardwarebackend.cpp:517
-#: mediamanager/tdehardwarebackend.cpp:750
+#: mediamanager/tdehardwarebackend.cpp:483
+#: mediamanager/tdehardwarebackend.cpp:520
+#: mediamanager/tdehardwarebackend.cpp:753
#, fuzzy
msgid "%1 Removable Device"
msgstr "Flyttbar eining"
-#: mediamanager/tdehardwarebackend.cpp:525
+#: mediamanager/tdehardwarebackend.cpp:528
#, fuzzy
msgid "Blank CD-ROM"
msgstr "CD-ROM"
-#: mediamanager/tdehardwarebackend.cpp:534
+#: mediamanager/tdehardwarebackend.cpp:537
msgid "Blank CD-R"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:543
+#: mediamanager/tdehardwarebackend.cpp:546
msgid "Blank CD-RW"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:552
+#: mediamanager/tdehardwarebackend.cpp:555
msgid "Blank Magneto-Optical CD"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:561
+#: mediamanager/tdehardwarebackend.cpp:564
msgid "Blank Mount Ranier CD-RW"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:570
+#: mediamanager/tdehardwarebackend.cpp:573
msgid "Blank Mount Ranier CD-RW-W"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:579
+#: mediamanager/tdehardwarebackend.cpp:582
msgid "Blank DVD-ROM"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:588
+#: mediamanager/tdehardwarebackend.cpp:591
msgid "Blank DVD-RAM"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:597
+#: mediamanager/tdehardwarebackend.cpp:600
msgid "Blank DVD-R"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:606
+#: mediamanager/tdehardwarebackend.cpp:609
msgid "Blank DVD-RW"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:615
+#: mediamanager/tdehardwarebackend.cpp:618
msgid "Blank Dual Layer DVD-R"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:624
+#: mediamanager/tdehardwarebackend.cpp:627
msgid "Blank Dual Layer DVD-RW"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:633
+#: mediamanager/tdehardwarebackend.cpp:636
msgid "Blank DVD+R"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:642
+#: mediamanager/tdehardwarebackend.cpp:645
msgid "Blank DVD+RW"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:651
+#: mediamanager/tdehardwarebackend.cpp:654
msgid "Blank Dual Layer DVD+R"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:660
+#: mediamanager/tdehardwarebackend.cpp:663
msgid "Blank Dual Layer DVD+RW"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:669
+#: mediamanager/tdehardwarebackend.cpp:672
msgid "Blank BD-ROM"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:678
+#: mediamanager/tdehardwarebackend.cpp:681
msgid "Blank BD-R"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:687
+#: mediamanager/tdehardwarebackend.cpp:690
msgid "Blank BD-RW"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:696
+#: mediamanager/tdehardwarebackend.cpp:699
msgid "Blank HDDVD-ROM"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:705
+#: mediamanager/tdehardwarebackend.cpp:708
msgid "Blank HDDVD-R"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:714
+#: mediamanager/tdehardwarebackend.cpp:717
msgid "Blank HDDVD-RW"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:721
+#: mediamanager/tdehardwarebackend.cpp:724
msgid "Audio CD"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:742
+#: mediamanager/tdehardwarebackend.cpp:745
msgid "%1 Fixed Disk (%2)"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:849
+#: mediamanager/tdehardwarebackend.cpp:852
#, fuzzy
msgid "%1 Zip Disk"
msgstr "Zip-disk"
-#: mediamanager/tdehardwarebackend.cpp:1212
-#: mediamanager/tdehardwarebackend.cpp:1392
-#, fuzzy
-msgid "Internal error"
-msgstr "Intern feil"
+#: mediamanager/tdehardwarebackend.cpp:1224
+#: mediamanager/tdehardwarebackend.cpp:1417
+msgid "Internal error. Couldn't find medium."
+msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:1239
-msgid ""
-"<qt>Unable to mount this device.<p>Potential reasons include:<br>Improper "
-"device and/or user privilege level<br>Corrupt data on storage device"
+#: mediamanager/tdehardwarebackend.cpp:1249
+#: mediamanager/tdehardwarebackend.cpp:1323
+msgid "Unable to mount this device."
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:1241
-#: mediamanager/tdehardwarebackend.cpp:1316
-#: mediamanager/tdehardwarebackend.cpp:1408
-#: mediamanager/tdehardwarebackend.cpp:1426
+#: mediamanager/tdehardwarebackend.cpp:1252
+#: mediamanager/tdehardwarebackend.cpp:1326
+#: mediamanager/tdehardwarebackend.cpp:1435
+#: mediamanager/tdehardwarebackend.cpp:1457
msgid "<p>Technical details:<br>"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:1314
-msgid ""
-"<qt>Unable to mount this device.<p>Potential reasons include:<br>Improper "
-"device and/or user privilege level<br>Corrupt data on storage "
-"device<br>Incorrect encryption password"
+#: mediamanager/tdehardwarebackend.cpp:1284
+msgid "Decryption aborted"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:1420
+#: mediamanager/tdehardwarebackend.cpp:1443
msgid ""
"<qt>The device <b>%1</b> (%2) named <b>'%3'</b> and currently mounted at <b>"
"%4</b> can not be unmounted at this time.<p>%5<p><b>Would you like to "
@@ -396,7 +402,7 @@ msgid ""
"lost</i>"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:1547
+#: mediamanager/tdehardwarebackend.cpp:1577
#, fuzzy
msgid ""
"Programs still using the device have been detected. They are listed below. "
@@ -411,7 +417,7 @@ msgstr ""
msgid "%1 cannot be found."
msgstr "Finn ikkje «%1»."
-#: mounthelper/tdeio_media_mounthelper.cpp:86
+#: mounthelper/tdeio_media_mounthelper.cpp:87
msgid "%1 is not a mountable media."
msgstr "«%1» er ikkje eit monterbart medium."
@@ -422,39 +428,47 @@ msgstr "«%1» er ikkje eit monterbart medium."
#: mounthelper/tdeio_media_mounthelper.cpp:107
#, fuzzy
-msgid "%1 is already decrypted."
+msgid "%1 is already unlocked."
msgstr "Eininga er montert frå før."
-#: mounthelper/tdeio_media_mounthelper.cpp:228
+#: mounthelper/tdeio_media_mounthelper.cpp:139
+msgid "Unknown unmount error."
+msgstr ""
+
+#: mounthelper/tdeio_media_mounthelper.cpp:246
msgid "The device was successfully unmounted, but the tray could not be opened"
msgstr "Eininga vart avmontert, men klarte ikkje opna skuffa."
-#: mounthelper/tdeio_media_mounthelper.cpp:230
+#: 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:275
+#: mounthelper/tdeio_media_mounthelper.cpp:281
+msgid "Unknown decrypt error."
+msgstr ""
+
+#: mounthelper/tdeio_media_mounthelper.cpp:295
#, fuzzy
msgid "Decrypt given URL"
msgstr "Avmonter URL"
-#: mounthelper/tdeio_media_mounthelper.cpp:276
+#: mounthelper/tdeio_media_mounthelper.cpp:296
msgid "Unmount given URL"
msgstr "Avmonter URL"
-#: mounthelper/tdeio_media_mounthelper.cpp:277
+#: mounthelper/tdeio_media_mounthelper.cpp:297
msgid "Mount given URL (default)"
msgstr "Monter URL (standard)"
-#: mounthelper/tdeio_media_mounthelper.cpp:278
+#: mounthelper/tdeio_media_mounthelper.cpp:298
msgid "Eject given URL via tdeeject"
msgstr "Løys ut URL med tdeeject"
-#: mounthelper/tdeio_media_mounthelper.cpp:279
+#: mounthelper/tdeio_media_mounthelper.cpp:299
msgid "Unmount and Eject given URL (necessary for some USB devices)"
msgstr "Avmonter og løys ut vald URL (trengst for enkelte USB-einingar)"
-#: mounthelper/tdeio_media_mounthelper.cpp:280
+#: mounthelper/tdeio_media_mounthelper.cpp:300
msgid "media:/ URL to mount/unmount/eject/remove"
msgstr "media:/-URL som skal monterast/avmonterast/løysast ut/fjernast"
@@ -475,43 +489,43 @@ msgstr "Klarte ikkje lagra endringane"
msgid "&Mounting"
msgstr "&Montering"
-#: tdefile-plugin/tdefilemediaplugin.cpp:190
+#: tdefile-plugin/tdefilemediaplugin.cpp:184
msgid "Medium Information"
msgstr "Medieinformasjon"
-#: tdefile-plugin/tdefilemediaplugin.cpp:193
+#: tdefile-plugin/tdefilemediaplugin.cpp:187
msgid "Free"
msgstr "Ledig"
-#: tdefile-plugin/tdefilemediaplugin.cpp:196
+#: tdefile-plugin/tdefilemediaplugin.cpp:190
msgid "Used"
msgstr "Bruka"
-#: tdefile-plugin/tdefilemediaplugin.cpp:199
+#: tdefile-plugin/tdefilemediaplugin.cpp:193
msgid "Total"
msgstr "Totalt"
-#: tdefile-plugin/tdefilemediaplugin.cpp:202
+#: tdefile-plugin/tdefilemediaplugin.cpp:196
msgid "Base URL"
msgstr "Baseadresse"
-#: tdefile-plugin/tdefilemediaplugin.cpp:203
+#: tdefile-plugin/tdefilemediaplugin.cpp:197
msgid "Mount Point"
msgstr "Monteringspunkt"
-#: tdefile-plugin/tdefilemediaplugin.cpp:204
+#: tdefile-plugin/tdefilemediaplugin.cpp:198
msgid "Device Node"
msgstr "Einingsnode"
-#: tdefile-plugin/tdefilemediaplugin.cpp:206
+#: tdefile-plugin/tdefilemediaplugin.cpp:200
msgid "Medium Summary"
msgstr "Mediesamandrag"
-#: tdefile-plugin/tdefilemediaplugin.cpp:208
+#: tdefile-plugin/tdefilemediaplugin.cpp:202
msgid "Usage"
msgstr "Bruk"
-#: tdefile-plugin/tdefilemediaplugin.cpp:210
+#: tdefile-plugin/tdefilemediaplugin.cpp:204
msgid "Bar Graph"
msgstr "Søylediagram"
@@ -583,23 +597,30 @@ msgid ""
"devices are plugged in."
msgstr ""
-#: mediamanager/decryptdialog.ui:24 mounthelper/decryptdialog.ui:24
+#: mediamanager/unlockdialog.ui:24 mounthelper/unlockdialog.ui:24
#, no-c-format
msgid "Decrypting Storage Device"
msgstr ""
-#: mediamanager/decryptdialog.ui:109 mounthelper/decryptdialog.ui:109
+#: mediamanager/unlockdialog.ui:109
#, no-c-format
msgid ""
-"<p><b>%1</b> is an encrypted storage device.</p>\n"
-"<p>Please enter the password to decrypt the storage device.</p>"
+"<p><b>%1</b> is an encrypted locked storage device.</p>\n"
+"<p>Please enter the password to unlock the storage device.</p>"
msgstr ""
-#: mediamanager/decryptdialog.ui:131 mounthelper/decryptdialog.ui:131
+#: mediamanager/unlockdialog.ui:131 mounthelper/unlockdialog.ui:131
#, no-c-format
msgid "&Password:"
msgstr ""
+#: mounthelper/unlockdialog.ui:109
+#, no-c-format
+msgid ""
+"<p><b>%1</b> is an encrypted storage device.</p>\n"
+"<p>Please enter the password to decrypt the storage device.</p>"
+msgstr ""
+
#: propsdlgplugin/propertiespagegui.ui:16
#, no-c-format
msgid "PropertiesPageGUI"
@@ -858,3 +879,7 @@ msgstr "Blanda"
#, no-c-format
msgid "Filesystem: iso9660"
msgstr "Filsystem: iso9660"
+
+#, 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 117040a6f41..9aed4624f94 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: 2019-01-13 18:47+0100\n"
+"POT-Creation-Date: 2019-07-11 02:33+0200\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"
@@ -50,7 +50,6 @@ msgstr "ਅਣਜਾਣ"
#: mediaimpl.cpp:88 mediaimpl.cpp:115 mediaimpl.cpp:141 mediaimpl.cpp:177
#: mediaimpl.cpp:197 mediaimpl.cpp:218
#: mounthelper/tdeio_media_mounthelper.cpp:50
-#: mounthelper/tdeio_media_mounthelper.cpp:256
msgid "The TDE mediamanager is not running."
msgstr "ਕੇਡੀਈ ਮੀਡਿਆ-ਮੈਨੇਜਰ ਚੱਲ ਨਹੀਂ ਰਿਹਾ ਹੈ।"
@@ -58,7 +57,7 @@ msgstr "ਕੇਡੀਈ ਮੀਡਿਆ-ਮੈਨੇਜਰ ਚੱਲ ਨਹੀ
msgid "This media name already exists."
msgstr "ਇਹ ਮਾਧਿਅਮ ਪਹਿਲਾਂ ਹੀ ਮੌਜੂਦ ਹੈ।"
-#: mediaimpl.cpp:230 mediaimpl.cpp:293
+#: mediaimpl.cpp:230 mediaimpl.cpp:297
msgid "No such medium."
msgstr "ਕੋਈ ਮੀਡਿਅਮ ਨਹੀਂ ਹੈ।"
@@ -66,324 +65,331 @@ msgstr "ਕੋਈ ਮੀਡਿਅਮ ਨਹੀਂ ਹੈ।"
msgid "The drive is encrypted."
msgstr ""
-#: mediaimpl.cpp:272 mediamanager/halbackend.cpp:1264
-#: mediamanager/halbackend.cpp:1273 mediamanager/halbackend.cpp:1663
-#: mediamanager/halbackend.cpp:1680 mediamanager/halbackend.cpp:1691
-#: mediamanager/halbackend.cpp:1793 mediamanager/halbackend.cpp:1801
-#: mediamanager/halbackend.cpp:1808 mediamanager/halbackend.cpp:1848
-#: mediamanager/halbackend.cpp:1854 mediamanager/halbackend.cpp:1861
-#: mounthelper/tdeio_media_mounthelper.cpp:58
-msgid "Internal Error"
-msgstr "ਅੰਦਰੂਨੀ ਗਲਤੀ"
+#: mediaimpl.cpp:274 mediamanager/tdehardwarebackend.cpp:201
+#: mediamanager/tdehardwarebackend.cpp:252
+#: mounthelper/tdeio_media_mounthelper.cpp:202
+msgid "Unknown mount error."
+msgstr ""
#: mediamanager/dialog.cpp:26 mounthelper/dialog.cpp:26
-msgid "Decrypt"
+msgid "Unlock"
msgstr ""
-#: mediamanager/fstabbackend.cpp:104 mediamanager/fstabbackend.cpp:114
-#: mediamanager/halbackend.cpp:1595 mediamanager/halbackend.cpp:1617
-#: mediamanager/halbackend.cpp:1776 mediamanager/halbackend.cpp:1831
-#: mediamanager/tdehardwarebackend.cpp:1349
-#: mediamanager/tdehardwarebackend.cpp:1360
+#: mediamanager/fstabbackend.cpp:105 mediamanager/fstabbackend.cpp:120
+#: mediamanager/halbackend.cpp:1598 mediamanager/halbackend.cpp:1625
+#: mediamanager/halbackend.cpp:1808 mediamanager/halbackend.cpp:1877
+#: mediamanager/mediamanager.cpp:363 mediamanager/mediamanager.cpp:375
+#: mediamanager/mediamanager.cpp:387 mediamanager/mediamanager.cpp:399
+#: mediamanager/tdehardwarebackend.cpp:1363
+#: mediamanager/tdehardwarebackend.cpp:1378
#, c-format
msgid "No such medium: %1"
msgstr "ਕੋਈ ਮੀਡਿਅਮ ਨਹੀਂ ਹੈ: %1"
-#: mediamanager/fstabbackend.cpp:398
+#: mediamanager/fstabbackend.cpp:408
msgid "CD Recorder"
msgstr "CD ਰਿਕਾਰਡਰ"
-#: mediamanager/fstabbackend.cpp:404
+#: mediamanager/fstabbackend.cpp:414
msgid "DVD"
msgstr "DVD"
-#: mediamanager/fstabbackend.cpp:415
+#: mediamanager/fstabbackend.cpp:425
msgid "CD-ROM"
msgstr "CD-ROM"
-#: mediamanager/fstabbackend.cpp:428
+#: mediamanager/fstabbackend.cpp:438
msgid "Floppy"
msgstr "ਫਲਾਪੀ"
-#: mediamanager/fstabbackend.cpp:436
+#: mediamanager/fstabbackend.cpp:446
msgid "Zip Disk"
msgstr "ਜ਼ਿਪ ਡਿਸਕ"
-#: mediamanager/fstabbackend.cpp:447
+#: mediamanager/fstabbackend.cpp:457
msgid "Removable Device"
msgstr "ਹਟਾਉਣਯੋਗ ਜੰਤਰ"
-#: mediamanager/fstabbackend.cpp:452 mediamanager/fstabbackend.cpp:458
+#: mediamanager/fstabbackend.cpp:462 mediamanager/fstabbackend.cpp:468
msgid "Remote Share"
msgstr "ਰਿਮੋਟ ਸਾਂਝ"
-#: mediamanager/fstabbackend.cpp:463
+#: mediamanager/fstabbackend.cpp:473
msgid "Hard Disk"
msgstr "ਹਾਰਡ ਡਿਸਕ"
-#: mediamanager/halbackend.cpp:749 mediamanager/tdehardwarebackend.cpp:805
+#: mediamanager/halbackend.cpp:744 mediamanager/tdehardwarebackend.cpp:808
#, fuzzy
msgid "Unknown Drive"
msgstr "ਅਣਜਾਣ"
-#: mediamanager/halbackend.cpp:761 mediamanager/tdehardwarebackend.cpp:835
+#: mediamanager/halbackend.cpp:756 mediamanager/tdehardwarebackend.cpp:838
#, fuzzy
msgid "Floppy Drive"
msgstr "ਫਲਾਪੀ"
-#: mediamanager/halbackend.cpp:769
+#: mediamanager/halbackend.cpp:764
#, fuzzy
msgid "Zip Drive"
msgstr "ਜ਼ਿਪ ਡਿਸਕ"
-#: mediamanager/halbackend.cpp:839 mediamanager/tdehardwarebackend.cpp:892
+#: mediamanager/halbackend.cpp:834 mediamanager/tdehardwarebackend.cpp:895
msgid "Camera"
msgstr "ਕੈਮਰਾ"
-#: mediamanager/halbackend.cpp:1221 mediamanager/halbackend.cpp:1247
+#: mediamanager/halbackend.cpp:1216 mediamanager/halbackend.cpp:1242
msgid "Authenticate"
msgstr ""
-#: mediamanager/halbackend.cpp:1222
+#: mediamanager/halbackend.cpp:1217
msgid ""
"<big><b>System policy prevents mounting internal media</b></big><br/"
">Authentication is required to perform this action. Please enter your "
"password to verify."
msgstr ""
-#: mediamanager/halbackend.cpp:1248
+#: mediamanager/halbackend.cpp:1243
msgid ""
"<big><b>System policy prevents unmounting media mounted by other users</b></"
"big><br/>Authentication is required to perform this action. Please enter "
"your password to verify."
msgstr ""
-#: mediamanager/halbackend.cpp:1284
+#: mediamanager/halbackend.cpp:1259 mediamanager/halbackend.cpp:1268
+#: mediamanager/halbackend.cpp:1849 mediamanager/halbackend.cpp:1916
+#: mounthelper/tdeio_media_mounthelper.cpp:58
+msgid "Internal Error"
+msgstr "ਅੰਦਰੂਨੀ ਗਲਤੀ"
+
+#: mediamanager/halbackend.cpp:1279
msgid "Invalid filesystem type"
msgstr "ਗਲਤ ਫਾਇਲ ਸਿਸਟਮ ਕਿਸਮ ਹੈ"
-#: mediamanager/halbackend.cpp:1286
+#: mediamanager/halbackend.cpp:1281
msgid ""
"Permission denied<p>Please ensure that:<br>1. You have permission to access "
"this device.<br>2. This device node is not listed in /etc/fstab.</p>"
msgstr ""
-#: mediamanager/halbackend.cpp:1290
+#: mediamanager/halbackend.cpp:1285
msgid "Device is already mounted."
msgstr "ਜੰਤਰ ਪਹਿਲਾਂ ਹੀ ਮਾਊਂਟ ਹੈ।"
-#: mediamanager/halbackend.cpp:1340
+#: mediamanager/halbackend.cpp:1335
msgid ""
"Moreover, programs still using the device have been detected. They are "
"listed below. You have to close them or change their working directory "
"before attempting to unmount the device again."
msgstr ""
-#: mediamanager/halbackend.cpp:1381 mediamanager/tdehardwarebackend.cpp:1588
+#: mediamanager/halbackend.cpp:1376 mediamanager/tdehardwarebackend.cpp:1618
msgid ""
"Programs that were still using the device have been forcibly terminated. "
"They are listed below."
msgstr ""
-#: mediamanager/halbackend.cpp:1402 mediamanager/halbackend.cpp:1715
-#: mediamanager/tdehardwarebackend.cpp:1406
-#: mediamanager/tdehardwarebackend.cpp:1424
-#: mediamanager/tdehardwarebackend.cpp:1464
+#: mediamanager/halbackend.cpp:1397 mediamanager/halbackend.cpp:1742
+#: mediamanager/tdehardwarebackend.cpp:1430
+#: mediamanager/tdehardwarebackend.cpp:1452
+#: mediamanager/tdehardwarebackend.cpp:1494
msgid ""
"Unfortunately, the device <b>%1</b> (%2) named <b>'%3'</b> and currently "
"mounted at <b>%4</b> could not be unmounted. "
msgstr ""
-#: mediamanager/halbackend.cpp:1408 mediamanager/tdehardwarebackend.cpp:1470
+#: mediamanager/halbackend.cpp:1403 mediamanager/tdehardwarebackend.cpp:1500
msgid "The following error was returned by umount command:"
msgstr "ਅਣ-ਮਾਊਂਟ (umount) ਕਮਾਂਡ ਨੇ ਅੱਗੇ ਦਿੱਤੀ ਗਲਤੀ ਭੇਜੀ:"
-#: mediamanager/halbackend.cpp:1478
+#: mediamanager/halbackend.cpp:1567 mediamanager/tdehardwarebackend.cpp:1322
+msgid "Cannot mount encrypted locked drives!"
+msgstr ""
+
+#: mediamanager/halbackend.cpp:1682 mediamanager/halbackend.cpp:1703
+#: mediamanager/halbackend.cpp:1716 mediamanager/halbackend.cpp:1830
+#: mediamanager/halbackend.cpp:1840 mediamanager/halbackend.cpp:1899
+#: mediamanager/halbackend.cpp:1907
#, fuzzy
-msgid "Permission denied"
-msgstr "ਅਧਿਕਾਰ ਪਾਬੰਦੀ ਹੈ"
+msgid "Internal error"
+msgstr "ਅੰਦਰੂਨੀ ਗਲਤੀ"
-#: mediamanager/halbackend.cpp:1562 mediamanager/tdehardwarebackend.cpp:1232
-msgid "Cannot mount encrypted drives!"
-msgstr ""
+#: mediamanager/halbackend.cpp:1694
+#, fuzzy
+#| msgid "Unknown"
+msgid "Unknown error"
+msgstr "ਅਣਜਾਣ"
-#: mediamanager/halbackend.cpp:1721
+#: mediamanager/halbackend.cpp:1748
msgid "Unmounting failed due to the following error:"
msgstr "ਅੱਗੇ ਦਿੱਤੀ ਗਲਤੀ ਨਾਲ ਅਣ-ਮਾਊਂਟ ਕਰਨਾ ਫੇਲ੍ਹ ਹੋਇਆ:"
-#: mediamanager/halbackend.cpp:1723
+#: mediamanager/halbackend.cpp:1750
msgid "Device is Busy:"
msgstr "ਜੰਤਰ ਰੁੱਝਿਆ ਹੈ:"
-#: mediamanager/halbackend.cpp:1727
+#: mediamanager/halbackend.cpp:1754
msgid ""
"Permission denied<p>Please ensure that:<br>1. You have permission to access "
"this device.<br>2. This device was originally mounted using TDE.</p>"
msgstr ""
-#: mediamanager/halbackend.cpp:1739
+#: mediamanager/halbackend.cpp:1766
msgid ""
"%1<p><b>Would you like to forcibly terminate these processes?</b><br><i>All "
"unsaved data would be lost</i>"
msgstr ""
-#: mediamanager/halbackend.cpp:1811
+#: mediamanager/halbackend.cpp:1852
msgid "Wrong password"
msgstr ""
-#: mediamanager/mediamanager.cpp:247 mediamanager/mediamanager.cpp:266
-#: mediamanager/mediamanager.cpp:285 mediamanager/mediamanager.cpp:293
-#: mediamanager/mediamanager.cpp:302 mediamanager/mediamanager.cpp:310
-msgid "Feature only available with HAL"
-msgstr "ਫੀਚਰ ਸਿਰਫ਼ HAL ਨਾਲ ਹੀ ਉਪਲੱਬਧ ਹੈ"
-
-#: mediamanager/mediamanager.cpp:252
+#: mediamanager/mediamanager.cpp:248 mediamanager/mediamanager.cpp:275
#, fuzzy
msgid "Feature only available with the TDE hardware backend"
msgstr "ਫੀਚਰ ਸਿਰਫ਼ HAL ਨਾਲ ਹੀ ਉਪਲੱਬਧ ਹੈ"
-#: mediamanager/mediamanager.cpp:256 mediamanager/mediamanager.cpp:271
-#: mediamanager/mediamanager.cpp:275
+#: mediamanager/mediamanager.cpp:255 mediamanager/mediamanager.cpp:282
+#: mediamanager/mediamanager.cpp:312 mediamanager/mediamanager.cpp:343
+msgid "Feature only available with HAL"
+msgstr "ਫੀਚਰ ਸਿਰਫ਼ HAL ਨਾਲ ਹੀ ਉਪਲੱਬਧ ਹੈ"
+
+#: mediamanager/mediamanager.cpp:262 mediamanager/mediamanager.cpp:289
+#: mediamanager/mediamanager.cpp:320 mediamanager/mediamanager.cpp:350
#, fuzzy
msgid "Feature only available with HAL or TDE hardware backend"
msgstr "ਫੀਚਰ ਸਿਰਫ਼ HAL ਨਾਲ ਹੀ ਉਪਲੱਬਧ ਹੈ"
-#: mediamanager/tdehardwarebackend.cpp:480
-#: mediamanager/tdehardwarebackend.cpp:517
-#: mediamanager/tdehardwarebackend.cpp:750
+#: mediamanager/tdehardwarebackend.cpp:483
+#: mediamanager/tdehardwarebackend.cpp:520
+#: mediamanager/tdehardwarebackend.cpp:753
#, fuzzy
msgid "%1 Removable Device"
msgstr "ਹਟਾਉਣਯੋਗ ਜੰਤਰ"
-#: mediamanager/tdehardwarebackend.cpp:525
+#: mediamanager/tdehardwarebackend.cpp:528
#, fuzzy
msgid "Blank CD-ROM"
msgstr "CD-ROM"
-#: mediamanager/tdehardwarebackend.cpp:534
+#: mediamanager/tdehardwarebackend.cpp:537
msgid "Blank CD-R"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:543
+#: mediamanager/tdehardwarebackend.cpp:546
msgid "Blank CD-RW"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:552
+#: mediamanager/tdehardwarebackend.cpp:555
msgid "Blank Magneto-Optical CD"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:561
+#: mediamanager/tdehardwarebackend.cpp:564
msgid "Blank Mount Ranier CD-RW"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:570
+#: mediamanager/tdehardwarebackend.cpp:573
msgid "Blank Mount Ranier CD-RW-W"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:579
+#: mediamanager/tdehardwarebackend.cpp:582
msgid "Blank DVD-ROM"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:588
+#: mediamanager/tdehardwarebackend.cpp:591
msgid "Blank DVD-RAM"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:597
+#: mediamanager/tdehardwarebackend.cpp:600
msgid "Blank DVD-R"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:606
+#: mediamanager/tdehardwarebackend.cpp:609
msgid "Blank DVD-RW"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:615
+#: mediamanager/tdehardwarebackend.cpp:618
msgid "Blank Dual Layer DVD-R"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:624
+#: mediamanager/tdehardwarebackend.cpp:627
msgid "Blank Dual Layer DVD-RW"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:633
+#: mediamanager/tdehardwarebackend.cpp:636
msgid "Blank DVD+R"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:642
+#: mediamanager/tdehardwarebackend.cpp:645
msgid "Blank DVD+RW"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:651
+#: mediamanager/tdehardwarebackend.cpp:654
msgid "Blank Dual Layer DVD+R"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:660
+#: mediamanager/tdehardwarebackend.cpp:663
msgid "Blank Dual Layer DVD+RW"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:669
+#: mediamanager/tdehardwarebackend.cpp:672
msgid "Blank BD-ROM"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:678
+#: mediamanager/tdehardwarebackend.cpp:681
msgid "Blank BD-R"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:687
+#: mediamanager/tdehardwarebackend.cpp:690
msgid "Blank BD-RW"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:696
+#: mediamanager/tdehardwarebackend.cpp:699
msgid "Blank HDDVD-ROM"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:705
+#: mediamanager/tdehardwarebackend.cpp:708
msgid "Blank HDDVD-R"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:714
+#: mediamanager/tdehardwarebackend.cpp:717
msgid "Blank HDDVD-RW"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:721
+#: mediamanager/tdehardwarebackend.cpp:724
msgid "Audio CD"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:742
+#: mediamanager/tdehardwarebackend.cpp:745
msgid "%1 Fixed Disk (%2)"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:849
+#: mediamanager/tdehardwarebackend.cpp:852
#, fuzzy
msgid "%1 Zip Disk"
msgstr "ਜ਼ਿਪ ਡਿਸਕ"
-#: mediamanager/tdehardwarebackend.cpp:1212
-#: mediamanager/tdehardwarebackend.cpp:1392
-#, fuzzy
-msgid "Internal error"
-msgstr "ਅੰਦਰੂਨੀ ਗਲਤੀ"
+#: mediamanager/tdehardwarebackend.cpp:1224
+#: mediamanager/tdehardwarebackend.cpp:1417
+msgid "Internal error. Couldn't find medium."
+msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:1239
-msgid ""
-"<qt>Unable to mount this device.<p>Potential reasons include:<br>Improper "
-"device and/or user privilege level<br>Corrupt data on storage device"
+#: mediamanager/tdehardwarebackend.cpp:1249
+#: mediamanager/tdehardwarebackend.cpp:1323
+msgid "Unable to mount this device."
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:1241
-#: mediamanager/tdehardwarebackend.cpp:1316
-#: mediamanager/tdehardwarebackend.cpp:1408
-#: mediamanager/tdehardwarebackend.cpp:1426
+#: mediamanager/tdehardwarebackend.cpp:1252
+#: mediamanager/tdehardwarebackend.cpp:1326
+#: mediamanager/tdehardwarebackend.cpp:1435
+#: mediamanager/tdehardwarebackend.cpp:1457
msgid "<p>Technical details:<br>"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:1314
-msgid ""
-"<qt>Unable to mount this device.<p>Potential reasons include:<br>Improper "
-"device and/or user privilege level<br>Corrupt data on storage "
-"device<br>Incorrect encryption password"
+#: mediamanager/tdehardwarebackend.cpp:1284
+msgid "Decryption aborted"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:1420
+#: mediamanager/tdehardwarebackend.cpp:1443
msgid ""
"<qt>The device <b>%1</b> (%2) named <b>'%3'</b> and currently mounted at <b>"
"%4</b> can not be unmounted at this time.<p>%5<p><b>Would you like to "
@@ -391,7 +397,7 @@ msgid ""
"lost</i>"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:1547
+#: mediamanager/tdehardwarebackend.cpp:1577
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 "
@@ -402,7 +408,7 @@ msgstr ""
msgid "%1 cannot be found."
msgstr "%1 ਨਹੀਂ ਲੱਭਿਆ ਜਾ ਸਕਿਆ।"
-#: mounthelper/tdeio_media_mounthelper.cpp:86
+#: mounthelper/tdeio_media_mounthelper.cpp:87
msgid "%1 is not a mountable media."
msgstr "%1 ਇੱਕ ਮਾਊਟੇਬਲ ਮਾਧਿਅਮ ਨਹੀਂ ਹੈ।"
@@ -413,39 +419,47 @@ msgstr "%1 ਇੱਕ ਮਾਊਟੇਬਲ ਮਾਧਿਅਮ ਨਹੀਂ ਹ
#: mounthelper/tdeio_media_mounthelper.cpp:107
#, fuzzy
-msgid "%1 is already decrypted."
+msgid "%1 is already unlocked."
msgstr "ਜੰਤਰ ਪਹਿਲਾਂ ਹੀ ਮਾਊਂਟ ਹੈ।"
-#: mounthelper/tdeio_media_mounthelper.cpp:228
+#: mounthelper/tdeio_media_mounthelper.cpp:139
+msgid "Unknown unmount error."
+msgstr ""
+
+#: mounthelper/tdeio_media_mounthelper.cpp:246
msgid "The device was successfully unmounted, but the tray could not be opened"
msgstr ""
-#: mounthelper/tdeio_media_mounthelper.cpp:230
+#: mounthelper/tdeio_media_mounthelper.cpp:248
msgid "The device was successfully unmounted, but could not be ejected"
msgstr "ਜੰਤਰ ਠੀਕ ਤਰ੍ਹਾਂ ਅਣ-ਮਾਊਂਟ ਕੀਤਾ ਗਿਆ ਹੈ, ਪਰ ਬਾਹਰ ਨਹੀਂ ਕੱਢਿਆ ਜਾ ਸਕਿਆ"
-#: mounthelper/tdeio_media_mounthelper.cpp:275
+#: mounthelper/tdeio_media_mounthelper.cpp:281
+msgid "Unknown decrypt error."
+msgstr ""
+
+#: mounthelper/tdeio_media_mounthelper.cpp:295
#, fuzzy
msgid "Decrypt given URL"
msgstr "ਦਿੱਤੇ URL ਨੂੰ ਅਨਮਾਊਟ ਕਰੋ"
-#: mounthelper/tdeio_media_mounthelper.cpp:276
+#: mounthelper/tdeio_media_mounthelper.cpp:296
msgid "Unmount given URL"
msgstr "ਦਿੱਤੇ URL ਨੂੰ ਅਨਮਾਊਟ ਕਰੋ"
-#: mounthelper/tdeio_media_mounthelper.cpp:277
+#: mounthelper/tdeio_media_mounthelper.cpp:297
msgid "Mount given URL (default)"
msgstr "ਦਿੱਤੇ URL ਨੂੰ ਮਾਊਟ ਕਰੋ (ਮੂਲ)"
-#: mounthelper/tdeio_media_mounthelper.cpp:278
+#: mounthelper/tdeio_media_mounthelper.cpp:298
msgid "Eject given URL via tdeeject"
msgstr "ਦਿੱਤੇ URL ਨੂੰ ਕੇਡੀਈ-ਕੱਢੋ(tdeeject) ਰਾਹੀਂ ਕੱਢੋ"
-#: mounthelper/tdeio_media_mounthelper.cpp:279
+#: mounthelper/tdeio_media_mounthelper.cpp:299
msgid "Unmount and Eject given URL (necessary for some USB devices)"
msgstr "ਦਿੱਤਾ URL ਲਈ ਅਨਮਾਊਟ ਅਤੇ ਬਾਹਰ ਕੱਢੋ (ਕੁਝ USB ਜੰਤਰਾਂ ਲਈ ਲੋੜੀਦਾ ਹੈ)"
-#: mounthelper/tdeio_media_mounthelper.cpp:280
+#: mounthelper/tdeio_media_mounthelper.cpp:300
msgid "media:/ URL to mount/unmount/eject/remove"
msgstr "ਮਾਧਿਅਮ:/ URL ਨੂੰ ਮਾਊਟ/ਅਨ-ਮਾਊਟ/ਕੱਢੋ"
@@ -466,43 +480,43 @@ msgstr "ਬਦਲਾਅ ਸੰਭਾਲਣ ਲਈ ਫੇਲ੍ਹ ਹੈ"
msgid "&Mounting"
msgstr "ਮਾਊਂਟ ਕੀਤਾ ਜਾ ਰਿਹਾ ਹੈ(&M)"
-#: tdefile-plugin/tdefilemediaplugin.cpp:190
+#: tdefile-plugin/tdefilemediaplugin.cpp:184
msgid "Medium Information"
msgstr "ਮਾਧਿਅਮ ਜਾਣਕਾਰੀ"
-#: tdefile-plugin/tdefilemediaplugin.cpp:193
+#: tdefile-plugin/tdefilemediaplugin.cpp:187
msgid "Free"
msgstr "ਖਾਲੀ"
-#: tdefile-plugin/tdefilemediaplugin.cpp:196
+#: tdefile-plugin/tdefilemediaplugin.cpp:190
msgid "Used"
msgstr "ਵਰਤਿਆ"
-#: tdefile-plugin/tdefilemediaplugin.cpp:199
+#: tdefile-plugin/tdefilemediaplugin.cpp:193
msgid "Total"
msgstr "ਕੁੱਲ"
-#: tdefile-plugin/tdefilemediaplugin.cpp:202
+#: tdefile-plugin/tdefilemediaplugin.cpp:196
msgid "Base URL"
msgstr "ਮੂਲ URL"
-#: tdefile-plugin/tdefilemediaplugin.cpp:203
+#: tdefile-plugin/tdefilemediaplugin.cpp:197
msgid "Mount Point"
msgstr "ਮਾਊਟ ਥਾਂ"
-#: tdefile-plugin/tdefilemediaplugin.cpp:204
+#: tdefile-plugin/tdefilemediaplugin.cpp:198
msgid "Device Node"
msgstr "ਜੰਤਰ ਨੋਡ"
-#: tdefile-plugin/tdefilemediaplugin.cpp:206
+#: tdefile-plugin/tdefilemediaplugin.cpp:200
msgid "Medium Summary"
msgstr "ਮਾਧਿਅਮ ਸੰਖੇਪ"
-#: tdefile-plugin/tdefilemediaplugin.cpp:208
+#: tdefile-plugin/tdefilemediaplugin.cpp:202
msgid "Usage"
msgstr "ਵਰਤੋਂ"
-#: tdefile-plugin/tdefilemediaplugin.cpp:210
+#: tdefile-plugin/tdefilemediaplugin.cpp:204
msgid "Bar Graph"
msgstr "ਆਇਤ ਗ਼ਰਾਫ"
@@ -574,23 +588,30 @@ msgid ""
"devices are plugged in."
msgstr ""
-#: mediamanager/decryptdialog.ui:24 mounthelper/decryptdialog.ui:24
+#: mediamanager/unlockdialog.ui:24 mounthelper/unlockdialog.ui:24
#, no-c-format
msgid "Decrypting Storage Device"
msgstr ""
-#: mediamanager/decryptdialog.ui:109 mounthelper/decryptdialog.ui:109
+#: mediamanager/unlockdialog.ui:109
#, no-c-format
msgid ""
-"<p><b>%1</b> is an encrypted storage device.</p>\n"
-"<p>Please enter the password to decrypt the storage device.</p>"
+"<p><b>%1</b> is an encrypted locked storage device.</p>\n"
+"<p>Please enter the password to unlock the storage device.</p>"
msgstr ""
-#: mediamanager/decryptdialog.ui:131 mounthelper/decryptdialog.ui:131
+#: mediamanager/unlockdialog.ui:131 mounthelper/unlockdialog.ui:131
#, no-c-format
msgid "&Password:"
msgstr ""
+#: mounthelper/unlockdialog.ui:109
+#, no-c-format
+msgid ""
+"<p><b>%1</b> is an encrypted storage device.</p>\n"
+"<p>Please enter the password to decrypt the storage device.</p>"
+msgstr ""
+
#: propsdlgplugin/propertiespagegui.ui:16
#, no-c-format
msgid "PropertiesPageGUI"
@@ -807,3 +828,7 @@ msgstr "ਰਲਵਾਂ"
#, no-c-format
msgid "Filesystem: iso9660"
msgstr "ਫਾਇਲ ਸਿਸਟਮ: iso9660"
+
+#, 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 d4242681c50..c1c89c8657c 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: 2019-01-13 18:47+0100\n"
+"POT-Creation-Date: 2019-07-11 02:33+0200\n"
"PO-Revision-Date: 2015-01-16 23:00+0100\n"
"Last-Translator: mcbx\n"
"Language-Team: <pl@li.org>\n"
@@ -49,7 +49,6 @@ 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
-#: mounthelper/tdeio_media_mounthelper.cpp:256
msgid "The TDE mediamanager is not running."
msgstr "Menedżer nośników wymiennych TDE nie jest uruchomiony."
@@ -57,7 +56,7 @@ msgstr "Menedżer nośników wymiennych TDE nie jest uruchomiony."
msgid "This media name already exists."
msgstr "Podana nazwa nośnika już istnieje."
-#: mediaimpl.cpp:230 mediaimpl.cpp:293
+#: mediaimpl.cpp:230 mediaimpl.cpp:297
msgid "No such medium."
msgstr "Nie ma takiego nośnika."
@@ -65,82 +64,80 @@ msgstr "Nie ma takiego nośnika."
msgid "The drive is encrypted."
msgstr "Dysk jest zaszyfrowany"
-#: mediaimpl.cpp:272 mediamanager/halbackend.cpp:1264
-#: mediamanager/halbackend.cpp:1273 mediamanager/halbackend.cpp:1663
-#: mediamanager/halbackend.cpp:1680 mediamanager/halbackend.cpp:1691
-#: mediamanager/halbackend.cpp:1793 mediamanager/halbackend.cpp:1801
-#: mediamanager/halbackend.cpp:1808 mediamanager/halbackend.cpp:1848
-#: mediamanager/halbackend.cpp:1854 mediamanager/halbackend.cpp:1861
-#: mounthelper/tdeio_media_mounthelper.cpp:58
-msgid "Internal Error"
-msgstr "Błąd wewnętrzny"
+#: mediaimpl.cpp:274 mediamanager/tdehardwarebackend.cpp:201
+#: mediamanager/tdehardwarebackend.cpp:252
+#: mounthelper/tdeio_media_mounthelper.cpp:202
+msgid "Unknown mount error."
+msgstr ""
#: mediamanager/dialog.cpp:26 mounthelper/dialog.cpp:26
-msgid "Decrypt"
-msgstr "Odszyfruj"
-
-#: mediamanager/fstabbackend.cpp:104 mediamanager/fstabbackend.cpp:114
-#: mediamanager/halbackend.cpp:1595 mediamanager/halbackend.cpp:1617
-#: mediamanager/halbackend.cpp:1776 mediamanager/halbackend.cpp:1831
-#: mediamanager/tdehardwarebackend.cpp:1349
-#: mediamanager/tdehardwarebackend.cpp:1360
+msgid "Unlock"
+msgstr ""
+
+#: mediamanager/fstabbackend.cpp:105 mediamanager/fstabbackend.cpp:120
+#: mediamanager/halbackend.cpp:1598 mediamanager/halbackend.cpp:1625
+#: mediamanager/halbackend.cpp:1808 mediamanager/halbackend.cpp:1877
+#: mediamanager/mediamanager.cpp:363 mediamanager/mediamanager.cpp:375
+#: mediamanager/mediamanager.cpp:387 mediamanager/mediamanager.cpp:399
+#: mediamanager/tdehardwarebackend.cpp:1363
+#: mediamanager/tdehardwarebackend.cpp:1378
#, c-format
msgid "No such medium: %1"
msgstr "Nie ma takiego nośnika: %1"
-#: mediamanager/fstabbackend.cpp:398
+#: mediamanager/fstabbackend.cpp:408
msgid "CD Recorder"
msgstr "Nagrywarka CD"
-#: mediamanager/fstabbackend.cpp:404
+#: mediamanager/fstabbackend.cpp:414
msgid "DVD"
msgstr "DVD"
-#: mediamanager/fstabbackend.cpp:415
+#: mediamanager/fstabbackend.cpp:425
msgid "CD-ROM"
msgstr "CD-ROM"
-#: mediamanager/fstabbackend.cpp:428
+#: mediamanager/fstabbackend.cpp:438
msgid "Floppy"
msgstr "Dyskietka"
-#: mediamanager/fstabbackend.cpp:436
+#: mediamanager/fstabbackend.cpp:446
msgid "Zip Disk"
msgstr "Dysk ZIP"
-#: mediamanager/fstabbackend.cpp:447
+#: mediamanager/fstabbackend.cpp:457
msgid "Removable Device"
msgstr "Napęd wymienny"
-#: mediamanager/fstabbackend.cpp:452 mediamanager/fstabbackend.cpp:458
+#: mediamanager/fstabbackend.cpp:462 mediamanager/fstabbackend.cpp:468
msgid "Remote Share"
msgstr "Odległy zasób"
-#: mediamanager/fstabbackend.cpp:463
+#: mediamanager/fstabbackend.cpp:473
msgid "Hard Disk"
msgstr "Dysk twardy"
-#: mediamanager/halbackend.cpp:749 mediamanager/tdehardwarebackend.cpp:805
+#: mediamanager/halbackend.cpp:744 mediamanager/tdehardwarebackend.cpp:808
msgid "Unknown Drive"
msgstr "Nieznany napęd"
-#: mediamanager/halbackend.cpp:761 mediamanager/tdehardwarebackend.cpp:835
+#: mediamanager/halbackend.cpp:756 mediamanager/tdehardwarebackend.cpp:838
msgid "Floppy Drive"
msgstr "Dyskietka"
-#: mediamanager/halbackend.cpp:769
+#: mediamanager/halbackend.cpp:764
msgid "Zip Drive"
msgstr "Dysk ZIP"
-#: mediamanager/halbackend.cpp:839 mediamanager/tdehardwarebackend.cpp:892
+#: mediamanager/halbackend.cpp:834 mediamanager/tdehardwarebackend.cpp:895
msgid "Camera"
msgstr "Aparat fotograficzny"
-#: mediamanager/halbackend.cpp:1221 mediamanager/halbackend.cpp:1247
+#: mediamanager/halbackend.cpp:1216 mediamanager/halbackend.cpp:1242
msgid "Authenticate"
msgstr "Uwierzytelnij"
-#: mediamanager/halbackend.cpp:1222
+#: mediamanager/halbackend.cpp:1217
msgid ""
"<big><b>System policy prevents mounting internal media</b></big><br/"
">Authentication is required to perform this action. Please enter your "
@@ -150,7 +147,7 @@ msgstr ""
"big> <br/>Dla wykonania tej czynności niezbędne jest uwierzytelnienie. "
"Proszę wprowadzić swoje hasło."
-#: mediamanager/halbackend.cpp:1248
+#: mediamanager/halbackend.cpp:1243
msgid ""
"<big><b>System policy prevents unmounting media mounted by other users</b></"
"big><br/>Authentication is required to perform this action. Please enter "
@@ -160,11 +157,17 @@ msgstr ""
"przez innych użytkowników</b></big> Dla wykonania tej operacji niezbędne "
"jest uwierzytelnienie. Proszę wprowadzić swoje hasło."
-#: mediamanager/halbackend.cpp:1284
+#: mediamanager/halbackend.cpp:1259 mediamanager/halbackend.cpp:1268
+#: mediamanager/halbackend.cpp:1849 mediamanager/halbackend.cpp:1916
+#: mounthelper/tdeio_media_mounthelper.cpp:58
+msgid "Internal Error"
+msgstr "Błąd wewnętrzny"
+
+#: mediamanager/halbackend.cpp:1279
msgid "Invalid filesystem type"
msgstr "Nieprawidłowy system plików"
-#: mediamanager/halbackend.cpp:1286
+#: mediamanager/halbackend.cpp:1281
msgid ""
"Permission denied<p>Please ensure that:<br>1. You have permission to access "
"this device.<br>2. This device node is not listed in /etc/fstab.</p>"
@@ -173,11 +176,11 @@ msgstr ""
"dla dostępu do tego urządzenia. <br>2. To urządzenie nie posiada wpisu w /"
"etc/fstab.</p>"
-#: mediamanager/halbackend.cpp:1290
+#: mediamanager/halbackend.cpp:1285
msgid "Device is already mounted."
msgstr "Urządzenie jest już zamontowane."
-#: mediamanager/halbackend.cpp:1340
+#: mediamanager/halbackend.cpp:1335
msgid ""
"Moreover, programs still using the device have been detected. They are "
"listed below. You have to close them or change their working directory "
@@ -187,7 +190,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:1381 mediamanager/tdehardwarebackend.cpp:1588
+#: mediamanager/halbackend.cpp:1376 mediamanager/tdehardwarebackend.cpp:1618
msgid ""
"Programs that were still using the device have been forcibly terminated. "
"They are listed below."
@@ -195,10 +198,10 @@ msgstr ""
"Programy, które nadal używały urządzenia zostały zakończone. Programy te "
"podano poniżej."
-#: mediamanager/halbackend.cpp:1402 mediamanager/halbackend.cpp:1715
-#: mediamanager/tdehardwarebackend.cpp:1406
-#: mediamanager/tdehardwarebackend.cpp:1424
-#: mediamanager/tdehardwarebackend.cpp:1464
+#: mediamanager/halbackend.cpp:1397 mediamanager/halbackend.cpp:1742
+#: mediamanager/tdehardwarebackend.cpp:1430
+#: mediamanager/tdehardwarebackend.cpp:1452
+#: mediamanager/tdehardwarebackend.cpp:1494
msgid ""
"Unfortunately, the device <b>%1</b> (%2) named <b>'%3'</b> and currently "
"mounted at <b>%4</b> could not be unmounted. "
@@ -206,27 +209,38 @@ 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:1408 mediamanager/tdehardwarebackend.cpp:1470
+#: mediamanager/halbackend.cpp:1403 mediamanager/tdehardwarebackend.cpp:1500
msgid "The following error was returned by umount command:"
msgstr "Następujący błąd został zwrócony przez polecenie umount:"
-#: mediamanager/halbackend.cpp:1478
-msgid "Permission denied"
-msgstr "Brak dostępu"
-
-#: mediamanager/halbackend.cpp:1562 mediamanager/tdehardwarebackend.cpp:1232
-msgid "Cannot mount encrypted drives!"
+#: mediamanager/halbackend.cpp:1567 mediamanager/tdehardwarebackend.cpp:1322
+#, fuzzy
+#| msgid "Cannot mount encrypted drives!"
+msgid "Cannot mount encrypted locked drives!"
msgstr "Nie można zamontować zaszyfrowanego dysku!"
-#: mediamanager/halbackend.cpp:1721
+#: mediamanager/halbackend.cpp:1682 mediamanager/halbackend.cpp:1703
+#: mediamanager/halbackend.cpp:1716 mediamanager/halbackend.cpp:1830
+#: mediamanager/halbackend.cpp:1840 mediamanager/halbackend.cpp:1899
+#: mediamanager/halbackend.cpp:1907
+msgid "Internal error"
+msgstr "Błąd wewnętrzny"
+
+#: mediamanager/halbackend.cpp:1694
+#, fuzzy
+#| msgid "Unknown"
+msgid "Unknown error"
+msgstr "Nieznane"
+
+#: mediamanager/halbackend.cpp:1748
msgid "Unmounting failed due to the following error:"
msgstr "Odmontowywanie nie powiodło się z powodu następującego błędu:"
-#: mediamanager/halbackend.cpp:1723
+#: mediamanager/halbackend.cpp:1750
msgid "Device is Busy:"
msgstr "Urządzenie jest zajęte:"
-#: mediamanager/halbackend.cpp:1727
+#: mediamanager/halbackend.cpp:1754
msgid ""
"Permission denied<p>Please ensure that:<br>1. You have permission to access "
"this device.<br>2. This device was originally mounted using TDE.</p>"
@@ -235,7 +249,7 @@ msgstr ""
"dostępu do tego urządzenia. <br>2. To urządzenie zostało zamontowane przy "
"użyciu TDE.</p>"
-#: mediamanager/halbackend.cpp:1739
+#: mediamanager/halbackend.cpp:1766
msgid ""
"%1<p><b>Would you like to forcibly terminate these processes?</b><br><i>All "
"unsaved data would be lost</i>"
@@ -243,163 +257,152 @@ msgstr ""
"%1<p><b>Czy chcesz zakończyć te procesy?</b> <br><i>Niezapisane dane zostaną "
"utracone</i>"
-#: mediamanager/halbackend.cpp:1811
+#: mediamanager/halbackend.cpp:1852
msgid "Wrong password"
msgstr "Błędne hasło"
-#: mediamanager/mediamanager.cpp:247 mediamanager/mediamanager.cpp:266
-#: mediamanager/mediamanager.cpp:285 mediamanager/mediamanager.cpp:293
-#: mediamanager/mediamanager.cpp:302 mediamanager/mediamanager.cpp:310
-msgid "Feature only available with HAL"
-msgstr "Właściwość ta dostępna jest jedynie z HAL"
-
-#: mediamanager/mediamanager.cpp:252
+#: mediamanager/mediamanager.cpp:248 mediamanager/mediamanager.cpp:275
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:256 mediamanager/mediamanager.cpp:271
-#: mediamanager/mediamanager.cpp:275
+#: mediamanager/mediamanager.cpp:255 mediamanager/mediamanager.cpp:282
+#: mediamanager/mediamanager.cpp:312 mediamanager/mediamanager.cpp:343
+msgid "Feature only available with HAL"
+msgstr "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
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:480
-#: mediamanager/tdehardwarebackend.cpp:517
-#: mediamanager/tdehardwarebackend.cpp:750
+#: mediamanager/tdehardwarebackend.cpp:483
+#: mediamanager/tdehardwarebackend.cpp:520
+#: mediamanager/tdehardwarebackend.cpp:753
msgid "%1 Removable Device"
msgstr "%1 Napęd wymienny"
-#: mediamanager/tdehardwarebackend.cpp:525
+#: mediamanager/tdehardwarebackend.cpp:528
msgid "Blank CD-ROM"
msgstr "Czysty CD-ROM"
-#: mediamanager/tdehardwarebackend.cpp:534
+#: mediamanager/tdehardwarebackend.cpp:537
msgid "Blank CD-R"
msgstr "Czysty CD-R"
-#: mediamanager/tdehardwarebackend.cpp:543
+#: mediamanager/tdehardwarebackend.cpp:546
msgid "Blank CD-RW"
msgstr "Czysty CD-RW"
-#: mediamanager/tdehardwarebackend.cpp:552
+#: mediamanager/tdehardwarebackend.cpp:555
msgid "Blank Magneto-Optical CD"
msgstr "Czysty dysk magnetooptyczny"
-#: mediamanager/tdehardwarebackend.cpp:561
+#: mediamanager/tdehardwarebackend.cpp:564
msgid "Blank Mount Ranier CD-RW"
msgstr "Czysty Mount Ranier CD-RW"
-#: mediamanager/tdehardwarebackend.cpp:570
+#: mediamanager/tdehardwarebackend.cpp:573
msgid "Blank Mount Ranier CD-RW-W"
msgstr "Czysty Mount Ranier CD-RW-W"
-#: mediamanager/tdehardwarebackend.cpp:579
+#: mediamanager/tdehardwarebackend.cpp:582
msgid "Blank DVD-ROM"
msgstr "Czysty DVD-ROM"
-#: mediamanager/tdehardwarebackend.cpp:588
+#: mediamanager/tdehardwarebackend.cpp:591
msgid "Blank DVD-RAM"
msgstr "Czysty DVD-RAM"
-#: mediamanager/tdehardwarebackend.cpp:597
+#: mediamanager/tdehardwarebackend.cpp:600
msgid "Blank DVD-R"
msgstr "Czysty DVD-R"
-#: mediamanager/tdehardwarebackend.cpp:606
+#: mediamanager/tdehardwarebackend.cpp:609
msgid "Blank DVD-RW"
msgstr "Czysty DVD-RW"
-#: mediamanager/tdehardwarebackend.cpp:615
+#: mediamanager/tdehardwarebackend.cpp:618
msgid "Blank Dual Layer DVD-R"
msgstr "Czysty dwuwarstwowy DVD-R"
-#: mediamanager/tdehardwarebackend.cpp:624
+#: mediamanager/tdehardwarebackend.cpp:627
msgid "Blank Dual Layer DVD-RW"
msgstr "Czysty dwuwarstwowy DVD-RW"
-#: mediamanager/tdehardwarebackend.cpp:633
+#: mediamanager/tdehardwarebackend.cpp:636
msgid "Blank DVD+R"
msgstr "Czysty DVD+R"
-#: mediamanager/tdehardwarebackend.cpp:642
+#: mediamanager/tdehardwarebackend.cpp:645
msgid "Blank DVD+RW"
msgstr "Czysty DVD+RW"
-#: mediamanager/tdehardwarebackend.cpp:651
+#: mediamanager/tdehardwarebackend.cpp:654
msgid "Blank Dual Layer DVD+R"
msgstr "Czysty dwuwarstwowy DVD+R"
-#: mediamanager/tdehardwarebackend.cpp:660
+#: mediamanager/tdehardwarebackend.cpp:663
msgid "Blank Dual Layer DVD+RW"
msgstr "Czysty dwuwarstwowy DVD+RW"
-#: mediamanager/tdehardwarebackend.cpp:669
+#: mediamanager/tdehardwarebackend.cpp:672
msgid "Blank BD-ROM"
msgstr "Czysty BD-ROM"
-#: mediamanager/tdehardwarebackend.cpp:678
+#: mediamanager/tdehardwarebackend.cpp:681
msgid "Blank BD-R"
msgstr "Czysty BD-R"
-#: mediamanager/tdehardwarebackend.cpp:687
+#: mediamanager/tdehardwarebackend.cpp:690
msgid "Blank BD-RW"
msgstr "Czysty BD-RW"
-#: mediamanager/tdehardwarebackend.cpp:696
+#: mediamanager/tdehardwarebackend.cpp:699
msgid "Blank HDDVD-ROM"
msgstr "Czysty HDDVD-ROM"
-#: mediamanager/tdehardwarebackend.cpp:705
+#: mediamanager/tdehardwarebackend.cpp:708
msgid "Blank HDDVD-R"
msgstr "Czysty HDDVD-R"
-#: mediamanager/tdehardwarebackend.cpp:714
+#: mediamanager/tdehardwarebackend.cpp:717
msgid "Blank HDDVD-RW"
msgstr "Czysty HDDVD-RW"
-#: mediamanager/tdehardwarebackend.cpp:721
+#: mediamanager/tdehardwarebackend.cpp:724
msgid "Audio CD"
msgstr "Audio CD"
-#: mediamanager/tdehardwarebackend.cpp:742
+#: mediamanager/tdehardwarebackend.cpp:745
msgid "%1 Fixed Disk (%2)"
msgstr "%1 Dysk Stały (%2)"
-#: mediamanager/tdehardwarebackend.cpp:849
+#: mediamanager/tdehardwarebackend.cpp:852
msgid "%1 Zip Disk"
msgstr "%1 Dysk ZIP"
-#: mediamanager/tdehardwarebackend.cpp:1212
-#: mediamanager/tdehardwarebackend.cpp:1392
-msgid "Internal error"
-msgstr "Błąd wewnętrzny"
+#: mediamanager/tdehardwarebackend.cpp:1224
+#: mediamanager/tdehardwarebackend.cpp:1417
+msgid "Internal error. Couldn't find medium."
+msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:1239
-msgid ""
-"<qt>Unable to mount this device.<p>Potential reasons include:<br>Improper "
-"device and/or user privilege level<br>Corrupt data on storage device"
+#: mediamanager/tdehardwarebackend.cpp:1249
+#: mediamanager/tdehardwarebackend.cpp:1323
+msgid "Unable to mount this device."
msgstr ""
-"<qt>Nie można zamontować urządzenia. <p>Potencjalne przyczyny: "
-"<br>Niewłaściwe urządzenie lub poziom uprawnień <br>Uszkodzone dane zawarte "
-"w urządzeniu"
-#: mediamanager/tdehardwarebackend.cpp:1241
-#: mediamanager/tdehardwarebackend.cpp:1316
-#: mediamanager/tdehardwarebackend.cpp:1408
-#: mediamanager/tdehardwarebackend.cpp:1426
+#: mediamanager/tdehardwarebackend.cpp:1252
+#: mediamanager/tdehardwarebackend.cpp:1326
+#: mediamanager/tdehardwarebackend.cpp:1435
+#: mediamanager/tdehardwarebackend.cpp:1457
msgid "<p>Technical details:<br>"
msgstr "<p>Informacje techniczne:<br>"
-#: mediamanager/tdehardwarebackend.cpp:1314
-msgid ""
-"<qt>Unable to mount this device.<p>Potential reasons include:<br>Improper "
-"device and/or user privilege level<br>Corrupt data on storage "
-"device<br>Incorrect encryption password"
+#: mediamanager/tdehardwarebackend.cpp:1284
+msgid "Decryption aborted"
msgstr ""
-"<qt>Nie można zamontować tego urządzenia. <p>Potencjalne przyczyny: "
-"<br>Niewłaściwe urządzenie lub poziom uprawnień <br> Uszkodzone dane zawarte "
-"w urządzeniu<br>Niewłaściwe hasło"
-#: mediamanager/tdehardwarebackend.cpp:1420
+#: mediamanager/tdehardwarebackend.cpp:1443
msgid ""
"<qt>The device <b>%1</b> (%2) named <b>'%3'</b> and currently mounted at <b>"
"%4</b> can not be unmounted at this time.<p>%5<p><b>Would you like to "
@@ -410,7 +413,7 @@ msgstr ""
"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:1547
+#: mediamanager/tdehardwarebackend.cpp:1577
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 "
@@ -424,7 +427,7 @@ msgstr ""
msgid "%1 cannot be found."
msgstr "Nie można znaleźć %1."
-#: mounthelper/tdeio_media_mounthelper.cpp:86
+#: mounthelper/tdeio_media_mounthelper.cpp:87
msgid "%1 is not a mountable media."
msgstr "%1 nie jest montowalnym nośnikiem."
@@ -433,42 +436,52 @@ msgid "%1 is not an encrypted media."
msgstr "%1 nie jest szyfrowanym nośnikiem."
#: mounthelper/tdeio_media_mounthelper.cpp:107
-msgid "%1 is already decrypted."
+#, fuzzy
+#| msgid "%1 is already decrypted."
+msgid "%1 is already unlocked."
msgstr "%1 jest już odszyfrowane."
-#: mounthelper/tdeio_media_mounthelper.cpp:228
+#: mounthelper/tdeio_media_mounthelper.cpp:139
+msgid "Unknown unmount error."
+msgstr ""
+
+#: mounthelper/tdeio_media_mounthelper.cpp:246
msgid "The device was successfully unmounted, but the tray could not be opened"
msgstr ""
"Urządzenie zostało pomyślnie odmontowane, ale próba otworzenia tacki nie "
"powiodła się."
-#: mounthelper/tdeio_media_mounthelper.cpp:230
+#: mounthelper/tdeio_media_mounthelper.cpp:248
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."
-#: mounthelper/tdeio_media_mounthelper.cpp:275
+#: mounthelper/tdeio_media_mounthelper.cpp:281
+msgid "Unknown decrypt error."
+msgstr ""
+
+#: mounthelper/tdeio_media_mounthelper.cpp:295
msgid "Decrypt given URL"
msgstr "Odszyfruj podany URL"
-#: mounthelper/tdeio_media_mounthelper.cpp:276
+#: mounthelper/tdeio_media_mounthelper.cpp:296
msgid "Unmount given URL"
msgstr "Odmontuj podany URL"
-#: mounthelper/tdeio_media_mounthelper.cpp:277
+#: mounthelper/tdeio_media_mounthelper.cpp:297
msgid "Mount given URL (default)"
msgstr "Zamontuj podany URL (domyślnie)"
-#: mounthelper/tdeio_media_mounthelper.cpp:278
+#: 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:279
+#: 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:280
+#: mounthelper/tdeio_media_mounthelper.cpp:300
msgid "media:/ URL to mount/unmount/eject/remove"
msgstr "URL media:/ do zamontowania/odmontowania/wysunięcia/usunięcia"
@@ -489,43 +502,43 @@ msgstr "Zapisanie zmian nie powiodło się"
msgid "&Mounting"
msgstr "&Montowanie"
-#: tdefile-plugin/tdefilemediaplugin.cpp:190
+#: tdefile-plugin/tdefilemediaplugin.cpp:184
msgid "Medium Information"
msgstr "Informacje o nośniku"
-#: tdefile-plugin/tdefilemediaplugin.cpp:193
+#: tdefile-plugin/tdefilemediaplugin.cpp:187
msgid "Free"
msgstr "Wolne"
-#: tdefile-plugin/tdefilemediaplugin.cpp:196
+#: tdefile-plugin/tdefilemediaplugin.cpp:190
msgid "Used"
msgstr "Zajęte"
-#: tdefile-plugin/tdefilemediaplugin.cpp:199
+#: tdefile-plugin/tdefilemediaplugin.cpp:193
msgid "Total"
msgstr "Całkowicie"
-#: tdefile-plugin/tdefilemediaplugin.cpp:202
+#: tdefile-plugin/tdefilemediaplugin.cpp:196
msgid "Base URL"
msgstr "URL bazowy"
-#: tdefile-plugin/tdefilemediaplugin.cpp:203
+#: tdefile-plugin/tdefilemediaplugin.cpp:197
msgid "Mount Point"
msgstr "Punkt montowania"
-#: tdefile-plugin/tdefilemediaplugin.cpp:204
+#: tdefile-plugin/tdefilemediaplugin.cpp:198
msgid "Device Node"
msgstr "Urządzenie"
-#: tdefile-plugin/tdefilemediaplugin.cpp:206
+#: tdefile-plugin/tdefilemediaplugin.cpp:200
msgid "Medium Summary"
msgstr "Podsumowanie nośnika"
-#: tdefile-plugin/tdefilemediaplugin.cpp:208
+#: tdefile-plugin/tdefilemediaplugin.cpp:202
msgid "Usage"
msgstr "Zużycie"
-#: tdefile-plugin/tdefilemediaplugin.cpp:210
+#: tdefile-plugin/tdefilemediaplugin.cpp:204
msgid "Bar Graph"
msgstr "Wykres słupkowy"
@@ -597,23 +610,30 @@ msgid ""
"devices are plugged in."
msgstr ""
-#: mediamanager/decryptdialog.ui:24 mounthelper/decryptdialog.ui:24
+#: mediamanager/unlockdialog.ui:24 mounthelper/unlockdialog.ui:24
#, no-c-format
msgid "Decrypting Storage Device"
msgstr ""
-#: mediamanager/decryptdialog.ui:109 mounthelper/decryptdialog.ui:109
+#: mediamanager/unlockdialog.ui:109
#, no-c-format
msgid ""
-"<p><b>%1</b> is an encrypted storage device.</p>\n"
-"<p>Please enter the password to decrypt the storage device.</p>"
+"<p><b>%1</b> is an encrypted locked storage device.</p>\n"
+"<p>Please enter the password to unlock the storage device.</p>"
msgstr ""
-#: mediamanager/decryptdialog.ui:131 mounthelper/decryptdialog.ui:131
+#: mediamanager/unlockdialog.ui:131 mounthelper/unlockdialog.ui:131
#, no-c-format
msgid "&Password:"
msgstr ""
+#: mounthelper/unlockdialog.ui:109
+#, no-c-format
+msgid ""
+"<p><b>%1</b> is an encrypted storage device.</p>\n"
+"<p>Please enter the password to decrypt the storage device.</p>"
+msgstr ""
+
#: propsdlgplugin/propertiespagegui.ui:16
#, no-c-format
msgid "PropertiesPageGUI"
@@ -882,3 +902,26 @@ msgstr "Mieszane"
#, no-c-format
msgid "Filesystem: iso9660"
msgstr "System plików: iso-9660"
+
+#~ msgid "Decrypt"
+#~ msgstr "Odszyfruj"
+
+#~ msgid "Permission denied"
+#~ msgstr "Brak dostępu"
+
+#~ msgid ""
+#~ "<qt>Unable to mount this device.<p>Potential reasons include:<br>Improper "
+#~ "device and/or user privilege level<br>Corrupt data on storage device"
+#~ msgstr ""
+#~ "<qt>Nie można zamontować urządzenia. <p>Potencjalne przyczyny: "
+#~ "<br>Niewłaściwe urządzenie lub poziom uprawnień <br>Uszkodzone dane "
+#~ "zawarte w urządzeniu"
+
+#~ msgid ""
+#~ "<qt>Unable to mount this device.<p>Potential reasons include:<br>Improper "
+#~ "device and/or user privilege level<br>Corrupt data on storage "
+#~ "device<br>Incorrect encryption password"
+#~ msgstr ""
+#~ "<qt>Nie można zamontować tego urządzenia. <p>Potencjalne przyczyny: "
+#~ "<br>Niewłaściwe urządzenie lub poziom uprawnień <br> Uszkodzone dane "
+#~ "zawarte w urządzeniu<br>Niewłaściwe hasło"
diff --git a/tde-i18n-pt/messages/tdebase/tdeio_media.po b/tde-i18n-pt/messages/tdebase/tdeio_media.po
index f2ec3306c99..320297b2606 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: 2019-01-13 18:47+0100\n"
+"POT-Creation-Date: 2019-07-11 02:33+0200\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"
@@ -45,7 +45,6 @@ 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
-#: mounthelper/tdeio_media_mounthelper.cpp:256
msgid "The TDE mediamanager is not running."
msgstr "O gestor de media do TDE não está a correr."
@@ -53,7 +52,7 @@ msgstr "O gestor de media do TDE não está a correr."
msgid "This media name already exists."
msgstr "Este nome de dispositivo já existe."
-#: mediaimpl.cpp:230 mediaimpl.cpp:293
+#: mediaimpl.cpp:230 mediaimpl.cpp:297
msgid "No such medium."
msgstr "Não existe este suporte físico."
@@ -61,110 +60,114 @@ msgstr "Não existe este suporte físico."
msgid "The drive is encrypted."
msgstr ""
-#: mediaimpl.cpp:272 mediamanager/halbackend.cpp:1264
-#: mediamanager/halbackend.cpp:1273 mediamanager/halbackend.cpp:1663
-#: mediamanager/halbackend.cpp:1680 mediamanager/halbackend.cpp:1691
-#: mediamanager/halbackend.cpp:1793 mediamanager/halbackend.cpp:1801
-#: mediamanager/halbackend.cpp:1808 mediamanager/halbackend.cpp:1848
-#: mediamanager/halbackend.cpp:1854 mediamanager/halbackend.cpp:1861
-#: mounthelper/tdeio_media_mounthelper.cpp:58
-msgid "Internal Error"
-msgstr "Erro Interno"
+#: mediaimpl.cpp:274 mediamanager/tdehardwarebackend.cpp:201
+#: mediamanager/tdehardwarebackend.cpp:252
+#: mounthelper/tdeio_media_mounthelper.cpp:202
+msgid "Unknown mount error."
+msgstr ""
#: mediamanager/dialog.cpp:26 mounthelper/dialog.cpp:26
-msgid "Decrypt"
+msgid "Unlock"
msgstr ""
-#: mediamanager/fstabbackend.cpp:104 mediamanager/fstabbackend.cpp:114
-#: mediamanager/halbackend.cpp:1595 mediamanager/halbackend.cpp:1617
-#: mediamanager/halbackend.cpp:1776 mediamanager/halbackend.cpp:1831
-#: mediamanager/tdehardwarebackend.cpp:1349
-#: mediamanager/tdehardwarebackend.cpp:1360
+#: mediamanager/fstabbackend.cpp:105 mediamanager/fstabbackend.cpp:120
+#: mediamanager/halbackend.cpp:1598 mediamanager/halbackend.cpp:1625
+#: mediamanager/halbackend.cpp:1808 mediamanager/halbackend.cpp:1877
+#: mediamanager/mediamanager.cpp:363 mediamanager/mediamanager.cpp:375
+#: mediamanager/mediamanager.cpp:387 mediamanager/mediamanager.cpp:399
+#: mediamanager/tdehardwarebackend.cpp:1363
+#: mediamanager/tdehardwarebackend.cpp:1378
#, c-format
msgid "No such medium: %1"
msgstr "Não existe este suporte físico: %1"
-#: mediamanager/fstabbackend.cpp:398
+#: mediamanager/fstabbackend.cpp:408
msgid "CD Recorder"
msgstr "Gravador de CDs"
-#: mediamanager/fstabbackend.cpp:404
+#: mediamanager/fstabbackend.cpp:414
msgid "DVD"
msgstr "DVD"
-#: mediamanager/fstabbackend.cpp:415
+#: mediamanager/fstabbackend.cpp:425
msgid "CD-ROM"
msgstr "CD-ROM"
-#: mediamanager/fstabbackend.cpp:428
+#: mediamanager/fstabbackend.cpp:438
msgid "Floppy"
msgstr "Disquete"
-#: mediamanager/fstabbackend.cpp:436
+#: mediamanager/fstabbackend.cpp:446
msgid "Zip Disk"
msgstr "Disco Zip"
-#: mediamanager/fstabbackend.cpp:447
+#: mediamanager/fstabbackend.cpp:457
msgid "Removable Device"
msgstr "Dispositivo Amovível"
-#: mediamanager/fstabbackend.cpp:452 mediamanager/fstabbackend.cpp:458
+#: mediamanager/fstabbackend.cpp:462 mediamanager/fstabbackend.cpp:468
msgid "Remote Share"
msgstr "Partilha Remota"
-#: mediamanager/fstabbackend.cpp:463
+#: mediamanager/fstabbackend.cpp:473
msgid "Hard Disk"
msgstr "Disco Rígido"
-#: mediamanager/halbackend.cpp:749 mediamanager/tdehardwarebackend.cpp:805
+#: mediamanager/halbackend.cpp:744 mediamanager/tdehardwarebackend.cpp:808
msgid "Unknown Drive"
msgstr "Unidade Desconhecida"
-#: mediamanager/halbackend.cpp:761 mediamanager/tdehardwarebackend.cpp:835
+#: mediamanager/halbackend.cpp:756 mediamanager/tdehardwarebackend.cpp:838
msgid "Floppy Drive"
msgstr "Unidade de Disquetes"
-#: mediamanager/halbackend.cpp:769
+#: mediamanager/halbackend.cpp:764
msgid "Zip Drive"
msgstr "Unidade ZIP"
-#: mediamanager/halbackend.cpp:839 mediamanager/tdehardwarebackend.cpp:892
+#: mediamanager/halbackend.cpp:834 mediamanager/tdehardwarebackend.cpp:895
msgid "Camera"
msgstr "Câmara"
-#: mediamanager/halbackend.cpp:1221 mediamanager/halbackend.cpp:1247
+#: mediamanager/halbackend.cpp:1216 mediamanager/halbackend.cpp:1242
msgid "Authenticate"
msgstr ""
-#: mediamanager/halbackend.cpp:1222
+#: mediamanager/halbackend.cpp:1217
msgid ""
"<big><b>System policy prevents mounting internal media</b></big><br/"
">Authentication is required to perform this action. Please enter your "
"password to verify."
msgstr ""
-#: mediamanager/halbackend.cpp:1248
+#: mediamanager/halbackend.cpp:1243
msgid ""
"<big><b>System policy prevents unmounting media mounted by other users</b></"
"big><br/>Authentication is required to perform this action. Please enter "
"your password to verify."
msgstr ""
-#: mediamanager/halbackend.cpp:1284
+#: mediamanager/halbackend.cpp:1259 mediamanager/halbackend.cpp:1268
+#: mediamanager/halbackend.cpp:1849 mediamanager/halbackend.cpp:1916
+#: mounthelper/tdeio_media_mounthelper.cpp:58
+msgid "Internal Error"
+msgstr "Erro Interno"
+
+#: mediamanager/halbackend.cpp:1279
msgid "Invalid filesystem type"
msgstr "Tipo de sistema de ficheiros inválido"
-#: mediamanager/halbackend.cpp:1286
+#: mediamanager/halbackend.cpp:1281
msgid ""
"Permission denied<p>Please ensure that:<br>1. You have permission to access "
"this device.<br>2. This device node is not listed in /etc/fstab.</p>"
msgstr ""
-#: mediamanager/halbackend.cpp:1290
+#: mediamanager/halbackend.cpp:1285
msgid "Device is already mounted."
msgstr "O dispositivo já está montado."
-#: mediamanager/halbackend.cpp:1340
+#: mediamanager/halbackend.cpp:1335
msgid ""
"Moreover, programs still using the device have been detected. They are "
"listed below. You have to close them or change their working directory "
@@ -174,16 +177,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:1381 mediamanager/tdehardwarebackend.cpp:1588
+#: mediamanager/halbackend.cpp:1376 mediamanager/tdehardwarebackend.cpp:1618
msgid ""
"Programs that were still using the device have been forcibly terminated. "
"They are listed below."
msgstr ""
-#: mediamanager/halbackend.cpp:1402 mediamanager/halbackend.cpp:1715
-#: mediamanager/tdehardwarebackend.cpp:1406
-#: mediamanager/tdehardwarebackend.cpp:1424
-#: mediamanager/tdehardwarebackend.cpp:1464
+#: mediamanager/halbackend.cpp:1397 mediamanager/halbackend.cpp:1742
+#: mediamanager/tdehardwarebackend.cpp:1430
+#: mediamanager/tdehardwarebackend.cpp:1452
+#: mediamanager/tdehardwarebackend.cpp:1494
msgid ""
"Unfortunately, the device <b>%1</b> (%2) named <b>'%3'</b> and currently "
"mounted at <b>%4</b> could not be unmounted. "
@@ -191,196 +194,199 @@ 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:1408 mediamanager/tdehardwarebackend.cpp:1470
+#: mediamanager/halbackend.cpp:1403 mediamanager/tdehardwarebackend.cpp:1500
msgid "The following error was returned by umount command:"
msgstr "Foi devolvido o seguinte erro pelo comando 'umount':"
-#: mediamanager/halbackend.cpp:1478
+#: mediamanager/halbackend.cpp:1567 mediamanager/tdehardwarebackend.cpp:1322
+msgid "Cannot mount encrypted locked drives!"
+msgstr ""
+
+#: mediamanager/halbackend.cpp:1682 mediamanager/halbackend.cpp:1703
+#: mediamanager/halbackend.cpp:1716 mediamanager/halbackend.cpp:1830
+#: mediamanager/halbackend.cpp:1840 mediamanager/halbackend.cpp:1899
+#: mediamanager/halbackend.cpp:1907
#, fuzzy
-msgid "Permission denied"
-msgstr "Permissões negadas"
+msgid "Internal error"
+msgstr "Erro Interno"
-#: mediamanager/halbackend.cpp:1562 mediamanager/tdehardwarebackend.cpp:1232
-msgid "Cannot mount encrypted drives!"
-msgstr ""
+#: mediamanager/halbackend.cpp:1694
+#, fuzzy
+#| msgid "Unknown"
+msgid "Unknown error"
+msgstr "Desconhecido"
-#: mediamanager/halbackend.cpp:1721
+#: mediamanager/halbackend.cpp:1748
msgid "Unmounting failed due to the following error:"
msgstr "A desmontagem falhou devido ao seguinte erro:"
-#: mediamanager/halbackend.cpp:1723
+#: mediamanager/halbackend.cpp:1750
msgid "Device is Busy:"
msgstr "O Dispositivo Está Ocupado:"
-#: mediamanager/halbackend.cpp:1727
+#: mediamanager/halbackend.cpp:1754
msgid ""
"Permission denied<p>Please ensure that:<br>1. You have permission to access "
"this device.<br>2. This device was originally mounted using TDE.</p>"
msgstr ""
-#: mediamanager/halbackend.cpp:1739
+#: mediamanager/halbackend.cpp:1766
msgid ""
"%1<p><b>Would you like to forcibly terminate these processes?</b><br><i>All "
"unsaved data would be lost</i>"
msgstr ""
-#: mediamanager/halbackend.cpp:1811
+#: mediamanager/halbackend.cpp:1852
msgid "Wrong password"
msgstr ""
-#: mediamanager/mediamanager.cpp:247 mediamanager/mediamanager.cpp:266
-#: mediamanager/mediamanager.cpp:285 mediamanager/mediamanager.cpp:293
-#: mediamanager/mediamanager.cpp:302 mediamanager/mediamanager.cpp:310
-msgid "Feature only available with HAL"
-msgstr "A funcionalidade só está disponível com o HAL"
-
-#: mediamanager/mediamanager.cpp:252
+#: mediamanager/mediamanager.cpp:248 mediamanager/mediamanager.cpp:275
#, fuzzy
msgid "Feature only available with the TDE hardware backend"
msgstr "A funcionalidade só está disponível com o HAL"
-#: mediamanager/mediamanager.cpp:256 mediamanager/mediamanager.cpp:271
-#: mediamanager/mediamanager.cpp:275
+#: mediamanager/mediamanager.cpp:255 mediamanager/mediamanager.cpp:282
+#: mediamanager/mediamanager.cpp:312 mediamanager/mediamanager.cpp:343
+msgid "Feature only available with HAL"
+msgstr "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
#, fuzzy
msgid "Feature only available with HAL or TDE hardware backend"
msgstr "A funcionalidade só está disponível com o HAL"
-#: mediamanager/tdehardwarebackend.cpp:480
-#: mediamanager/tdehardwarebackend.cpp:517
-#: mediamanager/tdehardwarebackend.cpp:750
+#: mediamanager/tdehardwarebackend.cpp:483
+#: mediamanager/tdehardwarebackend.cpp:520
+#: mediamanager/tdehardwarebackend.cpp:753
#, fuzzy
msgid "%1 Removable Device"
msgstr "Dispositivo Amovível"
-#: mediamanager/tdehardwarebackend.cpp:525
+#: mediamanager/tdehardwarebackend.cpp:528
#, fuzzy
msgid "Blank CD-ROM"
msgstr "CD-ROM"
-#: mediamanager/tdehardwarebackend.cpp:534
+#: mediamanager/tdehardwarebackend.cpp:537
msgid "Blank CD-R"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:543
+#: mediamanager/tdehardwarebackend.cpp:546
msgid "Blank CD-RW"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:552
+#: mediamanager/tdehardwarebackend.cpp:555
msgid "Blank Magneto-Optical CD"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:561
+#: mediamanager/tdehardwarebackend.cpp:564
msgid "Blank Mount Ranier CD-RW"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:570
+#: mediamanager/tdehardwarebackend.cpp:573
msgid "Blank Mount Ranier CD-RW-W"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:579
+#: mediamanager/tdehardwarebackend.cpp:582
msgid "Blank DVD-ROM"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:588
+#: mediamanager/tdehardwarebackend.cpp:591
msgid "Blank DVD-RAM"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:597
+#: mediamanager/tdehardwarebackend.cpp:600
msgid "Blank DVD-R"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:606
+#: mediamanager/tdehardwarebackend.cpp:609
msgid "Blank DVD-RW"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:615
+#: mediamanager/tdehardwarebackend.cpp:618
msgid "Blank Dual Layer DVD-R"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:624
+#: mediamanager/tdehardwarebackend.cpp:627
msgid "Blank Dual Layer DVD-RW"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:633
+#: mediamanager/tdehardwarebackend.cpp:636
msgid "Blank DVD+R"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:642
+#: mediamanager/tdehardwarebackend.cpp:645
msgid "Blank DVD+RW"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:651
+#: mediamanager/tdehardwarebackend.cpp:654
msgid "Blank Dual Layer DVD+R"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:660
+#: mediamanager/tdehardwarebackend.cpp:663
msgid "Blank Dual Layer DVD+RW"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:669
+#: mediamanager/tdehardwarebackend.cpp:672
msgid "Blank BD-ROM"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:678
+#: mediamanager/tdehardwarebackend.cpp:681
msgid "Blank BD-R"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:687
+#: mediamanager/tdehardwarebackend.cpp:690
msgid "Blank BD-RW"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:696
+#: mediamanager/tdehardwarebackend.cpp:699
msgid "Blank HDDVD-ROM"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:705
+#: mediamanager/tdehardwarebackend.cpp:708
msgid "Blank HDDVD-R"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:714
+#: mediamanager/tdehardwarebackend.cpp:717
msgid "Blank HDDVD-RW"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:721
+#: mediamanager/tdehardwarebackend.cpp:724
msgid "Audio CD"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:742
+#: mediamanager/tdehardwarebackend.cpp:745
msgid "%1 Fixed Disk (%2)"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:849
+#: mediamanager/tdehardwarebackend.cpp:852
#, fuzzy
msgid "%1 Zip Disk"
msgstr "Disco Zip"
-#: mediamanager/tdehardwarebackend.cpp:1212
-#: mediamanager/tdehardwarebackend.cpp:1392
-#, fuzzy
-msgid "Internal error"
-msgstr "Erro Interno"
+#: mediamanager/tdehardwarebackend.cpp:1224
+#: mediamanager/tdehardwarebackend.cpp:1417
+msgid "Internal error. Couldn't find medium."
+msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:1239
-msgid ""
-"<qt>Unable to mount this device.<p>Potential reasons include:<br>Improper "
-"device and/or user privilege level<br>Corrupt data on storage device"
+#: mediamanager/tdehardwarebackend.cpp:1249
+#: mediamanager/tdehardwarebackend.cpp:1323
+msgid "Unable to mount this device."
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:1241
-#: mediamanager/tdehardwarebackend.cpp:1316
-#: mediamanager/tdehardwarebackend.cpp:1408
-#: mediamanager/tdehardwarebackend.cpp:1426
+#: mediamanager/tdehardwarebackend.cpp:1252
+#: mediamanager/tdehardwarebackend.cpp:1326
+#: mediamanager/tdehardwarebackend.cpp:1435
+#: mediamanager/tdehardwarebackend.cpp:1457
msgid "<p>Technical details:<br>"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:1314
-msgid ""
-"<qt>Unable to mount this device.<p>Potential reasons include:<br>Improper "
-"device and/or user privilege level<br>Corrupt data on storage "
-"device<br>Incorrect encryption password"
+#: mediamanager/tdehardwarebackend.cpp:1284
+msgid "Decryption aborted"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:1420
+#: mediamanager/tdehardwarebackend.cpp:1443
msgid ""
"<qt>The device <b>%1</b> (%2) named <b>'%3'</b> and currently mounted at <b>"
"%4</b> can not be unmounted at this time.<p>%5<p><b>Would you like to "
@@ -388,7 +394,7 @@ msgid ""
"lost</i>"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:1547
+#: mediamanager/tdehardwarebackend.cpp:1577
#, fuzzy
msgid ""
"Programs still using the device have been detected. They are listed below. "
@@ -403,7 +409,7 @@ msgstr ""
msgid "%1 cannot be found."
msgstr "Não foi possível encontrar %1."
-#: mounthelper/tdeio_media_mounthelper.cpp:86
+#: mounthelper/tdeio_media_mounthelper.cpp:87
msgid "%1 is not a mountable media."
msgstr "Não é possível montar %1."
@@ -414,43 +420,51 @@ msgstr "Não é possível montar %1."
#: mounthelper/tdeio_media_mounthelper.cpp:107
#, fuzzy
-msgid "%1 is already decrypted."
+msgid "%1 is already unlocked."
msgstr "O dispositivo já está montado."
-#: mounthelper/tdeio_media_mounthelper.cpp:228
+#: mounthelper/tdeio_media_mounthelper.cpp:139
+msgid "Unknown unmount error."
+msgstr ""
+
+#: mounthelper/tdeio_media_mounthelper.cpp:246
msgid "The device was successfully unmounted, but the tray could not be opened"
msgstr ""
"O dispositivo foi desmontado com sucesso, mas a bandeja não se conseguiu "
"abrir"
-#: mounthelper/tdeio_media_mounthelper.cpp:230
+#: 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 conseguiu ser ejectado"
-#: mounthelper/tdeio_media_mounthelper.cpp:275
+#: mounthelper/tdeio_media_mounthelper.cpp:281
+msgid "Unknown decrypt error."
+msgstr ""
+
+#: mounthelper/tdeio_media_mounthelper.cpp:295
#, fuzzy
msgid "Decrypt given URL"
msgstr "Desmontar a URL dada"
-#: mounthelper/tdeio_media_mounthelper.cpp:276
+#: mounthelper/tdeio_media_mounthelper.cpp:296
msgid "Unmount given URL"
msgstr "Desmontar a URL dada"
-#: mounthelper/tdeio_media_mounthelper.cpp:277
+#: mounthelper/tdeio_media_mounthelper.cpp:297
msgid "Mount given URL (default)"
msgstr "Montar a URL dada (por omissão)"
-#: mounthelper/tdeio_media_mounthelper.cpp:278
+#: mounthelper/tdeio_media_mounthelper.cpp:298
msgid "Eject given URL via tdeeject"
msgstr "Ejectar a URL dada via tdeeject"
-#: mounthelper/tdeio_media_mounthelper.cpp:279
+#: mounthelper/tdeio_media_mounthelper.cpp:299
msgid "Unmount and Eject given URL (necessary for some USB devices)"
msgstr ""
"Desmontar e Ejectar o URL dado (necessário para alguns dispositivos USB)"
-#: mounthelper/tdeio_media_mounthelper.cpp:280
+#: mounthelper/tdeio_media_mounthelper.cpp:300
msgid "media:/ URL to mount/unmount/eject/remove"
msgstr "media:/ URL a montar/desmontar/ejectar/remover"
@@ -471,43 +485,43 @@ msgstr "A gravação das alterações falhou"
msgid "&Mounting"
msgstr "&Montagem"
-#: tdefile-plugin/tdefilemediaplugin.cpp:190
+#: tdefile-plugin/tdefilemediaplugin.cpp:184
msgid "Medium Information"
msgstr "Informação do Media"
-#: tdefile-plugin/tdefilemediaplugin.cpp:193
+#: tdefile-plugin/tdefilemediaplugin.cpp:187
msgid "Free"
msgstr "Livre"
-#: tdefile-plugin/tdefilemediaplugin.cpp:196
+#: tdefile-plugin/tdefilemediaplugin.cpp:190
msgid "Used"
msgstr "Utilizado"
-#: tdefile-plugin/tdefilemediaplugin.cpp:199
+#: tdefile-plugin/tdefilemediaplugin.cpp:193
msgid "Total"
msgstr "Total"
-#: tdefile-plugin/tdefilemediaplugin.cpp:202
+#: tdefile-plugin/tdefilemediaplugin.cpp:196
msgid "Base URL"
msgstr "URL de Base"
-#: tdefile-plugin/tdefilemediaplugin.cpp:203
+#: tdefile-plugin/tdefilemediaplugin.cpp:197
msgid "Mount Point"
msgstr "Ponto de Montagem"
-#: tdefile-plugin/tdefilemediaplugin.cpp:204
+#: tdefile-plugin/tdefilemediaplugin.cpp:198
msgid "Device Node"
msgstr "Nó do Dispositivo"
-#: tdefile-plugin/tdefilemediaplugin.cpp:206
+#: tdefile-plugin/tdefilemediaplugin.cpp:200
msgid "Medium Summary"
msgstr "Sumário do Media"
-#: tdefile-plugin/tdefilemediaplugin.cpp:208
+#: tdefile-plugin/tdefilemediaplugin.cpp:202
msgid "Usage"
msgstr "Utilização"
-#: tdefile-plugin/tdefilemediaplugin.cpp:210
+#: tdefile-plugin/tdefilemediaplugin.cpp:204
msgid "Bar Graph"
msgstr "Gráfico de Barras"
@@ -579,23 +593,30 @@ msgid ""
"devices are plugged in."
msgstr ""
-#: mediamanager/decryptdialog.ui:24 mounthelper/decryptdialog.ui:24
+#: mediamanager/unlockdialog.ui:24 mounthelper/unlockdialog.ui:24
#, no-c-format
msgid "Decrypting Storage Device"
msgstr ""
-#: mediamanager/decryptdialog.ui:109 mounthelper/decryptdialog.ui:109
+#: mediamanager/unlockdialog.ui:109
#, no-c-format
msgid ""
-"<p><b>%1</b> is an encrypted storage device.</p>\n"
-"<p>Please enter the password to decrypt the storage device.</p>"
+"<p><b>%1</b> is an encrypted locked storage device.</p>\n"
+"<p>Please enter the password to unlock the storage device.</p>"
msgstr ""
-#: mediamanager/decryptdialog.ui:131 mounthelper/decryptdialog.ui:131
+#: mediamanager/unlockdialog.ui:131 mounthelper/unlockdialog.ui:131
#, no-c-format
msgid "&Password:"
msgstr ""
+#: mounthelper/unlockdialog.ui:109
+#, no-c-format
+msgid ""
+"<p><b>%1</b> is an encrypted storage device.</p>\n"
+"<p>Please enter the password to decrypt the storage device.</p>"
+msgstr ""
+
#: propsdlgplugin/propertiespagegui.ui:16
#, no-c-format
msgid "PropertiesPageGUI"
@@ -861,3 +882,7 @@ msgstr "Misto"
#, no-c-format
msgid "Filesystem: iso9660"
msgstr "Sistema de ficheiros: ISO9660"
+
+#, 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 2b61c3b3e5d..f3586a53a82 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: 2019-01-13 18:47+0100\n"
+"POT-Creation-Date: 2019-07-11 02:33+0200\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"
@@ -49,7 +49,6 @@ 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
-#: mounthelper/tdeio_media_mounthelper.cpp:256
msgid "The TDE mediamanager is not running."
msgstr "O gerenciador de mídia do TDE não está sendo executado."
@@ -57,7 +56,7 @@ msgstr "O gerenciador de mídia do TDE não está sendo executado."
msgid "This media name already exists."
msgstr "O nome desta mídia já existe."
-#: mediaimpl.cpp:230 mediaimpl.cpp:293
+#: mediaimpl.cpp:230 mediaimpl.cpp:297
msgid "No such medium."
msgstr "Mídia inexistente."
@@ -65,113 +64,117 @@ msgstr "Mídia inexistente."
msgid "The drive is encrypted."
msgstr ""
-#: mediaimpl.cpp:272 mediamanager/halbackend.cpp:1264
-#: mediamanager/halbackend.cpp:1273 mediamanager/halbackend.cpp:1663
-#: mediamanager/halbackend.cpp:1680 mediamanager/halbackend.cpp:1691
-#: mediamanager/halbackend.cpp:1793 mediamanager/halbackend.cpp:1801
-#: mediamanager/halbackend.cpp:1808 mediamanager/halbackend.cpp:1848
-#: mediamanager/halbackend.cpp:1854 mediamanager/halbackend.cpp:1861
-#: mounthelper/tdeio_media_mounthelper.cpp:58
-msgid "Internal Error"
-msgstr "Erro Interno"
+#: mediaimpl.cpp:274 mediamanager/tdehardwarebackend.cpp:201
+#: mediamanager/tdehardwarebackend.cpp:252
+#: mounthelper/tdeio_media_mounthelper.cpp:202
+msgid "Unknown mount error."
+msgstr ""
#: mediamanager/dialog.cpp:26 mounthelper/dialog.cpp:26
-msgid "Decrypt"
+msgid "Unlock"
msgstr ""
-#: mediamanager/fstabbackend.cpp:104 mediamanager/fstabbackend.cpp:114
-#: mediamanager/halbackend.cpp:1595 mediamanager/halbackend.cpp:1617
-#: mediamanager/halbackend.cpp:1776 mediamanager/halbackend.cpp:1831
-#: mediamanager/tdehardwarebackend.cpp:1349
-#: mediamanager/tdehardwarebackend.cpp:1360
+#: mediamanager/fstabbackend.cpp:105 mediamanager/fstabbackend.cpp:120
+#: mediamanager/halbackend.cpp:1598 mediamanager/halbackend.cpp:1625
+#: mediamanager/halbackend.cpp:1808 mediamanager/halbackend.cpp:1877
+#: mediamanager/mediamanager.cpp:363 mediamanager/mediamanager.cpp:375
+#: mediamanager/mediamanager.cpp:387 mediamanager/mediamanager.cpp:399
+#: mediamanager/tdehardwarebackend.cpp:1363
+#: mediamanager/tdehardwarebackend.cpp:1378
#, c-format
msgid "No such medium: %1"
msgstr "Meio inexistente: %1"
-#: mediamanager/fstabbackend.cpp:398
+#: mediamanager/fstabbackend.cpp:408
msgid "CD Recorder"
msgstr "Gravador de CD"
-#: mediamanager/fstabbackend.cpp:404
+#: mediamanager/fstabbackend.cpp:414
msgid "DVD"
msgstr "DVD"
-#: mediamanager/fstabbackend.cpp:415
+#: mediamanager/fstabbackend.cpp:425
msgid "CD-ROM"
msgstr "CD-ROM"
-#: mediamanager/fstabbackend.cpp:428
+#: mediamanager/fstabbackend.cpp:438
msgid "Floppy"
msgstr "Disquete"
-#: mediamanager/fstabbackend.cpp:436
+#: mediamanager/fstabbackend.cpp:446
msgid "Zip Disk"
msgstr "Disco Zip"
-#: mediamanager/fstabbackend.cpp:447
+#: mediamanager/fstabbackend.cpp:457
msgid "Removable Device"
msgstr "Dispositivo Removível"
-#: mediamanager/fstabbackend.cpp:452 mediamanager/fstabbackend.cpp:458
+#: mediamanager/fstabbackend.cpp:462 mediamanager/fstabbackend.cpp:468
msgid "Remote Share"
msgstr "Compartilhamento Remoto"
-#: mediamanager/fstabbackend.cpp:463
+#: mediamanager/fstabbackend.cpp:473
msgid "Hard Disk"
msgstr "Disco rígido"
-#: mediamanager/halbackend.cpp:749 mediamanager/tdehardwarebackend.cpp:805
+#: mediamanager/halbackend.cpp:744 mediamanager/tdehardwarebackend.cpp:808
#, fuzzy
msgid "Unknown Drive"
msgstr "Desconhecida"
-#: mediamanager/halbackend.cpp:761 mediamanager/tdehardwarebackend.cpp:835
+#: mediamanager/halbackend.cpp:756 mediamanager/tdehardwarebackend.cpp:838
#, fuzzy
msgid "Floppy Drive"
msgstr "Disquete"
-#: mediamanager/halbackend.cpp:769
+#: mediamanager/halbackend.cpp:764
#, fuzzy
msgid "Zip Drive"
msgstr "Disco Zip"
-#: mediamanager/halbackend.cpp:839 mediamanager/tdehardwarebackend.cpp:892
+#: mediamanager/halbackend.cpp:834 mediamanager/tdehardwarebackend.cpp:895
msgid "Camera"
msgstr "Câmera"
-#: mediamanager/halbackend.cpp:1221 mediamanager/halbackend.cpp:1247
+#: mediamanager/halbackend.cpp:1216 mediamanager/halbackend.cpp:1242
msgid "Authenticate"
msgstr ""
-#: mediamanager/halbackend.cpp:1222
+#: mediamanager/halbackend.cpp:1217
msgid ""
"<big><b>System policy prevents mounting internal media</b></big><br/"
">Authentication is required to perform this action. Please enter your "
"password to verify."
msgstr ""
-#: mediamanager/halbackend.cpp:1248
+#: mediamanager/halbackend.cpp:1243
msgid ""
"<big><b>System policy prevents unmounting media mounted by other users</b></"
"big><br/>Authentication is required to perform this action. Please enter "
"your password to verify."
msgstr ""
-#: mediamanager/halbackend.cpp:1284
+#: mediamanager/halbackend.cpp:1259 mediamanager/halbackend.cpp:1268
+#: mediamanager/halbackend.cpp:1849 mediamanager/halbackend.cpp:1916
+#: mounthelper/tdeio_media_mounthelper.cpp:58
+msgid "Internal Error"
+msgstr "Erro Interno"
+
+#: mediamanager/halbackend.cpp:1279
msgid "Invalid filesystem type"
msgstr "Tipo de sistema de arquivos inválido"
-#: mediamanager/halbackend.cpp:1286
+#: mediamanager/halbackend.cpp:1281
msgid ""
"Permission denied<p>Please ensure that:<br>1. You have permission to access "
"this device.<br>2. This device node is not listed in /etc/fstab.</p>"
msgstr ""
-#: mediamanager/halbackend.cpp:1290
+#: mediamanager/halbackend.cpp:1285
msgid "Device is already mounted."
msgstr "O dispositivo já está montado."
-#: mediamanager/halbackend.cpp:1340
+#: mediamanager/halbackend.cpp:1335
msgid ""
"Moreover, programs still using the device have been detected. They are "
"listed below. You have to close them or change their working directory "
@@ -181,16 +184,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:1381 mediamanager/tdehardwarebackend.cpp:1588
+#: mediamanager/halbackend.cpp:1376 mediamanager/tdehardwarebackend.cpp:1618
msgid ""
"Programs that were still using the device have been forcibly terminated. "
"They are listed below."
msgstr ""
-#: mediamanager/halbackend.cpp:1402 mediamanager/halbackend.cpp:1715
-#: mediamanager/tdehardwarebackend.cpp:1406
-#: mediamanager/tdehardwarebackend.cpp:1424
-#: mediamanager/tdehardwarebackend.cpp:1464
+#: mediamanager/halbackend.cpp:1397 mediamanager/halbackend.cpp:1742
+#: mediamanager/tdehardwarebackend.cpp:1430
+#: mediamanager/tdehardwarebackend.cpp:1452
+#: mediamanager/tdehardwarebackend.cpp:1494
msgid ""
"Unfortunately, the device <b>%1</b> (%2) named <b>'%3'</b> and currently "
"mounted at <b>%4</b> could not be unmounted. "
@@ -198,196 +201,199 @@ 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:1408 mediamanager/tdehardwarebackend.cpp:1470
+#: mediamanager/halbackend.cpp:1403 mediamanager/tdehardwarebackend.cpp:1500
msgid "The following error was returned by umount command:"
msgstr "O seguinte erro foi retornado pelo comando umount:"
-#: mediamanager/halbackend.cpp:1478
+#: mediamanager/halbackend.cpp:1567 mediamanager/tdehardwarebackend.cpp:1322
+msgid "Cannot mount encrypted locked drives!"
+msgstr ""
+
+#: mediamanager/halbackend.cpp:1682 mediamanager/halbackend.cpp:1703
+#: mediamanager/halbackend.cpp:1716 mediamanager/halbackend.cpp:1830
+#: mediamanager/halbackend.cpp:1840 mediamanager/halbackend.cpp:1899
+#: mediamanager/halbackend.cpp:1907
#, fuzzy
-msgid "Permission denied"
-msgstr "Permissões negadas"
+msgid "Internal error"
+msgstr "Erro Interno"
-#: mediamanager/halbackend.cpp:1562 mediamanager/tdehardwarebackend.cpp:1232
-msgid "Cannot mount encrypted drives!"
-msgstr ""
+#: mediamanager/halbackend.cpp:1694
+#, fuzzy
+#| msgid "Unknown"
+msgid "Unknown error"
+msgstr "Desconhecida"
-#: mediamanager/halbackend.cpp:1721
+#: mediamanager/halbackend.cpp:1748
msgid "Unmounting failed due to the following error:"
msgstr "A desmontagem falhou devido ao seguinte erro:"
-#: mediamanager/halbackend.cpp:1723
+#: mediamanager/halbackend.cpp:1750
msgid "Device is Busy:"
msgstr "O Dispositivo está Ocupado:"
-#: mediamanager/halbackend.cpp:1727
+#: mediamanager/halbackend.cpp:1754
msgid ""
"Permission denied<p>Please ensure that:<br>1. You have permission to access "
"this device.<br>2. This device was originally mounted using TDE.</p>"
msgstr ""
-#: mediamanager/halbackend.cpp:1739
+#: mediamanager/halbackend.cpp:1766
msgid ""
"%1<p><b>Would you like to forcibly terminate these processes?</b><br><i>All "
"unsaved data would be lost</i>"
msgstr ""
-#: mediamanager/halbackend.cpp:1811
+#: mediamanager/halbackend.cpp:1852
msgid "Wrong password"
msgstr ""
-#: mediamanager/mediamanager.cpp:247 mediamanager/mediamanager.cpp:266
-#: mediamanager/mediamanager.cpp:285 mediamanager/mediamanager.cpp:293
-#: mediamanager/mediamanager.cpp:302 mediamanager/mediamanager.cpp:310
-msgid "Feature only available with HAL"
-msgstr "Recurso disponível somente com o HAL"
-
-#: mediamanager/mediamanager.cpp:252
+#: mediamanager/mediamanager.cpp:248 mediamanager/mediamanager.cpp:275
#, fuzzy
msgid "Feature only available with the TDE hardware backend"
msgstr "Recurso disponível somente com o HAL"
-#: mediamanager/mediamanager.cpp:256 mediamanager/mediamanager.cpp:271
-#: mediamanager/mediamanager.cpp:275
+#: mediamanager/mediamanager.cpp:255 mediamanager/mediamanager.cpp:282
+#: mediamanager/mediamanager.cpp:312 mediamanager/mediamanager.cpp:343
+msgid "Feature only available with HAL"
+msgstr "Recurso disponível somente com o HAL"
+
+#: mediamanager/mediamanager.cpp:262 mediamanager/mediamanager.cpp:289
+#: mediamanager/mediamanager.cpp:320 mediamanager/mediamanager.cpp:350
#, fuzzy
msgid "Feature only available with HAL or TDE hardware backend"
msgstr "Recurso disponível somente com o HAL"
-#: mediamanager/tdehardwarebackend.cpp:480
-#: mediamanager/tdehardwarebackend.cpp:517
-#: mediamanager/tdehardwarebackend.cpp:750
+#: mediamanager/tdehardwarebackend.cpp:483
+#: mediamanager/tdehardwarebackend.cpp:520
+#: mediamanager/tdehardwarebackend.cpp:753
#, fuzzy
msgid "%1 Removable Device"
msgstr "Dispositivo Removível"
-#: mediamanager/tdehardwarebackend.cpp:525
+#: mediamanager/tdehardwarebackend.cpp:528
#, fuzzy
msgid "Blank CD-ROM"
msgstr "CD-ROM"
-#: mediamanager/tdehardwarebackend.cpp:534
+#: mediamanager/tdehardwarebackend.cpp:537
msgid "Blank CD-R"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:543
+#: mediamanager/tdehardwarebackend.cpp:546
msgid "Blank CD-RW"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:552
+#: mediamanager/tdehardwarebackend.cpp:555
msgid "Blank Magneto-Optical CD"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:561
+#: mediamanager/tdehardwarebackend.cpp:564
msgid "Blank Mount Ranier CD-RW"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:570
+#: mediamanager/tdehardwarebackend.cpp:573
msgid "Blank Mount Ranier CD-RW-W"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:579
+#: mediamanager/tdehardwarebackend.cpp:582
msgid "Blank DVD-ROM"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:588
+#: mediamanager/tdehardwarebackend.cpp:591
msgid "Blank DVD-RAM"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:597
+#: mediamanager/tdehardwarebackend.cpp:600
msgid "Blank DVD-R"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:606
+#: mediamanager/tdehardwarebackend.cpp:609
msgid "Blank DVD-RW"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:615
+#: mediamanager/tdehardwarebackend.cpp:618
msgid "Blank Dual Layer DVD-R"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:624
+#: mediamanager/tdehardwarebackend.cpp:627
msgid "Blank Dual Layer DVD-RW"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:633
+#: mediamanager/tdehardwarebackend.cpp:636
msgid "Blank DVD+R"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:642
+#: mediamanager/tdehardwarebackend.cpp:645
msgid "Blank DVD+RW"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:651
+#: mediamanager/tdehardwarebackend.cpp:654
msgid "Blank Dual Layer DVD+R"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:660
+#: mediamanager/tdehardwarebackend.cpp:663
msgid "Blank Dual Layer DVD+RW"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:669
+#: mediamanager/tdehardwarebackend.cpp:672
msgid "Blank BD-ROM"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:678
+#: mediamanager/tdehardwarebackend.cpp:681
msgid "Blank BD-R"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:687
+#: mediamanager/tdehardwarebackend.cpp:690
msgid "Blank BD-RW"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:696
+#: mediamanager/tdehardwarebackend.cpp:699
msgid "Blank HDDVD-ROM"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:705
+#: mediamanager/tdehardwarebackend.cpp:708
msgid "Blank HDDVD-R"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:714
+#: mediamanager/tdehardwarebackend.cpp:717
msgid "Blank HDDVD-RW"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:721
+#: mediamanager/tdehardwarebackend.cpp:724
msgid "Audio CD"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:742
+#: mediamanager/tdehardwarebackend.cpp:745
msgid "%1 Fixed Disk (%2)"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:849
+#: mediamanager/tdehardwarebackend.cpp:852
#, fuzzy
msgid "%1 Zip Disk"
msgstr "Disco Zip"
-#: mediamanager/tdehardwarebackend.cpp:1212
-#: mediamanager/tdehardwarebackend.cpp:1392
-#, fuzzy
-msgid "Internal error"
-msgstr "Erro Interno"
+#: mediamanager/tdehardwarebackend.cpp:1224
+#: mediamanager/tdehardwarebackend.cpp:1417
+msgid "Internal error. Couldn't find medium."
+msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:1239
-msgid ""
-"<qt>Unable to mount this device.<p>Potential reasons include:<br>Improper "
-"device and/or user privilege level<br>Corrupt data on storage device"
+#: mediamanager/tdehardwarebackend.cpp:1249
+#: mediamanager/tdehardwarebackend.cpp:1323
+msgid "Unable to mount this device."
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:1241
-#: mediamanager/tdehardwarebackend.cpp:1316
-#: mediamanager/tdehardwarebackend.cpp:1408
-#: mediamanager/tdehardwarebackend.cpp:1426
+#: mediamanager/tdehardwarebackend.cpp:1252
+#: mediamanager/tdehardwarebackend.cpp:1326
+#: mediamanager/tdehardwarebackend.cpp:1435
+#: mediamanager/tdehardwarebackend.cpp:1457
msgid "<p>Technical details:<br>"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:1314
-msgid ""
-"<qt>Unable to mount this device.<p>Potential reasons include:<br>Improper "
-"device and/or user privilege level<br>Corrupt data on storage "
-"device<br>Incorrect encryption password"
+#: mediamanager/tdehardwarebackend.cpp:1284
+msgid "Decryption aborted"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:1420
+#: mediamanager/tdehardwarebackend.cpp:1443
msgid ""
"<qt>The device <b>%1</b> (%2) named <b>'%3'</b> and currently mounted at <b>"
"%4</b> can not be unmounted at this time.<p>%5<p><b>Would you like to "
@@ -395,7 +401,7 @@ msgid ""
"lost</i>"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:1547
+#: mediamanager/tdehardwarebackend.cpp:1577
#, fuzzy
msgid ""
"Programs still using the device have been detected. They are listed below. "
@@ -410,7 +416,7 @@ msgstr ""
msgid "%1 cannot be found."
msgstr "%1 não pode ser encontrado."
-#: mounthelper/tdeio_media_mounthelper.cpp:86
+#: mounthelper/tdeio_media_mounthelper.cpp:87
msgid "%1 is not a mountable media."
msgstr "%1 não é uma mídia montável."
@@ -421,42 +427,50 @@ msgstr "%1 não é uma mídia montável."
#: mounthelper/tdeio_media_mounthelper.cpp:107
#, fuzzy
-msgid "%1 is already decrypted."
+msgid "%1 is already unlocked."
msgstr "O dispositivo já está montado."
-#: mounthelper/tdeio_media_mounthelper.cpp:228
+#: mounthelper/tdeio_media_mounthelper.cpp:139
+msgid "Unknown unmount error."
+msgstr ""
+
+#: mounthelper/tdeio_media_mounthelper.cpp:246
msgid "The device was successfully unmounted, but the tray could not be opened"
msgstr ""
"O dispositivo foi desmontado com sucesso, mas a bandeja não pôde ser aberta"
-#: mounthelper/tdeio_media_mounthelper.cpp:230
+#: 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:275
+#: mounthelper/tdeio_media_mounthelper.cpp:281
+msgid "Unknown decrypt error."
+msgstr ""
+
+#: mounthelper/tdeio_media_mounthelper.cpp:295
#, fuzzy
msgid "Decrypt given URL"
msgstr "Desmontar URL fornecida"
-#: mounthelper/tdeio_media_mounthelper.cpp:276
+#: mounthelper/tdeio_media_mounthelper.cpp:296
msgid "Unmount given URL"
msgstr "Desmontar URL fornecida"
-#: mounthelper/tdeio_media_mounthelper.cpp:277
+#: mounthelper/tdeio_media_mounthelper.cpp:297
msgid "Mount given URL (default)"
msgstr "Montar URL fornecida (padrão)"
-#: mounthelper/tdeio_media_mounthelper.cpp:278
+#: mounthelper/tdeio_media_mounthelper.cpp:298
msgid "Eject given URL via tdeeject"
msgstr "Ejetar URL fornecida via tdeeject"
-#: mounthelper/tdeio_media_mounthelper.cpp:279
+#: mounthelper/tdeio_media_mounthelper.cpp:299
msgid "Unmount and Eject given URL (necessary for some USB devices)"
msgstr ""
"Desmonta e ejeta o dispositivo fornecido (necessário para alguns "
"dispositivos USB)"
-#: mounthelper/tdeio_media_mounthelper.cpp:280
+#: mounthelper/tdeio_media_mounthelper.cpp:300
msgid "media:/ URL to mount/unmount/eject/remove"
msgstr "URL em media:/ para montar/desmonar/ejetar/remover"
@@ -477,43 +491,43 @@ msgstr "Falha ao gravar as mudanças"
msgid "&Mounting"
msgstr "&Montagem"
-#: tdefile-plugin/tdefilemediaplugin.cpp:190
+#: tdefile-plugin/tdefilemediaplugin.cpp:184
msgid "Medium Information"
msgstr "Informações Sobre a Mídia"
-#: tdefile-plugin/tdefilemediaplugin.cpp:193
+#: tdefile-plugin/tdefilemediaplugin.cpp:187
msgid "Free"
msgstr "Livre"
-#: tdefile-plugin/tdefilemediaplugin.cpp:196
+#: tdefile-plugin/tdefilemediaplugin.cpp:190
msgid "Used"
msgstr "Usado"
-#: tdefile-plugin/tdefilemediaplugin.cpp:199
+#: tdefile-plugin/tdefilemediaplugin.cpp:193
msgid "Total"
msgstr "Total"
-#: tdefile-plugin/tdefilemediaplugin.cpp:202
+#: tdefile-plugin/tdefilemediaplugin.cpp:196
msgid "Base URL"
msgstr "URL Base"
-#: tdefile-plugin/tdefilemediaplugin.cpp:203
+#: tdefile-plugin/tdefilemediaplugin.cpp:197
msgid "Mount Point"
msgstr "Ponto de montagem"
-#: tdefile-plugin/tdefilemediaplugin.cpp:204
+#: tdefile-plugin/tdefilemediaplugin.cpp:198
msgid "Device Node"
msgstr "Dispositivo"
-#: tdefile-plugin/tdefilemediaplugin.cpp:206
+#: tdefile-plugin/tdefilemediaplugin.cpp:200
msgid "Medium Summary"
msgstr "Resumo da Mídia"
-#: tdefile-plugin/tdefilemediaplugin.cpp:208
+#: tdefile-plugin/tdefilemediaplugin.cpp:202
msgid "Usage"
msgstr "Uso"
-#: tdefile-plugin/tdefilemediaplugin.cpp:210
+#: tdefile-plugin/tdefilemediaplugin.cpp:204
msgid "Bar Graph"
msgstr "Gráfico de Barras"
@@ -585,23 +599,30 @@ msgid ""
"devices are plugged in."
msgstr ""
-#: mediamanager/decryptdialog.ui:24 mounthelper/decryptdialog.ui:24
+#: mediamanager/unlockdialog.ui:24 mounthelper/unlockdialog.ui:24
#, no-c-format
msgid "Decrypting Storage Device"
msgstr ""
-#: mediamanager/decryptdialog.ui:109 mounthelper/decryptdialog.ui:109
+#: mediamanager/unlockdialog.ui:109
#, no-c-format
msgid ""
-"<p><b>%1</b> is an encrypted storage device.</p>\n"
-"<p>Please enter the password to decrypt the storage device.</p>"
+"<p><b>%1</b> is an encrypted locked storage device.</p>\n"
+"<p>Please enter the password to unlock the storage device.</p>"
msgstr ""
-#: mediamanager/decryptdialog.ui:131 mounthelper/decryptdialog.ui:131
+#: mediamanager/unlockdialog.ui:131 mounthelper/unlockdialog.ui:131
#, no-c-format
msgid "&Password:"
msgstr ""
+#: mounthelper/unlockdialog.ui:109
+#, no-c-format
+msgid ""
+"<p><b>%1</b> is an encrypted storage device.</p>\n"
+"<p>Please enter the password to decrypt the storage device.</p>"
+msgstr ""
+
#: propsdlgplugin/propertiespagegui.ui:16
#, no-c-format
msgid "PropertiesPageGUI"
@@ -867,3 +888,7 @@ msgstr "Misto"
#, no-c-format
msgid "Filesystem: iso9660"
msgstr "Sistema de Arquivos: iso9660"
+
+#, 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 643b3fa9540..dad38615620 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: 2019-01-13 18:47+0100\n"
+"POT-Creation-Date: 2019-07-11 02:33+0200\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"
@@ -48,7 +48,6 @@ 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
-#: mounthelper/tdeio_media_mounthelper.cpp:256
msgid "The TDE mediamanager is not running."
msgstr ""
@@ -57,7 +56,7 @@ msgstr ""
msgid "This media name already exists."
msgstr "Acest nume de dispozitiv există deja"
-#: mediaimpl.cpp:230 mediaimpl.cpp:293
+#: mediaimpl.cpp:230 mediaimpl.cpp:297
msgid "No such medium."
msgstr ""
@@ -65,322 +64,330 @@ msgstr ""
msgid "The drive is encrypted."
msgstr ""
-#: mediaimpl.cpp:272 mediamanager/halbackend.cpp:1264
-#: mediamanager/halbackend.cpp:1273 mediamanager/halbackend.cpp:1663
-#: mediamanager/halbackend.cpp:1680 mediamanager/halbackend.cpp:1691
-#: mediamanager/halbackend.cpp:1793 mediamanager/halbackend.cpp:1801
-#: mediamanager/halbackend.cpp:1808 mediamanager/halbackend.cpp:1848
-#: mediamanager/halbackend.cpp:1854 mediamanager/halbackend.cpp:1861
-#: mounthelper/tdeio_media_mounthelper.cpp:58
-msgid "Internal Error"
+#: mediaimpl.cpp:274 mediamanager/tdehardwarebackend.cpp:201
+#: mediamanager/tdehardwarebackend.cpp:252
+#: mounthelper/tdeio_media_mounthelper.cpp:202
+msgid "Unknown mount error."
msgstr ""
#: mediamanager/dialog.cpp:26 mounthelper/dialog.cpp:26
-msgid "Decrypt"
+msgid "Unlock"
msgstr ""
-#: mediamanager/fstabbackend.cpp:104 mediamanager/fstabbackend.cpp:114
-#: mediamanager/halbackend.cpp:1595 mediamanager/halbackend.cpp:1617
-#: mediamanager/halbackend.cpp:1776 mediamanager/halbackend.cpp:1831
-#: mediamanager/tdehardwarebackend.cpp:1349
-#: mediamanager/tdehardwarebackend.cpp:1360
+#: mediamanager/fstabbackend.cpp:105 mediamanager/fstabbackend.cpp:120
+#: mediamanager/halbackend.cpp:1598 mediamanager/halbackend.cpp:1625
+#: mediamanager/halbackend.cpp:1808 mediamanager/halbackend.cpp:1877
+#: mediamanager/mediamanager.cpp:363 mediamanager/mediamanager.cpp:375
+#: mediamanager/mediamanager.cpp:387 mediamanager/mediamanager.cpp:399
+#: mediamanager/tdehardwarebackend.cpp:1363
+#: mediamanager/tdehardwarebackend.cpp:1378
#, c-format
msgid "No such medium: %1"
msgstr ""
-#: mediamanager/fstabbackend.cpp:398
+#: mediamanager/fstabbackend.cpp:408
msgid "CD Recorder"
msgstr "CD Recorder"
-#: mediamanager/fstabbackend.cpp:404
+#: mediamanager/fstabbackend.cpp:414
msgid "DVD"
msgstr "DVD"
-#: mediamanager/fstabbackend.cpp:415
+#: mediamanager/fstabbackend.cpp:425
msgid "CD-ROM"
msgstr "CD-ROM"
-#: mediamanager/fstabbackend.cpp:428
+#: mediamanager/fstabbackend.cpp:438
msgid "Floppy"
msgstr "Floppy"
-#: mediamanager/fstabbackend.cpp:436
+#: mediamanager/fstabbackend.cpp:446
msgid "Zip Disk"
msgstr "Disc ZIP"
-#: mediamanager/fstabbackend.cpp:447
+#: mediamanager/fstabbackend.cpp:457
msgid "Removable Device"
msgstr "Dispozitiv amovibil"
-#: mediamanager/fstabbackend.cpp:452 mediamanager/fstabbackend.cpp:458
+#: mediamanager/fstabbackend.cpp:462 mediamanager/fstabbackend.cpp:468
msgid "Remote Share"
msgstr "Partajare distantă"
-#: mediamanager/fstabbackend.cpp:463
+#: mediamanager/fstabbackend.cpp:473
#, fuzzy
msgid "Hard Disk"
msgstr "Hard Disc"
-#: mediamanager/halbackend.cpp:749 mediamanager/tdehardwarebackend.cpp:805
+#: mediamanager/halbackend.cpp:744 mediamanager/tdehardwarebackend.cpp:808
#, fuzzy
msgid "Unknown Drive"
msgstr "Necunoscut"
-#: mediamanager/halbackend.cpp:761 mediamanager/tdehardwarebackend.cpp:835
+#: mediamanager/halbackend.cpp:756 mediamanager/tdehardwarebackend.cpp:838
#, fuzzy
msgid "Floppy Drive"
msgstr "Floppy"
-#: mediamanager/halbackend.cpp:769
+#: mediamanager/halbackend.cpp:764
#, fuzzy
msgid "Zip Drive"
msgstr "Disc ZIP"
-#: mediamanager/halbackend.cpp:839 mediamanager/tdehardwarebackend.cpp:892
+#: mediamanager/halbackend.cpp:834 mediamanager/tdehardwarebackend.cpp:895
msgid "Camera"
msgstr ""
-#: mediamanager/halbackend.cpp:1221 mediamanager/halbackend.cpp:1247
+#: mediamanager/halbackend.cpp:1216 mediamanager/halbackend.cpp:1242
msgid "Authenticate"
msgstr ""
-#: mediamanager/halbackend.cpp:1222
+#: mediamanager/halbackend.cpp:1217
msgid ""
"<big><b>System policy prevents mounting internal media</b></big><br/"
">Authentication is required to perform this action. Please enter your "
"password to verify."
msgstr ""
-#: mediamanager/halbackend.cpp:1248
+#: mediamanager/halbackend.cpp:1243
msgid ""
"<big><b>System policy prevents unmounting media mounted by other users</b></"
"big><br/>Authentication is required to perform this action. Please enter "
"your password to verify."
msgstr ""
-#: mediamanager/halbackend.cpp:1284
+#: mediamanager/halbackend.cpp:1259 mediamanager/halbackend.cpp:1268
+#: mediamanager/halbackend.cpp:1849 mediamanager/halbackend.cpp:1916
+#: mounthelper/tdeio_media_mounthelper.cpp:58
+msgid "Internal Error"
+msgstr ""
+
+#: mediamanager/halbackend.cpp:1279
msgid "Invalid filesystem type"
msgstr ""
-#: mediamanager/halbackend.cpp:1286
+#: mediamanager/halbackend.cpp:1281
msgid ""
"Permission denied<p>Please ensure that:<br>1. You have permission to access "
"this device.<br>2. This device node is not listed in /etc/fstab.</p>"
msgstr ""
-#: mediamanager/halbackend.cpp:1290
+#: mediamanager/halbackend.cpp:1285
#, fuzzy
msgid "Device is already mounted."
msgstr "Dispozitivul nu este montat"
-#: mediamanager/halbackend.cpp:1340
+#: mediamanager/halbackend.cpp:1335
msgid ""
"Moreover, programs still using the device have been detected. They are "
"listed below. You have to close them or change their working directory "
"before attempting to unmount the device again."
msgstr ""
-#: mediamanager/halbackend.cpp:1381 mediamanager/tdehardwarebackend.cpp:1588
+#: mediamanager/halbackend.cpp:1376 mediamanager/tdehardwarebackend.cpp:1618
msgid ""
"Programs that were still using the device have been forcibly terminated. "
"They are listed below."
msgstr ""
-#: mediamanager/halbackend.cpp:1402 mediamanager/halbackend.cpp:1715
-#: mediamanager/tdehardwarebackend.cpp:1406
-#: mediamanager/tdehardwarebackend.cpp:1424
-#: mediamanager/tdehardwarebackend.cpp:1464
+#: mediamanager/halbackend.cpp:1397 mediamanager/halbackend.cpp:1742
+#: mediamanager/tdehardwarebackend.cpp:1430
+#: mediamanager/tdehardwarebackend.cpp:1452
+#: mediamanager/tdehardwarebackend.cpp:1494
msgid ""
"Unfortunately, the device <b>%1</b> (%2) named <b>'%3'</b> and currently "
"mounted at <b>%4</b> could not be unmounted. "
msgstr ""
-#: mediamanager/halbackend.cpp:1408 mediamanager/tdehardwarebackend.cpp:1470
+#: mediamanager/halbackend.cpp:1403 mediamanager/tdehardwarebackend.cpp:1500
msgid "The following error was returned by umount command:"
msgstr ""
-#: mediamanager/halbackend.cpp:1478
-msgid "Permission denied"
+#: mediamanager/halbackend.cpp:1567 mediamanager/tdehardwarebackend.cpp:1322
+msgid "Cannot mount encrypted locked drives!"
msgstr ""
-#: mediamanager/halbackend.cpp:1562 mediamanager/tdehardwarebackend.cpp:1232
-msgid "Cannot mount encrypted drives!"
+#: mediamanager/halbackend.cpp:1682 mediamanager/halbackend.cpp:1703
+#: mediamanager/halbackend.cpp:1716 mediamanager/halbackend.cpp:1830
+#: mediamanager/halbackend.cpp:1840 mediamanager/halbackend.cpp:1899
+#: mediamanager/halbackend.cpp:1907
+msgid "Internal error"
msgstr ""
-#: mediamanager/halbackend.cpp:1721
+#: mediamanager/halbackend.cpp:1694
+#, fuzzy
+#| msgid "Unknown"
+msgid "Unknown error"
+msgstr "Necunoscut"
+
+#: mediamanager/halbackend.cpp:1748
msgid "Unmounting failed due to the following error:"
msgstr ""
-#: mediamanager/halbackend.cpp:1723
+#: mediamanager/halbackend.cpp:1750
msgid "Device is Busy:"
msgstr ""
-#: mediamanager/halbackend.cpp:1727
+#: mediamanager/halbackend.cpp:1754
msgid ""
"Permission denied<p>Please ensure that:<br>1. You have permission to access "
"this device.<br>2. This device was originally mounted using TDE.</p>"
msgstr ""
-#: mediamanager/halbackend.cpp:1739
+#: mediamanager/halbackend.cpp:1766
msgid ""
"%1<p><b>Would you like to forcibly terminate these processes?</b><br><i>All "
"unsaved data would be lost</i>"
msgstr ""
-#: mediamanager/halbackend.cpp:1811
+#: mediamanager/halbackend.cpp:1852
msgid "Wrong password"
msgstr ""
-#: mediamanager/mediamanager.cpp:247 mediamanager/mediamanager.cpp:266
-#: mediamanager/mediamanager.cpp:285 mediamanager/mediamanager.cpp:293
-#: mediamanager/mediamanager.cpp:302 mediamanager/mediamanager.cpp:310
-msgid "Feature only available with HAL"
+#: mediamanager/mediamanager.cpp:248 mediamanager/mediamanager.cpp:275
+msgid "Feature only available with the TDE hardware backend"
msgstr ""
-#: mediamanager/mediamanager.cpp:252
-msgid "Feature only available with the TDE hardware backend"
+#: mediamanager/mediamanager.cpp:255 mediamanager/mediamanager.cpp:282
+#: mediamanager/mediamanager.cpp:312 mediamanager/mediamanager.cpp:343
+msgid "Feature only available with HAL"
msgstr ""
-#: mediamanager/mediamanager.cpp:256 mediamanager/mediamanager.cpp:271
-#: mediamanager/mediamanager.cpp:275
+#: mediamanager/mediamanager.cpp:262 mediamanager/mediamanager.cpp:289
+#: mediamanager/mediamanager.cpp:320 mediamanager/mediamanager.cpp:350
msgid "Feature only available with HAL or TDE hardware backend"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:480
-#: mediamanager/tdehardwarebackend.cpp:517
-#: mediamanager/tdehardwarebackend.cpp:750
+#: mediamanager/tdehardwarebackend.cpp:483
+#: mediamanager/tdehardwarebackend.cpp:520
+#: mediamanager/tdehardwarebackend.cpp:753
#, fuzzy
msgid "%1 Removable Device"
msgstr "Dispozitiv amovibil"
-#: mediamanager/tdehardwarebackend.cpp:525
+#: mediamanager/tdehardwarebackend.cpp:528
#, fuzzy
msgid "Blank CD-ROM"
msgstr "CD-ROM"
-#: mediamanager/tdehardwarebackend.cpp:534
+#: mediamanager/tdehardwarebackend.cpp:537
msgid "Blank CD-R"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:543
+#: mediamanager/tdehardwarebackend.cpp:546
msgid "Blank CD-RW"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:552
+#: mediamanager/tdehardwarebackend.cpp:555
msgid "Blank Magneto-Optical CD"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:561
+#: mediamanager/tdehardwarebackend.cpp:564
msgid "Blank Mount Ranier CD-RW"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:570
+#: mediamanager/tdehardwarebackend.cpp:573
msgid "Blank Mount Ranier CD-RW-W"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:579
+#: mediamanager/tdehardwarebackend.cpp:582
msgid "Blank DVD-ROM"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:588
+#: mediamanager/tdehardwarebackend.cpp:591
msgid "Blank DVD-RAM"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:597
+#: mediamanager/tdehardwarebackend.cpp:600
msgid "Blank DVD-R"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:606
+#: mediamanager/tdehardwarebackend.cpp:609
msgid "Blank DVD-RW"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:615
+#: mediamanager/tdehardwarebackend.cpp:618
msgid "Blank Dual Layer DVD-R"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:624
+#: mediamanager/tdehardwarebackend.cpp:627
msgid "Blank Dual Layer DVD-RW"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:633
+#: mediamanager/tdehardwarebackend.cpp:636
msgid "Blank DVD+R"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:642
+#: mediamanager/tdehardwarebackend.cpp:645
msgid "Blank DVD+RW"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:651
+#: mediamanager/tdehardwarebackend.cpp:654
msgid "Blank Dual Layer DVD+R"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:660
+#: mediamanager/tdehardwarebackend.cpp:663
msgid "Blank Dual Layer DVD+RW"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:669
+#: mediamanager/tdehardwarebackend.cpp:672
msgid "Blank BD-ROM"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:678
+#: mediamanager/tdehardwarebackend.cpp:681
msgid "Blank BD-R"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:687
+#: mediamanager/tdehardwarebackend.cpp:690
msgid "Blank BD-RW"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:696
+#: mediamanager/tdehardwarebackend.cpp:699
msgid "Blank HDDVD-ROM"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:705
+#: mediamanager/tdehardwarebackend.cpp:708
msgid "Blank HDDVD-R"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:714
+#: mediamanager/tdehardwarebackend.cpp:717
msgid "Blank HDDVD-RW"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:721
+#: mediamanager/tdehardwarebackend.cpp:724
msgid "Audio CD"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:742
+#: mediamanager/tdehardwarebackend.cpp:745
msgid "%1 Fixed Disk (%2)"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:849
+#: mediamanager/tdehardwarebackend.cpp:852
#, fuzzy
msgid "%1 Zip Disk"
msgstr "Disc ZIP"
-#: mediamanager/tdehardwarebackend.cpp:1212
-#: mediamanager/tdehardwarebackend.cpp:1392
-msgid "Internal error"
+#: mediamanager/tdehardwarebackend.cpp:1224
+#: mediamanager/tdehardwarebackend.cpp:1417
+msgid "Internal error. Couldn't find medium."
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:1239
-msgid ""
-"<qt>Unable to mount this device.<p>Potential reasons include:<br>Improper "
-"device and/or user privilege level<br>Corrupt data on storage device"
+#: mediamanager/tdehardwarebackend.cpp:1249
+#: mediamanager/tdehardwarebackend.cpp:1323
+msgid "Unable to mount this device."
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:1241
-#: mediamanager/tdehardwarebackend.cpp:1316
-#: mediamanager/tdehardwarebackend.cpp:1408
-#: mediamanager/tdehardwarebackend.cpp:1426
+#: mediamanager/tdehardwarebackend.cpp:1252
+#: mediamanager/tdehardwarebackend.cpp:1326
+#: mediamanager/tdehardwarebackend.cpp:1435
+#: mediamanager/tdehardwarebackend.cpp:1457
msgid "<p>Technical details:<br>"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:1314
-msgid ""
-"<qt>Unable to mount this device.<p>Potential reasons include:<br>Improper "
-"device and/or user privilege level<br>Corrupt data on storage "
-"device<br>Incorrect encryption password"
+#: mediamanager/tdehardwarebackend.cpp:1284
+msgid "Decryption aborted"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:1420
+#: mediamanager/tdehardwarebackend.cpp:1443
msgid ""
"<qt>The device <b>%1</b> (%2) named <b>'%3'</b> and currently mounted at <b>"
"%4</b> can not be unmounted at this time.<p>%5<p><b>Would you like to "
@@ -388,7 +395,7 @@ msgid ""
"lost</i>"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:1547
+#: mediamanager/tdehardwarebackend.cpp:1577
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 "
@@ -399,7 +406,7 @@ msgstr ""
msgid "%1 cannot be found."
msgstr ""
-#: mounthelper/tdeio_media_mounthelper.cpp:86
+#: mounthelper/tdeio_media_mounthelper.cpp:87
msgid "%1 is not a mountable media."
msgstr ""
@@ -409,39 +416,49 @@ msgstr ""
#: mounthelper/tdeio_media_mounthelper.cpp:107
#, fuzzy
-msgid "%1 is already decrypted."
+msgid "%1 is already unlocked."
msgstr "Dispozitivul nu este montat"
-#: mounthelper/tdeio_media_mounthelper.cpp:228
+#: mounthelper/tdeio_media_mounthelper.cpp:139
+msgid "Unknown unmount error."
+msgstr ""
+
+#: mounthelper/tdeio_media_mounthelper.cpp:246
msgid "The device was successfully unmounted, but the tray could not be opened"
msgstr ""
-#: mounthelper/tdeio_media_mounthelper.cpp:230
+#: mounthelper/tdeio_media_mounthelper.cpp:248
msgid "The device was successfully unmounted, but could not be ejected"
msgstr ""
-#: mounthelper/tdeio_media_mounthelper.cpp:275
+#: mounthelper/tdeio_media_mounthelper.cpp:281
+#, fuzzy
+#| msgid "Unknown device %1"
+msgid "Unknown decrypt error."
+msgstr "Dispozitiv necunoscut %1"
+
+#: mounthelper/tdeio_media_mounthelper.cpp:295
#, fuzzy
msgid "Decrypt given URL"
msgstr "Demontează URL-ul dat"
-#: mounthelper/tdeio_media_mounthelper.cpp:276
+#: mounthelper/tdeio_media_mounthelper.cpp:296
msgid "Unmount given URL"
msgstr "Demontează URL-ul dat"
-#: mounthelper/tdeio_media_mounthelper.cpp:277
+#: mounthelper/tdeio_media_mounthelper.cpp:297
msgid "Mount given URL (default)"
msgstr "Montează URL-ul dat (implicit)"
-#: mounthelper/tdeio_media_mounthelper.cpp:278
+#: mounthelper/tdeio_media_mounthelper.cpp:298
msgid "Eject given URL via tdeeject"
msgstr "Ejectează URL-ul dat cu tdeeject"
-#: mounthelper/tdeio_media_mounthelper.cpp:279
+#: mounthelper/tdeio_media_mounthelper.cpp:299
msgid "Unmount and Eject given URL (necessary for some USB devices)"
msgstr ""
-#: mounthelper/tdeio_media_mounthelper.cpp:280
+#: mounthelper/tdeio_media_mounthelper.cpp:300
#, fuzzy
msgid "media:/ URL to mount/unmount/eject/remove"
msgstr "devices:/ URL de montat/demontat/ejectat"
@@ -463,46 +480,46 @@ msgstr ""
msgid "&Mounting"
msgstr ""
-#: tdefile-plugin/tdefilemediaplugin.cpp:190
+#: tdefile-plugin/tdefilemediaplugin.cpp:184
#, fuzzy
msgid "Medium Information"
msgstr "Informaţii dispozitiv"
-#: tdefile-plugin/tdefilemediaplugin.cpp:193
+#: tdefile-plugin/tdefilemediaplugin.cpp:187
msgid "Free"
msgstr "Liber"
-#: tdefile-plugin/tdefilemediaplugin.cpp:196
+#: tdefile-plugin/tdefilemediaplugin.cpp:190
msgid "Used"
msgstr "Utilizat"
-#: tdefile-plugin/tdefilemediaplugin.cpp:199
+#: tdefile-plugin/tdefilemediaplugin.cpp:193
msgid "Total"
msgstr "Total"
-#: tdefile-plugin/tdefilemediaplugin.cpp:202
+#: tdefile-plugin/tdefilemediaplugin.cpp:196
msgid "Base URL"
msgstr ""
-#: tdefile-plugin/tdefilemediaplugin.cpp:203
+#: tdefile-plugin/tdefilemediaplugin.cpp:197
msgid "Mount Point"
msgstr ""
-#: tdefile-plugin/tdefilemediaplugin.cpp:204
+#: tdefile-plugin/tdefilemediaplugin.cpp:198
#, fuzzy
msgid "Device Node"
msgstr "Dispozitive"
-#: tdefile-plugin/tdefilemediaplugin.cpp:206
+#: tdefile-plugin/tdefilemediaplugin.cpp:200
#, fuzzy
msgid "Medium Summary"
msgstr "Sumar dispozitiv"
-#: tdefile-plugin/tdefilemediaplugin.cpp:208
+#: tdefile-plugin/tdefilemediaplugin.cpp:202
msgid "Usage"
msgstr "Utilizare"
-#: tdefile-plugin/tdefilemediaplugin.cpp:210
+#: tdefile-plugin/tdefilemediaplugin.cpp:204
#, fuzzy
msgid "Bar Graph"
msgstr "Grafic de bare"
@@ -575,23 +592,30 @@ msgid ""
"devices are plugged in."
msgstr ""
-#: mediamanager/decryptdialog.ui:24 mounthelper/decryptdialog.ui:24
+#: mediamanager/unlockdialog.ui:24 mounthelper/unlockdialog.ui:24
#, no-c-format
msgid "Decrypting Storage Device"
msgstr ""
-#: mediamanager/decryptdialog.ui:109 mounthelper/decryptdialog.ui:109
+#: mediamanager/unlockdialog.ui:109
#, no-c-format
msgid ""
-"<p><b>%1</b> is an encrypted storage device.</p>\n"
-"<p>Please enter the password to decrypt the storage device.</p>"
+"<p><b>%1</b> is an encrypted locked storage device.</p>\n"
+"<p>Please enter the password to unlock the storage device.</p>"
msgstr ""
-#: mediamanager/decryptdialog.ui:131 mounthelper/decryptdialog.ui:131
+#: mediamanager/unlockdialog.ui:131 mounthelper/unlockdialog.ui:131
#, no-c-format
msgid "&Password:"
msgstr ""
+#: mounthelper/unlockdialog.ui:109
+#, no-c-format
+msgid ""
+"<p><b>%1</b> is an encrypted storage device.</p>\n"
+"<p>Please enter the password to decrypt the storage device.</p>"
+msgstr ""
+
#: propsdlgplugin/propertiespagegui.ui:16
#, no-c-format
msgid "PropertiesPageGUI"
@@ -824,9 +848,6 @@ msgstr ""
#~ "\n"
#~ "Verificaţi că discul este introdus corect."
-#~ msgid "Unknown device %1"
-#~ msgstr "Dispozitiv necunoscut %1"
-
#~ msgid "Device not accessible"
#~ msgstr "Dispozitivul nu este accesibil"
diff --git a/tde-i18n-ru/messages/tdebase/tdeio_media.po b/tde-i18n-ru/messages/tdebase/tdeio_media.po
index c2ae4108b51..8e5931c2721 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: 2019-01-13 18:47+0100\n"
+"POT-Creation-Date: 2019-07-11 02:33+0200\n"
"PO-Revision-Date: 2007-12-10 18:00+0300\n"
"Last-Translator: Roman Savochenko <rom_as@oscada.org>\n"
"Language-Team: Russian <kde-russian@lists.kde.ru>\n"
@@ -52,7 +52,6 @@ msgstr "Нет данных"
#: mediaimpl.cpp:88 mediaimpl.cpp:115 mediaimpl.cpp:141 mediaimpl.cpp:177
#: mediaimpl.cpp:197 mediaimpl.cpp:218
#: mounthelper/tdeio_media_mounthelper.cpp:50
-#: mounthelper/tdeio_media_mounthelper.cpp:256
msgid "The TDE mediamanager is not running."
msgstr "TDE mediamanager не запущен."
@@ -60,7 +59,7 @@ msgstr "TDE mediamanager не запущен."
msgid "This media name already exists."
msgstr "Имя диска уже существует."
-#: mediaimpl.cpp:230 mediaimpl.cpp:293
+#: mediaimpl.cpp:230 mediaimpl.cpp:297
msgid "No such medium."
msgstr "Диск отсутствует."
@@ -68,82 +67,80 @@ msgstr "Диск отсутствует."
msgid "The drive is encrypted."
msgstr "Диск зашифрован."
-#: mediaimpl.cpp:272 mediamanager/halbackend.cpp:1264
-#: mediamanager/halbackend.cpp:1273 mediamanager/halbackend.cpp:1663
-#: mediamanager/halbackend.cpp:1680 mediamanager/halbackend.cpp:1691
-#: mediamanager/halbackend.cpp:1793 mediamanager/halbackend.cpp:1801
-#: mediamanager/halbackend.cpp:1808 mediamanager/halbackend.cpp:1848
-#: mediamanager/halbackend.cpp:1854 mediamanager/halbackend.cpp:1861
-#: mounthelper/tdeio_media_mounthelper.cpp:58
-msgid "Internal Error"
-msgstr "Внутренняя ошибка"
+#: mediaimpl.cpp:274 mediamanager/tdehardwarebackend.cpp:201
+#: mediamanager/tdehardwarebackend.cpp:252
+#: mounthelper/tdeio_media_mounthelper.cpp:202
+msgid "Unknown mount error."
+msgstr ""
#: mediamanager/dialog.cpp:26 mounthelper/dialog.cpp:26
-msgid "Decrypt"
-msgstr "Расшифровать"
-
-#: mediamanager/fstabbackend.cpp:104 mediamanager/fstabbackend.cpp:114
-#: mediamanager/halbackend.cpp:1595 mediamanager/halbackend.cpp:1617
-#: mediamanager/halbackend.cpp:1776 mediamanager/halbackend.cpp:1831
-#: mediamanager/tdehardwarebackend.cpp:1349
-#: mediamanager/tdehardwarebackend.cpp:1360
+msgid "Unlock"
+msgstr ""
+
+#: mediamanager/fstabbackend.cpp:105 mediamanager/fstabbackend.cpp:120
+#: mediamanager/halbackend.cpp:1598 mediamanager/halbackend.cpp:1625
+#: mediamanager/halbackend.cpp:1808 mediamanager/halbackend.cpp:1877
+#: mediamanager/mediamanager.cpp:363 mediamanager/mediamanager.cpp:375
+#: mediamanager/mediamanager.cpp:387 mediamanager/mediamanager.cpp:399
+#: mediamanager/tdehardwarebackend.cpp:1363
+#: mediamanager/tdehardwarebackend.cpp:1378
#, c-format
msgid "No such medium: %1"
msgstr "Диск отсутствует: %1"
-#: mediamanager/fstabbackend.cpp:398
+#: mediamanager/fstabbackend.cpp:408
msgid "CD Recorder"
msgstr "Пишущий CD"
-#: mediamanager/fstabbackend.cpp:404
+#: mediamanager/fstabbackend.cpp:414
msgid "DVD"
msgstr "DVD"
-#: mediamanager/fstabbackend.cpp:415
+#: mediamanager/fstabbackend.cpp:425
msgid "CD-ROM"
msgstr "CD-ROM"
-#: mediamanager/fstabbackend.cpp:428
+#: mediamanager/fstabbackend.cpp:438
msgid "Floppy"
msgstr "Дискета"
-#: mediamanager/fstabbackend.cpp:436
+#: mediamanager/fstabbackend.cpp:446
msgid "Zip Disk"
msgstr "Диск Zip"
-#: mediamanager/fstabbackend.cpp:447
+#: mediamanager/fstabbackend.cpp:457
msgid "Removable Device"
msgstr "Съёмный диск"
-#: mediamanager/fstabbackend.cpp:452 mediamanager/fstabbackend.cpp:458
+#: mediamanager/fstabbackend.cpp:462 mediamanager/fstabbackend.cpp:468
msgid "Remote Share"
msgstr "Сетевая папка"
-#: mediamanager/fstabbackend.cpp:463
+#: mediamanager/fstabbackend.cpp:473
msgid "Hard Disk"
msgstr "Жёсткий диск"
-#: mediamanager/halbackend.cpp:749 mediamanager/tdehardwarebackend.cpp:805
+#: mediamanager/halbackend.cpp:744 mediamanager/tdehardwarebackend.cpp:808
msgid "Unknown Drive"
msgstr "Неизвестный диск"
-#: mediamanager/halbackend.cpp:761 mediamanager/tdehardwarebackend.cpp:835
+#: mediamanager/halbackend.cpp:756 mediamanager/tdehardwarebackend.cpp:838
msgid "Floppy Drive"
msgstr "Дискета"
-#: mediamanager/halbackend.cpp:769
+#: mediamanager/halbackend.cpp:764
msgid "Zip Drive"
msgstr "Диск Zip"
-#: mediamanager/halbackend.cpp:839 mediamanager/tdehardwarebackend.cpp:892
+#: mediamanager/halbackend.cpp:834 mediamanager/tdehardwarebackend.cpp:895
msgid "Camera"
msgstr "Фотоаппарат или видеокамера"
-#: mediamanager/halbackend.cpp:1221 mediamanager/halbackend.cpp:1247
+#: mediamanager/halbackend.cpp:1216 mediamanager/halbackend.cpp:1242
msgid "Authenticate"
msgstr "Аутентификация"
-#: mediamanager/halbackend.cpp:1222
+#: mediamanager/halbackend.cpp:1217
msgid ""
"<big><b>System policy prevents mounting internal media</b></big><br/"
">Authentication is required to perform this action. Please enter your "
@@ -153,7 +150,7 @@ msgstr ""
"big><br/>Аутентификация требуется для осуществления этого действия. "
"Пожалуйста введите ваш пароль для проверки."
-#: mediamanager/halbackend.cpp:1248
+#: mediamanager/halbackend.cpp:1243
msgid ""
"<big><b>System policy prevents unmounting media mounted by other users</b></"
"big><br/>Authentication is required to perform this action. Please enter "
@@ -163,11 +160,17 @@ msgstr ""
"другими пользователями</b></big><br/>Аутентификация требуется для "
"осуществления этого действия. Пожалуйста введите ваш пароль для проверки."
-#: mediamanager/halbackend.cpp:1284
+#: mediamanager/halbackend.cpp:1259 mediamanager/halbackend.cpp:1268
+#: mediamanager/halbackend.cpp:1849 mediamanager/halbackend.cpp:1916
+#: mounthelper/tdeio_media_mounthelper.cpp:58
+msgid "Internal Error"
+msgstr "Внутренняя ошибка"
+
+#: mediamanager/halbackend.cpp:1279
msgid "Invalid filesystem type"
msgstr "Недопустимый тип файловой системы"
-#: mediamanager/halbackend.cpp:1286
+#: mediamanager/halbackend.cpp:1281
#, fuzzy
msgid ""
"Permission denied<p>Please ensure that:<br>1. You have permission to access "
@@ -177,11 +180,11 @@ msgstr ""
"доступа к этому устройству.<br>2. Этот узел устройства не указан в /etc/"
"fstab.</p>"
-#: mediamanager/halbackend.cpp:1290
+#: mediamanager/halbackend.cpp:1285
msgid "Device is already mounted."
msgstr "Устройство уже смонтировано."
-#: mediamanager/halbackend.cpp:1340
+#: mediamanager/halbackend.cpp:1335
msgid ""
"Moreover, programs still using the device have been detected. They are "
"listed below. You have to close them or change their working directory "
@@ -191,7 +194,7 @@ msgstr ""
"Вам нужно закрыть их или перейти в другую папку в них перед там, как "
"попробовать отключить устройство ещё раз."
-#: mediamanager/halbackend.cpp:1381 mediamanager/tdehardwarebackend.cpp:1588
+#: mediamanager/halbackend.cpp:1376 mediamanager/tdehardwarebackend.cpp:1618
msgid ""
"Programs that were still using the device have been forcibly terminated. "
"They are listed below."
@@ -199,10 +202,10 @@ msgstr ""
"Программы которые всё ещё используют устройство будут принудительно "
"прерваны. Они перечислены ниже."
-#: mediamanager/halbackend.cpp:1402 mediamanager/halbackend.cpp:1715
-#: mediamanager/tdehardwarebackend.cpp:1406
-#: mediamanager/tdehardwarebackend.cpp:1424
-#: mediamanager/tdehardwarebackend.cpp:1464
+#: mediamanager/halbackend.cpp:1397 mediamanager/halbackend.cpp:1742
+#: mediamanager/tdehardwarebackend.cpp:1430
+#: mediamanager/tdehardwarebackend.cpp:1452
+#: mediamanager/tdehardwarebackend.cpp:1494
msgid ""
"Unfortunately, the device <b>%1</b> (%2) named <b>'%3'</b> and currently "
"mounted at <b>%4</b> could not be unmounted. "
@@ -210,27 +213,39 @@ msgstr ""
"Устройство <b>%1</b> (%2) с именем <b>'%3'</b> подключенное в <b>%4</b> не "
"может быть отключено. "
-#: mediamanager/halbackend.cpp:1408 mediamanager/tdehardwarebackend.cpp:1470
+#: mediamanager/halbackend.cpp:1403 mediamanager/tdehardwarebackend.cpp:1500
msgid "The following error was returned by umount command:"
msgstr "Произошла ошибка при отключении устройства:"
-#: mediamanager/halbackend.cpp:1478
-msgid "Permission denied"
-msgstr "Отказано в доступе"
-
-#: mediamanager/halbackend.cpp:1562 mediamanager/tdehardwarebackend.cpp:1232
-msgid "Cannot mount encrypted drives!"
+#: mediamanager/halbackend.cpp:1567 mediamanager/tdehardwarebackend.cpp:1322
+#, fuzzy
+#| msgid "Cannot mount encrypted drives!"
+msgid "Cannot mount encrypted locked drives!"
msgstr "Не могу монтировать зашифрованные диски!"
-#: mediamanager/halbackend.cpp:1721
+#: mediamanager/halbackend.cpp:1682 mediamanager/halbackend.cpp:1703
+#: mediamanager/halbackend.cpp:1716 mediamanager/halbackend.cpp:1830
+#: mediamanager/halbackend.cpp:1840 mediamanager/halbackend.cpp:1899
+#: mediamanager/halbackend.cpp:1907
+#, fuzzy
+msgid "Internal error"
+msgstr "Внутренняя ошибка"
+
+#: mediamanager/halbackend.cpp:1694
+#, fuzzy
+#| msgid "Unknown"
+msgid "Unknown error"
+msgstr "Нет данных"
+
+#: mediamanager/halbackend.cpp:1748
msgid "Unmounting failed due to the following error:"
msgstr "Отключение невозможно по следующей причине:"
-#: mediamanager/halbackend.cpp:1723
+#: mediamanager/halbackend.cpp:1750
msgid "Device is Busy:"
msgstr "Устройство занято:"
-#: mediamanager/halbackend.cpp:1727
+#: mediamanager/halbackend.cpp:1754
msgid ""
"Permission denied<p>Please ensure that:<br>1. You have permission to access "
"this device.<br>2. This device was originally mounted using TDE.</p>"
@@ -239,7 +254,7 @@ msgstr ""
"доступа к этому устройству.<br>2. Это устройство было смонтировано используя "
"TDE.</p>"
-#: mediamanager/halbackend.cpp:1739
+#: mediamanager/halbackend.cpp:1766
msgid ""
"%1<p><b>Would you like to forcibly terminate these processes?</b><br><i>All "
"unsaved data would be lost</i>"
@@ -247,163 +262,157 @@ msgstr ""
"%1<p><b>Вы согласны принудительно прервать эти процессы?</b><br><i>Все "
"несохранённые данные могут быть утеряны</i>"
-#: mediamanager/halbackend.cpp:1811
+#: mediamanager/halbackend.cpp:1852
msgid "Wrong password"
msgstr "Ошибка пароля"
-#: mediamanager/mediamanager.cpp:247 mediamanager/mediamanager.cpp:266
-#: mediamanager/mediamanager.cpp:285 mediamanager/mediamanager.cpp:293
-#: mediamanager/mediamanager.cpp:302 mediamanager/mediamanager.cpp:310
-msgid "Feature only available with HAL"
-msgstr "Для этой функции требуется библиотека HAL"
-
-#: mediamanager/mediamanager.cpp:252
+#: mediamanager/mediamanager.cpp:248 mediamanager/mediamanager.cpp:275
#, fuzzy
msgid "Feature only available with the TDE hardware backend"
msgstr "Для этой функции требуется библиотека HAL"
-#: mediamanager/mediamanager.cpp:256 mediamanager/mediamanager.cpp:271
-#: mediamanager/mediamanager.cpp:275
+#: mediamanager/mediamanager.cpp:255 mediamanager/mediamanager.cpp:282
+#: mediamanager/mediamanager.cpp:312 mediamanager/mediamanager.cpp:343
+msgid "Feature only available with HAL"
+msgstr "Для этой функции требуется библиотека HAL"
+
+#: mediamanager/mediamanager.cpp:262 mediamanager/mediamanager.cpp:289
+#: mediamanager/mediamanager.cpp:320 mediamanager/mediamanager.cpp:350
#, fuzzy
msgid "Feature only available with HAL or TDE hardware backend"
msgstr "Для этой функции требуется библиотека HAL"
-#: mediamanager/tdehardwarebackend.cpp:480
-#: mediamanager/tdehardwarebackend.cpp:517
-#: mediamanager/tdehardwarebackend.cpp:750
+#: mediamanager/tdehardwarebackend.cpp:483
+#: mediamanager/tdehardwarebackend.cpp:520
+#: mediamanager/tdehardwarebackend.cpp:753
#, fuzzy
msgid "%1 Removable Device"
msgstr "Съёмный диск"
-#: mediamanager/tdehardwarebackend.cpp:525
+#: mediamanager/tdehardwarebackend.cpp:528
#, fuzzy
msgid "Blank CD-ROM"
msgstr "CD-ROM"
-#: mediamanager/tdehardwarebackend.cpp:534
+#: mediamanager/tdehardwarebackend.cpp:537
msgid "Blank CD-R"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:543
+#: mediamanager/tdehardwarebackend.cpp:546
msgid "Blank CD-RW"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:552
+#: mediamanager/tdehardwarebackend.cpp:555
msgid "Blank Magneto-Optical CD"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:561
+#: mediamanager/tdehardwarebackend.cpp:564
msgid "Blank Mount Ranier CD-RW"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:570
+#: mediamanager/tdehardwarebackend.cpp:573
msgid "Blank Mount Ranier CD-RW-W"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:579
+#: mediamanager/tdehardwarebackend.cpp:582
msgid "Blank DVD-ROM"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:588
+#: mediamanager/tdehardwarebackend.cpp:591
msgid "Blank DVD-RAM"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:597
+#: mediamanager/tdehardwarebackend.cpp:600
msgid "Blank DVD-R"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:606
+#: mediamanager/tdehardwarebackend.cpp:609
msgid "Blank DVD-RW"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:615
+#: mediamanager/tdehardwarebackend.cpp:618
msgid "Blank Dual Layer DVD-R"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:624
+#: mediamanager/tdehardwarebackend.cpp:627
msgid "Blank Dual Layer DVD-RW"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:633
+#: mediamanager/tdehardwarebackend.cpp:636
msgid "Blank DVD+R"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:642
+#: mediamanager/tdehardwarebackend.cpp:645
msgid "Blank DVD+RW"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:651
+#: mediamanager/tdehardwarebackend.cpp:654
msgid "Blank Dual Layer DVD+R"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:660
+#: mediamanager/tdehardwarebackend.cpp:663
msgid "Blank Dual Layer DVD+RW"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:669
+#: mediamanager/tdehardwarebackend.cpp:672
msgid "Blank BD-ROM"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:678
+#: mediamanager/tdehardwarebackend.cpp:681
msgid "Blank BD-R"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:687
+#: mediamanager/tdehardwarebackend.cpp:690
msgid "Blank BD-RW"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:696
+#: mediamanager/tdehardwarebackend.cpp:699
msgid "Blank HDDVD-ROM"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:705
+#: mediamanager/tdehardwarebackend.cpp:708
msgid "Blank HDDVD-R"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:714
+#: mediamanager/tdehardwarebackend.cpp:717
msgid "Blank HDDVD-RW"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:721
+#: mediamanager/tdehardwarebackend.cpp:724
msgid "Audio CD"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:742
+#: mediamanager/tdehardwarebackend.cpp:745
msgid "%1 Fixed Disk (%2)"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:849
+#: mediamanager/tdehardwarebackend.cpp:852
#, fuzzy
msgid "%1 Zip Disk"
msgstr "Диск Zip"
-#: mediamanager/tdehardwarebackend.cpp:1212
-#: mediamanager/tdehardwarebackend.cpp:1392
-#, fuzzy
-msgid "Internal error"
-msgstr "Внутренняя ошибка"
+#: mediamanager/tdehardwarebackend.cpp:1224
+#: mediamanager/tdehardwarebackend.cpp:1417
+msgid "Internal error. Couldn't find medium."
+msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:1239
-msgid ""
-"<qt>Unable to mount this device.<p>Potential reasons include:<br>Improper "
-"device and/or user privilege level<br>Corrupt data on storage device"
+#: mediamanager/tdehardwarebackend.cpp:1249
+#: mediamanager/tdehardwarebackend.cpp:1323
+msgid "Unable to mount this device."
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:1241
-#: mediamanager/tdehardwarebackend.cpp:1316
-#: mediamanager/tdehardwarebackend.cpp:1408
-#: mediamanager/tdehardwarebackend.cpp:1426
+#: mediamanager/tdehardwarebackend.cpp:1252
+#: mediamanager/tdehardwarebackend.cpp:1326
+#: mediamanager/tdehardwarebackend.cpp:1435
+#: mediamanager/tdehardwarebackend.cpp:1457
msgid "<p>Technical details:<br>"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:1314
-msgid ""
-"<qt>Unable to mount this device.<p>Potential reasons include:<br>Improper "
-"device and/or user privilege level<br>Corrupt data on storage "
-"device<br>Incorrect encryption password"
+#: mediamanager/tdehardwarebackend.cpp:1284
+msgid "Decryption aborted"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:1420
+#: mediamanager/tdehardwarebackend.cpp:1443
#, fuzzy
msgid ""
"<qt>The device <b>%1</b> (%2) named <b>'%3'</b> and currently mounted at <b>"
@@ -414,7 +423,7 @@ msgstr ""
"%1<p><b>Вы согласны принудительно прервать эти процессы?</b><br><i>Все "
"несохранённые данные могут быть утеряны</i>"
-#: mediamanager/tdehardwarebackend.cpp:1547
+#: mediamanager/tdehardwarebackend.cpp:1577
#, fuzzy
msgid ""
"Programs still using the device have been detected. They are listed below. "
@@ -429,7 +438,7 @@ msgstr ""
msgid "%1 cannot be found."
msgstr "Не удаётся найти %1."
-#: mounthelper/tdeio_media_mounthelper.cpp:86
+#: mounthelper/tdeio_media_mounthelper.cpp:87
msgid "%1 is not a mountable media."
msgstr "%1 немонтабельное устройство."
@@ -438,40 +447,50 @@ msgid "%1 is not an encrypted media."
msgstr "%1 незашифрованное устройство."
#: mounthelper/tdeio_media_mounthelper.cpp:107
-msgid "%1 is already decrypted."
+#, fuzzy
+#| msgid "%1 is already decrypted."
+msgid "%1 is already unlocked."
msgstr "%1 уже расшифрован."
-#: mounthelper/tdeio_media_mounthelper.cpp:228
+#: mounthelper/tdeio_media_mounthelper.cpp:139
+msgid "Unknown unmount error."
+msgstr ""
+
+#: mounthelper/tdeio_media_mounthelper.cpp:246
msgid "The device was successfully unmounted, but the tray could not be opened"
msgstr "Устройство успешно отключено, но не может быть извлечено из лотка"
-#: mounthelper/tdeio_media_mounthelper.cpp:230
+#: mounthelper/tdeio_media_mounthelper.cpp:248
msgid "The device was successfully unmounted, but could not be ejected"
msgstr "Устройство успешно отключено, но не может быть извлечено"
-#: mounthelper/tdeio_media_mounthelper.cpp:275
+#: mounthelper/tdeio_media_mounthelper.cpp:281
+msgid "Unknown decrypt error."
+msgstr ""
+
+#: mounthelper/tdeio_media_mounthelper.cpp:295
msgid "Decrypt given URL"
msgstr "Расшифровать данный URL"
-#: mounthelper/tdeio_media_mounthelper.cpp:276
+#: mounthelper/tdeio_media_mounthelper.cpp:296
msgid "Unmount given URL"
msgstr "Отключить по заданной точке"
-#: mounthelper/tdeio_media_mounthelper.cpp:277
+#: mounthelper/tdeio_media_mounthelper.cpp:297
msgid "Mount given URL (default)"
msgstr "Подключить в заданную точку (по умолчанию)"
-#: mounthelper/tdeio_media_mounthelper.cpp:278
+#: mounthelper/tdeio_media_mounthelper.cpp:298
msgid "Eject given URL via tdeeject"
msgstr "Извлечь с помощью tdeeject"
-#: mounthelper/tdeio_media_mounthelper.cpp:279
+#: mounthelper/tdeio_media_mounthelper.cpp:299
msgid "Unmount and Eject given URL (necessary for some USB devices)"
msgstr ""
"Отключить от файловой системы и извлечь (необходимо для некоторых устройств "
"USB)"
-#: mounthelper/tdeio_media_mounthelper.cpp:280
+#: mounthelper/tdeio_media_mounthelper.cpp:300
msgid "media:/ URL to mount/unmount/eject/remove"
msgstr "Ссылка media:/ для операций с устройствами"
@@ -492,43 +511,43 @@ msgstr "Не удалось сохранить изменения"
msgid "&Mounting"
msgstr "&Подключение"
-#: tdefile-plugin/tdefilemediaplugin.cpp:190
+#: tdefile-plugin/tdefilemediaplugin.cpp:184
msgid "Medium Information"
msgstr "Информация о диске"
-#: tdefile-plugin/tdefilemediaplugin.cpp:193
+#: tdefile-plugin/tdefilemediaplugin.cpp:187
msgid "Free"
msgstr "Свободно"
-#: tdefile-plugin/tdefilemediaplugin.cpp:196
+#: tdefile-plugin/tdefilemediaplugin.cpp:190
msgid "Used"
msgstr "Использовано"
-#: tdefile-plugin/tdefilemediaplugin.cpp:199
+#: tdefile-plugin/tdefilemediaplugin.cpp:193
msgid "Total"
msgstr "Всего"
-#: tdefile-plugin/tdefilemediaplugin.cpp:202
+#: tdefile-plugin/tdefilemediaplugin.cpp:196
msgid "Base URL"
msgstr "Адрес"
-#: tdefile-plugin/tdefilemediaplugin.cpp:203
+#: tdefile-plugin/tdefilemediaplugin.cpp:197
msgid "Mount Point"
msgstr "Точка монтирования"
-#: tdefile-plugin/tdefilemediaplugin.cpp:204
+#: tdefile-plugin/tdefilemediaplugin.cpp:198
msgid "Device Node"
msgstr "Узел устройства"
-#: tdefile-plugin/tdefilemediaplugin.cpp:206
+#: tdefile-plugin/tdefilemediaplugin.cpp:200
msgid "Medium Summary"
msgstr "Сведения о диске"
-#: tdefile-plugin/tdefilemediaplugin.cpp:208
+#: tdefile-plugin/tdefilemediaplugin.cpp:202
msgid "Usage"
msgstr "Использование"
-#: tdefile-plugin/tdefilemediaplugin.cpp:210
+#: tdefile-plugin/tdefilemediaplugin.cpp:204
msgid "Bar Graph"
msgstr "Распределение"
@@ -600,23 +619,30 @@ msgid ""
"devices are plugged in."
msgstr ""
-#: mediamanager/decryptdialog.ui:24 mounthelper/decryptdialog.ui:24
+#: mediamanager/unlockdialog.ui:24 mounthelper/unlockdialog.ui:24
#, no-c-format
msgid "Decrypting Storage Device"
msgstr ""
-#: mediamanager/decryptdialog.ui:109 mounthelper/decryptdialog.ui:109
+#: mediamanager/unlockdialog.ui:109
#, no-c-format
msgid ""
-"<p><b>%1</b> is an encrypted storage device.</p>\n"
-"<p>Please enter the password to decrypt the storage device.</p>"
+"<p><b>%1</b> is an encrypted locked storage device.</p>\n"
+"<p>Please enter the password to unlock the storage device.</p>"
msgstr ""
-#: mediamanager/decryptdialog.ui:131 mounthelper/decryptdialog.ui:131
+#: mediamanager/unlockdialog.ui:131 mounthelper/unlockdialog.ui:131
#, no-c-format
msgid "&Password:"
msgstr ""
+#: mounthelper/unlockdialog.ui:109
+#, no-c-format
+msgid ""
+"<p><b>%1</b> is an encrypted storage device.</p>\n"
+"<p>Please enter the password to decrypt the storage device.</p>"
+msgstr ""
+
#: propsdlgplugin/propertiespagegui.ui:16
#, no-c-format
msgid "PropertiesPageGUI"
@@ -873,3 +899,9 @@ msgstr "Смешанные"
#, no-c-format
msgid "Filesystem: iso9660"
msgstr "Файловая система: iso9660"
+
+#~ msgid "Decrypt"
+#~ msgstr "Расшифровать"
+
+#~ msgid "Permission denied"
+#~ msgstr "Отказано в доступе"
diff --git a/tde-i18n-rw/messages/tdebase/tdeio_media.po b/tde-i18n-rw/messages/tdebase/tdeio_media.po
index 44e73fb2a6a..d4689c57b02 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: 2019-01-13 18:47+0100\n"
+"POT-Creation-Date: 2019-07-11 02:33+0200\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"
@@ -59,7 +59,6 @@ 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
-#: mounthelper/tdeio_media_mounthelper.cpp:256
msgid "The TDE mediamanager is not running."
msgstr "TDE mugenga-igihuza ntiri gukora"
@@ -67,7 +66,7 @@ msgstr "TDE mugenga-igihuza ntiri gukora"
msgid "This media name already exists."
msgstr "Izina ry'ibihuza risanzwemo."
-#: mediaimpl.cpp:230 mediaimpl.cpp:293
+#: mediaimpl.cpp:230 mediaimpl.cpp:297
msgid "No such medium."
msgstr ""
@@ -75,320 +74,328 @@ msgstr ""
msgid "The drive is encrypted."
msgstr ""
-#: mediaimpl.cpp:272 mediamanager/halbackend.cpp:1264
-#: mediamanager/halbackend.cpp:1273 mediamanager/halbackend.cpp:1663
-#: mediamanager/halbackend.cpp:1680 mediamanager/halbackend.cpp:1691
-#: mediamanager/halbackend.cpp:1793 mediamanager/halbackend.cpp:1801
-#: mediamanager/halbackend.cpp:1808 mediamanager/halbackend.cpp:1848
-#: mediamanager/halbackend.cpp:1854 mediamanager/halbackend.cpp:1861
-#: mounthelper/tdeio_media_mounthelper.cpp:58
-msgid "Internal Error"
+#: mediaimpl.cpp:274 mediamanager/tdehardwarebackend.cpp:201
+#: mediamanager/tdehardwarebackend.cpp:252
+#: mounthelper/tdeio_media_mounthelper.cpp:202
+msgid "Unknown mount error."
msgstr ""
#: mediamanager/dialog.cpp:26 mounthelper/dialog.cpp:26
-msgid "Decrypt"
+msgid "Unlock"
msgstr ""
-#: mediamanager/fstabbackend.cpp:104 mediamanager/fstabbackend.cpp:114
-#: mediamanager/halbackend.cpp:1595 mediamanager/halbackend.cpp:1617
-#: mediamanager/halbackend.cpp:1776 mediamanager/halbackend.cpp:1831
-#: mediamanager/tdehardwarebackend.cpp:1349
-#: mediamanager/tdehardwarebackend.cpp:1360
+#: mediamanager/fstabbackend.cpp:105 mediamanager/fstabbackend.cpp:120
+#: mediamanager/halbackend.cpp:1598 mediamanager/halbackend.cpp:1625
+#: mediamanager/halbackend.cpp:1808 mediamanager/halbackend.cpp:1877
+#: mediamanager/mediamanager.cpp:363 mediamanager/mediamanager.cpp:375
+#: mediamanager/mediamanager.cpp:387 mediamanager/mediamanager.cpp:399
+#: mediamanager/tdehardwarebackend.cpp:1363
+#: mediamanager/tdehardwarebackend.cpp:1378
#, c-format
msgid "No such medium: %1"
msgstr ""
-#: mediamanager/fstabbackend.cpp:398
+#: mediamanager/fstabbackend.cpp:408
msgid "CD Recorder"
msgstr "Mubika CD"
-#: mediamanager/fstabbackend.cpp:404
+#: mediamanager/fstabbackend.cpp:414
msgid "DVD"
msgstr "DVD"
-#: mediamanager/fstabbackend.cpp:415
+#: mediamanager/fstabbackend.cpp:425
msgid "CD-ROM"
msgstr "CD-ROM"
-#: mediamanager/fstabbackend.cpp:428
+#: mediamanager/fstabbackend.cpp:438
msgid "Floppy"
msgstr "Disikete"
-#: mediamanager/fstabbackend.cpp:436
+#: mediamanager/fstabbackend.cpp:446
msgid "Zip Disk"
msgstr "Disiki Zip"
-#: mediamanager/fstabbackend.cpp:447
+#: mediamanager/fstabbackend.cpp:457
msgid "Removable Device"
msgstr "Apareye Zikurwamo"
-#: mediamanager/fstabbackend.cpp:452 mediamanager/fstabbackend.cpp:458
+#: mediamanager/fstabbackend.cpp:462 mediamanager/fstabbackend.cpp:468
msgid "Remote Share"
msgstr "Isangira rya Kure"
-#: mediamanager/fstabbackend.cpp:463
+#: mediamanager/fstabbackend.cpp:473
msgid "Hard Disk"
msgstr "Ububiko disiki"
-#: mediamanager/halbackend.cpp:749 mediamanager/tdehardwarebackend.cpp:805
+#: mediamanager/halbackend.cpp:744 mediamanager/tdehardwarebackend.cpp:808
#, fuzzy
msgid "Unknown Drive"
msgstr "Kitazwi"
-#: mediamanager/halbackend.cpp:761 mediamanager/tdehardwarebackend.cpp:835
+#: mediamanager/halbackend.cpp:756 mediamanager/tdehardwarebackend.cpp:838
#, fuzzy
msgid "Floppy Drive"
msgstr "Disikete"
-#: mediamanager/halbackend.cpp:769
+#: mediamanager/halbackend.cpp:764
#, fuzzy
msgid "Zip Drive"
msgstr "Disiki Zip"
-#: mediamanager/halbackend.cpp:839 mediamanager/tdehardwarebackend.cpp:892
+#: mediamanager/halbackend.cpp:834 mediamanager/tdehardwarebackend.cpp:895
msgid "Camera"
msgstr "Kamera"
-#: mediamanager/halbackend.cpp:1221 mediamanager/halbackend.cpp:1247
+#: mediamanager/halbackend.cpp:1216 mediamanager/halbackend.cpp:1242
msgid "Authenticate"
msgstr ""
-#: mediamanager/halbackend.cpp:1222
+#: mediamanager/halbackend.cpp:1217
msgid ""
"<big><b>System policy prevents mounting internal media</b></big><br/"
">Authentication is required to perform this action. Please enter your "
"password to verify."
msgstr ""
-#: mediamanager/halbackend.cpp:1248
+#: mediamanager/halbackend.cpp:1243
msgid ""
"<big><b>System policy prevents unmounting media mounted by other users</b></"
"big><br/>Authentication is required to perform this action. Please enter "
"your password to verify."
msgstr ""
-#: mediamanager/halbackend.cpp:1284
+#: mediamanager/halbackend.cpp:1259 mediamanager/halbackend.cpp:1268
+#: mediamanager/halbackend.cpp:1849 mediamanager/halbackend.cpp:1916
+#: mounthelper/tdeio_media_mounthelper.cpp:58
+msgid "Internal Error"
+msgstr ""
+
+#: mediamanager/halbackend.cpp:1279
msgid "Invalid filesystem type"
msgstr ""
-#: mediamanager/halbackend.cpp:1286
+#: mediamanager/halbackend.cpp:1281
msgid ""
"Permission denied<p>Please ensure that:<br>1. You have permission to access "
"this device.<br>2. This device node is not listed in /etc/fstab.</p>"
msgstr ""
-#: mediamanager/halbackend.cpp:1290
+#: mediamanager/halbackend.cpp:1285
msgid "Device is already mounted."
msgstr ""
-#: mediamanager/halbackend.cpp:1340
+#: mediamanager/halbackend.cpp:1335
msgid ""
"Moreover, programs still using the device have been detected. They are "
"listed below. You have to close them or change their working directory "
"before attempting to unmount the device again."
msgstr ""
-#: mediamanager/halbackend.cpp:1381 mediamanager/tdehardwarebackend.cpp:1588
+#: mediamanager/halbackend.cpp:1376 mediamanager/tdehardwarebackend.cpp:1618
msgid ""
"Programs that were still using the device have been forcibly terminated. "
"They are listed below."
msgstr ""
-#: mediamanager/halbackend.cpp:1402 mediamanager/halbackend.cpp:1715
-#: mediamanager/tdehardwarebackend.cpp:1406
-#: mediamanager/tdehardwarebackend.cpp:1424
-#: mediamanager/tdehardwarebackend.cpp:1464
+#: mediamanager/halbackend.cpp:1397 mediamanager/halbackend.cpp:1742
+#: mediamanager/tdehardwarebackend.cpp:1430
+#: mediamanager/tdehardwarebackend.cpp:1452
+#: mediamanager/tdehardwarebackend.cpp:1494
msgid ""
"Unfortunately, the device <b>%1</b> (%2) named <b>'%3'</b> and currently "
"mounted at <b>%4</b> could not be unmounted. "
msgstr ""
-#: mediamanager/halbackend.cpp:1408 mediamanager/tdehardwarebackend.cpp:1470
+#: mediamanager/halbackend.cpp:1403 mediamanager/tdehardwarebackend.cpp:1500
msgid "The following error was returned by umount command:"
msgstr ""
-#: mediamanager/halbackend.cpp:1478
-msgid "Permission denied"
+#: mediamanager/halbackend.cpp:1567 mediamanager/tdehardwarebackend.cpp:1322
+msgid "Cannot mount encrypted locked drives!"
msgstr ""
-#: mediamanager/halbackend.cpp:1562 mediamanager/tdehardwarebackend.cpp:1232
-msgid "Cannot mount encrypted drives!"
+#: mediamanager/halbackend.cpp:1682 mediamanager/halbackend.cpp:1703
+#: mediamanager/halbackend.cpp:1716 mediamanager/halbackend.cpp:1830
+#: mediamanager/halbackend.cpp:1840 mediamanager/halbackend.cpp:1899
+#: mediamanager/halbackend.cpp:1907
+msgid "Internal error"
msgstr ""
-#: mediamanager/halbackend.cpp:1721
+#: mediamanager/halbackend.cpp:1694
+#, fuzzy
+#| msgid "Unknown"
+msgid "Unknown error"
+msgstr "Kitazwi"
+
+#: mediamanager/halbackend.cpp:1748
msgid "Unmounting failed due to the following error:"
msgstr ""
-#: mediamanager/halbackend.cpp:1723
+#: mediamanager/halbackend.cpp:1750
msgid "Device is Busy:"
msgstr ""
-#: mediamanager/halbackend.cpp:1727
+#: mediamanager/halbackend.cpp:1754
msgid ""
"Permission denied<p>Please ensure that:<br>1. You have permission to access "
"this device.<br>2. This device was originally mounted using TDE.</p>"
msgstr ""
-#: mediamanager/halbackend.cpp:1739
+#: mediamanager/halbackend.cpp:1766
msgid ""
"%1<p><b>Would you like to forcibly terminate these processes?</b><br><i>All "
"unsaved data would be lost</i>"
msgstr ""
-#: mediamanager/halbackend.cpp:1811
+#: mediamanager/halbackend.cpp:1852
msgid "Wrong password"
msgstr ""
-#: mediamanager/mediamanager.cpp:247 mediamanager/mediamanager.cpp:266
-#: mediamanager/mediamanager.cpp:285 mediamanager/mediamanager.cpp:293
-#: mediamanager/mediamanager.cpp:302 mediamanager/mediamanager.cpp:310
-msgid "Feature only available with HAL"
+#: mediamanager/mediamanager.cpp:248 mediamanager/mediamanager.cpp:275
+msgid "Feature only available with the TDE hardware backend"
msgstr ""
-#: mediamanager/mediamanager.cpp:252
-msgid "Feature only available with the TDE hardware backend"
+#: mediamanager/mediamanager.cpp:255 mediamanager/mediamanager.cpp:282
+#: mediamanager/mediamanager.cpp:312 mediamanager/mediamanager.cpp:343
+msgid "Feature only available with HAL"
msgstr ""
-#: mediamanager/mediamanager.cpp:256 mediamanager/mediamanager.cpp:271
-#: mediamanager/mediamanager.cpp:275
+#: mediamanager/mediamanager.cpp:262 mediamanager/mediamanager.cpp:289
+#: mediamanager/mediamanager.cpp:320 mediamanager/mediamanager.cpp:350
msgid "Feature only available with HAL or TDE hardware backend"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:480
-#: mediamanager/tdehardwarebackend.cpp:517
-#: mediamanager/tdehardwarebackend.cpp:750
+#: mediamanager/tdehardwarebackend.cpp:483
+#: mediamanager/tdehardwarebackend.cpp:520
+#: mediamanager/tdehardwarebackend.cpp:753
#, fuzzy
msgid "%1 Removable Device"
msgstr "Apareye Zikurwamo"
-#: mediamanager/tdehardwarebackend.cpp:525
+#: mediamanager/tdehardwarebackend.cpp:528
#, fuzzy
msgid "Blank CD-ROM"
msgstr "CD-ROM"
-#: mediamanager/tdehardwarebackend.cpp:534
+#: mediamanager/tdehardwarebackend.cpp:537
msgid "Blank CD-R"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:543
+#: mediamanager/tdehardwarebackend.cpp:546
msgid "Blank CD-RW"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:552
+#: mediamanager/tdehardwarebackend.cpp:555
msgid "Blank Magneto-Optical CD"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:561
+#: mediamanager/tdehardwarebackend.cpp:564
msgid "Blank Mount Ranier CD-RW"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:570
+#: mediamanager/tdehardwarebackend.cpp:573
msgid "Blank Mount Ranier CD-RW-W"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:579
+#: mediamanager/tdehardwarebackend.cpp:582
msgid "Blank DVD-ROM"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:588
+#: mediamanager/tdehardwarebackend.cpp:591
msgid "Blank DVD-RAM"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:597
+#: mediamanager/tdehardwarebackend.cpp:600
msgid "Blank DVD-R"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:606
+#: mediamanager/tdehardwarebackend.cpp:609
msgid "Blank DVD-RW"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:615
+#: mediamanager/tdehardwarebackend.cpp:618
msgid "Blank Dual Layer DVD-R"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:624
+#: mediamanager/tdehardwarebackend.cpp:627
msgid "Blank Dual Layer DVD-RW"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:633
+#: mediamanager/tdehardwarebackend.cpp:636
msgid "Blank DVD+R"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:642
+#: mediamanager/tdehardwarebackend.cpp:645
msgid "Blank DVD+RW"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:651
+#: mediamanager/tdehardwarebackend.cpp:654
msgid "Blank Dual Layer DVD+R"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:660
+#: mediamanager/tdehardwarebackend.cpp:663
msgid "Blank Dual Layer DVD+RW"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:669
+#: mediamanager/tdehardwarebackend.cpp:672
msgid "Blank BD-ROM"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:678
+#: mediamanager/tdehardwarebackend.cpp:681
msgid "Blank BD-R"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:687
+#: mediamanager/tdehardwarebackend.cpp:690
msgid "Blank BD-RW"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:696
+#: mediamanager/tdehardwarebackend.cpp:699
msgid "Blank HDDVD-ROM"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:705
+#: mediamanager/tdehardwarebackend.cpp:708
msgid "Blank HDDVD-R"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:714
+#: mediamanager/tdehardwarebackend.cpp:717
msgid "Blank HDDVD-RW"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:721
+#: mediamanager/tdehardwarebackend.cpp:724
msgid "Audio CD"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:742
+#: mediamanager/tdehardwarebackend.cpp:745
msgid "%1 Fixed Disk (%2)"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:849
+#: mediamanager/tdehardwarebackend.cpp:852
#, fuzzy
msgid "%1 Zip Disk"
msgstr "Disiki Zip"
-#: mediamanager/tdehardwarebackend.cpp:1212
-#: mediamanager/tdehardwarebackend.cpp:1392
-msgid "Internal error"
+#: mediamanager/tdehardwarebackend.cpp:1224
+#: mediamanager/tdehardwarebackend.cpp:1417
+msgid "Internal error. Couldn't find medium."
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:1239
-msgid ""
-"<qt>Unable to mount this device.<p>Potential reasons include:<br>Improper "
-"device and/or user privilege level<br>Corrupt data on storage device"
+#: mediamanager/tdehardwarebackend.cpp:1249
+#: mediamanager/tdehardwarebackend.cpp:1323
+msgid "Unable to mount this device."
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:1241
-#: mediamanager/tdehardwarebackend.cpp:1316
-#: mediamanager/tdehardwarebackend.cpp:1408
-#: mediamanager/tdehardwarebackend.cpp:1426
+#: mediamanager/tdehardwarebackend.cpp:1252
+#: mediamanager/tdehardwarebackend.cpp:1326
+#: mediamanager/tdehardwarebackend.cpp:1435
+#: mediamanager/tdehardwarebackend.cpp:1457
msgid "<p>Technical details:<br>"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:1314
-msgid ""
-"<qt>Unable to mount this device.<p>Potential reasons include:<br>Improper "
-"device and/or user privilege level<br>Corrupt data on storage "
-"device<br>Incorrect encryption password"
+#: mediamanager/tdehardwarebackend.cpp:1284
+msgid "Decryption aborted"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:1420
+#: mediamanager/tdehardwarebackend.cpp:1443
msgid ""
"<qt>The device <b>%1</b> (%2) named <b>'%3'</b> and currently mounted at <b>"
"%4</b> can not be unmounted at this time.<p>%5<p><b>Would you like to "
@@ -396,7 +403,7 @@ msgid ""
"lost</i>"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:1547
+#: mediamanager/tdehardwarebackend.cpp:1577
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 "
@@ -407,7 +414,7 @@ msgstr ""
msgid "%1 cannot be found."
msgstr "%1 ntishoboye kuboneka. "
-#: mounthelper/tdeio_media_mounthelper.cpp:86
+#: mounthelper/tdeio_media_mounthelper.cpp:87
msgid "%1 is not a mountable media."
msgstr "%1 ntabwo igihuza gishyirwamo. "
@@ -417,40 +424,48 @@ msgid "%1 is not an encrypted media."
msgstr "%1 ntabwo igihuza gishyirwamo. "
#: mounthelper/tdeio_media_mounthelper.cpp:107
-msgid "%1 is already decrypted."
+msgid "%1 is already unlocked."
msgstr ""
-#: mounthelper/tdeio_media_mounthelper.cpp:228
+#: mounthelper/tdeio_media_mounthelper.cpp:139
+msgid "Unknown unmount error."
+msgstr ""
+
+#: mounthelper/tdeio_media_mounthelper.cpp:246
msgid "The device was successfully unmounted, but the tray could not be opened"
msgstr ""
-#: mounthelper/tdeio_media_mounthelper.cpp:230
+#: mounthelper/tdeio_media_mounthelper.cpp:248
msgid "The device was successfully unmounted, but could not be ejected"
msgstr ""
-#: mounthelper/tdeio_media_mounthelper.cpp:275
+#: mounthelper/tdeio_media_mounthelper.cpp:281
+msgid "Unknown decrypt error."
+msgstr ""
+
+#: mounthelper/tdeio_media_mounthelper.cpp:295
#, fuzzy
msgid "Decrypt given URL"
msgstr "Gukuramo URL yatanzwe"
-#: mounthelper/tdeio_media_mounthelper.cpp:276
+#: mounthelper/tdeio_media_mounthelper.cpp:296
msgid "Unmount given URL"
msgstr "Gukuramo URL yatanzwe"
-#: mounthelper/tdeio_media_mounthelper.cpp:277
+#: mounthelper/tdeio_media_mounthelper.cpp:297
msgid "Mount given URL (default)"
msgstr "Gushyiramo URL yatanzwe (mburabuzi)"
-#: mounthelper/tdeio_media_mounthelper.cpp:278
+#: mounthelper/tdeio_media_mounthelper.cpp:298
msgid "Eject given URL via tdeeject"
msgstr "Gusohora URL yatanzwe biturutse kuri tdeeject"
-#: mounthelper/tdeio_media_mounthelper.cpp:279
+#: mounthelper/tdeio_media_mounthelper.cpp:299
msgid "Unmount and Eject given URL (necessary for some USB devices)"
msgstr ""
"Gukuramo no Gusohora URL yatanzwe (ngombwa kuri apareye USB zimwe na zimwe)"
-#: mounthelper/tdeio_media_mounthelper.cpp:280
+#: mounthelper/tdeio_media_mounthelper.cpp:300
msgid "media:/ URL to mount/unmount/eject/remove"
msgstr "ibihuza:/ URL yo gushyiramo/gukuramo/gusohora/kuvanamo"
@@ -472,43 +487,43 @@ msgstr ""
msgid "&Mounting"
msgstr "Akadomo k'Iteranya"
-#: tdefile-plugin/tdefilemediaplugin.cpp:190
+#: tdefile-plugin/tdefilemediaplugin.cpp:184
msgid "Medium Information"
msgstr "Amakuru y'Igihuza"
-#: tdefile-plugin/tdefilemediaplugin.cpp:193
+#: tdefile-plugin/tdefilemediaplugin.cpp:187
msgid "Free"
msgstr "Cyigenga"
-#: tdefile-plugin/tdefilemediaplugin.cpp:196
+#: tdefile-plugin/tdefilemediaplugin.cpp:190
msgid "Used"
msgstr "Byakoreshejwe"
-#: tdefile-plugin/tdefilemediaplugin.cpp:199
+#: tdefile-plugin/tdefilemediaplugin.cpp:193
msgid "Total"
msgstr "Igiteranyo"
-#: tdefile-plugin/tdefilemediaplugin.cpp:202
+#: tdefile-plugin/tdefilemediaplugin.cpp:196
msgid "Base URL"
msgstr "URL y'ibanze"
-#: tdefile-plugin/tdefilemediaplugin.cpp:203
+#: tdefile-plugin/tdefilemediaplugin.cpp:197
msgid "Mount Point"
msgstr "Akadomo k'Iteranya"
-#: tdefile-plugin/tdefilemediaplugin.cpp:204
+#: tdefile-plugin/tdefilemediaplugin.cpp:198
msgid "Device Node"
msgstr "Ipfundo ry'Apareye"
-#: tdefile-plugin/tdefilemediaplugin.cpp:206
+#: tdefile-plugin/tdefilemediaplugin.cpp:200
msgid "Medium Summary"
msgstr "Incamake y'Igihuza"
-#: tdefile-plugin/tdefilemediaplugin.cpp:208
+#: tdefile-plugin/tdefilemediaplugin.cpp:202
msgid "Usage"
msgstr "Ikoresha"
-#: tdefile-plugin/tdefilemediaplugin.cpp:210
+#: tdefile-plugin/tdefilemediaplugin.cpp:204
msgid "Bar Graph"
msgstr "Igishushanyo Mirongo"
@@ -580,23 +595,30 @@ msgid ""
"devices are plugged in."
msgstr ""
-#: mediamanager/decryptdialog.ui:24 mounthelper/decryptdialog.ui:24
+#: mediamanager/unlockdialog.ui:24 mounthelper/unlockdialog.ui:24
#, no-c-format
msgid "Decrypting Storage Device"
msgstr ""
-#: mediamanager/decryptdialog.ui:109 mounthelper/decryptdialog.ui:109
+#: mediamanager/unlockdialog.ui:109
#, no-c-format
msgid ""
-"<p><b>%1</b> is an encrypted storage device.</p>\n"
-"<p>Please enter the password to decrypt the storage device.</p>"
+"<p><b>%1</b> is an encrypted locked storage device.</p>\n"
+"<p>Please enter the password to unlock the storage device.</p>"
msgstr ""
-#: mediamanager/decryptdialog.ui:131 mounthelper/decryptdialog.ui:131
+#: mediamanager/unlockdialog.ui:131 mounthelper/unlockdialog.ui:131
#, no-c-format
msgid "&Password:"
msgstr ""
+#: mounthelper/unlockdialog.ui:109
+#, no-c-format
+msgid ""
+"<p><b>%1</b> is an encrypted storage device.</p>\n"
+"<p>Please enter the password to decrypt the storage device.</p>"
+msgstr ""
+
#: propsdlgplugin/propertiespagegui.ui:16
#, no-c-format
msgid "PropertiesPageGUI"
diff --git a/tde-i18n-se/messages/tdebase/tdeio_media.po b/tde-i18n-se/messages/tdebase/tdeio_media.po
index 0f92ff56074..a6d6915e442 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: 2019-01-13 18:47+0100\n"
+"POT-Creation-Date: 2019-07-11 02:33+0200\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"
@@ -46,7 +46,6 @@ 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
-#: mounthelper/tdeio_media_mounthelper.cpp:256
msgid "The TDE mediamanager is not running."
msgstr "TDE-mediagieđahalli ii leat jođus."
@@ -54,7 +53,7 @@ msgstr "TDE-mediagieđahalli ii leat jođus."
msgid "This media name already exists."
msgstr "Dát medianamma gávdno juo."
-#: mediaimpl.cpp:230 mediaimpl.cpp:293
+#: mediaimpl.cpp:230 mediaimpl.cpp:297
msgid "No such medium."
msgstr ""
@@ -62,323 +61,331 @@ msgstr ""
msgid "The drive is encrypted."
msgstr ""
-#: mediaimpl.cpp:272 mediamanager/halbackend.cpp:1264
-#: mediamanager/halbackend.cpp:1273 mediamanager/halbackend.cpp:1663
-#: mediamanager/halbackend.cpp:1680 mediamanager/halbackend.cpp:1691
-#: mediamanager/halbackend.cpp:1793 mediamanager/halbackend.cpp:1801
-#: mediamanager/halbackend.cpp:1808 mediamanager/halbackend.cpp:1848
-#: mediamanager/halbackend.cpp:1854 mediamanager/halbackend.cpp:1861
-#: mounthelper/tdeio_media_mounthelper.cpp:58
-msgid "Internal Error"
+#: mediaimpl.cpp:274 mediamanager/tdehardwarebackend.cpp:201
+#: mediamanager/tdehardwarebackend.cpp:252
+#: mounthelper/tdeio_media_mounthelper.cpp:202
+msgid "Unknown mount error."
msgstr ""
#: mediamanager/dialog.cpp:26 mounthelper/dialog.cpp:26
-msgid "Decrypt"
+msgid "Unlock"
msgstr ""
-#: mediamanager/fstabbackend.cpp:104 mediamanager/fstabbackend.cpp:114
-#: mediamanager/halbackend.cpp:1595 mediamanager/halbackend.cpp:1617
-#: mediamanager/halbackend.cpp:1776 mediamanager/halbackend.cpp:1831
-#: mediamanager/tdehardwarebackend.cpp:1349
-#: mediamanager/tdehardwarebackend.cpp:1360
+#: mediamanager/fstabbackend.cpp:105 mediamanager/fstabbackend.cpp:120
+#: mediamanager/halbackend.cpp:1598 mediamanager/halbackend.cpp:1625
+#: mediamanager/halbackend.cpp:1808 mediamanager/halbackend.cpp:1877
+#: mediamanager/mediamanager.cpp:363 mediamanager/mediamanager.cpp:375
+#: mediamanager/mediamanager.cpp:387 mediamanager/mediamanager.cpp:399
+#: mediamanager/tdehardwarebackend.cpp:1363
+#: mediamanager/tdehardwarebackend.cpp:1378
#, c-format
msgid "No such medium: %1"
msgstr ""
-#: mediamanager/fstabbackend.cpp:398
+#: mediamanager/fstabbackend.cpp:408
msgid "CD Recorder"
msgstr "CD Recorder"
-#: mediamanager/fstabbackend.cpp:404
+#: mediamanager/fstabbackend.cpp:414
msgid "DVD"
msgstr "DVD"
-#: mediamanager/fstabbackend.cpp:415
+#: mediamanager/fstabbackend.cpp:425
msgid "CD-ROM"
msgstr "CD-ROM"
-#: mediamanager/fstabbackend.cpp:428
+#: mediamanager/fstabbackend.cpp:438
msgid "Floppy"
msgstr "Dipmaskearru"
-#: mediamanager/fstabbackend.cpp:436
+#: mediamanager/fstabbackend.cpp:446
msgid "Zip Disk"
msgstr "Zip-skearru"
-#: mediamanager/fstabbackend.cpp:447
+#: mediamanager/fstabbackend.cpp:457
msgid "Removable Device"
msgstr "Sirdehahtti ovttadat"
-#: mediamanager/fstabbackend.cpp:452 mediamanager/fstabbackend.cpp:458
+#: mediamanager/fstabbackend.cpp:462 mediamanager/fstabbackend.cpp:468
msgid "Remote Share"
msgstr "Juohkujuvvon fierbmeresursa"
-#: mediamanager/fstabbackend.cpp:463
+#: mediamanager/fstabbackend.cpp:473
msgid "Hard Disk"
msgstr "Garraskearru"
# | msgid "Unknown"
-#: mediamanager/halbackend.cpp:749 mediamanager/tdehardwarebackend.cpp:805
+#: mediamanager/halbackend.cpp:744 mediamanager/tdehardwarebackend.cpp:808
#, fuzzy
msgid "Unknown Drive"
msgstr "Amas"
# | msgid "Floppy"
-#: mediamanager/halbackend.cpp:761 mediamanager/tdehardwarebackend.cpp:835
+#: mediamanager/halbackend.cpp:756 mediamanager/tdehardwarebackend.cpp:838
#, fuzzy
msgid "Floppy Drive"
msgstr "Dipmaskearru"
# | msgid "Zip Disk"
-#: mediamanager/halbackend.cpp:769
+#: mediamanager/halbackend.cpp:764
#, fuzzy
msgid "Zip Drive"
msgstr "Zip-skearru"
-#: mediamanager/halbackend.cpp:839 mediamanager/tdehardwarebackend.cpp:892
+#: mediamanager/halbackend.cpp:834 mediamanager/tdehardwarebackend.cpp:895
msgid "Camera"
msgstr "Govvenapperáhta"
-#: mediamanager/halbackend.cpp:1221 mediamanager/halbackend.cpp:1247
+#: mediamanager/halbackend.cpp:1216 mediamanager/halbackend.cpp:1242
msgid "Authenticate"
msgstr ""
-#: mediamanager/halbackend.cpp:1222
+#: mediamanager/halbackend.cpp:1217
msgid ""
"<big><b>System policy prevents mounting internal media</b></big><br/"
">Authentication is required to perform this action. Please enter your "
"password to verify."
msgstr ""
-#: mediamanager/halbackend.cpp:1248
+#: mediamanager/halbackend.cpp:1243
msgid ""
"<big><b>System policy prevents unmounting media mounted by other users</b></"
"big><br/>Authentication is required to perform this action. Please enter "
"your password to verify."
msgstr ""
-#: mediamanager/halbackend.cpp:1284
+#: mediamanager/halbackend.cpp:1259 mediamanager/halbackend.cpp:1268
+#: mediamanager/halbackend.cpp:1849 mediamanager/halbackend.cpp:1916
+#: mounthelper/tdeio_media_mounthelper.cpp:58
+msgid "Internal Error"
+msgstr ""
+
+#: mediamanager/halbackend.cpp:1279
msgid "Invalid filesystem type"
msgstr ""
-#: mediamanager/halbackend.cpp:1286
+#: mediamanager/halbackend.cpp:1281
msgid ""
"Permission denied<p>Please ensure that:<br>1. You have permission to access "
"this device.<br>2. This device node is not listed in /etc/fstab.</p>"
msgstr ""
-#: mediamanager/halbackend.cpp:1290
+#: mediamanager/halbackend.cpp:1285
msgid "Device is already mounted."
msgstr ""
-#: mediamanager/halbackend.cpp:1340
+#: mediamanager/halbackend.cpp:1335
msgid ""
"Moreover, programs still using the device have been detected. They are "
"listed below. You have to close them or change their working directory "
"before attempting to unmount the device again."
msgstr ""
-#: mediamanager/halbackend.cpp:1381 mediamanager/tdehardwarebackend.cpp:1588
+#: mediamanager/halbackend.cpp:1376 mediamanager/tdehardwarebackend.cpp:1618
msgid ""
"Programs that were still using the device have been forcibly terminated. "
"They are listed below."
msgstr ""
-#: mediamanager/halbackend.cpp:1402 mediamanager/halbackend.cpp:1715
-#: mediamanager/tdehardwarebackend.cpp:1406
-#: mediamanager/tdehardwarebackend.cpp:1424
-#: mediamanager/tdehardwarebackend.cpp:1464
+#: mediamanager/halbackend.cpp:1397 mediamanager/halbackend.cpp:1742
+#: mediamanager/tdehardwarebackend.cpp:1430
+#: mediamanager/tdehardwarebackend.cpp:1452
+#: mediamanager/tdehardwarebackend.cpp:1494
msgid ""
"Unfortunately, the device <b>%1</b> (%2) named <b>'%3'</b> and currently "
"mounted at <b>%4</b> could not be unmounted. "
msgstr ""
-#: mediamanager/halbackend.cpp:1408 mediamanager/tdehardwarebackend.cpp:1470
+#: mediamanager/halbackend.cpp:1403 mediamanager/tdehardwarebackend.cpp:1500
msgid "The following error was returned by umount command:"
msgstr ""
-#: mediamanager/halbackend.cpp:1478
-msgid "Permission denied"
+#: mediamanager/halbackend.cpp:1567 mediamanager/tdehardwarebackend.cpp:1322
+msgid "Cannot mount encrypted locked drives!"
msgstr ""
-#: mediamanager/halbackend.cpp:1562 mediamanager/tdehardwarebackend.cpp:1232
-msgid "Cannot mount encrypted drives!"
+#: mediamanager/halbackend.cpp:1682 mediamanager/halbackend.cpp:1703
+#: mediamanager/halbackend.cpp:1716 mediamanager/halbackend.cpp:1830
+#: mediamanager/halbackend.cpp:1840 mediamanager/halbackend.cpp:1899
+#: mediamanager/halbackend.cpp:1907
+msgid "Internal error"
msgstr ""
-#: mediamanager/halbackend.cpp:1721
+#: mediamanager/halbackend.cpp:1694
+#, fuzzy
+#| msgid "Unknown"
+msgid "Unknown error"
+msgstr "Amas"
+
+#: mediamanager/halbackend.cpp:1748
msgid "Unmounting failed due to the following error:"
msgstr ""
-#: mediamanager/halbackend.cpp:1723
+#: mediamanager/halbackend.cpp:1750
msgid "Device is Busy:"
msgstr ""
-#: mediamanager/halbackend.cpp:1727
+#: mediamanager/halbackend.cpp:1754
msgid ""
"Permission denied<p>Please ensure that:<br>1. You have permission to access "
"this device.<br>2. This device was originally mounted using TDE.</p>"
msgstr ""
-#: mediamanager/halbackend.cpp:1739
+#: mediamanager/halbackend.cpp:1766
msgid ""
"%1<p><b>Would you like to forcibly terminate these processes?</b><br><i>All "
"unsaved data would be lost</i>"
msgstr ""
-#: mediamanager/halbackend.cpp:1811
+#: mediamanager/halbackend.cpp:1852
msgid "Wrong password"
msgstr ""
-#: mediamanager/mediamanager.cpp:247 mediamanager/mediamanager.cpp:266
-#: mediamanager/mediamanager.cpp:285 mediamanager/mediamanager.cpp:293
-#: mediamanager/mediamanager.cpp:302 mediamanager/mediamanager.cpp:310
-msgid "Feature only available with HAL"
+#: mediamanager/mediamanager.cpp:248 mediamanager/mediamanager.cpp:275
+msgid "Feature only available with the TDE hardware backend"
msgstr ""
-#: mediamanager/mediamanager.cpp:252
-msgid "Feature only available with the TDE hardware backend"
+#: mediamanager/mediamanager.cpp:255 mediamanager/mediamanager.cpp:282
+#: mediamanager/mediamanager.cpp:312 mediamanager/mediamanager.cpp:343
+msgid "Feature only available with HAL"
msgstr ""
-#: mediamanager/mediamanager.cpp:256 mediamanager/mediamanager.cpp:271
-#: mediamanager/mediamanager.cpp:275
+#: mediamanager/mediamanager.cpp:262 mediamanager/mediamanager.cpp:289
+#: mediamanager/mediamanager.cpp:320 mediamanager/mediamanager.cpp:350
msgid "Feature only available with HAL or TDE hardware backend"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:480
-#: mediamanager/tdehardwarebackend.cpp:517
-#: mediamanager/tdehardwarebackend.cpp:750
+#: mediamanager/tdehardwarebackend.cpp:483
+#: mediamanager/tdehardwarebackend.cpp:520
+#: mediamanager/tdehardwarebackend.cpp:753
#, fuzzy
msgid "%1 Removable Device"
msgstr "Sirdehahtti ovttadat"
-#: mediamanager/tdehardwarebackend.cpp:525
+#: mediamanager/tdehardwarebackend.cpp:528
#, fuzzy
msgid "Blank CD-ROM"
msgstr "CD-ROM"
-#: mediamanager/tdehardwarebackend.cpp:534
+#: mediamanager/tdehardwarebackend.cpp:537
msgid "Blank CD-R"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:543
+#: mediamanager/tdehardwarebackend.cpp:546
msgid "Blank CD-RW"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:552
+#: mediamanager/tdehardwarebackend.cpp:555
msgid "Blank Magneto-Optical CD"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:561
+#: mediamanager/tdehardwarebackend.cpp:564
msgid "Blank Mount Ranier CD-RW"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:570
+#: mediamanager/tdehardwarebackend.cpp:573
msgid "Blank Mount Ranier CD-RW-W"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:579
+#: mediamanager/tdehardwarebackend.cpp:582
msgid "Blank DVD-ROM"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:588
+#: mediamanager/tdehardwarebackend.cpp:591
msgid "Blank DVD-RAM"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:597
+#: mediamanager/tdehardwarebackend.cpp:600
msgid "Blank DVD-R"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:606
+#: mediamanager/tdehardwarebackend.cpp:609
msgid "Blank DVD-RW"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:615
+#: mediamanager/tdehardwarebackend.cpp:618
msgid "Blank Dual Layer DVD-R"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:624
+#: mediamanager/tdehardwarebackend.cpp:627
msgid "Blank Dual Layer DVD-RW"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:633
+#: mediamanager/tdehardwarebackend.cpp:636
msgid "Blank DVD+R"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:642
+#: mediamanager/tdehardwarebackend.cpp:645
msgid "Blank DVD+RW"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:651
+#: mediamanager/tdehardwarebackend.cpp:654
msgid "Blank Dual Layer DVD+R"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:660
+#: mediamanager/tdehardwarebackend.cpp:663
msgid "Blank Dual Layer DVD+RW"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:669
+#: mediamanager/tdehardwarebackend.cpp:672
msgid "Blank BD-ROM"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:678
+#: mediamanager/tdehardwarebackend.cpp:681
msgid "Blank BD-R"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:687
+#: mediamanager/tdehardwarebackend.cpp:690
msgid "Blank BD-RW"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:696
+#: mediamanager/tdehardwarebackend.cpp:699
msgid "Blank HDDVD-ROM"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:705
+#: mediamanager/tdehardwarebackend.cpp:708
msgid "Blank HDDVD-R"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:714
+#: mediamanager/tdehardwarebackend.cpp:717
msgid "Blank HDDVD-RW"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:721
+#: mediamanager/tdehardwarebackend.cpp:724
msgid "Audio CD"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:742
+#: mediamanager/tdehardwarebackend.cpp:745
msgid "%1 Fixed Disk (%2)"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:849
+#: mediamanager/tdehardwarebackend.cpp:852
#, fuzzy
msgid "%1 Zip Disk"
msgstr "Zip-skearru"
-#: mediamanager/tdehardwarebackend.cpp:1212
-#: mediamanager/tdehardwarebackend.cpp:1392
-msgid "Internal error"
+#: mediamanager/tdehardwarebackend.cpp:1224
+#: mediamanager/tdehardwarebackend.cpp:1417
+msgid "Internal error. Couldn't find medium."
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:1239
-msgid ""
-"<qt>Unable to mount this device.<p>Potential reasons include:<br>Improper "
-"device and/or user privilege level<br>Corrupt data on storage device"
+#: mediamanager/tdehardwarebackend.cpp:1249
+#: mediamanager/tdehardwarebackend.cpp:1323
+msgid "Unable to mount this device."
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:1241
-#: mediamanager/tdehardwarebackend.cpp:1316
-#: mediamanager/tdehardwarebackend.cpp:1408
-#: mediamanager/tdehardwarebackend.cpp:1426
+#: mediamanager/tdehardwarebackend.cpp:1252
+#: mediamanager/tdehardwarebackend.cpp:1326
+#: mediamanager/tdehardwarebackend.cpp:1435
+#: mediamanager/tdehardwarebackend.cpp:1457
msgid "<p>Technical details:<br>"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:1314
-msgid ""
-"<qt>Unable to mount this device.<p>Potential reasons include:<br>Improper "
-"device and/or user privilege level<br>Corrupt data on storage "
-"device<br>Incorrect encryption password"
+#: mediamanager/tdehardwarebackend.cpp:1284
+msgid "Decryption aborted"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:1420
+#: mediamanager/tdehardwarebackend.cpp:1443
msgid ""
"<qt>The device <b>%1</b> (%2) named <b>'%3'</b> and currently mounted at <b>"
"%4</b> can not be unmounted at this time.<p>%5<p><b>Would you like to "
@@ -386,7 +393,7 @@ msgid ""
"lost</i>"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:1547
+#: mediamanager/tdehardwarebackend.cpp:1577
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 "
@@ -397,7 +404,7 @@ msgstr ""
msgid "%1 cannot be found."
msgstr "«%1» ii gávdnon."
-#: mounthelper/tdeio_media_mounthelper.cpp:86
+#: mounthelper/tdeio_media_mounthelper.cpp:87
msgid "%1 is not a mountable media."
msgstr "«%1» ii leat čanahahtti media."
@@ -407,41 +414,49 @@ msgid "%1 is not an encrypted media."
msgstr "«%1» ii leat čanahahtti media."
#: mounthelper/tdeio_media_mounthelper.cpp:107
-msgid "%1 is already decrypted."
+msgid "%1 is already unlocked."
msgstr ""
-#: mounthelper/tdeio_media_mounthelper.cpp:228
+#: mounthelper/tdeio_media_mounthelper.cpp:139
+msgid "Unknown unmount error."
+msgstr ""
+
+#: mounthelper/tdeio_media_mounthelper.cpp:246
msgid "The device was successfully unmounted, but the tray could not be opened"
msgstr ""
-#: mounthelper/tdeio_media_mounthelper.cpp:230
+#: mounthelper/tdeio_media_mounthelper.cpp:248
msgid "The device was successfully unmounted, but could not be ejected"
msgstr ""
-#: mounthelper/tdeio_media_mounthelper.cpp:275
+#: mounthelper/tdeio_media_mounthelper.cpp:281
+msgid "Unknown decrypt error."
+msgstr ""
+
+#: mounthelper/tdeio_media_mounthelper.cpp:295
#, fuzzy
msgid "Decrypt given URL"
msgstr "Gálgga addejuvvon URL:a"
-#: mounthelper/tdeio_media_mounthelper.cpp:276
+#: mounthelper/tdeio_media_mounthelper.cpp:296
msgid "Unmount given URL"
msgstr "Gálgga addejuvvon URL:a"
-#: mounthelper/tdeio_media_mounthelper.cpp:277
+#: mounthelper/tdeio_media_mounthelper.cpp:297
msgid "Mount given URL (default)"
msgstr "Čana addejuvvon URL:a (standárda)"
-#: mounthelper/tdeio_media_mounthelper.cpp:278
+#: 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:279
+#: mounthelper/tdeio_media_mounthelper.cpp:299
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)"
-#: mounthelper/tdeio_media_mounthelper.cpp:280
+#: mounthelper/tdeio_media_mounthelper.cpp:300
msgid "media:/ URL to mount/unmount/eject/remove"
msgstr "media:/-URL:a maid áiggut čatnat/gálgat/bálkestit olggos"
@@ -463,43 +478,43 @@ msgstr ""
msgid "&Mounting"
msgstr "Čatnansadji"
-#: tdefile-plugin/tdefilemediaplugin.cpp:190
+#: tdefile-plugin/tdefilemediaplugin.cpp:184
msgid "Medium Information"
msgstr "Mediadieđut"
-#: tdefile-plugin/tdefilemediaplugin.cpp:193
+#: tdefile-plugin/tdefilemediaplugin.cpp:187
msgid "Free"
msgstr "Ealjoheapmi"
-#: tdefile-plugin/tdefilemediaplugin.cpp:196
+#: tdefile-plugin/tdefilemediaplugin.cpp:190
msgid "Used"
msgstr "Geavahuvvon"
-#: tdefile-plugin/tdefilemediaplugin.cpp:199
+#: tdefile-plugin/tdefilemediaplugin.cpp:193
msgid "Total"
msgstr "Oktiibuot"
-#: tdefile-plugin/tdefilemediaplugin.cpp:202
+#: tdefile-plugin/tdefilemediaplugin.cpp:196
msgid "Base URL"
msgstr "Vuođđočujuhus"
-#: tdefile-plugin/tdefilemediaplugin.cpp:203
+#: tdefile-plugin/tdefilemediaplugin.cpp:197
msgid "Mount Point"
msgstr "Čatnansadji"
-#: tdefile-plugin/tdefilemediaplugin.cpp:204
+#: tdefile-plugin/tdefilemediaplugin.cpp:198
msgid "Device Node"
msgstr ""
-#: tdefile-plugin/tdefilemediaplugin.cpp:206
+#: tdefile-plugin/tdefilemediaplugin.cpp:200
msgid "Medium Summary"
msgstr "Mediačoahkkáigeassu"
-#: tdefile-plugin/tdefilemediaplugin.cpp:208
+#: tdefile-plugin/tdefilemediaplugin.cpp:202
msgid "Usage"
msgstr "Geavaheapmi"
-#: tdefile-plugin/tdefilemediaplugin.cpp:210
+#: tdefile-plugin/tdefilemediaplugin.cpp:204
msgid "Bar Graph"
msgstr "Stoalpodiagrámma"
@@ -571,23 +586,30 @@ msgid ""
"devices are plugged in."
msgstr ""
-#: mediamanager/decryptdialog.ui:24 mounthelper/decryptdialog.ui:24
+#: mediamanager/unlockdialog.ui:24 mounthelper/unlockdialog.ui:24
#, no-c-format
msgid "Decrypting Storage Device"
msgstr ""
-#: mediamanager/decryptdialog.ui:109 mounthelper/decryptdialog.ui:109
+#: mediamanager/unlockdialog.ui:109
#, no-c-format
msgid ""
-"<p><b>%1</b> is an encrypted storage device.</p>\n"
-"<p>Please enter the password to decrypt the storage device.</p>"
+"<p><b>%1</b> is an encrypted locked storage device.</p>\n"
+"<p>Please enter the password to unlock the storage device.</p>"
msgstr ""
-#: mediamanager/decryptdialog.ui:131 mounthelper/decryptdialog.ui:131
+#: mediamanager/unlockdialog.ui:131 mounthelper/unlockdialog.ui:131
#, no-c-format
msgid "&Password:"
msgstr ""
+#: mounthelper/unlockdialog.ui:109
+#, no-c-format
+msgid ""
+"<p><b>%1</b> is an encrypted storage device.</p>\n"
+"<p>Please enter the password to decrypt the storage device.</p>"
+msgstr ""
+
#: propsdlgplugin/propertiespagegui.ui:16
#, no-c-format
msgid "PropertiesPageGUI"
diff --git a/tde-i18n-sk/messages/tdebase/tdeio_media.po b/tde-i18n-sk/messages/tdebase/tdeio_media.po
index f0394b972e4..b3e512bdda4 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: 2019-01-13 18:47+0100\n"
+"POT-Creation-Date: 2019-07-11 02:33+0200\n"
"PO-Revision-Date: 2007-12-02 13:37+0100\n"
"Last-Translator: Richard Fric <Richard.Fric@kdemail.net>\n"
"Language-Team: Slovak <sk@li.org>\n"
@@ -50,7 +50,6 @@ 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
-#: mounthelper/tdeio_media_mounthelper.cpp:256
msgid "The TDE mediamanager is not running."
msgstr "TDE manažér médií nebeží."
@@ -58,7 +57,7 @@ msgstr "TDE manažér médií nebeží."
msgid "This media name already exists."
msgstr "Toto meno média už existuje."
-#: mediaimpl.cpp:230 mediaimpl.cpp:293
+#: mediaimpl.cpp:230 mediaimpl.cpp:297
msgid "No such medium."
msgstr "Médium neexistuje"
@@ -66,110 +65,114 @@ msgstr "Médium neexistuje"
msgid "The drive is encrypted."
msgstr ""
-#: mediaimpl.cpp:272 mediamanager/halbackend.cpp:1264
-#: mediamanager/halbackend.cpp:1273 mediamanager/halbackend.cpp:1663
-#: mediamanager/halbackend.cpp:1680 mediamanager/halbackend.cpp:1691
-#: mediamanager/halbackend.cpp:1793 mediamanager/halbackend.cpp:1801
-#: mediamanager/halbackend.cpp:1808 mediamanager/halbackend.cpp:1848
-#: mediamanager/halbackend.cpp:1854 mediamanager/halbackend.cpp:1861
-#: mounthelper/tdeio_media_mounthelper.cpp:58
-msgid "Internal Error"
-msgstr "Interná chyba"
+#: mediaimpl.cpp:274 mediamanager/tdehardwarebackend.cpp:201
+#: mediamanager/tdehardwarebackend.cpp:252
+#: mounthelper/tdeio_media_mounthelper.cpp:202
+msgid "Unknown mount error."
+msgstr ""
#: mediamanager/dialog.cpp:26 mounthelper/dialog.cpp:26
-msgid "Decrypt"
+msgid "Unlock"
msgstr ""
-#: mediamanager/fstabbackend.cpp:104 mediamanager/fstabbackend.cpp:114
-#: mediamanager/halbackend.cpp:1595 mediamanager/halbackend.cpp:1617
-#: mediamanager/halbackend.cpp:1776 mediamanager/halbackend.cpp:1831
-#: mediamanager/tdehardwarebackend.cpp:1349
-#: mediamanager/tdehardwarebackend.cpp:1360
+#: mediamanager/fstabbackend.cpp:105 mediamanager/fstabbackend.cpp:120
+#: mediamanager/halbackend.cpp:1598 mediamanager/halbackend.cpp:1625
+#: mediamanager/halbackend.cpp:1808 mediamanager/halbackend.cpp:1877
+#: mediamanager/mediamanager.cpp:363 mediamanager/mediamanager.cpp:375
+#: mediamanager/mediamanager.cpp:387 mediamanager/mediamanager.cpp:399
+#: mediamanager/tdehardwarebackend.cpp:1363
+#: mediamanager/tdehardwarebackend.cpp:1378
#, c-format
msgid "No such medium: %1"
msgstr "Médium %1 neexistuje"
-#: mediamanager/fstabbackend.cpp:398
+#: mediamanager/fstabbackend.cpp:408
msgid "CD Recorder"
msgstr "CD Recorder"
-#: mediamanager/fstabbackend.cpp:404
+#: mediamanager/fstabbackend.cpp:414
msgid "DVD"
msgstr "DVD"
-#: mediamanager/fstabbackend.cpp:415
+#: mediamanager/fstabbackend.cpp:425
msgid "CD-ROM"
msgstr "CD-ROM"
-#: mediamanager/fstabbackend.cpp:428
+#: mediamanager/fstabbackend.cpp:438
msgid "Floppy"
msgstr "Pružný disk"
-#: mediamanager/fstabbackend.cpp:436
+#: mediamanager/fstabbackend.cpp:446
msgid "Zip Disk"
msgstr "Zip Disk"
-#: mediamanager/fstabbackend.cpp:447
+#: mediamanager/fstabbackend.cpp:457
msgid "Removable Device"
msgstr "Odpojiteľné zariadenie"
-#: mediamanager/fstabbackend.cpp:452 mediamanager/fstabbackend.cpp:458
+#: mediamanager/fstabbackend.cpp:462 mediamanager/fstabbackend.cpp:468
msgid "Remote Share"
msgstr "Diaľkové zdieľanie"
-#: mediamanager/fstabbackend.cpp:463
+#: mediamanager/fstabbackend.cpp:473
msgid "Hard Disk"
msgstr "Pevný disk"
-#: mediamanager/halbackend.cpp:749 mediamanager/tdehardwarebackend.cpp:805
+#: mediamanager/halbackend.cpp:744 mediamanager/tdehardwarebackend.cpp:808
msgid "Unknown Drive"
msgstr "Neznámy disk"
-#: mediamanager/halbackend.cpp:761 mediamanager/tdehardwarebackend.cpp:835
+#: mediamanager/halbackend.cpp:756 mediamanager/tdehardwarebackend.cpp:838
msgid "Floppy Drive"
msgstr "Disketa"
-#: mediamanager/halbackend.cpp:769
+#: mediamanager/halbackend.cpp:764
msgid "Zip Drive"
msgstr "Zip Disk"
-#: mediamanager/halbackend.cpp:839 mediamanager/tdehardwarebackend.cpp:892
+#: mediamanager/halbackend.cpp:834 mediamanager/tdehardwarebackend.cpp:895
msgid "Camera"
msgstr "Fotoaparát"
-#: mediamanager/halbackend.cpp:1221 mediamanager/halbackend.cpp:1247
+#: mediamanager/halbackend.cpp:1216 mediamanager/halbackend.cpp:1242
msgid "Authenticate"
msgstr ""
-#: mediamanager/halbackend.cpp:1222
+#: mediamanager/halbackend.cpp:1217
msgid ""
"<big><b>System policy prevents mounting internal media</b></big><br/"
">Authentication is required to perform this action. Please enter your "
"password to verify."
msgstr ""
-#: mediamanager/halbackend.cpp:1248
+#: mediamanager/halbackend.cpp:1243
msgid ""
"<big><b>System policy prevents unmounting media mounted by other users</b></"
"big><br/>Authentication is required to perform this action. Please enter "
"your password to verify."
msgstr ""
-#: mediamanager/halbackend.cpp:1284
+#: mediamanager/halbackend.cpp:1259 mediamanager/halbackend.cpp:1268
+#: mediamanager/halbackend.cpp:1849 mediamanager/halbackend.cpp:1916
+#: mounthelper/tdeio_media_mounthelper.cpp:58
+msgid "Internal Error"
+msgstr "Interná chyba"
+
+#: mediamanager/halbackend.cpp:1279
msgid "Invalid filesystem type"
msgstr "Neplatný súborový systém"
-#: mediamanager/halbackend.cpp:1286
+#: mediamanager/halbackend.cpp:1281
msgid ""
"Permission denied<p>Please ensure that:<br>1. You have permission to access "
"this device.<br>2. This device node is not listed in /etc/fstab.</p>"
msgstr ""
-#: mediamanager/halbackend.cpp:1290
+#: mediamanager/halbackend.cpp:1285
msgid "Device is already mounted."
msgstr "Zariadenie je už pripojené."
-#: mediamanager/halbackend.cpp:1340
+#: mediamanager/halbackend.cpp:1335
msgid ""
"Moreover, programs still using the device have been detected. They are "
"listed below. You have to close them or change their working directory "
@@ -179,16 +182,16 @@ msgstr ""
"vymenované dolu. Buď ich ukončite alebo zmente ich pracovný priečinok "
"predtým ako skúsite znova zariadenie odpojiť."
-#: mediamanager/halbackend.cpp:1381 mediamanager/tdehardwarebackend.cpp:1588
+#: mediamanager/halbackend.cpp:1376 mediamanager/tdehardwarebackend.cpp:1618
msgid ""
"Programs that were still using the device have been forcibly terminated. "
"They are listed below."
msgstr ""
-#: mediamanager/halbackend.cpp:1402 mediamanager/halbackend.cpp:1715
-#: mediamanager/tdehardwarebackend.cpp:1406
-#: mediamanager/tdehardwarebackend.cpp:1424
-#: mediamanager/tdehardwarebackend.cpp:1464
+#: mediamanager/halbackend.cpp:1397 mediamanager/halbackend.cpp:1742
+#: mediamanager/tdehardwarebackend.cpp:1430
+#: mediamanager/tdehardwarebackend.cpp:1452
+#: mediamanager/tdehardwarebackend.cpp:1494
msgid ""
"Unfortunately, the device <b>%1</b> (%2) named <b>'%3'</b> and currently "
"mounted at <b>%4</b> could not be unmounted. "
@@ -196,196 +199,199 @@ msgstr ""
"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:1408 mediamanager/tdehardwarebackend.cpp:1470
+#: mediamanager/halbackend.cpp:1403 mediamanager/tdehardwarebackend.cpp:1500
msgid "The following error was returned by umount command:"
msgstr "Príkaz odpojenia vrátil nasledujúcu chybu:"
-#: mediamanager/halbackend.cpp:1478
+#: mediamanager/halbackend.cpp:1567 mediamanager/tdehardwarebackend.cpp:1322
+msgid "Cannot mount encrypted locked drives!"
+msgstr ""
+
+#: mediamanager/halbackend.cpp:1682 mediamanager/halbackend.cpp:1703
+#: mediamanager/halbackend.cpp:1716 mediamanager/halbackend.cpp:1830
+#: mediamanager/halbackend.cpp:1840 mediamanager/halbackend.cpp:1899
+#: mediamanager/halbackend.cpp:1907
#, fuzzy
-msgid "Permission denied"
-msgstr "Prístup odmietnutý"
+msgid "Internal error"
+msgstr "Interná chyba"
-#: mediamanager/halbackend.cpp:1562 mediamanager/tdehardwarebackend.cpp:1232
-msgid "Cannot mount encrypted drives!"
-msgstr ""
+#: mediamanager/halbackend.cpp:1694
+#, fuzzy
+#| msgid "Unknown"
+msgid "Unknown error"
+msgstr "Neznáme"
-#: mediamanager/halbackend.cpp:1721
+#: mediamanager/halbackend.cpp:1748
msgid "Unmounting failed due to the following error:"
msgstr "Odpojenie zlyhalo z dôvodu nasledujúcej chyby:"
-#: mediamanager/halbackend.cpp:1723
+#: mediamanager/halbackend.cpp:1750
msgid "Device is Busy:"
msgstr "Zariadenie je zaneprázdnené:"
-#: mediamanager/halbackend.cpp:1727
+#: mediamanager/halbackend.cpp:1754
msgid ""
"Permission denied<p>Please ensure that:<br>1. You have permission to access "
"this device.<br>2. This device was originally mounted using TDE.</p>"
msgstr ""
-#: mediamanager/halbackend.cpp:1739
+#: mediamanager/halbackend.cpp:1766
msgid ""
"%1<p><b>Would you like to forcibly terminate these processes?</b><br><i>All "
"unsaved data would be lost</i>"
msgstr ""
-#: mediamanager/halbackend.cpp:1811
+#: mediamanager/halbackend.cpp:1852
msgid "Wrong password"
msgstr ""
-#: mediamanager/mediamanager.cpp:247 mediamanager/mediamanager.cpp:266
-#: mediamanager/mediamanager.cpp:285 mediamanager/mediamanager.cpp:293
-#: mediamanager/mediamanager.cpp:302 mediamanager/mediamanager.cpp:310
-msgid "Feature only available with HAL"
-msgstr "Vlastnosť dostupná len pomocou HAL"
-
-#: mediamanager/mediamanager.cpp:252
+#: mediamanager/mediamanager.cpp:248 mediamanager/mediamanager.cpp:275
#, fuzzy
msgid "Feature only available with the TDE hardware backend"
msgstr "Vlastnosť dostupná len pomocou HAL"
-#: mediamanager/mediamanager.cpp:256 mediamanager/mediamanager.cpp:271
-#: mediamanager/mediamanager.cpp:275
+#: mediamanager/mediamanager.cpp:255 mediamanager/mediamanager.cpp:282
+#: mediamanager/mediamanager.cpp:312 mediamanager/mediamanager.cpp:343
+msgid "Feature only available with HAL"
+msgstr "Vlastnosť dostupná len pomocou HAL"
+
+#: mediamanager/mediamanager.cpp:262 mediamanager/mediamanager.cpp:289
+#: mediamanager/mediamanager.cpp:320 mediamanager/mediamanager.cpp:350
#, fuzzy
msgid "Feature only available with HAL or TDE hardware backend"
msgstr "Vlastnosť dostupná len pomocou HAL"
-#: mediamanager/tdehardwarebackend.cpp:480
-#: mediamanager/tdehardwarebackend.cpp:517
-#: mediamanager/tdehardwarebackend.cpp:750
+#: mediamanager/tdehardwarebackend.cpp:483
+#: mediamanager/tdehardwarebackend.cpp:520
+#: mediamanager/tdehardwarebackend.cpp:753
#, fuzzy
msgid "%1 Removable Device"
msgstr "Odpojiteľné zariadenie"
-#: mediamanager/tdehardwarebackend.cpp:525
+#: mediamanager/tdehardwarebackend.cpp:528
#, fuzzy
msgid "Blank CD-ROM"
msgstr "CD-ROM"
-#: mediamanager/tdehardwarebackend.cpp:534
+#: mediamanager/tdehardwarebackend.cpp:537
msgid "Blank CD-R"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:543
+#: mediamanager/tdehardwarebackend.cpp:546
msgid "Blank CD-RW"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:552
+#: mediamanager/tdehardwarebackend.cpp:555
msgid "Blank Magneto-Optical CD"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:561
+#: mediamanager/tdehardwarebackend.cpp:564
msgid "Blank Mount Ranier CD-RW"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:570
+#: mediamanager/tdehardwarebackend.cpp:573
msgid "Blank Mount Ranier CD-RW-W"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:579
+#: mediamanager/tdehardwarebackend.cpp:582
msgid "Blank DVD-ROM"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:588
+#: mediamanager/tdehardwarebackend.cpp:591
msgid "Blank DVD-RAM"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:597
+#: mediamanager/tdehardwarebackend.cpp:600
msgid "Blank DVD-R"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:606
+#: mediamanager/tdehardwarebackend.cpp:609
msgid "Blank DVD-RW"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:615
+#: mediamanager/tdehardwarebackend.cpp:618
msgid "Blank Dual Layer DVD-R"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:624
+#: mediamanager/tdehardwarebackend.cpp:627
msgid "Blank Dual Layer DVD-RW"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:633
+#: mediamanager/tdehardwarebackend.cpp:636
msgid "Blank DVD+R"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:642
+#: mediamanager/tdehardwarebackend.cpp:645
msgid "Blank DVD+RW"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:651
+#: mediamanager/tdehardwarebackend.cpp:654
msgid "Blank Dual Layer DVD+R"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:660
+#: mediamanager/tdehardwarebackend.cpp:663
msgid "Blank Dual Layer DVD+RW"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:669
+#: mediamanager/tdehardwarebackend.cpp:672
msgid "Blank BD-ROM"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:678
+#: mediamanager/tdehardwarebackend.cpp:681
msgid "Blank BD-R"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:687
+#: mediamanager/tdehardwarebackend.cpp:690
msgid "Blank BD-RW"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:696
+#: mediamanager/tdehardwarebackend.cpp:699
msgid "Blank HDDVD-ROM"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:705
+#: mediamanager/tdehardwarebackend.cpp:708
msgid "Blank HDDVD-R"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:714
+#: mediamanager/tdehardwarebackend.cpp:717
msgid "Blank HDDVD-RW"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:721
+#: mediamanager/tdehardwarebackend.cpp:724
msgid "Audio CD"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:742
+#: mediamanager/tdehardwarebackend.cpp:745
msgid "%1 Fixed Disk (%2)"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:849
+#: mediamanager/tdehardwarebackend.cpp:852
#, fuzzy
msgid "%1 Zip Disk"
msgstr "Zip Disk"
-#: mediamanager/tdehardwarebackend.cpp:1212
-#: mediamanager/tdehardwarebackend.cpp:1392
-#, fuzzy
-msgid "Internal error"
-msgstr "Interná chyba"
+#: mediamanager/tdehardwarebackend.cpp:1224
+#: mediamanager/tdehardwarebackend.cpp:1417
+msgid "Internal error. Couldn't find medium."
+msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:1239
-msgid ""
-"<qt>Unable to mount this device.<p>Potential reasons include:<br>Improper "
-"device and/or user privilege level<br>Corrupt data on storage device"
+#: mediamanager/tdehardwarebackend.cpp:1249
+#: mediamanager/tdehardwarebackend.cpp:1323
+msgid "Unable to mount this device."
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:1241
-#: mediamanager/tdehardwarebackend.cpp:1316
-#: mediamanager/tdehardwarebackend.cpp:1408
-#: mediamanager/tdehardwarebackend.cpp:1426
+#: mediamanager/tdehardwarebackend.cpp:1252
+#: mediamanager/tdehardwarebackend.cpp:1326
+#: mediamanager/tdehardwarebackend.cpp:1435
+#: mediamanager/tdehardwarebackend.cpp:1457
msgid "<p>Technical details:<br>"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:1314
-msgid ""
-"<qt>Unable to mount this device.<p>Potential reasons include:<br>Improper "
-"device and/or user privilege level<br>Corrupt data on storage "
-"device<br>Incorrect encryption password"
+#: mediamanager/tdehardwarebackend.cpp:1284
+msgid "Decryption aborted"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:1420
+#: mediamanager/tdehardwarebackend.cpp:1443
msgid ""
"<qt>The device <b>%1</b> (%2) named <b>'%3'</b> and currently mounted at <b>"
"%4</b> can not be unmounted at this time.<p>%5<p><b>Would you like to "
@@ -393,7 +399,7 @@ msgid ""
"lost</i>"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:1547
+#: mediamanager/tdehardwarebackend.cpp:1577
#, fuzzy
msgid ""
"Programs still using the device have been detected. They are listed below. "
@@ -408,7 +414,7 @@ msgstr ""
msgid "%1 cannot be found."
msgstr "%1 sa nedá nájsť."
-#: mounthelper/tdeio_media_mounthelper.cpp:86
+#: mounthelper/tdeio_media_mounthelper.cpp:87
msgid "%1 is not a mountable media."
msgstr "%1 nie je pripojiteľné médium."
@@ -419,39 +425,47 @@ msgstr "%1 nie je pripojiteľné médium."
#: mounthelper/tdeio_media_mounthelper.cpp:107
#, fuzzy
-msgid "%1 is already decrypted."
+msgid "%1 is already unlocked."
msgstr "Zariadenie je už pripojené."
-#: mounthelper/tdeio_media_mounthelper.cpp:228
+#: mounthelper/tdeio_media_mounthelper.cpp:139
+msgid "Unknown unmount error."
+msgstr ""
+
+#: mounthelper/tdeio_media_mounthelper.cpp:246
msgid "The device was successfully unmounted, but the tray could not be opened"
msgstr "Zariadenie bolo úspešne odpojené, ale zásuvka sa nedá otvoriť"
-#: mounthelper/tdeio_media_mounthelper.cpp:230
+#: 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:275
+#: mounthelper/tdeio_media_mounthelper.cpp:281
+msgid "Unknown decrypt error."
+msgstr ""
+
+#: mounthelper/tdeio_media_mounthelper.cpp:295
#, fuzzy
msgid "Decrypt given URL"
msgstr "Odpojiť zadanú URL"
-#: mounthelper/tdeio_media_mounthelper.cpp:276
+#: mounthelper/tdeio_media_mounthelper.cpp:296
msgid "Unmount given URL"
msgstr "Odpojiť zadanú URL"
-#: mounthelper/tdeio_media_mounthelper.cpp:277
+#: mounthelper/tdeio_media_mounthelper.cpp:297
msgid "Mount given URL (default)"
msgstr "Pripojiť zadanú URL (štandardne)"
-#: mounthelper/tdeio_media_mounthelper.cpp:278
+#: mounthelper/tdeio_media_mounthelper.cpp:298
msgid "Eject given URL via tdeeject"
msgstr "Vysunúť zadanú URL pomocou tdeeject"
-#: mounthelper/tdeio_media_mounthelper.cpp:279
+#: mounthelper/tdeio_media_mounthelper.cpp:299
msgid "Unmount and Eject given URL (necessary for some USB devices)"
msgstr "Odpojiť a vysunúť zadané URL (potrebné pre niektoré USB zariadenia)"
-#: mounthelper/tdeio_media_mounthelper.cpp:280
+#: mounthelper/tdeio_media_mounthelper.cpp:300
msgid "media:/ URL to mount/unmount/eject/remove"
msgstr "media:/ URL pre pripojenie/odpojenie/vysunutie/odstránenie"
@@ -472,43 +486,43 @@ msgstr "Uloženie zmien zlyhalo"
msgid "&Mounting"
msgstr "&Pripája sa"
-#: tdefile-plugin/tdefilemediaplugin.cpp:190
+#: tdefile-plugin/tdefilemediaplugin.cpp:184
msgid "Medium Information"
msgstr "Informácie o médiu"
-#: tdefile-plugin/tdefilemediaplugin.cpp:193
+#: tdefile-plugin/tdefilemediaplugin.cpp:187
msgid "Free"
msgstr "Prázdne"
-#: tdefile-plugin/tdefilemediaplugin.cpp:196
+#: tdefile-plugin/tdefilemediaplugin.cpp:190
msgid "Used"
msgstr "Použité"
-#: tdefile-plugin/tdefilemediaplugin.cpp:199
+#: tdefile-plugin/tdefilemediaplugin.cpp:193
msgid "Total"
msgstr "Spolu"
-#: tdefile-plugin/tdefilemediaplugin.cpp:202
+#: tdefile-plugin/tdefilemediaplugin.cpp:196
msgid "Base URL"
msgstr "Základné URL"
-#: tdefile-plugin/tdefilemediaplugin.cpp:203
+#: tdefile-plugin/tdefilemediaplugin.cpp:197
msgid "Mount Point"
msgstr "Miesto pripojenia"
-#: tdefile-plugin/tdefilemediaplugin.cpp:204
+#: tdefile-plugin/tdefilemediaplugin.cpp:198
msgid "Device Node"
msgstr "Uzol zariadenia"
-#: tdefile-plugin/tdefilemediaplugin.cpp:206
+#: tdefile-plugin/tdefilemediaplugin.cpp:200
msgid "Medium Summary"
msgstr "Sumár média"
-#: tdefile-plugin/tdefilemediaplugin.cpp:208
+#: tdefile-plugin/tdefilemediaplugin.cpp:202
msgid "Usage"
msgstr "Použitie"
-#: tdefile-plugin/tdefilemediaplugin.cpp:210
+#: tdefile-plugin/tdefilemediaplugin.cpp:204
msgid "Bar Graph"
msgstr "Stĺpcový graf"
@@ -580,23 +594,30 @@ msgid ""
"devices are plugged in."
msgstr ""
-#: mediamanager/decryptdialog.ui:24 mounthelper/decryptdialog.ui:24
+#: mediamanager/unlockdialog.ui:24 mounthelper/unlockdialog.ui:24
#, no-c-format
msgid "Decrypting Storage Device"
msgstr ""
-#: mediamanager/decryptdialog.ui:109 mounthelper/decryptdialog.ui:109
+#: mediamanager/unlockdialog.ui:109
#, no-c-format
msgid ""
-"<p><b>%1</b> is an encrypted storage device.</p>\n"
-"<p>Please enter the password to decrypt the storage device.</p>"
+"<p><b>%1</b> is an encrypted locked storage device.</p>\n"
+"<p>Please enter the password to unlock the storage device.</p>"
msgstr ""
-#: mediamanager/decryptdialog.ui:131 mounthelper/decryptdialog.ui:131
+#: mediamanager/unlockdialog.ui:131 mounthelper/unlockdialog.ui:131
#, no-c-format
msgid "&Password:"
msgstr ""
+#: mounthelper/unlockdialog.ui:109
+#, no-c-format
+msgid ""
+"<p><b>%1</b> is an encrypted storage device.</p>\n"
+"<p>Please enter the password to decrypt the storage device.</p>"
+msgstr ""
+
#: propsdlgplugin/propertiespagegui.ui:16
#, no-c-format
msgid "PropertiesPageGUI"
@@ -859,3 +880,7 @@ msgstr "Pomiešané"
#, no-c-format
msgid "Filesystem: iso9660"
msgstr "Súborový systém: iso9660"
+
+#, 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 d1e1ced249b..6992ba7d9d7 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: 2019-01-13 18:47+0100\n"
+"POT-Creation-Date: 2019-07-11 02:33+0200\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"
@@ -49,7 +49,6 @@ 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
-#: mounthelper/tdeio_media_mounthelper.cpp:256
msgid "The TDE mediamanager is not running."
msgstr "Upravitelj nosilcev za TDE ne teče."
@@ -57,7 +56,7 @@ msgstr "Upravitelj nosilcev za TDE ne teče."
msgid "This media name already exists."
msgstr "To ime nosilca že obstaja."
-#: mediaimpl.cpp:230 mediaimpl.cpp:293
+#: mediaimpl.cpp:230 mediaimpl.cpp:297
msgid "No such medium."
msgstr "Takega nosilca ni."
@@ -65,113 +64,117 @@ msgstr "Takega nosilca ni."
msgid "The drive is encrypted."
msgstr ""
-#: mediaimpl.cpp:272 mediamanager/halbackend.cpp:1264
-#: mediamanager/halbackend.cpp:1273 mediamanager/halbackend.cpp:1663
-#: mediamanager/halbackend.cpp:1680 mediamanager/halbackend.cpp:1691
-#: mediamanager/halbackend.cpp:1793 mediamanager/halbackend.cpp:1801
-#: mediamanager/halbackend.cpp:1808 mediamanager/halbackend.cpp:1848
-#: mediamanager/halbackend.cpp:1854 mediamanager/halbackend.cpp:1861
-#: mounthelper/tdeio_media_mounthelper.cpp:58
-msgid "Internal Error"
-msgstr "Notranja napaka"
+#: mediaimpl.cpp:274 mediamanager/tdehardwarebackend.cpp:201
+#: mediamanager/tdehardwarebackend.cpp:252
+#: mounthelper/tdeio_media_mounthelper.cpp:202
+msgid "Unknown mount error."
+msgstr ""
#: mediamanager/dialog.cpp:26 mounthelper/dialog.cpp:26
-msgid "Decrypt"
+msgid "Unlock"
msgstr ""
-#: mediamanager/fstabbackend.cpp:104 mediamanager/fstabbackend.cpp:114
-#: mediamanager/halbackend.cpp:1595 mediamanager/halbackend.cpp:1617
-#: mediamanager/halbackend.cpp:1776 mediamanager/halbackend.cpp:1831
-#: mediamanager/tdehardwarebackend.cpp:1349
-#: mediamanager/tdehardwarebackend.cpp:1360
+#: mediamanager/fstabbackend.cpp:105 mediamanager/fstabbackend.cpp:120
+#: mediamanager/halbackend.cpp:1598 mediamanager/halbackend.cpp:1625
+#: mediamanager/halbackend.cpp:1808 mediamanager/halbackend.cpp:1877
+#: mediamanager/mediamanager.cpp:363 mediamanager/mediamanager.cpp:375
+#: mediamanager/mediamanager.cpp:387 mediamanager/mediamanager.cpp:399
+#: mediamanager/tdehardwarebackend.cpp:1363
+#: mediamanager/tdehardwarebackend.cpp:1378
#, c-format
msgid "No such medium: %1"
msgstr "Tega nosilca ni: %1"
-#: mediamanager/fstabbackend.cpp:398
+#: mediamanager/fstabbackend.cpp:408
msgid "CD Recorder"
msgstr "Zapisovalnik CD-jev"
-#: mediamanager/fstabbackend.cpp:404
+#: mediamanager/fstabbackend.cpp:414
msgid "DVD"
msgstr "DVD"
-#: mediamanager/fstabbackend.cpp:415
+#: mediamanager/fstabbackend.cpp:425
msgid "CD-ROM"
msgstr "CD-ROM"
-#: mediamanager/fstabbackend.cpp:428
+#: mediamanager/fstabbackend.cpp:438
msgid "Floppy"
msgstr "Disketa"
-#: mediamanager/fstabbackend.cpp:436
+#: mediamanager/fstabbackend.cpp:446
msgid "Zip Disk"
msgstr "Disk Zip"
-#: mediamanager/fstabbackend.cpp:447
+#: mediamanager/fstabbackend.cpp:457
msgid "Removable Device"
msgstr "Izmenjevalna naprava"
-#: mediamanager/fstabbackend.cpp:452 mediamanager/fstabbackend.cpp:458
+#: mediamanager/fstabbackend.cpp:462 mediamanager/fstabbackend.cpp:468
msgid "Remote Share"
msgstr "Oddaljena souporaba"
-#: mediamanager/fstabbackend.cpp:463
+#: mediamanager/fstabbackend.cpp:473
msgid "Hard Disk"
msgstr "Trdi disk"
-#: mediamanager/halbackend.cpp:749 mediamanager/tdehardwarebackend.cpp:805
+#: mediamanager/halbackend.cpp:744 mediamanager/tdehardwarebackend.cpp:808
#, fuzzy
msgid "Unknown Drive"
msgstr "Neznano"
-#: mediamanager/halbackend.cpp:761 mediamanager/tdehardwarebackend.cpp:835
+#: mediamanager/halbackend.cpp:756 mediamanager/tdehardwarebackend.cpp:838
#, fuzzy
msgid "Floppy Drive"
msgstr "Disketa"
-#: mediamanager/halbackend.cpp:769
+#: mediamanager/halbackend.cpp:764
#, fuzzy
msgid "Zip Drive"
msgstr "Disk Zip"
-#: mediamanager/halbackend.cpp:839 mediamanager/tdehardwarebackend.cpp:892
+#: mediamanager/halbackend.cpp:834 mediamanager/tdehardwarebackend.cpp:895
msgid "Camera"
msgstr "Kamera"
-#: mediamanager/halbackend.cpp:1221 mediamanager/halbackend.cpp:1247
+#: mediamanager/halbackend.cpp:1216 mediamanager/halbackend.cpp:1242
msgid "Authenticate"
msgstr ""
-#: mediamanager/halbackend.cpp:1222
+#: mediamanager/halbackend.cpp:1217
msgid ""
"<big><b>System policy prevents mounting internal media</b></big><br/"
">Authentication is required to perform this action. Please enter your "
"password to verify."
msgstr ""
-#: mediamanager/halbackend.cpp:1248
+#: mediamanager/halbackend.cpp:1243
msgid ""
"<big><b>System policy prevents unmounting media mounted by other users</b></"
"big><br/>Authentication is required to perform this action. Please enter "
"your password to verify."
msgstr ""
-#: mediamanager/halbackend.cpp:1284
+#: mediamanager/halbackend.cpp:1259 mediamanager/halbackend.cpp:1268
+#: mediamanager/halbackend.cpp:1849 mediamanager/halbackend.cpp:1916
+#: mounthelper/tdeio_media_mounthelper.cpp:58
+msgid "Internal Error"
+msgstr "Notranja napaka"
+
+#: mediamanager/halbackend.cpp:1279
msgid "Invalid filesystem type"
msgstr "Neveljavna vrsta datotečnega sistema"
-#: mediamanager/halbackend.cpp:1286
+#: mediamanager/halbackend.cpp:1281
msgid ""
"Permission denied<p>Please ensure that:<br>1. You have permission to access "
"this device.<br>2. This device node is not listed in /etc/fstab.</p>"
msgstr ""
-#: mediamanager/halbackend.cpp:1290
+#: mediamanager/halbackend.cpp:1285
msgid "Device is already mounted."
msgstr "Naprava je že priklopljena."
-#: mediamanager/halbackend.cpp:1340
+#: mediamanager/halbackend.cpp:1335
msgid ""
"Moreover, programs still using the device have been detected. They are "
"listed below. You have to close them or change their working directory "
@@ -181,16 +184,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:1381 mediamanager/tdehardwarebackend.cpp:1588
+#: mediamanager/halbackend.cpp:1376 mediamanager/tdehardwarebackend.cpp:1618
msgid ""
"Programs that were still using the device have been forcibly terminated. "
"They are listed below."
msgstr ""
-#: mediamanager/halbackend.cpp:1402 mediamanager/halbackend.cpp:1715
-#: mediamanager/tdehardwarebackend.cpp:1406
-#: mediamanager/tdehardwarebackend.cpp:1424
-#: mediamanager/tdehardwarebackend.cpp:1464
+#: mediamanager/halbackend.cpp:1397 mediamanager/halbackend.cpp:1742
+#: mediamanager/tdehardwarebackend.cpp:1430
+#: mediamanager/tdehardwarebackend.cpp:1452
+#: mediamanager/tdehardwarebackend.cpp:1494
msgid ""
"Unfortunately, the device <b>%1</b> (%2) named <b>'%3'</b> and currently "
"mounted at <b>%4</b> could not be unmounted. "
@@ -198,196 +201,199 @@ 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:1408 mediamanager/tdehardwarebackend.cpp:1470
+#: mediamanager/halbackend.cpp:1403 mediamanager/tdehardwarebackend.cpp:1500
msgid "The following error was returned by umount command:"
msgstr "Ukaz unmount je vrnil sledečo napako:"
-#: mediamanager/halbackend.cpp:1478
+#: mediamanager/halbackend.cpp:1567 mediamanager/tdehardwarebackend.cpp:1322
+msgid "Cannot mount encrypted locked drives!"
+msgstr ""
+
+#: mediamanager/halbackend.cpp:1682 mediamanager/halbackend.cpp:1703
+#: mediamanager/halbackend.cpp:1716 mediamanager/halbackend.cpp:1830
+#: mediamanager/halbackend.cpp:1840 mediamanager/halbackend.cpp:1899
+#: mediamanager/halbackend.cpp:1907
#, fuzzy
-msgid "Permission denied"
-msgstr "Dovoljenje zavrnjeno"
+msgid "Internal error"
+msgstr "Notranja napaka"
-#: mediamanager/halbackend.cpp:1562 mediamanager/tdehardwarebackend.cpp:1232
-msgid "Cannot mount encrypted drives!"
-msgstr ""
+#: mediamanager/halbackend.cpp:1694
+#, fuzzy
+#| msgid "Unknown"
+msgid "Unknown error"
+msgstr "Neznano"
-#: mediamanager/halbackend.cpp:1721
+#: mediamanager/halbackend.cpp:1748
msgid "Unmounting failed due to the following error:"
msgstr "Odklapljanje je spodletelo zaradi sledeče napake:"
-#: mediamanager/halbackend.cpp:1723
+#: mediamanager/halbackend.cpp:1750
msgid "Device is Busy:"
msgstr "Naprava je zaposlena:"
-#: mediamanager/halbackend.cpp:1727
+#: mediamanager/halbackend.cpp:1754
msgid ""
"Permission denied<p>Please ensure that:<br>1. You have permission to access "
"this device.<br>2. This device was originally mounted using TDE.</p>"
msgstr ""
-#: mediamanager/halbackend.cpp:1739
+#: mediamanager/halbackend.cpp:1766
msgid ""
"%1<p><b>Would you like to forcibly terminate these processes?</b><br><i>All "
"unsaved data would be lost</i>"
msgstr ""
-#: mediamanager/halbackend.cpp:1811
+#: mediamanager/halbackend.cpp:1852
msgid "Wrong password"
msgstr ""
-#: mediamanager/mediamanager.cpp:247 mediamanager/mediamanager.cpp:266
-#: mediamanager/mediamanager.cpp:285 mediamanager/mediamanager.cpp:293
-#: mediamanager/mediamanager.cpp:302 mediamanager/mediamanager.cpp:310
-msgid "Feature only available with HAL"
-msgstr "Zmožnost je na voljo samo, če je nameščen HAL"
-
-#: mediamanager/mediamanager.cpp:252
+#: mediamanager/mediamanager.cpp:248 mediamanager/mediamanager.cpp:275
#, 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:256 mediamanager/mediamanager.cpp:271
-#: mediamanager/mediamanager.cpp:275
+#: mediamanager/mediamanager.cpp:255 mediamanager/mediamanager.cpp:282
+#: mediamanager/mediamanager.cpp:312 mediamanager/mediamanager.cpp:343
+msgid "Feature only available with HAL"
+msgstr "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
#, 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:480
-#: mediamanager/tdehardwarebackend.cpp:517
-#: mediamanager/tdehardwarebackend.cpp:750
+#: mediamanager/tdehardwarebackend.cpp:483
+#: mediamanager/tdehardwarebackend.cpp:520
+#: mediamanager/tdehardwarebackend.cpp:753
#, fuzzy
msgid "%1 Removable Device"
msgstr "Izmenjevalna naprava"
-#: mediamanager/tdehardwarebackend.cpp:525
+#: mediamanager/tdehardwarebackend.cpp:528
#, fuzzy
msgid "Blank CD-ROM"
msgstr "CD-ROM"
-#: mediamanager/tdehardwarebackend.cpp:534
+#: mediamanager/tdehardwarebackend.cpp:537
msgid "Blank CD-R"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:543
+#: mediamanager/tdehardwarebackend.cpp:546
msgid "Blank CD-RW"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:552
+#: mediamanager/tdehardwarebackend.cpp:555
msgid "Blank Magneto-Optical CD"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:561
+#: mediamanager/tdehardwarebackend.cpp:564
msgid "Blank Mount Ranier CD-RW"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:570
+#: mediamanager/tdehardwarebackend.cpp:573
msgid "Blank Mount Ranier CD-RW-W"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:579
+#: mediamanager/tdehardwarebackend.cpp:582
msgid "Blank DVD-ROM"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:588
+#: mediamanager/tdehardwarebackend.cpp:591
msgid "Blank DVD-RAM"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:597
+#: mediamanager/tdehardwarebackend.cpp:600
msgid "Blank DVD-R"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:606
+#: mediamanager/tdehardwarebackend.cpp:609
msgid "Blank DVD-RW"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:615
+#: mediamanager/tdehardwarebackend.cpp:618
msgid "Blank Dual Layer DVD-R"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:624
+#: mediamanager/tdehardwarebackend.cpp:627
msgid "Blank Dual Layer DVD-RW"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:633
+#: mediamanager/tdehardwarebackend.cpp:636
msgid "Blank DVD+R"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:642
+#: mediamanager/tdehardwarebackend.cpp:645
msgid "Blank DVD+RW"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:651
+#: mediamanager/tdehardwarebackend.cpp:654
msgid "Blank Dual Layer DVD+R"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:660
+#: mediamanager/tdehardwarebackend.cpp:663
msgid "Blank Dual Layer DVD+RW"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:669
+#: mediamanager/tdehardwarebackend.cpp:672
msgid "Blank BD-ROM"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:678
+#: mediamanager/tdehardwarebackend.cpp:681
msgid "Blank BD-R"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:687
+#: mediamanager/tdehardwarebackend.cpp:690
msgid "Blank BD-RW"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:696
+#: mediamanager/tdehardwarebackend.cpp:699
msgid "Blank HDDVD-ROM"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:705
+#: mediamanager/tdehardwarebackend.cpp:708
msgid "Blank HDDVD-R"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:714
+#: mediamanager/tdehardwarebackend.cpp:717
msgid "Blank HDDVD-RW"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:721
+#: mediamanager/tdehardwarebackend.cpp:724
msgid "Audio CD"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:742
+#: mediamanager/tdehardwarebackend.cpp:745
msgid "%1 Fixed Disk (%2)"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:849
+#: mediamanager/tdehardwarebackend.cpp:852
#, fuzzy
msgid "%1 Zip Disk"
msgstr "Disk Zip"
-#: mediamanager/tdehardwarebackend.cpp:1212
-#: mediamanager/tdehardwarebackend.cpp:1392
-#, fuzzy
-msgid "Internal error"
-msgstr "Notranja napaka"
+#: mediamanager/tdehardwarebackend.cpp:1224
+#: mediamanager/tdehardwarebackend.cpp:1417
+msgid "Internal error. Couldn't find medium."
+msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:1239
-msgid ""
-"<qt>Unable to mount this device.<p>Potential reasons include:<br>Improper "
-"device and/or user privilege level<br>Corrupt data on storage device"
+#: mediamanager/tdehardwarebackend.cpp:1249
+#: mediamanager/tdehardwarebackend.cpp:1323
+msgid "Unable to mount this device."
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:1241
-#: mediamanager/tdehardwarebackend.cpp:1316
-#: mediamanager/tdehardwarebackend.cpp:1408
-#: mediamanager/tdehardwarebackend.cpp:1426
+#: mediamanager/tdehardwarebackend.cpp:1252
+#: mediamanager/tdehardwarebackend.cpp:1326
+#: mediamanager/tdehardwarebackend.cpp:1435
+#: mediamanager/tdehardwarebackend.cpp:1457
msgid "<p>Technical details:<br>"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:1314
-msgid ""
-"<qt>Unable to mount this device.<p>Potential reasons include:<br>Improper "
-"device and/or user privilege level<br>Corrupt data on storage "
-"device<br>Incorrect encryption password"
+#: mediamanager/tdehardwarebackend.cpp:1284
+msgid "Decryption aborted"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:1420
+#: mediamanager/tdehardwarebackend.cpp:1443
msgid ""
"<qt>The device <b>%1</b> (%2) named <b>'%3'</b> and currently mounted at <b>"
"%4</b> can not be unmounted at this time.<p>%5<p><b>Would you like to "
@@ -395,7 +401,7 @@ msgid ""
"lost</i>"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:1547
+#: mediamanager/tdehardwarebackend.cpp:1577
#, fuzzy
msgid ""
"Programs still using the device have been detected. They are listed below. "
@@ -410,7 +416,7 @@ msgstr ""
msgid "%1 cannot be found."
msgstr "Ni moč najti %1."
-#: mounthelper/tdeio_media_mounthelper.cpp:86
+#: mounthelper/tdeio_media_mounthelper.cpp:87
msgid "%1 is not a mountable media."
msgstr "%1 ni priklopljiv medij."
@@ -421,39 +427,47 @@ msgstr "%1 ni priklopljiv medij."
#: mounthelper/tdeio_media_mounthelper.cpp:107
#, fuzzy
-msgid "%1 is already decrypted."
+msgid "%1 is already unlocked."
msgstr "Naprava je že priklopljena."
-#: mounthelper/tdeio_media_mounthelper.cpp:228
+#: mounthelper/tdeio_media_mounthelper.cpp:139
+msgid "Unknown unmount error."
+msgstr ""
+
+#: mounthelper/tdeio_media_mounthelper.cpp:246
msgid "The device was successfully unmounted, but the tray could not be opened"
msgstr "Naprava je bila uspešno odklopljena, a pladnja ni bilo moč odpreti"
-#: mounthelper/tdeio_media_mounthelper.cpp:230
+#: 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:275
+#: mounthelper/tdeio_media_mounthelper.cpp:281
+msgid "Unknown decrypt error."
+msgstr ""
+
+#: mounthelper/tdeio_media_mounthelper.cpp:295
#, fuzzy
msgid "Decrypt given URL"
msgstr "Odklopi podan URL"
-#: mounthelper/tdeio_media_mounthelper.cpp:276
+#: mounthelper/tdeio_media_mounthelper.cpp:296
msgid "Unmount given URL"
msgstr "Odklopi podan URL"
-#: mounthelper/tdeio_media_mounthelper.cpp:277
+#: mounthelper/tdeio_media_mounthelper.cpp:297
msgid "Mount given URL (default)"
msgstr "Priklopi podan URL (privzeto)"
-#: mounthelper/tdeio_media_mounthelper.cpp:278
+#: mounthelper/tdeio_media_mounthelper.cpp:298
msgid "Eject given URL via tdeeject"
msgstr "Izvrzi podan URL preko tdeeject"
-#: mounthelper/tdeio_media_mounthelper.cpp:279
+#: mounthelper/tdeio_media_mounthelper.cpp:299
msgid "Unmount and Eject given URL (necessary for some USB devices)"
msgstr "Odklopi in izvrzi podan URL (potrebno za nekatere naprave USB)"
-#: mounthelper/tdeio_media_mounthelper.cpp:280
+#: mounthelper/tdeio_media_mounthelper.cpp:300
msgid "media:/ URL to mount/unmount/eject/remove"
msgstr "URL media:/ za priklop/odklop/izvrzitev/odstranitev"
@@ -474,43 +488,43 @@ msgstr "Shranjevanje sprememb je spodletelo"
msgid "&Mounting"
msgstr "Pri&klapljanje"
-#: tdefile-plugin/tdefilemediaplugin.cpp:190
+#: tdefile-plugin/tdefilemediaplugin.cpp:184
msgid "Medium Information"
msgstr "Podatki o nosilcu"
-#: tdefile-plugin/tdefilemediaplugin.cpp:193
+#: tdefile-plugin/tdefilemediaplugin.cpp:187
msgid "Free"
msgstr "Prosto"
-#: tdefile-plugin/tdefilemediaplugin.cpp:196
+#: tdefile-plugin/tdefilemediaplugin.cpp:190
msgid "Used"
msgstr "Uporabljeno"
-#: tdefile-plugin/tdefilemediaplugin.cpp:199
+#: tdefile-plugin/tdefilemediaplugin.cpp:193
msgid "Total"
msgstr "Skupno"
-#: tdefile-plugin/tdefilemediaplugin.cpp:202
+#: tdefile-plugin/tdefilemediaplugin.cpp:196
msgid "Base URL"
msgstr "Osnovni URL"
-#: tdefile-plugin/tdefilemediaplugin.cpp:203
+#: tdefile-plugin/tdefilemediaplugin.cpp:197
msgid "Mount Point"
msgstr "Točka priklopa"
-#: tdefile-plugin/tdefilemediaplugin.cpp:204
+#: tdefile-plugin/tdefilemediaplugin.cpp:198
msgid "Device Node"
msgstr "Vozlišče naprave"
-#: tdefile-plugin/tdefilemediaplugin.cpp:206
+#: tdefile-plugin/tdefilemediaplugin.cpp:200
msgid "Medium Summary"
msgstr "Povzetek nosilca"
-#: tdefile-plugin/tdefilemediaplugin.cpp:208
+#: tdefile-plugin/tdefilemediaplugin.cpp:202
msgid "Usage"
msgstr "Uporaba"
-#: tdefile-plugin/tdefilemediaplugin.cpp:210
+#: tdefile-plugin/tdefilemediaplugin.cpp:204
msgid "Bar Graph"
msgstr "Stolpični graf"
@@ -582,23 +596,30 @@ msgid ""
"devices are plugged in."
msgstr ""
-#: mediamanager/decryptdialog.ui:24 mounthelper/decryptdialog.ui:24
+#: mediamanager/unlockdialog.ui:24 mounthelper/unlockdialog.ui:24
#, no-c-format
msgid "Decrypting Storage Device"
msgstr ""
-#: mediamanager/decryptdialog.ui:109 mounthelper/decryptdialog.ui:109
+#: mediamanager/unlockdialog.ui:109
#, no-c-format
msgid ""
-"<p><b>%1</b> is an encrypted storage device.</p>\n"
-"<p>Please enter the password to decrypt the storage device.</p>"
+"<p><b>%1</b> is an encrypted locked storage device.</p>\n"
+"<p>Please enter the password to unlock the storage device.</p>"
msgstr ""
-#: mediamanager/decryptdialog.ui:131 mounthelper/decryptdialog.ui:131
+#: mediamanager/unlockdialog.ui:131 mounthelper/unlockdialog.ui:131
#, no-c-format
msgid "&Password:"
msgstr ""
+#: mounthelper/unlockdialog.ui:109
+#, no-c-format
+msgid ""
+"<p><b>%1</b> is an encrypted storage device.</p>\n"
+"<p>Please enter the password to decrypt the storage device.</p>"
+msgstr ""
+
#: propsdlgplugin/propertiespagegui.ui:16
#, no-c-format
msgid "PropertiesPageGUI"
@@ -862,3 +883,7 @@ msgstr "Mešano"
#, no-c-format
msgid "Filesystem: iso9660"
msgstr "Datotečni sistem: iso9660"
+
+#, 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 e7a24d74c8d..3ce4e7d25aa 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: 2019-01-13 18:47+0100\n"
+"POT-Creation-Date: 2019-07-11 02:33+0200\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"
@@ -45,7 +45,6 @@ msgstr "Непознато"
#: mediaimpl.cpp:88 mediaimpl.cpp:115 mediaimpl.cpp:141 mediaimpl.cpp:177
#: mediaimpl.cpp:197 mediaimpl.cpp:218
#: mounthelper/tdeio_media_mounthelper.cpp:50
-#: mounthelper/tdeio_media_mounthelper.cpp:256
msgid "The TDE mediamanager is not running."
msgstr "TDE-ов менаџер медијума није покренут."
@@ -53,7 +52,7 @@ msgstr "TDE-ов менаџер медијума није покренут."
msgid "This media name already exists."
msgstr "Ово име медијума већ постоји."
-#: mediaimpl.cpp:230 mediaimpl.cpp:293
+#: mediaimpl.cpp:230 mediaimpl.cpp:297
msgid "No such medium."
msgstr "Нема таквог медијума."
@@ -61,110 +60,114 @@ msgstr "Нема таквог медијума."
msgid "The drive is encrypted."
msgstr ""
-#: mediaimpl.cpp:272 mediamanager/halbackend.cpp:1264
-#: mediamanager/halbackend.cpp:1273 mediamanager/halbackend.cpp:1663
-#: mediamanager/halbackend.cpp:1680 mediamanager/halbackend.cpp:1691
-#: mediamanager/halbackend.cpp:1793 mediamanager/halbackend.cpp:1801
-#: mediamanager/halbackend.cpp:1808 mediamanager/halbackend.cpp:1848
-#: mediamanager/halbackend.cpp:1854 mediamanager/halbackend.cpp:1861
-#: mounthelper/tdeio_media_mounthelper.cpp:58
-msgid "Internal Error"
-msgstr "Унутрашња грешка"
+#: mediaimpl.cpp:274 mediamanager/tdehardwarebackend.cpp:201
+#: mediamanager/tdehardwarebackend.cpp:252
+#: mounthelper/tdeio_media_mounthelper.cpp:202
+msgid "Unknown mount error."
+msgstr ""
#: mediamanager/dialog.cpp:26 mounthelper/dialog.cpp:26
-msgid "Decrypt"
+msgid "Unlock"
msgstr ""
-#: mediamanager/fstabbackend.cpp:104 mediamanager/fstabbackend.cpp:114
-#: mediamanager/halbackend.cpp:1595 mediamanager/halbackend.cpp:1617
-#: mediamanager/halbackend.cpp:1776 mediamanager/halbackend.cpp:1831
-#: mediamanager/tdehardwarebackend.cpp:1349
-#: mediamanager/tdehardwarebackend.cpp:1360
+#: mediamanager/fstabbackend.cpp:105 mediamanager/fstabbackend.cpp:120
+#: mediamanager/halbackend.cpp:1598 mediamanager/halbackend.cpp:1625
+#: mediamanager/halbackend.cpp:1808 mediamanager/halbackend.cpp:1877
+#: mediamanager/mediamanager.cpp:363 mediamanager/mediamanager.cpp:375
+#: mediamanager/mediamanager.cpp:387 mediamanager/mediamanager.cpp:399
+#: mediamanager/tdehardwarebackend.cpp:1363
+#: mediamanager/tdehardwarebackend.cpp:1378
#, c-format
msgid "No such medium: %1"
msgstr "Нема таквог медијума: %1"
-#: mediamanager/fstabbackend.cpp:398
+#: mediamanager/fstabbackend.cpp:408
msgid "CD Recorder"
msgstr "CD резач"
-#: mediamanager/fstabbackend.cpp:404
+#: mediamanager/fstabbackend.cpp:414
msgid "DVD"
msgstr "DVD"
-#: mediamanager/fstabbackend.cpp:415
+#: mediamanager/fstabbackend.cpp:425
msgid "CD-ROM"
msgstr "CD-ROM"
-#: mediamanager/fstabbackend.cpp:428
+#: mediamanager/fstabbackend.cpp:438
msgid "Floppy"
msgstr "Дискета"
-#: mediamanager/fstabbackend.cpp:436
+#: mediamanager/fstabbackend.cpp:446
msgid "Zip Disk"
msgstr "ZIP дискета"
-#: mediamanager/fstabbackend.cpp:447
+#: mediamanager/fstabbackend.cpp:457
msgid "Removable Device"
msgstr "Уклоњиви уређај"
-#: mediamanager/fstabbackend.cpp:452 mediamanager/fstabbackend.cpp:458
+#: mediamanager/fstabbackend.cpp:462 mediamanager/fstabbackend.cpp:468
msgid "Remote Share"
msgstr "Удаљено дељење"
-#: mediamanager/fstabbackend.cpp:463
+#: mediamanager/fstabbackend.cpp:473
msgid "Hard Disk"
msgstr "Хард диск"
-#: mediamanager/halbackend.cpp:749 mediamanager/tdehardwarebackend.cpp:805
+#: mediamanager/halbackend.cpp:744 mediamanager/tdehardwarebackend.cpp:808
msgid "Unknown Drive"
msgstr "Непознат уређај"
-#: mediamanager/halbackend.cpp:761 mediamanager/tdehardwarebackend.cpp:835
+#: mediamanager/halbackend.cpp:756 mediamanager/tdehardwarebackend.cpp:838
msgid "Floppy Drive"
msgstr "Дискетни уређај"
-#: mediamanager/halbackend.cpp:769
+#: mediamanager/halbackend.cpp:764
msgid "Zip Drive"
msgstr "ZIP уређај"
-#: mediamanager/halbackend.cpp:839 mediamanager/tdehardwarebackend.cpp:892
+#: mediamanager/halbackend.cpp:834 mediamanager/tdehardwarebackend.cpp:895
msgid "Camera"
msgstr "Камера"
-#: mediamanager/halbackend.cpp:1221 mediamanager/halbackend.cpp:1247
+#: mediamanager/halbackend.cpp:1216 mediamanager/halbackend.cpp:1242
msgid "Authenticate"
msgstr ""
-#: mediamanager/halbackend.cpp:1222
+#: mediamanager/halbackend.cpp:1217
msgid ""
"<big><b>System policy prevents mounting internal media</b></big><br/"
">Authentication is required to perform this action. Please enter your "
"password to verify."
msgstr ""
-#: mediamanager/halbackend.cpp:1248
+#: mediamanager/halbackend.cpp:1243
msgid ""
"<big><b>System policy prevents unmounting media mounted by other users</b></"
"big><br/>Authentication is required to perform this action. Please enter "
"your password to verify."
msgstr ""
-#: mediamanager/halbackend.cpp:1284
+#: mediamanager/halbackend.cpp:1259 mediamanager/halbackend.cpp:1268
+#: mediamanager/halbackend.cpp:1849 mediamanager/halbackend.cpp:1916
+#: mounthelper/tdeio_media_mounthelper.cpp:58
+msgid "Internal Error"
+msgstr "Унутрашња грешка"
+
+#: mediamanager/halbackend.cpp:1279
msgid "Invalid filesystem type"
msgstr "Неисправан тип система фајлова"
-#: mediamanager/halbackend.cpp:1286
+#: mediamanager/halbackend.cpp:1281
msgid ""
"Permission denied<p>Please ensure that:<br>1. You have permission to access "
"this device.<br>2. This device node is not listed in /etc/fstab.</p>"
msgstr ""
-#: mediamanager/halbackend.cpp:1290
+#: mediamanager/halbackend.cpp:1285
msgid "Device is already mounted."
msgstr "Уређај је већ монтиран."
-#: mediamanager/halbackend.cpp:1340
+#: mediamanager/halbackend.cpp:1335
msgid ""
"Moreover, programs still using the device have been detected. They are "
"listed below. You have to close them or change their working directory "
@@ -174,16 +177,16 @@ msgstr ""
"су доле. Морате их затворити или им променити радне фасцикле пре него што "
"поново покушате да демонтирате уређај."
-#: mediamanager/halbackend.cpp:1381 mediamanager/tdehardwarebackend.cpp:1588
+#: mediamanager/halbackend.cpp:1376 mediamanager/tdehardwarebackend.cpp:1618
msgid ""
"Programs that were still using the device have been forcibly terminated. "
"They are listed below."
msgstr ""
-#: mediamanager/halbackend.cpp:1402 mediamanager/halbackend.cpp:1715
-#: mediamanager/tdehardwarebackend.cpp:1406
-#: mediamanager/tdehardwarebackend.cpp:1424
-#: mediamanager/tdehardwarebackend.cpp:1464
+#: mediamanager/halbackend.cpp:1397 mediamanager/halbackend.cpp:1742
+#: mediamanager/tdehardwarebackend.cpp:1430
+#: mediamanager/tdehardwarebackend.cpp:1452
+#: mediamanager/tdehardwarebackend.cpp:1494
msgid ""
"Unfortunately, the device <b>%1</b> (%2) named <b>'%3'</b> and currently "
"mounted at <b>%4</b> could not be unmounted. "
@@ -191,196 +194,199 @@ msgstr ""
"Нажалост, уређај <b>%1</b> (%2) по имену <b>„%3“</b> и тренутно монтиран на "
"<b>%4</b>, не може да се демонтира. "
-#: mediamanager/halbackend.cpp:1408 mediamanager/tdehardwarebackend.cpp:1470
+#: mediamanager/halbackend.cpp:1403 mediamanager/tdehardwarebackend.cpp:1500
msgid "The following error was returned by umount command:"
msgstr "Наредба umount је вратила следећу грешку:"
-#: mediamanager/halbackend.cpp:1478
+#: mediamanager/halbackend.cpp:1567 mediamanager/tdehardwarebackend.cpp:1322
+msgid "Cannot mount encrypted locked drives!"
+msgstr ""
+
+#: mediamanager/halbackend.cpp:1682 mediamanager/halbackend.cpp:1703
+#: mediamanager/halbackend.cpp:1716 mediamanager/halbackend.cpp:1830
+#: mediamanager/halbackend.cpp:1840 mediamanager/halbackend.cpp:1899
+#: mediamanager/halbackend.cpp:1907
#, fuzzy
-msgid "Permission denied"
-msgstr "Овлашћења одбијена"
+msgid "Internal error"
+msgstr "Унутрашња грешка"
-#: mediamanager/halbackend.cpp:1562 mediamanager/tdehardwarebackend.cpp:1232
-msgid "Cannot mount encrypted drives!"
-msgstr ""
+#: mediamanager/halbackend.cpp:1694
+#, fuzzy
+#| msgid "Unknown"
+msgid "Unknown error"
+msgstr "Непознато"
-#: mediamanager/halbackend.cpp:1721
+#: mediamanager/halbackend.cpp:1748
msgid "Unmounting failed due to the following error:"
msgstr "Демонтирање није успело услед следеће грешке:"
-#: mediamanager/halbackend.cpp:1723
+#: mediamanager/halbackend.cpp:1750
msgid "Device is Busy:"
msgstr "Уређај је заузет:"
-#: mediamanager/halbackend.cpp:1727
+#: mediamanager/halbackend.cpp:1754
msgid ""
"Permission denied<p>Please ensure that:<br>1. You have permission to access "
"this device.<br>2. This device was originally mounted using TDE.</p>"
msgstr ""
-#: mediamanager/halbackend.cpp:1739
+#: mediamanager/halbackend.cpp:1766
msgid ""
"%1<p><b>Would you like to forcibly terminate these processes?</b><br><i>All "
"unsaved data would be lost</i>"
msgstr ""
-#: mediamanager/halbackend.cpp:1811
+#: mediamanager/halbackend.cpp:1852
msgid "Wrong password"
msgstr ""
-#: mediamanager/mediamanager.cpp:247 mediamanager/mediamanager.cpp:266
-#: mediamanager/mediamanager.cpp:285 mediamanager/mediamanager.cpp:293
-#: mediamanager/mediamanager.cpp:302 mediamanager/mediamanager.cpp:310
-msgid "Feature only available with HAL"
-msgstr "Могућност доступна само уз HAL"
-
-#: mediamanager/mediamanager.cpp:252
+#: mediamanager/mediamanager.cpp:248 mediamanager/mediamanager.cpp:275
#, fuzzy
msgid "Feature only available with the TDE hardware backend"
msgstr "Могућност доступна само уз HAL"
-#: mediamanager/mediamanager.cpp:256 mediamanager/mediamanager.cpp:271
-#: mediamanager/mediamanager.cpp:275
+#: mediamanager/mediamanager.cpp:255 mediamanager/mediamanager.cpp:282
+#: mediamanager/mediamanager.cpp:312 mediamanager/mediamanager.cpp:343
+msgid "Feature only available with HAL"
+msgstr "Могућност доступна само уз HAL"
+
+#: mediamanager/mediamanager.cpp:262 mediamanager/mediamanager.cpp:289
+#: mediamanager/mediamanager.cpp:320 mediamanager/mediamanager.cpp:350
#, fuzzy
msgid "Feature only available with HAL or TDE hardware backend"
msgstr "Могућност доступна само уз HAL"
-#: mediamanager/tdehardwarebackend.cpp:480
-#: mediamanager/tdehardwarebackend.cpp:517
-#: mediamanager/tdehardwarebackend.cpp:750
+#: mediamanager/tdehardwarebackend.cpp:483
+#: mediamanager/tdehardwarebackend.cpp:520
+#: mediamanager/tdehardwarebackend.cpp:753
#, fuzzy
msgid "%1 Removable Device"
msgstr "Уклоњиви уређај"
-#: mediamanager/tdehardwarebackend.cpp:525
+#: mediamanager/tdehardwarebackend.cpp:528
#, fuzzy
msgid "Blank CD-ROM"
msgstr "CD-ROM"
-#: mediamanager/tdehardwarebackend.cpp:534
+#: mediamanager/tdehardwarebackend.cpp:537
msgid "Blank CD-R"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:543
+#: mediamanager/tdehardwarebackend.cpp:546
msgid "Blank CD-RW"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:552
+#: mediamanager/tdehardwarebackend.cpp:555
msgid "Blank Magneto-Optical CD"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:561
+#: mediamanager/tdehardwarebackend.cpp:564
msgid "Blank Mount Ranier CD-RW"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:570
+#: mediamanager/tdehardwarebackend.cpp:573
msgid "Blank Mount Ranier CD-RW-W"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:579
+#: mediamanager/tdehardwarebackend.cpp:582
msgid "Blank DVD-ROM"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:588
+#: mediamanager/tdehardwarebackend.cpp:591
msgid "Blank DVD-RAM"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:597
+#: mediamanager/tdehardwarebackend.cpp:600
msgid "Blank DVD-R"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:606
+#: mediamanager/tdehardwarebackend.cpp:609
msgid "Blank DVD-RW"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:615
+#: mediamanager/tdehardwarebackend.cpp:618
msgid "Blank Dual Layer DVD-R"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:624
+#: mediamanager/tdehardwarebackend.cpp:627
msgid "Blank Dual Layer DVD-RW"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:633
+#: mediamanager/tdehardwarebackend.cpp:636
msgid "Blank DVD+R"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:642
+#: mediamanager/tdehardwarebackend.cpp:645
msgid "Blank DVD+RW"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:651
+#: mediamanager/tdehardwarebackend.cpp:654
msgid "Blank Dual Layer DVD+R"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:660
+#: mediamanager/tdehardwarebackend.cpp:663
msgid "Blank Dual Layer DVD+RW"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:669
+#: mediamanager/tdehardwarebackend.cpp:672
msgid "Blank BD-ROM"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:678
+#: mediamanager/tdehardwarebackend.cpp:681
msgid "Blank BD-R"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:687
+#: mediamanager/tdehardwarebackend.cpp:690
msgid "Blank BD-RW"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:696
+#: mediamanager/tdehardwarebackend.cpp:699
msgid "Blank HDDVD-ROM"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:705
+#: mediamanager/tdehardwarebackend.cpp:708
msgid "Blank HDDVD-R"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:714
+#: mediamanager/tdehardwarebackend.cpp:717
msgid "Blank HDDVD-RW"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:721
+#: mediamanager/tdehardwarebackend.cpp:724
msgid "Audio CD"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:742
+#: mediamanager/tdehardwarebackend.cpp:745
msgid "%1 Fixed Disk (%2)"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:849
+#: mediamanager/tdehardwarebackend.cpp:852
#, fuzzy
msgid "%1 Zip Disk"
msgstr "ZIP дискета"
-#: mediamanager/tdehardwarebackend.cpp:1212
-#: mediamanager/tdehardwarebackend.cpp:1392
-#, fuzzy
-msgid "Internal error"
-msgstr "Унутрашња грешка"
+#: mediamanager/tdehardwarebackend.cpp:1224
+#: mediamanager/tdehardwarebackend.cpp:1417
+msgid "Internal error. Couldn't find medium."
+msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:1239
-msgid ""
-"<qt>Unable to mount this device.<p>Potential reasons include:<br>Improper "
-"device and/or user privilege level<br>Corrupt data on storage device"
+#: mediamanager/tdehardwarebackend.cpp:1249
+#: mediamanager/tdehardwarebackend.cpp:1323
+msgid "Unable to mount this device."
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:1241
-#: mediamanager/tdehardwarebackend.cpp:1316
-#: mediamanager/tdehardwarebackend.cpp:1408
-#: mediamanager/tdehardwarebackend.cpp:1426
+#: mediamanager/tdehardwarebackend.cpp:1252
+#: mediamanager/tdehardwarebackend.cpp:1326
+#: mediamanager/tdehardwarebackend.cpp:1435
+#: mediamanager/tdehardwarebackend.cpp:1457
msgid "<p>Technical details:<br>"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:1314
-msgid ""
-"<qt>Unable to mount this device.<p>Potential reasons include:<br>Improper "
-"device and/or user privilege level<br>Corrupt data on storage "
-"device<br>Incorrect encryption password"
+#: mediamanager/tdehardwarebackend.cpp:1284
+msgid "Decryption aborted"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:1420
+#: mediamanager/tdehardwarebackend.cpp:1443
msgid ""
"<qt>The device <b>%1</b> (%2) named <b>'%3'</b> and currently mounted at <b>"
"%4</b> can not be unmounted at this time.<p>%5<p><b>Would you like to "
@@ -388,7 +394,7 @@ msgid ""
"lost</i>"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:1547
+#: mediamanager/tdehardwarebackend.cpp:1577
#, fuzzy
msgid ""
"Programs still using the device have been detected. They are listed below. "
@@ -403,7 +409,7 @@ msgstr ""
msgid "%1 cannot be found."
msgstr "%1 се не може наћи."
-#: mounthelper/tdeio_media_mounthelper.cpp:86
+#: mounthelper/tdeio_media_mounthelper.cpp:87
msgid "%1 is not a mountable media."
msgstr "%1 није медијум који се може монтирати."
@@ -414,39 +420,47 @@ msgstr "%1 није медијум који се може монтирати."
#: mounthelper/tdeio_media_mounthelper.cpp:107
#, fuzzy
-msgid "%1 is already decrypted."
+msgid "%1 is already unlocked."
msgstr "Уређај је већ монтиран."
-#: mounthelper/tdeio_media_mounthelper.cpp:228
+#: mounthelper/tdeio_media_mounthelper.cpp:139
+msgid "Unknown unmount error."
+msgstr ""
+
+#: mounthelper/tdeio_media_mounthelper.cpp:246
msgid "The device was successfully unmounted, but the tray could not be opened"
msgstr "Уређај је успешно демонтиран, али фиока није могла да се отвори"
-#: mounthelper/tdeio_media_mounthelper.cpp:230
+#: mounthelper/tdeio_media_mounthelper.cpp:248
msgid "The device was successfully unmounted, but could not be ejected"
msgstr "Уређај је успешно демонтиран, али није могао да се избаци"
-#: mounthelper/tdeio_media_mounthelper.cpp:275
+#: mounthelper/tdeio_media_mounthelper.cpp:281
+msgid "Unknown decrypt error."
+msgstr ""
+
+#: mounthelper/tdeio_media_mounthelper.cpp:295
#, fuzzy
msgid "Decrypt given URL"
msgstr "Демонтирај дати URL"
-#: mounthelper/tdeio_media_mounthelper.cpp:276
+#: mounthelper/tdeio_media_mounthelper.cpp:296
msgid "Unmount given URL"
msgstr "Демонтирај дати URL"
-#: mounthelper/tdeio_media_mounthelper.cpp:277
+#: mounthelper/tdeio_media_mounthelper.cpp:297
msgid "Mount given URL (default)"
msgstr "Монтирај дати URL (подразумевано)"
-#: mounthelper/tdeio_media_mounthelper.cpp:278
+#: mounthelper/tdeio_media_mounthelper.cpp:298
msgid "Eject given URL via tdeeject"
msgstr "Избаци дати URL помоћу tdeeject"
-#: mounthelper/tdeio_media_mounthelper.cpp:279
+#: mounthelper/tdeio_media_mounthelper.cpp:299
msgid "Unmount and Eject given URL (necessary for some USB devices)"
msgstr "Демонтирај и избаци дати URL (неопходно за неке USB уређаје)"
-#: mounthelper/tdeio_media_mounthelper.cpp:280
+#: mounthelper/tdeio_media_mounthelper.cpp:300
msgid "media:/ URL to mount/unmount/eject/remove"
msgstr "media:/ URL за монтирање/демонтирање/избацивање/уклањање"
@@ -467,43 +481,43 @@ msgstr "Снимање измена није успело"
msgid "&Mounting"
msgstr "&Монтирање"
-#: tdefile-plugin/tdefilemediaplugin.cpp:190
+#: tdefile-plugin/tdefilemediaplugin.cpp:184
msgid "Medium Information"
msgstr "Информације о медијуму"
-#: tdefile-plugin/tdefilemediaplugin.cpp:193
+#: tdefile-plugin/tdefilemediaplugin.cpp:187
msgid "Free"
msgstr "Слободно"
-#: tdefile-plugin/tdefilemediaplugin.cpp:196
+#: tdefile-plugin/tdefilemediaplugin.cpp:190
msgid "Used"
msgstr "Заузето"
-#: tdefile-plugin/tdefilemediaplugin.cpp:199
+#: tdefile-plugin/tdefilemediaplugin.cpp:193
msgid "Total"
msgstr "Укупно"
-#: tdefile-plugin/tdefilemediaplugin.cpp:202
+#: tdefile-plugin/tdefilemediaplugin.cpp:196
msgid "Base URL"
msgstr "Основни URL"
-#: tdefile-plugin/tdefilemediaplugin.cpp:203
+#: tdefile-plugin/tdefilemediaplugin.cpp:197
msgid "Mount Point"
msgstr "Тачка монтирања"
-#: tdefile-plugin/tdefilemediaplugin.cpp:204
+#: tdefile-plugin/tdefilemediaplugin.cpp:198
msgid "Device Node"
msgstr "Чвор уређаја"
-#: tdefile-plugin/tdefilemediaplugin.cpp:206
+#: tdefile-plugin/tdefilemediaplugin.cpp:200
msgid "Medium Summary"
msgstr "Медијум укратко"
-#: tdefile-plugin/tdefilemediaplugin.cpp:208
+#: tdefile-plugin/tdefilemediaplugin.cpp:202
msgid "Usage"
msgstr "Искоришћење"
-#: tdefile-plugin/tdefilemediaplugin.cpp:210
+#: tdefile-plugin/tdefilemediaplugin.cpp:204
msgid "Bar Graph"
msgstr "Тракасти графикон"
@@ -575,23 +589,30 @@ msgid ""
"devices are plugged in."
msgstr ""
-#: mediamanager/decryptdialog.ui:24 mounthelper/decryptdialog.ui:24
+#: mediamanager/unlockdialog.ui:24 mounthelper/unlockdialog.ui:24
#, no-c-format
msgid "Decrypting Storage Device"
msgstr ""
-#: mediamanager/decryptdialog.ui:109 mounthelper/decryptdialog.ui:109
+#: mediamanager/unlockdialog.ui:109
#, no-c-format
msgid ""
-"<p><b>%1</b> is an encrypted storage device.</p>\n"
-"<p>Please enter the password to decrypt the storage device.</p>"
+"<p><b>%1</b> is an encrypted locked storage device.</p>\n"
+"<p>Please enter the password to unlock the storage device.</p>"
msgstr ""
-#: mediamanager/decryptdialog.ui:131 mounthelper/decryptdialog.ui:131
+#: mediamanager/unlockdialog.ui:131 mounthelper/unlockdialog.ui:131
#, no-c-format
msgid "&Password:"
msgstr ""
+#: mounthelper/unlockdialog.ui:109
+#, no-c-format
+msgid ""
+"<p><b>%1</b> is an encrypted storage device.</p>\n"
+"<p>Please enter the password to decrypt the storage device.</p>"
+msgstr ""
+
#: propsdlgplugin/propertiespagegui.ui:16
#, no-c-format
msgid "PropertiesPageGUI"
@@ -853,3 +874,7 @@ msgstr "Мешано"
#, no-c-format
msgid "Filesystem: iso9660"
msgstr "Систем фајлова: iso9660"
+
+#, 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 6057a03eced..5bd4ea7f137 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: 2019-01-13 18:47+0100\n"
+"POT-Creation-Date: 2019-07-11 02:33+0200\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"
@@ -45,7 +45,6 @@ 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
-#: mounthelper/tdeio_media_mounthelper.cpp:256
msgid "The TDE mediamanager is not running."
msgstr "TDE-ov menadžer medijuma nije pokrenut."
@@ -53,7 +52,7 @@ msgstr "TDE-ov menadžer medijuma nije pokrenut."
msgid "This media name already exists."
msgstr "Ovo ime medijuma već postoji."
-#: mediaimpl.cpp:230 mediaimpl.cpp:293
+#: mediaimpl.cpp:230 mediaimpl.cpp:297
msgid "No such medium."
msgstr "Nema takvog medijuma."
@@ -61,110 +60,114 @@ msgstr "Nema takvog medijuma."
msgid "The drive is encrypted."
msgstr ""
-#: mediaimpl.cpp:272 mediamanager/halbackend.cpp:1264
-#: mediamanager/halbackend.cpp:1273 mediamanager/halbackend.cpp:1663
-#: mediamanager/halbackend.cpp:1680 mediamanager/halbackend.cpp:1691
-#: mediamanager/halbackend.cpp:1793 mediamanager/halbackend.cpp:1801
-#: mediamanager/halbackend.cpp:1808 mediamanager/halbackend.cpp:1848
-#: mediamanager/halbackend.cpp:1854 mediamanager/halbackend.cpp:1861
-#: mounthelper/tdeio_media_mounthelper.cpp:58
-msgid "Internal Error"
-msgstr "Unutrašnja greška"
+#: mediaimpl.cpp:274 mediamanager/tdehardwarebackend.cpp:201
+#: mediamanager/tdehardwarebackend.cpp:252
+#: mounthelper/tdeio_media_mounthelper.cpp:202
+msgid "Unknown mount error."
+msgstr ""
#: mediamanager/dialog.cpp:26 mounthelper/dialog.cpp:26
-msgid "Decrypt"
+msgid "Unlock"
msgstr ""
-#: mediamanager/fstabbackend.cpp:104 mediamanager/fstabbackend.cpp:114
-#: mediamanager/halbackend.cpp:1595 mediamanager/halbackend.cpp:1617
-#: mediamanager/halbackend.cpp:1776 mediamanager/halbackend.cpp:1831
-#: mediamanager/tdehardwarebackend.cpp:1349
-#: mediamanager/tdehardwarebackend.cpp:1360
+#: mediamanager/fstabbackend.cpp:105 mediamanager/fstabbackend.cpp:120
+#: mediamanager/halbackend.cpp:1598 mediamanager/halbackend.cpp:1625
+#: mediamanager/halbackend.cpp:1808 mediamanager/halbackend.cpp:1877
+#: mediamanager/mediamanager.cpp:363 mediamanager/mediamanager.cpp:375
+#: mediamanager/mediamanager.cpp:387 mediamanager/mediamanager.cpp:399
+#: mediamanager/tdehardwarebackend.cpp:1363
+#: mediamanager/tdehardwarebackend.cpp:1378
#, c-format
msgid "No such medium: %1"
msgstr "Nema takvog medijuma: %1"
-#: mediamanager/fstabbackend.cpp:398
+#: mediamanager/fstabbackend.cpp:408
msgid "CD Recorder"
msgstr "CD rezač"
-#: mediamanager/fstabbackend.cpp:404
+#: mediamanager/fstabbackend.cpp:414
msgid "DVD"
msgstr "DVD"
-#: mediamanager/fstabbackend.cpp:415
+#: mediamanager/fstabbackend.cpp:425
msgid "CD-ROM"
msgstr "CD-ROM"
-#: mediamanager/fstabbackend.cpp:428
+#: mediamanager/fstabbackend.cpp:438
msgid "Floppy"
msgstr "Disketa"
-#: mediamanager/fstabbackend.cpp:436
+#: mediamanager/fstabbackend.cpp:446
msgid "Zip Disk"
msgstr "ZIP disketa"
-#: mediamanager/fstabbackend.cpp:447
+#: mediamanager/fstabbackend.cpp:457
msgid "Removable Device"
msgstr "Uklonjivi uređaj"
-#: mediamanager/fstabbackend.cpp:452 mediamanager/fstabbackend.cpp:458
+#: mediamanager/fstabbackend.cpp:462 mediamanager/fstabbackend.cpp:468
msgid "Remote Share"
msgstr "Udaljeno deljenje"
-#: mediamanager/fstabbackend.cpp:463
+#: mediamanager/fstabbackend.cpp:473
msgid "Hard Disk"
msgstr "Hard disk"
-#: mediamanager/halbackend.cpp:749 mediamanager/tdehardwarebackend.cpp:805
+#: mediamanager/halbackend.cpp:744 mediamanager/tdehardwarebackend.cpp:808
msgid "Unknown Drive"
msgstr "Nepoznat uređaj"
-#: mediamanager/halbackend.cpp:761 mediamanager/tdehardwarebackend.cpp:835
+#: mediamanager/halbackend.cpp:756 mediamanager/tdehardwarebackend.cpp:838
msgid "Floppy Drive"
msgstr "Disketni uređaj"
-#: mediamanager/halbackend.cpp:769
+#: mediamanager/halbackend.cpp:764
msgid "Zip Drive"
msgstr "ZIP uređaj"
-#: mediamanager/halbackend.cpp:839 mediamanager/tdehardwarebackend.cpp:892
+#: mediamanager/halbackend.cpp:834 mediamanager/tdehardwarebackend.cpp:895
msgid "Camera"
msgstr "Kamera"
-#: mediamanager/halbackend.cpp:1221 mediamanager/halbackend.cpp:1247
+#: mediamanager/halbackend.cpp:1216 mediamanager/halbackend.cpp:1242
msgid "Authenticate"
msgstr ""
-#: mediamanager/halbackend.cpp:1222
+#: mediamanager/halbackend.cpp:1217
msgid ""
"<big><b>System policy prevents mounting internal media</b></big><br/"
">Authentication is required to perform this action. Please enter your "
"password to verify."
msgstr ""
-#: mediamanager/halbackend.cpp:1248
+#: mediamanager/halbackend.cpp:1243
msgid ""
"<big><b>System policy prevents unmounting media mounted by other users</b></"
"big><br/>Authentication is required to perform this action. Please enter "
"your password to verify."
msgstr ""
-#: mediamanager/halbackend.cpp:1284
+#: mediamanager/halbackend.cpp:1259 mediamanager/halbackend.cpp:1268
+#: mediamanager/halbackend.cpp:1849 mediamanager/halbackend.cpp:1916
+#: mounthelper/tdeio_media_mounthelper.cpp:58
+msgid "Internal Error"
+msgstr "Unutrašnja greška"
+
+#: mediamanager/halbackend.cpp:1279
msgid "Invalid filesystem type"
msgstr "Neispravan tip sistema fajlova"
-#: mediamanager/halbackend.cpp:1286
+#: mediamanager/halbackend.cpp:1281
msgid ""
"Permission denied<p>Please ensure that:<br>1. You have permission to access "
"this device.<br>2. This device node is not listed in /etc/fstab.</p>"
msgstr ""
-#: mediamanager/halbackend.cpp:1290
+#: mediamanager/halbackend.cpp:1285
msgid "Device is already mounted."
msgstr "Uređaj je već montiran."
-#: mediamanager/halbackend.cpp:1340
+#: mediamanager/halbackend.cpp:1335
msgid ""
"Moreover, programs still using the device have been detected. They are "
"listed below. You have to close them or change their working directory "
@@ -174,16 +177,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:1381 mediamanager/tdehardwarebackend.cpp:1588
+#: mediamanager/halbackend.cpp:1376 mediamanager/tdehardwarebackend.cpp:1618
msgid ""
"Programs that were still using the device have been forcibly terminated. "
"They are listed below."
msgstr ""
-#: mediamanager/halbackend.cpp:1402 mediamanager/halbackend.cpp:1715
-#: mediamanager/tdehardwarebackend.cpp:1406
-#: mediamanager/tdehardwarebackend.cpp:1424
-#: mediamanager/tdehardwarebackend.cpp:1464
+#: mediamanager/halbackend.cpp:1397 mediamanager/halbackend.cpp:1742
+#: mediamanager/tdehardwarebackend.cpp:1430
+#: mediamanager/tdehardwarebackend.cpp:1452
+#: mediamanager/tdehardwarebackend.cpp:1494
msgid ""
"Unfortunately, the device <b>%1</b> (%2) named <b>'%3'</b> and currently "
"mounted at <b>%4</b> could not be unmounted. "
@@ -191,196 +194,199 @@ 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:1408 mediamanager/tdehardwarebackend.cpp:1470
+#: mediamanager/halbackend.cpp:1403 mediamanager/tdehardwarebackend.cpp:1500
msgid "The following error was returned by umount command:"
msgstr "Naredba umount je vratila sledeću grešku:"
-#: mediamanager/halbackend.cpp:1478
+#: mediamanager/halbackend.cpp:1567 mediamanager/tdehardwarebackend.cpp:1322
+msgid "Cannot mount encrypted locked drives!"
+msgstr ""
+
+#: mediamanager/halbackend.cpp:1682 mediamanager/halbackend.cpp:1703
+#: mediamanager/halbackend.cpp:1716 mediamanager/halbackend.cpp:1830
+#: mediamanager/halbackend.cpp:1840 mediamanager/halbackend.cpp:1899
+#: mediamanager/halbackend.cpp:1907
#, fuzzy
-msgid "Permission denied"
-msgstr "Ovlašćenja odbijena"
+msgid "Internal error"
+msgstr "Unutrašnja greška"
-#: mediamanager/halbackend.cpp:1562 mediamanager/tdehardwarebackend.cpp:1232
-msgid "Cannot mount encrypted drives!"
-msgstr ""
+#: mediamanager/halbackend.cpp:1694
+#, fuzzy
+#| msgid "Unknown"
+msgid "Unknown error"
+msgstr "Nepoznato"
-#: mediamanager/halbackend.cpp:1721
+#: mediamanager/halbackend.cpp:1748
msgid "Unmounting failed due to the following error:"
msgstr "Demontiranje nije uspelo usled sledeće greške:"
-#: mediamanager/halbackend.cpp:1723
+#: mediamanager/halbackend.cpp:1750
msgid "Device is Busy:"
msgstr "Uređaj je zauzet:"
-#: mediamanager/halbackend.cpp:1727
+#: mediamanager/halbackend.cpp:1754
msgid ""
"Permission denied<p>Please ensure that:<br>1. You have permission to access "
"this device.<br>2. This device was originally mounted using TDE.</p>"
msgstr ""
-#: mediamanager/halbackend.cpp:1739
+#: mediamanager/halbackend.cpp:1766
msgid ""
"%1<p><b>Would you like to forcibly terminate these processes?</b><br><i>All "
"unsaved data would be lost</i>"
msgstr ""
-#: mediamanager/halbackend.cpp:1811
+#: mediamanager/halbackend.cpp:1852
msgid "Wrong password"
msgstr ""
-#: mediamanager/mediamanager.cpp:247 mediamanager/mediamanager.cpp:266
-#: mediamanager/mediamanager.cpp:285 mediamanager/mediamanager.cpp:293
-#: mediamanager/mediamanager.cpp:302 mediamanager/mediamanager.cpp:310
-msgid "Feature only available with HAL"
-msgstr "Mogućnost dostupna samo uz HAL"
-
-#: mediamanager/mediamanager.cpp:252
+#: mediamanager/mediamanager.cpp:248 mediamanager/mediamanager.cpp:275
#, fuzzy
msgid "Feature only available with the TDE hardware backend"
msgstr "Mogućnost dostupna samo uz HAL"
-#: mediamanager/mediamanager.cpp:256 mediamanager/mediamanager.cpp:271
-#: mediamanager/mediamanager.cpp:275
+#: mediamanager/mediamanager.cpp:255 mediamanager/mediamanager.cpp:282
+#: mediamanager/mediamanager.cpp:312 mediamanager/mediamanager.cpp:343
+msgid "Feature only available with HAL"
+msgstr "Mogućnost dostupna samo uz HAL"
+
+#: mediamanager/mediamanager.cpp:262 mediamanager/mediamanager.cpp:289
+#: mediamanager/mediamanager.cpp:320 mediamanager/mediamanager.cpp:350
#, fuzzy
msgid "Feature only available with HAL or TDE hardware backend"
msgstr "Mogućnost dostupna samo uz HAL"
-#: mediamanager/tdehardwarebackend.cpp:480
-#: mediamanager/tdehardwarebackend.cpp:517
-#: mediamanager/tdehardwarebackend.cpp:750
+#: mediamanager/tdehardwarebackend.cpp:483
+#: mediamanager/tdehardwarebackend.cpp:520
+#: mediamanager/tdehardwarebackend.cpp:753
#, fuzzy
msgid "%1 Removable Device"
msgstr "Uklonjivi uređaj"
-#: mediamanager/tdehardwarebackend.cpp:525
+#: mediamanager/tdehardwarebackend.cpp:528
#, fuzzy
msgid "Blank CD-ROM"
msgstr "CD-ROM"
-#: mediamanager/tdehardwarebackend.cpp:534
+#: mediamanager/tdehardwarebackend.cpp:537
msgid "Blank CD-R"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:543
+#: mediamanager/tdehardwarebackend.cpp:546
msgid "Blank CD-RW"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:552
+#: mediamanager/tdehardwarebackend.cpp:555
msgid "Blank Magneto-Optical CD"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:561
+#: mediamanager/tdehardwarebackend.cpp:564
msgid "Blank Mount Ranier CD-RW"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:570
+#: mediamanager/tdehardwarebackend.cpp:573
msgid "Blank Mount Ranier CD-RW-W"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:579
+#: mediamanager/tdehardwarebackend.cpp:582
msgid "Blank DVD-ROM"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:588
+#: mediamanager/tdehardwarebackend.cpp:591
msgid "Blank DVD-RAM"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:597
+#: mediamanager/tdehardwarebackend.cpp:600
msgid "Blank DVD-R"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:606
+#: mediamanager/tdehardwarebackend.cpp:609
msgid "Blank DVD-RW"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:615
+#: mediamanager/tdehardwarebackend.cpp:618
msgid "Blank Dual Layer DVD-R"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:624
+#: mediamanager/tdehardwarebackend.cpp:627
msgid "Blank Dual Layer DVD-RW"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:633
+#: mediamanager/tdehardwarebackend.cpp:636
msgid "Blank DVD+R"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:642
+#: mediamanager/tdehardwarebackend.cpp:645
msgid "Blank DVD+RW"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:651
+#: mediamanager/tdehardwarebackend.cpp:654
msgid "Blank Dual Layer DVD+R"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:660
+#: mediamanager/tdehardwarebackend.cpp:663
msgid "Blank Dual Layer DVD+RW"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:669
+#: mediamanager/tdehardwarebackend.cpp:672
msgid "Blank BD-ROM"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:678
+#: mediamanager/tdehardwarebackend.cpp:681
msgid "Blank BD-R"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:687
+#: mediamanager/tdehardwarebackend.cpp:690
msgid "Blank BD-RW"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:696
+#: mediamanager/tdehardwarebackend.cpp:699
msgid "Blank HDDVD-ROM"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:705
+#: mediamanager/tdehardwarebackend.cpp:708
msgid "Blank HDDVD-R"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:714
+#: mediamanager/tdehardwarebackend.cpp:717
msgid "Blank HDDVD-RW"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:721
+#: mediamanager/tdehardwarebackend.cpp:724
msgid "Audio CD"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:742
+#: mediamanager/tdehardwarebackend.cpp:745
msgid "%1 Fixed Disk (%2)"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:849
+#: mediamanager/tdehardwarebackend.cpp:852
#, fuzzy
msgid "%1 Zip Disk"
msgstr "ZIP disketa"
-#: mediamanager/tdehardwarebackend.cpp:1212
-#: mediamanager/tdehardwarebackend.cpp:1392
-#, fuzzy
-msgid "Internal error"
-msgstr "Unutrašnja greška"
+#: mediamanager/tdehardwarebackend.cpp:1224
+#: mediamanager/tdehardwarebackend.cpp:1417
+msgid "Internal error. Couldn't find medium."
+msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:1239
-msgid ""
-"<qt>Unable to mount this device.<p>Potential reasons include:<br>Improper "
-"device and/or user privilege level<br>Corrupt data on storage device"
+#: mediamanager/tdehardwarebackend.cpp:1249
+#: mediamanager/tdehardwarebackend.cpp:1323
+msgid "Unable to mount this device."
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:1241
-#: mediamanager/tdehardwarebackend.cpp:1316
-#: mediamanager/tdehardwarebackend.cpp:1408
-#: mediamanager/tdehardwarebackend.cpp:1426
+#: mediamanager/tdehardwarebackend.cpp:1252
+#: mediamanager/tdehardwarebackend.cpp:1326
+#: mediamanager/tdehardwarebackend.cpp:1435
+#: mediamanager/tdehardwarebackend.cpp:1457
msgid "<p>Technical details:<br>"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:1314
-msgid ""
-"<qt>Unable to mount this device.<p>Potential reasons include:<br>Improper "
-"device and/or user privilege level<br>Corrupt data on storage "
-"device<br>Incorrect encryption password"
+#: mediamanager/tdehardwarebackend.cpp:1284
+msgid "Decryption aborted"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:1420
+#: mediamanager/tdehardwarebackend.cpp:1443
msgid ""
"<qt>The device <b>%1</b> (%2) named <b>'%3'</b> and currently mounted at <b>"
"%4</b> can not be unmounted at this time.<p>%5<p><b>Would you like to "
@@ -388,7 +394,7 @@ msgid ""
"lost</i>"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:1547
+#: mediamanager/tdehardwarebackend.cpp:1577
#, fuzzy
msgid ""
"Programs still using the device have been detected. They are listed below. "
@@ -403,7 +409,7 @@ msgstr ""
msgid "%1 cannot be found."
msgstr "%1 se ne može naći."
-#: mounthelper/tdeio_media_mounthelper.cpp:86
+#: mounthelper/tdeio_media_mounthelper.cpp:87
msgid "%1 is not a mountable media."
msgstr "%1 nije medijum koji se može montirati."
@@ -414,39 +420,47 @@ msgstr "%1 nije medijum koji se može montirati."
#: mounthelper/tdeio_media_mounthelper.cpp:107
#, fuzzy
-msgid "%1 is already decrypted."
+msgid "%1 is already unlocked."
msgstr "Uređaj je već montiran."
-#: mounthelper/tdeio_media_mounthelper.cpp:228
+#: mounthelper/tdeio_media_mounthelper.cpp:139
+msgid "Unknown unmount error."
+msgstr ""
+
+#: mounthelper/tdeio_media_mounthelper.cpp:246
msgid "The device was successfully unmounted, but the tray could not be opened"
msgstr "Uređaj je uspešno demontiran, ali fioka nije mogla da se otvori"
-#: mounthelper/tdeio_media_mounthelper.cpp:230
+#: 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:275
+#: mounthelper/tdeio_media_mounthelper.cpp:281
+msgid "Unknown decrypt error."
+msgstr ""
+
+#: mounthelper/tdeio_media_mounthelper.cpp:295
#, fuzzy
msgid "Decrypt given URL"
msgstr "Demontiraj dati URL"
-#: mounthelper/tdeio_media_mounthelper.cpp:276
+#: mounthelper/tdeio_media_mounthelper.cpp:296
msgid "Unmount given URL"
msgstr "Demontiraj dati URL"
-#: mounthelper/tdeio_media_mounthelper.cpp:277
+#: mounthelper/tdeio_media_mounthelper.cpp:297
msgid "Mount given URL (default)"
msgstr "Montiraj dati URL (podrazumevano)"
-#: mounthelper/tdeio_media_mounthelper.cpp:278
+#: mounthelper/tdeio_media_mounthelper.cpp:298
msgid "Eject given URL via tdeeject"
msgstr "Izbaci dati URL pomoću tdeeject"
-#: mounthelper/tdeio_media_mounthelper.cpp:279
+#: mounthelper/tdeio_media_mounthelper.cpp:299
msgid "Unmount and Eject given URL (necessary for some USB devices)"
msgstr "Demontiraj i izbaci dati URL (neophodno za neke USB uređaje)"
-#: mounthelper/tdeio_media_mounthelper.cpp:280
+#: mounthelper/tdeio_media_mounthelper.cpp:300
msgid "media:/ URL to mount/unmount/eject/remove"
msgstr "media:/ URL za montiranje/demontiranje/izbacivanje/uklanjanje"
@@ -467,43 +481,43 @@ msgstr "Snimanje izmena nije uspelo"
msgid "&Mounting"
msgstr "&Montiranje"
-#: tdefile-plugin/tdefilemediaplugin.cpp:190
+#: tdefile-plugin/tdefilemediaplugin.cpp:184
msgid "Medium Information"
msgstr "Informacije o medijumu"
-#: tdefile-plugin/tdefilemediaplugin.cpp:193
+#: tdefile-plugin/tdefilemediaplugin.cpp:187
msgid "Free"
msgstr "Slobodno"
-#: tdefile-plugin/tdefilemediaplugin.cpp:196
+#: tdefile-plugin/tdefilemediaplugin.cpp:190
msgid "Used"
msgstr "Zauzeto"
-#: tdefile-plugin/tdefilemediaplugin.cpp:199
+#: tdefile-plugin/tdefilemediaplugin.cpp:193
msgid "Total"
msgstr "Ukupno"
-#: tdefile-plugin/tdefilemediaplugin.cpp:202
+#: tdefile-plugin/tdefilemediaplugin.cpp:196
msgid "Base URL"
msgstr "Osnovni URL"
-#: tdefile-plugin/tdefilemediaplugin.cpp:203
+#: tdefile-plugin/tdefilemediaplugin.cpp:197
msgid "Mount Point"
msgstr "Tačka montiranja"
-#: tdefile-plugin/tdefilemediaplugin.cpp:204
+#: tdefile-plugin/tdefilemediaplugin.cpp:198
msgid "Device Node"
msgstr "Čvor uređaja"
-#: tdefile-plugin/tdefilemediaplugin.cpp:206
+#: tdefile-plugin/tdefilemediaplugin.cpp:200
msgid "Medium Summary"
msgstr "Medijum ukratko"
-#: tdefile-plugin/tdefilemediaplugin.cpp:208
+#: tdefile-plugin/tdefilemediaplugin.cpp:202
msgid "Usage"
msgstr "Iskorišćenje"
-#: tdefile-plugin/tdefilemediaplugin.cpp:210
+#: tdefile-plugin/tdefilemediaplugin.cpp:204
msgid "Bar Graph"
msgstr "Trakasti grafikon"
@@ -575,23 +589,30 @@ msgid ""
"devices are plugged in."
msgstr ""
-#: mediamanager/decryptdialog.ui:24 mounthelper/decryptdialog.ui:24
+#: mediamanager/unlockdialog.ui:24 mounthelper/unlockdialog.ui:24
#, no-c-format
msgid "Decrypting Storage Device"
msgstr ""
-#: mediamanager/decryptdialog.ui:109 mounthelper/decryptdialog.ui:109
+#: mediamanager/unlockdialog.ui:109
#, no-c-format
msgid ""
-"<p><b>%1</b> is an encrypted storage device.</p>\n"
-"<p>Please enter the password to decrypt the storage device.</p>"
+"<p><b>%1</b> is an encrypted locked storage device.</p>\n"
+"<p>Please enter the password to unlock the storage device.</p>"
msgstr ""
-#: mediamanager/decryptdialog.ui:131 mounthelper/decryptdialog.ui:131
+#: mediamanager/unlockdialog.ui:131 mounthelper/unlockdialog.ui:131
#, no-c-format
msgid "&Password:"
msgstr ""
+#: mounthelper/unlockdialog.ui:109
+#, no-c-format
+msgid ""
+"<p><b>%1</b> is an encrypted storage device.</p>\n"
+"<p>Please enter the password to decrypt the storage device.</p>"
+msgstr ""
+
#: propsdlgplugin/propertiespagegui.ui:16
#, no-c-format
msgid "PropertiesPageGUI"
@@ -853,3 +874,7 @@ msgstr "Mešano"
#, no-c-format
msgid "Filesystem: iso9660"
msgstr "Sistem fajlova: iso9660"
+
+#, 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 b4edcca8014..8d313bf371e 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: 2019-01-13 18:47+0100\n"
+"POT-Creation-Date: 2019-07-11 02:33+0200\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"
@@ -46,7 +46,6 @@ 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
-#: mounthelper/tdeio_media_mounthelper.cpp:256
msgid "The TDE mediamanager is not running."
msgstr ""
@@ -54,7 +53,7 @@ msgstr ""
msgid "This media name already exists."
msgstr ""
-#: mediaimpl.cpp:230 mediaimpl.cpp:293
+#: mediaimpl.cpp:230 mediaimpl.cpp:297
msgid "No such medium."
msgstr ""
@@ -62,320 +61,328 @@ msgstr ""
msgid "The drive is encrypted."
msgstr ""
-#: mediaimpl.cpp:272 mediamanager/halbackend.cpp:1264
-#: mediamanager/halbackend.cpp:1273 mediamanager/halbackend.cpp:1663
-#: mediamanager/halbackend.cpp:1680 mediamanager/halbackend.cpp:1691
-#: mediamanager/halbackend.cpp:1793 mediamanager/halbackend.cpp:1801
-#: mediamanager/halbackend.cpp:1808 mediamanager/halbackend.cpp:1848
-#: mediamanager/halbackend.cpp:1854 mediamanager/halbackend.cpp:1861
-#: mounthelper/tdeio_media_mounthelper.cpp:58
-msgid "Internal Error"
+#: mediaimpl.cpp:274 mediamanager/tdehardwarebackend.cpp:201
+#: mediamanager/tdehardwarebackend.cpp:252
+#: mounthelper/tdeio_media_mounthelper.cpp:202
+msgid "Unknown mount error."
msgstr ""
#: mediamanager/dialog.cpp:26 mounthelper/dialog.cpp:26
-msgid "Decrypt"
+msgid "Unlock"
msgstr ""
-#: mediamanager/fstabbackend.cpp:104 mediamanager/fstabbackend.cpp:114
-#: mediamanager/halbackend.cpp:1595 mediamanager/halbackend.cpp:1617
-#: mediamanager/halbackend.cpp:1776 mediamanager/halbackend.cpp:1831
-#: mediamanager/tdehardwarebackend.cpp:1349
-#: mediamanager/tdehardwarebackend.cpp:1360
+#: mediamanager/fstabbackend.cpp:105 mediamanager/fstabbackend.cpp:120
+#: mediamanager/halbackend.cpp:1598 mediamanager/halbackend.cpp:1625
+#: mediamanager/halbackend.cpp:1808 mediamanager/halbackend.cpp:1877
+#: mediamanager/mediamanager.cpp:363 mediamanager/mediamanager.cpp:375
+#: mediamanager/mediamanager.cpp:387 mediamanager/mediamanager.cpp:399
+#: mediamanager/tdehardwarebackend.cpp:1363
+#: mediamanager/tdehardwarebackend.cpp:1378
#, c-format
msgid "No such medium: %1"
msgstr ""
-#: mediamanager/fstabbackend.cpp:398
+#: mediamanager/fstabbackend.cpp:408
msgid "CD Recorder"
msgstr "Sibhali sesma CD "
-#: mediamanager/fstabbackend.cpp:404
+#: mediamanager/fstabbackend.cpp:414
msgid "DVD"
msgstr ""
-#: mediamanager/fstabbackend.cpp:415
+#: mediamanager/fstabbackend.cpp:425
msgid "CD-ROM"
msgstr "CD-ROM"
-#: mediamanager/fstabbackend.cpp:428
+#: mediamanager/fstabbackend.cpp:438
msgid "Floppy"
msgstr "Floppy"
-#: mediamanager/fstabbackend.cpp:436
+#: mediamanager/fstabbackend.cpp:446
msgid "Zip Disk"
msgstr "I-diski ye zip "
-#: mediamanager/fstabbackend.cpp:447
+#: mediamanager/fstabbackend.cpp:457
msgid "Removable Device"
msgstr ""
-#: mediamanager/fstabbackend.cpp:452 mediamanager/fstabbackend.cpp:458
+#: mediamanager/fstabbackend.cpp:462 mediamanager/fstabbackend.cpp:468
msgid "Remote Share"
msgstr "Kwabelana lokubucalu"
-#: mediamanager/fstabbackend.cpp:463
+#: mediamanager/fstabbackend.cpp:473
#, fuzzy
msgid "Hard Disk"
msgstr "I-Diski-lecinile"
-#: mediamanager/halbackend.cpp:749 mediamanager/tdehardwarebackend.cpp:805
+#: mediamanager/halbackend.cpp:744 mediamanager/tdehardwarebackend.cpp:808
#, fuzzy
msgid "Unknown Drive"
msgstr "ngatiwa"
-#: mediamanager/halbackend.cpp:761 mediamanager/tdehardwarebackend.cpp:835
+#: mediamanager/halbackend.cpp:756 mediamanager/tdehardwarebackend.cpp:838
#, fuzzy
msgid "Floppy Drive"
msgstr "Floppy"
-#: mediamanager/halbackend.cpp:769
+#: mediamanager/halbackend.cpp:764
#, fuzzy
msgid "Zip Drive"
msgstr "I-diski ye zip "
-#: mediamanager/halbackend.cpp:839 mediamanager/tdehardwarebackend.cpp:892
+#: mediamanager/halbackend.cpp:834 mediamanager/tdehardwarebackend.cpp:895
msgid "Camera"
msgstr ""
-#: mediamanager/halbackend.cpp:1221 mediamanager/halbackend.cpp:1247
+#: mediamanager/halbackend.cpp:1216 mediamanager/halbackend.cpp:1242
msgid "Authenticate"
msgstr ""
-#: mediamanager/halbackend.cpp:1222
+#: mediamanager/halbackend.cpp:1217
msgid ""
"<big><b>System policy prevents mounting internal media</b></big><br/"
">Authentication is required to perform this action. Please enter your "
"password to verify."
msgstr ""
-#: mediamanager/halbackend.cpp:1248
+#: mediamanager/halbackend.cpp:1243
msgid ""
"<big><b>System policy prevents unmounting media mounted by other users</b></"
"big><br/>Authentication is required to perform this action. Please enter "
"your password to verify."
msgstr ""
-#: mediamanager/halbackend.cpp:1284
+#: mediamanager/halbackend.cpp:1259 mediamanager/halbackend.cpp:1268
+#: mediamanager/halbackend.cpp:1849 mediamanager/halbackend.cpp:1916
+#: mounthelper/tdeio_media_mounthelper.cpp:58
+msgid "Internal Error"
+msgstr ""
+
+#: mediamanager/halbackend.cpp:1279
msgid "Invalid filesystem type"
msgstr ""
-#: mediamanager/halbackend.cpp:1286
+#: mediamanager/halbackend.cpp:1281
msgid ""
"Permission denied<p>Please ensure that:<br>1. You have permission to access "
"this device.<br>2. This device node is not listed in /etc/fstab.</p>"
msgstr ""
-#: mediamanager/halbackend.cpp:1290
+#: mediamanager/halbackend.cpp:1285
msgid "Device is already mounted."
msgstr ""
-#: mediamanager/halbackend.cpp:1340
+#: mediamanager/halbackend.cpp:1335
msgid ""
"Moreover, programs still using the device have been detected. They are "
"listed below. You have to close them or change their working directory "
"before attempting to unmount the device again."
msgstr ""
-#: mediamanager/halbackend.cpp:1381 mediamanager/tdehardwarebackend.cpp:1588
+#: mediamanager/halbackend.cpp:1376 mediamanager/tdehardwarebackend.cpp:1618
msgid ""
"Programs that were still using the device have been forcibly terminated. "
"They are listed below."
msgstr ""
-#: mediamanager/halbackend.cpp:1402 mediamanager/halbackend.cpp:1715
-#: mediamanager/tdehardwarebackend.cpp:1406
-#: mediamanager/tdehardwarebackend.cpp:1424
-#: mediamanager/tdehardwarebackend.cpp:1464
+#: mediamanager/halbackend.cpp:1397 mediamanager/halbackend.cpp:1742
+#: mediamanager/tdehardwarebackend.cpp:1430
+#: mediamanager/tdehardwarebackend.cpp:1452
+#: mediamanager/tdehardwarebackend.cpp:1494
msgid ""
"Unfortunately, the device <b>%1</b> (%2) named <b>'%3'</b> and currently "
"mounted at <b>%4</b> could not be unmounted. "
msgstr ""
-#: mediamanager/halbackend.cpp:1408 mediamanager/tdehardwarebackend.cpp:1470
+#: mediamanager/halbackend.cpp:1403 mediamanager/tdehardwarebackend.cpp:1500
msgid "The following error was returned by umount command:"
msgstr ""
-#: mediamanager/halbackend.cpp:1478
-msgid "Permission denied"
+#: mediamanager/halbackend.cpp:1567 mediamanager/tdehardwarebackend.cpp:1322
+msgid "Cannot mount encrypted locked drives!"
msgstr ""
-#: mediamanager/halbackend.cpp:1562 mediamanager/tdehardwarebackend.cpp:1232
-msgid "Cannot mount encrypted drives!"
+#: mediamanager/halbackend.cpp:1682 mediamanager/halbackend.cpp:1703
+#: mediamanager/halbackend.cpp:1716 mediamanager/halbackend.cpp:1830
+#: mediamanager/halbackend.cpp:1840 mediamanager/halbackend.cpp:1899
+#: mediamanager/halbackend.cpp:1907
+msgid "Internal error"
msgstr ""
-#: mediamanager/halbackend.cpp:1721
+#: mediamanager/halbackend.cpp:1694
+#, fuzzy
+#| msgid "Unknown"
+msgid "Unknown error"
+msgstr "ngatiwa"
+
+#: mediamanager/halbackend.cpp:1748
msgid "Unmounting failed due to the following error:"
msgstr ""
-#: mediamanager/halbackend.cpp:1723
+#: mediamanager/halbackend.cpp:1750
msgid "Device is Busy:"
msgstr ""
-#: mediamanager/halbackend.cpp:1727
+#: mediamanager/halbackend.cpp:1754
msgid ""
"Permission denied<p>Please ensure that:<br>1. You have permission to access "
"this device.<br>2. This device was originally mounted using TDE.</p>"
msgstr ""
-#: mediamanager/halbackend.cpp:1739
+#: mediamanager/halbackend.cpp:1766
msgid ""
"%1<p><b>Would you like to forcibly terminate these processes?</b><br><i>All "
"unsaved data would be lost</i>"
msgstr ""
-#: mediamanager/halbackend.cpp:1811
+#: mediamanager/halbackend.cpp:1852
msgid "Wrong password"
msgstr ""
-#: mediamanager/mediamanager.cpp:247 mediamanager/mediamanager.cpp:266
-#: mediamanager/mediamanager.cpp:285 mediamanager/mediamanager.cpp:293
-#: mediamanager/mediamanager.cpp:302 mediamanager/mediamanager.cpp:310
-msgid "Feature only available with HAL"
+#: mediamanager/mediamanager.cpp:248 mediamanager/mediamanager.cpp:275
+msgid "Feature only available with the TDE hardware backend"
msgstr ""
-#: mediamanager/mediamanager.cpp:252
-msgid "Feature only available with the TDE hardware backend"
+#: mediamanager/mediamanager.cpp:255 mediamanager/mediamanager.cpp:282
+#: mediamanager/mediamanager.cpp:312 mediamanager/mediamanager.cpp:343
+msgid "Feature only available with HAL"
msgstr ""
-#: mediamanager/mediamanager.cpp:256 mediamanager/mediamanager.cpp:271
-#: mediamanager/mediamanager.cpp:275
+#: mediamanager/mediamanager.cpp:262 mediamanager/mediamanager.cpp:289
+#: mediamanager/mediamanager.cpp:320 mediamanager/mediamanager.cpp:350
msgid "Feature only available with HAL or TDE hardware backend"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:480
-#: mediamanager/tdehardwarebackend.cpp:517
-#: mediamanager/tdehardwarebackend.cpp:750
+#: mediamanager/tdehardwarebackend.cpp:483
+#: mediamanager/tdehardwarebackend.cpp:520
+#: mediamanager/tdehardwarebackend.cpp:753
msgid "%1 Removable Device"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:525
+#: mediamanager/tdehardwarebackend.cpp:528
#, fuzzy
msgid "Blank CD-ROM"
msgstr "CD-ROM"
-#: mediamanager/tdehardwarebackend.cpp:534
+#: mediamanager/tdehardwarebackend.cpp:537
msgid "Blank CD-R"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:543
+#: mediamanager/tdehardwarebackend.cpp:546
msgid "Blank CD-RW"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:552
+#: mediamanager/tdehardwarebackend.cpp:555
msgid "Blank Magneto-Optical CD"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:561
+#: mediamanager/tdehardwarebackend.cpp:564
msgid "Blank Mount Ranier CD-RW"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:570
+#: mediamanager/tdehardwarebackend.cpp:573
msgid "Blank Mount Ranier CD-RW-W"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:579
+#: mediamanager/tdehardwarebackend.cpp:582
msgid "Blank DVD-ROM"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:588
+#: mediamanager/tdehardwarebackend.cpp:591
msgid "Blank DVD-RAM"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:597
+#: mediamanager/tdehardwarebackend.cpp:600
msgid "Blank DVD-R"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:606
+#: mediamanager/tdehardwarebackend.cpp:609
msgid "Blank DVD-RW"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:615
+#: mediamanager/tdehardwarebackend.cpp:618
msgid "Blank Dual Layer DVD-R"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:624
+#: mediamanager/tdehardwarebackend.cpp:627
msgid "Blank Dual Layer DVD-RW"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:633
+#: mediamanager/tdehardwarebackend.cpp:636
msgid "Blank DVD+R"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:642
+#: mediamanager/tdehardwarebackend.cpp:645
msgid "Blank DVD+RW"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:651
+#: mediamanager/tdehardwarebackend.cpp:654
msgid "Blank Dual Layer DVD+R"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:660
+#: mediamanager/tdehardwarebackend.cpp:663
msgid "Blank Dual Layer DVD+RW"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:669
+#: mediamanager/tdehardwarebackend.cpp:672
msgid "Blank BD-ROM"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:678
+#: mediamanager/tdehardwarebackend.cpp:681
msgid "Blank BD-R"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:687
+#: mediamanager/tdehardwarebackend.cpp:690
msgid "Blank BD-RW"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:696
+#: mediamanager/tdehardwarebackend.cpp:699
msgid "Blank HDDVD-ROM"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:705
+#: mediamanager/tdehardwarebackend.cpp:708
msgid "Blank HDDVD-R"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:714
+#: mediamanager/tdehardwarebackend.cpp:717
msgid "Blank HDDVD-RW"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:721
+#: mediamanager/tdehardwarebackend.cpp:724
msgid "Audio CD"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:742
+#: mediamanager/tdehardwarebackend.cpp:745
msgid "%1 Fixed Disk (%2)"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:849
+#: mediamanager/tdehardwarebackend.cpp:852
#, fuzzy
msgid "%1 Zip Disk"
msgstr "I-diski ye zip "
-#: mediamanager/tdehardwarebackend.cpp:1212
-#: mediamanager/tdehardwarebackend.cpp:1392
-msgid "Internal error"
+#: mediamanager/tdehardwarebackend.cpp:1224
+#: mediamanager/tdehardwarebackend.cpp:1417
+msgid "Internal error. Couldn't find medium."
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:1239
-msgid ""
-"<qt>Unable to mount this device.<p>Potential reasons include:<br>Improper "
-"device and/or user privilege level<br>Corrupt data on storage device"
+#: mediamanager/tdehardwarebackend.cpp:1249
+#: mediamanager/tdehardwarebackend.cpp:1323
+msgid "Unable to mount this device."
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:1241
-#: mediamanager/tdehardwarebackend.cpp:1316
-#: mediamanager/tdehardwarebackend.cpp:1408
-#: mediamanager/tdehardwarebackend.cpp:1426
+#: mediamanager/tdehardwarebackend.cpp:1252
+#: mediamanager/tdehardwarebackend.cpp:1326
+#: mediamanager/tdehardwarebackend.cpp:1435
+#: mediamanager/tdehardwarebackend.cpp:1457
msgid "<p>Technical details:<br>"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:1314
-msgid ""
-"<qt>Unable to mount this device.<p>Potential reasons include:<br>Improper "
-"device and/or user privilege level<br>Corrupt data on storage "
-"device<br>Incorrect encryption password"
+#: mediamanager/tdehardwarebackend.cpp:1284
+msgid "Decryption aborted"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:1420
+#: mediamanager/tdehardwarebackend.cpp:1443
msgid ""
"<qt>The device <b>%1</b> (%2) named <b>'%3'</b> and currently mounted at <b>"
"%4</b> can not be unmounted at this time.<p>%5<p><b>Would you like to "
@@ -383,7 +390,7 @@ msgid ""
"lost</i>"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:1547
+#: mediamanager/tdehardwarebackend.cpp:1577
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 "
@@ -394,7 +401,7 @@ msgstr ""
msgid "%1 cannot be found."
msgstr ""
-#: mounthelper/tdeio_media_mounthelper.cpp:86
+#: mounthelper/tdeio_media_mounthelper.cpp:87
#, fuzzy
msgid "%1 is not a mountable media."
msgstr "%1%2 (ngakhuphukanga)"
@@ -405,40 +412,49 @@ msgid "%1 is not an encrypted media."
msgstr "%1%2 (ngakhuphukanga)"
#: mounthelper/tdeio_media_mounthelper.cpp:107
-msgid "%1 is already decrypted."
+msgid "%1 is already unlocked."
+msgstr ""
+
+#: mounthelper/tdeio_media_mounthelper.cpp:139
+msgid "Unknown unmount error."
msgstr ""
-#: mounthelper/tdeio_media_mounthelper.cpp:228
+#: mounthelper/tdeio_media_mounthelper.cpp:246
msgid "The device was successfully unmounted, but the tray could not be opened"
msgstr ""
-#: mounthelper/tdeio_media_mounthelper.cpp:230
+#: mounthelper/tdeio_media_mounthelper.cpp:248
msgid "The device was successfully unmounted, but could not be ejected"
msgstr ""
-#: mounthelper/tdeio_media_mounthelper.cpp:275
+#: mounthelper/tdeio_media_mounthelper.cpp:281
+#, fuzzy
+msgid "Unknown decrypt error."
+msgstr "Sisetjentiswa lesingatiwa"
+
+#: mounthelper/tdeio_media_mounthelper.cpp:295
#, fuzzy
msgid "Decrypt given URL"
msgstr "Kungakhuphuki lokuniketwe i-URL"
-#: mounthelper/tdeio_media_mounthelper.cpp:276
+#: mounthelper/tdeio_media_mounthelper.cpp:296
msgid "Unmount given URL"
msgstr "Kungakhuphuki lokuniketwe i-URL"
-#: mounthelper/tdeio_media_mounthelper.cpp:277
+#: mounthelper/tdeio_media_mounthelper.cpp:297
#, fuzzy
msgid "Mount given URL (default)"
msgstr "Kukhuphuka kuniketiwe (kwehluleka"
-#: mounthelper/tdeio_media_mounthelper.cpp:278
+#: mounthelper/tdeio_media_mounthelper.cpp:298
msgid "Eject given URL via tdeeject"
msgstr ""
-#: mounthelper/tdeio_media_mounthelper.cpp:279
+#: mounthelper/tdeio_media_mounthelper.cpp:299
msgid "Unmount and Eject given URL (necessary for some USB devices)"
msgstr ""
-#: mounthelper/tdeio_media_mounthelper.cpp:280
+#: mounthelper/tdeio_media_mounthelper.cpp:300
#, fuzzy
msgid "media:/ URL to mount/unmount/eject/remove"
msgstr "sisetjentiswa:/ i-url lekufanele yikhuphuke/yingakhuphulwa."
@@ -460,45 +476,45 @@ msgstr ""
msgid "&Mounting"
msgstr ""
-#: tdefile-plugin/tdefilemediaplugin.cpp:190
+#: tdefile-plugin/tdefilemediaplugin.cpp:184
#, fuzzy
msgid "Medium Information"
msgstr "Sisetjentiswa kasikhushulwanga"
-#: tdefile-plugin/tdefilemediaplugin.cpp:193
+#: tdefile-plugin/tdefilemediaplugin.cpp:187
msgid "Free"
msgstr ""
-#: tdefile-plugin/tdefilemediaplugin.cpp:196
+#: tdefile-plugin/tdefilemediaplugin.cpp:190
msgid "Used"
msgstr ""
-#: tdefile-plugin/tdefilemediaplugin.cpp:199
+#: tdefile-plugin/tdefilemediaplugin.cpp:193
msgid "Total"
msgstr ""
-#: tdefile-plugin/tdefilemediaplugin.cpp:202
+#: tdefile-plugin/tdefilemediaplugin.cpp:196
msgid "Base URL"
msgstr ""
-#: tdefile-plugin/tdefilemediaplugin.cpp:203
+#: tdefile-plugin/tdefilemediaplugin.cpp:197
msgid "Mount Point"
msgstr ""
-#: tdefile-plugin/tdefilemediaplugin.cpp:204
+#: tdefile-plugin/tdefilemediaplugin.cpp:198
#, fuzzy
msgid "Device Node"
msgstr "Sisetjentiswa kasikhushulwanga"
-#: tdefile-plugin/tdefilemediaplugin.cpp:206
+#: tdefile-plugin/tdefilemediaplugin.cpp:200
msgid "Medium Summary"
msgstr ""
-#: tdefile-plugin/tdefilemediaplugin.cpp:208
+#: tdefile-plugin/tdefilemediaplugin.cpp:202
msgid "Usage"
msgstr ""
-#: tdefile-plugin/tdefilemediaplugin.cpp:210
+#: tdefile-plugin/tdefilemediaplugin.cpp:204
msgid "Bar Graph"
msgstr ""
@@ -570,23 +586,30 @@ msgid ""
"devices are plugged in."
msgstr ""
-#: mediamanager/decryptdialog.ui:24 mounthelper/decryptdialog.ui:24
+#: mediamanager/unlockdialog.ui:24 mounthelper/unlockdialog.ui:24
#, no-c-format
msgid "Decrypting Storage Device"
msgstr ""
-#: mediamanager/decryptdialog.ui:109 mounthelper/decryptdialog.ui:109
+#: mediamanager/unlockdialog.ui:109
#, no-c-format
msgid ""
-"<p><b>%1</b> is an encrypted storage device.</p>\n"
-"<p>Please enter the password to decrypt the storage device.</p>"
+"<p><b>%1</b> is an encrypted locked storage device.</p>\n"
+"<p>Please enter the password to unlock the storage device.</p>"
msgstr ""
-#: mediamanager/decryptdialog.ui:131 mounthelper/decryptdialog.ui:131
+#: mediamanager/unlockdialog.ui:131 mounthelper/unlockdialog.ui:131
#, no-c-format
msgid "&Password:"
msgstr ""
+#: mounthelper/unlockdialog.ui:109
+#, no-c-format
+msgid ""
+"<p><b>%1</b> is an encrypted storage device.</p>\n"
+"<p>Please enter the password to decrypt the storage device.</p>"
+msgstr ""
+
#: propsdlgplugin/propertiespagegui.ui:16
#, no-c-format
msgid "PropertiesPageGUI"
@@ -804,10 +827,6 @@ msgstr ""
msgid "Filesystem: iso9660"
msgstr ""
-#, fuzzy
-#~ msgid "Unknown device %1"
-#~ msgstr "Sisetjentiswa lesingatiwa"
-
#~ msgid "Device not accessible"
#~ msgstr "Sisetjentiswa asitfolakali"
diff --git a/tde-i18n-sv/messages/tdebase/tdeio_media.po b/tde-i18n-sv/messages/tdebase/tdeio_media.po
index 89f806ad085..9b12210acf9 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: 2019-01-13 18:47+0100\n"
+"POT-Creation-Date: 2019-07-11 02:33+0200\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"
@@ -46,7 +46,6 @@ 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
-#: mounthelper/tdeio_media_mounthelper.cpp:256
msgid "The TDE mediamanager is not running."
msgstr "TDE:s mediahanterare kör inte."
@@ -54,7 +53,7 @@ msgstr "TDE:s mediahanterare kör inte."
msgid "This media name already exists."
msgstr "Medianamnet finns redan."
-#: mediaimpl.cpp:230 mediaimpl.cpp:293
+#: mediaimpl.cpp:230 mediaimpl.cpp:297
msgid "No such medium."
msgstr "Medium finns inte."
@@ -62,110 +61,114 @@ msgstr "Medium finns inte."
msgid "The drive is encrypted."
msgstr ""
-#: mediaimpl.cpp:272 mediamanager/halbackend.cpp:1264
-#: mediamanager/halbackend.cpp:1273 mediamanager/halbackend.cpp:1663
-#: mediamanager/halbackend.cpp:1680 mediamanager/halbackend.cpp:1691
-#: mediamanager/halbackend.cpp:1793 mediamanager/halbackend.cpp:1801
-#: mediamanager/halbackend.cpp:1808 mediamanager/halbackend.cpp:1848
-#: mediamanager/halbackend.cpp:1854 mediamanager/halbackend.cpp:1861
-#: mounthelper/tdeio_media_mounthelper.cpp:58
-msgid "Internal Error"
-msgstr "Internt fel"
+#: mediaimpl.cpp:274 mediamanager/tdehardwarebackend.cpp:201
+#: mediamanager/tdehardwarebackend.cpp:252
+#: mounthelper/tdeio_media_mounthelper.cpp:202
+msgid "Unknown mount error."
+msgstr ""
#: mediamanager/dialog.cpp:26 mounthelper/dialog.cpp:26
-msgid "Decrypt"
+msgid "Unlock"
msgstr ""
-#: mediamanager/fstabbackend.cpp:104 mediamanager/fstabbackend.cpp:114
-#: mediamanager/halbackend.cpp:1595 mediamanager/halbackend.cpp:1617
-#: mediamanager/halbackend.cpp:1776 mediamanager/halbackend.cpp:1831
-#: mediamanager/tdehardwarebackend.cpp:1349
-#: mediamanager/tdehardwarebackend.cpp:1360
+#: mediamanager/fstabbackend.cpp:105 mediamanager/fstabbackend.cpp:120
+#: mediamanager/halbackend.cpp:1598 mediamanager/halbackend.cpp:1625
+#: mediamanager/halbackend.cpp:1808 mediamanager/halbackend.cpp:1877
+#: mediamanager/mediamanager.cpp:363 mediamanager/mediamanager.cpp:375
+#: mediamanager/mediamanager.cpp:387 mediamanager/mediamanager.cpp:399
+#: mediamanager/tdehardwarebackend.cpp:1363
+#: mediamanager/tdehardwarebackend.cpp:1378
#, c-format
msgid "No such medium: %1"
msgstr "Medium finns inte: %1"
-#: mediamanager/fstabbackend.cpp:398
+#: mediamanager/fstabbackend.cpp:408
msgid "CD Recorder"
msgstr "Cd-brännare"
-#: mediamanager/fstabbackend.cpp:404
+#: mediamanager/fstabbackend.cpp:414
msgid "DVD"
msgstr "Dvd"
-#: mediamanager/fstabbackend.cpp:415
+#: mediamanager/fstabbackend.cpp:425
msgid "CD-ROM"
msgstr "Cd-rom"
-#: mediamanager/fstabbackend.cpp:428
+#: mediamanager/fstabbackend.cpp:438
msgid "Floppy"
msgstr "Diskett"
-#: mediamanager/fstabbackend.cpp:436
+#: mediamanager/fstabbackend.cpp:446
msgid "Zip Disk"
msgstr "Zip-diskett"
-#: mediamanager/fstabbackend.cpp:447
+#: mediamanager/fstabbackend.cpp:457
msgid "Removable Device"
msgstr "Flyttbar enhet"
-#: mediamanager/fstabbackend.cpp:452 mediamanager/fstabbackend.cpp:458
+#: mediamanager/fstabbackend.cpp:462 mediamanager/fstabbackend.cpp:468
msgid "Remote Share"
msgstr "Utdelad fjärrkatalog"
-#: mediamanager/fstabbackend.cpp:463
+#: mediamanager/fstabbackend.cpp:473
msgid "Hard Disk"
msgstr "Hårddisk"
-#: mediamanager/halbackend.cpp:749 mediamanager/tdehardwarebackend.cpp:805
+#: mediamanager/halbackend.cpp:744 mediamanager/tdehardwarebackend.cpp:808
msgid "Unknown Drive"
msgstr "Okänd enhet"
-#: mediamanager/halbackend.cpp:761 mediamanager/tdehardwarebackend.cpp:835
+#: mediamanager/halbackend.cpp:756 mediamanager/tdehardwarebackend.cpp:838
msgid "Floppy Drive"
msgstr "Diskett"
-#: mediamanager/halbackend.cpp:769
+#: mediamanager/halbackend.cpp:764
msgid "Zip Drive"
msgstr "Zip-diskett"
-#: mediamanager/halbackend.cpp:839 mediamanager/tdehardwarebackend.cpp:892
+#: mediamanager/halbackend.cpp:834 mediamanager/tdehardwarebackend.cpp:895
msgid "Camera"
msgstr "Kamera"
-#: mediamanager/halbackend.cpp:1221 mediamanager/halbackend.cpp:1247
+#: mediamanager/halbackend.cpp:1216 mediamanager/halbackend.cpp:1242
msgid "Authenticate"
msgstr ""
-#: mediamanager/halbackend.cpp:1222
+#: mediamanager/halbackend.cpp:1217
msgid ""
"<big><b>System policy prevents mounting internal media</b></big><br/"
">Authentication is required to perform this action. Please enter your "
"password to verify."
msgstr ""
-#: mediamanager/halbackend.cpp:1248
+#: mediamanager/halbackend.cpp:1243
msgid ""
"<big><b>System policy prevents unmounting media mounted by other users</b></"
"big><br/>Authentication is required to perform this action. Please enter "
"your password to verify."
msgstr ""
-#: mediamanager/halbackend.cpp:1284
+#: mediamanager/halbackend.cpp:1259 mediamanager/halbackend.cpp:1268
+#: mediamanager/halbackend.cpp:1849 mediamanager/halbackend.cpp:1916
+#: mounthelper/tdeio_media_mounthelper.cpp:58
+msgid "Internal Error"
+msgstr "Internt fel"
+
+#: mediamanager/halbackend.cpp:1279
msgid "Invalid filesystem type"
msgstr "Felaktig filsystemtyp"
-#: mediamanager/halbackend.cpp:1286
+#: mediamanager/halbackend.cpp:1281
msgid ""
"Permission denied<p>Please ensure that:<br>1. You have permission to access "
"this device.<br>2. This device node is not listed in /etc/fstab.</p>"
msgstr ""
-#: mediamanager/halbackend.cpp:1290
+#: mediamanager/halbackend.cpp:1285
msgid "Device is already mounted."
msgstr "Enheten är redan monterad."
-#: mediamanager/halbackend.cpp:1340
+#: mediamanager/halbackend.cpp:1335
msgid ""
"Moreover, programs still using the device have been detected. They are "
"listed below. You have to close them or change their working directory "
@@ -175,16 +178,16 @@ msgstr ""
"måste stänga dem eller ändra deras arbetskatalog innan du försöker avmontera "
"enheten igen."
-#: mediamanager/halbackend.cpp:1381 mediamanager/tdehardwarebackend.cpp:1588
+#: mediamanager/halbackend.cpp:1376 mediamanager/tdehardwarebackend.cpp:1618
msgid ""
"Programs that were still using the device have been forcibly terminated. "
"They are listed below."
msgstr ""
-#: mediamanager/halbackend.cpp:1402 mediamanager/halbackend.cpp:1715
-#: mediamanager/tdehardwarebackend.cpp:1406
-#: mediamanager/tdehardwarebackend.cpp:1424
-#: mediamanager/tdehardwarebackend.cpp:1464
+#: mediamanager/halbackend.cpp:1397 mediamanager/halbackend.cpp:1742
+#: mediamanager/tdehardwarebackend.cpp:1430
+#: mediamanager/tdehardwarebackend.cpp:1452
+#: mediamanager/tdehardwarebackend.cpp:1494
msgid ""
"Unfortunately, the device <b>%1</b> (%2) named <b>'%3'</b> and currently "
"mounted at <b>%4</b> could not be unmounted. "
@@ -192,196 +195,199 @@ 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:1408 mediamanager/tdehardwarebackend.cpp:1470
+#: mediamanager/halbackend.cpp:1403 mediamanager/tdehardwarebackend.cpp:1500
msgid "The following error was returned by umount command:"
msgstr "Följande fel returnerades av avmonteringskommandot:"
-#: mediamanager/halbackend.cpp:1478
+#: mediamanager/halbackend.cpp:1567 mediamanager/tdehardwarebackend.cpp:1322
+msgid "Cannot mount encrypted locked drives!"
+msgstr ""
+
+#: mediamanager/halbackend.cpp:1682 mediamanager/halbackend.cpp:1703
+#: mediamanager/halbackend.cpp:1716 mediamanager/halbackend.cpp:1830
+#: mediamanager/halbackend.cpp:1840 mediamanager/halbackend.cpp:1899
+#: mediamanager/halbackend.cpp:1907
#, fuzzy
-msgid "Permission denied"
-msgstr "Rättigheter saknas"
+msgid "Internal error"
+msgstr "Internt fel"
-#: mediamanager/halbackend.cpp:1562 mediamanager/tdehardwarebackend.cpp:1232
-msgid "Cannot mount encrypted drives!"
-msgstr ""
+#: mediamanager/halbackend.cpp:1694
+#, fuzzy
+#| msgid "Unknown"
+msgid "Unknown error"
+msgstr "Okänd"
-#: mediamanager/halbackend.cpp:1721
+#: mediamanager/halbackend.cpp:1748
msgid "Unmounting failed due to the following error:"
msgstr "Avmontering misslyckades på grund av följande fel:"
-#: mediamanager/halbackend.cpp:1723
+#: mediamanager/halbackend.cpp:1750
msgid "Device is Busy:"
msgstr "Enheten är upptagen:"
-#: mediamanager/halbackend.cpp:1727
+#: mediamanager/halbackend.cpp:1754
msgid ""
"Permission denied<p>Please ensure that:<br>1. You have permission to access "
"this device.<br>2. This device was originally mounted using TDE.</p>"
msgstr ""
-#: mediamanager/halbackend.cpp:1739
+#: mediamanager/halbackend.cpp:1766
msgid ""
"%1<p><b>Would you like to forcibly terminate these processes?</b><br><i>All "
"unsaved data would be lost</i>"
msgstr ""
-#: mediamanager/halbackend.cpp:1811
+#: mediamanager/halbackend.cpp:1852
msgid "Wrong password"
msgstr ""
-#: mediamanager/mediamanager.cpp:247 mediamanager/mediamanager.cpp:266
-#: mediamanager/mediamanager.cpp:285 mediamanager/mediamanager.cpp:293
-#: mediamanager/mediamanager.cpp:302 mediamanager/mediamanager.cpp:310
-msgid "Feature only available with HAL"
-msgstr "Funktionen är bara tillgänglig med HAL"
-
-#: mediamanager/mediamanager.cpp:252
+#: mediamanager/mediamanager.cpp:248 mediamanager/mediamanager.cpp:275
#, fuzzy
msgid "Feature only available with the TDE hardware backend"
msgstr "Funktionen är bara tillgänglig med HAL"
-#: mediamanager/mediamanager.cpp:256 mediamanager/mediamanager.cpp:271
-#: mediamanager/mediamanager.cpp:275
+#: mediamanager/mediamanager.cpp:255 mediamanager/mediamanager.cpp:282
+#: mediamanager/mediamanager.cpp:312 mediamanager/mediamanager.cpp:343
+msgid "Feature only available with HAL"
+msgstr "Funktionen är bara tillgänglig med HAL"
+
+#: mediamanager/mediamanager.cpp:262 mediamanager/mediamanager.cpp:289
+#: mediamanager/mediamanager.cpp:320 mediamanager/mediamanager.cpp:350
#, fuzzy
msgid "Feature only available with HAL or TDE hardware backend"
msgstr "Funktionen är bara tillgänglig med HAL"
-#: mediamanager/tdehardwarebackend.cpp:480
-#: mediamanager/tdehardwarebackend.cpp:517
-#: mediamanager/tdehardwarebackend.cpp:750
+#: mediamanager/tdehardwarebackend.cpp:483
+#: mediamanager/tdehardwarebackend.cpp:520
+#: mediamanager/tdehardwarebackend.cpp:753
#, fuzzy
msgid "%1 Removable Device"
msgstr "Flyttbar enhet"
-#: mediamanager/tdehardwarebackend.cpp:525
+#: mediamanager/tdehardwarebackend.cpp:528
#, fuzzy
msgid "Blank CD-ROM"
msgstr "Cd-rom"
-#: mediamanager/tdehardwarebackend.cpp:534
+#: mediamanager/tdehardwarebackend.cpp:537
msgid "Blank CD-R"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:543
+#: mediamanager/tdehardwarebackend.cpp:546
msgid "Blank CD-RW"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:552
+#: mediamanager/tdehardwarebackend.cpp:555
msgid "Blank Magneto-Optical CD"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:561
+#: mediamanager/tdehardwarebackend.cpp:564
msgid "Blank Mount Ranier CD-RW"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:570
+#: mediamanager/tdehardwarebackend.cpp:573
msgid "Blank Mount Ranier CD-RW-W"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:579
+#: mediamanager/tdehardwarebackend.cpp:582
msgid "Blank DVD-ROM"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:588
+#: mediamanager/tdehardwarebackend.cpp:591
msgid "Blank DVD-RAM"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:597
+#: mediamanager/tdehardwarebackend.cpp:600
msgid "Blank DVD-R"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:606
+#: mediamanager/tdehardwarebackend.cpp:609
msgid "Blank DVD-RW"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:615
+#: mediamanager/tdehardwarebackend.cpp:618
msgid "Blank Dual Layer DVD-R"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:624
+#: mediamanager/tdehardwarebackend.cpp:627
msgid "Blank Dual Layer DVD-RW"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:633
+#: mediamanager/tdehardwarebackend.cpp:636
msgid "Blank DVD+R"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:642
+#: mediamanager/tdehardwarebackend.cpp:645
msgid "Blank DVD+RW"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:651
+#: mediamanager/tdehardwarebackend.cpp:654
msgid "Blank Dual Layer DVD+R"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:660
+#: mediamanager/tdehardwarebackend.cpp:663
msgid "Blank Dual Layer DVD+RW"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:669
+#: mediamanager/tdehardwarebackend.cpp:672
msgid "Blank BD-ROM"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:678
+#: mediamanager/tdehardwarebackend.cpp:681
msgid "Blank BD-R"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:687
+#: mediamanager/tdehardwarebackend.cpp:690
msgid "Blank BD-RW"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:696
+#: mediamanager/tdehardwarebackend.cpp:699
msgid "Blank HDDVD-ROM"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:705
+#: mediamanager/tdehardwarebackend.cpp:708
msgid "Blank HDDVD-R"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:714
+#: mediamanager/tdehardwarebackend.cpp:717
msgid "Blank HDDVD-RW"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:721
+#: mediamanager/tdehardwarebackend.cpp:724
msgid "Audio CD"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:742
+#: mediamanager/tdehardwarebackend.cpp:745
msgid "%1 Fixed Disk (%2)"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:849
+#: mediamanager/tdehardwarebackend.cpp:852
#, fuzzy
msgid "%1 Zip Disk"
msgstr "Zip-diskett"
-#: mediamanager/tdehardwarebackend.cpp:1212
-#: mediamanager/tdehardwarebackend.cpp:1392
-#, fuzzy
-msgid "Internal error"
-msgstr "Internt fel"
+#: mediamanager/tdehardwarebackend.cpp:1224
+#: mediamanager/tdehardwarebackend.cpp:1417
+msgid "Internal error. Couldn't find medium."
+msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:1239
-msgid ""
-"<qt>Unable to mount this device.<p>Potential reasons include:<br>Improper "
-"device and/or user privilege level<br>Corrupt data on storage device"
+#: mediamanager/tdehardwarebackend.cpp:1249
+#: mediamanager/tdehardwarebackend.cpp:1323
+msgid "Unable to mount this device."
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:1241
-#: mediamanager/tdehardwarebackend.cpp:1316
-#: mediamanager/tdehardwarebackend.cpp:1408
-#: mediamanager/tdehardwarebackend.cpp:1426
+#: mediamanager/tdehardwarebackend.cpp:1252
+#: mediamanager/tdehardwarebackend.cpp:1326
+#: mediamanager/tdehardwarebackend.cpp:1435
+#: mediamanager/tdehardwarebackend.cpp:1457
msgid "<p>Technical details:<br>"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:1314
-msgid ""
-"<qt>Unable to mount this device.<p>Potential reasons include:<br>Improper "
-"device and/or user privilege level<br>Corrupt data on storage "
-"device<br>Incorrect encryption password"
+#: mediamanager/tdehardwarebackend.cpp:1284
+msgid "Decryption aborted"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:1420
+#: mediamanager/tdehardwarebackend.cpp:1443
msgid ""
"<qt>The device <b>%1</b> (%2) named <b>'%3'</b> and currently mounted at <b>"
"%4</b> can not be unmounted at this time.<p>%5<p><b>Would you like to "
@@ -389,7 +395,7 @@ msgid ""
"lost</i>"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:1547
+#: mediamanager/tdehardwarebackend.cpp:1577
#, fuzzy
msgid ""
"Programs still using the device have been detected. They are listed below. "
@@ -404,7 +410,7 @@ msgstr ""
msgid "%1 cannot be found."
msgstr "%1 kan inte hittas."
-#: mounthelper/tdeio_media_mounthelper.cpp:86
+#: mounthelper/tdeio_media_mounthelper.cpp:87
msgid "%1 is not a mountable media."
msgstr "%1 är inte ett monteringsbart media."
@@ -415,40 +421,48 @@ msgstr "%1 är inte ett monteringsbart media."
#: mounthelper/tdeio_media_mounthelper.cpp:107
#, fuzzy
-msgid "%1 is already decrypted."
+msgid "%1 is already unlocked."
msgstr "Enheten är redan monterad."
-#: mounthelper/tdeio_media_mounthelper.cpp:228
+#: mounthelper/tdeio_media_mounthelper.cpp:139
+msgid "Unknown unmount error."
+msgstr ""
+
+#: mounthelper/tdeio_media_mounthelper.cpp:246
msgid "The device was successfully unmounted, but the tray could not be opened"
msgstr "Enheten avmonterades med lyckat resultat, men den kunde inte öppnas"
-#: mounthelper/tdeio_media_mounthelper.cpp:230
+#: 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:275
+#: mounthelper/tdeio_media_mounthelper.cpp:281
+msgid "Unknown decrypt error."
+msgstr ""
+
+#: mounthelper/tdeio_media_mounthelper.cpp:295
#, fuzzy
msgid "Decrypt given URL"
msgstr "Avmontera angiven enhet"
-#: mounthelper/tdeio_media_mounthelper.cpp:276
+#: mounthelper/tdeio_media_mounthelper.cpp:296
msgid "Unmount given URL"
msgstr "Avmontera angiven enhet"
-#: mounthelper/tdeio_media_mounthelper.cpp:277
+#: mounthelper/tdeio_media_mounthelper.cpp:297
msgid "Mount given URL (default)"
msgstr "Montera angiven webbadress (förval)"
-#: mounthelper/tdeio_media_mounthelper.cpp:278
+#: mounthelper/tdeio_media_mounthelper.cpp:298
msgid "Eject given URL via tdeeject"
msgstr "Mata ut angiven webbadress via tdeeject"
-#: mounthelper/tdeio_media_mounthelper.cpp:279
+#: mounthelper/tdeio_media_mounthelper.cpp:299
msgid "Unmount and Eject given URL (necessary for some USB devices)"
msgstr ""
"Avmontera och mata ut angiven webbadress (nödvändigt för vissa USB-enheter)"
-#: mounthelper/tdeio_media_mounthelper.cpp:280
+#: mounthelper/tdeio_media_mounthelper.cpp:300
msgid "media:/ URL to mount/unmount/eject/remove"
msgstr "media:/ webbadress för att montera, avmontera, mata ut eller koppla ur"
@@ -469,43 +483,43 @@ msgstr "Misslyckades spara ändringar"
msgid "&Mounting"
msgstr "&Montering"
-#: tdefile-plugin/tdefilemediaplugin.cpp:190
+#: tdefile-plugin/tdefilemediaplugin.cpp:184
msgid "Medium Information"
msgstr "Information om media"
-#: tdefile-plugin/tdefilemediaplugin.cpp:193
+#: tdefile-plugin/tdefilemediaplugin.cpp:187
msgid "Free"
msgstr "Ledigt"
-#: tdefile-plugin/tdefilemediaplugin.cpp:196
+#: tdefile-plugin/tdefilemediaplugin.cpp:190
msgid "Used"
msgstr "Använt"
-#: tdefile-plugin/tdefilemediaplugin.cpp:199
+#: tdefile-plugin/tdefilemediaplugin.cpp:193
msgid "Total"
msgstr "Totalt"
-#: tdefile-plugin/tdefilemediaplugin.cpp:202
+#: tdefile-plugin/tdefilemediaplugin.cpp:196
msgid "Base URL"
msgstr "Baswebbadress"
-#: tdefile-plugin/tdefilemediaplugin.cpp:203
+#: tdefile-plugin/tdefilemediaplugin.cpp:197
msgid "Mount Point"
msgstr "Monteringsplats"
-#: tdefile-plugin/tdefilemediaplugin.cpp:204
+#: tdefile-plugin/tdefilemediaplugin.cpp:198
msgid "Device Node"
msgstr "Enhetsnod"
-#: tdefile-plugin/tdefilemediaplugin.cpp:206
+#: tdefile-plugin/tdefilemediaplugin.cpp:200
msgid "Medium Summary"
msgstr "Sammanfattning av media"
-#: tdefile-plugin/tdefilemediaplugin.cpp:208
+#: tdefile-plugin/tdefilemediaplugin.cpp:202
msgid "Usage"
msgstr "Användning"
-#: tdefile-plugin/tdefilemediaplugin.cpp:210
+#: tdefile-plugin/tdefilemediaplugin.cpp:204
msgid "Bar Graph"
msgstr "Stapeldiagram"
@@ -577,23 +591,30 @@ msgid ""
"devices are plugged in."
msgstr ""
-#: mediamanager/decryptdialog.ui:24 mounthelper/decryptdialog.ui:24
+#: mediamanager/unlockdialog.ui:24 mounthelper/unlockdialog.ui:24
#, no-c-format
msgid "Decrypting Storage Device"
msgstr ""
-#: mediamanager/decryptdialog.ui:109 mounthelper/decryptdialog.ui:109
+#: mediamanager/unlockdialog.ui:109
#, no-c-format
msgid ""
-"<p><b>%1</b> is an encrypted storage device.</p>\n"
-"<p>Please enter the password to decrypt the storage device.</p>"
+"<p><b>%1</b> is an encrypted locked storage device.</p>\n"
+"<p>Please enter the password to unlock the storage device.</p>"
msgstr ""
-#: mediamanager/decryptdialog.ui:131 mounthelper/decryptdialog.ui:131
+#: mediamanager/unlockdialog.ui:131 mounthelper/unlockdialog.ui:131
#, no-c-format
msgid "&Password:"
msgstr ""
+#: mounthelper/unlockdialog.ui:109
+#, no-c-format
+msgid ""
+"<p><b>%1</b> is an encrypted storage device.</p>\n"
+"<p>Please enter the password to decrypt the storage device.</p>"
+msgstr ""
+
#: propsdlgplugin/propertiespagegui.ui:16
#, no-c-format
msgid "PropertiesPageGUI"
@@ -854,3 +875,7 @@ msgstr "Blandat"
#, no-c-format
msgid "Filesystem: iso9660"
msgstr "Filsystem: ISO-9660"
+
+#, 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 65b383dfa66..497e0b0322b 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: 2019-01-13 18:47+0100\n"
+"POT-Creation-Date: 2019-07-11 02:33+0200\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"
@@ -45,7 +45,6 @@ msgstr ""
#: mediaimpl.cpp:88 mediaimpl.cpp:115 mediaimpl.cpp:141 mediaimpl.cpp:177
#: mediaimpl.cpp:197 mediaimpl.cpp:218
#: mounthelper/tdeio_media_mounthelper.cpp:50
-#: mounthelper/tdeio_media_mounthelper.cpp:256
msgid "The TDE mediamanager is not running."
msgstr "கேடியி மீடியா மேலாளர் இயங்கவில்லை."
@@ -53,7 +52,7 @@ msgstr "கேடியி மீடியா மேலாளர் இயங்
msgid "This media name already exists."
msgstr "இந்த மீடியா ஏற்கெனவே உள்ளது."
-#: mediaimpl.cpp:230 mediaimpl.cpp:293
+#: mediaimpl.cpp:230 mediaimpl.cpp:297
msgid "No such medium."
msgstr ""
@@ -61,319 +60,325 @@ msgstr ""
msgid "The drive is encrypted."
msgstr ""
-#: mediaimpl.cpp:272 mediamanager/halbackend.cpp:1264
-#: mediamanager/halbackend.cpp:1273 mediamanager/halbackend.cpp:1663
-#: mediamanager/halbackend.cpp:1680 mediamanager/halbackend.cpp:1691
-#: mediamanager/halbackend.cpp:1793 mediamanager/halbackend.cpp:1801
-#: mediamanager/halbackend.cpp:1808 mediamanager/halbackend.cpp:1848
-#: mediamanager/halbackend.cpp:1854 mediamanager/halbackend.cpp:1861
-#: mounthelper/tdeio_media_mounthelper.cpp:58
-msgid "Internal Error"
+#: mediaimpl.cpp:274 mediamanager/tdehardwarebackend.cpp:201
+#: mediamanager/tdehardwarebackend.cpp:252
+#: mounthelper/tdeio_media_mounthelper.cpp:202
+msgid "Unknown mount error."
msgstr ""
#: mediamanager/dialog.cpp:26 mounthelper/dialog.cpp:26
-msgid "Decrypt"
+msgid "Unlock"
msgstr ""
-#: mediamanager/fstabbackend.cpp:104 mediamanager/fstabbackend.cpp:114
-#: mediamanager/halbackend.cpp:1595 mediamanager/halbackend.cpp:1617
-#: mediamanager/halbackend.cpp:1776 mediamanager/halbackend.cpp:1831
-#: mediamanager/tdehardwarebackend.cpp:1349
-#: mediamanager/tdehardwarebackend.cpp:1360
+#: mediamanager/fstabbackend.cpp:105 mediamanager/fstabbackend.cpp:120
+#: mediamanager/halbackend.cpp:1598 mediamanager/halbackend.cpp:1625
+#: mediamanager/halbackend.cpp:1808 mediamanager/halbackend.cpp:1877
+#: mediamanager/mediamanager.cpp:363 mediamanager/mediamanager.cpp:375
+#: mediamanager/mediamanager.cpp:387 mediamanager/mediamanager.cpp:399
+#: mediamanager/tdehardwarebackend.cpp:1363
+#: mediamanager/tdehardwarebackend.cpp:1378
#, c-format
msgid "No such medium: %1"
msgstr ""
-#: mediamanager/fstabbackend.cpp:398
+#: mediamanager/fstabbackend.cpp:408
msgid "CD Recorder"
msgstr "குறுந்தகடு பதிப்பான்"
-#: mediamanager/fstabbackend.cpp:404
+#: mediamanager/fstabbackend.cpp:414
msgid "DVD"
msgstr "டிவிடி"
-#: mediamanager/fstabbackend.cpp:415
+#: mediamanager/fstabbackend.cpp:425
msgid "CD-ROM"
msgstr "குறுந்தகடு-ராம்"
-#: mediamanager/fstabbackend.cpp:428
+#: mediamanager/fstabbackend.cpp:438
msgid "Floppy"
msgstr "நிகழ்வட்டு"
-#: mediamanager/fstabbackend.cpp:436
+#: mediamanager/fstabbackend.cpp:446
msgid "Zip Disk"
msgstr "ஜிப் வட்டு"
-#: mediamanager/fstabbackend.cpp:447
+#: mediamanager/fstabbackend.cpp:457
msgid "Removable Device"
msgstr "நீக்கக்கூடிய சாதனம்"
-#: mediamanager/fstabbackend.cpp:452 mediamanager/fstabbackend.cpp:458
+#: mediamanager/fstabbackend.cpp:462 mediamanager/fstabbackend.cpp:468
msgid "Remote Share"
msgstr "தொலைதூர பங்கு"
-#: mediamanager/fstabbackend.cpp:463
+#: mediamanager/fstabbackend.cpp:473
msgid "Hard Disk"
msgstr "வன் வட்டு"
-#: mediamanager/halbackend.cpp:749 mediamanager/tdehardwarebackend.cpp:805
+#: mediamanager/halbackend.cpp:744 mediamanager/tdehardwarebackend.cpp:808
msgid "Unknown Drive"
msgstr ""
-#: mediamanager/halbackend.cpp:761 mediamanager/tdehardwarebackend.cpp:835
+#: mediamanager/halbackend.cpp:756 mediamanager/tdehardwarebackend.cpp:838
#, fuzzy
msgid "Floppy Drive"
msgstr "நிகழ்வட்டு"
-#: mediamanager/halbackend.cpp:769
+#: mediamanager/halbackend.cpp:764
#, fuzzy
msgid "Zip Drive"
msgstr "ஜிப் வட்டு"
-#: mediamanager/halbackend.cpp:839 mediamanager/tdehardwarebackend.cpp:892
+#: mediamanager/halbackend.cpp:834 mediamanager/tdehardwarebackend.cpp:895
msgid "Camera"
msgstr ""
-#: mediamanager/halbackend.cpp:1221 mediamanager/halbackend.cpp:1247
+#: mediamanager/halbackend.cpp:1216 mediamanager/halbackend.cpp:1242
msgid "Authenticate"
msgstr ""
-#: mediamanager/halbackend.cpp:1222
+#: mediamanager/halbackend.cpp:1217
msgid ""
"<big><b>System policy prevents mounting internal media</b></big><br/"
">Authentication is required to perform this action. Please enter your "
"password to verify."
msgstr ""
-#: mediamanager/halbackend.cpp:1248
+#: mediamanager/halbackend.cpp:1243
msgid ""
"<big><b>System policy prevents unmounting media mounted by other users</b></"
"big><br/>Authentication is required to perform this action. Please enter "
"your password to verify."
msgstr ""
-#: mediamanager/halbackend.cpp:1284
+#: mediamanager/halbackend.cpp:1259 mediamanager/halbackend.cpp:1268
+#: mediamanager/halbackend.cpp:1849 mediamanager/halbackend.cpp:1916
+#: mounthelper/tdeio_media_mounthelper.cpp:58
+msgid "Internal Error"
+msgstr ""
+
+#: mediamanager/halbackend.cpp:1279
msgid "Invalid filesystem type"
msgstr ""
-#: mediamanager/halbackend.cpp:1286
+#: mediamanager/halbackend.cpp:1281
msgid ""
"Permission denied<p>Please ensure that:<br>1. You have permission to access "
"this device.<br>2. This device node is not listed in /etc/fstab.</p>"
msgstr ""
-#: mediamanager/halbackend.cpp:1290
+#: mediamanager/halbackend.cpp:1285
msgid "Device is already mounted."
msgstr ""
-#: mediamanager/halbackend.cpp:1340
+#: mediamanager/halbackend.cpp:1335
msgid ""
"Moreover, programs still using the device have been detected. They are "
"listed below. You have to close them or change their working directory "
"before attempting to unmount the device again."
msgstr ""
-#: mediamanager/halbackend.cpp:1381 mediamanager/tdehardwarebackend.cpp:1588
+#: mediamanager/halbackend.cpp:1376 mediamanager/tdehardwarebackend.cpp:1618
msgid ""
"Programs that were still using the device have been forcibly terminated. "
"They are listed below."
msgstr ""
-#: mediamanager/halbackend.cpp:1402 mediamanager/halbackend.cpp:1715
-#: mediamanager/tdehardwarebackend.cpp:1406
-#: mediamanager/tdehardwarebackend.cpp:1424
-#: mediamanager/tdehardwarebackend.cpp:1464
+#: mediamanager/halbackend.cpp:1397 mediamanager/halbackend.cpp:1742
+#: mediamanager/tdehardwarebackend.cpp:1430
+#: mediamanager/tdehardwarebackend.cpp:1452
+#: mediamanager/tdehardwarebackend.cpp:1494
msgid ""
"Unfortunately, the device <b>%1</b> (%2) named <b>'%3'</b> and currently "
"mounted at <b>%4</b> could not be unmounted. "
msgstr ""
-#: mediamanager/halbackend.cpp:1408 mediamanager/tdehardwarebackend.cpp:1470
+#: mediamanager/halbackend.cpp:1403 mediamanager/tdehardwarebackend.cpp:1500
msgid "The following error was returned by umount command:"
msgstr ""
-#: mediamanager/halbackend.cpp:1478
-msgid "Permission denied"
+#: mediamanager/halbackend.cpp:1567 mediamanager/tdehardwarebackend.cpp:1322
+msgid "Cannot mount encrypted locked drives!"
msgstr ""
-#: mediamanager/halbackend.cpp:1562 mediamanager/tdehardwarebackend.cpp:1232
-msgid "Cannot mount encrypted drives!"
+#: mediamanager/halbackend.cpp:1682 mediamanager/halbackend.cpp:1703
+#: mediamanager/halbackend.cpp:1716 mediamanager/halbackend.cpp:1830
+#: mediamanager/halbackend.cpp:1840 mediamanager/halbackend.cpp:1899
+#: mediamanager/halbackend.cpp:1907
+msgid "Internal error"
msgstr ""
-#: mediamanager/halbackend.cpp:1721
+#: mediamanager/halbackend.cpp:1694
+msgid "Unknown error"
+msgstr ""
+
+#: mediamanager/halbackend.cpp:1748
msgid "Unmounting failed due to the following error:"
msgstr ""
-#: mediamanager/halbackend.cpp:1723
+#: mediamanager/halbackend.cpp:1750
msgid "Device is Busy:"
msgstr ""
-#: mediamanager/halbackend.cpp:1727
+#: mediamanager/halbackend.cpp:1754
msgid ""
"Permission denied<p>Please ensure that:<br>1. You have permission to access "
"this device.<br>2. This device was originally mounted using TDE.</p>"
msgstr ""
-#: mediamanager/halbackend.cpp:1739
+#: mediamanager/halbackend.cpp:1766
msgid ""
"%1<p><b>Would you like to forcibly terminate these processes?</b><br><i>All "
"unsaved data would be lost</i>"
msgstr ""
-#: mediamanager/halbackend.cpp:1811
+#: mediamanager/halbackend.cpp:1852
msgid "Wrong password"
msgstr ""
-#: mediamanager/mediamanager.cpp:247 mediamanager/mediamanager.cpp:266
-#: mediamanager/mediamanager.cpp:285 mediamanager/mediamanager.cpp:293
-#: mediamanager/mediamanager.cpp:302 mediamanager/mediamanager.cpp:310
-msgid "Feature only available with HAL"
+#: mediamanager/mediamanager.cpp:248 mediamanager/mediamanager.cpp:275
+msgid "Feature only available with the TDE hardware backend"
msgstr ""
-#: mediamanager/mediamanager.cpp:252
-msgid "Feature only available with the TDE hardware backend"
+#: mediamanager/mediamanager.cpp:255 mediamanager/mediamanager.cpp:282
+#: mediamanager/mediamanager.cpp:312 mediamanager/mediamanager.cpp:343
+msgid "Feature only available with HAL"
msgstr ""
-#: mediamanager/mediamanager.cpp:256 mediamanager/mediamanager.cpp:271
-#: mediamanager/mediamanager.cpp:275
+#: mediamanager/mediamanager.cpp:262 mediamanager/mediamanager.cpp:289
+#: mediamanager/mediamanager.cpp:320 mediamanager/mediamanager.cpp:350
msgid "Feature only available with HAL or TDE hardware backend"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:480
-#: mediamanager/tdehardwarebackend.cpp:517
-#: mediamanager/tdehardwarebackend.cpp:750
+#: mediamanager/tdehardwarebackend.cpp:483
+#: mediamanager/tdehardwarebackend.cpp:520
+#: mediamanager/tdehardwarebackend.cpp:753
#, fuzzy
msgid "%1 Removable Device"
msgstr "நீக்கக்கூடிய சாதனம்"
-#: mediamanager/tdehardwarebackend.cpp:525
+#: mediamanager/tdehardwarebackend.cpp:528
#, fuzzy
msgid "Blank CD-ROM"
msgstr "குறுந்தகடு-ராம்"
-#: mediamanager/tdehardwarebackend.cpp:534
+#: mediamanager/tdehardwarebackend.cpp:537
msgid "Blank CD-R"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:543
+#: mediamanager/tdehardwarebackend.cpp:546
msgid "Blank CD-RW"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:552
+#: mediamanager/tdehardwarebackend.cpp:555
msgid "Blank Magneto-Optical CD"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:561
+#: mediamanager/tdehardwarebackend.cpp:564
msgid "Blank Mount Ranier CD-RW"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:570
+#: mediamanager/tdehardwarebackend.cpp:573
msgid "Blank Mount Ranier CD-RW-W"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:579
+#: mediamanager/tdehardwarebackend.cpp:582
msgid "Blank DVD-ROM"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:588
+#: mediamanager/tdehardwarebackend.cpp:591
msgid "Blank DVD-RAM"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:597
+#: mediamanager/tdehardwarebackend.cpp:600
msgid "Blank DVD-R"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:606
+#: mediamanager/tdehardwarebackend.cpp:609
msgid "Blank DVD-RW"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:615
+#: mediamanager/tdehardwarebackend.cpp:618
msgid "Blank Dual Layer DVD-R"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:624
+#: mediamanager/tdehardwarebackend.cpp:627
msgid "Blank Dual Layer DVD-RW"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:633
+#: mediamanager/tdehardwarebackend.cpp:636
msgid "Blank DVD+R"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:642
+#: mediamanager/tdehardwarebackend.cpp:645
msgid "Blank DVD+RW"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:651
+#: mediamanager/tdehardwarebackend.cpp:654
msgid "Blank Dual Layer DVD+R"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:660
+#: mediamanager/tdehardwarebackend.cpp:663
msgid "Blank Dual Layer DVD+RW"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:669
+#: mediamanager/tdehardwarebackend.cpp:672
msgid "Blank BD-ROM"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:678
+#: mediamanager/tdehardwarebackend.cpp:681
msgid "Blank BD-R"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:687
+#: mediamanager/tdehardwarebackend.cpp:690
msgid "Blank BD-RW"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:696
+#: mediamanager/tdehardwarebackend.cpp:699
msgid "Blank HDDVD-ROM"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:705
+#: mediamanager/tdehardwarebackend.cpp:708
msgid "Blank HDDVD-R"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:714
+#: mediamanager/tdehardwarebackend.cpp:717
msgid "Blank HDDVD-RW"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:721
+#: mediamanager/tdehardwarebackend.cpp:724
msgid "Audio CD"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:742
+#: mediamanager/tdehardwarebackend.cpp:745
msgid "%1 Fixed Disk (%2)"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:849
+#: mediamanager/tdehardwarebackend.cpp:852
#, fuzzy
msgid "%1 Zip Disk"
msgstr "ஜிப் வட்டு"
-#: mediamanager/tdehardwarebackend.cpp:1212
-#: mediamanager/tdehardwarebackend.cpp:1392
-msgid "Internal error"
+#: mediamanager/tdehardwarebackend.cpp:1224
+#: mediamanager/tdehardwarebackend.cpp:1417
+msgid "Internal error. Couldn't find medium."
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:1239
-msgid ""
-"<qt>Unable to mount this device.<p>Potential reasons include:<br>Improper "
-"device and/or user privilege level<br>Corrupt data on storage device"
+#: mediamanager/tdehardwarebackend.cpp:1249
+#: mediamanager/tdehardwarebackend.cpp:1323
+msgid "Unable to mount this device."
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:1241
-#: mediamanager/tdehardwarebackend.cpp:1316
-#: mediamanager/tdehardwarebackend.cpp:1408
-#: mediamanager/tdehardwarebackend.cpp:1426
+#: mediamanager/tdehardwarebackend.cpp:1252
+#: mediamanager/tdehardwarebackend.cpp:1326
+#: mediamanager/tdehardwarebackend.cpp:1435
+#: mediamanager/tdehardwarebackend.cpp:1457
msgid "<p>Technical details:<br>"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:1314
-msgid ""
-"<qt>Unable to mount this device.<p>Potential reasons include:<br>Improper "
-"device and/or user privilege level<br>Corrupt data on storage "
-"device<br>Incorrect encryption password"
+#: mediamanager/tdehardwarebackend.cpp:1284
+msgid "Decryption aborted"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:1420
+#: mediamanager/tdehardwarebackend.cpp:1443
msgid ""
"<qt>The device <b>%1</b> (%2) named <b>'%3'</b> and currently mounted at <b>"
"%4</b> can not be unmounted at this time.<p>%5<p><b>Would you like to "
@@ -381,7 +386,7 @@ msgid ""
"lost</i>"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:1547
+#: mediamanager/tdehardwarebackend.cpp:1577
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 "
@@ -392,7 +397,7 @@ msgstr ""
msgid "%1 cannot be found."
msgstr "%1 இல்லை."
-#: mounthelper/tdeio_media_mounthelper.cpp:86
+#: mounthelper/tdeio_media_mounthelper.cpp:87
msgid "%1 is not a mountable media."
msgstr "%1 என்பது ஏற்றக்கூடிய மீடியா இல்லை."
@@ -402,39 +407,47 @@ msgid "%1 is not an encrypted media."
msgstr "%1 என்பது ஏற்றக்கூடிய மீடியா இல்லை."
#: mounthelper/tdeio_media_mounthelper.cpp:107
-msgid "%1 is already decrypted."
+msgid "%1 is already unlocked."
+msgstr ""
+
+#: mounthelper/tdeio_media_mounthelper.cpp:139
+msgid "Unknown unmount error."
msgstr ""
-#: mounthelper/tdeio_media_mounthelper.cpp:228
+#: mounthelper/tdeio_media_mounthelper.cpp:246
msgid "The device was successfully unmounted, but the tray could not be opened"
msgstr ""
-#: mounthelper/tdeio_media_mounthelper.cpp:230
+#: mounthelper/tdeio_media_mounthelper.cpp:248
msgid "The device was successfully unmounted, but could not be ejected"
msgstr ""
-#: mounthelper/tdeio_media_mounthelper.cpp:275
+#: mounthelper/tdeio_media_mounthelper.cpp:281
+msgid "Unknown decrypt error."
+msgstr ""
+
+#: mounthelper/tdeio_media_mounthelper.cpp:295
#, fuzzy
msgid "Decrypt given URL"
msgstr "கொடுக்கப்பட்ட வலைமனையை வெளியேற்று"
-#: mounthelper/tdeio_media_mounthelper.cpp:276
+#: mounthelper/tdeio_media_mounthelper.cpp:296
msgid "Unmount given URL"
msgstr "கொடுக்கப்பட்ட வலைமனையை வெளியேற்று"
-#: mounthelper/tdeio_media_mounthelper.cpp:277
+#: mounthelper/tdeio_media_mounthelper.cpp:297
msgid "Mount given URL (default)"
msgstr "கொடுக்கப்பட்ட வலைமனையை ஏற்று (முன்னிருப்பு)"
-#: mounthelper/tdeio_media_mounthelper.cpp:278
+#: mounthelper/tdeio_media_mounthelper.cpp:298
msgid "Eject given URL via tdeeject"
msgstr "கொடுக்கப்பட்ட வலைமனையை கேடியிவெளியேற்று வழியாக வெளியேற்று"
-#: mounthelper/tdeio_media_mounthelper.cpp:279
+#: mounthelper/tdeio_media_mounthelper.cpp:299
msgid "Unmount and Eject given URL (necessary for some USB devices)"
msgstr "கொடுக்கப்பட்ட வலைமனையை இறக்கி வெளியேற்று (சில யுஎஸ்பி சாதனங்களுக்கு அவசியம்)"
-#: mounthelper/tdeio_media_mounthelper.cpp:280
+#: mounthelper/tdeio_media_mounthelper.cpp:300
msgid "media:/ URL to mount/unmount/eject/remove"
msgstr "மீடியா:/ ஏற்ற/இறக்க/வெளியேற்ற/நீக்கவேண்டிய வலைமனை"
@@ -456,43 +469,43 @@ msgstr ""
msgid "&Mounting"
msgstr "சுட்டிப் புள்ளி"
-#: tdefile-plugin/tdefilemediaplugin.cpp:190
+#: tdefile-plugin/tdefilemediaplugin.cpp:184
msgid "Medium Information"
msgstr "மீடியம் தகவல்"
-#: tdefile-plugin/tdefilemediaplugin.cpp:193
+#: tdefile-plugin/tdefilemediaplugin.cpp:187
msgid "Free"
msgstr "இலவசம்"
-#: tdefile-plugin/tdefilemediaplugin.cpp:196
+#: tdefile-plugin/tdefilemediaplugin.cpp:190
msgid "Used"
msgstr "பயன்படுத்தப்பட்டது"
-#: tdefile-plugin/tdefilemediaplugin.cpp:199
+#: tdefile-plugin/tdefilemediaplugin.cpp:193
msgid "Total"
msgstr "மொத்தம்"
-#: tdefile-plugin/tdefilemediaplugin.cpp:202
+#: tdefile-plugin/tdefilemediaplugin.cpp:196
msgid "Base URL"
msgstr "அடிப்படை வலைமனை"
-#: tdefile-plugin/tdefilemediaplugin.cpp:203
+#: tdefile-plugin/tdefilemediaplugin.cpp:197
msgid "Mount Point"
msgstr "சுட்டிப் புள்ளி"
-#: tdefile-plugin/tdefilemediaplugin.cpp:204
+#: tdefile-plugin/tdefilemediaplugin.cpp:198
msgid "Device Node"
msgstr "சாதன முடிச்சு"
-#: tdefile-plugin/tdefilemediaplugin.cpp:206
+#: tdefile-plugin/tdefilemediaplugin.cpp:200
msgid "Medium Summary"
msgstr "மீடியம் சுருக்கம்"
-#: tdefile-plugin/tdefilemediaplugin.cpp:208
+#: tdefile-plugin/tdefilemediaplugin.cpp:202
msgid "Usage"
msgstr "பயன்பாடு"
-#: tdefile-plugin/tdefilemediaplugin.cpp:210
+#: tdefile-plugin/tdefilemediaplugin.cpp:204
msgid "Bar Graph"
msgstr "பட்டி வரைபடம்"
@@ -564,23 +577,30 @@ msgid ""
"devices are plugged in."
msgstr ""
-#: mediamanager/decryptdialog.ui:24 mounthelper/decryptdialog.ui:24
+#: mediamanager/unlockdialog.ui:24 mounthelper/unlockdialog.ui:24
#, no-c-format
msgid "Decrypting Storage Device"
msgstr ""
-#: mediamanager/decryptdialog.ui:109 mounthelper/decryptdialog.ui:109
+#: mediamanager/unlockdialog.ui:109
#, no-c-format
msgid ""
-"<p><b>%1</b> is an encrypted storage device.</p>\n"
-"<p>Please enter the password to decrypt the storage device.</p>"
+"<p><b>%1</b> is an encrypted locked storage device.</p>\n"
+"<p>Please enter the password to unlock the storage device.</p>"
msgstr ""
-#: mediamanager/decryptdialog.ui:131 mounthelper/decryptdialog.ui:131
+#: mediamanager/unlockdialog.ui:131 mounthelper/unlockdialog.ui:131
#, no-c-format
msgid "&Password:"
msgstr ""
+#: mounthelper/unlockdialog.ui:109
+#, no-c-format
+msgid ""
+"<p><b>%1</b> is an encrypted storage device.</p>\n"
+"<p>Please enter the password to decrypt the storage device.</p>"
+msgstr ""
+
#: propsdlgplugin/propertiespagegui.ui:16
#, no-c-format
msgid "PropertiesPageGUI"
diff --git a/tde-i18n-te/messages/tdebase/tdeio_media.po b/tde-i18n-te/messages/tdebase/tdeio_media.po
index 79c9973c4e9..260b485f84d 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: 2019-01-13 18:47+0100\n"
+"POT-Creation-Date: 2019-07-11 02:33+0200\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"
@@ -45,7 +45,6 @@ msgstr "తెలియనిది"
#: mediaimpl.cpp:88 mediaimpl.cpp:115 mediaimpl.cpp:141 mediaimpl.cpp:177
#: mediaimpl.cpp:197 mediaimpl.cpp:218
#: mounthelper/tdeio_media_mounthelper.cpp:50
-#: mounthelper/tdeio_media_mounthelper.cpp:256
msgid "The TDE mediamanager is not running."
msgstr ""
@@ -53,7 +52,7 @@ msgstr ""
msgid "This media name already exists."
msgstr "ఈ మాద్యమం పేరు ముందేవుంది"
-#: mediaimpl.cpp:230 mediaimpl.cpp:293
+#: mediaimpl.cpp:230 mediaimpl.cpp:297
msgid "No such medium."
msgstr "ఇలాంటి మాద్యమం లేదు"
@@ -61,321 +60,329 @@ msgstr "ఇలాంటి మాద్యమం లేదు"
msgid "The drive is encrypted."
msgstr ""
-#: mediaimpl.cpp:272 mediamanager/halbackend.cpp:1264
-#: mediamanager/halbackend.cpp:1273 mediamanager/halbackend.cpp:1663
-#: mediamanager/halbackend.cpp:1680 mediamanager/halbackend.cpp:1691
-#: mediamanager/halbackend.cpp:1793 mediamanager/halbackend.cpp:1801
-#: mediamanager/halbackend.cpp:1808 mediamanager/halbackend.cpp:1848
-#: mediamanager/halbackend.cpp:1854 mediamanager/halbackend.cpp:1861
-#: mounthelper/tdeio_media_mounthelper.cpp:58
-msgid "Internal Error"
-msgstr "అంతర్గత దోషం"
+#: mediaimpl.cpp:274 mediamanager/tdehardwarebackend.cpp:201
+#: mediamanager/tdehardwarebackend.cpp:252
+#: mounthelper/tdeio_media_mounthelper.cpp:202
+msgid "Unknown mount error."
+msgstr ""
#: mediamanager/dialog.cpp:26 mounthelper/dialog.cpp:26
-msgid "Decrypt"
+msgid "Unlock"
msgstr ""
-#: mediamanager/fstabbackend.cpp:104 mediamanager/fstabbackend.cpp:114
-#: mediamanager/halbackend.cpp:1595 mediamanager/halbackend.cpp:1617
-#: mediamanager/halbackend.cpp:1776 mediamanager/halbackend.cpp:1831
-#: mediamanager/tdehardwarebackend.cpp:1349
-#: mediamanager/tdehardwarebackend.cpp:1360
+#: mediamanager/fstabbackend.cpp:105 mediamanager/fstabbackend.cpp:120
+#: mediamanager/halbackend.cpp:1598 mediamanager/halbackend.cpp:1625
+#: mediamanager/halbackend.cpp:1808 mediamanager/halbackend.cpp:1877
+#: mediamanager/mediamanager.cpp:363 mediamanager/mediamanager.cpp:375
+#: mediamanager/mediamanager.cpp:387 mediamanager/mediamanager.cpp:399
+#: mediamanager/tdehardwarebackend.cpp:1363
+#: mediamanager/tdehardwarebackend.cpp:1378
#, c-format
msgid "No such medium: %1"
msgstr "%1 : ఇలాంటి మాద్యమం లేదు"
-#: mediamanager/fstabbackend.cpp:398
+#: mediamanager/fstabbackend.cpp:408
msgid "CD Recorder"
msgstr "సీడీ రికార్డర్"
-#: mediamanager/fstabbackend.cpp:404
+#: mediamanager/fstabbackend.cpp:414
msgid "DVD"
msgstr "డివిడి"
-#: mediamanager/fstabbackend.cpp:415
+#: mediamanager/fstabbackend.cpp:425
msgid "CD-ROM"
msgstr "సిడీ-రామ్"
-#: mediamanager/fstabbackend.cpp:428
+#: mediamanager/fstabbackend.cpp:438
msgid "Floppy"
msgstr "ఫ్లాపి"
-#: mediamanager/fstabbackend.cpp:436
+#: mediamanager/fstabbackend.cpp:446
msgid "Zip Disk"
msgstr "జిప్ డిస్క్"
-#: mediamanager/fstabbackend.cpp:447
+#: mediamanager/fstabbackend.cpp:457
msgid "Removable Device"
msgstr "తీసివేయగల పరికరం"
-#: mediamanager/fstabbackend.cpp:452 mediamanager/fstabbackend.cpp:458
+#: mediamanager/fstabbackend.cpp:462 mediamanager/fstabbackend.cpp:468
msgid "Remote Share"
msgstr "రిమొట్ షేర్"
-#: mediamanager/fstabbackend.cpp:463
+#: mediamanager/fstabbackend.cpp:473
msgid "Hard Disk"
msgstr "హార్డ్ డిస్క్"
-#: mediamanager/halbackend.cpp:749 mediamanager/tdehardwarebackend.cpp:805
+#: mediamanager/halbackend.cpp:744 mediamanager/tdehardwarebackend.cpp:808
#, fuzzy
msgid "Unknown Drive"
msgstr "తెలియనిది"
-#: mediamanager/halbackend.cpp:761 mediamanager/tdehardwarebackend.cpp:835
+#: mediamanager/halbackend.cpp:756 mediamanager/tdehardwarebackend.cpp:838
#, fuzzy
msgid "Floppy Drive"
msgstr "ఫ్లాపి"
-#: mediamanager/halbackend.cpp:769
+#: mediamanager/halbackend.cpp:764
#, fuzzy
msgid "Zip Drive"
msgstr "జిప్ డిస్క్"
-#: mediamanager/halbackend.cpp:839 mediamanager/tdehardwarebackend.cpp:892
+#: mediamanager/halbackend.cpp:834 mediamanager/tdehardwarebackend.cpp:895
msgid "Camera"
msgstr "కెమెరా"
-#: mediamanager/halbackend.cpp:1221 mediamanager/halbackend.cpp:1247
+#: mediamanager/halbackend.cpp:1216 mediamanager/halbackend.cpp:1242
msgid "Authenticate"
msgstr ""
-#: mediamanager/halbackend.cpp:1222
+#: mediamanager/halbackend.cpp:1217
msgid ""
"<big><b>System policy prevents mounting internal media</b></big><br/"
">Authentication is required to perform this action. Please enter your "
"password to verify."
msgstr ""
-#: mediamanager/halbackend.cpp:1248
+#: mediamanager/halbackend.cpp:1243
msgid ""
"<big><b>System policy prevents unmounting media mounted by other users</b></"
"big><br/>Authentication is required to perform this action. Please enter "
"your password to verify."
msgstr ""
-#: mediamanager/halbackend.cpp:1284
+#: mediamanager/halbackend.cpp:1259 mediamanager/halbackend.cpp:1268
+#: mediamanager/halbackend.cpp:1849 mediamanager/halbackend.cpp:1916
+#: mounthelper/tdeio_media_mounthelper.cpp:58
+msgid "Internal Error"
+msgstr "అంతర్గత దోషం"
+
+#: mediamanager/halbackend.cpp:1279
msgid "Invalid filesystem type"
msgstr ""
-#: mediamanager/halbackend.cpp:1286
+#: mediamanager/halbackend.cpp:1281
msgid ""
"Permission denied<p>Please ensure that:<br>1. You have permission to access "
"this device.<br>2. This device node is not listed in /etc/fstab.</p>"
msgstr ""
-#: mediamanager/halbackend.cpp:1290
+#: mediamanager/halbackend.cpp:1285
msgid "Device is already mounted."
msgstr ""
-#: mediamanager/halbackend.cpp:1340
+#: mediamanager/halbackend.cpp:1335
msgid ""
"Moreover, programs still using the device have been detected. They are "
"listed below. You have to close them or change their working directory "
"before attempting to unmount the device again."
msgstr ""
-#: mediamanager/halbackend.cpp:1381 mediamanager/tdehardwarebackend.cpp:1588
+#: mediamanager/halbackend.cpp:1376 mediamanager/tdehardwarebackend.cpp:1618
msgid ""
"Programs that were still using the device have been forcibly terminated. "
"They are listed below."
msgstr ""
-#: mediamanager/halbackend.cpp:1402 mediamanager/halbackend.cpp:1715
-#: mediamanager/tdehardwarebackend.cpp:1406
-#: mediamanager/tdehardwarebackend.cpp:1424
-#: mediamanager/tdehardwarebackend.cpp:1464
+#: mediamanager/halbackend.cpp:1397 mediamanager/halbackend.cpp:1742
+#: mediamanager/tdehardwarebackend.cpp:1430
+#: mediamanager/tdehardwarebackend.cpp:1452
+#: mediamanager/tdehardwarebackend.cpp:1494
msgid ""
"Unfortunately, the device <b>%1</b> (%2) named <b>'%3'</b> and currently "
"mounted at <b>%4</b> could not be unmounted. "
msgstr ""
-#: mediamanager/halbackend.cpp:1408 mediamanager/tdehardwarebackend.cpp:1470
+#: mediamanager/halbackend.cpp:1403 mediamanager/tdehardwarebackend.cpp:1500
msgid "The following error was returned by umount command:"
msgstr ""
-#: mediamanager/halbackend.cpp:1478
-msgid "Permission denied"
+#: mediamanager/halbackend.cpp:1567 mediamanager/tdehardwarebackend.cpp:1322
+msgid "Cannot mount encrypted locked drives!"
msgstr ""
-#: mediamanager/halbackend.cpp:1562 mediamanager/tdehardwarebackend.cpp:1232
-msgid "Cannot mount encrypted drives!"
-msgstr ""
+#: mediamanager/halbackend.cpp:1682 mediamanager/halbackend.cpp:1703
+#: mediamanager/halbackend.cpp:1716 mediamanager/halbackend.cpp:1830
+#: mediamanager/halbackend.cpp:1840 mediamanager/halbackend.cpp:1899
+#: mediamanager/halbackend.cpp:1907
+#, fuzzy
+msgid "Internal error"
+msgstr "అంతర్గత దోషం"
-#: mediamanager/halbackend.cpp:1721
+#: mediamanager/halbackend.cpp:1694
+#, fuzzy
+#| msgid "Unknown"
+msgid "Unknown error"
+msgstr "తెలియనిది"
+
+#: mediamanager/halbackend.cpp:1748
msgid "Unmounting failed due to the following error:"
msgstr ""
-#: mediamanager/halbackend.cpp:1723
+#: mediamanager/halbackend.cpp:1750
msgid "Device is Busy:"
msgstr ""
-#: mediamanager/halbackend.cpp:1727
+#: mediamanager/halbackend.cpp:1754
msgid ""
"Permission denied<p>Please ensure that:<br>1. You have permission to access "
"this device.<br>2. This device was originally mounted using TDE.</p>"
msgstr ""
-#: mediamanager/halbackend.cpp:1739
+#: mediamanager/halbackend.cpp:1766
msgid ""
"%1<p><b>Would you like to forcibly terminate these processes?</b><br><i>All "
"unsaved data would be lost</i>"
msgstr ""
-#: mediamanager/halbackend.cpp:1811
+#: mediamanager/halbackend.cpp:1852
msgid "Wrong password"
msgstr ""
-#: mediamanager/mediamanager.cpp:247 mediamanager/mediamanager.cpp:266
-#: mediamanager/mediamanager.cpp:285 mediamanager/mediamanager.cpp:293
-#: mediamanager/mediamanager.cpp:302 mediamanager/mediamanager.cpp:310
-msgid "Feature only available with HAL"
+#: mediamanager/mediamanager.cpp:248 mediamanager/mediamanager.cpp:275
+msgid "Feature only available with the TDE hardware backend"
msgstr ""
-#: mediamanager/mediamanager.cpp:252
-msgid "Feature only available with the TDE hardware backend"
+#: mediamanager/mediamanager.cpp:255 mediamanager/mediamanager.cpp:282
+#: mediamanager/mediamanager.cpp:312 mediamanager/mediamanager.cpp:343
+msgid "Feature only available with HAL"
msgstr ""
-#: mediamanager/mediamanager.cpp:256 mediamanager/mediamanager.cpp:271
-#: mediamanager/mediamanager.cpp:275
+#: mediamanager/mediamanager.cpp:262 mediamanager/mediamanager.cpp:289
+#: mediamanager/mediamanager.cpp:320 mediamanager/mediamanager.cpp:350
msgid "Feature only available with HAL or TDE hardware backend"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:480
-#: mediamanager/tdehardwarebackend.cpp:517
-#: mediamanager/tdehardwarebackend.cpp:750
+#: mediamanager/tdehardwarebackend.cpp:483
+#: mediamanager/tdehardwarebackend.cpp:520
+#: mediamanager/tdehardwarebackend.cpp:753
#, fuzzy
msgid "%1 Removable Device"
msgstr "తీసివేయగల పరికరం"
-#: mediamanager/tdehardwarebackend.cpp:525
+#: mediamanager/tdehardwarebackend.cpp:528
#, fuzzy
msgid "Blank CD-ROM"
msgstr "సిడీ-రామ్"
-#: mediamanager/tdehardwarebackend.cpp:534
+#: mediamanager/tdehardwarebackend.cpp:537
msgid "Blank CD-R"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:543
+#: mediamanager/tdehardwarebackend.cpp:546
msgid "Blank CD-RW"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:552
+#: mediamanager/tdehardwarebackend.cpp:555
msgid "Blank Magneto-Optical CD"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:561
+#: mediamanager/tdehardwarebackend.cpp:564
msgid "Blank Mount Ranier CD-RW"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:570
+#: mediamanager/tdehardwarebackend.cpp:573
msgid "Blank Mount Ranier CD-RW-W"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:579
+#: mediamanager/tdehardwarebackend.cpp:582
msgid "Blank DVD-ROM"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:588
+#: mediamanager/tdehardwarebackend.cpp:591
msgid "Blank DVD-RAM"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:597
+#: mediamanager/tdehardwarebackend.cpp:600
msgid "Blank DVD-R"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:606
+#: mediamanager/tdehardwarebackend.cpp:609
msgid "Blank DVD-RW"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:615
+#: mediamanager/tdehardwarebackend.cpp:618
msgid "Blank Dual Layer DVD-R"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:624
+#: mediamanager/tdehardwarebackend.cpp:627
msgid "Blank Dual Layer DVD-RW"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:633
+#: mediamanager/tdehardwarebackend.cpp:636
msgid "Blank DVD+R"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:642
+#: mediamanager/tdehardwarebackend.cpp:645
msgid "Blank DVD+RW"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:651
+#: mediamanager/tdehardwarebackend.cpp:654
msgid "Blank Dual Layer DVD+R"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:660
+#: mediamanager/tdehardwarebackend.cpp:663
msgid "Blank Dual Layer DVD+RW"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:669
+#: mediamanager/tdehardwarebackend.cpp:672
msgid "Blank BD-ROM"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:678
+#: mediamanager/tdehardwarebackend.cpp:681
msgid "Blank BD-R"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:687
+#: mediamanager/tdehardwarebackend.cpp:690
msgid "Blank BD-RW"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:696
+#: mediamanager/tdehardwarebackend.cpp:699
msgid "Blank HDDVD-ROM"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:705
+#: mediamanager/tdehardwarebackend.cpp:708
msgid "Blank HDDVD-R"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:714
+#: mediamanager/tdehardwarebackend.cpp:717
msgid "Blank HDDVD-RW"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:721
+#: mediamanager/tdehardwarebackend.cpp:724
msgid "Audio CD"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:742
+#: mediamanager/tdehardwarebackend.cpp:745
msgid "%1 Fixed Disk (%2)"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:849
+#: mediamanager/tdehardwarebackend.cpp:852
#, fuzzy
msgid "%1 Zip Disk"
msgstr "జిప్ డిస్క్"
-#: mediamanager/tdehardwarebackend.cpp:1212
-#: mediamanager/tdehardwarebackend.cpp:1392
-#, fuzzy
-msgid "Internal error"
-msgstr "అంతర్గత దోషం"
+#: mediamanager/tdehardwarebackend.cpp:1224
+#: mediamanager/tdehardwarebackend.cpp:1417
+msgid "Internal error. Couldn't find medium."
+msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:1239
-msgid ""
-"<qt>Unable to mount this device.<p>Potential reasons include:<br>Improper "
-"device and/or user privilege level<br>Corrupt data on storage device"
+#: mediamanager/tdehardwarebackend.cpp:1249
+#: mediamanager/tdehardwarebackend.cpp:1323
+msgid "Unable to mount this device."
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:1241
-#: mediamanager/tdehardwarebackend.cpp:1316
-#: mediamanager/tdehardwarebackend.cpp:1408
-#: mediamanager/tdehardwarebackend.cpp:1426
+#: mediamanager/tdehardwarebackend.cpp:1252
+#: mediamanager/tdehardwarebackend.cpp:1326
+#: mediamanager/tdehardwarebackend.cpp:1435
+#: mediamanager/tdehardwarebackend.cpp:1457
msgid "<p>Technical details:<br>"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:1314
-msgid ""
-"<qt>Unable to mount this device.<p>Potential reasons include:<br>Improper "
-"device and/or user privilege level<br>Corrupt data on storage "
-"device<br>Incorrect encryption password"
+#: mediamanager/tdehardwarebackend.cpp:1284
+msgid "Decryption aborted"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:1420
+#: mediamanager/tdehardwarebackend.cpp:1443
msgid ""
"<qt>The device <b>%1</b> (%2) named <b>'%3'</b> and currently mounted at <b>"
"%4</b> can not be unmounted at this time.<p>%5<p><b>Would you like to "
@@ -383,7 +390,7 @@ msgid ""
"lost</i>"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:1547
+#: mediamanager/tdehardwarebackend.cpp:1577
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 "
@@ -394,7 +401,7 @@ msgstr ""
msgid "%1 cannot be found."
msgstr "%1 కనపడుట లేదు"
-#: mounthelper/tdeio_media_mounthelper.cpp:86
+#: mounthelper/tdeio_media_mounthelper.cpp:87
msgid "%1 is not a mountable media."
msgstr ""
@@ -403,38 +410,46 @@ msgid "%1 is not an encrypted media."
msgstr ""
#: mounthelper/tdeio_media_mounthelper.cpp:107
-msgid "%1 is already decrypted."
+msgid "%1 is already unlocked."
+msgstr ""
+
+#: mounthelper/tdeio_media_mounthelper.cpp:139
+msgid "Unknown unmount error."
msgstr ""
-#: mounthelper/tdeio_media_mounthelper.cpp:228
+#: mounthelper/tdeio_media_mounthelper.cpp:246
msgid "The device was successfully unmounted, but the tray could not be opened"
msgstr ""
-#: mounthelper/tdeio_media_mounthelper.cpp:230
+#: mounthelper/tdeio_media_mounthelper.cpp:248
msgid "The device was successfully unmounted, but could not be ejected"
msgstr ""
-#: mounthelper/tdeio_media_mounthelper.cpp:275
+#: mounthelper/tdeio_media_mounthelper.cpp:281
+msgid "Unknown decrypt error."
+msgstr ""
+
+#: mounthelper/tdeio_media_mounthelper.cpp:295
msgid "Decrypt given URL"
msgstr ""
-#: mounthelper/tdeio_media_mounthelper.cpp:276
+#: mounthelper/tdeio_media_mounthelper.cpp:296
msgid "Unmount given URL"
msgstr ""
-#: mounthelper/tdeio_media_mounthelper.cpp:277
+#: mounthelper/tdeio_media_mounthelper.cpp:297
msgid "Mount given URL (default)"
msgstr ""
-#: mounthelper/tdeio_media_mounthelper.cpp:278
+#: mounthelper/tdeio_media_mounthelper.cpp:298
msgid "Eject given URL via tdeeject"
msgstr ""
-#: mounthelper/tdeio_media_mounthelper.cpp:279
+#: mounthelper/tdeio_media_mounthelper.cpp:299
msgid "Unmount and Eject given URL (necessary for some USB devices)"
msgstr ""
-#: mounthelper/tdeio_media_mounthelper.cpp:280
+#: mounthelper/tdeio_media_mounthelper.cpp:300
msgid "media:/ URL to mount/unmount/eject/remove"
msgstr ""
@@ -455,43 +470,43 @@ msgstr "మార్పులను దాచుటలో విఫలమైన
msgid "&Mounting"
msgstr ""
-#: tdefile-plugin/tdefilemediaplugin.cpp:190
+#: tdefile-plugin/tdefilemediaplugin.cpp:184
msgid "Medium Information"
msgstr "మాధ్యమ సమాచారం"
-#: tdefile-plugin/tdefilemediaplugin.cpp:193
+#: tdefile-plugin/tdefilemediaplugin.cpp:187
msgid "Free"
msgstr "ఖాళి"
-#: tdefile-plugin/tdefilemediaplugin.cpp:196
+#: tdefile-plugin/tdefilemediaplugin.cpp:190
msgid "Used"
msgstr "వాడినది"
-#: tdefile-plugin/tdefilemediaplugin.cpp:199
+#: tdefile-plugin/tdefilemediaplugin.cpp:193
msgid "Total"
msgstr "మొత్తం"
-#: tdefile-plugin/tdefilemediaplugin.cpp:202
+#: tdefile-plugin/tdefilemediaplugin.cpp:196
msgid "Base URL"
msgstr "మూల యూఆర్ ఎల్"
-#: tdefile-plugin/tdefilemediaplugin.cpp:203
+#: tdefile-plugin/tdefilemediaplugin.cpp:197
msgid "Mount Point"
msgstr ""
-#: tdefile-plugin/tdefilemediaplugin.cpp:204
+#: tdefile-plugin/tdefilemediaplugin.cpp:198
msgid "Device Node"
msgstr ""
-#: tdefile-plugin/tdefilemediaplugin.cpp:206
+#: tdefile-plugin/tdefilemediaplugin.cpp:200
msgid "Medium Summary"
msgstr "మాద్యమ సారాంశం"
-#: tdefile-plugin/tdefilemediaplugin.cpp:208
+#: tdefile-plugin/tdefilemediaplugin.cpp:202
msgid "Usage"
msgstr "వాడుక"
-#: tdefile-plugin/tdefilemediaplugin.cpp:210
+#: tdefile-plugin/tdefilemediaplugin.cpp:204
msgid "Bar Graph"
msgstr ""
@@ -563,23 +578,30 @@ msgid ""
"devices are plugged in."
msgstr ""
-#: mediamanager/decryptdialog.ui:24 mounthelper/decryptdialog.ui:24
+#: mediamanager/unlockdialog.ui:24 mounthelper/unlockdialog.ui:24
#, no-c-format
msgid "Decrypting Storage Device"
msgstr ""
-#: mediamanager/decryptdialog.ui:109 mounthelper/decryptdialog.ui:109
+#: mediamanager/unlockdialog.ui:109
#, no-c-format
msgid ""
-"<p><b>%1</b> is an encrypted storage device.</p>\n"
-"<p>Please enter the password to decrypt the storage device.</p>"
+"<p><b>%1</b> is an encrypted locked storage device.</p>\n"
+"<p>Please enter the password to unlock the storage device.</p>"
msgstr ""
-#: mediamanager/decryptdialog.ui:131 mounthelper/decryptdialog.ui:131
+#: mediamanager/unlockdialog.ui:131 mounthelper/unlockdialog.ui:131
#, no-c-format
msgid "&Password:"
msgstr ""
+#: mounthelper/unlockdialog.ui:109
+#, no-c-format
+msgid ""
+"<p><b>%1</b> is an encrypted storage device.</p>\n"
+"<p>Please enter the password to decrypt the storage device.</p>"
+msgstr ""
+
#: propsdlgplugin/propertiespagegui.ui:16
#, no-c-format
msgid "PropertiesPageGUI"
diff --git a/tde-i18n-tg/messages/tdebase/tdeio_media.po b/tde-i18n-tg/messages/tdebase/tdeio_media.po
index 8044e7a4d98..a2cbf5cc4d9 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: 2019-01-13 18:47+0100\n"
+"POT-Creation-Date: 2019-07-11 02:33+0200\n"
"PO-Revision-Date: 2005-09-16 15:48+0500\n"
"Last-Translator: Victor Ibragimov <youth_opportunities@tajikngo.org>\n"
"Language-Team: Tajik\n"
@@ -51,7 +51,6 @@ msgstr "Ношинос"
#: mediaimpl.cpp:88 mediaimpl.cpp:115 mediaimpl.cpp:141 mediaimpl.cpp:177
#: mediaimpl.cpp:197 mediaimpl.cpp:218
#: mounthelper/tdeio_media_mounthelper.cpp:50
-#: mounthelper/tdeio_media_mounthelper.cpp:256
msgid "The TDE mediamanager is not running."
msgstr ""
@@ -59,7 +58,7 @@ msgstr ""
msgid "This media name already exists."
msgstr ""
-#: mediaimpl.cpp:230 mediaimpl.cpp:293
+#: mediaimpl.cpp:230 mediaimpl.cpp:297
msgid "No such medium."
msgstr ""
@@ -67,320 +66,328 @@ msgstr ""
msgid "The drive is encrypted."
msgstr ""
-#: mediaimpl.cpp:272 mediamanager/halbackend.cpp:1264
-#: mediamanager/halbackend.cpp:1273 mediamanager/halbackend.cpp:1663
-#: mediamanager/halbackend.cpp:1680 mediamanager/halbackend.cpp:1691
-#: mediamanager/halbackend.cpp:1793 mediamanager/halbackend.cpp:1801
-#: mediamanager/halbackend.cpp:1808 mediamanager/halbackend.cpp:1848
-#: mediamanager/halbackend.cpp:1854 mediamanager/halbackend.cpp:1861
-#: mounthelper/tdeio_media_mounthelper.cpp:58
-msgid "Internal Error"
+#: mediaimpl.cpp:274 mediamanager/tdehardwarebackend.cpp:201
+#: mediamanager/tdehardwarebackend.cpp:252
+#: mounthelper/tdeio_media_mounthelper.cpp:202
+msgid "Unknown mount error."
msgstr ""
#: mediamanager/dialog.cpp:26 mounthelper/dialog.cpp:26
-msgid "Decrypt"
+msgid "Unlock"
msgstr ""
-#: mediamanager/fstabbackend.cpp:104 mediamanager/fstabbackend.cpp:114
-#: mediamanager/halbackend.cpp:1595 mediamanager/halbackend.cpp:1617
-#: mediamanager/halbackend.cpp:1776 mediamanager/halbackend.cpp:1831
-#: mediamanager/tdehardwarebackend.cpp:1349
-#: mediamanager/tdehardwarebackend.cpp:1360
+#: mediamanager/fstabbackend.cpp:105 mediamanager/fstabbackend.cpp:120
+#: mediamanager/halbackend.cpp:1598 mediamanager/halbackend.cpp:1625
+#: mediamanager/halbackend.cpp:1808 mediamanager/halbackend.cpp:1877
+#: mediamanager/mediamanager.cpp:363 mediamanager/mediamanager.cpp:375
+#: mediamanager/mediamanager.cpp:387 mediamanager/mediamanager.cpp:399
+#: mediamanager/tdehardwarebackend.cpp:1363
+#: mediamanager/tdehardwarebackend.cpp:1378
#, c-format
msgid "No such medium: %1"
msgstr ""
-#: mediamanager/fstabbackend.cpp:398
+#: mediamanager/fstabbackend.cpp:408
msgid "CD Recorder"
msgstr "Сабткунаки Диски Фишурда"
-#: mediamanager/fstabbackend.cpp:404
+#: mediamanager/fstabbackend.cpp:414
msgid "DVD"
msgstr "DVD"
-#: mediamanager/fstabbackend.cpp:415
+#: mediamanager/fstabbackend.cpp:425
msgid "CD-ROM"
msgstr "CD-ROM"
-#: mediamanager/fstabbackend.cpp:428
+#: mediamanager/fstabbackend.cpp:438
msgid "Floppy"
msgstr "Дискета"
-#: mediamanager/fstabbackend.cpp:436
+#: mediamanager/fstabbackend.cpp:446
msgid "Zip Disk"
msgstr "Диски Фаврӣ"
-#: mediamanager/fstabbackend.cpp:447
+#: mediamanager/fstabbackend.cpp:457
msgid "Removable Device"
msgstr ""
-#: mediamanager/fstabbackend.cpp:452 mediamanager/fstabbackend.cpp:458
+#: mediamanager/fstabbackend.cpp:462 mediamanager/fstabbackend.cpp:468
msgid "Remote Share"
msgstr "Тақсимоти Дурдаст"
-#: mediamanager/fstabbackend.cpp:463
+#: mediamanager/fstabbackend.cpp:473
#, fuzzy
msgid "Hard Disk"
msgstr "Диски Сахт"
-#: mediamanager/halbackend.cpp:749 mediamanager/tdehardwarebackend.cpp:805
+#: mediamanager/halbackend.cpp:744 mediamanager/tdehardwarebackend.cpp:808
#, fuzzy
msgid "Unknown Drive"
msgstr "Ношинос"
-#: mediamanager/halbackend.cpp:761 mediamanager/tdehardwarebackend.cpp:835
+#: mediamanager/halbackend.cpp:756 mediamanager/tdehardwarebackend.cpp:838
#, fuzzy
msgid "Floppy Drive"
msgstr "Дискета"
-#: mediamanager/halbackend.cpp:769
+#: mediamanager/halbackend.cpp:764
#, fuzzy
msgid "Zip Drive"
msgstr "Диски Фаврӣ"
-#: mediamanager/halbackend.cpp:839 mediamanager/tdehardwarebackend.cpp:892
+#: mediamanager/halbackend.cpp:834 mediamanager/tdehardwarebackend.cpp:895
msgid "Camera"
msgstr ""
-#: mediamanager/halbackend.cpp:1221 mediamanager/halbackend.cpp:1247
+#: mediamanager/halbackend.cpp:1216 mediamanager/halbackend.cpp:1242
msgid "Authenticate"
msgstr ""
-#: mediamanager/halbackend.cpp:1222
+#: mediamanager/halbackend.cpp:1217
msgid ""
"<big><b>System policy prevents mounting internal media</b></big><br/"
">Authentication is required to perform this action. Please enter your "
"password to verify."
msgstr ""
-#: mediamanager/halbackend.cpp:1248
+#: mediamanager/halbackend.cpp:1243
msgid ""
"<big><b>System policy prevents unmounting media mounted by other users</b></"
"big><br/>Authentication is required to perform this action. Please enter "
"your password to verify."
msgstr ""
-#: mediamanager/halbackend.cpp:1284
+#: mediamanager/halbackend.cpp:1259 mediamanager/halbackend.cpp:1268
+#: mediamanager/halbackend.cpp:1849 mediamanager/halbackend.cpp:1916
+#: mounthelper/tdeio_media_mounthelper.cpp:58
+msgid "Internal Error"
+msgstr ""
+
+#: mediamanager/halbackend.cpp:1279
msgid "Invalid filesystem type"
msgstr ""
-#: mediamanager/halbackend.cpp:1286
+#: mediamanager/halbackend.cpp:1281
msgid ""
"Permission denied<p>Please ensure that:<br>1. You have permission to access "
"this device.<br>2. This device node is not listed in /etc/fstab.</p>"
msgstr ""
-#: mediamanager/halbackend.cpp:1290
+#: mediamanager/halbackend.cpp:1285
msgid "Device is already mounted."
msgstr ""
-#: mediamanager/halbackend.cpp:1340
+#: mediamanager/halbackend.cpp:1335
msgid ""
"Moreover, programs still using the device have been detected. They are "
"listed below. You have to close them or change their working directory "
"before attempting to unmount the device again."
msgstr ""
-#: mediamanager/halbackend.cpp:1381 mediamanager/tdehardwarebackend.cpp:1588
+#: mediamanager/halbackend.cpp:1376 mediamanager/tdehardwarebackend.cpp:1618
msgid ""
"Programs that were still using the device have been forcibly terminated. "
"They are listed below."
msgstr ""
-#: mediamanager/halbackend.cpp:1402 mediamanager/halbackend.cpp:1715
-#: mediamanager/tdehardwarebackend.cpp:1406
-#: mediamanager/tdehardwarebackend.cpp:1424
-#: mediamanager/tdehardwarebackend.cpp:1464
+#: mediamanager/halbackend.cpp:1397 mediamanager/halbackend.cpp:1742
+#: mediamanager/tdehardwarebackend.cpp:1430
+#: mediamanager/tdehardwarebackend.cpp:1452
+#: mediamanager/tdehardwarebackend.cpp:1494
msgid ""
"Unfortunately, the device <b>%1</b> (%2) named <b>'%3'</b> and currently "
"mounted at <b>%4</b> could not be unmounted. "
msgstr ""
-#: mediamanager/halbackend.cpp:1408 mediamanager/tdehardwarebackend.cpp:1470
+#: mediamanager/halbackend.cpp:1403 mediamanager/tdehardwarebackend.cpp:1500
msgid "The following error was returned by umount command:"
msgstr ""
-#: mediamanager/halbackend.cpp:1478
-msgid "Permission denied"
+#: mediamanager/halbackend.cpp:1567 mediamanager/tdehardwarebackend.cpp:1322
+msgid "Cannot mount encrypted locked drives!"
msgstr ""
-#: mediamanager/halbackend.cpp:1562 mediamanager/tdehardwarebackend.cpp:1232
-msgid "Cannot mount encrypted drives!"
+#: mediamanager/halbackend.cpp:1682 mediamanager/halbackend.cpp:1703
+#: mediamanager/halbackend.cpp:1716 mediamanager/halbackend.cpp:1830
+#: mediamanager/halbackend.cpp:1840 mediamanager/halbackend.cpp:1899
+#: mediamanager/halbackend.cpp:1907
+msgid "Internal error"
msgstr ""
-#: mediamanager/halbackend.cpp:1721
+#: mediamanager/halbackend.cpp:1694
+#, fuzzy
+#| msgid "Unknown"
+msgid "Unknown error"
+msgstr "Ношинос"
+
+#: mediamanager/halbackend.cpp:1748
msgid "Unmounting failed due to the following error:"
msgstr ""
-#: mediamanager/halbackend.cpp:1723
+#: mediamanager/halbackend.cpp:1750
msgid "Device is Busy:"
msgstr ""
-#: mediamanager/halbackend.cpp:1727
+#: mediamanager/halbackend.cpp:1754
msgid ""
"Permission denied<p>Please ensure that:<br>1. You have permission to access "
"this device.<br>2. This device was originally mounted using TDE.</p>"
msgstr ""
-#: mediamanager/halbackend.cpp:1739
+#: mediamanager/halbackend.cpp:1766
msgid ""
"%1<p><b>Would you like to forcibly terminate these processes?</b><br><i>All "
"unsaved data would be lost</i>"
msgstr ""
-#: mediamanager/halbackend.cpp:1811
+#: mediamanager/halbackend.cpp:1852
msgid "Wrong password"
msgstr ""
-#: mediamanager/mediamanager.cpp:247 mediamanager/mediamanager.cpp:266
-#: mediamanager/mediamanager.cpp:285 mediamanager/mediamanager.cpp:293
-#: mediamanager/mediamanager.cpp:302 mediamanager/mediamanager.cpp:310
-msgid "Feature only available with HAL"
+#: mediamanager/mediamanager.cpp:248 mediamanager/mediamanager.cpp:275
+msgid "Feature only available with the TDE hardware backend"
msgstr ""
-#: mediamanager/mediamanager.cpp:252
-msgid "Feature only available with the TDE hardware backend"
+#: mediamanager/mediamanager.cpp:255 mediamanager/mediamanager.cpp:282
+#: mediamanager/mediamanager.cpp:312 mediamanager/mediamanager.cpp:343
+msgid "Feature only available with HAL"
msgstr ""
-#: mediamanager/mediamanager.cpp:256 mediamanager/mediamanager.cpp:271
-#: mediamanager/mediamanager.cpp:275
+#: mediamanager/mediamanager.cpp:262 mediamanager/mediamanager.cpp:289
+#: mediamanager/mediamanager.cpp:320 mediamanager/mediamanager.cpp:350
msgid "Feature only available with HAL or TDE hardware backend"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:480
-#: mediamanager/tdehardwarebackend.cpp:517
-#: mediamanager/tdehardwarebackend.cpp:750
+#: mediamanager/tdehardwarebackend.cpp:483
+#: mediamanager/tdehardwarebackend.cpp:520
+#: mediamanager/tdehardwarebackend.cpp:753
msgid "%1 Removable Device"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:525
+#: mediamanager/tdehardwarebackend.cpp:528
#, fuzzy
msgid "Blank CD-ROM"
msgstr "CD-ROM"
-#: mediamanager/tdehardwarebackend.cpp:534
+#: mediamanager/tdehardwarebackend.cpp:537
msgid "Blank CD-R"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:543
+#: mediamanager/tdehardwarebackend.cpp:546
msgid "Blank CD-RW"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:552
+#: mediamanager/tdehardwarebackend.cpp:555
msgid "Blank Magneto-Optical CD"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:561
+#: mediamanager/tdehardwarebackend.cpp:564
msgid "Blank Mount Ranier CD-RW"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:570
+#: mediamanager/tdehardwarebackend.cpp:573
msgid "Blank Mount Ranier CD-RW-W"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:579
+#: mediamanager/tdehardwarebackend.cpp:582
msgid "Blank DVD-ROM"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:588
+#: mediamanager/tdehardwarebackend.cpp:591
msgid "Blank DVD-RAM"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:597
+#: mediamanager/tdehardwarebackend.cpp:600
msgid "Blank DVD-R"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:606
+#: mediamanager/tdehardwarebackend.cpp:609
msgid "Blank DVD-RW"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:615
+#: mediamanager/tdehardwarebackend.cpp:618
msgid "Blank Dual Layer DVD-R"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:624
+#: mediamanager/tdehardwarebackend.cpp:627
msgid "Blank Dual Layer DVD-RW"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:633
+#: mediamanager/tdehardwarebackend.cpp:636
msgid "Blank DVD+R"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:642
+#: mediamanager/tdehardwarebackend.cpp:645
msgid "Blank DVD+RW"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:651
+#: mediamanager/tdehardwarebackend.cpp:654
msgid "Blank Dual Layer DVD+R"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:660
+#: mediamanager/tdehardwarebackend.cpp:663
msgid "Blank Dual Layer DVD+RW"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:669
+#: mediamanager/tdehardwarebackend.cpp:672
msgid "Blank BD-ROM"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:678
+#: mediamanager/tdehardwarebackend.cpp:681
msgid "Blank BD-R"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:687
+#: mediamanager/tdehardwarebackend.cpp:690
msgid "Blank BD-RW"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:696
+#: mediamanager/tdehardwarebackend.cpp:699
msgid "Blank HDDVD-ROM"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:705
+#: mediamanager/tdehardwarebackend.cpp:708
msgid "Blank HDDVD-R"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:714
+#: mediamanager/tdehardwarebackend.cpp:717
msgid "Blank HDDVD-RW"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:721
+#: mediamanager/tdehardwarebackend.cpp:724
msgid "Audio CD"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:742
+#: mediamanager/tdehardwarebackend.cpp:745
msgid "%1 Fixed Disk (%2)"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:849
+#: mediamanager/tdehardwarebackend.cpp:852
#, fuzzy
msgid "%1 Zip Disk"
msgstr "Диски Фаврӣ"
-#: mediamanager/tdehardwarebackend.cpp:1212
-#: mediamanager/tdehardwarebackend.cpp:1392
-msgid "Internal error"
+#: mediamanager/tdehardwarebackend.cpp:1224
+#: mediamanager/tdehardwarebackend.cpp:1417
+msgid "Internal error. Couldn't find medium."
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:1239
-msgid ""
-"<qt>Unable to mount this device.<p>Potential reasons include:<br>Improper "
-"device and/or user privilege level<br>Corrupt data on storage device"
+#: mediamanager/tdehardwarebackend.cpp:1249
+#: mediamanager/tdehardwarebackend.cpp:1323
+msgid "Unable to mount this device."
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:1241
-#: mediamanager/tdehardwarebackend.cpp:1316
-#: mediamanager/tdehardwarebackend.cpp:1408
-#: mediamanager/tdehardwarebackend.cpp:1426
+#: mediamanager/tdehardwarebackend.cpp:1252
+#: mediamanager/tdehardwarebackend.cpp:1326
+#: mediamanager/tdehardwarebackend.cpp:1435
+#: mediamanager/tdehardwarebackend.cpp:1457
msgid "<p>Technical details:<br>"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:1314
-msgid ""
-"<qt>Unable to mount this device.<p>Potential reasons include:<br>Improper "
-"device and/or user privilege level<br>Corrupt data on storage "
-"device<br>Incorrect encryption password"
+#: mediamanager/tdehardwarebackend.cpp:1284
+msgid "Decryption aborted"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:1420
+#: mediamanager/tdehardwarebackend.cpp:1443
msgid ""
"<qt>The device <b>%1</b> (%2) named <b>'%3'</b> and currently mounted at <b>"
"%4</b> can not be unmounted at this time.<p>%5<p><b>Would you like to "
@@ -388,7 +395,7 @@ msgid ""
"lost</i>"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:1547
+#: mediamanager/tdehardwarebackend.cpp:1577
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 "
@@ -399,7 +406,7 @@ msgstr ""
msgid "%1 cannot be found."
msgstr ""
-#: mounthelper/tdeio_media_mounthelper.cpp:86
+#: mounthelper/tdeio_media_mounthelper.cpp:87
msgid "%1 is not a mountable media."
msgstr ""
@@ -408,39 +415,47 @@ msgid "%1 is not an encrypted media."
msgstr ""
#: mounthelper/tdeio_media_mounthelper.cpp:107
-msgid "%1 is already decrypted."
+msgid "%1 is already unlocked."
msgstr ""
-#: mounthelper/tdeio_media_mounthelper.cpp:228
+#: mounthelper/tdeio_media_mounthelper.cpp:139
+msgid "Unknown unmount error."
+msgstr ""
+
+#: mounthelper/tdeio_media_mounthelper.cpp:246
msgid "The device was successfully unmounted, but the tray could not be opened"
msgstr ""
-#: mounthelper/tdeio_media_mounthelper.cpp:230
+#: mounthelper/tdeio_media_mounthelper.cpp:248
msgid "The device was successfully unmounted, but could not be ejected"
msgstr ""
-#: mounthelper/tdeio_media_mounthelper.cpp:275
+#: mounthelper/tdeio_media_mounthelper.cpp:281
+msgid "Unknown decrypt error."
+msgstr ""
+
+#: mounthelper/tdeio_media_mounthelper.cpp:295
#, fuzzy
msgid "Decrypt given URL"
msgstr "URL-ро таҷзия кунед"
-#: mounthelper/tdeio_media_mounthelper.cpp:276
+#: mounthelper/tdeio_media_mounthelper.cpp:296
msgid "Unmount given URL"
msgstr "URL-ро таҷзия кунед"
-#: mounthelper/tdeio_media_mounthelper.cpp:277
+#: mounthelper/tdeio_media_mounthelper.cpp:297
msgid "Mount given URL (default)"
msgstr "URL-ро насб кунед (бо нобаёнӣ)"
-#: mounthelper/tdeio_media_mounthelper.cpp:278
+#: mounthelper/tdeio_media_mounthelper.cpp:298
msgid "Eject given URL via tdeeject"
msgstr "Ба воситаи tdeeject URL-ро рад кунед"
-#: mounthelper/tdeio_media_mounthelper.cpp:279
+#: mounthelper/tdeio_media_mounthelper.cpp:299
msgid "Unmount and Eject given URL (necessary for some USB devices)"
msgstr ""
-#: mounthelper/tdeio_media_mounthelper.cpp:280
+#: mounthelper/tdeio_media_mounthelper.cpp:300
#, fuzzy
msgid "media:/ URL to mount/unmount/eject/remove"
msgstr "дастгоҳҳо:/ URL барои насб кардан/таҷзия кардан/рад кардан."
@@ -462,45 +477,45 @@ msgstr ""
msgid "&Mounting"
msgstr ""
-#: tdefile-plugin/tdefilemediaplugin.cpp:190
+#: tdefile-plugin/tdefilemediaplugin.cpp:184
#, fuzzy
msgid "Medium Information"
msgstr "Дастгоҳ насб нашудааст"
-#: tdefile-plugin/tdefilemediaplugin.cpp:193
+#: tdefile-plugin/tdefilemediaplugin.cpp:187
msgid "Free"
msgstr ""
-#: tdefile-plugin/tdefilemediaplugin.cpp:196
+#: tdefile-plugin/tdefilemediaplugin.cpp:190
msgid "Used"
msgstr ""
-#: tdefile-plugin/tdefilemediaplugin.cpp:199
+#: tdefile-plugin/tdefilemediaplugin.cpp:193
msgid "Total"
msgstr ""
-#: tdefile-plugin/tdefilemediaplugin.cpp:202
+#: tdefile-plugin/tdefilemediaplugin.cpp:196
msgid "Base URL"
msgstr ""
-#: tdefile-plugin/tdefilemediaplugin.cpp:203
+#: tdefile-plugin/tdefilemediaplugin.cpp:197
msgid "Mount Point"
msgstr ""
-#: tdefile-plugin/tdefilemediaplugin.cpp:204
+#: tdefile-plugin/tdefilemediaplugin.cpp:198
#, fuzzy
msgid "Device Node"
msgstr "Сохтмон"
-#: tdefile-plugin/tdefilemediaplugin.cpp:206
+#: tdefile-plugin/tdefilemediaplugin.cpp:200
msgid "Medium Summary"
msgstr ""
-#: tdefile-plugin/tdefilemediaplugin.cpp:208
+#: tdefile-plugin/tdefilemediaplugin.cpp:202
msgid "Usage"
msgstr ""
-#: tdefile-plugin/tdefilemediaplugin.cpp:210
+#: tdefile-plugin/tdefilemediaplugin.cpp:204
msgid "Bar Graph"
msgstr ""
@@ -572,23 +587,30 @@ msgid ""
"devices are plugged in."
msgstr ""
-#: mediamanager/decryptdialog.ui:24 mounthelper/decryptdialog.ui:24
+#: mediamanager/unlockdialog.ui:24 mounthelper/unlockdialog.ui:24
#, no-c-format
msgid "Decrypting Storage Device"
msgstr ""
-#: mediamanager/decryptdialog.ui:109 mounthelper/decryptdialog.ui:109
+#: mediamanager/unlockdialog.ui:109
#, no-c-format
msgid ""
-"<p><b>%1</b> is an encrypted storage device.</p>\n"
-"<p>Please enter the password to decrypt the storage device.</p>"
+"<p><b>%1</b> is an encrypted locked storage device.</p>\n"
+"<p>Please enter the password to unlock the storage device.</p>"
msgstr ""
-#: mediamanager/decryptdialog.ui:131 mounthelper/decryptdialog.ui:131
+#: mediamanager/unlockdialog.ui:131 mounthelper/unlockdialog.ui:131
#, no-c-format
msgid "&Password:"
msgstr ""
+#: mounthelper/unlockdialog.ui:109
+#, no-c-format
+msgid ""
+"<p><b>%1</b> is an encrypted storage device.</p>\n"
+"<p>Please enter the password to decrypt the storage device.</p>"
+msgstr ""
+
#: propsdlgplugin/propertiespagegui.ui:16
#, no-c-format
msgid "PropertiesPageGUI"
diff --git a/tde-i18n-th/messages/tdebase/tdeio_media.po b/tde-i18n-th/messages/tdebase/tdeio_media.po
index 9746542d9b2..83e30f51268 100644
--- a/tde-i18n-th/messages/tdebase/tdeio_media.po
+++ b/tde-i18n-th/messages/tdebase/tdeio_media.po
@@ -6,7 +6,7 @@
msgid ""
msgstr ""
"Project-Id-Version: tdeio_media\n"
-"POT-Creation-Date: 2019-01-13 18:47+0100\n"
+"POT-Creation-Date: 2019-07-11 02:33+0200\n"
"PO-Revision-Date: 2007-05-12 18:35+1000\n"
"Last-Translator: Sahachart Anukulkitch <drrider@gmail.com>\n"
"Language-Team: Thai <l10n@opentle.org>\n"
@@ -47,7 +47,6 @@ msgstr "ไม่รู้จัก"
#: mediaimpl.cpp:88 mediaimpl.cpp:115 mediaimpl.cpp:141 mediaimpl.cpp:177
#: mediaimpl.cpp:197 mediaimpl.cpp:218
#: mounthelper/tdeio_media_mounthelper.cpp:50
-#: mounthelper/tdeio_media_mounthelper.cpp:256
msgid "The TDE mediamanager is not running."
msgstr "ตัวจัดการสื่อของ TDE ไม่ได้กำลังทำงานอยู่"
@@ -55,7 +54,7 @@ msgstr "ตัวจัดการสื่อของ TDE ไม่ได้
msgid "This media name already exists."
msgstr "มีชื่อของสื่อนี้อยู่แล้ว"
-#: mediaimpl.cpp:230 mediaimpl.cpp:293
+#: mediaimpl.cpp:230 mediaimpl.cpp:297
msgid "No such medium."
msgstr "ไม่มีสื่อแบบนั้น"
@@ -63,113 +62,117 @@ msgstr "ไม่มีสื่อแบบนั้น"
msgid "The drive is encrypted."
msgstr ""
-#: mediaimpl.cpp:272 mediamanager/halbackend.cpp:1264
-#: mediamanager/halbackend.cpp:1273 mediamanager/halbackend.cpp:1663
-#: mediamanager/halbackend.cpp:1680 mediamanager/halbackend.cpp:1691
-#: mediamanager/halbackend.cpp:1793 mediamanager/halbackend.cpp:1801
-#: mediamanager/halbackend.cpp:1808 mediamanager/halbackend.cpp:1848
-#: mediamanager/halbackend.cpp:1854 mediamanager/halbackend.cpp:1861
-#: mounthelper/tdeio_media_mounthelper.cpp:58
-msgid "Internal Error"
-msgstr "ข้อผิดพลาดภายใน"
+#: mediaimpl.cpp:274 mediamanager/tdehardwarebackend.cpp:201
+#: mediamanager/tdehardwarebackend.cpp:252
+#: mounthelper/tdeio_media_mounthelper.cpp:202
+msgid "Unknown mount error."
+msgstr ""
#: mediamanager/dialog.cpp:26 mounthelper/dialog.cpp:26
-msgid "Decrypt"
+msgid "Unlock"
msgstr ""
-#: mediamanager/fstabbackend.cpp:104 mediamanager/fstabbackend.cpp:114
-#: mediamanager/halbackend.cpp:1595 mediamanager/halbackend.cpp:1617
-#: mediamanager/halbackend.cpp:1776 mediamanager/halbackend.cpp:1831
-#: mediamanager/tdehardwarebackend.cpp:1349
-#: mediamanager/tdehardwarebackend.cpp:1360
+#: mediamanager/fstabbackend.cpp:105 mediamanager/fstabbackend.cpp:120
+#: mediamanager/halbackend.cpp:1598 mediamanager/halbackend.cpp:1625
+#: mediamanager/halbackend.cpp:1808 mediamanager/halbackend.cpp:1877
+#: mediamanager/mediamanager.cpp:363 mediamanager/mediamanager.cpp:375
+#: mediamanager/mediamanager.cpp:387 mediamanager/mediamanager.cpp:399
+#: mediamanager/tdehardwarebackend.cpp:1363
+#: mediamanager/tdehardwarebackend.cpp:1378
#, c-format
msgid "No such medium: %1"
msgstr "ไม่มีสื่อ: %1"
-#: mediamanager/fstabbackend.cpp:398
+#: mediamanager/fstabbackend.cpp:408
msgid "CD Recorder"
msgstr "เครื่องบันทึกซีดี"
-#: mediamanager/fstabbackend.cpp:404
+#: mediamanager/fstabbackend.cpp:414
msgid "DVD"
msgstr "ดีวีดี"
-#: mediamanager/fstabbackend.cpp:415
+#: mediamanager/fstabbackend.cpp:425
msgid "CD-ROM"
msgstr "ซีดีรอม"
-#: mediamanager/fstabbackend.cpp:428
+#: mediamanager/fstabbackend.cpp:438
msgid "Floppy"
msgstr "ฟล็อบปี้"
-#: mediamanager/fstabbackend.cpp:436
+#: mediamanager/fstabbackend.cpp:446
msgid "Zip Disk"
msgstr "ดิสก์ Zip"
-#: mediamanager/fstabbackend.cpp:447
+#: mediamanager/fstabbackend.cpp:457
msgid "Removable Device"
msgstr "อุปกรณ์ถอดเสียบ"
-#: mediamanager/fstabbackend.cpp:452 mediamanager/fstabbackend.cpp:458
+#: mediamanager/fstabbackend.cpp:462 mediamanager/fstabbackend.cpp:468
msgid "Remote Share"
msgstr "การใช้งานร่วมกันระยะไกล"
-#: mediamanager/fstabbackend.cpp:463
+#: mediamanager/fstabbackend.cpp:473
msgid "Hard Disk"
msgstr "ฮาร์ดดิสก์"
-#: mediamanager/halbackend.cpp:749 mediamanager/tdehardwarebackend.cpp:805
+#: mediamanager/halbackend.cpp:744 mediamanager/tdehardwarebackend.cpp:808
#, fuzzy
msgid "Unknown Drive"
msgstr "ไม่รู้จัก"
-#: mediamanager/halbackend.cpp:761 mediamanager/tdehardwarebackend.cpp:835
+#: mediamanager/halbackend.cpp:756 mediamanager/tdehardwarebackend.cpp:838
#, fuzzy
msgid "Floppy Drive"
msgstr "ฟล็อบปี้"
-#: mediamanager/halbackend.cpp:769
+#: mediamanager/halbackend.cpp:764
#, fuzzy
msgid "Zip Drive"
msgstr "ดิสก์ Zip"
-#: mediamanager/halbackend.cpp:839 mediamanager/tdehardwarebackend.cpp:892
+#: mediamanager/halbackend.cpp:834 mediamanager/tdehardwarebackend.cpp:895
msgid "Camera"
msgstr "กล้อง"
-#: mediamanager/halbackend.cpp:1221 mediamanager/halbackend.cpp:1247
+#: mediamanager/halbackend.cpp:1216 mediamanager/halbackend.cpp:1242
msgid "Authenticate"
msgstr ""
-#: mediamanager/halbackend.cpp:1222
+#: mediamanager/halbackend.cpp:1217
msgid ""
"<big><b>System policy prevents mounting internal media</b></big><br/"
">Authentication is required to perform this action. Please enter your "
"password to verify."
msgstr ""
-#: mediamanager/halbackend.cpp:1248
+#: mediamanager/halbackend.cpp:1243
msgid ""
"<big><b>System policy prevents unmounting media mounted by other users</b></"
"big><br/>Authentication is required to perform this action. Please enter "
"your password to verify."
msgstr ""
-#: mediamanager/halbackend.cpp:1284
+#: mediamanager/halbackend.cpp:1259 mediamanager/halbackend.cpp:1268
+#: mediamanager/halbackend.cpp:1849 mediamanager/halbackend.cpp:1916
+#: mounthelper/tdeio_media_mounthelper.cpp:58
+msgid "Internal Error"
+msgstr "ข้อผิดพลาดภายใน"
+
+#: mediamanager/halbackend.cpp:1279
msgid "Invalid filesystem type"
msgstr "ชนิดของระบบแฟ้มไม่ถูกต้อง"
-#: mediamanager/halbackend.cpp:1286
+#: mediamanager/halbackend.cpp:1281
msgid ""
"Permission denied<p>Please ensure that:<br>1. You have permission to access "
"this device.<br>2. This device node is not listed in /etc/fstab.</p>"
msgstr ""
-#: mediamanager/halbackend.cpp:1290
+#: mediamanager/halbackend.cpp:1285
msgid "Device is already mounted."
msgstr "อุปกรณ์ถูกเมานท์อยู่แล้ว"
-#: mediamanager/halbackend.cpp:1340
+#: mediamanager/halbackend.cpp:1335
msgid ""
"Moreover, programs still using the device have been detected. They are "
"listed below. You have to close them or change their working directory "
@@ -179,16 +182,16 @@ msgstr ""
"คุณต้องปิดโปรแกรมเหล่านั้นก่อน หรือไม่ก็เปลี่ยนไดเร็คทอรีที่ใช้งานอยู่ไปที่อื่น "
"ก่อนที่จะทำการเลิกเมานท์อุปกรณ์อีกครั้ง"
-#: mediamanager/halbackend.cpp:1381 mediamanager/tdehardwarebackend.cpp:1588
+#: mediamanager/halbackend.cpp:1376 mediamanager/tdehardwarebackend.cpp:1618
msgid ""
"Programs that were still using the device have been forcibly terminated. "
"They are listed below."
msgstr ""
-#: mediamanager/halbackend.cpp:1402 mediamanager/halbackend.cpp:1715
-#: mediamanager/tdehardwarebackend.cpp:1406
-#: mediamanager/tdehardwarebackend.cpp:1424
-#: mediamanager/tdehardwarebackend.cpp:1464
+#: mediamanager/halbackend.cpp:1397 mediamanager/halbackend.cpp:1742
+#: mediamanager/tdehardwarebackend.cpp:1430
+#: mediamanager/tdehardwarebackend.cpp:1452
+#: mediamanager/tdehardwarebackend.cpp:1494
msgid ""
"Unfortunately, the device <b>%1</b> (%2) named <b>'%3'</b> and currently "
"mounted at <b>%4</b> could not be unmounted. "
@@ -196,196 +199,199 @@ msgstr ""
"อุปกรณ์ <b>%1</b> (%2) ที่ชื่อ <b>'%3'</b> และกำลังเมานท์อยู่ที่ <b>%4</b> "
"ไม่สามารถเลิกเมานท์ได้"
-#: mediamanager/halbackend.cpp:1408 mediamanager/tdehardwarebackend.cpp:1470
+#: mediamanager/halbackend.cpp:1403 mediamanager/tdehardwarebackend.cpp:1500
msgid "The following error was returned by umount command:"
msgstr "คำสั่ง umount คืนค่าความผิดพลาดต่อไปนี้กลับมา:"
-#: mediamanager/halbackend.cpp:1478
+#: mediamanager/halbackend.cpp:1567 mediamanager/tdehardwarebackend.cpp:1322
+msgid "Cannot mount encrypted locked drives!"
+msgstr ""
+
+#: mediamanager/halbackend.cpp:1682 mediamanager/halbackend.cpp:1703
+#: mediamanager/halbackend.cpp:1716 mediamanager/halbackend.cpp:1830
+#: mediamanager/halbackend.cpp:1840 mediamanager/halbackend.cpp:1899
+#: mediamanager/halbackend.cpp:1907
#, fuzzy
-msgid "Permission denied"
-msgstr "สิทธิ์อนุญาตถูกปฏิเสธ"
+msgid "Internal error"
+msgstr "ข้อผิดพลาดภายใน"
-#: mediamanager/halbackend.cpp:1562 mediamanager/tdehardwarebackend.cpp:1232
-msgid "Cannot mount encrypted drives!"
-msgstr ""
+#: mediamanager/halbackend.cpp:1694
+#, fuzzy
+#| msgid "Unknown"
+msgid "Unknown error"
+msgstr "ไม่รู้จัก"
-#: mediamanager/halbackend.cpp:1721
+#: mediamanager/halbackend.cpp:1748
msgid "Unmounting failed due to the following error:"
msgstr "การเลิกเมานท์ล้มเหลวเนื่องจากข้อผิดพลาดต่อไปนี้:"
-#: mediamanager/halbackend.cpp:1723
+#: mediamanager/halbackend.cpp:1750
msgid "Device is Busy:"
msgstr "อุปกรณ์ไม่ว่าง"
-#: mediamanager/halbackend.cpp:1727
+#: mediamanager/halbackend.cpp:1754
msgid ""
"Permission denied<p>Please ensure that:<br>1. You have permission to access "
"this device.<br>2. This device was originally mounted using TDE.</p>"
msgstr ""
-#: mediamanager/halbackend.cpp:1739
+#: mediamanager/halbackend.cpp:1766
msgid ""
"%1<p><b>Would you like to forcibly terminate these processes?</b><br><i>All "
"unsaved data would be lost</i>"
msgstr ""
-#: mediamanager/halbackend.cpp:1811
+#: mediamanager/halbackend.cpp:1852
msgid "Wrong password"
msgstr ""
-#: mediamanager/mediamanager.cpp:247 mediamanager/mediamanager.cpp:266
-#: mediamanager/mediamanager.cpp:285 mediamanager/mediamanager.cpp:293
-#: mediamanager/mediamanager.cpp:302 mediamanager/mediamanager.cpp:310
-msgid "Feature only available with HAL"
-msgstr "ความสามารถนี้มีกับ HAL เท่านั้น"
-
-#: mediamanager/mediamanager.cpp:252
+#: mediamanager/mediamanager.cpp:248 mediamanager/mediamanager.cpp:275
#, fuzzy
msgid "Feature only available with the TDE hardware backend"
msgstr "ความสามารถนี้มีกับ HAL เท่านั้น"
-#: mediamanager/mediamanager.cpp:256 mediamanager/mediamanager.cpp:271
-#: mediamanager/mediamanager.cpp:275
+#: mediamanager/mediamanager.cpp:255 mediamanager/mediamanager.cpp:282
+#: mediamanager/mediamanager.cpp:312 mediamanager/mediamanager.cpp:343
+msgid "Feature only available with HAL"
+msgstr "ความสามารถนี้มีกับ HAL เท่านั้น"
+
+#: mediamanager/mediamanager.cpp:262 mediamanager/mediamanager.cpp:289
+#: mediamanager/mediamanager.cpp:320 mediamanager/mediamanager.cpp:350
#, fuzzy
msgid "Feature only available with HAL or TDE hardware backend"
msgstr "ความสามารถนี้มีกับ HAL เท่านั้น"
-#: mediamanager/tdehardwarebackend.cpp:480
-#: mediamanager/tdehardwarebackend.cpp:517
-#: mediamanager/tdehardwarebackend.cpp:750
+#: mediamanager/tdehardwarebackend.cpp:483
+#: mediamanager/tdehardwarebackend.cpp:520
+#: mediamanager/tdehardwarebackend.cpp:753
#, fuzzy
msgid "%1 Removable Device"
msgstr "อุปกรณ์ถอดเสียบ"
-#: mediamanager/tdehardwarebackend.cpp:525
+#: mediamanager/tdehardwarebackend.cpp:528
#, fuzzy
msgid "Blank CD-ROM"
msgstr "ซีดีรอม"
-#: mediamanager/tdehardwarebackend.cpp:534
+#: mediamanager/tdehardwarebackend.cpp:537
msgid "Blank CD-R"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:543
+#: mediamanager/tdehardwarebackend.cpp:546
msgid "Blank CD-RW"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:552
+#: mediamanager/tdehardwarebackend.cpp:555
msgid "Blank Magneto-Optical CD"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:561
+#: mediamanager/tdehardwarebackend.cpp:564
msgid "Blank Mount Ranier CD-RW"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:570
+#: mediamanager/tdehardwarebackend.cpp:573
msgid "Blank Mount Ranier CD-RW-W"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:579
+#: mediamanager/tdehardwarebackend.cpp:582
msgid "Blank DVD-ROM"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:588
+#: mediamanager/tdehardwarebackend.cpp:591
msgid "Blank DVD-RAM"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:597
+#: mediamanager/tdehardwarebackend.cpp:600
msgid "Blank DVD-R"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:606
+#: mediamanager/tdehardwarebackend.cpp:609
msgid "Blank DVD-RW"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:615
+#: mediamanager/tdehardwarebackend.cpp:618
msgid "Blank Dual Layer DVD-R"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:624
+#: mediamanager/tdehardwarebackend.cpp:627
msgid "Blank Dual Layer DVD-RW"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:633
+#: mediamanager/tdehardwarebackend.cpp:636
msgid "Blank DVD+R"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:642
+#: mediamanager/tdehardwarebackend.cpp:645
msgid "Blank DVD+RW"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:651
+#: mediamanager/tdehardwarebackend.cpp:654
msgid "Blank Dual Layer DVD+R"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:660
+#: mediamanager/tdehardwarebackend.cpp:663
msgid "Blank Dual Layer DVD+RW"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:669
+#: mediamanager/tdehardwarebackend.cpp:672
msgid "Blank BD-ROM"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:678
+#: mediamanager/tdehardwarebackend.cpp:681
msgid "Blank BD-R"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:687
+#: mediamanager/tdehardwarebackend.cpp:690
msgid "Blank BD-RW"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:696
+#: mediamanager/tdehardwarebackend.cpp:699
msgid "Blank HDDVD-ROM"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:705
+#: mediamanager/tdehardwarebackend.cpp:708
msgid "Blank HDDVD-R"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:714
+#: mediamanager/tdehardwarebackend.cpp:717
msgid "Blank HDDVD-RW"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:721
+#: mediamanager/tdehardwarebackend.cpp:724
msgid "Audio CD"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:742
+#: mediamanager/tdehardwarebackend.cpp:745
msgid "%1 Fixed Disk (%2)"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:849
+#: mediamanager/tdehardwarebackend.cpp:852
#, fuzzy
msgid "%1 Zip Disk"
msgstr "ดิสก์ Zip"
-#: mediamanager/tdehardwarebackend.cpp:1212
-#: mediamanager/tdehardwarebackend.cpp:1392
-#, fuzzy
-msgid "Internal error"
-msgstr "ข้อผิดพลาดภายใน"
+#: mediamanager/tdehardwarebackend.cpp:1224
+#: mediamanager/tdehardwarebackend.cpp:1417
+msgid "Internal error. Couldn't find medium."
+msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:1239
-msgid ""
-"<qt>Unable to mount this device.<p>Potential reasons include:<br>Improper "
-"device and/or user privilege level<br>Corrupt data on storage device"
+#: mediamanager/tdehardwarebackend.cpp:1249
+#: mediamanager/tdehardwarebackend.cpp:1323
+msgid "Unable to mount this device."
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:1241
-#: mediamanager/tdehardwarebackend.cpp:1316
-#: mediamanager/tdehardwarebackend.cpp:1408
-#: mediamanager/tdehardwarebackend.cpp:1426
+#: mediamanager/tdehardwarebackend.cpp:1252
+#: mediamanager/tdehardwarebackend.cpp:1326
+#: mediamanager/tdehardwarebackend.cpp:1435
+#: mediamanager/tdehardwarebackend.cpp:1457
msgid "<p>Technical details:<br>"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:1314
-msgid ""
-"<qt>Unable to mount this device.<p>Potential reasons include:<br>Improper "
-"device and/or user privilege level<br>Corrupt data on storage "
-"device<br>Incorrect encryption password"
+#: mediamanager/tdehardwarebackend.cpp:1284
+msgid "Decryption aborted"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:1420
+#: mediamanager/tdehardwarebackend.cpp:1443
msgid ""
"<qt>The device <b>%1</b> (%2) named <b>'%3'</b> and currently mounted at <b>"
"%4</b> can not be unmounted at this time.<p>%5<p><b>Would you like to "
@@ -393,7 +399,7 @@ msgid ""
"lost</i>"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:1547
+#: mediamanager/tdehardwarebackend.cpp:1577
#, fuzzy
msgid ""
"Programs still using the device have been detected. They are listed below. "
@@ -408,7 +414,7 @@ msgstr ""
msgid "%1 cannot be found."
msgstr "ไม่พบ %1"
-#: mounthelper/tdeio_media_mounthelper.cpp:86
+#: mounthelper/tdeio_media_mounthelper.cpp:87
msgid "%1 is not a mountable media."
msgstr "%1 ไม่ใช่สื่อที่จะเมานท์ได้"
@@ -419,39 +425,47 @@ msgstr "%1 ไม่ใช่สื่อที่จะเมานท์ได
#: mounthelper/tdeio_media_mounthelper.cpp:107
#, fuzzy
-msgid "%1 is already decrypted."
+msgid "%1 is already unlocked."
msgstr "อุปกรณ์ถูกเมานท์อยู่แล้ว"
-#: mounthelper/tdeio_media_mounthelper.cpp:228
+#: mounthelper/tdeio_media_mounthelper.cpp:139
+msgid "Unknown unmount error."
+msgstr ""
+
+#: mounthelper/tdeio_media_mounthelper.cpp:246
msgid "The device was successfully unmounted, but the tray could not be opened"
msgstr "การเลิกเมานท์อุปกรณ์สำเร็จ แต่ไม่สามารถเปิดถาดได้"
-#: mounthelper/tdeio_media_mounthelper.cpp:230
+#: mounthelper/tdeio_media_mounthelper.cpp:248
msgid "The device was successfully unmounted, but could not be ejected"
msgstr "การเลิกเมานท์อุปกรณ์สำเร็จ แต่ไม่สามารถเอาสื่อออกได้"
-#: mounthelper/tdeio_media_mounthelper.cpp:275
+#: mounthelper/tdeio_media_mounthelper.cpp:281
+msgid "Unknown decrypt error."
+msgstr ""
+
+#: mounthelper/tdeio_media_mounthelper.cpp:295
#, fuzzy
msgid "Decrypt given URL"
msgstr "ยกเลิกเมานท์ตำแหน่งที่กำหนด"
-#: mounthelper/tdeio_media_mounthelper.cpp:276
+#: mounthelper/tdeio_media_mounthelper.cpp:296
msgid "Unmount given URL"
msgstr "ยกเลิกเมานท์ตำแหน่งที่กำหนด"
-#: mounthelper/tdeio_media_mounthelper.cpp:277
+#: mounthelper/tdeio_media_mounthelper.cpp:297
msgid "Mount given URL (default)"
msgstr "เมานท์ตำแหน่งที่กำหนด (ค่าปริยาย)"
-#: mounthelper/tdeio_media_mounthelper.cpp:278
+#: mounthelper/tdeio_media_mounthelper.cpp:298
msgid "Eject given URL via tdeeject"
msgstr "เอาแผ่นที่ URL ที่กำหนดออกผ่าน tdeeject"
-#: mounthelper/tdeio_media_mounthelper.cpp:279
+#: mounthelper/tdeio_media_mounthelper.cpp:299
msgid "Unmount and Eject given URL (necessary for some USB devices)"
msgstr "ให้เลิกเมานท์และเอาแผ่นที่ URL ที่กำหนดออก (จำเป็นสำหรับอุปกรณ์ USB บางตัว)"
-#: mounthelper/tdeio_media_mounthelper.cpp:280
+#: mounthelper/tdeio_media_mounthelper.cpp:300
msgid "media:/ URL to mount/unmount/eject/remove"
msgstr "ตำแหน่ง media:/ เพื่อเมานท์/ยกเลิกเมานท์/เอาแผ่นออก/ถอดอุปกรณ์ออก"
@@ -472,43 +486,43 @@ msgstr "การบันทึกความเปลี่ยนแปลง
msgid "&Mounting"
msgstr "เ&มานท์"
-#: tdefile-plugin/tdefilemediaplugin.cpp:190
+#: tdefile-plugin/tdefilemediaplugin.cpp:184
msgid "Medium Information"
msgstr "ข้อมูลของสื่อ"
-#: tdefile-plugin/tdefilemediaplugin.cpp:193
+#: tdefile-plugin/tdefilemediaplugin.cpp:187
msgid "Free"
msgstr "ว่าง"
-#: tdefile-plugin/tdefilemediaplugin.cpp:196
+#: tdefile-plugin/tdefilemediaplugin.cpp:190
msgid "Used"
msgstr "ใช้ไป"
-#: tdefile-plugin/tdefilemediaplugin.cpp:199
+#: tdefile-plugin/tdefilemediaplugin.cpp:193
msgid "Total"
msgstr "ทั้งหมด"
-#: tdefile-plugin/tdefilemediaplugin.cpp:202
+#: tdefile-plugin/tdefilemediaplugin.cpp:196
msgid "Base URL"
msgstr "URL พื้นฐาน"
-#: tdefile-plugin/tdefilemediaplugin.cpp:203
+#: tdefile-plugin/tdefilemediaplugin.cpp:197
msgid "Mount Point"
msgstr "จุดเมานท์"
-#: tdefile-plugin/tdefilemediaplugin.cpp:204
+#: tdefile-plugin/tdefilemediaplugin.cpp:198
msgid "Device Node"
msgstr "โหนดอุปกรณ์"
-#: tdefile-plugin/tdefilemediaplugin.cpp:206
+#: tdefile-plugin/tdefilemediaplugin.cpp:200
msgid "Medium Summary"
msgstr "ข้อมูลสรุปของสือ"
-#: tdefile-plugin/tdefilemediaplugin.cpp:208
+#: tdefile-plugin/tdefilemediaplugin.cpp:202
msgid "Usage"
msgstr "ใช้ไป"
-#: tdefile-plugin/tdefilemediaplugin.cpp:210
+#: tdefile-plugin/tdefilemediaplugin.cpp:204
msgid "Bar Graph"
msgstr "กราฟแท่ง"
@@ -580,23 +594,30 @@ msgid ""
"devices are plugged in."
msgstr ""
-#: mediamanager/decryptdialog.ui:24 mounthelper/decryptdialog.ui:24
+#: mediamanager/unlockdialog.ui:24 mounthelper/unlockdialog.ui:24
#, no-c-format
msgid "Decrypting Storage Device"
msgstr ""
-#: mediamanager/decryptdialog.ui:109 mounthelper/decryptdialog.ui:109
+#: mediamanager/unlockdialog.ui:109
#, no-c-format
msgid ""
-"<p><b>%1</b> is an encrypted storage device.</p>\n"
-"<p>Please enter the password to decrypt the storage device.</p>"
+"<p><b>%1</b> is an encrypted locked storage device.</p>\n"
+"<p>Please enter the password to unlock the storage device.</p>"
msgstr ""
-#: mediamanager/decryptdialog.ui:131 mounthelper/decryptdialog.ui:131
+#: mediamanager/unlockdialog.ui:131 mounthelper/unlockdialog.ui:131
#, no-c-format
msgid "&Password:"
msgstr ""
+#: mounthelper/unlockdialog.ui:109
+#, no-c-format
+msgid ""
+"<p><b>%1</b> is an encrypted storage device.</p>\n"
+"<p>Please enter the password to decrypt the storage device.</p>"
+msgstr ""
+
#: propsdlgplugin/propertiespagegui.ui:16
#, no-c-format
msgid "PropertiesPageGUI"
@@ -849,3 +870,7 @@ msgstr "ผสมกัน"
#, no-c-format
msgid "Filesystem: iso9660"
msgstr "ระบบแฟ้ม: iso9660"
+
+#, fuzzy
+#~ msgid "Permission denied"
+#~ msgstr "สิทธิ์อนุญาตถูกปฏิเสธ"
diff --git a/tde-i18n-tr/messages/tdebase/tdeio_media.po b/tde-i18n-tr/messages/tdebase/tdeio_media.po
index 31a9b98eb12..9cf173fe1b1 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: 2019-01-13 18:47+0100\n"
+"POT-Creation-Date: 2019-07-11 02:33+0200\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"
@@ -47,7 +47,6 @@ 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
-#: mounthelper/tdeio_media_mounthelper.cpp:256
msgid "The TDE mediamanager is not running."
msgstr "TDE ortam yöneticisi çalışmıyor."
@@ -55,7 +54,7 @@ msgstr "TDE ortam yöneticisi çalışmıyor."
msgid "This media name already exists."
msgstr "Bu ortam adı mevcut."
-#: mediaimpl.cpp:230 mediaimpl.cpp:293
+#: mediaimpl.cpp:230 mediaimpl.cpp:297
msgid "No such medium."
msgstr "Böyle bir ortam yok."
@@ -63,324 +62,331 @@ msgstr "Böyle bir ortam yok."
msgid "The drive is encrypted."
msgstr ""
-#: mediaimpl.cpp:272 mediamanager/halbackend.cpp:1264
-#: mediamanager/halbackend.cpp:1273 mediamanager/halbackend.cpp:1663
-#: mediamanager/halbackend.cpp:1680 mediamanager/halbackend.cpp:1691
-#: mediamanager/halbackend.cpp:1793 mediamanager/halbackend.cpp:1801
-#: mediamanager/halbackend.cpp:1808 mediamanager/halbackend.cpp:1848
-#: mediamanager/halbackend.cpp:1854 mediamanager/halbackend.cpp:1861
-#: mounthelper/tdeio_media_mounthelper.cpp:58
-msgid "Internal Error"
-msgstr "İç Hata"
+#: mediaimpl.cpp:274 mediamanager/tdehardwarebackend.cpp:201
+#: mediamanager/tdehardwarebackend.cpp:252
+#: mounthelper/tdeio_media_mounthelper.cpp:202
+msgid "Unknown mount error."
+msgstr ""
#: mediamanager/dialog.cpp:26 mounthelper/dialog.cpp:26
-msgid "Decrypt"
+msgid "Unlock"
msgstr ""
-#: mediamanager/fstabbackend.cpp:104 mediamanager/fstabbackend.cpp:114
-#: mediamanager/halbackend.cpp:1595 mediamanager/halbackend.cpp:1617
-#: mediamanager/halbackend.cpp:1776 mediamanager/halbackend.cpp:1831
-#: mediamanager/tdehardwarebackend.cpp:1349
-#: mediamanager/tdehardwarebackend.cpp:1360
+#: mediamanager/fstabbackend.cpp:105 mediamanager/fstabbackend.cpp:120
+#: mediamanager/halbackend.cpp:1598 mediamanager/halbackend.cpp:1625
+#: mediamanager/halbackend.cpp:1808 mediamanager/halbackend.cpp:1877
+#: mediamanager/mediamanager.cpp:363 mediamanager/mediamanager.cpp:375
+#: mediamanager/mediamanager.cpp:387 mediamanager/mediamanager.cpp:399
+#: mediamanager/tdehardwarebackend.cpp:1363
+#: mediamanager/tdehardwarebackend.cpp:1378
#, c-format
msgid "No such medium: %1"
msgstr "Böyle bir ortam yok: %1"
-#: mediamanager/fstabbackend.cpp:398
+#: mediamanager/fstabbackend.cpp:408
msgid "CD Recorder"
msgstr "CD Kayıt Aygıtı"
-#: mediamanager/fstabbackend.cpp:404
+#: mediamanager/fstabbackend.cpp:414
msgid "DVD"
msgstr "DVD"
-#: mediamanager/fstabbackend.cpp:415
+#: mediamanager/fstabbackend.cpp:425
msgid "CD-ROM"
msgstr "CD-ROM"
-#: mediamanager/fstabbackend.cpp:428
+#: mediamanager/fstabbackend.cpp:438
msgid "Floppy"
msgstr "Disket"
-#: mediamanager/fstabbackend.cpp:436
+#: mediamanager/fstabbackend.cpp:446
msgid "Zip Disk"
msgstr "Zip Diski"
-#: mediamanager/fstabbackend.cpp:447
+#: mediamanager/fstabbackend.cpp:457
msgid "Removable Device"
msgstr "Çıkartılabilir Aygıt"
-#: mediamanager/fstabbackend.cpp:452 mediamanager/fstabbackend.cpp:458
+#: mediamanager/fstabbackend.cpp:462 mediamanager/fstabbackend.cpp:468
msgid "Remote Share"
msgstr "Uzak Paylaşım"
-#: mediamanager/fstabbackend.cpp:463
+#: mediamanager/fstabbackend.cpp:473
msgid "Hard Disk"
msgstr "Sabit Disk"
-#: mediamanager/halbackend.cpp:749 mediamanager/tdehardwarebackend.cpp:805
+#: mediamanager/halbackend.cpp:744 mediamanager/tdehardwarebackend.cpp:808
#, fuzzy
msgid "Unknown Drive"
msgstr "Bilinmeyen"
-#: mediamanager/halbackend.cpp:761 mediamanager/tdehardwarebackend.cpp:835
+#: mediamanager/halbackend.cpp:756 mediamanager/tdehardwarebackend.cpp:838
#, fuzzy
msgid "Floppy Drive"
msgstr "Disket"
-#: mediamanager/halbackend.cpp:769
+#: mediamanager/halbackend.cpp:764
#, fuzzy
msgid "Zip Drive"
msgstr "Zip Diski"
-#: mediamanager/halbackend.cpp:839 mediamanager/tdehardwarebackend.cpp:892
+#: mediamanager/halbackend.cpp:834 mediamanager/tdehardwarebackend.cpp:895
msgid "Camera"
msgstr "Kamera"
-#: mediamanager/halbackend.cpp:1221 mediamanager/halbackend.cpp:1247
+#: mediamanager/halbackend.cpp:1216 mediamanager/halbackend.cpp:1242
msgid "Authenticate"
msgstr ""
-#: mediamanager/halbackend.cpp:1222
+#: mediamanager/halbackend.cpp:1217
msgid ""
"<big><b>System policy prevents mounting internal media</b></big><br/"
">Authentication is required to perform this action. Please enter your "
"password to verify."
msgstr ""
-#: mediamanager/halbackend.cpp:1248
+#: mediamanager/halbackend.cpp:1243
msgid ""
"<big><b>System policy prevents unmounting media mounted by other users</b></"
"big><br/>Authentication is required to perform this action. Please enter "
"your password to verify."
msgstr ""
-#: mediamanager/halbackend.cpp:1284
+#: mediamanager/halbackend.cpp:1259 mediamanager/halbackend.cpp:1268
+#: mediamanager/halbackend.cpp:1849 mediamanager/halbackend.cpp:1916
+#: mounthelper/tdeio_media_mounthelper.cpp:58
+msgid "Internal Error"
+msgstr "İç Hata"
+
+#: mediamanager/halbackend.cpp:1279
msgid "Invalid filesystem type"
msgstr "Geçersiz dosya sistemi tipi"
-#: mediamanager/halbackend.cpp:1286
+#: mediamanager/halbackend.cpp:1281
msgid ""
"Permission denied<p>Please ensure that:<br>1. You have permission to access "
"this device.<br>2. This device node is not listed in /etc/fstab.</p>"
msgstr ""
-#: mediamanager/halbackend.cpp:1290
+#: mediamanager/halbackend.cpp:1285
msgid "Device is already mounted."
msgstr "Aygıt zaten bağlı."
-#: mediamanager/halbackend.cpp:1340
+#: mediamanager/halbackend.cpp:1335
msgid ""
"Moreover, programs still using the device have been detected. They are "
"listed below. You have to close them or change their working directory "
"before attempting to unmount the device again."
msgstr ""
-#: mediamanager/halbackend.cpp:1381 mediamanager/tdehardwarebackend.cpp:1588
+#: mediamanager/halbackend.cpp:1376 mediamanager/tdehardwarebackend.cpp:1618
msgid ""
"Programs that were still using the device have been forcibly terminated. "
"They are listed below."
msgstr ""
-#: mediamanager/halbackend.cpp:1402 mediamanager/halbackend.cpp:1715
-#: mediamanager/tdehardwarebackend.cpp:1406
-#: mediamanager/tdehardwarebackend.cpp:1424
-#: mediamanager/tdehardwarebackend.cpp:1464
+#: mediamanager/halbackend.cpp:1397 mediamanager/halbackend.cpp:1742
+#: mediamanager/tdehardwarebackend.cpp:1430
+#: mediamanager/tdehardwarebackend.cpp:1452
+#: mediamanager/tdehardwarebackend.cpp:1494
msgid ""
"Unfortunately, the device <b>%1</b> (%2) named <b>'%3'</b> and currently "
"mounted at <b>%4</b> could not be unmounted. "
msgstr ""
-#: mediamanager/halbackend.cpp:1408 mediamanager/tdehardwarebackend.cpp:1470
+#: mediamanager/halbackend.cpp:1403 mediamanager/tdehardwarebackend.cpp:1500
msgid "The following error was returned by umount command:"
msgstr "Umount komutu şu hata ile döndü:"
-#: mediamanager/halbackend.cpp:1478
+#: mediamanager/halbackend.cpp:1567 mediamanager/tdehardwarebackend.cpp:1322
+msgid "Cannot mount encrypted locked drives!"
+msgstr ""
+
+#: mediamanager/halbackend.cpp:1682 mediamanager/halbackend.cpp:1703
+#: mediamanager/halbackend.cpp:1716 mediamanager/halbackend.cpp:1830
+#: mediamanager/halbackend.cpp:1840 mediamanager/halbackend.cpp:1899
+#: mediamanager/halbackend.cpp:1907
#, fuzzy
-msgid "Permission denied"
-msgstr "İzin verilmedi"
+msgid "Internal error"
+msgstr "İç Hata"
-#: mediamanager/halbackend.cpp:1562 mediamanager/tdehardwarebackend.cpp:1232
-msgid "Cannot mount encrypted drives!"
-msgstr ""
+#: mediamanager/halbackend.cpp:1694
+#, fuzzy
+#| msgid "Unknown"
+msgid "Unknown error"
+msgstr "Bilinmeyen"
-#: mediamanager/halbackend.cpp:1721
+#: mediamanager/halbackend.cpp:1748
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:1723
+#: mediamanager/halbackend.cpp:1750
msgid "Device is Busy:"
msgstr "Aygıt Meşgul:"
-#: mediamanager/halbackend.cpp:1727
+#: mediamanager/halbackend.cpp:1754
msgid ""
"Permission denied<p>Please ensure that:<br>1. You have permission to access "
"this device.<br>2. This device was originally mounted using TDE.</p>"
msgstr ""
-#: mediamanager/halbackend.cpp:1739
+#: mediamanager/halbackend.cpp:1766
msgid ""
"%1<p><b>Would you like to forcibly terminate these processes?</b><br><i>All "
"unsaved data would be lost</i>"
msgstr ""
-#: mediamanager/halbackend.cpp:1811
+#: mediamanager/halbackend.cpp:1852
msgid "Wrong password"
msgstr ""
-#: mediamanager/mediamanager.cpp:247 mediamanager/mediamanager.cpp:266
-#: mediamanager/mediamanager.cpp:285 mediamanager/mediamanager.cpp:293
-#: mediamanager/mediamanager.cpp:302 mediamanager/mediamanager.cpp:310
-msgid "Feature only available with HAL"
-msgstr "Bu özellik sadece HAL ile kullanılabilir"
-
-#: mediamanager/mediamanager.cpp:252
+#: mediamanager/mediamanager.cpp:248 mediamanager/mediamanager.cpp:275
#, fuzzy
msgid "Feature only available with the TDE hardware backend"
msgstr "Bu özellik sadece HAL ile kullanılabilir"
-#: mediamanager/mediamanager.cpp:256 mediamanager/mediamanager.cpp:271
-#: mediamanager/mediamanager.cpp:275
+#: mediamanager/mediamanager.cpp:255 mediamanager/mediamanager.cpp:282
+#: mediamanager/mediamanager.cpp:312 mediamanager/mediamanager.cpp:343
+msgid "Feature only available with HAL"
+msgstr "Bu özellik sadece HAL ile kullanılabilir"
+
+#: mediamanager/mediamanager.cpp:262 mediamanager/mediamanager.cpp:289
+#: mediamanager/mediamanager.cpp:320 mediamanager/mediamanager.cpp:350
#, fuzzy
msgid "Feature only available with HAL or TDE hardware backend"
msgstr "Bu özellik sadece HAL ile kullanılabilir"
-#: mediamanager/tdehardwarebackend.cpp:480
-#: mediamanager/tdehardwarebackend.cpp:517
-#: mediamanager/tdehardwarebackend.cpp:750
+#: mediamanager/tdehardwarebackend.cpp:483
+#: mediamanager/tdehardwarebackend.cpp:520
+#: mediamanager/tdehardwarebackend.cpp:753
#, fuzzy
msgid "%1 Removable Device"
msgstr "Çıkartılabilir Aygıt"
-#: mediamanager/tdehardwarebackend.cpp:525
+#: mediamanager/tdehardwarebackend.cpp:528
#, fuzzy
msgid "Blank CD-ROM"
msgstr "CD-ROM"
-#: mediamanager/tdehardwarebackend.cpp:534
+#: mediamanager/tdehardwarebackend.cpp:537
msgid "Blank CD-R"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:543
+#: mediamanager/tdehardwarebackend.cpp:546
msgid "Blank CD-RW"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:552
+#: mediamanager/tdehardwarebackend.cpp:555
msgid "Blank Magneto-Optical CD"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:561
+#: mediamanager/tdehardwarebackend.cpp:564
msgid "Blank Mount Ranier CD-RW"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:570
+#: mediamanager/tdehardwarebackend.cpp:573
msgid "Blank Mount Ranier CD-RW-W"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:579
+#: mediamanager/tdehardwarebackend.cpp:582
msgid "Blank DVD-ROM"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:588
+#: mediamanager/tdehardwarebackend.cpp:591
msgid "Blank DVD-RAM"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:597
+#: mediamanager/tdehardwarebackend.cpp:600
msgid "Blank DVD-R"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:606
+#: mediamanager/tdehardwarebackend.cpp:609
msgid "Blank DVD-RW"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:615
+#: mediamanager/tdehardwarebackend.cpp:618
msgid "Blank Dual Layer DVD-R"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:624
+#: mediamanager/tdehardwarebackend.cpp:627
msgid "Blank Dual Layer DVD-RW"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:633
+#: mediamanager/tdehardwarebackend.cpp:636
msgid "Blank DVD+R"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:642
+#: mediamanager/tdehardwarebackend.cpp:645
msgid "Blank DVD+RW"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:651
+#: mediamanager/tdehardwarebackend.cpp:654
msgid "Blank Dual Layer DVD+R"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:660
+#: mediamanager/tdehardwarebackend.cpp:663
msgid "Blank Dual Layer DVD+RW"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:669
+#: mediamanager/tdehardwarebackend.cpp:672
msgid "Blank BD-ROM"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:678
+#: mediamanager/tdehardwarebackend.cpp:681
msgid "Blank BD-R"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:687
+#: mediamanager/tdehardwarebackend.cpp:690
msgid "Blank BD-RW"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:696
+#: mediamanager/tdehardwarebackend.cpp:699
msgid "Blank HDDVD-ROM"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:705
+#: mediamanager/tdehardwarebackend.cpp:708
msgid "Blank HDDVD-R"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:714
+#: mediamanager/tdehardwarebackend.cpp:717
msgid "Blank HDDVD-RW"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:721
+#: mediamanager/tdehardwarebackend.cpp:724
msgid "Audio CD"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:742
+#: mediamanager/tdehardwarebackend.cpp:745
msgid "%1 Fixed Disk (%2)"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:849
+#: mediamanager/tdehardwarebackend.cpp:852
#, fuzzy
msgid "%1 Zip Disk"
msgstr "Zip Diski"
-#: mediamanager/tdehardwarebackend.cpp:1212
-#: mediamanager/tdehardwarebackend.cpp:1392
-#, fuzzy
-msgid "Internal error"
-msgstr "İç Hata"
+#: mediamanager/tdehardwarebackend.cpp:1224
+#: mediamanager/tdehardwarebackend.cpp:1417
+msgid "Internal error. Couldn't find medium."
+msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:1239
-msgid ""
-"<qt>Unable to mount this device.<p>Potential reasons include:<br>Improper "
-"device and/or user privilege level<br>Corrupt data on storage device"
+#: mediamanager/tdehardwarebackend.cpp:1249
+#: mediamanager/tdehardwarebackend.cpp:1323
+msgid "Unable to mount this device."
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:1241
-#: mediamanager/tdehardwarebackend.cpp:1316
-#: mediamanager/tdehardwarebackend.cpp:1408
-#: mediamanager/tdehardwarebackend.cpp:1426
+#: mediamanager/tdehardwarebackend.cpp:1252
+#: mediamanager/tdehardwarebackend.cpp:1326
+#: mediamanager/tdehardwarebackend.cpp:1435
+#: mediamanager/tdehardwarebackend.cpp:1457
msgid "<p>Technical details:<br>"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:1314
-msgid ""
-"<qt>Unable to mount this device.<p>Potential reasons include:<br>Improper "
-"device and/or user privilege level<br>Corrupt data on storage "
-"device<br>Incorrect encryption password"
+#: mediamanager/tdehardwarebackend.cpp:1284
+msgid "Decryption aborted"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:1420
+#: mediamanager/tdehardwarebackend.cpp:1443
msgid ""
"<qt>The device <b>%1</b> (%2) named <b>'%3'</b> and currently mounted at <b>"
"%4</b> can not be unmounted at this time.<p>%5<p><b>Would you like to "
@@ -388,7 +394,7 @@ msgid ""
"lost</i>"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:1547
+#: mediamanager/tdehardwarebackend.cpp:1577
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 "
@@ -399,7 +405,7 @@ msgstr ""
msgid "%1 cannot be found."
msgstr "%1 bulunamadı."
-#: mounthelper/tdeio_media_mounthelper.cpp:86
+#: mounthelper/tdeio_media_mounthelper.cpp:87
msgid "%1 is not a mountable media."
msgstr "%1 bağlanabilir bir ortam değil."
@@ -410,39 +416,47 @@ msgstr "%1 bağlanabilir bir ortam değil."
#: mounthelper/tdeio_media_mounthelper.cpp:107
#, fuzzy
-msgid "%1 is already decrypted."
+msgid "%1 is already unlocked."
msgstr "Aygıt zaten bağlı."
-#: mounthelper/tdeio_media_mounthelper.cpp:228
+#: mounthelper/tdeio_media_mounthelper.cpp:139
+msgid "Unknown unmount error."
+msgstr ""
+
+#: mounthelper/tdeio_media_mounthelper.cpp:246
msgid "The device was successfully unmounted, but the tray could not be opened"
msgstr "Aygıt başarılı şekilde ayrıldı, fakat çekmece açılamadı"
-#: mounthelper/tdeio_media_mounthelper.cpp:230
+#: 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:275
+#: mounthelper/tdeio_media_mounthelper.cpp:281
+msgid "Unknown decrypt error."
+msgstr ""
+
+#: mounthelper/tdeio_media_mounthelper.cpp:295
#, fuzzy
msgid "Decrypt given URL"
msgstr "Verilen adresi ayır"
-#: mounthelper/tdeio_media_mounthelper.cpp:276
+#: mounthelper/tdeio_media_mounthelper.cpp:296
msgid "Unmount given URL"
msgstr "Verilen adresi ayır"
-#: mounthelper/tdeio_media_mounthelper.cpp:277
+#: mounthelper/tdeio_media_mounthelper.cpp:297
msgid "Mount given URL (default)"
msgstr "Verilen adresi bağla (öntanımlı)"
-#: mounthelper/tdeio_media_mounthelper.cpp:278
+#: mounthelper/tdeio_media_mounthelper.cpp:298
msgid "Eject given URL via tdeeject"
msgstr "Verilen URL'yi tdeeject ile çıkar"
-#: mounthelper/tdeio_media_mounthelper.cpp:279
+#: 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:280
+#: mounthelper/tdeio_media_mounthelper.cpp:300
msgid "media:/ URL to mount/unmount/eject/remove"
msgstr "media:/ bağlama/ayırma/çıkarma/silme için URL"
@@ -463,43 +477,43 @@ msgstr "Değişiklikler kaydedilemedi"
msgid "&Mounting"
msgstr "&Bağlanıyor"
-#: tdefile-plugin/tdefilemediaplugin.cpp:190
+#: tdefile-plugin/tdefilemediaplugin.cpp:184
msgid "Medium Information"
msgstr "Ortam Bilgisi"
-#: tdefile-plugin/tdefilemediaplugin.cpp:193
+#: tdefile-plugin/tdefilemediaplugin.cpp:187
msgid "Free"
msgstr "Boş"
-#: tdefile-plugin/tdefilemediaplugin.cpp:196
+#: tdefile-plugin/tdefilemediaplugin.cpp:190
msgid "Used"
msgstr "Kullanılan"
-#: tdefile-plugin/tdefilemediaplugin.cpp:199
+#: tdefile-plugin/tdefilemediaplugin.cpp:193
msgid "Total"
msgstr "Toplam"
-#: tdefile-plugin/tdefilemediaplugin.cpp:202
+#: tdefile-plugin/tdefilemediaplugin.cpp:196
msgid "Base URL"
msgstr "Taban URL"
-#: tdefile-plugin/tdefilemediaplugin.cpp:203
+#: tdefile-plugin/tdefilemediaplugin.cpp:197
msgid "Mount Point"
msgstr "Bağlanma Noktası"
-#: tdefile-plugin/tdefilemediaplugin.cpp:204
+#: tdefile-plugin/tdefilemediaplugin.cpp:198
msgid "Device Node"
msgstr "Aygıt Dalı"
-#: tdefile-plugin/tdefilemediaplugin.cpp:206
+#: tdefile-plugin/tdefilemediaplugin.cpp:200
msgid "Medium Summary"
msgstr "Ortam Özeti"
-#: tdefile-plugin/tdefilemediaplugin.cpp:208
+#: tdefile-plugin/tdefilemediaplugin.cpp:202
msgid "Usage"
msgstr "Kullanım"
-#: tdefile-plugin/tdefilemediaplugin.cpp:210
+#: tdefile-plugin/tdefilemediaplugin.cpp:204
msgid "Bar Graph"
msgstr "Çubuk Grafiği"
@@ -571,23 +585,30 @@ msgid ""
"devices are plugged in."
msgstr ""
-#: mediamanager/decryptdialog.ui:24 mounthelper/decryptdialog.ui:24
+#: mediamanager/unlockdialog.ui:24 mounthelper/unlockdialog.ui:24
#, no-c-format
msgid "Decrypting Storage Device"
msgstr ""
-#: mediamanager/decryptdialog.ui:109 mounthelper/decryptdialog.ui:109
+#: mediamanager/unlockdialog.ui:109
#, no-c-format
msgid ""
-"<p><b>%1</b> is an encrypted storage device.</p>\n"
-"<p>Please enter the password to decrypt the storage device.</p>"
+"<p><b>%1</b> is an encrypted locked storage device.</p>\n"
+"<p>Please enter the password to unlock the storage device.</p>"
msgstr ""
-#: mediamanager/decryptdialog.ui:131 mounthelper/decryptdialog.ui:131
+#: mediamanager/unlockdialog.ui:131 mounthelper/unlockdialog.ui:131
#, no-c-format
msgid "&Password:"
msgstr ""
+#: mounthelper/unlockdialog.ui:109
+#, no-c-format
+msgid ""
+"<p><b>%1</b> is an encrypted storage device.</p>\n"
+"<p>Please enter the password to decrypt the storage device.</p>"
+msgstr ""
+
#: propsdlgplugin/propertiespagegui.ui:16
#, no-c-format
msgid "PropertiesPageGUI"
@@ -804,3 +825,7 @@ msgstr "Karışık"
#, no-c-format
msgid "Filesystem: iso9660"
msgstr "Dosya sistemi: iso9660"
+
+#, 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 6bfde3a4901..48cbda8d8f4 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: 2019-01-13 18:47+0100\n"
+"POT-Creation-Date: 2019-07-11 02:33+0200\n"
"PO-Revision-Date: 2007-04-02 23:06-0400\n"
"Last-Translator: Roman Savochenko <rom_as@oscada.org>\n"
"Language-Team: <en@li.org>\n"
@@ -53,7 +53,6 @@ msgstr "Невідома"
#: mediaimpl.cpp:88 mediaimpl.cpp:115 mediaimpl.cpp:141 mediaimpl.cpp:177
#: mediaimpl.cpp:197 mediaimpl.cpp:218
#: mounthelper/tdeio_media_mounthelper.cpp:50
-#: mounthelper/tdeio_media_mounthelper.cpp:256
msgid "The TDE mediamanager is not running."
msgstr "Менеджер роботи з носіями інформації не запущено."
@@ -61,7 +60,7 @@ msgstr "Менеджер роботи з носіями інформації н
msgid "This media name already exists."
msgstr "Пристрій з такою назвою вже існує."
-#: mediaimpl.cpp:230 mediaimpl.cpp:293
+#: mediaimpl.cpp:230 mediaimpl.cpp:297
msgid "No such medium."
msgstr "Нема такого носія."
@@ -69,82 +68,80 @@ msgstr "Нема такого носія."
msgid "The drive is encrypted."
msgstr "Диск зашифровано."
-#: mediaimpl.cpp:272 mediamanager/halbackend.cpp:1264
-#: mediamanager/halbackend.cpp:1273 mediamanager/halbackend.cpp:1663
-#: mediamanager/halbackend.cpp:1680 mediamanager/halbackend.cpp:1691
-#: mediamanager/halbackend.cpp:1793 mediamanager/halbackend.cpp:1801
-#: mediamanager/halbackend.cpp:1808 mediamanager/halbackend.cpp:1848
-#: mediamanager/halbackend.cpp:1854 mediamanager/halbackend.cpp:1861
-#: mounthelper/tdeio_media_mounthelper.cpp:58
-msgid "Internal Error"
-msgstr "Внутрішня помилка"
+#: mediaimpl.cpp:274 mediamanager/tdehardwarebackend.cpp:201
+#: mediamanager/tdehardwarebackend.cpp:252
+#: mounthelper/tdeio_media_mounthelper.cpp:202
+msgid "Unknown mount error."
+msgstr ""
#: mediamanager/dialog.cpp:26 mounthelper/dialog.cpp:26
-msgid "Decrypt"
-msgstr "Розшифрувати"
-
-#: mediamanager/fstabbackend.cpp:104 mediamanager/fstabbackend.cpp:114
-#: mediamanager/halbackend.cpp:1595 mediamanager/halbackend.cpp:1617
-#: mediamanager/halbackend.cpp:1776 mediamanager/halbackend.cpp:1831
-#: mediamanager/tdehardwarebackend.cpp:1349
-#: mediamanager/tdehardwarebackend.cpp:1360
+msgid "Unlock"
+msgstr ""
+
+#: mediamanager/fstabbackend.cpp:105 mediamanager/fstabbackend.cpp:120
+#: mediamanager/halbackend.cpp:1598 mediamanager/halbackend.cpp:1625
+#: mediamanager/halbackend.cpp:1808 mediamanager/halbackend.cpp:1877
+#: mediamanager/mediamanager.cpp:363 mediamanager/mediamanager.cpp:375
+#: mediamanager/mediamanager.cpp:387 mediamanager/mediamanager.cpp:399
+#: mediamanager/tdehardwarebackend.cpp:1363
+#: mediamanager/tdehardwarebackend.cpp:1378
#, c-format
msgid "No such medium: %1"
msgstr "Нема носія: %1"
-#: mediamanager/fstabbackend.cpp:398
+#: mediamanager/fstabbackend.cpp:408
msgid "CD Recorder"
msgstr "Гравер КД"
-#: mediamanager/fstabbackend.cpp:404
+#: mediamanager/fstabbackend.cpp:414
msgid "DVD"
msgstr "DVD"
-#: mediamanager/fstabbackend.cpp:415
+#: mediamanager/fstabbackend.cpp:425
msgid "CD-ROM"
msgstr "Пристрій для КД"
-#: mediamanager/fstabbackend.cpp:428
+#: mediamanager/fstabbackend.cpp:438
msgid "Floppy"
msgstr "Дисковод"
-#: mediamanager/fstabbackend.cpp:436
+#: mediamanager/fstabbackend.cpp:446
msgid "Zip Disk"
msgstr "Zip-диск"
-#: mediamanager/fstabbackend.cpp:447
+#: mediamanager/fstabbackend.cpp:457
msgid "Removable Device"
msgstr "Змінний пристрій"
-#: mediamanager/fstabbackend.cpp:452 mediamanager/fstabbackend.cpp:458
+#: mediamanager/fstabbackend.cpp:462 mediamanager/fstabbackend.cpp:468
msgid "Remote Share"
msgstr "Віддалений спільний ресурс"
-#: mediamanager/fstabbackend.cpp:463
+#: mediamanager/fstabbackend.cpp:473
msgid "Hard Disk"
msgstr "Жорсткий диск"
-#: mediamanager/halbackend.cpp:749 mediamanager/tdehardwarebackend.cpp:805
+#: mediamanager/halbackend.cpp:744 mediamanager/tdehardwarebackend.cpp:808
msgid "Unknown Drive"
msgstr "Невідомий Диск"
-#: mediamanager/halbackend.cpp:761 mediamanager/tdehardwarebackend.cpp:835
+#: mediamanager/halbackend.cpp:756 mediamanager/tdehardwarebackend.cpp:838
msgid "Floppy Drive"
msgstr "Дискета"
-#: mediamanager/halbackend.cpp:769
+#: mediamanager/halbackend.cpp:764
msgid "Zip Drive"
msgstr "Zip Диск"
-#: mediamanager/halbackend.cpp:839 mediamanager/tdehardwarebackend.cpp:892
+#: mediamanager/halbackend.cpp:834 mediamanager/tdehardwarebackend.cpp:895
msgid "Camera"
msgstr "Камера"
-#: mediamanager/halbackend.cpp:1221 mediamanager/halbackend.cpp:1247
+#: mediamanager/halbackend.cpp:1216 mediamanager/halbackend.cpp:1242
msgid "Authenticate"
msgstr "Аутентифікація"
-#: mediamanager/halbackend.cpp:1222
+#: mediamanager/halbackend.cpp:1217
msgid ""
"<big><b>System policy prevents mounting internal media</b></big><br/"
">Authentication is required to perform this action. Please enter your "
@@ -154,7 +151,7 @@ msgstr ""
">Аутентифікація потрібна для здійснення цієї дії. Будь ласка введіть ваш "
"пароль для перевірки."
-#: mediamanager/halbackend.cpp:1248
+#: mediamanager/halbackend.cpp:1243
msgid ""
"<big><b>System policy prevents unmounting media mounted by other users</b></"
"big><br/>Authentication is required to perform this action. Please enter "
@@ -164,11 +161,17 @@ msgstr ""
"користуваами</b></big><br/>Аутентифікація потрібна для здійснення цієї дії. "
"Будь ласка введіть ваш пароль для перевірки."
-#: mediamanager/halbackend.cpp:1284
+#: mediamanager/halbackend.cpp:1259 mediamanager/halbackend.cpp:1268
+#: mediamanager/halbackend.cpp:1849 mediamanager/halbackend.cpp:1916
+#: mounthelper/tdeio_media_mounthelper.cpp:58
+msgid "Internal Error"
+msgstr "Внутрішня помилка"
+
+#: mediamanager/halbackend.cpp:1279
msgid "Invalid filesystem type"
msgstr "Непридатний тип файлової системи"
-#: mediamanager/halbackend.cpp:1286
+#: mediamanager/halbackend.cpp:1281
#, fuzzy
msgid ""
"Permission denied<p>Please ensure that:<br>1. You have permission to access "
@@ -178,11 +181,11 @@ msgstr ""
"доступу до цього пристрою.<br>2. Цей вузол пристрою не вказано у /etc/fstab."
"</p>"
-#: mediamanager/halbackend.cpp:1290
+#: mediamanager/halbackend.cpp:1285
msgid "Device is already mounted."
msgstr "Пристрій вже змонтовано."
-#: mediamanager/halbackend.cpp:1340
+#: mediamanager/halbackend.cpp:1335
msgid ""
"Moreover, programs still using the device have been detected. They are "
"listed below. You have to close them or change their working directory "
@@ -192,7 +195,7 @@ msgstr ""
"Їх треба закрити або змінити їх робочий каталог перед тим, як ви повторите "
"спробу демонтування пристрою."
-#: mediamanager/halbackend.cpp:1381 mediamanager/tdehardwarebackend.cpp:1588
+#: mediamanager/halbackend.cpp:1376 mediamanager/tdehardwarebackend.cpp:1618
msgid ""
"Programs that were still using the device have been forcibly terminated. "
"They are listed below."
@@ -200,10 +203,10 @@ msgstr ""
"Програми які все ще використовують пристрій будуть примусово перервані. Їх "
"перелічено нижче."
-#: mediamanager/halbackend.cpp:1402 mediamanager/halbackend.cpp:1715
-#: mediamanager/tdehardwarebackend.cpp:1406
-#: mediamanager/tdehardwarebackend.cpp:1424
-#: mediamanager/tdehardwarebackend.cpp:1464
+#: mediamanager/halbackend.cpp:1397 mediamanager/halbackend.cpp:1742
+#: mediamanager/tdehardwarebackend.cpp:1430
+#: mediamanager/tdehardwarebackend.cpp:1452
+#: mediamanager/tdehardwarebackend.cpp:1494
msgid ""
"Unfortunately, the device <b>%1</b> (%2) named <b>'%3'</b> and currently "
"mounted at <b>%4</b> could not be unmounted. "
@@ -211,27 +214,39 @@ msgstr ""
"На жаль, пристрій <b>%1</b> (%2) з назвою <b>'%3'</b>, який в даний час "
"змонтований на <b>%4</b> не можна демонтувати. "
-#: mediamanager/halbackend.cpp:1408 mediamanager/tdehardwarebackend.cpp:1470
+#: mediamanager/halbackend.cpp:1403 mediamanager/tdehardwarebackend.cpp:1500
msgid "The following error was returned by umount command:"
msgstr "Командою umount було повернено наступну помилку:"
-#: mediamanager/halbackend.cpp:1478
-msgid "Permission denied"
-msgstr "Не має доступу"
-
-#: mediamanager/halbackend.cpp:1562 mediamanager/tdehardwarebackend.cpp:1232
-msgid "Cannot mount encrypted drives!"
+#: mediamanager/halbackend.cpp:1567 mediamanager/tdehardwarebackend.cpp:1322
+#, fuzzy
+#| msgid "Cannot mount encrypted drives!"
+msgid "Cannot mount encrypted locked drives!"
msgstr "Не можу монтувати зашифрованих дисків!"
-#: mediamanager/halbackend.cpp:1721
+#: mediamanager/halbackend.cpp:1682 mediamanager/halbackend.cpp:1703
+#: mediamanager/halbackend.cpp:1716 mediamanager/halbackend.cpp:1830
+#: mediamanager/halbackend.cpp:1840 mediamanager/halbackend.cpp:1899
+#: mediamanager/halbackend.cpp:1907
+#, fuzzy
+msgid "Internal error"
+msgstr "Внутрішня помилка"
+
+#: mediamanager/halbackend.cpp:1694
+#, fuzzy
+#| msgid "Unknown"
+msgid "Unknown error"
+msgstr "Невідома"
+
+#: mediamanager/halbackend.cpp:1748
msgid "Unmounting failed due to the following error:"
msgstr "Демонтування зазнало невдачі через наступну помилку:"
-#: mediamanager/halbackend.cpp:1723
+#: mediamanager/halbackend.cpp:1750
msgid "Device is Busy:"
msgstr "Пристрій зайнятий:"
-#: mediamanager/halbackend.cpp:1727
+#: mediamanager/halbackend.cpp:1754
msgid ""
"Permission denied<p>Please ensure that:<br>1. You have permission to access "
"this device.<br>2. This device was originally mounted using TDE.</p>"
@@ -240,7 +255,7 @@ msgstr ""
"доступу до цього пристрою.<br>2. Цей пристрій було змонтовано за допомогою "
"TDE.</p>"
-#: mediamanager/halbackend.cpp:1739
+#: mediamanager/halbackend.cpp:1766
msgid ""
"%1<p><b>Would you like to forcibly terminate these processes?</b><br><i>All "
"unsaved data would be lost</i>"
@@ -248,163 +263,157 @@ msgstr ""
"%1<p><b>Ви згодні примусово перервати ці процеси?</b><br><i>Всі незбережені "
"дані можуть бути втрачені</i>"
-#: mediamanager/halbackend.cpp:1811
+#: mediamanager/halbackend.cpp:1852
msgid "Wrong password"
msgstr "Помилка паролю"
-#: mediamanager/mediamanager.cpp:247 mediamanager/mediamanager.cpp:266
-#: mediamanager/mediamanager.cpp:285 mediamanager/mediamanager.cpp:293
-#: mediamanager/mediamanager.cpp:302 mediamanager/mediamanager.cpp:310
-msgid "Feature only available with HAL"
-msgstr "Функціональність доступна тільки з HAL"
-
-#: mediamanager/mediamanager.cpp:252
+#: mediamanager/mediamanager.cpp:248 mediamanager/mediamanager.cpp:275
#, fuzzy
msgid "Feature only available with the TDE hardware backend"
msgstr "Функціональність доступна тільки з HAL"
-#: mediamanager/mediamanager.cpp:256 mediamanager/mediamanager.cpp:271
-#: mediamanager/mediamanager.cpp:275
+#: mediamanager/mediamanager.cpp:255 mediamanager/mediamanager.cpp:282
+#: mediamanager/mediamanager.cpp:312 mediamanager/mediamanager.cpp:343
+msgid "Feature only available with HAL"
+msgstr "Функціональність доступна тільки з HAL"
+
+#: mediamanager/mediamanager.cpp:262 mediamanager/mediamanager.cpp:289
+#: mediamanager/mediamanager.cpp:320 mediamanager/mediamanager.cpp:350
#, fuzzy
msgid "Feature only available with HAL or TDE hardware backend"
msgstr "Функціональність доступна тільки з HAL"
-#: mediamanager/tdehardwarebackend.cpp:480
-#: mediamanager/tdehardwarebackend.cpp:517
-#: mediamanager/tdehardwarebackend.cpp:750
+#: mediamanager/tdehardwarebackend.cpp:483
+#: mediamanager/tdehardwarebackend.cpp:520
+#: mediamanager/tdehardwarebackend.cpp:753
#, fuzzy
msgid "%1 Removable Device"
msgstr "Змінний пристрій"
-#: mediamanager/tdehardwarebackend.cpp:525
+#: mediamanager/tdehardwarebackend.cpp:528
#, fuzzy
msgid "Blank CD-ROM"
msgstr "Пристрій для КД"
-#: mediamanager/tdehardwarebackend.cpp:534
+#: mediamanager/tdehardwarebackend.cpp:537
msgid "Blank CD-R"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:543
+#: mediamanager/tdehardwarebackend.cpp:546
msgid "Blank CD-RW"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:552
+#: mediamanager/tdehardwarebackend.cpp:555
msgid "Blank Magneto-Optical CD"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:561
+#: mediamanager/tdehardwarebackend.cpp:564
msgid "Blank Mount Ranier CD-RW"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:570
+#: mediamanager/tdehardwarebackend.cpp:573
msgid "Blank Mount Ranier CD-RW-W"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:579
+#: mediamanager/tdehardwarebackend.cpp:582
msgid "Blank DVD-ROM"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:588
+#: mediamanager/tdehardwarebackend.cpp:591
msgid "Blank DVD-RAM"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:597
+#: mediamanager/tdehardwarebackend.cpp:600
msgid "Blank DVD-R"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:606
+#: mediamanager/tdehardwarebackend.cpp:609
msgid "Blank DVD-RW"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:615
+#: mediamanager/tdehardwarebackend.cpp:618
msgid "Blank Dual Layer DVD-R"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:624
+#: mediamanager/tdehardwarebackend.cpp:627
msgid "Blank Dual Layer DVD-RW"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:633
+#: mediamanager/tdehardwarebackend.cpp:636
msgid "Blank DVD+R"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:642
+#: mediamanager/tdehardwarebackend.cpp:645
msgid "Blank DVD+RW"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:651
+#: mediamanager/tdehardwarebackend.cpp:654
msgid "Blank Dual Layer DVD+R"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:660
+#: mediamanager/tdehardwarebackend.cpp:663
msgid "Blank Dual Layer DVD+RW"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:669
+#: mediamanager/tdehardwarebackend.cpp:672
msgid "Blank BD-ROM"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:678
+#: mediamanager/tdehardwarebackend.cpp:681
msgid "Blank BD-R"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:687
+#: mediamanager/tdehardwarebackend.cpp:690
msgid "Blank BD-RW"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:696
+#: mediamanager/tdehardwarebackend.cpp:699
msgid "Blank HDDVD-ROM"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:705
+#: mediamanager/tdehardwarebackend.cpp:708
msgid "Blank HDDVD-R"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:714
+#: mediamanager/tdehardwarebackend.cpp:717
msgid "Blank HDDVD-RW"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:721
+#: mediamanager/tdehardwarebackend.cpp:724
msgid "Audio CD"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:742
+#: mediamanager/tdehardwarebackend.cpp:745
msgid "%1 Fixed Disk (%2)"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:849
+#: mediamanager/tdehardwarebackend.cpp:852
#, fuzzy
msgid "%1 Zip Disk"
msgstr "Zip-диск"
-#: mediamanager/tdehardwarebackend.cpp:1212
-#: mediamanager/tdehardwarebackend.cpp:1392
-#, fuzzy
-msgid "Internal error"
-msgstr "Внутрішня помилка"
+#: mediamanager/tdehardwarebackend.cpp:1224
+#: mediamanager/tdehardwarebackend.cpp:1417
+msgid "Internal error. Couldn't find medium."
+msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:1239
-msgid ""
-"<qt>Unable to mount this device.<p>Potential reasons include:<br>Improper "
-"device and/or user privilege level<br>Corrupt data on storage device"
+#: mediamanager/tdehardwarebackend.cpp:1249
+#: mediamanager/tdehardwarebackend.cpp:1323
+msgid "Unable to mount this device."
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:1241
-#: mediamanager/tdehardwarebackend.cpp:1316
-#: mediamanager/tdehardwarebackend.cpp:1408
-#: mediamanager/tdehardwarebackend.cpp:1426
+#: mediamanager/tdehardwarebackend.cpp:1252
+#: mediamanager/tdehardwarebackend.cpp:1326
+#: mediamanager/tdehardwarebackend.cpp:1435
+#: mediamanager/tdehardwarebackend.cpp:1457
msgid "<p>Technical details:<br>"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:1314
-msgid ""
-"<qt>Unable to mount this device.<p>Potential reasons include:<br>Improper "
-"device and/or user privilege level<br>Corrupt data on storage "
-"device<br>Incorrect encryption password"
+#: mediamanager/tdehardwarebackend.cpp:1284
+msgid "Decryption aborted"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:1420
+#: mediamanager/tdehardwarebackend.cpp:1443
#, fuzzy
msgid ""
"<qt>The device <b>%1</b> (%2) named <b>'%3'</b> and currently mounted at <b>"
@@ -415,7 +424,7 @@ msgstr ""
"%1<p><b>Ви згодні примусово перервати ці процеси?</b><br><i>Всі незбережені "
"дані можуть бути втрачені</i>"
-#: mediamanager/tdehardwarebackend.cpp:1547
+#: mediamanager/tdehardwarebackend.cpp:1577
#, fuzzy
msgid ""
"Programs still using the device have been detected. They are listed below. "
@@ -430,7 +439,7 @@ msgstr ""
msgid "%1 cannot be found."
msgstr "Не вдається знайти %1."
-#: mounthelper/tdeio_media_mounthelper.cpp:86
+#: mounthelper/tdeio_media_mounthelper.cpp:87
msgid "%1 is not a mountable media."
msgstr "%1 не є носієм, який можна змонтувати."
@@ -439,39 +448,49 @@ msgid "%1 is not an encrypted media."
msgstr "%1 незашифрований пристрій."
#: mounthelper/tdeio_media_mounthelper.cpp:107
-msgid "%1 is already decrypted."
+#, fuzzy
+#| msgid "%1 is already decrypted."
+msgid "%1 is already unlocked."
msgstr "%1 вже розшифровано."
-#: mounthelper/tdeio_media_mounthelper.cpp:228
+#: mounthelper/tdeio_media_mounthelper.cpp:139
+msgid "Unknown unmount error."
+msgstr ""
+
+#: mounthelper/tdeio_media_mounthelper.cpp:246
msgid "The device was successfully unmounted, but the tray could not be opened"
msgstr "Пристрій успішно демонтовано, але не вдалося відкрити лоток"
-#: mounthelper/tdeio_media_mounthelper.cpp:230
+#: mounthelper/tdeio_media_mounthelper.cpp:248
msgid "The device was successfully unmounted, but could not be ejected"
msgstr "Пристрій успішно демонтовано, але не вдалося виштовхнути"
-#: mounthelper/tdeio_media_mounthelper.cpp:275
+#: mounthelper/tdeio_media_mounthelper.cpp:281
+msgid "Unknown decrypt error."
+msgstr ""
+
+#: mounthelper/tdeio_media_mounthelper.cpp:295
msgid "Decrypt given URL"
msgstr "Розшифрувати цей URL"
-#: mounthelper/tdeio_media_mounthelper.cpp:276
+#: mounthelper/tdeio_media_mounthelper.cpp:296
msgid "Unmount given URL"
msgstr "Демонтувати вказану адресу (URL)"
-#: mounthelper/tdeio_media_mounthelper.cpp:277
+#: mounthelper/tdeio_media_mounthelper.cpp:297
msgid "Mount given URL (default)"
msgstr "Змонтувати вказану URL (типове)"
-#: mounthelper/tdeio_media_mounthelper.cpp:278
+#: mounthelper/tdeio_media_mounthelper.cpp:298
msgid "Eject given URL via tdeeject"
msgstr "Виштовхнути наведений URL за допомогою tdeeject"
-#: mounthelper/tdeio_media_mounthelper.cpp:279
+#: mounthelper/tdeio_media_mounthelper.cpp:299
msgid "Unmount and Eject given URL (necessary for some USB devices)"
msgstr ""
"Демонтувати і виштовхнути вказаний URL (необхідне для деяких пристроїв USB)"
-#: mounthelper/tdeio_media_mounthelper.cpp:280
+#: mounthelper/tdeio_media_mounthelper.cpp:300
msgid "media:/ URL to mount/unmount/eject/remove"
msgstr "media:/ URL для монтування/демонтування/виштовхування/вилучення"
@@ -492,43 +511,43 @@ msgstr "Помилка збереження змін"
msgid "&Mounting"
msgstr "&Монтування"
-#: tdefile-plugin/tdefilemediaplugin.cpp:190
+#: tdefile-plugin/tdefilemediaplugin.cpp:184
msgid "Medium Information"
msgstr "Інформація про носій"
-#: tdefile-plugin/tdefilemediaplugin.cpp:193
+#: tdefile-plugin/tdefilemediaplugin.cpp:187
msgid "Free"
msgstr "Вільно"
-#: tdefile-plugin/tdefilemediaplugin.cpp:196
+#: tdefile-plugin/tdefilemediaplugin.cpp:190
msgid "Used"
msgstr "Використано"
-#: tdefile-plugin/tdefilemediaplugin.cpp:199
+#: tdefile-plugin/tdefilemediaplugin.cpp:193
msgid "Total"
msgstr "Всього"
-#: tdefile-plugin/tdefilemediaplugin.cpp:202
+#: tdefile-plugin/tdefilemediaplugin.cpp:196
msgid "Base URL"
msgstr "Основний URL"
-#: tdefile-plugin/tdefilemediaplugin.cpp:203
+#: tdefile-plugin/tdefilemediaplugin.cpp:197
msgid "Mount Point"
msgstr "Точка підключення"
-#: tdefile-plugin/tdefilemediaplugin.cpp:204
+#: tdefile-plugin/tdefilemediaplugin.cpp:198
msgid "Device Node"
msgstr "Вузол пристрою"
-#: tdefile-plugin/tdefilemediaplugin.cpp:206
+#: tdefile-plugin/tdefilemediaplugin.cpp:200
msgid "Medium Summary"
msgstr "Коротко про носій"
-#: tdefile-plugin/tdefilemediaplugin.cpp:208
+#: tdefile-plugin/tdefilemediaplugin.cpp:202
msgid "Usage"
msgstr "Використання"
-#: tdefile-plugin/tdefilemediaplugin.cpp:210
+#: tdefile-plugin/tdefilemediaplugin.cpp:204
msgid "Bar Graph"
msgstr "Стовпчикова діаграма"
@@ -600,23 +619,30 @@ msgid ""
"devices are plugged in."
msgstr ""
-#: mediamanager/decryptdialog.ui:24 mounthelper/decryptdialog.ui:24
+#: mediamanager/unlockdialog.ui:24 mounthelper/unlockdialog.ui:24
#, no-c-format
msgid "Decrypting Storage Device"
msgstr ""
-#: mediamanager/decryptdialog.ui:109 mounthelper/decryptdialog.ui:109
+#: mediamanager/unlockdialog.ui:109
#, no-c-format
msgid ""
-"<p><b>%1</b> is an encrypted storage device.</p>\n"
-"<p>Please enter the password to decrypt the storage device.</p>"
+"<p><b>%1</b> is an encrypted locked storage device.</p>\n"
+"<p>Please enter the password to unlock the storage device.</p>"
msgstr ""
-#: mediamanager/decryptdialog.ui:131 mounthelper/decryptdialog.ui:131
+#: mediamanager/unlockdialog.ui:131 mounthelper/unlockdialog.ui:131
#, no-c-format
msgid "&Password:"
msgstr ""
+#: mounthelper/unlockdialog.ui:109
+#, no-c-format
+msgid ""
+"<p><b>%1</b> is an encrypted storage device.</p>\n"
+"<p>Please enter the password to decrypt the storage device.</p>"
+msgstr ""
+
#: propsdlgplugin/propertiespagegui.ui:16
#, no-c-format
msgid "PropertiesPageGUI"
@@ -881,3 +907,9 @@ msgstr "Змішана"
#, no-c-format
msgid "Filesystem: iso9660"
msgstr "Файлова система: iso9660"
+
+#~ msgid "Decrypt"
+#~ msgstr "Розшифрувати"
+
+#~ msgid "Permission denied"
+#~ msgstr "Не має доступу"
diff --git a/tde-i18n-uz/messages/tdebase/tdeio_media.po b/tde-i18n-uz/messages/tdebase/tdeio_media.po
index 0450b45a755..2aa2616ef8d 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: 2019-01-13 18:47+0100\n"
+"POT-Creation-Date: 2019-07-11 02:33+0200\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"
@@ -48,7 +48,6 @@ 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
-#: mounthelper/tdeio_media_mounthelper.cpp:256
msgid "The TDE mediamanager is not running."
msgstr "TDE saqlash uskunalar boshqaruvchisi ishga tushmagan."
@@ -56,7 +55,7 @@ msgstr "TDE saqlash uskunalar boshqaruvchisi ishga tushmagan."
msgid "This media name already exists."
msgstr "Maʼlumot tashuvchining nomi allaqachon mavjud."
-#: mediaimpl.cpp:230 mediaimpl.cpp:293
+#: mediaimpl.cpp:230 mediaimpl.cpp:297
msgid "No such medium."
msgstr ""
@@ -64,321 +63,328 @@ msgstr ""
msgid "The drive is encrypted."
msgstr ""
-#: mediaimpl.cpp:272 mediamanager/halbackend.cpp:1264
-#: mediamanager/halbackend.cpp:1273 mediamanager/halbackend.cpp:1663
-#: mediamanager/halbackend.cpp:1680 mediamanager/halbackend.cpp:1691
-#: mediamanager/halbackend.cpp:1793 mediamanager/halbackend.cpp:1801
-#: mediamanager/halbackend.cpp:1808 mediamanager/halbackend.cpp:1848
-#: mediamanager/halbackend.cpp:1854 mediamanager/halbackend.cpp:1861
-#: mounthelper/tdeio_media_mounthelper.cpp:58
-msgid "Internal Error"
-msgstr "Ichki xato"
+#: mediaimpl.cpp:274 mediamanager/tdehardwarebackend.cpp:201
+#: mediamanager/tdehardwarebackend.cpp:252
+#: mounthelper/tdeio_media_mounthelper.cpp:202
+msgid "Unknown mount error."
+msgstr ""
#: mediamanager/dialog.cpp:26 mounthelper/dialog.cpp:26
-msgid "Decrypt"
+msgid "Unlock"
msgstr ""
-#: mediamanager/fstabbackend.cpp:104 mediamanager/fstabbackend.cpp:114
-#: mediamanager/halbackend.cpp:1595 mediamanager/halbackend.cpp:1617
-#: mediamanager/halbackend.cpp:1776 mediamanager/halbackend.cpp:1831
-#: mediamanager/tdehardwarebackend.cpp:1349
-#: mediamanager/tdehardwarebackend.cpp:1360
+#: mediamanager/fstabbackend.cpp:105 mediamanager/fstabbackend.cpp:120
+#: mediamanager/halbackend.cpp:1598 mediamanager/halbackend.cpp:1625
+#: mediamanager/halbackend.cpp:1808 mediamanager/halbackend.cpp:1877
+#: mediamanager/mediamanager.cpp:363 mediamanager/mediamanager.cpp:375
+#: mediamanager/mediamanager.cpp:387 mediamanager/mediamanager.cpp:399
+#: mediamanager/tdehardwarebackend.cpp:1363
+#: mediamanager/tdehardwarebackend.cpp:1378
#, c-format
msgid "No such medium: %1"
msgstr ""
-#: mediamanager/fstabbackend.cpp:398
+#: mediamanager/fstabbackend.cpp:408
msgid "CD Recorder"
msgstr "Kompakt-disk yozuvchi"
-#: mediamanager/fstabbackend.cpp:404
+#: mediamanager/fstabbackend.cpp:414
msgid "DVD"
msgstr "DVD"
-#: mediamanager/fstabbackend.cpp:415
+#: mediamanager/fstabbackend.cpp:425
msgid "CD-ROM"
msgstr "Kompakt-disk"
-#: mediamanager/fstabbackend.cpp:428
+#: mediamanager/fstabbackend.cpp:438
msgid "Floppy"
msgstr "Disket"
-#: mediamanager/fstabbackend.cpp:436
+#: mediamanager/fstabbackend.cpp:446
msgid "Zip Disk"
msgstr "ZIP-disk"
-#: mediamanager/fstabbackend.cpp:447
+#: mediamanager/fstabbackend.cpp:457
msgid "Removable Device"
msgstr "Olinadigan uskuna"
-#: mediamanager/fstabbackend.cpp:452 mediamanager/fstabbackend.cpp:458
+#: mediamanager/fstabbackend.cpp:462 mediamanager/fstabbackend.cpp:468
msgid "Remote Share"
msgstr ""
-#: mediamanager/fstabbackend.cpp:463
+#: mediamanager/fstabbackend.cpp:473
msgid "Hard Disk"
msgstr "Qattiq disk"
-#: mediamanager/halbackend.cpp:749 mediamanager/tdehardwarebackend.cpp:805
+#: mediamanager/halbackend.cpp:744 mediamanager/tdehardwarebackend.cpp:808
msgid "Unknown Drive"
msgstr "Nomaʼlum"
-#: mediamanager/halbackend.cpp:761 mediamanager/tdehardwarebackend.cpp:835
+#: mediamanager/halbackend.cpp:756 mediamanager/tdehardwarebackend.cpp:838
msgid "Floppy Drive"
msgstr "Disket"
-#: mediamanager/halbackend.cpp:769
+#: mediamanager/halbackend.cpp:764
msgid "Zip Drive"
msgstr "ZIP-disk"
-#: mediamanager/halbackend.cpp:839 mediamanager/tdehardwarebackend.cpp:892
+#: mediamanager/halbackend.cpp:834 mediamanager/tdehardwarebackend.cpp:895
msgid "Camera"
msgstr "Fotoaparat"
-#: mediamanager/halbackend.cpp:1221 mediamanager/halbackend.cpp:1247
+#: mediamanager/halbackend.cpp:1216 mediamanager/halbackend.cpp:1242
msgid "Authenticate"
msgstr ""
-#: mediamanager/halbackend.cpp:1222
+#: mediamanager/halbackend.cpp:1217
msgid ""
"<big><b>System policy prevents mounting internal media</b></big><br/"
">Authentication is required to perform this action. Please enter your "
"password to verify."
msgstr ""
-#: mediamanager/halbackend.cpp:1248
+#: mediamanager/halbackend.cpp:1243
msgid ""
"<big><b>System policy prevents unmounting media mounted by other users</b></"
"big><br/>Authentication is required to perform this action. Please enter "
"your password to verify."
msgstr ""
-#: mediamanager/halbackend.cpp:1284
+#: mediamanager/halbackend.cpp:1259 mediamanager/halbackend.cpp:1268
+#: mediamanager/halbackend.cpp:1849 mediamanager/halbackend.cpp:1916
+#: mounthelper/tdeio_media_mounthelper.cpp:58
+msgid "Internal Error"
+msgstr "Ichki xato"
+
+#: mediamanager/halbackend.cpp:1279
msgid "Invalid filesystem type"
msgstr "Fayl tizimining turi notoʻgʻri"
-#: mediamanager/halbackend.cpp:1286
+#: mediamanager/halbackend.cpp:1281
msgid ""
"Permission denied<p>Please ensure that:<br>1. You have permission to access "
"this device.<br>2. This device node is not listed in /etc/fstab.</p>"
msgstr ""
-#: mediamanager/halbackend.cpp:1290
+#: mediamanager/halbackend.cpp:1285
msgid "Device is already mounted."
msgstr "Uskuna allaqachon ulangan."
-#: mediamanager/halbackend.cpp:1340
+#: mediamanager/halbackend.cpp:1335
msgid ""
"Moreover, programs still using the device have been detected. They are "
"listed below. You have to close them or change their working directory "
"before attempting to unmount the device again."
msgstr ""
-#: mediamanager/halbackend.cpp:1381 mediamanager/tdehardwarebackend.cpp:1588
+#: mediamanager/halbackend.cpp:1376 mediamanager/tdehardwarebackend.cpp:1618
msgid ""
"Programs that were still using the device have been forcibly terminated. "
"They are listed below."
msgstr ""
-#: mediamanager/halbackend.cpp:1402 mediamanager/halbackend.cpp:1715
-#: mediamanager/tdehardwarebackend.cpp:1406
-#: mediamanager/tdehardwarebackend.cpp:1424
-#: mediamanager/tdehardwarebackend.cpp:1464
+#: mediamanager/halbackend.cpp:1397 mediamanager/halbackend.cpp:1742
+#: mediamanager/tdehardwarebackend.cpp:1430
+#: mediamanager/tdehardwarebackend.cpp:1452
+#: mediamanager/tdehardwarebackend.cpp:1494
msgid ""
"Unfortunately, the device <b>%1</b> (%2) named <b>'%3'</b> and currently "
"mounted at <b>%4</b> could not be unmounted. "
msgstr ""
-#: mediamanager/halbackend.cpp:1408 mediamanager/tdehardwarebackend.cpp:1470
+#: mediamanager/halbackend.cpp:1403 mediamanager/tdehardwarebackend.cpp:1500
msgid "The following error was returned by umount command:"
msgstr ""
-#: mediamanager/halbackend.cpp:1478
+#: mediamanager/halbackend.cpp:1567 mediamanager/tdehardwarebackend.cpp:1322
+msgid "Cannot mount encrypted locked drives!"
+msgstr ""
+
+#: mediamanager/halbackend.cpp:1682 mediamanager/halbackend.cpp:1703
+#: mediamanager/halbackend.cpp:1716 mediamanager/halbackend.cpp:1830
+#: mediamanager/halbackend.cpp:1840 mediamanager/halbackend.cpp:1899
+#: mediamanager/halbackend.cpp:1907
#, fuzzy
-msgid "Permission denied"
-msgstr "Ruxsat yoʻq"
+msgid "Internal error"
+msgstr "Ichki xato"
-#: mediamanager/halbackend.cpp:1562 mediamanager/tdehardwarebackend.cpp:1232
-msgid "Cannot mount encrypted drives!"
-msgstr ""
+#: mediamanager/halbackend.cpp:1694
+#, fuzzy
+#| msgid "Unknown"
+msgid "Unknown error"
+msgstr "Nomaʼlum"
-#: mediamanager/halbackend.cpp:1721
+#: mediamanager/halbackend.cpp:1748
msgid "Unmounting failed due to the following error:"
msgstr ""
-#: mediamanager/halbackend.cpp:1723
+#: mediamanager/halbackend.cpp:1750
msgid "Device is Busy:"
msgstr "Uskuna band:"
-#: mediamanager/halbackend.cpp:1727
+#: mediamanager/halbackend.cpp:1754
msgid ""
"Permission denied<p>Please ensure that:<br>1. You have permission to access "
"this device.<br>2. This device was originally mounted using TDE.</p>"
msgstr ""
-#: mediamanager/halbackend.cpp:1739
+#: mediamanager/halbackend.cpp:1766
msgid ""
"%1<p><b>Would you like to forcibly terminate these processes?</b><br><i>All "
"unsaved data would be lost</i>"
msgstr ""
-#: mediamanager/halbackend.cpp:1811
+#: mediamanager/halbackend.cpp:1852
msgid "Wrong password"
msgstr ""
-#: mediamanager/mediamanager.cpp:247 mediamanager/mediamanager.cpp:266
-#: mediamanager/mediamanager.cpp:285 mediamanager/mediamanager.cpp:293
-#: mediamanager/mediamanager.cpp:302 mediamanager/mediamanager.cpp:310
-msgid "Feature only available with HAL"
-msgstr "Bu imkoniyat faqat HAL bilan ishlaydi"
-
-#: mediamanager/mediamanager.cpp:252
+#: mediamanager/mediamanager.cpp:248 mediamanager/mediamanager.cpp:275
#, fuzzy
msgid "Feature only available with the TDE hardware backend"
msgstr "Bu imkoniyat faqat HAL bilan ishlaydi"
-#: mediamanager/mediamanager.cpp:256 mediamanager/mediamanager.cpp:271
-#: mediamanager/mediamanager.cpp:275
+#: mediamanager/mediamanager.cpp:255 mediamanager/mediamanager.cpp:282
+#: mediamanager/mediamanager.cpp:312 mediamanager/mediamanager.cpp:343
+msgid "Feature only available with HAL"
+msgstr "Bu imkoniyat faqat HAL bilan ishlaydi"
+
+#: mediamanager/mediamanager.cpp:262 mediamanager/mediamanager.cpp:289
+#: mediamanager/mediamanager.cpp:320 mediamanager/mediamanager.cpp:350
#, fuzzy
msgid "Feature only available with HAL or TDE hardware backend"
msgstr "Bu imkoniyat faqat HAL bilan ishlaydi"
-#: mediamanager/tdehardwarebackend.cpp:480
-#: mediamanager/tdehardwarebackend.cpp:517
-#: mediamanager/tdehardwarebackend.cpp:750
+#: mediamanager/tdehardwarebackend.cpp:483
+#: mediamanager/tdehardwarebackend.cpp:520
+#: mediamanager/tdehardwarebackend.cpp:753
#, fuzzy
msgid "%1 Removable Device"
msgstr "Olinadigan uskuna"
-#: mediamanager/tdehardwarebackend.cpp:525
+#: mediamanager/tdehardwarebackend.cpp:528
#, fuzzy
msgid "Blank CD-ROM"
msgstr "Kompakt-disk"
-#: mediamanager/tdehardwarebackend.cpp:534
+#: mediamanager/tdehardwarebackend.cpp:537
msgid "Blank CD-R"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:543
+#: mediamanager/tdehardwarebackend.cpp:546
msgid "Blank CD-RW"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:552
+#: mediamanager/tdehardwarebackend.cpp:555
msgid "Blank Magneto-Optical CD"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:561
+#: mediamanager/tdehardwarebackend.cpp:564
msgid "Blank Mount Ranier CD-RW"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:570
+#: mediamanager/tdehardwarebackend.cpp:573
msgid "Blank Mount Ranier CD-RW-W"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:579
+#: mediamanager/tdehardwarebackend.cpp:582
msgid "Blank DVD-ROM"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:588
+#: mediamanager/tdehardwarebackend.cpp:591
msgid "Blank DVD-RAM"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:597
+#: mediamanager/tdehardwarebackend.cpp:600
msgid "Blank DVD-R"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:606
+#: mediamanager/tdehardwarebackend.cpp:609
msgid "Blank DVD-RW"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:615
+#: mediamanager/tdehardwarebackend.cpp:618
msgid "Blank Dual Layer DVD-R"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:624
+#: mediamanager/tdehardwarebackend.cpp:627
msgid "Blank Dual Layer DVD-RW"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:633
+#: mediamanager/tdehardwarebackend.cpp:636
msgid "Blank DVD+R"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:642
+#: mediamanager/tdehardwarebackend.cpp:645
msgid "Blank DVD+RW"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:651
+#: mediamanager/tdehardwarebackend.cpp:654
msgid "Blank Dual Layer DVD+R"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:660
+#: mediamanager/tdehardwarebackend.cpp:663
msgid "Blank Dual Layer DVD+RW"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:669
+#: mediamanager/tdehardwarebackend.cpp:672
msgid "Blank BD-ROM"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:678
+#: mediamanager/tdehardwarebackend.cpp:681
msgid "Blank BD-R"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:687
+#: mediamanager/tdehardwarebackend.cpp:690
msgid "Blank BD-RW"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:696
+#: mediamanager/tdehardwarebackend.cpp:699
msgid "Blank HDDVD-ROM"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:705
+#: mediamanager/tdehardwarebackend.cpp:708
msgid "Blank HDDVD-R"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:714
+#: mediamanager/tdehardwarebackend.cpp:717
msgid "Blank HDDVD-RW"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:721
+#: mediamanager/tdehardwarebackend.cpp:724
msgid "Audio CD"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:742
+#: mediamanager/tdehardwarebackend.cpp:745
msgid "%1 Fixed Disk (%2)"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:849
+#: mediamanager/tdehardwarebackend.cpp:852
#, fuzzy
msgid "%1 Zip Disk"
msgstr "ZIP-disk"
-#: mediamanager/tdehardwarebackend.cpp:1212
-#: mediamanager/tdehardwarebackend.cpp:1392
-#, fuzzy
-msgid "Internal error"
-msgstr "Ichki xato"
+#: mediamanager/tdehardwarebackend.cpp:1224
+#: mediamanager/tdehardwarebackend.cpp:1417
+msgid "Internal error. Couldn't find medium."
+msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:1239
-msgid ""
-"<qt>Unable to mount this device.<p>Potential reasons include:<br>Improper "
-"device and/or user privilege level<br>Corrupt data on storage device"
+#: mediamanager/tdehardwarebackend.cpp:1249
+#: mediamanager/tdehardwarebackend.cpp:1323
+msgid "Unable to mount this device."
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:1241
-#: mediamanager/tdehardwarebackend.cpp:1316
-#: mediamanager/tdehardwarebackend.cpp:1408
-#: mediamanager/tdehardwarebackend.cpp:1426
+#: mediamanager/tdehardwarebackend.cpp:1252
+#: mediamanager/tdehardwarebackend.cpp:1326
+#: mediamanager/tdehardwarebackend.cpp:1435
+#: mediamanager/tdehardwarebackend.cpp:1457
msgid "<p>Technical details:<br>"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:1314
-msgid ""
-"<qt>Unable to mount this device.<p>Potential reasons include:<br>Improper "
-"device and/or user privilege level<br>Corrupt data on storage "
-"device<br>Incorrect encryption password"
+#: mediamanager/tdehardwarebackend.cpp:1284
+msgid "Decryption aborted"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:1420
+#: mediamanager/tdehardwarebackend.cpp:1443
msgid ""
"<qt>The device <b>%1</b> (%2) named <b>'%3'</b> and currently mounted at <b>"
"%4</b> can not be unmounted at this time.<p>%5<p><b>Would you like to "
@@ -386,7 +392,7 @@ msgid ""
"lost</i>"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:1547
+#: mediamanager/tdehardwarebackend.cpp:1577
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 "
@@ -397,7 +403,7 @@ msgstr ""
msgid "%1 cannot be found."
msgstr "%1 topilmadi."
-#: mounthelper/tdeio_media_mounthelper.cpp:86
+#: mounthelper/tdeio_media_mounthelper.cpp:87
msgid "%1 is not a mountable media."
msgstr "%1 - ulanadigan uskuna emas."
@@ -408,39 +414,47 @@ msgstr "%1 - ulanadigan uskuna emas."
#: mounthelper/tdeio_media_mounthelper.cpp:107
#, fuzzy
-msgid "%1 is already decrypted."
+msgid "%1 is already unlocked."
msgstr "Uskuna allaqachon ulangan."
-#: mounthelper/tdeio_media_mounthelper.cpp:228
+#: mounthelper/tdeio_media_mounthelper.cpp:139
+msgid "Unknown unmount error."
+msgstr ""
+
+#: mounthelper/tdeio_media_mounthelper.cpp:246
msgid "The device was successfully unmounted, but the tray could not be opened"
msgstr ""
-#: mounthelper/tdeio_media_mounthelper.cpp:230
+#: mounthelper/tdeio_media_mounthelper.cpp:248
msgid "The device was successfully unmounted, but could not be ejected"
msgstr ""
-#: mounthelper/tdeio_media_mounthelper.cpp:275
+#: mounthelper/tdeio_media_mounthelper.cpp:281
+msgid "Unknown decrypt error."
+msgstr ""
+
+#: mounthelper/tdeio_media_mounthelper.cpp:295
#, fuzzy
msgid "Decrypt given URL"
msgstr "Koʻrsatilgan URL'ni uzish"
-#: mounthelper/tdeio_media_mounthelper.cpp:276
+#: mounthelper/tdeio_media_mounthelper.cpp:296
msgid "Unmount given URL"
msgstr "Koʻrsatilgan URL'ni uzish"
-#: mounthelper/tdeio_media_mounthelper.cpp:277
+#: mounthelper/tdeio_media_mounthelper.cpp:297
msgid "Mount given URL (default)"
msgstr "Koʻrsatilgan URL'ni ulash (andoza)"
-#: mounthelper/tdeio_media_mounthelper.cpp:278
+#: mounthelper/tdeio_media_mounthelper.cpp:298
msgid "Eject given URL via tdeeject"
msgstr ""
-#: mounthelper/tdeio_media_mounthelper.cpp:279
+#: mounthelper/tdeio_media_mounthelper.cpp:299
msgid "Unmount and Eject given URL (necessary for some USB devices)"
msgstr ""
-#: mounthelper/tdeio_media_mounthelper.cpp:280
+#: mounthelper/tdeio_media_mounthelper.cpp:300
msgid "media:/ URL to mount/unmount/eject/remove"
msgstr ""
@@ -461,43 +475,43 @@ msgstr "Oʻzgarishlarni saqlash muvaffaqiyatsiz tugadi"
msgid "&Mounting"
msgstr "&Ulash"
-#: tdefile-plugin/tdefilemediaplugin.cpp:190
+#: tdefile-plugin/tdefilemediaplugin.cpp:184
msgid "Medium Information"
msgstr "Uskuna haqida maʼlumot"
-#: tdefile-plugin/tdefilemediaplugin.cpp:193
+#: tdefile-plugin/tdefilemediaplugin.cpp:187
msgid "Free"
msgstr "Boʻsh"
-#: tdefile-plugin/tdefilemediaplugin.cpp:196
+#: tdefile-plugin/tdefilemediaplugin.cpp:190
msgid "Used"
msgstr "Ishlatilgan"
-#: tdefile-plugin/tdefilemediaplugin.cpp:199
+#: tdefile-plugin/tdefilemediaplugin.cpp:193
msgid "Total"
msgstr "Jami"
-#: tdefile-plugin/tdefilemediaplugin.cpp:202
+#: tdefile-plugin/tdefilemediaplugin.cpp:196
msgid "Base URL"
msgstr ""
-#: tdefile-plugin/tdefilemediaplugin.cpp:203
+#: tdefile-plugin/tdefilemediaplugin.cpp:197
msgid "Mount Point"
msgstr "Ulash nuqtasi"
-#: tdefile-plugin/tdefilemediaplugin.cpp:204
+#: tdefile-plugin/tdefilemediaplugin.cpp:198
msgid "Device Node"
msgstr "Uskunaning bogʻi"
-#: tdefile-plugin/tdefilemediaplugin.cpp:206
+#: tdefile-plugin/tdefilemediaplugin.cpp:200
msgid "Medium Summary"
msgstr ""
-#: tdefile-plugin/tdefilemediaplugin.cpp:208
+#: tdefile-plugin/tdefilemediaplugin.cpp:202
msgid "Usage"
msgstr "Foydalanilgan"
-#: tdefile-plugin/tdefilemediaplugin.cpp:210
+#: tdefile-plugin/tdefilemediaplugin.cpp:204
msgid "Bar Graph"
msgstr ""
@@ -569,23 +583,30 @@ msgid ""
"devices are plugged in."
msgstr ""
-#: mediamanager/decryptdialog.ui:24 mounthelper/decryptdialog.ui:24
+#: mediamanager/unlockdialog.ui:24 mounthelper/unlockdialog.ui:24
#, no-c-format
msgid "Decrypting Storage Device"
msgstr ""
-#: mediamanager/decryptdialog.ui:109 mounthelper/decryptdialog.ui:109
+#: mediamanager/unlockdialog.ui:109
#, no-c-format
msgid ""
-"<p><b>%1</b> is an encrypted storage device.</p>\n"
-"<p>Please enter the password to decrypt the storage device.</p>"
+"<p><b>%1</b> is an encrypted locked storage device.</p>\n"
+"<p>Please enter the password to unlock the storage device.</p>"
msgstr ""
-#: mediamanager/decryptdialog.ui:131 mounthelper/decryptdialog.ui:131
+#: mediamanager/unlockdialog.ui:131 mounthelper/unlockdialog.ui:131
#, no-c-format
msgid "&Password:"
msgstr ""
+#: mounthelper/unlockdialog.ui:109
+#, no-c-format
+msgid ""
+"<p><b>%1</b> is an encrypted storage device.</p>\n"
+"<p>Please enter the password to decrypt the storage device.</p>"
+msgstr ""
+
#: propsdlgplugin/propertiespagegui.ui:16
#, no-c-format
msgid "PropertiesPageGUI"
@@ -802,3 +823,7 @@ msgstr "Aralash"
#, no-c-format
msgid "Filesystem: iso9660"
msgstr "Fayl tizimi: ISO9660"
+
+#, 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 21a2932e7c4..1b157355394 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: 2019-01-13 18:47+0100\n"
+"POT-Creation-Date: 2019-07-11 02:33+0200\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"
@@ -48,7 +48,6 @@ msgstr "Номаълум"
#: mediaimpl.cpp:88 mediaimpl.cpp:115 mediaimpl.cpp:141 mediaimpl.cpp:177
#: mediaimpl.cpp:197 mediaimpl.cpp:218
#: mounthelper/tdeio_media_mounthelper.cpp:50
-#: mounthelper/tdeio_media_mounthelper.cpp:256
msgid "The TDE mediamanager is not running."
msgstr "TDE сақлаш ускуналар бошқарувчиси ишга тушмаган."
@@ -56,7 +55,7 @@ msgstr "TDE сақлаш ускуналар бошқарувчиси ишга т
msgid "This media name already exists."
msgstr "Маълумот ташувчининг номи аллақачон мавжуд."
-#: mediaimpl.cpp:230 mediaimpl.cpp:293
+#: mediaimpl.cpp:230 mediaimpl.cpp:297
msgid "No such medium."
msgstr ""
@@ -64,321 +63,328 @@ msgstr ""
msgid "The drive is encrypted."
msgstr ""
-#: mediaimpl.cpp:272 mediamanager/halbackend.cpp:1264
-#: mediamanager/halbackend.cpp:1273 mediamanager/halbackend.cpp:1663
-#: mediamanager/halbackend.cpp:1680 mediamanager/halbackend.cpp:1691
-#: mediamanager/halbackend.cpp:1793 mediamanager/halbackend.cpp:1801
-#: mediamanager/halbackend.cpp:1808 mediamanager/halbackend.cpp:1848
-#: mediamanager/halbackend.cpp:1854 mediamanager/halbackend.cpp:1861
-#: mounthelper/tdeio_media_mounthelper.cpp:58
-msgid "Internal Error"
-msgstr "Ички хато"
+#: mediaimpl.cpp:274 mediamanager/tdehardwarebackend.cpp:201
+#: mediamanager/tdehardwarebackend.cpp:252
+#: mounthelper/tdeio_media_mounthelper.cpp:202
+msgid "Unknown mount error."
+msgstr ""
#: mediamanager/dialog.cpp:26 mounthelper/dialog.cpp:26
-msgid "Decrypt"
+msgid "Unlock"
msgstr ""
-#: mediamanager/fstabbackend.cpp:104 mediamanager/fstabbackend.cpp:114
-#: mediamanager/halbackend.cpp:1595 mediamanager/halbackend.cpp:1617
-#: mediamanager/halbackend.cpp:1776 mediamanager/halbackend.cpp:1831
-#: mediamanager/tdehardwarebackend.cpp:1349
-#: mediamanager/tdehardwarebackend.cpp:1360
+#: mediamanager/fstabbackend.cpp:105 mediamanager/fstabbackend.cpp:120
+#: mediamanager/halbackend.cpp:1598 mediamanager/halbackend.cpp:1625
+#: mediamanager/halbackend.cpp:1808 mediamanager/halbackend.cpp:1877
+#: mediamanager/mediamanager.cpp:363 mediamanager/mediamanager.cpp:375
+#: mediamanager/mediamanager.cpp:387 mediamanager/mediamanager.cpp:399
+#: mediamanager/tdehardwarebackend.cpp:1363
+#: mediamanager/tdehardwarebackend.cpp:1378
#, c-format
msgid "No such medium: %1"
msgstr ""
-#: mediamanager/fstabbackend.cpp:398
+#: mediamanager/fstabbackend.cpp:408
msgid "CD Recorder"
msgstr "Компакт-диск ёзувчи"
-#: mediamanager/fstabbackend.cpp:404
+#: mediamanager/fstabbackend.cpp:414
msgid "DVD"
msgstr "DVD"
-#: mediamanager/fstabbackend.cpp:415
+#: mediamanager/fstabbackend.cpp:425
msgid "CD-ROM"
msgstr "Компакт-диск"
-#: mediamanager/fstabbackend.cpp:428
+#: mediamanager/fstabbackend.cpp:438
msgid "Floppy"
msgstr "Дискет"
-#: mediamanager/fstabbackend.cpp:436
+#: mediamanager/fstabbackend.cpp:446
msgid "Zip Disk"
msgstr "ZIP-диск"
-#: mediamanager/fstabbackend.cpp:447
+#: mediamanager/fstabbackend.cpp:457
msgid "Removable Device"
msgstr "Олинадиган ускуна"
-#: mediamanager/fstabbackend.cpp:452 mediamanager/fstabbackend.cpp:458
+#: mediamanager/fstabbackend.cpp:462 mediamanager/fstabbackend.cpp:468
msgid "Remote Share"
msgstr ""
-#: mediamanager/fstabbackend.cpp:463
+#: mediamanager/fstabbackend.cpp:473
msgid "Hard Disk"
msgstr "Қаттиқ диск"
-#: mediamanager/halbackend.cpp:749 mediamanager/tdehardwarebackend.cpp:805
+#: mediamanager/halbackend.cpp:744 mediamanager/tdehardwarebackend.cpp:808
msgid "Unknown Drive"
msgstr "Номаълум"
-#: mediamanager/halbackend.cpp:761 mediamanager/tdehardwarebackend.cpp:835
+#: mediamanager/halbackend.cpp:756 mediamanager/tdehardwarebackend.cpp:838
msgid "Floppy Drive"
msgstr "Дискет"
-#: mediamanager/halbackend.cpp:769
+#: mediamanager/halbackend.cpp:764
msgid "Zip Drive"
msgstr "ZIP-диск"
-#: mediamanager/halbackend.cpp:839 mediamanager/tdehardwarebackend.cpp:892
+#: mediamanager/halbackend.cpp:834 mediamanager/tdehardwarebackend.cpp:895
msgid "Camera"
msgstr "Фотоапарат"
-#: mediamanager/halbackend.cpp:1221 mediamanager/halbackend.cpp:1247
+#: mediamanager/halbackend.cpp:1216 mediamanager/halbackend.cpp:1242
msgid "Authenticate"
msgstr ""
-#: mediamanager/halbackend.cpp:1222
+#: mediamanager/halbackend.cpp:1217
msgid ""
"<big><b>System policy prevents mounting internal media</b></big><br/"
">Authentication is required to perform this action. Please enter your "
"password to verify."
msgstr ""
-#: mediamanager/halbackend.cpp:1248
+#: mediamanager/halbackend.cpp:1243
msgid ""
"<big><b>System policy prevents unmounting media mounted by other users</b></"
"big><br/>Authentication is required to perform this action. Please enter "
"your password to verify."
msgstr ""
-#: mediamanager/halbackend.cpp:1284
+#: mediamanager/halbackend.cpp:1259 mediamanager/halbackend.cpp:1268
+#: mediamanager/halbackend.cpp:1849 mediamanager/halbackend.cpp:1916
+#: mounthelper/tdeio_media_mounthelper.cpp:58
+msgid "Internal Error"
+msgstr "Ички хато"
+
+#: mediamanager/halbackend.cpp:1279
msgid "Invalid filesystem type"
msgstr "Файл тизимининг тури нотўғри"
-#: mediamanager/halbackend.cpp:1286
+#: mediamanager/halbackend.cpp:1281
msgid ""
"Permission denied<p>Please ensure that:<br>1. You have permission to access "
"this device.<br>2. This device node is not listed in /etc/fstab.</p>"
msgstr ""
-#: mediamanager/halbackend.cpp:1290
+#: mediamanager/halbackend.cpp:1285
msgid "Device is already mounted."
msgstr "Ускуна аллақачон уланган."
-#: mediamanager/halbackend.cpp:1340
+#: mediamanager/halbackend.cpp:1335
msgid ""
"Moreover, programs still using the device have been detected. They are "
"listed below. You have to close them or change their working directory "
"before attempting to unmount the device again."
msgstr ""
-#: mediamanager/halbackend.cpp:1381 mediamanager/tdehardwarebackend.cpp:1588
+#: mediamanager/halbackend.cpp:1376 mediamanager/tdehardwarebackend.cpp:1618
msgid ""
"Programs that were still using the device have been forcibly terminated. "
"They are listed below."
msgstr ""
-#: mediamanager/halbackend.cpp:1402 mediamanager/halbackend.cpp:1715
-#: mediamanager/tdehardwarebackend.cpp:1406
-#: mediamanager/tdehardwarebackend.cpp:1424
-#: mediamanager/tdehardwarebackend.cpp:1464
+#: mediamanager/halbackend.cpp:1397 mediamanager/halbackend.cpp:1742
+#: mediamanager/tdehardwarebackend.cpp:1430
+#: mediamanager/tdehardwarebackend.cpp:1452
+#: mediamanager/tdehardwarebackend.cpp:1494
msgid ""
"Unfortunately, the device <b>%1</b> (%2) named <b>'%3'</b> and currently "
"mounted at <b>%4</b> could not be unmounted. "
msgstr ""
-#: mediamanager/halbackend.cpp:1408 mediamanager/tdehardwarebackend.cpp:1470
+#: mediamanager/halbackend.cpp:1403 mediamanager/tdehardwarebackend.cpp:1500
msgid "The following error was returned by umount command:"
msgstr ""
-#: mediamanager/halbackend.cpp:1478
+#: mediamanager/halbackend.cpp:1567 mediamanager/tdehardwarebackend.cpp:1322
+msgid "Cannot mount encrypted locked drives!"
+msgstr ""
+
+#: mediamanager/halbackend.cpp:1682 mediamanager/halbackend.cpp:1703
+#: mediamanager/halbackend.cpp:1716 mediamanager/halbackend.cpp:1830
+#: mediamanager/halbackend.cpp:1840 mediamanager/halbackend.cpp:1899
+#: mediamanager/halbackend.cpp:1907
#, fuzzy
-msgid "Permission denied"
-msgstr "Рухсат йўқ"
+msgid "Internal error"
+msgstr "Ички хато"
-#: mediamanager/halbackend.cpp:1562 mediamanager/tdehardwarebackend.cpp:1232
-msgid "Cannot mount encrypted drives!"
-msgstr ""
+#: mediamanager/halbackend.cpp:1694
+#, fuzzy
+#| msgid "Unknown"
+msgid "Unknown error"
+msgstr "Номаълум"
-#: mediamanager/halbackend.cpp:1721
+#: mediamanager/halbackend.cpp:1748
msgid "Unmounting failed due to the following error:"
msgstr ""
-#: mediamanager/halbackend.cpp:1723
+#: mediamanager/halbackend.cpp:1750
msgid "Device is Busy:"
msgstr "Ускуна банд:"
-#: mediamanager/halbackend.cpp:1727
+#: mediamanager/halbackend.cpp:1754
msgid ""
"Permission denied<p>Please ensure that:<br>1. You have permission to access "
"this device.<br>2. This device was originally mounted using TDE.</p>"
msgstr ""
-#: mediamanager/halbackend.cpp:1739
+#: mediamanager/halbackend.cpp:1766
msgid ""
"%1<p><b>Would you like to forcibly terminate these processes?</b><br><i>All "
"unsaved data would be lost</i>"
msgstr ""
-#: mediamanager/halbackend.cpp:1811
+#: mediamanager/halbackend.cpp:1852
msgid "Wrong password"
msgstr ""
-#: mediamanager/mediamanager.cpp:247 mediamanager/mediamanager.cpp:266
-#: mediamanager/mediamanager.cpp:285 mediamanager/mediamanager.cpp:293
-#: mediamanager/mediamanager.cpp:302 mediamanager/mediamanager.cpp:310
-msgid "Feature only available with HAL"
-msgstr "Бу имконият фақат HAL билан ишлайди"
-
-#: mediamanager/mediamanager.cpp:252
+#: mediamanager/mediamanager.cpp:248 mediamanager/mediamanager.cpp:275
#, fuzzy
msgid "Feature only available with the TDE hardware backend"
msgstr "Бу имконият фақат HAL билан ишлайди"
-#: mediamanager/mediamanager.cpp:256 mediamanager/mediamanager.cpp:271
-#: mediamanager/mediamanager.cpp:275
+#: mediamanager/mediamanager.cpp:255 mediamanager/mediamanager.cpp:282
+#: mediamanager/mediamanager.cpp:312 mediamanager/mediamanager.cpp:343
+msgid "Feature only available with HAL"
+msgstr "Бу имконият фақат HAL билан ишлайди"
+
+#: mediamanager/mediamanager.cpp:262 mediamanager/mediamanager.cpp:289
+#: mediamanager/mediamanager.cpp:320 mediamanager/mediamanager.cpp:350
#, fuzzy
msgid "Feature only available with HAL or TDE hardware backend"
msgstr "Бу имконият фақат HAL билан ишлайди"
-#: mediamanager/tdehardwarebackend.cpp:480
-#: mediamanager/tdehardwarebackend.cpp:517
-#: mediamanager/tdehardwarebackend.cpp:750
+#: mediamanager/tdehardwarebackend.cpp:483
+#: mediamanager/tdehardwarebackend.cpp:520
+#: mediamanager/tdehardwarebackend.cpp:753
#, fuzzy
msgid "%1 Removable Device"
msgstr "Олинадиган ускуна"
-#: mediamanager/tdehardwarebackend.cpp:525
+#: mediamanager/tdehardwarebackend.cpp:528
#, fuzzy
msgid "Blank CD-ROM"
msgstr "Компакт-диск"
-#: mediamanager/tdehardwarebackend.cpp:534
+#: mediamanager/tdehardwarebackend.cpp:537
msgid "Blank CD-R"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:543
+#: mediamanager/tdehardwarebackend.cpp:546
msgid "Blank CD-RW"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:552
+#: mediamanager/tdehardwarebackend.cpp:555
msgid "Blank Magneto-Optical CD"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:561
+#: mediamanager/tdehardwarebackend.cpp:564
msgid "Blank Mount Ranier CD-RW"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:570
+#: mediamanager/tdehardwarebackend.cpp:573
msgid "Blank Mount Ranier CD-RW-W"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:579
+#: mediamanager/tdehardwarebackend.cpp:582
msgid "Blank DVD-ROM"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:588
+#: mediamanager/tdehardwarebackend.cpp:591
msgid "Blank DVD-RAM"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:597
+#: mediamanager/tdehardwarebackend.cpp:600
msgid "Blank DVD-R"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:606
+#: mediamanager/tdehardwarebackend.cpp:609
msgid "Blank DVD-RW"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:615
+#: mediamanager/tdehardwarebackend.cpp:618
msgid "Blank Dual Layer DVD-R"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:624
+#: mediamanager/tdehardwarebackend.cpp:627
msgid "Blank Dual Layer DVD-RW"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:633
+#: mediamanager/tdehardwarebackend.cpp:636
msgid "Blank DVD+R"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:642
+#: mediamanager/tdehardwarebackend.cpp:645
msgid "Blank DVD+RW"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:651
+#: mediamanager/tdehardwarebackend.cpp:654
msgid "Blank Dual Layer DVD+R"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:660
+#: mediamanager/tdehardwarebackend.cpp:663
msgid "Blank Dual Layer DVD+RW"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:669
+#: mediamanager/tdehardwarebackend.cpp:672
msgid "Blank BD-ROM"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:678
+#: mediamanager/tdehardwarebackend.cpp:681
msgid "Blank BD-R"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:687
+#: mediamanager/tdehardwarebackend.cpp:690
msgid "Blank BD-RW"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:696
+#: mediamanager/tdehardwarebackend.cpp:699
msgid "Blank HDDVD-ROM"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:705
+#: mediamanager/tdehardwarebackend.cpp:708
msgid "Blank HDDVD-R"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:714
+#: mediamanager/tdehardwarebackend.cpp:717
msgid "Blank HDDVD-RW"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:721
+#: mediamanager/tdehardwarebackend.cpp:724
msgid "Audio CD"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:742
+#: mediamanager/tdehardwarebackend.cpp:745
msgid "%1 Fixed Disk (%2)"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:849
+#: mediamanager/tdehardwarebackend.cpp:852
#, fuzzy
msgid "%1 Zip Disk"
msgstr "ZIP-диск"
-#: mediamanager/tdehardwarebackend.cpp:1212
-#: mediamanager/tdehardwarebackend.cpp:1392
-#, fuzzy
-msgid "Internal error"
-msgstr "Ички хато"
+#: mediamanager/tdehardwarebackend.cpp:1224
+#: mediamanager/tdehardwarebackend.cpp:1417
+msgid "Internal error. Couldn't find medium."
+msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:1239
-msgid ""
-"<qt>Unable to mount this device.<p>Potential reasons include:<br>Improper "
-"device and/or user privilege level<br>Corrupt data on storage device"
+#: mediamanager/tdehardwarebackend.cpp:1249
+#: mediamanager/tdehardwarebackend.cpp:1323
+msgid "Unable to mount this device."
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:1241
-#: mediamanager/tdehardwarebackend.cpp:1316
-#: mediamanager/tdehardwarebackend.cpp:1408
-#: mediamanager/tdehardwarebackend.cpp:1426
+#: mediamanager/tdehardwarebackend.cpp:1252
+#: mediamanager/tdehardwarebackend.cpp:1326
+#: mediamanager/tdehardwarebackend.cpp:1435
+#: mediamanager/tdehardwarebackend.cpp:1457
msgid "<p>Technical details:<br>"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:1314
-msgid ""
-"<qt>Unable to mount this device.<p>Potential reasons include:<br>Improper "
-"device and/or user privilege level<br>Corrupt data on storage "
-"device<br>Incorrect encryption password"
+#: mediamanager/tdehardwarebackend.cpp:1284
+msgid "Decryption aborted"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:1420
+#: mediamanager/tdehardwarebackend.cpp:1443
msgid ""
"<qt>The device <b>%1</b> (%2) named <b>'%3'</b> and currently mounted at <b>"
"%4</b> can not be unmounted at this time.<p>%5<p><b>Would you like to "
@@ -386,7 +392,7 @@ msgid ""
"lost</i>"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:1547
+#: mediamanager/tdehardwarebackend.cpp:1577
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 "
@@ -397,7 +403,7 @@ msgstr ""
msgid "%1 cannot be found."
msgstr "%1 топилмади."
-#: mounthelper/tdeio_media_mounthelper.cpp:86
+#: mounthelper/tdeio_media_mounthelper.cpp:87
msgid "%1 is not a mountable media."
msgstr "%1 - уланадиган ускуна эмас."
@@ -408,39 +414,47 @@ msgstr "%1 - уланадиган ускуна эмас."
#: mounthelper/tdeio_media_mounthelper.cpp:107
#, fuzzy
-msgid "%1 is already decrypted."
+msgid "%1 is already unlocked."
msgstr "Ускуна аллақачон уланган."
-#: mounthelper/tdeio_media_mounthelper.cpp:228
+#: mounthelper/tdeio_media_mounthelper.cpp:139
+msgid "Unknown unmount error."
+msgstr ""
+
+#: mounthelper/tdeio_media_mounthelper.cpp:246
msgid "The device was successfully unmounted, but the tray could not be opened"
msgstr ""
-#: mounthelper/tdeio_media_mounthelper.cpp:230
+#: mounthelper/tdeio_media_mounthelper.cpp:248
msgid "The device was successfully unmounted, but could not be ejected"
msgstr ""
-#: mounthelper/tdeio_media_mounthelper.cpp:275
+#: mounthelper/tdeio_media_mounthelper.cpp:281
+msgid "Unknown decrypt error."
+msgstr ""
+
+#: mounthelper/tdeio_media_mounthelper.cpp:295
#, fuzzy
msgid "Decrypt given URL"
msgstr "Кўрсатилган URL'ни узиш"
-#: mounthelper/tdeio_media_mounthelper.cpp:276
+#: mounthelper/tdeio_media_mounthelper.cpp:296
msgid "Unmount given URL"
msgstr "Кўрсатилган URL'ни узиш"
-#: mounthelper/tdeio_media_mounthelper.cpp:277
+#: mounthelper/tdeio_media_mounthelper.cpp:297
msgid "Mount given URL (default)"
msgstr "Кўрсатилган URL'ни улаш (андоза)"
-#: mounthelper/tdeio_media_mounthelper.cpp:278
+#: mounthelper/tdeio_media_mounthelper.cpp:298
msgid "Eject given URL via tdeeject"
msgstr ""
-#: mounthelper/tdeio_media_mounthelper.cpp:279
+#: mounthelper/tdeio_media_mounthelper.cpp:299
msgid "Unmount and Eject given URL (necessary for some USB devices)"
msgstr ""
-#: mounthelper/tdeio_media_mounthelper.cpp:280
+#: mounthelper/tdeio_media_mounthelper.cpp:300
msgid "media:/ URL to mount/unmount/eject/remove"
msgstr ""
@@ -461,43 +475,43 @@ msgstr "Ўзгаришларни сақлаш муваффақиятсиз ту
msgid "&Mounting"
msgstr "&Улаш"
-#: tdefile-plugin/tdefilemediaplugin.cpp:190
+#: tdefile-plugin/tdefilemediaplugin.cpp:184
msgid "Medium Information"
msgstr "Ускуна ҳақида маълумот"
-#: tdefile-plugin/tdefilemediaplugin.cpp:193
+#: tdefile-plugin/tdefilemediaplugin.cpp:187
msgid "Free"
msgstr "Бўш"
-#: tdefile-plugin/tdefilemediaplugin.cpp:196
+#: tdefile-plugin/tdefilemediaplugin.cpp:190
msgid "Used"
msgstr "Ишлатилган"
-#: tdefile-plugin/tdefilemediaplugin.cpp:199
+#: tdefile-plugin/tdefilemediaplugin.cpp:193
msgid "Total"
msgstr "Жами"
-#: tdefile-plugin/tdefilemediaplugin.cpp:202
+#: tdefile-plugin/tdefilemediaplugin.cpp:196
msgid "Base URL"
msgstr ""
-#: tdefile-plugin/tdefilemediaplugin.cpp:203
+#: tdefile-plugin/tdefilemediaplugin.cpp:197
msgid "Mount Point"
msgstr "Улаш нуқтаси"
-#: tdefile-plugin/tdefilemediaplugin.cpp:204
+#: tdefile-plugin/tdefilemediaplugin.cpp:198
msgid "Device Node"
msgstr "Ускунанинг боғи"
-#: tdefile-plugin/tdefilemediaplugin.cpp:206
+#: tdefile-plugin/tdefilemediaplugin.cpp:200
msgid "Medium Summary"
msgstr ""
-#: tdefile-plugin/tdefilemediaplugin.cpp:208
+#: tdefile-plugin/tdefilemediaplugin.cpp:202
msgid "Usage"
msgstr "Фойдаланилган"
-#: tdefile-plugin/tdefilemediaplugin.cpp:210
+#: tdefile-plugin/tdefilemediaplugin.cpp:204
msgid "Bar Graph"
msgstr ""
@@ -569,23 +583,30 @@ msgid ""
"devices are plugged in."
msgstr ""
-#: mediamanager/decryptdialog.ui:24 mounthelper/decryptdialog.ui:24
+#: mediamanager/unlockdialog.ui:24 mounthelper/unlockdialog.ui:24
#, no-c-format
msgid "Decrypting Storage Device"
msgstr ""
-#: mediamanager/decryptdialog.ui:109 mounthelper/decryptdialog.ui:109
+#: mediamanager/unlockdialog.ui:109
#, no-c-format
msgid ""
-"<p><b>%1</b> is an encrypted storage device.</p>\n"
-"<p>Please enter the password to decrypt the storage device.</p>"
+"<p><b>%1</b> is an encrypted locked storage device.</p>\n"
+"<p>Please enter the password to unlock the storage device.</p>"
msgstr ""
-#: mediamanager/decryptdialog.ui:131 mounthelper/decryptdialog.ui:131
+#: mediamanager/unlockdialog.ui:131 mounthelper/unlockdialog.ui:131
#, no-c-format
msgid "&Password:"
msgstr ""
+#: mounthelper/unlockdialog.ui:109
+#, no-c-format
+msgid ""
+"<p><b>%1</b> is an encrypted storage device.</p>\n"
+"<p>Please enter the password to decrypt the storage device.</p>"
+msgstr ""
+
#: propsdlgplugin/propertiespagegui.ui:16
#, no-c-format
msgid "PropertiesPageGUI"
@@ -802,3 +823,7 @@ msgstr "Аралаш"
#, no-c-format
msgid "Filesystem: iso9660"
msgstr "Файл тизими: ISO9660"
+
+#, 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 1fcb9460aad..1ee2d47e48d 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: 2019-01-13 18:47+0100\n"
+"POT-Creation-Date: 2019-07-11 02:33+0200\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"
@@ -47,7 +47,6 @@ 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
-#: mounthelper/tdeio_media_mounthelper.cpp:256
msgid "The TDE mediamanager is not running."
msgstr "Trình quản lý vật chứa TDE chưa chạy."
@@ -55,7 +54,7 @@ msgstr "Trình quản lý vật chứa TDE chưa chạy."
msgid "This media name already exists."
msgstr "Đã có tên vật chứa này."
-#: mediaimpl.cpp:230 mediaimpl.cpp:293
+#: mediaimpl.cpp:230 mediaimpl.cpp:297
#, fuzzy
msgid "No such medium."
msgstr "Không có vật chứa như vậy: %1"
@@ -64,324 +63,331 @@ msgstr "Không có vật chứa như vậy: %1"
msgid "The drive is encrypted."
msgstr ""
-#: mediaimpl.cpp:272 mediamanager/halbackend.cpp:1264
-#: mediamanager/halbackend.cpp:1273 mediamanager/halbackend.cpp:1663
-#: mediamanager/halbackend.cpp:1680 mediamanager/halbackend.cpp:1691
-#: mediamanager/halbackend.cpp:1793 mediamanager/halbackend.cpp:1801
-#: mediamanager/halbackend.cpp:1808 mediamanager/halbackend.cpp:1848
-#: mediamanager/halbackend.cpp:1854 mediamanager/halbackend.cpp:1861
-#: mounthelper/tdeio_media_mounthelper.cpp:58
-msgid "Internal Error"
-msgstr "Lỗi nội bộ"
+#: mediaimpl.cpp:274 mediamanager/tdehardwarebackend.cpp:201
+#: mediamanager/tdehardwarebackend.cpp:252
+#: mounthelper/tdeio_media_mounthelper.cpp:202
+msgid "Unknown mount error."
+msgstr ""
#: mediamanager/dialog.cpp:26 mounthelper/dialog.cpp:26
-msgid "Decrypt"
+msgid "Unlock"
msgstr ""
-#: mediamanager/fstabbackend.cpp:104 mediamanager/fstabbackend.cpp:114
-#: mediamanager/halbackend.cpp:1595 mediamanager/halbackend.cpp:1617
-#: mediamanager/halbackend.cpp:1776 mediamanager/halbackend.cpp:1831
-#: mediamanager/tdehardwarebackend.cpp:1349
-#: mediamanager/tdehardwarebackend.cpp:1360
+#: mediamanager/fstabbackend.cpp:105 mediamanager/fstabbackend.cpp:120
+#: mediamanager/halbackend.cpp:1598 mediamanager/halbackend.cpp:1625
+#: mediamanager/halbackend.cpp:1808 mediamanager/halbackend.cpp:1877
+#: mediamanager/mediamanager.cpp:363 mediamanager/mediamanager.cpp:375
+#: mediamanager/mediamanager.cpp:387 mediamanager/mediamanager.cpp:399
+#: mediamanager/tdehardwarebackend.cpp:1363
+#: mediamanager/tdehardwarebackend.cpp:1378
#, c-format
msgid "No such medium: %1"
msgstr "Không có vật chứa như vậy: %1"
-#: mediamanager/fstabbackend.cpp:398
+#: mediamanager/fstabbackend.cpp:408
msgid "CD Recorder"
msgstr "Đầu ghi CD"
-#: mediamanager/fstabbackend.cpp:404
+#: mediamanager/fstabbackend.cpp:414
msgid "DVD"
msgstr "DVD"
-#: mediamanager/fstabbackend.cpp:415
+#: mediamanager/fstabbackend.cpp:425
msgid "CD-ROM"
msgstr "Ổ CD"
-#: mediamanager/fstabbackend.cpp:428
+#: mediamanager/fstabbackend.cpp:438
msgid "Floppy"
msgstr "Đĩa mềm"
-#: mediamanager/fstabbackend.cpp:436
+#: mediamanager/fstabbackend.cpp:446
msgid "Zip Disk"
msgstr "Đĩa Zip"
-#: mediamanager/fstabbackend.cpp:447
+#: mediamanager/fstabbackend.cpp:457
msgid "Removable Device"
msgstr "Thiết bị rời"
-#: mediamanager/fstabbackend.cpp:452 mediamanager/fstabbackend.cpp:458
+#: mediamanager/fstabbackend.cpp:462 mediamanager/fstabbackend.cpp:468
msgid "Remote Share"
msgstr "Chia sẻ ở xa"
-#: mediamanager/fstabbackend.cpp:463
+#: mediamanager/fstabbackend.cpp:473
msgid "Hard Disk"
msgstr "Đĩa cứng"
-#: mediamanager/halbackend.cpp:749 mediamanager/tdehardwarebackend.cpp:805
+#: mediamanager/halbackend.cpp:744 mediamanager/tdehardwarebackend.cpp:808
#, fuzzy
msgid "Unknown Drive"
msgstr "Không rõ"
-#: mediamanager/halbackend.cpp:761 mediamanager/tdehardwarebackend.cpp:835
+#: mediamanager/halbackend.cpp:756 mediamanager/tdehardwarebackend.cpp:838
#, fuzzy
msgid "Floppy Drive"
msgstr "Đĩa mềm"
-#: mediamanager/halbackend.cpp:769
+#: mediamanager/halbackend.cpp:764
#, fuzzy
msgid "Zip Drive"
msgstr "Đĩa Zip"
-#: mediamanager/halbackend.cpp:839 mediamanager/tdehardwarebackend.cpp:892
+#: mediamanager/halbackend.cpp:834 mediamanager/tdehardwarebackend.cpp:895
msgid "Camera"
msgstr "Máy ảnh"
-#: mediamanager/halbackend.cpp:1221 mediamanager/halbackend.cpp:1247
+#: mediamanager/halbackend.cpp:1216 mediamanager/halbackend.cpp:1242
msgid "Authenticate"
msgstr ""
-#: mediamanager/halbackend.cpp:1222
+#: mediamanager/halbackend.cpp:1217
msgid ""
"<big><b>System policy prevents mounting internal media</b></big><br/"
">Authentication is required to perform this action. Please enter your "
"password to verify."
msgstr ""
-#: mediamanager/halbackend.cpp:1248
+#: mediamanager/halbackend.cpp:1243
msgid ""
"<big><b>System policy prevents unmounting media mounted by other users</b></"
"big><br/>Authentication is required to perform this action. Please enter "
"your password to verify."
msgstr ""
-#: mediamanager/halbackend.cpp:1284
+#: mediamanager/halbackend.cpp:1259 mediamanager/halbackend.cpp:1268
+#: mediamanager/halbackend.cpp:1849 mediamanager/halbackend.cpp:1916
+#: mounthelper/tdeio_media_mounthelper.cpp:58
+msgid "Internal Error"
+msgstr "Lỗi nội bộ"
+
+#: mediamanager/halbackend.cpp:1279
msgid "Invalid filesystem type"
msgstr "Kiểu hệ thống tập tin không hợp lệ"
-#: mediamanager/halbackend.cpp:1286
+#: mediamanager/halbackend.cpp:1281
msgid ""
"Permission denied<p>Please ensure that:<br>1. You have permission to access "
"this device.<br>2. This device node is not listed in /etc/fstab.</p>"
msgstr ""
-#: mediamanager/halbackend.cpp:1290
+#: mediamanager/halbackend.cpp:1285
msgid "Device is already mounted."
msgstr "Thiết bị đã được lắp."
-#: mediamanager/halbackend.cpp:1340
+#: mediamanager/halbackend.cpp:1335
msgid ""
"Moreover, programs still using the device have been detected. They are "
"listed below. You have to close them or change their working directory "
"before attempting to unmount the device again."
msgstr ""
-#: mediamanager/halbackend.cpp:1381 mediamanager/tdehardwarebackend.cpp:1588
+#: mediamanager/halbackend.cpp:1376 mediamanager/tdehardwarebackend.cpp:1618
msgid ""
"Programs that were still using the device have been forcibly terminated. "
"They are listed below."
msgstr ""
-#: mediamanager/halbackend.cpp:1402 mediamanager/halbackend.cpp:1715
-#: mediamanager/tdehardwarebackend.cpp:1406
-#: mediamanager/tdehardwarebackend.cpp:1424
-#: mediamanager/tdehardwarebackend.cpp:1464
+#: mediamanager/halbackend.cpp:1397 mediamanager/halbackend.cpp:1742
+#: mediamanager/tdehardwarebackend.cpp:1430
+#: mediamanager/tdehardwarebackend.cpp:1452
+#: mediamanager/tdehardwarebackend.cpp:1494
msgid ""
"Unfortunately, the device <b>%1</b> (%2) named <b>'%3'</b> and currently "
"mounted at <b>%4</b> could not be unmounted. "
msgstr ""
-#: mediamanager/halbackend.cpp:1408 mediamanager/tdehardwarebackend.cpp:1470
+#: mediamanager/halbackend.cpp:1403 mediamanager/tdehardwarebackend.cpp:1500
msgid "The following error was returned by umount command:"
msgstr ""
-#: mediamanager/halbackend.cpp:1478
+#: mediamanager/halbackend.cpp:1567 mediamanager/tdehardwarebackend.cpp:1322
+msgid "Cannot mount encrypted locked drives!"
+msgstr ""
+
+#: mediamanager/halbackend.cpp:1682 mediamanager/halbackend.cpp:1703
+#: mediamanager/halbackend.cpp:1716 mediamanager/halbackend.cpp:1830
+#: mediamanager/halbackend.cpp:1840 mediamanager/halbackend.cpp:1899
+#: mediamanager/halbackend.cpp:1907
#, fuzzy
-msgid "Permission denied"
-msgstr "Quyền bị từ chối"
+msgid "Internal error"
+msgstr "Lỗi nội bộ"
-#: mediamanager/halbackend.cpp:1562 mediamanager/tdehardwarebackend.cpp:1232
-msgid "Cannot mount encrypted drives!"
-msgstr ""
+#: mediamanager/halbackend.cpp:1694
+#, fuzzy
+#| msgid "Unknown"
+msgid "Unknown error"
+msgstr "Không rõ"
-#: mediamanager/halbackend.cpp:1721
+#: mediamanager/halbackend.cpp:1748
msgid "Unmounting failed due to the following error:"
msgstr ""
-#: mediamanager/halbackend.cpp:1723
+#: mediamanager/halbackend.cpp:1750
msgid "Device is Busy:"
msgstr "Thiết bị đang bận:"
-#: mediamanager/halbackend.cpp:1727
+#: mediamanager/halbackend.cpp:1754
msgid ""
"Permission denied<p>Please ensure that:<br>1. You have permission to access "
"this device.<br>2. This device was originally mounted using TDE.</p>"
msgstr ""
-#: mediamanager/halbackend.cpp:1739
+#: mediamanager/halbackend.cpp:1766
msgid ""
"%1<p><b>Would you like to forcibly terminate these processes?</b><br><i>All "
"unsaved data would be lost</i>"
msgstr ""
-#: mediamanager/halbackend.cpp:1811
+#: mediamanager/halbackend.cpp:1852
msgid "Wrong password"
msgstr ""
-#: mediamanager/mediamanager.cpp:247 mediamanager/mediamanager.cpp:266
-#: mediamanager/mediamanager.cpp:285 mediamanager/mediamanager.cpp:293
-#: mediamanager/mediamanager.cpp:302 mediamanager/mediamanager.cpp:310
-msgid "Feature only available with HAL"
-msgstr "Tính này này sẵn sàng chỉ với HAL"
-
-#: mediamanager/mediamanager.cpp:252
+#: mediamanager/mediamanager.cpp:248 mediamanager/mediamanager.cpp:275
#, 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:256 mediamanager/mediamanager.cpp:271
-#: mediamanager/mediamanager.cpp:275
+#: mediamanager/mediamanager.cpp:255 mediamanager/mediamanager.cpp:282
+#: mediamanager/mediamanager.cpp:312 mediamanager/mediamanager.cpp:343
+msgid "Feature only available with HAL"
+msgstr "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
#, 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:480
-#: mediamanager/tdehardwarebackend.cpp:517
-#: mediamanager/tdehardwarebackend.cpp:750
+#: mediamanager/tdehardwarebackend.cpp:483
+#: mediamanager/tdehardwarebackend.cpp:520
+#: mediamanager/tdehardwarebackend.cpp:753
#, fuzzy
msgid "%1 Removable Device"
msgstr "Thiết bị rời"
-#: mediamanager/tdehardwarebackend.cpp:525
+#: mediamanager/tdehardwarebackend.cpp:528
#, fuzzy
msgid "Blank CD-ROM"
msgstr "Ổ CD"
-#: mediamanager/tdehardwarebackend.cpp:534
+#: mediamanager/tdehardwarebackend.cpp:537
msgid "Blank CD-R"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:543
+#: mediamanager/tdehardwarebackend.cpp:546
msgid "Blank CD-RW"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:552
+#: mediamanager/tdehardwarebackend.cpp:555
msgid "Blank Magneto-Optical CD"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:561
+#: mediamanager/tdehardwarebackend.cpp:564
msgid "Blank Mount Ranier CD-RW"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:570
+#: mediamanager/tdehardwarebackend.cpp:573
msgid "Blank Mount Ranier CD-RW-W"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:579
+#: mediamanager/tdehardwarebackend.cpp:582
msgid "Blank DVD-ROM"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:588
+#: mediamanager/tdehardwarebackend.cpp:591
msgid "Blank DVD-RAM"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:597
+#: mediamanager/tdehardwarebackend.cpp:600
msgid "Blank DVD-R"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:606
+#: mediamanager/tdehardwarebackend.cpp:609
msgid "Blank DVD-RW"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:615
+#: mediamanager/tdehardwarebackend.cpp:618
msgid "Blank Dual Layer DVD-R"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:624
+#: mediamanager/tdehardwarebackend.cpp:627
msgid "Blank Dual Layer DVD-RW"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:633
+#: mediamanager/tdehardwarebackend.cpp:636
msgid "Blank DVD+R"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:642
+#: mediamanager/tdehardwarebackend.cpp:645
msgid "Blank DVD+RW"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:651
+#: mediamanager/tdehardwarebackend.cpp:654
msgid "Blank Dual Layer DVD+R"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:660
+#: mediamanager/tdehardwarebackend.cpp:663
msgid "Blank Dual Layer DVD+RW"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:669
+#: mediamanager/tdehardwarebackend.cpp:672
msgid "Blank BD-ROM"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:678
+#: mediamanager/tdehardwarebackend.cpp:681
msgid "Blank BD-R"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:687
+#: mediamanager/tdehardwarebackend.cpp:690
msgid "Blank BD-RW"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:696
+#: mediamanager/tdehardwarebackend.cpp:699
msgid "Blank HDDVD-ROM"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:705
+#: mediamanager/tdehardwarebackend.cpp:708
msgid "Blank HDDVD-R"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:714
+#: mediamanager/tdehardwarebackend.cpp:717
msgid "Blank HDDVD-RW"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:721
+#: mediamanager/tdehardwarebackend.cpp:724
msgid "Audio CD"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:742
+#: mediamanager/tdehardwarebackend.cpp:745
msgid "%1 Fixed Disk (%2)"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:849
+#: mediamanager/tdehardwarebackend.cpp:852
#, fuzzy
msgid "%1 Zip Disk"
msgstr "Đĩa Zip"
-#: mediamanager/tdehardwarebackend.cpp:1212
-#: mediamanager/tdehardwarebackend.cpp:1392
-#, fuzzy
-msgid "Internal error"
-msgstr "Lỗi nội bộ"
+#: mediamanager/tdehardwarebackend.cpp:1224
+#: mediamanager/tdehardwarebackend.cpp:1417
+msgid "Internal error. Couldn't find medium."
+msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:1239
-msgid ""
-"<qt>Unable to mount this device.<p>Potential reasons include:<br>Improper "
-"device and/or user privilege level<br>Corrupt data on storage device"
+#: mediamanager/tdehardwarebackend.cpp:1249
+#: mediamanager/tdehardwarebackend.cpp:1323
+msgid "Unable to mount this device."
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:1241
-#: mediamanager/tdehardwarebackend.cpp:1316
-#: mediamanager/tdehardwarebackend.cpp:1408
-#: mediamanager/tdehardwarebackend.cpp:1426
+#: mediamanager/tdehardwarebackend.cpp:1252
+#: mediamanager/tdehardwarebackend.cpp:1326
+#: mediamanager/tdehardwarebackend.cpp:1435
+#: mediamanager/tdehardwarebackend.cpp:1457
msgid "<p>Technical details:<br>"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:1314
-msgid ""
-"<qt>Unable to mount this device.<p>Potential reasons include:<br>Improper "
-"device and/or user privilege level<br>Corrupt data on storage "
-"device<br>Incorrect encryption password"
+#: mediamanager/tdehardwarebackend.cpp:1284
+msgid "Decryption aborted"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:1420
+#: mediamanager/tdehardwarebackend.cpp:1443
msgid ""
"<qt>The device <b>%1</b> (%2) named <b>'%3'</b> and currently mounted at <b>"
"%4</b> can not be unmounted at this time.<p>%5<p><b>Would you like to "
@@ -389,7 +395,7 @@ msgid ""
"lost</i>"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:1547
+#: mediamanager/tdehardwarebackend.cpp:1577
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 "
@@ -400,7 +406,7 @@ msgstr ""
msgid "%1 cannot be found."
msgstr "Không tìm thấy %1."
-#: mounthelper/tdeio_media_mounthelper.cpp:86
+#: 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."
@@ -411,39 +417,47 @@ msgstr "%1 không phải là một vật chứa có thể gắn."
#: mounthelper/tdeio_media_mounthelper.cpp:107
#, fuzzy
-msgid "%1 is already decrypted."
+msgid "%1 is already unlocked."
msgstr "Thiết bị đã được lắp."
-#: mounthelper/tdeio_media_mounthelper.cpp:228
+#: mounthelper/tdeio_media_mounthelper.cpp:139
+msgid "Unknown unmount error."
+msgstr ""
+
+#: mounthelper/tdeio_media_mounthelper.cpp:246
msgid "The device was successfully unmounted, but the tray could not be opened"
msgstr ""
-#: mounthelper/tdeio_media_mounthelper.cpp:230
+#: mounthelper/tdeio_media_mounthelper.cpp:248
msgid "The device was successfully unmounted, but could not be ejected"
msgstr ""
-#: mounthelper/tdeio_media_mounthelper.cpp:275
+#: mounthelper/tdeio_media_mounthelper.cpp:281
+msgid "Unknown decrypt error."
+msgstr ""
+
+#: mounthelper/tdeio_media_mounthelper.cpp:295
#, fuzzy
msgid "Decrypt given URL"
msgstr "Bỏ gắn URL đưa ra."
-#: mounthelper/tdeio_media_mounthelper.cpp:276
+#: mounthelper/tdeio_media_mounthelper.cpp:296
msgid "Unmount given URL"
msgstr "Bỏ gắn URL đưa ra."
-#: mounthelper/tdeio_media_mounthelper.cpp:277
+#: 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:278
+#: 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:279
+#: 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:280
+#: mounthelper/tdeio_media_mounthelper.cpp:300
msgid "media:/ URL to mount/unmount/eject/remove"
msgstr "Địa chỉ URL media:/ để gắn/bỏ gắn/nhả ra/xóa bỏ"
@@ -464,43 +478,43 @@ msgstr "Lỗi lưu các thay đổi"
msgid "&Mounting"
msgstr "&Lắp"
-#: tdefile-plugin/tdefilemediaplugin.cpp:190
+#: tdefile-plugin/tdefilemediaplugin.cpp:184
msgid "Medium Information"
msgstr "Thông tin vật chứa"
-#: tdefile-plugin/tdefilemediaplugin.cpp:193
+#: tdefile-plugin/tdefilemediaplugin.cpp:187
msgid "Free"
msgstr "Trống"
-#: tdefile-plugin/tdefilemediaplugin.cpp:196
+#: tdefile-plugin/tdefilemediaplugin.cpp:190
msgid "Used"
msgstr "Dùng"
-#: tdefile-plugin/tdefilemediaplugin.cpp:199
+#: tdefile-plugin/tdefilemediaplugin.cpp:193
msgid "Total"
msgstr "Tổng"
-#: tdefile-plugin/tdefilemediaplugin.cpp:202
+#: tdefile-plugin/tdefilemediaplugin.cpp:196
msgid "Base URL"
msgstr "URL cơ sở"
-#: tdefile-plugin/tdefilemediaplugin.cpp:203
+#: tdefile-plugin/tdefilemediaplugin.cpp:197
msgid "Mount Point"
msgstr "Điểm gắn"
-#: tdefile-plugin/tdefilemediaplugin.cpp:204
+#: tdefile-plugin/tdefilemediaplugin.cpp:198
msgid "Device Node"
msgstr "Nút thiết bị"
-#: tdefile-plugin/tdefilemediaplugin.cpp:206
+#: tdefile-plugin/tdefilemediaplugin.cpp:200
msgid "Medium Summary"
msgstr "Tổng kết về vật chứa"
-#: tdefile-plugin/tdefilemediaplugin.cpp:208
+#: tdefile-plugin/tdefilemediaplugin.cpp:202
msgid "Usage"
msgstr "Cách dùng"
-#: tdefile-plugin/tdefilemediaplugin.cpp:210
+#: tdefile-plugin/tdefilemediaplugin.cpp:204
msgid "Bar Graph"
msgstr "Đồ hoạ cột"
@@ -572,23 +586,30 @@ msgid ""
"devices are plugged in."
msgstr ""
-#: mediamanager/decryptdialog.ui:24 mounthelper/decryptdialog.ui:24
+#: mediamanager/unlockdialog.ui:24 mounthelper/unlockdialog.ui:24
#, no-c-format
msgid "Decrypting Storage Device"
msgstr ""
-#: mediamanager/decryptdialog.ui:109 mounthelper/decryptdialog.ui:109
+#: mediamanager/unlockdialog.ui:109
#, no-c-format
msgid ""
-"<p><b>%1</b> is an encrypted storage device.</p>\n"
-"<p>Please enter the password to decrypt the storage device.</p>"
+"<p><b>%1</b> is an encrypted locked storage device.</p>\n"
+"<p>Please enter the password to unlock the storage device.</p>"
msgstr ""
-#: mediamanager/decryptdialog.ui:131 mounthelper/decryptdialog.ui:131
+#: mediamanager/unlockdialog.ui:131 mounthelper/unlockdialog.ui:131
#, no-c-format
msgid "&Password:"
msgstr ""
+#: mounthelper/unlockdialog.ui:109
+#, no-c-format
+msgid ""
+"<p><b>%1</b> is an encrypted storage device.</p>\n"
+"<p>Please enter the password to decrypt the storage device.</p>"
+msgstr ""
+
#: propsdlgplugin/propertiespagegui.ui:16
#, no-c-format
msgid "PropertiesPageGUI"
@@ -850,6 +871,10 @@ msgstr "Đa hệ thống"
msgid "Filesystem: iso9660"
msgstr "Hệ thống tập tin: iso9660"
+#, fuzzy
+#~ msgid "Permission denied"
+#~ msgstr "Quyền bị từ chối"
+
#~ msgid ""
#~ "\n"
#~ "Please check that the disk is entered correctly."
diff --git a/tde-i18n-zh_CN/messages/tdebase/tdeio_media.po b/tde-i18n-zh_CN/messages/tdebase/tdeio_media.po
index 537bbb2e9b0..4d63886a8f0 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: 2019-01-13 18:47+0100\n"
+"POT-Creation-Date: 2019-07-11 02:33+0200\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"
@@ -44,7 +44,6 @@ msgstr "未知"
#: mediaimpl.cpp:88 mediaimpl.cpp:115 mediaimpl.cpp:141 mediaimpl.cpp:177
#: mediaimpl.cpp:197 mediaimpl.cpp:218
#: mounthelper/tdeio_media_mounthelper.cpp:50
-#: mounthelper/tdeio_media_mounthelper.cpp:256
msgid "The TDE mediamanager is not running."
msgstr "TDE 介质管理器未运行。"
@@ -52,7 +51,7 @@ msgstr "TDE 介质管理器未运行。"
msgid "This media name already exists."
msgstr "此介质名称已存在。"
-#: mediaimpl.cpp:230 mediaimpl.cpp:293
+#: mediaimpl.cpp:230 mediaimpl.cpp:297
msgid "No such medium."
msgstr "没有此类媒体。"
@@ -60,113 +59,117 @@ msgstr "没有此类媒体。"
msgid "The drive is encrypted."
msgstr ""
-#: mediaimpl.cpp:272 mediamanager/halbackend.cpp:1264
-#: mediamanager/halbackend.cpp:1273 mediamanager/halbackend.cpp:1663
-#: mediamanager/halbackend.cpp:1680 mediamanager/halbackend.cpp:1691
-#: mediamanager/halbackend.cpp:1793 mediamanager/halbackend.cpp:1801
-#: mediamanager/halbackend.cpp:1808 mediamanager/halbackend.cpp:1848
-#: mediamanager/halbackend.cpp:1854 mediamanager/halbackend.cpp:1861
-#: mounthelper/tdeio_media_mounthelper.cpp:58
-msgid "Internal Error"
-msgstr "内部错误"
+#: mediaimpl.cpp:274 mediamanager/tdehardwarebackend.cpp:201
+#: mediamanager/tdehardwarebackend.cpp:252
+#: mounthelper/tdeio_media_mounthelper.cpp:202
+msgid "Unknown mount error."
+msgstr ""
#: mediamanager/dialog.cpp:26 mounthelper/dialog.cpp:26
-msgid "Decrypt"
+msgid "Unlock"
msgstr ""
-#: mediamanager/fstabbackend.cpp:104 mediamanager/fstabbackend.cpp:114
-#: mediamanager/halbackend.cpp:1595 mediamanager/halbackend.cpp:1617
-#: mediamanager/halbackend.cpp:1776 mediamanager/halbackend.cpp:1831
-#: mediamanager/tdehardwarebackend.cpp:1349
-#: mediamanager/tdehardwarebackend.cpp:1360
+#: mediamanager/fstabbackend.cpp:105 mediamanager/fstabbackend.cpp:120
+#: mediamanager/halbackend.cpp:1598 mediamanager/halbackend.cpp:1625
+#: mediamanager/halbackend.cpp:1808 mediamanager/halbackend.cpp:1877
+#: mediamanager/mediamanager.cpp:363 mediamanager/mediamanager.cpp:375
+#: mediamanager/mediamanager.cpp:387 mediamanager/mediamanager.cpp:399
+#: mediamanager/tdehardwarebackend.cpp:1363
+#: mediamanager/tdehardwarebackend.cpp:1378
#, c-format
msgid "No such medium: %1"
msgstr "没有此类媒体: %1"
-#: mediamanager/fstabbackend.cpp:398
+#: mediamanager/fstabbackend.cpp:408
msgid "CD Recorder"
msgstr "CD 刻录机"
-#: mediamanager/fstabbackend.cpp:404
+#: mediamanager/fstabbackend.cpp:414
msgid "DVD"
msgstr "DVD"
-#: mediamanager/fstabbackend.cpp:415
+#: mediamanager/fstabbackend.cpp:425
msgid "CD-ROM"
msgstr "CD-ROM"
-#: mediamanager/fstabbackend.cpp:428
+#: mediamanager/fstabbackend.cpp:438
msgid "Floppy"
msgstr "软盘"
-#: mediamanager/fstabbackend.cpp:436
+#: mediamanager/fstabbackend.cpp:446
msgid "Zip Disk"
msgstr "Zip 磁盘"
-#: mediamanager/fstabbackend.cpp:447
+#: mediamanager/fstabbackend.cpp:457
msgid "Removable Device"
msgstr "可移动设备"
-#: mediamanager/fstabbackend.cpp:452 mediamanager/fstabbackend.cpp:458
+#: mediamanager/fstabbackend.cpp:462 mediamanager/fstabbackend.cpp:468
msgid "Remote Share"
msgstr "远程共享"
-#: mediamanager/fstabbackend.cpp:463
+#: mediamanager/fstabbackend.cpp:473
msgid "Hard Disk"
msgstr "硬盘"
-#: mediamanager/halbackend.cpp:749 mediamanager/tdehardwarebackend.cpp:805
+#: mediamanager/halbackend.cpp:744 mediamanager/tdehardwarebackend.cpp:808
#, fuzzy
msgid "Unknown Drive"
msgstr "未知"
-#: mediamanager/halbackend.cpp:761 mediamanager/tdehardwarebackend.cpp:835
+#: mediamanager/halbackend.cpp:756 mediamanager/tdehardwarebackend.cpp:838
#, fuzzy
msgid "Floppy Drive"
msgstr "软盘"
-#: mediamanager/halbackend.cpp:769
+#: mediamanager/halbackend.cpp:764
#, fuzzy
msgid "Zip Drive"
msgstr "Zip 磁盘"
-#: mediamanager/halbackend.cpp:839 mediamanager/tdehardwarebackend.cpp:892
+#: mediamanager/halbackend.cpp:834 mediamanager/tdehardwarebackend.cpp:895
msgid "Camera"
msgstr "相机"
-#: mediamanager/halbackend.cpp:1221 mediamanager/halbackend.cpp:1247
+#: mediamanager/halbackend.cpp:1216 mediamanager/halbackend.cpp:1242
msgid "Authenticate"
msgstr ""
-#: mediamanager/halbackend.cpp:1222
+#: mediamanager/halbackend.cpp:1217
msgid ""
"<big><b>System policy prevents mounting internal media</b></big><br/"
">Authentication is required to perform this action. Please enter your "
"password to verify."
msgstr ""
-#: mediamanager/halbackend.cpp:1248
+#: mediamanager/halbackend.cpp:1243
msgid ""
"<big><b>System policy prevents unmounting media mounted by other users</b></"
"big><br/>Authentication is required to perform this action. Please enter "
"your password to verify."
msgstr ""
-#: mediamanager/halbackend.cpp:1284
+#: mediamanager/halbackend.cpp:1259 mediamanager/halbackend.cpp:1268
+#: mediamanager/halbackend.cpp:1849 mediamanager/halbackend.cpp:1916
+#: mounthelper/tdeio_media_mounthelper.cpp:58
+msgid "Internal Error"
+msgstr "内部错误"
+
+#: mediamanager/halbackend.cpp:1279
msgid "Invalid filesystem type"
msgstr "无效的文件系统类型"
-#: mediamanager/halbackend.cpp:1286
+#: mediamanager/halbackend.cpp:1281
msgid ""
"Permission denied<p>Please ensure that:<br>1. You have permission to access "
"this device.<br>2. This device node is not listed in /etc/fstab.</p>"
msgstr ""
-#: mediamanager/halbackend.cpp:1290
+#: mediamanager/halbackend.cpp:1285
msgid "Device is already mounted."
msgstr "设备已装入。"
-#: mediamanager/halbackend.cpp:1340
+#: mediamanager/halbackend.cpp:1335
msgid ""
"Moreover, programs still using the device have been detected. They are "
"listed below. You have to close them or change their working directory "
@@ -175,212 +178,215 @@ msgstr ""
"此外,还检测到了仍然在使用设备的程序,程序清单列在下面。您需要关闭这些程序,"
"或者更改其工作目录,然后再尝试卸载设备。"
-#: mediamanager/halbackend.cpp:1381 mediamanager/tdehardwarebackend.cpp:1588
+#: mediamanager/halbackend.cpp:1376 mediamanager/tdehardwarebackend.cpp:1618
msgid ""
"Programs that were still using the device have been forcibly terminated. "
"They are listed below."
msgstr ""
-#: mediamanager/halbackend.cpp:1402 mediamanager/halbackend.cpp:1715
-#: mediamanager/tdehardwarebackend.cpp:1406
-#: mediamanager/tdehardwarebackend.cpp:1424
-#: mediamanager/tdehardwarebackend.cpp:1464
+#: mediamanager/halbackend.cpp:1397 mediamanager/halbackend.cpp:1742
+#: mediamanager/tdehardwarebackend.cpp:1430
+#: mediamanager/tdehardwarebackend.cpp:1452
+#: mediamanager/tdehardwarebackend.cpp:1494
msgid ""
"Unfortunately, the device <b>%1</b> (%2) named <b>'%3'</b> and currently "
"mounted at <b>%4</b> could not be unmounted. "
msgstr ""
"设备 <b>%1</b> (%2) 名为<b>“%3”</b>,目前正挂载于 <b>%4</b>,现在无法卸载。"
-#: mediamanager/halbackend.cpp:1408 mediamanager/tdehardwarebackend.cpp:1470
+#: mediamanager/halbackend.cpp:1403 mediamanager/tdehardwarebackend.cpp:1500
msgid "The following error was returned by umount command:"
msgstr "umount 命令返回了下列错误:"
-#: mediamanager/halbackend.cpp:1478
+#: mediamanager/halbackend.cpp:1567 mediamanager/tdehardwarebackend.cpp:1322
+msgid "Cannot mount encrypted locked drives!"
+msgstr ""
+
+#: mediamanager/halbackend.cpp:1682 mediamanager/halbackend.cpp:1703
+#: mediamanager/halbackend.cpp:1716 mediamanager/halbackend.cpp:1830
+#: mediamanager/halbackend.cpp:1840 mediamanager/halbackend.cpp:1899
+#: mediamanager/halbackend.cpp:1907
#, fuzzy
-msgid "Permission denied"
-msgstr "拒绝许可权限"
+msgid "Internal error"
+msgstr "内部错误"
-#: mediamanager/halbackend.cpp:1562 mediamanager/tdehardwarebackend.cpp:1232
-msgid "Cannot mount encrypted drives!"
-msgstr ""
+#: mediamanager/halbackend.cpp:1694
+#, fuzzy
+#| msgid "Unknown"
+msgid "Unknown error"
+msgstr "未知"
-#: mediamanager/halbackend.cpp:1721
+#: mediamanager/halbackend.cpp:1748
msgid "Unmounting failed due to the following error:"
msgstr "卸载失败,错误原因如下:"
-#: mediamanager/halbackend.cpp:1723
+#: mediamanager/halbackend.cpp:1750
msgid "Device is Busy:"
msgstr "设备正忙:"
-#: mediamanager/halbackend.cpp:1727
+#: mediamanager/halbackend.cpp:1754
msgid ""
"Permission denied<p>Please ensure that:<br>1. You have permission to access "
"this device.<br>2. This device was originally mounted using TDE.</p>"
msgstr ""
-#: mediamanager/halbackend.cpp:1739
+#: mediamanager/halbackend.cpp:1766
msgid ""
"%1<p><b>Would you like to forcibly terminate these processes?</b><br><i>All "
"unsaved data would be lost</i>"
msgstr ""
-#: mediamanager/halbackend.cpp:1811
+#: mediamanager/halbackend.cpp:1852
msgid "Wrong password"
msgstr ""
-#: mediamanager/mediamanager.cpp:247 mediamanager/mediamanager.cpp:266
-#: mediamanager/mediamanager.cpp:285 mediamanager/mediamanager.cpp:293
-#: mediamanager/mediamanager.cpp:302 mediamanager/mediamanager.cpp:310
-msgid "Feature only available with HAL"
-msgstr "功能仅对于 HAL 可用"
-
-#: mediamanager/mediamanager.cpp:252
+#: mediamanager/mediamanager.cpp:248 mediamanager/mediamanager.cpp:275
#, fuzzy
msgid "Feature only available with the TDE hardware backend"
msgstr "功能仅对于 HAL 可用"
-#: mediamanager/mediamanager.cpp:256 mediamanager/mediamanager.cpp:271
-#: mediamanager/mediamanager.cpp:275
+#: mediamanager/mediamanager.cpp:255 mediamanager/mediamanager.cpp:282
+#: mediamanager/mediamanager.cpp:312 mediamanager/mediamanager.cpp:343
+msgid "Feature only available with HAL"
+msgstr "功能仅对于 HAL 可用"
+
+#: mediamanager/mediamanager.cpp:262 mediamanager/mediamanager.cpp:289
+#: mediamanager/mediamanager.cpp:320 mediamanager/mediamanager.cpp:350
#, fuzzy
msgid "Feature only available with HAL or TDE hardware backend"
msgstr "功能仅对于 HAL 可用"
-#: mediamanager/tdehardwarebackend.cpp:480
-#: mediamanager/tdehardwarebackend.cpp:517
-#: mediamanager/tdehardwarebackend.cpp:750
+#: mediamanager/tdehardwarebackend.cpp:483
+#: mediamanager/tdehardwarebackend.cpp:520
+#: mediamanager/tdehardwarebackend.cpp:753
#, fuzzy
msgid "%1 Removable Device"
msgstr "可移动设备"
-#: mediamanager/tdehardwarebackend.cpp:525
+#: mediamanager/tdehardwarebackend.cpp:528
#, fuzzy
msgid "Blank CD-ROM"
msgstr "CD-ROM"
-#: mediamanager/tdehardwarebackend.cpp:534
+#: mediamanager/tdehardwarebackend.cpp:537
msgid "Blank CD-R"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:543
+#: mediamanager/tdehardwarebackend.cpp:546
msgid "Blank CD-RW"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:552
+#: mediamanager/tdehardwarebackend.cpp:555
msgid "Blank Magneto-Optical CD"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:561
+#: mediamanager/tdehardwarebackend.cpp:564
msgid "Blank Mount Ranier CD-RW"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:570
+#: mediamanager/tdehardwarebackend.cpp:573
msgid "Blank Mount Ranier CD-RW-W"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:579
+#: mediamanager/tdehardwarebackend.cpp:582
msgid "Blank DVD-ROM"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:588
+#: mediamanager/tdehardwarebackend.cpp:591
msgid "Blank DVD-RAM"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:597
+#: mediamanager/tdehardwarebackend.cpp:600
msgid "Blank DVD-R"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:606
+#: mediamanager/tdehardwarebackend.cpp:609
msgid "Blank DVD-RW"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:615
+#: mediamanager/tdehardwarebackend.cpp:618
msgid "Blank Dual Layer DVD-R"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:624
+#: mediamanager/tdehardwarebackend.cpp:627
msgid "Blank Dual Layer DVD-RW"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:633
+#: mediamanager/tdehardwarebackend.cpp:636
msgid "Blank DVD+R"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:642
+#: mediamanager/tdehardwarebackend.cpp:645
msgid "Blank DVD+RW"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:651
+#: mediamanager/tdehardwarebackend.cpp:654
msgid "Blank Dual Layer DVD+R"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:660
+#: mediamanager/tdehardwarebackend.cpp:663
msgid "Blank Dual Layer DVD+RW"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:669
+#: mediamanager/tdehardwarebackend.cpp:672
msgid "Blank BD-ROM"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:678
+#: mediamanager/tdehardwarebackend.cpp:681
msgid "Blank BD-R"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:687
+#: mediamanager/tdehardwarebackend.cpp:690
msgid "Blank BD-RW"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:696
+#: mediamanager/tdehardwarebackend.cpp:699
msgid "Blank HDDVD-ROM"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:705
+#: mediamanager/tdehardwarebackend.cpp:708
msgid "Blank HDDVD-R"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:714
+#: mediamanager/tdehardwarebackend.cpp:717
msgid "Blank HDDVD-RW"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:721
+#: mediamanager/tdehardwarebackend.cpp:724
msgid "Audio CD"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:742
+#: mediamanager/tdehardwarebackend.cpp:745
msgid "%1 Fixed Disk (%2)"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:849
+#: mediamanager/tdehardwarebackend.cpp:852
#, fuzzy
msgid "%1 Zip Disk"
msgstr "Zip 磁盘"
-#: mediamanager/tdehardwarebackend.cpp:1212
-#: mediamanager/tdehardwarebackend.cpp:1392
-#, fuzzy
-msgid "Internal error"
-msgstr "内部错误"
+#: mediamanager/tdehardwarebackend.cpp:1224
+#: mediamanager/tdehardwarebackend.cpp:1417
+msgid "Internal error. Couldn't find medium."
+msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:1239
-msgid ""
-"<qt>Unable to mount this device.<p>Potential reasons include:<br>Improper "
-"device and/or user privilege level<br>Corrupt data on storage device"
+#: mediamanager/tdehardwarebackend.cpp:1249
+#: mediamanager/tdehardwarebackend.cpp:1323
+msgid "Unable to mount this device."
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:1241
-#: mediamanager/tdehardwarebackend.cpp:1316
-#: mediamanager/tdehardwarebackend.cpp:1408
-#: mediamanager/tdehardwarebackend.cpp:1426
+#: mediamanager/tdehardwarebackend.cpp:1252
+#: mediamanager/tdehardwarebackend.cpp:1326
+#: mediamanager/tdehardwarebackend.cpp:1435
+#: mediamanager/tdehardwarebackend.cpp:1457
msgid "<p>Technical details:<br>"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:1314
-msgid ""
-"<qt>Unable to mount this device.<p>Potential reasons include:<br>Improper "
-"device and/or user privilege level<br>Corrupt data on storage "
-"device<br>Incorrect encryption password"
+#: mediamanager/tdehardwarebackend.cpp:1284
+msgid "Decryption aborted"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:1420
+#: mediamanager/tdehardwarebackend.cpp:1443
msgid ""
"<qt>The device <b>%1</b> (%2) named <b>'%3'</b> and currently mounted at <b>"
"%4</b> can not be unmounted at this time.<p>%5<p><b>Would you like to "
@@ -388,7 +394,7 @@ msgid ""
"lost</i>"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:1547
+#: mediamanager/tdehardwarebackend.cpp:1577
#, fuzzy
msgid ""
"Programs still using the device have been detected. They are listed below. "
@@ -402,7 +408,7 @@ msgstr ""
msgid "%1 cannot be found."
msgstr "找不到 %1。"
-#: mounthelper/tdeio_media_mounthelper.cpp:86
+#: mounthelper/tdeio_media_mounthelper.cpp:87
msgid "%1 is not a mountable media."
msgstr "%1 不是可挂载的介质。"
@@ -413,39 +419,47 @@ msgstr "%1 不是可挂载的介质。"
#: mounthelper/tdeio_media_mounthelper.cpp:107
#, fuzzy
-msgid "%1 is already decrypted."
+msgid "%1 is already unlocked."
msgstr "设备已装入。"
-#: mounthelper/tdeio_media_mounthelper.cpp:228
+#: mounthelper/tdeio_media_mounthelper.cpp:139
+msgid "Unknown unmount error."
+msgstr ""
+
+#: mounthelper/tdeio_media_mounthelper.cpp:246
msgid "The device was successfully unmounted, but the tray could not be opened"
msgstr "设备已经成功卸载,但无法打开托盘"
-#: mounthelper/tdeio_media_mounthelper.cpp:230
+#: mounthelper/tdeio_media_mounthelper.cpp:248
msgid "The device was successfully unmounted, but could not be ejected"
msgstr "设备已经成功卸载,但尚未弹出"
-#: mounthelper/tdeio_media_mounthelper.cpp:275
+#: mounthelper/tdeio_media_mounthelper.cpp:281
+msgid "Unknown decrypt error."
+msgstr ""
+
+#: mounthelper/tdeio_media_mounthelper.cpp:295
#, fuzzy
msgid "Decrypt given URL"
msgstr "卸载给出的 URL"
-#: mounthelper/tdeio_media_mounthelper.cpp:276
+#: mounthelper/tdeio_media_mounthelper.cpp:296
msgid "Unmount given URL"
msgstr "卸载给出的 URL"
-#: mounthelper/tdeio_media_mounthelper.cpp:277
+#: mounthelper/tdeio_media_mounthelper.cpp:297
msgid "Mount given URL (default)"
msgstr "挂载给定的 URL(默认)"
-#: mounthelper/tdeio_media_mounthelper.cpp:278
+#: mounthelper/tdeio_media_mounthelper.cpp:298
msgid "Eject given URL via tdeeject"
msgstr "通过 tdeeject 弹出给定 URL"
-#: mounthelper/tdeio_media_mounthelper.cpp:279
+#: mounthelper/tdeio_media_mounthelper.cpp:299
msgid "Unmount and Eject given URL (necessary for some USB devices)"
msgstr "卸载并弹出给定的 URL(某些 USB 设备需要)"
-#: mounthelper/tdeio_media_mounthelper.cpp:280
+#: mounthelper/tdeio_media_mounthelper.cpp:300
msgid "media:/ URL to mount/unmount/eject/remove"
msgstr "要挂载/卸载/弹出/删除的 media:/ URL"
@@ -466,43 +480,43 @@ msgstr "保存更改失败"
msgid "&Mounting"
msgstr "挂载(&M)"
-#: tdefile-plugin/tdefilemediaplugin.cpp:190
+#: tdefile-plugin/tdefilemediaplugin.cpp:184
msgid "Medium Information"
msgstr "介质信息"
-#: tdefile-plugin/tdefilemediaplugin.cpp:193
+#: tdefile-plugin/tdefilemediaplugin.cpp:187
msgid "Free"
msgstr "剩余"
-#: tdefile-plugin/tdefilemediaplugin.cpp:196
+#: tdefile-plugin/tdefilemediaplugin.cpp:190
msgid "Used"
msgstr "已用"
-#: tdefile-plugin/tdefilemediaplugin.cpp:199
+#: tdefile-plugin/tdefilemediaplugin.cpp:193
msgid "Total"
msgstr "总计"
-#: tdefile-plugin/tdefilemediaplugin.cpp:202
+#: tdefile-plugin/tdefilemediaplugin.cpp:196
msgid "Base URL"
msgstr "基 URL"
-#: tdefile-plugin/tdefilemediaplugin.cpp:203
+#: tdefile-plugin/tdefilemediaplugin.cpp:197
msgid "Mount Point"
msgstr "挂载点"
-#: tdefile-plugin/tdefilemediaplugin.cpp:204
+#: tdefile-plugin/tdefilemediaplugin.cpp:198
msgid "Device Node"
msgstr "设备节点"
-#: tdefile-plugin/tdefilemediaplugin.cpp:206
+#: tdefile-plugin/tdefilemediaplugin.cpp:200
msgid "Medium Summary"
msgstr "介质概览"
-#: tdefile-plugin/tdefilemediaplugin.cpp:208
+#: tdefile-plugin/tdefilemediaplugin.cpp:202
msgid "Usage"
msgstr "用量"
-#: tdefile-plugin/tdefilemediaplugin.cpp:210
+#: tdefile-plugin/tdefilemediaplugin.cpp:204
msgid "Bar Graph"
msgstr "条形图"
@@ -574,23 +588,30 @@ msgid ""
"devices are plugged in."
msgstr ""
-#: mediamanager/decryptdialog.ui:24 mounthelper/decryptdialog.ui:24
+#: mediamanager/unlockdialog.ui:24 mounthelper/unlockdialog.ui:24
#, no-c-format
msgid "Decrypting Storage Device"
msgstr ""
-#: mediamanager/decryptdialog.ui:109 mounthelper/decryptdialog.ui:109
+#: mediamanager/unlockdialog.ui:109
#, no-c-format
msgid ""
-"<p><b>%1</b> is an encrypted storage device.</p>\n"
-"<p>Please enter the password to decrypt the storage device.</p>"
+"<p><b>%1</b> is an encrypted locked storage device.</p>\n"
+"<p>Please enter the password to unlock the storage device.</p>"
msgstr ""
-#: mediamanager/decryptdialog.ui:131 mounthelper/decryptdialog.ui:131
+#: mediamanager/unlockdialog.ui:131 mounthelper/unlockdialog.ui:131
#, no-c-format
msgid "&Password:"
msgstr ""
+#: mounthelper/unlockdialog.ui:109
+#, no-c-format
+msgid ""
+"<p><b>%1</b> is an encrypted storage device.</p>\n"
+"<p>Please enter the password to decrypt the storage device.</p>"
+msgstr ""
+
#: propsdlgplugin/propertiespagegui.ui:16
#, no-c-format
msgid "PropertiesPageGUI"
@@ -839,6 +860,10 @@ msgstr "混合"
msgid "Filesystem: iso9660"
msgstr "文件系统:iso9660"
+#, fuzzy
+#~ msgid "Permission denied"
+#~ msgstr "拒绝许可权限"
+
#~ msgid ""
#~ "\n"
#~ "Please check that the disk is entered correctly."
diff --git a/tde-i18n-zh_TW/messages/tdebase/tdeio_media.po b/tde-i18n-zh_TW/messages/tdebase/tdeio_media.po
index b902f76abb6..d4d6d8b2b56 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: 2019-01-13 18:47+0100\n"
+"POT-Creation-Date: 2019-07-11 02:33+0200\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"
@@ -48,7 +48,6 @@ msgstr "不明"
#: mediaimpl.cpp:88 mediaimpl.cpp:115 mediaimpl.cpp:141 mediaimpl.cpp:177
#: mediaimpl.cpp:197 mediaimpl.cpp:218
#: mounthelper/tdeio_media_mounthelper.cpp:50
-#: mounthelper/tdeio_media_mounthelper.cpp:256
msgid "The TDE mediamanager is not running."
msgstr "TDE 檔案管理程式並未執行。"
@@ -56,7 +55,7 @@ msgstr "TDE 檔案管理程式並未執行。"
msgid "This media name already exists."
msgstr "這個媒體名稱已經存在。"
-#: mediaimpl.cpp:230 mediaimpl.cpp:293
+#: mediaimpl.cpp:230 mediaimpl.cpp:297
msgid "No such medium."
msgstr "找不到該媒體。"
@@ -64,110 +63,114 @@ msgstr "找不到該媒體。"
msgid "The drive is encrypted."
msgstr ""
-#: mediaimpl.cpp:272 mediamanager/halbackend.cpp:1264
-#: mediamanager/halbackend.cpp:1273 mediamanager/halbackend.cpp:1663
-#: mediamanager/halbackend.cpp:1680 mediamanager/halbackend.cpp:1691
-#: mediamanager/halbackend.cpp:1793 mediamanager/halbackend.cpp:1801
-#: mediamanager/halbackend.cpp:1808 mediamanager/halbackend.cpp:1848
-#: mediamanager/halbackend.cpp:1854 mediamanager/halbackend.cpp:1861
-#: mounthelper/tdeio_media_mounthelper.cpp:58
-msgid "Internal Error"
-msgstr "內部錯誤"
+#: mediaimpl.cpp:274 mediamanager/tdehardwarebackend.cpp:201
+#: mediamanager/tdehardwarebackend.cpp:252
+#: mounthelper/tdeio_media_mounthelper.cpp:202
+msgid "Unknown mount error."
+msgstr ""
#: mediamanager/dialog.cpp:26 mounthelper/dialog.cpp:26
-msgid "Decrypt"
+msgid "Unlock"
msgstr ""
-#: mediamanager/fstabbackend.cpp:104 mediamanager/fstabbackend.cpp:114
-#: mediamanager/halbackend.cpp:1595 mediamanager/halbackend.cpp:1617
-#: mediamanager/halbackend.cpp:1776 mediamanager/halbackend.cpp:1831
-#: mediamanager/tdehardwarebackend.cpp:1349
-#: mediamanager/tdehardwarebackend.cpp:1360
+#: mediamanager/fstabbackend.cpp:105 mediamanager/fstabbackend.cpp:120
+#: mediamanager/halbackend.cpp:1598 mediamanager/halbackend.cpp:1625
+#: mediamanager/halbackend.cpp:1808 mediamanager/halbackend.cpp:1877
+#: mediamanager/mediamanager.cpp:363 mediamanager/mediamanager.cpp:375
+#: mediamanager/mediamanager.cpp:387 mediamanager/mediamanager.cpp:399
+#: mediamanager/tdehardwarebackend.cpp:1363
+#: mediamanager/tdehardwarebackend.cpp:1378
#, c-format
msgid "No such medium: %1"
msgstr "沒有媒體 %1"
-#: mediamanager/fstabbackend.cpp:398
+#: mediamanager/fstabbackend.cpp:408
msgid "CD Recorder"
msgstr "燒錄器"
-#: mediamanager/fstabbackend.cpp:404
+#: mediamanager/fstabbackend.cpp:414
msgid "DVD"
msgstr "DVD-ROM"
-#: mediamanager/fstabbackend.cpp:415
+#: mediamanager/fstabbackend.cpp:425
msgid "CD-ROM"
msgstr "光碟機"
-#: mediamanager/fstabbackend.cpp:428
+#: mediamanager/fstabbackend.cpp:438
msgid "Floppy"
msgstr "軟碟"
-#: mediamanager/fstabbackend.cpp:436
+#: mediamanager/fstabbackend.cpp:446
msgid "Zip Disk"
msgstr "Zip 磁碟"
-#: mediamanager/fstabbackend.cpp:447
+#: mediamanager/fstabbackend.cpp:457
msgid "Removable Device"
msgstr "可移除的裝置"
-#: mediamanager/fstabbackend.cpp:452 mediamanager/fstabbackend.cpp:458
+#: mediamanager/fstabbackend.cpp:462 mediamanager/fstabbackend.cpp:468
msgid "Remote Share"
msgstr "遠端分享"
-#: mediamanager/fstabbackend.cpp:463
+#: mediamanager/fstabbackend.cpp:473
msgid "Hard Disk"
msgstr "硬碟"
-#: mediamanager/halbackend.cpp:749 mediamanager/tdehardwarebackend.cpp:805
+#: mediamanager/halbackend.cpp:744 mediamanager/tdehardwarebackend.cpp:808
msgid "Unknown Drive"
msgstr "不明磁碟機"
-#: mediamanager/halbackend.cpp:761 mediamanager/tdehardwarebackend.cpp:835
+#: mediamanager/halbackend.cpp:756 mediamanager/tdehardwarebackend.cpp:838
msgid "Floppy Drive"
msgstr "軟碟機"
-#: mediamanager/halbackend.cpp:769
+#: mediamanager/halbackend.cpp:764
msgid "Zip Drive"
msgstr "Zip 磁碟機"
-#: mediamanager/halbackend.cpp:839 mediamanager/tdehardwarebackend.cpp:892
+#: mediamanager/halbackend.cpp:834 mediamanager/tdehardwarebackend.cpp:895
msgid "Camera"
msgstr "攝影機"
-#: mediamanager/halbackend.cpp:1221 mediamanager/halbackend.cpp:1247
+#: mediamanager/halbackend.cpp:1216 mediamanager/halbackend.cpp:1242
msgid "Authenticate"
msgstr ""
-#: mediamanager/halbackend.cpp:1222
+#: mediamanager/halbackend.cpp:1217
msgid ""
"<big><b>System policy prevents mounting internal media</b></big><br/"
">Authentication is required to perform this action. Please enter your "
"password to verify."
msgstr ""
-#: mediamanager/halbackend.cpp:1248
+#: mediamanager/halbackend.cpp:1243
msgid ""
"<big><b>System policy prevents unmounting media mounted by other users</b></"
"big><br/>Authentication is required to perform this action. Please enter "
"your password to verify."
msgstr ""
-#: mediamanager/halbackend.cpp:1284
+#: mediamanager/halbackend.cpp:1259 mediamanager/halbackend.cpp:1268
+#: mediamanager/halbackend.cpp:1849 mediamanager/halbackend.cpp:1916
+#: mounthelper/tdeio_media_mounthelper.cpp:58
+msgid "Internal Error"
+msgstr "內部錯誤"
+
+#: mediamanager/halbackend.cpp:1279
msgid "Invalid filesystem type"
msgstr "不合法的檔案系統型態"
-#: mediamanager/halbackend.cpp:1286
+#: mediamanager/halbackend.cpp:1281
msgid ""
"Permission denied<p>Please ensure that:<br>1. You have permission to access "
"this device.<br>2. This device node is not listed in /etc/fstab.</p>"
msgstr ""
-#: mediamanager/halbackend.cpp:1290
+#: mediamanager/halbackend.cpp:1285
msgid "Device is already mounted."
msgstr "裝置已掛載。"
-#: mediamanager/halbackend.cpp:1340
+#: mediamanager/halbackend.cpp:1335
msgid ""
"Moreover, programs still using the device have been detected. They are "
"listed below. You have to close them or change their working directory "
@@ -176,212 +179,215 @@ msgstr ""
"此外,系統偵測到底下的程式仍然在使用此裝置。您必須先將它們關閉,或改變它們的"
"工作目錄,才能卸載此裝置。"
-#: mediamanager/halbackend.cpp:1381 mediamanager/tdehardwarebackend.cpp:1588
+#: mediamanager/halbackend.cpp:1376 mediamanager/tdehardwarebackend.cpp:1618
msgid ""
"Programs that were still using the device have been forcibly terminated. "
"They are listed below."
msgstr ""
-#: mediamanager/halbackend.cpp:1402 mediamanager/halbackend.cpp:1715
-#: mediamanager/tdehardwarebackend.cpp:1406
-#: mediamanager/tdehardwarebackend.cpp:1424
-#: mediamanager/tdehardwarebackend.cpp:1464
+#: mediamanager/halbackend.cpp:1397 mediamanager/halbackend.cpp:1742
+#: mediamanager/tdehardwarebackend.cpp:1430
+#: mediamanager/tdehardwarebackend.cpp:1452
+#: mediamanager/tdehardwarebackend.cpp:1494
msgid ""
"Unfortunately, the device <b>%1</b> (%2) named <b>'%3'</b> and currently "
"mounted at <b>%4</b> could not be unmounted. "
msgstr ""
"不幸地,裝置 <b>%1</b>(%2)名為 <b>%3</b> 目前掛載於 <b>%4</b> 無法卸載。"
-#: mediamanager/halbackend.cpp:1408 mediamanager/tdehardwarebackend.cpp:1470
+#: mediamanager/halbackend.cpp:1403 mediamanager/tdehardwarebackend.cpp:1500
msgid "The following error was returned by umount command:"
msgstr "卸載時發生以下錯誤:"
-#: mediamanager/halbackend.cpp:1478
+#: mediamanager/halbackend.cpp:1567 mediamanager/tdehardwarebackend.cpp:1322
+msgid "Cannot mount encrypted locked drives!"
+msgstr ""
+
+#: mediamanager/halbackend.cpp:1682 mediamanager/halbackend.cpp:1703
+#: mediamanager/halbackend.cpp:1716 mediamanager/halbackend.cpp:1830
+#: mediamanager/halbackend.cpp:1840 mediamanager/halbackend.cpp:1899
+#: mediamanager/halbackend.cpp:1907
#, fuzzy
-msgid "Permission denied"
-msgstr "權限被拒"
+msgid "Internal error"
+msgstr "內部錯誤"
-#: mediamanager/halbackend.cpp:1562 mediamanager/tdehardwarebackend.cpp:1232
-msgid "Cannot mount encrypted drives!"
-msgstr ""
+#: mediamanager/halbackend.cpp:1694
+#, fuzzy
+#| msgid "Unknown"
+msgid "Unknown error"
+msgstr "不明"
-#: mediamanager/halbackend.cpp:1721
+#: mediamanager/halbackend.cpp:1748
msgid "Unmounting failed due to the following error:"
msgstr "卸載失敗,錯誤訊息:"
-#: mediamanager/halbackend.cpp:1723
+#: mediamanager/halbackend.cpp:1750
msgid "Device is Busy:"
msgstr "裝置忙碌:"
-#: mediamanager/halbackend.cpp:1727
+#: mediamanager/halbackend.cpp:1754
msgid ""
"Permission denied<p>Please ensure that:<br>1. You have permission to access "
"this device.<br>2. This device was originally mounted using TDE.</p>"
msgstr ""
-#: mediamanager/halbackend.cpp:1739
+#: mediamanager/halbackend.cpp:1766
msgid ""
"%1<p><b>Would you like to forcibly terminate these processes?</b><br><i>All "
"unsaved data would be lost</i>"
msgstr ""
-#: mediamanager/halbackend.cpp:1811
+#: mediamanager/halbackend.cpp:1852
msgid "Wrong password"
msgstr ""
-#: mediamanager/mediamanager.cpp:247 mediamanager/mediamanager.cpp:266
-#: mediamanager/mediamanager.cpp:285 mediamanager/mediamanager.cpp:293
-#: mediamanager/mediamanager.cpp:302 mediamanager/mediamanager.cpp:310
-msgid "Feature only available with HAL"
-msgstr "此功能只能與 HAL 使用"
-
-#: mediamanager/mediamanager.cpp:252
+#: mediamanager/mediamanager.cpp:248 mediamanager/mediamanager.cpp:275
#, fuzzy
msgid "Feature only available with the TDE hardware backend"
msgstr "此功能只能與 HAL 使用"
-#: mediamanager/mediamanager.cpp:256 mediamanager/mediamanager.cpp:271
-#: mediamanager/mediamanager.cpp:275
+#: mediamanager/mediamanager.cpp:255 mediamanager/mediamanager.cpp:282
+#: mediamanager/mediamanager.cpp:312 mediamanager/mediamanager.cpp:343
+msgid "Feature only available with HAL"
+msgstr "此功能只能與 HAL 使用"
+
+#: mediamanager/mediamanager.cpp:262 mediamanager/mediamanager.cpp:289
+#: mediamanager/mediamanager.cpp:320 mediamanager/mediamanager.cpp:350
#, fuzzy
msgid "Feature only available with HAL or TDE hardware backend"
msgstr "此功能只能與 HAL 使用"
-#: mediamanager/tdehardwarebackend.cpp:480
-#: mediamanager/tdehardwarebackend.cpp:517
-#: mediamanager/tdehardwarebackend.cpp:750
+#: mediamanager/tdehardwarebackend.cpp:483
+#: mediamanager/tdehardwarebackend.cpp:520
+#: mediamanager/tdehardwarebackend.cpp:753
#, fuzzy
msgid "%1 Removable Device"
msgstr "可移除的裝置"
-#: mediamanager/tdehardwarebackend.cpp:525
+#: mediamanager/tdehardwarebackend.cpp:528
#, fuzzy
msgid "Blank CD-ROM"
msgstr "光碟機"
-#: mediamanager/tdehardwarebackend.cpp:534
+#: mediamanager/tdehardwarebackend.cpp:537
msgid "Blank CD-R"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:543
+#: mediamanager/tdehardwarebackend.cpp:546
msgid "Blank CD-RW"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:552
+#: mediamanager/tdehardwarebackend.cpp:555
msgid "Blank Magneto-Optical CD"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:561
+#: mediamanager/tdehardwarebackend.cpp:564
msgid "Blank Mount Ranier CD-RW"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:570
+#: mediamanager/tdehardwarebackend.cpp:573
msgid "Blank Mount Ranier CD-RW-W"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:579
+#: mediamanager/tdehardwarebackend.cpp:582
msgid "Blank DVD-ROM"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:588
+#: mediamanager/tdehardwarebackend.cpp:591
msgid "Blank DVD-RAM"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:597
+#: mediamanager/tdehardwarebackend.cpp:600
msgid "Blank DVD-R"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:606
+#: mediamanager/tdehardwarebackend.cpp:609
msgid "Blank DVD-RW"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:615
+#: mediamanager/tdehardwarebackend.cpp:618
msgid "Blank Dual Layer DVD-R"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:624
+#: mediamanager/tdehardwarebackend.cpp:627
msgid "Blank Dual Layer DVD-RW"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:633
+#: mediamanager/tdehardwarebackend.cpp:636
msgid "Blank DVD+R"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:642
+#: mediamanager/tdehardwarebackend.cpp:645
msgid "Blank DVD+RW"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:651
+#: mediamanager/tdehardwarebackend.cpp:654
msgid "Blank Dual Layer DVD+R"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:660
+#: mediamanager/tdehardwarebackend.cpp:663
msgid "Blank Dual Layer DVD+RW"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:669
+#: mediamanager/tdehardwarebackend.cpp:672
msgid "Blank BD-ROM"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:678
+#: mediamanager/tdehardwarebackend.cpp:681
msgid "Blank BD-R"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:687
+#: mediamanager/tdehardwarebackend.cpp:690
msgid "Blank BD-RW"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:696
+#: mediamanager/tdehardwarebackend.cpp:699
msgid "Blank HDDVD-ROM"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:705
+#: mediamanager/tdehardwarebackend.cpp:708
msgid "Blank HDDVD-R"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:714
+#: mediamanager/tdehardwarebackend.cpp:717
msgid "Blank HDDVD-RW"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:721
+#: mediamanager/tdehardwarebackend.cpp:724
msgid "Audio CD"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:742
+#: mediamanager/tdehardwarebackend.cpp:745
msgid "%1 Fixed Disk (%2)"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:849
+#: mediamanager/tdehardwarebackend.cpp:852
#, fuzzy
msgid "%1 Zip Disk"
msgstr "Zip 磁碟"
-#: mediamanager/tdehardwarebackend.cpp:1212
-#: mediamanager/tdehardwarebackend.cpp:1392
-#, fuzzy
-msgid "Internal error"
-msgstr "內部錯誤"
+#: mediamanager/tdehardwarebackend.cpp:1224
+#: mediamanager/tdehardwarebackend.cpp:1417
+msgid "Internal error. Couldn't find medium."
+msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:1239
-msgid ""
-"<qt>Unable to mount this device.<p>Potential reasons include:<br>Improper "
-"device and/or user privilege level<br>Corrupt data on storage device"
+#: mediamanager/tdehardwarebackend.cpp:1249
+#: mediamanager/tdehardwarebackend.cpp:1323
+msgid "Unable to mount this device."
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:1241
-#: mediamanager/tdehardwarebackend.cpp:1316
-#: mediamanager/tdehardwarebackend.cpp:1408
-#: mediamanager/tdehardwarebackend.cpp:1426
+#: mediamanager/tdehardwarebackend.cpp:1252
+#: mediamanager/tdehardwarebackend.cpp:1326
+#: mediamanager/tdehardwarebackend.cpp:1435
+#: mediamanager/tdehardwarebackend.cpp:1457
msgid "<p>Technical details:<br>"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:1314
-msgid ""
-"<qt>Unable to mount this device.<p>Potential reasons include:<br>Improper "
-"device and/or user privilege level<br>Corrupt data on storage "
-"device<br>Incorrect encryption password"
+#: mediamanager/tdehardwarebackend.cpp:1284
+msgid "Decryption aborted"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:1420
+#: mediamanager/tdehardwarebackend.cpp:1443
msgid ""
"<qt>The device <b>%1</b> (%2) named <b>'%3'</b> and currently mounted at <b>"
"%4</b> can not be unmounted at this time.<p>%5<p><b>Would you like to "
@@ -389,7 +395,7 @@ msgid ""
"lost</i>"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:1547
+#: mediamanager/tdehardwarebackend.cpp:1577
#, fuzzy
msgid ""
"Programs still using the device have been detected. They are listed below. "
@@ -403,7 +409,7 @@ msgstr ""
msgid "%1 cannot be found."
msgstr "無法找到 %1。"
-#: mounthelper/tdeio_media_mounthelper.cpp:86
+#: mounthelper/tdeio_media_mounthelper.cpp:87
msgid "%1 is not a mountable media."
msgstr "%1 不是一個可掛載的媒體。"
@@ -414,39 +420,47 @@ msgstr "%1 不是一個可掛載的媒體。"
#: mounthelper/tdeio_media_mounthelper.cpp:107
#, fuzzy
-msgid "%1 is already decrypted."
+msgid "%1 is already unlocked."
msgstr "裝置已掛載。"
-#: mounthelper/tdeio_media_mounthelper.cpp:228
+#: mounthelper/tdeio_media_mounthelper.cpp:139
+msgid "Unknown unmount error."
+msgstr ""
+
+#: mounthelper/tdeio_media_mounthelper.cpp:246
msgid "The device was successfully unmounted, but the tray could not be opened"
msgstr "裝置已成功卸載,但是匣門無法開啟"
-#: mounthelper/tdeio_media_mounthelper.cpp:230
+#: mounthelper/tdeio_media_mounthelper.cpp:248
msgid "The device was successfully unmounted, but could not be ejected"
msgstr "裝置已成功卸載,但無法彈出"
-#: mounthelper/tdeio_media_mounthelper.cpp:275
+#: mounthelper/tdeio_media_mounthelper.cpp:281
+msgid "Unknown decrypt error."
+msgstr ""
+
+#: mounthelper/tdeio_media_mounthelper.cpp:295
#, fuzzy
msgid "Decrypt given URL"
msgstr "卸載指定的URL位置"
-#: mounthelper/tdeio_media_mounthelper.cpp:276
+#: mounthelper/tdeio_media_mounthelper.cpp:296
msgid "Unmount given URL"
msgstr "卸載指定的URL位置"
-#: mounthelper/tdeio_media_mounthelper.cpp:277
+#: mounthelper/tdeio_media_mounthelper.cpp:297
msgid "Mount given URL (default)"
msgstr "掛載指定的URL位置(預設)"
-#: mounthelper/tdeio_media_mounthelper.cpp:278
+#: mounthelper/tdeio_media_mounthelper.cpp:298
msgid "Eject given URL via tdeeject"
msgstr "以tdeeject退出指定的URL位置"
-#: mounthelper/tdeio_media_mounthelper.cpp:279
+#: mounthelper/tdeio_media_mounthelper.cpp:299
msgid "Unmount and Eject given URL (necessary for some USB devices)"
msgstr "卸載及跳出指定的URL位置(某些USB裝置需要這樣做)"
-#: mounthelper/tdeio_media_mounthelper.cpp:280
+#: mounthelper/tdeio_media_mounthelper.cpp:300
msgid "media:/ URL to mount/unmount/eject/remove"
msgstr "進行掛載/卸載/跳出/移除的 media:/ URL"
@@ -467,43 +481,43 @@ msgstr "儲存變更時失敗"
msgid "&Mounting"
msgstr "掛載(&M)"
-#: tdefile-plugin/tdefilemediaplugin.cpp:190
+#: tdefile-plugin/tdefilemediaplugin.cpp:184
msgid "Medium Information"
msgstr "媒體資訊"
-#: tdefile-plugin/tdefilemediaplugin.cpp:193
+#: tdefile-plugin/tdefilemediaplugin.cpp:187
msgid "Free"
msgstr "可用"
-#: tdefile-plugin/tdefilemediaplugin.cpp:196
+#: tdefile-plugin/tdefilemediaplugin.cpp:190
msgid "Used"
msgstr "已用"
-#: tdefile-plugin/tdefilemediaplugin.cpp:199
+#: tdefile-plugin/tdefilemediaplugin.cpp:193
msgid "Total"
msgstr "總共"
-#: tdefile-plugin/tdefilemediaplugin.cpp:202
+#: tdefile-plugin/tdefilemediaplugin.cpp:196
msgid "Base URL"
msgstr "基礎網址"
-#: tdefile-plugin/tdefilemediaplugin.cpp:203
+#: tdefile-plugin/tdefilemediaplugin.cpp:197
msgid "Mount Point"
msgstr "掛載點"
-#: tdefile-plugin/tdefilemediaplugin.cpp:204
+#: tdefile-plugin/tdefilemediaplugin.cpp:198
msgid "Device Node"
msgstr "裝置節點"
-#: tdefile-plugin/tdefilemediaplugin.cpp:206
+#: tdefile-plugin/tdefilemediaplugin.cpp:200
msgid "Medium Summary"
msgstr "媒體概要"
-#: tdefile-plugin/tdefilemediaplugin.cpp:208
+#: tdefile-plugin/tdefilemediaplugin.cpp:202
msgid "Usage"
msgstr "使用情形"
-#: tdefile-plugin/tdefilemediaplugin.cpp:210
+#: tdefile-plugin/tdefilemediaplugin.cpp:204
msgid "Bar Graph"
msgstr "長條圖"
@@ -575,23 +589,30 @@ msgid ""
"devices are plugged in."
msgstr ""
-#: mediamanager/decryptdialog.ui:24 mounthelper/decryptdialog.ui:24
+#: mediamanager/unlockdialog.ui:24 mounthelper/unlockdialog.ui:24
#, no-c-format
msgid "Decrypting Storage Device"
msgstr ""
-#: mediamanager/decryptdialog.ui:109 mounthelper/decryptdialog.ui:109
+#: mediamanager/unlockdialog.ui:109
#, no-c-format
msgid ""
-"<p><b>%1</b> is an encrypted storage device.</p>\n"
-"<p>Please enter the password to decrypt the storage device.</p>"
+"<p><b>%1</b> is an encrypted locked storage device.</p>\n"
+"<p>Please enter the password to unlock the storage device.</p>"
msgstr ""
-#: mediamanager/decryptdialog.ui:131 mounthelper/decryptdialog.ui:131
+#: mediamanager/unlockdialog.ui:131 mounthelper/unlockdialog.ui:131
#, no-c-format
msgid "&Password:"
msgstr ""
+#: mounthelper/unlockdialog.ui:109
+#, no-c-format
+msgid ""
+"<p><b>%1</b> is an encrypted storage device.</p>\n"
+"<p>Please enter the password to decrypt the storage device.</p>"
+msgstr ""
+
#: propsdlgplugin/propertiespagegui.ui:16
#, no-c-format
msgid "PropertiesPageGUI"
@@ -836,3 +857,7 @@ msgstr "混合模式"
#, no-c-format
msgid "Filesystem: iso9660"
msgstr "檔案系統:iso9660"
+
+#, fuzzy
+#~ msgid "Permission denied"
+#~ msgstr "權限被拒"