re-added UnderMouse Placement

added NLS support in the new configure system.

23 files changed, 174 insertions, 117 deletions

diff --git a/nls/C/Makefile.am b/nls/C/Makefile.am
index 9c0c39ce..f13b6b84 100644
--- a/nls/C/Makefile.am
+++ b/nls/C/Makefile.am
@@ -8,7 +8,7 @@ MFILES = @srcdir@/BaseDisplay.m @srcdir@/Basemenu.m @srcdir@/Configmenu.m @srcdi
 
 all-local: Translation.m openbox.cat
 install-data-local: openbox.cat
-	@if test x$(NLSTEST) = "x-DNLS"; then \
+	@if test x$(NLSTEST) = "xyes"; then \
 		echo "Installing catalog in $(DESTDIR)$(pkgdatadir)/nls/C"; \
 		$(mkinstalldirs) $(DESTDIR)$(pkgdatadir)/nls/C; \
 		$(INSTALL_DATA) openbox.cat $(DESTDIR)$(pkgdatadir)/nls/C; \
@@ -24,7 +24,7 @@ install-data-local: openbox.cat
 		ln -f -s C $(DESTDIR)$(pkgdatadir)/nls/en; \
 	fi
 uninstall-local:
-	@if test x$(NLSTEST) = "x-DNLS"; then \
+	@if test x$(NLSTEST) = "xyes"; then \
 		rm -f $(DESTDIR)$(pkgdatadir)/nls/C/openbox.cat; \
 		rm -f $(DESTDIR)$(pkgdatadir)/nls/US_ASCII; \
 		rm -f $(DESTDIR)$(pkgdatadir)/nls/POSIX; \
@@ -42,7 +42,7 @@ Translation.m: $(MFILES)
 		output=Translation.m $(MFILES)
 
 openbox.cat: Translation.m
-	@if test x$(NLSTEST) = "x-DNLS"; then \
+	@if test x$(NLSTEST) = "xyes"; then \
 		$(gencat_cmd) openbox.cat Translation.m; \
 	fi
 
diff --git a/nls/Makefile.am b/nls/Makefile.am
index 9b6c8fac..eb6fdc9e 100644
--- a/nls/Makefile.am
+++ b/nls/Makefile.am
@@ -7,7 +7,7 @@ MAINTAINERCLEANFILES = Makefile.in blackbox-nls.hh
 DISTCLEANFILES = blackbox-nls.hh
 
 uninstall-local:
-	@if test x$(NLSTEST) = "x-DNLS"; then \
+	@if test x$(NLSTEST) = "xyes"; then \
 		rmdir $(DESTDIR)$(pkgdatadir)/nls; \
 	fi
 distclean-local:
diff --git a/nls/da_DK/Makefile.am b/nls/da_DK/Makefile.am
index 1badc683..72eff11b 100644
--- a/nls/da_DK/Makefile.am
+++ b/nls/da_DK/Makefile.am
@@ -10,24 +10,24 @@ MFILES = @srcdir@/BaseDisplay.m @srcdir@/Basemenu.m @srcdir@/Configmenu.m @srcdi
 
 all-local: openbox.cat
 install-data-local: openbox.cat
-	@if test x$(NLSTEST) = "x-DNLS"; then \
+	@if test x$(NLSTEST) = "xyes"; then \
 		echo "Installing catalog in $(THE_NLS_PATH)"; \
 		$(mkinstalldirs) $(THE_NLS_PATH); \
 		$(INSTALL_DATA) openbox.cat $(THE_NLS_PATH); \
 	fi
 uninstall-local:
-	@if test x$(NLSTEST) = "x-DNLS"; then \
+	@if test x$(NLSTEST) = "xyes"; then \
 		rm -f $(THE_NLS_PATH)/openbox.cat; \
 		rmdir $(THE_NLS_PATH); \
 	fi
 
 Translation.m: $(MFILES)
-	@if test x$(NLSTEST) = "x-DNLS"; then \
+	@if test x$(NLSTEST) = "xyes"; then \
 		awk -f @srcdir@/../convert.awk output=Translation.m $(MFILES); \
 	fi
 
 openbox.cat: Translation.m
-	@if test x$(NLSTEST) = "x-DNLS"; then \
+	@if test x$(NLSTEST) = "xyes"; then \
 		$(gencat_cmd) openbox.cat Translation.m; \
 	fi
 
diff --git a/nls/de_DE/Makefile.am b/nls/de_DE/Makefile.am
index 3bb95579..b4d883a5 100644
--- a/nls/de_DE/Makefile.am
+++ b/nls/de_DE/Makefile.am
@@ -10,7 +10,7 @@ MFILES = @srcdir@/BaseDisplay.m @srcdir@/Basemenu.m @srcdir@/Configmenu.m @srcdi
 
 all-local: openbox.cat
 install-data-local: openbox.cat
-	@if test x$(NLSTEST) = "x-DNLS"; then \
+	@if test x$(NLSTEST) = "xyes"; then \
 		echo "Installing catalog in $(THE_NLS_PATH)"; \
 		$(mkinstalldirs) $(THE_NLS_PATH); \
 		$(INSTALL_DATA) openbox.cat $(THE_NLS_PATH); \
