Merge lp:~cairo-dock-team/ubuntu/oneiric/cairo-dock/2.4.0-0beta2 into lp:ubuntu/oneiric/cairo-dock

[Matthieu Baerts]

Hello,

The Cairo-Dock team proposes a new version of its Cairo-Dock package.

This is the Upstream (short) ChangeLog:
 * Upstream (short) ChangeLog:
   - A new Help applet has been added to help our beloved user.
   - Improved integration in the XFCE and LXDE desktop.
   - Improved the classifying of our files in the source code
      and in share/cairo-dock directory.
   - Launchers and applications now uses the linked .desktop file.
   - Fixed a few bugs as usual

This branch should be ready to be pushed on lp:ubuntu/cairo-dock (except the UNRELEASED version in debian/changelog)

Please upload this version before the FF.

Thank you for your help

PS: Don't forget to upload this package AND OUR PLUG-INS ( LP: #823514 )

[Kees Cook (kees)]

Looks good, thanks!

review: Approve

=== removed directory '.pc/01-default_theme_with_default_apps'
=== removed directory '.pc/01-default_theme_with_default_apps/data'
=== removed directory '.pc/01-default_theme_with_default_apps/data/default-theme'
=== removed directory '.pc/01-default_theme_with_default_apps/data/default-theme/launchers'
=== removed file '.pc/01-default_theme_with_default_apps/data/default-theme/launchers/01eog.desktop'
=== removed file '.pc/01-default_theme_with_default_apps/data/default-theme/launchers/01evolution.desktop'
=== removed file '.pc/01-default_theme_with_default_apps/data/default-theme/launchers/01f-spot.desktop'
--- .pc/01-default_theme_with_default_apps/data/default-theme/launchers/01f-spot.desktop	2011-03-17 14:08:48 +0000
+++ .pc/01-default_theme_with_default_apps/data/default-theme/launchers/01f-spot.desktop	1970-01-01 00:00:00 +0000
@@ -1,53 +0,0 @@
-#!en
-
-[Desktop Entry]
-#s Launcher's name :
-Name=F-Spot
-#s Command to launch on click :
-#{Exemple : nautilus --no-desktop, gedit, etc. You can even enter a keyboard shortcut, for exemple <Alt>F1, <Ctrl>c,  <Ctrl>v, etc}
-Exec=f-spot
-#S Image's name or path :
-Icon=f-spot
-#d Name of the container it belongs to:
-#{If you write here a container's name that doesn't exist yet, a new one will be created, with this icon inside.}
-Container=Graphics
-
-#X[Extra parameters]
-frame_extra=
-#f[0;100] Order you want for this launcher among the others:
-Order=-0.6361083984375
-#b Prevent this launcher from stealing appli from taskbar ?
-#{If you choosed to mix launcher and applis, this option will deactivate this behaviour for this launcher only. It can be useful for instance for a launcher that launches a script in a terminal, but you don't want it to steal the Terminal's icon from the Taskbar.} 
-prevent inhibate=false
-
-#K Class of the program :
-#{The only reason you may want to modify this parameter is if you made this launcher by hands. If you dropped it into the dock from the menu, it is nearly sure that you shouldn't touch it. It defines the class of the program, which is useful to link the appli with its launcher.}
-StartupWMClass=
-
-#b Run in a terminal ?
-#{It will use 'xterm'.}
-Terminal=false
-
-#i-[0;16] Only show in this specific viewport
-#{If '0' the launcher will be displayed on every viewport.}
-ShowOnViewport=0
-
-Nb subicons=0
-
-Renderer=
-
-Base URI=
-Is mounting point=false
-
-Version=1.0
-GenericName=Photo Manager
-X-GNOME-FullName=F-Spot Photo Manager
-Comment=Organize, enjoy, and share your photos
-StartupNotify=true
-Type=Application
-Categories=Graphics;Photography;GNOME;GTK;
-X-GNOME-Bugzilla-Bugzilla=GNOME
-X-GNOME-Bugzilla-Product=f-spot
-X-GNOME-Bugzilla-Component=General
-X-GNOME-Bugzilla-Version=0.6.1.5
-X-GNOME-DocPath=f-spot/f-spot.xml

=== removed file '.pc/01-default_theme_with_default_apps/data/default-theme/launchers/01inkscape.desktop'
--- .pc/01-default_theme_with_default_apps/data/default-theme/launchers/01inkscape.desktop	2011-03-17 14:08:48 +0000
+++ .pc/01-default_theme_with_default_apps/data/default-theme/launchers/01inkscape.desktop	1970-01-01 00:00:00 +0000
@@ -1,92 +0,0 @@
-#!en
-
-[Desktop Entry]
-#s Launcher's name :
-Name=Inkscape
-#s Command to launch on click :
-#{Exemple : nautilus --no-desktop, gedit, etc. You can even enter a keyboard shortcut, for exemple <Alt>F1, <Ctrl>c,  <Ctrl>v, etc}
-Exec=inkscape 
-#S Image's name or path :
-Icon=inkscape
-#d Name of the container it belongs to:
-#{If you write here a container's name that doesn't exist yet, a new one will be created, with this icon inside.}
-Container=Graphics
-
-#X[Extra parameters]
-frame_extra=
-#f[0;100] Order you want for this launcher among the others:
-Order=-1.6361083984375
-#b Prevent this launcher from stealing appli from taskbar ?
-#{If you choosed to mix launcher and applis, this option will deactivate this behaviour for this launcher only. It can be useful for instance for a launcher that launches a script in a terminal, but you don't want it to steal the Terminal's icon from the Taskbar.} 
-prevent inhibate=false
-
-#K Class of the program :
-#{The only reason you may want to modify this parameter is if you made this launcher by hands. If you dropped it into the dock from the menu, it is nearly sure that you shouldn't touch it. It defines the class of the program, which is useful to link the appli with its launcher.}
-StartupWMClass=
-
-#b Run in a terminal ?
-#{It will use 'xterm'.}
-Terminal=false
-
-#i-[0;16] Only show in this specific viewport
-#{If '0' the launcher will be displayed on every viewport.}
-ShowOnViewport=0
-
-Nb subicons=0
-
-Renderer=
-
-Base URI=
-Is mounting point=false
-
-Version=1.0
-GenericName=Vector Graphics Editor
-X-GNOME-FullName=Inkscape Vector Graphics Editor
-X-GNOME-FullName[ar]=إنكسكايب محرر الرسومات الشعاعية
-X-GNOME-FullName[be]=Р�дактар в�ктарнай ґрафікі Inkscape
-X-GNOME-FullName[bg]=Inkscape илю�тратор за векторна графика
-X-GNOME-FullName[br]=Inkscape Embanner kevregadoù sturiadel
-X-GNOME-FullName[ca]=Editor de gràfics vectorials Inkscape
-X-GNOME-FullName[cs]=Inkscape - editor vektorové grafiky
-X-GNOME-FullName[de]=Inkscape SVG-Vektorgrafik-Editor
-X-GNOME-FullName[en_GB]=Inkscape Vector Graphics Editor
-X-GNOME-FullName[en_US@piglatin]=Inkscape Ectorvay Aphicsgray Editorway
-X-GNOME-FullName[eo]=Inkscape: Ilustrilo por Vektoraj Bildoj
-X-GNOME-FullName[es]=Editor de gráficos vectoriales Inkscape
-X-GNOME-FullName[et]=Inkscape, vektorgraafika redaktor
-X-GNOME-FullName[eu]=Inkscape bektore-grafikoen editorea
-X-GNOME-FullName[fi]=Inkscape vektorigrafiikkatyökalu
-X-GNOME-FullName[fr]=Éditeur d'images vectorielles SVG Inkscape
-X-GNOME-FullName[gl]=Editor de imaxes vectoriais Inkscape
-X-GNOME-FullName[he]=�ינקסקייפ עורך גרפיקה וקטורית
-X-GNOME-FullName[hr]=Inkscape - program za vektorsko crtanje
-X-GNOME-FullName[hu]=Inkscape - vektorgrafikai szerkesztő
-X-GNOME-FullName[hy]=Inkscape ÕŽÕ¥Õ¯Õ¿Õ¸Ö€Õ¡ÕµÕ«Õ¶ Ô³Ö€Õ¡Ö†Õ«Õ¯Õ¡ÕµÕ« Ô½Õ´Õ¢Õ¡Õ£Õ«Ö€
-X-GNOME-FullName[it]=Inkscape - Grafica vettoriale SVG
-X-GNOME-FullName[ja]=Inkscape ベクターグラフィックエディタ
-X-GNOME-FullName[km]=កម្មវិធី​កែ​សម្រួល​ក្រាហ្វិក​វ៉ិចទ�រ Inkscape
-X-GNOME-FullName[ko]=Inkscape 벡터 그래픽 편집기
-X-GNOME-FullName[lt]=Inkscape vektorinÄ—s grafikos rengyklÄ—
-X-GNOME-FullName[nb]=Inkscape vektor-tegneprogram
-X-GNOME-FullName[nl]=Inkscape SVG-vector-illustrator
-X-GNOME-FullName[pl]=Inkscape - edytor grafiki wektorowej
-X-GNOME-FullName[pt]=Inkscape Editor de Imagem Vectorial
-X-GNOME-FullName[pt_BR]=Editor de Imagens Vetoriais Inkscape
-X-GNOME-FullName[ro]=Inkscape editor de grafică vectorială
-X-GNOME-FullName[ru]=Редактор векторной графики Inkscape
-X-GNOME-FullName[sk]=Inkscape - editor vektorovej grafiky
-X-GNOME-FullName[sl]=Urejevalnik vektorskih slik Inkscape
-X-GNOME-FullName[sr]=Inkscape програм за вектор�ко цртање
-X-GNOME-FullName[sr@latin]=Inkscape program za vektorsko crtanje
-X-GNOME-FullName[sv]=Vektorillustratören Inkscape
-X-GNOME-FullName[tr]=Inkscape Vektörel Grafik Düzenleyici
-X-GNOME-FullName[uk]=Редактор векторної графіки Inkscape
-X-GNOME-FullName[vi]=Inkscape - Trình Xử lý Ảnh Véc-tơ
-X-GNOME-FullName[zh_CN]=Inkscape矢�绘图软件
-X-GNOME-FullName[zh_TW]=Inkscape ��繪圖軟體
-Comment=Create and edit Scalable Vector Graphics images
-Type=Application
-Categories=Graphics;VectorGraphics;GTK;
-MimeType=image/svg+xml;image/svg+xml-compressed;
-TryExec=inkscape
-StartupNotify=true

=== removed file '.pc/01-default_theme_with_default_apps/data/default-theme/launchers/01shotwell.desktop'
=== removed file '.pc/01-default_theme_with_default_apps/data/default-theme/launchers/01thunderbird.desktop'
--- .pc/01-default_theme_with_default_apps/data/default-theme/launchers/01thunderbird.desktop	2011-03-17 14:08:48 +0000
+++ .pc/01-default_theme_with_default_apps/data/default-theme/launchers/01thunderbird.desktop	1970-01-01 00:00:00 +0000
@@ -1,58 +0,0 @@
-#!en
-
-[Desktop Entry]
-#s Launcher's name :
-Name=Mozilla Thunderbird Mail/News
-#s Command to launch on click :
-#{Exemple : nautilus --no-desktop, gedit, etc. You can even enter a keyboard shortcut, for exemple <Alt>F1 for the Applications Menu, <Ctrl>c or <Ctrl>v to copy or paste, etc}
-Exec=thunderbird 
-#S Image's name or path :
-Icon=thunderbird
-#E[_MainDock_;Quimper, France;Blog;Documents;Vidéos]  Name of the container it belongs to:
-#{If you write here a container's name that doesn't exist yet, a new one will be created, with this icon inside.}
-Container=_MainDock_
-
-#X[Extra parameters]
-frame_extra=
-#f Order you want for this launcher among the others:
-Order=2.977783203125
-#b Prevent this launcher from stealing appli from taskbar ?
-#{Use this option for exemple if the launcher launches a script in a terminal but you don't want it to steal normal terminal's icons from the TaskBar, or if you explicitely want to use the original icon of the TaskBar because it provides some info, for exemple Pidgin's icons represent the avatar of the contact.}
-prevent inhibate=false
-
-#s Class of the program :
-#{The only reason you may want to modify this parameter is if you made this launcher by hands. If you dropped it into the dock from the menu, it is nearly sure that you shouldn't touch it. It defines the class of the program, which is useful to link the appli with its launcher.}
-StartupWMClass=Thunderbird-bin
-
-Is container=false
-
-Renderer=
-
-Base URI=
-Is mounting point=false
-Encoding=UTF-8
-Comment=Read/Write Mail/News with Mozilla Thunderbird
-GenericName=Mail Client
-Terminal=false
-X-MultipleArgs=false
-Type=Application
-Categories=Application;Network;
-MimeType=text/html;text/xml;application/xhtml+xml;application/xml;application/vnd.mozilla.xul+xml;application/rss+xml;application/rdf+xml;image/gif;image/jpeg;image/png
-StartupNotify=true
-Name[cs]=Poštovní klient Thunderbird
-Name[ca]=Client de correu Thunderbird
-Name[fi]=Thunderbird-sähköposti
-Name[fr]=Thunderbird
-Name[pl]=Klient poczty Thunderbird
-Name[pt_BR]=Cliente de E-mail Thunderbird
-Name[sv]=E-postklienten Thunderbird
-Comment[ca]=Llegiu i escriviu correu
-Comment[cs]=Čtení a psaní pošty
-Comment[de]=Emails lesen und verfassen
-Comment[fi]=Lue ja kirjoita sähköposteja
-Comment[fr]=Lire et écrire des courriels
-Comment[it]=Leggere e scrivere email
-Comment[ja]=メール�読�書�
-Comment[pl]=Czytanie i wysyłanie e-maili
-Comment[pt_BR]=Ler e escrever suas mensagens
-Comment[sv]=Läs och skriv e-post

=== removed file '.pc/01-default_theme_with_default_apps/data/default-theme/launchers/CMakeLists.txt'
--- .pc/01-default_theme_with_default_apps/data/default-theme/launchers/CMakeLists.txt	2011-03-17 14:08:48 +0000
+++ .pc/01-default_theme_with_default_apps/data/default-theme/launchers/CMakeLists.txt	1970-01-01 00:00:00 +0000
@@ -1,17 +0,0 @@
-
-########### install files ###############
-
-install(FILES
-	01container.desktop
-	01gcalctool.desktop
-	01empathy.desktop
-	01gimp.desktop
-	01firefox.desktop
-	01gnome-terminal.desktop
-	01f-spot.desktop
-	01inkscape.desktop
-	01separator.desktop
-	01thunderbird.desktop
-	02separator.desktop
-	03separator.desktop
-	DESTINATION ${pkgdatadir}/themes/_default_/launchers)

=== removed directory '.pc/01-default_theme_with_default_apps/data/default-theme/plug-ins'
=== removed directory '.pc/01-default_theme_with_default_apps/data/default-theme/plug-ins/GMenu'
=== removed file '.pc/01-default_theme_with_default_apps/data/default-theme/plug-ins/GMenu/GMenu.conf'
--- .pc/01-default_theme_with_default_apps/data/default-theme/plug-ins/GMenu/GMenu.conf	2011-03-17 14:08:48 +0000
+++ .pc/01-default_theme_with_default_apps/data/default-theme/plug-ins/GMenu/GMenu.conf	1970-01-01 00:00:00 +0000
@@ -1,133 +0,0 @@
-#!en;1.1.6
-
-#[gtk-about]
-[Icon]
-
-#F[Applet]
-frame_maininfo=
-
-#d Name of the dock it belongs to:
-dock name=
-
-#s Name of the icon as it will appear in its caption in the dock:
-name=Applications Menu
-
-#F[Display]
-frame_display=
-
-#S+ Image filename:
-#{Leave empty to use the default one.}
-icon=alacarte
-
-#j+[0;128] Desired icon size for this applet
-#{Set to 0 to use the default applet size}
-icon size=0;0;
-
-order=-0.81805419921875
-
-#F[Applet's Handbook]
-frame_hand=
-#A
-handbook=GMenu
-
-#[gtk-convert]
-[Desklet]
-
-#X[Position]
-frame_pos=
-
-#b Lock position?
-#{If locked, the desklet cannot be moved by simply dragging it with the left mouse button. It can still be moved with ALT + left-click.}
-locked=false
-
-#j[24;512] Desklet dimensions (width x height):
-#{Depending on your WindowManager, you may be able to resize this with ALT + middle-click or ALT + left-click.}
-size=96;96;
-
-#i[-2048;2048] Desklet position (x, y):
-#{Depending on your WindowManager, you may be able to move this with ALT + left-click.}
-x position=0
-#i[-2048;2048] ...
-y position=0
-
-#I[-180;180] Rotation:
-#{You can quickly rotate the desklet with the mouse, by dragging the little buttons on its left and top sides.}
-rotation=0
-
-#X[Visibility]
-frame_visi=
-
-#b Is detached from the dock
-initially detached=false
-#l[Normal;Keep above;Keep below;Keep on widget layer;Reserve space] Visibility:
-#{for CompizFusion's "widget layer", set behaviour in Compiz to: (class=Cairo-dock & type=utility)}
-accessibility=0
-#b Should be visible on all desktops?
-sticky=true
-
-
-
-
-#F[Decorations;gtk-orientation-portrait]
-frame_deco=
-
-#o+ Choose a decoration theme for this desklet:
-#{Choose 'Custom decorations' to define your own decorations below.}
-decorations=default
-
-#v
-sep_deco=
-
-#S+ Background image:
-#{Image to be displayed below drawings, e.g. a frame. Leave empty for no image.}
-bg desklet=
-#e+[0;1] Background transparency:
-bg alpha=1
-#i+[0;256] Left offset:
-#{in pixels. Use this to adjust the left position of drawings.}
-left offset=0
-#i+[0;256] Top offset:
-#{in pixels. Use this to adjust the top position of drawings.}
-top offset=0
-#i+[0;256] Right offset:
-#{in pixels. Use this to adjust the right position of drawings.}
-right offset=0
-#i+[0;256] Bottom offset:
-#{in pixels. Use this to adjust the bottom position of drawings.}
-bottom offset=0
-#S+ Foreground image:
-#{Image to be displayed above the drawings, e.g. a reflection. Leave empty for no image.}
-fg desklet=
-#e+[0;1] Foreground tansparency:
-fg alpha=1
-
-#[gtk-preferences]
-[Configuration]
-
-#b Display icons in the menu?
-has icons=true
-
-#k Shortkey to show/hide the menu:
-menu shortkey=<Control>F1
-
-#k Shortkey to show/hide the quick-launch dialog:
-quick launch shortkey=<Control>F2
-
-#s Command to use for configuring the menu:
-#{Leave empty to use the default one.}
-config menu=
-
-#F[Recent documents]
-recent=
-
-#b Show recent documents?
-show recent=true
-
-#D Only show files that are under this folder or its sub-folder:
-#{Leave blank if filter is not needed.}
-recent root dir=
-#i[0;30] Only show files whose last modification date is less than ;
-#{in days. Set 0 to not use this filter.}
-#
-recent age=0
-

=== removed directory '.pc/01-default_theme_with_default_apps/data/default-theme/plug-ins/musicPlayer'
=== removed file '.pc/01-default_theme_with_default_apps/data/default-theme/plug-ins/musicPlayer/musicPlayer.conf'
--- .pc/01-default_theme_with_default_apps/data/default-theme/plug-ins/musicPlayer/musicPlayer.conf	2011-03-17 14:08:48 +0000
+++ .pc/01-default_theme_with_default_apps/data/default-theme/plug-ins/musicPlayer/musicPlayer.conf	1970-01-01 00:00:00 +0000
@@ -1,172 +0,0 @@
-#!en;1.0.7
-
-#[gtk-about]
-[Icon]
-
-#F[Applet]
-frame_maininfo=
-
-#d Name of the dock it belongs to:
-dock name=
-
-#s Name of the icon as it will appear in its caption in the dock:
-#{Leave it empty to display the name of the player currently controlled.}
-name=
-
-#F[Display]
-frame_display=
-
-icon=
-#j[0;128] Desired icon size for this applet
-#{Set to 0 to use the default applet size}
-#
-#
-icon size=0;0;
-
-order=22.375
-
-#F[Applet's Handbook]
-frame_hand=
-#A
-handbook=musicPlayer
-
-#[gtk-convert]
-[Desklet]
-
-#X[Position]
-frame_pos=
-
-#b Lock position?
-#{If locked, the desklet cannot be moved by simply dragging it with the left mouse button. It can still be moved with ALT + left-click.}
-locked=false
-
-#j+[24;512] Desklet dimensions (width x height):
-#{Depending on your WindowManager, you may be able to resize this with ALT + middle-click or ALT + left-click.}
-size=96;96;
-
-#i[-2048;2048] Desklet position (x, y):
-#{Depending on your WindowManager, you may be able to move this with ALT + left-click.}
-x position=0
-#i[-2048;2048] ...
-y position=0
-
-#I[-180;180] Rotation:
-#{You can quickly rotate the desklet with the mouse, by dragging the little buttons on its left and top sides.}
-rotation=0
-
-#X[Visibility]
-frame_visi=
-
-#b Is detached from the dock
-initially detached=false
-#l[Normal;Keep above;Keep below;Keep on widget layer;Reserve space] Visibility:
-#{for CompizFusion's "widget layer", set behaviour in Compiz to: (class=Cairo-dock & type=utility)}
-accessibility=0
-#b Should be visible on all desktops?
-sticky=true
-
-
-
-
-#F[Decorations;gtk-orientation-portrait]
-frame_deco=
-
-#o+ Choose a decoration theme for this desklet:
-#{Choose 'Custom decorations' to define your own decorations below.}
-decorations=default
-
-#v
-sep_deco=
-
-#S+ Background image:
-#{Image to be displayed below drawings, e.g. a frame. Leave empty for no image.}
-bg desklet=
-#e+[0;1] Background transparency:
-bg alpha=1
-#i+[0;256] Left offset:
-#{in pixels. Use this to adjust the left position of drawings.}
-left offset=0
-#i+[0;256] Top offset:
-#{in pixels. Use this to adjust the top position of drawings.}
-top offset=0
-#i+[0;256] Right offset:
-#{in pixels. Use this to adjust the right position of drawings.}
-right offset=0
-#i+[0;256] Bottom offset:
-#{in pixels. Use this to adjust the bottom position of drawings.}
-bottom offset=0
-#S+ Foreground image:
-#{Image to be displayed above the drawings, e.g. a reflection. Leave empty for no image.}
-fg desklet=
-#e+[0;1] Foreground tansparency:
-fg alpha=1
-
-#[gtk-preferences]
-[Configuration]
-
-#F[Audio Player;gtk-cdrom]
-frame_player=
-#L[Amarok 2;Audacious;Banshee;Clementine;Exaile;Exaile 0.3;GMusicBrowser;Guayadeque;Listen;Qmmp;QuodLibet;Rhythmbox;Songbird;XMMS 2;XMMS] Player to control:
-current-player=Rhythmbox
-
-#b Steal the player's icon from the taskbar?
-#{This will prevent the player icon appearing in the taskbar. The applet's icon will then behave as a launcher, an application and an applet.}
-inhibate appli=true
-
-#l[Play/Pause on click, Next on middle-click;Show/Hide player on click, Play/Pause on middle-click] Actions on click and middle-click :
-pause on click=0
-
-
-#F[Action on music change;gtk-preferences]
-frame_info=
-
-#B Show tooltips?
-enable_dialogs=true
-
-#i[1;30] Time length of tooltips:
-#{in seconds.}
-time_dialog=4
-
-#a+ Animation when music changes:
-change_animation=wobbly
-
-
-#F[Display;gtk-dialog-info]
-frame_disp=
-
-#l[Nothing;Time Elapsed;Time Remaining;Track number] Information to display on the icon :
-quick-info_type=1
-
-#B Display album's cover?
-enable_cover=true
-
-#b Allow Cairo-Dock to download missing covers?
-#{You need to be connected to the Internet.}
-DOWNLOAD=true
-
-#B+ Use 3D themes?
-#{requires OpenGL.}
-enable_opengl_themes=true
-
-#h+[/usr/share/cairo-dock/plug-ins/musicPlayer/themes;musicPlayer;musicPlayer] List of available 3D themes for covers :
-#{requires OpenGL.}
-theme=cd_box_simple
-
-
-#X[Customisation;gtk-dialog-info]
-frame_perso=
-#S+ 'Default' icon image name:
-#{Leave empty to use the default icon.}
-default icon=
-#S+ Name of the image for the 'play' icon :
-#{Leave empty to use the default icon.}
-play icon=
-#S+ Name of the image for the 'stop' icon :
-#{Leave empty to use the default icon.}
-stop icon=
-#S+ Name of the image for the 'pause' icon :
-#{Leave empty to use the default icon.}
-pause icon=
-#S+ 'Broken' icon image name:
-#{Leave empty to use the default icon.}
-broken icon=

