projects / dotfiles / openbox.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (from parent 1: 495e840)
Some more tweaks and translations
authorJulien Valroff <julien@kirya.net>
Mon, 30 May 2011 05:07:29 +0000 (07:07 +0200)
committerJulien Valroff <julien@kirya.net>
Mon, 30 May 2011 05:07:29 +0000 (07:07 +0200)
menu.xml patch | blob | history
pipemenus/recently_opened_menu.sh patch | blob | history

diff --git a/menu.xml b/menu.xml
index 090c4f3..729b8d2 100644 (file)
--- a/menu.xml
+++ b/menu.xml
@@ -48,6 +48,13 @@
                                </execute>
                        </action>
                </item>
+               <item label="Client Jabber">
+                       <action name="Execute">
+                               <execute>
+                                       gajim
+                               </execute>
+                       </action>
+               </item>
                <item label="Lecteur de flux RSS">
                        <action name="Execute">
                                <execute>
@@ -55,6 +62,13 @@
                                </execute>
                        </action>
                </item>
+               <item label="Lecteur de musique">
+                       <action name="Execute">
+                               <execute>
+                                       ario
+                               </execute>
+                       </action>
+               </item>
                <item label="Lecteur vidéos">
                        <action name="Execute">
                                <execute>
@@ -67,30 +81,30 @@
                <menu execute="~/.config/openbox/pipemenus/dash_places_menu.sh ~" id="places" label="Poste de travail"/>
                <separator/>
                <menu id="settings" label="Configuration">
-                       <menu id="conkyconfig" label="Conky Config">
-                               <item label="Edit .conkyrc">
+                       <menu id="conkyconfig" label="Configurer Conky">
+                               <item label="Éditer .conkyrc">
                                        <action name="Execute">
                                                <execute>
-                                                       gedit ~/.conkyrc
+                                                       gvim ~/.conkyrc
                                                </execute>
                                        </action>
                                </item>
-                               <item label="Restart Conky">
+                               <item label="Redémarrer Conky">
                                        <action name="Execute">
                                                <execute>
-                                                       conkywonky
+                                                       pkill conky &amp;&amp; conky
                                                </execute>
                                        </action>
                                </item>
-                               <separator label="Help?"/>
-                               <item label="man page">
+                               <separator label="Aide"/>
+                               <item label="Manuel">
                                        <action name="Execute">
                                                <execute>
-                                                       terminator --command=&quot;man conky&quot;
+                                                       x-terminal-emulator -e man conky
                                                </execute>
                                        </action>
                                </item>
-                               <item label="Wiki Page">
+                               <item label="Wiki">
                                        <action name="Execute">
                                                <execute>
                                                        x-www-browser http://crunchbanglinux.org/wiki/conky
@@ -98,107 +112,107 @@
                                        </action>
                                </item>
                        </menu>
-                       <menu id="dmenuconfig" label="dmenu Config">
-                               <item label="Edit start-up script">
+                       <menu id="dmenuconfig" label="Configurer dmenu">
+                               <item label="Éditer le script de démarrage">
                                        <action name="Execute">
                                                <execute>
-                                                       gedit ~/.config/dmenu/dmenu-bind.sh
+                                                       gvim ~/.config/dmenu/dmenu-bind.sh
                                                </execute>
                                        </action>
                                </item>
-                               <separator label="Help?"/>
-                               <item label="man page">
+                               <separator label="Aide"/>
+                               <item label="Manuel">
                                        <action name="Execute">
                                                <execute>
-                                                       terminator --command=&quot;man dmenu&quot;
+                                                       x-terminal-emulator -e man dmenu
                                                </execute>
                                        </action>
                                </item>
                        </menu>
-                       <menu id="gmrunconfig" label="gmrun Config">
-                               <item label="Edit config file">
+                       <menu id="gmrunconfig" label="Configurer gmrun">
+                               <item label="Éditer le fichier de configuration">
                                        <action name="Execute">
                                                <execute>
-                                                       gedit ~/.gmrunrc
+                                                       gvim ~/.gmrunrc
                                                </execute>
                                        </action>
                                </item>
-                               <separator label="Help?"/>
-                               <item label="man page">
+                               <separator label="Aide"/>
+                               <item label="Manuel">
                                        <action name="Execute">
                                                <execute>