@@ -18,19 +18,19 @@ install-data-local: openbox.cat
                 ln -f -s de_DE $(DESTDIR)$(pkgdatadir)/nls/de; \
 	fi
 uninstall-local:
-	@if test x$(NLSTEST) = "x-DNLS"; then \
+	@if test x$(NLSTEST) = "xyes"; then \
 		rm -f $(THE_NLS_PATH)/openbox.cat; \
 		rm -f $(DESTDIR)$(pkgdatadir)/nls/de; \
 		rmdir $(THE_NLS_PATH); \
 	fi
 
 Translation.m: $(MFILES)
-	@if test x$(NLSTEST) = "x-DNLS"; then \
+	@if test x$(NLSTEST) = "xyes"; then \
 		awk -f @srcdir@/../convert.awk output=Translation.m $(MFILES); \
 	fi
 
 openbox.cat: Translation.m
-	@if test x$(NLSTEST) = "x-DNLS"; then \
+	@if test x$(NLSTEST) = "xyes"; then \
 		$(gencat_cmd) openbox.cat Translation.m; \
 	fi
 
diff --git a/nls/es_ES/Makefile.am b/nls/es_ES/Makefile.am
index 0108edb9..fe6d2150 100644
--- a/nls/es_ES/Makefile.am
+++ b/nls/es_ES/Makefile.am
@@ -10,7 +10,7 @@ MFILES = @srcdir@/BaseDisplay.m @srcdir@/Basemenu.m @srcdir@/Configmenu.m @srcdi
 
 all-local: openbox.cat
 install-data-local: openbox.cat
-	@if test x$(NLSTEST) = "x-DNLS"; then \
+	@if test x$(NLSTEST) = "xyes"; then \
 		echo "Installing catalog in $(THE_NLS_PATH)"; \
 		$(mkinstalldirs) $(THE_NLS_PATH); \
 		$(INSTALL_DATA) openbox.cat $(THE_NLS_PATH); \
@@ -18,19 +18,19 @@ install-data-local: openbox.cat
 		ln -f -s es_ES $(DESTDIR)$(pkgdatadir)/nls/es; \
 	fi
 uninstall-local:
-	@if test x$(NLSTEST) = "x-DNLS"; then \
+	@if test x$(NLSTEST) = "xyes"; then \
 		rm -f $(THE_NLS_PATH)/openbox.cat; \
 		rm -f $(DESTDIR)$(pkgdatadir)/nls/es; \
 		rmdir $(THE_NLS_PATH); \
 	fi
 
 Translation.m: $(MFILES)
-	@if test x$(NLSTEST) = "x-DNLS"; then \
+	@if test x$(NLSTEST) = "xyes"; then \
 		awk -f @srcdir@/../convert.awk output=Translation.m $(MFILES); \
 	fi
 
 openbox.cat: Translation.m
-	@if test x$(NLSTEST) = "x-DNLS"; then \
+	@if test x$(NLSTEST) = "xyes"; then \
 		$(gencat_cmd) openbox.cat Translation.m; \
 	fi
 
diff --git a/nls/et_EE/Makefile.am b/nls/et_EE/Makefile.am
index 9364b753..43f549b4 100644
--- a/nls/et_EE/Makefile.am
+++ b/nls/et_EE/Makefile.am
@@ -10,24 +10,24 @@ MFILES = @srcdir@/BaseDisplay.m @srcdir@/Basemenu.m @srcdir@/Configmenu.m @srcdi
 
 all-local: openbox.cat
 install-data-local: openbox.cat
-	@if test x$(NLSTEST) = "x-DNLS"; then \
+	@if test x$(NLSTEST) = "xyes"; then \
 		echo "Installing catalog in $(THE_NLS_PATH)"; \
 		$(mkinstalldirs) $(THE_NLS_PATH); \
 		$(INSTALL_DATA) openbox.cat $(THE_NLS_PATH); \
 	fi
 uninstall-local:
-	@if test x$(NLSTEST) = "x-DNLS"; then \
+	@if test x$(NLSTEST) = "xyes"; then \
 		rm -f $(THE_NLS_PATH)/openbox.cat; \
 		rmdir $(THE_NLS_PATH); \
 	fi
 
 Translation.m: $(MFILES)
-	@if test x$(NLSTEST) = "x-DNLS"; then \
+	@if test x$(NLSTEST) = "xyes"; then \
 		awk -f @srcdir@/../convert.awk output=Translation.m $(MFILES); \
 	fi
 
 openbox.cat: Translation.m
-	@if test x$(NLSTEST) = "x-DNLS"; then \
+	@if test x$(NLSTEST) = "xyes"; then \
 		$(gencat_cmd) openbox.cat Translation.m; \
 	fi
 
diff --git a/nls/fr_FR/Makefile.am b/nls/fr_FR/Makefile.am
index b407ab93..a1f27a31 100644
--- a/nls/fr_FR/Makefile.am
+++ b/nls/fr_FR/Makefile.am
@@ -10,7 +10,7 @@ MFILES = @srcdir@/BaseDisplay.m @srcdir@/Basemenu.m @srcdir@/Configmenu.m @srcdi
 
 all-local: openbox.cat
 install-data-local: openbox.cat
