fvwm-crystal-commits Mailing List for FVWM-Crystal

FVWM-Crystal aims to create an easy to use and powerful desktop.

Status: Beta

Brought to you by: dominique_libre, harnir

fvwm-crystal-commits — FVWM-Crystal commits archive

You can subscribe to this list here.

2008	Jan	Feb	Mar	Apr	May (6)	Jun (16)	Jul	Aug	Sep	Oct	Nov	Dec
2009	Jan	Feb	Mar	Apr (2)	May	Jun (3)	Jul	Aug	Sep	Oct	Nov	Dec
2010	Jan	Feb	Mar	Apr	May	Jun	Jul	Aug	Sep	Oct	Nov	Dec (28)
2011	Jan (33)	Feb (10)	Mar	Apr	May (1)	Jun (14)	Jul	Aug	Sep	Oct	Nov	Dec
2012	Jan	Feb	Mar	Apr (4)	May (1)	Jun	Jul (6)	Aug	Sep	Oct (9)	Nov	Dec (1)
2013	Jan (2)	Feb	Mar (1)	Apr (192)	May (161)	Jun (21)	Jul (27)	Aug (6)	Sep (4)	Oct	Nov	Dec (13)
2014	Jan (26)	Feb (27)	Mar (12)	Apr	May (5)	Jun	Jul	Aug	Sep	Oct (25)	Nov (1)	Dec
2015	Jan (16)	Feb (4)	Mar (5)	Apr (1)	May (1)	Jun (9)	Jul	Aug	Sep (18)	Oct (53)	Nov (35)	Dec (46)
2016	Jan (6)	Feb	Mar	Apr (14)	May (1)	Jun	Jul	Aug	Sep (1)	Oct	Nov (1)	Dec (5)
2017	Jan (1)	Feb	Mar	Apr	May (4)	Jun	Jul (2)	Aug	Sep (5)	Oct	Nov	Dec
2018	Jan (1)	Feb	Mar	Apr	May	Jun	Jul (3)	Aug	Sep	Oct	Nov	Dec
2019	Jan	Feb	Mar (2)	Apr	May (9)	Jun (4)	Jul	Aug (25)	Sep (4)	Oct (1)	Nov (16)	Dec (1)
2020	Jan (4)	Feb (63)	Mar	Apr (15)	May	Jun	Jul (1)	Aug	Sep (4)	Oct (4)	Nov (1)	Dec (10)
2021	Jan (1)	Feb	Mar	Apr	May	Jun	Jul	Aug	Sep	Oct	Nov	Dec

Flat | Threaded

1 2 3 .. 43 > >> (Page 1 of 43)

[Fvwm-crystal-commits] SF.net SVN: fvwm-crystal:[1059] README

From: <dom...@us...> - 2021-01-03 18:30:50

Revision: 1059
          http://sourceforge.net/p/fvwm-crystal/code/1059
Author:   dominique_libre
Date:     2021-01-03 18:30:48 +0000 (Sun, 03 Jan 2021)
Log Message:
-----------
Update README with current development.

Modified Paths:
--------------
    README

Modified: README
===================================================================
--- README	2020-12-15 21:52:29 UTC (rev 1058)
+++ README	2021-01-03 18:30:48 UTC (rev 1059)
@@ -1,3 +1,6 @@
+Current development has moved to github. See
+  https://github.com/fvwm-crystal/fvwm-crystal
+
 FVWM-Crystal 3.7.0
 http://fvwm-crystal.sourceforge.net/
 ------------------------------------

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Fvwm-crystal-commits] SF.net SVN: fvwm-crystal:[1058] bin/fvwm-crystal

From: <dom...@us...> - 2020-12-15 21:52:31

Revision: 1058
          http://sourceforge.net/p/fvwm-crystal/code/1058
Author:   dominique_libre
Date:     2020-12-15 21:52:29 +0000 (Tue, 15 Dec 2020)
Log Message:
-----------
Oops: fvwm-crystal: one more bashism fix

Modified Paths:
--------------
    bin/fvwm-crystal

Modified: bin/fvwm-crystal
===================================================================
--- bin/fvwm-crystal	2020-12-15 21:06:01 UTC (rev 1057)
+++ bin/fvwm-crystal	2020-12-15 21:52:29 UTC (rev 1058)
@@ -56,7 +56,7 @@
 	FVWM_DISTROMENUNAME="debian"
 fi
 # Where to write the log when fvwm3 is in debug mode
-if [ "${FVWM_EXEC}" == "fvwm3" ]; then
+if [ "${FVWM_EXEC}" = "fvwm3" ]; then
 	if [ "x${FVWM3_LOGFILE}" == "x" ]; then
 	        FVWM3_LOGFILE="${HOME}/.fvwm-crystal.log"
 	        export FVWM3_LOGFILE

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Fvwm-crystal-commits] SF.net SVN: fvwm-crystal:[1057] fvwm/components

From: <dom...@us...> - 2020-12-15 21:06:03

Revision: 1057
          http://sourceforge.net/p/fvwm-crystal/code/1057
Author:   dominique_libre
Date:     2020-12-15 21:06:01 +0000 (Tue, 15 Dec 2020)
Log Message:
-----------
Fix the FvwmMiniConssole to work with fvwm3 without golang support; bump to 3.7.1

Modified Paths:
--------------
    ChangeLog
    NEWS
    fvwm/components/apps/FvwmMiniConsole
    fvwm/components/functions/About

Modified: ChangeLog
===================================================================
--- ChangeLog	2020-12-15 19:55:25 UTC (rev 1056)
+++ ChangeLog	2020-12-15 21:06:01 UTC (rev 1057)
@@ -1,7 +1,14 @@
 ChangeLog for FVWM-Crystal
 
+Version 3.7.1
+-------------
+
 mardi 15 décembre 2020
   bin/fvwm-crystal: make dash to be happy with the fvwm* and debug mode tests.
+  fvwm/components/functions/About;
+  fvwm/components/apps/FvwmMiniConsole: make FvwmPrompt/FvwmConsole test to
+  work with fvwm2 and fvwm3 with or without golang support.
+  NEWS: bump to 3.7.1
 
 dimanche 13 décembre 2020
   fvwm/preferences/Startup: use StartFunction with Test (Init) instead of

Modified: NEWS
===================================================================
--- NEWS	2020-12-15 19:55:25 UTC (rev 1056)
+++ NEWS	2020-12-15 21:06:01 UTC (rev 1057)
@@ -1,3 +1,30 @@
+Version 3.7.1
+-------------
+
+Fvwm Crystal 3.7.1 is an important bug fix release.
+
+- Fix X failure at fvwm-crystal start when sh is dash (Debian and derivatives).
+
+It introduce some minor bug fixes and feature as well:
+
+- Use StartFunction with Test (Init) instead of the deprecated InitFunction.
+  This male the Startup file in the preferences folder to be more reliable
+  with fvwm3.
+
+- Add alsamixer launcher in the Startup file with support for the current
+  Mixer preference setting.
+
+- Start FvwmMFL when running fvwm3.
+
+- Add support for FvwmPrompt (fvwm3 with golang support only) into the
+  FvwmMiniConsole. Fvwm2 and fvwm3 without golang are supported as before
+  via FvwmConsole.
+
+As always, see ChangeLog for details.
+
+Have fun!
+Dominique Michel
+
 Version 3.7.0
 -------------
 

Modified: fvwm/components/apps/FvwmMiniConsole
===================================================================
--- fvwm/components/apps/FvwmMiniConsole	2020-12-15 19:55:25 UTC (rev 1056)
+++ fvwm/components/apps/FvwmMiniConsole	2020-12-15 21:06:01 UTC (rev 1057)
@@ -24,9 +24,10 @@
 + I Style FvwmMiniConsoleNeedsUniqueName WindowShadeSteps 16
 + I Style FvwmMiniConsoleNeedsUniqueName WindowShadeShrinks
 + I Style FvwmMiniConsoleNeedsUniqueName TitleAtBottom
-# fvwm3 version start with 1.0.0
-+ I Test (Version >= 2.6.9) Module FvwmConsole -terminal $[infostore.FvwmConsoleTerminal] -geometry 80x5+0-0 -title FvwmMiniConsoleNeedsUniqueName
-+ I TestRc (NoMatch) AGT FvwmMiniConsoleNeedsUniqueName 80x5+0-0 FvwmPrompt
+# fvwm3 with golang support
++ I Test (X FvwmPrompt) AGT FvwmMiniConsoleNeedsUniqueName 80x5+0-0 FvwmPrompt
+# fvwm2 (or fvwm3 without golang support at that time of writing 15.12-2020)
++ I TestRc (NoMatch)  Module FvwmConsole -terminal $[infostore.FvwmConsoleTerminal] -geometry 80x5+0-0 -title FvwmMiniConsoleNeedsUniqueName
 + I Wait FvwmMiniConsoleNeedsUniqueName
 + I Style FvwmMiniConsoleNeedsUniqueName FixedPosition
 + I All (FvwmMiniConsoleNeedsUniqueName) MoveToDesk 0 666

Modified: fvwm/components/functions/About
===================================================================
--- fvwm/components/functions/About	2020-12-15 19:55:25 UTC (rev 1056)
+++ fvwm/components/functions/About	2020-12-15 21:06:01 UTC (rev 1057)
@@ -5,7 +5,7 @@
 *About: Line center
 *About: Text "FVWM-Crystal"
 *About: Line center
-*About: Text "$[gt.Version]: 3.7.0"
+*About: Text "$[gt.Version]: 3.7.1"
 *About: Line center
 *About: Text "Magic Star"
 *About: Line center

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Fvwm-crystal-commits] SF.net SVN: fvwm-crystal:[1056] bin

From: <dom...@us...> - 2020-12-15 19:55:29

Revision: 1056
          http://sourceforge.net/p/fvwm-crystal/code/1056
Author:   dominique_libre
Date:     2020-12-15 19:55:25 +0000 (Tue, 15 Dec 2020)
Log Message:
-----------
fvwm-crystal: make dash to be happy with the fvwm* and debug mode tests

Modified Paths:
--------------
    ChangeLog
    bin/fvwm-crystal

Modified: ChangeLog
===================================================================
--- ChangeLog	2020-12-13 15:16:57 UTC (rev 1055)
+++ ChangeLog	2020-12-15 19:55:25 UTC (rev 1056)
@@ -1,5 +1,8 @@
 ChangeLog for FVWM-Crystal
 
+mardi 15 décembre 2020
+  bin/fvwm-crystal: make dash to be happy with the fvwm* and debug mode tests.
+
 dimanche 13 décembre 2020
   fvwm/preferences/Startup: use StartFunction with Test (Init) instead of
   InitFunction; add alsamixer launcher.

Modified: bin/fvwm-crystal
===================================================================
--- bin/fvwm-crystal	2020-12-13 15:16:57 UTC (rev 1055)
+++ bin/fvwm-crystal	2020-12-15 19:55:25 UTC (rev 1056)
@@ -14,16 +14,16 @@
 
 # We now have both fvwm and fvwm3. fvwm-crystal work with both of them.
 # Use $FVWM_EXEC if set, fvwm3 if present, fvvwm otherwise:
-if [ "x${FVWM_EXEC}" == "x" ]; then
+if [ "x${FVWM_EXEC}" = "x" ]; then
     	for name in fvwm3 fvwm fvwm2; do
 	    FVWM_EXEC=`which "${name}" 2>/dev/null`
-	    if (($? == 0)); then
+	    if [ $? = 0 ]; then
 		break
 	    fi
 	done
 fi
 FVWM_EXEC=`basename ${FVWM_EXEC}`
-if [ "x${FVWM_EXEC}" == "x" ]; then
+if [ "x${FVWM_EXEC}" = "x" ]; then
 	echo 'No fvwm, fvwm2 or fvwm3 executable found in $PATH.'
 	echo "Please adjust your PATH accordingly or install fvwm."
 	echo "If fvwm is installed in another location, you can provide it as:"
@@ -120,11 +120,11 @@
 #echo "exec fvwm -f $configfile $@"
 
 #exec fvwm -f $configfile $@
-if [ "x${FVWMCRYSTAL_DEBUG}" == "x" ]; then
+if [ "x${FVWMCRYSTAL_DEBUG}" = "x" ]; then
 	echo "Fvwm-Crystal starting using ${FVWM_EXEC}."
 	exec ${FVWM_EXEC} -f $configfile $@
 else
-	if [ "${FVWM_EXEC}" == "fvwm3" ]; then
+	if [ "${FVWM_EXEC}" = "fvwm3" ]; then
 		echo "Fvwm-Crystal starting using ${FVWM_EXEC} in debug mode, the log file is ${FVWM3_LOGFILE}."
 		exec ${FVWM_EXEC} -v -f $configfile $@
 	else

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Fvwm-crystal-commits] SF.net SVN: fvwm-crystal:[1055] fvwm/components/functions

From: <dom...@us...> - 2020-12-13 15:16:59

Revision: 1055
          http://sourceforge.net/p/fvwm-crystal/code/1055
Author:   dominique_libre
Date:     2020-12-13 15:16:57 +0000 (Sun, 13 Dec 2020)
Log Message:
-----------
fvwm/components/functions/LoadCommonStuffs: add FvwmMFL start with version test

Modified Paths:
--------------
    ChangeLog
    fvwm/components/functions/LoadCommonStuffs

Modified: ChangeLog
===================================================================
--- ChangeLog	2020-12-13 11:34:31 UTC (rev 1054)
+++ ChangeLog	2020-12-13 15:16:57 UTC (rev 1055)
@@ -3,6 +3,8 @@
 dimanche 13 décembre 2020
   fvwm/preferences/Startup: use StartFunction with Test (Init) instead of
   InitFunction; add alsamixer launcher.
+  fvwm/components/functions/LoadCommonStuffs: add FvwmMFL start with version
+  test.
 
 lundi 7 décembre 2020
   INSTALL: add fvwm3 dependency.

Modified: fvwm/components/functions/LoadCommonStuffs
===================================================================
--- fvwm/components/functions/LoadCommonStuffs	2020-12-13 11:34:31 UTC (rev 1054)
+++ fvwm/components/functions/LoadCommonStuffs	2020-12-13 15:16:57 UTC (rev 1055)
@@ -18,7 +18,11 @@
 ImagePath $[FVWM_USERDIR]/icons/$[infostore.Icon_Theme]:$[FVWM_SYSTEMDIR]/icons/$[infostore.Icon_Theme]
 
 # Includes and FVWM modules {{{1
-Module FvwmCommandS
+DestroyFunc StartCommandPipe
+AddToFunc StartCommandPipe
++ I Test (Version >= 2.6.9) Module FvwmCommandS
++ I TestRc (NoMatch) Module FvwmMFL
+StartCommandPipe
 
 # Default FVWM-Crystal functions, initialization {{{2
 Include components/functions/Clear-FVWM-Settings

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Fvwm-crystal-commits] SF.net SVN: fvwm-crystal:[1054] fvwm/preferences

From: <dom...@us...> - 2020-12-13 11:34:33

Revision: 1054
          http://sourceforge.net/p/fvwm-crystal/code/1054
Author:   dominique_libre
Date:     2020-12-13 11:34:31 +0000 (Sun, 13 Dec 2020)
Log Message:
-----------
Startup: use StartFunction with Test (Init) instead of InitFunction; add alsamixer launcher.

Modified Paths:
--------------
    ChangeLog
    fvwm/preferences/Startup

Modified: ChangeLog
===================================================================
--- ChangeLog	2020-12-07 09:02:16 UTC (rev 1053)
+++ ChangeLog	2020-12-13 11:34:31 UTC (rev 1054)
@@ -1,5 +1,9 @@
 ChangeLog for FVWM-Crystal
 
+dimanche 13 décembre 2020
+  fvwm/preferences/Startup: use StartFunction with Test (Init) instead of
+  InitFunction; add alsamixer launcher.
+
 lundi 7 décembre 2020
   INSTALL: add fvwm3 dependency.
   fvwm/components/apps/FvwmMiniConsole: add support for FvwmPrompt

Modified: fvwm/preferences/Startup
===================================================================
--- fvwm/preferences/Startup	2020-12-07 09:02:16 UTC (rev 1053)
+++ fvwm/preferences/Startup	2020-12-13 11:34:31 UTC (rev 1054)
@@ -1,47 +1,53 @@
 # In this file you can start up applications at the beginning of the session.
 
-AddToFunc InitFunction
+AddToFunc StartFunction
 
 # Launch GKrellM, only if it doesn't run
-#+ I Test (x gkrellm) Exec pidof gkrellm || exec gkrellm
+#+ I Test (Init) Test (x gkrellm) Exec pidof gkrellm || exec gkrellm
 
 #Launch torsmo
 #+ I Test (x torsmo) Exec pidof torsmo || exec torsmo
 
 #Launch conky
-#+ I Test (x conky) Exec pidof conky || exec conky
+#+ I Test (Init) Test (x conky) Exec pidof conky || exec conky
 
 # A calendar on the desktop
-#+ I Test (x gdeskcal) X gdeskcal
+#+ I Test (Init) Test (x gdeskcal) X gdeskcal
 
 # Launch Skype
-#+ I Test (x skype) Exec pidof skype || exec skype
+#+ I Test (Init) Test (x skype) Exec pidof skype || exec skype
 
 # Launch Psi
-#+ I Test (x psi) Exec pidof psi || exec psi
+#+ I Test (Init) Test (x psi) Exec pidof psi || exec psi
 
 # Launch TleenX2
-#+ I Test (x tleenx2) Exec pidof tleenx2 || exec tleenx2
+#+ I Test (Init) Test (x tleenx2) Exec pidof tleenx2 || exec tleenx2
 
 # Launch Kadu
-#+ I Test (x kadu) Exec pidof kadu || exec kadu
+#+ I Test (Init) Test (x kadu) Exec pidof kadu || exec kadu
 
 # Launch QJackCtl
-#+ I Test (x qjackctl) Exec pidof qjackctl || exec qjackctl
+#+ I Test (Init) Test (x qjackctl) Exec pidof qjackctl || exec qjackctl
 
 # Launch LADITray
-#+ I Test (x ladi-system-tray) Exec pidof ladi-system-tray || exec ladi-system-tray 2>/dev/null
+#+ I Test (Init) Test (x ladi-system-tray) Exec pidof ladi-system-tray || exec ladi-system-tray 2>/dev/null
 
 # Launch jamin
-#+ I Test (x jamin) Exec pidof jamin || exec jamin
+#+ I Test (Init) Test (x jamin) Exec pidof jamin || exec jamin
 
 # Launch jackdbus
-#+ I Test (x jackdbus) PipeRead "pidof jackdbus || (echo A start_jack && echo Music-QJackGUI)"
+#+ I Test (Init) Test (x jackdbus) PipeRead "pidof jackdbus || (echo A start_jack && echo Music-QJackGUI)"
 
 # Lauch Cadence
-#+ I Test (x cadence) PipeRead "pidof cadence || echo A start_cadence
+#+ I Test (Init) Test (x cadence) PipeRead "pidof cadence || echo A start_cadence"
 
+# Launch alsamixer
+#+ I Test (Init) Test (x alsamixer) PipeRead 'pidof alsamixer || echo "AT \\\"ALSA Mixer\\\" \\\"alsamixer -c $[infostore.SoundCard]\\\""
+
 # Launch HexChat
-#+ I Test (x hexchat) Exec pidof hexchat || exec hexchat
+#+ I Test (Init) Test (x hexchat) Exec pidof hexchat || exec hexchat
 
+# Launch Zim
+#+ I Test (Init) Test (x zim) Exec pidof zim || exec zim
+
 # vim:ft=fvwm

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Fvwm-crystal-commits] SF.net SVN: fvwm-crystal:[1053] fvwm/components

From: <dom...@us...> - 2020-12-07 09:02:19

Revision: 1053
          http://sourceforge.net/p/fvwm-crystal/code/1053
Author:   dominique_libre
Date:     2020-12-07 09:02:16 +0000 (Mon, 07 Dec 2020)
Log Message:
-----------
Add support for FvwmPrompt in FvwmMiniConsole

Modified Paths:
--------------
    ChangeLog
    INSTALL
    fvwm/components/apps/FvwmMiniConsole
    fvwm/components/functions/Exec-Accelerator

Modified: ChangeLog
===================================================================
--- ChangeLog	2020-12-03 00:38:27 UTC (rev 1052)
+++ ChangeLog	2020-12-07 09:02:16 UTC (rev 1053)
@@ -1,5 +1,11 @@
 ChangeLog for FVWM-Crystal
 
+lundi 7 décembre 2020
+  INSTALL: add fvwm3 dependency.
+  fvwm/components/apps/FvwmMiniConsole: add support for FvwmPrompt
+  fvwm/components/functions/Exec-Accelerator: add AGT, as AT but with geometry;
+  needed by FvwmPrompt.
+
 Version 3.7.0
 -------------
 

Modified: INSTALL
===================================================================
--- INSTALL	2020-12-03 00:38:27 UTC (rev 1052)
+++ INSTALL	2020-12-07 09:02:16 UTC (rev 1053)
@@ -145,7 +145,7 @@
 
 Needed:
 -------
-- fvwm>=2.6.9
+- fvwm>=2.6.9 or fvwm3 with FvwmPrompt (with --enable-golang).
 - python3 - tested with 3.6, should work with any python3 version.
     python2 is not supported anymore because upstream will end
     its support at the end of that year (2019).

Modified: fvwm/components/apps/FvwmMiniConsole
===================================================================
--- fvwm/components/apps/FvwmMiniConsole	2020-12-03 00:38:27 UTC (rev 1052)
+++ fvwm/components/apps/FvwmMiniConsole	2020-12-07 09:02:16 UTC (rev 1053)
@@ -24,7 +24,9 @@
 + I Style FvwmMiniConsoleNeedsUniqueName WindowShadeSteps 16
 + I Style FvwmMiniConsoleNeedsUniqueName WindowShadeShrinks
 + I Style FvwmMiniConsoleNeedsUniqueName TitleAtBottom
-+ I Module FvwmConsole -terminal $[infostore.FvwmConsoleTerminal] -geometry 80x5+0-0 -title FvwmMiniConsoleNeedsUniqueName
+# fvwm3 version start with 1.0.0
++ I Test (Version >= 2.6.9) Module FvwmConsole -terminal $[infostore.FvwmConsoleTerminal] -geometry 80x5+0-0 -title FvwmMiniConsoleNeedsUniqueName
++ I TestRc (NoMatch) AGT FvwmMiniConsoleNeedsUniqueName 80x5+0-0 FvwmPrompt
 + I Wait FvwmMiniConsoleNeedsUniqueName
 + I Style FvwmMiniConsoleNeedsUniqueName FixedPosition
 + I All (FvwmMiniConsoleNeedsUniqueName) MoveToDesk 0 666

Modified: fvwm/components/functions/Exec-Accelerator
===================================================================
--- fvwm/components/functions/Exec-Accelerator	2020-12-03 00:38:27 UTC (rev 1052)
+++ fvwm/components/functions/Exec-Accelerator	2020-12-07 09:02:16 UTC (rev 1053)
@@ -22,6 +22,9 @@
 # AT
 # As 'A' function, but give a Title to the window terminal.
 
+# ATG
+# As 'AT' function, but give a geometry to the window terminal.
+
 # C
 # Launches a the fvwm console terminal with optional program as an argument.
 # Terminal settings should be set using ~/.Xresources file or (in Eterm) theme file.
@@ -67,6 +70,11 @@
 + I Test (!EnvMatch infostore.DefaultTerminal gnome-terminal, !EnvMatch DefaultTerminal multi-gnome-terminal, !EnvMatch DefaultTerminal terminator, !EnvMatch DefaultTerminal x-terminal-emulator, !EnvMatch DefaultTerminal xfce4-terminal) Exec exec $[infostore.DefaultTerminal] --title "$0" -e $[1-]  $[infostore.SILENT]
 + I TestRc (NoMatch) Exec exec $[infostore.DefaultTerminal] --title "$0" -e "$[1-]" $[infostore.SILENT]
 
+DestroyFunc StartGTitledTerminal
+AddToFunc StartGTitledTerminal
++ I Test (!EnvMatch infostore.DefaultTerminal gnome-terminal, !EnvMatch DefaultTerminal multi-gnome-terminal, !EnvMatch DefaultTerminal terminator, !EnvMatch DefaultTerminal x-terminal-emulator, !EnvMatch DefaultTerminal xfce4-terminal) Exec exec $[infostore.DefaultTerminal] --title "$0" --geometry "$1" -e $[2-]  $[infostore.SILENT]
++ I TestRc (NoMatch) Exec exec $[infostore.DefaultTerminal] --title "$0" --geometry "$1" -e "$[2-]" $[infostore.SILENT]
+
 # Usage: A [command] [command options]
 DestroyFunc A
 AddToFunc A
@@ -89,6 +97,13 @@
 + I Test (EnvMatch infostore.DefaultTerminal urxvtc) StartUrxvtc --title "$0" -name "$0" -e $[1-]
 + I TestRc (NoMatch) StartTitledTerminal "$0" $[1-]
 
+# Usage: AGT [title] [geometry] [command] (Use quotes if you want command options or title with spaces)
+DestroyFunc AGT
+AddToFunc AGT
++ I Window-SetPlacementPolicy
++ I Test (EnvMatch infostore.DefaultTerminal urxvtc) StartUrxvtc --title "$0" -name "$0" --geometry "$1" -e $[2-]
++ I TestRc (NoMatch) StartGTitledTerminal "$0" "$1" "$[2-]"
+
 # Usage: C [command] [command options]
 DestroyFunc C
 AddToFunc C

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Fvwm-crystal-commits] SF.net SVN: fvwm-crystal:[1052]

