Merge translation files from master branch.

1 files changed, 134 insertions, 75 deletions

diff --git a/translations/desktop_files/tdeioslave-desktops/vi.po b/translations/desktop_files/tdeioslave-desktops/vi.po
index 555b5bcd0..4e672df99 100644
--- a/translations/desktop_files/tdeioslave-desktops/vi.po
+++ b/translations/desktop_files/tdeioslave-desktops/vi.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"
@@ -94,26 +94,34 @@ msgid "Blank DVD"
 msgstr "DVD trống"
 
 #. 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 đã kết nối"
 
 #. Comment
+#: media/mimetypes/bluray_mounted_decrypted.desktop:7
+#, fuzzy
+msgid "Mounted Decrypted BLURAY"
+msgstr "BLURAY đã kết nối"
+
+#. Comment
 #: media/mimetypes/bluray_unmounted.desktop:6
 msgid "Unmounted BLURAY"
 msgstr "BLURAY đã gỡ ra"
 
 #. Comment
+#: media/mimetypes/bluray_unmounted_decrypted.desktop:7
+#, fuzzy
+msgid "Unmounted Decrypted BLURAY"
+msgstr "BLURAY đã gỡ ra"
+
+#. Comment
+#: media/mimetypes/bluray_unmounted_encrypted.desktop:7
+#, fuzzy
+msgid "Unmounted Encrypted BLURAY"
+msgstr "BLURAY đã gỡ ra"
+
+#. Comment
 #: media/mimetypes/blurayvideo.desktop:6
 msgid "BLURAY Video Disk"
 msgstr "Đĩa Video BLURAY"
@@ -129,34 +137,32 @@ msgid "Unmounted Camera"
 msgstr "Máy chụp ảnh số đã gỡ ra"
 
 #. 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 "Ổ ghi CD đã kết nối"
 
 #. Comment
+#: media/mimetypes/cd-r_mounted_decrypted.desktop:7
+#, fuzzy
+msgid "Mounted Decrypted CD-R"
+msgstr "Ổ ghi CD đã kết nối"
+
+#. Comment
 #: media/mimetypes/cd-r_unmounted.desktop:6
 msgid "Unmounted CD-R"
 msgstr "Ổ ghi CD đã gỡ ra"
 
 #. 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 "Ổ ghi CD đã gỡ ra"
 
 #. 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 "Ổ ghi CD đã gỡ ra"
 
 #. Comment
 #: media/mimetypes/cd-rw_mounted.desktop:6
@@ -164,19 +170,27 @@ msgid "Mounted CD-RW"
 msgstr "Ổ ghi CD đã kết nối"
 
 #. Comment
+#: media/mimetypes/cd-rw_mounted_decrypted.desktop:7
+#, fuzzy
+msgid "Mounted Decrypted CD-RW"
+msgstr "Ổ ghi CD đã kết nối"
+
+#. Comment
 #: media/mimetypes/cd-rw_unmounted.desktop:6
 msgid "Unmounted CD-RW"
 msgstr "Ổ ghi CD đã gỡ ra"
 
 #. 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 "Ổ ghi CD đã gỡ ra"
 
 #. 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 "Ổ ghi CD đã gỡ ra"
 
 #. Comment
 #: media/mimetypes/cdrom_mounted.desktop:6
@@ -184,19 +198,27 @@ msgid "Mounted CD-ROM"
 msgstr "Ổ CD ROM đã kết nối"
 
 #. Comment
+#: media/mimetypes/cdrom_mounted_decrypted.desktop:7
+#, fuzzy
+msgid "Mounted Decrypted CD-ROM"
+msgstr "Ổ CD ROM đã kết nối"
+
+#. Comment
 #: media/mimetypes/cdrom_unmounted.desktop:6
 msgid "Unmounted CD-ROM"
 msgstr "Ổ CD-ROM đã gỡ ra"
 
 #. 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 đã gỡ ra"
 
 #. 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 đã gỡ ra"
 
 #. Comment
 #: media/mimetypes/dvd_mounted.desktop:6
@@ -204,11 +226,29 @@ msgid "Mounted DVD"
 msgstr "DVD đã kết nối"
 
 #. Comment
+#: media/mimetypes/dvd_mounted_decrypted.desktop:7
+#, fuzzy
+msgid "Mounted Decrypted DVD"
+msgstr "DVD đã kết nối"
+
+#. Comment
 #: media/mimetypes/dvd_unmounted.desktop:6
 msgid "Unmounted DVD"
 msgstr "DVD đã gỡ ra"
 
 #. Comment
+#: media/mimetypes/dvd_unmounted_decrypted.desktop:7
+#, fuzzy
+msgid "Unmounted Decrypted DVD"
+msgstr "DVD đã gỡ ra"
+
+#. Comment
+#: media/mimetypes/dvd_unmounted_encrypted.desktop:7
+#, fuzzy
+msgid "Unmounted Encrypted DVD"
+msgstr "DVD đã gỡ ra"
+
+#. Comment
 #: media/mimetypes/dvdvideo.desktop:6
 msgid "DVD Video Disk"
 msgstr "Đĩa Video DVD"
@@ -239,20 +279,14 @@ msgid "Camera"
 msgstr "Máy chụp ảnh số"
 
 #. 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 "Các Phân vùng Ổ cứng đã kết nối"
 
 #. Comment
-#: media/mimetypes/hdd_encrypted_unlocked.desktop:7
+#: media/mimetypes/hdd_mounted_decrypted.desktop:7
 #, fuzzy
