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

[Matthieu Baerts]

Hello,

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

This is the Upstream (short) ChangeLog:
 * Upstream (short) ChangeLog (2.4.0~0beta2 -> 2.4.0~1):
   - Improved support of the new Gnome 3 session
      (to avoid conflicts with the new Gnome-Panel).
   - Code cleaned and re-organised a few functions
      (e.g. with cairo-dock-overlay, cairo-dock.c, etc.)
   - Updating translations
   - Improved the support of XFCE and LXDE environments
   - Removed invalid launcher desktop files
   - Used a default icon if the path set by the user is wrong
   - Fixed the possibility to sticky a desklet (bug due to a Xorg update)
   - GUI: fixed the list-entry widget
   - Fixed support of the Widget Layer in Compiz >= 0.9
   - Compiz type filter: replaced type=utility by type=Utility
   - Fixed a small refresh bug in cairo mode
      (with icons that are always visible)
   - Improved the placement of icons when avoiding the mouse
      (when something is being dropped onto the dock)
   - Updated the default theme in order to use new applications
   - Gauge implementation: Rewritten to use CairoDockImageBuffer
      and fixed the problem with png images
   - Graphs: Improved the drawing and added more precisions
   - Improved the 'lock' option description
   - GUI simple: fixed a bad update of the parameters
      when switching back to the previous value
   - Fixed the path of the preview for the default view
   - Help: Fixed the problem with tips
   - Default-theme: .conf files: fixed lintian warnings
   - Fixed a few warnings at the compilation
   - Removed a few useless output messages
   - Fixed these LP bugs:
    + Cairo-dock corrupts Kdenlive monitor display LP: #729970
    + Can't play videos in kaffeine LP: #475375
   - And fixed a lot of tiny bugs, please have a look to bzr logs.

Note that this is the stable version of the 2.4 branch. It fixes a lot of bugs of the previous version (2.4.0~0beta2).

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

Thank you for your help! :)

PS: Don't forget to upload this package AND THE PLUGINS ( LP: #859984 )

[Luke Yelavich (themuso)]

This needs a feature freeze exception request, please have a read of https://wiki.ubuntu.com/FeatureFreeze for more information. I suggest you use your existing bug #859982 for the request, no need for a new bug.

However, given how late in the Oneiric cycle we are now, the chances of this being accepted wholesale are minimal. I would suggest patching the existing cairo-doc package with the most critical bug fixes, and update the entire package in the P cycle.

review: Disapprove

[Fabounet (fabounet03)]

This is the final release from the 2.4-beta2 version that is already in
Oneiric
There is no way to "patch the existing cairo-dock package with the most
critical bug fixes".

Please reconsider your decision; because of all the recent changes in
Ubuntu, we need this version to keep the program running well in Oneiric
(I'm thinking of all the changes in the DBus interfaces for instance,
Compiz, Messaging-Menu and others). Cairo-Dock 2.3 just can't run in
Oneiric, and 2.4-beta ... well, is a beta !

2011/9/30 Luke Yelavich <email address hidden>

> Review: Disapprove
>
> This needs a feature freeze exception request, please have a read of
> https://wiki.ubuntu.com/FeatureFreeze for more information. I suggest you
> use your existing bug #859982 for the request, no need for a new bug.
>
> However, given how late in the Oneiric cycle we are now, the chances of
> this being accepted wholesale are minimal. I would suggest patching the
> existing cairo-doc package with the most critical bug fixes, and update the
> entire package in the P cycle.
>
> --
>
> https://code.launchpad.net/~cairo-dock-team/ubuntu/oneiric/cairo-dock/2.4.0-1/+merge/77045<https://code.launchpad.net/%7Ecairo-dock-team/ubuntu/oneiric/cairo-dock/2.4.0-1/+merge/77045>
> Your team Cairo-Dock Team is subscribed to branch
> lp:~cairo-dock-team/ubuntu/oneiric/cairo-dock/2.4.0-1.
>
> _______________________________________________
> Mailing list: https://launchpad.net/~cairo-dock-team
> Post to : <email address hidden>
> Unsubscribe : https://launchpad.net/~cairo-dock-team
> More help : https://help.launchpad.net/ListHelp
>

[lp:~cairo-dock-team/ubuntu/oneiric/cairo-dock/2.4.0-1]

22. By Matthieu Baerts on 2011-10-04

* Upstream (short) ChangeLog (2.4.0~1 -> 2.4.0~2):
 - Fixed a bug with the detection of compiz plugins
 - doc: used the right version
 - Fixed a possible crash with an empty dock LP: #861725
 - FlyingContainer: draw the icon correctly
* New upstream release.

[Matthieu Baerts (matttbe)]

ACK given by pitti. Thank to him!

[lp:~cairo-dock-team/ubuntu/oneiric/cairo-dock/2.4.0-1]

23. By Matthieu Baerts on 2011-10-06

* debian/patches/01-improved-cairo-dock-session.patch:
 - Improved the launch of our Cairo-Dock session (by removing Unity
    Compiz plugin and by launching the dock with a short delay)

[Ken VanDine (ken-vandine)]

There are lots of warnings and a few errors from lintian, please at least clean up the errors and ideally the warnings too.

E: cairo-dock source: version-substvar-for-external-package cairo-dock -> cairo-dock-plug-ins
W: cairo-dock-core: package-name-doesnt-match-sonames libgldi2
W: cairo-dock-core: old-fsf-address-in-copyright-file
W: cairo-dock-core: description-synopsis-starts-with-article
E: cairo-dock-core: manpage-not-compressed-with-max-compression usr/share/man/man1/cairo-dock.1.gz
W: cairo-dock-core: non-dev-pkg-with-shlib-symlink usr/lib/libgldi.so.2.4.0~2 usr/lib/libgldi.so
W: cairo-dock-data: old-fsf-address-in-copyright-file
W: cairo-dock-data: description-synopsis-starts-with-article
W: cairo-dock-data: binary-without-manpage usr/bin/cairo-dock-package-theme
W: cairo-dock-data: binary-without-manpage usr/bin/cairo-dock-session
E: cairo-dock-data: shell-script-fails-syntax-check usr/bin/cairo-dock-session
W: cairo-dock: old-fsf-address-in-copyright-file
W: cairo-dock: description-synopsis-starts-with-article
W: cairo-dock-dev: old-fsf-address-in-copyright-file
W: cairo-dock-dev: description-synopsis-starts-with-article

review: Disapprove

[lp:~cairo-dock-team/ubuntu/oneiric/cairo-dock/2.4.0-1]

24. By Matthieu Baerts on 2011-10-08

* debian/copyright:
 - Updated and fixed lintian warnings: old-fsf-address-in-copyright-file
* debian/control:
 - Fixed lintian warning: description-synopsis-starts-with-article
 - Fixed lintian error: version-substvar-for-external-package
* debian/cairo-dock-data.lintian-overrides:
 - Removed old warnings (fixed)
 - Added binary-without-manpage (custom scripts used)
* debian/cairo-dock-core.install and debian/cairo-dock-dev.install:
 - Fixed a lintian warning: non-dev-pkg-with-shlib-symlink
 - Fixed lintian error: shell-script-fails-syntax-check
    (it seems I made wrong manipulation with vim...)
* debian/patches/02-manpage-not-compressed-with-max-compression.patch:
 - Fixed this lintian error: manpage-not-compressed-with-max-compression

[Matthieu Baerts (matttbe)]

Hello Ken,

Thank you for this comment and your patience!

It should be much better now!

=== added file '.pc/.quilt_patches'
--- .pc/.quilt_patches	1970-01-01 00:00:00 +0000
+++ .pc/.quilt_patches	2011-10-08 22:21:24 +0000
@@ -0,0 +1,1 @@
+debian/patches

=== added file '.pc/.quilt_series'
--- .pc/.quilt_series	1970-01-01 00:00:00 +0000
+++ .pc/.quilt_series	2011-10-08 22:21:24 +0000
@@ -0,0 +1,1 @@
+series

=== added directory '.pc/01-improved-cairo-dock-session.patch'
=== added directory '.pc/01-improved-cairo-dock-session.patch/data'
=== added directory '.pc/01-improved-cairo-dock-session.patch/data/desktop-manager'
=== added file '.pc/01-improved-cairo-dock-session.patch/data/desktop-manager/CMakeLists.txt'
--- .pc/01-improved-cairo-dock-session.patch/data/desktop-manager/CMakeLists.txt	1970-01-01 00:00:00 +0000
+++ .pc/01-improved-cairo-dock-session.patch/data/desktop-manager/CMakeLists.txt	2011-10-08 22:21:24 +0000
@@ -0,0 +1,9 @@
+install (FILES
+	cairo-dock.desktop
+	cairo-dock-fallback.desktop
+	DESTINATION /usr/share/xsessions)
+
+install (FILES
+	cairo-dock.session
+	cairo-dock-fallback.session
+	DESTINATION /usr/share/gnome-session/sessions)

=== added file '.pc/01-improved-cairo-dock-session.patch/data/desktop-manager/cairo-dock-fallback.desktop'
--- .pc/01-improved-cairo-dock-session.patch/data/desktop-manager/cairo-dock-fallback.desktop	1970-01-01 00:00:00 +0000
+++ .pc/01-improved-cairo-dock-session.patch/data/desktop-manager/cairo-dock-fallback.desktop	2011-10-08 22:21:24 +0000
@@ -0,0 +1,7 @@
+[Desktop Entry]
+Name=Cairo-Dock (with Gnome and without effect)
+Comment=This session logs you into GNOME with Cairo-Dock and without any graphical effect.
+Exec=gnome-session --session=cairo-dock-fallback
+TryExec=gnome-session
+Icon=
+Type=Application

=== added file '.pc/01-improved-cairo-dock-session.patch/data/desktop-manager/cairo-dock-session'
=== added file '.pc/01-improved-cairo-dock-session.patch/data/desktop-manager/cairo-dock.desktop'
--- .pc/01-improved-cairo-dock-session.patch/data/desktop-manager/cairo-dock.desktop	1970-01-01 00:00:00 +0000
+++ .pc/01-improved-cairo-dock-session.patch/data/desktop-manager/cairo-dock.desktop	2011-10-08 22:21:24 +0000
@@ -0,0 +1,7 @@
+[Desktop Entry]
+Name=Cairo-Dock (with Gnome and effects)
+Comment=This session logs you into GNOME with Cairo-Dock and with graphical effects.
+Exec=gnome-session --session=cairo-dock
+TryExec=gnome-session
+Icon=
+Type=Application

=== added directory '.pc/01-improved-cairo-dock-session.patch/data/scripts'
=== added file '.pc/01-improved-cairo-dock-session.patch/data/scripts/help_scripts.sh'
--- .pc/01-improved-cairo-dock-session.patch/data/scripts/help_scripts.sh	1970-01-01 00:00:00 +0000
+++ .pc/01-improved-cairo-dock-session.patch/data/scripts/help_scripts.sh	2011-10-08 22:21:24 +0000
@@ -0,0 +1,148 @@
+#!/bin/bash
+
+# Script for the Help applet of Cairo-Dock
+#
+# Copyright : (C) see the 'copyright' file.
+# E-mail    : see the 'copyright' file.
+#
+#
+# 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 3
+# 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
+
+ARG=$1
+ARG2=$2
+#ARG3=$3
+ERROR=0
+
+up_install() {
+	if [ "$ARG2" != "no" ]; then
+		apt-get update
+		apt-get install cairo-dock cairo-dock-plug-ins
+	fi
+}
+
+addRepo() {
+	# $1, repository address
+	# $2, a few comments
+	if [ "$1" = "" ]; then
+		exit
+	else
+		myRepo="$1"
+	fi
+	if [ "$2" = "" ]; then
+		comments="Additional Repository"
+	else
+		comments="$2"
+	fi
+
+	grep -r "$myRepo" /etc/apt/sources.list* > /dev/null
+	if [ $? -eq 1 ]; then
+		# the repository isn't in the list.
+		echo "$myRepo ## $comments" | sudo tee -a /etc/apt/sources.list
+	fi
+}
+
+repository() {
+	addRepo "deb http://repository.glx-dock.org/ubuntu $(lsb_release -sc) cairo-dock" "Cairo-Dock-Stable"
+	wget -q http://repository.glx-dock.org/cairo-dock.gpg -O- | apt-key add -
+	up_install
+}
+
+ppa() {
+	addRepo "deb http://ppa.launchpad.net/cairo-dock-team/ppa/ubuntu $(lsb_release -sc) main" "Cairo-Dock-PPA"
+	apt-key adv --keyserver keyserver.ubuntu.com --recv-keys E80D6BF5
+	up_install
+}
+
+weekly() {
+	addRepo "deb http://ppa.launchpad.net/cairo-dock-team/weekly/ubuntu $(lsb_release -sc) main" "Cairo-Dock-PPA-Weekly"
+	apt-key adv --keyserver keyserver.ubuntu.com --recv-keys E80D6BF5
+	up_install
+}
+
+debian_stable() {
+	addRepo "deb http://repository.glx-dock.org/debian stable cairo-dock" "Cairo-Dock-Stable"
+	wget -q http://repository.glx-dock.org/cairo-dock.gpg -O- | apt-key add -
+	up_install
+}
+
+debian_unstable() {
+	addRepo "deb http://repository.glx-dock.org/debian unstable cairo-dock" "Cairo-Dock-Stable"
+	wget -q http://repository.glx-dock.org/cairo-dock.gpg -O- | apt-key add -
+	up_install
+}
+
+compiz_plugin() {
+	if test -d "$HOME/.config/compiz"; then # compiz < 0.9
+		# flat file
+		if test -f "$HOME/.config/compiz/compizconfig/Default.ini"; then
+			sed -i "/as_active_plugins/ s/.*/&;$ARG2/g" $HOME/.config/compiz/compizconfig/Default.ini
+		fi
+		# gconf
+		plugins=`gconftool-2 -g /apps/compiz/general/allscreens/options/active_plugins`
+		gconftool-2 -s /apps/compiz/general/allscreens/options/active_plugins --type=list --list-type=string "${plugins:0:${#plugins}-1},$ARG2]"  # plug-ins in double are filtered by Compiz.
+	fi
+
+	if test -d "$HOME/.config/compiz-1"; then # compiz >= 0.9 => we can have compiz and compiz-1
+		# plug-ins in double are NO LONGER filtered by Compiz in this version... (and if plugins in double, compiz crashes :) )
+		# flat file
+		if test -f "$HOME/.config/compiz-1/compizconfig/Default.ini"; then
+			pluginsFlat=`grep "s0_active_plugins" $HOME/.config/compiz-1/compizconfig/Default.ini`
+			if test `echo $pluginsFlat | grep -c $ARG2` -eq 0; then
+				pluginsFlat="$pluginsFlat""$ARG2;"
+				sed -i "/s0_active_plugins/ s/.*/&$ARG2;/g" $HOME/.config/compiz-1/compizconfig/Default.ini
+			fi
+		fi
+		# gconf
+		plugins=`gconftool-2 -g /apps/compiz-1/general/screen0/options/active_plugins`
+		if test `echo $plugins | grep -c $ARG2` -eq 0; then
+			plugins=${plugins:0:${#plugins}-1},$ARG2]
+			gconftool-2 -s /apps/compiz-1/general/screen0/options/active_plugins --type=list --list-type=string "$plugins"
+		fi
+	fi
+}
+
+compiz_new_replace_list_plugins() {
+	if test -d "$HOME/.config/compiz-1"; then # only for compiz 0.9
+		# flat file
+		if test -f "$HOME/.config/compiz-1/compizconfig/Default.ini"; then
+			pluginsList="s0_active_plugins = "`echo $ARG2 |sed -e 's/,/;/g'`";" # , => ;
+			sed -i "/s0_active_plugins/ s/.*/$ARG2/g" $HOME/.config/compiz-1/compizconfig/Default.ini
+		fi
+		# gconf
+		gconftool-2 -s /apps/compiz-1/general/screen0/options/active_plugins --type=list --list-type=string "[$ARG2]"
+	fi
+}
+
+case $ARG in
+	"repository")
+		repository
+	;;
+	"ppa")
+		ppa
+	;;
+	"weekly")
+		weekly
+	;;
+	"debian_stable")
+		debian_stable
+	;;
+	"debian_unstable")
+		debian_unstable
+	;;
+	"compiz_plugin")
+		compiz_plugin
+	;;
+	"compiz_new_replace_list_plugins")
+		compiz_new_replace_list_plugins
+	;;
+esac
+exit

=== removed directory '.pc/01-musicPlayer_with_banshee'
=== removed directory '.pc/01-musicPlayer_with_banshee/data'
=== removed directory '.pc/01-musicPlayer_with_banshee/data/default-theme'
=== removed directory '.pc/01-musicPlayer_with_banshee/data/default-theme/plug-ins'
=== removed directory '.pc/01-musicPlayer_with_banshee/data/default-theme/plug-ins/musicPlayer'
=== removed 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	2011-08-09 19:53:55 +0000
+++ .pc/01-musicPlayer_with_banshee/data/default-theme/plug-ins/musicPlayer/musicPlayer.conf	1970-01-01 00:00:00 +0000
@@ -1,174 +0,0 @@
-#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=

=== added directory '.pc/02-manpage-not-compressed-with-max-compression.patch'
=== added directory '.pc/02-manpage-not-compressed-with-max-compression.patch/data'
=== added directory '.pc/02-manpage-not-compressed-with-max-compression.patch/data/man'
=== added file '.pc/02-manpage-not-compressed-with-max-compression.patch/data/man/CMakeLists.txt'
--- .pc/02-manpage-not-compressed-with-max-compression.patch/data/man/CMakeLists.txt	1970-01-01 00:00:00 +0000
+++ .pc/02-manpage-not-compressed-with-max-compression.patch/data/man/CMakeLists.txt	2011-10-08 22:21:24 +0000
@@ -0,0 +1,22 @@
+############## Man pages ################
+find_program(GZIP_TOOL
+				NAMES gzip
+				PATHS /bin
+				usr/bin
+				usr/local/bin)
+if(NOT GZIP_TOOL)
+	message(FATAL_ERROR "Unable to find 'gzip' program")
+endif(NOT GZIP_TOOL)
+set(cairo_dock_man_src cairo-dock_en.1) # cairo-dock_fr.1 cairo-dock_it.1)
+
+# Compression of the manuals
+foreach(man ${cairo_dock_man_src})
+	message(STATUS "Building ${man}.gz")
+	execute_process(COMMAND ${GZIP_TOOL} -c ${CMAKE_CURRENT_SOURCE_DIR}/${man}
+						OUTPUT_FILE ${CMAKE_CURRENT_BINARY_DIR}/${man}.gz)
+endforeach(man)
+
+# Installation of the manuals
+install(FILES ${CMAKE_CURRENT_BINARY_DIR}/cairo-dock_en.1.gz
+        DESTINATION "${mandir}/man1"
+        PERMISSIONS OWNER_READ GROUP_READ WORLD_READ RENAME cairo-dock.1.gz)

=== added file '.pc/applied-patches'
--- .pc/applied-patches	1970-01-01 00:00:00 +0000
+++ .pc/applied-patches	2011-10-08 22:21:24 +0000
@@ -0,0 +1,2 @@
+01-improved-cairo-dock-session.patch
+02-manpage-not-compressed-with-max-compression.patch

=== removed file '.pc/applied-patches'
--- .pc/applied-patches	2011-08-09 19:53:55 +0000
+++ .pc/applied-patches	1970-01-01 00:00:00 +0000
@@ -1,1 +0,0 @@
-01-musicPlayer_with_banshee

=== modified file 'CMakeLists.txt'
--- CMakeLists.txt	2011-08-09 19:53:55 +0000
+++ CMakeLists.txt	2011-10-08 22:21:24 +0000
@@ -10,9 +10,9 @@
 ########### project ###############
 
 project ("cairo-dock")
-set (VERSION "2.4.0~0beta2")
+set (VERSION "2.4.0~2")
 
-add_definitions (-std=c99 -Wstrict-prototypes -Wextra -Wwrite-strings -Wuninitialized -Werror-implicit-function-declaration) #-Wunreachable-code -Wno-unused-parameter -Wall 
+add_definitions (-std=c99 -Wextra -Wwrite-strings -Wuninitialized -Werror-implicit-function-declaration) # removed for stable versions: -Wstrict-prototypes #-Wunreachable-code -Wno-unused-parameter -Wall 
 if (NOT ${CMAKE_BUILD_TYPE})
 	add_definitions (-O3)
 endif()

=== modified file 'data/CMakeLists.txt'
--- data/CMakeLists.txt	2011-08-09 16:48:08 +0000
+++ data/CMakeLists.txt	2011-10-08 22:21:24 +0000
@@ -5,6 +5,9 @@
 add_subdirectory(icons)
 add_subdirectory(images)
 add_subdirectory(scripts)
+if ("${enable-desktop-manager}" STREQUAL "yes")
+	add_subdirectory(desktop-manager)
+endif()
 
 
 ########### install files ###############
@@ -26,16 +29,17 @@
 	# lib
 	${CMAKE_CURRENT_BINARY_DIR}/main-dock.conf
 	${CMAKE_CURRENT_BINARY_DIR}/cairo-dock.conf
+	${CMAKE_CURRENT_BINARY_DIR}/launcher.desktop
+	${CMAKE_CURRENT_BINARY_DIR}/container.desktop
+	${CMAKE_CURRENT_BINARY_DIR}/separator.desktop
 	# 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}/launcher.desktop
-	${CMAKE_CURRENT_BINARY_DIR}/container.desktop
-	${CMAKE_CURRENT_BINARY_DIR}/separator.desktop
 	DESTINATION ${pkgdatadir})
 
 # appli desktop file
 install (FILES
-	cairo-dock.desktop 		cairo-dock-cairo.desktop
+	cairo-dock.desktop
+	cairo-dock-cairo.desktop
 	DESTINATION ${datadir}/applications)

