1 files changed, 23 insertions, 67 deletions
diff --git a/src/Windowmenu.cc b/src/Windowmenu.cc
index 3946e92..a79c608 100644
--- a/src/Windowmenu.cc
+++ b/src/Windowmenu.cc
@@ -52,96 +52,52 @@ screen(window->getScreen()){
        
        sendToMenu = new SendtoWorkspacemenu(this);
        sendGroupToMenu = new SendGroupToWorkspacemenu(this);
-        
+        using namespace FBNLS;  
        insert(i18n->getMessage(
-#ifdef          NLS
+                WindowmenuSet, WindowmenuSendTo,
-                                WindowmenuSet, WindowmenuSendTo,
+                "Send To ..."),
-#else // !NLS
-                                0, 0,
-#endif // NLS
-                                "Send To ..."),
         sendToMenu);
         
        insert(i18n->getMessage(
-#ifdef          NLS
+                WindowmenuSet, WindowmenuSendGroupTo,
-                                WindowmenuSet, WindowmenuSendGroupTo,
+                "Send Group To ..."),
-#else // !NLS
-                                0, 0,
-#endif // NLS
-                                "Send Group To ..."),
        sendGroupToMenu);
         
        insert(i18n->getMessage(
-#ifdef          NLS
+                WindowmenuSet, WindowmenuShade,
-                                WindowmenuSet, WindowmenuShade,
+                "Shade"),
-#else // !NLS
-                                0, 0,
-#endif // NLS
-                                "Shade"),
         BScreen::WINDOWSHADE);
        insert(i18n->getMessage(
-#ifdef          NLS
+                WindowmenuSet, WindowmenuIconify,
-                                WindowmenuSet, WindowmenuIconify,
+                "Iconify"),
-#else // !NLS
-                                0, 0,
-#endif // NLS
-                                "Iconify"),
         BScreen::WINDOWICONIFY);
        insert(i18n->getMessage(
-#ifdef          NLS
+                WindowmenuSet, WindowmenuMaximize,
-                                WindowmenuSet, WindowmenuMaximize,
+                "Maximize"),
-#else // !NLS
-                                0, 0,
-#endif // NLS
-                                "Maximize"),
         BScreen::WINDOWMAXIMIZE);
        insert(i18n->getMessage(
-#ifdef          NLS
+                WindowmenuSet, WindowmenuRaise,
-                                WindowmenuSet, WindowmenuRaise,
+                "Raise"),
-#else // !NLS
-                                0, 0,
-#endif // NLS
-                                "Raise"),
         BScreen::WINDOWRAISE);
        insert(i18n->getMessage(
-#ifdef          NLS
+                WindowmenuSet, WindowmenuLower,
-                                WindowmenuSet, WindowmenuLower,
+                "Lower"),
-#else // !NLS
-                                0, 0,
-#endif // NLS
-                                "Lower"),
         BScreen::WINDOWLOWER);
        insert(i18n->getMessage(
-#ifdef          NLS
+                WindowmenuSet, WindowmenuStick,
-                                WindowmenuSet, WindowmenuStick,
+                "Stick"),
-#else // !NLS
-                                0, 0,
-#endif // NLS
-                                "Stick"),
         BScreen::WINDOWSTICK);
        insert(i18n->getMessage(
-#ifdef          NLS
+                WindowmenuSet, WindowmenuKillClient,
-                                WindowmenuSet, WindowmenuKillClient,
+                "Kill Client"),
-#else // !NLS
-                                0, 0,
-#endif // NLS
-                                "Kill Client"),
         BScreen::WINDOWKILL);
        insert(i18n->getMessage(
-#ifdef          NLS
+                WindowmenuSet, WindowmenuClose,
-                                WindowmenuSet, WindowmenuClose,
+                "Close"),
-#else // !NLS
-                                0, 0,
-#endif // NLS
-                                "Close"),
         BScreen::WINDOWCLOSE);
        insert(i18n->getMessage(
-#ifdef          NLS
+                WindowmenuSet, WindowmenuTab,
-                                WindowmenuSet, WindowmenuTab,
+                "Tab"),
-#else // !NLS
-                                0, 0,
-#endif // NLS
-                                "Tab"),
         BScreen::WINDOWTAB);
        update();

