Merge translation files from master branch.

2 files changed, 53 insertions, 28 deletions

diff --git a/tde-i18n-sr@Latn/messages/tdebase/konsole.po b/tde-i18n-sr@Latn/messages/tdebase/konsole.po
index 4a3f1532b8b..a0eed6ef635 100644
--- a/tde-i18n-sr@Latn/messages/tdebase/konsole.po
+++ b/tde-i18n-sr@Latn/messages/tdebase/konsole.po
@@ -10,7 +10,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: konsole\n"
-"POT-Creation-Date: 2019-07-08 00:07+0200\n"
+"POT-Creation-Date: 2020-01-02 05:37+0100\n"
 "PO-Revision-Date: 2007-02-27 10:16+0100\n"
 "Last-Translator: Slobodan Simic <[email protected]>\n"
 "Language-Team: Serbian <[email protected]>\n"
@@ -1047,108 +1047,108 @@ msgstr "ZModem napredak"
 msgid "&Stop"
 msgstr "Zaus&tavi"
 
-#: schemas:1
+#: ../other/BlackOnLightColor.schema:5
 msgid "Black on Light Color"
 msgstr "Crna na svetloj boji"
 
-#: schemas:2
+#: ../other/BlackOnLightYellow.schema:5
 msgid "Black on Light Yellow"
 msgstr "Crna na svetlo žutoj"
 
-#: schemas:3
+#: ../other/BlackOnWhite.schema:5
 msgid "Black on White"
 msgstr "Crna na beloj"
 
-#: schemas:4
+#: ../other/DarkPicture.schema:5
 msgid "Marble"
 msgstr "Mermer"
 
-#: schemas:5
+#: ../other/Example.Schema:5
 msgid "Ugly 1"
 msgstr ""
 
-#: schemas:6
+#: ../other/GreenOnBlack.schema:5
 msgid "Green on Black"
 msgstr "Zelena na crnoj"
 
-#: schemas:7
+#: ../other/GreenTint.schema:3
 msgid "Green Tint"
 msgstr "Zelena tinta"
 
-#: schemas:8
+#: ../other/GreenTint_MC.schema:3
 msgid "Green Tint with Transparent MC"
 msgstr "Zelena tinta sa providnim MC-om"
 
-#: schemas:9
+#: ../other/LightPaper.schema:5
 msgid "Paper, Light"
 msgstr "Papir, svetlo"
 
-#: schemas:10
+#: ../other/LightPicture.schema:5
 msgid "Paper"
 msgstr "Papir"
 
-#: schemas:11
+#: ../other/Linux.schema:3
 msgid "Linux Colors"
 msgstr "Boje Linux-a"
 
-#: schemas:12
+#: ../other/README.default.Schema:5
 #, fuzzy
 msgid "Konsole Defaults"
 msgstr "Konsole-ino podrazumevano"
 
-#: schemas:13
+#: ../other/Transparent.schema:3
 msgid "Transparent Konsole"
 msgstr "Providna konzola"
 
-#: schemas:14
+#: ../other/Transparent_MC.schema:3
 msgid "Transparent for MC"
 msgstr "Providan MC"
 
-#: schemas:15
+#: ../other/Transparent_darkbg.schema:3
 msgid "Transparent, Dark Background"
 msgstr "Providna, tamna pozadina"
 
-#: schemas:16
+#: ../other/Transparent_lightbg.schema:3
 msgid "Transparent, Light Background"
 msgstr "Providna, svetla pozadina"
 
-#: schemas:17
+#: ../other/WhiteOnBlack.schema:5
 msgid "White on Black"
 msgstr "Bela na crnoj"
 
-#: schemas:18
+#: ../other/XTerm.schema:9
 msgid "XTerm Colors"
 msgstr "Boje XTerm-a"
 
-#: schemas:19
+#: ../other/syscolor.schema:5
 msgid "System Colors"
 msgstr "Sistemske boje"
 
-#: schemas:20
+#: ../other/vim.schema:5
 msgid "VIM Colors"
 msgstr "Boje VIM-a"
 
-#: schemas:21
+#: ../other/README.default.Keytab:19
 msgid "XTerm (XFree 4.x.x)"
 msgstr "XTerm (XFree 4.x.x)"
 
-#: schemas:22
+#: ../other/linux.keytab:6
 msgid "linux console"
 msgstr "Konzola Linux-a"
 
-#: schemas:23
+#: ../other/solaris.keytab:4
 msgid "Solaris"
 msgstr "Solaris"
 
-#: schemas:24
+#: ../other/vt100.keytab:5
 msgid "vt100 (historical)"
 msgstr "VT100 (istorijski)"
 
-#: schemas:25
+#: ../other/vt420pc.keytab:20
 msgid "VT420PC"
 msgstr "VT420PC"
 
-#: schemas:26
+#: ../other/x11r5.keytab:3
 msgid "XTerm (XFree 3.x.x)"
 msgstr "XTerm (XFree 3.x.x)"
 
diff --git a/tde-i18n-sr@Latn/messages/tdegraphics/kooka.po b/tde-i18n-sr@Latn/messages/tdegraphics/kooka.po
index 5867e014dd8..43a9d7d519e 100644
--- a/tde-i18n-sr@Latn/messages/tdegraphics/kooka.po
+++ b/tde-i18n-sr@Latn/messages/tdegraphics/kooka.po
@@ -8,7 +8,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: kooka\n"
-"POT-Creation-Date: 2019-07-18 00:27+0200\n"
+"POT-Creation-Date: 2020-01-02 01:16+0100\n"
 "PO-Revision-Date: 2007-04-20 20:53+0200\n"
 "Last-Translator: Chusslove Illich <[email protected]>\n"
 "Language-Team: Serbian\n"
@@ -1084,6 +1084,31 @@ msgstr ""
 msgid "Spell-Check"
 msgstr "Provera pravopisa"
 
+#: main.cpp:47
+msgid ""
+"Kooka is a TDE application which provides access to scanner hardware\n"
+"using the SANE library.\n"
+"\n"
+"Kooka helps you scan, save your image in the correct image format\n"
+"and perform Optical Character Recognition on it, using gocr, Joerg\n"
+"Schulenburg's and friends' Open Source ocr program."
+msgstr ""
+
+#: main.cpp:54
+msgid ""
+"This program is distributed under the terms of the GPL v2 as publishec by\n"
+"the Free Software Foundation\n"
+"\n"
+"As a special exception, permission is given to link this program\n"
+"with any version of the KADMOS ocr/icr engine of reRecognition GmbH,\n"
+"Kreuzlingen and distribute the resulting executable without\n"
+"including the source code for KADMOS in the source distribution.\n"
+"\n"
+"As a special exception, permission is given to link this program\n"
+"with any edition of TQt, and distribute the resulting executable,\n"
+"without including the source code for TQt in the source distribution.\n"
+msgstr ""
+
 #: main.cpp:67
 msgid "The SANE compatible device specification (e.g. umax:/dev/sg0)"
 msgstr "Oznaka SANE kompatibilnog uređaja (npr. umax:/dev/sg0)"