Merge translation files from master branch.

2 files changed, 62 insertions, 50 deletions

diff --git a/tde-i18n-sr/messages/tdelibs/tdelibs_colors.po b/tde-i18n-sr/messages/tdelibs/tdelibs_colors.po
index 868e44d3129..b5c34b57845 100644
--- a/tde-i18n-sr/messages/tdelibs/tdelibs_colors.po
+++ b/tde-i18n-sr/messages/tdelibs/tdelibs_colors.po
@@ -7,7 +7,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-06-14 21:14+0200\n"
 "Last-Translator: Toplica Tanaskovic <toptan@kde.org.yu>\n"
 "Language-Team: Srpski <kde-i18n-sr@kde.org>\n"
@@ -17,6 +17,18 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: KBabel 1.3.1\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-sr/messages/tdepim/kmailcvt.po b/tde-i18n-sr/messages/tdepim/kmailcvt.po
index b764a796f60..a9448861dc5 100644
--- a/tde-i18n-sr/messages/tdepim/kmailcvt.po
+++ b/tde-i18n-sr/messages/tdepim/kmailcvt.po
@@ -10,7 +10,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-01-08 15:56+0100\n"
 "Last-Translator: Chusslove Illich <caslav.ilic@gmx.net>\n"
 "Language-Team: Serbian <kde-i18n-sr@kde.org>\n"
@@ -32,54 +32,6 @@ msgid ""
 "Your emails"
 msgstr "toptan@kde.org.yu,simicsl@verat.net"
 
-#: 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><i>Написао %1.</i></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 "© 2000-2005, развојни тим KMailCVT-а"
-
-#: 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"
@@ -554,6 +506,54 @@ msgstr "Не могу да додам поруку у фасциклу %1 у KMa
 msgid "Error while adding message to folder %1 in KMail"
 msgstr "Грешка приликом додавања поруке у фасциклу %1 у KMail-у"
 
+#: 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><i>Написао %1.</i></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 "© 2000-2005, развојни тим KMailCVT-а"
+
+#: 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:"