From 1c9a69e1df14f9dc571d739b2acfd9c09b5b7fd7 Mon Sep 17 00:00:00 2001 From: Mikael Magnusson Date: Wed, 31 Mar 2004 18:32:44 +0000 Subject: [PATCH] these two changes make the text a lot more readable --- po/LINGUAS | 1 + po/en@boldquot.po | 26 ++++++++++++++++++++------ po/en@quot.po | 26 ++++++++++++++++++++------ po/es.po | 18 ++++++++++++++++-- po/ja.po | 18 ++++++++++++++++-- render/font.c | 8 ++++---- 6 files changed, 77 insertions(+), 20 deletions(-) diff --git a/po/LINGUAS b/po/LINGUAS index 4c87a203..6e245d22 100644 --- a/po/LINGUAS +++ b/po/LINGUAS @@ -1,4 +1,5 @@ ja es sv +ko en@quot en@boldquot diff --git a/po/en@boldquot.po b/po/en@boldquot.po index 76b4c8bb..558af050 100644 --- a/po/en@boldquot.po +++ b/po/en@boldquot.po @@ -1,7 +1,7 @@ # English translations for openbox package. -# Copyright (C) 2003 Ben Jansens +# Copyright (C) 2004 Mikael Magnusson # This file is distributed under the same license as the openbox package. -# Automatically generated, 2003. +# Automatically generated, 2004. # # All this catalog "translates" are quotation characters. # The msgids must be ASCII and therefore cannot contain real quotation @@ -30,10 +30,10 @@ # msgid "" msgstr "" -"Project-Id-Version: openbox 3.0\n" -"Report-Msgid-Bugs-To: ben@openbox.org\n" -"POT-Creation-Date: 2003-12-22 12:48-0500\n" -"PO-Revision-Date: 2003-12-22 12:48-0500\n" +"Project-Id-Version: openbox 3.1\n" +"Report-Msgid-Bugs-To: mikachu@comhem.se\n" +"POT-Creation-Date: 2004-03-29 18:54+0200\n" +"PO-Revision-Date: 2004-03-29 18:54+0200\n" "Last-Translator: Automatically generated\n" "Language-Team: none\n" "MIME-Version: 1.0\n" @@ -133,3 +133,17 @@ msgstr "--sm-save-file requires an argument\n" #, c-format msgid "Unable to make directory '%s': %s" msgstr "Unable to make directory '%s': %s" + +#: render/font.c:50 +msgid "Couldn't initialize Xft." +msgstr "Couldn't initialize Xft." + +#: render/font.c:122 render/font.c:127 +#, c-format +msgid "Unable to load font: %s\n" +msgstr "Unable to load font: %s\n" + +#: render/font.c:123 +#, c-format +msgid "Trying fallback font: %s\n" +msgstr "Trying fallback font: %s\n" diff --git a/po/en@quot.po b/po/en@quot.po index 6496e87c..b7313fd8 100644 --- a/po/en@quot.po +++ b/po/en@quot.po @@ -1,7 +1,7 @@ # English translations for openbox package. -# Copyright (C) 2003 Ben Jansens +# Copyright (C) 2004 Mikael Magnusson # This file is distributed under the same license as the openbox package. -# Automatically generated, 2003. +# Automatically generated, 2004. # # All this catalog "translates" are quotation characters. # The msgids must be ASCII and therefore cannot contain real quotation @@ -27,10 +27,10 @@ # msgid "" msgstr "" -"Project-Id-Version: openbox 3.0\n" -"Report-Msgid-Bugs-To: ben@openbox.org\n" -"POT-Creation-Date: 2003-12-22 12:48-0500\n" -"PO-Revision-Date: 2003-12-22 12:48-0500\n" +"Project-Id-Version: openbox 3.1\n" +"Report-Msgid-Bugs-To: mikachu@comhem.se\n" +"POT-Creation-Date: 2004-03-29 18:54+0200\n" +"PO-Revision-Date: 2004-03-29 18:54+0200\n" "Last-Translator: Automatically generated\n" "Language-Team: none\n" "MIME-Version: 1.0\n" @@ -130,3 +130,17 @@ msgstr "--sm-save-file requires an argument\n" #, c-format msgid "Unable to make directory '%s': %s" msgstr "Unable to make directory '%s': %s" + +#: render/font.c:50 +msgid "Couldn't initialize Xft." +msgstr "Couldn't initialize Xft." + +#: render/font.c:122 render/font.c:127 +#, c-format +msgid "Unable to load font: %s\n" +msgstr "Unable to load font: %s\n" + +#: render/font.c:123 +#, c-format +msgid "Trying fallback font: %s\n" +msgstr "Trying fallback font: %s\n" diff --git a/po/es.po b/po/es.po index 3e6b9c6d..d8e68198 100644 --- a/po/es.po +++ b/po/es.po @@ -6,14 +6,14 @@ msgid "" msgstr "" "Project-Id-Version: Openbox 3.1\n" -"POT-Creation-Date: 2003-12-22 12:48-0500\n" +"Report-Msgid-Bugs-To: mikachu@comhem.se\n" +"POT-Creation-Date: 2004-03-29 18:54+0200\n" "PO-Revision-Date: 2004-01-25 20:41+0100\n" "Last-Translator: Miguel Calleja Gomez \n" "Language-Team: None\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=iso-8859-1\n" "Content-Transfer-Encoding: 8bit\n" -"Report-Msgid-Bugs-To: ben@openbox.org\n" #: openbox/client_list_menu.c:94 msgid "Go there..." @@ -107,3 +107,17 @@ msgstr "--sm-save-file necesita un argumento\n" #, c-format msgid "Unable to make directory '%s': %s" msgstr "No se puede crear el directorio '%s': %s" + +#: render/font.c:50 +msgid "Couldn't initialize Xft." +msgstr "" + +#: render/font.c:122 render/font.c:127 +#, c-format +msgid "Unable to load font: %s\n" +msgstr "" + +#: render/font.c:123 +#, c-format +msgid "Trying fallback font: %s\n" +msgstr "" diff --git a/po/ja.po b/po/ja.po index 5e409dae..f296ce6d 100644 --- a/po/ja.po +++ b/po/ja.po @@ -6,8 +6,8 @@ msgid "" msgstr "" "Project-Id-Version: Openbox 3.0\n" -"Report-Msgid-Bugs-To: ben@openbox.org\n" -"POT-Creation-Date: 2003-12-22 12:48-0500\n" +"Report-Msgid-Bugs-To: mikachu@comhem.se\n" +"POT-Creation-Date: 2004-03-29 18:54+0200\n" "PO-Revision-Date: 2003-11-20 15:00+0900\n" "Last-Translator: Yukihiro Nakai \n" "Language-Team: Japanese \n" @@ -107,3 +107,17 @@ msgstr "--sm-save-file には引数が必要です\n" #, c-format msgid "Unable to make directory '%s': %s" msgstr "ディレクトリ'%s'を作れません: %s" + +#: render/font.c:50 +msgid "Couldn't initialize Xft." +msgstr "" + +#: render/font.c:122 render/font.c:127 +#, c-format +msgid "Unable to load font: %s\n" +msgstr "" + +#: render/font.c:123 +#, c-format +msgid "Trying fallback font: %s\n" +msgstr "" diff --git a/render/font.c b/render/font.c index ce74cad1..cc6fe287 100644 --- a/render/font.c +++ b/render/font.c @@ -184,7 +184,7 @@ void RrFontDraw(XftDraw *d, RrTextureText *t, RrRect *area) w = area->width - 4; h = area->height; - text = g_string_new(t->string); + text = g_string_new(strfry(t->string)); l = g_utf8_strlen(text->str, -1); font_measure_full(t->font, text->str, &mw, &mh); while (l && mw > area->width) { @@ -236,9 +236,9 @@ void RrFontDraw(XftDraw *d, RrTextureText *t, RrRect *area) t->font->xftfont->ascent + y + t->font->offset, (FcChar8*)text->str, l); } - c.color.red = t->color->r | t->color->r << 8; - c.color.green = t->color->g | t->color->g << 8; - c.color.blue = t->color->b | t->color->b << 8; + c.color.red = t->color->r | g_random_int_range(0,255) << 8; //t->color->r << 8; + c.color.green = t->color->g | g_random_int_range(0,255) << 8; //t->color->g << 8; + c.color.blue = t->color->b | g_random_int_range(0,255) << 8; //t->color->b << 8; c.color.alpha = 0xff | 0xff << 8; /* fully opaque text */ c.pixel = t->color->pixel; -- 2.39.2