From: <dom...@us...> - 2020-12-03 00:38:35

Revision: 1052
          http://sourceforge.net/p/fvwm-crystal/code/1052
Author:   dominique_libre
Date:     2020-12-03 00:38:27 +0000 (Thu, 03 Dec 2020)
Log Message:
-----------
Fix startup in debug mode

Modified Paths:
--------------
    ChangeLog
    asciidoc/fvwm-crystal
    bin/fvwm-crystal
    doc/html/fvwm-crystal.html
    man/fvwm-crystal.1

Modified: ChangeLog
===================================================================
--- ChangeLog	2020-12-02 23:25:17 UTC (rev 1051)
+++ ChangeLog	2020-12-03 00:38:27 UTC (rev 1052)
@@ -5,7 +5,7 @@
 
 mercredi 2 décembre 2020
   bin/fvwm-crystal: add initial support for fvwm3;
-  fvwm3 debug mode is supported if $FVWM_DEBUG is set to a non empty value
+  fvwm3 debug mode is supported if $FVWMCRYSTAL_DEBUG is set to a non empty value
   at startup; if $FVWM_LOGFILE is not set, the log file will be ~/.fvwm-crystal.log.
   fvwm/scripts/launchwm: add fvwm3 and fvwm2 support. Each fvwm variant will
   use its own FVWM_USERDIR path:

Modified: asciidoc/fvwm-crystal
===================================================================
--- asciidoc/fvwm-crystal	2020-12-02 23:25:17 UTC (rev 1051)
+++ asciidoc/fvwm-crystal	2020-12-03 00:38:27 UTC (rev 1052)
@@ -72,7 +72,7 @@
 
 When fvwm3 is in use, the following variables can be used:
 
-*FVWM-CRYSTAL_DEBUG* set fvwm3 in debug mode when set to a non empty value (default: not set). You don't need to redirect the errors into a file, fvwm3 will do it for you.
+*FVWMCRYSTAL_DEBUG* set fvwm3 in debug mode when set to a non empty value (default: not set). You don't need to redirect the errors into a file, fvwm3 will do it for you.
 
 *FVWM_LOGFILE* set fvwm3 log file when in debug mode (default: ~/.fvwm-crystal.log).
 

Modified: bin/fvwm-crystal
===================================================================
--- bin/fvwm-crystal	2020-12-02 23:25:17 UTC (rev 1051)
+++ bin/fvwm-crystal	2020-12-03 00:38:27 UTC (rev 1052)
@@ -22,6 +22,7 @@
 	    fi
 	done
 fi
+FVWM_EXEC=`basename ${FVWM_EXEC}`
 if [ "x${FVWM_EXEC}" == "x" ]; then
 	echo 'No fvwm, fvwm2 or fvwm3 executable found in $PATH.'
 	echo "Please adjust your PATH accordingly or install fvwm."
@@ -56,9 +57,9 @@
 fi
 # Where to write the log when fvwm3 is in debug mode
 if [ "${FVWM_EXEC}" == "fvwm3" ]; then
-	if [ "x${FVWM_LOGFILE}" == "x" ]; then
-	        FVWM_LOGFILE="${HOME}/.fvwm-crystal.log"
-	        export FVWM_LOGFILE
+	if [ "x${FVWM3_LOGFILE}" == "x" ]; then
+	        FVWM3_LOGFILE="${HOME}/.fvwm-crystal.log"
+	        export FVWM3_LOGFILE
 	fi
 fi
 #
@@ -119,12 +120,12 @@
 #echo "exec fvwm -f $configfile $@"
 
 #exec fvwm -f $configfile $@
-if [ "x${FVWM-CRYSTAL_DEBUG}" == "x" ]; then
+if [ "x${FVWMCRYSTAL_DEBUG}" == "x" ]; then
 	echo "Fvwm-Crystal starting using ${FVWM_EXEC}."
 	exec ${FVWM_EXEC} -f $configfile $@
 else
 	if [ "${FVWM_EXEC}" == "fvwm3" ]; then
-		echo "Fvwm-Crystal starting using ${FVWM_EXEC} in debug mode, the log file is ${FVWM_LOGFILE}."
+		echo "Fvwm-Crystal starting using ${FVWM_EXEC} in debug mode, the log file is ${FVWM3_LOGFILE}."
 		exec ${FVWM_EXEC} -v -f $configfile $@
 	else
 		echo "Debug mode is not supported by ${FVWM_EXEC}. It print all errors to stderr."

Modified: doc/html/fvwm-crystal.html
===================================================================
--- doc/html/fvwm-crystal.html	2020-12-02 23:25:17 UTC (rev 1051)
+++ doc/html/fvwm-crystal.html	2020-12-03 00:38:27 UTC (rev 1052)
@@ -802,7 +802,7 @@
 <pre><code>startx</code></pre>
 </div></div>
 <div class="paragraph"><p>When fvwm3 is in use, the following variables can be used:</p></div>
-<div class="paragraph"><p><strong>FVWM-CRYSTAL_DEBUG</strong> set fvwm3 in debug mode when set to a non empty value (default: not set). You don&#8217;t need to redirect the errors into a file, fvwm3 will do it for you.</p></div>
+<div class="paragraph"><p><strong>FVWMCRYSTAL_DEBUG</strong> set fvwm3 in debug mode when set to a non empty value (default: not set). You don&#8217;t need to redirect the errors into a file, fvwm3 will do it for you.</p></div>
 <div class="paragraph"><p><strong>FVWM_LOGFILE</strong> set fvwm3 log file when in debug mode (default: ~/.fvwm-crystal.log).</p></div>
 <div class="sect2">
 <h3 id="_first_start">First Start</h3>
@@ -1444,7 +1444,7 @@
 <div id="footer">
 <div id="footer-text">
 Last updated
- 2020-12-02 23:31:08 CET
+ 2020-12-03 01:36:23 CET
 </div>
 </div>
 </body>

Modified: man/fvwm-crystal.1
===================================================================
--- man/fvwm-crystal.1	2020-12-02 23:25:17 UTC (rev 1051)
+++ man/fvwm-crystal.1	2020-12-03 00:38:27 UTC (rev 1052)
@@ -2,12 +2,12 @@
 .\"     Title: fvwm-crystal
 .\"    Author: [see the "AUTHORS" section]
 .\" Generator: DocBook XSL Stylesheets v1.79.1 <http://docbook.sf.net/>
-.\"      Date: 12/02/2020
+.\"      Date: 12/03/2020
 .\"    Manual: FVWM-Crystal
 .\"    Source: fvwm-crystal 3.7.0
 .\"  Language: English
 .\"
-.TH "FVWM\-CRYSTAL" "1" "12/02/2020" "fvwm\-crystal 3\&.7\&.0" "FVWM\-Crystal"
+.TH "FVWM\-CRYSTAL" "1" "12/03/2020" "fvwm\-crystal 3\&.7\&.0" "FVWM\-Crystal"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
@@ -127,7 +127,7 @@
 .sp
 When fvwm3 is in use, the following variables can be used:
 .sp
-\fBFVWM\-CRYSTAL_DEBUG\fR set fvwm3 in debug mode when set to a non empty value (default: not set)\&. You don\(cqt need to redirect the errors into a file, fvwm3 will do it for you\&.
+\fBFVWMCRYSTAL_DEBUG\fR set fvwm3 in debug mode when set to a non empty value (default: not set)\&. You don\(cqt need to redirect the errors into a file, fvwm3 will do it for you\&.
 .sp
 \fBFVWM_LOGFILE\fR set fvwm3 log file when in debug mode (default: ~/\&.fvwm\-crystal\&.log)\&.
 .SS "First Start"

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Fvwm-crystal-commits] SF.net SVN: fvwm-crystal:[1051]

From: <dom...@us...> - 2020-12-02 23:25:23

Revision: 1051
          http://sourceforge.net/p/fvwm-crystal/code/1051
Author:   dominique_libre
Date:     2020-12-02 23:25:17 +0000 (Wed, 02 Dec 2020)
Log Message:
-----------
Update README to 3.7.0 and fvwm3

Modified Paths:
--------------
    ChangeLog
    README

Modified: ChangeLog
===================================================================
--- ChangeLog	2020-12-02 23:15:10 UTC (rev 1050)
+++ ChangeLog	2020-12-02 23:25:17 UTC (rev 1051)
@@ -14,6 +14,7 @@
   asciidoc/fvwm-crystal: add fvwm3 and related variables; create the man and html doc.
   fvwm/components/functions/About;
   NEWS: bump to 3.7.0
+  README: bump to 3.7.0; add fvwm3 into the dependencies.
 
 dimanche 29 novembre 2020
   fvwm/components/scripts/FvwmScript-CpuTemp: fix temperature reading path.

Modified: README
===================================================================
--- README	2020-12-02 23:15:10 UTC (rev 1050)
+++ README	2020-12-02 23:25:17 UTC (rev 1051)
@@ -1,4 +1,4 @@
-FVWM-Crystal 3.5.1
+FVWM-Crystal 3.7.0
 http://fvwm-crystal.sourceforge.net/
 ------------------------------------
 
@@ -108,7 +108,7 @@
 Requirements
 ------------
 
-- FVWM - version 2.6.9 or higher.
+- fvwm - version 2.6.9 or higher. This include fvwm3.
 - Python 3 - for applications menu database and random wallpaper.
 - ImageMagick - import and convert are used for screenshots.
 - UAM and pmount-gui - automounting of removable medias, optional.

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Fvwm-crystal-commits] SF.net SVN: fvwm-crystal:[1050]

From: <dom...@us...> - 2020-12-02 23:15:14

Revision: 1050
          http://sourceforge.net/p/fvwm-crystal/code/1050
Author:   dominique_libre
Date:     2020-12-02 23:15:10 +0000 (Wed, 02 Dec 2020)
Log Message:
-----------
Update NEWS to 3.7.0

Modified Paths:
--------------
    ChangeLog
    NEWS

Modified: ChangeLog
===================================================================
--- ChangeLog	2020-12-02 22:46:38 UTC (rev 1049)
+++ ChangeLog	2020-12-02 23:15:10 UTC (rev 1050)
@@ -12,7 +12,8 @@
   fvwm in ~.fvwm, fvwm2 in ~/.fvwm2, fvwm3 in ~/.fvwm3 and fvwm-themes
   in ~/fvwm-themes.
   asciidoc/fvwm-crystal: add fvwm3 and related variables; create the man and html doc.
-  fvwm/components/functions/About: bump to 3.7.0
+  fvwm/components/functions/About;
+  NEWS: bump to 3.7.0
 
 dimanche 29 novembre 2020
   fvwm/components/scripts/FvwmScript-CpuTemp: fix temperature reading path.

Modified: NEWS
===================================================================
--- NEWS	2020-12-02 22:46:38 UTC (rev 1049)
+++ NEWS	2020-12-02 23:15:10 UTC (rev 1050)
@@ -1,3 +1,23 @@
+Version 3.7.0
+-------------
+
+Fvwm Crystal 3.7.0 is out!
+
+This release add fvwm3 support and a minor fix.
+
+- Initial fvwm3 support. It should work out of the box.
+
+- Support for fvwm3 debug mode vie environmental variables.
+  See 'man fvwm-crystal' for the details.
+
+- Xephyr nested sessions: make the different fvwm versions use different FVWM_USERDIR:
+  fvwm: ~/.fvwm; fvwm2: ~/.fvwm2; fvwm3: ~/.fvwm3 and fvwm-themes: ~/.fvwm-themes.
+
+- Fix temperature sensor path in the CpuTmp applet.
+
+See ChangeLog for details.
+Dominique Michel
+
 Version 3.6.7
 -------------
 

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Fvwm-crystal-commits] SF.net SVN: fvwm-crystal:[1049]

From: <dom...@us...> - 2020-12-02 22:46:45

Revision: 1049
          http://sourceforge.net/p/fvwm-crystal/code/1049
Author:   dominique_libre
Date:     2020-12-02 22:46:38 +0000 (Wed, 02 Dec 2020)
Log Message:
-----------
Add initial fvwm3 support; bump version to 3.7.0.

Modified Paths:
--------------
    ChangeLog
    asciidoc/fvwm-crystal
    bin/fvwm-crystal
    doc/html/fvwm-crystal.html
    fvwm/components/functions/About
    fvwm/scripts/launchwm
    man/fvwm-crystal.1

Modified: ChangeLog
===================================================================
--- ChangeLog	2020-11-29 22:39:25 UTC (rev 1048)
+++ ChangeLog	2020-12-02 22:46:38 UTC (rev 1049)
@@ -1,5 +1,19 @@
 ChangeLog for FVWM-Crystal
 
+Version 3.7.0
+-------------
+
+mercredi 2 décembre 2020
+  bin/fvwm-crystal: add initial support for fvwm3;
+  fvwm3 debug mode is supported if $FVWM_DEBUG is set to a non empty value
+  at startup; if $FVWM_LOGFILE is not set, the log file will be ~/.fvwm-crystal.log.
+  fvwm/scripts/launchwm: add fvwm3 and fvwm2 support. Each fvwm variant will
+  use its own FVWM_USERDIR path:
+  fvwm in ~.fvwm, fvwm2 in ~/.fvwm2, fvwm3 in ~/.fvwm3 and fvwm-themes
+  in ~/fvwm-themes.
+  asciidoc/fvwm-crystal: add fvwm3 and related variables; create the man and html doc.
+  fvwm/components/functions/About: bump to 3.7.0
+
 dimanche 29 novembre 2020
   fvwm/components/scripts/FvwmScript-CpuTemp: fix temperature reading path.
 

Modified: asciidoc/fvwm-crystal
===================================================================
--- asciidoc/fvwm-crystal	2020-11-29 22:39:25 UTC (rev 1048)
+++ asciidoc/fvwm-crystal	2020-12-02 22:46:38 UTC (rev 1049)
@@ -2,7 +2,7 @@
 ===============
 :doctype: manpage
 :man source:   fvwm-crystal
-:man version:  3.5.1
+:man version:  3.7.0
 :man manual:   FVWM-Crystal
 
 NAME
@@ -70,6 +70,13 @@
 startx
 ----
 
+When fvwm3 is in use, the following variables can be used:
+
+*FVWM-CRYSTAL_DEBUG* set fvwm3 in debug mode when set to a non empty value (default: not set). You don't need to redirect the errors into a file, fvwm3 will do it for you.
+
+*FVWM_LOGFILE* set fvwm3 log file when in debug mode (default: ~/.fvwm-crystal.log).
+
+
 First Start
 ~~~~~~~~~~~
 *FVWM-Crystal* checks while your first login if +~/.fvwm-crystal+ exist and if old preferences must be converted to the new Fvwm InfoStore variables. In all cases, it should just start.

Modified: bin/fvwm-crystal
===================================================================
--- bin/fvwm-crystal	2020-11-29 22:39:25 UTC (rev 1048)
+++ bin/fvwm-crystal	2020-12-02 22:46:38 UTC (rev 1049)
@@ -12,29 +12,55 @@
 # Name of the configuration file
 configname=config
 
+# We now have both fvwm and fvwm3. fvwm-crystal work with both of them.
+# Use $FVWM_EXEC if set, fvwm3 if present, fvvwm otherwise:
+if [ "x${FVWM_EXEC}" == "x" ]; then
+    	for name in fvwm3 fvwm fvwm2; do
+	    FVWM_EXEC=`which "${name}" 2>/dev/null`
+	    if (($? == 0)); then
+		break
+	    fi
+	done
+fi
+if [ "x${FVWM_EXEC}" == "x" ]; then
+	echo 'No fvwm, fvwm2 or fvwm3 executable found in $PATH.'
+	echo "Please adjust your PATH accordingly or install fvwm."
+	echo "If fvwm is installed in another location, you can provide it as:"
+	echo '    export FVWM_EXEC="/my/location/fvwm"'
+        echo "before starting fvwm-crystal."
+	exit 1
+fi
+
 # Other fvwm-crystal variables. They was previously in the configuration file, but
 # due how fvwm honor the -F option, it is better to define them before
 # fvwm statup. If they are already defined, skip this setup.
 # Where is the user-wide configuration
-if [ -z "${FVWM_USERDIR}" ]
-then	FVWM_USERDIR="${HOME}/.fvwm-crystal"
+if [ -z "${FVWM_USERDIR}" ]; then
+	FVWM_USERDIR="${HOME}/.fvwm-crystal"
 fi
 # Where is the system-wide configuration
-if [ -z "${FVWM_CONFIGDIR}" ]
-then	FVWM_CONFIGDIR="/etc/X11/fvwm/fvwm-crystal"
+if [ -z "${FVWM_CONFIGDIR}" ]; then
+	FVWM_CONFIGDIR="/etc/X11/fvwm/fvwm-crystal"
 fi
 # Where are the system-wide files
-if [ -z "${FVWM_SYSTEMDIR}" ]
-then	FVWM_SYSTEMDIR="/usr/share/fvwm-crystal/fvwm"
+if [ -z "${FVWM_SYSTEMDIR}" ]; then
+	FVWM_SYSTEMDIR="/usr/share/fvwm-crystal/fvwm"
 fi
 # Where the distribution specific menu is located
-if [ -z "${FVWM_DISTROMENUDIR}" ]
-then	FVWM_DISTROMENUDIR="/var/lib/fvwm-crystal"
+if [ -z "${FVWM_DISTROMENUDIR}" ]; then
+	FVWM_DISTROMENUDIR="/var/lib/fvwm-crystal"
 fi
 # Nema of the distribution menu
-if [ -z "${FVWM_DISTROMENUNAME}" ]
-then	FVWM_DISTROMENUNAME="debian"
+if [ -z "${FVWM_DISTROMENUNAME}" ]; then
+	FVWM_DISTROMENUNAME="debian"
 fi
+# Where to write the log when fvwm3 is in debug mode
+if [ "${FVWM_EXEC}" == "fvwm3" ]; then
+	if [ "x${FVWM_LOGFILE}" == "x" ]; then
+	        FVWM_LOGFILE="${HOME}/.fvwm-crystal.log"
+	        export FVWM_LOGFILE
+	fi
+fi
 #
 export FVWM_USERDIR FVWM_CONFIGDIR FVWM_SYSTEMDIR FVWM_DISTROMENUDIR FVWM_DISTROMENUNAME
 
@@ -42,18 +68,15 @@
 # if a variable 'configfile' is defined in the environment, its value is
 # preserved; otherwise, the scripts look for configuration in common places.
 configfile="$HOME/fvwm-crystal/$configname"
-if [ -n "$FVWMCRYSTAL_BASECONFIG" ]
-	then
-		configfile="$FVWMCRYSTAL_BASECONFIG"
-	elif [ -f "$HOME/fvwm-crystal/$configname" ]
-	then
-		configfile=$HOME/fvwm-crystal/$configname;
-	elif [ -f "`dirname ${0}`/../share/fvwm-crystal/fvwm/$configname" ]
-	then
-		configfile="`dirname ${0}`/../share/fvwm-crystal/fvwm/$configname";
+if [ -n "$FVWMCRYSTAL_BASECONFIG" ]; then
+	configfile="$FVWMCRYSTAL_BASECONFIG"
+elif [ -f "$HOME/fvwm-crystal/$configname" ]; then
+	configfile=$HOME/fvwm-crystal/$configname;
+elif [ -f "`dirname ${0}`/../share/fvwm-crystal/fvwm/$configname" ]; then
+	configfile="`dirname ${0}`/../share/fvwm-crystal/fvwm/$configname";
 fi
 
-# This scripts will also kill the helper scripts when needed
+# This script will also kill the helper scripts when needed
 cleanup() {
 	exitcode="0"
 	# remove orfaned fullscreen files
@@ -95,4 +118,19 @@
 #echo "paramètres: $@"
 #echo "exec fvwm -f $configfile $@"
 
-exec fvwm -f $configfile $@
+#exec fvwm -f $configfile $@
+if [ "x${FVWM-CRYSTAL_DEBUG}" == "x" ]; then
+	echo "Fvwm-Crystal starting using ${FVWM_EXEC}."
+	exec ${FVWM_EXEC} -f $configfile $@
+else
+	if [ "${FVWM_EXEC}" == "fvwm3" ]; then
+		echo "Fvwm-Crystal starting using ${FVWM_EXEC} in debug mode, the log file is ${FVWM_LOGFILE}."
+		exec ${FVWM_EXEC} -v -f $configfile $@
+	else
+		echo "Debug mode is not supported by ${FVWM_EXEC}. It print all errors to stderr."
+		echo "You can redirect these errors into a file whith the following line in ~/.xinitrc:"
+		echo '     exec /usr/bin/fvwm-crystal 2>./.errors.fvwm-crystal'
+		echo "Fvwm-Crystal starting using ${FVWM_EXEC}."
+		exec ${FVWM_EXEC} -f $configfile $@
+	fi
+fi

Modified: doc/html/fvwm-crystal.html
===================================================================
--- doc/html/fvwm-crystal.html	2020-11-29 22:39:25 UTC (rev 1048)
+++ doc/html/fvwm-crystal.html	2020-12-02 22:46:38 UTC (rev 1049)
@@ -4,7 +4,7 @@
 <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en">
 <head>
 <meta http-equiv="Content-Type" content="application/xhtml+xml; charset=UTF-8" />
-<meta name="generator" content="AsciiDoc 8.6.10" />
+<meta name="generator" content="AsciiDoc 9.0.2" />
 <title>fvwm-crystal(1)</title>
 <style type="text/css">
 /* Shared CSS for AsciiDoc xhtml11 and html5 backends */
@@ -801,6 +801,9 @@
 <div class="content">
 <pre><code>startx</code></pre>
 </div></div>
+<div class="paragraph"><p>When fvwm3 is in use, the following variables can be used:</p></div>
+<div class="paragraph"><p><strong>FVWM-CRYSTAL_DEBUG</strong> set fvwm3 in debug mode when set to a non empty value (default: not set). You don&#8217;t need to redirect the errors into a file, fvwm3 will do it for you.</p></div>
+<div class="paragraph"><p><strong>FVWM_LOGFILE</strong> set fvwm3 log file when in debug mode (default: ~/.fvwm-crystal.log).</p></div>
 <div class="sect2">
 <h3 id="_first_start">First Start</h3>
 <div class="paragraph"><p><strong>FVWM-Crystal</strong> checks while your first login if <code>~/.fvwm-crystal</code> exist and if old preferences must be converted to the new Fvwm InfoStore variables. In all cases, it should just start.</p></div>
@@ -1441,7 +1444,7 @@
 <div id="footer">
 <div id="footer-text">
 Last updated
- 2019-09-06 21:17:44 CEST
+ 2020-12-02 23:31:08 CET
 </div>
 </div>
 </body>

Modified: fvwm/components/functions/About
===================================================================
--- fvwm/components/functions/About	2020-11-29 22:39:25 UTC (rev 1048)
+++ fvwm/components/functions/About	2020-12-02 22:46:38 UTC (rev 1049)
@@ -5,7 +5,7 @@
 *About: Line center
 *About: Text "FVWM-Crystal"
 *About: Line center
-*About: Text "$[gt.Version]: 3.6.7"
+*About: Text "$[gt.Version]: 3.7.0"
 *About: Line center
 *About: Text "Magic Star"
 *About: Line center

Modified: fvwm/scripts/launchwm
===================================================================
--- fvwm/scripts/launchwm	2020-11-29 22:39:25 UTC (rev 1048)
+++ fvwm/scripts/launchwm	2020-12-02 22:46:38 UTC (rev 1049)
@@ -17,17 +17,25 @@
 XEPHYR_PID=`echo $!`
 
 # launch the wm
-# We dont want the fvwm and fvwm-themes files to be mixed with fvwm-crystal
+# We dont want the fvwm* and fvwm-themes files to be mixed with fvwm-crystal
 ENVWM=`basename $EXECWM`
-if [ "$ENVWM" = "fvwm-themes-start" ] ; then
-    FVWM_USERDIR="${HOME}/.fvwm" DISPLAY=:$XephyrDisplay $EXECWM 2>/dev/null
-else
-    if [ "$ENVWM" = "fvwm" ] ; then
-	FVWM_USERDIR="/${HOME}/.fvwm" DISPLAY=:$XephyrDisplay $EXECWM 2>/dev/null
-    else
-	DISPLAY=:$XephyrDisplay $EXECWM 2>/dev/null
-    fi
-fi
+case "${ENVWM}" in
+	fvwm-themes-start)
+		FVWM_USERDIR="${HOME}/.fvwm-themes" DISPLAY=:$XephyrDisplay $EXECWM 2>/dev/null
+		;;
+	fvwm)
+		FVWM_USERDIR="/${HOME}/.fvwm" DISPLAY=:$XephyrDisplay $EXECWM 2>/dev/null
+		;;
+	fvwm2)
+		FVWM_USERDIR="/${HOME}/.fvwm2" DISPLAY=:$XephyrDisplay $EXECWM 2>/dev/null
+		;;
+	fvwm3)
+		FVWM_USERDIR="/${HOME}/.fvwm3" DISPLAY=:$XephyrDisplay $EXECWM 2>/dev/null
+		;;
+	*)
+		DISPLAY=:$XephyrDisplay $EXECWM 2>/dev/null
+		;;
+esac
 
 # stop Xephyr
 kill $!

Modified: man/fvwm-crystal.1
===================================================================
--- man/fvwm-crystal.1	2020-11-29 22:39:25 UTC (rev 1048)
+++ man/fvwm-crystal.1	2020-12-02 22:46:38 UTC (rev 1049)
@@ -2,12 +2,12 @@
 .\"     Title: fvwm-crystal
 .\"    Author: [see the "AUTHORS" section]
 .\" Generator: DocBook XSL Stylesheets v1.79.1 <http://docbook.sf.net/>
