Merge translation files from master branch.

2 files changed, 63 insertions, 75 deletions

diff --git a/tde-i18n-vi/messages/tdelibs/tdelibs.po b/tde-i18n-vi/messages/tdelibs/tdelibs.po
index d459f364aab..bf88e7c7a61 100644
--- a/tde-i18n-vi/messages/tdelibs/tdelibs.po
+++ b/tde-i18n-vi/messages/tdelibs/tdelibs.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: tdelibs\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-09-27 21:09+0200\n"
+"POT-Creation-Date: 2020-10-07 22:21+0200\n"
 "PO-Revision-Date: 2006-07-04 22:06+0930\n"
 "Last-Translator: Clytie Siddall <[email protected]>\n"
 "Language-Team: Vietnamese <[email protected]>\n"
@@ -2472,7 +2472,7 @@ msgstr "Ảnh động"
 msgid "Mailbox"
 msgstr "Hộp thư"
 
-#: tdeabc/phonenumber.cpp:178 tdecore/tdehw/tdehardwaredevices.cpp:4175
+#: tdeabc/phonenumber.cpp:178 tdecore/tdehw/tdehardwaredevices.cpp:4184
 msgid "Modem"
 msgstr "Bộ điều giải"
 
@@ -4718,7 +4718,7 @@ msgid "Generic Input Device"
 msgstr "Tùy chọn giống loài"
 
 #: tdecore/tdehw/tdegenericdevice.cpp:315
-#: tdecore/tdehw/tdehardwaredevices.cpp:3318
+#: tdecore/tdehw/tdehardwaredevices.cpp:3327
 msgid "Generic %1 Device"
 msgstr ""
 
@@ -4732,240 +4732,240 @@ msgid "Unknown Virtual Device"
 msgstr ""
 
 #: tdecore/tdehw/tdegenericdevice.cpp:330
-#: tdecore/tdehw/tdehardwaredevices.cpp:4274
+#: tdecore/tdehw/tdehardwaredevices.cpp:4283
 #, fuzzy
 msgid "Unknown Device"
 msgstr "Trường lạ"
 
-#: tdecore/tdehw/tdehardwaredevices.cpp:3323
+#: tdecore/tdehw/tdehardwaredevices.cpp:3332
 msgid "Disconnected %1 Port"
 msgstr ""
 
-#: tdecore/tdehw/tdehardwaredevices.cpp:3699
-#: tdecore/tdehw/tdehardwaredevices.cpp:3779
-#: tdecore/tdehw/tdehardwaredevices.cpp:3791
+#: tdecore/tdehw/tdehardwaredevices.cpp:3708
+#: tdecore/tdehw/tdehardwaredevices.cpp:3788
+#: tdecore/tdehw/tdehardwaredevices.cpp:3800
 #, fuzzy
 msgid "Unknown PCI Device"
 msgstr "Trường lạ"
 
-#: tdecore/tdehw/tdehardwaredevices.cpp:3809
-#: tdecore/tdehw/tdehardwaredevices.cpp:3889
-#: tdecore/tdehw/tdehardwaredevices.cpp:3901
+#: tdecore/tdehw/tdehardwaredevices.cpp:3818
+#: tdecore/tdehw/tdehardwaredevices.cpp:3898
+#: tdecore/tdehw/tdehardwaredevices.cpp:3910
 #, fuzzy
 msgid "Unknown USB Device"
 msgstr "Trường lạ"
 
-#: tdecore/tdehw/tdehardwaredevices.cpp:3930
-#: tdecore/tdehw/tdehardwaredevices.cpp:3971
+#: tdecore/tdehw/tdehardwaredevices.cpp:3939
+#: tdecore/tdehw/tdehardwaredevices.cpp:3980
 #, fuzzy
 msgid "Unknown PNP Device"
 msgstr "Trường lạ"
 
-#: tdecore/tdehw/tdehardwaredevices.cpp:4000
-#: tdecore/tdehw/tdehardwaredevices.cpp:4041
+#: tdecore/tdehw/tdehardwaredevices.cpp:4009
+#: tdecore/tdehw/tdehardwaredevices.cpp:4050
 msgid "Unknown Monitor Device"
 msgstr ""
 
