Merge translation files from master branch.

3 files changed, 18 insertions, 18 deletions

diff --git a/tde-i18n-ja/messages/tdebase/ksmserver.po b/tde-i18n-ja/messages/tdebase/ksmserver.po
index 0a528b33f2f..ce4b91e2dda 100644
--- a/tde-i18n-ja/messages/tdebase/ksmserver.po
+++ b/tde-i18n-ja/messages/tdebase/ksmserver.po
@@ -10,7 +10,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: 2007-03-13 18:00+0900\n"
 "Last-Translator: Yukiko Bando <ybando@k6.dion.ne.jp>\n"
 "Language-Team: Japanese <Kdeveloper@kde.gr.jp>\n"
@@ -62,11 +62,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-ja/messages/tdebase/ksysguard.po b/tde-i18n-ja/messages/tdebase/ksysguard.po
index 2380f7921b7..271cfe8ab48 100644
--- a/tde-i18n-ja/messages/tdebase/ksysguard.po
+++ b/tde-i18n-ja/messages/tdebase/ksysguard.po
@@ -10,7 +10,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ksysguard\n"
 "Report-Msgid-Bugs-To: http://bugs.trinitydesktop.org\n"
-"POT-Creation-Date: 2019-11-28 03:15+0100\n"
+"POT-Creation-Date: 2019-12-05 01:28+0100\n"
 "PO-Revision-Date: 2007-10-01 20:00+0900\n"
 "Last-Translator: Yukiko Bando <ybando@k6.dion.ne.jp>\n"
 "Language-Team: Japanese <Kdeveloper@kde.gr.jp>\n"
@@ -1539,7 +1539,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 システムガード"
@@ -1635,10 +1639,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 "(c) 1996-2002 KSysGuard 開発チーム"
@@ -1729,7 +1729,7 @@ msgstr "CPU"
 msgid "Mem"
 msgstr "メモリ"
 
-#~ msgid "TDE system guard"
+#~ msgid "TDE System Guard"
 #~ msgstr "TDE システムガード"
 
 #~ msgid "&Tree"
diff --git a/tde-i18n-ja/messages/tdelibs/tdelibs.po b/tde-i18n-ja/messages/tdelibs/tdelibs.po
index 2783a8015a6..594de3e56f1 100644
--- a/tde-i18n-ja/messages/tdelibs/tdelibs.po
+++ b/tde-i18n-ja/messages/tdelibs/tdelibs.po
@@ -11,7 +11,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: 2007-08-28 21:00+0900\n"
 "Last-Translator: Yukiko Bando <ybando@k6.dion.ne.jp>\n"
 "Language-Team: Japanese <Kdeveloper@kde.gr.jp>\n"
@@ -6566,7 +6566,7 @@ msgstr "致命的なパースエラー: %1 行 %2, 列 %3"
 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 "
@@ -6576,7 +6576,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 "
@@ -6586,11 +6586,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"
@@ -6601,12 +6601,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"