-.\"      Date: 04/12/2020
+.\"      Date: 12/02/2020
 .\"    Manual: FVWM-Crystal
-.\"    Source: fvwm-crystal 3.5.1
+.\"    Source: fvwm-crystal 3.7.0
 .\"  Language: English
 .\"
-.TH "FVWM\-CRYSTAL" "1" "04/12/2020" "fvwm\-crystal 3\&.5\&.1" "FVWM\-Crystal"
+.TH "FVWM\-CRYSTAL" "1" "12/02/2020" "fvwm\-crystal 3\&.7\&.0" "FVWM\-Crystal"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
@@ -124,6 +124,12 @@
 .if n \{\
 .RE
 .\}
+.sp
+When fvwm3 is in use, the following variables can be used:
+.sp
+\fBFVWM\-CRYSTAL_DEBUG\fR set fvwm3 in debug mode when set to a non empty value (default: not set)\&. You don\(cqt need to redirect the errors into a file, fvwm3 will do it for you\&.
+.sp
+\fBFVWM_LOGFILE\fR set fvwm3 log file when in debug mode (default: ~/\&.fvwm\-crystal\&.log)\&.
 .SS "First Start"
 .sp
 \fBFVWM\-Crystal\fR checks while your first login if ~/\&.fvwm\-crystal exist and if old preferences must be converted to the new Fvwm InfoStore variables\&. In all cases, it should just start\&.

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Fvwm-crystal-commits] SF.net SVN: fvwm-crystal:[1048] fvwm/components/scripts

From: <dom...@us...> - 2020-11-29 22:39:31

Revision: 1048
          http://sourceforge.net/p/fvwm-crystal/code/1048
Author:   dominique_libre
Date:     2020-11-29 22:39:25 +0000 (Sun, 29 Nov 2020)
Log Message:
-----------
FvwmScript-CpuTemp: fix temperature reading path

Modified Paths:
--------------
    ChangeLog
    fvwm/components/scripts/FvwmScript-CpuTemp

Modified: ChangeLog
===================================================================
--- ChangeLog	2020-10-07 00:02:29 UTC (rev 1047)
+++ ChangeLog	2020-11-29 22:39:25 UTC (rev 1048)
@@ -1,5 +1,8 @@
 ChangeLog for FVWM-Crystal
 
+dimanche 29 novembre 2020
+  fvwm/components/scripts/FvwmScript-CpuTemp: fix temperature reading path.
+
 Version 3.6.7
 -------------
 

Modified: fvwm/components/scripts/FvwmScript-CpuTemp
===================================================================
--- fvwm/components/scripts/FvwmScript-CpuTemp	2020-10-07 00:02:29 UTC (rev 1047)
+++ fvwm/components/scripts/FvwmScript-CpuTemp	2020-11-29 22:39:25 UTC (rev 1048)
@@ -15,7 +15,7 @@
 Init
 Begin
   Set $temp_prev = 1
-  Set $temp = (GetOutput {sed 's:...$::' </sys/class/hwmon/hwmon0/temp1_input} 1 1)
+  Set $temp = (GetOutput {for i in /sys/class/hwmon/hwmon*/temp1_input; do sed 's:...$::' <$i; break; done} 1 1)
   Set $degree = (Gettext {°C})
   Set $tmp = $temp $degree
   ChangeTitle 1 $tmp
@@ -25,7 +25,7 @@
 Begin 
  If (RemainderOfDiv (GetTime) 2)==0 Then
  Begin
-  Set $temp = (GetOutput {sed 's:...$::' </sys/class/hwmon/hwmon0/temp1_input} 1 1) 
+  Set $temp = (GetOutput {for i in /sys/class/hwmon/hwmon*/temp1_input; do sed 's:...$::' <$i; break; done} 1 1) 
   Set $degree = (Gettext {°C})
   Set $tmp = $temp $degree
 

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Fvwm-crystal-commits] SF.net SVN: fvwm-crystal:[1047] fvwm/components/functions

From: <dom...@us...> - 2020-10-07 00:02:37

Revision: 1047
          http://sourceforge.net/p/fvwm-crystal/code/1047
Author:   dominique_libre
Date:     2020-10-07 00:02:29 +0000 (Wed, 07 Oct 2020)
Log Message:
-----------
3.6.7 bump

Modified Paths:
--------------
    ChangeLog
    NEWS
    fvwm/components/functions/About

Modified: ChangeLog
===================================================================
--- ChangeLog	2020-10-06 23:33:31 UTC (rev 1046)
+++ ChangeLog	2020-10-07 00:02:29 UTC (rev 1047)
@@ -1,5 +1,8 @@
 ChangeLog for FVWM-Crystal
 
+Version 3.6.7
+-------------
+
 mardi 7 octobre 2020
   fvwm/scripts/CustomButtonBar/CustomButtonBar: fix typo +  multiple
   trayer instances after redrawing the button.
@@ -8,6 +11,8 @@
   thanks to Gianni Ceccarelli for reporting this.
   fvwm/components/functions/Exec-Accelerator: fix Restart by removing
   superflous quoting.
+  fvwm/components/functions/About,
+  NEWS: 3.6.7 bump
 
 jeudi 17 septembre 2020
 + fvwm/locale/zh_CN*: Add chinese translation. Thanks to 玉堂白鹤

Modified: NEWS
===================================================================
--- NEWS	2020-10-06 23:33:31 UTC (rev 1046)
+++ NEWS	2020-10-07 00:02:29 UTC (rev 1047)
@@ -1,3 +1,25 @@
+Version 3.6.7
+-------------
+
+Fvwm Crystal 3.6.7 is out!
+
+This version introduce a chinese zh_CN translation and a few bug fixes:
+
+- Fix the pmount menu (fvwm-crystal desktop icons).
+
+- timidity++: add user mode server into the application menu;
+  it use jack-dbus and should be easy to change when needed.
+
+- Exec-Accelerator: remove superflous quoting.
+
+- Fix regression of trayer style which caused it to move around.
+
+- Custom button bar: fix multiple trayer instances when redrawing
+  the magic button.
+
+See ChangeLog for details.
+Dominique Michel
+
 Version 3.6.6
 -------------
 

Modified: fvwm/components/functions/About
===================================================================
--- fvwm/components/functions/About	2020-10-06 23:33:31 UTC (rev 1046)
+++ fvwm/components/functions/About	2020-10-07 00:02:29 UTC (rev 1047)
@@ -5,7 +5,7 @@
 *About: Line center
 *About: Text "FVWM-Crystal"
 *About: Line center
-*About: Text "$[gt.Version]: 3.6.6"
+*About: Text "$[gt.Version]: 3.6.7"
 *About: Line center
 *About: Text "Magic Star"
 *About: Line center

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Fvwm-crystal-commits] SF.net SVN: fvwm-crystal:[1046] fvwm/components/functions

From: <dom...@us...> - 2020-10-06 23:33:33

Revision: 1046
          http://sourceforge.net/p/fvwm-crystal/code/1046
Author:   dominique_libre
Date:     2020-10-06 23:33:31 +0000 (Tue, 06 Oct 2020)
Log Message:
-----------
Exec-Accelerator: fix Restart by removing superflous quoting

Modified Paths:
--------------
    ChangeLog
    fvwm/components/functions/Exec-Accelerator

Modified: ChangeLog
===================================================================
--- ChangeLog	2020-10-06 23:18:49 UTC (rev 1045)
+++ ChangeLog	2020-10-06 23:33:31 UTC (rev 1046)
@@ -6,6 +6,8 @@
   fvwm/components/styles/FVWM: revert trayer style in revision 898
   due to trayer moving with the "arrange all windows" button;
   thanks to Gianni Ceccarelli for reporting this.
+  fvwm/components/functions/Exec-Accelerator: fix Restart by removing
+  superflous quoting.
 
 jeudi 17 septembre 2020
 + fvwm/locale/zh_CN*: Add chinese translation. Thanks to 玉堂白鹤

Modified: fvwm/components/functions/Exec-Accelerator
===================================================================
--- fvwm/components/functions/Exec-Accelerator	2020-10-06 23:18:49 UTC (rev 1045)
+++ fvwm/components/functions/Exec-Accelerator	2020-10-06 23:33:31 UTC (rev 1046)
@@ -49,11 +49,12 @@
 
 # If urxvtc is killed, urxvtd is killed too, so start urxvtd if needed.
 # StartUrxvtc need an argument or urxvtc will fail; see the A, AA and AT functions.
+# With superflous argument quoting, fvwm work fine after startup, but not sometime after Restart.
 DestroyFunc StartUrxvtc
 AddToFunc StartUrxvtc
-+ I Piperead 'urxvtc "$*" $[infostore.SILENT]; if [ $? = 2 ]; then \
++ I Piperead 'urxvtc $* $[infostore.SILENT]; if [ $? = 2 ]; then \
 				urxvtd -f -o $[infostore.SILENT]; \
-				urxvtc "$*"; \
+				urxvtc $*; \
 			fi'
 
 DestroyFunc StartTerminal
@@ -70,22 +71,22 @@
 DestroyFunc A
 AddToFunc A
 + I Window-SetPlacementPolicy
-+ I Test (EnvMatch infostore.DefaultTerminal urxvtc) StartUrxvtc "-e $*"
++ I Test (EnvMatch infostore.DefaultTerminal urxvtc) StartUrxvtc -e $*
 + I TestRc (NoMatch) StartTerminal "$*"
 
 DestroyFunc AA
 AddToFunc AA
 + I Window-SetPlacementPolicy
-+ I Test (EnvMatch infostore.DefaultTerminal urxvtc) StartUrxvtc "-name urxvt"
++ I Test (EnvMatch infostore.DefaultTerminal urxvtc) StartUrxvtc -name urxvt
 + I TestRc (NoMatch) Exec exec $[infostore.DefaultTerminal] $[infostore.SILENT]
 
 # Usage: AT [title] [command] (Use quotes if you want command options or title with spaces)
 # !: doesn't work anymore with gnome-terminal due to a bug in gnome-terminal (doesn't honor anymore it's own --title option (and --name and --class too)).
-# As the preceding similar bug tooks years to be fixed and that one was introduced only a few months later, just choose another terminal
+# The preceding similar bug tooks years to be fixed, and a new one was introduced only a few months later, better just choose another terminal
 DestroyFunc AT
 AddToFunc AT
 + I Window-SetPlacementPolicy
-+ I Test (EnvMatch infostore.DefaultTerminal urxvtc) StartUrxvtc "--title "$0" -name "$0" -e $[1-]"
++ I Test (EnvMatch infostore.DefaultTerminal urxvtc) StartUrxvtc --title "$0" -name "$0" -e $[1-]
 + I TestRc (NoMatch) StartTitledTerminal "$0" $[1-]
 
 # Usage: C [command] [command options]

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Fvwm-crystal-commits] SF.net SVN: fvwm-crystal:[1045] fvwm/components/styles

From: <dom...@us...> - 2020-10-06 23:18:51

Revision: 1045
          http://sourceforge.net/p/fvwm-crystal/code/1045
Author:   dominique_libre
Date:     2020-10-06 23:18:49 +0000 (Tue, 06 Oct 2020)
Log Message:
-----------
revert trayer style in revision 898 due to trayer moving with the "arrange all windows" button

Revision Links:
--------------
    http://sourceforge.net/p/fvwm-crystal/code/898

Modified Paths:
--------------
    ChangeLog
    fvwm/components/styles/FVWM

Modified: ChangeLog
===================================================================
--- ChangeLog	2020-10-06 23:10:57 UTC (rev 1044)
+++ ChangeLog	2020-10-06 23:18:49 UTC (rev 1045)
@@ -1,8 +1,11 @@
 ChangeLog for FVWM-Crystal
 
 mardi 7 octobre 2020
-fvwm/scripts/CustomButtonBar/CustomButtonBar: fix typo +  multiple
+  fvwm/scripts/CustomButtonBar/CustomButtonBar: fix typo +  multiple
   trayer instances after redrawing the button.
+  fvwm/components/styles/FVWM: revert trayer style in revision 898
+  due to trayer moving with the "arrange all windows" button;
+  thanks to Gianni Ceccarelli for reporting this.
 
 jeudi 17 septembre 2020
 + fvwm/locale/zh_CN*: Add chinese translation. Thanks to 玉堂白鹤

Modified: fvwm/components/styles/FVWM
===================================================================
--- fvwm/components/styles/FVWM	2020-10-06 23:10:57 UTC (rev 1044)
+++ fvwm/components/styles/FVWM	2020-10-06 23:18:49 UTC (rev 1045)
@@ -23,7 +23,7 @@
 Style FvwmScript UseStyle FvwmParts
 Style FvwmScript VariablePosition, Title, StaysPut
 
-#Style trayer UseStyle FvwmParts
+Style trayer UseStyle FvwmParts
 Style stalonetray UseStyle FvwmParts
 
 Style FvwmIdent UseStyle FvwmParts

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Fvwm-crystal-commits] SF.net SVN: fvwm-crystal:[1044] fvwm/scripts/CustomButtonBar

From: <dom...@us...> - 2020-10-06 23:11:01

Revision: 1044
          http://sourceforge.net/p/fvwm-crystal/code/1044
Author:   dominique_libre
Date:     2020-10-06 23:10:57 +0000 (Tue, 06 Oct 2020)
Log Message:
-----------
CustomButtonBar: fix typo +  multiple trayer instances after redrawing the button

Modified Paths:
--------------
    ChangeLog
    fvwm/scripts/CustomButtonBar/CustomButtonBar

Modified: ChangeLog
===================================================================
--- ChangeLog	2020-09-17 02:10:20 UTC (rev 1043)
+++ ChangeLog	2020-10-06 23:10:57 UTC (rev 1044)
@@ -1,5 +1,9 @@
 ChangeLog for FVWM-Crystal
 
+mardi 7 octobre 2020
+fvwm/scripts/CustomButtonBar/CustomButtonBar: fix typo +  multiple
+  trayer instances after redrawing the button.
+
 jeudi 17 septembre 2020
 + fvwm/locale/zh_CN*: Add chinese translation. Thanks to 玉堂白鹤
 
@@ -402,7 +406,7 @@
   cleanup, add remaining applets with associated preferences.
   recipes/Custom: cleanup
   styles/Applictions-Icons-22-32: add mini icon for start_jack
-  styles/FVWM: fix trayer styke
+  styles/FVWM: fix trayer style
   functions/Exit
 + scripts/ScreenLidSuspend: add screen lid suspend menu and function.
   functions/Media-Music-functions: alsaplayer style change

Modified: fvwm/scripts/CustomButtonBar/CustomButtonBar
===================================================================
--- fvwm/scripts/CustomButtonBar/CustomButtonBar	2020-09-17 02:10:20 UTC (rev 1043)
+++ fvwm/scripts/CustomButtonBar/CustomButtonBar	2020-10-06 23:10:57 UTC (rev 1044)
@@ -324,6 +324,9 @@
 # the Custom recipe is the only one that can have the 2 buttons
 # and it work as it.
 # TODO: - Implement the ewmh borders. This will permit to use that button into the other recipes.
+if [ "${11}" = "trayer" ]; then
+    echo 'PipeRead "killall -3 trayer"' >> "${FVWM_USERDIR}/tmp/CustomButtonBar"
+fi
 case $3 in
     Left)
 	vertical_button $2 $4
@@ -475,7 +478,7 @@
 		echo "FvwmTrayerPanel pixel pixel $((${ybuttons[0]}*$4)) bottom right 0 0 \"--width $((${xbuttons[0]}*$4))\"" >> "${FVWM_USERDIR}/tmp/CustomButtonBar"
 	    ;;
 	esac
-    echo "*FvwmButtons-CustomBar: (${xbuttons[0]}x${ybuttons[0]}, Frame 0, Padding 0, Swallow (UseOld, FvwmModule) trayer Nop')" >> "${FVWM_USERDIR}/tmp/CustomButtonBar"
+    echo "*FvwmButtons-CustomBar: (${xbuttons[0]}x${ybuttons[0]}, Frame 0, Padding 0, Swallow (UseOld, FvwmModule) trayer Nop)" >> "${FVWM_USERDIR}/tmp/CustomButtonBar"
     fi
     inplacenb="${xbuttons[0]}"
 fi

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Fvwm-crystal-commits] SF.net SVN: fvwm-crystal:[1043] fvwm/locale

From: <dom...@us...> - 2020-09-17 02:10:23

Revision: 1043
          http://sourceforge.net/p/fvwm-crystal/code/1043
Author:   dominique_libre
Date:     2020-09-17 02:10:20 +0000 (Thu, 17 Sep 2020)
Log Message:
-----------
Add chinese translation. Thanks to {U+7389}{U+5802}{U+767D}{U+9E64}

Modified Paths:
--------------
    ChangeLog

Added Paths:
-----------
    fvwm/locale/zh_CN
    fvwm/locale/zh_CN.UTF-8/
    fvwm/locale/zh_CN.UTF-8/LC_MESSAGES/
    fvwm/locale/zh_CN.UTF-8/LC_MESSAGES/fvwm-crystal-script.mo
    fvwm/locale/zh_CN.UTF-8/LC_MESSAGES/fvwm-crystal-script.po
    fvwm/locale/zh_CN.UTF-8/LC_MESSAGES/fvwm-crystal.mo
    fvwm/locale/zh_CN.UTF-8/LC_MESSAGES/fvwm-crystal.po

Modified: ChangeLog
===================================================================
--- ChangeLog	2020-09-17 01:52:50 UTC (rev 1042)
+++ ChangeLog	2020-09-17 02:10:20 UTC (rev 1043)
@@ -1,6 +1,8 @@
 ChangeLog for FVWM-Crystal
 
 jeudi 17 septembre 2020
++ fvwm/locale/zh_CN*: Add chinese translation. Thanks to 玉堂白鹤
+
   fvwm/Applications/Mulltimedia/Audio/Engineering/MIDI/20~timidity*:
   add user mode to the timidity ALSA sequencerr server menu (need
   jack-dbus but easy to change in $FVWM_USERDIR).

Added: fvwm/locale/zh_CN
===================================================================
--- fvwm/locale/zh_CN	                        (rev 0)
+++ fvwm/locale/zh_CN	2020-09-17 02:10:20 UTC (rev 1043)
@@ -0,0 +1 @@
+link zh_CN.UTF-8
\ No newline at end of file


Property changes on: fvwm/locale/zh_CN
___________________________________________________________________
Added: svn:special
## -0,0 +1 ##
+*
\ No newline at end of property
Added: fvwm/locale/zh_CN.UTF-8/LC_MESSAGES/fvwm-crystal-script.mo
===================================================================
(Binary files differ)

Index: fvwm/locale/zh_CN.UTF-8/LC_MESSAGES/fvwm-crystal-script.mo
===================================================================
--- fvwm/locale/zh_CN.UTF-8/LC_MESSAGES/fvwm-crystal-script.mo	2020-09-17 01:52:50 UTC (rev 1042)
+++ fvwm/locale/zh_CN.UTF-8/LC_MESSAGES/fvwm-crystal-script.mo	2020-09-17 02:10:20 UTC (rev 1043)

