Merge translation files from master branch.

1 files changed, 113 insertions, 72 deletions

diff --git a/translations/desktop_files/tdeioslave-desktops/cy.po b/translations/desktop_files/tdeioslave-desktops/cy.po
index d85182eed..e865f694f 100644
--- a/translations/desktop_files/tdeioslave-desktops/cy.po
+++ b/translations/desktop_files/tdeioslave-desktops/cy.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-25 18:45+0200\n"
+"POT-Creation-Date: 2020-06-29 00:09+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <[email protected]>\n"
@@ -93,26 +93,34 @@ msgid "Blank DVD"
 msgstr ""
 
 #. Comment
-#: media/mimetypes/bluray_encrypted_locked.desktop:7
-msgid "Encrypted Locked BLURAY"
-msgstr ""
-
-#. Comment
-#: media/mimetypes/bluray_encrypted_unlocked.desktop:7
-msgid "Encrypted Unlocked BLURAY"
-msgstr ""
-
-#. Comment
 #: media/mimetypes/bluray_mounted.desktop:6
 msgid "Mounted BLURAY"
 msgstr "BLURAY wedi'i osod"
 
 #. Comment
+#: media/mimetypes/bluray_mounted_decrypted.desktop:7
+#, fuzzy
+msgid "Mounted Decrypted BLURAY"
+msgstr "BLURAY wedi'i osod"
+
+#. Comment
 #: media/mimetypes/bluray_unmounted.desktop:6
 msgid "Unmounted BLURAY"
 msgstr "BLURAY wedi'i ddadosod"
 
 #. Comment
+#: media/mimetypes/bluray_unmounted_decrypted.desktop:7
+#, fuzzy
+msgid "Unmounted Decrypted BLURAY"
+msgstr "BLURAY wedi'i ddadosod"
+
+#. Comment
+#: media/mimetypes/bluray_unmounted_encrypted.desktop:7
+#, fuzzy
+msgid "Unmounted Encrypted BLURAY"
+msgstr "BLURAY wedi'i ddadosod"
+
+#. Comment
 #: media/mimetypes/blurayvideo.desktop:6
 msgid "BLURAY Video Disk"
 msgstr ""
@@ -130,34 +138,32 @@ msgid "Unmounted Camera"
 msgstr "Ysgrifennwr CD wedi'i ddadosod"
 
 #. Comment
-#: media/mimetypes/cd-r_encrypted_locked.desktop:7
-msgid "Encrypted Locked CD-R"
-msgstr ""
-
-#. Comment
-#: media/mimetypes/cd-r_encrypted_unlocked.desktop:7
-msgid "Encrypted Unlocked CD-R"
-msgstr ""
-
-#. Comment
 #: media/mimetypes/cd-r_mounted.desktop:6
 msgid "Mounted CD-R"
 msgstr "Ysgrifennwr CD wedi'i osod"
 
 #. Comment
+#: media/mimetypes/cd-r_mounted_decrypted.desktop:7
+#, fuzzy
+msgid "Mounted Decrypted CD-R"
+msgstr "Ysgrifennwr CD wedi'i osod"
+
+#. Comment
 #: media/mimetypes/cd-r_unmounted.desktop:6
 msgid "Unmounted CD-R"
 msgstr "Ysgrifennwr CD wedi'i ddadosod"
 
 #. Comment
-#: media/mimetypes/cd-rw_encrypted_locked.desktop:7
-msgid "Encrypted Locked CD-RW"
-msgstr ""
+#: media/mimetypes/cd-r_unmounted_decrypted.desktop:7
+#, fuzzy
+msgid "Unmounted Decrypted CD-R"
+msgstr "Ysgrifennwr CD wedi'i ddadosod"
 
 #. Comment
-#: media/mimetypes/cd-rw_encrypted_unlocked.desktop:7
-msgid "Encrypted Unlocked CD-RW"
-msgstr ""
+#: media/mimetypes/cd-r_unmounted_encrypted.desktop:7
+#, fuzzy
+msgid "Unmounted Encrypted CD-R"
+msgstr "Ysgrifennwr CD wedi'i ddadosod"
 
 #. Comment
 #: media/mimetypes/cd-rw_mounted.desktop:6
@@ -165,19 +171,27 @@ msgid "Mounted CD-RW"
 msgstr "Ysgrifennwr CD wedi'i osod"
 
 #. Comment
