Merge translation files from master branch.

2 files changed, 64 insertions, 59 deletions

diff --git a/tde-i18n-sl/messages/tdebase/kasbarextension.po b/tde-i18n-sl/messages/tdebase/kasbarextension.po
index 6b104c396dd..47546d26767 100644
--- a/tde-i18n-sl/messages/tdebase/kasbarextension.po
+++ b/tde-i18n-sl/messages/tdebase/kasbarextension.po
@@ -11,7 +11,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: 2006-04-04 02:18+0200\n"
 "Last-Translator: Jure Repinc <jlp@holodeck1.com>\n"
 "Language-Team: Slovenian <sl@li.org>\n"
@@ -394,26 +394,25 @@ msgid "Enable &progress indicator"
 msgstr "Omogoči po&kazatelja napredka"
 
 #: 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 ""
 "Omogoči prikaz črte napredka v oznakah oken, ki so pokazatelji napredka."
 
-#: kasprefsdlg.cpp:426
+#: kasprefsdlg.cpp:425
 msgid "Enable &attention indicator"
 msgstr "Omogoči pokazatelja po&zornosti"
 
-#: kasprefsdlg.cpp:428
+#: kasprefsdlg.cpp:427
 msgid ""
 "Enables the display of an icon that indicates a window that needs attention."
 msgstr "Omogoči prikaz ikone, ki prikazuje, da je okno potrebno pozornosti."
 
-#: kasprefsdlg.cpp:432
+#: kasprefsdlg.cpp:431
 msgid "Enable frames for inactive items"
 msgstr "Omogoči okvirje za neaktivne gumbe"
 
-#: 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."
@@ -421,7 +420,7 @@ msgstr ""
 "Omogoči okvirje okoli neaktivnih gumbov. Če želite, da vrstica izgine v "
 "ozadje, potem izklopite to možnost."
 
-#: kasprefsdlg.cpp:445
+#: kasprefsdlg.cpp:444
 msgid ""
 "_n:  pixel\n"
 " pixels"
@@ -547,3 +546,9 @@ msgstr ""
 #: kastaskitem.cpp:504
 msgid "NET WM Specification Info"
 msgstr "Informacije o specifikaciji NET WM"
+
+#~ msgid ""
+#~ "Enables the display of a progress bar in the label of windows show are "
+#~ "progress indicators."
+#~ msgstr ""
+#~ "Omogoči prikaz črte napredka v oznakah oken, ki so pokazatelji napredka."
diff --git a/tde-i18n-sl/messages/tdebase/ktip.po b/tde-i18n-sl/messages/tdebase/ktip.po
index 5882f690f9d..1659962593f 100644
--- a/tde-i18n-sl/messages/tdebase/ktip.po
+++ b/tde-i18n-sl/messages/tdebase/ktip.po
@@ -1727,56 +1727,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> Želite zmogljivosti tiskanja v TDE v ne-TDE programih?  </p>\n"
-#~ "<p> Potem uporabljajte <strong>»kprinter«</strong> kot »tiskalniški "
-#~ "ukaz« ...\n"
-#~ "Deluje z Netscapeom, Mozillo, Galeonom, gv, Acrobat Readerjem,\n"
-#~ " StarOffice, OpenOffice, katerimkoli programom za GNOME in mnogimi "
-#~ "drugimi ...</p>\n"
-#~ "<center>\n"
-#~ "<img src=\"crystalsvg/48x48/devices/printer.png\">\n"
-#~ "<p align=\"right\"><em>Prispeval 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"
-#~ "TDE lahko nastavite, da tipko <b>NumLock</b> vključi ali izključi pri "
-#~ "zagonu.\n"
-#~ "</p>\n"
-#~ "<p>\n"
-#~ "Odprite Nadzorno središče > Strojni dodatki > Tipkovnica in izberite "
-#~ "željeno nastavitev.\n"
-#~ "</p>\n"
-#~ "<p>\n"
-#~ "<hr><br><br>\n"
-#~ "<i>To je zadnji namig v zbirki namigov. Klik na »Naslednji« vas bo \n"
-#~ "vrnil nazaj na prvi namig.</i>\n"
-#~ "</p>\n"
-
 #~ msgid ""
 #~ "<P>\n"
 #~ "There is a lot of information about TDE on the\n"
@@ -1870,3 +1820,53 @@ msgstr ""
 #~ "najdete samo zastarele načrte, nas od naslednje izdaje verjetno loči\n"
 #~ "vsaj še nekaj tednov ali mesecev intenzivnega razvoja.</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> Želite zmogljivosti tiskanja v TDE v ne-TDE programih?  </p>\n"
+#~ "<p> Potem uporabljajte <strong>»kprinter«</strong> kot »tiskalniški "
+#~ "ukaz« ...\n"
+#~ "Deluje z Netscapeom, Mozillo, Galeonom, gv, Acrobat Readerjem,\n"
+#~ " StarOffice, OpenOffice, katerimkoli programom za GNOME in mnogimi "
+#~ "drugimi ...</p>\n"
+#~ "<center>\n"
+#~ "<img src=\"crystalsvg/48x48/devices/printer.png\">\n"
+#~ "<p align=\"right\"><em>Prispeval 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"
+#~ "TDE lahko nastavite, da tipko <b>NumLock</b> vključi ali izključi pri "
+#~ "zagonu.\n"
+#~ "</p>\n"
+#~ "<p>\n"
+#~ "Odprite Nadzorno središče > Strojni dodatki > Tipkovnica in izberite "
+#~ "željeno nastavitev.\n"
+#~ "</p>\n"
+#~ "<p>\n"
+#~ "<hr><br><br>\n"
+#~ "<i>To je zadnji namig v zbirki namigov. Klik na »Naslednji« vas bo \n"
+#~ "vrnil nazaj na prvi namig.</i>\n"
+#~ "</p>\n"