Property changes on: fvwm/locale/zh_CN.UTF-8/LC_MESSAGES/fvwm-crystal-script.mo
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+application/x-gettext-translation
\ No newline at end of property
Added: fvwm/locale/zh_CN.UTF-8/LC_MESSAGES/fvwm-crystal-script.po
===================================================================
--- fvwm/locale/zh_CN.UTF-8/LC_MESSAGES/fvwm-crystal-script.po	                        (rev 0)
+++ fvwm/locale/zh_CN.UTF-8/LC_MESSAGES/fvwm-crystal-script.po	2020-09-17 02:10:20 UTC (rev 1043)
@@ -0,0 +1,290 @@
+# Chinese translation for FVWM-Crystal
+# Copyright (C) YEAR FVWM-Crystal team
+# This file is distributed under the same license as the fvwm-crystal package.
+# 玉堂白鹤 <yj...@qq...>, 2020.
+#
+# Using quoting characters into a translation can confuse fvwm.
+# To avoid this, you MUST use other UTF-8 characters like , ‘ ’ “ ” « or ».
+# The most used one can be the apostrophe: please use ’ instead of '.
+msgid ""
+msgstr ""
+"Project-Id-Version: fvwm-crystal 3.6.2\n"
+"POT-Creation-Date: 2020-02-26 16:43+0100\n"
+"PO-Revision-Date: 2020-08-21 11:05+0800\n"
+"Language-Team: \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Generator: Poedit 2.4.1\n"
+"Last-Translator: 玉堂白鹤 <yj...@qq...>\n"
+"Plural-Forms: nplurals=1; plural=0;\n"
+"Language: zh_CN\n"
+
+#: ../fvwm/components/scripts/FvwmScript-CpuTemp:19
+#: ../fvwm/components/scripts/FvwmScript-CpuTemp:29
+msgid "°C"
+msgstr "°C"
+
+#: ../fvwm/scripts/FileEditors/FileEditWithHelp:19
+msgid "FVWM-Crystal File Editor"
+msgstr "FVWM-Crystal 文件编辑器"
+
+#: ../fvwm/scripts/FileEditors/FileEditWithHelp:106
+msgid "File"
+msgstr "文件"
+
+#: ../fvwm/scripts/FileEditors/FileEditWithHelp:122
+#: ../fvwm/scripts/PrefVars/PrefVars:614
+msgid "Help"
+msgstr "帮助"
+
+#: ../fvwm/scripts/FileEditors/FileEditWithHelp:141
+#: ../fvwm/scripts/PrefVars/PrefVars:273 ../fvwm/scripts/PrefVars/PrefVars:445
+#: ../fvwm/scripts/PrefVars/PrefVars:630 ../fvwm/scripts/PrefVars/PrefVars:815
+msgid "Add line"
+msgstr "添加行"
+
+# 默认字体显示中文为方块，需调整字体后才显示。翻译为中文加英文，方便设置。
+#: ../fvwm/scripts/FileEditors/FileEditWithHelp:162
+#: ../fvwm/scripts/FontSelector/FontSelector:815
+#: ../fvwm/scripts/KeyModifiersEditor/KeyModifiersEditor:289
+#: ../fvwm/scripts/KeyModifiersEditor/KeyModifiersEditor:400
+#: ../fvwm/scripts/KeyModifiersEditor/KeyModifiersEditor:510
+#: ../fvwm/scripts/KeyModifiersEditor/KeyModifiersEditor:620
+#: ../fvwm/scripts/KeyModifiersEditor/KeyModifiersEditor:730
+#: ../fvwm/scripts/PrefVars/PrefVars:120 ../fvwm/scripts/PrefVars/PrefVars:187
+#: ../fvwm/scripts/PrefVars/PrefVars:294 ../fvwm/scripts/PrefVars/PrefVars:466
+#: ../fvwm/scripts/PrefVars/PrefVars:651 ../fvwm/scripts/PrefVars/PrefVars:836
+msgid "Save"
+msgstr "保存(Save)"
+
+#: ../fvwm/scripts/FileEditors/FileEditWithHelp:200
+#: ../fvwm/scripts/PrefVars/PrefVars:334 ../fvwm/scripts/PrefVars/PrefVars:504
+#: ../fvwm/scripts/PrefVars/PrefVars:689 ../fvwm/scripts/PrefVars/PrefVars:874
+msgid "Remove"
+msgstr "删除"
+
+#: ../fvwm/scripts/FileEditors/FileEditWithHelp:220
+#: ../fvwm/scripts/PrefVars/PrefVars:354 ../fvwm/scripts/PrefVars/PrefVars:524
+#: ../fvwm/scripts/PrefVars/PrefVars:709 ../fvwm/scripts/PrefVars/PrefVars:894
+msgid "Update"
+msgstr "更新"
+
+#: ../fvwm/scripts/FontSelector/FontSelector:8
+msgid "FVWM-Crystal Font Selector"
+msgstr "FVWM-Crystal 字体选择器"
+
+#: ../fvwm/scripts/FontSelector/FontSelector:83
+#: ../fvwm/scripts/FontSelector/FontSelector:606
+#: ../fvwm/scripts/FontSelector/FontSelector:623
+#: ../fvwm/scripts/FontSelector/FontSelector:640
+#: ../fvwm/scripts/FontSelector/FontSelector:657
+#: ../fvwm/scripts/FontSelector/FontSelector:674
+#: ../fvwm/scripts/FontSelector/FontSelector:710
+msgid "abijk ABIJK éç ÀÉ O09 你好"
+msgstr "abijk ABIJK éç ÀÉ O09 你好"
+
+#: ../fvwm/scripts/FontSelector/FontSelector:387
+#: ../fvwm/scripts/FontSelector/FontSelector:411
+msgid "Regular"
+msgstr "常规"
+
+#: ../fvwm/scripts/FontSelector/FontSelector:427
+#: ../fvwm/scripts/FontSelector/FontSelector:451
+msgid "Bold"
+msgstr "粗体"
+
+#: ../fvwm/scripts/FontSelector/FontSelector:467
+#: ../fvwm/scripts/FontSelector/FontSelector:491
+msgid "Italic"
+msgstr "斜体"
+
+#: ../fvwm/scripts/FontSelector/FontSelector:507
+#: ../fvwm/scripts/FontSelector/FontSelector:531
+msgid "Bold Italic"
+msgstr "粗斜体"
+
+#: ../fvwm/scripts/FontSelector/FontSelector:571
+msgid "With"
+msgstr ""
+
+#: ../fvwm/scripts/FontSelector/FontSelector:691
+msgid " Edit me:"
+msgstr " 编辑我:"
+
+#: ../fvwm/scripts/FontSelector/FontSelector:727
+msgid "Save editing"
+msgstr "保存编辑"
+
+#: ../fvwm/scripts/FontSelector/FontSelector:743
+msgid "Reset editing"
+msgstr "重置编辑"
+
+# 默认字体显示中文为方块，需调整字体后才显示。翻译为中文加英文，方便设置。
+#: ../fvwm/scripts/FontSelector/FontSelector:767
+msgid "Quit"
+msgstr "退出(Quit)"
+
+# 默认字体显示中文为方块，需调整字体后才显示。翻译为中文加英文，方便设置。
+#: ../fvwm/scripts/FontSelector/FontSelector:783
+msgid "Apply"
+msgstr "应用(Apply)"
+
+# 默认字体显示中文为方块，需调整字体后才显示。翻译为中文加英文，方便设置。
+#: ../fvwm/scripts/FontSelector/FontSelector:857
+msgid ". Panel Font"
+msgstr ". 面板字体(panel)"
+
+# 默认字体显示中文为方块，需调整字体后才显示。翻译为中文加英文，方便设置。
+#: ../fvwm/scripts/FontSelector/FontSelector:885
+msgid ". Title Font"
+msgstr ". 标题字体(title)"
+
+# 默认字体显示中文为方块，需调整字体后才显示。翻译为中文加英文，方便设置。
+#: ../fvwm/scripts/FontSelector/FontSelector:914
+msgid ". Menu Font"
+msgstr ". 菜单字体(menu)"
+
+#: ../fvwm/scripts/FvwmMPD/FvwmApplet-MpdAddSong:5
+msgid "Add to playlist"
+msgstr "添加至播放列表"
+
+#: ../fvwm/scripts/FvwmMPD/FvwmApplet-MpdAddSong:98
+msgid " Folders "
+msgstr " 文件夹 "
+
+#: ../fvwm/scripts/FvwmMPD/FvwmApplet-MpdAddSong:112
+msgid " Songs "
+msgstr " 歌曲 "
+
+#: ../fvwm/scripts/FvwmMPD/FvwmApplet-MpdAddSong:126
+msgid " Close "
+msgstr " 关闭 "
+
+#: ../fvwm/scripts/FvwmMPD/FvwmApplet-MpdAddSong:141
+msgid " Dir: "
+msgstr " 目录: "
+
+#: ../fvwm/scripts/FvwmMPD/FvwmApplet-MpdAddSong:155
+#: ../fvwm/scripts/FvwmMPD/FvwmApplet-MpdPlEd:121
+msgid " Up "
+msgstr " 向上 "
+
+#: ../fvwm/scripts/FvwmMPD/FvwmApplet-MpdAddSong:181
+msgid " Add dir "
+msgstr " 添加目录 "
+
+#: ../fvwm/scripts/FvwmMPD/FvwmApplet-MpdAddSong:204
+msgid " Song: "
+msgstr " 歌曲: "
+
+#: ../fvwm/scripts/FvwmMPD/FvwmApplet-MpdAddSong:218
+msgid " Add "
+msgstr " 添加 "
+
+#: ../fvwm/scripts/FvwmMPD/FvwmApplet-MpdPlEd:27
+msgid "MPD Playlist Editor"
+msgstr "MPD 播放列表编辑器"
+
+#: ../fvwm/scripts/FvwmMPD/FvwmApplet-MpdPlEd:104
+msgid "Move song:"
+msgstr "移动曲目:"
+
+#: ../fvwm/scripts/FvwmMPD/FvwmApplet-MpdPlEd:138
+msgid " Down "
+msgstr " 向下 "
+
+#: ../fvwm/scripts/FvwmMPD/FvwmApplet-MpdPlEd:155
+msgid " Add song "
+msgstr " 添加曲目 "
+
+#: ../fvwm/scripts/FvwmMPD/FvwmApplet-MpdPlEd:177
+msgid " Remove song "
+msgstr " 删除曲目 "
+
+#: ../fvwm/scripts/FvwmMPD/FvwmApplet-MpdPlEd:191
+msgid " File|Quit "
+msgstr " 文件|退出 "
+
+#: ../fvwm/scripts/FvwmMPD/FvwmApplet-MpdPlEd:207
+msgid " Options|Toggle repeat|Toggle random|Crop|Clear "
+msgstr " 选项|切换重复|切换随机|裁剪|清除 "
+
+#: ../fvwm/scripts/FvwmMPD/FvwmApplet-MpdPlEd:229
+msgid " Database|Update "
+msgstr " 数据库|更新 "
+
+#: ../fvwm/scripts/KeyModifiersEditor/KeyModifiersEditor:10
+msgid "FVWM-Crystal Keyboard Modifiers Editor"
+msgstr "FVWM-Crystal 键盘修改编辑器"
+
+#: ../fvwm/scripts/KeyModifiersEditor/KeyModifiersEditor:221
+msgid ""
+"N=none, A=any (0 or more), M=Meta (Alt_L), S=Shift_L, C=Control_L, 4=Super_L "
+"(Win_L)"
+msgstr ""
+
+#: ../fvwm/scripts/KeyModifiersEditor/KeyModifiersEditor:252
+msgid "Mod: any modifier (0 or more)"
+msgstr ""
+
+#: ../fvwm/scripts/KeyModifiersEditor/KeyModifiersEditor:331
+#: ../fvwm/scripts/KeyModifiersEditor/KeyModifiersEditor:441
+#: ../fvwm/scripts/KeyModifiersEditor/KeyModifiersEditor:551
+#: ../fvwm/scripts/KeyModifiersEditor/KeyModifiersEditor:661
+#: ../fvwm/scripts/KeyModifiersEditor/KeyModifiersEditor:771
+msgid "Restore"
+msgstr "恢复"
+
+#: ../fvwm/scripts/KeyModifiersEditor/KeyModifiersEditor:363
+msgid "Mod0: no modifier"
+msgstr ""
+
+#: ../fvwm/scripts/KeyModifiersEditor/KeyModifiersEditor:473
+msgid "Mod1: usually Meta"
+msgstr ""
+
+#: ../fvwm/scripts/KeyModifiersEditor/KeyModifiersEditor:583
+msgid "Mod2: second mode"
+msgstr ""
+
+#: ../fvwm/scripts/KeyModifiersEditor/KeyModifiersEditor:693
+msgid "SelectOnRelease: for WindowLists"
+msgstr ""
+
+#: ../fvwm/scripts/PrefVars/PrefVars:10
+msgid "FVWM-Crystal Variables Editor"
+msgstr "FVWM-Crystal 变量编辑器"
+
+#: ../fvwm/scripts/PrefVars/PrefVars:104
+msgid "Browser"
+msgstr "浏览器"
+
+#: ../fvwm/scripts/PrefVars/PrefVars:171
+msgid "Editor"
+msgstr "编辑器"
+
+#: ../fvwm/scripts/PrefVars/PrefVars:242
+msgid "Desktop"
+msgstr "桌面"
+
+#: ../fvwm/scripts/PrefVars/PrefVars:257 ../fvwm/scripts/PrefVars/PrefVars:429
+#: ../fvwm/scripts/PrefVars/PrefVars:599
+msgid "Directories"
+msgstr "目录"
+
+#: ../fvwm/scripts/PrefVars/PrefVars:414
+msgid "Icons"
+msgstr "图标"
+
+#: ../fvwm/scripts/PrefVars/PrefVars:584
+msgid "Media"
+msgstr "媒体"
+
+#: ../fvwm/scripts/PrefVars/PrefVars:769
+msgid "Full screen"
+msgstr "全屏"
+
+#: ../fvwm/scripts/PrefVars/PrefVars:784
+msgid "Applications"
+msgstr "应用程序"

Added: fvwm/locale/zh_CN.UTF-8/LC_MESSAGES/fvwm-crystal.mo
===================================================================
(Binary files differ)

Index: fvwm/locale/zh_CN.UTF-8/LC_MESSAGES/fvwm-crystal.mo
===================================================================
--- fvwm/locale/zh_CN.UTF-8/LC_MESSAGES/fvwm-crystal.mo	2020-09-17 01:52:50 UTC (rev 1042)
+++ fvwm/locale/zh_CN.UTF-8/LC_MESSAGES/fvwm-crystal.mo	2020-09-17 02:10:20 UTC (rev 1043)