=== added directory '.pc/01-musicPlayer_with_banshee'
=== added directory '.pc/01-musicPlayer_with_banshee/data'
=== added directory '.pc/01-musicPlayer_with_banshee/data/default-theme'
=== added directory '.pc/01-musicPlayer_with_banshee/data/default-theme/plug-ins'
=== added directory '.pc/01-musicPlayer_with_banshee/data/default-theme/plug-ins/musicPlayer'
=== added file '.pc/01-musicPlayer_with_banshee/data/default-theme/plug-ins/musicPlayer/musicPlayer.conf'
--- .pc/01-musicPlayer_with_banshee/data/default-theme/plug-ins/musicPlayer/musicPlayer.conf	1970-01-01 00:00:00 +0000
+++ .pc/01-musicPlayer_with_banshee/data/default-theme/plug-ins/musicPlayer/musicPlayer.conf	2011-08-09 20:04:34 +0000
@@ -0,0 +1,174 @@
+#1.0.8
+
+#[gtk-about]
+[Icon]
+
+#F[Icon]
+frame_maininfo=
+
+#d Name of the dock it belongs to:
+dock name=
+
+#s Name of the icon as it will appear in its caption in the dock:
+#{Leave it empty to display the name of the player currently controlled.}
+name=
+ #v
+sep_display=
+
+icon=
+
+#j[0;128] Desired icon size for this applet
+#{Set to 0 to use the default applet size}
+icon size=0;0;
+
+order=22.375
+
+#F[Applet's Handbook]
+frame_hand=
+#A
+handbook=musicPlayer
+
+
+#[gtk-convert]
+[Desklet]
+
+#X[Position]
+frame_pos=
+
+#b Lock position?
+#{If locked, the desklet cannot be moved by simply dragging it with the left mouse button. It can still be moved with ALT + left-click.}
+locked=false
+
+#j+[24;512] Desklet dimensions (width x height):
+#{Depending on your WindowManager, you may be able to resize this with ALT + middle-click or ALT + left-click.}
+size=96;96;
+
+#i[-2048;2048] Desklet position (x, y):
+#{Depending on your WindowManager, you may be able to move this with ALT + left-click.}
+x position=0
+#i[-2048;2048] ...
+y position=0
+
+#I[-180;180] Rotation:
+#{You can quickly rotate the desklet with the mouse, by dragging the little buttons on its left and top sides.}
+rotation=0
+
+#X[Visibility]
+frame_visi=
+
+#b Is detached from the dock
+initially detached=false
+#l[Normal;Keep above;Keep below;Keep on widget layer;Reserve space] Visibility:
+#{for CompizFusion's "widget layer", set behaviour in Compiz to: (class=Cairo-dock & type=utility)}
+accessibility=0
+#b Should be visible on all desktops?
+sticky=true
+
+
+#F[Decorations;gtk-orientation-portrait]
+frame_deco=
+
+#o+ Choose a decoration theme for this desklet:
+#{Choose 'Custom decorations' to define your own decorations below.}
+decorations=default
+
+#v
+sep_deco=
+
+#S+ Background image:
+#{Image to be displayed below drawings, e.g. a frame. Leave empty for no image.}
+bg desklet=
+#e+[0;1] Background transparency:
+bg alpha=1
+#i+[0;256] Left offset:
+#{in pixels. Use this to adjust the left position of drawings.}
+left offset=0
+#i+[0;256] Top offset:
+#{in pixels. Use this to adjust the top position of drawings.}
+top offset=0
+#i+[0;256] Right offset:
+#{in pixels. Use this to adjust the right position of drawings.}
+right offset=0
+#i+[0;256] Bottom offset:
+#{in pixels. Use this to adjust the bottom position of drawings.}
+bottom offset=0
+#S+ Foreground image:
+#{Image to be displayed above the drawings, e.g. a reflection. Leave empty for no image.}
+fg desklet=
+#e+[0;1] Foreground tansparency:
+fg alpha=1
+
+
+#[gtk-preferences]
+no input=false
+depth rotation y=0
+depth rotation x=0
+
+[Configuration]
+
+#F[Audio Player;gtk-cdrom]
+frame_player=
+#L[Amarok 2;Audacious;Banshee;Clementine;Exaile;Exaile 0.3;GMusicBrowser;Guayadeque;Listen;Qmmp;QuodLibet;Rhythmbox;Songbird;XMMS 2;XMMS] Player to control:
+current-player=Rhythmbox
+
+#b Steal the player's icon from the taskbar?
+#{This will prevent the player icon appearing in the taskbar. The applet's icon will then behave as a launcher, an application and an applet.}
+inhibate appli=true
+
+#l[Play/Pause on click, Next on middle-click;Show/Hide player on click, Play/Pause on middle-click] Actions on click and middle-click :
+pause on click=0
+
+
+#F[Action on music change;gtk-preferences]
+frame_info=
+
+#B Show tooltips?
+enable_dialogs=true
+
+#i[1;30] Time length of tooltips:
+#{in seconds.}
+time_dialog=4
+
+#a+ Animation when music changes:
+change_animation=wobbly
+
+
+#F[Display;gtk-dialog-info]
+frame_disp=
+
+#l[Nothing;Time Elapsed;Time Remaining;Track number] Information to display on the icon :
+quick-info_type=1
+
+#B Display album's cover?
+enable_cover=true
+
+#b Allow Cairo-Dock to download missing covers?
+#{You need to be connected to the Internet.}
+DOWNLOAD=true
+
+#B+ Use 3D themes?
+#{requires OpenGL.}
+enable_opengl_themes=true
+
+#h+[/usr/share/cairo-dock/plug-ins/musicPlayer/themes;musicPlayer;musicPlayer] List of available 3D themes for covers :
+#{requires OpenGL.}
+theme=cd_box_simple
+
+
+#X[Customisation;gtk-dialog-info]
+frame_perso=
+#S+ 'Default' icon image name:
+#{Leave empty to use the default icon.}
+default icon=
+#S+ Name of the image for the 'play' icon :
+#{Leave empty to use the default icon.}
+play icon=
+#S+ Name of the image for the 'stop' icon :
+#{Leave empty to use the default icon.}
+stop icon=
+#S+ Name of the image for the 'pause' icon :
+#{Leave empty to use the default icon.}
+pause icon=
+#S+ 'Broken' icon image name:
+#{Leave empty to use the default icon.}
+broken icon=

=== modified file '.pc/applied-patches'
--- .pc/applied-patches	2011-06-20 14:57:12 +0000
+++ .pc/applied-patches	2011-08-09 20:04:34 +0000
@@ -1,1 +1,1 @@
-01-default_theme_with_default_apps
+01-musicPlayer_with_banshee

=== modified file 'CMakeLists.txt'
--- CMakeLists.txt	2011-06-20 14:57:12 +0000
+++ CMakeLists.txt	2011-08-09 20:04:34 +0000
@@ -10,7 +10,7 @@
 ########### project ###############
 
 project ("cairo-dock")
-set (VERSION "2.3.0~3")
+set (VERSION "2.4.0~0beta2")
 
 add_definitions (-std=c99 -Wstrict-prototypes -Wextra -Wwrite-strings -Wuninitialized -Werror-implicit-function-declaration) #-Wunreachable-code -Wno-unused-parameter -Wall 
 if (NOT ${CMAKE_BUILD_TYPE})
@@ -28,7 +28,7 @@
 set (CPACK_SOURCE_GENERATOR "TGZ")
 set (CPACK_SOURCE_PACKAGE_FILE_NAME "${CMAKE_PROJECT_NAME}-${VERSION}")
 set (CPACK_SOURCE_IGNORE_FILES 
-	"/build/;/.bzr/;bzrignore$;/config.h$;/gldi-config.h$;/scripts/;/doc/;/misc/;~$;${CPACK_SOURCE_IGNORE_FILES}")
+	"/build/;/.bzr/;bzrignore$;/config.h$;/gldi-config.h$;/doc/;/misc/;~$;${CPACK_SOURCE_IGNORE_FILES}")
 include (CPack)
 
 add_custom_target( dist
@@ -50,6 +50,7 @@
 set (datadir ${prefix}/share)
 set (pkgdatadir ${datadir}/cairo-dock)
 set (mandir ${datadir}/man)
+set (VERSION_HELP "0.9.99") # needed to parse Help.conf.in
 
 if( CMAKE_SIZEOF_VOID_P EQUAL 8 AND NOT "${FORCE_LIB64}" STREQUAL "")  # 64bits and force install in lib64
 	set (libdir ${prefix}/lib64)
@@ -120,14 +121,17 @@
 configure_file (${CMAKE_CURRENT_SOURCE_DIR}/data/cairo-dock.conf.in ${CMAKE_CURRENT_BINARY_DIR}/data/cairo-dock.conf)
 configure_file (${CMAKE_CURRENT_SOURCE_DIR}/data/cairo-dock-simple.conf.in ${CMAKE_CURRENT_BINARY_DIR}/data/cairo-dock-simple.conf)
 configure_file (${CMAKE_CURRENT_SOURCE_DIR}/data/main-dock.conf.in ${CMAKE_CURRENT_BINARY_DIR}/data/main-dock.conf)
+configure_file (${CMAKE_CURRENT_SOURCE_DIR}/data/launcher.desktop.in ${CMAKE_CURRENT_BINARY_DIR}/data/launcher.desktop)
+configure_file (${CMAKE_CURRENT_SOURCE_DIR}/data/container.desktop.in ${CMAKE_CURRENT_BINARY_DIR}/data/container.desktop)
+configure_file (${CMAKE_CURRENT_SOURCE_DIR}/data/separator.desktop.in ${CMAKE_CURRENT_BINARY_DIR}/data/separator.desktop)
 configure_file (${CMAKE_CURRENT_SOURCE_DIR}/data/themes.conf.in ${CMAKE_CURRENT_BINARY_DIR}/data/themes.conf)
-configure_file (${CMAKE_CURRENT_SOURCE_DIR}/data/help.conf.in ${CMAKE_CURRENT_BINARY_DIR}/data/help.conf)
+configure_file (${CMAKE_CURRENT_SOURCE_DIR}/data/Help.conf.in ${CMAKE_CURRENT_BINARY_DIR}/data/Help.conf)
 configure_file (${CMAKE_CURRENT_SOURCE_DIR}/cairo-dock.pc.in ${CMAKE_CURRENT_BINARY_DIR}/cairo-dock.pc)
 configure_file (${CMAKE_CURRENT_SOURCE_DIR}/cmake_uninstall.cmake.in ${CMAKE_CURRENT_BINARY_DIR}/cmake_uninstall.cmake IMMEDIATE @ONLY)
 
 ########### install files ###############
 
-install (FILES cairo-dock-package-theme launch-cairo-dock-with-delay
+install (FILES cairo-dock-package-theme
 	DESTINATION ${bindir}
 	PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE GROUP_READ GROUP_EXECUTE WORLD_READ WORLD_EXECUTE)
 install (FILES ${CMAKE_CURRENT_BINARY_DIR}/cairo-dock.pc DESTINATION ${libdir}/pkgconfig)

=== modified file 'cairo-dock.pc.in'
--- cairo-dock.pc.in	2010-09-18 14:17:48 +0000
+++ cairo-dock.pc.in	2011-08-09 20:04:34 +0000
@@ -9,5 +9,5 @@
 Description: An eye-candy fully animated and configurable dock.
 Requires: gtk+-2.0 gthread-2.0 cairo librsvg-2.0 dbus-1 dbus-glib-1 libxml-2.0 xrender gtkglext-1.0 @xextend_required@ @glitz_required@ @libgio_required@
 Libs: -L${libdir}
-Cflags: -I${includedir}/cairo-dock -I${includedir}/cairo-dock/cairo-dock -I${includedir}/cairo-dock/icon-factory
+Cflags: -I${includedir}/cairo-dock -I${includedir}/cairo-dock/gldit -I${includedir}/cairo-dock/icon-factory -I${includedir}/cairo-dock/implementations
 Version: @VERSION@

=== removed file 'cairo-dock_theme-creator.sh'
--- cairo-dock_theme-creator.sh	2010-08-09 23:26:12 +0000
+++ cairo-dock_theme-creator.sh	1970-01-01 00:00:00 +0000
@@ -1,626 +0,0 @@
-#!/bin/bash
-
-# Theme creator for Cairo-Dock
-#
-# Copyright : (C) 2008 by Fabounet
-# E-mail    : [e-mail]
-#
-#
-# This program is free software; you can redistribute it and/or
-# modify it under the terms of the GNU General Public License
-# as published by the Free Software Foundation; either version 2
-# of the License, or (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-# http://www.gnu.org/licenses/licenses.html#GPL
-
-# Auteur : Nochka85
-# Contact : [e-mail]
-# Version : 05/07/08
-
-# Changelog
-# 05/07/08 :	Ajout catégorie drive_internet ET specific_vlc_icon
-# 05/07/08 :	Refonte totale du scipt + Ajout de fonctionnalités (choix des catégories dans une liste coché ou décoché)... ;-)
-# 02/07/08 :	Ajout de l'option --test - 1ere mise en ligne sur le FTP ;-)
-# 01/07/08 :	Ajout des catégories specific_firefox_icon, specific_thunderbird_icon, specific_inkscape_icon, specific_gimp_icon, launcher, settings, gohome ET system_search
-# 30/06/08 :	Ajout de catégories + Ajout d'icônes spécifiques + Ajout options --relink --[category] --help 
-# 29/06/08 :	Ajout detection format + répertoire source + amelioration diverse
-# 29/06/08 :	Ebauche du programme
-		
-
-DEBUG=0 # Attention, ne pas oublier de remettre a 0 pour une MAJ du script ... quand ce sera dispo ;-)
-
-# ICONS_DIR="/home/$USER/cairo-dock_theme-creator/"  ## Pour moi ;-)
-ICONS_DIR="/home/$USER/.cairo-dock/icons_themes/"
-
-# MAIN_CAT="web_browser mail_reader video_messenger video_player"  # Encore pour moi :-)
-MAIN_CAT="web_browser file_browser mail_reader image_reader audio_player video_player writer bittorrent downloader cd_burner settings gohome system_search launcher image_editor text_messenger video_messenger terminal packages system_monitor calculator virtual_machine remote_control logo_distribution home_folder default_folder desktop computer webcam irc"
-
-DRIVES_CAT="drive_usb_mounted drive_usb_unmounted network_folder harddrive drive_optical floppy_unmounted drive_internet"
-
-#SPECIFICS_CAT="specific_firefox_icon"	# Encore pour moi :-)
-SPECIFICS_CAT="googleearth specific_skype_icon specific_amsn_icon specific_gaim_icon specific_oowriter_icon specific_oodraw_icon specific_oocalc_icon specific_ooimpress_icon specific_oobase_icon specific_oomath_icon specific_update_manager specific_firefox_icon specific_thunderbird_icon specific_inkscape_icon specific_gimp_icon specific_vlc_icon"
-
-
-
-## Catégories MAIN_CAT :
-LINKS_WEB_BROWSER="firefox firefox-3.0 opera epiphany"
-LINKS_FILE_BROWSER="nautilus konqueror thunar pcmanfm"
-LINKS_MAIL_READER="thunderbird kmail evolution"
-LINKS_IMAGE_READER="eog gqview gwenview f-spot"
-LINKS_AUDIO_PLAYER="rhythmbox exaile xmms listen audacious beep-media-player bmp amarok"
-LINKS_VIDEO_PLAYER="totem mplayer vlc xine kaffeine smplayer"
-LINKS_WRITER="gedit kate oowriter ooo-writer abiword emacs mousepad"
-LINKS_BITTORRENT="transmission deluge bittornado gnome-btdownload ktorrent"
-LINKS_DOWNLOADER="amule emule filezilla"
-LINKS_CD_BURNER="nautilus-burner graveman k3b brasero gnomebaker"
-LINKS_SETTINGS="gnome-settings"
-LINKS_GOHOME="gohome"
-LINKS_SYSTEM_SEARCH="system-search tracker-search-tool"
-LINKS_LAUNCHER="gnome-panel-launcher"
-LINKS_IMAGE_EDITOR="gimp inkscape krita"
-LINKS_TEXT_MESSENGER="gaim pidgin kopete emessene"
-LINKS_VIDEO_MESSENGER="skype ekiga amsn"
-LINKS_TERMINAL="gnome-terminal konsole xfce4-terminal"
-LINKS_PACKAGES="synaptic adept pacman-g2 update-manager"
-LINKS_SYSTEM_MONITOR="ksysguard gnome-system-monitor utilities-system-monitor conky"
-LINKS_CALCULATOR="gnome-calculator accessories-calculator gcalctool crunch"
-LINKS_VIRTUAL_MACHINE="VBox vmware-server"
-LINKS_REMOTE_CONTROL="tsclient"
-LINKS_LOGO_DISTRIBUTION="distributor-logo gnome-main-menu start-here"
-LINKS_HOME_FOLDER="user-home gnome-fs-home folder_home"
-LINKS_DEFAULT_FOLDER="folder gnome-fs-directory"
-LINKS_DESKTOP="desktop"
-LINKS_COMPUTER="computer"
-LINKS_WEBCAM="cheese"
-LINKS_IRC="xchat konversation kvirc"
-
-## Catégories DRIVES_CAT :
-LINKS_DRIVE_USB_MOUNTED="drive-harddisk-usb"
-LINKS_DRIVE_USB_UNMOUNTED="drive-removable-media-usb"
-LINKS_NETWORK_FOLDER="network folder-remote"
-LINKS_HARDDRIVE="gnome-dev-harddisk drive-harddisk"
-LINKS_DRIVE_OPTICAL="drive-optical"
-LINKS_FLOPPY_UNMOUNTED="drive-removable-media"
-LINKS_DRIVE_INTERNET="applications-internet gnome-globe package_network redhat-internet stock_internet xfce-internet"
-
-## Catégories SPECIFICS_CAT :
-LINKS_GOOGLEEARTH="googleearth"
-LINKS_SPECIFIC_SKYPE_ICON="skype"
-LINKS_SPECIFIC_AMSN_ICON="amsn"
-LINKS_SPECIFIC_GAIM_ICON="gaim"
-LINKS_SPECIFIC_OOWRITER_ICON="oowriter ooo-writer"
-LINKS_SPECIFIC_OODRAW_ICON="oodraw ooo-draw"
-LINKS_SPECIFIC_OOCALC_ICON="oocalc ooo-calc"
-LINKS_SPECIFIC_OOIMPRESS_ICON="ooimpress ooo-impress"
-LINKS_SPECIFIC_OOBASE_ICON="oobase ooo-base"
-LINKS_SPECIFIC_OOMATH_ICON="oomath ooo-math"
-LINKS_SPECIFIC_UPDATE_MANAGER="update-manager"
-LINKS_SPECIFIC_FIREFOX_ICON="firefox firefox-3.0"
-LINKS_SPECIFIC_THUNDERBIRD_ICON="thunderbird"
-LINKS_SPECIFIC_INKSCAPE_ICON="inkscape"
-LINKS_SPECIFIC_GIMP_ICON="gimp"
-LINKS_SPECIFIC_VLC_ICON="vlc"
-
-
-
-
-
-
-
-SCRIPT="cairo-dock_theme-creator.sh"		#OK
-SCRIPT_SAVE="cairo-dock_theme-creator.sh.save"	#OK
-SCRIPT_NEW="cairo-dock_theme-creator.sh.new"	#OK
-HOST="http://theme_creator.glx-dock.org"	#OK
-
-
-
-
-IFS=" "				#OK
-START_MENU=""			#OK
-TODO_LIST=""			#OK
-TODO_FINAL=""			#OK
-THEME_NAME=""			#OK
-WORK_DIR=""			#OK
-LINKS=""			#OK
-CURRENT_ICON=""			#OK
-START_DIR="/home/$USER/"	#OK
-REDO_DIR=""			#OK
-GLOBAL_NAME=""			#OK
-FILENAME=""			#OK
-FORMAT=""			#OK
-DETAIL_LIST=""			#OK
-TRUE_FALSE=""			#OK
-TEST_FILE="test_links.log"	#OK
-LOG_FILE="log.txt"
-
-
-NORMAL="\\033[0;39m"
-BLEU="\\033[1;34m"
-VERT="\\033[1;32m" 
-ROUGE="\\033[1;31m"
-
-
-#############################################################################################################
-links_definition() {
-## Catégories MAIN_CAT :
-	if [ $current_category = "web_browser" ]; then LINKS=$LINKS_WEB_BROWSER;
-	elif [ $current_category = "file_browser" ]; then LINKS=$LINKS_FILE_BROWSER;
-	elif [ $current_category = "mail_reader" ]; then LINKS=$LINKS_MAIL_READER;
-	elif [ $current_category = "image_reader" ]; then LINKS=$LINKS_IMAGE_READER;
-	elif [ $current_category = "audio_player" ]; then LINKS=$LINKS_AUDIO_PLAYER;
-	elif [ $current_category = "video_player" ]; then LINKS=$LINKS_VIDEO_PLAYER;
-	elif [ $current_category = "writer" ]; then LINKS=$LINKS_WRITER;
-	elif [ $current_category = "bittorrent" ]; then LINKS=$LINKS_BITTORRENT;
-	elif [ $current_category = "downloader" ]; then LINKS=$LINKS_DOWNLOADER;
-	elif [ $current_category = "cd_burner" ]; then LINKS=$LINKS_CD_BURNER;
-	elif [ $current_category = "settings" ]; then LINKS=$LINKS_SETTINGS;
-	elif [ $current_category = "gohome" ]; then LINKS=$LINKS_GOHOME;
-	elif [ $current_category = "system_search" ]; then LINKS=$LINKS_SYSTEM_SEARCH;
-	elif [ $current_category = "launcher" ]; then LINKS=$LINKS_LAUNCHER;
-	elif [ $current_category = "image_editor" ]; then LINKS=$LINKS_IMAGE_EDITOR;
-	elif [ $current_category = "text_messenger" ]; then LINKS=$LINKS_TEXT_MESSENGER;
-	elif [ $current_category = "video_messenger" ]; then LINKS=$LINKS_VIDEO_MESSENGER;
-	elif [ $current_category = "terminal" ]; then LINKS=$LINKS_TERMINAL;
-	elif [ $current_category = "packages" ]; then LINKS=$LINKS_PACKAGES;
-	elif [ $current_category = "system_monitor" ]; then LINKS=$LINKS_SYSTEM_MONITOR;
-	elif [ $current_category = "calculator" ]; then LINKS=$LINKS_CALCULATOR;
-	elif [ $current_category = "virtual_machine" ]; then LINKS=$LINKS_VIRTUAL_MACHINE;
-	elif [ $current_category = "remote_control" ]; then LINKS=$LINKS_REMOTE_CONTROL;
-	elif [ $current_category = "logo_distribution" ]; then LINKS=$LINKS_LOGO_DISTRIBUTION;
-	elif [ $current_category = "home_folder" ]; then LINKS=$LINKS_HOME_FOLDER;
-	elif [ $current_category = "default_folder" ]; then LINKS=$LINKS_DEFAULT_FOLDER;
-	elif [ $current_category = "desktop" ]; then LINKS=$LINKS_DESKTOP;
-	elif [ $current_category = "computer" ]; then LINKS=$LINKS_COMPUTER;
-	elif [ $current_category = "webcam" ]; then LINKS=$LINKS_WEBCAM;
-	elif [ $current_category = "irc" ]; then LINKS=$LINKS_IRC;
-
-
-## Catégories DRIVES_CAT :
-	elif [ $current_category = "drive_usb_mounted" ]; then LINKS=$LINKS_DRIVE_USB_MOUNTED;
-	elif [ $current_category = "drive_usb_unmounted" ]; then LINKS=$LINKS_DRIVE_USB_UNMOUNTED;
-	elif [ $current_category = "network_folder" ]; then LINKS=$LINKS_NETWORK_FOLDER;
-	elif [ $current_category = "harddrive" ]; then LINKS=$LINKS_HARDDRIVE;
-	elif [ $current_category = "drive_optical" ]; then LINKS=$LINKS_DRIVE_OPTICAL;
-	elif [ $current_category = "floppy_unmounted" ]; then LINKS=$LINKS_FLOPPY_UNMOUNTED;
-	elif [ $current_category = "drive_internet" ]; then LINKS=$LINKS_DRIVE_INTERNET;
-
-## Catégories SPECIFICS_CAT :
-	elif [ $current_category = "googleearth" ]; then LINKS=$LINKS_GOOGLEEARTH;
-	elif [ $current_category = "specific_skype_icon" ]; then LINKS=$LINKS_SPECIFIC_SKYPE_ICON;
-	elif [ $current_category = "specific_amsn_icon" ]; then LINKS=$LINKS_SPECIFIC_AMSN_ICON;
-	elif [ $current_category = "specific_gaim_icon" ]; then LINKS=$LINKS_SPECIFIC_GAIM_ICON;
-	elif [ $current_category = "specific_oowriter_icon" ]; then LINKS=$LINKS_SPECIFIC_OOWRITER_ICON;
-	elif [ $current_category = "specific_oodraw_icon" ]; then LINKS=$LINKS_SPECIFIC_OODRAW_ICON;
-	elif [ $current_category = "specific_oocalc_icon" ]; then LINKS=$LINKS_SPECIFIC_OOCALC_ICON;
-	elif [ $current_category = "specific_ooimpress_icon" ]; then LINKS=$LINKS_SPECIFIC_OOIMPRESS_ICON;
-	elif [ $current_category = "specific_oobase_icon" ]; then LINKS=$LINKS_SPECIFIC_OOBASE_ICON;
-	elif [ $current_category = "specific_oomath_icon" ]; then LINKS=$LINKS_SPECIFIC_OOMATH_ICON;
-	elif [ $current_category = "specific_update_manager" ]; then LINKS=$LINKS_SPECIFIC_UPDATE_MANAGER;
-	elif [ $current_category = "specific_firefox_icon" ]; then LINKS=$LINKS_SPECIFIC_FIREFOX_ICON;
-	elif [ $current_category = "specific_thunderbird_icon" ]; then LINKS=$LINKS_SPECIFIC_THUNDERBIRD_ICON;
-	elif [ $current_category = "specific_inkscape_icon" ]; then LINKS=$LINKS_SPECIFIC_INKSCAPE_ICON;
-	elif [ $current_category = "specific_gimp_icon" ]; then LINKS=$LINKS_SPECIFIC_GIMP_ICON;
-	elif [ $current_category = "specific_vlc_icon" ]; then LINKS=$LINKS_SPECIFIC_VLC_ICON;
-	fi
-}
-
-
-#############################################################################################################
-check_new_script() {
-	cp $SCRIPT $SCRIPT_SAVE #pour moi :)
-	echo -e "$NORMAL"""
-	echo "Vérification de la disponibilité d'un nouveau script"
-	wget $HOST/$SCRIPT -q -O $SCRIPT_NEW	
-	diff $SCRIPT $SCRIPT_NEW >/dev/null
-	if [ $? -eq 1 ]; then
-		echo -e "$ROUGE"		
-		echo "Veuillez relancer le script, une mise à jour a été téléchargée"
-		echo -e "$NORMAL"
-		mv $SCRIPT_NEW $SCRIPT
-		chmod u+x $SCRIPT
-		zenity --info --title="Cairo-Dock Theme Creator" --text="Une mise à jour a été téléchargée.	Cliquez sur Ok pour fermer le terminal."
-		exit
-	else
-		echo ""
-		echo -e "$VERT""Vous possédez la dernière version du script de Nochka85"
-	fi
-	echo -e "$NORMAL"
-	rm $SCRIPT_NEW
-}
-
-
-#############################################################################################################
-start_menu() {
-# Remise à zéro des variables:
-IFS=" "
-START_MENU=""			#OK
-TODO_LIST=""			#OK
-TODO_FINAL=""			#OK
-THEME_NAME=""			#OK
-WORK_DIR=""			#OK
-LINKS=""			#OK
-CURRENT_ICON=""			#OK
-START_DIR="/home/$USER/"	#OK
-REDO_DIR=""			#OK
-GLOBAL_NAME=""			#OK
-FILENAME=""			#OK
-FORMAT=""			#OK
-DETAIL_LIST=""			#OK
-TRUE_FALSE=""			#OK
-
-
-
-
-
-
-START_MENU=$(zenity --width=800 --height=400 --list --separator " " --column="Choix" --column="Action" --column="Observation" --radiolist --text="Choisissez l'action à effectuer (Cliquez sur "Annuler" pour quitter) :" --title="CD Theme Creator" \
-true "NOUVEAU THEME D'ICÔNES" "Créez un nouveau thème d'icônes standard pour Cairo-dock" \
-false "Re-créer les liens d'un thème d'icônes standard" "A effectuer en cas de liens cassés et/ou manquants dans un thème d'icônes créé avec ce script" \
-false "Sélectionner les catégories dans une liste" "Sélectionnez vous même les catégories à traiter dans une liste (TOUT DECOCHE par défaut)" \
-false "Désélectionner les catégories dans une liste" "Sélectionnez vous même les catégories à traiter dans une liste (TOUT COCHE par défaut)" \
-false "Tester ou contrôler un thème d'icônes existant" "Retrouvez facilement les catégories et les liens qu'il manque à votre thème d'icônes")
-
-
-if [ "$START_MENU" = "" ]; then 
-	exit
-else
-	IFS="|"
-	for temp in $START_MENU
-		do
-
-		if [ $temp = "NOUVEAU THEME D'ICÔNES" ]; then
-			new_theme
-			start_menu
-						
-		elif [ $temp = "Re-créer les liens d'un thème d'icônes standard" ]; then
-			relink
-			start_menu
-
-		elif [ $temp = "Sélectionner les catégories dans une liste" ]; then 
-			select_false
-			start_menu
-
-		elif [ $temp = "Désélectionner les catégories dans une liste" ]; then
-			select_true
-			start_menu
-
-		elif [ $temp = "Tester ou contrôler un thème d'icônes existant" ]; then
-			do_report
-			start_menu
-
-		fi
-		done
-fi
-IFS=" "
-}
-
-#############################################################################################################
-new_theme() {
-choose_category		# Definition de $TODO_FINAL
-working_directory	# Definition du nom du répertoire $WORK_DIR
-new_directory		# Création du nouveau répertoire
-cd $WORK_DIR
-REDO_DIR="$START_DIR"
-copy_categories		# Copie des icônes des différentes catégories			
-relink_icons		# Création des liens
-zenity --info --title="CD Theme Creator" --text="Votre thème a été créé dans le répertoire:\n$WORK_DIR"
-}
-
-#############################################################################################################
-relink() {
-tempo_text="Spécifier le répertoire dans lequel re-créer les liens"
-todo_relink
-relink_icons
-zenity --info --title="CD Theme Creator" --text="Tous les liens ont été re-créés dans :\n$WORK_DIR\n\nCliquer sur Valider pour revenir au menu principal..."
-}
-
-#############################################################################################################
-select_false() {
-TRUE_FALSE="FALSE"
-select_true_false
-}
-
-#############################################################################################################
-select_true() {
-TRUE_FALSE="TRUE"
-select_true_false
-}
-
-#############################################################################################################
-select_true_false() {
-choose_category
-detail_list		# Definition de $TODO_FINAL et $WORK_DIR
-cd $WORK_DIR
-REDO_DIR="$START_DIR"
-copy_categories		# Copie des icônes des différentes catégories			
-relink_icons		# Création des liens
-zenity --info --title="CD Theme Creator" --text="Toutes les catégories sélectionnées ont été créés dans le répertoire:\n$WORK_DIR"
-}
-
-
-#############################################################################################################
-choose_category() {
-IFS=" "
-TODO_LIST=$(zenity --width=750 --height=400 --list --column="Choix" --column="Catégories" --column="Observation" --checklist --text="Choisissez les catégories d'icônes à traiter\n\nATTENTION : Les icônes génériques sont OBLIGATOIRES\n" --title="CD Theme Creator" \
-true "Icônes génériques" "Ce sont les icônes OBLIGATOIRES pour un thème standard cairo-dock" \
-false "Icônes des VOLUMES" "Conseillés pour certaines applets de cairo-dock" \
-false "Icônes spécifiques" "Permettent de "surcharger" les icônes génériques pour certaines applications (exemple : Firefox, Thunderbird,etc...)")
-
-if [ "$TODO_LIST" = "" ]; then start_menu
-
-else
-	IFS="|"
-	for temp in $TODO_LIST
-		do
-
-		if [ $temp = "Icônes génériques" ]; then 
-						for categorie in $MAIN_CAT
-							do 
-								TODO_FINAL="$TODO_FINAL$categorie "
-							done
-
-		elif [ $temp = "Icônes des VOLUMES" ]; then 
-						for categorie in $DRIVES_CAT
-							do 
-								TODO_FINAL="$TODO_FINAL$categorie "
-							done
-		
-		elif [ $temp = "Icônes spécifiques" ]; then 
-						for categorie in $SPECIFICS_CAT
-							do 
-								TODO_FINAL="$TODO_FINAL$categorie "
-							done
-		fi
-		done
-fi
-IFS=" "
-}
-
-
-#############################################################################################################
-working_directory() {
-THEME_NAME=$(zenity --entry --title="CD Theme Creator" --text="Entrez le nom de votre thème d'icônes (il sera placé dans $ICONS_DIR)")
-if [ "$THEME_NAME" = "" ]; then
-				zenity --error --text "Aucun nom n'a été rentré ou l'opération a été annulée..."
-				TODO_FINAL=""
-				start_menu
-else
-WORK_DIR="$ICONS_DIR$THEME_NAME"/
-fi
-}
-
-
-#############################################################################################################
-new_directory() {
- if test -e $ICONS_DIR$THEME_NAME; then
-		zenity --error --text "Le répertoire $THEME_NAME existe déjà dans \n $ICONS_DIR\nVeuillez entrer un autre nom pour votre thème d'icônes..."
-		working_directory
-		new_directory
- else
-	mkdir -p $WORK_DIR
- fi
-}
-
-#############################################################################################################
-copy_categories() {
-for current_category in $TODO_FINAL
-		do
-			choose_icon
-			if [ "$CURRENT_ICON" != "" ]; then
-				rm -f $WORK_DIR.$current_category.*
-				cp -f $CURRENT_ICON $WORK_DIR.$current_category.$FORMAT
-			fi
-		done
-}
-
-
-#############################################################################################################
-choose_icon() {
-	zenity --info --title="CD Theme Creator" --text="Choisissez une image pour "$current_category"\n\nAnnuler pour passer\n"
-	CURRENT_ICON=$(zenity --file-selection --filename $REDO_DIR --title="CD Theme Creator - Image "$current_category)
-	if [ "$CURRENT_ICON" != "" ]; then
-		REDO_DIR=`dirname $CURRENT_ICON`/		# Répertoire de l'icône
-		GLOBAL_NAME=`basename $CURRENT_ICON`		# Nom de l'image avec son extension
-		FILENAME=${GLOBAL_NAME%.*}			# Nom du fichier SANS extension
-		FORMAT=${GLOBAL_NAME##*.}			# Extension SEULE
-	fi
-}
-
-
-#############################################################################################################
-todo_relink() {
-TODO_FINAL=""
-for categorie in $MAIN_CAT
-	do 
-		TODO_FINAL="$TODO_FINAL$categorie "
-	done
-
-for categorie in $DRIVES_CAT
-	do 
-		TODO_FINAL="$TODO_FINAL$categorie "
-	done
-
-for categorie in $SPECIFICS_CAT
-	do 
-		TODO_FINAL="$TODO_FINAL$categorie "
-	done
-
-zenity --info --title="CD Theme Creator" --text="$tempo_text"
-WORK_DIR=$(zenity --file-selection --filename $ICONS_DIR --directory --title="CD Theme Creator")/
-
-if [ "$WORK_DIR" = "/" ]; then
-				zenity --error --text "L'opération a été annulée..."
-				TODO_FINAL=""
-				start_menu
-fi
-}
-
-
-
-#############################################################################################################
-relink_icons() {
-IFS=" "
-	for current_category in $TODO_FINAL
-		do
-			for FORMAT in "svg" "png"
-				do
-					if test -e $WORK_DIR.$current_category.$FORMAT; then
-						cd $WORK_DIR
-						links_definition
-						for links in $LINKS
-							do
-								rm -f $links.*
-								ln -s -f .$current_category.$FORMAT $links.$FORMAT
-							done
-					fi
-				done
-		done
-}
-
-
-
-#############################################################################################################
-detail_list() {
-DETAIL_LIST=""
-for current_category in $TODO_FINAL
-	do
-		links_definition
-		temp=""
-		for links in $LINKS
-			do
-			temp="$temp[$links]"
-			done
-
-		DETAIL_LIST="$DETAIL_LIST$TRUE_FALSE $current_category $temp "
-	done
-
-TODO_FINAL=""
-TODO_FINAL=$(zenity --width=750 --height=400 --list --column="Choix" --column="Catégories" --column="Liste des applications concernées" --checklist --text="Choisissez les catégories d'icônes à traiter\n\nATTENTION : Les icônes génériques sont OBLIGATOIRES\n" --title="CD Theme Creator" $DETAIL_LIST)
-DETAIL_LIST="$TODO_FINAL"
-TODO_FINAL=""
-IFS="|"
-for temp in $DETAIL_LIST
-	do
-		TODO_FINAL="$TODO_FINAL$temp "
-	done
-IFS=" "
-
-if [ "$TODO_FINAL" = "" ]; then
-				zenity --error --text "Aucune catégorie n'a été sélectionnée ou l'opération a été annulée..."
-				TODO_FINAL=""
-				start_menu
-fi
-
-
-
-zenity --info --title="CD Theme Creator" --text="Spécifier le répertoire dans lequel (re-)créer les liens"
-WORK_DIR=$(zenity --file-selection --filename $ICONS_DIR --directory --title="CD Theme Creator")/
-
-
-if [ "$WORK_DIR" = "/" ]; then
-				zenity --error --text "Aucun répertoire n'a été spécifié ou l'opération a été annulée..."
-				TODO_FINAL=""
-				start_menu
-fi
-
-
-}
-
-
-#############################################################################################################
-do_report() {
-tempo_text="Spécifier le répertoire où tester les liens"
-todo_relink		# Definition $TODO_FINAL et $WORK_DIR
-cd $WORK_DIR
-rm -f $TEST_FILE
-IFS=" "
-
-for current_category in $TODO_FINAL
-	do
-		for FORMAT in "png" "svg"
-			do
-				if test -e .$current_category.$FORMAT; then
-					echo "OK : La categorie $current_category EXISTE au format $FORMAT">>$TEST_FILE
-					CURRENT=.$current_category.$FORMAT
-					links_definition
-					for links in $LINKS
-						do
-							if test -e $links.$FORMAT; then
-								cd $WORK_DIR
-							else
-								echo "          ATTENTION : le lien $links.$FORMAT est absent de la categorie $current_category">>$TEST_FILE
-							fi
-						done
-				else
-					echo "La categorie $current_category n'a pas ete creee en $FORMAT">>$TEST_FILE
-				fi
-			done
-		echo "">>$TEST_FILE
-		echo "">>$TEST_FILE
-	done
-
-zenity --info --title="CD Theme Creator" --text="Un fichier de rapport $TEST_FILE a été créé dans $WORK_DIR\nCliquer sur Valider pour continuer"
-cat $TEST_FILE | zenity --text-info --title="CD Theme Creator - $TEST_FILE" --width 550 --height=700
-}
-
-
-
-
-#############################################################################################################
-# DEBUT DU PROGRAMME
-#############################################################################################################
-
-
-if [ $DEBUG -ne 1 ]; then
-	check_new_script
-fi
-
-
-case $1 in
-
-	"--help")
-		echo -e "$VERT""Usage:"		
-		echo -e "$NORMAL""$0""$VERT""         			Créer un nouveau thème" 
-		echo -e "$NORMAL""$0 --relink""$VERT""        		Re-créer les liens dans un répertoire avec des liens cassés"
-		echo -e "$NORMAL""$0 --choose_all""$VERT""        	Specifier la (ou les) catégorie(s) à traiter (Tout coché par défaut)"
-		echo -e "$NORMAL""$0 --choose_none""$VERT""        	Specifier la (ou les) catégorie(s) à traiter (Tout décoché par défaut)"
-		echo -e "$NORMAL""$0 --test""$VERT""        		Vérifier qu'un thème est complet"
-		echo -e "$NORMAL""$0 --help""$VERT""          		Afficher ce menu d'aide "
-		echo ""
-		echo ""
-		echo -e "$NORMAL""Auteur : Nochka85"
-		echo -e "$NORMAL""Contact : [e-mail]"
-		echo ""
-		exit
-	;;
-
-	"--relink")
-		relink
-		exit
-	;;
-
-	"--choose_all")
-		select_true
-		exit
-	;;
-
-	"--choose_none")
-		select_false
-		exit
-	;;
-		
-	"--test")
-		do_report
-		exit
-	;;
-esac
-
-start_menu
-exit
-
-
-

