Merge translation files from master branch.

1 files changed, 134 insertions, 75 deletions

diff --git a/translations/desktop_files/tdeioslave-desktops/sr.po b/translations/desktop_files/tdeioslave-desktops/sr.po
index cec04e30c..3fc45e7bf 100644
--- a/translations/desktop_files/tdeioslave-desktops/sr.po
+++ b/translations/desktop_files/tdeioslave-desktops/sr.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,26 +93,34 @@ msgid "Blank DVD"
 msgstr "Празан DVD"
 
 #. 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"
 
 #. Comment
+#: media/mimetypes/bluray_mounted_decrypted.desktop:7
+#, fuzzy
+msgid "Mounted Decrypted BLURAY"
+msgstr "Монтиран BLURAY"
+
+#. Comment
 #: media/mimetypes/bluray_unmounted.desktop:6
 msgid "Unmounted BLURAY"
 msgstr "Демонтиран BLURAY"
 
 #. Comment
+#: media/mimetypes/bluray_unmounted_decrypted.desktop:7
+#, fuzzy
+msgid "Unmounted Decrypted BLURAY"
+msgstr "Демонтиран BLURAY"
+
+#. Comment
+#: media/mimetypes/bluray_unmounted_encrypted.desktop:7
+#, fuzzy
+msgid "Unmounted Encrypted BLURAY"
+msgstr "Демонтиран BLURAY"
+
+#. Comment
 #: media/mimetypes/blurayvideo.desktop:6
 msgid "BLURAY Video Disk"
 msgstr "BLURAY видео диск"
@@ -128,34 +136,32 @@ msgid "Unmounted Camera"
 msgstr "Демонтирана камера"
 
 #. 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 "Монтиран CD резач"
 
 #. Comment
+#: media/mimetypes/cd-r_mounted_decrypted.desktop:7
+#, fuzzy
+msgid "Mounted Decrypted CD-R"
+msgstr "Монтиран CD резач"
+
+#. Comment
 #: media/mimetypes/cd-r_unmounted.desktop:6
 msgid "Unmounted CD-R"
 msgstr "Демонтиран CD резач"
 
 #. 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 "Демонтиран CD резач"
 
 #. 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 "Демонтиран CD резач"
 
 #. Comment
 #: media/mimetypes/cd-rw_mounted.desktop:6
@@ -163,19 +169,27 @@ msgid "Mounted CD-RW"
 msgstr "Монтиран CD резач"
 
 #. Comment
+#: media/mimetypes/cd-rw_mounted_decrypted.desktop:7
+#, fuzzy
+msgid "Mounted Decrypted CD-RW"
+msgstr "Монтиран CD резач"
+
+#. Comment
 #: media/mimetypes/cd-rw_unmounted.desktop:6
 msgid "Unmounted CD-RW"
 msgstr "Демонтиран CD резач"
 
 #. 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 "Демонтиран CD резач"
 
 #. 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 "Демонтиран CD резач"
 
 #. Comment
 #: media/mimetypes/cdrom_mounted.desktop:6
@@ -183,19 +197,27 @@ msgid "Mounted CD-ROM"
 msgstr "Монитран CD-ROM"
 
 #. Comment
+#: media/mimetypes/cdrom_mounted_decrypted.desktop:7
+#, fuzzy
+msgid "Mounted Decrypted CD-ROM"
+msgstr "Монитран CD-ROM"
+
+#. Comment
 #: media/mimetypes/cdrom_unmounted.desktop:6
 msgid "Unmounted CD-ROM"
 msgstr "Демонтиран CD-ROM"
 
 #. 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"
 
 #. 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"
 
 #. Comment
 #: media/mimetypes/dvd_mounted.desktop:6
@@ -203,11 +225,29 @@ msgid "Mounted DVD"
 msgstr "Монтиран DVD"
 
 #. Comment
+#: media/mimetypes/dvd_mounted_decrypted.desktop:7
+#, fuzzy
+msgid "Mounted Decrypted DVD"
+msgstr "Монтиран DVD"
+
+#. Comment
 #: media/mimetypes/dvd_unmounted.desktop:6
 msgid "Unmounted DVD"
 msgstr "Демонтиран DVD"
 
 #. Comment
+#: media/mimetypes/dvd_unmounted_decrypted.desktop:7
+#, fuzzy
+msgid "Unmounted Decrypted DVD"
+msgstr "Демонтиран DVD"
+
+#. Comment
+#: media/mimetypes/dvd_unmounted_encrypted.desktop:7
+#, fuzzy
+msgid "Unmounted Encrypted DVD"
+msgstr "Демонтиран DVD"
+
+#. Comment
 #: media/mimetypes/dvdvideo.desktop:6
 msgid "DVD Video Disk"
 msgstr "DVD видео диск"
@@ -238,20 +278,14 @@ msgid "Camera"
 msgstr "Камера"
 
 #. Comment
-#: media/mimetypes/hdd_encrypted_locked.desktop:7
-#, fuzzy
-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
+#: media/mimetypes/hdd_mounted_decrypted.desktop:7
 #, fuzzy
