Merge translation files from master branch.

3 files changed, 64 insertions, 42 deletions

diff --git a/tde-i18n-vi/messages/tdelibs/cupsdconf.po b/tde-i18n-vi/messages/tdelibs/cupsdconf.po
index 5c671939e14..bd0dfc9ad7b 100644
--- a/tde-i18n-vi/messages/tdelibs/cupsdconf.po
+++ b/tde-i18n-vi/messages/tdelibs/cupsdconf.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: cupsdconf\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2019-01-13 18:46+0100\n"
+"POT-Creation-Date: 2019-03-03 17:08+0100\n"
 "PO-Revision-Date: 2006-07-04 22:00+0930\n"
 "Last-Translator: Clytie Siddall <clytie@riverland.net.au>\n"
 "Language-Team: Vietnamese <kde-l10n-vi@kde.org>\n"
@@ -138,7 +138,7 @@ msgstr "Thứ tự duyệt:"
 msgid "Browse options:"
 msgstr "Tùy chọn duyệt:"
 
-#: cupsdconf.cpp:847 cupsdconf.cpp:870 cupsdconf.cpp:886
+#: cupsdconf.cpp:852 cupsdconf.cpp:875 cupsdconf.cpp:891
 #, fuzzy
 msgid ""
 "_: Base\n"
@@ -147,31 +147,31 @@ msgstr ""
 "_: Base\n"
 "Gốc"
 
-#: cupsdconf.cpp:847 cupsdconf.cpp:867 cupsdconf.cpp:888
+#: cupsdconf.cpp:852 cupsdconf.cpp:872 cupsdconf.cpp:893
 msgid "All printers"
 msgstr "Mọi máy in"
 
-#: cupsdconf.cpp:847 cupsdconf.cpp:868 cupsdconf.cpp:889
+#: cupsdconf.cpp:852 cupsdconf.cpp:873 cupsdconf.cpp:894
 msgid "All classes"
 msgstr "Mọi hạng"
 
-#: cupsdconf.cpp:847 cupsdconf.cpp:869 cupsdconf.cpp:891
+#: cupsdconf.cpp:852 cupsdconf.cpp:874 cupsdconf.cpp:896
 msgid "Print jobs"
 msgstr "Công việc in"
 
-#: cupsdconf.cpp:848 cupsdconf.cpp:866 cupsdconf.cpp:887
+#: cupsdconf.cpp:853 cupsdconf.cpp:871 cupsdconf.cpp:892
 msgid "Administration"
 msgstr "Quản trị"
 
-#: cupsdconf.cpp:849 cupsdconf.cpp:876 cupsdconf.cpp:879 cupsdconf.cpp:900
+#: cupsdconf.cpp:854 cupsdconf.cpp:881 cupsdconf.cpp:884 cupsdconf.cpp:905
 msgid "Class"
 msgstr "Hạng"
 
-#: cupsdconf.cpp:850 cupsdconf.cpp:871 cupsdconf.cpp:874 cupsdconf.cpp:894
+#: cupsdconf.cpp:855 cupsdconf.cpp:876 cupsdconf.cpp:879 cupsdconf.cpp:899
 msgid "Printer"
 msgstr "Máy in"
 
-#: cupsdconf.cpp:890
+#: cupsdconf.cpp:895
 msgid "Root"
 msgstr "Người chủ"
 
diff --git a/tde-i18n-vi/messages/tdelibs/katepart.po b/tde-i18n-vi/messages/tdelibs/katepart.po
index 1b9b31ebe78..4007ba854c2 100644
--- a/tde-i18n-vi/messages/tdelibs/katepart.po
+++ b/tde-i18n-vi/messages/tdelibs/katepart.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: kate_part\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2019-01-23 23:15+0100\n"
+"POT-Creation-Date: 2019-03-03 19:04+0100\n"
 "PO-Revision-Date: 2006-07-04 22:03+0930\n"
 "Last-Translator: Clytie Siddall <clytie@riverland.net.au>\n"
 "Language-Team: Vietnamese <kde-l10n-vi@kde.org>\n"