Property changes on: fvwm/locale/zh_CN.UTF-8/LC_MESSAGES/fvwm-crystal.mo
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+application/x-gettext-translation
\ No newline at end of property
Added: fvwm/locale/zh_CN.UTF-8/LC_MESSAGES/fvwm-crystal.po
===================================================================
--- fvwm/locale/zh_CN.UTF-8/LC_MESSAGES/fvwm-crystal.po	                        (rev 0)
+++ fvwm/locale/zh_CN.UTF-8/LC_MESSAGES/fvwm-crystal.po	2020-09-17 02:10:20 UTC (rev 1043)
@@ -0,0 +1,3091 @@
+# Chinese translation for FVWM-Crystal
+# Copyright (C) 2005 FVWM-Crystal team
+# This file is distributed under the same license as the fvwm-crystal package.
+# 玉堂白鹤 <yj...@qq...>, 2020.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: fvwm-crystal\n"
+"POT-Creation-Date: 2020-02-26 16:43+0100\n"
+"PO-Revision-Date: 2020-08-21 10:53+0800\n"
+"Last-Translator: 玉堂白鹤 <yj...@qq...>\n"
+"Language-Team: \n"
+"Language: zh_CN\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Generator: Poedit 2.4.1\n"
+"Plural-Forms: nplurals=1; plural=0;\n"
+
+#: ../bin/fvwm-crystal.generate-menu:350 ../fvwm/Applications/Multimedia/
+msgid "Audio"
+msgstr "音频"
+
+#: ../bin/fvwm-crystal.generate-menu:354 ../fvwm/Applications/Multimedia/
+msgid "Audio-Video"
+msgstr "音频-视频"
+
+#: ../bin/fvwm-crystal.generate-menu:358 ../fvwm/Applications/
+msgid "Development"
+msgstr "开发"
+
+#: ../bin/fvwm-crystal.generate-menu:362 ../fvwm/Applications/
+msgid "Knowledge"
+msgstr "学术"
+
+#: ../bin/fvwm-crystal.generate-menu:366 ../fvwm/Applications/
+msgid "Games"
+msgstr "游戏"
+
+#: ../bin/fvwm-crystal.generate-menu:370 ../fvwm/Applications/
+msgid "Graphics"
+msgstr "图形"
+
+#: ../bin/fvwm-crystal.generate-menu:374 ../fvwm/Applications/
+msgid "Network"
+msgstr "网络"
+
+#: ../bin/fvwm-crystal.generate-menu:378 ../fvwm/Applications/
+msgid "Office"
+msgstr "办公"
+
+#: ../bin/fvwm-crystal.generate-menu:382
+msgid "Science"
+msgstr "科学"
+
+#: ../bin/fvwm-crystal.generate-menu:386 ../fvwm/Applications/
+msgid "Settings"
+msgstr "设置"
+
+#
+# String used in submenus (window decorations and colorsets)
+#
+#: ../bin/fvwm-crystal.generate-menu:390 ../fvwm/Applications/
+#: ../fvwm/components/functions/Colorsets:24
+#: ../fvwm/components/functions/Preferences-Menu:55
+#: ../fvwm/components/functions/Window-Decorations:26
+msgid "System"
+msgstr "系统"
+
+#: ../bin/fvwm-crystal.generate-menu:394 ../fvwm/Applications/
+msgid "Utilities"
+msgstr "工具"
+
+#: ../bin/fvwm-crystal.generate-menu:398 ../fvwm/Applications/Multimedia/
+msgid "Video"
+msgstr "视频"
+
+#: ../bin/fvwm-crystal.generate-menu:413 ../fvwm/Applications/Graphics/
+msgid "2D Graphics"
+msgstr "2D 图形"
+
+#: ../bin/fvwm-crystal.generate-menu:417 ../fvwm/Applications/Graphics/
+msgid "3D Graphics"
+msgstr "3D 图形"
+
+#: ../bin/fvwm-crystal.generate-menu:421
+msgid "Accessibility"
+msgstr "辅助功能"
+
+#: ../bin/fvwm-crystal.generate-menu:425 ../fvwm/Applications/20~Games/
+msgid "Action Games"
+msgstr "动作类游戏"
+
+#: ../bin/fvwm-crystal.generate-menu:429
+msgid "Adventure Games"
+msgstr "冒险游戏"
+
+#: ../bin/fvwm-crystal.generate-menu:433
+msgid "Adult"
+msgstr "成人"
+
+#: ../bin/fvwm-crystal.generate-menu:437 ../fvwm/Applications/20~Games/
+msgid "Arcade Games"
+msgstr "街机游戏"
+
+#: ../bin/fvwm-crystal.generate-menu:441
+msgid "Amusement"
+msgstr "娱乐"
+
+#: ../bin/fvwm-crystal.generate-menu:445 ../fvwm/Applications/Utilities/
+msgid "Archiving"
+msgstr "归档"
+
+#: ../bin/fvwm-crystal.generate-menu:449
+msgid "Art"
+msgstr "艺术"
+
+#: ../bin/fvwm-crystal.generate-menu:453
+msgid "Artificial Intelligence"
+msgstr "人工智能"
+
+#: ../bin/fvwm-crystal.generate-menu:457 ../fvwm/Applications/Knowledge/
+msgid "Astronomy"
+msgstr "天文"
+
+#: ../bin/fvwm-crystal.generate-menu:461 ../fvwm/Applications/Multimedia/Audio/
+#: ../fvwm/Applications/Multimedia/Audio-Video/
+#: ../fvwm/Applications/Multimedia/Video/
+msgid "Audio-Video Editing"
+msgstr "音视频编辑"
+
+#: ../bin/fvwm-crystal.generate-menu:465
+msgid "Biology"
+msgstr "生物学"
+
+#: ../bin/fvwm-crystal.generate-menu:469
+msgid "Blocks Games"
+msgstr "积木游戏"
+
+#: ../bin/fvwm-crystal.generate-menu:473 ../fvwm/Applications/20~Games/
+msgid "Board Games"
+msgstr "棋盘游戏"
+
+#: ../bin/fvwm-crystal.generate-menu:477
+msgid "Building"
+msgstr "建筑"
+
+#: ../bin/fvwm-crystal.generate-menu:481 ../fvwm/Applications/Utilities/
+msgid "Calculators"
+msgstr "计算器"
+
+#: ../bin/fvwm-crystal.generate-menu:485 ../fvwm/Applications/Office/
+msgid "Calendars"
+msgstr "日历"
+
+#: ../bin/fvwm-crystal.generate-menu:489 ../fvwm/Applications/20~Games/
+msgid "Card Games"
+msgstr "纸牌游戏"
+
+#: ../bin/fvwm-crystal.generate-menu:493
+msgid "Charts"
+msgstr "图表"
+
+#: ../bin/fvwm-crystal.generate-menu:497
+msgid "Chat"
+msgstr "聊天"
+
+#: ../bin/fvwm-crystal.generate-menu:501
+msgid "Chemistry"
+msgstr "化学"
+
+#: ../bin/fvwm-crystal.generate-menu:505
+msgid "Clocks"
+msgstr "时钟"
+
+#: ../bin/fvwm-crystal.generate-menu:509
+msgid "Compression"
+msgstr "压缩"
+
+#: ../bin/fvwm-crystal.generate-menu:513
+msgid "Computer Science"
+msgstr "计算机科学"
+
+#: ../bin/fvwm-crystal.generate-menu:517
+msgid "Console Only"
+msgstr "仅控制台"
+
+#: ../bin/fvwm-crystal.generate-menu:521
+msgid "Construction"
+msgstr ""
+
+#: ../bin/fvwm-crystal.generate-menu:525 ../fvwm/Applications/Office/
+msgid "Contact Management"
+msgstr "联系人管理"
+
+#: ../bin/fvwm-crystal.generate-menu:529
+msgid "Core"
+msgstr "核心"
+
+#: ../bin/fvwm-crystal.generate-menu:533
+msgid "Data Visualization"
+msgstr "数据可视化"
+
+#: ../bin/fvwm-crystal.generate-menu:537
+#: ../fvwm/Applications/Multimedia/Audio-Video/
+msgid "Databases"
+msgstr "数据库"
+
+#: ../bin/fvwm-crystal.generate-menu:541 ../fvwm/Applications/Network/
+msgid "Dial-up"
+msgstr "拨号"
+
+#: ../bin/fvwm-crystal.generate-menu:545 ../fvwm/Applications/Development/
+msgid "Debuggers"
+msgstr "调试器"
+
+#: ../bin/fvwm-crystal.generate-menu:549 ../fvwm/Applications/Settings/
+msgid "Desktop Settings"
+msgstr "桌面设置"
+
+#: ../bin/fvwm-crystal.generate-menu:553
+msgid "Dialup"
+msgstr "拨号"
+
+#: ../bin/fvwm-crystal.generate-menu:557 ../fvwm/Applications/Office/
+msgid "Dictionaries"
+msgstr "辞典"
+
+#: ../bin/fvwm-crystal.generate-menu:561
+#: ../fvwm/Applications/Multimedia/Audio-Video/
+msgid "Disc Burning"
+msgstr "光盘刻录"
+
+#: ../bin/fvwm-crystal.generate-menu:565 ../fvwm/Applications/Development/
+#: ../fvwm/Applications/System/
+msgid "Documentation"
+msgstr "文档"
+
+#: ../bin/fvwm-crystal.generate-menu:569
+msgid "Economy"
+msgstr "经济"
+
+#: ../bin/fvwm-crystal.generate-menu:573
+msgid "Electricity"
+msgstr "电力"
+
+#: ../bin/fvwm-crystal.generate-menu:577 ../fvwm/Applications/Development/
+msgid "Electronics"
+msgstr "电子"
+
+#: ../bin/fvwm-crystal.generate-menu:581 ../fvwm/Applications/Network/
+msgid "Email"
+msgstr "电子邮件"
+
+#: ../bin/fvwm-crystal.generate-menu:585 ../fvwm/Applications/20~Games/
+#: ../fvwm/Applications/System/
+msgid "Emulators"
+msgstr "仿真器"
+
+#: ../bin/fvwm-crystal.generate-menu:589 ../fvwm/Applications/Graphics/
+#: ../fvwm/Applications/Multimedia/Audio/
+msgid "Engineering"
+msgstr "工程"
+
+#: ../bin/fvwm-crystal.generate-menu:593
+msgid "Feed"
+msgstr ""
+
+#: ../bin/fvwm-crystal.generate-menu:597 ../fvwm/Applications/System/
+msgid "File Managers"
+msgstr "文件管理"
+
+#
+# String used in submenus (window decorations and colorsets)
+#
+#: ../bin/fvwm-crystal.generate-menu:601
+msgid "File Systems"
+msgstr "文件系统"
+
+#: ../bin/fvwm-crystal.generate-menu:605 ../fvwm/Applications/Utilities/
+msgid "File Tools"
+msgstr "文件工具"
+
+#: ../bin/fvwm-crystal.generate-menu:609 ../fvwm/Applications/Network/
+msgid "File Transfer"
+msgstr "文件传输"
+
+#: ../bin/fvwm-crystal.generate-menu:613 ../fvwm/Applications/Office/
+msgid "Finance"
+msgstr "金融"
+
+#: ../bin/fvwm-crystal.generate-menu:617
+msgid "Flow Charts"
+msgstr "流程图"
+
+#: ../bin/fvwm-crystal.generate-menu:621
+msgid "Geography"
+msgstr "地理"
+
+#: ../bin/fvwm-crystal.generate-menu:625
+msgid "Geology"
+msgstr "地质学"
+
+#: ../bin/fvwm-crystal.generate-menu:629
+msgid "Geoscience"
+msgstr "地球科学"
+
+#: ../bin/fvwm-crystal.generate-menu:641 ../fvwm/Applications/Multimedia/Audio/
+msgid "GUI Designers"
+msgstr "GUI 设计"
+
+#: ../bin/fvwm-crystal.generate-menu:645
+msgid "Ham Radio"
+msgstr "业余无线电"
+
+#: ../bin/fvwm-crystal.generate-menu:649 ../fvwm/Applications/Settings/
+msgid "Hardware Settings"
+msgstr "硬件设置"
+
+#: ../bin/fvwm-crystal.generate-menu:653
+msgid "History"
+msgstr "历史"
+
+#: ../bin/fvwm-crystal.generate-menu:657
+msgid "Humanities"
+msgstr "人文学科"
+
+#: ../bin/fvwm-crystal.generate-menu:661 ../fvwm/Applications/Development/
+msgid "IDE"
+msgstr "IDE"
+
+#: ../bin/fvwm-crystal.generate-menu:665
+msgid "Image Processing"
+msgstr "图像处理"
+
+#: ../bin/fvwm-crystal.generate-menu:669 ../fvwm/Applications/Network/
+msgid "IRC Clients"
+msgstr "IRC 客户端"
+
+#: ../bin/fvwm-crystal.generate-menu:673 ../fvwm/Applications/Network/
+msgid "Instant Messaging"
+msgstr "即时通讯"
+
+#: ../bin/fvwm-crystal.generate-menu:677 ../fvwm/Applications/Development/
+msgid "Java"
+msgstr "Java"
+
+#: ../bin/fvwm-crystal.generate-menu:689 ../fvwm/Applications/20~Games/
+msgid "Kids Games"
+msgstr "儿童游戏"
+
+#: ../bin/fvwm-crystal.generate-menu:693 ../fvwm/Applications/Knowledge/
+msgid "Languages"
+msgstr "语言"
+
+#: ../bin/fvwm-crystal.generate-menu:697
+msgid "Literature"
+msgstr "文学"
+
+#: ../bin/fvwm-crystal.generate-menu:701 ../fvwm/Applications/20~Games/
+msgid "Logic Games"
+msgstr "逻辑游戏"
+
+#: ../bin/fvwm-crystal.generate-menu:705
+msgid "Maps"
+msgstr "地图"
+
+#: ../bin/fvwm-crystal.generate-menu:709 ../fvwm/Applications/Knowledge/
+msgid "Math"
+msgstr "数学"
+
+#: ../bin/fvwm-crystal.generate-menu:713
+msgid "Medical Softwares"
+msgstr "医疗软件"
+
+#: ../bin/fvwm-crystal.generate-menu:717
+#: ../fvwm/Applications/Multimedia/Audio/Engineering/
+#: ../fvwm/Applications/Multimedia/Audio/
+msgid "MIDI"
+msgstr "MIDI"
+
+#: ../bin/fvwm-crystal.generate-menu:721 ../fvwm/Applications/Multimedia/Audio/
+#: ../fvwm/components/functions/Media:466
+msgid "Mixers"
+msgstr "混音器"
+
+#: ../bin/fvwm-crystal.generate-menu:725 ../fvwm/Applications/System/
+msgid "Monitors"
+msgstr "监视器"
+
+#: ../bin/fvwm-crystal.generate-menu:729
+msgid "Motif"
+msgstr ""
+
+#
+# Music menu
+#
+#: ../bin/fvwm-crystal.generate-menu:733
+#: ../fvwm/components/functions/CustomButtonBar-Menu:289
+#: ../fvwm/components/functions/Fvwm-Crystal-Menu:34 ../fvwm/recipes/Amiga:419
+#: ../fvwm/recipes/Corner:162 ../fvwm/recipes/LapLeft:98
+#: ../fvwm/recipes/LapLeft with ACPI:110 ../fvwm/recipes/LapRight:97
+#: ../fvwm/recipes/LapRight ACPI:103 ../fvwm/recipes/Light:55
+#: ../fvwm/recipes/TopDown:64 ../fvwm/recipes/Wing-Commander:58
+msgid "Music"
+msgstr "音乐"
+
+#: ../bin/fvwm-crystal.generate-menu:737 ../fvwm/Applications/Network/
+msgid "News"
+msgstr "新闻"
+
+#: ../bin/fvwm-crystal.generate-menu:741
+msgid "Numerical Analysis"
+msgstr "数值分析"
+
+#: ../bin/fvwm-crystal.generate-menu:745
+msgid "OCR"
+msgstr "OCR"
+
+#: ../bin/fvwm-crystal.generate-menu:749 ../fvwm/Applications/Network/
+msgid "P2P"
+msgstr "P2P"
+
+#: ../bin/fvwm-crystal.generate-menu:753 ../fvwm/Applications/Settings/
+msgid "Package Managers"
+msgstr "软件包管理"
+
+#: ../bin/fvwm-crystal.generate-menu:757
+msgid "Parallel Computing"
+msgstr "并行计算"
+
+#: ../bin/fvwm-crystal.generate-menu:761 ../fvwm/Applications/Office/
+msgid "PDA"
+msgstr "PDA"
+
+#: ../bin/fvwm-crystal.generate-menu:765 ../fvwm/Applications/Graphics/
+msgid "Photography"
+msgstr "摄影"
+
+#: ../bin/fvwm-crystal.generate-menu:769 ../fvwm/Applications/Knowledge/
+msgid "Physics"
+msgstr "物理"
+
+#: ../bin/fvwm-crystal.generate-menu:773 ../fvwm/Applications/Multimedia/Audio/
+#: ../fvwm/Applications/Multimedia/Video/
+msgid "Players"
+msgstr "播放器"
+
+#: ../bin/fvwm-crystal.generate-menu:777
+msgid "Presentations"
+msgstr "简报"
+
+#: ../bin/fvwm-crystal.generate-menu:781 ../fvwm/Applications/Settings/
+#: ../fvwm/Applications/Utilities/
+msgid "Printing"
+msgstr "打印"
+
+#: ../bin/fvwm-crystal.generate-menu:785
+msgid "Profiling"
+msgstr "分析"
+
+#: ../bin/fvwm-crystal.generate-menu:789
+msgid "Project Management"
+msgstr "项目管理"
+
+#: ../bin/fvwm-crystal.generate-menu:793 ../fvwm/Applications/Office/
+msgid "Publishing"
+msgstr "发布"
+
+#: ../bin/fvwm-crystal.generate-menu:801
+msgid "Raster Graphics"
+msgstr "栅格图形"
+
+#: ../bin/fvwm-crystal.generate-menu:805
+msgid "Recorders"
+msgstr "记录"
+
+#: ../bin/fvwm-crystal.generate-menu:809 ../fvwm/Applications/Network/
+msgid "Remote Access"
+msgstr "远程访问"
+
+#: ../bin/fvwm-crystal.generate-menu:813 ../fvwm/Applications/Development/
+msgid "Revision Control"
+msgstr "版本控制"
+
+#: ../bin/fvwm-crystal.generate-menu:817
+msgid "Robotics"
+msgstr "机器人"
+
+#: ../bin/fvwm-crystal.generate-menu:821 ../fvwm/Applications/20~Games/
+msgid "Role Playing"
+msgstr "角色扮演"
+
+#: ../bin/fvwm-crystal.generate-menu:825 ../fvwm/Applications/Graphics/
+msgid "Scanning"
+msgstr "扫描"
+
+#: ../bin/fvwm-crystal.generate-menu:829 ../fvwm/Applications/System/
+msgid "Security"
+msgstr "安全"
+
+#: ../bin/fvwm-crystal.generate-menu:833 ../fvwm/Applications/Multimedia/Audio/
+msgid "Sequencers"
+msgstr ""
+
+#: ../bin/fvwm-crystal.generate-menu:837
+msgid "Shooter"
+msgstr ""
+
+#: ../bin/fvwm-crystal.generate-menu:841 ../fvwm/Applications/20~Games/
+msgid "Simulation"
+msgstr "模拟"
+
+#: ../bin/fvwm-crystal.generate-menu:845
+msgid "Spirituality"
+msgstr ""
+
+#: ../bin/fvwm-crystal.generate-menu:849
+msgid "Sports"
+msgstr "体育"
+
+#: ../bin/fvwm-crystal.generate-menu:853
+msgid "Sports Games"
+msgstr "体育游戏"
+
+#: ../bin/fvwm-crystal.generate-menu:857 ../fvwm/Applications/Office/
+msgid "Spreadsheets"
+msgstr "电子表格"
+
+#: ../bin/fvwm-crystal.generate-menu:861 ../fvwm/Applications/20~Games/
+msgid "Strategy Games"
+msgstr "策略游戏"
+
+#: ../bin/fvwm-crystal.generate-menu:869 ../fvwm/Applications/Network/
+msgid "Telephony"
+msgstr "电话"
+
+#: ../bin/fvwm-crystal.generate-menu:873
+msgid "Telephony Tools"
+msgstr "电话工具"
+
+#: ../bin/fvwm-crystal.generate-menu:877 ../fvwm/Applications/System/
+msgid "Terminals"
+msgstr "终端"
+
+#: ../bin/fvwm-crystal.generate-menu:881 ../fvwm/Applications/Utilities/
+msgid "Text Editors"
+msgstr "文本编辑器"
+
+#: ../bin/fvwm-crystal.generate-menu:885 ../fvwm/Applications/Utilities/
+msgid "Text Tools"
+msgstr "文本工具"
+
+#: ../bin/fvwm-crystal.generate-menu:889
+msgid "Translation"
+msgstr "翻译"
+
+#: ../bin/fvwm-crystal.generate-menu:893 ../fvwm/Applications/Multimedia/Audio/
+msgid "Tuners"
+msgstr "调音"
+
+#: ../bin/fvwm-crystal.generate-menu:897 ../fvwm/Applications/Multimedia/Video/
+msgid "TV"
+msgstr "TV"
+
+#: ../bin/fvwm-crystal.generate-menu:901 ../fvwm/Applications/Graphics/
+msgid "Vector Graphics"
+msgstr "矢量图形"
+
+#: ../bin/fvwm-crystal.generate-menu:905 ../fvwm/Applications/Network/
+msgid "Webcam"
+msgstr "网络摄像头"
+
+#: ../bin/fvwm-crystal.generate-menu:909 ../fvwm/Applications/Graphics/
+#: ../fvwm/Applications/Office/
+msgid "Viewers"
+msgstr "查看器"
+
+#: ../bin/fvwm-crystal.generate-menu:913 ../fvwm/Applications/Network/
+msgid "Web Browsers"
+msgstr "网页浏览器"
+
+#: ../bin/fvwm-crystal.generate-menu:917 ../fvwm/Applications/Development/
+msgid "Web Development"
+msgstr "Web 开发"
+
+#: ../bin/fvwm-crystal.generate-menu:921 ../fvwm/Applications/Office/
+msgid "Word Processors"
+msgstr "文字处理"
+
+# Applications menu
+#: ../fvwm/ ../fvwm/components/functions/CustomButtonBar-Menu:306
+msgid "Applications"
+msgstr "应用程序"
+
+#: ../fvwm/Applications/20~Games/
+msgid "Block Games"
+msgstr "方块游戏"
+
+#: ../fvwm/Applications/20~Games/
+msgid "Adventures Games"
+msgstr "冒险游戏"
+
+#: ../fvwm/Applications/20~Games/Logic_Games/
+msgid "Portable Puzzle Collection"
+msgstr "便携式益智系列"
+
+#: ../fvwm/Applications/20~Games/
+msgid "Shooters"
+msgstr ""
+
+#: ../fvwm/Applications/Development/Electronics/
+msgid "Antennas"
+msgstr "天线"
+
+#: ../fvwm/Applications/Development/Electronics/
+msgid "Chipmunksystem"
+msgstr "Chipmunksystem"
+
+#: ../fvwm/Applications/Development/Electronics/
+msgid "Geda"
+msgstr "Geda"
+
+#: ../fvwm/Applications/
+msgid "Multimedia"
+msgstr "多媒体"
+
+#: ../fvwm/Applications/Multimedia/Audio/10~Mixers/
+#: ../fvwm/Applications/Multimedia/Audio/Audio-Video_Editing/
+#: ../fvwm/Applications/Multimedia/Audio/Engineering/
+#: ../fvwm/Applications/Multimedia/Audio/Recording/
+#: ../fvwm/Applications/Multimedia/Audio/Rhythm/
+#: ../fvwm/Applications/Multimedia/Audio/Samplers/
+#: ../fvwm/Applications/Multimedia/Audio/Sequencers/
+#: ../fvwm/Applications/Multimedia/Audio/Sound_Effects/
+#: ../fvwm/Applications/Multimedia/Audio/Synthetizers/
+#: ../fvwm/Applications/Multimedia/Audio/Vu-Meters/
+msgid "Other"
+msgstr "其他"
+
+#: ../fvwm/Applications/Multimedia/Audio/
+msgid "Composition"
+msgstr ""
+
+#: ../fvwm/Applications/Multimedia/Audio/
+msgid "DJ"
+msgstr "DJ"
+
+#: ../fvwm/Applications/Multimedia/Audio/Engineering/
+#: ../fvwm/Applications/Multimedia/Audio/Tuners/
+msgid "Jack"
+msgstr "Jack"
+
+#: ../fvwm/Applications/Multimedia/Audio/
+msgid "Mp3"
+msgstr "Mp3"
+
+#: ../fvwm/Applications/Multimedia/Audio/
+msgid "Non"
+msgstr "无"
+
+#: ../fvwm/Applications/Multimedia/Audio/
+msgid "Notation"
+msgstr ""
+
+#: ../fvwm/Applications/Multimedia/Audio/
+msgid "Radios"
+msgstr "收音机"
+
+#: ../fvwm/Applications/Multimedia/Audio/
+msgid "Recording"
+msgstr "录音"
+
+#: ../fvwm/Applications/Multimedia/Audio/
+msgid "Rhythm"
+msgstr ""
+
+#: ../fvwm/Applications/Multimedia/Audio/
+msgid "Rippers"
+msgstr ""
+
+#: ../fvwm/Applications/Multimedia/Audio/
+msgid "Samplers"
+msgstr "取样"
+
+#: ../fvwm/Applications/Multimedia/Audio/
+msgid "Sound Effects"
+msgstr "音效"
+
+#: ../fvwm/Applications/Multimedia/Audio/
+msgid "Sound Processing"
+msgstr "声音处理"
+
+#: ../fvwm/Applications/Multimedia/Audio/
+msgid "Streaming"
+msgstr "流媒体"
+
+#: ../fvwm/Applications/Multimedia/Audio/
+msgid "Synthetizers"
+msgstr "合成器"
+
+#: ../fvwm/Applications/Multimedia/Audio/Synthetizers/
+msgid "Bristol"
+msgstr ""
+
+#: ../fvwm/Applications/Multimedia/Audio/
+msgid "Trackers"
+msgstr ""
+
+#: ../fvwm/Applications/Multimedia/Audio/
+msgid "Vu-Meters"
+msgstr "Vu-Meters"
+
+#: ../fvwm/Applications/Multimedia/Video/
+msgid "Video Effects"
+msgstr "视频特效"
+
+#: ../fvwm/Applications/Network/Instant_Messaging/
+msgid "Jabber"
+msgstr "Jabber"
+
+#: ../fvwm/Applications/Office/
+msgid "KOffice"
+msgstr "KOffice"
+
+#: ../fvwm/Applications/Office/
+msgid "LibreOffice"
+msgstr "LibreOffice"
+
+#: ../fvwm/Applications/Office/
+msgid "OpenOffice.org"
+msgstr "OpenOffice.org"
+
+#: ../fvwm/components/apps/DesktopIcons:49 ../fvwm/scripts/desktop_manager:180
+msgid "Umount"
+msgstr "卸载"
+
+#: ../fvwm/components/apps/DesktopIcons:54
+#: ../fvwm/components/apps/DesktopIcons:71
+#: ../fvwm/components/apps/DesktopIcons:173
+#: ../fvwm/components/functions/CustomButtonBar-Menu:74
+#: ../fvwm/components/functions/CustomButtonBar-Menu:85
+#: ../fvwm/components/functions/CustomButtonBar-Menu:108
+#: ../fvwm/components/functions/CustomButtonBar-Menu:173
+#: ../fvwm/components/functions/Preferences-Menu:676
+#: ../fvwm/components/functions/Preferences-Menu:737
+msgid "On"
+msgstr "开"
+
+#: ../fvwm/components/apps/DesktopIcons:55
+#: ../fvwm/components/apps/DesktopIcons:72
+#: ../fvwm/components/apps/DesktopIcons:174
+#: ../fvwm/components/functions/CustomButtonBar-Menu:64
+#: ../fvwm/components/functions/CustomButtonBar-Menu:75
+#: ../fvwm/components/functions/CustomButtonBar-Menu:86
+#: ../fvwm/components/functions/CustomButtonBar-Menu:98
+#: ../fvwm/components/functions/CustomButtonBar-Menu:109
+#: ../fvwm/components/functions/CustomButtonBar-Menu:174
+#: ../fvwm/components/functions/Preferences-Menu:677
+#: ../fvwm/components/functions/Preferences-Menu:738
+msgid "Off"
+msgstr "关"
+
+# Applications menu
+#: ../fvwm/components/apps/DesktopIcons:89
+#: ../fvwm/components/apps/DesktopIcons:90
+msgid "Action "
+msgstr "动作 "
+
+#: ../fvwm/components/apps/DesktopIcons:91
+#: ../fvwm/components/apps/DesktopIcons:92
+msgid "Custom action "
+msgstr "自定义动作 "
+
+#: ../fvwm/components/apps/DesktopIcons:102
+#: ../fvwm/components/apps/DesktopIcons:123
+msgid "File browser action"
+msgstr "文件浏览器动作"
+
+#: ../fvwm/components/apps/DesktopIcons:103
+msgid "Type a command to bind to the first mouse button."
+msgstr "请键入命令以绑定到第一个鼠标按钮。"
+
+#: ../fvwm/components/apps/DesktopIcons:106
+#: ../fvwm/components/apps/DesktopIcons:127
+msgid "A console command must be prefixed by A and space,"
+msgstr "控制台命令必须以 A 和 空格 为前缀，"
+
+#: ../fvwm/components/apps/DesktopIcons:109
+#: ../fvwm/components/apps/DesktopIcons:130
+msgid "use X and space otherwise."
+msgstr "否则请使用 X 和空格。"
+
+#: ../fvwm/components/apps/DesktopIcons:115
+#: ../fvwm/components/apps/DesktopIcons:136
+#: ../fvwm/components/functions/Feedback:75
+#: ../fvwm/components/functions/Music-audacious:57
+#: ../fvwm/components/functions/Music-mpd:79
+#: ../fvwm/components/functions/Music-xmms2:85
+#: ../fvwm/components/functions/Preferences-Menu:541
+msgid "Save"
+msgstr "保存"
+
+#: ../fvwm/components/apps/DesktopIcons:117
+#: ../fvwm/components/apps/DesktopIcons:138
+#: ../fvwm/components/functions/Feedback:45
+#: ../fvwm/components/functions/Preferences-Menu:80
+#: ../fvwm/components/functions/Preferences-Menu:316
+#: ../fvwm/components/functions/Preferences-Menu:330
+#: ../fvwm/components/functions/Preferences-Menu:371
+#: ../fvwm/components/functions/Preferences-Menu:455
+#: ../fvwm/components/functions/Preferences-Menu:543
+#: ../fvwm/components/functions/Preferences-Menu:709
+msgid "Not now"
+msgstr "现在不"
+
+#: ../fvwm/components/apps/DesktopIcons:124
+msgid "Type a command to bind to the second mouse button."
+msgstr "请键入命令以绑定到第二个鼠标按钮。"
+
+#: ../fvwm/components/apps/DesktopIcons:156
+#: ../fvwm/components/functions/CustomButtonBar-Menu:237
+msgid "Left"
+msgstr "左"
+
+#: ../fvwm/components/apps/DesktopIcons:157
+#: ../fvwm/components/functions/CustomButtonBar-Menu:238
+msgid "Right"
+msgstr "右"
+
+#  Wallpaper menu
+#: ../fvwm/components/apps/Nautilus:41 ../fvwm/components/apps/ROX-Filer:32
+#: ../fvwm/components/functions/Wallpaper:58
+msgid "Random"
+msgstr "随机"
+
+#
+# Screensaver menu
+#
+#: ../fvwm/components/apps/XScreenSaver:23
+msgid "Force suspend"
+msgstr "强制挂起"
+
+#: ../fvwm/components/apps/XScreenSaver:24
+msgid "Activate"
+msgstr "激活"
+
+#: ../fvwm/components/apps/XScreenSaver:25
+#: ../fvwm/components/functions/Exit:127
+#: ../fvwm/components/functions/Exit-Safe:9
+msgid "Lock screen"
+msgstr "锁屏"
+
+#: ../fvwm/components/apps/XScreenSaver:26
+#: ../fvwm/components/functions/CustomButtonBar-Menu:299
+#: ../fvwm/components/functions/Fvwm-Crystal-Menu:45 ../fvwm/recipes/Light:66
+#: ../fvwm/recipes/TopDown:75 ../fvwm/recipes/Wing-Commander:71
+msgid "Preferences"
+msgstr "首选项"
+
+#: ../fvwm/components/apps/XScreenSaver:28
+msgid "Stop screensaver"
+msgstr "停止屏保"
+
+#: ../fvwm/components/apps/XScreenSaver:28
+msgid "Start screensaver"
+msgstr "开始屏保"
+
+#
+# About dialog
+#
+#: ../fvwm/components/functions/About:8 ../fvwm/scripts/convert_preferences:4
+msgid "Version"
+msgstr "版本"
+
+#: ../fvwm/components/functions/About:13
+msgid "Authors"
+msgstr "作者"
+
+#: ../fvwm/components/functions/About:17
+msgid "With contributions from:"
+msgstr "来自以下个人或组织的贡献:"
+
+#: ../fvwm/components/functions/About:33
+msgid "The majority of the icons are from the Tango project and from"
+msgstr "大多数图标来自 Tango 项目和"
+
+#: ../fvwm/components/functions/About:40
+msgid "FVWM version"
+msgstr "FVWM 版本"
+
+#: ../fvwm/components/functions/About:46
+msgid "Feedback, support"
+msgstr "反馈，支持"
+
+#: ../fvwm/components/functions/About:48
+#: ../fvwm/components/functions/Debug-Functions:57
+#: ../fvwm/components/functions/Window-Buttons:75
+#: ../fvwm/components/functions/Window-Buttons:134
+#: ../fvwm/components/functions/Window-Buttons-Vertical:81
+#: ../fvwm/components/functions/Window-Buttons-Vertical:138
+msgid "Close"
+msgstr "关闭"
+
+#: ../fvwm/components/functions/AutoWallpaper-Error:6
+#: ../fvwm/components/functions/Wallpaper:39
+msgid "Auto wallpaper"
+msgstr "自动壁纸"
+
+#: ../fvwm/components/functions/AutoWallpaper-Error:7
+msgid "No pictures found."
+msgstr "没有发现图片。"
+
+#: ../fvwm/components/functions/AutoWallpaper-Error:10
+msgid "You should save wallpapers in"
+msgstr "您需要将壁纸保存在"
+
+#: ../fvwm/components/functions/AutoWallpaper-Error:16
+msgid "Auto wallpapers must be in subdirectories."
+msgstr "自动壁纸必须位于子目录中。"
+
+#: ../fvwm/components/functions/AutoWallpaper-Error:19
+msgid "Symlinks to directories are allowed."
+msgstr "允许目录的符号链接。"
+
+#: ../fvwm/components/functions/AutoWallpaper-Error:22
+msgid "The thumbnails generation is CPU intensive,"
+msgstr "生成缩略图将会占用大量 CPU，"
+
+#: ../fvwm/components/functions/AutoWallpaper-Error:25
+msgid "it is better to have a few subdirectories than"
+msgstr "所以有多个子目录比一个"
+
+#: ../fvwm/components/functions/AutoWallpaper-Error:28
+msgid "a lot of files in one subdirectory."
+msgstr "子目录中有大量文件更好。"
+
+#: ../fvwm/components/functions/AutoWallpaper-Error:31
+#: ../fvwm/components/functions/CustomButtonBar-Menu:225
+#: ../fvwm/components/functions/Preferences-Menu:190
+#: ../fvwm/components/functions/Preferences-Menu:577
+#: ../fvwm/components/functions/Preferences-Menu:727
+#: ../fvwm/scripts/FileEditors/ShowDirectories-Help:40
+msgid "OK"
+msgstr "好"
+
+#: ../fvwm/components/functions/Colorsets:25
+#: ../fvwm/components/functions/Preferences-Menu:56
+#: ../fvwm/components/functions/Window-Decorations:27
+msgid "User"
+msgstr "用户"
+
+#: ../fvwm/components/functions/CustomButtonBar-Menu:59
+#: ../fvwm/components/functions/CustomButtonBar-Menu:96
+#: ../fvwm/components/functions/Media:444
+#: ../fvwm/components/functions/Music-alsaplayer:263
+#: ../fvwm/components/functions/Music-alsaplayerdaemon:259
+msgid "Normal"
+msgstr "正常"
+
+#: ../fvwm/components/functions/CustomButtonBar-Menu:60
+msgid "24 hours"
+msgstr "24 小时"
+
+#: ../fvwm/components/functions/CustomButtonBar-Menu:61
+#: ../fvwm/components/functions/CustomButtonBar-Menu:97
+#: ../fvwm/components/functions/CustomButtonBar-Menu:154
+msgid "Small"
+msgstr "小"
+
+#: ../fvwm/components/functions/CustomButtonBar-Menu:62
+msgid "Small + date"
+msgstr "小 + 日期"
+
+#: ../fvwm/components/functions/CustomButtonBar-Menu:63
+msgid "24 hours small + date"
+msgstr "24小时 小+日期"
+
+#: ../fvwm/components/functions/CustomButtonBar-Menu:155
+msgid "Medium"
+msgstr "中"
+
+#: ../fvwm/components/functions/CustomButtonBar-Menu:156
+msgid "Big"
+msgstr "大"
+
+#: ../fvwm/components/functions/CustomButtonBar-Menu:197
+msgid "Custom Button Bar"
+msgstr "自定义按钮栏"
+
+#: ../fvwm/components/functions/CustomButtonBar-Menu:198
+#: ../fvwm/scripts/FileEditors/ShowDirectories-Help:4
+msgid "You are editing the file"
+msgstr "您正在编辑该文件"
+
+#: ../fvwm/components/functions/CustomButtonBar-Menu:204
+#: ../fvwm/components/functions/Preferences-Menu:559
+#: ../fvwm/scripts/FileEditors/ShowDirectories-Help:10
+msgid "Each line has the following format:"
+msgstr "每一行的格式如下："
+
+#: ../fvwm/components/functions/CustomButtonBar-Menu:207
+msgid "icon name command"
+msgstr "icon name command"
+
+#: ../fvwm/components/functions/CustomButtonBar-Menu:210
+msgid "where icon is the icon used for the button,"
+msgstr "其中 icon 是按钮图标，"
+
+#: ../fvwm/components/functions/CustomButtonBar-Menu:213
+msgid "name is the button name"
+msgstr "name 是按钮的名称"
+
+#: ../fvwm/components/functions/CustomButtonBar-Menu:216
+msgid "and command will be launched by the button."
+msgstr "command 是使用按钮运行的命令。"
+
+#: ../fvwm/components/functions/CustomButtonBar-Menu:219
+msgid "icon and name must have no space,"
+msgstr "图标和名称不能有空格,"
+
+#: ../fvwm/components/functions/CustomButtonBar-Menu:222
+msgid "command can have spaces."
+msgstr "命令可以有空格。"
+
+#: ../fvwm/components/functions/CustomButtonBar-Menu:239
+msgid "Up"
+msgstr "向上"
+
+#: ../fvwm/components/functions/CustomButtonBar-Menu:240
+msgid "Down"
+msgstr "向下"
+
+#: ../fvwm/components/functions/CustomButtonBar-Menu:270
+msgid "Custom bar location"
+msgstr "自定义栏位置"
+
+#: ../fvwm/components/functions/CustomButtonBar-Menu:271
+msgid "Button size"
+msgstr "按钮大小"
+
+#: ../fvwm/components/functions/CustomButtonBar-Menu:272
+msgid "Toggle bar with mouse on same border"
+msgstr "用鼠标在同一边框上切换栏"
+
+#: ../fvwm/components/functions/CustomButtonBar-Menu:273
+#: ../fvwm/components/functions/Preferences-Menu:29
+msgid "Preferences editor"
+msgstr "首选项编辑"
+
+#: ../fvwm/components/functions/CustomButtonBar-Menu:274
+msgid "Generate this Menu"
+msgstr "生成此菜单"
+
+#: ../fvwm/components/functions/CustomButtonBar-Menu:275
+msgid "Generate the custom buttons bar"
+msgstr "生成自定义按钮栏"
+
+#: ../fvwm/components/functions/CustomButtonBar-Menu:278
+msgid "Choose an applet to add:"
+msgstr "选择要添加的小程序："
+
+#: ../fvwm/components/functions/CustomButtonBar-Menu:280
+msgid "Clock"
+msgstr "时钟"
+
+#: ../fvwm/components/functions/CustomButtonBar-Menu:281
+msgid "ACPI battery"
+msgstr "ACPI 电池"
+
+#: ../fvwm/components/functions/CustomButtonBar-Menu:282
+msgid "CPU temperature"
+msgstr "CPU 温度"
+
+#: ../fvwm/components/functions/CustomButtonBar-Menu:283
+msgid "CPU frequency"
+msgstr "CPU 频率"
+
+#: ../fvwm/components/functions/CustomButtonBar-Menu:284
+msgid "Pager"
+msgstr "分页器"
+
+#: ../fvwm/components/functions/CustomButtonBar-Menu:287
+msgid "Choose a menu entry to add it as a button:"
+msgstr "选择一个菜单项以将其添加为按钮:"
+
+#: ../fvwm/components/functions/CustomButtonBar-Menu:291
+#: ../fvwm/components/functions/Developer-Menu:19
+#: ../fvwm/components/functions/Fvwm-Crystal-Menu:32 ../fvwm/recipes/Light:57
+#: ../fvwm/recipes/TopDown:66 ../fvwm/recipes/Wing-Commander:60
+msgid "FVWM-Crystal documentation"
+msgstr "FVWM-Crystal 文档"
+
+#: ../fvwm/components/functions/CustomButtonBar-Menu:293
+#: ../fvwm/components/functions/Fvwm-Crystal-Menu:37 ../fvwm/recipes/Light:60
+#: ../fvwm/recipes/TopDown:69 ../fvwm/recipes/Wing-Commander:63
+msgid "Screensaver"
+msgstr "屏幕保护"
+
+#: ../fvwm/components/functions/CustomButtonBar-Menu:294
+#: ../fvwm/components/functions/Fvwm-Crystal-Menu:38
+#: ../fvwm/components/functions/Screenshot-import:6
+#: ../fvwm/components/functions/Screenshot-import:11
+#: ../fvwm/components/functions/Screenshot-import:16 ../fvwm/recipes/Light:61
+#: ../fvwm/recipes/TopDown:70 ../fvwm/recipes/Wing-Commander:64
+msgid "Screenshot"
+msgstr "截屏"
+
+#
+# Main menu - usually found in recipes/*
+#
+#: ../fvwm/components/functions/CustomButtonBar-Menu:296
+#: ../fvwm/components/functions/Fvwm-Crystal-Menu:40 ../fvwm/recipes/Light:63
+#: ../fvwm/recipes/TopDown:72 ../fvwm/recipes/Wing-Commander:66
+msgid "Window decorations"
+msgstr "窗户装饰"
+
+#: ../fvwm/components/functions/CustomButtonBar-Menu:297
+#: ../fvwm/components/functions/Fvwm-Crystal-Menu:41 ../fvwm/recipes/Light:64
+#: ../fvwm/recipes/TopDown:73 ../fvwm/recipes/Wing-Commander:67
+msgid "Colorsets"
+msgstr "配色方案"
+
+#: ../fvwm/components/functions/CustomButtonBar-Menu:298
+#: ../fvwm/components/functions/Fvwm-Crystal-Menu:42 ../fvwm/recipes/Light:65
+#: ../fvwm/recipes/TopDown:74 ../fvwm/recipes/Wing-Commander:68
+msgid "Wallpaper"
+msgstr "壁纸"
+
+#: ../fvwm/components/functions/CustomButtonBar-Menu:301
+#: ../fvwm/components/functions/Developer-Menu:4
+#: ../fvwm/components/functions/Fvwm-Crystal-Menu:47 ../fvwm/recipes/Light:68
+#: ../fvwm/recipes/TopDown:77 ../fvwm/recipes/Wing-Commander:73
+msgid "Developer menu"
+msgstr "开发者菜单"
+
+#: ../fvwm/components/functions/CustomButtonBar-Menu:302
+#: ../fvwm/components/functions/Fvwm-Crystal-Menu:48 ../fvwm/recipes/Light:69
+#: ../fvwm/recipes/TopDown:78 ../fvwm/recipes/Wing-Commander:76
+msgid "About FVWM-Crystal"
+msgstr "关于 FVWM-Crystal"
+
+#: ../fvwm/components/functions/CustomButtonBar-Menu:305
+#: ../fvwm/components/functions/Fvwm-Crystal-Menu:51 ../fvwm/recipes/Light:70
+#: ../fvwm/recipes/TopDown:79 ../fvwm/recipes/Wing-Commander:77
+msgid "Exit"
+msgstr "退出"
+
+#
+# Developer menu
+#
+#: ../fvwm/components/functions/Debug-Functions:52
+#: ../fvwm/components/functions/Developer-Menu:6
+msgid "Identify window"
+msgstr "识别窗口"
+
+#: ../fvwm/components/functions/Debug-Functions:53
+#: ../fvwm/components/functions/Developer-Menu:29
+#: ../fvwm/components/functions/Developer-Menu:159
+msgid "WindowStyle"
+msgstr "窗口样式"
+
+#: ../fvwm/components/functions/Debug-Functions:55
+msgid "Move"
+msgstr "移动"
+
+#: ../fvwm/components/functions/Debug-Functions:56
+msgid "Resize"
+msgstr "调整"
+
+#: ../fvwm/components/functions/Debug-Functions:58
+#: ../fvwm/components/functions/Window-Buttons:76
+#: ../fvwm/components/functions/Window-Buttons-Vertical:82
+msgid "Destroy"
+msgstr "摧毁"
+
+#: ../fvwm/components/functions/Developer-Menu:5
+msgid "Reload current recipe"
+msgstr "重新加载当前方案"
+
+#: ../fvwm/components/functions/Developer-Menu:7
+msgid "Toggle FvwmConsole"
+msgstr "切换 FvwmConsole"
+
+#: ../fvwm/components/functions/Developer-Menu:8
+msgid "Open debug window"
+msgstr "打开调试窗口"
+
+#: ../fvwm/components/functions/Developer-Menu:20
+msgid "FVWM manpages"
+msgstr "FVWM 手册页"
+
+#: ../fvwm/components/functions/Developer-Menu:21
+msgid "X.org documentation"
+msgstr "X.org 文档"
+
+#: ../fvwm/components/functions/Developer-Menu:25
+msgid "Browse Info pages with EMacs"
+msgstr "使用 EMacs 浏览信息页面"
+
+#: ../fvwm/components/functions/Developer-Menu:26
+msgid "Browse Info pages with pinfo"
+msgstr "使用 pinfo 浏览信息页面"
+
+#: ../fvwm/components/functions/Developer-Menu:27
+msgid "Browse Info pages with tkinfo"
+msgstr "使用 tkinfo 浏览信息页面"
+
+#: ../fvwm/components/functions/Developer-Menu:34
+msgid "Keyboard bindings"
+msgstr "键盘绑定"
+
+#: ../fvwm/components/functions/Developer-Menu:35
+msgid "Mouse bindings"
+msgstr "鼠标绑定"
+
+#: ../fvwm/components/functions/Developer-Menu:36
+msgid "FAQ"
+msgstr "常见问题"
+
+#: ../fvwm/components/functions/Developer-Menu:37
+msgid "Tips"
+msgstr "提示"
+
+#: ../fvwm/components/functions/Developer-Menu:38
+msgid "Crystal Rox! HOWTO"
+msgstr "Crystal Rox! 指南"
+
+# Applications menu
+#: ../fvwm/components/functions/Developer-Menu:39
+msgid "Application database"
+msgstr "应用程序数据库"
+
+#: ../fvwm/components/functions/Developer-Menu:48
+msgid "Main documentation"
+msgstr "主文档"
+
+#: ../fvwm/components/functions/Developer-Menu:49
+msgid "Decorations and colorsets"
+msgstr "装饰和色彩"
+
+#: ../fvwm/components/functions/Developer-Menu:50
+msgid "Modules used in FVWM-Crystal"
+msgstr "FVWM-Crystal 中使用的模块"
+
+#: ../fvwm/components/functions/Developer-Menu:52
+msgid "Interface look and feel"
+msgstr "界面外观"
+
+#: ../fvwm/components/functions/Developer-Menu:53
+msgid "Programming and debugging"
+msgstr "编程和调试"
+
+#: ../fvwm/components/functions/Developer-Menu:54
+msgid "External scripts and applications"
+msgstr "外部脚本和应用"
+
+#: ../fvwm/components/functions/Developer-Menu:126
+msgid "X.Org documentation"
+msgstr "X.org 文档"
+
+#: ../fvwm/components/functions/Developer-Menu:128
+msgid "X.Org-Xserver documentation"
+msgstr "X.Org-Xserver 文档"
+
+#: ../fvwm/components/functions/Exit:29 ../fvwm/components/functions/Exit:42
+msgid " 1 %"
+msgstr " 1 %"
+
+#: ../fvwm/components/functions/Exit:30 ../fvwm/components/functions/Exit:43
+msgid " 2 %"
+msgstr " 2 %"
+
+#: ../fvwm/components/functions/Exit:31 ../fvwm/components/functions/Exit:44
+msgid " 3 %"
+msgstr " 3 %"
+
+#: ../fvwm/components/functions/Exit:32 ../fvwm/components/functions/Exit:45
+msgid " 5 %"
+msgstr " 5 %"
+
+#: ../fvwm/components/functions/Exit:33 ../fvwm/components/functions/Exit:46
+msgid "10 %"
+msgstr "10 %"
+
+#: ../fvwm/components/functions/Exit:34 ../fvwm/components/functions/Exit:47
+msgid "15 %"
+msgstr "15 %"
+
+#: ../fvwm/components/functions/Exit:35 ../fvwm/components/functions/Exit:48
+msgid "20 %"
+msgstr "20 %"
+
+#: ../fvwm/components/functions/Exit:36 ../fvwm/components/functions/Exit:49
+msgid "25 %"
+msgstr "25 %"
+
+#: ../fvwm/components/functions/Exit:37 ../fvwm/components/functions/Exit:50
+msgid "50 %"
+msgstr "50%"
+
+#: ../fvwm/components/functions/Exit:38 ../fvwm/components/functions/Exit:51
+msgid "75 %"
+msgstr "75 %"
+
+#: ../fvwm/components/functions/Exit:57
+msgid "Stop"
+msgstr "停止"
+
+#: ../fvwm/components/functions/Exit:59 ../fvwm/components/functions/Exit:60
+msgid "Start when battery is as low as"
+msgstr "开始，当电池电量低至"
+
+#: ../fvwm/components/functions/Exit:82
+msgid "No resume hybride with screen lid"
+msgstr ""
+
+#: ../fvwm/components/functions/Exit:84 ../fvwm/components/functions/Exit:85
+#: ../fvwm/components/functions/Exit:97 ../fvwm/components/functions/Exit:108
+msgid "Resume hybride with screen lid"
+msgstr ""
+
+#: ../fvwm/components/functions/Exit:96 ../fvwm/components/functions/Exit:107
+msgid "Automatic suspend to disk"
+msgstr "自动挂起至硬盘"
+
+#: ../fvwm/components/functions/Exit:99 ../fvwm/components/functions/Exit:110
+msgid "Resume to RAM"
+msgstr "恢复至 RAM"
+
+#: ../fvwm/components/functions/Exit:100 ../fvwm/components/functions/Exit:111
+msgid "Resume hybride"
+msgstr ""
+
+#: ../fvwm/components/functions/Exit:101 ../fvwm/components/functions/Exit:112
+msgid "Suspend to disk"
+msgstr "挂起至硬盘"
+
+#: ../fvwm/components/functions/Exit:102
+msgid "Powersave"
+msgstr "省电"
+
+#: ../fvwm/components/functions/Exit:114
+#: ../fvwm/components/functions/Exit-Safe-gdm:13
+#: ../fvwm/components/functions/Exit-Safe-sudo:6
+#: ../fvwm/components/functions/Exit-gdm:13
+#: ../fvwm/components/functions/Exit-sudo:6
+msgid "Reboot computer"
+msgstr "重启电脑"
+
+#: ../fvwm/components/functions/Exit:115
+#: ../fvwm/components/functions/Exit-Safe-gdm:17
+#: ../fvwm/components/functions/Exit-Safe-sudo:7
+#: ../fvwm/components/functions/Exit-gdm:17
+#: ../fvwm/components/functions/Exit-sudo:7
+msgid "Turn off computer"
+msgstr "关闭电脑"
+
+#: ../fvwm/components/functions/Exit:126
+#: ../fvwm/components/functions/Exit-Safe:8
+#: ../fvwm/components/functions/Preferences-Menu:78
+#: ../fvwm/components/functions/Preferences-Menu:369
+#: ../fvwm/components/functions/Preferences-Menu:453
+#: ../fvwm/components/functions/Preferences-Menu:707
+msgid "Restart"
+msgstr "重新开始"
+
+#
+# Exit menu
+#
+#: ../fvwm/components/functions/Exit:128 ../fvwm/components/functions/Exit:129
+#: ../fvwm/components/functions/Exit-Safe:10
+#: ../fvwm/components/functions/Preferences-Menu:314
+#: ../fvwm/components/functions/Preferences-Menu:328
+msgid "Logout"
+msgstr "注销"
+
+#: ../fvwm/components/functions/Exit:133
+msgid "Save session"
+msgstr "保存会话"
+
+#: ../fvwm/components/functions/Exit:134
+msgid "Manage session"
+msgstr "管理会话"
+
+#: ../fvwm/components/functions/Exit-Safe:19
+#: ../fvwm/components/functions/Exit-Safe:20
+#: ../fvwm/components/functions/Exit-Safe-gdm:21
+#: ../fvwm/components/functions/Exit-Safe-gdm:25
+#: ../fvwm/components/functions/Exit-Safe-gdm:29
+#: ../fvwm/components/functions/Exit-Safe-sudo:11
+#: ../fvwm/components/functions/Exit-Safe-sudo:15
+msgid "I am sure"
+msgstr "我确定"
+
+#: ../fvwm/components/functions/Exit-Safe-gdm:10
+#: ../fvwm/components/functions/Exit-gdm:10
+msgid "New login"
+msgstr "新登录"
+
+#: ../fvwm/components/functions/Exit-Safe-gdm:11
+#: ../fvwm/components/functions/Exit-gdm:11
+msgid "New nested login"
+msgstr "新的嵌套登录"
+
+#
+# Screensaver menu
+#
+#: ../fvwm/components/functions/Exit-Safe-gdm:15
+#: ../fvwm/components/functions/Exit-gdm:15
+msgid "Suspend"
+msgstr "挂起"
+
+#: ../fvwm/components/functions/Feedback:19
+msgid "User feedback"
+msgstr "用户反馈"
+
+#: ../fvwm/components/functions/Feedback:20
+msgid "You are welcomed to send feedback to the developer:"
+msgstr "欢迎您将反馈发送给开发人员："
+
+#: ../fvwm/components/functions/Feedback:22
+msgid "bug reports, suggestions, patches, ideas,"
+msgstr "错误报告，建议，补丁，想法，"
+
+#: ../fvwm/components/functions/Feedback:24
+msgid "congratulations or complaints."
+msgstr "祝贺或投诉。"
+
+#: ../fvwm/components/functions/Feedback:26
+msgid "This will help him make this software better."
+msgstr "这将帮助他，使该软件做得更好。"
+
+#: ../fvwm/components/functions/Feedback:28
+msgid "Send feedback (for support keep reading)"
+msgstr "发送反馈（如需获取支持，请继续阅读）"
+
+#: ../fvwm/components/functions/Feedback:32
+msgid "To get support, the best places are the"
+msgstr "要获得支持，最好的地方是"
+
+#: ../fvwm/components/functions/Feedback:34
+msgid "FVWM-Crystal users email list, or the"
+msgstr "FVWM-Crystal 用户电子邮件列表，或"
+
+#: ../fvwm/components/functions/Feedback:36
+msgid "fvwm-crystal IRC channel on FreeNode:"
+msgstr "位于 FreeNode 上的 fvwm-crystal IRC 频道 :"
+
+#: ../fvwm/components/functions/Feedback:38
+msgid "Go to the FVWM-Crystal users email list"
+msgstr "前往 FVWM-Crystal 用户电子邮件列表"
+
+#: ../fvwm/components/functions/Feedback:41
+msgid "Go to the fvwm-crystal IRC channel"
+msgstr "转到 fvwm-crystal IRC 频道"
+
+#: ../fvwm/components/functions/Feedback:69
+msgid "Default browser"
+msgstr "默认浏览器"
+
+#: ../fvwm/components/functions/Feedback:70
+msgid "Enter the default browser"
+msgstr "输入默认浏览器"
+
+#: ../fvwm/components/functions/Fvwm-Crystal-Menu:36 ../fvwm/recipes/Light:59
+#: ../fvwm/recipes/TopDown:68 ../fvwm/recipes/Wing-Commander:62
+msgid "Screen resolution"
+msgstr "屏幕分辨率"
+
+#: ../fvwm/components/functions/Fvwm-Crystal-Menu:50
+#: ../fvwm/recipes/Wing-Commander:75
+msgid "Nested sessions"
+msgstr "嵌套会话"
+
+#: ../fvwm/components/functions/Media:101
+#: ../fvwm/components/functions/Music-alsaplayer:42
+#: ../fvwm/components/functions/Music-alsaplayerdaemon:40
+#: ../fvwm/components/functions/Music-audacious:27
+#: ../fvwm/components/functions/Music-audacious:182
+#: ../fvwm/components/functions/Music-cdcd:37
+#: ../fvwm/components/functions/Music-cmus:35
+#: ../fvwm/components/functions/Music-mocp:33
+#: ../fvwm/components/functions/Music-mpd:40
+#: ../fvwm/components/functions/Music-quodlibet:28
+#: ../fvwm/components/functions/Music-xmms2:46
+msgid "Recreate the Playlists"
+msgstr "重建播放列表"
+
+#: ../fvwm/components/functions/Media:102
+#: ../fvwm/components/functions/Music-alsaplayer:43
+#: ../fvwm/components/functions/Music-alsaplayerdaemon:41
+#: ../fvwm/components/functions/Music-audacious:28
+#: ../fvwm/components/functions/Music-audacious:183
+#: ../fvwm/components/functions/Music-cdcd:38
+#: ../fvwm/components/functions/Music-cdcd:105
+#: ../fvwm/components/functions/Music-cmus:36
+#: ../fvwm/components/functions/Music-cmus:132
+#: ../fvwm/components/functions/Music-mocp:34
+#: ../fvwm/components/functions/Music-mocp:131
+#: ../fvwm/components/functions/Music-mpd:41
+#: ../fvwm/components/functions/Music-mpd:207
+#: ../fvwm/components/functions/Music-quodlibet:29
+#: ../fvwm/components/functions/Music-quodlibet:104
+#: ../fvwm/components/functions/Music-xmms2:47
+#: ../fvwm/components/functions/Music-xmms2:209
+msgid "Music player"
+msgstr "音乐播放器"
+
+#: ../fvwm/components/functions/Media:103
+msgid "Icons in file browser"
+msgstr "文件浏览器中的图标"
+
+#: ../fvwm/components/functions/Media:105
+#: ../fvwm/components/functions/Music-alsaplayer:45
+#: ../fvwm/components/functions/Music-alsaplayerdaemon:43
+#: ../fvwm/components/functions/Music-audacious:30
+#: ../fvwm/components/functions/Music-audacious:177
+#: ../fvwm/components/functions/Music-cdcd:40
+#: ../fvwm/components/functions/Music-cdcd:101
+#: ../fvwm/components/functions/Music-cmus:38
+#: ../fvwm/components/functions/Music-cmus:134
+#: ../fvwm/components/functions/Music-mocp:36
+#: ../fvwm/components/functions/Music-mocp:127
+#: ../fvwm/components/functions/Music-mpd:43
+#: ../fvwm/components/functions/Music-mpd:203
+#: ../fvwm/components/functions/Music-quodlibet:31
+#: ../fvwm/components/functions/Music-quodlibet:97
+#: ../fvwm/components/functions/Music-xmms2:49
+#: ../fvwm/components/functions/Music-xmms2:205
+msgid "Start QJackCtl"
+msgstr "启动 QJackCtl"
+
+#: ../fvwm/components/functions/Media:106
+#: ../fvwm/components/functions/Music-alsaplayer:46
+#: ../fvwm/components/functions/Music-alsaplayerdaemon:44
+#: ../fvwm/components/functions/Music-audacious:31
+#: ../fvwm/components/functions/Music-audacious:178
+#: ../fvwm/components/functions/Music-cdcd:41
+#: ../fvwm/components/functions/Music-cdcd:102
+#: ../fvwm/components/functions/Music-cmus:39
+#: ../fvwm/components/functions/Music-cmus:135
+#: ../fvwm/components/functions/Music-mocp:37
+#: ../fvwm/components/functions/Music-mocp:128
+#: ../fvwm/components/functions/Music-mpd:44
+#: ../fvwm/components/functions/Music-mpd:204
+#: ../fvwm/components/functions/Music-quodlibet:32
+#: ../fvwm/components/functions/Music-quodlibet:98
+#: ../fvwm/components/functions/Music-xmms2:50
+#: ../fvwm/components/functions/Music-xmms2:206
+msgid "Start Cadence"
+msgstr "启动 Cadence"
+
+#: ../fvwm/components/functions/Media:109
+msgid "Start player"
+msgstr "启动 player"
+
+#: ../fvwm/components/functions/Media:110
+msgid "Stop MPlayer"
+msgstr "停止 MPlayer"
+
+#: ../fvwm/components/functions/Media:111
+msgid "Destroy MPlayer"
+msgstr "摧毁 MPlayer"
+
+#: ../fvwm/components/functions/Media:156
+#: ../fvwm/components/functions/Music:118
+msgid "Audio playlists"
+msgstr "音频播放列表"
+
+#: ../fvwm/components/functions/Media:157
+msgid "Video playlists"
+msgstr "视频播放列表"
+
+#: ../fvwm/components/functions/Media:158
+#: ../fvwm/components/functions/Music:119
+msgid "Personal audio playlists"
+msgstr "个人音频播放列表"
+
+#: ../fvwm/components/functions/Media:159
+msgid "Personal video playlists"
+msgstr "个人视频播放列表"
+
+#: ../fvwm/components/functions/Media:175
+msgid "Choose playlist to remove"
+msgstr "选择要删除的播放列表"
+
+#: ../fvwm/components/functions/Media:177
+#: ../fvwm/components/functions/Media:178
+#: ../fvwm/components/functions/Media:196
+#: ../fvwm/components/functions/Media:197
+#: ../fvwm/components/functions/Music:112 ../fvwm/scripts/media_directories:24
+msgid "Browse Medias"
+msgstr "浏览媒体"
+
+#: ../fvwm/components/functions/Media:194
+msgid "Choose playlist to copy"
+msgstr "选择要复制的播放列表"
+
+#: ../fvwm/components/functions/Media:202
+#: ../fvwm/components/functions/Preferences-Menu:531
+msgid "Select channel list"
+msgstr "选择频道列表"
+
+#: ../fvwm/components/functions/Media:203
+#: ../fvwm/components/functions/Media:241
+#: ../fvwm/components/functions/Music-alsaplayer:80
+#: ../fvwm/components/functions/Music-alsaplayerdaemon:78
+#: ../fvwm/components/functions/Music-audacious:88
+#: ../fvwm/components/functions/Music-audacious:166
+#: ../fvwm/components/functions/Music-cmus:70
+#: ../fvwm/components/functions/Music-mocp:70
+#: ../fvwm/components/functions/Music-mocp:116
+#: ../fvwm/components/functions/Music-mpd:108
+#: ../fvwm/components/functions/Music-mpd:184
+#: ../fvwm/components/functions/Music-xmms2:129
+#: ../fvwm/components/functions/Music-xmms2:194
+msgid "Remove playlist"
+msgstr "删除播放列表"
+
+#: ../fvwm/components/functions/Media:204
+#: ../fvwm/components/functions/Media:240
+msgid "Copy playlist"
+msgstr "复制播放列表"
+
+#: ../fvwm/components/functions/Media:205
+#: ../fvwm/components/functions/Media:207
+#: ../fvwm/components/functions/Media:209
+#: ../fvwm/components/functions/Media:211
+#: ../fvwm/components/functions/Media:232
+#: ../fvwm/components/functions/Media:233
+#: ../fvwm/components/functions/Media:234
+#: ../fvwm/components/functions/Media:235
+msgid "Watch DVB"
+msgstr "观看 DVB"
+
+#: ../fvwm/components/functions/Media:206
+#: ../fvwm/components/functions/Media:208
+#: ../fvwm/components/functions/Media:210
+#: ../fvwm/components/functions/Media:212
+#: ../fvwm/components/functions/Media:470
+#: ../fvwm/components/functions/Media:471
+#: ../fvwm/components/functions/Media:472
+#: ../fvwm/components/functions/Media:473
+msgid "Channels"
+msgstr "频道"
+
+#: ../fvwm/components/functions/Media:213
+#: ../fvwm/components/functions/Media:237
+msgid "Load media file"
+msgstr "加载媒体文件"
+
+#: ../fvwm/components/functions/Media:214
+#: ../fvwm/components/functions/Media:236
+msgid "Play DVD"
+msgstr "播放 DVD"
+
+#: ../fvwm/components/functions/Media:215
+#: ../fvwm/components/functions/Media:238
+#: ../fvwm/components/functions/Music-alsaplayer:83
+#: ../fvwm/components/functions/Music-alsaplayerdaemon:81
+#: ../fvwm/components/functions/Music-audacious:92
+#: ../fvwm/components/functions/Music-audacious:162
+#: ../fvwm/components/functions/Music-cmus:72
+#: ../fvwm/components/functions/Music-cmus:131
+#: ../fvwm/components/functions/Music-mocp:73
+#: ../fvwm/components/functions/Music-mocp:114
+#: ../fvwm/components/functions/Music-mpd:103
+#: ../fvwm/components/functions/Music-mpd:178
+#: ../fvwm/components/functions/Music-xmms2:125
+#: ../fvwm/components/functions/Music-xmms2:188
+msgid "Load playlist"
+msgstr "载入播放列表"
+
+#: ../fvwm/components/functions/Media:216
+#: ../fvwm/components/functions/Media:242
+msgid "Show file name"
+msgstr "显示文件名"
+
+#: ../fvwm/components/functions/Media:325
+msgid "Start"
+msgstr "启动"
+
+#: ../fvwm/components/functions/Media:332
+#: ../fvwm/components/functions/Music-alsaplayer:150
+#: ../fvwm/components/functions/Music-alsaplayerdaemon:146
+msgid "+ 10 min"
+msgstr "+ 10 分钟"
+
+#: ../fvwm/components/functions/Media:333
+#: ../fvwm/components/functions/Music-alsaplayer:151
+#: ../fvwm/components/functions/Music-alsaplayerdaemon:147
+msgid "+  5 min"
+msgstr "+  5 分钟"
+
+#: ../fvwm/components/functions/Media:334
+#: ../fvwm/components/functions/Music-alsaplayer:152
+#: ../fvwm/components/functions/Music-alsaplayerdaemon:148
+msgid "+  3 min"
+msgstr "+  3 分钟"
+
+#: ../fvwm/components/functions/Media:335
+#: ../fvwm/compon...
 
