--- /tmp/gui/Source/NSApplication.m	Mon Sep 17 08:09:03 2001
+++ NSApplication.m	Thu Nov 15 14:43:11 2001
@@ -523,6 +523,9 @@
     
     RELEASE (_app_init_pool);
   }
+  
+  _windows_menu_title = @"Windows";
+
   return self;
 }
 
@@ -1777,7 +1780,8 @@
       anItem = [menuItems objectAtIndex: i];
       /* "Window" is for compatibility with menus ported from apple */
       if (([[anItem title] compare: @"Windows"] == NSOrderedSame) 
-	  || ([[anItem title] compare: @"Window"] == NSOrderedSame)) 
+	  || ([[anItem title] compare: @"Window"] == NSOrderedSame)
+	  || ([[anItem title] compare: _windows_menu_title] == NSOrderedSame) )
 	{
 	  _windows_menu = anItem;
 	  break;
@@ -1943,6 +1947,14 @@
     }
 }
 
+- (void) setWindowsMenuTitle: (NSString *) theTitle
+{
+  if (theTitle)
+    {
+      _windows_menu_title = theTitle;
+    }
+}
+
 - (void) setWindowsMenu: (NSMenu*)aMenu
 {
   NSMenuItem	*anItem;
@@ -1959,7 +1971,9 @@
       for (i = 0; i < count; ++i)
 	{
 	  anItem = [itemArray objectAtIndex: i];
-	  if ([[anItem title] compare: @"Windows"] == NSOrderedSame)
+	  if ([[anItem title] compare: @"Windows"] == NSOrderedSame ||
+	      [[anItem title] compare: @"Window"] == NSOrderedSame ||
+	      [[anItem title] compare: _windows_menu_title] == NSOrderedSame)
 	    {
 	      _windows_menu = anItem;
 	      break;
@@ -1967,7 +1981,7 @@
 	}
       if (_windows_menu == nil)
 	{
-	  _windows_menu = [_main_menu insertItemWithTitle: @"Windows"
+	  _windows_menu = [_main_menu insertItemWithTitle: _windows_menu_title
 						 action: 0 
 					  keyEquivalent: @""
 					        atIndex: count];