Merge lp:~cairo-dock-team/ubuntu/precise/cairo-dock/3.0.0.0beta1 into lp:ubuntu/precise/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:
   - The taskbar has been greatly enhanced.
   - The control of the dock from the keyboard is now very powerful:
    - many shortkeys have been added in different applets
    - you can activate a launcher by pressing a shortkey + its number
    - all shortkeys can now be managed in a single place
       in the configuration window.
   - A new Twitter applet lets you tweet in one click.
   - A new applet to inhibit the screensaver in one click.
   - Cairo-Dock now uses GTK3, for a better integration in a Gnome desktop

Note that the next stable version if scheduled for March. (before the beta freeze)

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

Please upload this version before the Feature Freeze :)

Thank you for your help!

PS: Don't forget our plug-ins ! ( LP: #932042 )

[Matthieu Baerts (matttbe)]

@Stefano Rivera: Thank you :)

=== removed directory '.pc/01-improved-cairo-dock-session.patch'
=== removed directory '.pc/01-improved-cairo-dock-session.patch/data'
=== removed directory '.pc/01-improved-cairo-dock-session.patch/data/desktop-manager'
=== removed 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	2011-10-11 10:53:26 +0000
+++ .pc/01-improved-cairo-dock-session.patch/data/desktop-manager/CMakeLists.txt	1970-01-01 00:00:00 +0000
@@ -1,9 +0,0 @@
-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)

