From b48e215ca642d1973e0b1b71e632657c2679443a Mon Sep 17 00:00:00 2001 From: Dana Jansens Date: Tue, 28 May 2002 12:21:38 +0000 Subject: [PATCH] updated nls to use openbox.cat --- configure.in | 1 + nls/C/Configmenu.m | 2 ++ nls/C/Makefile.am | 14 +++++++------- nls/da_DK/Makefile.am | 14 +++++++------- nls/de_DE/Makefile.am | 14 +++++++------- nls/es_ES/Makefile.am | 14 +++++++------- nls/et_EE/Makefile.am | 14 +++++++------- nls/fr_FR/Makefile.am | 14 +++++++------- nls/hu_HU/Makefile.am | 14 +++++++------- nls/it_IT/Makefile.am | 14 +++++++------- nls/ja_JP/Makefile.am | 14 +++++++------- nls/nl_NL/Makefile.am | 14 +++++++------- nls/pt_BR/Makefile.am | 14 +++++++------- nls/ru_RU/Makefile.am | 14 +++++++------- nls/sl_SI/Makefile.am | 14 +++++++------- nls/sv_SE/Makefile.am | 14 +++++++------- nls/tr_TR/Makefile.am | 14 +++++++------- nls/uk_UA/Makefile.am | 14 +++++++------- nls/zh_CN/Makefile.am | 14 +++++++------- nls/zh_TW/Makefile.am | 14 +++++++------- src/main.cc | 2 +- util/bsetroot.cc | 2 +- 22 files changed, 131 insertions(+), 128 deletions(-) diff --git a/configure.in b/configure.in index 4fe7beeb..1da34f1b 100644 --- a/configure.in +++ b/configure.in @@ -179,6 +179,7 @@ fi if test x$NLS = "xyes"; then AC_DEFINE(NLS,1,Include natural language support) + AC_SUBST(NLS) fi dnl Check for new timed pixmap cache diff --git a/nls/C/Configmenu.m b/nls/C/Configmenu.m index 5459d773..b0c3e019 100644 --- a/nls/C/Configmenu.m +++ b/nls/C/Configmenu.m @@ -32,6 +32,8 @@ $ #SmartCols # Smart Placement (Columns) $ #Cascade # Cascade Placement +$ #UnderMouse +# Under Mouse Placement $ #LeftRight # Left to Right $ #RightLeft diff --git a/nls/C/Makefile.am b/nls/C/Makefile.am index 6674611b..9c0c39ce 100644 --- a/nls/C/Makefile.am +++ b/nls/C/Makefile.am @@ -1,17 +1,17 @@ # nls/C/Makefile.am for Blackbox - an X11 Window Manager NLSTEST = @NLS@ -CLEANFILES = blackbox.cat +CLEANFILES = openbox.cat MAINTAINERCLEANFILES = Makefile.in Translation.m DISTCLEANFILES = Translation.m MFILES = @srcdir@/BaseDisplay.m @srcdir@/Basemenu.m @srcdir@/Configmenu.m @srcdir@/Icon.m @srcdir@/Image.m @srcdir@/Screen.m @srcdir@/Slit.m @srcdir@/Toolbar.m @srcdir@/Window.m @srcdir@/Windowmenu.m @srcdir@/Workspace.m @srcdir@/Workspacemenu.m @srcdir@/blackbox.m @srcdir@/common.m @srcdir@/main.m @srcdir@/bsetroot.m -all-local: Translation.m blackbox.cat -install-data-local: blackbox.cat +all-local: Translation.m openbox.cat +install-data-local: openbox.cat @if test x$(NLSTEST) = "x-DNLS"; then \ echo "Installing catalog in $(DESTDIR)$(pkgdatadir)/nls/C"; \ $(mkinstalldirs) $(DESTDIR)$(pkgdatadir)/nls/C; \ - $(INSTALL_DATA) blackbox.cat $(DESTDIR)$(pkgdatadir)/nls/C; \ + $(INSTALL_DATA) openbox.cat $(DESTDIR)$(pkgdatadir)/nls/C; \ rm -f $(DESTDIR)$(pkgdatadir)/nls/US_ASCII; \ ln -f -ss C $(DESTDIR)$(pkgdatadir)/nls/US_ASCII; \ rm -f $(DESTDIR)$(pkgdatadir)/nls/POSIX; \ @@ -25,7 +25,7 @@ install-data-local: blackbox.cat fi uninstall-local: @if test x$(NLSTEST) = "x-DNLS"; then \ - rm -f $(DESTDIR)$(pkgdatadir)/nls/C/blackbox.cat; \ + rm -f $(DESTDIR)$(pkgdatadir)/nls/C/openbox.cat; \ rm -f $(DESTDIR)$(pkgdatadir)/nls/US_ASCII; \ rm -f $(DESTDIR)$(pkgdatadir)/nls/POSIX; \ rm -f $(DESTDIR)$(pkgdatadir)/nls/en_US; \ @@ -41,9 +41,9 @@ Translation.m: $(MFILES) awk -f @srcdir@/../convert.awk header=../blackbox-nls.hh \ output=Translation.m $(MFILES) -blackbox.cat: Translation.m +openbox.cat: Translation.m @if test x$(NLSTEST) = "x-DNLS"; then \ - $(gencat_cmd) blackbox.cat Translation.m; \ + $(gencat_cmd) openbox.cat Translation.m; \ fi distclean-local: diff --git a/nls/da_DK/Makefile.am b/nls/da_DK/Makefile.am index 42dc37b8..1badc683 100644 --- a/nls/da_DK/Makefile.am +++ b/nls/da_DK/Makefile.am @@ -3,21 +3,21 @@ NLSTEST = @NLS@ THE_LANG = da_DK THE_NLS_PATH = $(DESTDIR)$(pkgdatadir)/nls/$(THE_LANG) -CLEANFILES = blackbox.cat +CLEANFILES = openbox.cat MAINTAINERCLEANFILES = Makefile.in Translation.m DISTCLEANFILES = Translation.m MFILES = @srcdir@/BaseDisplay.m @srcdir@/Basemenu.m @srcdir@/Configmenu.m @srcdir@/Icon.m @srcdir@/Image.m @srcdir@/Screen.m @srcdir@/Slit.m @srcdir@/Toolbar.m @srcdir@/Window.m @srcdir@/Windowmenu.m @srcdir@/Workspace.m @srcdir@/Workspacemenu.m @srcdir@/blackbox.m @srcdir@/common.m @srcdir@/main.m @srcdir@/bsetroot.m -all-local: blackbox.cat -install-data-local: blackbox.cat +all-local: openbox.cat +install-data-local: openbox.cat @if test x$(NLSTEST) = "x-DNLS"; then \ echo "Installing catalog in $(THE_NLS_PATH)"; \ $(mkinstalldirs) $(THE_NLS_PATH); \ - $(INSTALL_DATA) blackbox.cat $(THE_NLS_PATH); \ + $(INSTALL_DATA) openbox.cat $(THE_NLS_PATH); \ fi uninstall-local: @if test x$(NLSTEST) = "x-DNLS"; then \ - rm -f $(THE_NLS_PATH)/blackbox.cat; \ + rm -f $(THE_NLS_PATH)/openbox.cat; \ rmdir $(THE_NLS_PATH); \ fi @@ -26,9 +26,9 @@ Translation.m: $(MFILES) awk -f @srcdir@/../convert.awk output=Translation.m $(MFILES); \ fi -blackbox.cat: Translation.m +openbox.cat: Translation.m @if test x$(NLSTEST) = "x-DNLS"; then \ - $(gencat_cmd) blackbox.cat Translation.m; \ + $(gencat_cmd) openbox.cat Translation.m; \ fi distclean-local: diff --git a/nls/de_DE/Makefile.am b/nls/de_DE/Makefile.am index d00edae7..3bb95579 100644 --- a/nls/de_DE/Makefile.am +++ b/nls/de_DE/Makefile.am @@ -3,23 +3,23 @@ NLSTEST = @NLS@ THE_LANG = de_DE THE_NLS_PATH = $(DESTDIR)$(pkgdatadir)/nls/$(THE_LANG) -CLEANFILES = blackbox.cat +CLEANFILES = openbox.cat MAINTAINERCLEANFILES = Makefile.in Translation.m DISTCLEANFILES = Translation.m MFILES = @srcdir@/BaseDisplay.m @srcdir@/Basemenu.m @srcdir@/Configmenu.m @srcdir@/Icon.m @srcdir@/Image.m @srcdir@/Screen.m @srcdir@/Slit.m @srcdir@/Toolbar.m @srcdir@/Window.m @srcdir@/Windowmenu.m @srcdir@/Workspace.m @srcdir@/Workspacemenu.m @srcdir@/blackbox.m @srcdir@/common.m @srcdir@/main.m @srcdir@/bsetroot.m -all-local: blackbox.cat -install-data-local: blackbox.cat +all-local: openbox.cat +install-data-local: openbox.cat @if test x$(NLSTEST) = "x-DNLS"; then \ echo "Installing catalog in $(THE_NLS_PATH)"; \ $(mkinstalldirs) $(THE_NLS_PATH); \ - $(INSTALL_DATA) blackbox.cat $(THE_NLS_PATH); \ + $(INSTALL_DATA) openbox.cat $(THE_NLS_PATH); \ rm -f $(DESTDIR)$(pkgdatadir)/nls/de; \ ln -f -s de_DE $(DESTDIR)$(pkgdatadir)/nls/de; \ fi uninstall-local: @if test x$(NLSTEST) = "x-DNLS"; then \ - rm -f $(THE_NLS_PATH)/blackbox.cat; \ + rm -f $(THE_NLS_PATH)/openbox.cat; \ rm -f $(DESTDIR)$(pkgdatadir)/nls/de; \ rmdir $(THE_NLS_PATH); \ fi @@ -29,9 +29,9 @@ Translation.m: $(MFILES) awk -f @srcdir@/../convert.awk output=Translation.m $(MFILES); \ fi -blackbox.cat: Translation.m +openbox.cat: Translation.m @if test x$(NLSTEST) = "x-DNLS"; then \ - $(gencat_cmd) blackbox.cat Translation.m; \ + $(gencat_cmd) openbox.cat Translation.m; \ fi distclean-local: diff --git a/nls/es_ES/Makefile.am b/nls/es_ES/Makefile.am index 70423167..0108edb9 100644 --- a/nls/es_ES/Makefile.am +++ b/nls/es_ES/Makefile.am @@ -3,23 +3,23 @@ NLSTEST = @NLS@ THE_LANG = es_ES THE_NLS_PATH = $(DESTDIR)$(pkgdatadir)/nls/$(THE_LANG) -CLEANFILES = blackbox.cat +CLEANFILES = openbox.cat MAINTAINERCLEANFILES = Makefile.in Translation.m DISTCLEANFILES = Translation.m MFILES = @srcdir@/BaseDisplay.m @srcdir@/Basemenu.m @srcdir@/Configmenu.m @srcdir@/Icon.m @srcdir@/Image.m @srcdir@/Screen.m @srcdir@/Slit.m @srcdir@/Toolbar.m @srcdir@/Window.m @srcdir@/Windowmenu.m @srcdir@/Workspace.m @srcdir@/Workspacemenu.m @srcdir@/blackbox.m @srcdir@/common.m @srcdir@/main.m @srcdir@/bsetroot.m -all-local: blackbox.cat -install-data-local: blackbox.cat +all-local: openbox.cat +install-data-local: openbox.cat @if test x$(NLSTEST) = "x-DNLS"; then \ echo "Installing catalog in $(THE_NLS_PATH)"; \ $(mkinstalldirs) $(THE_NLS_PATH); \ - $(INSTALL_DATA) blackbox.cat $(THE_NLS_PATH); \ + $(INSTALL_DATA) openbox.cat $(THE_NLS_PATH); \ rm -f $(DESTDIR)$(pkgdatadir)/nls/es; \ ln -f -s es_ES $(DESTDIR)$(pkgdatadir)/nls/es; \ fi uninstall-local: @if test x$(NLSTEST) = "x-DNLS"; then \ - rm -f $(THE_NLS_PATH)/blackbox.cat; \ + rm -f $(THE_NLS_PATH)/openbox.cat; \ rm -f $(DESTDIR)$(pkgdatadir)/nls/es; \ rmdir $(THE_NLS_PATH); \ fi @@ -29,9 +29,9 @@ Translation.m: $(MFILES) awk -f @srcdir@/../convert.awk output=Translation.m $(MFILES); \ fi -blackbox.cat: Translation.m +openbox.cat: Translation.m @if test x$(NLSTEST) = "x-DNLS"; then \ - $(gencat_cmd) blackbox.cat Translation.m; \ + $(gencat_cmd) openbox.cat Translation.m; \ fi distclean-local: diff --git a/nls/et_EE/Makefile.am b/nls/et_EE/Makefile.am index e8b1893b..9364b753 100644 --- a/nls/et_EE/Makefile.am +++ b/nls/et_EE/Makefile.am @@ -3,21 +3,21 @@ NLSTEST = @NLS@ THE_LANG = et_ET THE_NLS_PATH = $(DESTDIR)$(pkgdatadir)/nls/$(THE_LANG) -CLEANFILES = blackbox.cat +CLEANFILES = openbox.cat MAINTAINERCLEANFILES = Makefile.in Translation.m DISTCLEANFILES = Translation.m MFILES = @srcdir@/BaseDisplay.m @srcdir@/Basemenu.m @srcdir@/Configmenu.m @srcdir@/Icon.m @srcdir@/Image.m @srcdir@/Screen.m @srcdir@/Slit.m @srcdir@/Toolbar.m @srcdir@/Window.m @srcdir@/Windowmenu.m @srcdir@/Workspace.m @srcdir@/Workspacemenu.m @srcdir@/blackbox.m @srcdir@/common.m @srcdir@/main.m @srcdir@/bsetroot.m -all-local: blackbox.cat -install-data-local: blackbox.cat +all-local: openbox.cat +install-data-local: openbox.cat @if test x$(NLSTEST) = "x-DNLS"; then \ echo "Installing catalog in $(THE_NLS_PATH)"; \ $(mkinstalldirs) $(THE_NLS_PATH); \ - $(INSTALL_DATA) blackbox.cat $(THE_NLS_PATH); \ + $(INSTALL_DATA) openbox.cat $(THE_NLS_PATH); \ fi uninstall-local: @if test x$(NLSTEST) = "x-DNLS"; then \ - rm -f $(THE_NLS_PATH)/blackbox.cat; \ + rm -f $(THE_NLS_PATH)/openbox.cat; \ rmdir $(THE_NLS_PATH); \ fi @@ -26,9 +26,9 @@ Translation.m: $(MFILES) awk -f @srcdir@/../convert.awk output=Translation.m $(MFILES); \ fi -blackbox.cat: Translation.m +openbox.cat: Translation.m @if test x$(NLSTEST) = "x-DNLS"; then \ - $(gencat_cmd) blackbox.cat Translation.m; \ + $(gencat_cmd) openbox.cat Translation.m; \ fi distclean-local: diff --git a/nls/fr_FR/Makefile.am b/nls/fr_FR/Makefile.am index 41942906..b407ab93 100644 --- a/nls/fr_FR/Makefile.am +++ b/nls/fr_FR/Makefile.am @@ -3,23 +3,23 @@ NLSTEST = @NLS@ THE_LANG = fr_FR THE_NLS_PATH = $(DESTDIR)$(pkgdatadir)/nls/$(THE_LANG) -CLEANFILES = blackbox.cat +CLEANFILES = openbox.cat MAINTAINERCLEANFILES = Makefile.in Translation.m DISTCLEANFILES = Translation.m MFILES = @srcdir@/BaseDisplay.m @srcdir@/Basemenu.m @srcdir@/Configmenu.m @srcdir@/Icon.m @srcdir@/Image.m @srcdir@/Screen.m @srcdir@/Slit.m @srcdir@/Toolbar.m @srcdir@/Window.m @srcdir@/Windowmenu.m @srcdir@/Workspace.m @srcdir@/Workspacemenu.m @srcdir@/blackbox.m @srcdir@/common.m @srcdir@/main.m @srcdir@/bsetroot.m -all-local: blackbox.cat -install-data-local: blackbox.cat +all-local: openbox.cat +install-data-local: openbox.cat @if test x$(NLSTEST) = "x-DNLS"; then \ echo "Installing catalog in $(THE_NLS_PATH)"; \ $(mkinstalldirs) $(THE_NLS_PATH); \ - $(INSTALL_DATA) blackbox.cat $(THE_NLS_PATH); \ + $(INSTALL_DATA) openbox.cat $(THE_NLS_PATH); \ rm -f $(DESTDIR)$(pkgdatadir)/nls/fr; \ ln -f -s fr_FR $(DESTDIR)$(pkgdatadir)/nls/fr; \ fi uninstall-local: @if test x$(NLSTEST) = "x-DNLS"; then \ - rm -f $(THE_NLS_PATH)/blackbox.cat; \ + rm -f $(THE_NLS_PATH)/openbox.cat; \ rm -f $(DESTDIR)$(pkgdatadir)/nls/fr; \ rmdir $(THE_NLS_PATH); \ fi @@ -29,9 +29,9 @@ Translation.m: $(MFILES) awk -f @srcdir@/../convert.awk output=Translation.m $(MFILES); \ fi -blackbox.cat: Translation.m +openbox.cat: Translation.m @if test x$(NLSTEST) = "x-DNLS"; then \ - $(gencat_cmd) blackbox.cat Translation.m; \ + $(gencat_cmd) openbox.cat Translation.m; \ fi distclean-local: diff --git a/nls/hu_HU/Makefile.am b/nls/hu_HU/Makefile.am index 37bb1023..b109c1af 100644 --- a/nls/hu_HU/Makefile.am +++ b/nls/hu_HU/Makefile.am @@ -3,21 +3,21 @@ NLSTEST = @NLS@ THE_LANG = hu_HU THE_NLS_PATH = $(DESTDIR)$(pkgdatadir)/nls/$(THE_LANG) -CLEANFILES = blackbox.cat +CLEANFILES = openbox.cat MAINTAINERCLEANFILES = Makefile.in Translation.m DISTCLEANFILES = Translation.m MFILES = @srcdir@/BaseDisplay.m @srcdir@/Basemenu.m @srcdir@/Configmenu.m @srcdir@/Icon.m @srcdir@/Image.m @srcdir@/Screen.m @srcdir@/Slit.m @srcdir@/Toolbar.m @srcdir@/Window.m @srcdir@/Windowmenu.m @srcdir@/Workspace.m @srcdir@/Workspacemenu.m @srcdir@/blackbox.m @srcdir@/common.m @srcdir@/main.m @srcdir@/bsetroot.m -all-local: blackbox.cat -install-data-local: blackbox.cat +all-local: openbox.cat +install-data-local: openbox.cat @if test x$(NLSTEST) = "x-DNLS"; then \ echo "Installing catalog in $(THE_NLS_PATH)"; \ $(mkinstalldirs) $(THE_NLS_PATH); \ - $(INSTALL_DATA) blackbox.cat $(THE_NLS_PATH); \ + $(INSTALL_DATA) openbox.cat $(THE_NLS_PATH); \ fi uninstall-local: @if test x$(NLSTEST) = "x-DNLS"; then \ - rm -f $(THE_NLS_PATH)/blackbox.cat; \ + rm -f $(THE_NLS_PATH)/openbox.cat; \ rmdir $(THE_NLS_PATH); \ fi @@ -26,9 +26,9 @@ Translation.m: $(MFILES) awk -f @srcdir@/../convert.awk output=Translation.m $(MFILES); \ fi -blackbox.cat: Translation.m +openbox.cat: Translation.m @if test x$(NLSTEST) = "x-DNLS"; then \ - $(gencat_cmd) blackbox.cat Translation.m; \ + $(gencat_cmd) openbox.cat Translation.m; \ fi distclean-local: diff --git a/nls/it_IT/Makefile.am b/nls/it_IT/Makefile.am index f3ab8827..a2a5988f 100644 --- a/nls/it_IT/Makefile.am +++ b/nls/it_IT/Makefile.am @@ -3,23 +3,23 @@ NLSTEST = @NLS@ THE_LANG = it_IT THE_NLS_PATH = $(DESTDIR)$(pkgdatadir)/nls/$(THE_LANG) -CLEANFILES = blackbox.cat +CLEANFILES = openbox.cat MAINTAINERCLEANFILES = Makefile.in Translation.m DISTCLEANFILES = Translation.m MFILES = @srcdir@/BaseDisplay.m @srcdir@/Basemenu.m @srcdir@/Configmenu.m @srcdir@/Icon.m @srcdir@/Image.m @srcdir@/Screen.m @srcdir@/Slit.m @srcdir@/Toolbar.m @srcdir@/Window.m @srcdir@/Windowmenu.m @srcdir@/Workspace.m @srcdir@/Workspacemenu.m @srcdir@/blackbox.m @srcdir@/common.m @srcdir@/main.m @srcdir@/bsetroot.m -all-local: blackbox.cat -install-data-local: blackbox.cat +all-local: openbox.cat +install-data-local: openbox.cat @if test x$(NLSTEST) = "x-DNLS"; then \ echo "Installing catalog in $(THE_NLS_PATH)"; \ $(mkinstalldirs) $(THE_NLS_PATH); \ - $(INSTALL_DATA) blackbox.cat $(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 uninstall-local: @if test x$(NLSTEST) = "x-DNLS"; then \ - rm -f $(THE_NLS_PATH)/blackbox.cat; \ + rm -f $(THE_NLS_PATH)/openbox.cat; \ rm -f $(DESTDIR)$(pkgdatadir)/nls/it; \ rmdir $(THE_NLS_PATH); \ fi @@ -29,9 +29,9 @@ Translation.m: $(MFILES) awk -f @srcdir@/../convert.awk output=Translation.m $(MFILES); \ fi -blackbox.cat: Translation.m +openbox.cat: Translation.m @if test x$(NLSTEST) = "x-DNLS"; then \ - $(gencat_cmd) blackbox.cat Translation.m; \ + $(gencat_cmd) openbox.cat Translation.m; \ fi distclean-local: diff --git a/nls/ja_JP/Makefile.am b/nls/ja_JP/Makefile.am index e7ea2342..46045a49 100644 --- a/nls/ja_JP/Makefile.am +++ b/nls/ja_JP/Makefile.am @@ -3,21 +3,21 @@ NLSTEST = @NLS@ THE_LANG = ja_JP THE_NLS_PATH = $(DESTDIR)$(pkgdatadir)/nls/$(THE_LANG) -CLEANFILES = blackbox.cat +CLEANFILES = openbox.cat MAINTAINERCLEANFILES = Makefile.in Translation.m DISTCLEANFILES = Translation.m MFILES = @srcdir@/BaseDisplay.m @srcdir@/Basemenu.m @srcdir@/Configmenu.m @srcdir@/Icon.m @srcdir@/Image.m @srcdir@/Screen.m @srcdir@/Slit.m @srcdir@/Toolbar.m @srcdir@/Window.m @srcdir@/Windowmenu.m @srcdir@/Workspace.m @srcdir@/Workspacemenu.m @srcdir@/blackbox.m @srcdir@/common.m @srcdir@/main.m @srcdir@/bsetroot.m -all-local: blackbox.cat -install-data-local: blackbox.cat +all-local: openbox.cat +install-data-local: openbox.cat @if test x$(NLSTEST) = "x-DNLS"; then \ echo "Installing catalog in $(THE_NLS_PATH)"; \ $(mkinstalldirs) $(THE_NLS_PATH); \ - $(INSTALL_DATA) blackbox.cat $(THE_NLS_PATH); \ + $(INSTALL_DATA) openbox.cat $(THE_NLS_PATH); \ fi uninstall-local: @if test x$(NLSTEST) = "x-DNLS"; then \ - rm -f $(THE_NLS_PATH)/blackbox.cat; \ + rm -f $(THE_NLS_PATH)/openbox.cat; \ rmdir $(THE_NLS_PATH); \ fi @@ -26,9 +26,9 @@ Translation.m: $(MFILES) awk -f @srcdir@/../convert.awk output=Translation.m $(MFILES); \ fi -blackbox.cat: Translation.m +openbox.cat: Translation.m @if test x$(NLSTEST) = "x-DNLS"; then \ - $(gencat_cmd) blackbox.cat Translation.m; \ + $(gencat_cmd) openbox.cat Translation.m; \ fi distclean-local: diff --git a/nls/nl_NL/Makefile.am b/nls/nl_NL/Makefile.am index ee3f834b..cade0ea4 100644 --- a/nls/nl_NL/Makefile.am +++ b/nls/nl_NL/Makefile.am @@ -3,23 +3,23 @@ NLSTEST = @NLS@ THE_LANG = nl_NL THE_NLS_PATH = $(DESTDIR)$(pkgdatadir)/nls/$(THE_LANG) -CLEANFILES = blackbox.cat +CLEANFILES = openbox.cat MAINTAINERCLEANFILES = Makefile.in Translation.m DISTCLEANFILES = Translation.m MFILES = @srcdir@/BaseDisplay.m @srcdir@/Basemenu.m @srcdir@/Configmenu.m @srcdir@/Icon.m @srcdir@/Image.m @srcdir@/Screen.m @srcdir@/Slit.m @srcdir@/Toolbar.m @srcdir@/Window.m @srcdir@/Windowmenu.m @srcdir@/Workspace.m @srcdir@/Workspacemenu.m @srcdir@/blackbox.m @srcdir@/common.m @srcdir@/main.m @srcdir@/bsetroot.m -all-local: blackbox.cat -install-data-local: blackbox.cat +all-local: openbox.cat +install-data-local: openbox.cat @if test x$(NLSTEST) = "x-DNLS"; then \ echo "Installing catalog in $(THE_NLS_PATH)"; \ $(mkinstalldirs) $(THE_NLS_PATH); \ - $(INSTALL_DATA) blackbox.cat $(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 uninstall-local: @if test x$(NLSTEST) = "x-DNLS"; then \ - rm -f $(THE_NLS_PATH)/blackbox.cat; \ + rm -f $(THE_NLS_PATH)/openbox.cat; \ rm -f $(DESTDIR)$(pkgdatadir)/nls/nl; \ rmdir $(THE_NLS_PATH); \ fi @@ -29,9 +29,9 @@ Translation.m: $(MFILES) awk -f @srcdir@/../convert.awk output=Translation.m $(MFILES); \ fi -blackbox.cat: Translation.m +openbox.cat: Translation.m @if test x$(NLSTEST) = "x-DNLS"; then \ - $(gencat_cmd) blackbox.cat Translation.m; \ + $(gencat_cmd) openbox.cat Translation.m; \ fi distclean-local: diff --git a/nls/pt_BR/Makefile.am b/nls/pt_BR/Makefile.am index 6580b370..c52861c1 100644 --- a/nls/pt_BR/Makefile.am +++ b/nls/pt_BR/Makefile.am @@ -3,21 +3,21 @@ NLSTEST = @NLS@ THE_LANG = pt_BR THE_NLS_PATH = $(DESTDIR)$(pkgdatadir)/nls/$(THE_LANG) -CLEANFILES = blackbox.cat +CLEANFILES = openbox.cat MAINTAINERCLEANFILES = Makefile.in Translation.m DISTCLEANFILES = Translation.m MFILES = @srcdir@/BaseDisplay.m @srcdir@/Basemenu.m @srcdir@/Configmenu.m @srcdir@/Icon.m @srcdir@/Image.m @srcdir@/Screen.m @srcdir@/Slit.m @srcdir@/Toolbar.m @srcdir@/Window.m @srcdir@/Windowmenu.m @srcdir@/Workspace.m @srcdir@/Workspacemenu.m @srcdir@/blackbox.m @srcdir@/common.m @srcdir@/main.m @srcdir@/bsetroot.m -all-local: blackbox.cat -install-data-local: blackbox.cat +all-local: openbox.cat +install-data-local: openbox.cat @if test x$(NLSTEST) = "x-DNLS"; then \ echo "Installing catalog in $(THE_NLS_PATH)"; \ $(mkinstalldirs) $(THE_NLS_PATH); \ - $(INSTALL_DATA) blackbox.cat $(THE_NLS_PATH); \ + $(INSTALL_DATA) openbox.cat $(THE_NLS_PATH); \ fi uninstall-local: @if test x$(NLSTEST) = "x-DNLS"; then \ - rm -f $(THE_NLS_PATH)/blackbox.cat; \ + rm -f $(THE_NLS_PATH)/openbox.cat; \ rmdir $(THE_NLS_PATH); \ fi @@ -26,9 +26,9 @@ Translation.m: $(MFILES) awk -f @srcdir@/../convert.awk output=Translation.m $(MFILES); \ fi -blackbox.cat: Translation.m +openbox.cat: Translation.m @if test x$(NLSTEST) = "x-DNLS"; then \ - $(gencat_cmd) blackbox.cat Translation.m; \ + $(gencat_cmd) openbox.cat Translation.m; \ fi distclean-local: diff --git a/nls/ru_RU/Makefile.am b/nls/ru_RU/Makefile.am index 97de4c63..b148c08a 100644 --- a/nls/ru_RU/Makefile.am +++ b/nls/ru_RU/Makefile.am @@ -3,21 +3,21 @@ NLSTEST = @NLS@ THE_LANG = ru_RU THE_NLS_PATH = $(DESTDIR)$(pkgdatadir)/nls/$(THE_LANG) -CLEANFILES = blackbox.cat +CLEANFILES = openbox.cat MAINTAINERCLEANFILES = Makefile.in Translation.m DISTCLEANFILES = Translation.m MFILES = @srcdir@/BaseDisplay.m @srcdir@/Basemenu.m @srcdir@/Configmenu.m @srcdir@/Icon.m @srcdir@/Image.m @srcdir@/Screen.m @srcdir@/Slit.m @srcdir@/Toolbar.m @srcdir@/Window.m @srcdir@/Windowmenu.m @srcdir@/Workspace.m @srcdir@/Workspacemenu.m @srcdir@/blackbox.m @srcdir@/common.m @srcdir@/main.m @srcdir@/bsetroot.m -all-local: blackbox.cat -install-data-local: blackbox.cat +all-local: openbox.cat +install-data-local: openbox.cat @if test x$(NLSTEST) = "x-DNLS"; then \ echo "Installing catalog in $(THE_NLS_PATH)"; \ $(mkinstalldirs) $(THE_NLS_PATH); \ - $(INSTALL_DATA) blackbox.cat $(THE_NLS_PATH); \ + $(INSTALL_DATA) openbox.cat $(THE_NLS_PATH); \ fi uninstall-local: @if test x$(NLSTEST) = "x-DNLS"; then \ - rm -f $(THE_NLS_PATH)/blackbox.cat; \ + rm -f $(THE_NLS_PATH)/openbox.cat; \ rmdir $(THE_NLS_PATH); \ fi @@ -26,9 +26,9 @@ Translation.m: $(MFILES) awk -f @srcdir@/../convert.awk output=Translation.m $(MFILES); \ fi -blackbox.cat: Translation.m +openbox.cat: Translation.m @if test x$(NLSTEST) = "x-DNLS"; then \ - $(gencat_cmd) blackbox.cat Translation.m; \ + $(gencat_cmd) openbox.cat Translation.m; \ fi distclean-local: diff --git a/nls/sl_SI/Makefile.am b/nls/sl_SI/Makefile.am index 0478a2d8..f5ffde73 100644 --- a/nls/sl_SI/Makefile.am +++ b/nls/sl_SI/Makefile.am @@ -3,21 +3,21 @@ NLSTEST = @NLS@ THE_LANG = sl_SI THE_NLS_PATH = $(DESTDIR)$(pkgdatadir)/nls/$(THE_LANG) -CLEANFILES = blackbox.cat +CLEANFILES = openbox.cat MAINTAINERCLEANFILES = Makefile.in Translation.m DISTCLEANFILES = Translation.m MFILES = @srcdir@/BaseDisplay.m @srcdir@/Basemenu.m @srcdir@/Configmenu.m @srcdir@/Icon.m @srcdir@/Image.m @srcdir@/Screen.m @srcdir@/Slit.m @srcdir@/Toolbar.m @srcdir@/Window.m @srcdir@/Windowmenu.m @srcdir@/Workspace.m @srcdir@/Workspacemenu.m @srcdir@/blackbox.m @srcdir@/common.m @srcdir@/main.m @srcdir@/bsetroot.m -all-local: blackbox.cat -install-data-local: blackbox.cat +all-local: openbox.cat +install-data-local: openbox.cat @if test x$(NLSTEST) = "x-DNLS"; then \ echo "Installing catalog in $(THE_NLS_PATH)"; \ $(mkinstalldirs) $(THE_NLS_PATH); \ - $(INSTALL_DATA) blackbox.cat $(THE_NLS_PATH); \ + $(INSTALL_DATA) openbox.cat $(THE_NLS_PATH); \ fi uninstall-local: @if test x$(NLSTEST) = "x-DNLS"; then \ - rm -f $(THE_NLS_PATH)/blackbox.cat; \ + rm -f $(THE_NLS_PATH)/openbox.cat; \ rmdir $(THE_NLS_PATH); \ fi @@ -26,9 +26,9 @@ Translation.m: $(MFILES) awk -f @srcdir@/../convert.awk output=Translation.m $(MFILES); \ fi -blackbox.cat: Translation.m +openbox.cat: Translation.m @if test x$(NLSTEST) = "x-DNLS"; then \ - $(gencat_cmd) blackbox.cat Translation.m; \ + $(gencat_cmd) openbox.cat Translation.m; \ fi distclean-local: diff --git a/nls/sv_SE/Makefile.am b/nls/sv_SE/Makefile.am index a8ae26b0..647a6460 100644 --- a/nls/sv_SE/Makefile.am +++ b/nls/sv_SE/Makefile.am @@ -3,21 +3,21 @@ NLSTEST = @NLS@ THE_LANG = sv_SE THE_NLS_PATH = $(DESTDIR)$(pkgdatadir)/nls/$(THE_LANG) -CLEANFILES = blackbox.cat +CLEANFILES = openbox.cat MAINTAINERCLEANFILES = Makefile.in Translation.m DISTCLEANFILES = Translation.m MFILES = @srcdir@/BaseDisplay.m @srcdir@/Basemenu.m @srcdir@/Configmenu.m @srcdir@/Icon.m @srcdir@/Image.m @srcdir@/Screen.m @srcdir@/Slit.m @srcdir@/Toolbar.m @srcdir@/Window.m @srcdir@/Windowmenu.m @srcdir@/Workspace.m @srcdir@/Workspacemenu.m @srcdir@/blackbox.m @srcdir@/common.m @srcdir@/main.m @srcdir@/bsetroot.m -all-local: blackbox.cat -install-data-local: blackbox.cat +all-local: openbox.cat +install-data-local: openbox.cat @if test x$(NLSTEST) = "x-DNLS"; then \ echo "Installing catalog in $(THE_NLS_PATH)"; \ $(mkinstalldirs) $(THE_NLS_PATH); \ - $(INSTALL_DATA) blackbox.cat $(THE_NLS_PATH); \ + $(INSTALL_DATA) openbox.cat $(THE_NLS_PATH); \ fi uninstall-local: @if test x$(NLSTEST) = "x-DNLS"; then \ - rm -f $(THE_NLS_PATH)/blackbox.cat; \ + rm -f $(THE_NLS_PATH)/openbox.cat; \ rmdir $(THE_NLS_PATH); \ fi @@ -26,9 +26,9 @@ Translation.m: $(MFILES) awk -f @srcdir@/../convert.awk output=Translation.m $(MFILES); \ fi -blackbox.cat: Translation.m +openbox.cat: Translation.m @if test x$(NLSTEST) = "x-DNLS"; then \ - $(gencat_cmd) blackbox.cat Translation.m; \ + $(gencat_cmd) openbox.cat Translation.m; \ fi distclean-local: diff --git a/nls/tr_TR/Makefile.am b/nls/tr_TR/Makefile.am index 9459afda..c28295d7 100644 --- a/nls/tr_TR/Makefile.am +++ b/nls/tr_TR/Makefile.am @@ -3,21 +3,21 @@ NLSTEST = @NLS@ THE_LANG = tr_TR THE_NLS_PATH = $(DESTDIR)$(pkgdatadir)/nls/$(THE_LANG) -CLEANFILES = blackbox.cat +CLEANFILES = openbox.cat MAINTAINERCLEANFILES = Makefile.in Translation.m DISTCLEANFILES = Translation.m MFILES = @srcdir@/BaseDisplay.m @srcdir@/Basemenu.m @srcdir@/Configmenu.m @srcdir@/Icon.m @srcdir@/Image.m @srcdir@/Screen.m @srcdir@/Slit.m @srcdir@/Toolbar.m @srcdir@/Window.m @srcdir@/Windowmenu.m @srcdir@/Workspace.m @srcdir@/Workspacemenu.m @srcdir@/blackbox.m @srcdir@/common.m @srcdir@/main.m @srcdir@/bsetroot.m -all-local: blackbox.cat -install-data-local: blackbox.cat +all-local: openbox.cat +install-data-local: openbox.cat @if test x$(NLSTEST) = "x-DNLS"; then \ echo "Installing catalog in $(THE_NLS_PATH)"; \ $(mkinstalldirs) $(THE_NLS_PATH); \ - $(INSTALL_DATA) blackbox.cat $(THE_NLS_PATH); \ + $(INSTALL_DATA) openbox.cat $(THE_NLS_PATH); \ fi uninstall-local: @if test x$(NLSTEST) = "x-DNLS"; then \ - rm -f $(THE_NLS_PATH)/blackbox.cat; \ + rm -f $(THE_NLS_PATH)/openbox.cat; \ rmdir $(THE_NLS_PATH); \ fi @@ -26,9 +26,9 @@ Translation.m: $(MFILES) awk -f @srcdir@/../convert.awk output=Translation.m $(MFILES); \ fi -blackbox.cat: Translation.m +openbox.cat: Translation.m @if test x$(NLSTEST) = "x-DNLS"; then \ - $(gencat_cmd) blackbox.cat Translation.m; \ + $(gencat_cmd) openbox.cat Translation.m; \ fi distclean-local: diff --git a/nls/uk_UA/Makefile.am b/nls/uk_UA/Makefile.am index 08e9d469..7f799e97 100644 --- a/nls/uk_UA/Makefile.am +++ b/nls/uk_UA/Makefile.am @@ -3,21 +3,21 @@ NLSTEST = @NLS@ THE_LANG = uk_UA THE_NLS_PATH = $(DESTDIR)$(pkgdatadir)/nls/$(THE_LANG) -CLEANFILES = blackbox.cat +CLEANFILES = openbox.cat MAINTAINERCLEANFILES = Makefile.in Translation.m DISTCLEANFILES = Translation.m MFILES = @srcdir@/BaseDisplay.m @srcdir@/Basemenu.m @srcdir@/Configmenu.m @srcdir@/Icon.m @srcdir@/Image.m @srcdir@/Screen.m @srcdir@/Slit.m @srcdir@/Toolbar.m @srcdir@/Window.m @srcdir@/Windowmenu.m @srcdir@/Workspace.m @srcdir@/Workspacemenu.m @srcdir@/blackbox.m @srcdir@/common.m @srcdir@/main.m @srcdir@/bsetroot.m -all-local: blackbox.cat -install-data-local: blackbox.cat +all-local: openbox.cat +install-data-local: openbox.cat @if test x$(NLSTEST) = "x-DNLS"; then \ echo "Installing catalog in $(THE_NLS_PATH)"; \ $(mkinstalldirs) $(THE_NLS_PATH); \ - $(INSTALL_DATA) blackbox.cat $(THE_NLS_PATH); \ + $(INSTALL_DATA) openbox.cat $(THE_NLS_PATH); \ fi uninstall-local: @if test x$(NLSTEST) = "x-DNLS"; then \ - rm -f $(THE_NLS_PATH)/blackbox.cat; \ + rm -f $(THE_NLS_PATH)/openbox.cat; \ rmdir $(THE_NLS_PATH); \ fi @@ -26,9 +26,9 @@ Translation.m: $(MFILES) awk -f @srcdir@/../convert.awk output=Translation.m $(MFILES); \ fi -blackbox.cat: Translation.m +openbox.cat: Translation.m @if test x$(NLSTEST) = "x-DNLS"; then \ - $(gencat_cmd) blackbox.cat Translation.m; \ + $(gencat_cmd) openbox.cat Translation.m; \ fi distclean-local: diff --git a/nls/zh_CN/Makefile.am b/nls/zh_CN/Makefile.am index d29cd987..39400ec4 100644 --- a/nls/zh_CN/Makefile.am +++ b/nls/zh_CN/Makefile.am @@ -3,21 +3,21 @@ NLSTEST = @NLS@ THE_LANG = zh_CN THE_NLS_PATH = $(DESTDIR)$(pkgdatadir)/nls/$(THE_LANG) -CLEANFILES = blackbox.cat +CLEANFILES = openbox.cat MAINTAINERCLEANFILES = Makefile.in Translation.m DISTCLEANFILES = Translation.m MFILES = @srcdir@/BaseDisplay.m @srcdir@/Basemenu.m @srcdir@/Configmenu.m @srcdir@/Icon.m @srcdir@/Image.m @srcdir@/Screen.m @srcdir@/Slit.m @srcdir@/Toolbar.m @srcdir@/Window.m @srcdir@/Windowmenu.m @srcdir@/Workspace.m @srcdir@/Workspacemenu.m @srcdir@/blackbox.m @srcdir@/common.m @srcdir@/main.m @srcdir@/bsetroot.m -all-local: blackbox.cat -install-data-local: blackbox.cat +all-local: openbox.cat +install-data-local: openbox.cat @if test x$(NLSTEST) = "x-DNLS"; then \ echo "Installing catalog in $(THE_NLS_PATH)"; \ $(mkinstalldirs) $(THE_NLS_PATH); \ - $(INSTALL_DATA) blackbox.cat $(THE_NLS_PATH); \ + $(INSTALL_DATA) openbox.cat $(THE_NLS_PATH); \ fi uninstall-local: @if test x$(NLSTEST) = "x-DNLS"; then \ - rm -f $(THE_NLS_PATH)/blackbox.cat; \ + rm -f $(THE_NLS_PATH)/openbox.cat; \ rmdir $(THE_NLS_PATH); \ fi @@ -26,9 +26,9 @@ Translation.m: $(MFILES) awk -f @srcdir@/../convert.awk output=Translation.m $(MFILES); \ fi -blackbox.cat: Translation.m +openbox.cat: Translation.m @if test x$(NLSTEST) = "x-DNLS"; then \ - $(gencat_cmd) blackbox.cat Translation.m; \ + $(gencat_cmd) openbox.cat Translation.m; \ fi distclean-local: diff --git a/nls/zh_TW/Makefile.am b/nls/zh_TW/Makefile.am index 87f7a9df..da4fb159 100644 --- a/nls/zh_TW/Makefile.am +++ b/nls/zh_TW/Makefile.am @@ -3,21 +3,21 @@ NLSTEST = @NLS@ THE_LANG = zh_TW THE_NLS_PATH = $(DESTDIR)$(pkgdatadir)/nls/$(THE_LANG) -CLEANFILES = blackbox.cat +CLEANFILES = openbox.cat MAINTAINERCLEANFILES = Makefile.in Translation.m DISTCLEANFILES = Translation.m MFILES = @srcdir@/BaseDisplay.m @srcdir@/Basemenu.m @srcdir@/Configmenu.m @srcdir@/Icon.m @srcdir@/Image.m @srcdir@/Screen.m @srcdir@/Slit.m @srcdir@/Toolbar.m @srcdir@/Window.m @srcdir@/Windowmenu.m @srcdir@/Workspace.m @srcdir@/Workspacemenu.m @srcdir@/blackbox.m @srcdir@/common.m @srcdir@/main.m @srcdir@/bsetroot.m -all-local: blackbox.cat -install-data-local: blackbox.cat +all-local: openbox.cat +install-data-local: openbox.cat @if test x$(NLSTEST) = "x-DNLS"; then \ echo "Installing catalog in $(THE_NLS_PATH)"; \ $(mkinstalldirs) $(THE_NLS_PATH); \ - $(INSTALL_DATA) blackbox.cat $(THE_NLS_PATH); \ + $(INSTALL_DATA) openbox.cat $(THE_NLS_PATH); \ fi uninstall-local: @if test x$(NLSTEST) = "x-DNLS"; then \ - rm -f $(THE_NLS_PATH)/blackbox.cat; \ + rm -f $(THE_NLS_PATH)/openbox.cat; \ rmdir $(THE_NLS_PATH); \ fi @@ -26,9 +26,9 @@ Translation.m: $(MFILES) awk -f @srcdir@/../convert.awk output=Translation.m $(MFILES); \ fi -blackbox.cat: Translation.m +openbox.cat: Translation.m @if test x$(NLSTEST) = "x-DNLS"; then \ - $(gencat_cmd) blackbox.cat Translation.m; \ + $(gencat_cmd) openbox.cat Translation.m; \ fi distclean-local: diff --git a/src/main.cc b/src/main.cc index 03576905..c374f694 100644 --- a/src/main.cc +++ b/src/main.cc @@ -119,7 +119,7 @@ int main(int argc, char **argv) { char *rc_file = (char *) 0; char *menu_file = (char *) 0; - i18n.openCatalog("blackbox.cat"); + i18n.openCatalog("openbox.cat"); for (int i = 1; i < argc; ++i) { if (! strcmp(argv[i], "-rc")) { diff --git a/util/bsetroot.cc b/util/bsetroot.cc index cd047c2a..47939aec 100644 --- a/util/bsetroot.cc +++ b/util/bsetroot.cc @@ -340,7 +340,7 @@ void bsetroot::usage(int exit_code) { int main(int argc, char **argv) { char *display_name = (char *) 0; - i18n.openCatalog("blackbox.cat"); + i18n.openCatalog("openbox.cat"); for (int i = 1; i < argc; i++) { if (! strcmp(argv[i], "-display")) { -- 2.44.0