Merge translation files from master branch.

1 files changed, 84 insertions, 61 deletions

diff --git a/translations/desktop_files/tdeioslave-desktops/sr@ijekavianlatin.po b/translations/desktop_files/tdeioslave-desktops/sr@ijekavianlatin.po
index 35683f003..f3fdee284 100644
--- a/translations/desktop_files/tdeioslave-desktops/sr@ijekavianlatin.po
+++ b/translations/desktop_files/tdeioslave-desktops/sr@ijekavianlatin.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 <LL@li.org>\n"
@@ -93,23 +93,28 @@ msgid "Blank DVD"
 msgstr ""
 
 #. Comment
-#: media/mimetypes/bluray_encrypted_locked.desktop:7
-msgid "Encrypted Locked BLURAY"
+#: media/mimetypes/bluray_mounted.desktop:6
+msgid "Mounted BLURAY"
 msgstr ""
 
 #. Comment
-#: media/mimetypes/bluray_encrypted_unlocked.desktop:7
-msgid "Encrypted Unlocked BLURAY"
+#: media/mimetypes/bluray_mounted_decrypted.desktop:7
+msgid "Mounted Decrypted BLURAY"
 msgstr ""
 
 #. Comment
-#: media/mimetypes/bluray_mounted.desktop:6
-msgid "Mounted BLURAY"
+#: media/mimetypes/bluray_unmounted.desktop:6
+msgid "Unmounted BLURAY"
 msgstr ""
 
 #. Comment
-#: media/mimetypes/bluray_unmounted.desktop:6
-msgid "Unmounted BLURAY"
+#: media/mimetypes/bluray_unmounted_decrypted.desktop:7
+msgid "Unmounted Decrypted BLURAY"
+msgstr ""
+
+#. Comment
+#: media/mimetypes/bluray_unmounted_encrypted.desktop:7
+msgid "Unmounted Encrypted BLURAY"
 msgstr ""
 
 #. Comment
@@ -128,18 +133,13 @@ msgid "Unmounted Camera"
 msgstr ""
 
 #. Comment
-#: media/mimetypes/cd-r_encrypted_locked.desktop:7
-msgid "Encrypted Locked CD-R"
+#: media/mimetypes/cd-r_mounted.desktop:6
+msgid "Mounted 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"
+#: media/mimetypes/cd-r_mounted_decrypted.desktop:7
+msgid "Mounted Decrypted CD-R"
 msgstr ""
 
 #. Comment
@@ -148,13 +148,13 @@ msgid "Unmounted CD-R"
 msgstr ""
 
 #. Comment
-#: media/mimetypes/cd-rw_encrypted_locked.desktop:7
-msgid "Encrypted Locked CD-RW"
+#: media/mimetypes/cd-r_unmounted_decrypted.desktop:7
+msgid "Unmounted Decrypted CD-R"
 msgstr ""
 
 #. Comment
-#: media/mimetypes/cd-rw_encrypted_unlocked.desktop:7
-msgid "Encrypted Unlocked CD-RW"
+#: media/mimetypes/cd-r_unmounted_encrypted.desktop:7
+msgid "Unmounted Encrypted CD-R"
 msgstr ""
 
 #. Comment
@@ -163,18 +163,23 @@ msgid "Mounted CD-RW"
 msgstr ""
 
 #. Comment
+#: media/mimetypes/cd-rw_mounted_decrypted.desktop:7
+msgid "Mounted Decrypted CD-RW"
+msgstr ""
+
+#. Comment
 #: media/mimetypes/cd-rw_unmounted.desktop:6
 msgid "Unmounted CD-RW"
 msgstr ""
 
 #. Comment
-#: media/mimetypes/cdrom_encrypted_locked.desktop:7
-msgid "Encrypted Locked CD-ROM"
+#: media/mimetypes/cd-rw_unmounted_decrypted.desktop:7
+msgid "Unmounted Decrypted CD-RW"
 msgstr ""
 
 #. Comment
-#: media/mimetypes/cdrom_encrypted_unlocked.desktop:7
-msgid "Encrypted Unlocked CD-ROM"
+#: media/mimetypes/cd-rw_unmounted_encrypted.desktop:7
+msgid "Unmounted Encrypted CD-RW"
 msgstr ""
 
 #. Comment
