2 ===================================================================
3 RCS file: /cvsroot/wm/configure.ac,v
4 retrieving revision 1.43
5 diff -u -r1.43 configure.ac
6 --- configure.ac 2003/08/14 01:39:27 1.43
7 +++ configure.ac 2004/03/26 13:50:57
10 AC_CHECK_PROG(XFTCONFIG, xft-config, xft-config)
12 - AC_MSG_CHECKING([for the Xft2 library])
13 if test "x$XFTCONFIG" != x; then
14 XFTLIBS=`$XFTCONFIG --libs`
15 XFTFLAGS=`$XFTCONFIG --cflags`
16 + AC_MSG_CHECKING([for the Xft2 library])
17 AC_MSG_RESULT([found])
18 + AC_DEFINE(XFT2, 1, [define if you have Xft version 2 (set by configure)])
21 - AC_MSG_RESULT([not found])
22 + AC_CHECK_LIB(Xft, XftDrawCreate, [XFTLIBS="-lXft" XFTFLAGS=""],
23 + xft=no, $XLFLAGS $XLIBS)
25 if test "$xft" = yes; then
27 Index: WINGs/ChangeLog
28 ===================================================================
29 RCS file: /cvsroot/wm/WINGs/ChangeLog,v
30 retrieving revision 1.153
31 retrieving revision 1.152
32 diff -u -r1.153 -r1.152
33 --- WINGs/ChangeLog 2003/08/07 00:26:21 1.153
34 +++ WINGs/ChangeLog 2003/08/02 21:36:45 1.152
36 WMCreateRGBAColor() and WMSetColorAlpha()
37 - Miscelaneous code cleanups in wtext.c
38 - Added Xft support in WINGs (for drawing antialiased fonts with transparency).
39 -- New options in WMGLOBAL: AntialiasedText. Check NEWS for details.
40 +- Added a new function: WMCreateAntialiasedFont() to create a font which will
41 + be drawn antialiased using Xft (if available, else function returns NULL)
42 +- New options in WMGLOBAL: AntialiasedText, AntialiasedSystemFont and
43 + AntialiasedBoldSystemFont. Check NEWS for details.
44 - Fixed some improper calls to snprintf in wfont.c
45 - Added double buffering when drawing a WMFrame title with an antialiased font
47 - Added double buffering when drawing WMList items to avoid flickering.
48 Double buffering for list also works for user drawn lists. Read NEWS for
49 details and incompatibilities introduced by this change.
50 +- Added WMIsAntialiasedFont(WMFont *font) to check if a font is antialiased.
51 - Added WMGetColorAlpha(WMColor *color)
52 - Better outline when drawing balloons.
53 -- Added WMCreateFontWithAttributes()
54 +- Added WMCreateFontWithFlags()
55 - You can now pass "SystemFont", "BoldSystemFont", "SystemFont-##" or
56 "BoldSystemFont-##", with ## being the font size to any font creating
57 function to create a font with the (bold) system font font specification.
58 +- Added WMCreateAntialiasedFontSet() (like WMCreateAntialiasedFont() but for
59 + languages with multibyte text). Note however that these specific font
60 + creating functions (as well as WMCreateNormalFont() and WMCreateFontSet())
61 + are not meant to be called directly except in very special cases.
62 + The more generic WMCreateFont() or WMCreateFontWithFlags() should be used.
63 +- Multibyte languages can now render antialiased text too (only tested on
64 + russian since this is the only multibyte language I can test).
65 - Added WMCopyFontWithChanges(). This is a more generic and powerful function
66 meant to replaces the obsoleted WMEmphasizeFont(), WMNormalizeFont(),
67 WMStrenghtenFont() and the other similar functions. To get the same effect
69 - Added WMGetWidgetBackgroundColor()
70 - Code cleanup in wtext.c
71 - Fixed a memory leak in wfontpanel.c
72 -??- Added a check that only %d is used in a font specification in WMGLOBAL and at
73 +- Added a check that only %d is used in a font specification in WMGLOBAL and at
74 most once for each font in a fontset (eliminates a possible security exploit)
75 - Fixed WMGetTextDefaultColor() not to retain the returned color. It returns
76 only a reference to the internal color, which you shouldn't release
77 Index: WINGs/Makefile.am
78 ===================================================================
79 RCS file: /cvsroot/wm/WINGs/Makefile.am,v
80 retrieving revision 1.66
81 retrieving revision 1.65
83 --- WINGs/Makefile.am 2004/02/25 21:26:49 1.66
84 +++ WINGs/Makefile.am 2003/06/10 01:56:28 1.65
89 -AM_CPPFLAGS = @CPPFLAGS@ -DLOCALEDIR=\"$(NLSDIR)\"
90 +CPPFLAGS = @CPPFLAGS@ -DLOCALEDIR=\"$(NLSDIR)\"
92 INCLUDES = -I$(top_srcdir)/WINGs/WINGs -I$(top_srcdir)/wrlib -I$(top_srcdir)/src \
93 -DRESOURCE_PATH=\"$(datadir)/WINGs\" @XFTFLAGS@ @HEADER_SEARCH_PATH@ -DDEBUG
94 Index: WINGs/configuration.c
95 ===================================================================
96 RCS file: /cvsroot/wm/WINGs/configuration.c,v
97 retrieving revision 1.16
98 retrieving revision 1.15
100 --- WINGs/configuration.c 2003/08/07 00:26:21 1.16
101 +++ WINGs/configuration.c 2002/11/30 02:13:37 1.15
104 } else if (xlfd == WINGsConfiguration.boldSystemFont) {
105 ptr = "bold system font";
106 + } else if (xlfd == WINGsConfiguration.antialiasedSystemFont) {
107 + ptr = "antialiased system font";
108 + } else if (xlfd == WINGsConfiguration.antialiasedBoldSystemFont) {
109 + ptr = "antialiased bold system font";
111 ptr = "Unknown System Font";
114 WINGsConfiguration.boldSystemFont =
115 WMGetUDStringForKey(defaults, "BoldSystemFont");
117 + WINGsConfiguration.antialiasedSystemFont =
118 + WMGetUDStringForKey(defaults, "AntialiasedSystemFont");
120 + WINGsConfiguration.antialiasedBoldSystemFont =
121 + WMGetUDStringForKey(defaults, "AntialiasedBoldSystemFont");
124 WINGsConfiguration.antialiasedText =
125 WMGetUDBoolForKey(defaults, "AntialiasedText");
128 if (missingOrInvalidXLFD(WINGsConfiguration.boldSystemFont)) {
129 WINGsConfiguration.boldSystemFont = BOLD_SYSTEM_FONT;
131 + if (missingOrInvalidXLFD(WINGsConfiguration.antialiasedSystemFont)) {
132 + WINGsConfiguration.antialiasedSystemFont = XFTSYSTEM_FONT;
134 + if (missingOrInvalidXLFD(WINGsConfiguration.antialiasedBoldSystemFont)) {
135 + WINGsConfiguration.antialiasedBoldSystemFont = XFTBOLD_SYSTEM_FONT;
137 if (!WINGsConfiguration.floppyPath) {
138 WINGsConfiguration.floppyPath = FLOPPY_PATH;
139 Index: WINGs/connection.c
140 ===================================================================
141 RCS file: /cvsroot/wm/WINGs/connection.c,v
142 retrieving revision 1.28
143 retrieving revision 1.27
144 diff -u -r1.28 -r1.27
145 --- WINGs/connection.c 2004/02/25 21:26:49 1.28
146 +++ WINGs/connection.c 2003/01/16 23:30:46 1.27
148 clearOutputQueue(cPtr);
149 cPtr->state = WCTimedOut;
150 cPtr->timeoutState = WCTWhileSending;
151 - // should we close it no matter what (after calling the didTimeout
153 if (cPtr->delegate && cPtr->delegate->didTimeout) {
154 (*cPtr->delegate->didTimeout)(cPtr->delegate, cPtr);
156 Index: WINGs/handlers.c
157 ===================================================================
158 RCS file: /cvsroot/wm/WINGs/handlers.c,v
159 retrieving revision 1.7
160 retrieving revision 1.6
162 --- WINGs/handlers.c 2003/08/14 01:39:27 1.7
163 +++ WINGs/handlers.c 2002/09/09 04:25:52 1.6
167 #else /* not HAVE_SELECT, not HAVE_POLL */
168 -# error Neither select nor poll. You lose.
169 + Neither select nor poll. You lose.
170 #endif /* HAVE_SELECT */
171 #endif /* HAVE_POLL */
174 ===================================================================
175 RCS file: /cvsroot/wm/WINGs/wfont.c,v
176 retrieving revision 1.40
177 retrieving revision 1.34
178 diff -u -r1.40 -r1.34
179 --- WINGs/wfont.c 2003/09/03 19:09:24 1.40
180 +++ WINGs/wfont.c 2003/06/12 21:21:57 1.34
184 # include <X11/Xft/Xft.h>
185 -# ifdef HAVE_WCHAR_H
188 -# include <stdlib.h>
196 #include <X11/Xlocale.h>
201 -#if defined(HAVE_MBSNRTOWCS)
204 -wmbsnrtowcs(wchar_t *dest, const char **src, size_t nbytes, size_t len)
209 - memset(&ps, 0, sizeof(mbstate_t));
210 - n = mbsnrtowcs(dest, src, nbytes, len, &ps);
211 - if (n!=(size_t)-1 && *src) {
212 - *src -= ps.__count;
218 -#elif defined(HAVE_MBRTOWC)
220 -// This is 8 times slower than the version above.
222 -wmbsnrtowcs(wchar_t *dest, const char **src, size_t nbytes, size_t len)
232 - memset(&ps, 0, sizeof(mbstate_t));
234 - if (dest == NULL) {
235 - for (ptr=*src, n=0; nbytes>0; n++) {
236 - nb = mbrtowc(NULL, ptr, nbytes, &ps);
238 - return ((size_t)-1);
239 - } else if (nb==0 || nb==-2) {
247 - for (ptr=*src, n=0; n<len && nbytes>0; n++, dest++) {
248 - nb = mbrtowc(dest, ptr, nbytes, &ps);
252 - } else if (nb == -1) {
254 - return ((size_t)-1);
255 - } else if (nb == 0) {
269 -// Not only 8 times slower than the version based on mbsnrtowcs
270 -// but also this version is not thread safe nor reentrant
273 -wmbsnrtowcs(wchar_t *dest, const char **src, size_t nbytes, size_t len)
282 - mbtowc(NULL, NULL, 0); /* reset shift state */
284 - if (dest == NULL) {
285 - for (ptr=*src, n=0; nbytes>0; n++) {
286 - nb = mbtowc(NULL, ptr, nbytes);
288 - mbtowc(NULL, NULL, 0);
289 - nb = mbtowc(NULL, ptr, strlen(ptr));
290 - return (nb == -1 ? (size_t)-1 : n);
291 - } else if (nb==0) {
299 - for (ptr=*src, n=0; n<len && nbytes>0; n++, dest++) {
300 - nb = mbtowc(dest, ptr, nbytes);
302 - mbtowc(NULL, NULL, 0);
303 - nb = mbtowc(NULL, ptr, strlen(ptr));
305 - return (nb == -1 ? (size_t)-1 : n);
306 - } else if (nb == 0) {
322 -alreadyHasStringValue(XftPattern *pattern, const char *object, char *value)
328 - if (!value || value[0]==0)
332 - while ((r=XftPatternGetString(pattern, object, id, &s))!=XftResultNoId) {
333 - if (r == XftResultMatch && strcasecmp(value, s) == 0) {
343 -// check if to add a fallback size too. -Dan
344 -// also handle an xlfd with %d for size?
346 -makeFontOfSize(char *font, int size, char *fallback)
348 - XftPattern *pattern;
352 - len = strlen(font) + 64;
353 - pattern = XftNameParse(font);
354 - XftPatternDel(pattern, "pixelsize");
355 - XftPatternAddDouble(pattern, "pixelsize", (double)size);
357 - if (!alreadyHasStringValue(pattern, "family", fallback)) {
358 - len += strlen(fallback);
359 - XftPatternAddString(pattern, "family", fallback);
362 - result = wmalloc(len);
363 - XftNameUnparse(pattern, result, len);
364 - XftPatternDestroy(pattern);
371 -WMCreateFont(WMScreen *scrPtr, char *fontName)
374 - Display *display = scrPtr->display;
377 - /* This is for back-compat (to allow reading of old xlfd descriptions) */
378 - if (fontName[0]=='-' && (ptr = strchr(fontName, ','))) {
379 - // warn for deprecation
380 - fname = wmalloc(ptr - fontName + 1);
381 - strncpy(fname, fontName, ptr - fontName);
382 - fname[ptr - fontName] = 0;
384 - fname = wstrdup(fontName);
387 - font = WMHashGet(scrPtr->fontCache, fname);
389 - WMRetainFont(font);
394 - font = wmalloc(sizeof(WMFont));
395 - memset(font, 0, sizeof(WMFont));
397 - font->screen = scrPtr;
400 - printf("%s\n", fname);
402 - if (fname[0] == '-') {
403 - // Backward compat thing. Remove in a later version
404 - font->font = XftFontOpenXlfd(display, scrPtr->screen, fname);
406 - font->font = XftFontOpenName(display, scrPtr->screen, fname);
413 - font->height = font->font->ascent+font->font->descent;
414 - font->y = font->font->ascent;
416 - font->refCount = 1;
418 - font->name = fname;
420 - assert(WMHashInsert(scrPtr->fontCache, font->name, font)==NULL);
427 -WMRetainFont(WMFont *font)
429 - wassertrv(font!=NULL, NULL);
438 -WMReleaseFont(WMFont *font)
440 - wassertr(font!=NULL);
443 - if (font->refCount < 1) {
444 - XftFontClose(font->screen->display, font->font);
446 - WMHashRemove(font->screen->fontCache, font->name);
455 -WMIsAntialiasingEnabled(WMScreen *scrPtr)
457 - return scrPtr->antialiasedText;
462 -WMFontHeight(WMFont *font)
464 - wassertrv(font!=NULL, 0);
466 - return font->height;
471 -WMGetFontName(WMFont *font)
473 - wassertrv(font!=NULL, NULL);
480 -WMDefaultSystemFont(WMScreen *scrPtr)
482 - return WMRetainFont(scrPtr->normalFont);
487 -WMDefaultBoldSystemFont(WMScreen *scrPtr)
489 - return WMRetainFont(scrPtr->boldFont);
494 -WMSystemFontOfSize(WMScreen *scrPtr, int size)
499 - fontSpec = makeFontOfSize(WINGsConfiguration.systemFont, size, "sans");
501 - font = WMCreateFont(scrPtr, fontSpec);
504 - wwarning(_("could not load font %s."), fontSpec);
514 -WMBoldSystemFontOfSize(WMScreen *scrPtr, int size)
519 - fontSpec = makeFontOfSize(WINGsConfiguration.boldSystemFont, size, "sans");
521 - font = WMCreateFont(scrPtr, fontSpec);
524 - wwarning(_("could not load font %s."), fontSpec);
534 -WMWidthOfString(WMFont *font, char *text, int length)
536 - XGlyphInfo extents;
538 - wassertrv(font!=NULL, 0);
539 - wassertrv(text!=NULL, 0);
541 - if (font->screen->useWideChar) {
546 - wtext = (wchar_t *)wmalloc(sizeof(wchar_t)*(length+1));
548 - len = wmbsnrtowcs(wtext, &mtext, length, length);
550 - wtext[len] = L'\0'; /* not really necessary here */
551 - XftTextExtents32(font->screen->display, font->font,
552 - (XftChar32 *)wtext, len, &extents);
555 - wwarning(_("Conversion to widechar failed (possible "
556 - "invalid multibyte sequence): '%s':(pos %d)\n"),
557 - text, mtext-text+1);
563 - XftTextExtents8(font->screen->display, font->font,
564 - (XftChar8 *)text, length, &extents);
567 - return extents.xOff; /* don't ask :P */
573 -WMDrawString(WMScreen *scr, Drawable d, WMColor *color, WMFont *font,
574 - int x, int y, char *text, int length)
578 - wassertr(font!=NULL);
580 - xftcolor.color.red = color->color.red;
581 - xftcolor.color.green = color->color.green;
582 - xftcolor.color.blue = color->color.blue;
583 - xftcolor.color.alpha = color->alpha;;
584 - xftcolor.pixel = W_PIXEL(color);
586 - XftDrawChange(scr->xftdraw, d);
588 - if (font->screen->useWideChar) {
593 - wtext = (wchar_t *)wmalloc(sizeof(wchar_t)*(length+1));
595 - len = wmbsnrtowcs(wtext, &mtext, length, length);
597 - XftDrawString32(scr->xftdraw, &xftcolor, font->font,
598 - x, y + font->y, (XftChar32*)wtext, len);
599 - } else if (len==-1) {
600 - wwarning(_("Conversion to widechar failed (possible invalid "
601 - "multibyte sequence): '%s':(pos %d)\n"),
602 - text, mtext-text+1);
603 - /* we can draw normal text, or we can draw as much widechar
604 - * text as was already converted until the error. go figure */
605 - /*XftDrawString8(scr->xftdraw, &xftcolor, font->font,
606 - x, y + font->y, (XftChar8*)text, length);*/
610 - XftDrawString8(scr->xftdraw, &xftcolor, font->font,
611 - x, y + font->y, (XftChar8*)text, length);
617 -WMDrawImageString(WMScreen *scr, Drawable d, WMColor *color, WMColor *background,
618 - WMFont *font, int x, int y, char *text, int length)
620 - XftColor textColor;
623 - wassertr(font!=NULL);
625 - textColor.color.red = color->color.red;
626 - textColor.color.green = color->color.green;
627 - textColor.color.blue = color->color.blue;
628 - textColor.color.alpha = color->alpha;;
629 - textColor.pixel = W_PIXEL(color);
631 - bgColor.color.red = background->color.red;
632 - bgColor.color.green = background->color.green;
633 - bgColor.color.blue = background->color.blue;
634 - bgColor.color.alpha = background->alpha;;
635 - bgColor.pixel = W_PIXEL(background);
637 - XftDrawChange(scr->xftdraw, d);
639 - XftDrawRect(scr->xftdraw, &bgColor, x, y,
640 - WMWidthOfString(font, text, length),
643 - if (font->screen->useWideChar) {
649 - wtext = (wchar_t *)wmalloc(sizeof(wchar_t)*(length+1));
650 - len = wmbsnrtowcs(wtext, &mtext, length, length);
652 - XftDrawString32(scr->xftdraw, &textColor, font->font,
653 - x, y + font->y, (XftChar32*)wtext, len);
654 - } else if (len==-1) {
655 - wwarning(_("Conversion to widechar failed (possible invalid "
656 - "multibyte sequence): '%s':(pos %d)\n"),
657 - text, mtext-text+1);
658 - /* we can draw normal text, or we can draw as much widechar
659 - * text as was already converted until the error. go figure */
660 - /*XftDrawString8(scr->xftdraw, &textColor, font->font,
661 - x, y + font->y, (XftChar8*)text, length);*/
665 - XftDrawString8(scr->xftdraw, &textColor, font->font,
666 - x, y + font->y, (XftChar8*)text, length);
672 -WMCopyFontWithChanges(WMScreen *scrPtr, WMFont *font,
673 - const WMFontAttributes *changes)
675 - int index[FONT_PROPS], count[FONT_PROPS];
676 - int totalProps, i, j, carry;
678 - WMFontFlags fFlags;
684 - snprintf(fname, 512, "%s", font->name);
686 - fFlags = (font->antialiased ? WFAntialiased : WFNotAntialiased);
687 - fFlags |= (font->notFontSet ? WFNormalFont : WFFontSet);
689 - props = WMCreateBagWithDestructor(1, (WMFreeDataProc*)WMFreeArray);
692 - for (i=0; i<FONT_PROPS; i++) {
693 - prop = ((W_FontAttributes*)changes)->props[i];
694 - count[i] = index[i] = 0;
696 - /* No change for this property */
698 - } else if (strchr(prop, ',')==NULL) {
699 - /* Simple option */
700 - changeFontProp(fname, prop, i);
702 - /* Option with fallback alternatives */
703 - if ((changes==WFAEmphasized || changes==WFABoldEmphasized) &&
704 - font->antialiased && strcmp(prop, "o,i")==0) {
705 - options = getOptions("i,o");
707 - options = getOptions(prop);
709 - WMInsertInBag(props, i, options);
710 - count[i] = WMGetArrayItemCount(options);
713 - totalProps = totalProps * count[i];
717 - if (totalProps == 0) {
718 - /* No options with fallback alternatives at all */
720 - return WMCreateFontWithFlags(scrPtr, fname, fFlags);
723 - for (i=0; i<totalProps; i++) {
724 - for (j=0; j<FONT_PROPS; j++) {
726 - options = WMGetFromBag(props, j);
727 - prop = WMGetFromArray(options, index[j]);
729 - changeFontProp(fname, prop, j);
733 - result = WMCreateFontWithFlags(scrPtr, fname, fFlags);
738 - for (j=FONT_PROPS-1, carry=1; j>=0; j--) {
741 - carry = (index[j]==count[j]);
742 - index[j] %= count[j];
755 -#define FONT_PROPS 14
758 - char *props[FONT_PROPS];
763 -changeFontProp(char *buf, char *newprop, int position)
766 - char *ptr, *pptr, *rptr;
770 - /* // remove warning later. or maybe not */
771 - wwarning(_("Invalid font specification: '%s'\n"), buf);
775 - ptr = pptr = rptr = buf;
777 - while (*ptr && *ptr!=',') {
780 - if (count-1==position+1) {
784 - if (count-1==position) {
790 - if (position==FONT_PROPS-1) {
795 - snprintf(buf2, 512, "%s%s%s", buf, newprop, rptr);
801 -getOptions(char *options)
803 - char *ptr, *ptr2, *str;
807 - result = WMCreateArrayWithDestructor(2, (WMFreeDataProc*)wfree);
811 - ptr2 = strchr(ptr, ',');
813 - WMAddToArray(result, wstrdup(ptr));
816 - count = ptr2 - ptr;
817 - str = wmalloc(count+1);
818 - memcpy(str, ptr, count);
820 - WMAddToArray(result, str);
833 -#else /* No XFT support */
836 static char *makeFontSetOfSize(char *fontset, int size);
840 Display *display = scrPtr->display;
843 + if (!scrPtr->hasXftSupport)
846 fontName = xlfdFromFontName(fontName, True);
848 if ((ptr = strchr(fontName, ','))) {
850 Display *display = scrPtr->display;
853 + if (!scrPtr->hasXftSupport)
856 fontName = xlfdFromFontName(fontName, True);
858 if ((ptr = strchr(fontName, ','))) {
859 @@ -1153,6 +522,13 @@
863 +WMHasAntialiasingSupport(WMScreen *scrPtr)
865 + return scrPtr->hasXftSupport;
870 WMIsAntialiasingEnabled(WMScreen *scrPtr)
872 return scrPtr->antialiasedText;
873 @@ -1704,7 +1080,6 @@
880 // should WFANormal also set "normal" or leave it alone?
881 Index: WINGs/wframe.c
882 ===================================================================
883 RCS file: /cvsroot/wm/WINGs/wframe.c,v
884 retrieving revision 1.14
885 retrieving revision 1.13
886 diff -u -r1.14 -r1.13
887 --- WINGs/wframe.c 2003/08/14 01:39:27 1.14
888 +++ WINGs/wframe.c 2002/11/25 04:46:00 1.13
891 /* can't draw AA text over and over again because it gets messed */
892 /* // TODO create the dbl buffer pixmap when create/set frame title */
893 - if (scrPtr->antialiasedText) {
894 + if (font->antialiased) {
897 d = XCreatePixmap(display, view->window, tw, th, scrPtr->depth);
898 Index: WINGs/widgets.c
899 ===================================================================
900 RCS file: /cvsroot/wm/WINGs/widgets.c,v
901 retrieving revision 1.52
902 retrieving revision 1.50
903 diff -u -r1.52 -r1.50
904 --- WINGs/widgets.c 2003/08/15 02:58:04 1.52
905 +++ WINGs/widgets.c 2003/06/10 01:56:28 1.50
908 scrPtr->fontCache = WMCreateHashTable(WMStringPointerHashCallbacks);
910 + scrPtr->xftFontCache = WMCreateHashTable(WMStringPointerHashCallbacks);
912 + scrPtr->fontSetCache = WMCreateHashTable(WMStringPointerHashCallbacks);
914 + scrPtr->xftFontSetCache = WMCreateHashTable(WMStringPointerHashCallbacks);
919 + scrPtr->hasXftSupport = 1;
921 + scrPtr->hasXftSupport = XftDefaultHasRender(scrPtr->display);
924 scrPtr->xftdraw = XftDrawCreate(scrPtr->display, W_DRAWABLE(scrPtr),
925 scrPtr->visual, scrPtr->colormap);
929 scrPtr->useMultiByte = WINGsConfiguration.useMultiByte;
931 - scrPtr->useWideChar = 1;
933 - scrPtr->antialiasedText = WINGsConfiguration.antialiasedText;
934 + if (scrPtr->hasXftSupport) {
935 + scrPtr->antialiasedText = WINGsConfiguration.antialiasedText;
937 + if (WINGsConfiguration.antialiasedText) {
938 + wwarning(_("Text antialiasing is enabled in the configuration but"
939 + " the X server doesn't have the required capabilities "
940 + "(missing RENDER extension). Disabling text antialiasing."));
942 + scrPtr->antialiasedText = False;
945 scrPtr->normalFont = WMSystemFontOfSize(scrPtr,
946 WINGsConfiguration.defaultFontSize);
947 @@ -780,16 +800,16 @@
948 CHECK_BUTTON_ON_HEIGHT, False);
950 scrPtr->checkButtonImageOff = makePixmap(scrPtr, CHECK_BUTTON_OFF,
951 - CHECK_BUTTON_OFF_WIDTH,
952 - CHECK_BUTTON_OFF_HEIGHT, False);
953 + CHECK_BUTTON_OFF_WIDTH,
954 + CHECK_BUTTON_OFF_HEIGHT, False);
956 scrPtr->radioButtonImageOn = makePixmap(scrPtr, RADIO_BUTTON_ON,
957 RADIO_BUTTON_ON_WIDTH,
958 RADIO_BUTTON_ON_HEIGHT, False);
960 scrPtr->radioButtonImageOff = makePixmap(scrPtr, RADIO_BUTTON_OFF,
961 - RADIO_BUTTON_OFF_WIDTH,
962 - RADIO_BUTTON_OFF_HEIGHT, False);
963 + RADIO_BUTTON_OFF_WIDTH,
964 + RADIO_BUTTON_OFF_HEIGHT, False);
966 scrPtr->buttonArrow = makePixmap(scrPtr, BUTTON_ARROW,
967 BUTTON_ARROW_WIDTH, BUTTON_ARROW_HEIGHT,
968 @@ -822,20 +842,20 @@
969 SCROLLER_ARROW_RIGHT_HEIGHT, True);
971 scrPtr->hiUpArrow = makePixmap(scrPtr, HI_SCROLLER_ARROW_UP,
972 - SCROLLER_ARROW_UP_WIDTH,
973 - SCROLLER_ARROW_UP_HEIGHT, True);
974 + SCROLLER_ARROW_UP_WIDTH,
975 + SCROLLER_ARROW_UP_HEIGHT, True);
977 scrPtr->hiDownArrow = makePixmap(scrPtr, HI_SCROLLER_ARROW_DOWN,
978 - SCROLLER_ARROW_DOWN_WIDTH,
979 - SCROLLER_ARROW_DOWN_HEIGHT, True);
980 + SCROLLER_ARROW_DOWN_WIDTH,
981 + SCROLLER_ARROW_DOWN_HEIGHT, True);
983 scrPtr->hiLeftArrow = makePixmap(scrPtr, HI_SCROLLER_ARROW_LEFT,
984 - SCROLLER_ARROW_LEFT_WIDTH,
985 - SCROLLER_ARROW_LEFT_HEIGHT, True);
986 + SCROLLER_ARROW_LEFT_WIDTH,
987 + SCROLLER_ARROW_LEFT_HEIGHT, True);
989 scrPtr->hiRightArrow = makePixmap(scrPtr, HI_SCROLLER_ARROW_RIGHT,
990 - SCROLLER_ARROW_RIGHT_WIDTH,
991 - SCROLLER_ARROW_RIGHT_HEIGHT, True);
992 + SCROLLER_ARROW_RIGHT_WIDTH,
993 + SCROLLER_ARROW_RIGHT_HEIGHT, True);
995 scrPtr->popUpIndicator = makePixmap(scrPtr, POPUP_INDICATOR,
996 POPUP_INDICATOR_WIDTH,
1003 blank = XCreatePixmap(display, scrPtr->stipple, 1, 1, 1);
1004 XSetForeground(display, scrPtr->monoGC, 0);
1005 XFillRectangle(display, blank, scrPtr->monoGC, 0, 0, 1, 1);
1006 Index: WINGs/WINGs/WINGs.h
1007 ===================================================================
1008 RCS file: /cvsroot/wm/WINGs/WINGs/WINGs.h,v
1009 retrieving revision 1.42
1010 retrieving revision 1.41
1011 diff -u -r1.42 -r1.41
1012 --- WINGs/WINGs/WINGs.h 2003/08/07 00:26:22 1.42
1013 +++ WINGs/WINGs/WINGs.h 2003/07/16 20:58:50 1.41
1014 @@ -107,6 +107,22 @@
1020 + WFDefaultFont = 0,
1021 + WFNormalFont = (1<<0),
1022 + WFFontSet = (1<<1),
1023 + WFAntialiased = (1<<2),
1024 + WFNotAntialiased = (1<<3)
1028 +/* Use default system font size in system font name */
1030 + WFDefaultSize = -1
1034 /* frame title positions */
1037 @@ -730,11 +746,18 @@
1039 /* ....................................................................... */
1041 +WMFont* WMCreateNormalFont(WMScreen *scrPtr, char *fontName);
1043 +WMFont* WMCreateFontSet(WMScreen *scrPtr, char *fontName);
1045 +WMFont* WMCreateAntialiasedFont(WMScreen *scrPtr, char *fontName);
1047 +WMFont* WMCreateAntialiasedFontSet(WMScreen *scrPtr, char *fontName);
1049 WMFont* WMCreateFont(WMScreen *scrPtr, char *fontName);
1052 -WMFont* WMCreateFontWithAttributes(WMScreen *scrPtr, char *fontName,
1053 - WMFontAttributes *attribs);
1054 +WMFont* WMCreateFontWithFlags(WMScreen *scrPtr, char *fontName,
1055 + WMFontFlags flags);
1057 WMFont* WMCopyFontWithChanges(WMScreen *scrPtr, WMFont *font,
1058 const WMFontAttributes *changes);
1059 @@ -747,6 +770,15 @@
1061 unsigned int WMFontHeight(WMFont *font);
1063 +Bool WMIsAntialiasedFont(WMFont *font);
1066 +WMFont* WMUserFontOfSize(WMScreen *scrPtr, int size);
1068 +WMFont* WMUserFixedPitchFontOfSize(WMScreen *scrPtr, int size);
1072 void WMSetWidgetDefaultFont(WMScreen *scr, WMFont *font);
1074 void WMSetWidgetDefaultBoldFont(WMScreen *scr, WMFont *font);
1076 WMFont* WMSystemFontOfSize(WMScreen *scrPtr, int size);
1078 WMFont* WMBoldSystemFontOfSize(WMScreen *scrPtr, int size);
1080 +XFontSet WMGetFontFontSet(WMFont *font);
1082 /* ....................................................................... */
1084 Index: WINGs/WINGs/WINGsP.h
1085 ===================================================================
1086 RCS file: /cvsroot/wm/WINGs/WINGs/WINGsP.h,v
1087 retrieving revision 1.19
1088 retrieving revision 1.16
1089 diff -u -r1.19 -r1.16
1090 --- WINGs/WINGs/WINGsP.h 2003/08/15 02:58:04 1.19
1091 +++ WINGs/WINGs/WINGsP.h 2002/11/25 04:46:02 1.16
1094 #define DOUBLE_BUFFER
1099 #define WC_UserWidget 128
1103 typedef struct W_Font {
1104 struct W_Screen *screen;
1107 - struct _XftFont *font;
1111 - XFontStruct *font;
1116 + XFontStruct *normal;
1117 + struct _XftFont *xft;
1123 - //unsigned int notFontSet:1;
1124 - //unsigned int antialiased:1;
1125 + unsigned int notFontSet:1;
1126 + unsigned int antialiased:1;
1131 struct W_DraggingInfo {
1132 Window destinationWindow;
1133 Window sourceWindow;
1138 unsigned sourceOperation;
1141 unsigned finished:1;
1146 typedef struct W_Screen {
1150 struct _XftDraw *xftdraw; /* shared XftDraw */
1152 + Bool hasXftSupport; /* if it can antialias text */
1154 /* application related */
1156 W_FocusInfo *focusInfo;
1157 @@ -201,9 +200,13 @@
1159 WMHashTable *fontCache;
1161 - Bool useMultiByte;
1162 + WMHashTable *xftFontCache;
1165 + WMHashTable *fontSetCache;
1167 + WMHashTable *xftFontSetCache;
1169 + Bool useMultiByte;
1171 Bool antialiasedText;
1174 typedef struct _WINGsConfiguration {
1176 char *boldSystemFont;
1177 + char *antialiasedSystemFont;
1178 + char *antialiasedBoldSystemFont;
1179 int defaultFontSize;
1180 Bool antialiasedText;
1182 Index: WINGs/po/ca.po
1183 ===================================================================
1184 RCS file: /cvsroot/wm/WINGs/po/ca.po,v
1185 retrieving revision 1.2
1186 retrieving revision 1.1
1188 --- WINGs/po/ca.po 2003/09/16 23:31:30 1.2
1189 +++ WINGs/po/ca.po 2003/02/23 22:12:21 1.1
1191 # Catalan messages for WINGs.
1192 -# Copyright (C) 2003 Ernest Adrogué <eadrogue@gmx.net>.
1193 -# This file is distributed under the terms of the GNU General Public License.
1194 +# Copyright (C) 2003 Free Software Foundation, Inc.
1195 +# This file is distributed under the same license as GNU Window Maker.
1196 +# Ernest Adrogué <eadrogue@gmx.net>, 2003.
1199 -# WM-ver author email date
1200 -# 0.80.2 Ernest Adrogué eadrogue@gmx.net 23 Feb 2003
1201 -# CVS-20030914 Ernest Adrogué eadrogue@gmx.net 15 Set 2003
1202 +# WM-ver author email date
1203 +# 0.80.2 Ernest Adrogué eadrogue@gmx.net 23 Feb 2003
1207 "Project-Id-Version: WINGs 0.80.2\n"
1208 -"POT-Creation-Date: 2003-09-16 22:59+0200\n"
1209 -"PO-Revision-Date: 2003-09-16 23:16+0200\n"
1210 +"POT-Creation-Date: 2003-02-23 16:54+0100\n"
1211 +"PO-Revision-Date: 2002-12-06 14:15+0100\n"
1212 "Last-Translator: Ernest Adrogué <eadrogue@gmx.net>\n"
1213 "Language-Team: Catalan <ca@dodds.net>\n"
1214 "MIME-Version: 1.0\n"
1215 "Content-Type: text/plain; charset=iso-8859-1\n"
1216 "Content-Transfer-Encoding: 8bit\n"
1218 -#: ../../WINGs/connection.c:467 ../../WINGs/connection.c:532
1219 -#: ../../WINGs/connection.c:575
1220 +#: ../../WINGs/connection.c:461 ../../WINGs/connection.c:526
1221 +#: ../../WINGs/connection.c:569
1222 msgid "Bad address-service-protocol combination"
1223 msgstr "Combinació adreça-servei-protocol incorrecta"
1227 #: ../../WINGs/error.c:110
1229 -msgstr ": atenció: "
1230 +msgstr " atenció: "
1232 #: ../../WINGs/error.c:137
1233 msgid " fatal error: "
1234 -msgstr ": error fatal: "
1235 +msgstr " error fatal: "
1237 #: ../../WINGs/error.c:163 ../../WINGs/error.c:192
1242 #: ../../WINGs/findfile.c:48
1244 msgid "could not get password entry for UID %i"
1245 -msgstr "no s'ha pogut obtenir l'informació de compte de l'UID %i"
1246 +msgstr "no s'ha pogut obtenir l'informació d'usuari per l'UID %i"
1248 #: ../../WINGs/findfile.c:66
1250 msgid "could not get password entry for user %s"
1251 -msgstr "no s'ha pogut obtenir l'informació de compte de l'usuari %s"
1252 +msgstr "no s'ha pogut obtenir l'informació d'usuari per l'usuari %s"
1254 #: ../../WINGs/host.c:114
1255 msgid "Cannot get current host name"
1256 msgstr "No s'ha pogut obtenir el nom de host actual"
1258 -# falten coses per traduïr en el codi font. eac
1259 #: ../../WINGs/proplist.c:91
1261 msgid "syntax error in %s %s, line %i: %s"
1262 -msgstr "error de sintaxi a %s %s, línia %i: %s"
1263 +msgstr "error de sintaxi en %s %s, línia %i: %s"
1265 #: ../../WINGs/proplist.c:150
1266 msgid "Only string or data is supported for a proplist dictionary key"
1268 -"Una entrada PropList de diccionari només pot contenir dades o una cadena"
1269 +"Les entrades de diccionari PropList només poden contenir dades o una cadena"
1271 #: ../../WINGs/proplist.c:184 ../../WINGs/proplist.c:236
1272 #: ../../WINGs/proplist.c:394 ../../WINGs/proplist.c:474
1274 #: ../../WINGs/proplist.c:1293 ../../WINGs/proplist.c:1372
1275 #: ../../WINGs/proplist.c:1493 ../../WINGs/proplist.c:1540
1276 msgid "Used proplist functions on non-WMPropLists objects"
1277 -msgstr "S'han usat funcions PropList en objectes no-WMPropLists"
1278 +msgstr "S'han usat funcions proplist en objectes no-WMPropLists"
1280 #: ../../WINGs/proplist.c:630
1281 msgid "unterminated PropList string"
1282 @@ -120,19 +119,19 @@
1284 #: ../../WINGs/proplist.c:803
1285 msgid "error parsing PropList dictionary key"
1286 -msgstr "error mentre s'analitzava l'entrada PropList de diccionari"
1287 +msgstr "error analitzant l'entrada PropList de diccionari"
1289 #: ../../WINGs/proplist.c:811
1290 msgid "missing = in PropList dictionary entry"
1291 -msgstr "falta un \"=\" a l'entrada PropList de diccionari"
1292 +msgstr "falta un \"=\" a l'entrada de diccionari PropList"
1294 #: ../../WINGs/proplist.c:819
1295 msgid "error parsing PropList dictionary entry value"
1296 -msgstr "error mentre s'analitzava el valor de l'entrada PropList de diccionari"
1297 +msgstr "error analitzant el valor de l'entrada de diccionari PropList"
1299 #: ../../WINGs/proplist.c:827
1300 msgid "missing ; in PropList dictionary entry"
1301 -msgstr "falta un \";\" a l'entrada PropList de diccionari"
1302 +msgstr "falta un \";\" en l'entrada de diccionari PropList"
1304 #: ../../WINGs/proplist.c:888
1308 #: ../../WINGs/proplist.c:892
1309 msgid "Comments are not allowed inside WindowMaker owned domain files."
1310 -msgstr "No es permeten comentaris en els fitxers de domini de WindowMaker."
1311 +msgstr "No es permeten comentaris en els fitxers de domini de Window Maker."
1313 -#: ../../WINGs/proplist.c:1563 ../../WINGs/proplist.c:1630
1314 +#: ../../WINGs/proplist.c:1563 ../../WINGs/proplist.c:1628
1315 msgid "extra data after end of property list"
1316 msgstr "sobren dades després de la llista de propietats"
1318 @@ -155,166 +154,166 @@
1319 msgid "could not get size for file '%s'"
1320 msgstr "no s'ha pogut obtenir la mida de \"%s\""
1322 -#: ../../WINGs/proplist.c:1619
1323 +#: ../../WINGs/proplist.c:1618
1325 msgid "error reading from file '%s'"
1326 -msgstr "error mentre es llegia el fitxer \"%s\""
1327 +msgstr "error llegint el fitxer \"%s\""
1329 -#: ../../WINGs/proplist.c:1671
1330 +#: ../../WINGs/proplist.c:1669
1332 msgid "mkstemp (%s) failed"
1333 msgstr "la rutina mkstemp (%s) ha fallat"
1335 -#: ../../WINGs/proplist.c:1682
1336 +#: ../../WINGs/proplist.c:1680
1338 msgid "mktemp (%s) failed"
1339 msgstr "la rutina mktemp (%s) ha fallat"
1341 -#: ../../WINGs/proplist.c:1693
1342 +#: ../../WINGs/proplist.c:1691
1344 msgid "open (%s) failed"
1345 msgstr "la rutina open (%s) ha fallat"
1347 -#: ../../WINGs/proplist.c:1700
1348 +#: ../../WINGs/proplist.c:1698
1350 msgid "writing to file: %s failed"
1351 msgstr "l'escriptura del fitxer \"%s\" ha fallat"
1353 -#: ../../WINGs/proplist.c:1708
1354 +#: ../../WINGs/proplist.c:1706
1356 msgid "fclose (%s) failed"
1357 msgstr "la rutina fclose (%s) ha fallat"
1359 -#: ../../WINGs/proplist.c:1717
1360 +#: ../../WINGs/proplist.c:1715
1362 msgid "rename ('%s' to '%s') failed"
1363 msgstr "el canvi de nom (\"%s\" a \"%s\") ha fallat"
1365 #. something happened with the file. just overwrite it
1366 -#: ../../WINGs/userdefaults.c:188 ../../WINGs/userdefaults.c:204
1367 +#: ../../WINGs/userdefaults.c:192 ../../WINGs/userdefaults.c:208
1369 msgid "cannot read domain from file '%s' when syncing"
1370 msgstr "no s'ha pogut llegir un domini del fitxer \"%s\" quan es sincronitzava"
1372 -#: ../../WINGs/wcolor.c:224 ../../WINGs/wcolor.c:236 ../../WINGs/wcolor.c:275
1373 -#: ../../WINGs/wcolor.c:316
1374 +#: ../../WINGs/wcolor.c:198 ../../WINGs/wcolor.c:211 ../../WINGs/wcolor.c:250
1375 +#: ../../WINGs/wcolor.c:291
1377 msgid "could not allocate %s color"
1378 msgstr "no s'ha pogut assignar espai pel color \"%s\""
1380 -#: ../../WINGs/wcolor.c:224
1381 +#: ../../WINGs/wcolor.c:198
1385 -#: ../../WINGs/wcolor.c:236
1386 +#: ../../WINGs/wcolor.c:211
1390 -#: ../../WINGs/wcolor.c:275
1391 +#: ../../WINGs/wcolor.c:250
1395 -#: ../../WINGs/wcolor.c:316
1396 +#: ../../WINGs/wcolor.c:291
1400 -#: ../../WINGs/wcolorpanel.c:420
1401 +#: ../../WINGs/wcolorpanel.c:415
1405 -#: ../../WINGs/wcolorpanel.c:610 ../../WINGs/wcolorpanel.c:2829
1406 +#: ../../WINGs/wcolorpanel.c:605 ../../WINGs/wcolorpanel.c:2824
1410 -#: ../../WINGs/wcolorpanel.c:612 ../../WINGs/wcolorpanel.c:688
1411 -#: ../../WINGs/wcolorpanel.c:721 ../../WINGs/wcolorpanel.c:755
1412 -#: ../../WINGs/wcolorpanel.c:815 ../../WINGs/wcolorpanel.c:849
1413 -#: ../../WINGs/wcolorpanel.c:883 ../../WINGs/wcolorpanel.c:918
1414 -#: ../../WINGs/wcolorpanel.c:2169 ../../WINGs/wcolorpanel.c:2831
1415 -#: ../../WINGs/wcolorpanel.c:2867 ../../WINGs/wcolorpanel.c:2903
1416 -#: ../../WINGs/wcolorpanel.c:3745
1417 +#: ../../WINGs/wcolorpanel.c:607 ../../WINGs/wcolorpanel.c:683
1418 +#: ../../WINGs/wcolorpanel.c:716 ../../WINGs/wcolorpanel.c:750
1419 +#: ../../WINGs/wcolorpanel.c:810 ../../WINGs/wcolorpanel.c:844
1420 +#: ../../WINGs/wcolorpanel.c:878 ../../WINGs/wcolorpanel.c:913
1421 +#: ../../WINGs/wcolorpanel.c:2164 ../../WINGs/wcolorpanel.c:2826
1422 +#: ../../WINGs/wcolorpanel.c:2862 ../../WINGs/wcolorpanel.c:2898
1423 +#: ../../WINGs/wcolorpanel.c:3746
1424 msgid "Color Panel: Could not allocate memory"
1425 msgstr "Panell de color: No s'ha pogut assignar memòria"
1427 -#: ../../WINGs/wcolorpanel.c:685 ../../WINGs/wcolorpanel.c:686
1428 +#: ../../WINGs/wcolorpanel.c:680 ../../WINGs/wcolorpanel.c:681
1432 -#: ../../WINGs/wcolorpanel.c:718 ../../WINGs/wcolorpanel.c:719
1433 +#: ../../WINGs/wcolorpanel.c:713 ../../WINGs/wcolorpanel.c:714
1437 -#: ../../WINGs/wcolorpanel.c:752 ../../WINGs/wcolorpanel.c:753
1438 +#: ../../WINGs/wcolorpanel.c:747 ../../WINGs/wcolorpanel.c:748
1442 -#: ../../WINGs/wcolorpanel.c:812 ../../WINGs/wcolorpanel.c:813
1443 +#: ../../WINGs/wcolorpanel.c:807 ../../WINGs/wcolorpanel.c:808
1447 -#: ../../WINGs/wcolorpanel.c:846 ../../WINGs/wcolorpanel.c:847
1448 +#: ../../WINGs/wcolorpanel.c:841 ../../WINGs/wcolorpanel.c:842
1452 -#: ../../WINGs/wcolorpanel.c:880 ../../WINGs/wcolorpanel.c:881
1453 +#: ../../WINGs/wcolorpanel.c:875 ../../WINGs/wcolorpanel.c:876
1457 -#: ../../WINGs/wcolorpanel.c:915 ../../WINGs/wcolorpanel.c:916
1458 +#: ../../WINGs/wcolorpanel.c:910 ../../WINGs/wcolorpanel.c:911
1462 -#: ../../WINGs/wcolorpanel.c:996
1463 +#: ../../WINGs/wcolorpanel.c:991
1467 -#: ../../WINGs/wcolorpanel.c:1026
1468 +#: ../../WINGs/wcolorpanel.c:1021
1472 -#: ../../WINGs/wcolorpanel.c:1032
1473 +#: ../../WINGs/wcolorpanel.c:1027
1474 msgid "New from File..."
1475 -msgstr "Obtenir d'un fitxer..."
1476 +msgstr "Obté d'un fitxer..."
1478 -#: ../../WINGs/wcolorpanel.c:1033 ../../WINGs/wcolorpanel.c:1081
1479 -#: ../../WINGs/wcolorpanel.c:1098
1480 +#: ../../WINGs/wcolorpanel.c:1028 ../../WINGs/wcolorpanel.c:1076
1481 +#: ../../WINGs/wcolorpanel.c:1093
1483 -msgstr "Reanomenar..."
1484 +msgstr "Reanomena..."
1486 -#: ../../WINGs/wcolorpanel.c:1034 ../../WINGs/wcolorpanel.c:1082
1487 -#: ../../WINGs/wcolorpanel.c:1099 ../../WINGs/wcolorpanel.c:3326
1488 +#: ../../WINGs/wcolorpanel.c:1029 ../../WINGs/wcolorpanel.c:1077
1489 +#: ../../WINGs/wcolorpanel.c:1094 ../../WINGs/wcolorpanel.c:3321
1494 -#: ../../WINGs/wcolorpanel.c:1035
1495 +#: ../../WINGs/wcolorpanel.c:1030
1500 -#: ../../WINGs/wcolorpanel.c:1036
1501 +#: ../../WINGs/wcolorpanel.c:1031
1502 msgid "New from Clipboard"
1503 -msgstr "Obtenir del porta-retalls..."
1504 +msgstr "Obté del porta-retalls..."
1506 -#: ../../WINGs/wcolorpanel.c:1057
1507 +#: ../../WINGs/wcolorpanel.c:1052
1511 -#: ../../WINGs/wcolorpanel.c:1074
1512 +#: ../../WINGs/wcolorpanel.c:1069
1516 -#: ../../WINGs/wcolorpanel.c:1080
1517 +#: ../../WINGs/wcolorpanel.c:1075
1521 -#: ../../WINGs/wcolorpanel.c:1090
1522 +#: ../../WINGs/wcolorpanel.c:1085
1526 -#: ../../WINGs/wcolorpanel.c:1097
1527 +#: ../../WINGs/wcolorpanel.c:1092
1531 -#: ../../WINGs/wcolorpanel.c:1236
1532 +#: ../../WINGs/wcolorpanel.c:1231
1535 "Color Panel: Could not create directory %s needed to store configurations"
1536 @@ -323,105 +322,104 @@
1539 #. Delete the file, it doesn't belong here
1540 -#: ../../WINGs/wcolorpanel.c:1242 ../../WINGs/wcolorpanel.c:3212
1541 -#: ../../WINGs/wcolorpanel.c:3216
1542 +#: ../../WINGs/wcolorpanel.c:1237 ../../WINGs/wcolorpanel.c:3207
1543 +#: ../../WINGs/wcolorpanel.c:3211
1545 msgstr "Error de fitxer"
1547 -#: ../../WINGs/wcolorpanel.c:1243
1548 +#: ../../WINGs/wcolorpanel.c:1238
1549 msgid "Could not create ColorPanel configuration directory"
1550 msgstr "No s'ha pogut crear el directori de configuració del Panell de color"
1552 -#: ../../WINGs/wcolorpanel.c:1244 ../../WINGs/wcolorpanel.c:3213
1553 -#: ../../WINGs/wcolorpanel.c:3218 ../../WINGs/wcolorpanel.c:3245
1554 -#: ../../WINGs/wfilepanel.c:250 ../../WINGs/wfilepanel.c:650
1555 -#: ../../WINGs/wfilepanel.c:662 ../../WINGs/wfilepanel.c:763
1556 -#: ../../WINGs/wfilepanel.c:974 ../../WINGs/wfontpanel.c:751
1557 +#: ../../WINGs/wcolorpanel.c:1239 ../../WINGs/wcolorpanel.c:3208
1558 +#: ../../WINGs/wcolorpanel.c:3213 ../../WINGs/wcolorpanel.c:3240
1559 +#: ../../WINGs/wfilepanel.c:250 ../../WINGs/wfilepanel.c:647
1560 +#: ../../WINGs/wfilepanel.c:659 ../../WINGs/wfilepanel.c:760
1561 +#: ../../WINGs/wfilepanel.c:971 ../../WINGs/wfontpanel.c:709
1565 -#: ../../WINGs/wcolorpanel.c:1250 ../../WINGs/wcolorpanel.c:1286
1566 -#: ../../WINGs/wcolorpanel.c:1304
1567 +#: ../../WINGs/wcolorpanel.c:1245 ../../WINGs/wcolorpanel.c:1281
1568 +#: ../../WINGs/wcolorpanel.c:1299
1569 msgid "Color Panel: Could not find file"
1570 msgstr "Panell de color: No s'ha trobat el fitxer"
1572 -#: ../../WINGs/wcolorpanel.c:1491 ../../WINGs/wcolorpanel.c:1556
1573 -#: ../../WINGs/wcolorpanel.c:1620
1574 +#: ../../WINGs/wcolorpanel.c:1486 ../../WINGs/wcolorpanel.c:1551
1575 +#: ../../WINGs/wcolorpanel.c:1615
1576 msgid "Color Panel: X failed request"
1577 msgstr "Panell de color: petició X fallida"
1579 -#: ../../WINGs/wcolorpanel.c:2865
1580 +#: ../../WINGs/wcolorpanel.c:2860
1584 -#: ../../WINGs/wcolorpanel.c:2901
1585 +#: ../../WINGs/wcolorpanel.c:2896
1589 -# és el títol d'un quadre de diàleg. eac
1590 -#: ../../WINGs/wcolorpanel.c:3151
1591 +#: ../../WINGs/wcolorpanel.c:3146
1592 msgid "Open Palette"
1593 msgstr "Obrir paleta"
1595 -#: ../../WINGs/wcolorpanel.c:3213
1596 +#: ../../WINGs/wcolorpanel.c:3208
1597 msgid "Invalid file format !"
1598 msgstr "El format del fitxer no és vàlid !"
1600 -#: ../../WINGs/wcolorpanel.c:3215
1601 +#: ../../WINGs/wcolorpanel.c:3210
1603 msgid "can't remove file %s"
1604 msgstr "no s'ha pogut eliminar el fitxer \"%s\""
1606 -#: ../../WINGs/wcolorpanel.c:3217
1607 +#: ../../WINGs/wcolorpanel.c:3212
1608 msgid "Couldn't remove file from Configuration Directory !"
1609 msgstr "No s'ha pogut eliminar el fitxer del directori de configuració !"
1611 -#: ../../WINGs/wcolorpanel.c:3244
1612 +#: ../../WINGs/wcolorpanel.c:3239
1616 -#: ../../WINGs/wcolorpanel.c:3244
1617 +#: ../../WINGs/wcolorpanel.c:3239
1618 msgid "Rename palette to:"
1619 -msgstr "Reanomena la paleta com a:"
1620 +msgstr "Reanomenar la paleta a:"
1622 -#: ../../WINGs/wcolorpanel.c:3245 ../../WINGs/wfilepanel.c:259
1623 -#: ../../WINGs/wfilepanel.c:662 ../../WINGs/wfilepanel.c:763
1624 +#: ../../WINGs/wcolorpanel.c:3240 ../../WINGs/wfilepanel.c:259
1625 +#: ../../WINGs/wfilepanel.c:659 ../../WINGs/wfilepanel.c:760
1629 #. Careful, this palette exists already
1630 -#: ../../WINGs/wcolorpanel.c:3261 ../../WINGs/wfilepanel.c:763
1631 +#: ../../WINGs/wcolorpanel.c:3256 ../../WINGs/wfilepanel.c:760
1635 -#: ../../WINGs/wcolorpanel.c:3262
1636 +#: ../../WINGs/wcolorpanel.c:3257
1638 "Palette already exists !\n"
1642 -"Ja existia una paleta amb aquest nom!\n"
1643 +"La paleta existeix!\n"
1645 "La voleu sobreescriure?"
1647 -#: ../../WINGs/wcolorpanel.c:3262 ../../WINGs/wcolorpanel.c:3326
1648 +#: ../../WINGs/wcolorpanel.c:3257 ../../WINGs/wcolorpanel.c:3321
1652 -#: ../../WINGs/wcolorpanel.c:3262 ../../WINGs/wcolorpanel.c:3326
1653 +#: ../../WINGs/wcolorpanel.c:3257 ../../WINGs/wcolorpanel.c:3321
1657 -#: ../../WINGs/wcolorpanel.c:3294
1658 +#: ../../WINGs/wcolorpanel.c:3289
1660 msgid "Couldn't rename palette %s to %s\n"
1661 -msgstr "No s'ha pogut reanomenar la paleta %s com a %s\n"
1662 +msgstr "No s'ha pogut reanomenar la paleta %s a %s\n"
1664 -#: ../../WINGs/wcolorpanel.c:3320
1665 +#: ../../WINGs/wcolorpanel.c:3315
1666 msgid "This will permanently remove the palette "
1667 msgstr "Això eliminarà la paleta per sempre "
1669 -#: ../../WINGs/wcolorpanel.c:3323
1670 +#: ../../WINGs/wcolorpanel.c:3318
1674 @@ -431,27 +429,27 @@
1676 "Esteu segurs que voleu eliminar aquesta paleta?"
1678 -#: ../../WINGs/wcolorpanel.c:3348
1679 +#: ../../WINGs/wcolorpanel.c:3343
1681 msgid "Couldn't remove palette %s\n"
1682 msgstr "No s'ha pogut eliminar la paleta %s\n"
1684 -#: ../../WINGs/wcolorpanel.c:3647
1685 +#: ../../WINGs/wcolorpanel.c:3648
1687 msgid "Could not open %s"
1688 msgstr "No s'ha pogut obrir %s"
1690 -#: ../../WINGs/wcolorpanel.c:3654
1691 +#: ../../WINGs/wcolorpanel.c:3655
1693 msgid "Could not create %s"
1694 msgstr "No s'ha pogut crear %s"
1696 -#: ../../WINGs/wcolorpanel.c:3665
1697 +#: ../../WINGs/wcolorpanel.c:3666
1699 msgid "Write error on file %s"
1700 msgstr "Error d'escriptura en el fitxer %s"
1702 -#: ../../WINGs/wcolorpanel.c:3710
1703 +#: ../../WINGs/wcolorpanel.c:3711
1704 msgid "Color Panel: Color unspecified"
1705 msgstr "Panell de color: Color no especificat"
1707 @@ -467,270 +465,211 @@
1711 -#: ../../WINGs/wfilepanel.c:565
1712 +#: ../../WINGs/wfilepanel.c:562
1714 msgid "WINGs: could not open directory %s\n"
1715 msgstr "WINGs: no s'ha pogut obrir el directori %s\n"
1717 -#: ../../WINGs/wfilepanel.c:583
1718 +#: ../../WINGs/wfilepanel.c:580
1720 msgid "WINGs: could not stat %s\n"
1721 msgstr "WINGs: no s'ha pogut determinar l'estat de %s\n"
1723 -#: ../../WINGs/wfilepanel.c:650 ../../WINGs/wfilepanel.c:973
1724 -#: ../../WINGs/wfontpanel.c:750
1725 +#: ../../WINGs/wfilepanel.c:647 ../../WINGs/wfilepanel.c:970
1726 +#: ../../WINGs/wfontpanel.c:708
1730 -# és el nom d'un quadre de diàleg. eac
1731 -#: ../../WINGs/wfilepanel.c:661
1732 +#: ../../WINGs/wfilepanel.c:658
1733 msgid "Create Directory"
1734 msgstr "Crear directori"
1736 -#: ../../WINGs/wfilepanel.c:662
1737 +#: ../../WINGs/wfilepanel.c:659
1738 msgid "Enter directory name"
1739 msgstr "Entreu el nom del directori"
1741 -#: ../../WINGs/wfilepanel.c:698 ../../WINGs/wfilepanel.c:737
1742 -#: ../../WINGs/wfilepanel.c:768 ../../WINGs/wfilepanel.c:796
1743 +#: ../../WINGs/wfilepanel.c:695 ../../WINGs/wfilepanel.c:734
1744 +#: ../../WINGs/wfilepanel.c:765 ../../WINGs/wfilepanel.c:793
1745 msgid "Permission denied."
1746 msgstr "Permís denegat."
1748 -#: ../../WINGs/wfilepanel.c:701
1749 +#: ../../WINGs/wfilepanel.c:698
1751 msgid "'%s' already exists."
1752 msgstr "\"%s\" existia prèviament."
1754 -#: ../../WINGs/wfilepanel.c:704
1755 +#: ../../WINGs/wfilepanel.c:701
1756 msgid "Path does not exist."
1757 -msgstr "L'ubicació no existeix."
1758 +msgstr "El camí no existeix."
1760 -#: ../../WINGs/wfilepanel.c:734 ../../WINGs/wfilepanel.c:793
1761 +#: ../../WINGs/wfilepanel.c:731 ../../WINGs/wfilepanel.c:790
1763 msgid "'%s' does not exist."
1764 msgstr "\"%s\" no existeix."
1766 -#: ../../WINGs/wfilepanel.c:741 ../../WINGs/wfilepanel.c:800
1767 +#: ../../WINGs/wfilepanel.c:738 ../../WINGs/wfilepanel.c:797
1768 msgid "Insufficient memory available."
1769 msgstr "No hi ha prou memòria disponible."
1771 -#: ../../WINGs/wfilepanel.c:745 ../../WINGs/wfilepanel.c:804
1772 +#: ../../WINGs/wfilepanel.c:742 ../../WINGs/wfilepanel.c:801
1774 msgid "'%s' is on a read-only filesystem."
1775 msgstr "\"%s\" es troba en un sistema de fitxers de només lectura."
1777 -#: ../../WINGs/wfilepanel.c:748 ../../WINGs/wfilepanel.c:780
1778 -#: ../../WINGs/wfilepanel.c:807
1779 +#: ../../WINGs/wfilepanel.c:745 ../../WINGs/wfilepanel.c:777
1780 +#: ../../WINGs/wfilepanel.c:804
1782 msgid "Can not delete '%s'."
1783 msgstr "No s'ha pogut eliminar \"%s\"."
1785 -#: ../../WINGs/wfilepanel.c:755
1786 +#: ../../WINGs/wfilepanel.c:752
1788 msgid "Delete directory %s ?"
1789 -msgstr "Voleu eliminar el directori %s ?"
1790 +msgstr "Eliminar el directori %s ?"
1792 -#: ../../WINGs/wfilepanel.c:759
1793 +#: ../../WINGs/wfilepanel.c:756
1795 msgid "Delete file %s ?"
1796 -msgstr "Voleu eliminar el fitxer %s ?"
1797 +msgstr "Eliminar el fitxer %s ?"
1799 -#: ../../WINGs/wfilepanel.c:771
1800 +#: ../../WINGs/wfilepanel.c:768
1802 msgid "Directory '%s' does not exist."
1803 msgstr "El directori \"%s\" no existeix."
1805 -#: ../../WINGs/wfilepanel.c:774
1806 +#: ../../WINGs/wfilepanel.c:771
1808 msgid "Directory '%s' is not empty."
1809 msgstr "El directori \"%s\" no està buit."
1811 -#: ../../WINGs/wfilepanel.c:777
1812 +#: ../../WINGs/wfilepanel.c:774
1814 msgid "Directory '%s' is busy."
1815 msgstr "El directori \"%s\" es troba ocupat."
1817 -#: ../../WINGs/wfilepanel.c:790
1818 +#: ../../WINGs/wfilepanel.c:787
1820 msgid "'%s' is a directory."
1821 msgstr "\"%s\" és un directori."
1823 -#: ../../WINGs/wfilepanel.c:832
1824 +#: ../../WINGs/wfilepanel.c:829
1826 msgid "An error occured browsing '%s'."
1827 msgstr "S'ha produït un error mentre s'explorava \"%s\"."
1829 -#: ../../WINGs/wfilepanel.c:836
1830 +#: ../../WINGs/wfilepanel.c:833
1832 msgid "'%s' is not a directory."
1833 msgstr "\"%s\" no és un directori."
1835 -#: ../../WINGs/wfilepanel.c:973
1836 +#: ../../WINGs/wfilepanel.c:970
1837 msgid "File does not exist."
1838 msgstr "El fitxer no existeix."
1840 -#: ../../WINGs/wfont.c:324 ../../WINGs/wfont.c:344
1842 -msgid "could not load font %s."
1843 -msgstr "no s'ha pogut carregar el tipus de lletra %s."
1845 -#: ../../WINGs/wfont.c:375 ../../WINGs/wfont.c:420 ../../WINGs/wfont.c:475
1846 -#: ../../WINGs/wfont.c:1337 ../../WINGs/wfont.c:1398 ../../WINGs/wfont.c:1469
1849 -"Conversion to widechar failed (possible invalid multibyte sequence): '%s':"
1852 -"Ha fallat la conversió a caràcter estès (possible seqüència no vàlida): '%"
1855 -#. // remove warning later. or maybe not
1856 -#: ../../WINGs/wfont.c:591 ../../WINGs/wfont.c:1568
1858 -msgid "Invalid font specification: '%s'\n"
1859 -msgstr "Especificació de font no vàlida: \"%s\"\n"
1861 -#: ../../WINGs/wfont.c:770 ../../WINGs/wfont.c:780
1863 -msgid "Invalid size specification '%s' in %s. Using default %d\n"
1865 -"La mida \"%s\" especificada a %s no és vàlida. S'usa el valor per omissió %"
1868 -#: ../../WINGs/wfont.c:824
1869 +#: ../../WINGs/wfont.c:129
1871 msgid "the following character sets are missing in %s:"
1872 msgstr "els següents conjunts de caràcters falten a %s:"
1874 -#: ../../WINGs/wfont.c:830
1875 +#: ../../WINGs/wfont.c:136
1878 "the string \"%s\" will be used in place of any characters from those sets."
1880 "la cadena \"%s\" s'usarà en lloc dels caràcters d'aquests conjunts de "
1883 -#. is arial a good fallback for multibyte?
1884 -#: ../../WINGs/wfont.c:1232 ../../WINGs/wfont.c:1247
1886 -msgid "could not load font %s. Trying arial."
1887 -msgstr "no s'ha pogut carregar el tipus de lletra %s. Provant amb \"arial\"."
1889 -#: ../../WINGs/wfont.c:1239
1890 -msgid "could not load antialiased font set. Reverting to standard font sets."
1892 -"no s'ha pogut carregar el conjunt de fonts amb allisat. S'usarà l'estàndard."
1894 -#: ../../WINGs/wfont.c:1242
1895 +#: ../../WINGs/wfont.c:300 ../../WINGs/wfont.c:336
1897 -msgid "could not load FontSet %s. Trying fixed."
1898 +msgid "could not load font set %s. Trying fixed."
1899 msgstr "no s'ha pogut carregar el tipus de lletra %s. Provant amb \"fixed\"."
1901 -#: ../../WINGs/wfont.c:1254
1902 -msgid "could not load antialiased fonts. Reverting to normal fonts."
1903 -msgstr "no s'han pogut carregar fonts allisades. S'usaran fonts normals."
1905 -#: ../../WINGs/wfont.c:1257 ../../WINGs/wfont.c:1268
1906 +#: ../../WINGs/wfont.c:306 ../../WINGs/wfont.c:342
1908 msgid "could not load font %s. Trying fixed."
1909 -msgstr "no s'ha pogut carregar la font %s. Provant amb \"fixed\"."
1911 -#: ../../WINGs/wfont.c:1262
1913 -msgid "could not load font set %s. Trying fixed."
1914 -msgstr "no s'ha pogut carregar el conjunt de fonts %s. Provant amb \"fixed\"."
1915 +msgstr "no s'ha pogut carregar el tipus de lletra %s. Provant amb \"fixed\"."
1917 -#: ../../WINGs/wfont.c:1272
1918 +#: ../../WINGs/wfont.c:310 ../../WINGs/wfont.c:346
1919 msgid "could not load fixed font!"
1920 msgstr "no s'ha pogut carregar el tipus de lletra \"fixed\" !"
1922 -#: ../../WINGs/wfont.c:1520
1923 +#: ../../WINGs/wfont.c:441
1925 msgid "font description %s is too large."
1926 msgstr "la descripció de tipus de lletra %s és massa gran."
1928 -#: ../../WINGs/wfontpanel.c:235
1929 +#: ../../WINGs/wfontpanel.c:205
1933 -#: ../../WINGs/wfontpanel.c:241
1934 +#: ../../WINGs/wfontpanel.c:211
1938 -#: ../../WINGs/wfontpanel.c:252
1939 +#: ../../WINGs/wfontpanel.c:222
1943 -#: ../../WINGs/wfontpanel.c:263
1944 +#: ../../WINGs/wfontpanel.c:233
1948 -#: ../../WINGs/wfontpanel.c:282
1949 +#: ../../WINGs/wfontpanel.c:252
1953 -#: ../../WINGs/wfontpanel.c:288
1954 +#: ../../WINGs/wfontpanel.c:257
1958 -#: ../../WINGs/wfontpanel.c:751
1959 +#: ../../WINGs/wfontpanel.c:709
1960 msgid "Could not retrieve font list"
1961 msgstr "No s'ha pogut obtenir la llista de tipus de lletra"
1963 -#: ../../WINGs/wfontpanel.c:765
1964 +#: ../../WINGs/wfontpanel.c:721
1966 msgid "font name %s is longer than 256, which is invalid."
1968 "el nom de tipus de lletra %s ocupa més de 256 caràcters, per tant no és "
1971 -#: ../../WINGs/wfontpanel.c:913
1972 +#: ../../WINGs/wfontpanel.c:868
1976 -#: ../../WINGs/wfontpanel.c:916
1977 +#: ../../WINGs/wfontpanel.c:871
1981 -#: ../../WINGs/wfontpanel.c:918
1982 +#: ../../WINGs/wfontpanel.c:873
1986 -#: ../../WINGs/wfontpanel.c:920
1987 +#: ../../WINGs/wfontpanel.c:875
1989 -msgstr "Itàlica inv"
1990 +msgstr "Itàlica rev"
1992 -#: ../../WINGs/wfontpanel.c:922
1993 +#: ../../WINGs/wfontpanel.c:877
1995 -msgstr "Obliqua inv"
1996 +msgstr "Obliqua rev"
1998 -#: ../../WINGs/wfontpanel.c:928
1999 +#: ../../WINGs/wfontpanel.c:883
2003 -#: ../../WINGs/widgets.c:419
2004 +#: ../../WINGs/widgets.c:415
2006 msgid "WINGs: could not load widget images file: %s"
2007 -msgstr "WINGs: no s'ha pogut carregar el fitxer d'imatges: %s"
2008 +msgstr "WINGs: no s'ha pogut carregar el fitxer d'imatges dels elements: %s"
2010 -#: ../../WINGs/widgets.c:772
2011 +#: ../../WINGs/widgets.c:763
2013 "could not load any fonts. Make sure your font installation and locale "
2014 "settings are correct."
2016 -"no s'ha pogut carregar cap font. Assegureu-vos que heu instal·lat i "
2017 -"configurat correctament les fonts i el local."
2018 +"no s'ha pogut carregar cap font. Assegureu-vos que l'instal·lació dels tipus "
2019 +"de lletra i la configuració del local és adquada."
2021 -#: ../../WINGs/wruler.c:192
2022 +#: ../../WINGs/wruler.c:189
2027 -#~ "Text antialiasing is enabled in the configuration but the X server "
2028 -#~ "doesn't have the required capabilities (missing RENDER extension). "
2029 -#~ "Disabling text antialiasing."
2031 -#~ "L'allisat de text està habilitat a la configuració però el servidor X no\n"
2032 -#~ "té la capacitat necessària (falta l'extensió RENDER) de manera que "
2034 -#~ "de text es deshabilitarà."
2035 Index: WINGs/po/sk.po
2036 ===================================================================
2037 RCS file: /cvsroot/wm/WINGs/po/sk.po,v
2038 retrieving revision 1.4
2039 retrieving revision 1.3
2041 --- WINGs/po/sk.po 2004/02/02 02:30:13 1.4
2042 +++ WINGs/po/sk.po 2001/12/20 16:16:09 1.3
2044 # Currently maintained by Jan "judas" Tomka <judas@linux.sk>
2047 -# WM-ver author email date
2048 -# 0.65.1 Jan "judas" Tomka <judas@linux.sk> Aug 08 2001
2049 -# 0.70.0 Jan "judas" Tomka <judas@linux.sk> Oct 15 2001
2050 -# 0.70.1 Jan "judas" Tomka <judas@linux.sk> Nov 02 2001
2051 -# 0.80.0 Jan "judas" Tomka <judas@linux.sk> Dec 20 2001
2052 -# 0.80.2 Jan "judas" Tomka <judas@linux.sk> Jan 31 2004
2053 +# WM-ver author email date
2054 +# 0.65.1 Jan "judas" Tomka <judas@linux.sk> Aug 08 2001
2055 +# 0.70.0 Jan "judas" Tomka <judas@linux.sk> Oct 15 2001
2056 +# 0.70.1 Jan "judas" Tomka <judas@linux.sk> Nov 02 2001
2057 +# 0.80.0 Jan "judas" Tomka <judas@linux.sk> Dec 20 2001
2061 "Project-Id-Version: WINGs 0.80.0\n"
2062 -"POT-Creation-Date: 2004-01-31 18:36+0100\n"
2063 +"POT-Creation-Date: 2001-12-20 03:50+0100\n"
2064 "PO-Revision-Date: 2001-12-20 04:00+0100\n"
2065 "Last-Translator: Jan \"judas\" Tomka <judas@linux.sk>\n"
2066 "Language-Team: Slovak <sk@li.org>\n"
2068 "Content-Type: text/plain; charset=ISO-8859-2\n"
2069 "Content-Transfer-Encoding: 8bit\n"
2071 -#: ../../WINGs/connection.c:467 ../../WINGs/connection.c:532
2072 -#: ../../WINGs/connection.c:575
2073 +#: ../../WINGs/connection.c:461 ../../WINGs/connection.c:526
2074 +#: ../../WINGs/connection.c:569
2075 msgid "Bad address-service-protocol combination"
2076 msgstr "Nesprávna kombinácia adresa-slu¾ba-protokol"
2079 msgid "Cannot get current host name"
2080 msgstr "Nemo¾no zisti» aktuálne meno poèítaèa"
2082 -#: ../../WINGs/proplist.c:91
2084 -msgid "syntax error in %s %s, line %i: %s"
2085 -msgstr "chyba syntaxe v %s %s, riadok %i: %s"
2087 #: ../../WINGs/proplist.c:150
2088 msgid "Only string or data is supported for a proplist dictionary key"
2089 msgstr "Pre kµúè slovníka proplist je podporovaný len re»azec alebo dáta"
2091 #: ../../WINGs/proplist.c:184 ../../WINGs/proplist.c:236
2092 #: ../../WINGs/proplist.c:394 ../../WINGs/proplist.c:474
2093 -#: ../../WINGs/proplist.c:1075 ../../WINGs/proplist.c:1127
2094 -#: ../../WINGs/proplist.c:1293 ../../WINGs/proplist.c:1372
2095 -#: ../../WINGs/proplist.c:1493 ../../WINGs/proplist.c:1540
2096 +#: ../../WINGs/proplist.c:1071 ../../WINGs/proplist.c:1123
2097 +#: ../../WINGs/proplist.c:1251 ../../WINGs/proplist.c:1330
2098 +#: ../../WINGs/proplist.c:1451 ../../WINGs/proplist.c:1498
2099 msgid "Used proplist functions on non-WMPropLists objects"
2100 msgstr "Pou¾itá proplist funkcia na iných ako WMPropLists objektoch"
2103 msgid "unterminated PropList data (missing hexdigit)"
2104 msgstr "neukonèené PropList dáta (chýbajúca hex èíslica)"
2106 -#: ../../WINGs/proplist.c:690 ../../WINGs/proplist.c:695
2107 +#: ../../WINGs/proplist.c:690
2108 msgid "non hexdigit character in PropList data"
2109 msgstr "v PropList dátach je znak, ktorý nie je hex èíslicou"
2111 -#: ../../WINGs/proplist.c:729
2112 +#: ../../WINGs/proplist.c:725
2113 msgid "unterminated PropList array"
2114 msgstr "neukonèené PropList pole"
2116 -#: ../../WINGs/proplist.c:737
2117 +#: ../../WINGs/proplist.c:733
2118 msgid "missing or unterminated PropList array"
2119 msgstr "chýbajúce alebo neukonèené PropList pole"
2121 -#: ../../WINGs/proplist.c:747
2122 +#: ../../WINGs/proplist.c:743
2123 msgid "could not get PropList array element"
2124 msgstr "nemo¾no zisti» prvok PropList poµa"
2126 -#: ../../WINGs/proplist.c:776
2127 +#: ../../WINGs/proplist.c:772
2128 msgid "unterminated PropList dictionary"
2129 msgstr "neukonèený PropList slovník"
2131 -#: ../../WINGs/proplist.c:793
2132 +#: ../../WINGs/proplist.c:789
2133 msgid "missing PropList dictionary key"
2134 msgstr "chýbajúci kµúè PropList slovníka"
2136 -#: ../../WINGs/proplist.c:795
2137 +#: ../../WINGs/proplist.c:791
2138 msgid "missing PropList dictionary entry key or unterminated dictionary"
2139 msgstr "chýbajúci kµúè polo¾ky PropList slovníka alebo neukonèený slovník"
2141 -#: ../../WINGs/proplist.c:803
2142 +#: ../../WINGs/proplist.c:799
2143 msgid "error parsing PropList dictionary key"
2144 msgstr "chyba pri parsovaní kµúèa PropList slovníka"
2146 -#: ../../WINGs/proplist.c:811
2147 +#: ../../WINGs/proplist.c:807
2148 msgid "missing = in PropList dictionary entry"
2149 msgstr "chýbajúce = v polo¾ke PropList slovníka"
2151 -#: ../../WINGs/proplist.c:819
2152 +#: ../../WINGs/proplist.c:815
2153 msgid "error parsing PropList dictionary entry value"
2154 msgstr "chyba pri parsovaní hodnoty polo¾ky PropList slovníka"
2156 -#: ../../WINGs/proplist.c:827
2157 +#: ../../WINGs/proplist.c:823
2158 msgid "missing ; in PropList dictionary entry"
2159 msgstr "chýbajúca ; v polo¾ke PropList slovníka"
2161 -#: ../../WINGs/proplist.c:888
2162 +#: ../../WINGs/proplist.c:884
2164 "was expecting a string, data, array or dictionary. If it's a string, try "
2165 "enclosing it with \"."
2166 @@ -145,179 +139,179 @@
2167 "oèakávaný bol re»azec, dáta, pole alebo slovník. Ak je to re»azec, skúste ho "
2168 "uzavrie» medzi \"."
2170 -#: ../../WINGs/proplist.c:892
2171 +#: ../../WINGs/proplist.c:888
2172 msgid "Comments are not allowed inside WindowMaker owned domain files."
2173 msgstr "Komentáre v doménových súboroch Window Makera nie sú povolené."
2175 -#: ../../WINGs/proplist.c:1563 ../../WINGs/proplist.c:1630
2176 +#: ../../WINGs/proplist.c:1521 ../../WINGs/proplist.c:1586
2177 msgid "extra data after end of property list"
2178 msgstr "prebytoèné dáta na konci property listu"
2180 -#: ../../WINGs/proplist.c:1606
2181 +#: ../../WINGs/proplist.c:1564
2183 msgid "could not get size for file '%s'"
2184 msgstr "nemo¾no zisti» veµkos» súboru '%s'"
2186 -#: ../../WINGs/proplist.c:1619
2187 +#: ../../WINGs/proplist.c:1576
2189 msgid "error reading from file '%s'"
2190 msgstr "chyba pri èítaní zo súboru '%s'"
2192 -#: ../../WINGs/proplist.c:1671
2193 +#: ../../WINGs/proplist.c:1627
2195 msgid "mkstemp (%s) failed"
2196 msgstr "chyba mkstemp (%s)"
2198 -#: ../../WINGs/proplist.c:1682
2199 +#: ../../WINGs/proplist.c:1638
2201 msgid "mktemp (%s) failed"
2202 msgstr "chyba mktemp(%s)"
2204 -#: ../../WINGs/proplist.c:1693
2205 +#: ../../WINGs/proplist.c:1649
2207 msgid "open (%s) failed"
2208 msgstr "chyba pri otváraní (%s)"
2210 -#: ../../WINGs/proplist.c:1700
2211 +#: ../../WINGs/proplist.c:1656
2213 msgid "writing to file: %s failed"
2214 msgstr "chyba pri zápise do súboru: %s"
2216 -#: ../../WINGs/proplist.c:1708
2217 +#: ../../WINGs/proplist.c:1664
2219 msgid "fclose (%s) failed"
2220 msgstr "chyba fclose (%s)"
2222 -#: ../../WINGs/proplist.c:1717
2223 +#: ../../WINGs/proplist.c:1673
2225 msgid "rename ('%s' to '%s') failed"
2226 msgstr "chyba rename ('%s' na '%s')"
2228 #. something happened with the file. just overwrite it
2229 -#: ../../WINGs/userdefaults.c:188 ../../WINGs/userdefaults.c:204
2230 +#: ../../WINGs/userdefaults.c:192 ../../WINGs/userdefaults.c:208
2232 msgid "cannot read domain from file '%s' when syncing"
2233 msgstr "nemo¾no èíta» doménu zo súboru '%s' pri synchronizácii"
2235 -#: ../../WINGs/wcolor.c:224 ../../WINGs/wcolor.c:236 ../../WINGs/wcolor.c:275
2236 -#: ../../WINGs/wcolor.c:316
2237 +#: ../../WINGs/wcolor.c:198 ../../WINGs/wcolor.c:211 ../../WINGs/wcolor.c:250
2238 +#: ../../WINGs/wcolor.c:291
2240 msgid "could not allocate %s color"
2241 msgstr "nemo¾no alokova» %s farbu"
2243 -#: ../../WINGs/wcolor.c:224
2244 +#: ../../WINGs/wcolor.c:198
2248 -#: ../../WINGs/wcolor.c:236
2249 +#: ../../WINGs/wcolor.c:211
2253 -#: ../../WINGs/wcolor.c:275
2254 +#: ../../WINGs/wcolor.c:250
2258 -#: ../../WINGs/wcolor.c:316
2259 +#: ../../WINGs/wcolor.c:291
2263 -#: ../../WINGs/wcolorpanel.c:420
2264 +#: ../../WINGs/wcolorpanel.c:415
2268 -#: ../../WINGs/wcolorpanel.c:610 ../../WINGs/wcolorpanel.c:2829
2269 +#: ../../WINGs/wcolorpanel.c:605 ../../WINGs/wcolorpanel.c:2824
2273 -#: ../../WINGs/wcolorpanel.c:612 ../../WINGs/wcolorpanel.c:688
2274 -#: ../../WINGs/wcolorpanel.c:721 ../../WINGs/wcolorpanel.c:755
2275 -#: ../../WINGs/wcolorpanel.c:815 ../../WINGs/wcolorpanel.c:849
2276 -#: ../../WINGs/wcolorpanel.c:883 ../../WINGs/wcolorpanel.c:918
2277 -#: ../../WINGs/wcolorpanel.c:2169 ../../WINGs/wcolorpanel.c:2831
2278 -#: ../../WINGs/wcolorpanel.c:2867 ../../WINGs/wcolorpanel.c:2903
2279 -#: ../../WINGs/wcolorpanel.c:3745
2280 +#: ../../WINGs/wcolorpanel.c:607 ../../WINGs/wcolorpanel.c:683
2281 +#: ../../WINGs/wcolorpanel.c:716 ../../WINGs/wcolorpanel.c:750
2282 +#: ../../WINGs/wcolorpanel.c:810 ../../WINGs/wcolorpanel.c:844
2283 +#: ../../WINGs/wcolorpanel.c:878 ../../WINGs/wcolorpanel.c:913
2284 +#: ../../WINGs/wcolorpanel.c:2164 ../../WINGs/wcolorpanel.c:2826
2285 +#: ../../WINGs/wcolorpanel.c:2862 ../../WINGs/wcolorpanel.c:2898
2286 +#: ../../WINGs/wcolorpanel.c:3746
2287 msgid "Color Panel: Could not allocate memory"
2288 msgstr "Panel farieb: Nemo¾no alokova» pamä»"
2290 -#: ../../WINGs/wcolorpanel.c:685 ../../WINGs/wcolorpanel.c:686
2291 +#: ../../WINGs/wcolorpanel.c:680 ../../WINGs/wcolorpanel.c:681
2295 -#: ../../WINGs/wcolorpanel.c:718 ../../WINGs/wcolorpanel.c:719
2296 +#: ../../WINGs/wcolorpanel.c:713 ../../WINGs/wcolorpanel.c:714
2300 -#: ../../WINGs/wcolorpanel.c:752 ../../WINGs/wcolorpanel.c:753
2301 +#: ../../WINGs/wcolorpanel.c:747 ../../WINGs/wcolorpanel.c:748
2305 -#: ../../WINGs/wcolorpanel.c:812 ../../WINGs/wcolorpanel.c:813
2306 +#: ../../WINGs/wcolorpanel.c:807 ../../WINGs/wcolorpanel.c:808
2310 -#: ../../WINGs/wcolorpanel.c:846 ../../WINGs/wcolorpanel.c:847
2311 +#: ../../WINGs/wcolorpanel.c:841 ../../WINGs/wcolorpanel.c:842
2315 -#: ../../WINGs/wcolorpanel.c:880 ../../WINGs/wcolorpanel.c:881
2316 +#: ../../WINGs/wcolorpanel.c:875 ../../WINGs/wcolorpanel.c:876
2320 -#: ../../WINGs/wcolorpanel.c:915 ../../WINGs/wcolorpanel.c:916
2321 +#: ../../WINGs/wcolorpanel.c:910 ../../WINGs/wcolorpanel.c:911
2325 -#: ../../WINGs/wcolorpanel.c:996
2326 +#: ../../WINGs/wcolorpanel.c:991
2330 -#: ../../WINGs/wcolorpanel.c:1026
2331 +#: ../../WINGs/wcolorpanel.c:1021
2335 -#: ../../WINGs/wcolorpanel.c:1032
2336 +#: ../../WINGs/wcolorpanel.c:1027
2337 msgid "New from File..."
2338 msgstr "Nová zo súboru..."
2340 -#: ../../WINGs/wcolorpanel.c:1033 ../../WINGs/wcolorpanel.c:1081
2341 -#: ../../WINGs/wcolorpanel.c:1098
2342 +#: ../../WINGs/wcolorpanel.c:1028 ../../WINGs/wcolorpanel.c:1076
2343 +#: ../../WINGs/wcolorpanel.c:1093
2345 msgstr "Premenova»..."
2347 -#: ../../WINGs/wcolorpanel.c:1034 ../../WINGs/wcolorpanel.c:1082
2348 -#: ../../WINGs/wcolorpanel.c:1099 ../../WINGs/wcolorpanel.c:3326
2349 +#: ../../WINGs/wcolorpanel.c:1029 ../../WINGs/wcolorpanel.c:1077
2350 +#: ../../WINGs/wcolorpanel.c:1094 ../../WINGs/wcolorpanel.c:3321
2354 -#: ../../WINGs/wcolorpanel.c:1035
2355 +#: ../../WINGs/wcolorpanel.c:1030
2359 -#: ../../WINGs/wcolorpanel.c:1036
2360 +#: ../../WINGs/wcolorpanel.c:1031
2361 msgid "New from Clipboard"
2362 msgstr "Nová z nástenky"
2364 -#: ../../WINGs/wcolorpanel.c:1057
2365 +#: ../../WINGs/wcolorpanel.c:1052
2369 -#: ../../WINGs/wcolorpanel.c:1074
2370 +#: ../../WINGs/wcolorpanel.c:1069
2374 -#: ../../WINGs/wcolorpanel.c:1080
2375 +#: ../../WINGs/wcolorpanel.c:1075
2379 -#: ../../WINGs/wcolorpanel.c:1090
2380 +#: ../../WINGs/wcolorpanel.c:1085
2384 -#: ../../WINGs/wcolorpanel.c:1097
2385 +#: ../../WINGs/wcolorpanel.c:1092
2389 -#: ../../WINGs/wcolorpanel.c:1236
2390 +#: ../../WINGs/wcolorpanel.c:1231
2393 "Color Panel: Could not create directory %s needed to store configurations"
2394 @@ -325,77 +319,77 @@
2395 "Panel farieb: Nemo¾no vytvori» adresár %s potrebný na ulo¾enie nastavení"
2397 #. Delete the file, it doesn't belong here
2398 -#: ../../WINGs/wcolorpanel.c:1242 ../../WINGs/wcolorpanel.c:3212
2399 -#: ../../WINGs/wcolorpanel.c:3216
2400 +#: ../../WINGs/wcolorpanel.c:1237 ../../WINGs/wcolorpanel.c:3207
2401 +#: ../../WINGs/wcolorpanel.c:3211
2403 msgstr "Chyba súboru"
2405 -#: ../../WINGs/wcolorpanel.c:1243
2406 +#: ../../WINGs/wcolorpanel.c:1238
2407 msgid "Could not create ColorPanel configuration directory"
2408 msgstr "Nemo¾no vytvori» konfiguraèný adresár panelu farieb"
2410 -#: ../../WINGs/wcolorpanel.c:1244 ../../WINGs/wcolorpanel.c:3213
2411 -#: ../../WINGs/wcolorpanel.c:3218 ../../WINGs/wcolorpanel.c:3245
2412 -#: ../../WINGs/wfilepanel.c:250 ../../WINGs/wfilepanel.c:650
2413 -#: ../../WINGs/wfilepanel.c:662 ../../WINGs/wfilepanel.c:763
2414 -#: ../../WINGs/wfilepanel.c:974 ../../WINGs/wfontpanel.c:751
2415 +#: ../../WINGs/wcolorpanel.c:1239 ../../WINGs/wcolorpanel.c:3208
2416 +#: ../../WINGs/wcolorpanel.c:3213 ../../WINGs/wcolorpanel.c:3240
2417 +#: ../../WINGs/wfilepanel.c:250 ../../WINGs/wfilepanel.c:647
2418 +#: ../../WINGs/wfilepanel.c:659 ../../WINGs/wfilepanel.c:760
2419 +#: ../../WINGs/wfilepanel.c:971 ../../WINGs/wfontpanel.c:709
2423 -#: ../../WINGs/wcolorpanel.c:1250 ../../WINGs/wcolorpanel.c:1286
2424 -#: ../../WINGs/wcolorpanel.c:1304
2425 +#: ../../WINGs/wcolorpanel.c:1245 ../../WINGs/wcolorpanel.c:1281
2426 +#: ../../WINGs/wcolorpanel.c:1299
2427 msgid "Color Panel: Could not find file"
2428 msgstr "Panel farieb: Nemo¾no nájs» súbor"
2430 -#: ../../WINGs/wcolorpanel.c:1491 ../../WINGs/wcolorpanel.c:1556
2431 -#: ../../WINGs/wcolorpanel.c:1620
2432 +#: ../../WINGs/wcolorpanel.c:1486 ../../WINGs/wcolorpanel.c:1551
2433 +#: ../../WINGs/wcolorpanel.c:1615
2434 msgid "Color Panel: X failed request"
2435 msgstr "Panel farieb: chyba po¾iadavky X"
2437 -#: ../../WINGs/wcolorpanel.c:2865
2438 +#: ../../WINGs/wcolorpanel.c:2860
2442 -#: ../../WINGs/wcolorpanel.c:2901
2443 +#: ../../WINGs/wcolorpanel.c:2896
2447 -#: ../../WINGs/wcolorpanel.c:3151
2448 +#: ../../WINGs/wcolorpanel.c:3146
2449 msgid "Open Palette"
2450 msgstr "Otvori» paletu"
2452 -#: ../../WINGs/wcolorpanel.c:3213
2453 +#: ../../WINGs/wcolorpanel.c:3208
2454 msgid "Invalid file format !"
2455 msgstr "Nesprávny súborový formát!"
2457 -#: ../../WINGs/wcolorpanel.c:3215
2458 +#: ../../WINGs/wcolorpanel.c:3210
2460 msgid "can't remove file %s"
2461 msgstr "namo¾no odstráni» súbor %s"
2463 -#: ../../WINGs/wcolorpanel.c:3217
2464 +#: ../../WINGs/wcolorpanel.c:3212
2465 msgid "Couldn't remove file from Configuration Directory !"
2466 msgstr "Nemo¾no odstráni» súbor z konfiguraèného adresára!"
2468 -#: ../../WINGs/wcolorpanel.c:3244
2469 +#: ../../WINGs/wcolorpanel.c:3239
2473 -#: ../../WINGs/wcolorpanel.c:3244
2474 +#: ../../WINGs/wcolorpanel.c:3239
2475 msgid "Rename palette to:"
2476 msgstr "Premenova» paletu:"
2478 -#: ../../WINGs/wcolorpanel.c:3245 ../../WINGs/wfilepanel.c:259
2479 -#: ../../WINGs/wfilepanel.c:662 ../../WINGs/wfilepanel.c:763
2480 +#: ../../WINGs/wcolorpanel.c:3240 ../../WINGs/wfilepanel.c:259
2481 +#: ../../WINGs/wfilepanel.c:659 ../../WINGs/wfilepanel.c:760
2485 #. Careful, this palette exists already
2486 -#: ../../WINGs/wcolorpanel.c:3261 ../../WINGs/wfilepanel.c:763
2487 +#: ../../WINGs/wcolorpanel.c:3256 ../../WINGs/wfilepanel.c:760
2491 -#: ../../WINGs/wcolorpanel.c:3262
2492 +#: ../../WINGs/wcolorpanel.c:3257
2494 "Palette already exists !\n"
2496 @@ -405,24 +399,24 @@
2500 -#: ../../WINGs/wcolorpanel.c:3262 ../../WINGs/wcolorpanel.c:3326
2501 +#: ../../WINGs/wcolorpanel.c:3257 ../../WINGs/wcolorpanel.c:3321
2505 -#: ../../WINGs/wcolorpanel.c:3262 ../../WINGs/wcolorpanel.c:3326
2506 +#: ../../WINGs/wcolorpanel.c:3257 ../../WINGs/wcolorpanel.c:3321
2510 -#: ../../WINGs/wcolorpanel.c:3294
2511 +#: ../../WINGs/wcolorpanel.c:3289
2513 msgid "Couldn't rename palette %s to %s\n"
2514 msgstr "Nemo¾no premenova» paletu %s na %s\n"
2516 -#: ../../WINGs/wcolorpanel.c:3320
2517 +#: ../../WINGs/wcolorpanel.c:3315
2518 msgid "This will permanently remove the palette "
2519 msgstr "Paleta bude natrvalo zmazaná"
2521 -#: ../../WINGs/wcolorpanel.c:3323
2522 +#: ../../WINGs/wcolorpanel.c:3318
2526 @@ -432,27 +426,27 @@
2528 "Ste si istý, ¾e chcete odstráni» túto paletu?"
2530 -#: ../../WINGs/wcolorpanel.c:3348
2531 +#: ../../WINGs/wcolorpanel.c:3343
2533 msgid "Couldn't remove palette %s\n"
2534 msgstr "Nemo¾no odstráni» paletu %s\n"
2536 -#: ../../WINGs/wcolorpanel.c:3647
2537 +#: ../../WINGs/wcolorpanel.c:3648
2539 msgid "Could not open %s"
2540 msgstr "Nemo¾no otvori» %s"
2542 -#: ../../WINGs/wcolorpanel.c:3654
2543 +#: ../../WINGs/wcolorpanel.c:3655
2545 msgid "Could not create %s"
2546 msgstr "Nemo¾no vytvori» %s"
2548 -#: ../../WINGs/wcolorpanel.c:3665
2549 +#: ../../WINGs/wcolorpanel.c:3666
2551 msgid "Write error on file %s"
2552 msgstr "Chyba zápisu do súboru %s"
2554 -#: ../../WINGs/wcolorpanel.c:3710
2555 +#: ../../WINGs/wcolorpanel.c:3711
2556 msgid "Color Panel: Color unspecified"
2557 msgstr "Panel farieb: Ne¹pecifikovaná farba"
2559 @@ -468,252 +462,207 @@
2563 -#: ../../WINGs/wfilepanel.c:565
2564 +#: ../../WINGs/wfilepanel.c:562
2566 msgid "WINGs: could not open directory %s\n"
2567 msgstr "WINGs: nemo¾no otvori» adresár %s\n"
2569 -#: ../../WINGs/wfilepanel.c:583
2570 +#: ../../WINGs/wfilepanel.c:580
2572 msgid "WINGs: could not stat %s\n"
2573 msgstr "WINGs: nemo¾no zisti» informácie o %s\n"
2575 -#: ../../WINGs/wfilepanel.c:650 ../../WINGs/wfilepanel.c:973
2576 -#: ../../WINGs/wfontpanel.c:750
2577 +#: ../../WINGs/wfilepanel.c:647 ../../WINGs/wfilepanel.c:970
2578 +#: ../../WINGs/wfontpanel.c:708
2582 -#: ../../WINGs/wfilepanel.c:661
2583 +#: ../../WINGs/wfilepanel.c:658
2584 msgid "Create Directory"
2585 msgstr "Vytvori» adresár"
2587 -#: ../../WINGs/wfilepanel.c:662
2588 +#: ../../WINGs/wfilepanel.c:659
2589 msgid "Enter directory name"
2590 msgstr "Meno adresára"
2592 -#: ../../WINGs/wfilepanel.c:698 ../../WINGs/wfilepanel.c:737
2593 -#: ../../WINGs/wfilepanel.c:768 ../../WINGs/wfilepanel.c:796
2594 +#: ../../WINGs/wfilepanel.c:695 ../../WINGs/wfilepanel.c:734
2595 +#: ../../WINGs/wfilepanel.c:765 ../../WINGs/wfilepanel.c:793
2596 msgid "Permission denied."
2597 msgstr "Prístup zamietnutý."
2599 -#: ../../WINGs/wfilepanel.c:701
2600 +#: ../../WINGs/wfilepanel.c:698
2602 msgid "'%s' already exists."
2603 msgstr "'%s' u¾ existuje"
2605 -#: ../../WINGs/wfilepanel.c:704
2606 +#: ../../WINGs/wfilepanel.c:701
2607 msgid "Path does not exist."
2608 msgstr "Cesta neexistuje."
2610 -#: ../../WINGs/wfilepanel.c:734 ../../WINGs/wfilepanel.c:793
2611 +#: ../../WINGs/wfilepanel.c:731 ../../WINGs/wfilepanel.c:790
2613 msgid "'%s' does not exist."
2614 msgstr "'%s' neexistuje."
2616 -#: ../../WINGs/wfilepanel.c:741 ../../WINGs/wfilepanel.c:800
2617 +#: ../../WINGs/wfilepanel.c:738 ../../WINGs/wfilepanel.c:797
2618 msgid "Insufficient memory available."
2619 msgstr "Nedostatok pamäti."
2621 -#: ../../WINGs/wfilepanel.c:745 ../../WINGs/wfilepanel.c:804
2622 +#: ../../WINGs/wfilepanel.c:742 ../../WINGs/wfilepanel.c:801
2624 msgid "'%s' is on a read-only filesystem."
2625 msgstr "'%s' je na súborovom systéme len pre èítanie."
2627 -#: ../../WINGs/wfilepanel.c:748 ../../WINGs/wfilepanel.c:780
2628 -#: ../../WINGs/wfilepanel.c:807
2629 +#: ../../WINGs/wfilepanel.c:745 ../../WINGs/wfilepanel.c:777
2630 +#: ../../WINGs/wfilepanel.c:804
2632 msgid "Can not delete '%s'."
2633 msgstr "Nemo¾no odstráni» '%s'."
2635 -#: ../../WINGs/wfilepanel.c:755
2636 +#: ../../WINGs/wfilepanel.c:752
2638 msgid "Delete directory %s ?"
2639 msgstr "Odstráni» adresár %s?"
2641 -#: ../../WINGs/wfilepanel.c:759
2642 +#: ../../WINGs/wfilepanel.c:756
2644 msgid "Delete file %s ?"
2645 msgstr "Odstráni» súbor %s?"
2647 -#: ../../WINGs/wfilepanel.c:771
2648 +#: ../../WINGs/wfilepanel.c:768
2650 msgid "Directory '%s' does not exist."
2651 msgstr "Adresár '%s' neexistuje."
2653 -#: ../../WINGs/wfilepanel.c:774
2654 +#: ../../WINGs/wfilepanel.c:771
2656 msgid "Directory '%s' is not empty."
2657 msgstr "Adresár '%s' nie je prázdny."
2659 -#: ../../WINGs/wfilepanel.c:777
2660 +#: ../../WINGs/wfilepanel.c:774
2662 msgid "Directory '%s' is busy."
2663 msgstr "Adresár '%s' je pou¾ívaný."
2665 -#: ../../WINGs/wfilepanel.c:790
2666 +#: ../../WINGs/wfilepanel.c:787
2668 msgid "'%s' is a directory."
2669 msgstr "'%s' je adresár."
2671 -#: ../../WINGs/wfilepanel.c:832
2672 +#: ../../WINGs/wfilepanel.c:829
2674 msgid "An error occured browsing '%s'."
2675 msgstr "Pri prehliadaní '%s' nastala chyba."
2677 -#: ../../WINGs/wfilepanel.c:836
2678 +#: ../../WINGs/wfilepanel.c:833
2680 msgid "'%s' is not a directory."
2681 msgstr "'%s' nie je adresár."
2683 -#: ../../WINGs/wfilepanel.c:973
2684 +#: ../../WINGs/wfilepanel.c:970
2685 msgid "File does not exist."
2686 msgstr "Súbor neexistuje."
2688 -#: ../../WINGs/wfont.c:324 ../../WINGs/wfont.c:344
2690 -msgid "could not load font %s."
2691 -msgstr "nemo¾no naèíta» font %s."
2693 -#: ../../WINGs/wfont.c:375 ../../WINGs/wfont.c:420 ../../WINGs/wfont.c:475
2694 -#: ../../WINGs/wfont.c:1337 ../../WINGs/wfont.c:1398 ../../WINGs/wfont.c:1469
2697 -"Conversion to widechar failed (possible invalid multibyte sequence): '%s':"
2700 -"Konverzia do widechar zlyhala (mo¾no nesprávna multibyte sekvencia): '%s':"
2703 -#. // remove warning later. or maybe not
2704 -#: ../../WINGs/wfont.c:591 ../../WINGs/wfont.c:1568
2705 +#: ../../WINGs/wfont.c:129
2707 -msgid "Invalid font specification: '%s'\n"
2708 -msgstr "Chybná ¹pecifikácia fontu: '%s'\n"
2710 -#: ../../WINGs/wfont.c:770 ../../WINGs/wfont.c:780
2712 -msgid "Invalid size specification '%s' in %s. Using default %d\n"
2713 -msgstr "Chybná ¹pecifikácia veµkosti '%s' v %s. Pou¾ije sa implicitná %d\n"
2715 -#: ../../WINGs/wfont.c:824
2717 msgid "the following character sets are missing in %s:"
2718 msgstr "nasledujúce sady znakov chýbajú v %s:"
2720 -#: ../../WINGs/wfont.c:830
2721 +#: ../../WINGs/wfont.c:136
2724 "the string \"%s\" will be used in place of any characters from those sets."
2725 msgstr "re»azec \"%s\" bude pou¾itý namiesto znakov z týchto sád."
2727 -#. is arial a good fallback for multibyte?
2728 -#: ../../WINGs/wfont.c:1232 ../../WINGs/wfont.c:1247
2730 -msgid "could not load font %s. Trying arial."
2731 -msgstr "nemo¾no naèíta» font %s. Skú¹a sa naèíta» arial."
2733 -#: ../../WINGs/wfont.c:1239
2734 -msgid "could not load antialiased font set. Reverting to standard font sets."
2735 -msgstr "nemo¾no naèíta» antialiasovanú sadu fontov. Spä» k ¹tandardnej sade fontov."
2737 -#: ../../WINGs/wfont.c:1242
2739 -msgid "could not load FontSet %s. Trying fixed."
2740 -msgstr "nemo¾no naèíta» sadu fontov %s. Skú¹a sa naèíta» fixed."
2742 -#: ../../WINGs/wfont.c:1254
2743 -msgid "could not load antialiased fonts. Reverting to normal fonts."
2744 -msgstr "nemo¾no zavies» antialiasovaný font. Návrat k normálnemu fontu."
2746 -#: ../../WINGs/wfont.c:1257 ../../WINGs/wfont.c:1268
2747 +#: ../../WINGs/wfont.c:282 ../../WINGs/wfont.c:318
2749 -msgid "could not load font %s. Trying fixed."
2750 +msgid "could not load font set %s. Trying fixed."
2751 msgstr "nemo¾no naèíta» font %s. Skú¹a sa naèíta» fixed."
2753 -#: ../../WINGs/wfont.c:1262
2754 +#: ../../WINGs/wfont.c:288 ../../WINGs/wfont.c:324
2756 -msgid "could not load font set %s. Trying fixed."
2757 +msgid "could not load font %s. Trying fixed."
2758 msgstr "nemo¾no naèíta» font %s. Skú¹a sa naèíta» fixed."
2760 -#: ../../WINGs/wfont.c:1272
2761 +#: ../../WINGs/wfont.c:292 ../../WINGs/wfont.c:328
2762 msgid "could not load fixed font!"
2763 msgstr "nemo¾no naèíta» font fixed!"
2765 -#: ../../WINGs/wfont.c:1520
2766 +#: ../../WINGs/wfont.c:423
2768 msgid "font description %s is too large."
2769 msgstr "popis fontu %s je príli¹ veµký."
2771 -#: ../../WINGs/wfontpanel.c:235
2772 +#: ../../WINGs/wfontpanel.c:205
2776 -#: ../../WINGs/wfontpanel.c:241
2777 +#: ../../WINGs/wfontpanel.c:211
2781 -#: ../../WINGs/wfontpanel.c:252
2782 +#: ../../WINGs/wfontpanel.c:222
2786 -#: ../../WINGs/wfontpanel.c:263
2787 +#: ../../WINGs/wfontpanel.c:233
2791 -#: ../../WINGs/wfontpanel.c:282
2792 +#: ../../WINGs/wfontpanel.c:252
2796 -#: ../../WINGs/wfontpanel.c:288
2797 +#: ../../WINGs/wfontpanel.c:257
2801 -#: ../../WINGs/wfontpanel.c:751
2802 +#: ../../WINGs/wfontpanel.c:709
2803 msgid "Could not retrieve font list"
2804 msgstr "Nemo¾no obdr¾a» zoznam fontov"
2806 -#: ../../WINGs/wfontpanel.c:765
2807 +#: ../../WINGs/wfontpanel.c:721
2809 msgid "font name %s is longer than 256, which is invalid."
2810 msgstr "meno fontu %s je dlh¹ie ako 256, èo je nesprávne."
2812 -#: ../../WINGs/wfontpanel.c:913
2813 +#: ../../WINGs/wfontpanel.c:868
2817 -#: ../../WINGs/wfontpanel.c:916
2818 +#: ../../WINGs/wfontpanel.c:871
2822 -#: ../../WINGs/wfontpanel.c:918
2823 +#: ../../WINGs/wfontpanel.c:873
2827 -#: ../../WINGs/wfontpanel.c:920
2828 +#: ../../WINGs/wfontpanel.c:875
2830 msgstr "obr. kurzíva"
2832 -#: ../../WINGs/wfontpanel.c:922
2833 +#: ../../WINGs/wfontpanel.c:877
2837 -#: ../../WINGs/wfontpanel.c:928
2838 +#: ../../WINGs/wfontpanel.c:883
2842 -#: ../../WINGs/widgets.c:419
2843 +#: ../../WINGs/widgets.c:415
2845 msgid "WINGs: could not load widget images file: %s"
2846 msgstr "WINGs: nemo¾no naèíta» súbor s obrázkami pre widgety: %s"
2848 -#: ../../WINGs/widgets.c:772
2849 +#: ../../WINGs/widgets.c:761
2851 -"could not load any fonts. Make sure your font installation and locale "
2852 +"could not load any fonts. Make sure your font installationand locale "
2853 "settings are correct."
2855 "nemo¾no naèíta» ¾iadny font. Ubezpeète sa, ¾e in¹talácia fontov a miestne "
2856 "nastavenia sú v poriadku."
2858 -#: ../../WINGs/wruler.c:192
2859 +#: ../../WINGs/wruler.c:189
2862 Index: WINGs/python/README
2863 ===================================================================
2864 RCS file: /cvsroot/wm/WINGs/python/README,v
2865 retrieving revision 1.2
2866 retrieving revision 1.1
2868 --- WINGs/python/README 2004/01/15 20:36:48 1.2
2869 +++ WINGs/python/README 2002/12/01 06:01:08 1.1
2872 -This is a python wrapper for the WINGs library, that can be used to write python
2873 -based programs with WINGs-based graphic interfaces.
2874 +This is a python wrapper for the WINGs library. With it you can write python
2875 +based programs which will have WINGs based graphic interfaces.
2877 This module in not built by default. To build it you need python2.1 or later
2878 and swig-1.3.14 or later.
2880 To build it, first compile and install WINGs. after that run 'make' in this
2881 directory. 'make install' will install the python module into the python tree.
2883 -run test.py or WINGs.py for an example.
2884 +run test.py or even WINGs.py for an example.
2886 -the code is not finished yet and may fail to work as expected in some cases.
2887 +the code is not yet finished and probably won't do everything you expect it
2890 Note: currently the module expects WINGs installed to build. it won't take
2891 the WINGs libraries and header files from the source tree. You need to
2892 install WINGs first. Even if an old version of WINGs is already installed,
2893 -you still need to install the newly built WINGs, else the python module will
2894 -be built against the old version.
2895 +you still need to nstall the newly built WINGs, else the python module will
2896 +be built against the old version
2898 Index: WINGs/python/WINGs.py
2899 ===================================================================
2900 RCS file: /cvsroot/wm/WINGs/python/WINGs.py,v
2901 retrieving revision 1.4
2902 retrieving revision 1.3
2904 --- WINGs/python/WINGs.py 2004/01/15 20:36:48 1.4
2905 +++ WINGs/python/WINGs.py 2003/02/20 23:02:28 1.3
2907 raise Error, "'%s' is a read-only WMScreen attribute" % name
2908 self.__dict__[name] = value
2910 - def __delattr__(self, name):
2911 - if name in self.__readonly:
2912 - #raise AttributeError, "'%s' attribute cannot be deleted from WMScreen instance" % name
2913 - raise Error, "'%s' attribute cannot be deleted from WMScreen instance" % name
2915 - del(self.__dict__[name])
2917 - raise AttributeError, "%s instance has no attribute '%s'" % \
2918 - (self.__class__.__name__, name)
2921 wings.pyWMScreenMainLoop(self._o)
2923 Index: WINGs/python/setup.py
2924 ===================================================================
2925 RCS file: /cvsroot/wm/WINGs/python/setup.py,v
2926 retrieving revision 1.3
2927 retrieving revision 1.2
2929 --- WINGs/python/setup.py 2004/01/15 20:36:48 1.3
2930 +++ WINGs/python/setup.py 2002/12/20 17:47:32 1.2
2933 ## Get the include dirs
2934 wings = os.popen("get-wings-flags --cflags", "r")
2935 -flags = wings.read().split()
2936 +lines = [x.strip() for x in wings.readlines()]
2937 +flags = reduce(lambda x,y: x+y, [x.split() for x in lines if x])
2938 include_dirs = [x[2:] for x in flags]
2939 #include_dirs += [".."]
2942 ## Get the library dirs
2943 wings = os.popen("get-wings-flags --ldflags", "r")
2944 -flags = wings.read().split()
2945 +lines = [x.strip() for x in wings.readlines()]
2946 +flags = reduce(lambda x,y: x+y, [x.split() for x in lines if x])
2947 library_dirs = [x[2:] for x in flags]
2948 #library_dirs += [".."]
2951 ## Get the libraries
2952 wings = os.popen("get-wings-flags --libs", "r")
2953 -flags = wings.read().split()
2954 +lines = [x.strip() for x in wings.readlines()]
2955 +flags = reduce(lambda x,y: x+y, [x.split() for x in lines if x])
2956 libraries = [x[2:] for x in flags]