Merge translation files from master branch.

1 files changed, 134 insertions, 75 deletions

diff --git a/translations/desktop_files/tdeioslave-desktops/nb.po b/translations/desktop_files/tdeioslave-desktops/nb.po
index d03826122..0eda32248 100644
--- a/translations/desktop_files/tdeioslave-desktops/nb.po
+++ b/translations/desktop_files/tdeioslave-desktops/nb.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 "Tom 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 "Montert BLURAY"
 
 #. Comment
+#: media/mimetypes/bluray_mounted_decrypted.desktop:7
+#, fuzzy
+msgid "Mounted Decrypted BLURAY"
+msgstr "Montert BLURAY"
+
+#. Comment
 #: media/mimetypes/bluray_unmounted.desktop:6
 msgid "Unmounted BLURAY"
 msgstr "Avmontert BLURAY"
 
 #. Comment
+#: media/mimetypes/bluray_unmounted_decrypted.desktop:7
+#, fuzzy
+msgid "Unmounted Decrypted BLURAY"
+msgstr "Avmontert BLURAY"
+
+#. Comment
+#: media/mimetypes/bluray_unmounted_encrypted.desktop:7
+#, fuzzy
+msgid "Unmounted Encrypted BLURAY"
+msgstr "Avmontert BLURAY"
+
+#. Comment
 #: media/mimetypes/blurayvideo.desktop:6
 msgid "BLURAY Video Disk"
 msgstr "BLURAY-videoplate"
@@ -128,34 +136,32 @@ msgid "Unmounted Camera"
 msgstr "Avmontert kamera"
 
 #. 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 "Montert CD-brenner"
 
 #. Comment
+#: media/mimetypes/cd-r_mounted_decrypted.desktop:7
+#, fuzzy
+msgid "Mounted Decrypted CD-R"
+msgstr "Montert CD-brenner"
+
+#. Comment
 #: media/mimetypes/cd-r_unmounted.desktop:6
 msgid "Unmounted CD-R"
 msgstr "Avmontert CD-brenner"
 
 #. 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 "Avmontert CD-brenner"
 
 #. 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 "Avmontert CD-brenner"
 
 #. Comment
 #: media/mimetypes/cd-rw_mounted.desktop:6
@@ -163,19 +169,27 @@ msgid "Mounted CD-RW"
 msgstr "Montert CD-brenner"
 
 #. Comment
+#: media/mimetypes/cd-rw_mounted_decrypted.desktop:7
+#, fuzzy
+msgid "Mounted Decrypted CD-RW"
+msgstr "Montert CD-brenner"
+
+#. Comment
 #: media/mimetypes/cd-rw_unmounted.desktop:6
 msgid "Unmounted CD-RW"
 msgstr "Avmontert CD-brenner"
 
 #. 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 "Avmontert CD-brenner"
 
 #. 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 "Avmontert CD-brenner"
 
 #. Comment
 #: media/mimetypes/cdrom_mounted.desktop:6
@@ -183,19 +197,27 @@ msgid "Mounted CD-ROM"
 msgstr "Montert CD-plate"
 
 #. Comment
+#: media/mimetypes/cdrom_mounted_decrypted.desktop:7
+#, fuzzy
+msgid "Mounted Decrypted CD-ROM"
+msgstr "Montert CD-plate"
+
+#. Comment
 #: media/mimetypes/cdrom_unmounted.desktop:6
 msgid "Unmounted CD-ROM"
 msgstr "Avmontert CD-plate"
 
 #. 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 "Avmontert CD-plate"
 
 #. 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 "Avmontert CD-plate"
 
 #. Comment
 #: media/mimetypes/dvd_mounted.desktop:6
@@ -203,11 +225,29 @@ msgid "Mounted DVD"
 msgstr "Montert DVD"
 
 #. Comment
+#: media/mimetypes/dvd_mounted_decrypted.desktop:7
+#, fuzzy
+msgid "Mounted Decrypted DVD"
+msgstr "Montert DVD"
+
+#. Comment
 #: media/mimetypes/dvd_unmounted.desktop:6
 msgid "Unmounted DVD"
 msgstr "Avmontert DVD"
 
 #. Comment
+#: media/mimetypes/dvd_unmounted_decrypted.desktop:7
+#, fuzzy
+msgid "Unmounted Decrypted DVD"
+msgstr "Avmontert DVD"
+
+#. Comment
+#: media/mimetypes/dvd_unmounted_encrypted.desktop:7
+#, fuzzy
+msgid "Unmounted Encrypted DVD"
+msgstr "Avmontert DVD"
+
+#. Comment
 #: media/mimetypes/dvdvideo.desktop:6
 msgid "DVD Video Disk"
 msgstr "DVD-videoplate"
@@ -238,20 +278,14 @@ msgid "Camera"
 msgstr "Kamera"
 
 #. 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 "Montert harddiskpartisjon"
 
 #. Comment
-#: media/mimetypes/hdd_encrypted_unlocked.desktop:7
+#: media/mimetypes/hdd_mounted_decrypted.desktop:7
 #, fuzzy