=== added file 'data/ChangeLog-history.txt'
--- data/ChangeLog-history.txt	1970-01-01 00:00:00 +0000
+++ data/ChangeLog-history.txt	2011-10-08 22:21:24 +0000
@@ -0,0 +1,52 @@
+[ChangeLog]
+
+1.4.5 = pouet
+
+1.4.6 = Welcome to new 1.4.6 version !\n - New conf panel, clearly separating apparence and behavior.\n - complete internationnalisation (except plug-ins).\n - applis on current desktop only.\n - minimized applis only.\n - better accessibility of sub-docks and show on clic.\n - Themes and applets preview.\n - Distinction launcher/sub-dock in the menu.\n - And ... merry Xmas ! :-)
+
+1.4.6 = It's Mr Jack who made the presents and he hid some bugs into them ^_^\nv1.4.6.1 :\n - Prevent Rhythmbox applet from interfering when we don't want.\n - Correct a bug that made dialogs freeze the dock.\n - Better version management for applet.
+
+1.4.6 = v1.4.6.2 :\nThis time is the good one !\n - correct a bug that crashed the dock when adding files\n - make dustbin delete trash when we choose to\n - internationnalization of most applets
+
+1.4.6 = v1.4.6.3 :\nJust to say :\n*** Happy new Year 2008 ! ***\n  the Cairo-Dock's team.
+
+1.5.0 = v1.5.0 : it's been 1 month since previous release, and we worked hardly to bring you :\n - A parabolic view : perfect for sub-docks with a dozen of icons.\n - A big pack of new applets :\n   Cairo-Dock has now its own terminal.\n   It can handle your systray instead of your panel,\n   monitor your laptop's battery,\n   and change your screen's luminosity through the dock\n   The integration into the GNOME desktop is provided by the 'gnome-integration' plug-in.\n    Wanted : a KDE user who could do the same for KDE !\n - Dustbin v2 can now handle drag'n'drops and display nice info.\n - Manual separators, better sub-dock accessibility, 64bits works smoothly, etc\n - And cherry on the cake, a new theme (I, Cairo) !\n  Now, why not try to make an applet for Cairo-Dock ? ;-)
+
+1.5.1 = v1.5.1 :\n - The 1.5 branch is still young, so this version brings a lot of bug fixes\n - Cairo-Dock is now translated in Japanese, thanks to Jiro Kawada for his work !\n - A new view has appeared : Rainbow\n - Cairo-Dock has become a desklet manager !\n  most of applets can now detached themselves from the dock\n and behave as real desklets.
+
+1.5.2 = v1.5.2.1 :\n - a lot of bug fixes, especially on desklets.\n - New applet : weather !\n - Cairo-Dock is now fully translated in Japanese, thanks to Jiro Kawada !
+
+1.5.3 = v1.5.3.2 :\n - Themes have been deeply reviewed\n to switch from one to another completely.\n - New applet : alsaMixer !\n - Desklets improvment with the 'showDesklets' applet.\n - The 'Shortcuts' applet can now detached itself from the dock.\n - The dock can now behave like a menu 'on-the-mouse'\n - Updates in translations and the usual bug fixes. ^_^\n  By the way, we are still searching someone\n  who could help cairo-dock to be well-integrated into KDE ;-)
+
+1.5.4 = v1.5.4.2 : a huge release !\n - add a cute pinguin in your dock with the new applet Cairo-Penguin\n - monitor your wifi connection with the Wifi applet\n - control xmms, audacious, banshee and exaile with the Xmms applet\n - Cairo-Dock is now fully integrated into XFCE environment !\n - better detection of battery in the Powermanager applet\n - lot of improvments in the Terminal applet.\n - the dock can auto-resize when it grows too large\n - refresh your dock with the new theme : Wood\n - 3 more themes in Weather
+
+1.5.5 = v1.5.5.4 :\n - Huge enhancements in the TaskBar :\n  launchers and applets can now behave as applications.\n  windows can show up during drag and drop if mouse stay on them\n - hiqh quality launchers' icons can be used instead of X ones\n - Quickly manage Compiz with the 'Compiz-Icon' applet\n - Control Cairo-Dock from an external program thanks to the Dbus plug-in.\n - Added a 'ShowDesktop' applet for convenience.\n - Some fix in PowerManager (now ok !)\n - The ability to have many docks for a single instance of Cairo-Dock.\n - Cairo-Dock is not yet well integrated into Gnome 2.22, but it will come soon ;-)
+
+1.5.6 = v1.5.6 :\n - Integration into the last Gnome 2.22 (Ubuntu8.04, Fedora9, ...) - still experimental\n - You can now have many docks in 1 instance of Cairo-Dock.\n Just place a launcher or an applet in a dock, giving this dock a name that doesn't exist yet\n a new one will be created.\n - SHIFT+mouse wheel on AlsaMixer, Xmms, Rhythmbox, etc.\n - Launchers can now launch keyboard shortcuts.\n - The dock can now auto-hide itself when a window is maximized.\n - Improvment in drag and drop with animated indicator.\n - Physical separator in 3D-plane view.\n - Bug fixes in XGamma/Weather.\n - Any help would be welcome to integrate the dock into KDE !
+
+1.6.0 = v1.6.0 :\n - A new view has appeared : Diapositive !\n - A huge stock of new applets :\n   cpusage\n   ram-meter\n   netspeed\n   tomboy\n   nVidia\n - 2 new themes : Neon & Clear\n - A new cute character for Cairo-Penguin : Wanda the Cairo-Fish ^_^\n - Cairo-Dock can now run without composite manager, with fake transparency.\n - The dock can now stay below windows and be popped up on demand.\n - Auto-reload on crash.\n - Real window thumbnail when minimized.
+
+1.6.1 = v1.6.1 :\nCairo-Dock has one year ! To celebrate this event, we are happy to offer you :\n - Once again a new view : Curve !\n - A long time waited applet : the desktop Switcher.\n - A very complete theme : Brit\n - Translation in italian and chinese.\n - And we are still hoping someone would help us writing a kde-integration plug-in ^_^
+
+1.6.2 = v1.6.2 : the first version integrated in the Ubuntu repositories !\n - 2 new applets have been released :\n  Slider and Stack. Enjoy !\n - Applets can now be launched many times\n (Clock, Cairo-Penguin, Slider, Stack), each with a different config.\n - Cairo-Dock is now able to load themes on its own server,\n so feel free to send us all your themes, we can distribute them ! :-)\n - And we are still searching someone motivated to write a kde-integration plug-in ^_^
+
+1.6.3 = v1.6.3 : \n - first the bad news :\n user datas have been moved into ~/.config to respect the FreeDesktop standards.\n and local icons are now in a dedicated 'icons' sub-folder.\n So in advance, sorry for the possible inconvenience ^_^\n - And now the very good news !\n - 2 new applets have just been born : Clipper and GMenu. \n - Lot of improvements for Desklets : decorations, rotation, dragging, etc\n - Cpusage and other applets can now display nice graphics.\n - You can now remove launchers by dragging them out of the dock\n  and detach applet in the same way.\n - Smooth icons movement when dragging them inside the dock\n - The dock is now translated in Sweden and partially in Greek.
+
+2.0.0 = Cairo-Dock II\n - Cairo-Dock is now a full OpenGL dock ! (the cairo backend is still available for old graphic cards or ATI)\n - New plug-ins provide many visual affects : Animated icons, icon effects, illusion, drop indicator, motion blur, dialog rendering\n - The config panel has been widely rewritten.\n - Desklets are now in 3D\n - New applets : mail, keyboard indicator, quick folder, Toons.\n - Lot of bug fixes and upgrades in all plug-ins.
+
+
+2.0.5 = 2.0.5 :\n - This is mainly a bug-fix version\n - improvment in the RB applet\n - Added functionnalities on grouped applications icons.
+
+2.1.0 = 2.1.0 : A really heavy version !\n - Control any music player with the MusicPlayer applet\n   Share your files easily with the world thanks to the dnd2share applet,\n   Monitor your system thanks to the System-Monitor applet\n   Take notes quickly thanks to the Notes applet.\n - The dock has an "extended panel" mode and a new theme selector.\n - Lot of updates in the Keyboard-indicator and Shortcuts applets\n - New animation for the 'Slide' view\n - Bug fixes in the Taskbar, Clipper, Powermanager, Clock and Cairo-Penguin modules.\n - OpenGL mode works on ATI and Intel with the latest drivers !\n - Finally, Cairo-Dock has its own ppa on LaunchPad, and a complete documentation on http://doc.glx-dock.org.
+
+2.1.1 = 2.1.1 : more stable and user-friendly !\n - This version corrects many bugs appeared with the v2.1.0 (sorry for that !)\n - There is no more visual artifact under Metacity,OpenBox,KDE,etc.\n - Applis can now be placed amongst launchers and applets.\n - A new and convenient config panel for launchers.\n - Switcher provides a list of all opened windows on middle-click,\n    and allows you to name your desktops.\n - Logout can be programmed to shutdown at a given time.\n - The dock fades out smoothly when it hides below other windows.\n - Clipper has an option to copy all items at once.\n - The DBus plug-in provides a new and powerful API that lets you control your dock from an extern application.\n    You can even write an applet in any language with it !
+
+2.1.2 = 2.1.2 : \n - The config panel has been improved again (new icons, more clear, better option naming)\n - Desklets can be fixed on their current desktop, not only on the first one.\n - Launchers can also be assigned to a given desktop\n - Auto-hide has been rewritten\n - Welcome to the new "RSS-reader" applet !\n - Light up your dock with the new "firework" icon effects !\n - ShowDesktop can now show the desklets, the Widget Layer, and the Expose on middle-click.\n - The Mail applet can mark all messages as read.\n - A KDE-integration plug-in has been started, any help is greatly welcome to achieve it !
+
+2.1.3 = GLX-Dock 2.1.3\n - A new and simplified configuration panel has been written\n - Thumbnails of windows inside the dock now have an emblem.\n - Icons pointing on sub-docks can display the sub-dock's content.\n - When an application demands your attention, only its icon will appear when the dock is hidden.\n - The DBus plug-in now allows to automatically load external applets, written in any language.\n - ShowDesktop can now quickly change the resolution of the screen.\n - Dnd2Share can now directly sends the clipboard's content.\n - This version also fixes a huge number of problems.
+
+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 users :-)\n - <b>Integration in the XFCE desktop</b> has been improved\n - Several <b>new DBus methods</b> lets you interact on the dock more easily.\n - The dock can now be used as a shell in a Compiz-standalone environment.

=== modified file 'data/ChangeLog.txt'
--- data/ChangeLog.txt	2011-08-09 16:48:08 +0000
+++ data/ChangeLog.txt	2011-10-08 22:21:24 +0000
@@ -1,52 +1,4 @@
+# Recent changelog (see ChangeLog-history.txt for the previous ones)
 [ChangeLog]
 
-1.4.5 = pouet
-
-1.4.6 = Welcome to new 1.4.6 version !\n - New conf panel, clearly separating apparence and behavior.\n - complete internationnalisation (except plug-ins).\n - applis on current desktop only.\n - minimized applis only.\n - better accessibility of sub-docks and show on clic.\n - Themes and applets preview.\n - Distinction launcher/sub-dock in the menu.\n - And ... merry Xmas ! :-)
-
-1.4.6 = It's Mr Jack who made the presents and he hid some bugs into them ^_^\nv1.4.6.1 :\n - Prevent Rhythmbox applet from interfering when we don't want.\n - Correct a bug that made dialogs freeze the dock.\n - Better version management for applet.
-
-1.4.6 = v1.4.6.2 :\nThis time is the good one !\n - correct a bug that crashed the dock when adding files\n - make dustbin delete trash when we choose to\n - internationnalization of most applets
-
-1.4.6 = v1.4.6.3 :\nJust to say :\n*** Happy new Year 2008 ! ***\n  the Cairo-Dock's team.
-
-1.5.0 = v1.5.0 : it's been 1 month since previous release, and we worked hardly to bring you :\n - A parabolic view : perfect for sub-docks with a dozen of icons.\n - A big pack of new applets :\n   Cairo-Dock has now its own terminal.\n   It can handle your systray instead of your panel,\n   monitor your laptop's battery,\n   and change your screen's luminosity through the dock\n   The integration into the GNOME desktop is provided by the 'gnome-integration' plug-in.\n    Wanted : a KDE user who could do the same for KDE !\n - Dustbin v2 can now handle drag'n'drops and display nice info.\n - Manual separators, better sub-dock accessibility, 64bits works smoothly, etc\n - And cherry on the cake, a new theme (I, Cairo) !\n  Now, why not try to make an applet for Cairo-Dock ? ;-)
-
-1.5.1 = v1.5.1 :\n - The 1.5 branch is still young, so this version brings a lot of bug fixes\n - Cairo-Dock is now translated in Japanese, thanks to Jiro Kawada for his work !\n - A new view has appeared : Rainbow\n - Cairo-Dock has become a desklet manager !\n  most of applets can now detached themselves from the dock\n and behave as real desklets.
-
-1.5.2 = v1.5.2.1 :\n - a lot of bug fixes, especially on desklets.\n - New applet : weather !\n - Cairo-Dock is now fully translated in Japanese, thanks to Jiro Kawada !
-
-1.5.3 = v1.5.3.2 :\n - Themes have been deeply reviewed\n to switch from one to another completely.\n - New applet : alsaMixer !\n - Desklets improvment with the 'showDesklets' applet.\n - The 'Shortcuts' applet can now detached itself from the dock.\n - The dock can now behave like a menu 'on-the-mouse'\n - Updates in translations and the usual bug fixes. ^_^\n  By the way, we are still searching someone\n  who could help cairo-dock to be well-integrated into KDE ;-)
-
-1.5.4 = v1.5.4.2 : a huge release !\n - add a cute pinguin in your dock with the new applet Cairo-Penguin\n - monitor your wifi connection with the Wifi applet\n - control xmms, audacious, banshee and exaile with the Xmms applet\n - Cairo-Dock is now fully integrated into XFCE environment !\n - better detection of battery in the Powermanager applet\n - lot of improvments in the Terminal applet.\n - the dock can auto-resize when it grows too large\n - refresh your dock with the new theme : Wood\n - 3 more themes in Weather
-
-1.5.5 = v1.5.5.4 :\n - Huge enhancements in the TaskBar :\n  launchers and applets can now behave as applications.\n  windows can show up during drag and drop if mouse stay on them\n - hiqh quality launchers' icons can be used instead of X ones\n - Quickly manage Compiz with the 'Compiz-Icon' applet\n - Control Cairo-Dock from an external program thanks to the Dbus plug-in.\n - Added a 'ShowDesktop' applet for convenience.\n - Some fix in PowerManager (now ok !)\n - The ability to have many docks for a single instance of Cairo-Dock.\n - Cairo-Dock is not yet well integrated into Gnome 2.22, but it will come soon ;-)
-
-1.5.6 = v1.5.6 :\n - Integration into the last Gnome 2.22 (Ubuntu8.04, Fedora9, ...) - still experimental\n - You can now have many docks in 1 instance of Cairo-Dock.\n Just place a launcher or an applet in a dock, giving this dock a name that doesn't exist yet\n a new one will be created.\n - SHIFT+mouse wheel on AlsaMixer, Xmms, Rhythmbox, etc.\n - Launchers can now launch keyboard shortcuts.\n - The dock can now auto-hide itself when a window is maximized.\n - Improvment in drag and drop with animated indicator.\n - Physical separator in 3D-plane view.\n - Bug fixes in XGamma/Weather.\n - Any help would be welcome to integrate the dock into KDE !
-
-1.6.0 = v1.6.0 :\n - A new view has appeared : Diapositive !\n - A huge stock of new applets :\n   cpusage\n   ram-meter\n   netspeed\n   tomboy\n   nVidia\n - 2 new themes : Neon & Clear\n - A new cute character for Cairo-Penguin : Wanda the Cairo-Fish ^_^\n - Cairo-Dock can now run without composite manager, with fake transparency.\n - The dock can now stay below windows and be popped up on demand.\n - Auto-reload on crash.\n - Real window thumbnail when minimized.
-
-1.6.1 = v1.6.1 :\nCairo-Dock has one year ! To celebrate this event, we are happy to offer you :\n - Once again a new view : Curve !\n - A long time waited applet : the desktop Switcher.\n - A very complete theme : Brit\n - Translation in italian and chinese.\n - And we are still hoping someone would help us writing a kde-integration plug-in ^_^
-
-1.6.2 = v1.6.2 : the first version integrated in the Ubuntu repositories !\n - 2 new applets have been released :\n  Slider and Stack. Enjoy !\n - Applets can now be launched many times\n (Clock, Cairo-Penguin, Slider, Stack), each with a different config.\n - Cairo-Dock is now able to load themes on its own server,\n so feel free to send us all your themes, we can distribute them ! :-)\n - And we are still searching someone motivated to write a kde-integration plug-in ^_^
-
-1.6.3 = v1.6.3 : \n - first the bad news :\n user datas have been moved into ~/.config to respect the FreeDesktop standards.\n and local icons are now in a dedicated 'icons' sub-folder.\n So in advance, sorry for the possible inconvenience ^_^\n - And now the very good news !\n - 2 new applets have just been born : Clipper and GMenu. \n - Lot of improvements for Desklets : decorations, rotation, dragging, etc\n - Cpusage and other applets can now display nice graphics.\n - You can now remove launchers by dragging them out of the dock\n  and detach applet in the same way.\n - Smooth icons movement when dragging them inside the dock\n - The dock is now translated in Sweden and partially in Greek.
-
-2.0.0 = Cairo-Dock II\n - Cairo-Dock is now a full OpenGL dock ! (the cairo backend is still available for old graphic cards or ATI)\n - New plug-ins provide many visual affects : Animated icons, icon effects, illusion, drop indicator, motion blur, dialog rendering\n - The config panel has been widely rewritten.\n - Desklets are now in 3D\n - New applets : mail, keyboard indicator, quick folder, Toons.\n - Lot of bug fixes and upgrades in all plug-ins.
-
-
-2.0.5 = 2.0.5 :\n - This is mainly a bug-fix version\n - improvment in the RB applet\n - Added functionnalities on grouped applications icons.
-
-2.1.0 = 2.1.0 : A really heavy version !\n - Control any music player with the MusicPlayer applet\n   Share your files easily with the world thanks to the dnd2share applet,\n   Monitor your system thanks to the System-Monitor applet\n   Take notes quickly thanks to the Notes applet.\n - The dock has an "extended panel" mode and a new theme selector.\n - Lot of updates in the Keyboard-indicator and Shortcuts applets\n - New animation for the 'Slide' view\n - Bug fixes in the Taskbar, Clipper, Powermanager, Clock and Cairo-Penguin modules.\n - OpenGL mode works on ATI and Intel with the latest drivers !\n - Finally, Cairo-Dock has its own ppa on LaunchPad, and a complete documentation on http://doc.glx-dock.org.
-
-2.1.1 = 2.1.1 : more stable and user-friendly !\n - This version corrects many bugs appeared with the v2.1.0 (sorry for that !)\n - There is no more visual artifact under Metacity,OpenBox,KDE,etc.\n - Applis can now be placed amongst launchers and applets.\n - A new and convenient config panel for launchers.\n - Switcher provides a list of all opened windows on middle-click,\n    and allows you to name your desktops.\n - Logout can be programmed to shutdown at a given time.\n - The dock fades out smoothly when it hides below other windows.\n - Clipper has an option to copy all items at once.\n - The DBus plug-in provides a new and powerful API that lets you control your dock from an extern application.\n    You can even write an applet in any language with it !
-
-2.1.2 = 2.1.2 : \n - The config panel has been improved again (new icons, more clear, better option naming)\n - Desklets can be fixed on their current desktop, not only on the first one.\n - Launchers can also be assigned to a given desktop\n - Auto-hide has been rewritten\n - Welcome to the new "RSS-reader" applet !\n - Light up your dock with the new "firework" icon effects !\n - ShowDesktop can now show the desklets, the Widget Layer, and the Expose on middle-click.\n - The Mail applet can mark all messages as read.\n - A KDE-integration plug-in has been started, any help is greatly welcome to achieve it !
-
-2.1.3 = GLX-Dock 2.1.3\n - A new and simplified configuration panel has been written\n - Thumbnails of windows inside the dock now have an emblem.\n - Icons pointing on sub-docks can display the sub-dock's content.\n - When an application demands your attention, only its icon will appear when the dock is hidden.\n - The DBus plug-in now allows to automatically load external applets, written in any language.\n - ShowDesktop can now quickly change the resolution of the screen.\n - Dnd2Share can now directly sends the clipboard's content.\n - This version also fixes a huge number of problems.
-
-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.
+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 users :-)\n - <b>Integration in the XFCE desktop</b> has been improved\n - Several <b>new DBus methods</b> lets you interact on the dock more easily.\n - The dock can now be used as a shell in a Compiz-standalone environment.

=== modified file 'data/Help.conf.in'
--- data/Help.conf.in	2011-08-09 16:48:08 +0000
+++ data/Help.conf.in	2011-10-08 22:21:24 +0000
@@ -49,7 +49,8 @@
 #>- 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".
+#Right-click on the icon -> "Other actions" -> "set a custom icon", and choose an image. To remove the custom image, right-click on the icon -> "Other actions" -> "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 =
 
@@ -115,7 +116,7 @@
 #>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:
+#G [bash '@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=
 
@@ -283,7 +284,7 @@
 #>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
+#To remove a bookmark, right-click on its icon -> remove
 _Accessing folder bookmarks =
 
 #X[Having multiple instances of an applet]
@@ -509,7 +510,7 @@
 #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)}
+#{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

=== modified file 'data/cairo-dock.conf.in'
--- data/cairo-dock.conf.in	2011-08-09 16:48:08 +0000
+++ data/cairo-dock.conf.in	2011-10-08 22:21:24 +0000
@@ -30,7 +30,7 @@
 
 #B- Use Xinerama?
 #{This option is to use if you have a dual-screen and use Xinerama to manage them.}
-xinerama = false
+xinerama = true
 
 #i-[0;12] Number of the screen where the dock should be located:
 #{0 is the first screen.}
@@ -163,6 +163,10 @@
 #{This is the default behaviour of most taskbars.}
 minimize on click = true
 
+#b- Present windows preview on click when several windows are grouped togather
+#{Only if your Window Manager supports it.}
+present class on click = true
+
 #v- 
 sep_att =
 
@@ -359,7 +363,7 @@
 #{You can overwrite this parameter for each sub-dock.}/
 sub-dock view = default
 
-#e+[0.1;1.;smaller;same size] Ratio for the size of the sub-docks' icons :
+#e+[0.5;1.5;smaller;larger] Ratio for the size of the sub-docks' icons :
 #{You can specify a ratio for the size of the sub-docks' icons, in relation to the main docks' icons size}
 relative icon size = .8
 
@@ -492,11 +496,11 @@
 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.}
-zoom max = 2.0
+zoom max = 1.75
 
 #i+[1;999] Width of the space in which the zoom will be effective :
 #{in pixels. Outside of this space (centered on the mouse), there is no zoom.}
-sinusoid width = 300
+sinusoid width = 150
 
 #i+[0;50] Space between icons :
 #{in pixels.}
@@ -521,13 +525,13 @@
 frame_size =
 
 #j+[10;128] Launcher's size at rest (width x height) :
-launcher size = 48;48
+launcher size = 40;40
 
 #j+[10;128] Application's size at rest (width x height) :
-appli size = 48;48
+appli size = 40;40
 
 #j+[10;128] Applet's size at rest (width x height) :
-applet size = 48;48
+applet size = 40;40
 
 #m[Animated icons] Configure icons' animations.
 config_anim = 
@@ -541,8 +545,8 @@
 #X+[Separators]
 frame_sep =
 
-#j+[4;64] Icon size at rest (width x height) :
-separator size = 48;48
+#j+[4;128] Icon size at rest (width x height) :
+separator size = 8;40
 
 #b+ Force separator's image size to stay constant?
 force size = false
@@ -686,20 +690,20 @@
 custom = false
 
 #P+ Font used for labels :
-police = 
+police = Sans 10
 
 #b+ Draw the outline of the text?
-text oulined = true
+text oulined = false
 
 #F+[Background;gtk-orientation-portrait]
 frame_bg =
 
 #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;0;
+text background color=0;0;0;1;
 
 #i+[0;20] Margin around the text (in pixels) :
-text margin = 4
+text margin = 3
 
 #F+[Colour;gtk-select-color]
 frame_col =
@@ -721,11 +725,11 @@
 frame_qi =
 
 #B[-2] Use the same look as the labels?
-qi same = true
+qi same = false
 
 #c+ Text color:
 qi text color = 1;1;1
 
 #C+ Background color:
-qi bg color = 0;0;0;0.8
+qi bg color = 0;0;0;0.667
 

=== modified file 'data/default-theme/cairo-dock.conf'
--- data/default-theme/cairo-dock.conf	2011-08-09 16:48:08 +0000
+++ data/default-theme/cairo-dock.conf	2011-10-08 22:21:24 +0000
@@ -1,4 +1,4 @@
-#2.4.0~0beta0
+#2.4.0~0beta3
 ######## 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,17 +20,17 @@
 
 #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 = 0
+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
+xinerama=true
 
 #i-[0;12] Number of the screen where the dock should be located:
 #{0 is the first screen.}
@@ -46,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 = 4
+visibility=4
 
 #v
 sep_visi=
@@ -85,18 +85,18 @@
 
 #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 = 1
+show_on_click=0
 
 #i- Delay before displaying a sub-dock:
 #{in ms.}
-show delay = 300
+show delay=500
 
 #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]
@@ -106,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
@@ -116,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.}
@@ -124,7 +124,7 @@
 
 #s- 		Except the following classes:
 #{Enter the class of the applications, separated by a semi-colon ';'}
-group exception = 
+group exception=
 
 
 #F-[Representation;gtk-find]
@@ -132,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 = 
+overwrite exception=evince;totem;gimp
 
 #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.35
+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 = 20
+max name length=20
 
 #F-[Interaction;gtk-refresh]
 frame2=
@@ -161,17 +161,21 @@
 
 #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
+
+#b- Present windows preview on click when several windows are grouped togather
+#{Only if your Window Manager supports it.}
+present class 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 = 2
+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.
@@ -192,61 +196,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 = 10
+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 = 10
+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 = 7
+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.}
@@ -258,7 +262,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=
@@ -274,7 +278,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;Help
+modules=switcher;dnd2share;illusion;logout;showDesktop;shortcuts;Quick Browser;GMenu;Recent-Events;Animated icons;icon effects;Scooby-Do;musicPlayer;Help
 
 
 [Background]
@@ -359,9 +363,9 @@
 #{You can overwrite this parameter for each sub-dock.}/
 sub-dock view=Slide
 