[truncated message content]

[Fvwm-crystal-commits] SF.net SVN: fvwm-crystal:[1042] fvwm/Applications/Multimedia/Audio/ Engineering/MIDI/20~timidity~Timidity_Server_Stop

From: <dom...@us...> - 2020-09-17 01:52:52

Revision: 1042
          http://sourceforge.net/p/fvwm-crystal/code/1042
Author:   dominique_libre
Date:     2020-09-17 01:52:50 +0000 (Thu, 17 Sep 2020)
Log Message:
-----------
mess with the timidity menu

Added Paths:
-----------
    fvwm/Applications/Multimedia/Audio/Engineering/MIDI/20~timidity~Timidity_Server_Stop

Added: fvwm/Applications/Multimedia/Audio/Engineering/MIDI/20~timidity~Timidity_Server_Stop
===================================================================
--- fvwm/Applications/Multimedia/Audio/Engineering/MIDI/20~timidity~Timidity_Server_Stop	                        (rev 0)
+++ fvwm/Applications/Multimedia/Audio/Engineering/MIDI/20~timidity~Timidity_Server_Stop	2020-09-17 01:52:50 UTC (rev 1042)
@@ -0,0 +1,5 @@
+#!/bin/sh
+
+# timidity make a core dump with STOP, use KILL
+exec killall -9 timidity $@ 2>/dev/null
+