-	@if test x$(NLSTEST) = "x-DNLS"; then \
+	@if test x$(NLSTEST) = "xyes"; then \
 		echo "Installing catalog in $(THE_NLS_PATH)"; \
 		$(mkinstalldirs) $(THE_NLS_PATH); \
 		$(INSTALL_DATA) openbox.cat $(THE_NLS_PATH); \
@@ -18,19 +18,19 @@ install-data-local: openbox.cat
                 ln -f -s fr_FR $(DESTDIR)$(pkgdatadir)/nls/fr; \
 	fi
 uninstall-local:
-	@if test x$(NLSTEST) = "x-DNLS"; then \
+	@if test x$(NLSTEST) = "xyes"; then \
 		rm -f $(THE_NLS_PATH)/openbox.cat; \
 		rm -f $(DESTDIR)$(pkgdatadir)/nls/fr; \
 		rmdir $(THE_NLS_PATH); \
 	fi
 
 Translation.m: $(MFILES)
-	@if test x$(NLSTEST) = "x-DNLS"; then \
+	@if test x$(NLSTEST) = "xyes"; then \
 		awk -f @srcdir@/../convert.awk output=Translation.m $(MFILES); \
 	fi
 
 openbox.cat: Translation.m
-	@if test x$(NLSTEST) = "x-DNLS"; then \
+	@if test x$(NLSTEST) = "xyes"; then \
 		$(gencat_cmd) openbox.cat Translation.m; \
 	fi
 
diff --git a/nls/hu_HU/Makefile.am b/nls/hu_HU/Makefile.am
index b109c1af..a97c98ab 100644
--- a/nls/hu_HU/Makefile.am
+++ b/nls/hu_HU/Makefile.am
@@ -10,24 +10,24 @@ MFILES = @srcdir@/BaseDisplay.m @srcdir@/Basemenu.m @srcdir@/Configmenu.m @srcdi
 
 all-local: openbox.cat
 install-data-local: openbox.cat
-	@if test x$(NLSTEST) = "x-DNLS"; then \
+	@if test x$(NLSTEST) = "xyes"; then \
 		echo "Installing catalog in $(THE_NLS_PATH)"; \
 		$(mkinstalldirs) $(THE_NLS_PATH); \
 		$(INSTALL_DATA) openbox.cat $(THE_NLS_PATH); \
 	fi
 uninstall-local:
-	@if test x$(NLSTEST) = "x-DNLS"; then \
+	@if test x$(NLSTEST) = "xyes"; then \
 		rm -f $(THE_NLS_PATH)/openbox.cat; \
 		rmdir $(THE_NLS_PATH); \
 	fi
 
 Translation.m: $(MFILES)
-	@if test x$(NLSTEST) = "x-DNLS"; then \
+	@if test x$(NLSTEST) = "xyes"; then \
 		awk -f @srcdir@/../convert.awk output=Translation.m $(MFILES); \
 	fi
 
 openbox.cat: Translation.m
-	@if test x$(NLSTEST) = "x-DNLS"; then \
+	@if test x$(NLSTEST) = "xyes"; then \
 		$(gencat_cmd) openbox.cat Translation.m; \
 	fi
 
diff --git a/nls/it_IT/Makefile.am b/nls/it_IT/Makefile.am
index a2a5988f..bea5101a 100644
--- a/nls/it_IT/Makefile.am
+++ b/nls/it_IT/Makefile.am
@@ -10,27 +10,27 @@ MFILES = @srcdir@/BaseDisplay.m @srcdir@/Basemenu.m @srcdir@/Configmenu.m @srcdi
 
 all-local: openbox.cat
 install-data-local: openbox.cat
-	@if test x$(NLSTEST) = "x-DNLS"; then \
+	@if test x$(NLSTEST) = "xyes"; then \
 		echo "Installing catalog in $(THE_NLS_PATH)"; \
 		$(mkinstalldirs) $(THE_NLS_PATH); \
 		$(INSTALL_DATA) openbox.cat $(THE_NLS_PATH); \
-		rm -f $(DESTDIR)$(pkgdatadir)/nls/it; \
-		ln -f -s it_IT $(DESTDIR)$(pkgdatadir)/nls/it; \
-	fi
+                rm -f $(DESTDIR)$(pkgdatadir)/nls/it; \
+                ln -f -s it_IT $(DESTDIR)$(pkgdatadir)/nls/it; \
+fi
 uninstall-local:
-	@if test x$(NLSTEST) = "x-DNLS"; then \
+	@if test x$(NLSTEST) = "xyes"; then \
 		rm -f $(THE_NLS_PATH)/openbox.cat; \
 		rm -f $(DESTDIR)$(pkgdatadir)/nls/it; \
 		rmdir $(THE_NLS_PATH); \
 	fi
 
 Translation.m: $(MFILES)
-	@if test x$(NLSTEST) = "x-DNLS"; then \
+	@if test x$(NLSTEST) = "xyes"; then \
 		awk -f @srcdir@/../convert.awk output=Translation.m $(MFILES); \
 	fi
 
 openbox.cat: Translation.m
-	@if test x$(NLSTEST) = "x-DNLS"; then \
+	@if test x$(NLSTEST) = "xyes"; then \
 		$(gencat_cmd) openbox.cat Translation.m; \
 	fi
 