-#e+[0.1;1.;smaller;same size] Ratio for the size of the sub-docks' icons :
+#e+[0.1;1.5;smaller;same size] Ratio for the size of the sub-docks' icons :
 #{You can specify a ratio for the size of the sub-docks' icons, in relation to the main docks' icons size}
-relative icon size=0.80000000000000004
+relative icon size=1.2
 
 
 [Dialogs]
@@ -383,7 +387,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
@@ -492,11 +496,11 @@
 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.}
-zoom max=1.5
+zoom max=1.75
 
 #i+[1;999] Width of the space in which the zoom will be effective :
 #{in pixels. Outside of this space (centered on the mouse), there is no zoom.}
-sinusoid width=220
+sinusoid width=150
 
 #i+[0;50] Space between icons :
 #{in pixels.}
@@ -521,13 +525,13 @@
 frame_size=
 
 #j+[10;128] Launcher's size at rest (width x height) :
-launcher size=44;44;
+launcher size=40;40;
 
 #j+[10;128] Application's size at rest (width x height) :
-appli size=44;44;
+appli size=40;40;
 
 #j+[10;128] Applet's size at rest (width x height) :
-applet size=44;44;
+applet size=40;40;
 
 #m[Animated icons] Configure icons' animations.
 config_anim=
@@ -541,7 +545,7 @@
 #X+[Separators]
 frame_sep=
 
-#j+[4;64] Icon size at rest (width x height) :
+#j+[4;128] Icon size at rest (width x height) :
 separator size=8;40;
 
 #b+ Force separator's image size to stay constant?
@@ -676,30 +680,30 @@
 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
+police=Sans 10
 
 #b+ Draw the outline of the text?
-text oulined=true
+text oulined=false
 
 #F+[Background;gtk-orientation-portrait]
 frame_bg=
 
 #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;0.49999237048905165;
+text background color=0;0;0;1;
 
 #i+[0;20] Margin around the text (in pixels) :
-text margin=4
+text margin=3
 
 #F+[Colour;gtk-select-color]
 frame_col=
@@ -721,11 +725,11 @@
 frame_qi=
 
 #B[-2] Use the same look as the labels?
-qi same=true
+qi same=false
 
 #c+ Text color:
-qi text color=1;1;1
+qi text color=1;1;1;
 
 #C+ Background color:
-qi bg color=0;0;0;0.8
+qi bg color=0;0;0;0.667;
 

=== modified file 'data/default-theme/plug-ins/Clipper/Clipper.conf'
--- data/default-theme/plug-ins/Clipper/Clipper.conf	2011-08-09 16:48:08 +0000
+++ data/default-theme/plug-ins/Clipper/Clipper.conf	2011-10-08 22:21:24 +0000
@@ -1,4 +1,4 @@
-#!en;1.1.3
+#1.1.3
 
 #[gtk-about]
 [Icon]
@@ -54,7 +54,7 @@
 #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)}
+#{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

=== modified file 'data/default-theme/plug-ins/Dbus/Dbus.conf'
--- data/default-theme/plug-ins/Dbus/Dbus.conf	2011-03-17 14:08:48 +0000
+++ data/default-theme/plug-ins/Dbus/Dbus.conf	2011-10-08 22:21:24 +0000
@@ -1,4 +1,4 @@
-#!en;1.2.1
+#1.2.1
 
 #[gtk-preferences]
 [Configuration]

=== modified file 'data/default-theme/plug-ins/GMenu/GMenu.conf'
--- data/default-theme/plug-ins/GMenu/GMenu.conf	2011-08-09 19:53:55 +0000
+++ data/default-theme/plug-ins/GMenu/GMenu.conf	2011-10-08 22:21:24 +0000
@@ -1,4 +1,4 @@
-#1.1.7
+#1.1.8
 
 #[gtk-about]
 [Icon]
@@ -59,7 +59,7 @@
 #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)}
+#{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
@@ -101,14 +101,15 @@
 fg alpha=1
 
 #[gtk-preferences]
-no input=false
 depth rotation y=0
 depth rotation x=0
 
+num desktop=-1
+
 [Configuration]
 
 #b Display icons in the menu?
-has icons = true
+has icons=true
 
 #k Shortkey to show/hide the menu:
 menu shortkey=<Control>F1
@@ -124,7 +125,7 @@
 recent=
 
 #b Show recent documents?
-show recent = true
+show recent=true
 
 #D Only show files that are under this folder or its sub-folder:
 #{Leave blank if filter is not needed.}
@@ -134,3 +135,8 @@
 #{in days. Set 0 if unsued.}
 recent age=0
 
+#F[Session management buttons]
+quit=
+
+#l+[None;Logout;Shutdown;Both] Show Logout and/or Shutdown : 
+show quit=0

=== modified file 'data/default-theme/plug-ins/Recent-Events/Recent-Events.conf'
--- data/default-theme/plug-ins/Recent-Events/Recent-Events.conf	2011-08-09 16:48:08 +0000
+++ data/default-theme/plug-ins/Recent-Events/Recent-Events.conf	2011-10-08 22:21:24 +0000
@@ -60,7 +60,7 @@
 #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)}
+#{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

=== modified file 'data/default-theme/plug-ins/dialog-rendering/dialog-rendering.conf'
--- data/default-theme/plug-ins/dialog-rendering/dialog-rendering.conf	2011-08-09 16:48:08 +0000
+++ data/default-theme/plug-ins/dialog-rendering/dialog-rendering.conf	2011-10-08 22:21:24 +0000
@@ -1,4 +1,4 @@
-#!en;0.5.1
+#0.5.1
 
 #[gtk-preference]
 [Comics]

=== modified file 'data/default-theme/plug-ins/dnd2share/dnd2share.conf'
--- data/default-theme/plug-ins/dnd2share/dnd2share.conf	2011-08-09 16:48:08 +0000
+++ data/default-theme/plug-ins/dnd2share/dnd2share.conf	2011-10-08 22:21:24 +0000
@@ -55,7 +55,7 @@
 #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)}
+#{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

=== modified file 'data/default-theme/plug-ins/icon-effect/icon-effect.conf'
--- data/default-theme/plug-ins/icon-effect/icon-effect.conf	2011-03-17 14:08:48 +0000
+++ data/default-theme/plug-ins/icon-effect/icon-effect.conf	2011-10-08 22:21:24 +0000
@@ -1,4 +1,4 @@
-#!en;1.2.4
+#1.2.4
 
 #[gtk-preferences]
 [Global]

=== modified file 'data/default-theme/plug-ins/illusion/illusion.conf'
--- data/default-theme/plug-ins/illusion/illusion.conf	2011-03-17 14:08:48 +0000
+++ data/default-theme/plug-ins/illusion/illusion.conf	2011-10-08 22:21:24 +0000
@@ -1,4 +1,4 @@
-#!en;1.0.7
+#1.0.7
 
 #[gtk-preferences]
 [Global]

=== modified file 'data/default-theme/plug-ins/logout/logout.conf'
--- data/default-theme/plug-ins/logout/logout.conf	2011-08-09 16:48:08 +0000
+++ data/default-theme/plug-ins/logout/logout.conf	2011-10-08 22:21:24 +0000
@@ -59,7 +59,7 @@
 #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)}
+#{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

=== modified file 'data/default-theme/plug-ins/musicPlayer/musicPlayer.conf'
--- data/default-theme/plug-ins/musicPlayer/musicPlayer.conf	2011-08-09 19:53:55 +0000
+++ data/default-theme/plug-ins/musicPlayer/musicPlayer.conf	2011-10-08 22:21:24 +0000
@@ -1,4 +1,4 @@
-#1.0.8
+#1.1.0
 
 #[gtk-about]
 [Icon]
@@ -12,7 +12,8 @@
 #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
+
+#v
 sep_display=
 
 icon=
@@ -59,7 +60,7 @@
 #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)}
+#{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
@@ -100,16 +101,17 @@
 
 
 #[gtk-preferences]
-no input=false
 depth rotation y=0
 depth rotation x=0
 
