Merge translation files from master branch.

1 files changed, 0 insertions, 45 deletions

diff --git a/tde-i18n-sk/messages/tdebase/tdeio_media.po b/tde-i18n-sk/messages/tdebase/tdeio_media.po
index 6c096cd21bf..4bf68038781 100644
--- a/tde-i18n-sk/messages/tdebase/tdeio_media.po
+++ b/tde-i18n-sk/messages/tdebase/tdeio_media.po
@@ -69,7 +69,6 @@ msgstr "Neznáma chyba pripojenia."
 
 #: mediamanager/dialog.cpp:26 mounthelper/dialog.cpp:26
 #, fuzzy
-#| msgid "Decrypting Storage Device"
 msgid "Unlock Storage Device"
 msgstr "Dešifrovanie úložného zariadenia"
 
@@ -125,7 +124,6 @@ msgstr "Pevný disk"
 
 #: mediamanager/mediamanager.cpp:225 mediamanager/mediamanager.cpp:244
 #, fuzzy
-#| msgid "Feature only available with the TDE hardware backend"
 msgid "Feature only available with the TDE hardware or fstab backend"
 msgstr "Vlastnosť dostupná len pomocou hardvérovej podpory TDE"
 
@@ -141,7 +139,6 @@ msgstr "Odpojiteľné zariadenie %1"
 #: mediamanager/tdehardwarebackend.cpp:523
 #: mediamanager/tdehardwarebackend.cpp:779
 #, fuzzy
-#| msgid "%1 Removable Device"
 msgid "%1 Removable Disk (%2)"
 msgstr "Odpojiteľné zariadenie %1"
 
@@ -211,19 +208,16 @@ msgstr "Prázdne dvojvrstvové médium DVD+RW"
 
 #: mediamanager/tdehardwarebackend.cpp:692
 #, fuzzy
-#| msgid "Blank BD-ROM"
 msgid "Blank BLURAY-ROM"
 msgstr "Prázdne médium BD-ROM"
 
 #: mediamanager/tdehardwarebackend.cpp:702
 #, fuzzy
-#| msgid "Blank BD-R"
 msgid "Blank BLURAY-R"
 msgstr "Prázdne médium BD-R"
 
 #: mediamanager/tdehardwarebackend.cpp:712
 #, fuzzy
-#| msgid "Blank BD-RW"
 msgid "Blank BLURAY-RW"
 msgstr "Prázdne médium BD-RW"
 
@@ -257,7 +251,6 @@ msgstr "Disketová jednotka"
 
 #: mediamanager/tdehardwarebackend.cpp:886
 #, fuzzy
-#| msgid "%1 Fixed Disk (%2)"
 msgid "%1 Zip Disk (%2)"
 msgstr "%1 Pevný disk (%2)"
 
@@ -272,7 +265,6 @@ msgstr "%1 nie je pripojiteľné médium."
 
 #: mediamanager/tdehardwarebackend.cpp:1225
 #, fuzzy
-#| msgid "%1 is already unlocked."
 msgid "%1 is already mounted to %2."
 msgstr "%1 je už pripojené."
 
@@ -282,13 +274,11 @@ msgstr "%1 je už pripojené."
 #: mediamanager/tdehardwarebackend.cpp:1510
 #: mediamanager/tdehardwarebackend.cpp:1556
 #, fuzzy, c-format
-#| msgid "Internal error. Couldn't find medium."
 msgid "Internal error. Couldn't find medium id %1."
 msgstr "Vnútorná chyba. Nepodarilo sa nájsť médium."
 
 #: mediamanager/tdehardwarebackend.cpp:1282
 #, fuzzy
-#| msgid "Unable to mount this device."
 msgid "<b>Unable to mount this device.</b>"
 msgstr "Toto zariadenie sa nepodarilo pripojiť."
 
@@ -303,7 +293,6 @@ msgstr "<p>Technické podrobnosti:<br>"
 
 #: mediamanager/tdehardwarebackend.cpp:1336
 #, fuzzy
-#| msgid "%1 is already unlocked."
 msgid "%1 is already unmounted."
 msgstr "%1 je už pripojené."
 
@@ -311,9 +300,6 @@ msgstr "%1 je už pripojené."
 #: mediamanager/tdehardwarebackend.cpp:1405
 #: mediamanager/tdehardwarebackend.cpp:1661
 #, fuzzy
-#| msgid ""
-#| "Unfortunately, the device <b>%1</b> (%2) named <b>'%3'</b> and currently "
-#| "mounted at <b>%4</b> could not be unmounted. "
 msgid ""
 "The device <b>%1</b> (%2) named <b>'%3'</b> and currently mounted at <b>%4</"
 "b> could not be unmounted. "
@@ -323,11 +309,6 @@ msgstr ""
 
 #: mediamanager/tdehardwarebackend.cpp:1396
 #, fuzzy
-#| msgid ""
-#| "<qt>The device <b>%1</b> (%2) named <b>'%3'</b> and currently mounted at "
-#| "<b>%4</b> can not be unmounted at this time.<p>%5<p><b>Would you like to "
-#| "forcibly terminate these processes?</b><br><i>All unsaved data would be "
-#| "lost</i>"
 msgid ""
 "The device <b>%1</b> (%2) named <b>'%3'</b> and currently mounted at <b>%4</"
 "b> can not be unmounted at this time.<p>%5<p><b>Would you like to forcibly "
@@ -348,25 +329,21 @@ msgstr "%1 je už pripojené."
 
 #: mediamanager/tdehardwarebackend.cpp:1468
 #, fuzzy
