3 files changed, 52 insertions, 49 deletions

diff --git a/ChangeLog b/ChangeLog
index 4985db3..28dcb94 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,8 @@
 (Format: Year/Month/Day)
 Changes for 0.9.11
+*04/10/11:
+  * Fix a bad nls string name - it ended with Set, but was a string (Simon)
+    main.cc
 *04/10/10:
   * Fix for a minor fbrun - problem (Mathias)
     FbRun.cc
diff --git a/nls/fluxbox-nls.hh b/nls/fluxbox-nls.hh
index f3ee428..d4e7469 100644
--- a/nls/fluxbox-nls.hh
+++ b/nls/fluxbox-nls.hh
@@ -1,4 +1,4 @@
-// This file generated by nlsinfo -H -N FBNLS ../src ../util, on Mon Oct 11 00:43:45 2004
+// This file generated by nlsinfo -H -N FBNLS ../src ../util, on Mon Jun 21 00:15:24 2004
 
 #ifndef FLUXBOX_NLS_HH
 #define FLUXBOX_NLS_HH
@@ -58,17 +58,17 @@ enum {
         ConfigmenuFocusLast = 7,
         ConfigmenuFocusModel = 8,
         ConfigmenuFocusNew = 9,
-        ConfigmenuFocusedAlpha = 10,
-        ConfigmenuForcePseudoTrans = 11,
-        ConfigmenuFullMax = 12,
-        ConfigmenuImageDithering = 13,
-        ConfigmenuMenuAlpha = 14,
-        ConfigmenuOpaqueMove = 15,
-        ConfigmenuSemiSloppyFocus = 16,
-        ConfigmenuSloppyFocus = 17,
+        ConfigmenuFullMax = 10,
+        ConfigmenuImageDithering = 11,
+        ConfigmenuOpaqueMove = 12,
+        ConfigmenuSemiSloppyFocus = 13,
+        ConfigmenuSloppyFocus = 14,
+        ConfigmenuWorkspaceWarping = 15,
+        ConfigmenuForcePseudoTrans = 16,
+        ConfigmenuMenuAlpha = 17,
         ConfigmenuTransparency = 18,
-        ConfigmenuUnfocusedAlpha = 19,
-        ConfigmenuWorkspaceWarping = 20,
+        ConfigmenuFocusedAlpha = 19,
+        ConfigmenuUnfocusedAlpha = 20,
 
         EwmhSet = 5,
         EwmhOutOfMemoryClientList = 1,
@@ -115,15 +115,7 @@ enum {
         KeysBadMerge = 2,
         KeysInvalidKeyMod = 3,
 
-        LayerSet = 10,
-        LayerAboveDock = 1,
-        LayerBottom = 2,
-        LayerDesktop = 3,
-        LayerDock = 4,
-        LayerNormal = 5,
-        LayerTop = 6,
-
-        MenuSet = 11,
+        MenuSet = 10,
         MenuConfiguration = 1,
         MenuDefaultRootMenu = 2,
         MenuExit = 3,
@@ -135,7 +127,7 @@ enum {
         MenuRestart = 9,
         Menuxterm = 10,
 
-        RememberSet = 12,
+        RememberSet = 11,
         RememberDecorations = 1,
         RememberDimensions = 2,
         RememberJumpToWorkspace = 3,
@@ -148,7 +140,7 @@ enum {
         RememberUnknown = 10,
         RememberWorkspace = 11,
 
-        ScreenSet = 13,
+        ScreenSet = 12,
         ScreenAnotherWMRunning = 1,
         ScreenGeometryFormat = 2,
         ScreenGeometryLength = 3,
@@ -156,7 +148,7 @@ enum {
         ScreenPositionFormat = 5,
         ScreenPositionLength = 6,
 
-        SlitSet = 14,
+        SlitSet = 13,
         SlitClientsMenu = 1,
         SlitCycleDown = 2,
         SlitCycleUp = 3,
@@ -166,28 +158,28 @@ enum {
         SlitPlacement = 7,
         SlitSlit = 8,
 
-        ToolbarSet = 15,
-        ToolbarClock12 = 1,
-        ToolbarClock24 = 2,
-        ToolbarClockEditFormat = 3,
-        ToolbarEditWkspcName = 4,
-        ToolbarIconbarMode = 5,
-        ToolbarIconbarModeAllWindows = 6,
-        ToolbarIconbarModeIcons = 7,
-        ToolbarIconbarModeNone = 8,
-        ToolbarIconbarModeWorkspace = 9,
-        ToolbarIconbarModeWorkspaceIcons = 10,
-        ToolbarLayer = 11,
-        ToolbarOnHead = 12,
-        ToolbarPlacement = 13,
-        ToolbarShowIcons = 14,
-        ToolbarToolbar = 15,
-        ToolbarWidthPercent = 16,
-
-        WindowSet = 16,
+        ToolbarSet = 14,
+        ToolbarEditWkspcName = 1,
+        ToolbarIconbarMode = 2,
+        ToolbarIconbarModeAllWindows = 3,
+        ToolbarIconbarModeIcons = 4,
+        ToolbarIconbarModeNone = 5,
+        ToolbarIconbarModeWorkspace = 6,
+        ToolbarIconbarModeWorkspaceIcons = 7,
+        ToolbarLayer = 8,
+        ToolbarOnHead = 9,
+        ToolbarPlacement = 10,
+        ToolbarToolbar = 11,
+        ToolbarWidthPercent = 12,
+        ToolbarClock24 = 13,
+        ToolbarClock12 = 14,
+        ToolbarClockEditFormat = 15,
+        ToolbarShowIcons = 16,
+
+        WindowSet = 15,
         WindowUnnamed = 1,
 
-        WindowmenuSet = 17,
+        WindowmenuSet = 16,
         WindowmenuClose = 1,
         WindowmenuIconify = 2,
         WindowmenuLayer = 3,
@@ -198,18 +190,18 @@ enum {
         WindowmenuShade = 8,
         WindowmenuStick = 9,
 
-        WorkspaceSet = 18,
+        WorkspaceSet = 17,
         WorkspaceDefaultNameFormat = 1,
         WorkspaceMenuTitle = 2,
         WorkspaceNewWorkspace = 3,
         WorkspaceRemoveLast = 4,
 
-        bsetrootSet = 19,
+        bsetrootSet = 18,
         bsetrootMustSpecify = 1,
         bsetrootNoPixmapAtoms = 2,
         bsetrootUsage = 3,
 
-        mainSet = 20,
+        mainSet = 19,
         mainDISPLAYRequiresArg = 1,
         mainErrorBadAlloc = 2,
         mainErrorBadCast = 3,
@@ -222,7 +214,15 @@ enum {
         mainLoggingTo = 10,
         mainRCRequiresArg = 11,
         mainUsage = 12,
-        mainWarnDisplaySet = 13,
+        mainWarnDisplayEnv = 13,
+
+        LayerSet = 20,
+        LayerAboveDock = 1,
+        LayerBottom = 2,
+        LayerDesktop = 3,
+        LayerDock = 4,
+        LayerNormal = 5,
+        LayerTop = 6,
 
         dummy_not_used = 0 // just for the end
 
diff --git a/src/main.cc b/src/main.cc
index 3c9dc7f..b7fb949 100644
--- a/src/main.cc
+++ b/src/main.cc
@@ -20,7 +20,7 @@
 // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
 // DEALINGS IN THE SOFTWARE.
 
-// $Id: main.cc,v 1.31 2004/08/31 15:26:39 rathnor Exp $
+// $Id: main.cc,v 1.32 2004/10/11 22:48:35 rathnor Exp $
 
 #include "fluxbox.hh"
 #include "version.h"
@@ -187,7 +187,7 @@ int main(int argc, char **argv) {
             session_display = argv[i];
             std::string display_env = "DISPLAY=" + session_display;
             if (putenv(const_cast<char *>(display_env.c_str()))) {
-                cerr<<_FBTEXT(main, WarnDisplaySet,
+                cerr<<_FBTEXT(main, WarnDisplayEnv,
                                 "warning: couldn't set environment variable 'DISPLAY'",
                               "")<<endl;
                 perror("putenv()");