Merge translation files from master branch.

2 files changed, 60 insertions, 11 deletions

diff --git a/tde-i18n-sk/messages/tdebase/kcmhwmanager.po b/tde-i18n-sk/messages/tdebase/kcmhwmanager.po
index 10dee629eb5..2ed395e166e 100644
--- a/tde-i18n-sk/messages/tdebase/kcmhwmanager.po
+++ b/tde-i18n-sk/messages/tdebase/kcmhwmanager.po
@@ -751,22 +751,31 @@ msgstr "Filtrovať podľa názvu:"
 #~ msgid "MD5 Digest"
 #~ msgstr "Odtlačok MD5"
 
+#, fuzzy
+#~| msgid "Unfortunately, the device could not be unmounted."
+#~ msgid "<b>The device could not be unmounted.</b>"
+#~ msgstr "Zariadenie sa bohužiaľ nepodarilo odpojiť."
+
+#, fuzzy
+#~| msgid ""
+#~| "<qt>Unable to unlock this device.<p>Potential reasons include:<br>Wrong "
+#~| "password and/or user privilege level.<br>Corrupt data on storage device."
 #~ msgid ""
 #~ "<qt>Unable to unlock this device.<p>Potential reasons include:<br>Wrong "
-#~ "password and/or user privilege level.<br>Corrupt data on storage device."
+#~ "password and/or user privilege level.<br>Corrupt data on storage device.</"
+#~ "qt>"
 #~ msgstr ""
 #~ "<qt>Toto zariadenie sa nedá odomknúť.<p>Možné príčiny sú:<br>Nesprávne "
 #~ "heslo a/alebo úroveň oprávnenia používateľa.<br>Poškodené údaje na "
 #~ "ukladacom zariadení."
 
-#~ msgid "Unknown unlock error."
-#~ msgstr "Neznáma chyba odomykania."
-
 #~ msgid "Unlock Failed"
 #~ msgstr "Odomknutie zlyhalo"
 
-#~ msgid "Unfortunately, the device could not be locked."
-#~ msgstr "Bohužiaľ, zariadenie nie je možné odomknúť."
+#, fuzzy
+#~| msgid "Unlock Storage Device"
+#~ msgid "Unable to lock the device."
+#~ msgstr "Odomknúť ukladacie zariadenia"
 
 #~ msgid "Lock Failed"
 #~ msgstr "Uzamknutie zlyhalo"
@@ -950,6 +959,15 @@ msgstr "Filtrovať podľa názvu:"
 #~ msgid "Decrypting Storage Device"
 #~ msgstr "Dešifrujem ukladacie zaradenie"
 
+#~ msgid "&Password:"
+#~ msgstr "&Heslo:"
+
+#~ msgid "Unknown unlock error."
+#~ msgstr "Neznáma chyba odomykania."
+
+#~ msgid "Unfortunately, the device could not be locked."
+#~ msgstr "Bohužiaľ, zariadenie nie je možné odomknúť."
+
 #~ msgid ""
 #~ "<p><b>%1</b> is an encrypted storage device.</p>\n"
 #~ "<p>Please enter the password to unlock the storage device.</p>"
@@ -957,8 +975,13 @@ msgstr "Filtrovať podľa názvu:"
 #~ "<p><b>%1</b>je zašifrované ukladacie zariedenie.</p>\n"
 #~ "<p>Prosím vložte heslo na odomknutie ukladacieho zariadenia.</p>"
 
-#~ msgid "&Password:"
-#~ msgstr "&Heslo:"
+#~ msgid ""
+#~ "<qt>Unable to unlock this device.<p>Potential reasons include:<br>Wrong "
+#~ "password and/or user privilege level.<br>Corrupt data on storage device."
+#~ msgstr ""
+#~ "<qt>Toto zariadenie sa nedá odomknúť.<p>Možné príčiny sú:<br>Nesprávne "
+#~ "heslo a/alebo úroveň oprávnenia používateľa.<br>Poškodené údaje na "
+#~ "ukladacom zariadení."
 
 #, fuzzy
 #~| msgid ""
diff --git a/tde-i18n-sk/messages/tdebase/tdeio_media.po b/tde-i18n-sk/messages/tdebase/tdeio_media.po
index 03dc3334ca2..29578ff99f7 100644
--- a/tde-i18n-sk/messages/tdebase/tdeio_media.po
+++ b/tde-i18n-sk/messages/tdebase/tdeio_media.po
@@ -909,11 +909,24 @@ msgstr "Súborový systém: iso9660"
 #~ msgid "Internal error. Couldn't find medium id %1."
 #~ msgstr "Vnútorná chyba. Nepodarilo sa nájsť médium."
 
-#~ msgid "Unable to mount this device."
+#, fuzzy
+#~| msgid "Unable to mount this device."
+#~ msgid "<b>Unable to mount this device.</b>"
 #~ msgstr "Toto zariadenie sa nepodarilo pripojiť."
 
 #, 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. "
+#~ 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ť. "
+
+#, 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 "
@@ -931,12 +944,12 @@ msgstr "Súborový systém: iso9660"
 
 #, fuzzy
 #~| msgid "Unable to mount this device."
-#~ msgid "Unable to unlock the device."
+#~ msgid "<b>Unable to unlock the device.</b>"
 #~ msgstr "Toto zariadenie sa nepodarilo pripojiť."
 
 #, fuzzy
 #~| msgid "Unable to mount this device."
-#~ msgid "Unable to lock the device."
+#~ msgid "<b>Unable to lock the device.</b>"
 #~ msgstr "Toto zariadenie sa nepodarilo pripojiť."
 
 #, fuzzy
@@ -1021,6 +1034,19 @@ msgstr "Súborový systém: iso9660"
 #~ msgid "Unknown decrypt error."
 #~ msgstr "Neznáma chyba dešifrovania."
 
+#~ msgid "Unable to mount this device."
+#~ msgstr "Toto zariadenie sa nepodarilo pripojiť."
+
+#, fuzzy
+#~| msgid "Unable to mount this device."
+#~ msgid "Unable to unlock the device."
+#~ msgstr "Toto zariadenie sa nepodarilo pripojiť."
+
+#, fuzzy
+#~| msgid "Unable to mount this device."
+#~ msgid "Unable to lock the device."
+#~ msgstr "Toto zariadenie sa nepodarilo pripojiť."
+
 #~ msgid "Internal error. Couldn't find medium."
 #~ msgstr "Vnútorná chyba. Nepodarilo sa nájsť médium."