Merge translation files from master branch.

2 files changed, 62 insertions, 50 deletions

diff --git a/tde-i18n-ja/messages/tdelibs/tdelibs_colors.po b/tde-i18n-ja/messages/tdelibs/tdelibs_colors.po
index b1ea3e007e7..1052d86d48f 100644
--- a/tde-i18n-ja/messages/tdelibs/tdelibs_colors.po
+++ b/tde-i18n-ja/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: 2006-06-19 21:00+0900\n"
 "Last-Translator: Yukiko Bando <[email protected]>\n"
 "Language-Team: Japanese <[email protected]>\n"
@@ -15,6 +15,18 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: KBabel 1.3\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-ja/messages/tdepim/kmailcvt.po b/tde-i18n-ja/messages/tdepim/kmailcvt.po
index cd814f0e217..9f430feb488 100644
--- a/tde-i18n-ja/messages/tdepim/kmailcvt.po
+++ b/tde-i18n-ja/messages/tdepim/kmailcvt.po
@@ -8,7 +8,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: 2007-02-21 23:00+0900\n"
 "Last-Translator: Yukiko Bando <[email protected]>\n"
 "Language-Team: Japanese <[email protected]>\n"
@@ -30,54 +30,6 @@ msgid ""
 "Your emails"
 msgstr "[email protected]"
 
-#: kmailcvt.cpp:28
-msgid "KMailCVT Import Tool"
-msgstr "KMailCVT インポートツール"
-
-#: kmailcvt.cpp:31
-msgid "Step 1: Select Filter"
-msgstr "ステップ 1: フィルタを選択"
-
-#: kmailcvt.cpp:34
-msgid "Step 2: Importing..."
-msgstr "ステップ 2: インポート..."
-
-#: 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>作者: %1</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 "(c) 2000-2005, The KMailCVT developers"
-
-#: 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 のローカルメールとフォルダ構造をインポート"
@@ -545,6 +497,54 @@ msgstr "KMail のフォルダ %1 にメッセージを追加できません"
 msgid "Error while adding message to folder %1 in KMail"
 msgstr "KMail のフォルダ %1 へのメッセージの追加中にエラー発生"
 
+#: kmailcvt.cpp:28
+msgid "KMailCVT Import Tool"
+msgstr "KMailCVT インポートツール"
+
+#: kmailcvt.cpp:31
+msgid "Step 1: Select Filter"
+msgstr "ステップ 1: フィルタを選択"
+
+#: kmailcvt.cpp:34
+msgid "Step 2: Importing..."
+msgstr "ステップ 2: インポート..."
+
+#: 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>作者: %1</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 "(c) 2000-2005, The KMailCVT developers"
+
+#: 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:"