diff --git a/nls/ja_JP/Makefile.am b/nls/ja_JP/Makefile.am
index 46045a49..fcfcf633 100644
--- a/nls/ja_JP/Makefile.am
+++ b/nls/ja_JP/Makefile.am
@@ -10,24 +10,24 @@ MFILES = @srcdir@/BaseDisplay.m @srcdir@/Basemenu.m @srcdir@/Configmenu.m @srcdi
 
 all-local: openbox.cat
 install-data-local: openbox.cat
-	@if test x$(NLSTEST) = "x-DNLS"; then \
+	@if test x$(NLSTEST) = "xyes"; then \
 		echo "Installing catalog in $(THE_NLS_PATH)"; \
 		$(mkinstalldirs) $(THE_NLS_PATH); \
 		$(INSTALL_DATA) openbox.cat $(THE_NLS_PATH); \
 	fi
 uninstall-local:
-	@if test x$(NLSTEST) = "x-DNLS"; then \
+	@if test x$(NLSTEST) = "xyes"; then \
 		rm -f $(THE_NLS_PATH)/openbox.cat; \
 		rmdir $(THE_NLS_PATH); \
 	fi
 
 Translation.m: $(MFILES)
-	@if test x$(NLSTEST) = "x-DNLS"; then \
+	@if test x$(NLSTEST) = "xyes"; then \
 		awk -f @srcdir@/../convert.awk output=Translation.m $(MFILES); \
 	fi
 
 openbox.cat: Translation.m
-	@if test x$(NLSTEST) = "x-DNLS"; then \
+	@if test x$(NLSTEST) = "xyes"; then \
 		$(gencat_cmd) openbox.cat Translation.m; \
 	fi
 
diff --git a/nls/nl_NL/Makefile.am b/nls/nl_NL/Makefile.am
index cade0ea4..177003ef 100644
--- a/nls/nl_NL/Makefile.am
+++ b/nls/nl_NL/Makefile.am
@@ -10,27 +10,27 @@ MFILES = @srcdir@/BaseDisplay.m @srcdir@/Basemenu.m @srcdir@/Configmenu.m @srcdi
 
 all-local: openbox.cat
 install-data-local: openbox.cat
-	@if test x$(NLSTEST) = "x-DNLS"; then \
+	@if test x$(NLSTEST) = "xyes"; then \
 		echo "Installing catalog in $(THE_NLS_PATH)"; \
 		$(mkinstalldirs) $(THE_NLS_PATH); \
 		$(INSTALL_DATA) openbox.cat $(THE_NLS_PATH); \
-		rm -f $(DESTDIR)$(pkgdatadir)/nls/nl; \
-		ln -f -s nl_NL $(DESTDIR)$(pkgdatadir)/nls/nl; \
-	fi
+                rm -f $(DESTDIR)$(pkgdatadir)/nls/nl; \
+                ln -f -s nl_NL $(DESTDIR)$(pkgdatadir)/nls/nl; \
+fi
 uninstall-local:
-	@if test x$(NLSTEST) = "x-DNLS"; then \
+	@if test x$(NLSTEST) = "xyes"; then \
 		rm -f $(THE_NLS_PATH)/openbox.cat; \
 		rm -f $(DESTDIR)$(pkgdatadir)/nls/nl; \
 		rmdir $(THE_NLS_PATH); \
 	fi
 
 Translation.m: $(MFILES)
-	@if test x$(NLSTEST) = "x-DNLS"; then \
+	@if test x$(NLSTEST) = "xyes"; then \
 		awk -f @srcdir@/../convert.awk output=Translation.m $(MFILES); \
 	fi
 
 openbox.cat: Translation.m
-	@if test x$(NLSTEST) = "x-DNLS"; then \
+	@if test x$(NLSTEST) = "xyes"; then \
 		$(gencat_cmd) openbox.cat Translation.m; \
 	fi
 
diff --git a/nls/pt_BR/Makefile.am b/nls/pt_BR/Makefile.am
index c52861c1..957716d4 100644
--- a/nls/pt_BR/Makefile.am
+++ b/nls/pt_BR/Makefile.am
@@ -10,24 +10,24 @@ MFILES = @srcdir@/BaseDisplay.m @srcdir@/Basemenu.m @srcdir@/Configmenu.m @srcdi
 
 all-local: openbox.cat
 install-data-local: openbox.cat
-	@if test x$(NLSTEST) = "x-DNLS"; then \
+	@if test x$(NLSTEST) = "xyes"; then \
 		echo "Installing catalog in $(THE_NLS_PATH)"; \
 		$(mkinstalldirs) $(THE_NLS_PATH); \
 		$(INSTALL_DATA) openbox.cat $(THE_NLS_PATH); \
 	fi
 uninstall-local:
-	@if test x$(NLSTEST) = "x-DNLS"; then \
+	@if test x$(NLSTEST) = "xyes"; then \
 		rm -f $(THE_NLS_PATH)/openbox.cat; \
 		rmdir $(THE_NLS_PATH); \
 	fi
 
 Translation.m: $(MFILES)
-	@if test x$(NLSTEST) = "x-DNLS"; then \
+	@if test x$(NLSTEST) = "xyes"; then \
 		awk -f @srcdir@/../convert.awk output=Translation.m $(MFILES); \
 	fi
 
 openbox.cat: Translation.m