-                                                       terminator --command=&quot;man gmrun&quot;
+                                                       x-terminal-emulator -e man gmrun
                                                </execute>
                                        </action>
                                </item>
                        </menu>
-                       <menu id="obConfig" label="Openbox Config">
-                               <item label="Edit menu.xml">
+                       <menu id="obConfig" label="Configurer OpenBox">
+                               <item label="Éditer menu.xml">
                                        <action name="Execute">
                                                <execute>
-                                                       gedit ~/.config/openbox/menu.xml
+                                                       gvim ~/.config/openbox/menu.xml
                                                </execute>
                                        </action>
                                </item>
-                               <item label="Edit rc.xml">
+                               <item label="Éditer rc.xml">
                                        <action name="Execute">
                                                <execute>
-                                                       gedit ~/.config/openbox/rc.xml
+                                                       gvim ~/.config/openbox/rc.xml
                                                </execute>
                                        </action>
                                </item>
-                               <item label="Edit autostart.sh">
+                               <item label="Éditer autostart.sh">
                                        <action name="Execute">
                                                <execute>
-                                                       gedit ~/.config/openbox/autostart.sh
+                                                       gvim ~/.config/openbox/autostart.sh
                                                </execute>
                                        </action>
                                </item>
-                               <item label="GUI Menu Editor">
+                               <item label="Outil de configuration du menu">
                                        <action name="Execute">
                                                <execute>
                                                        obmenu
                                                </execute>
                                        </action>
                                </item>
-                               <item label="GUI Config Tool">
+                               <item label="Outil de configuration graphique">
                                        <action name="Execute">
                                                <execute>
                                                        obconf
                                                </execute>
                                        </action>
                                </item>
-                               <item label="Reconfigure">
+                               <item label="Reconfigurer OpenBox">
                                        <action name="Reconfigure"/>
                                </item>
-                               <item label="Restart">
+                               <item label="Redémarrer OpenBox">
                                        <action name="Restart"/>
                                </item>
                        </menu>
-                       <menu id="tint2config" label="tint2 Panel Config">
-                               <item label="Edit config file">
+                       <menu id="tint2config" label="Configurer tint2">
+                               <item label="Éditer le fichier de configuration">
                                        <action name="Execute">
                                                <execute>
-                                                       gedit ~/.config/tint2/tint2rc
+                                                       gvim ~/.config/tint2/tint2rc
                                                </execute>
                                        </action>
                                </item>
-                               <item label="GUI Config Tool">
+                               <item label="Outil de configuration graphique">
                                        <action name="Execute">
                                                <execute>
                                                        tint2conf
                                                </execute>
                                        </action>
                                </item>
-                               <separator label="Help?"/>
-                               <item label="man page">
+                               <separator label="Aide"/>
+                               <item label="Manuel">
                                        <action name="Execute">
                                                <execute>
-                                                       terminator --command=&quot;man tint2&quot;
+                                                       x-terminal-emulator -e man tint2
                                                </execute>
                                        </action>
                                </item>
-                               <item label="Online Help">
+                               <item label="Aide en ligne">
                                        <action name="Execute">
                                                <execute>
                                                        x-www-browser http://code.google.com/p/tint2/wiki/Welcome
@@ -206,35 +220,20 @@
                                        </action>
                                </item>
                        </menu>
-                       <menu id="DisplaySettings" label="Display Settings">
-                               <item label="Adjust with grandr">
-                                       <action name="Execute">
-                                               <execute>
-                                                   grandr
-                                               </execute>
-                                       </action>
-                               </item>
-                               <separator label="Help?"/>
+                       <menu id="DisplaySettings" label="Préférences d'affichage">
                                <item label="man xrandr">
                                        <action name="Execute">
                                                <execute>
-                                                   terminator --command=&quot;man xrandr&quot;
+                                                   x-terminal-emulator -e man xrandr
                                                </execute>
                                        </action>
                                </item>
                        </menu>
                        <menu id="NotificationsSettings" label="Notifications">
-                               <item label="Edit config file">
+                               <item label="Préférences">
                                        <action name="Execute">
                                                <execute>
-                                                       gvim ~/.notify-osd
-                                               </execute>
-                                       </action>
-                               </item>
-                               <item label="Send test notification">
-                                       <action name="Execute">
-                                               <execute>
-                                                   cb-fortune
+                                                       notification-properties
                                                </execute>
                                        </action>
                                </item>