-msgid "Encrypted Unlocked Hard Disk Volume"
-msgstr "Демонтирана партиција хард диска"
-
-#. Comment
-#: media/mimetypes/hdd_mounted.desktop:6
-msgid "Mounted Hard Disk Volume"
+msgid "Mounted Decrypted Hard Disk Volume"
 msgstr "Монтирана партиција хард диска"
 
 #. Comment
@@ -260,6 +294,18 @@ msgid "Unmounted Hard Disk Volume"
 msgstr "Демонтирана партиција хард диска"
 
 #. Comment
+#: media/mimetypes/hdd_unmounted_decrypted.desktop:7
+#, fuzzy
+msgid "Unmounted Decrypted Hard Disk Volume"
+msgstr "Демонтирана партиција хард диска"
+
+#. Comment
+#: media/mimetypes/hdd_unmounted_encrypted.desktop:7
+#, fuzzy
+msgid "Unmounted Encrypted Hard Disk Volume"
+msgstr "Демонтирана партиција хард диска"
+
+#. Comment
 #: media/mimetypes/mycomputer.desktop:6
 msgid "My Computer"
 msgstr ""
@@ -291,20 +337,14 @@ msgid "Printers"
 msgstr ""
 
 #. Comment
-#: media/mimetypes/removable_encrypted_locked.desktop:7
-#, fuzzy
-msgid "Encrypted Locked Removable Medium"
+#: media/mimetypes/removable_mounted.desktop:6
+msgid "Mounted Removable Medium"
 msgstr "Монтиран уклоњиви медијум"
 
 #. Comment
-#: media/mimetypes/removable_encrypted_unlocked.desktop:7
+#: media/mimetypes/removable_mounted_decrypted.desktop:7
 #, fuzzy
-msgid "Encrypted Unlocked Removable Medium"
-msgstr "Демонтиран уклоњиви медијум"
-
-#. Comment
-#: media/mimetypes/removable_mounted.desktop:6
-msgid "Mounted Removable Medium"
+msgid "Mounted Decrypted Removable Medium"
 msgstr "Монтиран уклоњиви медијум"
 
 #. Comment
@@ -313,6 +353,18 @@ msgid "Unmounted Removable Medium"
 msgstr "Демонтиран уклоњиви медијум"
 
 #. Comment
+#: media/mimetypes/removable_unmounted_decrypted.desktop:7
+#, fuzzy
+msgid "Unmounted Decrypted Removable Medium"
+msgstr "Демонтиран уклоњиви медијум"
+
+#. Comment
+#: media/mimetypes/removable_unmounted_encrypted.desktop:7
+#, fuzzy
+msgid "Unmounted Encrypted Removable Medium"
+msgstr "Демонтиран уклоњиви медијум"
+
+#. Comment
 #: media/mimetypes/smb_mounted.desktop:6
 msgid "Mounted Samba (Microsoft Network) Share"
 msgstr "Монтирано Samba дељење (Microsoft-ова мрежа)"
@@ -330,7 +382,6 @@ msgstr "Супер видео CD"
 #. Comment
 #. Name
 #: media/mimetypes/trash.desktop:7 system/entries/trash.desktop:7
-#: trash/kcmtrash.desktop:11
 msgid "Trash"
 msgstr "Смеће"
 
@@ -366,8 +417,8 @@ msgstr ""
 "Прикључак са својствима Konqueror-а за подешавање понашања при монтирању"
 
 #. Name
-#: media/services/media_decrypt.desktop:8
-msgid "Unlock"
+#: media/services/media_decrypt.desktop:6
+msgid "Decrypt"
 msgstr ""
 
 #. Name
@@ -406,7 +457,7 @@ msgid "storage;media;usb;cdrom;device;"
 msgstr "storage;media;usb;cdrom;device;складиштење;медијум;уређај;"
 
 #. Name
-#: media/tdefile-plugin/tdefile_media.desktop:6
+#: media/tdefile-plugin/tdefile_media.desktop:8
 msgid "Medium Information"
 msgstr "Информације о медијуму"
 
@@ -510,18 +561,6 @@ msgstr "Текстуални фајлови"
 msgid "Thumbnail Handler"
 msgstr "Управљач сличицама"
 
-#. Comment
-#. Name
-#: trash/kcmtrash.desktop:13 trash/ktrashpropsdlgplugin.desktop:7
-#, fuzzy
-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
@@ -552,3 +591,23 @@ msgstr "Kioslave за SFTP"
 #: trash/trash.protocol:25
 msgid "Original Path,Deletion Date"
 msgstr "првобитна путања,датум брисања"
+
+#, fuzzy
+#~ msgid "Encrypted Locked Hard Disk Volume"
+#~ msgstr "Монтирана партиција хард диска"
+
+#, fuzzy
+#~ msgid "Encrypted Unlocked Hard Disk Volume"
+#~ msgstr "Демонтирана партиција хард диска"
+
+#, fuzzy
+#~ msgid "Encrypted Locked Removable Medium"
+#~ msgstr "Монтиран уклоњиви медијум"
+
+#, fuzzy
+#~ msgid "Encrypted Unlocked Removable Medium"
+#~ msgstr "Демонтиран уклоњиви медијум"
+
+#, fuzzy
+#~ msgid "Trash Properties"
+#~ msgstr "Страна са својствима медијума"