From a09ae58928ef36b3b5ff22b429eaa81cd2edca8f Mon Sep 17 00:00:00 2001
From: Automated System <slavek.banko@axis.cz>
Date: Thu, 5 Dec 2019 02:36:33 +0100
Subject: [PATCH] Merge translation files from master branch.

---
 kdiff3plugin/po/sk.po | 44 +++++++++++++++++++++++++++----------------
 1 file changed, 28 insertions(+), 16 deletions(-)

diff --git a/kdiff3plugin/po/sk.po b/kdiff3plugin/po/sk.po
index 2c8f56f..ed7f66c 100644
--- a/kdiff3plugin/po/sk.po
+++ b/kdiff3plugin/po/sk.po
@@ -5,27 +5,28 @@ msgid ""
 msgstr ""
 "Project-Id-Version: kdiff3_plugin\n"
 "POT-Creation-Date: 2018-12-27 19:51+0100\n"
-"PO-Revision-Date: 2006-11-19 16:30+0100\n"
-"Last-Translator: Richard Fric <Richard.Fric@kdemail.net>\n"
-"Language-Team: Slovak <sk@li.org>\n"
+"PO-Revision-Date: 2019-12-04 23:59+0000\n"
+"Last-Translator: Marek Mlynar <marek.inq.mlynar@gmail.com>\n"
+"Language-Team: Slovak <https://mirror.git.trinitydesktop.org/weblate/"
+"projects/applications/kdiff3-plugin/sk/>\n"
 "Language: sk\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: KBabel 1.11.4\n"
-"Plural-Forms:  nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n"
+"Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n"
+"X-Generator: Weblate 3.9.1\n"
 
 #: _translatorinfo:1
 msgid ""
 "_: NAME OF TRANSLATORS\n"
 "Your names"
-msgstr ""
+msgstr "Preklad SVK: Marek Mynár"
 
 #: _translatorinfo:2
 msgid ""
 "_: EMAIL OF TRANSLATORS\n"
 "Your emails"
-msgstr ""
+msgstr "marek.inq.mlynar@gmail.com"
 
 #: kdiff3plugin.cpp:97
 msgid "KDiff3"
@@ -34,40 +35,40 @@ msgstr "KDiff3"
 #: kdiff3plugin.cpp:104
 #, c-format
 msgid "Compare with %1"
-msgstr ""
+msgstr "Porovnaj s %1"
 
 #: kdiff3plugin.cpp:109
 #, c-format
 msgid "Merge with %1"
-msgstr ""
+msgstr "Zlúč s %1"
 
 #: kdiff3plugin.cpp:114
 msgid "Save '%1' for later"
-msgstr ""
+msgstr "Ulož '%1' na neskôr"
 
 #: kdiff3plugin.cpp:119
 msgid "3-way merge with base"
-msgstr ""
+msgstr "3-cestné zlúčenie so základom"
 
 #: kdiff3plugin.cpp:125
 msgid "Compare with ..."
-msgstr ""
+msgstr "Porovnaj s..."
 
 #: kdiff3plugin.cpp:134
 msgid "Clear list"
-msgstr ""
+msgstr "Vyčisti zoznam"
 
 #: kdiff3plugin.cpp:141
 msgid "Compare"
-msgstr ""
+msgstr "Porovnaj"
 
 #: kdiff3plugin.cpp:146
 msgid "3 way comparison"
-msgstr ""
+msgstr "3 cestné porovnanie"
 
 #: kdiff3plugin.cpp:149
 msgid "About KDiff3 menu plugin ..."
-msgstr ""
+msgstr "O KDiff3 menu plugine..."
 
 #: kdiff3plugin.cpp:250
 msgid ""
@@ -75,6 +76,9 @@ msgid ""
 "KDiff3 homepage: http://kdiff3.sourceforge.net\n"
 "\n"
 msgstr ""
+"KDiff3 Menu Plugin: Copyright (C) 2006 Joachim Eibl\n"
+"KDiff3 domáca stránka: http://kdiff3.sourceforge.net\n"
+"\n"
 
 #: kdiff3plugin.cpp:252
 msgid ""
@@ -88,3 +92,11 @@ msgid ""
 "destination.\n"
 "Same also applies to directory comparison and merge."
 msgstr ""
+"Používanie rozšírenia kontextového menu:\n"
+"Pre jednoduché porovnanie 2 súborov vyberte \"Porovnaj\".\n"
+"Ak sa nachádza ďalší súbor niekde inde, vyberte \"Uložiť\" prvý súbor na "
+"neskôr. potom sa objaví v submenu \"Porovnaj s...\". potom použite "
+"\"Porovnaj s...\" na druhý súbor.\n"
+"Pre 3-cestné zlúčenie najskôr použite \"Uložiť\" na prvý súbor, tiež na "
+"druhý súbor a nakoniec zvoľte \"3-cestné zlúčenie so základom\" na tretí  "
+"ktorý poslúži ako cieľový."