Merge translation files from master branch.

2 files changed, 60 insertions, 54 deletions

diff --git a/tde-i18n-sr@Latn/messages/tdebase/kasbarextension.po b/tde-i18n-sr@Latn/messages/tdebase/kasbarextension.po
index e045a847424..50e584a339e 100644
--- a/tde-i18n-sr@Latn/messages/tdebase/kasbarextension.po
+++ b/tde-i18n-sr@Latn/messages/tdebase/kasbarextension.po
@@ -9,7 +9,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-05-04 18:31+0200\n"
 "Last-Translator: Chusslove Illich <caslav.ilic@gmx.net>\n"
 "Language-Team: Serbian <kde-i18n-sr@kde.org>\n"
@@ -394,27 +394,26 @@ msgid "Enable &progress indicator"
 msgstr "Aktiviraj indikator n&apretka"
 
 #: 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 ""
 "Aktivira prikaz trake napretka u oznakama prozora koji su indikatori "
 "napretka."
 
-#: kasprefsdlg.cpp:426
+#: kasprefsdlg.cpp:425
 msgid "Enable &attention indicator"
 msgstr "Aktiviraj indikator &pažnje"
 
-#: kasprefsdlg.cpp:428
+#: kasprefsdlg.cpp:427
 msgid ""
 "Enables the display of an icon that indicates a window that needs attention."
 msgstr "Aktivira prikaz ikone koja ukazuje da je prozoru potrebna pažnja."
 
-#: kasprefsdlg.cpp:432
+#: kasprefsdlg.cpp:431
 msgid "Enable frames for inactive items"
 msgstr "Aktiviraj okvire za neaktivne stavke"
 
-#: 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."
@@ -422,7 +421,7 @@ msgstr ""
 "Aktivira okvire oko neaktivnih stavki; ako želite da traka nestane u "
 "pozadini verovatno treba da isključite ovu opciju."
 
-#: kasprefsdlg.cpp:445
+#: kasprefsdlg.cpp:444
 msgid ""
 "_n:  pixel\n"
 " pixels"
@@ -547,3 +546,10 @@ msgstr ""
 #: kastaskitem.cpp:504
 msgid "NET WM Specification Info"
 msgstr "Info o NET WM specifikaciji"
+
+#~ msgid ""
+#~ "Enables the display of a progress bar in the label of windows show are "
+#~ "progress indicators."
+#~ msgstr ""
+#~ "Aktivira prikaz trake napretka u oznakama prozora koji su indikatori "
+#~ "napretka."
diff --git a/tde-i18n-sr@Latn/messages/tdebase/ktip.po b/tde-i18n-sr@Latn/messages/tdebase/ktip.po
index 137cb8a4613..4ca565cd80a 100644
--- a/tde-i18n-sr@Latn/messages/tdebase/ktip.po
+++ b/tde-i18n-sr@Latn/messages/tdebase/ktip.po
@@ -1730,51 +1730,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 TDE-ovu moć štampanja u ne-TDE programima?  </p>\n"
-#~ "<p> Onda koristite <strong>„kprinter“</strong> kao „naredbu za "
-#~ "štampanje“. \n"
-#~ "Uspešno radi sa programima Netscape, Mozilla, Galeon, gv, Acrobat "
-#~ "Reader,\n"
-#~ " StarOffice, OpenOffice.org, bilo kojim GNOME programom i mnogim "
-#~ "drugima...</p>\n"
-#~ "<center>\n"
-#~ "<img src=\"crystalsvg/48x48/devices/printer.png\">\n"
-#~ "<p align=\"right\"><em>Priložio Kurt Pfajfle (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>Možete podesiti TDE da uključi ili isključi <b>NumLock</b> po "
-#~ "prijavljivanju.</p>\n"
-#~ "<p>Otvorite Kontrolni centar, izaberite „Periferije->Tastatura“ i "
-#~ "izaberite.</p>\n"
-#~ "<p><hr><br><br>\n"
-#~ "<i>Ovo je poslednji savet u bazi. Klikom na „Sledeći“ vratićete se na "
-#~ "prvi savet.</i></p>\n"
-
 #~ msgid ""
 #~ "<P>\n"
 #~ "There is a lot of information about TDE on the\n"
@@ -1868,3 +1823,48 @@ msgstr ""
 #~ "rasporede izdanja, verovatno je potrebno još nekoliko sedmica/meseci "
 #~ "intenzivnog razvoja pre sledećeg izdanja.</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 TDE-ovu moć štampanja u ne-TDE programima?  </p>\n"
+#~ "<p> Onda koristite <strong>„kprinter“</strong> kao „naredbu za "
+#~ "štampanje“. \n"
+#~ "Uspešno radi sa programima Netscape, Mozilla, Galeon, gv, Acrobat "
+#~ "Reader,\n"
+#~ " StarOffice, OpenOffice.org, bilo kojim GNOME programom i mnogim "
+#~ "drugima...</p>\n"
+#~ "<center>\n"
+#~ "<img src=\"crystalsvg/48x48/devices/printer.png\">\n"
+#~ "<p align=\"right\"><em>Priložio Kurt Pfajfle (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>Možete podesiti TDE da uključi ili isključi <b>NumLock</b> po "
+#~ "prijavljivanju.</p>\n"
+#~ "<p>Otvorite Kontrolni centar, izaberite „Periferije->Tastatura“ i "
+#~ "izaberite.</p>\n"
+#~ "<p><hr><br><br>\n"
+#~ "<i>Ovo je poslednji savet u bazi. Klikom na „Sledeći“ vratićete se na "
+#~ "prvi savet.</i></p>\n"