@@ -242,25 +241,25 @@
                        <item label="Applications préférées">
                                <action name="Execute">
                                        <execute>
-                                               x-terminal-emulator --command=&quot;sudo update-alternatives --all&quot;
+                                               x-terminal-emulator -e sudo update-alternatives --all
                                        </execute>
                                </action>
                        </item>
-                       <item label="Power Management">
+                       <item label="Gestion de l'énergie">
                                <action name="Execute">
                                        <execute>
-                                               xfce4-power-manager-settings
+                                               gnome-power-manager-preferences
                                        </execute>
                                </action>
                        </item>
-                       <item label="Screensaver">
+                       <item label="Économiseur d'écran">
                                <action name="Execute">
                                        <execute>
-                                               xscreensaver-demo
+                                               gnome-screensaver-preferences
                                        </execute>
                                </action>
                        </item>
-                       <item label="Choose Wallpaper">
+                       <item label="Fond d'écran">
                                <action name="Execute">
                                        <execute>
                                                nitrogen
@@ -276,20 +275,21 @@
                                </execute>
                        </action>
                </item>
-               <item label="Mise en veille prolongée">
+               <item label="Mise en veille">
                        <action name="Execute">
                                <execute>
-                                       dbus-send --system --print-reply  --dest=org.freedesktop.UPower /org/freedesktop/UPower  org.freedesktop.UPower.Hibernate
+                                       dbus-send --system --print-reply  --dest=org.freedesktop.UPower /org/freedesktop/UPower org.freedesktop.UPower.Suspend
                                </execute>
                        </action>
                </item>
-               <item label="Mise en veille">
+               <item label="Mise en veille prolongée">
                        <action name="Execute">
                                <execute>
-                                       dbus-send --system --print-reply  --dest=org.freedesktop.UPower /org/freedesktop/UPower org.freedesktop.UPower.Suspend
+                                       dbus-send --system --print-reply  --dest=org.freedesktop.UPower /org/freedesktop/UPower  org.freedesktop.UPower.Hibernate
                                </execute>
                        </action>
                </item>
+               <separator/>
                <item label="Déconnexion">
                        <action name="Execute">
                                <execute>
diff --git a/pipemenus/recently_opened_menu.sh b/pipemenus/recently_opened_menu.sh
index c58d651..98cc8cb 100755 (executable)
--- a/pipemenus/recently_opened_menu.sh
+++ b/pipemenus/recently_opened_menu.sh
@@ -1,5 +1,5 @@
 #!/bin/sh
-#    recently_opened_menu.sh - a script to parse .recently-used.xbel
+#    recently_opened_menu.sh - a script to parse recently-used.xbel
 #    and generate openbox pipe menu
 #    Copyright (C) 2010  John Crawley
 #
@@ -21,9 +21,9 @@ maximum_entries=15 # max. number of entries in menu
 
 #######################################################################
 
-# if argument is --clear, empty .recently-used.xbel
+# if argument is --clear, empty recently-used.xbel
 [ "$1" = '--clear' ] && {
-cat <<':EOF' > "${HOME}"/.recently-used.xbel
+cat <<':EOF' > "${HOME}"/.local/share/recently-used.xbel
 <?xml version="1.0" encoding="UTF-8"?>
 <xbel version="1.0"
       xmlns:bookmark="http://www.freedesktop.org/standards/desktop-bookmarks"
@@ -42,7 +42,7 @@ mid='">
 post='</command></action>
     </item>'
     
-files=$( tac "${HOME}"/.recently-used.xbel |  awk -v MAX="$maximum_entries" -v PR="$pre" -v MI="$mid" -v PO="$post" 'BEGIN {
+files=$( tac "${HOME}"/.local/share/recently-used.xbel |  awk -v MAX="$maximum_entries" -v PR="$pre" -v MI="$mid" -v PO="$post" 'BEGIN {
     RS="</bookmark>";
     FS="<info>";
 }
@@ -70,7 +70,7 @@ files=$(perl -MURI::Escape -e 'print uri_unescape($ARGV[0]);' "$files")
 output='<openbox_pipe_menu>
 '"$files"'
 <separator />
-    <item label="Clear Recent Files">
+    <item label="Effacer la liste">
         <action name="Execute">
             <command>
             &apos;'"$0"'&apos; --clear
OpenBox configuration