Merge translation files from master branch.

2 files changed, 62 insertions, 50 deletions

diff --git a/tde-i18n-ga/messages/tdelibs/tdelibs_colors.po b/tde-i18n-ga/messages/tdelibs/tdelibs_colors.po
index 86ec7f10dd1..d3d8e5b577b 100644
--- a/tde-i18n-ga/messages/tdelibs/tdelibs_colors.po
+++ b/tde-i18n-ga/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: 2004-12-03 14:52-0500\n"
 "Last-Translator: Kevin Patrick Scannell <scannell@SLU.EDU>\n"
 "Language-Team: Irish <ga@li.org>\n"
@@ -15,6 +15,18 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: KBabel 0.9.6\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-ga/messages/tdepim/kmailcvt.po b/tde-i18n-ga/messages/tdepim/kmailcvt.po
index f935b7eb5f2..feb5dedea2e 100644
--- a/tde-i18n-ga/messages/tdepim/kmailcvt.po
+++ b/tde-i18n-ga/messages/tdepim/kmailcvt.po
@@ -1,7 +1,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: tdepim/kmailcvt.po\n"
-"POT-Creation-Date: 2020-05-11 04:03+0200\n"
+"POT-Creation-Date: 2020-10-09 15:41+0200\n"
 "PO-Revision-Date: 2004-12-03 14:52-0500\n"
 "Last-Translator: Kevin Patrick Scannell <scannell@SLU.EDU>\n"
 "Language-Team: ga <LL@li.org>\n"
@@ -22,54 +22,6 @@ msgid ""
 "Your emails"
 msgstr "seoc at iolfree dot ie,scannell at slu dot edu"
 
-#: kmailcvt.cpp:28
-msgid "KMailCVT Import Tool"
-msgstr "Uirlis Iompórtála KMailCVT"
-
-#: kmailcvt.cpp:31
-msgid "Step 1: Select Filter"
-msgstr "Céim a haon: Roghnaigh Scagaire"
-
-#: kmailcvt.cpp:34
-msgid "Step 2: Importing..."
-msgstr "Céim a dó: Á nIompórtáil"
-
-#: kmailcvt.cpp:76
-msgid "Import in progress"
-msgstr "Iompórtáil ar siúl"
-
-#: kmailcvt.cpp:79
-msgid "Import finished"
-msgstr ""
-
-#: kselfilterpage.cpp:78
-msgid "<p><i>Written by %1.</i></p>"
-msgstr "<p><i>Scríofa ag %1.</i></p>"
-
-#: main.cpp:33
-msgid "KMailCVT"
-msgstr "KMailCVT"
-
-#: main.cpp:34
-msgid "KMail Import Filters"
-msgstr "Scagairí Iompórtála KMail"
-
-#: main.cpp:35
-msgid "(c) 2000-2005, The KMailCVT developers"
-msgstr "© 2000-2005, Forbróirí KMailCVT"
-
-#: main.cpp:36
-msgid "Original author"
-msgstr "An chéad údar"
-
-#: main.cpp:37
-msgid "Maintainer & New filters"
-msgstr "Cothaitheoir & Scagairí nua"
-
-#: main.cpp:38 main.cpp:39
-msgid "New GUI & cleanups"
-msgstr "Comhéadan nua & glanadh"
-
 #: filter_evolution.cxx:31
 msgid "Import Evolution 1.x Local Mails and Folder Structure"
 msgstr ""
@@ -461,6 +413,54 @@ msgstr "Ní féidir teachtaireacht a chur leis an fhillteán %1 i KMail"
 msgid "Error while adding message to folder %1 in KMail"
 msgstr ""
 
+#: kmailcvt.cpp:28
+msgid "KMailCVT Import Tool"
+msgstr "Uirlis Iompórtála KMailCVT"
+
+#: kmailcvt.cpp:31
+msgid "Step 1: Select Filter"
+msgstr "Céim a haon: Roghnaigh Scagaire"
+
+#: kmailcvt.cpp:34
+msgid "Step 2: Importing..."
+msgstr "Céim a dó: Á nIompórtáil"
+
+#: kmailcvt.cpp:76
+msgid "Import in progress"
+msgstr "Iompórtáil ar siúl"
+
+#: kmailcvt.cpp:79
+msgid "Import finished"
+msgstr ""
+
+#: kselfilterpage.cpp:78
+msgid "<p><i>Written by %1.</i></p>"
+msgstr "<p><i>Scríofa ag %1.</i></p>"
+
+#: main.cpp:33
+msgid "KMailCVT"
+msgstr "KMailCVT"
+
+#: main.cpp:34
+msgid "KMail Import Filters"
+msgstr "Scagairí Iompórtála KMail"
+
+#: main.cpp:35
+msgid "(c) 2000-2005, The KMailCVT developers"
+msgstr "© 2000-2005, Forbróirí KMailCVT"
+
+#: main.cpp:36
+msgid "Original author"
+msgstr "An chéad údar"
+
+#: main.cpp:37
+msgid "Maintainer & New filters"
+msgstr "Cothaitheoir & Scagairí nua"
+
+#: main.cpp:38 main.cpp:39
+msgid "New GUI & cleanups"
+msgstr "Comhéadan nua & glanadh"
+
 #: kimportpagedlg.ui:91
 #, no-c-format
 msgid "From:"