Merge translation files from master branch.

1 files changed, 35 insertions, 29 deletions

diff --git a/tde-i18n-sr@Latn/messages/tdebase/kcmfonts.po b/tde-i18n-sr@Latn/messages/tdebase/kcmfonts.po
index d75d3ab2494..65becf6771a 100644
--- a/tde-i18n-sr@Latn/messages/tdebase/kcmfonts.po
+++ b/tde-i18n-sr@Latn/messages/tdebase/kcmfonts.po
@@ -9,7 +9,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: kcmfonts\n"
-"POT-Creation-Date: 2020-05-11 04:01+0200\n"
+"POT-Creation-Date: 2021-10-07 18:17+0000\n"
 "PO-Revision-Date: 2007-04-20 21:24+0200\n"
 "Last-Translator: Chusslove Illich <caslav.ilic@gmx.net>\n"
 "Language-Team: Serbian <kde-i18n-sr@kde.org>\n"
@@ -153,7 +153,7 @@ msgstr "Kliknite da izmenite sve fontove"
 msgid "Use a&nti-aliasing:"
 msgstr "Koristi &omekšavanje:"
 
-#: fonts.cpp:624
+#: fonts.cpp:624 fonts.cpp:641
 msgid "Enabled"
 msgstr "Uključeno"
 
@@ -179,37 +179,15 @@ msgstr "Podesi..."
 msgid "Force fonts DPI:"
 msgstr "Forsiraj DPI fontova:"
 
-#: fonts.cpp:641
-msgid "96 DPI"
-msgstr "96 DPI"
-
-#: fonts.cpp:642
-msgid "120 DPI"
-msgstr "120 DPI"
-
-#: fonts.cpp:644
+#: fonts.cpp:643
 msgid ""
 "<p>This option forces a specific DPI value for fonts. It may be useful when "
 "the real DPI of the hardware is not detected properly and it is also often "
 "misused when poor quality fonts are used that do not look well with DPI "
-"values other than 96 or 120 DPI.</p><p>The use of this option is generally "
-"discouraged. For selecting proper DPI value a better option is explicitly "
-"configuring it for the whole X server if possible (e.g. DisplaySize in xorg."
-"conf or adding <i>-dpi value</i> to ServerLocalArgs= in $TDEDIR/share/config/"
-"tdm/tdmrc). When fonts do not render properly with real DPI value better "
-"fonts should be used or configuration of font hinting should be checked.</p>"
+"values other than 96 or 120 DPI.</p>"
 msgstr ""
-"<p>Ova opcija prisiljava određenu DPI vrednost za fontove. Ovo može biti "
-"korisno kada prava DPI vrednost za trenutni hardver nije pravilno otkrivena, "
-"kao i kada se koriste fontovi slabijeg kvaliteta koji dobro izgledaju samo "
-"pri 96 ili 120 DPI.</p><p>Uglavnom, ovu opciju ne treba koristiti. Bolje je "
-"umesto toga, ako je moguće, tačno podesiti DPI vrednost za ceo X-server "
-"(npr. DisplaySize u xorg.conf ili dodavanjem <i>-dpi vrednost</i> u "
-"ServerLocalArgs= u $TDEDIR/share/config/tdm/tdmrc). Ako i tada fontovi loše "
-"izgledaju, treba ili izabrati bolje fontove, ili možda isprobati opciju "
-"navođenja fontova u podešavanjima.</p>"
-
-#: fonts.cpp:761
+
+#: fonts.cpp:772
 msgid ""
 "<p>Some changes such as anti-aliasing will only affect newly started "
 "applications.</p>"
@@ -217,7 +195,7 @@ msgstr ""
 "<p>Neke postavke, kao npr. omekšavanje, imaće uticaja tek na novopokrenute "
 "programe.</p>"
 
-#: fonts.cpp:762
+#: fonts.cpp:773
 msgid "Font Settings Changed"
 msgstr "Promenjene postavke fontova"
 
@@ -252,3 +230,31 @@ msgstr "Ovlaš"
 #: kxftconfig.cpp:921
 msgid "Full"
 msgstr "Puno"
+
+#~ msgid "96 DPI"
+#~ msgstr "96 DPI"
+
+#~ msgid "120 DPI"
+#~ msgstr "120 DPI"
+
+#~ msgid ""
+#~ "<p>This option forces a specific DPI value for fonts. It may be useful "
+#~ "when the real DPI of the hardware is not detected properly and it is also "
+#~ "often misused when poor quality fonts are used that do not look well with "
+#~ "DPI values other than 96 or 120 DPI.</p><p>The use of this option is "
+#~ "generally discouraged. For selecting proper DPI value a better option is "
+#~ "explicitly configuring it for the whole X server if possible (e.g. "
+#~ "DisplaySize in xorg.conf or adding <i>-dpi value</i> to ServerLocalArgs= "
+#~ "in $TDEDIR/share/config/tdm/tdmrc). When fonts do not render properly "
+#~ "with real DPI value better fonts should be used or configuration of font "
+#~ "hinting should be checked.</p>"
+#~ msgstr ""
+#~ "<p>Ova opcija prisiljava određenu DPI vrednost za fontove. Ovo može biti "
+#~ "korisno kada prava DPI vrednost za trenutni hardver nije pravilno "
+#~ "otkrivena, kao i kada se koriste fontovi slabijeg kvaliteta koji dobro "
+#~ "izgledaju samo pri 96 ili 120 DPI.</p><p>Uglavnom, ovu opciju ne treba "
+#~ "koristiti. Bolje je umesto toga, ako je moguće, tačno podesiti DPI "
+#~ "vrednost za ceo X-server (npr. DisplaySize u xorg.conf ili dodavanjem <i>-"
+#~ "dpi vrednost</i> u ServerLocalArgs= u $TDEDIR/share/config/tdm/tdmrc). "
+#~ "Ako i tada fontovi loše izgledaju, treba ili izabrati bolje fontove, ili "
+#~ "možda isprobati opciju navođenja fontova u podešavanjima.</p>"