diff --git a/WPrefs.app/Configurations.c b/WPrefs.app/Configurations.c index 96a54fcb..86b0fbdf 100644 --- a/WPrefs.app/Configurations.c +++ b/WPrefs.app/Configurations.c @@ -416,7 +416,7 @@ createPanel(Panel *p) WMResizeWidget(panel->noteL, 235, 28); WMMoveWidget(panel->noteL, 10, 85); WMSetLabelFont(panel->noteL, font); - WMSetLabelText(panel->noteL, _("Note: sound requires a module distributed separately")); + WMSetLabelText(panel->noteL, _("Note: sound requires a module distributed\nseparately")); WMMapSubwidgets(panel->animF); @@ -456,14 +456,14 @@ createPanel(Panel *p) WMMoveWidget(panel->dith1L, 5, 50); WMSetLabelTextAlignment(panel->dith1L, WACenter); WMSetLabelFont(panel->dith1L, font); - WMSetLabelText(panel->dith1L, _("More colors for applications")); + WMSetLabelText(panel->dith1L, _("More colors for\napplications")); panel->dith2L = WMCreateLabel(panel->dithF); WMResizeWidget(panel->dith2L, 70, 35); WMMoveWidget(panel->dith2L, 180, 50); WMSetLabelTextAlignment(panel->dith2L, WACenter); WMSetLabelFont(panel->dith2L, font); - WMSetLabelText(panel->dith2L, _("More colors for WindowMaker")); + WMSetLabelText(panel->dith2L, _("More colors for\nWindowMaker")); WMMapSubwidgets(panel->dithF); diff --git a/WPrefs.app/Expert.c b/WPrefs.app/Expert.c index 18eb03ee..504a4e5f 100644 --- a/WPrefs.app/Expert.c +++ b/WPrefs.app/Expert.c @@ -51,7 +51,7 @@ showData(_Panel *panel) WMSetButtonSelected(panel->swi[1], WMGetUDBoolForKey(udb, "NoXSetStuff")); WMSetButtonSelected(panel->swi[2], GetBoolForKey("SaveSessionOnExit")); WMSetButtonSelected(panel->swi[3], GetBoolForKey("UseSaveUnders")); - WMSetButtonSelected(panel->swi[4], GetBoolForKey("WindowsCycling")); + WMSetButtonSelected(panel->swi[4], GetBoolForKey("WindozeCycling")); WMSetButtonSelected(panel->swi[5], GetBoolForKey("DontConfirmKill")); WMSetButtonSelected(panel->swi[6], GetBoolForKey("DisableBlinking")); } diff --git a/WPrefs.app/Focus.c b/WPrefs.app/Focus.c index 39f8a460..c9988964 100644 --- a/WPrefs.app/Focus.c +++ b/WPrefs.app/Focus.c @@ -361,13 +361,13 @@ createPanel(Panel *p) panel->ignB = WMCreateSwitchButton(panel->optF); WMResizeWidget(panel->ignB, 210, 50); WMMoveWidget(panel->ignB, 15, 10); - WMSetButtonText(panel->ignB, _("Do not let applications receive the "\ - "click used to focus windows.")); + WMSetButtonText(panel->ignB, _("Do not let applications receive\n" + "the click used to focus windows.")); panel->newB = WMCreateSwitchButton(panel->optF); WMResizeWidget(panel->newB, 210, 35); WMMoveWidget(panel->newB, 15, 70); - WMSetButtonText(panel->newB, _("Automatically focus new windows.")); + WMSetButtonText(panel->newB, _("Automatically focus new\nwindows.")); WMMapSubwidgets(panel->optF); diff --git a/WPrefs.app/KeyboardShortcuts.c b/WPrefs.app/KeyboardShortcuts.c index f8ee6915..19308690 100644 --- a/WPrefs.app/KeyboardShortcuts.c +++ b/WPrefs.app/KeyboardShortcuts.c @@ -456,6 +456,7 @@ createPanel(Panel *p) WMResizeWidget(panel->instructionsL, 160, 55); WMMoveWidget(panel->instructionsL, 15, 140); WMSetLabelTextAlignment(panel->instructionsL, WACenter); + WMSetLabelWraps(panel->instructionsL, True); WMSetLabelText(panel->instructionsL, _("Click Capture to interactively define the shortcut key.")); WMMapSubwidgets(panel->shoF); diff --git a/WPrefs.app/Preferences.c b/WPrefs.app/Preferences.c index e3479bc8..be72ce82 100644 --- a/WPrefs.app/Preferences.c +++ b/WPrefs.app/Preferences.c @@ -273,13 +273,13 @@ createPanel(Panel *p) panel->raisB = WMCreateSwitchButton(panel->optF); WMResizeWidget(panel->raisB, 210, 30); WMMoveWidget(panel->raisB, 15, 7); - WMSetButtonText(panel->raisB, _("Raise window when switching focus with keyboard.")); + WMSetButtonText(panel->raisB, _("Raise window when switching\nfocus with keyboard.")); #ifdef XKB_MODELOCK panel->modeB = WMCreateSwitchButton(panel->optF); WMResizeWidget(panel->modeB, 210, 30); WMMoveWidget(panel->modeB, 15, 40); - WMSetButtonText(panel->modeB, _("Enable keyboard language switch button in window titlebars.")); + WMSetButtonText(panel->modeB, _("Enable keyboard language\nswitch button in window titlebars.")); #endif WMMapSubwidgets(panel->optF); diff --git a/WPrefs.app/README b/WPrefs.app/README index 618fb303..fce17755 100644 --- a/WPrefs.app/README +++ b/WPrefs.app/README @@ -102,10 +102,13 @@ User interface design, programming and a few icons: Additional programming: James Thompson + Dan Pascu + ]d Icon and image artwork: - Marco van Hylckama Vlieg - + Jesse Kaufman + Marco van Hylckama Vlieg + See details in README in tiff/ directory WindowMaker ----------- diff --git a/WPrefs.app/WPrefs.c b/WPrefs.app/WPrefs.c index ee534a8a..32f45cb0 100644 --- a/WPrefs.app/WPrefs.c +++ b/WPrefs.app/WPrefs.c @@ -352,8 +352,8 @@ createMainWindow(WMScreen *scr) WMMoveWidget(WPrefs.creditsL, 10, FRAME_HEIGHT-60); WMSetLabelTextAlignment(WPrefs.creditsL, WACenter); WMSetLabelText(WPrefs.creditsL, _("Programming/Design: Alfredo K. Kojima\n" - "Artwork: Marco van Hylckama Vlieg and Largo\n" - "More Programming: James Thompson")); + "Artwork: Marco van Hylckama Vlieg, Largo et al\n" + "More Programming: James Thompson et al")); WMMapSubwidgets(WPrefs.win); diff --git a/WPrefs.app/Workspace.c b/WPrefs.app/Workspace.c index 584c400b..7fc6e935 100644 --- a/WPrefs.app/Workspace.c +++ b/WPrefs.app/Workspace.c @@ -181,7 +181,7 @@ createPanel(Panel *p) WMResizeWidget(panel->cyclB, 280, 34); WMMoveWidget(panel->cyclB, 75, 30); WMSetButtonText(panel->cyclB, - _("wrap to the first workspace after the last workspace.")); + _("wrap to the first workspace after the\nlast workspace.")); panel->cyclL = WMCreateLabel(panel->navF); WMResizeWidget(panel->cyclL, 60, 60); @@ -248,7 +248,7 @@ createPanel(Panel *p) WMMoveWidget(panel->posL, 75, 165); WMSetLabelTextAlignment(panel->posL, WARight); WMSetLabelText(panel->posL, - _("Position of workspace name display")); + _("Position of workspace\nname display")); panel->posiL = WMCreateLabel(panel->navF); WMResizeWidget(panel->posiL, 60, 40); diff --git a/WPrefs.app/tiff/README b/WPrefs.app/tiff/README index 8d49a0df..abbe0a01 100644 --- a/WPrefs.app/tiff/README +++ b/WPrefs.app/tiff/README @@ -5,6 +5,7 @@ Icon Contributors Jesse Kaufman configs.tiff +Largo All other graphics are copyright 1998,1999 by Marco van Hylckama Vlieg