From 716ac8b8033794e2557ad567005dfff4dd95f031 Mon Sep 17 00:00:00 2001 From: Keith Packard Date: Thu, 21 Apr 2005 19:03:53 +0000 Subject: [PATCH] Don't force bitmap font enable in default configuration; allows users to override this in ~/.fonts.conf Updated translations Destroy font configuration on exit to help valgrind Use own transcoding routines in preference to iconv which appears to have leaks in some translators. Call iconv_close after using iconv (oops). Prefer unicode encoding of Euro char as some fonts mis-encode Euro in other ones. Must fetch bitmap glyphs to get width values to check for monospace/dual-width fonts. --- ChangeLog | 36 +++++++++ debian/fontconfig.postinst | 8 +- debian/po/cs.po | 154 +++++++++++++++---------------------- debian/po/da.po | 94 ++++++++-------------- debian/po/de.po | 71 +++++------------ debian/po/es.po | 77 +++++-------------- debian/po/fr.po | 77 +++++-------------- debian/po/ja.po | 150 +++++++----------------------------- debian/po/nl.po | 71 +++++------------ debian/po/pt.po | 71 +++++------------ debian/po/pt_BR.po | 77 +++++-------------- debian/po/templates.pot | 66 ++++------------ debian/po/tr.po | 71 +++++------------ debian/po/zh_CN.po | 71 +++++------------ fc-cache/fc-cache.c | 1 + fonts.conf.in | 37 ++++----- src/fcfreetype.c | 84 +++++++++++--------- 17 files changed, 404 insertions(+), 812 deletions(-) diff --git a/ChangeLog b/ChangeLog index fbec32e..2a1c1b3 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,39 @@ +2005-04-21 Keith Packard + + * debian/fontconfig.postinst: + Don't force bitmap font enable in default + configuration; allows users to override this in + ~/.fonts.conf + * debian/po/cs.po: + * debian/po/da.po: + * debian/po/de.po: + * debian/po/es.po: + * debian/po/fr.po: + * debian/po/ja.po: + * debian/po/nl.po: + * debian/po/pt.po: + * debian/po/pt_BR.po: + * debian/po/templates.pot: + * debian/po/tr.po: + * debian/po/zh_CN.po: + Updated translations + + * fc-cache/fc-cache.c: (main): + Destroy font configuration on exit to help valgrind + + * fonts.conf.in: + * src/fcfreetype.c: (FcSfntNameTranscode), (FcFreeTypeCharIndex), + (FcFreeTypeCheckGlyph): + Use own transcoding routines in preference to iconv + which appears to have leaks in some translators. + Call iconv_close after using iconv (oops). + + Prefer unicode encoding of Euro char as some + fonts mis-encode Euro in other ones. + + Must fetch bitmap glyphs to get width values + to check for monospace/dual-width fonts. + 2005-04-13 Ross Burton * src/fcpat.c: diff --git a/debian/fontconfig.postinst b/debian/fontconfig.postinst index 900a71b..7030cdb 100755 --- a/debian/fontconfig.postinst +++ b/debian/fontconfig.postinst @@ -77,7 +77,13 @@ fi case "$enable_bitmaps" in "true") - ln -s $CONFDIR/$yes_bitmaps $CONFDIR/$bitmaps_prio$yes_bitmaps +# +# Bitmap fonts will be enabled by default, so there's no need +# to use this configuration file. However, the file remains useful if +# you want to force bitmaps to be considered even when some application +# disables them. +# +# ln -s $CONFDIR/$yes_bitmaps $CONFDIR/$bitmaps_prio$yes_bitmaps ;; *) ln -s $CONFDIR/$no_bitmaps $CONFDIR/$bitmaps_prio$no_bitmaps diff --git a/debian/po/cs.po b/debian/po/cs.po index 35b3a84..f403e3e 100644 --- a/debian/po/cs.po +++ b/debian/po/cs.po @@ -15,102 +15,72 @@ msgid "" msgstr "" "Project-Id-Version: fontconfig\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2005-03-02 13:41-0800\n" -"PO-Revision-Date: 2004-10-24 18:49+0200\n" +"POT-Creation-Date: 2005-03-10 19:01-0800\n" +"PO-Revision-Date: 2005-03-30 17:34+0200\n" "Last-Translator: Miroslav Kure \n" -"Language-Team: Czech \n" +"Language-Team: Czech \n" "MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=ISO-8859-2\n" +"Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" #. Type: select #. Choices #: ../fontconfig.templates:3 msgid "Native, Autohinter, None" -msgstr "" - -#. Type: select -#. Description -#: ../fontconfig.templates:5 -#, fuzzy -msgid "With what method should fonts be hinted?" -msgstr "Která metoda se má pou¾ít pro vykreslování textu?" +msgstr "Nativní, Autohinter, Nijak" #. Type: select #. Description #: ../fontconfig.templates:5 -msgid "" -"The FreeType font library can adjust glyph outlines to accomodate the pixel " -"grid for improved legibility. This process is called \"hinting\". FreeType " -"can either use the hints built-in to each font or it can use a format-" -"indepedent Autohinter. For most font formats, using the format-specific " -"hints generates better results. However, many freely available TrueType " -"format fonts don't include any hints at all. When loading such a font, " -"unless you specifically ask to use the Autohinter, these fonts will end up " -"unhinted, which will make them appear fuzzy on the screen." -msgstr "" +msgid "How should fonts be tuned for the screen?" +msgstr "Jak se mají fonty vyladit pro obrazovku?" #. Type: select #. Description #: ../fontconfig.templates:5 msgid "" -"If the TrueType fonts you use most include hints, then the Native hinter " -"gives better results. However, if the fonts you use most do not include " -"such hints, then the Autohinter will work better. Yes, FreeType should do " -"this automatically." -msgstr "" - -#. Type: select -#. Description -#: ../fontconfig.templates:5 -msgid "" -"You can also select None to disable all hinting and make your screen look " -"like Mac OS X." +"Select Native if you mostly use Bitstream Vera (the default in Debian) or " +"any of the Microsoft fonts. Select Autohinter if you mostly use other " +"TrueType fonts. Select None if you want blurry text." msgstr "" +"Používáte-li větÅ¡inou Bitstream Vera (výchozí v Debianu) nebo některý z " +"fontů Microsoftu, vyberte Nativní. Autohinter je vhodný pro ostatní " +"TrueTypová písma. Chcete-li rozmazaný text, zvolte Nijak." #. Type: select #. Choices -#: ../fontconfig.templates:28 -msgid "Automatic, Enable, Disable" -msgstr "" +#: ../fontconfig.templates:12 +msgid "Automatic, Always, Never" +msgstr "Automaticky, Vždy, Nikdy" #. Type: select #. Description -#: ../fontconfig.templates:30 -msgid "Should font be rendered using sub-pixel elements?" -msgstr "" +#: ../fontconfig.templates:14 +msgid "Enable subpixel rendering of text?" +msgstr "Povolit podpixelové vykreslování textu?" #. Type: select #. Description -#: ../fontconfig.templates:30 +#: ../fontconfig.templates:14 msgid "" -"With known sub-pixel geometry, LCD screens can synthesize higher resolution " -"in one dimension. Taking advantage of this when rendering glyphs sharpens " -"the appearance of text on the screen. This can cause color artifacts, " -"especially when rendering unhinted or autohinted fonts." -msgstr "" - -#. Type: select -#. Description -#: ../fontconfig.templates:30 -msgid "" -"This option selects when sub-pixel rendering should be used. Automatic " -"enables sub-pixel rendering whenever the X server detects an LCD monitor, " -"which it can generally do when the monitor is built into the computer or " -"connected with a digital (DVI) cable. Enable forces the system to use sub-" -"pixel rendering while Disable forces the system to not use sub-pixel " -"rendering." +"Rendering text at a subpixel level generally makes it look a bit better on " +"flat (LCD) screens, but can show color artifacts on CRT screens. The " +"\"Automatic\" choice will enable it only if a LCD screen is detected." msgstr "" +"Vykreslování textu na podpixelové úrovni způsobí, že na plochých (LCD) " +"obrazovkách vypadá o něco lépe, ale na CRT monitorech může zobrazovat " +"barevné artefakty. Možnost \"Automaticky\" povolí podpixelové vykreslování " +"pouze pokud bude rozpoznán LCD monitor." #. Type: boolean #. Description -#: ../fontconfig.templates:46 +#: ../fontconfig.templates:22 msgid "Enable bitmapped fonts by default?" -msgstr "Povolit implicitnì bitmapové fonty?" +msgstr "Povolit implicitně bitmapové fonty?" #. Type: boolean #. Description -#: ../fontconfig.templates:46 +#: ../fontconfig.templates:22 msgid "" "By default, only outline fonts are used by applications which support " "fontconfig. Outline fonts are fonts which scale well to various sizes. In " @@ -118,37 +88,39 @@ msgid "" "affect the systemwide default; this and many other fontconfig options may be " "enabled or disabled on a per-user basis." msgstr "" -"Standardnì jsou v aplikacích podporujících fontconfig pou¾ívány pouze " -"obrysové fonty. Tyto fonty se velmi dobøe zvìt¹ují a zmen¹ují. Oproti nim " -"mohou zvìt¹ované bitmapové fonty vypadat kostrbatì. Tato volba ovlivní " -"implicitní nastavení celého systému, nicménì u¾ivatelé si ji mohou zmìnit ve " -"svém osobním nastavení." +"Implicitně jsou v aplikacích podporujících fontconfig používány pouze " +"obrysové fonty. Tyto fonty se velmi dobře zvětÅ¡ují a zmenÅ¡ují. Oproti nim " +"mohou zvětÅ¡ované bitmapové fonty vypadat kostrbatě. Tato volba ovlivní " +"implicitní nastavení celého systému, nicméně uživatelé si ji mohou změnit ve " +"svém osobním nastavení." + +msgid "With what method should fonts be hinted?" +msgstr "Která metoda hintingu se má pro fonty použít?" -#~ msgid "" -#~ "Bytecode interpreter (CRT screens), Autohinter, Subpixel rendering (LCD " -#~ "screens)" -#~ msgstr "" -#~ "Interpret bytekódu (CRT monitory), Autohinter, Podpixelové renderování " -#~ "(LCD obrazovky)" +msgid "" +"Bytecode interpreter (CRT screens), Autohinter, Subpixel rendering (LCD " +"screens)" +msgstr "" +"Interpret bytekódu (CRT monitory), Autohinter, Podpixelové renderování (LCD " +"obrazovky)" -#~ msgid "" -#~ "The Freetype font library is able to render fonts with different methods. " -#~ "Depending on your hardware and the fonts you generally use, some will " -#~ "give better results." -#~ msgstr "" -#~ "Knihovna Freetype umí vykreslovat písma rùznými metodami. Podle va¹eho " -#~ "hardwaru a typu pou¾itých fontù mù¾ete s nìkterými metodami dosáhnout " -#~ "lep¹ích výsledkù." +msgid "" +"The Freetype font library is able to render fonts with different methods. " +"Depending on your hardware and the fonts you generally use, some will give " +"better results." +msgstr "" +"Knihovna Freetype umí vykreslovat písma různými metodami. Podle vaÅ¡eho " +"hardwaru a typu použitých fontů můžete s některými metodami dosáhnout " +"lepších výsledků." -#~ msgid "" -#~ "The autohinter module is the default; it gives correct results on most " -#~ "configurations. The bytecode interpreter renders fonts very sharply, and " -#~ "is often a better choice if you are using a cathode-ray screen. On the " -#~ "other hand, the subpixel rendering method is optimized for high-quality " -#~ "rendering on most liquid crystal displays." -#~ msgstr "" -#~ "Modul autohinter je implicitní, proto¾e dává správné výsledky na vìt¹inì " -#~ "konfigurací. Interpret bytekódu kreslí písma velmi ostøe a pokud máte " -#~ "klasický monitor, bývá èasto lep¹í volbou. Analogicky je podpixelové " -#~ "renderování pøizpùsobeno pro vysoce kvalitní výstup na vìt¹inì LCD " -#~ "monitorù." +msgid "" +"The autohinter module is the default; it gives correct results on most " +"configurations. The bytecode interpreter renders fonts very sharply, and is " +"often a better choice if you are using a cathode-ray screen. On the other " +"hand, the subpixel rendering method is optimized for high-quality rendering " +"on most liquid crystal displays." +msgstr "" +"Modul autohinter je implicitní, protože dává správné výsledky na větÅ¡ině " +"konfigurací. Interpret bytekódu kreslí písma velmi ostře a pokud máte " +"klasický monitor, bývá často lepší volbou. Analogicky je podpixelové " +"renderování přizpůsobeno pro vysoce kvalitní výstup na větÅ¡ině LCD monitorů." diff --git a/debian/po/da.po b/debian/po/da.po index e7749ba..fa8d849 100644 --- a/debian/po/da.po +++ b/debian/po/da.po @@ -1,14 +1,14 @@ # translation of fontconfig debconf template to Danish # Reviewed by Ole Laursen, 2004 -# Claus Hindsgaul , 2004. +# Claus Hindsgaul , 2004, 2005. # # msgid "" msgstr "" "Project-Id-Version: fontconfig_2.2.2-1_da\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2005-03-02 13:41-0800\n" -"PO-Revision-Date: 2004-11-19 16:56+0100\n" +"POT-Creation-Date: 2005-03-10 19:01-0800\n" +"PO-Revision-Date: 2005-04-14 10:34+0200\n" "Last-Translator: Claus Hindsgaul \n" "Language-Team: Danish \n" "MIME-Version: 1.0\n" @@ -20,90 +20,60 @@ msgstr "" #. Choices #: ../fontconfig.templates:3 msgid "Native, Autohinter, None" -msgstr "" +msgstr "Indbygget, Autohinter, Ingen" #. Type: select #. Description #: ../fontconfig.templates:5 -#, fuzzy -msgid "With what method should fonts be hinted?" -msgstr "Hvilken metode skal benyttes til at tegne tekst?" +msgid "How should fonts be tuned for the screen?" +msgstr "Hvordan skal skrifterne tilpasses skærmen?" #. Type: select #. Description #: ../fontconfig.templates:5 msgid "" -"The FreeType font library can adjust glyph outlines to accomodate the pixel " -"grid for improved legibility. This process is called \"hinting\". FreeType " -"can either use the hints built-in to each font or it can use a format-" -"indepedent Autohinter. For most font formats, using the format-specific " -"hints generates better results. However, many freely available TrueType " -"format fonts don't include any hints at all. When loading such a font, " -"unless you specifically ask to use the Autohinter, these fonts will end up " -"unhinted, which will make them appear fuzzy on the screen." -msgstr "" - -#. Type: select -#. Description -#: ../fontconfig.templates:5 -msgid "" -"If the TrueType fonts you use most include hints, then the Native hinter " -"gives better results. However, if the fonts you use most do not include " -"such hints, then the Autohinter will work better. Yes, FreeType should do " -"this automatically." -msgstr "" - -#. Type: select -#. Description -#: ../fontconfig.templates:5 -msgid "" -"You can also select None to disable all hinting and make your screen look " -"like Mac OS X." +"Select Native if you mostly use Bitstream Vera (the default in Debian) or " +"any of the Microsoft fonts. Select Autohinter if you mostly use other " +"TrueType fonts. Select None if you want blurry text." msgstr "" +"Vælg Indbygget hvis du mest benytter Bitstream Vera (standarden i Debian) " +"eller nogen af Microsoft-skrifterne. Vælg Autohinter hvis du mest benytter " +"andre Truetype-skrifter. Vælg Ingen hvis du ønsker utydelig tekst." #. Type: select #. Choices -#: ../fontconfig.templates:28 -msgid "Automatic, Enable, Disable" -msgstr "" - -#. Type: select -#. Description -#: ../fontconfig.templates:30 -msgid "Should font be rendered using sub-pixel elements?" -msgstr "" +#: ../fontconfig.templates:12 +msgid "Automatic, Always, Never" +msgstr "Automatisk, Altid, Aldrig" #. Type: select #. Description -#: ../fontconfig.templates:30 -msgid "" -"With known sub-pixel geometry, LCD screens can synthesize higher resolution " -"in one dimension. Taking advantage of this when rendering glyphs sharpens " -"the appearance of text on the screen. This can cause color artifacts, " -"especially when rendering unhinted or autohinted fonts." -msgstr "" +#: ../fontconfig.templates:14 +msgid "Enable subpixel rendering of text?" +msgstr "Aktivér delpiksel-tekstoptegning?" #. Type: select #. Description -#: ../fontconfig.templates:30 +#: ../fontconfig.templates:14 msgid "" -"This option selects when sub-pixel rendering should be used. Automatic " -"enables sub-pixel rendering whenever the X server detects an LCD monitor, " -"which it can generally do when the monitor is built into the computer or " -"connected with a digital (DVI) cable. Enable forces the system to use sub-" -"pixel rendering while Disable forces the system to not use sub-pixel " -"rendering." +"Rendering text at a subpixel level generally makes it look a bit better on " +"flat (LCD) screens, but can show color artifacts on CRT screens. The " +"\"Automatic\" choice will enable it only if a LCD screen is detected." msgstr "" +"Optegningen af tekst pÃ¥ delpikselniveau fÃ¥r generelt teksten til at se bedre " +"ud pÃ¥ fladskærme (LCD), men kan give uønskede farver i kanterne pÃ¥ CRT-skærme. " +"Valget \"Automatisk\" vil kun aktivere delpiksel-tekstoptegningen, hvis der " +"detekteres en LCD-skærm." #. Type: boolean #. Description -#: ../fontconfig.templates:46 +#: ../fontconfig.templates:22 msgid "Enable bitmapped fonts by default?" msgstr "Aktivér billedbaserede skrifttyper som standard?" #. Type: boolean #. Description -#: ../fontconfig.templates:46 +#: ../fontconfig.templates:22 msgid "" "By default, only outline fonts are used by applications which support " "fontconfig. Outline fonts are fonts which scale well to various sizes. In " @@ -118,6 +88,10 @@ msgstr "" "standardindstilling. Denne og mange andre fontconfig-tilvalg kan aktiveres " "eller deaktiveres for hver enkelt bruger." +#, fuzzy +#~ msgid "With what method should fonts be hinted?" +#~ msgstr "Hvilken metode skal benyttes til at tegne tekst?" + #~ msgid "" #~ "Bytecode interpreter (CRT screens), Autohinter, Subpixel rendering (LCD " #~ "screens)" @@ -147,9 +121,6 @@ msgstr "" #~ "en billedrørs-skærm. PÃ¥ den anden side er delpiksel-optegningsmetoden " #~ "optimeret til visning pÃ¥ den høje kvalitet, fladskærme (LCD) besidder." -#~ msgid "Enable sub-pixel text rendering?" -#~ msgstr "Aktivér delpiksel-tekstoptegning?" - #~ msgid "" #~ "If you have an LCD display, then you will want to enable this option. It " #~ "allows for higher-quality text rendering. For more information, please " @@ -172,3 +143,4 @@ msgstr "" #~ "Afhængig af din skærm og hvilke skrifttyper, du bruger, kan de se bedre " #~ "eller dÃ¥rligere ud, nÃ¥r du bruger autohinter-modulet. Aktivér det, hvis " #~ "du foretrækker det udseende, det giver dine skrifttyper." + diff --git a/debian/po/de.po b/debian/po/de.po index 4379e52..58f74e7 100644 --- a/debian/po/de.po +++ b/debian/po/de.po @@ -15,7 +15,7 @@ msgid "" msgstr "" "Project-Id-Version: fontconfig_2.2.3-3_de\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2005-03-02 13:41-0800\n" +"POT-Creation-Date: 2005-03-29 13:33-0800\n" "PO-Revision-Date: 2004-11-13 17:50+0100\n" "Last-Translator: Erik Schanze \n" "Language-Team: German \n" @@ -34,85 +34,48 @@ msgstr "" #. Type: select #. Description #: ../fontconfig.templates:5 -#, fuzzy -msgid "With what method should fonts be hinted?" -msgstr "Wie sollen Schriften gerendert werden?" - -#. Type: select -#. Description -#: ../fontconfig.templates:5 -msgid "" -"The FreeType font library can adjust glyph outlines to accomodate the pixel " -"grid for improved legibility. This process is called \"hinting\". FreeType " -"can either use the hints built-in to each font or it can use a format-" -"indepedent Autohinter. For most font formats, using the format-specific " -"hints generates better results. However, many freely available TrueType " -"format fonts don't include any hints at all. When loading such a font, " -"unless you specifically ask to use the Autohinter, these fonts will end up " -"unhinted, which will make them appear fuzzy on the screen." +msgid "How should fonts be tuned for the screen?" msgstr "" #. Type: select #. Description #: ../fontconfig.templates:5 msgid "" -"If the TrueType fonts you use most include hints, then the Native hinter " -"gives better results. However, if the fonts you use most do not include " -"such hints, then the Autohinter will work better. Yes, FreeType should do " -"this automatically." -msgstr "" - -#. Type: select -#. Description -#: ../fontconfig.templates:5 -msgid "" -"You can also select None to disable all hinting and make your screen look " -"like Mac OS X." +"Select Native if you mostly use Bitstream Vera (the default in Debian) or " +"any of the Microsoft fonts. Select Autohinter if you mostly use other " +"TrueType fonts. Select None if you want blurry text." msgstr "" #. Type: select #. Choices -#: ../fontconfig.templates:28 -msgid "Automatic, Enable, Disable" +#: ../fontconfig.templates:12 +msgid "Automatic, Always, Never" msgstr "" #. Type: select #. Description -#: ../fontconfig.templates:30 -msgid "Should font be rendered using sub-pixel elements?" +#: ../fontconfig.templates:14 +msgid "Enable subpixel rendering of text?" msgstr "" #. Type: select #. Description -#: ../fontconfig.templates:30 +#: ../fontconfig.templates:14 msgid "" -"With known sub-pixel geometry, LCD screens can synthesize higher resolution " -"in one dimension. Taking advantage of this when rendering glyphs sharpens " -"the appearance of text on the screen. This can cause color artifacts, " -"especially when rendering unhinted or autohinted fonts." -msgstr "" - -#. Type: select -#. Description -#: ../fontconfig.templates:30 -msgid "" -"This option selects when sub-pixel rendering should be used. Automatic " -"enables sub-pixel rendering whenever the X server detects an LCD monitor, " -"which it can generally do when the monitor is built into the computer or " -"connected with a digital (DVI) cable. Enable forces the system to use sub-" -"pixel rendering while Disable forces the system to not use sub-pixel " -"rendering." +"Rendering text at a subpixel level generally makes it look a bit better on " +"flat (LCD) screens, but can show color artifacts on CRT screens. The " +"\"Automatic\" choice will enable it only if a LCD screen is detected." msgstr "" #. Type: boolean #. Description -#: ../fontconfig.templates:46 +#: ../fontconfig.templates:22 msgid "Enable bitmapped fonts by default?" msgstr "Standardmäßig Bitmap-Schriften verwenden?" #. Type: boolean #. Description -#: ../fontconfig.templates:46 +#: ../fontconfig.templates:22 msgid "" "By default, only outline fonts are used by applications which support " "fontconfig. Outline fonts are fonts which scale well to various sizes. In " @@ -127,6 +90,10 @@ msgstr "" "systemweiten Standard; diese und viele andere Einstellungen von fontconfig " "können benutzerbezogen ein- und ausgeschaltet werden." +#, fuzzy +#~ msgid "With what method should fonts be hinted?" +#~ msgstr "Wie sollen Schriften gerendert werden?" + #~ msgid "" #~ "Bytecode interpreter (CRT screens), Autohinter, Subpixel rendering (LCD " #~ "screens)" diff --git a/debian/po/es.po b/debian/po/es.po index cf8bc18..4900eff 100644 --- a/debian/po/es.po +++ b/debian/po/es.po @@ -31,7 +31,7 @@ msgid "" msgstr "" "Project-Id-Version: fontconfig 2.2.3-3\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2005-03-02 13:41-0800\n" +"POT-Creation-Date: 2005-03-29 13:33-0800\n" "PO-Revision-Date: 2004-10-24 14:05+0200\n" "Last-Translator: Rubén Porras\n" "Language-Team: Debian Spanish \n" @@ -48,85 +48,49 @@ msgstr "" #. Type: select #. Description #: ../fontconfig.templates:5 -#, fuzzy -msgid "With what method should fonts be hinted?" -msgstr "¿Con qué método se deben interpretar los textos?" - -#. Type: select -#. Description -#: ../fontconfig.templates:5 -msgid "" -"The FreeType font library can adjust glyph outlines to accomodate the pixel " -"grid for improved legibility. This process is called \"hinting\". FreeType " -"can either use the hints built-in to each font or it can use a format-" -"indepedent Autohinter. For most font formats, using the format-specific " -"hints generates better results. However, many freely available TrueType " -"format fonts don't include any hints at all. When loading such a font, " -"unless you specifically ask to use the Autohinter, these fonts will end up " -"unhinted, which will make them appear fuzzy on the screen." -msgstr "" - -#. Type: select -#. Description -#: ../fontconfig.templates:5 -msgid "" -"If the TrueType fonts you use most include hints, then the Native hinter " -"gives better results. However, if the fonts you use most do not include " -"such hints, then the Autohinter will work better. Yes, FreeType should do " -"this automatically." +msgid "How should fonts be tuned for the screen?" msgstr "" #. Type: select #. Description #: ../fontconfig.templates:5 msgid "" -"You can also select None to disable all hinting and make your screen look " -"like Mac OS X." +"Select Native if you mostly use Bitstream Vera (the default in Debian) or " +"any of the Microsoft fonts. Select Autohinter if you mostly use other " +"TrueType fonts. Select None if you want blurry text." msgstr "" #. Type: select #. Choices -#: ../fontconfig.templates:28 -msgid "Automatic, Enable, Disable" -msgstr "" - -#. Type: select -#. Description -#: ../fontconfig.templates:30 -msgid "Should font be rendered using sub-pixel elements?" +#: ../fontconfig.templates:12 +msgid "Automatic, Always, Never" msgstr "" #. Type: select #. Description -#: ../fontconfig.templates:30 -msgid "" -"With known sub-pixel geometry, LCD screens can synthesize higher resolution " -"in one dimension. Taking advantage of this when rendering glyphs sharpens " -"the appearance of text on the screen. This can cause color artifacts, " -"especially when rendering unhinted or autohinted fonts." -msgstr "" +#: ../fontconfig.templates:14 +#, fuzzy +msgid "Enable subpixel rendering of text?" +msgstr "¿Activar el renderizado de sub-pixel de texto?" #. Type: select #. Description -#: ../fontconfig.templates:30 +#: ../fontconfig.templates:14 msgid "" -"This option selects when sub-pixel rendering should be used. Automatic " -"enables sub-pixel rendering whenever the X server detects an LCD monitor, " -"which it can generally do when the monitor is built into the computer or " -"connected with a digital (DVI) cable. Enable forces the system to use sub-" -"pixel rendering while Disable forces the system to not use sub-pixel " -"rendering." +"Rendering text at a subpixel level generally makes it look a bit better on " +"flat (LCD) screens, but can show color artifacts on CRT screens. The " +"\"Automatic\" choice will enable it only if a LCD screen is detected." msgstr "" #. Type: boolean #. Description -#: ../fontconfig.templates:46 +#: ../fontconfig.templates:22 msgid "Enable bitmapped fonts by default?" msgstr "¿Activar el tipo de letra «bitmapped» por omisión?" #. Type: boolean #. Description -#: ../fontconfig.templates:46 +#: ../fontconfig.templates:22 msgid "" "By default, only outline fonts are used by applications which support " "fontconfig. Outline fonts are fonts which scale well to various sizes. In " @@ -141,6 +105,10 @@ msgstr "" "sistema; los usuarios podrán, de forma individual, activar ésta y muchas " "otras opciones de fontconfig." +#, fuzzy +#~ msgid "With what method should fonts be hinted?" +#~ msgstr "¿Con qué método se deben interpretar los textos?" + #~ msgid "" #~ "Bytecode interpreter (CRT screens), Autohinter, Subpixel rendering (LCD " #~ "screens)" @@ -171,9 +139,6 @@ msgstr "" #~ "subpíxeles está optimizado para obtener resultados de alta calidad en " #~ "pantallas de cristal líquido." -#~ msgid "Enable sub-pixel text rendering?" -#~ msgstr "¿Activar el renderizado de sub-pixel de texto?" - #~ msgid "" #~ "If you have an LCD display, then you will want to enable this option. It " #~ "allows for higher-quality text rendering. For more information, please " diff --git a/debian/po/fr.po b/debian/po/fr.po index 82f7c3b..59ae2c1 100644 --- a/debian/po/fr.po +++ b/debian/po/fr.po @@ -15,7 +15,7 @@ msgid "" msgstr "" "Project-Id-Version: fontconfig 2.2.3-1\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2005-03-02 13:41-0800\n" +"POT-Creation-Date: 2005-03-29 13:33-0800\n" "PO-Revision-Date: 2004-10-23 17:00+0200\n" "Last-Translator: Philippe Batailler \n" "Language-Team: French \n" @@ -32,85 +32,49 @@ msgstr "" #. Type: select #. Description #: ../fontconfig.templates:5 -#, fuzzy -msgid "With what method should fonts be hinted?" -msgstr "Méthode à utiliser pour le rendu des textes :" - -#. Type: select -#. Description -#: ../fontconfig.templates:5 -msgid "" -"The FreeType font library can adjust glyph outlines to accomodate the pixel " -"grid for improved legibility. This process is called \"hinting\". FreeType " -"can either use the hints built-in to each font or it can use a format-" -"indepedent Autohinter. For most font formats, using the format-specific " -"hints generates better results. However, many freely available TrueType " -"format fonts don't include any hints at all. When loading such a font, " -"unless you specifically ask to use the Autohinter, these fonts will end up " -"unhinted, which will make them appear fuzzy on the screen." -msgstr "" - -#. Type: select -#. Description -#: ../fontconfig.templates:5 -msgid "" -"If the TrueType fonts you use most include hints, then the Native hinter " -"gives better results. However, if the fonts you use most do not include " -"such hints, then the Autohinter will work better. Yes, FreeType should do " -"this automatically." +msgid "How should fonts be tuned for the screen?" msgstr "" #. Type: select #. Description #: ../fontconfig.templates:5 msgid "" -"You can also select None to disable all hinting and make your screen look " -"like Mac OS X." +"Select Native if you mostly use Bitstream Vera (the default in Debian) or " +"any of the Microsoft fonts. Select Autohinter if you mostly use other " +"TrueType fonts. Select None if you want blurry text." msgstr "" #. Type: select #. Choices -#: ../fontconfig.templates:28 -msgid "Automatic, Enable, Disable" -msgstr "" - -#. Type: select -#. Description -#: ../fontconfig.templates:30 -msgid "Should font be rendered using sub-pixel elements?" +#: ../fontconfig.templates:12 +msgid "Automatic, Always, Never" msgstr "" #. Type: select #. Description -#: ../fontconfig.templates:30 -msgid "" -"With known sub-pixel geometry, LCD screens can synthesize higher resolution " -"in one dimension. Taking advantage of this when rendering glyphs sharpens " -"the appearance of text on the screen. This can cause color artifacts, " -"especially when rendering unhinted or autohinted fonts." -msgstr "" +#: ../fontconfig.templates:14 +#, fuzzy +msgid "Enable subpixel rendering of text?" +msgstr "Voulez-vous activer le lissage sous-pixel pour le texte ?" #. Type: select #. Description -#: ../fontconfig.templates:30 +#: ../fontconfig.templates:14 msgid "" -"This option selects when sub-pixel rendering should be used. Automatic " -"enables sub-pixel rendering whenever the X server detects an LCD monitor, " -"which it can generally do when the monitor is built into the computer or " -"connected with a digital (DVI) cable. Enable forces the system to use sub-" -"pixel rendering while Disable forces the system to not use sub-pixel " -"rendering." +"Rendering text at a subpixel level generally makes it look a bit better on " +"flat (LCD) screens, but can show color artifacts on CRT screens. The " +"\"Automatic\" choice will enable it only if a LCD screen is detected." msgstr "" #. Type: boolean #. Description -#: ../fontconfig.templates:46 +#: ../fontconfig.templates:22 msgid "Enable bitmapped fonts by default?" msgstr "Voulez-vous des polices de type « bitmap » par défaut ?" #. Type: boolean #. Description -#: ../fontconfig.templates:46 +#: ../fontconfig.templates:22 msgid "" "By default, only outline fonts are used by applications which support " "fontconfig. Outline fonts are fonts which scale well to various sizes. In " @@ -125,6 +89,10 @@ msgstr "" "valeur par défaut pour tout le système ; chaque utilisateur peut activer ou " "désactiver cette option ainsi que d'autres options de fontconfig." +#, fuzzy +#~ msgid "With what method should fonts be hinted?" +#~ msgstr "Méthode à utiliser pour le rendu des textes :" + #~ msgid "" #~ "Bytecode interpreter (CRT screens), Autohinter, Subpixel rendering (LCD " #~ "screens)" @@ -154,9 +122,6 @@ msgstr "" #~ "un écran CRT. Enfin, la méthode du lissage sous-pixel offre un rendu de " #~ "haute qualité sur la plupart des écrans LCD." -#~ msgid "Enable sub-pixel text rendering?" -#~ msgstr "Voulez-vous activer le lissage sous-pixel pour le texte ?" - #~ msgid "" #~ "If you have an LCD display, then you will want to enable this option. It " #~ "allows for higher-quality text rendering. For more information, please " diff --git a/debian/po/ja.po b/debian/po/ja.po index b73d2d3..bb63600 100644 --- a/debian/po/ja.po +++ b/debian/po/ja.po @@ -15,102 +15,65 @@ msgid "" msgstr "" "Project-Id-Version: fontconfig\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2005-03-02 13:41-0800\n" -"PO-Revision-Date: 2004-10-24 09:28+0900\n" +"POT-Creation-Date: 2005-03-10 19:01-0800\n" +"PO-Revision-Date: 2005-04-01 09:12+0900\n" "Last-Translator: Kenshi Muto \n" "Language-Team: Japanese \n" "MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=EUC-JP\n" +"Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" #. Type: select #. Choices #: ../fontconfig.templates:3 msgid "Native, Autohinter, None" -msgstr "" - -#. Type: select -#. Description -#: ../fontconfig.templates:5 -#, fuzzy -msgid "With what method should fonts be hinted?" -msgstr "¥Æ¥­¥¹¥È¤ò¤É¤ÎÊýË¡¤ÇÉÁ²è¤·¤Þ¤¹¤«?" +msgstr "ネイティブ, オートヒント, なし" #. Type: select #. Description #: ../fontconfig.templates:5 -msgid "" -"The FreeType font library can adjust glyph outlines to accomodate the pixel " -"grid for improved legibility. This process is called \"hinting\". FreeType " -"can either use the hints built-in to each font or it can use a format-" -"indepedent Autohinter. For most font formats, using the format-specific " -"hints generates better results. However, many freely available TrueType " -"format fonts don't include any hints at all. When loading such a font, " -"unless you specifically ask to use the Autohinter, these fonts will end up " -"unhinted, which will make them appear fuzzy on the screen." -msgstr "" +msgid "How should fonts be tuned for the screen?" +msgstr "画面に対してフォントを調整しますか?" #. Type: select #. Description #: ../fontconfig.templates:5 msgid "" -"If the TrueType fonts you use most include hints, then the Native hinter " -"gives better results. However, if the fonts you use most do not include " -"such hints, then the Autohinter will work better. Yes, FreeType should do " -"this automatically." -msgstr "" - -#. Type: select -#. Description -#: ../fontconfig.templates:5 -msgid "" -"You can also select None to disable all hinting and make your screen look " -"like Mac OS X." -msgstr "" +"Select Native if you mostly use Bitstream Vera (the default in Debian) or " +"any of the Microsoft fonts. Select Autohinter if you mostly use other " +"TrueType fonts. Select None if you want blurry text." +msgstr "Bitstream Vera (Debian のデフォルト) または Microsoft のフォントをよく使うのであれば、ネイティブを選びます。その他の TrueType フォントをよく使うのであれば、オートヒントを選びます。ぼんやりしたテキストでもよいなら、なしを選びます。" #. Type: select #. Choices -#: ../fontconfig.templates:28 -msgid "Automatic, Enable, Disable" -msgstr "" +#: ../fontconfig.templates:12 +msgid "Automatic, Always, Never" +msgstr "自動, 常に, なし" #. Type: select #. Description -#: ../fontconfig.templates:30 -msgid "Should font be rendered using sub-pixel elements?" -msgstr "" +#: ../fontconfig.templates:14 +msgid "Enable subpixel rendering of text?" +msgstr "テキストのサブピクセルレンダリングを有効にしますか?" #. Type: select #. Description -#: ../fontconfig.templates:30 +#: ../fontconfig.templates:14 msgid "" -"With known sub-pixel geometry, LCD screens can synthesize higher resolution " -"in one dimension. Taking advantage of this when rendering glyphs sharpens " -"the appearance of text on the screen. This can cause color artifacts, " -"especially when rendering unhinted or autohinted fonts." -msgstr "" - -#. Type: select -#. Description -#: ../fontconfig.templates:30 -msgid "" -"This option selects when sub-pixel rendering should be used. Automatic " -"enables sub-pixel rendering whenever the X server detects an LCD monitor, " -"which it can generally do when the monitor is built into the computer or " -"connected with a digital (DVI) cable. Enable forces the system to use sub-" -"pixel rendering while Disable forces the system to not use sub-pixel " -"rendering." -msgstr "" +"Rendering text at a subpixel level generally makes it look a bit better on " +"flat (LCD) screens, but can show color artifacts on CRT screens. The " +"\"Automatic\" choice will enable it only if a LCD screen is detected." +msgstr "サブピクセルレベルでテキストを描画すると、一般にフラット (LCD) 画面で少し見栄えが良くなりますが、CRT 画面では、文字に色が散りばめられたように見えてしまいます。「自動」を選ぶと、LCD 画面を検出したときのみにこれを有効にします。" #. Type: boolean #. Description -#: ../fontconfig.templates:46 +#: ../fontconfig.templates:22 msgid "Enable bitmapped fonts by default?" -msgstr "¥Ç¥Õ¥©¥ë¥È¤Ç¥Ó¥Ã¥È¥Þ¥Ã¥×¥Õ¥©¥ó¥È¤òÍ­¸ú¤Ë¤·¤Þ¤¹¤«?" +msgstr "デフォルトでビットマップフォントを有効にしますか?" #. Type: boolean #. Description -#: ../fontconfig.templates:46 +#: ../fontconfig.templates:22 msgid "" "By default, only outline fonts are used by applications which support " "fontconfig. Outline fonts are fonts which scale well to various sizes. In " @@ -118,63 +81,8 @@ msgid "" "affect the systemwide default; this and many other fontconfig options may be " "enabled or disabled on a per-user basis." msgstr "" -"¥Ç¥Õ¥©¥ë¥È¤Ç¤Ï¡¢¥¢¥¦¥È¥é¥¤¥ó¥Õ¥©¥ó¥È¤Î¤ß¤¬ fontconfig ¤ò¥µ¥Ý¡¼¥È¤¹¤ë¥¢¥×¥ê" -"¥±¡¼¥·¥ç¥ó¤Ç»È¤ï¤ì¤Þ¤¹¡£¥¢¥¦¥È¥é¥¤¥ó¥Õ¥©¥ó¥È¤Ï¤µ¤Þ¤¶¤Þ¤Ê¥µ¥¤¥º¤Ë¹ç¤ï¤»¤ÆÂ礭" -"¤µ¤ÎÊѤï¤ë¥Õ¥©¥ó¥È¤Ç¤¹¡£ÂоÈŪ¤Ë¥Ó¥Ã¥È¥Þ¥Ã¥×¥Õ¥©¥ó¥È¤Ï¤¿¤¤¤Æ¤¤ÄãÉʼÁ¤Ç¤¹¡£¤³" -"¤ÎÁªÂò»è¤òÍ­¸ú¤Ë¤¹¤ë¤È¡¢¥·¥¹¥Æ¥àÁ´ÂΤΥǥե©¥ë¥È¤ËÇȵڤ·¤Þ¤¹¡£¤³¤ì¤È¤Û¤«¤Î¿" -"¤¯¤Î fontconfig ¤ÎÁªÂò»è¤Ï´ðËÜŪ¤Ë¥æ¡¼¥¶¤´¤È¤ËÍ­¸ú¡¢Ìµ¸ú¤Ë¤Ç¤­¤Þ¤¹¡£" - -#~ msgid "" -#~ "Bytecode interpreter (CRT screens), Autohinter, Subpixel rendering (LCD " -#~ "screens)" -#~ msgstr "" -#~ "¥Ð¥¤¥È¥³¡¼¥É¥¤¥ó¥¿¥×¥ê¥¿ (CRT ²èÌÌ), ¥ª¡¼¥È¥Ò¥ó¥È, ¥µ¥Ö¥Ô¥¯¥»¥ë¥ì¥ó¥À¥ê¥ó" -#~ "¥° (LCD ²èÌÌ)" - -#~ msgid "" -#~ "The Freetype font library is able to render fonts with different methods. " -#~ "Depending on your hardware and the fonts you generally use, some will " -#~ "give better results." -#~ msgstr "" -#~ "Freetype ¥Õ¥©¥ó¥È¥é¥¤¥Ö¥é¥ê¤Ï°Û¤Ê¤ëÊýË¡¤Ç¥Õ¥©¥ó¥È¤òÉÁ²è¤Ç¤­¤Þ¤¹¡£¤É¤ì¤¬¤Û" -#~ "¤«¤è¤êÎɤ¤·ë²Ì¤Ë¤Ê¤ë¤«¤Ï¡¢¥Ï¡¼¥É¥¦¥§¥¢¤ª¤è¤Ó°ìÈ̤ËÍøÍѤ¹¤ë¥Õ¥©¥ó¥È¤Ë°Í¸¤·" -#~ "¤Þ¤¹¡£" - -#~ msgid "" -#~ "The autohinter module is the default; it gives correct results on most " -#~ "configurations. The bytecode interpreter renders fonts very sharply, and " -#~ "is often a better choice if you are using a cathode-ray screen. On the " -#~ "other hand, the subpixel rendering method is optimized for high-quality " -#~ "rendering on most liquid crystal displays." -#~ msgstr "" -#~ "¥ª¡¼¥È¥Ò¥ó¥È¥â¥¸¥å¡¼¥ë¤Ï¥Ç¥Õ¥©¥ë¥È¤Ç¤¹¡£¤Û¤È¤ó¤É¤ÎÀßÄê¤ÇŬÀڤʷë²Ì¤Ë¤Ê¤ê¤Þ" -#~ "¤¹¡£¥Ð¥¤¥È¥³¡¼¥É¥¤¥ó¥¿¥×¥ê¥¿¤Ï¥Õ¥©¥ó¥È¤òÈó¾ï¤ËÁ¯ÌÀ¤ËÉÁ²è¤·¡¢CRT ²èÌ̤ò»È¤Ã" -#~ "¤Æ¤¤¤ë¤È¤­¤Ë¤Ï¤è¤êÎɤ¤ÁªÂò»è¤Ë¤Ê¤ë¤³¤È¤¬¤¢¤ê¤Þ¤¹¡£¤³¤ì¤ËÂФ·¡¢¥µ¥Ö¥Ô¥¯¥»¥ë" -#~ "¥ì¥ó¥À¥ê¥ó¥°¼êË¡¤Ï¡¢¤Û¤È¤ó¤É¤Î LCD ²èÌ̤ǤιâÉʼÁ¤ÊÉÁ²è¤Î¤¿¤á¤ËºÇŬ²½¤µ¤ì" -#~ "¤Æ¤¤¤Þ¤¹¡£" - -#~ msgid "Enable sub-pixel text rendering?" -#~ msgstr "¥µ¥Ö¥Ô¥¯¥»¥ë¥Æ¥­¥¹¥È¥ì¥ó¥À¥ê¥ó¥°¤òÍ­¸ú¤Ë¤·¤Þ¤¹¤«?" - -#~ msgid "" -#~ "If you have an LCD display, then you will want to enable this option. It " -#~ "allows for higher-quality text rendering. For more information, please " -#~ "see the fontconfig manual in /usr/share/doc/fontconfig/ on your Debian " -#~ "system." -#~ msgstr "" -#~ "LCD ¥Ç¥£¥¹¥×¥ì¥¤¤ò»È¤Ã¤Æ¤¤¤ë¤Î¤Ç¤¢¤ì¤Ð¡¢¤³¤ÎÁªÂò»è¤òÍ­¸ú¤Ë¤¹¤ë¤Î¤¬¤è¤¤¤Ç" -#~ "¤·¤ç¤¦¡£¹âÉʼÁ¤Î¥Æ¥­¥¹¥È¥ì¥ó¥À¥ê¥ó¥°¤¬¤Ç¤­¤Þ¤¹¡£¾ÜºÙ¤Ë¤Ä¤¤¤Æ¤Ï¤¢¤Ê¤¿¤Î " -#~ "Debian ¥·¥¹¥Æ¥à¤Î /usr/share/doc/fontconfig/ ¤Ë¤¢¤ë fontconfig ¤Î¥Þ¥Ë¥å¥¢" -#~ "¥ë¤ò»²¾È¤·¤Æ¤¯¤À¤µ¤¤¡£" - -#~ msgid "Enable the freetype autohinter module?" -#~ msgstr "freetype ¥ª¡¼¥È¥Ò¥ó¥È¥â¥¸¥å¡¼¥ë¤òÍ­¸ú¤Ë¤·¤Þ¤¹¤«?" - -#~ msgid "" -#~ "Depending on your display and on which fonts you use, they can look " -#~ "better or worse when using the autohinter module. Enable it if you happen " -#~ "to prefer the look it gives to your fonts." -#~ msgstr "" -#~ "¥ª¡¼¥È¥Ò¥ó¥È¥â¥¸¥å¡¼¥ë¤ò»È¤Ã¤¿¤È¤­¤Ë¤è¤êÎɤ¯¸«¤¨¤ë¤è¤¦¤Ë¤Ê¤ë¤«¤è¤ê°­¤¯¤Ê¤ë" -#~ "¤«¤Ï¡¢¤¢¤Ê¤¿¤Î¥Ç¥£¥¹¥×¥ì¥¤¤ÈÍøÍѤ¹¤ë¥Õ¥©¥ó¥È¤Ë°Í¸¤·¤Þ¤¹¡£¥Õ¥©¥ó¥È¤¬¤è¤êÎÉ" -#~ "¤¯¸«¤¨¤ë¤è¤¦¤Ç¤¢¤ì¤ÐÍ­¸ú¤Ë¤·¤Þ¤¹¡£" +"デフォルトでは、アウトラインフォントのみが fontconfig をサポートするアプリ" +"ケーションで使われます。アウトラインフォントはさまざまなサイズに合わせて大き" +"さの変わるフォントです。対照的にビットマップフォントはたいてい低品質です。こ" +"の選択肢を有効にすると、システム全体のデフォルトに波及します。これとほかの多" +"くの fontconfig の選択肢は基本的にユーザごとに有効、無効にできます。" diff --git a/debian/po/nl.po b/debian/po/nl.po index dd4d4ae..861e090 100644 --- a/debian/po/nl.po +++ b/debian/po/nl.po @@ -16,7 +16,7 @@ msgid "" msgstr "" "Project-Id-Version: nl\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2005-03-02 13:41-0800\n" +"POT-Creation-Date: 2005-03-29 13:33-0800\n" "PO-Revision-Date: 2004-11-03 22:00+0100\n" "Last-Translator: Frans Pop \n" "Language-Team: Dutch \n" @@ -34,85 +34,48 @@ msgstr "" #. Type: select #. Description #: ../fontconfig.templates:5 -#, fuzzy -msgid "With what method should fonts be hinted?" -msgstr "Volgens welke methode moet tekst worden weergegeven?" - -#. Type: select -#. Description -#: ../fontconfig.templates:5 -msgid "" -"The FreeType font library can adjust glyph outlines to accomodate the pixel " -"grid for improved legibility. This process is called \"hinting\". FreeType " -"can either use the hints built-in to each font or it can use a format-" -"indepedent Autohinter. For most font formats, using the format-specific " -"hints generates better results. However, many freely available TrueType " -"format fonts don't include any hints at all. When loading such a font, " -"unless you specifically ask to use the Autohinter, these fonts will end up " -"unhinted, which will make them appear fuzzy on the screen." +msgid "How should fonts be tuned for the screen?" msgstr "" #. Type: select #. Description #: ../fontconfig.templates:5 msgid "" -"If the TrueType fonts you use most include hints, then the Native hinter " -"gives better results. However, if the fonts you use most do not include " -"such hints, then the Autohinter will work better. Yes, FreeType should do " -"this automatically." -msgstr "" - -#. Type: select -#. Description -#: ../fontconfig.templates:5 -msgid "" -"You can also select None to disable all hinting and make your screen look " -"like Mac OS X." +"Select Native if you mostly use Bitstream Vera (the default in Debian) or " +"any of the Microsoft fonts. Select Autohinter if you mostly use other " +"TrueType fonts. Select None if you want blurry text." msgstr "" #. Type: select #. Choices -#: ../fontconfig.templates:28 -msgid "Automatic, Enable, Disable" +#: ../fontconfig.templates:12 +msgid "Automatic, Always, Never" msgstr "" #. Type: select #. Description -#: ../fontconfig.templates:30 -msgid "Should font be rendered using sub-pixel elements?" +#: ../fontconfig.templates:14 +msgid "Enable subpixel rendering of text?" msgstr "" #. Type: select #. Description -#: ../fontconfig.templates:30 +#: ../fontconfig.templates:14 msgid "" -"With known sub-pixel geometry, LCD screens can synthesize higher resolution " -"in one dimension. Taking advantage of this when rendering glyphs sharpens " -"the appearance of text on the screen. This can cause color artifacts, " -"especially when rendering unhinted or autohinted fonts." -msgstr "" - -#. Type: select -#. Description -#: ../fontconfig.templates:30 -msgid "" -"This option selects when sub-pixel rendering should be used. Automatic " -"enables sub-pixel rendering whenever the X server detects an LCD monitor, " -"which it can generally do when the monitor is built into the computer or " -"connected with a digital (DVI) cable. Enable forces the system to use sub-" -"pixel rendering while Disable forces the system to not use sub-pixel " -"rendering." +"Rendering text at a subpixel level generally makes it look a bit better on " +"flat (LCD) screens, but can show color artifacts on CRT screens. The " +"\"Automatic\" choice will enable it only if a LCD screen is detected." msgstr "" #. Type: boolean #. Description -#: ../fontconfig.templates:46 +#: ../fontconfig.templates:22 msgid "Enable bitmapped fonts by default?" msgstr "Bitmap-lettertypen standaard activeren?" #. Type: boolean #. Description -#: ../fontconfig.templates:46 +#: ../fontconfig.templates:22 msgid "" "By default, only outline fonts are used by applications which support " "fontconfig. Outline fonts are fonts which scale well to various sizes. In " @@ -127,6 +90,10 @@ msgstr "" "opties van fontconfig kunnen voor elke gebruiker afzonderlijk ingesteld " "worden." +#, fuzzy +#~ msgid "With what method should fonts be hinted?" +#~ msgstr "Volgens welke methode moet tekst worden weergegeven?" + #~ msgid "" #~ "Bytecode interpreter (CRT screens), Autohinter, Subpixel rendering (LCD " #~ "screens)" diff --git a/debian/po/pt.po b/debian/po/pt.po index e40498b..85a242b 100644 --- a/debian/po/pt.po +++ b/debian/po/pt.po @@ -4,7 +4,7 @@ msgid "" msgstr "" "Project-Id-Version: fontconfig 2.2.3-3\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2005-03-02 13:41-0800\n" +"POT-Creation-Date: 2005-03-29 13:33-0800\n" "PO-Revision-Date: 2004-10-24 12:23+0000\n" "Last-Translator:Miguel Figueiredo \n" "Language-Team: Portuguese \n" @@ -21,85 +21,48 @@ msgstr "" #. Type: select #. Description #: ../fontconfig.templates:5 -#, fuzzy -msgid "With what method should fonts be hinted?" -msgstr "Com qual método deverá ser desenhado o texto?" - -#. Type: select -#. Description -#: ../fontconfig.templates:5 -msgid "" -"The FreeType font library can adjust glyph outlines to accomodate the pixel " -"grid for improved legibility. This process is called \"hinting\". FreeType " -"can either use the hints built-in to each font or it can use a format-" -"indepedent Autohinter. For most font formats, using the format-specific " -"hints generates better results. However, many freely available TrueType " -"format fonts don't include any hints at all. When loading such a font, " -"unless you specifically ask to use the Autohinter, these fonts will end up " -"unhinted, which will make them appear fuzzy on the screen." +msgid "How should fonts be tuned for the screen?" msgstr "" #. Type: select #. Description #: ../fontconfig.templates:5 msgid "" -"If the TrueType fonts you use most include hints, then the Native hinter " -"gives better results. However, if the fonts you use most do not include " -"such hints, then the Autohinter will work better. Yes, FreeType should do " -"this automatically." -msgstr "" - -#. Type: select -#. Description -#: ../fontconfig.templates:5 -msgid "" -"You can also select None to disable all hinting and make your screen look " -"like Mac OS X." +"Select Native if you mostly use Bitstream Vera (the default in Debian) or " +"any of the Microsoft fonts. Select Autohinter if you mostly use other " +"TrueType fonts. Select None if you want blurry text." msgstr "" #. Type: select #. Choices -#: ../fontconfig.templates:28 -msgid "Automatic, Enable, Disable" +#: ../fontconfig.templates:12 +msgid "Automatic, Always, Never" msgstr "" #. Type: select #. Description -#: ../fontconfig.templates:30 -msgid "Should font be rendered using sub-pixel elements?" +#: ../fontconfig.templates:14 +msgid "Enable subpixel rendering of text?" msgstr "" #. Type: select #. Description -#: ../fontconfig.templates:30 +#: ../fontconfig.templates:14 msgid "" -"With known sub-pixel geometry, LCD screens can synthesize higher resolution " -"in one dimension. Taking advantage of this when rendering glyphs sharpens " -"the appearance of text on the screen. This can cause color artifacts, " -"especially when rendering unhinted or autohinted fonts." -msgstr "" - -#. Type: select -#. Description -#: ../fontconfig.templates:30 -msgid "" -"This option selects when sub-pixel rendering should be used. Automatic " -"enables sub-pixel rendering whenever the X server detects an LCD monitor, " -"which it can generally do when the monitor is built into the computer or " -"connected with a digital (DVI) cable. Enable forces the system to use sub-" -"pixel rendering while Disable forces the system to not use sub-pixel " -"rendering." +"Rendering text at a subpixel level generally makes it look a bit better on " +"flat (LCD) screens, but can show color artifacts on CRT screens. The " +"\"Automatic\" choice will enable it only if a LCD screen is detected." msgstr "" #. Type: boolean #. Description -#: ../fontconfig.templates:46 +#: ../fontconfig.templates:22 msgid "Enable bitmapped fonts by default?" msgstr "Permitir tipos de letra bitmap por omissão?" #. Type: boolean #. Description -#: ../fontconfig.templates:46 +#: ../fontconfig.templates:22 msgid "" "By default, only outline fonts are used by applications which support " "fontconfig. Outline fonts are fonts which scale well to various sizes. In " @@ -114,6 +77,10 @@ msgstr "" "omissão de todo o sistema; esta e muitas outras opções do fontconfig são " "ligadas ou desligadas num controle por utilizador." +#, fuzzy +#~ msgid "With what method should fonts be hinted?" +#~ msgstr "Com qual método deverá ser desenhado o texto?" + #~ msgid "" #~ "Bytecode interpreter (CRT screens), Autohinter, Subpixel rendering (LCD " #~ "screens)" diff --git a/debian/po/pt_BR.po b/debian/po/pt_BR.po index aca9a74..4427a8c 100644 --- a/debian/po/pt_BR.po +++ b/debian/po/pt_BR.po @@ -15,7 +15,7 @@ msgid "" msgstr "" "Project-Id-Version: fontconfig\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2005-03-02 13:41-0800\n" +"POT-Creation-Date: 2005-03-29 13:33-0800\n" "PO-Revision-Date: 2004-10-30 13:01-0300\n" "Last-Translator: André Luís Lopes \n" "Language-Team: Debian-BR Project \n" @@ -32,85 +32,49 @@ msgstr "" #. Type: select #. Description #: ../fontconfig.templates:5 -#, fuzzy -msgid "With what method should fonts be hinted?" -msgstr "Os textos devem ser renderizados usando qual método ?" - -#. Type: select -#. Description -#: ../fontconfig.templates:5 -msgid "" -"The FreeType font library can adjust glyph outlines to accomodate the pixel " -"grid for improved legibility. This process is called \"hinting\". FreeType " -"can either use the hints built-in to each font or it can use a format-" -"indepedent Autohinter. For most font formats, using the format-specific " -"hints generates better results. However, many freely available TrueType " -"format fonts don't include any hints at all. When loading such a font, " -"unless you specifically ask to use the Autohinter, these fonts will end up " -"unhinted, which will make them appear fuzzy on the screen." -msgstr "" - -#. Type: select -#. Description -#: ../fontconfig.templates:5 -msgid "" -"If the TrueType fonts you use most include hints, then the Native hinter " -"gives better results. However, if the fonts you use most do not include " -"such hints, then the Autohinter will work better. Yes, FreeType should do " -"this automatically." +msgid "How should fonts be tuned for the screen?" msgstr "" #. Type: select #. Description #: ../fontconfig.templates:5 msgid "" -"You can also select None to disable all hinting and make your screen look " -"like Mac OS X." +"Select Native if you mostly use Bitstream Vera (the default in Debian) or " +"any of the Microsoft fonts. Select Autohinter if you mostly use other " +"TrueType fonts. Select None if you want blurry text." msgstr "" #. Type: select #. Choices -#: ../fontconfig.templates:28 -msgid "Automatic, Enable, Disable" -msgstr "" - -#. Type: select -#. Description -#: ../fontconfig.templates:30 -msgid "Should font be rendered using sub-pixel elements?" +#: ../fontconfig.templates:12 +msgid "Automatic, Always, Never" msgstr "" #. Type: select #. Description -#: ../fontconfig.templates:30 -msgid "" -"With known sub-pixel geometry, LCD screens can synthesize higher resolution " -"in one dimension. Taking advantage of this when rendering glyphs sharpens " -"the appearance of text on the screen. This can cause color artifacts, " -"especially when rendering unhinted or autohinted fonts." -msgstr "" +#: ../fontconfig.templates:14 +#, fuzzy +msgid "Enable subpixel rendering of text?" +msgstr "Habilitar renderização de texto de sub-pixel ?" #. Type: select #. Description -#: ../fontconfig.templates:30 +#: ../fontconfig.templates:14 msgid "" -"This option selects when sub-pixel rendering should be used. Automatic " -"enables sub-pixel rendering whenever the X server detects an LCD monitor, " -"which it can generally do when the monitor is built into the computer or " -"connected with a digital (DVI) cable. Enable forces the system to use sub-" -"pixel rendering while Disable forces the system to not use sub-pixel " -"rendering." +"Rendering text at a subpixel level generally makes it look a bit better on " +"flat (LCD) screens, but can show color artifacts on CRT screens. The " +"\"Automatic\" choice will enable it only if a LCD screen is detected." msgstr "" #. Type: boolean #. Description -#: ../fontconfig.templates:46 +#: ../fontconfig.templates:22 msgid "Enable bitmapped fonts by default?" msgstr "Habilitar fontes bitmapped por padrão ?" #. Type: boolean #. Description -#: ../fontconfig.templates:46 +#: ../fontconfig.templates:22 msgid "" "By default, only outline fonts are used by applications which support " "fontconfig. Outline fonts are fonts which scale well to various sizes. In " @@ -125,6 +89,10 @@ msgstr "" "sistema; essa e muitas outras opções do fontconfig podem ser habilitadas ou " "desabilitadas para cada usuário." +#, fuzzy +#~ msgid "With what method should fonts be hinted?" +#~ msgstr "Os textos devem ser renderizados usando qual método ?" + #~ msgid "" #~ "Bytecode interpreter (CRT screens), Autohinter, Subpixel rendering (LCD " #~ "screens)" @@ -155,9 +123,6 @@ msgstr "" #~ "renderização de subpixel é otimizado para renderização de alta qualidade " #~ "na maioria dos displays de cristal líquido." -#~ msgid "Enable sub-pixel text rendering?" -#~ msgstr "Habilitar renderização de texto de sub-pixel ?" - #~ msgid "" #~ "If you have an LCD display, then you will want to enable this option. It " #~ "allows for higher-quality text rendering. For more information, please " diff --git a/debian/po/templates.pot b/debian/po/templates.pot index 5461486..4646e31 100644 --- a/debian/po/templates.pot +++ b/debian/po/templates.pot @@ -16,7 +16,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2005-03-02 13:41-0800\n" +"POT-Creation-Date: 2005-03-29 13:33-0800\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -33,84 +33,48 @@ msgstr "" #. Type: select #. Description #: ../fontconfig.templates:5 -msgid "With what method should fonts be hinted?" +msgid "How should fonts be tuned for the screen?" msgstr "" #. Type: select #. Description #: ../fontconfig.templates:5 msgid "" -"The FreeType font library can adjust glyph outlines to accomodate the pixel " -"grid for improved legibility. This process is called \"hinting\". FreeType " -"can either use the hints built-in to each font or it can use a format-" -"indepedent Autohinter. For most font formats, using the format-specific " -"hints generates better results. However, many freely available TrueType " -"format fonts don't include any hints at all. When loading such a font, " -"unless you specifically ask to use the Autohinter, these fonts will end up " -"unhinted, which will make them appear fuzzy on the screen." -msgstr "" - -#. Type: select -#. Description -#: ../fontconfig.templates:5 -msgid "" -"If the TrueType fonts you use most include hints, then the Native hinter " -"gives better results. However, if the fonts you use most do not include " -"such hints, then the Autohinter will work better. Yes, FreeType should do " -"this automatically." -msgstr "" - -#. Type: select -#. Description -#: ../fontconfig.templates:5 -msgid "" -"You can also select None to disable all hinting and make your screen look " -"like Mac OS X." +"Select Native if you mostly use Bitstream Vera (the default in Debian) or " +"any of the Microsoft fonts. Select Autohinter if you mostly use other " +"TrueType fonts. Select None if you want blurry text." msgstr "" #. Type: select #. Choices -#: ../fontconfig.templates:28 -msgid "Automatic, Enable, Disable" -msgstr "" - -#. Type: select -#. Description -#: ../fontconfig.templates:30 -msgid "Should font be rendered using sub-pixel elements?" +#: ../fontconfig.templates:12 +msgid "Automatic, Always, Never" msgstr "" #. Type: select #. Description -#: ../fontconfig.templates:30 -msgid "" -"With known sub-pixel geometry, LCD screens can synthesize higher resolution " -"in one dimension. Taking advantage of this when rendering glyphs sharpens " -"the appearance of text on the screen. This can cause color artifacts, " -"especially when rendering unhinted or autohinted fonts." +#: ../fontconfig.templates:14 +msgid "Enable subpixel rendering of text?" msgstr "" #. Type: select #. Description -#: ../fontconfig.templates:30 +#: ../fontconfig.templates:14 msgid "" -"This option selects when sub-pixel rendering should be used. Automatic " -"enables sub-pixel rendering whenever the X server detects an LCD monitor, " -"which it can generally do when the monitor is built into the computer or " -"connected with a digital (DVI) cable. Enable forces the system to use sub-" -"pixel rendering while Disable forces the system to not use sub-pixel " -"rendering." +"Rendering text at a subpixel level generally makes it look a bit better on " +"flat (LCD) screens, but can show color artifacts on CRT screens. The " +"\"Automatic\" choice will enable it only if a LCD screen is detected." msgstr "" #. Type: boolean #. Description -#: ../fontconfig.templates:46 +#: ../fontconfig.templates:22 msgid "Enable bitmapped fonts by default?" msgstr "" #. Type: boolean #. Description -#: ../fontconfig.templates:46 +#: ../fontconfig.templates:22 msgid "" "By default, only outline fonts are used by applications which support " "fontconfig. Outline fonts are fonts which scale well to various sizes. In " diff --git a/debian/po/tr.po b/debian/po/tr.po index 50c1579..008f046 100644 --- a/debian/po/tr.po +++ b/debian/po/tr.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: fontconfig\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2005-03-02 13:41-0800\n" +"POT-Creation-Date: 2005-03-29 13:33-0800\n" "PO-Revision-Date: 2004-10-23 16:23+0300\n" "Last-Translator: Gürkan Aslan \n" "Language-Team: Turkish \n" @@ -24,85 +24,48 @@ msgstr "" #. Type: select #. Description #: ../fontconfig.templates:5 -#, fuzzy -msgid "With what method should fonts be hinted?" -msgstr "Metinler hangi yöntemle kaplansın?" - -#. Type: select -#. Description -#: ../fontconfig.templates:5 -msgid "" -"The FreeType font library can adjust glyph outlines to accomodate the pixel " -"grid for improved legibility. This process is called \"hinting\". FreeType " -"can either use the hints built-in to each font or it can use a format-" -"indepedent Autohinter. For most font formats, using the format-specific " -"hints generates better results. However, many freely available TrueType " -"format fonts don't include any hints at all. When loading such a font, " -"unless you specifically ask to use the Autohinter, these fonts will end up " -"unhinted, which will make them appear fuzzy on the screen." +msgid "How should fonts be tuned for the screen?" msgstr "" #. Type: select #. Description #: ../fontconfig.templates:5 msgid "" -"If the TrueType fonts you use most include hints, then the Native hinter " -"gives better results. However, if the fonts you use most do not include " -"such hints, then the Autohinter will work better. Yes, FreeType should do " -"this automatically." -msgstr "" - -#. Type: select -#. Description -#: ../fontconfig.templates:5 -msgid "" -"You can also select None to disable all hinting and make your screen look " -"like Mac OS X." +"Select Native if you mostly use Bitstream Vera (the default in Debian) or " +"any of the Microsoft fonts. Select Autohinter if you mostly use other " +"TrueType fonts. Select None if you want blurry text." msgstr "" #. Type: select #. Choices -#: ../fontconfig.templates:28 -msgid "Automatic, Enable, Disable" +#: ../fontconfig.templates:12 +msgid "Automatic, Always, Never" msgstr "" #. Type: select #. Description -#: ../fontconfig.templates:30 -msgid "Should font be rendered using sub-pixel elements?" +#: ../fontconfig.templates:14 +msgid "Enable subpixel rendering of text?" msgstr "" #. Type: select #. Description -#: ../fontconfig.templates:30 +#: ../fontconfig.templates:14 msgid "" -"With known sub-pixel geometry, LCD screens can synthesize higher resolution " -"in one dimension. Taking advantage of this when rendering glyphs sharpens " -"the appearance of text on the screen. This can cause color artifacts, " -"especially when rendering unhinted or autohinted fonts." -msgstr "" - -#. Type: select -#. Description -#: ../fontconfig.templates:30 -msgid "" -"This option selects when sub-pixel rendering should be used. Automatic " -"enables sub-pixel rendering whenever the X server detects an LCD monitor, " -"which it can generally do when the monitor is built into the computer or " -"connected with a digital (DVI) cable. Enable forces the system to use sub-" -"pixel rendering while Disable forces the system to not use sub-pixel " -"rendering." +"Rendering text at a subpixel level generally makes it look a bit better on " +"flat (LCD) screens, but can show color artifacts on CRT screens. The " +"\"Automatic\" choice will enable it only if a LCD screen is detected." msgstr "" #. Type: boolean #. Description -#: ../fontconfig.templates:46 +#: ../fontconfig.templates:22 msgid "Enable bitmapped fonts by default?" msgstr "Biteşlemli yazıtipleri öntanımlı olarak etkinleştirilsin mi?" #. Type: boolean #. Description -#: ../fontconfig.templates:46 +#: ../fontconfig.templates:22 msgid "" "By default, only outline fonts are used by applications which support " "fontconfig. Outline fonts are fonts which scale well to various sizes. In " @@ -118,6 +81,10 @@ msgstr "" "alternatif olarak bu ve diğer birçok fontconfig seçeneğinin kullanıcı " "bazında etkinleştirilmesi de tercih edilebilir." +#, fuzzy +#~ msgid "With what method should fonts be hinted?" +#~ msgstr "Metinler hangi yöntemle kaplansın?" + #~ msgid "" #~ "Bytecode interpreter (CRT screens), Autohinter, Subpixel rendering (LCD " #~ "screens)" diff --git a/debian/po/zh_CN.po b/debian/po/zh_CN.po index df04f09..2c58a84 100644 --- a/debian/po/zh_CN.po +++ b/debian/po/zh_CN.po @@ -15,7 +15,7 @@ msgid "" msgstr "" "Project-Id-Version: fontconfig debconf\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2005-03-02 13:41-0800\n" +"POT-Creation-Date: 2005-03-29 13:33-0800\n" "PO-Revision-Date: 2004-11-03 00:14+1300\n" "Last-Translator: Carlos Liu \n" "Language-Team: Debian Chinese [GB] \n" @@ -32,85 +32,48 @@ msgstr "" #. Type: select #. Description #: ../fontconfig.templates:5 -#, fuzzy -msgid "With what method should fonts be hinted?" -msgstr "您希望使用哪种文本渲染方式？" - -#. Type: select -#. Description -#: ../fontconfig.templates:5 -msgid "" -"The FreeType font library can adjust glyph outlines to accomodate the pixel " -"grid for improved legibility. This process is called \"hinting\". FreeType " -"can either use the hints built-in to each font or it can use a format-" -"indepedent Autohinter. For most font formats, using the format-specific " -"hints generates better results. However, many freely available TrueType " -"format fonts don't include any hints at all. When loading such a font, " -"unless you specifically ask to use the Autohinter, these fonts will end up " -"unhinted, which will make them appear fuzzy on the screen." +msgid "How should fonts be tuned for the screen?" msgstr "" #. Type: select #. Description #: ../fontconfig.templates:5 msgid "" -"If the TrueType fonts you use most include hints, then the Native hinter " -"gives better results. However, if the fonts you use most do not include " -"such hints, then the Autohinter will work better. Yes, FreeType should do " -"this automatically." -msgstr "" - -#. Type: select -#. Description -#: ../fontconfig.templates:5 -msgid "" -"You can also select None to disable all hinting and make your screen look " -"like Mac OS X." +"Select Native if you mostly use Bitstream Vera (the default in Debian) or " +"any of the Microsoft fonts. Select Autohinter if you mostly use other " +"TrueType fonts. Select None if you want blurry text." msgstr "" #. Type: select #. Choices -#: ../fontconfig.templates:28 -msgid "Automatic, Enable, Disable" +#: ../fontconfig.templates:12 +msgid "Automatic, Always, Never" msgstr "" #. Type: select #. Description -#: ../fontconfig.templates:30 -msgid "Should font be rendered using sub-pixel elements?" +#: ../fontconfig.templates:14 +msgid "Enable subpixel rendering of text?" msgstr "" #. Type: select #. Description -#: ../fontconfig.templates:30 +#: ../fontconfig.templates:14 msgid "" -"With known sub-pixel geometry, LCD screens can synthesize higher resolution " -"in one dimension. Taking advantage of this when rendering glyphs sharpens " -"the appearance of text on the screen. This can cause color artifacts, " -"especially when rendering unhinted or autohinted fonts." -msgstr "" - -#. Type: select -#. Description -#: ../fontconfig.templates:30 -msgid "" -"This option selects when sub-pixel rendering should be used. Automatic " -"enables sub-pixel rendering whenever the X server detects an LCD monitor, " -"which it can generally do when the monitor is built into the computer or " -"connected with a digital (DVI) cable. Enable forces the system to use sub-" -"pixel rendering while Disable forces the system to not use sub-pixel " -"rendering." +"Rendering text at a subpixel level generally makes it look a bit better on " +"flat (LCD) screens, but can show color artifacts on CRT screens. The " +"\"Automatic\" choice will enable it only if a LCD screen is detected." msgstr "" #. Type: boolean #. Description -#: ../fontconfig.templates:46 +#: ../fontconfig.templates:22 msgid "Enable bitmapped fonts by default?" msgstr "默认使用点阵字体吗？" #. Type: boolean #. Description -#: ../fontconfig.templates:46 +#: ../fontconfig.templates:22 msgid "" "By default, only outline fonts are used by applications which support " "fontconfig. Outline fonts are fonts which scale well to various sizes. In " @@ -123,6 +86,10 @@ msgstr "" "此选项将会影响整个系统的默认设置。当然，此选项以及其它很多 fontconfig 设置都" "可以基于每个用户单独进行开启或关闭。" +#, fuzzy +#~ msgid "With what method should fonts be hinted?" +#~ msgstr "您希望使用哪种文本渲染方式？" + #~ msgid "" #~ "Bytecode interpreter (CRT screens), Autohinter, Subpixel rendering (LCD " #~ "screens)" diff --git a/fc-cache/fc-cache.c b/fc-cache/fc-cache.c index ef92535..6fa0c5a 100644 --- a/fc-cache/fc-cache.c +++ b/fc-cache/fc-cache.c @@ -296,6 +296,7 @@ main (int argc, char **argv) * sleep(3) can't be interrupted by a signal here -- this isn't in the * library, and there aren't any signals flying around here. */ + FcConfigDestroy (config); sleep (2); if (verbose) printf ("%s: %s\n", argv[0], ret ? "failed" : "succeeded"); diff --git a/fonts.conf.in b/fonts.conf.in index ef988ee..aa93427 100644 --- a/fonts.conf.in +++ b/fonts.conf.in @@ -140,33 +140,24 @@ - - Times - - Nimbus Roman No9 L - - - - Helvetica - - Nimbus Sans L - - - - Courier - - Nimbus Mono L - - + + Times + Nimbus Roman No9 L + + + Helvetica + Nimbus Sans L + + + Courier + Nimbus Mono L + Times New Roman diff --git a/src/fcfreetype.c b/src/fcfreetype.c index 4ca1ba0..ee4af40 100644 --- a/src/fcfreetype.c +++ b/src/fcfreetype.c @@ -606,36 +606,6 @@ FcSfntNameTranscode (FT_SfntName *sname) if (!fromcode) return 0; } -#if USE_ICONV - cd = iconv_open ("UTF-8", fromcode); - if (cd) - { - size_t in_bytes_left = sname->string_len; - size_t out_bytes_left = sname->string_len * FC_UTF8_MAX_LEN; - char *inbuf, *outbuf; - - utf8 = malloc (out_bytes_left + 1); - if (!utf8) - return 0; - - outbuf = (char *) utf8; - inbuf = (char *) sname->string; - - while (in_bytes_left) - { - size_t did = iconv (cd, - &inbuf, &in_bytes_left, - &outbuf, &out_bytes_left); - if (did == (size_t) (-1)) - { - free (utf8); - return 0; - } - } - *outbuf = '\0'; - goto done; - } -#endif if (!strcmp (fromcode, "UCS-2BE") || !strcmp (fromcode, "UTF-16BE")) { FcChar8 *src = sname->string; @@ -726,6 +696,41 @@ FcSfntNameTranscode (FT_SfntName *sname) *u8 = '\0'; goto done; } +#if USE_ICONV + cd = iconv_open ("UTF-8", fromcode); + if (cd && cd != (iconv_t) (-1)) + { + size_t in_bytes_left = sname->string_len; + size_t out_bytes_left = sname->string_len * FC_UTF8_MAX_LEN; + char *inbuf, *outbuf; + + utf8 = malloc (out_bytes_left + 1); + if (!utf8) + { + iconv_close (cd); + return 0; + } + + outbuf = (char *) utf8; + inbuf = (char *) sname->string; + + while (in_bytes_left) + { + size_t did = iconv (cd, + &inbuf, &in_bytes_left, + &outbuf, &out_bytes_left); + if (did == (size_t) (-1)) + { + iconv_close (cd); + free (utf8); + return 0; + } + } + iconv_close (cd); + *outbuf = '\0'; + goto done; + } +#endif return 0; done: if (FcStrCmpIgnoreBlanksAndCase (utf8, "") == 0) @@ -2120,6 +2125,12 @@ static const FcFontDecode fcFontDecoders[] = { #define NUM_DECODE (sizeof (fcFontDecoders) / sizeof (fcFontDecoders[0])) +static const FcChar32 prefer_unicode[] = { + 0x20ac, /* EURO SIGN */ +}; + +#define NUM_PREFER_UNICODE (sizeof (prefer_unicode) / sizeof (prefer_unicode[0])) + FcChar32 FcFreeTypeUcs4ToPrivate (FcChar32 ucs4, const FcCharMap *map) { @@ -2281,6 +2292,7 @@ FcFreeTypeCharIndex (FT_Face face, FcChar32 ucs4) int initial, offset, decode; FT_UInt glyphindex; FcChar32 charcode; + int p; initial = 0; /* @@ -2294,6 +2306,12 @@ FcFreeTypeCharIndex (FT_Face face, FcChar32 ucs4) if (initial == NUM_DECODE) initial = 0; } + for (p = 0; p < NUM_PREFER_UNICODE; p++) + if (ucs4 == prefer_unicode[p]) + { + initial = 0; + break; + } /* * Check each encoding for the glyph, starting with the current one */ @@ -2341,12 +2359,6 @@ FcFreeTypeCheckGlyph (FT_Face face, FcChar32 ucs4, FT_Int load_flags = FT_LOAD_IGNORE_GLOBAL_ADVANCE_WIDTH | FT_LOAD_NO_SCALE | FT_LOAD_NO_HINTING; FT_GlyphSlot slot; - /* - * For bitmap-only fonts, assume that they're OK. - */ - if ((face->face_flags & FT_FACE_FLAG_SCALABLE) == 0) - return FcTrue; - /* * When using scalable fonts, only report those glyphs * which can be scaled; otherwise those fonts will -- 2.39.2