-msgid "Encrypted Unlocked Hard Disk Volume"
-msgstr "Avmontert harddiskpartisjon"
-
-#. Comment
-#: media/mimetypes/hdd_mounted.desktop:6
-msgid "Mounted Hard Disk Volume"
+msgid "Mounted Decrypted Hard Disk Volume"
 msgstr "Montert harddiskpartisjon"
 
 #. Comment
@@ -260,6 +294,18 @@ msgid "Unmounted Hard Disk Volume"
 msgstr "Avmontert harddiskpartisjon"
 
 #. Comment
+#: media/mimetypes/hdd_unmounted_decrypted.desktop:7
+#, fuzzy
+msgid "Unmounted Decrypted Hard Disk Volume"
+msgstr "Avmontert harddiskpartisjon"
+
+#. Comment
+#: media/mimetypes/hdd_unmounted_encrypted.desktop:7
+#, fuzzy
+msgid "Unmounted Encrypted Hard Disk Volume"
+msgstr "Avmontert harddiskpartisjon"
+
+#. Comment
 #: media/mimetypes/mycomputer.desktop:6
 msgid "My Computer"
 msgstr ""
@@ -292,20 +338,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 "Montert flyttbart medium"
 
 #. Comment
-#: media/mimetypes/removable_encrypted_unlocked.desktop:7
+#: media/mimetypes/removable_mounted_decrypted.desktop:7
 #, fuzzy
-msgid "Encrypted Unlocked Removable Medium"
-msgstr "Avmontert flyttbart medium"
-
-#. Comment
-#: media/mimetypes/removable_mounted.desktop:6
-msgid "Mounted Removable Medium"
+msgid "Mounted Decrypted Removable Medium"
 msgstr "Montert flyttbart medium"
 
 #. Comment
@@ -314,6 +354,18 @@ msgid "Unmounted Removable Medium"
 msgstr "Avmontert flyttbart medium"
 
 #. Comment
+#: media/mimetypes/removable_unmounted_decrypted.desktop:7
+#, fuzzy
+msgid "Unmounted Decrypted Removable Medium"
+msgstr "Avmontert flyttbart medium"
+
+#. Comment
+#: media/mimetypes/removable_unmounted_encrypted.desktop:7
+#, fuzzy
+msgid "Unmounted Encrypted Removable Medium"
+msgstr "Avmontert flyttbart medium"
+
+#. Comment
 #: media/mimetypes/smb_mounted.desktop:6
 msgid "Mounted Samba (Microsoft Network) Share"
 msgstr "Montert Samba-katalog (Microsoft nettverk)"
@@ -331,7 +383,6 @@ msgstr "Super video CD"
 #. Comment
 #. Name
 #: media/mimetypes/trash.desktop:7 system/entries/trash.desktop:7
-#: trash/kcmtrash.desktop:11
 msgid "Trash"
 msgstr "Papirkurv"
 
@@ -367,8 +418,8 @@ msgid "Konqueror properties dialog plugin to configure mount behaviour"
 msgstr "Et programtillegg for å sette opp montering av enheter i Konqueror"
 
 #. Name
-#: media/services/media_decrypt.desktop:8
-msgid "Unlock"
+#: media/services/media_decrypt.desktop:6
+msgid "Decrypt"
 msgstr ""
 
 #. Name
@@ -409,7 +460,7 @@ msgstr ""
 "eksterne harddisker;zip-disker;"
 
 #. Name
-#: media/tdefile-plugin/tdefile_media.desktop:6
+#: media/tdefile-plugin/tdefile_media.desktop:8
 msgid "Medium Information"
 msgstr "Medieinformasjon"
 
@@ -511,18 +562,6 @@ msgstr "Tekstfiler"
 msgid "Thumbnail Handler"
 msgstr "Håndtering av forhåndsvisning"
 
-#. Comment
-#. Name
-#: trash/kcmtrash.desktop:13 trash/ktrashpropsdlgplugin.desktop:7
-#, fuzzy
-msgid "Trash Properties"
-msgstr "Side for medievarsling"
-
-#. 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
@@ -553,3 +592,23 @@ msgstr "En tdeioslave for sftp"
 #: trash/trash.protocol:25
 msgid "Original Path,Deletion Date"
 msgstr "Opprinnelig sti, slettedato"
+
+#, fuzzy
+#~ msgid "Encrypted Locked Hard Disk Volume"
+#~ msgstr "Montert harddiskpartisjon"
+
+#, fuzzy
+#~ msgid "Encrypted Unlocked Hard Disk Volume"
+#~ msgstr "Avmontert harddiskpartisjon"
+
+#, fuzzy
+#~ msgid "Encrypted Locked Removable Medium"
+#~ msgstr "Montert flyttbart medium"
+
+#, fuzzy
+#~ msgid "Encrypted Unlocked Removable Medium"
+#~ msgstr "Avmontert flyttbart medium"
+
+#, fuzzy
+#~ msgid "Trash Properties"
+#~ msgstr "Side for medievarsling"