Merge translation files from master branch.

2 files changed, 62 insertions, 50 deletions

diff --git a/tde-i18n-km/messages/tdelibs/tdelibs_colors.po b/tde-i18n-km/messages/tdelibs/tdelibs_colors.po
index f73bda4d6dc..e107dbe56f0 100644
--- a/tde-i18n-km/messages/tdelibs/tdelibs_colors.po
+++ b/tde-i18n-km/messages/tdelibs/tdelibs_colors.po
@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: tdelibs_colors\n"
-"POT-Creation-Date: 2020-10-07 19:49+0200\n"
+"POT-Creation-Date: 2020-10-08 04:28+0200\n"
 "PO-Revision-Date: 2005-11-04 15:09+0700\n"
 "Last-Translator: Khoem Sokhem <khoemsokhem@khmeros.info>\n"
 "Language-Team: Khmer <support@khmeros.info>\n"
@@ -15,6 +15,18 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: KBabel 1.10\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 ""
diff --git a/tde-i18n-km/messages/tdepim/kmailcvt.po b/tde-i18n-km/messages/tdepim/kmailcvt.po
index d18822146af..40617fc6b81 100644
--- a/tde-i18n-km/messages/tdepim/kmailcvt.po
+++ b/tde-i18n-km/messages/tdepim/kmailcvt.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: kmailcvt\n"
-"POT-Creation-Date: 2020-05-11 04:03+0200\n"
+"POT-Creation-Date: 2020-10-09 15:41+0200\n"
 "PO-Revision-Date: 2008-07-14 16:41+0700\n"
 "Last-Translator: Khoem Sokhem <khoemsokhem@khmeros.info>\n"
 "Language-Team: Khmer <en@li.org>\n"
@@ -30,54 +30,6 @@ msgstr ""
 "khoemsokhem@khmeros.info,soursdey@khmeros.info, evannak@khmeros.info,"
 "piseth_dv@khmeros.info"
 
-#: kmailcvt.cpp:28
-msgid "KMailCVT Import Tool"
-msgstr "ឧបករណ៍​នាំចូល KMailCVT"
-
-#: kmailcvt.cpp:31
-msgid "Step 1: Select Filter"
-msgstr "ជំហាន​ទី​ ១​ ៖ ជ្រើស​តម្រង​"
-
-#: kmailcvt.cpp:34
-msgid "Step 2: Importing..."
-msgstr "ជំហាន​ទី ២ ៖ កំពុង​នាំចូល​..."
-
-#: kmailcvt.cpp:76
-msgid "Import in progress"
-msgstr "នាំចូល​ក្នុង​ដំណើរការ"
-
-#: kmailcvt.cpp:79
-msgid "Import finished"
-msgstr "ការ​នាំចូល​បាន​បញ្ចប់​"
-
-#: kselfilterpage.cpp:78
-msgid "<p><i>Written by %1.</i></p>"
-msgstr "<p><i>បាន​សរសេរ​ដោយ​ %1 ។</i></p>"
-
-#: main.cpp:33
-msgid "KMailCVT"
-msgstr "KMailCVT"
-
-#: main.cpp:34
-msgid "KMail Import Filters"
-msgstr "តម្រង​នាំចូល​របស់ KMail"
-
-#: main.cpp:35
-msgid "(c) 2000-2005, The KMailCVT developers"
-msgstr "រក្សា​សិទ្ធិ​ឆ្នាំ ២000-២00៥ ដោយ​​អ្នក​អភិវឌ្ឍន៍ KMailCVT"
-
-#: main.cpp:36
-msgid "Original author"
-msgstr "អ្នក​និពន្ធ​ដើម​"
-
-#: main.cpp:37
-msgid "Maintainer & New filters"
-msgstr "អ្នក​ថែទាំ​ និង​តម្រង​ថ្មី​"
-
-#: main.cpp:38 main.cpp:39
-msgid "New GUI & cleanups"
-msgstr "GUI ថ្មី​ និង​ការ​បោស​សំអាត"
-
 #: filter_evolution.cxx:31
 msgid "Import Evolution 1.x Local Mails and Folder Structure"
 msgstr "នាំចូល​សំបុត្រ​មូលដ្ឋាន​របស់ Evolution 1.x ​និង​រចនាសម្ព័ន្ធ​ថត"
@@ -532,6 +484,54 @@ msgstr "មិន​អាច​បន្ថែម​សារ​ទៅ​ថត
 msgid "Error while adding message to folder %1 in KMail"
 msgstr "កំហុស​ខណៈពេល​បន្ថែម​សារ​ទៅ​ថត %1 ក្នុង KMail"
 
+#: kmailcvt.cpp:28
+msgid "KMailCVT Import Tool"
+msgstr "ឧបករណ៍​នាំចូល KMailCVT"
+
+#: kmailcvt.cpp:31
+msgid "Step 1: Select Filter"
+msgstr "ជំហាន​ទី​ ១​ ៖ ជ្រើស​តម្រង​"
+
+#: kmailcvt.cpp:34
+msgid "Step 2: Importing..."
+msgstr "ជំហាន​ទី ២ ៖ កំពុង​នាំចូល​..."
+
+#: kmailcvt.cpp:76
+msgid "Import in progress"
+msgstr "នាំចូល​ក្នុង​ដំណើរការ"
+
+#: kmailcvt.cpp:79
+msgid "Import finished"
+msgstr "ការ​នាំចូល​បាន​បញ្ចប់​"
+
+#: kselfilterpage.cpp:78
+msgid "<p><i>Written by %1.</i></p>"
+msgstr "<p><i>បាន​សរសេរ​ដោយ​ %1 ។</i></p>"
+
+#: main.cpp:33
+msgid "KMailCVT"
+msgstr "KMailCVT"
+
+#: main.cpp:34
+msgid "KMail Import Filters"
+msgstr "តម្រង​នាំចូល​របស់ KMail"
+
+#: main.cpp:35
+msgid "(c) 2000-2005, The KMailCVT developers"
+msgstr "រក្សា​សិទ្ធិ​ឆ្នាំ ២000-២00៥ ដោយ​​អ្នក​អភិវឌ្ឍន៍ KMailCVT"
+
+#: main.cpp:36
+msgid "Original author"
+msgstr "អ្នក​និពន្ធ​ដើម​"
+
+#: main.cpp:37
+msgid "Maintainer & New filters"
+msgstr "អ្នក​ថែទាំ​ និង​តម្រង​ថ្មី​"
+
+#: main.cpp:38 main.cpp:39
+msgid "New GUI & cleanups"
+msgstr "GUI ថ្មី​ និង​ការ​បោស​សំអាត"
+
 #: kimportpagedlg.ui:91
 #, no-c-format
 msgid "From:"