+#: media/mimetypes/cd-rw_mounted_decrypted.desktop:7
+#, fuzzy
+msgid "Mounted Decrypted CD-RW"
+msgstr "Ysgrifennwr CD wedi'i osod"
+
+#. Comment
 #: media/mimetypes/cd-rw_unmounted.desktop:6
 msgid "Unmounted CD-RW"
 msgstr "Ysgrifennwr CD wedi'i ddadosod"
 
 #. Comment
-#: media/mimetypes/cdrom_encrypted_locked.desktop:7
-msgid "Encrypted Locked CD-ROM"
-msgstr ""
+#: media/mimetypes/cd-rw_unmounted_decrypted.desktop:7
+#, fuzzy
+msgid "Unmounted Decrypted CD-RW"
+msgstr "Ysgrifennwr CD wedi'i ddadosod"
 
 #. Comment
-#: media/mimetypes/cdrom_encrypted_unlocked.desktop:7
-msgid "Encrypted Unlocked CD-ROM"
-msgstr ""
+#: media/mimetypes/cd-rw_unmounted_encrypted.desktop:7
+#, fuzzy
+msgid "Unmounted Encrypted CD-RW"
+msgstr "Ysgrifennwr CD wedi'i ddadosod"
 
 #. Comment
 #: media/mimetypes/cdrom_mounted.desktop:6
@@ -185,19 +199,27 @@ msgid "Mounted CD-ROM"
 msgstr "CD-ROM wedi ei osod"
 
 #. Comment
+#: media/mimetypes/cdrom_mounted_decrypted.desktop:7
+#, fuzzy
+msgid "Mounted Decrypted CD-ROM"
+msgstr "CD-ROM wedi ei osod"
+
+#. Comment
 #: media/mimetypes/cdrom_unmounted.desktop:6
 msgid "Unmounted CD-ROM"
 msgstr "CD-ROM wedi'i ddadosod"
 
 #. Comment
-#: media/mimetypes/dvd_encrypted_locked.desktop:7
-msgid "Encrypted Locked DVD"
-msgstr ""
+#: media/mimetypes/cdrom_unmounted_decrypted.desktop:7
+#, fuzzy
+msgid "Unmounted Decrypted CD-ROM"
+msgstr "CD-ROM wedi'i ddadosod"
 
 #. Comment
-#: media/mimetypes/dvd_encrypted_unlocked.desktop:7
-msgid "Encrypted Unlocked DVD"
-msgstr ""
+#: media/mimetypes/cdrom_unmounted_encrypted.desktop:7
+#, fuzzy
+msgid "Unmounted Encrypted CD-ROM"
+msgstr "CD-ROM wedi'i ddadosod"
 
 #. Comment
 #: media/mimetypes/dvd_mounted.desktop:6
@@ -205,11 +227,29 @@ msgid "Mounted DVD"
 msgstr "DVD wedi'i osod"
 
 #. Comment
+#: media/mimetypes/dvd_mounted_decrypted.desktop:7
+#, fuzzy
+msgid "Mounted Decrypted DVD"
+msgstr "DVD wedi'i osod"
+
+#. Comment
 #: media/mimetypes/dvd_unmounted.desktop:6
 msgid "Unmounted DVD"
 msgstr "DVD wedi'i ddadosod"
 
 #. Comment
+#: media/mimetypes/dvd_unmounted_decrypted.desktop:7
+#, fuzzy
+msgid "Unmounted Decrypted DVD"
+msgstr "DVD wedi'i ddadosod"
+
+#. Comment
+#: media/mimetypes/dvd_unmounted_encrypted.desktop:7
+#, fuzzy
+msgid "Unmounted Encrypted DVD"
+msgstr "DVD wedi'i ddadosod"
+
+#. Comment
 #: media/mimetypes/dvdvideo.desktop:6
 msgid "DVD Video Disk"
 msgstr ""
@@ -240,28 +280,36 @@ msgid "Camera"
 msgstr ""
 
 #. Comment
-#: media/mimetypes/hdd_encrypted_locked.desktop:7
-msgid "Encrypted Locked Hard Disk Volume"
-msgstr ""
-
-#. Comment
-#: media/mimetypes/hdd_encrypted_unlocked.desktop:7
-msgid "Encrypted Unlocked Hard Disk Volume"
-msgstr ""
-
-#. Comment
 #: media/mimetypes/hdd_mounted.desktop:6
 #, fuzzy
 msgid "Mounted Hard Disk Volume"
 msgstr "Disg Zip wedi'i osod "
 
 #. Comment