Property changes on: fvwm/Applications/Multimedia/Audio/Engineering/MIDI/20~timidity~Timidity_Server_Stop
___________________________________________________________________
Added: svn:executable
## -0,0 +1 ##
+*
\ No newline at end of property
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Fvwm-crystal-commits] SF.net SVN: fvwm-crystal:[1041] fvwm/Applications/Multimedia/Audio/ Engineering/MIDI

From: <dom...@us...> - 2020-09-17 01:44:35

Revision: 1041
          http://sourceforge.net/p/fvwm-crystal/code/1041
Author:   dominique_libre
Date:     2020-09-17 01:44:33 +0000 (Thu, 17 Sep 2020)
Log Message:
-----------
mess with the timidity menu

Modified Paths:
--------------
    ChangeLog

Added Paths:
-----------
    fvwm/Applications/Multimedia/Audio/Engineering/MIDI/20~timidity~Timidity_ALSA_output_Server_Start
    fvwm/Applications/Multimedia/Audio/Engineering/MIDI/20~timidity~Timidity_JACK_output_Server_Start
    fvwm/Applications/Multimedia/Audio/Engineering/MIDI/20~timidity~Timidity_System_Server_Start
    fvwm/Applications/Multimedia/Audio/Engineering/MIDI/20~timidity~Timidity_System_Server_Stop

Removed Paths:
-------------
    fvwm/Applications/Multimedia/Audio/Engineering/MIDI/20~timidity~Timidity_Server_Start
    fvwm/Applications/Multimedia/Audio/Engineering/MIDI/20~timidity~Timidity_Server_Stop

Modified: ChangeLog
===================================================================
--- ChangeLog	2020-09-17 01:33:41 UTC (rev 1040)
+++ ChangeLog	2020-09-17 01:44:33 UTC (rev 1041)
@@ -1,5 +1,10 @@
 ChangeLog for FVWM-Crystal
 
+jeudi 17 septembre 2020
+  fvwm/Applications/Mulltimedia/Audio/Engineering/MIDI/20~timidity*:
+  add user mode to the timidity ALSA sequencerr server menu (need
+  jack-dbus but easy to change in $FVWM_USERDIR).
+
 mardi 25 août 2020
   fvwm/scripts/desktop_mamager: Fix pmount menu.
 

Added: fvwm/Applications/Multimedia/Audio/Engineering/MIDI/20~timidity~Timidity_ALSA_output_Server_Start
===================================================================
--- fvwm/Applications/Multimedia/Audio/Engineering/MIDI/20~timidity~Timidity_ALSA_output_Server_Start	                        (rev 0)
+++ fvwm/Applications/Multimedia/Audio/Engineering/MIDI/20~timidity~Timidity_ALSA_output_Server_Start	2020-09-17 01:44:33 UTC (rev 1041)
@@ -0,0 +1,7 @@
+#!/bin/sh
+
+# need jack_control (jack_dbus)
+SRATE=$(jack_control dp|grep rate|sed 's;\(.*:\)\([0-9]*\)\(:.*\);\2;')
+exec FvwmCommand "AT Timidity++ \"timidity -iA -s${SRATE} -B2,8 -Os $@ 2>/dev/null\""
+
+


Property changes on: fvwm/Applications/Multimedia/Audio/Engineering/MIDI/20~timidity~Timidity_ALSA_output_Server_Start
___________________________________________________________________
Added: svn:executable
## -0,0 +1 ##
+*
\ No newline at end of property
Added: fvwm/Applications/Multimedia/Audio/Engineering/MIDI/20~timidity~Timidity_JACK_output_Server_Start
===================================================================
--- fvwm/Applications/Multimedia/Audio/Engineering/MIDI/20~timidity~Timidity_JACK_output_Server_Start	                        (rev 0)
+++ fvwm/Applications/Multimedia/Audio/Engineering/MIDI/20~timidity~Timidity_JACK_output_Server_Start	2020-09-17 01:44:33 UTC (rev 1041)
@@ -0,0 +1,5 @@
+#!/bin/sh
+
+# need jack_control (jack_dbus)
+SRATE=$(jack_control dp|grep rate|sed 's;\(.*:\)\([0-9]*\)\(:.*\);\2;')
+exec FvwmCommand "AT Timidity++ \"timidity -iA -s${SRATE} -B2,8 -Oj $@ 2>/dev/null\""


Property changes on: fvwm/Applications/Multimedia/Audio/Engineering/MIDI/20~timidity~Timidity_JACK_output_Server_Start
___________________________________________________________________
Added: svn:executable
## -0,0 +1 ##
+*
\ No newline at end of property
Deleted: fvwm/Applications/Multimedia/Audio/Engineering/MIDI/20~timidity~Timidity_Server_Start
===================================================================
--- fvwm/Applications/Multimedia/Audio/Engineering/MIDI/20~timidity~Timidity_Server_Start	2020-09-17 01:33:41 UTC (rev 1040)
+++ fvwm/Applications/Multimedia/Audio/Engineering/MIDI/20~timidity~Timidity_Server_Start	2020-09-17 01:44:33 UTC (rev 1041)
@@ -1,4 +0,0 @@
-#!/bin/sh
-
-exec sudo /etc/init.d/timidity start $@ 2>/dev/null
-

Deleted: fvwm/Applications/Multimedia/Audio/Engineering/MIDI/20~timidity~Timidity_Server_Stop
===================================================================
--- fvwm/Applications/Multimedia/Audio/Engineering/MIDI/20~timidity~Timidity_Server_Stop	2020-09-17 01:33:41 UTC (rev 1040)
+++ fvwm/Applications/Multimedia/Audio/Engineering/MIDI/20~timidity~Timidity_Server_Stop	2020-09-17 01:44:33 UTC (rev 1041)
@@ -1,4 +0,0 @@
-#!/bin/sh
-
-exec sudo /etc/init.d/timidity stop $@ 2>/dev/null
-

Added: fvwm/Applications/Multimedia/Audio/Engineering/MIDI/20~timidity~Timidity_System_Server_Start
===================================================================
--- fvwm/Applications/Multimedia/Audio/Engineering/MIDI/20~timidity~Timidity_System_Server_Start	                        (rev 0)
+++ fvwm/Applications/Multimedia/Audio/Engineering/MIDI/20~timidity~Timidity_System_Server_Start	2020-09-17 01:44:33 UTC (rev 1041)
@@ -0,0 +1,4 @@
+#!/bin/sh
+
+exec sudo /etc/init.d/timidity start $@ 2>/dev/null
+


Property changes on: fvwm/Applications/Multimedia/Audio/Engineering/MIDI/20~timidity~Timidity_System_Server_Start
___________________________________________________________________
Added: svn:executable
## -0,0 +1 ##
+*
\ No newline at end of property
Added: fvwm/Applications/Multimedia/Audio/Engineering/MIDI/20~timidity~Timidity_System_Server_Stop
===================================================================
--- fvwm/Applications/Multimedia/Audio/Engineering/MIDI/20~timidity~Timidity_System_Server_Stop	                        (rev 0)
+++ fvwm/Applications/Multimedia/Audio/Engineering/MIDI/20~timidity~Timidity_System_Server_Stop	2020-09-17 01:44:33 UTC (rev 1041)
@@ -0,0 +1,4 @@
+#!/bin/sh
+
+exec sudo /etc/init.d/timidity stop $@ 2>/dev/null
+


Property changes on: fvwm/Applications/Multimedia/Audio/Engineering/MIDI/20~timidity~Timidity_System_Server_Stop
___________________________________________________________________
Added: svn:executable
## -0,0 +1 ##
+*
\ No newline at end of property
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Fvwm-crystal-commits] SF.net SVN: fvwm-crystal:[1040] fvwm/scripts

From: <dom...@us...> - 2020-09-17 01:33:43

Revision: 1040
          http://sourceforge.net/p/fvwm-crystal/code/1040
Author:   dominique_libre
Date:     2020-09-17 01:33:41 +0000 (Thu, 17 Sep 2020)
Log Message:
-----------
Desktop manager: fix pmount menu

Modified Paths:
--------------
    ChangeLog
    fvwm/scripts/desktop_manager

Modified: ChangeLog
===================================================================
--- ChangeLog	2020-07-28 20:04:43 UTC (rev 1039)
+++ ChangeLog	2020-09-17 01:33:41 UTC (rev 1040)
@@ -1,5 +1,8 @@
 ChangeLog for FVWM-Crystal
 
+mardi 25 août 2020
+  fvwm/scripts/desktop_mamager: Fix pmount menu.
+
 Version 3.6.6
 -------------
 

Modified: fvwm/scripts/desktop_manager
===================================================================
--- fvwm/scripts/desktop_manager	2020-07-28 20:04:43 UTC (rev 1039)
+++ fvwm/scripts/desktop_manager	2020-09-17 01:33:41 UTC (rev 1040)
@@ -50,9 +50,9 @@
 # Preference menu
 echo "DestroyMenu /Preferences/IconLauncher" >> "${deskmanfile}"
 echo "AddToMenu /Preferences/IconLauncher" >> "${deskmanfile}"
-if [ -f pmount-gui ]
-	then echo "+ PMount \"Exec exec pmount-gui\"" >> "${deskmanfile}"
-	     echo "+ PUMount \"Exec exec pmount-gui -u\"" >> "${deskmanfile}"; fi
+if [ -f pmount-gui ] || [ -f /usr/bin/pmount-gui ] || [ -f /usr/local/bin/pmount-gui ]
+	then echo "+ \"PMount\" Exec exec pmount-gui" >> "${deskmanfile}"
+	     echo "+ \"PUMount\" Exec exec pmount-gui -u" >> "${deskmanfile}"; fi
 if [[ "${ShowPartitions}" == "yes" ]]
 then cat /etc/fstab|grep user|grep -v \#| awk '{print $2}'|while read line
 do  	partition=${line}

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Fvwm-crystal-commits] SF.net SVN: fvwm-crystal:[1039] fvwm/scripts

From: <dom...@us...> - 2020-07-28 20:04:45

Revision: 1039
          http://sourceforge.net/p/fvwm-crystal/code/1039
Author:   dominique_libre
Date:     2020-07-28 20:04:43 +0000 (Tue, 28 Jul 2020)
Log Message:
-----------
desktop manager: fix geometry and add EWMH placement and geometry support; add support for non transparent terminals; bump to 3.6.6

Modified Paths:
--------------
    ChangeLog
    NEWS
    addons/README
    fvwm/components/functions/About
    fvwm/scripts/desktop_manager

Added Paths:
-----------
    addons/Xdefaults.no_transparency
    addons/Xresources.no_transparency

Modified: ChangeLog
===================================================================
--- ChangeLog	2020-05-02 19:29:26 UTC (rev 1038)
+++ ChangeLog	2020-07-28 20:04:43 UTC (rev 1039)
@@ -1,8 +1,26 @@
 ChangeLog for FVWM-Crystal
 
-  fvwm/functions/bindings/Application-Icons-22-32: fix
-  libreoffice styles
+Version 3.6.6
+-------------
 
+mardi 28 juillet 2020
+  fvwm/scripts/desktop_mamager: fix widget geometry;
+  add EWMH support for its placement and geometry.
+  The desktop icons manager will be centerd according to
+  the y EWMH size, which is not necesarily the same than the
+  y center of the screen.
+  fvwm/functions/components/About,
+  NEWS: 3.6.6
+
+26 juin 2020
++ addons/Xdefaults.no_transparency,
++ addons/Xresources.no_transparency,
+  addons/README: add support for non transparent consoles.
+
+vendredi 1 mai 2020
+  fvwm/functions/styles/Application-Icons-22-32: fix
+  libreoffice styles.
+
 Version 3.6.5
 -------------
 

Modified: NEWS
===================================================================
--- NEWS	2020-05-02 19:29:26 UTC (rev 1038)
+++ NEWS	2020-07-28 20:04:43 UTC (rev 1039)
@@ -1,3 +1,29 @@
+Version 3.6.6
+-------------
+
+Fvwm Crystal 3.6.6 is out!
+
+This is a bug fix and new features release:
+
+- Fix libreofficce icons styles.
+
+- New addons/Xdefaults.no_transparency and Xresources.no_transparency files;
+  they add support for non transparent terminals.
+
+- Fix the size of the desktop manager (Icons on dekstop).
+  The widget was too big verticaly, which could be an issue when configured
+  to display a lot of icons.
+
+- Add complete EWMH support for the size and the placement of the desktop manager.
+  This fix collision with the magic button bar of the Custom recipe.
+  I never constated such collision, but it was possible in theory.
+
+  Anyway, this should be fixed now and this support, plus the geometry fix,
+  make the visual to lock better.
+
+Enjoy!
+Dominique Michel
+
 Version 3.6.5
 -------------
 

Modified: addons/README
===================================================================
--- addons/README	2020-05-02 19:29:26 UTC (rev 1038)
+++ addons/README	2020-07-28 20:04:43 UTC (rev 1039)
@@ -80,8 +80,14 @@
     Remove a strange urxwt binding that print garbage at stdout
     And more
 
-Xressources: Xressources example file to use with FVWM-Crystal.
+Xdefaults.no_transparency: same than Xdefault, but with setup
+    for non transparent virtual terminals.
+
+Xresources: Xressources example file to use with FVWM-Crystal.
     Read INSTALL in main Crystal folder.
 
+Xresources.no_transparency: same than Xressources, but with setup
+    for non transparent virtual terminals.
+
 Xsession: Xsession example file to use with FVWM-Crystal.
     Read INSTALL in main Crystal folder.

Added: addons/Xdefaults.no_transparency
===================================================================
--- addons/Xdefaults.no_transparency	                        (rev 0)
+++ addons/Xdefaults.no_transparency	2020-07-28 20:04:43 UTC (rev 1039)
@@ -0,0 +1,260 @@
+! $Header: /home/taviso/.Xdefaults,v 1.3 2004/04/20 19:52:21 taviso Exp $
+
+! TEST
+!XEmacs*font: -xos4-terminus-medium-r-normal--24-240-72-72-c-120-iso8859-1
+!XEmacs*font: xft:Bistream Vera Sans Mono:pixelsize=20
+XEmacs*font: xft:Monospace:pixelsize=20
+!XEmacs*boldFont: -*-terminus-bold-*-*-*-*-*-*-*-*-*-*-
+XEmacs*boldFont: xft:MonospaceBold:pixelsize=20
+!XEmacs*saveLines: 100000
+! TEST
+
+
+Aterm*colorBD: blue
+Aterm*colorUL: green
+! We don't want to screw up 'shopt login_shell'
+! when used in .bashrc or .bash_profile
+! If you get errors at terminal start up before the prompt
+! comment out the following line (it is 2 other similar lines downer):
+! Aterm*loginShell: true
+Aterm*scrollBar: false
+Aterm*foreground: white
+Aterm*background: #000052
+Aterm*transparent: false
+Aterm*tintingType: true
+Aterm*shading: 90
+Aterm*tinting: white
+!Aterm*font: -monotype-andale mono-medium-r-normal--0-0-0-0-m-0-iso8859-1
+!Aterm*boldFont: -*-terminus-bold-*-*-*-*-*-*-*-*-*-*-*
+Aterm*saveLines: 100000
+
+Rxvt*geometry: 80x60
+Rxvt*colorBD: blue
+Rxvt*colorUL: green
+! Rxvt*loginShell: true
+Rxvt*scrollBar: false
+Rxvt*foreground: white
+Rxvt*background: #577274
+!Rxvt*font: -xos4-terminus-medium-r-normal--24-240-72-72-c-120-iso8859-1
+!Rxvt*font: xft:Bistream Vera Sans Mono:pixelsize=20
+Rxvt*font: xft:Monospace:pixelsize=20
+!Rxvt*boldFont: -*-terminus-bold-*-*-*-*-*-*-*-*-*-*-
+Rxvt*boldFont: xft:MonospaceBold:pixelsize=20
+Rxvt*saveLines: 100000
+
+! ===========================================================================
+! URxvt resources
+
+! Remove garbage with Alt+NumLook+KP_Multiply
+URxvt.keysym.M-N-KP_Multiply: command:
+
+! Look similar to the Linux Console, with transparency
+! ---------------------------------------------------------------------------
+URxvt.background: black
+URxvt.foreground: white
+URxvt.shading: 30
+URxvt.tintColor: white
+URxvt.transparent: false
+URxvt.scrollBar: false
+
+! Font settings
+! URxvt uses UTF-8, so we don't need encoding-specific settings'
+! ---------------------------------------------------------------------------
+! 640x480
+!URxvt.font: xft:Monospace:pixelsize=10
+! 800x600
+!URxvt.font: xft:Monospace:pixelsize=10
+! 1024x768
+!URxvt.font: xft:Monospace:pixelsize=11
+! 1152x864
+!URxvt.font: xft:Monospace:pixelsize=12
+! 1280x1024
+!URxvt.font: xft:Monospace:pixelsize=14
+! 1600x1024
+URxvt.font: xft:Monospace:pixelsize=20
+! 1680x1280
+!URxvt.font: xft:Monospace:pixelsize=20
+
+! Colors similar to Linux console
+! ---------------------------------------------------------------------------
+URxvt.color0: rgb:0/0/0
+URxvt.color1: rgb:cc/00/00
+URxvt.color2: rgb:00/cc/00
+URxvt.color3: #bd5e01
+URxvt.color4: rgb:00/00/cc
+URxvt.color5: rgb:cc/00/cc
+URxvt.color6: rgb:00/cc/cc
+URxvt.color7: rgb:aa/aa/aa
+URxvt.color8: rgb:33/33/33
+URxvt.color9: rgb:ff/00/00
+URxvt.color10: rgb:00/ff/00
+URxvt.color11: rgb:ff/ff/00
+URxvt.color12: rgb:00/00/ff
+URxvt.color13: rgb:ff/00/ff
+URxvt.color14: rgb:00/ff/ff
+URxvt.color15: rgb:ff/ff/ff
+
+! Default URxvt colors
+! ---------------------------------------------------------------------------
+!URxvt.color0: black
+!URxvt.color1: red3
+!URxvt.color2: green3
+!URxvt.color3: brown
+!URxvt.color4: blue3
+!URxvt.color5: magenta3
+!URxvt.color6: cyan3
+!URxvt.color7: gray90
+!URxvt.color8: gray30
+!URxvt.color9: red
+!URxvt.color10: green
+!URxvt.color11: yellow
+!URxvt.color12: blue
+!URxvt.color13: magenta
+!URxvt.color14: cyan
+!URxvt.color15: white
+
+!ascii[-range]:class,...
+!XTerm*VT100*font: -misc-fixed-medium-r-semicondensed--13-120-75-75-c-60-iso10646-1
+!XTerm*VT100*widefont: -misc-fixed-medium-r-normal-ja-13-125-75-75-c-120-iso10646-1
+!XTerm*VT100*boldfont: -misc-fixed-bold-r-semicondensed--13-120-75-75-c-60-iso10646-1
+XTerm*VT100*Geometry: 80 50
+XTerm*charClass: 33:48,37:48,45-47:48,38:48,58:48
+!XTerm*faceName: Andale Mono Bold:size=11
+XTerm*faceName: Terminus
+XTerm*faceSize: 18
+XTerm*Background: #577274
+XTerm*Foreground: #ffffff
+XTerm*eightBitInput: false
+XTerm*eightBitControl: false
+XTerm*utf8: 1
+XTerm*ActiveIcon: true
+XTerm*AllowWindowOps: true
+! use mouse wheel in mutt
+Mutt*Translations: #override \
+        <Btn5Down>:string("\033[6~") \n\
+        <Btn4Down>:string("\033[5~")
+IDAPro*showBlinkAsBold: true
+! intercept mouse wheel events in ida
+IDAPro*Translations: #override \
+        <Btn5Down>:interpret("\033[?1002l\033[?1002r") string("\033[6~") \n\
+        <Btn5Up>:interpret("\033[?1002s\033[?1002h") \n\
+        <Btn4Down>:interpret("\033[?1002l\033[?1002r") string("\033[5~") \n\
+        <Btn4Up>:interpret("\033[?1002s\033[?1002h")
+
+
+HiddenConsole*faceName: Andale Mono Bold:size=11
+HiddenConsole*Background: #577274
+HiddenConsole*Foreground: #ffffff
+HiddenConsole*eightBitInput: false
+
+! look in /usr/share/cursors/xorg-x11
+! Xcursor.theme: whiteglass
+! Xcursor.theme: tuxcursor
+! Xcursor.theme: Blue
+! Xcursor.theme: Gold
+! Xcursor.theme : ComixCursors-Orange-Regular
+! Xcursor.theme : ComixCursors-Orange-Large
+Xcursor.theme : Oxygen_White_Big
+Xcursor.size: 48
+
+! XTerm*loginShell: true
+
+xosview*title: xosview
+xosview*captions: False
+xosview*labels: False
+xosview*usedlabels: False
+xosview*borderwidth: 0
+xosview*foreground: black
+xosview*transparent: False
+xosview*background: #c6c3c6
+
+xosview*cpuUserColor: #ffe4b5
+xosview*cpuNiceColor: #ffe4b5
+xosview*cpuSystemColor: #ffe4b5
+xosview*cpuInterruptColor: #ffe4b5
+xosview*cpuFreeColor: #c6cbd6
+xosview*cpuDecay: False
+xosview*cpuGraph: False
+xosview*cpuPriority: 2
+
+xosview*memFreeColor: #c6cbd6
+xosview*memInactiveColor: #99b0de
+xosview*memUsedColor: #99b0de
+xosview*memBufferColor: #c6cbd6
+xosview*memCacheColor: #c6cbd6
+xosview*memSharedColor: #99b0de
+xosview*memTextColor: #99b0de
+xosview*memOtherColor: #99b0de
+xosview*memActiveColor: #99b0de
+xosview*memGraph: False
+
+xosview*netBackground: #c6cbd6
+xosview*netInColor: #b5c7b5
+xosview*netOutColor: #b5c7b5
+xosview*netBandwidth: 120000
+xosview*netDecay: False
+xosview*netGraph: False
+
+xosview*swapFreeColor: #c6cbd6
+xosview*swapUsedColor: #7ec0ee
+
+xosview*diskIdleColor: #c6cbd6
+xosview*diskReadColor: #b5aeff
+xosview*diskWriteColor: #b5aeff
+xosview*diskUsedColor: #b5aeff
+xosview*diskGraph: False
+xosview*diskDecay: False
+
+xosview*battery: False
+xosview*gfx: False
+xosview*net: False
+xosview*page: False
+xosview*disk: False
+xosview*interrupts: False
+xosview*load: False
+xosview*swap: False
+xosview*lmstemp: False
+xosview*cpu: False
+xosview*mem: False
+
+*beNiceToColormap: False
+!*shapeStyle: Rectangle
+!*Text.borderWidth: 0
+!*SimpleMenu.borderWidth: 0
+!*Paned.internalBorderWidth: 0
+!SmeBSB.shadowWidth:  0
+
+!## NETSCAPE
+Netscape*drawingArea.translations:  #replace    \
+<Btn1Down>:           ArmLink()   \n\
+<Btn2Down>:           ArmLink()   \n\
+~Shift<Btn1Up>:       ActivateLink()  \n\
+~Shift<Btn2Up>:       ActivateLink(new-window)  \
+DisarmLink()    \n\
+Shift<Btn1Up>:        ActivateLink(save-only)  \
+DisarmLink()    \n\
+Shift<Btn2Up>:        ActivateLink(save-only)  \
+DisarmLink()    \n\
+<Btn1Motion>:             DisarmLinkIfMoved()  \n\
+<Btn2Motion>:             DisarmLinkIfMoved()  \n\
+<Btn3Motion>:             DisarmLinkIfMoved()  \n\
+<Motion>:             DescribeLink()  \n\
+<Btn3Down>:           xfeDoPopup()    \n\
+<Btn3Up>:             ActivatePopup() \n\
+Ctrl<Btn4Down>: PageUp()\n\
+Ctrl<Btn5Down>: PageDown()\n\
+Shift<Btn4Down>: LineUp()\n\
+Shift<Btn5Down>: LineDown()\n\
+None<Btn4Down>: LineUp()LineUp()LineUp()LineUp()LineUp()LineUp()\n\
+None<Btn5Down>: LineDown()LineDown()LineDown()LineDown()LineDown()LineDown()\n\
+Alt<Btn4Down>: xfeDoCommand(forward)\n\
+Alt<Btn5Down>: xfeDoCommand(back)\n
+
+      Netscape*globalNonTextTranslations: #override\n\
+      Shift<Btn4Down>: LineUp()\n\
+      Shift<Btn5Down>: LineDown()\n\
+      None<Btn4Down>:LineUp()LineUp()LineUp()LineUp()LineUp()LineUp()\n\
+      None<Btn5Down>:LineDown()LineDown()LineDown()LineDown()LineDown()LineDown()\n\
+      Alt<Btn4Down>: xfeDoCommand(forward)\n\
+      Alt<Btn5Down>: xfeDoCommand(back)\n
+