-#| msgid "Unable to mount this device."
 msgid "<b>Unable to unlock the device.</b>"
 msgstr "Toto zariadenie sa nepodarilo pripojiť."
 
 #: mediamanager/tdehardwarebackend.cpp:1502
 #, fuzzy
-#| msgid "%1 is already unlocked."
 msgid "%1 is already locked."
 msgstr "%1 je už pripojené."
 
 #: mediamanager/tdehardwarebackend.cpp:1523
 #, fuzzy
-#| msgid "Unable to mount this device."
 msgid "<b>Unable to lock the device.</b>"
 msgstr "Toto zariadenie sa nepodarilo pripojiť."
 
 #: mediamanager/tdehardwarebackend.cpp:1564
 #, fuzzy
-#| msgid "Unable to mount this device."
 msgid "<b>Unable to eject the device.</b>"
 msgstr "Toto zariadenie sa nepodarilo pripojiť."
 
@@ -394,7 +371,6 @@ msgstr ""
 
 #: mounthelper/tdeio_media_mounthelper.cpp:53
 #, fuzzy
-#| msgid "The TDE mediamanager is not running."
 msgid "The TDE mediamanager is not running.\n"
 msgstr "Správca médií TDE nebeží."
 
@@ -408,19 +384,16 @@ msgstr ""
 
 #: mounthelper/tdeio_media_mounthelper.cpp:119
 #, fuzzy
-#| msgid "Unknown mount error."
 msgid "Unknown lock error."
 msgstr "Neznáma chyba pripojenia."
 
 #: mounthelper/tdeio_media_mounthelper.cpp:135
 #, fuzzy
-#| msgid "Unknown decrypt error."
 msgid "Unknown eject error."
 msgstr "Neznáma chyba dešifrovania."
 
 #: mounthelper/tdeio_media_mounthelper.cpp:162
 #, fuzzy
-#| msgid "Unknown mount error."
 msgid "Unknown safe removal error."
 msgstr "Neznáma chyba pripojenia."
 
@@ -434,19 +407,16 @@ msgstr "%1 sa nedá nájsť."
 
 #: mounthelper/tdeio_media_mounthelper.cpp:206
 #, fuzzy
-#| msgid "%1 is not an encrypted media."
 msgid "%1 is not a mountable or encrypted media."
 msgstr "%1 nie je šifrované médium."
 
 #: mounthelper/tdeio_media_mounthelper.cpp:304
 #, fuzzy
-#| msgid "Unknown unmount error."
 msgid "Unknown unlock error."
 msgstr "Neznáma chyba odpojenia."
 
 #: mounthelper/tdeio_media_mounthelper.cpp:317
 #, fuzzy
-#| msgid "Unmount given URL"
 msgid "Mount given URL"
 msgstr "Odpojiť zadanú URL"
 
@@ -456,19 +426,16 @@ msgstr "Odpojiť zadanú URL"
 
 #: mounthelper/tdeio_media_mounthelper.cpp:319
 #, fuzzy
-#| msgid "Unmount given URL"
 msgid "Unlock given URL"
 msgstr "Odpojiť zadanú URL"
 
 #: mounthelper/tdeio_media_mounthelper.cpp:320
 #, fuzzy
-#| msgid "Decrypt given URL"
 msgid "Lock given URL"
 msgstr "Dešifrovať zadanú adresu URL"
 
 #: mounthelper/tdeio_media_mounthelper.cpp:321
 #, fuzzy
-#| msgid "Decrypt given URL"
 msgid "Eject given URL"
 msgstr "Dešifrovať zadanú adresu URL"
 
@@ -482,7 +449,6 @@ msgstr ""
 
 #: mounthelper/tdeio_media_mounthelper.cpp:324
 #, fuzzy
-#| msgid "media:/ URL to mount/unmount/eject/remove"
 msgid "media:/URL to mount/unmount/unlock/lock/eject/remove"
 msgstr "media:/ URL pre pripojenie/odpojenie/vysunutie/odstránenie"
 
@@ -595,15 +561,11 @@ msgstr ""
 
 #: libmediacommon/mediamanagersettings.kcfg:23
 #, fuzzy, no-c-format
-#| msgid "Enable notification popups"
 msgid "Enable notification dialogs popups"
 msgstr "Povoliť kontextové okná s upozorneniami"
 
 #: libmediacommon/mediamanagersettings.kcfg:24
 #, fuzzy, no-c-format
-#| msgid ""
-#| "Deselect this if you do not want action request popups to be generated "
-#| "when devices are plugged in."
 msgid ""
 "Deselect this if you do not want action request dialog popups to be "
 "generated when devices are plugged in."
@@ -613,15 +575,11 @@ msgstr ""
 
 #: libmediacommon/mediamanagersettings.kcfg:28
 #, fuzzy, no-c-format
-#| msgid "Enable notification popups"
 msgid "Enable device monitor notification popups"
 msgstr "Povoliť kontextové okná s upozorneniami"
 
 #: libmediacommon/mediamanagersettings.kcfg:29
 #, fuzzy, no-c-format
-#| msgid ""
-#| "Deselect this if you do not want action request popups to be generated "
-#| "when devices are plugged in."
 msgid ""
 "Deselect this if you do not want device monitoring popups to be generated "
 "when devices are added, modified or removed."
@@ -650,9 +608,6 @@ msgstr "&Heslo:"
 
 #: mounthelper/unlockdialog.ui:109
 #, fuzzy, no-c-format
-#| msgid ""
-#| "<p><b>%1</b> is an encrypted locked storage device.</p>\n"
-#| "<p>Please enter the password to unlock the storage device.</p>"
 msgid ""
 "<p><b>%1</b> is an encrypted storage device.</p>\n"
 "<p>Please enter the password to unlock the storage device.</p>"