-	@if test x$(NLSTEST) = "x-DNLS"; then \
+	@if test x$(NLSTEST) = "xyes"; then \
 		$(gencat_cmd) openbox.cat Translation.m; \
 	fi
 
diff --git a/nls/ru_RU/Makefile.am b/nls/ru_RU/Makefile.am
index b148c08a..f883f664 100644
--- a/nls/ru_RU/Makefile.am
+++ b/nls/ru_RU/Makefile.am
@@ -10,24 +10,24 @@ MFILES = @srcdir@/BaseDisplay.m @srcdir@/Basemenu.m @srcdir@/Configmenu.m @srcdi
 
 all-local: openbox.cat
 install-data-local: openbox.cat
-	@if test x$(NLSTEST) = "x-DNLS"; then \
+	@if test x$(NLSTEST) = "xyes"; then \
 		echo "Installing catalog in $(THE_NLS_PATH)"; \
 		$(mkinstalldirs) $(THE_NLS_PATH); \
 		$(INSTALL_DATA) openbox.cat $(THE_NLS_PATH); \
 	fi
 uninstall-local:
-	@if test x$(NLSTEST) = "x-DNLS"; then \
+	@if test x$(NLSTEST) = "xyes"; then \
 		rm -f $(THE_NLS_PATH)/openbox.cat; \
 		rmdir $(THE_NLS_PATH); \
 	fi
 
 Translation.m: $(MFILES)
-	@if test x$(NLSTEST) = "x-DNLS"; then \
+	@if test x$(NLSTEST) = "xyes"; then \
 		awk -f @srcdir@/../convert.awk output=Translation.m $(MFILES); \
 	fi
 
 openbox.cat: Translation.m
-	@if test x$(NLSTEST) = "x-DNLS"; then \
+	@if test x$(NLSTEST) = "xyes"; then \
 		$(gencat_cmd) openbox.cat Translation.m; \
 	fi
 
diff --git a/nls/sl_SI/Makefile.am b/nls/sl_SI/Makefile.am
index f5ffde73..b006001e 100644
--- a/nls/sl_SI/Makefile.am
+++ b/nls/sl_SI/Makefile.am
@@ -10,24 +10,24 @@ MFILES = @srcdir@/BaseDisplay.m @srcdir@/Basemenu.m @srcdir@/Configmenu.m @srcdi
 
 all-local: openbox.cat
 install-data-local: openbox.cat
-	@if test x$(NLSTEST) = "x-DNLS"; then \
+	@if test x$(NLSTEST) = "xyes"; then \
 		echo "Installing catalog in $(THE_NLS_PATH)"; \
 		$(mkinstalldirs) $(THE_NLS_PATH); \
 		$(INSTALL_DATA) openbox.cat $(THE_NLS_PATH); \
 	fi
 uninstall-local:
-	@if test x$(NLSTEST) = "x-DNLS"; then \
+	@if test x$(NLSTEST) = "xyes"; then \
 		rm -f $(THE_NLS_PATH)/openbox.cat; \
 		rmdir $(THE_NLS_PATH); \
 	fi
 
 Translation.m: $(MFILES)
-	@if test x$(NLSTEST) = "x-DNLS"; then \
+	@if test x$(NLSTEST) = "xyes"; then \
 		awk -f @srcdir@/../convert.awk output=Translation.m $(MFILES); \
 	fi
 
 openbox.cat: Translation.m
-	@if test x$(NLSTEST) = "x-DNLS"; then \
+	@if test x$(NLSTEST) = "xyes"; then \
 		$(gencat_cmd) openbox.cat Translation.m; \
 	fi
 
diff --git a/nls/sv_SE/Makefile.am b/nls/sv_SE/Makefile.am
index 647a6460..737625a9 100644
--- a/nls/sv_SE/Makefile.am
+++ b/nls/sv_SE/Makefile.am
@@ -10,24 +10,24 @@ MFILES = @srcdir@/BaseDisplay.m @srcdir@/Basemenu.m @srcdir@/Configmenu.m @srcdi
 
 all-local: openbox.cat
 install-data-local: openbox.cat
-	@if test x$(NLSTEST) = "x-DNLS"; then \
+	@if test x$(NLSTEST) = "xyes"; then \
 		echo "Installing catalog in $(THE_NLS_PATH)"; \
 		$(mkinstalldirs) $(THE_NLS_PATH); \
 		$(INSTALL_DATA) openbox.cat $(THE_NLS_PATH); \
 	fi
 uninstall-local:
-	@if test x$(NLSTEST) = "x-DNLS"; then \
+	@if test x$(NLSTEST) = "xyes"; then \
 		rm -f $(THE_NLS_PATH)/openbox.cat; \
 		rmdir $(THE_NLS_PATH); \
 	fi
 
 Translation.m: $(MFILES)
-	@if test x$(NLSTEST) = "x-DNLS"; then \
+	@if test x$(NLSTEST) = "xyes"; then \
 		awk -f @srcdir@/../convert.awk output=Translation.m $(MFILES); \
 	fi
 
 openbox.cat: Translation.m
-	@if test x$(NLSTEST) = "x-DNLS"; then \
+	@if test x$(NLSTEST) = "xyes"; then \
 		$(gencat_cmd) openbox.cat Translation.m; \
 	fi
 