diff --git a/src/Windowmenu.cc b/src/Windowmenu.cc index 3946e92..a79c608 100644 --- a/src/Windowmenu.cc +++ b/src/Windowmenu.cc
@@ -52,96 +52,52 @@ screen(window->getScreen()){
52		52
53	sendToMenu = new SendtoWorkspacemenu(this);	53	sendToMenu = new SendtoWorkspacemenu(this);
54	sendGroupToMenu = new SendGroupToWorkspacemenu(this);	54	sendGroupToMenu = new SendGroupToWorkspacemenu(this);
55		55	using namespace FBNLS;
56	insert(i18n->getMessage(	56	insert(i18n->getMessage(
57	#ifdef NLS	57	WindowmenuSet, WindowmenuSendTo,
58	WindowmenuSet, WindowmenuSendTo,	58	"Send To ..."),
59	#else // !NLS
60	0, 0,
61	#endif // NLS
62	"Send To ..."),
63	sendToMenu);	59	sendToMenu);
64		60
65	insert(i18n->getMessage(	61	insert(i18n->getMessage(
66	#ifdef NLS	62	WindowmenuSet, WindowmenuSendGroupTo,
67	WindowmenuSet, WindowmenuSendGroupTo,	63	"Send Group To ..."),
68	#else // !NLS
69	0, 0,
70	#endif // NLS
71	"Send Group To ..."),
72	sendGroupToMenu);	64	sendGroupToMenu);
73		65
74	insert(i18n->getMessage(	66	insert(i18n->getMessage(
75	#ifdef NLS	67	WindowmenuSet, WindowmenuShade,
76	WindowmenuSet, WindowmenuShade,	68	"Shade"),
77	#else // !NLS
78	0, 0,
79	#endif // NLS
80	"Shade"),
81	BScreen::WINDOWSHADE);	69	BScreen::WINDOWSHADE);
82	insert(i18n->getMessage(	70	insert(i18n->getMessage(
83	#ifdef NLS	71	WindowmenuSet, WindowmenuIconify,
84	WindowmenuSet, WindowmenuIconify,	72	"Iconify"),
85	#else // !NLS
86	0, 0,
87	#endif // NLS
88	"Iconify"),
89	BScreen::WINDOWICONIFY);	73	BScreen::WINDOWICONIFY);
90	insert(i18n->getMessage(	74	insert(i18n->getMessage(
91	#ifdef NLS	75	WindowmenuSet, WindowmenuMaximize,
92	WindowmenuSet, WindowmenuMaximize,	76	"Maximize"),
93	#else // !NLS
94	0, 0,
95	#endif // NLS
96	"Maximize"),
97	BScreen::WINDOWMAXIMIZE);	77	BScreen::WINDOWMAXIMIZE);
98	insert(i18n->getMessage(	78	insert(i18n->getMessage(
99	#ifdef NLS	79	WindowmenuSet, WindowmenuRaise,
100	WindowmenuSet, WindowmenuRaise,	80	"Raise"),
101	#else // !NLS
102	0, 0,
103	#endif // NLS
104	"Raise"),
105	BScreen::WINDOWRAISE);	81	BScreen::WINDOWRAISE);
106	insert(i18n->getMessage(	82	insert(i18n->getMessage(
107	#ifdef NLS	83	WindowmenuSet, WindowmenuLower,
108	WindowmenuSet, WindowmenuLower,	84	"Lower"),
109	#else // !NLS
110	0, 0,
111	#endif // NLS
112	"Lower"),
113	BScreen::WINDOWLOWER);	85	BScreen::WINDOWLOWER);
114	insert(i18n->getMessage(	86	insert(i18n->getMessage(
115	#ifdef NLS	87	WindowmenuSet, WindowmenuStick,
116	WindowmenuSet, WindowmenuStick,	88	"Stick"),
117	#else // !NLS
118	0, 0,
119	#endif // NLS
120	"Stick"),
121	BScreen::WINDOWSTICK);	89	BScreen::WINDOWSTICK);
122	insert(i18n->getMessage(	90	insert(i18n->getMessage(
123	#ifdef NLS	91	WindowmenuSet, WindowmenuKillClient,
124	WindowmenuSet, WindowmenuKillClient,	92	"Kill Client"),
125	#else // !NLS
126	0, 0,
127	#endif // NLS
128	"Kill Client"),
129	BScreen::WINDOWKILL);	93	BScreen::WINDOWKILL);
130	insert(i18n->getMessage(	94	insert(i18n->getMessage(
131	#ifdef NLS	95	WindowmenuSet, WindowmenuClose,
132	WindowmenuSet, WindowmenuClose,	96	"Close"),
133	#else // !NLS
134	0, 0,
135	#endif // NLS
136	"Close"),
137	BScreen::WINDOWCLOSE);	97	BScreen::WINDOWCLOSE);
138	insert(i18n->getMessage(	98	insert(i18n->getMessage(
139	#ifdef NLS	99	WindowmenuSet, WindowmenuTab,
140	WindowmenuSet, WindowmenuTab,	100	"Tab"),
141	#else // !NLS
142	0, 0,
143	#endif // NLS
144	"Tab"),
145	BScreen::WINDOWTAB);	101	BScreen::WINDOWTAB);
146		102
147	update();	103	update();