Merge translation files from master branch.

3 files changed, 79 insertions, 66 deletions

diff --git a/tde-i18n-sk/messages/tdebase/twin.po b/tde-i18n-sk/messages/tdebase/twin.po
index 4a1086370d4..872492ddf7d 100644
--- a/tde-i18n-sk/messages/tdebase/twin.po
+++ b/tde-i18n-sk/messages/tdebase/twin.po
@@ -4,11 +4,12 @@
 # Stanislav Visnovsky <visnovsky@nenya.ms.mff.cuni.cz>, 2002.
 # Stanislav Visnovsky <visnovsky@kde.org>, 2003, 2004.
 # Richard Fric <Richard.Fric@kdemail.net>, 2006.
+# Marek Mlynar <marek.inq.mlynar@gmail.com>, 2020.
 msgid ""
 msgstr ""
 "Project-Id-Version: twin\n"
 "POT-Creation-Date: 2020-05-11 13:04+0200\n"
-"PO-Revision-Date: 2020-02-11 04:07+0000\n"
+"PO-Revision-Date: 2020-10-08 01:48+0000\n"
 "Last-Translator: Marek Mlynar <marek.inq.mlynar@gmail.com>\n"
 "Language-Team: Slovak <https://mirror.git.trinitydesktop.org/weblate/"
 "projects/tdebase/twin/sk/>\n"
@@ -17,7 +18,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n"
-"X-Generator: Weblate 3.10.3\n"
+"X-Generator: Weblate 4.2.2\n"
 
 #. Instead of a literal translation, add your name to the end of the list (separated by a comma).
 msgid ""
@@ -119,7 +120,7 @@ msgstr "Rozbaliť"
 
 #: lib/kcommondecoration.cpp:450 lib/kcommondecoration.cpp:567
 msgid "Shade"
-msgstr "Zbaliť"
+msgstr "Zabaliť"
 
 #: lib/kdecoration_plugins_p.cpp:120
 msgid "No window decoration plugin library was found."
@@ -137,7 +138,7 @@ msgstr "Knižnica \"%1\" nie je modul pre TWin ."
 msgid ""
 "[twin] it looks like there's already a window manager running. twin not "
 "started.\n"
-msgstr "twin: zdá sa, že už je spustený správca okien. twin sa nespustil\n"
+msgstr "twin: zdá sa, že už je spustený správca okien. twin sa nespustil.\n"
 
 #: main.cpp:79
 msgid "[twin] failure during initialization; aborting"
@@ -165,7 +166,7 @@ msgstr "Nahradiť už bežiaceho ICCCM2.0 kompatibilného správcu okien"
 
 #: main.cpp:243
 msgid "Do not start composition manager"
-msgstr "Nespúšťať kompozitora"
+msgstr "Nespúšťať správcu kompozitora"
 
 #: main.cpp:321
 msgid "(c) 1999-2005, The KDE Developers"
@@ -617,39 +618,39 @@ msgstr "Prepnúť o jednu plochu dolu"
 
 #: twinbindings.cpp:146
 msgid "Switch to Screen 0"
-msgstr "Prepnúť na na obrazovku 0"
+msgstr "Prepnúť sa na obrazovku 0"
 
 #: twinbindings.cpp:147
 msgid "Switch to Screen 1"
-msgstr "Prepnúť na na obrazovku 1"
+msgstr "Prepnúť sa na obrazovku 1"
 
 #: twinbindings.cpp:148
 msgid "Switch to Screen 2"
-msgstr "Prepnúť na na obrazovku 2"
+msgstr "Prepnúť sa na obrazovku 2"
 
 #: twinbindings.cpp:149
 msgid "Switch to Screen 3"
-msgstr "Prepnúť na na obrazovku 3"
+msgstr "Prepnúť sa na obrazovku 3"
 
 #: twinbindings.cpp:150
 msgid "Switch to Screen 4"
-msgstr "Prepnúť na na obrazovku 4"
+msgstr "Prepnúť sa na obrazovku 4"
 
 #: twinbindings.cpp:151
 msgid "Switch to Screen 5"
-msgstr "Prepnúť na na obrazovku 5"
+msgstr "Prepnúť sa na obrazovku 5"
 
 #: twinbindings.cpp:152
 msgid "Switch to Screen 6"
-msgstr "Prepnúť na na obrazovku 6"
+msgstr "Prepnúť sa na obrazovku 6"
 
 #: twinbindings.cpp:153
 msgid "Switch to Screen 7"
-msgstr "Prepnúť na na obrazovku 7"
+msgstr "Prepnúť sa na obrazovku 7"
 
 #: twinbindings.cpp:154
 msgid "Switch to Next Screen"
-msgstr "Prepnúť na nasledujúcu obrazovku"
+msgstr "Prepnúť sa na nasledujúcu obrazovku"
 
 #: twinbindings.cpp:157
 msgid "Mouse Emulation"
@@ -665,7 +666,7 @@ msgstr "Zachytiť snímku obsahu okna"
 
 #: twinbindings.cpp:160
 msgid "Desktop Screenshot"
-msgstr "Zachytiť snímku  obsahu obrazovky"
+msgstr "Zachytiť snímku obsahu obrazovky"
 
 #: twinbindings.cpp:165
 msgid "Block Global Shortcuts"
