Le Sat, 15 Jun 2013 21:08:25 +0200, Thomas Funk <t.f...@web.de> a écrit :
> 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 PATCH COMMAND: patch -p1 -g0 -E --no-backup-if-mismatch < '/var/lib/layman/test/x11-wm/fvwm/files/fvwm-menu-desktop-config.fpl.gettext.patch' ====================================================== checking file bin/fvwm-menu-desktop-config.fpl Hunk #2 FAILED at 48. Hunk #3 succeeded at 205 (offset 16 lines). Hunk #4 FAILED at 225. 2 out of 4 hunks FAILED I included the rej file. It is against the svn of today. > > fvwm.pot: > - update to support translations for fvwm-menu-desktop and > fvwm-menu-desktop-config.fpl > > fvwm.de.po: > - update of the German translation The other patches are working fine. But I still doesn't get anything into Fvwm-Nightshade menu configurator: cut: champs et positions sont numérotés à partir de 1 which mean cut: fields and positions are numbered from 1 > > @Dominique: > Would you update the french translation file, please? It is join. Best, Dominique -- "We have the heroes we deserve."
--- 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 @@ -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) )\\ @@ -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:
--- fvwm/po/fvwm.fr.po.orig 2012-08-24 03:17:43.000000000 +0200 +++ fvwm/po/fvwm.fr.po 2013-06-16 22:11:18.000000000 +0200 @@ -319,3 +319,164 @@ #. ./modules/FvwmForm/FvwmForm-Setup.in: line 55 msgid "Copy Config File(s)" msgstr "Copier les Fichiers" + +#. ./bin/fvwm-menu-desktop-config.fpl.in: line 51 +msgid "Fvwm Menu Desktop Config" +msgstr "Configuration de Fvwm Menu Desktop" + +#. ./bin/fvwm-menu-desktop-config.fpl.in: line 58 +msgid "Multiple Menu" +msgstr "Menu multiple" + +#. ./bin/fvwm-menu-desktop-config.fpl.in: line 66 +msgid "Menus in" +msgstr "Menus dans" + +#. ./bin/fvwm-menu-desktop-config.fpl.in: line 95 +msgid "No menus found! Check why from within a terminal with" +msgstr "Pas de menu trouvé ! Depuis un terminal, contrôlez pourquoi avec" + +#. ./bin/fvwm-menu-desktop-config.fpl.in: line 107 +msgid "General Options" +msgstr "Options générales" + +#. ./bin/fvwm-menu-desktop-config.fpl.in: line 110 +msgid "Use Icons in Menus? " +msgstr "Utiliser des icônes dans les menus? " + +#. ./bin/fvwm-menu-desktop-config.fpl.in: line 112 +msgid "Yes" +msgstr "Oui" + +#. ./bin/fvwm-menu-desktop-config.fpl.in: line 113 +msgid "No" +msgstr "Non" + +#. ./bin/fvwm-menu-desktop-config.fpl.in: line 116 +msgid "Icon size: " +msgstr "Taille d'icône : " + +#. ./bin/fvwm-menu-desktop-config.fpl.in: line 118 +msgid " (in pixels. Default is 24)" +msgstr " (en pixels. Valeur par défaut 24)" + +#. ./bin/fvwm-menu-desktop-config.fpl.in: line 121 +msgid "Converted Icon directory: " +msgstr "Dossier des icônes: " + +#. ./bin/fvwm-menu-desktop-config.fpl.in: line 123 +msgid " (Directory for converted icons)" +msgstr " (Répertoire pour les icônes converties)" + +#. ./bin/fvwm-menu-desktop-config.fpl.in: line 126 +msgid "Use Titles in Menus? " +msgstr "Utiliser des titres dans les menus? " + +#. ./bin/fvwm-menu-desktop-config.fpl.in: line 132 +msgid "Insert Menu(s) in a Menu? " +msgstr "Menu(s) dans un menu? " + +#. ./bin/fvwm-menu-desktop-config.fpl.in: line 136 +msgid "Top title name: " +msgstr "Nom du titre principal: " + +#. ./bin/fvwm-menu-desktop-config.fpl.in: line 140 +msgid "Used Icon theme: " +msgstr "Thême d'icônes à utiliser: " + +#. ./bin/fvwm-menu-desktop-config.fpl.in: line 142 +msgid " (Theme name for icon selection)" +msgstr " (Nom du thême pour le choix des icônes)" + +#. ./bin/fvwm-menu-desktop-config.fpl.in: line 149 +msgid "Single Menu" +msgstr "Menu simple" + +#. ./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 "Si vous voulez un menu unique, désélectionner tous les menus ci-dessus et remplissez" + +#. ./bin/fvwm-menu-desktop-config.fpl.in: line 154 +msgid "the fields below. But remember, if the menu doesn't exist, nothing happens." +msgstr "les champs ci-dessous. Mais rappelez-vous, si le menu n'existe pas, rien ne se passe." + +#. ./bin/fvwm-menu-desktop-config.fpl.in: line 158 +msgid "Menu Top Title:" +msgstr "Titre principal du menu :" + +#. ./bin/fvwm-menu-desktop-config.fpl.in: line 147 +msgid " (Eg. FvwmTestMenu)" +msgstr " (Ex. FvwmTestMenu)" + +#. ./bin/fvwm-menu-desktop-config.fpl.in: line 160 +msgid "Install-Prefix:" +msgstr "Préfixe d'installation :" + +#. ./bin/fvwm-menu-desktop-config.fpl.in: line 165 +msgid " (Eg. /etc/xdg/menus/)" +msgstr " (Ex. /etc/xdg/menus/)" + +#. ./bin/fvwm-menu-desktop-config.fpl.in: line 168 +msgid "Desktop: " +msgstr "Bureau : " + +#. ./bin/fvwm-menu-desktop-config.fpl.in: line 170 +msgid " (Eg. gnome, kde, xfce, lxde)" +msgstr " (Ex. gnome, kde, xfce, lxde)" + +#. ./bin/fvwm-menu-desktop-config.fpl.in: line 173 +msgid "Menutype: " +msgstr "Type de menu : " + +#. ./bin/fvwm-menu-desktop-config.fpl.in: line 175 +msgid " (Eg. applications, settings)" +msgstr " (Ex. applications, réglages)" + +#. ./bin/fvwm-menu-desktop-config.fpl.in: line 178 +msgid "Output path: " +msgstr "Chemin de sortie : " + +#. ./bin/fvwm-menu-desktop-config.fpl.in: line 180 +msgid " (Full path to store output)" +msgstr " (Chemin complêt du fichier de sortie)" + +#. ./bin/fvwm-menu-desktop-config.fpl.in: line 187 +msgid "Actions" +msgstr "Actions" + +#. ./bin/fvwm-menu-desktop-config.fpl.in: line 192 +msgid "Multiple" +msgstr "Multiple" + +#. ./bin/fvwm-menu-desktop-config.fpl.in: line 193 +msgid "Single" +msgstr "Simple" + +#. ./bin/fvwm-menu-desktop-config.fpl.in: line 197 +msgid "Generate Menu(s)" +msgstr "Générer le(s) menu(s)" + +#. ./bin/fvwm-menu-desktop-config.fpl.in: line 221 +msgid "Save Settings" +msgstr "Sauvez les réglages" + +#. ./bin/fvwm-menu-desktop-config.fpl.in: line 262 +msgid "Reset" +msgstr "Remise à zéro" + +#. ./bin/fvwm-menu-desktop-config.fpl.in: line 264 +msgid "Help" +msgstr "Aide" + +#. ./bin/fvwm-menu-desktop-config.fpl.in: line 266 +msgid "Quit" +msgstr "Quittez" + +#. ./bin/fvwm-menu-desktop.in: line 472 +msgid "Regenerate XDG Menu(s)" +msgstr "Régénérer le(s) menu(s) XDG" + +#. ./bin/fvwm-menu-desktop.in: line 515 +msgid "Regenerate XDG Menu" +msgstr "Régénérer le menu XDG" +