=== removed 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	2011-10-11 10:53:26 +0000
+++ .pc/01-improved-cairo-dock-session.patch/data/desktop-manager/cairo-dock-fallback.desktop	1970-01-01 00:00:00 +0000
@@ -1,7 +0,0 @@
-[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

=== removed file '.pc/01-improved-cairo-dock-session.patch/data/desktop-manager/cairo-dock-session'
=== removed 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	2011-10-11 10:53:26 +0000
+++ .pc/01-improved-cairo-dock-session.patch/data/desktop-manager/cairo-dock.desktop	1970-01-01 00:00:00 +0000
@@ -1,7 +0,0 @@
-[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

=== removed directory '.pc/01-improved-cairo-dock-session.patch/data/scripts'
=== removed 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	2011-10-11 10:53:26 +0000
+++ .pc/01-improved-cairo-dock-session.patch/data/scripts/help_scripts.sh	1970-01-01 00:00:00 +0000
@@ -1,148 +0,0 @@
-#!/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/02-manpage-not-compressed-with-max-compression.patch'
=== removed directory '.pc/02-manpage-not-compressed-with-max-compression.patch/data'
=== removed directory '.pc/02-manpage-not-compressed-with-max-compression.patch/data/man'
=== removed 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	2011-10-11 10:53:26 +0000
+++ .pc/02-manpage-not-compressed-with-max-compression.patch/data/man/CMakeLists.txt	1970-01-01 00:00:00 +0000
@@ -1,22 +0,0 @@
-############## 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)

=== removed file '.pc/applied-patches'
--- .pc/applied-patches	2011-10-11 10:53:26 +0000
+++ .pc/applied-patches	1970-01-01 00:00:00 +0000
@@ -1,2 +0,0 @@
-01-improved-cairo-dock-session.patch
-02-manpage-not-compressed-with-max-compression.patch

=== modified file 'CMakeLists.txt'
--- CMakeLists.txt	2011-10-11 10:53:26 +0000
+++ CMakeLists.txt	2012-02-14 14:02:34 +0000
@@ -6,13 +6,14 @@
 include (CheckIncludeFiles)
 include (CheckFunctionExists)
 include (CheckSymbolExists)
+include ("${CMAKE_CURRENT_SOURCE_DIR}/cmake_modules/GNUInstallDirs.cmake")
 
 ########### project ###############
 
 project ("cairo-dock")
-set (VERSION "2.4.0~2")
+set (VERSION "3.0.0.0beta1")
 
-add_definitions (-std=c99 -Wextra -Wwrite-strings -Wuninitialized -Werror-implicit-function-declaration) # removed for stable versions: -Wstrict-prototypes #-Wunreachable-code -Wno-unused-parameter -Wall 
+add_definitions (-std=c99 -Wextra -Wwrite-strings -Wuninitialized -Werror-implicit-function-declaration -Wstrict-prototypes) # removed for stable versions: -Wstrict-prototypes #-Wunreachable-code -Wno-unused-parameter -Wall 
 if (NOT ${CMAKE_BUILD_TYPE})
 	add_definitions (-O3)
 endif()
@@ -45,31 +46,53 @@
 
 set (PACKAGE ${CMAKE_PROJECT_NAME})
 set (GETTEXT_PACKAGE ${PACKAGE})
-set (prefix ${CMAKE_INSTALL_PREFIX})
+
+set (prefix ${CMAKE_INSTALL_PREFIX})  # /usr/local
 set (exec_prefix ${prefix})
-set (datadir ${prefix}/share)
-set (pkgdatadir ${datadir}/cairo-dock)
-set (mandir ${datadir}/man)
+set (datadir "${prefix}/${CMAKE_INSTALL_DATAROOTDIR}")  # (...)/share
+set (pkgdatadir "${datadir}/${CMAKE_PROJECT_NAME}")  # (...)/cairo-dock
+set (mandir "${prefix}/${CMAKE_INSTALL_MANDIR}")  # (...)/man
+
 set (VERSION_HELP "0.9.99") # needed to parse Help.conf.in
 
-if( CMAKE_SIZEOF_VOID_P EQUAL 8 AND NOT "${FORCE_LIB64}" STREQUAL "")  # 64bits and force install in lib64
-	set (libdir ${prefix}/lib64)
+if( CMAKE_SIZEOF_VOID_P EQUAL 8 AND "${FORCE_LIB64}" STREQUAL "yes")  # 64bits and force install in lib64
+	set (libdir "${prefix}/lib64")
 else()
-	set (libdir ${prefix}/lib${LIB_SUFFIX})
+	set (libdir "${prefix}/${CMAKE_INSTALL_LIBDIR}${LIB_SUFFIX}")  # (...)/lib
 endif()
 
-set (includedir ${prefix}/include)
-set (bindir ${prefix}/bin)
+set (includedir "${prefix}/${CMAKE_INSTALL_INCLUDEDIR}")  # (...)/include
+set (bindir "${prefix}/${CMAKE_INSTALL_BINDIR}")  # (...)/bin
 
 ########### dependencies ###############
 
-pkg_check_modules ("PACKAGE" REQUIRED "gtk+-2.0" "gthread-2.0" "cairo" "librsvg-2.0" "dbus-1" "dbus-glib-1" "libxml-2.0" "gtkglext-1.0" "xrender" "libcurl")
+set (packages_required "gthread-2.0 cairo librsvg-2.0 dbus-1 dbus-glib-1 libxml-2.0 xrender gl glu pangox libcurl")  # for the .pc
+STRING (REGEX REPLACE " " ";" packages_required_semicolon ${packages_required})  # replace blank space by semicolon => to have more details if a package is missing
+pkg_check_modules ("PACKAGE" REQUIRED "${packages_required_semicolon}")
 
-pkg_check_modules ("XEXTEND" "xtst" "xcomposite" "xinerama")
+set (xextend_required "xtst xcomposite xinerama")  # for the .pc
+STRING (REGEX REPLACE " " ";" xextend_required_semicolon ${xextend_required})
+pkg_check_modules ("XEXTEND" "${xextend_required_semicolon}")
 if (${XEXTEND_FOUND})
 	set (HAVE_XEXTEND 1)
-	set (xextend_required "xtst xcomposite xinerama")  # pour le .pc
-endif()
+else()
+	set (xextend_required)
+endif()
+
+if (NOT "${force-gtk2}" STREQUAL "yes")  # by default, we use GTK+3 except if we force the use of GTK+2
+	set (gtk_required "gtk+-3.0")  # for the .pc
+	pkg_check_modules ("GTK" "${gtk_required}")  # the check is not set as 'required' because we can use GTK+2 if GTK+3 isn't available
+endif()
+
+if (NOT "${GTK_FOUND}")
+	set (gtk_required "gtk+-2.0")  # for the .pc
+	pkg_check_modules ("GTK" REQUIRED "${gtk_required}")  # the check is requiered this time because we need GTK anyway.
+endif()
+
+STRING (REGEX REPLACE "\\..*" "" GTK_MAJOR "${GTK_VERSION}")
+
+add_definitions (-DGTK_DISABLE_DEPRECATED="1")
+## add_definitions (-DG_DISABLE_DEPRECATED="1")
 
 # We use crypt(3) which may be in libc, or in libcrypt (eg FreeBSD)
 check_library_exists (crypt encrypt "" HAVE_LIBCRYPT)
@@ -93,26 +116,28 @@
 else()
 	MESSAGE (STATUS " * crypt passwords : no")
 endif()
+MESSAGE (STATUS " * GTK version : ${GTK_MAJOR}")
 MESSAGE (STATUS)
 
-########### next steps ###############
-
-add_subdirectory (src)
-add_subdirectory (data)
-add_subdirectory (po)
-
 ########### variables defined at compil time ###############
 
 set (CAIRO_DOCK_SHARE_DATA_DIR ${pkgdatadir})
 set (CAIRO_DOCK_SHARE_THEMES_DIR ${pkgdatadir}/themes)
 #set (CAIRO_DOCK_MODULES_DIR ${libdir}/cairo-dock)
-set (CAIRO_DOCK_LOCALE_DIR ${datadir}/locale)
+set (CAIRO_DOCK_LOCALE_DIR "${prefix}/${CMAKE_INSTALL_LOCALEDIR}")
 set (CAIRO_DOCK_THEMES_DIR "themes")
 set (CAIRO_DOCK_GETTEXT_PACKAGE ${GETTEXT_PACKAGE})
 
 set (GLDI_GETTEXT_PACKAGE ${GETTEXT_PACKAGE})
 set (GLDI_SHARE_DATA_DIR ${pkgdatadir})
 set (GLDI_MODULES_DIR ${libdir}/cairo-dock)
+set (GLDI_BIN_DIR ${bindir})
+
+########### next steps ###############
+
+add_subdirectory (src)
+add_subdirectory (data)
+add_subdirectory (po)
 
 ########### file generation ###############
 

=== modified file 'INSTALL'
--- INSTALL	2010-09-18 14:17:48 +0000
+++ INSTALL	2012-02-14 14:02:34 +0000
@@ -32,10 +32,6 @@
 You can also force another prefix for this librairy directory with "LIB_SUFFIX" flag, e.g. for 'lib32' directory:
     $ cmake CMakeLists.txt -DCMAKE_INSTALL_PREFIX=/usr -DLIB_SUFFIX=32
 
-<deprecated>
-If your libcairo is compiled with glitz support (that is, with --enable-glitz option), you can benefit from glitz hardware acceleration in cairo-dock too.
-Just add the -Denable-glitz option.
-</deprecated>
 
 Plug-ins are compiled all at once, but you can skip some of them. Unstable plug-ins are skipped by default, unless you add "-Denable-xxx=yes", where xxx is the name of the plug-in.
 See the "Applets.stable" file in the "plug-ins" folder for an exhaustive list of stable applets (that are effectively integrated into the official package).

=== modified file 'cairo-dock.pc.in'
--- cairo-dock.pc.in	2011-08-09 16:48:08 +0000
+++ cairo-dock.pc.in	2012-02-14 14:02:34 +0000
@@ -6,8 +6,8 @@
 pluginsdatadir=@datadir@/@PACKAGE@/plug-ins
 
 Name: cairo-dock
-Description: An eye-candy fully animated and configurable dock.
-Requires: gtk+-2.0 gthread-2.0 cairo librsvg-2.0 dbus-1 dbus-glib-1 libxml-2.0 xrender gtkglext-1.0 @xextend_required@ @glitz_required@ @libgio_required@
+Description: A pretty and convenient interface to your desktop: dock, panel, desklet.
+Requires: @packages_required@ @xextend_required@ @gtk_required@
 Libs: -L${libdir}
 Cflags: -I${includedir}/cairo-dock -I${includedir}/cairo-dock/gldit -I${includedir}/cairo-dock/icon-factory -I${includedir}/cairo-dock/implementations
 Version: @VERSION@

=== added directory 'cmake_modules'
=== added file 'cmake_modules/GNUInstallDirs.cmake'
--- cmake_modules/GNUInstallDirs.cmake	1970-01-01 00:00:00 +0000
+++ cmake_modules/GNUInstallDirs.cmake	2012-02-14 14:02:34 +0000
@@ -0,0 +1,182 @@
+# - Define GNU standard installation directories
+# Provides install directory variables as defined for GNU software:
+#  http://www.gnu.org/prep/standards/html_node/Directory-Variables.html
+# Inclusion of this module defines the following variables:
+#  CMAKE_INSTALL_<dir>      - destination for files of a given type
+#  CMAKE_INSTALL_FULL_<dir> - corresponding absolute path
+# where <dir> is one of:
+#  BINDIR           - user executables (bin)
+#  SBINDIR          - system admin executables (sbin)
+#  LIBEXECDIR       - program executables (libexec)
+#  SYSCONFDIR       - read-only single-machine data (etc)
+#  SHAREDSTATEDIR   - modifiable architecture-independent data (com)
+#  LOCALSTATEDIR    - modifiable single-machine data (var)
+#  LIBDIR           - object code libraries (lib or lib64)
+#  INCLUDEDIR       - C header files (include)
+#  OLDINCLUDEDIR    - C header files for non-gcc (/usr/include)
+#  DATAROOTDIR      - read-only architecture-independent data root (share)
+#  DATADIR          - read-only architecture-independent data (DATAROOTDIR)
+#  INFODIR          - info documentation (DATAROOTDIR/info)
+#  LOCALEDIR        - locale-dependent data (DATAROOTDIR/locale)
+#  MANDIR           - man documentation (DATAROOTDIR/man)
+#  DOCDIR           - documentation root (DATAROOTDIR/doc/PROJECT_NAME)
+# Each CMAKE_INSTALL_<dir> value may be passed to the DESTINATION options of
+# install() commands for the corresponding file type.  If the includer does
+# not define a value the above-shown default will be used and the value will
+# appear in the cache for editing by the user.
+# Each CMAKE_INSTALL_FULL_<dir> value contains an absolute path constructed
+# from the corresponding destination by prepending (if necessary) the value
+# of CMAKE_INSTALL_PREFIX.
+
+#=============================================================================
+# Copyright 2011 Nikita Krupen'ko <[e-mail]>
+# Copyright 2011 Kitware, Inc.
+#
+# Distributed under the OSI-approved BSD License (the "License");
+# see accompanying file Copyright.txt for details.
+#
+# This software is distributed WITHOUT ANY WARRANTY; without even the
+# implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+# See the License for more information.
+#=============================================================================
+# (To distribute this file outside of CMake, substitute the full
+#  License text for the above reference.)
+
+# Installation directories
+
+if(NOT DEFINED CMAKE_INSTALL_BINDIR)
+  set(CMAKE_INSTALL_BINDIR "bin" CACHE PATH "user executables (bin)")
+endif()
+
+#~ if(NOT DEFINED CMAKE_INSTALL_SBINDIR)
+  #~ set(CMAKE_INSTALL_SBINDIR "sbin" CACHE PATH "system admin executables (sbin)")
+#~ endif()
+#~ 
+#~ if(NOT DEFINED CMAKE_INSTALL_LIBEXECDIR)
+  #~ set(CMAKE_INSTALL_LIBEXECDIR "libexec" CACHE PATH "program executables (libexec)")
+#~ endif()
+#~ 
+#~ if(NOT DEFINED CMAKE_INSTALL_SYSCONFDIR)
+  #~ set(CMAKE_INSTALL_SYSCONFDIR "etc" CACHE PATH "read-only single-machine data (etc)")
+#~ endif()
+#~ 
+#~ if(NOT DEFINED CMAKE_INSTALL_SHAREDSTATEDIR)
+  #~ set(CMAKE_INSTALL_SHAREDSTATEDIR "com" CACHE PATH "modifiable architecture-independent data (com)")
+#~ endif()
+#~ 
+#~ if(NOT DEFINED CMAKE_INSTALL_LOCALSTATEDIR)
+  #~ set(CMAKE_INSTALL_LOCALSTATEDIR "var" CACHE PATH "modifiable single-machine data (var)")
+#~ endif()
+
+if(NOT DEFINED CMAKE_INSTALL_LIBDIR)
+  set(_LIBDIR_DEFAULT "lib")
+  # Override this default 'lib' with 'lib64' iff:
+  #  - we are on Linux system but NOT cross-compiling
+  #  - we are NOT on debian
+  #  - we are on a 64 bits system
+  # reason is: amd64 ABI: http://www.x86-64.org/documentation/abi.pdf
+  # Note that the future of multi-arch handling may be even
+  # more complicated than that: http://wiki.debian.org/Multiarch
+  if(CMAKE_SYSTEM_NAME MATCHES "Linux"
+      AND NOT CMAKE_CROSSCOMPILING
+      AND NOT EXISTS "/etc/debian_version")
+    if(NOT DEFINED CMAKE_SIZEOF_VOID_P)
+      message(AUTHOR_WARNING
+        "Unable to determine default CMAKE_INSTALL_LIBDIR directory because no target architecture is known. "
+        "Please enable at least one language before including GNUInstallDirs.")
+    else()
+      if("${CMAKE_SIZEOF_VOID_P}" EQUAL "8")
+        set(_LIBDIR_DEFAULT "lib64")
+      endif()
+    endif()
+  endif()
+  set(CMAKE_INSTALL_LIBDIR "${_LIBDIR_DEFAULT}" CACHE PATH "object code libraries (${_LIBDIR_DEFAULT})")
+endif()
+
+if(NOT DEFINED CMAKE_INSTALL_INCLUDEDIR)
+  set(CMAKE_INSTALL_INCLUDEDIR "include" CACHE PATH "C header files (include)")
+endif()
+
+#~ if(NOT DEFINED CMAKE_INSTALL_OLDINCLUDEDIR)
+  #~ set(CMAKE_INSTALL_OLDINCLUDEDIR "/usr/include" CACHE PATH "C header files for non-gcc (/usr/include)")
+#~ endif()
+
+if(NOT DEFINED CMAKE_INSTALL_DATAROOTDIR)
+  set(CMAKE_INSTALL_DATAROOTDIR "share" CACHE PATH "read-only architecture-independent data root (share)")
+endif()
+
+#-----------------------------------------------------------------------------
+# Values whose defaults are relative to DATAROOTDIR.  Store empty values in
+# the cache and store the defaults in local variables if the cache values are
+# not set explicitly.  This auto-updates the defaults as DATAROOTDIR changes.
+
+if(NOT CMAKE_INSTALL_DATADIR)
+  set(CMAKE_INSTALL_DATADIR "" CACHE PATH "read-only architecture-independent data (DATAROOTDIR)")
+  set(CMAKE_INSTALL_DATADIR "${CMAKE_INSTALL_DATAROOTDIR}")
+endif()
+
+#~ if(NOT CMAKE_INSTALL_INFODIR)
+  #~ set(CMAKE_INSTALL_INFODIR "" CACHE PATH "info documentation (DATAROOTDIR/info)")
+  #~ set(CMAKE_INSTALL_INFODIR "${CMAKE_INSTALL_DATAROOTDIR}/info")
+#~ endif()
+
+if(NOT CMAKE_INSTALL_LOCALEDIR)
+  set(CMAKE_INSTALL_LOCALEDIR "" CACHE PATH "locale-dependent data (DATAROOTDIR/locale)")
+  set(CMAKE_INSTALL_LOCALEDIR "${CMAKE_INSTALL_DATAROOTDIR}/locale")
+endif()
+
+if(NOT CMAKE_INSTALL_MANDIR)
+  set(CMAKE_INSTALL_MANDIR "" CACHE PATH "man documentation (DATAROOTDIR/man)")
+  set(CMAKE_INSTALL_MANDIR "${CMAKE_INSTALL_DATAROOTDIR}/man")
+endif()
+
+#~ if(NOT CMAKE_INSTALL_DOCDIR)
+  #~ set(CMAKE_INSTALL_DOCDIR "" CACHE PATH "documentation root (DATAROOTDIR/doc/PROJECT_NAME)")
+  #~ set(CMAKE_INSTALL_DOCDIR "${CMAKE_INSTALL_DATAROOTDIR}/doc/${PROJECT_NAME}")
+#~ endif()
+
+#-----------------------------------------------------------------------------
+
+mark_as_advanced(
+  CMAKE_INSTALL_BINDIR
+  #~ CMAKE_INSTALL_SBINDIR
+  #~ CMAKE_INSTALL_LIBEXECDIR
+  #~ CMAKE_INSTALL_SYSCONFDIR
+  #~ CMAKE_INSTALL_SHAREDSTATEDIR
+  #~ CMAKE_INSTALL_LOCALSTATEDIR
+  CMAKE_INSTALL_LIBDIR
+  CMAKE_INSTALL_INCLUDEDIR
+  #~ CMAKE_INSTALL_OLDINCLUDEDIR
+  CMAKE_INSTALL_DATAROOTDIR
+  CMAKE_INSTALL_DATADIR
+  #~ CMAKE_INSTALL_INFODIR
+  CMAKE_INSTALL_LOCALEDIR
+  CMAKE_INSTALL_MANDIR
+  #~ CMAKE_INSTALL_DOCDIR
+  )
+
+# Result directories
+
+foreach(dir
+    BINDIR
+    #~ SBINDIR
+    #~ LIBEXECDIR
+    #~ SYSCONFDIR
+    #~ SHAREDSTATEDIR
+    #~ LOCALSTATEDIR
+    LIBDIR
+    INCLUDEDIR
+    #~ OLDINCLUDEDIR
+    DATAROOTDIR
+    DATADIR
+    #~ INFODIR
+    LOCALEDIR
+    MANDIR
+    #~ DOCDIR
+    )
+  if(NOT IS_ABSOLUTE ${CMAKE_INSTALL_${dir}})
+    set(CMAKE_INSTALL_FULL_${dir} "${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_${dir}}")
+  else()
+    set(CMAKE_INSTALL_FULL_${dir} "${CMAKE_INSTALL_${dir}}")
+  endif()
+endforeach()

=== modified file 'copyright'
--- copyright	2011-03-17 14:08:48 +0000
+++ copyright	2012-02-14 14:02:34 +0000
@@ -2,7 +2,7 @@
 X-Upstream-Author: Fabrice Rey <[e-mail]>.
 
 Files: 	*/*
-Copyright: 2007-2011 Fabrice Rey <[e-mail]>
+Copyright: 2007-2012 Fabrice Rey <[e-mail]>
 Licence: GPL 3+ (See /usr/share/common-licenses/GPL-3 for complete licence)
  * 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

=== modified file 'data/ChangeLog.txt'
--- data/ChangeLog.txt	2011-09-26 11:14:46 +0000
+++ data/ChangeLog.txt	2012-02-14 14:02:34 +0000
@@ -2,3 +2,5 @@
 [ChangeLog]
 
 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.
+
+3.0.0 = <b>New version: <span color='red'>GLX-Dock 3.0</span>!</b>\n - The <b>taskbar</b> has been greatly enhanced.\n - The <b>Log out</b> applet has been rewritten, now allows to switch users.\n - The <b>control of the dock from the keyboard</b> is now very powerful:\n   - many shortkeys have been added in different applets\n   - you can activate a launcher by pressing a shortkey + its number\n   - all shortkeys can now be managed in a single place in the configuration window.\n - The <b>Sound Menu</b> from Ubuntu has been integrated into the Sound-Control applet.\n - A new <b>Twitter applet</b> lets you tweet in one click.\n - A new applet to <b>inhibit the screensaver</b> in one click.\n - Separators are transparent to click in <b>'Panel'</b> mode\n - Cairo-Dock now uses <b>GTK3</b>, for a better integration in a Gnome desktop\n - Few additions to the DBus API.\n - It's possible to donate to support the project!

=== modified file 'data/cairo-dock-simple.conf.in'
--- data/cairo-dock-simple.conf.in	2011-08-09 16:48:08 +0000
+++ data/cairo-dock-simple.conf.in	2012-02-14 14:02:34 +0000
@@ -37,13 +37,16 @@
 #F-[Taskbar;@pkgdatadir@/icons/icon-taskbar.png]
 frame_task =
 
-#l-[None;MacOSX;KDE;Gnome] Behaviour of the Taskbar:
-#{None     : Don't show opened windows in the dock.
-#MacOSX   : Mix applications with its launcher, show other windows only if they are minimized.
-#KDE : Mix applications with its launcher, show all others windows and group windows togather in sub-dock.
-#Gnome    : Separate the taskbar from the launchers and only show windows that are on the current desktop.}
+#Y-[None;0;0;Minimalistic;1;1;Integrated;1;1;Separated;1;1] Behaviour of the Taskbar:
+#{None       : Don't show opened windows in the dock.
+#Minimalistic: Mix applications with its launcher, show other windows only if they are minimized (like in MacOSX).
+#Integrated  : Mix applications with its launcher, show all others windows and group windows togather in sub-dock (default).
+#Separated   : Separate the taskbar from the launchers and only show windows that are on the current desktop.}
 taskbar = 2
 
+#l-[At the beginning of the dock;Before the launchers;After the launchers;At the end of the dock] Place new icons
+place icons = 2
+
 
 #F[Icons' animations and effects;@pkgdatadir@/icons/icon-movment.png]
 frame_anim=
@@ -71,16 +74,6 @@
 #l[Very small;Small;Medium;Big;Very Big] Icons size:
 icon size = 2
 
-#v
-sev_order=
-
-#B Separate the different types of icons?
-#{This will separate launchers, application, and applets from each others. Separators will be automatically inserted then.}
-separate icons = true
-
-#T[launchers;applications;applets] Order of the different types of icons :
-icon's type order = 0;1;2
-
 
 #F[Views;@pkgdatadir@/icons/icon-views.svg]
 frame_view =
@@ -96,6 +89,18 @@
 sub-dock view = default
 
 
+#[gtk-select-font]
+[Shortkeys]
+
+#F[Keyboard shortcuts currently available;gtk-select-font]
+frame_key=
+
+#_ 
+#{Many applets provide shortkeys for their actions. As soon as an applet is enabled, its shortkeys become available.
+#Double-click on a line, and press the shortkey you want to use for the corresponding action.}
+shortkeys=
+
+
 #[@pkgdatadir@/icons/icon-plug-ins.svg]
 [Add-ons]
 

=== modified file 'data/cairo-dock.conf.in'
--- data/cairo-dock.conf.in	2011-09-26 11:14:46 +0000
+++ data/cairo-dock.conf.in	2012-02-14 14:02:34 +0000
@@ -59,7 +59,7 @@
 unhide delay = 0
 
 #Y-[Hit the screen's border;0;0;Hit where the dock is;0;0;Hit the screen's corner;0;0;Hit a zone;1;2] How to call the dock back:
-callback = 0
+callback = 1
 
 #j-[2;999] Size of the zone :
 zone size = 80;10
@@ -104,20 +104,23 @@
 #F-[Behaviour;gtk-properties]
 frame1 =
 
-#B-[5] Show currently opened applications in the dock?
+#B-[8] 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
 
-#b- Only show icons whose windows are minimised
-hide visible = false
-
-#b- Only show applications on current desktop
-current desktop only = false
-
 #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
 
+#b- Only show applications on current desktop
+current desktop only = false
+
+#b- Only show icons whose windows are minimised
+hide visible = false
+
+#l-[At the beginning of the dock;Before the launchers;After the launchers;At the end of the dock] Place new icons
+place icons = 2
+
 #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.}
 group by class = true
@@ -156,7 +159,7 @@
 #F-[Interaction;gtk-refresh]
 frame2 =
 
-#l-[Nothing;Close;Minimize;Launch new] Action on middle-click on the related application
+#l-[Nothing;Close;Minimize;Launch new;Lower] Action on middle-click on the related application
 action on middle click = 1
 
 #b- Minimise the window when its icon is clicked, if it was already the active window ?
@@ -186,6 +189,18 @@
 animation on demands attention = rotate
 
 
+#[gtk-select-font]
+[Shortkeys]
+
+#F[Keyboard shortcuts currently available;gtk-select-font]
+frame_key=
+
+#_ 
+#{Many applets provide shortkeys for their actions. As soon as an applet is enabled, its shortkeys become available.
+#Double-click on a line, and press the shortkey you want to use for the corresponding action.}
+shortkeys=
+
+
 [System]
 
 #X-[Animations speed;@pkgdatadir@/icons/icon-movment.png]
@@ -492,6 +507,12 @@
 #{Any format allowed; leave this field empty if you don't want to use an image as background.}
 icons bg =
 
+#F+[Icons size;gtk-zoom-fit]
+frame_size =
+
+#j+[10;128] Icons' size at rest (width x height) :
+launcher size = 40;40
+
 #F+[Zoom effect;@pkgdatadir@/icons/icon-wave.png]
 frame_shape =
 #f+[1;5] Maximum zoom of the icons :
@@ -506,42 +527,6 @@
 #{in pixels.}
 icon gap = 0
 
-#F+[Reflections]
-frame_refl =
-
-#e+[0;1;light;strong] Reflective power of the plane :
-#{It is its albedo (reflectivity); at 1 the icons reflect to the maximum, at 0 reflections are not used.}
-albedo = .8
-
-#e+[0;1;small;tall] Height of the reflection:
-#{In percent of the icon's size. This parameter influence the total height of the dock.}
-field depth = 0.5
-
-#e+[0;1;Transparent;Opaque] Icons' transparency at rest :
-#{It is their transparency when the dock is at rest; they will "materialize" progressively as the dock grows up. The closer to 0, the more transparent they will be.}
-alpha at rest = 1
-
-#X+[Icons size]
-frame_size =
-
-#j+[10;128] Launcher's size at rest (width x height) :
-launcher size = 40;40
-
-#j+[10;128] Application's size at rest (width x height) :
-appli size = 40;40
-
-#j+[10;128] Applet's size at rest (width x height) :
-applet size = 40;40
-
-#m[Animated icons] Configure icons' animations.
-config_anim = 
-
-#M[icon effects] Configure icons' special effects (requires OpenGL).
-config_effect = 
-
-#M[illusion] Configure icons' animations on appearing/disappearing (require OpenGL capacity).
-config_illusion = 
-
 #X+[Separators]
 frame_sep =
 
@@ -565,18 +550,20 @@
 #C+ Colour of flat separators :
 separator color = 0.9;0.9;0.9;1.0
 
-
-#X+[Icons order]
-frame_order =
-
-#Y+[No;0;0;Separate applications from others;1;1;Separate applets from others;1;1;Separate all;1;1] Separate the different types of icons?
-#{If you separate a type of icons, the icons of this type will be placed together, separated from the others by a separator.
-#If you don't separate the icons, you can place them wherever you want, and insert separators manually. Applications will then be placed next to their launcher if they have one, or after the last launcher.}
-separate_icons = 0
-
-#T+[launchers;applications;applets] Order of the different types of icons :
-icon's type order = 0;1;2
-
+#X+[Reflections]
+frame_refl =
+
+#e+[0;1;light;strong] Reflective power of the plane :
+#{It is its albedo (reflectivity); at 1 the icons reflect to the maximum, at 0 reflections are not used.}
+albedo = .45
+
+#e+[0;1;small;tall] Height of the reflection:
+#{In percent of the icon's size. This parameter influence the total height of the dock.}
+field depth = 0.5
+
+#e+[0;1;Transparent;Opaque] Icons' transparency at rest :
+#{It is their transparency when the dock is at rest; they will "materialize" progressively as the dock grows up. The closer to 0, the more transparent they will be.}
+alpha at rest = 1
 
 #X+[Link the icons with a string]
 frame_string =

=== modified file 'data/container.desktop.in'
--- data/container.desktop.in	2011-08-09 16:48:08 +0000
+++ data/container.desktop.in	2012-02-14 14:02:34 +0000
@@ -35,7 +35,5 @@
 #f[0;100] Order you want for this launcher among the others:
 Order=0
 
-group = 0
-
 Icon Type = 1
 Type = Container

=== modified file 'data/default-theme/cairo-dock.conf'
--- data/default-theme/cairo-dock.conf	2011-09-26 11:14:46 +0000
+++ data/default-theme/cairo-dock.conf	2012-02-14 14:02:34 +0000
@@ -59,7 +59,7 @@
 unhide delay=0
 
 #Y-[Hit the screen's border;0;0;Hit where the dock is;0;0;Hit the screen's corner;0;0;Hit a zone;1;2] How to call the dock back:
-callback=0
+callback=1
 
 #j-[2;999] Size of the zone :
 zone size=80;10
@@ -278,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;Remote-Control
 
 
 [Background]

=== 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	2012-02-14 14:02:34 +0000
@@ -0,0 +1,48 @@
+#!/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
+			killall unity-panel-service
+		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

=== removed file 'data/desktop-manager/cairo-dock-session'
--- data/desktop-manager/cairo-dock-session	2011-10-11 10:53:26 +0000
+++ data/desktop-manager/cairo-dock-session	1970-01-01 00:00:00 +0000
@@ -1,47 +0,0 @@
-#!/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

=== modified file 'data/icons/CMakeLists.txt'
--- data/icons/CMakeLists.txt	2011-09-26 11:14:46 +0000
+++ data/icons/CMakeLists.txt	2012-02-14 14:02:34 +0000
@@ -49,6 +49,7 @@
 	icon-internet.svg
 	icon-labels.svg
 	icon-lock-icons.svg
+	icon-lower.svg
 	icon-maximize.svg
 	icon-minimize.svg
 	icon-mouse.svg

=== added file 'data/icons/icon-lower.svg'
--- data/icons/icon-lower.svg	1970-01-01 00:00:00 +0000
+++ data/icons/icon-lower.svg	2012-02-14 14:02:34 +0000
@@ -0,0 +1,130 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   version="1.0"
+   width="24"
+   height="24"
+   id="svg2"
+   inkscape:version="0.48.2 r9819"
+   sodipodi:docname="icon-lower.svg">
+  <metadata
+     id="metadata21">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <sodipodi:namedview
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-width="1084"
+     inkscape:window-height="729"
+     id="namedview19"
+     showgrid="false"
+     inkscape:zoom="17.383042"
+     inkscape:cx="12"
+     inkscape:cy="13.093622"
+     inkscape:window-x="7"
+     inkscape:window-y="41"
+     inkscape:window-maximized="0"
+     inkscape:current-layer="svg2" />
+  <defs
+     id="defs4">
+    <linearGradient
+       id="linearGradient3725">
+      <stop
+         id="stop3729"
+         style="stop-color:#f0c178;stop-opacity:1;"
+         offset="0" />
+      <stop
+         offset="0.5"
+         style="stop-color:#e18941;stop-opacity:1;"
+         id="stop3766" />
+      <stop
+         id="stop3731"
+         style="stop-color:#ec4f18;stop-opacity:1;"
+         offset="1" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient5105-262-943-861">
+      <stop
+         id="stop2487"
+         style="stop-color:#0d0d0d;stop-opacity:1"
+         offset="0" />
+      <stop
+         id="stop2489"
+         style="stop-color:#0d0d0d;stop-opacity:0"
+         offset="1" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient4222">
+      <stop
+         id="stop4224"
+         style="stop-color:#f6daae;stop-opacity:1;"
+         offset="0" />
+      <stop
+         id="stop4226"
+         style="stop-color:#ffffff;stop-opacity:0"
+         offset="1" />
+    </linearGradient>
+    <linearGradient
+       x1="24.138529"
+       y1="6.5316639"
+       x2="24.138529"
+       y2="45.690399"
+       id="linearGradient2833"
+       xlink:href="#linearGradient4222"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.5399382,0,0,0.5366811,-0.8489227,-5.8733974)" />
+    <linearGradient
+       x1="23.878078"
+       y1="18.541262"
+       x2="23.942078"
+       y2="36.509308"
+       id="linearGradient2836"
+       xlink:href="#linearGradient3725"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.8988874,0,0,0.8934652,-9.4637044,-13.933171)" />
+    <radialGradient
+       cx="11.25"
+       cy="19.03125"
+       r="8.0625"
+       fx="11.25"
+       fy="19.03125"
+       id="radialGradient2839"
+       xlink:href="#linearGradient5105-262-943-861"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.4061954,0,0,0.37209335,-3.8196983,7.9186058)" />
+  </defs>
+  <path
+     d="m 21.5,5.1276193 0,5.0051817 -9.442473,8.39899 -9.5575271,-8.39899 0,-5.0051817 z"
+     id="path2262"
+     style="fill:url(#linearGradient2836);fill-opacity:1;fill-rule:evenodd;stroke:#bb2b12;stroke-width:1;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;display:inline"
+     inkscape:connector-curvature="0"
+     sodipodi:nodetypes="cccccc" />
+  <path
+     d="m 20.5,6.1276193 0,3.0051813 L 12.162712,16.448642 3.5,9.1328006 3.5,6.1276193 z"
+     id="path2272"
+     style="opacity:0.4;fill:none;stroke:url(#linearGradient2833);stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;display:inline"
+     inkscape:connector-curvature="0"
+     sodipodi:nodetypes="cccccc" />
+</svg>

=== modified file 'data/launcher.desktop.in'
--- data/launcher.desktop.in	2011-08-09 16:48:08 +0000
+++ data/launcher.desktop.in	2012-02-14 14:02:34 +0000
@@ -12,13 +12,13 @@
 #v
 sep_display=
 
-#s Launcher's name :
+#s[Default] Launcher's name :
 Name =
 
-#S+ Image's name or path :
+#S+[Default] Image's name or path :
 Icon=
 
-#s Command to launch on click :
+#s[Default] Command to launch on click :
 #{Exemple : nautilus --no-desktop, gedit, etc. You can even enter a keyboard shortcut, for exemple <Alt>F1, <Ctrl>c,  <Ctrl>v, etc}
 Exec=
 
@@ -26,11 +26,11 @@
 #X[Extra parameters]
 frame_extra =
 
-#b Prevent this launcher from stealing appli from taskbar ?
+#b Prevent this launcher from stealing this application from taskbar ?
 #{If you choosed to mix launcher and applis, this option will deactivate this behaviour for this launcher only. It can be useful for instance for a launcher that launches a script in a terminal, but you don't want it to steal the Terminal's icon from the Taskbar.} 
 prevent inhibate = false
 
-#K Class of the program :
+#K[Default] Class of the program :
 #{The only reason you may want to modify this parameter is if you made this launcher by hands. If you dropped it into the dock from the menu, it is nearly sure that you shouldn't touch it. It defines the class of the program, which is useful to link the appli with its launcher.}
 StartupWMClass = 
 

=== modified file 'data/main-dock.conf.in'
--- data/main-dock.conf.in	2011-08-09 16:48:08 +0000
+++ data/main-dock.conf.in	2012-02-14 14:02:34 +0000
@@ -36,7 +36,7 @@
 #F-[Visibility of the dock;@pkgdatadir@/icons/icon-visibility.svg]
 frame_visi =
 
-#l-[Always on top;Reserve space for the dock;Keep the dock below;Hide the dock when it overlaps the current window;Hide the dock whenever it overlaps any window;Keep the dock hidden;Pop-up on shortcut] Visibility:
+#l-[Always on top;Reserve space for the dock;Keep the dock below;Hide the dock when it overlaps the current window;Hide the dock whenever it overlaps any window;Keep the dock hidden] Visibility:
 #{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.}
@@ -46,6 +46,12 @@
 #[@pkgdatadir@/icons/icon-appearance.svg]
 [Appearance]
 
+#F[Icons;@pkgdatadir@/icons/icon-icons.svg]
+frame_icons=
+
+#l[Same as main dock;Tiny;Very small;Small;Medium;Big;Very Big] Icons size:
+icon size = 0
+
 #F[Views;@pkgdatadir@/icons/icon-views.svg]
 frame_view =
 

=== modified file 'data/man/CMakeLists.txt'
--- data/man/CMakeLists.txt	2011-10-11 10:53:26 +0000
+++ data/man/CMakeLists.txt	2012-02-14 14:02:34 +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} -9 -c ${CMAKE_CURRENT_SOURCE_DIR}/${man}
+	execute_process(COMMAND ${GZIP_TOOL} -9c ${CMAKE_CURRENT_SOURCE_DIR}/${man}
 						OUTPUT_FILE ${CMAKE_CURRENT_BINARY_DIR}/${man}.gz)
 endforeach(man)
 

=== modified file 'data/man/cairo-dock_en.1'
--- data/man/cairo-dock_en.1	2011-08-09 16:48:08 +0000
+++ data/man/cairo-dock_en.1	2012-02-14 14:02:34 +0000
@@ -32,7 +32,7 @@
 .PP
 It's recommended to install the PLUG\-INS package (
 .B cairo\-dock\-plug\-ins
-) to have acces to more views, dialogs and many plug\-ins and applets.
+) to have access to more views, dialogues and many plug\-ins and applets.
 .PP
 Some
 .B screenshots
@@ -138,21 +138,27 @@
 .B Cairo\-Dock
 project was written by 
 .B Fabrice Rey
-(fabounet) <[e-mail]>.
-.br
+(fabounet) <[e-mail]>.
+.PP
 The
 .B Cairo\-Dock Team
-is formed by
+is currently formed by
 .B Fabounet
-(Fabrice Rey),
+(Fabrice Rey) and
+.B Matttbe
+(Matthieu Baerts).
+.br
+With the help of
+.B Eduardo Mucelli
+for our third-party applets.
+.PP
+Thanks to our former developers:
 .B Mav
 (Yann Sladek),
 .B Tofe
 (Christophe Chapuis),
 .B Nochka85
 (Yann Dulieu),
-.B Matttbe
-(Matthieu Baerts)
 .B ChanGFu
 (Rémy Robertson),
 .B Paradoxxx\ Zero
@@ -164,7 +170,19 @@
 .B Ctaf
 ,
 .B Augur
- as well as numerous beta testers (ppmt, vilraleur, M.Tasaka, etc. see the 'About' menu in the dock) !
+and
+.B SQP
+as well as numerous beta testers and contributors:
+lylambda, taiebot65, Franksuse64, ppmt, etc.
+see the 'About' menu in the dock and this web page.
+.br
+        http://glx\-dock.org/userlist_messages.php
+.PP
+Don't hesitate to contribute to this project ;)
+.br
+Please have a look at this wiki page:
+.br
+        http://glx\-dock.org/ww_page.php?p=How%20to%20help%20us
 .PP
 This manual page was started by Julien Lavergne <[e-mail]>,
 for the Debian project (but may be used by others).
@@ -175,13 +193,17 @@
 Your bug is maybe a
 .B recurrent problem
 (black background, window at startup (use \-c or \-o),
-problem with OpenGL, etc.). Please go to http://www.glx\-dock.org/ww_page.php?p=Recurrents%20problems&lang=en
+problem with OpenGL, etc.). Please go to:
+.br
+        http://www.glx\-dock.org/ww_page.php?p=Recurrents%20problems
 .PP
-For any other bugs, you can post them on Cairo\-Dock forum
-(http://forum.glx\-dock.org)
+For any other bugs, you can post them on Cairo\-Dock forum:
+.br
+        http://forum.glx\-dock.org
 .br
 or on Launchpad
-(https://bugs.launchpad.net/cairo\-dock)
+.br
+        https://bugs.launchpad.net/cairo\-dock
 
 .SH WEBSITE
 <

=== modified file 'data/separator.desktop.in'
--- data/separator.desktop.in	2011-08-09 16:48:08 +0000
+++ data/separator.desktop.in	2012-02-14 14:02:34 +0000
@@ -21,7 +21,5 @@
 #f[0;100] Order you want for this launcher among the others:
 Order=0
 
-group = 0
-
 Icon Type = 2
 Type = Separator

=== modified file 'debian/cairo-dock-core.install'
--- debian/cairo-dock-core.install	2011-10-11 10:53:26 +0000
+++ debian/cairo-dock-core.install	2012-02-14 14:02:34 +0000
@@ -2,5 +2,4 @@
 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/man1/cairo-dock.1.gz
-debian/tmp/usr/lib*/*.so.*
+debian/tmp/usr/share/man/

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

=== removed file 'debian/cairo-dock-dev.install'
--- debian/cairo-dock-dev.install	2011-10-11 10:53:26 +0000
+++ debian/cairo-dock-dev.install	1970-01-01 00:00:00 +0000
@@ -1,3 +0,0 @@
-debian/tmp/usr/include
-debian/tmp/usr/lib*/pkgconfig
-debian/tmp/usr/lib*/*.so

=== modified file 'debian/changelog'
--- debian/changelog	2011-10-11 10:53:26 +0000
+++ debian/changelog	2012-02-14 14:02:34 +0000
@@ -1,3 +1,42 @@
+cairo-dock (3.0.0.0beta1-0ubuntu1) UNRELEASED; urgency=low
+
+  * New upstream release. (LP: #932041)
+  * Upstream (short) ChangeLog:
+   - The taskbar has been greatly enhanced.
+   - The control of the dock from the keyboard is now very powerful:
+    - many shortkeys have been added in different applets
+    - you can activate a launcher by pressing a shortkey + its number
+    - all shortkeys can now be managed in a single place
+       in the configuration window.
+   - A new Twitter applet lets you tweet in one click.
+   - A new applet to inhibit the screensaver in one click.
+   - Cairo-Dock now uses GTK3, for a better integration in a Gnome desktop
+   - It's possible to donate to support the project!
+   - (...)
+  * debian/patches:
+   - Removed all previous patches (now in upstream)
+  * debian/rules and debian/control:
+   - Added multiarch support
+  * debian/control:
+   - libgtk-3-dev is now needed instead of libgtk2.0-dev
+   - libgtkglext1-dev is no longer needed
+      (replaced by libgl, libglu and libpango)
+   - cairo-dock: increase the version of plug-ins packages
+      and added: cairo-dock-plug-ins-dbus-interface-python
+   - cairo-dock-dev has been replaced by libgldi-dev
+      and dependences have been updated
+   - Added a new package (libgldi3) in order to support multiarch
+      and to fix this lintian error: package-name-doesnt-match-sonames
+  * debian/cairo-dock-core.install and debian/libgldi3.install:
+   - libgldi3 package has been added
+   - It contains the library used by cairo-dock
+   - MultiArch is supported
+  * debian/cairo-dock-dev.install and debian/libgldi-dev.install:
+   - cairo-dock-dev has been replaced by libgldi-dev
+  * Updated debian/watch
+
+ -- Matthieu Baerts (matttbe) <[e-mail]>  Tue, 14 Feb 2012 13:56:31 +0100
+
 cairo-dock (2.4.0~2-0ubuntu1) oneiric; urgency=low
 
   [ Matthieu Baerts (matttbe) ]

=== modified file 'debian/compat'
--- debian/compat	2009-08-26 17:13:42 +0000
+++ debian/compat	2012-02-14 14:02:34 +0000
@@ -1,1 +1,1 @@
-7
+8

=== modified file 'debian/control'
--- debian/control	2011-10-11 10:53:26 +0000
+++ debian/control	2012-02-14 14:02:34 +0000
@@ -4,19 +4,21 @@
 Maintainer: Ubuntu Developers <[e-mail]>
 XSBC-Original-Maintainer: Matthieu Baerts (matttbe) <[e-mail]>, Julien Lavergne <[e-mail]>, Fabrice Rey <[e-mail]>
 Build-Depends: 	cdbs, 
-		debhelper (>= 7),
+		debhelper (>= 8.1.3),
 		cmake,
 		libcairo2-dev, 
-		libgtk2.0-dev, 
+		libgtk-3-dev, 
 		librsvg2-dev,
 		libdbus-glib-1-dev,
 		libxml2-dev,
 		libxtst-dev,
 		libxrender-dev,
 		libxcomposite-dev,
-		libgtkglext1-dev,
 		libxinerama-dev,
 		libglib2.0-dev,
+		libgl1-mesa-dev | libgl-dev,
+		libglu1-mesa-dev | libglu-dev,
+		libpango1.0-dev,
 		libcurl4-gnutls-dev
 Standards-Version: 3.9.2
 Homepage: http://www.glx-dock.org/
@@ -26,8 +28,10 @@
 Architecture: all
 Conflicts: 	cairo-dock (<= 2.0.8.0)
 Depends: 	cairo-dock-core (>= ${source:Version}),
-		cairo-dock-plug-ins (>= 2.4.0~2),
-		${misc:Depends}
+			cairo-dock-plug-ins (>= 3.0.0.0beta1),
+			cairo-dock-plug-ins-integration (>= 3.0.0.0beta1),
+			cairo-dock-plug-ins-dbus-interface-python (>= 3.0.0.0beta1),
+			${misc:Depends}
 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! 
@@ -50,8 +54,8 @@
 Conflicts: cairo-dock (<= 2.0.8.0)
 Replaces: cairo-dock (<= 2.0.8.0) 
 Depends: 	cairo-dock-data (>= ${source:Version}),
-		${shlibs:Depends}, 
-		${misc:Depends}
+			${shlibs:Depends}, 
+			${misc:Depends}
 Recommends:	cairo-dock, cairo-dock-plug-ins
 Suggests:	firefox, gnome-terminal, empathy, inkscape, gimp, shotwell, rhythmbox
 Description: Light and eye-candy dock to launch your programs (core package)
@@ -68,24 +72,28 @@
  .
  This package is the core of Cairo-Dock project.
 
-Package: cairo-dock-dev
+Package: libgldi-dev
 Section: libdevel
-Architecture: all
-Depends: 	cairo-dock-core (>= ${source:Version}),
+Architecture: any
+Depends: 	libgldi3 (= ${binary:Version}),
 		${misc:Depends},
-		cmake,
-		libcairo2-dev, 
-		libgtk2.0-dev, 
+		libcairo2-dev,
+		libgtk-3-dev,
 		librsvg2-dev,
 		libdbus-glib-1-dev,
 		libxml2-dev,
 		libxtst-dev,
 		libxrender-dev,
 		libxcomposite-dev,
-		libgtkglext1-dev,
 		libxinerama-dev,
-		libglib2.0-dev
-Recommends:	cairo-dock-plug-ins
+		libglib2.0-dev,
+		libgl1-mesa-dev | libgl-dev,
+		libglu1-mesa-dev | libglu-dev,
+		libpango1.0-dev,
+		libcurl4-gnutls-dev
+Pre-Depends: ${misc:Pre-Depends}
+Recommends:	cairo-dock
+Multi-Arch: same
 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! 
@@ -106,8 +114,7 @@
 Architecture: all
 Conflicts: cairo-dock (<= 2.0.8.0)
 Replaces: cairo-dock (<= 2.0.8.0) 
-Depends: 	${shlibs:Depends}, 
-		${misc:Depends}
+Depends: 	${misc:Depends}
 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! 
@@ -121,3 +128,29 @@
  Development site: https://launchpad.net/cairo-dock
  .
  This package contains default icons and themes for Cairo-Dock.
+
+Package: libgldi3
+Section: graphics
+Architecture: any
+Conflicts:	cairo-dock (<= 2.0.8.0)
+Replaces:	cairo-dock (<= 2.0.8.0),
+			cairo-dock-core (<< 3.0.0)
+Breaks:		cairo-dock-core (<< 3.0.0)
+Depends: 	${shlibs:Depends}, 
+			${misc:Depends}
+Recommends:	cairo-dock-data (>= ${source:Version})
+Pre-Depends: ${misc:Pre-Depends}
+Multi-Arch: same
+Description: Light and eye-candy dock to launch your programs (lib 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. 
+ Applets can be detached from the dock to act as desktop widgets. 
+ Numerous ready-to-use themes are downloadable in 1 click, and can be easily
+  customized at your convenience.
+ It can use hardware acceleration to be very fast and low on CPU.
+ .
+ Some screenshots are available : http://pics.glx-dock.org
+ Development site: https://launchpad.net/cairo-dock
+ .
+ This package contains the library created and used by the Cairo-Dock project.

=== added file 'debian/libgldi-dev.install'
--- debian/libgldi-dev.install	1970-01-01 00:00:00 +0000
+++ debian/libgldi-dev.install	2012-02-14 14:02:34 +0000
@@ -0,0 +1,3 @@
+debian/tmp/usr/include
+debian/tmp/usr/lib/*/pkgconfig
+debian/tmp/usr/lib/*/*.so

=== added file 'debian/libgldi3.install'
--- debian/libgldi3.install	1970-01-01 00:00:00 +0000
+++ debian/libgldi3.install	2012-02-14 14:02:34 +0000
@@ -0,0 +1,1 @@
+debian/tmp/usr/lib/*/*.so.*

=== removed file 'debian/patches/01-improved-cairo-dock-session.patch'
--- debian/patches/01-improved-cairo-dock-session.patch	2011-10-11 10:53:26 +0000
+++ debian/patches/01-improved-cairo-dock-session.patch	1970-01-01 00:00:00 +0000
@@ -1,106 +0,0 @@
-## 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/02-manpage-not-compressed-with-max-compression.patch'
--- debian/patches/02-manpage-not-compressed-with-max-compression.patch	2011-10-11 10:53:26 +0000
+++ debian/patches/02-manpage-not-compressed-with-max-compression.patch	1970-01-01 00:00:00 +0000
@@ -1,19 +0,0 @@
-## 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-10-11 10:53:26 +0000
+++ debian/patches/series	2012-02-14 14:02:34 +0000
@@ -1,2 +0,0 @@
-01-improved-cairo-dock-session.patch
-02-manpage-not-compressed-with-max-compression.patch

=== modified file 'debian/rules'
--- debian/rules	2011-10-11 10:53:26 +0000
+++ debian/rules	2012-02-14 14:02:34 +0000
@@ -4,7 +4,8 @@
 DH_ALWAYS_EXCLUDE=CVS:.bzr
 
 DEB_CMAKE_EXTRA_FLAGS += -Denable_gtk_grip=yes \
-	-Denable-desktop-manager=yes
+	-Denable-desktop-manager=yes \
+	-DCMAKE_INSTALL_LIBDIR=lib/$(DEB_HOST_MULTIARCH)
 
 include /usr/share/cdbs/1/rules/debhelper.mk
 include /usr/share/cdbs/1/class/cmake.mk

=== modified file 'debian/watch'
--- debian/watch	2011-03-17 14:08:48 +0000
+++ debian/watch	2012-02-14 14:02:34 +0000
@@ -1,2 +1,2 @@
 version=3
-https://launchpad.net/cairo-dock-core/+download .*/cairo-dock-([\d\.\-]+(?:~.*)?).tar.gz
+https://launchpad.net/cairo-dock-core/+download .*/cairo-dock-([\d\.]+(?:.*)?).tar.gz

=== modified file 'po/CMakeLists.txt'
--- po/CMakeLists.txt	2010-08-09 23:26:12 +0000
+++ po/CMakeLists.txt	2012-02-14 14:02:34 +0000
@@ -14,6 +14,6 @@
 		set (MO_OUTPUT ${PO_INPUT_BASE}.gmo)  # le nom du fichier en sortie.
 		message (STATUS "  Building ${MO_OUTPUT}...")
 		add_custom_command (TARGET i18n COMMAND ${MSGFMT_EXECUTABLE} -o  ${CMAKE_CURRENT_BINARY_DIR}/${MO_OUTPUT} ${PO_INPUT})  # appel a msgfmt.
-		install (FILES  ${CMAKE_CURRENT_BINARY_DIR}/${MO_OUTPUT} DESTINATION ${datadir}/locale/${PO_INPUT_BASE}/LC_MESSAGES RENAME ${GETTEXT_PACKAGE}.mo)  # installation du fichier dans le bon repertoire.
+		install (FILES  ${CMAKE_CURRENT_BINARY_DIR}/${MO_OUTPUT} DESTINATION ${CAIRO_DOCK_LOCALE_DIR}/${PO_INPUT_BASE}/LC_MESSAGES RENAME ${GETTEXT_PACKAGE}.mo)  # installation du fichier dans le bon repertoire.
 	endif()
 endforeach ()

=== modified file 'po/ar.po'
--- po/ar.po	2011-09-26 11:14:46 +0000
+++ po/ar.po	2012-02-14 14:02:34 +0000
@@ -7,160 +7,192 @@
 msgstr ""
 "Project-Id-Version: cairo-dock-core\n"
 "Report-Msgid-Bugs-To: [e-mail]\n"
-"POT-Creation-Date: 2011-09-23 23:42+0000\n"
-"PO-Revision-Date: 2011-09-20 08:48+0000\n"
+"POT-Creation-Date: 2012-02-13 01:12+0000\n"
+"PO-Revision-Date: 2012-02-13 02:57+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-09-25 04:33+0000\n"
-"X-Generator: Launchpad (build 14012)\n"
+"X-Launchpad-Export-Date: 2012-02-13 04:34+0000\n"
+"X-Generator: Launchpad (build 14781)\n"
 "Language: ar\n"
 
-#: ../src/cairo-dock-gui-commons.c:216
+#: ../src/cairo-dock-gui-commons.c:221
 msgid ""
 "You have made some changes to the current theme.\n"
 "You will lose them if you don't save before choosing a new theme. Continue "
 "anyway?"
 msgstr ""
 
-#: ../src/cairo-dock-gui-commons.c:242
+#: ../src/cairo-dock-gui-commons.c:247
 msgid "Please wait while importing the theme..."
 msgstr ""
 
-#: ../src/cairo-dock-gui-commons.c:364 ../src/cairo-dock-menu.c:1456
+#: ../src/cairo-dock-gui-commons.c:369
 msgid "Configure this applet"
 msgstr "تكوين الاضافة"
 
-#: ../src/cairo-dock-gui-commons.c:401 ../src/cairo-dock-gui-main.c:131
+#: ../src/cairo-dock-gui-commons.c:406 ../src/cairo-dock-gui-main.c:130
 msgid "Files"
 msgstr "ملفّات"
 
-#: ../src/cairo-dock-gui-commons.c:406 ../src/cairo-dock-gui-main.c:132
+#: ../src/cairo-dock-gui-commons.c:411 ../src/cairo-dock-gui-main.c:131
 msgid "Internet"
 msgstr "إنترنت"
 
-#: ../src/cairo-dock-gui-commons.c:411 ../src/cairo-dock-gui-main.c:133
+#: ../src/cairo-dock-gui-commons.c:416 ../src/cairo-dock-gui-main.c:132
 msgid "Desktop"
 msgstr "سطح المكتب"
 
-#: ../src/cairo-dock-gui-commons.c:416
+#: ../src/cairo-dock-gui-commons.c:421
 msgid "Accessory"
 msgstr "ملحقات"
 
-#: ../src/cairo-dock-gui-commons.c:421 ../src/cairo-dock-gui-main.c:135
-#: ../src/cairo-dock-gui-main.c:1504 ../data/messages:757
+#: ../src/cairo-dock-gui-commons.c:426 ../src/cairo-dock-gui-main.c:134
+#: ../src/cairo-dock-gui-main.c:1528 ../data/messages:779
 msgid "System"
 msgstr "النّظام"
 
-#: ../src/cairo-dock-gui-commons.c:426 ../src/cairo-dock-gui-main.c:136
+#: ../src/cairo-dock-gui-commons.c:431 ../src/cairo-dock-gui-main.c:135
 msgid "Fun"
 msgstr "مرح"
 
-#: ../src/cairo-dock-gui-commons.c:468
+#: ../src/cairo-dock-gui-commons.c:474
 msgid "plug-in"
 msgstr ""
 
-#: ../src/cairo-dock-gui-commons.c:474
+#: ../src/cairo-dock-gui-commons.c:480
 msgid "category"
 msgstr "تصنيف"
 
-#: ../src/cairo-dock-gui-items.c:384
+#: ../src/cairo-dock-gui-commons.c:575
+msgid "Press the shortkey"
+msgstr ""
+
+#: ../src/cairo-dock-gui-commons.c:594
+msgid "Change the shortkey"
+msgstr ""
+
+#: ../src/cairo-dock-gui-commons.c:681
+msgid "Origin"
+msgstr ""
+
+#: ../src/cairo-dock-gui-commons.c:686
+msgid "Action"
+msgstr ""
+
+#: ../src/cairo-dock-gui-commons.c:690
+msgid "Shortkey"
+msgstr ""
+
+#: ../src/cairo-dock-gui-items.c:242
 msgid ""
 "Main dock's parameters are available in the main configuration window."
 msgstr ""
 
-#: ../src/cairo-dock-gui-items.c:600
+#: ../src/cairo-dock-gui-items.c:459
 msgid "Launcher configuration"
 msgstr "اعدادات المشغل"
 
-#: ../src/cairo-dock-gui-main.c:129 ../data/messages:671
+#: ../src/cairo-dock-gui-items.c:877
+msgid "Remove this item"
+msgstr ""
+
+#: ../src/cairo-dock-gui-main.c:128 ../data/messages:675
 msgid "Behaviour"
 msgstr "السّلوك"
 
-#: ../src/cairo-dock-gui-main.c:130 ../data/messages:491 ../data/messages:1657
+#: ../src/cairo-dock-gui-main.c:129 ../data/messages:501 ../data/messages:1645
 msgid "Appearance"
 msgstr "المظهر"
 
-#: ../src/cairo-dock-gui-main.c:134
+#: ../src/cairo-dock-gui-main.c:133
 msgid "Accessories"
 msgstr "ملحقات"
 
-#: ../src/cairo-dock-gui-main.c:137 ../src/cairo-dock-gui-main.c:1653
-#: ../data/messages:1791
+#: ../src/cairo-dock-gui-main.c:136 ../src/cairo-dock-gui-main.c:1682
+#: ../data/messages:1797
 msgid "All"
 msgstr "الكل"
 
-#: ../src/cairo-dock-gui-main.c:1482
+#: ../src/cairo-dock-gui-main.c:1499
 msgid "Set the position of the main dock."
 msgstr "تحديد موضع الشريط الرئيسي."
 
-#: ../src/cairo-dock-gui-main.c:1483 ../data/messages:335 ../data/messages:545
+#: ../src/cairo-dock-gui-main.c:1500 ../data/messages:335 ../data/messages:549
 msgid "Position"
 msgstr "الموضع"
 
-#: ../src/cairo-dock-gui-main.c:1489
+#: ../src/cairo-dock-gui-main.c:1506
 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:1490 ../src/cairo-dock-menu.c:1494
+#: ../src/cairo-dock-gui-main.c:1507 ../src/cairo-dock-menu.c:1690
 #: ../data/messages:353
 msgid "Visibility"
 msgstr "الرؤية"
 
-#: ../src/cairo-dock-gui-main.c:1496
+#: ../src/cairo-dock-gui-main.c:1513
 msgid "Display and interact with currently open windows."
 msgstr "العرض والتفاعل مع النوافذ المفتوحة حاليا."
 
-#: ../src/cairo-dock-gui-main.c:1497 ../data/messages:41 ../data/messages:469
-#: ../data/messages:1323
+#: ../src/cairo-dock-gui-main.c:1514 ../data/messages:41 ../data/messages:469
+#: ../data/messages:1313
 msgid "Taskbar"
 msgstr "شريط المهام"
 
-#: ../src/cairo-dock-gui-main.c:1503
+#: ../src/cairo-dock-gui-main.c:1520
+msgid "Define all the keyboard shortcuts currently available."
+msgstr ""
+
+#: ../src/cairo-dock-gui-main.c:1521 ../data/messages:529 ../data/messages:773
+msgid "Shortkeys"
+msgstr ""
+
+#: ../src/cairo-dock-gui-main.c:1527
 msgid "All of the parameters you will never want to tweak."
 msgstr "المؤشرات التي لن تعدلها ابدا."
 
-#: ../src/cairo-dock-gui-main.c:1513
+#: ../src/cairo-dock-gui-main.c:1537
 msgid "Set a background for your dock."
 msgstr "تعيين خلفية  لشريطك"
 
-#: ../src/cairo-dock-gui-main.c:1514 ../data/messages:853
-#: ../data/messages:1251 ../data/messages:1665
+#: ../src/cairo-dock-gui-main.c:1538 ../data/messages:875
+#: ../data/messages:1241 ../data/messages:1671
 msgid "Background"
 msgstr "خلفيَّة"
 
-#: ../src/cairo-dock-gui-main.c:1520
+#: ../src/cairo-dock-gui-main.c:1544
 msgid "Select a view for each of your docks."
 msgstr "حدد طريقة عرض الشريط"
 
-#: ../src/cairo-dock-gui-main.c:1521 ../data/messages:523 ../data/messages:915
-#: ../data/messages:1659
+#: ../src/cairo-dock-gui-main.c:1545 ../data/messages:521 ../data/messages:937
+#: ../data/messages:1665
 msgid "Views"
 msgstr "العرض"
 
-#: ../src/cairo-dock-gui-main.c:1528
+#: ../src/cairo-dock-gui-main.c:1552
 msgid "Configure text bubble appearance."
 msgstr "ظهور فقاعة في خصائص النص."
 
-#: ../src/cairo-dock-gui-main.c:1529
+#: ../src/cairo-dock-gui-main.c:1553
 msgid "Dialog boxes"
 msgstr "صناديق الحوار"
 
-#: ../src/cairo-dock-gui-main.c:1536
+#: ../src/cairo-dock-gui-main.c:1560
 msgid "Applets can be displayed on your desktop as widgets."
 msgstr "يمكن عرض بريمجاتك على سطح المكتب في وجدات الشريط"
 
-#: ../src/cairo-dock-gui-main.c:1537 ../data/messages:101 ../data/messages:971
-#: ../data/messages:1383
+#: ../src/cairo-dock-gui-main.c:1561 ../data/messages:101 ../data/messages:993
+#: ../data/messages:1373
 msgid "Desklets"
 msgstr ""
 
-#: ../src/cairo-dock-gui-main.c:1544
+#: ../src/cairo-dock-gui-main.c:1568
 msgid ""
 "All about icons:\n"
 " size, reflection, icon theme,..."
@@ -168,76 +200,76 @@
 "كل ما يخص الايقونات:\n"
 " الحجم, الإنعكاس, سمة الايقونة, ..."
 
-#: ../src/cairo-dock-gui-main.c:1545 ../data/messages:11 ../data/messages:493
-#: ../data/messages:1035 ../data/messages:1293
+#: ../src/cairo-dock-gui-main.c:1569 ../data/messages:11 ../data/messages:503
+#: ../data/messages:1057 ../data/messages:1283 ../data/messages:1647
 msgid "Icons"
 msgstr "أيقونات"
 
-#: ../src/cairo-dock-gui-main.c:1551
+#: ../src/cairo-dock-gui-main.c:1575
 msgid "Indicators are additional markers for your icons."
 msgstr "المؤشرات هي علامات إضافية للأيقونات."
 
-#: ../src/cairo-dock-gui-main.c:1552 ../data/messages:1153
+#: ../src/cairo-dock-gui-main.c:1576 ../data/messages:1143
 msgid "Indicators"
 msgstr "المؤشرات"
 
-#: ../src/cairo-dock-gui-main.c:1559
+#: ../src/cairo-dock-gui-main.c:1583
 msgid "Define icon caption and quick-info style."
 msgstr "رمز تعريف وشرح سريع لمعلومات النمط."
 
-#: ../src/cairo-dock-gui-main.c:1560
+#: ../src/cairo-dock-gui-main.c:1584
 msgid "Captions"
 msgstr "تعليق"
 
-#: ../src/cairo-dock-gui-main.c:1629
+#: ../src/cairo-dock-gui-main.c:1654
 msgid "Categories"
 msgstr "التصنيفات"
 
-#: ../src/cairo-dock-gui-main.c:1767
+#: ../src/cairo-dock-gui-main.c:1796
 msgid "Filter"
 msgstr "فلترة"
 
-#: ../src/cairo-dock-gui-main.c:1814
+#: ../src/cairo-dock-gui-main.c:1843
 msgid "Options"
 msgstr "خيارات"
 
-#: ../src/cairo-dock-gui-main.c:1824
+#: ../src/cairo-dock-gui-main.c:1853
 msgid "All words"
 msgstr "كافة الكلمات"
 
-#: ../src/cairo-dock-gui-main.c:1828
+#: ../src/cairo-dock-gui-main.c:1857
 msgid "Highlighted words"
 msgstr "الكلمات المظللة"
 
-#: ../src/cairo-dock-gui-main.c:1833
+#: ../src/cairo-dock-gui-main.c:1862
 msgid "Hide others"
 msgstr "اخفاء الاخرى"
 
-#: ../src/cairo-dock-gui-main.c:1838
+#: ../src/cairo-dock-gui-main.c:1867
 msgid "Search in description"
 msgstr "البحث بالوصف"
 
-#: ../src/cairo-dock-gui-main.c:1852
+#: ../src/cairo-dock-gui-main.c:1881
 msgid "Enable this module"
 msgstr "تمكين هذه الوحدة"
 
-#: ../src/cairo-dock-gui-main.c:1916 ../data/messages:541
+#: ../src/cairo-dock-gui-main.c:1945 ../data/messages:545
 msgid "More applets"
 msgstr "مزيد من التطبيقات"
 
-#: ../src/cairo-dock-gui-main.c:1917 ../data/messages:539
+#: ../src/cairo-dock-gui-main.c:1946 ../data/messages:543
 msgid "Get more applets online !"
 msgstr "الحصول على المزيد من التطبيقات على الانترنت!"
 
-#: ../src/cairo-dock-gui-main.c:1951 ../src/cairo-dock.c:663
+#: ../src/cairo-dock-gui-main.c:1982 ../src/cairo-dock.c:689
 msgid "< Maintenance mode >"
 msgstr "< وضع الصيانة >"
 
-#: ../src/cairo-dock-gui-main.c:2041 ../src/cairo-dock-gui-simple.c:901
+#: ../src/cairo-dock-gui-main.c:2072 ../src/cairo-dock-gui-simple.c:859
 msgid "Cairo-Dock configuration"
 msgstr "إعدادات كايرو دك"
 
-#: ../src/cairo-dock-gui-main.c:2396
+#: ../src/cairo-dock-gui-main.c:2437
 #, c-format
 msgid ""
 "The '%s' module is not present. You need to install it and all its "
@@ -246,57 +278,57 @@
 "'%s' الوحدة غير موجودة . تحتاج إلى تثبيتها وجميع تابعاتها من أجل استخدام هذه "
 "الوحدة"
 
-#: ../src/cairo-dock-gui-main.c:2402
+#: ../src/cairo-dock-gui-main.c:2443
 #, c-format
 msgid "The '%s' module is not enabled."
 msgstr "'%s' الوحدةغير مفعلة."
 
-#: ../src/cairo-dock-gui-main.c:2403
+#: ../src/cairo-dock-gui-main.c:2444
 msgid "Do you want to enable it now?"
 msgstr "هل تريد تفعيلها الان؟"
 
-#: ../src/cairo-dock-gui-main.c:2750
+#: ../src/cairo-dock-gui-main.c:2810
 msgid "Simple Mode"
 msgstr "الوضع البسيط"
 
-#: ../src/cairo-dock-gui-simple.c:408 ../src/cairo-dock-gui-themes.c:114
+#: ../src/cairo-dock-gui-simple.c:378 ../src/cairo-dock-gui-themes.c:114
 msgid "Could not import the theme."
 msgstr "ﻻيمكن اسيراد السمة ."
 
-#: ../src/cairo-dock-gui-simple.c:428
+#: ../src/cairo-dock-gui-simple.c:398
 msgid "Importing theme..."
 msgstr ""
 
-#: ../src/cairo-dock-gui-simple.c:435 ../src/cairo-dock-gui-themes.c:156
+#: ../src/cairo-dock-gui-simple.c:405 ../src/cairo-dock-gui-themes.c:156
 msgid "Theme has been saved"
 msgstr ""
 
-#: ../src/cairo-dock-gui-simple.c:441 ../src/cairo-dock-gui-themes.c:162
+#: ../src/cairo-dock-gui-simple.c:411 ../src/cairo-dock-gui-themes.c:162
 msgid "Themes have been deleted"
 msgstr ""
 
-#: ../src/cairo-dock-gui-simple.c:771
+#: ../src/cairo-dock-gui-simple.c:706
 msgid "Animation:"
 msgstr "تحريك:"
 
-#: ../src/cairo-dock-gui-simple.c:788
+#: ../src/cairo-dock-gui-simple.c:727
 msgid "Effects:"
 msgstr "تأثيرات:"
 
-#: ../src/cairo-dock-gui-simple.c:856
+#: ../src/cairo-dock-gui-simple.c:795
 msgid ""
 "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:485
+#: ../src/cairo-dock-gui-simple.c:821 ../data/messages:495
 msgid "On mouse hover:"
 msgstr "حدث مرور الفأرة:"
 
-#: ../src/cairo-dock-gui-simple.c:867 ../data/messages:487
+#: ../src/cairo-dock-gui-simple.c:823 ../data/messages:497
 msgid "On click:"
 msgstr "عند الضغط:"
 
-#: ../src/cairo-dock-gui-simple.c:938
+#: ../src/cairo-dock-gui-simple.c:896
 msgid ""
 "This is the simple configuration panel of Cairo-Dock.\n"
 " After you get familiar with it, and if you want to customise your theme\n"
@@ -304,11 +336,11 @@
 " You can switch from a mode to another at any time."
 msgstr ""
 
-#: ../src/cairo-dock-gui-simple.c:1063
+#: ../src/cairo-dock-gui-simple.c:1039
 msgid "Advanced Mode"
 msgstr "الوضع المتقدم"
 
-#: ../src/cairo-dock-gui-simple.c:1064
+#: ../src/cairo-dock-gui-simple.c:1040
 msgid ""
 "The advanced mode lets you tweak every single parameter of the dock. It is a "
 "powerful tool to customise your current theme."
@@ -324,541 +356,576 @@
 msgid "Manage Themes"
 msgstr "إدارة السمات"
 
-#: ../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
+#: ../src/cairo-dock-menu.c:123
 msgid "Delete this dock?"
 msgstr ""
 
-#: ../src/cairo-dock-menu.c:174
+#: ../src/cairo-dock-menu.c:177
 msgid "About Cairo-Dock"
 msgstr ""
 
-#: ../src/cairo-dock-menu.c:211 ../data/messages:283 ../data/messages:1565
+#: ../src/cairo-dock-menu.c:214 ../data/messages:283 ../data/messages:1555
 msgid "Development site"
 msgstr "موقع التطوير"
 
-#: ../src/cairo-dock-menu.c:212 ../data/messages:281 ../data/messages:1563
+#: ../src/cairo-dock-menu.c:215 ../data/messages:281 ../data/messages:1553
 msgid "Find the latest version of Cairo-Dock here !"
 msgstr "إبحث عن النسخه الاخيره  من البرنامج هنا !"
 
-#: ../src/cairo-dock-menu.c:216 ../src/cairo-dock-menu.c:447
+#: ../src/cairo-dock-menu.c:219 ../src/cairo-dock-menu.c:928
 msgid "Get more applets!"
 msgstr "الحصول على مزيد من التطبيقات!"
 
-#: ../src/cairo-dock-menu.c:220 ../src/cairo-dock-menu.c:226
+#: ../src/cairo-dock-menu.c:223 ../src/cairo-dock-menu.c:229
 msgid "Donate"
 msgstr ""
 
-#: ../src/cairo-dock-menu.c:223 ../src/cairo-dock-menu.c:229
+#: ../src/cairo-dock-menu.c:226 ../src/cairo-dock-menu.c:232
 msgid ""
 "Support the people who spend countless hours to bring you the best dock ever."
 msgstr ""
 
-#: ../src/cairo-dock-menu.c:240
+#: ../src/cairo-dock-menu.c:260
+msgid "Here is a list of the current developers and contributors"
+msgstr ""
+
+#: ../src/cairo-dock-menu.c:261
+msgid "Developers"
+msgstr ""
+
+#: ../src/cairo-dock-menu.c:262
+msgid "Main developer and project leader"
+msgstr ""
+
+#: ../src/cairo-dock-menu.c:263
+msgid "Contributors / Hackers"
+msgstr ""
+
+#: ../src/cairo-dock-menu.c:265
 msgid "Development"
 msgstr "تطوير"
 
-#: ../src/cairo-dock-menu.c:246
+#: ../src/cairo-dock-menu.c:280
+msgid "Website"
+msgstr ""
+
+#: ../src/cairo-dock-menu.c:281
+msgid "Beta-testing / Suggestions / Forum animation"
+msgstr ""
+
+#: ../src/cairo-dock-menu.c:282
+msgid "Translators for this language"
+msgstr ""
+
+#: ../src/cairo-dock-menu.c:283
+msgid "translator-credits"
+msgstr ""
+"Launchpad Contributions:\n"
+"  Ahmed Mohammed https://launchpad.net/~ahmedqatar\n"
+"  Fabounet https://launchpad.net/~fabounet03\n"
+"  Matthieu Baerts https://launchpad.net/~matttbe"
+
+#: ../src/cairo-dock-menu.c:285
+msgid "Support"
+msgstr "الدعم"
+
+#: ../src/cairo-dock-menu.c:315
+msgid ""
+"Thanks to all people that help us to improve the Cairo-Dock project.\n"
+"Thanks to all current, former and future contributors."
+msgstr ""
+
+#: ../src/cairo-dock-menu.c:317
+msgid "How to help us?"
+msgstr ""
+
+#: ../src/cairo-dock-menu.c:318
+msgid "Don't hesitate to join the project, we need you ;)"
+msgstr ""
+
+#: ../src/cairo-dock-menu.c:319
+msgid "Former contributors"
+msgstr ""
+
+#: ../src/cairo-dock-menu.c:320
+msgid "For a complete list, please have a look to BZR logs"
+msgstr ""
+
+#: ../src/cairo-dock-menu.c:321
+msgid "Users of our forum"
+msgstr ""
+
+#: ../src/cairo-dock-menu.c:322
 msgid "Artwork"
 msgstr "الأعمال الفنية"
 
-#: ../src/cairo-dock-menu.c:250
-msgid "Support"
-msgstr "الدعم"
+#: ../src/cairo-dock-menu.c:324
+msgid "Thanks"
+msgstr ""
 
-#: ../src/cairo-dock-menu.c:332
+#: ../src/cairo-dock-menu.c:401
 msgid "Quit Cairo-Dock?"
 msgstr "إغلاق برنامج كايرو-دوك؟"
 
-#: ../src/cairo-dock-menu.c:363
+#: ../src/cairo-dock-menu.c:431 ../src/cairo-dock-menu.c:573
+msgid "Separator"
+msgstr ""
+
+#: ../src/cairo-dock-menu.c:543
+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:567
+msgid "Add"
+msgstr "أضف"
+
+#: ../src/cairo-dock-menu.c:569
+msgid "Sub-dock"
+msgstr ""
+
+#: ../src/cairo-dock-menu.c:571
+msgid "Main dock"
+msgstr ""
+
+#: ../src/cairo-dock-menu.c:575
+msgid "Custom launcher"
+msgstr ""
+
+#: ../src/cairo-dock-menu.c:576
+msgid ""
+"Usually you would drag a launcher from the menu and drop it on the dock."
+msgstr "يتوجب في العاده سحب المشغل من القائمه وإفلاته على الشريط."
+
+#: ../src/cairo-dock-menu.c:593
+msgid "separator"
+msgstr "فاصل"
+
+#: ../src/cairo-dock-menu.c:597
+#, c-format
+msgid "You're about to remove this icon (%s) from the dock. Are you sure?"
+msgstr "انت على وشك ازالة الأيقون  (%s)من الشريط. هل انت متأكد؟"
+
+#: ../src/cairo-dock-menu.c:609
+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:633
+msgid "Sorry, this icon doesn't have a configuration file."
+msgstr "عذرا ، هذا الايقون لا يملك  ملف التكوين."
+
+#: ../src/cairo-dock-menu.c:673
+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:731
+msgid ""
+"Sorry, couldn't find the corresponding description file.\n"
+"Consider dragging and dropping the launcher from the Applications Menu."
+msgstr ""
+"عفوا, لم يتم العثور على الملف المطابق.\n"
+"حاول سحب المشغل وإفلاته من قائمه التطبيقات."
+
+#: ../src/cairo-dock-menu.c:772
+#, c-format
+msgid "You're about to remove this applet (%s) from the dock. Are you sure?"
+msgstr "انت على وشك ازالة الاضافة  (%s)من الشريط . هل انت متأكد ؟"
+
+#: ../src/cairo-dock-menu.c:830
 msgid "Configure"
 msgstr "عدل"
 
-#: ../src/cairo-dock-menu.c:368
+#: ../src/cairo-dock-menu.c:835
 msgid "Configure behaviour, appearance, and applets."
 msgstr "تكوين السلوك والمظهر والاضفات ."
 
-#: ../src/cairo-dock-menu.c:372
+#: ../src/cairo-dock-menu.c:840
 msgid "Configure this dock"
 msgstr "ضبط الشريط"
 
-#: ../src/cairo-dock-menu.c:377
+#: ../src/cairo-dock-menu.c:845
 msgid "Customize the position, visibility and appearance of this main dock."
 msgstr ""
 
-#: ../src/cairo-dock-menu.c:379
+#: ../src/cairo-dock-menu.c:847
 msgid "Delete this dock"
 msgstr ""
 
-#: ../src/cairo-dock-menu.c:388
+#: ../src/cairo-dock-menu.c:857
 msgid "Manage themes"
 msgstr "إدارة الثيمات"
 
-#: ../src/cairo-dock-menu.c:393
+#: ../src/cairo-dock-menu.c:862
 msgid ""
 "Choose from amongst many themes on the server or save your current theme."
 msgstr "اختر من العديد من السمات في الخادم او حفظ السمة الخاصة بك ."
 
-#: ../src/cairo-dock-menu.c:399
-msgid "Unlock icons"
-msgstr "فتح الايقونات"
-
-#: ../src/cairo-dock-menu.c:399
-msgid "Lock icons"
-msgstr "قفل الايقونات"
-
-#: ../src/cairo-dock-menu.c:403
+#: ../src/cairo-dock-menu.c:875
+msgid "Unlock icons position"
+msgstr ""
+
+#: ../src/cairo-dock-menu.c:875
+msgid "Lock icons position"
+msgstr ""
+
+#: ../src/cairo-dock-menu.c:879
 msgid "This will (un)lock the position of the icons."
 msgstr "هذا سيلغي قفل مكان الأيقونات."
 
-#: ../src/cairo-dock-menu.c:407
-msgid "Unlock dock"
-msgstr "إالغاء قفل الشريط"
-
-#: ../src/cairo-dock-menu.c:407
-msgid "Lock dock"
-msgstr "قفل الشريط"
-
-#: ../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
+#: ../src/cairo-dock-menu.c:903
 msgid "Quick-Hide"
 msgstr "إخفاء سريع"
 
-#: ../src/cairo-dock-menu.c:429
+#: ../src/cairo-dock-menu.c:908
 msgid "This will hide the dock until you hover over it with the mouse."
 msgstr "سيختفي الشريط حتى تقوم بتمرير المؤشر عليه"
 
-#: ../src/cairo-dock-menu.c:437
+#: ../src/cairo-dock-menu.c:917
 msgid "Launch Cairo-Dock on startup"
 msgstr "تشغيل شريط كيرو عند بدء التشغيل"
 
-#: ../src/cairo-dock-menu.c:452
+#: ../src/cairo-dock-menu.c:933
 msgid ""
 "Third-party applets provide integration with many programs, like Pidgin"
 msgstr ""
 
-#: ../src/cairo-dock-menu.c:459
+#: ../src/cairo-dock-menu.c:936 ../src/help/applet-init.c:28
+#: ../src/help/applet-notifications.c:257
+msgid "Help"
+msgstr "مساعدة"
+
+#: ../src/cairo-dock-menu.c:941
 msgid "There are no problems, only solutions (and a lot of useful hints!)"
 msgstr "لا يوجد مشاكل، فقط حلول (والعديد من التلميحات المفيده!)"
 
-#: ../src/cairo-dock-menu.c:461
+#: ../src/cairo-dock-menu.c:943
 msgid "About"
 msgstr "حول"
 
-#: ../src/cairo-dock-menu.c:469
+#: ../src/cairo-dock-menu.c:952
 msgid "Quit"
 msgstr "خروج"
 
-#: ../src/cairo-dock-menu.c:494
-msgid "separator"
-msgstr "فاصل"
-
-#: ../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: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: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:611
-msgid "Sorry, this icon doesn't have a configuration file."
-msgstr "عذرا ، هذا الايقون لا يملك  ملف التكوين."
-
-#: ../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: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:934
-msgid ""
-"Sorry, couldn't find the corresponding description file.\n"
-"Consider dragging and dropping the launcher from the Applications Menu."
-msgstr ""
-"عفوا, لم يتم العثور على الملف المطابق.\n"
-"حاول سحب المشغل وإفلاته من قائمه التطبيقات."
-
-#: ../src/cairo-dock-menu.c:1169
+#: ../src/cairo-dock-menu.c:961
+msgid ""
+"You're using a Cairo-Dock Session!\n"
+"It's not advised to quit the dock but you can press Shift to unlock this "
+"menu entry."
+msgstr ""
+
+#: ../src/cairo-dock-menu.c:993 ../src/cairo-dock-menu.c:1014
+msgid "Edit"
+msgstr ""
+
+#: ../src/cairo-dock-menu.c:995 ../src/cairo-dock-menu.c:1021
+msgid "Remove"
+msgstr ""
+
+#: ../src/cairo-dock-menu.c:996
+msgid ""
+"You can remove a launcher by dragging it out of the dock with the mouse ."
+msgstr "بإمكانك ازاله احد المشغلات بسحبه خارج الشريط بالمؤشر."
+
+#: ../src/cairo-dock-menu.c:998 ../src/cairo-dock-menu.c:1030
+msgid "Move to another dock"
+msgstr "نقل الى شريط اخر"
+
+#: ../src/cairo-dock-menu.c:1000 ../src/cairo-dock-menu.c:1032
+#: ../src/gldit/cairo-dock-gui-factory.c:1105
+msgid "New main dock"
+msgstr "شريط رئيسي جديد"
+
+#: ../src/cairo-dock-menu.c:1009
+msgid "Make it a launcher"
+msgstr "تحويله الى مشغل"
+
+#: ../src/cairo-dock-menu.c:1018
+msgid "Detach"
+msgstr ""
+
+#: ../src/cairo-dock-menu.c:1018
+msgid "Return to the dock"
+msgstr "عوده الى الشريط"
+
+#: ../src/cairo-dock-menu.c:1025
+msgid "Duplicate"
+msgstr ""
+
+#: ../src/cairo-dock-menu.c:1040
+msgid "Applet's handbook"
+msgstr ""
+
+#: ../src/cairo-dock-menu.c:1085
+msgid "Pick up an image"
+msgstr ""
+
+#: ../src/cairo-dock-menu.c:1316
 #, c-format
 msgid "Move all to desktop %d - face %d"
 msgstr "أنقل الكل إلى سطح المكتب %d - الوجه %d"
 
-#: ../src/cairo-dock-menu.c:1169
+#: ../src/cairo-dock-menu.c:1316
 #, c-format
 msgid "Move to desktop %d - face %d"
 msgstr "أنقل إلى سطح المكتب %d - الوجه %d"
 
-#: ../src/cairo-dock-menu.c:1171
+#: ../src/cairo-dock-menu.c:1318
 #, c-format
 msgid "Move all to desktop %d"
 msgstr "نقل الكل الى سطح المكتب %d"
 
-#: ../src/cairo-dock-menu.c:1171
+#: ../src/cairo-dock-menu.c:1318
 #, c-format
 msgid "Move to desktop %d"
 msgstr "أنقل إلى سطح المكتب %d"
 
-#: ../src/cairo-dock-menu.c:1173
+#: ../src/cairo-dock-menu.c:1320
 #, c-format
 msgid "Move all to face %d"
 msgstr "أنقل الكل إلى الوجه %d"
 
-#: ../src/cairo-dock-menu.c:1173
+#: ../src/cairo-dock-menu.c:1320
 #, c-format
 msgid "Move to face %d"
 msgstr "أنقل إلى الوجه %d"
 
-#: ../src/cairo-dock-menu.c:1211
-msgid "Add"
-msgstr "أضف"
-
-#: ../src/cairo-dock-menu.c:1213
-msgid "Sub-dock"
-msgstr ""
-
-#: ../src/cairo-dock-menu.c:1215
-msgid "Main dock"
-msgstr ""
-
-#: ../src/cairo-dock-menu.c:1218
-msgid "Separator"
-msgstr ""
-
-#: ../src/cairo-dock-menu.c:1222
-msgid "Custom launcher"
-msgstr ""
-
-#: ../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:1288
-msgid "Modify this separator"
-msgstr "تحرير الفاصل"
-
-#: ../src/cairo-dock-menu.c:1288
-msgid "Modify this launcher"
-msgstr "تعديل هذا المشغل"
-
-#: ../src/cairo-dock-menu.c:1290
-msgid "Remove this separator"
-msgstr "إزالة هذا الفاصل"
-
-#: ../src/cairo-dock-menu.c:1290
-msgid "Remove this launcher"
-msgstr "إزالة هذا المشغل"
-
-#: ../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:1293 ../src/cairo-dock-menu.c:1472
-msgid "Move to another dock"
-msgstr "نقل الى شريط اخر"
-
-#: ../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:1318 ../src/cairo-dock-menu.c:1416
+#: ../src/cairo-dock-menu.c:1566 ../src/cairo-dock-menu.c:1665
 msgid "Other actions"
 msgstr "خيارات أخرى"
 
-#: ../src/cairo-dock-menu.c:1324
+#: ../src/cairo-dock-menu.c:1568
 msgid "Move to this desktop"
 msgstr "نقل إالى سطح المكتب هذا"
 
-#: ../src/cairo-dock-menu.c:1339
+#: ../src/cairo-dock-menu.c:1583
 msgid "Not Fullscreen"
 msgstr "ليس ملء"
 
-#: ../src/cairo-dock-menu.c:1339
+#: ../src/cairo-dock-menu.c:1583
 msgid "Fullscreen"
 msgstr "ملء الشاشة"
 
-#: ../src/cairo-dock-menu.c:1343
+#: ../src/cairo-dock-menu.c:1587
 msgid "Don't keep above"
 msgstr "ﻻ تجعله في الاعلى"
 
-#: ../src/cairo-dock-menu.c:1343 ../data/messages:363
+#: ../src/cairo-dock-menu.c:1587 ../data/messages:363
 msgid "Keep above"
 msgstr "أبقها في الأعلى"
 
-#: ../src/cairo-dock-menu.c:1368
+#: ../src/cairo-dock-menu.c:1612
 msgid "Remove custom icon"
 msgstr "إزاله الايقونه المعدله"
 
-#: ../src/cairo-dock-menu.c:1372
+#: ../src/cairo-dock-menu.c:1616
 msgid "Set a custom icon"
 msgstr ""
 
-#: ../src/cairo-dock-menu.c:1375
+#: ../src/cairo-dock-menu.c:1619
 msgid "Kill"
 msgstr "اقتل"
 
-#: ../src/cairo-dock-menu.c:1380
-msgid "Make it a launcher"
-msgstr "تحويله الى مشغل"
-
-#: ../src/cairo-dock-menu.c:1383 ../src/cairo-dock-menu.c:1426
+#: ../src/cairo-dock-menu.c:1623 ../src/cairo-dock-menu.c:1671
 msgid "Launch a new (Shift+clic)"
 msgstr "تشغيل جديد (Shift+أنقر)"
 
-#: ../src/cairo-dock-menu.c:1385
+#: ../src/cairo-dock-menu.c:1627
 msgid "Show"
 msgstr "اظهر"
 
-#: ../src/cairo-dock-menu.c:1387
+#: ../src/cairo-dock-menu.c:1629
 msgid "Unmaximise"
 msgstr "غير مكبر"
 
-#: ../src/cairo-dock-menu.c:1387
+#: ../src/cairo-dock-menu.c:1629
 msgid "Maximise"
 msgstr "تكبير"
 
-#: ../src/cairo-dock-menu.c:1392 ../src/cairo-dock-menu.c:1394
+#: ../src/cairo-dock-menu.c:1634 ../src/cairo-dock-menu.c:1636
 msgid "Minimise"
 msgstr "تصغير"
 
-#: ../src/cairo-dock-menu.c:1392 ../src/cairo-dock-menu.c:1400
-#: ../src/help/applet-notifications.c:218
+#: ../src/cairo-dock-menu.c:1634 ../src/cairo-dock-menu.c:1641
+#: ../src/cairo-dock-menu.c:1649 ../src/help/applet-notifications.c:247
 msgid "middle-click"
 msgstr ""
 
-#: ../src/cairo-dock-menu.c:1400 ../src/cairo-dock-menu.c:1402
-#: ../data/messages:731
+#: ../src/cairo-dock-menu.c:1641 ../src/cairo-dock-menu.c:1643
+#: ../data/messages:751
+msgid "Lower"
+msgstr ""
+
+#: ../src/cairo-dock-menu.c:1649 ../src/cairo-dock-menu.c:1651
+#: ../data/messages:745
 msgid "Close"
 msgstr ""
 
-#: ../src/cairo-dock-menu.c:1422
+#: ../src/cairo-dock-menu.c:1667
 msgid "Move all to this desktop"
 msgstr "نقل الكل لسطح المكتب هذا"
 
-#: ../src/cairo-dock-menu.c:1428
+#: ../src/cairo-dock-menu.c:1673
 msgid "Show all"
 msgstr "إظهار الكل"
 
-#: ../src/cairo-dock-menu.c:1430
+#: ../src/cairo-dock-menu.c:1675
 msgid "Minimise all"
 msgstr "تصغير الكل"
 
-#: ../src/cairo-dock-menu.c:1432
+#: ../src/cairo-dock-menu.c:1677
 msgid "Close all"
 msgstr "إغلاق الكل"
 
-#: ../src/cairo-dock-menu.c:1460
-msgid "Detach this applet"
-msgstr ""
-
-#: ../src/cairo-dock-menu.c:1460
-msgid "Return to the dock"
-msgstr "عوده الى الشريط"
-
-#: ../src/cairo-dock-menu.c:1463
-msgid "Remove this applet"
-msgstr "حذف الاضافة"
-
-#: ../src/cairo-dock-menu.c:1467
-msgid "Launch another instance of this applet"
-msgstr ""
-
-#: ../src/cairo-dock-menu.c:1502 ../data/messages:361
+#: ../src/cairo-dock-menu.c:1698 ../data/messages:361
 msgid "Normal"
 msgstr "عادي"
 
-#: ../src/cairo-dock-menu.c:1508 ../data/messages:427 ../data/messages:595
-#: ../data/messages:1643
+#: ../src/cairo-dock-menu.c:1704 ../data/messages:427 ../data/messages:599
+#: ../data/messages:1633
 msgid "Always on top"
 msgstr "دائما في الأعلى"
 
-#: ../src/cairo-dock-menu.c:1515
+#: ../src/cairo-dock-menu.c:1711
 msgid "Always below"
 msgstr "دئما ادنى"
 
-#: ../src/cairo-dock-menu.c:1533 ../data/messages:369
+#: ../src/cairo-dock-menu.c:1728 ../data/messages:369
 msgid "Reserve space"
 msgstr "الإحتفاظ بالمسافه"
 
-#: ../src/cairo-dock-menu.c:1540
+#: ../src/cairo-dock-menu.c:1735
 msgid "On all desktops"
 msgstr "على كل سطوح المكتب"
 
-#: ../src/cairo-dock-menu.c:1546
+#: ../src/cairo-dock-menu.c:1741
 msgid "Lock position"
 msgstr "قفل التحريك"
 
-#: ../src/cairo-dock-user-interaction.c:405
+#: ../src/cairo-dock-user-interaction.c:416
 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:148
+#: ../src/cairo-dock.c:147
 #, c-format
 msgid "Happy new year %d !!!"
 msgstr ""
 
-#: ../src/cairo-dock.c:317
+#: ../src/cairo-dock.c:320
 msgid "Use Cairo backend."
 msgstr ""
 
-#: ../src/cairo-dock.c:320
+#: ../src/cairo-dock.c:323
 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
+#: ../src/cairo-dock.c:326
 msgid ""
 "Use OpenGL backend with indirect rendering. There are very few case where "
 "this option should be used."
 msgstr ""
 
-#: ../src/cairo-dock.c:331
+#: ../src/cairo-dock.c:329
+msgid "Ask again on startup which backend to use."
+msgstr ""
+
+#: ../src/cairo-dock.c:332
 msgid "Force the dock to consider this environnement - use it with care."
 msgstr ""
 
-#: ../src/cairo-dock.c:334
+#: ../src/cairo-dock.c:335
 msgid ""
 "Force the dock to load from this directory, instead of ~/.config/cairo-dock."
 msgstr ""
 
-#: ../src/cairo-dock.c:337
+#: ../src/cairo-dock.c:338
 msgid ""
 "Address of a server containing additional themes. This will overwrite the "
 "default server address."
 msgstr ""
 
-#: ../src/cairo-dock.c:340
+#: ../src/cairo-dock.c:341
 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
+#: ../src/cairo-dock.c:344
 msgid ""
 "Allow to edit the config before the dock is started and show the config "
 "panel on start."
 msgstr ""
 
-#: ../src/cairo-dock.c:346
+#: ../src/cairo-dock.c:347
 msgid "Exclude a given plug-in from activating (it is still loaded though)."
 msgstr ""
 
-#: ../src/cairo-dock.c:349
+#: ../src/cairo-dock.c:350
 msgid "Don't load any plug-ins."
 msgstr ""
 
-#: ../src/cairo-dock.c:352
+#: ../src/cairo-dock.c:353
 msgid ""
 "Log verbosity (debug,message,warning,critical,error); default is warning."
 msgstr ""
 
-#: ../src/cairo-dock.c:355
+#: ../src/cairo-dock.c:356
 msgid "Force to display some output messages with colors."
 msgstr ""
 
-#: ../src/cairo-dock.c:358
+#: ../src/cairo-dock.c:359
 msgid "Print version and quit."
 msgstr ""
 
-#: ../src/cairo-dock.c:361
+#: ../src/cairo-dock.c:362
 msgid "Lock the dock so that any modification is impossible for users."
 msgstr ""
 
-#: ../src/cairo-dock.c:365
+#: ../src/cairo-dock.c:366
 msgid "Keep the dock above other windows whatever."
 msgstr ""
 
-#: ../src/cairo-dock.c:368
+#: ../src/cairo-dock.c:369
 msgid "Don't make the dock appear on all desktops."
 msgstr ""
 
-#: ../src/cairo-dock.c:371
+#: ../src/cairo-dock.c:372
 msgid "Cairo-Dock makes anything, including coffee !"
 msgstr ""
 
-#: ../src/cairo-dock.c:374
+#: ../src/cairo-dock.c:375
 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
+#: ../src/cairo-dock.c:378
 msgid ""
 "For debugging purpose only. The crash manager will not be started to hunt "
 "down the bugs."
 msgstr ""
 
-#: ../src/cairo-dock.c:380
+#: ../src/cairo-dock.c:381
 msgid ""
 "For debugging purpose only. Some hidden and still unstable options will be "
 "activated."
 msgstr ""
 
-#: ../src/cairo-dock.c:499
+#: ../src/cairo-dock.c:502
 msgid "Use OpenGL in Cairo-Dock"
 msgstr "استخدام OpenGL في شريط كيرو"
 
-#: ../src/cairo-dock.c:507
+#: ../src/cairo-dock.c:510
 msgid ""
 "OpenGL allows you to use the hardware acceleration, reducing the CPU load to "
 "the minimum.\n"
@@ -870,11 +937,11 @@
 "  or with the -o option to force OpenGL and -c to force cairo.)"
 msgstr ""
 
-#: ../src/cairo-dock.c:512
+#: ../src/cairo-dock.c:521
 msgid "Remember this choice"
 msgstr "تذكر هذا الاختيار"
 
-#: ../src/cairo-dock.c:749
+#: ../src/cairo-dock.c:775
 #, c-format
 msgid ""
 "The module '%s' may have encountered a problem.\n"
@@ -900,77 +967,86 @@
 "ﻻ يمكن العثور على السِّمَةُ  القياسية. سوف يكون القياس الافتراضية مفعله .\n"
 "يمكنك تغيير ذلك عن طريق فتح تكوين هذه الوحدة. هل تريد أن تفعل ذلك الآن؟"
 
-#: ../src/gldit/cairo-dock-applet-facility.h:374
-msgid "Applet's handbook"
-msgstr ""
-
-#: ../src/gldit/cairo-dock-desklet-manager.c:860
+#: ../src/gldit/cairo-dock-desklet-manager.c:858
 msgid "_custom decoration_"
 msgstr "_زخرفه مخصصه_"
 
-#: ../src/gldit/cairo-dock-dock-manager.c:333
+#: ../src/gldit/cairo-dock-dock-manager.c:363
 msgid "Bottom dock"
 msgstr ""
 
-#: ../src/gldit/cairo-dock-dock-manager.c:335
+#: ../src/gldit/cairo-dock-dock-manager.c:365
 msgid "Top dock"
 msgstr ""
 
-#: ../src/gldit/cairo-dock-dock-manager.c:340
+#: ../src/gldit/cairo-dock-dock-manager.c:370
 msgid "Right dock"
 msgstr ""
 
-#: ../src/gldit/cairo-dock-dock-manager.c:342
+#: ../src/gldit/cairo-dock-dock-manager.c:372
 msgid "Left dock"
 msgstr ""
 
-#: ../src/gldit/cairo-dock-gui-factory.c:236
+#: ../src/gldit/cairo-dock-dock-manager.c:1632
+#: ../src/gldit/cairo-dock-dock-manager.c:1733
+msgid "Pop up the main dock"
+msgstr ""
+
+#: ../src/gldit/cairo-dock-gui-factory.c:243
 #, c-format
 msgid "by %s"
 msgstr ""
 
-#: ../src/gldit/cairo-dock-gui-factory.c:248
+#: ../src/gldit/cairo-dock-gui-factory.c:255
 msgid "kB"
 msgstr ""
 
-#: ../src/gldit/cairo-dock-gui-factory.c:250
+#: ../src/gldit/cairo-dock-gui-factory.c:257
 msgid "MB"
 msgstr ""
 
-#: ../src/gldit/cairo-dock-gui-factory.c:259
+#: ../src/gldit/cairo-dock-gui-factory.c:266
 msgid "Local"
 msgstr "محلِّي"
 
-#: ../src/gldit/cairo-dock-gui-factory.c:260
+#: ../src/gldit/cairo-dock-gui-factory.c:267
 msgid "User"
 msgstr "مستخدم"
 
-#: ../src/gldit/cairo-dock-gui-factory.c:261
+#: ../src/gldit/cairo-dock-gui-factory.c:268
 msgid "Net"
 msgstr "شبكة"
 
-#: ../src/gldit/cairo-dock-gui-factory.c:262
+#: ../src/gldit/cairo-dock-gui-factory.c:269
 msgid "New"
 msgstr "جديد"
 
-#: ../src/gldit/cairo-dock-gui-factory.c:263
+#: ../src/gldit/cairo-dock-gui-factory.c:270
 msgid "Updated"
 msgstr "محدث"
 
-#: ../src/gldit/cairo-dock-gui-factory.c:983
+#: ../src/gldit/cairo-dock-gui-factory.c:724
+msgid "Pick up a file"
+msgstr ""
+
+#: ../src/gldit/cairo-dock-gui-factory.c:724
+msgid "Pick up a directory"
+msgstr ""
+
+#: ../src/gldit/cairo-dock-gui-factory.c:984
 msgid "_Custom Icons_"
 msgstr "_ايقونه معدله_"
 
-#: ../src/gldit/cairo-dock-gui-factory.c:1347
+#: ../src/gldit/cairo-dock-gui-factory.c:1348
 msgid "Rate me"
 msgstr ""
 
-#: ../src/gldit/cairo-dock-gui-factory.c:1446
-#: ../src/gldit/cairo-dock-gui-factory.c:1448
+#: ../src/gldit/cairo-dock-gui-factory.c:1447
+#: ../src/gldit/cairo-dock-gui-factory.c:1449
 msgid "You must try the theme before you can rate it."
 msgstr "يتوجب عليك تجربة السمة قبل تقيمها"
 
-#: ../src/gldit/cairo-dock-gui-factory.c:1471
+#: ../src/gldit/cairo-dock-gui-factory.c:1472
 #, c-format
 msgid ""
 "The '%s' module was not found.\n"
@@ -980,7 +1056,7 @@
 "الـــــ '%s' لم يتم العثور علىالوحدة .\n"
 "يجب التأكد من تثبت الاصدار المتوافق مع الشريط لتمتع بهذه المزايا ."
 
-#: ../src/gldit/cairo-dock-gui-factory.c:1480
+#: ../src/gldit/cairo-dock-gui-factory.c:1481
 #, c-format
 msgid ""
 "The '%s' plug-in is not active.\n"
@@ -989,33 +1065,33 @@
 "الإضافة '%s' غير مفعله.\n"
 "هل تريد تفعليها الآن ؟"
 
-#: ../src/gldit/cairo-dock-gui-factory.c:2252
-#: ../src/gldit/cairo-dock-gui-factory.c:2831
+#: ../src/gldit/cairo-dock-gui-factory.c:2329
+#: ../src/gldit/cairo-dock-gui-factory.c:2912
 #, c-format
 msgid "Listing themes in '%s' ..."
 msgstr "قائمة السمات في '%s' ..."
 
-#: ../src/gldit/cairo-dock-gui-factory.c:2769
+#: ../src/gldit/cairo-dock-gui-factory.c:2846
 msgid "Theme"
 msgstr "سِمة"
 
-#: ../src/gldit/cairo-dock-gui-factory.c:2782
+#: ../src/gldit/cairo-dock-gui-factory.c:2859
 msgid "Rating"
 msgstr "تقييم"
 
-#: ../src/gldit/cairo-dock-gui-factory.c:2788
+#: ../src/gldit/cairo-dock-gui-factory.c:2865
 msgid "Sobriety"
 msgstr ""
 
-#: ../src/gldit/cairo-dock-gui-factory.c:2857
+#: ../src/gldit/cairo-dock-gui-factory.c:2938
 msgid "link"
 msgstr "رابط"
 
-#: ../src/gldit/cairo-dock-gui-factory.c:2910
+#: ../src/gldit/cairo-dock-gui-factory.c:2991
 msgid "Grab"
 msgstr "التقاط"
 
-#: ../src/gldit/cairo-dock-struct.h:419
+#: ../src/gldit/cairo-dock-struct.h:423
 msgid "Default"
 msgstr "الافتراضي"
 
@@ -1028,22 +1104,19 @@
 msgid "Last modification on:"
 msgstr ""
 
-#: ../src/gldit/cairo-dock-themes-manager.c:276
+#: ../src/gldit/cairo-dock-themes-manager.c:272
 #, c-format
 msgid ""
-"Could not access remote file %s/%s. Maybe the server is down.\n"
+"Could not access remote file %s. Maybe the server is down.\n"
 "Please retry later or contact us at glx-dock.org."
 msgstr ""
-"لا يمكن الوصول إلى الملف %s/%s عن بعد. قد يكون الخادم مشغول او متوقف عن "
-"العمل.\n"
-"حاول لاحقا. وفي حال استمرت المشكله اتصل بنا على glx-dock.org"
 
-#: ../src/gldit/cairo-dock-themes-manager.c:291
+#: ../src/gldit/cairo-dock-themes-manager.c:286
 #, c-format
 msgid "Are you sure you want to delete theme %s?"
 msgstr "هل تريد حذف السمة %s ؟"
 
-#: ../src/gldit/cairo-dock-themes-manager.c:293
+#: ../src/gldit/cairo-dock-themes-manager.c:288
 msgid "Are you sure you want to delete these themes?"
 msgstr "هل انت متأكد سوف تقوم بحذف هذه السمات ؟"
 
@@ -1085,72 +1158,85 @@
 "page."
 msgstr ""
 
-#: ../src/help/applet-notifications.c:169
-msgid "Unity is already disabled."
+#: ../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/help/applet-notifications.c:218
+#: ../src/help/applet-notifications.c:247
 msgid "Open global settings"
 msgstr ""
 
-#: ../src/help/applet-notifications.c:223
+#: ../src/help/applet-notifications.c:252
 msgid "Activate composite"
 msgstr ""
 
-#: ../src/help/applet-notifications.c:225
+#: ../src/help/applet-notifications.c:254
 msgid "Disable the gnome-panel"
 msgstr ""
 
-#: ../src/help/applet-notifications.c:227
+#: ../src/help/applet-notifications.c:256
 msgid "Disable Unity"
 msgstr ""
 
-#: ../src/help/applet-notifications.c:229
+#: ../src/help/applet-notifications.c:258
 msgid "Online help"
 msgstr ""
 
-#: ../src/icon-factory/cairo-dock-desktop-file-factory.c:128
+#: ../src/help/applet-tips-dialog.c:152
+msgid "Tips and Tricks"
+msgstr ""
+
+#: ../src/help/applet-tips-dialog.c:307
+msgid "Category"
+msgstr ""
+
+#: ../src/icon-factory/cairo-dock-desktop-file-factory.c:119
 msgid "Enter a command"
 msgstr ""
 
-#: ../src/icon-factory/cairo-dock-desktop-file-factory.c:129
+#: ../src/icon-factory/cairo-dock-desktop-file-factory.c:120
 msgid "New launcher"
 msgstr ""
 
-#: ../src/implementations/cairo-dock-hiding-effect.c:602 ../data/messages:445
-#: ../data/messages:613
+#: ../src/implementations/cairo-dock-hiding-effect.c:596 ../data/messages:445
+#: ../data/messages:617
 msgid "Move down"
 msgstr "تحريك للأسفل"
 
-#: ../src/implementations/cairo-dock-hiding-effect.c:610 ../data/messages:447
-#: ../data/messages:615
+#: ../src/implementations/cairo-dock-hiding-effect.c:604 ../data/messages:447
+#: ../data/messages:619
 msgid "Fade out"
 msgstr "تلاشي"
 
-#: ../src/implementations/cairo-dock-hiding-effect.c:618 ../data/messages:449
-#: ../data/messages:617
+#: ../src/implementations/cairo-dock-hiding-effect.c:612 ../data/messages:449
+#: ../data/messages:621
 msgid "Semi transparent"
 msgstr "شبه شفاف"
 
-#: ../src/implementations/cairo-dock-hiding-effect.c:627 ../data/messages:451
-#: ../data/messages:619
+#: ../src/implementations/cairo-dock-hiding-effect.c:621 ../data/messages:451
+#: ../data/messages:623
 msgid "Zoom out"
 msgstr "تصغير"
 
-#: ../src/implementations/cairo-dock-hiding-effect.c:635 ../data/messages:453
-#: ../data/messages:621
+#: ../src/implementations/cairo-dock-hiding-effect.c:629 ../data/messages:453
+#: ../data/messages:625
 msgid "Folding"
 msgstr "ثني"
 
-#: ../data/messages:1 ../data/messages:1283
+#: ../data/messages:1 ../data/messages:1273
 msgid "General"
 msgstr ""
 
-#: ../data/messages:3 ../data/messages:1285
+#: ../data/messages:3 ../data/messages:1275
 msgid "Using the dock"
 msgstr ""
 
-#: ../data/messages:5 ../data/messages:1287
+#: ../data/messages:5 ../data/messages:1277
 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-"
@@ -1159,11 +1245,11 @@
 "sould be on middle-click."
 msgstr ""
 
-#: ../data/messages:7 ../data/messages:1289
+#: ../data/messages:7 ../data/messages:1279
 msgid "Adding features"
 msgstr ""
 
-#: ../data/messages:9 ../data/messages:1291
+#: ../data/messages:9 ../data/messages:1281
 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"
@@ -1174,11 +1260,11 @@
 "and then just drag-and-drop the link of an applet into your dock."
 msgstr ""
 
-#: ../data/messages:13 ../data/messages:1295
+#: ../data/messages:13 ../data/messages:1285
 msgid "Adding a launcher"
 msgstr ""
 
-#: ../data/messages:15 ../data/messages:1297
+#: ../data/messages:15 ../data/messages:1287
 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"
@@ -1186,21 +1272,21 @@
 "its icon and select \"make it a launcher\"."
 msgstr ""
 
-#: ../data/messages:17 ../data/messages:1299
+#: ../data/messages:17 ../data/messages:1289
 msgid "Removing a launcher"
 msgstr ""
 
-#: ../data/messages:19 ../data/messages:1301
+#: ../data/messages:19 ../data/messages:1291
 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:1303
+#: ../data/messages:21 ../data/messages:1293
 msgid "Grouping icons into a sub-dock"
 msgstr ""
 
-#: ../data/messages:23 ../data/messages:1305
+#: ../data/messages:23 ../data/messages:1295
 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"
@@ -1208,11 +1294,11 @@
 "dock -> select the sub-dock's name."
 msgstr ""
 
-#: ../data/messages:25 ../data/messages:1307
+#: ../data/messages:25 ../data/messages:1297
 msgid "Moving icons"
 msgstr ""
 
-#: ../data/messages:27 ../data/messages:1309
+#: ../data/messages:27 ../data/messages:1299
 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 "
@@ -1221,7 +1307,7 @@
 "icon inside."
 msgstr ""
 
-#: ../data/messages:29 ../data/messages:1311
+#: ../data/messages:29 ../data/messages:1301
 msgid "Changing an icon's image"
 msgstr ""
 
@@ -1239,11 +1325,11 @@
 "window."
 msgstr ""
 
-#: ../data/messages:33 ../data/messages:1315
+#: ../data/messages:33 ../data/messages:1305
 msgid "Resizing icons"
 msgstr ""
 
-#: ../data/messages:35 ../data/messages:1317
+#: ../data/messages:35 ../data/messages:1307
 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 "
@@ -1254,11 +1340,11 @@
 "settings."
 msgstr ""
 
-#: ../data/messages:37 ../data/messages:1319
+#: ../data/messages:37 ../data/messages:1309
 msgid "Separating icons"
 msgstr ""
 
-#: ../data/messages:39 ../data/messages:1321
+#: ../data/messages:39 ../data/messages:1311
 msgid ""
 "You can add separators between icons by right-clicking on the dock -> add -> "
 "a separator.\n"
@@ -1268,11 +1354,11 @@
 "In the \"panel\" view, separators are represented as gap between icons."
 msgstr ""
 
-#: ../data/messages:43 ../data/messages:1325
+#: ../data/messages:43 ../data/messages:1315
 msgid "Using the dock as a taskbar"
 msgstr ""
 
-#: ../data/messages:45 ../data/messages:1327
+#: ../data/messages:45 ../data/messages:1317
 msgid ""
 "When an application is running, a corresponding icon will appear in the "
 "dock.\n"
@@ -1283,50 +1369,50 @@
 "the launcher, etc."
 msgstr ""
 
-#: ../data/messages:47 ../data/messages:1329
+#: ../data/messages:47 ../data/messages:1319
 msgid "Closing a window"
 msgstr ""
 
-#: ../data/messages:49 ../data/messages:1331
+#: ../data/messages:49 ../data/messages:1321
 msgid ""
 "You can close a window by middle-clicking on its icon (or from the menu)."
 msgstr ""
 
-#: ../data/messages:51 ../data/messages:1333
+#: ../data/messages:51 ../data/messages:1323
 msgid "Minimizing / restauring a window"
 msgstr ""
 
-#: ../data/messages:53 ../data/messages:1335
+#: ../data/messages:53 ../data/messages:1325
 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:1337
+#: ../data/messages:55 ../data/messages:1327
 msgid "Launching an application several times"
 msgstr ""
 
-#: ../data/messages:57 ../data/messages:1339
+#: ../data/messages:57 ../data/messages:1329
 msgid ""
 "You can launch an application several times by SHIFT+clicking on its icon "
 "(or from the menu)."
 msgstr ""
 
-#: ../data/messages:59 ../data/messages:1341
+#: ../data/messages:59 ../data/messages:1331
 msgid "Switching between the windows of a same application"
 msgstr ""
 
-#: ../data/messages:61 ../data/messages:1343
+#: ../data/messages:61 ../data/messages:1333
 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:1345
+#: ../data/messages:63 ../data/messages:1335
 msgid "Grouping windows of a given application"
 msgstr ""
 
-#: ../data/messages:65 ../data/messages:1347
+#: ../data/messages:65 ../data/messages:1337
 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"
@@ -1334,19 +1420,19 @@
 "side-by-side (if your Window Manager is able to do that)."
 msgstr ""
 
-#: ../data/messages:67 ../data/messages:1349
+#: ../data/messages:67 ../data/messages:1339
 msgid "Setting a custom icon for an application"
 msgstr ""
 
-#: ../data/messages:69 ../data/messages:1351
+#: ../data/messages:69 ../data/messages:1341
 msgid "See \"Changing an icon's image\" in the \"Icons\" category."
 msgstr ""
 
-#: ../data/messages:71 ../data/messages:1353
+#: ../data/messages:71 ../data/messages:1343
 msgid "Showing windows preview over the icons"
 msgstr ""
 
-#: ../data/messages:73 ../data/messages:1355
+#: ../data/messages:73 ../data/messages:1345
 msgid ""
 "You need to run Compiz, and enable the \"Window Preview\" plug-in in Compiz. "
 "Install \"ccsm\" to be able to configure Compiz."
@@ -1354,26 +1440,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: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
+#: ../data/messages:307 ../data/messages:311 ../data/messages:1347
+#: ../data/messages:1469 ../data/messages:1489 ../data/messages:1527
+#: ../data/messages:1569 ../data/messages:1573 ../data/messages:1579
+#: ../data/messages:1583 ../data/messages:1587 ../data/messages:1591
 msgid "Tip: If this line is grayed, it's because this tip is not for you.)"
 msgstr ""
 
-#: ../data/messages:77 ../data/messages:1359
+#: ../data/messages:77 ../data/messages:1349
 msgid "If you're using Compiz, you can click on this button:"
 msgstr ""
 
-#: ../data/messages:79 ../data/messages:1361
+#: ../data/messages:79 ../data/messages:1351
 msgid "Docks"
 msgstr ""
 
-#: ../data/messages:81 ../data/messages:1363
+#: ../data/messages:81 ../data/messages:1353
 msgid "Positionning the dock on the screen"
 msgstr ""
 
-#: ../data/messages:83 ../data/messages:1365
+#: ../data/messages:83 ../data/messages:1355
 msgid ""
 "The dock can be placed anywhere on the screen.\n"
 "In the case of the main dock, right-click -> Cairo-Dock -> configure, and "
@@ -1382,11 +1468,11 @@
 "dock, and then select the position you want."
 msgstr ""
 
-#: ../data/messages:85 ../data/messages:1367
+#: ../data/messages:85 ../data/messages:1357
 msgid "Hiding the dock to use all the screen"
 msgstr ""
 
-#: ../data/messages:87 ../data/messages:1369
+#: ../data/messages:87 ../data/messages:1359
 msgid ""
 "The dock can hide itself to let all the screen for applications. But it can "
 "also be always visible like a panel.\n"
@@ -1396,39 +1482,39 @@
 "dock, and then select the visibility you want."
 msgstr ""
 
-#: ../data/messages:89 ../data/messages:1371
+#: ../data/messages:89 ../data/messages:1361
 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
+#: ../data/messages:1363 ../data/messages:1367 ../data/messages:1371
 msgid "TODO"
 msgstr ""
 
-#: ../data/messages:93 ../data/messages:1375
+#: ../data/messages:93 ../data/messages:1365
 msgid "Deleting a dock"
 msgstr ""
 
-#: ../data/messages:97 ../data/messages:1379
+#: ../data/messages:97 ../data/messages:1369
 msgid "Changing the look of a dock"
 msgstr ""
 
-#: ../data/messages:103 ../data/messages:1385
+#: ../data/messages:103 ../data/messages:1375
 msgid "Placing applets on your desktop"
 msgstr ""
 
-#: ../data/messages:105 ../data/messages:1387
+#: ../data/messages:105 ../data/messages:1377
 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:1389
+#: ../data/messages:107 ../data/messages:1379
 msgid "Moving desklets"
 msgstr ""
 
-#: ../data/messages:109 ../data/messages:1391
+#: ../data/messages:109 ../data/messages:1381
 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 "
@@ -1437,11 +1523,11 @@
 "clicking on it -> \"lock position\". To unlock it, de-select this option."
 msgstr ""
 
-#: ../data/messages:111 ../data/messages:1393
+#: ../data/messages:111 ../data/messages:1383
 msgid "Placing desklets"
 msgstr ""
 
-#: ../data/messages:113 ../data/messages:1395
+#: ../data/messages:113 ../data/messages:1385
 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 "
@@ -1452,26 +1538,26 @@
 "the small bottom-right button."
 msgstr ""
 
-#: ../data/messages:115 ../data/messages:1397
+#: ../data/messages:115 ../data/messages:1387
 msgid "Changing the desklets decorations"
 msgstr ""
 
-#: ../data/messages:117 ../data/messages:1399
+#: ../data/messages:117 ../data/messages:1389
 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:1401
+#: ../data/messages:119 ../data/messages:1391
 msgid "Useful Features"
 msgstr ""
 
-#: ../data/messages:121 ../data/messages:1403
+#: ../data/messages:121 ../data/messages:1393
 msgid "Having a calendar with tasks"
 msgstr ""
 
-#: ../data/messages:123 ../data/messages:1405
+#: ../data/messages:123 ../data/messages:1395
 msgid ""
 "Activate the Clock applet.\n"
 "Clicking on it will display a calendar.\n"
@@ -1481,11 +1567,11 @@
 "(15mn before the event, and also 1 day before in the case of an anniversary)."
 msgstr ""
 
-#: ../data/messages:125 ../data/messages:1407
+#: ../data/messages:125 ../data/messages:1397
 msgid "Having a list of all windows"
 msgstr ""
 
-#: ../data/messages:127 ../data/messages:1409
+#: ../data/messages:127 ../data/messages:1399
 msgid ""
 "Activate the Switcher applet.\n"
 "Right-clicking on it will give you access to a list containing all the "
@@ -1495,43 +1581,43 @@
 "You can bind this action to the middle-click."
 msgstr ""
 
-#: ../data/messages:129 ../data/messages:1411
+#: ../data/messages:129 ../data/messages:1401
 msgid "Showing all the desktops"
 msgstr ""
 
-#: ../data/messages:131 ../data/messages:1413
+#: ../data/messages:131 ../data/messages:1403
 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:1415
+#: ../data/messages:133 ../data/messages:1405
 msgid "Changing the screen resolution"
 msgstr ""
 
-#: ../data/messages:135 ../data/messages:1417
+#: ../data/messages:135 ../data/messages:1407
 msgid ""
 "Activate the Show-Desktop applet.\n"
 "Right-click on it -> \"change resolution\" -> select the one you want."
 msgstr ""
 
-#: ../data/messages:137 ../data/messages:1419
+#: ../data/messages:137 ../data/messages:1409
 msgid "Locking your session"
 msgstr ""
 
-#: ../data/messages:139 ../data/messages:1421
+#: ../data/messages:139 ../data/messages:1411
 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:1423
+#: ../data/messages:141 ../data/messages:1413
 msgid "Quick-launching a program from keyboard (replacing ALT+F2)"
 msgstr ""
 
-#: ../data/messages:143 ../data/messages:1425
+#: ../data/messages:143 ../data/messages:1415
 msgid ""
 "Activate the Applications Menu applet.\n"
 "Middle-click on it, or right-click -> \"quick-launch\".\n"
@@ -1540,11 +1626,11 @@
 "completed into \"firefox\")."
 msgstr ""
 
-#: ../data/messages:145 ../data/messages:1427
+#: ../data/messages:145 ../data/messages:1417
 msgid "Turning Composite OFF during games"
 msgstr ""
 
-#: ../data/messages:147 ../data/messages:1429
+#: ../data/messages:147 ../data/messages:1419
 msgid ""
 "Activate the Composite Manager applet.\n"
 "Clicking on it will disable the Composite, which often makes games more "
@@ -1552,11 +1638,11 @@
 "Clicking again on it will enable the Composite."
 msgstr ""
 
-#: ../data/messages:149 ../data/messages:1431
+#: ../data/messages:149 ../data/messages:1421
 msgid "Seeing the hourly weather forecast"
 msgstr ""
 
-#: ../data/messages:151 ../data/messages:1433
+#: ../data/messages:151 ../data/messages:1423
 msgid ""
 "Activate the Weather applet.\n"
 "Open its settings, go to Configure, and type the name of your city. Press "
@@ -1566,11 +1652,11 @@
 "forecast for this day."
 msgstr ""
 
-#: ../data/messages:153 ../data/messages:1435
+#: ../data/messages:153 ../data/messages:1425
 msgid "Adding a file or a web page into the dock"
 msgstr ""
 
-#: ../data/messages:155 ../data/messages:1437
+#: ../data/messages:155 ../data/messages:1427
 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"
@@ -1580,22 +1666,22 @@
 "directly."
 msgstr ""
 
-#: ../data/messages:157 ../data/messages:1439
+#: ../data/messages:157 ../data/messages:1429
 msgid "Importing a folder into the dock"
 msgstr ""
 
-#: ../data/messages:159 ../data/messages:1441
+#: ../data/messages:159 ../data/messages:1431
 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:1443
+#: ../data/messages:161 ../data/messages:1433
 msgid "Accessing the recent events"
 msgstr ""
 
-#: ../data/messages:163 ../data/messages:1445
+#: ../data/messages:163 ../data/messages:1435
 msgid ""
 "Activate the Recent-Events applet.\n"
 "You need to have the Zeitgeist daemon to be running. Install it if it's not "
@@ -1605,11 +1691,11 @@
 "quickly."
 msgstr ""
 
-#: ../data/messages:165 ../data/messages:1447
+#: ../data/messages:165 ../data/messages:1437
 msgid "Quickly opening a recent file with a launcher"
 msgstr ""
 
-#: ../data/messages:167 ../data/messages:1449
+#: ../data/messages:167 ../data/messages:1439
 msgid ""
 "Activate the Recent-Events applet.\n"
 "You need to have the Zeitgeist daemon to be running. Install it if it's not "
@@ -1618,11 +1704,11 @@
 "opened with this launcher will appear in its menu."
 msgstr ""
 
-#: ../data/messages:169 ../data/messages:1451
+#: ../data/messages:169 ../data/messages:1441
 msgid "Accessing disks"
 msgstr ""
 
-#: ../data/messages:171 ../data/messages:1453
+#: ../data/messages:171 ../data/messages:1443
 msgid ""
 "Activate the Shortcuts applet.\n"
 "Then all the disks (including USB key or external hard drives) will be "
@@ -1630,7 +1716,7 @@
 "To unmount a disk before disconnecting it, middle-click on its icon."
 msgstr ""
 
-#: ../data/messages:173 ../data/messages:1455
+#: ../data/messages:173 ../data/messages:1445
 msgid "Accessing folder bookmarks"
 msgstr ""
 
@@ -1643,11 +1729,11 @@
 "To remove a bookmark, right-click on its icon -> remove"
 msgstr ""
 
-#: ../data/messages:177 ../data/messages:1459
+#: ../data/messages:177 ../data/messages:1449
 msgid "Having multiple instances of an applet"
 msgstr ""
 
-#: ../data/messages:179 ../data/messages:1461
+#: ../data/messages:179 ../data/messages:1451
 msgid ""
 "Some applets can have several instances running at the same time: Clock, "
 "Stack, Weather, ...\n"
@@ -1657,22 +1743,22 @@
 "the weather in different cities."
 msgstr ""
 
-#: ../data/messages:181 ../data/messages:1463
+#: ../data/messages:181 ../data/messages:1453
 msgid "Adding / removing a desktop"
 msgstr ""
 
-#: ../data/messages:183 ../data/messages:1465
+#: ../data/messages:183 ../data/messages:1455
 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:1467
+#: ../data/messages:185 ../data/messages:1457
 msgid "Controling the sound volume"
 msgstr ""
 
-#: ../data/messages:187 ../data/messages:1469
+#: ../data/messages:187 ../data/messages:1459
 msgid ""
 "Activate the Sound Volume applet.\n"
 "Then scroll up/down to increase/decrease the sound.\n"
@@ -1680,22 +1766,22 @@
 "Middle-click will mute/unmute."
 msgstr ""
 
-#: ../data/messages:189 ../data/messages:1471
+#: ../data/messages:189 ../data/messages:1461
 msgid "Controling the screen brightness"
 msgstr ""
 
-#: ../data/messages:191 ../data/messages:1473
+#: ../data/messages:191 ../data/messages:1463
 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:1475
+#: ../data/messages:193 ../data/messages:1465
 msgid "Removing completely the gnome-panel"
 msgstr ""
 
-#: ../data/messages:195 ../data/messages:1477
+#: ../data/messages:195 ../data/messages:1467
 msgid ""
 "Open gconf-editor, edit the key "
 "/desktop/gnome/session/required_components/panel, and replace its content "
@@ -1704,43 +1790,43 @@
 "dock has been started (if not, you can add it to the startup programs)."
 msgstr ""
 
-#: ../data/messages:199 ../data/messages:1481
+#: ../data/messages:199 ../data/messages:1471
 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:1483
+#: ../data/messages:201 ../data/messages:1473
 msgid "Troubleshooting"
 msgstr ""
 
-#: ../data/messages:203 ../data/messages:1485
+#: ../data/messages:203 ../data/messages:1475
 msgid "If you have any question, don't hesitate to ask on our forum."
 msgstr ""
 
-#: ../data/messages:205 ../data/messages:1487
+#: ../data/messages:205 ../data/messages:1477
 msgid "Forum"
 msgstr ""
 
-#: ../data/messages:207 ../data/messages:1489
+#: ../data/messages:207 ../data/messages:1479
 msgid "Our wiki can also help you, it is more complete on some points."
 msgstr ""
 
-#: ../data/messages:209 ../data/messages:1491
+#: ../data/messages:209 ../data/messages:1481
 msgid "Wiki"
 msgstr ""
 
-#: ../data/messages:211 ../data/messages:1493
+#: ../data/messages:211 ../data/messages:1483
 msgid "I have a black background around my dock."
 msgstr ""
 
-#: ../data/messages:213 ../data/messages:1495
+#: ../data/messages:213 ../data/messages:1485
 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:1497
+#: ../data/messages:215 ../data/messages:1487
 msgid ""
 "You need to turn on compositing. For instance, you can run Compiz or "
 "xcompmgr. \n"
@@ -1751,28 +1837,28 @@
 "'/apps/metacity/general/compositing_manager' and set it to 'true'."
 msgstr ""
 
-#: ../data/messages:219 ../data/messages:1501
+#: ../data/messages:219 ../data/messages:1491
 msgid ""
 "If you're on Gnome with Metacity (without Compiz), you can click on this "
 "button:"
 msgstr ""
 
-#: ../data/messages:221 ../data/messages:1503
+#: ../data/messages:221 ../data/messages:1493
 msgid "My machine is too old to run a composite manager."
 msgstr ""
 
-#: ../data/messages:223 ../data/messages:1505
+#: ../data/messages:223 ../data/messages:1495
 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:1507
+#: ../data/messages:225 ../data/messages:1497
 msgid "The dock is horribly slow when I move the mouse into it."
 msgstr ""
 
-#: ../data/messages:227 ../data/messages:1509
+#: ../data/messages:227 ../data/messages:1499
 msgid ""
 "If you have an Nvidia GeForce8 graphics card, please install the latest "
 "drivers, as the first ones were really buggy.\n"
@@ -1782,32 +1868,32 @@
 "with «cairo-dock -c»."
 msgstr ""
 
-#: ../data/messages:229 ../data/messages:1511
+#: ../data/messages:229 ../data/messages:1501
 msgid "I don't have these wonderful effects like fire, cube rotating, etc."
 msgstr ""
 
-#: ../data/messages:231 ../data/messages:1513
+#: ../data/messages:231 ../data/messages:1503
 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:1515
+#: ../data/messages:233 ../data/messages:1505
 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:1517
+#: ../data/messages:235 ../data/messages:1507
 msgid "I don't have any themes in the Theme Manager, except the default one."
 msgstr ""
 
-#: ../data/messages:237 ../data/messages:1519
+#: ../data/messages:237 ../data/messages:1509
 msgid "Hint : Up to version 2.1.1-2, wget was used."
 msgstr ""
 
-#: ../data/messages:239 ../data/messages:1521
+#: ../data/messages:239 ../data/messages:1511
 msgid ""
 "Be sure that you are connected to the Net.\n"
 " If your connection is very slow, you can increase the connection timeout in "
@@ -1817,17 +1903,17 @@
 "\"http_proxy\" environment variable)."
 msgstr ""
 
-#: ../data/messages:241 ../data/messages:1523
+#: ../data/messages:241 ../data/messages:1513
 msgid "The «netspeed» applet displays 0 even when I'm downloading something"
 msgstr ""
 
-#: ../data/messages:243 ../data/messages:1525
+#: ../data/messages:243 ../data/messages:1515
 msgid ""
 "Tip: you can run several instances of this applet if you wish to monitor "
 "several interfaces."
 msgstr ""
 
-#: ../data/messages:245 ../data/messages:1527
+#: ../data/messages:245 ../data/messages:1517
 msgid ""
 "You must tell the applet which interface you're using to connect to the Net "
 "(by default, this is «eth0»).\n"
@@ -1836,11 +1922,11 @@
 "something like «eth1», «ath0», or «wifi0».."
 msgstr ""
 
-#: ../data/messages:247 ../data/messages:1529
+#: ../data/messages:247 ../data/messages:1519
 msgid "The dustbin remains empty even when I delete a file."
 msgstr ""
 
-#: ../data/messages:249 ../data/messages:1531
+#: ../data/messages:249 ../data/messages:1521
 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 "
@@ -1848,31 +1934,31 @@
 "here!!! (do not insert spaces or some invisible caracters)."
 msgstr ""
 
-#: ../data/messages:251 ../data/messages:1533
+#: ../data/messages:251 ../data/messages:1523
 msgid ""
 "There is no icon in the Applications Menu even though I enable the option."
 msgstr ""
 
-#: ../data/messages:253 ../data/messages:1535
+#: ../data/messages:253 ../data/messages:1525
 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:1539
+#: ../data/messages:257 ../data/messages:1529
 msgid "If you're on Gnome you can click on this button:"
 msgstr ""
 
-#: ../data/messages:259 ../data/messages:1541
+#: ../data/messages:259 ../data/messages:1531
 msgid "The Project"
 msgstr ""
 
-#: ../data/messages:261 ../data/messages:1543
+#: ../data/messages:261 ../data/messages:1533
 msgid "Join the project!"
 msgstr ""
 
-#: ../data/messages:263 ../data/messages:1545
+#: ../data/messages:263 ../data/messages:1535
 msgid ""
 "We value your help! If you see a bug, if you think something could be "
 "improved,\n"
@@ -1883,73 +1969,73 @@
 "we’ll be happy to integrate it on our server !"
 msgstr ""
 
-#: ../data/messages:265 ../data/messages:1547
+#: ../data/messages:265 ../data/messages:1537
 msgid ""
 "If you wish to develop an applet, a complete documentation is available here."
 msgstr ""
 
-#: ../data/messages:267 ../data/messages:1549
+#: ../data/messages:267 ../data/messages:1539
 msgid "Documentation"
 msgstr ""
 
-#: ../data/messages:269 ../data/messages:1551
+#: ../data/messages:269 ../data/messages:1541
 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:1553
+#: ../data/messages:271 ../data/messages:1543
 msgid "DBus API"
 msgstr ""
 
-#: ../data/messages:273 ../data/messages:1555
+#: ../data/messages:273 ../data/messages:1545
 msgid ""
 "\n"
 "\n"
 "The Cairo-Dock Team"
 msgstr ""
 
-#: ../data/messages:275 ../data/messages:1557
+#: ../data/messages:275 ../data/messages:1547
 msgid "Websites"
 msgstr ""
 
-#: ../data/messages:277 ../data/messages:1559
+#: ../data/messages:277 ../data/messages:1549
 msgid "Problems? Suggestions? Just want to talk to us? Come on over!"
 msgstr "مشاكل؟ اقتراحات؟ تريد التحدث إلينا؟ تفضل!"
 
-#: ../data/messages:279 ../data/messages:1561
+#: ../data/messages:279 ../data/messages:1551
 msgid "Community site"
 msgstr "موقع المجتمع"
 
-#: ../data/messages:285 ../data/messages:1567
+#: ../data/messages:285 ../data/messages:1557
 msgid "More applets available online!"
 msgstr ""
 
-#: ../data/messages:287 ../data/messages:1569
+#: ../data/messages:287 ../data/messages:1559
 msgid "Cairo-Dock-Plug-ins-Extras"
 msgstr "اضفات اضافية ليكرو دوك"
 
-#: ../data/messages:289 ../data/messages:1571
+#: ../data/messages:289 ../data/messages:1561
 msgid "Repositories"
 msgstr ""
 
-#: ../data/messages:291 ../data/messages:1573
+#: ../data/messages:291 ../data/messages:1563
 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:1575
+#: ../data/messages:293 ../data/messages:1565
 msgid "Debian/Ubuntu"
 msgstr ""
 
-#: ../data/messages:295 ../data/messages:1577
+#: ../data/messages:295 ../data/messages:1567
 msgid "Ubuntu"
 msgstr ""
 
-#: ../data/messages:299 ../data/messages:1581
+#: ../data/messages:299 ../data/messages:1571
 msgid ""
 "If you're on Ubuntu, you can add our 'stable' repository by clicking on this "
 "button:\n"
@@ -1957,7 +2043,7 @@
 "latest stable version."
 msgstr ""
 
-#: ../data/messages:303 ../data/messages:1585
+#: ../data/messages:303 ../data/messages:1575
 msgid ""
 "If you're on Ubuntu, you can also add our 'weekly' ppa (can be unstable) by "
 "clicking on this button:\n"
@@ -1965,11 +2051,11 @@
 "latest weekly version."
 msgstr ""
 
-#: ../data/messages:305 ../data/messages:1587
+#: ../data/messages:305 ../data/messages:1577
 msgid "Debian"
 msgstr ""
 
-#: ../data/messages:309 ../data/messages:1591
+#: ../data/messages:309 ../data/messages:1581
 msgid ""
 "If you're on Debian Stable, you can add our 'stable' repository by clicking "
 "on this button:\n"
@@ -1977,7 +2063,7 @@
 "system and reinstall 'cairo-dock' package."
 msgstr ""
 
-#: ../data/messages:313 ../data/messages:1595
+#: ../data/messages:313 ../data/messages:1585
 msgid ""
 "If you're on Debian Unstable, you can add our 'stable' repository by "
 "clicking on this button:\n"
@@ -1985,8 +2071,8 @@
 "system and reinstall 'cairo-dock' package."
 msgstr ""
 
-#: ../data/messages:315 ../data/messages:317 ../data/messages:1733
-#: ../data/messages:1813 ../data/messages:1845
+#: ../data/messages:315 ../data/messages:317 ../data/messages:1739
+#: ../data/messages:1819 ../data/messages:1851
 msgid "Icon"
 msgstr ""
 
@@ -2073,7 +2159,7 @@
 msgstr ""
 
 #: ../data/messages:359 ../data/messages:425 ../data/messages:463
-#: ../data/messages:593 ../data/messages:655 ../data/messages:1641
+#: ../data/messages:597 ../data/messages:659 ../data/messages:1631
 msgid "Visibility:"
 msgstr "مدى الرؤية:"
 
@@ -2089,7 +2175,7 @@
 msgid "Should be visible on all desktops?"
 msgstr ""
 
-#: ../data/messages:373 ../data/messages:973
+#: ../data/messages:373 ../data/messages:995
 msgid "Decorations"
 msgstr "زخرفات"
 
@@ -2160,41 +2246,41 @@
 msgid "Foreground tansparency:"
 msgstr ""
 
-#: ../data/messages:407 ../data/messages:1605
+#: ../data/messages:407 ../data/messages:1595
 msgid "Behavior"
 msgstr "سلوك"
 
-#: ../data/messages:409 ../data/messages:547 ../data/messages:1607
+#: ../data/messages:409 ../data/messages:551 ../data/messages:1597
 msgid "Position on the screen"
 msgstr "الموقع على الشاشه"
 
-#: ../data/messages:411 ../data/messages:549 ../data/messages:1609
+#: ../data/messages:411 ../data/messages:553 ../data/messages:1599
 msgid "Choose which border of the screen the dock will be placed on:"
 msgstr "أختر جهه الشاشه التي ترغب بظهور الشريط فيها:"
 
-#: ../data/messages:413 ../data/messages:551 ../data/messages:1611
+#: ../data/messages:413 ../data/messages:555 ../data/messages:1601
 msgid "bottom"
 msgstr "أسفل"
 
-#: ../data/messages:415 ../data/messages:553 ../data/messages:1613
+#: ../data/messages:415 ../data/messages:557 ../data/messages:1603
 msgid "top"
 msgstr "أعلى"
 
-#: ../data/messages:417 ../data/messages:555 ../data/messages:565
-#: ../data/messages:1615
+#: ../data/messages:417 ../data/messages:559 ../data/messages:569
+#: ../data/messages:1605
 msgid "right"
 msgstr "يمين"
 
-#: ../data/messages:419 ../data/messages:557 ../data/messages:563
-#: ../data/messages:1617
+#: ../data/messages:419 ../data/messages:561 ../data/messages:567
+#: ../data/messages:1607
 msgid "left"
 msgstr "يسار"
 
-#: ../data/messages:421 ../data/messages:589
+#: ../data/messages:421 ../data/messages:593
 msgid "Visibility of the main dock"
 msgstr "وضوح الشريط الرئيسي"
 
-#: ../data/messages:423 ../data/messages:591 ../data/messages:1639
+#: ../data/messages:423 ../data/messages:595 ../data/messages:1629
 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 "
@@ -2203,47 +2289,47 @@
 "mouse. The rest of the time, it stays invisible, thus acting like a menu."
 msgstr ""
 
-#: ../data/messages:429 ../data/messages:597 ../data/messages:1645
+#: ../data/messages:429 ../data/messages:601 ../data/messages:1635
 msgid "Reserve space for the dock"
 msgstr ""
 
-#: ../data/messages:431 ../data/messages:599 ../data/messages:1647
+#: ../data/messages:431 ../data/messages:603 ../data/messages:1637
 msgid "Keep the dock below"
 msgstr ""
 
-#: ../data/messages:433 ../data/messages:601 ../data/messages:1649
+#: ../data/messages:433 ../data/messages:605 ../data/messages:1639
 msgid "Hide the dock when it overlaps the current window"
 msgstr "إخفاء الشريط عندما يتداخل مع النافذة الحالية"
 
-#: ../data/messages:435 ../data/messages:603 ../data/messages:1651
+#: ../data/messages:435 ../data/messages:607 ../data/messages:1641
 msgid "Hide the dock whenever it overlaps any window"
 msgstr ""
 
-#: ../data/messages:437 ../data/messages:605 ../data/messages:1653
+#: ../data/messages:437 ../data/messages:609 ../data/messages:1643
 msgid "Keep the dock hidden"
 msgstr ""
 
-#: ../data/messages:439 ../data/messages:607 ../data/messages:1655
+#: ../data/messages:439 ../data/messages:611
 msgid "Pop-up on shortcut"
 msgstr "فقاعه على الاختصارات"
 
-#: ../data/messages:441 ../data/messages:609
+#: ../data/messages:441 ../data/messages:613
 msgid "Effect used to hide the dock:"
 msgstr "التأثير المستخدم لإخفاء الشريط:"
 
-#: ../data/messages:443 ../data/messages:475 ../data/messages:611
-#: ../data/messages:1781
+#: ../data/messages:443 ../data/messages:475 ../data/messages:615
+#: ../data/messages:1787
 msgid "None"
 msgstr "بدون"
 
-#: ../data/messages:455 ../data/messages:641
+#: ../data/messages:455 ../data/messages:645
 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:457 ../data/messages:643
+#: ../data/messages:457 ../data/messages:647
 msgid "Keyboard shortcut to pop-up the dock:"
 msgstr "إختصار لوحه المفاتيح لإظهار الشريط:"
 
@@ -2251,28 +2337,28 @@
 msgid "Visibility of sub-docks"
 msgstr "وضوح الشريط الفرعي"
 
-#: ../data/messages:461 ../data/messages:653
+#: ../data/messages:461 ../data/messages:657
 msgid ""
 "they will appear either when you click or when you linger over the icon "
 "pointing on it."
 msgstr ""
 
-#: ../data/messages:465 ../data/messages:657
+#: ../data/messages:465 ../data/messages:661
 msgid "Appear on mouse over"
 msgstr "إظهار عند مرور المؤشر"
 
-#: ../data/messages:467 ../data/messages:659
+#: ../data/messages:467 ../data/messages:663
 msgid "Appear on click"
 msgstr "إظهار عند النقر"
 
 #: ../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 "
-"they are minimized.\n"
-"KDE : Mix applications with its launcher, show all others windows and group "
-"windows togather in sub-dock.\n"
-"Gnome    : Separate the taskbar from the launchers and only show windows "
+"None       : Don't show opened windows in the dock.\n"
+"Minimalistic: Mix applications with its launcher, show other windows only if "
+"they are minimized (like in MacOSX).\n"
+"Integrated  : Mix applications with its launcher, show all others windows "
+"and group windows togather in sub-dock (default).\n"
+"Separated   : Separate the taskbar from the launchers and only show windows "
 "that are on the current desktop."
 msgstr ""
 
@@ -2281,123 +2367,129 @@
 msgstr "سلوك شريط المهام"
 
 #: ../data/messages:477
-msgid "MacOSX"
-msgstr "ماك"
+msgid "Minimalistic"
+msgstr ""
 
 #: ../data/messages:479
-msgid "KDE"
-msgstr "وندوز سفن"
+msgid "Integrated"
+msgstr ""
 
 #: ../data/messages:481
-msgid "Gnome"
-msgstr "جنوم"
-
-#: ../data/messages:483
+msgid "Separated"
+msgstr ""
+
+#: ../data/messages:483 ../data/messages:689
+msgid "Place new icons"
+msgstr ""
+
+#: ../data/messages:485 ../data/messages:691
+msgid "At the beginning of the dock"
+msgstr ""
+
+#: ../data/messages:487 ../data/messages:693
+msgid "Before the launchers"
+msgstr ""
+
+#: ../data/messages:489 ../data/messages:695
+msgid "After the launchers"
+msgstr ""
+
+#: ../data/messages:491 ../data/messages:697
+msgid "At the end of the dock"
+msgstr ""
+
+#: ../data/messages:493
 msgid "Icons' animations and effects"
 msgstr "تأثيرات الأيقونات وحركاتها"
 
-#: ../data/messages:489
+#: ../data/messages:499
 msgid "On appearance/disappearance:"
 msgstr "عند الإظهار\\الإخفاء:"
 
-#: ../data/messages:495 ../data/messages:1039
+#: ../data/messages:505 ../data/messages:1061
 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:497
+#: ../data/messages:507
 msgid "Choose a theme of icons :"
 msgstr "اختر سمات الايقونات"
 
-#: ../data/messages:499
+#: ../data/messages:509 ../data/messages:1649
 msgid "Icons size:"
 msgstr "حجم الايقونات :"
 
-#: ../data/messages:501
+#: ../data/messages:511 ../data/messages:1655
 msgid "Very small"
 msgstr "صغير جدا"
 
-#: ../data/messages:503
+#: ../data/messages:513 ../data/messages:1657
 msgid "Small"
 msgstr "صغير"
 
-#: ../data/messages:505
+#: ../data/messages:515 ../data/messages:1659
 msgid "Medium"
 msgstr "متوسط"
 
-#: ../data/messages:507
+#: ../data/messages:517 ../data/messages:1661
 msgid "Big"
 msgstr "كبير"
 
-#: ../data/messages:509
+#: ../data/messages:519 ../data/messages:1663
 msgid "Very Big"
 msgstr "كبير جدا"
 
-#: ../data/messages:511
-msgid ""
-"This will separate launchers, application, and applets from each others. "
-"Separators will be automatically inserted then."
-msgstr ""
-
-#: ../data/messages:513 ../data/messages:1129
-msgid "Separate the different types of icons?"
-msgstr "فصل الأنواع المختلفه من الأيقونات؟"
-
-#: ../data/messages:515 ../data/messages:1139
-msgid "Order of the different types of icons :"
-msgstr "ترتيب الأنواع المختلفه من الأيقونات:"
-
-#: ../data/messages:517 ../data/messages:1141
-msgid "launchers"
-msgstr "المشغلات"
-
-#: ../data/messages:519 ../data/messages:1143
-msgid "applications"
-msgstr "تطبيقات"
-
-#: ../data/messages:521 ../data/messages:1145
-msgid "applets"
-msgstr "تطبيقات"
-
-#: ../data/messages:525 ../data/messages:919
+#: ../data/messages:523 ../data/messages:941
 msgid "Choose the default view for main docks :"
 msgstr "اختيار طريقة العرض الافتراضية لشريط الرئيسي :"
 
-#: ../data/messages:527 ../data/messages:923
+#: ../data/messages:525 ../data/messages:945
 msgid "You can overwrite this parameter for each sub-dock."
 msgstr "بإمكانك تغيير المؤشرات لكل شريط فرعي."
 
-#: ../data/messages:529 ../data/messages:925
+#: ../data/messages:527 ../data/messages:947
 msgid "Choose the default view for sub-docks :"
 msgstr "اختيار الطريقة الافتراضية  لكيرو  الفرعي"
 
-#: ../data/messages:531
+#: ../data/messages:531 ../data/messages:775
+msgid "Keyboard shortcuts currently available"
+msgstr ""
+
+#: ../data/messages:533 ../data/messages:777
+msgid ""
+"Many applets provide shortkeys for their actions. As soon as an applet is "
+"enabled, its shortkeys become available.\n"
+"Double-click on a line, and press the shortkey you want to use for the "
+"corresponding action."
+msgstr ""
+
+#: ../data/messages:535
 msgid "Add-ons"
 msgstr "إضافات"
 
-#: ../data/messages:533
+#: ../data/messages:537
 msgid "Add or remove any applet"
 msgstr ""
 
-#: ../data/messages:535
+#: ../data/messages:539
 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:537
+#: ../data/messages:541
 msgid ""
 "You can install them by simply drag-and-dropping the link onto your dock."
 msgstr ""
 
-#: ../data/messages:543 ../data/messages:1687
+#: ../data/messages:547 ../data/messages:1693
 msgid "Themes"
 msgstr "السِمات"
 
-#: ../data/messages:559 ../data/messages:1619
+#: ../data/messages:563 ../data/messages:1609
 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 "
@@ -2406,148 +2498,140 @@
 "the screen's edge."
 msgstr ""
 
-#: ../data/messages:561 ../data/messages:1621
+#: ../data/messages:565 ../data/messages:1611
 msgid "Relative alignment:"
 msgstr "المحاذاه النسبيه :"
 
-#: ../data/messages:567 ../data/messages:1623
+#: ../data/messages:571 ../data/messages:1613
 msgid "Offset from the screen's edge"
 msgstr "موازنة مع حافة الشاشة"
 
-#: ../data/messages:569 ../data/messages:1625
+#: ../data/messages:573 ../data/messages:1615
 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:571 ../data/messages:1627
+#: ../data/messages:575 ../data/messages:1617
 msgid "Lateral offset:"
 msgstr "موازنة خارجية :"
 
-#: ../data/messages:573 ../data/messages:1629
+#: ../data/messages:577 ../data/messages:1619
 msgid ""
 "in pixels. You can also move the dock by holding the ALT or CTRL key and the "
 "left mouse button."
 msgstr ""
 
-#: ../data/messages:575 ../data/messages:1631
+#: ../data/messages:579 ../data/messages:1621
 msgid "Distance to the screen edge:"
 msgstr "المسافه إالى حافه الشاشه :"
 
-#: ../data/messages:577
+#: ../data/messages:581
 msgid "Multiple screens"
 msgstr "شاشات متعددة"
 
-#: ../data/messages:579
+#: ../data/messages:583
 msgid ""
 "This option is to use if you have a dual-screen and use Xinerama to manage "
 "them."
 msgstr ""
 
-#: ../data/messages:581
+#: ../data/messages:585
 msgid "Use Xinerama?"
 msgstr ""
 
-#: ../data/messages:583
+#: ../data/messages:587
 msgid "0 is the first screen."
 msgstr "0 هي الشاشه الأولى."
 
-#: ../data/messages:585 ../data/messages:1635
+#: ../data/messages:589 ../data/messages:1625
 msgid "Number of the screen where the dock should be located:"
 msgstr "رقم الشاشه التي تريد إظهار الشريط فيها :"
 
-#: ../data/messages:587
+#: ../data/messages:591
 msgid "Accessibility"
 msgstr "الإتاحة"
 
-#: ../data/messages:623
+#: ../data/messages:627
 msgid "in ms. 0 means no delay."
 msgstr "0 ملي ثانيه ، تعني إلغاء التأخير."
 
-#: ../data/messages:625
+#: ../data/messages:629
 msgid "Delay before the dock unhides itself:"
 msgstr "المده قبل أن يظهر الشريط ذاتيا :"
 
-#: ../data/messages:627
+#: ../data/messages:631
 msgid "How to call the dock back:"
 msgstr "طريقه إستدعاء الشريط مره اخرى:"
 
-#: ../data/messages:629
+#: ../data/messages:633
 msgid "Hit the screen's border"
 msgstr ""
 
-#: ../data/messages:631
+#: ../data/messages:635
 msgid "Hit where the dock is"
 msgstr ""
 
-#: ../data/messages:633
+#: ../data/messages:637
 msgid "Hit the screen's corner"
 msgstr ""
 
-#: ../data/messages:635
+#: ../data/messages:639
 msgid "Hit a zone"
 msgstr ""
 
-#: ../data/messages:637
+#: ../data/messages:641
 msgid "Size of the zone :"
 msgstr ""
 
-#: ../data/messages:639
+#: ../data/messages:643
 msgid "Image to display on the zone :"
 msgstr ""
 
-#: ../data/messages:645
+#: ../data/messages:649
 msgid "Additional parameters"
 msgstr "مؤشرات إضافيه"
 
-#: ../data/messages:647
+#: ../data/messages:651
 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:649
+#: ../data/messages:653
 msgid "Automatically hide the dock when a window becomes full screen?"
 msgstr "إخفاء الشريط ذاتيا عندما تكون هناك نافذه في وضع ملء الشاشه؟"
 
-#: ../data/messages:651
+#: ../data/messages:655
 msgid "Sub-docks' visibility"
 msgstr "الرؤية الفرعية لشريط"
 
-#: ../data/messages:661 ../data/messages:665
+#: ../data/messages:665 ../data/messages:669
 msgid "in ms."
 msgstr "بالمللي ثانيه ."
 
-#: ../data/messages:663
+#: ../data/messages:667
 msgid "Delay before displaying a sub-dock:"
 msgstr "التأخير قبل عرض الشريط الفرعي :"
 
-#: ../data/messages:667
+#: ../data/messages:671
 msgid "Delay before leaving a sub-dock takes effect:"
 msgstr ""
 
-#: ../data/messages:669
+#: ../data/messages:673
 msgid "TaskBar"
 msgstr "شريط المهام"
 
-#: ../data/messages:673
+#: ../data/messages:677
 msgid ""
 "Cairo-Dock will then act as your taskbar. It is recommended to remove any "
 "other taskbars."
 msgstr ""
 
-#: ../data/messages:675
+#: ../data/messages:679
 msgid "Show currently opened applications in the dock?"
 msgstr "اظهار التطبيقات المفتوحة في الشريط ؟"
 
-#: ../data/messages:677
-msgid "Only show icons whose windows are minimised"
-msgstr "فقط أظهار الأيقونات التي تم تصغير نوافذها"
-
-#: ../data/messages:679
-msgid "Only show applications on current desktop"
-msgstr "فقط اظهار التطبيقات المتواجده على سطح المكتب الحالي"
-
 #: ../data/messages:681
 msgid ""
 "Allows launchers to act as applications when their programs are running and "
@@ -2560,862 +2644,819 @@
 msgstr "خلط المشغلات بالتطبيقات"
 
 #: ../data/messages:685
+msgid "Only show applications on current desktop"
+msgstr "فقط اظهار التطبيقات المتواجده على سطح المكتب الحالي"
+
+#: ../data/messages:687
+msgid "Only show icons whose windows are minimised"
+msgstr "فقط أظهار الأيقونات التي تم تصغير نوافذها"
+
+#: ../data/messages:699
 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:687
+#: ../data/messages:701
 msgid "Group windows from the same application in a sub-dock ?"
 msgstr "جمع النوافذ من نفس التطبيق في شريط فرعي ؟"
 
-#: ../data/messages:689 ../data/messages:699
+#: ../data/messages:703 ../data/messages:713
 msgid "Enter the class of the applications, separated by a semi-colon ';'"
 msgstr "أدخل فئه التطبيق ، وافصل بينها بقاصله منقوطه \";\""
 
-#: ../data/messages:691 ../data/messages:701
+#: ../data/messages:705 ../data/messages:715
 msgid "\t\tExcept the following classes:"
 msgstr ""
 
-#: ../data/messages:693
+#: ../data/messages:707
 msgid "Representation"
 msgstr "التمثيل"
 
-#: ../data/messages:695
+#: ../data/messages:709
 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:697
+#: ../data/messages:711
 msgid "Overwrite the X icon with the launchers' icon?"
 msgstr "إستبدل الايقونه X بأيقونه المشغلات"
 
-#: ../data/messages:703
+#: ../data/messages:717
 msgid ""
 "A composite manager is required to display the thumbnail.\n"
 "OpenGL is required to draw the icon bent backwards."
 msgstr ""
 
-#: ../data/messages:705
+#: ../data/messages:719
 msgid "How to draw minimised windows ?"
 msgstr "كيف يتم رسم النوافذ المصغره؟"
 
-#: ../data/messages:707
+#: ../data/messages:721
 msgid "Make the icon transparent"
 msgstr "جعل الايقون شفاف ؟"
 
-#: ../data/messages:709
+#: ../data/messages:723
 msgid "Show a window's thumbnail"
 msgstr "إظهار مصغره للنافذه"
 
-#: ../data/messages:711
+#: ../data/messages:725
 msgid "Draw it bent backwards"
 msgstr ""
 
-#: ../data/messages:713
+#: ../data/messages:727
 msgid "Transparency of icons whose window is minimised:"
 msgstr "شفافية الأيقونات ذات النوافذ المصغره:"
 
-#: ../data/messages:715 ../data/messages:873 ../data/messages:987
-#: ../data/messages:1013 ../data/messages:1085
+#: ../data/messages:729 ../data/messages:895 ../data/messages:1009
+#: ../data/messages:1035 ../data/messages:1135
 msgid "Opaque"
 msgstr "معتم"
 
-#: ../data/messages:717 ../data/messages:871 ../data/messages:985
-#: ../data/messages:1011 ../data/messages:1083
+#: ../data/messages:731 ../data/messages:893 ../data/messages:1007
+#: ../data/messages:1033 ../data/messages:1133
 msgid "Transparent"
 msgstr "شفّاف"
 
-#: ../data/messages:719
+#: ../data/messages:733
 msgid "Play a short animation of the icon when its window becomes active"
 msgstr ""
 
-#: ../data/messages:721
+#: ../data/messages:735
 msgid "\"...\" will be added at the end if the name is too long."
 msgstr "\"...\" ستوضع في نهايه الاسم إذا كان طويلا جدا."
 
-#: ../data/messages:723
+#: ../data/messages:737
 msgid "Maximum number of caracters in application name:"
 msgstr "أقصى عدد لخانات الحروف في اسم التطبيق :"
 
-#: ../data/messages:725
+#: ../data/messages:739
 msgid "Interaction"
 msgstr "تفاعل"
 
-#: ../data/messages:727
+#: ../data/messages:741
 msgid "Action on middle-click on the related application"
 msgstr ""
 
-#: ../data/messages:729
+#: ../data/messages:743
 msgid "Nothing"
 msgstr ""
 
-#: ../data/messages:733
+#: ../data/messages:747
 msgid "Minimize"
 msgstr ""
 
-#: ../data/messages:735
+#: ../data/messages:749
 msgid "Launch new"
 msgstr "إطار جديد"
 
-#: ../data/messages:737
+#: ../data/messages:753
 msgid "This is the default behaviour of most taskbars."
 msgstr "هذا هو السلوك لمعظم اشرطه المهام."
 
-#: ../data/messages:739
+#: ../data/messages:755
 msgid ""
 "Minimise the window when its icon is clicked, if it was already the active "
 "window ?"
 msgstr ""
 
-#: ../data/messages:741
+#: ../data/messages:757
 msgid "Only if your Window Manager supports it."
 msgstr ""
 
-#: ../data/messages:743
+#: ../data/messages:759
 msgid ""
 "Present windows preview on click when several windows are grouped togather"
 msgstr ""
 
-#: ../data/messages:745
+#: ../data/messages:761
 msgid "Highlight applications requiring your attention with a dialog bubble"
 msgstr ""
 
-#: ../data/messages:747
+#: ../data/messages:763
 msgid "in seconds"
 msgstr "في الثواني"
 
-#: ../data/messages:749
+#: ../data/messages:765
 msgid "Duration of the dialog:"
 msgstr "مده الحوار :"
 
-#: ../data/messages:751
+#: ../data/messages:767
 msgid ""
 "It will notify you even if, for instance, you are watching a movie in full "
 "screen or you are on another desktop.\n"
 msgstr ""
 
-#: ../data/messages:753
+#: ../data/messages:769
 msgid "Force the following applications to demand your attention"
 msgstr "جعل التطبيقات التالية تجذب إنتباهك دائما"
 
-#: ../data/messages:755
+#: ../data/messages:771
 msgid "Highlight applications demanding your attention with an animation"
 msgstr ""
 
-#: ../data/messages:759
+#: ../data/messages:781
 msgid "Animations speed"
 msgstr "الرسم المتحرك بسرعة"
 
-#: ../data/messages:761
+#: ../data/messages:783
 msgid "Animate sub-docks when they appear"
 msgstr "إضافه حركه عند ظهور الشريط الفرعي"
 
-#: ../data/messages:763
+#: ../data/messages:785
 msgid ""
 "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."
 msgstr ""
 
-#: ../data/messages:765
+#: ../data/messages:787
 msgid "Animation unfolding duration:"
 msgstr "مده حركه إلغاء الثني:"
 
-#: ../data/messages:767 ../data/messages:775 ../data/messages:779
-#: ../data/messages:787 ../data/messages:791
+#: ../data/messages:789 ../data/messages:797 ../data/messages:801
+#: ../data/messages:809 ../data/messages:813
 msgid "fast"
 msgstr "سريع"
 
-#: ../data/messages:769 ../data/messages:777 ../data/messages:781
-#: ../data/messages:789 ../data/messages:793
+#: ../data/messages:791 ../data/messages:799 ../data/messages:803
+#: ../data/messages:811 ../data/messages:815
 msgid "slow"
 msgstr "بطيء"
 
-#: ../data/messages:771 ../data/messages:783
+#: ../data/messages:793 ../data/messages:805
 msgid "The more there are, the slower it will be"
 msgstr "كلما زاد العدد، يزداد بطئه"
 
-#: ../data/messages:773
+#: ../data/messages:795
 msgid "Number of steps in the zoom animation (grow/shrink):"
 msgstr "عدد الخطوات أثناء حركه التكبير (تمدد/انكماش) :"
 
-#: ../data/messages:785
+#: ../data/messages:807
 msgid "Number of steps in the auto-hide animation (move up/move down):"
 msgstr ""
 
-#: ../data/messages:795
+#: ../data/messages:817
 msgid "Refresh rate"
 msgstr "مُعدَّل التحديث"
 
-#: ../data/messages:797 ../data/messages:801 ../data/messages:805
+#: ../data/messages:819 ../data/messages:823 ../data/messages:827
 msgid "in Hz. This is to adjust behaviour relative to your CPU power."
 msgstr ""
 
-#: ../data/messages:799
+#: ../data/messages:821
 msgid "Refresh rate when mouving cursor into the dock :"
 msgstr "معدل التحديث أثناء مرور المؤشر على الشريط :"
 
-#: ../data/messages:803
+#: ../data/messages:825
 msgid "Animation frequency for the OpenGL backend :"
 msgstr ""
 
-#: ../data/messages:807
+#: ../data/messages:829
 msgid "Animation frequency for the Cairo backend :"
 msgstr ""
 
-#: ../data/messages:809
+#: ../data/messages:831
 msgid ""
 "The transparency gradation pattern will then be re-calculated in real time. "
 "May need more CPU power."
 msgstr ""
 
-#: ../data/messages:811
+#: ../data/messages:833
 msgid "Reflections should be calculated in real-time?"
 msgstr "حساب الإنعكاسات في الوقت الحقيقي؟"
 
-#: ../data/messages:813
+#: ../data/messages:835
 msgid "Composition"
 msgstr "تَرْكِيب"
 
-#: ../data/messages:815
+#: ../data/messages:837
 msgid ""
 "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."
 msgstr ""
 
-#: ../data/messages:817
+#: ../data/messages:839
 msgid "Emulate composition with fake transparency?"
 msgstr ""