Added: addons/Xresources.no_transparency
===================================================================
--- addons/Xresources.no_transparency	                        (rev 0)
+++ addons/Xresources.no_transparency	2020-07-28 20:04:43 UTC (rev 1039)
@@ -0,0 +1,202 @@
+! X resources used in FVWM-Crystal project (http://fvwm-crystal.berlios.de/)
+! Written by: Maciej Delmanowski <ha...@po...>
+! Modified for non transparent virtual terminals dom...@us...>
+! Put this file as ~/.Xresources in your home directory
+
+! ===========================================================================
+! XTerm resources
+
+! Look similar to the Linux Console
+! ---------------------------------------------------------------------------
+XTerm*background: black
+XTerm*foreground: white
+XTerm*cursorColor: yellow
+XTerm*Title: XTerm
+XTerm*scrollBar: false
+XTerm*saveLines: 5000
+
+! Fonts for different resolutions and character encodings
+! By default English encoding is set. How to set different encodings:
+! - Polish encoding: apply "-iso8859-2" at the end of the font string
+! ---------------------------------------------------------------------------
+! Englsh encoding
+! 640x480
+!XTerm*font: -misc-fixed-medium-r-normal-*-12-*
+! 800x600
+!XTerm*font: -misc-fixed-medium-r-normal-*-13-*
+! 1024x768
+XTerm*font: -misc-fixed-medium-r-normal-*-14-*
+! 1152x864
+!XTerm*font: -misc-fixed-medium-r-normal-*-14-*
+! 1280x1024
+!XTerm*font: -misc-fixed-medium-r-normal-*-18-*
+
+! Colors similar to those used in Linux Console (ttyX)
+! ---------------------------------------------------------------------------
+XTerm*color0: rgb:0/0/0
+XTerm*color1: rgb:cc/00/00
+XTerm*color2: rgb:00/cc/00
+XTerm*color3: #bd5e01
+XTerm*color4: rgb:00/00/cc
+XTerm*color5: rgb:cc/00/cc
+XTerm*color6: rgb:00/cc/cc
+XTerm*color7: rgb:aa/aa/aa
+XTerm*color8: rgb:33/33/33
+XTerm*color9: rgb:ff/00/00
+XTerm*color10: rgb:00/ff/00
+XTerm*color11: rgb:ff/ff/00
+XTerm*color12: rgb:00/00/ff
+XTerm*color13: rgb:ff/00/ff
+XTerm*color14: rgb:00/ff/ff
+XTerm*color15: rgb:ff/ff/ff
+
+! Default XTerm colors
+! ---------------------------------------------------------------------------
+!XTerm*color0: black
+!XTerm*color1: red3
+!XTerm*color2: green3
+!XTerm*color3: brown
+!XTerm*color4: blue3
+!XTerm*color5: magenta3
+!XTerm*color6: cyan3
+!XTerm*color7: gray90
+!XTerm*color8: gray30
+!XTerm*color9: red
+!XTerm*color10: green
+!XTerm*color11: yellow
+!XTerm*color12: blue
+!XTerm*color13: magenta
+!XTerm*color14: cyan
+!XTerm*color15: white
+
+! Specific settings for QuakeConsole (Alt+`), to get better effect
+! ---------------------------------------------------------------------------
+! 800x600
+!QuakeConsoleNeedsUniqueName*internalBorder: 0
+! 1024x768
+!QuakeConsoleNeedsUniqueName*internalBorder: 0
+! 1152x864
+!QuakeConsoleNeedsUniqueName*internalBorder: 1
+! 1280x1024
+!QuakeConsoleNeedsUniqueName*internalBorder: 0
+
+! Specific settings for FvwmConsole, to remove the menubar
+!FvwmConsole*toolBar: false
+
+! ===========================================================================
+! Aterm resources
+! Aterm can use XTerm's resources, so look also in there
+! Here are only settings specific to Aterm
+
+! Aterm supports transparency, so it's turned off by default
+! ---------------------------------------------------------------------------
+Aterm.transparent: false
+Aterm.shading: 30
+
+! Specific settings for Aterm-based QuakeConsole
+! ---------------------------------------------------------------------------
+! 1152x864
+!QuakeConsoleNeedsUniqueName*font: -misc-fixed-medium-r-normal-*-12-*
+! 1280x1024
+!QuakeConsoleNeedsUniqueName*font: -misc-fixed-medium-r-normal-*-14-*
+
+
+! ===========================================================================
+! mrxvt resources
+! mrxvt can use XTerm's resources, so look also in there
+! Here are only settings specific to mrxvt
+
+! Similar look to the Linux Console, with corresponding tabs
+! ---------------------------------------------------------------------------
+mrxvt.initTermNumber: 1
+mrxvt.protectSecondary: true
+mrxvt.syncTabTitle: true
+mrxvt.bottomTabbar: true
+mrxvt.hideButtons: true
+mrxvt.tabForeground: white
+mrxvt.tabBackground: black
+mrxvt.itabForeground: white
+mrxvt.itabBackground: #555555
+
+! Settings for mrxvt-based QuakeConsole - strongly recommended :)
+! ---------------------------------------------------------------------------
+!QuakeConsoleNeedsUniqueName.initTermNumber: 1
+!QuakeConsoleNeedsUniqueName.protectSecondary: true
+!QuakeConsoleNeedsUniqueName.syncTabTitle: true
+!QuakeConsoleNeedsUniqueName.bottomTabbar: true
+!QuakeConsoleNeedsUniqueName.hideButtons: true
+!QuakeConsoleNeedsUniqueName.tabForeground: white
+!QuakeConsoleNeedsUniqueName.tabBackground: black
+!QuakeConsoleNeedsUniqueName.itabForeground: white
+!QuakeConsoleNeedsUniqueName.itabBackground: #555555
+
+
+! ===========================================================================
+! URxvt resources
+
+! Look similar to the Linux Console, with transparency
+! ---------------------------------------------------------------------------
+URxvt.background: black
+URxvt.foreground: white
+! URxvt shading: 0 to 99 darkens, 101 to 200 lightens
+URxvt.shading: 30
+URxvt.tintColor: white
+URxvt.inheritPixmap: false
+URxvt.scrollBar: false
+
+! Font settings
+! URxvt uses UTF-8, so we don't need encoding-specific settings
+! ---------------------------------------------------------------------------
+! 640x480
+!URxvt.font: xft:Monospace:pixelsize=10
+! 800x600
+!URxvt.font: xft:Monospace:pixelsize=10
+! 1024x768
+URxvt.font: xft:Monospace:pixelsize=11
+! 1152x864
+!URxvt.font: xft:Monospace:pixelsize=12
+! 1280x1024
+!URxvt.font: xft:Monospace:pixelsize=14
+
+! Colors similar to Linux console
+! ---------------------------------------------------------------------------
+URxvt.color0: rgb:0/0/0
+URxvt.color1: rgb:cc/00/00
+URxvt.color2: rgb:00/cc/00
+URxvt.color3: #bd5e01
+URxvt.color4: rgb:00/00/cc
+URxvt.color5: rgb:cc/00/cc
+URxvt.color6: rgb:00/cc/cc
+URxvt.color7: rgb:aa/aa/aa
+URxvt.color8: rgb:33/33/33
+URxvt.color9: rgb:ff/00/00
+URxvt.color10: rgb:00/ff/00
+URxvt.color11: rgb:ff/ff/00
+URxvt.color12: rgb:00/00/ff
+URxvt.color13: rgb:ff/00/ff
+URxvt.color14: rgb:00/ff/ff
+URxvt.color15: rgb:ff/ff/ff
+
+! Default URxvt colors
+! ---------------------------------------------------------------------------
+!URxvt.color0: black
+!URxvt.color1: red3
+!URxvt.color2: green3
+!URxvt.color3: brown
+!URxvt.color4: blue3
+!URxvt.color5: magenta3
+!URxvt.color6: cyan3
+!URxvt.color7: gray90
+!URxvt.color8: gray30
+!URxvt.color9: red
+!URxvt.color10: green
+!URxvt.color11: yellow
+!URxvt.color12: blue
+!URxvt.color13: magenta
+!URxvt.color14: cyan
+!URxvt.color15: white
+
+! Specific settings for QuakeConsole
+! ---------------------------------------------------------------------------
+! 1280x1024
+!QuakeConsoleNeedsUniqueName.font: xft:Monospace:pixelsize=12

Modified: fvwm/components/functions/About
===================================================================
--- fvwm/components/functions/About	2020-05-02 19:29:26 UTC (rev 1038)
+++ fvwm/components/functions/About	2020-07-28 20:04:43 UTC (rev 1039)
@@ -5,7 +5,7 @@
 *About: Line center
 *About: Text "FVWM-Crystal"
 *About: Line center
-*About: Text "$[gt.Version]: 3.6.5"
+*About: Text "$[gt.Version]: 3.6.6"
 *About: Line center
 *About: Text "Magic Star"
 *About: Line center

Modified: fvwm/scripts/desktop_manager
===================================================================
--- fvwm/scripts/desktop_manager	2020-05-02 19:29:26 UTC (rev 1038)
+++ fvwm/scripts/desktop_manager	2020-07-28 20:04:43 UTC (rev 1039)
@@ -16,6 +16,7 @@
 
 # We must calculate the size of the button box {{{1
 # Home: 1 icon, XDG user dirs: 8 icons, partitions: variable, directories: variable
+# Number of icons to show: {{{2
 IconNumber=1
 if [[ "${ShowXDG}" == "yes" ]]; then IconNumber=9; fi
 if [[ "${ShowPartitions}" == "yes" ]]
@@ -23,13 +24,28 @@
 		IconNumber="$((${IconNumber}+`wc -l < ${7}`))"
 		IconNumber="$((${IconNumber}+`wc -l < ${HOME}/.fvwm-crystal/preferences/ShowDirectories`))"
 fi
-IconRowsNumber="$((((${6}-((${EWMH_BS_Panel_Top}+${EWMH_BS_Panel_Bottom}))))/50))"
-tmpvar=$((${IconNumber}/${IconRowsNumber}))
-if [[ "$((${IconRowsNumber}*${tmpvar}))" != "${IconNumber}" ]]
-	then IconColumnsNumber="$((${tmpvar}+1))"
-	else IconColumnsNumber="${tmpvar}"
+# Available number of icons on the EWMH screen height: {{{2
+if [ "${10}" -gt "${15}" ]
+	then EWMHTop="${10}"
+	else EWMHTop="${15}"
 fi
+if [ "${11}" -gt "${16}" ]
+	then EWMHBottom="${11}"
+	else EWMHBottom="${16}"
+fi
+ScreenIconRowsNumber="$((((${6}-((${EWMHTop}+${EWMHBottom}))))/48))"
+# Widget column and row sizes {{{2
+Rest="$((${IconNumber}%${ScreenIconRowsNumber}))"
+if [ "${Rest}" != "0" ]
+	then IconColumnsNumber="$((((${IconNumber}/${ScreenIconRowsNumber}))+1))"
+	else IconColumnsNumber="$((${IconNumber}/${ScreenIconRowsNumber}))"
+fi
 ButtonWidth=$((${IconColumnsNumber}*48))
+Rest="$((${IconNumber}%${IconColumnsNumber}))"
+if [ "${Rest}" != "0" ]
+	then IconRowsNumber="$((((${IconNumber}/${IconColumnsNumber}))+1))"
+	else IconRowsNumber="$((${IconNumber}/${IconColumnsNumber}))"
+fi
 
 # Preference menu
 echo "DestroyMenu /Preferences/IconLauncher" >> "${deskmanfile}"
@@ -135,8 +151,9 @@
 echo "+ I KillModule FvwmButtons DesktopIcons" >> "${deskmanfile}"
 echo "+ I DestroyModuleConfig DesktopIcons: *" >> "${deskmanfile}"
 if [ "$1" = "-" ]
-	then echo "+ I *DesktopIcons: Geometry ${ButtonWidth}x$((${IconRowsNumber}*48))+$((${12}-${ButtonXPlace}))+${15}" >> "${deskmanfile}"
-	else echo "+ I *DesktopIcons: Geometry ${ButtonWidth}x$((${IconRowsNumber}*48))+${ButtonXPlace}+${15}" >> "${deskmanfile}"
+# widget at y center => y = (EWMHTop + ((vp.height - (EWMHTop + EWMHBottom + (IconsRowsNumber * 48))) / 2))
+	then echo "+ I *DesktopIcons: Geometry ${ButtonWidth}x$((${IconRowsNumber}*48))+$((${12}-${ButtonXPlace}))+$((${EWMHTop}+((((${6}-((${EWMHTop}+${EWMHBottom}+((${IconRowsNumber}*48))))))/2))))" >> "${deskmanfile}"
+	else echo "+ I *DesktopIcons: Geometry ${ButtonWidth}x$((${IconRowsNumber}*48))+${ButtonXPlace}+$((${EWMHTop}+((((${6}-((${EWMHTop}+${EWMHBottom}+((${IconRowsNumber}*48))))))/2))))" >> "${deskmanfile}"
 fi
 echo "+ I *DesktopIcons: Padding 1 1" >> "${deskmanfile}"
 echo "+ I *DesktopIcons: BoxSize Fixed" >> "${deskmanfile}"

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Fvwm-crystal-commits] SF.net SVN: fvwm-crystal:[1037] bin

From: <dom...@us...> - 2020-04-12 11:56:30

Revision: 1037
          http://sourceforge.net/p/fvwm-crystal/code/1037
Author:   dominique_libre
Date:     2020-04-12 11:56:28 +0000 (Sun, 12 Apr 2020)
Log Message:
-----------
Comment the style fix

Modified Paths:
--------------
    ChangeLog
    NEWS
    bin/fvwm-crystal.generate-menu

Modified: ChangeLog
===================================================================
--- ChangeLog	2020-04-12 11:36:03 UTC (rev 1036)
+++ ChangeLog	2020-04-12 11:56:28 UTC (rev 1037)
@@ -12,8 +12,10 @@
 + fvwm/Applications/...: Add some applications.
   fvwm/functions/components/About: 3.6.4
   bin/fvwm-crystal.generate-menu;
-  fvwm/scripts/CheckMenuDate: fix for when new dessktop file date is older
+  fvwm/scripts/CheckMenuDate: fix for when new desktop file date is older
   than their installation date.
+  bin/fvwm-crystal.generate-menu: fix the styles not neededd anymore,
+  comment it.
 
 vendreedi 10 avril 2020
 + fvwm/scripts/SetGtkFont;

Modified: NEWS
===================================================================
--- NEWS	2020-04-12 11:36:03 UTC (rev 1036)
+++ NEWS	2020-04-12 11:56:28 UTC (rev 1037)
@@ -19,6 +19,7 @@
 - Automatic generation of the application menu: Fix for when
   the date of newly installed desktop files is older that
   their installation date.
+  Comment the style fix, it is not needed anymore.
 
 That's all!
 Dominique Michel

Modified: bin/fvwm-crystal.generate-menu
===================================================================
--- bin/fvwm-crystal.generate-menu	2020-04-12 11:36:03 UTC (rev 1036)
+++ bin/fvwm-crystal.generate-menu	2020-04-12 11:56:28 UTC (rev 1037)
@@ -1112,8 +1112,8 @@
 	echo "Reloading the menu..."
 	echo "SetEnv DateLastApp \"`stat --printf="%y\n" ${DesktopDir} | sort -n -r | head -1`\"" > ${FVWM_USERDIR}/preferences/DateLastApp
 	FvwmCommand 'ReloadRecipe'
-	FvwmCommand 'Include components/styles/Generated-Application-Icons-22-32'
-	FvwmCommand 'Include components/styles/Application-Icons-22-32'
+#	FvwmCommand 'Include components/styles/Generated-Application-Icons-22-32'
+#	FvwmCommand 'Include components/styles/Application-Icons-22-32'
 else
 	echo "You will find the list of the desktop files with non valid Main Category in non_valid_cat.log"
 fi

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Fvwm-crystal-commits] SF.net SVN: fvwm-crystal:[1036] bin

From: <dom...@us...> - 2020-04-12 11:36:04

Revision: 1036
          http://sourceforge.net/p/fvwm-crystal/code/1036
Author:   dominique_libre
Date:     2020-04-12 11:36:03 +0000 (Sun, 12 Apr 2020)
Log Message:
-----------
Oops: update the menu generation script.

Modified Paths:
--------------
    ChangeLog
    bin/fvwm-crystal.generate-menu

Modified: ChangeLog
===================================================================
--- ChangeLog	2020-04-12 11:16:11 UTC (rev 1035)
+++ ChangeLog	2020-04-12 11:36:03 UTC (rev 1036)
@@ -11,6 +11,7 @@
 + fvwm/icons/...: Add icons for xpenguins and xsnow
 + fvwm/Applications/...: Add some applications.
   fvwm/functions/components/About: 3.6.4
+  bin/fvwm-crystal.generate-menu;
   fvwm/scripts/CheckMenuDate: fix for when new dessktop file date is older
   than their installation date.
 

Modified: bin/fvwm-crystal.generate-menu
===================================================================
--- bin/fvwm-crystal.generate-menu	2020-04-12 11:16:11 UTC (rev 1035)
+++ bin/fvwm-crystal.generate-menu	2020-04-12 11:36:03 UTC (rev 1036)
@@ -1107,7 +1107,7 @@
 
 if [ $# -ge 2 ]; then
 	rm non_valid_cat.log
-	DesktopDir=`awk -v ORS="" '!/(#|^$)/{print $0"/* "}' $USERPREFS/DesktopDirs`
+	DesktopDir=`awk -v ORS="" '!/(#|^$)/{print $0" "}' $USERPREFS/DesktopDirs`
 	echo "Saving the date of the last installed desktop file in ${FVWM_USERDIR}/preferences/DateLastApp"
 	echo "Reloading the menu..."
 	echo "SetEnv DateLastApp \"`stat --printf="%y\n" ${DesktopDir} | sort -n -r | head -1`\"" > ${FVWM_USERDIR}/preferences/DateLastApp

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Fvwm-crystal-commits] SF.net SVN: fvwm-crystal:[1035] fvwm/scripts

From: <dom...@us...> - 2020-04-12 11:16:12

Revision: 1035
          http://sourceforge.net/p/fvwm-crystal/code/1035
Author:   dominique_libre
Date:     2020-04-12 11:16:11 +0000 (Sun, 12 Apr 2020)
Log Message:
-----------
app menu generation: fix for date of desktop file older than their installation

Modified Paths:
--------------
    ChangeLog
    NEWS
    fvwm/scripts/CheckMenuDate

Modified: ChangeLog
===================================================================
--- ChangeLog	2020-04-12 10:40:32 UTC (rev 1034)
+++ ChangeLog	2020-04-12 11:16:11 UTC (rev 1035)
@@ -11,6 +11,8 @@
 + fvwm/icons/...: Add icons for xpenguins and xsnow
 + fvwm/Applications/...: Add some applications.
   fvwm/functions/components/About: 3.6.4
+  fvwm/scripts/CheckMenuDate: fix for when new dessktop file date is older
+  than their installation date.
 
 vendreedi 10 avril 2020
 + fvwm/scripts/SetGtkFont;

Modified: NEWS
===================================================================
--- NEWS	2020-04-12 10:40:32 UTC (rev 1034)
+++ NEWS	2020-04-12 11:16:11 UTC (rev 1035)
@@ -16,6 +16,10 @@
 
 - Added icon styles for the Brave browser.
 
+- Automatic generation of the application menu: Fix for when
+  the date of newly installed desktop files is older that
+  their installation date.
+
 That's all!
 Dominique Michel
 

Modified: fvwm/scripts/CheckMenuDate
===================================================================
--- fvwm/scripts/CheckMenuDate	2020-04-12 10:40:32 UTC (rev 1034)
+++ fvwm/scripts/CheckMenuDate	2020-04-12 11:16:11 UTC (rev 1035)
@@ -1,7 +1,7 @@
 #!/bin/bash
 # Check for new desktop files and generate the menu if yes.
 
-DesktopDir=`awk -v ORS="" '!/(#|^$)/{print $0"/* "}' ${FVWM_USERDIR}/preferences/DesktopDirs`
+DesktopDir=`awk -v ORS="" '!/(#|^$)/{print $0" "}' ${FVWM_USERDIR}/preferences/DesktopDirs`
 #echo "$DesktopDir"
 #echo "DateLastApp=$DateLastApp"
 

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Fvwm-crystal-commits] SF.net SVN: fvwm-crystal:[1034] man

From: <dom...@us...> - 2020-04-12 10:40:33

Revision: 1034
          http://sourceforge.net/p/fvwm-crystal/code/1034
Author:   dominique_libre
Date:     2020-04-12 10:40:32 +0000 (Sun, 12 Apr 2020)
Log Message:
-----------
Update FAQ with panel font prefs to GTK

Modified Paths:
--------------
    asciidoc/FAQ
    doc/html/FAQ.html
    man/FVWMCrystalFAQ.1

Modified: asciidoc/FAQ
===================================================================
--- asciidoc/FAQ	2020-04-12 10:05:51 UTC (rev 1033)
+++ asciidoc/FAQ	2020-04-12 10:40:32 UTC (rev 1034)
@@ -2,7 +2,7 @@
 ===================
 :doctype: manpage
 :man source:   FAQ
-:man version:  3.4.0
+:man version:  3.6.4
 :man manual:   FVWM-Crystal
 
 NAME
@@ -470,6 +470,8 @@
 
 After selecting your favorite GTK+ theme with lxappearance, run qtconfig to select the Default theme to use the system settings, or the GTK+ style to apply your GTK+ settings to QT.
 
+Fram fvwm-crystal-3.6.4, the Panel font preferences will be applyed to GTK+ 2 and 3 as its default font.
+
 We are now in 2017 and time have changed. We are now in the QT5 time and qtconfig don't exist anymore. First install qt5ct and, if possible, qt5-styleplugins. 
 
 With qt5ct, you can set the theme, some of them have both gtk+ and qt versions and you can set them here for qt. When qt5-styleplugins is installed, you can choose the gtk2 theme and any time you change the gtk+ theme, as example with lxappearance, qt will use it. Be aware the gtk theme will work best if it have both gtk2 and gtk3 versions.

Modified: doc/html/FAQ.html
===================================================================
--- doc/html/FAQ.html	2020-04-12 10:05:51 UTC (rev 1033)
+++ doc/html/FAQ.html	2020-04-12 10:40:32 UTC (rev 1034)
@@ -1299,6 +1299,7 @@
 <div class="paragraph"><p>A: This is not related to FVWM-Crystal, but anyway, the look of the applications can be a little bit difficult to configure if you don&#8217;t have Gnome and KDE installed, and don&#8217;t know how to proceed.</p></div>
 <div class="paragraph"><p>First, you must install lxappearance and qtconfig. At that time of writing (May 2013), lxappearance have a bug that imply any custom color change will be lost. But anyway, it is the best light application to change the GTK+ themes, icons, etc. If you want to customize the colors, you can always edit ~/.gtkrc-2.0 directly.</p></div>
 <div class="paragraph"><p>After selecting your favorite GTK+ theme with lxappearance, run qtconfig to select the Default theme to use the system settings, or the GTK+ style to apply your GTK+ settings to QT.</p></div>
+<div class="paragraph"><p>Fram fvwm-crystal-3.6.4, the Panel font preferences will be applyed to GTK+ 2 and 3 as its default font.</p></div>
 <div class="paragraph"><p>We are now in 2017 and time have changed. We are now in the QT5 time and qtconfig don&#8217;t exist anymore. First install qt5ct and, if possible, qt5-styleplugins.</p></div>
 <div class="paragraph"><p>With qt5ct, you can set the theme, some of them have both gtk+ and qt versions and you can set them here for qt. When qt5-styleplugins is installed, you can choose the gtk2 theme and any time you change the gtk+ theme, as example with lxappearance, qt will use it. Be aware the gtk theme will work best if it have both gtk2 and gtk3 versions.</p></div>
 <div class="paragraph"><p>For all that to work, you may have to set 2 variables, as example in <sub>/.xinitrc or </sub>/.bashprofile:</p></div>
@@ -1404,7 +1405,7 @@
 <div id="footer">
 <div id="footer-text">
 Last updated
- 2020-04-12 04:26:39 CEST
+ 2020-04-12 12:37:17 CEST
 </div>
 </div>
 </body>

Modified: man/FVWMCrystalFAQ.1
===================================================================
--- man/FVWMCrystalFAQ.1	2020-04-12 10:05:51 UTC (rev 1033)
+++ man/FVWMCrystalFAQ.1	2020-04-12 10:40:32 UTC (rev 1034)
@@ -4,10 +4,10 @@
 .\" Generator: DocBook XSL Stylesheets v1.79.1 <http://docbook.sf.net/>
 .\"      Date: 04/12/2020
 .\"    Manual: FVWM-Crystal
-.\"    Source: FAQ 3.4.0
+.\"    Source: FAQ 3.6.4
 .\"  Language: English
 .\"
-.TH "FVWM\-CRYSTAL\-FAQ" "1" "04/12/2020" "FAQ 3\&.4\&.0" "FVWM\-Crystal"
+.TH "FVWM\-CRYSTAL\-FAQ" "1" "04/12/2020" "FAQ 3\&.6\&.4" "FVWM\-Crystal"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
@@ -969,6 +969,8 @@
 .sp
 After selecting your favorite GTK+ theme with lxappearance, run qtconfig to select the Default theme to use the system settings, or the GTK+ style to apply your GTK+ settings to QT\&.
 .sp
+Fram fvwm\-crystal\-3\&.6\&.4, the Panel font preferences will be applyed to GTK+ 2 and 3 as its default font\&.
+.sp
 We are now in 2017 and time have changed\&. We are now in the QT5 time and qtconfig don\(cqt exist anymore\&. First install qt5ct and, if possible, qt5\-styleplugins\&.
 .sp
 With qt5ct, you can set the theme, some of them have both gtk+ and qt versions and you can set them here for qt\&. When qt5\-styleplugins is installed, you can choose the gtk2 theme and any time you change the gtk+ theme, as example with lxappearance, qt will use it\&. Be aware the gtk theme will work best if it have both gtk2 and gtk3 versions\&.

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Flat | Threaded

1 2 3 .. 43 > >> (Page 1 of 43)