+#: media/mimetypes/hdd_mounted_decrypted.desktop:7
+#, fuzzy
+msgid "Mounted Decrypted Hard Disk Volume"
+msgstr "Disg Zip wedi'i osod "
+
+#. Comment
 #: media/mimetypes/hdd_unmounted.desktop:6
 #, fuzzy
 msgid "Unmounted Hard Disk Volume"
 msgstr "Disg Zip wedi'i ddadosod"
 
 #. Comment
+#: media/mimetypes/hdd_unmounted_decrypted.desktop:7
+#, fuzzy
+msgid "Unmounted Decrypted Hard Disk Volume"
+msgstr "Disg Zip wedi'i ddadosod"
+
+#. Comment
+#: media/mimetypes/hdd_unmounted_encrypted.desktop:7
+#, fuzzy
+msgid "Unmounted Encrypted Hard Disk Volume"
+msgstr "Disg Zip wedi'i ddadosod"
+
+#. Comment
 #: media/mimetypes/mycomputer.desktop:6
 msgid "My Computer"
 msgstr ""
@@ -293,23 +341,28 @@ msgid "Printers"
 msgstr ""
 
 #. Comment
-#: media/mimetypes/removable_encrypted_locked.desktop:7
-msgid "Encrypted Locked Removable Medium"
+#: media/mimetypes/removable_mounted.desktop:6
+msgid "Mounted Removable Medium"
 msgstr ""
 
 #. Comment
-#: media/mimetypes/removable_encrypted_unlocked.desktop:7
-msgid "Encrypted Unlocked Removable Medium"
+#: media/mimetypes/removable_mounted_decrypted.desktop:7
+msgid "Mounted Decrypted Removable Medium"
 msgstr ""
 
 #. Comment
-#: media/mimetypes/removable_mounted.desktop:6
-msgid "Mounted Removable Medium"
+#: media/mimetypes/removable_unmounted.desktop:6
+msgid "Unmounted Removable Medium"
 msgstr ""
 
 #. Comment
-#: media/mimetypes/removable_unmounted.desktop:6
-msgid "Unmounted Removable Medium"
+#: media/mimetypes/removable_unmounted_decrypted.desktop:7
+msgid "Unmounted Decrypted Removable Medium"
+msgstr ""
+
+#. Comment
+#: media/mimetypes/removable_unmounted_encrypted.desktop:7
+msgid "Unmounted Encrypted Removable Medium"
 msgstr ""
 
 #. Comment
@@ -330,7 +383,6 @@ msgstr ""
 #. Comment
 #. Name
 #: media/mimetypes/trash.desktop:7 system/entries/trash.desktop:7
-#: trash/kcmtrash.desktop:11
 msgid "Trash"
 msgstr "Sbwriel"
 
@@ -365,8 +417,8 @@ msgid "Konqueror properties dialog plugin to configure mount behaviour"
 msgstr ""
 
 #. Name
-#: media/services/media_decrypt.desktop:8
-msgid "Unlock"
+#: media/services/media_decrypt.desktop:6
+msgid "Decrypt"
 msgstr ""
 
 #. Name
@@ -405,7 +457,7 @@ msgid "storage;media;usb;cdrom;device;"
 msgstr ""
 
 #. Name
-#: media/tdefile-plugin/tdefile_media.desktop:6
+#: media/tdefile-plugin/tdefile_media.desktop:8
 msgid "Medium Information"
 msgstr ""
 
@@ -510,17 +562,6 @@ msgstr "Ffeiliau Testun"
 msgid "Thumbnail Handler"
 msgstr "Trinydd Lluniau Cryno"
 
-#. Comment
-#. Name
-#: trash/kcmtrash.desktop:13 trash/ktrashpropsdlgplugin.desktop:7
-msgid "Trash Properties"
-msgstr ""
-
-#. Keywords
-#: trash/kcmtrash.desktop:15
-msgid "trash;properties;size;limits;delete"
-msgstr ""
-
 #. Name
 #: trash/tdefile-plugin/tdefile_trash.desktop:4
 #: trash/tdefile-plugin/tdefile_trash_system.desktop:4