-#: tdecore/tdehw/tdehardwaredevices.cpp:4130
+#: tdecore/tdehw/tdehardwaredevices.cpp:4139
 #, fuzzy
 msgid "Root"
 msgstr "Không có gốc CA"
 
-#: tdecore/tdehw/tdehardwaredevices.cpp:4133
+#: tdecore/tdehw/tdehardwaredevices.cpp:4142
 #, fuzzy
 msgid "System Root"
 msgstr "Trình đơn hê thống"
 
-#: tdecore/tdehw/tdehardwaredevices.cpp:4136
+#: tdecore/tdehw/tdehardwaredevices.cpp:4145
 msgid "CPU"
 msgstr ""
 
-#: tdecore/tdehw/tdehardwaredevices.cpp:4139
+#: tdecore/tdehw/tdehardwaredevices.cpp:4148
 #, fuzzy
 msgid "Graphics Processor"
 msgstr "Vị trí địa lý"
 
-#: tdecore/tdehw/tdehardwaredevices.cpp:4142
+#: tdecore/tdehw/tdehardwaredevices.cpp:4151
 msgid "RAM"
 msgstr ""
 
-#: tdecore/tdehw/tdehardwaredevices.cpp:4145
+#: tdecore/tdehw/tdehardwaredevices.cpp:4154
 msgid "Bus"
 msgstr ""
 
-#: tdecore/tdehw/tdehardwaredevices.cpp:4148
+#: tdecore/tdehw/tdehardwaredevices.cpp:4157
 msgid "I2C Bus"
 msgstr ""
 
-#: tdecore/tdehw/tdehardwaredevices.cpp:4151
+#: tdecore/tdehw/tdehardwaredevices.cpp:4160
 msgid "MDIO Bus"
 msgstr ""
 
-#: tdecore/tdehw/tdehardwaredevices.cpp:4154
+#: tdecore/tdehw/tdehardwaredevices.cpp:4163
 #, fuzzy
 msgid "Mainboard"
 msgstr "Thanh công cụ chính"
 
-#: tdecore/tdehw/tdehardwaredevices.cpp:4157
+#: tdecore/tdehw/tdehardwaredevices.cpp:4166
 msgid "Disk"
 msgstr ""
 
-#: tdecore/tdehw/tdehardwaredevices.cpp:4160
+#: tdecore/tdehw/tdehardwaredevices.cpp:4169
 msgid "SCSI"
 msgstr ""
 
-#: tdecore/tdehw/tdehardwaredevices.cpp:4163
+#: tdecore/tdehw/tdehardwaredevices.cpp:4172
 msgid "Storage Controller"
 msgstr ""
 
-#: tdecore/tdehw/tdehardwaredevices.cpp:4166
+#: tdecore/tdehw/tdehardwaredevices.cpp:4175
 msgid "Mouse"
 msgstr ""
 
-#: tdecore/tdehw/tdehardwaredevices.cpp:4169
+#: tdecore/tdehw/tdehardwaredevices.cpp:4178
 msgid "Keyboard"
 msgstr ""
 
-#: tdecore/tdehw/tdehardwaredevices.cpp:4172
+#: tdecore/tdehw/tdehardwaredevices.cpp:4181
 msgid "HID"
 msgstr ""
 
-#: tdecore/tdehw/tdehardwaredevices.cpp:4178
+#: tdecore/tdehw/tdehardwaredevices.cpp:4187
 msgid "Monitor and Display"
 msgstr ""
 
-#: tdecore/tdehw/tdehardwaredevices.cpp:4181
+#: tdecore/tdehw/tdehardwaredevices.cpp:4190
 msgid "Network"
 msgstr ""
 
 #: ../dependencies/tqt3/src/dialogs/qprintdialog.cpp:1033