-msgid "Encrypted Unlocked Hard Disk Volume"
-msgstr "Các Phân vùng Ổ cứng đã gỡ ra"
-
-#. Comment
-#: media/mimetypes/hdd_mounted.desktop:6
-msgid "Mounted Hard Disk Volume"
+msgid "Mounted Decrypted Hard Disk Volume"
 msgstr "Các Phân vùng Ổ cứng đã kết nối"
 
 #. Comment
@@ -261,6 +295,18 @@ msgid "Unmounted Hard Disk Volume"
 msgstr "Các Phân vùng Ổ cứng đã gỡ ra"
 
 #. Comment
+#: media/mimetypes/hdd_unmounted_decrypted.desktop:7
+#, fuzzy
+msgid "Unmounted Decrypted Hard Disk Volume"
+msgstr "Các Phân vùng Ổ cứng đã gỡ ra"
+
+#. Comment
+#: media/mimetypes/hdd_unmounted_encrypted.desktop:7
+#, fuzzy
+msgid "Unmounted Encrypted Hard Disk Volume"
+msgstr "Các Phân vùng Ổ cứng đã gỡ ra"
+
+#. Comment
 #: media/mimetypes/mycomputer.desktop:6
 msgid "My Computer"
 msgstr ""
@@ -293,20 +339,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 "Ổ lưu trữ Di động đã kết nối"
 
 #. Comment
-#: media/mimetypes/removable_encrypted_unlocked.desktop:7
+#: media/mimetypes/removable_mounted_decrypted.desktop:7
 #, fuzzy
-msgid "Encrypted Unlocked Removable Medium"
-msgstr "Ổ lưu trữ Di động đã gỡ ra"
-
-#. Comment
-#: media/mimetypes/removable_mounted.desktop:6
-msgid "Mounted Removable Medium"
+msgid "Mounted Decrypted Removable Medium"
 msgstr "Ổ lưu trữ Di động đã kết nối"
 
 #. Comment
@@ -315,6 +355,18 @@ msgid "Unmounted Removable Medium"
 msgstr "Ổ lưu trữ Di động đã gỡ ra"
 
 #. Comment
+#: media/mimetypes/removable_unmounted_decrypted.desktop:7
+#, fuzzy
+msgid "Unmounted Decrypted Removable Medium"
+msgstr "Ổ lưu trữ Di động đã gỡ ra"
+
+#. Comment
+#: media/mimetypes/removable_unmounted_encrypted.desktop:7
+#, fuzzy
+msgid "Unmounted Encrypted Removable Medium"
+msgstr "Ổ lưu trữ Di động đã gỡ ra"
+
+#. Comment
 #: media/mimetypes/smb_mounted.desktop:6
 msgid "Mounted Samba (Microsoft Network) Share"
 msgstr "Chia sẻ SAMBA (mạng của Microsoft) đã kết nối"
@@ -332,7 +384,6 @@ msgstr "Đĩa siêu video CD"
 #. Comment
 #. Name
 #: media/mimetypes/trash.desktop:7 system/entries/trash.desktop:7
-#: trash/kcmtrash.desktop:11
 msgid "Trash"
 msgstr "Thùng rác"
 
@@ -367,8 +418,8 @@ msgid "Konqueror properties dialog plugin to configure mount behaviour"
 msgstr "bổ sung hộp thoại tài sản Konqueror để cấu hình ứng xử gắn kết"
 
 #. Name
-#: media/services/media_decrypt.desktop:8
-msgid "Unlock"
+#: media/services/media_decrypt.desktop:6
+msgid "Decrypt"
 msgstr ""
 
 #. Name
@@ -407,7 +458,7 @@ msgid "storage;media;usb;cdrom;device;"
 msgstr "lưu trữ;ổ;usb;cdrom;thiết bị;"
 
 #. Name
-#: media/tdefile-plugin/tdefile_media.desktop:6
+#: media/tdefile-plugin/tdefile_media.desktop:8
 msgid "Medium Information"
 msgstr "Thông tin về Ổ lưu trữ"
 
@@ -508,18 +559,6 @@ msgstr "Tập tin Văn bản"
 msgid "Thumbnail Handler"
 msgstr "Thao tác Hình nhỏ"
 
-#. Comment
-#. Name
-#: trash/kcmtrash.desktop:13 trash/ktrashpropsdlgplugin.desktop:7
-#, fuzzy
-msgid "Trash Properties"
-msgstr "Trang tài sản phương tiện"
-
-#. 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
@@ -550,3 +589,23 @@ msgstr "A tdeioslave (đày tớ vào ra TDE) cho sftp"
 #: trash/trash.protocol:25
 msgid "Original Path,Deletion Date"
 msgstr "Đường dẫn Trước khi vứt,Ngày Vứt"
+
+#, fuzzy
+#~ msgid "Encrypted Locked Hard Disk Volume"
+#~ msgstr "Các Phân vùng Ổ cứng đã kết nối"
+
+#, fuzzy
+#~ msgid "Encrypted Unlocked Hard Disk Volume"
+#~ msgstr "Các Phân vùng Ổ cứng đã gỡ ra"
+
+#, fuzzy
+#~ msgid "Encrypted Locked Removable Medium"
+#~ msgstr "Ổ lưu trữ Di động đã kết nối"
+
+#, fuzzy
+#~ msgid "Encrypted Unlocked Removable Medium"
+#~ msgstr "Ổ lưu trữ Di động đã gỡ ra"
+
+#, fuzzy
+#~ msgid "Trash Properties"
+#~ msgstr "Trang tài sản phương tiện"