Merge translation files from master branch.

2 files changed, 62 insertions, 50 deletions

diff --git a/tde-i18n-gl/messages/tdelibs/tdelibs_colors.po b/tde-i18n-gl/messages/tdelibs/tdelibs_colors.po
index f81d3b1c74e..3cdd7d4c48a 100644
--- a/tde-i18n-gl/messages/tdelibs/tdelibs_colors.po
+++ b/tde-i18n-gl/messages/tdelibs/tdelibs_colors.po
@@ -3,7 +3,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-07-18 18:17+0200\n"
 "Last-Translator: Gonzalo H. Castilla <ttxzgl@yahoo.es>\n"
 "Language-Team: galego <trasno@ceu.fi.udc.es>\n"
@@ -13,6 +13,18 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: KBabel 1.0.2\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-gl/messages/tdepim/kmailcvt.po b/tde-i18n-gl/messages/tdepim/kmailcvt.po
index b53371edc51..a1820f95c81 100644
--- a/tde-i18n-gl/messages/tdepim/kmailcvt.po
+++ b/tde-i18n-gl/messages/tdepim/kmailcvt.po
@@ -4,7 +4,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: 2006-12-30 13:50+0100\n"
 "Last-Translator: Xabi G. Feal <xabigf@gmx.net>\n"
 "Language-Team: Galician <trasno@ceu.fi.udc.es>\n"
@@ -26,54 +26,6 @@ msgid ""
 "Your emails"
 msgstr "xabigf@gmx.net"
 
-#: kmailcvt.cpp:28
-msgid "KMailCVT Import Tool"
-msgstr "Ferramenta de importación de KMailCVT"
-
-#: kmailcvt.cpp:31
-msgid "Step 1: Select Filter"
-msgstr "Paso 1: Escoller filtro"
-
-#: kmailcvt.cpp:34
-msgid "Step 2: Importing..."
-msgstr "Paso 2: Importando..."
-
-#: kmailcvt.cpp:76
-msgid "Import in progress"
-msgstr "Importación en progreso"
-
-#: kmailcvt.cpp:79
-msgid "Import finished"
-msgstr "Importación rematada"
-
-#: kselfilterpage.cpp:78
-msgid "<p><i>Written by %1.</i></p>"
-msgstr "<p><i>Escrito por %1.</i></p>"
-
-#: main.cpp:33
-msgid "KMailCVT"
-msgstr "KMailCVT"
-
-#: main.cpp:34
-msgid "KMail Import Filters"
-msgstr "Filtros de Importación de KMail"
-
-#: main.cpp:35
-msgid "(c) 2000-2005, The KMailCVT developers"
-msgstr "(c) 2000-2005, Os desenvolvedores de KMailCVT"
-
-#: main.cpp:36
-msgid "Original author"
-msgstr "Autor orixinal"
-
-#: main.cpp:37
-msgid "Maintainer & New filters"
-msgstr "Mantedor & Novos Filtros"
-
-#: main.cpp:38 main.cpp:39
-msgid "New GUI & cleanups"
-msgstr "Pulementos e nova interface"
-
 #: filter_evolution.cxx:31
 msgid "Import Evolution 1.x Local Mails and Folder Structure"
 msgstr "Importar correos-e e estructura de cartafoles de Evolution 1.x"
@@ -553,6 +505,54 @@ msgstr "Non se pode engadir a mensaxe ao cartafol %1 en KMail"
 msgid "Error while adding message to folder %1 in KMail"
 msgstr "Erro ao engadir a mensaxe ao cartafol %1 en KMail"
 
+#: kmailcvt.cpp:28
+msgid "KMailCVT Import Tool"
+msgstr "Ferramenta de importación de KMailCVT"
+
+#: kmailcvt.cpp:31
+msgid "Step 1: Select Filter"
+msgstr "Paso 1: Escoller filtro"
+
+#: kmailcvt.cpp:34
+msgid "Step 2: Importing..."
+msgstr "Paso 2: Importando..."
+
+#: kmailcvt.cpp:76
+msgid "Import in progress"
+msgstr "Importación en progreso"
+
+#: kmailcvt.cpp:79
+msgid "Import finished"
+msgstr "Importación rematada"
+
+#: kselfilterpage.cpp:78
+msgid "<p><i>Written by %1.</i></p>"
+msgstr "<p><i>Escrito por %1.</i></p>"
+
+#: main.cpp:33
+msgid "KMailCVT"
+msgstr "KMailCVT"
+
+#: main.cpp:34
+msgid "KMail Import Filters"
+msgstr "Filtros de Importación de KMail"
+
+#: main.cpp:35
+msgid "(c) 2000-2005, The KMailCVT developers"
+msgstr "(c) 2000-2005, Os desenvolvedores de KMailCVT"
+
+#: main.cpp:36
+msgid "Original author"
+msgstr "Autor orixinal"
+
+#: main.cpp:37
+msgid "Maintainer & New filters"
+msgstr "Mantedor & Novos Filtros"
+
+#: main.cpp:38 main.cpp:39
+msgid "New GUI & cleanups"
+msgstr "Pulementos e nova interface"
+
 #: kimportpagedlg.ui:91
 #, no-c-format
 msgid "From:"