diff --git a/nls/tr_TR/Makefile.am b/nls/tr_TR/Makefile.am
index c28295d7..aa6c6ae4 100644
--- a/nls/tr_TR/Makefile.am
+++ b/nls/tr_TR/Makefile.am
@@ -10,24 +10,24 @@ MFILES = @srcdir@/BaseDisplay.m @srcdir@/Basemenu.m @srcdir@/Configmenu.m @srcdi
 
 all-local: openbox.cat
 install-data-local: openbox.cat
-	@if test x$(NLSTEST) = "x-DNLS"; then \
+	@if test x$(NLSTEST) = "xyes"; then \
 		echo "Installing catalog in $(THE_NLS_PATH)"; \
 		$(mkinstalldirs) $(THE_NLS_PATH); \
 		$(INSTALL_DATA) openbox.cat $(THE_NLS_PATH); \
 	fi
 uninstall-local:
-	@if test x$(NLSTEST) = "x-DNLS"; then \
+	@if test x$(NLSTEST) = "xyes"; then \
 		rm -f $(THE_NLS_PATH)/openbox.cat; \
 		rmdir $(THE_NLS_PATH); \
 	fi
 
 Translation.m: $(MFILES)
-	@if test x$(NLSTEST) = "x-DNLS"; then \
+	@if test x$(NLSTEST) = "xyes"; then \
 		awk -f @srcdir@/../convert.awk output=Translation.m $(MFILES); \
 	fi
 
 openbox.cat: Translation.m
-	@if test x$(NLSTEST) = "x-DNLS"; then \
+	@if test x$(NLSTEST) = "xyes"; then \
 		$(gencat_cmd) openbox.cat Translation.m; \
 	fi
 
diff --git a/nls/uk_UA/Makefile.am b/nls/uk_UA/Makefile.am
index 7f799e97..059d8ccc 100644
--- a/nls/uk_UA/Makefile.am
+++ b/nls/uk_UA/Makefile.am
@@ -10,24 +10,24 @@ MFILES = @srcdir@/BaseDisplay.m @srcdir@/Basemenu.m @srcdir@/Configmenu.m @srcdi
 
 all-local: openbox.cat
 install-data-local: openbox.cat
-	@if test x$(NLSTEST) = "x-DNLS"; then \
+	@if test x$(NLSTEST) = "xyes"; then \
 		echo "Installing catalog in $(THE_NLS_PATH)"; \
 		$(mkinstalldirs) $(THE_NLS_PATH); \
 		$(INSTALL_DATA) openbox.cat $(THE_NLS_PATH); \
 	fi
 uninstall-local:
-	@if test x$(NLSTEST) = "x-DNLS"; then \
+	@if test x$(NLSTEST) = "xyes"; then \
 		rm -f $(THE_NLS_PATH)/openbox.cat; \
 		rmdir $(THE_NLS_PATH); \
 	fi
 
 Translation.m: $(MFILES)
-	@if test x$(NLSTEST) = "x-DNLS"; then \
+	@if test x$(NLSTEST) = "xyes"; then \
 		awk -f @srcdir@/../convert.awk output=Translation.m $(MFILES); \
 	fi
 
 openbox.cat: Translation.m
-	@if test x$(NLSTEST) = "x-DNLS"; then \
+	@if test x$(NLSTEST) = "xyes"; then \
 		$(gencat_cmd) openbox.cat Translation.m; \
 	fi
 
diff --git a/nls/zh_CN/Makefile.am b/nls/zh_CN/Makefile.am
index 39400ec4..0fb4ee2a 100644
--- a/nls/zh_CN/Makefile.am
+++ b/nls/zh_CN/Makefile.am
@@ -10,24 +10,24 @@ MFILES = @srcdir@/BaseDisplay.m @srcdir@/Basemenu.m @srcdir@/Configmenu.m @srcdi
 
 all-local: openbox.cat
 install-data-local: openbox.cat
-	@if test x$(NLSTEST) = "x-DNLS"; then \
+	@if test x$(NLSTEST) = "xyes"; then \
 		echo "Installing catalog in $(THE_NLS_PATH)"; \
 		$(mkinstalldirs) $(THE_NLS_PATH); \
 		$(INSTALL_DATA) openbox.cat $(THE_NLS_PATH); \
 	fi
 uninstall-local:
-	@if test x$(NLSTEST) = "x-DNLS"; then \
+	@if test x$(NLSTEST) = "xyes"; then \
 		rm -f $(THE_NLS_PATH)/openbox.cat; \
 		rmdir $(THE_NLS_PATH); \
 	fi
 
 Translation.m: $(MFILES)
-	@if test x$(NLSTEST) = "x-DNLS"; then \
+	@if test x$(NLSTEST) = "xyes"; then \
 		awk -f @srcdir@/../convert.awk output=Translation.m $(MFILES); \
 	fi
 
 openbox.cat: Translation.m
-	@if test x$(NLSTEST) = "x-DNLS"; then \
+	@if test x$(NLSTEST) = "xyes"; then \
 		$(gencat_cmd) openbox.cat Translation.m; \
 	fi
 
diff --git a/nls/zh_TW/Makefile.am b/nls/zh_TW/Makefile.am
index da4fb159..98bffb95 100644
--- a/nls/zh_TW/Makefile.am
+++ b/nls/zh_TW/Makefile.am
@@ -10,24 +10,24 @@ MFILES = @srcdir@/BaseDisplay.m @srcdir@/Basemenu.m @srcdir@/Configmenu.m @srcdi
 
 all-local: openbox.cat
 install-data-local: openbox.cat
