Merge translation files from master branch.

1 files changed, 37 insertions, 31 deletions

diff --git a/tde-i18n-fy/messages/tdebase/kcmfonts.po b/tde-i18n-fy/messages/tdebase/kcmfonts.po
index 2b1ef8c4249..2c3a5e8cd83 100644
--- a/tde-i18n-fy/messages/tdebase/kcmfonts.po
+++ b/tde-i18n-fy/messages/tdebase/kcmfonts.po
@@ -4,7 +4,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-05-01 13:37+0100\n"
 "Last-Translator: Berend Ytsma <berendy@gmail.com>\n"
 "Language-Team: Dutch <kde-i18n-nl@kde.org>\n"
@@ -150,7 +150,7 @@ msgstr "Klik hir om alle lettertypen te wizigjen"
 msgid "Use a&nti-aliasing:"
 msgstr "A&nti-aliasing brûke:"
 
-#: fonts.cpp:624
+#: fonts.cpp:624 fonts.cpp:641
 msgid "Enabled"
 msgstr "Ynskeakele"
 
@@ -177,39 +177,15 @@ msgstr "Ynstelle..."
 msgid "Force fonts DPI:"
 msgstr "Lettertype DPI forsearje:"
 
-#: 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>Dizze opsje forsearret in bepaalde DPI wearde foar lettertypen. It kin "
-"brûkber wêze as de wiere DPI fan it hurdguod net goed ûntdutsen wurd en it "
-"wurdt ek wol misbrûkt troch lettertypen fan slechte kwaliteit dy der net "
-"goed útsjogge by DPI wearden oars dan 96 of 120 DPI.</p><p>It brûken fan "
-"dizze opsje wurdt yn it algemien ûntmoedige. In bettere opsje foar it "
-"selektearjen fan juste DPI wearden kin eksplisyt konfigurearre wurde as it "
-"mooglik is yn de X tsjinner (bgl. DisplaySize yn xorg.conf of taheakje <i>-"
-"dpi value</i> oan ServerLocalArgs= in $TDEDIR/share/config/tdm/tdmrc).  "
-"Wannear lettertypen net goed foarme wurde troch de wiere DPI wearde maotte "
-"der bettere lettertypen brûkt wurde of konfiguraasje fan lettertype tip moat "
-"selektearre wurde.</p>"
-
-#: fonts.cpp:761
+
+#: fonts.cpp:772
 msgid ""
 "<p>Some changes such as anti-aliasing will only affect newly started "
 "applications.</p>"
@@ -217,7 +193,7 @@ msgstr ""
 "<p>Guon wizigings lykas anti-aliasing wizige sille allinne effekt ha op nij "
 "úteinsetten applikaasjes.</p>"
 
-#: fonts.cpp:762
+#: fonts.cpp:773
 msgid "Font Settings Changed"
 msgstr "Lettertype-ynstellings wizige"
 
@@ -252,3 +228,33 @@ msgstr "Dieltelik"
 #: kxftconfig.cpp:921
 msgid "Full"
 msgstr "Fol"
+
+#~ 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>Dizze opsje forsearret in bepaalde DPI wearde foar lettertypen. It kin "
+#~ "brûkber wêze as de wiere DPI fan it hurdguod net goed ûntdutsen wurd en "
+#~ "it wurdt ek wol misbrûkt troch lettertypen fan slechte kwaliteit dy der "
+#~ "net goed útsjogge by DPI wearden oars dan 96 of 120 DPI.</p><p>It brûken "
+#~ "fan dizze opsje wurdt yn it algemien ûntmoedige. In bettere opsje foar it "
+#~ "selektearjen fan juste DPI wearden kin eksplisyt konfigurearre wurde as "
+#~ "it mooglik is yn de X tsjinner (bgl. DisplaySize yn xorg.conf of taheakje "
+#~ "<i>-dpi value</i> oan ServerLocalArgs= in $TDEDIR/share/config/tdm/"
+#~ "tdmrc).  Wannear lettertypen net goed foarme wurde troch de wiere DPI "
+#~ "wearde maotte der bettere lettertypen brûkt wurde of konfiguraasje fan "
+#~ "lettertype tip moat selektearre wurde.</p>"