diff --git a/Makefile.am b/Makefile.am index 1c260d54b..37368b761 100644 --- a/Makefile.am +++ b/Makefile.am @@ -17,8 +17,6 @@ SUBDIRS = \ $(POSUB) \ tests -EXTRA_DIST = INSTALL.fvwm - ## --------------------------------------------------------------------------- ## Manage bzip2 archive together with gzip archive # Usage: diff --git a/NEWS b/NEWS index 0307c46bc..5fbc57da7 100644 --- a/NEWS +++ b/NEWS @@ -2,10 +2,12 @@ Note, the changes for the last STABLE release start with release 2.6.0. ------------------------------------------------------------------- -Changes in stable release 2.6.7 (UNRELEASED) +Changes in stable release 2.6.7 (06-Mar-2016) * New fvwm features: + - A new default configuration which is available when fvwm + doesn't detect a configuration file to load. - A new conitional command "Desk n" can restrict matching windows to a specific desk. - A new conditional command "Screen n" to restrict matching diff --git a/configure.ac b/configure.ac index d0c40e6ea..c5d0955f5 100644 --- a/configure.ac +++ b/configure.ac @@ -3,7 +3,7 @@ dnl AC_PREREQ(2.60) dnl should be "yes" only within the released distribution -ISRELEASED="no" +ISRELEASED="yes" if test $ISRELEASED = "no"; then RELDATELONG="" RELDATESHORT="" @@ -26,9 +26,9 @@ VERSIONINFO="" dnl date of the released version (please zero pad the day in the last 2 dates) dnl for example: "4 February 2003", "04 Feb 2003", "2003-02-04" dnl date format strings: "%e %B %Y", "%d-%b-%Y", "%Y-%m-%d" -RELDATELONG="15 March 2016" -RELDATESHORT="15-Mar-2016" -RELDATENUM="2016-03-15" +RELDATELONG="06 November 2016" +RELDATESHORT="06-Nov-2016" +RELDATENUM="2016-11-06" # constant variable settings FVWMNAMELONG="F? Virtual Window Manager" diff --git a/default-config/Makefile.am b/default-config/Makefile.am index a75067d5c..8867aa161 100644 --- a/default-config/Makefile.am +++ b/default-config/Makefile.am @@ -1,13 +1,19 @@ ## Process this file with automake to create Makefile.in configdir = @FVWM_DATADIR@/default-config -IMAGES_DIR != find images -type d config_DATA = config \ .stalonetrayrc \ FvwmScript-DateTime \ FvwmScript-ConfirmQuit \ FvwmScript-ConfirmCopyConfig +EXTRA_DIST = images \ + config \ + .stalonetrayrc \ + FvwmScript-DateTime \ + FvwmScript-ConfirmQuit \ + FvwmScript-ConfirmCopyConfig + install-data-hook: cp -r images @FVWM_DATADIR@/default-config ln -sf @FVWM_DATADIR@/default-config/FvwmScript-DateTime @FVWM_DATADIR@ diff --git a/doc/docbook-xml/Makefile.am b/doc/docbook-xml/Makefile.am index 295da32d6..a930f11e4 100644 --- a/doc/docbook-xml/Makefile.am +++ b/doc/docbook-xml/Makefile.am @@ -1,7 +1,6 @@ SUBDIRS = ent EXTRA_DIST = \ - ChangeLog \ README \ calstblx.dtd \ catalog.xml \ diff --git a/po/FvwmTaskBar.ar.gmo b/po/FvwmTaskBar.ar.gmo deleted file mode 100644 index 58db15768..000000000 Binary files a/po/FvwmTaskBar.ar.gmo and /dev/null differ diff --git a/po/FvwmTaskBar.ar.po b/po/FvwmTaskBar.ar.po deleted file mode 100644 index 0e31ecb89..000000000 --- a/po/FvwmTaskBar.ar.po +++ /dev/null @@ -1,33 +0,0 @@ -# Arabic translations for fvwm package. -# Copyright (C) 2002 fvwm workers -# This file is distributed under the same license as the fvwm package. -# Nadim Shaikli -# -msgid "" -msgstr "" -"Project-Id-Version: fvwm\n" -"POT-Creation-Date: 2003-04-11 12:43+0200\n" -"PO-Revision-Date: 2002-12-06 08:25+0100\n" -"Last-Translator: Nadim Shaikli \n" -"Language-Team: Arabic\n" -"Language: \n" -"MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=UTF-8\n" -"Content-Transfer-Encoding: 8bit\n" -"X-Generator: KBabel 0.9.6\n" - -#: ../modules/FvwmTaskBar/Goodies.c:462 -msgid "No new mail" -msgstr "لا يوجد رسائل جديدة" - -#: ../modules/FvwmTaskBar/Goodies.c:466 -msgid "You have new mail" -msgstr "لديك رسائل جديدة" - -#: ../modules/FvwmTaskBar/Goodies.c:470 -msgid "You have mail" -msgstr "لديك رسائل بالبريد" - -#: ../modules/FvwmTaskBar/FvwmTaskBar.c:1320 -msgid "Click here to start" -msgstr "أضغط هنا للبدأ" diff --git a/po/FvwmTaskBar.de.gmo b/po/FvwmTaskBar.de.gmo deleted file mode 100644 index 44575a431..000000000 Binary files a/po/FvwmTaskBar.de.gmo and /dev/null differ diff --git a/po/FvwmTaskBar.de.po b/po/FvwmTaskBar.de.po deleted file mode 100644 index 0e091b865..000000000 --- a/po/FvwmTaskBar.de.po +++ /dev/null @@ -1,33 +0,0 @@ -# German translations for fvwm package -# Copyright (C) 2003 fvwm workers -# This file is distributed under the same license as the fvwm package. -# Andrei Mitrofanow , 2002. -# -msgid "" -msgstr "" -"Project-Id-Version: fvwm\n" -"POT-Creation-Date: 2003-04-11 12:43+0200\n" -"PO-Revision-Date: 2002-11-27 21:29+0100\n" -"Last-Translator: Andrei Mitrofanow \n" -"Language-Team: German\n" -"Language: \n" -"MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=ISO-8859-15\n" -"Content-Transfer-Encoding: 8bit\n" -"Plural-Forms: nplurals=2; plural=(n > 1);\n" - -#: ../modules/FvwmTaskBar/Goodies.c:462 -msgid "No new mail" -msgstr "Keine neue Post" - -#: ../modules/FvwmTaskBar/Goodies.c:466 -msgid "You have new mail" -msgstr "Sie haben neue Post" - -#: ../modules/FvwmTaskBar/Goodies.c:470 -msgid "You have mail" -msgstr "Sie haben Post" - -#: ../modules/FvwmTaskBar/FvwmTaskBar.c:1320 -msgid "Click here to start" -msgstr "Klick hier um zu starten" diff --git a/po/FvwmTaskBar.es.gmo b/po/FvwmTaskBar.es.gmo deleted file mode 100644 index d5f67c573..000000000 Binary files a/po/FvwmTaskBar.es.gmo and /dev/null differ diff --git a/po/FvwmTaskBar.es.po b/po/FvwmTaskBar.es.po deleted file mode 100644 index 1f0531243..000000000 --- a/po/FvwmTaskBar.es.po +++ /dev/null @@ -1,32 +0,0 @@ -# Spanish translations for fvwm package -# Copyright (C) 2013 fvwm workers -# This file is distributed under the same license as the PACKAGE package. -# Adonai Martin , 2013. -# -#, fuzzy -msgid "" -msgstr "" -"Project-Id-Version: fvwm\n" -"POT-Creation-Date: 2003-04-11 12:43+0200\n" -"PO-Revision-Date: 2013-03-11 17:20+0200\n" -"Last-Translator: Adonai Martin \n" -"Language-Team: Spanish\n" -"MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=ISO-8859-15\n" -"Content-Transfer-Encoding: 8bit\n" - -#: ../modules/FvwmTaskBar/Goodies.c:462 -msgid "No new mail" -msgstr "Ningn correo nuevo" - -#: ../modules/FvwmTaskBar/Goodies.c:466 -msgid "You have new mail" -msgstr "Tiene un correo nuevo" - -#: ../modules/FvwmTaskBar/Goodies.c:470 -msgid "You have mail" -msgstr "Tiene un correo" - -#: ../modules/FvwmTaskBar/FvwmTaskBar.c:1320 -msgid "Click here to start" -msgstr "Pulse aqu para empezar" diff --git a/po/FvwmTaskBar.fr.gmo b/po/FvwmTaskBar.fr.gmo deleted file mode 100644 index 668fffea5..000000000 Binary files a/po/FvwmTaskBar.fr.gmo and /dev/null differ diff --git a/po/FvwmTaskBar.fr.po b/po/FvwmTaskBar.fr.po deleted file mode 100644 index c370b5927..000000000 --- a/po/FvwmTaskBar.fr.po +++ /dev/null @@ -1,34 +0,0 @@ -# French translations for fvwm package -# Traduction anglaise du package fvwm. -# Copyright (C) 2002 fvwm workers -# This file is distributed under the same license as the fvwm package. -# Olivier Chapuis , 2002. -# -msgid "" -msgstr "" -"Project-Id-Version: fvwm\n" -"POT-Creation-Date: 2003-04-11 12:43+0200\n" -"PO-Revision-Date: 2002-11-27 21:29+0100\n" -"Last-Translator: Olivier Chapuis \n" -"Language-Team: French\n" -"Language: \n" -"MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=ISO-8859-15\n" -"Content-Transfer-Encoding: 8bit\n" -"Plural-Forms: nplurals=2; plural=(n > 1);\n" - -#: ../modules/FvwmTaskBar/Goodies.c:462 -msgid "No new mail" -msgstr "Pas de nouveaux messages" - -#: ../modules/FvwmTaskBar/Goodies.c:466 -msgid "You have new mail" -msgstr "Vous avez un nouveau message" - -#: ../modules/FvwmTaskBar/Goodies.c:470 -msgid "You have mail" -msgstr "Vous avez un message" - -#: ../modules/FvwmTaskBar/FvwmTaskBar.c:1320 -msgid "Click here to start" -msgstr "Cliquer ici pour ouvrir le menu" diff --git a/po/FvwmTaskBar.pot b/po/FvwmTaskBar.pot deleted file mode 100644 index 7c6c1d299..000000000 --- a/po/FvwmTaskBar.pot +++ /dev/null @@ -1,32 +0,0 @@ -# SOME DESCRIPTIVE TITLE. -# Copyright (C) YEAR fvwm workers -# This file is distributed under the same license as the PACKAGE package. -# FIRST AUTHOR , YEAR. -# -#, fuzzy -msgid "" -msgstr "" -"Project-Id-Version: PACKAGE VERSION\n" -"POT-Creation-Date: 2003-04-11 12:43+0200\n" -"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" -"Last-Translator: FULL NAME \n" -"Language-Team: LANGUAGE \n" -"MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=CHARSET\n" -"Content-Transfer-Encoding: 8bit\n" - -#: ../modules/FvwmTaskBar/Goodies.c:462 -msgid "No new mail" -msgstr "" - -#: ../modules/FvwmTaskBar/Goodies.c:466 -msgid "You have new mail" -msgstr "" - -#: ../modules/FvwmTaskBar/Goodies.c:470 -msgid "You have mail" -msgstr "" - -#: ../modules/FvwmTaskBar/FvwmTaskBar.c:1320 -msgid "Click here to start" -msgstr "" diff --git a/po/FvwmTaskBar.ru.gmo b/po/FvwmTaskBar.ru.gmo deleted file mode 100644 index bb3986c0d..000000000 Binary files a/po/FvwmTaskBar.ru.gmo and /dev/null differ diff --git a/po/FvwmTaskBar.ru.po b/po/FvwmTaskBar.ru.po deleted file mode 100644 index b1f847e66..000000000 --- a/po/FvwmTaskBar.ru.po +++ /dev/null @@ -1,31 +0,0 @@ -# Russian translation for fvwm package. -# Copyright (C) 2013 fvwm workers -# This file is distributed under the same license as the fvwm package. -# Ivan Gayevskiy (a.k.a. Spoofing) , 2013. -# -msgid "" -msgstr "" -"Project-Id-Version: fvwm\n" -"POT-Creation-Date: 2003-04-11 12:43+0200\n" -"PO-Revision-Date: 2013-02-12 13:50+0800\n" -"Last-Translator: Ivan Gayevskiy \n" -"Language-Team: Russian\n" -"MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=UTF-8\n" -"Content-Transfer-Encoding: 8bit\n" - -#: ../modules/FvwmTaskBar/Goodies.c:462 -msgid "No new mail" -msgstr "Нет новых писем" - -#: ../modules/FvwmTaskBar/Goodies.c:466 -msgid "You have new mail" -msgstr "У вас новое письмо" - -#: ../modules/FvwmTaskBar/Goodies.c:470 -msgid "You have mail" -msgstr "Имеются непрочитанные" - -#: ../modules/FvwmTaskBar/FvwmTaskBar.c:1320 -msgid "Click here to start" -msgstr "Начните работу с нажатия этой кнопки" diff --git a/po/FvwmTaskBar.sv_SE.gmo b/po/FvwmTaskBar.sv_SE.gmo deleted file mode 100644 index 32651e626..000000000 Binary files a/po/FvwmTaskBar.sv_SE.gmo and /dev/null differ diff --git a/po/FvwmTaskBar.sv_SE.po b/po/FvwmTaskBar.sv_SE.po deleted file mode 100644 index 7668150d1..000000000 --- a/po/FvwmTaskBar.sv_SE.po +++ /dev/null @@ -1,34 +0,0 @@ -# Swedish translations for fvwm package -# Svenska versttningar fr paket fvwm. -# Copyright (C) 2003 fvwm workers -# This file is distributed under the same license as the fvwm package. -# Johan Svedberg , 2003. -# -msgid "" -msgstr "" -"Project-Id-Version: fvwm\n" -"POT-Creation-Date: 2003-04-11 12:43+0200\n" -"PO-Revision-Date: 2003-10-19 13:34+0200\n" -"Last-Translator: Johan Svedberg \n" -"Language-Team: Swedish\n" -"Language: \n" -"MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=ISO-8859-1\n" -"Content-Transfer-Encoding: 8bit\n" -"Plural-Forms: nplurals=2; plural=(n != 1);\n" - -#: ../modules/FvwmTaskBar/Goodies.c:462 -msgid "No new mail" -msgstr "Ingen ny post" - -#: ../modules/FvwmTaskBar/Goodies.c:466 -msgid "You have new mail" -msgstr "Du har ny post" - -#: ../modules/FvwmTaskBar/Goodies.c:470 -msgid "You have mail" -msgstr "Du har post" - -#: ../modules/FvwmTaskBar/FvwmTaskBar.c:1320 -msgid "Click here to start" -msgstr "Klicka hr fr att starta" diff --git a/po/FvwmTaskBar.zh_CN.gmo b/po/FvwmTaskBar.zh_CN.gmo deleted file mode 100644 index e8bcf4f94..000000000 Binary files a/po/FvwmTaskBar.zh_CN.gmo and /dev/null differ diff --git a/po/FvwmTaskBar.zh_CN.po b/po/FvwmTaskBar.zh_CN.po deleted file mode 100644 index eecc2195d..000000000 --- a/po/FvwmTaskBar.zh_CN.po +++ /dev/null @@ -1,32 +0,0 @@ -# SOME DESCRIPTIVE TITLE. -# Copyright (C) YEAR fvwm workers -# This file is distributed under the same license as the PACKAGE package. -# Funda Wang , 2004. -# -msgid "" -msgstr "" -"Project-Id-Version: FvwmTaskBar\n" -"POT-Creation-Date: 2003-04-11 12:43+0200\n" -"PO-Revision-Date: 2004-05-22 16:17+0800\n" -"Last-Translator: Funda Wang \n" -"Language-Team: zh_CN \n" -"Language: \n" -"MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=UTF-8\n" -"Content-Transfer-Encoding: 8bit\n" - -#: ../modules/FvwmTaskBar/Goodies.c:462 -msgid "No new mail" -msgstr "无新邮件" - -#: ../modules/FvwmTaskBar/Goodies.c:466 -msgid "You have new mail" -msgstr "您有新邮件" - -#: ../modules/FvwmTaskBar/Goodies.c:470 -msgid "You have mail" -msgstr "您有邮件" - -#: ../modules/FvwmTaskBar/FvwmTaskBar.c:1320 -msgid "Click here to start" -msgstr "点击此处开始" diff --git a/po/FvwmTaskBar.zh_TW.po b/po/FvwmTaskBar.zh_TW.po deleted file mode 100644 index c230dbde8..000000000 --- a/po/FvwmTaskBar.zh_TW.po +++ /dev/null @@ -1,32 +0,0 @@ -# Traditional Chinese Messages for the FvwmTaskBar. -# Copyright (C) 2004-2005 fvwm workers. -# This file is distributed under the same license as the fvwm package. -# Funda Wang , 2004. -# Wei-Lun Chao , 2008. -# -msgid "" -msgstr "" -"Project-Id-Version: fvwm 2.7.0\n" -"POT-Creation-Date: 2003-04-11 12:43+0200\n" -"PO-Revision-Date: 2008-11-25 16:16+0800\n" -"Last-Translator: Wei-Lun Chao \n" -"Language-Team: zh_TW \n" -"MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=UTF-8\n" -"Content-Transfer-Encoding: 8bit\n" - -#: ../modules/FvwmTaskBar/Goodies.c:462 -msgid "No new mail" -msgstr "沒有新郵件" - -#: ../modules/FvwmTaskBar/Goodies.c:466 -msgid "You have new mail" -msgstr "您有新郵件" - -#: ../modules/FvwmTaskBar/Goodies.c:470 -msgid "You have mail" -msgstr "您有郵件" - -#: ../modules/FvwmTaskBar/FvwmTaskBar.c:1320 -msgid "Click here to start" -msgstr "點擊此處開始" diff --git a/po/Makefile.am b/po/Makefile.am index e8a740e11..e96d8534a 100644 --- a/po/Makefile.am +++ b/po/Makefile.am @@ -12,10 +12,6 @@ FVWMRC_POT_FILES = \ ../fvwm/ConfigFvwmSetup \ ../modules/FvwmForm/FvwmForm-Setup.in -FVWMTASKBAR_POT_FILES = \ - ../modules/FvwmTaskBar/Goodies.c \ - ../modules/FvwmTaskBar/FvwmTaskBar.c - FVWMSCRIPT_POT_FILES = \ ../modules/FvwmScript/Scripts/FvwmScript-BellSetup \ ../modules/FvwmScript/Scripts/FvwmScript-KeyboardSetup \ @@ -24,7 +20,7 @@ FVWMSCRIPT_POT_FILES = \ ../modules/FvwmScript/Scripts/FvwmScript-FileBrowser EXTRA_DIST = \ - @POFILES@ @GMOFILES@ fvwm.pot FvwmTaskBar.pot FvwmScript.pot \ + @POFILES@ @GMOFILES@ fvwm.pot FvwmScript.pot \ remove-potcdate.sed remove-potcdate.sin COPYRIGHT_HOLDER = fvwm workers @@ -108,36 +104,6 @@ $(FVWM_DOMAIN).pot-update: $(FVWM_POT_FILES) \ $(srcdir)/$(FVWM_DOMAIN).pot: $(MAKE) $(FVWM_DOMAIN).pot-update -$(FVWMTASKBAR_DOMAIN).pot-update: $(FVWMTASKBAR_POT_FILES) \ - remove-potcdate.sed - potfiles='$(FVWMTASKBAR_POT_FILES)'; \ - $(XGETTEXT) \ - --add-comments=TRANSLATORS: $(XGETTEXT_OPTIONS) \ - -o $(FVWMTASKBAR_DOMAIN).po \ - --copyright-holder='$(COPYRIGHT_HOLDER)' $$potfiles; \ - test ! -f $(FVWMTASKBAR_DOMAIN).po || { \ - if test -f $(srcdir)/$(FVWMTASKBAR_DOMAIN).pot; then \ - sed -f remove-potcdate.sed < $(srcdir)/$(FVWMTASKBAR_DOMAIN).pot \ - > $(FVWMTASKBAR_DOMAIN).1po && \ - sed -f remove-potcdate.sed < $(FVWMTASKBAR_DOMAIN).po \ - > $(FVWMTASKBAR_DOMAIN).2po && \ - if cmp $(FVWMTASKBAR_DOMAIN).1po $(FVWMTASKBAR_DOMAIN).2po \ - >/dev/null 2>&1; then \ - rm -f $(FVWMTASKBAR_DOMAIN).1po $(FVWMTASKBAR_DOMAIN).2po \ - $(FVWMTASKBAR_DOMAIN).po; \ - else \ - rm -f $(FVWMTASKBAR_DOMAIN).1po $(FVWMTASKBAR_DOMAIN).2po \ - $(srcdir)/$(FVWMTASKBAR_DOMAIN).pot && \ - mv $(FVWMTASKBAR_DOMAIN).po $(srcdir)/$(FVWMTASKBAR_DOMAIN).pot; \ - fi; \ - else \ - mv $(FVWMTASKBAR_DOMAIN).po $(srcdir)/$(FVWMTASKBAR_DOMAIN).pot; \ - fi; \ - } - -$(srcdir)/$(FVWMTASKBAR_DOMAIN).pot: - $(MAKE) $(FVWMTASKBAR_DOMAIN).pot-update - $(FVWMSCRIPT_DOMAIN).pot-update: $(FVWMSCRIPT_POT_FILES) \ remove-potcdate.sed potfiles='$(FVWMSCRIPT_POT_FILES)'; \ @@ -155,7 +121,7 @@ $(FVWMSCRIPT_DOMAIN).pot-update: $(FVWMSCRIPT_POT_FILES) \ $(srcdir)/$(FVWMSCRIPT_DOMAIN).pot: $(MAKE) $(FVWMSCRIPT_DOMAIN).pot-update -$(POFILES): $(srcdir)/$(FVWM_DOMAIN).pot $(srcdir)/$(FVWMTASKBAR_DOMAIN).pot \ +$(POFILES): $(srcdir)/$(FVWM_DOMAIN).pot \ $(srcdir)/$(FVWMSCRIPT_DOMAIN).pot dlang=`echo $@ | sed -e 's,.*/,,' -e 's/\.po$$//'`; \ dom=`echo $$dlang | sed -e 's/\..*$$//'`; \ @@ -293,7 +259,6 @@ uninstall-local-yes: update-po: Makefile $(MAKE) $(FVWM_DOMAIN).pot-update - $(MAKE) $(FVWMTASKBAR_DOMAIN).pot-update $(MAKE) $(FVWMSCRIPT_DOMAIN).pot-update $(MAKE) $(UPDATEPOFILES) $(MAKE) update-gmo