Merge translation files from master branch.

2 files changed, 62 insertions, 57 deletions

diff --git a/tde-i18n-sk/messages/tdebase/kasbarextension.po b/tde-i18n-sk/messages/tdebase/kasbarextension.po
index e990a7e42a0..189a0151979 100644
--- a/tde-i18n-sk/messages/tdebase/kasbarextension.po
+++ b/tde-i18n-sk/messages/tdebase/kasbarextension.po
@@ -8,7 +8,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: kasbarextension\n"
-"POT-Creation-Date: 2019-01-13 18:47+0100\n"
+"POT-Creation-Date: 2019-07-18 01:58+0200\n"
 "PO-Revision-Date: 2008-07-20 12:46+0200\n"
 "Last-Translator: Richard Fric <Richard.Fric@kdemail.net>\n"
 "Language-Team: Slovak <sk@li.org>\n"
@@ -391,26 +391,25 @@ msgid "Enable &progress indicator"
 msgstr "Povoliť identifikátor &priebehu"
 
 #: kasprefsdlg.cpp:421
-msgid ""
-"Enables the display of a progress bar in the label of windows show are "
-"progress indicators."
+#, fuzzy
+msgid "Enables the display of a progress indicator in the label of windows."
 msgstr ""
 "Povolí zobrazenie pruhu priebehu pre okná, ktoré sú indikátormi priebehu."
 
-#: kasprefsdlg.cpp:426
+#: kasprefsdlg.cpp:425
 msgid "Enable &attention indicator"
 msgstr "Povoliť identifikátor &upozornenia"
 
-#: kasprefsdlg.cpp:428
+#: kasprefsdlg.cpp:427
 msgid ""
 "Enables the display of an icon that indicates a window that needs attention."
 msgstr "Povolí zobrazenie ikony, ktorá upozorňuje na okno."
 
-#: kasprefsdlg.cpp:432
+#: kasprefsdlg.cpp:431
 msgid "Enable frames for inactive items"
 msgstr "Povolí okraj pre neaktívne prvky"
 
-#: kasprefsdlg.cpp:434
+#: kasprefsdlg.cpp:433
 msgid ""
 "Enables frames around inactive items, if you want the bar to disappear into "
 "the background you should probably uncheck this option."
@@ -418,7 +417,7 @@ msgstr ""
 "Povolí okraje okolo aktívnych prvkov, ak chcete aby sa panel vytratil "
 "pravdepodobne nebude chcieť zvoliť túto možnosť."
 
-#: kasprefsdlg.cpp:445
+#: kasprefsdlg.cpp:444
 msgid ""
 "_n:  pixel\n"
 " pixels"
@@ -543,3 +542,9 @@ msgstr ""
 #: kastaskitem.cpp:504
 msgid "NET WM Specification Info"
 msgstr "Informácia špecifikácie NET WM"
+
+#~ msgid ""
+#~ "Enables the display of a progress bar in the label of windows show are "
+#~ "progress indicators."
+#~ msgstr ""
+#~ "Povolí zobrazenie pruhu priebehu pre okná, ktoré sú indikátormi priebehu."
diff --git a/tde-i18n-sk/messages/tdebase/ktip.po b/tde-i18n-sk/messages/tdebase/ktip.po
index 6ba5a366065..d656122b84c 100644
--- a/tde-i18n-sk/messages/tdebase/ktip.po
+++ b/tde-i18n-sk/messages/tdebase/ktip.po
@@ -1826,54 +1826,6 @@ msgid ""
 "</p>\n"
 msgstr ""
 