=== removed file 'compile-all.sh'
--- compile-all.sh	2010-08-09 23:26:12 +0000
+++ compile-all.sh	1970-01-01 00:00:00 +0000
@@ -1,354 +0,0 @@
-#!/bin/sh
-
-export CAIRO_DOCK_DIR=`pwd`/..
-export CAIRO_DOCK_PREFIX=/usr
-export CAIRO_DOCK_AUTORECONF="0"
-export CAIRO_DOCK_CLEAN="0"
-export CAIRO_DOCK_COMPIL="0"
-export CAIRO_DOCK_UNSTABLE="0"
-export CAIRO_DOCK_INSTALL="0"
-export CAIRO_DOCK_DOC="0"
-export CAIRO_DOCK_EXCLUDE="template stacks"
-export CAIRO_DOCK_GLITZ_OPTION=""
-export CAIRO_DOCK_PLUG_INS_OPTION=""
-export SUDO=sudo
-export TIME=time
-
-echo "this script will process : "
-while getopts "acCituhd:Dgm" flag
-do
-	echo " option $flag $OPTIND $OPTARG"
-	case "$flag" in
-	a)
-		echo " => re-generation of files"
-		export CAIRO_DOCK_AUTORECONF="1"
-		;;
-	c)
-		echo " => cleaning"
-		export CAIRO_DOCK_CLEAN="1"
-		;;
-	C)
-		echo " => compilation"
-		export CAIRO_DOCK_COMPIL="1"
-		;;
-	i)
-		echo " => installation"
-		export CAIRO_DOCK_INSTALL="1"
-		;;
-	u)
-		echo " => include unstable applets"
-		export CAIRO_DOCK_UNSTABLE="1"
-		;;
-	d)
-		echo " => use folder $OPTARG"
-		export CAIRO_DOCK_DIR="$OPTARG"
-		;;
-	D)
-		echo " => build documentation $OPTARG"
-		export CAIRO_DOCK_DOC="1"
-		;;
-	g)
-		echo " => enable glitz"
-		export CAIRO_DOCK_GLITZ_OPTION="--enable-glitz"
-		;;
-	m)
-		echo " => minimum requirements"
-		export CAIRO_DOCK_PLUG_INS_OPTION="--without-mail --without-weblet"
-		;;
-	h)
-		echo "-a : run autoreconf"
-		echo "-c : clean all"
-		echo "-C : compil"
-		echo "-i : install (will ask root password)"
-		echo "-u : include still unstable applets"
-		echo "-d rep : compile in the folder 'rep'"
-		exit 0
-		;;
-	*)
-		echo "unexpected argument"
-		exit 1
-		;;
-	esac
-done
-export CAIRO_DOCK_EXTRACT_MESSAGE=${CAIRO_DOCK_DIR}/utils/cairo-dock-extract-message
-export CAIRO_DOCK_GEN_TRANSLATION=${CAIRO_DOCK_DIR}/cairo-dock/po/generate-translation.sh
-
-echo ""
-
-rm -f $CAIRO_DOCK_DIR/compile.log
-
-cd $CAIRO_DOCK_DIR
-find . -name linguas -execdir mv linguas LINGUAS \;
-find . -name potfiles.in -execdir mv potfiles.in POTFILES.in \;
-
-
-cd $CAIRO_DOCK_DIR/cairo-dock
-echo "*********************************"
-echo "* Compilation of cairo-dock ... *"
-echo "*********************************"
-if test "$CAIRO_DOCK_CLEAN" = "1"; then
-	rm -f config.* configure configure.lineno intltool-extract intltool-merge intltool-update libtool ltmain.sh Makefile.in Makefile aclocal.m4 install-sh install depcomp missing compile cairo-dock.pc stamp-h1 cairo-dock.conf 
-	rm -rf autom4te.cache src/.deps src/.libs src/Makefile src/Makefile.in po/Makefile po/Makefile.in po/*.gmo src/*.o src/*.lo src/*.la
-	if test "$CAIRO_DOCK_DOC" = "1"; then
-		rm -rf doc/html
-		rm -rf doc/latex
-	fi
-fi
-if test "$CAIRO_DOCK_AUTORECONF" = "1"; then
-	if test -e po; then
-		echo "generating translation files ..."
-		if test -x $CAIRO_DOCK_EXTRACT_MESSAGE; then
-			rm -f data/messages
-			for c in data/*.conf
-			do
-				$CAIRO_DOCK_EXTRACT_MESSAGE $c
-			done;
-			$CAIRO_DOCK_EXTRACT_MESSAGE data/ChangeLog.txt
-		fi
-		cd po
-		$CAIRO_DOCK_GEN_TRANSLATION
-		cd ..
-	fi
-	echo  "* configuring ..."
-	/usr/bin/time -f "  time elapsed : %Us" autoreconf -isf > /dev/null && ./configure --prefix=$CAIRO_DOCK_PREFIX $CAIRO_DOCK_GLITZ_OPTION > /dev/null
-	if test ! "$?" = "0"; then
-		echo "  Attention : an error has occured !"
-		echo "Error while configuring cairo-dock" >> $CAIRO_DOCK_DIR/compile.log
-	else
-		echo "  -> passed"
-	fi
-fi
-if test "$CAIRO_DOCK_CLEAN" = "1" -a -e Makefile; then
-	make clean > /dev/null
-fi
-if test "$CAIRO_DOCK_COMPIL" = "1"; then
-	echo  "* compiling ..."
-	/usr/bin/time -f "  time elapsed : %Us" make > /dev/null
-	if test ! "$?" = "0"; then
-		echo "  Attention : an error has occured !"
-		echo "Error while compiling cairo-dock" >> $CAIRO_DOCK_DIR/compile.log
-	else
-		echo "  -> passed"
-	fi
-fi
-if test "$CAIRO_DOCK_DOC" = "1"; then
-	echo  "* generating documentation ..."
-	cd doc
-	/usr/bin/time -f "  time elapsed : %Us" doxygen dox.config > /dev/null
-	if test ! "$?" = "0"; then
-		echo "  Attention : an error has occured !"
-		echo "Error while generating documentation" >> $CAIRO_DOCK_DIR/compile.log
-	else
-		echo "  -> passed"
-	fi
-	cd ..
-fi
-if test "$CAIRO_DOCK_INSTALL" = "1"; then
-	echo "*  installation of cairo-dock..."
-	$SUDO rm -f $CAIRO_DOCK_PREFIX/bin/cairo-dock
-	$SUDO rm -rf $CAIRO_DOCK_PREFIX/share/cairo-dock
-	$SUDO rm -rf $CAIRO_DOCK_PREFIX/lib/cairo-dock
-	/usr/bin/time -f "  time elapsed : %Us" $SUDO make install > /dev/null
-	if test ! "$?" = "0"; then
-		echo "  Attention : an error has occured !"
-		echo "Error while installing cairo-dock" >> $CAIRO_DOCK_DIR/compile.log
-	else
-		echo "  -> passed"
-	fi
-	$SUDO chmod +x $CAIRO_DOCK_PREFIX/bin/cairo-dock-update.sh
-	$SUDO chmod +x $CAIRO_DOCK_PREFIX/bin/launch-cairo-dock-after-beryl.sh
-	$SUDO chmod +x $CAIRO_DOCK_PREFIX/bin/cairo-dock-package-theme.sh
-fi
-
-
-### On liste les plug-ins a compiler.
-cd $CAIRO_DOCK_DIR/plug-ins
-export liste_stable="`sed "/^#/d" Applets.stable`"
-export liste_all="`find . -maxdepth 1  -type d | cut -d "/" -f 2 | /bin/grep -v '\.'`"
-if test "$CAIRO_DOCK_UNSTABLE" = "1"; then
-	export liste_plugins="`echo $liste_all`"
-else
-	export liste_plugins="`echo $liste_stable`"
-fi
-echo "the following applets will be compiled :"
-echo "$liste_plugins"
-
-echo "*************************************"
-echo "* Compilation of stable modules ... *"
-echo "*************************************"
-
-### on extrait les messages des plug-ins a traduire.
-if test "$CAIRO_DOCK_AUTORECONF" = "1"; then
-	echo "extracting sentences to translate..."
-	for plugin in $liste_plugins
-	do
-		if test -d $plugin; then
-			cd $plugin
-			if test -e Makefile.am -a "$plugin" != "$CAIRO_DOCK_EXCLUDE"; then
-				if test -e po; then
-					echo "generating translation files for $plugin ..."
-					if test -x $CAIRO_DOCK_EXTRACT_MESSAGE; then
-						rm -f data/messages
-						for c in data/*.conf
-						do
-							$CAIRO_DOCK_EXTRACT_MESSAGE "$c"
-						done;
-					fi
-					cd po
-					$CAIRO_DOCK_GEN_TRANSLATION # defient obsolete.
-					cd ..
-				fi
-			fi
-			cd ..
-		fi
-	done;
-fi
-
-cd po
-$CAIRO_DOCK_GEN_TRANSLATION all
-cd ..
-
-
-### On compile les plug-ins stables en une passe.
-export compil_ok="1"
-if test "$CAIRO_DOCK_AUTORECONF" = "1"; then
-	echo  "* configuring stable plug-ins ..."
-	/usr/bin/time -f "  time elapsed : %Us" autoreconf -isf > /dev/null && ./configure $CAIRO_DOCK_PLUG_INS_OPTION --prefix=$CAIRO_DOCK_PREFIX > /dev/null
-	if test ! "$?" = "0"; then
-		echo "  Attention : an error has occured !"
-		echo "Error while configuring stable plug-ins" >> $CAIRO_DOCK_DIR/compile.log
-		export compil_ok="0"
-	else
-		echo "  -> passed"
-	fi
-fi
-if test "$CAIRO_DOCK_CLEAN" = "1" -a -e Makefile; then
-	make clean > /dev/null
-fi
-if test "$CAIRO_DOCK_COMPIL" = "1"; then
-	echo  "* compiling stable plug-ins ..."
-	/usr/bin/time -f "  time elapsed : %Us" make > /dev/null
-	if test ! "$?" = "0"; then
-		echo "  Attention : an error has occured !"
-		echo "Error while compiling stable plug-ins" >> $CAIRO_DOCK_DIR/compile.log
-		export compil_ok="0"
-	else
-		echo "  -> passed"
-	fi
-fi
-if test "$CAIRO_DOCK_INSTALL" = "1"; then
-	echo "*  installation of stable plug-ins ..."
-	/usr/bin/time -f "  time elapsed : %Us" $SUDO make install > /dev/null
-	if test ! "$?" = "0"; then
-		echo "  Attention : an error has occured !"
-		echo "Error while installing stable plug-ins" >> $CAIRO_DOCK_DIR/compile.log
-		export compil_ok="0"
-	else
-		echo "  -> passed"
-	fi
-fi
-
-### On les compilera un a un si la compil globale a foirre.
-if test "$compil_ok" = "0"; then
-	if test "$CAIRO_DOCK_UNSTABLE" = "0"; then
-		export liste_all="$liste_stable"
-	fi
-	export liste_stable=""
-fi
-
-### On compile un a un les plug-ins instables.
-if test "$CAIRO_DOCK_UNSTABLE" = "1" -o "$compil_ok" = "0"; then
-	for plugin in $liste_all
-	do
-		if test "`echo $liste_stable | grep $plugin`" = ""; then
-			cd $plugin
-			export exluded="0"
-			for e in $CAIRO_DOCK_EXCLUDE
-			do
-				if test "$e" = "$plugin"; then
-					export exluded="1"
-				fi
-			done;
-			if test -e Makefile.am -a "$exluded" != "1"; then
-				
-				echo "************************************"
-				echo "* Compilation of module $plugin ... *"
-				echo "************************************"
-				if test "$CAIRO_DOCK_CLEAN" = "1"; then
-					rm -f config.* configure configure.lineno intltool-extract intltool-merge intltool-update libtool ltmain.sh Makefile.in Makefile aclocal.m4 missing stamp-h1 depcomp compile install-sh
-					rm -rf autom4te.cache src/.deps src/.libs src/Makefile src/Makefile.in po/Makefile po/Makefile.in po/*.gmo src/*.o src/*.lo src/*.la
-				fi
-				if test "$CAIRO_DOCK_AUTORECONF" = "1"; then
-					if test -e po; then
-						if test -x $CAIRO_DOCK_EXTRACT_MESSAGE; then
-							rm -f data/messages
-							for c in data/*.conf
-							do
-								$CAIRO_DOCK_EXTRACT_MESSAGE $c
-							done;
-						fi
-						cd po
-						$CAIRO_DOCK_GEN_TRANSLATION
-						cd ..
-					fi
-					echo  "* configuring ..."
-					/usr/bin/time -f "  time elapsed : %Us" autoreconf -isf > /dev/null && ./configure --prefix=$CAIRO_DOCK_PREFIX $CAIRO_DOCK_GLITZ_OPTION > /dev/null
-					if test ! "$?" = "0"; then
-						echo "  Attention : an error has occured !"
-						echo "Error while configuring $plugin" >> $CAIRO_DOCK_DIR/compile.log
-					else
-						echo "  -> passed"
-					fi
-				fi
-				if test "$CAIRO_DOCK_CLEAN" = "1" -a -e Makefile; then
-					make clean > /dev/null
-				fi
-				if test "$CAIRO_DOCK_COMPIL" = "1"; then
-					echo  "* compiling ..."
-					/usr/bin/time -f "  time elapsed : %Us" make > /dev/null
-					if test ! "$?" = "0"; then
-						echo "  Attention : an error has occured !"
-						echo "Error while compiling $plugin" >> $CAIRO_DOCK_DIR/compile.log
-					else
-						echo "  -> passed"
-					fi
-				fi
-				if test "$CAIRO_DOCK_INSTALL" = "1"; then
-					echo "*  installation of module $plugin..."
-					/usr/bin/time -f "  time elapsed : %Us" $SUDO make install > /dev/null
-					if test ! "$?" = "0"; then
-						echo "  Attention : an error has occured !"
-						echo "Error while installing $plugin" >> $CAIRO_DOCK_DIR/compile.log
-					else
-						echo "  -> passed"
-					fi
-				fi
-			fi
-			cd ..
-		fi
-	done;
-fi
-
-if test "$CAIRO_DOCK_INSTALL" = "1"; then
-	$SUDO rm -f $CAIRO_DOCK_PREFIX/lib/cairo-dock/*.la
-	
-	echo "check :"
-	echo "------------"
-	date +"compil ended at %c"
-	ls -l $CAIRO_DOCK_PREFIX/bin/cairo-dock
-	ls -l $CAIRO_DOCK_PREFIX/lib/cairo-dock
-#	nb_plugins = "`ls $CAIRO_DOCK_PREFIX/lib/cairo-dock/*.so | wc -w`"
-fi
-
-cd $CAIRO_DOCK_DIR
-echo "number of lines/word/caracters of sources (.c only) :"
-sed '/^ *$/d' cairo-dock/src/*.c plug-ins/*/src/*.c | sed '/^\t*$/d'  | sed '/^\t*\/\/*/d' | sed '/\t*\/\*/d' | wc
-
-if test -e compile.log; then
-	echo "\033[8;34mSome errors were encountered :\033[0m"
-	cat compile.log
-else
-	echo "Compile is a success !"
-fi
-
-exit

=== modified file 'data/CMakeLists.txt'
--- data/CMakeLists.txt	2011-03-17 14:08:48 +0000
+++ data/CMakeLists.txt	2011-08-09 20:04:34 +0000
@@ -3,81 +3,25 @@
 add_subdirectory(explosion)
 add_subdirectory(man)
 add_subdirectory(icons)
+add_subdirectory(images)
+add_subdirectory(scripts)
 
 
 ########### install files ###############
 
+# misc
 install (FILES
-	# lib
-	rotate-desklet.svg
-	retach-desklet.svg
-	no-input-desklet.png
-	depth-rotate-desklet.svg
-	cairo-dock-ok.svg
-	cairo-dock-cancel.svg
-	hand.svg
-	default-class-indicator.svg
-	default-icon-appli.svg
-	default-icon.svg
-	default-indicator.png
-	launcher.desktop
-	container.desktop
-	separator.desktop
-	# implementations
-	preview-default.png
+	cairo-dock.svg
 	readme-default-view
-	box-back.png
-	box-front.png
-	# appli
-	cairo-dock-animated.xpm
-	cairo-dock-logo.png
-	cairo-dock.svg
 	ChangeLog.txt
-	icon-accessories.svg
-	icon-all.svg
-	icon-appearance.svg
-	icon-background.svg
-	icon-behavior.svg
-	icon-bubble.png
-	icon-buttons.png
-	icon-close.png
-	icon-connection.svg
-	icon-controler.svg
-	icon-desklets.png
-	icon-desktop.svg
-	icon-dialogs.svg
-	icon-extensions.svg
-	icon-files.svg
-	icon-frame.png
-	icon-fun.svg
-	icon-gradation.png
-	icon-help.svg
-	icon-hidden-dock.svg
-	icon-icons.svg
-	icon-indicators.svg
-	icon-internet.svg
-	icon-labels.svg
-	icon-lock-icons.svg
-	icon-maximize.png
-	icon-minimize.png
-	icon-mouse.svg
-	icon-movment.png
-	icon-plug-ins.svg
-	icon-position.svg
-	icon-restore.png
-	icon-subdock.png
-	icon-system.svg
-	icon-taskbar.png
-	icon-views.svg
-	icon-visibility.svg
-	icon-wave.png
 	DESTINATION ${pkgdatadir})
 
-# appli
-install (FILES help_scripts.sh
-	DESTINATION ${pkgdatadir}
-	PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE GROUP_READ GROUP_EXECUTE WORLD_READ WORLD_EXECUTE)
+# appli icon
+install (FILES
+	cairo-dock.svg
+	DESTINATION ${datadir}/pixmaps)
 