-	@if test x$(NLSTEST) = "x-DNLS"; then \
+	@if test x$(NLSTEST) = "xyes"; then \
 		echo "Installing catalog in $(THE_NLS_PATH)"; \
 		$(mkinstalldirs) $(THE_NLS_PATH); \
 		$(INSTALL_DATA) openbox.cat $(THE_NLS_PATH); \
 	fi
 uninstall-local:
-	@if test x$(NLSTEST) = "x-DNLS"; then \
+	@if test x$(NLSTEST) = "xyes"; then \
 		rm -f $(THE_NLS_PATH)/openbox.cat; \
 		rmdir $(THE_NLS_PATH); \
 	fi
 
 Translation.m: $(MFILES)
-	@if test x$(NLSTEST) = "x-DNLS"; then \
+	@if test x$(NLSTEST) = "xyes"; then \
 		awk -f @srcdir@/../convert.awk output=Translation.m $(MFILES); \
 	fi
 
 openbox.cat: Translation.m
-	@if test x$(NLSTEST) = "x-DNLS"; then \
+	@if test x$(NLSTEST) = "xyes"; then \
 		$(gencat_cmd) openbox.cat Translation.m; \
 	fi
 
diff --git a/src/Configmenu.cc b/src/Configmenu.cc
index 6d1bbed2..77755e27 100644
--- a/src/Configmenu.cc
+++ b/src/Configmenu.cc
@@ -203,6 +203,8 @@ Configmenu::Placementmenu::Placementmenu(Configmenu *cm):
          BScreen::ColSmartPlacement);
   insert(i18n(ConfigmenuSet, ConfigmenuCascade, "Cascade Placement"),
          BScreen::CascadePlacement);