-#: tdecore/tdehw/tdehardwaredevices.cpp:4184
+#: tdecore/tdehw/tdehardwaredevices.cpp:4193
 #, fuzzy
 msgid "Printer"
 msgstr "In"
 
-#: tdecore/tdehw/tdehardwaredevices.cpp:4187
+#: tdecore/tdehw/tdehardwaredevices.cpp:4196
 msgid "Scanner"
 msgstr ""
 
-#: tdeabc/scripts/entrylist:83 tdecore/tdehw/tdehardwaredevices.cpp:4190
+#: tdeabc/scripts/entrylist:83 tdecore/tdehw/tdehardwaredevices.cpp:4199
 msgid "Sound"
 msgstr "Âm thanh"
 
-#: tdecore/tdehw/tdehardwaredevices.cpp:4193
+#: tdecore/tdehw/tdehardwaredevices.cpp:4202
 #, fuzzy
 msgid "Video Capture"
 msgstr "Thanh công cụ ảnh động"
 
-#: tdecore/tdehw/tdehardwaredevices.cpp:4196
+#: tdecore/tdehw/tdehardwaredevices.cpp:4205
 msgid "IEEE1394"
 msgstr ""
 
-#: tdecore/tdehw/tdehardwaredevices.cpp:4199
+#: tdecore/tdehw/tdehardwaredevices.cpp:4208
 msgid "PCMCIA"
 msgstr ""
 
-#: tdecore/tdehw/tdehardwaredevices.cpp:4202
+#: tdecore/tdehw/tdehardwaredevices.cpp:4211
 msgid "Camera"
 msgstr ""
 
-#: tdecore/tdehw/tdehardwaredevices.cpp:4205
+#: tdecore/tdehw/tdehardwaredevices.cpp:4214
 #, fuzzy
 msgid "Text I/O"
 msgstr "Chỉ có chữ"
 
-#: tdecore/tdehw/tdehardwaredevices.cpp:4208
+#: tdecore/tdehw/tdehardwaredevices.cpp:4217
 msgid "Serial Communications Controller"
 msgstr ""
 
-#: tdecore/tdehw/tdehardwaredevices.cpp:4211
+#: tdecore/tdehw/tdehardwaredevices.cpp:4220
 msgid "Parallel Port"
 msgstr ""
 
-#: tdecore/tdehw/tdehardwaredevices.cpp:4214
+#: tdecore/tdehw/tdehardwaredevices.cpp:4223
 msgid "Peripheral"
 msgstr ""
 
-#: tdecore/tdehw/tdehardwaredevices.cpp:4217
+#: tdecore/tdehw/tdehardwaredevices.cpp:4226
 #, fuzzy
 msgid "Backlight"
 msgstr "Lùi"
 
-#: tdecore/tdehw/tdehardwaredevices.cpp:4220
+#: tdecore/tdehw/tdehardwaredevices.cpp:4229
 msgid "Battery"
 msgstr ""
 
-#: tdecore/tdehw/tdehardwaredevices.cpp:4223
+#: tdecore/tdehw/tdehardwaredevices.cpp:4232
 msgid "Power Supply"
 msgstr ""
 
-#: tdecore/tdehw/tdehardwaredevices.cpp:4226
+#: tdecore/tdehw/tdehardwaredevices.cpp:4235
 #, fuzzy
 msgid "Docking Station"
 msgstr "Hướng"
 
-#: tdecore/tdehw/tdehardwaredevices.cpp:4229
+#: tdecore/tdehw/tdehardwaredevices.cpp:4238
 #, fuzzy
 msgid "Thermal Sensor"
 msgstr "Thiết lập chung"
 
-#: tdecore/tdehw/tdehardwaredevices.cpp:4232
+#: tdecore/tdehw/tdehardwaredevices.cpp:4241
 msgid "Thermal Control"
 msgstr ""
 
-#: tdecore/tdehw/tdehardwaredevices.cpp:4235
+#: tdecore/tdehw/tdehardwaredevices.cpp:4244
 #: tdecore/tdehw/tdenetworkconnections.cpp:781
 msgid "Bluetooth"
 msgstr ""
 
