From 3218a4ce0d821f848f03bd4675dea5fb159c030c Mon Sep 17 00:00:00 2001 From: fluxgen Date: Mon, 9 Dec 2002 23:41:54 +0000 Subject: [PATCH] blackbox.cat to fluxbox.cat --- nls/C/Makefile.am | 38 +++++++++++++++++++------------------- nls/bg_BG/Makefile.am | 16 ++++++++-------- nls/blackbox-nls.hh | 6 +++--- nls/da_DK/Makefile.am | 16 ++++++++-------- nls/es_ES/Makefile.am | 16 ++++++++-------- nls/et_EE/Makefile.am | 16 ++++++++-------- nls/fr_FR/Makefile.am | 16 ++++++++-------- nls/it_IT/Makefile.am | 16 ++++++++-------- nls/ja_JP/Makefile.am | 16 ++++++++-------- nls/lv_LV/Makefile.am | 16 ++++++++-------- nls/pt_BR/Makefile.am | 16 ++++++++-------- nls/pt_PT/Makefile.am | 16 ++++++++-------- nls/ru_RU/Makefile.am | 16 ++++++++-------- nls/sv_SE/Makefile.am | 16 ++++++++-------- nls/tr_TR/Makefile.am | 16 ++++++++-------- util/bsetroot.cc | 4 ++-- 16 files changed, 128 insertions(+), 128 deletions(-) diff --git a/nls/C/Makefile.am b/nls/C/Makefile.am index d17897a4..7ed90258 100644 --- a/nls/C/Makefile.am +++ b/nls/C/Makefile.am @@ -1,16 +1,16 @@ # nls/C/Makefile.am for Blackbox-0.61.x - an X11 Window Manager NLSTEST = @NLS@ -CLEANFILES = blackbox.cat +CLEANFILES = fluxbox.cat MAINTAINERCLEANFILES = Makefile.in Translation.m -MFILES = BaseDisplay.m Basemenu.m Configmenu.m Icon.m Image.m Screen.m Slit.m Toolbar.m Window.m Windowmenu.m Workspace.m Workspacemenu.m blackbox.m common.m main.m bsetroot.m +MFILES = BaseDisplay.m Basemenu.m Configmenu.m Icon.m Image.m Screen.m Slit.m Toolbar.m Window.m Windowmenu.m Workspace.m Workspacemenu.m fluxbox.m common.m main.m bsetroot.m EXTRA_DIST= $(MFILES) -all-local: blackbox.cat -install-data-local: blackbox.cat +all-local: fluxbox.cat +install-data-local: fluxbox.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) fluxbox.cat $(DESTDIR)$(pkgdatadir)/nls/C; \ rm -f $(DESTDIR)$(pkgdatadir)/nls/US_ASCII; \ ln -fs C $(DESTDIR)$(pkgdatadir)/nls/US_ASCII; \ rm -f $(DESTDIR)$(pkgdatadir)/nls/POSIX; \ @@ -22,7 +22,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/fluxbox.cat; \ rm -f $(DESTDIR)$(pkgdatadir)/nls/US_ASCII; \ rm -f $(DESTDIR)$(pkgdatadir)/nls/POSIX; \ rm -f $(DESTDIR)$(pkgdatadir)/nls/en_US; \ @@ -31,26 +31,26 @@ uninstall-local: fi # note... when adding new catalogs... you do not need the -# header=../blackbox-nls.hh which is passed to awk... we +# header=../fluxbox-nls.hh which is passed to awk... we # only need to generate it once. Translation.m: $(MFILES) @if test x$(NLSTEST) = "x-DNLS"; then \ rm -f Translation.m; \ - echo "//This file is generated from nls/C" > ../blackbox-nls.hh; \ - echo "#ifndef BLACKBOX_NLS_HH" >> ../blackbox-nls.hh; \ - echo "#define BLACKBOX_NLS_HH" >> ../blackbox-nls.hh; \ - echo "namespace FBNLS {" >> ../blackbox-nls.hh; \ - echo "enum {" >> ../blackbox-nls.hh; \ - awk -f ../convert.awk header=../blackbox-nls.hh \ + echo "//This file is generated from nls/C" > ../fluxbox-nls.hh; \ + echo "#ifndef BLACKBOX_NLS_HH" >> ../fluxbox-nls.hh; \ + echo "#define BLACKBOX_NLS_HH" >> ../fluxbox-nls.hh; \ + echo "namespace FBNLS {" >> ../fluxbox-nls.hh; \ + echo "enum {" >> ../fluxbox-nls.hh; \ + awk -f ../convert.awk header=../fluxbox-nls.hh \ output=Translation.m $(MFILES); \ - echo " dummy_not_used = 0 //just for the ending" >> ../blackbox-nls.hh; \ - echo "}; //end enum" >> ../blackbox-nls.hh; \ - echo "}; //end namespace" >> ../blackbox-nls.hh; \ - echo "#endif //BLACKBOX_NLS_HH" >> ../blackbox-nls.hh; \ + echo " dummy_not_used = 0 //just for the ending" >> ../fluxbox-nls.hh; \ + echo "}; //end enum" >> ../fluxbox-nls.hh; \ + echo "}; //end namespace" >> ../fluxbox-nls.hh; \ + echo "#endif //BLACKBOX_NLS_HH" >> ../fluxbox-nls.hh; \ fi -blackbox.cat: Translation.m +fluxbox.cat: Translation.m @if test x$(NLSTEST) = "x-DNLS"; then \ - $(gencat_cmd) blackbox.cat Translation.m; \ + $(gencat_cmd) fluxbox.cat Translation.m; \ fi diff --git a/nls/bg_BG/Makefile.am b/nls/bg_BG/Makefile.am index 0c3c8d5d..e524853d 100644 --- a/nls/bg_BG/Makefile.am +++ b/nls/bg_BG/Makefile.am @@ -1,21 +1,21 @@ THE_LANG=bg_BG NLSTEST = @NLS@ -CLEANFILES = blackbox.cat +CLEANFILES = fluxbox.cat MAINTAINERCLEANFILES = Makefile.in Translation.m -MFILES = BaseDisplay.m Basemenu.m Configmenu.m Icon.m Image.m Screen.m Slit.m Toolbar.m Window.m Windowmenu.m Workspace.m Workspacemenu.m blackbox.m common.m main.m bsetroot.m +MFILES = BaseDisplay.m Basemenu.m Configmenu.m Icon.m Image.m Screen.m Slit.m Toolbar.m Window.m Windowmenu.m Workspace.m Workspacemenu.m fluxbox.m common.m main.m bsetroot.m EXTRA_DIST=$(MFILES) -all-local: blackbox.cat -install-data-local: blackbox.cat +all-local: fluxbox.cat +install-data-local: fluxbox.cat @if test x$(NLSTEST) = "x-DNLS"; then \ echo "Installing catalog in $(DESTDIR)$(pkgdatadir)/nls/$(THE_LANG)"; \ $(mkinstalldirs) $(DESTDIR)$(pkgdatadir)/nls/$(THE_LANG); \ - $(INSTALL_DATA) blackbox.cat $(DESTDIR)$(pkgdatadir)/nls/$(THE_LANG); \ + $(INSTALL_DATA) fluxbox.cat $(DESTDIR)$(pkgdatadir)/nls/$(THE_LANG); \ fi uninstall-local: @if test x$(NLSTEST) = "x-DNLS"; then \ - rm -f $(DESTDIR)$(pkgdatadir)/nls/$(THE_LANG)/blackbox.cat; \ + rm -f $(DESTDIR)$(pkgdatadir)/nls/$(THE_LANG)/fluxbox.cat; \ rmdir $(DESTDIR)$(pkgdatadir)/nls/$(THE_LANG); \ fi @@ -25,7 +25,7 @@ Translation.m: $(MFILES) awk -f ../convert.awk output=Translation.m $(MFILES); \ fi -blackbox.cat: Translation.m +fluxbox.cat: Translation.m @if test x$(NLSTEST) = "x-DNLS"; then \ - LANG=bg_BG $(gencat_cmd) blackbox.cat Translation.m; \ + LANG=bg_BG $(gencat_cmd) fluxbox.cat Translation.m; \ fi diff --git a/nls/blackbox-nls.hh b/nls/blackbox-nls.hh index f8f91eb2..e0e41057 100644 --- a/nls/blackbox-nls.hh +++ b/nls/blackbox-nls.hh @@ -176,6 +176,6 @@ enum { bsetrootMustSpecify = 0x1, bsetrootUsage = 0x2, dummy_not_used = 0 //just for the ending -}; //end enum\n -}; //end namespace\n -#endif //BLACKBOX_NLS_HH\n +}; //end enum +}; //end namespace +#endif //BLACKBOX_NLS_HH diff --git a/nls/da_DK/Makefile.am b/nls/da_DK/Makefile.am index fc639702..4e933ef3 100644 --- a/nls/da_DK/Makefile.am +++ b/nls/da_DK/Makefile.am @@ -1,20 +1,20 @@ # nls/da_DK/Makefile.am for Blackbox-0.61.x - an X11 Window Manager NLSTEST = @NLS@ -CLEANFILES = blackbox.cat +CLEANFILES = fluxbox.cat MAINTAINERCLEANFILES = Makefile.in Translation.m -MFILES = BaseDisplay.m Basemenu.m Configmenu.m Icon.m Image.m Screen.m Slit.m Toolbar.m Window.m Windowmenu.m Workspace.m Workspacemenu.m blackbox.m common.m main.m bsetroot.m +MFILES = BaseDisplay.m Basemenu.m Configmenu.m Icon.m Image.m Screen.m Slit.m Toolbar.m Window.m Windowmenu.m Workspace.m Workspacemenu.m fluxbox.m common.m main.m bsetroot.m EXTRA_DIST= $(MFILES) -all-local: blackbox.cat -install-data-local: blackbox.cat +all-local: fluxbox.cat +install-data-local: fluxbox.cat @if test x$(NLSTEST) = "x-DNLS"; then \ echo "Installing catalog in $(DESTDIR)$(pkgdatadir)/nls/da_DK"; \ $(mkinstalldirs) $(DESTDIR)$(pkgdatadir)/nls/da_DK; \ - $(INSTALL_DATA) blackbox.cat $(DESTDIR)$(pkgdatadir)/nls/da_DK; \ + $(INSTALL_DATA) fluxbox.cat $(DESTDIR)$(pkgdatadir)/nls/da_DK; \ fi uninstall-local: @if test x$(NLSTEST) = "x-DNLS"; then \ - rm -f $(DESTDIR)$(pkgdatadir)/nls/da_DK/blackbox.cat; \ + rm -f $(DESTDIR)$(pkgdatadir)/nls/da_DK/fluxbox.cat; \ rmdir $(DESTDIR)$(pkgdatadir)/nls/da_DK; \ fi @@ -24,7 +24,7 @@ Translation.m: $(MFILES) awk -f ../convert.awk output=Translation.m $(MFILES); \ fi -blackbox.cat: Translation.m +fluxbox.cat: Translation.m @if test x$(NLSTEST) = "x-DNLS"; then \ - LANG=da_DK $(gencat_cmd) blackbox.cat Translation.m; \ + LANG=da_DK $(gencat_cmd) fluxbox.cat Translation.m; \ fi diff --git a/nls/es_ES/Makefile.am b/nls/es_ES/Makefile.am index d7d2f028..8cb0e02c 100644 --- a/nls/es_ES/Makefile.am +++ b/nls/es_ES/Makefile.am @@ -1,22 +1,22 @@ # nls/es_ES/Makefile.am for Blackbox-0.61.x - an X11 Window Manager NLSTEST = @NLS@ -CLEANFILES = blackbox.cat +CLEANFILES = fluxbox.cat MAINTAINERCLEANFILES = Makefile.in Translation.m -MFILES = BaseDisplay.m Basemenu.m Configmenu.m Icon.m Image.m Screen.m Slit.m Toolbar.m Window.m Windowmenu.m Workspace.m Workspacemenu.m blackbox.m common.m main.m bsetroot.m +MFILES = BaseDisplay.m Basemenu.m Configmenu.m Icon.m Image.m Screen.m Slit.m Toolbar.m Window.m Windowmenu.m Workspace.m Workspacemenu.m fluxbox.m common.m main.m bsetroot.m EXTRA_DIST=$(MFILES) -all-local: blackbox.cat -install-data-local: blackbox.cat +all-local: fluxbox.cat +install-data-local: fluxbox.cat @if test x$(NLSTEST) = "x-DNLS"; then \ echo "Installing catalog in $(DESTDIR)$(pkgdatadir)/nls/es_ES"; \ $(mkinstalldirs) $(DESTDIR)$(pkgdatadir)/nls/es_ES; \ - $(INSTALL_DATA) blackbox.cat $(DESTDIR)$(pkgdatadir)/nls/es_ES; \ + $(INSTALL_DATA) fluxbox.cat $(DESTDIR)$(pkgdatadir)/nls/es_ES; \ rm -f $(DESTDIR)$(pkgdatadir)/nls/es; \ ln -fs es_ES $(DESTDIR)$(pkgdatadir)/nls/es; \ fi uninstall-local: @if test x$(NLSTEST) = "x-DNLS"; then \ - rm -f $(DESTDIR)$(pkgdatadir)/nls/es_ES/blackbox.cat; \ + rm -f $(DESTDIR)$(pkgdatadir)/nls/es_ES/fluxbox.cat; \ rm -f $(DESTDIR)$(pkgdatadir)/nls/es; \ rmdir $(DESTDIR)$(pkgdatadir)/nls/es_ES; \ fi @@ -27,7 +27,7 @@ Translation.m: $(MFILES) awk -f ../convert.awk output=Translation.m $(MFILES); \ fi -blackbox.cat: Translation.m +fluxbox.cat: Translation.m @if test x$(NLSTEST) = "x-DNLS"; then \ - LANG=es_ES $(gencat_cmd) blackbox.cat Translation.m; \ + LANG=es_ES $(gencat_cmd) fluxbox.cat Translation.m; \ fi diff --git a/nls/et_EE/Makefile.am b/nls/et_EE/Makefile.am index ad2e0d93..15206152 100644 --- a/nls/et_EE/Makefile.am +++ b/nls/et_EE/Makefile.am @@ -1,20 +1,20 @@ # nls/et_EE/Makefile.am for Blackbox-0.61.x - an X11 Window Manager NLSTEST = @NLS@ -CLEANFILES = blackbox.cat +CLEANFILES = fluxbox.cat MAINTAINERCLEANFILES = Makefile.in Translation.m -MFILES = BaseDisplay.m Basemenu.m Configmenu.m Icon.m Image.m Screen.m Slit.m Toolbar.m Window.m Windowmenu.m Workspace.m Workspacemenu.m blackbox.m common.m main.m bsetroot.m +MFILES = BaseDisplay.m Basemenu.m Configmenu.m Icon.m Image.m Screen.m Slit.m Toolbar.m Window.m Windowmenu.m Workspace.m Workspacemenu.m fluxbox.m common.m main.m bsetroot.m EXTRA_DIST=$(MFILES) -all-local: blackbox.cat -install-data-local: blackbox.cat +all-local: fluxbox.cat +install-data-local: fluxbox.cat @if test x$(NLSTEST) = "x-DNLS"; then \ echo "Installing catalog in $(DESTDIR)$(pkgdatadir)/nls/et_EE"; \ $(mkinstalldirs) $(DESTDIR)$(pkgdatadir)/nls/et_EE ; \ - $(INSTALL_DATA) blackbox.cat $(DESTDIR)$(pkgdatadir)/nls/et_EE; \ + $(INSTALL_DATA) fluxbox.cat $(DESTDIR)$(pkgdatadir)/nls/et_EE; \ fi uninstall-local: @if test x$(NLSTEST) = "x-DNLS"; then \ - rm -f $(DESTDIR)$(pkgdatadir)/nls/et_EE/blackbox.cat; \ + rm -f $(DESTDIR)$(pkgdatadir)/nls/et_EE/fluxbox.cat; \ rmdir $(DESTDIR)$(pkgdatadir)/nls/et_EE; \ fi @@ -24,7 +24,7 @@ Translation.m: $(MFILES) awk -f ../convert.awk output=Translation.m $(MFILES); \ fi -blackbox.cat: Translation.m +fluxbox.cat: Translation.m @if test x$(NLSTEST) = "x-DNLS"; then \ - LANG=et_EE $(gencat_cmd) blackbox.cat Translation.m; \ + LANG=et_EE $(gencat_cmd) fluxbox.cat Translation.m; \ fi diff --git a/nls/fr_FR/Makefile.am b/nls/fr_FR/Makefile.am index 97221e27..48255a2e 100644 --- a/nls/fr_FR/Makefile.am +++ b/nls/fr_FR/Makefile.am @@ -1,23 +1,23 @@ # nls/fr_FR/Makefile.am for Blackbox-0.61.x - an X11 Window Manager NLSTEST = @NLS@ -CLEANFILES = blackbox.cat +CLEANFILES = fluxbox.cat MAINTAINERCLEANFILES = Makefile.in Translation.m -MFILES = BaseDisplay.m Basemenu.m Configmenu.m Icon.m Image.m Screen.m Slit.m Toolbar.m Window.m Windowmenu.m Workspace.m Workspacemenu.m blackbox.m common.m main.m bsetroot.m +MFILES = BaseDisplay.m Basemenu.m Configmenu.m Icon.m Image.m Screen.m Slit.m Toolbar.m Window.m Windowmenu.m Workspace.m Workspacemenu.m fluxbox.m common.m main.m bsetroot.m EXTRA_DIST=$(MFILES) -all-local: blackbox.cat -install-data-local: blackbox.cat +all-local: fluxbox.cat +install-data-local: fluxbox.cat @if test x$(NLSTEST) = "x-DNLS"; then \ echo "Installing catalog in $(DESTDIR)$(pkgdatadir)/nls/fr_FR"; \ $(mkinstalldirs) $(DESTDIR)$(pkgdatadir)/nls/fr_FR; \ - $(INSTALL_DATA) blackbox.cat $(DESTDIR)$(pkgdatadir)/nls/fr_FR; \ + $(INSTALL_DATA) fluxbox.cat $(DESTDIR)$(pkgdatadir)/nls/fr_FR; \ rm -f $(DESTDIR)$(pkgdatadir)/nls/fr; \ ln -fs fr_FR $(DESTDIR)$(pkgdatadir)/nls/fr; \ fi uninstall-local: @if test x$(NLSTEST) = "x-DNLS"; then \ - rm -f $(DESTDIR)$(pkgdatadir)/nls/fr_FR/blackbox.cat; \ + rm -f $(DESTDIR)$(pkgdatadir)/nls/fr_FR/fluxbox.cat; \ rm -f $(DESTDIR)$(pkgdatadir)/nls/fr; \ rmdir $(DESTDIR)$(pkgdatadir)/nls/fr_FR; \ fi @@ -28,7 +28,7 @@ Translation.m: $(MFILES) awk -f ../convert.awk output=Translation.m $(MFILES); \ fi -blackbox.cat: Translation.m +fluxbox.cat: Translation.m @if test x$(NLSTEST) = "x-DNLS"; then \ - LANG=fr_FR $(gencat_cmd) blackbox.cat Translation.m; \ + LANG=fr_FR $(gencat_cmd) fluxbox.cat Translation.m; \ fi diff --git a/nls/it_IT/Makefile.am b/nls/it_IT/Makefile.am index 1797882b..beb9ab7a 100644 --- a/nls/it_IT/Makefile.am +++ b/nls/it_IT/Makefile.am @@ -1,21 +1,21 @@ # nls/it_IT/Makefile.am for Fluxbox - an X11 Window Manager NLSTEST = @NLS@ -CLEANFILES = blackbox.cat +CLEANFILES = fluxbox.cat MAINTAINERCLEANFILES = Makefile.in Translation.m -MFILES = BaseDisplay.m Basemenu.m Configmenu.m Icon.m Image.m Screen.m Slit.m Toolbar.m Window.m Windowmenu.m Workspace.m Workspacemenu.m blackbox.m common.m main.m bsetroot.m +MFILES = BaseDisplay.m Basemenu.m Configmenu.m Icon.m Image.m Screen.m Slit.m Toolbar.m Window.m Windowmenu.m Workspace.m Workspacemenu.m fluxbox.m common.m main.m bsetroot.m EXTRA_DIST= $(MFILES) -all-local: blackbox.cat -install-data-local: blackbox.cat +all-local: fluxbox.cat +install-data-local: fluxbox.cat @if test x$(NLSTEST) = "x-DNLS"; then \ echo "Installing catalog in $(DESTDIR)$(pkgdatadir)/nls/it_IT"; \ $(mkinstalldirs) $(DESTDIR)$(pkgdatadir)/nls/it_IT; \ - $(INSTALL_DATA) blackbox.cat $(DESTDIR)$(pkgdatadir)/nls/it_IT; \ + $(INSTALL_DATA) fluxbox.cat $(DESTDIR)$(pkgdatadir)/nls/it_IT; \ fi uninstall-local: @if test x$(NLSTEST) = "x-DNLS"; then \ - rm -f $(DESTDIR)$(pkgdatadir)/nls/it_IT/blackbox.cat; \ + rm -f $(DESTDIR)$(pkgdatadir)/nls/it_IT/fluxbox.cat; \ rmdir $(DESTDIR)$(pkgdatadir)/nls/it_IT; \ fi @@ -25,7 +25,7 @@ Translation.m: $(MFILES) awk -f ../convert.awk output=Translation.m $(MFILES); \ fi -blackbox.cat: Translation.m +fluxbox.cat: Translation.m @if test x$(NLSTEST) = "x-DNLS"; then \ - LANG=it_IT $(gencat_cmd) blackbox.cat Translation.m; \ + LANG=it_IT $(gencat_cmd) fluxbox.cat Translation.m; \ fi diff --git a/nls/ja_JP/Makefile.am b/nls/ja_JP/Makefile.am index de48ab7a..9a4d97ae 100644 --- a/nls/ja_JP/Makefile.am +++ b/nls/ja_JP/Makefile.am @@ -1,18 +1,18 @@ NLSTEST = @NLS@ -CLEANFILES = blackbox.cat +CLEANFILES = fluxbox.cat MAINTAINERCLEANFILES = Makefile.in Translation.m -MFILES = BaseDisplay.m Basemenu.m Configmenu.m Icon.m Image.m Screen.m Slit.m Toolbar.m Window.m Windowmenu.m Workspace.m Workspacemenu.m blackbox.m common.m main.m bsetroot.m +MFILES = BaseDisplay.m Basemenu.m Configmenu.m Icon.m Image.m Screen.m Slit.m Toolbar.m Window.m Windowmenu.m Workspace.m Workspacemenu.m fluxbox.m common.m main.m bsetroot.m EXTRA_DIST=$(MFILES) -all-local: blackbox.cat -install-data-local: blackbox.cat +all-local: fluxbox.cat +install-data-local: fluxbox.cat @if test x$(NLSTEST) = "x-DNLS"; then \ echo "Installing catalog in $(DESTDIR)$(pkgdatadir)/nls/ja_JP"; \ $(mkinstalldirs) $(DESTDIR)$(pkgdatadir)/nls/ja_JP; \ - $(INSTALL_DATA) blackbox.cat $(DESTDIR)$(pkgdatadir)/nls/ja_JP; \ + $(INSTALL_DATA) fluxbox.cat $(DESTDIR)$(pkgdatadir)/nls/ja_JP; \ fi uninstall-local: @if test x$(NLSTEST) = "x-DNLS"; then \ - rm -f $(DESTDIR)$(pkgdatadir)/nls/ja_JP/blackbox.cat; \ + rm -f $(DESTDIR)$(pkgdatadir)/nls/ja_JP/fluxbox.cat; \ rmdir $(DESTDIR)$(pkgdatadir)/nls/ja_JP; \ fi @@ -22,7 +22,7 @@ Translation.m: $(MFILES) awk -f ../convert.awk output=Translation.m $(MFILES); \ fi -blackbox.cat: Translation.m +fluxbox.cat: Translation.m @if test x$(NLSTEST) = "x-DNLS"; then \ - LANG=ja_JP $(gencat_cmd) blackbox.cat Translation.m; \ + LANG=ja_JP $(gencat_cmd) fluxbox.cat Translation.m; \ fi diff --git a/nls/lv_LV/Makefile.am b/nls/lv_LV/Makefile.am index 24bcf716..b4cb62d3 100644 --- a/nls/lv_LV/Makefile.am +++ b/nls/lv_LV/Makefile.am @@ -1,22 +1,22 @@ # nls/lv_LV/Makefile.am for Blackbox-0.61.x - an X11 Window Manager NLSTEST = @NLS@ -CLEANFILES = blackbox.cat +CLEANFILES = fluxbox.cat MAINTAINERCLEANFILES = Makefile.in Translation.m -MFILES = BaseDisplay.m Basemenu.m Configmenu.m Icon.m Image.m Screen.m Slit.m Toolbar.m Window.m Windowmenu.m Workspace.m Workspacemenu.m blackbox.m common.m main.m bsetroot.m +MFILES = BaseDisplay.m Basemenu.m Configmenu.m Icon.m Image.m Screen.m Slit.m Toolbar.m Window.m Windowmenu.m Workspace.m Workspacemenu.m fluxbox.m common.m main.m bsetroot.m EXTRA_DIST=$(MFILES) -all-local: blackbox.cat -install-data-local: blackbox.cat +all-local: fluxbox.cat +install-data-local: fluxbox.cat @if test x$(NLSTEST) = "x-DNLS"; then \ echo "Installing catalog in $(DESTDIR)$(pkgdatadir)/nls/lv_LV"; \ $(mkinstalldirs) $(DESTDIR)$(pkgdatadir)/nls/lv_LV; \ - $(INSTALL_DATA) blackbox.cat $(DESTDIR)$(pkgdatadir)/nls/lv_LV; \ + $(INSTALL_DATA) fluxbox.cat $(DESTDIR)$(pkgdatadir)/nls/lv_LV; \ rm -f $(DESTDIR)$(pkgdatadir)/nls/lv; \ ln -fs lv_LV $(DESTDIR)$(pkgdatadir)/nls/lv; \ fi uninstall-local: @if test x$(NLSTEST) = "x-DNLS"; then \ - rm -f $(DESTDIR)$(pkgdatadir)/nls/lv_LV/blackbox.cat; \ + rm -f $(DESTDIR)$(pkgdatadir)/nls/lv_LV/fluxbox.cat; \ rmdir $(DESTDIR)$(pkgdatadir)/nls/lv_LV; \ fi @@ -26,7 +26,7 @@ Translation.m: $(MFILES) awk -f ../convert.awk output=Translation.m $(MFILES); \ fi -blackbox.cat: Translation.m +fluxbox.cat: Translation.m @if test x$(NLSTEST) = "x-DNLS"; then \ - LANG=lv_LV $(gencat_cmd) blackbox.cat Translation.m; \ + LANG=lv_LV $(gencat_cmd) fluxbox.cat Translation.m; \ fi diff --git a/nls/pt_BR/Makefile.am b/nls/pt_BR/Makefile.am index d22ede38..f0f9749b 100644 --- a/nls/pt_BR/Makefile.am +++ b/nls/pt_BR/Makefile.am @@ -1,20 +1,20 @@ # nls/pt_BR/Makefile.am for Blackbox-0.61.x - an X11 Window Manager NLSTEST = @NLS@ -CLEANFILES = blackbox.cat +CLEANFILES = fluxbox.cat MAINTAINERCLEANFILES = Makefile.in Translation.m -MFILES = BaseDisplay.m Basemenu.m Configmenu.m Icon.m Image.m Screen.m Slit.m Toolbar.m Window.m Windowmenu.m Workspace.m Workspacemenu.m blackbox.m common.m main.m bsetroot.m +MFILES = BaseDisplay.m Basemenu.m Configmenu.m Icon.m Image.m Screen.m Slit.m Toolbar.m Window.m Windowmenu.m Workspace.m Workspacemenu.m fluxbox.m common.m main.m bsetroot.m EXTRA_DIST=$(MFILES) -all-local: blackbox.cat -install-data-local: blackbox.cat +all-local: fluxbox.cat +install-data-local: fluxbox.cat @if test x$(NLSTEST) = "x-DNLS"; then \ echo "Installing catalog in $(DESTDIR)$(pkgdatadir)/nls/pr_BR"; \ $(mkinstalldirs) $(DESTDIR)$(pkgdatadir)/nls/pt_BR; \ - $(INSTALL_DATA) blackbox.cat $(DESTDIR)$(pkgdatadir)/nls/pt_BR; \ + $(INSTALL_DATA) fluxbox.cat $(DESTDIR)$(pkgdatadir)/nls/pt_BR; \ fi uninstall-local: @if test x$(NLSTEST) = "x-DNLS"; then \ - rm -f $(DESTDIR)$(pkgdatadir)/nls/pt_BR/blackbox.cat; \ + rm -f $(DESTDIR)$(pkgdatadir)/nls/pt_BR/fluxbox.cat; \ rmdir $(DESTDIR)$(pkgdatadir)/nls/pt_BR; \ fi @@ -24,7 +24,7 @@ Translation.m: $(MFILES) awk -f ../convert.awk output=Translation.m $(MFILES); \ fi -blackbox.cat: Translation.m +fluxbox.cat: Translation.m @if test x$(NLSTEST) = "x-DNLS"; then \ - LANG=pt_BR $(gencat_cmd) blackbox.cat Translation.m; \ + LANG=pt_BR $(gencat_cmd) fluxbox.cat Translation.m; \ fi diff --git a/nls/pt_PT/Makefile.am b/nls/pt_PT/Makefile.am index a0b064f1..cf35d0cc 100644 --- a/nls/pt_PT/Makefile.am +++ b/nls/pt_PT/Makefile.am @@ -1,20 +1,20 @@ # nls/pt_PT/Makefile.am for Fluxbox - an X11 Window Manager NLSTEST = @NLS@ -CLEANFILES = blackbox.cat +CLEANFILES = fluxbox.cat MAINTAINERCLEANFILES = Makefile.in Translation.m -MFILES = BaseDisplay.m Basemenu.m Configmenu.m Icon.m Image.m Screen.m Slit.m Toolbar.m Window.m Windowmenu.m Workspace.m Workspacemenu.m blackbox.m common.m main.m bsetroot.m +MFILES = BaseDisplay.m Basemenu.m Configmenu.m Icon.m Image.m Screen.m Slit.m Toolbar.m Window.m Windowmenu.m Workspace.m Workspacemenu.m fluxbox.m common.m main.m bsetroot.m EXTRA_DIST=$(MFILES) -all-local: blackbox.cat -install-data-local: blackbox.cat +all-local: fluxbox.cat +install-data-local: fluxbox.cat @if test x$(NLSTEST) = "x-DNLS"; then \ echo "Installing catalog in $(DESTDIR)$(pkgdatadir)/nls/pt_PT"; \ $(mkinstalldirs) $(DESTDIR)$(pkgdatadir)/nls/pt_PT; \ - $(INSTALL_DATA) blackbox.cat $(DESTDIR)$(pkgdatadir)/nls/pt_PT; \ + $(INSTALL_DATA) fluxbox.cat $(DESTDIR)$(pkgdatadir)/nls/pt_PT; \ fi uninstall-local: @if test x$(NLSTEST) = "x-DNLS"; then \ - rm -f $(DESTDIR)$(pkgdatadir)/nls/pt_PT/blackbox.cat; \ + rm -f $(DESTDIR)$(pkgdatadir)/nls/pt_PT/fluxbox.cat; \ rmdir $(DESTDIR)$(pkgdatadir)/nls/pt_PT; \ fi @@ -24,7 +24,7 @@ Translation.m: $(MFILES) awk -f ../convert.awk output=Translation.m $(MFILES); \ fi -blackbox.cat: Translation.m +fluxbox.cat: Translation.m @if test x$(NLSTEST) = "x-DNLS"; then \ - LANG=pt_PT $(gencat_cmd) blackbox.cat Translation.m; \ + LANG=pt_PT $(gencat_cmd) fluxbox.cat Translation.m; \ fi diff --git a/nls/ru_RU/Makefile.am b/nls/ru_RU/Makefile.am index 9ccbfb2c..b2504932 100644 --- a/nls/ru_RU/Makefile.am +++ b/nls/ru_RU/Makefile.am @@ -1,20 +1,20 @@ # nls/ru_RU/Makefile.am for Blackbox-0.61.x - an X11 Window Manager NLSTEST = @NLS@ -CLEANFILES = blackbox.cat +CLEANFILES = fluxbox.cat MAINTAINERCLEANFILES = Makefile.in Translation.m -MFILES = BaseDisplay.m Basemenu.m Configmenu.m Icon.m Image.m Screen.m Slit.m Toolbar.m Window.m Windowmenu.m Workspace.m Workspacemenu.m blackbox.m common.m main.m bsetroot.m +MFILES = BaseDisplay.m Basemenu.m Configmenu.m Icon.m Image.m Screen.m Slit.m Toolbar.m Window.m Windowmenu.m Workspace.m Workspacemenu.m fluxbox.m common.m main.m bsetroot.m EXTRA_DIST=$(MFILES) -all-local: blackbox.cat -install-data-local: blackbox.cat +all-local: fluxbox.cat +install-data-local: fluxbox.cat @if test x$(NLSTEST) = "x-DNLS"; then \ echo "Installing catalog in $(DESTDIR)$(pkgdatadir)/nls/ru_RU"; \ $(mkinstalldirs) $(DESTDIR)$(pkgdatadir)/nls/ru_RU; \ - $(INSTALL_DATA) blackbox.cat $(DESTDIR)$(pkgdatadir)/nls/ru_RU; \ + $(INSTALL_DATA) fluxbox.cat $(DESTDIR)$(pkgdatadir)/nls/ru_RU; \ fi uninstall-local: @if test x$(NLSTEST) = "x-DNLS"; then \ - rm -f $(DESTDIR)$(pkgdatadir)/nls/ru_RU/blackbox.cat; \ + rm -f $(DESTDIR)$(pkgdatadir)/nls/ru_RU/fluxbox.cat; \ rmdir $(DESTDIR)$(pkgdatadir)/nls/ru_RU; \ fi @@ -24,7 +24,7 @@ Translation.m: $(MFILES) awk -f ../convert.awk output=Translation.m $(MFILES); \ fi -blackbox.cat: Translation.m +fluxbox.cat: Translation.m @if test x$(NLSTEST) = "x-DNLS"; then \ - LANG=ru_RU $(gencat_cmd) blackbox.cat Translation.m; \ + LANG=ru_RU $(gencat_cmd) fluxbox.cat Translation.m; \ fi diff --git a/nls/sv_SE/Makefile.am b/nls/sv_SE/Makefile.am index 59d8d0b5..91a3cc22 100644 --- a/nls/sv_SE/Makefile.am +++ b/nls/sv_SE/Makefile.am @@ -1,21 +1,21 @@ # nls/sv_SE/Makefile.am for Blackbox-0.61.x - an X11 Window Manager NLSTEST = @NLS@ -CLEANFILES = blackbox.cat +CLEANFILES = fluxbox.cat MAINTAINERCLEANFILES = Makefile.in Translation.m -MFILES = BaseDisplay.m Basemenu.m Configmenu.m Icon.m Image.m Screen.m Slit.m Toolbar.m Window.m Windowmenu.m Workspace.m Workspacemenu.m blackbox.m common.m main.m bsetroot.m +MFILES = BaseDisplay.m Basemenu.m Configmenu.m Icon.m Image.m Screen.m Slit.m Toolbar.m Window.m Windowmenu.m Workspace.m Workspacemenu.m fluxbox.m common.m main.m bsetroot.m EXTRA_DIST=$(MFILES) -all-local: blackbox.cat -install-data-local: blackbox.cat +all-local: fluxbox.cat +install-data-local: fluxbox.cat @if test x$(NLSTEST) = "x-DNLS"; then \ echo "Installing catalog in $(DESTDIR)$(pkgdatadir)/nls/sv_SE"; \ $(mkinstalldirs) $(DESTDIR)$(pkgdatadir)/nls/sv_SE; \ - $(INSTALL_DATA) blackbox.cat $(DESTDIR)$(pkgdatadir)/nls/sv_SE; \ + $(INSTALL_DATA) fluxbox.cat $(DESTDIR)$(pkgdatadir)/nls/sv_SE; \ fi uninstall-local: @if test x$(NLSTEST) = "x-DNLS"; then \ - rm -f $(DESTDIR)$(pkgdatadir)/nls/sv_SE/blackbox.cat; \ + rm -f $(DESTDIR)$(pkgdatadir)/nls/sv_SE/fluxbox.cat; \ rmdir $(DESTDIR)$(pkgdatadir)/nls/sv_SE; \ fi @@ -25,7 +25,7 @@ Translation.m: $(MFILES) awk -f ../convert.awk output=Translation.m $(MFILES); \ fi -blackbox.cat: Translation.m +fluxbox.cat: Translation.m @if test x$(NLSTEST) = "x-DNLS"; then \ - LANG=sv_SE $(gencat_cmd) blackbox.cat Translation.m; \ + LANG=sv_SE $(gencat_cmd) fluxbox.cat Translation.m; \ fi diff --git a/nls/tr_TR/Makefile.am b/nls/tr_TR/Makefile.am index f3a62786..b7075dd7 100644 --- a/nls/tr_TR/Makefile.am +++ b/nls/tr_TR/Makefile.am @@ -5,21 +5,21 @@ # NLSTEST = @NLS@ -CLEANFILES = blackbox.cat +CLEANFILES = fluxbox.cat MAINTAINERCLEANFILES = Makefile.in Translation.m -MFILES = BaseDisplay.m Basemenu.m Configmenu.m Icon.m Image.m Screen.m Slit.m Toolbar.m Window.m Windowmenu.m Workspace.m Workspacemenu.m blackbox.m common.m main.m bsetroot.m +MFILES = BaseDisplay.m Basemenu.m Configmenu.m Icon.m Image.m Screen.m Slit.m Toolbar.m Window.m Windowmenu.m Workspace.m Workspacemenu.m fluxbox.m common.m main.m bsetroot.m EXTRA_DIST=$(MFILES) -all-local: blackbox.cat -install-data-local: blackbox.cat +all-local: fluxbox.cat +install-data-local: fluxbox.cat @if test x$(NLSTEST) = "x-DNLS"; then \ echo "Installing catalog in $(DESTDIR)$(pkgdatadir)/nls/tr_TR"; \ $(mkinstalldirs) $(DESTDIR)$(pkgdatadir)/nls/tr_TR; \ - $(INSTALL_DATA) blackbox.cat $(DESTDIR)$(pkgdatadir)/nls/tr_TR; \ + $(INSTALL_DATA) fluxbox.cat $(DESTDIR)$(pkgdatadir)/nls/tr_TR; \ fi uninstall-local: @if test x$(NLSTEST) = "x-DNLS"; then \ - rm -f $(DESTDIR)$(pkgdatadir)/nls/tr_TR/blackbox.cat; \ + rm -f $(DESTDIR)$(pkgdatadir)/nls/tr_TR/fluxbox.cat; \ rmdir $(DESTDIR)$(pkgdatadir)/nls/tr_TR; \ fi @@ -29,7 +29,7 @@ Translation.m: $(MFILES) awk -f ../convert.awk output=Translation.m $(MFILES); \ fi -blackbox.cat: Translation.m +fluxbox.cat: Translation.m @if test x$(NLSTEST) = "x-DNLS"; then \ - LANG=tr_TR $(gencat_cmd) blackbox.cat Translation.m; \ + LANG=tr_TR $(gencat_cmd) fluxbox.cat Translation.m; \ fi diff --git a/util/bsetroot.cc b/util/bsetroot.cc index 6365689c..1be584af 100644 --- a/util/bsetroot.cc +++ b/util/bsetroot.cc @@ -18,7 +18,7 @@ // LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER -// $Id: bsetroot.cc,v 1.13 2002/11/30 21:07:51 fluxgen Exp $ +// $Id: bsetroot.cc,v 1.14 2002/12/09 23:41:54 fluxgen Exp $ #include "bsetroot.hh" @@ -407,7 +407,7 @@ int main(int argc, char **argv) { char *display_name = (char *) 0; int i = 1; - NLSInit("blackbox.cat"); + NLSInit("fluxbox.cat"); for (; i < argc; i++) { if (! strcmp(argv[i], "-display")) {