Merge translation files from master branch.

1 files changed, 35 insertions, 28 deletions

diff --git a/tde-i18n-sl/messages/tdebase/kcmfonts.po b/tde-i18n-sl/messages/tdebase/kcmfonts.po
index 3b368a53bc7..732fac343f3 100644
--- a/tde-i18n-sl/messages/tdebase/kcmfonts.po
+++ b/tde-i18n-sl/messages/tdebase/kcmfonts.po
@@ -11,7 +11,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-23 03:56+0200\n"
 "Last-Translator: Jure Repinc <jlp@holodeck1.com>\n"
 "Language-Team: Slovenian <sl@li.org>\n"
@@ -157,7 +157,7 @@ msgstr "Kliknite za spremembo vseh pisav"
 msgid "Use a&nti-aliasing:"
 msgstr "Uporabi &glajenje:"
 
-#: fonts.cpp:624
+#: fonts.cpp:624 fonts.cpp:641
 msgid "Enabled"
 msgstr "Omogočeno"
 
@@ -183,36 +183,15 @@ msgstr "Nastavi ..."
 msgid "Force fonts DPI:"
 msgstr "Vsili ločljivost za pisave:"
 
-#: 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>Ta možnost vsili določeno ločljivost za pisave. Uporabna je, ko prava "
-"ločljivost za strojno opremo ni zaznana pravilno. Možnost se pogosto napačno "
-"uporablja za pisave slabše kvalitete, ki pri ločljivostih 96 ali 120 DPI ne "
-"izgledajo dobro.</p><p>Uporabo te možnosti na splošno odsvetujemo. Boljši "
-"način je nastavitev pravilne ločljivosti za celoten strežnik X (npr. "
-"nastavitev možnosti DisplaySize v datoteki xorg.conf). Če prikaz pisav pri "
-"pravi nastavitvi ločljivosti ni pravilen, je priporočljivo uporabiti "
-"kvalitetnejše pisave ali pa preveriti nastavitve namigovanja za pisave.</p>"
-
-#: fonts.cpp:761
+
+#: fonts.cpp:772
 msgid ""
 "<p>Some changes such as anti-aliasing will only affect newly started "
 "applications.</p>"
@@ -220,7 +199,7 @@ msgstr ""
 "<p>Nekatere spremembe, npr. glajenja pisav, bodo vplivale le na novo zagnane "
 "programe.</p>"
 
-#: fonts.cpp:762
+#: fonts.cpp:773
 msgid "Font Settings Changed"
 msgstr "Spremembe nastavitev pisav"
 
@@ -255,3 +234,31 @@ msgstr "Malo"
 #: kxftconfig.cpp:921
 msgid "Full"
 msgstr "Polno"
+
+#~ 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>Ta možnost vsili določeno ločljivost za pisave. Uporabna je, ko prava "
+#~ "ločljivost za strojno opremo ni zaznana pravilno. Možnost se pogosto "
+#~ "napačno uporablja za pisave slabše kvalitete, ki pri ločljivostih 96 ali "
+#~ "120 DPI ne izgledajo dobro.</p><p>Uporabo te možnosti na splošno "
+#~ "odsvetujemo. Boljši način je nastavitev pravilne ločljivosti za celoten "
+#~ "strežnik X (npr. nastavitev možnosti DisplaySize v datoteki xorg.conf). "
+#~ "Če prikaz pisav pri pravi nastavitvi ločljivosti ni pravilen, je "
+#~ "priporočljivo uporabiti kvalitetnejše pisave ali pa preveriti nastavitve "
+#~ "namigovanja za pisave.</p>"