@@ -3442,7 +3442,7 @@ msgstr "Bộ cầm phít hoàn chỉnh từ"
 #: data/mason.xml:3 data/mel.xml:23 data/perl.xml:42 data/php.xml:67
 #: data/pig.xml:4 data/pike.xml:4 data/praat.xml:24 data/puppet.xml:37
 #: data/python.xml:16 data/q.xml:3 data/qml.xml:4 data/r.xml:10 data/rexx.xml:3
-#: data/ruby.xml:33 data/scheme.xml:43 data/sed.xml:3 data/sieve.xml:4
+#: data/ruby.xml:33 data/scheme.xml:3 data/sed.xml:3 data/sieve.xml:4
 #: data/taskjuggler.xml:14 data/tcl.xml:31 data/tcsh.xml:11 data/uscript.xml:3
 #: data/velocity.xml:3 data/xonotic-console.xml:3 data/zsh.xml:11
 msgid ""
@@ -3461,30 +3461,31 @@ msgstr "Tập lệnh"
 #: data/inform.xml:5 data/isocpp.xml:13 data/java.xml:3 data/julia.xml:32
 #: data/kbasic.xml:3 data/lex.xml:21 data/literate-curry.xml:4
 #: data/literate-haskell.xml:3 data/logtalk.xml:4 data/lpc.xml:19
-#: data/m4.xml:41 data/modelica.xml:19 data/modula-2.xml:3
-#: data/monobasic.xml:13 data/nemerle.xml:4 data/nesc.xml:3 data/noweb.xml:3
-#: data/objectivec.xml:3 data/objectivecpp.xml:3 data/ocaml.xml:19
-#: data/ocamllex.xml:11 data/ocamlyacc.xml:14 data/oors.xml:3 data/opal.xml:3
-#: data/opencl.xml:3 data/pascal.xml:4 data/prolog.xml:107 data/protobuf.xml:3
-#: data/purebasic.xml:2 data/qt4.xml:13 data/rapidq.xml:3 data/rsiidl.xml:3
-#: data/rust.xml:37 data/sather.xml:3 data/scala.xml:3 data/sml.xml:3
-#: data/stata.xml:3 data/tads3.xml:5 data/xharbour.xml:3 data/yacc.xml:28
+#: data/m4.xml:41 data/modelica.xml:19 data/modula-2-iso-only.xml:4
+#: data/modula-2-pim-only.xml:4 data/modula-2-r10-only.xml:4
+#: data/modula-2.xml:4 data/monobasic.xml:13 data/nemerle.xml:4 data/nesc.xml:3
+#: data/noweb.xml:3 data/objectivec.xml:3 data/objectivecpp.xml:3
+#: data/ocaml.xml:19 data/ocamllex.xml:11 data/ocamlyacc.xml:14 data/oors.xml:3
+#: data/opal.xml:3 data/opencl.xml:3 data/pascal.xml:4 data/prolog.xml:107
+#: data/protobuf.xml:3 data/purebasic.xml:2 data/qt4.xml:13 data/rapidq.xml:3
+#: data/rsiidl.xml:3 data/rust.xml:37 data/sather.xml:3 data/scala.xml:3
+#: data/sml.xml:3 data/tads3.xml:5 data/xharbour.xml:3 data/yacc.xml:35
 #: data/zonnon.xml:3
 msgid ""
 "_: Language Section\n"
 "Sources"
 msgstr "Nguồn"
 
-#: data/abc.xml:5 data/alert.xml:29 data/alert_indent.xml:29
-#: data/changelog.xml:3 data/cmake.xml:33 data/css-php.xml:32 data/cue.xml:3
+#: data/abc.xml:5 data/alert.xml:29 data/alert_indent.xml:3
+#: data/changelog.xml:3 data/cmake.xml:36 data/css-php.xml:32 data/cue.xml:3
 #: data/debianchangelog.xml:3 data/debiancontrol.xml:3 data/diff.xml:18
 #: data/dockerfile.xml:4 data/email.xml:6 data/gcode.xml:31 data/gdb.xml:10