+# conf files
 install (FILES
 	# lib
 	${CMAKE_CURRENT_BINARY_DIR}/main-dock.conf
@@ -85,14 +29,13 @@
 	# appli
 	${CMAKE_CURRENT_BINARY_DIR}/cairo-dock-simple.conf
 	${CMAKE_CURRENT_BINARY_DIR}/themes.conf
-	${CMAKE_CURRENT_BINARY_DIR}/help.conf
+	${CMAKE_CURRENT_BINARY_DIR}/Help.conf
+	${CMAKE_CURRENT_BINARY_DIR}/launcher.desktop
+	${CMAKE_CURRENT_BINARY_DIR}/container.desktop
+	${CMAKE_CURRENT_BINARY_DIR}/separator.desktop
 	DESTINATION ${pkgdatadir})
 
-# appli
-install (FILES
-	cairo-dock.svg
-	DESTINATION ${datadir}/pixmaps)
-
+# appli desktop file
 install (FILES
 	cairo-dock.desktop 		cairo-dock-cairo.desktop
 	DESTINATION ${datadir}/applications)

=== modified file 'data/ChangeLog.txt'
--- data/ChangeLog.txt	2011-03-17 14:08:48 +0000
+++ data/ChangeLog.txt	2011-08-09 20:04:34 +0000
@@ -48,3 +48,5 @@
 2.2.0 = <b><span color='red'>GLX-Dock 2.2.0</span></b>\n - The dock has gained 2 <b>new visibility modes</b> and several <b>auto-hide animations</b>.\n - Icons can be <b>displayed even when the dock is hidden</b> (Clock, System-Monitor, applications demanding your attention, etc)\n - Icons pointing on a sub-dock can be displayed <b>inside a box</b> with a nice opening animation.\n - A <b>new view</b> is available : <u>panel</u>\n - The <b>Me-Menu</b> and <b>Messaging-Menu</b> are now available inside the dock.\n - <b>Clock</b> applet has now a real <b>calendar with tasks management</b> (available with left-click).\n - You can now <b>lock your screen</b> with the <b>Logout</b> applet.\n - <b>Desklets</b> can now be <b>transparent to mouse</b>, that is to say you can click on what is behind the desklet.\n - Better support of <b>old graphic cards</b> thanks to FBOs.\n - The <b>config panel icons</b> have been refreshed, with a more Tango-friendly theme and better options layout.\n - A <b>new default theme</b> is also available; it should integrate itself better on any desktop.
 
 2.3.0 = <b><span color='red'>GLX-Dock 2.3.0</span></b>\n - A lot of <b>new applets</b> are available in our new repository! (Transmission, Deluge, MintMenu, Translator, Quote of the day, etc)\n   You can install them for free in a single click!\n - The new <i>"Recent-Events"</i> applet lets you browse your <b>last activties</b> (music, videos, documents, web pages, etc).\n - The <i>System-Monitor</i> applet can now monitor <b>CPU temperature</b> and <b>fan speed</b>.\n - The <i>menus</i> have a <b>better layout</b>.\n - The <i>Logout applet</i> now warns you when the computer <b>needs to be restarted</b>.\n - The <i>Stack</i> applet now displays the <b>web page's favicon</b>.\n - The <i>Drop and Share</i> applet now handles <b>UbuntuOne</b>.\n - Better integration with <b>Compiz and Kwin</b>.\n - Several <b>bug-fixes</b> and improvments.
+
+2.4.0 = <b><span color='red'>GLX-Dock 2.4.0</span></b>\n - The <b>Power-Manager applet</b> has been rewritten to work on any plateform.\n - A <b>new Help applet</b> has been added to help our beloved user :-)\n - Improved <b>integration in the XFCE desktop</b>\n - Several <b>new DBus methods</b> lets you interact on the dock more easily.

=== added file 'data/Help.conf.in'
--- data/Help.conf.in	1970-01-01 00:00:00 +0000
+++ data/Help.conf.in	2011-08-09 20:04:34 +0000
@@ -0,0 +1,549 @@
+#@VERSION_HELP@
+
+#[@pkgdatadir@/icons/icon-help.svg]
+[General]
+
+#X[Using the dock]
+Using the dock =
+#>Most icons in the dock have several actions: the primary action on left-click, a secondary action on middle-click, and additionnal actions on right-click (in the menu).
+#Some applets let you bind a shortkey to an action, and decide which action sould be on middle-click.
+_Using the dock =
+
+#X[Adding features]
+Adding features =
+#>Cairo-Dock has a lot of applets. Applets are small applications that live inside the dock, for instance a clock or a log-out button.
+#To enable new applets, open the settings (right-click -> Cairo-Dock -> configure), go to "Add-ons", and tick the applet you want.
+#More applets can be installed easily: in the configuration window, click on the "More applets" button (which will lead you to our applets web page) and then just drag-and-drop the link of an applet into your dock.
+_Adding features =
+
+#[@pkgdatadir@/icons/icon-icons.svg]
+[Icons]
+
+#X[Adding a launcher]
+Adding a launcher =
+#>You can add a launcher by drag-and-dropping it from the Applications Menu into the dock. An animated arrow will appear when you can drop.
+#Alternatively, if an application is already opened, you can right-click on its icon and select "make it a launcher".
+_Adding a launcher =
+
+#X[Removing a launcher]
+Removing a launcher =
+#>You can remove a launcher by drag-and-dropping it outside the dock. A "delete" emblem will appear on it when you can drop it.
+_Removing a launcher =
+
+#X[Grouping icons into a sub-dock]
+Grouping icons into a sub-dock =
+#>You can group icons into a "sub-dock".
+#To add a sub-dock, right-click on the dock -> add -> a sub-dock.
+#To move an icon into the sub-dock, right-click on an icon -> move to another dock -> select the sub-dock's name.
+_Grouping icons into a sub-dock =
+
+#X[Moving icons]
+Moving icons =
+#> You can drag any icon to a new location inside its dock.
+#You can move an icon into another dock by right-clicking on it -> move to another dock -> select the dock you want.
+#If you select "a new main dock", a main dock will be created with this icon inside.
+_Moving icons =
+
+#X[Changing an icon's image]
+Changing an icon's image =
+#>- For a launcher or an applet:
+#Open the settings of the icon, and set a path to an image.
+#- For an aplication icon:
+#Right-click on the icon -> "set a custom icon". Then choose an image you'd like to use, and apply. To remove the custom image, right-click on the icon -> "remove the custom icon".
+#If you have installed some icons themes on your PC, you can also select one of them to be used instead of the default icon theme, in the global config window.
+_Changing an icon's image =
+
+#X[Resizing icons]
+Resizing icons =
+#>You can make the icons and the zoom effect smaller or bigger. Open the settings (right-click -> Cairo-Dock -> configure), and go to Appearance (or Icons in advanced mode).
+#Note that if there are too many icons inside the dock, they will be zoomed out to fit in the screen.
+#Also, you can define the size of each applet independently in their own settings.
+_Resizing icons =
+
+#X[Separating icons]
+Separators =
+#>You can add separators between icons by right-clicking on the dock -> add -> a separator.
+#Also, if you enabled the option to separate icons of different types (launchers/applications/applets), a separator will be added automatically between each group.
+#In the "panel" view, separators are represented as gap between icons.
+_Separators =
+
+
+#[@pkgdatadir@/icons/icon-taskbar.png]
+[Taskbar]
+
+#X[Using the dock as a taskbar]
+Using the dock as a taskbar =
+#>When an application is running, a corresponding icon will appear in the dock.
+#If the application already has a launcher, the icon will not appear, instead its launcher will have a small indicator.
+#Note that you can decide which applications should appear in the dock: only the windows of the current desktop, only the hidden windows, separated from the launcher, etc.
+_Using the dock as a taskbar =
+
+#X[Closing a window]
+Closing a window =
+#>You can close a window by middle-clicking on its icon (or from the menu).
+_Closing a window =
+
+#X[Minimizing / restauring a window]
+Minimizing / restauring a window =
+#>Clicking on its icon will bring the window on top.
+#When the window has the focus, clicking on its icon will minimize the window.
+_Minimizing / restauring a window =
+
+#X[Launching an application several times]
+Launching an application several times =
+#>You can launch an application several times by SHIFT+clicking on its icon (or from the menu).
+_Launching an application several times =
+
+#X[Switching between the windows of a same application]
+Switching between the windows of a same application =
+#>With your mouse, scroll up/down on one of the icons of the application. Each time you scroll, the next/previous window will be presented to you.
+_Switching between the windows of a same application =
+
+#X[Grouping windows of a given application]
+Grouping windows of a given application =
+#>When an application has several windows, one icon for each window will appear in the dock; they will be grouped togather into a sub-dock.
+#Clicking on the main icon will display all the windows of the application side-by-side (if your Window Manager is able to do that).
+_Grouping windows of a given application =
+
+#X[Setting a custom icon for an application]
+Setting a custom icon for an application =
+#>See "Changing an icon's image" in the "Icons" category.
+_Setting a custom icon for an application =
+
+#X[Showing windows preview over the icons]
+Showing windows preview =
+#>You need to run Compiz, and enable the "Window Preview" plug-in in Compiz. Install "ccsm" to be able to configure Compiz.
+_Showing windows preview =
+preview_compiz =
+#G [sh '@pkgdatadir@/scripts/help_scripts.sh' compiz_plugin thumbnail && dbus-send --session --dest=org.freedesktop.compiz /org/freedesktop/compiz/thumbnail/screen0/current_viewport org.freedesktop.compiz.set boolean:false;sh -c "ps aux | grep -v grep | grep -c 'compiz'"]If you're using Compiz, you can click on this button:
+#{Tip: If this line is grayed, it's because this tip is not for you.)
+preview_compiz_button=
+
+
+#[@pkgdatadir@/icons/icon-background.svg]
+[Docks]
+
+#X[Positionning the dock on the screen]
+Positionning the dock on the screen =
+#>The dock can be placed anywhere on the screen.
+#In the case of the main dock, right-click -> Cairo-Dock -> configure, and then select the position you want.
+#In the case of a 2nd or 3rd dock, right-click -> Cairo-Dock -> set up this dock, and then select the position you want.
+_Positionning the dock on the screen=
+
+#X[Hiding the dock to use all the screen]
+Hiding the dock to use all the screen=
+#>The dock can hide itself to let all the screen for applications. But it can also be always visible like a panel.
+#To change that, right-click -> Cairo-Dock -> configure, and then select the visibility you want.
+#In the case of a 2nd or 3rd dock, right-click -> Cairo-Dock -> set up this dock, and then select the visibility you want.
+_Hiding the dock to use all the screen=
+
+#X[Having more than one dock]
+Having more than one dock=
+#>TODO
+_Having more than one dock=
+
+#X[Deleting a dock]
+Deleting a dock=
+#>TODO
+_Deleting a dock=
+
+#X[Changing the look of a dock]
+Changing the look of a dock=
+#>TODO
+_Changing the look of a dock=
+
+
+
+#[@pkgdatadir@/icons/icon-desklets.png]
+[Desklets]
+
+#X[Placing applets on your desktop]
+Placing applets on your desktop =
+#>Applets can live inside desklets, which are small windows that can be placed wherever on your desktop.
+#To detach an applet from the dock, simply drag and drop it outside the dock.
+_Placing applets on your desktop =
+
+#X[Moving desklets]
+Moving desklets  =
+#>Desklets can be moved anywhere simply with the mouse.
+#They can also be rotated by dragging the small arrows on the top and left sides.
+#If you don't want to move it any more, you can lock its position by right-clicking on it -> "lock position". To unlock it, de-select this option.
+_Moving desklets  =
+
+#X[Placing desklets]
+Placing desklets =
+#>From the menu (right-click -> visibility), you can also decide to keep it above other windows, or on the Widget Layer (if you use Compiz), or make a "desklet bar" by placing them on a side of the screen and selecting "reserve space".
+#Desklets that don't need interaction (like the clock) can be set transparent to the mouse (means you can click on what is behind them), by clicking on the small bottom-right button.
+_Placing desklets =
+
+#X[Changing the desklets decorations]
+Changing the desklets decorations =
+#>Desklets can have decorations. To change that, open the settings of the applet, go to Desklet, and select the decoration you want (you can provide your own one).
+_Changing the desklets decorations =
+
+
+#[@pkgdatadir@/icons/icon-system.svg]
+[Useful Features]
+
+#X[Having a calendar with tasks]
+Having a calendar with tasks =
+#>Activate the Clock applet.
+#Clicking on it will display a calendar.
+#Double-clicking on a day will pop-up a task-editor. Here you can add/remove taks.
+#When a task has been or is going to be scheduled, the applet will warn you (15mn before the event, and also 1 day before in the case of an anniversary).
+_Having a calendar with tasks =
+
+#X[Having a list of all windows]
+Having a list of all windows =
+#>Activate the Switcher applet.
+#Right-clicking on it will give you access to a list containing all the windows, sorted by desktops.
+#You can also display the windows side-by-side if your Window-Manager is able to do that.
+#You can bind this action to the middle-click.
+_Having a list of all windows =
+
+#X[Showing all the desktops]
+Showing all the desktops =
+#>Activate either the Switcher applet or the Show-Desktop applet.
+#Right-click on it -> "show all the desktop".
+#You can bind this action to the middle-click.
+_Showing all the desktops =
+
+#X[Changing the screen resolution]
+Changing the screen resolution =
+#>Activate the Show-Desktop applet.
+#Right-click on it -> "change resolution" -> select the one you want.
+_Changing the screen resolution =
+
+#X[Locking your session]
+Locking your session =
+#>Activate the Log-out applet.
+#Right-click on it -> "lock screen".
+#You can bind this action to the middle-click.
+_Locking your session =
+
+#X[Quick-launching a program from keyboard (replacing ALT+F2)]
+Quick-launching a program from keyboard (replacing ALT+F2) =
+#>Activate the Applications Menu applet.
+#Middle-click on it, or right-click -> "quick-launch".
+#You can bin a shortkey for this action.
+#The text is automatically completed (for instance, typing "fir" will be completed into "firefox").
+_Quick-launching a program from keyboard (replacing ALT+F2) =
+
+#X[Turning Composite OFF during games]
+Turning Composite OFF during games =
+#>Activate the Composite Manager applet.
+#Clicking on it will disable the Composite, which often makes games more smooth.
+#Clicking again on it will enable the Composite.
+_Turning Composite OFF during games =
+
+#X[Seeing the hourly weather forecast]
+Seeing the hourly weather forecast =
+#>Activate the Weather applet.
+#Open its settings, go to Configure, and type the name of your city. Press Enter, and select your city from the list that will appear.
+#Then validate to close the settings window.
+#Now, double-clicking on a day will lead you to the web page of the hourly forecast for this day.
+_Seeing the hourly weather forecast =
+
+#X[Adding a file or a web page into the dock]
+Adding a file or a web page into the dock =
+#>Simply drag a file or an html link and drop it onto the dock (an animated arrow should appear when you can drop).
+#It will be added into the Stack. The Stack is a sub-dock that can contain any file or link you want to access quickly.
+#You can have several Stacks, and you can drop files/links onto a Stack directly.
+_Adding a file or a web page into the dock =
+
+#X[Importing a folder into the dock]
+Importing a folder into the dock =
+#>Simply drag a folder and drop it onto the dock (an animated arrow should appear when you can drop).
+#You can choose to import the folder's files or not.
+_Importing a folder into the dock =
+
+#X[Accessing the recent events]
+Accessing the recent events =
+#>Activate the Recent-Events applet.
+#You need to have the Zeitgeist daemon to be running. Install it if it's not present.
+#The applet can then display all the files, folders, web pages, songs, videos and documents you have accessed recently, so that you can access them quickly.
+_Accessing the recent events =
+
+#X[Quickly opening a recent file with a launcher]
+Quickly opening a recent file with a launcher =
+#>Activate the Recent-Events applet.
+#You need to have the Zeitgeist daemon to be running. Install it if it's not present.
+#Now when you right-click on a launcher, all the recent files that can be opened with this launcher will appear in its menu.
+_Quickly opening a recent file with a launcher =
+
+#X[Accessing disks]
+Accessing disks  =
+#>Activate the Shortcuts applet.
+#Then all the disks (including USB key or external hard drives) will be listed in a sub-dock.
+#To unmount a disk before disconnecting it, middle-click on its icon.
+_Accessing disks  =
+
+#X[Accessing folder bookmarks]
+Accessing folder bookmarks =
+#>Activate the Shortcuts applet.
+#Then all the folders bookmarks (the ones that appear in Nautilus) will be listed in a sub-dock.
+#To add a bookmark, simply drag-and-drop a folder onto the applet's icon.
+#To remove a boorkmark, right-click on its icon -> remove
+_Accessing folder bookmarks =
+
+#X[Having multiple instances of an applet]
+Having multiple instances of an applet =
+#>Some applets can have several instances running at the same time: Clock, Stack, Weather, ...
+#Right click on the applet's icon -> "launch another instance".
+#You can configure each instance independantely. This allows you, for example, to have the current time for different countries in your dock or the weather in different cities.
+_Having multiple instances of an applet =
+
+#X[Adding / removing a desktop]
+Adding / removing a desktop =
+#>Activate the Switcher applet.
+#Right-click on it -> "add a desktop" or "remove this desktop".
+#You can even name each of them.
+_Adding / removing a desktop =
+
+#X[Controling the sound volume]
+Controling the sound volume =
+#>Activate the Sound Volume applet.
+#Then scroll up/down to increase/decrease the sound.
+#Alternatively, you can click on the icon and move the scroll bar.
+#Middle-click will mute/unmute.
+_Controling the sound volume =
+
+#X[Controling the screen brightness]
+Controling the screen brightness =
+#>Activate the Screen Luminosity applet.
+#Then scroll up/down to increase/decrease the brightness.
+#Alternatively, you can click on the icon and move the scroll bar.
+_Controling the screen brightness =
+
+#X [Removing completely the gnome-panel]
+Xremove=
+#> Open gconf-editor, edit the key /desktop/gnome/session/required_components/panel, and replace its content with "cairo-dock".
+#Then restart your session : the gnome-panel has not been started, and the dock has been started (if not, you can add it to the startup programs).
+remove=
+#G [sh -c "gconftool-2 --type string --set /desktop/gnome/session/required_components/panel '(cairo-dock'";sh -c "ps aux | grep -v grep | grep -c 'gnome-settings-daemon'"]If you are on Gnome, you can click on this button in order to automatically modify this key:
+#{Tip: If this line is grayed, it's because this tip is not for you.)
+widget_compiz=
+
+
+#[@pkgdatadir@/icons/icon-behavior.svg]
+[Troubleshooting]
+#W[Forum] If you have any question, don't hesitate to ask on our forum.
+forum=http://forum.glx-dock.org
+#W[Wiki] Our wiki can also help you, it is more complete on some points.
+wiki=http://wiki.glx-dock.org
+
+#X [I have a black background around my dock.] 
+Xblack=
+#> You need to turn on compositing. For instance, you can run Compiz or xcompmgr. 
+#If you're using XFCE or KDE, you can just enable compositing in the window manager options.
+#If you're using Gnome, you can enable it in Metacity in this way :
+# Open gconf-editor, edit the key '/apps/metacity/general/compositing_manager' and set it to 'true'.
+#{Hint : If you have an ATI or an Intel card, you should try without OpenGL first, because their drivers are not yet perfect.}
+black=
+#G [gconftool-2 --type bool --set /apps/metacity/general/compositing_manager true;sh -c "ps aux | grep -v grep | grep -c 'metacity'"]If you're on Gnome with Metacity (without Compiz), you can click on this button:
+#{Tip: If this line is grayed, it's because this tip is not for you.)
+blackMetacity=
+#X [My machine is too old to run a composite manager.] 
+Xfake=
+#> Don't panic, Cairo-Dock can emulate the transparency.
+#To get rid of the black background, simply enable the corresponding option in the end of the «System» module
+fake=
+#X [The dock is horribly slow when I move the mouse into it.] 
+Xslow=
+#> If you have an Nvidia GeForce8 graphics card, please install the latest drivers, as the first ones were really buggy.
+#If the dock is running without OpenGL, try to reduce the number of icons in the main dock, or try to reduce its size.
+#If the dock is running with OpenGL, try to disable it by launching the dock with «cairo-dock -c».
+slow=
+#X [I don't have these wonderful effects like fire, cube rotating, etc.] 
+Xeff=
+#> You need a graphics card with drivers that support OpenGL2.0. Most Nvidia cards can do this, as can more and more Intel cards. Most ATI cards do not support OpenGL2.0.
+#{Tip: You can force OpenGL by launching the dock with «cairo-dock -o».but you might get a lot of visual artifacts.}
+eff=
+#X [I don't have any themes in the Theme Manager, except the default one.]
+Xconn=
+#> Be sure that you are connected to the Net.
+# If your connection is very slow, you can increase the connection timeout in the "System" module.
+# If you're under a proxy, you'll have to configure "curl" to use it; search on the web how to do it (basically, you have to set up the "http_proxy" environment variable).
+#{Hint : Up to version 2.1.1-2, wget was used.}
+conn=
+#v
+sep_applet=
+#X [The «netspeed» applet displays 0 even when I'm downloading something]
+Xnetspeed=
+#> You must tell the applet which interface you're using to connect to the Net (by default, this is «eth0»).
+#Just edit its configuration, and enter the interface name. To find it, type «ifconfig» in a terminal, and ignore the «loop» interface. It's probably something like «eth1», «ath0», or «wifi0»..
+#{Tip: you can run several instances of this applet if you wish to monitor several interfaces.}
+netspeed=
+#X [The dustbin remains empty even when I delete a file.]
+Xdustbin=
+#> if you're using KDE, you may have to specify the path to the trash folder.
+#Just edit the applet's configuration, and fill in the Trash path; it is probably «~/.locale/share/Trash/files». Be very careful when typing a path here!!! (do not insert spaces or some invisible caracters).
+dustbin=
+#X [There is no icon in the Applications Menu even though I enable the option.]
+XMenu=
+#> In Gnome, there is an option that override the dock's one. To enable icons in menus, open 'gconf-editor', go to Desktop / Gnome / Interface and enable the "menus have icons" and the "buttons have icons" options. 
+Menu=
+#G [sh -c "gconftool-2 --type bool --set /desktop/gnome/interface/menus_have_icons true && gconftool-2 --type bool --set /desktop/gnome/interface/buttons_have_icons true";sh -c "ps aux | grep -v grep | grep -c 'gnome-settings-daemon'"]If you're on Gnome you can click on this button:
+#{Tip: If this line is grayed, it's because this tip is not for you.)
+MenuGnome=
+
+
+#[@pkgdatadir@/cairo-dock.svg]
+[The Project]
+#F [Join the project!]
+frame_project=
+
+#> We value your help! If you see a bug, if you think something could be improved,
+#or if you just made a dream about the dock, pay us a visit on glx-dock.org.
+#English (and others!) speakers are welcome, so don’t be shy ! ;-)
+#
+#If you made a theme for the dock or one of the applet, and want to share it, we’ll be happy to integrate it on our server !
+help=
+#W[Documentation] If you wish to develop an applet, a complete documentation is available here.
+doc=http://doc.glx-dock.org
+#W[DBus API] If you wish to develop an applet in Python, Perl or any other language,
+#or to interact with the dock in any kind of way, a full DBus API is described here.
+dbus=http://dbus.glx-dock.org
+#>
+#
+#The Cairo-Dock Team
+team=
+
+#F [Websites]
+frame_website=
+#W[Community site] Problems? Suggestions? Just want to talk to us? Come on over!
+community_site=http://glx-dock.org
+#W[Development site] Find the latest version of Cairo-Dock here !
+dev_site=https://launchpad.net/cairo-dock
+#W[Cairo-Dock-Plug-ins-Extras] More applets available online!
+extras_site=http://extras.glx-dock.org
+
+#F [Repositories]
+frame_repositories=
+#W[Debian/Ubuntu] We maintain two repositories for Debian, Ubuntu and other Debian-forked:
+# One for stable releases and another which is updated weekly (unstable version)
+reposit_wiki_site=http://www.glx-dock.org/ww_page.php?p=From the repository&lang=en
+#X [Ubuntu]
+#> If you on (x/k/l)Ubuntu, you can easily add our repositories with these buttons
+#  (if you're using a fork of Ubuntu like Linux Mint, please have a look at our wiki).
+ubuntu=
+#G [gksu "sh '@pkgdatadir@/scripts/help_scripts.sh' repository no";sh -c "lsb_release -i | grep -c Ubuntu"]If you're on Ubuntu, you can add our 'stable' repository by clicking on this button:
+# After that, you can launch your update manager in order to install the latest stable version.
+#{Tip: If this line is grayed, it's because this tip is not for you.)
+addUbuntuRepo=
+#G [gksu "sh '@pkgdatadir@/scripts/help_scripts.sh' weekly no";sh -c "lsb_release -i | grep -c Ubuntu"]If you're on Ubuntu, you can also add our 'weekly' ppa (can be unstable) by clicking on this button:
+# After that, you can launch your update manager in order to install the latest weekly version.
+#{Tip: If this line is grayed, it's because this tip is not for you.)
+addWeeklyRepo=
+#X [Debian]
+#> If you on Debian, you can easily add our repositories with these buttons
+#  (Please check if you're using the Stable or the Unstable version of Debian).
+debian=
+#G [gksu "sh '@pkgdatadir@/scripts/help_scripts.sh' debian_stable no";sh -c "grep -c ^Debian /etc/issue"]If you're on Debian Stable, you can add our 'stable' repository by clicking on this button:
+# After that, you can purge all 'cairo-dock*' packages, update the your system and reinstall 'cairo-dock' package.
+#{Tip: If this line is grayed, it's because this tip is not for you.)
+addDebianStableRepo=
+#G [gksu "sh '@pkgdatadir@/scripts/help_scripts.sh' debian_unstable no";sh -c "grep -c ^Debian /etc/issue"]If you're on Debian Unstable, you can add our 'stable' repository by clicking on this button:
+# After that, you can purge all 'cairo-dock*' packages, update the your system and reinstall 'cairo-dock' package.
+#{Tip: If this line is grayed, it's because this tip is not for you.)
+addDebianUnStableRepo=
+
+
+#[gtk-about]
+[Icon]
+
+#F[Icon]
+frame_maininfo=
+
+#d Name of the dock it belongs to:
+dock name = 
+
+#s Name of the icon as it will appear in its caption in the dock:
+name = 
+ #v
+sep_display=
+
+#S+ Image filename:
+#{Leave empty to use the default one.}
+icon=preferences-desktop-accessibility
+
+#j[0;128] Desired icon size for this applet
+#{Set to 0 to use the default applet size}
+icon size = 0;0
+
+order=
+
+#F[Applet's Handbook]
+frame_hand=
+#A
+handbook=Help
+
+
+#[gtk-convert]
+[Desklet]
+
+#X[Position]
+frame_pos =
+
+#b Lock position?
+#{If locked, the desklet cannot be moved by simply dragging it with the left mouse button. It can still be moved with ALT + left-click.}
+locked = false
+
+#j+[24;512] Desklet dimensions (width x height):
+#{Depending on your WindowManager, you may be able to resize this with ALT + middle-click or ALT + left-click.}
+size = 96;96
+
+#i[-2048;2048] Desklet position (x, y):
+#{Depending on your WindowManager, you may be able to move this with ALT + left-click.. Negative values are counted from the right/bottom of the screen}
+x position=0
+#i[-2048;2048] ...
+y position=0
+
+#I[-180;180] Rotation:
+#{You can quickly rotate the desklet with the mouse, by dragging the little buttons on its left and top sides.}
+rotation = 0
+
+#X[Visibility]
+frame_visi =
+
+#b Is detached from the dock
+initially detached=false
+#l[Normal;Keep above;Keep below;Keep on widget layer;Reserve space] Visibility:
+#{for CompizFusion's "widget layer", set behaviour in Compiz to: (class=Cairo-dock & type=utility)}
+accessibility=0
+#b Should be visible on all desktops?
+sticky=true
+
+
+#F[Decorations;gtk-orientation-portrait]
+frame_deco=
+
+#o+ Choose a decoration theme for this desklet:
+#{Choose 'Custom decorations' to define your own decorations below.}
+decorations = default
+
+#v
+sep_deco =
+
+#S+ Background image:
+#{Image to be displayed below drawings, e.g. a frame. Leave empty for no image.}
+bg desklet =
+#e+[0;1] Background transparency:
+bg alpha = 1
+#i+[0;256] Left offset:
+#{in pixels. Use this to adjust the left position of drawings.}
+left offset = 0
+#i+[0;256] Top offset:
+#{in pixels. Use this to adjust the top position of drawings.}
+top offset = 0
+#i+[0;256] Right offset:
+#{in pixels. Use this to adjust the right position of drawings.}
+right offset = 0
+#i+[0;256] Bottom offset:
+#{in pixels. Use this to adjust the bottom position of drawings.}
+bottom offset = 0
+#S+ Foreground image:
+#{Image to be displayed above the drawings, e.g. a reflection. Leave empty for no image.}
+fg desklet =
+#e+[0;1] Foreground tansparency:
+fg alpha = 1

