From 68d9e45b9f6374a3478cedd1daf8c0ba47225cde Mon Sep 17 00:00:00 2001
From: Automated System <slavek.banko@axis.cz>
Date: Thu, 5 Dec 2019 02:35:47 +0100
Subject: Merge translation files from master branch.

---
 tde-i18n-km/messages/tdebase/ksmserver.po |  6 +++---
 tde-i18n-km/messages/tdebase/ksysguard.po | 14 +++++++-------
 tde-i18n-km/messages/tdelibs/tdelibs.po   | 16 ++++++++--------
 3 files changed, 18 insertions(+), 18 deletions(-)

(limited to 'tde-i18n-km')

diff --git a/tde-i18n-km/messages/tdebase/ksmserver.po b/tde-i18n-km/messages/tdebase/ksmserver.po
index 53937d3225c..8ea8acf8f9c 100644
--- a/tde-i18n-km/messages/tdebase/ksmserver.po
+++ b/tde-i18n-km/messages/tdebase/ksmserver.po
@@ -4,7 +4,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: ksmserver\n"
-"POT-Creation-Date: 2019-01-23 23:16+0100\n"
+"POT-Creation-Date: 2019-12-05 01:28+0100\n"
 "PO-Revision-Date: 2008-07-15 15:07+0700\n"
 "Last-Translator: Khoem Sokhem <khoemsokhem@khmeros.info>\n"
 "Language-Team: Khmer <en@li.org>\n"
@@ -56,11 +56,11 @@ msgstr ""
 msgid "Also allow remote connections"
 msgstr "អនុញ្ញាតឲ្យ​មានការ​តភ្ជាប់​ពី​ចម្ងាយ​ផង​ដែរ"
 
-#: main.cpp:183
+#: main.cpp:179
 msgid "The TDE Session Manager"
 msgstr "កម្មវិធី​គ្រប់គ្រង​សម័យ TDE"
 
-#: main.cpp:187
+#: main.cpp:183
 msgid "Maintainer"
 msgstr "អ្នក​ថែទាំ"
 
diff --git a/tde-i18n-km/messages/tdebase/ksysguard.po b/tde-i18n-km/messages/tdebase/ksysguard.po
index 303f640a536..8ace9915db1 100644
--- a/tde-i18n-km/messages/tdebase/ksysguard.po
+++ b/tde-i18n-km/messages/tdebase/ksysguard.po
@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: ksysguard\n"
-"POT-Creation-Date: 2019-11-28 03:15+0100\n"
+"POT-Creation-Date: 2019-12-05 01:28+0100\n"
 "PO-Revision-Date: 2008-07-15 15:14+0700\n"
 "Last-Translator: Khoem Sokhem <khoemsokhem@khmeros.info>\n"
 "Language-Team: Khmer <en@li.org>\n"
@@ -1535,7 +1535,11 @@ msgstr "កំណត់​ឧបករណ៍​កំណត់​ពេល​វ
 msgid "Use update interval of worksheet"
 msgstr "ប្រើ​ចន្លោះ​ពេលធ្វើ​ឲ្យ​ទាន់​សម័យសន្លឹក​កិច្ចការ"
 
-#: ksysguard.cc:64 ksysguard.cc:74
+#: ksysguard.cc:64
+msgid "TDE system guard"
+msgstr "ឆ្មាំ​ប្រព័ន្ធ TDE"
+
+#: ksysguard.cc:74 ksysguard.cc:556
 #, fuzzy
 msgid "KSysGuard"
 msgstr "ឆ្មាំ​ប្រព័ន្ធ TDE"
@@ -1631,10 +1635,6 @@ msgstr "បង្ហាញ​តែ​បញ្ជី​ដំណើរការ
 msgid "Optional worksheet files to load"
 msgstr "ឯកសារ​សន្លឹក​កិច្ចការ​ស្រេចចិត្ត​ដែល​ត្រូវ​ផ្ទុក"
 
-#: ksysguard.cc:556
-msgid "TDE System Guard"
-msgstr "ឆ្មាំ​ប្រព័ន្ធ TDE"
-
 #: ksysguard.cc:558
 msgid "(c) 1996-2002 The KSysGuard Developers"
 msgstr "រក្សាសិទ្ធិ​ឆ្នាំ ១៩៩៦-២០០២ ដោយ​អ្នក​​អភិវឌ្ឍន៍ KSysGuard"
