Merge translation files from master branch.

2 files changed, 36 insertions, 6 deletions

diff --git a/tde-i18n-nl/messages/tdebase/kcmhwmanager.po b/tde-i18n-nl/messages/tdebase/kcmhwmanager.po
index 8595ec29a19..2f8d9f2ce8b 100644
--- a/tde-i18n-nl/messages/tdebase/kcmhwmanager.po
+++ b/tde-i18n-nl/messages/tdebase/kcmhwmanager.po
@@ -753,13 +753,19 @@ msgstr "Filteren op naam:"
 #~ msgstr "MD5-samenvatting"
 
 #, fuzzy
+#~| msgid "Unfortunately, the device could not be unmounted."
+#~ msgid "<b>The device could not be unmounted.</b>"
+#~ msgstr "Het apparaat kan niet worden aangekoppeld."
+
+#, fuzzy
 #~| 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"
 #~ 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>Dit apparaat kan niet worden aangekoppeld.<p>Mogelijke redenen "
 #~ "hiervoor zijn:<br>onjuist apparaat en/of onjuiste "
@@ -771,11 +777,6 @@ msgstr "Filteren op naam:"
 #~ msgstr "Afkoppelen mislukt"
 
 #, fuzzy
-#~| msgid "Unfortunately, the device could not be unmounted."
-#~ msgid "Unfortunately, the device could not be locked."
-#~ msgstr "Het apparaat kan niet worden aangekoppeld."
-
-#, fuzzy
 #~| msgid "Mount Failed"
 #~ msgid "Lock Failed"
 #~ msgstr "Aankoppelen mislukt"
@@ -954,6 +955,24 @@ msgstr "Filteren op naam:"
 #~ msgstr "Voer uw wachtwoord in"
 
 #, fuzzy
+#~| msgid "Unfortunately, the device could not be unmounted."
+#~ msgid "Unfortunately, the device could not be locked."
+#~ msgstr "Het apparaat kan niet worden aangekoppeld."
+
+#, fuzzy
+#~| 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"
+#~ 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>Dit apparaat kan niet worden aangekoppeld.<p>Mogelijke redenen "
+#~ "hiervoor zijn:<br>onjuist apparaat en/of onjuiste "
+#~ "toegangsrechten<br>Corrupte gegevens op het apparaat"
+
+#, fuzzy
 #~| msgid ""
 #~| "<qt>Unable to mount this device.<p>Potential reasons include:"
 #~| "<br>Improper device and/or user privilege level<br>Corrupt data on "
diff --git a/tde-i18n-nl/messages/tdebase/tdeio_media.po b/tde-i18n-nl/messages/tdebase/tdeio_media.po
index 3b309746b71..c2877835a33 100644
--- a/tde-i18n-nl/messages/tdebase/tdeio_media.po
+++ b/tde-i18n-nl/messages/tdebase/tdeio_media.po
@@ -878,6 +878,17 @@ msgstr "Bestandssysteem: iso9660"
 #~ msgstr "Station is reeds aangekoppeld."
 
 #, 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 ""
+#~ "Het apparaat <b>%1</b> (%2) genaamd <b>'%3'</b>, dat is aangekoppeld op "
+#~ "<b>%4</b> kon niet worden afgekoppeld"
+
+#, fuzzy
 #~| msgid "The TDE mediamanager is not running."
 #~ msgid "The TDE mediamanager is not running.\n"
 #~ msgstr "De TDE-mediabeheerder draait niet."