Hi Dan!
attached are some patches to fix the following:
fvwm-menu-desktop:
- fix problem with python-xdg versions > 0.19 (Dominique reported this
some days ago)
- localization support for gettext -> 'Regenerate XDG menu(s)'
fvwm-menu-desktop-config.fpl:
- localization support for gettext
- add query to check if no menus found -> message occur
fvwm.pot:
- update to support translations for fvwm-menu-desktop and
fvwm-menu-desktop-config.fpl
fvwm.de.po:
- update of the German translation
@Dominique:
Would you update the french translation file, please?
@Jesús J. Guerrero Botella:
Is it possible that you would do the translation for the Spanish po?
@all others:
Who has time to update the rest of the pos?
-> ar
-> ru
-> sv_SE
-> zh_CN
-> zh_TW
Thanks,
Thomas
--- ../cvs/fvwm/po/fvwm.de.po 2012-09-07 23:58:21.019311436 +0200
+++ fvwm.de.po 2013-06-15 20:28:41.297731413 +0200
@@ -1,14 +1,15 @@
# German translations for fvwm package
-# Copyright (C) 2003 fvwm workers
+# Copyright (C) 2013 fvwm workers
# This file is distributed under the same license as the fvwm package.
# Andrei Mitrofanow <smile...@web.de>, 2003.
+# Thomas Funk <t.f...@web.de>, 2013
#
msgid ""
msgstr ""
"Project-Id-Version: fvwm\n"
"POT-Creation-Date: 2002-11-28 14:23+0100\n"
-"PO-Revision-Date: 2002-11-23 06:00+0100\n"
-"Last-Translator: Andrei Mitrofanow <smile...@web.de>\n"
+"PO-Revision-Date: 2013-06-15 20:00+0200\n"
+"Last-Translator: Thomas Funk <t.f...@web.de>\n"
"Language-Team: German\n"
"Language: \n"
"MIME-Version: 1.0\n"
@@ -318,3 +319,163 @@
#. ./modules/FvwmForm/FvwmForm-Setup.in: line 55
msgid "Copy Config File(s)"
msgstr "Konfigurationsdateien kopieren"
+
+#. ./bin/fvwm-menu-desktop-config.fpl.in: line 51
+msgid "Fvwm Menu Desktop Config"
+msgstr "Fvwm Menu Desktop Konfiguration"
+
+#. ./bin/fvwm-menu-desktop-config.fpl.in: line 58
+msgid "Multiple Menu"
+msgstr "Mehrfachmenü"
+
+#. ./bin/fvwm-menu-desktop-config.fpl.in: line 66
+msgid "Menus in"
+msgstr "Menüs in"
+
+#. ./bin/fvwm-menu-desktop-config.fpl.in: line 95
+msgid "No menus found! Check why from within a terminal with"
+msgstr "Keine Menüs gefunden! In einem Terminal checken warum mit"
+
+#. ./bin/fvwm-menu-desktop-config.fpl.in: line 107
+msgid "General Options"
+msgstr "Generelle Optionen"
+
+#. ./bin/fvwm-menu-desktop-config.fpl.in: line 110
+msgid "Use Icons in Menus? "
+msgstr "Icons in Menüs? "
+
+#. ./bin/fvwm-menu-desktop-config.fpl.in: line 112
+msgid "Yes"
+msgstr "Ja"
+
+#. ./bin/fvwm-menu-desktop-config.fpl.in: line 113
+msgid "No"
+msgstr "Nein"
+
+#. ./bin/fvwm-menu-desktop-config.fpl.in: line 116
+msgid "Icon size: "
+msgstr "Icongröße: "
+
+#. ./bin/fvwm-menu-desktop-config.fpl.in: line 118
+msgid " (in pixels. Default is 24)"
+msgstr " (in Pixel. Default ist 24)"
+
+#. ./bin/fvwm-menu-desktop-config.fpl.in: line 121
+msgid "Converted Icon directory: "
+msgstr "Icon-Verzeichnis: "
+
+#. ./bin/fvwm-menu-desktop-config.fpl.in: line 123
+msgid " (Directory for converted icons)"
+msgstr " (für konvertierte Icons)"
+
+#. ./bin/fvwm-menu-desktop-config.fpl.in: line 126
+msgid "Use Titles in Menus? "
+msgstr "Titel in Menüs? "
+
+#. ./bin/fvwm-menu-desktop-config.fpl.in: line 132
+msgid "Insert Menu(s) in a Menu? "
+msgstr "Menü(s) in einem Menü? "
+
+#. ./bin/fvwm-menu-desktop-config.fpl.in: line 136
+msgid "Top title name: "
+msgstr "Toptitel Name: "
+
+#. ./bin/fvwm-menu-desktop-config.fpl.in: line 140
+msgid "Used Icon theme: "
+msgstr "Benutzter Icontheme: "
+
+#. ./bin/fvwm-menu-desktop-config.fpl.in: line 142
+msgid " (Theme name for icon selection)"
+msgstr " (Themename für Iconauswahl)"
+
+#. ./bin/fvwm-menu-desktop-config.fpl.in: line 149
+msgid "Single Menu"
+msgstr "Einzelmenü"
+
+#. ./bin/fvwm-menu-desktop-config.fpl.in: line 152
+msgid "If you want a single menu only deselect all menus above and fill out"
+msgstr "Für ein Einzelmenü alle nicht benötigten Menüs deselektieren und die"
+
+#. ./bin/fvwm-menu-desktop-config.fpl.in: line 154
+msgid "the fields below. But remember, if the menu doesn't exist, nothing happens."
+msgstr "Felder unten ausfüllen. Achtung: wenn ein Menü leer ist, passiert nichts."
+
+#. ./bin/fvwm-menu-desktop-config.fpl.in: line 158
+msgid "Menu Top Title:"
+msgstr "Menü Top Titel:"
+
+#. ./bin/fvwm-menu-desktop-config.fpl.in: line 147
+msgid " (Eg. FvwmTestMenu)"
+msgstr " (z.b. FvwmTestMenu)"
+
+#. ./bin/fvwm-menu-desktop-config.fpl.in: line 160
+msgid "Install-Prefix:"
+msgstr "Install-Prefix:"
+
+#. ./bin/fvwm-menu-desktop-config.fpl.in: line 165
+msgid " (Eg. /etc/xdg/menus/)"
+msgstr " (z.B. /etc/xdg/menus/)"
+
+#. ./bin/fvwm-menu-desktop-config.fpl.in: line 168
+msgid "Desktop: "
+msgstr "Desktop: "
+
+#. ./bin/fvwm-menu-desktop-config.fpl.in: line 170
+msgid " (Eg. gnome, kde, xfce, lxde)"
+msgstr " (z.B. gnome, kde, xfce, lxde)"
+
+#. ./bin/fvwm-menu-desktop-config.fpl.in: line 173
+msgid "Menutype: "
+msgstr "Menütyp: "
+
+#. ./bin/fvwm-menu-desktop-config.fpl.in: line 175
+msgid " (Eg. applications, settings)"
+msgstr " (z.B. applications, settings)"
+
+#. ./bin/fvwm-menu-desktop-config.fpl.in: line 178
+msgid "Output path: "
+msgstr "Ausgabepfad: "
+
+#. ./bin/fvwm-menu-desktop-config.fpl.in: line 180
+msgid " (Full path to store output)"
+msgstr " (voller Speicherpfad der Ausgabe)"
+
+#. ./bin/fvwm-menu-desktop-config.fpl.in: line 187
+msgid "Actions"
+msgstr "Aktionen"
+
+#. ./bin/fvwm-menu-desktop-config.fpl.in: line 192
+msgid "Multiple"
+msgstr "Mehrfach"
+
+#. ./bin/fvwm-menu-desktop-config.fpl.in: line 193
+msgid "Single"
+msgstr "Einzel"
+
+#. ./bin/fvwm-menu-desktop-config.fpl.in: line 197
+msgid "Generate Menu(s)"
+msgstr "Menü(s) erstellen"
+
+#. ./bin/fvwm-menu-desktop-config.fpl.in: line 221
+msgid "Save Settings"
+msgstr "Settings speichern"
+
+#. ./bin/fvwm-menu-desktop-config.fpl.in: line 262
+msgid "Reset"
+msgstr "Zurücksetzen"
+
+#. ./bin/fvwm-menu-desktop-config.fpl.in: line 264
+msgid "Help"
+msgstr "Hilfe"
+
+#. ./bin/fvwm-menu-desktop-config.fpl.in: line 266
+msgid "Quit"
+msgstr "Beenden"
+
+#. ./bin/fvwm-menu-desktop.in: line 472
+msgid "Regenerate XDG Menu(s)"
+msgstr "XDG Menu(s) neu erstellen"
+
+#. ./bin/fvwm-menu-desktop.in: line 515
+msgid "Regenerate XDG Menu"
+msgstr "XDG Menu neu erstellen"
--- ../cvs/fvwm/po/fvwm.pot 2012-09-07 23:58:21.031312130 +0200
+++ fvwm.pot 2013-06-15 17:41:30.942334544 +0200
@@ -316,3 +316,163 @@
#. ./modules/FvwmForm/FvwmForm-Setup.in: line 55
msgid "Copy Config File(s)"
msgstr ""
+
+#. ./bin/fvwm-menu-desktop-config.fpl.in: line 51
+msgid "Fvwm Menu Desktop Config"
+msgstr ""
+
+#. ./bin/fvwm-menu-desktop-config.fpl.in: line 58
+msgid "Multiple Menu"
+msgstr ""
+
+#. ./bin/fvwm-menu-desktop-config.fpl.in: line 66
+msgid "Menus in"
+msgstr ""
+
+#. ./bin/fvwm-menu-desktop-config.fpl.in: line 95
+msgid "No menus found! Check why from within a terminal with"
+msgstr ""
+
+#. ./bin/fvwm-menu-desktop-config.fpl.in: line 107
+msgid "General Options"
+msgstr ""
+
+#. ./bin/fvwm-menu-desktop-config.fpl.in: line 110
+msgid "Use Icons in Menus? "
+msgstr ""
+
+#. ./bin/fvwm-menu-desktop-config.fpl.in: line 112
+msgid "Yes"
+msgstr ""
+
+#. ./bin/fvwm-menu-desktop-config.fpl.in: line 113
+msgid "No"
+msgstr ""
+
+#. ./bin/fvwm-menu-desktop-config.fpl.in: line 116
+msgid "Icon size: "
+msgstr ""
+
+#. ./bin/fvwm-menu-desktop-config.fpl.in: line 118
+msgid " (in pixels. Default is 24)"
+msgstr ""
+
+#. ./bin/fvwm-menu-desktop-config.fpl.in: line 121
+msgid "Converted Icon directory: "
+msgstr ""
+
+#. ./bin/fvwm-menu-desktop-config.fpl.in: line 123
+msgid " (Directory for converted icons)"
+msgstr ""
+
+#. ./bin/fvwm-menu-desktop-config.fpl.in: line 126
+msgid "Use Titles in Menus? "
+msgstr ""
+
+#. ./bin/fvwm-menu-desktop-config.fpl.in: line 132
+msgid "Insert Menu(s) in a Menu? "
+msgstr ""
+
+#. ./bin/fvwm-menu-desktop-config.fpl.in: line 136
+msgid "Top title name: "
+msgstr ""
+
+#. ./bin/fvwm-menu-desktop-config.fpl.in: line 140
+msgid "Used Icon theme: "
+msgstr ""
+
+#. ./bin/fvwm-menu-desktop-config.fpl.in: line 142
+msgid " (Theme name for icon selection)"
+msgstr ""
+
+#. ./bin/fvwm-menu-desktop-config.fpl.in: line 149
+msgid "Single Menu"
+msgstr ""
+
+#. ./bin/fvwm-menu-desktop-config.fpl.in: line 152
+msgid "If you want a single menu only deselect all menus above and fill out"
+msgstr ""
+
+#. ./bin/fvwm-menu-desktop-config.fpl.in: line 154
+msgid "the fields below. But remember, if the menu doesn't exist, nothing happens."
+msgstr ""
+
+#. ./bin/fvwm-menu-desktop-config.fpl.in: line 158
+msgid "Menu Top Title:"
+msgstr ""
+
+#. ./bin/fvwm-menu-desktop-config.fpl.in: line 147
+msgid " (Eg. FvwmTestMenu)"
+msgstr ""
+
+#. ./bin/fvwm-menu-desktop-config.fpl.in: line 160
+msgid "Install-Prefix:"
+msgstr ""
+
+#. ./bin/fvwm-menu-desktop-config.fpl.in: line 165
+msgid " (Eg. /etc/xdg/menus/)"
+msgstr ""
+
+#. ./bin/fvwm-menu-desktop-config.fpl.in: line 168
+msgid "Desktop: "
+msgstr ""
+
+#. ./bin/fvwm-menu-desktop-config.fpl.in: line 170
+msgid " (Eg. gnome, kde, xfce, lxde)"
+msgstr ""
+
+#. ./bin/fvwm-menu-desktop-config.fpl.in: line 173
+msgid "Menutype: "
+msgstr ""
+
+#. ./bin/fvwm-menu-desktop-config.fpl.in: line 175
+msgid " (Eg. applications, settings)"
+msgstr ""
+
+#. ./bin/fvwm-menu-desktop-config.fpl.in: line 178
+msgid "Output path: "
+msgstr ""
+
+#. ./bin/fvwm-menu-desktop-config.fpl.in: line 180
+msgid " (Full path to store output)"
+msgstr ""
+
+#. ./bin/fvwm-menu-desktop-config.fpl.in: line 187
+msgid "Actions"
+msgstr ""
+
+#. ./bin/fvwm-menu-desktop-config.fpl.in: line 192
+msgid "Multiple"
+msgstr ""
+
+#. ./bin/fvwm-menu-desktop-config.fpl.in: line 193
+msgid "Single"
+msgstr ""
+
+#. ./bin/fvwm-menu-desktop-config.fpl.in: line 197
+msgid "Generate Menu(s)"
+msgstr ""
+
+#. ./bin/fvwm-menu-desktop-config.fpl.in: line 221
+msgid "Save Settings"
+msgstr ""
+
+#. ./bin/fvwm-menu-desktop-config.fpl.in: line 262
+msgid "Reset"
+msgstr ""
+
+#. ./bin/fvwm-menu-desktop-config.fpl.in: line 264
+msgid "Help"
+msgstr ""
+
+#. ./bin/fvwm-menu-desktop-config.fpl.in: line 266
+msgid "Quit"
+msgstr ""
+
+#. ./bin/fvwm-menu-desktop.in: line 472
+msgid "Regenerate XDG Menu(s)"
+msgstr ""
+
+#. ./bin/fvwm-menu-desktop.in: line 515
+msgid "Regenerate XDG Menu"
+msgstr ""
--- ../cvs/fvwm/bin/fvwm-menu-desktop.in 2013-06-13 00:25:36.929491165 +0200
+++ fvwm-menu-desktop.in 2013-06-15 20:21:32.710785090 +0200
@@ -2,6 +2,10 @@
# Modification History
+# Changed on 15/06/13 by Thomas Funk:
+# support for python-xdg > 0.19.
+# add gettext localization.
+
# Changed on 10/01/12 by Thomas Funk:
# Unicode support.
@@ -43,6 +47,7 @@
import os.path
import os
from xdg.DesktopEntry import *
+from xdg.BaseDirectory import *
import fnmatch
import time
@@ -109,7 +114,7 @@
sys.exit(2)
global verbose, force, size, theme, icon_dir, top, install_prefix, menu_type, menu_list_length
global with_titles, menu_entry_count, get_menus, timestamp, set_menus, printmode, insert_in_menu
- version = "2.1"
+ version = "2.2"
verbose = False
force = False
desktop=''
@@ -468,7 +473,7 @@
printmenu(title, '', 'Popup "%s"' % name)
printtext('+ "" Nop')
- printmenu("Regenerate XDG Menu(s)", "system-software-update", "Module FvwmPerl -l fvwm-menu-desktop-config.fpl" )
+ printmenu("$[gt.Regenerate XDG Menu(s)]", "system-software-update", "Module FvwmPerl -l fvwm-menu-desktop-config.fpl" )
if not get_menus == '':
printtext('%s' % ' '.join(new_menulist))
@@ -511,7 +516,7 @@
# should only appear in a single menu. For more it will insert in parsemenus() when the top menu will built
if menu_list_length == 1 and not insert_in_menu and name == top:
printtext('+ "" Nop')
- printmenu("Regenerate XDG Menu", "system-software-update", "Module FvwmPerl -l fvwm-menu-desktop-config.fpl" )
+ printmenu("$[gt.Regenerate XDG Menu(s)]", "system-software-update", "Module FvwmPerl -l fvwm-menu-desktop-config.fpl" )
if printmode:
printtext('')
--- ../cvs/fvwm/bin/fvwm-menu-desktop-config.fpl.in 2012-07-28 20:20:30.000000000 +0200
+++ fvwm-menu-desktop-config.fpl 2013-06-15 17:41:33.654376217 +0200
@@ -4,7 +4,7 @@
# Dan Espen but inserts the found xdg menus dynamically into the Form
# before processed.
# Author: Thomas Funk <t.f...@web.de>
-# Version: 1.2
+# Version: 1.3
package MenuConfig;
use File::Basename;
@@ -48,130 +48,159 @@
my $fvwmform_commands = "
DestroyModuleConfig ${modname}: *
-*${modname}: Title \"Fvwm Menu Desktop Config\"
+*${modname}: Title \"\$[gt.Fvwm Menu Desktop Config]\"
*${modname}: WarpPointer
*${modname}: Line center
-*${modname}: Text \"Fvwm Menu Desktop Config\"
+*${modname}: Text \"\$[gt.Fvwm Menu Desktop Config]\"
+*${modname}: Line
+*${modname}: Separator
*${modname}: Line center
-*${modname}: Text \"------------------ Multiple Menu ------------------\"
+*${modname}: Text \"\$[gt.Multiple Menu]\"
*${modname}: Line
";
-foreach my $key (sort( keys %all_menus)) {
- $fvwmform_commands .= "
-*${modname}: Line left
-*${modname}: Text \"Menus in $key\"
-*${modname}: Line left
-*${modname}: Selection meth multiple
- ";
- my $m_count = 0;
- foreach my $count (sort(keys %{$all_menus{$key}})) {
- my @menu = @{$all_menus{$key}{$count}};
- my $newstring = $menu[0] . ' ' x eval($max_length-length($menu[0]));
- $fvwmform_commands .= "*${modname}: Choice $menu[1] $menu[1] $menu[2] \"$newstring\"
- ";
- $m_count++;
- if ($m_count == 3) {
- $fvwmform_commands .= "
- *${modname}: Line left
- *${modname}: Selection meth multiple
- ";
- $m_count = 0;
+if (scalar keys %all_menus != 0) {
+ foreach my $key (sort( keys %all_menus)) {
+ $fvwmform_commands .= "
+ *${modname}: Line left
+ *${modname}: Text \"\$[gt.Menus in]\"
+ *${modname}: Text \" $key\"
+ *${modname}: Line left
+ *${modname}: Selection meth multiple
+ ";
+ my $m_count = 0;
+ foreach my $count (sort(keys %{$all_menus{$key}})) {
+ my @menu = @{$all_menus{$key}{$count}};
+ my $newstring = $menu[0] . ' ' x eval($max_length-length($menu[0]));
+ $fvwmform_commands .= "*${modname}: Choice $menu[1] $menu[1] $menu[2] \"$newstring\"
+ ";
+ $m_count++;
+ if ($m_count == 3) {
+ $fvwmform_commands .= "
+ *${modname}: Line left
+ *${modname}: Selection meth multiple
+ ";
+ $m_count = 0;
+ }
+ }
+ $fvwmform_commands .= "
+ *${modname}: Line left
+ *${modname}: Text \" \"
+ ";
}
- }
- $fvwmform_commands .= "
- *${modname}: Line left
- *${modname}: Text \" \"
- ";
+}
+else {
+ $fvwmform_commands .= "
+ *${modname}: Line center
+ *${modname}: Text \"\$[gt.No menus found! Check why from within a terminal with]\"
+ *${modname}: Line center
+ *${modname}: Text \"'fvwm-menu-desktop -v'\"
+ *${modname}: Line left
+ *${modname}: Text \" \"
+ ";
}
$fvwmform_commands .= "
+*${modname}: Line
+*${modname}: Separator
*${modname}: Line center
-*${modname}: Text \"------------------ General Options ------------------\"
+*${modname}: Text \"\$[gt.General Options]\"
*${modname}: Line
*${modname}: Line Left
-*${modname}: Text \"Use Icons in Menus? \"
+*${modname}: Text \"\$[gt.Use Icons in Menus? ]\"
*${modname}: Selection SelItype single
-*${modname}: Choice IconsOn IconsOn on \"Yes\"
-*${modname}: Choice IconsOff IconsOff off \"No\"
+*${modname}: Choice IconsOn IconsOn on \"\$[gt.Yes]\"
+*${modname}: Choice IconsOff IconsOff off \"\$[gt.No]\"
*${modname}: Line left
-*${modname}: Text \"Icon size: \"
+*${modname}: Text \"\$[gt.Icon size: ]\"
*${modname}: Input Size 2 \"\"
-*${modname}: Text \" (in pixels. Default is 24)
+*${modname}: Text \"\$[gt. (in pixels. Default is 24)]\"
+
+*${modname}: Line left
+*${modname}: Text \"\$[gt.Converted Icon directory: ]\"
+*${modname}: Input IconDir 25 \"~/.fvwm/icons\"
+*${modname}: Text \"\$[gt. (Directory for converted icons)]\"
*${modname}: Line Left
-*${modname}: Text \"Use Titles in Menus? \"
+*${modname}: Text \"\$[gt.Use Titles in Menus? ]\"
*${modname}: Selection SelItype single
-*${modname}: Choice TitlesOn TitlesOn on \"Yes\"
-*${modname}: Choice TitlesOff TitlesOff off \"No\"
+*${modname}: Choice TitlesOn TitlesOn on \"\$[gt.Yes]\"
+*${modname}: Choice TitlesOff TitlesOff off \"\$[gt.No]\"
*${modname}: Line Left
-*${modname}: Text \"Insert Menu(s) in a Menu? \"
+*${modname}: Text \"\$[gt.Insert Menu(s) in a Menu? ]\"
*${modname}: Selection SelItype single
-*${modname}: Choice InsertOn InsertOn off \"Yes\"
-*${modname}: Choice InsertOff InsertOff on \"No\"
-*${modname}: Text \"Top title name: \"
+*${modname}: Choice InsertOn InsertOn off \"\$[gt.Yes]\"
+*${modname}: Choice InsertOff InsertOff on \"\$[gt.No]\"
+*${modname}: Text \"\$[gt.Top title name: ]\"
*${modname}: Input InMenu 20 \"\"
*${modname}: Line left
-*${modname}: Text \"Used Icon theme: \"
+*${modname}: Text \"\$[gt.Used Icon theme: ]\"
*${modname}: Input Theme 20 \"\"
-*${modname}: Text \" (Theme name for icon selection)\"
+*${modname}: Text \"\$[gt. (Theme name for icon selection)]\"
*${modname}: Line left
*${modname}: Line
+*${modname}: Line
+*${modname}: Separator
*${modname}: Line center
-*${modname}: Text \"------------------ Single Menu ------------------\"
+*${modname}: Text \"\$[gt.Single Menu]\"
*${modname}: Line
-*${modname}: Line Left
-*${modname}: Text \"If you want a single menu only deselect all menus above and fill out\"
-*${modname}: Line Left
-*${modname}: Text \"the fields below. But remember, if the menu doesn't exist, nothing happens.\"
+*${modname}: Line Left
+*${modname}: Text \"\$[gt.If you want a single menu only deselect all menus above and fill out]\"
+*${modname}: Line Left
+*${modname}: Text \"\$[gt.the fields below. But remember, if the menu doesn't exist, nothing happens.]\"
*${modname}: Line
*${modname}: Line left
-*${modname}: Text \"Menu Top Title:\"
+*${modname}: Text \"\$[gt.Menu Top Title:]\"
*${modname}: Input Title 20 \"\"
-*${modname}: Text \" (Eg. FvwmTestMenu)\"
+*${modname}: Text \"\$[gt. (Eg. FvwmTestMenu)]\"
*${modname}: Line left
-*${modname}: Text \"Install-Prefix:\"
+*${modname}: Text \"\$[gt.Install-Prefix:]\"
*${modname}: Input Installprefix 20 \"\"
-*${modname}: Text \" (Eg. /etc/xdg/menus/)\"
+*${modname}: Text \"\$[gt. (Eg. /etc/xdg/menus/)]\"
*${modname}: Line left
-*${modname}: Text \"Desktop: \"
+*${modname}: Text \"\$[gt.Desktop: ]\"
*${modname}: Input Desktop 20 \"\"
-*${modname}: Text \" (Eg. gnome, kde, xfce, lxde)\"
+*${modname}: Text \"\$[gt. (Eg. gnome, kde, xfce, lxde)]\"
*${modname}: Line left
-*${modname}: Text \"Menutype: \"
+*${modname}: Text \"\$[gt.Menutype: ]\"
*${modname}: Input Menutype 20 \"\"
-*${modname}: Text \" (Eg. applications, settings)\"
+*${modname}: Text \"\$[gt. (Eg. applications, settings)]\"
*${modname}: Line left
-*${modname}: Text \"Output path: \"
+*${modname}: Text \"\$[gt.Output path: ]\"
*${modname}: Input Path 25 \"\$FVWM_USERDIR/.menu\"
-*${modname}: Text \" (Full path to store output)\"
+*${modname}: Text \"\$[gt. (Full path to store output)]\"
*${modname}: Line left
*${modname}: Line
+*${modname}: Line
+*${modname}: Separator
*${modname}: Line center
-*${modname}: Text \"------------------ Actions ------------------\"
+*${modname}: Text \"\$[gt.Actions]\"
*${modname}: Line left
*${modname}: Line
*${modname}: Line center
*${modname}: Selection SelItype single
-*${modname}: Choice MultiOn MultiOn on \"Multiple\"
-*${modname}: Choice MultiOff MultiOff off \"Single\"
+*${modname}: Choice MultiOn MultiOn on \"\$[gt.Multiple]\"
+*${modname}: Choice MultiOff MultiOff off \"\$[gt.Single]\"
+*${modname}: Line
+*${modname}: Separator
*${modname}: Line expand
-*${modname}: Button continue \"Generate Menu(s)\"
+*${modname}: Button continue \"\$[gt.Generate Menu(s)]\"
*${modname}: Command PipeRead 'fvwm-menu-desktop \\
\$(IconsOn\?--enable-mini-icons )\\
\$(Size\?-s \$(Size) )\\
\$(TitlesOn\?--with-titles )\\
\$(InsertOn\?--insert-in-menu \$(InMenu) )\\
+\$(IconDir\?--mini-icon-dir \$(IconDir) )\\
\$(Title\?--title \$(Title) )\\
\$(Installprefix\?--install-prefix \$(Installprefix) )\\
\$(Desktop\?--desktop \$(Desktop) )\\
@@ -189,7 +218,7 @@
$fvwmform_commands .= "\") \$(Path\? > \$(Path)) 2> ~/.xsession-errors && echo \"Read \$(Path\? \$(Path))\"'
-*${modname}: Button continue \"Save Settings\"
+*${modname}: Button continue \"\$[gt.Save Settings]\"
# Before saving the data, remove any previously saved data:
*${modname}: Command DestroyModuleConfig ${modname}Default: *
@@ -225,15 +254,16 @@
'*${modname}Default: Desktop \$(Desktop) ' ; /bin/echo \\
'*${modname}Default: Menutype \$(Menutype) ' ; /bin/echo \\
'*${modname}Default: Path \$(Path) ' ; /bin/echo \\
+ '*${modname}Default: IconDir \$(IconDir) ' ; /bin/echo \\
'*${modname}Default: MultiOn \$(MultiOn\?on) ' ; /bin/echo \\
'*${modname}Default: MultiOff \$(MultiOff\?on) ' \\
) >> \$FVWM_USERDIR/.${modname}
-*${modname}: Button restart \"Reset\"
+*${modname}: Button restart \"\$[gt.Reset]\"
*${modname}: Command Nop
-*${modname}: Button continue \"Help\"
+*${modname}: Button continue \"\$[gt.Help]\"
*${modname}: Command Exec exec xterm -g 100x50 -n \"Help fvwm-menu-desktop\" -T \"Help fvwm-menu-desktop\" -e \"man fvwm-menu-desktop\" &
-*${modname}: Button quit \"Quit\"
+*${modname}: Button quit \"\$[gt.Quit]\"
*${modname}: Command Nop
# Tell ${modname} to read vars from .${modname}Default file:
