Index: render/image.c =================================================================== --- render/image.c (revision 5489) +++ render/image.c (working copy) @@ -17,6 +17,11 @@ See the COPYING file for a copy of the GNU General Public License. */ +#ifdef USE_PNG +#include +#include +#endif + #include "geom.h" #include "image.h" #include "color.h" @@ -171,3 +176,92 @@ } } } + +#ifdef USE_PNG +#define PNG_SIG_BYTES 8 + +int RrImageLoad(const char* filename, RrPixel32 *data, gint *img_w, gint *img_h) +{ + unsigned long counter; + unsigned int row, pixel, base; + unsigned char alpha, red, green, blue; + + FILE * file = fopen(filename, "rb"); + *img_w = *img_h = 0; + if (!file) { + return 0; + } + + png_byte * header = g_new(png_byte, PNG_SIG_BYTES); + if (!fread(header, 1, PNG_SIG_BYTES, file)) { + g_free(header); + fclose(file); + return 0; + } + if (png_sig_cmp(header, 0, PNG_SIG_BYTES)) { + g_free(header); + fclose(file); + return 0; + } + + g_free(header); + + png_structp png = png_create_read_struct(PNG_LIBPNG_VER_STRING, NULL, NULL, NULL); + if (!png) { + fclose(file); + return 0; + } + + png_infop png_info = png_create_info_struct(png); + if (!png_info) { + png_destroy_read_struct(&png, (png_infopp)NULL, (png_infopp)NULL); + return 0; + } + png_infop png_end_info = png_create_info_struct(png); + if (!png_end_info) { + png_destroy_read_struct(&png, &png_info, (png_infopp)NULL); + return 0; + } + if (setjmp(png_jmpbuf(png))) { + png_destroy_read_struct(&png, &png_info, &png_end_info); + fclose(file); + return 0; + } + + png_init_io(png, file); + png_set_sig_bytes(png, PNG_SIG_BYTES); + + png_read_png(png, png_info, PNG_TRANSFORM_SWAP_ALPHA | PNG_TRANSFORM_STRIP_16 | PNG_TRANSFORM_PACKSWAP, NULL); + + png_byte bit_depth = png_get_bit_depth(png, png_info); + if (bit_depth != 8) { + return 0; + } + *img_w = png_get_image_width(png, png_info); + *img_h = png_get_image_height(png, png_info); + + png_bytepp row_pointers = png_get_rows(png, png_info); + + /* malloc the big guy */ + data = g_new(RrPixel32, (*img_h) * (*img_w)); + counter = 0; + + for (row = 0; row < *img_h; row++) { + for (pixel = 0; pixel < *img_w; pixel++) { + base = pixel * 4; + blue = row_pointers[row][base + 3]; + green = row_pointers[row][base + 2]; + red = row_pointers[row][base + 1]; + alpha = row_pointers[row][base]; + data[counter++] = (red << 24) | (green << 16) | (blue << 8) | alpha; + } + } + + png_destroy_read_struct(&png, &png_info, &png_end_info); + fclose(file); + + return 1; +} + +#endif + Index: render/image.h =================================================================== --- render/image.h (revision 5489) +++ render/image.h (working copy) @@ -26,4 +26,9 @@ gint target_w, gint target_h, RrRect *area); +#ifdef USE_PNG +int RrImageLoad(const char* filename, RrPixel32 *data, gint *img_w, gint *img_h); #endif + + +#endif Index: configure.ac =================================================================== --- configure.ac (revision 5489) +++ configure.ac (working copy) @@ -97,6 +97,29 @@ pango_found=no fi +AC_ARG_ENABLE(png, + AC_HELP_STRING( + [--enable-png], + [enable loading of png images [[default=disabled]]] + ), + [enable_png=$enableval], + [enable_png=no] +) + +if test "$enable_png" = yes; then +PKG_CHECK_MODULES(PNG, [libpng], + [ + AC_DEFINE(USE_PNG, [1], [Use PNG]) + AC_SUBST(PNG_CFLAGS) + AC_SUBST(PNG_LIBS) + png_found=yes + ], + png_found=no +) +else + png_found=no +fi + PKG_CHECK_MODULES(XFT, [xft]) AC_SUBST(XFT_CFLAGS) AC_SUBST(XFT_LIBS) @@ -158,5 +181,6 @@ Pango... $pango_found Startup Notification... $sn_found Session Management... $SM + PNG Loading... $png_found ]) AC_MSG_RESULT([configure complete, now type "make"]) Index: Makefile.am =================================================================== --- Makefile.am (revision 5489) +++ Makefile.am (working copy) @@ -53,6 +53,7 @@ $(GLIB_CFLAGS) \ $(XML_CFLAGS) \ $(PANGO_CFLAGS) \ + $(PNG_CFLAGS) \ -DG_LOG_DOMAIN=\"ObRender\" \ -DDEFAULT_THEME=\"$(theme)\" render_libobrender_la_LDFLAGS = \ @@ -62,6 +63,7 @@ $(X_LIBS) \ $(XFT_LIBS) \ $(PANGO_LIBS) \ + $(PNG_LIBS) \ $(GLIB_LIBS) \ $(XML_LIBS) render_libobrender_la_SOURCES = \ Index: openbox/framerender.c =================================================================== --- openbox/framerender.c (revision 5489) +++ openbox/framerender.c (working copy) @@ -237,17 +237,20 @@ static void framerender_icon(ObFrame *self, RrAppearance *a) { const ObClientIcon *icon; + RrPixel32 *data; + gint w,h; if (self->icon_x < 0) return; - icon = client_icon(self->client, +/* icon = client_icon(self->client, ob_rr_theme->button_size + 2, ob_rr_theme->button_size + 2); - if (icon) { - a->texture[0].type = RR_TEXTURE_RGBA; + if (icon) { */ + if (RrImageLoad("/home/daf/close.png", data, &w, &h)) { + a->texture[0].type = RR_TEXTURE_RGBA; a->texture[0].data.rgba.width = icon->width; a->texture[0].data.rgba.height = icon->height; - a->texture[0].data.rgba.data = icon->data; + a->texture[0].data.rgba.data = data; } else a->texture[0].type = RR_TEXTURE_NONE; @@ -283,7 +286,24 @@ static void framerender_close(ObFrame *self, RrAppearance *a) { - if (self->close_x < 0) return; + /* + RrPixel32 *data; + gint w, h; + if (!RrImageLoad("/home/daf/close.png", data, &w, &h)) + { + printf("dyde\n"); + a->texture[0].type = RR_TEXTURE_NONE; + } + else { + a->texture[0].type = RR_TEXTURE_RGBA; + a->texture[0].data.rgba.width = w; + a->texture[0].data.rgba.height = h; + a->texture[0].data.rgba.data = data; + printf("good to go\n"); + } + */ + if (self->close_x < 0) return; + RrPaint(a, self->close, ob_rr_theme->button_size, ob_rr_theme->button_size); } Index: po/fr.po =================================================================== --- po/fr.po (revision 5489) +++ po/fr.po (working copy) @@ -6,8 +6,8 @@ msgid "" msgstr "" "Project-Id-Version: Openbox 3.2\n" -"Report-Msgid-Bugs-To: mikachu@comhem.se\n" -"POT-Creation-Date: 2004-11-07 12:52+0100\n" +"Report-Msgid-Bugs-To: mikachu@icculus.org\n" +"POT-Creation-Date: 2006-09-06 18:29-0400\n" "PO-Revision-Date: 2004-06-11 23:06+0200\n" "Last-Translator: Julien Louis \n" "Language-Team: French \n" @@ -15,11 +15,11 @@ "Content-Type: text/plain; charset=iso-8859-1\n" "Content-Transfer-Encoding: 8bit\n" -#: openbox/client_list_menu.c:95 +#: openbox/client_list_menu.c:96 msgid "Go there..." msgstr "Aller ..." -#: openbox/client_list_menu.c:161 +#: openbox/client_list_menu.c:186 msgid "Desktops" msgstr "Bureaux" @@ -108,16 +108,16 @@ msgid "Unable to make directory '%s': %s" msgstr "Impossible de crer le rpertoire '%s': %s" -#: render/font.c:50 +#: render/font.c:58 msgid "Couldn't initialize Xft." msgstr "Impossible d'initialiser Xft." -#: render/font.c:122 render/font.c:127 +#: render/font.c:193 render/font.c:198 #, c-format msgid "Unable to load font: %s\n" msgstr "Impossible de charger la police : %s\n" -#: render/font.c:123 +#: render/font.c:194 #, c-format msgid "Trying fallback font: %s\n" msgstr "Tentative de remplacement de la police : %s\n" Index: po/es.po =================================================================== --- po/es.po (revision 5489) +++ po/es.po (working copy) @@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: Openbox 3.3\n" "Report-Msgid-Bugs-To: mikachu@icculus.org\n" -"POT-Creation-Date: 2005-03-25 00:39+0100\n" +"POT-Creation-Date: 2006-09-06 18:29-0400\n" "PO-Revision-Date: 2005-03-25 09:31+0100\n" "Last-Translator: Miguel Calleja Gómez \n" "Language-Team: None\n" @@ -15,11 +15,11 @@ "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -#: openbox/client_list_menu.c:95 +#: openbox/client_list_menu.c:96 msgid "Go there..." msgstr "Ir ahí..." -#: openbox/client_list_menu.c:161 +#: openbox/client_list_menu.c:186 msgid "Desktops" msgstr "Escritorios" @@ -108,16 +108,16 @@ msgid "Unable to make directory '%s': %s" msgstr "No se puede crear el directorio '%s': %s" -#: render/font.c:50 +#: render/font.c:58 msgid "Couldn't initialize Xft." msgstr "No se pudo iniciar Xft." -#: render/font.c:164 render/font.c:169 +#: render/font.c:193 render/font.c:198 #, c-format msgid "Unable to load font: %s\n" msgstr "No se puede cargar la fuente: %s\n" -#: render/font.c:165 +#: render/font.c:194 #, c-format msgid "Trying fallback font: %s\n" msgstr "Intentando recurrir a la fuente: %s\n" Index: po/pl.po =================================================================== --- po/pl.po (revision 5489) +++ po/pl.po (working copy) @@ -6,8 +6,8 @@ msgid "" msgstr "" "Project-Id-Version: Openbox 3.2\n" -"Report-Msgid-Bugs-To: mikachu@comhem.se\n" -"POT-Creation-Date: 2004-11-07 12:52+0100\n" +"Report-Msgid-Bugs-To: mikachu@icculus.org\n" +"POT-Creation-Date: 2006-09-06 18:29-0400\n" "PO-Revision-Date: 2004-09-07 21:17+0200\n" "Last-Translator: Madej \n" "Language-Team: NONE\n" @@ -15,11 +15,11 @@ "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -#: openbox/client_list_menu.c:95 +#: openbox/client_list_menu.c:96 msgid "Go there..." msgstr "Przejdź..." -#: openbox/client_list_menu.c:161 +#: openbox/client_list_menu.c:186 msgid "Desktops" msgstr "Pulpit" @@ -108,16 +108,16 @@ msgid "Unable to make directory '%s': %s" msgstr "Nie mogę utworzyć katalogu '%s': %s" -#: render/font.c:50 +#: render/font.c:58 msgid "Couldn't initialize Xft." msgstr "Błąd przy inicjalizacji Xft." -#: render/font.c:122 render/font.c:127 +#: render/font.c:193 render/font.c:198 #, c-format msgid "Unable to load font: %s\n" msgstr "Nie mogę załadować czcionki: %s\n" -#: render/font.c:123 +#: render/font.c:194 #, c-format msgid "Trying fallback font: %s\n" msgstr "Próbuję użyć czcionki: %s\n" Index: po/en@quot.po =================================================================== --- po/en@quot.po (revision 5489) +++ po/en@quot.po (working copy) @@ -28,8 +28,8 @@ msgid "" msgstr "" "Project-Id-Version: openbox 3.2\n" -"Report-Msgid-Bugs-To: mikachu@comhem.se\n" -"POT-Creation-Date: 2004-11-07 12:52+0100\n" +"Report-Msgid-Bugs-To: mikachu@icculus.org\n" +"POT-Creation-Date: 2006-09-06 18:29-0400\n" "PO-Revision-Date: 2004-11-07 12:52+0100\n" "Last-Translator: Automatically generated\n" "Language-Team: none\n" @@ -38,11 +38,11 @@ "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -#: openbox/client_list_menu.c:95 +#: openbox/client_list_menu.c:96 msgid "Go there..." msgstr "Go there..." -#: openbox/client_list_menu.c:161 +#: openbox/client_list_menu.c:186 msgid "Desktops" msgstr "Desktops" @@ -131,16 +131,16 @@ msgid "Unable to make directory '%s': %s" msgstr "Unable to make directory '%s': %s" -#: render/font.c:50 +#: render/font.c:58 msgid "Couldn't initialize Xft." msgstr "Couldn't initialize Xft." -#: render/font.c:122 render/font.c:127 +#: render/font.c:193 render/font.c:198 #, c-format msgid "Unable to load font: %s\n" msgstr "Unable to load font: %s\n" -#: render/font.c:123 +#: render/font.c:194 #, c-format msgid "Trying fallback font: %s\n" msgstr "Trying fallback font: %s\n" Index: po/no.po =================================================================== --- po/no.po (revision 5489) +++ po/no.po (working copy) @@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: openbox 3.2\n" "Report-Msgid-Bugs-To: mikachu@icculus.org\n" -"POT-Creation-Date: 2004-11-07 12:59+0100\n" +"POT-Creation-Date: 2006-09-06 18:29-0400\n" "PO-Revision-Date: 2004-03-29 18:33:39+0200\n" "Last-Translator: yvind Albrigtsen\n" "Language-Team: None\n" @@ -15,11 +15,11 @@ "Content-Type: text/plain; charset=iso-8859-1\n" "Content-Transfer-Encoding: 8bit\n" -#: openbox/client_list_menu.c:95 +#: openbox/client_list_menu.c:96 msgid "Go there..." msgstr "G dit" -#: openbox/client_list_menu.c:161 +#: openbox/client_list_menu.c:186 msgid "Desktops" msgstr "Skrivebord" @@ -108,16 +108,16 @@ msgid "Unable to make directory '%s': %s" msgstr "Kunde ikke lage katalogen '%s': %s" -#: render/font.c:50 +#: render/font.c:58 msgid "Couldn't initialize Xft." msgstr "Kunde ikke initialisere Xft." -#: render/font.c:122 render/font.c:127 +#: render/font.c:193 render/font.c:198 #, c-format msgid "Unable to load font: %s\n" msgstr "Kunde ikke laste fonten \"%s\"\n" -#: render/font.c:123 +#: render/font.c:194 #, c-format msgid "Trying fallback font: %s\n" msgstr "Prver med reservefonten: %s\n" Index: po/en@boldquot.po =================================================================== --- po/en@boldquot.po (revision 5489) +++ po/en@boldquot.po (working copy) @@ -31,8 +31,8 @@ msgid "" msgstr "" "Project-Id-Version: openbox 3.2\n" -"Report-Msgid-Bugs-To: mikachu@comhem.se\n" -"POT-Creation-Date: 2004-11-07 12:52+0100\n" +"Report-Msgid-Bugs-To: mikachu@icculus.org\n" +"POT-Creation-Date: 2006-09-06 18:29-0400\n" "PO-Revision-Date: 2004-11-07 12:52+0100\n" "Last-Translator: Automatically generated\n" "Language-Team: none\n" @@ -41,11 +41,11 @@ "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -#: openbox/client_list_menu.c:95 +#: openbox/client_list_menu.c:96 msgid "Go there..." msgstr "Go there..." -#: openbox/client_list_menu.c:161 +#: openbox/client_list_menu.c:186 msgid "Desktops" msgstr "Desktops" @@ -134,16 +134,16 @@ msgid "Unable to make directory '%s': %s" msgstr "Unable to make directory '%s': %s" -#: render/font.c:50 +#: render/font.c:58 msgid "Couldn't initialize Xft." msgstr "Couldn't initialize Xft." -#: render/font.c:122 render/font.c:127 +#: render/font.c:193 render/font.c:198 #, c-format msgid "Unable to load font: %s\n" msgstr "Unable to load font: %s\n" -#: render/font.c:123 +#: render/font.c:194 #, c-format msgid "Trying fallback font: %s\n" msgstr "Trying fallback font: %s\n" Index: po/sk.po =================================================================== --- po/sk.po (revision 5489) +++ po/sk.po (working copy) @@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: Openbox-3.3rc2\n" "Report-Msgid-Bugs-To: mikachu@icculus.org\n" -"POT-Creation-Date: 2005-09-01 18:05+0200\n" +"POT-Creation-Date: 2006-09-06 18:29-0400\n" "PO-Revision-Date: 2006-08-25 00:52+0200\n" "Last-Translator: Jozef Riha \n" @@ -15,11 +15,11 @@ "Content-Type: text/plain; charset=utf-8\n" "Content-Transfer-Encoding: 8bit\n" -#: openbox/client_list_menu.c:95 +#: openbox/client_list_menu.c:96 msgid "Go there..." msgstr "Prejsť na..." -#: openbox/client_list_menu.c:161 +#: openbox/client_list_menu.c:186 msgid "Desktops" msgstr "Plochy" @@ -108,16 +108,16 @@ msgid "Unable to make directory '%s': %s" msgstr "Nebolo možné vytvoriť adresár '%s': %s" -#: render/font.c:57 +#: render/font.c:58 msgid "Couldn't initialize Xft." msgstr "Nepodarilo sa inicializovať Xft." -#: render/font.c:194 render/font.c:199 +#: render/font.c:193 render/font.c:198 #, c-format msgid "Unable to load font: %s\n" msgstr "Nepodarilo sa načítať font: %s\n" -#: render/font.c:195 +#: render/font.c:194 #, c-format msgid "Trying fallback font: %s\n" msgstr "Pokus o návrat k fontu: %s\n" Index: po/pt.po =================================================================== --- po/pt.po (revision 5489) +++ po/pt.po (working copy) @@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: Openbox 3.3\n" "Report-Msgid-Bugs-To: mikachu@icculus.org\n" -"POT-Creation-Date: 2006-08-20 21:54+0200\n" +"POT-Creation-Date: 2006-09-06 18:29-0400\n" "PO-Revision-Date: 2004-03-29 18:33:39+0200\n" "Last-Translator: Gonalo Ferreira \n" "Language-Team: None\n" @@ -15,11 +15,11 @@ "Content-Type: text/plain; charset=iso-8859-1\n" "Content-Transfer-Encoding: 8bit\n" -#: openbox/client_list_menu.c:95 +#: openbox/client_list_menu.c:96 msgid "Go there..." msgstr "Ir at..." -#: openbox/client_list_menu.c:161 +#: openbox/client_list_menu.c:186 msgid "Desktops" msgstr "reas de trabalho" @@ -108,7 +108,7 @@ msgid "Unable to make directory '%s': %s" msgstr "Incapaz de criar o directrio '%s': %s " -#: render/font.c:57 +#: render/font.c:58 msgid "Couldn't initialize Xft." msgstr "Incapaz de inicializar Xft." Index: po/ca.po =================================================================== --- po/ca.po (revision 5489) +++ po/ca.po (working copy) @@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: Openbox 3.3\n" "Report-Msgid-Bugs-To: mikachu@icculus.org\n" -"POT-Creation-Date: 2004-11-25 10:29+0100\n" +"POT-Creation-Date: 2006-09-06 18:29-0400\n" "PO-Revision-Date: 2004-01-25 20:41+0100\n" "Last-Translator: David Majà Martínez \n" "Language-Team: catalan\n" @@ -15,11 +15,11 @@ "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -#: openbox/client_list_menu.c:95 +#: openbox/client_list_menu.c:96 msgid "Go there..." msgstr "Vés aquí..." -#: openbox/client_list_menu.c:161 +#: openbox/client_list_menu.c:186 msgid "Desktops" msgstr "Escriptoris" @@ -108,16 +108,16 @@ msgid "Unable to make directory '%s': %s" msgstr "No és pot crear el directori '%s': %s" -#: render/font.c:50 +#: render/font.c:58 msgid "Couldn't initialize Xft." msgstr "No s'ha pogut inicialitzar Xft." -#: render/font.c:170 render/font.c:175 +#: render/font.c:193 render/font.c:198 #, c-format msgid "Unable to load font: %s\n" msgstr "No és pot carregar el tipus de lletra: %s\n" -#: render/font.c:171 +#: render/font.c:194 #, c-format msgid "Trying fallback font: %s\n" msgstr "S'està carregant el tipus de lletra de recanvi: %s\n" Index: po/ru.po =================================================================== --- po/ru.po (revision 5489) +++ po/ru.po (working copy) @@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: openbox 3.2\n" "Report-Msgid-Bugs-To: mikachu@icculus.org\n" -"POT-Creation-Date: 2004-11-07 12:52+0100\n" +"POT-Creation-Date: 2006-09-06 18:29-0400\n" "PO-Revision-Date: 2004-04-23 13:00+0300\n" "Last-Translator: Alexey Remizov \n" "Language-Team: Russian \n" @@ -15,11 +15,11 @@ "Content-Type: text/plain; charset=utf-8\n" "Content-Transfer-Encoding: 8bit\n" -#: openbox/client_list_menu.c:95 +#: openbox/client_list_menu.c:96 msgid "Go there..." msgstr "Перейти..." -#: openbox/client_list_menu.c:161 +#: openbox/client_list_menu.c:186 msgid "Desktops" msgstr "Рабочие места" @@ -108,16 +108,16 @@ msgid "Unable to make directory '%s': %s" msgstr "Невозможно создать каталог '%s': %s" -#: render/font.c:50 +#: render/font.c:58 msgid "Couldn't initialize Xft." msgstr "Не удалось инициализировать Xft." -#: render/font.c:122 render/font.c:127 +#: render/font.c:193 render/font.c:198 #, c-format msgid "Unable to load font: %s\n" msgstr "Невозможно загрузить шрифт: %s\n" -#: render/font.c:123 +#: render/font.c:194 #, c-format msgid "Trying fallback font: %s\n" msgstr "Попытка вернуть шрифт: %s\n" Index: po/de.po =================================================================== --- po/de.po (revision 5489) +++ po/de.po (working copy) @@ -6,7 +6,7 @@ msgstr "" "Project-Id-Version: Openbox 3.3\n" "Report-Msgid-Bugs-To: mikachu@icculus.org\n" -"POT-Creation-Date: 2005-09-01 18:05+0200\n" +"POT-Creation-Date: 2006-09-06 18:29-0400\n" "PO-Revision-Date: 2006-06-11 10:41+0200\n" "Last-Translator: Sebastian Vahl \n" "Language-Team: \n" @@ -14,11 +14,11 @@ "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -#: openbox/client_list_menu.c:95 +#: openbox/client_list_menu.c:96 msgid "Go there..." msgstr "Gehe zu..." -#: openbox/client_list_menu.c:161 +#: openbox/client_list_menu.c:186 msgid "Desktops" msgstr "" @@ -107,17 +107,16 @@ msgid "Unable to make directory '%s': %s" msgstr "" -#: render/font.c:57 +#: render/font.c:58 msgid "Couldn't initialize Xft." msgstr "Konnte Xft nicht initializieren" -#: render/font.c:194 render/font.c:199 +#: render/font.c:193 render/font.c:198 #, c-format msgid "Unable to load font: %s\n" msgstr "Font konnte nicht geladen werden: %s\n" -#: render/font.c:195 +#: render/font.c:194 #, c-format msgid "Trying fallback font: %s\n" msgstr "" - Index: po/sv.po =================================================================== --- po/sv.po (revision 5489) +++ po/sv.po (working copy) @@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: openbox 3.3\n" "Report-Msgid-Bugs-To: mikachu@icculus.org\n" -"POT-Creation-Date: 2004-11-07 12:52+0100\n" +"POT-Creation-Date: 2006-09-06 18:29-0400\n" "PO-Revision-Date: 2004-03-29 18:33:39+0200\n" "Last-Translator: Mikael Magnusson \n" "Language-Team: None\n" @@ -15,11 +15,11 @@ "Content-Type: text/plain; charset=iso-8859-1\n" "Content-Transfer-Encoding: 8bit\n" -#: openbox/client_list_menu.c:95 +#: openbox/client_list_menu.c:96 msgid "Go there..." msgstr "G dit" -#: openbox/client_list_menu.c:161 +#: openbox/client_list_menu.c:186 msgid "Desktops" msgstr "Skrivbord" @@ -108,16 +108,16 @@ msgid "Unable to make directory '%s': %s" msgstr "Kunde inte skapa katalogen '%s': %s" -#: render/font.c:50 +#: render/font.c:58 msgid "Couldn't initialize Xft." msgstr "Kunde inte initialisera Xft." -#: render/font.c:122 render/font.c:127 +#: render/font.c:193 render/font.c:198 #, c-format msgid "Unable to load font: %s\n" msgstr "Kunde inte ladda fonten \"%s\"\n" -#: render/font.c:123 +#: render/font.c:194 #, c-format msgid "Trying fallback font: %s\n" msgstr "Frsker med reservfonten \"%s\"\n" Index: po/ja.po =================================================================== --- po/ja.po (revision 5489) +++ po/ja.po (working copy) @@ -6,8 +6,8 @@ msgid "" msgstr "" "Project-Id-Version: Openbox 3.0\n" -"Report-Msgid-Bugs-To: mikachu@comhem.se\n" -"POT-Creation-Date: 2004-11-07 12:52+0100\n" +"Report-Msgid-Bugs-To: mikachu@icculus.org\n" +"POT-Creation-Date: 2006-09-06 18:29-0400\n" "PO-Revision-Date: 2003-11-20 15:00+0900\n" "Last-Translator: Yukihiro Nakai \n" "Language-Team: Japanese \n" @@ -15,11 +15,11 @@ "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -#: openbox/client_list_menu.c:95 +#: openbox/client_list_menu.c:96 msgid "Go there..." msgstr "移動する..." -#: openbox/client_list_menu.c:161 +#: openbox/client_list_menu.c:186 msgid "Desktops" msgstr "デスクトップ" @@ -108,16 +108,16 @@ msgid "Unable to make directory '%s': %s" msgstr "ディレクトリ'%s'を作れません: %s" -#: render/font.c:50 +#: render/font.c:58 msgid "Couldn't initialize Xft." msgstr "" -#: render/font.c:122 render/font.c:127 +#: render/font.c:193 render/font.c:198 #, c-format msgid "Unable to load font: %s\n" msgstr "" -#: render/font.c:123 +#: render/font.c:194 #, c-format msgid "Trying fallback font: %s\n" msgstr "" Index: po/zh_TW.po =================================================================== --- po/zh_TW.po (revision 5489) +++ po/zh_TW.po (working copy) @@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: openbox 3.3rc2\n" "Report-Msgid-Bugs-To: mikachu@icculus.org\n" -"POT-Creation-Date: 2005-09-01 18:05+0200\n" +"POT-Creation-Date: 2006-09-06 18:29-0400\n" "PO-Revision-Date: 2006-03-01 12:00+0800\n" "Last-Translator: Wei-Lun Chao \n" "Language-Team: Chinese (traditional) \n" @@ -16,11 +16,11 @@ "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=1; plural=0;\n" -#: openbox/client_list_menu.c:95 +#: openbox/client_list_menu.c:96 msgid "Go there..." msgstr "到那裡去..." -#: openbox/client_list_menu.c:161 +#: openbox/client_list_menu.c:186 msgid "Desktops" msgstr "桌面" @@ -109,16 +109,16 @@ msgid "Unable to make directory '%s': %s" msgstr "無法製作目錄 '%s': %s" -#: render/font.c:57 +#: render/font.c:58 msgid "Couldn't initialize Xft." msgstr "無法初始化 Xft。" -#: render/font.c:194 render/font.c:199 +#: render/font.c:193 render/font.c:198 #, c-format msgid "Unable to load font: %s\n" msgstr "無法載入字型：%s\n" -#: render/font.c:195 +#: render/font.c:194 #, c-format msgid "Trying fallback font: %s\n" msgstr "正在嘗試權宜字型：%s\n" Index: po/fi.po =================================================================== --- po/fi.po (revision 5489) +++ po/fi.po (working copy) @@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: openbox 3.3\n" "Report-Msgid-Bugs-To: mikachu@icculus.org\n" -"POT-Creation-Date: 2005-04-11 23:11+0300\n" +"POT-Creation-Date: 2006-09-06 18:29-0400\n" "PO-Revision-Date: 2005-03-15 21:29+0200\n" "Last-Translator: Pauli Virtanen \n" "Language-Team: Finnish \n" @@ -15,111 +15,109 @@ "Content-Type: text/plain; charset=utf-8\n" "Content-Transfer-Encoding: 8bit\n" -#: ../openbox/client_list_menu.c:95 +#: openbox/client_list_menu.c:96 msgid "Go there..." msgstr "Näytä tämä..." -#: ../openbox/client_list_menu.c:161 +#: openbox/client_list_menu.c:186 msgid "Desktops" msgstr "Työtilat" -#: ../openbox/client_menu.c:78 +#: openbox/client_menu.c:78 msgid "Restore" msgstr "Palauta" -#: ../openbox/client_menu.c:78 +#: openbox/client_menu.c:78 msgid "Maximize" msgstr "Suurenna" -#: ../openbox/client_menu.c:84 +#: openbox/client_menu.c:84 msgid "Roll down" msgstr "Rullaa auki" -#: ../openbox/client_menu.c:84 +#: openbox/client_menu.c:84 msgid "Roll up" msgstr "Rullaa" -#: ../openbox/client_menu.c:146 +#: openbox/client_menu.c:146 msgid "All desktops" msgstr "Kaikkiin työtiloihin" -#: ../openbox/client_menu.c:170 +#: openbox/client_menu.c:170 msgid "Layer" msgstr "Kerros" -#: ../openbox/client_menu.c:175 +#: openbox/client_menu.c:175 msgid "Always on top" msgstr "Aina päällimmäinen" -#: ../openbox/client_menu.c:180 +#: openbox/client_menu.c:180 msgid "Normal" msgstr "Tavallinen" -#: ../openbox/client_menu.c:185 +#: openbox/client_menu.c:185 msgid "Always on bottom" msgstr "Aina alimmainen" -#: ../openbox/client_menu.c:188 +#: openbox/client_menu.c:188 msgid "Send to desktop" msgstr "Siirrä työtilaan" -#: ../openbox/client_menu.c:192 +#: openbox/client_menu.c:192 msgid "Client menu" msgstr "Ikkunan valikko" -#: ../openbox/client_menu.c:205 +#: openbox/client_menu.c:205 msgid "Iconify" msgstr "Pienennä" -#: ../openbox/client_menu.c:222 +#: openbox/client_menu.c:222 msgid "Raise to top" msgstr "Nosta päällimmäiseksi" -#: ../openbox/client_menu.c:226 +#: openbox/client_menu.c:226 msgid "Lower to bottom" msgstr "Laske alimmaiseksi" -#: ../openbox/client_menu.c:239 +#: openbox/client_menu.c:239 msgid "Decorate" msgstr "Piirrä/poista kehykset" -#: ../openbox/client_menu.c:245 +#: openbox/client_menu.c:245 msgid "Move" msgstr "Siirrä" -#: ../openbox/client_menu.c:249 +#: openbox/client_menu.c:249 msgid "Resize" msgstr "Muuta kokoa" -#: ../openbox/client_menu.c:255 +#: openbox/client_menu.c:255 msgid "Close" msgstr "Sulje" -#. no args left -#: ../openbox/session.c:124 +#: openbox/session.c:124 msgid "--sm-client-id requires an argument\n" msgstr "--sm-client-id tarvitsee parametrin\n" -#. no args left -#: ../openbox/session.c:132 +#: openbox/session.c:132 msgid "--sm-save-file requires an argument\n" msgstr "--sm-save-file tarvitsee parametrin\n" -#: ../openbox/session.c:160 +#: openbox/session.c:160 #, c-format msgid "Unable to make directory '%s': %s" msgstr "Hakemiston \"%s\" luonti epäonnistui: %s" -#: ../render/font.c:50 +#: render/font.c:58 msgid "Couldn't initialize Xft." msgstr "Xft:n käynnistys epäonnistui." -#: ../render/font.c:164 ../render/font.c:169 +#: render/font.c:193 render/font.c:198 #, c-format msgid "Unable to load font: %s\n" msgstr "Kirjasinlajin lataaminen epäonnistui: %s\n" -#: ../render/font.c:165 +#: render/font.c:194 #, c-format msgid "Trying fallback font: %s\n" msgstr "Kokeillaan varakirjasinlajia: %s\n"