-#: data/git-rebase.xml:3 data/hunspell-aff.xml:3 data/hunspell-dat.xml:3
+#: data/git-rebase.xml:3 data/hunspell-aff.xml:6 data/hunspell-dat.xml:3
 #: data/hunspell-dic.xml:3 data/hunspell-idx.xml:3 data/jam.xml:24
 #: data/javascript-php.xml:12 data/lilypond.xml:23 data/m3u.xml:17
 #: data/makefile.xml:10 data/meson.xml:3 data/modelines.xml:13 data/mup.xml:3
-#: data/pgn.xml:15 data/povray.xml:9 data/qmake.xml:3 data/rib.xml:8
-#: data/rpmspec.xml:11 data/valgrind-suppression.xml:3
+#: data/pgn.xml:15 data/povray.xml:9 data/qmake.xml:3 data/rpmspec.xml:11
+#: data/valgrind-suppression.xml:3
 msgid ""
 "_: Language Section\n"
 "Other"
@@ -3501,7 +3502,7 @@ msgstr "Phần cứng"
 #: data/ansys.xml:3 data/bmethod.xml:3 data/dot.xml:4 data/gap.xml:17
 #: data/gdl.xml:3 data/magma.xml:3 data/mathematica.xml:3 data/matlab.xml:60
 #: data/maxima.xml:24 data/octave.xml:18 data/replicode.xml:14 data/sci.xml:3
-#: data/tibasic.xml:3 data/yacas.xml:3
+#: data/stata.xml:3 data/tibasic.xml:3 data/yacas.xml:3
 msgid ""
 "_: Language Section\n"
 "Scientific"
@@ -3545,14 +3546,14 @@ msgid ""
 msgstr "Mã định dạng"
 
 #: data/fgl-4gl.xml:3 data/fgl-per.xml:3 data/ldif.xml:3 data/progress.xml:3
-#: data/sql-mysql.xml:8 data/sql-oracle.xml:4 data/sql-postgresql.xml:4
-#: data/sql.xml:6
+#: data/sql-mysql.xml:8 data/sql-oracle.xml:4 data/sql-postgresql.xml:6
+#: data/sql.xml:8
 msgid ""
 "_: Language Section\n"
 "Database"
 msgstr "Cơ sở dữ liệu"
 
-#: data/vrml.xml:3
+#: data/rib.xml:8 data/vrml.xml:3
 #, fuzzy
 msgid ""
 "_: Language Section\n"
@@ -3611,7 +3612,7 @@ msgid ""
 "Alerts"
 msgstr "Cảnh giác"
 
-#: data/alert_indent.xml:29
+#: data/alert_indent.xml:3
 #, fuzzy
 msgid ""
 "_: Language\n"
@@ -3786,7 +3787,7 @@ msgid ""
 "Clojure"
 msgstr "C"
 
-#: data/cmake.xml:30
+#: data/cmake.xml:33
 #, fuzzy
 msgid ""
 "_: Language\n"
@@ -4192,7 +4193,7 @@ msgid ""
 "HTML"
 msgstr "HTML"
 
-#: data/hunspell-aff.xml:3
+#: data/hunspell-aff.xml:6
 #, fuzzy
 msgid ""
 "_: Language\n"
@@ -4525,6 +4526,27 @@ msgid ""
 "Modelines"
 msgstr "Mason"
 
+#: data/modula-2-iso-only.xml:3
+#, fuzzy
+msgid ""
+"_: Language\n"
+"Modula-2 (ISO only)"
+msgstr "Modula-2"
+
+#: data/modula-2-pim-only.xml:3
+#, fuzzy
+msgid ""
+"_: Language\n"
+"Modula-2 (PIM only)"
+msgstr "Modula-2"
+
+#: data/modula-2-r10-only.xml:3
+#, fuzzy
+msgid ""
+"_: Language\n"
+"Modula-2 (R10 only)"
+msgstr "Modula-2"
+
 #: data/modula-2.xml:3
 msgid ""
 "_: Language\n"