=== removed file 'data/alpha.jpg'
Binary files data/alpha.jpg	2010-08-09 23:26:12 +0000 and data/alpha.jpg	1970-01-01 00:00:00 +0000 differ
=== removed file 'data/apply-default-values-to-conf.sh'
--- data/apply-default-values-to-conf.sh	2010-08-09 23:26:12 +0000
+++ data/apply-default-values-to-conf.sh	1970-01-01 00:00:00 +0000
@@ -1,73 +0,0 @@
-#!/bin/sh
-
-# Compiz check for Cairo-Dock
-#
-# Copyright : (C) 2009 by Fabounet
-# E-mail    : [e-mail]
-#
-#
-# This program is free software; you can redistribute it and/or
-# modify it under the terms of the GNU General Public License
-# as published by the Free Software Foundation; either version 2
-# of the License, or (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-# http://www.gnu.org/licenses/licenses.html#GPL
-
-export CONF_FILE="cairo-dock.conf"
-
-function set_value()
-{
-	sed -i "s/^$1 *=/$1 = $2/g"
-	echo -n "."
-}
-
-set_value "auto-hide"				false
-set_value "reserve space"			true
-set_value "x gap"					0
-set_value "y gap"					0
-set_value "xinerama"				false
-set_value "max autorized width"		0
-set_value "pop-up"					false
-set_value "raise shortcut"			""
-set_value "leaving delay"			250
-set_value "show delay"				300
-set_value "lock icons"				false
-set_value "show applications"		true
-set_value "unique PID"				false
-set_value "group by class"			false
-set_value "group exception"			""
-set_value "hide visible"			false
-set_value "current desktop only"	false
-set_value "mix launcher appli"		true
-set_value "overwrite xicon"			true
-set_value "overwrite exception"		"pidgin;xchat;amsn"
-set_value "window thumbnail"		true
-set_value "minimize on click"		true
-set_value "close on middle click"	true
-set_value "auto quick hide"			false
-set_value "auto quick hide on max"	false
-set_value "demands attention with dialog" true
-set_value "animation on demands attention" "rotate"
-set_value "animation on active window" "wobbly
-set_value "max name length"			15
-set_value "visibility alpha"		"0.2"
-set_value "animate subdocks"		true
-#set_value "unfold factor"			8
-#set_value "shrink down steps"		12
-#set_value "move down speed"		"0.25"
-set_value "refresh frequency"		35
-set_value "dynamic reflection"		false
-set_value "opengl anim freq"		33
-set_value "cairo anim freq"			25
-set_value "always horizontal"		true
-set_value "show hidden files"		false
-set_value "fake transparency"		false
-set_value "modules"					"dock-rendering;dialog-rendering;Animated icons;clock;logout;dustbin;stack;shortcuts;GMenu;switcher;icon effects;illusion"
-
-echo ""
-echo "le thème a été mis à jour."
-exit 0

=== removed file 'data/box-back.png'
Binary files data/box-back.png	2010-08-09 23:26:12 +0000 and data/box-back.png	1970-01-01 00:00:00 +0000 differ
=== removed file 'data/box-front.png'
Binary files data/box-front.png	2010-08-09 23:26:12 +0000 and data/box-front.png	1970-01-01 00:00:00 +0000 differ
=== removed file 'data/cairo-dock-animated.xpm'
--- data/cairo-dock-animated.xpm	2010-09-18 14:17:48 +0000
+++ data/cairo-dock-animated.xpm	1970-01-01 00:00:00 +0000
@@ -1,97 +0,0 @@
-/* XPM */
-static char * reader_xpm[] = {
-"360 30 64 1",
-" 	c None",
-".	c #040204",
-"+	c #191918",
-"@	c #463015",
-"#	c #FE8B06",
-"$	c #292929",
-"%	c #80807F",
-"&	c #363636",
-"*	c #36962E",
-"=	c #FEC142",
-"-	c #26BA3A",
-";	c #626266",
-">	c #C2BAA6",
-",	c #FECE56",
-"'	c #EACA7A",
-")	c #6E5D41",
-"!	c #AEA28E",
-"~	c #FCD98E",
-"{	c #EAE2DA",
-"]	c #22DE72",
-"^	c #FA983A",
-"/	c #7A541C",
-"(	c #935004",
-"_	c #FEAC0B",
-":	c #D65A0D",
-"<	c #FEE696",
-"[	c #FEE9AE",
-"}	c #D6CABA",
-"|	c #AE5202",
-"1	c #96968E",
-"2	c #EFD19F",
-"3	c #261202",
-"4	c #FC5602",
-"5	c #FE9A02",
-"6	c #FEEEBE",
-"7	c #121212",
-"8	c #FE9E3E",
-"9	c #D2B276",
-"0	c #FEC67D",
-"a	c #EEEAE2",
-"b	c #5A420A",
-"c	c #DE6A05",
-"d	c #FEA23E",
-"e	c #DAA25E",
-"f	c #E2DACD",
-"g	c #FEB134",
-"h	c #FE922A",
-"i	c #1A0A02",
-"j	c #2A1A0A",
-"k	c #FD7403",
-"l	c #423A3E",
-"m	c #0B0A0A",
-"n	c #EE722E",
-"o	c #5A420E",
-"p	c #9A9A9A",
-"q	c #423E3E",
-"r	c #9A896E",
-"s	c #FECE6A",
-"t	c #F8B255",
-"u	c #4E4E4E",
-"v	c #FED776",
-"w	c #F6F2E6",
-"x	c #A9ABAC",
-"y	c #FEFEF6",
-"                                                                                                                                                                                                                                                                                                                                                                        ",
-"                                                                                                                                                                                                                                                                                                                                                                        ",
-"                                                                                                                                                                                                                                                                                                                                                                        ",
-"                                                                                                                                                                                                                                                                                                                                                                        ",
-"            ;+++;                         ;+++;                         ;....;                        ;....;                                                                                    ;....;                        ;....;                         ;+++;                         ;+++;                                                      ;+++;             ",
-"           ;$++.+;                       ;$++.+;                       ;$++...;                      ;$++...;                       ;$m.m7%                       ;$m.m7%                      ;...++$;                      ;...++$;                       ;+.++$;                       ;+.++$;                       ;$m.m7%                      ;$++.+;            ",
-"           ++......                      ++......                     ;++.mmm.+;                    ;++.mmm.+;                     +.7...m.;                     +.7...m.;                    ;m.mmm.++;                    ;m.mmm.++;                     ......++                      ......++                      +.7...m.;                     ++......           ",
-"          ;+++%y.$                      ;+++%y.$                      .+++%y.$y+                    .+++%y.$y+                    ;71>&.1f%m                    ;71>&.1f%m                    +y$.y%+++.                    +y$.y%+++.                      $.y%+++;                      $.y%+++;                    ;71>&.1f%m                    ;+++%y.$            ",
-"          ++&y%q)@.                     ++&y%q)@.                     ++$y%l)@.+                    ++$y%l)@.+                    &ua&@)&%y&1                   &ua&@)&%y&1                   +.@)q%y$++p                   +.@)q%y$++p                    .@)lry&++1                    .@)lry&++1                   &ua&@)&%y&1                   ++&y%q)@.           ",
-"          +$+2~~2a#:                    +$+2~~2a#:                    +;+'~26#:^                    +;+'~26#:^                    $le:#[2~}7r                   $le:#[2~}7r                   ^:#62~2+;+%                   ^:#62~2+;+%                   :#6f222+$7r                   :#6f222+$7r                   $le:#[2~}7r                   +$+2~~2a#:          ",
-"         1&+bg~<<~0dd^k                1&+bg~<<~0dd^k                1$+o=~[20d^k(                 1$+o=~[20d^k(                 1(kkd0~6~go&                  1(kkd0~6~go&                 (k^8'~[~=b+$&                 (k^8'~[~=b+$&                k^dd0~[<vgb+&&                k^dd0~[<vgb+&&                  1(kkd0~6~go&                  1&+bg~<<~0dd^k       ",
-"   ff}>$....3...33i..mx!!!>      ff}>$....3...33i..mx!!!>      ff}>$....3...33i..mx!!!>      ff}>$....3...33i..mx!!!>      ff}>$....3...33i..mx!!!>      ff}>$....3...33i..mx!!!>      ff}>$....3...33i..mx!!!>      ff}>$....3...33i..mx!!!>      ff}>$....3...33i..mx!!!>      ff}>$....3...33i..mx!!!>      ff}>$....3...33i..mx!!!>      ff}>$....3...33i..mx!!!>   ",
-"  af>f>f>}...7&&7...>>}!>>>>    af>f>f>}...7&&7...>>}!>>>>    af>f>f>}...7&&7...>>}!>>>>    af>f>f>}...7&&7...>>}!>>>>    af>f>f>}...7&&7...>>}!>>>>    af>f>f>}...7&&7...>>}!>>>>    af>f>f>}...7&&7...>>}!>>>>    af>f>f>}...7&&7...>>}!>>>>    af>f>f>}...7&&7...>>}!>>>>    af>f>f>}...7&&7...>>}!>>>>    af>f>f>}...7&&7...>>}!>>>>    af>f>f>}...7&&7...>>}!>>>>  ",
-"  ]]]aawaff>}x>f!!}}>!>>>***    ]]]aawaff>}x>f!!}}>!>>>***    ]]]aawaff>}x>f!!}}>!>>>***    ]]]aawaff>}x>f!!}}>!>>>***    ]]]aawaff>}x>f!!}}>!>>>***    ]]]aawaff>}x>f!!}}>!>>>***    ]]]aawaff>}x>f!!}}>!>>>***    ]]]aawaff>}x>f!!}}>!>>>***    ]]]aawaff>}x>f!!}}>!>>>***    ]]]aawaff>}x>f!!}}>!>>>***    ]]]aawaff>}x>f!!}}>!>>>***    ]]]aawaff>}x>f!!}}>!>>>***  ",
-"  ]]]]]]]wwwwf>>>{>>>*******    ]]]]]]]wwwwf>>>{>>>*******    ]]]]]]]wwwwf>>>{>>>*******    ]]]]]]]wwwwf>>>{>>>*******    ]]]]]]]wwwwf>>>{>>>*******    ]]]]]]]wwwwf>>>{>>>*******    ]]]]]]]wwwwf>>>{>>>*******    ]]]]]]]wwwwf>>>{>>>*******    ]]]]]]]wwwwf>>>{>>>*******    ]]]]]]]wwwwf>>>{>>>*******    ]]]]]]]wwwwf>>>{>>>*******    ]]]]]]]wwwwf>>>{>>>*******  ",
-"  ]]]]]]]]]]]----***********    ]]]]]]]]]]]----***********    ]]]]]]]]]]]----***********    ]]]]]]]]]]]----***********    ]]]]]]]]]]]----***********    ]]]]]]]]]]]----***********    ]]]]]]]]]]]----***********    ]]]]]]]]]]]----***********    ]]]]]]]]]]]----***********    ]]]]]]]]]]]----***********    ]]]]]]]]]]]----***********    ]]]]]]]]]]]----***********  ",
-"  f]]]]]]]]]]----**********>    f]]]]]]]]]]----**********>    f]]]]]]]]]]----**********>    f]]]]]]]]]]----**********>    f]]]]]]]]]]----**********>    f]]]]]]]]]]----**********>    f]]]]]]]]]]----**********>    f]]]]]]]]]]----**********>    f]]]]]]]]]]----**********>    f]]]]]]]]]]----**********>    f]]]]]]]]]]----**********>    f]]]]]]]]]]----**********>  ",
-"   ]]]]]]]]]]----**********      ]]]]]]]]]]----**********      ]]]]]]]]]]----**********      ]]]]]]]]]]----**********      ]]]]]]]]]]----**********      ]]]]]]]]]]----**********      ]]]]]]]]]]----**********      ]]]]]]]]]]----**********      ]]]]]]]]]]----**********      ]]]]]]]]]]----**********      ]]]]]]]]]]----**********      ]]]]]]]]]]----**********   ",
-"  ..]]]]]]]]]----*********..    ..]]]]]]]]]----*********..    ..]]]]]]]]]----*********..    ..]]]]]]]]]----*********..    ..]]]]]]]]]----*********..    ..]]]]]]]]]----*********..    ..]]]]]]]]]----*********..    ..]]]]]]]]]----*********..    ..]]]]]]]]]----*********..    ..]]]]]]]]]----*********..    ..]]]]]]]]]----*********..    ..]]]]]]]]]----*********..  ",
-"  ...]]]]]]]]----********...    ...]]]]]]]]----********...    ...]]]]]]]]----********...    ...]]]]]]]]----********...    ...]]]]]]]]----********...    ...]]]]]]]]----********...    ...]]]]]]]]----********...    ...]]]]]]]]----********...    ...]]]]]]]]----********...    ...]]]]]]]]----********...    ...]]]]]]]]----********...    ...]]]]]]]]----********...  ",
-"   ..]]]]]]]]----********q.%     ..]]]]]]]]----********q.%     ..]]]]]]]]----********q.%     ..]]]]]]]]----********q.%     ..]]]]]]]]----********q.%     ..]]]]]]]]----********q.%     ..]]]]]]]]----********q.%     ..]]]]]]]]----********q.%     ..]]]]]]]]----********q.%     ..]]]]]]]]----********q.%     ..]]]]]]]]----********q.%     ..]]]]]]]]----********q.%  ",
-"    ]]]]]]]]]----*********%       ]]]]]]]]]----*********%       ]]]]]]]]]----*********%       ]]]]]]]]]----*********%       ]]]]]]]]]----*********%       ]]]]]]]]]----*********%       ]]]]]]]]]----*********%       ]]]]]]]]]----*********%       ]]]]]]]]]----*********%       ]]]]]]]]]----*********%       ]]]]]]]]]----*********%       ]]]]]]]]]----*********%   ",
-"    ==9]]]]]]----******!5g        ==9]]]]]]----******!5g        ==9]]]]]]----******!5g        ==9]]]]]]----******!5g        ==9]]]]]]----******!5g        ==9]]]]]]----******!5g        ==9]]]]]]----******!5g        ==9]]]]]]----******!5g        ==9]]]]]]----******!5g        ==9]]]]]]----******!5g        ==9]]]]]]----******!5g        ==9]]]]]]----******!5g    ",
-"   ,vg#g==]]]----****k55#t~      ,vg#g==]]]----****k55#t~      ,vg#g==]]]----****k55#t~      ,vg#g==]]]----****k55#t~      ,vg#g==]]]----****k55#t~      ,vg#g==]]]----****k55#t~      ,vg#g==]]]----****k55#t~      ,vg#g==]]]----****k55#t~      ,vg#g==]]]----****k55#t~      ,vg#g==]]]----****k55#t~      ,vg#g==]]]----****k55#t~      ,vg#g==]]]----****k55#t~   ",
-"   ,t##5=v0]]----***#__5kg~      ,t##5=v0]]----***#__5kg~      ,t##5=v0]]----***#__5kg~      ,t##5=v0]]----***#__5kg~      ,t##5=v0]]----***#__5kg~      ,t##5=v0]]----***#__5kg~      ,t##5=v0]]----***#__5kg~      ,t##5=v0]]----***#__5kg~      ,t##5=v0]]----***#__5kg~      ,t##5=v0]]----***#__5kg~      ,t##5=v0]]----***#__5kg~      ,t##5=v0]]----***#__5kg~   ",
-"  <sg4k5_=,=]----*nk___5khv[    <sg4k5_=,=]----*nk___5khv[    <sg4k5_=,=]----*nk___5khv[    <sg4k5_=,=]----*nk___5khv[    <sg4k5_=,=]----*nk___5khv[    <sg4k5_=,=]----*nk___5khv[    <sg4k5_=,=]----*nk___5khv[    <sg4k5_=,=]----*nk___5khv[    <sg4k5_=,=]----*nk___5khv[    <sg4k5_=,=]----*nk___5khv[    <sg4k5_=,=]----*nk___5khv[    <sg4k5_=,=]----*nk___5khv[  ",
-"  ~=#44k5_~,3----u45__gg#kg<    ~=#44k5_~,3----u45__gg#kg<    ~=#44k5_~,3----u45__gg#kg<    ~=#44k5_~,3----u45__gg#kg<    ~=#44k5_~,3----u45__gg#kg<    ~=#44k5_~,3----u45__gg#kg<    ~=#44k5_~,3----u45__gg#kg<    ~=#44k5_~,3----u45__gg#kg<    ~=#44k5_~,3----u45__gg#kg<    ~=#44k5_~,3----u45__gg#kg<    ~=#44k5_~,3----u45__gg#kg<    ~=#44k5_~,3----u45__gg#kg<  ",
-"  ~##h44k5=tj.7$7j4#g=,=g#_<    ~##h44k5=tj.7$7j4#g=,=g#_<    ~##h44k5=tj.7$7j4#g=,=g#_<    ~##h44k5=tj.7$7j4#g=,=g#_<    ~##h44k5=tj.7$7j4#g=,=g#_<    ~##h44k5=tj.7$7j4#g=,=g#_<    ~##h44k5=tj.7$7j4#g=,=g#_<    ~##h44k5=tj.7$7j4#g=,=g#_<    ~##h44k5=tj.7$7j4#g=,=g#_<    ~##h44k5=tj.7$7j4#g=,=g#_<    ~##h44k5=tj.7$7j4#g=,=g#_<    ~##h44k5=tj.7$7j4#g=,=g#_<  ",
-"   h#h44k5=tj.i$7j4#g=,=g#_      h#h44k5=tj.i$7j4#g=,=g#_      h##44k5=tj.i$7j4#g=,=g#_      h##44k5=tj.i$7j4#g=,=g#_      h#h44k5=tj.i$734#g=,=g#_      h#h44k5=tj.i$734#g=,=g#_      h#h44k5=t3m7j7j4#g=,=g#_      h#h44k5=t3m7j7j4#g=,=g#_      ##h44k5=t3m7$734#g=,=g#_      ##h44k5=t3m7$734#g=,=g#_      h#h44k5=tj.i$734#g=,=g#_      h#h44k5=tj.i$7j4#g=,=g#_   ",
-"       tck#.7....3.k5gv              tck#.7....3.k5gv              tck#.7....3.k5gv              tck#.7....3.k5gv              tkk#.7....j.k5gv              tkk#.7....j.k5gv              tck#.7....3.k5gv              tck#.7....3.k5gv              gnk#.7....j.k5gv              gnk#.7....j.k5gv              tkk#.7....j.k5gv              tck#.7....3.k5gv       "};

=== modified file 'data/cairo-dock-cairo.desktop'
--- data/cairo-dock-cairo.desktop	2010-09-18 14:17:48 +0000
+++ data/cairo-dock-cairo.desktop	2011-08-09 20:04:34 +0000
@@ -3,7 +3,7 @@
 Encoding=UTF-8
 Type=Application
 Exec=cairo-dock -c
-Icon=cairo-dock.svg
+Icon=cairo-dock
 Terminal=false
 
 Comment=A light and eye-candy dock and desklets for your desktop.

=== removed file 'data/cairo-dock-cancel.svg'
--- data/cairo-dock-cancel.svg	2010-04-20 02:44:22 +0000
+++ data/cairo-dock-cancel.svg	1970-01-01 00:00:00 +0000
@@ -1,149 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:xlink="http://www.w3.org/1999/xlink"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   version="1.1"
-   width="48"
-   height="48"
-   id="svg2405"
-   inkscape:version="0.47 r22583"
-   sodipodi:docname="cairo-dock-cancel.svg">
-  <metadata
-     id="metadata22">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <sodipodi:namedview
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1"
-     objecttolerance="10"
-     gridtolerance="10"
-     guidetolerance="10"
-     inkscape:pageopacity="0"
-     inkscape:pageshadow="2"
-     inkscape:window-width="1235"
-     inkscape:window-height="809"
-     id="namedview20"
-     showgrid="false"
-     inkscape:zoom="6.9532167"
-     inkscape:cx="41.905722"
-     inkscape:cy="29.390383"
-     inkscape:window-x="0"
-     inkscape:window-y="24"
-     inkscape:window-maximized="0"
-     inkscape:current-layer="svg2405" />
-  <defs
-     id="defs2407">
-    <linearGradient
-       id="linearGradient3738">
-      <stop
-         id="stop3740"
-         style="stop-color:#791235;stop-opacity:1"
-         offset="0" />
-      <stop
-         id="stop3742"
-         style="stop-color:#dd3b27;stop-opacity:1"
-         offset="1" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient2091">
-      <stop
-         id="stop2093"
-         style="stop-color:black;stop-opacity:1"
-         offset="0" />
-      <stop
-         id="stop2095"
-         style="stop-color:black;stop-opacity:0"
-         offset="1" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient3781">
-      <stop
-         offset="0"
-         style="stop-color:white;stop-opacity:1"
-         id="stop3783" />
-      <stop
-         offset="1"
-         style="stop-color:white;stop-opacity:0"
-         id="stop3785" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient3242">
-      <stop
-         offset="0"
-         style="stop-color:#f8b17e;stop-opacity:1"
-         id="stop3244" />
-      <stop
-         offset="0.26238"
-         style="stop-color:#e35d4f;stop-opacity:1"
-         id="stop3246" />
-      <stop
-         offset="1"
-         style="stop-color:#c6262e;stop-opacity:1"
-         id="stop3248" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3242"
-       id="linearGradient3666"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.1895554,-1.1860299,1.1895554,1.1860299,-71.261213,26.63417)"
-       x1="49.882484"
-       y1="30.701427"
-       x2="34.162975"
-       y2="46.420933" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient2091"
-       id="radialGradient3672"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(2.1179199,0.02623673,-0.01901894,0.44293005,-23.791094,26.530401)"
-       cx="23.070683"
-       cy="35.127438"
-       fx="23.070683"
-       fy="35.127438"
-       r="10.31934" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3781"
-       id="linearGradient3697"
-       gradientUnits="userSpaceOnUse"
-       x1="24.481066"
-       y1="5.0808945"
-       x2="24.481066"
-       y2="45.074459"
-       gradientTransform="translate(58.779664,-30.771177)" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3738"
-       id="linearGradient3744"
-       x1="24.597811"
-       y1="41.172474"
-       x2="24.597815"
-       y2="3.8848629"
-       gradientUnits="userSpaceOnUse" />
-  </defs>
-  <path
-     style="opacity:0.2557078;fill:url(#radialGradient3672);fill-opacity:1;stroke:none"
-     id="path1361"
-     d="m 48.03457,42.607578 a 23.89074,4.812109 0 0 1 -47.78148044,0 23.89074,4.812109 0 1 1 47.78148044,0 z" />
-  <path
-     style="font-size:59.90107727000000182px;font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;text-align:start;line-height:125%;writing-mode:lr-tb;text-anchor:start;fill:url(#linearGradient3666);fill-opacity:1;stroke:url(#linearGradient3744);stroke-width:1.13179493000000009;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;font-family:Bitstream Vera Sans"
-     id="path7076"
-     d="M 43.620564,34.084033 31.515172,22.555088 43.044117,10.449697 36.463672,4.7330029 24.597806,16.214169 12.492415,4.685225 5.5750481,11.026144 17.680439,22.491288 5.5750481,34.084033 12.492415,40.424952 24.597806,28.319561 36.703197,40.424952 43.620564,34.084033 z" />
-</svg>

=== removed file 'data/cairo-dock-logo.png'
Binary files data/cairo-dock-logo.png	2010-08-09 23:26:12 +0000 and data/cairo-dock-logo.png	1970-01-01 00:00:00 +0000 differ
=== removed file 'data/cairo-dock-ok.svg'
--- data/cairo-dock-ok.svg	2010-04-20 02:44:22 +0000
+++ data/cairo-dock-ok.svg	1970-01-01 00:00:00 +0000
@@ -1,91 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-
-<svg
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:xlink="http://www.w3.org/1999/xlink"
-   version="1.1"
-   width="48"
-   height="48"
-   id="svg2448">
-  <defs
-     id="defs2450">
-    <linearGradient
-       id="linearGradient8662">
-      <stop
-         id="stop8664"
-         style="stop-color:black;stop-opacity:1"
-         offset="0" />
-      <stop
-         id="stop8666"
-         style="stop-color:black;stop-opacity:0"
-         offset="1" />
-    </linearGradient>
-    <radialGradient
-       cx="24.837126"
-       cy="36.421127"
-       r="15.644737"
-       fx="24.837126"
-       fy="36.421127"
-       id="radialGradient1444"
-       xlink:href="#linearGradient8662"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1,0,0,0.536723,0,16.87306)" />
-    <linearGradient
-       id="linearGradient2264">
-      <stop
-         id="stop2266"
-         style="stop-color:#d7e866;stop-opacity:1"
-         offset="0" />
-      <stop
-         id="stop2268"
-         style="stop-color:#8cab2a;stop-opacity:1"
-         offset="1" />
-    </linearGradient>
-    <linearGradient
-       x1="-84.343536"
-       y1="-5.3878593"
-       x2="-91.513138"
-       y2="24.558243"
-       id="linearGradient2628"
-       xlink:href="#linearGradient2264"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.017301,-0.243559,0.243559,1.017301,110.52469,-7.9553513)" />
-    <linearGradient
-       id="linearGradient3400">
-      <stop
-         id="stop3402"
-         style="stop-color:white;stop-opacity:1"
-         offset="0" />
-      <stop
-         id="stop3404"
-         style="stop-color:white;stop-opacity:0"
-         offset="1" />
-    </linearGradient>
-    <linearGradient
-       x1="20.494444"
-       y1="6.0097799"
-       x2="20.494444"
-       y2="47.760197"
-       id="linearGradient3406"
-       xlink:href="#linearGradient3400"
-       gradientUnits="userSpaceOnUse" />
-  </defs>
-  <g
-     id="layer1">
-    <path
-       d="m 40.481863,36.421127 a 15.644737,8.3968938 0 1 1 -31.2894745,0 15.644737,8.3968938 0 1 1 31.2894745,0 z"
-       transform="matrix(1.214466,0,0,0.595458,-6.163846,20.31274)"
-       id="path8660"
-       style="opacity:0.20454544;color:black;fill:url(#radialGradient1444);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible" />
-    <path
-       d="m 33.706448,5.4818293 c -0.559734,-0.056806 -1.116221,0.217337 -1.403811,0.7436469 L 20.049307,28.645074 12.17121,22.380993 c -0.701747,-0.383453 -1.577286,-0.136769 -1.960742,0.564978 l -3.5328714,4.535744 c -0.3834475,0.701741 -0.1254891,1.577017 0.5762529,1.960469 0,0 14.3844195,11.880283 14.4021675,11.889074 0.164469,0.08987 0.336465,0.135093 0.511297,0.157184 0.571121,0.07217 1.155595,-0.196162 1.449176,-0.733433 L 40.141725,10.519399 C 40.525176,9.8176549 40.267222,8.9423801 39.565474,8.558928 L 34.26311,5.6492257 C 34.087671,5.553362 33.893026,5.5007637 33.706448,5.4818293 z"
-       id="path1542"
-       style="fill:url(#linearGradient2628);fill-opacity:1;fill-rule:nonzero;stroke:#42770c;stroke-width:1;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible" />
-    <path
-       d="M 32.938536,7.2012775 26.730268,18.60791 21.197213,28.668822 c -0.178482,0.181096 -0.123845,0.754094 -0.902701,0.952966 -0.538869,0.137595 -0.636352,-0.06289 -1.204172,-0.427914 l -6.950556,-5.492153 c -0.7733,-0.621665 -0.749753,-0.589365 -1.297288,-0.03737 L 8.0515824,27.18582 c -0.7518117,0.804672 -0.6353589,1.290849 0.3017539,1.891047 0,0 13.0781537,10.780055 13.0949407,10.788373 0.155564,0.085 0.0892,0.114145 0.757862,0.57814 0.428927,0.297637 0.807539,-0.647982 1.083435,-1.15286 L 39.190779,10.274963 C 39.55113,9.6155282 39.523767,9.624421 38.860008,9.2617466 L 34.11801,6.7472827 C 33.434075,6.3758505 33.430508,6.3800895 32.938536,7.2012775 z"
-       id="path1544"
-       style="opacity:0.4;fill:none;stroke:url(#linearGradient3406);stroke-width:1;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible" />
-  </g>
-</svg>