@@ -701,7 +702,7 @@ msgstr "Po&zastaviť aplikáciu"
 
 #: useractions.cpp:73
 msgid "&Resume Application"
-msgstr "Znova spustiť aplikáciu"
+msgstr "Z&nova spustiť aplikáciu"
 
 #: useractions.cpp:75
 msgid "&Special Window Settings..."
diff --git a/tde-i18n-sk/messages/tdelibs/tdelibs_colors.po b/tde-i18n-sk/messages/tdelibs/tdelibs_colors.po
index e4d5920352d..a4dcfa0e88f 100644
--- a/tde-i18n-sk/messages/tdelibs/tdelibs_colors.po
+++ b/tde-i18n-sk/messages/tdelibs/tdelibs_colors.po
@@ -8,7 +8,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: 2003-11-17 12:43+0100\n"
 "Last-Translator: Stanislav Visnovsky <visnovsky@kde.org>\n"
 "Language-Team: Slovak <sk-i18n@linux.sk>\n"
@@ -18,6 +18,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-sk/messages/tdepim/kmailcvt.po b/tde-i18n-sk/messages/tdepim/kmailcvt.po
index 97615eb5903..f361429dd05 100644
--- a/tde-i18n-sk/messages/tdepim/kmailcvt.po
+++ b/tde-i18n-sk/messages/tdepim/kmailcvt.po
@@ -7,7 +7,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-07-05 12:53+0200\n"
 "Last-Translator: Richard Fric <Richard.Fric@kdemail.net>\n"
 "Language-Team: Slovak <kde-i18n-doc@kde.org>\n"
@@ -30,54 +30,6 @@ msgid ""
 "Your emails"
 msgstr "visnovsky@kde.org"
 
-#: kmailcvt.cpp:28
-msgid "KMailCVT Import Tool"
-msgstr "Importovací nástroj KMailCVT"
-
-#: kmailcvt.cpp:31
-msgid "Step 1: Select Filter"
-msgstr "Krok 1: Výber filtra"
-
-#: kmailcvt.cpp:34
-msgid "Step 2: Importing..."
-msgstr "Krok 2: Importovanie..."
-
-#: kmailcvt.cpp:76
-msgid "Import in progress"
-msgstr "Prebieha import"
-
-#: kmailcvt.cpp:79
-msgid "Import finished"
-msgstr "Import bol ukončený"
-
-#: kselfilterpage.cpp:78
-msgid "<p><i>Written by %1.</i></p>"
-msgstr "<p><i>Napísal %1.</i></p>"
-
-#: main.cpp:33
-msgid "KMailCVT"
-msgstr "KMailCVT"
-
-#: main.cpp:34
-msgid "KMail Import Filters"
-msgstr "Importovacie filtre KMailu"
-
-#: main.cpp:35
-msgid "(c) 2000-2005, The KMailCVT developers"
-msgstr "(c) 2000-2005, Vývojári KMailCVT"
-
-#: main.cpp:36
-msgid "Original author"
-msgstr "Pôvodný autor"
-
-#: main.cpp:37
-msgid "Maintainer & New filters"
-msgstr "Údržbár a nové filtre"
-
-#: main.cpp:38 main.cpp:39
-msgid "New GUI & cleanups"
-msgstr "Nové rozhranie a vyčistenie"
-
 #: filter_evolution.cxx:31
 msgid "Import Evolution 1.x Local Mails and Folder Structure"
 msgstr "Import lokálnych správ Evolution a štruktúry priečinkov"
@@ -550,6 +502,54 @@ msgstr "Nie je možné pridať správu do priečinku %1 v KMaile"
 msgid "Error while adding message to folder %1 in KMail"
 msgstr "Chyba pri pridávaní správy do priečinku %1 v KMaile"
 
+#: kmailcvt.cpp:28
+msgid "KMailCVT Import Tool"
+msgstr "Importovací nástroj KMailCVT"
+
+#: kmailcvt.cpp:31
+msgid "Step 1: Select Filter"
+msgstr "Krok 1: Výber filtra"
+
+#: kmailcvt.cpp:34
+msgid "Step 2: Importing..."
+msgstr "Krok 2: Importovanie..."
+
+#: kmailcvt.cpp:76
+msgid "Import in progress"
+msgstr "Prebieha import"
+
+#: kmailcvt.cpp:79
+msgid "Import finished"
+msgstr "Import bol ukončený"
+
+#: kselfilterpage.cpp:78
+msgid "<p><i>Written by %1.</i></p>"
+msgstr "<p><i>Napísal %1.</i></p>"
+
+#: main.cpp:33
+msgid "KMailCVT"
+msgstr "KMailCVT"
+
+#: main.cpp:34
+msgid "KMail Import Filters"
+msgstr "Importovacie filtre KMailu"
+
+#: main.cpp:35
+msgid "(c) 2000-2005, The KMailCVT developers"
+msgstr "(c) 2000-2005, Vývojári KMailCVT"
+
+#: main.cpp:36
+msgid "Original author"
+msgstr "Pôvodný autor"
+
+#: main.cpp:37
+msgid "Maintainer & New filters"
+msgstr "Údržbár a nové filtre"
+
+#: main.cpp:38 main.cpp:39
+msgid "New GUI & cleanups"
+msgstr "Nové rozhranie a vyčistenie"
+
 #: kimportpagedlg.ui:91
 #, no-c-format
 msgid "From:"