@@ -183,18 +188,23 @@ msgid "Mounted CD-ROM"
 msgstr ""
 
 #. Comment
+#: media/mimetypes/cdrom_mounted_decrypted.desktop:7
+msgid "Mounted Decrypted CD-ROM"
+msgstr ""
+
+#. Comment
 #: media/mimetypes/cdrom_unmounted.desktop:6
 msgid "Unmounted CD-ROM"
 msgstr ""
 
 #. Comment
-#: media/mimetypes/dvd_encrypted_locked.desktop:7
-msgid "Encrypted Locked DVD"
+#: media/mimetypes/cdrom_unmounted_decrypted.desktop:7
+msgid "Unmounted Decrypted CD-ROM"
 msgstr ""
 
 #. Comment
-#: media/mimetypes/dvd_encrypted_unlocked.desktop:7
-msgid "Encrypted Unlocked DVD"
+#: media/mimetypes/cdrom_unmounted_encrypted.desktop:7
+msgid "Unmounted Encrypted CD-ROM"
 msgstr ""
 
 #. Comment
@@ -203,11 +213,26 @@ msgid "Mounted DVD"
 msgstr ""
 
 #. Comment
+#: media/mimetypes/dvd_mounted_decrypted.desktop:7
+msgid "Mounted Decrypted DVD"
+msgstr ""
+
+#. Comment
 #: media/mimetypes/dvd_unmounted.desktop:6
 msgid "Unmounted DVD"
 msgstr ""
 
 #. Comment
+#: media/mimetypes/dvd_unmounted_decrypted.desktop:7
+msgid "Unmounted Decrypted DVD"
+msgstr ""
+
+#. Comment
+#: media/mimetypes/dvd_unmounted_encrypted.desktop:7
+msgid "Unmounted Encrypted DVD"
+msgstr ""
+
+#. Comment
 #: media/mimetypes/dvdvideo.desktop:6
 msgid "DVD Video Disk"
 msgstr ""
@@ -238,23 +263,28 @@ msgid "Camera"
 msgstr ""
 
 #. Comment
-#: media/mimetypes/hdd_encrypted_locked.desktop:7
-msgid "Encrypted Locked Hard Disk Volume"
+#: media/mimetypes/hdd_mounted.desktop:6
+msgid "Mounted Hard Disk Volume"
 msgstr ""
 
 #. Comment
-#: media/mimetypes/hdd_encrypted_unlocked.desktop:7
-msgid "Encrypted Unlocked Hard Disk Volume"
+#: media/mimetypes/hdd_mounted_decrypted.desktop:7
+msgid "Mounted Decrypted Hard Disk Volume"
 msgstr ""
 
 #. Comment
-#: media/mimetypes/hdd_mounted.desktop:6
-msgid "Mounted Hard Disk Volume"
+#: media/mimetypes/hdd_unmounted.desktop:6
+msgid "Unmounted Hard Disk Volume"
 msgstr ""
 
 #. Comment
-#: media/mimetypes/hdd_unmounted.desktop:6
-msgid "Unmounted Hard Disk Volume"
+#: media/mimetypes/hdd_unmounted_decrypted.desktop:7
+msgid "Unmounted Decrypted Hard Disk Volume"
+msgstr ""
+
+#. Comment
+#: media/mimetypes/hdd_unmounted_encrypted.desktop:7
+msgid "Unmounted Encrypted Hard Disk Volume"
 msgstr ""
 
 #. Comment
@@ -288,23 +318,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
@@ -325,7 +360,6 @@ msgstr ""
 #. Comment
 #. Name
 #: media/mimetypes/trash.desktop:7 system/entries/trash.desktop:7
-#: trash/kcmtrash.desktop:11
 msgid "Trash"
 msgstr ""
 
@@ -360,8 +394,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
@@ -400,7 +434,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 ""
 
@@ -502,17 +536,6 @@ msgstr ""
 msgid "Thumbnail Handler"
 msgstr ""
 
-#. 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