=== modified file 'data/cairo-dock-simple.conf.in'
--- data/cairo-dock-simple.conf.in	2011-03-17 14:08:48 +0000
+++ data/cairo-dock-simple.conf.in	2011-08-09 20:04:34 +0000
@@ -1,16 +1,16 @@
-#!en;#@VERSION@
+#@VERSION@
 
-#[@pkgdatadir@/icon-behavior.svg]
+#[@pkgdatadir@/icons/icon-behavior.svg]
 [Behavior]
 
-#F-[Position on the screen;@pkgdatadir@/icon-position.svg]
+#F-[Position on the screen;@pkgdatadir@/icons/icon-position.svg]
 frame_pos =
 
 #l-[bottom;top;right;left] Choose which border of the screen the dock will be placed on:
 screen border = 0
 
 
-#F-[Visibility of the main dock;@pkgdatadir@/icon-visibility.svg]
+#F-[Visibility of the main dock;@pkgdatadir@/icons/icon-visibility.svg]
 frame_visi =
 
 #Y-[Always on top;0;0;Reserve space for the dock;0;0;Keep the dock below;0;0;Hide the dock when it overlaps the current window;1;1;Hide the dock whenever it overlaps any window;1;1;Keep the dock hidden;1;1;Pop-up on shortcut;2;1] Visibility:
@@ -26,7 +26,7 @@
 #{When you press the shortcut, the dock will show itself at the potition of your mouse. The rest of the time, it stays invisible, thus acting like a menu.}
 raise shortcut = 
 
-#F-[Visibility of sub-docks;@pkgdatadir@/icon-subdock.png]
+#F-[Visibility of sub-docks;@pkgdatadir@/icons/icon-subdock.png]
 frame_sub =
 
 #l-[Appear on mouse over;Appear on click] Visibility:
@@ -34,7 +34,7 @@
 show_on_click = 0
 
 
-#F-[Taskbar;@pkgdatadir@/icon-taskbar.png]
+#F-[Taskbar;@pkgdatadir@/icons/icon-taskbar.png]
 frame_task =
 
 #l-[None;MacOSX;KDE;Gnome] Behaviour of the Taskbar:
@@ -45,7 +45,7 @@
 taskbar = 2
 
 
-#F[Icons' animations and effects;@pkgdatadir@/icon-movment.png]
+#F[Icons' animations and effects;@pkgdatadir@/icons/icon-movment.png]
 frame_anim=
 
 #_ On mouse hover:
@@ -58,10 +58,10 @@
 anim_disappear=
 
 
-#[@pkgdatadir@/icon-appearance.svg]
+#[@pkgdatadir@/icons/icon-appearance.svg]
 [Appearance]
 
-#F[Icons;@pkgdatadir@/icon-icons.svg]
+#F[Icons;@pkgdatadir@/icons/icon-icons.svg]
 frame_icons=
 
 #w Choose a theme of icons :
@@ -82,7 +82,7 @@
 icon's type order = 0;1;2
 
 
-#F[Views;@pkgdatadir@/icon-views.svg]
+#F[Views;@pkgdatadir@/icons/icon-views.svg]
 frame_view =
 
 #n Choose the default view for main docks :/
@@ -96,10 +96,10 @@
 sub-dock view = default
 
 
-#[@pkgdatadir@/icon-plug-ins.svg]
+#[@pkgdatadir@/icons/icon-plug-ins.svg]
 [Add-ons]
 
-#F[Add or remove any applet;@pkgdatadir@/icon-accessories.svg]
+#F[Add or remove any applet;@pkgdatadir@/icons/icon-accessories.svg]
 frame_mod=
 
 #_ 
@@ -113,7 +113,7 @@
 third party=http://forum.glx-dock.org
 
 
-#[@pkgdatadir@/icon-controler.svg]
+#[@pkgdatadir@/icons/icon-controler.svg]
 [Themes]
 
 #_

=== modified file 'data/cairo-dock.conf.in'
--- data/cairo-dock.conf.in	2011-03-17 14:08:48 +0000
+++ data/cairo-dock.conf.in	2011-08-09 20:04:34 +0000
@@ -1,4 +1,4 @@
-#!en;@VERSION@
+#@VERSION@
 ######## This is the conf file of Cairo-Dock, released under the GPL.##########
 ######## It is parsed by cairo-dock to automatically generate an appropriate GUI,##########
 ######## so don't mess into it, except if you know what you're doing ! ;-)##########
@@ -76,14 +76,11 @@
 
 max_authorized_width = 0
 
-#b- Stretch the dock to always fill the screen
-extended = false
-
 #b- Automatically hide the dock when a window becomes full screen?
 #{This is only usefull if you do not already use auto-hide and if your Window Manager allows the dock in front of fullscreen windows (which is rare).}
 auto quick hide = false
 
-#F-[Sub-docks' visibility;@pkgdatadir@/icon-subdock.png]
+#F-[Sub-docks' visibility;@pkgdatadir@/icons/icon-subdock.png]
 frame_sub =
 
 #Y-[Appear on mouse over;1;1;Appear on click;0;0] Visibility:
@@ -154,7 +151,7 @@
 
 #i- Maximum number of caracters in application name:
 #{"..." will be added at the end if the name is too long.}
-max name length = 20
+max name length = 25
 
 #F-[Interaction;gtk-refresh]
 frame2 =
@@ -187,7 +184,7 @@
 
 [System]
 
-#X-[Animations speed;@pkgdatadir@/icon-movment.png]
+#X-[Animations speed;@pkgdatadir@/icons/icon-movment.png]
 frame_mov =
 
 #B- Animate sub-docks when they appear
@@ -299,7 +296,7 @@
 #b+ Repeat image as a pattern to fill background?
 repeat image = true
 
-#F+[Colour gradation;@pkgdatadir@/icon-gradation.png]
+#F+[Colour gradation;@pkgdatadir@/icons/icon-gradation.png]
 #{Use a colour gradation.}
 frame3 = 
 
@@ -318,9 +315,15 @@
 number of stripes = 0
 
 #f+[0;1] Percentage of the bright colour:
-stripes width = 0.2
-
-#F+[External Frame;@pkgdatadir@/icon-frame.png]
+stripes width = 0.5
+
+#F
+frame3_=
+
+#b+ Stretch the dock to always fill the screen
+extended = false
+
+#F+[External Frame;@pkgdatadir@/icons/icon-frame.png]
 frame_frame =
 #i+[0;30] Corner radius :
 #{in pixels.}
@@ -363,7 +366,7 @@
 
 [Dialogs]
 
-#F+[Bubble;@pkgdatadir@/icon-bubble.png]
+#F+[Bubble;@pkgdatadir@/icons/icon-bubble.png]
 frame_bubble =
 
 #C+ Background colour of the bubble:
@@ -391,12 +394,12 @@
 #c+ Text color:
 text color = 0.0; 0.0; 0.0
 
-#F+[Buttons;@pkgdatadir@/icon-buttons.png]
+#F+[Buttons;@pkgdatadir@/icons/icon-buttons.png]
 frame_button =
 
 #j+[10;64] Size of buttons in the info-bubbles (width x height) :
 #{in pixels.}
-button size = 36;36
+button size = 28;28
 
 #S+ Name of an image to use for the yes/ok button :
 #{If you don't provide any, a default image will be used.}
@@ -485,7 +488,7 @@
 #{Any format allowed; leave this field empty if you don't want to use an image as background.}
 icons bg =
 
-#F+[Zoom effect;@pkgdatadir@/icon-wave.png]
+#F+[Zoom effect;@pkgdatadir@/icons/icon-wave.png]
 frame_shape =
 #f+[1;5] Maximum zoom of the icons :
 #{set to 1 if you don't want the icons to zoom when you hover over them.}
@@ -693,7 +696,7 @@
 
 #C+ Colour of the label's background :
 #{If you set it to fully transparent, there will be no background for the text, but the margin around the text will still be in effect.}
-text background color = 0;0;0;.6
+text background color=0;0;0;0;
 
 #i+[0;20] Margin around the text (in pixels) :
 text margin = 4

=== modified file 'data/cairo-dock.desktop'
--- data/cairo-dock.desktop	2010-09-18 14:17:48 +0000
+++ data/cairo-dock.desktop	2011-08-09 20:04:34 +0000
@@ -2,8 +2,8 @@
 [Desktop Entry]
 Encoding=UTF-8
 Type=Application
-Exec=cairo-dock -o
-Icon=cairo-dock.svg
+Exec=cairo-dock
+Icon=cairo-dock
 Terminal=false
 
 Comment=Cairo-Dock with OpenGL (hardware acceleration)

=== removed file 'data/container.desktop'
--- data/container.desktop	2011-03-17 14:08:48 +0000
+++ data/container.desktop	1970-01-01 00:00:00 +0000
@@ -1,41 +0,0 @@
-#!en
-
-#[gtk-about]
-[Desktop Entry]
-
-#F[Subdock]
-frame_maininfo=
-
-#d Name of the container it belongs to:
-Container = 
-
-#s Sub-dock's name :
-Name = New sub-dock
-
-Exec=
-
-#F[Display]
-frame_display=
-
-#Y[Use an image;1;1;Draw sub-dock's content as emblems;0;0;Draw sub-dock's content as stack;0;0;Draw sub-dock's content inside a box;0;0] How to render the icon :
-render = 3
-
-#S Image's name or path :
-Icon=
-
-#X[Extra parameters]
-frame_extra =
-
-Is container = true
-
-#n Name of the view used for the sub-dock :/
-Renderer = 
-
-#i-[0;16] Only show in this specific viewport
-#{If '0' the container will be displayed on every viewport.}
-ShowOnViewport = 0
-
-#f[0;100] Order you want for this launcher among the others:
-Order=0
-
-group = 0

=== added file 'data/container.desktop.in'
--- data/container.desktop.in	1970-01-01 00:00:00 +0000
+++ data/container.desktop.in	2011-08-09 20:04:34 +0000
@@ -0,0 +1,41 @@
+#@VERSION@
+
+#[gtk-about]
+[Desktop Entry]
+
+#F[Icon]
+frame_maininfo=
+
+#d+ Name of the container it belongs to:
+Container = 
+
+#s Sub-dock's name :
+Name = New sub-dock
+
+#v
+sep_display=
+
+#Y+[Use an image;1;1;Draw sub-dock's content as emblems;0;0;Draw sub-dock's content as stack;0;0;Draw sub-dock's content inside a box;0;0] How to render the icon :
+render = 3
+
+#S+ Image's name or path :
+Icon=
+
+
+#X[Extra parameters]
+frame_extra =
+
+#n Name of the view used for the sub-dock :/
+Renderer = 
+
+#i-[0;16] Only show in this specific viewport
+#{If '0' the container will be displayed on every viewport.}
+ShowOnViewport = 0
+
+#f[0;100] Order you want for this launcher among the others:
+Order=0
+
+group = 0
+
+Icon Type = 1
+Type = Container

=== removed file 'data/default-class-indicator.svg'
--- data/default-class-indicator.svg	2010-04-20 02:44:22 +0000
+++ data/default-class-indicator.svg	1970-01-01 00:00:00 +0000
@@ -1,131 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:xlink="http://www.w3.org/1999/xlink"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   version="1.0"
-   width="48"
-   height="48"
-   id="svg2443"
-   inkscape:version="0.47 r22583"
-   sodipodi:docname="default-class-indicator.svg">
-  <metadata
-     id="metadata22">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title />
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <sodipodi:namedview
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1"
-     objecttolerance="10"
-     gridtolerance="10"
-     guidetolerance="10"
-     inkscape:pageopacity="0"
-     inkscape:pageshadow="2"
-     inkscape:window-width="1233"
-     inkscape:window-height="742"
-     id="namedview20"
-     showgrid="false"
-     inkscape:zoom="4.9166667"
-     inkscape:cx="-13.932203"
-     inkscape:cy="21.254237"
-     inkscape:window-x="59"
-     inkscape:window-y="148"
-     inkscape:window-maximized="0"
-     inkscape:current-layer="layer1" />
-  <defs
-     id="defs2445">
-    <linearGradient
-       id="linearGradient5105-262-943-861">
-      <stop
-         id="stop2487"
-         style="stop-color:#0d0d0d;stop-opacity:1"
-         offset="0" />
-      <stop
-         id="stop2489"
-         style="stop-color:#0d0d0d;stop-opacity:0"
-         offset="1" />
-    </linearGradient>
-    <radialGradient
-       cx="11.25"
-       cy="19.03125"
-       r="8.0625"
-       fx="11.25"
-       fy="19.03125"
-       id="radialGradient5315"
-       xlink:href="#linearGradient5105-262-943-861"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1,0,0,0.282946,0,13.64644)" />
-    <linearGradient
-       id="linearGradient4168">
-      <stop
-         id="stop4170"
-         style="stop-color:#8babcb;stop-opacity:1;"
-         offset="0" />
-      <stop
-         id="stop4172"
-         style="stop-color:#426296;stop-opacity:1;"
-         offset="1" />
-    </linearGradient>
-    <linearGradient
-       x1="15.658319"
-       y1="23.890965"
-       x2="43.091583"
-       y2="23.890965"
-       id="linearGradient2615"
-       xlink:href="#linearGradient4168"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0,0.98279,-0.9893763,0,47.637156,-0.2998291)" />
-    <linearGradient
-       id="linearGradient4222">
-      <stop
-         id="stop4224"
-         style="stop-color:white;stop-opacity:1"
-         offset="0" />
-      <stop
-         id="stop4226"
-         style="stop-color:white;stop-opacity:0"
-         offset="1" />
-    </linearGradient>
-    <linearGradient
-       x1="37.390652"
-       y1="26.022907"
-       x2="-7.150826"
-       y2="26.022907"
-       id="linearGradient2612"
-       xlink:href="#linearGradient4222"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0,-1.1398464,-1.1421864,0,54.071685,50.210506)" />
-  </defs>
-  <g
-     id="layer1">
-    <path
-       d="m 19.3125,19.03125 a 8.0625,2.28125 0 1 1 -16.125,0 8.0625,2.28125 0 1 1 16.125,0 z"
-       transform="matrix(2.9695155,0,0,2.8861277,-9.4070494,-14.010597)"
-       id="path4346"
-       style="opacity:0.16292138;fill:url(#radialGradient5315);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible" />
-    <path
-       d="M 43.500221,23.5 23.951009,1.5000008 4.4997782,23.5 13.5,23.5 l 0,18.000221 21,0 0,-18.000221 9.000221,0 z"
-       id="path4348"
-       style="fill:url(#linearGradient2615);fill-opacity:1;fill-rule:nonzero;stroke:#426296;stroke-width:0.99955720000000003;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible" />
-    <path
-       d="M 41.338037,22.5 24,3.0000008 6.4999996,22.5 14.5,22.5 l 0,18 19,0 0,-18 7.838037,0 z"
-       id="path4360"
-       style="opacity:0.35400008;fill:none;stroke:url(#linearGradient2612);stroke-width:0.9995572;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible" />
-  </g>
-</svg>

=== removed file 'data/default-icon-appli.svg'
--- data/default-icon-appli.svg	2010-04-20 02:44:22 +0000
+++ data/default-icon-appli.svg	1970-01-01 00:00:00 +0000
@@ -1,207 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-
-<svg
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:xlink="http://www.w3.org/1999/xlink"
-   version="1.1"
-   width="48"
-   height="48"
-   id="svg19123">
-  <defs
-     id="defs19125">
-    <radialGradient
-       cx="4.9929786"
-       cy="43.5"
-       r="2.5"
-       fx="4.9929786"
-       fy="43.5"
-       id="radialGradient2873-966-168"
-       xlink:href="#linearGradient3688-166-749"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(2.003784,0,0,1.4,27.98813,-17.4)" />
-    <linearGradient
-       id="linearGradient3688-166-749">
-      <stop
-         id="stop2883"
-         style="stop-color:#181818;stop-opacity:1"
-         offset="0" />
-      <stop
-         id="stop2885"
-         style="stop-color:#181818;stop-opacity:0"
-         offset="1" />
-    </linearGradient>
-    <radialGradient
-       cx="4.9929786"
-       cy="43.5"
-       r="2.5"
-       fx="4.9929786"
-       fy="43.5"
-       id="radialGradient2875-742-326"
-       xlink:href="#linearGradient3688-464-309"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(2.003784,0,0,1.4,-20.01187,-104.4)" />
-    <linearGradient
-       id="linearGradient3688-464-309">
-      <stop
-         id="stop2889"
-         style="stop-color:#181818;stop-opacity:1"
-         offset="0" />
-      <stop
-         id="stop2891"
-         style="stop-color:#181818;stop-opacity:0"
-         offset="1" />
-    </linearGradient>
-    <linearGradient
-       x1="25.058096"
-       y1="47.027729"
-       x2="25.058096"
-       y2="39.999443"
-       id="linearGradient2877-634-617"
-       xlink:href="#linearGradient3702-501-757"
-       gradientUnits="userSpaceOnUse" />
-    <linearGradient
-       id="linearGradient3702-501-757">
-      <stop
-         id="stop2895"
-         style="stop-color:#181818;stop-opacity:0"
-         offset="0" />
-      <stop
-         id="stop2897"
-         style="stop-color:#181818;stop-opacity:1"
-         offset="0.5" />
-      <stop
-         id="stop2899"
-         style="stop-color:#181818;stop-opacity:0"
-         offset="1" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient3242-52-665">
-      <stop
-         id="stop2903"
-         style="stop-color:#d3d3d3;stop-opacity:1"
-         offset="0" />
-      <stop
-         id="stop2905"
-         style="stop-color:#b1b1b1;stop-opacity:1"
-         offset="0.26238" />
-      <stop
-         id="stop2907"
-         style="stop-color:#8e8e8e;stop-opacity:1"
-         offset="0.66093999" />
-      <stop
-         id="stop2909"
-         style="stop-color:#525252;stop-opacity:1"
-         offset="1" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient2490-654-721">
-      <stop
-         id="stop2913"
-         style="stop-color:#545454;stop-opacity:1"
-         offset="0" />
-      <stop
-         id="stop2915"
-         style="stop-color:#a4a4a4;stop-opacity:1"
-         offset="1" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient3308-4-6-931-761">
-      <stop
-         id="stop2919"
-         style="stop-color:white;stop-opacity:1"
-         offset="0" />
-      <stop
-         id="stop2921"
-         style="stop-color:white;stop-opacity:0"
-         offset="1" />
-    </linearGradient>
-    <linearGradient
-       x1="23.99999"
-       y1="4.999989"
-       x2="23.99999"
-       y2="43"
-       id="linearGradient3003"
-       xlink:href="#linearGradient3308-4-6-931-761"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="translate(0,0.9674386)" />
-    <radialGradient
-       cx="7.4956832"
-       cy="8.4497671"
-       r="19.99999"
-       fx="7.4956832"
-       fy="8.4497671"
-       id="radialGradient3006"
-       xlink:href="#linearGradient3242-52-665"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0,2.2997661,-3.0782051,-9.7040999e-8,50.010227,-11.188343)" />
-    <linearGradient
-       x1="24"
-       y1="44"
-       x2="24"
-       y2="3.8990016"
-       id="linearGradient3008"
-       xlink:href="#linearGradient2490-654-721"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="translate(0,0.9674386)" />
-  </defs>
-  <g
-     transform="matrix(1.1,0,0,0.44444486,-2.4000022,25.11107)"
-     id="g2036"
-     style="display:inline">
-    <g
-       transform="matrix(1.052632,0,0,1.285713,-1.263158,-13.42854)"
-       id="g3712"
-       style="opacity:0.4">
-      <rect
-         width="5"
-         height="7"
-         x="38"
-         y="40"
-         id="rect2801"
-         style="fill:url(#radialGradient2873-966-168);fill-opacity:1;stroke:none" />
-      <rect
-         width="5"
-         height="7"
-         x="-10"
-         y="-47"
-         transform="scale(-1,-1)"
-         id="rect3696"
-         style="fill:url(#radialGradient2875-742-326);fill-opacity:1;stroke:none" />
-      <rect
-         width="28"
-         height="7.0000005"
-         x="10"
-         y="40"
-         id="rect3700"
-         style="fill:url(#linearGradient2877-634-617);fill-opacity:1;stroke:none" />
-    </g>
-  </g>
-  <rect
-     width="39"
-     height="39"
-     rx="2.2322156"
-     ry="2.2322156"
-     x="4.5"
-     y="5.4674392"
-     id="rect5505"
-     style="fill:url(#radialGradient3006);fill-opacity:1;stroke:url(#linearGradient3008);stroke-width:1;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0" />
-  <rect
-     width="36.999985"
-     height="37.000011"
-     rx="1.365193"
-     ry="1.365193"
-     x="5.4999981"
-     y="6.4674282"
-     id="rect6741"
-     style="opacity:0.4;fill:none;stroke:url(#linearGradient3003);stroke-width:0.99999976;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0" />
-  <path
-     d="m 24.910438,30.163548 c -0.06608,-2.358762 0.462374,-4.648617 2.690869,-6.270608 2.35386,-1.834368 4.620815,-4.129412 4.381246,-6.83475 -0.05231,-2.609055 -3.092241,-4.653533 -6.367546,-4.947493 -3.684186,-0.510386 -8.142028,0.751736 -9.376574,3.628942 -0.626134,1.399375 -0.0455,3.910017 2.055795,3.910017 1.229052,0 1.793562,-0.793934 1.886302,-1.520198 0.07017,-0.549514 -0.155434,-1.040224 -0.288666,-1.494127 -0.15181,-0.517192 0.496254,-1.519566 1.202084,-1.927971 0.589802,-0.341274 1.206886,-0.455708 1.297847,-0.477569 2.118145,-0.509045 4.22963,0.615366 5.110579,1.983913 0.88095,1.368546 -0.08871,3.444365 -1.482855,5.463019 -1.394147,2.018654 -2.890315,4.311433 -2.884338,6.74674 0,0.927123 -0.08261,1.242088 -0.02391,1.617179 0.04689,0.299687 1.039226,0.263471 1.799169,0.122906 z m -0.966655,3.174767 c -2.025281,-0.109945 -3.427057,2.185998 -2.210368,3.648826 1.086561,1.615107 4.133026,1.216405 4.655189,-0.612542 0.542861,-1.422241 -0.763542,-3.060025 -2.44482,-3.036285 l -1e-6,1e-6 z"
-     id="path3298"
-     style="font-size:72px;font-style:normal;font-weight:bold;opacity:0.4;fill:white;fill-opacity:1;stroke:none;font-family:Standard Symbols L" />
-  <path
-     d="m 24.910438,29.163548 c -0.06608,-2.358762 0.462374,-4.648617 2.690869,-6.270608 2.35386,-1.834368 4.620815,-4.129412 4.381246,-6.83475 -0.05231,-2.609055 -3.092241,-4.653533 -6.367546,-4.947493 -3.684186,-0.510386 -8.142028,0.751736 -9.376574,3.628942 -0.626134,1.399375 -0.0455,3.910017 2.055795,3.910017 1.229052,0 1.793562,-0.793934 1.886302,-1.520198 0.07017,-0.549514 -0.155434,-1.040224 -0.288666,-1.494127 -0.15181,-0.517192 0.496254,-1.519566 1.202084,-1.927971 0.589802,-0.341274 1.206886,-0.455708 1.297847,-0.477569 2.118145,-0.509045 4.22963,0.615366 5.110579,1.983913 0.88095,1.368546 -0.08871,3.444365 -1.482855,5.463019 -1.394147,2.018654 -2.890315,4.311433 -2.884338,6.74674 0,0.927123 -0.08261,1.242088 -0.02391,1.617179 0.04689,0.299687 1.039226,0.263471 1.799169,0.122906 z m -0.966655,3.174767 c -2.025281,-0.109945 -3.427057,2.185998 -2.210368,3.648826 1.086561,1.615107 4.133026,1.216405 4.655189,-0.612542 0.542861,-1.422241 -0.763542,-3.060025 -2.44482,-3.036285 l -1e-6,1e-6 z"
-     id="path9053"
-     style="font-size:72px;font-style:normal;font-weight:bold;opacity:0.4;fill:black;fill-opacity:1;stroke:none;font-family:Standard Symbols L" />
-</svg>