+  insert(i18n(ConfigmenuSet, ConfigmenuUnderMouse, "Under Mouse Placement"),
+         BScreen::UnderMousePlacement);
   insert(i18n(ConfigmenuSet, ConfigmenuLeftRight, "Left to Right"),
          BScreen::LeftRight);
   insert(i18n(ConfigmenuSet, ConfigmenuRightLeft, "Right to Left"),
@@ -217,28 +219,26 @@ Configmenu::Placementmenu::Placementmenu(Configmenu *cm):
 
 
 void Configmenu::Placementmenu::setValues(void) {
-  switch (getScreen()->getPlacementPolicy()) {
-  case BScreen::RowSmartPlacement:
-    setItemSelected(0, True);
-    break;
-
-  case BScreen::ColSmartPlacement:
-    setItemSelected(1, True);
-    break;
-
-  case BScreen::CascadePlacement:
-    setItemSelected(2, True);
-    break;
-  }
+  int placement = getScreen()->getPlacementPolicy();
+  
+  setItemSelected(0, placement == BScreen::RowSmartPlacement);
+  setItemSelected(1, placement == BScreen::ColSmartPlacement);
+  setItemSelected(2, placement == BScreen::CascadePlacement);
+  setItemSelected(3, placement == BScreen::UnderMousePlacement);
 
   bool rl = (getScreen()->getRowPlacementDirection() == BScreen::LeftRight),
-       tb = (getScreen()->getColPlacementDirection() == BScreen::TopBottom);
-
-  setItemSelected(3, rl);
-  setItemSelected(4, ! rl);
-
-  setItemSelected(5, tb);
-  setItemSelected(6, ! tb);
+       tb = (getScreen()->getColPlacementDirection() == BScreen::TopBottom),
+       e = placement != BScreen::UnderMousePlacement;
+
+  setItemSelected(4, rl);
+  setItemSelected(5, ! rl);
+  setItemEnabled(4, e);
+  setItemEnabled(5, e);
+
+  setItemSelected(6, tb);
+  setItemSelected(7, ! tb);
+  setItemEnabled(6, e);
+  setItemEnabled(7, e);
 }
 
 
@@ -261,59 +261,88 @@ void Configmenu::Placementmenu::itemSelected(int button, unsigned int index) {
   case BScreen::RowSmartPlacement:
     getScreen()->savePlacementPolicy(item->function());
 
-    setItemSelected(0, True);
-    setItemSelected(1, False);
-    setItemSelected(2, False);
+    setItemSelected(0, true);
+    setItemSelected(1, false);
+    setItemSelected(2, false);
+    setItemSelected(3, false);
+    setItemEnabled(4, true);
+    setItemEnabled(5, true);
+    setItemEnabled(6, true);
+    setItemEnabled(7, true);
 
     break;
 
   case BScreen::ColSmartPlacement:
     getScreen()->savePlacementPolicy(item->function());
 
-    setItemSelected(0, False);
-    setItemSelected(1, True);
-    setItemSelected(2, False);
+    setItemSelected(0, false);
+    setItemSelected(1, true);
+    setItemSelected(2, false);
+    setItemSelected(3, false);
+    setItemEnabled(4, true);
+    setItemEnabled(5, true);
+    setItemEnabled(6, true);
+    setItemEnabled(7, true);
 
     break;
 
   case BScreen::CascadePlacement:
     getScreen()->savePlacementPolicy(item->function());
 
-    setItemSelected(0, False);
-    setItemSelected(1, False);
-    setItemSelected(2, True);
+    setItemSelected(0, false);
+    setItemSelected(1, false);
+    setItemSelected(2, true);
+    setItemSelected(3, false);
+    setItemEnabled(4, true);
+    setItemEnabled(5, true);
+    setItemEnabled(6, true);
+    setItemEnabled(7, true);
+
+    break;
+
+  case BScreen::UnderMousePlacement:
+    getScreen()->savePlacementPolicy(item->function());
+
+    setItemSelected(0, false);
+    setItemSelected(1, false);
+    setItemSelected(2, false);
+    setItemSelected(3, true);
+    setItemEnabled(4, false);
+    setItemEnabled(5, false);
+    setItemEnabled(6, false);
+    setItemEnabled(7, false);
 
     break;
 
   case BScreen::LeftRight:
     getScreen()->saveRowPlacementDirection(BScreen::LeftRight);
 
-    setItemSelected(3, True);
-    setItemSelected(4, False);
+    setItemSelected(4, true);
+    setItemSelected(5, false);
 
     break;
 
   case BScreen::RightLeft:
     getScreen()->saveRowPlacementDirection(BScreen::RightLeft);
 
-    setItemSelected(3, False);
-    setItemSelected(4, True);
+    setItemSelected(4, false);
+    setItemSelected(5, true);
 
     break;
 
   case BScreen::TopBottom:
     getScreen()->saveColPlacementDirection(BScreen::TopBottom);
 
-    setItemSelected(5, True);
-    setItemSelected(6, False);
+    setItemSelected(6, true);
+    setItemSelected(7, false);
 
     break;
 
   case BScreen::BottomTop:
     getScreen()->saveColPlacementDirection(BScreen::BottomTop);
 
-    setItemSelected(5, False);
-    setItemSelected(6, True);
+    setItemSelected(6, false);
+    setItemSelected(7, true);
 
     break;
   }
diff --git a/src/Screen.hh b/src/Screen.hh
index 34cc633a..3ed724f9 100644
--- a/src/Screen.hh
+++ b/src/Screen.hh
@@ -190,8 +190,8 @@ private:
 
 
 public:
-  enum { RowSmartPlacement = 1, ColSmartPlacement, CascadePlacement, LeftRight,
-         RightLeft, TopBottom, BottomTop };
+  enum { RowSmartPlacement = 1, ColSmartPlacement, CascadePlacement,
+         UnderMousePlacement, LeftRight, RightLeft, TopBottom, BottomTop };
   enum { RoundBullet = 1, TriangleBullet, SquareBullet, NoBullet };
   enum { Restart = 1, RestartOther, Exit, Shutdown, Execute, Reconfigure,
          WindowShade, WindowIconify, WindowMaximize, WindowClose, WindowRaise,
diff --git a/src/Workspace.cc b/src/Workspace.cc
index 0bc906cb..91bc1419 100644
--- a/src/Workspace.cc
+++ b/src/Workspace.cc
@@ -556,6 +556,31 @@ bool Workspace::smartPlacement(Rect& win, const Rect& availableArea) {
 }
 
 
+bool Workspace::underMousePlacement(Rect &win, const Rect &availableArea) {
+  int x, y, rx, ry;
+  Window c, r;
+  unsigned int m;
+  XQueryPointer(screen->getBlackbox()->getXDisplay(), screen->getRootWindow(),
+                &r, &c, &rx, &ry, &x, &y, &m);
+  x = rx - win.width() / 2;
+  y = ry - win.height() / 2;
+
+  if (x < availableArea.x())
+    x = availableArea.x();
+  if (y < availableArea.y())
+    y = availableArea.y();
+  if (x + win.width() > availableArea.x() + availableArea.width())
+    x = availableArea.x() + availableArea.width() - win.width();
+  if (y + win.height() > availableArea.y() + availableArea.height())
+    y = availableArea.y() + availableArea.height() - win.height();
+
+  win.setX(x);
+  win.setY(y);
+
+  return True;
+}
+
+
 bool Workspace::cascadePlacement(Rect &win, const Rect &availableArea) {
   if ((cascade_x > static_cast<signed>(availableArea.width() / 2)) ||
       (cascade_y > static_cast<signed>(availableArea.height() / 2)))
@@ -583,6 +608,8 @@ void Workspace::placeWindow(BlackboxWindow *win) {
   case BScreen::ColSmartPlacement:
     placed = smartPlacement(new_win, availableArea);
     break;
+  case BScreen::UnderMousePlacement:
+    placed = underMousePlacement(new_win, availableArea);
   default:
     break; // handled below
   } // switch
diff --git a/src/Workspace.hh b/src/Workspace.hh
index 652e8cef..dadb0dd0 100644
--- a/src/Workspace.hh
+++ b/src/Workspace.hh
@@ -64,6 +64,7 @@ private:
   void placeWindow(BlackboxWindow *win);
   bool cascadePlacement(Rect& win, const Rect& availableArea);
   bool smartPlacement(Rect& win, const Rect& availableArea);
+  bool underMousePlacement(Rect& win, const Rect& availableArea);
 
 public:
   Workspace(BScreen *scrn, unsigned int i = 0);