-#: tdecore/tdehw/tdehardwaredevices.cpp:4238
+#: tdecore/tdehw/tdehardwaredevices.cpp:4247
 msgid "Bridge"
 msgstr ""
 
-#: tdecore/tdehw/tdehardwaredevices.cpp:4241
+#: tdecore/tdehw/tdehardwaredevices.cpp:4250
 msgid "Platform"
 msgstr ""
 
-#: tdecore/tdehw/tdehardwaredevices.cpp:4244
+#: tdecore/tdehw/tdehardwaredevices.cpp:4253
 msgid "Cryptography"
 msgstr ""
 
-#: tdecore/tdehw/tdehardwaredevices.cpp:4247
+#: tdecore/tdehw/tdehardwaredevices.cpp:4256
 msgid "Platform Event"
 msgstr ""
 
-#: tdecore/tdehw/tdehardwaredevices.cpp:4250
+#: tdecore/tdehw/tdehardwaredevices.cpp:4259
 #, fuzzy
 msgid "Platform Input"
 msgstr "Xoá trường nhập"
 
-#: tdecore/tdehw/tdehardwaredevices.cpp:4253
+#: tdecore/tdehw/tdehardwaredevices.cpp:4262
 msgid "Plug and Play"
 msgstr ""
 
-#: tdecore/tdehw/tdehardwaredevices.cpp:4256
+#: tdecore/tdehw/tdehardwaredevices.cpp:4265
 #, fuzzy
 msgid "Other ACPI"
 msgstr "Khác"
 
-#: tdecore/tdehw/tdehardwaredevices.cpp:4259
+#: tdecore/tdehw/tdehardwaredevices.cpp:4268
 #, fuzzy
 msgid "Other USB"
 msgstr "Khác"
 
-#: tdecore/tdehw/tdehardwaredevices.cpp:4262
+#: tdecore/tdehw/tdehardwaredevices.cpp:4271
 msgid "Other Multimedia"
 msgstr ""
 
-#: tdecore/tdehw/tdehardwaredevices.cpp:4265
+#: tdecore/tdehw/tdehardwaredevices.cpp:4274
 msgid "Other Peripheral"
 msgstr ""
 
-#: tdecore/tdehw/tdehardwaredevices.cpp:4268
+#: tdecore/tdehw/tdehardwaredevices.cpp:4277
 msgid "Other Sensor"
 msgstr ""
 
-#: tdecore/tdehw/tdehardwaredevices.cpp:4271
+#: tdecore/tdehw/tdehardwaredevices.cpp:4280
 msgid "Other Virtual"
 msgstr ""
 
diff --git a/tde-i18n-vi/messages/tdelibs/tdelibs_colors.po b/tde-i18n-vi/messages/tdelibs/tdelibs_colors.po
index 5cddd1096a1..ac412df71f4 100644
--- a/tde-i18n-vi/messages/tdelibs/tdelibs_colors.po
+++ b/tde-i18n-vi/messages/tdelibs/tdelibs_colors.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: tdelibs_colors\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-05-11 04:01+0200\n"
+"POT-Creation-Date: 2020-10-07 19:49+0200\n"
 "PO-Revision-Date: 2006-04-04 16:03+0930\n"
 "Last-Translator: Clytie Siddall <[email protected]>\n"
 "Language-Team: Vietnamese <[email protected]>\n"
@@ -17,18 +17,6 @@ msgstr ""
 "Plural-Forms: nplurals=1; plural=0\n"
 "X-Generator: LocFactoryEditor 1.6b36\n"
 
-#. Instead of a literal translation, add your name to the end of the list (separated by a comma).
-msgid ""
-"_: NAME OF TRANSLATORS\n"
-"Your names"
-msgstr ""
-
-#. Instead of a literal translation, add your email to the end of the list (separated by a comma).
-msgid ""
-"_: EMAIL OF TRANSLATORS\n"
-"Your emails"
-msgstr ""
-
 #: rgb.txt:2
 #, no-c-format
 msgid ""