=== removed file 'data/default-icon.svg'
--- data/default-icon.svg	2010-04-20 02:44:22 +0000
+++ data/default-icon.svg	1970-01-01 00:00:00 +0000
@@ -1,125 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-
-<svg
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:xlink="http://www.w3.org/1999/xlink"
-   version="1.0"
-   width="48"
-   height="48"
-   id="svg3675">
-  <defs
-     id="defs3677">
-    <linearGradient
-       id="linearGradient8838">
-      <stop
-         id="stop8840"
-         style="stop-color:black;stop-opacity:1"
-         offset="0" />
-      <stop
-         id="stop8842"
-         style="stop-color:black;stop-opacity:0"
-         offset="1" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient2490-182-124">
-      <stop
-         id="stop2788"
-         style="stop-color:#1f4b6a;stop-opacity:1"
-         offset="0" />
-      <stop
-         id="stop2790"
-         style="stop-color:#4083c2;stop-opacity:1"
-         offset="1" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient3242-187-536">
-      <stop
-         id="stop2778"
-         style="stop-color:#8badea;stop-opacity:1"
-         offset="0" />
-      <stop
-         id="stop2780"
-         style="stop-color:#6396cd;stop-opacity:1"
-         offset="0.26238" />
-      <stop
-         id="stop2782"
-         style="stop-color:#3b7caf;stop-opacity:1"
-         offset="0.66093999" />
-      <stop
-         id="stop2784"
-         style="stop-color:#194c70;stop-opacity:1"
-         offset="1" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient4873">
-      <stop
-         id="stop4875"
-         style="stop-color:white;stop-opacity:1"
-         offset="0" />
-      <stop
-         id="stop4877"
-         style="stop-color:white;stop-opacity:0"
-         offset="1" />
-    </linearGradient>
-    <linearGradient
-       x1="63.397362"
-       y1="-12.489107"
-       x2="63.397362"
-       y2="5.4675598"
-       id="linearGradient2407"
-       xlink:href="#linearGradient4873"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(2.1153735,0,0,2.1153253,-107.57709,32.426559)" />
-    <radialGradient
-       cx="23.895569"
-       cy="3.9900031"
-       r="20.397499"
-       fx="23.895569"
-       fy="3.9900031"
-       id="radialGradient2410"
-       xlink:href="#linearGradient3242-187-536"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0,2.2874593,-3.0194057,0,36.047437,-50.630156)" />
-    <linearGradient
-       x1="18.379412"
-       y1="44.980297"
-       x2="18.379412"
-       y2="3.0816143"
-       id="linearGradient2412"
-       xlink:href="#linearGradient2490-182-124"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.9584364,0,0,0.9584366,0.9975246,1.9975253)" />
-    <radialGradient
-       cx="62.625"
-       cy="4.625"
-       r="10.625"
-       fx="62.625"
-       fy="4.625"
-       id="radialGradient2415"
-       xlink:href="#linearGradient8838"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(2.1647059,0,0,0.7529402,-111.56471,36.517647)" />
-  </defs>
-  <path
-     d="m 46.999997,40 c 0,4.418278 -10.297452,8 -23,8 -12.702548,0 -23.0000002,-3.581722 -23.0000002,-8 0,-4.418278 10.2974522,-8 23.0000002,-8 12.702548,0 23,3.581722 23,8 l 0,0 z"
-     id="path8836"
-     style="opacity:0.3;fill:url(#radialGradient2415);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:0.99999988;marker:none;visibility:visible;display:inline;overflow:visible" />
-  <path
-     d="M 24.000002,5.5018088 C 13.241573,5.5018088 4.5018088,14.24157 4.5018088,25 c 0,10.75843 8.7397642,19.498195 19.4981932,19.498192 10.758425,0 19.498199,-8.739762 19.498189,-19.498192 0,-10.75843 -8.739764,-19.4981912 -19.498189,-19.4981912 z"
-     id="path2555"
-     style="fill:url(#radialGradient2410);fill-opacity:1;stroke:url(#linearGradient2412);stroke-width:1.003654;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0" />
-  <path
-     d="M 42.500002,24.999344 C 42.500002,35.216942 34.21666,43.5 24.000235,43.5 13.782875,43.5 5.5000003,35.216848 5.5000003,24.999344 c 0,-10.217125 8.2828747,-18.4993439 18.5002347,-18.4993439 10.216425,0 18.499767,8.2822189 18.499767,18.4993439 l 0,0 z"
-     id="path8655"
-     style="opacity:0.4;fill:none;stroke:url(#linearGradient2407);stroke-width:1;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
-  <path
-     d="m 24.910438,30.163548 c -0.06608,-2.358762 0.462374,-4.648617 2.690869,-6.270608 2.35386,-1.834368 4.620815,-4.129412 4.381246,-6.83475 -0.05231,-2.609055 -3.092241,-4.653533 -6.367546,-4.947493 -3.684186,-0.510386 -8.142028,0.751736 -9.376574,3.628942 -0.626134,1.399375 -0.0455,3.910017 2.055795,3.910017 1.229052,0 1.793562,-0.793934 1.886302,-1.520198 0.07017,-0.549514 -0.155434,-1.040224 -0.288666,-1.494127 -0.15181,-0.517192 0.496254,-1.519566 1.202084,-1.927971 0.589802,-0.341274 1.206886,-0.455708 1.297847,-0.477569 2.118145,-0.509045 4.22963,0.615366 5.110579,1.983913 0.88095,1.368546 -0.08871,3.444365 -1.482855,5.463019 -1.394147,2.018654 -2.890315,4.311433 -2.884338,6.74674 0,0.927123 -0.08261,1.242088 -0.02391,1.617179 0.04689,0.299687 1.039226,0.263471 1.799169,0.122906 z m -0.966655,3.174767 c -2.025281,-0.109945 -3.427057,2.185998 -2.210368,3.648826 1.086561,1.615107 4.133026,1.216405 4.655189,-0.612542 0.542861,-1.422241 -0.763542,-3.060025 -2.44482,-3.036285 l -1e-6,1e-6 z"
-     id="path9053"
-     style="font-size:72px;font-style:normal;font-weight:bold;opacity:0.2;fill:black;fill-opacity:1;stroke:none;font-family:Standard Symbols L" />
-  <path
-     d="m 24.910438,31.163548 c -0.06608,-2.358762 0.462374,-4.648617 2.690869,-6.270608 2.35386,-1.834368 4.620815,-4.129412 4.381246,-6.83475 -0.05231,-2.609055 -3.092241,-4.653533 -6.367546,-4.947493 -3.684186,-0.510386 -8.142028,0.751736 -9.376574,3.628942 -0.626134,1.399375 -0.0455,3.910017 2.055795,3.910017 1.229052,0 1.793562,-0.793934 1.886302,-1.520198 0.07017,-0.549514 -0.155434,-1.040224 -0.288666,-1.494127 -0.15181,-0.517192 0.496254,-1.519566 1.202084,-1.927971 0.589802,-0.341274 1.206886,-0.455708 1.297847,-0.477569 2.118145,-0.509045 4.22963,0.615366 5.110579,1.983913 0.88095,1.368546 -0.08871,3.444365 -1.482855,5.463019 -1.394147,2.018654 -2.890315,4.311433 -2.884338,6.74674 0,0.927123 -0.08261,1.242088 -0.02391,1.617179 0.04689,0.299687 1.039226,0.263471 1.799169,0.122906 z m -0.966655,3.174767 c -2.025281,-0.109945 -3.427057,2.185998 -2.210368,3.648826 1.086561,1.615107 4.133026,1.216405 4.655189,-0.612542 0.542861,-1.422241 -0.763542,-3.060025 -2.44482,-3.036285 l -1e-6,1e-6 z"
-     id="path3298"
-     style="font-size:72px;font-style:normal;font-weight:bold;fill:white;fill-opacity:1;stroke:none;font-family:Standard Symbols L" />
-</svg>

=== removed file 'data/default-indicator.png'
Binary files data/default-indicator.png	2010-09-18 14:17:48 +0000 and data/default-indicator.png	1970-01-01 00:00:00 +0000 differ
=== modified file 'data/default-theme/CMakeLists.txt'
--- data/default-theme/CMakeLists.txt	2011-03-17 14:08:48 +0000
+++ data/default-theme/CMakeLists.txt	2011-08-09 20:04:34 +0000
@@ -1,13 +1,11 @@
 add_subdirectory(launchers)
 add_subdirectory(plug-ins)
+add_subdirectory(images)
 
 ########### install files ###############
 
 install(FILES
 	cairo-dock.conf
-	active.png
-	bg.svg
-	indicator.png
 	preview
 	readme
 	DESTINATION ${pkgdatadir}/themes/_default_ )

=== removed file 'data/default-theme/active.png'
Binary files data/default-theme/active.png	2010-04-20 02:44:22 +0000 and data/default-theme/active.png	1970-01-01 00:00:00 +0000 differ
=== removed file 'data/default-theme/bg.svg'
--- data/default-theme/bg.svg	2010-08-09 23:26:12 +0000
+++ data/default-theme/bg.svg	1970-01-01 00:00:00 +0000
@@ -1,83 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   width="800"
-   height="120"
-   id="svg3776"
-   version="1.1"
-   inkscape:version="0.47 r22583"
-   sodipodi:docname="bg.svg">
-  <defs
-     id="defs3778">
-    <inkscape:perspective
-       sodipodi:type="inkscape:persp3d"
-       inkscape:vp_x="0 : 526.18109 : 1"
-       inkscape:vp_y="0 : 1000 : 0"
-       inkscape:vp_z="744.09448 : 526.18109 : 1"
-       inkscape:persp3d-origin="372.04724 : 350.78739 : 1"
-       id="perspective3784" />
-    <inkscape:perspective
-       id="perspective3771"
-       inkscape:persp3d-origin="0.5 : 0.33333333 : 1"
-       inkscape:vp_z="1 : 0.5 : 1"
-       inkscape:vp_y="0 : 1000 : 0"
-       inkscape:vp_x="0 : 0.5 : 1"
-       sodipodi:type="inkscape:persp3d" />
-  </defs>
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="0.98994949"
-     inkscape:cx="102.063"
-     inkscape:cy="-14.87004"
-     inkscape:document-units="px"
-     inkscape:current-layer="layer1"
-     showgrid="false"
-     inkscape:window-width="1215"
-     inkscape:window-height="970"
-     inkscape:window-x="65"
-     inkscape:window-y="25"
-     inkscape:window-maximized="1" />
-  <metadata
-     id="metadata3781">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title />
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <g
-     inkscape:label="Calque 1"
-     inkscape:groupmode="layer"
-     id="layer1"
-     transform="translate(0,-932.36218)">
-    <rect
-       style="fill:#262626;stroke:none;fill-opacity:1;opacity:1"
-       id="rect3837"
-       width="801.08618"
-       height="121.21831"
-       x="0"
-       y="932.15405" />
-    <path
-       style="fill:#000000;fill-opacity:1;stroke:none"
-       d="m 185.22702,955.16035 c -53.85908,0.0108 -56.53315,-2.85345 -125.718433,8.61984 -25.40949,4.21377 -59.53391653,21.22977 -59.53391653,21.22977 0,0 0.36446262,-52.26629 0.36446262,-52.26629 l 800.62423691,-0.1753 0.80189,69.20133 c -209.92993,2.1491 -408.74928,-50.58789 -616.53824,-46.60935 z"
-       id="path3743"
-       sodipodi:nodetypes="csccccc" />
-  </g>
-</svg>

=== modified file 'data/default-theme/cairo-dock.conf'
--- data/default-theme/cairo-dock.conf	2011-03-17 14:08:48 +0000
+++ data/default-theme/cairo-dock.conf	2011-08-09 20:04:34 +0000
@@ -1,4 +1,4 @@
-#!en;2.3.0~0rc2
+#2.4.0~0beta0
 ######## This is the conf file of Cairo-Dock, released under the GPL.##########
 ######## It is parsed by cairo-dock to automatically generate an appropriate GUI,##########
 ######## so don't mess into it, except if you know what you're doing ! ;-)##########
@@ -20,21 +20,20 @@
 
 #I-[-1000;1000] Lateral offset:
 #{Gap from the absolute position on the screen's edge, in pixels. You can also move the dock by holding the ALT or CTRL key and the left mouse button.}
-x gap=0
+x gap = 0
 #i-[-30;1000] Distance to the screen edge:
 #{in pixels. You can also move the dock by holding the ALT or CTRL key and the left mouse button.}
-y gap=-1
+y gap = 0
 
 #F-[Multiple screens]
 frame_xin=
 
 #B- Use Xinerama?
 #{This option is to use if you have a dual-screen and use Xinerama to manage them.}
-xinerama=false
-#i[0;12] Number of the screen where the dock should be located:
-#{starting from 0}
-#
-#
+xinerama = false
+
+#i-[0;12] Number of the screen where the dock should be located:
+#{0 is the first screen.}
 num screen=0
 
 
@@ -47,7 +46,7 @@
 #{Modes are sorted from the most intrusive to the less intrusive.
 #When the dock is hidden or below a window, place the mouse on the screen's border to call it back.
 #When the dock pops up on shortcut, it will appear at the position of your mouse. The rest of the time, it stays invisible, thus acting like a menu.}
-visibility=3
+visibility = 4
 
 #v
 sep_visi=
@@ -77,30 +76,27 @@
 
 max_authorized_width=0
 
-#b- Stretch the dock to always fill the screen
-extended=false
-
 #b- Automatically hide the dock when a window becomes full screen?
 #{This is only usefull if you do not already use auto-hide and if your Window Manager allows the dock in front of fullscreen windows (which is rare).}
 auto quick hide=false
 
-#F-[Sub-docks' visibility;/usr/share/cairo-dock/icon-subdock.png]
+#F-[Sub-docks' visibility;/usr/share/cairo-dock/icons/icon-subdock.png]
 frame_sub=
 
 #Y-[Appear on mouse over;1;1;Appear on click;0;0] Visibility:
 #{they will appear either when you click or when you linger over the icon pointing on it.}
-show_on_click=0
+show_on_click = 1
 
 #i- Delay before displaying a sub-dock:
 #{in ms.}
-show delay=300
+show delay = 300
 
 #i- Delay before leaving a sub-dock takes effect:
 #{in ms.}
-leaving delay=250
+leaving delay = 250
 
-lock icons=false
-lock all=false
+lock icons = false
+lock all = false
 
 
 [TaskBar]
@@ -110,7 +106,7 @@
 
 #B-[5] Show currently opened applications in the dock?
 #{Cairo-Dock will then act as your taskbar. It is recommended to remove any other taskbars.}
-show applications=true
+show applications = true
 
 #b- Only show icons whose windows are minimised
 hide visible=false
@@ -120,7 +116,7 @@
 
 #b- Mix launchers and applications
 #{Allows launchers to act as applications when their programs are running and displays a marker on icons to indicate this. You can launch other occurences of the program with SHIFT+click.}
-mix launcher appli=true
+mix launcher appli = true
 
 #B- Group windows from the same application in a sub-dock ?
 #{This allows you to group all the windows of a given application into a unique sub-dock, and to act on all of the windows at the same time.}
@@ -128,7 +124,7 @@
 
 #s- 		Except the following classes:
 #{Enter the class of the applications, separated by a semi-colon ';'}
-group exception=pidgin;xchat;empathy
+group exception = 
 
 
 #F-[Representation;gtk-find]
@@ -136,26 +132,26 @@
 
 #B- Overwrite the X icon with the launchers' icon?
 #{If not set, the icon provided by X for each application will be used. If set, the same icon as the corresponding launcher will be used for each application.}
-overwrite xicon=true
+overwrite xicon = true
 
 #s- 		Except the following classes:
 #{Enter the class of the applications, separated by a semi-colon ';'}
-overwrite exception=pidgin;xchat;empathy
+overwrite exception = 
 
 #Y-[Make the icon transparent;1;1;Show a window's thumbnail;0;0;Draw it bent backwards;0;0] How to draw minimised windows ?
 #{A composite manager is required to display the thumbnail.
 #OpenGL is required to draw the icon bent backwards.}
-minimized=1
+minimized = 1
 
 #e-[0;.6;Opaque;Transparent] Transparency of icons whose window is minimised:
-visibility alpha=0.34999999999999998
+visibility alpha = 0.35
 
 #a- Play a short animation of the icon when its window becomes active
-animation on active window=wobbly
+animation on active window = wobbly
 
 #i- Maximum number of caracters in application name:
 #{"..." will be added at the end if the name is too long.}
-max name length=15
+max name length = 20
 
 #F-[Interaction;gtk-refresh]
 frame2=
@@ -165,17 +161,17 @@
 
 #b- Minimise the window when its icon is clicked, if it was already the active window ?
 #{This is the default behaviour of most taskbars.}
-minimize on click=true
+minimize on click = true
 
 #v- 
 sep_att=
 
 #B-[2] Highlight applications requiring your attention with a dialog bubble
-demands attention with dialog=true
+demands attention with dialog = true
 
 #i-[1;20] Duration of the dialog:
 #{in seconds}
-duration=3
+duration = 2
 
 #s- Force the following applications to demand your attention
 #{It will notify you even if, for instance, you are watching a movie in full screen or you are on another desktop.
@@ -188,7 +184,7 @@
 
 [System]
 
-#X-[Animations speed;/usr/share/cairo-dock/icon-movment.png]
+#X-[Animations speed;/usr/share/cairo-dock/icons/icon-movment.png]
 frame_mov=
 
 #B- Animate sub-docks when they appear
@@ -196,61 +192,61 @@
 
 #I-[100;600;fast;slow] Animation unfolding duration:
 #{Icons will appear folded on themselves and will then unfold until they fill the whole dock. The smaller this value, the faster this will be.}
-unfold duration=300
+unfold duration = 300
 
 #v
 sep_unfold=
 
 #I-[4;40;fast;slow] Number of steps in the zoom animation (grow/shrink):
 #{The more there are, the slower it will be}
-grow nb steps=8
+grow nb steps = 10
 #I-[4;40;fast;slow] ...
-shrink nb steps=8
+shrink nb steps = 8
 
 #v
 sep_unhide=
 
 #I-[4;40;fast;slow] Number of steps in the auto-hide animation (move up/move down):
 #{The more there are, the slower it will be}
-move up nb steps=12
+move up nb steps = 10
 #I-[4;40;fast;slow] ...
-move down nb steps=16
+move down nb steps = 16
 
 #X-[Refresh rate;gtk-execute]
 frame_cpu=
 
 #i-[5;40] Refresh rate when mouving cursor into the dock :
 #{in Hz. This is to adjust behaviour relative to your CPU power.}
-refresh frequency=35
+refresh frequency = 35
 
 #i-[15;60] Animation frequency for the OpenGL backend :
 #{in Hz. This is to adjust behaviour relative to your CPU power.}
-opengl anim freq=33
+opengl anim freq = 33
 
 #i-[15;50] Animation frequency for the Cairo backend :
 #{in Hz. This is to adjust behaviour relative to your CPU power.}
-cairo anim freq=25
+cairo anim freq = 25
 
 #b- Reflections should be calculated in real-time?
 #{The transparency gradation pattern will then be re-calculated in real time. May need more CPU power.}
-dynamic reflection=false
+dynamic reflection = false
 
 #X-[Composition;gtk-clear]
 frame_fake=
 #b- Emulate composition with fake transparency?
 #{Only use this if you don't run a composite manager like Compiz, xcompmgr, etc and have a black background around your dock. For aesthetic reasons, the dock will be kept under other windows.}
-fake transparency=false
+fake transparency = false
 
 #b- Make the config panel transparent?
 #{You need to re-open the panel. It is deactivated by default on KDE.}
-config transparency=false
+config transparency = false
 
 #X-[Connection to the Internet;gtk-network]
 frame_conn=
 
 #i-[1;20] Connection timeout :
 #{Maximum time in seconds that you allow the connection to the server to take. This only limits the connection phase,  once the dock has connected this option is of no more use.}
-conn timeout=10
+conn timeout = 7
 
 #i-[10;300] Maximum time to download a file:
 #{Maximum time in seconds that you allow the whole operation to last. Some themes can be up to a few MB.}
@@ -262,7 +258,7 @@
 
 #B-[4] Are you behind a proxy ?
 #{Use this option if you connect to the Internet through a proxy.}
-conn use proxy=false
+conn use proxy = false
 
 #s- Proxy name :
 conn proxy=
@@ -278,7 +274,7 @@
 #{Let empty if you don't need to log-in to the proxy with a user/password.}
 conn passwd=
 
-modules=switcher;dnd2share;illusion;logout;showDesktop;shortcuts;Quick Browser;GMenu;Recent-Events;Animated icons;icon effects;Scooby-Do;musicPlayer
+modules = switcher;dnd2share;illusion;logout;showDesktop;shortcuts;Quick Browser;GMenu;Recent-Events;Animated icons;icon effects;Scooby-Do;musicPlayer;Help
 
 
 [Background]
@@ -300,7 +296,7 @@
 #b+ Repeat image as a pattern to fill background?
 repeat image=false
 
-#F+[Colour gradation;/usr/share/cairo-dock/icon-gradation.png]
+#F+[Colour gradation;/usr/share/cairo-dock/icons/icon-gradation.png]
 #{Use a colour gradation.}
 frame3=
 
@@ -321,11 +317,17 @@
 #f+[0;1] Percentage of the bright colour:
 stripes width=0.49999999999999961
 
-#F+[External Frame;/usr/share/cairo-dock/icon-frame.png]
+#F
+frame3_=
+
+#b+ Stretch the dock to always fill the screen
+extended=false
+
+#F+[External Frame;/usr/share/cairo-dock/icons/icon-frame.png]
 frame_frame=
 #i+[0;30] Corner radius :
 #{in pixels.}
-corner radius=20
+corner radius=10
 
 #i+[0;20] Linewidth of the external line :
 #{in pixels.}
@@ -364,7 +366,7 @@
 
 [Dialogs]
 
-#F+[Bubble;/usr/share/cairo-dock/icon-bubble.png]
+#F+[Bubble;/usr/share/cairo-dock/icons/icon-bubble.png]
 frame_bubble=
 
 #C+ Background colour of the bubble:
@@ -381,7 +383,7 @@
 
 #B+ Use a custom font for the text?
 #{Otherwise the default's system one will be used.}
-custom=false
+custom = false
 
 #P+ Text font:
 message police=Sans 11
@@ -392,12 +394,12 @@
 #c+ Text color:
 text color=1;1;1;
 
-#F+[Buttons;/usr/share/cairo-dock/icon-buttons.png]
+#F+[Buttons;/usr/share/cairo-dock/icons/icon-buttons.png]
 frame_button=
 
 #j+[10;64] Size of buttons in the info-bubbles (width x height) :
 #{in pixels.}
-button size=36;36;
+button size=28;28;
 
 #S+ Name of an image to use for the yes/ok button :
 #{If you don't provide any, a default image will be used.}
@@ -486,7 +488,7 @@
 #{Any format allowed; leave this field empty if you don't want to use an image as background.}
 icons bg=
 
-#F+[Zoom effect;/usr/share/cairo-dock/icon-wave.png]
+#F+[Zoom effect;/usr/share/cairo-dock/icons/icon-wave.png]
 frame_shape=
 #f+[1;5] Maximum zoom of the icons :
 #{set to 1 if you don't want the icons to zoom when you hover over them.}
@@ -674,14 +676,14 @@
 alpha threshold=50
 
 #b- Should the labels always be horizontal, even when dock is vertical?
-always horizontal=true
+always horizontal = true
 
 #F+[Font;gtk-select-font]
 frame_font=
 
 #B+ Use a custom font for labels?
 #{Otherwise the default's system one will be used.}
-custom=false
+custom = false
 
 #P+ Font used for labels :
 police=Sans 12

=== added directory 'data/default-theme/images'
=== added file 'data/default-theme/images/CMakeLists.txt'
--- data/default-theme/images/CMakeLists.txt	1970-01-01 00:00:00 +0000
+++ data/default-theme/images/CMakeLists.txt	2011-08-09 20:04:34 +0000
@@ -0,0 +1,8 @@
+
+########### install files ###############
+
+install(FILES
+	active.png
+	bg.svg
+	indicator.png
+	DESTINATION ${pkgdatadir}/themes/_default_/images )

=== added file 'data/default-theme/images/active.png'
Binary files data/default-theme/images/active.png	1970-01-01 00:00:00 +0000 and data/default-theme/images/active.png	2011-08-09 20:04:34 +0000 differ
=== added file 'data/default-theme/images/bg.svg'
--- data/default-theme/images/bg.svg	1970-01-01 00:00:00 +0000
+++ data/default-theme/images/bg.svg	2011-08-09 20:04:34 +0000
@@ -0,0 +1,83 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="800"
+   height="120"
+   id="svg3776"
+   version="1.1"
+   inkscape:version="0.47 r22583"
+   sodipodi:docname="bg.svg">
+  <defs
+     id="defs3778">
+    <inkscape:perspective
+       sodipodi:type="inkscape:persp3d"
+       inkscape:vp_x="0 : 526.18109 : 1"
+       inkscape:vp_y="0 : 1000 : 0"
+       inkscape:vp_z="744.09448 : 526.18109 : 1"
+       inkscape:persp3d-origin="372.04724 : 350.78739 : 1"
+       id="perspective3784" />
+    <inkscape:perspective
+       id="perspective3771"
+       inkscape:persp3d-origin="0.5 : 0.33333333 : 1"
+       inkscape:vp_z="1 : 0.5 : 1"
+       inkscape:vp_y="0 : 1000 : 0"
+       inkscape:vp_x="0 : 0.5 : 1"
+       sodipodi:type="inkscape:persp3d" />
+  </defs>
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="0.98994949"
+     inkscape:cx="102.063"
+     inkscape:cy="-14.87004"
+     inkscape:document-units="px"
+     inkscape:current-layer="layer1"
+     showgrid="false"
+     inkscape:window-width="1215"
+     inkscape:window-height="970"
+     inkscape:window-x="65"
+     inkscape:window-y="25"
+     inkscape:window-maximized="1" />
+  <metadata
+     id="metadata3781">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title />
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     inkscape:label="Calque 1"
+     inkscape:groupmode="layer"
+     id="layer1"
+     transform="translate(0,-932.36218)">
+    <rect
+       style="fill:#262626;stroke:none;fill-opacity:1;opacity:1"
+       id="rect3837"
+       width="801.08618"
+       height="121.21831"
+       x="0"
+       y="932.15405" />
+    <path
+       style="fill:#000000;fill-opacity:1;stroke:none"
+       d="m 185.22702,955.16035 c -53.85908,0.0108 -56.53315,-2.85345 -125.718433,8.61984 -25.40949,4.21377 -59.53391653,21.22977 -59.53391653,21.22977 0,0 0.36446262,-52.26629 0.36446262,-52.26629 l 800.62423691,-0.1753 0.80189,69.20133 c -209.92993,2.1491 -408.74928,-50.58789 -616.53824,-46.60935 z"
+       id="path3743"
+       sodipodi:nodetypes="csccccc" />
+  </g>
+</svg>

=== added file 'data/default-theme/images/indicator.png'
Binary files data/default-theme/images/indicator.png	1970-01-01 00:00:00 +0000 and data/default-theme/images/indicator.png	2011-08-09 20:04:34 +0000 differ
=== removed file 'data/default-theme/indicator.png'
Binary files data/default-theme/indicator.png	2010-09-18 14:17:48 +0000 and data/default-theme/indicator.png	1970-01-01 00:00:00 +0000 differ
=== removed file 'data/default-theme/launchers/01container.desktop'
--- data/default-theme/launchers/01container.desktop	2010-09-18 14:17:48 +0000
+++ data/default-theme/launchers/01container.desktop	1970-01-01 00:00:00 +0000
@@ -1,34 +0,0 @@
-#!en
-
-[Desktop Entry]
-#s Sub-dock's name :
-Name=Graphics
-
-Exec=
-
-#Y[Use an image;1;1;Draw sub-dock's content as emblems;0;0;Draw sub-dock's content as stack;0;0;Draw sub-dock's content inside a box;0;0] How to render the icon :
-render=0
-
-#S Image's name or path :
-Icon=applications-graphics
-
-#X[Extra parameters]
-frame_extra=
-#f[0;100] Order you want for this launcher among the others:
-Order=1.3184051513671875
-#d Name of the container it belongs to:
-Container=_MainDock_
-
-Nb subicons=1
-
-#n Name of the view used for the sub-dock :/
-Renderer=
-
-#i-[0;16] Only show in this specific viewport
-#{If '0' the container will be displayed on every viewport.}
-ShowOnViewport=0
-
-Base URI=
-Is mounting point=false
-Is container=true
-Name[fr_BE]=Graphics

