diff --git a/AUTHORS b/AUTHORS index 68c7fe93..bd8e170a 100644 --- a/AUTHORS +++ b/AUTHORS @@ -1,4 +1,4 @@ -Bjoern Giesler +Information about locale translators is at src/po/README and Library/WindowMaker/README Many thanks to the following people who have contributed @@ -108,7 +108,7 @@ Marcelo E. Magallon CPP search path improvement, man pages Tim Malone -bug fix +bug fix, jpeg bug fix MANOME Tomonori I18N bug fixes and japanese locale @@ -155,6 +155,9 @@ REDUCE_APPICON/single-icon Chong Shang Shan flipping iconification animation +Paul D. Smith +SunOS portability, configure fixes + Phillip Smith FTP, WWW, mailing list site provider/maintainer (Net logistics) diff --git a/BUGS b/BUGS index 18cc6881..9da4313f 100644 --- a/BUGS +++ b/BUGS @@ -11,3 +11,9 @@ to the Pixmap (to save memory and drop bug compatibility). - host information is not saved/honored by the dock or save session stuff. It should at least check if the host is the local machine and only save it in the session/allow docking it if yes. +- the SHELL environment variable support in the apps menu was removed +because of a problem with tcsh. If ~/.tcshrc contains "stty erase ^H", +it will block and the cmd will not be executed. +- mouse grab being done in client window (in wWindowResetMouseGrabs()) +instead of the frame window. If grab is done in frame, titlebar buttons +dont work well diff --git a/ChangeLog b/ChangeLog index e03f33d5..f4314942 100644 --- a/ChangeLog +++ b/ChangeLog @@ -22,6 +22,24 @@ Changes since version 0.20.2: - changed order of link flags in Makefiles - fixed problem with random window placement - fixed multiple window selection for multiheads +- grayscale and 8bit jpeg support +- fixed client restoration in restart/exit in multiheads +- started session management code +- fixed problem with docked programs that have names with spaces +- updated WPrefs.app for iconificationstyle +- added -static command line option +- put redundant NoWindowOverDock +- fixed overlapping clip icon bug +- extended window level code +- added KeepOnBottom hint +- added iconification style to WPrefs.app +- fixed crash with bad value in defaults file +- changed icon stacking code +- added primitive support for 5 button mouse (for switching workspaces) +- fixed BadAccess and crash on programs that do XGrabButton +- fixed bug with rootmenu Exec not working when stty is called from ~/.tcshrc +- fixed bug with Move menu and sloppy focus +- temporarily removed SHELL support in apps menu Changes since version 0.20.1: ............................. diff --git a/FAQ b/FAQ index 0628acd5..903eddf3 100644 --- a/FAQ +++ b/FAQ @@ -28,6 +28,7 @@ Installation - How do I switch CDE's windowmanager to use WindowMaker? - Do I need to rerun wmaker.inst with every new version of WindowMaker? - When I run wmaker it quits complaing about something __register_frame_info. + - The libxyz image format library is not detected. Usage - What is an appicon? @@ -74,6 +75,7 @@ Other Applications - How do I get different icons for rxvt's (or xterms) running different programs? - How do I allow Alt+# to work in an rxvt session? (with irc for example) + - When I use Netscape with Window Maker it crashes. Programming - How do I get a normal X application to produce an appicon? @@ -387,6 +389,21 @@ When I run wmaker it quits complaing about something __register_frame_info. This seems to be related to pgcc, gcc-2.8.0 or something. Try using gcc 2.7.x to compile wmaker. + +The libxyz image format library is not detected. +------------------------------------------------ + +Always look at config.log and see why configure isn't detecting the library. +If that doens't help you much, check the following: + +- if there is only one set of libraries in your system (look in +/usr/openwin/lib, check if you have different versions of the library etc) +- if the header file(s) of that library are installed (make sure you +have installed the devel packages of that library) +- supply the path of that library to configure: + ./configure --with-gfx-libs=/the/path/to/the/lib + + ### -=-=-=- @@ -844,6 +861,19 @@ Click 'Save' and 'Apply' and you should be able to run your session without the shortcuts. +When I use Netscape with Window Maker it crashes +------------------------------------------------ + +(the problem where you get a message with something like _MOTIF_DRAG_WINDOW +was deleted or something) + +You are probably are running a glibc system and using libc5 version of +Netscape. To solve this, upgrade Netscape to a glibc version. + +BTW: blaming wmaker for something like this is nonsensical. It makes as +much sense as blaming the pizza you ate yesterday for a disentery +your dog is having. + -=-=-=-=-=-=- Programming: diff --git a/INSTALL b/INSTALL index 5e9416b2..b62d9aa5 100644 --- a/INSTALL +++ b/INSTALL @@ -25,6 +25,7 @@ SUPPORTED PLATFORMS - DEC Alpha/Digital UNIX 4.x - XFree86 / OS/2 - Corel NetWinder +- SunOS 4.x Patches to make it work on other platforms are welcome. @@ -282,11 +283,6 @@ WPrefs.app Example: ./configure --prefix=/home/jshmoe --with-appspath=/home/jshmoe/GNUstep/Apps -If you use national language support, you must also supply the --with-nlsdir -option, as: - -./configure --prefix=/home/jshmoe --with-appspath=/home/jshmoe/GNUstep/Apps \ - --with-nlsdir=/home/jshmoe/lib/locale Then make /home/jshmoe/bin be included in your search path and run bin/wmaker.inst diff --git a/Install b/Install index 56c21b95..92b57343 100755 --- a/Install +++ b/Install @@ -40,7 +40,8 @@ echo "NOTE: If this script fails, read the INSTALL file and" echo "install by hand." echo echo "Please read the INSTALL and FAQ files before e-mailing " -echo "questions." +echo "questions. (we are lazy to reply questions already answered " +echo "there as much as you are lazy to read these ;) " perai if test "$USER" != "root"; then diff --git a/NEWS b/NEWS index 14ae596f..9f571fef 100644 --- a/NEWS +++ b/NEWS @@ -5,6 +5,39 @@ NEWS for veteran Window Maker users --- 0.20.3 +Icon (miniwindow) stacking +-------------------------- + +If you want miniwindows to reside under normal windows, edit +wconfig.h and change WNormalLevel (just grep for it) to +WDesktopLevel + + +5 Button Mouse +-------------- + +If you have a 5 button mouse and want to give some utility for +the extra 2 buttons, edit the appropriate line in src/wconfig.h +Clicking Button4 in the root window will switch you to the previous +workspace and Button5 will do that for the next. + + +Option Changes +-------------- + +put NoWindowOverDock back + +KeepOnBottom window attribute + + +-static command line option +--------------------------- + +wmaker -static will start Window Maker in static mode. This will +prevent wmaker from checking or making any configuration changes. +That makes it possible to run wmaker before running wmaker.inst + + Hysteresis for menu item selection ---------------------------------- diff --git a/README b/README index 73c593dc..f5ddd553 100644 --- a/README +++ b/README @@ -51,6 +51,8 @@ Documentation in the directories. * INSTALL has installation instructions and some troubleshooting tips. +You're meant to read it before installing. it was not written just to +fill up space in the package... * FAQ: Frequently Asked Questions. READ IT!!! FAQ.I18N is for internationalization related questions. @@ -123,6 +125,9 @@ If you got a problem, ask there (after reading the docs, of course). The people there is more likely to be able to answer your questions than we are. For bug reports use the BUGFORM. +If you have a problem with a precompiled version of Window Maker +(rpm, deb etc), first ask the person who made the package. + IMPORTANT NOTE: when asking for help (in the mailing list or to the developerts, directly) *always* send information about the system you are using. You can use the system information section at the end of BUGFORM as a @@ -248,14 +253,17 @@ The file named typescript will contain the backtrace. -Copyrights -========== +Copyrights & Disclaimers +======================== Window Maker is copyrighted by Alfredo K. Kojima and is licensed through the GNU General Public License. Read the COPYING file for the complete license. NeXT, OpenStep and NEXTSTEP are a trademarks of NeXT Computer, Inc. +The authors reserve the right to make changes in the software without prior +notice. + Authors ======= diff --git a/TODO b/TODO index ec735250..f2cc0859 100644 --- a/TODO +++ b/TODO @@ -9,6 +9,8 @@ Do ASAP: - make unhide app map windows in the same stacking order they were before hiding - blink border of clients with UrgencyHint set between red and black +- finish session stuff +- order window list menu by workspace Need to do: =========== @@ -30,8 +32,9 @@ Need to do: - remake internal string processing to use wchar? unicode? - -stateprefix cmd arg to specify sufix for WMState domain (multiple instance support) -- R6 style session management (or something to make wmaker compatible/aware - of it) +- GNOME stuff +- add new file for stuff like default commands and dnd commands for +docked apps, balloons for the dock etc Maybe some day: diff --git a/WINGs/error.c b/WINGs/error.c index a6e7abad..a873b3d0 100644 --- a/WINGs/error.c +++ b/WINGs/error.c @@ -27,6 +27,25 @@ #include #include +#if !defined(HAVE_STRERROR) && defined(BSD) +#define HAVE_STRERROR +char * +strerror(int errnum) +{ + extern int errno, sys_nerr; +#ifndef __DECC + extern char *sys_errlist[]; +#endif + static char buf[] = "Unknown error 12345678901234567890"; + + if (errno < sys_nerr) + return sys_errlist[errnum]; + + sprintf (buf, "Unknown error %d", errnum); + return buf; +} +#endif + extern char *_WINGS_progname; diff --git a/WINGs/userdefaults.c b/WINGs/userdefaults.c index 2f61cbf5..74f108f0 100644 --- a/WINGs/userdefaults.c +++ b/WINGs/userdefaults.c @@ -166,7 +166,13 @@ WMGetStandardUserDefaults(void) sharedUserDefaults = defaults; /* set to save changes in defaults when program is exited */ + + +#if !defined(HAVE_ATEXIT) && defined(HAVE_ON_EXIT) + on_exit(saveDefaultsChanges,0); +#else atexit(saveDefaultsChanges); +#endif } return sharedUserDefaults; diff --git a/WINGs/wbrowser.c b/WINGs/wbrowser.c index cc966dd4..b81afe8e 100644 --- a/WINGs/wbrowser.c +++ b/WINGs/wbrowser.c @@ -436,10 +436,11 @@ paintItem(WMList *lPtr, Drawable d, char *text, int state, WMRect *rect) else XClearArea(scr->display, d, x, y, width, height, False); - if (text) - W_PaintText(view, d, scr->normalFont, x+4, y, width, + if (text) { + W_PaintText(view, d, scr->normalFont, x+4, y, width, WALeft, W_GC(scr->black), False, text, strlen(text)); - + } + if (state & WLDSIsBranch) { XDrawLine(scr->display, d, W_GC(scr->darkGray), x+width-11, y+3, x+width-6, y+height/2); diff --git a/WINGs/wtextfield.c b/WINGs/wtextfield.c index d74518b4..5ececb23 100644 --- a/WINGs/wtextfield.c +++ b/WINGs/wtextfield.c @@ -839,7 +839,7 @@ handleTextFieldActionEvents(XEvent *event, void *data) event->xbutton.x); paintTextField(tPtr); } - if (event->xbutton.button == Button2) { + if (event->xbutton.button == Button2 && tPtr->flags.enabled) { char *text; text = W_GetTextSelection(tPtr->view->screen, XA_PRIMARY); diff --git a/WINGs/wwindow.c b/WINGs/wwindow.c index bb5cb36c..3eaffc06 100644 --- a/WINGs/wwindow.c +++ b/WINGs/wwindow.c @@ -330,7 +330,7 @@ setSizeHints(WMWindow *win) static void writeGNUstepWMAttr(WMScreen *scr, Window window, GNUstepWMAttributes *attr) { - CARD32 data[9]; + unsigned long data[9]; /* handle idiot compilers where array of CARD32 != struct of CARD32 */ data[0] = attr->flags; diff --git a/WPrefs.app/Icons.c b/WPrefs.app/Icons.c index bf262407..a90711d8 100644 --- a/WPrefs.app/Icons.c +++ b/WPrefs.app/Icons.c @@ -44,6 +44,9 @@ typedef struct _Panel { WMButton *verB; WMButton *horB; + WMFrame *animF; + WMButton *animB[4]; + WMFrame *optF; WMButton *arrB; WMButton *omnB; @@ -133,7 +136,18 @@ showData(_Panel *panel) i = 0; else if (i>9) i = 9; - WMSetPopUpButtonSelectedItem(panel->sizeP, i); + WMSetPopUpButtonSelectedItem(panel->sizeP, i); + + str = GetStringForKey("IconificationStyle"); + if (strcasecmp(str, "none")==0) + WMPerformButtonClick(panel->animB[3]); + else if (strcasecmp(str, "twist")==0) + WMPerformButtonClick(panel->animB[1]); + else if (strcasecmp(str, "flip")==0) + WMPerformButtonClick(panel->animB[2]); + else { + WMPerformButtonClick(panel->animB[0]); + } } @@ -153,38 +167,28 @@ createPanel(Panel *p) /***************** Positioning of Icons *****************/ panel->posF = WMCreateFrame(panel->frame); - WMResizeWidget(panel->posF, 475, 135); + WMResizeWidget(panel->posF, 260, 135); WMMoveWidget(panel->posF, 25, 10); WMSetFrameTitle(panel->posF, _("Icon Positioning")); - panel->nwB = WMCreateRadioButton(panel->posF); - WMResizeWidget(panel->nwB, 110, 20); + panel->nwB = WMCreateButton(panel->posF, WBTOnOff); + WMResizeWidget(panel->nwB, 24, 24); WMMoveWidget(panel->nwB, 15, 25); - WMSetButtonImagePosition(panel->nwB, WIPRight); - WMSetButtonTextAlignment(panel->nwB, WARight); - WMSetButtonText(panel->nwB, "Top left"); WMSetButtonAction(panel->nwB, showIconLayout, panel); - panel->neB = WMCreateRadioButton(panel->posF); - WMResizeWidget(panel->neB, 110, 20); - WMMoveWidget(panel->neB, 230, 25); - WMSetButtonImagePosition(panel->neB, WIPLeft); - WMSetButtonTextAlignment(panel->neB, WALeft); - WMSetButtonText(panel->neB, "Top right"); + panel->neB = WMCreateButton(panel->posF, WBTOnOff); + WMResizeWidget(panel->neB, 24, 24); + WMMoveWidget(panel->neB, 115, 25); WMSetButtonAction(panel->neB, showIconLayout, panel); - panel->swB = WMCreateRadioButton(panel->posF); - WMResizeWidget(panel->swB, 110, 20); - WMMoveWidget(panel->swB, 15, 95); - WMSetButtonText(panel->swB, "Bottom left"); - WMSetButtonTextAlignment(panel->swB, WARight); - WMSetButtonImagePosition(panel->swB, WIPRight); + panel->swB = WMCreateButton(panel->posF, WBTOnOff); + WMResizeWidget(panel->swB, 24, 24); + WMMoveWidget(panel->swB, 15, 100); WMSetButtonAction(panel->swB, showIconLayout, panel); - panel->seB = WMCreateRadioButton(panel->posF); - WMResizeWidget(panel->seB, 110, 20); - WMMoveWidget(panel->seB, 230, 95); - WMSetButtonText(panel->seB, "Bottom right"); + panel->seB = WMCreateButton(panel->posF, WBTOnOff); + WMResizeWidget(panel->seB, 24, 24); + WMMoveWidget(panel->seB, 115, 100); WMSetButtonAction(panel->seB, showIconLayout, panel); WMGroupButtons(panel->nwB, panel->neB); @@ -195,7 +199,7 @@ createPanel(Panel *p) 0x7100, True); panel->posVF = WMCreateFrame(panel->posF); WMResizeWidget(panel->posVF, 95, 70); - WMMoveWidget(panel->posVF, 130, 35); + WMMoveWidget(panel->posVF, 30, 38); WMSetFrameRelief(panel->posVF, WRSunken); WMSetWidgetBackgroundColor(panel->posVF, color); WMReleaseColor(color); @@ -204,14 +208,14 @@ createPanel(Panel *p) WMSetFrameRelief(panel->posV, WRSimple); panel->verB = WMCreateRadioButton(panel->posF); - WMResizeWidget(panel->verB, 120, 20); - WMMoveWidget(panel->verB, 345, 45); + WMResizeWidget(panel->verB, 105, 20); + WMMoveWidget(panel->verB, 150, 45); WMSetButtonText(panel->verB, "Vertical"); WMSetButtonAction(panel->verB, showIconLayout, panel); panel->horB = WMCreateRadioButton(panel->posF); - WMResizeWidget(panel->horB, 120, 20); - WMMoveWidget(panel->horB, 345, 80); + WMResizeWidget(panel->horB, 105, 20); + WMMoveWidget(panel->horB, 150, 75); WMSetButtonText(panel->horB, "Horizontal"); WMSetButtonAction(panel->horB, showIconLayout, panel); @@ -220,6 +224,28 @@ createPanel(Panel *p) WMMapSubwidgets(panel->posF); + /***************** Animation ****************/ + panel->animF = WMCreateFrame(panel->frame); + WMResizeWidget(panel->animF, 205, 135); + WMMoveWidget(panel->animF, 295, 10); + WMSetFrameTitle(panel->animF, _("Iconification Animation")); + + for (i=0; i<4; i++) { + panel->animB[i] = WMCreateRadioButton(panel->animF); + WMResizeWidget(panel->animB[i], 170, 20); + WMMoveWidget(panel->animB[i], 20, 24+i*25); + } + WMGroupButtons(panel->animB[0], panel->animB[1]); + WMGroupButtons(panel->animB[0], panel->animB[2]); + WMGroupButtons(panel->animB[0], panel->animB[3]); + + WMSetButtonText(panel->animB[0], _("Shrinking/Zooming")); + WMSetButtonText(panel->animB[1], _("Spinning/Twisting")); + WMSetButtonText(panel->animB[2], _("3D-flipping")); + WMSetButtonText(panel->animB[3], _("None")); + + WMMapSubwidgets(panel->animF); + /***************** Options ****************/ panel->optF = WMCreateFrame(panel->frame); WMResizeWidget(panel->optF, 260, 65); @@ -265,7 +291,7 @@ static void storeData(_Panel *panel) { char buf[8]; - + SetBoolForKey(WMGetButtonSelected(panel->arrB), "AutoArrangeIcons"); SetBoolForKey(WMGetButtonSelected(panel->omnB), "StickyIcons"); @@ -293,6 +319,15 @@ storeData(_Panel *panel) buf[2] = 'v'; } SetStringForKey(buf, "IconPosition"); + + if (WMGetButtonSelected(panel->animB[0])) + SetStringForKey("zoom", "IconificationStyle"); + else if (WMGetButtonSelected(panel->animB[1])) + SetStringForKey("twist", "IconificationStyle"); + else if (WMGetButtonSelected(panel->animB[2])) + SetStringForKey("flip", "IconificationStyle"); + else + SetStringForKey("none", "IconificationStyle"); } diff --git a/WPrefs.app/Makefile.am b/WPrefs.app/Makefile.am index 88ab3473..8e9b0162 100644 --- a/WPrefs.app/Makefile.am +++ b/WPrefs.app/Makefile.am @@ -49,15 +49,15 @@ CPPFLAGS = \ INCLUDES = \ -I$(top_srcdir)/wrlib \ -I$(top_srcdir)/WINGs \ - @XCFLAGS@ \ - -I$(top_srcdir)/libPropList + -I$(top_srcdir)/libPropList \ + @XCFLAGS@ WPrefs_DEPENDENCIES = $(top_builddir)/WINGs/libWINGs.a WPrefs_LDADD = \ - -L$(top_builddir)/WINGs -lWINGs\ - -L$(top_builddir)/wrlib -lwraster \ - -L$(top_builddir)/libPropList -lPropList \ + $(top_builddir)/WINGs/libWINGs.a\ + $(top_builddir)/wrlib/libwraster.a \ + $(top_builddir)/libPropList/libPropList.a \ @GFXLFLAGS@ \ @XLFLAGS@ \ @GFXLIBS@ \ diff --git a/WPrefs.app/Makefile.in b/WPrefs.app/Makefile.in index d1bfe18f..5e8f3d5b 100644 --- a/WPrefs.app/Makefile.in +++ b/WPrefs.app/Makefile.in @@ -140,15 +140,15 @@ CPPFLAGS = \ INCLUDES = \ -I$(top_srcdir)/wrlib \ -I$(top_srcdir)/WINGs \ - @XCFLAGS@ \ - -I$(top_srcdir)/libPropList + -I$(top_srcdir)/libPropList \ + @XCFLAGS@ WPrefs_DEPENDENCIES = $(top_builddir)/WINGs/libWINGs.a WPrefs_LDADD = \ - -L$(top_builddir)/WINGs -lWINGs\ - -L$(top_builddir)/wrlib -lwraster \ - -L$(top_builddir)/libPropList -lPropList \ + $(top_builddir)/WINGs/libWINGs.a\ + $(top_builddir)/wrlib/libwraster.a \ + $(top_builddir)/libPropList/libPropList.a \ @GFXLFLAGS@ \ @XLFLAGS@ \ @GFXLIBS@ \ diff --git a/WPrefs.app/WPrefs.h b/WPrefs.app/WPrefs.h index 1c874176..6b014b9a 100644 --- a/WPrefs.app/WPrefs.h +++ b/WPrefs.app/WPrefs.h @@ -37,7 +37,7 @@ #include -#define WVERSION "0.7" +#define WVERSION "0.8" #define WMVERSION "0.20.x" diff --git a/WPrefs.app/WindowHandling.c b/WPrefs.app/WindowHandling.c index 5becbbe8..05fdc19e 100644 --- a/WPrefs.app/WindowHandling.c +++ b/WPrefs.app/WindowHandling.c @@ -44,6 +44,7 @@ typedef struct _Panel { WMFrame *maxiF; WMButton *miconB; + WMButton *mdockB; WMFrame *opaqF; WMButton *opaqB; @@ -144,6 +145,8 @@ showData(_Panel *panel) WMSetButtonSelected(panel->opaqB, GetBoolForKey("OpaqueMove")); WMSetButtonSelected(panel->miconB, GetBoolForKey("NoWindowOverIcons")); + + WMSetButtonSelected(panel->mdockB, GetBoolForKey("NoWindowOverDock")); } @@ -154,6 +157,7 @@ storeData(_Panel *panel) char x[16], y[16]; SetBoolForKey(WMGetButtonSelected(panel->miconB), "NoWindowOverIcons"); + SetBoolForKey(WMGetButtonSelected(panel->mdockB), "NoWindowOverDock"); SetBoolForKey(WMGetButtonSelected(panel->opaqB), "OpaqueMove"); SetBoolForKey(WMGetButtonSelected(panel->tranB), "OnTopTransients"); SetStringForKey(placements[WMGetPopUpButtonSelectedItem(panel->placP)], @@ -292,10 +296,16 @@ createPanel(Panel *p) WMSetFrameTitle(panel->maxiF, _("When maximizing...")); panel->miconB = WMCreateSwitchButton(panel->maxiF); - WMResizeWidget(panel->miconB, 185, 35); - WMMoveWidget(panel->miconB, 10, 20); + WMResizeWidget(panel->miconB, 185, 20); + WMMoveWidget(panel->miconB, 10, 10); WMSetButtonText(panel->miconB, _("...do not resize over icons")); + panel->mdockB = WMCreateSwitchButton(panel->maxiF); + WMResizeWidget(panel->mdockB, 185, 20); + WMMoveWidget(panel->mdockB, 10, 40); + + WMSetButtonText(panel->mdockB, _("...do not resize over dock")); + WMMapSubwidgets(panel->maxiF); /**************** Transients On Top ****************/ diff --git a/WPrefs.app/po/hr.po b/WPrefs.app/po/hr.po index 7e1deeb3..6023b7d7 100644 --- a/WPrefs.app/po/hr.po +++ b/WPrefs.app/po/hr.po @@ -1,1184 +1,1268 @@ +# Message catalog for WindowMaker +# Copyright (C) 1998 Free Software Foundation, Inc. +# David Sauer , 1998. +# msgid "" msgstr "" -"Date: 1998-08-24 14:36:41-0300\n" -"From: Toni Bilić tbilic@oliver.efos.hr \n" -"Language-Team: Croatian \n" -"Content-Type: text/plain; charset=ISO8859-2\n" -"Xgettext-Options: --default-domain=WPrefs --add-comments --keyword=_\n" -"Files: ../../WPrefs/Configurations.c ../../WPrefs/Expert.c ../../WPrefs/Focus.c ../../WPrefs/KeyboardSettings.c ../../WPrefs/KeyboardShortcuts.c ../../WPrefs/Menu.c ../../WPrefs/MenuGuru.c ../../WPrefs/MenuPreferences.c ../../WPrefs/MouseSettings.c ../../WPrefs/Paths.c ../../WPrefs/Preferences.c ../../WPrefs/Text.c ../../WPrefs/TextureAndColor.c ../../WPrefs/WPrefs.c ../../WPrefs/WindowHandling.c ../../WPrefs/Workspace.c ../../WPrefs/main.c ../../WPrefs/xmodifier.c\n" +"Project-Id-Version: WPrefs 0.6 (WindowMaker 0.20.x)\n" +"POT-Creation-Date: 1998-10-24 12:35+0200\n" +"PO-Revision-Date: 1998-10-27 13:02+01:00\n" +"Last-Translator: David Sauer \n" +"Language-Team: czech \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=ISO-8859-2\n" +"Content-Transfer-Encoding: unknown\n" -#: ../../WPrefs/Configurations.c:141 ../../WPrefs/Configurations.c:147 ../../WPrefs/MouseSettings.c:510 ../../WPrefs/WindowHandling.c:274 ../../WPrefs/WindowHandling.c:286 ../../WPrefs/Workspace.c:70 ../../WPrefs/Workspace.c:76 +#: ../../WPrefs.app/Configurations.c:142 ../../WPrefs.app/Configurations.c:148 +#: ../../WPrefs.app/MouseSettings.c:510 ../../WPrefs.app/WindowHandling.c:270 +#: ../../WPrefs.app/WindowHandling.c:282 ../../WPrefs.app/Workspace.c:71 +#: ../../WPrefs.app/Workspace.c:77 +#, c-format msgid "could not load icon %s" -msgstr "ne mogu učitati ikonu %s" +msgstr "nelze načíst ikonu %s" -#: ../../WPrefs/Configurations.c:154 ../../WPrefs/Workspace.c:83 +#: ../../WPrefs.app/Configurations.c:156 ../../WPrefs.app/Workspace.c:85 +#, c-format msgid "could not process icon %s:" -msgstr "ne mogu procesirati ikonu %s" +msgstr "nelze zpracovat ikonu %s:" -#: ../../WPrefs/Configurations.c:179 ../../WPrefs/Workspace.c:122 +#: ../../WPrefs.app/Configurations.c:181 ../../WPrefs.app/Workspace.c:124 +#, c-format msgid "could not load image file %s" -msgstr "ne mogu učitati image datoteku %s" +msgstr "ze souboru %s nelze načíst obrázek" -#: ../../WPrefs/Configurations.c:193 +#: ../../WPrefs.app/Configurations.c:195 msgid "Icon Slide Speed" -msgstr "Brzina klizanja ikone" +msgstr "Rychlost klouzání ikony" -#: ../../WPrefs/Configurations.c:199 +#: ../../WPrefs.app/Configurations.c:201 msgid "Shade Animation Speed" -msgstr "Brzina Shade animacije" +msgstr "Rychlost změny okna na titulek" -#: ../../WPrefs/Configurations.c:232 ../../WPrefs/Configurations.c:244 ../../WPrefs/Focus.c:310 ../../WPrefs/Focus.c:321 ../../WPrefs/MenuPreferences.c:135 ../../WPrefs/MenuPreferences.c:146 ../../WPrefs/MenuPreferences.c:174 ../../WPrefs/MenuPreferences.c:189 ../../WPrefs/MouseSettings.c:538 ../../WPrefs/MouseSettings.c:549 ../../WPrefs/MouseSettings.c:604 ../../WPrefs/MouseSettings.c:615 ../../WPrefs/MouseSettings.c:651 ../../WPrefs/MouseSettings.c:666 ../../WPrefs/MouseSettings.c:682 ../../WPrefs/WPrefs.c:395 ../../WPrefs/WPrefs.c:413 +#: ../../WPrefs.app/Configurations.c:234 ../../WPrefs.app/Configurations.c:246 +#: ../../WPrefs.app/Focus.c:310 ../../WPrefs.app/Focus.c:321 +#: ../../WPrefs.app/MenuPreferences.c:135 +#: ../../WPrefs.app/MenuPreferences.c:146 +#: ../../WPrefs.app/MenuPreferences.c:174 +#: ../../WPrefs.app/MenuPreferences.c:189 ../../WPrefs.app/MouseSettings.c:538 +#: ../../WPrefs.app/MouseSettings.c:549 ../../WPrefs.app/MouseSettings.c:604 +#: ../../WPrefs.app/MouseSettings.c:615 ../../WPrefs.app/MouseSettings.c:651 +#: ../../WPrefs.app/MouseSettings.c:666 ../../WPrefs.app/MouseSettings.c:682 +#: ../../WPrefs.app/WPrefs.c:398 ../../WPrefs.app/WPrefs.c:416 +#, c-format msgid "could not load icon file %s" -msgstr "ne mogu učitati ikonu %s" +msgstr "nelze načíst soubor s ikonou %s" -#: ../../WPrefs/Configurations.c:260 +#: ../../WPrefs.app/Configurations.c:262 msgid "Titlebar Style" -msgstr "Stil Titlebar-a" +msgstr "Styl titulku" -#: ../../WPrefs/Configurations.c:297 +#: ../../WPrefs.app/Configurations.c:299 msgid "Animations and Sound" -msgstr "Animacije i zvuk" +msgstr "Animace a Zvuky" -#: ../../WPrefs/Configurations.c:303 +#: ../../WPrefs.app/Configurations.c:305 msgid "Animations" -msgstr "Animacije" +msgstr "Animace" -#: ../../WPrefs/Configurations.c:319 +#: ../../WPrefs.app/Configurations.c:321 msgid "Superfluous" -msgstr "Superfluous" +msgstr "Animace+" -#: ../../WPrefs/Configurations.c:335 +#: ../../WPrefs.app/Configurations.c:337 msgid "Sounds" -msgstr "Zvukovi" +msgstr "Zvuky" -#: ../../WPrefs/Configurations.c:352 +#: ../../WPrefs.app/Configurations.c:354 msgid "Note: sound requires a module distributed separately" -msgstr "Upozorenje: zvuk ovisi o zasebnom modulu" +msgstr "Poznámka: zvuk vyžaduje samostatný modul" -#: ../../WPrefs/Configurations.c:362 +#: ../../WPrefs.app/Configurations.c:364 msgid "Dithering colormap for 8bpp" -msgstr "Dithering colormap for 8bpp" +msgstr "Ditherovat na 8bpp" -#: ../../WPrefs/Configurations.c:367 +#: ../../WPrefs.app/Configurations.c:369 msgid "Disable dithering in any visual/depth" -msgstr "Onemogući dithering za bilo koji visual/dubinu" +msgstr "Zakaž jakékoli ditherování" -#: ../../WPrefs/Configurations.c:388 +#: ../../WPrefs.app/Configurations.c:390 msgid "More colors for applications" -msgstr "Još boja za aplikacije" +msgstr "Barvy aplikacím" -#: ../../WPrefs/Configurations.c:395 +#: ../../WPrefs.app/Configurations.c:397 msgid "More colors for WindowMaker" -msgstr "Još boja za WindowMaker" +msgstr "Barvy WindowMakeru" -#: ../../WPrefs/Configurations.c:448 +#: ../../WPrefs.app/Configurations.c:450 msgid "Other Configurations" -msgstr "Ostale konfiguracije" +msgstr "Další konfigurace" -#: ../../WPrefs/Expert.c:70 +#: ../../WPrefs.app/Expert.c:70 msgid "Do not set non-WindowMaker specific parameters (do not use xset)" -msgstr "Ne postavljaj ne-WindowMaker parametre (ne koristi xset)" +msgstr "Nenastavovat parametry mimo WindowMaker (nepoužívat xset)" -#: ../../WPrefs/Expert.c:71 +#: ../../WPrefs.app/Expert.c:71 msgid "Automatically save session when exiting WindowMaker" -msgstr "Automatski snimi sessoin pri izlazu iz WindowMakera" +msgstr "Při ukončení WindowMakeru automaticky uložit sezení" -#: ../../WPrefs/Expert.c:72 +#: ../../WPrefs.app/Expert.c:72 msgid "Use SaveUnder in window frames, icons, menus and other objects" -msgstr "Koristi SaveUnder u okvirima prozora, ikona, menu-a i drugih objekata" +msgstr "Používat SaveUnder při vykreslení rámečků, menu, ikon apod." -#: ../../WPrefs/Expert.c:73 +#: ../../WPrefs.app/Expert.c:73 msgid "Disable cycling color highlighting of icons." -msgstr "Onemugući cycling color highlighting of icons." +msgstr "Zakaž rotaci barev při zvýraznění ikon" -#: ../../WPrefs/Expert.c:103 +#: ../../WPrefs.app/Expert.c:103 msgid "Expert User Preferences" -msgstr "Struče postavke" +msgstr "Nastavení pro experty" -#: ../../WPrefs/Focus.c:79 +#: ../../WPrefs.app/Focus.c:79 +#, c-format msgid "bad option value %s for option FocusMode. Using default Manual" -msgstr "kriva vrijednost opcije %s za FokusMod. Koristim Manual" +msgstr "chybná hodnota %s pro FocusMode. Používám Manual" -#: ../../WPrefs/Focus.c:92 +#: ../../WPrefs.app/Focus.c:92 +#, c-format msgid "bad option value %s for option ColormapMode. Using default Manual" -msgstr "kriva vrijednost opcije %s za ColormapMod. Koristim Manual" +msgstr "chybná hodnota %s pro ColormapMode. Používám Manual" -#: ../../WPrefs/Focus.c:190 +#: ../../WPrefs.app/Focus.c:190 msgid "" "Click on the window to set\n" "keyboard input focus." msgstr "" -"Kliknite na prozor da\n" -"postavite fokus" +"Ťuk myší v okně zaměří\n" +"vstup z klávesnice" -#: ../../WPrefs/Focus.c:194 +#: ../../WPrefs.app/Focus.c:194 msgid "" "Set keyboard input focus to\n" "the window under the mouse pointer,\n" "including the root window." msgstr "" -"Postavljanje fokusa na prozor\n" -"ispod pokazivača miša,\n" -"uključujući i root prozor." +"Nastav zaměření vstupu\n" +"na okno pod ukazatelem myši.\n" +"(včetně hlavního okna)" -#: ../../WPrefs/Focus.c:199 +#: ../../WPrefs.app/Focus.c:199 msgid "" "Set keyboard input focus to\n" "the window under the mouse pointer,\n" "except the root window." msgstr "" -"Postavljanje fokusa na prozor ispod\n" -"pokazivača miša, osim root prozora." +"Nastav zaměření vstupu\n" +"na okno pod ukazatelem myši.\n" +"(mimo hlavního okna)" -#: ../../WPrefs/Focus.c:243 +#: ../../WPrefs.app/Focus.c:243 msgid "Input Focus Mode" -msgstr "Način fokusiranja" +msgstr "Způsob zaměření okna" -#: ../../WPrefs/Focus.c:248 +#: ../../WPrefs.app/Focus.c:248 msgid "Click window to focus" -msgstr "Klikni prozor za fokus" +msgstr "Ťuk myší zaměří" -#: ../../WPrefs/Focus.c:249 +#: ../../WPrefs.app/Focus.c:249 msgid "Focus follows mouse" -msgstr "Fokus prati miša" +msgstr "Pohyb myší zaměří" -#: ../../WPrefs/Focus.c:250 +#: ../../WPrefs.app/Focus.c:250 msgid "\"Sloppy\" focus" -msgstr "\"Sloppy\" fokus" +msgstr "Režim \"Sloopy\"" -#: ../../WPrefs/Focus.c:265 +#: ../../WPrefs.app/Focus.c:265 msgid "Install colormap in the window..." -msgstr "Instaliraj colormap u prozor..." +msgstr "Nastavit mapu barev v okně.." -#: ../../WPrefs/Focus.c:270 +#: ../../WPrefs.app/Focus.c:270 msgid "...that has the input focus." -msgstr "što ima fokus." +msgstr "... které má zaměření." -#: ../../WPrefs/Focus.c:275 +#: ../../WPrefs.app/Focus.c:275 msgid "...that is under the mouse pointer." -msgstr "što je ispod kursora" +msgstr "... které je pod myší." -#: ../../WPrefs/Focus.c:284 +#: ../../WPrefs.app/Focus.c:284 msgid "Automatic Window Raise Delay" -msgstr "Automatsko zadržavanje podizanja prozora" +msgstr "Prodleva při vyzdvihnutí oken" -#: ../../WPrefs/Focus.c:341 +#: ../../WPrefs.app/Focus.c:341 msgid "msec" -msgstr "msec" +msgstr "ms" -#: ../../WPrefs/Focus.c:358 +#: ../../WPrefs.app/Focus.c:358 msgid "Do not let aplications receive the click used to focus windows." -msgstr "Ne daj da aplikacije prime klik za fokusiranje prozora." +msgstr "Nepovolit aplikaci přijmout ťuk myší k zaměření oken." -#: ../../WPrefs/Focus.c:364 +#: ../../WPrefs.app/Focus.c:364 msgid "Automatically focus new windows." -msgstr "Automatski fokusiraj nove prozore" +msgstr "Automaticky zaměřit nová okna." -#: ../../WPrefs/Focus.c:385 +#: ../../WPrefs.app/Focus.c:385 msgid "Window Focus Preferences" -msgstr "Postavke fokusiranja prozora" +msgstr "Nastavení zaměření oken" -#: ../../WPrefs/KeyboardSettings.c:72 +#: ../../WPrefs.app/KeyboardSettings.c:72 msgid "Initial Key Repeat" -msgstr "Prvotno ponavljanje ključa" +msgstr "Začít opakovat po ..." -#: ../../WPrefs/KeyboardSettings.c:113 +#: ../../WPrefs.app/KeyboardSettings.c:113 msgid "Key Repeat Rate" -msgstr "Razmak između ponavljanja ključa" +msgstr "Rychlost opakování kláves" -#: ../../WPrefs/KeyboardSettings.c:153 +#: ../../WPrefs.app/KeyboardSettings.c:153 msgid "Type here to test" -msgstr "Ukucajte ovdje da testirate" +msgstr "Zkuste klávesnici zde" -#: ../../WPrefs/KeyboardSettings.c:172 +#: ../../WPrefs.app/KeyboardSettings.c:172 msgid "Keyboard Preferences" -msgstr "Postavke tastature" +msgstr "Nastavení klávesnice" -#: ../../WPrefs/KeyboardShortcuts.c:161 ../../WPrefs/Menu.c:916 ../../WPrefs/MenuGuru.c:263 +#: ../../WPrefs.app/KeyboardShortcuts.c:161 ../../WPrefs.app/Menu.c:923 +#: ../../WPrefs.app/Menu.c:1290 ../../WPrefs.app/MenuGuru.c:263 msgid "Cancel" -msgstr "Otkaži" +msgstr "Nic" -#: ../../WPrefs/KeyboardShortcuts.c:162 +#: ../../WPrefs.app/KeyboardShortcuts.c:162 msgid "Press the desired shortcut key(s) or click Cancel to stop capturing." -msgstr "Pritisnite željenu kraticu ili kliknite Otkaži za prekid hvatanja." +msgstr "Stiskněte požadované klávesy nebo použijete \"Nic\"." -#: ../../WPrefs/KeyboardShortcuts.c:180 ../../WPrefs/KeyboardShortcuts.c:374 ../../WPrefs/Menu.c:927 ../../WPrefs/Menu.c:1147 +#: ../../WPrefs.app/KeyboardShortcuts.c:180 +#: ../../WPrefs.app/KeyboardShortcuts.c:374 ../../WPrefs.app/Menu.c:935 +#: ../../WPrefs.app/Menu.c:1157 msgid "Capture" -msgstr "Uhvati" +msgstr "Snímat" -#: ../../WPrefs/KeyboardShortcuts.c:181 ../../WPrefs/KeyboardShortcuts.c:381 +#: ../../WPrefs.app/KeyboardShortcuts.c:181 +#: ../../WPrefs.app/KeyboardShortcuts.c:381 msgid "Click Capture to interactively define the shortcut key." -msgstr "Kliknite \"Uhvati\" da interaktivno definirate kraticu." +msgstr "Použijte \"Snímat\" k definici klávesy." -#: ../../WPrefs/KeyboardShortcuts.c:299 +#: ../../WPrefs.app/KeyboardShortcuts.c:299 msgid "Actions" -msgstr "Akcije" +msgstr "Akce" -#: ../../WPrefs/KeyboardShortcuts.c:313 +#: ../../WPrefs.app/KeyboardShortcuts.c:313 msgid "Open applications menu" -msgstr "Otvori menu aplikacija" +msgstr "Otevřít menu aplikací" -#: ../../WPrefs/KeyboardShortcuts.c:314 +#: ../../WPrefs.app/KeyboardShortcuts.c:314 msgid "Open window list menu" -msgstr "Otvori menu liste prozora" +msgstr "Otevřít menu s okny" -#: ../../WPrefs/KeyboardShortcuts.c:315 +#: ../../WPrefs.app/KeyboardShortcuts.c:315 msgid "Open window commands menu" -msgstr "Otvori menu prozorskih naredbi" +msgstr "Otevřít menu s přikazy pro okno" -#: ../../WPrefs/KeyboardShortcuts.c:316 +#: ../../WPrefs.app/KeyboardShortcuts.c:316 msgid "Hide active application" -msgstr "Sakrij aktivnu aplikaciju" +msgstr "Skrýt aplikaci" -#: ../../WPrefs/KeyboardShortcuts.c:317 +#: ../../WPrefs.app/KeyboardShortcuts.c:317 msgid "Miniaturize active window" -msgstr "Minimiziraj aktivni prozor" +msgstr "Miniaturizace" -#: ../../WPrefs/KeyboardShortcuts.c:318 +#: ../../WPrefs.app/KeyboardShortcuts.c:318 msgid "Close active window" -msgstr "Zatvori aktivni prozor" +msgstr "Uzavřít okno" -#: ../../WPrefs/KeyboardShortcuts.c:319 +#: ../../WPrefs.app/KeyboardShortcuts.c:319 msgid "Maximize active window" -msgstr "Maksimiziraj aktivni prozor" +msgstr "Maximalizace okna" -#: ../../WPrefs/KeyboardShortcuts.c:320 +#: ../../WPrefs.app/KeyboardShortcuts.c:320 msgid "Maximize active window vertically" -msgstr "Maksimiziraj aktivni prozor vertikalno" +msgstr "Vertikální maximalizace" -#: ../../WPrefs/KeyboardShortcuts.c:321 +#: ../../WPrefs.app/KeyboardShortcuts.c:321 msgid "Raise active window" -msgstr "Podigni aktivni prozor" +msgstr "Aktivní okno výše" -#: ../../WPrefs/KeyboardShortcuts.c:322 +#: ../../WPrefs.app/KeyboardShortcuts.c:322 msgid "Lower active window" -msgstr "Spusti aktivni prozor" +msgstr "Aktivní okno níže" -#: ../../WPrefs/KeyboardShortcuts.c:323 +#: ../../WPrefs.app/KeyboardShortcuts.c:323 msgid "Raise/Lower window under mouse pointer" -msgstr "Podigni/Spusti prozor ispod pokazivača miša" +msgstr "Okno pod ukazatelem myši výše/níže" -#: ../../WPrefs/KeyboardShortcuts.c:324 +#: ../../WPrefs.app/KeyboardShortcuts.c:324 msgid "Shade active window" -msgstr "Shade-iraj aktivni prozor" +msgstr "Z okna jen titulek" -#: ../../WPrefs/KeyboardShortcuts.c:325 +#: ../../WPrefs.app/KeyboardShortcuts.c:325 msgid "Select active window" -msgstr "Selektiraj aktivni prozor" +msgstr "Vyber okno" -#: ../../WPrefs/KeyboardShortcuts.c:326 +#: ../../WPrefs.app/KeyboardShortcuts.c:326 msgid "Focus next window" -msgstr "Fokusiraj sljedeći prozor" +msgstr "Zaměrit další oknp" -#: ../../WPrefs/KeyboardShortcuts.c:327 +#: ../../WPrefs.app/KeyboardShortcuts.c:327 msgid "Focus previous window" -msgstr "Fokusiraj prethodni prozor" +msgstr "Zaměřit předchozí okno" -#: ../../WPrefs/KeyboardShortcuts.c:328 +#: ../../WPrefs.app/KeyboardShortcuts.c:328 msgid "Switch to next workspace" -msgstr "Prebacivanje na sljedeći radni prostor" +msgstr "Další plocha" -#: ../../WPrefs/KeyboardShortcuts.c:329 +#: ../../WPrefs.app/KeyboardShortcuts.c:329 msgid "Switch to previous workspace" -msgstr "Prebacivanje na prethodni radni prostor" +msgstr "Předchozí plocha" -#: ../../WPrefs/KeyboardShortcuts.c:330 +#: ../../WPrefs.app/KeyboardShortcuts.c:330 msgid "Switch to next ten workspaces" -msgstr "Prebacivanje na sljedećih 10 radnih prostora" +msgstr "Dalších 10 ploch" -#: ../../WPrefs/KeyboardShortcuts.c:331 +#: ../../WPrefs.app/KeyboardShortcuts.c:331 msgid "Switch to previous ten workspaces" -msgstr "Prebacivanje na predhodnih 10 radnih prostora" +msgstr "Předchozích 10 ploch" -#: ../../WPrefs/KeyboardShortcuts.c:332 +#: ../../WPrefs.app/KeyboardShortcuts.c:332 msgid "Switch to workspace 1" -msgstr "Prebacivanje na radni prostor 1" +msgstr "Přepni na plochu 1" -#: ../../WPrefs/KeyboardShortcuts.c:333 +#: ../../WPrefs.app/KeyboardShortcuts.c:333 msgid "Switch to workspace 2" -msgstr "Prebacivanje na radni prostor 2" +msgstr "Přepni na plochu 2" -#: ../../WPrefs/KeyboardShortcuts.c:334 +#: ../../WPrefs.app/KeyboardShortcuts.c:334 msgid "Switch to workspace 3" -msgstr "Prebacivanje na radni prostor 3" +msgstr "Přepni na plochu 3" -#: ../../WPrefs/KeyboardShortcuts.c:335 +#: ../../WPrefs.app/KeyboardShortcuts.c:335 msgid "Switch to workspace 4" -msgstr "Prebacivanje na radni prostor 4" +msgstr "Přepni na plochu 4" -#: ../../WPrefs/KeyboardShortcuts.c:336 +#: ../../WPrefs.app/KeyboardShortcuts.c:336 msgid "Switch to workspace 5" -msgstr "Prebacivanje na radni prostor 5" +msgstr "Přepni na plochu 5" -#: ../../WPrefs/KeyboardShortcuts.c:337 +#: ../../WPrefs.app/KeyboardShortcuts.c:337 msgid "Switch to workspace 6" -msgstr "Prebacivanje na radni prostor 6" +msgstr "Přepni na plochu 6" -#: ../../WPrefs/KeyboardShortcuts.c:338 +#: ../../WPrefs.app/KeyboardShortcuts.c:338 msgid "Switch to workspace 7" -msgstr "Prebacivanje na radni prostor 7" +msgstr "Přepni na plochu 7" -#: ../../WPrefs/KeyboardShortcuts.c:339 +#: ../../WPrefs.app/KeyboardShortcuts.c:339 msgid "Switch to workspace 8" -msgstr "Prebacivanje na radni prostor 8" +msgstr "Přepni na plochu 8" -#: ../../WPrefs/KeyboardShortcuts.c:340 +#: ../../WPrefs.app/KeyboardShortcuts.c:340 msgid "Switch to workspace 9" -msgstr "Prebacivanje na radni prostor 9" +msgstr "Přepni na plochu 9" -#: ../../WPrefs/KeyboardShortcuts.c:341 +#: ../../WPrefs.app/KeyboardShortcuts.c:341 msgid "Switch to workspace 10" -msgstr "Prebacivanje na radni prostor 10" +msgstr "Přepni na plochu 10" -#: ../../WPrefs/KeyboardShortcuts.c:342 +#: ../../WPrefs.app/KeyboardShortcuts.c:342 msgid "Raise Clip" -msgstr "Podigni Clip" +msgstr "Sponku výše" -#: ../../WPrefs/KeyboardShortcuts.c:343 +#: ../../WPrefs.app/KeyboardShortcuts.c:343 msgid "Lower Clip" -msgstr "Spusti Clip" +msgstr "Sponku níže" -#: ../../WPrefs/KeyboardShortcuts.c:344 +#: ../../WPrefs.app/KeyboardShortcuts.c:344 msgid "Raise/Lower Clip" -msgstr "Podigni/Spusti Clip" +msgstr "Sponku výše/níže" -#: ../../WPrefs/KeyboardShortcuts.c:357 ../../WPrefs/Menu.c:1136 +#: ../../WPrefs.app/KeyboardShortcuts.c:357 ../../WPrefs.app/Menu.c:1146 msgid "Shortcut" -msgstr "Kratica" +msgstr "Zkratka" -#: ../../WPrefs/KeyboardShortcuts.c:368 +#: ../../WPrefs.app/KeyboardShortcuts.c:368 msgid "Clear" -msgstr "Očisti" +msgstr "Vymaž" -#: ../../WPrefs/KeyboardShortcuts.c:429 +#: ../../WPrefs.app/KeyboardShortcuts.c:429 msgid "Keyboard Shortcut Preferences" -msgstr "Postavke tastaturnih kratica" +msgstr "Nastavení klávesových zkratek" -#: ../../WPrefs/Menu.c:371 +#: ../../WPrefs.app/Menu.c:373 msgid "Window Manager" -msgstr "Window Manager" +msgstr "Manažer oken" -#: ../../WPrefs/Menu.c:373 +#: ../../WPrefs.app/Menu.c:375 msgid "Program to open files" -msgstr "Program za otvaranje datoteka" +msgstr "Program na otvírání souborů" -#: ../../WPrefs/Menu.c:375 ../../WPrefs/Menu.c:1123 +#: ../../WPrefs.app/Menu.c:377 ../../WPrefs.app/Menu.c:1133 msgid "Program to Run" -msgstr "Program za pokrenuti" +msgstr "Spustit program" -#: ../../WPrefs/Menu.c:425 ../../WPrefs/Menu.c:426 +#: ../../WPrefs.app/Menu.c:427 ../../WPrefs.app/Menu.c:428 +#, c-format msgid "New Command %i" -msgstr "Nova naredba %i" +msgstr "Nový příkaz %i" -#: ../../WPrefs/Menu.c:433 +#: ../../WPrefs.app/Menu.c:435 msgid "New Submenu" -msgstr "Novi podmenu" +msgstr "Nové podmenu" -#: ../../WPrefs/Menu.c:438 +#: ../../WPrefs.app/Menu.c:440 msgid "External Menu" -msgstr "Eksterni menu" +msgstr "Externí menu" -#: ../../WPrefs/Menu.c:445 +#: ../../WPrefs.app/Menu.c:447 msgid "Workspaces" -msgstr "Radni prostori" +msgstr "Pracovní plochy" -#: ../../WPrefs/Menu.c:1007 ../../WPrefs/Menu.c:1022 +#: ../../WPrefs.app/Menu.c:1017 ../../WPrefs.app/Menu.c:1032 msgid "Commands" -msgstr "Naredbe" +msgstr "Příkazy" -#: ../../WPrefs/Menu.c:1008 ../../WPrefs/Menu.c:1023 +#: ../../WPrefs.app/Menu.c:1018 ../../WPrefs.app/Menu.c:1033 msgid "Add Command" -msgstr "Naredba" +msgstr "Přidat příkaz" -#: ../../WPrefs/Menu.c:1009 ../../WPrefs/Menu.c:1024 +#: ../../WPrefs.app/Menu.c:1019 ../../WPrefs.app/Menu.c:1034 msgid "Add Submenu" -msgstr "Podmenu" +msgstr "Přidat podmenu" -#: ../../WPrefs/Menu.c:1010 ../../WPrefs/Menu.c:1025 +#: ../../WPrefs.app/Menu.c:1020 ../../WPrefs.app/Menu.c:1035 msgid "Add External Menu" -msgstr "Eksterni menu" +msgstr "Přidat externí menu" -#: ../../WPrefs/Menu.c:1011 ../../WPrefs/Menu.c:1026 +#: ../../WPrefs.app/Menu.c:1021 ../../WPrefs.app/Menu.c:1036 msgid "Add Workspace Menu" -msgstr "Menu radnih prostora" +msgstr "Přidat menu ploch" -#: ../../WPrefs/Menu.c:1012 ../../WPrefs/Menu.c:1027 +#: ../../WPrefs.app/Menu.c:1022 ../../WPrefs.app/Menu.c:1037 msgid "Remove Item" -msgstr "Obrisati stavku" +msgstr "Odstraň položku" -#: ../../WPrefs/Menu.c:1013 ../../WPrefs/Menu.c:1028 +#: ../../WPrefs.app/Menu.c:1023 ../../WPrefs.app/Menu.c:1038 msgid "Cut Item" -msgstr "Izrezati stavku" +msgstr "Vyřízni položku" -#: ../../WPrefs/Menu.c:1014 ../../WPrefs/Menu.c:1029 +#: ../../WPrefs.app/Menu.c:1024 ../../WPrefs.app/Menu.c:1039 msgid "Copy Item" -msgstr "Kopirati stavku" +msgstr "Zkopíruj položku" -#: ../../WPrefs/Menu.c:1015 ../../WPrefs/Menu.c:1030 +#: ../../WPrefs.app/Menu.c:1025 ../../WPrefs.app/Menu.c:1040 msgid "Paste Item" -msgstr "Naljepiti stavku" +msgstr "Vlož položku" -#: ../../WPrefs/Menu.c:1059 +#: ../../WPrefs.app/Menu.c:1069 msgid "Label" -msgstr "Oznaka" +msgstr "Označení" -#: ../../WPrefs/Menu.c:1072 +#: ../../WPrefs.app/Menu.c:1082 msgid "Command" -msgstr "Naredba" +msgstr "Příkaz" -#: ../../WPrefs/Menu.c:1077 +#: ../../WPrefs.app/Menu.c:1087 msgid "Run Program" -msgstr "Pokrenuti program" +msgstr "Spusť program" -#: ../../WPrefs/Menu.c:1078 +#: ../../WPrefs.app/Menu.c:1088 msgid "Arrange Icons" -msgstr "Pospremiti ikone" +msgstr "Srovnej ikony" -#: ../../WPrefs/Menu.c:1079 +#: ../../WPrefs.app/Menu.c:1089 msgid "Hide Others" -msgstr "Sakriti ostale" +msgstr "Skryj ostatní" -#: ../../WPrefs/Menu.c:1080 +#: ../../WPrefs.app/Menu.c:1090 msgid "Show All Windows" -msgstr "Pokaži sve prozore" +msgstr "Ukaž všechna okna" -#: ../../WPrefs/Menu.c:1081 +#: ../../WPrefs.app/Menu.c:1091 msgid "Exit WindowMaker" -msgstr "Izaći iz WindowMakera" +msgstr "Ukončit manažera oken" -#: ../../WPrefs/Menu.c:1082 +#: ../../WPrefs.app/Menu.c:1092 msgid "Exit X Session" -msgstr "Izaći is X sessiona" +msgstr "Ukončit sezení X" -#: ../../WPrefs/Menu.c:1083 +#: ../../WPrefs.app/Menu.c:1093 msgid "Start window manager" -msgstr "Pokrenuti window manager" +msgstr "Odstartovat manažer oken" -#: ../../WPrefs/Menu.c:1084 +#: ../../WPrefs.app/Menu.c:1094 msgid "Restart WindowMaker" -msgstr "Restartari WindowMaker" +msgstr "RestartWindowMakeru" -#: ../../WPrefs/Menu.c:1085 +#: ../../WPrefs.app/Menu.c:1095 msgid "Save Session" -msgstr "Snimiti session" +msgstr "Uložit stav sezení" -#: ../../WPrefs/Menu.c:1086 +#: ../../WPrefs.app/Menu.c:1096 msgid "Clear Session" -msgstr "Očistiti session" +msgstr "Vymazat sezení" -#: ../../WPrefs/Menu.c:1087 +#: ../../WPrefs.app/Menu.c:1097 msgid "Refresh Screen" -msgstr "Osvježiti ekran" +msgstr "Obnovit obrazovku" -#: ../../WPrefs/Menu.c:1088 +#: ../../WPrefs.app/Menu.c:1098 msgid "Info Panel" -msgstr "Info panel" +msgstr "Informace" -#: ../../WPrefs/Menu.c:1089 +#: ../../WPrefs.app/Menu.c:1099 msgid "Legal Panel" -msgstr "Legal panel" +msgstr "Copyright" -#: ../../WPrefs/Menu.c:1097 +#: ../../WPrefs.app/Menu.c:1107 msgid "Open workspace menu" -msgstr "Otvoriti menu radnih prostora" +msgstr "Otevřít menu ploch" -#: ../../WPrefs/Menu.c:1104 +#: ../../WPrefs.app/Menu.c:1114 msgid "No confirmation panel" -msgstr "Nema panela potvrde" +msgstr "Bez ukončovacího dialogu" -#: ../../WPrefs/Menu.c:1110 +#: ../../WPrefs.app/Menu.c:1120 msgid "Menu Path/Directory List" -msgstr "Menu lista Staza/Direktorij" +msgstr "Cesta k menu/adresář" -#: ../../WPrefs/Menu.c:1155 +#: ../../WPrefs.app/Menu.c:1165 msgid "Ask help to the Guru" -msgstr "Traži pomoć od Gurua" +msgstr "Zeptat se Mistra" -#: ../../WPrefs/Menu.c:1276 +#: ../../WPrefs.app/Menu.c:1285 msgid "" -"The format of the current menu in ~/G/D/WMRootMenu is not supported by WPrefs. A new menu will be created.\n" -"You can also replace ~/G/D/WMRootMenu with ~/G/L/W/plmenu to get the default menu." +"The format of the current menu in ~/G/D/WMRootMenu is not supported by " +"WPrefs. A new menu will be created.\n" +"You can also replace ~/G/D/WMRootMenu with ~/G/L/W/plmenu to get the default " +"menu." msgstr "" -"Format trenutnog menu-a u ~/G/D/WMRootMenu nije podržan od WPrefs-a. Napravit ću novi menu.\n" -"Možete zamjeniti ~/G/D/WMRootMenu da ~/G/L/W/plmenu da dobijete početni menu." +"Aktuální formát menu v ~/G/D/WMRootMenu není podporován programem WPrefs. Bude vytvořeno nové menu.\n" +"Standardní menu získáte příkazem \"cp ~/G/L/W/plmenu ~/G/D/WMRootMenu\"." -#: ../../WPrefs/Menu.c:1280 ../../WPrefs/WPrefs.c:574 +#: ../../WPrefs.app/Menu.c:1290 ../../WPrefs.app/Menu.c:1295 +#: ../../WPrefs.app/WPrefs.c:585 msgid "Warning" -msgstr "Upozorenje" +msgstr "Varování" -#. WMMapWidget(panel->pathB); -#: ../../WPrefs/Menu.c:1281 ../../WPrefs/MenuGuru.c:119 ../../WPrefs/MenuGuru.c:126 ../../WPrefs/MenuGuru.c:140 ../../WPrefs/MouseSettings.c:156 ../../WPrefs/Text.c:181 ../../WPrefs/WPrefs.c:536 ../../WPrefs/WPrefs.c:541 ../../WPrefs/WPrefs.c:552 ../../WPrefs/WPrefs.c:561 ../../WPrefs/WPrefs.c:567 ../../WPrefs/WPrefs.c:574 ../../WPrefs/WPrefs.c:591 ../../WPrefs/WPrefs.c:596 +#: ../../WPrefs.app/Menu.c:1290 ../../WPrefs.app/Menu.c:1296 +#: ../../WPrefs.app/MenuGuru.c:119 ../../WPrefs.app/MenuGuru.c:126 +#: ../../WPrefs.app/MenuGuru.c:140 ../../WPrefs.app/MouseSettings.c:156 +#: ../../WPrefs.app/Text.c:181 ../../WPrefs.app/WPrefs.c:546 +#: ../../WPrefs.app/WPrefs.c:551 ../../WPrefs.app/WPrefs.c:562 +#: ../../WPrefs.app/WPrefs.c:572 ../../WPrefs.app/WPrefs.c:578 +#: ../../WPrefs.app/WPrefs.c:585 ../../WPrefs.app/WPrefs.c:602 +#: ../../WPrefs.app/WPrefs.c:607 msgid "OK" -msgstr "U redu" +msgstr "OK" -#: ../../WPrefs/Menu.c:1334 -msgid "Aplications Menu Definition" -msgstr "Definiranje menu Aplikacije" +#: ../../WPrefs.app/Menu.c:1295 +msgid "Any changes made in this section will not be saved" +msgstr "Jakékoli změny v této sekci budou zrušeny" -#: ../../WPrefs/MenuGuru.c:106 +#: ../../WPrefs.app/Menu.c:1360 +msgid "Applications Menu Definition" +msgstr "Definice menu aplikací" + +#: ../../WPrefs.app/MenuGuru.c:106 msgid "Menu Guru - Select Type" -msgstr "Guru menu - odabrati tip" +msgstr "Menu Mistra - Vyberte typ" -#: ../../WPrefs/MenuGuru.c:111 ../../WPrefs/MenuGuru.c:133 ../../WPrefs/MenuGuru.c:251 +#: ../../WPrefs.app/MenuGuru.c:111 ../../WPrefs.app/MenuGuru.c:133 +#: ../../WPrefs.app/MenuGuru.c:251 msgid "Next" -msgstr "Sljedeći" +msgstr "Další" -#: ../../WPrefs/MenuGuru.c:114 +#: ../../WPrefs.app/MenuGuru.c:114 msgid "Menu Guru - Select Menu File" -msgstr "Guru menu - Odabrati menu datoteku" +msgstr "Mistrova nabídka - Vyberte soubor menu" -#: ../../WPrefs/MenuGuru.c:122 +#: ../../WPrefs.app/MenuGuru.c:122 msgid "Menu Guru - Select Pipe Command" -msgstr "Guru menu - Odabrati pipe naredbu" +msgstr "Mistrova nabídka - Vyberte příkaz roury" -#: ../../WPrefs/MenuGuru.c:129 +#: ../../WPrefs.app/MenuGuru.c:129 msgid "Menu Guru - Select Directories" -msgstr "Guru menu - Odabrati direktorije" +msgstr "Mistrova nabídka - Vyberte adresáře" -#: ../../WPrefs/MenuGuru.c:136 +#: ../../WPrefs.app/MenuGuru.c:136 msgid "Menu Guru - Select Command" -msgstr "Guru menu - Odabrati naredbu" +msgstr "Mistrova nabídka - Vyberte příkaz" -#: ../../WPrefs/MenuGuru.c:257 +#: ../../WPrefs.app/MenuGuru.c:257 msgid "Back" -msgstr "Natrag" +msgstr "Zpět" -#: ../../WPrefs/MenuGuru.c:271 +#: ../../WPrefs.app/MenuGuru.c:271 msgid "" -"This process will help you create a submenu which definition is located in another file or is created dynamically.\n" +"This process will help you create a submenu which definition is located in " +"another file or is created dynamically.\n" "What do you want to use as the contents of the submenu?" msgstr "" -"Ovaj postupak će vam pomoći u kreiranju podmenija čija definicija nalazi u drugoj datoteci ili se stvara dinamički.\n" -"Što želite koristiti kao sadržaj podmenu-a?" +"Mistr vám pomůže vytvořit podmenu ze souboru nebo vytvořené dynamicky.\n" +"Co chcete použít jako obsah podmenu?" -#: ../../WPrefs/MenuGuru.c:279 -msgid "A file containing the menu definition in the plain text (non-property list) menu format." -msgstr "Datoteka koja sadrži definiciju menu-a u čistom tekst menu formatu." +#: ../../WPrefs.app/MenuGuru.c:279 +msgid "" +"A file containing the menu definition in the plain text (non-property list) " +"menu format." +msgstr "Soubor obsahující definici menu jako obyčejný text s daným formátem." -#: ../../WPrefs/MenuGuru.c:285 +#: ../../WPrefs.app/MenuGuru.c:285 msgid "The menu definition generated by a script/program read through a pipe." -msgstr "Definicja menu-a generirana pomoću skripte/programa pročitanog kroz pipe." +msgstr "" +"Definice menu generovaná sriptem nebo programem, definice bude čtena z roury." -#: ../../WPrefs/MenuGuru.c:291 +#: ../../WPrefs.app/MenuGuru.c:291 msgid "The files in one or more directories." -msgstr "Datoteke u jednom ili više direktorija." +msgstr "Soubory v jednom nebo více adresářích." -#: ../../WPrefs/MenuGuru.c:303 +#: ../../WPrefs.app/MenuGuru.c:303 msgid "Type the path for the menu file:" -msgstr "Upiši stazu za menu datoteku:" +msgstr "Zadejte cestu k souboru s menu:" -#: ../../WPrefs/MenuGuru.c:318 -msgid "The menu file must contain a menu in the plain text menu file format. This format is described in the menu files included with WindowMaker, probably at ~/GNUstep/Library/WindowMaker/menu" -msgstr "Menu datoteka mora sadržavati menu u čistom tekst menu formatu. Ovaj format je opisan u menu datotekama u distribuciji, vjerojatno u ~/GNUstep/Library/WindowMaker/menu" +#: ../../WPrefs.app/MenuGuru.c:318 +msgid "" +"The menu file must contain a menu in the plain text menu file format. This " +"format is described in the menu files included with WindowMaker, probably at " +"~/GNUstep/Library/WindowMaker/menu" +msgstr "Soubor s menu musí obsahovat popis menu jako obyčejný text. Tento formát je zřejmý ze souboru s menu, který je distribuován s Window Makerem, pravděpodobně v souboru ~/GNUstep/Library/WindowMaker/menu" -#: ../../WPrefs/MenuGuru.c:328 +#: ../../WPrefs.app/MenuGuru.c:328 msgid "Type the command that will generate the menu definition:" -msgstr "Upiši naredbu koja će generirati definiciju menu-a:" +msgstr "Zadejte příkaz, který vygeneruje definici menu:" -#: ../../WPrefs/MenuGuru.c:338 -msgid "The command supplied must generate and output a valid menu definition to stdout. This definition should be in the plain text menu file format, described in the menu files included with WindowMaker, probably at ~/GNUstep/Library/WindowMaker/menu" -msgstr "Ponuđena naredba mora generirati i ispisati važeću definicuju menu-a na stdout. Ova bi definicja trebala biti u čistom tekst menu formatu koji je opisan u menu datotekama iz distribucije, vjerojatno u ~/GNUstep/Library/WindowMaker/menu" +#: ../../WPrefs.app/MenuGuru.c:338 +msgid "" +"The command supplied must generate and output a valid menu definition to " +"stdout. This definition should be in the plain text menu file format, " +"described in the menu files included with WindowMaker, usually at " +"~/GNUstep/Library/WindowMaker/menu" +msgstr "Příkaz musí generovat a standardní výstup zapsat správnou definici menu. Tato definice musí být ve formě neformátovaného textu, jak je ukázáno v distribučním souboru s menu, obvykle v ~/GNUstep/Library/WindowMaker/menu" -#: ../../WPrefs/MenuGuru.c:350 ../../WPrefs/MenuGuru.c:372 ../../WPrefs/MenuGuru.c:394 -msgid "Type the path for the directory. You can type more than one path by separating them with spaces." -msgstr "Upišite stazu za direktorij. Možete upisati više od jedne staze odvajajući ih razmacima." +#: ../../WPrefs.app/MenuGuru.c:350 ../../WPrefs.app/MenuGuru.c:372 +#: ../../WPrefs.app/MenuGuru.c:394 +msgid "" +"Type the path for the directory. You can type more than one path by " +"separating them with spaces." +msgstr "Zadejte cestu pro adresář. Pokud chcete zadat více adresářů, oddělte je mezerami." -#: ../../WPrefs/MenuGuru.c:361 ../../WPrefs/MenuGuru.c:383 ../../WPrefs/MenuGuru.c:405 -msgid "The menu generated will have an item for each file in the directory. The directories can contain program executables or data files (such as jpeg images)." -msgstr "Generirani menu će imati stavku za svaku datoteku u direktoriju. Direktoriji mogu sadržavati izvršne programe ili podatke (kao jpeg slike)." +#: ../../WPrefs.app/MenuGuru.c:361 ../../WPrefs.app/MenuGuru.c:383 +#: ../../WPrefs.app/MenuGuru.c:405 +msgid "" +"The menu generated will have an item for each file in the directory. The " +"directories can contain program executables or data files (such as jpeg " +"images)." +msgstr "Generované menu bude mít položku pro každý soubor v adresáři. Adresáře mohou obsahovat programy nebo datové soubory, například obrázky formátu jpeg." -#: ../../WPrefs/MenuGuru.c:415 -msgid "If the directory contain data files, type the command used to open these files. Otherwise, leave it in blank." -msgstr "Ako direktorij sadrži podatkovne datoteke, upišite naredbu korištenu za otvaranje tih datoteka, ili ostavit prazno." +#: ../../WPrefs.app/MenuGuru.c:415 +msgid "" +"If the directory contain data files, type the command used to open these " +"files. Otherwise, leave it in blank." +msgstr "Pokud adresář obsahuje datové soubory, zadejte příkaz pro jejich otevření. Jinak ponechte prázdné." -#: ../../WPrefs/MenuGuru.c:426 -msgid "Each file in the directory will have an item and they will be opened with the supplied command.For example, if the directory contains image files and the command is \"xv -root\", each file in the directory will have a menu item like \"xv -root imagefile\"." -msgstr "Svaka datoteka u direktoriju će imati stavku i bit će otvorene sa navedenom naredbom. Na primjer ako direktorij sadrži image datoteke i naredba je \"xv -root\", svaka datoteka u direktoriju će imati stavku \"xv -root image_datoteka\"." +#: ../../WPrefs.app/MenuGuru.c:426 +msgid "" +"Each file in the directory will have an item and they will be opened with " +"the supplied command.For example, if the directory contains image files and " +"the command is \"xv -root\", each file in the directory will have a menu " +"item like \"xv -root imagefile\"." +msgstr "Každý soubor v adresáři bude mít položku v menu a bude otevřen pomocí daného příkazu. Například, pokud adresář obsahuje soubory s obrázky a příkaz je \"xv -root\", každý soubor bude mít položku \"xv -root soubor_s_obrázkem." -#: ../../WPrefs/MenuPreferences.c:112 +#: ../../WPrefs.app/MenuPreferences.c:112 msgid "Menu Scrolling Speed" -msgstr "Brzina pomicanja menu-a" +msgstr "Rychlost posunu menu" -#: ../../WPrefs/MenuPreferences.c:161 +#: ../../WPrefs.app/MenuPreferences.c:161 msgid "Submenu Alignment" -msgstr "Poravnanje podmenu-a" +msgstr "Zarovnání submenu" -#: ../../WPrefs/MenuPreferences.c:204 +#: ../../WPrefs.app/MenuPreferences.c:204 msgid "" "Always open submenus inside the screen, instead of scrolling.\n" "Note: this can be an annoyance at some circumstances." msgstr "" -"Uvijek otvori podmenu-u unutar ekrana umjesto pomicanja.\n" -"Upozorenje: ovo zna biti vrlo frustrirajuće u nekim okolnostima." +"Menu otevřít vždy na ploše obrazovky (neposouvat).\n" +"Poznámka: někdy může způsobit problémy." -#: ../../WPrefs/MenuPreferences.c:209 +#: ../../WPrefs.app/MenuPreferences.c:209 msgid "Scroll off-screen menus when pointer is moved over them." -msgstr "Pomakni menu-e izvan ekrana unutra kada se pokazivač miče iznad njih" +msgstr "Posouvat menu při pohybu ukazatele nad tímto menu." -#: ../../WPrefs/MenuPreferences.c:229 +#: ../../WPrefs.app/MenuPreferences.c:229 msgid "Menu Preferences" -msgstr "Postavke menu-a" +msgstr "Nastavení menu" -#: ../../WPrefs/MouseSettings.c:154 ../../WPrefs/Text.c:180 ../../WPrefs/WPrefs.c:536 ../../WPrefs/WPrefs.c:541 ../../WPrefs/WPrefs.c:550 ../../WPrefs/WPrefs.c:559 ../../WPrefs/WPrefs.c:567 ../../WPrefs/WPrefs.c:591 ../../WPrefs/WPrefs.c:596 +#: ../../WPrefs.app/MouseSettings.c:154 ../../WPrefs.app/Text.c:181 +#: ../../WPrefs.app/WPrefs.c:546 ../../WPrefs.app/WPrefs.c:551 +#: ../../WPrefs.app/WPrefs.c:560 ../../WPrefs.app/WPrefs.c:570 +#: ../../WPrefs.app/WPrefs.c:578 ../../WPrefs.app/WPrefs.c:602 +#: ../../WPrefs.app/WPrefs.c:607 msgid "Error" -msgstr "Greška" +msgstr "Chyba" -#: ../../WPrefs/MouseSettings.c:155 -msgid "Invalid mouse acceleration threshold value. Must be the number of pixels to travel before accelerating." -msgstr "Kriva vrijednost ubrzavanja miša. Mora biti broj pixela putovanja prije ubrzavanja." +#: ../../WPrefs.app/MouseSettings.c:155 +msgid "" +"Invalid mouse acceleration threshold value. Must be the number of pixels to " +"travel before accelerating." +msgstr "Chybná hodnota pro práh zrychlení myši. Zadejte číslo označující počet pixelů před akcelarecí." -#: ../../WPrefs/MouseSettings.c:209 +#: ../../WPrefs.app/MouseSettings.c:209 +#, c-format msgid "mouse button %s not supported by WPrefs." -msgstr "tipka miše %s nije podržana od WPrefs-a." +msgstr "tlačítko myši %s není podporováno." -#: ../../WPrefs/MouseSettings.c:243 ../../WPrefs/MouseSettings.c:254 ../../WPrefs/MouseSettings.c:265 +#: ../../WPrefs.app/MouseSettings.c:243 ../../WPrefs.app/MouseSettings.c:254 +#: ../../WPrefs.app/MouseSettings.c:265 +#, c-format msgid "bad value %s for option %s" -msgstr "kriva vrijednost %s za opciju %s" +msgstr "chybná hodnota %s pro volbu %s" -#: ../../WPrefs/MouseSettings.c:325 -msgid "modifier key %s for option ModifierKey was not recognized. Using %s as default" -msgstr "modifier ključ %s za opciju ModifierKey nije prepoznat. Koristim %s." +#: ../../WPrefs.app/MouseSettings.c:325 +#, c-format +msgid "" +"modifier key %s for option ModifierKey was not recognized. Using %s as " +"default" +msgstr "" +"modifikátor klávesy %s pro volbu \"ModifierKey\" není znám. Používám %s." -#: ../../WPrefs/MouseSettings.c:350 +#: ../../WPrefs.app/MouseSettings.c:350 msgid "could not retrieve keyboard modifier mapping" -msgstr "ne mogu povući keyboard modifier mapping" +msgstr "nelze převzít mapování modifikátorů kláves" -#: ../../WPrefs/MouseSettings.c:497 +#: ../../WPrefs.app/MouseSettings.c:497 msgid "Mouse Speed" -msgstr "Brzina miša" +msgstr "Rychlost myši" -#: ../../WPrefs/MouseSettings.c:564 +#: ../../WPrefs.app/MouseSettings.c:564 msgid "Threshold:" -msgstr "Treshold:" +msgstr "Mez:" -#: ../../WPrefs/MouseSettings.c:579 +#: ../../WPrefs.app/MouseSettings.c:579 msgid "Double-Click Delay" -msgstr "Razmak između dvostrukog klika" +msgstr "Prodleva pro dvojité ťuknutí" -#: ../../WPrefs/MouseSettings.c:623 +#: ../../WPrefs.app/MouseSettings.c:623 msgid "Test" msgstr "Test" -#: ../../WPrefs/MouseSettings.c:633 +#: ../../WPrefs.app/MouseSettings.c:633 msgid "Workspace Mouse Actions" -msgstr "Akcije miša na radnom prostoru" +msgstr "Akce myší" -#: ../../WPrefs/MouseSettings.c:638 +#: ../../WPrefs.app/MouseSettings.c:638 msgid "Disable mouse actions" -msgstr "Onemogući akcije miša" +msgstr "Zakaž akce myší" -#: ../../WPrefs/MouseSettings.c:691 +#: ../../WPrefs.app/MouseSettings.c:691 msgid "Applications menu" -msgstr "Menu Aplikacije" +msgstr "Menu aplikací" -#: ../../WPrefs/MouseSettings.c:697 +#: ../../WPrefs.app/MouseSettings.c:697 msgid "Window list menu" -msgstr "Menu Lista prozora" +msgstr "Seznam oken" -#: ../../WPrefs/MouseSettings.c:703 +#: ../../WPrefs.app/MouseSettings.c:703 msgid "Select windows" -msgstr "Odaberi prozore" +msgstr "Vyber okna" -#: ../../WPrefs/MouseSettings.c:738 +#: ../../WPrefs.app/MouseSettings.c:738 msgid "Mouse Grab Modifier" -msgstr "Modifier za \"hvatanje\" prozora mišom" +msgstr "Modifikátor pro myš" -#: ../../WPrefs/MouseSettings.c:772 +#: ../../WPrefs.app/MouseSettings.c:772 +#, c-format msgid "could not create %s" -msgstr "ne mogu kreirati %s" +msgstr "nelze vytvořit \"%s\"" -#: ../../WPrefs/MouseSettings.c:788 +#: ../../WPrefs.app/MouseSettings.c:788 +#, c-format msgid "could not create temporary file %s" -msgstr "ne mogu kreirati privremenu datoteku %s" +msgstr "nelze vytvořit dočasný soubor %s" -#: ../../WPrefs/MouseSettings.c:813 +#: ../../WPrefs.app/MouseSettings.c:813 +#, c-format msgid "could not rename file %s to %s\n" -msgstr "ne mogu preimenovati datoteku %s u %s\n" +msgstr "soubor %s nelze přejmenovat na %s\n" -#: ../../WPrefs/MouseSettings.c:896 +#: ../../WPrefs.app/MouseSettings.c:896 msgid "Mouse Preferences" -msgstr "Postavke miša" +msgstr "Nastavení myši" -#: ../../WPrefs/Paths.c:82 +#: ../../WPrefs.app/Paths.c:82 msgid "bad value in option IconPath. Using default path list" -msgstr "kriva vrijednost IconPath opciji. Koristim početnu listu staza" +msgstr "ve volbě IconPath je nesprávná hodnota. Používám standardní nastavení" -#: ../../WPrefs/Paths.c:99 +#: ../../WPrefs.app/Paths.c:99 msgid "bad value in option PixmapPath. Using default path list" -msgstr "kriva vrijednost u PixmapPath opciji. Koristim početnu listu staza" +msgstr "ve volbě PixmapPath je chybná hodnota. Používám standard." -#: ../../WPrefs/Paths.c:301 +#: ../../WPrefs.app/Paths.c:301 msgid "Icon Search Paths" -msgstr "Staze za ikone" +msgstr "Adresáře ikon" -#: ../../WPrefs/Paths.c:313 ../../WPrefs/Paths.c:349 +#: ../../WPrefs.app/Paths.c:313 ../../WPrefs.app/Paths.c:349 msgid "Add" -msgstr "Dodaj" +msgstr "Přidat" -#: ../../WPrefs/Paths.c:320 ../../WPrefs/Paths.c:356 +#: ../../WPrefs.app/Paths.c:320 ../../WPrefs.app/Paths.c:356 msgid "Remove" -msgstr "Obriši" +msgstr "Odstranit" -#: ../../WPrefs/Paths.c:337 +#: ../../WPrefs.app/Paths.c:337 msgid "Pixmap Search Paths" -msgstr "Staze za pixmape" +msgstr "Adresáře pro obrázky" -#: ../../WPrefs/Paths.c:385 +#: ../../WPrefs.app/Paths.c:385 msgid "Search Path Configuration" -msgstr "Konfiguracija staza" +msgstr "Konfigurace prohledávaných cest" -#: ../../WPrefs/Preferences.c:142 +#: ../../WPrefs.app/Preferences.c:142 msgid "Size Display" -msgstr "Prikaz veličine" +msgstr "Zobrazení velikosti" -#: ../../WPrefs/Preferences.c:147 ../../WPrefs/Preferences.c:163 +#: ../../WPrefs.app/Preferences.c:147 ../../WPrefs.app/Preferences.c:163 msgid "Corner of screen" -msgstr "Kut ekrana" +msgstr "Roh obrazovky" -#: ../../WPrefs/Preferences.c:148 ../../WPrefs/Preferences.c:164 +#: ../../WPrefs.app/Preferences.c:148 ../../WPrefs.app/Preferences.c:164 msgid "Center of screen" -msgstr "Središte ekrana" +msgstr "Střed obrazovky" -#: ../../WPrefs/Preferences.c:149 ../../WPrefs/Preferences.c:165 +#: ../../WPrefs.app/Preferences.c:149 ../../WPrefs.app/Preferences.c:165 msgid "Center of resized window" -msgstr "Središte prozora" +msgstr "Střed okna" -#: ../../WPrefs/Preferences.c:150 +#: ../../WPrefs.app/Preferences.c:150 msgid "Technical drawing-like" -msgstr "Poput tehničkog crtanja" +msgstr "Jako kóty výkresů" -#: ../../WPrefs/Preferences.c:158 +#: ../../WPrefs.app/Preferences.c:158 msgid "Position Display" -msgstr "Prikaz pozicije" +msgstr "Zobrazení pozice" -#: ../../WPrefs/Preferences.c:173 +#: ../../WPrefs.app/Preferences.c:173 msgid "Show balloon text for..." -msgstr "Pokaži tekst u balonu za..." +msgstr "Balónová nápověda pro..." -#: ../../WPrefs/Preferences.c:180 +#: ../../WPrefs.app/Preferences.c:180 msgid "incomplete window titles" -msgstr "nepotpune naslove prozora" +msgstr "nekompletní titulky oken" -#: ../../WPrefs/Preferences.c:181 +#: ../../WPrefs.app/Preferences.c:181 msgid "miniwindow titles" -msgstr "nalsove miniprozora" +msgstr "ikony" -#: ../../WPrefs/Preferences.c:182 +#: ../../WPrefs.app/Preferences.c:182 msgid "application/dock icons" -msgstr "aplikacijske/dock ikone" +msgstr "aplikační/ukotvené ikony" -#: ../../WPrefs/Preferences.c:195 -msgid "Raise window when switching focus with keyboard." -msgstr "Podići prozor pri mjenjanju fokusa tastaturom." +#: ../../WPrefs.app/Preferences.c:195 +msgid "Raise window when switching focus with keyboard (CirculateRaise)." +msgstr "Při změně zaměření přes klávesnici zdvihnout okno." -#: ../../WPrefs/Preferences.c:215 +#: ../../WPrefs.app/Preferences.c:215 msgid "Miscellaneous Ergonomic Preferences" -msgstr "Razne ergonomske postavke" +msgstr "Různá nastavení ergonomie" -#: ../../WPrefs/Text.c:179 +#: ../../WPrefs.app/Text.c:179 +#, c-format msgid "Invalid font %s." -msgstr "Krivi font %s." +msgstr "Chybný font %s." -#: ../../WPrefs/Text.c:256 +#: ../../WPrefs.app/Text.c:256 msgid "Set Font..." -msgstr "Postavi font..." +msgstr "Nastavit font..." -#: ../../WPrefs/Text.c:262 +#: ../../WPrefs.app/Text.c:262 msgid "Window Title Font" -msgstr "Font naslova prozora" +msgstr "Font titulku oken" -#: ../../WPrefs/Text.c:263 +#: ../../WPrefs.app/Text.c:263 msgid "Menu Title Font" -msgstr "Font naslova menu-a" +msgstr "Font titulku menu" -#: ../../WPrefs/Text.c:264 +#: ../../WPrefs.app/Text.c:264 msgid "Menu Item Font" -msgstr "Font stavke u menu-u" +msgstr "Font položky menu" -#: ../../WPrefs/Text.c:265 +#: ../../WPrefs.app/Text.c:265 msgid "Icon Title Font" -msgstr "Font naslova ikone" +msgstr "Font titulků ikon" -#: ../../WPrefs/Text.c:266 +#: ../../WPrefs.app/Text.c:266 msgid "Clip Title Font" -msgstr "Font naslova clipa" +msgstr "Font pro Sponku" -#: ../../WPrefs/Text.c:267 +#: ../../WPrefs.app/Text.c:267 msgid "Geometry Display Font" -msgstr "Font prikaza geometry" +msgstr "Font zobrazení geometrie" -#: ../../WPrefs/Text.c:280 +#: ../../WPrefs.app/Text.c:280 msgid "" "Sample Text\n" "abcdefghijklmnopqrstuvxywz\n" "ABCDEFGHIJKLMNOPQRSTUVXYWZ\n" "0123456789" msgstr "" -"Primjer texta\n" +"Příklad textu\n" "abcdefghijklmnopqrstuvxywz\n" "ABCDEFGHIJKLMNOPQRSTUVXYWZ\n" "0123456789" -#: ../../WPrefs/Text.c:285 +#: ../../WPrefs.app/Text.c:285 msgid "Alignment" -msgstr "Poravnanje" +msgstr "Zarovnání" -#: ../../WPrefs/Text.c:290 +#: ../../WPrefs.app/Text.c:290 msgid "Left" -msgstr "Lijevo" +msgstr "Vlevo" -#: ../../WPrefs/Text.c:296 +#: ../../WPrefs.app/Text.c:296 msgid "Center" -msgstr "Sredina" +msgstr "Centrovat" -#: ../../WPrefs/Text.c:303 +#: ../../WPrefs.app/Text.c:303 msgid "Right" -msgstr "Desno" +msgstr "Vpravo" -#: ../../WPrefs/Text.c:325 +#: ../../WPrefs.app/Text.c:325 msgid "Text Preferences" -msgstr "Postavke teksta" +msgstr "Nastavení textů" -#: ../../WPrefs/TextureAndColor.c:339 +#: ../../WPrefs.app/TextureAndColor.c:384 msgid "Window Title Bar" -msgstr "Title Bar prozora" +msgstr "Titulek okna" -#: ../../WPrefs/TextureAndColor.c:340 +#: ../../WPrefs.app/TextureAndColor.c:385 msgid "Menu Title Bar" -msgstr "Title Bar menu-a" +msgstr "Menu titulku" -#: ../../WPrefs/TextureAndColor.c:341 +#: ../../WPrefs.app/TextureAndColor.c:386 msgid "Menu Items" -msgstr "Stavke menu-a" +msgstr "Položky men" -#: ../../WPrefs/TextureAndColor.c:342 +#: ../../WPrefs.app/TextureAndColor.c:387 msgid "Workspace/Clip" -msgstr "Radni prostor/Clip" +msgstr "Plocha/Sponka" -#: ../../WPrefs/TextureAndColor.c:343 +#: ../../WPrefs.app/TextureAndColor.c:388 msgid "Icons" -msgstr "Ikone" +msgstr "Ikony" -#: ../../WPrefs/TextureAndColor.c:354 +#: ../../WPrefs.app/TextureAndColor.c:399 msgid "Focused Window" -msgstr "Fokusirani prozor" +msgstr "Zaměřené okno" -#: ../../WPrefs/TextureAndColor.c:367 ../../WPrefs/TextureAndColor.c:398 ../../WPrefs/TextureAndColor.c:429 +#: ../../WPrefs.app/TextureAndColor.c:412 +#: ../../WPrefs.app/TextureAndColor.c:443 +#: ../../WPrefs.app/TextureAndColor.c:474 msgid "Texture" -msgstr "Tekstura" +msgstr "Textura" -#: ../../WPrefs/TextureAndColor.c:373 ../../WPrefs/TextureAndColor.c:404 ../../WPrefs/TextureAndColor.c:435 +#: ../../WPrefs.app/TextureAndColor.c:418 +#: ../../WPrefs.app/TextureAndColor.c:449 +#: ../../WPrefs.app/TextureAndColor.c:480 msgid "Text Color" -msgstr "Boja teksta" +msgstr "Barva textu" -#: ../../WPrefs/TextureAndColor.c:378 ../../WPrefs/TextureAndColor.c:409 ../../WPrefs/TextureAndColor.c:440 ../../WPrefs/TextureAndColor.c:464 ../../WPrefs/TextureAndColor.c:530 ../../WPrefs/TextureAndColor.c:607 +#: ../../WPrefs.app/TextureAndColor.c:423 +#: ../../WPrefs.app/TextureAndColor.c:454 +#: ../../WPrefs.app/TextureAndColor.c:485 +#: ../../WPrefs.app/TextureAndColor.c:509 +#: ../../WPrefs.app/TextureAndColor.c:575 +#: ../../WPrefs.app/TextureAndColor.c:652 msgid "Set..." -msgstr "Postavi..." +msgstr "Nastavit..." -#: ../../WPrefs/TextureAndColor.c:385 +#: ../../WPrefs.app/TextureAndColor.c:430 msgid "Unfocused Window" -msgstr "Nefokusirani prozor" +msgstr "Nezaměřená okna" -#: ../../WPrefs/TextureAndColor.c:416 +#: ../../WPrefs.app/TextureAndColor.c:461 msgid "Owner of Focused Window" -msgstr "Vlasnik fokusiranog prozora" +msgstr "Vlastník zaměřeného okna" -#: ../../WPrefs/TextureAndColor.c:449 +#: ../../WPrefs.app/TextureAndColor.c:494 msgid "Unselected Items" -msgstr "Neselktirne stvari" +msgstr "Nevybrané položky" -#: ../../WPrefs/TextureAndColor.c:459 ../../WPrefs/TextureAndColor.c:513 +#: ../../WPrefs.app/TextureAndColor.c:504 +#: ../../WPrefs.app/TextureAndColor.c:558 msgid "Background" -msgstr "Pozadina" +msgstr "Pozadí" -#: ../../WPrefs/TextureAndColor.c:474 +#: ../../WPrefs.app/TextureAndColor.c:519 msgid "Normal Text" -msgstr "Normalni tekst" +msgstr "Normální text" -#: ../../WPrefs/TextureAndColor.c:484 +#: ../../WPrefs.app/TextureAndColor.c:529 msgid "Disabled Text" -msgstr "Onemogućeni tekst" +msgstr "Zakazaný text" -#: ../../WPrefs/TextureAndColor.c:493 +#: ../../WPrefs.app/TextureAndColor.c:538 msgid "Selected Items" -msgstr "Selektirani tekst" +msgstr "Vybrané položky" -#: ../../WPrefs/TextureAndColor.c:503 +#: ../../WPrefs.app/TextureAndColor.c:548 msgid "Text" -msgstr "Tekst" +msgstr "Text" -#: ../../WPrefs/TextureAndColor.c:521 +#: ../../WPrefs.app/TextureAndColor.c:566 msgid "Menu Title Background" -msgstr "Pozadina naslova menu-a" +msgstr "Pozadí pro titulek menu" -#: ../../WPrefs/TextureAndColor.c:539 +#: ../../WPrefs.app/TextureAndColor.c:584 msgid "Menu Title Text" -msgstr "Tekst naslova menu-a" +msgstr "Barva textu v menu" -#: ../../WPrefs/TextureAndColor.c:551 +#: ../../WPrefs.app/TextureAndColor.c:596 msgid "Workspace Background" -msgstr "Pozadina radnog prostora" +msgstr "Pozadí plochy" -#: ../../WPrefs/TextureAndColor.c:560 +#: ../../WPrefs.app/TextureAndColor.c:605 msgid "Change" -msgstr "Promjeni" +msgstr "Změnit" -#: ../../WPrefs/TextureAndColor.c:566 +#: ../../WPrefs.app/TextureAndColor.c:611 msgid "Clip Title Text" -msgstr "Tekst naslova clipa" +msgstr "Barva pro text Sponky" -#: ../../WPrefs/TextureAndColor.c:576 +#: ../../WPrefs.app/TextureAndColor.c:621 msgid "Normal" -msgstr "Normalan" +msgstr "Normální" -#: ../../WPrefs/TextureAndColor.c:586 +#: ../../WPrefs.app/TextureAndColor.c:631 msgid "Collapsed" -msgstr "Srušen" +msgstr "Svinuto" -#: ../../WPrefs/TextureAndColor.c:598 +#: ../../WPrefs.app/TextureAndColor.c:643 msgid "Icon Background" -msgstr "Pozadina ikone" +msgstr "Pozadí ikon" -#: ../../WPrefs/TextureAndColor.c:632 +#: ../../WPrefs.app/TextureAndColor.c:677 msgid "Texture and Color Preferences" -msgstr "Postavke tekstura i boja" +msgstr "Nastavení textur a barev" -#: ../../WPrefs/WPrefs.c:196 -msgid "WindowMaker Preferences" -msgstr "Postavke WindowMaker-a" +#: ../../WPrefs.app/WPrefs.c:196 +msgid "Window Maker Preferences" +msgstr "Nastavení Window Makeru" -#: ../../WPrefs/WPrefs.c:218 +#: ../../WPrefs.app/WPrefs.c:220 msgid "Revert Page" -msgstr "Povrati stranicu" +msgstr "Stránku zpět" -#: ../../WPrefs/WPrefs.c:224 +#: ../../WPrefs.app/WPrefs.c:226 msgid "Revert All" -msgstr "Povrati sve" +msgstr "Vše zpět" -#: ../../WPrefs/WPrefs.c:230 +#: ../../WPrefs.app/WPrefs.c:232 msgid "Save" -msgstr "Snimi" +msgstr "Ulož" -#: ../../WPrefs/WPrefs.c:236 +#: ../../WPrefs.app/WPrefs.c:238 msgid "Close" -msgstr "Zatvori" +msgstr "Uzavři" -#: ../../WPrefs/WPrefs.c:260 -msgid "Version %s for WindowMaker %s" -msgstr "Verzija %s za WindowMaker %s" +#: ../../WPrefs.app/WPrefs.c:262 +#, c-format +msgid "Version %s for Window Maker %s" +msgstr "Verze %s pro Window Maker %s" -#: ../../WPrefs/WPrefs.c:267 +#: ../../WPrefs.app/WPrefs.c:269 msgid "Starting..." -msgstr "Pokrećem..." +msgstr "Startuji..." -#: ../../WPrefs/WPrefs.c:273 +#: ../../WPrefs.app/WPrefs.c:275 msgid "" "Programming/Design: Alfredo K. Kojima\n" -"Artwork: Marco van Hylckama Vlieg" +"Artwork: Marco van Hylckama Vlieg\n" +"More Programming: James Thompson" msgstr "" -"Programiranje/Dizajn: Alfredo K. Kojima\n" -"Artwork: Marco van Hylckama Vlieg" +"Programoval/Návrh: Alfredo K. Kojima\n" +"Předloha: Marco van Hylckama Vlieg\n" +"Spolupracoval: James Thompson" -#: ../../WPrefs/WPrefs.c:360 +#: ../../WPrefs.app/WPrefs.c:363 +#, c-format msgid "could not locate image file %s\n" -msgstr "ne mogu naći image daoteku %s\n" +msgstr "nelze najít soubor %s s obrázkem\n" -#: ../../WPrefs/WPrefs.c:484 -msgid "Loading WindowMaker configuration files..." -msgstr "Učitavam WindowMaker konfiguracijske datoteke..." +#: ../../WPrefs.app/WPrefs.c:488 +msgid "Loading Window Maker configuration files..." +msgstr "Čtu konfigurační soubory Window Makeru" -#: ../../WPrefs/WPrefs.c:488 +#: ../../WPrefs.app/WPrefs.c:492 msgid "Initializing configuration panels..." -msgstr "Inicijaliziram konfiguracijske panele..." +msgstr "Inicializace konfiguračních panelů..." -#: ../../WPrefs/WPrefs.c:535 ../../WPrefs/WPrefs.c:590 -msgid "WindowMaker domain (%s) is corrupted!" -msgstr "WindowMaker domena (%s) je oštećena!" +#: ../../WPrefs.app/WPrefs.c:545 ../../WPrefs.app/WPrefs.c:601 +#, c-format +msgid "Window Maker domain (%s) is corrupted!" +msgstr "Doména Window Makeru (%s) je poškozena!" -#: ../../WPrefs/WPrefs.c:539 -msgid "Could not load WindowMaker domain (%s) from defaults database." -msgstr "Ne mogu učitati WindowMaker domenu (%s) iz početne baze." +#: ../../WPrefs.app/WPrefs.c:549 +#, c-format +msgid "Could not load Window Maker domain (%s) from defaults database." +msgstr "z databáze standardů nelze načíst doménu Window Makeru (%s)." -#: ../../WPrefs/WPrefs.c:547 -msgid "could not extract version information from WindowMaker" -msgstr "ne mogu izvuči informaciju o verziji WindowMaker-a" +#: ../../WPrefs.app/WPrefs.c:557 +msgid "could not extract version information from Window Maker" +msgstr "od Window Makeru nelze získat číslo verze" -#: ../../WPrefs/WPrefs.c:548 -msgid "Make sure WindowMaker is in your search path." -msgstr "Provjerite da je WindowMaker u vašoj search stazi." +#: ../../WPrefs.app/WPrefs.c:558 +msgid "Make sure Window Maker is in your search path." +msgstr "Zajistěte, aby byl Window Maker v prohledávaných adresářích ($PATH)." -#: ../../WPrefs/WPrefs.c:551 ../../WPrefs/WPrefs.c:560 -msgid "Could not extract version from WindowMaker. Make sure it is correctly installed." -msgstr "Ne mogu izvuči verziju WindowMakera. Provjerite da je ispravno instaliran." - -#: ../../WPrefs/WPrefs.c:565 +#: ../../WPrefs.app/WPrefs.c:561 ../../WPrefs.app/WPrefs.c:571 msgid "" -"WPrefs only supports WindowMaker 0.18.0 or newer.\n" +"Could not extract version from Window Maker. Make sure it is correctly " +"installed." +msgstr "Od Window Makeru nelze získat číslo verze. Zjistěte, je-li správne instalován." + +#: ../../WPrefs.app/WPrefs.c:576 +#, c-format +msgid "" +"WPrefs only supports Window Maker 0.18.0 or newer.\n" "The version installed is %i.%i.%i\n" msgstr "" -"WPrefs podržava samo WindowMaker 0.18.0 ili noviji.\n" -"Instalirana je verzija %i.%i.%i\n" +"Program WPrefs podporuje Window Maker 0.18.0 a vyšší.\n" +"Instalovaná verze je %i.%i.%i\n" -#: ../../WPrefs/WPrefs.c:572 -msgid "WindowMaker %i.%i.%i, which is installed in your system, is not fully supported by this version of WPrefs." -msgstr "WindowMaker %i.%i.%i, koji je instaliran na vašem sistemu, nije potpuno podržan ovom verzijom WPrefs-a." - -#: ../../WPrefs/WPrefs.c:579 -msgid "could not run \"wmaker -global_defaults_path\"." -msgstr "ne mogu pokrenuti \"wmaker -global_defaults_path\"." - -#: ../../WPrefs/WPrefs.c:594 -msgid "Could not load global WindowMaker domain (%s)." -msgstr "Ne mogu učitati globlanu WindowMaker domenu (%s)." - -#: ../../WPrefs/WPrefs.c:840 +#: ../../WPrefs.app/WPrefs.c:583 +#, c-format msgid "" -"bad speed value for option %s.\n" -"Using default Medium" +"Window Maker %i.%i.%i, which is installed in your system, is not fully " +"supported by this version of WPrefs." +msgstr "Instalovaný Window Maker %i.%i.%i není plně touto verzí programu WPrefs podporován." + +#: ../../WPrefs.app/WPrefs.c:590 +msgid "could not run \"wmaker -global_defaults_path\"." +msgstr "nelze provést \"wmaker -global_defaults_path\"" + +#: ../../WPrefs.app/WPrefs.c:605 +#, c-format +msgid "Could not load global Window Maker domain (%s)." +msgstr "Nelze načíst globální doménu pro Window Maker (%s)." + +#: ../../WPrefs.app/WPrefs.c:851 +#, c-format +msgid "" +"bad speed value for option %s\n" +". Using default Medium" msgstr "" -"kriva vrijednost za brzinu za opciju %s.\n" -"Koristm Medium" +"pro volbu %s je chybně určená\n" +"ryclost. Použita 'Medium'" -#: ../../WPrefs/WindowHandling.c:108 +#: ../../WPrefs.app/WindowHandling.c:107 +#, c-format msgid "bad option value %s in WindowPlacement. Using default value" -msgstr "kriva vrijednost opcije %s za WindowPlacement. Koristim početnu vrijednost" +msgstr "chybná hodnota volby %s ve WindowPlacement. Používám standardní" -#: ../../WPrefs/WindowHandling.c:130 +#: ../../WPrefs.app/WindowHandling.c:129 msgid "invalid data in option WindowPlaceOrigin. Using default (0,0)" -msgstr "krivi podaci u opciji WindowPlaceOrigin. Koristim početno (0,0)" +msgstr "chybná data pro WindowPlaceOrigin. Používám (0,0)" -#: ../../WPrefs/WindowHandling.c:192 +#: ../../WPrefs.app/WindowHandling.c:188 msgid "Window Placement" -msgstr "Položaj prozora" +msgstr "Pokládání oken" -#: ../../WPrefs/WindowHandling.c:197 +#: ../../WPrefs.app/WindowHandling.c:193 msgid "Automatic" -msgstr "Automatski" +msgstr "Automatické" -#: ../../WPrefs/WindowHandling.c:198 +#: ../../WPrefs.app/WindowHandling.c:194 msgid "Random" -msgstr "Slučajno" +msgstr "Náhodné" -#: ../../WPrefs/WindowHandling.c:199 +#: ../../WPrefs.app/WindowHandling.c:195 msgid "Manual" -msgstr "Ručno" +msgstr "Ruční" -#: ../../WPrefs/WindowHandling.c:200 +#: ../../WPrefs.app/WindowHandling.c:196 msgid "Cascade" -msgstr "Cascade" +msgstr "Kaskádně" -#: ../../WPrefs/WindowHandling.c:206 +#: ../../WPrefs.app/WindowHandling.c:202 msgid "Placement Origin" -msgstr "Početni položaj" +msgstr "Počáteční poloha" -#: ../../WPrefs/WindowHandling.c:260 +#: ../../WPrefs.app/WindowHandling.c:256 msgid "Opaque Move" -msgstr "Micanje punog prozora" +msgstr "Přesouvat plná okna" -#: ../../WPrefs/WindowHandling.c:296 +#: ../../WPrefs.app/WindowHandling.c:292 msgid "When maximizing..." -msgstr "Pri maksimiziranju..." +msgstr "Při maximalizaci..." -#: ../../WPrefs/WindowHandling.c:301 +#: ../../WPrefs.app/WindowHandling.c:297 msgid "...do not resize over icons" -msgstr "ne pokrivati ikone" +msgstr "... nezvětšovat přes ikony" -#: ../../WPrefs/WindowHandling.c:306 -msgid "...do not resize over dock" -msgstr "ne pokrivati dock" - -#: ../../WPrefs/WindowHandling.c:319 +#: ../../WPrefs.app/WindowHandling.c:310 msgid "Keep transients above their owners" -msgstr "Transient-i iznad svojih vlasnika" +msgstr "Dialogy držet nad vlastníky" -#: ../../WPrefs/WindowHandling.c:346 +#: ../../WPrefs.app/WindowHandling.c:337 msgid "Window Handling Preferences" -msgstr "Postavke postupanja prozorima" +msgstr "Nastavení práce s okny" -#: ../../WPrefs/Workspace.c:135 +#: ../../WPrefs.app/Workspace.c:137 msgid "Workspace Navigation" -msgstr "Navigacija radnim prostorima" +msgstr "Orientace v plochách" -#: ../../WPrefs/Workspace.c:159 +#: ../../WPrefs.app/Workspace.c:161 msgid "drag windows between workspaces." -msgstr "povlačenje prozora između radnih prostora." +msgstr "táhnout okna mezi pracovními plochami." -#: ../../WPrefs/Workspace.c:184 -msgid "switch to first workspace when switching past the last workspace and vice-versa" -msgstr "prebacivanje na prvi radni prostor pri prelaženju sa zadnjeg i obrnuto." +#: ../../WPrefs.app/Workspace.c:186 +msgid "" +"switch to first workspace when switching past the last workspace and " +"vice-versa" +msgstr "za poslední plochou přepni opět na první a opačně" -#: ../../WPrefs/Workspace.c:208 +#: ../../WPrefs.app/Workspace.c:210 msgid "create a new workspace when switching past the last workspace." -msgstr "stvaranje novog radnog prostora pri prelaženju sa zadnjeg." +msgstr "za poslední plochou vytvoř při přepnutí novou." -#: ../../WPrefs/Workspace.c:216 +#: ../../WPrefs.app/Workspace.c:218 msgid "Dock/Clip" -msgstr "Dock/Clip" +msgstr "Dok/Sponka" -#: ../../WPrefs/Workspace.c:285 +#: ../../WPrefs.app/Workspace.c:287 msgid "Workspace Preferences" -msgstr "Postavke radnog prostora" +msgstr "Nastavení pracovní plochy " -#: ../../WPrefs/main.c:56 +#: ../../WPrefs.app/main.c:56 +#, c-format msgid "usage: %s [options]\n" -msgstr "uporaba: %s [opcije]\n" +msgstr "použití: %s [volby]\n" -#: ../../WPrefs/main.c:57 +#: ../../WPrefs.app/main.c:57 msgid "options:" -msgstr "opcije:" +msgstr "volby:" -#: ../../WPrefs/main.c:58 +#: ../../WPrefs.app/main.c:58 msgid " -display \tdisplay to be used" -msgstr " -display \tdisplay za korištenje" +msgstr " -display \tkterý display použít" -#: ../../WPrefs/main.c:59 +#: ../../WPrefs.app/main.c:59 msgid " -version\t\tprint version number and exit" -msgstr " -version\t\tispiši verziju u izađi" +msgstr " -version\t\tzobraz verzi a konec" -#: ../../WPrefs/main.c:82 +#: ../../WPrefs.app/main.c:82 +#, c-format msgid "too few arguments for %s" -msgstr "premalo argumenata za %s" +msgstr "nedostatek argumetů pro %s" -#: ../../WPrefs/main.c:104 +#: ../../WPrefs.app/main.c:104 msgid "X server does not support locale" -msgstr "X server ne podržava locale" +msgstr "X server nepodporuje nastavení místních zvyklostí" -#: ../../WPrefs/main.c:107 +#: ../../WPrefs.app/main.c:107 msgid "cannot set locale modifiers" -msgstr "ne mogu postaviti locale modifiere" +msgstr "nelze nastavit modifikátory místních zvyklostí" -#: ../../WPrefs/main.c:113 +#: ../../WPrefs.app/main.c:113 +#, c-format msgid "could not open display %s" -msgstr "ne mogu otvoriti display %s" +msgstr "nelze otevřít displej %s" -#: ../../WPrefs/main.c:121 +#: ../../WPrefs.app/main.c:121 msgid "could not initialize application" -msgstr "ne mogu inicijalizirati aplikaciju" - -# msgid "The format of the current menu file (%s) is not supported by WPrefs. A new menu will be created." -# msgstr "Format trenutne menu datoteke (%s) nije podržan od strane WPrefs-a. Kreirat ću novi menu." -# -# msgid "Omnipresent miniwindows" -# msgstr "SvugdjePrisutni mini prozori" -# -# msgid "Error extracting version from WindowMaker. Make sure it is correctly installed." -# msgstr "Greška pri izvlačenju verzije WindowMakera. Provjerite da je ispravno instaliran." -# -# msgid "Auto-arrange icons" -# msgstr "Auto-pospremanje ikona" -# -# msgid "Open submenus to the left if they don't fit inside the screen." -# msgstr "Otvoriti podmenu-e na lijevo ako ne stanu unutar ekrana." -# -# msgid "Use SaveUnders in icons, menus and other objects" -# msgstr "Koristi SnimiIspod u ikonama, menuima i drugim objektima" -# -# msgid "Type the path for the directory. You can type more than one path by separating them with spaces." -# msgstr "Upišite stazu za direktorij. Možete upisati više od jedne staze odvajajući ih razmacima." -# -# msgid "invalid data in option WindowPlacementOrigin. Using default (0,0)" -# msgstr "krivi podaci u opciji WindowPlacementOrigin. Koristim (0,0)" -# -# msgid "Icon Size" -# msgstr "Veličina ikone" -# +msgstr "nelze inicializovat aplikaci" +\ No newline at end of file diff --git a/WPrefs.app/po/ko.po b/WPrefs.app/po/ko.po index 5c3cb73d..4ce2c78a 100644 --- a/WPrefs.app/po/ko.po +++ b/WPrefs.app/po/ko.po @@ -1,5 +1,5 @@ # Korean message file for WPrefs -# Last Update: version 0.2 +# Last Update: version 0.6 # msgid "" msgstr "" @@ -12,785 +12,801 @@ msgstr "" "Xgettext-Options: --default-domain=WPrefs --add-comments --keyword=_\n" "Files: ../../WPrefs/Configurations.c ../../WPrefs/Expert.c ../../WPrefs/Focus.c ../../WPrefs/KeyboardSettings.c ../../WPrefs/KeyboardShortcuts.c ../../WPrefs/Menu.c ../../WPrefs/MenuGuru.c ../../WPrefs/MenuPreferences.c ../../WPrefs/MouseSettings.c ../../WPrefs/Paths.c ../../WPrefs/Preferences.c ../../WPrefs/Text.c ../../WPrefs/TextureAndColor.c ../../WPrefs/WPrefs.c ../../WPrefs/WindowHandling.c ../../WPrefs/Workspace.c ../../WPrefs/main.c ../../WPrefs/xmodifier.c\n" -#: ../../WPrefs/Configurations.c:141 ../../WPrefs/Configurations.c:147 ../../WPrefs/MouseSettings.c:510 ../../WPrefs/WindowHandling.c:274 ../../WPrefs/WindowHandling.c:286 ../../WPrefs/Workspace.c:70 ../../WPrefs/Workspace.c:76 +#: ../../WPrefs.app/Configurations.c:142 ../../WPrefs.app/Configurations.c:148 ../../WPrefs.app/MouseSettings.c:510 ../../WPrefs.app/WindowHandling.c:270 ../../WPrefs.app/WindowHandling.c:282 ../../WPrefs.app/Workspace.c:71 ../../WPrefs.app/Workspace.c:77 msgid "could not load icon %s" msgstr "%s žĆŔĚÄÜŔť ŔĐŔť źö žřŔ˝" -#: ../../WPrefs/Configurations.c:154 ../../WPrefs/Workspace.c:83 +#: ../../WPrefs.app/Configurations.c:156 ../../WPrefs.app/Workspace.c:85 msgid "could not process icon %s:" -msgstr "" +msgstr "%s žĆŔĚÄÜŔť Ăł¸ŽÇĎÁö ¸řÇÔ:" -#: ../../WPrefs/Configurations.c:179 ../../WPrefs/Workspace.c:122 +#: ../../WPrefs.app/Configurations.c:181 ../../WPrefs.app/Workspace.c:124 msgid "could not load image file %s" msgstr "%s ŔĚšĚÁö ĆÄŔĎŔť ŔĐŔť źö žřŔ˝" -#: ../../WPrefs/Configurations.c:193 +#: ../../WPrefs.app/Configurations.c:195 msgid "Icon Slide Speed" msgstr "žĆŔĚÄÜ ˝˝śóŔĚľĺ źÓľľ" -#: ../../WPrefs/Configurations.c:199 +#: ../../WPrefs.app/Configurations.c:201 msgid "Shade Animation Speed" msgstr "Shade žÖ´Ď¸ŢŔĚźÇ źÓľľ" -#: ../../WPrefs/Configurations.c:232 ../../WPrefs/Configurations.c:244 ../../WPrefs/Focus.c:310 ../../WPrefs/Focus.c:321 ../../WPrefs/MenuPreferences.c:135 ../../WPrefs/MenuPreferences.c:146 ../../WPrefs/MenuPreferences.c:174 ../../WPrefs/MenuPreferences.c:189 ../../WPrefs/MouseSettings.c:538 ../../WPrefs/MouseSettings.c:549 ../../WPrefs/MouseSettings.c:604 ../../WPrefs/MouseSettings.c:615 ../../WPrefs/MouseSettings.c:651 ../../WPrefs/MouseSettings.c:666 ../../WPrefs/MouseSettings.c:682 ../../WPrefs/WPrefs.c:395 ../../WPrefs/WPrefs.c:413 +#: ../../WPrefs.app/Configurations.c:234 ../../WPrefs.app/Configurations.c:246 ../../WPrefs.app/Focus.c:310 ../../WPrefs.app/Focus.c:321 ../../WPrefs.app/MenuPreferences.c:135 ../../WPrefs.app/MenuPreferences.c:146 ../../WPrefs.app/MenuPreferences.c:174 ../../WPrefs.app/MenuPreferences.c:189 ../../WPrefs.app/MouseSettings.c:538 ../../WPrefs.app/MouseSettings.c:549 ../../WPrefs.app/MouseSettings.c:604 ../../WPrefs.app/MouseSettings.c:615 ../../WPrefs.app/MouseSettings.c:651 ../../WPrefs.app/MouseSettings.c:666 ../../WPrefs.app/MouseSettings.c:682 ../../WPrefs.app/WPrefs.c:398 ../../WPrefs.app/WPrefs.c:416 msgid "could not load icon file %s" msgstr "%s žĆŔĚÄÜ ĆÄŔĎŔť ŔĐŔť źö žřŔ˝" -#: ../../WPrefs/Configurations.c:260 +#: ../../WPrefs.app/Configurations.c:262 msgid "Titlebar Style" msgstr "ŸŔĚƲšŮ ˝şĹ¸ŔĎ" -#: ../../WPrefs/Configurations.c:297 +#: ../../WPrefs.app/Configurations.c:299 msgid "Animations and Sound" msgstr "žÖ´Ď¸ŢŔĚźÇ, Ŕ˝ÇâČż°ú" -#: ../../WPrefs/Configurations.c:303 +#: ../../WPrefs.app/Configurations.c:305 msgid "Animations" msgstr "žÖ´Ď¸ŢŔĚźÇ" -#: ../../WPrefs/Configurations.c:319 +#: ../../WPrefs.app/Configurations.c:321 msgid "Superfluous" msgstr "" -#: ../../WPrefs/Configurations.c:335 +#: ../../WPrefs.app/Configurations.c:337 msgid "Sounds" msgstr "Ŕ˝ÇâČż°ú" -#: ../../WPrefs/Configurations.c:352 +#: ../../WPrefs.app/Configurations.c:354 msgid "Note: sound requires a module distributed separately" msgstr "ÁÖŔÇ: Ŕ˝ÇâČż°ú´Â ľűˇÎŔĚ ščĆ÷ľÇ´Â ¸đľâŔĚ ÇĘżäÇÔ" -#: ../../WPrefs/Configurations.c:362 +#: ../../WPrefs.app/Configurations.c:364 msgid "Dithering colormap for 8bpp" msgstr "8bpp żë ÄĂˇŻ¸Ę ľđ´ő¸ľ" -#: ../../WPrefs/Configurations.c:367 +#: ../../WPrefs.app/Configurations.c:369 msgid "Disable dithering in any visual/depth" msgstr "ľđ´ő¸ľ ťçżëÇĎÁö žĘŔ˝" -#: ../../WPrefs/Configurations.c:388 +#: ../../WPrefs.app/Configurations.c:390 msgid "More colors for applications" msgstr "žÖÇøŽÄÉŔ̟ǿĄ ¸šŔş ÄĂˇŻ şÎżŠ" -#: ../../WPrefs/Configurations.c:395 +#: ../../WPrefs.app/Configurations.c:397 msgid "More colors for WindowMaker" msgstr "ŔŠľľżě¸ŢŔĚÄżżĄ ¸šŔş ÄĂˇŻ şÎżŠ" -#: ../../WPrefs/Configurations.c:448 +#: ../../WPrefs.app/Configurations.c:450 msgid "Other Configurations" msgstr "ą× żÜ źłÁ¤" -#: ../../WPrefs/Expert.c:69 +#: ../../WPrefs.app/Expert.c:70 msgid "Do not set non-WindowMaker specific parameters (do not use xset)" msgstr "ŔŠľľżě¸ŢŔĚÄżŔÇ ąâ´ÉŔĚ žĆ´Ń °ÍŔť źłÁ¤ÄĄ žĘŔ˝ (xset Ŕť ťçżëÇĎÁö žĘŔ˝)" -#: ../../WPrefs/Expert.c:70 +#: ../../WPrefs.app/Expert.c:71 msgid "Automatically save session when exiting WindowMaker" msgstr "ŔŠľľżě¸ŢŔĚÄż Ážˇá˝Ă źźźÇ ŔÚľż ŔúŔĺ" -#: ../../WPrefs/Expert.c:71 +#: ../../WPrefs.app/Expert.c:72 msgid "Use SaveUnder in window frames, icons, menus and other objects" msgstr "ŔŠľľżě ÇÁˇšŔÓ, žĆŔĚÄÜ, ¸Ţ´ş ľîżĄź­ SaveUnder ťçżëÇÔ" -#: ../../WPrefs/Expert.c:100 +#: ../../WPrefs.app/Expert.c:73 +msgid "Disable cycling color highlighting of icons." +msgstr "žĆŔĚÄÜ ÄĂˇŻ ÇĎŔĚśóŔĚĆĂ ťçżëÇĎÁö žĘŔ˝" + +#: ../../WPrefs.app/Expert.c:103 msgid "Expert User Preferences" msgstr "°íąŢ ťçżëŔÚżë źłÁ¤" -#: ../../WPrefs/Focus.c:79 +#: ../../WPrefs.app/Focus.c:79 msgid "bad option value %s for option FocusMode. Using default Manual" msgstr "Ć÷Äż˝ş ¸đľĺżĄ Ŕ߸řľČ °Ş %s. ąâşť°ŞŔÎ Manual Ŕť ťçżë" -#: ../../WPrefs/Focus.c:92 +#: ../../WPrefs.app/Focus.c:92 msgid "bad option value %s for option ColormapMode. Using default Manual" msgstr "ÄĂˇŻ¸Ę ¸đľĺżĄ Ŕ߸řľČ °Ş %s. ąâşť°ŞŔÎ Manual Ŕť ťçżë" -#: ../../WPrefs/Focus.c:190 +#: ../../WPrefs.app/Focus.c:190 msgid "" "Click on the window to set\n" "keyboard input focus." msgstr "" -#: ../../WPrefs/Focus.c:194 +#: ../../WPrefs.app/Focus.c:194 msgid "" "Set keyboard input focus to\n" "the window under the mouse pointer,\n" "including the root window." msgstr "" -#: ../../WPrefs/Focus.c:199 +#: ../../WPrefs.app/Focus.c:199 msgid "" "Set keyboard input focus to\n" "the window under the mouse pointer,\n" "except the root window." msgstr "" -#: ../../WPrefs/Focus.c:243 +#: ../../WPrefs.app/Focus.c:243 msgid "Input Focus Mode" msgstr "Ŕԡ ȰźşČ­ ¸đľĺ" -#: ../../WPrefs/Focus.c:248 +#: ../../WPrefs.app/Focus.c:248 msgid "Click window to focus" msgstr "" -#: ../../WPrefs/Focus.c:249 +#: ../../WPrefs.app/Focus.c:249 msgid "Focus follows mouse" msgstr "" -#: ../../WPrefs/Focus.c:250 +#: ../../WPrefs.app/Focus.c:250 msgid "\"Sloppy\" focus" msgstr "" -#: ../../WPrefs/Focus.c:265 +#: ../../WPrefs.app/Focus.c:265 msgid "Install colormap in the window..." msgstr "ÄĂˇŻ¸Ę ¸đľĺ" -#: ../../WPrefs/Focus.c:270 +#: ../../WPrefs.app/Focus.c:270 msgid "...that has the input focus." msgstr "Ŕԡ ȰźşČ­ ŔŠľľżě" -#: ../../WPrefs/Focus.c:275 +#: ../../WPrefs.app/Focus.c:275 msgid "...that is under the mouse pointer." msgstr "¸śżě˝ş°Ą Ŕ§ÄĄÇŃ ŔŠľľżě" -#: ../../WPrefs/Focus.c:284 +#: ../../WPrefs.app/Focus.c:284 msgid "Automatic Window Raise Delay" msgstr "ŔÚľż â żĂ¸Žąâ ÁöżŹ ˝Ă°Ł" -#: ../../WPrefs/Focus.c:341 +#: ../../WPrefs.app/Focus.c:341 msgid "msec" msgstr "" -#: ../../WPrefs/Focus.c:358 +#: ../../WPrefs.app/Focus.c:358 msgid "Do not let aplications receive the click used to focus windows." msgstr "" -#: ../../WPrefs/Focus.c:364 +#: ../../WPrefs.app/Focus.c:364 msgid "Automatically focus new windows." msgstr "ťőˇÎżî â ŔÚľż ȰźşČ­" -#: ../../WPrefs/Focus.c:385 +#: ../../WPrefs.app/Focus.c:385 msgid "Window Focus Preferences" msgstr "ŔŠľľżě ȰźşČ­ źłÁ¤" -#: ../../WPrefs/KeyboardSettings.c:72 +#: ../../WPrefs.app/KeyboardSettings.c:72 msgid "Initial Key Repeat" -msgstr "" +msgstr "Ű ŔçŔԡ ˝Ă°Ł" -#: ../../WPrefs/KeyboardSettings.c:113 +#: ../../WPrefs.app/KeyboardSettings.c:113 msgid "Key Repeat Rate" -msgstr "" +msgstr "Ű šÝşš źÓľľ" -#: ../../WPrefs/KeyboardSettings.c:153 +#: ../../WPrefs.app/KeyboardSettings.c:153 msgid "Type here to test" -msgstr "" +msgstr "Űş¸ľĺ źÓľľ Ĺ×˝şĆŽ" -#: ../../WPrefs/KeyboardSettings.c:172 +#: ../../WPrefs.app/KeyboardSettings.c:172 msgid "Keyboard Preferences" -msgstr "" +msgstr "Űş¸ľĺ źłÁ¤" -#: ../../WPrefs/KeyboardShortcuts.c:161 ../../WPrefs/Menu.c:891 ../../WPrefs/MenuGuru.c:261 +#: ../../WPrefs.app/KeyboardShortcuts.c:161 ../../WPrefs.app/Menu.c:923 ../../WPrefs.app/Menu.c:1290 ../../WPrefs.app/MenuGuru.c:263 msgid "Cancel" msgstr "ĂëźŇ" -#: ../../WPrefs/KeyboardShortcuts.c:162 +#: ../../WPrefs.app/KeyboardShortcuts.c:162 msgid "Press the desired shortcut key(s) or click Cancel to stop capturing." msgstr "żřÇĎ´Â ´ÜĂŕŰ¸Ś ´Š¸Ł˝Ę˝ĂżŔ. ĂëźŇ¸Ś ´Š¸Ł¸é Capture °Ą Áߴܾ˴ϴŮ." -#: ../../WPrefs/KeyboardShortcuts.c:180 ../../WPrefs/KeyboardShortcuts.c:372 ../../WPrefs/Menu.c:902 ../../WPrefs/Menu.c:1122 +#: ../../WPrefs.app/KeyboardShortcuts.c:180 ../../WPrefs.app/KeyboardShortcuts.c:374 ../../WPrefs.app/Menu.c:935 ../../WPrefs.app/Menu.c:1157 msgid "Capture" -msgstr "" +msgstr "ĸĂÄ" -#: ../../WPrefs/KeyboardShortcuts.c:181 ../../WPrefs/KeyboardShortcuts.c:379 +#: ../../WPrefs.app/KeyboardShortcuts.c:181 ../../WPrefs.app/KeyboardShortcuts.c:381 msgid "Click Capture to interactively define the shortcut key." -msgstr "Capture ¸Ś ´­ˇŻ ´ÜĂŕŰ¸Ś ˝ą°Ô ÁöÁ¤ÇŇ źö ŔÖ˝Ŕ´Ď´Ů." +msgstr "ĸĂÄ šöưŔť ´­ˇŻ ´ÜĂŕŰ¸Ś ˝ą°Ô ÁöÁ¤ÇŇ źö ŔÖ˝Ŕ´Ď´Ů." -#: ../../WPrefs/KeyboardShortcuts.c:297 +#: ../../WPrefs.app/KeyboardShortcuts.c:299 msgid "Actions" msgstr "ľżŔŰ" -#: ../../WPrefs/KeyboardShortcuts.c:311 +#: ../../WPrefs.app/KeyboardShortcuts.c:313 msgid "Open applications menu" msgstr "žÖÇøŽÄÉŔĚźÇ ¸Ţ´ş" -#: ../../WPrefs/KeyboardShortcuts.c:312 +#: ../../WPrefs.app/KeyboardShortcuts.c:314 msgid "Open window list menu" msgstr "ŔŠľľżě ¸Ž˝şĆŽ ¸Ţ´ş" -#: ../../WPrefs/KeyboardShortcuts.c:313 +#: ../../WPrefs.app/KeyboardShortcuts.c:315 msgid "Open window commands menu" msgstr "ŔŠľľżě ¸íˇÉ ¸Ţ´ş" -#: ../../WPrefs/KeyboardShortcuts.c:314 +#: ../../WPrefs.app/KeyboardShortcuts.c:316 msgid "Hide active application" msgstr "žÖÇøŽÄÉŔĚźÇ źűąč" -#: ../../WPrefs/KeyboardShortcuts.c:315 +#: ../../WPrefs.app/KeyboardShortcuts.c:317 msgid "Miniaturize active window" msgstr "ŔŠľľżě ĂÖźŇČ­" -#: ../../WPrefs/KeyboardShortcuts.c:316 +#: ../../WPrefs.app/KeyboardShortcuts.c:318 msgid "Close active window" msgstr "ŔŠľľżě ´Ýąâ" -#: ../../WPrefs/KeyboardShortcuts.c:317 +#: ../../WPrefs.app/KeyboardShortcuts.c:319 msgid "Maximize active window" msgstr "ŔŠľľżě ĂÖ´ëČ­" -#: ../../WPrefs/KeyboardShortcuts.c:318 +#: ../../WPrefs.app/KeyboardShortcuts.c:320 msgid "Maximize active window vertically" msgstr "ŔŠľľżě¸Ś żˇŔ¸ˇÎ ĂÖ´ëČ­" -#: ../../WPrefs/KeyboardShortcuts.c:319 +#: ../../WPrefs.app/KeyboardShortcuts.c:321 msgid "Raise active window" msgstr "ŔŠľľżě żĂ¸˛" -#: ../../WPrefs/KeyboardShortcuts.c:320 +#: ../../WPrefs.app/KeyboardShortcuts.c:322 msgid "Lower active window" msgstr "ŔŠľľżě łť¸˛" -#: ../../WPrefs/KeyboardShortcuts.c:321 +#: ../../WPrefs.app/KeyboardShortcuts.c:323 msgid "Raise/Lower window under mouse pointer" msgstr "¸śżě˝ş°Ą Ŕ§ÄĄÇŃ Ă˘ żĂ¸˛/łť¸˛" -#: ../../WPrefs/KeyboardShortcuts.c:322 +#: ../../WPrefs.app/KeyboardShortcuts.c:324 msgid "Shade active window" msgstr "ŔŠľľżě Shade" -#: ../../WPrefs/KeyboardShortcuts.c:323 +#: ../../WPrefs.app/KeyboardShortcuts.c:325 msgid "Select active window" msgstr "ŔŠľľżě źąĹĂ" -#: ../../WPrefs/KeyboardShortcuts.c:324 +#: ../../WPrefs.app/KeyboardShortcuts.c:326 msgid "Focus next window" msgstr "´ŮŔ˝ ŔŠľľżě ȰźşČ­" -#: ../../WPrefs/KeyboardShortcuts.c:325 +#: ../../WPrefs.app/KeyboardShortcuts.c:327 msgid "Focus previous window" msgstr "ŔĚŔü ŔŠľľżě ȰźşČ­" -#: ../../WPrefs/KeyboardShortcuts.c:326 +#: ../../WPrefs.app/KeyboardShortcuts.c:328 msgid "Switch to next workspace" msgstr "´ŮŔ˝ ŔŰž÷°ř°ŁŔ¸ˇÎ ŔüČŻ" -#: ../../WPrefs/KeyboardShortcuts.c:327 +#: ../../WPrefs.app/KeyboardShortcuts.c:329 msgid "Switch to previous workspace" msgstr "ŔĚŔü ŔŰž÷°ř°ŁŔ¸ˇÎ ŔüČŻ" -#: ../../WPrefs/KeyboardShortcuts.c:328 +#: ../../WPrefs.app/KeyboardShortcuts.c:330 msgid "Switch to next ten workspaces" -msgstr "" +msgstr "ż­Ä­ ´ŮŔ˝ŔÇ ŔŰž÷°ř°ŁŔ¸ˇÎ ŔüČŻ" -#: ../../WPrefs/KeyboardShortcuts.c:329 +#: ../../WPrefs.app/KeyboardShortcuts.c:331 msgid "Switch to previous ten workspaces" -msgstr "" +msgstr "ż­Ä­ ŔĚŔüŔÇ ŔŰž÷°ř°ŁŔ¸ˇÎ ŔüČŻ" -#: ../../WPrefs/KeyboardShortcuts.c:330 +#: ../../WPrefs.app/KeyboardShortcuts.c:332 msgid "Switch to workspace 1" msgstr "1šř ŔŰž÷°ř°ŁŔ¸ˇÎ ŔüČŻ" -#: ../../WPrefs/KeyboardShortcuts.c:331 +#: ../../WPrefs.app/KeyboardShortcuts.c:333 msgid "Switch to workspace 2" msgstr "2šř ŔŰž÷°ř°ŁŔ¸ˇÎ ŔüČŻ" -#: ../../WPrefs/KeyboardShortcuts.c:332 +#: ../../WPrefs.app/KeyboardShortcuts.c:334 msgid "Switch to workspace 3" msgstr "3šř ŔŰž÷°ř°ŁŔ¸ˇÎ ŔüČŻ" -#: ../../WPrefs/KeyboardShortcuts.c:333 +#: ../../WPrefs.app/KeyboardShortcuts.c:335 msgid "Switch to workspace 4" msgstr "4šř ŔŰž÷°ř°ŁŔ¸ˇÎ ŔüČŻ" -#: ../../WPrefs/KeyboardShortcuts.c:334 +#: ../../WPrefs.app/KeyboardShortcuts.c:336 msgid "Switch to workspace 5" msgstr "5šř ŔŰž÷°ř°ŁŔ¸ˇÎ ŔüČŻ" -#: ../../WPrefs/KeyboardShortcuts.c:335 +#: ../../WPrefs.app/KeyboardShortcuts.c:337 msgid "Switch to workspace 6" msgstr "6šř ŔŰž÷°ř°ŁŔ¸ˇÎ ŔüČŻ" -#: ../../WPrefs/KeyboardShortcuts.c:336 +#: ../../WPrefs.app/KeyboardShortcuts.c:338 msgid "Switch to workspace 7" msgstr "7šř ŔŰž÷°ř°ŁŔ¸ˇÎ ŔüČŻ" -#: ../../WPrefs/KeyboardShortcuts.c:337 +#: ../../WPrefs.app/KeyboardShortcuts.c:339 msgid "Switch to workspace 8" msgstr "8šř ŔŰž÷°ř°ŁŔ¸ˇÎ ŔüČŻ" -#: ../../WPrefs/KeyboardShortcuts.c:338 +#: ../../WPrefs.app/KeyboardShortcuts.c:340 msgid "Switch to workspace 9" msgstr "9šř ŔŰž÷°ř°ŁŔ¸ˇÎ ŔüČŻ" -#: ../../WPrefs/KeyboardShortcuts.c:339 +#: ../../WPrefs.app/KeyboardShortcuts.c:341 msgid "Switch to workspace 10" msgstr "10šř ŔŰž÷°ř°ŁŔ¸ˇÎ ŔüČŻ" -#: ../../WPrefs/KeyboardShortcuts.c:340 +#: ../../WPrefs.app/KeyboardShortcuts.c:342 msgid "Raise Clip" msgstr "Clip żĂ¸˛" -#: ../../WPrefs/KeyboardShortcuts.c:341 +#: ../../WPrefs.app/KeyboardShortcuts.c:343 msgid "Lower Clip" msgstr "Clip łť¸˛" -#: ../../WPrefs/KeyboardShortcuts.c:342 +#: ../../WPrefs.app/KeyboardShortcuts.c:344 msgid "Raise/Lower Clip" msgstr "Clip żĂ¸˛/łť¸˛" -#: ../../WPrefs/KeyboardShortcuts.c:355 ../../WPrefs/Menu.c:1111 +#: ../../WPrefs.app/KeyboardShortcuts.c:357 ../../WPrefs.app/Menu.c:1146 msgid "Shortcut" msgstr "´ÜĂŕŰ" -#: ../../WPrefs/KeyboardShortcuts.c:366 +#: ../../WPrefs.app/KeyboardShortcuts.c:368 msgid "Clear" msgstr "Áöżň" -#: ../../WPrefs/KeyboardShortcuts.c:427 +#: ../../WPrefs.app/KeyboardShortcuts.c:429 msgid "Keyboard Shortcut Preferences" msgstr "Űş¸ľĺ ´ÜĂŕŰ źłÁ¤" -#: ../../WPrefs/Menu.c:364 +#: ../../WPrefs.app/Menu.c:373 msgid "Window Manager" -msgstr "" +msgstr "ŔŠľľżě °ü¸ŽŔÚ" -#: ../../WPrefs/Menu.c:366 +#: ../../WPrefs.app/Menu.c:375 msgid "Program to open files" msgstr "" -#: ../../WPrefs/Menu.c:368 ../../WPrefs/Menu.c:1098 +#: ../../WPrefs.app/Menu.c:377 ../../WPrefs.app/Menu.c:1133 msgid "Program to Run" -msgstr "" +msgstr "˝ÇÇŕÇŇ ÇÁˇÎą×ˇĽ" -#: ../../WPrefs/Menu.c:418 ../../WPrefs/Menu.c:419 +#: ../../WPrefs.app/Menu.c:427 ../../WPrefs.app/Menu.c:428 msgid "New Command %i" -msgstr "" +msgstr "ťőˇÎżî ¸íˇÉ %i" -#: ../../WPrefs/Menu.c:426 +#: ../../WPrefs.app/Menu.c:435 msgid "New Submenu" -msgstr "" +msgstr "ťőˇÎżî ÇϺΠ¸Ţ´ş" -#: ../../WPrefs/Menu.c:431 +#: ../../WPrefs.app/Menu.c:440 msgid "External Menu" msgstr "" -#: ../../WPrefs/Menu.c:438 +#: ../../WPrefs.app/Menu.c:447 msgid "Workspaces" -msgstr "" +msgstr "ŔŰž÷°ř°Ł" -#: ../../WPrefs/Menu.c:982 ../../WPrefs/Menu.c:997 +#: ../../WPrefs.app/Menu.c:1017 ../../WPrefs.app/Menu.c:1032 msgid "Commands" -msgstr "" +msgstr "¸íˇÉžî" -#: ../../WPrefs/Menu.c:983 ../../WPrefs/Menu.c:998 +#: ../../WPrefs.app/Menu.c:1018 ../../WPrefs.app/Menu.c:1033 msgid "Add Command" -msgstr "" +msgstr "¸íˇÉžî Ăß°Ą" -#: ../../WPrefs/Menu.c:984 ../../WPrefs/Menu.c:999 +#: ../../WPrefs.app/Menu.c:1019 ../../WPrefs.app/Menu.c:1034 msgid "Add Submenu" -msgstr "" +msgstr "ÇϺΠ¸Ţ´ş Ăß°Ą" -#: ../../WPrefs/Menu.c:985 ../../WPrefs/Menu.c:1000 +#: ../../WPrefs.app/Menu.c:1020 ../../WPrefs.app/Menu.c:1035 msgid "Add External Menu" msgstr "" -#: ../../WPrefs/Menu.c:986 ../../WPrefs/Menu.c:1001 +#: ../../WPrefs.app/Menu.c:1021 ../../WPrefs.app/Menu.c:1036 msgid "Add Workspace Menu" -msgstr "" +msgstr "ŔŰž÷°ř°Ł ¸Ţ´ş Ăß°Ą" -#: ../../WPrefs/Menu.c:987 ../../WPrefs/Menu.c:1002 +#: ../../WPrefs.app/Menu.c:1022 ../../WPrefs.app/Menu.c:1037 msgid "Remove Item" -msgstr "" +msgstr "Ç׸ń ÁڰĹ" -#: ../../WPrefs/Menu.c:988 ../../WPrefs/Menu.c:1003 +#: ../../WPrefs.app/Menu.c:1023 ../../WPrefs.app/Menu.c:1038 msgid "Cut Item" -msgstr "" +msgstr "Ç׸ń ŔÚ¸Łąâ" -#: ../../WPrefs/Menu.c:989 ../../WPrefs/Menu.c:1004 +#: ../../WPrefs.app/Menu.c:1024 ../../WPrefs.app/Menu.c:1039 msgid "Copy Item" -msgstr "" +msgstr "Ç׸ń şšťç" -#: ../../WPrefs/Menu.c:990 ../../WPrefs/Menu.c:1005 +#: ../../WPrefs.app/Menu.c:1025 ../../WPrefs.app/Menu.c:1040 msgid "Paste Item" -msgstr "" +msgstr "Ç׸ń şŮŔĚąâ" -#: ../../WPrefs/Menu.c:1034 +#: ../../WPrefs.app/Menu.c:1069 msgid "Label" -msgstr "" +msgstr "śóş§" -#: ../../WPrefs/Menu.c:1047 +#: ../../WPrefs.app/Menu.c:1082 msgid "Command" -msgstr "" +msgstr "¸íˇÉžî" -#: ../../WPrefs/Menu.c:1052 +#: ../../WPrefs.app/Menu.c:1087 msgid "Run Program" -msgstr "" +msgstr "ÇÁˇÎą×ˇĽ ˝ÇÇŕ" -#: ../../WPrefs/Menu.c:1053 +#: ../../WPrefs.app/Menu.c:1088 msgid "Arrange Icons" -msgstr "" +msgstr "žĆŔĚÄÜ Á¤ˇÄ" -#: ../../WPrefs/Menu.c:1054 +#: ../../WPrefs.app/Menu.c:1089 msgid "Hide Others" -msgstr "" +msgstr "´Ů¸Ľ °Íľé źűąč" -#: ../../WPrefs/Menu.c:1055 +#: ../../WPrefs.app/Menu.c:1090 msgid "Show All Windows" -msgstr "" +msgstr "¸đľç ŔŠľľżě ş¸ąâ" -#: ../../WPrefs/Menu.c:1056 +#: ../../WPrefs.app/Menu.c:1091 msgid "Exit WindowMaker" -msgstr "" +msgstr "ŔŠľľżě¸ŢŔĚÄż Ážˇá" -#: ../../WPrefs/Menu.c:1057 +#: ../../WPrefs.app/Menu.c:1092 msgid "Exit X Session" -msgstr "" +msgstr "X źźźÇ Ážˇá" -#: ../../WPrefs/Menu.c:1058 +#: ../../WPrefs.app/Menu.c:1093 msgid "Start window manager" -msgstr "" +msgstr "ŔŠľľżě °ü¸ŽŔÚ ˝ĂŔŰ" -#: ../../WPrefs/Menu.c:1059 +#: ../../WPrefs.app/Menu.c:1094 msgid "Restart WindowMaker" -msgstr "" +msgstr "ŔŠľľżě¸ŢŔĚÄż Ŕç˝ĂŔŰ" -#: ../../WPrefs/Menu.c:1060 +#: ../../WPrefs.app/Menu.c:1095 msgid "Save Session" -msgstr "" +msgstr "źźźÇ ŔúŔĺ" -#: ../../WPrefs/Menu.c:1061 +#: ../../WPrefs.app/Menu.c:1096 msgid "Clear Session" msgstr "" -#: ../../WPrefs/Menu.c:1062 +#: ../../WPrefs.app/Menu.c:1097 msgid "Refresh Screen" -msgstr "" +msgstr "Č­¸é Á¤¸Ž" -#: ../../WPrefs/Menu.c:1063 +#: ../../WPrefs.app/Menu.c:1098 msgid "Info Panel" -msgstr "" +msgstr "Á¤ş¸" -#: ../../WPrefs/Menu.c:1064 +#: ../../WPrefs.app/Menu.c:1099 msgid "Legal Panel" -msgstr "" +msgstr "ÄŤÇÇśóŔĚĆŽ" -#: ../../WPrefs/Menu.c:1072 +#: ../../WPrefs.app/Menu.c:1107 msgid "Open workspace menu" -msgstr "" +msgstr "ŔŰž÷°ř°Ł ¸Ţ´ş ż­ąâ" -#: ../../WPrefs/Menu.c:1079 +#: ../../WPrefs.app/Menu.c:1114 msgid "No confirmation panel" msgstr "" -#: ../../WPrefs/Menu.c:1085 +#: ../../WPrefs.app/Menu.c:1120 msgid "Menu Path/Directory List" msgstr "" -#: ../../WPrefs/Menu.c:1130 +#: ../../WPrefs.app/Menu.c:1165 msgid "Ask help to the Guru" msgstr "" -#: ../../WPrefs/Menu.c:1242 -msgid "The format of the current menu file (%s) is not supported by WPrefs. A new menu will be created." +#: ../../WPrefs.app/Menu.c:1285 +msgid "" +"The format of the current menu in ~/G/D/WMRootMenu is not supported by WPrefs. A new menu will be created.\n" +"You can also replace ~/G/D/WMRootMenu with ~/G/L/W/plmenu to get the default menu." msgstr "" -#: ../../WPrefs/Menu.c:1245 ../../WPrefs/WPrefs.c:568 +#: ../../WPrefs.app/Menu.c:1290 ../../WPrefs.app/Menu.c:1295 ../../WPrefs.app/WPrefs.c:585 msgid "Warning" -msgstr "" +msgstr "°ć°í" -#: ../../WPrefs/Menu.c:1246 ../../WPrefs/MenuGuru.c:117 ../../WPrefs/MenuGuru.c:124 ../../WPrefs/MenuGuru.c:138 ../../WPrefs/MouseSettings.c:156 ../../WPrefs/Text.c:181 ../../WPrefs/WPrefs.c:530 ../../WPrefs/WPrefs.c:535 ../../WPrefs/WPrefs.c:546 ../../WPrefs/WPrefs.c:555 ../../WPrefs/WPrefs.c:561 ../../WPrefs/WPrefs.c:568 ../../WPrefs/WPrefs.c:590 +#. WMMapWidget(panel->pathB); +#: ../../WPrefs.app/Menu.c:1290 ../../WPrefs.app/Menu.c:1296 ../../WPrefs.app/MenuGuru.c:119 ../../WPrefs.app/MenuGuru.c:126 ../../WPrefs.app/MenuGuru.c:140 ../../WPrefs.app/MouseSettings.c:156 ../../WPrefs.app/Text.c:181 ../../WPrefs.app/WPrefs.c:546 ../../WPrefs.app/WPrefs.c:551 ../../WPrefs.app/WPrefs.c:562 ../../WPrefs.app/WPrefs.c:572 ../../WPrefs.app/WPrefs.c:578 ../../WPrefs.app/WPrefs.c:585 ../../WPrefs.app/WPrefs.c:602 ../../WPrefs.app/WPrefs.c:607 msgid "OK" msgstr "" -#: ../../WPrefs/Menu.c:1284 -msgid "Aplications Menu Definition" -msgstr "žÖÇøŽÄÉŔĚźÇ ¸Ţ´ş źłÁ¤" +#: ../../WPrefs.app/Menu.c:1295 +msgid "Any changes made in this section will not be saved" +msgstr "" -#: ../../WPrefs/MenuGuru.c:104 +#: ../../WPrefs.app/Menu.c:1360 +msgid "Applications Menu Definition" +msgstr "" + +#: ../../WPrefs.app/MenuGuru.c:106 msgid "Menu Guru - Select Type" msgstr "" -#: ../../WPrefs/MenuGuru.c:109 ../../WPrefs/MenuGuru.c:131 ../../WPrefs/MenuGuru.c:249 +#: ../../WPrefs.app/MenuGuru.c:111 ../../WPrefs.app/MenuGuru.c:133 ../../WPrefs.app/MenuGuru.c:251 msgid "Next" -msgstr "" +msgstr "´ŮŔ˝" -#: ../../WPrefs/MenuGuru.c:112 +#: ../../WPrefs.app/MenuGuru.c:114 msgid "Menu Guru - Select Menu File" msgstr "" -#: ../../WPrefs/MenuGuru.c:120 +#: ../../WPrefs.app/MenuGuru.c:122 msgid "Menu Guru - Select Pipe Command" msgstr "" -#: ../../WPrefs/MenuGuru.c:127 +#: ../../WPrefs.app/MenuGuru.c:129 msgid "Menu Guru - Select Directories" msgstr "" -#: ../../WPrefs/MenuGuru.c:134 +#: ../../WPrefs.app/MenuGuru.c:136 msgid "Menu Guru - Select Command" msgstr "" -#: ../../WPrefs/MenuGuru.c:255 +#: ../../WPrefs.app/MenuGuru.c:257 msgid "Back" -msgstr "" +msgstr "ŔĚŔü" -#: ../../WPrefs/MenuGuru.c:269 +#: ../../WPrefs.app/MenuGuru.c:271 msgid "" "This process will help you create a submenu which definition is located in another file or is created dynamically.\n" "What do you want to use as the contents of the submenu?" msgstr "" -#: ../../WPrefs/MenuGuru.c:277 +#: ../../WPrefs.app/MenuGuru.c:279 msgid "A file containing the menu definition in the plain text (non-property list) menu format." msgstr "" -#: ../../WPrefs/MenuGuru.c:283 +#: ../../WPrefs.app/MenuGuru.c:285 msgid "The menu definition generated by a script/program read through a pipe." msgstr "" -#: ../../WPrefs/MenuGuru.c:289 +#: ../../WPrefs.app/MenuGuru.c:291 msgid "The files in one or more directories." msgstr "" -#: ../../WPrefs/MenuGuru.c:301 +#: ../../WPrefs.app/MenuGuru.c:303 msgid "Type the path for the menu file:" msgstr "" -#: ../../WPrefs/MenuGuru.c:316 +#: ../../WPrefs.app/MenuGuru.c:318 msgid "The menu file must contain a menu in the plain text menu file format. This format is described in the menu files included with WindowMaker, probably at ~/GNUstep/Library/WindowMaker/menu" msgstr "" -#: ../../WPrefs/MenuGuru.c:326 +#: ../../WPrefs.app/MenuGuru.c:328 msgid "Type the command that will generate the menu definition:" msgstr "" -#: ../../WPrefs/MenuGuru.c:336 -msgid "The command supplied must generate and output a valid menu definition to stdout. This definition should be in the plain text menu file format, described in the menu files included with WindowMaker, probably at ~/GNUstep/Library/WindowMaker/menu" +#: ../../WPrefs.app/MenuGuru.c:338 +msgid "The command supplied must generate and output a valid menu definition to stdout. This definition should be in the plain text menu file format, described in the menu files included with WindowMaker, usually at ~/GNUstep/Library/WindowMaker/menu" msgstr "" -#: ../../WPrefs/MenuGuru.c:348 ../../WPrefs/MenuGuru.c:370 ../../WPrefs/MenuGuru.c:392 +#: ../../WPrefs.app/MenuGuru.c:350 ../../WPrefs.app/MenuGuru.c:372 ../../WPrefs.app/MenuGuru.c:394 msgid "Type the path for the directory. You can type more than one path by separating them with spaces." msgstr "" -#: ../../WPrefs/MenuGuru.c:359 ../../WPrefs/MenuGuru.c:381 ../../WPrefs/MenuGuru.c:403 +#: ../../WPrefs.app/MenuGuru.c:361 ../../WPrefs.app/MenuGuru.c:383 ../../WPrefs.app/MenuGuru.c:405 msgid "The menu generated will have an item for each file in the directory. The directories can contain program executables or data files (such as jpeg images)." msgstr "" -#: ../../WPrefs/MenuGuru.c:413 +#: ../../WPrefs.app/MenuGuru.c:415 msgid "If the directory contain data files, type the command used to open these files. Otherwise, leave it in blank." msgstr "" -#: ../../WPrefs/MenuGuru.c:424 +#: ../../WPrefs.app/MenuGuru.c:426 msgid "Each file in the directory will have an item and they will be opened with the supplied command.For example, if the directory contains image files and the command is \"xv -root\", each file in the directory will have a menu item like \"xv -root imagefile\"." msgstr "" -#: ../../WPrefs/MenuPreferences.c:112 +#: ../../WPrefs.app/MenuPreferences.c:112 msgid "Menu Scrolling Speed" msgstr "¸Ţ´ş ˝şĹŠˇŃ źÓľľ" -#: ../../WPrefs/MenuPreferences.c:161 +#: ../../WPrefs.app/MenuPreferences.c:161 msgid "Submenu Alignment" msgstr "ÇϺΠ¸Ţ´ş Ŕ§ÄĄ" -#: ../../WPrefs/MenuPreferences.c:204 -msgid "Open submenus to the left if they don't fit inside the screen." -msgstr "ź­şę ¸Ţ´ş¸Ś ż­ ś§ Č­¸éžČżĄ ľéžî°ĄÁö ¸řÇĎ¸é żŢÂĘŔ¸ˇÎ ż­¸˛." +#: ../../WPrefs.app/MenuPreferences.c:204 +msgid "" +"Always open submenus inside the screen, instead of scrolling.\n" +"Note: this can be an annoyance at some circumstances." +msgstr "" +"¸Ţ´ş ˝şĹŠˇŃ ´ë˝Ĺ ÇϺΠ¸Ţ´ş¸Ś ż­ ś§ Çםó Č­¸é žČżĄ Ŕ§ÄĄÇĎąâ ÇÔ.\n" +"ÁÖŔÇ: ťóȲżĄ ľűśóź­ źş°Ą˝Ĺ °ÍŔĚ ľÉ źö ŔÖŔ˝." -#: ../../WPrefs/MenuPreferences.c:209 + +#: ../../WPrefs.app/MenuPreferences.c:209 msgid "Scroll off-screen menus when pointer is moved over them." msgstr "˝şĹЏ° šŰŔ¸ˇÎ łŞ°Ł ¸Ţ´ş°Ą ą×ÂĘŔ¸ˇÎ ¸śżě˝ş¸Ś żňÁ÷ŔĚ¸é ˝şĹŠˇŃ ľĘ." -#: ../../WPrefs/MenuPreferences.c:229 +#: ../../WPrefs.app/MenuPreferences.c:229 msgid "Menu Preferences" msgstr "¸Ţ´ş źłÁ¤" -#: ../../WPrefs/MouseSettings.c:154 ../../WPrefs/Text.c:180 ../../WPrefs/WPrefs.c:530 ../../WPrefs/WPrefs.c:535 ../../WPrefs/WPrefs.c:544 ../../WPrefs/WPrefs.c:553 ../../WPrefs/WPrefs.c:561 ../../WPrefs/WPrefs.c:590 +#: ../../WPrefs.app/MouseSettings.c:154 ../../WPrefs.app/Text.c:181 ../../WPrefs.app/WPrefs.c:546 ../../WPrefs.app/WPrefs.c:551 ../../WPrefs.app/WPrefs.c:560 ../../WPrefs.app/WPrefs.c:570 ../../WPrefs.app/WPrefs.c:578 ../../WPrefs.app/WPrefs.c:602 ../../WPrefs.app/WPrefs.c:607 msgid "Error" msgstr "żĄˇŻ" -#: ../../WPrefs/MouseSettings.c:155 +#: ../../WPrefs.app/MouseSettings.c:155 msgid "Invalid mouse acceleration threshold value. Must be the number of pixels to travel before accelerating." -msgstr "" +msgstr "¸śżě˝ş °ĄźÓ threshold °ŞŔĚ Ŕ߸řľĘ. °ĄźÓľÇąâąîÁö żňÁ÷ŔĚ´Â ÇČźż źö¸Ś ŔűŔ˝" -#: ../../WPrefs/MouseSettings.c:209 +#: ../../WPrefs.app/MouseSettings.c:209 msgid "mouse button %s not supported by WPrefs." msgstr "¸śżě˝ş šöư %s ´Â ÁöżřÇĎÁö žĘŔ˝" -#: ../../WPrefs/MouseSettings.c:243 ../../WPrefs/MouseSettings.c:254 ../../WPrefs/MouseSettings.c:265 +#: ../../WPrefs.app/MouseSettings.c:243 ../../WPrefs.app/MouseSettings.c:254 ../../WPrefs.app/MouseSettings.c:265 msgid "bad value %s for option %s" msgstr "%s żÉźÇżĄ Ŕ߸řľČ °Ş %s" -#: ../../WPrefs/MouseSettings.c:325 +#: ../../WPrefs.app/MouseSettings.c:325 msgid "modifier key %s for option ModifierKey was not recognized. Using %s as default" msgstr "ModifierKey ŔÇ modifier key %s ¸Ś ŔνÄÇŇ źö žřŔ˝. ąâşť°ŞŔÎ %s ¸Ś ťçżë." -#: ../../WPrefs/MouseSettings.c:350 +#: ../../WPrefs.app/MouseSettings.c:350 msgid "could not retrieve keyboard modifier mapping" msgstr "" -#: ../../WPrefs/MouseSettings.c:497 +#: ../../WPrefs.app/MouseSettings.c:497 msgid "Mouse Speed" msgstr "¸śżě˝ş źÓľľ" -#: ../../WPrefs/MouseSettings.c:564 +#: ../../WPrefs.app/MouseSettings.c:564 msgid "Threshold:" msgstr "" -#: ../../WPrefs/MouseSettings.c:579 +#: ../../WPrefs.app/MouseSettings.c:579 msgid "Double-Click Delay" msgstr "´őşí ĹŹ¸Ż źÓľľ" -#: ../../WPrefs/MouseSettings.c:623 +#: ../../WPrefs.app/MouseSettings.c:623 msgid "Test" msgstr "Ĺ×˝şĆŽ" -#: ../../WPrefs/MouseSettings.c:633 +#: ../../WPrefs.app/MouseSettings.c:633 msgid "Workspace Mouse Actions" msgstr "¸śżě˝ş ľżŔŰ źłÁ¤" -#: ../../WPrefs/MouseSettings.c:638 +#: ../../WPrefs.app/MouseSettings.c:638 msgid "Disable mouse actions" msgstr "¸śżě˝ş ž×źÇ ťçżë žĘŔ˝" -#: ../../WPrefs/MouseSettings.c:691 +#: ../../WPrefs.app/MouseSettings.c:691 msgid "Applications menu" msgstr "žÖÇøŽÄÉŔĚźÇ ¸Ţ´ş" -#: ../../WPrefs/MouseSettings.c:697 +#: ../../WPrefs.app/MouseSettings.c:697 msgid "Window list menu" msgstr "ŔŠľľżě ¸Ž˝şĆŽ ¸Ţ´ş" -#: ../../WPrefs/MouseSettings.c:703 +#: ../../WPrefs.app/MouseSettings.c:703 msgid "Select windows" msgstr "ŔŠľľżě źąĹĂ" -#: ../../WPrefs/MouseSettings.c:738 +#: ../../WPrefs.app/MouseSettings.c:738 msgid "Mouse Grab Modifier" msgstr "" -#: ../../WPrefs/MouseSettings.c:772 +#: ../../WPrefs.app/MouseSettings.c:772 msgid "could not create %s" msgstr "%s ¸Ś ¸¸ľé źö žřŔ˝" -#: ../../WPrefs/MouseSettings.c:788 +#: ../../WPrefs.app/MouseSettings.c:788 msgid "could not create temporary file %s" -msgstr "" +msgstr "Ŕӽà ĆÄŔĎ %s ¸Ś ťýźşÇĎÁö ¸řÇÔ" -#: ../../WPrefs/MouseSettings.c:813 +#: ../../WPrefs.app/MouseSettings.c:813 msgid "could not rename file %s to %s\n" msgstr "%s ĆÄŔϸíŔť %s ˇÎ šŮ˛Ü źö žřŔ˝" -#: ../../WPrefs/MouseSettings.c:896 +#: ../../WPrefs.app/MouseSettings.c:896 msgid "Mouse Preferences" msgstr "¸śżě˝ş źłÁ¤" -#: ../../WPrefs/Paths.c:82 +#: ../../WPrefs.app/Paths.c:82 msgid "bad value in option IconPath. Using default path list" msgstr "IconPath żĄ Ŕ߸řľČ °Ş. ąâşť path ťçżë" -#: ../../WPrefs/Paths.c:99 +#: ../../WPrefs.app/Paths.c:99 msgid "bad value in option PixmapPath. Using default path list" msgstr "PixmapPath żĄ Ŕ߸řľČ °Ş. ąâşť path ťçżë" -#: ../../WPrefs/Paths.c:301 +#: ../../WPrefs.app/Paths.c:301 msgid "Icon Search Paths" msgstr "žĆŔĚÄÜŔť ĂŁŔť Path" -#: ../../WPrefs/Paths.c:313 ../../WPrefs/Paths.c:349 +#: ../../WPrefs.app/Paths.c:313 ../../WPrefs.app/Paths.c:349 msgid "Add" msgstr "Ăß°Ą" -#: ../../WPrefs/Paths.c:320 ../../WPrefs/Paths.c:356 +#: ../../WPrefs.app/Paths.c:320 ../../WPrefs.app/Paths.c:356 msgid "Remove" msgstr "ťčÁŚ" -#: ../../WPrefs/Paths.c:337 +#: ../../WPrefs.app/Paths.c:337 msgid "Pixmap Search Paths" msgstr "Pixmap Ŕť ĂŁŔť Path" -#: ../../WPrefs/Paths.c:385 +#: ../../WPrefs.app/Paths.c:385 msgid "Search Path Configuration" msgstr "Path źłÁ¤" -#: ../../WPrefs/Preferences.c:142 +#: ../../WPrefs.app/Preferences.c:142 msgid "Size Display" msgstr "ĹŠąâ ÁśÁ¤ ÇĽ˝Ăâ" -#: ../../WPrefs/Preferences.c:147 ../../WPrefs/Preferences.c:163 +#: ../../WPrefs.app/Preferences.c:147 ../../WPrefs.app/Preferences.c:163 msgid "Corner of screen" msgstr "Č­¸é ą¸źŽ" -#: ../../WPrefs/Preferences.c:148 ../../WPrefs/Preferences.c:164 +#: ../../WPrefs.app/Preferences.c:148 ../../WPrefs.app/Preferences.c:164 msgid "Center of screen" msgstr "Č­¸é °ĄżîľĽ" -#: ../../WPrefs/Preferences.c:149 ../../WPrefs/Preferences.c:165 +#: ../../WPrefs.app/Preferences.c:149 ../../WPrefs.app/Preferences.c:165 msgid "Center of resized window" msgstr "ÇöŔç ŔŠľľżě °ĄżîľĽ" -#: ../../WPrefs/Preferences.c:150 +#: ../../WPrefs.app/Preferences.c:150 msgid "Technical drawing-like" msgstr "ŔŠľľżě Ĺ׾θŽ" -#: ../../WPrefs/Preferences.c:158 +#: ../../WPrefs.app/Preferences.c:158 msgid "Position Display" msgstr "â Ŕ§ÄĄ ÇĽ˝Ăâ" -#: ../../WPrefs/Preferences.c:173 +#: ../../WPrefs.app/Preferences.c:173 msgid "Show balloon text for..." msgstr "Çłźą ľľżň¸ť" -#: ../../WPrefs/Preferences.c:180 +#: ../../WPrefs.app/Preferences.c:180 msgid "incomplete window titles" msgstr "şŇżĎŔüÇŃ ŔŠľľżě ŸŔĚƲ" -#: ../../WPrefs/Preferences.c:181 +#: ../../WPrefs.app/Preferences.c:181 msgid "miniwindow titles" msgstr "žĆŔĚÄÜ Ĺ¸ŔĚƲ" -#: ../../WPrefs/Preferences.c:182 +#: ../../WPrefs.app/Preferences.c:182 msgid "application/dock icons" msgstr "žÖÇøŽÄÉŔĚźÇ/dock žĆŔĚÄÜ" -#: ../../WPrefs/Preferences.c:195 -msgid "Raise window when switching focus with keyboard." -msgstr "Űş¸ľĺˇÎ â ŔüČŻ˝Ă ŔŠľľżě żĂ¸˛" +#: ../../WPrefs.app/Preferences.c:195 +msgid "Raise window when switching focus with keyboard (CirculateRaise)." +msgstr "Űş¸ľĺˇÎ â ŔüČŻ˝Ă ŔŠľľżě żĂ¸˛ (CirculateRaise)" -#: ../../WPrefs/Preferences.c:215 +#: ../../WPrefs.app/Preferences.c:215 msgid "Miscellaneous Ergonomic Preferences" msgstr "" -#: ../../WPrefs/Text.c:179 +#: ../../WPrefs.app/Text.c:179 msgid "Invalid font %s." msgstr "Ŕ߸řľČ ĆůĆŽ %s" -#: ../../WPrefs/Text.c:256 +#: ../../WPrefs.app/Text.c:256 msgid "Set Font..." msgstr "ąŰ˛Ă ÁöÁ¤" -#: ../../WPrefs/Text.c:262 +#: ../../WPrefs.app/Text.c:262 msgid "Window Title Font" msgstr "ŔŠľľżě ŸŔĚƲ ąŰ˛Ă" -#: ../../WPrefs/Text.c:263 +#: ../../WPrefs.app/Text.c:263 msgid "Menu Title Font" msgstr "¸Ţ´ş ŸŔĚƲ ąŰ˛Ă" -#: ../../WPrefs/Text.c:264 +#: ../../WPrefs.app/Text.c:264 msgid "Menu Item Font" msgstr "¸Ţ´ş Ç׸ń ąŰ˛Ă" -#: ../../WPrefs/Text.c:265 +#: ../../WPrefs.app/Text.c:265 msgid "Icon Title Font" msgstr "žĆŔĚÄÜ Ĺ¸ŔĚƲ ąŰ˛Ă" -#: ../../WPrefs/Text.c:266 +#: ../../WPrefs.app/Text.c:266 msgid "Clip Title Font" msgstr "Clip ŸŔĚƲ ąŰ˛Ă" -#: ../../WPrefs/Text.c:267 +#: ../../WPrefs.app/Text.c:267 msgid "Geometry Display Font" msgstr "Ŕ§ÄĄ ÇĽ˝Ă⠹۲Ă" -#: ../../WPrefs/Text.c:280 +#: ../../WPrefs.app/Text.c:280 msgid "" "Sample Text\n" "abcdefghijklmnopqrstuvxywz\n" @@ -798,352 +814,355 @@ msgid "" "0123456789" msgstr "" -#: ../../WPrefs/Text.c:285 +#: ../../WPrefs.app/Text.c:285 msgid "Alignment" -msgstr "" +msgstr "Á¤ˇÄ" -#: ../../WPrefs/Text.c:290 +#: ../../WPrefs.app/Text.c:290 msgid "Left" -msgstr "" +msgstr "żŢÂĘ" -#: ../../WPrefs/Text.c:296 +#: ../../WPrefs.app/Text.c:296 msgid "Center" -msgstr "" +msgstr "°ĄżîľĽ" -#: ../../WPrefs/Text.c:303 +#: ../../WPrefs.app/Text.c:303 msgid "Right" -msgstr "" +msgstr "żŔ¸ĽÂĘ" -#: ../../WPrefs/Text.c:325 +#: ../../WPrefs.app/Text.c:325 msgid "Text Preferences" msgstr "" -#: ../../WPrefs/TextureAndColor.c:339 +#: ../../WPrefs.app/TextureAndColor.c:384 msgid "Window Title Bar" -msgstr "" +msgstr "ŔŠľľżě ŸŔĚƲ šŮ" -#: ../../WPrefs/TextureAndColor.c:340 +#: ../../WPrefs.app/TextureAndColor.c:385 msgid "Menu Title Bar" -msgstr "" +msgstr "¸Ţ´ş ŸŔĚƲ šŮ" -#: ../../WPrefs/TextureAndColor.c:341 +#: ../../WPrefs.app/TextureAndColor.c:386 msgid "Menu Items" -msgstr "" +msgstr "¸Ţ´ş Ç׸ń" -#: ../../WPrefs/TextureAndColor.c:342 +#: ../../WPrefs.app/TextureAndColor.c:387 msgid "Workspace/Clip" msgstr "" -#: ../../WPrefs/TextureAndColor.c:343 +#: ../../WPrefs.app/TextureAndColor.c:388 msgid "Icons" -msgstr "" +msgstr "žĆŔĚÄÜ" -#: ../../WPrefs/TextureAndColor.c:354 +#: ../../WPrefs.app/TextureAndColor.c:399 msgid "Focused Window" -msgstr "" +msgstr "Č°źş Ă˘" -#: ../../WPrefs/TextureAndColor.c:367 ../../WPrefs/TextureAndColor.c:398 ../../WPrefs/TextureAndColor.c:429 +#: ../../WPrefs.app/TextureAndColor.c:412 ../../WPrefs.app/TextureAndColor.c:443 ../../WPrefs.app/TextureAndColor.c:474 msgid "Texture" msgstr "" -#: ../../WPrefs/TextureAndColor.c:373 ../../WPrefs/TextureAndColor.c:404 ../../WPrefs/TextureAndColor.c:435 +#: ../../WPrefs.app/TextureAndColor.c:418 ../../WPrefs.app/TextureAndColor.c:449 ../../WPrefs.app/TextureAndColor.c:480 msgid "Text Color" -msgstr "" +msgstr "ąŰŔÚ ťöąň" -#: ../../WPrefs/TextureAndColor.c:378 ../../WPrefs/TextureAndColor.c:409 ../../WPrefs/TextureAndColor.c:440 ../../WPrefs/TextureAndColor.c:464 ../../WPrefs/TextureAndColor.c:530 ../../WPrefs/TextureAndColor.c:607 +#: ../../WPrefs.app/TextureAndColor.c:423 ../../WPrefs.app/TextureAndColor.c:454 ../../WPrefs.app/TextureAndColor.c:485 ../../WPrefs.app/TextureAndColor.c:509 ../../WPrefs.app/TextureAndColor.c:575 ../../WPrefs.app/TextureAndColor.c:652 msgid "Set..." msgstr "" -#: ../../WPrefs/TextureAndColor.c:385 +#: ../../WPrefs.app/TextureAndColor.c:430 msgid "Unfocused Window" -msgstr "" +msgstr "şńČ°źş Ă˘" -#: ../../WPrefs/TextureAndColor.c:416 +#: ../../WPrefs.app/TextureAndColor.c:461 msgid "Owner of Focused Window" -msgstr "" +msgstr "Č°źş Ă˘ŔÇ şÎ¸đâ" -#: ../../WPrefs/TextureAndColor.c:449 +#: ../../WPrefs.app/TextureAndColor.c:494 msgid "Unselected Items" -msgstr "" +msgstr "źąĹĂľÇÁö žĘŔş Ç׸ń" -#: ../../WPrefs/TextureAndColor.c:459 ../../WPrefs/TextureAndColor.c:513 +#: ../../WPrefs.app/TextureAndColor.c:504 ../../WPrefs.app/TextureAndColor.c:558 msgid "Background" -msgstr "" +msgstr "šč°ć" -#: ../../WPrefs/TextureAndColor.c:474 +#: ../../WPrefs.app/TextureAndColor.c:519 msgid "Normal Text" msgstr "" -#: ../../WPrefs/TextureAndColor.c:484 +#: ../../WPrefs.app/TextureAndColor.c:529 msgid "Disabled Text" msgstr "" -#: ../../WPrefs/TextureAndColor.c:493 +#: ../../WPrefs.app/TextureAndColor.c:538 msgid "Selected Items" -msgstr "" +msgstr "źąĹĂľČ Ç׸ń" -#: ../../WPrefs/TextureAndColor.c:503 +#: ../../WPrefs.app/TextureAndColor.c:548 msgid "Text" msgstr "" -#: ../../WPrefs/TextureAndColor.c:521 +#: ../../WPrefs.app/TextureAndColor.c:566 msgid "Menu Title Background" -msgstr "" +msgstr "¸Ţ´ş ŸŔĚƲ šč°ć" -#: ../../WPrefs/TextureAndColor.c:539 +#: ../../WPrefs.app/TextureAndColor.c:584 msgid "Menu Title Text" msgstr "" -#: ../../WPrefs/TextureAndColor.c:551 +#: ../../WPrefs.app/TextureAndColor.c:596 msgid "Workspace Background" -msgstr "" +msgstr "šč°ć Č­¸é" -#: ../../WPrefs/TextureAndColor.c:560 +#: ../../WPrefs.app/TextureAndColor.c:605 msgid "Change" -msgstr "" +msgstr "šŮ˛Ţ" -#: ../../WPrefs/TextureAndColor.c:566 +#: ../../WPrefs.app/TextureAndColor.c:611 msgid "Clip Title Text" msgstr "" -#: ../../WPrefs/TextureAndColor.c:576 +#: ../../WPrefs.app/TextureAndColor.c:621 msgid "Normal" -msgstr "" +msgstr "ŔĎšÝ" -#: ../../WPrefs/TextureAndColor.c:586 +#: ../../WPrefs.app/TextureAndColor.c:631 msgid "Collapsed" msgstr "" -#: ../../WPrefs/TextureAndColor.c:598 +#: ../../WPrefs.app/TextureAndColor.c:643 msgid "Icon Background" -msgstr "" +msgstr "žĆŔĚÄÜ šč°ć" -#: ../../WPrefs/TextureAndColor.c:632 +#: ../../WPrefs.app/TextureAndColor.c:677 msgid "Texture and Color Preferences" msgstr "" -#: ../../WPrefs/WPrefs.c:196 -msgid "WindowMaker Preferences" -msgstr "ŔŠľľżě¸ŢŔĚÄż źłÁ¤" +#: ../../WPrefs.app/WPrefs.c:196 +msgid "Window Maker Preferences" +msgstr "ŔŠľľżě ¸ŢŔĚÄż źłÁ¤" -#: ../../WPrefs/WPrefs.c:218 +#: ../../WPrefs.app/WPrefs.c:220 msgid "Revert Page" -msgstr "" +msgstr "ÇöŔç ĆäŔĚÁö şšą¸" -#: ../../WPrefs/WPrefs.c:224 +#: ../../WPrefs.app/WPrefs.c:226 msgid "Revert All" -msgstr "" +msgstr "ŔüĂź şšą¸" -#: ../../WPrefs/WPrefs.c:230 +#: ../../WPrefs.app/WPrefs.c:232 msgid "Save" msgstr "ŔúŔĺ" -#: ../../WPrefs/WPrefs.c:236 +#: ../../WPrefs.app/WPrefs.c:238 msgid "Close" msgstr "´Ýąâ" -#: ../../WPrefs/WPrefs.c:260 -msgid "Version %s for WindowMaker %s" -msgstr "šöÁŻ %s (ŔŠľľżě¸ŢŔĚÄż %s)" +#: ../../WPrefs.app/WPrefs.c:262 +msgid "Version %s for Window Maker %s" +msgstr "šöÁŻ %s (ŔŠľľżě ¸ŢŔĚÄż %s)" -#: ../../WPrefs/WPrefs.c:267 +#: ../../WPrefs.app/WPrefs.c:269 msgid "Starting..." msgstr "˝ĂŔŰ..." -#: ../../WPrefs/WPrefs.c:273 +#: ../../WPrefs.app/WPrefs.c:275 msgid "" "Programming/Design: Alfredo K. Kojima\n" -"Artwork: Marco van Hylckama Vlieg" +"Artwork: Marco van Hylckama Vlieg\n" +"More Programming: James Thompson" msgstr "" -"ÇÁˇÎą×ˇĄšÖ/ľđŔÚŔÎ: Alfredo K. Kojima\n" -"Arkwork: Macro van Hylckama Vlieg" +"ÇÁˇÎą×ˇĄšÖ/źł°č: Alfredo K. Kojima\n" +"žĆĆŽżöĹŠ: Marco van Hylckama Vlieg\n" +"ÇÁˇÎą×ˇĄšÖ: James Thompson" -#: ../../WPrefs/WPrefs.c:360 +#: ../../WPrefs.app/WPrefs.c:363 msgid "could not locate image file %s\n" msgstr "%s ŔĚšĚÁö ĆÄŔĎŔť ĂŁŔť źö žřŔ˝\n" -#: ../../WPrefs/WPrefs.c:478 -msgid "Loading WindowMaker configuration files..." -msgstr "ŔŠľľżě¸ŢŔĚÄż źłÁ¤ ĆÄŔĎŔť ŔĐ´Â Áß..." +#: ../../WPrefs.app/WPrefs.c:488 +msgid "Loading Window Maker configuration files..." +msgstr "ŔŠľľżě ¸ŢŔĚÄż źłÁ¤ ĆÄŔĎ ŔĐ´Â Áß..." -#: ../../WPrefs/WPrefs.c:482 +#: ../../WPrefs.app/WPrefs.c:492 msgid "Initializing configuration panels..." msgstr "źłÁ¤ ĆÇłÚ ĂĘąâČ­ Áß..." -#: ../../WPrefs/WPrefs.c:529 ../../WPrefs/WPrefs.c:584 -msgid "WindowMaker domain (%s) is corrupted!" +#: ../../WPrefs.app/WPrefs.c:545 ../../WPrefs.app/WPrefs.c:601 +msgid "Window Maker domain (%s) is corrupted!" msgstr "" -#: ../../WPrefs/WPrefs.c:533 ../../WPrefs/WPrefs.c:588 -msgid "Could not load WindowMaker domain (%s) from defaults database." +#: ../../WPrefs.app/WPrefs.c:549 +msgid "Could not load Window Maker domain (%s) from defaults database." msgstr "" -#: ../../WPrefs/WPrefs.c:541 -msgid "could not extract version information from WindowMaker" +#: ../../WPrefs.app/WPrefs.c:557 +msgid "could not extract version information from Window Maker" msgstr "" -#: ../../WPrefs/WPrefs.c:542 -msgid "Make sure WindowMaker is in your search path." +#: ../../WPrefs.app/WPrefs.c:558 +msgid "Make sure Window Maker is in your search path." msgstr "" -#: ../../WPrefs/WPrefs.c:545 ../../WPrefs/WPrefs.c:554 -msgid "Could not extract version from WindowMaker. Make sure it is correctly installed." +#: ../../WPrefs.app/WPrefs.c:561 ../../WPrefs.app/WPrefs.c:571 +msgid "Could not extract version from Window Maker. Make sure it is correctly installed." msgstr "" -#: ../../WPrefs/WPrefs.c:559 +#: ../../WPrefs.app/WPrefs.c:576 msgid "" -"WPrefs only supports WindowMaker 0.18.0 or newer.\n" +"WPrefs only supports Window Maker 0.18.0 or newer.\n" "The version installed is %i.%i.%i\n" msgstr "" -"WPrefs ´Â ŔŠľľżě¸ŢŔĚÄż 0.18.0 ŔĚťó¸¸Ŕť ÁöżřÇŐ´Ď´Ů.\n" -"źłÄĄľČ šöÁŻŔş %i.%i.%i ŔÔ´Ď´Ů.\n" +"WPrefs ´Â ŔŠľľżě ¸ŢŔĚÄż 0.18.0 ŔĚťóŔÇ šöÁݏ¸Ŕť ÁöżřÇŐ´Ď´Ů.\n" +"%i.%i.%i šöÁŻŔĚ źłÄĄľÇžî ŔÖ˝Ŕ´Ď´Ů.\n" -#: ../../WPrefs/WPrefs.c:566 -msgid "WindowMaker %i.%i.%i, which is installed in your system, is not fully supported by this version of WPrefs." -msgstr "" +#: ../../WPrefs.app/WPrefs.c:583 +msgid "Window Maker %i.%i.%i, which is installed in your system, is not fully supported by this version of WPrefs." +msgstr "ŔŠľľżě ¸ŢŔĚÄż %i.%i.%i °Ą ˝Ă˝şĹŰżĄ źłÄĄľÇžî ŔÖ˝Ŕ´Ď´Ů. ŔĚ šöÁŻŔş ÇöŔçŔÇ WPrefs °Ą ÁöżřÇĎÁö žĘ˝Ŕ´Ď´Ů." -#: ../../WPrefs/WPrefs.c:573 +#: ../../WPrefs.app/WPrefs.c:590 msgid "could not run \"wmaker -global_defaults_path\"." msgstr "" -#: ../../WPrefs/WPrefs.c:831 +#: ../../WPrefs.app/WPrefs.c:605 +msgid "Could not load global Window Maker domain (%s)." +msgstr "" + +#: ../../WPrefs.app/WPrefs.c:851 msgid "" "bad speed value for option %s\n" ". Using default Medium" -msgstr "" +msgstr "%s żÉźÇŔÇ źÓľľ°ŞŔĚ Ŕ߸řľĘ\n" +". ąâşť °ŞŔť ťçżëÇÔ" -#: ../../WPrefs/WindowHandling.c:108 +#: ../../WPrefs.app/WindowHandling.c:107 msgid "bad option value %s in WindowPlacement. Using default value" msgstr "" -#: ../../WPrefs/WindowHandling.c:130 +#: ../../WPrefs.app/WindowHandling.c:129 msgid "invalid data in option WindowPlaceOrigin. Using default (0,0)" msgstr "" -#: ../../WPrefs/WindowHandling.c:192 +#: ../../WPrefs.app/WindowHandling.c:188 msgid "Window Placement" msgstr "ŔŠľľżě Ŕ§ÄĄ" -#: ../../WPrefs/WindowHandling.c:197 +#: ../../WPrefs.app/WindowHandling.c:193 msgid "Automatic" msgstr "ŔÚľż" -#: ../../WPrefs/WindowHandling.c:198 +#: ../../WPrefs.app/WindowHandling.c:194 msgid "Random" msgstr "ˇŁ´ý" -#: ../../WPrefs/WindowHandling.c:199 +#: ../../WPrefs.app/WindowHandling.c:195 msgid "Manual" msgstr "źöľż" -#: ../../WPrefs/WindowHandling.c:200 +#: ../../WPrefs.app/WindowHandling.c:196 msgid "Cascade" msgstr "°č´Ü˝Ä" -#: ../../WPrefs/WindowHandling.c:206 +#: ../../WPrefs.app/WindowHandling.c:202 msgid "Placement Origin" msgstr "ąâşť Ŕ§ÄĄ" -#: ../../WPrefs/WindowHandling.c:260 +#: ../../WPrefs.app/WindowHandling.c:256 msgid "Opaque Move" -msgstr "" +msgstr "â łťżë ş¸ŔÎä ŔĚľż" -#: ../../WPrefs/WindowHandling.c:296 +#: ../../WPrefs.app/WindowHandling.c:292 msgid "When maximizing..." msgstr "ĂÖ´ëČ­ źłÁ¤" -#: ../../WPrefs/WindowHandling.c:301 +#: ../../WPrefs.app/WindowHandling.c:297 msgid "...do not resize over icons" msgstr "žĆŔĚÄÜ ľ¤Áö žĘŔ˝" -#: ../../WPrefs/WindowHandling.c:306 -msgid "...do not resize over dock" -msgstr "Dock ľ¤Áö žĘŔ˝" - -#: ../../WPrefs/WindowHandling.c:319 +#: ../../WPrefs.app/WindowHandling.c:310 msgid "Keep transients above their owners" msgstr "" -#: ../../WPrefs/WindowHandling.c:346 +#: ../../WPrefs.app/WindowHandling.c:337 msgid "Window Handling Preferences" msgstr "ŔŠľľżě ÁŚžî źłÁ¤" -#: ../../WPrefs/Workspace.c:135 +#: ../../WPrefs.app/Workspace.c:137 msgid "Workspace Navigation" msgstr "ŔŰž÷°ř°Ł ŔüČŻ" -#: ../../WPrefs/Workspace.c:159 +#: ../../WPrefs.app/Workspace.c:161 msgid "drag windows between workspaces." msgstr "´Ů¸Ľ ŔŰž÷°ř°ŁŔ¸ˇÎ ŔŠľľżě ˛řąâ" -#: ../../WPrefs/Workspace.c:184 +#: ../../WPrefs.app/Workspace.c:186 msgid "switch to first workspace when switching past the last workspace and vice-versa" msgstr "ŔŰž÷°ř°Ł ŔÚľż źřČŻ" -#: ../../WPrefs/Workspace.c:208 +#: ../../WPrefs.app/Workspace.c:210 msgid "create a new workspace when switching past the last workspace." msgstr "ťőˇÎżî ŔŰž÷°ř°Ł ŔÚľż ťýźş" -#: ../../WPrefs/Workspace.c:216 +#: ../../WPrefs.app/Workspace.c:218 msgid "Dock/Clip" msgstr "" -#: ../../WPrefs/Workspace.c:285 +#: ../../WPrefs.app/Workspace.c:287 msgid "Workspace Preferences" msgstr "ŔŰž÷°ř°Ł źłÁ¤" -#: ../../WPrefs/main.c:56 +#: ../../WPrefs.app/main.c:56 msgid "usage: %s [options]\n" msgstr "ťçżëšý: %s [żÉźÇ]\n" -#: ../../WPrefs/main.c:57 +#: ../../WPrefs.app/main.c:57 msgid "options:" msgstr "żÉźÇ:" -#: ../../WPrefs/main.c:58 +#: ../../WPrefs.app/main.c:58 msgid " -display \tdisplay to be used" msgstr "-display \tťçżëÇŇ ľđ˝şÇášŔĚ" -#: ../../WPrefs/main.c:59 +#: ../../WPrefs.app/main.c:59 msgid " -version\t\tprint version number and exit" msgstr "-version\t\tšöÁŻ ĂâˇÂČÄ Ážˇá" -#: ../../WPrefs/main.c:82 +#: ../../WPrefs.app/main.c:82 msgid "too few arguments for %s" msgstr "%s ŔÇ ŔÎŔÚ°Ą łĘšŤ ŔűŔ˝" -#: ../../WPrefs/main.c:104 +#: ../../WPrefs.app/main.c:104 msgid "X server does not support locale" msgstr "X ź­šö°Ą locale Ŕť ÁöżřÄĄ žĘŔ˝" -#: ../../WPrefs/main.c:107 +#: ../../WPrefs.app/main.c:107 msgid "cannot set locale modifiers" msgstr "locale modifier ¸Ś źłÁ¤ÇŇ źö žřŔ˝" -#: ../../WPrefs/main.c:113 +#: ../../WPrefs.app/main.c:113 msgid "could not open display %s" msgstr "%s ľđ˝şÇášŔĚ¸Ś ż­ źö žřŔ˝" -#: ../../WPrefs/main.c:121 +#: ../../WPrefs.app/main.c:121 msgid "could not initialize application" msgstr "žÖÇøŽÄÉŔĚźÇ ĂĘąâČ­¸Ś ÇŇ źö žřŔ˝" -#: ../../WPrefs/Icons.c:158 +#: ../../WPrefs.app/Icons.c:158 msgid "Icon Positioning" msgstr "žĆŔĚÄÜ Ŕ§ÄĄ" -#: ../../WPrefs/Icons.c:231 +#: ../../WPrefs.app/Icons.c:231 msgid "Auto-arrange icons" msgstr "žĆŔĚÄÜ ŔÚľż Á¤ˇÄ" -#: ../../WPrefs/Icons.c:236 +#: ../../WPrefs.app/Icons.c:236 msgid "Omnipresent miniwindows" msgstr "žĆŔĚÄÜ Ç×ťó ş¸ŔÓ" -#: ../../WPrefs/Icons.c:244 +#: ../../WPrefs.app/Icons.c:244 msgid "Icon Size" msgstr "žĆŔĚÄÜ ĹŠąâ" -#: ../../WPrefs/Icons.c:308 +#: ../../WPrefs.app/Icons.c:308 msgid "Icon Preferences" msgstr "žĆŔĚÄÜ źłÁ¤" diff --git a/WindowMaker/Defaults/Makefile.am b/WindowMaker/Defaults/Makefile.am index fc8f7d89..b8fef185 100644 --- a/WindowMaker/Defaults/Makefile.am +++ b/WindowMaker/Defaults/Makefile.am @@ -18,7 +18,7 @@ WindowMaker: $(srcdir)/WindowMaker.in ./Makefile sed -e "s:#pkgdatadir#:$(pkgdatadir):" $(srcdir)/WindowMaker.in > WindowMaker chmod 644 WindowMaker -WMState: $(srcdir)/WMState.in $(srcdir)/Makefile +WMState: $(srcdir)/WMState.in ./Makefile -rm -f WMState sed -e "s:#wprefs#:$(wprefsdir)/WPrefs:" $(srcdir)/WMState.in > WMState chmod 644 WMState diff --git a/WindowMaker/Defaults/Makefile.in b/WindowMaker/Defaults/Makefile.in index 5c124ed5..8b744723 100755 --- a/WindowMaker/Defaults/Makefile.in +++ b/WindowMaker/Defaults/Makefile.in @@ -217,7 +217,7 @@ WindowMaker: $(srcdir)/WindowMaker.in ./Makefile sed -e "s:#pkgdatadir#:$(pkgdatadir):" $(srcdir)/WindowMaker.in > WindowMaker chmod 644 WindowMaker -WMState: $(srcdir)/WMState.in $(srcdir)/Makefile +WMState: $(srcdir)/WMState.in ./Makefile -rm -f WMState sed -e "s:#wprefs#:$(wprefsdir)/WPrefs:" $(srcdir)/WMState.in > WMState chmod 644 WMState diff --git a/WindowMaker/Makefile.am b/WindowMaker/Makefile.am index f9dae626..d87a09b5 100644 --- a/WindowMaker/Makefile.am +++ b/WindowMaker/Makefile.am @@ -8,14 +8,14 @@ prefsdata_DATA = wmmacros README menu plmenu autostart.sh exitscript.sh \ menu.fi menu.hr menu.dk menu.sl -EXTRA_DIST = $(prefsdata_DATA) wmmacros.in plmenu.in +EXTRA_DIST = $(prefsdata_DATA) wmmacros.in plmenu.in plmenu.fr.in plmenu.hr.in CLEANFILES = wmmacros plmenu wmmacros: $(srcdir)/wmmacros.in ./Makefile -rm -f wmmacros - sed -e "s:#pkgdatadir#:$(pkgdatadir):" \ + sed -e "s:#pkgdatadir#:$(pkgdatadir):" -e "s://:/:" \ $(srcdir)/wmmacros.in > wmmacros; \ chmod 644 wmmacros @@ -23,7 +23,7 @@ wmmacros: $(srcdir)/wmmacros.in ./Makefile plmenu: $(srcdir)/plmenu.in ./Makefile -rm -f plmenu - sed -e "s:#pkgdatadir#:$(pkgdatadir):" \ + sed -e "s:#pkgdatadir#:$(pkgdatadir):" -e "s://:/:" \ $(srcdir)/plmenu.in > plmenu; \ chmod 644 plmenu diff --git a/WindowMaker/Makefile.in b/WindowMaker/Makefile.in index 4ed8b1c0..940234c7 100755 --- a/WindowMaker/Makefile.in +++ b/WindowMaker/Makefile.in @@ -99,7 +99,7 @@ prefsdata_DATA = wmmacros README menu plmenu autostart.sh exitscript.sh \ menu.it menu.no menu.he menu.es menu.ru menu.tr menu.el menu.se \ menu.fi menu.hr menu.dk menu.sl -EXTRA_DIST = $(prefsdata_DATA) wmmacros.in plmenu.in +EXTRA_DIST = $(prefsdata_DATA) wmmacros.in plmenu.in plmenu.fr.in plmenu.hr.in CLEANFILES = wmmacros plmenu mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs @@ -306,14 +306,14 @@ mostlyclean distclean maintainer-clean wmmacros: $(srcdir)/wmmacros.in ./Makefile -rm -f wmmacros - sed -e "s:#pkgdatadir#:$(pkgdatadir):" \ + sed -e "s:#pkgdatadir#:$(pkgdatadir):" -e "s://:/:" \ $(srcdir)/wmmacros.in > wmmacros; \ chmod 644 wmmacros plmenu: $(srcdir)/plmenu.in ./Makefile -rm -f plmenu - sed -e "s:#pkgdatadir#:$(pkgdatadir):" \ + sed -e "s:#pkgdatadir#:$(pkgdatadir):" -e "s://:/:" \ $(srcdir)/plmenu.in > plmenu; \ chmod 644 plmenu diff --git a/WindowMaker/README b/WindowMaker/README index 782f6b1e..2eb5b53f 100644 --- a/WindowMaker/README +++ b/WindowMaker/README @@ -54,4 +54,5 @@ menu.el Greek Nikolaos Papagrigoriou menu.dk Danish John M. Lockard Jacob Sparre Andersen menu.sl Slovene Alen Salamun +menu.hu Hungarian Csanaki Csaba diff --git a/WindowMaker/menu b/WindowMaker/menu index f161c7c3..e7a025b5 100644 --- a/WindowMaker/menu +++ b/WindowMaker/menu @@ -203,7 +203,7 @@ "Restart" RESTART "Start AfterStep" RESTART afterstep "Exit..." EXIT - "Exit session..." SHUTDOWN + "Kill session..." SHUTDOWN "Exit" END "Applications" END diff --git a/WindowMaker/menu.cz b/WindowMaker/menu.cz index fd93e23a..c88a007d 100644 --- a/WindowMaker/menu.cz +++ b/WindowMaker/menu.cz @@ -133,12 +133,6 @@ "Zámek" EXEC xlock -allowroot -usefirst "Ulož vzhled" EXEC SAVE_WORKSPACE "Pracovní plocha" END -#if (UID==0) // root only stuff - "Správa systému" MENU - // RedHat control panel pro uživatele root - "RH ControlPanel" EXEC control-panel - "Správa systému" END -#endif "Konec" MENU // 'Restartovat' není opravdu příliš české slovo, najde někdo lepší ? "Restartovat" RESTART diff --git a/WindowMaker/menu.de b/WindowMaker/menu.de index de5e423c..82e64fb5 100644 --- a/WindowMaker/menu.de +++ b/WindowMaker/menu.de @@ -114,12 +114,6 @@ #endif "Arbeitsplatz sichern" EXEC SAVE_WORKSPACE "Arbeitsplatz" END -#if (UID==0) // nur für root - "System" MENU - // das RedHat control panel Programm - "RH ControlPanel" EXEC control-panel - "System" END -#endif "Beenden" MENU "Neustart" RESTART "AfterStep starten" RESTART afterstep diff --git a/WindowMaker/menu.it b/WindowMaker/menu.it index 3d0804d3..90f767eb 100644 --- a/WindowMaker/menu.it +++ b/WindowMaker/menu.it @@ -119,12 +119,6 @@ "Salva area di lavoro" EXEC SAVE_WORKSPACE "Area di lavoro" END -#if (UID==0) // root only stuff - "Sistema" MENU - // the RedHat control panel program - "Pannello di controllo RH" EXEC control-panel - "Sistema" END -#endif "Uscire" MENU "Restart" RESTART "Avviare AfterStep" RESTART afterstep diff --git a/WindowMaker/menu.ko b/WindowMaker/menu.ko index eb4384fd..315613f3 100644 --- a/WindowMaker/menu.ko +++ b/WindowMaker/menu.ko @@ -210,12 +210,5 @@ "Applications" END - -#if (UID==0) // root only stuff - "˝Ă˝şĹŰ" MENU - // the RedHat control panel program - "RH ControlPanel" EXEC control-panel - "˝Ă˝şĹŰ" END -#endif "ŔŠľľżě¸ŢŔĚÄż" END diff --git a/WindowMaker/menu.nl b/WindowMaker/menu.nl index ffa3062d..eb041050 100644 --- a/WindowMaker/menu.nl +++ b/WindowMaker/menu.nl @@ -98,12 +98,6 @@ "Blokkeren" EXEC xlock -allowroot -usefirst "Opslaan werkplaats" EXEC SAVE_WORKSPACE "Werkplaats" END -#if (UID==0) // enkel voor root - "Systeem" MENU - // the RedHat control panel program - "RH Controle Paneel" EXEC control-panel - "Systeem" END -#endif "Exit" MENU "Herstart" RESTART "Start AfterStep" RESTART afterstep diff --git a/WindowMaker/plmenu b/WindowMaker/plmenu index 4bc963f7..a164daa6 100644 --- a/WindowMaker/plmenu +++ b/WindowMaker/plmenu @@ -98,6 +98,6 @@ ("Restart", RESTART), ("Start AfterStep", RESTART, afterstep), ("Exit...", EXIT), - ("Exit session...", SHUTDOWN) + ("Kill session...", SHUTDOWN) ) ) diff --git a/WindowMaker/plmenu.in b/WindowMaker/plmenu.in index f5d8e1c8..5dac28b9 100755 --- a/WindowMaker/plmenu.in +++ b/WindowMaker/plmenu.in @@ -98,6 +98,6 @@ ("Restart", RESTART), ("Start AfterStep", RESTART, afterstep), ("Exit...", EXIT), - ("Exit session...", SHUTDOWN) + ("Kill session...", SHUTDOWN) ) ) diff --git a/WindowMaker/wmmacros b/WindowMaker/wmmacros index 704a4046..9acacfbf 100644 --- a/WindowMaker/wmmacros +++ b/WindowMaker/wmmacros @@ -59,6 +59,7 @@ #define THEMES_DIR /usr/local/share/WindowMaker/Themes #define STYLES_DIR /usr/local/share/WindowMaker/Styles #define ICON_SETS_DIR /usr/local/share/WindowMaker/IconSets +#define SOUND_SETS_DIR /usr/local/share/WindowMaker/SoundSets #define BACKGROUNDS_DIR /usr/local/share/WindowMaker/Backgrounds diff --git a/WindowMaker/wmmacros.in b/WindowMaker/wmmacros.in index 31992373..5a144eea 100755 --- a/WindowMaker/wmmacros.in +++ b/WindowMaker/wmmacros.in @@ -59,6 +59,7 @@ #define THEMES_DIR #pkgdatadir#/Themes #define STYLES_DIR #pkgdatadir#/Styles #define ICON_SETS_DIR #pkgdatadir#/IconSets +#define SOUND_SETS_DIR #pkgdatadir#/SoundSets #define BACKGROUNDS_DIR #pkgdatadir#/Backgrounds diff --git a/configure b/configure index b1b1a651..4907b57b 100755 --- a/configure +++ b/configure @@ -29,6 +29,8 @@ ac_help="$ac_help --with-gfx-incs pass compiler flags to look for gfx header files" ac_help="$ac_help --disable-xpm disable use of XPM pixmaps through libXpm" +ac_help="$ac_help + --disable-png disable PNG support through libpng" ac_help="$ac_help --disable-jpeg disable JPEG support through libjpeg" ac_help="$ac_help @@ -42,7 +44,8 @@ ac_help="$ac_help ac_help="$ac_help --with-pixmapdir=PATH specify where pixmaps are located [DATADIR/pixmaps]" ac_help="$ac_help - --with-appspath=PATH specify the path of the GNUstep applications directory" + --with-appspath=PATH specify the path of the GNUstep applications +directory" ac_help="$ac_help --enable-single-icon use single application icon per WM_INSTANCE+WM_CLASS " @@ -584,7 +587,7 @@ ac_configure=$ac_aux_dir/configure # This should be Cygnus configure. # SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff" # ./install, which can be erroneously created by make from ./install.sh. echo $ac_n "checking for a BSD compatible install""... $ac_c" 1>&6 -echo "configure:588: checking for a BSD compatible install" >&5 +echo "configure:591: checking for a BSD compatible install" >&5 if test -z "$INSTALL"; then if eval "test \"`echo '$''{'ac_cv_path_install'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -637,7 +640,7 @@ test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644' test -z "$INSTALL_SCRIPT" && INSTALL_SCRIPT='${INSTALL_PROGRAM}' echo $ac_n "checking whether build environment is sane""... $ac_c" 1>&6 -echo "configure:641: checking whether build environment is sane" >&5 +echo "configure:644: checking whether build environment is sane" >&5 # Just in case sleep 1 echo timestamp > conftestfile @@ -694,7 +697,7 @@ test "$program_suffix" != NONE && test "$program_transform_name" = "" && program_transform_name="s,x,x," echo $ac_n "checking whether ${MAKE-make} sets \${MAKE}""... $ac_c" 1>&6 -echo "configure:698: checking whether ${MAKE-make} sets \${MAKE}" >&5 +echo "configure:701: checking whether ${MAKE-make} sets \${MAKE}" >&5 set dummy ${MAKE-make}; ac_make=`echo "$2" | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_prog_make_${ac_make}_set'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -740,7 +743,7 @@ EOF missing_dir=`cd $ac_aux_dir && pwd` echo $ac_n "checking for working aclocal""... $ac_c" 1>&6 -echo "configure:744: checking for working aclocal" >&5 +echo "configure:747: checking for working aclocal" >&5 # Run test in a subshell; some versions of sh will print an error if # an executable is not found, even if stderr is redirected. # Redirect stdin to placate older versions of autoconf. Sigh. @@ -753,7 +756,7 @@ else fi echo $ac_n "checking for working autoconf""... $ac_c" 1>&6 -echo "configure:757: checking for working autoconf" >&5 +echo "configure:760: checking for working autoconf" >&5 # Run test in a subshell; some versions of sh will print an error if # an executable is not found, even if stderr is redirected. # Redirect stdin to placate older versions of autoconf. Sigh. @@ -766,7 +769,7 @@ else fi echo $ac_n "checking for working automake""... $ac_c" 1>&6 -echo "configure:770: checking for working automake" >&5 +echo "configure:773: checking for working automake" >&5 # Run test in a subshell; some versions of sh will print an error if # an executable is not found, even if stderr is redirected. # Redirect stdin to placate older versions of autoconf. Sigh. @@ -779,7 +782,7 @@ else fi echo $ac_n "checking for working autoheader""... $ac_c" 1>&6 -echo "configure:783: checking for working autoheader" >&5 +echo "configure:786: checking for working autoheader" >&5 # Run test in a subshell; some versions of sh will print an error if # an executable is not found, even if stderr is redirected. # Redirect stdin to placate older versions of autoconf. Sigh. @@ -792,7 +795,7 @@ else fi echo $ac_n "checking for working makeinfo""... $ac_c" 1>&6 -echo "configure:796: checking for working makeinfo" >&5 +echo "configure:799: checking for working makeinfo" >&5 # Run test in a subshell; some versions of sh will print an error if # an executable is not found, even if stderr is redirected. # Redirect stdin to placate older versions of autoconf. Sigh. @@ -828,7 +831,7 @@ else { echo "configure: error: can not run $ac_config_sub" 1>&2; exit 1; } fi echo $ac_n "checking host system type""... $ac_c" 1>&6 -echo "configure:832: checking host system type" >&5 +echo "configure:835: checking host system type" >&5 host_alias=$host case "$host_alias" in @@ -853,7 +856,7 @@ echo "$ac_t""$host" 1>&6 # Extract the first word of "gcc", so it can be a program name with args. set dummy gcc; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:857: checking for $ac_word" >&5 +echo "configure:860: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -882,7 +885,7 @@ if test -z "$CC"; then # Extract the first word of "cc", so it can be a program name with args. set dummy cc; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:886: checking for $ac_word" >&5 +echo "configure:889: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -930,7 +933,7 @@ fi fi echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works""... $ac_c" 1>&6 -echo "configure:934: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5 +echo "configure:937: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5 ac_ext=c # CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options. @@ -940,11 +943,11 @@ ac_link='${CC-cc} -o conftest $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS cross_compiling=$ac_cv_prog_cc_cross cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:951: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then ac_cv_prog_cc_works=yes # If we can't run a trivial program, we are probably using a cross compiler. if (./conftest; exit) 2>/dev/null; then @@ -964,12 +967,12 @@ if test $ac_cv_prog_cc_works = no; then { echo "configure: error: installation or configuration problem: C compiler cannot create executables." 1>&2; exit 1; } fi echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler""... $ac_c" 1>&6 -echo "configure:968: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5 +echo "configure:971: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5 echo "$ac_t""$ac_cv_prog_cc_cross" 1>&6 cross_compiling=$ac_cv_prog_cc_cross echo $ac_n "checking whether we are using GNU C""... $ac_c" 1>&6 -echo "configure:973: checking whether we are using GNU C" >&5 +echo "configure:976: checking whether we are using GNU C" >&5 if eval "test \"`echo '$''{'ac_cv_prog_gcc'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -978,7 +981,7 @@ else yes; #endif EOF -if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:982: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then +if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:985: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then ac_cv_prog_gcc=yes else ac_cv_prog_gcc=no @@ -993,7 +996,7 @@ if test $ac_cv_prog_gcc = yes; then ac_save_CFLAGS="$CFLAGS" CFLAGS= echo $ac_n "checking whether ${CC-cc} accepts -g""... $ac_c" 1>&6 -echo "configure:997: checking whether ${CC-cc} accepts -g" >&5 +echo "configure:1000: checking whether ${CC-cc} accepts -g" >&5 if eval "test \"`echo '$''{'ac_cv_prog_cc_g'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1021,7 +1024,7 @@ else fi echo $ac_n "checking for POSIXized ISC""... $ac_c" 1>&6 -echo "configure:1025: checking for POSIXized ISC" >&5 +echo "configure:1028: checking for POSIXized ISC" >&5 if test -d /etc/conf/kconfig.d && grep _POSIX_VERSION /usr/include/sys/unistd.h >/dev/null 2>&1 then @@ -1044,7 +1047,7 @@ fi # Extract the first word of "gcc", so it can be a program name with args. set dummy gcc; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:1048: checking for $ac_word" >&5 +echo "configure:1051: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1073,7 +1076,7 @@ if test -z "$CC"; then # Extract the first word of "cc", so it can be a program name with args. set dummy cc; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:1077: checking for $ac_word" >&5 +echo "configure:1080: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1121,7 +1124,7 @@ fi fi echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works""... $ac_c" 1>&6 -echo "configure:1125: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5 +echo "configure:1128: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5 ac_ext=c # CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options. @@ -1131,11 +1134,11 @@ ac_link='${CC-cc} -o conftest $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS cross_compiling=$ac_cv_prog_cc_cross cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:1142: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then ac_cv_prog_cc_works=yes # If we can't run a trivial program, we are probably using a cross compiler. if (./conftest; exit) 2>/dev/null; then @@ -1155,12 +1158,12 @@ if test $ac_cv_prog_cc_works = no; then { echo "configure: error: installation or configuration problem: C compiler cannot create executables." 1>&2; exit 1; } fi echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler""... $ac_c" 1>&6 -echo "configure:1159: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5 +echo "configure:1162: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5 echo "$ac_t""$ac_cv_prog_cc_cross" 1>&6 cross_compiling=$ac_cv_prog_cc_cross echo $ac_n "checking whether we are using GNU C""... $ac_c" 1>&6 -echo "configure:1164: checking whether we are using GNU C" >&5 +echo "configure:1167: checking whether we are using GNU C" >&5 if eval "test \"`echo '$''{'ac_cv_prog_gcc'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1169,7 +1172,7 @@ else yes; #endif EOF -if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:1173: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then +if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:1176: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then ac_cv_prog_gcc=yes else ac_cv_prog_gcc=no @@ -1184,7 +1187,7 @@ if test $ac_cv_prog_gcc = yes; then ac_save_CFLAGS="$CFLAGS" CFLAGS= echo $ac_n "checking whether ${CC-cc} accepts -g""... $ac_c" 1>&6 -echo "configure:1188: checking whether ${CC-cc} accepts -g" >&5 +echo "configure:1191: checking whether ${CC-cc} accepts -g" >&5 if eval "test \"`echo '$''{'ac_cv_prog_cc_g'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1212,7 +1215,7 @@ else fi echo $ac_n "checking whether ${MAKE-make} sets \${MAKE}""... $ac_c" 1>&6 -echo "configure:1216: checking whether ${MAKE-make} sets \${MAKE}" >&5 +echo "configure:1219: checking whether ${MAKE-make} sets \${MAKE}" >&5 set dummy ${MAKE-make}; ac_make=`echo "$2" | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_prog_make_${ac_make}_set'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -1241,7 +1244,7 @@ fi # Extract the first word of "ranlib", so it can be a program name with args. set dummy ranlib; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:1245: checking for $ac_word" >&5 +echo "configure:1248: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_RANLIB'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1278,7 +1281,7 @@ fi # SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff" # ./install, which can be erroneously created by make from ./install.sh. echo $ac_n "checking for a BSD compatible install""... $ac_c" 1>&6 -echo "configure:1282: checking for a BSD compatible install" >&5 +echo "configure:1285: checking for a BSD compatible install" >&5 if test -z "$INSTALL"; then if eval "test \"`echo '$''{'ac_cv_path_install'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -1328,7 +1331,7 @@ test -z "$INSTALL_PROGRAM" && INSTALL_PROGRAM='${INSTALL}' test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644' echo $ac_n "checking whether ln -s works""... $ac_c" 1>&6 -echo "configure:1332: checking whether ln -s works" >&5 +echo "configure:1335: checking whether ln -s works" >&5 if eval "test \"`echo '$''{'ac_cv_prog_LN_S'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1349,7 +1352,7 @@ else fi echo $ac_n "checking how to run the C preprocessor""... $ac_c" 1>&6 -echo "configure:1353: checking how to run the C preprocessor" >&5 +echo "configure:1356: checking how to run the C preprocessor" >&5 # On Suns, sometimes $CPP names a directory. if test -n "$CPP" && test -d "$CPP"; then CPP= @@ -1364,13 +1367,13 @@ else # On the NeXT, cc -E runs the code through the compiler's parser, # not just through cpp. cat > conftest.$ac_ext < Syntax Error EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:1374: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:1377: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out` if test -z "$ac_err"; then : @@ -1381,13 +1384,13 @@ else rm -rf conftest* CPP="${CC-cc} -E -traditional-cpp" cat > conftest.$ac_ext < Syntax Error EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:1391: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:1394: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out` if test -z "$ac_err"; then : @@ -1411,13 +1414,13 @@ echo "$ac_t""$CPP" 1>&6 if test $ac_cv_prog_gcc = yes; then echo $ac_n "checking whether ${CC-cc} needs -traditional""... $ac_c" 1>&6 -echo "configure:1415: checking whether ${CC-cc} needs -traditional" >&5 +echo "configure:1418: checking whether ${CC-cc} needs -traditional" >&5 if eval "test \"`echo '$''{'ac_cv_prog_gcc_traditional'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else ac_pattern="Autoconf.*'x'" cat > conftest.$ac_ext < Autoconf TIOCGETP @@ -1435,7 +1438,7 @@ rm -f conftest* if test $ac_cv_prog_gcc_traditional = no; then cat > conftest.$ac_ext < Autoconf TCGETA @@ -1459,12 +1462,12 @@ fi echo $ac_n "checking return type of signal handlers""... $ac_c" 1>&6 -echo "configure:1463: checking return type of signal handlers" >&5 +echo "configure:1466: checking return type of signal handlers" >&5 if eval "test \"`echo '$''{'ac_cv_type_signal'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < #include @@ -1481,7 +1484,7 @@ int main() { int i; ; return 0; } EOF -if { (eval echo configure:1485: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:1488: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_type_signal=void else @@ -1500,12 +1503,12 @@ EOF echo $ac_n "checking for vprintf""... $ac_c" 1>&6 -echo "configure:1504: checking for vprintf" >&5 +echo "configure:1507: checking for vprintf" >&5 if eval "test \"`echo '$''{'ac_cv_func_vprintf'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:1535: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* eval "ac_cv_func_vprintf=yes" else @@ -1552,12 +1555,12 @@ fi if test "$ac_cv_func_vprintf" != yes; then echo $ac_n "checking for _doprnt""... $ac_c" 1>&6 -echo "configure:1556: checking for _doprnt" >&5 +echo "configure:1559: checking for _doprnt" >&5 if eval "test \"`echo '$''{'ac_cv_func__doprnt'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:1587: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* eval "ac_cv_func__doprnt=yes" else @@ -1607,19 +1610,19 @@ fi # The Ultrix 4.2 mips builtin alloca declared by alloca.h only works # for constant arguments. Useless! echo $ac_n "checking for working alloca.h""... $ac_c" 1>&6 -echo "configure:1611: checking for working alloca.h" >&5 +echo "configure:1614: checking for working alloca.h" >&5 if eval "test \"`echo '$''{'ac_cv_header_alloca_h'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < int main() { char *p = alloca(2 * sizeof(int)); ; return 0; } EOF -if { (eval echo configure:1623: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:1626: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* ac_cv_header_alloca_h=yes else @@ -1640,12 +1643,12 @@ EOF fi echo $ac_n "checking for alloca""... $ac_c" 1>&6 -echo "configure:1644: checking for alloca" >&5 +echo "configure:1647: checking for alloca" >&5 if eval "test \"`echo '$''{'ac_cv_func_alloca_works'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:1675: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* ac_cv_func_alloca_works=yes else @@ -1700,12 +1703,12 @@ EOF echo $ac_n "checking whether alloca needs Cray hooks""... $ac_c" 1>&6 -echo "configure:1704: checking whether alloca needs Cray hooks" >&5 +echo "configure:1707: checking whether alloca needs Cray hooks" >&5 if eval "test \"`echo '$''{'ac_cv_os_cray'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&6 if test $ac_cv_os_cray = yes; then for ac_func in _getb67 GETB67 getb67; do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:1734: checking for $ac_func" >&5 +echo "configure:1737: checking for $ac_func" >&5 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:1765: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else @@ -1785,7 +1788,7 @@ done fi echo $ac_n "checking stack direction for C alloca""... $ac_c" 1>&6 -echo "configure:1789: checking stack direction for C alloca" >&5 +echo "configure:1792: checking stack direction for C alloca" >&5 if eval "test \"`echo '$''{'ac_cv_c_stack_direction'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1793,7 +1796,7 @@ else ac_cv_c_stack_direction=0 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null +if { (eval echo configure:1819: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null then ac_cv_c_stack_direction=1 else @@ -1836,12 +1839,12 @@ fi for ac_func in gethostname gettimeofday select poll strerror strncasecmp setpgid do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:1840: checking for $ac_func" >&5 +echo "configure:1843: checking for $ac_func" >&5 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:1871: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else @@ -1899,7 +1902,7 @@ if test "x$CPP_PATH" = x; then # Extract the first word of "cpp", so it can be a program name with args. set dummy cpp; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:1903: checking for $ac_word" >&5 +echo "configure:1906: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_path_CPP_PATH'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1957,12 +1960,12 @@ INTLIBS="" echo $ac_n "checking for gettext""... $ac_c" 1>&6 -echo "configure:1961: checking for gettext" >&5 +echo "configure:1964: checking for gettext" >&5 if eval "test \"`echo '$''{'ac_cv_func_gettext'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:1992: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* eval "ac_cv_func_gettext=yes" else @@ -2003,7 +2006,7 @@ if eval "test \"`echo '$ac_cv_func_'gettext`\" = yes"; then else echo "$ac_t""no" 1>&6 echo $ac_n "checking for gettext in -lintl""... $ac_c" 1>&6 -echo "configure:2007: checking for gettext in -lintl" >&5 +echo "configure:2010: checking for gettext in -lintl" >&5 ac_lib_var=`echo intl'_'gettext | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -2011,7 +2014,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lintl $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:2029: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -2049,7 +2052,7 @@ fi # Extract the first word of "xgettext", so it can be a program name with args. set dummy xgettext; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:2053: checking for $ac_word" >&5 +echo "configure:2056: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_XGETTEXT'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -2153,7 +2156,7 @@ if test "$enable_kanji" = yes; then case $host_os in freebsd*) echo $ac_n "checking for setlocale in -lxpg4""... $ac_c" 1>&6 -echo "configure:2157: checking for setlocale in -lxpg4" >&5 +echo "configure:2160: checking for setlocale in -lxpg4" >&5 ac_lib_var=`echo xpg4'_'setlocale | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -2161,7 +2164,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lxpg4 $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:2179: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -2239,7 +2242,7 @@ fi # Uses ac_ vars as temps to allow command line to override cache and checks. # --without-x overrides everything else, but does not touch the cache. echo $ac_n "checking for X""... $ac_c" 1>&6 -echo "configure:2243: checking for X" >&5 +echo "configure:2246: checking for X" >&5 # Check whether --with-x or --without-x was given. if test "${with_x+set}" = set; then @@ -2301,12 +2304,12 @@ if test "$ac_x_includes" = NO; then # First, try using that file with no special directory specified. cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:2310: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:2313: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out` if test -z "$ac_err"; then rm -rf conftest* @@ -2375,14 +2378,14 @@ if test "$ac_x_libraries" = NO; then ac_save_LIBS="$LIBS" LIBS="-l$x_direct_test_library $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:2389: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* LIBS="$ac_save_LIBS" # We can link X programs with no special library path. @@ -2488,17 +2491,17 @@ else case "`(uname -sr) 2>/dev/null`" in "SunOS 5"*) echo $ac_n "checking whether -R must be followed by a space""... $ac_c" 1>&6 -echo "configure:2492: checking whether -R must be followed by a space" >&5 +echo "configure:2495: checking whether -R must be followed by a space" >&5 ac_xsave_LIBS="$LIBS"; LIBS="$LIBS -R$x_libraries" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:2505: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* ac_R_nospace=yes else @@ -2514,14 +2517,14 @@ rm -f conftest* else LIBS="$ac_xsave_LIBS -R $x_libraries" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:2528: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* ac_R_space=yes else @@ -2553,7 +2556,7 @@ rm -f conftest* # libraries were built with DECnet support. And karl@cs.umb.edu says # the Alpha needs dnet_stub (dnet does not exist). echo $ac_n "checking for dnet_ntoa in -ldnet""... $ac_c" 1>&6 -echo "configure:2557: checking for dnet_ntoa in -ldnet" >&5 +echo "configure:2560: checking for dnet_ntoa in -ldnet" >&5 ac_lib_var=`echo dnet'_'dnet_ntoa | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -2561,7 +2564,7 @@ else ac_save_LIBS="$LIBS" LIBS="-ldnet $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:2579: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -2594,7 +2597,7 @@ fi if test $ac_cv_lib_dnet_dnet_ntoa = no; then echo $ac_n "checking for dnet_ntoa in -ldnet_stub""... $ac_c" 1>&6 -echo "configure:2598: checking for dnet_ntoa in -ldnet_stub" >&5 +echo "configure:2601: checking for dnet_ntoa in -ldnet_stub" >&5 ac_lib_var=`echo dnet_stub'_'dnet_ntoa | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -2602,7 +2605,7 @@ else ac_save_LIBS="$LIBS" LIBS="-ldnet_stub $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:2620: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -2642,12 +2645,12 @@ fi # The nsl library prevents programs from opening the X display # on Irix 5.2, according to dickey@clark.net. echo $ac_n "checking for gethostbyname""... $ac_c" 1>&6 -echo "configure:2646: checking for gethostbyname" >&5 +echo "configure:2649: checking for gethostbyname" >&5 if eval "test \"`echo '$''{'ac_cv_func_gethostbyname'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:2677: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* eval "ac_cv_func_gethostbyname=yes" else @@ -2691,7 +2694,7 @@ fi if test $ac_cv_func_gethostbyname = no; then echo $ac_n "checking for gethostbyname in -lnsl""... $ac_c" 1>&6 -echo "configure:2695: checking for gethostbyname in -lnsl" >&5 +echo "configure:2698: checking for gethostbyname in -lnsl" >&5 ac_lib_var=`echo nsl'_'gethostbyname | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -2699,7 +2702,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lnsl $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:2717: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -2740,12 +2743,12 @@ fi # -lsocket must be given before -lnsl if both are needed. # We assume that if connect needs -lnsl, so does gethostbyname. echo $ac_n "checking for connect""... $ac_c" 1>&6 -echo "configure:2744: checking for connect" >&5 +echo "configure:2747: checking for connect" >&5 if eval "test \"`echo '$''{'ac_cv_func_connect'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:2775: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* eval "ac_cv_func_connect=yes" else @@ -2789,7 +2792,7 @@ fi if test $ac_cv_func_connect = no; then echo $ac_n "checking for connect in -lsocket""... $ac_c" 1>&6 -echo "configure:2793: checking for connect in -lsocket" >&5 +echo "configure:2796: checking for connect in -lsocket" >&5 ac_lib_var=`echo socket'_'connect | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -2797,7 +2800,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lsocket $X_EXTRA_LIBS $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:2815: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -2832,12 +2835,12 @@ fi # gomez@mi.uni-erlangen.de says -lposix is necessary on A/UX. echo $ac_n "checking for remove""... $ac_c" 1>&6 -echo "configure:2836: checking for remove" >&5 +echo "configure:2839: checking for remove" >&5 if eval "test \"`echo '$''{'ac_cv_func_remove'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:2867: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* eval "ac_cv_func_remove=yes" else @@ -2881,7 +2884,7 @@ fi if test $ac_cv_func_remove = no; then echo $ac_n "checking for remove in -lposix""... $ac_c" 1>&6 -echo "configure:2885: checking for remove in -lposix" >&5 +echo "configure:2888: checking for remove in -lposix" >&5 ac_lib_var=`echo posix'_'remove | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -2889,7 +2892,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lposix $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:2907: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -2924,12 +2927,12 @@ fi # BSDI BSD/OS 2.1 needs -lipc for XOpenDisplay. echo $ac_n "checking for shmat""... $ac_c" 1>&6 -echo "configure:2928: checking for shmat" >&5 +echo "configure:2931: checking for shmat" >&5 if eval "test \"`echo '$''{'ac_cv_func_shmat'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:2959: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* eval "ac_cv_func_shmat=yes" else @@ -2973,7 +2976,7 @@ fi if test $ac_cv_func_shmat = no; then echo $ac_n "checking for shmat in -lipc""... $ac_c" 1>&6 -echo "configure:2977: checking for shmat in -lipc" >&5 +echo "configure:2980: checking for shmat in -lipc" >&5 ac_lib_var=`echo ipc'_'shmat | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -2981,7 +2984,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lipc $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:2999: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -3025,7 +3028,7 @@ fi # libraries we check for below, so use a different variable. # --interran@uluru.Stanford.EDU, kb@cs.umb.edu. echo $ac_n "checking for IceConnectionNumber in -lICE""... $ac_c" 1>&6 -echo "configure:3029: checking for IceConnectionNumber in -lICE" >&5 +echo "configure:3032: checking for IceConnectionNumber in -lICE" >&5 ac_lib_var=`echo ICE'_'IceConnectionNumber | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -3033,7 +3036,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lICE $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:3051: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -3076,7 +3079,7 @@ XLFLAGS="$X_LIBS" XLIBS="$X_EXTRA_LIBS -lX11" echo $ac_n "checking for _Xsetlocale in -lX11""... $ac_c" 1>&6 -echo "configure:3080: checking for _Xsetlocale in -lX11" >&5 +echo "configure:3083: checking for _Xsetlocale in -lX11" >&5 ac_lib_var=`echo X11'_'_Xsetlocale | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -3084,7 +3087,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lX11 $XLFLAGS $XLIBS $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:3102: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -3132,7 +3135,7 @@ added_xext=no if test "$shape" = yes; then echo $ac_n "checking for XShapeSelectInput in -lXext""... $ac_c" 1>&6 -echo "configure:3136: checking for XShapeSelectInput in -lXext" >&5 +echo "configure:3139: checking for XShapeSelectInput in -lXext" >&5 ac_lib_var=`echo Xext'_'XShapeSelectInput | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -3140,7 +3143,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lXext $XLFLAGS $XLIBS $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:3158: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -3190,7 +3193,7 @@ fi if test "$shm" = yes; then echo $ac_n "checking for XShmAttach in -lXext""... $ac_c" 1>&6 -echo "configure:3194: checking for XShmAttach in -lXext" >&5 +echo "configure:3197: checking for XShmAttach in -lXext" >&5 ac_lib_var=`echo Xext'_'XShmAttach | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -3198,7 +3201,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lXext $XLFLAGS $XLIBS $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:3216: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -3233,12 +3236,12 @@ fi if test "$ok" = yes; then echo $ac_n "checking for shmget""... $ac_c" 1>&6 -echo "configure:3237: checking for shmget" >&5 +echo "configure:3240: checking for shmget" >&5 if eval "test \"`echo '$''{'ac_cv_func_shmget'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:3268: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* eval "ac_cv_func_shmget=yes" else @@ -3295,6 +3298,14 @@ fi +# +# +#AC_DEFINE(R6SM) +#AC_SUBST(XSMPLIBS) +# + + + GFXLIBS="" # Check whether --with-gfx-libs or --without-gfx-libs was given. if test "${with_gfx_libs+set}" = set; then @@ -3329,7 +3340,7 @@ fi if test "$xpm" = yes; then echo $ac_n "checking for XpmCreatePixmapFromData in -lXpm""... $ac_c" 1>&6 -echo "configure:3333: checking for XpmCreatePixmapFromData in -lXpm" >&5 +echo "configure:3344: checking for XpmCreatePixmapFromData in -lXpm" >&5 ac_lib_var=`echo Xpm'_'XpmCreatePixmapFromData | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -3337,7 +3348,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lXpm $GFX_INC_PATH $GFXLFLAGS $XLFLAGS $XLIBS $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:3363: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -3375,17 +3386,17 @@ fi CPPFLAGS="$CPPFLAGS $GFX_INC_PATH $XCFLAGS" ac_safe=`echo "X11/xpm.h" | sed 'y%./+-%__p_%'` echo $ac_n "checking for X11/xpm.h""... $ac_c" 1>&6 -echo "configure:3379: checking for X11/xpm.h" >&5 +echo "configure:3390: checking for X11/xpm.h" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:3389: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:3400: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out` if test -z "$ac_err"; then rm -rf conftest* @@ -3423,7 +3434,7 @@ fi echo $ac_n "checking for gzread in -lz""... $ac_c" 1>&6 -echo "configure:3427: checking for gzread in -lz" >&5 +echo "configure:3438: checking for gzread in -lz" >&5 ac_lib_var=`echo z'_'gzread | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -3431,7 +3442,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lz $GFX_INC_PATH $GFXLFLAGS $XLFLAGS $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:3457: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -3466,15 +3477,19 @@ fi png=yes -# assume libz is present... -#AC_ARG_ENABLE(png, -#[ --disable-png disable PNG support through libpng], -# png=$enableval, png=yes) +# Check whether --enable-png or --disable-png was given. +if test "${enable_png+set}" = set; then + enableval="$enable_png" + png=$enableval +else + png=yes +fi + if test "$png" = yes -a "$zlib" = yes ; then echo $ac_n "checking for png_get_valid in -lpng""... $ac_c" 1>&6 -echo "configure:3478: checking for png_get_valid in -lpng" >&5 +echo "configure:3493: checking for png_get_valid in -lpng" >&5 ac_lib_var=`echo png'_'png_get_valid | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -3482,7 +3497,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lpng $GFX_INC_PATH $GFXLFLAGS $XLFLAGS -lz -lm $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:3512: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -3520,17 +3535,17 @@ fi CPPFLAGS="$CPPFLAGS $GFX_INC_PATH $XCFLAGS" ac_safe=`echo "png.h" | sed 'y%./+-%__p_%'` echo $ac_n "checking for png.h""... $ac_c" 1>&6 -echo "configure:3524: checking for png.h" >&5 +echo "configure:3539: checking for png.h" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:3534: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:3549: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out` if test -z "$ac_err"; then rm -rf conftest* @@ -3569,7 +3584,7 @@ fi if test "$jpeg" = yes; then echo $ac_n "checking for jpeg_destroy_compress in -ljpeg""... $ac_c" 1>&6 -echo "configure:3573: checking for jpeg_destroy_compress in -ljpeg" >&5 +echo "configure:3588: checking for jpeg_destroy_compress in -ljpeg" >&5 ac_lib_var=`echo jpeg'_'jpeg_destroy_compress | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -3577,7 +3592,7 @@ else ac_save_LIBS="$LIBS" LIBS="-ljpeg $GFX_INC_PATH $GFXLFLAGS $XLFLAGS $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:3607: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -3614,12 +3629,12 @@ fi my_old_cppflags=$CPPFLAGS CPPFLAGS="$CPPFLAGS $GFX_INC_PATH $XCFLAGS" cat > conftest.$ac_ext <&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:3638: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out` if test -z "$ac_err"; then rm -rf conftest* @@ -3649,7 +3664,7 @@ fi if test "$gif" = yes; then retry=no echo $ac_n "checking for DGifOpenFileName in -lungif""... $ac_c" 1>&6 -echo "configure:3653: checking for DGifOpenFileName in -lungif" >&5 +echo "configure:3668: checking for DGifOpenFileName in -lungif" >&5 ac_lib_var=`echo ungif'_'DGifOpenFileName | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -3657,7 +3672,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lungif $GFX_INC_PATH $GFXLFLAGS $XLFLAGS $XLIBS $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:3687: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -3691,7 +3706,7 @@ fi if test "$retry" = yes; then echo $ac_n "checking for DGifOpenFileName in -lgif""... $ac_c" 1>&6 -echo "configure:3695: checking for DGifOpenFileName in -lgif" >&5 +echo "configure:3710: checking for DGifOpenFileName in -lgif" >&5 ac_lib_var=`echo gif'_'DGifOpenFileName | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -3699,7 +3714,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lgif $GFX_INC_PATH $GFXLFLAGS $XLFLAGS $XLIBS $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:3729: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -3738,17 +3753,17 @@ fi CPPFLAGS="$CPPFLAGS $GFX_INC_PATH $XCFLAGS" ac_safe=`echo "gif_lib.h" | sed 'y%./+-%__p_%'` echo $ac_n "checking for gif_lib.h""... $ac_c" 1>&6 -echo "configure:3742: checking for gif_lib.h" >&5 +echo "configure:3757: checking for gif_lib.h" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:3752: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:3767: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out` if test -z "$ac_err"; then rm -rf conftest* @@ -3798,7 +3813,7 @@ ICONEXT="xpm" if test "$tif" = yes; then my_libname="" echo $ac_n "checking for TIFFGetVersion in -ltiff""... $ac_c" 1>&6 -echo "configure:3802: checking for TIFFGetVersion in -ltiff" >&5 +echo "configure:3817: checking for TIFFGetVersion in -ltiff" >&5 ac_lib_var=`echo tiff'_'TIFFGetVersion | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -3806,7 +3821,7 @@ else ac_save_LIBS="$LIBS" LIBS="-ltiff $GFX_INC_PATH $GFXLFLAGS $XLFLAGS $XLIBS $GFXLIBS -lm $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:3836: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -3838,10 +3853,11 @@ else my_libok=no fi + unset ac_cv_lib_tiff_TIFFGetVersion if test "$my_libok" = no; then if test "$zlib" = "yes"; then echo $ac_n "checking for TIFFGetVersion in -ltiff""... $ac_c" 1>&6 -echo "configure:3845: checking for TIFFGetVersion in -ltiff" >&5 +echo "configure:3861: checking for TIFFGetVersion in -ltiff" >&5 ac_lib_var=`echo tiff'_'TIFFGetVersion | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -3849,7 +3865,7 @@ else ac_save_LIBS="$LIBS" LIBS="-ltiff $GFX_INC_PATH $GFXLFLAGS $XLFLAGS $XLIBS $GFXLIBS -lz -lm $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:3880: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -3886,7 +3902,7 @@ fi if test "$my_libok" = no; then echo $ac_n "checking for TIFFGetVersion in -ltiff34""... $ac_c" 1>&6 -echo "configure:3890: checking for TIFFGetVersion in -ltiff34" >&5 +echo "configure:3906: checking for TIFFGetVersion in -ltiff34" >&5 ac_lib_var=`echo tiff34'_'TIFFGetVersion | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -3894,7 +3910,7 @@ else ac_save_LIBS="$LIBS" LIBS="-ltiff34 $GFX_INC_PATH $GFXLFLAGS $XLFLAGS $XLIBS $GFXLIBS -lm $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:3925: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -3933,17 +3949,17 @@ fi CPPFLAGS="$CPPFLAGS $GFX_INC_PATH $XCFLAGS" ac_safe=`echo "tiffio.h" | sed 'y%./+-%__p_%'` echo $ac_n "checking for tiffio.h""... $ac_c" 1>&6 -echo "configure:3937: checking for tiffio.h" >&5 +echo "configure:3953: checking for tiffio.h" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:3947: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:3963: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out` if test -z "$ac_err"; then rm -rf conftest* @@ -3979,70 +3995,6 @@ fi - -#LIBPL_LIBS="-L${top_builddir}/libPropList -lPropList" -#LIBPL_INC_PATH="-I${top_srcdir}/libPropList" -# -# -#PLPATH=`pwd`/libPropList -# -#if test -f $PLPATH/libPropList.a; then -# echo "using bundled libPropList, already compiled." -# needtobuild=no -# LIBPL_LIBS="-L$PLPATH -lPropList" -# LIBPL_INC_PATH="-I$PLPATH" -#else -# AC_CHECK_LIB(PropList, PLGetString, -# [LIBPL_LIBS=-lPropList LIBPL_INC_PATH="" needtobuild=no], -# [LIBPL_LIBS="-L$PLPATH -lPropList" -# LIBPL_INC_PATH="-I$PLPATH" -# needtobuild=yes]) -#fi -# -# -#if test "$needtobuild" = yes; then -# if test -f libPropList/libPropList.a; then -# echo "using included libPropList" -# else -# echo "********** WARNING *************" -# echo "libPropList is not installed in your system." -# echo "You need to build it before building Window Maker (if you already" -# echo "did that, remove config.cache and rerun configure)." -# echo "Please read the INSTALL file for detailed instructions." -# echo "Press to continue configuring Window Maker or" -# echo "type b and to build it now." -# read foo -# if test "$foo" = b; then -# echo -# echo "Building libPropList..." -# echo -# if test ! -d libPropList; then -# gzip -d -c libPropList.tar.gz | tar xf - -# fi -# ok=no -# if (cd libPropList; ./configure); then -# if (cd libPropList; make); then -# ok=yes -# fi -# fi -# if test "$ok" = no; then -# echo "********** WARNING **********" -# echo "An error occurred while building libPropList" -# echo "Please build it manually." -# echo "Press to continue." -# read foo -# fi -# echo -# echo "resuming Window Maker configuration..." -# echo -# fi -# fi -#fi -# -#AC_SUBST(LIBPL_LIBS) -#AC_SUBST(LIBPL_INC_PATH) - - # Check whether --enable-debug or --disable-debug was given. if test "${enable_debug+set}" = set; then enableval="$enable_debug" @@ -4084,7 +4036,7 @@ if test "${prefix}" = "NONE"; then prefix="/usr/local" fi if test "${exec_prefix}" = "NONE"; then - exec_prefix="${prefix}" + exec_prefix='$(prefix)' fi # Check whether --with-pixmapdir or --without-pixmapdir was given. @@ -4097,7 +4049,7 @@ fi if test "x$with_pixmapdir" != "x"; then pixmapdir=$with_pixmapdir else - pixmapdir="${datadir}/pixmaps" + pixmapdir='$(datadir)/pixmaps' fi @@ -4109,15 +4061,16 @@ appspath="" # Check whether --with-appspath or --without-appspath was given. if test "${with_appspath+set}" = set; then withval="$with_appspath" - : + appspath=$withval fi -if test "x$with_appspath" = "x"; then +if test "x$appspath" = "x"; then gnustepdir='$(prefix)/GNUstep' if test "x$GNUSTEP_LOCAL_ROOT" != "x" ; then - gnustepdir=`echo "$GNUSTEP_LOCAL_ROOT" | sed -e "s%${prefix}%\${prefix}%"` + gnustepdir=`echo "$GNUSTEP_LOCAL_ROOT" | sed -e "s|^${prefix}|prefix|"` + gnustepdir=`echo $gnustepdir | sed -e 's|^prefix|${prefix}|'` fi with_appspath=$gnustepdir/Apps @@ -4144,12 +4097,12 @@ fi echo $ac_n "checking for sys/wait.h that is POSIX.1 compatible""... $ac_c" 1>&6 -echo "configure:4148: checking for sys/wait.h that is POSIX.1 compatible" >&5 +echo "configure:4101: checking for sys/wait.h that is POSIX.1 compatible" >&5 if eval "test \"`echo '$''{'ac_cv_header_sys_wait_h'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < #include @@ -4165,7 +4118,7 @@ wait (&s); s = WIFEXITED (s) ? WEXITSTATUS (s) : 1; ; return 0; } EOF -if { (eval echo configure:4169: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:4122: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_header_sys_wait_h=yes else @@ -4189,17 +4142,17 @@ for ac_hdr in fcntl.h limits.h sys/ioctl.h sys/time.h sys/types.h libintl.h sys/ do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:4193: checking for $ac_hdr" >&5 +echo "configure:4146: checking for $ac_hdr" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:4203: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:4156: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out` if test -z "$ac_err"; then rm -rf conftest* @@ -4229,12 +4182,12 @@ done echo $ac_n "checking for sys_siglist declaration in signal.h or unistd.h""... $ac_c" 1>&6 -echo "configure:4233: checking for sys_siglist declaration in signal.h or unistd.h" >&5 +echo "configure:4186: checking for sys_siglist declaration in signal.h or unistd.h" >&5 if eval "test \"`echo '$''{'ac_cv_decl_sys_siglist'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < #include @@ -4246,7 +4199,7 @@ int main() { char *msg = *(sys_siglist + 1); ; return 0; } EOF -if { (eval echo configure:4250: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:4203: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_decl_sys_siglist=yes else @@ -4267,12 +4220,12 @@ EOF fi echo $ac_n "checking for working const""... $ac_c" 1>&6 -echo "configure:4271: checking for working const" >&5 +echo "configure:4224: checking for working const" >&5 if eval "test \"`echo '$''{'ac_cv_c_const'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:4278: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_c_const=yes else @@ -4342,12 +4295,12 @@ EOF fi echo $ac_n "checking for ANSI C header files""... $ac_c" 1>&6 -echo "configure:4346: checking for ANSI C header files" >&5 +echo "configure:4299: checking for ANSI C header files" >&5 if eval "test \"`echo '$''{'ac_cv_header_stdc'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < #include @@ -4355,7 +4308,7 @@ else #include EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:4359: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:4312: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out` if test -z "$ac_err"; then rm -rf conftest* @@ -4372,7 +4325,7 @@ rm -f conftest* if test $ac_cv_header_stdc = yes; then # SunOS 4.x string.h does not declare mem*, contrary to ANSI. cat > conftest.$ac_ext < EOF @@ -4390,7 +4343,7 @@ fi if test $ac_cv_header_stdc = yes; then # ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI. cat > conftest.$ac_ext < EOF @@ -4411,7 +4364,7 @@ if test "$cross_compiling" = yes; then : else cat > conftest.$ac_ext < #define ISLOWER(c) ('a' <= (c) && (c) <= 'z') @@ -4422,7 +4375,7 @@ if (XOR (islower (i), ISLOWER (i)) || toupper (i) != TOUPPER (i)) exit(2); exit (0); } EOF -if { (eval echo configure:4426: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null +if { (eval echo configure:4379: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null then : else @@ -4446,12 +4399,12 @@ EOF fi echo $ac_n "checking for size_t""... $ac_c" 1>&6 -echo "configure:4450: checking for size_t" >&5 +echo "configure:4403: checking for size_t" >&5 if eval "test \"`echo '$''{'ac_cv_type_size_t'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < #if STDC_HEADERS @@ -4479,12 +4432,12 @@ EOF fi echo $ac_n "checking for pid_t""... $ac_c" 1>&6 -echo "configure:4483: checking for pid_t" >&5 +echo "configure:4436: checking for pid_t" >&5 if eval "test \"`echo '$''{'ac_cv_type_pid_t'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < #if STDC_HEADERS @@ -4512,12 +4465,12 @@ EOF fi echo $ac_n "checking whether time.h and sys/time.h may both be included""... $ac_c" 1>&6 -echo "configure:4516: checking whether time.h and sys/time.h may both be included" >&5 +echo "configure:4469: checking whether time.h and sys/time.h may both be included" >&5 if eval "test \"`echo '$''{'ac_cv_header_time'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < #include @@ -4526,7 +4479,7 @@ int main() { struct tm *tp; ; return 0; } EOF -if { (eval echo configure:4530: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:4483: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_header_time=yes else @@ -4548,17 +4501,6 @@ fi -if test "$GCC" = "yes"; then -# ceflagues="" -# for i in $CFLAGS; do -# if test "$i" != "-g" ; then -# ceflagues="$ceflagues $i" -# fi -# fi -# CFLAGS="$ceflagues -Wall -Wno-implicit-int -finline-functions" - CFLAGS="$CFLAGS -Wall -Wno-implicit-int -Wcast-align" -fi - enable_shared=no @@ -4596,7 +4538,7 @@ if test "$enable_shared" = yes; then fi echo $ac_n "checking for shared library support""... $ac_c" 1>&6 -echo "configure:4600: checking for shared library support" >&5 +echo "configure:4542: checking for shared library support" >&5 test=tmptest$$ cat > $test.c < to continue configuring Window Maker or" -# echo "type b and to build it now." -# read foo -# if test "$foo" = b; then -# echo -# echo "Building libPropList..." -# echo -# if test ! -d libPropList; then -# gzip -d -c libPropList.tar.gz | tar xf - -# fi -# ok=no -# if (cd libPropList; ./configure); then -# if (cd libPropList; make); then -# ok=yes -# fi -# fi -# if test "$ok" = no; then -# echo "********** WARNING **********" -# echo "An error occurred while building libPropList" -# echo "Please build it manually." -# echo "Press to continue." -# read foo -# fi -# echo -# echo "resuming Window Maker configuration..." -# echo -# fi -# fi -#fi -# -#AC_SUBST(LIBPL_LIBS) -#AC_SUBST(LIBPL_INC_PATH) - dnl Debugging setup dnl =============== @@ -597,7 +538,7 @@ if test "${prefix}" = "NONE"; then prefix="/usr/local" fi if test "${exec_prefix}" = "NONE"; then - exec_prefix="${prefix}" + exec_prefix='$(prefix)' fi dnl Support for PIXMAPDIR option @@ -608,7 +549,7 @@ AC_ARG_WITH(pixmapdir, if test "x$with_pixmapdir" != "x"; then pixmapdir=$with_pixmapdir else - pixmapdir="${datadir}/pixmaps" + pixmapdir='$(datadir)/pixmaps' fi AC_SUBST(pixmapdir) @@ -620,13 +561,15 @@ dnl ============================================== appspath="" AC_ARG_WITH(appspath, -[ --with-appspath=PATH specify the path of the GNUstep applications directory]) +[ --with-appspath=PATH specify the path of the GNUstep applications +directory], appspath=$withval ) -if test "x$with_appspath" = "x"; then +if test "x$appspath" = "x"; then gnustepdir='$(prefix)/GNUstep' if test "x$GNUSTEP_LOCAL_ROOT" != "x" ; then - gnustepdir=`echo "$GNUSTEP_LOCAL_ROOT" | sed -e "s%${prefix}%\${prefix}%"` + gnustepdir=`echo "$GNUSTEP_LOCAL_ROOT" | sed -e "s|^${prefix}|prefix|"` + gnustepdir=`echo $gnustepdir | sed -e 's|^prefix|${prefix}|'` fi with_appspath=$gnustepdir/Apps @@ -668,19 +611,6 @@ AC_TYPE_PID_T AC_HEADER_TIME -dnl Some decisions.... -dnl ================== -if test "$GCC" = "yes"; then -# ceflagues="" -# for i in $CFLAGS; do -# if test "$i" != "-g" ; then -# ceflagues="$ceflagues $i" -# fi -# fi -# CFLAGS="$ceflagues -Wall -Wno-implicit-int -finline-functions" - CFLAGS="$CFLAGS -Wall -Wno-implicit-int -Wcast-align" -fi - dnl Shared Library Support (unfinished) dnl =================================== @@ -814,8 +744,8 @@ echo echo "Window Maker was configured as follows:" echo echo "Installation path prefix: $prefix" -echo "Installation path prefix for binaries: $exec_prefix" -echo "Installation path for WPrefs.app: $wprefsdir" +echo "Installation path prefix for binaries: $exec_prefix" | sed -e 's|\$(prefix)|'"$prefix|" +echo "Installation path for WPrefs.app: $wprefsdir" | sed -e 's|\$(prefix)|'"$prefix|" echo "Graphic format libraries: $supported_gfx" echo "Sound support: $sound" echo "Translated message files to install: $mof" diff --git a/po/README b/po/README index ca805f56..1a76d111 100644 --- a/po/README +++ b/po/README @@ -25,7 +25,7 @@ fi.po Finnish Ville Hautamaki Ramin Miraftabi hr.po Croatian 3 Toni Bilic el.po Greek Nikolaos Papagrigoriou -pl.po Pollish Piotr Dembiński +pl.po Pollish Piotr Dembiński ro.po Romanian Andrei Vuta diff --git a/po/cs.po b/po/cs.po index e97f107b..15824228 100644 --- a/po/cs.po +++ b/po/cs.po @@ -1,33 +1,40 @@ -# Message catalog 1998. +# Message catalog for WindowMaker # Copyright (C) 1998 Free Software Foundation, Inc. # David Sauer , 1998. # msgid "" msgstr "" -"Project-Id-Version: WindowMaker 0.18.0\n" -"POT-Creation-Date: 1998-08-18 01:41+0200\n" -"PO-Revision-Date: 1998-08-18 01:52+02:00\n" +"Project-Id-Version: WindowMaker 0.20.2\n" +"POT-Creation-Date: 1998-10-24 12:35+02:00\n" +"PO-Revision-Date: 1998-10-27 13:07+01:00\n" "Last-Translator: David Sauer \n" -"Language-Team: Czech \n" +"Language-Team: czech \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=ISO-8859-2\n" "Content-Transfer-Encoding: unknown\n" -#: ../src/appicon.c:493 ../src/dialog.c:262 ../src/dialog.c:318 -#: ../src/dock.c:2966 ../src/rootmenu.c:164 ../src/winspector.c:269 -#: ../src/winspector.c:277 +#: ../src/appicon.c:509 ../src/dialog.c:215 ../src/dialog.c:271 +#: ../src/dock.c:2955 ../src/dockedapp.c:206 ../src/winspector.c:279 +#: ../src/winspector.c:295 msgid "Error" msgstr "Chyba" -#: ../src/appicon.c:494 ../src/winspector.c:278 +#: ../src/appicon.c:510 msgid "Could not open specified icon file" -msgstr "Nelze otevří specifikovaný soubor s ikonou" +msgstr "Nelze otevřít specifikovaný soubor s ikonou" -#: ../src/appicon.c:515 ../src/dock.c:238 ../src/winmenu.c:85 +#: ../src/appicon.c:511 ../src/dialog.c:114 ../src/dialog.c:215 +#: ../src/dialog.c:271 ../src/dialog.c:451 ../src/dock.c:420 +#: ../src/dock.c:2956 ../src/dockedapp.c:206 ../src/dockedapp.c:350 +#: ../src/winspector.c:280 ../src/winspector.c:296 +msgid "OK" +msgstr "OK" + +#: ../src/appicon.c:532 ../src/dock.c:268 ../src/winmenu.c:85 msgid "Kill Application" msgstr "Ukončit aplikaci" -#: ../src/appicon.c:516 ../src/dock.c:239 ../src/winmenu.c:86 +#: ../src/appicon.c:533 ../src/dock.c:269 ../src/winmenu.c:86 msgid "" "This will kill the application.\n" "Any unsaved changes will be lost.\n" @@ -37,429 +44,364 @@ msgstr "" "Jakékoli změny budou ztraceny.\n" "Prosím potvrďte." -#: ../src/appicon.c:547 ../src/dock.c:1038 +#: ../src/appicon.c:534 ../src/dock.c:270 ../src/winmenu.c:87 +msgid "Yes" +msgstr "Ano" + +#: ../src/appicon.c:534 ../src/dock.c:270 ../src/winmenu.c:87 +msgid "No" +msgstr "Ne" + +#: ../src/appicon.c:548 ../src/dock.c:1030 msgid "Unhide Here" msgstr "Odkryj zde" -#: ../src/appicon.c:548 ../src/dock.c:1040 +#: ../src/appicon.c:549 ../src/dock.c:1032 msgid "(Un)Hide" msgstr "Skrýt/Odkrýt" -#: ../src/appicon.c:549 +#: ../src/appicon.c:550 msgid "Set Icon..." msgstr "Nastavit ikonu..." -#: ../src/appicon.c:550 ../src/dock.c:1044 ../src/winmenu.c:260 +#: ../src/appicon.c:551 ../src/dock.c:1036 ../src/winmenu.c:260 msgid "Kill" msgstr "Ukončit" -#: ../src/defaults.c:581 ../src/screen.c:535 ../src/screen.c:643 -#: ../src/screen.c:649 +#: ../src/defaults.c:687 ../src/startup.c:681 ../src/startup.c:699 +#: ../src/startup.c:705 #, c-format msgid "could not read domain \"%s\" from defaults database" msgstr "z databáze standardů nelze načíst doménu \"%s\"" -#: ../src/defaults.c:627 ../src/defaults.c:749 ../src/defaults.c:784 -#: ../src/defaults.c:810 +#: ../src/defaults.c:733 ../src/defaults.c:857 ../src/defaults.c:896 +#: ../src/defaults.c:926 #, c-format msgid "Domain %s (%s) of defaults database is corrupted!" msgstr "V databázi standardů jsou poškozena doména %s (%s)!" -#: ../src/defaults.c:632 ../src/defaults.c:766 ../src/defaults.c:793 -#: ../src/defaults.c:819 +#: ../src/defaults.c:738 ../src/defaults.c:878 ../src/defaults.c:909 +#: ../src/defaults.c:935 #, c-format msgid "could not load domain %s from user defaults database" msgstr "z uživatelovy databáze standardů nelze načíst doménu \"%s\"" -#: ../src/defaults.c:643 ../src/defaults.c:734 +#: ../src/defaults.c:749 ../src/defaults.c:842 #, c-format msgid "Domain %s (%s) of global defaults database is corrupted!" msgstr "V globální databázi standardů je poškozena doména %s (%s)" -#: ../src/defaults.c:660 ../src/defaults.c:739 +#: ../src/defaults.c:768 ../src/defaults.c:847 #, c-format msgid "could not load domain %s from global defaults database" msgstr "z globální databáze standardů nelze načíst doménu \"%s\"" -#: ../src/defaults.c:1131 +#: ../src/defaults.c:1237 +#, c-format +msgid "wrong option value for key \"%s\". Should be one of %s" +msgstr "Chybný formát volby pro klíč \"%s\". Má být jeden z %s" + +#: ../src/defaults.c:1284 #, c-format msgid "can't convert \"%s\" to boolean for key \"%s\"" msgstr "\"%s\" nelze zkonvertovat pro klíč \"%s\" na boolean " -#: ../src/defaults.c:1136 ../src/defaults.c:1170 ../src/defaults.c:1202 -#: ../src/defaults.c:1215 ../src/defaults.c:1230 ../src/defaults.c:1245 -#: ../src/defaults.c:1316 ../src/defaults.c:1328 ../src/defaults.c:1387 -#: ../src/defaults.c:1431 ../src/defaults.c:1473 ../src/defaults.c:1519 -#: ../src/defaults.c:1565 ../src/defaults.c:1787 ../src/defaults.c:1801 -#: ../src/defaults.c:1839 ../src/defaults.c:1851 ../src/defaults.c:1863 -#: ../src/defaults.c:1886 ../src/defaults.c:1913 ../src/defaults.c:1926 -#: ../src/defaults.c:1939 ../src/defaults.c:1969 ../src/defaults.c:2010 -#: ../src/defaults.c:2022 ../src/defaults.c:2034 ../src/defaults.c:2059 -#: ../src/defaults.c:2079 ../src/defaults.c:2092 ../src/defaults.c:2105 -#: ../src/defaults.c:2142 ../src/defaults.c:2180 ../src/defaults.c:2244 -#: ../src/defaults.c:2395 +#: ../src/defaults.c:1289 ../src/defaults.c:1323 ../src/defaults.c:1355 +#: ../src/defaults.c:1368 ../src/defaults.c:1383 ../src/defaults.c:1398 +#: ../src/defaults.c:1469 ../src/defaults.c:1481 ../src/defaults.c:1736 +#: ../src/defaults.c:1750 ../src/defaults.c:1788 ../src/defaults.c:1800 +#: ../src/defaults.c:1812 ../src/defaults.c:1835 ../src/defaults.c:1862 +#: ../src/defaults.c:1875 ../src/defaults.c:1888 ../src/defaults.c:1918 +#: ../src/defaults.c:1959 ../src/defaults.c:1971 ../src/defaults.c:1983 +#: ../src/defaults.c:2009 ../src/defaults.c:2029 ../src/defaults.c:2042 +#: ../src/defaults.c:2057 ../src/defaults.c:2096 ../src/defaults.c:2161 #, c-format msgid "using default \"%s\" instead" msgstr "použiji implicitní %s" -#: ../src/defaults.c:1167 +#: ../src/defaults.c:1320 #, c-format msgid "can't convert \"%s\" to integer for key \"%s\"" msgstr "\"%s\" nelze zkonvertovat pro klíč \"%s\" na integer" -#: ../src/defaults.c:1197 ../src/defaults.c:1311 ../src/defaults.c:1782 -#: ../src/defaults.c:1834 ../src/defaults.c:2005 ../src/wdefaults.c:541 -#: ../src/wdefaults.c:577 +#: ../src/defaults.c:1350 ../src/defaults.c:1464 ../src/defaults.c:1731 +#: ../src/defaults.c:1783 ../src/defaults.c:1954 ../src/wdefaults.c:544 +#: ../src/wdefaults.c:580 #, c-format msgid "Wrong option format for key \"%s\". Should be %s." msgstr "Chybný formát volby pro klíč \"%s\". Má být %s." -#: ../src/defaults.c:1210 +#: ../src/defaults.c:1363 #, c-format msgid "Incorrect number of elements in array for key \"%s\"." msgstr "Pro klíč %s je v poli chybný počet prvků." -#: ../src/defaults.c:1225 +#: ../src/defaults.c:1378 #, c-format msgid "Wrong value for key \"%s\". Should be Coordinate." msgstr "Chybná hodnota pro klíč \"%s\". Má být Coordinate." -#: ../src/defaults.c:1240 +#: ../src/defaults.c:1393 #, c-format msgid "can't convert array to integers for \"%s\"." msgstr "pole nelze konvertovat na čísla typu integer(pro %s)." -#: ../src/defaults.c:1379 -#, c-format -msgid "Invalid focus mode \"%s\". Should be Manual, Auto or Sloppy." -msgstr "Chybný způsob zaměření oken \"%s\". Má být Manual, Auto nebo Sloopy." - -#: ../src/defaults.c:1382 -#, c-format -msgid "Invalid colormap focus mode \"%s\". Should be Manual or Auto." -msgstr "Chybný způsob zaměření barevné mapy \"%s\". Má být Manual nebo Auto." - -#: ../src/defaults.c:1425 -#, c-format -msgid "" -"Invalid window placement mode \"%s\". Should be Auto, Cascade, Random or " -"Manual." -msgstr "" -"Pokládání oken způsobem \"%s\". Má být Auto, Cascade, Random nebo Manual." - -#: ../src/defaults.c:1467 -#, c-format -msgid "" -"Invalid geometry display type \"%s\". Should be Center, Corner, Floating or " -"Line." -msgstr "" -"Chybně určený typ zobrazení geometrie okna \"%s\". Má být Center, Corner, " -"Floating nebo Line." - -#: ../src/defaults.c:1514 -#, c-format -msgid "" -"Invalid speed \"%s\". Should be UltraFast, Fast, Medium, Slow or UltraSlow." -msgstr "" -"Chybný způsob určení rychlosti \"%s\". Má být UltraFast, Fast, Medium, Slow " -"nebo UltraSlow." - -#: ../src/defaults.c:1559 -#, c-format -msgid "" -"Invalid mouse button \"%s\". Should be Left, Middle, Right or Button1 " -"through Button5" -msgstr "" -"Chybně určené tlačítko myši \"%s\". Má být Left, Middle, Right nebo Button1 " -"až Button5" - -#: ../src/defaults.c:1628 ../src/defaults.c:1659 ../src/defaults.c:1671 -#: ../src/defaults.c:1713 ../src/defaults.c:1753 +#: ../src/defaults.c:1577 ../src/defaults.c:1608 ../src/defaults.c:1620 +#: ../src/defaults.c:1662 ../src/defaults.c:1702 #, c-format msgid "\"%s\" is not a valid color name" msgstr "%s není správné jméno barvy" -#: ../src/defaults.c:1640 +#: ../src/defaults.c:1589 msgid "bad number of arguments in gradient specification" msgstr "chybný počet argumetů ve specifikaci gradientu" -#: ../src/defaults.c:1686 +#: ../src/defaults.c:1635 msgid "too few arguments in multicolor gradient specification" msgstr "nedostatek argumentů při specifikaci vícebarevného gradientu" -#: ../src/defaults.c:1796 +#: ../src/defaults.c:1745 #, c-format msgid "Error in texture specification for key \"%s\"" msgstr "Chyba ve specifikaci textury pro klíč \"%s\"" -#: ../src/defaults.c:1847 ../src/defaults.c:1882 ../src/defaults.c:2018 -#: ../src/defaults.c:2055 +#: ../src/defaults.c:1796 ../src/defaults.c:1831 ../src/defaults.c:1967 +#: ../src/defaults.c:2005 msgid "Too few elements in array for key \"WorkspaceBack\"." msgstr "Pro klíč \"WorkspaceBack\" není v poli dostatek prvků." -#: ../src/defaults.c:1859 ../src/defaults.c:2030 +#: ../src/defaults.c:1808 ../src/defaults.c:1979 msgid "Wrong type for workspace background. Should be Texture." msgstr "Chybný typ pro pozadí pracovní plochy. Má být 'Texture'." -#: ../src/defaults.c:1909 ../src/defaults.c:2075 +#: ../src/defaults.c:1858 ../src/defaults.c:2025 msgid "Cannot get color entry for key \"WorkspaceBack\"." msgstr "Nelze získat barevnou položku pro klíč \"WorkspaceBack\"." -#: ../src/defaults.c:1921 ../src/defaults.c:2087 +#: ../src/defaults.c:1870 ../src/defaults.c:2037 #, c-format msgid "key \"WorkspaceBack\" has invalid color \"%s\"" msgstr "klíč \"WorkspaceBack\" má chybné jméno barvy \"%s\"" -#: ../src/defaults.c:1935 ../src/defaults.c:2101 +#: ../src/defaults.c:1884 ../src/defaults.c:2053 msgid "Cannot get file entry for key \"WorkspaceBack\"." msgstr "Pro klíč \"WorkspaceBack\" nelze získat položku souboru." -#: ../src/defaults.c:1948 ../src/defaults.c:2125 +#: ../src/defaults.c:1897 ../src/defaults.c:2078 #, c-format msgid "could not find background image \"%s\"" msgstr "nelze získat pozadí obrázku \"%s\"" -#: ../src/defaults.c:1965 ../src/defaults.c:2138 +#: ../src/defaults.c:1914 ../src/defaults.c:2092 msgid "Error in texture specification for key \"WorkspaceBack\"" msgstr "Chyba ve specifikaci textury pro klíč \"WorkspaceBack\"" -#: ../src/defaults.c:2119 +#: ../src/defaults.c:2073 #, c-format msgid "could not run \"%s\"" msgstr "nelze provést příkaz \"%s\"" -#: ../src/defaults.c:2175 -#, c-format -msgid "Invalid justification type \"%s\". Should be Left, Center or Right" -msgstr "Chybně určený typ zarovnání \"%s\". Mý být Left, Center nebo Rigth." - -#: ../src/defaults.c:2209 +#: ../src/defaults.c:2126 msgid "could not load any usable font" msgstr "nelze načíst žádný použitelný font" -#: ../src/defaults.c:2239 +#: ../src/defaults.c:2156 #, c-format msgid "could not get color for key \"%s\"" msgstr "nelze získat barvu pro klíč \"%s\"" -#: ../src/defaults.c:2298 ../src/rootmenu.c:433 +#: ../src/defaults.c:2215 ../src/rootmenu.c:440 #, c-format msgid "%s:invalid key modifier \"%s\"" msgstr "%s:chybný modifikátor klávesy \"%s\"" -#: ../src/defaults.c:2310 +#: ../src/defaults.c:2227 #, c-format msgid "%s:invalid kbd shortcut specification \"%s\"" msgstr "%s:chybná specifikace klávesové zkratky \"%s\"" -#: ../src/defaults.c:2317 +#: ../src/defaults.c:2234 #, c-format msgid "%s:invalid key in shortcut \"%s\"" msgstr "%s:chybná klávesa v klávesové zkratce \"%s\"" -#: ../src/defaults.c:2343 +#: ../src/defaults.c:2260 #, c-format msgid "%s: modifier key %s is not valid" msgstr "%s: klávesa modifikátoru %s není v pořádku" -#: ../src/defaults.c:2389 -#, c-format -msgid "" -"Invalid icon Position \"%s\". Should be one of blv, blh, brv, brh, tlv, tlh, " -"trv, trh" -msgstr "" -"Chybně zadaná pozice ikon \"%s\". Má být: blv, blh, brv, brh, tlv, tlh, trv " -"nebo trh" - -#: ../src/defaults.c:2471 +#: ../src/defaults.c:2336 msgid "could not render texture for icon background" msgstr "pro pozadí ikony nelze vykreslit texturu" -#: ../src/defaults.c:2830 +#: ../src/defaults.c:2692 msgid "background texture rendering was unsuccessfull" msgstr "vykreslení textury pozadí není v pořádku" -#: ../src/defaults.c:2857 +#: ../src/defaults.c:2719 #, c-format msgid "could not load image %s for option %s:%s\n" msgstr "pro volbu %2$s:%3$s nelze načíst obrázek loga %1$s\n" -#: ../src/defaults.c:2873 +#: ../src/defaults.c:2735 msgid "could not spawn texture rendering subprocess for option" msgstr "pro vykreslení textury nelze založit podproces pro volbu" -#: ../src/defaults.c:2922 ../src/defaults.c:3010 +#: ../src/defaults.c:2789 ../src/defaults.c:2877 msgid "could not render texture for workspace background" msgstr "pro pozadí pracovní plochy nelze vykreslit texturu" -#: ../src/dialog.c:69 ../src/dialog.c:81 ../src/dialog.c:166 -#: ../src/dialog.c:503 ../src/dockedapp.c:349 -msgid "OK" -msgstr "OK" - -#: ../src/dialog.c:69 ../src/dialog.c:74 ../src/dialog.c:166 -#: ../src/dialog.c:510 ../src/dockedapp.c:355 +#: ../src/dialog.c:114 ../src/dialog.c:458 ../src/dock.c:420 +#: ../src/dockedapp.c:356 ../src/rootmenu.c:207 ../src/rootmenu.c:236 msgid "Cancel" msgstr "Nic" -#: ../src/dialog.c:74 ../src/rootmenu.c:208 -msgid "Exit" -msgstr "Konec" - -#: ../src/dialog.c:86 -msgid "Yes" -msgstr "Ano" - -#: ../src/dialog.c:86 -msgid "No" -msgstr "Ne" - -#: ../src/dialog.c:262 +#: ../src/dialog.c:210 msgid "Could not open directory " msgstr "Nelze otevřít adresář" -#: ../src/dialog.c:318 +#: ../src/dialog.c:266 msgid "Could not load image file " msgstr "Nelze načíst obrázek" -#: ../src/dialog.c:447 +#: ../src/dialog.c:395 msgid "Directories" msgstr "Adresáře" -#: ../src/dialog.c:456 +#: ../src/dialog.c:404 msgid "Icons" msgstr "Ikony" -#: ../src/dialog.c:493 +#: ../src/dialog.c:441 msgid "File Name:" -msgstr "Jméno souboru:" +msgstr "Soubor:" -#: ../src/dialog.c:516 +#: ../src/dialog.c:464 msgid "Choose File" msgstr "Vyberte soubor" -#: ../src/dialog.c:526 +#: ../src/dialog.c:474 msgid "Icon Chooser" msgstr "Výběr ikony" -#: ../src/dock.c:225 +#: ../src/dock.c:209 #, c-format msgid "Type the name for workspace %i:" msgstr "Zadejte jméno pro plochu %i:" -#: ../src/dock.c:226 ../src/dock.c:1017 +#: ../src/dock.c:210 ../src/dock.c:1009 msgid "Rename Workspace" msgstr "Přejmenovat plochu" -#: ../src/dock.c:429 +#: ../src/dock.c:418 msgid "Workspace Clip" msgstr "Sponka" -#: ../src/dock.c:430 +#: ../src/dock.c:419 msgid "All selected icons will be removed!" msgstr "Všechny vybrané ikony budou odstraněny!" -#: ../src/dock.c:479 +#: ../src/dock.c:469 msgid "Keep Icon" msgstr "Držet ikonu" -#: ../src/dock.c:480 ../src/dock.c:1932 ../src/dock.c:2049 +#: ../src/dock.c:470 ../src/dock.c:1926 ../src/dock.c:2048 msgid "Type the command used to launch the application" msgstr "Zadejte příkaz, který spustí aplikaci" -#: ../src/dock.c:841 +#: ../src/dock.c:833 #, c-format msgid "could not launch application %s\n" msgstr "aplikaci %s nelze odstartovat\n" -#: ../src/dock.c:896 +#: ../src/dock.c:888 msgid "could not create workspace submenu for Clip menu" msgstr "nelze vytvořit submenu pracovní plochy pro menu Sponky" -#: ../src/dock.c:954 +#: ../src/dock.c:946 msgid "could not create options submenu for Clip menu" msgstr "nelze vytvořit submenu voleb pro menu Sponky" -#: ../src/dock.c:958 -msgid "Floating Clip" -msgstr "Plovoucí sponka" +#: ../src/dock.c:950 +msgid "Keep Clip On Top" +msgstr "Sponka vždy navrchu" -#: ../src/dock.c:964 +#: ../src/dock.c:956 msgid "Collapsed" msgstr "Svinuto" -#: ../src/dock.c:970 +#: ../src/dock.c:962 msgid "AutoCollapse" msgstr "Automaticky svinout" -#: ../src/dock.c:976 +#: ../src/dock.c:968 msgid "AutoAttract Icons" msgstr "Automaticky chytat iony" -#: ../src/dock.c:982 +#: ../src/dock.c:974 msgid "Keep Attracted Icons" msgstr "Drž chycené ikony" -#: ../src/dock.c:1006 -msgid "Floating Dock" -msgstr "Plovoucí Dok" +#: ../src/dock.c:998 +msgid "Keep Dock On Top" +msgstr "Dok vždy navrchu" -#: ../src/dock.c:1012 +#: ../src/dock.c:1004 msgid "Clip Options" msgstr "Volby Sponky" -#: ../src/dock.c:1019 +#: ../src/dock.c:1011 msgid "(Un)Select Icon" msgstr "(Od)Označ ikonu" -#: ../src/dock.c:1021 +#: ../src/dock.c:1013 msgid "(Un)Select All Icons" msgstr "(Od)Označ všechny ikony" -#: ../src/dock.c:1024 +#: ../src/dock.c:1016 msgid "Keep Icon(s)" msgstr "Drž ikonu/ikony" -#: ../src/dock.c:1026 +#: ../src/dock.c:1018 msgid "Move Icon(s) To" msgstr "Přesunou ikonu/ikony na" -#: ../src/dock.c:1031 +#: ../src/dock.c:1023 msgid "Remove Icon(s)" msgstr "Odstraň ikonu/ikony" -#: ../src/dock.c:1033 +#: ../src/dock.c:1025 msgid "Attract Icons" msgstr "Chytej ikony" -#: ../src/dock.c:1036 +#: ../src/dock.c:1028 msgid "Launch" msgstr "Odstartovat" -#: ../src/dock.c:1042 +#: ../src/dock.c:1034 msgid "Settings..." msgstr "Nastavení..." -#: ../src/dock.c:1426 ../src/dock.c:1440 ../src/dock.c:1454 ../src/dock.c:1464 +#: ../src/dock.c:1418 ../src/dock.c:1432 ../src/dock.c:1446 ../src/dock.c:1456 #, c-format msgid "bad value in docked icon state info %s" msgstr "chybná hodnota stavu ukotvené ikony %s" -#: ../src/dock.c:1472 +#: ../src/dock.c:1464 #, c-format msgid "bad value in docked icon position %i,%i" msgstr "chybná hodnota pozice ukotvené ikony %i,%i" -#: ../src/dock.c:1701 +#: ../src/dock.c:1693 msgid "there are too many icons stored in dock. Ignoring what doesn't fit" msgstr "v doku je příliš mnoho ikon. Co se nevejde, je zanedbáno" #. icon->forced_dock = 1; -#: ../src/dock.c:1931 ../src/dock.c:2048 +#: ../src/dock.c:1925 ../src/dock.c:2047 msgid "Dock Icon" msgstr "Ukotvit ikonu" -#: ../src/dock.c:2992 ../src/dock.c:2996 +#: ../src/dock.c:2948 ../src/dock.c:2952 #, c-format msgid "Could not execute command \"%s\"" msgstr "Nelze provést příkaz \"%s\"" @@ -474,40 +416,40 @@ msgstr "nelze naj msgid "Could not open specified icon file:%s" msgstr "Nelze otevřít specifikovaný soubor s ikonou(%s)" -#: ../src/dockedapp.c:290 +#: ../src/dockedapp.c:291 msgid "Start when WindowMaker is started" msgstr "Odstartovat při startu WindowMakeru" -#: ../src/dockedapp.c:297 +#: ../src/dockedapp.c:298 msgid "Application path and arguments" msgstr "Cesty a argumenty pro aplikaci" -#: ../src/dockedapp.c:308 +#: ../src/dockedapp.c:309 msgid "Command for files dropped with DND" msgstr "Příkaz pro položený soubor (DND)" -#: ../src/dockedapp.c:320 +#: ../src/dockedapp.c:321 #, c-format msgid "%d will be replaced with the file name" msgstr "%d bude nahrazeno jménem souboru" -#: ../src/dockedapp.c:324 +#: ../src/dockedapp.c:325 msgid "DND support was not compiled in" msgstr "DNS podpora nebylo zakompilována" -#: ../src/dockedapp.c:330 +#: ../src/dockedapp.c:331 msgid "Icon Image" msgstr "Ikona" -#: ../src/dockedapp.c:342 ../src/winspector.c:1175 +#: ../src/dockedapp.c:343 ../src/winspector.c:1191 msgid "Browse..." msgstr "Hledat..." -#: ../src/dockedapp.c:387 +#: ../src/dockedapp.c:388 msgid "Docked Application Settings" msgstr "Nastavení pro aplikaci v doku" -#: ../src/event.c:467 +#: ../src/event.c:385 msgid "stack overflow: too many dead processes" msgstr "přetečení zásobníku: příliš mnoho procesů ve stavu dead" @@ -517,106 +459,120 @@ msgid "could not render gradient: %s" msgstr "nelze vykreslit gradient: %s" #: ../src/framewin.c:542 ../src/framewin.c:557 ../src/framewin.c:568 -#: ../src/framewin.c:575 ../src/framewin.c:582 ../src/icon.c:294 -#: ../src/texture.c:528 +#: ../src/framewin.c:575 ../src/framewin.c:582 ../src/icon.c:296 +#: ../src/texture.c:492 #, c-format msgid "error rendering image:%s" msgstr "nelze vykreslit obrázek:%s" -#: ../src/icon.c:180 ../src/wdefaults.c:399 +#: ../src/icon.c:182 ../src/wdefaults.c:402 #, c-format msgid "error loading image file \"%s\"" msgstr "ze souboru \"%s\" nelze načíst obrázek" -#: ../src/icon.c:611 +#: ../src/icon.c:428 ../src/icon.c:437 +#, c-format +msgid "could not create directory %s" +msgstr "Nelze vytvořit adresář %s" + +#: ../src/icon.c:702 #, c-format msgid "could not find default icon \"%s\"" msgstr "nelze najít stadardní ikonu \"%s\"" -#: ../src/icon.c:617 +#: ../src/icon.c:708 #, c-format msgid "could not load default icon \"%s\":%s" msgstr "nelze načíst standardní ikonu \"%s\":%s" -#: ../src/main.c:171 +#: ../src/main.c:189 +msgid "could not exec window manager" +msgstr "nelze spustit správce oken" + +#: ../src/main.c:190 msgid "Restart failed!!!" msgstr "Operace \"RESTART\" selhala!!!" -#: ../src/main.c:187 +#: ../src/main.c:237 #, c-format msgid "%s aborted.\n" msgstr "%s přerušen.\n" -#: ../src/main.c:198 +#: ../src/main.c:248 #, c-format msgid "usage: %s [-options]\n" msgstr "použití: %s [-volby]\n" -#: ../src/main.c:199 +#: ../src/main.c:249 msgid "options:" msgstr "volby:" -#: ../src/main.c:201 +#: ../src/main.c:251 msgid " -nocpp \t\tdisable preprocessing of configuration files" msgstr " -nocpp \t\tneprováděj předzpracování konfiguračních souborů" -#: ../src/main.c:203 +#: ../src/main.c:253 msgid " -nodock\t\tdo not open the application Dock" msgstr " -nodock\t\tnezobrazuj \"hnízdo\" pro ikony" -#: ../src/main.c:204 +#: ../src/main.c:254 msgid " -noclip\t\tdo not open the workspace Clip" msgstr " -noclip\t\tneotvírat aplikaci Sponku" #. #. puts(_(" -locale locale locale to use")); #. -#: ../src/main.c:208 +#: ../src/main.c:258 msgid " -visualid visualid\tvisual id of visual to use" msgstr "" " -visualid visualid\\tčíslo obrazového módu(visual id), který bude použit" -#: ../src/main.c:209 +#: ../src/main.c:259 msgid " -display host:dpy\tdisplay to use" msgstr " -display host:dpy\tkterý display použít" -#: ../src/main.c:210 +#: ../src/main.c:260 msgid " -version\t\tprint version and exit" msgstr " -version\t\tzobraz verzi a konec" -#: ../src/main.c:222 +#: ../src/main.c:272 +#, c-format msgid "" -"could not find user GNUstep directory.\n" -"Make sure you have installed WindowMaker correctly and run wmaker.inst" +"could not find user GNUstep directory (%s).\n" +"Make sure you have installed Window Maker correctly and run wmaker.inst" msgstr "" -"nelze najít uživatelův adresář GNUstep.\n" -"Ujistěte se, že máte WindowMaker správně nainstalován, případně proveďte " -"wmaker.inst" +"nelze najít uživatelův adresář GNUstep (%s).\n" +"Ujistěte se, že máte Window Maker správně nainstalován, případně proveďte wmaker.inst" -#: ../src/main.c:243 +#: ../src/main.c:294 #, c-format msgid "%s:could not execute initialization script" msgstr "%s:nelze provést inicializační skript" -#: ../src/main.c:300 ../src/main.c:307 ../src/main.c:314 +#: ../src/main.c:313 +#, c-format +msgid "%s:could not execute exit script" +msgstr "%s:nelze provést ukončovací skript" + +#: ../src/main.c:370 ../src/main.c:377 ../src/main.c:384 #, c-format msgid "too few arguments for %s" msgstr "nedostatek argumetů pro %s" -#: ../src/main.c:318 +#: ../src/main.c:388 #, c-format msgid "bad value for visualid: \"%s\"" msgstr "chybná hodnota pro typ visual: \"%s\"" -#: ../src/main.c:361 +#: ../src/main.c:429 msgid "X server does not support locale" msgstr "X server nepodporuje nastavení místních zvyklostí" -#: ../src/main.c:364 +#: ../src/main.c:432 msgid "cannot set locale modifiers" msgstr "nelze nastavit modifikátory místních zvyklostí" -#: ../src/main.c:378 +#: ../src/main.c:449 #, c-format msgid "could not open display \"%s\"" msgstr "nelze otevřít displej \"%s\"" @@ -625,75 +581,75 @@ msgstr "nelze otev msgid "wrealloc() failed while trying to add menu item" msgstr "funkce wrealloc() selhala při přidání položky do menu" -#: ../src/misc.c:70 +#: ../src/misc.c:73 #, c-format msgid "could not define value for %s for cpp" msgstr "pro %s pro cpp nelze určit hodnotu" -#: ../src/misc.c:100 +#: ../src/misc.c:103 #, c-format msgid "could not get password entry for UID %i" msgstr "" "pro uživatele s UID %i nelze získat položku ze systémové tabulky passwd" -#: ../src/misc.c:124 +#: ../src/misc.c:127 #, c-format msgid "your machine is misconfigured. HOSTNAME is set to %s" msgstr "" "váš počítač není správně konfigurován. Proměnná HOSTNAME je nastavena na %s" -#: ../src/misc.c:130 +#: ../src/misc.c:133 #, c-format msgid "your machine is misconfigured. HOST is set to %s" msgstr "váš počítač není správně nakonfigurován. Proměnná HOST nastavena na %s" -#: ../src/misc.c:758 +#: ../src/misc.c:810 msgid "selection timed-out" msgstr "time out při výběru" -#: ../src/misc.c:772 +#: ../src/misc.c:825 msgid "Program Arguments" msgstr "Argumenty Programu" -#: ../src/misc.c:791 +#: ../src/misc.c:844 msgid "Enter command arguments:" msgstr "Zadejte argumenty pro příkaz:" -#: ../src/misc.c:812 +#: ../src/misc.c:870 msgid "unable to get dropped data from DND drop" msgstr "nelze získat data z DND operace drop" -#: ../src/misc.c:820 +#: ../src/misc.c:878 msgid "error getting dropped data from DND drop" msgstr "chyba při získávání dat z operace DND drop" -#: ../src/misc.c:826 +#: ../src/misc.c:884 msgid "out of memory while getting data from DND drop" msgstr "nedostatek paměti při čtení dat z DND operace drop" -#: ../src/misc.c:870 ../src/misc.c:989 +#: ../src/misc.c:928 ../src/misc.c:1048 #, c-format msgid "out of memory during expansion of \"%s\"" msgstr "nedostatek paměti při expanzi \"%s\"" -#: ../src/misc.c:924 +#: ../src/misc.c:982 msgid "out of memory during expansion of \"%w\"" msgstr "nedostatek paměti při expanzi \"%w\"" -#: ../src/misc.c:943 +#: ../src/misc.c:1001 msgid "out of memory during expansion of \"%a\"" msgstr "nedostatek paměti při expanzi \"%a\"" -#: ../src/misc.c:965 +#: ../src/misc.c:1027 #, c-format msgid "out of memory during expansion of \"%d\"" msgstr "nedostatek paměti při expanzi \"%d\"" -#: ../src/misc.c:977 +#: ../src/misc.c:1041 msgid "selection not available" msgstr "výběr není dostupný" -#: ../src/misc.c:1055 ../src/misc.c:1061 +#: ../src/misc.c:1114 ../src/misc.c:1120 #, c-format msgid "bad window name value in %s state info" msgstr "chybné jméno okna ve stavové informaci %s" @@ -795,20 +751,19 @@ msgstr "nelze zpracovat barvu \"%s\"" msgid "could not allocate color \"%s\"" msgstr "nelze alokovat položku pro barvu \"%s\"" -#: ../src/rootmenu.c:164 -#, c-format -msgid "Program \"%s\" not found or cannot be executed." -msgstr "Program \"%s\" nebyl nalezen nebo nemůže být proveden." +#: ../src/rootmenu.c:205 ../src/rootmenu.c:207 ../src/rootmenu.c:236 +msgid "Exit" +msgstr "Konec" -#: ../src/rootmenu.c:209 +#: ../src/rootmenu.c:206 msgid "Exit window manager?" msgstr "Ukončit manažera oken?" -#: ../src/rootmenu.c:229 +#: ../src/rootmenu.c:234 msgid "Close X session" msgstr "Ukončit sezení X" -#: ../src/rootmenu.c:230 +#: ../src/rootmenu.c:235 msgid "" "Close Window System session?\n" "(all applications will be closed)" @@ -816,51 +771,47 @@ msgstr "" "Ukončit sezení?\n" "(všechny aplikace budou uzavřeny)" -#: ../src/rootmenu.c:232 -msgid "Exiting...\n" -msgstr "Končím...\n" - -#: ../src/rootmenu.c:447 +#: ../src/rootmenu.c:454 #, c-format msgid "%s:invalid kbd shortcut specification \"%s\" for entry %s" msgstr "%s:chybná specifikace klávesové zkratky \"%s\" pro položku %s" -#: ../src/rootmenu.c:455 +#: ../src/rootmenu.c:462 #, c-format msgid "%s:invalid key in shortcut \"%s\" for entry %s" msgstr "%s:chybná klávesa v klávesové zkratce \"%s\" pro položku %s" -#: ../src/rootmenu.c:508 +#: ../src/rootmenu.c:515 #, c-format msgid "%s: unmatched '\"' in menu file" msgstr "%s: neodpovídající '\"' v souboru s menu" -#: ../src/rootmenu.c:558 +#: ../src/rootmenu.c:565 #, c-format msgid "%s: missing command" msgstr "%s: očekávám příkaz" -#: ../src/rootmenu.c:591 +#: ../src/rootmenu.c:598 #, c-format msgid "invalid OPEN_MENU specification: %s" msgstr "chybná specifikace OPEN_MENU: %s" -#: ../src/rootmenu.c:656 +#: ../src/rootmenu.c:663 #, c-format msgid "%s:could not stat menu" msgstr "%s:nelze provést operaci 'stat' na menu" -#: ../src/rootmenu.c:664 +#: ../src/rootmenu.c:671 #, c-format msgid "%s:could not stat menu :%s" msgstr "%s:nelze provést operaci 'stat' na menu: %s" -#: ../src/rootmenu.c:682 +#: ../src/rootmenu.c:689 #, c-format msgid "too many parameters in OPEN_MENU: %s" msgstr "příliš mnoho parametrů pro příkaz OPEN_MENU: %s" -#: ../src/rootmenu.c:718 +#: ../src/rootmenu.c:725 msgid "" "There are more than one WORKSPACE_MENU commands in the applications menu. " "Only one is allowed." @@ -868,121 +819,112 @@ msgstr "" "V aplikačním menu je více než jeden příkaz WORKSPACE_MENU. Je povolen jen " "jeden." -#: ../src/rootmenu.c:747 ../src/rootmenu.c:765 +#: ../src/rootmenu.c:754 ../src/rootmenu.c:772 #, c-format msgid "%s:missing parameter for menu command \"%s\"" msgstr "%s:pro příkaz menu \"%s\" očekávám parametr" -#: ../src/rootmenu.c:828 +#: ../src/rootmenu.c:835 #, c-format msgid "%s:unknown command \"%s\" in menu config." msgstr "%s:neznámý příkaz \"%s\" v konfiguraci menu." -#: ../src/rootmenu.c:836 +#: ../src/rootmenu.c:843 #, c-format msgid "%s:can't add shortcut for entry \"%s\"" msgstr "%s: pro položku \"%s\" nelze přidat klávesou zkratku" -#: ../src/rootmenu.c:973 +#: ../src/rootmenu.c:980 #, c-format msgid "%s:maximal line size exceeded in menu config: %s" msgstr "%s:v konfiguraci menu %s byla překročena maximální délka řádky" -#: ../src/rootmenu.c:995 ../src/rootmenu.c:1087 ../src/rootmenu.c:1188 +#: ../src/rootmenu.c:1002 ../src/rootmenu.c:1094 ../src/rootmenu.c:1195 #, c-format msgid "%s:missing command in menu config: %s" msgstr "%s:v konfiguraci menu %s očekávám příkaz" -#: ../src/rootmenu.c:1025 +#: ../src/rootmenu.c:1032 #, c-format msgid "%s:syntax error in menu file:END declaration missing" msgstr "%s:syntaktická chyba v souboru s menu: očekávána deklarace END" -#: ../src/rootmenu.c:1054 ../src/rootmenu.c:1153 +#: ../src/rootmenu.c:1061 ../src/rootmenu.c:1160 msgid "could not make arguments for menu file preprocessor" msgstr "nelze vytvořit argumety pro preprocesor souboru s menu" -#: ../src/rootmenu.c:1060 ../src/rootmenu.c:1160 +#: ../src/rootmenu.c:1067 ../src/rootmenu.c:1167 #, c-format msgid "%s:could not open/preprocess menu file" msgstr "%s: nelze otevřít nebo předzpracovat soubor s menu" -#: ../src/rootmenu.c:1072 ../src/rootmenu.c:1173 +#: ../src/rootmenu.c:1079 ../src/rootmenu.c:1180 #, c-format msgid "%s:could not open menu file" msgstr "%s:nelze otevřít soubor s menu" -#: ../src/rootmenu.c:1099 +#: ../src/rootmenu.c:1106 #, c-format msgid "%s:invalid menu file. MENU command is missing" msgstr "%s:syntaktická chyba v souboru s menu: očekáván příkaz MENU" -#: ../src/rootmenu.c:1108 +#: ../src/rootmenu.c:1115 msgid "error reading preprocessed menu data" msgstr "chyba při čtení předzpracovaného souboru s menu" -#: ../src/rootmenu.c:1200 +#: ../src/rootmenu.c:1207 #, c-format msgid "%s:no title given for the root menu" msgstr "%s: pro hlavní menu nebyl určen titulek" -#: ../src/rootmenu.c:1254 ../src/rootmenu.c:1317 ../src/rootmenu.c:1361 +#: ../src/rootmenu.c:1261 ../src/rootmenu.c:1324 ../src/rootmenu.c:1368 #, c-format msgid "out of memory while constructing directory menu %s" msgstr "nedostatek paměti při konstrukci menu z obsahu adresáře %s" -#: ../src/rootmenu.c:1264 +#: ../src/rootmenu.c:1271 #, c-format msgid "%s:could not stat file \"%s\" in menu directory" msgstr "%s:nelze provést 'stat' na soubory \"%s\" v adresáři s menu" -#: ../src/rootmenu.c:1410 +#: ../src/rootmenu.c:1417 msgid "Commands" msgstr "Příkazy" -#: ../src/rootmenu.c:1412 +#: ../src/rootmenu.c:1419 msgid "Exit..." msgstr "Konec..." -#: ../src/rootmenu.c:1479 +#: ../src/rootmenu.c:1486 #, c-format msgid "could not find menu file \"%s\" referenced in WMRootMenu" msgstr "nelze najít soubor s menu \"%s\", odkazovaný z WMRootMenu" -#: ../src/rootmenu.c:1486 +#: ../src/rootmenu.c:1493 #, c-format msgid "could not access menu \"%s\" referenced in WMRootMenu" msgstr "není přístup k souboru s menu \"%s\", odkazovaném z WMRootMenu" -#: ../src/rootmenu.c:1514 ../src/rootmenu.c:1569 +#: ../src/rootmenu.c:1521 ../src/rootmenu.c:1576 #, c-format msgid "%s:format error in root menu configuration \"%s\"" msgstr "%s:chybný formát v konfiguraci hlavního menu \"%s\"" -#: ../src/screen.c:111 -msgid "it seems that there already is a window manager running" -msgstr "mám ten pocit, že zde již jeden manažer oken běží" - -#: ../src/screen.c:394 +#: ../src/screen.c:402 msgid "could not load logo image for panels" msgstr "pro panely nelze načíst logo" -#: ../src/screen.c:397 +#: ../src/screen.c:405 #, c-format msgid "error making logo image for panel:%s" msgstr "chyba při vytváření obrázku s logem pro panel:%s" -#: ../src/screen.c:544 -#, c-format -msgid "icon size is configured to %i, but it's too small. Using 16, instead\n" -msgstr "je nakonfigurována velikost ikony %i, to je ovšem málo. Použiji 16\n" - -#: ../src/screen.c:587 +#: ../src/screen.c:584 #, c-format msgid "could not initialize graphics library context: %s" msgstr "nelze inicializovat kontext grafické knihovny: %s" -#: ../src/session.c:113 ../src/wdefaults.c:559 ../src/winspector.c:337 +#: ../src/session.c:113 ../src/wdefaults.c:562 ../src/winspector.c:343 #, c-format msgid "can't convert \"%s\" to boolean" msgstr "\"%s\" nelze zkonvertovat na boolean" @@ -991,37 +933,37 @@ msgstr "\"%s\" nelze zkonvertovat na boolean" msgid "could not get window list!!" msgstr "nelze získat seznam oken!!!" -#: ../src/startup.c:163 +#: ../src/startup.c:187 #, c-format msgid "internal X error: %s\n" msgstr "interní chyba systému X: %s\n" -#: ../src/startup.c:225 +#: ../src/startup.c:250 #, c-format msgid "got signal %i (%s) - restarting\n" msgstr "přijat signál %i (%s) - restartuji\n" -#: ../src/startup.c:227 +#: ../src/startup.c:252 #, c-format msgid "got signal %i - restarting\n" msgstr "přijat signál %i - restartuji\n" -#: ../src/startup.c:240 +#: ../src/startup.c:266 #, c-format msgid "%s: Received signal SIGTERM. Exiting..." msgstr "%s: Přijat signál SIGTERM. Končím..." -#: ../src/startup.c:251 +#: ../src/startup.c:278 #, c-format msgid "got signal %i (%s)\n" msgstr "přijat signál %i (%s)\n" -#: ../src/startup.c:253 +#: ../src/startup.c:280 #, c-format msgid "got signal %i\n" msgstr "získán signál %i\n" -#: ../src/startup.c:258 +#: ../src/startup.c:285 msgid "" "crashed while trying to do some post-crash cleanup. Aborting immediatelly." msgstr "" @@ -1029,10 +971,28 @@ msgstr "" #. restart another window manager so that the X session doesn't #. * go to space -#: ../src/startup.c:267 +#: ../src/startup.c:296 msgid "trying to start alternative window manager..." msgstr "zkouším odstartovat jiný okenní manažer" +#: ../src/startup.c:691 +#, c-format +msgid "icon size is configured to %i, but it's too small. Using 16, instead\n" +msgstr "je nakonfigurována velikost ikony %i, to je ovšem málo. Použiji 16\n" + +#: ../src/startup.c:735 +msgid "it seems that there already is a window manager running" +msgstr "mám ten pocit, že zde již jeden manažer oken běží" + +#: ../src/startup.c:741 +#, c-format +msgid "could not manage screen %i" +msgstr "nelze připojit obrazovku %i" + +#: ../src/startup.c:797 +msgid "could not manage any screen" +msgstr "nelze připojit žádnou obrazovku" + #: ../src/switchmenu.c:124 msgid "Windows" msgstr "Okna" @@ -1047,17 +1007,17 @@ msgstr "soubor s obr msgid "could not load texture pixmap \"%s\":%s" msgstr "nelze načíst obrázek s texturou: \"%s\":%s" -#: ../src/texture.c:413 ../src/texture.c:524 +#: ../src/texture.c:377 ../src/texture.c:488 #, c-format msgid "could not render texture: %s" msgstr "nelze vykreslit texturu: %s" -#: ../src/wdefaults.c:393 +#: ../src/wdefaults.c:396 #, c-format msgid "could not find icon file \"%s\"" msgstr "nelze získat soubor s ikonou \"%s\"" -#: ../src/window.c:1948 ../src/window.c:2087 +#: ../src/window.c:2213 ../src/window.c:2356 msgid "" "the NumLock, ScrollLock or similar key seems to be turned on.\n" "Turn it off or some mouse actions and keyboard shortcuts will not work." @@ -1110,53 +1070,53 @@ msgstr "Atributy..." msgid "Close" msgstr "Uzavři" -#: ../src/winspector.c:276 +#: ../src/winspector.c:277 #, c-format msgid "Could not find icon \"%s\" specified for this window" msgstr "Pro toto okno nelze najít specifikovanou ikonu (%s)" -#: ../src/winspector.c:289 +#: ../src/winspector.c:293 #, c-format msgid "Could not open specified icon \"%s\":%s" msgstr "Nelze otevřít pecifikovanou ikonu \"%s\":%s" -#: ../src/winspector.c:973 +#: ../src/winspector.c:989 msgid "Save" msgstr "Ulož" -#: ../src/winspector.c:979 +#: ../src/winspector.c:995 msgid "Apply" msgstr "Nastav" -#: ../src/winspector.c:985 +#: ../src/winspector.c:1001 msgid "Revert" msgstr "Zpět" -#: ../src/winspector.c:994 ../src/winspector.c:1004 +#: ../src/winspector.c:1010 ../src/winspector.c:1020 msgid "Window Specification" msgstr "Specifikace okna" -#: ../src/winspector.c:995 +#: ../src/winspector.c:1011 msgid "Window Attributes" msgstr "Atributy okna" -#: ../src/winspector.c:996 +#: ../src/winspector.c:1012 msgid "Advanced Options" msgstr "Další volby" -#: ../src/winspector.c:997 +#: ../src/winspector.c:1013 msgid "Icon and Initial Workspace" msgstr "Ikona a počáteční plocha" -#: ../src/winspector.c:998 +#: ../src/winspector.c:1014 msgid "Application Specific" msgstr "Atributy aplikace" -#: ../src/winspector.c:1012 +#: ../src/winspector.c:1028 msgid "Defaults for all windows" msgstr "Standard pro všechna okna" -#: ../src/winspector.c:1048 +#: ../src/winspector.c:1064 msgid "" "The configuration will apply to all\n" "windows that have their WM_CLASS property set to the above selected\n" @@ -1166,154 +1126,139 @@ msgstr "" "kteří mají nastavenu vlastnost WM_CLASS na vybranou výše\n" "(při uložení této konfigurace)" -#: ../src/winspector.c:1055 +#: ../src/winspector.c:1071 msgid "Attributes" msgstr "Atributy" -#: ../src/winspector.c:1065 +#: ../src/winspector.c:1081 msgid "Disable titlebar" msgstr "Zakaž titulek" -#: ../src/winspector.c:1069 +#: ../src/winspector.c:1085 msgid "Disable resizebar" msgstr "Nelze zvětšit" -#: ../src/winspector.c:1073 +#: ../src/winspector.c:1089 msgid "Disable close button" msgstr "Zakaž prvek pro uzavření" -#: ../src/winspector.c:1077 +#: ../src/winspector.c:1093 msgid "Disable miniaturize button" msgstr "Zakaž minimalizaci" -#: ../src/winspector.c:1081 +#: ../src/winspector.c:1097 msgid "Keep on top" msgstr "Vždy navrchu" -#: ../src/winspector.c:1085 +#: ../src/winspector.c:1101 msgid "Omnipresent" msgstr "Všechny plochy" -#: ../src/winspector.c:1089 +#: ../src/winspector.c:1105 msgid "Start Miniaturized" msgstr "Odstartovat jako ikonu" -#: ../src/winspector.c:1093 +#: ../src/winspector.c:1109 msgid "Skip window list" msgstr "Vynechat ze seznamu oken" -#: ../src/winspector.c:1107 +#: ../src/winspector.c:1123 msgid "Advanced" msgstr "Další volby" -#: ../src/winspector.c:1117 +#: ../src/winspector.c:1133 msgid "Ignore HideOthers" msgstr "Ignoruj \"Skryj Ostatní\"" -#: ../src/winspector.c:1121 +#: ../src/winspector.c:1137 msgid "Don't bind keyboard shortcuts" msgstr "Klávesnice jen pro aplikaci" -#: ../src/winspector.c:1125 +#: ../src/winspector.c:1141 msgid "Don't bind mouse clicks" msgstr "Myš jen pro aplikaci" -#: ../src/winspector.c:1129 +#: ../src/winspector.c:1145 msgid "Keep inside screen" msgstr "Vždy na obrazovce" -#: ../src/winspector.c:1133 +#: ../src/winspector.c:1149 msgid "Don't let it take focus" msgstr "Nepovol zaměření" -#: ../src/winspector.c:1137 +#: ../src/winspector.c:1153 msgid "Don't Save Session" msgstr "Neukládat stav sezení" -#: ../src/winspector.c:1141 +#: ../src/winspector.c:1157 msgid "Emulate Application Icon" msgstr "Emulovat aplikační ikonu" -#: ../src/winspector.c:1156 +#: ../src/winspector.c:1172 msgid "" "Enable the \"Don't bind...\" options to allow the application to receive all " "mouse or keyboard events." msgstr "" -"Povolte volbu \"Všechny...\", aby aplikace mohla získat veškeré události od " +"Povolte volby \"...jen pro aplikaci\", aby aplikace mohla získat všechny události od " "klávesnice a myši." -#: ../src/winspector.c:1163 +#: ../src/winspector.c:1179 msgid "Miniwindow Image" msgstr "Ikona" -#: ../src/winspector.c:1181 +#: ../src/winspector.c:1198 msgid "Update" msgstr "Zapiš" -#: ../src/winspector.c:1193 +#: ../src/winspector.c:1213 msgid "Icon file name:" msgstr "Soubor ikony:" -#: ../src/winspector.c:1206 +#: ../src/winspector.c:1225 msgid "Ignore client supplied icon" msgstr "Ignoruj klientovy ikony" -#: ../src/winspector.c:1213 +#: ../src/winspector.c:1232 msgid "Initial Workspace" msgstr "Počáteční plocha" -#: ../src/winspector.c:1218 +#: ../src/winspector.c:1237 msgid "Nowhere in particular" msgstr "Nikde neurčeno" -#: ../src/winspector.c:1249 +#: ../src/winspector.c:1271 msgid "Application Wide" msgstr "Atributy aplikace" -#: ../src/winspector.c:1259 +#: ../src/winspector.c:1281 msgid "Start Hidden" msgstr "Startuj skrytě" -#: ../src/winspector.c:1263 +#: ../src/winspector.c:1285 msgid "No application icon" msgstr "Bez aplikační ikony" -#: ../src/workspace.c:89 ../src/workspace.c:90 ../src/workspace.c:419 +#: ../src/workspace.c:89 ../src/workspace.c:90 ../src/workspace.c:423 #, c-format msgid "Workspace %i" msgstr "Plocha %i" -#: ../src/workspace.c:467 +#: ../src/workspace.c:471 msgid "Workspaces" msgstr "Pracovní plochy" -#: ../src/workspace.c:469 +#: ../src/workspace.c:473 msgid "could not create Workspace menu" msgstr "nelze vytvořit menu pracovních ploch" -#: ../src/workspace.c:476 +#: ../src/workspace.c:480 msgid "New" msgstr "Nová" -#: ../src/workspace.c:477 +#: ../src/workspace.c:481 msgid "Destroy Last" msgstr "Zruš poslední" -#: ../src/xutil.c:226 +#: ../src/xutil.c:228 msgid "invalid data in selection" msgstr "ve výběru jsou nepřípustná data" - -#~ msgid "invalid key modifier \"%s\"" -#~ msgstr "chybný modifikátor klíče \"%s\"" - -#~ msgid "invalid kbd shortcut specification \"%s\"" -#~ msgstr "chybná specifikace klávesové zkratky \"%s\"" - -#~ msgid "invalid key in shortcut \"%s\"" -#~ msgstr "chybná klávesa v klávesové zkratce \"%s\"" - -#~ msgid "could not load clip tile image" -#~ msgstr "nelze načíst obrázek pro Sponku" - -#~ msgid "not enough memory to open window inspector panel" -#~ msgstr "nedostatek paměti na otevření inspektora oken" diff --git a/po/fr.po b/po/fr.po index bb3e79ca..c23cb405 100644 --- a/po/fr.po +++ b/po/fr.po @@ -675,7 +675,7 @@ msgid "" "Close Window System session?\n" "(all applications will be closed)" msgstr "" -"Fermer la session X-Window" +"Fermer la session X-Window\n" "(toutes les applications seront fermées)" #: ../src/rootmenu.c:230 diff --git a/po/hr.po b/po/hr.po index ea327cc1..324740d2 100644 --- a/po/hr.po +++ b/po/hr.po @@ -7,19 +7,23 @@ msgstr "" "Xgettext-Options: --default-domain=WindowMaker --add-comments --keyword=_\n" "Files: ../src/appicon.c ../src/defaults.c ../src/dialog.c ../src/dock.c ../src/event.c ../src/framewin.c ../src/icon.c ../src/main.c ../src/menu.c ../src/misc.c ../src/pixmap.c ../src/resources.c ../src/rootmenu.c ../src/screen.c ../src/session.c ../src/stacking.c ../src/startup.c ../src/switchmenu.c ../src/texture.c ../src/wdefaults.c ../src/winmenu.c ../src/winspector.c ../src/workspace.c ../src/xutil.c\n" -#: ../src/appicon.c:500 ../src/dialog.c:264 ../src/dialog.c:320 ../src/dock.c:2982 ../src/dockedapp.c:206 ../src/rootmenu.c:166 ../src/winspector.c:276 ../src/winspector.c:289 +#: ../src/appicon.c:509 ../src/dialog.c:215 ../src/dialog.c:271 ../src/dock.c:2953 ../src/dockedapp.c:206 ../src/winspector.c:279 ../src/winspector.c:295 msgid "Error" msgstr "Greška" -#: ../src/appicon.c:501 +#: ../src/appicon.c:510 msgid "Could not open specified icon file" msgstr "Ne mogu ovoriti navedenu ikonu" -#: ../src/appicon.c:522 ../src/dock.c:265 ../src/winmenu.c:85 +#: ../src/appicon.c:511 ../src/dialog.c:114 ../src/dialog.c:215 ../src/dialog.c:271 ../src/dialog.c:451 ../src/dock.c:420 ../src/dock.c:2954 ../src/dockedapp.c:206 ../src/dockedapp.c:350 ../src/winspector.c:280 ../src/winspector.c:296 +msgid "OK" +msgstr "U redu" + +#: ../src/appicon.c:532 ../src/dock.c:268 ../src/winmenu.c:85 msgid "Kill Application" msgstr "Ubij Aplikaciju" -#: ../src/appicon.c:523 ../src/dock.c:266 ../src/winmenu.c:86 +#: ../src/appicon.c:533 ../src/dock.c:269 ../src/winmenu.c:86 msgid "" "This will kill the application.\n" "Any unsaved changes will be lost.\n" @@ -29,226 +33,203 @@ msgstr "" "Promjene koje nisu snimljene bit će izgubljene.\n" "Molim potvrdite." -#: ../src/appicon.c:538 ../src/dock.c:1022 -msgid "Unhide Here" -msgstr "Pokaži ovdje" - -#: ../src/appicon.c:539 ../src/dock.c:1024 -msgid "(Un)Hide" -msgstr "Otkrij/Sakrij" - -#: ../src/appicon.c:540 -msgid "Set Icon..." -msgstr "Postavi ikonu..." - -#: ../src/appicon.c:541 ../src/dock.c:1028 ../src/winmenu.c:260 -msgid "Kill" -msgstr "Ubij" - -#: ../src/defaults.c:580 ../src/screen.c:535 ../src/screen.c:643 ../src/screen.c:649 -msgid "could not read domain \"%s\" from defaults database" -msgstr "ne mogu pročitati domenu \"%s\" iz baze postavki" - -#: ../src/defaults.c:626 ../src/defaults.c:748 ../src/defaults.c:783 ../src/defaults.c:809 -msgid "Domain %s (%s) of defaults database is corrupted!" -msgstr "Domena %s (%s) baze postavki je nečitljiva" - -#: ../src/defaults.c:631 ../src/defaults.c:765 ../src/defaults.c:792 ../src/defaults.c:818 -msgid "could not load domain %s from user defaults database" -msgstr "ne mogu pročitati domenu %s iz korisnikove baze postavki" - -#: ../src/defaults.c:642 ../src/defaults.c:733 -msgid "Domain %s (%s) of global defaults database is corrupted!" -msgstr "Domena %s (%s) globalne baze postavki je nečitljiva" - -#: ../src/defaults.c:659 ../src/defaults.c:738 -msgid "could not load domain %s from global defaults database" -msgstr "ne mogu učitati domenu %s iz globalne baze postavki" - -#: ../src/defaults.c:1106 -msgid "can't convert \"%s\" to boolean for key \"%s\"" -msgstr "ne mogu konvertirati \"%s\" u logički izraz za \"%s\"" - -#: ../src/defaults.c:1111 ../src/defaults.c:1145 ../src/defaults.c:1177 ../src/defaults.c:1190 ../src/defaults.c:1205 ../src/defaults.c:1220 ../src/defaults.c:1291 ../src/defaults.c:1303 ../src/defaults.c:1362 ../src/defaults.c:1406 ../src/defaults.c:1448 ../src/defaults.c:1494 ../src/defaults.c:1540 ../src/defaults.c:1763 ../src/defaults.c:1777 ../src/defaults.c:1810 ../src/defaults.c:1822 ../src/defaults.c:1834 ../src/defaults.c:1858 ../src/defaults.c:1876 ../src/defaults.c:1889 ../src/defaults.c:1902 ../src/defaults.c:1939 ../src/defaults.c:1977 ../src/defaults.c:2041 ../src/defaults.c:2192 -msgid "using default \"%s\" instead" -msgstr "umjesto toga koristim default \"%s\"" - -#: ../src/defaults.c:1142 -msgid "can't convert \"%s\" to integer for key \"%s\"" -msgstr "ne mogu konvertirati \"%s\" u integer za \"%s\"" - -#: ../src/defaults.c:1172 ../src/defaults.c:1286 ../src/defaults.c:1758 ../src/defaults.c:1805 ../src/wdefaults.c:541 ../src/wdefaults.c:577 -msgid "Wrong option format for key \"%s\". Should be %s." -msgstr "Krivi format opcije za \"%s\". Trebao bi biti %s" - -#: ../src/defaults.c:1185 -msgid "Incorrect number of elements in array for key \"%s\"." -msgstr "Krivi broj elemenata u nizu za \"%s\"" - -#: ../src/defaults.c:1200 -msgid "Wrong value for key \"%s\". Should be Coordinate." -msgstr "Kriva vrijednost za \"%s\". Trebale bi biti koordinate." - -#: ../src/defaults.c:1215 -msgid "can't convert array to integers for \"%s\"." -msgstr "ne mogu konvertirati niz u integere za \"%s\"." - -#: ../src/defaults.c:1354 -msgid "Invalid focus mode \"%s\". Should be Manual, Auto or Sloppy." -msgstr "Pogrešni fokus mod \"%s\". Trebao bi biti Manual, Auto ili Sloppy." - -#: ../src/defaults.c:1357 -msgid "Invalid colormap focus mode \"%s\". Should be Manual or Auto." -msgstr "Pogrešni colormap fokus mod \"%s\". Trebao bi biti Manual ili Auto." - -#: ../src/defaults.c:1400 -msgid "Invalid window placement mode \"%s\". Should be Auto, Cascade, Random or Manual." -msgstr "Pogrešni window placement mod \"%s\". Trebao bi biti Auto, Cascade, Random ili Manual." - -#: ../src/defaults.c:1442 -msgid "Invalid geometry display type \"%s\". Should be Center, Corner, Floating or Line." -msgstr "Pogrešni tip geometry prikaza \"%s\". Trebao bi biti Center, Corner, Floating ili Line." - -#: ../src/defaults.c:1489 -msgid "Invalid speed \"%s\". Should be UltraFast, Fast, Medium, Slow or UltraSlow." -msgstr "Pogrešna brzina \"%s\". Trebala bi biti UltraFast, Fast, Medium, Slow ili UltraSlow." - -#: ../src/defaults.c:1534 -msgid "Invalid mouse button \"%s\". Should be Left, Middle, Right or Button1 through Button5" -msgstr "Pogrešno dugme miša \"%s\". Trebalo bi biti Left, Middle, Right ili Button1 do Button5." - -#: ../src/defaults.c:1603 ../src/defaults.c:1634 ../src/defaults.c:1646 ../src/defaults.c:1688 ../src/defaults.c:1725 -msgid "\"%s\" is not a valid color name" -msgstr "\"%s\"je krivo ime za boju" - -#: ../src/defaults.c:1615 -msgid "bad number of arguments in gradient specification" -msgstr "krivi broj argumenata u specifikaciji gradacije" - -#: ../src/defaults.c:1661 -msgid "too few arguments in multicolor gradient specification" -msgstr "premalo argumenata u specifikaciji višebojne gradacije" - -#: ../src/defaults.c:1772 -msgid "Error in texture specification for key \"%s\"" -msgstr "Greška u specifikaciji teksture za \"%s\"" - -#: ../src/defaults.c:1818 ../src/defaults.c:1854 -msgid "Too few elements in array for key \"WorkspaceBack\"." -msgstr "Premalo elemenata u nizu za \"WorkspaceBack\"." - -#: ../src/defaults.c:1830 -msgid "Wrong type for workspace background. Should be Texture." -msgstr "Krivi tip za pozadinu radnog prostora. Trebala bi biti tekstura." - -#: ../src/defaults.c:1872 -msgid "Cannot get color entry for key \"WorkspaceBack\"." -msgstr "Ne mogu uzeti boju za \"WorkspaceBack\"." - -#: ../src/defaults.c:1884 -msgid "key \"WorkspaceBack\" has invalid color \"%s\"" -msgstr "\"WorkspaceBack\" ima pogrešnu boju \"%s\"" - -#: ../src/defaults.c:1898 -msgid "Cannot get file entry for key \"WorkspaceBack\"." -msgstr "Ne mogu uzeti datotečni zapis za \"WorkspaceBack\"." - -#: ../src/defaults.c:1916 -msgid "could not run \"%s\"" -msgstr "ne mogu pokrenuti \"%s\"" - -#: ../src/defaults.c:1922 -msgid "could not find background image \"%s\"" -msgstr "ne mogu naći sliku za pozadinu \"%s\"" - -#: ../src/defaults.c:1935 -msgid "Error in texture specification for key \"WorkspaceBack\"" -msgstr "Greška u specifikaciji teksture za \"WorkspaceBack\"" - -#: ../src/defaults.c:1972 -msgid "Invalid justification type \"%s\". Should be Left, Center or Right" -msgstr "Pogrešan tip poravnanja \"%s\". Trebao bi biti Left, Center ili Right" - -#: ../src/defaults.c:2006 -msgid "could not load any usable font" -msgstr "ne mogu učitati nijedan iskoristivi font" - -#: ../src/defaults.c:2036 -msgid "could not get color for key \"%s\"" -msgstr "ne mogu uzeti boju za \"%s\"" - -#: ../src/defaults.c:2095 ../src/rootmenu.c:433 -msgid "%s:invalid key modifier \"%s\"" -msgstr "%s:krivi modifier \"%s\"" - -#: ../src/defaults.c:2107 -msgid "%s:invalid kbd shortcut specification \"%s\"" -msgstr "%s: kriva specifikacija kbd kratice \"%s\"" - -#: ../src/defaults.c:2114 -msgid "%s:invalid key in shortcut \"%s\"" -msgstr "%s krivi ključ u kratici \"%s\"" - -#: ../src/defaults.c:2140 -msgid "%s: modifier key %s is not valid" -msgstr "%s: krivi modifier ključ %s " - -#: ../src/defaults.c:2186 -msgid "Invalid icon Position \"%s\". Should be one of blv, blh, brv, brh, tlv, tlh, trv, trh" -msgstr "Kriva pozicija ikone \"%s\". Trebala bi biti: blv, blh, brv, brh, tlv, tlh, trv ili trh" -#: ../src/defaults.c:2268 -msgid "could not render texture for icon background" -msgstr "ne mogu renderirati teksturu za pozadinu ikone" - -#: ../src/defaults.c:2613 -msgid "could not render texture for workspace background" -msgstr "ne mogu renderirati teksturu za pozadinu radnog prostora" - -#: ../src/dialog.c:69 ../src/dialog.c:81 ../src/dialog.c:164 ../src/dialog.c:500 ../src/dockedapp.c:349 -msgid "OK" -msgstr "U redu" - -#: ../src/dialog.c:69 ../src/dialog.c:74 ../src/dialog.c:164 ../src/dialog.c:507 ../src/dockedapp.c:355 -msgid "Cancel" -msgstr "Otkaži" - -#: ../src/dialog.c:74 ../src/rootmenu.c:208 -msgid "Exit" -msgstr "Izlaz" - -#: ../src/dialog.c:86 +#: ../src/appicon.c:534 ../src/dock.c:270 ../src/winmenu.c:87 msgid "Yes" msgstr "Da" -#: ../src/dialog.c:86 +#: ../src/appicon.c:534 ../src/dock.c:270 ../src/winmenu.c:87 msgid "No" msgstr "Ne" -#: ../src/dialog.c:259 +#: ../src/appicon.c:548 ../src/dock.c:1030 +msgid "Unhide Here" +msgstr "Pokaži ovdje" + +#: ../src/appicon.c:549 ../src/dock.c:1032 +msgid "(Un)Hide" +msgstr "Otkrij/Sakrij" + +#: ../src/appicon.c:550 +msgid "Set Icon..." +msgstr "Postavi ikonu..." + +#: ../src/appicon.c:551 ../src/dock.c:1036 ../src/winmenu.c:342 +msgid "Kill" +msgstr "Ubij" + +#: ../src/defaults.c:690 ../src/startup.c:686 ../src/startup.c:704 ../src/startup.c:710 +msgid "could not read domain \"%s\" from defaults database" +msgstr "ne mogu pročitati domenu \"%s\" iz baze postavki" + +#: ../src/defaults.c:736 ../src/defaults.c:860 ../src/defaults.c:899 ../src/defaults.c:929 +msgid "Domain %s (%s) of defaults database is corrupted!" +msgstr "Domena %s (%s) baze postavki je nečitljiva" + +#: ../src/defaults.c:741 ../src/defaults.c:881 ../src/defaults.c:912 ../src/defaults.c:938 +msgid "could not load domain %s from user defaults database" +msgstr "ne mogu pročitati domenu %s iz korisnikove baze postavki" + +#: ../src/defaults.c:752 ../src/defaults.c:845 +msgid "Domain %s (%s) of global defaults database is corrupted!" +msgstr "Domena %s (%s) globalne baze postavki je nečitljiva" + +#: ../src/defaults.c:771 ../src/defaults.c:850 +msgid "could not load domain %s from global defaults database" +msgstr "ne mogu učitati domenu %s iz globalne baze postavki" + +#: ../src/defaults.c:1240 +msgid "wrong option value for key \"%s\". Should be one of %s" +msgstr "kriva vrijednost opcije za kjluč \"%s\". Trebala bi biti jedna od %s" + +#: ../src/defaults.c:1287 +msgid "can't convert \"%s\" to boolean for key \"%s\"" +msgstr "ne mogu konvertirati \"%s\" u logički izraz za \"%s\"" + +#: ../src/defaults.c:1292 ../src/defaults.c:1326 ../src/defaults.c:1358 ../src/defaults.c:1371 ../src/defaults.c:1386 ../src/defaults.c:1401 ../src/defaults.c:1472 ../src/defaults.c:1484 ../src/defaults.c:1739 ../src/defaults.c:1753 ../src/defaults.c:1791 ../src/defaults.c:1803 ../src/defaults.c:1815 ../src/defaults.c:1838 ../src/defaults.c:1865 ../src/defaults.c:1878 ../src/defaults.c:1891 ../src/defaults.c:1921 ../src/defaults.c:1962 ../src/defaults.c:1974 ../src/defaults.c:1986 ../src/defaults.c:2012 ../src/defaults.c:2032 ../src/defaults.c:2045 ../src/defaults.c:2060 ../src/defaults.c:2099 ../src/defaults.c:2164 +msgid "using default \"%s\" instead" +msgstr "umjesto toga koristim default \"%s\"" + +#: ../src/defaults.c:1323 +msgid "can't convert \"%s\" to integer for key \"%s\"" +msgstr "ne mogu konvertirati \"%s\" u integer za \"%s\"" + +#: ../src/defaults.c:1353 ../src/defaults.c:1467 ../src/defaults.c:1734 ../src/defaults.c:1786 ../src/defaults.c:1957 ../src/wdefaults.c:544 ../src/wdefaults.c:580 +msgid "Wrong option format for key \"%s\". Should be %s." +msgstr "Krivi format opcije za \"%s\". Trebao bi biti %s" + +#: ../src/defaults.c:1366 +msgid "Incorrect number of elements in array for key \"%s\"." +msgstr "Krivi broj elemenata u nizu za \"%s\"" + +#: ../src/defaults.c:1381 +msgid "Wrong value for key \"%s\". Should be Coordinate." +msgstr "Kriva vrijednost za \"%s\". Trebale bi biti koordinate." + +#: ../src/defaults.c:1396 +msgid "can't convert array to integers for \"%s\"." +msgstr "ne mogu konvertirati niz u integere za \"%s\"." + +#: ../src/defaults.c:1580 ../src/defaults.c:1611 ../src/defaults.c:1623 ../src/defaults.c:1665 ../src/defaults.c:1705 +msgid "\"%s\" is not a valid color name" +msgstr "\"%s\"je krivo ime za boju" + +#: ../src/defaults.c:1592 +msgid "bad number of arguments in gradient specification" +msgstr "krivi broj argumenata u specifikaciji gradacije" + +#: ../src/defaults.c:1638 +msgid "too few arguments in multicolor gradient specification" +msgstr "premalo argumenata u specifikaciji višebojne gradacije" + +#: ../src/defaults.c:1748 +msgid "Error in texture specification for key \"%s\"" +msgstr "Greška u specifikaciji teksture za \"%s\"" + +#: ../src/defaults.c:1799 ../src/defaults.c:1834 ../src/defaults.c:1970 ../src/defaults.c:2008 +msgid "Too few elements in array for key \"WorkspaceBack\"." +msgstr "Premalo elemenata u nizu za \"WorkspaceBack\"." + +#: ../src/defaults.c:1811 ../src/defaults.c:1982 +msgid "Wrong type for workspace background. Should be Texture." +msgstr "Krivi tip za pozadinu radnog prostora. Trebala bi biti tekstura." + +#: ../src/defaults.c:1861 ../src/defaults.c:2028 +msgid "Cannot get color entry for key \"WorkspaceBack\"." +msgstr "Ne mogu uzeti boju za \"WorkspaceBack\"." + +#: ../src/defaults.c:1873 ../src/defaults.c:2040 +msgid "key \"WorkspaceBack\" has invalid color \"%s\"" +msgstr "\"WorkspaceBack\" ima pogrešnu boju \"%s\"" + +#: ../src/defaults.c:1887 ../src/defaults.c:2056 +msgid "Cannot get file entry for key \"WorkspaceBack\"." +msgstr "Ne mogu uzeti datotečni zapis za \"WorkspaceBack\"." + +#: ../src/defaults.c:1900 ../src/defaults.c:2081 +msgid "could not find background image \"%s\"" +msgstr "ne mogu naći sliku za pozadinu \"%s\"" + +#: ../src/defaults.c:1917 ../src/defaults.c:2095 +msgid "Error in texture specification for key \"WorkspaceBack\"" +msgstr "Greška u specifikaciji teksture za \"WorkspaceBack\"" + +#: ../src/defaults.c:2076 +msgid "could not run \"%s\"" +msgstr "ne mogu pokrenuti \"%s\"" + +#: ../src/defaults.c:2129 +msgid "could not load any usable font" +msgstr "ne mogu učitati nijedan iskoristivi font" + +#: ../src/defaults.c:2159 +msgid "could not get color for key \"%s\"" +msgstr "ne mogu uzeti boju za \"%s\"" + +#: ../src/defaults.c:2218 ../src/rootmenu.c:440 +msgid "%s:invalid key modifier \"%s\"" +msgstr "%s:krivi modifier \"%s\"" + +#: ../src/defaults.c:2230 +msgid "%s:invalid kbd shortcut specification \"%s\"" +msgstr "%s: kriva specifikacija kbd kratice \"%s\"" + +#: ../src/defaults.c:2237 +msgid "%s:invalid key in shortcut \"%s\"" +msgstr "%s krivi ključ u kratici \"%s\"" + +#: ../src/defaults.c:2263 +msgid "%s: modifier key %s is not valid" +msgstr "%s: krivi modifier ključ %s " + +#: ../src/defaults.c:2339 +msgid "could not render texture for icon background" +msgstr "ne mogu renderirati teksturu za pozadinu ikone" + +#: ../src/defaults.c:2695 +msgid "background texture rendering was unsuccessfull" +msgstr "neuspješno rednriranje teksure za pozadinu" + +#: ../src/defaults.c:2722 +msgid "could not load image %s for option %s:%s\n" +msgstr "ne mogu učitati image %s za opciju %s:%s\n" + +#: ../src/defaults.c:2738 +msgid "could not spawn texture rendering subprocess for option" +msgstr "" + +#: ../src/defaults.c:2792 ../src/defaults.c:2880 +msgid "could not render texture for workspace background" +msgstr "ne mogu renderirati teksturu za pozadinu radnog prostora" + +#: ../src/dialog.c:114 ../src/dialog.c:458 ../src/dock.c:420 ../src/dockedapp.c:356 ../src/rootmenu.c:207 ../src/rootmenu.c:236 +msgid "Cancel" +msgstr "Otkaži" + +#: ../src/dialog.c:210 msgid "Could not open directory " msgstr "Ne mogu otvoriti direktorij " -#: ../src/dialog.c:315 +#: ../src/dialog.c:266 msgid "Could not load image file " msgstr "Ne mogu učitati image datoteku " -#: ../src/dialog.c:444 +#: ../src/dialog.c:395 msgid "Directories" msgstr "Direktoriji" -#: ../src/dialog.c:453 +#: ../src/dialog.c:404 msgid "Icons" msgstr "Ikone" -#: ../src/dialog.c:490 +#: ../src/dialog.c:441 msgid "File Name:" msgstr "Datoteka:" -#: ../src/dialog.c:513 +#: ../src/dialog.c:464 msgid "Choose File" msgstr "Izaberi datoteku" -#: ../src/dialog.c:523 +#: ../src/dialog.c:474 msgid "Icon Chooser" msgstr "Birač ikona" @@ -256,116 +237,112 @@ msgstr "Bira msgid "Type the name for workspace %i:" msgstr "Upiši ime za radni prostor %i:" -#: ../src/dock.c:210 ../src/dock.c:1001 +#: ../src/dock.c:210 ../src/dock.c:1009 msgid "Rename Workspace" msgstr "Promjeni ime radnom prostoru" -#: ../src/dock.c:413 +#: ../src/dock.c:418 msgid "Workspace Clip" msgstr "Clip radnog prostora" -#: ../src/dock.c:414 +#: ../src/dock.c:419 msgid "All selected icons will be removed!" msgstr "Sve odabrane ikone će biti uklonjene!" -#: ../src/dock.c:463 +#: ../src/dock.c:469 msgid "Keep Icon" msgstr "Zadrži ikonu" -#: ../src/dock.c:464 ../src/dock.c:1916 ../src/dock.c:2032 +#: ../src/dock.c:470 ../src/dock.c:1924 ../src/dock.c:2046 msgid "Type the command used to launch the application" msgstr "Upiši naredbu za pokretanje aplikacije" -#: ../src/dock.c:825 +#: ../src/dock.c:833 msgid "could not launch application %s\n" msgstr "ne mogu pokrenuti %s\n" -#: ../src/dock.c:880 +#: ../src/dock.c:888 msgid "could not create workspace submenu for Clip menu" -msgstr "ne mogu napraviti podmeni radnog prostora za Clip meni" +msgstr "ne mogu napraviti podizbornik radnog prostora za Clip meni" -#: ../src/dock.c:938 +#: ../src/dock.c:946 msgid "could not create options submenu for Clip menu" -msgstr "ne mogu napraviti podmenu opcija za Clip menu" +msgstr "ne mogu napraviti podizbornik opcija za izbornik Clip-a" -#: ../src/dock.c:942 -msgid "Floating Clip" -msgstr "Plutajući Clip" +#: ../src/dock.c:950 ../src/dock.c:998 ../src/winspector.c:1097 +msgid "Keep on top" +msgstr "Drži na vrhu" -#: ../src/dock.c:948 +#: ../src/dock.c:956 msgid "Collapsed" msgstr "Srušen" -#: ../src/dock.c:954 +#: ../src/dock.c:962 msgid "AutoCollapse" msgstr "AutoRušanje" -#: ../src/dock.c:960 +#: ../src/dock.c:968 msgid "AutoAttract Icons" msgstr "AutoPrivlačenje ikona" -#: ../src/dock.c:966 +#: ../src/dock.c:974 msgid "Keep Attracted Icons" msgstr "Zadrži privučene ikone" -#: ../src/dock.c:990 -msgid "Floating Dock" -msgstr "Plutajući dock" - -#: ../src/dock.c:996 +#: ../src/dock.c:1004 msgid "Clip Options" msgstr "Opcije clipa" -#: ../src/dock.c:1003 +#: ../src/dock.c:1011 msgid "(Un)Select Icon" msgstr "(De)Selektiraj ikonu" -#: ../src/dock.c:1005 +#: ../src/dock.c:1013 msgid "(Un)Select All Icons" msgstr "(De)Selektiraj sve ikone" -#: ../src/dock.c:1008 +#: ../src/dock.c:1016 msgid "Keep Icon(s)" msgstr "Zadrži ikonu(e)" -#: ../src/dock.c:1010 +#: ../src/dock.c:1018 msgid "Move Icon(s) To" msgstr "Stavi ikonu(e) na" -#: ../src/dock.c:1015 +#: ../src/dock.c:1023 msgid "Remove Icon(s)" msgstr "Makni ikonu(e)" -#: ../src/dock.c:1017 +#: ../src/dock.c:1025 msgid "Attract Icons" msgstr "Privuci ikone" -#: ../src/dock.c:1020 +#: ../src/dock.c:1028 msgid "Launch" msgstr "Pokreni" -#: ../src/dock.c:1026 +#: ../src/dock.c:1034 msgid "Settings..." msgstr "Postavke..." -#: ../src/dock.c:1410 ../src/dock.c:1424 ../src/dock.c:1438 ../src/dock.c:1448 +#: ../src/dock.c:1416 ../src/dock.c:1430 ../src/dock.c:1444 ../src/dock.c:1454 msgid "bad value in docked icon state info %s" msgstr "kriva vrijednost u dockiranom info stanju ikone %s" -#: ../src/dock.c:1456 +#: ../src/dock.c:1462 msgid "bad value in docked icon position %i,%i" msgstr "kriva vrijednost u dockiranoj poziciji ikone %i,%i" -#: ../src/dock.c:1685 +#: ../src/dock.c:1691 msgid "there are too many icons stored in dock. Ignoring what doesn't fit" msgstr "previše je ikona stavljeno na dock. Zanemarujem ono što ne stane" #. icon->forced_dock = 1; -#: ../src/dock.c:1915 ../src/dock.c:2031 +#: ../src/dock.c:1923 ../src/dock.c:2045 msgid "Dock Icon" msgstr "Stavi ikonu na dock" -#: ../src/dock.c:2975 ../src/dock.c:2979 +#: ../src/dock.c:2946 ../src/dock.c:2950 msgid "Could not execute command \"%s\"" msgstr "Ne mogu izvršiti naredbu \"%s\"" @@ -377,39 +354,39 @@ msgstr "ne mogu na msgid "Could not open specified icon file:%s" msgstr "Ne mogu otvoriti navedenu ikonu:%s" -#: ../src/dockedapp.c:290 +#: ../src/dockedapp.c:291 msgid "Start when WindowMaker is started" msgstr "Pokreni kada se pokrene WindowMaker" -#: ../src/dockedapp.c:297 +#: ../src/dockedapp.c:298 msgid "Application path and arguments" msgstr "Staze i argumenti aplikacije" -#: ../src/dockedapp.c:308 +#: ../src/dockedapp.c:309 msgid "Command for files dropped with DND" msgstr "Naredba za datoteke spuštene DND-om" -#: ../src/dockedapp.c:320 +#: ../src/dockedapp.c:321 msgid "%d will be replaced with the file name" msgstr "%d će biti zamjenjeno imenom datoteke" -#: ../src/dockedapp.c:324 +#: ../src/dockedapp.c:325 msgid "DND support was not compiled in" msgstr "Podrška za DND nije ukompajlirana" -#: ../src/dockedapp.c:330 +#: ../src/dockedapp.c:331 msgid "Icon Image" msgstr "Ikona" -#: ../src/dockedapp.c:342 ../src/winspector.c:1163 +#: ../src/dockedapp.c:343 ../src/winspector.c:1191 msgid "Browse..." msgstr "Potraži..." -#: ../src/dockedapp.c:387 +#: ../src/dockedapp.c:388 msgid "Docked Application Settings" msgstr "Postavke dockirane aplikacije" -#: ../src/event.c:465 +#: ../src/event.c:372 msgid "stack overflow: too many dead processes" msgstr "stack overflow: previše mrtvih procesa" @@ -417,162 +394,171 @@ msgstr "stack overflow: previ msgid "could not render gradient: %s" msgstr "ne mogu rednderiradi gradaciju: %s" -#: ../src/framewin.c:542 ../src/framewin.c:557 ../src/framewin.c:568 ../src/framewin.c:575 ../src/framewin.c:582 ../src/icon.c:294 ../src/texture.c:496 +#: ../src/framewin.c:542 ../src/framewin.c:557 ../src/framewin.c:568 ../src/framewin.c:575 ../src/framewin.c:582 ../src/icon.c:296 ../src/texture.c:492 msgid "error rendering image:%s" msgstr "greška pri rednderiranju slike: %s" -#: ../src/icon.c:180 ../src/wdefaults.c:399 +#: ../src/icon.c:182 ../src/wdefaults.c:402 msgid "error loading image file \"%s\"" msgstr "greška pri učitavanju image datoteke \"%s\"" -#: ../src/icon.c:611 +#: ../src/icon.c:428 ../src/icon.c:437 +msgid "could not create directory %s" +msgstr "ne mogu kreirati direktorij %s" + +#: ../src/icon.c:702 msgid "could not find default icon \"%s\"" msgstr "ne mogu naći glavnu ikonu \"%s\"" -#: ../src/icon.c:617 +#: ../src/icon.c:708 msgid "could not load default icon \"%s\":%s" msgstr "ne mogu učitati glavnu ikonu \"%s\":%s" -#: ../src/main.c:171 +#: ../src/main.c:186 +msgid "could not exec window manager" +msgstr "ne mogu pokrenuti window manager" + +#: ../src/main.c:187 msgid "Restart failed!!!" msgstr "Ponovno startanje nije uspjelo!!!" -#: ../src/main.c:187 +#: ../src/main.c:234 msgid "%s aborted.\n" msgstr "%s se srušio.\n" -#: ../src/main.c:198 +#: ../src/main.c:245 msgid "usage: %s [-options]\n" msgstr "upotreba: %s [-opcije]\n" -#: ../src/main.c:199 +#: ../src/main.c:246 msgid "options:" msgstr "opcije:" -#: ../src/main.c:201 +#: ../src/main.c:248 msgid " -nocpp \t\tdisable preprocessing of configuration files" msgstr " -nocpp \t\tonemogući preprocesiranje konfiguracijskih datoteka" -#: ../src/main.c:203 +#: ../src/main.c:250 msgid " -nodock\t\tdo not open the application Dock" msgstr " -nodock\t\tne otvaraj Dock aplikaciju" -#: ../src/main.c:204 +#: ../src/main.c:251 msgid " -noclip\t\tdo not open the workspace Clip" msgstr " -noclip\t\tne otvaraj Clip radnih prostora" -#. -#. puts(_(" -locale locale locale to use")); -#. -#: ../src/main.c:208 +#: ../src/main.c:255 msgid " -visualid visualid\tvisual id of visual to use" msgstr " -visualid visualid\tvisual id of visual to use" -#: ../src/main.c:209 +#: ../src/main.c:256 msgid " -display host:dpy\tdisplay to use" msgstr " -display host:dpy\tdisplay za korištenje" -#: ../src/main.c:210 +#: ../src/main.c:257 msgid " -version\t\tprint version and exit" msgstr " -version\t\tispiši verziju i izađi" -#: ../src/main.c:222 +#: ../src/main.c:269 msgid "" -"could not find user GNUstep directory.\n" -"Make sure you have installed WindowMaker correctly and run wmaker.inst" +"could not find user GNUstep directory (%s).\n" +"Make sure you have installed Window Maker correctly and run wmaker.inst" msgstr "" -"ne mogu naći korisnikov GNUstep direktorij.\n" -"Provjerite da li ste ispravno instalirali WinowMaker i pokrenite wmaker.inst" +"Ne mogu naći korisnički GNUstep direktorij (%s).\n" +"Provjerite da li ste pravilno instalirali Window Maker i pokrenuli wmaker.inst" -#: ../src/main.c:243 +#: ../src/main.c:291 msgid "%s:could not execute initialization script" msgstr "%s:ne mogu izvrširi inicijalizacijsku skriptu" -#: ../src/main.c:300 ../src/main.c:307 ../src/main.c:314 +#: ../src/main.c:310 +msgid "%s:could not execute exit script" +msgstr "%s:ne mogu izvršiti izlaznu skriptu" + +#: ../src/main.c:367 ../src/main.c:374 ../src/main.c:381 msgid "too few arguments for %s" msgstr "premalo argumenata za %s" -#: ../src/main.c:318 +#: ../src/main.c:385 msgid "bad value for visualid: \"%s\"" msgstr "kriva vrijednost za visualid: \"%s\"" -#: ../src/main.c:361 +#: ../src/main.c:426 msgid "X server does not support locale" msgstr "X server ne podržava locale" -#: ../src/main.c:364 +#: ../src/main.c:429 msgid "cannot set locale modifiers" msgstr "ne mogu postaviti loacale modifiers" -#: ../src/main.c:378 +#: ../src/main.c:446 msgid "could not open display \"%s\"" msgstr "ne mogu otvoriti display \"%s\"" #: ../src/menu.c:285 msgid "wrealloc() failed while trying to add menu item" -msgstr "wrealloc() pao pokušavajući dodati postavku u menu" +msgstr "wrealloc() pao pokušavajući dodati postavku u izbornik" -#: ../src/misc.c:70 +#: ../src/misc.c:71 msgid "could not define value for %s for cpp" msgstr "ne mogu definirati vrijednost za %s za cpp" -#: ../src/misc.c:100 +#: ../src/misc.c:101 msgid "could not get password entry for UID %i" msgstr "ne mogu uzeti password zapis za UID %i" -#: ../src/misc.c:124 +#: ../src/misc.c:125 msgid "your machine is misconfigured. HOSTNAME is set to %s" msgstr "vaša mašina je krivo konfigurirana. HOSTNAME je postavljen na %s" -#: ../src/misc.c:130 +#: ../src/misc.c:131 msgid "your machine is misconfigured. HOST is set to %s" msgstr "vaša mašina je krivo konfigurirana. HOST je postavljen na %s" -#: ../src/misc.c:756 +#: ../src/misc.c:773 msgid "selection timed-out" msgstr "vrijeme za odabir isteklo" -#: ../src/misc.c:770 +#: ../src/misc.c:788 msgid "Program Arguments" msgstr "Argumenti programa" -#: ../src/misc.c:789 +#: ../src/misc.c:807 msgid "Enter command arguments:" msgstr "Upiši argumente naredbe:" -#: ../src/misc.c:810 +#: ../src/misc.c:833 msgid "unable to get dropped data from DND drop" msgstr "ne mogu uzeti spuštene podatke od DND spuštanja" -#: ../src/misc.c:818 +#: ../src/misc.c:841 msgid "error getting dropped data from DND drop" msgstr "greška pri uzimanju spuštenih podataka od DND spuštanja" -#: ../src/misc.c:824 +#: ../src/misc.c:847 msgid "out of memory while getting data from DND drop" msgstr "iskorištena sva memorija pri uzimanju podataka od DND spuštanja" -#: ../src/misc.c:868 ../src/misc.c:987 +#: ../src/misc.c:891 ../src/misc.c:1011 msgid "out of memory during expansion of \"%s\"" msgstr "iskorištena sva memorija za vrijeme širenja \"%s\"" -#: ../src/misc.c:922 +#: ../src/misc.c:945 msgid "out of memory during expansion of \"%w\"" msgstr "iskorištena sva memorija za vrijeme širenja \"%w\"" -#: ../src/misc.c:941 +#: ../src/misc.c:964 msgid "out of memory during expansion of \"%a\"" msgstr "iskorištena sva memorija za vrijeme širenja \"%a\"" -#: ../src/misc.c:963 +#: ../src/misc.c:990 msgid "out of memory during expansion of \"%d\"" msgstr "iskorištena sva memorija za vrijeme širenja \"%d\"" -#: ../src/misc.c:975 +#: ../src/misc.c:1004 msgid "selection not available" msgstr "odabir nije dostupan" -#: ../src/misc.c:1053 ../src/misc.c:1059 +#: ../src/misc.c:1076 ../src/misc.c:1082 msgid "bad window name value in %s state info" msgstr "kriva vrijednost imena za prozor u %s u info stanju" @@ -664,19 +650,19 @@ msgstr "ne mogu parsirati boju \"%s\"" msgid "could not allocate color \"%s\"" msgstr "ne mogu alocirati boju \"%s\"" -#: ../src/rootmenu.c:164 -msgid "Program \"%s\" not found or cannot be executed." -msgstr "Program \"%s\" ne može biti nađen ili izvršen." +#: ../src/rootmenu.c:205 ../src/rootmenu.c:207 ../src/rootmenu.c:236 +msgid "Exit" +msgstr "Izlaz" -#: ../src/rootmenu.c:209 +#: ../src/rootmenu.c:206 msgid "Exit window manager?" msgstr "Izlaz iz window managera?" -#: ../src/rootmenu.c:229 +#: ../src/rootmenu.c:234 msgid "Close X session" msgstr "Zatvori X session" -#: ../src/rootmenu.c:230 +#: ../src/rootmenu.c:235 msgid "" "Close Window System session?\n" "(all applications will be closed)" @@ -684,143 +670,131 @@ msgstr "" "Zatvoriti Window System session?\n" "(sve aplikacije će biti zatvorene)" -#: ../src/rootmenu.c:232 -msgid "Exiting...\n" -msgstr "Izlazim...\n" - -#: ../src/rootmenu.c:447 +#: ../src/rootmenu.c:454 msgid "%s:invalid kbd shortcut specification \"%s\" for entry %s" msgstr "%s:kriva specifikacija za kbd kraticu \"%s\" za zapis %s" -#: ../src/rootmenu.c:455 +#: ../src/rootmenu.c:462 msgid "%s:invalid key in shortcut \"%s\" for entry %s" msgstr "%s:krivi ključ u kratici \"%s\" za zapis %s" -#: ../src/rootmenu.c:508 +#: ../src/rootmenu.c:515 msgid "%s: unmatched '\"' in menu file" -msgstr "%s: unmatched '\" u menu datoteci" +msgstr "%s: unmatched '\" u datoteci izbornika" -#: ../src/rootmenu.c:558 +#: ../src/rootmenu.c:565 msgid "%s: missing command" msgstr "%s: nedostaje naredba" -#: ../src/rootmenu.c:591 +#: ../src/rootmenu.c:598 msgid "invalid OPEN_MENU specification: %s" msgstr "kriva OPEN_MENU specifikacija: %s" -#: ../src/rootmenu.c:656 +#: ../src/rootmenu.c:663 msgid "%s:could not stat menu" -msgstr "%s:ne mogu statirati meni" +msgstr "%s:ne mogu statirati izbornik" -#: ../src/rootmenu.c:664 +#: ../src/rootmenu.c:671 msgid "%s:could not stat menu :%s" -msgstr "%s:ne mogu statirati meni: %s" +msgstr "%s:ne mogu statirati izbornik: %s" -#: ../src/rootmenu.c:682 +#: ../src/rootmenu.c:689 msgid "too many parameters in OPEN_MENU: %s" msgstr "previše parametara u OPEN_MENU: %s" -#: ../src/rootmenu.c:718 +#: ../src/rootmenu.c:725 msgid "There are more than one WORKSPACE_MENU commands in the applications menu. Only one is allowed." -msgstr "Ima više nego jedna WORKSPACE_MENU naredba u meniu aplikacija. Smije biti samo jedna." +msgstr "Ima više nego jedna WORKSPACE_MENU naredba u izborniku aplikacija. Smije biti samo jedna." -#: ../src/rootmenu.c:747 ../src/rootmenu.c:765 +#: ../src/rootmenu.c:754 ../src/rootmenu.c:772 msgid "%s:missing parameter for menu command \"%s\"" -msgstr "%s:nedostaje parametar za meni naredbu \"%s\"" +msgstr "%s:nedostaje parametar za naredbu izbornika \"%s\"" -#: ../src/rootmenu.c:828 +#: ../src/rootmenu.c:835 msgid "%s:unknown command \"%s\" in menu config." -msgstr "%s:nepoznata naredba \"%s\" u konfiguraciji menija" +msgstr "%s:nepoznata naredba \"%s\" u konfiguraciji izbornika" -#: ../src/rootmenu.c:836 +#: ../src/rootmenu.c:843 msgid "%s:can't add shortcut for entry \"%s\"" msgstr "%s:ne mogu dodati kraticu za zapis \"%s\"" -#: ../src/rootmenu.c:973 +#: ../src/rootmenu.c:980 msgid "%s:maximal line size exceeded in menu config: %s" -msgstr "%s prekoračena maksimalna veličina linije u konfiguraciji menija: %s" +msgstr "%s prekoračena maksimalna veličina linije u konfiguraciji izbornika: %s" -#: ../src/rootmenu.c:995 ../src/rootmenu.c:1087 ../src/rootmenu.c:1188 +#: ../src/rootmenu.c:1002 ../src/rootmenu.c:1094 ../src/rootmenu.c:1195 msgid "%s:missing command in menu config: %s" -msgstr "%s:nedostaje naredba u konfiguraciji menija: %s" +msgstr "%s:nedostaje naredba u konfiguraciji izbornika: %s" -#: ../src/rootmenu.c:1025 +#: ../src/rootmenu.c:1032 msgid "%s:syntax error in menu file:END declaration missing" -msgstr "%s:greška u sintaksi u meni datoteci: nedostaje deklaracija END" +msgstr "%s:greška u sintaksi u datoteci izbornika: nedostaje deklaracija END" -#: ../src/rootmenu.c:1054 ../src/rootmenu.c:1153 +#: ../src/rootmenu.c:1061 ../src/rootmenu.c:1160 msgid "could not make arguments for menu file preprocessor" -msgstr "ne mogu napraviti argumente za preprocesor datoteke menija" +msgstr "ne mogu napraviti argumente za preprocesor datoteke izbornika" -#: ../src/rootmenu.c:1060 ../src/rootmenu.c:1160 +#: ../src/rootmenu.c:1067 ../src/rootmenu.c:1167 msgid "%s:could not open/preprocess menu file" -msgstr "%s:ne mogu otvoriti/preprocesirati datoteku menija" +msgstr "%s:ne mogu otvoriti/preprocesirati datoteku izbornika" -#: ../src/rootmenu.c:1072 ../src/rootmenu.c:1173 +#: ../src/rootmenu.c:1079 ../src/rootmenu.c:1180 msgid "%s:could not open menu file" -msgstr "%s: ne mogu otvoriti datoteku menija" +msgstr "%s: ne mogu otvoriti datoteku izbornika" -#: ../src/rootmenu.c:1099 +#: ../src/rootmenu.c:1106 msgid "%s:invalid menu file. MENU command is missing" -msgstr "%s:kriva datoteka menija. Nedostaje MENU naredba" +msgstr "%s:kriva datoteka izbornika. Nedostaje MENU naredba" -#: ../src/rootmenu.c:1108 +#: ../src/rootmenu.c:1115 msgid "error reading preprocessed menu data" -msgstr "greška pri čitanju preprocesiranih podataka za meni" +msgstr "greška pri čitanju preprocesiranih podataka za izbornik" -#: ../src/rootmenu.c:1200 +#: ../src/rootmenu.c:1207 msgid "%s:no title given for the root menu" -msgstr "%s:nije naveden naslov za root meni" +msgstr "%s:nije naveden naslov za root izbornik" -#: ../src/rootmenu.c:1254 ../src/rootmenu.c:1317 ../src/rootmenu.c:1361 +#: ../src/rootmenu.c:1261 ../src/rootmenu.c:1324 ../src/rootmenu.c:1368 msgid "out of memory while constructing directory menu %s" -msgstr "iskorištena sva memorija prilikom konstruiranja direktorij menija %s" +msgstr "iskorištena sva memorija prilikom konstruiranja direktorij izbornika %s" -#: ../src/rootmenu.c:1264 +#: ../src/rootmenu.c:1271 msgid "%s:could not stat file \"%s\" in menu directory" -msgstr "%s:ne mogu statirati datoteku \"%s\" u meni direktoriju" +msgstr "%s:ne mogu statirati datoteku \"%s\" u izbornik direktoriju" -#: ../src/rootmenu.c:1410 +#: ../src/rootmenu.c:1417 msgid "Commands" msgstr "Naredbe" -#: ../src/rootmenu.c:1412 +#: ../src/rootmenu.c:1419 msgid "Exit..." msgstr "Izlaz" -#: ../src/rootmenu.c:1479 -msgid "could not find menu file \"%s\" referenced in WMRootMenu" -msgstr "ne mogu naći menu datoteku \"%s\" naveden u WMRootMenu datoteci" - #: ../src/rootmenu.c:1486 +msgid "could not find menu file \"%s\" referenced in WMRootMenu" +msgstr "ne mogu naći datoteku izbornika \"%s\" naveden u WMRootMenu datoteci" + +#: ../src/rootmenu.c:1493 msgid "could not access menu \"%s\" referenced in WMRootMenu" -msgstr "ne mogu pristupiti menu datoteci \"%s\" navedenoj u WMRootMenu" +msgstr "ne mogu pristupiti datoteci izbornika \"%s\" navedenoj u WMRootMenu" -#: ../src/rootmenu.c:1514 ../src/rootmenu.c:1569 +#: ../src/rootmenu.c:1521 ../src/rootmenu.c:1576 msgid "%s:format error in root menu configuration \"%s\"" -msgstr "%s:greška u formatu u root mani konfiguraciji \"%s\"" +msgstr "%s:greška u formatu u konfiguraciji root izbornika \"%s\"" -#: ../src/screen.c:111 -msgid "it seems that there already is a window manager running" -msgstr "čini se da je već pokrenut window manager" - -#: ../src/screen.c:394 +#: ../src/screen.c:412 msgid "could not load logo image for panels" msgstr "ne mogu učitati logo image za panele" -#: ../src/screen.c:397 +#: ../src/screen.c:415 msgid "error making logo image for panel:%s" msgstr "greška pri kreiranju logo imagea za panel:%s" -#: ../src/screen.c:544 -msgid "icon size is configured to %i, but it's too small. Using 16, instead\n" -msgstr "veličina ikone je konfigurirana ba %i, ali je premala. Umjetsto toga koristim 16\n" - -#: ../src/screen.c:587 +#: ../src/screen.c:594 msgid "could not initialize graphics library context: %s" msgstr "ne mogu inicijalizirati sadržaj grafičke biblioteke: %s" -#: ../src/session.c:113 ../src/wdefaults.c:559 ../src/winspector.c:335 +#: ../src/session.c:113 ../src/wdefaults.c:562 ../src/winspector.c:343 msgid "can't convert \"%s\" to boolean" msgstr "ne mogu konvertirati \"%s\" u logički izraz" @@ -828,59 +802,77 @@ msgstr "ne mogu konvertirati \"%s\" u logi msgid "could not get window list!!" msgstr "ne mogu uzeti listu prozora!!" -#: ../src/startup.c:163 +#: ../src/startup.c:188 msgid "internal X error: %s\n" msgstr "interna X greška: %s\n" -#: ../src/startup.c:225 +#: ../src/startup.c:251 msgid "got signal %i (%s) - restarting\n" msgstr "dobio sam signal %i (%s) - ponovno startam\n" -#: ../src/startup.c:227 +#: ../src/startup.c:253 msgid "got signal %i - restarting\n" msgstr "primio signal %i - ponovno startam\n" -#: ../src/startup.c:240 +#: ../src/startup.c:267 msgid "%s: Received signal SIGTERM. Exiting..." msgstr "%s: Primio signal SIGTERM. Izlazim..." -#: ../src/startup.c:251 +#: ../src/startup.c:279 msgid "got signal %i (%s)\n" msgstr "primio signal %i (%s)\n" -#: ../src/startup.c:253 +#: ../src/startup.c:281 msgid "got signal %i\n" msgstr "primio signal %i\n" -#: ../src/startup.c:258 +#: ../src/startup.c:286 msgid "crashed while trying to do some post-crash cleanup. Aborting immediatelly." msgstr "srušio se dok sam pokušavao čistiti. Prekidam odmah." -#: ../src/startup.c:267 +#. restart another window manager so that the X session doesn't +#. * go to space +#: ../src/startup.c:297 msgid "trying to start alternative window manager..." msgstr "pokušavam startati drugi window manager" -#: ../src/switchmenu.c:124 +#: ../src/startup.c:696 +msgid "icon size is configured to %i, but it's too small. Using 16, instead\n" +msgstr "veličina ikone je konfigurirana ba %i, ali je premala. Umjetsto toga koristim 16\n" + +#: ../src/startup.c:740 +msgid "it seems that there already is a window manager running" +msgstr "čini se da je već pokrenut window manager" + +#: ../src/startup.c:746 +msgid "could not manage screen %i" +msgstr "ne mogu upravljati ekranom %i" + +#: ../src/startup.c:802 +msgid "could not manage any screen" +msgstr "ne mogu upravljati nijednim ekranom" + +#: ../src/switchmenu.c:112 msgid "Windows" msgstr "Lista prozora" -#: ../src/texture.c:260 +#: ../src/texture.c:267 msgid "image file \"%s\" used as texture could not be found." msgstr "ne mogu naći image datoteku \"%s\" koja se koristi kao tekstura." -#: ../src/texture.c:266 +#: ../src/texture.c:273 msgid "could not load texture pixmap \"%s\":%s" msgstr "ne mogu učitati teksturni pixmap \"%s\":%s" -#: ../src/texture.c:362 ../src/texture.c:492 +#: ../src/texture.c:377 ../src/texture.c:488 msgid "could not render texture: %s" msgstr "ne mogu renderirati teksturu: %s" -#: ../src/wdefaults.c:393 +#: ../src/wdefaults.c:396 msgid "could not find icon file \"%s\"" msgstr "ne mogu naći ikonu \"%s\"" -#: ../src/window.c:1943 ../src/window.c:2082 +#: ../src/window.c:2261 ../src/window.c:2404 msgid "" "the NumLock, ScrollLock or similar key seems to be turned on.\n" "Turn it off or some mouse actions and keyboard shortcuts will not work." @@ -888,91 +880,100 @@ msgstr "" "čini se da su NumLock, ScrollLock ili slični ključevi uključeni.\n" "Isključite ih ili neke akcije s mišom i tastaturom neće raditi." -#: ../src/winmenu.c:182 -msgid "could not create workspace submenu for window menu" -msgstr "ne mogu kreirati radni prostor podmeni za prozor menu" +#: ../src/winmenu.c:192 ../src/winmenu.c:199 +msgid "Shortcut" +msgstr "Kratica" -#: ../src/winmenu.c:204 +#: ../src/winmenu.c:242 ../src/winmenu.c:258 +msgid "could not create submenu for window menu" +msgstr "ne mogu kreirati podizbornik za izornik prozora" + +#. +#. * Warning: If you make some change that affects the order of the +#. * entries, you must update the command #defines in the top of +#. * this file. +#. +#: ../src/winmenu.c:284 msgid "(Un)Maximize" msgstr "(De)Maksimiziraj" -#: ../src/winmenu.c:212 +#: ../src/winmenu.c:292 msgid "Miniaturize" msgstr "Minimiziraj" -#: ../src/winmenu.c:221 +#: ../src/winmenu.c:301 msgid "(Un)Shade" msgstr "(Un)Shade" -#: ../src/winmenu.c:229 +#: ../src/winmenu.c:309 msgid "Hide" msgstr "Sakrij" -#: ../src/winmenu.c:236 -msgid "Hide Others" -msgstr "Sakrij ostale" - -#: ../src/winmenu.c:238 +#: ../src/winmenu.c:317 msgid "Select" msgstr "Odaberi" -#: ../src/winmenu.c:246 +#: ../src/winmenu.c:325 msgid "Move To" msgstr "Stavi na" -#: ../src/winmenu.c:251 +#: ../src/winmenu.c:330 msgid "Attributes..." msgstr "Atributi..." -#: ../src/winmenu.c:253 +#: ../src/winmenu.c:332 +msgid "Select Shortcut" +msgstr "Odaberi kratici" + +#: ../src/winmenu.c:335 msgid "Close" msgstr "Zatvori" -#: ../src/winspector.c:274 +#: ../src/winspector.c:277 msgid "Could not find icon \"%s\" specified for this window" msgstr "Ne mogu naći ikonu \"%s\" dodjeljenu ovom prozoru" -#: ../src/winspector.c:287 +#: ../src/winspector.c:293 msgid "Could not open specified icon \"%s\":%s" msgstr "Ne mogu otvoriti navedenu ikonu \"%s\":%s" -#: ../src/winspector.c:961 +#: ../src/winspector.c:989 msgid "Save" msgstr "Snimi" -#: ../src/winspector.c:967 +#: ../src/winspector.c:995 msgid "Apply" msgstr "Primjeni" -#: ../src/winspector.c:973 +#: ../src/winspector.c:1001 msgid "Revert" msgstr "Vrati" -#: ../src/winspector.c:982 ../src/winspector.c:992 +#: ../src/winspector.c:1010 ../src/winspector.c:1020 msgid "Window Specification" msgstr "Specifikacija prozora" -#: ../src/winspector.c:983 +#: ../src/winspector.c:1011 msgid "Window Attributes" msgstr "Atributi prozora" -#: ../src/winspector.c:984 +#: ../src/winspector.c:1012 msgid "Advanced Options" msgstr "Napredne opcije" -#: ../src/winspector.c:985 +#: ../src/winspector.c:1013 msgid "Icon and Initial Workspace" msgstr "Ikona i početna radni prostor" -#: ../src/winspector.c:986 +#: ../src/winspector.c:1014 msgid "Application Specific" msgstr "Specifično za aplikaciju" -#: ../src/winspector.c:1000 +#: ../src/winspector.c:1028 msgid "Defaults for all windows" msgstr "Defaults za sve prozore" -#: ../src/winspector.c:1036 +#: ../src/winspector.c:1064 msgid "" "The configuration will apply to all\n" "windows that have their WM_CLASS property set to the above selected\n" @@ -983,143 +984,190 @@ msgstr "" "imaju svoju WM_CLASS postavku\n" "postavljenu na gore navedeno ime." -#. *** attributes *** -#: ../src/winspector.c:1043 +#: ../src/winspector.c:1071 msgid "Attributes" msgstr "Atributi" -#: ../src/winspector.c:1053 +#: ../src/winspector.c:1081 msgid "Disable titlebar" msgstr "Onemogući titlebar" -#: ../src/winspector.c:1057 +#: ../src/winspector.c:1085 msgid "Disable resizebar" msgstr "Onemogući resizebar" -#: ../src/winspector.c:1061 +#: ../src/winspector.c:1089 msgid "Disable close button" msgstr "Bez dugmeta za zatvaranje" -#: ../src/winspector.c:1065 +#: ../src/winspector.c:1093 msgid "Disable miniaturize button" msgstr "Bez dugmeta za minimiziranje" -#: ../src/winspector.c:1069 -msgid "Keep on top" -msgstr "Drži na vrhu" - -#: ../src/winspector.c:1073 +#: ../src/winspector.c:1101 msgid "Omnipresent" msgstr "SvugdjePrisutan" -#: ../src/winspector.c:1077 +#: ../src/winspector.c:1105 msgid "Start Miniaturized" msgstr "Pokreni minimizirano" -#: ../src/winspector.c:1081 +#: ../src/winspector.c:1109 msgid "Skip window list" msgstr "Preskoči listu prozora" -#: ../src/winspector.c:1095 +#: ../src/winspector.c:1123 msgid "Advanced" msgstr "Napredno" -#: ../src/winspector.c:1105 +#: ../src/winspector.c:1133 msgid "Ignore HideOthers" msgstr "Ignoriraj SakrijOstale" -#: ../src/winspector.c:1109 +#: ../src/winspector.c:1137 msgid "Don't bind keyboard shortcuts" msgstr "Ne primjenjuj kbd kratice" -#: ../src/winspector.c:1113 +#: ../src/winspector.c:1141 msgid "Don't bind mouse clicks" msgstr "Ne primjenjuj klikove miša" -#: ../src/winspector.c:1117 +#: ../src/winspector.c:1145 msgid "Keep inside screen" msgstr "Drži unutar ekrana" -#: ../src/winspector.c:1121 +#: ../src/winspector.c:1149 msgid "Don't let it take focus" msgstr "Ne daj da uzme fokus" -#: ../src/winspector.c:1125 +#: ../src/winspector.c:1153 msgid "Don't Save Session" msgstr "Ne snimaj sessiju" -#: ../src/winspector.c:1129 +#: ../src/winspector.c:1157 msgid "Emulate Application Icon" msgstr "Emulirati aplikacijsku ikonu" -#: ../src/winspector.c:1144 +#: ../src/winspector.c:1172 msgid "Enable the \"Don't bind...\" options to allow the application to receive all mouse or keyboard events." msgstr "Omogući \"Ne primjenjuj...\" opcije da bi dopustio aplikaciji da primi sve miš ili tastaturne događaje." -#: ../src/winspector.c:1151 +#: ../src/winspector.c:1179 msgid "Miniwindow Image" msgstr "Miniwindow Image" -#: ../src/winspector.c:1169 +#: ../src/winspector.c:1198 msgid "Update" msgstr "Update" -#: ../src/winspector.c:1174 +#: ../src/winspector.c:1213 msgid "Icon file name:" msgstr "Ime ikone:" -#: ../src/winspector.c:1184 +#: ../src/winspector.c:1225 msgid "Ignore client supplied icon" msgstr "Zanemari ponuđenu ikonu" -#: ../src/winspector.c:1191 +#: ../src/winspector.c:1232 msgid "Initial Workspace" msgstr "Početni randi prostor" -#: ../src/winspector.c:1196 +#: ../src/winspector.c:1237 msgid "Nowhere in particular" msgstr "Nigdje posebno" -#: ../src/winspector.c:1227 +#: ../src/winspector.c:1271 msgid "Application Wide" msgstr "Preko cijele aplikacije" -#: ../src/winspector.c:1237 +#: ../src/winspector.c:1281 msgid "Start Hidden" msgstr "Pokreni skriveno" -#: ../src/winspector.c:1241 +#: ../src/winspector.c:1285 msgid "No application icon" msgstr "Nema ikone za aplikaciju" -#: ../src/workspace.c:89 ../src/workspace.c:90 ../src/workspace.c:390 +#: ../src/workspace.c:89 ../src/workspace.c:90 ../src/workspace.c:423 msgid "Workspace %i" msgstr "Radni prostor %i" -#: ../src/workspace.c:438 +#: ../src/workspace.c:471 msgid "Workspaces" msgstr "Radni prostori" -#: ../src/workspace.c:440 +#: ../src/workspace.c:473 msgid "could not create Workspace menu" -msgstr "ne mogu kreirati menu Radnog prostora" +msgstr "ne mogu kreirati izbornik Radnog prostora" -#: ../src/workspace.c:447 +#: ../src/workspace.c:480 msgid "New" msgstr "Novi" -#: ../src/workspace.c:448 +#: ../src/workspace.c:481 msgid "Destroy Last" msgstr "Uništi zadnju" -#: ../src/xutil.c:226 +#: ../src/xutil.c:228 msgid "invalid data in selection" msgstr "krivi podaci u odabiru" +# msgid "could not create workspace submenu for window menu" +# msgstr "ne mogu kreirati radni prostor podizbornik za prozor izbornik" +# +# msgid "Floating Dock" +# msgstr "Plutajući dock" +# +# msgid "Program \"%s\" not found or cannot be executed." +# msgstr "Program \"%s\" ne može biti nađen ili izvršen." +# +# msgid "Invalid justification type \"%s\". Should be Left, Center or Right" +# msgstr "Pogrešan tip poravnanja \"%s\". Trebao bi biti Left, Center ili Right" +# +# msgid "Invalid colormap focus mode \"%s\". Should be Manual or Auto." +# msgstr "Pogrešni colormap fokus mod \"%s\". Trebao bi biti Manual ili Auto." +# +# msgid "Invalid geometry display type \"%s\". Should be Center, Corner, Floating or Line." +# msgstr "Pogrešni tip geometry prikaza \"%s\". Trebao bi biti Center, Corner, Floating ili Line." +# +# msgid "Invalid window placement mode \"%s\". Should be Auto, Cascade, Random or Manual." +# msgstr "Pogrešni window placement mod \"%s\". Trebao bi biti Auto, Cascade, Random ili Manual." +# +# msgid "Invalid focus mode \"%s\". Should be Manual, Auto or Sloppy." +# msgstr "Pogrešni fokus mod \"%s\". Trebao bi biti Manual, Auto ili Sloppy." +# +# msgid "Invalid mouse button \"%s\". Should be Left, Middle, Right or Button1 through Button5" +# msgstr "Pogrešno dugme miša \"%s\". Trebalo bi biti Left, Middle, Right ili Button1 do Button5." +# +# msgid "Invalid iconification style \"%s\". Should be Zoom, Twist, Flip or None" +# msgstr "Krivi stil ikonifikacije \"%s\". Trebao bi biti Zoom, Twist, Flip ili None" +# +# msgid "Invalid speed \"%s\". Should be UltraFast, Fast, Medium, Slow or UltraSlow." +# msgstr "Pogrešna brzina \"%s\". Trebala bi biti UltraFast, Fast, Medium, Slow ili UltraSlow." +# +# msgid "Floating Clip" +# msgstr "Plutajući Clip" +# +# msgid "Invalid icon Position \"%s\". Should be one of blv, blh, brv, brh, tlv, tlh, trv, trh" +# msgstr "Kriva pozicija ikone \"%s\". Trebala bi biti: blv, blh, brv, brh, tlv, tlh, trv ili trh" +# +# msgid "" +# "could not find user GNUstep directory.\n" +# "Make sure you have installed WindowMaker correctly and run wmaker.inst" +# msgstr "" +# "ne mogu naći korisnikov GNUstep direktorij.\n" +# "Provjerite da li ste ispravno instalirali WinowMaker i pokrenite wmaker.inst" +# +# msgid "Hide Others" +# msgstr "Sakrij ostale" +# +# msgid "Exiting...\n" +# msgstr "Izlazim...\n" +# # msgid "%s:could not find menu file \"%s\"" -# msgstr "%s:ne mogu naći meni datoteku \"%s\"" +# msgstr "%s:ne mogu naći datoteku izbornika \"%s\"" # # msgid "%s:could not access menu \"%s\"" -# msgstr "%s:ne mogu pristupiti meniju \"%s\"" +# msgstr "%s:ne mogu pristupiti izborniku \"%s\"" # # msgid "invalid kbd shortcut specification \"%s\"" # msgstr "pogrešna specifikacija kbd kratice \"%s\"" diff --git a/po/ko.po b/po/ko.po index b47380ba..48cad4bf 100644 --- a/po/ko.po +++ b/po/ko.po @@ -1,1119 +1,1114 @@ -# Korean message file for WindowMaker -# Last Update: version 0.18.0 -# -msgid "" -msgstr "" -"Date: 1998-07-21 00:20:01+0900\n" -"From: Byeong-Chan, Kim \n" -"Language-Team: Korean \n" -"MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=EUC-KR\n" -"Content-Transfer-Encoding: 8-bit\n" -"Xgettext-Options: --default-domain=WindowMaker --add-comments --keyword=_\n" -"Files: ../main.c ../event.c ../window.c ../startup.c ../shutdown.c ../wcore.c ../properties.c ../texture.c ../actions.c ../menu.c ../client.c ../pixmap.c ../image.c ../gradient.c ../button.c ../screen.c ../icon.c ../rootmenu.c ../dialog.c ../resource.c ../moveres.c ../application.c ../colormap.c ../raster.c ../placement.c ../misc.c ../appmenu.c ../keybind.c ../stacking.c ../appicon.c ../switchmenu.c ../dock.c ../winmenu.c\n" - -#: ../src/appicon.c:500 ../src/dialog.c:262 ../src/dialog.c:318 ../src/dock.c:2977 ../src/dockedapp.c:206 ../src/rootmenu.c:164 ../src/winspector.c:276 ../src/winspector.c:289 -msgid "Error" -msgstr "żĄˇŻ" - -#: ../src/appicon.c:501 -msgid "Could not open specified icon file" -msgstr "ÁöÁ¤ÇŃ žĆŔĚÄÜŔť ż­Áö ¸řÇÔ." - -#: ../src/appicon.c:522 ../src/dock.c:263 ../src/winmenu.c:85 -msgid "Kill Application" -msgstr "°­ÁŚ Ážˇá" - -#: ../src/appicon.c:523 ../src/dock.c:264 ../src/winmenu.c:86 -msgid "" -"This will kill the application.\n" -"Any unsaved changes will be lost.\n" -"Please confirm." -msgstr "" -"žÖÇøŽÄÉŔĚźÇŔť °­ÁŚ ÁžˇáÇŐ´Ď´Ů.\n" -"ŔúŔĺÇĎÁö žĘŔş şŻ°ć ťçÇ×Ŕş ŔŇ°Ô ľË´Ď´Ů.\n" -"°čźÓ ÇϽðڽŔ´Ďąî?" - -#: ../src/appicon.c:538 ../src/dock.c:1017 -msgid "Unhide Here" -msgstr "źűąä °Í Ŕ̰÷żĄ ş¸ŔÓ" - -#: ../src/appicon.c:539 ../src/dock.c:1019 -msgid "(Un)Hide" -msgstr "(žČ)źűąč" - -#: ../src/appicon.c:540 -msgid "Set Icon..." -msgstr "žĆŔĚÄÜ źłÁ¤" - -#: ../src/appicon.c:541 ../src/dock.c:1023 ../src/winmenu.c:260 -msgid "Kill" -msgstr "°­ÁŚ Ážˇá" - -#: ../src/defaults.c:577 ../src/screen.c:535 ../src/screen.c:643 ../src/screen.c:649 -msgid "could not read domain \"%s\" from defaults database" -msgstr "" - -#: ../src/defaults.c:623 ../src/defaults.c:745 ../src/defaults.c:780 ../src/defaults.c:806 -msgid "Domain %s (%s) of defaults database is corrupted!" -msgstr "" - -#: ../src/defaults.c:628 ../src/defaults.c:762 ../src/defaults.c:789 ../src/defaults.c:814 -msgid "could not load domain %s from user defaults database" -msgstr "" - -#: ../src/defaults.c:639 ../src/defaults.c:730 -msgid "Domain %s (%s) of global defaults database is corrupted!" -msgstr "" - -#: ../src/defaults.c:656 ../src/defaults.c:735 -msgid "could not load domain %s from global defaults database" -msgstr "" - -#: ../src/defaults.c:1102 -msgid "can't convert \"%s\" to boolean for key \"%s\"" -msgstr "" - -#: ../src/defaults.c:1107 ../src/defaults.c:1141 ../src/defaults.c:1173 ../src/defaults.c:1186 ../src/defaults.c:1201 ../src/defaults.c:1216 ../src/defaults.c:1287 ../src/defaults.c:1299 ../src/defaults.c:1358 ../src/defaults.c:1402 ../src/defaults.c:1444 ../src/defaults.c:1490 ../src/defaults.c:1536 ../src/defaults.c:1759 ../src/defaults.c:1773 ../src/defaults.c:1806 ../src/defaults.c:1818 ../src/defaults.c:1830 ../src/defaults.c:1854 ../src/defaults.c:1872 ../src/defaults.c:1885 ../src/defaults.c:1898 ../src/defaults.c:1935 ../src/defaults.c:1973 ../src/defaults.c:2037 ../src/defaults.c:2188 -msgid "using default \"%s\" instead" -msgstr "ąâşť°ŞŔÎ \"%s\" ¸Ś ´ë˝Ĺ ťçżëÇÔ" - -#: ../src/defaults.c:1138 -msgid "can't convert \"%s\" to integer for key \"%s\"" -msgstr "\"%s\" ŔÎ \"%s\" ŰŔÇ °ŞŔť Á¤źöÇüŔ¸ˇÎ şŻČ°ÇŇ źö žřŔ˝" - -#: ../src/defaults.c:1168 ../src/defaults.c:1282 ../src/defaults.c:1754 ../src/defaults.c:1801 ../src/wdefaults.c:541 ../src/wdefaults.c:577 -msgid "Wrong option format for key \"%s\". Should be %s." -msgstr "\"%s\" ŰŔÇ żÉźÇ Ć÷¸ËŔĚ Ŕ߸řľĘ. %s ŔĎ °Í °°Ŕ˝." - -#: ../src/defaults.c:1181 -msgid "Incorrect number of elements in array for key \"%s\"." -msgstr "" - -#: ../src/defaults.c:1196 -msgid "Wrong value for key \"%s\". Should be Coordinate." -msgstr "\"%s\" Ű °ŞŔĚ Ŕ߸řľĘ. ÁÂÇĽˇÎ ş¸ŔÓ." - -#: ../src/defaults.c:1211 -msgid "can't convert array to integers for \"%s\"." -msgstr "" - -#: ../src/defaults.c:1350 -msgid "Invalid focus mode \"%s\". Should be Manual, Auto or Sloppy." -msgstr "Ŕ߸řľČ ŔŠľľżě ȰźşČ­ ¸đľĺ \"%s\". Manual, Auto, Sloopy ¸Ś ťçżëÇŇ źö ŔÖŔ˝." - -#: ../src/defaults.c:1353 -msgid "Invalid colormap focus mode \"%s\". Should be Manual or Auto." -msgstr "Ŕ߸řľČ ÄĂˇŻ¸Ę Č°źşČ­ ¸đľĺ \"%s\". Manual, Auto ¸Ś ťçżëÇŇ źö ŔÖŔ˝" - -#: ../src/defaults.c:1396 -msgid "Invalid window placement mode \"%s\". Should be Auto, Cascade, Random or Manual." -msgstr "Ŕ߸řľČ ŔŠľľżě ščÄĄ ¸đľĺ \"%s\". Auto, Cascade, Random, Manual Ŕť ťçżëÇŇ źö ŔÖŔ˝." - -#: ../src/defaults.c:1438 -msgid "Invalid geometry display type \"%s\". Should be Center, Corner, Floating or Line." -msgstr "Ŕ߸řľČ Ŕ§ÄĄ ÇĽ˝Ă Çü˝Ä \"%s\". Center, Corner, Floating, Line Ŕť ťçżëÇŇ źö ŔÖŔ˝." - -#: ../src/defaults.c:1485 -msgid "Invalid speed \"%s\". Should be UltraFast, Fast, Medium, Slow or UltraSlow." -msgstr "Ŕ߸řľČ źÓľľ źłÁ¤ \"%s\". UltraFast, Fast, Medium, Slow, UltraSlow ¸Ś ťçżëÇŇ źö ŔÖŔ˝." - -#: ../src/defaults.c:1530 -msgid "Invalid mouse button \"%s\". Should be Left, Middle, Right or Button1 through Button5" -msgstr "Ŕ߸řľČ ¸śżě˝ş šöư \"%s\". Left, Middle, Right, Button1 ~ 5 ¸Ś ťçżëÇŇ źö ŔÖŔ˝" - -#: ../src/defaults.c:1599 ../src/defaults.c:1630 ../src/defaults.c:1642 ../src/defaults.c:1684 ../src/defaults.c:1721 -msgid "\"%s\" is not a valid color name" -msgstr "\"%s\" ´Â ÁŚ´ëˇÎ ľČ ťöťó¸íŔĚ žĆ´Ô" - -#: ../src/defaults.c:1611 -msgid "bad number of arguments in gradient specification" -msgstr "Gradient ˝şĆĺŔÇ ŔÎŔÚ°Ą ¸ÂÁö žĘŔ˝" - -#: ../src/defaults.c:1657 -msgid "too few arguments in multicolor gradient specification" -msgstr "´Ůťö gradient ˝şĆĺŔÇ ŔÎźö°Ą łĘšŤ ŔŰŔ˝" - -#: ../src/defaults.c:1768 -msgid "Error in texture specification for key \"%s\"" -msgstr "" - -#: ../src/defaults.c:1814 ../src/defaults.c:1850 -msgid "Too few elements in array for key \"WorkspaceBack\"." -msgstr "" - -#: ../src/defaults.c:1826 -msgid "Wrong type for workspace background. Should be Texture." -msgstr "šč°ćťö źłÁ¤ŔĚ Ŕ߸řľĘ. TextureˇÎ ş¸ŔÓ." - -#: ../src/defaults.c:1868 -msgid "Cannot get color entry for key \"WorkspaceBack\"." -msgstr "\"WorkspaceBack\" ŰżĄ ÄĂˇŻ Ç׸ńŔť °ĄÁŽżĂ źö žřŔ˝." - -#: ../src/defaults.c:1880 -msgid "key \"WorkspaceBack\" has invalid color \"%s\"" -msgstr "\"WorkspaceBack\" ŰżĄ ŔűŔýÄĄ žĘŔş ťöťó \"%s\"" - -#: ../src/defaults.c:1894 -msgid "Cannot get file entry for key \"WorkspaceBack\"." -msgstr "\"WorkspaceBack\" ŰżĄź­ ĆÄŔĎ Ç׸ńŔť °ĄÁŽżĂ źö žřŔ˝." - -#: ../src/defaults.c:1912 -msgid "could not run \"%s\"" -msgstr "\"%s\" ¸Ś ˝ÇÇŕÇŇ źö žřŔ˝" - -#: ../src/defaults.c:1918 -msgid "could not find background image \"%s\"" -msgstr "šč°ć ŔĚšĚÁö \"%s\" ¸Ś ĂŁÁö ¸řÇÔ" - -#: ../src/defaults.c:1931 -msgid "Error in texture specification for key \"WorkspaceBack\"" -msgstr "" - -#: ../src/defaults.c:1968 -msgid "Invalid justification type \"%s\". Should be Left, Center or Right" -msgstr "Ŕ߸řľČ Áڏń Á¤ˇÄ°Ş \"%s\". Left, Center, Right ¸Ś ťçżëÇŇ źö ŔÖŔ˝" - -#: ../src/defaults.c:2002 -msgid "could not load any usable font" -msgstr "ťçżë °Ą´ÉÇŃ ąŰ˛ĂŔĚ žřŔ˝" - -#: ../src/defaults.c:2032 -msgid "could not get color for key \"%s\"" -msgstr "\"%s\" ŰżĄ ÁöÁ¤ľČ ťöŔť ÇŇ´çÇŇ źö žřŔ˝" - -#: ../src/defaults.c:2091 ../src/rootmenu.c:435 -msgid "%s:invalid key modifier \"%s\"" -msgstr "%s:Ű Modifier \"%s\" °Ą ŔűŔýÄĄ žĘŔ˝" - -#: ../src/defaults.c:2103 -msgid "%s:invalid kbd shortcut specification \"%s\"" -msgstr "%s:Űş¸ľĺ ´ÜĂŕŰ \"%s\" °Ą ŔűŔýÄĄ žĘŔ˝" - -#: ../src/defaults.c:2110 -msgid "%s:invalid key in shortcut \"%s\"" -msgstr "%s:\"%s\" ´ÜĂŕŰżĄ ŔűŔýÄĄ žĘŔş ۰Ą ŔÖŔ˝" - -#: ../src/defaults.c:2136 -msgid "%s: modifier key %s is not valid" -msgstr "%s: Modifier Ű %s °Ą Ŕű´çÄĄ žĘŔ˝" - -#: ../src/defaults.c:2182 -msgid "Invalid icon Position \"%s\". Should be one of blv, blh, brv, brh, tlv, tlh, trv, trh" -msgstr "Ŕ߸řľČ žĆŔĚÄÜ Ŕ§ÄĄ ÁöÁ¤ \"%s\". blv, blh, brv, brh, tlv , tlh, trv, trh ¸Ś ťçżëÇŇ źö ŔÖŔ˝" - -#: ../src/defaults.c:2264 -msgid "could not render texture for icon background" -msgstr "žĆŔĚÄÜ šč°ć ŔĚšĚÁö¸Ś ą×¸ŽÁö ¸řÇÔ" - -#: ../src/defaults.c:2609 -msgid "could not render texture for workspace background" -msgstr "ŔŰž÷°ř°Ł šč°ć ŔĚšĚÁö¸Ś ą×¸ŽÁö ¸řÇÔ" - -#: ../src/dialog.c:67 ../src/dialog.c:79 ../src/dialog.c:162 ../src/dialog.c:498 ../src/dockedapp.c:349 -msgid "OK" -msgstr "" - -#: ../src/dialog.c:67 ../src/dialog.c:72 ../src/dialog.c:162 ../src/dialog.c:505 ../src/dockedapp.c:355 -msgid "Cancel" -msgstr "ĂëźŇ" - -#: ../src/dialog.c:72 ../src/rootmenu.c:206 -msgid "Exit" -msgstr "Ážˇá" - -#: ../src/dialog.c:84 -msgid "Yes" -msgstr "żš" - -#: ../src/dialog.c:84 -msgid "No" -msgstr "žĆ´ĎżŔ" - -#: ../src/dialog.c:257 -msgid "Could not open directory " -msgstr "ľđˇşĹ与¸Ś ż­ źö žřŔ˝ " - -#: ../src/dialog.c:313 -msgid "Could not load image file " -msgstr "ŔĚšĚÁö ĆÄŔĎŔť ŔĐŔť źö žřŔ˝" - -#: ../src/dialog.c:442 -msgid "Directories" -msgstr "ľđˇşĹ与" - -#: ../src/dialog.c:451 -msgid "Icons" -msgstr "žĆŔĚÄÜ" - -#: ../src/dialog.c:488 -msgid "File Name:" -msgstr "ĆÄŔϸí:" - -#: ../src/dialog.c:511 -msgid "Choose File" -msgstr "ĆÄŔĎ źąĹĂ" - -#: ../src/dialog.c:521 -msgid "Icon Chooser" -msgstr "žĆŔĚÄÜ źąĹĂ" - -#: ../src/dock.c:207 -msgid "Type the name for workspace %i:" -msgstr "ŔŰž÷°ř°Ł %i ŔÇ Ŕ̸§Ŕť ŔÔˇÂ:" - -#: ../src/dock.c:208 ../src/dock.c:996 -msgid "Rename Workspace" -msgstr "ŔŰž÷°ř°Ł Ŕ̸§ šŮ˛Ţ" - -#: ../src/dock.c:408 -msgid "Workspace Clip" -msgstr "" - -#: ../src/dock.c:409 -msgid "All selected icons will be removed!" -msgstr "źąĹĂÇŃ ¸đľç žĆŔĚÄÜŔĚ žřžîÁý´Ď´Ů!!" - -#: ../src/dock.c:458 -msgid "Keep Icon" -msgstr "žĆŔĚÄÜ ŔŻÁö" - -#: ../src/dock.c:459 ../src/dock.c:1911 ../src/dock.c:2027 -msgid "Type the command used to launch the application" -msgstr "žÖÇøŽÄÉŔĚźÇ ˝ÇÇŕ ¸íˇÉ" - -#: ../src/dock.c:820 -msgid "could not launch application %s\n" -msgstr "%s žÖÇøŽÄÉŔĚźÇŔť ˝ÇÇŕÇŇ źö žřŔ˝" - -#: ../src/dock.c:875 -msgid "could not create workspace submenu for Clip menu" -msgstr "Clip ¸Ţ´ş¸Ś Ŕ§ÇŃ ŔŰž÷°ř°Ł şÎźÓ¸Ţ´ş¸Ś ¸¸ľéÁö ¸řÇÔ" - -#: ../src/dock.c:933 -msgid "could not create options submenu for Clip menu" -msgstr "Clip ¸Ţ´ş¸Ś Ŕ§ÇŃ żÉźÇ şÎźÓ¸Ţ´ş¸Ś ¸¸ľéÁö ¸řÇÔ" - -#: ../src/dock.c:937 -msgid "Floating Clip" -msgstr "Çםó Ŕ§" - -#: ../src/dock.c:943 -msgid "Collapsed" -msgstr "žĆŔĚÄÜ źűąč" - -#: ../src/dock.c:949 -msgid "AutoCollapse" -msgstr "ŔÚľż źűąč" - -#: ../src/dock.c:955 -msgid "AutoAttract Icons" -msgstr "žĆŔĚÄÜ ŔÚľż ¸đŔ˝" - -#: ../src/dock.c:961 -msgid "Keep Attracted Icons" -msgstr "¸đŔş žĆŔĚÄÜ ŔŻÁö" - -#: ../src/dock.c:985 -msgid "Floating Dock" -msgstr "Çםó Ŕ§" - -#: ../src/dock.c:991 -msgid "Clip Options" -msgstr "Clip żÉźÇ" - -#: ../src/dock.c:998 -msgid "(Un)Select Icon" -msgstr "žĆŔĚÄÜ (žČ)źąĹĂ" - -#: ../src/dock.c:1000 -msgid "(Un)Select All Icons" -msgstr "¸đľç žĆŔĚÄÜ (žČ)źąĹĂ" - -#: ../src/dock.c:1003 -msgid "Keep Icon(s)" -msgstr "žĆŔĚÄÜ ŔŻÁö" - -#: ../src/dock.c:1005 -msgid "Move Icon(s) To" -msgstr "žĆŔĚÄÜ żĹąč" - -#: ../src/dock.c:1010 -msgid "Remove Icon(s)" -msgstr "žĆŔĚÄÜ žřžÚ" - -#: ../src/dock.c:1012 -msgid "Attract Icons" -msgstr "žĆŔĚÄÜ ¸đŔ˝" - -#: ../src/dock.c:1015 -msgid "Launch" -msgstr "˝ÇÇŕ" - -#: ../src/dock.c:1021 -msgid "Settings..." -msgstr "źłÁ¤..." - -#: ../src/dock.c:1405 ../src/dock.c:1419 ../src/dock.c:1433 ../src/dock.c:1443 -msgid "bad value in docked icon state info %s" -msgstr "Dock žĆŔĚÄÜŔÇ ťóĹÂÁ¤ş¸żĄ Ŕ߸řľČ °Ş %s" - -#: ../src/dock.c:1451 -msgid "bad value in docked icon position %i,%i" -msgstr "Dock žĆŔĚÄÜŔÇ Ŕ§ÄĄ°Ş %i,%i ´Â Ŕ߸řľČ °Ş" - -#: ../src/dock.c:1680 -msgid "there are too many icons stored in dock. Ignoring what doesn't fit" -msgstr "Dock żĄ ľéžî°Ł žĆŔĚÄÜŔĚ łĘšŤ ¸šŔ˝. ÇĘżä žř´Â °ÍŔť Áöżě˝Ę˝ĂżŔ" - -#. icon->forced_dock = 1; -#: ../src/dock.c:1910 ../src/dock.c:2026 -msgid "Dock Icon" -msgstr "" - -#: ../src/dock.c:2970 ../src/dock.c:2974 -msgid "Could not execute command \"%s\"" -msgstr "\"%s\" ¸íˇÉŔť ˝ÇÇŕÇŇ źö žřŔ˝." - -#: ../src/dockedapp.c:128 -msgid "could not find icon %s, used in a docked application" -msgstr "ľľĹˇľČ žÖÇĂżĄ ťçżëÇŇ %s žĆŔĚÄÜŔť ĂŁŔť źö žřŔ˝" - -#: ../src/dockedapp.c:205 -msgid "Could not open specified icon file:%s" -msgstr "ÁöÁ¤ľČ žĆŔĚÄÜŔť ż­ źö žřŔ˝:%s" - -#: ../src/dockedapp.c:290 -msgid "Start when WindowMaker is started" -msgstr "ŔŠľľżě¸ŢŔĚÄż°Ą ˝ÇÇŕľÉś§ ˝ÇÇŕÇÔ" - -#: ../src/dockedapp.c:297 -msgid "Application path and arguments" -msgstr "žÖÇøŽÄÉŔĚźÇ PATH, ¸íˇÉžî" - -#: ../src/dockedapp.c:308 -msgid "Command for files dropped with DND" -msgstr "DND ˇÎ ˝ÇÇŕÇŇ ¸íˇÉžî" - -#: ../src/dockedapp.c:320 -msgid "%d will be replaced with the file name" -msgstr "%d żĄ łŃ°Ü šŢŔş ĆÄŔϸíŔť ´ëŔÔÇÔ" - -#: ../src/dockedapp.c:324 -msgid "DND support was not compiled in" -msgstr "ÄÄĆÄŔϽà DND ÁöżřŔĚ Ć÷ÇÔľÇÁö žĘŔ˝" - -#: ../src/dockedapp.c:330 -msgid "Icon Image" -msgstr "žĆŔĚÄÜ ŔĚšĚÁö" - -#: ../src/dockedapp.c:342 ../src/winspector.c:1158 -msgid "Browse..." -msgstr "ĂŁąâ" - -#: ../src/dockedapp.c:387 -msgid "Docked Application Settings" -msgstr "Dock žÖÇøŽÄÉŔĚźÇ źłÁ¤" - -#: ../src/event.c:465 -msgid "stack overflow: too many dead processes" -msgstr "˝şĹĂ żŔšöÇáοě: Á×Ŕş ÇÁˇÎźź˝ş°Ą ¸šŔ˝" - -#: ../src/framewin.c:526 -msgid "could not render gradient: %s" -msgstr "Gradient ¸Ś ÇĽÇöÇĎÁö ¸řÇÔ: %s" - -#: ../src/framewin.c:542 ../src/framewin.c:557 ../src/framewin.c:568 ../src/framewin.c:575 ../src/framewin.c:582 ../src/icon.c:294 ../src/texture.c:496 -msgid "error rendering image:%s" -msgstr "ŔĚšĚÁö ˇť´ő¸ľ żĄˇŻ:%s" - -#: ../src/icon.c:180 ../src/wdefaults.c:399 -msgid "error loading image file \"%s\"" -msgstr "ŔĚšĚÁö ĆÄŔĎ \"%s\"¸Ś ŔĐ´Â Áß żĄˇŻ" - -#: ../src/icon.c:612 -msgid "could not find default icon \"%s\"" -msgstr "ąâşť žĆŔĚÄÜ \"%s\" ĂŁÁö ¸řÇÔ" - -#: ../src/icon.c:618 -msgid "could not load default icon \"%s\":%s" -msgstr "ąâşť žĆŔĚÄÜ \"%s\":%s ŔĐÁö ¸řÇÔ" - -#: ../src/main.c:169 -msgid "Restart failed!!!" -msgstr "Ŕç˝ĂŔŰ ˝ÇĆĐ!!!" - -#: ../src/main.c:185 -msgid "%s aborted.\n" -msgstr "%s Ážˇá.\n" - -#: ../src/main.c:196 -msgid "usage: %s [-options]\n" -msgstr "ťçżëšý: %s [-żÉźÇ]\n" - -#: ../src/main.c:197 -msgid "options:" -msgstr "żÉźÇ:" - -#: ../src/main.c:199 -msgid " -nocpp \t\tdisable preprocessing of configuration files" -msgstr " -nocpp \t\tźłÁ¤ĆÄŔĎŔÇ ˝Ç˝Ă°Ł ŔűżëŔť ťçżë žČÇÔ" - -#: ../src/main.c:201 -msgid " -nodock\t\tdo not open the application Dock" -msgstr " -nodock\t\tžÖÇøŽÄÉŔĚźÇ Dock Ŕť ťçżë žČÇÔ" - -#: ../src/main.c:202 -msgid " -noclip\t\tdo not open the workspace Clip" -msgstr "-noclip\t\tClip Ŕť ťçżë žČÇÔ" - -#. -#. puts(_(" -locale locale locale to use")); -#. -#: ../src/main.c:206 -msgid " -visualid visualid\tvisual id of visual to use" -msgstr "-visualid visualid\tvisual id ¸Ś ťçżëÇÔ" - -#: ../src/main.c:207 -msgid " -display host:dpy\tdisplay to use" -msgstr " -display ČŁ˝şĆŽ:ľđ˝şÇášŔĚ\tťçżëÇŇ ľđ˝şÇášŔĚ" - -#: ../src/main.c:208 -msgid " -version\t\tprint version and exit" -msgstr " -version\t\tšöÁŻŔť ÇĽ˝ĂÇϰí Ážˇá" - -#: ../src/main.c:220 -msgid "" -"could not find user GNUstep directory.\n" -"Make sure you have installed WindowMaker correctly and run wmaker.inst" -msgstr "" -"GNUstep ľđˇşĹ与¸Ś ĂŁŔťźö žř˝Ŕ´Ď´Ů.\n" -"ŔŠľľżě¸ŢŔĚÄż°Ą ÁŚ´ëˇÎ źłÄĄľÇžú´ÂÁö ´Ů˝Ă ČŽŔÎ ČÄ wmaker.inst ¸Ś ˝ÇÇŕÇϽù⠚ٜř´Ď´Ů." - -#: ../src/main.c:241 -msgid "%s:could not execute initialization script" -msgstr "%s: ĂĘąâČ­ ˝şĹЏłĆŽ¸Ś ˝ÇÇŕÇŇ źö žř˝Ŕ´Ď´Ů." - -#: ../src/main.c:298 ../src/main.c:305 ../src/main.c:312 -msgid "too few arguments for %s" -msgstr "%s ¸Ś Ŕ§ÇŃ ŔÎŔÚ°Ą şÎÁˇÇÔ" - -#: ../src/main.c:316 -msgid "bad value for visualid: \"%s\"" -msgstr "Visualid ŔÇ Ŕ߸řľČ °Ş: \"%s\"" - -#: ../src/main.c:359 -msgid "X server does not support locale" -msgstr "X ź­šö°Ą ˇÎÄÉŔĎŔť ÁöżřÇĎÁö žĘŔ˝" - -#: ../src/main.c:362 -msgid "cannot set locale modifiers" -msgstr "ˇÎÄÉŔĎ modifier ¸Ś źłÁ¤ÇŇ źö žřŔ˝" - -#: ../src/main.c:376 -msgid "could not open display \"%s\"" -msgstr "\"%s\" ľđ˝şÇášŔĚ¸Ś ż­Áö ¸řÇÔ." - -#: ../src/menu.c:285 -msgid "wrealloc() failed while trying to add menu item" -msgstr "¸Ţ´ş žĆŔĚĹŰ Ăß°Ą ˝ĂľľÁß wrealloc() ˝ÇĆĐ" - -#: ../src/misc.c:70 -msgid "could not define value for %s for cpp" -msgstr "cpp ŔÇ %s ¸Ś Ŕ§ÇŃ °ŞŔĚ Á¤ŔÇľÇÁö žĘŔ˝" - -#: ../src/misc.c:100 -msgid "could not get password entry for UID %i" -msgstr "UID %i ŔÇ ĆĐ˝şżöľĺ şÎşĐŔť ŔĐŔť źö žřŔ˝" - -#: ../src/misc.c:124 -msgid "your machine is misconfigured. HOSTNAME is set to %s" -msgstr "˝Ă˝şĹŰ źłÁ¤ŔĚ Ŕ߸řľĘ. HOSTNAME Ŕť %s ˇÎ źłÁ¤ÇÔ" - -#: ../src/misc.c:130 -msgid "your machine is misconfigured. HOST is set to %s" -msgstr "˝Ă˝şĹŰ źłÁ¤ŔĚ Ŕ߸řľĘ. HOST ¸Ś %s ˇÎ źłÁ¤ÇÔ" - -#: ../src/misc.c:735 -msgid "selection timed-out" -msgstr "źąĹĂ˝Ă°Ł Ăʰú" - -#: ../src/misc.c:749 -msgid "Program Arguments" -msgstr "ÇÁˇÎą×ˇĽ żÉźÇ" - -#: ../src/misc.c:768 -msgid "Enter command arguments:" -msgstr "¸íˇÉžî:" - -#: ../src/misc.c:789 -msgid "unable to get dropped data from DND drop" -msgstr "" - -#: ../src/misc.c:797 -msgid "error getting dropped data from DND drop" -msgstr "" - -#: ../src/misc.c:803 -msgid "out of memory while getting data from DND drop" -msgstr "" - -#: ../src/misc.c:847 ../src/misc.c:966 -msgid "out of memory during expansion of \"%s\"" -msgstr "\"%s\" ŔÇ ČŽŔĺ Áß ¸Ţ¸đ¸Ž şÎÁˇ" - -#: ../src/misc.c:901 -msgid "out of memory during expansion of \"%w\"" -msgstr "\"%w\" ŔÇ ČŽŔĺ Áß ¸Ţ¸đ¸Ž şÎÁˇ" - -#: ../src/misc.c:920 -msgid "out of memory during expansion of \"%a\"" -msgstr "\"%a\" ŔÇ ČŽŔĺ Áß ¸Ţ¸đ¸Ž şÎÁˇ" - -#: ../src/misc.c:942 -msgid "out of memory during expansion of \"%d\"" -msgstr "\"%d\" ŔÇ ČŽŔĺ Áß ¸Ţ¸đ¸Ž şÎÁˇ" - -#: ../src/misc.c:954 -msgid "selection not available" -msgstr "źąĹĂ şŇ°Ą´É" - -#: ../src/misc.c:1032 ../src/misc.c:1038 -msgid "bad window name value in %s state info" -msgstr "%s ťóĹ Á¤ş¸ŔÇ ŔŠľľżě Ŕ̸§ŔĚ Ŕ߸řľĘ" - -#: ../src/pixmap.c:235 -msgid "could not load mask bitmap file \"%s\". Won't use mask" -msgstr "" - -#: ../src/proplist.c:180 -msgid "unterminated string" -msgstr "" - -#: ../src/proplist.c:247 -msgid "unterminated array" -msgstr "" - -#: ../src/proplist.c:256 -msgid "missing , in array or unterminated array" -msgstr "" - -#: ../src/proplist.c:267 -msgid "could not get array element" -msgstr "" - -#: ../src/proplist.c:297 -msgid "unterminated dictionary" -msgstr "" - -#: ../src/proplist.c:315 -msgid "missing dictionary key" -msgstr "" - -#: ../src/proplist.c:317 -msgid "missing dictionary entry key or unterminated dictionary" -msgstr "" - -#: ../src/proplist.c:323 -msgid "error parsing dictionary key" -msgstr "" - -#: ../src/proplist.c:332 -msgid "missing = in dictionary entry" -msgstr "" - -#: ../src/proplist.c:351 -msgid "missing ; in dictionary entry" -msgstr "" - -#: ../src/proplist.c:432 -msgid "was expecting a string, dictionary, data or array." -msgstr "" - -#: ../src/proplist.c:434 -msgid "Comments are not allowed inside WindowMaker owned domain files." -msgstr "" - -#: ../src/proplist.c:453 -msgid "could not open domain file %s" -msgstr "" - -#: ../src/proplist.c:466 -msgid "extra data after end of file" -msgstr "" - -#: ../src/resources.c:71 -msgid "The following character sets are missing in %s:" -msgstr "" - -#: ../src/resources.c:76 -msgid "The string \"%s\" will be used in place" -msgstr "ŔĚ šŽŔÚźÂŔť ťçżëÇĎ´Â šŽŔÚľéŔş" - -#: ../src/resources.c:78 -msgid "of any characters from those sets." -msgstr "\"%s\" ˇÎ ´ëĂźÇŐ´Ď´Ů." - -#: ../src/resources.c:81 -msgid "could not create font set %s. Trying fixed" -msgstr "%s ąŰ˛Ă źÂŔť ¸¸ľéÁö ¸řÇÔ. ąâşť ąŰ˛ĂˇÎ Ŕç˝Ăľľ" - -#: ../src/resources.c:98 -msgid "could not load font %s. Trying fixed" -msgstr "%s ąŰ˛ĂŔĚ žřŔ˝. ąâşť ąŰ˛ĂˇÎ Ŕç˝Ăľľ" - -#: ../src/resources.c:136 -msgid "could not parse color \"%s\"" -msgstr "\"%s\" ťöŔť ŔνÄÇŇ źö žřŔ˝" - -#: ../src/resources.c:140 -msgid "could not allocate color \"%s\"" -msgstr "\"%s\" ťöŔť ÇŇ´çÇŇ źö žřŔ˝" - -#: ../src/rootmenu.c:162 -msgid "Program \"%s\" not found or cannot be executed." -msgstr "\"%s\" ÇÁˇÎą×ˇĽŔť ĂŁŔť źö žř°ĹłŞ ˝ÇÇŕÇŇ źö žřŔ˝." - -#: ../src/rootmenu.c:207 -msgid "Exit window manager?" -msgstr "ŔŠľľżě °ü¸ŽŔÚ¸Ś ÁžˇáÇϽðڽŔ´Ďąî?" - -#: ../src/rootmenu.c:227 -msgid "Close X session" -msgstr "X ¸Ś ÁžˇáÇŐ´Ď´Ů!" - -#: ../src/rootmenu.c:228 -msgid "" -"Close Window System session?\n" -"(all applications will be closed)" -msgstr "" -"X ¸Ś ÁžˇáÇϽðڽŔ´Ďąî?\n" -"(¸đľç žÖÇøŽÄÉŔĚźÇŔĚ ÁžˇáľË´Ď´Ů)" - -#: ../src/rootmenu.c:230 -msgid "Exiting...\n" -msgstr "Ážˇá...\n" - -#: ../src/rootmenu.c:449 -msgid "%s:invalid kbd shortcut specification \"%s\" for entry %s" -msgstr "" - -#: ../src/rootmenu.c:457 -msgid "%s:invalid key in shortcut \"%s\" for entry %s" -msgstr "" - -#: ../src/rootmenu.c:510 -msgid "%s: unmatched '\"' in menu file" -msgstr "¸Ţ´ş ĆÄŔĎŔÇ '\"' ÂŚŔĚ ¸ÂÁö žĘŔ˝ " - -#: ../src/rootmenu.c:559 -msgid "%s: missing command" -msgstr "%s: ¸íˇÉžî°Ą žřŔ˝" - -#: ../src/rootmenu.c:592 -msgid "invalid OPEN_MENU specification: %s" -msgstr "OPEN_MENU ˝şĆĺŔĚ ŔűŔýÄĄ žĘŔ˝: %s" - -#: ../src/rootmenu.c:657 -msgid "%s:could not stat menu" -msgstr "" - -#: ../src/rootmenu.c:665 -msgid "%s:could not stat menu :%s" -msgstr "" - -#: ../src/rootmenu.c:683 -msgid "too many parameters in OPEN_MENU: %s" -msgstr "OPEN_MENU żĄ ¸Ĺ°ł şŻźö°Ą łĘšŤ ¸šŔ˝: %s" - -#: ../src/rootmenu.c:719 -msgid "There are more than one WORKSPACE_MENU commands in the applications menu. Only one is allowed." -msgstr "" - -#: ../src/rootmenu.c:748 ../src/rootmenu.c:766 -msgid "%s:missing parameter for menu command \"%s\"" -msgstr "%s: ¸Ţ´ş ¸íˇÉžî \"%s\" ŔÇ ŔÎźö°Ą şüÁłŔ˝" - -#: ../src/rootmenu.c:829 -msgid "%s:unknown command \"%s\" in menu config." -msgstr "%s:¸Ţ´ş źłÁ¤ŔÇ \"%s\" ¸íˇÉŔť žË źö žřŔ˝." - -#: ../src/rootmenu.c:837 -msgid "%s:can't add shortcut for entry \"%s\"" -msgstr "" - -#: ../src/rootmenu.c:974 -msgid "%s:maximal line size exceeded in menu config: %s" -msgstr "%s:¸Ţ´ş źłÁ¤ŔÇ ĂÖ´ë ÁŮźö¸Ś ĂʰúÇÔ: %s" - -#: ../src/rootmenu.c:996 ../src/rootmenu.c:1088 ../src/rootmenu.c:1189 -msgid "%s:missing command in menu config: %s" -msgstr "%s:¸Ţ´şżĄ ľîˇĎľČ ¸íˇÉŔť ĂŁŔť źö žřŔ˝: %s" - -#: ../src/rootmenu.c:1026 -msgid "%s:syntax error in menu file:END declaration missing" -msgstr "%s:¸Ţ´şĆÄŔĎ šŽšýżĄˇŻ:END źąžđšŽ žřŔ˝" - -#: ../src/rootmenu.c:1055 ../src/rootmenu.c:1154 -msgid "could not make arguments for menu file preprocessor" -msgstr "" - -#: ../src/rootmenu.c:1061 ../src/rootmenu.c:1161 -msgid "%s:could not open/preprocess menu file" -msgstr "" - -#: ../src/rootmenu.c:1073 ../src/rootmenu.c:1174 -msgid "%s:could not open menu file" -msgstr "%s:¸Ţ´ş ĆÄŔĎŔť ż­Áö ¸řÇÔ" - -#: ../src/rootmenu.c:1100 -msgid "%s:invalid menu file. MENU command is missing" -msgstr "" - -#: ../src/rootmenu.c:1109 -msgid "error reading preprocessed menu data" -msgstr "" - -#: ../src/rootmenu.c:1201 -msgid "%s:no title given for the root menu" -msgstr "%s:ąâşť ¸Ţ´ş Áڏń ÁöÁ¤ľÇÁö žĘŔ˝" - -#: ../src/rootmenu.c:1255 ../src/rootmenu.c:1318 ../src/rootmenu.c:1362 -msgid "out of memory while constructing directory menu %s" -msgstr "%s ľđˇşĹ与 ¸Ţ´ş ťýźş Áß ¸Ţ¸đ¸Ž şÎÁˇ" - -#: ../src/rootmenu.c:1265 -msgid "%s:could not stat file \"%s\" in menu directory" -msgstr "" - -#: ../src/rootmenu.c:1411 -msgid "Commands" -msgstr "¸íˇÉžî" - -#: ../src/rootmenu.c:1413 -msgid "Exit..." -msgstr "Ážˇá..." - -#: ../src/rootmenu.c:1477 -msgid "%s:could not find menu file \"%s\"" -msgstr "%s:\"%s\" ¸Ţ´ş ĆÄŔĎŔť ĂŁÁö ¸řÇÔ" - -#: ../src/rootmenu.c:1484 -msgid "%s:could not access menu \"%s\"" -msgstr "%s:¸Ţ´ş \"%s\" żĄ Á˘ąŮÇĎÁö ¸řÇÔ" - -#: ../src/rootmenu.c:1510 ../src/rootmenu.c:1565 -msgid "%s:format error in root menu configuration \"%s\"" -msgstr "%s: ˇçĆŽ ¸Ţ´ş źłÁ¤ŔÇ \"%s\" Ć÷¸Ë żĄˇŻ" - -#: ../src/screen.c:111 -msgid "it seems that there already is a window manager running" -msgstr "ŔĚšĚ ´Ů¸Ľ ŔŠľľżě ¸Ţ´ĎÁްĄ ŔŰľż Áß" - -#: ../src/screen.c:394 -msgid "could not load logo image for panels" -msgstr "ĆгοĄ ž˛ŔĎ ˇÎ°í ŔĚšĚÁö¸Ś ŔĐÁö ¸řÇÔ" - -#: ../src/screen.c:397 -msgid "error making logo image for panel:%s" -msgstr "ĆгοĄ ž˛ŔĎ ˇÎ°í ŔĚšĚÁö¸Ś ¸¸ľéÁö ¸řÇÔ:%s" - -#: ../src/screen.c:544 -msgid "icon size is configured to %i, but it's too small. Using 16, instead\n" -msgstr "ÁöÁ¤ľČ žĆŔĚÄÜ ĹŠąâ(%i)°Ą łĘšŤ ŔŰŔ˝. 16Ŕ¸ˇÎ šŮ˛Ţ" - -#: ../src/screen.c:587 -msgid "could not initialize graphics library context: %s" -msgstr "ą×ˇĄÇČ śóŔ̺ꡯ¸Ž ČŻ°ćŔť ĂĘąâČ­ ÇŇźö žřŔ˝" - -#: ../src/session.c:113 ../src/wdefaults.c:559 ../src/winspector.c:335 -msgid "can't convert \"%s\" to boolean" -msgstr "" - -#: ../src/stacking.c:88 -msgid "could not get window list!!" -msgstr "ŔŠľľżě ¸Ž˝şĆŽ¸Ś °ĄÁŽ żĂ źö žřŔ˝!!" - -#: ../src/startup.c:163 -msgid "internal X error: %s\n" -msgstr "X łťşÎ żĄˇŻ: %s\n" - -#: ../src/startup.c:225 -msgid "got signal %i (%s) - restarting\n" -msgstr "%i (%s) ˝ĹČŁ °¨Áö - Ŕç˝Ăľż\n" - -#: ../src/startup.c:227 -msgid "got signal %i - restarting\n" -msgstr "%i ˝ĹČŁ °¨Áö - Ŕç˝ĂľżÇÔ\n" - -#: ../src/startup.c:240 -msgid "%s: Received signal SIGTERM. Exiting..." -msgstr "%s: SIGTERM ˝ĹČŁ šŢŔ˝. Ážˇá..." - -#: ../src/startup.c:251 -msgid "got signal %i (%s)\n" -msgstr "%i (%s) ˝ĹČŁ °¨Áö\n" - -#: ../src/startup.c:253 -msgid "got signal %i\n" -msgstr "%i ˝ĹČŁ °¨Áö\n" - -#: ../src/startup.c:258 -msgid "crashed while trying to do some post-crash cleanup. Aborting immediatelly." -msgstr "" - -#: ../src/startup.c:267 -msgid "trying to start alternative window manager..." -msgstr "" - -#: ../src/switchmenu.c:124 -msgid "Windows" -msgstr "ŔŠľľżě ¸Ž˝şĆŽ" - -#: ../src/texture.c:260 -msgid "image file \"%s\" used as texture could not be found." -msgstr "\"%s\" ŔĚšĚÁö ĆÄŔĎŔť ĂŁŔť źö žřŔ˝." - -#: ../src/texture.c:266 -msgid "could not load texture pixmap \"%s\":%s" -msgstr "Texture pixmap \"%s\"Ŕť ż­ źö°Ą žřŔ˝." - -#: ../src/texture.c:362 ../src/texture.c:492 -msgid "could not render texture: %s" -msgstr "Texture ˇť´ő¸ľŔť ÇŇ źö žřŔ˝: %s" - -#: ../src/wdefaults.c:393 -msgid "could not find icon file \"%s\"" -msgstr "\"%s\" žĆŔĚÄÜŔť ĂŁÁö ¸řÇÔ" - -#: ../src/window.c:1931 ../src/window.c:2070 -msgid "" -"the NumLock, ScrollLock or similar key seems to be turned on.\n" -"Turn it off or some mouse actions and keyboard shortcuts will not work." -msgstr "" - -#: ../src/winmenu.c:182 -msgid "could not create workspace submenu for window menu" -msgstr "ŔŠľľżě¸Ţ´ş¸Ś Ŕ§ÇŃ ŔŰž÷°ř°Ł şÎźÓ¸Ţ´ş¸Ś ¸¸ľé źö žřŔ˝" - -#: ../src/winmenu.c:204 -msgid "(Un)Maximize" -msgstr "(žČ)ĂÖ´ëČ­" - -#: ../src/winmenu.c:212 -msgid "Miniaturize" -msgstr "ĂÖźŇČ­" - -#: ../src/winmenu.c:221 -msgid "(Un)Shade" -msgstr "(žČ)°Ą¸˛" - -#: ../src/winmenu.c:229 -msgid "Hide" -msgstr "źűąč" - -#: ../src/winmenu.c:236 -msgid "Hide Others" -msgstr "´Ů¸Ľ °Íľé źűąč" - -#: ../src/winmenu.c:238 -msgid "Select" -msgstr "źąĹĂ" - -#: ../src/winmenu.c:246 -msgid "Move To" -msgstr "żĹąč" - -#: ../src/winmenu.c:251 -msgid "Attributes..." -msgstr "źÓźş źłÁ¤" - -#: ../src/winmenu.c:253 -msgid "Close" -msgstr "´Ýąâ" - -#: ../src/winspector.c:274 -msgid "Could not find icon \"%s\" specified for this window" -msgstr "ŔĚ ŔŠľľżěżĄź­ ťçżëÇĎ´Â \"%s\" žĆŔĚÄÜŔť ĂŁŔť źö žřŔ˝" - -#: ../src/winspector.c:287 -msgid "Could not open specified icon \"%s\":%s" -msgstr "ÁöÁ¤ľČ \"%s\" žĆŔĚÄÜŔť ż­ źö žřŔ˝:%s" - -#: ../src/winspector.c:958 -msgid "Save" -msgstr "ŔúŔĺ" - -#: ../src/winspector.c:964 -msgid "Apply" -msgstr "Ŕűżë" - -#: ../src/winspector.c:970 -msgid "Revert" -msgstr "şšą¸" - -#. *** window spec *** -#: ../src/winspector.c:979 ../src/winspector.c:987 -msgid "Window Specification" -msgstr "ŔŠľľżě źąĹĂ" - -#: ../src/winspector.c:980 -msgid "Window Attributes" -msgstr "ŔŠľľżě źÓźş" - -#: ../src/winspector.c:981 -msgid "Advanced Options" -msgstr "°íąŢ żÉźÇ" - -#: ../src/winspector.c:982 -msgid "Icon and Initial Workspace" -msgstr "žĆŔĚÄÜ, ĂĘąâ ŔŰž÷°ř°Ł" - -#: ../src/winspector.c:983 -msgid "Application Specific" -msgstr "žÖÇøŽÄÉŔĚźÇ" - -#: ../src/winspector.c:995 -msgid "Defaults for all windows" -msgstr "ŔŠľľżě ąâşť°Ş" - -#: ../src/winspector.c:1031 -msgid "" -"The configuration will apply to all\n" -"windows that have their WM_CLASS property set to the above selected\n" -"name, when saved." -msgstr "" -"źłÁ¤Ŕť ŔúŔĺÇϸé Ŕ§żĄ źąĹĂÇŃ Ŕ̸§Ŕť Ć÷ÇÔÇĎ´Â WM_CLASS źÓźşŔť °ĄÁö´Â ¸đľç " -"ŔŠľľżěżĄ ą× źłÁ¤ŔĚ ŔűżëľË´Ď´Ů.\n" - -#: ../src/winspector.c:1038 -msgid "Attributes" -msgstr "źÓźş źąĹĂ Ç׸ń" - -#: ../src/winspector.c:1048 -msgid "Disable titlebar" -msgstr "ŸŔĚƲšŮ źűąč" - -#: ../src/winspector.c:1052 -msgid "Disable resizebar" -msgstr "ĹŠąâÁśÁ¤šŮ źűąč" - -#: ../src/winspector.c:1056 -msgid "Disable close button" -msgstr "´Ýąâ šöư žřžÚ" - -#: ../src/winspector.c:1060 -msgid "Disable miniaturize button" -msgstr "ĂÖźŇČ­ šöư žřžÚ" - -#: ../src/winspector.c:1064 -msgid "Keep on top" -msgstr "Çםó Ŕ§" - -#: ../src/winspector.c:1068 -msgid "Omnipresent" -msgstr "Ç×ťó ş¸ŔÓ" - -#: ../src/winspector.c:1072 -msgid "Start Miniaturized" -msgstr "ĂÖźŇČ­ÇĎżŠ ˝ÇÇŕ" - -#: ../src/winspector.c:1076 -msgid "Skip window list" -msgstr "ŔŠľľżě ¸Ž˝şĆŽżĄź­ ÁŚżÜ" - -#: ../src/winspector.c:1090 -msgid "Advanced" -msgstr "°íąŢ źąĹĂ Ç׸ń" - -#: ../src/winspector.c:1100 -msgid "Ignore HideOthers" -msgstr "´Ů¸Ľ °Íľé źűąč šŤ˝Ă" - -#: ../src/winspector.c:1104 -msgid "Don't bind keyboard shortcuts" -msgstr "´ÜĂŕŰ ťçżë şŇ°Ą" - -#: ../src/winspector.c:1108 -msgid "Don't bind mouse clicks" -msgstr "¸śżě˝ş ĹŹ¸Ż ťçżë şŇ°Ą" - -#: ../src/winspector.c:1112 -msgid "Keep inside screen" -msgstr "Çםó Č­¸éžČżĄ Ŕ§ÄĄ" - -#: ../src/winspector.c:1116 -msgid "Don't let it take focus" -msgstr "ȰźşČ­ žČľĘ" - -#: ../src/winspector.c:1120 -msgid "Don't Save Session" -msgstr "źźźÇŔť ŔúŔĺÇĎÁö žĘŔ˝" - -#: ../src/winspector.c:1124 -msgid "Emulate Application Icon" -msgstr "" - -#: ../src/winspector.c:1139 -msgid "Enable the \"Don't bind...\" options to allow the application to receive all mouse or keyboard events." -msgstr " " - -#: ../src/winspector.c:1146 -msgid "Miniwindow Image" -msgstr "žĆŔĚÄÜ" - -#: ../src/winspector.c:1164 -msgid "Update" -msgstr "°ť˝Ĺ" - -#: ../src/winspector.c:1169 -msgid "Icon file name:" -msgstr "žĆŔĚÄÜ ĆÄŔϸí:" - -#: ../src/winspector.c:1179 -msgid "Ignore client supplied icon" -msgstr "žÖÇøŽÄÉŔĚźÇ žĆŔĚÄÜ šŤ˝Ă" - -#: ../src/winspector.c:1185 -msgid "Initial Workspace" -msgstr "ĂĘąâ ŔŰž÷°ř°Ł" - -#: ../src/winspector.c:1191 -msgid "Nowhere in particular" -msgstr "ĆŻş°ÇŃ źłÁ¤ žřŔ˝" - -#: ../src/winspector.c:1222 -msgid "Application Wide" -msgstr "žÖÇøŽÄÉŔĚźÇ" - -#: ../src/winspector.c:1232 -msgid "Start Hidden" -msgstr "źű°Üź­ ˝ÇÇŕ" - -#: ../src/winspector.c:1236 -msgid "No application icon" -msgstr "žÖÇøŽÄÉŔĚźÇ žĆŔĚÄÜ ťçżë žČÇÔ" - -#: ../src/workspace.c:89 ../src/workspace.c:90 ../src/workspace.c:390 -msgid "Workspace %i" -msgstr "" - -#: ../src/workspace.c:439 -msgid "Workspaces" -msgstr "ŔŰž÷°ř°Ł" - -#: ../src/workspace.c:441 -msgid "could not create Workspace menu" -msgstr "ŔŰž÷°ř°Ł ¸Ţ´ş¸Ś ¸¸ľéźö žřŔ˝" - -#: ../src/workspace.c:448 -msgid "New" -msgstr "ťő ŔŰž÷°ř°Ł ¸¸ľë" - -#: ../src/workspace.c:449 -msgid "Destroy Last" -msgstr "¸śÁö¸ˇ ŔŰž÷°ř°Ł žřžÚ" - -#: ../src/xutil.c:220 -msgid "invalid data in selection" -msgstr "" +# Korean message file for WindowMaker +# Last Update: version 0.20.2 +# +msgid "" +msgstr "" +"Date: 1998-07-21 00:20:01+0900\n" +"From: Byeong-Chan, Kim \n" +"Language-Team: Korean \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=EUC-KR\n" +"Content-Transfer-Encoding: 8-bit\n" +"Xgettext-Options: --default-domain=WindowMaker --add-comments --keyword=_\n" +"Files: ../main.c ../event.c ../window.c ../startup.c ../shutdown.c ../wcore.c ../properties.c ../texture.c ../actions.c ../menu.c ../client.c ../pixmap.c ../image.c ../gradient.c ../button.c ../screen.c ../icon.c ../rootmenu.c ../dialog.c ../resource.c ../moveres.c ../application.c ../colormap.c ../raster.c ../placement.c ../misc.c ../appmenu.c ../keybind.c ../stacking.c ../appicon.c ../switchmenu.c ../dock.c ../winmenu.c\n" + +#: ../src/appicon.c:509 ../src/dialog.c:215 ../src/dialog.c:271 ../src/dock.c:2955 ../src/dockedapp.c:206 ../src/winspector.c:279 ../src/winspector.c:295 +msgid "Error" +msgstr "żĄˇŻ" + +#: ../src/appicon.c:510 +msgid "Could not open specified icon file" +msgstr "ÁöÁ¤ľČ žĆŔĚÄÜ ż­Áö ¸řÇÔ" + +#: ../src/appicon.c:511 ../src/dialog.c:114 ../src/dialog.c:215 ../src/dialog.c:271 ../src/dialog.c:451 ../src/dock.c:420 ../src/dock.c:2956 ../src/dockedapp.c:206 ../src/dockedapp.c:350 ../src/winspector.c:280 ../src/winspector.c:296 +msgid "OK" +msgstr "" + +#: ../src/appicon.c:532 ../src/dock.c:268 ../src/winmenu.c:85 +msgid "Kill Application" +msgstr "°­ÁŚ Ážˇá" + +#: ../src/appicon.c:533 ../src/dock.c:269 ../src/winmenu.c:86 +msgid "" +"This will kill the application.\n" +"Any unsaved changes will be lost.\n" +"Please confirm." +msgstr "" +"žÖÇøŽÄÉŔĚźÇŔť °­ÁŚ ÁžˇáÇŐ´Ď´Ů.\n" +"ŔúŔĺľÇÁö žĘŔş ş´°ć ťçÇ×Ŕť ŔŇ°Ô ľË´Ď´Ů.\n" +"ÁžˇáÇϽðڽŔ´Ďąî?" + +#: ../src/appicon.c:534 ../src/dock.c:270 ../src/winmenu.c:87 +msgid "Yes" +msgstr "żš" + +#: ../src/appicon.c:534 ../src/dock.c:270 ../src/winmenu.c:87 +msgid "No" +msgstr "žĆ´ĎżŔ" + +#: ../src/appicon.c:548 ../src/dock.c:1030 +msgid "Unhide Here" +msgstr "źűąä °Í Ŕ̰÷żĄ ş¸ŔÓ" + +#: ../src/appicon.c:549 ../src/dock.c:1032 +msgid "(Un)Hide" +msgstr "(žČ)źűąč" + +#: ../src/appicon.c:550 +msgid "Set Icon..." +msgstr "žĆŔĚÄÜ źłÁ¤" + +#: ../src/appicon.c:551 ../src/dock.c:1036 ../src/winmenu.c:260 +msgid "Kill" +msgstr "°­ÁŚ Ážˇá" + +#: ../src/defaults.c:670 ../src/startup.c:681 ../src/startup.c:699 ../src/startup.c:705 +msgid "could not read domain \"%s\" from defaults database" +msgstr "" + +#: ../src/defaults.c:716 ../src/defaults.c:840 ../src/defaults.c:879 ../src/defaults.c:909 +msgid "Domain %s (%s) of defaults database is corrupted!" +msgstr "" + +#: ../src/defaults.c:721 ../src/defaults.c:861 ../src/defaults.c:892 ../src/defaults.c:918 +msgid "could not load domain %s from user defaults database" +msgstr "" + +#: ../src/defaults.c:732 ../src/defaults.c:825 +msgid "Domain %s (%s) of global defaults database is corrupted!" +msgstr "" + +#: ../src/defaults.c:751 ../src/defaults.c:830 +msgid "could not load domain %s from global defaults database" +msgstr "" + +#: ../src/defaults.c:1220 +msgid "wrong option value for key \"%s\". Should be one of %s" +msgstr "" + +#: ../src/defaults.c:1267 +msgid "can't convert \"%s\" to boolean for key \"%s\"" +msgstr "" + +#: ../src/defaults.c:1272 ../src/defaults.c:1306 ../src/defaults.c:1338 ../src/defaults.c:1351 ../src/defaults.c:1366 ../src/defaults.c:1381 ../src/defaults.c:1452 ../src/defaults.c:1464 ../src/defaults.c:1719 ../src/defaults.c:1733 ../src/defaults.c:1771 ../src/defaults.c:1783 ../src/defaults.c:1795 ../src/defaults.c:1818 ../src/defaults.c:1845 ../src/defaults.c:1858 ../src/defaults.c:1871 ../src/defaults.c:1901 ../src/defaults.c:1942 ../src/defaults.c:1954 ../src/defaults.c:1966 ../src/defaults.c:1992 ../src/defaults.c:2012 ../src/defaults.c:2025 ../src/defaults.c:2040 ../src/defaults.c:2079 ../src/defaults.c:2144 +msgid "using default \"%s\" instead" +msgstr "ąâşť°Ş \"%s\" ¸Ś ´ë˝Ĺ ťçżë" + +#: ../src/defaults.c:1303 +msgid "can't convert \"%s\" to integer for key \"%s\"" +msgstr "\"%s\" ŔÎ \"%s\" ŰŔÇ °ŞŔť Á¤źöÇüŔ¸ˇÎ şŻČŻ ¸řÇÔ" + +#: ../src/defaults.c:1333 ../src/defaults.c:1447 ../src/defaults.c:1714 ../src/defaults.c:1766 ../src/defaults.c:1937 ../src/wdefaults.c:544 ../src/wdefaults.c:580 +msgid "Wrong option format for key \"%s\". Should be %s." +msgstr "\"%s\" Ű żÉźÇ Ć÷¸ËŔĚ Ŕ߸řľĘ. %sŔÎ °Ĺ °°Ŕ˝." + +#: ../src/defaults.c:1346 +msgid "Incorrect number of elements in array for key \"%s\"." +msgstr "\"%s\" Ű şÎşĐŔÇ ŔÎŔÚ źö°Ą ¸ÂÁö žĘŔ˝" + +#: ../src/defaults.c:1361 +msgid "Wrong value for key \"%s\". Should be Coordinate." +msgstr "\"%s\" Ű °ŞŔĚ Ŕ߸řľĘ. ÁÂÇĽˇÎ ş¸ŔÓ." + +#: ../src/defaults.c:1376 +msgid "can't convert array to integers for \"%s\"." +msgstr "\"%s\" ŔÇ °ŞŔť Á¤źöÇüŔ¸ˇÎ şŻČŻÄĄ ¸řÇÔ." + +#: ../src/defaults.c:1560 ../src/defaults.c:1591 ../src/defaults.c:1603 ../src/defaults.c:1645 ../src/defaults.c:1685 +msgid "\"%s\" is not a valid color name" +msgstr "\"%s\" ´Â ÁŚ´ëˇÎ ľČ ťöťó¸íŔĚ žĆ´Ô" + +#: ../src/defaults.c:1572 +msgid "bad number of arguments in gradient specification" +msgstr "Gradient ˝şĆĺŔÇ ŔÎŔÚ°Ą ¸ÂÁö žĘŔ˝" + +#: ../src/defaults.c:1618 +msgid "too few arguments in multicolor gradient specification" +msgstr "´Ůťö gradient ˝şĆĺŔÇ ŔÎźö°Ą łĘšŤ ŔŰŔ˝" + +#: ../src/defaults.c:1728 +msgid "Error in texture specification for key \"%s\"" +msgstr "" + +#: ../src/defaults.c:1779 ../src/defaults.c:1814 ../src/defaults.c:1950 ../src/defaults.c:1988 +msgid "Too few elements in array for key \"WorkspaceBack\"." +msgstr "WorkspaceBack Ű şÎşĐŔÇ ŔÎŔÚ°Ą łĘšŤ ŔűŔ˝" + +#: ../src/defaults.c:1791 ../src/defaults.c:1962 +msgid "Wrong type for workspace background. Should be Texture." +msgstr "šč°ćťö źłÁ¤ŔĚ Ŕ߸řľĘ. TextureˇÎ ş¸ŔÓ." + +#: ../src/defaults.c:1841 ../src/defaults.c:2008 +msgid "Cannot get color entry for key \"WorkspaceBack\"." +msgstr "\"WorkspaceBack\" ŰżĄ ÄĂˇŻ Ç׸ńŔť °ĄÁŽżĂ źö žřŔ˝." + +#: ../src/defaults.c:1853 ../src/defaults.c:2020 +msgid "key \"WorkspaceBack\" has invalid color \"%s\"" +msgstr "\"WorkspaceBack\" ŰżĄ ŔűŔýÄĄ žĘŔş ťöťó \"%s\"" + +#: ../src/defaults.c:1867 ../src/defaults.c:2036 +msgid "Cannot get file entry for key \"WorkspaceBack\"." +msgstr "\"WorkspaceBack\" ŰżĄź­ ĆÄŔĎ Ç׸ńŔť °ĄÁŽżĂ źö žřŔ˝." + +#: ../src/defaults.c:1880 ../src/defaults.c:2061 +msgid "could not find background image \"%s\"" +msgstr "šč°ć ŔĚšĚÁö \"%s\" ¸Ś ĂŁÁö ¸řÇÔ" + +#: ../src/defaults.c:1897 ../src/defaults.c:2075 +msgid "Error in texture specification for key \"WorkspaceBack\"" +msgstr "" + +#: ../src/defaults.c:2056 +msgid "could not run \"%s\"" +msgstr "\"%s\" ¸Ś ˝ÇÇŕÇŇ źö žřŔ˝" + +#: ../src/defaults.c:2109 +msgid "could not load any usable font" +msgstr "ťçżë °Ą´ÉÇŃ ąŰ˛ĂŔĚ žřŔ˝" + +#: ../src/defaults.c:2139 +msgid "could not get color for key \"%s\"" +msgstr "\"%s\" ŰżĄ ÁöÁ¤ľČ ťöŔť ÇŇ´çÇŇ źö žřŔ˝" + +#: ../src/defaults.c:2198 ../src/rootmenu.c:440 +msgid "%s:invalid key modifier \"%s\"" +msgstr "%s:Ű Modifier \"%s\" °Ą ŔűŔýÄĄ žĘŔ˝" + +#: ../src/defaults.c:2210 +msgid "%s:invalid kbd shortcut specification \"%s\"" +msgstr "%s:Űş¸ľĺ ´ÜĂŕŰ \"%s\" °Ą ŔűŔýÄĄ žĘŔ˝" + +#: ../src/defaults.c:2217 +msgid "%s:invalid key in shortcut \"%s\"" +msgstr "%s:\"%s\" ´ÜĂŕŰżĄ ŔűŔýÄĄ žĘŔş ۰Ą Á¸ŔçÇÔ" + +#: ../src/defaults.c:2243 +msgid "%s: modifier key %s is not valid" +msgstr "%s: Modifier Ű %s °Ą Ŕű´çÄĄ žĘŔ˝" + +#: ../src/defaults.c:2319 +msgid "could not render texture for icon background" +msgstr "žĆŔĚÄÜ šč°ć ŔĚšĚÁö¸Ś ą×¸ŽÁö ¸řÇÔ" + +#: ../src/defaults.c:2675 +msgid "background texture rendering was unsuccessfull" +msgstr "šč°ć Č­¸é ťýźşżĄ ˝ÇĆĐÇÔ" + +#: ../src/defaults.c:2702 +msgid "could not load image %s for option %s:%s\n" +msgstr "ŔĚšĚÁö %s ¸Ś ŔĐÁö ¸řÇÔ. żÉźÇ %s:%s" + +#: ../src/defaults.c:2718 +msgid "could not spawn texture rendering subprocess for option" +msgstr "" + +#: ../src/defaults.c:2772 ../src/defaults.c:2860 +msgid "could not render texture for workspace background" +msgstr "ŔŰž÷°ř°Ł šč°ć ŔĚšĚÁö¸Ś ą×¸ŽÁö ¸řÇÔ" + +#: ../src/dialog.c:114 ../src/dialog.c:458 ../src/dock.c:420 ../src/dockedapp.c:356 ../src/rootmenu.c:207 ../src/rootmenu.c:236 +msgid "Cancel" +msgstr "ĂëźŇ" + +#: ../src/dialog.c:210 +msgid "Could not open directory " +msgstr "ľđˇşĹ与¸Ś ż­ źö žřŔ˝ " + +#: ../src/dialog.c:266 +msgid "Could not load image file " +msgstr "ŔĚšĚÁö ĆÄŔĎŔť ŔĐŔť źö žřŔ˝ " + +#: ../src/dialog.c:395 +msgid "Directories" +msgstr "ľđˇşĹ与" + +#: ../src/dialog.c:404 +msgid "Icons" +msgstr "žĆŔĚÄÜ" + +#: ../src/dialog.c:441 +msgid "File Name:" +msgstr "ĆÄŔϸí:" + +#: ../src/dialog.c:464 +msgid "Choose File" +msgstr "ĆÄŔĎ źąĹĂ" + +#: ../src/dialog.c:474 +msgid "Icon Chooser" +msgstr "žĆŔĚÄÜ źąĹĂ" + +#: ../src/dock.c:209 +msgid "Type the name for workspace %i:" +msgstr "ŔŰž÷°ř°Ł %i ŔÇ Ŕ̸§Ŕť ŔÔˇÂ:" + +#: ../src/dock.c:210 ../src/dock.c:1009 +msgid "Rename Workspace" +msgstr "ŔŰž÷°ř°Ł Ŕ̸§ šŮ˛Ţ" + +#: ../src/dock.c:418 +msgid "Workspace Clip" +msgstr "" + +#: ../src/dock.c:419 +msgid "All selected icons will be removed!" +msgstr "źąĹĂÇŃ ¸đľç žĆŔĚÄÜŔĚ žřžîÁý´Ď´Ů!!" + +#: ../src/dock.c:469 +msgid "Keep Icon" +msgstr "žĆŔĚÄÜ ŔŻÁö" + +#: ../src/dock.c:470 ../src/dock.c:1926 ../src/dock.c:2048 +msgid "Type the command used to launch the application" +msgstr "žÖÇøŽÄÉŔĚźÇ ˝ÇÇŕ ¸íˇÉ" + +#: ../src/dock.c:833 +msgid "could not launch application %s\n" +msgstr "%s žÖÇøŽÄÉŔĚźÇŔť ˝ÇÇŕÇŇ źö žřŔ˝\n" + +#: ../src/dock.c:888 +msgid "could not create workspace submenu for Clip menu" +msgstr "Clip ¸Ţ´ş¸Ś Ŕ§ÇŃ ŔŰž÷°ř°Ł şÎźÓ¸Ţ´ş¸Ś ¸¸ľéÁö ¸řÇÔ" + +#: ../src/dock.c:946 +msgid "could not create options submenu for Clip menu" +msgstr "Clip ¸Ţ´ş¸Ś Ŕ§ÇŃ żÉźÇ şÎźÓ¸Ţ´ş¸Ś ¸¸ľéÁö ¸řÇÔ" + +#: ../src/dock.c:950 +msgid "Keep Clip On Top" +msgstr "Clip Ç×ťó ş¸ŔÓ" + +#: ../src/dock.c:956 +msgid "Collapsed" +msgstr "žĆŔĚÄÜ źűąč" + +#: ../src/dock.c:962 +msgid "AutoCollapse" +msgstr "ŔÚľż źűąč" + +#: ../src/dock.c:968 +msgid "AutoAttract Icons" +msgstr "žĆŔĚÄÜ ŔÚľż ¸đŔ˝" + +#: ../src/dock.c:974 +msgid "Keep Attracted Icons" +msgstr "¸đŔş žĆŔĚÄÜ ŔŻÁö" + +#: ../src/dock.c:998 +msgid "Keep Dock On Top" +msgstr "Dock Ç×ťó ş¸ŔÓ" + +#: ../src/dock.c:1004 +msgid "Clip Options" +msgstr "Clip żÉźÇ" + +#: ../src/dock.c:1011 +msgid "(Un)Select Icon" +msgstr "žĆŔĚÄÜ (žČ)źąĹĂ" + +#: ../src/dock.c:1013 +msgid "(Un)Select All Icons" +msgstr "¸đľç žĆŔĚÄÜ (žČ)źąĹĂ" + +#: ../src/dock.c:1016 +msgid "Keep Icon(s)" +msgstr "žĆŔĚÄÜ ŔŻÁö" + +#: ../src/dock.c:1018 +msgid "Move Icon(s) To" +msgstr "žĆŔĚÄÜ żĹąč" + +#: ../src/dock.c:1023 +msgid "Remove Icon(s)" +msgstr "žĆŔĚÄÜ žřžÚ" + +#: ../src/dock.c:1025 +msgid "Attract Icons" +msgstr "žĆŔĚÄÜ ¸đŔ˝" + +#: ../src/dock.c:1028 +msgid "Launch" +msgstr "˝ÇÇŕ" + +#: ../src/dock.c:1034 +msgid "Settings..." +msgstr "źłÁ¤..." + +#: ../src/dock.c:1418 ../src/dock.c:1432 ../src/dock.c:1446 ../src/dock.c:1456 +msgid "bad value in docked icon state info %s" +msgstr "Dock žĆŔĚÄÜŔÇ ťóĹÂÁ¤ş¸żĄ Ŕ߸řľČ °Ş %s" + +#: ../src/dock.c:1464 +msgid "bad value in docked icon position %i,%i" +msgstr "Dock žĆŔĚÄÜŔÇ Ŕ§ÄĄ°Ş %i,%i ´Â Ŕ߸řľČ °Ş" + +#: ../src/dock.c:1693 +msgid "there are too many icons stored in dock. Ignoring what doesn't fit" +msgstr "Dock żĄ ľéžî°Ł žĆŔĚÄÜŔĚ łĘšŤ ¸šŔ˝. ÇĘżä žř´Â °ÍŔť Áöżě˝Ę˝ĂżŔ" + +#: ../src/dock.c:1925 ../src/dock.c:2047 +msgid "Dock Icon" +msgstr "" + +#: ../src/dock.c:2948 ../src/dock.c:2952 +msgid "Could not execute command \"%s\"" +msgstr "\"%s\" ¸íˇÉŔť ˝ÇÇŕÇŇ źö žřŔ˝." + +#: ../src/dockedapp.c:128 +msgid "could not find icon %s, used in a docked application" +msgstr "ľľĹˇľČ žÖÇĂżĄ ťçżëÇŇ %s žĆŔĚÄÜŔť ĂŁŔť źö žřŔ˝" + +#: ../src/dockedapp.c:205 +msgid "Could not open specified icon file:%s" +msgstr "ÁöÁ¤ľČ žĆŔĚÄÜŔť ż­ źö žřŔ˝:%s" + +#: ../src/dockedapp.c:291 +msgid "Start when WindowMaker is started" +msgstr "ŔŠľľżě¸ŢŔĚÄż°Ą ˝ÇÇŕľÉś§ ˝ÇÇŕÇÔ" + +#: ../src/dockedapp.c:298 +msgid "Application path and arguments" +msgstr "žÖÇøŽÄÉŔĚźÇ PATH, ¸íˇÉžî" + +#: ../src/dockedapp.c:309 +msgid "Command for files dropped with DND" +msgstr "DND ˇÎ ˝ÇÇŕÇŇ ¸íˇÉžî" + +#: ../src/dockedapp.c:321 +msgid "%d will be replaced with the file name" +msgstr "%d żĄ łŃ°Ü šŢŔş ĆÄŔϸíŔť ´ëŔÔÇÔ" + +#: ../src/dockedapp.c:325 +msgid "DND support was not compiled in" +msgstr "ÄÄĆÄŔϽà DND ÁöżřŔĚ Ć÷ÇÔľÇÁö žĘŔ˝" + +#: ../src/dockedapp.c:331 +msgid "Icon Image" +msgstr "žĆŔĚÄÜ ŔĚšĚÁö" + +#: ../src/dockedapp.c:343 ../src/winspector.c:1191 +msgid "Browse..." +msgstr "ĂŁąâ" + +#: ../src/dockedapp.c:388 +msgid "Docked Application Settings" +msgstr "Dock žÖÇøŽÄÉŔĚźÇ źłÁ¤" + +#: ../src/event.c:366 +msgid "stack overflow: too many dead processes" +msgstr "˝şĹĂ żŔšöÇáοě: Á×Ŕş ÇÁˇÎźź˝ş°Ą ¸šŔ˝" + +#: ../src/framewin.c:526 +msgid "could not render gradient: %s" +msgstr "Gradient ¸Ś ÇĽÇöÇĎÁö ¸řÇÔ: %s" + +#: ../src/framewin.c:542 ../src/framewin.c:557 ../src/framewin.c:568 ../src/framewin.c:575 ../src/framewin.c:582 ../src/icon.c:296 ../src/texture.c:492 +msgid "error rendering image:%s" +msgstr "ŔĚšĚÁö ˇť´ő¸ľ żĄˇŻ:%s" + +#: ../src/icon.c:182 ../src/wdefaults.c:402 +msgid "error loading image file \"%s\"" +msgstr "ŔĚšĚÁö ĆÄŔĎ \"%s\"¸Ś ŔĐ´Â Áß żĄˇŻ" + +#: ../src/icon.c:428 ../src/icon.c:437 +msgid "could not create directory %s" +msgstr "%s ľđˇşĹ与 ťýźş ˝ÇĆĐ" + +#: ../src/icon.c:702 +msgid "could not find default icon \"%s\"" +msgstr "ąâşť žĆŔĚÄÜ \"%s\" ĂŁÁö ¸řÇÔ" + +#: ../src/icon.c:708 +msgid "could not load default icon \"%s\":%s" +msgstr "ąâşť žĆŔĚÄÜ \"%s\":%s ŔĐÁö ¸řÇÔ" + +#: ../src/main.c:185 +msgid "could not exec window manager" +msgstr "ŔŠľľżě °ü¸ŽŔÚ¸Ś ˝ÇÇŕÇŇ źö žřŔ˝" + +#: ../src/main.c:186 +msgid "Restart failed!!!" +msgstr "Ŕç˝ĂŔŰ ˝ÇĆĐ!!!" + +#: ../src/main.c:233 +msgid "%s aborted.\n" +msgstr "%s Ážˇá.\n" + +#: ../src/main.c:244 +msgid "usage: %s [-options]\n" +msgstr "ťçżëšý: %s [-żÉźÇ]\n" + +#: ../src/main.c:245 +msgid "options:" +msgstr "żÉźÇ:" + +#: ../src/main.c:247 +msgid " -nocpp \t\tdisable preprocessing of configuration files" +msgstr " -nocpp \t\tźłÁ¤ĆÄŔĎŔÇ ˝Ç˝Ă°Ł ŔűżëŔť ťçżë žČÇÔ" + +#: ../src/main.c:249 +msgid " -nodock\t\tdo not open the application Dock" +msgstr " -nodock\t\tžÖÇøŽÄÉŔĚźÇ Dock Ŕť ťçżë žČÇÔ" + +#: ../src/main.c:250 +msgid " -noclip\t\tdo not open the workspace Clip" +msgstr "-noclip\t\tClip Ŕť ťçżë žČÇÔ" + +#. +#. puts(_(" -locale locale locale to use")); +#. +#: ../src/main.c:254 +msgid " -visualid visualid\tvisual id of visual to use" +msgstr "-visualid visualid\tvisual id ¸Ś ťçżëÇÔ" + +#: ../src/main.c:255 +msgid " -display host:dpy\tdisplay to use" +msgstr " -display ČŁ˝şĆŽ:ľđ˝şÇášŔĚ\tťçżëÇŇ ľđ˝şÇášŔĚ" + +#: ../src/main.c:256 +msgid " -version\t\tprint version and exit" +msgstr " -version\t\tšöÁŻŔť ÇĽ˝ĂÇϰí Ážˇá" + +#: ../src/main.c:268 +msgid "" +"could not find user GNUstep directory (%s).\n" +"Make sure you have installed Window Maker correctly and run wmaker.inst" +msgstr "" +"ťçżëŔÚŔÇ GNUstep ľđˇşĹ与 (%s)¸Ś ĂŁŔť źö žřŔ˝.\n" +"ŔŠľľżě ¸ŢŔĚÄż¸Ś ÁŚ´ëˇÎ źłÄĄÇß´ÂÁö ČŽŔÎÇϰí wmaker.inst ¸Ś ˝ÇÇŕÇϽÿŔ" + +#: ../src/main.c:290 +msgid "%s:could not execute initialization script" +msgstr "%s: ĂĘąâČ­ ˝şĹЏłĆŽ¸Ś ˝ÇÇŕÇŇ źö žř˝Ŕ´Ď´Ů." + +#: ../src/main.c:309 +msgid "%s:could not execute exit script" +msgstr "%s:Ážˇá ˝şĹЏłĆŽ¸Ś ˝ÇÇŕÇĎÁö ¸řÇÔ" + +#: ../src/main.c:366 ../src/main.c:373 ../src/main.c:380 +msgid "too few arguments for %s" +msgstr "%s ¸Ś Ŕ§ÇŃ ŔÎŔÚ°Ą şÎÁˇÇÔ" + +#: ../src/main.c:384 +msgid "bad value for visualid: \"%s\"" +msgstr "Visualid ŔÇ Ŕ߸řľČ °Ş: \"%s\"" + +#: ../src/main.c:425 +msgid "X server does not support locale" +msgstr "X ź­šö°Ą ˇÎÄÉŔĎŔť ÁöżřÇĎÁö žĘŔ˝" + +#: ../src/main.c:428 +msgid "cannot set locale modifiers" +msgstr "ˇÎÄÉŔĎ modifier ¸Ś źłÁ¤ÇŇ źö žřŔ˝" + +#: ../src/main.c:445 +msgid "could not open display \"%s\"" +msgstr "\"%s\" ľđ˝şÇášŔĚ¸Ś ż­Áö ¸řÇÔ." + +#: ../src/menu.c:285 +msgid "wrealloc() failed while trying to add menu item" +msgstr "¸Ţ´ş žĆŔĚĹŰ Ăß°Ą ˝ĂľľÁß wrealloc() ˝ÇĆĐ" + +#: ../src/misc.c:71 +msgid "could not define value for %s for cpp" +msgstr "cpp ŔÇ %s ¸Ś Ŕ§ÇŃ °ŞŔĚ Á¤ŔÇľÇÁö žĘŔ˝" + +#: ../src/misc.c:101 +msgid "could not get password entry for UID %i" +msgstr "UID %i ŔÇ ĆĐ˝şżöľĺ şÎşĐŔť ŔĐŔť źö žřŔ˝" + +#: ../src/misc.c:125 +msgid "your machine is misconfigured. HOSTNAME is set to %s" +msgstr "˝Ă˝şĹŰ źłÁ¤ŔĚ Ŕ߸řľĘ. HOSTNAME Ŕť %s ˇÎ źłÁ¤ÇÔ" + +#: ../src/misc.c:131 +msgid "your machine is misconfigured. HOST is set to %s" +msgstr "˝Ă˝şĹŰ źłÁ¤ŔĚ Ŕ߸řľĘ. HOST ¸Ś %s ˇÎ źłÁ¤ÇÔ" + +#: ../src/misc.c:773 +msgid "selection timed-out" +msgstr "źąĹĂ˝Ă°Ł Ăʰú" + +#: ../src/misc.c:788 +msgid "Program Arguments" +msgstr "ÇÁˇÎą×ˇĽ żÉźÇ" + +#: ../src/misc.c:807 +msgid "Enter command arguments:" +msgstr "¸íˇÉžî:" + +#: ../src/misc.c:833 +msgid "unable to get dropped data from DND drop" +msgstr "" + +#: ../src/misc.c:841 +msgid "error getting dropped data from DND drop" +msgstr "" + +#: ../src/misc.c:847 +msgid "out of memory while getting data from DND drop" +msgstr "" + +#: ../src/misc.c:891 ../src/misc.c:1011 +msgid "out of memory during expansion of \"%s\"" +msgstr "\"%s\" ŔÇ ČŽŔĺ Áß ¸Ţ¸đ¸Ž şÎÁˇ" + +#: ../src/misc.c:945 +msgid "out of memory during expansion of \"%w\"" +msgstr "\"%w\" ŔÇ ČŽŔĺ Áß ¸Ţ¸đ¸Ž şÎÁˇ" + +#: ../src/misc.c:964 +msgid "out of memory during expansion of \"%a\"" +msgstr "\"%a\" ŔÇ ČŽŔĺ Áß ¸Ţ¸đ¸Ž şÎÁˇ" + +#: ../src/misc.c:990 +msgid "out of memory during expansion of \"%d\"" +msgstr "\"%d\" ŔÇ ČŽŔĺ Áß ¸Ţ¸đ¸Ž şÎÁˇ" + +#: ../src/misc.c:1004 +msgid "selection not available" +msgstr "źąĹĂ şŇ°Ą´É" + +#: ../src/misc.c:1077 ../src/misc.c:1083 +msgid "bad window name value in %s state info" +msgstr "%s ťóĹ Á¤ş¸ŔÇ ŔŠľľżě Ŕ̸§ŔĚ Ŕ߸řľĘ" + +#: ../src/pixmap.c:235 +msgid "could not load mask bitmap file \"%s\". Won't use mask" +msgstr "" + +#: ../src/proplist.c:180 +msgid "unterminated string" +msgstr "" + +#: ../src/proplist.c:247 +msgid "unterminated array" +msgstr "" + +#: ../src/proplist.c:256 +msgid "missing , in array or unterminated array" +msgstr "" + +#: ../src/proplist.c:267 +msgid "could not get array element" +msgstr "ščż­ŔÇ ŔÎŔÚ¸Ś °ĄÁŽżŔÁö ¸řÇÔ" + +#: ../src/proplist.c:297 +msgid "unterminated dictionary" +msgstr "" + +#: ../src/proplist.c:315 +msgid "missing dictionary key" +msgstr "" + +#: ../src/proplist.c:317 +msgid "missing dictionary entry key or unterminated dictionary" +msgstr "" + +#: ../src/proplist.c:323 +msgid "error parsing dictionary key" +msgstr "" + +#: ../src/proplist.c:332 +msgid "missing = in dictionary entry" +msgstr "" + +#: ../src/proplist.c:351 +msgid "missing ; in dictionary entry" +msgstr "" + +#: ../src/proplist.c:432 +msgid "was expecting a string, dictionary, data or array." +msgstr "" + +#: ../src/proplist.c:434 +msgid "Comments are not allowed inside WindowMaker owned domain files." +msgstr "" + +#: ../src/proplist.c:453 +msgid "could not open domain file %s" +msgstr "" + +#: ../src/proplist.c:466 +msgid "extra data after end of file" +msgstr "" + +#: ../src/resources.c:71 +msgid "The following character sets are missing in %s:" +msgstr "" + +#: ../src/resources.c:76 +msgid "The string \"%s\" will be used in place" +msgstr "" + +#: ../src/resources.c:78 +msgid "of any characters from those sets." +msgstr "" + +#: ../src/resources.c:81 +msgid "could not create font set %s. Trying fixed" +msgstr "%s ąŰ˛Ă źÂŔť ¸¸ľéÁö ¸řÇÔ. ąâşť ąŰ˛ĂˇÎ Ŕç˝Ăľľ" + +#: ../src/resources.c:98 +msgid "could not load font %s. Trying fixed" +msgstr "%s ąŰ˛ĂŔĚ žřŔ˝. ąâşť ąŰ˛ĂˇÎ Ŕç˝Ăľľ" + +#: ../src/resources.c:136 +msgid "could not parse color \"%s\"" +msgstr "\"%s\" ťöŔť ŔνÄÇŇ źö žřŔ˝" + +#: ../src/resources.c:140 +msgid "could not allocate color \"%s\"" +msgstr "\"%s\" ťöŔť ÇŇ´çÇŇ źö žřŔ˝" + +#: ../src/rootmenu.c:205 ../src/rootmenu.c:207 ../src/rootmenu.c:236 +msgid "Exit" +msgstr "Ážˇá" + +#: ../src/rootmenu.c:206 +msgid "Exit window manager?" +msgstr "ŔŠľľżě °ü¸ŽŔÚ¸Ś ÁžˇáÇϽðڽŔ´Ďąî?" + +#: ../src/rootmenu.c:234 +msgid "Close X session" +msgstr "X ¸Ś ÁžˇáÇŐ´Ď´Ů!" + +#: ../src/rootmenu.c:235 +msgid "" +"Close Window System session?\n" +"(all applications will be closed)" +msgstr "" +"X ¸Ś ÁžˇáÇϽðڽŔ´Ďąî?\n" +"(¸đľç žÖÇøŽÄÉŔĚźÇŔĚ ÁžˇáľË´Ď´Ů)" + +#: ../src/rootmenu.c:454 +msgid "%s:invalid kbd shortcut specification \"%s\" for entry %s" +msgstr "" + +#: ../src/rootmenu.c:462 +msgid "%s:invalid key in shortcut \"%s\" for entry %s" +msgstr "" + +#: ../src/rootmenu.c:515 +msgid "%s: unmatched '\"' in menu file" +msgstr "¸Ţ´ş ĆÄŔĎŔÇ '\"' ÂŚŔĚ ¸ÂÁö žĘŔ˝ " + +#: ../src/rootmenu.c:565 +msgid "%s: missing command" +msgstr "%s: ¸íˇÉžî°Ą žřŔ˝" + +#: ../src/rootmenu.c:598 +msgid "invalid OPEN_MENU specification: %s" +msgstr "OPEN_MENU ˝şĆĺŔĚ ŔűŔýÄĄ žĘŔ˝: %s" + +#: ../src/rootmenu.c:663 +msgid "%s:could not stat menu" +msgstr "" + +#: ../src/rootmenu.c:671 +msgid "%s:could not stat menu :%s" +msgstr "" + +#: ../src/rootmenu.c:689 +msgid "too many parameters in OPEN_MENU: %s" +msgstr "OPEN_MENU żĄ ¸Ĺ°ł şŻźö°Ą łĘšŤ ¸šŔ˝: %s" + +#: ../src/rootmenu.c:725 +msgid "There are more than one WORKSPACE_MENU commands in the applications menu. Only one is allowed." +msgstr "" + +#: ../src/rootmenu.c:754 ../src/rootmenu.c:772 +msgid "%s:missing parameter for menu command \"%s\"" +msgstr "%s: ¸Ţ´ş ¸íˇÉžî \"%s\" ŔÇ ŔÎźö°Ą şüÁłŔ˝" + +#: ../src/rootmenu.c:835 +msgid "%s:unknown command \"%s\" in menu config." +msgstr "%s:¸Ţ´ş źłÁ¤ŔÇ \"%s\" ¸íˇÉŔť žË źö žřŔ˝." + +#: ../src/rootmenu.c:843 +msgid "%s:can't add shortcut for entry \"%s\"" +msgstr "" + +#: ../src/rootmenu.c:980 +msgid "%s:maximal line size exceeded in menu config: %s" +msgstr "%s:¸Ţ´ş źłÁ¤ŔÇ ĂÖ´ë ÁŮźö¸Ś ĂʰúÇÔ: %s" + +#: ../src/rootmenu.c:1002 ../src/rootmenu.c:1094 ../src/rootmenu.c:1195 +msgid "%s:missing command in menu config: %s" +msgstr "%s:¸Ţ´şżĄ ľîˇĎľČ ¸íˇÉŔť ĂŁŔť źö žřŔ˝: %s" + +#: ../src/rootmenu.c:1032 +msgid "%s:syntax error in menu file:END declaration missing" +msgstr "%s:¸Ţ´şĆÄŔĎ šŽšýżĄˇŻ:END źąžđšŽ žřŔ˝" + +#: ../src/rootmenu.c:1061 ../src/rootmenu.c:1160 +msgid "could not make arguments for menu file preprocessor" +msgstr "" + +#: ../src/rootmenu.c:1067 ../src/rootmenu.c:1167 +msgid "%s:could not open/preprocess menu file" +msgstr "%s:¸Ţ´ş ĆÄŔĎŔť ż­ąâ/şĐźŽ ¸řÇÔ" + +#: ../src/rootmenu.c:1079 ../src/rootmenu.c:1180 +msgid "%s:could not open menu file" +msgstr "%s:¸Ţ´ş ĆÄŔĎŔť ż­Áö ¸řÇÔ" + +#: ../src/rootmenu.c:1106 +msgid "%s:invalid menu file. MENU command is missing" +msgstr "%s:Ŕ߸řľČ ¸Ţ´ş ĆÄŔĎ. MENU Ç׸ńŔĚ žřŔ˝" + +#: ../src/rootmenu.c:1115 +msgid "error reading preprocessed menu data" +msgstr "" + +#: ../src/rootmenu.c:1207 +msgid "%s:no title given for the root menu" +msgstr "%s:ąâşť ¸Ţ´ş Áڏń ÁöÁ¤ľÇÁö žĘŔ˝" + +#: ../src/rootmenu.c:1261 ../src/rootmenu.c:1324 ../src/rootmenu.c:1368 +msgid "out of memory while constructing directory menu %s" +msgstr "%s ľđˇşĹ与 ¸Ţ´ş ťýźş Áß ¸Ţ¸đ¸Ž şÎÁˇ" + +#: ../src/rootmenu.c:1271 +msgid "%s:could not stat file \"%s\" in menu directory" +msgstr "" + +#: ../src/rootmenu.c:1417 +msgid "Commands" +msgstr "¸íˇÉžî" + +#: ../src/rootmenu.c:1419 +msgid "Exit..." +msgstr "Ážˇá..." + +#: ../src/rootmenu.c:1486 +msgid "could not find menu file \"%s\" referenced in WMRootMenu" +msgstr "WMRootMenu żĄ ÁöÁ¤ľČ \"%s\" ¸Ţ´ş ĆÄŔĎŔť ĂŁÁö ¸řÇÔ" + +#: ../src/rootmenu.c:1493 +msgid "could not access menu \"%s\" referenced in WMRootMenu" +msgstr "WMRootMenu żĄ ÁöÁ¤ľČ \"%s\" ¸Ţ´ş ĆÄŔĎżĄ Á˘ąŮ ¸řÇÔ" + +#: ../src/rootmenu.c:1521 ../src/rootmenu.c:1576 +msgid "%s:format error in root menu configuration \"%s\"" +msgstr "%s: ˇçĆŽ ¸Ţ´ş źłÁ¤ŔÇ \"%s\" Ć÷¸Ë żĄˇŻ" + +#: ../src/screen.c:402 +msgid "could not load logo image for panels" +msgstr "ĆгοĄ ž˛ŔĎ ˇÎ°í ŔĚšĚÁö¸Ś ŔĐÁö ¸řÇÔ" + +#: ../src/screen.c:405 +msgid "error making logo image for panel:%s" +msgstr "ĆгοĄ ž˛ŔĎ ˇÎ°í ŔĚšĚÁö¸Ś ¸¸ľéÁö ¸řÇÔ:%s" + +#: ../src/screen.c:584 +msgid "could not initialize graphics library context: %s" +msgstr "ą×ˇĄÇČ śóŔ̺ꡯ¸Ž ČŻ°ćŔť ĂĘąâČ­ ÇŇźö žřŔ˝" + +#: ../src/session.c:113 ../src/wdefaults.c:562 ../src/winspector.c:343 +msgid "can't convert \"%s\" to boolean" +msgstr "" + +#: ../src/stacking.c:88 +msgid "could not get window list!!" +msgstr "ŔŠľľżě ¸Ž˝şĆŽ¸Ś °ĄÁŽ żĂ źö žřŔ˝!!" + +#: ../src/startup.c:187 +msgid "internal X error: %s\n" +msgstr "X łťşÎ żĄˇŻ: %s\n" + +#: ../src/startup.c:250 +msgid "got signal %i (%s) - restarting\n" +msgstr "%i (%s) ˝ĹČŁ °¨Áö - Ŕç˝Ăľż\n" + +#: ../src/startup.c:252 +msgid "got signal %i - restarting\n" +msgstr "%i ˝ĹČŁ °¨Áö - Ŕç˝ĂľżÇÔ\n" + +#: ../src/startup.c:266 +msgid "%s: Received signal SIGTERM. Exiting..." +msgstr "%s: SIGTERM ˝ĹČŁ šŢŔ˝. Ážˇá..." + +#: ../src/startup.c:278 +msgid "got signal %i (%s)\n" +msgstr "%i (%s) ˝ĹČŁ °¨Áö\n" + +#: ../src/startup.c:280 +msgid "got signal %i\n" +msgstr "%i ˝ĹČŁ °¨Áö\n" + +#: ../src/startup.c:285 +msgid "crashed while trying to do some post-crash cleanup. Aborting immediatelly." +msgstr "" + +#: ../src/startup.c:296 +msgid "trying to start alternative window manager..." +msgstr "" + +#: ../src/startup.c:691 +msgid "icon size is configured to %i, but it's too small. Using 16, instead\n" +msgstr "ÁöÁ¤ľČ žĆŔĚÄÜ ĹŠąâ(%i)°Ą łĘšŤ ŔŰŔ˝. 16Ŕ¸ˇÎ šŮ˛Ţ\n" + +#: ../src/startup.c:735 +msgid "it seems that there already is a window manager running" +msgstr "ŔĚšĚ ´Ů¸Ľ ŔŠľľżě ¸Ţ´ĎÁްĄ ŔŰľż Áß" + +#: ../src/startup.c:741 +msgid "could not manage screen %i" +msgstr "" + +#: ../src/startup.c:797 +msgid "could not manage any screen" +msgstr "" + +#: ../src/switchmenu.c:124 +msgid "Windows" +msgstr "ŔŠľľżě ¸Ž˝şĆŽ" + +#: ../src/texture.c:267 +msgid "image file \"%s\" used as texture could not be found." +msgstr "\"%s\" ŔĚšĚÁö ĆÄŔĎŔť ĂŁŔť źö žřŔ˝." + +#: ../src/texture.c:273 +msgid "could not load texture pixmap \"%s\":%s" +msgstr "Texture pixmap \"%s\"Ŕť ż­ źö°Ą žřŔ˝." + +#: ../src/texture.c:377 ../src/texture.c:488 +msgid "could not render texture: %s" +msgstr "Texture ˇť´ő¸ľŔť ÇŇ źö žřŔ˝: %s" + +#: ../src/wdefaults.c:396 +msgid "could not find icon file \"%s\"" +msgstr "\"%s\" žĆŔĚÄÜŔť ĂŁÁö ¸řÇÔ" + +#: ../src/window.c:2201 ../src/window.c:2344 +msgid "" +"the NumLock, ScrollLock or similar key seems to be turned on.\n" +"Turn it off or some mouse actions and keyboard shortcuts will not work." +msgstr "" + +#: ../src/winmenu.c:182 +msgid "could not create workspace submenu for window menu" +msgstr "ŔŠľľżě¸Ţ´ş¸Ś Ŕ§ÇŃ ŔŰž÷°ř°Ł şÎźÓ¸Ţ´ş¸Ś ¸¸ľé źö žřŔ˝" + +#: ../src/winmenu.c:204 +msgid "(Un)Maximize" +msgstr "(žČ)ĂÖ´ëČ­" + +#: ../src/winmenu.c:212 +msgid "Miniaturize" +msgstr "ĂÖźŇČ­" + +#: ../src/winmenu.c:221 +msgid "(Un)Shade" +msgstr "(žČ)°Ą¸˛" + +#: ../src/winmenu.c:229 +msgid "Hide" +msgstr "źűąč" + +#: ../src/winmenu.c:236 +msgid "Hide Others" +msgstr "´Ů¸Ľ °Íľé źűąč" + +#: ../src/winmenu.c:238 +msgid "Select" +msgstr "źąĹĂ" + +#: ../src/winmenu.c:246 +msgid "Move To" +msgstr "żĹąč" + +#: ../src/winmenu.c:251 +msgid "Attributes..." +msgstr "źÓźş źłÁ¤" + +#: ../src/winmenu.c:253 +msgid "Close" +msgstr "´Ýąâ" + +#: ../src/winspector.c:277 +msgid "Could not find icon \"%s\" specified for this window" +msgstr "ŔĚ ŔŠľľżěżĄź­ ťçżëÇĎ´Â \"%s\" žĆŔĚÄÜŔť ĂŁŔť źö žřŔ˝" + +#: ../src/winspector.c:293 +msgid "Could not open specified icon \"%s\":%s" +msgstr "ÁöÁ¤ľČ \"%s\" žĆŔĚÄÜŔť ż­ źö žřŔ˝:%s" + +#: ../src/winspector.c:989 +msgid "Save" +msgstr "ŔúŔĺ" + +#: ../src/winspector.c:995 +msgid "Apply" +msgstr "Ŕűżë" + +#: ../src/winspector.c:1001 +msgid "Revert" +msgstr "şšą¸" + +#: ../src/winspector.c:1010 ../src/winspector.c:1020 +msgid "Window Specification" +msgstr "ŔŠľľżě źąĹĂ" + +#: ../src/winspector.c:1011 +msgid "Window Attributes" +msgstr "ŔŠľľżě źÓźş" + +#: ../src/winspector.c:1012 +msgid "Advanced Options" +msgstr "°íąŢ żÉźÇ" + +#: ../src/winspector.c:1013 +msgid "Icon and Initial Workspace" +msgstr "žĆŔĚÄÜ, ĂĘąâ ŔŰž÷°ř°Ł" + +#: ../src/winspector.c:1014 +msgid "Application Specific" +msgstr "žÖÇøŽÄÉŔĚźÇ" + +#: ../src/winspector.c:1028 +msgid "Defaults for all windows" +msgstr "ŔŠľľżě ąâşť°Ş" + +#: ../src/winspector.c:1064 +msgid "" +"The configuration will apply to all\n" +"windows that have their WM_CLASS property set to the above selected\n" +"name, when saved." +msgstr "" +"źłÁ¤Ŕť ŔúŔĺÇϸé Ŕ§żĄ źąĹĂÇŃ Ŕ̸§Ŕť Ć÷ÇÔÇĎ´Â WM_CLASS źÓźşŔť °ĄÁö´Â ¸đľç\n" +"ŔŠľľżěżĄ ą× źłÁ¤ŔĚ ŔűżëľË´Ď´Ů.\n" +" " + +#: ../src/winspector.c:1071 +msgid "Attributes" +msgstr "źÓźş źąĹĂ Ç׸ń" + +#: ../src/winspector.c:1081 +msgid "Disable titlebar" +msgstr "ŸŔĚƲšŮ źűąč" + +#: ../src/winspector.c:1085 +msgid "Disable resizebar" +msgstr "ĹŠąâÁśÁ¤šŮ źűąč" + +#: ../src/winspector.c:1089 +msgid "Disable close button" +msgstr "´Ýąâ šöư žřžÚ" + +#: ../src/winspector.c:1093 +msgid "Disable miniaturize button" +msgstr "ĂÖźŇČ­ šöư žřžÚ" + +#: ../src/winspector.c:1097 +msgid "Keep on top" +msgstr "Çםó Ŕ§" + +#: ../src/winspector.c:1101 +msgid "Omnipresent" +msgstr "Ç×ťó ş¸ŔÓ" + +#: ../src/winspector.c:1105 +msgid "Start Miniaturized" +msgstr "ĂÖźŇČ­ÇĎżŠ ˝ÇÇŕ" + +#: ../src/winspector.c:1109 +msgid "Skip window list" +msgstr "ŔŠľľżě ¸Ž˝şĆŽżĄź­ ÁŚżÜ" + +#: ../src/winspector.c:1123 +msgid "Advanced" +msgstr "°íąŢ źąĹĂ Ç׸ń" + +#: ../src/winspector.c:1133 +msgid "Ignore HideOthers" +msgstr "´Ů¸Ľ °Íľé źűąč šŤ˝Ă" + +#: ../src/winspector.c:1137 +msgid "Don't bind keyboard shortcuts" +msgstr "´ÜĂŕŰ ťçżë şŇ°Ą" + +#: ../src/winspector.c:1141 +msgid "Don't bind mouse clicks" +msgstr "¸śżě˝ş ĹŹ¸Ż ťçżë şŇ°Ą" + +#: ../src/winspector.c:1145 +msgid "Keep inside screen" +msgstr "Çםó Č­¸éžČżĄ Ŕ§ÄĄ" + +#: ../src/winspector.c:1149 +msgid "Don't let it take focus" +msgstr "ȰźşČ­ žČľĘ" + +#: ../src/winspector.c:1153 +msgid "Don't Save Session" +msgstr "źźźÇŔť ŔúŔĺÇĎÁö žĘŔ˝" + +#: ../src/winspector.c:1157 +msgid "Emulate Application Icon" +msgstr "" + +#: ../src/winspector.c:1172 +msgid "Enable the \"Don't bind...\" options to allow the application to receive all mouse or keyboard events." +msgstr " " + +#: ../src/winspector.c:1179 +msgid "Miniwindow Image" +msgstr "žĆŔĚÄÜ" + +#: ../src/winspector.c:1198 +msgid "Update" +msgstr "°ť˝Ĺ" + +#: ../src/winspector.c:1213 +msgid "Icon file name:" +msgstr "žĆŔĚÄÜ ĆÄŔϸí:" + +#: ../src/winspector.c:1225 +msgid "Ignore client supplied icon" +msgstr "žÖÇøŽÄÉŔĚźÇ žĆŔĚÄÜ šŤ˝Ă" + +#: ../src/winspector.c:1232 +msgid "Initial Workspace" +msgstr "ĂĘąâ ŔŰž÷°ř°Ł" + +#: ../src/winspector.c:1237 +msgid "Nowhere in particular" +msgstr "ĆŻş°ÇŃ źłÁ¤ žřŔ˝" + +#: ../src/winspector.c:1271 +msgid "Application Wide" +msgstr "žÖÇøŽÄÉŔĚźÇ" + +#: ../src/winspector.c:1281 +msgid "Start Hidden" +msgstr "źű°Üź­ ˝ÇÇŕ" + +#: ../src/winspector.c:1285 +msgid "No application icon" +msgstr "žÖÇøŽÄÉŔĚźÇ žĆŔĚÄÜ ťçżë žČÇÔ" + +#: ../src/workspace.c:89 ../src/workspace.c:90 ../src/workspace.c:423 +msgid "Workspace %i" +msgstr "" + +#: ../src/workspace.c:471 +msgid "Workspaces" +msgstr "ŔŰž÷°ř°Ł" + +#: ../src/workspace.c:473 +msgid "could not create Workspace menu" +msgstr "ŔŰž÷°ř°Ł ¸Ţ´ş¸Ś ¸¸ľéźö žřŔ˝" + +#: ../src/workspace.c:480 +msgid "New" +msgstr "ťő ŔŰž÷°ř°Ł ¸¸ľë" + +#: ../src/workspace.c:481 +msgid "Destroy Last" +msgstr "¸śÁö¸ˇ ŔŰž÷°ř°Ł žřžÚ" + +#: ../src/xutil.c:228 +msgid "invalid data in selection" +msgstr "" diff --git a/src/Makefile.am b/src/Makefile.am index a3a4e0ee..e6ba84b1 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -24,7 +24,6 @@ wmaker_SOURCES = \ client.c \ client.h \ colormap.c \ - config.h \ def_pixmaps.h \ defaults.c \ defaults.h \ diff --git a/src/Makefile.in b/src/Makefile.in index b0ad2c59..d7293c20 100644 --- a/src/Makefile.in +++ b/src/Makefile.in @@ -116,7 +116,6 @@ wmaker_SOURCES = \ client.c \ client.h \ colormap.c \ - config.h \ def_pixmaps.h \ defaults.c \ defaults.h \ diff --git a/src/WindowMaker.h b/src/WindowMaker.h index f9da5706..528d7e25 100644 --- a/src/WindowMaker.h +++ b/src/WindowMaker.h @@ -37,8 +37,6 @@ #endif -/* max. number of distinct window levels */ -#define MAX_WINDOW_LEVELS 5 /* class codes */ @@ -56,6 +54,17 @@ typedef enum { } WClassType; +/* generic window levels (a superset of the N*XTSTEP ones) */ +enum { + WMDesktopLevel = 0, + WMSunkenLevel = 1, + WMNormalLevel = 2, + WMFloatingLevel = 3, + WMDockLevel = 4, + WMSubmenuLevel = 5, + WMMainMenuLevel = 6 +}; +#define MAX_WINDOW_LEVELS 7 /* * WObjDescriptor will be used by the event dispatcher to @@ -203,9 +212,7 @@ typedef struct WPreferences { char use_saveunders; /* turn on SaveUnders for menus, * icons etc. */ -/* char no_window_under_dock; - */ char no_window_over_icons; @@ -307,6 +314,7 @@ typedef struct WPreferences { unsigned int nodock:1; /* don't display the dock */ unsigned int noclip:1; /* don't display the clip */ unsigned int nocpp:1; /* don't use cpp */ + unsigned int noupdates:1; /* don't require ~/GNUstep (-static) */ } flags; /* internal flags */ } WPreferences; diff --git a/src/actions.c b/src/actions.c index b76faaef..e6ac0501 100644 --- a/src/actions.c +++ b/src/actions.c @@ -411,15 +411,11 @@ wMaximizeWindow(WWindow *wwin, int directions) if (!(wPreferences.icon_yard & IY_RIGHT)) new_x += wPreferences.icon_size; } -#if 0 - if (wPreferences.no_window_under_dock - && wwin->screen_ptr->dock) { - new_width -= wPreferences.icon_size + DOCK_EXTRA_SPACE; - if (!wwin->screen_ptr->dock->on_right_side) - new_x += wPreferences.icon_size + DOCK_EXTRA_SPACE; - } -#endif - if (wwin->screen_ptr->dock && !wwin->screen_ptr->dock->lowered) { + + if (wwin->screen_ptr->dock + && (!wwin->screen_ptr->dock->lowered + || wPreferences.no_window_under_dock)) { + new_width -= wPreferences.icon_size + DOCK_EXTRA_SPACE; if (!wwin->screen_ptr->dock->on_right_side) new_x += wPreferences.icon_size + DOCK_EXTRA_SPACE; @@ -900,9 +896,8 @@ wIconifyWindow(WWindow *wwin) wwin->window_flags.omnipresent || wPreferences.sticky_icons) XMapWindow(dpy, wwin->icon->core->window); AddToStackList(wwin->icon->core); -#ifndef STRICTNS + wLowerFrame(wwin->icon->core); -#endif if (present) { WWindow *owner = recursiveTransientFor(wwin->screen_ptr->focused_window); @@ -1263,6 +1258,10 @@ wHideApplication(WApplication *wapp) } wapp->flags.hidden = 1; + + if(wPreferences.auto_arrange_icons) { + wArrangeIcons(scr, True); + } } @@ -1564,7 +1563,7 @@ wArrangeIcons(WScreen *scr, Bool arrangeAll) wwin = wwin->prev; while (wwin) { - if (wwin->icon && wwin->flags.miniaturized && + if (wwin->icon && wwin->flags.miniaturized && !wwin->flags.hidden && (wwin->frame->workspace==scr->current_workspace || wwin->window_flags.omnipresent || wPreferences.sticky_icons)) { diff --git a/src/application.c b/src/application.c index 49aeec61..a579ee4c 100644 --- a/src/application.c +++ b/src/application.c @@ -180,7 +180,7 @@ saveIconNameFor(char *iconPath, char *wm_instance, char *wm_class) } PLRelease(key); - if (val) + if (val && !wPreferences.flags.noupdates) PLSave(dict, YES); } @@ -382,9 +382,7 @@ wApplicationCreate(WScreen *scr, Window main_window) } else { PlaceIcon(scr, &x, &y); wAppIconMove(wapp->app_icon, x, y); -#ifndef STRICTNS - wLowerFrame(icon->core); -#endif + wLowerFrame(icon->core); } if (!clip || !wapp->app_icon->attracted || !clip->collapsed) XMapWindow(dpy, icon->core->window); diff --git a/src/defaults.c b/src/defaults.c index 40669ead..bc8a32e8 100644 --- a/src/defaults.c +++ b/src/defaults.c @@ -391,11 +391,9 @@ WDefaultEntry optionList[] = { {"AutoArrangeIcons", "NO", NULL, &wPreferences.auto_arrange_icons, getBool, NULL }, - /* {"NoWindowUnderDock", "NO", NULL, &wPreferences.no_window_under_dock, getBool, NULL }, - */ {"NoWindowOverIcons", "NO", NULL, &wPreferences.no_window_over_icons, getBool, NULL }, @@ -1209,7 +1207,7 @@ wDefaultUpdateIcons(WScreen *scr) #define STRINGP(x) if (!PLIsString(value)) { \ wwarning(_("Wrong option format for key \"%s\". Should be %s."), \ - PLGetString(entry->plkey), x); \ + entry->key, x); \ return False; } @@ -1285,7 +1283,7 @@ again: data = 0; } else { wwarning(_("can't convert \"%s\" to boolean for key \"%s\""), - val, PLGetString(entry->plkey)); + val, entry->key); if (second_pass==0) { val = PLGetString(entry->plvalue); second_pass = 1; @@ -1321,7 +1319,7 @@ getInt(WScreen *scr, WDefaultEntry *entry, proplist_t value, void *addr, if (sscanf(val, "%i", &data)!=1) { wwarning(_("can't convert \"%s\" to integer for key \"%s\""), - val, PLGetString(entry->plkey)); + val, entry->key); val = PLGetString(entry->plvalue); wwarning(_("using default \"%s\" instead"), val); if (sscanf(val, "%i", &data)!=1) { @@ -1351,7 +1349,7 @@ getCoord(WScreen *scr, WDefaultEntry *entry, proplist_t value, void *addr, again: if (!PLIsArray(value)) { wwarning(_("Wrong option format for key \"%s\". Should be %s."), - PLGetString(entry->plkey), "Coordinate"); + entry->key, "Coordinate"); if (changed==0) { value = entry->plvalue; changed = 1; @@ -1364,7 +1362,7 @@ again: nelem = PLGetNumberOfElements(value); if (nelem != 2) { wwarning(_("Incorrect number of elements in array for key \"%s\"."), - PLGetString(entry->plkey)); + entry->key); if (changed==0) { value = entry->plvalue; changed = 1; @@ -1379,7 +1377,7 @@ again: if (!elem_x || !elem_y || !PLIsString(elem_x) || !PLIsString(elem_y)) { wwarning(_("Wrong value for key \"%s\". Should be Coordinate."), - PLGetString(entry->plkey)); + entry->key); if (changed==0) { value = entry->plvalue; changed = 1; @@ -1393,8 +1391,7 @@ again: val_y = PLGetString(elem_y); if (sscanf(val_x, "%i", &data.x)!=1 || sscanf(val_y, "%i", &data.y)!=1) { - wwarning(_("can't convert array to integers for \"%s\"."), - PLGetString(entry->plkey)); + wwarning(_("can't convert array to integers for \"%s\"."), entry->key); if (changed==0) { value = entry->plvalue; changed = 1; @@ -1465,7 +1462,7 @@ getPathList(WScreen *scr, WDefaultEntry *entry, proplist_t value, void *addr, again: if (!PLIsArray(value)) { wwarning(_("Wrong option format for key \"%s\". Should be %s."), - PLGetString(entry->plkey), "an array of paths"); + entry->key, "an array of paths"); if (changed==0) { value = entry->plvalue; changed = 1; @@ -1516,7 +1513,7 @@ getEnum(WScreen *scr, WDefaultEntry *entry, proplist_t value, void *addr, { static char data; - data = string2index(entry->key, value, entry->default_value, + data = string2index(entry->plkey, value, entry->default_value, (WOptionEnumeration*)entry->extra_data); if (data < 0) return False; @@ -1732,7 +1729,7 @@ getTexture(WScreen *scr, WDefaultEntry *entry, proplist_t value, void *addr, again: if (!PLIsArray(value)) { wwarning(_("Wrong option format for key \"%s\". Should be %s."), - PLGetString(entry->plkey), "Texture"); + entry->key, "Texture"); if (changed==0) { value = entry->plvalue; changed = 1; @@ -1741,12 +1738,28 @@ again: } return False; } + + if (strcmp(entry->key, "WidgetColor")==0 && !changed) { + proplist_t pl; + + pl = PLGetArrayElement(value, 0); + if (!pl || !PLIsString(pl) || !PLGetString(pl) + || strcasecmp(PLGetString(pl), "solid")!=0) { + wwarning(_("Wrong option format for key \"%s\". Should be %s."), + entry->key, "Solid Texture"); + + value = entry->plvalue; + changed = 1; + wwarning(_("using default \"%s\" instead"), entry->default_value); + goto again; + } + } texture = parse_texture(scr, value); if (!texture) { wwarning(_("Error in texture specification for key \"%s\""), - PLGetString(entry->plkey)); + entry->key); if (changed==0) { value = entry->plvalue; changed = 1; @@ -2069,8 +2082,8 @@ again: if (file) { if (fork()==0) { SetupEnvironment(scr); - - close(ConnectionNumber(dpy)); + + CloseDescriptors(); execlp(program, program, style, "-c", cpc, "-b", back, file, NULL); wwarning(_("could not run \"%s\""), program); @@ -2157,7 +2170,7 @@ getColor(WScreen *scr, WDefaultEntry *entry, proplist_t value, void *addr, again: if (!wGetColor(scr, val, &color)) { wwarning(_("could not get color for key \"%s\""), - PLGetString(entry->plkey)); + entry->key); if (second_pass==0) { val = PLGetString(entry->plvalue); second_pass = 1; @@ -2741,7 +2754,7 @@ makeWorkspaceTexture(WScreen *scr, WTexture *texture, char *file, char *option) SetupEnvironment(scr); - close(ConnectionNumber(dpy)); + CloseDescriptors(); colorn = wmalloc(32); sprintf(colorn, "\"#%2x%2x%2x\"", diff --git a/src/dialog.c b/src/dialog.c index 24104498..c4271181 100644 --- a/src/dialog.c +++ b/src/dialog.c @@ -148,13 +148,13 @@ wInputDialog(WScreen *scr, char *title, char *message, char **text) XDestroyWindow(dpy, parent); if (result==NULL) - return WDB_CANCEL; + return False; else { if (*text) free(*text); *text = result; - return WDB_OK; + return True; } } diff --git a/src/dialog.h b/src/dialog.h index 61f514c7..c5db803f 100644 --- a/src/dialog.h +++ b/src/dialog.h @@ -24,12 +24,6 @@ #define WMDIALOG_H_ -#define WDB_OK (0) -#define WDB_CANCEL (1) -#define WDB_YES (2) -#define WDB_NO (3) -#define WDB_EXIT (4) - int wMessageDialog(WScreen *scr, char *title, char *message, char *defBtn, char *altBtn, char *othBtn); int wInputDialog(WScreen *scr, char *title, char *message, char **text); diff --git a/src/dock.c b/src/dock.c index 50c0c2f7..fde4e2ae 100644 --- a/src/dock.c +++ b/src/dock.c @@ -208,7 +208,7 @@ renameCallback(WMenu *menu, WMenuEntry *entry) sprintf(buffer, _("Type the name for workspace %i:"), wspace+1); if (wInputDialog(dock->screen_ptr, _("Rename Workspace"), buffer, - &name)==WDB_OK) { + &name)) { wWorkspaceRename(dock->screen_ptr, wspace, name); } if (name) { @@ -432,9 +432,6 @@ removeIconsCallback(WMenu *menu, WMenuEntry *entry) wDockDetach(dock, aicon); if (keepit) { PlaceIcon(dock->screen_ptr, &aicon->x_pos, &aicon->y_pos); -#ifndef STRICTNS - wLowerFrame(aicon->icon->core); -#endif XMoveWindow(dpy, aicon->icon->core->window, aicon->x_pos, aicon->y_pos); if (!dock->mapped || dock->collapsed) @@ -468,7 +465,7 @@ keepIconsCallback(WMenu *menu, WMenuEntry *entry) clickedIcon->editing = 1; if (wInputDialog(dock->screen_ptr, _("Keep Icon"), _("Type the command used to launch the application"), - &command)==WDB_OK) { + &command)) { if (command && (command[0]==0 || (command[0]=='-' && command[1]==0))) { free(command); @@ -748,7 +745,7 @@ mainIconCreate(WScreen *scr, int type) btn->icon->core->descriptor.handle_mousedown = iconMouseDown; btn->icon->core->descriptor.parent_type = WCLASS_DOCK_ICON; btn->icon->core->descriptor.parent = btn; - /*ChangeStackingLevel(btn->icon->core, NSDockWindowLevel);*/ + /*ChangeStackingLevel(btn->icon->core, WMDockLevel);*/ XMapWindow(dpy, btn->icon->core->window); btn->x_pos = x_pos; btn->y_pos = 0; @@ -1104,9 +1101,6 @@ wDockDestroy(WDock *dock) wDockDetach(dock, aicon); if (keepit) { PlaceIcon(dock->screen_ptr, &aicon->x_pos, &aicon->y_pos); -#ifndef STRICTNS - wLowerFrame(aicon->icon->core); -#endif XMoveWindow(dpy, aicon->icon->core->window, aicon->x_pos, aicon->y_pos); if (!dock->mapped || dock->collapsed) @@ -1703,9 +1697,9 @@ wDockRestoreState(WScreen *scr, proplist_t dock_state, int type) aicon->y_pos = dock->y_pos + (aicon->yindex*ICON_SIZE); if (dock->lowered) - ChangeStackingLevel(aicon->icon->core, WMNormalWindowLevel); + ChangeStackingLevel(aicon->icon->core, WMNormalLevel); else - ChangeStackingLevel(aicon->icon->core, WMDockWindowLevel); + ChangeStackingLevel(aicon->icon->core, WMDockLevel); wCoreConfigure(aicon->icon->core, aicon->x_pos, aicon->y_pos, 0, 0); @@ -1725,9 +1719,9 @@ wDockRestoreState(WScreen *scr, proplist_t dock_state, int type) old_top->x_pos = dock->x_pos; old_top->y_pos = dock->y_pos; if (dock->lowered) - ChangeStackingLevel(old_top->icon->core, WMNormalWindowLevel); + ChangeStackingLevel(old_top->icon->core, WMNormalLevel); else - ChangeStackingLevel(old_top->icon->core, WMDockWindowLevel); + ChangeStackingLevel(old_top->icon->core, WMDockLevel); dock->icon_array[0] = old_top; XMoveWindow(dpy, old_top->icon->core->window, dock->x_pos, dock->y_pos); /* we don't need to increment dock->icon_count here because it was @@ -1911,18 +1905,18 @@ wDockAttachIcon(WDock *dock, WAppIcon *icon, int x, int y) if (icon->command==NULL) { icon->editing = 0; if (XGetCommand(dpy, wwin->client_win, &argv, &argc) && argc>0) { - + icon->command = FlattenStringList(argv, argc); XFreeStringList(argv); } else { char *command=NULL; - + /* icon->forced_dock = 1;*/ if (!icon->attracted || dock->type!=WM_CLIP || dock->keep_attracted) { icon->editing = 1; if (wInputDialog(dock->screen_ptr, _("Dock Icon"), _("Type the command used to launch the application"), - &command)==WDB_OK) { + &command)) { if (command && (command[0]==0 || (command[0]=='-' && command[1]==0))) { free(command); @@ -1990,6 +1984,13 @@ wDockAttachIcon(WDock *dock, WAppIcon *icon, int x, int y) if (wPreferences.auto_arrange_icons) wArrangeIcons(dock->screen_ptr, True); +#ifdef OFFIX_DND + if (icon->command && !icon->dnd_command) { + icon->dnd_command = wmalloc(strlen(icon->command)+8); + sprintf(icon->dnd_command, "%s %%d", icon->command); + } +#endif + return True; } @@ -2044,7 +2045,7 @@ moveIconBetweenDocks(WDock *src, WDock *dest, WAppIcon *icon, int x, int y) /* icon->forced_dock = 1;*/ if (wInputDialog(src->screen_ptr, _("Dock Icon"), _("Type the command used to launch the application"), - &command)==WDB_OK) { + &command)) { if (command && (command[0]==0 || (command[0]=='-' && command[1]==0))) { free(command); @@ -2181,7 +2182,9 @@ wDockDetach(WDock *dock, WAppIcon *icon) icon->icon->core->descriptor.handle_leavenotify = NULL; icon->icon->core->descriptor.parent_type = WCLASS_APPICON; icon->icon->core->descriptor.parent = icon; - ChangeStackingLevel(icon->icon->core, WMNormalWindowLevel); + + ChangeStackingLevel(icon->icon->core, NORMAL_ICON_LEVEL); + wAppIconPaint(icon); if (wPreferences.auto_arrange_icons) { wArrangeIcons(dock->screen_ptr, True); @@ -2198,7 +2201,7 @@ wDockDetach(WDock *dock, WAppIcon *icon) * * Returns False if icon can't be docked. */ -int +Bool wDockSnapIcon(WDock *dock, WAppIcon *icon, int req_x, int req_y, int *ret_x, int *ret_y, int redocking) { @@ -2210,6 +2213,9 @@ wDockSnapIcon(WDock *dock, WAppIcon *icon, int req_x, int req_y, WAppIcon *nicon = NULL; + if (wPreferences.flags.noupdates) + return False; + dx = dock->x_pos; dy = dock->y_pos; @@ -2238,6 +2244,9 @@ wDockSnapIcon(WDock *dock, WAppIcon *icon, int req_x, int req_y, return False; if (dock->type == WM_DOCK) { + if (icon->dock != dock && ex_x != 0) + return False; + for (i=0; imax_icons; i++) { nicon = dock->icon_array[i]; if (nicon && nicon->yindex == ex_y) { @@ -2333,8 +2342,8 @@ wDockSnapIcon(WDock *dock, WAppIcon *icon, int req_x, int req_y, break; } } - if ((!redocking && neighbours && !aicon) || - (redocking && neighbours && (aicon == icon || !aicon))) { + + if (neighbours && (aicon==NULL || (redocking && aicon == icon))) { *ret_x = ex_x; *ret_y = ex_y; return True; @@ -2356,7 +2365,7 @@ wDockSnapIcon(WDock *dock, WAppIcon *icon, int req_x, int req_y, * in which case it changes x_pos and y_pos accordingly. * Else returns false. */ -int +Bool wDockFindFreeSlot(WDock *dock, int *x_pos, int *y_pos) { WScreen *scr = dock->screen_ptr; @@ -2369,6 +2378,7 @@ wDockFindFreeSlot(WDock *dock, int *x_pos, int *y_pos) int corner; int sx=0, sy=0, ex=scr->scr_width, ey=scr->scr_height; + /* if the dock is full */ if (dock->icon_count >= dock->max_icons) { return False; @@ -2666,7 +2676,7 @@ execCommand(WAppIcon *btn, char *command, WSavedState *state) SetupEnvironment(scr); - close(ConnectionNumber(dpy)); + CloseDescriptors(); #ifdef HAVE_SETPGID setpgid(0, 0); @@ -2674,7 +2684,7 @@ execCommand(WAppIcon *btn, char *command, WSavedState *state) args = malloc(sizeof(char*)*(argc+1)); if (!args) - exit(111); + exit(111); for (i=0; iicon_array[0]; moveDock(dock, btn->x_pos, btn->y_pos); - newlevel = dock->lowered ? WMNormalWindowLevel : WMDockWindowLevel; + newlevel = dock->lowered ? WMNormalLevel : WMDockLevel; ChangeStackingLevel(btn->icon->core, newlevel); for (i=1; imax_icons; i++) { @@ -2967,10 +2977,10 @@ toggleLowered(WDock *dock) /* lower/raise Dock */ if (!dock->lowered) { - newlevel = WMNormalWindowLevel; + newlevel = WMNormalLevel; dock->lowered = 1; } else { - newlevel = WMDockWindowLevel; + newlevel = WMDockLevel; dock->lowered = 0; } @@ -3083,7 +3093,8 @@ openDockMenu(WDock *dock, WAppIcon *aicon, XEvent *event) /* settings */ entry = dock->menu->entries[++index]; entry->clientdata = aicon; - wMenuSetEnabled(dock->menu, index, !aicon->editing); + wMenuSetEnabled(dock->menu, index, !aicon->editing + && !wPreferences.flags.noupdates); /* kill */ entry = dock->menu->entries[++index]; @@ -3374,6 +3385,9 @@ handleIconMove(WDock *dock, WAppIcon *aicon, XEvent *event) Bool docked; int superfluous = wPreferences.superfluous; /* we catch it to avoid problems */ + if (wPreferences.flags.noupdates) + return; + if (XGrabPointer(dpy, icon->core->window, True, ButtonMotionMask |ButtonReleaseMask|ButtonPressMask, GrabModeAsync, GrabModeAsync, None, None, CurrentTime) !=GrabSuccess) { diff --git a/src/dock.h b/src/dock.h index f7b418e8..4231feb5 100644 --- a/src/dock.h +++ b/src/dock.h @@ -76,9 +76,9 @@ void wDockRaiseLower(WDock *dock); void wDockSaveState(WScreen *scr); Bool wDockAttachIcon(WDock *dock, WAppIcon *icon, int x, int y); -int wDockSnapIcon(WDock *dock, WAppIcon *icon, int req_x, int req_y, +Bool wDockSnapIcon(WDock *dock, WAppIcon *icon, int req_x, int req_y, int *ret_x, int *ret_y, int redocking); -int wDockFindFreeSlot(WDock *dock, int *req_x, int *req_y); +Bool wDockFindFreeSlot(WDock *dock, int *req_x, int *req_y); void wDockDetach(WDock *dock, WAppIcon *icon); void wDockTrackWindowLaunch(WDock *dock, Window window); diff --git a/src/dockedapp.c b/src/dockedapp.c index 293ae99e..7e8e9402 100644 --- a/src/dockedapp.c +++ b/src/dockedapp.c @@ -90,8 +90,8 @@ updateCommand(WAppIcon *icon, char *command) } icon->command = command; - if (!icon->wm_class && !icon->wm_instance && - icon->command && strlen(icon->command)>0) { + if (!icon->wm_class && !icon->wm_instance && icon->command + && strlen(icon->command)>0) { icon->forced_dock = 1; } } @@ -216,7 +216,7 @@ panelBtnCallback(WMWidget *self, void *data) else wAppIconPaint(aicon); - wDefaultChangeIcon(panel->wwin->screen_ptr, aicon->wm_instance, + wDefaultChangeIcon(panel->wwin->screen_ptr, aicon->wm_instance, aicon->wm_class, text); } if (text) @@ -236,11 +236,11 @@ panelBtnCallback(WMWidget *self, void *data) text = WMGetTextFieldText(panel->dndCommandField); updateDNDCommand(panel->editedIcon, text); #endif - + panel->editedIcon->auto_launch = WMGetButtonSelected(panel->autoLaunchBtn); } - + if (done) DestroyDockAppSettingsPanel(panel); } diff --git a/src/event.c b/src/event.c index 7ebfcd24..4363c8ea 100644 --- a/src/event.c +++ b/src/event.c @@ -222,12 +222,12 @@ DispatchEvent(XEvent *event) scr = wScreenWithNumber(i); if (scr) { wScreenSaveState(scr); - RestoreDesktop(scr); } } + RestoreDesktop(NULL); ExecExitScript(); /* received SIGTERM */ - exit(0); + Exit(0); } else if (WProgramState == WSTATE_NEED_RESTART) { WProgramState = WSTATE_RESTARTING; @@ -236,9 +236,9 @@ DispatchEvent(XEvent *event) scr = wScreenWithNumber(i); if (scr) { wScreenSaveState(scr); - RestoreDesktop(scr); } } + RestoreDesktop(NULL); /* received SIGHUP */ Restart(NULL); } @@ -350,10 +350,10 @@ EventLoop() Bool IsDoubleClick(WScreen *scr, XEvent *event) { - if ((scr->last_click_time>0) && + if ((scr->last_click_time>0) && (event->xbutton.time-scr->last_click_time<=wPreferences.dblclick_time) && (event->xbutton.button == scr->last_click_button) - && (event->xbutton.window == scr->last_click_window)) { + && (event->xbutton.subwindow == scr->last_click_window)) { scr->flags.next_click_is_not_double = 1; scr->last_click_time = 0; @@ -655,12 +655,27 @@ handleButtonPress(XEvent *event) wUnselectWindows(scr); wSelectWindows(scr, event); } +#ifdef MOUSE_WS_SWITCH + else if (event->xbutton.button==Button4) { + + if (scr->current_workspace > 0) + wWorkspaceChange(scr, scr->current_workspace-1); + + } else if (event->xbutton.button==Button5) { + + if (scr->current_workspace < scr->workspace_count-1) + wWorkspaceChange(scr, scr->current_workspace+1); + + } +#endif /* MOUSE_WS_SWITCH */ } - - if (XFindContext(dpy, event->xbutton.window, wWinContext, + if (XFindContext(dpy, event->xbutton.subwindow, wWinContext, (XPointer *)&desc)==XCNOENT) { - return; + if (XFindContext(dpy, event->xbutton.window, wWinContext, + (XPointer *)&desc)==XCNOENT) { + return; + } } if (desc->parent_type == WCLASS_WINDOW) { @@ -697,7 +712,7 @@ handleButtonPress(XEvent *event) } else { scr->last_click_time = event->xbutton.time; scr->last_click_button = event->xbutton.button; - scr->last_click_window = event->xbutton.window; + scr->last_click_window = event->xbutton.subwindow; } } @@ -1213,7 +1228,10 @@ handleColormapNotify(XEvent *event) scr->current_colormap == event->xcolormap.colormap) { /* some bastard app (like XV) removed our colormap */ - reinstall = True; + /* + * can't enforce or things like xscreensaver wont work + * reinstall = True; + */ } else if (event->xcolormap.state == ColormapInstalled && scr->current_colormap == event->xcolormap.colormap) { diff --git a/src/funcs.h b/src/funcs.h index 416c72be..a10f4bbd 100644 --- a/src/funcs.h +++ b/src/funcs.h @@ -33,6 +33,8 @@ typedef void (WDeathHandler)(pid_t pid, unsigned int status, void *cdata); void RestoreDesktop(WScreen *scr); +void Exit(int status); + void Restart(char *manager); void SetupEnvironment(WScreen *scr); diff --git a/src/icon.c b/src/icon.c index 264ed00b..63eb76e6 100644 --- a/src/icon.c +++ b/src/icon.c @@ -103,7 +103,7 @@ wIconCreate(WWindow *wwin) icon->core->stacking = wmalloc(sizeof(WStacking)); icon->core->stacking->above = NULL; icon->core->stacking->under = NULL; - icon->core->stacking->window_level = WMNormalWindowLevel; + icon->core->stacking->window_level = NORMAL_ICON_LEVEL; icon->core->stacking->child_of = NULL; icon->owner = wwin; @@ -173,7 +173,7 @@ wIconCreateWithIconFile(WScreen *scr, char *iconfile, int tile) icon->core->stacking = wmalloc(sizeof(WStacking)); icon->core->stacking->above = NULL; icon->core->stacking->under = NULL; - icon->core->stacking->window_level = WMNormalWindowLevel; + icon->core->stacking->window_level = NORMAL_ICON_LEVEL; icon->core->stacking->child_of = NULL; if (iconfile) { diff --git a/src/main.c b/src/main.c index 419ca1f1..58bf1fb5 100644 --- a/src/main.c +++ b/src/main.c @@ -46,6 +46,7 @@ #include "keybind.h" #include "xmodifier.h" #include "defaults.h" +#include "session.h" #include @@ -157,6 +158,16 @@ extern void EventLoop(); extern void StartUp(); +void +Exit(int status) +{ +#ifdef R6SM + wSessionDisconnectManager(); +#endif + XCloseDisplay(dpy); + + exit(status); +} void Restart(char *manager) @@ -174,7 +185,9 @@ Restart(char *manager) } } } - +#ifdef R6SM + wSessionDisconnectManager(); +#endif XCloseDisplay(dpy); if (!prog) execvp(Arguments[0], Arguments); @@ -254,6 +267,7 @@ print_help() */ puts(_(" -visualid visualid visual id of visual to use")); puts(_(" -display host:dpy display to use")); + puts(_(" -static do not update or save configurations")); puts(_(" -version print version and exit")); } @@ -276,7 +290,6 @@ check_defaults() } - static void execInitScript() { @@ -285,7 +298,7 @@ execInitScript() file = wfindfile(DEF_CONFIG_PATHS, DEF_INIT_SCRIPT); if (file) { if (fork()==0) { - close(ConnectionNumber(dpy)); + CloseDescriptors(); execl("/bin/sh", "/bin/sh", "-c", file, NULL); wsyserror(_("%s:could not execute initialization script"), file); @@ -304,7 +317,7 @@ ExecExitScript() file = wfindfile(DEF_CONFIG_PATHS, DEF_EXIT_SCRIPT); if (file) { if (fork()==0) { - close(ConnectionNumber(dpy)); + CloseDescriptors(); execl("/bin/sh", "/bin/sh", "-c", file, NULL); wsyserror(_("%s:could not execute exit script"), file); @@ -336,10 +349,7 @@ main(int argc, char **argv) else ProgName++; - - /* check existence of Defaults DB directory */ - check_defaults(); - + restart = 0; memset(&wPreferences, 0, sizeof(WPreferences)); @@ -385,12 +395,29 @@ main(int argc, char **argv) wwarning(_("bad value for visualid: \"%s\""), argv[i]); exit(0); } + } else if (strcmp(argv[i], "-static")==0) { + wPreferences.flags.noupdates = 1; +#ifdef R6SM + } else if (strcmp(argv[i], "-clientid")==0 + || strcmp(argv[i], "-restore")==0) { + i++; + if (i>=argc) { + wwarning(_("too few arguments for %s"), argv[i-1]); + exit(0); + } +#endif } else { print_help(); exit(0); } } } + + if (!wPreferences.flags.noupdates) { + /* check existence of Defaults DB directory */ + check_defaults(); + } + #if 0 tmp = getenv("LANG"); if (tmp) { @@ -429,16 +456,16 @@ main(int argc, char **argv) wwarning(_("cannot set locale modifiers")); } #endif - + if (Locale) { char *ptr; - + Locale = wstrdup(Locale); ptr = strchr(Locale, '.'); if (ptr) *ptr = 0; } - + /* open display */ dpy = XOpenDisplay(DisplayName); @@ -472,6 +499,11 @@ main(int argc, char **argv) #ifdef SOUNDS wSoundInitialize(); #endif + +#ifdef R6SM + wSessionConnectManager(argv, argc); +#endif + StartUp(!multiHead); execInitScript(); diff --git a/src/menu.c b/src/menu.c index c1474ebd..7735222c 100644 --- a/src/menu.c +++ b/src/menu.c @@ -112,9 +112,9 @@ wMenuCreate(WScreen *screen, char *title, int main_menu) memset(menu, 0, sizeof(WMenu)); #ifdef SINGLE_MENULEVEL - tmp = WMSubmenuWindowLevel; + tmp = WMSubmenuLevel; #else - tmp = (main_menu ? WMMainMenuWindowLevel : WMSubmenuWindowLevel); + tmp = (main_menu ? WMMainMenuLevel : WMSubmenuLevel); #endif flags = WFF_SINGLE_STATE; @@ -359,10 +359,10 @@ wMenuEntrySetCascade(WMenu *menu, WMenuEntry *entry, WMenu *cascade) if (menu->flags.lowered) { cascade->flags.lowered = 1; - ChangeStackingLevel(cascade->frame->core, WMNormalWindowLevel); + ChangeStackingLevel(cascade->frame->core, WMNormalLevel); cascade->brother->flags.lowered = 1; - ChangeStackingLevel(cascade->brother->frame->core, WMNormalWindowLevel); + ChangeStackingLevel(cascade->brother->frame->core, WMNormalLevel); } if (!menu->flags.realized) @@ -2110,12 +2110,12 @@ changeMenuLevels(WMenu *menu, int lower) int i; if (!lower) { - ChangeStackingLevel(menu->frame->core, (!menu->parent ? WMMainMenuWindowLevel - : WMSubmenuWindowLevel)); + ChangeStackingLevel(menu->frame->core, (!menu->parent ? WMMainMenuLevel + : WMSubmenuLevel)); wRaiseFrame(menu->frame->core); menu->flags.lowered = 0; } else { - ChangeStackingLevel(menu->frame->core, WMNormalWindowLevel); + ChangeStackingLevel(menu->frame->core, WMNormalLevel); wLowerFrame(menu->frame->core); menu->flags.lowered = 1; } diff --git a/src/misc.c b/src/misc.c index 60b2178e..de1455b5 100644 --- a/src/misc.c +++ b/src/misc.c @@ -601,8 +601,8 @@ FlattenStringList(char **list, int count) return NULL; } - strcpy(flat_string, list[0]); - for (i=1; iscr_width; - if (scr->dock) { - if (scr->dock->on_right_side) - right_margin -= wPreferences.icon_size + DOCK_EXTRA_SPACE; - else - left_margin += wPreferences.icon_size + DOCK_EXTRA_SPACE; - } - - x1 = left_margin; - y2 = scr->scr_height; - y1 = y2-wPreferences.icon_size*2; - x2 = left_margin+wPreferences.icon_size; - - while (1) { - wcore = scr->stacking_list[0]; - - while (wcore) { - void *parent; - - if (x2>=right_margin+wPreferences.icon_size) { - x1 = left_margin; - x2 = left_margin+wPreferences.icon_size*2; - y1 -= wPreferences.icon_size; - y2 -= wPreferences.icon_size; - if (y2descriptor.parent; - - /* if it is an application icon */ - if (wcore->descriptor.parent_type == WCLASS_APPICON) { - icon_x = ((WAppIcon*)parent)->x_pos; - icon_y = ((WAppIcon*)parent)->y_pos; - } else if (wcore->descriptor.parent_type == WCLASS_MINIWINDOW && - (((WIcon*)parent)->owner->frame->workspace==scr->current_workspace - || ((WIcon*)parent)->owner->window_flags.omnipresent - || wPreferences.sticky_icons)) { - icon_x = ((WIcon*)parent)->owner->icon_x; - icon_y = ((WIcon*)parent)->owner->icon_y; - } else { - wcore = wcore->stacking->under; - continue; - } - wcore = wcore->stacking->under; - - /* test if place is taken */ - if (icon_y>y1 && icon_y=x1) { - x2 = icon_x+wPreferences.icon_size*2; - x1 = icon_x+wPreferences.icon_size; - /* this place can't be used */ - wcore = scr->stacking_list[0]; - break; - } - } - } - if (!wcore) { - /* found spot */ - break; - } - } - *x_ret = x1; - *y_ret = y2-wPreferences.icon_size; -} -#endif /* * Returns True if it is an icon and is in this workspace. @@ -143,7 +62,7 @@ iconPosition(WCoreWindow *wcore, int sx1, int sy1, int sx2, int sy2, { void *parent; int ok = 0; - + parent = wcore->descriptor.parent; /* if it is an application icon */ @@ -155,14 +74,15 @@ iconPosition(WCoreWindow *wcore, int sx1, int sy1, int sx2, int sy2, } else if (wcore->descriptor.parent_type == WCLASS_MINIWINDOW && (((WIcon*)parent)->owner->frame->workspace==workspace || ((WIcon*)parent)->owner->window_flags.omnipresent - || wPreferences.sticky_icons)) { + || wPreferences.sticky_icons) + && !((WIcon*)parent)->owner->flags.hidden) { *retX = ((WIcon*)parent)->owner->icon_x; *retY = ((WIcon*)parent)->owner->icon_y; ok = 1; } - + /* * Check if it is inside the screen. */ @@ -201,6 +121,7 @@ PlaceIcon(WScreen *scr, int *x_ret, int *y_ret) int x, y; int isize = wPreferences.icon_size; int done = 0; + int level; /* * Find out screen boundaries. @@ -257,27 +178,29 @@ PlaceIcon(WScreen *scr, int *x_ret, int *y_ret) #define INDEX(x,y) (((y)+1)*(sw+2) + (x) + 1) - obj = scr->stacking_list[0]; - while (obj) { - int x, y; + for (level = WMNormalLevel; level >= WMDesktopLevel; level--) { + obj = scr->stacking_list[level]; + + while (obj) { + int x, y; - if (iconPosition(obj, sx1, sy1, sx2, sy2, scr->current_workspace, - &x, &y)) { - int xdi, ydi; /* rounded down */ - int xui, yui; /* rounded up */ + if (iconPosition(obj, sx1, sy1, sx2, sy2, scr->current_workspace, + &x, &y)) { + int xdi, ydi; /* rounded down */ + int xui, yui; /* rounded up */ - xdi = x/isize; - ydi = y/isize; - xui = (x+isize/2)/isize; - yui = (y+isize/2)/isize; - map[INDEX(xdi,ydi)] = 1; - map[INDEX(xdi,yui)] = 1; - map[INDEX(xui,ydi)] = 1; - map[INDEX(xui,yui)] = 1; + xdi = x/isize; + ydi = y/isize; + xui = (x+isize/2)/isize; + yui = (y+isize/2)/isize; + map[INDEX(xdi,ydi)] = 1; + map[INDEX(xdi,yui)] = 1; + map[INDEX(xui,ydi)] = 1; + map[INDEX(xui,yui)] = 1; + } + obj = obj->stacking->under; } - obj = obj->stacking->under; } - /* * Default position */ diff --git a/src/properties.c b/src/properties.c index 57fb7cfe..6b7b3d01 100644 --- a/src/properties.c +++ b/src/properties.c @@ -43,6 +43,11 @@ extern Atom _XA_WM_CLIENT_LEADER; extern Atom _XA_WM_TAKE_FOCUS; extern Atom _XA_WM_DELETE_WINDOW; extern Atom _XA_WM_SAVE_YOURSELF; +#ifdef R6SM +extern Atom _XA_WM_WINDOW_ROLE; +extern Atom _XA_SM_CLIENT_ID; +#endif + extern Atom _XA_GNUSTEP_WM_ATTR; extern Atom _XA_GNUSTEP_WM_MINIATURIZE_WINDOW; @@ -209,35 +214,90 @@ PropSetWMakerProtocols(Window root) } -int -PropGetClientLeader(Window window, Window *leader) +Window +PropGetClientLeader(Window window) { Atom type_ret; int fmt_ret; unsigned long nitems_ret; unsigned long bytes_after_ret; Window *win; + Window leader; - if (XGetWindowProperty(dpy, window, _XA_WM_CLIENT_LEADER, 0, 4, + if (XGetWindowProperty(dpy, window, _XA_WM_CLIENT_LEADER, 0, 1, False, AnyPropertyType, &type_ret, &fmt_ret, &nitems_ret, &bytes_after_ret, - (unsigned char**)&win)!=Success) - return 0; + (unsigned char**)&win)!=Success || !win) + return None; - if (!win) return 0; - *leader = (Window)*win; + leader = (Window)*win; XFree(win); - return 1; + + if (type_ret == XA_WINDOW && fmt_ret == 32 && nitems_ret == 1 + && bytes_after_ret == 0) + return leader; + else + return None; } +#ifdef R6SM +char* +PropGetClientID(Window window) +{ + XTextProperty txprop; + + txprop.value = NULL; + + if (XGetTextProperty(dpy, window, &txprop, _XA_SM_CLIENT_ID)!=Success) { + return NULL; + } + + if (txprop.encoding == XA_STRING && txprop.format == 8 + && txprop.nitems > 0) { + + return (char*)txprop.value; + } else { + + if (txprop.value) + XFree(txprop.value); + + return NULL; + } +} + + +char* +PropGetWindowRole(Window window) +{ + XTextProperty txprop; + + txprop.value = NULL; + + if (XGetTextProperty(dpy, window, &txprop, _XA_WM_WINDOW_ROLE)!=Success) { + return NULL; + } + + if (txprop.encoding == XA_STRING && txprop.format == 8 + && txprop.nitems > 0) { + + return (char*)txprop.value; + } else { + + if (txprop.value) + XFree(txprop.value); + + return NULL; + } +} +#endif /* R6SM */ + void PropWriteGNUstepWMAttr(Window window, GNUstepWMAttributes *attr) { - CARD32 data[9]; + unsigned long data[9]; - /* handle idiot compilers where array of CARD32 != struct of CARD32 */ data[0] = attr->flags; data[1] = attr->window_style; data[2] = attr->window_level; diff --git a/src/properties.h b/src/properties.h index 26867fc8..6239d541 100644 --- a/src/properties.h +++ b/src/properties.h @@ -35,7 +35,6 @@ void PropGetProtocols(Window window, WProtocols *prots); int PropGetWMClass(Window window, char **wm_class, char **wm_instance); int PropGetGNUstepWMAttr(Window window, GNUstepWMAttributes **attr); void PropWriteGNUstepWMAttr(Window window, GNUstepWMAttributes *attr); -int PropGetClientLeader(Window window, Window *leader); void PropSetWMakerProtocols(Window root); void PropCleanUp(Window root); @@ -44,4 +43,10 @@ void PropCleanUp(Window root); int PropGetMotifWMHints(Window window, MWMHints **mwmhints); #endif +Window PropGetClientLeader(Window window); + +#ifdef R6SM +char *PropGetClientID(Window window); +#endif + #endif diff --git a/src/rootmenu.c b/src/rootmenu.c index d2aecdd4..57b8dceb 100644 --- a/src/rootmenu.c +++ b/src/rootmenu.c @@ -65,6 +65,7 @@ extern Time LastTimestamp; extern WPreferences wPreferences; +extern int wScreenCount; static WMenu *readMenuPipe(WScreen *scr, char **file_name); static WMenu *readMenuFile(WScreen *scr, char *file_name); @@ -152,12 +153,18 @@ execCommand(WMenu *menu, WMenuEntry *entry) { char *cmdline; static char *shell = NULL; - + + /* + * This have a problem: if the shell is tcsh (not sure about others) + * and ~/.tcshrc have /bin/stty erase ^H somewhere on it, the shell + * will block and the command will not be executed. if (!shell) { shell = getenv("SHELL"); if (!shell) shell = "/bin/sh"; } + */ + shell = "/bin/sh"; cmdline = ExpandOptions(menu->frame->screen_ptr, (char*)entry->clientdata); @@ -175,14 +182,17 @@ execCommand(WMenu *menu, WMenuEntry *entry) * Ok. -Alfredo */ if (fork()==0) { + SetupEnvironment(menu->frame->screen_ptr); - close(ConnectionNumber(dpy)); + + CloseDescriptors(); + #ifdef HAVE_SETPGID setpgid(0, 0); #endif execl(shell, shell, "-c", cmdline, NULL); wsyserror("could not exec %s -c %s\n", shell, cmdline); - exit(-1); + Exit(-1); } free(cmdline); } @@ -205,16 +215,22 @@ exitCommand(WMenu *menu, WMenuEntry *entry) || wMessageDialog(menu->frame->screen_ptr, _("Exit"), _("Exit window manager?"), _("Exit"), _("Cancel"), NULL)==WAPRDefault) { + int i; #ifdef DEBUG printf("Exiting WindowMaker.\n"); #endif + for (i=0; iframe->screen_ptr); - - RestoreDesktop(menu->frame->screen_ptr); + scr = wScreenWithNumber(i); + if (scr) + wScreenSaveState(scr); + } + + RestoreDesktop(NULL); ExecExitScript(); - exit(0); + Exit(0); } inside = 0; } @@ -224,25 +240,74 @@ static void shutdownCommand(WMenu *menu, WMenuEntry *entry) { static int inside = 0; + int result; + int i; /* prevent reentrant calls */ if (inside) return; inside = 1; - if ((int)entry->clientdata==M_QUICK - || wMessageDialog(menu->frame->screen_ptr, _("Close X session"), - _("Close Window System session?\n(all applications will be closed)"), - _("Exit"), _("Cancel"), NULL)==WAPRDefault) { -/* printf(_("Exiting...\n"));*/ - - wScreenSaveState(menu->frame->screen_ptr); +#define R_CANCEL 0 +#define R_CLOSE 1 +#define R_KILL 2 - WipeDesktop(menu->frame->screen_ptr); - - ExecExitScript(); - exit(0); + + result = R_CANCEL; + if ((int)entry->clientdata==M_QUICK) + result = R_CLOSE; + else { +#ifdef R6SM + if (wSessionIsManaged()) { + int r; + + r = wMessageDialog(menu->frame->screen_ptr, + _("Close X session"), + _("Close Window System session?\n" + "Kill might close applications with unsaved data."), + _("Close"), _("Kill"), _("Cancel")); + if (r==WAPRDefault) + result = R_CLOSE; + else if (r==WAPRAlternate) + result = R_KILL; + } else +#endif + { + int r; + + r = wMessageDialog(menu->frame->screen_ptr, + _("Kill X session"), + _("Kill Window System session?\n" + "(all applications will be closed)"), + _("Kill"), _("Cancel"), NULL); + if (r==WAPRDefault) + result = R_KILL; + } + } + + if (result!=R_CANCEL) { +#ifdef R6SM + if (result == R_CLOSE) { + wSessionRequestShutdown(); + } else +#endif /* R6SM */ + { + for (i=0; iframe->screen_ptr); - - RestoreDesktop(menu->frame->screen_ptr); + int i; + + for (i=0; iclientdata); } @@ -1256,6 +1328,9 @@ readMenuDirectory(WScreen *scr, char *title, char **path, char *command) strcmp(dentry->d_name, "..")==0) continue; + if (dentry->d_name[0] == '.') + continue; + buffer = wmalloc(strlen(path[i])+strlen(dentry->d_name)+4); if (!buffer) { wsyserror(_("out of memory while constructing directory menu %s"), @@ -1444,6 +1519,7 @@ configureMenu(WScreen *scr, proplist_t definition) if (PLIsString(definition)) { struct stat stat_buf; char *path = NULL; + Bool menu_is_default = False; /* menu definition is a string. Probably a path, so parse the file */ @@ -1482,6 +1558,11 @@ configureMenu(WScreen *scr, proplist_t definition) if (!path) path = wfindfile(DEF_CONFIG_PATHS, tmp); + if (!path) { + path = wfindfile(DEF_CONFIG_PATHS, DEF_MENU_FILE); + menu_is_default = True; + } + if (!path) { wsyserror(_("could not find menu file \"%s\" referenced in WMRootMenu"), tmp); @@ -1499,6 +1580,12 @@ configureMenu(WScreen *scr, proplist_t definition) if (!scr->root_menu || stat_buf.st_mtime > scr->root_menu->timestamp /* if the pointer in WMRootMenu has changed */ || WDRootMenu->timestamp > scr->root_menu->timestamp) { + + if (menu_is_default) { + wwarning(_("using default menu file \"%s\" as the menu referenced in WMRootMenu could not be found "), + path); + } + menu = readMenuFile(scr, path); if (menu) menu->timestamp = MAX(stat_buf.st_mtime, WDRootMenu->timestamp); @@ -1649,6 +1736,7 @@ OpenRootMenu(WScreen *scr, int x, int y, int keyboard) menu = configureMenu(scr, definition); if (menu) menu->timestamp = WDRootMenu->timestamp; + } else menu = NULL; } else { diff --git a/src/screen.c b/src/screen.c index 3b20a614..b14b3e45 100644 --- a/src/screen.c +++ b/src/screen.c @@ -747,6 +747,11 @@ wScreenSaveState(WScreen *scr) wwin = wwin->prev; } + + if (wPreferences.flags.noupdates) + return; + + old_state = scr->session_state; scr->session_state = PLMakeDictionaryFromEntries(NULL, NULL, NULL); @@ -796,7 +801,9 @@ wScreenSaveState(WScreen *scr) path = PLMakeString(str); free(str); PLSetFilename(scr->session_state, path); - PLSave(scr->session_state, YES); + if (!PLSave(scr->session_state, YES)) { + wwarning(_("could not save session state in %s"), PLGetString(path)); + } PLRelease(path); PLRelease(old_state); } diff --git a/src/screen.h b/src/screen.h index 92b3d86e..44b349d1 100644 --- a/src/screen.h +++ b/src/screen.h @@ -110,7 +110,7 @@ typedef struct _WScreen { * is ordered from the topmost to * the lowest window */ - int window_level_count[MAX_WINDOW_LEVELS]; +/* int window_level_count[MAX_WINDOW_LEVELS];*/ int window_count; /* number of windows in window_list */ #ifdef EXPERIMENTAL diff --git a/src/session.c b/src/session.c index 280d942e..baa3d65d 100644 --- a/src/session.c +++ b/src/session.c @@ -1,6 +1,7 @@ -/* session.c - session state handling +/* session.c - session state handling and R6 style session management * * Copyright (c) 1998 Dan Pascu + * Copyright (c) 1998 Alfredo Kojima * * Window Maker window manager * @@ -24,10 +25,17 @@ #include #include + +#ifdef R6SM +#include +#endif + #include #include #include #include +#include + #include "WindowMaker.h" #include "screen.h" @@ -41,6 +49,7 @@ #include "application.h" #include "appicon.h" + #include "dock.h" #include "list.h" @@ -48,6 +57,19 @@ #include +#ifdef R6SM +/* requested for SaveYourselfPhase2 */ +static Bool sWaitingPhase2 = False; + +static SmcConn sSMCConn = NULL; + +static WMHandlerID sSMInputHandler = NULL; + +/* our SM client ID */ +static char *sClientID = NULL; +#endif + + static proplist_t sApplications = NULL; static proplist_t sCommand; static proplist_t sName; @@ -288,8 +310,8 @@ execCommand(WScreen *scr, char *command, char *host) SetupEnvironment(scr); - close(ConnectionNumber(dpy)); - + CloseDescriptors(); + args = malloc(sizeof(char*)*(argc+1)); if (!args) exit(111); @@ -506,3 +528,418 @@ wSessionRestoreLastWorkspace(WScreen *scr) } + +#ifdef R6SM +/* + * With full session management support, the part of WMState + * that store client window state will become obsolete, + * but we still need to store state info like the dock and workspaces. + * It is better to keep dock/wspace info in WMState because the user + * might want to keep the dock configuration while not wanting to + * resume a previously saved session. + * So, wmaker specific state info can be saved in + * ~/GNUstep/.AppInfo/WindowMaker/statename.state + * Its better to not put it in the defaults directory because: + * - its not a defaults file (having domain names like wmaker0089504baa + * in the defaults directory wouldn't be very neat) + * - this state file is not meant to be edited by users + * + * The old session code will become obsolete. When wmaker is + * compiled with R6 sm support compiled in, itll be better to + * use a totally rewritten state saving code, but we can keep + * the current code for when R6SM is not compiled in. + * + * This will be confusing to old users (well get lots of "SAVE_SESSION broke!" + * messages), but itll be better. + * + * -readme + */ + + +/* + * Windows are identified as: + * WM_CLASS(instance.class).WM_WINDOW_ROLE + * + * + */ +static void +saveClientState(WWindow *wwin, proplist_t dict) +{ + proplist_t key; + + +} + + +static void +smSaveYourselfPhase2Proc(SmcConn smc_conn, SmPointer client_data) +{ + SmProp props[4]; + SmPropValue prop1val, prop2val, prop3val, prop4val; + char **argv = (char**)client_data; + int argc; + int i, j; + Bool ok = False; + char *statefile = NULL; + char *prefix; + Bool gsPrefix = False; + char *discardCmd = NULL; + time_t t; + FILE *file; + +#ifdef DEBUG1 + puts("received SaveYourselfPhase2 SM message"); +#endif + + /* save session state */ + + /* the file that will contain the state */ + prefix = getenv("SM_SAVE_DIR"); + if (!prefix) { + prefix = wusergnusteppath(); + if (prefix) + gsPrefix = True; + } + if (!prefix) { + prefix = getenv("HOME"); + } + if (!prefix) + prefix = "."; + + statefile = malloc(strlen(prefix)+64); + if (!statefile) { + if (gsPrefix) + free(prefix); + wwarning(_("end of memory while saving session state")); + goto fail; + } + + t = time(); + i = 0; + do { + if (gsPrefix) + sprintf(statefile, "%s/.AppInfo/WindowMaker/%l%i.state", + prefix, t, i); + else + sprintf(statefile, "%s/wmaker.%l%i.state", prefix, t, i); + i++; + } while (access(F_OK, statefile)!=-1); + + if (gsPrefix) + free(prefix); + + /* save the states of all windows we're managing */ + + file = fopen(statefile, "w"); + if (!file) { + wsyserror(_("could not create state file %s"), statefile); + goto fail; + } + + + + fclose(file); + + + /* set the remaining properties that we didn't set at + * startup time */ + + for (argc=0, i=0; argv[i]!=NULL; i++) { + if (strcmp(argv[i], "-clientid")==0 + || strcmp(argv[i], "-restore")==0) { + i++; + } else { + argc++; + } + } + + prop[0].name = SmRestartCommand; + prop[0].type = SmLISTofARRAY8; + prop[0].vals = malloc(sizeof(SmPropValue)*(argc+4)); + prop[0].num_vals = argc+4; + + prop[1].name = SmCloneCommand; + prop[1].type = SmLISTofARRAY8; + prop[1].vals = malloc(sizeof(SmPropValue)*(argc)); + prop[1].num_vals = argc; + + if (!prop[0].vals || !prop[1].vals) { + wwarning(_("end of memory while saving session state")); + goto fail; + } + + for (j=0, i=0; ifocused_window; while (wwin) { if (wwin->protocols.DELETE_WINDOW) diff --git a/src/stacking.c b/src/stacking.c index 1c322a2b..0fd35551 100644 --- a/src/stacking.c +++ b/src/stacking.c @@ -41,25 +41,6 @@ extern XContext wStackContext; extern WPreferences wPreferences; -static int -levelToIndex(int level) -{ - switch (level) { - case WMNormalWindowLevel: - return 0; - case WMFloatingWindowLevel: - return 1; - case WMDockWindowLevel: - return 2; - case WMSubmenuWindowLevel: - return 3; - case WMMainMenuWindowLevel: - return 4; - default: - return 0; - } -} - /* *---------------------------------------------------------------------- * RemakeStackList-- @@ -91,7 +72,7 @@ RemakeStackList(WScreen *scr) for (i=0; istacking_list[i] = NULL; onbotw[i] = NULL; - scr->window_level_count[i] = 0; +/* scr->window_level_count[i] = 0;*/ } /* verify list integrity */ c=0; @@ -102,13 +83,13 @@ RemakeStackList(WScreen *scr) } if (!frame) continue; c++; - level = levelToIndex(frame->stacking->window_level); + level = frame->stacking->window_level; if (onbotw[level]) onbotw[level]->stacking->above = frame; frame->stacking->under = onbotw[level]; frame->stacking->above = NULL; onbotw[level] = frame; - scr->window_level_count[level]++; +/* scr->window_level_count[level]++;*/ } XFree(windows); #ifdef DEBUG @@ -209,7 +190,7 @@ void wRaiseFrame(WCoreWindow *frame) { WCoreWindow *wlist=frame; - int level = levelToIndex(frame->stacking->window_level); + int level = frame->stacking->window_level; int i; /* already on top */ @@ -312,7 +293,7 @@ wLowerFrame(WCoreWindow *frame) { WScreen *scr=frame->screen_ptr; WCoreWindow *prev, *wlist=frame; - int level = levelToIndex(frame->stacking->window_level); + int level = frame->stacking->window_level; int i; /* already in bottom */ @@ -401,10 +382,10 @@ void AddToStackList(WCoreWindow *frame) { WCoreWindow *prev, *tmpw, *wlist; - int index = levelToIndex(frame->stacking->window_level); + int index = frame->stacking->window_level; frame->screen_ptr->window_count++; - frame->screen_ptr->window_level_count[index]++; +/* frame->screen_ptr->window_level_count[index]++;*/ XSaveContext(dpy, frame->window, wStackContext, (XPointer)frame); tmpw = frame->screen_ptr->stacking_list[index]; if (!tmpw) { @@ -474,7 +455,7 @@ MoveInStackListAbove(WCoreWindow *next, WCoreWindow *frame) if (frame->stacking->window_level != next->stacking->window_level) ChangeStackingLevel(frame, next->stacking->window_level); - index = levelToIndex(frame->stacking->window_level); + index = frame->stacking->window_level; tmpw = frame->screen_ptr->stacking_list[index]; if (tmpw == frame) @@ -541,7 +522,7 @@ MoveInStackListUnder(WCoreWindow *prev, WCoreWindow *frame) if (frame->stacking->window_level != prev->stacking->window_level) ChangeStackingLevel(frame, prev->stacking->window_level); - index = levelToIndex(frame->stacking->window_level); + index = frame->stacking->window_level; tmpw = frame->screen_ptr->stacking_list[index]; if (tmpw == frame) @@ -562,7 +543,7 @@ MoveInStackListUnder(WCoreWindow *prev, WCoreWindow *frame) void RemoveFromStackList(WCoreWindow *frame) { - int index = levelToIndex(frame->stacking->window_level); + int index = frame->stacking->window_level; if (XDeleteContext(dpy, frame->window, wStackContext)==XCNOENT) { #ifdef DEBUG0 @@ -579,7 +560,7 @@ RemoveFromStackList(WCoreWindow *frame) frame->screen_ptr->stacking_list[index] = frame->stacking->under; frame->screen_ptr->window_count--; - frame->screen_ptr->window_level_count[index]--; +/* frame->screen_ptr->window_level_count[index]--;*/ } diff --git a/src/startup.c b/src/startup.c index 7daac0a2..d25dc0d5 100644 --- a/src/startup.c +++ b/src/startup.c @@ -70,6 +70,12 @@ extern const char * const sys_siglist[]; #endif #endif +/* for SunOS */ +#ifndef SA_RESTART +# define SA_RESTART 0 +#endif + + /****** Global Variables ******/ extern WPreferences wPreferences; @@ -148,6 +154,9 @@ static void manageAllWindows(); extern void NotifyDeadProcess(pid_t pid, unsigned char status); +#ifdef R6SM +extern void _wSessionCloseDescriptors(); +#endif static int @@ -199,11 +208,10 @@ catchXError(Display *dpy, XErrorEvent *error) static int handleXIO(Display *dpy) { - exit(0); + Exit(0); } - /* *---------------------------------------------------------------------- * delayedAction- @@ -554,6 +562,16 @@ wScreenForWindow(Window window) } +void +CloseDescriptors() +{ + if (dpy) + close(ConnectionNumber(dpy)); +#ifdef R6SM + _wSessionCloseDescriptors(); +#endif +} + /* *---------------------------------------------------------- @@ -738,7 +756,7 @@ StartUp(Bool defaultScreenOnly) wScreen[wScreenCount] = wScreenInit(DefaultScreen(dpy)); if (!wScreen[wScreenCount]) { wfatal(_("it seems that there already is a window manager running")); - exit(1); + Exit(1); } } else { wScreen[wScreenCount] = wScreenInit(j); @@ -800,11 +818,13 @@ StartUp(Bool defaultScreenOnly) if (wScreenCount == 0) { wfatal(_("could not manage any screen")); - exit(1); + Exit(1); } - /* setup defaults file polling */ - WMAddTimerHandler(3000, wDefaultsCheckDomains, NULL); + if (!wPreferences.flags.noupdates) { + /* setup defaults file polling */ + WMAddTimerHandler(3000, wDefaultsCheckDomains, NULL); + } } diff --git a/src/wconfig.h b/src/wconfig.h index f8d15d1d..bff15b07 100644 --- a/src/wconfig.h +++ b/src/wconfig.h @@ -42,14 +42,6 @@ #define ANIMATIONS -/* - * mimic N*XTSTEP behaviour as close as possible. - * affected behaviour: - * - disable auto-lower miniwindows - */ -#undef STRICTNS - - /* * undefine USECPP if you don't want your config files to be preprocessed * by cpp @@ -114,6 +106,11 @@ #define MWM_HINTS +/* Define if you have a 5 button mouse and want to use button 4 + * (in the root window) for switching to the previous workspace + * and 5 for the next */ +#undef MOUSE_WS_SWITCH + /* * Turn on a hack to make mouse and keyboard actions work even if * the NumLock or ScrollLock modifiers are turned on. They might @@ -199,6 +196,8 @@ #define DEF_CONFIG_PATHS \ "~/GNUstep/Library/WindowMaker:"PKGDATADIR +#define DEF_MENU_FILE "menu" + /* name of the script to execute at startup */ #define DEF_INIT_SCRIPT "autostart" @@ -249,6 +248,10 @@ #define DEF_APPMENU_X 10 #define DEF_APPMENU_Y 10 + +/* Window level where icons reside */ +#define NORMAL_ICON_LEVEL WMNormalLevel + /* do not divide main menu and submenu in different tiers, * opposed to OpenStep */ #define SINGLE_MENULEVEL diff --git a/src/wconfig.h.in b/src/wconfig.h.in index 20cafffb..733b85ba 100644 --- a/src/wconfig.h.in +++ b/src/wconfig.h.in @@ -42,14 +42,6 @@ #define ANIMATIONS -/* - * mimic N*XTSTEP behaviour as close as possible. - * affected behaviour: - * - disable auto-lower miniwindows - */ -#undef STRICTNS - - /* * undefine USECPP if you don't want your config files to be preprocessed * by cpp @@ -114,6 +106,11 @@ #define MWM_HINTS +/* Define if you have a 5 button mouse and want to use button 4 + * (in the root window) for switching to the previous workspace + * and 5 for the next */ +#undef MOUSE_WS_SWITCH + /* * Turn on a hack to make mouse and keyboard actions work even if * the NumLock or ScrollLock modifiers are turned on. They might @@ -199,6 +196,8 @@ #define DEF_CONFIG_PATHS \ "~/GNUstep/Library/WindowMaker:"PKGDATADIR +#define DEF_MENU_FILE "menu" + /* name of the script to execute at startup */ #define DEF_INIT_SCRIPT "autostart" @@ -249,6 +248,10 @@ #define DEF_APPMENU_X 10 #define DEF_APPMENU_Y 10 + +/* Window level where icons reside */ +#define NORMAL_ICON_LEVEL WMNormalLevel + /* do not divide main menu and submenu in different tiers, * opposed to OpenStep */ #define SINGLE_MENULEVEL diff --git a/src/wdefaults.c b/src/wdefaults.c index 5d15b61f..9e73149a 100644 --- a/src/wdefaults.c +++ b/src/wdefaults.c @@ -71,6 +71,7 @@ static proplist_t ANoMouseBindings; static proplist_t ANoKeyBindings; static proplist_t ANoAppIcon; /* app */ static proplist_t AKeepOnTop; +static proplist_t AKeepOnBottom; static proplist_t AOmnipresent; static proplist_t ASkipWindowList; static proplist_t AKeepInsideScreen; @@ -104,6 +105,7 @@ init_wdefaults(WScreen *scr) ANoKeyBindings = PLMakeString("NoKeyBindings"); ANoAppIcon = PLMakeString("NoAppIcon"); AKeepOnTop = PLMakeString("KeepOnTop"); + AKeepOnBottom = PLMakeString("KeepOnBottom"); AOmnipresent = PLMakeString("Omnipresent"); ASkipWindowList = PLMakeString("SkipWindowList"); AKeepInsideScreen = PLMakeString("KeepInsideScreen"); @@ -254,6 +256,10 @@ wDefaultFillAttributes(WScreen *scr, char *instance, char *class, if (value) attr->floating = getBool(AKeepOnTop, value); + value = get_value(dw, dc, dn, da, AKeepOnBottom, No, useGlobalDefault); + if (value) + attr->floating = getBool(AKeepOnBottom, value); + value = get_value(dw, dc, dn, da, AOmnipresent, No, useGlobalDefault); if (value) attr->omnipresent = getBool(AOmnipresent, value); @@ -522,7 +528,8 @@ wDefaultChangeIcon(WScreen *scr, char *instance, char* class, char *file) else if (icon_value!=NULL && !same) { PLInsertDictionaryEntry(dict, key, icon_value); } - PLSave(dict, YES); + if (!wPreferences.flags.noupdates) + PLSave(dict, YES); PLRelease(key); if(icon_value) diff --git a/src/window.c b/src/window.c index 863274a6..656ec2a1 100644 --- a/src/window.c +++ b/src/window.c @@ -401,6 +401,9 @@ wWindowCheckAttributeSanity(WWindow *wwin, WWindowAttributes *wflags) if (wwin->transient_for!=None && wwin->transient_for!=wwin->screen_ptr->root_win) wflags->emulate_appicon = 0; + + if (wflags->sunken && wflags->floating) + wflags->sunken = 0; } @@ -527,11 +530,9 @@ wManageWindow(WScreen *scr, Window window) motif_hints = NULL; #endif /* MWM_HINTS */ - if (!PropGetClientLeader(window, &wwin->client_leader)) { - wwin->client_leader = None; - } else { + wwin->client_leader = PropGetClientLeader(window); + if (wwin->client_leader!=None) wwin->main_window = wwin->client_leader; - } if (wwin->wm_hints) XFree(wwin->wm_hints); @@ -642,11 +643,32 @@ wManageWindow(WScreen *scr, Window window) /* set GNUstep window attributes */ if (wwin->wm_gnustep_attr) { setupGNUstepHints(&wwin->window_flags, wwin->wm_gnustep_attr); + if (wwin->wm_gnustep_attr->flags & GSWindowLevelAttr) { - window_level = wwin->wm_gnustep_attr->window_level; + + switch (wwin->wm_gnustep_attr->window_level) { + case WMNormalWindowLevel: + window_level = WMNormalLevel; + break; + case WMFloatingWindowLevel: + window_level = WMFloatingLevel; + break; + case WMDockWindowLevel: + window_level = WMDockLevel; + break; + case WMSubmenuWindowLevel: + window_level = WMSubmenuLevel; + break; + case WMMainMenuWindowLevel: + window_level = WMMainMenuLevel; + break; + default: + window_level = WMNormalLevel; + break; + } } else { /* setup defaults */ - window_level = WMNormalWindowLevel; + window_level = WMNormalLevel; } } else { #ifdef MWM_HINTS @@ -655,9 +677,11 @@ wManageWindow(WScreen *scr, Window window) } #endif /* MWM_HINTS */ if (wwin->window_flags.floating) - window_level = WMFloatingWindowLevel; + window_level = WMFloatingLevel; + else if (wwin->window_flags.sunken) + window_level = WMSunkenLevel; else - window_level = WMNormalWindowLevel; + window_level = WMNormalLevel; } #ifdef MWM_HINTS if (motif_hints) @@ -1080,7 +1104,7 @@ wManageInternalWindow(WScreen *scr, Window window, Window owner, foo = WFF_RIGHT_BUTTON; foo |= WFF_TITLEBAR; - wwin->frame = wFrameWindowCreate(scr, WMFloatingWindowLevel, + wwin->frame = wFrameWindowCreate(scr, WMFloatingLevel, wwin->frame_x, wwin->frame_y, width, height, foo, scr->window_title_texture, @@ -1474,6 +1498,7 @@ wWindowChangeWorkspace(WWindow *wwin, int workspace) { WScreen *scr = wwin->screen_ptr; WApplication *wapp; + int unmap = 0; if (workspace >= scr->workspace_count || workspace < 0 || workspace == wwin->frame->workspace) @@ -1489,7 +1514,7 @@ wWindowChangeWorkspace(WWindow *wwin, int workspace) if (wapp) { wapp->last_workspace = workspace; } - XUnmapWindow(dpy, wwin->frame->core->window); + unmap = 1; wwin->flags.mapped = 0; wSetFocusTo(scr, NULL); } @@ -1504,6 +1529,8 @@ wWindowChangeWorkspace(WWindow *wwin, int workspace) wwin->frame->workspace = workspace; UpdateSwitchMenu(scr, wwin, ACTION_CHANGE_WORKSPACE); } + if (unmap) + XUnmapWindow(dpy, wwin->frame->core->window); } @@ -2028,13 +2055,21 @@ wWindowSetKeyGrabs(WWindow *wwin) void wWindowResetMouseGrabs(WWindow *wwin) { + /* Mouse grabs can't be done on the client window because of + * ICCCM and because clients that try to do the same will crash. + * + * But there is a problem wich makes tbar buttons of unfocused + * windows not usable as the click goes to the frame window instead + * of the button itself. Must figure a way to fix that. + */ + XUngrabButton(dpy, AnyButton, AnyModifier, wwin->client_win); if (!wwin->window_flags.no_bind_mouse) { /* grabs for Meta+drag */ - wHackedGrabButton(AnyButton, MOD_MASK, wwin->client_win, + wHackedGrabButton(AnyButton, MOD_MASK, wwin->client_win, True, ButtonPressMask, GrabModeSync, - GrabModeAsync, None, wCursor[WCUR_ARROW]); + GrabModeAsync, None, None); } if (!wwin->flags.focused) { @@ -2255,9 +2290,7 @@ resizebarMouseDown(WCoreWindow *sender, void *data, XEvent *event) if (event->xbutton.button == Button1) wRaiseFrame(wwin->frame->core); - if (event->xbutton.state & MOD_MASK) { - /* move the window */ -#if 0 + if (event->xbutton.window != wwin->frame->resizebar->window) { if (XGrabPointer(dpy, wwin->frame->resizebar->window, True, ButtonMotionMask|ButtonReleaseMask|ButtonPressMask, GrabModeAsync, GrabModeAsync, None, @@ -2267,22 +2300,13 @@ resizebarMouseDown(WCoreWindow *sender, void *data, XEvent *event) #endif return; } -#endif + } + + if (event->xbutton.state & MOD_MASK) { + /* move the window */ wMouseMoveWindow(wwin, event); XUngrabPointer(dpy, CurrentTime); } else { -#if 0 - /* resize the window */ - if (XGrabPointer(dpy, wwin->frame->resizebar->window, True, - ButtonMotionMask|ButtonReleaseMask|ButtonPressMask, - GrabModeAsync, GrabModeAsync, None, - None, CurrentTime)!=GrabSuccess) { -#ifdef DEBUG0 - wwarning("pointer grab failed for window resize"); -#endif - return; - } -#endif wMouseResizeWindow(wwin, event); XUngrabPointer(dpy, CurrentTime); } @@ -2385,17 +2409,15 @@ titlebarMouseDown(WCoreWindow *sender, void *data, XEvent *event) "Turn it off or some mouse actions and keyboard shortcuts will not work.")); } #endif - event->xbutton.state &= ValidModMask; - CloseWindowMenu(wwin->screen_ptr); - + if (wPreferences.focus_mode==WKF_CLICK && !(event->xbutton.state&ControlMask)) { wSetFocusTo(wwin->screen_ptr, wwin); } - + if (event->xbutton.button == Button1 || event->xbutton.button == Button2) { @@ -2411,13 +2433,36 @@ titlebarMouseDown(WCoreWindow *sender, void *data, XEvent *event) wSelectWindow(wwin, !wwin->flags.selected); return; } + if (event->xbutton.window != wwin->frame->titlebar->window + && XGrabPointer(dpy, wwin->frame->titlebar->window, False, + ButtonMotionMask|ButtonReleaseMask|ButtonPressMask, + GrabModeAsync, GrabModeAsync, None, + None, CurrentTime)!=GrabSuccess) { +#ifdef DEBUG0 + wwarning("pointer grab failed for window move"); +#endif + return; + } + /* move the window */ wMouseMoveWindow(wwin, event); + XUngrabPointer(dpy, CurrentTime); } else if (event->xbutton.button == Button3 && event->xbutton.state==0 && !wwin->flags.internal_window) { WObjDescriptor *desc; - + + if (event->xbutton.window != wwin->frame->titlebar->window + && XGrabPointer(dpy, wwin->frame->titlebar->window, False, + ButtonMotionMask|ButtonReleaseMask|ButtonPressMask, + GrabModeAsync, GrabModeAsync, None, + None, CurrentTime)!=GrabSuccess) { +#ifdef DEBUG0 + wwarning("pointer grab failed for window move"); +#endif + return; + } + OpenWindowMenu(wwin, event->xbutton.x_root, wwin->frame_y+wwin->frame->top_width, False); @@ -2425,6 +2470,8 @@ titlebarMouseDown(WCoreWindow *sender, void *data, XEvent *event) desc = &wwin->screen_ptr->window_menu->menu->descriptor; event->xany.send_event = True; (*desc->handle_mousedown)(desc, event); + + XUngrabPointer(dpy, CurrentTime); } } diff --git a/src/window.h b/src/window.h index 2cb55ee0..1ada3074 100644 --- a/src/window.h +++ b/src/window.h @@ -91,7 +91,8 @@ typedef struct { unsigned int no_shadeable:1; unsigned int omnipresent:1; unsigned int skip_window_list:1; - unsigned int floating:1; /* put in NSFloatingWindowLevel */ + unsigned int floating:1; /* put in WMFloatingLevel */ + unsigned int sunken:1; /* put in WMSunkenLevel */ unsigned int no_bind_keys:1; /* intercept wm kbd binds * while window is focused */ unsigned int no_bind_mouse:1; /* intercept mouse events diff --git a/src/winspector.c b/src/winspector.c index 2868ef55..3fef6573 100644 --- a/src/winspector.c +++ b/src/winspector.c @@ -62,6 +62,7 @@ static proplist_t ANoMouseBindings; static proplist_t ANoKeyBindings; static proplist_t ANoAppIcon; static proplist_t AKeepOnTop; +static proplist_t AKeepOnBottom; static proplist_t AOmnipresent; static proplist_t ASkipWindowList; static proplist_t AKeepInsideScreen; @@ -106,6 +107,7 @@ make_keys() ANoKeyBindings = PLMakeString("NoKeyBindings"); ANoAppIcon = PLMakeString("NoAppIcon"); AKeepOnTop = PLMakeString("KeepOnTop"); + AKeepOnBottom = PLMakeString("KeepOnBottom"); AOmnipresent = PLMakeString("Omnipresent"); ASkipWindowList = PLMakeString("SkipWindowList"); AKeepInsideScreen = PLMakeString("KeepInsideScreen"); @@ -494,12 +496,15 @@ saveSettings(WMButton *button, InspectorPanel *panel) insertAttribute(dict, winDic, AKeepOnTop, value, &different, flags); value = (WMGetButtonSelected(panel->attrChk[5])!=0) ? Yes : No; - insertAttribute(dict, winDic, AOmnipresent, value, &different, flags); + insertAttribute(dict, winDic, AKeepOnBottom, value, &different, flags); value = (WMGetButtonSelected(panel->attrChk[6])!=0) ? Yes : No; - insertAttribute(dict, winDic, AStartMiniaturized, value, &different, flags); + insertAttribute(dict, winDic, AOmnipresent, value, &different, flags); value = (WMGetButtonSelected(panel->attrChk[7])!=0) ? Yes : No; + insertAttribute(dict, winDic, AStartMiniaturized, value, &different, flags); + + value = (WMGetButtonSelected(panel->attrChk[8])!=0) ? Yes : No; insertAttribute(dict, winDic, ASkipWindowList, value, &different, flags); @@ -627,9 +632,6 @@ makeAppIconFor(WApplication *wapp) } else { PlaceIcon(scr, &x, &y); wAppIconMove(wapp->app_icon, x, y); -#ifndef STRICTNS - wLowerFrame(icon->core); -#endif } if (!clip || !wapp->app_icon->attracted || !clip->collapsed) XMapWindow(dpy, icon->core->window); @@ -677,7 +679,7 @@ applySettings(WMButton *button, InspectorPanel *panel) WWindowAttributes *wflags = &wwin->window_flags; WWindowAttributes oldFlags = *wflags; WApplication *wapp = wApplicationOf(wwin->main_window); - int floating, skip_window_list; + int floating, sunken, skip_window_list; showIconFor(WMWidgetScreen(button), panel, NULL, NULL, USE_TEXT_FIELD); @@ -686,9 +688,11 @@ applySettings(WMButton *button, InspectorPanel *panel) wflags->no_close_button = WMGetButtonSelected(panel->attrChk[2]); wflags->no_miniaturize_button = WMGetButtonSelected(panel->attrChk[3]); floating = WMGetButtonSelected(panel->attrChk[4]); - wflags->omnipresent = WMGetButtonSelected(panel->attrChk[5]); - wflags->start_miniaturized = WMGetButtonSelected(panel->attrChk[6]); - skip_window_list = WMGetButtonSelected(panel->attrChk[7]); + sunken = WMGetButtonSelected(panel->attrChk[5]); + wflags->omnipresent = WMGetButtonSelected(panel->attrChk[6]); + wflags->start_miniaturized = WMGetButtonSelected(panel->attrChk[7]); + skip_window_list = WMGetButtonSelected(panel->attrChk[8]); + wflags->no_hide_others = WMGetButtonSelected(panel->moreChk[0]); wflags->no_bind_keys = WMGetButtonSelected(panel->moreChk[1]); wflags->no_bind_mouse = WMGetButtonSelected(panel->moreChk[2]); @@ -702,12 +706,21 @@ applySettings(WMButton *button, InspectorPanel *panel) wUnshadeWindow(wwin); wflags->no_shadeable = wflags->no_titlebar; - if (wflags->floating != floating) { - int wlevel = ((wflags->floating = floating)) - ? WMFloatingWindowLevel : WMNormalWindowLevel; - ChangeStackingLevel(wwin->frame->core, wlevel); + if (floating) { + if (!wflags->floating) + ChangeStackingLevel(wwin->frame->core, WMFloatingLevel); + } else if (sunken) { + if (!wflags->sunken) + ChangeStackingLevel(wwin->frame->core, WMSunkenLevel); + } else { + if (wflags->floating || wflags->sunken) + ChangeStackingLevel(wwin->frame->core, WMNormalLevel); } + wflags->sunken = sunken; + wflags->floating = floating; + + if (wflags->skip_window_list != skip_window_list) { int action = ((wflags->skip_window_list = skip_window_list)) ? ACTION_REMOVE : ACTION_ADD; @@ -767,7 +780,7 @@ revertSettings(WMButton *button, InspectorPanel *panel) { WWindow *wwin = panel->inspected; WApplication *wapp = wApplicationOf(wwin->main_window); - int i, n, floating, skip_window_list; + int i, n, floating, sunken, skip_window_list; char *wm_instance = NULL; char *wm_class = NULL; @@ -797,7 +810,7 @@ revertSettings(WMButton *button, InspectorPanel *panel) wwin->window_flags.no_shadeable = wwin->window_flags.no_titlebar; - for (i=0; i < 8; i++) { + for (i=0; i < 9; i++) { int flag = 0; switch (i) { @@ -814,27 +827,18 @@ revertSettings(WMButton *button, InspectorPanel *panel) flag = wwin->window_flags.no_miniaturize_button; break; case 4: - floating = WMGetButtonSelected(panel->attrChk[4]); - if (wwin->window_flags.floating != floating) { - int wlevel = (wwin->window_flags.floating != 0) - ? WMFloatingWindowLevel : WMNormalWindowLevel; - ChangeStackingLevel(wwin->frame->core, wlevel); - } flag = wwin->window_flags.floating; break; case 5: - flag = wwin->window_flags.omnipresent; + flag = wwin->window_flags.sunken; break; case 6: - flag = wwin->window_flags.no_focusable; + flag = wwin->window_flags.omnipresent; break; case 7: - skip_window_list = WMGetButtonSelected(panel->attrChk[7]); - if (wwin->window_flags.skip_window_list != skip_window_list) { - int action = (wwin->window_flags.skip_window_list != 0) - ? ACTION_REMOVE : ACTION_ADD; - UpdateSwitchMenu(wwin->screen_ptr, wwin, action); - } + flag = wwin->window_flags.no_focusable; + break; + case 8: flag = wwin->window_flags.skip_window_list; break; } @@ -988,6 +992,8 @@ createInspectorForWindow(WWindow *wwin) WMMoveWidget(panel->saveBtn, 15, 310); WMSetButtonText(panel->saveBtn, _("Save")); WMResizeWidget(panel->saveBtn, btn_width, 28); + if (wPreferences.flags.noupdates) + WMSetButtonEnabled(panel->saveBtn, False); panel->applyBtn = WMCreateCommandButton(panel->win); WMSetButtonAction(panel->applyBtn, (WMAction*)applySettings, panel); @@ -1072,7 +1078,7 @@ createInspectorForWindow(WWindow *wwin) WMMoveWidget(panel->attrFrm, 15, 50); WMResizeWidget(panel->attrFrm, frame_width, 240); - for (i=0; i < 8; i++) { + for (i=0; i < 9; i++) { char *caption = NULL; int flag = 0; @@ -1094,18 +1100,22 @@ createInspectorForWindow(WWindow *wwin) flag = wwin->window_flags.no_miniaturize_button; break; case 4: - caption = _("Keep on top"); + caption = _("Keep on top / floating"); flag = wwin->window_flags.floating; break; case 5: + caption = _("Keep on bottom / sunken"); + flag = wwin->window_flags.sunken; + break; + case 6: caption = _("Omnipresent"); flag = wwin->window_flags.omnipresent; break; - case 6: + case 7: caption = _("Start Miniaturized"); flag = wwin->window_flags.start_miniaturized; break; - case 7: + case 8: caption = _("Skip window list"); flag = wwin->window_flags.skip_window_list; break; diff --git a/src/winspector.h b/src/winspector.h index 5cf162f6..787c1d2f 100644 --- a/src/winspector.h +++ b/src/winspector.h @@ -56,8 +56,8 @@ typedef struct InspectorPanel { /* second page. attributes */ WMFrame *attrFrm; - WMButton *attrChk[8]; - + WMButton *attrChk[9]; + /* 3rd page. more attributes */ WMFrame *moreFrm; WMButton *moreChk[7]; diff --git a/util/Makefile.am b/util/Makefile.am index d8a6c5a6..dee7cdc1 100644 --- a/util/Makefile.am +++ b/util/Makefile.am @@ -5,7 +5,7 @@ pkgdatadir = $(datadir)/@PACKAGE@ bin_PROGRAMS = wxcopy wxpaste wdwrite getstyle setstyle seticons geticonset wmsetbg -bin_SCRIPTS = wmaker.inst wm-oldmenu2new +bin_SCRIPTS = wmaker.inst wm-oldmenu2new wsetfont EXTRA_DIST = wmaker.inst.in bughint wm-oldmenu2new @@ -52,7 +52,7 @@ wmsetbg_SOURCES = wmsetbg.c CLEANFILES = wmaker.inst -wmaker.inst: $(srcdir)/wmaker.inst.in $(srcdir)/Makefile +wmaker.inst: $(srcdir)/wmaker.inst.in ./Makefile -rm -f wmaker.inst sed -e "s:#pkgdatadir#:$(pkgdatadir):" \ -e "s/#version#/$(VERSION)/" \ diff --git a/util/Makefile.in b/util/Makefile.in index 2d6e110d..d00b0a0b 100644 --- a/util/Makefile.in +++ b/util/Makefile.in @@ -94,7 +94,7 @@ pkgdatadir = $(datadir)/@PACKAGE@ bin_PROGRAMS = wxcopy wxpaste wdwrite getstyle setstyle seticons geticonset wmsetbg -bin_SCRIPTS = wmaker.inst wm-oldmenu2new +bin_SCRIPTS = wmaker.inst wm-oldmenu2new wsetfont EXTRA_DIST = wmaker.inst.in bughint wm-oldmenu2new @@ -397,7 +397,7 @@ clean-generic maintainer-clean-generic clean mostlyclean distclean \ maintainer-clean -wmaker.inst: $(srcdir)/wmaker.inst.in $(srcdir)/Makefile +wmaker.inst: $(srcdir)/wmaker.inst.in ./Makefile -rm -f wmaker.inst sed -e "s:#pkgdatadir#:$(pkgdatadir):" \ -e "s/#version#/$(VERSION)/" \ diff --git a/util/README b/util/README index 4908106d..414ab27c 100644 --- a/util/README +++ b/util/README @@ -30,3 +30,5 @@ wmsetbg- set the workspace background into a image and make it persist between wdwrite- write data into the defaults database (configuration files). +wsetfont- set locale the fonts needed for a specific locale for Window Maker + diff --git a/util/wm-oldmenu2new b/util/wm-oldmenu2new index 61f32f85..80f61cb6 100755 --- a/util/wm-oldmenu2new +++ b/util/wm-oldmenu2new @@ -1,203 +1,212 @@ -#!/bin/sh -# -# wm-oldmenu2new: script to convert from old-style WindowMaker -# menu file to the new PropertyList style of the WMRootMenu. -# -# Note: ex in all the Linux systems I've used is badly -# broken, except for nex. perl can be relied on however. -# Re-written to use perl. -# -# Local dependencies: -# None. -# -# Authors: Luke Kendall, Toby J Sargeant -# -# Copyright waived; no warranty provided. -# - -GLW=GNUstep/Library/WindowMaker -GD=GNUstep/Defaults -WLW=$HOME/$GLW -WD=$HOME/$GD - -MYNAME=`basename $0` -USAGE="usage: $MYNAME [menu-file-specifier] - E.g. $MYNAME menu.pt - or $MYNAME pt - the default menu if no arguments are given is the English one, 'menu'." - -# -# Process arguments - work out which language menu we're converting. -# I am *assuming* that foreign language locales have the .lang suffix -# attached to the WMRootMenu name. I hope that's right! -# -OLD_MENU=menu -NEW_MENU=WMRootMenu -if [ $# = 1 ] -then - if [ -s "$WLW/menu.$1" ] - then - OLD_MENU="menu.$1" - NEW_MENU="WMRootMenu.$1" - elif [ -s "$WLW/$1" ] - then - OLD_MENU="$1" - x=`expr "$1" : "menu\.\(.*\)"` - [ "x$x" != "x" ] && NEW_MENU="WMRootMenu.$x" - else - echo "$MYNAME: $WLW/$1 does not exist" >&2 - exit 1 - fi -elif [ $# != 0 ] -then - echo "$USAGE" >&2 - exit 1 -fi - -# -# For working out what cc is installed -# -which1() -{ - oldpath=$PATH - PATH=/bin:/usr/bin:/usr/local/bin - - IFS=":" - for j in $oldpath - do - test -x $j/$1 && test ! -d $j/$1 && echo $j/$1 && return 0 - done - IFS=" " - return 1 -} - -# -# Expand macros if necessary. -# Create a temp copy of the menu file to edit to turn into the new. -# -T=/tmp/wmmenu$$ -echo "Converting $GLW/$OLD_MENU --> $GD/$NEW_MENU" -cd $WLW || exit 1 -if [ ! -s "$OLD_MENU" ] -then - echo "$MYNAME: $WLW/$OLD_MENU does not exist" >&2 - exit 1 -fi -# -# Always pre-process, to join lines split with \, and to strip comments. -# Not to mention the main purpose, include & process wmmacros if used. -# -set -e -CC=`which1 cc` -[ "x$CC" = "x" ] && CC=`which1 gcc` -[ "x$CC" = "x" ] && "$MYNAME: no cc, gcc found - can't preprocess" >&2 && exit 1 -cp $OLD_MENU $T-c -# -# Given the set -e, the exit 1 shouldn't be needed. But it is, on my NeXT! -# -$CC -E -I. $T-c > $T+c || exit 1 -sed '/^#/d;/^[ ]*$/d' $T+c > $T -rm $T-c $T+c -set +e - -# -# This is the interesting bit. Edit the old style menu and -# convert into new style property-list menu. -# -perl - $T <<-'EOF' > $T-p - $v=chr(22); - for (<>) { - push @foo,$_; - } - for (@foo) { - s/\s*$//; - s/^(\s*)"*(Workspaces*)"*\s\s*(WORKSPACE_MENU)/\1(\2, \3),/; - s/^(\s*)("[^"]*")\s+MENU/\1($v\n\1\2,/; - push @foo2,split "\n"; - } - @foo=(); - for (@foo2) { - s/^(\s*)"([^"]*)"\s\s*END/\1),/; - s/^(\s*)"([^"]*)"\s\s*EXEC\s\s*(.*)$/\1($v\n\1"\2",$v\n\1EXEC,$v\n\1"\3"$v\n\1),/; - push @foo,split "\n"; - } - @foo2=(); - for (@foo) { - s/^(\s*)"([^"]*)"\s\s*OPEN_MENU\s\s*(.*)$/\1($v\n\1"\2",$v\n\1OPEN_MENU,$v\n\1"\3"$v\n\1),/; - push @foo2,split "\n"; - } - @foo=(); - for (@foo2) { - s/^(\s*)([^ ]*)\s\s*MENU/\1($v\n\1"\2",/; - push @foo,split "\n"; - } - @foo2=(); - for (@foo) { - s/^(\s*)([^ ]*)\s\s*END/\1),/; - s/^(\s*)([^ ]*)\s\s*EXEC\s\s*(.*)$/\1($v\n\1"\2",$v\n\1EXEC,$v\n\1"\3"$v\n\1),/; - push @foo2,split "\n"; - } - @foo=(); - for (@foo2) { - s/^(\s*)([^ ]*)\s\s*OPEN_MENU\s\s*(.*)$/\1($v\n\1"\2",$v\n\1OPEN_MENU,$v\n\1"\3"$v\n\1),/; - push @foo,split "\n"; - } - @foo2=(); - for (@foo) { - s/ WITH / QQQjjQQQ /; - s/^(\s*)"([^"]*)"\s\s*([A-Z_][A-Z_]*)$/\1("\2", \3),/; - s/^(\s*)"([^"]*)"\s+([A-Z_][A-Z_]*)\s\s*(.*)$/\1("\2", \3, \4),/; - s/"(.*".*)"/JJJqqJJJ\1JJJqqJJJ/; - /JJJqqJJJ/ && s/"/\\"/g; - s/JJJqqJJJ/"/g; - s/ QQQjjQQQ / WITH /; - print "$_\n"; - } -EOF -mv $T-p $T - -# -# Now strip off spurious commas from lines like: -# ), -# ) -# since comma is a property separator, not terminator. Sigh. -# Also correct for another problem - Linux ex's require the CTRL-V -# above; a real vi/ex doesn't; so we have to strip out any spurious -# CTRL-V characters if we're using a real ex: -# -sed 's///g' $T | awk ' - { - if (last_line != null) - { - if ((last_line ~ /,$/) && ($0 ~ /^[ ]*\)/)) - print substr(last_line, 0, length(last_line)-1) - else - print last_line - } - last_line = $0 - } - -END { - if (last_line != null) - { - if (last_line ~ /,$/) - print substr(last_line, 0, length(last_line)-1) - else - print last_line - } - } -' > $WD/$NEW_MENU.new || exit 1 - -rm $T - -# -# Now install it. -# -cd $WD -if [ -s $NEW_MENU ] -then - echo "Preserving $NEW_MENU as $NEW_MENU.sav in $WD" - mv $NEW_MENU $NEW_MENU.sav -fi -mv $NEW_MENU.new $NEW_MENU && echo "Created new $WD/$NEW_MENU" - +#!/bin/sh +# +# wm-oldmenu2new: script to convert from old-style WindowMaker +# menu file to the new PropertyList style of the WMRootMenu. +# +# Note: ex in all the Linux systems I've used is badly +# broken, except for nex. perl can be relied on however. +# Re-written to use perl. +# +# Local dependencies: +# None. +# +# Authors: Luke Kendall, Toby J Sargeant +# +# Copyright waived; no warranty provided. +# + +GLW=GNUstep/Library/WindowMaker +GD=GNUstep/Defaults +WLW=$HOME/$GLW +WD=$HOME/$GD + +MYNAME=`basename $0` +USAGE="usage: $MYNAME [menu-file-specifier] + E.g. $MYNAME menu.pt + or $MYNAME pt + The default menu if no arguments are given is the English one, 'menu'." + +# +# Process arguments - work out which language menu we're converting. +# Note that foreign language locales do *not* have the .lang suffix +# attached to the WMRootMenu name. +# +OLD_MENU=menu +NEW_MENU=WMRootMenu +if [ $# = 1 ] +then + if [ -s "$WLW/menu.$1" ] + then + OLD_MENU="menu.$1" + NEW_MENU="WMRootMenu" + elif [ -s "$WLW/$1" ] + then + OLD_MENU="$1" + x=`expr "$1" : "menu\.\(.*\)"` + [ "x$x" != "x" ] && NEW_MENU="WMRootMenu" + else + echo "$MYNAME: $WLW/$1 does not exist" >&2 + exit 1 + fi +elif [ $# != 0 ] +then + echo "$USAGE" >&2 + exit 1 +fi + +# +# For working out what cc is installed +# +which1() +{ + oldpath=$PATH + PATH=/bin:/usr/bin:/usr/local/bin + + IFS=":" + for j in $oldpath + do + test -x $j/$1 && test ! -d $j/$1 && echo $j/$1 && return 0 + done + IFS=" " + return 1 +} + +# +# Expand macros if necessary. +# Create a temp copy of the menu file to edit to turn into the new. +# +T=/tmp/wmmenu$$ +echo "Converting $GLW/$OLD_MENU --> $GD/$NEW_MENU" +cd $WLW || exit 1 +if [ ! -s "$OLD_MENU" ] +then + echo "$MYNAME: $WLW/$OLD_MENU does not exist" >&2 + exit 1 +fi +# +# Always pre-process, to join lines split with \, and to strip comments. +# Not to mention the main purpose, include & process wmmacros if used. +# +set -e +CC=`which1 cc` +[ "x$CC" = "x" ] && CC=`which1 gcc` +[ "x$CC" = "x" ] && "$MYNAME: no cc, gcc found - can't preprocess" >&2 && exit 1 + +# +# Use the "parse as if it's C option" if cc is gcc, because +# newer versions apparently get confused. Apparently gcc -E does +# not simply run the preprocessor (that's sad). +# +strings "$CC" | grep -l gcc > /dev/null && GCC_FLAGS="-x c" + +cp $OLD_MENU $T-c +# +# Given the set -e, the exit 1 shouldn't be needed. But it is, on my NeXT! +# +$CC -E -I. $GCC_FLAGS $T-c > $T+c || exit 1 +sed '/^#/d;/^[ ]*$/d' $T+c > $T +rm $T-c $T+c +set +e + +# +# This is the interesting bit. Edit the old style menu and +# convert into new style property-list menu. +# +perl - $T <<-'EOF' > $T-p + $v=chr(22); + for (<>) { + push @foo,$_; + } + for (@foo) { + s/\s*$//; + s/^(\s*)"*(Workspaces*)"*\s\s*(WORKSPACE_MENU)/\1(\2, \3),/; + s/^(\s*)("[^"]*")\s+MENU/\1($v\n\1\2,/; + push @foo2,split "\n"; + } + @foo=(); + for (@foo2) { + s/^(\s*)"([^"]*)"\s\s*END/\1),/; + s/^(\s*)"([^"]*)"\s\s*EXEC\s\s*(.*)$/\1($v\n\1"\2",$v\n\1EXEC,$v\n\1"\3"$v\n\1),/; + push @foo,split "\n"; + } + @foo2=(); + for (@foo) { + +s/^(\s*)"([^"]*)"\s\s*OPEN_MENU\s\s*(.*)$/\1($v\n\1"\2",$v\n\1OPEN_MENU,$v\n\1"\3"$v\n\1),/; + push @foo2,split "\n"; + } + @foo=(); + for (@foo2) { + s/^(\s*)([^ ]*)\s\s*MENU/\1($v\n\1"\2",/; + push @foo,split "\n"; + } + @foo2=(); + for (@foo) { + s/^(\s*)([^ ]*)\s\s*END/\1),/; + s/^(\s*)([^ ]*)\s\s*EXEC\s\s*(.*)$/\1($v\n\1"\2",$v\n\1EXEC,$v\n\1"\3"$v\n\1),/; + push @foo2,split "\n"; + } + @foo=(); + for (@foo2) { + s/^(\s*)([^ +]*)\s\s*OPEN_MENU\s\s*(.*)$/\1($v\n\1"\2",$v\n\1OPEN_MENU,$v\n\1"\3"$v\n\1),/; + push @foo,split "\n"; + } + @foo2=(); + for (@foo) { + s/ WITH / QQQjjQQQ /; + s/^(\s*)"([^"]*)"\s\s*([A-Z_][A-Z_]*)$/\1("\2", \3),/; + s/^(\s*)"([^"]*)"\s+([A-Z_][A-Z_]*)\s\s*(.*)$/\1("\2", \3, \4),/; + s/"(.*".*)"/JJJqqJJJ\1JJJqqJJJ/; + /JJJqqJJJ/ && s/"/\\"/g; + s/JJJqqJJJ/"/g; + s/ QQQjjQQQ / WITH /; + print "$_\n"; + } +EOF +mv $T-p $T + +# +# Now strip off spurious commas from lines like: +# ), +# ) +# since comma is a property separator, not terminator. Sigh. +# Also correct for another problem - Linux ex's require the CTRL-V +# above; a real vi/ex doesn't; so we have to strip out any spurious +# CTRL-V characters if we're using a real ex: +# +sed 's///g' $T | awk ' + { + if (last_line != null) + { + if ((last_line ~ /,$/) && ($0 ~ /^[ ]*\)/)) + print substr(last_line, 0, length(last_line)-1) + else + print last_line + } + last_line = $0 + } + +END { + if (last_line != null) + { + if (last_line ~ /,$/) + print substr(last_line, 0, length(last_line)-1) + else + print last_line + } + } +' > $WD/$NEW_MENU.new || exit 1 + +rm $T + +# +# Now install it. +# +cd $WD +if [ -s $NEW_MENU ] +then + echo "Preserving $NEW_MENU as $NEW_MENU.sav in $WD" + mv $NEW_MENU $NEW_MENU.sav +fi +mv $NEW_MENU.new $NEW_MENU && echo "Created new $WD/$NEW_MENU" diff --git a/util/wmaker.inst.in b/util/wmaker.inst.in index 7dc1de26..1d158af7 100644 --- a/util/wmaker.inst.in +++ b/util/wmaker.inst.in @@ -12,13 +12,15 @@ VERSION="#version#" BINDIR="#bindir#" - +make_dir() { + make_dir $1 + chmod +rw $1 +} make_script() { ISCRIPT=$1 cat << EOF >> $ISCRIPT -#!/bin/sh # Window Maker default X session startup script PATH="\$PATH:$BINDIR" @@ -79,7 +81,7 @@ if test "x$GNUSTEP_USER_ROOT" = "x"; then GSDIR=$USERDIR/GNUstep if [ ! -d $GSDIR ]; then echo "Creating $GSDIR user directory" - mkdir $GSDIR + make_dir $GSDIR fi else GSDIR=$GNUSTEP_USER_ROOT @@ -93,11 +95,11 @@ fi if [ ! -d "$GSDIR/.AppInfo" ]; then - mkdir $GSDIR/.AppInfo + make_dir $GSDIR/.AppInfo fi if [ ! -d "$GSDIR/Defaults" ]; then - mkdir $GSDIR/Defaults + make_dir $GSDIR/Defaults fi echo "Copying defaults database..." @@ -126,23 +128,23 @@ done if [ ! -d "$GSDIR/Library/Icons/" ]; then echo "Creating icon library directory $GSDIR/Library/Icons" if [ ! -d $GSDIR/Library ]; then - mkdir $GSDIR/Library + make_dir $GSDIR/Library fi - mkdir $GSDIR/Library/Icons + make_dir $GSDIR/Library/Icons fi if [ ! -d "$GSDIR/Library/WindowMaker/" ]; then echo "Creating WindowMaker data library directory $GSDIR/Library/WindowMaker" if [ ! -d $GSDIR/Library ]; then - mkdir $GSDIR/Library + make_dir $GSDIR/Library fi - mkdir $GSDIR/Library/WindowMaker + make_dir $GSDIR/Library/WindowMaker fi if [ ! -d "$GSDIR/Library/WindowMaker/Styles" ]; then echo "Creating style library $GSDIR/Library/WindowMaker/Styles" - mkdir $GSDIR/Library/WindowMaker/Styles + make_dir $GSDIR/Library/WindowMaker/Styles else echo "Styles directory already exists. Skipping..." fi @@ -150,7 +152,7 @@ fi if [ ! -d "$GSDIR/Library/WindowMaker/Themes" ]; then echo "Creating theme library $GSDIR/Library/WindowMaker/Themes" - mkdir $GSDIR/Library/WindowMaker/Themes + make_dir $GSDIR/Library/WindowMaker/Themes else echo "Themes directory already exists. Skipping..." fi @@ -158,7 +160,7 @@ fi if [ ! -d "$GSDIR/Library/WindowMaker/Backgrounds" ]; then echo "Creating bg image library $GSDIR/Library/WindowMaker/Backgrounds" - mkdir $GSDIR/Library/WindowMaker/Backgrounds + make_dir $GSDIR/Library/WindowMaker/Backgrounds else echo "Default Backgrounds directory already exists. Skipping..." fi @@ -166,7 +168,7 @@ fi if [ ! -d "$GSDIR/Library/WindowMaker/IconSets" ]; then echo "Creating icon setup library $GSDIR/Library/WindowMaker/IconSets" - mkdir $GSDIR/Library/WindowMaker/IconSets + make_dir $GSDIR/Library/WindowMaker/IconSets else echo "Default IconSets directory already exists. Skipping..." fi @@ -174,7 +176,7 @@ fi if [ ! -d "$GSDIR/Library/WindowMaker/Pixmaps" ]; then echo "Creating pixmap library $GSDIR/Library/WindowMaker/Pixmaps" - mkdir $GSDIR/Library/WindowMaker/Pixmaps + make_dir $GSDIR/Library/WindowMaker/Pixmaps else echo "Default Pixmaps directory already exists. Skipping..." fi @@ -182,7 +184,7 @@ fi if [ ! -d "$GSDIR/Library/WindowMaker/Sounds" ]; then echo "Creating sound library $GSDIR/Library/WindowMaker/Sounds" - mkdir $GSDIR/Library/WindowMaker/Sounds + make_dir $GSDIR/Library/WindowMaker/Sounds else echo "Default Sounds directory already exists. Skipping..." fi @@ -190,7 +192,7 @@ fi if [ ! -d "$GSDIR/Library/WindowMaker/SoundSets" ]; then echo "Creating sound set library $GSDIR/Library/WindowMaker/SoundSets" - mkdir $GSDIR/Library/WindowMaker/SoundSets + make_dir $GSDIR/Library/WindowMaker/SoundSets else echo "Default SoundSets directory already exists. Skipping..." fi diff --git a/util/wxpaste.c b/util/wxpaste.c index 516d0e7f..a07eaea6 100644 --- a/util/wxpaste.c +++ b/util/wxpaste.c @@ -224,7 +224,7 @@ main(int argc, char **argv) if (buf == NULL) { status = 1; } else { - if (write(STDIN_FILENO, buf, l) == -1) + if (write(STDOUT_FILENO, buf, l) == -1) status = errno; else status = 0; diff --git a/wrlib/convert.c b/wrlib/convert.c index cf9766b8..87bc94a0 100644 --- a/wrlib/convert.c +++ b/wrlib/convert.c @@ -613,7 +613,7 @@ RConvertImage(RContext *context, RImage *image, Pixmap *pixmap) image->height, context->depth); #ifdef XSHM - if (context->flags.use_shared_pixmap) + if (context->flags.use_shared_pixmap && ximg->is_shared) tmp = R_CreateXImageMappedPixmap(context, ximg); else tmp = None; diff --git a/wrlib/jpeg.c b/wrlib/jpeg.c index 20beed11..77119340 100644 --- a/wrlib/jpeg.c +++ b/wrlib/jpeg.c @@ -143,26 +143,39 @@ RLoadJPEG(RContext *context, char *file_name, int index) goto bye; } - cinfo.out_color_space = JCS_RGB; + + if(cinfo.jpeg_color_space==JCS_GRAYSCALE) { + cinfo.out_color_space=JCS_GRAYSCALE; + } else + cinfo.out_color_space = JCS_RGB; cinfo.quantize_colors = FALSE; cinfo.do_fancy_upsampling = FALSE; cinfo.do_block_smoothing = FALSE; - + jpeg_calc_output_dimensions(&cinfo); + image = RCreateImage(cinfo.image_width, cinfo.image_height, False); + if (!image) { + RErrorCode = RERR_NOMEMORY; + goto bye; + } jpeg_start_decompress(&cinfo); r = image->data[0]; g = image->data[1]; b = image->data[2]; - while (cinfo.output_scanline < cinfo.image_height) { - jpeg_read_scanlines(&cinfo, buffer, 1); + while (cinfo.output_scanline < cinfo.output_height) { + jpeg_read_scanlines(&cinfo, buffer,(JDIMENSION) 1); for (i=0,j=0; iattribs->use_shared_memory) { retry_without_shm: + + context->attribs->use_shared_memory = 0; rximg->is_shared = 0; rximg->image = XCreateImage(context->dpy, visual, depth, ZPixmap, 0, NULL, width, height, 8, 0); @@ -115,7 +117,7 @@ RCreateXImage(RContext *context, int depth, unsigned width, unsigned height) rximg->info.shmid = shmget(IPC_PRIVATE, rximg->image->bytes_per_line*height, - IPC_CREAT|0666); + IPC_CREAT|0777); if (rximg->info.shmid < 0) { context->attribs->use_shared_memory = 0; perror("wrlib:could not allocate shared memory segment"); @@ -150,7 +152,8 @@ RCreateXImage(RContext *context, int depth, unsigned width, unsigned height) perror("wrlib:shmdt"); if (shmctl(rximg->info.shmid, IPC_RMID, 0) < 0) perror("wrlib:shmctl"); - printf("wrlib:error attaching shared memory segment to XImage\n"); +/* printf("wrlib:error attaching shared memory segment to XImage\n"); + */ goto retry_without_shm; } }