@@ -4902,7 +4924,7 @@ msgid ""
 "Scala"
 msgstr "Stata"
 
-#: data/scheme.xml:43
+#: data/scheme.xml:3
 msgid ""
 "_: Language\n"
 "Scheme"
@@ -4972,13 +4994,13 @@ msgid ""
 "SQL (Oracle)"
 msgstr "SQL (PostgreSQL)"
 
-#: data/sql-postgresql.xml:4
+#: data/sql-postgresql.xml:6
 msgid ""
 "_: Language\n"
 "SQL (PostgreSQL)"
 msgstr "SQL (PostgreSQL)"
 
-#: data/sql.xml:6
+#: data/sql.xml:8
 msgid ""
 "_: Language\n"
 "SQL"
@@ -5192,7 +5214,7 @@ msgid ""
 "yacas"
 msgstr "yacas"
 
-#: data/yacc.xml:28
+#: data/yacc.xml:35
 msgid ""
 "_: Language\n"
 "Yacc/Bison"
diff --git a/tde-i18n-vi/messages/tdelibs/tdelibs.po b/tde-i18n-vi/messages/tdelibs/tdelibs.po
index 5bca09ee579..3ae3ff4d11b 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: 2019-01-23 23:08+0100\n"
+"POT-Creation-Date: 2019-03-03 18:57+0100\n"
 "PO-Revision-Date: 2006-07-04 22:06+0930\n"
 "Last-Translator: Clytie Siddall <clytie@riverland.net.au>\n"
 "Language-Team: Vietnamese <kde-l10n-vi@kde.org>\n"
@@ -3672,7 +3672,7 @@ msgid "Greek"
 msgstr "Hy Lạp"
 
 #: tdecore/kcharsets.cpp:51 tdehtml/tdehtml_part.cpp:285 tdeui/ksconfig.cpp:239
-#: tdeui/ksconfig.cpp:399 tdeui/ksconfig.cpp:660
+#: tdeui/ksconfig.cpp:399 tdeui/ksconfig.cpp:665
 msgid "Hebrew"
 msgstr "Do Thái"
 
@@ -3689,7 +3689,7 @@ msgid "Thai"
 msgstr "Thái"
 
 #: tdecore/kcharsets.cpp:55 tdehtml/tdehtml_part.cpp:290 tdeui/ksconfig.cpp:244
-#: tdeui/ksconfig.cpp:404 tdeui/ksconfig.cpp:665
+#: tdeui/ksconfig.cpp:404 tdeui/ksconfig.cpp:670
 msgid "Turkish"
 msgstr "Thổ Nhĩ Kỳ"
 
@@ -9005,21 +9005,21 @@ msgid ""
 "Unknown"
 msgstr "Lạ"
 
-#: tdeui/ksconfig.cpp:444 tdeui/ksconfig.cpp:598
+#: tdeui/ksconfig.cpp:444 tdeui/ksconfig.cpp:603
 msgid "ISpell Default"
 msgstr "Ispell mặc định"
 
-#: tdeui/ksconfig.cpp:492 tdeui/ksconfig.cpp:646
+#: tdeui/ksconfig.cpp:497 tdeui/ksconfig.cpp:651
 msgid ""
 "_: default spelling dictionary\n"
 "Default - %1 [%2]"
 msgstr "Mặc định — %1 [%2]"
 
-#: tdeui/ksconfig.cpp:512 tdeui/ksconfig.cpp:672
+#: tdeui/ksconfig.cpp:517 tdeui/ksconfig.cpp:677
 msgid "ASpell Default"
 msgstr "Aspell mặc định"
 
-#: tdeui/ksconfig.cpp:577 tdeui/ksconfig.cpp:737
+#: tdeui/ksconfig.cpp:582 tdeui/ksconfig.cpp:742
 #, c-format
 msgid ""
 "_: default spelling dictionary\n"