@@ -1736,7 +1736,7 @@ msgstr "CPU"
 msgid "Mem"
 msgstr "សតិ"
 
-#~ msgid "TDE system guard"
+#~ msgid "TDE System Guard"
 #~ msgstr "ឆ្មាំ​ប្រព័ន្ធ TDE"
 
 #~ msgid "&Tree"
diff --git a/tde-i18n-km/messages/tdelibs/tdelibs.po b/tde-i18n-km/messages/tdelibs/tdelibs.po
index b4da3aaa90a..1960dc0692a 100644
--- a/tde-i18n-km/messages/tdelibs/tdelibs.po
+++ b/tde-i18n-km/messages/tdelibs/tdelibs.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: tdelibs\n"
-"POT-Creation-Date: 2019-08-01 05:09+0200\n"
+"POT-Creation-Date: 2019-12-05 01:24+0100\n"
 "PO-Revision-Date: 2008-07-15 14:20+0700\n"
 "Last-Translator: Khoem Sokhem <khoemsokhem@khmeros.info>\n"
 "Language-Team: Khmer <en@li.org>\n"
@@ -6533,7 +6533,7 @@ msgstr "កំហុស​ញែក​ធ្ងន់ធ្ងរ ៖ %1 នៅ
 msgid "XML parsing error"
 msgstr "កំហុស​ញែក XML"
 
-#: tdeinit/tdeinit.cpp:475
+#: tdeinit/tdeinit.cpp:476
 msgid ""
 "Unable to start new process.\n"
 "The system may have reached the maximum number of open files possible or the "
@@ -6543,7 +6543,7 @@ msgstr ""
 "ប្រព័ន្ធ​ប្រហែល​ជា​ឈាន​ដល់ចំនួន​ឯកសារ​អតិបរមា​ដែល​អាច​​​បើកបាន ឬ វាបាន​ឈាន​​ដល់​ចំនួន​ឯកសារ​អតិបរមា​ដែល​អាច​"
 "បើក ដែល​​អ្នក​បាន​កំណត់ ។"
 
-#: tdeinit/tdeinit.cpp:497
+#: tdeinit/tdeinit.cpp:498
 msgid ""
 "Unable to create new process.\n"
 "The system may have reached the maximum number of processes possible or the "
@@ -6553,11 +6553,11 @@ msgstr ""
 "ប្រព័ន្ធ​ប្រហែល​ជា​ឈាន​ដល់ចំនួន​ឯកសារ​អតិបរមា​ដែល​អាច​​​បើកបាន ឬ វាបាន​ឈាន​​ដល់​ចំនួន​ឯកសារ​អតិបរមា​ដែល​អាច​"
 "បើក ដែល​​អ្នក​បាន​កំណត់ ។"
 
-#: tdeinit/tdeinit.cpp:589
+#: tdeinit/tdeinit.cpp:590
 msgid "Could not find '%1' executable."
 msgstr "រក​មិន​ឃើញ '%1' ដែល​អាច​ប្រតិបត្តិបាន ។"
 
-#: tdeinit/tdeinit.cpp:605
+#: tdeinit/tdeinit.cpp:606
 msgid ""
 "Could not open library '%1'.\n"
 "%2"
@@ -6568,12 +6568,12 @@ msgstr ""
 #: ../dependencies/tqt3/src/network/qftp.cpp:1252
 #: ../dependencies/tqt3/src/network/qftp.cpp:1980
 #: ../dependencies/tqt3/src/network/qhttp.cpp:1226
-#: ../dependencies/tqt3/src/network/qhttp.cpp:1793 tdeinit/tdeinit.cpp:606
-#: tdeinit/tdeinit.cpp:649
+#: ../dependencies/tqt3/src/network/qhttp.cpp:1793 tdeinit/tdeinit.cpp:607
+#: tdeinit/tdeinit.cpp:650
 msgid "Unknown error"
 msgstr "មិន​ស្គាល់​កំហុស"
 
-#: tdeinit/tdeinit.cpp:648
+#: tdeinit/tdeinit.cpp:649
 msgid ""
 "Could not find 'kdemain' in '%1'.\n"
 "%2"
-- 
cgit v1.2.1