+num desktop=-1
+
 [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=Banshee
+#E[;Amarok 2;Audacious;Banshee;Clementine;Exaile;Exaile 0.3;GMusicBrowser;Guayadeque;Listen;Qmmp;QuodLibet;Rhythmbox;Songbird;XMMS 2] Player to control:
+current-player=
 
 #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.}

=== modified file 'data/default-theme/plug-ins/quick-browser/quick-browser.conf'
--- data/default-theme/plug-ins/quick-browser/quick-browser.conf	2011-08-09 16:48:08 +0000
+++ data/default-theme/plug-ins/quick-browser/quick-browser.conf	2011-10-08 22:21:24 +0000
@@ -60,7 +60,7 @@
 #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)}
+#{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

=== modified file 'data/default-theme/plug-ins/rendering/rendering.conf'
--- data/default-theme/plug-ins/rendering/rendering.conf	2011-08-09 16:48:08 +0000
+++ data/default-theme/plug-ins/rendering/rendering.conf	2011-10-08 22:21:24 +0000
@@ -1,4 +1,4 @@
-#!en;1.5.9
+#1.5.9
 
 #[;3D plane]
 [Inclinated Plane]

=== modified file 'data/default-theme/plug-ins/shortcuts/shortcuts.conf'
--- data/default-theme/plug-ins/shortcuts/shortcuts.conf	2011-08-09 16:48:08 +0000
+++ data/default-theme/plug-ins/shortcuts/shortcuts.conf	2011-10-08 22:21:24 +0000
@@ -60,7 +60,7 @@
 #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)}
+#{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

=== modified file 'data/default-theme/plug-ins/showDesktop/showDesktop.conf'
--- data/default-theme/plug-ins/showDesktop/showDesktop.conf	2011-08-09 16:48:08 +0000
+++ data/default-theme/plug-ins/showDesktop/showDesktop.conf	2011-10-08 22:21:24 +0000
@@ -63,7 +63,7 @@
 #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)}
+#{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

=== modified file 'data/default-theme/plug-ins/stack/stack.conf'
--- data/default-theme/plug-ins/stack/stack.conf	2011-08-09 16:48:08 +0000
+++ data/default-theme/plug-ins/stack/stack.conf	2011-10-08 22:21:24 +0000
@@ -1,4 +1,4 @@
-#!en;0.2.7
+#0.2.7
 
 #[gtk-about]
 [Icon]
@@ -54,7 +54,7 @@
 #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)}
+#{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

=== added directory 'data/desktop-manager'
=== added file 'data/desktop-manager/CMakeLists.txt'
--- data/desktop-manager/CMakeLists.txt	1970-01-01 00:00:00 +0000
+++ data/desktop-manager/CMakeLists.txt	2011-10-08 22:21:24 +0000
@@ -0,0 +1,13 @@
+install (FILES
+	cairo-dock.desktop
+	cairo-dock-fallback.desktop
+	DESTINATION /usr/share/xsessions)
+
+install (FILES
+	cairo-dock.session
+	cairo-dock-fallback.session
+	DESTINATION /usr/share/gnome-session/sessions)
+
+install (FILES cairo-dock-session
+	DESTINATION ${bindir}
+	PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE GROUP_READ GROUP_EXECUTE WORLD_READ WORLD_EXECUTE)

=== added file 'data/desktop-manager/cairo-dock-fallback.desktop'
--- data/desktop-manager/cairo-dock-fallback.desktop	1970-01-01 00:00:00 +0000
+++ data/desktop-manager/cairo-dock-fallback.desktop	2011-10-08 22:21:24 +0000
@@ -0,0 +1,7 @@
+[Desktop Entry]
+Name=Cairo-Dock (with Gnome and without effect)
+Comment=This session logs you into GNOME with Cairo-Dock and without any graphical effect.
+Exec=gnome-session --session=cairo-dock-fallback
+TryExec=cairo-dock-session
+Icon=
+Type=Application

=== added file 'data/desktop-manager/cairo-dock-fallback.session'
--- data/desktop-manager/cairo-dock-fallback.session	1970-01-01 00:00:00 +0000
+++ data/desktop-manager/cairo-dock-fallback.session	2011-10-08 22:21:24 +0000
@@ -0,0 +1,7 @@
+[GNOME Session]
+Name=Cairo-Dock Session fallback (Safe Mode)
+RequiredComponents=gnome-settings-daemon;
+RequiredProviders=windowmanager;panel;
+DefaultProvider-windowmanager=metacity
+DefaultProvider-panel=cairo-dock
+DesktopName=GNOME

=== added file 'data/desktop-manager/cairo-dock-session'
--- data/desktop-manager/cairo-dock-session	1970-01-01 00:00:00 +0000
+++ data/desktop-manager/cairo-dock-session	2011-10-08 22:21:24 +0000
@@ -0,0 +1,47 @@
+#!/bin/bash
+
+# Script for the 'desktop-manager' subproject of Cairo-Dock
+#
+# Copyright : (C) see the 'copyright' file.
+# E-mail    : see the 'copyright' file.
+#
+#
+# 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 3
+# 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
+
+# This script removes Unity Compiz plugin and launches Cairo-Dock with a short delay
+
+UNITY_NAME="unityshell"
+COMPIZ_FLAT_FILE="$HOME/.config/compiz-1/compizconfig/Default.ini"
+COMPIZ_GCONF="/apps/compiz-1/general/screen0/options/active_plugins"
+
+if test -d "$HOME/.config/compiz-1"; then # compiz >= 0.9
+	# plug-ins in double are NO LONGER filtered by Compiz in this version... (and if plugins are in double or wrong, compiz crashes :) )
+	# flat file
+	if test -f "$COMPIZ_FLAT_FILE"; then
+		pluginsFlat=`grep "s0_active_plugins" $COMPIZ_FLAT_FILE`
+		if test `echo $pluginsFlat | grep -c $UNITY_NAME` -gt 0; then
+			pluginsFlatWithoutUnity=`echo $pluginsFlat | sed -e "s/$UNITY_NAME;//g"`
+			sed -i "/s0_active_plugins/ s/$pluginsFlat/$pluginsFlatWithoutUnity/g" $COMPIZ_FLAT_FILE
+		fi
+	fi
+	# gconf
+	plugins=`gconftool-2 -g $COMPIZ_GCONF`
+	if test `echo $plugins | grep -c $UNITY_NAME` -gt 0; then
+		pluginsWithoutUnity=`echo $plugins | sed -e "s/$UNITY_NAME,//g"`
+		gconftool-2 -s $COMPIZ_GCONF --type=list --list-type=string "$pluginsWithoutUnity"
+		killall unity-panel-service
+	fi
+fi
+
+if test `ps aux | grep -c " [c]airo-dock"` -eq 0; then # cairo-dock not launched
+	cairo-dock -w 3
+fi

=== added file 'data/desktop-manager/cairo-dock.desktop'
--- data/desktop-manager/cairo-dock.desktop	1970-01-01 00:00:00 +0000
+++ data/desktop-manager/cairo-dock.desktop	2011-10-08 22:21:24 +0000
@@ -0,0 +1,7 @@
+[Desktop Entry]
+Name=Cairo-Dock (with Gnome and effects)
+Comment=This session logs you into GNOME with Cairo-Dock and with graphical effects.
+Exec=gnome-session --session=cairo-dock
+TryExec=cairo-dock-session
+Icon=
+Type=Application

=== added file 'data/desktop-manager/cairo-dock.session'
--- data/desktop-manager/cairo-dock.session	1970-01-01 00:00:00 +0000
+++ data/desktop-manager/cairo-dock.session	2011-10-08 22:21:24 +0000
@@ -0,0 +1,8 @@
+[GNOME Session]
+Name=Cairo-Dock Session
+RequiredComponents=gnome-settings-daemon;
+RequiredProviders=windowmanager;panel;
+DefaultProvider-windowmanager=compiz
+DefaultProvider-panel=cairo-dock
+FallbackSession=cairo-dock-fallback
+DesktopName=GNOME

=== modified file 'data/icons/CMakeLists.txt'
--- data/icons/CMakeLists.txt	2011-08-09 16:48:08 +0000
+++ data/icons/CMakeLists.txt	2011-10-08 22:21:24 +0000
@@ -2,17 +2,28 @@
 ########### install files ###############
 
 install (FILES
-	balloons.png
-	box-back.png
-	box-front.png
-	cairo-dock-animated.xpm
+	# lib
+	cairo-dock-ok.svg
 	cairo-dock-cancel.svg
-	cairo-dock-ok.svg
 	default-class-indicator.svg
 	default-icon.svg
 	default-icon-appli.svg
 	default-indicator.png
 	depth-rotate-desklet.svg
+	no-input-desklet.png
+	retach-desklet.svg
+	rotate-desklet.svg
+	theme-distant.svg
+	theme-local.svg
+	theme-new.svg
+	theme-updated.svg
+	theme-user.svg
+	# implementations
+	box-back.png
+	box-front.png
+	# appli
+	balloons.png
+	cairo-dock-animated.xpm
 	icon-accessories.svg
 	icon-all.svg
 	icon-appearance.svg
@@ -51,13 +62,4 @@
 	icon-views.svg
 	icon-visibility.svg
 	icon-wave.png
-	no-input-desklet.png
-	retach-desklet.svg
-	rotate-desklet.svg
-	theme-distant.svg
-	theme-local.svg
-	theme-new.svg
-	theme-updated.svg
-	theme-user.svg
 	DESTINATION ${pkgdatadir}/icons )
-

=== modified file 'data/images/CMakeLists.txt'
--- data/images/CMakeLists.txt	2011-08-09 16:48:08 +0000
+++ data/images/CMakeLists.txt	2011-10-08 22:21:24 +0000
@@ -1,10 +1,11 @@
 
 ########### install files ###############
 
-# scripts
 install (FILES
+	# appli
 	cairo-dock-logo.png
 	help-preview.jpg
+	# implementations
 	preview-default.png
 	DESTINATION ${pkgdatadir}/images )
 

=== modified file 'data/man/CMakeLists.txt'
--- data/man/CMakeLists.txt	2011-03-17 14:08:48 +0000
+++ data/man/CMakeLists.txt	2011-10-08 22:21:24 +0000
@@ -12,7 +12,7 @@
 # Compression of the manuals
 foreach(man ${cairo_dock_man_src})
 	message(STATUS "Building ${man}.gz")
-	execute_process(COMMAND ${GZIP_TOOL} -c ${CMAKE_CURRENT_SOURCE_DIR}/${man}
+	execute_process(COMMAND ${GZIP_TOOL} -9 -c ${CMAKE_CURRENT_SOURCE_DIR}/${man}
 						OUTPUT_FILE ${CMAKE_CURRENT_BINARY_DIR}/${man}.gz)
 endforeach(man)
 

=== modified file 'data/scripts/help_scripts.sh'
--- data/scripts/help_scripts.sh	2011-08-09 16:48:08 +0000
+++ data/scripts/help_scripts.sh	2011-10-08 22:21:24 +0000
@@ -1,4 +1,21 @@
-#!/bin/sh
+#!/bin/bash
+
+# Script for the Help applet of Cairo-Dock
+#
+# Copyright : (C) see the 'copyright' file.
+# E-mail    : see the 'copyright' file.
+#
+#
+# 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 3
+# 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
 
 ARG=$1
 ARG2=$2
@@ -64,10 +81,44 @@
 }
 
 compiz_plugin() {
-	COMPIZ_PLUGINS=`gconftool-2 --get /apps/compiz/general/allscreens/options/active_plugins`
-	if [ `echo $COMPIZ_PLUGINS |grep -c $ARG2` -eq 0 ]; then
-		NEW_PG_LIST="`echo $COMPIZ_PLUGINS |cut -d] -f1`,$ARG2]"
-		gconftool-2 --type list --list-type string --set /apps/compiz/general/allscreens/options/active_plugins "$NEW_PG_LIST"
+	if test -d "$HOME/.config/compiz"; then # compiz < 0.9
+		# flat file
+		if test -f "$HOME/.config/compiz/compizconfig/Default.ini"; then
+			sed -i "/as_active_plugins/ s/.*/&;$ARG2/g" $HOME/.config/compiz/compizconfig/Default.ini
+		fi
+		# gconf
+		plugins=`gconftool-2 -g /apps/compiz/general/allscreens/options/active_plugins`
+		gconftool-2 -s /apps/compiz/general/allscreens/options/active_plugins --type=list --list-type=string "${plugins:0:${#plugins}-1},$ARG2]"  # plug-ins in double are filtered by Compiz.
+	fi
+
+	if test -d "$HOME/.config/compiz-1"; then # compiz >= 0.9 => we can have compiz and compiz-1
+		# plug-ins in double are NO LONGER filtered by Compiz in this version... (and if plugins in double, compiz crashes :) )
+		# flat file
+		if test -f "$HOME/.config/compiz-1/compizconfig/Default.ini"; then
+			pluginsFlat=`grep "s0_active_plugins" $HOME/.config/compiz-1/compizconfig/Default.ini`
+			if test `echo $pluginsFlat | grep -c $ARG2` -eq 0; then
+				pluginsFlat="$pluginsFlat""$ARG2;"
+				sed -i "/s0_active_plugins/ s/.*/&$ARG2;/g" $HOME/.config/compiz-1/compizconfig/Default.ini
+			fi
+		fi
+		# gconf
+		plugins=`gconftool-2 -g /apps/compiz-1/general/screen0/options/active_plugins`
+		if test `echo $plugins | grep -c $ARG2` -eq 0; then
+			plugins=${plugins:0:${#plugins}-1},$ARG2]
+			gconftool-2 -s /apps/compiz-1/general/screen0/options/active_plugins --type=list --list-type=string "$plugins"
+		fi
+	fi
+}
+
+compiz_new_replace_list_plugins() {
+	if test -d "$HOME/.config/compiz-1"; then # only for compiz 0.9
+		# flat file
+		if test -f "$HOME/.config/compiz-1/compizconfig/Default.ini"; then
+			pluginsList="s0_active_plugins = "`echo $ARG2 |sed -e 's/,/;/g'`";" # , => ;
+			sed -i "/s0_active_plugins/ s/.*/$pluginsList/g" $HOME/.config/compiz-1/compizconfig/Default.ini
+		fi
+		# gconf
+		gconftool-2 -s /apps/compiz-1/general/screen0/options/active_plugins --type=list --list-type=string "[$ARG2]"
 	fi
 }
 
@@ -90,5 +141,8 @@
 	"compiz_plugin")
 		compiz_plugin
 	;;
+	"compiz_new_replace_list_plugins")
+		compiz_new_replace_list_plugins
+	;;
 esac
 exit

=== modified file 'data/scripts/initial-setup.sh'
--- data/scripts/initial-setup.sh	2011-08-09 16:48:08 +0000
+++ data/scripts/initial-setup.sh	2011-10-08 22:21:24 +0000
@@ -1,5 +1,22 @@
 #!/bin/bash
 
+# Script for the Help applet of Cairo-Dock
+#
+# Copyright : (C) see the 'copyright' file.
+# E-mail    : see the 'copyright' file.
+#
+#
+# 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 3
+# 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
+
 # Note: we have to use $HOME instead of '~'
 
 # Enable icons in menus and buttons in Gnome

=== modified file 'data/themes.conf.in'
--- data/themes.conf.in	2011-08-09 16:48:08 +0000
+++ data/themes.conf.in	2011-10-08 22:21:24 +0000
@@ -3,7 +3,7 @@
 #[gtk-open]
 [Themes]
 
-#R[@pkgdatadir@/themes;../@CAIRO_DOCK_THEMES_DIR@;themes2.2] /
+#R[@pkgdatadir@/themes;../@CAIRO_DOCK_THEMES_DIR@;themes2.4] /
 chosen theme = 
 
 #S ...or drag and drop a theme package here :

=== modified file 'debian/cairo-dock-core.install'
--- debian/cairo-dock-core.install	2010-08-09 23:26:12 +0000
+++ debian/cairo-dock-core.install	2011-10-08 22:21:24 +0000
@@ -2,5 +2,5 @@
 debian/tmp/usr/share/locale
 debian/tmp/usr/share/applications
 debian/apport/cairo-dock.py usr/share/apport/package-hooks/
-debian/tmp/usr/share/man/
-debian/tmp/usr/lib*/*.so*
+debian/tmp/usr/share/man/man1/cairo-dock.1.gz
+debian/tmp/usr/lib*/*.so.*

=== added file 'debian/cairo-dock-core.lintian-overrides'
--- debian/cairo-dock-core.lintian-overrides	1970-01-01 00:00:00 +0000
+++ debian/cairo-dock-core.lintian-overrides	2011-10-08 22:21:24 +0000
@@ -0,0 +1,2 @@
+# Temporally lintian override: This package is going to be split
+cairo-dock-core: package-name-doesnt-match-sonames

=== modified file 'debian/cairo-dock-data.install'
--- debian/cairo-dock-data.install	2009-08-26 17:13:42 +0000
+++ debian/cairo-dock-data.install	2011-10-08 22:21:24 +0000
@@ -1,3 +1,6 @@
 debian/tmp/usr/bin/cairo-dock-package-theme
 debian/tmp/usr/share/cairo-dock/*
 debian/tmp/usr/share/pixmaps/
+debian/tmp/usr/share/xsessions/
+debian/tmp/usr/share/gnome-session/sessions/
+debian/tmp/usr/bin/cairo-dock-session

=== modified file 'debian/cairo-dock-data.lintian-overrides'
--- debian/cairo-dock-data.lintian-overrides	2009-08-26 17:13:42 +0000
+++ debian/cairo-dock-data.lintian-overrides	2011-10-08 22:21:24 +0000
@@ -1,5 +1,2 @@
-# Cairo-dock plugin config files uses shebang
-# upstream is warned
-cairo-dock-data: interpreter-not-absolute
-cairo-dock-data: script-not-executable
-cairo-dock-data: unusual-interpreter
+# Cairo-Dock uses custom scripts
+cairo-dock-data: binary-without-manpage

=== modified file 'debian/cairo-dock-dev.install'
--- debian/cairo-dock-dev.install	2010-08-09 23:26:12 +0000
+++ debian/cairo-dock-dev.install	2011-10-08 22:21:24 +0000
@@ -1,2 +1,3 @@
 debian/tmp/usr/include
 debian/tmp/usr/lib*/pkgconfig
+debian/tmp/usr/lib*/*.so

=== modified file 'debian/changelog'
--- debian/changelog	2011-08-11 19:31:26 +0000
+++ debian/changelog	2011-10-08 22:21:24 +0000
@@ -1,3 +1,68 @@
+cairo-dock (2.4.0~2-0ubuntu1) UNRELEASED; urgency=low
+
+  * New upstream bug fix release. (LP: #859982)
+  * Upstream (short) ChangeLog (2.4.0~0beta2 -> 2.4.0~1):
+   - Improved support of the new Gnome 3 session
+      (to avoid conflicts with the new Gnome-Panel).
+   - Code cleaned and re-organised a few functions
+      (e.g. with cairo-dock-overlay, cairo-dock.c, etc.)
+   - Updating translations
+   - Improved the support of XFCE and LXDE environments
+   - Removed invalid launcher desktop files
+   - Used a default icon if the path set by the user is wrong
+   - Fixed the possibility to sticky a desklet (bug due to a Xorg update)
+   - GUI: fixed the list-entry widget
+   - Fixed support of the Widget Layer in Compiz >= 0.9
+   - Compiz type filter: replaced type=utility by type=Utility
+   - Fixed a small refresh bug in cairo mode
+      (with icons that are always visible)
+   - Improved the placement of icons when avoiding the mouse
+      (when something is being dropped onto the dock)
+   - Updated the default theme in order to use new applications
+   - Gauge implementation: Rewritten to use CairoDockImageBuffer
+      and fixed the problem with png images
+   - Graphs: Improved the drawing and added more precisions
+   - Improved the 'lock' option description
+   - GUI simple: fixed a bad update of the parameters
+      when switching back to the previous value
+   - Fixed the path of the preview for the default view
+   - Help: Fixed the problem with tips
+   - Default-theme: .conf files: fixed lintian warnings
+   - Fixed a few warnings at the compilation
+   - Removed a few useless output messages
+   - Fixed these LP bugs:
+    + Cairo-dock corrupts Kdenlive monitor display LP: #729970
+    + Can't play videos in kaffeine LP: #475375
+   - And fixed a lot of tiny bugs, please have a look to bzr logs.
+  * Upstream (short) ChangeLog (2.4.0~1 -> 2.4.0~2):
+   - Fixed a bug with the detection of compiz plugins
+   - doc: used the right version
+   - Fixed a possible crash with an empty dock LP: #861725
+   - FlyingContainer: draw the icon correctly
+  * debian/patches:
+   - Removed 01-musicPlayer_with_banshee: now in upstream
+  * debian/copyright:
+   - Updated and fixed lintian warnings: old-fsf-address-in-copyright-file
+  * debian/rules and debian/cairo-dock-data.install:
+   - Added support of the new Gnome 3 session.
+  * debian/control:
+   - Fixed lintian warning: description-synopsis-starts-with-article
+   - Fixed lintian error: version-substvar-for-external-package
+  * debian/cairo-dock-data.lintian-overrides:
+   - Removed old warnings (fixed)
+   - Added binary-without-manpage (custom scripts used)
+  * debian/cairo-dock-core.install and debian/cairo-dock-dev.install:
+   - Fixed a lintian warning: non-dev-pkg-with-shlib-symlink
+  * debian/patches/01-improved-cairo-dock-session.patch:
+   - Improved the launch of our Cairo-Dock session (by removing Unity
+      Compiz plugin and by launching the dock with a short delay)
+   - Fixed lintian error: shell-script-fails-syntax-check
+      (it seems I made wrong manipulation with vim...)
+  * debian/patches/02-manpage-not-compressed-with-max-compression.patch:
+   - Fixed this lintian error: manpage-not-compressed-with-max-compression
+
+ -- Matthieu Baerts (matttbe) <[e-mail]>  Sun, 09 Oct 2011 00:17:42 +0200
+
 cairo-dock (2.4.0~0beta2-0ubuntu1) oneiric; urgency=low
 
   * New upstream release. (LP: #823513)

=== modified file 'debian/control'
--- debian/control	2011-08-09 19:53:55 +0000
+++ debian/control	2011-10-08 22:21:24 +0000
@@ -26,9 +26,9 @@
 Architecture: all
 Conflicts: 	cairo-dock (<= 2.0.8.0)
 Depends: 	cairo-dock-core (>= ${source:Version}),
-		cairo-dock-plug-ins (>= ${source:Version}),
+		cairo-dock-plug-ins (>= 2.4.0~2),
 		${misc:Depends}
-Description: A light and eye-candy dock to launch your programs (metapackage)
+Description: Light and eye-candy dock to launch your programs (metapackage)
  Cairo-Dock is a pretty, light and convenient interface to your desktop,
   able to replace advantageously your system panel! 
  It features multi-docks, taskbar, launchers and a lot of useful applets. 
@@ -54,7 +54,7 @@
 		${misc:Depends}
 Recommends:	cairo-dock, cairo-dock-plug-ins
 Suggests:	firefox, gnome-terminal, empathy, inkscape, gimp, shotwell, rhythmbox
-Description: A light and eye-candy dock to launch your programs (core package)
+Description: Light and eye-candy dock to launch your programs (core package)
  Cairo-Dock is a pretty, light and convenient interface to your desktop,
   able to replace advantageously your system panel! 
  It features multi-docks, taskbar, launchers and a lot of useful applets. 
@@ -86,7 +86,7 @@
 		libxinerama-dev,
 		libglib2.0-dev
 Recommends:	cairo-dock-plug-ins
-Description: A light and eye-candy dock to launch your programs (dev package)
+Description: Light and eye-candy dock to launch your programs (dev package)
  Cairo-Dock is a pretty, light and convenient interface to your desktop,
   able to replace advantageously your system panel! 
  It features multi-docks, taskbar, launchers and a lot of useful applets. 
@@ -108,7 +108,7 @@
 Replaces: cairo-dock (<= 2.0.8.0) 
 Depends: 	${shlibs:Depends}, 
 		${misc:Depends}
-Description: A light and eye-candy dock to launch your programs (common files)
+Description: Light and eye-candy dock to launch your programs (common files)
  Cairo-Dock is a pretty, light and convenient interface to your desktop,
   able to replace advantageously your system panel! 
  It features multi-docks, taskbar, launchers and a lot of useful applets. 

=== modified file 'debian/copyright'
--- debian/copyright	2010-09-07 20:31:25 +0000
+++ debian/copyright	2011-10-08 22:21:24 +0000
@@ -16,7 +16,8 @@
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ * Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston,
+ * MA 02110-1301, USA.
 
 Files: 	src/gldit/cairo-dock-dbus.*
 Copyright: Adrien Pilleboue <[e-mail]>
@@ -43,7 +44,8 @@
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ * Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston,
+ * MA 02110-1301, USA.
 
 Files: 	src/gldit/texture-gradation.h
 Copyright: Copyright (C) 2007  Gimp dev.
@@ -53,7 +55,7 @@
 Copyright: Humanity devs (some of them modified by Matthieu Baerts)
 Licence: GPL 3+
 
-Files: data/default-theme/ data/man/
+Files: data/default-theme/ data/man/ data/
 Copyright: Matthieu Baerts
 Licence: LGPL
 

=== added file 'debian/patches/01-improved-cairo-dock-session.patch'
--- debian/patches/01-improved-cairo-dock-session.patch	1970-01-01 00:00:00 +0000
+++ debian/patches/01-improved-cairo-dock-session.patch	2011-10-08 22:21:24 +0000
@@ -0,0 +1,106 @@
+## From: Matthieu Baerts (matttbe) <[e-mail]>
+## Description: Improved the launch of our Cairo-Dock session (by removing Unity
+##               Compiz plugin and by launching the dock with a short delay)
+## Origin: upstream, http://bazaar.launchpad.net/~cairo-dock-team/cairo-dock-core/cairo-dock/revision/885
+## Forwarded: yes
+Index: cairo-dock/data/desktop-manager/CMakeLists.txt
+===================================================================
+--- cairo-dock.orig/data/desktop-manager/CMakeLists.txt	2011-10-06 12:02:24.494184799 +0200
++++ cairo-dock/data/desktop-manager/CMakeLists.txt	2011-10-06 12:02:17.554184897 +0200
+@@ -7,3 +7,7 @@
+ 	cairo-dock.session
+ 	cairo-dock-fallback.session
+ 	DESTINATION /usr/share/gnome-session/sessions)
++
++install (FILES cairo-dock-session
++	DESTINATION ${bindir}
++	PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE GROUP_READ GROUP_EXECUTE WORLD_READ WORLD_EXECUTE)
+Index: cairo-dock/data/desktop-manager/cairo-dock-fallback.desktop
+===================================================================
+--- cairo-dock.orig/data/desktop-manager/cairo-dock-fallback.desktop	2011-10-06 12:02:24.578184798 +0200
++++ cairo-dock/data/desktop-manager/cairo-dock-fallback.desktop	2011-10-06 12:02:17.554184897 +0200
+@@ -2,6 +2,6 @@
+ Name=Cairo-Dock (with Gnome and without effect)
+ Comment=This session logs you into GNOME with Cairo-Dock and without any graphical effect.
+ Exec=gnome-session --session=cairo-dock-fallback
+-TryExec=gnome-session
++TryExec=cairo-dock-session
+ Icon=
+ Type=Application
+Index: cairo-dock/data/desktop-manager/cairo-dock-session
+===================================================================
+--- /dev/null	1970-01-01 00:00:00.000000000 +0000
++++ cairo-dock/data/desktop-manager/cairo-dock-session	2011-10-06 12:02:17.554184897 +0200
+@@ -0,0 +1,47 @@
++#!/bin/bash
++
++# Script for the 'desktop-manager' subproject of Cairo-Dock
++#
++# Copyright : (C) see the 'copyright' file.
++# E-mail    : see the 'copyright' file.
++#
++#
++# 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 3
++# 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
++
++# This script removes Unity Compiz plugin and launches Cairo-Dock with a short delay
++
++UNITY_NAME="unityshell"
++COMPIZ_FLAT_FILE="$HOME/.config/compiz-1/compizconfig/Default.ini"
++COMPIZ_GCONF="/apps/compiz-1/general/screen0/options/active_plugins"
++
++if test -d "$HOME/.config/compiz-1"; then # compiz >= 0.9
++	# plug-ins in double are NO LONGER filtered by Compiz in this version... (and if plugins are in double or wrong, compiz crashes :) )
++	# flat file
++	if test -f "$COMPIZ_FLAT_FILE"; then
++		pluginsFlat=`grep "s0_active_plugins" $COMPIZ_FLAT_FILE`
++		if test `echo $pluginsFlat | grep -c $UNITY_NAME` -gt 0; then
++			pluginsFlatWithoutUnity=`echo $pluginsFlat | sed -e "s/$UNITY_NAME;//g"`
++			sed -i "/s0_active_plugins/ s/$pluginsFlat/$pluginsFlatWithoutUnity/g" $COMPIZ_FLAT_FILE
++		fi
++	fi
++	# gconf
++	plugins=`gconftool-2 -g $COMPIZ_GCONF`
++	if test `echo $plugins | grep -c $UNITY_NAME` -gt 0; then
++		pluginsWithoutUnity=`echo $plugins | sed -e "s/$UNITY_NAME,//g"`
++		gconftool-2 -s $COMPIZ_GCONF --type=list --list-type=string "$pluginsWithoutUnity"
++		killall unity-panel-service
++	fi
++fi
++
++if test `ps aux | grep -c " [c]airo-dock"` -eq 0; then # cairo-dock not launched
++	cairo-dock -w 3
++fi
+Index: cairo-dock/data/desktop-manager/cairo-dock.desktop
+===================================================================
+--- cairo-dock.orig/data/desktop-manager/cairo-dock.desktop	2011-10-06 12:02:24.450184800 +0200
++++ cairo-dock/data/desktop-manager/cairo-dock.desktop	2011-10-06 12:02:17.554184897 +0200
+@@ -2,6 +2,6 @@
+ Name=Cairo-Dock (with Gnome and effects)
+ Comment=This session logs you into GNOME with Cairo-Dock and with graphical effects.
+ Exec=gnome-session --session=cairo-dock
+-TryExec=gnome-session
++TryExec=cairo-dock-session
+ Icon=
+ Type=Application
+Index: cairo-dock/data/scripts/help_scripts.sh
+===================================================================
+--- cairo-dock.orig/data/scripts/help_scripts.sh	2011-10-06 12:02:24.294184802 +0200
++++ cairo-dock/data/scripts/help_scripts.sh	2011-10-06 12:02:17.554184897 +0200
+@@ -115,7 +115,7 @@
+ 		# flat file
+ 		if test -f "$HOME/.config/compiz-1/compizconfig/Default.ini"; then
+ 			pluginsList="s0_active_plugins = "`echo $ARG2 |sed -e 's/,/;/g'`";" # , => ;
+-			sed -i "/s0_active_plugins/ s/.*/$ARG2/g" $HOME/.config/compiz-1/compizconfig/Default.ini
++			sed -i "/s0_active_plugins/ s/.*/$pluginsList/g" $HOME/.config/compiz-1/compizconfig/Default.ini
+ 		fi
+ 		# gconf
+ 		gconftool-2 -s /apps/compiz-1/general/screen0/options/active_plugins --type=list --list-type=string "[$ARG2]"

=== removed file 'debian/patches/01-musicPlayer_with_banshee'
--- debian/patches/01-musicPlayer_with_banshee	2011-08-09 19:53:55 +0000
+++ debian/patches/01-musicPlayer_with_banshee	1970-01-01 00:00:00 +0000
@@ -1,17 +0,0 @@
-From: Matthieu Baerts <[e-mail]>
-Subject: Replaced Rhythmbox default player by Banshee (the default music player in Ubuntu)
-Forwarded: yes
-
-Index: cairo-dock/data/default-theme/plug-ins/musicPlayer/musicPlayer.conf
-===================================================================
---- cairo-dock.orig/data/default-theme/plug-ins/musicPlayer/musicPlayer.conf	2011-08-09 19:09:05.462064890 +0200
-+++ cairo-dock/data/default-theme/plug-ins/musicPlayer/musicPlayer.conf	2011-08-09 19:09:41.082552489 +0200
-@@ -109,7 +109,7 @@
- #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
-+current-player=Banshee
- 
- #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.}

=== added file 'debian/patches/02-manpage-not-compressed-with-max-compression.patch'
--- debian/patches/02-manpage-not-compressed-with-max-compression.patch	1970-01-01 00:00:00 +0000
+++ debian/patches/02-manpage-not-compressed-with-max-compression.patch	2011-10-08 22:21:24 +0000
@@ -0,0 +1,19 @@
+## From: Matthieu Baerts (matttbe) <[e-mail]>
+## Description: Fixed a lintian error
+## Forwarded: yes
+Index: cairo-dock/.bzr/checkout/dirstate
+===================================================================
+Binary files cairo-dock.orig/.bzr/checkout/dirstate	2011-10-08 18:37:04.250876667 +0200 and cairo-dock/.bzr/checkout/dirstate	2011-10-08 18:36:53.094876635 +0200 differ
+Index: cairo-dock/data/man/CMakeLists.txt
+===================================================================
+--- cairo-dock.orig/data/man/CMakeLists.txt	2011-10-08 18:37:04.114876666 +0200
++++ cairo-dock/data/man/CMakeLists.txt	2011-10-08 18:33:17.478876037 +0200
+@@ -12,7 +12,7 @@
+ # Compression of the manuals
+ foreach(man ${cairo_dock_man_src})
+ 	message(STATUS "Building ${man}.gz")
+-	execute_process(COMMAND ${GZIP_TOOL} -c ${CMAKE_CURRENT_SOURCE_DIR}/${man}
++	execute_process(COMMAND ${GZIP_TOOL} -9 -c ${CMAKE_CURRENT_SOURCE_DIR}/${man}
+ 						OUTPUT_FILE ${CMAKE_CURRENT_BINARY_DIR}/${man}.gz)
+ endforeach(man)
+ 

=== modified file 'debian/patches/series'
--- debian/patches/series	2011-08-09 19:53:55 +0000
+++ debian/patches/series	2011-10-08 22:21:24 +0000
@@ -1,1 +1,2 @@
-01-musicPlayer_with_banshee
+01-improved-cairo-dock-session.patch
+02-manpage-not-compressed-with-max-compression.patch

=== modified file 'debian/rules'
--- debian/rules	2011-03-17 14:08:48 +0000
+++ debian/rules	2011-10-08 22:21:24 +0000
@@ -3,7 +3,8 @@
 
 DH_ALWAYS_EXCLUDE=CVS:.bzr
 
-DEB_CMAKE_EXTRA_FLAGS += -Denable_gtk_grip=yes
+DEB_CMAKE_EXTRA_FLAGS += -Denable_gtk_grip=yes \
+	-Denable-desktop-manager=yes
 
 include /usr/share/cdbs/1/rules/debhelper.mk
 include /usr/share/cdbs/1/class/cmake.mk

=== modified file 'po/ar.po'
--- po/ar.po	2011-08-09 16:48:08 +0000
+++ po/ar.po	2011-10-08 22:21:24 +0000
@@ -7,15 +7,15 @@
 msgstr ""
 "Project-Id-Version: cairo-dock-core\n"
 "Report-Msgid-Bugs-To: [e-mail]\n"
-"POT-Creation-Date: 2011-07-03 00:01+0000\n"
-"PO-Revision-Date: 2010-10-12 19:55+0000\n"
+"POT-Creation-Date: 2011-09-23 23:42+0000\n"
+"PO-Revision-Date: 2011-09-20 08:48+0000\n"
 "Last-Translator: Matthieu Baerts <[e-mail]>\n"
 "Language-Team: Arabic <[e-mail]>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-07-04 04:32+0000\n"
-"X-Generator: Launchpad (build 13168)\n"
+"X-Launchpad-Export-Date: 2011-09-25 04:33+0000\n"
+"X-Generator: Launchpad (build 14012)\n"
 "Language: ar\n"
 
 #: ../src/cairo-dock-gui-commons.c:216
@@ -29,7 +29,7 @@
 msgid "Please wait while importing the theme..."
 msgstr ""
 
-#: ../src/cairo-dock-gui-commons.c:364 ../src/cairo-dock-menu.c:1427
+#: ../src/cairo-dock-gui-commons.c:364 ../src/cairo-dock-menu.c:1456
 msgid "Configure this applet"
 msgstr "تكوين الاضافة"
 
@@ -50,7 +50,7 @@
 msgstr "ملحقات"
 
 #: ../src/cairo-dock-gui-commons.c:421 ../src/cairo-dock-gui-main.c:135
-#: ../src/cairo-dock-gui-main.c:1502 ../data/messages:761
+#: ../src/cairo-dock-gui-main.c:1504 ../data/messages:757
 msgid "System"
 msgstr "النّظام"
 
@@ -66,20 +66,20 @@
 msgid "category"
 msgstr "تصنيف"
 
-#: ../src/cairo-dock-gui-items.c:381
+#: ../src/cairo-dock-gui-items.c:384
 msgid ""
 "Main dock's parameters are available in the main configuration window."
 msgstr ""
 
-#: ../src/cairo-dock-gui-items.c:621
+#: ../src/cairo-dock-gui-items.c:600
 msgid "Launcher configuration"
 msgstr "اعدادات المشغل"
 
-#: ../src/cairo-dock-gui-main.c:129 ../data/messages:679
+#: ../src/cairo-dock-gui-main.c:129 ../data/messages:671
 msgid "Behaviour"
 msgstr "السّلوك"
 
-#: ../src/cairo-dock-gui-main.c:130 ../data/messages:499 ../data/messages:1339
+#: ../src/cairo-dock-gui-main.c:130 ../data/messages:491 ../data/messages:1657
 msgid "Appearance"
 msgstr "المظهر"
 
@@ -87,78 +87,80 @@
 msgid "Accessories"
 msgstr "ملحقات"
 
-#: ../src/cairo-dock-gui-main.c:137 ../src/cairo-dock-gui-main.c:1651
-#: ../data/messages:1473
+#: ../src/cairo-dock-gui-main.c:137 ../src/cairo-dock-gui-main.c:1653
+#: ../data/messages:1791
 msgid "All"
 msgstr "الكل"
 
-#: ../src/cairo-dock-gui-main.c:1480
+#: ../src/cairo-dock-gui-main.c:1482
 msgid "Set the position of the main dock."
 msgstr "تحديد موضع الشريط الرئيسي."
 
-#: ../src/cairo-dock-gui-main.c:1481 ../data/messages:343 ../data/messages:553
+#: ../src/cairo-dock-gui-main.c:1483 ../data/messages:335 ../data/messages:545
 msgid "Position"
 msgstr "الموضع"
 
-#: ../src/cairo-dock-gui-main.c:1487
+#: ../src/cairo-dock-gui-main.c:1489
 msgid ""
 "Do you like your dock to be always visible,\n"
 " or on the contrary unobtrusive?\n"
 "Configure the way you access your docks and sub-docks!"
 msgstr ""
 
-#: ../src/cairo-dock-gui-main.c:1488 ../src/cairo-dock-menu.c:1465
-#: ../data/messages:361
+#: ../src/cairo-dock-gui-main.c:1490 ../src/cairo-dock-menu.c:1494
+#: ../data/messages:353
 msgid "Visibility"
 msgstr "الرؤية"
 
-#: ../src/cairo-dock-gui-main.c:1494
+#: ../src/cairo-dock-gui-main.c:1496
 msgid "Display and interact with currently open windows."
 msgstr "العرض والتفاعل مع النوافذ المفتوحة حاليا."
 
-#: ../src/cairo-dock-gui-main.c:1495 ../data/messages:41 ../data/messages:477
+#: ../src/cairo-dock-gui-main.c:1497 ../data/messages:41 ../data/messages:469
+#: ../data/messages:1323
 msgid "Taskbar"
 msgstr "شريط المهام"
 
-#: ../src/cairo-dock-gui-main.c:1501
+#: ../src/cairo-dock-gui-main.c:1503
 msgid "All of the parameters you will never want to tweak."
 msgstr "المؤشرات التي لن تعدلها ابدا."
 
-#: ../src/cairo-dock-gui-main.c:1511
+#: ../src/cairo-dock-gui-main.c:1513
 msgid "Set a background for your dock."
 msgstr "تعيين خلفية  لشريطك"
 
-#: ../src/cairo-dock-gui-main.c:1512 ../data/messages:857
-#: ../data/messages:1255 ../data/messages:1347
+#: ../src/cairo-dock-gui-main.c:1514 ../data/messages:853
+#: ../data/messages:1251 ../data/messages:1665
 msgid "Background"
 msgstr "خلفيَّة"
 
-#: ../src/cairo-dock-gui-main.c:1518
+#: ../src/cairo-dock-gui-main.c:1520
 msgid "Select a view for each of your docks."
 msgstr "حدد طريقة عرض الشريط"
 
-#: ../src/cairo-dock-gui-main.c:1519 ../data/messages:531 ../data/messages:919
-#: ../data/messages:1341
+#: ../src/cairo-dock-gui-main.c:1521 ../data/messages:523 ../data/messages:915
+#: ../data/messages:1659
 msgid "Views"
 msgstr "العرض"
 
-#: ../src/cairo-dock-gui-main.c:1526
+#: ../src/cairo-dock-gui-main.c:1528
 msgid "Configure text bubble appearance."
 msgstr "ظهور فقاعة في خصائص النص."
 
-#: ../src/cairo-dock-gui-main.c:1527
+#: ../src/cairo-dock-gui-main.c:1529
 msgid "Dialog boxes"
 msgstr "صناديق الحوار"
 
-#: ../src/cairo-dock-gui-main.c:1534
+#: ../src/cairo-dock-gui-main.c:1536
 msgid "Applets can be displayed on your desktop as widgets."
 msgstr "يمكن عرض بريمجاتك على سطح المكتب في وجدات الشريط"
 
-#: ../src/cairo-dock-gui-main.c:1535 ../data/messages:101 ../data/messages:975
+#: ../src/cairo-dock-gui-main.c:1537 ../data/messages:101 ../data/messages:971
+#: ../data/messages:1383
 msgid "Desklets"
 msgstr ""
 
-#: ../src/cairo-dock-gui-main.c:1542
+#: ../src/cairo-dock-gui-main.c:1544
 msgid ""
 "All about icons:\n"
 " size, reflection, icon theme,..."
@@ -166,77 +168,76 @@
 "كل ما يخص الايقونات:\n"
 " الحجم, الإنعكاس, سمة الايقونة, ..."
 
-#: ../src/cairo-dock-gui-main.c:1543 ../data/messages:11 ../data/messages:501
-#: ../data/messages:1039
+#: ../src/cairo-dock-gui-main.c:1545 ../data/messages:11 ../data/messages:493
+#: ../data/messages:1035 ../data/messages:1293
 msgid "Icons"
 msgstr "أيقونات"
 
-#: ../src/cairo-dock-gui-main.c:1549
+#: ../src/cairo-dock-gui-main.c:1551
 msgid "Indicators are additional markers for your icons."
 msgstr "المؤشرات هي علامات إضافية للأيقونات."
 
-#: ../src/cairo-dock-gui-main.c:1550 ../data/messages:1157
+#: ../src/cairo-dock-gui-main.c:1552 ../data/messages:1153
 msgid "Indicators"
 msgstr "المؤشرات"
 
-#: ../src/cairo-dock-gui-main.c:1557
+#: ../src/cairo-dock-gui-main.c:1559
 msgid "Define icon caption and quick-info style."
 msgstr "رمز تعريف وشرح سريع لمعلومات النمط."
 
-#: ../src/cairo-dock-gui-main.c:1558
+#: ../src/cairo-dock-gui-main.c:1560
 msgid "Captions"
 msgstr "تعليق"
 
-#: ../src/cairo-dock-gui-main.c:1627
+#: ../src/cairo-dock-gui-main.c:1629
 msgid "Categories"
 msgstr "التصنيفات"
 
-#: ../src/cairo-dock-gui-main.c:1765
+#: ../src/cairo-dock-gui-main.c:1767
 msgid "Filter"
 msgstr "فلترة"
 
-#: ../src/cairo-dock-gui-main.c:1812
+#: ../src/cairo-dock-gui-main.c:1814
 msgid "Options"
 msgstr "خيارات"
 
-#: ../src/cairo-dock-gui-main.c:1822
+#: ../src/cairo-dock-gui-main.c:1824
 msgid "All words"
 msgstr "كافة الكلمات"
 
-#: ../src/cairo-dock-gui-main.c:1826
+#: ../src/cairo-dock-gui-main.c:1828
 msgid "Highlighted words"
 msgstr "الكلمات المظللة"
 
-#: ../src/cairo-dock-gui-main.c:1831
+#: ../src/cairo-dock-gui-main.c:1833
 msgid "Hide others"
 msgstr "اخفاء الاخرى"
 
-#: ../src/cairo-dock-gui-main.c:1836
+#: ../src/cairo-dock-gui-main.c:1838
 msgid "Search in description"
 msgstr "البحث بالوصف"
 
-#: ../src/cairo-dock-gui-main.c:1850
+#: ../src/cairo-dock-gui-main.c:1852
 msgid "Enable this module"
 msgstr "تمكين هذه الوحدة"
 
-#: ../src/cairo-dock-gui-main.c:1914 ../src/cairo-dock-menu.c:209
-#: ../data/messages:549
+#: ../src/cairo-dock-gui-main.c:1916 ../data/messages:541
 msgid "More applets"
 msgstr "مزيد من التطبيقات"
 
-#: ../src/cairo-dock-gui-main.c:1915 ../data/messages:547
+#: ../src/cairo-dock-gui-main.c:1917 ../data/messages:539
 msgid "Get more applets online !"
 msgstr "الحصول على المزيد من التطبيقات على الانترنت!"
 
-#: ../src/cairo-dock-gui-main.c:1949 ../src/cairo-dock.c:632
+#: ../src/cairo-dock-gui-main.c:1951 ../src/cairo-dock.c:663
 msgid "< Maintenance mode >"
 msgstr "< وضع الصيانة >"
 
-#: ../src/cairo-dock-gui-main.c:2039 ../src/cairo-dock-gui-simple.c:901
+#: ../src/cairo-dock-gui-main.c:2041 ../src/cairo-dock-gui-simple.c:901
 msgid "Cairo-Dock configuration"
 msgstr "إعدادات كايرو دك"
 
-#: ../src/cairo-dock-gui-main.c:2394
+#: ../src/cairo-dock-gui-main.c:2396
 #, c-format
 msgid ""
 "The '%s' module is not present. You need to install it and all its "
@@ -245,16 +246,16 @@
 "'%s' الوحدة غير موجودة . تحتاج إلى تثبيتها وجميع تابعاتها من أجل استخدام هذه "
 "الوحدة"
 
-#: ../src/cairo-dock-gui-main.c:2400
+#: ../src/cairo-dock-gui-main.c:2402
 #, c-format
 msgid "The '%s' module is not enabled."
 msgstr "'%s' الوحدةغير مفعلة."
 
-#: ../src/cairo-dock-gui-main.c:2401
+#: ../src/cairo-dock-gui-main.c:2403
 msgid "Do you want to enable it now?"
 msgstr "هل تريد تفعيلها الان؟"
 
-#: ../src/cairo-dock-gui-main.c:2756
+#: ../src/cairo-dock-gui-main.c:2750
 msgid "Simple Mode"
 msgstr "الوضع البسيط"
 
@@ -287,11 +288,11 @@
 "Click on an applet in order to have a preview and a description for it."
 msgstr "انقر على المصغر للحصول على عرض و وصف له."
 
-#: ../src/cairo-dock-gui-simple.c:865 ../data/messages:493
+#: ../src/cairo-dock-gui-simple.c:865 ../data/messages:485
 msgid "On mouse hover:"
 msgstr "حدث مرور الفأرة:"
 
-#: ../src/cairo-dock-gui-simple.c:867 ../data/messages:495
+#: ../src/cairo-dock-gui-simple.c:867 ../data/messages:487
 msgid "On click:"
 msgstr "عند الضغط:"
 
@@ -323,177 +324,203 @@
 msgid "Manage Themes"
 msgstr "إدارة السمات"
 
-#: ../src/cairo-dock-menu.c:121
+#: ../src/cairo-dock-help.c:54 ../src/cairo-dock-menu.c:454
+#: ../src/help/applet-init.c:28 ../src/help/applet-notifications.c:228
+msgid "Help"
+msgstr "مساعدة"
+
+#: ../src/cairo-dock-help.c:69 ../src/help/applet-init.c:31
+msgid ""
+"This applet is made to help you.\n"
+"Click on its icon to pop up useful tips about the possibilities of Cairo-"
+"Dock.\n"
+"Middle-click to open the configuration window.\n"
+"Right-click to access some troubleshooting actions."
+msgstr ""
+
+#: ../src/cairo-dock-help.c:220 ../src/help/applet-tips-dialog.c:152
+msgid "Tips and Tricks"
+msgstr ""
+
+#: ../src/cairo-dock-help.c:380 ../src/help/applet-tips-dialog.c:299
+msgid "Category"
+msgstr ""
+
+#: ../src/cairo-dock-menu.c:122
 msgid "Delete this dock?"
 msgstr ""
 
-#: ../src/cairo-dock-menu.c:173
+#: ../src/cairo-dock-menu.c:174
 msgid "About Cairo-Dock"
 msgstr ""
 
-#: ../src/cairo-dock-menu.c:200 ../data/messages:279
-msgid "Community site"
-msgstr "موقع المجتمع"
-
-#: ../src/cairo-dock-menu.c:201 ../data/messages:277
-msgid "Problems? Suggestions? Just want to talk to us? Come on over!"
-msgstr "مشاكل؟ اقتراحات؟ تريد التحدث إلينا؟ تفضل!"
-
-#: ../src/cairo-dock-menu.c:204 ../data/messages:283
+#: ../src/cairo-dock-menu.c:211 ../data/messages:283 ../data/messages:1565
 msgid "Development site"
 msgstr "موقع التطوير"
 
-#: ../src/cairo-dock-menu.c:205 ../data/messages:281
+#: ../src/cairo-dock-menu.c:212 ../data/messages:281 ../data/messages:1563
 msgid "Find the latest version of Cairo-Dock here !"
 msgstr "إبحث عن النسخه الاخيره  من البرنامج هنا !"
 
-#: ../src/cairo-dock-menu.c:220
+#: ../src/cairo-dock-menu.c:216 ../src/cairo-dock-menu.c:447
+msgid "Get more applets!"
+msgstr "الحصول على مزيد من التطبيقات!"
+
+#: ../src/cairo-dock-menu.c:220 ../src/cairo-dock-menu.c:226
+msgid "Donate"
+msgstr ""
+
+#: ../src/cairo-dock-menu.c:223 ../src/cairo-dock-menu.c:229
+msgid ""
+"Support the people who spend countless hours to bring you the best dock ever."
+msgstr ""
+
+#: ../src/cairo-dock-menu.c:240
 msgid "Development"
 msgstr "تطوير"
 
-#: ../src/cairo-dock-menu.c:226
+#: ../src/cairo-dock-menu.c:246
 msgid "Artwork"
 msgstr "الأعمال الفنية"
 
-#: ../src/cairo-dock-menu.c:230
+#: ../src/cairo-dock-menu.c:250
 msgid "Support"
 msgstr "الدعم"
 
-#: ../src/cairo-dock-menu.c:312
+#: ../src/cairo-dock-menu.c:332
 msgid "Quit Cairo-Dock?"
 msgstr "إغلاق برنامج كايرو-دوك؟"
 
-#: ../src/cairo-dock-menu.c:343
+#: ../src/cairo-dock-menu.c:363
 msgid "Configure"
 msgstr "عدل"
 
-#: ../src/cairo-dock-menu.c:348
+#: ../src/cairo-dock-menu.c:368
 msgid "Configure behaviour, appearance, and applets."
 msgstr "تكوين السلوك والمظهر والاضفات ."
 
-#: ../src/cairo-dock-menu.c:352
+#: ../src/cairo-dock-menu.c:372
 msgid "Configure this dock"
 msgstr "ضبط الشريط"
 
-#: ../src/cairo-dock-menu.c:357
+#: ../src/cairo-dock-menu.c:377
 msgid "Customize the position, visibility and appearance of this main dock."
 msgstr ""
 
-#: ../src/cairo-dock-menu.c:359
+#: ../src/cairo-dock-menu.c:379
 msgid "Delete this dock"
 msgstr ""
 
-#: ../src/cairo-dock-menu.c:368
+#: ../src/cairo-dock-menu.c:388
 msgid "Manage themes"
 msgstr "إدارة الثيمات"
 
-#: ../src/cairo-dock-menu.c:373
+#: ../src/cairo-dock-menu.c:393
 msgid ""
 "Choose from amongst many themes on the server or save your current theme."
 msgstr "اختر من العديد من السمات في الخادم او حفظ السمة الخاصة بك ."
 
-#: ../src/cairo-dock-menu.c:379
+#: ../src/cairo-dock-menu.c:399
 msgid "Unlock icons"
 msgstr "فتح الايقونات"
 
-#: ../src/cairo-dock-menu.c:379
+#: ../src/cairo-dock-menu.c:399
 msgid "Lock icons"
 msgstr "قفل الايقونات"
 
-#: ../src/cairo-dock-menu.c:383
+#: ../src/cairo-dock-menu.c:403
 msgid "This will (un)lock the position of the icons."
 msgstr "هذا سيلغي قفل مكان الأيقونات."
 
-#: ../src/cairo-dock-menu.c:387
+#: ../src/cairo-dock-menu.c:407
 msgid "Unlock dock"
 msgstr "إالغاء قفل الشريط"
 
-#: ../src/cairo-dock-menu.c:387
+#: ../src/cairo-dock-menu.c:407
 msgid "Lock dock"
 msgstr "قفل الشريط"
 
-#: ../src/cairo-dock-menu.c:392
-msgid "This will (un)lock the whole dock."
-msgstr "هذا سيلغي قفل كامل الشريط."
-
-#: ../src/cairo-dock-menu.c:397
+#: ../src/cairo-dock-menu.c:414
+msgid ""
+"This will allow you to add or remove launchers and applets, and configure "
+"the program."
+msgstr ""
+
+#: ../src/cairo-dock-menu.c:418
+msgid ""
+"This will prevent any modification of the current theme, and hide all the "
+"unnecessary entries in the menus."
+msgstr ""
+
+#: ../src/cairo-dock-menu.c:424
 msgid "Quick-Hide"
 msgstr "إخفاء سريع"
 
-#: ../src/cairo-dock-menu.c:402
+#: ../src/cairo-dock-menu.c:429
 msgid "This will hide the dock until you hover over it with the mouse."
 msgstr "سيختفي الشريط حتى تقوم بتمرير المؤشر عليه"
 
-#: ../src/cairo-dock-menu.c:410
+#: ../src/cairo-dock-menu.c:437
 msgid "Launch Cairo-Dock on startup"
 msgstr "تشغيل شريط كيرو عند بدء التشغيل"
 
-#: ../src/cairo-dock-menu.c:420
-msgid "Get more applets!"
-msgstr "الحصول على مزيد من التطبيقات!"
-
-#: ../src/cairo-dock-menu.c:425
+#: ../src/cairo-dock-menu.c:452
 msgid ""
 "Third-party applets provide integration with many programs, like Pidgin"
 msgstr ""
 
-#: ../src/cairo-dock-menu.c:427 ../src/help/applet-init.c:28
-#: ../src/help/applet-notifications.c:65
-msgid "Help"
-msgstr "مساعدة"
-
-#: ../src/cairo-dock-menu.c:432
+#: ../src/cairo-dock-menu.c:459
 msgid "There are no problems, only solutions (and a lot of useful hints!)"
 msgstr "لا يوجد مشاكل، فقط حلول (والعديد من التلميحات المفيده!)"
 
-#: ../src/cairo-dock-menu.c:434
+#: ../src/cairo-dock-menu.c:461
 msgid "About"
 msgstr "حول"
 
-#: ../src/cairo-dock-menu.c:442
+#: ../src/cairo-dock-menu.c:469
 msgid "Quit"
 msgstr "خروج"
 
-#: ../src/cairo-dock-menu.c:467
+#: ../src/cairo-dock-menu.c:494
 msgid "separator"
 msgstr "فاصل"
 
-#: ../src/cairo-dock-menu.c:471
+#: ../src/cairo-dock-menu.c:498
 #, c-format
 msgid "You're about to remove this icon (%s) from the dock. Are you sure?"
 msgstr "انت على وشك ازالة الأيقون  (%s)من الشريط. هل انت متأكد؟"
 
-#: ../src/cairo-dock-menu.c:482
+#: ../src/cairo-dock-menu.c:509
 msgid ""
 "Do you want to re-dispatch the icons contained inside this container into "
 "the dock?\n"
 "(otherwise they will be destroyed)"
 msgstr ""
 
-#: ../src/cairo-dock-menu.c:554
+#: ../src/cairo-dock-menu.c:577
 msgid ""
 "The new dock has been created.\n"
 "Now move some launchers or applets into it by right-clicking on the icon -> "
 "move to another dock"
 msgstr ""
 
-#: ../src/cairo-dock-menu.c:576
+#: ../src/cairo-dock-menu.c:611
 msgid "Sorry, this icon doesn't have a configuration file."
 msgstr "عذرا ، هذا الايقون لا يملك  ملف التكوين."
 
-#: ../src/cairo-dock-menu.c:620
+#: ../src/cairo-dock-menu.c:651
 msgid ""
 "The new dock has been created.\n"
 "You can customize it by right-clicking on it -> cairo-dock -> configure this "
 "dock."
 msgstr ""
 
-#: ../src/cairo-dock-menu.c:681
+#: ../src/cairo-dock-menu.c:712
 #, c-format
 msgid "You're about to remove this applet (%s) from the dock. Are you sure?"
 msgstr "انت على وشك ازالة الاضافة  (%s)من الشريط . هل انت متأكد ؟"
 
-#: ../src/cairo-dock-menu.c:903
+#: ../src/cairo-dock-menu.c:934
 msgid ""
 "Sorry, couldn't find the corresponding description file.\n"
 "Consider dragging and dropping the launcher from the Applications Menu."
@@ -501,235 +528,337 @@
 "عفوا, لم يتم العثور على الملف المطابق.\n"
 "حاول سحب المشغل وإفلاته من قائمه التطبيقات."
 
-#: ../src/cairo-dock-menu.c:1138
+#: ../src/cairo-dock-menu.c:1169
 #, c-format
 msgid "Move all to desktop %d - face %d"
 msgstr "أنقل الكل إلى سطح المكتب %d - الوجه %d"
 
-#: ../src/cairo-dock-menu.c:1138
+#: ../src/cairo-dock-menu.c:1169
 #, c-format
 msgid "Move to desktop %d - face %d"
 msgstr "أنقل إلى سطح المكتب %d - الوجه %d"
 
-#: ../src/cairo-dock-menu.c:1140
+#: ../src/cairo-dock-menu.c:1171
 #, c-format
 msgid "Move all to desktop %d"
 msgstr "نقل الكل الى سطح المكتب %d"
 
-#: ../src/cairo-dock-menu.c:1140
+#: ../src/cairo-dock-menu.c:1171
 #, c-format
 msgid "Move to desktop %d"
 msgstr "أنقل إلى سطح المكتب %d"
 
-#: ../src/cairo-dock-menu.c:1142
+#: ../src/cairo-dock-menu.c:1173
 #, c-format
 msgid "Move all to face %d"
 msgstr "أنقل الكل إلى الوجه %d"
 
-#: ../src/cairo-dock-menu.c:1142
+#: ../src/cairo-dock-menu.c:1173
 #, c-format
 msgid "Move to face %d"
 msgstr "أنقل إلى الوجه %d"
 
-#: ../src/cairo-dock-menu.c:1180
+#: ../src/cairo-dock-menu.c:1211
 msgid "Add"
 msgstr "أضف"
 
-#: ../src/cairo-dock-menu.c:1185
+#: ../src/cairo-dock-menu.c:1213
 msgid "Sub-dock"
 msgstr ""
 
-#: ../src/cairo-dock-menu.c:1187
+#: ../src/cairo-dock-menu.c:1215
 msgid "Main dock"
 msgstr ""
 
-#: ../src/cairo-dock-menu.c:1190
+#: ../src/cairo-dock-menu.c:1218
 msgid "Separator"
 msgstr ""
 
-#: ../src/cairo-dock-menu.c:1194
+#: ../src/cairo-dock-menu.c:1222
 msgid "Custom launcher"
 msgstr ""
 
-#: ../src/cairo-dock-menu.c:1195
+#: ../src/cairo-dock-menu.c:1223
 msgid ""
 "Usually you would drag a launcher from the menu and drop it on the dock."
 msgstr "يتوجب في العاده سحب المشغل من القائمه وإفلاته على الشريط."
 
-#: ../src/cairo-dock-menu.c:1259
+#: ../src/cairo-dock-menu.c:1288
 msgid "Modify this separator"
 msgstr "تحرير الفاصل"
 
-#: ../src/cairo-dock-menu.c:1259
+#: ../src/cairo-dock-menu.c:1288
 msgid "Modify this launcher"
 msgstr "تعديل هذا المشغل"
 
-#: ../src/cairo-dock-menu.c:1261
+#: ../src/cairo-dock-menu.c:1290
 msgid "Remove this separator"
 msgstr "إزالة هذا الفاصل"
 
-#: ../src/cairo-dock-menu.c:1261
+#: ../src/cairo-dock-menu.c:1290
 msgid "Remove this launcher"
 msgstr "إزالة هذا المشغل"
 
-#: ../src/cairo-dock-menu.c:1262
+#: ../src/cairo-dock-menu.c:1291
 msgid ""
 "You can remove a launcher by dragging it out of the dock with the mouse ."
 msgstr "بإمكانك ازاله احد المشغلات بسحبه خارج الشريط بالمؤشر."
 
-#: ../src/cairo-dock-menu.c:1264 ../src/cairo-dock-menu.c:1443
+#: ../src/cairo-dock-menu.c:1293 ../src/cairo-dock-menu.c:1472
 msgid "Move to another dock"
 msgstr "نقل الى شريط اخر"
 
-#: ../src/cairo-dock-menu.c:1269 ../src/cairo-dock-menu.c:1448
-#: ../src/gldit/cairo-dock-gui-factory.c:1110
+#: ../src/cairo-dock-menu.c:1298 ../src/cairo-dock-menu.c:1477
+#: ../src/gldit/cairo-dock-gui-factory.c:1104
 msgid "New main dock"
 msgstr "شريط رئيسي جديد"
 
-#: ../src/cairo-dock-menu.c:1289 ../src/cairo-dock-menu.c:1387
+#: ../src/cairo-dock-menu.c:1318 ../src/cairo-dock-menu.c:1416
 msgid "Other actions"
 msgstr "خيارات أخرى"
 
-#: ../src/cairo-dock-menu.c:1295
+#: ../src/cairo-dock-menu.c:1324
 msgid "Move to this desktop"
 msgstr "نقل إالى سطح المكتب هذا"
 
-#: ../src/cairo-dock-menu.c:1310
+#: ../src/cairo-dock-menu.c:1339
 msgid "Not Fullscreen"
 msgstr "ليس ملء"
 
-#: ../src/cairo-dock-menu.c:1310
+#: ../src/cairo-dock-menu.c:1339
 msgid "Fullscreen"
 msgstr "ملء الشاشة"
 
-#: ../src/cairo-dock-menu.c:1314
+#: ../src/cairo-dock-menu.c:1343
 msgid "Don't keep above"
 msgstr "ﻻ تجعله في الاعلى"
 
-#: ../src/cairo-dock-menu.c:1314 ../data/messages:371
+#: ../src/cairo-dock-menu.c:1343 ../data/messages:363
 msgid "Keep above"
 msgstr "أبقها في الأعلى"
 
-#: ../src/cairo-dock-menu.c:1339
+#: ../src/cairo-dock-menu.c:1368
 msgid "Remove custom icon"
 msgstr "إزاله الايقونه المعدله"
 
-#: ../src/cairo-dock-menu.c:1343
+#: ../src/cairo-dock-menu.c:1372
 msgid "Set a custom icon"
 msgstr ""
 
-#: ../src/cairo-dock-menu.c:1346
+#: ../src/cairo-dock-menu.c:1375
 msgid "Kill"
 msgstr "اقتل"
 
-#: ../src/cairo-dock-menu.c:1351
+#: ../src/cairo-dock-menu.c:1380
 msgid "Make it a launcher"
 msgstr "تحويله الى مشغل"
 
-#: ../src/cairo-dock-menu.c:1354 ../src/cairo-dock-menu.c:1397
+#: ../src/cairo-dock-menu.c:1383 ../src/cairo-dock-menu.c:1426
 msgid "Launch a new (Shift+clic)"
 msgstr "تشغيل جديد (Shift+أنقر)"
 
-#: ../src/cairo-dock-menu.c:1356
+#: ../src/cairo-dock-menu.c:1385
 msgid "Show"
 msgstr "اظهر"
 
-#: ../src/cairo-dock-menu.c:1358
+#: ../src/cairo-dock-menu.c:1387
 msgid "Unmaximise"
 msgstr "غير مكبر"
 
-#: ../src/cairo-dock-menu.c:1358
+#: ../src/cairo-dock-menu.c:1387
 msgid "Maximise"
 msgstr "تكبير"
 
-#: ../src/cairo-dock-menu.c:1363 ../src/cairo-dock-menu.c:1365
+#: ../src/cairo-dock-menu.c:1392 ../src/cairo-dock-menu.c:1394
 msgid "Minimise"
 msgstr "تصغير"
 
-#: ../src/cairo-dock-menu.c:1363 ../src/cairo-dock-menu.c:1371
-#: ../src/help/applet-notifications.c:59
+#: ../src/cairo-dock-menu.c:1392 ../src/cairo-dock-menu.c:1400
+#: ../src/help/applet-notifications.c:218
 msgid "middle-click"
 msgstr ""
 
-#: ../src/cairo-dock-menu.c:1371 ../src/cairo-dock-menu.c:1373
-#: ../data/messages:739
+#: ../src/cairo-dock-menu.c:1400 ../src/cairo-dock-menu.c:1402
+#: ../data/messages:731
 msgid "Close"
 msgstr ""
 
-#: ../src/cairo-dock-menu.c:1393
+#: ../src/cairo-dock-menu.c:1422
 msgid "Move all to this desktop"
 msgstr "نقل الكل لسطح المكتب هذا"
 
-#: ../src/cairo-dock-menu.c:1399
+#: ../src/cairo-dock-menu.c:1428
 msgid "Show all"
 msgstr "إظهار الكل"
 
-#: ../src/cairo-dock-menu.c:1401
+#: ../src/cairo-dock-menu.c:1430
 msgid "Minimise all"
 msgstr "تصغير الكل"
 
-#: ../src/cairo-dock-menu.c:1403
+#: ../src/cairo-dock-menu.c:1432
 msgid "Close all"
 msgstr "إغلاق الكل"
 
-#: ../src/cairo-dock-menu.c:1431
+#: ../src/cairo-dock-menu.c:1460
 msgid "Detach this applet"
 msgstr ""
 
-#: ../src/cairo-dock-menu.c:1431
+#: ../src/cairo-dock-menu.c:1460
 msgid "Return to the dock"
 msgstr "عوده الى الشريط"
 
-#: ../src/cairo-dock-menu.c:1434
+#: ../src/cairo-dock-menu.c:1463
 msgid "Remove this applet"
 msgstr "حذف الاضافة"
 
-#: ../src/cairo-dock-menu.c:1438
+#: ../src/cairo-dock-menu.c:1467
 msgid "Launch another instance of this applet"
 msgstr ""
 
-#: ../src/cairo-dock-menu.c:1482 ../data/messages:369
+#: ../src/cairo-dock-menu.c:1502 ../data/messages:361
 msgid "Normal"
 msgstr "عادي"
 
-#: ../src/cairo-dock-menu.c:1488 ../data/messages:435 ../data/messages:603
-#: ../data/messages:1325
+#: ../src/cairo-dock-menu.c:1508 ../data/messages:427 ../data/messages:595
+#: ../data/messages:1643
 msgid "Always on top"
 msgstr "دائما في الأعلى"
 
-#: ../src/cairo-dock-menu.c:1495
+#: ../src/cairo-dock-menu.c:1515
 msgid "Always below"
 msgstr "دئما ادنى"
 
-#: ../src/cairo-dock-menu.c:1513 ../data/messages:377
+#: ../src/cairo-dock-menu.c:1533 ../data/messages:369
 msgid "Reserve space"
 msgstr "الإحتفاظ بالمسافه"
 
-#: ../src/cairo-dock-menu.c:1520
+#: ../src/cairo-dock-menu.c:1540
 msgid "On all desktops"
 msgstr "على كل سطوح المكتب"
 
-#: ../src/cairo-dock-menu.c:1526
+#: ../src/cairo-dock-menu.c:1546
 msgid "Lock position"
 msgstr "قفل التحريك"
 
-#: ../src/cairo-dock-user-interaction.c:402
+#: ../src/cairo-dock-user-interaction.c:405
 msgid ""
 "The option 'overwrite X icons' has been automatically enabled in the "
 "config.\n"
 "It is located in the 'Taskbar' module."
 msgstr ""
 
-#: ../src/cairo-dock.c:150
+#: ../src/cairo-dock.c:148
 #, c-format
 msgid "Happy new year %d !!!"
 msgstr ""
 
-#: ../src/cairo-dock.c:468
+#: ../src/cairo-dock.c:317
+msgid "Use Cairo backend."
+msgstr ""
+
+#: ../src/cairo-dock.c:320
+msgid "Use OpenGL backend."
+msgstr ""
+
+#: ../src/cairo-dock.c:324
+msgid ""
+"Force Glitz backend (hardware acceleration for cairo, needs a glitz-enabled "
+"libcairo)."
+msgstr ""
+
+#: ../src/cairo-dock.c:328
+msgid ""
+"Use OpenGL backend with indirect rendering. There are very few case where "
+"this option should be used."
+msgstr ""
+
+#: ../src/cairo-dock.c:331
+msgid "Force the dock to consider this environnement - use it with care."
+msgstr ""
+
+#: ../src/cairo-dock.c:334
+msgid ""
+"Force the dock to load from this directory, instead of ~/.config/cairo-dock."
+msgstr ""
+
+#: ../src/cairo-dock.c:337
+msgid ""
+"Address of a server containing additional themes. This will overwrite the "
+"default server address."
+msgstr ""
+
+#: ../src/cairo-dock.c:340
+msgid ""
+"Wait for N seconds before starting; this is useful if you notice some "
+"problems when the dock starts with the session."
+msgstr ""
+
+#: ../src/cairo-dock.c:343
+msgid ""
+"Allow to edit the config before the dock is started and show the config "
+"panel on start."
+msgstr ""
+
+#: ../src/cairo-dock.c:346
+msgid "Exclude a given plug-in from activating (it is still loaded though)."
+msgstr ""
+
+#: ../src/cairo-dock.c:349
+msgid "Don't load any plug-ins."
+msgstr ""
+
+#: ../src/cairo-dock.c:352
+msgid ""
+"Log verbosity (debug,message,warning,critical,error); default is warning."
+msgstr ""
+
+#: ../src/cairo-dock.c:355
+msgid "Force to display some output messages with colors."
+msgstr ""
+
+#: ../src/cairo-dock.c:358
+msgid "Print version and quit."
+msgstr ""
+
+#: ../src/cairo-dock.c:361
+msgid "Lock the dock so that any modification is impossible for users."
+msgstr ""
+
+#: ../src/cairo-dock.c:365
+msgid "Keep the dock above other windows whatever."
+msgstr ""
+
+#: ../src/cairo-dock.c:368
+msgid "Don't make the dock appear on all desktops."
+msgstr ""
+
+#: ../src/cairo-dock.c:371
+msgid "Cairo-Dock makes anything, including coffee !"
+msgstr ""
+
+#: ../src/cairo-dock.c:374
+msgid ""
+"Ask the dock to load additionnal modules contained in this directory (though "
+"it is unsafe for your dock to load unnofficial modules)."
+msgstr ""
+
+#: ../src/cairo-dock.c:377
+msgid ""
+"For debugging purpose only. The crash manager will not be started to hunt "
+"down the bugs."
+msgstr ""
+
+#: ../src/cairo-dock.c:380
+msgid ""
+"For debugging purpose only. Some hidden and still unstable options will be "
+"activated."
+msgstr ""
+
+#: ../src/cairo-dock.c:499
 msgid "Use OpenGL in Cairo-Dock"
 msgstr "استخدام OpenGL في شريط كيرو"
 
-#: ../src/cairo-dock.c:476
+#: ../src/cairo-dock.c:507
 msgid ""
 "OpenGL allows you to use the hardware acceleration, reducing the CPU load to "
 "the minimum.\n"
@@ -741,11 +870,11 @@
 "  or with the -o option to force OpenGL and -c to force cairo.)"
 msgstr ""
 
-#: ../src/cairo-dock.c:481
+#: ../src/cairo-dock.c:512
 msgid "Remember this choice"
 msgstr "تذكر هذا الاختيار"
 
-#: ../src/cairo-dock.c:732
+#: ../src/cairo-dock.c:749
 #, c-format
 msgid ""
 "The module '%s' may have encountered a problem.\n"
@@ -753,7 +882,7 @@
 "at http://glx-dock.org"
 msgstr ""
 
-#: ../src/gldit/cairo-dock-applet-facility.h:276
+#: ../src/gldit/cairo-dock-applet-facility.h:277
 msgid ""
 "The theme could not be found; the default theme will be used instead.\n"
 " You can change this by opening the configuration of this module. Do you "
@@ -762,7 +891,7 @@
 "ﻻ يمكن العثور على السِّمَةُ . سوف تكون السِّمَةُ الافتراضية مفعله .\n"
 "يمكنك تغيير ذلك عن طريق فتح تكوين هذه الوحدة. هل تريد أن تفعل ذلك الآن؟"
 
-#: ../src/gldit/cairo-dock-applet-facility.h:291
+#: ../src/gldit/cairo-dock-applet-facility.h:292
 msgid ""
 "The gauge theme could not be found; a default gauge will be used instead.\n"
 "You can change this by opening the configuration of this module. Do you want "
@@ -771,7 +900,7 @@
 "ﻻ يمكن العثور على السِّمَةُ  القياسية. سوف يكون القياس الافتراضية مفعله .\n"
 "يمكنك تغيير ذلك عن طريق فتح تكوين هذه الوحدة. هل تريد أن تفعل ذلك الآن؟"
 
-#: ../src/gldit/cairo-dock-applet-facility.h:373
+#: ../src/gldit/cairo-dock-applet-facility.h:374
 msgid "Applet's handbook"
 msgstr ""
 
@@ -809,44 +938,39 @@
 msgstr ""
 
 #: ../src/gldit/cairo-dock-gui-factory.c:259
-#: ../src/gldit/cairo-dock-gui-factory.c:1507
 msgid "Local"
 msgstr "محلِّي"
 
 #: ../src/gldit/cairo-dock-gui-factory.c:260
-#: ../src/gldit/cairo-dock-gui-factory.c:1510
 msgid "User"
 msgstr "مستخدم"
 
 #: ../src/gldit/cairo-dock-gui-factory.c:261
-#: ../src/gldit/cairo-dock-gui-factory.c:1513
 msgid "Net"
 msgstr "شبكة"
 
 #: ../src/gldit/cairo-dock-gui-factory.c:262
-#: ../src/gldit/cairo-dock-gui-factory.c:1516
 msgid "New"
 msgstr "جديد"
 
 #: ../src/gldit/cairo-dock-gui-factory.c:263
-#: ../src/gldit/cairo-dock-gui-factory.c:1520
 msgid "Updated"
 msgstr "محدث"
 
-#: ../src/gldit/cairo-dock-gui-factory.c:989
+#: ../src/gldit/cairo-dock-gui-factory.c:983
 msgid "_Custom Icons_"
 msgstr "_ايقونه معدله_"
 
-#: ../src/gldit/cairo-dock-gui-factory.c:1332
+#: ../src/gldit/cairo-dock-gui-factory.c:1347
 msgid "Rate me"
 msgstr ""
 
-#: ../src/gldit/cairo-dock-gui-factory.c:1431
-#: ../src/gldit/cairo-dock-gui-factory.c:1433
+#: ../src/gldit/cairo-dock-gui-factory.c:1446
+#: ../src/gldit/cairo-dock-gui-factory.c:1448
 msgid "You must try the theme before you can rate it."
 msgstr "يتوجب عليك تجربة السمة قبل تقيمها"
 
-#: ../src/gldit/cairo-dock-gui-factory.c:1456
+#: ../src/gldit/cairo-dock-gui-factory.c:1471
 #, c-format
 msgid ""
 "The '%s' module was not found.\n"
@@ -856,7 +980,7 @@
 "الـــــ '%s' لم يتم العثور علىالوحدة .\n"
 "يجب التأكد من تثبت الاصدار المتوافق مع الشريط لتمتع بهذه المزايا ."
 
-#: ../src/gldit/cairo-dock-gui-factory.c:1465
+#: ../src/gldit/cairo-dock-gui-factory.c:1480
 #, c-format
 msgid ""
 "The '%s' plug-in is not active.\n"
@@ -865,29 +989,29 @@
 "الإضافة '%s' غير مفعله.\n"
 "هل تريد تفعليها الآن ؟"
 
-#: ../src/gldit/cairo-dock-gui-factory.c:2331
-#: ../src/gldit/cairo-dock-gui-factory.c:2918
+#: ../src/gldit/cairo-dock-gui-factory.c:2252
+#: ../src/gldit/cairo-dock-gui-factory.c:2831
 #, c-format
 msgid "Listing themes in '%s' ..."
 msgstr "قائمة السمات في '%s' ..."
 
-#: ../src/gldit/cairo-dock-gui-factory.c:2848
+#: ../src/gldit/cairo-dock-gui-factory.c:2769
 msgid "Theme"
 msgstr "سِمة"
 
-#: ../src/gldit/cairo-dock-gui-factory.c:2861
+#: ../src/gldit/cairo-dock-gui-factory.c:2782
 msgid "Rating"
 msgstr "تقييم"
 
-#: ../src/gldit/cairo-dock-gui-factory.c:2867
+#: ../src/gldit/cairo-dock-gui-factory.c:2788
 msgid "Sobriety"
 msgstr ""
 
-#: ../src/gldit/cairo-dock-gui-factory.c:2944
+#: ../src/gldit/cairo-dock-gui-factory.c:2857
 msgid "link"
 msgstr "رابط"
 
-#: ../src/gldit/cairo-dock-gui-factory.c:2997
+#: ../src/gldit/cairo-dock-gui-factory.c:2910
 msgid "Grab"
 msgstr "التقاط"
 
@@ -961,65 +1085,72 @@
 "page."
 msgstr ""
 
-#: ../src/help/applet-init.c:31
-msgid ""
-"This applet is made to help you.\n"
-"Click on its icon to pop up useful tips about the possibilities of Cairo-"
-"Dock.\n"
-"Middle-click to open the configuration window.\n"
-"Right-click to access some troubleshooting actions."
+#: ../src/help/applet-notifications.c:169
+msgid "Unity is already disabled."
 msgstr ""
 
-#: ../src/help/applet-notifications.c:59
+#: ../src/help/applet-notifications.c:218
 msgid "Open global settings"
 msgstr ""
 
-#: ../src/help/applet-notifications.c:64
+#: ../src/help/applet-notifications.c:223
 msgid "Activate composite"
 msgstr ""
 
-#: ../src/help/applet-tips-dialog.c:152
-msgid "Tips and Tricks"
-msgstr ""
-
-#: ../src/help/applet-tips-dialog.c:299
-msgid "Category"
-msgstr ""
-
-#: ../src/implementations/cairo-dock-hiding-effect.c:602 ../data/messages:453
-#: ../data/messages:621
+#: ../src/help/applet-notifications.c:225
+msgid "Disable the gnome-panel"
+msgstr ""
+
+#: ../src/help/applet-notifications.c:227
+msgid "Disable Unity"
+msgstr ""
+
+#: ../src/help/applet-notifications.c:229
+msgid "Online help"
+msgstr ""
+
+#: ../src/icon-factory/cairo-dock-desktop-file-factory.c:128
+msgid "Enter a command"
+msgstr ""
+
+#: ../src/icon-factory/cairo-dock-desktop-file-factory.c:129
+msgid "New launcher"
+msgstr ""
+
+#: ../src/implementations/cairo-dock-hiding-effect.c:602 ../data/messages:445
+#: ../data/messages:613
 msgid "Move down"
 msgstr "تحريك للأسفل"
 
-#: ../src/implementations/cairo-dock-hiding-effect.c:610 ../data/messages:455
-#: ../data/messages:623
+#: ../src/implementations/cairo-dock-hiding-effect.c:610 ../data/messages:447
+#: ../data/messages:615
 msgid "Fade out"
 msgstr "تلاشي"
 
-#: ../src/implementations/cairo-dock-hiding-effect.c:618 ../data/messages:457
-#: ../data/messages:625
+#: ../src/implementations/cairo-dock-hiding-effect.c:618 ../data/messages:449
+#: ../data/messages:617
 msgid "Semi transparent"
 msgstr "شبه شفاف"
 
-#: ../src/implementations/cairo-dock-hiding-effect.c:627 ../data/messages:459
-#: ../data/messages:627
+#: ../src/implementations/cairo-dock-hiding-effect.c:627 ../data/messages:451
+#: ../data/messages:619
 msgid "Zoom out"
 msgstr "تصغير"
 
-#: ../src/implementations/cairo-dock-hiding-effect.c:635 ../data/messages:461
-#: ../data/messages:629
+#: ../src/implementations/cairo-dock-hiding-effect.c:635 ../data/messages:453
+#: ../data/messages:621
 msgid "Folding"
 msgstr "ثني"
 
-#: ../data/messages:1
+#: ../data/messages:1 ../data/messages:1283
 msgid "General"
 msgstr ""
 
-#: ../data/messages:3
+#: ../data/messages:3 ../data/messages:1285
 msgid "Using the dock"
 msgstr ""
 
-#: ../data/messages:5
+#: ../data/messages:5 ../data/messages:1287
 msgid ""
 "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-"
@@ -1028,11 +1159,11 @@
 "sould be on middle-click."
 msgstr ""
 
-#: ../data/messages:7
+#: ../data/messages:7 ../data/messages:1289
 msgid "Adding features"
 msgstr ""
 
-#: ../data/messages:9
+#: ../data/messages:9 ../data/messages:1291
 msgid ""
 "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.\n"
@@ -1043,11 +1174,11 @@
 "and then just drag-and-drop the link of an applet into your dock."
 msgstr ""
 
-#: ../data/messages:13
+#: ../data/messages:13 ../data/messages:1295
 msgid "Adding a launcher"
 msgstr ""
 
-#: ../data/messages:15
+#: ../data/messages:15 ../data/messages:1297
 msgid ""
 "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.\n"
@@ -1055,21 +1186,21 @@
 "its icon and select \"make it a launcher\"."
 msgstr ""
 
-#: ../data/messages:17
+#: ../data/messages:17 ../data/messages:1299
 msgid "Removing a launcher"
 msgstr ""
 
-#: ../data/messages:19
+#: ../data/messages:19 ../data/messages:1301
 msgid ""
 "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."
 msgstr ""
 
-#: ../data/messages:21
+#: ../data/messages:21 ../data/messages:1303
 msgid "Grouping icons into a sub-dock"
 msgstr ""
 
-#: ../data/messages:23
+#: ../data/messages:23 ../data/messages:1305
 msgid ""
 "You can group icons into a \"sub-dock\".\n"
 "To add a sub-dock, right-click on the dock -> add -> a sub-dock.\n"
@@ -1077,11 +1208,11 @@
 "dock -> select the sub-dock's name."
 msgstr ""
 
-#: ../data/messages:25
+#: ../data/messages:25 ../data/messages:1307
 msgid "Moving icons"
 msgstr ""
 
-#: ../data/messages:27
+#: ../data/messages:27 ../data/messages:1309
 msgid ""
 "You can drag any icon to a new location inside its dock.\n"
 "You can move an icon into another dock by right-clicking on it -> move to "
@@ -1090,7 +1221,7 @@
 "icon inside."
 msgstr ""
 
-#: ../data/messages:29
+#: ../data/messages:29 ../data/messages:1311
 msgid "Changing an icon's image"
 msgstr ""
 
@@ -1099,19 +1230,20 @@
 "For a launcher or an applet:\n"
 "Open the settings of the icon, and set a path to an image.\n"
 "- For an aplication icon:\n"
-"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\".\n"
+"Right-click on the icon -> \"Other actions\" -> \"set a custom icon\", and "
+"choose an image. To remove the custom image, right-click on the icon -> "
+"\"Other actions\" -> \"remove the custom icon\".\n"
+"\n"
 "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."
 msgstr ""
 
-#: ../data/messages:33
+#: ../data/messages:33 ../data/messages:1315
 msgid "Resizing icons"
 msgstr ""
 
-#: ../data/messages:35
+#: ../data/messages:35 ../data/messages:1317
 msgid ""
 "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 "
@@ -1122,11 +1254,11 @@
 "settings."
 msgstr ""
 
-#: ../data/messages:37
+#: ../data/messages:37 ../data/messages:1319
 msgid "Separating icons"
 msgstr ""
 
-#: ../data/messages:39
+#: ../data/messages:39 ../data/messages:1321
 msgid ""
 "You can add separators between icons by right-clicking on the dock -> add -> "
 "a separator.\n"
@@ -1136,11 +1268,11 @@
 "In the \"panel\" view, separators are represented as gap between icons."
 msgstr ""
 
-#: ../data/messages:43
+#: ../data/messages:43 ../data/messages:1325
 msgid "Using the dock as a taskbar"
 msgstr ""
 
-#: ../data/messages:45
+#: ../data/messages:45 ../data/messages:1327
 msgid ""
 "When an application is running, a corresponding icon will appear in the "
 "dock.\n"
@@ -1151,50 +1283,50 @@
 "the launcher, etc."
 msgstr ""
 
-#: ../data/messages:47
+#: ../data/messages:47 ../data/messages:1329
 msgid "Closing a window"
 msgstr ""
 
-#: ../data/messages:49
+#: ../data/messages:49 ../data/messages:1331
 msgid ""
 "You can close a window by middle-clicking on its icon (or from the menu)."
 msgstr ""
 
-#: ../data/messages:51
+#: ../data/messages:51 ../data/messages:1333
 msgid "Minimizing / restauring a window"
 msgstr ""
 
-#: ../data/messages:53
+#: ../data/messages:53 ../data/messages:1335
 msgid ""
 "Clicking on its icon will bring the window on top.\n"
 "When the window has the focus, clicking on its icon will minimize the window."
 msgstr ""
 
-#: ../data/messages:55
+#: ../data/messages:55 ../data/messages:1337
 msgid "Launching an application several times"
 msgstr ""
 
-#: ../data/messages:57
+#: ../data/messages:57 ../data/messages:1339
 msgid ""
 "You can launch an application several times by SHIFT+clicking on its icon "
 "(or from the menu)."
 msgstr ""
 
-#: ../data/messages:59
+#: ../data/messages:59 ../data/messages:1341
 msgid "Switching between the windows of a same application"
 msgstr ""
 
-#: ../data/messages:61
+#: ../data/messages:61 ../data/messages:1343
 msgid ""
 "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."
 msgstr ""
 
-#: ../data/messages:63
+#: ../data/messages:63 ../data/messages:1345
 msgid "Grouping windows of a given application"
 msgstr ""
 
-#: ../data/messages:65
+#: ../data/messages:65 ../data/messages:1347
 msgid ""
 "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.\n"
@@ -1202,19 +1334,19 @@
 "side-by-side (if your Window Manager is able to do that)."
 msgstr ""
 
-#: ../data/messages:67
+#: ../data/messages:67 ../data/messages:1349
 msgid "Setting a custom icon for an application"
 msgstr ""
 
-#: ../data/messages:69
+#: ../data/messages:69 ../data/messages:1351
 msgid "See \"Changing an icon's image\" in the \"Icons\" category."
 msgstr ""
 
-#: ../data/messages:71
+#: ../data/messages:71 ../data/messages:1353
 msgid "Showing windows preview over the icons"
 msgstr ""
 
-#: ../data/messages:73
+#: ../data/messages:73 ../data/messages:1355
 msgid ""
 "You need to run Compiz, and enable the \"Window Preview\" plug-in in Compiz. "
 "Install \"ccsm\" to be able to configure Compiz."
@@ -1222,24 +1354,26 @@
 
 #: ../data/messages:75 ../data/messages:197 ../data/messages:217
 #: ../data/messages:255 ../data/messages:297 ../data/messages:301
-#: ../data/messages:307 ../data/messages:311 ../data/messages:315
-#: ../data/messages:319
+#: ../data/messages:307 ../data/messages:311 ../data/messages:1357
+#: ../data/messages:1479 ../data/messages:1499 ../data/messages:1537
+#: ../data/messages:1579 ../data/messages:1583 ../data/messages:1589
+#: ../data/messages:1593 ../data/messages:1597 ../data/messages:1601
 msgid "Tip: If this line is grayed, it's because this tip is not for you.)"
 msgstr ""
 
-#: ../data/messages:77
+#: ../data/messages:77 ../data/messages:1359
 msgid "If you're using Compiz, you can click on this button:"
 msgstr ""
 
-#: ../data/messages:79
+#: ../data/messages:79 ../data/messages:1361
 msgid "Docks"
 msgstr ""
 
-#: ../data/messages:81
+#: ../data/messages:81 ../data/messages:1363
 msgid "Positionning the dock on the screen"
 msgstr ""
 
-#: ../data/messages:83
+#: ../data/messages:83 ../data/messages:1365
 msgid ""
 "The dock can be placed anywhere on the screen.\n"
 "In the case of the main dock, right-click -> Cairo-Dock -> configure, and "
@@ -1248,11 +1382,11 @@
 "dock, and then select the position you want."
 msgstr ""
 
-#: ../data/messages:85
+#: ../data/messages:85 ../data/messages:1367
 msgid "Hiding the dock to use all the screen"
 msgstr ""
 
-#: ../data/messages:87
+#: ../data/messages:87 ../data/messages:1369
 msgid ""
 "The dock can hide itself to let all the screen for applications. But it can "
 "also be always visible like a panel.\n"
@@ -1262,38 +1396,39 @@
 "dock, and then select the visibility you want."
 msgstr ""
 
-#: ../data/messages:89
+#: ../data/messages:89 ../data/messages:1371
 msgid "Having more than one dock"
 msgstr ""
 
 #: ../data/messages:91 ../data/messages:95 ../data/messages:99
+#: ../data/messages:1373 ../data/messages:1377 ../data/messages:1381
 msgid "TODO"
 msgstr ""
 
-#: ../data/messages:93
+#: ../data/messages:93 ../data/messages:1375
 msgid "Deleting a dock"
 msgstr ""
 
-#: ../data/messages:97
+#: ../data/messages:97 ../data/messages:1379
 msgid "Changing the look of a dock"
 msgstr ""
 
-#: ../data/messages:103
+#: ../data/messages:103 ../data/messages:1385
 msgid "Placing applets on your desktop"
 msgstr ""
 
-#: ../data/messages:105
+#: ../data/messages:105 ../data/messages:1387
 msgid ""
 "Applets can live inside desklets, which are small windows that can be placed "
 "wherever on your desktop.\n"
 "To detach an applet from the dock, simply drag and drop it outside the dock."
 msgstr ""
 
-#: ../data/messages:107
+#: ../data/messages:107 ../data/messages:1389
 msgid "Moving desklets"
 msgstr ""
 
-#: ../data/messages:109
+#: ../data/messages:109 ../data/messages:1391
 msgid ""
 "Desklets can be moved anywhere simply with the mouse.\n"
 "They can also be rotated by dragging the small arrows on the top and left "
@@ -1302,11 +1437,11 @@
 "clicking on it -> \"lock position\". To unlock it, de-select this option."
 msgstr ""
 
-#: ../data/messages:111
+#: ../data/messages:111 ../data/messages:1393
 msgid "Placing desklets"
 msgstr ""
 
-#: ../data/messages:113
+#: ../data/messages:113 ../data/messages:1395
 msgid ""
 "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 "
@@ -1317,26 +1452,26 @@
 "the small bottom-right button."
 msgstr ""
 
-#: ../data/messages:115
+#: ../data/messages:115 ../data/messages:1397
 msgid "Changing the desklets decorations"
 msgstr ""
 
-#: ../data/messages:117
+#: ../data/messages:117 ../data/messages:1399
 msgid ""
 "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)."
 msgstr ""
 
-#: ../data/messages:119
+#: ../data/messages:119 ../data/messages:1401
 msgid "Useful Features"
 msgstr ""
 
-#: ../data/messages:121
+#: ../data/messages:121 ../data/messages:1403
 msgid "Having a calendar with tasks"
 msgstr ""
 
-#: ../data/messages:123
+#: ../data/messages:123 ../data/messages:1405
 msgid ""
 "Activate the Clock applet.\n"
 "Clicking on it will display a calendar.\n"
@@ -1346,11 +1481,11 @@
 "(15mn before the event, and also 1 day before in the case of an anniversary)."
 msgstr ""
 
-#: ../data/messages:125
+#: ../data/messages:125 ../data/messages:1407
 msgid "Having a list of all windows"
 msgstr ""
 
-#: ../data/messages:127
+#: ../data/messages:127 ../data/messages:1409
 msgid ""
 "Activate the Switcher applet.\n"
 "Right-clicking on it will give you access to a list containing all the "
@@ -1360,43 +1495,43 @@
 "You can bind this action to the middle-click."
 msgstr ""
 
-#: ../data/messages:129
+#: ../data/messages:129 ../data/messages:1411
 msgid "Showing all the desktops"
 msgstr ""
 
-#: ../data/messages:131
+#: ../data/messages:131 ../data/messages:1413
 msgid ""
 "Activate either the Switcher applet or the Show-Desktop applet.\n"
 "Right-click on it -> \"show all the desktop\".\n"
 "You can bind this action to the middle-click."
 msgstr ""
 
-#: ../data/messages:133
+#: ../data/messages:133 ../data/messages:1415
 msgid "Changing the screen resolution"
 msgstr ""
 
-#: ../data/messages:135
+#: ../data/messages:135 ../data/messages:1417
 msgid ""
 "Activate the Show-Desktop applet.\n"
 "Right-click on it -> \"change resolution\" -> select the one you want."
 msgstr ""
 
-#: ../data/messages:137
+#: ../data/messages:137 ../data/messages:1419
 msgid "Locking your session"
 msgstr ""
 
-#: ../data/messages:139
+#: ../data/messages:139 ../data/messages:1421
 msgid ""
 "Activate the Log-out applet.\n"
 "Right-click on it -> \"lock screen\".\n"
 "You can bind this action to the middle-click."
 msgstr ""
 
-#: ../data/messages:141
+#: ../data/messages:141 ../data/messages:1423
 msgid "Quick-launching a program from keyboard (replacing ALT+F2)"
 msgstr ""
 
-#: ../data/messages:143
+#: ../data/messages:143 ../data/messages:1425
 msgid ""
 "Activate the Applications Menu applet.\n"
 "Middle-click on it, or right-click -> \"quick-launch\".\n"
@@ -1405,11 +1540,11 @@
 "completed into \"firefox\")."
 msgstr ""
 
-#: ../data/messages:145
+#: ../data/messages:145 ../data/messages:1427
 msgid "Turning Composite OFF during games"
 msgstr ""
 
-#: ../data/messages:147
+#: ../data/messages:147 ../data/messages:1429
 msgid ""
 "Activate the Composite Manager applet.\n"
 "Clicking on it will disable the Composite, which often makes games more "
@@ -1417,11 +1552,11 @@
 "Clicking again on it will enable the Composite."
 msgstr ""
 
-#: ../data/messages:149
+#: ../data/messages:149 ../data/messages:1431
 msgid "Seeing the hourly weather forecast"
 msgstr ""
 
-#: ../data/messages:151
+#: ../data/messages:151 ../data/messages:1433
 msgid ""
 "Activate the Weather applet.\n"
 "Open its settings, go to Configure, and type the name of your city. Press "
@@ -1431,11 +1566,11 @@
 "forecast for this day."
 msgstr ""
 
-#: ../data/messages:153
+#: ../data/messages:153 ../data/messages:1435
 msgid "Adding a file or a web page into the dock"
 msgstr ""
 
-#: ../data/messages:155
+#: ../data/messages:155 ../data/messages:1437
 msgid ""
 "Simply drag a file or an html link and drop it onto the dock (an animated "
 "arrow should appear when you can drop).\n"
@@ -1445,22 +1580,22 @@
 "directly."
 msgstr ""
 
-#: ../data/messages:157
+#: ../data/messages:157 ../data/messages:1439
 msgid "Importing a folder into the dock"
 msgstr ""
 
-#: ../data/messages:159
+#: ../data/messages:159 ../data/messages:1441
 msgid ""
 "Simply drag a folder and drop it onto the dock (an animated arrow should "
 "appear when you can drop).\n"
 "You can choose to import the folder's files or not."
 msgstr ""
 
-#: ../data/messages:161
+#: ../data/messages:161 ../data/messages:1443
 msgid "Accessing the recent events"
 msgstr ""
 
-#: ../data/messages:163
+#: ../data/messages:163 ../data/messages:1445
 msgid ""
 "Activate the Recent-Events applet.\n"
 "You need to have the Zeitgeist daemon to be running. Install it if it's not "
@@ -1470,11 +1605,11 @@
 "quickly."
 msgstr ""
 
-#: ../data/messages:165
+#: ../data/messages:165 ../data/messages:1447
 msgid "Quickly opening a recent file with a launcher"
 msgstr ""
 
-#: ../data/messages:167
+#: ../data/messages:167 ../data/messages:1449
 msgid ""
 "Activate the Recent-Events applet.\n"
 "You need to have the Zeitgeist daemon to be running. Install it if it's not "
@@ -1483,11 +1618,11 @@
 "opened with this launcher will appear in its menu."
 msgstr ""
 
-#: ../data/messages:169
+#: ../data/messages:169 ../data/messages:1451
 msgid "Accessing disks"
 msgstr ""
 
-#: ../data/messages:171
+#: ../data/messages:171 ../data/messages:1453
 msgid ""
 "Activate the Shortcuts applet.\n"
 "Then all the disks (including USB key or external hard drives) will be "
@@ -1495,7 +1630,7 @@
 "To unmount a disk before disconnecting it, middle-click on its icon."
 msgstr ""
 
-#: ../data/messages:173
+#: ../data/messages:173 ../data/messages:1455
 msgid "Accessing folder bookmarks"
 msgstr ""
 
@@ -1505,14 +1640,14 @@
 "Then all the folders bookmarks (the ones that appear in Nautilus) will be "
 "listed in a sub-dock.\n"
 "To add a bookmark, simply drag-and-drop a folder onto the applet's icon.\n"
-"To remove a boorkmark, right-click on its icon -> remove"
+"To remove a bookmark, right-click on its icon -> remove"
 msgstr ""
 
-#: ../data/messages:177
+#: ../data/messages:177 ../data/messages:1459
 msgid "Having multiple instances of an applet"
 msgstr ""
 
-#: ../data/messages:179
+#: ../data/messages:179 ../data/messages:1461
 msgid ""
 "Some applets can have several instances running at the same time: Clock, "
 "Stack, Weather, ...\n"
@@ -1522,22 +1657,22 @@
 "the weather in different cities."
 msgstr ""
 
-#: ../data/messages:181
+#: ../data/messages:181 ../data/messages:1463
 msgid "Adding / removing a desktop"
 msgstr ""
 
-#: ../data/messages:183
+#: ../data/messages:183 ../data/messages:1465
 msgid ""
 "Activate the Switcher applet.\n"
 "Right-click on it -> \"add a desktop\" or \"remove this desktop\".\n"
 "You can even name each of them."
 msgstr ""
 
-#: ../data/messages:185
+#: ../data/messages:185 ../data/messages:1467
 msgid "Controling the sound volume"
 msgstr ""
 
-#: ../data/messages:187
+#: ../data/messages:187 ../data/messages:1469
 msgid ""
 "Activate the Sound Volume applet.\n"
 "Then scroll up/down to increase/decrease the sound.\n"
@@ -1545,22 +1680,22 @@
 "Middle-click will mute/unmute."
 msgstr ""
 
-#: ../data/messages:189
+#: ../data/messages:189 ../data/messages:1471
 msgid "Controling the screen brightness"
 msgstr ""
 
-#: ../data/messages:191
+#: ../data/messages:191 ../data/messages:1473
 msgid ""
 "Activate the Screen Luminosity applet.\n"
 "Then scroll up/down to increase/decrease the brightness.\n"
 "Alternatively, you can click on the icon and move the scroll bar."
 msgstr ""
 
-#: ../data/messages:193
+#: ../data/messages:193 ../data/messages:1475
 msgid "Removing completely the gnome-panel"
 msgstr ""
 
-#: ../data/messages:195
+#: ../data/messages:195 ../data/messages:1477
 msgid ""
 "Open gconf-editor, edit the key "
 "/desktop/gnome/session/required_components/panel, and replace its content "
@@ -1569,43 +1704,43 @@
 "dock has been started (if not, you can add it to the startup programs)."
 msgstr ""
 
-#: ../data/messages:199
+#: ../data/messages:199 ../data/messages:1481
 msgid ""
 "If you are on Gnome, you can click on this button in order to automatically "
 "modify this key:"
 msgstr ""
 
-#: ../data/messages:201
+#: ../data/messages:201 ../data/messages:1483
 msgid "Troubleshooting"
 msgstr ""
 
-#: ../data/messages:203
+#: ../data/messages:203 ../data/messages:1485
 msgid "If you have any question, don't hesitate to ask on our forum."
 msgstr ""
 
-#: ../data/messages:205
+#: ../data/messages:205 ../data/messages:1487
 msgid "Forum"
 msgstr ""
 
-#: ../data/messages:207
+#: ../data/messages:207 ../data/messages:1489
 msgid "Our wiki can also help you, it is more complete on some points."
 msgstr ""
 
-#: ../data/messages:209
+#: ../data/messages:209 ../data/messages:1491
 msgid "Wiki"
 msgstr ""
 
-#: ../data/messages:211
+#: ../data/messages:211 ../data/messages:1493
 msgid "I have a black background around my dock."
 msgstr ""
 
-#: ../data/messages:213
+#: ../data/messages:213 ../data/messages:1495
 msgid ""
 "Hint : If you have an ATI or an Intel card, you should try without OpenGL "
 "first, because their drivers are not yet perfect."
 msgstr ""
 
-#: ../data/messages:215
+#: ../data/messages:215 ../data/messages:1497
 msgid ""
 "You need to turn on compositing. For instance, you can run Compiz or "
 "xcompmgr. \n"
@@ -1616,28 +1751,28 @@
 "'/apps/metacity/general/compositing_manager' and set it to 'true'."
 msgstr ""
 
-#: ../data/messages:219
+#: ../data/messages:219 ../data/messages:1501
 msgid ""
 "If you're on Gnome with Metacity (without Compiz), you can click on this "
 "button:"
 msgstr ""
 
-#: ../data/messages:221
+#: ../data/messages:221 ../data/messages:1503
 msgid "My machine is too old to run a composite manager."
 msgstr ""
 
-#: ../data/messages:223
+#: ../data/messages:223 ../data/messages:1505
 msgid ""
 "Don't panic, Cairo-Dock can emulate the transparency.\n"
 "To get rid of the black background, simply enable the corresponding option "
 "in the end of the «System» module"
 msgstr ""
 
-#: ../data/messages:225
+#: ../data/messages:225 ../data/messages:1507
 msgid "The dock is horribly slow when I move the mouse into it."
 msgstr ""
 
-#: ../data/messages:227
+#: ../data/messages:227 ../data/messages:1509
 msgid ""
 "If you have an Nvidia GeForce8 graphics card, please install the latest "
 "drivers, as the first ones were really buggy.\n"
@@ -1647,32 +1782,32 @@
 "with «cairo-dock -c»."
 msgstr ""
 
-#: ../data/messages:229
+#: ../data/messages:229 ../data/messages:1511
 msgid "I don't have these wonderful effects like fire, cube rotating, etc."
 msgstr ""
 
-#: ../data/messages:231
+#: ../data/messages:231 ../data/messages:1513
 msgid ""
 "Tip: You can force OpenGL by launching the dock with «cairo-dock -o».but you "
 "might get a lot of visual artifacts."
 msgstr ""
 
-#: ../data/messages:233
+#: ../data/messages:233 ../data/messages:1515
 msgid ""
 "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."
 msgstr ""
 
-#: ../data/messages:235
+#: ../data/messages:235 ../data/messages:1517
 msgid "I don't have any themes in the Theme Manager, except the default one."
 msgstr ""
 
-#: ../data/messages:237
+#: ../data/messages:237 ../data/messages:1519
 msgid "Hint : Up to version 2.1.1-2, wget was used."
 msgstr ""
 
-#: ../data/messages:239
+#: ../data/messages:239 ../data/messages:1521
 msgid ""
 "Be sure that you are connected to the Net.\n"
 " If your connection is very slow, you can increase the connection timeout in "
@@ -1682,17 +1817,17 @@
 "\"http_proxy\" environment variable)."
 msgstr ""
 
-#: ../data/messages:241
+#: ../data/messages:241 ../data/messages:1523
 msgid "The «netspeed» applet displays 0 even when I'm downloading something"
 msgstr ""
 
-#: ../data/messages:243
+#: ../data/messages:243 ../data/messages:1525
 msgid ""
 "Tip: you can run several instances of this applet if you wish to monitor "
 "several interfaces."
 msgstr ""
 
-#: ../data/messages:245
+#: ../data/messages:245 ../data/messages:1527
 msgid ""
 "You must tell the applet which interface you're using to connect to the Net "
 "(by default, this is «eth0»).\n"
@@ -1701,11 +1836,11 @@
 "something like «eth1», «ath0», or «wifi0».."
 msgstr ""
 
-#: ../data/messages:247
+#: ../data/messages:247 ../data/messages:1529
 msgid "The dustbin remains empty even when I delete a file."
 msgstr ""
 
-#: ../data/messages:249
+#: ../data/messages:249 ../data/messages:1531
 msgid ""
 "if you're using KDE, you may have to specify the path to the trash folder.\n"
 "Just edit the applet's configuration, and fill in the Trash path; it is "
@@ -1713,31 +1848,31 @@
 "here!!! (do not insert spaces or some invisible caracters)."
 msgstr ""
 
-#: ../data/messages:251
+#: ../data/messages:251 ../data/messages:1533
 msgid ""
 "There is no icon in the Applications Menu even though I enable the option."
 msgstr ""
 
-#: ../data/messages:253
+#: ../data/messages:253 ../data/messages:1535
 msgid ""
 "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. "
 msgstr ""
 
-#: ../data/messages:257
+#: ../data/messages:257 ../data/messages:1539
 msgid "If you're on Gnome you can click on this button:"
 msgstr ""
 
-#: ../data/messages:259
+#: ../data/messages:259 ../data/messages:1541
 msgid "The Project"
 msgstr ""
 
-#: ../data/messages:261
+#: ../data/messages:261 ../data/messages:1543
 msgid "Join the project!"
 msgstr ""
 
-#: ../data/messages:263
+#: ../data/messages:263 ../data/messages:1545
 msgid ""
 "We value your help! If you see a bug, if you think something could be "
 "improved,\n"
@@ -1748,65 +1883,73 @@
 "we’ll be happy to integrate it on our server !"
 msgstr ""
 
-#: ../data/messages:265
+#: ../data/messages:265 ../data/messages:1547
 msgid ""
 "If you wish to develop an applet, a complete documentation is available here."
 msgstr ""
 
-#: ../data/messages:267
+#: ../data/messages:267 ../data/messages:1549
 msgid "Documentation"
 msgstr ""
 
-#: ../data/messages:269
+#: ../data/messages:269 ../data/messages:1551
 msgid ""
 "If you wish to develop an applet in Python, Perl or any other language,\n"
 "or to interact with the dock in any kind of way, a full DBus API is "
 "described here."
 msgstr ""
 
-#: ../data/messages:271
+#: ../data/messages:271 ../data/messages:1553
 msgid "DBus API"
 msgstr ""
 
-#: ../data/messages:273
+#: ../data/messages:273 ../data/messages:1555
 msgid ""
 "\n"
 "\n"
 "The Cairo-Dock Team"
 msgstr ""
 
-#: ../data/messages:275
+#: ../data/messages:275 ../data/messages:1557
 msgid "Websites"
 msgstr ""
 
-#: ../data/messages:285
+#: ../data/messages:277 ../data/messages:1559
+msgid "Problems? Suggestions? Just want to talk to us? Come on over!"
+msgstr "مشاكل؟ اقتراحات؟ تريد التحدث إلينا؟ تفضل!"
+
+#: ../data/messages:279 ../data/messages:1561
+msgid "Community site"
+msgstr "موقع المجتمع"
+
+#: ../data/messages:285 ../data/messages:1567
 msgid "More applets available online!"
 msgstr ""
 
-#: ../data/messages:287
+#: ../data/messages:287 ../data/messages:1569
 msgid "Cairo-Dock-Plug-ins-Extras"
 msgstr "اضفات اضافية ليكرو دوك"
 
-#: ../data/messages:289
+#: ../data/messages:289 ../data/messages:1571
 msgid "Repositories"
 msgstr ""
 
-#: ../data/messages:291
+#: ../data/messages:291 ../data/messages:1573
 msgid ""
 "We maintain two repositories for Debian, Ubuntu and other Debian-forked:\n"
 " One for stable releases and another which is updated weekly (unstable "
 "version)"
 msgstr ""
 
-#: ../data/messages:293
+#: ../data/messages:293 ../data/messages:1575
 msgid "Debian/Ubuntu"
 msgstr ""
 
-#: ../data/messages:295
+#: ../data/messages:295 ../data/messages:1577
 msgid "Ubuntu"
 msgstr ""
 
-#: ../data/messages:299
+#: ../data/messages:299 ../data/messages:1581
 msgid ""
 "If you're on Ubuntu, you can add our 'stable' repository by clicking on this "
 "button:\n"
@@ -1814,7 +1957,7 @@
 "latest stable version."
 msgstr ""
 
-#: ../data/messages:303
+#: ../data/messages:303 ../data/messages:1585
 msgid ""
 "If you're on Ubuntu, you can also add our 'weekly' ppa (can be unstable) by "
 "clicking on this button:\n"
@@ -1822,11 +1965,11 @@
 "latest weekly version."
 msgstr ""
 
-#: ../data/messages:305
+#: ../data/messages:305 ../data/messages:1587
 msgid "Debian"
 msgstr ""
 
-#: ../data/messages:309
+#: ../data/messages:309 ../data/messages:1591
 msgid ""
 "If you're on Debian Stable, you can add our 'stable' repository by clicking "
 "on this button:\n"
@@ -1834,7 +1977,7 @@
 "system and reinstall 'cairo-dock' package."
 msgstr ""
 
-#: ../data/messages:313
+#: ../data/messages:313 ../data/messages:1595
 msgid ""
 "If you're on Debian Unstable, you can add our 'stable' repository by "
 "clicking on this button:\n"
@@ -1842,232 +1985,216 @@
 "system and reinstall 'cairo-dock' package."
 msgstr ""
 
-#: ../data/messages:317
-msgid ""
-"If you're on Debian Stable, you can add our 'weekly' ppa (can be unstable) "
-"by clicking on this button:\n"
-" After that, you can purge all 'cairo-dock*' packages, update the your "
-"system and reinstall 'cairo-dock' package."
-msgstr ""
-
-#: ../data/messages:321
-msgid ""
-"If you're on Debian Unstable, you can add our 'weekly' ppa (can be unstable) "
-"by clicking on this button:\n"
-" After that, you can purge all 'cairo-dock*' packages, update the your "
-"system and reinstall 'cairo-dock' package."
-msgstr ""
-
-#: ../data/messages:323 ../data/messages:325 ../data/messages:1415
-#: ../data/messages:1495 ../data/messages:1527
+#: ../data/messages:315 ../data/messages:317 ../data/messages:1733
+#: ../data/messages:1813 ../data/messages:1845
 msgid "Icon"
 msgstr ""
 
-#: ../data/messages:327
+#: ../data/messages:319
 msgid "Name of the dock it belongs to:"
 msgstr ""
 
-#: ../data/messages:329
+#: ../data/messages:321
 msgid "Name of the icon as it will appear in its caption in the dock:"
 msgstr ""
 
-#: ../data/messages:331
+#: ../data/messages:323
 msgid "Leave empty to use the default one."
 msgstr ""
 
-#: ../data/messages:333
+#: ../data/messages:325
 msgid "Image filename:"
 msgstr ""
 
-#: ../data/messages:335
+#: ../data/messages:327
 msgid "Set to 0 to use the default applet size"
 msgstr ""
 
-#: ../data/messages:337
+#: ../data/messages:329
 msgid "Desired icon size for this applet"
 msgstr ""
 
-#: ../data/messages:339
+#: ../data/messages:331
 msgid "Applet's Handbook"
 msgstr ""
 
-#: ../data/messages:341
+#: ../data/messages:333
 msgid "Desklet"
 msgstr ""
 
-#: ../data/messages:345
+#: ../data/messages:337
 msgid ""
 "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."
 msgstr ""
 
-#: ../data/messages:347
+#: ../data/messages:339
 msgid "Lock position?"
 msgstr ""
 
-#: ../data/messages:349
+#: ../data/messages:341
 msgid ""
 "Depending on your WindowManager, you may be able to resize this with ALT + "
 "middle-click or ALT + left-click."
 msgstr ""
 
-#: ../data/messages:351
+#: ../data/messages:343
 msgid "Desklet dimensions (width x height):"
 msgstr ""
 
-#: ../data/messages:353
+#: ../data/messages:345
 msgid ""
 "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"
 msgstr ""
 
-#: ../data/messages:355
+#: ../data/messages:347
 msgid "Desklet position (x, y):"
 msgstr ""
 
-#: ../data/messages:357
+#: ../data/messages:349
 msgid ""
 "You can quickly rotate the desklet with the mouse, by dragging the little "
 "buttons on its left and top sides."
 msgstr ""
 
-#: ../data/messages:359
+#: ../data/messages:351
 msgid "Rotation:"
 msgstr ""
 
-#: ../data/messages:363
+#: ../data/messages:355
 msgid "Is detached from the dock"
 msgstr ""
 
-#: ../data/messages:365
+#: ../data/messages:357
 msgid ""
 "for CompizFusion's \"widget layer\", set behaviour in Compiz to: "
-"(class=Cairo-dock & type=utility)"
+"(class=Cairo-dock & type=Utility)"
 msgstr ""
 
-#: ../data/messages:367 ../data/messages:433 ../data/messages:471
-#: ../data/messages:601 ../data/messages:663 ../data/messages:1323
+#: ../data/messages:359 ../data/messages:425 ../data/messages:463
+#: ../data/messages:593 ../data/messages:655 ../data/messages:1641
 msgid "Visibility:"
 msgstr "مدى الرؤية:"
 
-#: ../data/messages:373
+#: ../data/messages:365
 msgid "Keep below"
 msgstr ""
 
-#: ../data/messages:375
+#: ../data/messages:367
 msgid "Keep on widget layer"
 msgstr ""
 
-#: ../data/messages:379
+#: ../data/messages:371
 msgid "Should be visible on all desktops?"
 msgstr ""
 
-#: ../data/messages:381 ../data/messages:977
+#: ../data/messages:373 ../data/messages:973
 msgid "Decorations"
 msgstr "زخرفات"
 
-#: ../data/messages:383
+#: ../data/messages:375
 msgid "Choose 'Custom decorations' to define your own decorations below."
 msgstr ""
 
-#: ../data/messages:385
+#: ../data/messages:377
 msgid "Choose a decoration theme for this desklet:"
 msgstr ""
 
-#: ../data/messages:387
+#: ../data/messages:379
 msgid ""
 "Image to be displayed below drawings, e.g. a frame. Leave empty for no image."
 msgstr ""
 
-#: ../data/messages:389
+#: ../data/messages:381
 msgid "Background image:"
 msgstr ""
 
-#: ../data/messages:391
+#: ../data/messages:383
 msgid "Background transparency:"
 msgstr ""
 
-#: ../data/messages:393
+#: ../data/messages:385
 msgid "in pixels. Use this to adjust the left position of drawings."
 msgstr ""
 
-#: ../data/messages:395
+#: ../data/messages:387
 msgid "Left offset:"
 msgstr ""
 
-#: ../data/messages:397
+#: ../data/messages:389
 msgid "in pixels. Use this to adjust the top position of drawings."
 msgstr ""
 
-#: ../data/messages:399
+#: ../data/messages:391
 msgid "Top offset:"
 msgstr ""
 
-#: ../data/messages:401
+#: ../data/messages:393
 msgid "in pixels. Use this to adjust the right position of drawings."
 msgstr ""
 
-#: ../data/messages:403
+#: ../data/messages:395
 msgid "Right offset:"
 msgstr ""
 
-#: ../data/messages:405
+#: ../data/messages:397
 msgid "in pixels. Use this to adjust the bottom position of drawings."
 msgstr ""
 
-#: ../data/messages:407
+#: ../data/messages:399
 msgid "Bottom offset:"
 msgstr ""
 
-#: ../data/messages:409
+#: ../data/messages:401
 msgid ""
 "Image to be displayed above the drawings, e.g. a reflection. Leave empty for "
 "no image."
 msgstr ""
 
-#: ../data/messages:411
+#: ../data/messages:403
 msgid "Foreground image:"
 msgstr ""
 
-#: ../data/messages:413
+#: ../data/messages:405
 msgid "Foreground tansparency:"
 msgstr ""
 
-#: ../data/messages:415 ../data/messages:1287
+#: ../data/messages:407 ../data/messages:1605
 msgid "Behavior"
 msgstr "سلوك"
 
-#: ../data/messages:417 ../data/messages:555 ../data/messages:1289
+#: ../data/messages:409 ../data/messages:547 ../data/messages:1607
 msgid "Position on the screen"
 msgstr "الموقع على الشاشه"
 
-#: ../data/messages:419 ../data/messages:557 ../data/messages:1291
+#: ../data/messages:411 ../data/messages:549 ../data/messages:1609
 msgid "Choose which border of the screen the dock will be placed on:"
 msgstr "أختر جهه الشاشه التي ترغب بظهور الشريط فيها:"
 
-#: ../data/messages:421 ../data/messages:559 ../data/messages:1293
+#: ../data/messages:413 ../data/messages:551 ../data/messages:1611
 msgid "bottom"
 msgstr "أسفل"
 
-#: ../data/messages:423 ../data/messages:561 ../data/messages:1295
+#: ../data/messages:415 ../data/messages:553 ../data/messages:1613
 msgid "top"
 msgstr "أعلى"
 
-#: ../data/messages:425 ../data/messages:563 ../data/messages:573
-#: ../data/messages:1297
+#: ../data/messages:417 ../data/messages:555 ../data/messages:565
+#: ../data/messages:1615
 msgid "right"
 msgstr "يمين"
 
-#: ../data/messages:427 ../data/messages:565 ../data/messages:571
-#: ../data/messages:1299
+#: ../data/messages:419 ../data/messages:557 ../data/messages:563
+#: ../data/messages:1617
 msgid "left"
 msgstr "يسار"
 
-#: ../data/messages:429 ../data/messages:597
+#: ../data/messages:421 ../data/messages:589
 msgid "Visibility of the main dock"
 msgstr "وضوح الشريط الرئيسي"
 
-#: ../data/messages:431 ../data/messages:599 ../data/messages:1321
+#: ../data/messages:423 ../data/messages:591 ../data/messages:1639
 msgid ""
 "Modes are sorted from the most intrusive to the less intrusive.\n"
 "When the dock is hidden or below a window, place the mouse on the screen's "
@@ -2076,69 +2203,69 @@
 "mouse. The rest of the time, it stays invisible, thus acting like a menu."
 msgstr ""
 
-#: ../data/messages:437 ../data/messages:605 ../data/messages:1327
+#: ../data/messages:429 ../data/messages:597 ../data/messages:1645
 msgid "Reserve space for the dock"
 msgstr ""
 
-#: ../data/messages:439 ../data/messages:607 ../data/messages:1329
+#: ../data/messages:431 ../data/messages:599 ../data/messages:1647
 msgid "Keep the dock below"
 msgstr ""
 
-#: ../data/messages:441 ../data/messages:609 ../data/messages:1331
+#: ../data/messages:433 ../data/messages:601 ../data/messages:1649
 msgid "Hide the dock when it overlaps the current window"
 msgstr "إخفاء الشريط عندما يتداخل مع النافذة الحالية"
 
-#: ../data/messages:443 ../data/messages:611 ../data/messages:1333
+#: ../data/messages:435 ../data/messages:603 ../data/messages:1651
 msgid "Hide the dock whenever it overlaps any window"
 msgstr ""
 
-#: ../data/messages:445 ../data/messages:613 ../data/messages:1335
+#: ../data/messages:437 ../data/messages:605 ../data/messages:1653
 msgid "Keep the dock hidden"
 msgstr ""
 
-#: ../data/messages:447 ../data/messages:615 ../data/messages:1337
+#: ../data/messages:439 ../data/messages:607 ../data/messages:1655
 msgid "Pop-up on shortcut"
 msgstr "فقاعه على الاختصارات"
 
-#: ../data/messages:449 ../data/messages:617
+#: ../data/messages:441 ../data/messages:609
 msgid "Effect used to hide the dock:"
 msgstr "التأثير المستخدم لإخفاء الشريط:"
 
-#: ../data/messages:451 ../data/messages:483 ../data/messages:619
-#: ../data/messages:1463
+#: ../data/messages:443 ../data/messages:475 ../data/messages:611
+#: ../data/messages:1781
 msgid "None"
 msgstr "بدون"
 
-#: ../data/messages:463 ../data/messages:649
+#: ../data/messages:455 ../data/messages:641
 msgid ""
 "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."
 msgstr ""
 
-#: ../data/messages:465 ../data/messages:651
+#: ../data/messages:457 ../data/messages:643
 msgid "Keyboard shortcut to pop-up the dock:"
 msgstr "إختصار لوحه المفاتيح لإظهار الشريط:"
 
-#: ../data/messages:467
+#: ../data/messages:459
 msgid "Visibility of sub-docks"
 msgstr "وضوح الشريط الفرعي"
 
-#: ../data/messages:469 ../data/messages:661
+#: ../data/messages:461 ../data/messages:653
 msgid ""
 "they will appear either when you click or when you linger over the icon "
 "pointing on it."
 msgstr ""
 
-#: ../data/messages:473 ../data/messages:665
+#: ../data/messages:465 ../data/messages:657
 msgid "Appear on mouse over"
 msgstr "إظهار عند مرور المؤشر"
 
-#: ../data/messages:475 ../data/messages:667
+#: ../data/messages:467 ../data/messages:659
 msgid "Appear on click"
 msgstr "إظهار عند النقر"
 
-#: ../data/messages:479
+#: ../data/messages:471
 msgid ""
 "None     : Don't show opened windows in the dock.\n"
 "MacOSX   : Mix applications with its launcher, show other windows only if "
@@ -2149,128 +2276,128 @@
 "that are on the current desktop."
 msgstr ""
 
-#: ../data/messages:481
+#: ../data/messages:473
 msgid "Behaviour of the Taskbar:"
 msgstr "سلوك شريط المهام"
 
-#: ../data/messages:485
+#: ../data/messages:477
 msgid "MacOSX"
 msgstr "ماك"
 
-#: ../data/messages:487
+#: ../data/messages:479
 msgid "KDE"
 msgstr "وندوز سفن"
 
-#: ../data/messages:489
+#: ../data/messages:481
 msgid "Gnome"
 msgstr "جنوم"
 
-#: ../data/messages:491
+#: ../data/messages:483
 msgid "Icons' animations and effects"
 msgstr "تأثيرات الأيقونات وحركاتها"
 
-#: ../data/messages:497
+#: ../data/messages:489
 msgid "On appearance/disappearance:"
 msgstr "عند الإظهار\\الإخفاء:"
 
-#: ../data/messages:503 ../data/messages:1043
+#: ../data/messages:495 ../data/messages:1039
 msgid ""
 "Leave empty to use the current icon theme of your system. You can enter the "
 "name of a theme that is installed on your system (like 'Gartoon' or "
 "'Human'), or even a path to a folder containing icons."
 msgstr ""
 
-#: ../data/messages:505
+#: ../data/messages:497
 msgid "Choose a theme of icons :"
 msgstr "اختر سمات الايقونات"
 
-#: ../data/messages:507
+#: ../data/messages:499
 msgid "Icons size:"
 msgstr "حجم الايقونات :"
 
-#: ../data/messages:509
+#: ../data/messages:501
 msgid "Very small"
 msgstr "صغير جدا"
 
-#: ../data/messages:511
+#: ../data/messages:503
 msgid "Small"
 msgstr "صغير"
 
-#: ../data/messages:513
+#: ../data/messages:505
 msgid "Medium"
 msgstr "متوسط"
 
-#: ../data/messages:515
+#: ../data/messages:507
 msgid "Big"
 msgstr "كبير"
 
-#: ../data/messages:517
+#: ../data/messages:509
 msgid "Very Big"
 msgstr "كبير جدا"
 
-#: ../data/messages:519
+#: ../data/messages:511
 msgid ""
 "This will separate launchers, application, and applets from each others. "
 "Separators will be automatically inserted then."
 msgstr ""
 
-#: ../data/messages:521 ../data/messages:1133
+#: ../data/messages:513 ../data/messages:1129
 msgid "Separate the different types of icons?"
 msgstr "فصل الأنواع المختلفه من الأيقونات؟"
 
-#: ../data/messages:523 ../data/messages:1143
+#: ../data/messages:515 ../data/messages:1139
 msgid "Order of the different types of icons :"
 msgstr "ترتيب الأنواع المختلفه من الأيقونات:"
 
-#: ../data/messages:525 ../data/messages:1145
+#: ../data/messages:517 ../data/messages:1141
 msgid "launchers"
 msgstr "المشغلات"
 
-#: ../data/messages:527 ../data/messages:1147
+#: ../data/messages:519 ../data/messages:1143
 msgid "applications"
 msgstr "تطبيقات"
 
-#: ../data/messages:529 ../data/messages:1149
+#: ../data/messages:521 ../data/messages:1145
 msgid "applets"
 msgstr "تطبيقات"
 
-#: ../data/messages:533 ../data/messages:923
+#: ../data/messages:525 ../data/messages:919
 msgid "Choose the default view for main docks :"
 msgstr "اختيار طريقة العرض الافتراضية لشريط الرئيسي :"
 
-#: ../data/messages:535 ../data/messages:927
+#: ../data/messages:527 ../data/messages:923
 msgid "You can overwrite this parameter for each sub-dock."
 msgstr "بإمكانك تغيير المؤشرات لكل شريط فرعي."
 
-#: ../data/messages:537 ../data/messages:929
+#: ../data/messages:529 ../data/messages:925
 msgid "Choose the default view for sub-docks :"
 msgstr "اختيار الطريقة الافتراضية  لكيرو  الفرعي"
 
-#: ../data/messages:539
+#: ../data/messages:531
 msgid "Add-ons"
 msgstr "إضافات"
 
-#: ../data/messages:541
+#: ../data/messages:533
 msgid "Add or remove any applet"
 msgstr ""
 
-#: ../data/messages:543
+#: ../data/messages:535
 msgid ""
 "Select a line to get a preview and a description of the applet.\n"
 "Click on the left check-box to (de)activate an applet.\n"
 "Once an applet is active, you can configure it by right clicking on its icon."
 msgstr ""
 
-#: ../data/messages:545
+#: ../data/messages:537
 msgid ""
 "You can install them by simply drag-and-dropping the link onto your dock."
 msgstr ""
 
-#: ../data/messages:551 ../data/messages:1369
+#: ../data/messages:543 ../data/messages:1687
 msgid "Themes"
 msgstr "السِمات"
 
-#: ../data/messages:567 ../data/messages:1301
+#: ../data/messages:559 ../data/messages:1619
 msgid ""
 "When set to 0 the dock will position itself relative to the left corner if "
 "horizontal and the top corner if vertical. When set to 1 it will position "
@@ -2279,910 +2406,919 @@
 "the screen's edge."
 msgstr ""
 
-#: ../data/messages:569 ../data/messages:1303
+#: ../data/messages:561 ../data/messages:1621
 msgid "Relative alignment:"
 msgstr "المحاذاه النسبيه :"
 
-#: ../data/messages:575 ../data/messages:1305
+#: ../data/messages:567 ../data/messages:1623
 msgid "Offset from the screen's edge"
 msgstr "موازنة مع حافة الشاشة"
 
-#: ../data/messages:577 ../data/messages:1307
+#: ../data/messages:569 ../data/messages:1625
 msgid ""
 "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."
 msgstr ""
 
-#: ../data/messages:579 ../data/messages:1309
+#: ../data/messages:571 ../data/messages:1627
 msgid "Lateral offset:"
 msgstr "موازنة خارجية :"
 
-#: ../data/messages:581 ../data/messages:1311
+#: ../data/messages:573 ../data/messages:1629
 msgid ""
 "in pixels. You can also move the dock by holding the ALT or CTRL key and the "
 "left mouse button."
 msgstr ""
 
-#: ../data/messages:583 ../data/messages:1313
+#: ../data/messages:575 ../data/messages:1631
 msgid "Distance to the screen edge:"
 msgstr "المسافه إالى حافه الشاشه :"
 
-#: ../data/messages:585
+#: ../data/messages:577
 msgid "Multiple screens"
 msgstr "شاشات متعددة"
 
-#: ../data/messages:587
+#: ../data/messages:579
 msgid ""
 "This option is to use if you have a dual-screen and use Xinerama to manage "
 "them."
 msgstr ""
 
-#: ../data/messages:589
+#: ../data/messages:581
 msgid "Use Xinerama?"
 msgstr ""
 
-#: ../data/messages:591
+#: ../data/messages:583
 msgid "0 is the first screen."
 msgstr "0 هي الشاشه الأولى."
 
-#: ../data/messages:593 ../data/messages:1317
+#: ../data/messages:585 ../data/messages:1635
 msgid "Number of the screen where the dock should be located:"
 msgstr "رقم الشاشه التي تريد إظهار الشريط فيها :"
 
-#: ../data/messages:595
+#: ../data/messages:587
 msgid "Accessibility"
 msgstr "الإتاحة"
 
-#: ../data/messages:631
+#: ../data/messages:623
 msgid "in ms. 0 means no delay."
 msgstr "0 ملي ثانيه ، تعني إلغاء التأخير."
 
-#: ../data/messages:633
+#: ../data/messages:625
 msgid "Delay before the dock unhides itself:"
 msgstr "المده قبل أن يظهر الشريط ذاتيا :"
 
-#: ../data/messages:635
+#: ../data/messages:627
 msgid "How to call the dock back:"
 msgstr "طريقه إستدعاء الشريط مره اخرى:"
 
-#: ../data/messages:637
+#: ../data/messages:629
 msgid "Hit the screen's border"
 msgstr ""
 
-#: ../data/messages:639
+#: ../data/messages:631
 msgid "Hit where the dock is"
 msgstr ""
 
-#: ../data/messages:641
+#: ../data/messages:633
 msgid "Hit the screen's corner"
 msgstr ""
 
-#: ../data/messages:643
+#: ../data/messages:635
 msgid "Hit a zone"
 msgstr ""
 
-#: ../data/messages:645
+#: ../data/messages:637
 msgid "Size of the zone :"
 msgstr ""
 
-#: ../data/messages:647
+#: ../data/messages:639
 msgid "Image to display on the zone :"
 msgstr ""
 
-#: ../data/messages:653
+#: ../data/messages:645
 msgid "Additional parameters"
 msgstr "مؤشرات إضافيه"
 
-#: ../data/messages:655
+#: ../data/messages:647
 msgid ""
 "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)."
 msgstr ""
 
-#: ../data/messages:657
+#: ../data/messages:649
 msgid "Automatically hide the dock when a window becomes full screen?"
 msgstr "إخفاء الشريط ذاتيا عندما تكون هناك نافذه في وضع ملء الشاشه؟"
 
-#: ../data/messages:659
+#: ../data/messages:651
 msgid "Sub-docks' visibility"
 msgstr "الرؤية الفرعية لشريط"
 
-#: ../data/messages:669 ../data/messages:673
+#: ../data/messages:661 ../data/messages:665
 msgid "in ms."
 msgstr "بالمللي ثانيه ."
 
-#: ../data/messages:671
+#: ../data/messages:663
 msgid "Delay before displaying a sub-dock:"
 msgstr "التأخير قبل عرض الشريط الفرعي :"
 
-#: ../data/messages:675
+#: ../data/messages:667
 msgid "Delay before leaving a sub-dock takes effect:"
 msgstr ""
 
-#: ../data/messages:677
+#: ../data/messages:669
 msgid "TaskBar"
 msgstr "شريط المهام"
 
-#: ../data/messages:681
+#: ../data/messages:673
 msgid ""
 "Cairo-Dock will then act as your taskbar. It is recommended to remove any "
 "other taskbars."
 msgstr ""
 
-#: ../data/messages:683
+#: ../data/messages:675
 msgid "Show currently opened applications in the dock?"
 msgstr "اظهار التطبيقات المفتوحة في الشريط ؟"
 
-#: ../data/messages:685
+#: ../data/messages:677
 msgid "Only show icons whose windows are minimised"
 msgstr "فقط أظهار الأيقونات التي تم تصغير نوافذها"
 
-#: ../data/messages:687
+#: ../data/messages:679
 msgid "Only show applications on current desktop"
 msgstr "فقط اظهار التطبيقات المتواجده على سطح المكتب الحالي"
 
-#: ../data/messages:689
+#: ../data/messages:681
 msgid ""
 "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."
 msgstr ""
 
-#: ../data/messages:691
+#: ../data/messages:683
 msgid "Mix launchers and applications"
 msgstr "خلط المشغلات بالتطبيقات"
 
-#: ../data/messages:693
+#: ../data/messages:685
 msgid ""
 "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."
 msgstr ""
 
-#: ../data/messages:695
+#: ../data/messages:687
 msgid "Group windows from the same application in a sub-dock ?"
 msgstr "جمع النوافذ من نفس التطبيق في شريط فرعي ؟"
 
-#: ../data/messages:697 ../data/messages:707
+#: ../data/messages:689 ../data/messages:699
 msgid "Enter the class of the applications, separated by a semi-colon ';'"
 msgstr "أدخل فئه التطبيق ، وافصل بينها بقاصله منقوطه \";\""
 
-#: ../data/messages:699 ../data/messages:709
+#: ../data/messages:691 ../data/messages:701
 msgid "\t\tExcept the following classes:"
 msgstr ""
 
-#: ../data/messages:701
+#: ../data/messages:693
 msgid "Representation"
 msgstr "التمثيل"
 
-#: ../data/messages:703
+#: ../data/messages:695
 msgid ""
 "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."
 msgstr ""
 
-#: ../data/messages:705
+#: ../data/messages:697
 msgid "Overwrite the X icon with the launchers' icon?"
 msgstr "إستبدل الايقونه X بأيقونه المشغلات"
 
-#: ../data/messages:711
+#: ../data/messages:703
 msgid ""
 "A composite manager is required to display the thumbnail.\n"
 "OpenGL is required to draw the icon bent backwards."
 msgstr ""
 
-#: ../data/messages:713
+#: ../data/messages:705
 msgid "How to draw minimised windows ?"
 msgstr "كيف يتم رسم النوافذ المصغره؟"
 
-#: ../data/messages:715
+#: ../data/messages:707
 msgid "Make the icon transparent"
 msgstr "جعل الايقون شفاف ؟"
 
-#: ../data/messages:717
+#: ../data/messages:709
 msgid "Show a window's thumbnail"
 msgstr "إظهار مصغره للنافذه"
 
-#: ../data/messages:719
+#: ../data/messages:711
 msgid "Draw it bent backwards"
 msgstr ""
 
-#: ../data/messages:721
+#: ../data/messages:713
 msgid "Transparency of icons whose window is minimised:"
 msgstr "شفافية الأيقونات ذات النوافذ المصغره:"
 
-#: ../data/messages:723 ../data/messages:877 ../data/messages:991
-#: ../data/messages:1017 ../data/messages:1089
+#: ../data/messages:715 ../data/messages:873 ../data/messages:987
+#: ../data/messages:1013 ../data/messages:1085