Merge translation files from master branch.

2 files changed, 62 insertions, 50 deletions

diff --git a/tde-i18n-pa/messages/tdelibs/tdelibs_colors.po b/tde-i18n-pa/messages/tdelibs/tdelibs_colors.po
index a1fb12198b4..a98e1023ee1 100644
--- a/tde-i18n-pa/messages/tdelibs/tdelibs_colors.po
+++ b/tde-i18n-pa/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: 2007-01-17 10:14+0530\n"
 "Last-Translator: A S Alam <aalam@users.sf.net>\n"
 "Language-Team: Punjabi <punjabi-l10n@lists.sf.net>\n"
@@ -16,6 +16,18 @@ msgstr ""
 "X-Generator: KBabel 1.11.4\n"
 "Plural-Forms: nplurals=2; plural=(n != 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-pa/messages/tdepim/kmailcvt.po b/tde-i18n-pa/messages/tdepim/kmailcvt.po
index e67c1f5e755..f94d915a94e 100644
--- a/tde-i18n-pa/messages/tdepim/kmailcvt.po
+++ b/tde-i18n-pa/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: 2007-01-17 10:47+0530\n"
 "Last-Translator: A S Alam <aalam@users.sf.net>\n"
 "Language-Team: Punjabi <punjabi-l10n@lists.sf.net>\n"
@@ -27,54 +27,6 @@ msgid ""
 "Your emails"
 msgstr "aalam@redhat.com,aalam@users.sf.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 "(c) ੨੦੦੦-੨੦੦੫, 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 ""
@@ -466,6 +418,54 @@ msgstr "ਕੇਮੇਲ ਵਿੱਚ %1 ਫੋਲਡਰ ਲਈ ਸੁਨੇਹ�
 msgid "Error while adding message to folder %1 in KMail"
 msgstr "ਕੇਮੇਲ ਵਿੱਚ %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><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 "(c) ੨੦੦੦-੨੦੦੫, 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:"