-#, fuzzy
-#~ msgid ""
-#~ "<p> Want TDE's printing power in non-TDE apps?  </p>\n"
-#~ "<p> Then use <strong>'tdeprinter'</strong> as \"print command\".\n"
-#~ "Works with Firefox, Seamonkey, PaleMoon, Chrome/Chromium, Epiphany, gv, "
-#~ "Acrobat Reader,\n"
-#~ "LibreOffice, OpenOffice, any GNOME application and many more...</p>\n"
-#~ "<center>\n"
-#~ "<img src=\"crystalsvg/48x48/devices/printer.png\">\n"
-#~ "<p align=\"right\"><em>Contributed by Kurt Pfeifle</em></p>\n"
-#~ msgstr ""
-#~ "<p> Chcete použiť TDE tlač aj v iných aplikáciách než v TDE?  </p>\n"
-#~ "<p> Jednoducho použite <strong>'kprinter'</strong> ako \"tlačový príkaz\" "
-#~ "v aplikácii.\n"
-#~ "Funguje to s Netscape, Mozilla, Galeon, gv, Acrobat Reader, S Office, "
-#~ "OpenOffice,\n"
-#~ "každou aplikáciou GNOME a s ďalšími...</p>\n"
-#~ "<center>\n"
-#~ "<img src=\"48x48/devices/printer1.png\">\n"
-#~ "<p align=\"right\"><em>Dodal Kurt Pfeifle</em></p>\n"
-
-#~ msgid ""
-#~ "<p>\n"
-#~ "You can let TDE turn the <b>NumLock</b> ON or OFF at startup.\n"
-#~ "</p>\n"
-#~ "<p>\n"
-#~ "Open the Control Center, select Peripherals->Keyboard and make your\n"
-#~ " choice.\n"
-#~ "</p>\n"
-#~ "<p>\n"
-#~ "<hr><br><br>\n"
-#~ "<i>This is the last tip in the tips database. Clicking \"Next\" will take "
-#~ "you back to\n"
-#~ " the first tip.</i>\n"
-#~ "</p>\n"
-#~ msgstr ""
-#~ "<p>\n"
-#~ "Pri štarte môžete TDE zapnúť alebo vypnúť <b>NumLock</b>.\n"
-#~ "</p>\n"
-#~ "<p>\n"
-#~ "Spustte Ovládacie centrum -> Periférie -> Klávesnica a vyberte si.\n"
-#~ "</p>\n"
-#~ "<p>\n"
-#~ "<hr><br><br>\n"
-#~ "<i>Toto je posledný tip. Stlačením \"Nasledujúci\" sa vrátite späť na "
-#~ "prvý tip.</i>\n"
-#~ "</p>\n"
-
 #~ msgid ""
 #~ "<P>\n"
 #~ "There is a lot of information about TDE on the\n"
@@ -1969,3 +1921,51 @@ msgstr ""
 #~ "asi bude ešte niekoľko týždňov/mesiacov vývoja trvať, kým\n"
 #~ "bude nová verzia.</p><br>\n"
 #~ "<center><img src=\"hicolor/48x48/apps/konqueror.png\"></center>\n"
+
+#, fuzzy
+#~ msgid ""
+#~ "<p> Want TDE's printing power in non-TDE apps?  </p>\n"
+#~ "<p> Then use <strong>'tdeprinter'</strong> as \"print command\".\n"
+#~ "Works with Firefox, Seamonkey, PaleMoon, Chrome/Chromium, Epiphany, gv, "
+#~ "Acrobat Reader,\n"
+#~ "LibreOffice, OpenOffice, any GNOME application and many more...</p>\n"
+#~ "<center>\n"
+#~ "<img src=\"crystalsvg/48x48/devices/printer.png\">\n"
+#~ "<p align=\"right\"><em>Contributed by Kurt Pfeifle</em></p>\n"
+#~ msgstr ""
+#~ "<p> Chcete použiť TDE tlač aj v iných aplikáciách než v TDE?  </p>\n"
+#~ "<p> Jednoducho použite <strong>'kprinter'</strong> ako \"tlačový príkaz\" "
+#~ "v aplikácii.\n"
+#~ "Funguje to s Netscape, Mozilla, Galeon, gv, Acrobat Reader, S Office, "
+#~ "OpenOffice,\n"
+#~ "každou aplikáciou GNOME a s ďalšími...</p>\n"
+#~ "<center>\n"
+#~ "<img src=\"48x48/devices/printer1.png\">\n"
+#~ "<p align=\"right\"><em>Dodal Kurt Pfeifle</em></p>\n"
+
+#~ msgid ""
+#~ "<p>\n"
+#~ "You can let TDE turn the <b>NumLock</b> ON or OFF at startup.\n"
+#~ "</p>\n"
+#~ "<p>\n"
+#~ "Open the Control Center, select Peripherals->Keyboard and make your\n"
+#~ " choice.\n"
+#~ "</p>\n"
+#~ "<p>\n"
+#~ "<hr><br><br>\n"
+#~ "<i>This is the last tip in the tips database. Clicking \"Next\" will take "
+#~ "you back to\n"
+#~ " the first tip.</i>\n"
+#~ "</p>\n"
+#~ msgstr ""
+#~ "<p>\n"
+#~ "Pri štarte môžete TDE zapnúť alebo vypnúť <b>NumLock</b>.\n"
+#~ "</p>\n"
+#~ "<p>\n"
+#~ "Spustte Ovládacie centrum -> Periférie -> Klávesnica a vyberte si.\n"
+#~ "</p>\n"
+#~ "<p>\n"
+#~ "<hr><br><br>\n"
+#~ "<i>Toto je posledný tip. Stlačením \"Nasledujúci\" sa vrátite späť na "
+#~ "prvý tip.</i>\n"
+#~ "</p>\n"