=== removed file 'data/default-theme/launchers/01empathy.desktop'
--- data/default-theme/launchers/01empathy.desktop	2011-03-17 14:08:48 +0000
+++ data/default-theme/launchers/01empathy.desktop	1970-01-01 00:00:00 +0000
@@ -1,52 +0,0 @@
-#!en
-
-[Desktop Entry]
-#s Launcher's name :
-Name=Empathy
-#s Command to launch on click :
-#{Exemple : nautilus --no-desktop, gedit, etc. You can even enter a keyboard shortcut, for exemple <Alt>F1, <Ctrl>c,  <Ctrl>v, etc}
-Exec=empathy
-#S Image's name or path :
-Icon=empathy
-#d Name of the container it belongs to:
-#{If you write here a container's name that doesn't exist yet, a new one will be created, with this icon inside.}
-Container=_MainDock_
-
-#X[Extra parameters]
-frame_extra=
-#f[0;100] Order you want for this launcher among the others:
-Order=3.361114501953125
-#b Prevent this launcher from stealing appli from taskbar ?
-#{If you choosed to mix launcher and applis, this option will deactivate this behaviour for this launcher only. It can be useful for instance for a launcher that launches a script in a terminal, but you don't want it to steal the Terminal's icon from the Taskbar.} 
-prevent inhibate=false
-
-#K Class of the program :
-#{The only reason you may want to modify this parameter is if you made this launcher by hands. If you dropped it into the dock from the menu, it is nearly sure that you shouldn't touch it. It defines the class of the program, which is useful to link the appli with its launcher.}
-StartupWMClass=
-
-#b Run in a terminal ?
-#{It will use 'xterm'.}
-Terminal=false
-
-#i-[0;16] Only show in this specific viewport
-#{If '0' the launcher will be displayed on every viewport.}
-ShowOnViewport=0
-
-Nb subicons=0
-
-Renderer=
-
-Base URI=
-Is mounting point=false
-
-Version=1.0
-GenericName=IM Client
-X-GNOME-FullName=Empathy IM Client
-Comment=Send and receive messages
-StartupNotify=false
-Type=Application
-Categories=GNOME;GTK;Network;InstantMessaging;
-X-GNOME-Bugzilla-Bugzilla=GNOME
-X-GNOME-Bugzilla-Product=empathy
-X-GNOME-Bugzilla-Component=General
-X-GNOME-Bugzilla-Version=2.29.92

=== removed file 'data/default-theme/launchers/01eog.desktop'
--- data/default-theme/launchers/01eog.desktop	2011-03-17 14:08:48 +0000
+++ data/default-theme/launchers/01eog.desktop	1970-01-01 00:00:00 +0000
@@ -1,54 +0,0 @@
-#!en
-
-[Desktop Entry]
-#s Launcher's name :
-Name=Image Viewer
-#s Command to launch on click :
-#{Exemple : nautilus --no-desktop, gedit, etc. You can even enter a keyboard shortcut, for exemple <Alt>F1, <Ctrl>c,  <Ctrl>v, etc}
-Exec=eog %U
-#S Image's name or path :
-Icon=eog
-#d Name of the container it belongs to:
-#{If you write here a container's name that doesn't exist yet, a new one will be created, with this icon inside.}
-Container=Graphics
-
-#X[Extra parameters]
-frame_extra=
-#f[0;100] Order you want for this launcher among the others:
-Order=-1.6361083984375
-#b Prevent this launcher from stealing appli from taskbar ?
-#{If you choosed to mix launcher and applis, this option will deactivate this behaviour for this launcher only. It can be useful for instance for a launcher that launches a script in a terminal, but you don't want it to steal the Terminal's icon from the Taskbar.}
-prevent inhibate=false
-
-#K Class of the program :
-#{The only reason you may want to modify this parameter is if you made this launcher by hands. If you dropped it into the dock from the menu, it is nearly sure that you shouldn't touch it. It defines the class of the program, which is useful to link the appli with its launcher.}
-StartupWMClass=
-
-#b Run in a terminal ?
-#{It will use 'xterm'.}
-Terminal=false
-
-#i-[0;16] Only show in this specific viewport
-#{If '0' the launcher will be displayed on every viewport.}
-ShowOnViewport=0
-
-Nb subicons=0
-
-Renderer=
-
-Base URI=
-Is mounting point=false
-
-X-GNOME-Bugzilla-Bugzilla=GNOME
-X-GNOME-Bugzilla-Product=EOG
-X-GNOME-Bugzilla-Component=general
-X-GNOME-Bugzilla-Version=2.32.1
-X-GNOME-DocPath=eog/eog.xml
-Comment=Browse and rotate images
-Type=Application
-Categories=GNOME;GTK;Graphics;RasterGraphics;Viewer;
-MimeType=image/bmp;image/gif;image/jpeg;image/jpg;image/pjpeg;image/png;image/tiff;image/x-bmp;image/x-gray;image/x-icb;image/x-ico;image/x-png;image/x-portable-anymap;image/x-portable-bitmap;image/x-portable-graymap;image/x-portable-pixmap;image/x-xbitmap;image/x-xpixmap;image/x-pcx;image/svg+xml;image/svg+xml-compressed;image/vnd.wap.wbmp;
-TryExec=eog
-StartupNotify=true
-NoDisplay=true
-X-Ubuntu-Gettext-Domain=eog

=== removed file 'data/default-theme/launchers/01evolution.desktop'
--- data/default-theme/launchers/01evolution.desktop	2011-03-17 14:08:48 +0000
+++ data/default-theme/launchers/01evolution.desktop	1970-01-01 00:00:00 +0000
@@ -1,47 +0,0 @@
-#!en
-
-[Desktop Entry]
-#s Launcher's name :
-Name=Evolution
-#s Command to launch on click :
-#{Exemple : nautilus --no-desktop, gedit, etc. You can even enter a keyboard shortcut, for exemple <Alt>F1 for the Applications Menu, <Ctrl>c or <Ctrl>v to copy or paste, etc}
-Exec=evolution %U
-#S Image's name or path :
-Icon=evolution
-#E[_MainDock_;Quimper, France;Blog;Documents;Vidéos]  Name of the container it belongs to:
-#{If you write here a container's name that doesn't exist yet, a new one will be created, with this icon inside.}
-Container=_MainDock_
-
-#X[Extra parameters]
-frame_extra=
-#f Order you want for this launcher among the others:
-Order=2.977783203125
-#b Prevent this launcher from stealing appli from taskbar ?
-#{Use this option for exemple if the launcher launches a script in a terminal but you don't want it to steal normal terminal's icons from the TaskBar, or if you explicitely want to use the original icon of the TaskBar because it provides some info, for exemple Pidgin's icons represent the avatar of the contact.}
-prevent inhibate=false
-
-#s Class of the program :
-#{The only reason you may want to modify this parameter is if you made this launcher by hands. If you dropped it into the dock from the menu, it is nearly sure that you shouldn't touch it. It defines the class of the program, which is useful to link the appli with its launcher.}
-StartupWMClass=
-
-Is container=false
-
-Renderer=
-
-Base URI=
-Is mounting point=false
-
-Comment=Manage your email, contacts and schedule
-GenericName=Groupware Suite
-X-GNOME-FullName=Evolution Mail and Calendar
-Terminal=false
-Type=Application
-Categories=GNOME;GTK;Office;Email;Calendar;ContactManagement;X-Red-Hat-Base;
-MimeType=text/calendar;text/x-vcard;text/directory;application/mbox;message/rfc822;x-scheme-handler/mailto
-StartupNotify=true
-X-GNOME-Bugzilla-Bugzilla=GNOME
-X-GNOME-Bugzilla-Product=Evolution
-X-GNOME-Bugzilla-Component=BugBuddyBugs
-X-GNOME-Bugzilla-Version=2.32.x
-X-GNOME-Bugzilla-OtherBinaries=e-addressbook-factory;e-calendar-factory
-X-Ubuntu-Gettext-Domain=evolution-2.32

=== modified file 'data/default-theme/launchers/01firefox.desktop' (properties changed: +x to -x)
--- data/default-theme/launchers/01firefox.desktop	2011-03-17 14:08:48 +0000
+++ data/default-theme/launchers/01firefox.desktop	2011-08-09 20:04:34 +0000
@@ -1,108 +1,49 @@
-#!en
+#2.4.0~0beta0
 
+#[gtk-about]
 [Desktop Entry]
+
+#F[Icon]
+frame_maininfo=
+
+#d+ Name of the container it belongs to:
+Container=_MainDock_
+
+#v
+sep_display=
+
 #s Launcher's name :
-Name=Firefox Web Browser
+Name=
+
+#S+ Image's name or path :
+Icon=
+
 #s Command to launch on click :
 #{Exemple : nautilus --no-desktop, gedit, etc. You can even enter a keyboard shortcut, for exemple <Alt>F1, <Ctrl>c,  <Ctrl>v, etc}
-Exec=firefox 
-#S Image's name or path :
-Icon=firefox
-#d Name of the container it belongs to:
-#{If you write here a container's name that doesn't exist yet, a new one will be created, with this icon inside.}
-Container=_MainDock_
+Exec=
+
 
 #X[Extra parameters]
 frame_extra=
-#f[0;100] Order you want for this launcher among the others:
-Order=3.23333740234375
+
 #b Prevent this launcher from stealing appli from taskbar ?
 #{If you choosed to mix launcher and applis, this option will deactivate this behaviour for this launcher only. It can be useful for instance for a launcher that launches a script in a terminal, but you don't want it to steal the Terminal's icon from the Taskbar.} 
 prevent inhibate=false
 
 #K Class of the program :
 #{The only reason you may want to modify this parameter is if you made this launcher by hands. If you dropped it into the dock from the menu, it is nearly sure that you shouldn't touch it. It defines the class of the program, which is useful to link the appli with its launcher.}
-StartupWMClass=Firefox
+StartupWMClass=
 
 #b Run in a terminal ?
-#{It will use 'xterm'.}
 Terminal=false
 
 #i-[0;16] Only show in this specific viewport
 #{If '0' the launcher will be displayed on every viewport.}
 ShowOnViewport=0
 
-Nb subicons=0
-
-Renderer=
-
-Base URI=
-Is mounting point=false
-
-Is container=false
-Version=1.0
-Name[ca]=Navegador web Firefox
-Name[cs]=Firefox Webový prohlíže�
-Name[es]=Navegador web Firefox
-Name[fa]=مرورگر اینترنتی Firefox
-Name[fi]=Firefox-selain
-Name[fr]=Firefox Web Browser
-Name[hu]=Firefox webböngésző
-Name[it]=Firefox Browser Web
-Name[ja]=Firefox ウェブ・ブラウザ
-Name[ko]=Firefox 웹 브�우저
-Name[nb]=Firefox Nettleser
-Name[nl]=Firefox webbrowser
-Name[nn]=Firefox Nettlesar
-Name[no]=Firefox Nettleser
-Name[pl]=PrzeglÄ…darka WWW Firefox
-Name[pt]=Firefox Navegador Web
-Name[pt_BR]=Navegador Web Firefox
-Name[sk]=Internetový prehliada� Firefox
-Name[sv]=Webbläsaren Firefox
-Comment=Browse the World Wide Web
-Comment[ca]=Navegueu per el web
-Comment[cs]=Prohlížení stránek World Wide Webu
-Comment[de]=Im Internet surfen
-Comment[es]=Navegue por la web
-Comment[fa]=ص�حات شبکه جهانی اینترنت را مرور نمایید
-Comment[fi]=Selaa Internetin WWW-sivuja
-Comment[fr]=Navigue sur Internet
-Comment[hu]=A világháló böngészése
-Comment[it]=Esplora il web
-Comment[ja]=ウェブを閲覧���
-Comment[ko]=웹� �아 다닙니다
-Comment[nb]=Surf på nettet
-Comment[nl]=Verken het internet
-Comment[nn]=Surf på nettet
-Comment[no]=Surf på nettet
-Comment[pl]=PrzeglÄ…danie stron WWW 
-Comment[pt]=Navegue na Internet
-Comment[pt_BR]=Navegue na Internet
-Comment[sk]=Prehliadanie internetu
-Comment[sv]=Surfa på webben
-GenericName=Web Browser
-GenericName[ca]=Navegador web
-GenericName[cs]=Webový prohlíže�
-GenericName[es]=Navegador web
-GenericName[fa]=مرورگر اینترنتی
-GenericName[fi]=WWW-selain
-GenericName[fr]=Navigateur Web
-GenericName[hu]=Webböngésző
-GenericName[it]=Browser Web
-GenericName[ja]=ウェブ・ブラウザ
-GenericName[ko]=웹 브�우저
-GenericName[nb]=Nettleser
-GenericName[nl]=Webbrowser
-GenericName[nn]=Nettlesar
-GenericName[no]=Nettleser
-GenericName[pl]=PrzeglÄ…darka WWW
-GenericName[pt]=Navegador Web
-GenericName[pt_BR]=Navegador Web
-GenericName[sk]=Internetový prehliada�
-GenericName[sv]=Webbläsare
-X-MultipleArgs=false
+#f[0;100] Order you want for this launcher among the others:
+Order=7
+
+Icon Type=0
 Type=Application
-Categories=Application;Network;
-MimeType=text/html;text/xml;application/xhtml+xml;application/xml;application/vnd.mozilla.xul+xml;application/rss+xml;application/rdf+xml;image/gif;image/jpeg;image/png;
-StartupNotify=true
+Origin=/usr/share/applications/firefox.desktop;iceweasel.desktop;chromium-browser.desktop;rekonq.desktop;konqueror.desktop

=== modified file 'data/default-theme/launchers/01gcalctool.desktop' (properties changed: +x to -x)
--- data/default-theme/launchers/01gcalctool.desktop	2010-09-18 14:17:48 +0000
+++ data/default-theme/launchers/01gcalctool.desktop	2011-08-09 20:04:34 +0000
@@ -1,21 +1,31 @@
-#!en
+#2.4.0~0beta0
 
+#[gtk-about]
 [Desktop Entry]
+
+#F[Icon]
+frame_maininfo=
+
+#d+ Name of the container it belongs to:
+Container=_MainDock_
+
+#v
+sep_display=
+
 #s Launcher's name :
-Name=Calculator
+Name=
+
+#S+ Image's name or path :
+Icon=
+
 #s Command to launch on click :
 #{Exemple : nautilus --no-desktop, gedit, etc. You can even enter a keyboard shortcut, for exemple <Alt>F1, <Ctrl>c,  <Ctrl>v, etc}
-Exec=gcalctool
-#S Image's name or path :
-Icon=accessories-calculator
-#d Name of the container it belongs to:
-#{If you write here a container's name that doesn't exist yet, a new one will be created, with this icon inside.}
-Container=_MainDock_
+Exec=
+
 
 #X[Extra parameters]
 frame_extra=
-#f[0;100] Order you want for this launcher among the others:
-Order=0.272918701171875
+
 #b Prevent this launcher from stealing appli from taskbar ?
 #{If you choosed to mix launcher and applis, this option will deactivate this behaviour for this launcher only. It can be useful for instance for a launcher that launches a script in a terminal, but you don't want it to steal the Terminal's icon from the Taskbar.} 
 prevent inhibate=false
@@ -25,27 +35,15 @@
 StartupWMClass=
 
 #b Run in a terminal ?
-#{It will use 'xterm'.}
 Terminal=false
 
 #i-[0;16] Only show in this specific viewport
 #{If '0' the launcher will be displayed on every viewport.}
 ShowOnViewport=0
 
-Nb subicons=0
-
-Renderer=
-
-Base URI=
-Is mounting point=false
-
-Comment=Perform arithmetic, scientific or financial calculations
-NotShowIn=KDE;
+#f[0;100] Order you want for this launcher among the others:
+Order=4
+
+Icon Type=0
 Type=Application
-StartupNotify=true
-Categories=GNOME;GTK;Utility;Calculator
-X-GNOME-DocPath=gcalctool/gcalctool.xml
-X-GNOME-Bugzilla-Bugzilla=GNOME
-X-GNOME-Bugzilla-Product=gcalctool
-X-GNOME-Bugzilla-Component=general
-X-GNOME-Bugzilla-OtherBinaries=gnome-calculator
+Origin=/usr/share/applications/gcalctool.desktop;kcalc.desktop;galculator.desktop

=== modified file 'data/default-theme/launchers/01gimp.desktop' (properties changed: +x to -x)
--- data/default-theme/launchers/01gimp.desktop	2010-09-18 14:17:48 +0000
+++ data/default-theme/launchers/01gimp.desktop	2011-08-09 20:04:34 +0000
@@ -1,21 +1,31 @@
-#!en
+#2.4.0~0beta0
 
+#[gtk-about]
 [Desktop Entry]
+
+#F[Icon]
+frame_maininfo=
+
+#d+ Name of the container it belongs to:
+Container=_MainDock_
+
+#v
+sep_display=
+
 #s Launcher's name :
-Name=Gimp
+Name=
+
+#S+ Image's name or path :
+Icon=
+
 #s Command to launch on click :
 #{Exemple : nautilus --no-desktop, gedit, etc. You can even enter a keyboard shortcut, for exemple <Alt>F1, <Ctrl>c,  <Ctrl>v, etc}
-Exec=gimp
-#S Image's name or path :
-Icon=gimp
-#d Name of the container it belongs to:
-#{If you write here a container's name that doesn't exist yet, a new one will be created, with this icon inside.}
-Container=Graphics
+Exec=
+
 
 #X[Extra parameters]
 frame_extra=
-#f[0;100] Order you want for this launcher among the others:
-Order=0.6138916015625
+
 #b Prevent this launcher from stealing appli from taskbar ?
 #{If you choosed to mix launcher and applis, this option will deactivate this behaviour for this launcher only. It can be useful for instance for a launcher that launches a script in a terminal, but you don't want it to steal the Terminal's icon from the Taskbar.} 
 prevent inhibate=false
@@ -25,128 +35,15 @@
 StartupWMClass=
 
 #b Run in a terminal ?
-#{It will use 'xterm'.}
 Terminal=false
 
 #i-[0;16] Only show in this specific viewport
 #{If '0' the launcher will be displayed on every viewport.}
 ShowOnViewport=0
 
-Nb subicons=0
-
-Renderer=
-
-Base URI=
-Is mounting point=false
-
-Is container=false
-Version=1.0
+#f[0;100] Order you want for this launcher among the others:
+Order=3
+
+Icon Type=0
 Type=Application
-GenericName=Image Editor
-GenericName[ar]=محرر صور
-GenericName[be]=Р�дактар відары�аў
-GenericName[bg]=Редактор на изображени�
-GenericName[ca]=Editor d'imatges
-GenericName[ca@valencia]=Editor d'imatges
-GenericName[cs]=Editor obrázků
-GenericName[da]=Billedredigering
-GenericName[de]=Bildeditor
-GenericName[dz]=གཟུགས་བརྙན་ ཞུན་དག་པ�
-GenericName[en_CA]=Image Editor
-GenericName[en_GB]=Image Editor
-GenericName[eo]=Bilada Redaktilo
-GenericName[es]=Editor de imagen
-GenericName[et]=Pildiredaktor
-GenericName[eu]=Irudi-editorea
-GenericName[fa]=ویرایشگر تصویر
-GenericName[fi]=Kuvaeditori
-GenericName[fr]=Éditeur d'image
-GenericName[gl]=Editor de imaxes
-GenericName[gu]=ચિત�ર સંપાદક
-GenericName[hu]=Képszerkesztő
-GenericName[is]=Myndvinnsluforrit
-GenericName[it]=Editor immagine
-GenericName[ja]=画�エディタ
-GenericName[ka]=გ�მ�ს�ხულებების რედ�ქტ�რი
-GenericName[km]=កម្មវិធី​និពន្ធ​រូបភាព
-GenericName[ko]=�미지 편집기
-GenericName[lt]=Paveikslėlių rengyklė
-GenericName[lv]=Attēla redaktors
-GenericName[mk]=Уредник за �лики
-GenericName[nb]=Bildebehandler
-GenericName[ne]=छवि सम�पादक
-GenericName[nl]=Afbeeldingsbewerker
-GenericName[nn]=Biletbehandlar
-GenericName[pa]=ਚਿੱਤਰ �ਡੀਟਰ
-GenericName[pl]=Edytor obrazu
-GenericName[pt_BR]=Editor de Imagens
-GenericName[ru]=Редактор изображений
-GenericName[sk]=Editor obrázkov
-GenericName[sl]=Urejevalnik slik
-GenericName[sr]=Обрада �лика
-GenericName[sr@latin]=Obrada slika
-GenericName[sv]=Bildredigerare
-GenericName[th]=ตัว��้ไขภาพ
-GenericName[tr]=Resim Düzenleyici
-GenericName[tt]=Sürät Tözätkeç
-GenericName[uk]=Редактор зображень
-GenericName[vi]=Bộ biên soạn ảnh
-GenericName[xh]=UmHleli woMfanekiso
-GenericName[zh_CN]=图�编辑器
-GenericName[zh_HK]=圖片編輯器
-GenericName[zh_TW]=圖片編輯器
-Comment=Create images and edit photographs
-Comment[ar]=أنشئ صورا وحرّر لقطات
-Comment[be]=Ствар�ньне відары�аў і р�дагаваньне фатаграфій
-Comment[bg]=Създаване на изображени� и редакци� на �нимки
-Comment[ca]=Creeu imatges i editeu fotografies
-Comment[ca@valencia]=Creeu imatges i editeu fotografies
-Comment[cs]=Vytvářet obrázky a upravovat fotografie
-Comment[da]=Opret billeder og redigér fotografier
-Comment[de]=Bilder erstellen und Fotografien bearbeiten
-Comment[dz]=གཟུགས་བརྙན་ཚུ་ གསར་བས�ྲུན་འབད་ནི་དང་ དཔར་ཚུ་ཞུན་དག་འབད�
-Comment[en_CA]=Create images and edit photographs
-Comment[en_GB]=Create images and edit photographs
-Comment[eo]=Kreu bildojn aÅ­ redaktu fotojn
-Comment[es]=Cree imágenes y edite fotografías
-Comment[et]=Loo pilte ja redigeeri fotosid
-Comment[eu]=Sortu irudiak eta editatu argazkiak
-Comment[fi]=Luo kuvia ja muokkaa valokuvia
-Comment[fr]=Créer des images et modifier des photographies
-Comment[gl]=Crear imaxes e editar fotografías
-Comment[gu]=ચિત�રો બનાવો અને ફોટાઓમાં ફેરફાર કરો
-Comment[hu]=Képek létrehozása és fotók szerkesztése
-Comment[it]=Crea immagini o modifica fotografie
-Comment[ja]=画��作��写真�編集
-Comment[km]=បង្កើ�​រូបភាព និង កែសម្រួល​រូប��
-Comment[ko]=�미지를 만들거나 사진� 편집합니다.
-Comment[lt]=Kurti paveikslÄ—lius ir redaguoti fotografijas
-Comment[lv]=Attēlu vai fotogr�fiju izveide un koriģēšana
-Comment[mk]=�аправи �лики и уреди фотографии
-Comment[nb]=Lag bilder og rediger fotografier
-Comment[ne]=छवि सिर�जना गर�न�होस� र फोटोग�राफ सम�पादन गर�न�होस�
-Comment[nl]=Afbeeldingen of foto's aanmaken en bewerken
-Comment[nn]=Lag teikningar eller rediger foto
-Comment[pa]=ਚਿੱਤਰ ਬਣਾਓ ਅਤੇ ਤਸਵੀਰਾਂ ਸੋਧੋ
-Comment[pl]=Program do tworzenia oraz obróbki obrazów i fotografii
-Comment[pt_BR]=Crie e edite imagens ou fotografias
-Comment[ru]=Создание изображений и редактирование фотографий
-Comment[sl]=Ustvari slike in uredi fotografije
-Comment[sr]=�аправите �лике и уредите фотографије
-Comment[sr@latin]=Napravite slike i uredite fotografije
-Comment[sv]=Skapa bilder och redigera fotografier
-Comment[tr]=Resim ya da fotoğrafları oluşturun ve düzenleyin
-Comment[uk]=Створенн� зображень та редагуванн� фотографій
-Comment[vi]=Tạo và biên soạn ảnh hay ảnh chụp
-Comment[zh_CN]=创建图�或编辑照片
-Comment[zh_HK]=建立圖�與編輯照片
-Comment[zh_TW]=建立圖�與編輯照片
-TryExec=gimp-2.6
-Categories=Graphics;2DGraphics;RasterGraphics;GTK;
-X-GNOME-Bugzilla-Bugzilla=GNOME
-X-GNOME-Bugzilla-Product=GIMP
-X-GNOME-Bugzilla-Component=General
-X-GNOME-Bugzilla-Version=2.6.0
-X-GNOME-Bugzilla-OtherBinaries=gimp-2.6
-StartupNotify=true
-MimeType=application/postscript;application/pdf;image/bmp;image/g3fax;image/gif;image/x-fits;image/pcx;image/x-portable-anymap;image/x-portable-bitmap;image/x-portable-graymap;image/x-portable-pixmap;image/x-psd;image/x-sgi;image/x-tga;image/x-xbitmap;image/x-xwindowdump;image/x-xcf;image/x-compressed-xcf;image/tiff;image/jpeg;image/x-psd;image/png;image/x-icon;image/x-xpixmap;image/svg+xml;image/x-wmf;
+Origin=/usr/share/applications/gimp.desktop;krita.desktop;shotwell.desktop;f-spot.desktop;inkscape.desktop;mtpaint.desktop

=== modified file 'data/default-theme/launchers/01gnome-terminal.desktop' (properties changed: +x to -x)
--- data/default-theme/launchers/01gnome-terminal.desktop	2010-09-18 14:17:48 +0000
+++ data/default-theme/launchers/01gnome-terminal.desktop	2011-08-09 20:04:34 +0000
@@ -1,21 +1,31 @@
-#!en
+#2.4.0~0beta0
 
+#[gtk-about]
 [Desktop Entry]
+
+#F[Icon]
+frame_maininfo=
+
+#d+ Name of the container it belongs to:
+Container=_MainDock_
+
+#v
+sep_display=
+
 #s Launcher's name :
-Name=Terminal
+Name=
+
+#S+ Image's name or path :
+Icon=
+
 #s Command to launch on click :
 #{Exemple : nautilus --no-desktop, gedit, etc. You can even enter a keyboard shortcut, for exemple <Alt>F1, <Ctrl>c,  <Ctrl>v, etc}
-Exec=gnome-terminal
-#S Image's name or path :
-Icon=terminal
-#d Name of the container it belongs to:
-#{If you write here a container's name that doesn't exist yet, a new one will be created, with this icon inside.}
-Container=_MainDock_
+Exec=
+
 
 #X[Extra parameters]
 frame_extra=
-#f[0;100] Order you want for this launcher among the others:
-Order=0.18194580078125
+
 #b Prevent this launcher from stealing appli from taskbar ?
 #{If you choosed to mix launcher and applis, this option will deactivate this behaviour for this launcher only. It can be useful for instance for a launcher that launches a script in a terminal, but you don't want it to steal the Terminal's icon from the Taskbar.} 
 prevent inhibate=false
@@ -25,167 +35,15 @@
 StartupWMClass=
 
 #b Run in a terminal ?
-#{It will use 'xterm'.}
 Terminal=false
 
 #i-[0;16] Only show in this specific viewport
 #{If '0' the launcher will be displayed on every viewport.}
 ShowOnViewport=0
 
-Nb subicons=0
-
-Renderer=Caroussel
-
-Base URI=
-Is mounting point=false
-
-Is container=false
-Categories=GNOME;GTK;Utility;TerminalEmulator;
-Comment=Use the command line
-Comment[ar]=استعمل سطرالأوامر
-Comment[be]=Ужыць загадны радок
-Comment[bg]=Използване на команден ред
-Comment[bn]=কমান�ড লাইন ব�যবহার কর�ন
-Comment[bn_IN]=কমান�ড লাইন ব�যবহার কর�ন
-Comment[ca]=Obriu la línia d'ordres
-Comment[cs]=Používat příkazový řádek
-Comment[cy]=Defnyddio'r llinell orchymyn
-Comment[da]=Brug kommandolinjen
-Comment[de]=Befehlszeile verwenden
-Comment[dz]=བཀོད་ལམ་ལག་ལེན་འ�བ�
-Comment[el]=Χ�ήση γ�αμμής εντολών
-Comment[en_CA]=Use the command line
-Comment[en_GB]=Use the command line
-Comment[es]=Use la línea de comandos
-Comment[et]=Käsurea kasutamine
-Comment[eu]=Erabili komando-lerroa
-Comment[fa]=است�اده از سطر �رمان
-Comment[fi]=Käytä komentoriviä
-Comment[fr]=Utiliser la ligne de commande
-Comment[gl]=Usar a liña de comandos
-Comment[gu]=આદેશ વાક�ય વાપરો
-Comment[he]=השתמש בשורת הפקודה
-Comment[hi]=कमांड लाइन का प�रयोग करें