Merge lp:~cairo-dock-team/ubuntu/precise/cairo-dock-plug-ins/3.0.0.1 into lp:ubuntu/precise/cairo-dock-plug-ins

[Matthieu Baerts]

Hello,

== Note: Message written by Scott Kitterman on the bug #983289: "Ack. Approved." ==

The Cairo-Dock team proposes a new "bugs fixed" version of their Cairo-Dock packages.

===========

This is the Upstream (short) ChangeLog:
   - Updated translations
   - Moved 'battery' theme from cairo-dock-core to cairo-dock-plug-ins
   - Included here a sound gauge theme for alsaMixer applet from our server in
      order to use the Default-Panel theme without an Internet connexion.
   - Shortcuts: properly initialize the disk structure, to avoid polling non
      writable disks
   - Clipper: fixed a warning when stopping the applet
   - Clock: fixed a small regression: text should be vertically centered
   - dnd2share: Fixed videobin backend and forced curl to follow redirection
   - Clock: numeric: Fixed a typo about the maximum ratio in vertical mode
   - Panel view: fixed the frame drawing (no bottom rounded corners)
   - Messaging-Menu:
    + Some items was not displayed with the latest version of indicator-messages
    + Fixed a few details about the lozenge and the drawing
    + Fixed a tiny memory leak
   - MusicPlayer: Fixed a typo about the detection of the MPRIS2 services for
      handlers with a valid mpris2 string
   - Shortcuts: used a default icon if vfs_backend_get_file_info returns none
      icon name (g_file_info_get_icon seems not able to find an icon for folders
      or drives on KDE)
   - GMenu: checked if alacarte or kmenuedit is available before adding the menu
      entry to launch it (alacarte seems no longer installed by default on new
      distributions with Gnome)
   - PowerManager: if we want to hide the icon, hide it even on desktop when we
      have no information)
   - ShowDesktop: if we can't show the widget layer or present the desktops
      (expo), we now display a warning and use the default action instead of
      doing nothing
   - Switcher: menu: limit windows' title to 50 chars to avoid too larger menus
   - Clipper: Menu entries are now translated
   - Mail: disable the RSS feed for Gmail, as it is not working any more with the
      current GMail authentification system; use IMAP instead
   - Status-Notifier: Removed an unused function
   - stdout: removed a lot of g_print functions (or replaced by cd_debug)
   - Clock: fixed the text drawing: avoid any stretching of the text

============

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

Thank you for your help! ;)

PS: 'cairo-dock' package has to be uploaded before this package! (if possible, 30min before) ( LP: #983288 )

[lp:~cairo-dock-team/ubuntu/precise/cairo-dock-plug-ins/3.0.0.1]

28. By Matthieu Baerts on 2012-04-16

* New upstream release. (LP: #983289)
* Upstream ChangeLog:
 - Updated translations
 - Moved 'battery' theme from cairo-dock-core to cairo-dock-plug-ins
 - Included here a sound gauge theme for alsaMixer applet from our server in
    order to use the Default-Panel theme without an Internet connexion.
 - Shortcuts: properly initialize the disk structure, to avoid polling non
    writable disks
 - Clipper: fixed a warning when stopping the applet
 - Clock: fixed a small regression: text should be vertically centered
 - dnd2share: Fixed videobin backend and forced curl to follow redirection
 - Clock: numeric: Fixed a typo about the maximum ratio in vertical mode
 - Panel view: fixed the frame drawing (no bottom rounded corners)
 - Messaging-Menu:
  + Some items was not displayed with the latest version of indicator-messages
  + Fixed a few details about the lozenge and the drawing
  + Fixed a tiny memory leak
 - MusicPlayer: Fixed a typo about the detection of the MPRIS2 services for
    handlers with a valid mpris2 string
 - Shortcuts: used a default icon if vfs_backend_get_file_info returns none
    icon name (g_file_info_get_icon seems not able to find an icon for folders
    or drives on KDE)
 - GMenu: checked if alacarte or kmenuedit is available before adding the menu
    entry to launch it (alacarte seems no longer installed by default on new
    distributions with Gnome)
 - PowerManager: if we want to hide the icon, hide it even on desktop when we
    have no information)
 - ShowDesktop: if we can't show the widget layer or present the desktops
    (expo), we now display a warning and use the default action instead of
    doing nothing
 - Switcher: menu: limit windows' title to 50 chars to avoid too larger menus
 - Clipper: Menu entries are now translated
 - Mail: disable the RSS feed for Gmail, as it is not working any more with the
    current GMail authentification system; use IMAP instead
 - Status-Notifier: Removed an unused function
 - stdout: removed a lot of g_print functions (or replaced by cd_debug)
 - Clock: fixed the text drawing: avoid any stretching of the text
* This 3.0 series (and previous series) also fixes these bugs:
 - "Cairo-dock plugin musicPlayer loads ridiculous covers" (LP: #538569)
 - "Songbird support outdated in musicPlayer" (LP: #538361)
 - "Trash applet detects drag-and-dropped items twice" (LP: #530975)
 - "Lock screen does not work in GNOME 3" (LP: #943533)
 - "Sound volume don't work on the cairo-dock of my computer after a killall
     pulseaudio" (LP: #913101)
 - "Logout Applet needs guest session menu" (LP: #757193)
 - "Trash not emptied with folders from other partitions" (LP: #686564)
 - "Incorrect down/up speeds in Netspeed" (LP: #672452)
 - "the desklet 'meteo' gone freeze, and if i try to change localization crashes
     all cairo, that became black" (LP: #671261)
 - "Clipper action failed on other WM than kde gnome xfce" (LP: #664089)
 - "Crashed when trying to remove Doncky deskapplet" (LP: #656611)
 - "Issues with the rendering of the Switcher applet" (LP: #606304)
 - "Shortcuts plugin brings dock to the front if new usb drive is pluged in
     and dock stays infront of all windows after that" (LP: #569598)
 - "Dustbin applet does not display trash on all volumes" (LP: #483963)
* debian/control:
 - Bump Standards-Version
 - Updated the version of libgldi-dev (build-dep) and cairo-dock-core.
* debian/rules:
 - Removed -Denable-global-menu=yes
    (Global Menu applet is not considered as a stable and usable applet)

[Daniel Holbach (dholbach)]

It fails to build for me on amd64 precise:

dh_installlogcheck -pcairo-dock-plug-ins
dh_installchangelogs -pcairo-dock-plug-ins ChangeLog
dh_installudev -pcairo-dock-plug-ins
dh_lintian -pcairo-dock-plug-ins
dh_bugfiles -pcairo-dock-plug-ins
dh_install -pcairo-dock-plug-ins
dh_install: cairo-dock-plug-ins missing files (usr/lib/*/cairo-dock/appmenu-registrar), aborting
make: *** [binary-install/cairo-dock-plug-ins] Error 2
dpkg-buildpackage: error: fakeroot debian/rules binary gave error exit status 2
debuild: fatal error at line 1350:
dpkg-buildpackage -rfakeroot -D -us -uc failed
daniel@daydream:~/cairo-dock-plug-ins$

review: Needs Fixing

[lp:~cairo-dock-team/ubuntu/precise/cairo-dock-plug-ins/3.0.0.1]

29. By Matthieu Baerts on 2012-04-17

* debian/cairo-dock-plug-ins.install
 - Removed 'appmenu-registrar' (Global Menu applet is no longer compiled)

[Matthieu Baerts (matttbe)]

> It fails to build for me on amd64 precise:
Oh, sorry, I forgot to push the modifications of this file :( (I did this modification for our ppa and tested it with pbuilder but I don't know why I didn't apply it here...)

This new rev (29) fixes this bug.

PS: thank you for your help!

[Daniel Holbach (dholbach)]

Builds fine now! :)

review: Approve

[Matthieu Baerts (matttbe)]

Thank you! :)

=== modified file 'CMakeLists.txt'
--- CMakeLists.txt	2012-03-21 20:34:03 +0000
+++ CMakeLists.txt	2012-04-17 13:08:18 +0000
@@ -11,7 +11,7 @@
 ########### project ###############
 
 project ("cairo-dock-plugins")
-set (VERSION "3.0.0.0rc1")
+set (VERSION "3.0.0")
 
 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})
@@ -210,8 +210,10 @@
 	if (${INDICATOR_MAJOR} GREATER 0 OR ${INDICATOR_MINOR} GREATER 4
 	    OR (${INDICATOR_MINOR} EQUAL 4 AND ${INDICATOR_NANO} GREATER 89))
 		set (SOUND_SERVICE_VERSION 1) # Sound-Menu: new DBus path
+		set (INDICATOR_MESSAGES_HAS_LOZENGE 1)   # Messaging Menu has 'right-is-lozenge'
 	else() # older than Precise.
 		set (SOUND_SERVICE_VERSION 0)
+		set (INDICATOR_MESSAGES_HAS_LOZENGE 0)
 	endif()
 
 	if ("${INDICATOR_NEW_VERSION}" STREQUAL "1")  # oneiric and newer
 
=== modified file 'Clipper/src/applet-config.c'
--- Clipper/src/applet-config.c	2012-02-16 01:45:57 +0000
+++ Clipper/src/applet-config.c	2012-04-17 13:08:18 +0000
@@ -75,5 +75,6 @@
 	g_list_foreach (myData.pActions, (GFunc)cd_clipper_free_action, NULL);
 	g_list_free (myData.pActions);
 	
-	gtk_widget_destroy (myData.pActionMenu);
+	if (myData.pActionMenu)
+		gtk_widget_destroy (myData.pActionMenu);
 CD_APPLET_RESET_DATA_END
 
=== modified file 'Clipper/src/applet-notifications.c'
--- Clipper/src/applet-notifications.c	2012-02-16 01:45:57 +0000
+++ Clipper/src/applet-notifications.c	2012-04-17 13:08:18 +0000
@@ -86,9 +86,9 @@
 	CD_APPLET_LEAVE();
 }
 CD_APPLET_ON_BUILD_MENU_BEGIN
-	CD_APPLET_ADD_IN_MENU_WITH_STOCK ("Clear clipboard History", GTK_STOCK_CLEAR, _cd_clipper_clear_history, CD_APPLET_MY_MENU);
+	CD_APPLET_ADD_IN_MENU_WITH_STOCK (D_("Clear clipboard History"), GTK_STOCK_CLEAR, _cd_clipper_clear_history, CD_APPLET_MY_MENU);
 	
-	CD_APPLET_ADD_IN_MENU_WITH_STOCK ("Paste all copied items", GTK_STOCK_PASTE, _cd_clipper_paste_all, CD_APPLET_MY_MENU);
+	CD_APPLET_ADD_IN_MENU_WITH_STOCK (D_("Paste all copied items"), GTK_STOCK_PASTE, _cd_clipper_paste_all, CD_APPLET_MY_MENU);
 CD_APPLET_ON_BUILD_MENU_END
 
 
 
=== modified file 'GMenu/src/applet-notifications.c'
--- GMenu/src/applet-notifications.c	2012-02-16 01:45:57 +0000
+++ GMenu/src/applet-notifications.c	2012-04-17 13:08:18 +0000
@@ -25,6 +25,7 @@
 #include "applet-run-dialog.h"
 #include "applet-notifications.h"
 
+static const gchar *s_cEditMenuCmd = NULL; // we need to check with 'which' only one time if alacarte or kmenuedit is available
 
 static void cd_menu_show_menu (void)
 {
@@ -56,26 +57,52 @@
 //\___________ Define here the entries you want to add to the menu when the user right-clicks on your icon or on its subdock or your desklet. The icon and the container that were clicked are available through the macros CD_APPLET_CLICKED_ICON and CD_APPLET_CLICKED_CONTAINER. CD_APPLET_CLICKED_ICON may be NULL if the user clicked in the container but out of icons. The menu where you can add your entries is available throught the macro CD_APPLET_MY_MENU; you can add sub-menu to it if you want.
 static void _cd_menu_configure_menu (GtkMenuItem *menu_item, gpointer data)
 {
+	CD_APPLET_ENTER;
+	GError *error = NULL;
 	if (myConfig.cConfigureMenuCommand != NULL)
 	{
-		cairo_dock_launch_command (myConfig.cConfigureMenuCommand);
-	}
-	else
-	{
-		if (g_iDesktopEnv == CAIRO_DOCK_GNOME || g_iDesktopEnv == CAIRO_DOCK_XFCE)  /// a confirmer pour XFCE ...
-			cairo_dock_launch_command ("alacarte");
-		else if (g_iDesktopEnv == CAIRO_DOCK_KDE)
-			cairo_dock_launch_command ("kmenuedit");
-		else
-			cd_warning ("Sorry, couldn't guess what to do to configure the menu");
-	}
+		g_spawn_command_line_async (myConfig.cConfigureMenuCommand, &error);
+	}
+	else if (s_cEditMenuCmd != NULL)
+	{
+		g_spawn_command_line_async (s_cEditMenuCmd, &error);
+	}
+	
+	if (error != NULL)
+	{
+		cd_warning ("Attention : when trying to execute '%s' : %s",
+			myConfig.cConfigureMenuCommand ? myConfig.cConfigureMenuCommand : s_cEditMenuCmd,
+			error->message);
+		g_error_free (error);
+	}
+	CD_APPLET_LEAVE();
 }
 CD_APPLET_ON_BUILD_MENU_BEGIN
 	gchar *cLabel = g_strdup_printf ("%s (%s)", D_("Quick launch"), D_("middle-click"));
 	CD_APPLET_ADD_IN_MENU_WITH_STOCK (cLabel, GTK_STOCK_EXECUTE, cd_menu_show_hide_quick_launch, CD_APPLET_MY_MENU);
 	g_free (cLabel);
 	CD_APPLET_ADD_SEPARATOR_IN_MENU (CD_APPLET_MY_MENU);
-	CD_APPLET_ADD_IN_MENU_WITH_STOCK (D_("Configure menu"), GTK_STOCK_PREFERENCES, _cd_menu_configure_menu, CD_APPLET_MY_MENU);
+
+	static gboolean bEditMenuCmdChecked = FALSE;
+	if (!myConfig.cConfigureMenuCommand && !bEditMenuCmdChecked)
+	{
+		bEditMenuCmdChecked = TRUE;
+		gchar *cResult = cairo_dock_launch_command_sync ("which alacarte");  // Gnome (2 + 3(?)) + XFCE(?)
+		if (cResult != NULL && *cResult == '/')
+		{
+			s_cEditMenuCmd = "alacarte";
+		}
+		else
+		{
+			g_free (cResult);
+			cResult = cairo_dock_launch_command_sync ("which kmenuedit");  // KDE
+			if (cResult != NULL && *cResult == '/')
+				s_cEditMenuCmd = "kmenuedit";
+		}  /// TODO: handle other DE ...
+		g_free (cResult);
+	}
+	if (myConfig.cConfigureMenuCommand || s_cEditMenuCmd)
+		CD_APPLET_ADD_IN_MENU_WITH_STOCK (D_("Configure menu"), GTK_STOCK_PREFERENCES, _cd_menu_configure_menu, CD_APPLET_MY_MENU);
 	
 	CD_APPLET_ADD_SEPARATOR_IN_MENU (CD_APPLET_MY_MENU);
 	CD_APPLET_ADD_IN_MENU_WITH_STOCK (D_("Clear recent"), GTK_STOCK_CLEAR, cd_menu_clear_recent, CD_APPLET_MY_MENU);
 
=== modified file 'Global-Menu/src/applet-app.c'
--- Global-Menu/src/applet-app.c	2012-02-16 01:45:57 +0000
+++ Global-Menu/src/applet-app.c	2012-04-17 13:08:18 +0000
@@ -141,7 +141,7 @@
 
 static void _on_registrar_owner_changed (const gchar *cName, gboolean bOwned, gpointer data)
 {
-	g_print ("=== Registrar is on the bus (%d)\n", bOwned);
+	cd_debug ("Registrar is on the bus (%d)", bOwned);
 	CD_APPLET_ENTER;
 	
 	if (bOwned)
@@ -169,7 +169,7 @@
 
 static void _on_detect_registrar (gboolean bPresent, gpointer data)
 {
-	g_print ("=== Registrar is present: %d\n", bPresent);
+	cd_debug ("Registrar is present: %d", bPresent);
 	CD_APPLET_ENTER;
 	s_pDetectRegistrarCall = NULL;
 	// if present, set up proxy.
@@ -261,13 +261,13 @@
 }
 static void _get_menu_async (CDSharedMemory *pSharedMemory)
 {
-	g_print ("%s()\n", __func__);
+	cd_debug ("%s()", __func__);
 	pSharedMemory->pMenu = dbusmenu_gtkmenu_new (pSharedMemory->cService, pSharedMemory->cMenuObject);  /// can this object disappear by itself ? it seems to crash with 2 instances of inkscape, when closing one of them... 
-	g_print ("menu built\n");
+	cd_debug ("menu built");
 }
 static gboolean _fetch_menu (CDSharedMemory *pSharedMemory)
 {
-	g_print ("%s()\n", __func__);
+	cd_debug ("%s()", __func__);
 	CD_APPLET_ENTER;
 	myData.pMenu = pSharedMemory->pMenu;
 	pSharedMemory->pMenu = NULL;
@@ -280,7 +280,7 @@
 
 static void _on_got_menu (DBusGProxy *proxy, DBusGProxyCall *call_id, CairoDockModuleInstance *myApplet)
 {
-	g_print ("=== %s ()\n", __func__);
+	cd_debug ("%s ()", __func__);
 	CD_APPLET_ENTER;
 	s_pGetMenuCall = NULL;
 	
@@ -300,8 +300,8 @@
 	}
 	if (bSuccess)
 	{
-		g_print (" -> %s\n", cService);
-		g_print ("    %s\n", cMenuObject);
+		cd_debug (" -> %s", cService);
+		cd_debug ("    %s", cMenuObject);
 		if (cService && *cService != '\0')
 		{
 			/*if (myData.pTask != NULL)
@@ -440,7 +440,7 @@
 
 void cd_app_menu_set_current_window (Window iActiveWindow)
 {
-	g_print ("%s (%ld)\n", __func__, iActiveWindow);
+	cd_debug ("%s (%ld)", __func__, iActiveWindow);
 	if (iActiveWindow != myData.iCurrentWindow)
 	{
 		myData.iPreviousWindow = myData.iCurrentWindow;
 
=== modified file 'Indicator-applet/indicator-applet.c'
--- Indicator-applet/indicator-applet.c	2012-03-21 11:26:14 +0000
+++ Indicator-applet/indicator-applet.c	2012-04-17 13:08:18 +0000
@@ -29,13 +29,13 @@
 
 static void _on_menu_destroyed (CDAppletIndicator *pIndicator, GObject *old_menu_pointer)
 {
-	g_print (" --------- no more menu (%p / %p\n", old_menu_pointer, pIndicator->pMenu);
+	cd_debug ("no more menu (%p / %p)", old_menu_pointer, pIndicator->pMenu);
 	if (old_menu_pointer == (GObject*)pIndicator->pMenu)
 		pIndicator->pMenu = NULL;
 }
 static void _on_service_destroyed (CDAppletIndicator *pIndicator, GObject *old_menu_pointer)
 {
-	g_print (" --------- no more service (%p / %p\n", old_menu_pointer, pIndicator->service);
+	cd_debug ("no more service (%p / %p)", old_menu_pointer, pIndicator->service);
 	if (old_menu_pointer == (GObject*)pIndicator->service)
 		pIndicator->service = NULL;
 }
@@ -69,7 +69,7 @@
 static void
 connection_changed (IndicatorServiceManager * sm, gboolean connected, CDAppletIndicator *pIndicator)
 {
-	g_print ("%s (%s : %d)\n", __func__, pIndicator->cBusName, connected);
+	cd_debug ("%s (%s : %d)", __func__, pIndicator->cBusName, connected);
 	CairoDockModuleInstance *myApplet = pIndicator->pApplet;
 	if (connected)
 	{
@@ -117,9 +117,9 @@
 				pIndicator->on_disconnect (myApplet);
 			if (pIndicator->pMenu)
 			{
-				g_print ("destroy menu...\n");
+				cd_debug ("destroy menu...");
 				g_object_unref (pIndicator->pMenu);
-				g_print ("done.\n");
+				cd_debug ("done.");
 				pIndicator->pMenu = NULL;
 			}
 			if (pIndicator->pServiceProxy != NULL)
@@ -182,16 +182,16 @@
 		g_source_remove (pIndicator->iSidCheckIndicator);
 	pIndicator->bConnected = FALSE;
 	pIndicator->on_disconnect = NULL;  // since the indicator has been explicitely destroyed, we don't want to call the callback when we'll disconnect from the service.
-	g_print ("destroy indicator menu...\n");
+	cd_debug ("destroy indicator menu...");
 	if (pIndicator->pMenu)
 		g_object_unref (pIndicator->pMenu);
-	g_print ("done.\n");
+	cd_debug ("done.");
 	if (pIndicator->pServiceProxy)
 	{
 		g_object_unref (pIndicator->pServiceProxy);
 		pIndicator->pServiceProxy = NULL;
 	}
-	g_print ("destroy service...\n");
+	cd_debug ("destroy service...");
 	if (pIndicator->service)
 	{
 		//g_object_unref (pIndicator->service);  // this causes a crash in libindicator (beacuse they keep the service as parameter of the callback 'service_proxy_name_changed'). so just be sure to disconnect from this object, and forget it.
@@ -201,7 +201,7 @@
 			pIndicator);
 		pIndicator->service = NULL;
 	}
-	g_print ("done.\n");
+	cd_debug ("done.");
 	g_free (pIndicator);
 }
 
 
=== modified file 'Messaging-Menu/src/CMakeLists.txt'
--- Messaging-Menu/src/CMakeLists.txt	2012-02-16 01:45:57 +0000
+++ Messaging-Menu/src/CMakeLists.txt	2012-04-17 13:08:18 +0000
@@ -22,6 +22,7 @@
 add_definitions (-DMY_APPLET_DOCK_VERSION="${dock_version}")
 add_definitions (-DMY_APPLET_ICON_FILE="icon.svg")
 add_definitions (-DINDICATOR_OLD_NAMES=${INDICATOR_OLD_NAMES})
+add_definitions (-DINDICATOR_MESSAGES_HAS_LOZENGE=${INDICATOR_MESSAGES_HAS_LOZENGE})
 ### uncomment the following line to allow multi-instance applet.
 #add_definitions (-DCD_APPLET_MULTI_INSTANCE="1")
 ### uncomment the following line to allow extended OpenGL drawing.
 
=== modified file 'Messaging-Menu/src/applet-menu.c'
--- Messaging-Menu/src/applet-menu.c	2012-02-16 01:45:57 +0000
+++ Messaging-Menu/src/applet-menu.c	2012-04-17 13:08:18 +0000
@@ -22,6 +22,7 @@
 
 #include <stdlib.h>
 #include <string.h>
+#include <math.h>
 
 #include "applet-struct.h"
 #include "applet-menu.h"
@@ -158,12 +159,27 @@
 	return FALSE;
 }
 
+static gint
+gtk_widget_get_font_size (GtkWidget *widget)
+{
+#if (GTK_MAJOR_VERSION < 3)
+    return RIGHT_LABEL_FONT_SIZE;
+#else
+    const PangoFontDescription *font;
+
+    font = gtk_style_context_get_font (gtk_widget_get_style_context (widget),
+                                       gtk_widget_get_state_flags (widget));
+
+    return pango_font_description_get_size (font) / PANGO_SCALE;
+#endif
+}
+
 /* Custom function to draw rounded rectangle with max radius */
 static void
 custom_cairo_rounded_rectangle (cairo_t *cr,
                                 double x, double y, double w, double h)
 {
-	double radius = MIN (w/2.0, h/2.0);
+	double radius = h / 2.0;
 
 	cairo_move_to (cr, x+radius, y);
 	cairo_arc (cr, x+w-radius, y+radius, radius, M_PI*1.5, M_PI*2);
@@ -184,8 +200,15 @@
 {
 	double x, y, w, h;
 	PangoLayout * layout;
-	gint font_size = RIGHT_LABEL_FONT_SIZE;
-	
+	gint font_size = gtk_widget_get_font_size (widget);
+
+	#if (INDICATOR_MESSAGES_HAS_LOZENGE == 1)
+	gboolean is_lozenge = GPOINTER_TO_INT (g_object_get_data (G_OBJECT (widget), "is-lozenge"));
+	/* let the label handle the drawing if it's not a lozenge */
+	if (!is_lozenge)
+		return FALSE;
+	#endif
+
 	if (!GTK_IS_WIDGET (widget)) return FALSE;
 
 	/* get style + arrow position / dimensions */
@@ -208,18 +231,20 @@
 	red = color.red;
 	green = color.green;
 	blue = color.blue;
-	w = gtk_widget_get_allocated_width (widget);
-	h = gtk_widget_get_allocated_height (widget);
+	GtkAllocation allocation;
+	gtk_widget_get_allocation (widget, &allocation);
+	w = allocation.width;
+	h = allocation.height;
 	x = y = 0;
 	#endif
 	
 	layout = gtk_label_get_layout (GTK_LABEL(widget));
+	PangoRectangle layout_extents;
+	pango_layout_get_extents (layout, NULL, &layout_extents);
+	pango_extents_to_pixels (&layout_extents, NULL);
 
-	/* This does not work, don't ask me why but font_size is 0.
-	 * I wanted to use a dynamic font size to adjust the padding on left/right edges
-	 * of the rounded rectangle. Andrea Cimitan */
-	/* const PangoFontDescription * font_description = pango_layout_get_font_description (layout);
-	font_size = pango_font_description_get_size (font_description); */
+	if (layout_extents.width == 0)
+		return TRUE;
 
 	/* initialize cairo context */
 	#if (GTK_MAJOR_VERSION < 3)
@@ -237,7 +262,9 @@
 	                           green,
 	                           blue, 0.5);
 
-	cairo_move_to (ctx, x, y);
+	x += (allocation.width - layout_extents.width) / 2.0;
+	y += (allocation.height - layout_extents.height) / 2.0;
+	cairo_move_to (ctx, floor (x), floor (y));
 	pango_cairo_layout_path (ctx, layout);
 	cairo_fill (ctx);
 
@@ -257,7 +284,7 @@
 
 	cd_debug ("%s (\"%s\")", __func__, cName);
 
-#if (INDICATOR_OLD_NAMES == 0)
+#if (INDICATOR_OLD_NAMES == 0 && INDICATOR_MESSAGES_HAS_LOZENGE != 1)
 	if (newitem == NULL || !dbusmenu_menuitem_property_get_bool(newitem, DBUSMENU_MENUITEM_PROP_VISIBLE))
 	{
 		cd_debug ("Not visible: %s", cName);
@@ -271,29 +298,36 @@
 	gtk_image_menu_item_set_always_show_image(GTK_IMAGE_MENU_ITEM(gmi), TRUE);
 #endif
 
-	/* Set the minimum size, we always want it to take space */
-	gint width, height;
-	gtk_icon_size_lookup(GTK_ICON_SIZE_MENU, &width, &height);
-
-	GtkWidget * icon = gtk_image_new_from_icon_name(dbusmenu_menuitem_property_get(newitem, APPLICATION_MENUITEM_PROP_ICON), GTK_ICON_SIZE_MENU);
-	gtk_widget_set_size_request(icon, width
-								+ 5 /* ref triangle is 5x9 pixels */
-								+ 2 /* padding */,
-								height);
+	gint padding = 4;
+	gtk_widget_style_get(GTK_WIDGET(gmi), "toggle-spacing", &padding, NULL);
+
+	GtkWidget * hbox = _gtk_hbox_new(padding);
+
+	// Added for Cairo-Dock
+	const gchar *sIconName = dbusmenu_menuitem_property_get (newitem, APPLICATION_MENUITEM_PROP_ICON);
+	#if (GTK_MAJOR_VERSION > 2 && INDICATOR_MESSAGES_HAS_LOZENGE == 1) // we add a left margin
+	if (! dbusmenu_menuitem_property_get_bool(newitem, DBUSMENU_MENUITEM_PROP_VISIBLE)
+		&& (sIconName == NULL || *sIconName == '\0'))
+	{
+		gint width, height;
+		gtk_icon_size_lookup(GTK_ICON_SIZE_MENU, &width, &height);
+		gtk_widget_set_size_request(GTK_WIDGET (gmi), -1, height + 4);
+		gtk_widget_set_margin_left (hbox, width + padding);
+	}
+	#endif
+	// end
+
+	GtkWidget * icon = gtk_image_new_from_icon_name(sIconName, GTK_ICON_SIZE_MENU);
 	gtk_misc_set_alignment(GTK_MISC(icon), 1.0 /* right aligned */, 0.5);
-#if (GTK_MAJOR_VERSION > 2 || GTK_MINOR_VERSION >= 16)
-	gtk_image_menu_item_set_always_show_image (GTK_IMAGE_MENU_ITEM (gmi), TRUE);
-#endif
-	gtk_image_menu_item_set_image(GTK_IMAGE_MENU_ITEM(gmi), icon);
-	gtk_widget_show(icon);
+	gtk_box_pack_start (GTK_BOX (hbox), icon, FALSE, FALSE, 0);
 
 	/* Application name in a label */
 	GtkWidget * label = gtk_label_new(cName);
 	gtk_misc_set_alignment(GTK_MISC(label), 0.0, 0.5);
-	gtk_widget_show(label);
+	gtk_box_pack_start (GTK_BOX (hbox), label, TRUE, TRUE, 0);
 
-	/* Insert the hbox */
-	gtk_container_add(GTK_CONTAINER(gmi), label);
+	gtk_container_add(GTK_CONTAINER(gmi), hbox);
+	gtk_widget_show_all (GTK_WIDGET (gmi));
 
 	/* Attach some of the standard GTK stuff */
 	dbusmenu_gtkclient_newitem_base(DBUSMENU_GTKCLIENT(client), newitem, gmi, parent);
@@ -309,6 +343,8 @@
 	#endif
 	G_CALLBACK (application_triangle_draw_cb), newitem);
 
+	g_free (cName);
+
 	return TRUE;
 }
 
@@ -352,6 +388,11 @@
 #else
 		gtk_label_set_text(GTK_LABEL(mi_data->right), g_value_get_string(value));
 #endif
+#if (INDICATOR_MESSAGES_HAS_LOZENGE == 1)
+	} else if (!g_strcmp0(prop, INDICATOR_MENUITEM_PROP_RIGHT_IS_LOZENGE)) {
+		g_object_set_data (G_OBJECT (mi_data->right), "is-lozenge", GINT_TO_POINTER (TRUE));
+		gtk_widget_queue_draw (mi_data->right);
+#endif
 	} else if (!g_strcmp0(prop, INDICATOR_MENUITEM_PROP_ICON)) {
 		/* We don't use the value here, which is probably less efficient, 
 		   but it's easier to use the easy function.  And since th value
@@ -415,10 +456,10 @@
 	GtkMenuItem * gmi = GTK_MENU_ITEM(gtk_menu_item_new());
 
 	gint padding = 4;
-	gint font_size = RIGHT_LABEL_FONT_SIZE;
-	gtk_widget_style_get(GTK_WIDGET(gmi), "horizontal-padding", &padding, NULL);
+	gint font_size = gtk_widget_get_font_size (GTK_WIDGET (gmi));
+	gtk_widget_style_get(GTK_WIDGET(gmi), "toggle-spacing", &padding, NULL);
 
-	GtkWidget * hbox = _gtk_hbox_new(0);
+	GtkWidget * hbox = _gtk_hbox_new(padding);
 
 	/* Icon, probably someone's face or avatar on an IM */
 	mi_data->icon = gtk_image_new();
@@ -426,7 +467,11 @@
 	/* Set the minimum size, we always want it to take space */
 	gint width, height;
 	gtk_icon_size_lookup(GTK_ICON_SIZE_MENU, &width, &height);
-	gtk_widget_set_size_request(mi_data->icon, width, height);
+	gtk_widget_set_size_request(GTK_WIDGET (gmi), -1, height + 4);
+
+#if (GTK_MAJOR_VERSION > 2)
+	gtk_widget_set_margin_left (hbox, width + padding);
+#endif
 
 	GdkPixbuf * pixbuf = dbusmenu_menuitem_property_get_image(newitem, INDICATOR_MENUITEM_PROP_ICON);
 	if (pixbuf != NULL) {
@@ -451,7 +496,7 @@
 		g_object_unref(resized_pixbuf);
 	}
 	gtk_misc_set_alignment(GTK_MISC(mi_data->icon), 0.0, 0.5);
-	gtk_box_pack_start(GTK_BOX(hbox), mi_data->icon, FALSE, FALSE, padding);
+	gtk_box_pack_start(GTK_BOX(hbox), mi_data->icon, FALSE, FALSE, 0);
 
 	if (pixbuf != NULL) {
 		gtk_widget_show(mi_data->icon);
@@ -460,13 +505,19 @@
 	/* Label, probably a username, chat room or mailbox name */
 	mi_data->label = gtk_label_new(dbusmenu_menuitem_property_get(newitem, INDICATOR_MENUITEM_PROP_LABEL));
 	gtk_misc_set_alignment(GTK_MISC(mi_data->label), 0.0, 0.5);
-	gtk_box_pack_start(GTK_BOX(hbox), mi_data->label, TRUE, TRUE, padding);
+	gtk_box_pack_start(GTK_BOX(hbox), mi_data->label, TRUE, TRUE, 0);
 	gtk_widget_show(mi_data->label);
 
 	/* Usually either the time or the count on the individual
 	   item. */
 	mi_data->right = gtk_label_new(dbusmenu_menuitem_property_get(newitem, INDICATOR_MENUITEM_PROP_RIGHT));
+	#if (INDICATOR_MESSAGES_HAS_LOZENGE == 1)
+	g_object_set_data (G_OBJECT (mi_data->right),
+			   "is-lozenge",
+			   GINT_TO_POINTER (dbusmenu_menuitem_property_get_bool (newitem, INDICATOR_MENUITEM_PROP_RIGHT_IS_LOZENGE)));
+	#else
 	gtk_size_group_add_widget(indicator_right_group, mi_data->right);
+	#endif
 	/* install extra decoration overlay */
 	g_signal_connect (G_OBJECT (mi_data->right),
 	#if (GTK_MAJOR_VERSION < 3)
@@ -478,6 +529,11 @@
 	
 	gtk_misc_set_alignment(GTK_MISC(mi_data->right), 1.0, 0.5);
 	gtk_box_pack_start(GTK_BOX(hbox), mi_data->right, FALSE, FALSE, padding + font_size/2.0);
+	gtk_label_set_width_chars (GTK_LABEL (mi_data->right), 2);
+	#if (INDICATOR_MESSAGES_HAS_LOZENGE == 1 && GTK_MAJOR_VERSION > 2)
+	gtk_style_context_add_class (gtk_widget_get_style_context (mi_data->right),
+	                             "accelerator");
+	#endif
 	gtk_widget_show(mi_data->right);
 
 	gtk_container_add(GTK_CONTAINER(gmi), hbox);
 
=== modified file 'Messaging-Menu/src/dbus-data.h'
--- Messaging-Menu/src/dbus-data.h	2011-04-20 20:46:51 +0000
+++ Messaging-Menu/src/dbus-data.h	2012-04-17 13:08:18 +0000
@@ -17,6 +17,9 @@
 #define INDICATOR_MENUITEM_PROP_LABEL    "indicator-label"
 #define INDICATOR_MENUITEM_PROP_ICON     "indicator-icon"
 #define INDICATOR_MENUITEM_PROP_RIGHT    "right-side-text"
+#if (INDICATOR_MESSAGES_HAS_LOZENGE == 1)
+#define INDICATOR_MENUITEM_PROP_RIGHT_IS_LOZENGE "right-is-lozenge"
+#endif
 
 #define MAX_NUMBER_OF_INDICATORS  7
 
 
=== modified file 'Remote-Control/src/applet-icon-finder.c'
--- Remote-Control/src/applet-icon-finder.c	2012-02-16 01:45:57 +0000
+++ Remote-Control/src/applet-icon-finder.c	2012-04-17 13:08:18 +0000
@@ -147,7 +147,7 @@
 	//\_________________ on gere le cachage et le montrage du dock precedent et actuel.
 	if (myData.pCurrentDock != NULL && pDock != myData.pCurrentDock)  // on remet au repos le dock precedemment anime.
 	{
-		g_print ("leave this dock\n");
+		cd_debug ("leave this dock");
 		cairo_dock_emit_leave_signal (CAIRO_CONTAINER (myData.pCurrentDock));
 		
 		cd_do_remove_icons_number (myData.pCurrentDock);
@@ -159,7 +159,7 @@
 	}
 	if (pDock != NULL && pDock != myData.pCurrentDock)  // on montre le nouveau dock
 	{
-		g_print (" dock %p <- %p\n", myData.pCurrentDock, pDock);
+		cd_debug (" dock %p <- %p", myData.pCurrentDock, pDock);
 		if (pDock->iRefCount > 0)
 		{
 			CairoDock *pParentDock = NULL;
@@ -172,7 +172,7 @@
 		else
 		{
 			/// utile de faire ca si on entre dedans ?...
-			g_print ("enter this dock\n");
+			cd_debug ("enter this dock");
 			if (pDock->bAutoHide)
 				cairo_dock_start_showing (pDock);
 			if (pDock->iVisibility == CAIRO_DOCK_VISI_KEEP_BELOW)
@@ -238,7 +238,7 @@
 	
 	myData.pCurrentDock = pDock;
 	myData.pCurrentIcon = pIcon;
-	g_print ("myData.pCurrentDock <- %p\n", myData.pCurrentDock);
+	cd_debug ("myData.pCurrentDock <- %p", myData.pCurrentDock);
 }
 
 
 
=== modified file 'Remote-Control/src/applet-notifications.c'
--- Remote-Control/src/applet-notifications.c	2012-03-21 11:26:14 +0000
+++ Remote-Control/src/applet-notifications.c	2012-04-17 13:08:18 +0000
@@ -109,7 +109,7 @@
 }
 static void _activate_nth_icon (guint iKeyVal, guint iModifierType)  // iKeyVal is already in the correct interval.
 {
-	g_print ("%s (%d)\n", __func__, iKeyVal);
+	cd_debug ("%s (%d)", __func__, iKeyVal);
 	// get the index of the icon: we want "1" to be the first icon, because it's more natural and it follows the keyboard layout. So "0" will actually be the 10th icon.
 	int iIndex;  // from 0
 	if (iKeyVal >= GDK_0 && iKeyVal <= GDK_9)
@@ -126,7 +126,7 @@
 		else
 			iIndex = iKeyVal - GDK_KP_1;
 	}
-	g_print ("click on %d\n", iIndex);
+	cd_debug ("click on %d", iIndex);
 	// retrieve the nth icon in the current dock.
 	int n = 0;
 	Icon *pNthIcon = NULL, *pIcon;
@@ -148,7 +148,7 @@
 	// execute the icon directly.
 	if (pNthIcon != NULL)
 	{
-		g_print ("click on %s\n", pNthIcon->cName);
+		cd_debug ("click on %s", pNthIcon->cName);
 		///cairo_dock_notify_on_object (CAIRO_CONTAINER (myData.pCurrentDock), NOTIFICATION_CLICK_ICON, pNthIcon, myData.pCurrentDock, iModifierType);
 		cd_do_simulate_click (CAIRO_CONTAINER (myData.pCurrentDock), pNthIcon, iModifierType);
 
@@ -226,7 +226,7 @@
 	{
 		if (myData.sCurrentText->len > 0)
 		{
-			cd_debug ("on efface la derniere lettre de %s (%d)\n", myData.sCurrentText->str, myData.sCurrentText->len);
+			cd_debug ("we remove the last letter of %s (%d)\n", myData.sCurrentText->str, myData.sCurrentText->len);
 			
 			g_string_truncate (myData.sCurrentText, myData.sCurrentText->len-1);
 			
@@ -248,7 +248,7 @@
 	{
 		if (myData.pCurrentIcon != NULL)
 		{
-			g_print ("on clique sur l'icone '%s' [%d, %d]\n", myData.pCurrentIcon->cName, iModifierType, GDK_SHIFT_MASK);
+			cd_debug ("we click on the icon '%s' [%d, %d]", myData.pCurrentIcon->cName, iModifierType, GDK_SHIFT_MASK);
 			
 			myData.bIgnoreIconState = TRUE;
 			if (iModifierType & GDK_MOD1_MASK)  // ALT
 
=== modified file 'Status-Notifier/src/applet-item.c'
--- Status-Notifier/src/applet-item.c	2012-03-21 11:26:14 +0000
+++ Status-Notifier/src/applet-item.c	2012-04-17 13:08:18 +0000
@@ -50,7 +50,7 @@
 
 static CDStatusEnum _find_status (const gchar *cStatus)
 {
-	g_print ("STATUS: %s\n", cStatus);
+	cd_debug ("STATUS: %s", cStatus);
 	if (!cStatus)
 		return CD_STATUS_ACTIVE;
 	if (*cStatus == 'N')
 
=== modified file 'Status-Notifier/src/applet-notifications.c'
--- Status-Notifier/src/applet-notifications.c	2012-03-21 11:26:14 +0000
+++ Status-Notifier/src/applet-notifications.c	2012-04-17 13:08:18 +0000
@@ -191,7 +191,7 @@
 }
 
 
-static gboolean _popup_tooltip (Icon *pIcon)
+/*static gboolean _popup_tooltip (Icon *pIcon)
 {
 	CDStatusNotifierItem *pItemData = CD_APPLET_GET_MY_ICON_DATA (pIcon);
 	if (pItemData != NULL && pItemData->pToolTip != NULL)
@@ -202,7 +202,7 @@
 		gchar *cIconPath = NULL;
 		if (pItemData->pToolTip->cIconName)
 		{
-			cIconPath = cairo_dock_search_icon_s_path (pItemData->pToolTip->cIconName, 32); // dialog
+			cIconPath = cairo_dock_search_icon_s_path (pItemData->pToolTip->cIconName, cairo_dock_search_icon_size (GTK_ICON_SIZE_DND)); // dialog
 		}
 		
 		cairo_dock_show_temporary_dialog_with_icon (cText, pIcon, CAIRO_CONTAINER (myIcon->pSubDock), 3000, cIconPath ? cIconPath : "same icon");
@@ -211,7 +211,7 @@
 		pItemData->iSidPopupTooltip = 0;
 	}
 	return FALSE;
-}
+}*/
 gboolean cd_status_notifier_on_enter_icon (CairoDockModuleInstance *myApplet, Icon *pIcon, CairoDock *pDock, gboolean *bStartAnimation)
 {
 	if (pDock == myIcon->pSubDock && myIcon->pSubDock != NULL)
 
=== modified file 'Status-Notifier/watcher/status-notifier-watcher.py.in'
--- Status-Notifier/watcher/status-notifier-watcher.py.in	2012-02-16 01:45:57 +0000
+++ Status-Notifier/watcher/status-notifier-watcher.py.in	2012-04-17 13:08:18 +0000
@@ -36,7 +36,7 @@
 		try: 
 			self.bus = dbus.SessionBus()
 			bus_name = dbus.service.BusName (self.bus_name_str, self.bus)
-			print "registered a watcher:",bus_name
+			# print "registered a watcher:",bus_name
 			dbus.service.Object.__init__(self, bus_name, self.bus_obj_str)
 		except Exception, exception:
 			print 'Could not open dbus. Uncaught exception.'
@@ -50,16 +50,16 @@
 		self.loop.run()
 	
 	def on_name_owner_changed(self, service, prev_owner, new_owner):
-		print "name_owner_changed: %s; %s; %s" % (service, prev_owner, new_owner)
+		# print "name_owner_changed: %s; %s; %s" % (service, prev_owner, new_owner)
 		if (new_owner == '' and not service.startswith(':')):  # a service has disappear from the bus, check if it was an item or a host.
 			# search amongst the items.
 			match = service+'/'
-			print "  search for ",match
+			# print "  search for ",match
 			to_be_removed=[]
 			for it in self.items_list:
-				print "  check for ",it
+				# print "  check for ",it
 				if (it.startswith(match)):  # it[0:len(match)] == match
-					print "    match!"
+					# print "    match!"
 					to_be_removed.append(it)
 			for it in to_be_removed:
 				self.items_list.remove (it)
@@ -81,7 +81,7 @@
 		if (self.hosts_list.count (service) == 0):  # if not already listed
 			self.hosts_list.append (service)
 			self.StatusNotifierHostRegistered()
-		print 'hosts:',self.hosts_list
+		# print 'hosts:',self.hosts_list
 		sys.stdout.flush()
 	
 	@dbus.service.method(dbus_interface = bus_iface_str, in_signature = 's', out_signature = None, sender_keyword='sender')
@@ -106,7 +106,7 @@
 	def Get(self, interface, property):
 		if interface == 'org.kde.StatusNotifierWatcher':
 			if property == 'RegisteredStatusNotifierItems':
-				print "items: ",self.items_list
+				# print "items: ",self.items_list
 				if (len (self.items_list) != 0):
 					return self.items_list
 				else:  # too bad! dbus-python can't encode the GValue if 'items_list' is None or [].
@@ -120,22 +120,22 @@
 	
 	@dbus.service.signal(dbus_interface=bus_name_str, signature='s')
 	def StatusNotifierItemRegistered(self, service):
-		print "%s registered" % (service)
+		# print "%s registered" % (service)
 		sys.stdout.flush()
 	
 	@dbus.service.signal(dbus_interface=bus_name_str, signature='s')
 	def StatusNotifierItemUnregistered(self, service):
-		print "%s unregistered" % (service)
+		# print "%s unregistered" % (service)
 		sys.stdout.flush()
 	
 	@dbus.service.signal(dbus_interface=bus_name_str, signature=None)
 	def StatusNotifierHostRegistered(self):
-		print "a host has been registered"
+		# print "a host has been registered"
 		sys.stdout.flush()
 	
 	@dbus.service.signal(dbus_interface=bus_name_str, signature=None)
 	def StatusNotifierHostUnregistered(self):
-		print "a host has been unregistered"
+		# print "a host has been unregistered"
 		sys.stdout.flush()
 	
 	
 
=== modified file 'alsaMixer/data/AlsaMixer.conf.in'
--- alsaMixer/data/AlsaMixer.conf.in	2012-03-21 11:26:14 +0000
+++ alsaMixer/data/AlsaMixer.conf.in	2012-04-17 13:08:18 +0000
@@ -142,7 +142,7 @@
 mute icon = 
 
 #h+[@gaugesdir@;gauges;gauges3;sound] Choose one of the available themes:/
-theme = Turbo-night-fuel
+theme = Sound-Mono
 
 #l+[No;With dock orientation;Yes] Rotate applet theme :
 rotate theme = No
 
=== modified file 'alsaMixer/data/CMakeLists.txt'
--- alsaMixer/data/CMakeLists.txt	2010-09-07 02:38:17 +0000
+++ alsaMixer/data/CMakeLists.txt	2012-04-17 13:08:18 +0000
@@ -1,3 +1,4 @@
+add_subdirectory(gauges)
 
 ########### install files ###############
 
 
=== added directory 'alsaMixer/data/gauges'
=== added file 'alsaMixer/data/gauges/CMakeLists.txt'
--- alsaMixer/data/gauges/CMakeLists.txt	1970-01-01 00:00:00 +0000
+++ alsaMixer/data/gauges/CMakeLists.txt	2012-04-17 13:08:18 +0000
@@ -0,0 +1,2 @@
+add_subdirectory(Sound-Mono)
+
 
=== added directory 'alsaMixer/data/gauges/Sound-Mono'
=== added file 'alsaMixer/data/gauges/Sound-Mono/0.svg'
--- alsaMixer/data/gauges/Sound-Mono/0.svg	1970-01-01 00:00:00 +0000
+++ alsaMixer/data/gauges/Sound-Mono/0.svg	2012-04-17 13:08:18 +0000
@@ -0,0 +1,29 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+<svg id="svg3814" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns="http://www.w3.org/2000/svg" height="24" width="24" version="1.1" xmlns:cc="http://creativecommons.org/ns#" xmlns:dc="http://purl.org/dc/elements/1.1/">
+ <metadata id="metadata3819">
+  <rdf:RDF>
+   <cc:Work rdf:about="">
+    <dc:format>image/svg+xml</dc:format>
+    <dc:type rdf:resource="http://purl.org/dc/dcmitype/StillImage"/>
+    <dc:title/>
+   </cc:Work>
+  </rdf:RDF>
+ </metadata>
+ <g id="layer1" transform="translate(1.0004 7)">
+  <path id="rect3180-0" style="opacity:.3;fill-rule:evenodd" d="m7.0129 1c-0.30522 0-0.56653 0.12796-0.75 0.34375l-2.25 2.6562h-2c-0.552 0-1 0.448-1 1-0.00627 0.99607 0.00222 2.0145 0 3 0 0.552 0.448 1 1 1h2l2.1562 2.4688c0.1714 0.305 0.4694 0.531 0.8438 0.531 0.552 0 1-0.448 1-1v-9c0-0.552-0.448-1-1-1z"/>
+  <g id="g3766" style="opacity:.4">
+   <path id="path2996" style="opacity:.3;stroke-width:1.7;stroke:#000;stroke-linecap:round;fill:none" d="m16.867-1.15s2.6135 2.4227 2.6135 7.6349c0 5.1866-2.618 7.6651-2.618 7.6651"/>
+   <path id="path2990" style="stroke-width:1.7;stroke:#dfdbd2;stroke-linecap:round;fill:none" d="m16.867-2.15s2.6135 2.4227 2.6135 7.6349c0 5.1866-2.618 7.6651-2.618 7.6651"/>
+  </g>
+  <g id="g3789" style="opacity:.4">
+   <path id="path2994" style="opacity:.3;stroke-width:1.7;stroke:#000;stroke-linecap:round;fill:none" d="m13.893 1.0955s1.8454 1.7448 1.7797 5.4045c-0.0662 3.6901-1.8093 5.4045-1.8093 5.4045"/>
+   <path id="path2988" style="stroke-width:1.7;stroke:#dfdbd2;stroke-linecap:round;fill:none" d="m13.893 0.095476s1.8454 1.7448 1.7797 5.4045c-0.0662 3.6901-1.8093 5.4045-1.8093 5.4045"/>
+  </g>
+  <g id="g3812" style="opacity:.4">
+   <path id="path3209-4" style="opacity:.3;stroke-width:1.7;stroke:#000;stroke-linecap:round;fill:none" d="m10.863 3.2219s0.98347 0.79498 1.0085 3.2306c0.02476 2.4053-1.0085 3.3256-1.0085 3.3256"/>
+   <path id="path3209" style="stroke-width:1.7;stroke:#dfdbd2;stroke-linecap:round;fill:none" d="m10.863 2.2219s0.98347 0.79498 1.0085 3.2306c0.02476 2.4053-1.0085 3.3256-1.0085 3.3256"/>
+  </g>
+  <path id="rect3180" style="fill-rule:evenodd;fill:#dfdbd2" d="m7.0129 0c-0.30522 0-0.56653 0.12796-0.75 0.34375l-2.25 2.6562h-2c-0.552 0-1 0.448-1 1-0.00627 0.99607 0.00222 2.0145 0 3 0 0.552 0.448 1 1 1h2l2.1562 2.4688c0.1714 0.305 0.4694 0.531 0.8438 0.531 0.552 0 1-0.448 1-1v-9c0-0.552-0.448-1-1-1z"/>
+ </g>
+</svg>
 
=== added file 'alsaMixer/data/gauges/Sound-Mono/1.svg'
--- alsaMixer/data/gauges/Sound-Mono/1.svg	1970-01-01 00:00:00 +0000
+++ alsaMixer/data/gauges/Sound-Mono/1.svg	2012-04-17 13:08:18 +0000
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+<svg id="svg3814" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns="http://www.w3.org/2000/svg" height="24" width="24" version="1.1" xmlns:cc="http://creativecommons.org/ns#" xmlns:dc="http://purl.org/dc/elements/1.1/">
+ <metadata id="metadata3819">
+  <rdf:RDF>
+   <cc:Work rdf:about="">
+    <dc:format>image/svg+xml</dc:format>
+    <dc:type rdf:resource="http://purl.org/dc/dcmitype/StillImage"/>
+    <dc:title/>
+   </cc:Work>
+  </rdf:RDF>
+ </metadata>
+ <g id="layer1" transform="translate(.98942 7)">
+  <path id="rect3180-0" style="opacity:.3;fill-rule:evenodd" d="m7.0129 1c-0.30522 0-0.56653 0.12796-0.75 0.34375l-2.25 2.6562h-2c-0.552 0-1 0.448-1 1-0.00627 0.99607 0.00222 2.0145 0 3 0 0.552 0.448 1 1 1h2l2.1562 2.4688c0.1714 0.305 0.4694 0.531 0.8438 0.531 0.552 0 1-0.448 1-1v-9c0-0.552-0.448-1-1-1z"/>
+  <path id="path3209-4" style="opacity:.3;stroke-width:1.7;stroke:#000;stroke-linecap:round;fill:none" d="m10.863 3.2219s0.98347 0.79498 1.0085 3.2306c0.02476 2.4053-1.0085 3.3256-1.0085 3.3256"/>
+  <g id="g3766" style="opacity:.4">
+   <path id="path2996" style="opacity:.3;stroke-width:1.7;stroke:#000;stroke-linecap:round;fill:none" d="m16.867-1.15s2.6135 2.4227 2.6135 7.6349c0 5.1866-2.618 7.6651-2.618 7.6651"/>
+   <path id="path2990" style="stroke-width:1.7;stroke:#dfdbd2;stroke-linecap:round;fill:none" d="m16.867-2.15s2.6135 2.4227 2.6135 7.6349c0 5.1866-2.618 7.6651-2.618 7.6651"/>
+  </g>
+  <g id="g3789" style="opacity:.4">
+   <path id="path2994" style="opacity:.3;stroke-width:1.7;stroke:#000;stroke-linecap:round;fill:none" d="m13.893 1.0955s1.8454 1.7448 1.7797 5.4045c-0.0662 3.6901-1.8093 5.4045-1.8093 5.4045"/>
+   <path id="path2988" style="stroke-width:1.7;stroke:#dfdbd2;stroke-linecap:round;fill:none" d="m13.893 0.095476s1.8454 1.7448 1.7797 5.4045c-0.0662 3.6901-1.8093 5.4045-1.8093 5.4045"/>
+  </g>
+  <path id="path3209" style="stroke-width:1.7;stroke:#dfdbd2;stroke-linecap:round;fill:none" d="m10.863 2.2219s0.98347 0.79498 1.0085 3.2306c0.02476 2.4053-1.0085 3.3256-1.0085 3.3256"/>
+  <path id="rect3180" style="fill-rule:evenodd;fill:#dfdbd2" d="m7.0129 0c-0.30522 0-0.56653 0.12796-0.75 0.34375l-2.25 2.6562h-2c-0.552 0-1 0.448-1 1-0.00627 0.99607 0.00222 2.0145 0 3 0 0.552 0.448 1 1 1h2l2.1562 2.4688c0.1714 0.305 0.4694 0.531 0.8438 0.531 0.552 0 1-0.448 1-1v-9c0-0.552-0.448-1-1-1z"/>
+ </g>
+</svg>
 
=== added file 'alsaMixer/data/gauges/Sound-Mono/2.svg'
--- alsaMixer/data/gauges/Sound-Mono/2.svg	1970-01-01 00:00:00 +0000
+++ alsaMixer/data/gauges/Sound-Mono/2.svg	2012-04-17 13:08:18 +0000
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+<svg id="svg3814" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns="http://www.w3.org/2000/svg" height="24" width="24" version="1.1" xmlns:cc="http://creativecommons.org/ns#" xmlns:dc="http://purl.org/dc/elements/1.1/">
+ <metadata id="metadata3819">
+  <rdf:RDF>
+   <cc:Work rdf:about="">
+    <dc:format>image/svg+xml</dc:format>
+    <dc:type rdf:resource="http://purl.org/dc/dcmitype/StillImage"/>
+    <dc:title/>
+   </cc:Work>
+  </rdf:RDF>
+ </metadata>
+ <g id="layer1" transform="translate(1.0004 7)">
+  <path id="rect3180-0" style="opacity:.3;fill-rule:evenodd" d="m7.0129 1c-0.30522 0-0.56653 0.12796-0.75 0.34375l-2.25 2.6562h-2c-0.552 0-1 0.448-1 1-0.00627 0.99607 0.00222 2.0145 0 3 0 0.552 0.448 1 1 1h2l2.1562 2.4688c0.1714 0.305 0.4694 0.531 0.8438 0.531 0.552 0 1-0.448 1-1v-9c0-0.552-0.448-1-1-1z"/>
+  <path id="path2994" style="opacity:.3;stroke-width:1.7;stroke:#000;stroke-linecap:round;fill:none" d="m13.893 1.0955s1.8454 1.7448 1.7797 5.4045c-0.0662 3.6901-1.8093 5.4045-1.8093 5.4045"/>
+  <path id="path3209-4" style="opacity:.3;stroke-width:1.7;stroke:#000;stroke-linecap:round;fill:none" d="m10.863 3.2219s0.98347 0.79498 1.0085 3.2306c0.02476 2.4053-1.0085 3.3256-1.0085 3.3256"/>
+  <g id="g3766" style="opacity:.4">
+   <path id="path2996" style="opacity:.3;stroke-width:1.7;stroke:#000;stroke-linecap:round;fill:none" d="m16.867-1.15s2.6135 2.4227 2.6135 7.6349c0 5.1866-2.618 7.6651-2.618 7.6651"/>
+   <path id="path2990" style="stroke-width:1.7;stroke:#dfdbd2;stroke-linecap:round;fill:none" d="m16.867-2.15s2.6135 2.4227 2.6135 7.6349c0 5.1866-2.618 7.6651-2.618 7.6651"/>
+  </g>
+  <path id="path2988" style="stroke-width:1.7;stroke:#dfdbd2;stroke-linecap:round;fill:none" d="m13.893 0.095476s1.8454 1.7448 1.7797 5.4045c-0.0662 3.6901-1.8093 5.4045-1.8093 5.4045"/>
+  <path id="path3209" style="stroke-width:1.7;stroke:#dfdbd2;stroke-linecap:round;fill:none" d="m10.863 2.2219s0.98347 0.79498 1.0085 3.2306c0.02476 2.4053-1.0085 3.3256-1.0085 3.3256"/>
+  <path id="rect3180" style="fill-rule:evenodd;fill:#dfdbd2" d="m7.0129 0c-0.30522 0-0.56653 0.12796-0.75 0.34375l-2.25 2.6562h-2c-0.552 0-1 0.448-1 1-0.00627 0.99607 0.00222 2.0145 0 3 0 0.552 0.448 1 1 1h2l2.1562 2.4688c0.1714 0.305 0.4694 0.531 0.8438 0.531 0.552 0 1-0.448 1-1v-9c0-0.552-0.448-1-1-1z"/>
+ </g>
+</svg>
 
=== added file 'alsaMixer/data/gauges/Sound-Mono/3.svg'
--- alsaMixer/data/gauges/Sound-Mono/3.svg	1970-01-01 00:00:00 +0000
+++ alsaMixer/data/gauges/Sound-Mono/3.svg	2012-04-17 13:08:18 +0000
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+<svg id="svg3814" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns="http://www.w3.org/2000/svg" height="24" width="24" version="1.1" xmlns:cc="http://creativecommons.org/ns#" xmlns:dc="http://purl.org/dc/elements/1.1/">
+ <metadata id="metadata3819">
+  <rdf:RDF>
+   <cc:Work rdf:about="">
+    <dc:format>image/svg+xml</dc:format>
+    <dc:type rdf:resource="http://purl.org/dc/dcmitype/StillImage"/>
+    <dc:title/>
+   </cc:Work>
+  </rdf:RDF>
+ </metadata>
+ <g id="layer1" transform="translate(0,8)">
+  <path id="rect3180-0" d="m8.0134-2.3842e-8c-0.30522 0-0.56653 0.12796-0.75 0.34375l-2.25 2.6562h-2c-0.552 0-1 0.448-1 1-0.00627 0.99607 0.00222 2.0145 0 3 0 0.552 0.448 1 1 1h2l2.1562 2.4688c0.1714 0.305 0.4693 0.531 0.8438 0.531 0.552 0 1-0.448 1-1v-9c0-0.552-0.448-1-1-1z" style="opacity:.3;fill-rule:evenodd"/>
+  <path id="path3209-4" d="m17.868-2.15s2.6135 2.4227 2.6135 7.6349c0 5.1866-2.618 7.6651-2.618 7.6651m-2.971-13.055s1.8454 1.7448 1.7797 5.4045c-0.0662 3.6901-1.8093 5.4045-1.8093 5.4045m-3-8.6827s0.98347 0.79498 1.0085 3.2306c0.02476 2.4053-1.0085 3.3256-1.0085 3.3256" style="opacity:.3;stroke-width:1.7;stroke:#000;stroke-linecap:round;fill:none"/>
+  <path id="path3209" d="m17.868-3.15s2.6135 2.4227 2.6135 7.6349c0 5.1866-2.618 7.6651-2.618 7.6651m-2.971-13.055s1.8454 1.7448 1.7797 5.4045c-0.0662 3.6901-1.8093 5.4045-1.8093 5.4045m-3-8.6827s0.98347 0.79498 1.0085 3.2306c0.02476 2.4053-1.0085 3.3256-1.0085 3.3256" style="stroke-width:1.7;stroke:#dfdbd2;stroke-linecap:round;fill:none"/>
+  <path id="rect3180" d="m8.0134-1c-0.30522 0-0.56653 0.12796-0.75 0.34375l-2.25 2.6562h-2c-0.552 0-1 0.448-1 1-0.00627 0.99607 0.00222 2.0145 0 3 0 0.552 0.448 1 1 1h2l2.1562 2.4688c0.1714 0.3049 0.4693 0.5312 0.8438 0.5312 0.552 0 1-0.448 1-1v-9c0-0.552-0.448-1-1-1z" style="fill-rule:evenodd;fill:#dfdbd2"/>
+ </g>
+</svg>
 
=== added file 'alsaMixer/data/gauges/Sound-Mono/CMakeLists.txt'
--- alsaMixer/data/gauges/Sound-Mono/CMakeLists.txt	1970-01-01 00:00:00 +0000
+++ alsaMixer/data/gauges/Sound-Mono/CMakeLists.txt	2012-04-17 13:08:18 +0000
@@ -0,0 +1,15 @@
+
+########### install files ###############
+
+install(FILES
+	0.svg
+	1.svg
+	2.svg
+	3.svg
+	preview
+	readme
+	theme.xml
+	undef.svg
+	version
+	DESTINATION ${gaugesdir}/Sound-Mono )
+
 
=== added file 'alsaMixer/data/gauges/Sound-Mono/preview'
 Binary files alsaMixer/data/gauges/Sound-Mono/preview	1970-01-01 00:00:00 +0000 and alsaMixer/data/gauges/Sound-Mono/preview	2012-04-17 13:08:18 +0000 differ
=== added file 'alsaMixer/data/gauges/Sound-Mono/readme'
--- alsaMixer/data/gauges/Sound-Mono/readme	1970-01-01 00:00:00 +0000
+++ alsaMixer/data/gauges/Sound-Mono/readme	2012-04-17 13:08:18 +0000
@@ -0,0 +1,1 @@
+Official Ubuntu-Mono's Icons assembled by Matttbe for Cairo-Dock.
 
=== added file 'alsaMixer/data/gauges/Sound-Mono/theme.xml'
--- alsaMixer/data/gauges/Sound-Mono/theme.xml	1970-01-01 00:00:00 +0000
+++ alsaMixer/data/gauges/Sound-Mono/theme.xml	2012-04-17 13:08:18 +0000
@@ -0,0 +1,12 @@
+<gauge>
+	<name>Sound: Ubuntu Mono Dark</name>
+	<version>3</version>
+	<author>Ubuntu-Mono Designers</author>
+	<indicator type="images">
+		<file>0.svg</file>
+		<file>1.svg</file>
+		<file>2.svg</file>
+		<file>3.svg</file>
+		<file type="undef-value">undef.svg</file>
+	</indicator>
+</gauge>
 
=== added file 'alsaMixer/data/gauges/Sound-Mono/undef.svg'
--- alsaMixer/data/gauges/Sound-Mono/undef.svg	1970-01-01 00:00:00 +0000
+++ alsaMixer/data/gauges/Sound-Mono/undef.svg	2012-04-17 13:08:18 +0000
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+<svg id="svg3830" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns="http://www.w3.org/2000/svg" height="24" width="24" version="1.1" xmlns:cc="http://creativecommons.org/ns#" xmlns:dc="http://purl.org/dc/elements/1.1/">
+ <metadata id="metadata3835">
+  <rdf:RDF>
+   <cc:Work rdf:about="">
+    <dc:format>image/svg+xml</dc:format>
+    <dc:type rdf:resource="http://purl.org/dc/dcmitype/StillImage"/>
+    <dc:title/>
+   </cc:Work>
+  </rdf:RDF>
+ </metadata>
+ <path id="path2396-0" d="m8.0024 8c-0.30522 0-0.56653 0.12796-0.75 0.34375l-2.25 2.6562h-2c-0.552 0-1 0.448-1 1-0.00627 0.99607 0.00222 2.0145 0 3 0 0.552 0.448 1 1 1h2l2.1562 2.4688c0.1714 0.305 0.4693 0.531 0.8438 0.531 0.552 0 1-0.448 1-1v-9c0-0.552-0.448-1-1-1zm9.6875 2-2.1875 2.25-2.25-2.2188-1.25 1.2812 2.25 2.1875-2.2188 2.25 1.2812 1.25 2.1875-2.25 2.25 2.2188 1.25-1.2812-2.25-2.1875 2.2188-2.25-1.2812-1.25z" style="opacity:.3"/>
+ <path id="rect3180" d="m8.0024 7c-0.30522 0-0.56653 0.12796-0.75 0.34375l-2.25 2.6562h-2c-0.552 0-1 0.448-1 1-0.00627 0.99607 0.00222 2.0145 0 3 0 0.552 0.448 1 1 1h2l2.1562 2.4688c0.1714 0.305 0.4693 0.531 0.8438 0.531 0.552 0 1-0.448 1-1v-9c0-0.552-0.448-1-1-1zm9.6875 2-2.1875 2.25-2.25-2.2188-1.25 1.2812 2.25 2.1875-2.2188 2.25 1.2812 1.25 2.1875-2.25 2.25 2.2188 1.25-1.2812-2.25-2.1875 2.2188-2.25l-1.281-1.25z" style="fill-rule:evenodd;fill:#19b6ee"/>
+</svg>
 
=== added file 'alsaMixer/data/gauges/Sound-Mono/version'
--- alsaMixer/data/gauges/Sound-Mono/version	1970-01-01 00:00:00 +0000
+++ alsaMixer/data/gauges/Sound-Mono/version	2012-04-17 13:08:18 +0000
@@ -0,0 +1,1 @@
+1
 
=== modified file 'alsaMixer/src/applet-backend-sound-menu.c'
--- alsaMixer/src/applet-backend-sound-menu.c	2012-03-21 11:26:14 +0000
+++ alsaMixer/src/applet-backend-sound-menu.c	2012-04-17 13:08:18 +0000
@@ -73,7 +73,7 @@
 static void
 on_sound_state_updated (DBusGProxy * proxy, gint iNewState, CairoDockModuleInstance *myApplet)
 {
-	g_print ("++++ %s (iNewState : %d)\n", __func__, iNewState);
+	cd_debug ("%s (iNewState : %d)", __func__, iNewState);
 	CD_APPLET_ENTER;
 	if (iNewState != myData.iCurrentState)
 	{
@@ -124,7 +124,7 @@
 
 static void cd_sound_on_connect (CairoDockModuleInstance *myApplet)
 {
-	g_print ("%s ()\n", __func__);
+	cd_debug ("%s ()", __func__);
 	// the sound service is up and running, stop the alsa mixer if ever we initialized it before.
 	cd_stop ();
 	
@@ -150,13 +150,13 @@
 static void cd_sound_on_disconnect (CairoDockModuleInstance *myApplet)
 {
 	CD_APPLET_ENTER;
-	g_print ("++++ %s \n", __func__);
+	cd_debug ("%s", __func__);
 	
 	if (myData.ctl.get_volume == _get_volume)  // the backend was set, unset it
 	{
 		memset (&myData.ctl, 0, sizeof (CDSoundCtl));
 		
-		g_print ("clean\n");
+		cd_debug ("clean");
 		myData.volume_widget = NULL;
 		myData.transport_widgets_list = NULL;
 		myData.voip_widget = NULL;
@@ -179,7 +179,7 @@
 		G_TYPE_INT,
 		&iCurrentState,
 		G_TYPE_INVALID);
-	g_print ("-> got sound state: %d\n", iCurrentState);
+	cd_debug ("got sound state: %d", iCurrentState);
 	
 	// update the icon.
 	myData.iCurrentState = iCurrentState;
@@ -207,7 +207,7 @@
 
 void update_accessible_desc (double new_value)
 {
-	g_print ("%s (%p)\n", __func__, myData.volume_widget);
+	cd_debug ("%s (%p)", __func__, myData.volume_widget);
 	if (!myData.volume_widget)
 		return;
 	
 
=== modified file 'alsaMixer/src/applet-draw.c'
--- alsaMixer/src/applet-draw.c	2012-03-21 11:26:14 +0000
+++ alsaMixer/src/applet-draw.c	2012-04-17 13:08:18 +0000
@@ -46,7 +46,7 @@
 
 static void mixer_draw_bar (cairo_surface_t *pSurface)
 {
-	g_print ("%s (%p, %d)\n", __func__, pSurface, myData.iCurrentVolume);
+	cd_debug ("%s (%p, %d)", __func__, pSurface, myData.iCurrentVolume);
 	CD_APPLET_SET_SURFACE_ON_MY_ICON_WITH_BAR (pSurface, myData.iCurrentVolume * .01);
 }
 
 
=== modified file 'clock/src/applet-draw.c'
--- clock/src/applet-draw.c	2012-03-21 11:26:14 +0000
+++ clock/src/applet-draw.c	2012-04-17 13:08:18 +0000
@@ -24,7 +24,6 @@
 #include <math.h>
 
 #include "applet-struct.h"
-//#include "applet-digital.h" //Digital html like renderer
 #include "applet-draw.h"
 
 #define CD_CLOCK_DATE_BUFFER_LENGTH 50
@@ -49,7 +48,7 @@
 	//\______________ On defini le texte a dessiner.
 	// layout
 	PangoFontDescription *pDesc = pango_font_description_new ();
-	pango_font_description_set_absolute_size (pDesc, myIcon->fHeight * PANGO_SCALE);
+	pango_font_description_set_absolute_size (pDesc, myIcon->fHeight * 72 / myData.fDpi * PANGO_SCALE); // pixel converted to point, converted to pango dimension.
 	pango_font_description_set_family_static (pDesc, myConfig.cFont);
 	pango_font_description_set_weight (pDesc, myConfig.iWeight);
 	pango_font_description_set_style (pDesc, myConfig.iStyle);
@@ -99,16 +98,14 @@
 			w = MAX (log.width, log2.width);
 			fZoomX = (double) iWidth / w;
 			fZoomY = (double) iHeight / h;
-			if (myDock)
-			{
-				if (myContainer->bIsHorizontal && fZoomY > MAX_RATIO * fZoomX)  // we limit the deformation
-					fZoomY = MAX_RATIO * fZoomX;
-				else if (myContainer->bIsHorizontal && fZoomX > MAX_RATIO * fZoomY)
-					fZoomX = MAX_RATIO * fZoomY;
-			}
+			/**if (myDock && fZoomY > MAX_RATIO * fZoomX)  // we limit the deformation
+				fZoomY = MAX_RATIO * fZoomX;
 			
 			if (myConfig.fTextRatio < 1)
-				fZoomY *= myConfig.fTextRatio;
+				fZoomY *= myConfig.fTextRatio;*/
+			// keep the ratio of the text
+			fZoomX = MIN (fZoomX, fZoomY) * myConfig.fTextRatio;
+			fZoomY = fZoomX;
 		}
 		if (myData.iTextLayout == CD_TEXT_LAYOUT_1_LINE || myData.iTextLayout == CD_TEXT_LAYOUT_AUTO)
 		{
@@ -116,22 +113,20 @@
 			w_ = log.width + log2.width + GAPX * iWidth;
 			fZoomX_ = (double) iWidth / w_;
 			fZoomY_ = (double) iHeight / h_;
-			if (myDock)
-			{
-				if (myContainer->bIsHorizontal && fZoomY_ > MAX_RATIO * fZoomX_)  // we limit the deformation
-					fZoomY_ = MAX_RATIO * fZoomX_;
-				else if (myContainer->bIsHorizontal && fZoomX_ > MAX_RATIO * fZoomY_)
-					fZoomX_ = MAX_RATIO * fZoomY_;
-			}
+			/**if (myDock && fZoomY_ > MAX_RATIO * fZoomX_)  // we limit the deformation
+				fZoomY_ = MAX_RATIO * fZoomX_;
 			
 			if (myConfig.fTextRatio < 1)
 				fZoomY_ *= myConfig.fTextRatio;
-
+			
 			if (fZoomY_ > fZoomX_)
 			{
 				double fMaxScale = cairo_dock_get_icon_max_scale (myIcon);
 				fZoomY_ = MAX (fZoomX_, 16. * fMaxScale / h_);  // en mode horizontal, on n'a pas besoin que le texte remplisse toute la hauteur de l'icone. 16 pixels de haut sont suffisant pour etre lisible.
-			}
+			}*/
+			// keep the ratio of the text
+			fZoomX_ = MIN (fZoomX_, fZoomY_) * myConfig.fTextRatio;
+			fZoomY_ = fZoomX_;
 		}
 		
 		if (myData.iTextLayout == CD_TEXT_LAYOUT_AUTO)  // si l'orientation n'est pas encore definie, on la definit de facon a ne pas changer (si on est tres proche de la limite, la taille du texte pourrait changer suffisamment pour nous faire passer d'une orientation a l'autre.
@@ -146,7 +141,7 @@
 		
 		if (myData.iTextLayout == CD_TEXT_LAYOUT_1_LINE)  // mode 1 ligne
 		{
-			cairo_translate (myDrawContext, (iWidth - fZoomX_ * w_) / 2, (iHeight - fZoomY_ * h_)/2);  // centre verticalement.
+			cairo_translate (myDrawContext, (iWidth - fZoomX_ * w_) / 2, (iHeight - fZoomY_ * h_)/2);  // text will be centred.
 			cairo_scale (myDrawContext, fZoomX_, fZoomY_);
 			pango_cairo_show_layout (myDrawContext, pLayout2);
 			
@@ -159,7 +154,7 @@
 		}
 		else  // mode 2 lignes
 		{
-			cairo_translate (myDrawContext, (iWidth - fZoomX * log.width) / 2, (iHeight - fZoomY * h)/2);  // centre verticalement.
+			cairo_translate (myDrawContext, (iWidth - fZoomX * log.width) / 2, (iHeight - fZoomY * h)/2);  // text will be centred.
 			cairo_scale (myDrawContext, fZoomX, fZoomY);
 			pango_cairo_show_layout (myDrawContext, pLayout);
 			
@@ -176,21 +171,18 @@
 	{
 		double fZoomX = (double) iWidth / log.width;
 		double fZoomY = (double) iHeight / log.height;
-		if (myDock)
-		{
-			if (myContainer->bIsHorizontal && fZoomY > MAX_RATIO * fZoomX)  // we limit the deformation
-				fZoomY = MAX_RATIO * fZoomX;
-			else if (myContainer->bIsHorizontal && fZoomX > MAX_RATIO * fZoomY)
-				fZoomX = MAX_RATIO * fZoomY;
-		}
-
+		/**if (myDock && fZoomY > MAX_RATIO * fZoomX)  // we limit the deformation
+			fZoomY = MAX_RATIO * fZoomX;
+		
 		if (myConfig.fTextRatio < 1)
-		{
-			fZoomY *= myConfig.fTextRatio; // only for the height
-			cairo_translate (myDrawContext,
-				0,
-				(iHeight - fZoomY * log.height)/2);  // this text will be centred.
-		}
+			fZoomY *= myConfig.fTextRatio;*/
+		// keep the ratio of the text
+		fZoomX = MIN (fZoomX, fZoomY) * myConfig.fTextRatio;
+		fZoomY = fZoomX;
+		
+		cairo_translate (myDrawContext,
+			(iWidth - fZoomX * log.width)/2,
+			(iHeight - fZoomY * log.height)/2);  // text will be centred.
 		cairo_scale (myDrawContext, fZoomX, fZoomY);
 		pango_cairo_show_layout (myDrawContext, pLayout);
 	}
 
=== modified file 'clock/src/applet-init.c'
--- clock/src/applet-init.c	2011-08-09 18:08:08 +0000
+++ clock/src/applet-init.c	2012-04-17 13:08:18 +0000
@@ -72,6 +72,8 @@
 	myData.iLastCheckedMonth = -1;
 	myData.iLastCheckedYear = -1;
 	myData.iTextLayout = myConfig.iPreferedTextLayout;
+
+	myData.fDpi = gdk_screen_get_resolution (gdk_screen_get_default());
 	
 	//\_______________ On enregistre nos notifications.
 	CD_APPLET_REGISTER_FOR_CLICK_EVENT;
@@ -156,7 +158,9 @@
 		cd_clock_set_current_backend (myApplet);
 		if (pOldBackend != myData.pBackend)
 			cd_clock_list_tasks (myApplet);
-		
+
+		myData.fDpi = gdk_screen_get_resolution (gdk_screen_get_default());
+
 		//\_______________ On relance le timer.
 		myData.iLastCheckedMinute = -1;
 		myData.iLastCheckedDay = -1;
 
=== modified file 'clock/src/applet-struct.h'
--- clock/src/applet-struct.h	2010-09-18 14:20:27 +0000
+++ clock/src/applet-struct.h	2012-04-17 13:08:18 +0000
@@ -183,6 +183,7 @@
 	cairo_surface_t *pNumericBgSurface;
 	ClockDigital pDigitalClock;
 	guint iTextLayout;
+	gdouble fDpi;
 	
 	GLuint iBgTexture, iFgTexture, iHourNeedleTexture, iMinuteNeedleTexture, iSecondNeedleTexture, iDateTexture;
 	gint iNeedleWidth, iNeedleHeight;
 
=== modified file 'debian/cairo-dock-plug-ins.install'
--- debian/cairo-dock-plug-ins.install	2012-02-16 01:45:57 +0000
+++ debian/cairo-dock-plug-ins.install	2012-04-17 13:08:18 +0000
@@ -1,3 +1,3 @@
 usr/lib/*/cairo-dock/libcd-*.so
 usr/lib/*/cairo-dock/status-notifier-watcher
-usr/lib/*/cairo-dock/appmenu-registrar
+
 
=== modified file 'debian/changelog'
--- debian/changelog	2012-03-26 14:35:30 +0000
+++ debian/changelog	2012-04-17 13:08:18 +0000
@@ -1,3 +1,71 @@
+cairo-dock-plug-ins (3.0.0.1-0ubuntu1) UNRELEASED; urgency=low
+
+  * New upstream release. (LP: #983289)
+  * Upstream ChangeLog:
+   - Updated translations
+   - Moved 'battery' theme from cairo-dock-core to cairo-dock-plug-ins
+   - Included here a sound gauge theme for alsaMixer applet from our server in
+      order to use the Default-Panel theme without an Internet connexion.
+   - Shortcuts: properly initialize the disk structure, to avoid polling non
+      writable disks
+   - Clipper: fixed a warning when stopping the applet
+   - Clock: fixed a small regression: text should be vertically centered
+   - dnd2share: Fixed videobin backend and forced curl to follow redirection
+   - Clock: numeric: Fixed a typo about the maximum ratio in vertical mode
+   - Panel view: fixed the frame drawing (no bottom rounded corners)
+   - Messaging-Menu:
+    + Some items was not displayed with the latest version of indicator-messages
+    + Fixed a few details about the lozenge and the drawing
+    + Fixed a tiny memory leak
+   - MusicPlayer: Fixed a typo about the detection of the MPRIS2 services for
+      handlers with a valid mpris2 string
+   - Shortcuts: used a default icon if vfs_backend_get_file_info returns none
+      icon name (g_file_info_get_icon seems not able to find an icon for folders
+      or drives on KDE)
+   - GMenu: checked if alacarte or kmenuedit is available before adding the menu
+      entry to launch it (alacarte seems no longer installed by default on new
+      distributions with Gnome)
+   - PowerManager: if we want to hide the icon, hide it even on desktop when we
+      have no information)
+   - ShowDesktop: if we can't show the widget layer or present the desktops
+      (expo), we now display a warning and use the default action instead of
+      doing nothing
+   - Switcher: menu: limit windows' title to 50 chars to avoid too larger menus
+   - Clipper: Menu entries are now translated
+   - Mail: disable the RSS feed for Gmail, as it is not working any more with the
+      current GMail authentification system; use IMAP instead
+   - Status-Notifier: Removed an unused function
+   - stdout: removed a lot of g_print functions (or replaced by cd_debug)
+   - Clock: fixed the text drawing: avoid any stretching of the text
+  * This 3.0 series (and previous series) also fixes these bugs:
+   - "Cairo-dock plugin musicPlayer loads ridiculous covers" (LP: #538569)
+   - "Songbird support outdated in musicPlayer" (LP: #538361)
+   - "Trash applet detects drag-and-dropped items twice" (LP: #530975)
+   - "Lock screen does not work in GNOME 3" (LP: #943533)
+   - "Sound volume don't work on the cairo-dock of my computer after a killall
+       pulseaudio" (LP: #913101)
+   - "Logout Applet needs guest session menu" (LP: #757193)
+   - "Trash not emptied with folders from other partitions" (LP: #686564)
+   - "Incorrect down/up speeds in Netspeed" (LP: #672452)
+   - "the desklet 'meteo' gone freeze, and if i try to change localization crashes
+       all cairo, that became black" (LP: #671261)
+   - "Clipper action failed on other WM than kde gnome xfce" (LP: #664089)
+   - "Crashed when trying to remove Doncky deskapplet" (LP: #656611)
+   - "Issues with the rendering of the Switcher applet" (LP: #606304)
+   - "Shortcuts plugin brings dock to the front if new usb drive is pluged in
+       and dock stays infront of all windows after that" (LP: #569598)
+   - "Dustbin applet does not display trash on all volumes" (LP: #483963)
+  * debian/control:
+   - Bump Standards-Version
+   - Updated the version of libgldi-dev (build-dep) and cairo-dock-core.
+  * debian/rules:
+   - Removed -Denable-global-menu=yes
+      (Global Menu applet is not considered as a stable and usable applet)
+  * debian/cairo-dock-plug-ins.install
+   - Removed 'appmenu-registrar' (Global Menu applet is no longer compiled)
+
+ -- Matthieu Baerts (matttbe) <[e-mail]>  Tue, 17 Apr 2012 15:04:21 +0200
+
 cairo-dock-plug-ins (3.0.0.0rc1-0ubuntu1) precise; urgency=low
 
   * New upstream release. (LP: #961579)
 
=== modified file 'debian/control'
--- debian/control	2012-03-21 20:34:03 +0000
+++ debian/control	2012-04-17 13:08:18 +0000
@@ -17,7 +17,7 @@
 		libgl1-mesa-dev | libgl-dev,
 		libglu1-mesa-dev | libglu-dev,
 		libpango1.0-dev,
-		libgldi-dev (>= 3.0.0.0rc1),
+		libgldi-dev (>= 3.0.0.1),
 		libasound2-dev,
 		libvte-2.90-dev,
 		x11proto-xf86vidmode-dev,
@@ -46,7 +46,7 @@
 		libndesk-dbus-glib1.0-cil-dev,
 		libpulse-dev,
 		libupower-glib-dev
-Standards-Version: 3.9.2
+Standards-Version: 3.9.3
 Homepage: http://www.glx-dock.org/
 
 Package: cairo-dock-plug-ins-integration
@@ -55,7 +55,7 @@
 Conflicts: 	cairo-dock-plug-ins (<= 2.0.8.0)
 Replaces: 	cairo-dock-plug-ins (<= 2.0.8.0)
 Depends: 	cairo-dock-plug-ins-data (>= ${source:Version}),
-		cairo-dock-core (>= 3.0.0.0rc1),
+		cairo-dock-core (>= 3.0.0.1),
 		${misc:Depends}
 Pre-Depends: ${misc:Pre-Depends}
 Suggests:	gvfs
@@ -72,7 +72,7 @@
 Architecture: any
 Conflicts: 	cairo-dock-plug-ins (<= 2.0.8.0)
 Depends: 	cairo-dock-plug-ins-data (>= ${source:Version}),
-		cairo-dock-core (>= 3.0.0.0rc1),
+		cairo-dock-core (>= 3.0.0.1),
 		curl,
 		wget,
 		${shlibs:Depends},
 
=== modified file 'debian/rules'
--- debian/rules	2012-02-16 01:45:57 +0000
+++ debian/rules	2012-04-17 13:08:18 +0000
@@ -7,7 +7,6 @@
 	-Denable-old-gnome-integration=no \
 	-Denable-kde-integration=yes \
 	-Denable-xfce-integration=yes \
-	-Denable-global-menu=yes \
 	-DGMCS_EXECUTABLE=/usr/bin/mono-csc \
 	-DROOT_PREFIX=$(CURDIR)/debian/tmp \
 	-DCMAKE_INSTALL_LIBDIR=lib/$(DEB_HOST_MULTIARCH)
 
=== modified file 'dnd2share/src/applet-backend-imagebin.c'
--- dnd2share/src/applet-backend-imagebin.c	2011-04-20 20:46:51 +0000
+++ dnd2share/src/applet-backend-imagebin.c	2012-04-17 13:08:18 +0000
@@ -45,7 +45,7 @@
 	close(fds);
 	
 	// On lance la commande d'upload.
-	gchar *cCommand = g_strdup_printf ("curl --connect-timeout 5 --retry 2 --limit-rate %dk http://imagebin.ca/upload.php -F f=@\"%s\" -F t=file -o \"s\"", iLimitRate, cFilePath, cLogFile);
+	gchar *cCommand = g_strdup_printf ("curl -L --connect-timeout 5 --retry 2 --limit-rate %dk http://imagebin.ca/upload.php -F f=@\"%s\" -F t=file -o \"s\"", iLimitRate, cFilePath, cLogFile);
 	cd_debug ("%s", cCommand);
 	int r = system (cCommand);
 	g_free (cCommand);
 
=== modified file 'dnd2share/src/applet-backend-imageshack.c'
--- dnd2share/src/applet-backend-imageshack.c	2011-04-20 20:46:51 +0000
+++ dnd2share/src/applet-backend-imageshack.c	2012-04-17 13:08:18 +0000
@@ -45,7 +45,7 @@
 	
 	// On lance la commande d'upload.
 	gchar *cCommand = NULL;
-	cCommand = g_strdup_printf ("curl --connect-timeout 5 --retry 2 --limit-rate %dk http://imageshack.us -F xml=yes -F tags=Cairo-Dock -F fileupload=@\"%s\" -o \"%s\"", iLimitRate, cFilePath, cLogFile);
+	cCommand = g_strdup_printf ("curl -L --connect-timeout 5 --retry 2 --limit-rate %dk http://imageshack.us -F xml=yes -F tags=Cairo-Dock -F fileupload=@\"%s\" -o \"%s\"", iLimitRate, cFilePath, cLogFile);
 	cd_debug ("%s", cCommand);
 	int r = system (cCommand);
 	g_free (cCommand);
 
=== modified file 'dnd2share/src/applet-backend-uppix.c'
--- dnd2share/src/applet-backend-uppix.c	2011-08-09 18:08:08 +0000
+++ dnd2share/src/applet-backend-uppix.c	2012-04-17 13:08:18 +0000
@@ -44,7 +44,7 @@
 	close(fds);
 	
 	// On lance la commande d'upload.
-	gchar *cCommand = g_strdup_printf ("curl --connect-timeout 5 --retry 2 --limit-rate %dk uppix.net -H Expect: -F myimage=@\"%s\" -F submit=Upload -F formup=1 -o \"%s\"", iLimitRate, cFilePath, cLogFile);
+	gchar *cCommand = g_strdup_printf ("curl -L --connect-timeout 5 --retry 2 --limit-rate %dk uppix.net -H Expect: -F myimage=@\"%s\" -F submit=Upload -F formup=1 -o \"%s\"", iLimitRate, cFilePath, cLogFile);
 	cd_debug ("%s", cCommand);
 	int r = system (cCommand);
 	g_free (cCommand);
 
=== modified file 'dnd2share/src/applet-backend-videobin.c'
--- dnd2share/src/applet-backend-videobin.c	2011-04-20 20:46:51 +0000
+++ dnd2share/src/applet-backend-videobin.c	2012-04-17 13:08:18 +0000
@@ -35,7 +35,7 @@
 static void upload (const gchar *cFilePath, gchar *cDropboxDir, gboolean bAnonymous, gint iLimitRate, gchar **cResultUrls)
 {
 	// On lance la commande d'upload.
-	gchar *cCommand = g_strdup_printf ("curl --connect-timeout 5 --retry 2 --limit-rate %dk http://www.videobin.org/add -F videoFile=@\"%s\" -F api=1", iLimitRate, cFilePath);
+	gchar *cCommand = g_strdup_printf ("curl -L --connect-timeout 5 --retry 2 --limit-rate %dk http://videobin.org/add -F videoFile=@\"%s\" -F api=1", iLimitRate, cFilePath);
 	cd_debug ("%s", cCommand);
 	gchar *cURL = cairo_dock_launch_command_sync (cCommand);
 	g_free (cCommand);
 
=== modified file 'dock-rendering/src/rendering-panel.c'
--- dock-rendering/src/rendering-panel.c	2012-02-16 01:45:57 +0000
+++ dock-rendering/src/rendering-panel.c	2012-04-17 13:08:18 +0000
@@ -180,7 +180,7 @@
 	}
 
 	cairo_save (pCairoContext);
-	double fDeltaXTrapeze = cairo_dock_draw_frame (pCairoContext, fRadius, fLineWidth, fDockWidth, pDock->iDecorationsHeight, fDockOffsetX, fDockOffsetY, sens, 0., pDock->container.bIsHorizontal, myDocksParam.bRoundedBottomCorner);
+	double fDeltaXTrapeze = cairo_dock_draw_frame (pCairoContext, fRadius, fLineWidth, fDockWidth, pDock->iDecorationsHeight, fDockOffsetX, fDockOffsetY, sens, 0., pDock->container.bIsHorizontal, FALSE);  // FALSE <=> ignore 'myDocksParam.bRoundedBottomCorner', as bottom rounded corners looks bad for a panel.
 
 	//\____________________ On dessine les decorations dedans.
 	fDockOffsetY = (pDock->container.bDirectionUp ? pDock->container.iHeight - pDock->iDecorationsHeight - fLineWidth : fLineWidth);
@@ -473,7 +473,7 @@
 	double fDockMagnitude = cairo_dock_calculate_magnitude (pDock->iMagnitudeIndex);
 	
 	//\_____________ On genere les coordonnees du contour.
-	const CairoDockGLPath *pFramePath = cairo_dock_generate_rectangle_path (fDockWidth, fFrameHeight, fRadius, myDocksParam.bRoundedBottomCorner);
+	const CairoDockGLPath *pFramePath = cairo_dock_generate_rectangle_path (fDockWidth, fFrameHeight, fRadius, FALSE);  // same remark as in cairo rendering
 	
 	//\_____________ On remplit avec le fond.
 	glPushMatrix ();
@@ -809,7 +809,7 @@
 							rect.y = 0;
 							rect.width = pData->fGroupGap - 4 * my_fPanelRadius;
 							rect.height = pDock->iMaxDockHeight;  // we use iMaxDockHeight instead of the actual window size, because at this time, the dock's window may not have its definite size.
-							g_print ("***  rect %d; %d\n", (int)rect.x, (int)rect.width);
+							cd_debug ("rect %d; %d", (int)rect.x, (int)rect.width);
 						}
 						else
 						{
@@ -848,7 +848,7 @@
 		wi *= my_fPanelRatio;
 		hi *= my_fPanelRatio;
 	}
-	g_print (" ~~~~~~~~~~~~ size: %d => %dx%d\n", pDock->iIconSize, wi, hi);
+	//g_print (" ~~~~~~~~~~~~ size: %d => %dx%d\n", pDock->iIconSize, wi, hi);
 	
 	// set the visible size at rest.
 	if (CAIRO_DOCK_ICON_TYPE_IS_APPLET (icon))  // for applets, consider (fWidth,fHeight) as a requested size, if not 0.
@@ -896,7 +896,7 @@
 		icon->iImageWidth = icon->fHeight;
 		icon->iImageHeight = icon->fWidth;
 	}
-	g_print (" ~~~~~~~~~~~~ => %dx%d\n", icon->iImageWidth, icon->iImageHeight);
+	//g_print (" ~~~~~~~~~~~~ => %dx%d\n", icon->iImageWidth, icon->iImageHeight);
 }
 
 void cd_rendering_register_panel_renderer (const gchar *cRendererName)
 
=== modified file 'drop-indicator/src/applet-notifications.c'
--- drop-indicator/src/applet-notifications.c	2012-03-21 11:26:14 +0000
+++ drop-indicator/src/applet-notifications.c	2012-04-17 13:08:18 +0000
@@ -382,7 +382,7 @@
 			iHeight,
 			CAIRO_DOCK_KEEP_RATIO);
 	}
-	g_print (" %p, %d, %d\n", myData.hoverIndicator.pSurface, myData.hoverIndicator.iTexture, g_bUseOpenGL);
+	cd_debug (" %p, %d, %d", myData.hoverIndicator.pSurface, myData.hoverIndicator.iTexture, g_bUseOpenGL);
 }
 
 void cd_drop_indicator_free_buffers (void)
 
=== modified file 'gvfs-integration/cairo-dock-gio-vfs.c'
--- gvfs-integration/cairo-dock-gio-vfs.c	2012-03-21 11:26:14 +0000
+++ gvfs-integration/cairo-dock-gio-vfs.c	2012-04-17 13:08:18 +0000
@@ -862,7 +862,7 @@
 				if (pPreviewIcon != NULL)
 				{
 					icon->cFileName = _cd_get_icon_path (pPreviewIcon, NULL);
-					g_print ("got preview icon '%s'\n", icon->cFileName);
+					// g_print ("got preview icon '%s'\n", icon->cFileName);
 				}
 			}*/
 			#endif
 
=== modified file 'keyboard-indicator/src/applet-draw.c'
--- keyboard-indicator/src/applet-draw.c	2012-02-16 01:45:57 +0000
+++ keyboard-indicator/src/applet-draw.c	2012-04-17 13:08:18 +0000
@@ -58,7 +58,7 @@
 			1.,
 			0*iWidth,
 			&myData.iCurrentTextWidth, &myData.iCurrentTextHeight);
-		g_print ("KEYBOARD: %dx%d / %dx%d\n", myData.iCurrentTextWidth, myData.iCurrentTextHeight, myIcon->iImageWidth, myIcon->iImageHeight);
+		cd_debug ("KEYBOARD: %dx%d / %dx%d", myData.iCurrentTextWidth, myData.iCurrentTextHeight, myIcon->iImageWidth, myIcon->iImageHeight);
 		if (g_bUseOpenGL)
 		{
 			myData.iCurrentTexture = cairo_dock_create_texture_from_surface (myData.pCurrentSurface);
@@ -101,7 +101,7 @@
 	///CD_APPLET_SET_QUICK_INFO_ON_MY_ICON (!cIndicatorName || *cIndicatorName == '\0' ? NULL : cIndicatorName);
 	if (myConfig.bShowKbdIndicator)
 	{
-		g_print ("XKBD: caps-lock: %d; num-lock: %d\n", myData.iCurrentIndic & 1, myData.iCurrentIndic & 2);
+		cd_debug ("XKBD: caps-lock: %d; num-lock: %d", myData.iCurrentIndic & 1, myData.iCurrentIndic & 2);
 		if (myData.iCurrentIndic & 1)  // caps-lock
 		{
 			if (! (myData.iPreviousIndic & 1))
@@ -132,7 +132,7 @@
 {
 	CD_APPLET_ENTER;
 	double f = CD_APPLET_GET_TRANSITION_FRACTION ();
-	g_print ("%s (%.2f; %.2fx%.2f)\n", __func__, f, myIcon->fWidth, myIcon->fHeight);
+	cd_debug ("%s (%.2f; %.2fx%.2f)", __func__, f, myIcon->fWidth, myIcon->fHeight);
 	
 	int iWidth, iHeight;
 	CD_APPLET_GET_MY_ICON_EXTENT (&iWidth, &iHeight);
 
=== modified file 'mail/src/cd-mail-applet-accounts.c'
--- mail/src/cd-mail-applet-accounts.c	2011-04-20 20:46:51 +0000
+++ mail/src/cd-mail-applet-accounts.c	2012-04-17 13:08:18 +0000
@@ -340,7 +340,7 @@
 
 	gboolean bFlushConfFileNeeded = FALSE;
 
-#if ( __WORDSIZE == 64 )
+#if (1 || __WORDSIZE == 64 )  // RSS authentification seems to have changed, and doesn't work anymore here :-/ so use IMAP by default
 /* in 64bit libetpan crashes with RSS, so use the IMAP feature of GMail
  * instead of RSS. */
 	mailaccount->driver = IMAP_STORAGE;
@@ -361,7 +361,7 @@
 	mailaccount->folder = NULL;
 	mailaccount->server = NULL;
 	mailaccount->port = 443;
-	mailaccount->connection_type = CONNECTION_TYPE_PLAIN;
+	mailaccount->connection_type = CONNECTION_TYPE_STARTTLS;
 	mailaccount->user = NULL;
 	mailaccount->password = NULL;
 	mailaccount->auth_type = POP3_AUTH_TYPE_PLAIN;
 
=== modified file 'musicPlayer/src/applet-cover.c'
--- musicPlayer/src/applet-cover.c	2012-02-16 01:45:57 +0000
+++ musicPlayer/src/applet-cover.c	2012-04-17 13:08:18 +0000
@@ -182,7 +182,7 @@
 }
 static gboolean _get_cover_again (gpointer data)
 {
-	g_print ("%s ()\n", __func__);
+	cd_debug ("%s ()", __func__);
 	myData.iNbCheckCover ++;
 	if (myData.iNbCheckCover > 1)
 	{
@@ -243,7 +243,7 @@
 	{
 		return;
 	}
-	g_print ("%s (%s -> %s)\n", __func__, myData.cCoverPath, cGivenCoverPath);
+	cd_debug ("%s (%s -> %s)", __func__, myData.cCoverPath, cGivenCoverPath);
 	
 	g_free (myData.cPreviousCoverPath);
 	myData.cPreviousCoverPath = myData.cCoverPath;  // remember the previous cover.
@@ -321,7 +321,7 @@
 }
 static void cd_musicplayer_dl_cover (void)
 {
-	g_print ("MP-COVER - %s (%s, %s, %s)\n", __func__, myData.cArtist, myData.cAlbum, myData.cPlayingUri);
+	cd_debug ("MP-COVER - %s (%s, %s, %s)", __func__, myData.cArtist, myData.cAlbum, myData.cPlayingUri);
 	
 	if (myData.pCoverTask != NULL)
 	{
 
=== modified file 'musicPlayer/src/applet-draw.c'
--- musicPlayer/src/applet-draw.c	2012-03-21 11:26:14 +0000
+++ musicPlayer/src/applet-draw.c	2012-04-17 13:08:18 +0000
@@ -201,7 +201,7 @@
  */
 void cd_musicplayer_apply_status_surface (MyPlayerStatus iStatus)
 {
-	g_print ("*** %s (%d)\n", __func__, iStatus);
+	cd_debug ("%s (%d)", __func__, iStatus);
 	g_return_if_fail (iStatus < PLAYER_NB_STATUS);
 	gboolean bUse3DTheme = (CD_APPLET_MY_CONTAINER_IS_OPENGL && myConfig.bOpenglThemes);
 	cairo_surface_t *pSurface = myData.pSurfaces[iStatus];
@@ -253,7 +253,7 @@
 
 void cd_musiplayer_apply_cover (void)
 {
-	g_print ("*** %s (%s)\n", __func__, myData.cCoverPath);
+	cd_debug ("%s (%s)", __func__, myData.cCoverPath);
 	g_return_if_fail (myData.cCoverPath != NULL);
 	
 	if (CD_APPLET_MY_CONTAINER_IS_OPENGL && myConfig.bOpenglThemes)
 
=== modified file 'musicPlayer/src/applet-musicplayer.c'
--- musicPlayer/src/applet-musicplayer.c	2012-03-21 11:26:14 +0000
+++ musicPlayer/src/applet-musicplayer.c	2012-04-17 13:08:18 +0000
@@ -284,13 +284,13 @@
 	if (bSuccess && G_VALUE_HOLDS_STRING (&v))
 	{
 		const gchar *cDesktopFileName = g_value_get_string (&v);
-		g_print (" got desktop-entry '%s' from the service '%s'\n", cDesktopFileName, myData.pCurrentHandler->cMprisService);
+		cd_debug (" got desktop-entry '%s' from the service '%s'", cDesktopFileName, myData.pCurrentHandler->cMprisService);
 		
 		if (cDesktopFileName != NULL)
 		{
 			if (myConfig.cLastKnownDesktopFile == NULL || strcmp (cDesktopFileName, myConfig.cLastKnownDesktopFile) != 0)  // the property has changed from the previous time.
 			{
-				g_print ("  desktop-entry has changed, update\n");
+				cd_debug ("  desktop-entry has changed, update");
 				// store the desktop filename, since we can't have it until the service is up, the next time the applet is started, which means we wouldn't be able to launch the player.
 				cairo_dock_update_conf_file (CD_APPLET_MY_CONF_FILE,
 					G_TYPE_STRING, "Configuration", "desktop-entry", cDesktopFileName,
@@ -306,7 +306,7 @@
 				myData.pCurrentHandler->appclass = cairo_dock_register_class (cDesktopFileName);
 				myData.pCurrentHandler->launch = g_strdup (cairo_dock_get_class_command (myData.pCurrentHandler->appclass));
 				myData.pCurrentHandler->cDisplayedName = g_strdup (cairo_dock_get_class_name (myData.pCurrentHandler->appclass));
-				g_print ("  class is now '%s'\n", myData.pCurrentHandler->appclass);
+				cd_debug ("  class is now '%s'", myData.pCurrentHandler->appclass);
 				
 				if (myData.pCurrentHandler->appclass != NULL)
 				{
@@ -451,8 +451,8 @@
 	
 	if (myData.pCurrentHandler != NULL)  // an old handler exist with this name, use it but also look for the associated MPRIS2 service.
 	{
-		myData.cMpris2Service = g_strdup_printf (CD_MPRIS2_SERVICE_BASE".%s",
-			myData.pCurrentHandler->cMpris2Service ? myData.pCurrentHandler->cMpris2Service : cName);
+		myData.cMpris2Service = myData.pCurrentHandler->cMpris2Service ? g_strdup (myData.pCurrentHandler->cMpris2Service) : g_strdup_printf (CD_MPRIS2_SERVICE_BASE".%s", cName);
+		cd_debug ("We check this MPRIS2 service: %s", myData.cMpris2Service);
 		
 		cairo_dock_watch_dbus_name_owner (myData.cMpris2Service, (CairoDockDbusNameOwnerChangedFunc) _on_name_owner_changed, NULL);
 		
 
=== modified file 'po/ar.po'
--- po/ar.po	2012-03-21 11:26:14 +0000
+++ po/ar.po	2012-04-17 13:08:18 +0000
@@ -7,15 +7,16 @@
 msgstr ""
 "Project-Id-Version: cairo-dock-plug-ins\n"
 "Report-Msgid-Bugs-To: [e-mail]\n"
+"POT-Creation-Date: 2012-04-12 00:33+0000\n"
 "PO-Revision-Date: 2011-09-16 00:48+0000\n"
 "Last-Translator: Fabounet <[e-mail]>\n"
 "Language-Team: Arabic <[e-mail]>\n"
-"Language: ar\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-02-13 04:54+0000\n"
-"X-Generator: Launchpad (build 14781)\n"
+"X-Launchpad-Export-Date: 2012-04-13 05:31+0000\n"
+"X-Generator: Launchpad (build 15070)\n"
+"Language: ar\n"
 
 #: ../Animated-icons/src/applet-init.c:32
 msgid "Animated icons"
@@ -66,38 +67,6 @@
 msgid "Spot"
 msgstr "بقعة"
 
-#: ../Application-Menu/src/applet-init.c:30
-#, fuzzy
-msgid "Application Menu"
-msgstr "قائمة البرامج"
-
-#: ../Application-Menu/src/applet-init.c:33
-#: ../Global-Menu/src/applet-init.c:33
-msgid ""
-"This applet allows you to control the current active window:\n"
-"  close, minimize, maximize, and display the application menu.To display the "
-"menu, applications have to support this feature, which is the case on Ubuntu "
-"by default.\n"
-"You can bind a shortkey to this action."
-msgstr ""
-
-#: ../Application-Menu/src/applet-init.c:83
-#: ../Application-Menu/src/applet-init.c:148
-#: ../Global-Menu/src/applet-init.c:108 ../Global-Menu/src/applet-init.c:210
-msgid "Show/hide the current application menu"
-msgstr ""
-
-#: ../Application-Menu/src/applet-notifications.c:52
-#: ../Global-Menu/src/applet-notifications.c:52
-msgid "The application didn't send its menu to us."
-msgstr ""
-
-#: ../Application-Menu/src/indicator-sound.c:228
-#: ../Sound-Menu/src/indicator-sound.c:228
-#, c-format
-msgid "Volume (%'.0f%%)"
-msgstr ""
-
 #: ../Cairo-Penguin/src/applet-init.c:33
 msgid ""
 "Add a lively Penguin in your dock !\n"
@@ -125,7 +94,8 @@
 #: ../Cairo-Penguin/src/applet-notifications.c:31
 msgid ""
 "I don't have time to play with you, I have to dig and mine all these icons."
-msgstr "ليس لدي مايكفي من الوقت للعب معك, علي أن احفر وألغم كل هذه الأيقونات."
+msgstr ""
+"ليس لدي مايكفي من الوقت للعب معك, علي أن احفر وألغم كل هذه الأيقونات."
 
 #: ../Cairo-Penguin/src/applet-notifications.c:32
 msgid "Your dock is so messy! Let me clean it."
@@ -223,6 +193,14 @@
 msgid "The clipboard history is empty."
 msgstr ""
 
+#: ../Clipper/src/applet-notifications.c:89
+msgid "Clear clipboard History"
+msgstr ""
+
+#: ../Clipper/src/applet-notifications.c:91
+msgid "Paste all copied items"
+msgstr ""
+
 #: ../Clipper/src/applet-notifications.c:99
 msgid ""
 "No persistent items.\n"
@@ -291,7 +269,7 @@
 #: ../Composite-Manager/src/applet-notifications.c:154
 #: ../Composite-Manager/src/applet-notifications.c:163
 #: ../Folders/src/applet-notifications.c:365
-#: ../GMenu/src/applet-notifications.c:74
+#: ../GMenu/src/applet-notifications.c:81
 #: ../RSSreader/src/applet-notifications.c:129
 #: ../System-Monitor/src/applet-notifications.c:106
 #: ../Xgamma/src/applet-notifications.c:87
@@ -303,9 +281,9 @@
 #: ../quick-browser/src/applet-notifications.c:41
 #: ../shortcuts/src/applet-notifications.c:249
 #: ../shortcuts/src/applet-notifications.c:269
-#: ../showDesktop/src/applet-notifications.c:153
 #: ../showDesktop/src/applet-notifications.c:165
 #: ../showDesktop/src/applet-notifications.c:177
+#: ../showDesktop/src/applet-notifications.c:189
 #: ../slider/src/applet-notifications.c:223
 #: ../slider/src/applet-notifications.c:265
 #: ../stack/src/applet-notifications.c:181
@@ -322,16 +300,16 @@
 msgstr ""
 
 #: ../Composite-Manager/src/applet-notifications.c:136
-#: ../showDesktop/src/applet-notifications.c:153
-#: ../showDesktop/src/applet-notifications.c:155
+#: ../showDesktop/src/applet-notifications.c:165
+#: ../showDesktop/src/applet-notifications.c:167
 #: ../Composite-Manager/data/messages:133 ../showDesktop/data/messages:103
 #: ../showDesktop/data/messages:117 ../switcher/data/messages:113
 msgid "Show desktop"
 msgstr ""
 
 #: ../Composite-Manager/src/applet-notifications.c:145
-#: ../showDesktop/src/applet-notifications.c:165
-#: ../showDesktop/src/applet-notifications.c:167
+#: ../showDesktop/src/applet-notifications.c:177
+#: ../showDesktop/src/applet-notifications.c:179
 #: ../switcher/src/applet-notifications.c:314
 #: ../Composite-Manager/data/messages:135 ../showDesktop/data/messages:111
 #: ../showDesktop/data/messages:125 ../switcher/data/messages:115
@@ -345,8 +323,8 @@
 msgstr ""
 
 #: ../Composite-Manager/src/applet-notifications.c:163
-#: ../showDesktop/src/applet-notifications.c:177
-#: ../showDesktop/src/applet-notifications.c:179
+#: ../showDesktop/src/applet-notifications.c:189
+#: ../showDesktop/src/applet-notifications.c:191
 #: ../Composite-Manager/data/messages:139 ../showDesktop/data/messages:109
 #: ../showDesktop/data/messages:123
 msgid "Show the Widget Layer"
@@ -372,7 +350,8 @@
 
 #: ../Dbus/src/interface-applet-signals.c:466
 #, c-format
-msgid "The applet '%s' has been succefully updated and automatically reloaded"
+msgid ""
+"The applet '%s' has been succefully updated and automatically reloaded"
 msgstr "البريمج '%s' تم تحديثه وإعادة تشغيله تلقائياً بنجاح"
 
 #: ../Dbus/src/interface-applet-signals.c:466
@@ -569,22 +548,21 @@
 
 #: ../Folders/src/applet-notifications.c:184
 #: ../Folders/src/applet-notifications.c:185
-#: ../Folders/src/applet-notifications.c:186
-#: ../Application-Menu/data/messages:293 ../Disks/data/messages:101
+#: ../Folders/src/applet-notifications.c:186 ../Disks/data/messages:101
 #: ../Disks/data/messages:137 ../Messaging-Menu/data/messages:15
 #: ../Network-Monitor/data/messages:17 ../Network-Monitor/data/messages:117
-#: ../RSSreader/data/messages:113 ../Sound-Menu/data/messages:183
-#: ../Status-Notifier/data/messages:19 ../System-Monitor/data/messages:15
-#: ../System-Monitor/data/messages:111 ../System-Monitor/data/messages:163
-#: ../Toons/data/messages:15 ../alsaMixer/data/messages:17
-#: ../alsaMixer/data/messages:113 ../alsaMixer/data/messages:143
-#: ../clock/data/messages:17 ../clock/data/messages:105
-#: ../keyboard-indicator/data/messages:15 ../mail/data/messages:15
-#: ../musicPlayer/data/messages:17 ../netspeed/data/messages:15
-#: ../netspeed/data/messages:111 ../netspeed/data/messages:159
-#: ../powermanager/data/messages:17 ../shortcuts/data/messages:119
-#: ../slider/data/messages:15 ../slider/data/messages:167
-#: ../weather/data/messages:17 ../wifi/data/messages:15
+#: ../RSSreader/data/messages:113 ../Status-Notifier/data/messages:19
+#: ../System-Monitor/data/messages:15 ../System-Monitor/data/messages:111
+#: ../System-Monitor/data/messages:163 ../Toons/data/messages:15
+#: ../alsaMixer/data/messages:17 ../alsaMixer/data/messages:113
+#: ../alsaMixer/data/messages:143 ../clock/data/messages:17
+#: ../clock/data/messages:105 ../keyboard-indicator/data/messages:15
+#: ../mail/data/messages:15 ../musicPlayer/data/messages:17
+#: ../netspeed/data/messages:15 ../netspeed/data/messages:111
+#: ../netspeed/data/messages:159 ../powermanager/data/messages:17
+#: ../shortcuts/data/messages:119 ../slider/data/messages:15
+#: ../slider/data/messages:167 ../weather/data/messages:17
+#: ../wifi/data/messages:15
 msgid "No"
 msgstr ""
 
@@ -744,15 +722,15 @@
 msgid "Shutdown"
 msgstr ""
 
-#: ../GMenu/src/applet-notifications.c:74
+#: ../GMenu/src/applet-notifications.c:81
 msgid "Quick launch"
 msgstr "تشغيل سريع"
 
-#: ../GMenu/src/applet-notifications.c:78
+#: ../GMenu/src/applet-notifications.c:105
 msgid "Configure menu"
 msgstr "قائمة الاعدادات"
 
-#: ../GMenu/src/applet-notifications.c:81
+#: ../GMenu/src/applet-notifications.c:108
 msgid "Clear recent"
 msgstr "حذف أحدث"
 
@@ -772,6 +750,23 @@
 msgid "Global Menu"
 msgstr ""
 
+#: ../Global-Menu/src/applet-init.c:33
+msgid ""
+"This applet allows you to control the current active window:\n"
+"  close, minimize, maximize, and display the application menu.To display the "
+"menu, applications have to support this feature, which is the case on Ubuntu "
+"by default.\n"
+"You can bind a shortkey to this action."
+msgstr ""
+
+#: ../Global-Menu/src/applet-init.c:108 ../Global-Menu/src/applet-init.c:210
+msgid "Show/hide the current application menu"
+msgstr ""
+
+#: ../Global-Menu/src/applet-notifications.c:52
+msgid "The application didn't send its menu to us."
+msgstr ""
+
 #: ../Impulse/src/applet-impulse.c:170
 msgid ""
 "There is something wrong with PulseAudio.\n"
@@ -847,7 +842,7 @@
 msgstr "تم فصل كابل"
 
 #: ../Network-Monitor/src/applet-draw.c:30
-#: ../powermanager/src/powermanager-draw.c:172 ../wifi/src/applet-draw.c:31
+#: ../powermanager/src/powermanager-draw.c:174 ../wifi/src/applet-draw.c:31
 #: ../Clipper/data/messages:99 ../GMenu/data/messages:119
 #: ../Network-Monitor/data/messages:221 ../alsaMixer/data/messages:121
 #: ../dnd2share/data/messages:111 ../dustbin/data/messages:101
@@ -916,8 +911,8 @@
 #: ../Network-Monitor/src/applet-draw.c:148
 #: ../musicPlayer/src/applet-draw.c:152 ../musicPlayer/src/applet-draw.c:154
 #: ../musicPlayer/src/applet-draw.c:156
-#: ../powermanager/src/powermanager-draw.c:201
-#: ../powermanager/src/powermanager-draw.c:254
+#: ../powermanager/src/powermanager-draw.c:203
+#: ../powermanager/src/powermanager-draw.c:256
 msgid "Unknown"
 msgstr "مجهول"
 
@@ -1312,31 +1307,6 @@
 msgid "Enter your search"
 msgstr "أدخال مادة البحث"
 
-#: ../Sound-Menu/src/applet-init.c:38
-#, fuzzy
-msgid "Sound Menu"
-msgstr "التحكم في الصوت"
-
-#: ../Sound-Menu/src/applet-init.c:41
-msgid ""
-"A menu to control the volume of each current audio sources.\n"
-"It requires the Sound service, which is available on Ubuntu by default."
-msgstr ""
-
-#: ../Sound-Menu/src/applet-init.c:91 ../alsaMixer/src/applet-init.c:118
-msgid "Show/hide the Sound menu"
-msgstr ""
-
-#: ../Sound-Menu/src/applet-notifications.c:35
-msgid ""
-"The Sound service did not reply.\n"
-"Please check that it is correctly installed."
-msgstr ""
-
-#: ../Sound-Menu/src/applet-sound.c:200 ../alsaMixer/src/applet-draw.c:64
-msgid "Volume"
-msgstr ""
-
 #: ../Status-Notifier/src/applet-init.c:33
 msgid ""
 "A <b>notification area</b> for your dock\n"
@@ -1516,42 +1486,39 @@
 msgstr ""
 
 #: ../alsaMixer/src/applet-backend-alsamixer.c:46
-#: ../alsaMixer/src/applet-mixer.c:51
 #, c-format
 msgid "I couldn't open card '%s'"
 msgstr ""
 
 #: ../alsaMixer/src/applet-backend-alsamixer.c:51
-#: ../alsaMixer/src/applet-mixer.c:56
 #, c-format
 msgid "Card '%s' opened but I couldn't get any info"
 msgstr ""
 
 #: ../alsaMixer/src/applet-backend-alsamixer.c:59
-#: ../alsaMixer/src/applet-mixer.c:64
 msgid "I couldn't open the mixer"
 msgstr ""
 
 #: ../alsaMixer/src/applet-backend-alsamixer.c:66
-#: ../alsaMixer/src/applet-mixer.c:71
 msgid "I couldn't attach the mixer to the card"
 msgstr ""
 
 #: ../alsaMixer/src/applet-backend-alsamixer.c:73
-#: ../alsaMixer/src/applet-mixer.c:78
 msgid "I couldn't register options"
 msgstr ""
 
 #: ../alsaMixer/src/applet-backend-alsamixer.c:80
-#: ../alsaMixer/src/applet-mixer.c:86
 msgid "I couldn't load the mixer"
 msgstr ""
 
 #: ../alsaMixer/src/applet-backend-alsamixer.c:261
-#: ../alsaMixer/src/applet-mixer.c:286
 msgid "Set up volume:"
 msgstr ""
 
+#: ../alsaMixer/src/applet-draw.c:64
+msgid "Volume"
+msgstr ""
+
 #: ../alsaMixer/src/applet-init.c:34
 msgid ""
 "This applet lets you control the sound volume from the dock.\n"
@@ -1567,6 +1534,10 @@
 msgid "Sound Control"
 msgstr "التحكم في الصوت"
 
+#: ../alsaMixer/src/applet-init.c:118
+msgid "Show/hide the Sound menu"
+msgstr ""
+
 #: ../alsaMixer/src/applet-notifications.c:80
 msgid "Adjust channels"
 msgstr ""
@@ -1697,8 +1668,8 @@
 "2 view are available : <b>numeric</b> and <b>analogic</b>.\n"
 " Analogic view is compatible with the Cairo-Clock's themes, and you can "
 "detach the applet to be a perfect clone of Cairo-Clock.\n"
-"It displays a <b>calendar</b> on left-click, which lets you <b>manage tasks</"
-"b>.\n"
+"It displays a <b>calendar</b> on left-click, which lets you <b>manage "
+"tasks</b>.\n"
 "It also supports alarms, and allows you to setup time and date.\n"
 "Left-click to show/hide the calendar, Middle-click to stop a notification,\n"
 "Double-click on a day to edit the tasks for this day."
@@ -1893,7 +1864,8 @@
 msgstr ""
 
 #: ../dnd2share/src/applet-dnd2share.c:331
-msgid "Please wait for the current upload to finish before starting a new one."
+msgid ""
+"Please wait for the current upload to finish before starting a new one."
 msgstr ""
 
 #: ../dnd2share/src/applet-dnd2share.c:591
@@ -2654,66 +2626,66 @@
 msgid "Re-check interface"
 msgstr ""
 
-#: ../powermanager/src/powermanager-draw.c:128
+#: ../powermanager/src/powermanager-draw.c:130
 msgid "Battery charged"
 msgstr ""
 
-#: ../powermanager/src/powermanager-draw.c:150
+#: ../powermanager/src/powermanager-draw.c:152
 msgid "Time before empty"
 msgstr ""
 
-#: ../powermanager/src/powermanager-draw.c:150
+#: ../powermanager/src/powermanager-draw.c:152
 msgid "Time before full"
 msgstr ""
 
-#: ../powermanager/src/powermanager-draw.c:207
+#: ../powermanager/src/powermanager-draw.c:209
 msgid "Laptop on Battery."
 msgstr ""
 
-#: ../powermanager/src/powermanager-draw.c:208
-#: ../powermanager/src/powermanager-draw.c:217
+#: ../powermanager/src/powermanager-draw.c:210
+#: ../powermanager/src/powermanager-draw.c:219
 msgid "Battery charged at:"
 msgstr ""
 
-#: ../powermanager/src/powermanager-draw.c:209
+#: ../powermanager/src/powermanager-draw.c:211
 msgid "Estimated time before empty:"
 msgstr ""
 
-#: ../powermanager/src/powermanager-draw.c:216
+#: ../powermanager/src/powermanager-draw.c:218
 msgid "Laptop on Charge."
 msgstr ""
 
-#: ../powermanager/src/powermanager-draw.c:218
+#: ../powermanager/src/powermanager-draw.c:220
 msgid "Estimated time before full:"
 msgstr ""
 
-#: ../powermanager/src/powermanager-draw.c:225
+#: ../powermanager/src/powermanager-draw.c:227
 msgid "Model"
 msgstr ""
 
-#: ../powermanager/src/powermanager-draw.c:233
+#: ../powermanager/src/powermanager-draw.c:235
 msgid "Maximum capacity"
 msgstr ""
 
-#: ../powermanager/src/powermanager-draw.c:238
+#: ../powermanager/src/powermanager-draw.c:240
 msgid "No battery found."
 msgstr ""
 
-#: ../powermanager/src/powermanager-draw.c:260
+#: ../powermanager/src/powermanager-draw.c:262
 msgid ""
 "PowerManager.\n"
 "Battery charge seems to be low"
 msgstr ""
 
-#: ../powermanager/src/powermanager-draw.c:260
+#: ../powermanager/src/powermanager-draw.c:262
 msgid "Estimated time with charge:"
 msgstr ""
 
-#: ../powermanager/src/powermanager-draw.c:260
+#: ../powermanager/src/powermanager-draw.c:262
 msgid "Please put your laptop on charge."
 msgstr ""
 
-#: ../powermanager/src/powermanager-draw.c:274
+#: ../powermanager/src/powermanager-draw.c:276
 msgid ""
 "PowerManager.\n"
 "Your battery is now charged"
@@ -2766,23 +2738,23 @@
 msgstr ""
 
 #: ../shortcuts/src/applet-bookmarks.c:131
-#: ../shortcuts/src/applet-bookmarks.c:391
-#: ../shortcuts/src/applet-drives.c:277
+#: ../shortcuts/src/applet-bookmarks.c:393
+#: ../shortcuts/src/applet-drives.c:283
 msgid "Unmounted"
 msgstr ""
 
-#: ../shortcuts/src/applet-drives.c:147 ../shortcuts/src/applet-drives.c:204
+#: ../shortcuts/src/applet-drives.c:151 ../shortcuts/src/applet-drives.c:210
 #, c-format
 msgid "%s is now mounted"
 msgstr ""
 
-#: ../shortcuts/src/applet-drives.c:147
+#: ../shortcuts/src/applet-drives.c:151
 #: ../shortcuts/src/applet-load-icons.c:137
 #, c-format
 msgid "%s has been connected"
 msgstr ""
 
-#: ../shortcuts/src/applet-drives.c:204
+#: ../shortcuts/src/applet-drives.c:210
 #, c-format
 msgid "%s is now unmounted"
 msgstr ""
@@ -2865,8 +2837,8 @@
 
 #: ../show-mouse/src/applet-init.c:31
 msgid ""
-"This plugin draws some animations around the cursor when it's inside a dock/"
-"desklet."
+"This plugin draws some animations around the cursor when it's inside a "
+"dock/desklet."
 msgstr ""
 
 #: ../showDesktop/src/applet-init.c:28
@@ -2884,7 +2856,7 @@
 "Layer, or all the desktops at once."
 msgstr ""
 
-#: ../showDesktop/src/applet-notifications.c:189
+#: ../showDesktop/src/applet-notifications.c:201
 msgid "Change screen resolution"
 msgstr ""
 
@@ -2989,13 +2961,13 @@
 msgid "The URL has been added to the stack."
 msgstr ""
 
-#: ../switcher/src/applet-draw.c:595 ../switcher/src/applet-draw.c:602
+#: ../switcher/src/applet-draw.c:597 ../switcher/src/applet-draw.c:604
 #: ../switcher/src/applet-load-icons.c:53
 #: ../switcher/src/applet-notifications.c:415
 msgid "Current"
 msgstr ""
 
-#: ../switcher/src/applet-draw.c:602 ../switcher/src/applet-draw.c:604
+#: ../switcher/src/applet-draw.c:604 ../switcher/src/applet-draw.c:606
 #: ../switcher/src/applet-load-icons.c:59
 #: ../switcher/src/applet-notifications.c:216
 #: ../switcher/src/applet-notifications.c:228
@@ -3474,29 +3446,27 @@
 msgid "Type of mesh:"
 msgstr ""
 
-#: ../Animated-icons/data/messages:73 ../Application-Menu/data/messages:39
-#: ../Application-Menu/data/messages:151 ../Application-Menu/data/messages:241
-#: ../Clipper/data/messages:45 ../Composite-Manager/data/messages:41
-#: ../Disks/data/messages:27 ../Doncky/data/messages:43
-#: ../Folders/data/messages:57 ../GMenu/data/messages:45
-#: ../Global-Menu/data/messages:39 ../Impulse/data/messages:43
-#: ../MeMenu/data/messages:39 ../Messaging-Menu/data/messages:51
-#: ../Network-Monitor/data/messages:53 ../RSSreader/data/messages:47
-#: ../Recent-Events/data/messages:45 ../Sound-Menu/data/messages:41
-#: ../Sound-Menu/data/messages:131 ../Status-Notifier/data/messages:55
-#: ../System-Monitor/data/messages:51 ../Toons/data/messages:51
-#: ../Xgamma/data/messages:47 ../alsaMixer/data/messages:53
-#: ../clock/data/messages:53 ../dnd2share/data/messages:41
-#: ../dustbin/data/messages:41 ../keyboard-indicator/data/messages:51
-#: ../logout/data/messages:45 ../mail/data/messages:51
-#: ../musicPlayer/data/messages:53 ../netspeed/data/messages:51
-#: ../powermanager/data/messages:53 ../quick-browser/data/messages:47
-#: ../shortcuts/data/messages:45 ../showDesktop/data/messages:49
-#: ../slider/data/messages:51 ../stack/data/messages:47
-#: ../switcher/data/messages:39 ../systray/data/messages:37
-#: ../template/data/messages:45 ../terminal/data/messages:45
-#: ../tomboy/data/messages:55 ../weather/data/messages:53
-#: ../weblets/data/messages:45 ../wifi/data/messages:51
+#: ../Animated-icons/data/messages:73 ../Clipper/data/messages:45
+#: ../Composite-Manager/data/messages:41 ../Disks/data/messages:27
+#: ../Doncky/data/messages:43 ../Folders/data/messages:57
+#: ../GMenu/data/messages:45 ../Global-Menu/data/messages:39
+#: ../Impulse/data/messages:43 ../MeMenu/data/messages:39
+#: ../Messaging-Menu/data/messages:51 ../Network-Monitor/data/messages:53
+#: ../RSSreader/data/messages:47 ../Recent-Events/data/messages:45
+#: ../Status-Notifier/data/messages:55 ../System-Monitor/data/messages:51
+#: ../Toons/data/messages:51 ../Xgamma/data/messages:47
+#: ../alsaMixer/data/messages:53 ../clock/data/messages:53
+#: ../dnd2share/data/messages:41 ../dustbin/data/messages:41
+#: ../keyboard-indicator/data/messages:51 ../logout/data/messages:45
+#: ../mail/data/messages:51 ../musicPlayer/data/messages:53
+#: ../netspeed/data/messages:51 ../powermanager/data/messages:53
+#: ../quick-browser/data/messages:47 ../shortcuts/data/messages:45
+#: ../showDesktop/data/messages:49 ../slider/data/messages:51
+#: ../stack/data/messages:47 ../switcher/data/messages:39
+#: ../systray/data/messages:37 ../template/data/messages:45
+#: ../terminal/data/messages:45 ../tomboy/data/messages:55
+#: ../weather/data/messages:53 ../weblets/data/messages:45
+#: ../wifi/data/messages:51
 msgid "Normal"
 msgstr ""
 
@@ -3513,7 +3483,6 @@
 msgstr ""
 
 #: ../Animated-icons/data/messages:91 ../Animated-icons/data/messages:95
-#: ../Application-Menu/data/messages:307 ../Application-Menu/data/messages:311
 #: ../Clipper/data/messages:9 ../Composite-Manager/data/messages:91
 #: ../Composite-Manager/data/messages:95 ../Doncky/data/messages:9
 #: ../Doncky/data/messages:91 ../Folders/data/messages:21
@@ -3521,8 +3490,7 @@
 #: ../Impulse/data/messages:7 ../Impulse/data/messages:125
 #: ../Impulse/data/messages:129 ../Impulse/data/messages:133
 #: ../RSSreader/data/messages:11 ../RSSreader/data/messages:129
-#: ../Recent-Events/data/messages:9 ../Sound-Menu/data/messages:197
-#: ../Sound-Menu/data/messages:201 ../System-Monitor/data/messages:187
+#: ../Recent-Events/data/messages:9 ../System-Monitor/data/messages:187
 #: ../System-Monitor/data/messages:195 ../Xgamma/data/messages:11
 #: ../alsaMixer/data/messages:131 ../alsaMixer/data/messages:135
 #: ../alsaMixer/data/messages:149 ../dnd2share/data/messages:9
@@ -3655,9 +3623,6 @@
 msgid "Blink duration:"
 msgstr ""
 
-#: ../Application-Menu/data/messages:1 ../Application-Menu/data/messages:3
-#: ../Application-Menu/data/messages:111 ../Application-Menu/data/messages:113
-#: ../Application-Menu/data/messages:201 ../Application-Menu/data/messages:203
 #: ../Cairo-Penguin/data/messages:1 ../Cairo-Penguin/data/messages:3
 #: ../Clipper/data/messages:1 ../Clipper/data/messages:3
 #: ../Composite-Manager/data/messages:1 ../Composite-Manager/data/messages:3
@@ -3671,9 +3636,7 @@
 #: ../Messaging-Menu/data/messages:3 ../Network-Monitor/data/messages:1
 #: ../Network-Monitor/data/messages:3 ../RSSreader/data/messages:1
 #: ../RSSreader/data/messages:3 ../Recent-Events/data/messages:1
-#: ../Recent-Events/data/messages:3 ../Sound-Menu/data/messages:1
-#: ../Sound-Menu/data/messages:3 ../Sound-Menu/data/messages:91
-#: ../Sound-Menu/data/messages:93 ../Status-Notifier/data/messages:1
+#: ../Recent-Events/data/messages:3 ../Status-Notifier/data/messages:1
 #: ../Status-Notifier/data/messages:3 ../System-Monitor/data/messages:1
 #: ../System-Monitor/data/messages:3 ../Toons/data/messages:1
 #: ../Toons/data/messages:3 ../Xgamma/data/messages:1
@@ -3703,1099 +3666,35 @@
 msgid "Icon"
 msgstr ""
 
-#: ../Application-Menu/data/messages:5 ../Application-Menu/data/messages:115
-#: ../Application-Menu/data/messages:205 ../Cairo-Penguin/data/messages:5
-#: ../Clipper/data/messages:5 ../Composite-Manager/data/messages:5
-#: ../Doncky/data/messages:5 ../Folders/data/messages:5
-#: ../GMenu/data/messages:5 ../Global-Menu/data/messages:5
-#: ../Impulse/data/messages:5 ../MeMenu/data/messages:5
-#: ../Messaging-Menu/data/messages:5 ../Network-Monitor/data/messages:5
-#: ../RSSreader/data/messages:5 ../Recent-Events/data/messages:5
-#: ../Sound-Menu/data/messages:5 ../Sound-Menu/data/messages:95
-#: ../Status-Notifier/data/messages:5 ../System-Monitor/data/messages:5
-#: ../Toons/data/messages:5 ../Xgamma/data/messages:5
-#: ../alsaMixer/data/messages:5 ../clock/data/messages:5
-#: ../dnd2share/data/messages:5 ../dustbin/data/messages:5
-#: ../keyboard-indicator/data/messages:5 ../logout/data/messages:5
-#: ../mail/data/messages:5 ../musicPlayer/data/messages:5
-#: ../netspeed/data/messages:5 ../powermanager/data/messages:5
-#: ../quick-browser/data/messages:5 ../shortcuts/data/messages:5
-#: ../showDesktop/data/messages:5 ../slider/data/messages:5
-#: ../stack/data/messages:5 ../switcher/data/messages:5
-#: ../systray/data/messages:5 ../template/data/messages:5
-#: ../terminal/data/messages:5 ../tomboy/data/messages:5
-#: ../weather/data/messages:5 ../weblets/data/messages:5
-#: ../wifi/data/messages:5
+#: ../Cairo-Penguin/data/messages:5 ../Clipper/data/messages:5
+#: ../Composite-Manager/data/messages:5 ../Doncky/data/messages:5
+#: ../Folders/data/messages:5 ../GMenu/data/messages:5
+#: ../Global-Menu/data/messages:5 ../Impulse/data/messages:5
+#: ../MeMenu/data/messages:5 ../Messaging-Menu/data/messages:5
+#: ../Network-Monitor/data/messages:5 ../RSSreader/data/messages:5
+#: ../Recent-Events/data/messages:5 ../Status-Notifier/data/messages:5
+#: ../System-Monitor/data/messages:5 ../Toons/data/messages:5
+#: ../Xgamma/data/messages:5 ../alsaMixer/data/messages:5
+#: ../clock/data/messages:5 ../dnd2share/data/messages:5
+#: ../dustbin/data/messages:5 ../keyboard-indicator/data/messages:5
+#: ../logout/data/messages:5 ../mail/data/messages:5
+#: ../musicPlayer/data/messages:5 ../netspeed/data/messages:5
+#: ../powermanager/data/messages:5 ../quick-browser/data/messages:5
+#: ../shortcuts/data/messages:5 ../showDesktop/data/messages:5
+#: ../slider/data/messages:5 ../stack/data/messages:5
+#: ../switcher/data/messages:5 ../systray/data/messages:5
+#: ../template/data/messages:5 ../terminal/data/messages:5
+#: ../tomboy/data/messages:5 ../weather/data/messages:5
+#: ../weblets/data/messages:5 ../wifi/data/messages:5
 msgid "Name of the dock it belongs to:"
 msgstr ""
 
-#: ../Application-Menu/data/messages:7 ../Application-Menu/data/messages:119
-#: ../Application-Menu/data/messages:209 ../Cairo-Penguin/data/messages:9
-#: ../Clipper/data/messages:13 ../Composite-Manager/data/messages:9
-#: ../Disks/data/messages:9 ../Doncky/data/messages:13
-#: ../Folders/data/messages:25 ../GMenu/data/messages:13
-#: ../Global-Menu/data/messages:7 ../Impulse/data/messages:11
-#: ../MeMenu/data/messages:7 ../Messaging-Menu/data/messages:9
-#: ../Network-Monitor/data/messages:11 ../RSSreader/data/messages:15
-#: ../Recent-Events/data/messages:13 ../Sound-Menu/data/messages:9
-#: ../Sound-Menu/data/messages:99 ../Status-Notifier/data/messages:13
-#: ../System-Monitor/data/messages:9 ../Toons/data/messages:9
-#: ../Xgamma/data/messages:15 ../alsaMixer/data/messages:11
-#: ../clock/data/messages:11 ../dnd2share/data/messages:13
-#: ../dustbin/data/messages:9 ../keyboard-indicator/data/messages:9
-#: ../logout/data/messages:13 ../mail/data/messages:9
-#: ../musicPlayer/data/messages:11 ../netspeed/data/messages:9
-#: ../powermanager/data/messages:11 ../quick-browser/data/messages:15
-#: ../shortcuts/data/messages:13 ../showDesktop/data/messages:17
-#: ../slider/data/messages:9 ../stack/data/messages:15
-#: ../switcher/data/messages:13 ../systray/data/messages:13
-#: ../template/data/messages:13 ../terminal/data/messages:13
-#: ../tomboy/data/messages:23 ../weather/data/messages:11
-#: ../weblets/data/messages:13 ../wifi/data/messages:9
-msgid "Set to 0 to use the default applet size"
-msgstr ""
-
-#: ../Application-Menu/data/messages:9 ../Application-Menu/data/messages:121
-#: ../Application-Menu/data/messages:211 ../Cairo-Penguin/data/messages:11
-#: ../Clipper/data/messages:15 ../Composite-Manager/data/messages:11
-#: ../Disks/data/messages:11 ../Doncky/data/messages:15
-#: ../Folders/data/messages:27 ../GMenu/data/messages:15
-#: ../Global-Menu/data/messages:9 ../Impulse/data/messages:13
-#: ../MeMenu/data/messages:9 ../Messaging-Menu/data/messages:11
-#: ../Network-Monitor/data/messages:13 ../RSSreader/data/messages:17
-#: ../Recent-Events/data/messages:15 ../Sound-Menu/data/messages:11
-#: ../Sound-Menu/data/messages:101 ../Status-Notifier/data/messages:15
-#: ../System-Monitor/data/messages:11 ../Toons/data/messages:11
-#: ../Xgamma/data/messages:17 ../alsaMixer/data/messages:13
-#: ../clock/data/messages:13 ../dnd2share/data/messages:15
-#: ../dustbin/data/messages:11 ../keyboard-indicator/data/messages:11
-#: ../logout/data/messages:15 ../mail/data/messages:11
-#: ../musicPlayer/data/messages:13 ../netspeed/data/messages:11
-#: ../powermanager/data/messages:13 ../quick-browser/data/messages:17
-#: ../shortcuts/data/messages:15 ../showDesktop/data/messages:19
-#: ../slider/data/messages:11 ../stack/data/messages:17
-#: ../switcher/data/messages:15 ../systray/data/messages:15
-#: ../template/data/messages:15 ../terminal/data/messages:15
-#: ../tomboy/data/messages:25 ../weather/data/messages:13
-#: ../weblets/data/messages:15 ../wifi/data/messages:11
-msgid "Desired icon size for this applet"
-msgstr ""
-
-#: ../Application-Menu/data/messages:11 ../Application-Menu/data/messages:123
-#: ../Application-Menu/data/messages:213 ../Cairo-Penguin/data/messages:13
-#: ../Clipper/data/messages:17 ../Composite-Manager/data/messages:13
-#: ../Disks/data/messages:13 ../Folders/data/messages:29
-#: ../GMenu/data/messages:17 ../Global-Menu/data/messages:11
-#: ../Impulse/data/messages:15 ../MeMenu/data/messages:11
-#: ../Messaging-Menu/data/messages:23 ../Network-Monitor/data/messages:25
-#: ../RSSreader/data/messages:19 ../Recent-Events/data/messages:17
-#: ../Scooby-Do/data/messages:115 ../Sound-Menu/data/messages:13
-#: ../Sound-Menu/data/messages:103 ../Status-Notifier/data/messages:27
-#: ../System-Monitor/data/messages:23 ../Toons/data/messages:23
-#: ../Xgamma/data/messages:19 ../alsaMixer/data/messages:25
-#: ../clock/data/messages:25 ../dnd2share/data/messages:17
-#: ../dustbin/data/messages:13 ../keyboard-indicator/data/messages:23
-#: ../logout/data/messages:17 ../mail/data/messages:23
-#: ../musicPlayer/data/messages:25 ../netspeed/data/messages:23
-#: ../powermanager/data/messages:25 ../quick-browser/data/messages:19
-#: ../shortcuts/data/messages:17 ../showDesktop/data/messages:21
-#: ../slider/data/messages:23 ../stack/data/messages:19
-#: ../switcher/data/messages:17 ../systray/data/messages:17
-#: ../template/data/messages:17 ../terminal/data/messages:17
-#: ../tomboy/data/messages:27 ../weather/data/messages:25
-#: ../weblets/data/messages:17 ../wifi/data/messages:23
-msgid "Applet's Handbook"
-msgstr ""
-
-#: ../Application-Menu/data/messages:13 ../Application-Menu/data/messages:125
-#: ../Application-Menu/data/messages:215 ../Clipper/data/messages:19
-#: ../Composite-Manager/data/messages:15 ../Disks/data/messages:15
-#: ../Doncky/data/messages:17 ../Folders/data/messages:31
-#: ../GMenu/data/messages:19 ../Global-Menu/data/messages:13
-#: ../Impulse/data/messages:17 ../MeMenu/data/messages:13
-#: ../Messaging-Menu/data/messages:25 ../Network-Monitor/data/messages:27
-#: ../RSSreader/data/messages:21 ../Recent-Events/data/messages:19
-#: ../Sound-Menu/data/messages:15 ../Sound-Menu/data/messages:105
-#: ../Status-Notifier/data/messages:29 ../System-Monitor/data/messages:25
-#: ../Toons/data/messages:25 ../Xgamma/data/messages:21
-#: ../alsaMixer/data/messages:27 ../clock/data/messages:27
-#: ../dnd2share/data/messages:19 ../dustbin/data/messages:15
-#: ../keyboard-indicator/data/messages:25 ../logout/data/messages:19
-#: ../mail/data/messages:25 ../musicPlayer/data/messages:27
-#: ../netspeed/data/messages:25 ../powermanager/data/messages:27
-#: ../quick-browser/data/messages:21 ../shortcuts/data/messages:19
-#: ../show-mouse/data/messages:13 ../showDesktop/data/messages:23
-#: ../slider/data/messages:25 ../stack/data/messages:21
-#: ../switcher/data/messages:19 ../systray/data/messages:19
-#: ../template/data/messages:19 ../terminal/data/messages:19
-#: ../tomboy/data/messages:29 ../weather/data/messages:27
-#: ../weblets/data/messages:19 ../wifi/data/messages:25
-msgid "Desklet"
-msgstr ""
-
-#: ../Application-Menu/data/messages:15 ../Application-Menu/data/messages:127
-#: ../Application-Menu/data/messages:217 ../Clipper/data/messages:21
-#: ../Composite-Manager/data/messages:17 ../Disks/data/messages:39
-#: ../Doncky/data/messages:19 ../Folders/data/messages:33
-#: ../GMenu/data/messages:21 ../Global-Menu/data/messages:15
-#: ../Impulse/data/messages:19 ../MeMenu/data/messages:15
-#: ../Messaging-Menu/data/messages:27 ../Network-Monitor/data/messages:29
-#: ../RSSreader/data/messages:23 ../Recent-Events/data/messages:21
-#: ../Sound-Menu/data/messages:17 ../Sound-Menu/data/messages:107
-#: ../Status-Notifier/data/messages:31 ../System-Monitor/data/messages:27
-#: ../Toons/data/messages:27 ../Xgamma/data/messages:23
-#: ../alsaMixer/data/messages:29 ../clock/data/messages:29
-#: ../dnd2share/data/messages:21 ../dustbin/data/messages:17
-#: ../keyboard-indicator/data/messages:27 ../logout/data/messages:21
-#: ../mail/data/messages:27 ../musicPlayer/data/messages:29
-#: ../netspeed/data/messages:27 ../powermanager/data/messages:29
-#: ../quick-browser/data/messages:23 ../shortcuts/data/messages:21
-#: ../showDesktop/data/messages:25 ../slider/data/messages:27
-#: ../stack/data/messages:23 ../switcher/data/messages:21
-#: ../systray/data/messages:21 ../template/data/messages:21
-#: ../terminal/data/messages:21 ../tomboy/data/messages:31
-#: ../weather/data/messages:29 ../weblets/data/messages:21
-#: ../wifi/data/messages:27
-msgid "Position"
-msgstr ""
-
-#: ../Application-Menu/data/messages:17 ../Application-Menu/data/messages:129
-#: ../Application-Menu/data/messages:219 ../Clipper/data/messages:23
-#: ../Composite-Manager/data/messages:19 ../Disks/data/messages:41
-#: ../Doncky/data/messages:21 ../Folders/data/messages:35
-#: ../GMenu/data/messages:23 ../Global-Menu/data/messages:17
-#: ../Impulse/data/messages:21 ../MeMenu/data/messages:17
-#: ../Messaging-Menu/data/messages:29 ../Network-Monitor/data/messages:31
-#: ../RSSreader/data/messages:25 ../Recent-Events/data/messages:23
-#: ../Sound-Menu/data/messages:19 ../Sound-Menu/data/messages:109
-#: ../Status-Notifier/data/messages:33 ../System-Monitor/data/messages:29
-#: ../Toons/data/messages:29 ../Xgamma/data/messages:25
-#: ../alsaMixer/data/messages:31 ../clock/data/messages:31
-#: ../dnd2share/data/messages:23 ../dustbin/data/messages:19
-#: ../keyboard-indicator/data/messages:29 ../logout/data/messages:23
-#: ../mail/data/messages:29 ../musicPlayer/data/messages:31
-#: ../netspeed/data/messages:29 ../powermanager/data/messages:31
-#: ../quick-browser/data/messages:25 ../shortcuts/data/messages:23
-#: ../showDesktop/data/messages:27 ../slider/data/messages:29
-#: ../stack/data/messages:25 ../switcher/data/messages:23
-#: ../systray/data/messages:23 ../template/data/messages:23
-#: ../terminal/data/messages:23 ../tomboy/data/messages:33
-#: ../weather/data/messages:31 ../weblets/data/messages:23
-#: ../wifi/data/messages:29
-msgid ""
-"If locked, the desklet cannot be moved by simply dragging it with the left "
-"mouse button. It can still be moved with ALT + left-click."
-msgstr ""
-
-#: ../Application-Menu/data/messages:19 ../Application-Menu/data/messages:131
-#: ../Application-Menu/data/messages:221 ../Clipper/data/messages:25
-#: ../Composite-Manager/data/messages:21 ../Disks/data/messages:43
-#: ../Doncky/data/messages:23 ../Folders/data/messages:37
-#: ../GMenu/data/messages:25 ../Global-Menu/data/messages:19
-#: ../Impulse/data/messages:23 ../MeMenu/data/messages:19
-#: ../Messaging-Menu/data/messages:31 ../Network-Monitor/data/messages:33
-#: ../RSSreader/data/messages:27 ../Recent-Events/data/messages:25
-#: ../Sound-Menu/data/messages:21 ../Sound-Menu/data/messages:111
-#: ../Status-Notifier/data/messages:35 ../System-Monitor/data/messages:31
-#: ../Toons/data/messages:31 ../Xgamma/data/messages:27
-#: ../alsaMixer/data/messages:33 ../clock/data/messages:33
-#: ../dnd2share/data/messages:25 ../dustbin/data/messages:21
-#: ../keyboard-indicator/data/messages:31 ../logout/data/messages:25
-#: ../mail/data/messages:31 ../musicPlayer/data/messages:33
-#: ../netspeed/data/messages:31 ../powermanager/data/messages:33
-#: ../quick-browser/data/messages:27 ../shortcuts/data/messages:25
-#: ../showDesktop/data/messages:29 ../slider/data/messages:31
-#: ../stack/data/messages:27 ../switcher/data/messages:25
-#: ../systray/data/messages:25 ../template/data/messages:25
-#: ../terminal/data/messages:25 ../tomboy/data/messages:35
-#: ../weather/data/messages:33 ../weblets/data/messages:25
-#: ../wifi/data/messages:31
-msgid "Lock position?"
-msgstr ""
-
-#: ../Application-Menu/data/messages:21 ../Application-Menu/data/messages:133
-#: ../Application-Menu/data/messages:223 ../Clipper/data/messages:27
-#: ../Composite-Manager/data/messages:23 ../Disks/data/messages:21
-#: ../Doncky/data/messages:25 ../Folders/data/messages:39
-#: ../GMenu/data/messages:27 ../Global-Menu/data/messages:21
-#: ../Impulse/data/messages:25 ../MeMenu/data/messages:21
-#: ../Messaging-Menu/data/messages:33 ../Network-Monitor/data/messages:35
-#: ../RSSreader/data/messages:29 ../Recent-Events/data/messages:27
-#: ../Sound-Menu/data/messages:23 ../Sound-Menu/data/messages:113
-#: ../Status-Notifier/data/messages:37 ../System-Monitor/data/messages:33
-#: ../Toons/data/messages:33 ../Xgamma/data/messages:29
-#: ../alsaMixer/data/messages:35 ../clock/data/messages:35
-#: ../dnd2share/data/messages:27 ../dustbin/data/messages:23
-#: ../keyboard-indicator/data/messages:33 ../logout/data/messages:27
-#: ../mail/data/messages:33 ../musicPlayer/data/messages:35
-#: ../netspeed/data/messages:33 ../powermanager/data/messages:35
-#: ../quick-browser/data/messages:29 ../shortcuts/data/messages:27
-#: ../showDesktop/data/messages:31 ../slider/data/messages:33
-#: ../stack/data/messages:29 ../switcher/data/messages:27
-#: ../template/data/messages:27 ../terminal/data/messages:27
-#: ../tomboy/data/messages:37 ../weather/data/messages:35
-#: ../weblets/data/messages:27 ../wifi/data/messages:33
-msgid ""
-"Depending on your WindowManager, you may be able to resize this with ALT + "
-"middle-click or ALT + left-click."
-msgstr ""
-
-#: ../Application-Menu/data/messages:23 ../Application-Menu/data/messages:135
-#: ../Application-Menu/data/messages:225 ../Clipper/data/messages:29
-#: ../Composite-Manager/data/messages:25 ../Disks/data/messages:23
-#: ../Doncky/data/messages:27 ../Folders/data/messages:41
-#: ../GMenu/data/messages:29 ../Global-Menu/data/messages:23
-#: ../Impulse/data/messages:27 ../MeMenu/data/messages:23
-#: ../Messaging-Menu/data/messages:35 ../Network-Monitor/data/messages:37
-#: ../RSSreader/data/messages:31 ../Recent-Events/data/messages:29
-#: ../Sound-Menu/data/messages:25 ../Sound-Menu/data/messages:115
-#: ../Status-Notifier/data/messages:39 ../System-Monitor/data/messages:35
-#: ../Toons/data/messages:35 ../Xgamma/data/messages:31
-#: ../alsaMixer/data/messages:37 ../clock/data/messages:37
-#: ../dnd2share/data/messages:29 ../dustbin/data/messages:25
-#: ../keyboard-indicator/data/messages:35 ../logout/data/messages:29
-#: ../mail/data/messages:35 ../musicPlayer/data/messages:37
-#: ../netspeed/data/messages:35 ../powermanager/data/messages:37
-#: ../quick-browser/data/messages:31 ../shortcuts/data/messages:29
-#: ../showDesktop/data/messages:33 ../slider/data/messages:35
-#: ../stack/data/messages:31 ../switcher/data/messages:29
-#: ../template/data/messages:29 ../terminal/data/messages:29
-#: ../tomboy/data/messages:39 ../weather/data/messages:37
-#: ../weblets/data/messages:29 ../wifi/data/messages:35
-msgid "Desklet dimensions (width x height):"
-msgstr ""
-
-#: ../Application-Menu/data/messages:25 ../Composite-Manager/data/messages:27
-#: ../Global-Menu/data/messages:25 ../Impulse/data/messages:29
-#: ../Recent-Events/data/messages:31 ../Status-Notifier/data/messages:41
-#: ../alsaMixer/data/messages:39 ../clock/data/messages:39
-#: ../dustbin/data/messages:27 ../netspeed/data/messages:37
-#: ../systray/data/messages:27 ../template/data/messages:31
-#: ../tomboy/data/messages:41
-msgid ""
-"Depending on your WindowManager, you may be able to move this with ALT + "
-"left-click.. Negative values are counted from the right/bottom of the screen"
-msgstr ""
-
-#: ../Application-Menu/data/messages:27 ../Application-Menu/data/messages:139
-#: ../Application-Menu/data/messages:229 ../Clipper/data/messages:33
-#: ../Composite-Manager/data/messages:29 ../Disks/data/messages:47
-#: ../Doncky/data/messages:31 ../Folders/data/messages:45
-#: ../GMenu/data/messages:33 ../Global-Menu/data/messages:27
-#: ../Impulse/data/messages:31 ../MeMenu/data/messages:27
-#: ../Messaging-Menu/data/messages:39 ../Network-Monitor/data/messages:41
-#: ../RSSreader/data/messages:35 ../Recent-Events/data/messages:33
-#: ../Sound-Menu/data/messages:29 ../Sound-Menu/data/messages:119
-#: ../Status-Notifier/data/messages:43 ../System-Monitor/data/messages:39
-#: ../Toons/data/messages:39 ../Xgamma/data/messages:35
-#: ../alsaMixer/data/messages:41 ../clock/data/messages:41
-#: ../dnd2share/data/messages:33 ../dustbin/data/messages:29
-#: ../keyboard-indicator/data/messages:39 ../logout/data/messages:33
-#: ../mail/data/messages:39 ../musicPlayer/data/messages:41
-#: ../netspeed/data/messages:39 ../powermanager/data/messages:41
-#: ../quick-browser/data/messages:35 ../shortcuts/data/messages:33
-#: ../showDesktop/data/messages:37 ../slider/data/messages:39
-#: ../stack/data/messages:35 ../switcher/data/messages:31
-#: ../systray/data/messages:29 ../template/data/messages:33
-#: ../terminal/data/messages:33 ../tomboy/data/messages:43
-#: ../weather/data/messages:41 ../weblets/data/messages:33
-#: ../wifi/data/messages:39
-msgid "Desklet position (x, y):"
-msgstr ""
-
-#: ../Application-Menu/data/messages:29 ../Application-Menu/data/messages:141
-#: ../Application-Menu/data/messages:231 ../Clipper/data/messages:35
-#: ../Composite-Manager/data/messages:31 ../Disks/data/messages:49
-#: ../Doncky/data/messages:33 ../Folders/data/messages:47
-#: ../GMenu/data/messages:35 ../Global-Menu/data/messages:29
-#: ../Impulse/data/messages:33 ../MeMenu/data/messages:29
-#: ../Messaging-Menu/data/messages:41 ../Network-Monitor/data/messages:43
-#: ../RSSreader/data/messages:37 ../Recent-Events/data/messages:35
-#: ../Sound-Menu/data/messages:31 ../Sound-Menu/data/messages:121
-#: ../Status-Notifier/data/messages:45 ../System-Monitor/data/messages:41
-#: ../Toons/data/messages:41 ../Xgamma/data/messages:37
-#: ../alsaMixer/data/messages:43 ../clock/data/messages:43
-#: ../dustbin/data/messages:31 ../keyboard-indicator/data/messages:41
-#: ../logout/data/messages:35 ../mail/data/messages:41
-#: ../musicPlayer/data/messages:43 ../netspeed/data/messages:41
-#: ../powermanager/data/messages:43 ../quick-browser/data/messages:37
-#: ../shortcuts/data/messages:35 ../showDesktop/data/messages:39
-#: ../slider/data/messages:41 ../stack/data/messages:37
-#: ../template/data/messages:35 ../terminal/data/messages:35
-#: ../tomboy/data/messages:45 ../weather/data/messages:43
-#: ../weblets/data/messages:35 ../wifi/data/messages:41
-msgid ""
-"You can quickly rotate the desklet with the mouse, by dragging the little "
-"buttons on its left and top sides."
-msgstr ""
-
-#: ../Application-Menu/data/messages:31 ../Application-Menu/data/messages:143
-#: ../Application-Menu/data/messages:233 ../Clipper/data/messages:37
-#: ../Composite-Manager/data/messages:33 ../Disks/data/messages:51
-#: ../Doncky/data/messages:35 ../Folders/data/messages:49
-#: ../GMenu/data/messages:37 ../Global-Menu/data/messages:31
-#: ../Impulse/data/messages:35 ../MeMenu/data/messages:31
-#: ../Messaging-Menu/data/messages:43 ../Network-Monitor/data/messages:45
-#: ../RSSreader/data/messages:39 ../Recent-Events/data/messages:37
-#: ../Sound-Menu/data/messages:33 ../Sound-Menu/data/messages:123
-#: ../Status-Notifier/data/messages:47 ../System-Monitor/data/messages:43
-#: ../Toons/data/messages:43 ../Xgamma/data/messages:39
-#: ../alsaMixer/data/messages:45 ../clock/data/messages:45
-#: ../dustbin/data/messages:33 ../keyboard-indicator/data/messages:43
-#: ../logout/data/messages:37 ../mail/data/messages:43
-#: ../musicPlayer/data/messages:45 ../netspeed/data/messages:43
-#: ../powermanager/data/messages:45 ../quick-browser/data/messages:39
-#: ../shortcuts/data/messages:37 ../showDesktop/data/messages:41
-#: ../slider/data/messages:43 ../stack/data/messages:39
-#: ../template/data/messages:37 ../terminal/data/messages:37
-#: ../tomboy/data/messages:47 ../weather/data/messages:45
-#: ../weblets/data/messages:37 ../wifi/data/messages:43
-msgid "Rotation:"
-msgstr ""
-
-#: ../Application-Menu/data/messages:33 ../Application-Menu/data/messages:145
-#: ../Application-Menu/data/messages:235 ../Clipper/data/messages:39
-#: ../Composite-Manager/data/messages:35 ../Doncky/data/messages:37
-#: ../Folders/data/messages:51 ../GMenu/data/messages:39
-#: ../Global-Menu/data/messages:33 ../Impulse/data/messages:37
-#: ../MeMenu/data/messages:33 ../Messaging-Menu/data/messages:45
-#: ../Network-Monitor/data/messages:47 ../RSSreader/data/messages:41
-#: ../Recent-Events/data/messages:39 ../Sound-Menu/data/messages:35
-#: ../Sound-Menu/data/messages:125 ../Status-Notifier/data/messages:49
-#: ../System-Monitor/data/messages:45 ../Toons/data/messages:45
-#: ../Xgamma/data/messages:41 ../alsaMixer/data/messages:47
-#: ../clock/data/messages:47 ../dnd2share/data/messages:35
-#: ../dustbin/data/messages:35 ../keyboard-indicator/data/messages:45
-#: ../logout/data/messages:39 ../mail/data/messages:45
-#: ../musicPlayer/data/messages:47 ../netspeed/data/messages:45
-#: ../powermanager/data/messages:47 ../quick-browser/data/messages:41
-#: ../shortcuts/data/messages:39 ../showDesktop/data/messages:43
-#: ../slider/data/messages:45 ../stack/data/messages:41
-#: ../switcher/data/messages:33 ../systray/data/messages:31
-#: ../template/data/messages:39 ../terminal/data/messages:39
-#: ../tomboy/data/messages:49 ../weather/data/messages:47
-#: ../weblets/data/messages:39 ../wifi/data/messages:45
-msgid "Visibility"
-msgstr ""
-
-#: ../Application-Menu/data/messages:35 ../Application-Menu/data/messages:147
-#: ../Application-Menu/data/messages:237 ../Clipper/data/messages:41
-#: ../Composite-Manager/data/messages:37 ../Disks/data/messages:19
-#: ../Doncky/data/messages:39 ../Folders/data/messages:53
-#: ../GMenu/data/messages:41 ../Global-Menu/data/messages:35
-#: ../Impulse/data/messages:39 ../MeMenu/data/messages:35
-#: ../Messaging-Menu/data/messages:47 ../Network-Monitor/data/messages:49
-#: ../RSSreader/data/messages:43 ../Recent-Events/data/messages:41
-#: ../Scooby-Do/data/messages:25 ../Sound-Menu/data/messages:37
-#: ../Sound-Menu/data/messages:127 ../Status-Notifier/data/messages:51
-#: ../System-Monitor/data/messages:47 ../Toons/data/messages:47
-#: ../Xgamma/data/messages:43 ../alsaMixer/data/messages:49
-#: ../clock/data/messages:49 ../dnd2share/data/messages:37
-#: ../dustbin/data/messages:37 ../keyboard-indicator/data/messages:47
-#: ../logout/data/messages:41 ../mail/data/messages:47
-#: ../musicPlayer/data/messages:49 ../netspeed/data/messages:47
-#: ../powermanager/data/messages:49 ../quick-browser/data/messages:43
-#: ../shortcuts/data/messages:41 ../showDesktop/data/messages:45
-#: ../slider/data/messages:47 ../stack/data/messages:43
-#: ../switcher/data/messages:35 ../systray/data/messages:33
-#: ../template/data/messages:41 ../terminal/data/messages:41
-#: ../tomboy/data/messages:51 ../weather/data/messages:49
-#: ../weblets/data/messages:41 ../wifi/data/messages:47
-msgid "Is detached from the dock"
-msgstr ""
-
-#: ../Application-Menu/data/messages:37 ../Application-Menu/data/messages:149
-#: ../Application-Menu/data/messages:239 ../Clipper/data/messages:43
-#: ../Composite-Manager/data/messages:39 ../Disks/data/messages:25
-#: ../Doncky/data/messages:41 ../Folders/data/messages:55
-#: ../GMenu/data/messages:43 ../Global-Menu/data/messages:37
-#: ../Impulse/data/messages:41 ../MeMenu/data/messages:37
-#: ../Messaging-Menu/data/messages:49 ../Network-Monitor/data/messages:51
-#: ../RSSreader/data/messages:45 ../Recent-Events/data/messages:43
-#: ../Sound-Menu/data/messages:39 ../Sound-Menu/data/messages:129
-#: ../Status-Notifier/data/messages:53 ../System-Monitor/data/messages:49
-#: ../Toons/data/messages:49 ../Xgamma/data/messages:45
-#: ../alsaMixer/data/messages:51 ../clock/data/messages:51
-#: ../dnd2share/data/messages:39 ../dustbin/data/messages:39
-#: ../keyboard-indicator/data/messages:49 ../logout/data/messages:43
-#: ../mail/data/messages:49 ../musicPlayer/data/messages:51
-#: ../netspeed/data/messages:49 ../powermanager/data/messages:51
-#: ../quick-browser/data/messages:45 ../shortcuts/data/messages:43
-#: ../showDesktop/data/messages:47 ../slider/data/messages:49
-#: ../stack/data/messages:45 ../switcher/data/messages:37
-#: ../systray/data/messages:35 ../template/data/messages:43
-#: ../terminal/data/messages:43 ../tomboy/data/messages:53
-#: ../weather/data/messages:51 ../weblets/data/messages:43
-#: ../wifi/data/messages:49
-msgid "Visibility:"
-msgstr ""
-
-#: ../Application-Menu/data/messages:41 ../Application-Menu/data/messages:153
-#: ../Application-Menu/data/messages:243 ../Clipper/data/messages:47
-#: ../Composite-Manager/data/messages:43 ../Disks/data/messages:29
-#: ../Doncky/data/messages:45 ../Folders/data/messages:59
-#: ../GMenu/data/messages:47 ../Global-Menu/data/messages:41
-#: ../Impulse/data/messages:45 ../MeMenu/data/messages:41
-#: ../Messaging-Menu/data/messages:53 ../Network-Monitor/data/messages:55
-#: ../RSSreader/data/messages:49 ../Recent-Events/data/messages:47
-#: ../Sound-Menu/data/messages:43 ../Sound-Menu/data/messages:133
-#: ../Status-Notifier/data/messages:57 ../System-Monitor/data/messages:53
-#: ../Toons/data/messages:53 ../Xgamma/data/messages:49
-#: ../alsaMixer/data/messages:55 ../clock/data/messages:55
-#: ../dnd2share/data/messages:43 ../dustbin/data/messages:43
-#: ../keyboard-indicator/data/messages:53 ../logout/data/messages:47
-#: ../mail/data/messages:53 ../musicPlayer/data/messages:55
-#: ../netspeed/data/messages:53 ../powermanager/data/messages:55
-#: ../quick-browser/data/messages:49 ../shortcuts/data/messages:47
-#: ../showDesktop/data/messages:51 ../slider/data/messages:53
-#: ../stack/data/messages:49 ../switcher/data/messages:41
-#: ../systray/data/messages:39 ../template/data/messages:47
-#: ../terminal/data/messages:47 ../tomboy/data/messages:57
-#: ../weather/data/messages:55 ../weblets/data/messages:47
-#: ../wifi/data/messages:53
-msgid "Keep above"
-msgstr ""
-
-#: ../Application-Menu/data/messages:43 ../Application-Menu/data/messages:155
-#: ../Application-Menu/data/messages:245 ../Clipper/data/messages:49
-#: ../Composite-Manager/data/messages:45 ../Disks/data/messages:31
-#: ../Doncky/data/messages:47 ../Folders/data/messages:61
-#: ../GMenu/data/messages:49 ../Global-Menu/data/messages:43
-#: ../Impulse/data/messages:47 ../MeMenu/data/messages:43
-#: ../Messaging-Menu/data/messages:55 ../Network-Monitor/data/messages:57
-#: ../RSSreader/data/messages:51 ../Recent-Events/data/messages:49
-#: ../Sound-Menu/data/messages:45 ../Sound-Menu/data/messages:135
-#: ../Status-Notifier/data/messages:59 ../System-Monitor/data/messages:55
-#: ../Toons/data/messages:55 ../Xgamma/data/messages:51
-#: ../alsaMixer/data/messages:57 ../clock/data/messages:57
-#: ../dnd2share/data/messages:45 ../dustbin/data/messages:45
-#: ../keyboard-indicator/data/messages:55 ../logout/data/messages:49
-#: ../mail/data/messages:55 ../musicPlayer/data/messages:57
-#: ../netspeed/data/messages:55 ../powermanager/data/messages:57
-#: ../quick-browser/data/messages:51 ../shortcuts/data/messages:49
-#: ../showDesktop/data/messages:53 ../slider/data/messages:55
-#: ../stack/data/messages:51 ../switcher/data/messages:43
-#: ../systray/data/messages:41 ../template/data/messages:49
-#: ../terminal/data/messages:49 ../tomboy/data/messages:59
-#: ../weather/data/messages:57 ../weblets/data/messages:49
-#: ../wifi/data/messages:55
-msgid "Keep below"
-msgstr ""
-
-#: ../Application-Menu/data/messages:45 ../Application-Menu/data/messages:157
-#: ../Application-Menu/data/messages:247 ../Clipper/data/messages:51
-#: ../Composite-Manager/data/messages:47 ../Disks/data/messages:33
-#: ../Doncky/data/messages:49 ../Folders/data/messages:63
-#: ../GMenu/data/messages:51 ../Global-Menu/data/messages:45
-#: ../Impulse/data/messages:49 ../MeMenu/data/messages:45
-#: ../Messaging-Menu/data/messages:57 ../Network-Monitor/data/messages:59
-#: ../RSSreader/data/messages:53 ../Recent-Events/data/messages:51
-#: ../Sound-Menu/data/messages:47 ../Sound-Menu/data/messages:137
-#: ../Status-Notifier/data/messages:61 ../System-Monitor/data/messages:57
-#: ../Toons/data/messages:57 ../Xgamma/data/messages:53
-#: ../alsaMixer/data/messages:59 ../clock/data/messages:59
-#: ../dnd2share/data/messages:47 ../dustbin/data/messages:47
-#: ../keyboard-indicator/data/messages:57 ../logout/data/messages:51
-#: ../mail/data/messages:57 ../musicPlayer/data/messages:59
-#: ../netspeed/data/messages:57 ../powermanager/data/messages:59
-#: ../quick-browser/data/messages:53 ../shortcuts/data/messages:51
-#: ../showDesktop/data/messages:55 ../slider/data/messages:57
-#: ../stack/data/messages:53 ../switcher/data/messages:45
-#: ../systray/data/messages:43 ../template/data/messages:51
-#: ../terminal/data/messages:51 ../tomboy/data/messages:61
-#: ../weather/data/messages:59 ../weblets/data/messages:51
-#: ../wifi/data/messages:57
-msgid "Keep on widget layer"
-msgstr ""
-
-#: ../Application-Menu/data/messages:47 ../Application-Menu/data/messages:159
-#: ../Application-Menu/data/messages:249 ../Clipper/data/messages:53
-#: ../Composite-Manager/data/messages:49 ../Disks/data/messages:35
-#: ../Doncky/data/messages:51 ../Folders/data/messages:65
-#: ../GMenu/data/messages:53 ../Global-Menu/data/messages:47
-#: ../Impulse/data/messages:51 ../MeMenu/data/messages:47
-#: ../Messaging-Menu/data/messages:59 ../Network-Monitor/data/messages:61
-#: ../RSSreader/data/messages:55 ../Recent-Events/data/messages:53
-#: ../Sound-Menu/data/messages:49 ../Sound-Menu/data/messages:139
-#: ../Status-Notifier/data/messages:63 ../System-Monitor/data/messages:59
-#: ../Toons/data/messages:59 ../Xgamma/data/messages:55
-#: ../alsaMixer/data/messages:61 ../clock/data/messages:61
-#: ../dnd2share/data/messages:49 ../dustbin/data/messages:49
-#: ../keyboard-indicator/data/messages:59 ../logout/data/messages:53
-#: ../mail/data/messages:59 ../musicPlayer/data/messages:61
-#: ../netspeed/data/messages:59 ../powermanager/data/messages:61
-#: ../quick-browser/data/messages:55 ../shortcuts/data/messages:53
-#: ../showDesktop/data/messages:57 ../slider/data/messages:59
-#: ../stack/data/messages:55 ../switcher/data/messages:47
-#: ../systray/data/messages:45 ../template/data/messages:53
-#: ../terminal/data/messages:53 ../tomboy/data/messages:63
-#: ../weather/data/messages:61 ../weblets/data/messages:53
-#: ../wifi/data/messages:59
-msgid "Reserve space"
-msgstr ""
-
-#: ../Application-Menu/data/messages:49 ../Application-Menu/data/messages:161
-#: ../Application-Menu/data/messages:251 ../Clipper/data/messages:55
-#: ../Composite-Manager/data/messages:51 ../Disks/data/messages:37
-#: ../Doncky/data/messages:53 ../Folders/data/messages:67
-#: ../GMenu/data/messages:55 ../Global-Menu/data/messages:49
-#: ../Impulse/data/messages:53 ../MeMenu/data/messages:49
-#: ../Messaging-Menu/data/messages:61 ../Network-Monitor/data/messages:63
-#: ../RSSreader/data/messages:57 ../Recent-Events/data/messages:55
-#: ../Sound-Menu/data/messages:51 ../Sound-Menu/data/messages:141
-#: ../Status-Notifier/data/messages:65 ../System-Monitor/data/messages:61
-#: ../Toons/data/messages:61 ../Xgamma/data/messages:57
-#: ../alsaMixer/data/messages:63 ../clock/data/messages:63
-#: ../dnd2share/data/messages:51 ../dustbin/data/messages:51
-#: ../keyboard-indicator/data/messages:61 ../logout/data/messages:55
-#: ../mail/data/messages:61 ../musicPlayer/data/messages:63
-#: ../netspeed/data/messages:61 ../powermanager/data/messages:63
-#: ../quick-browser/data/messages:57 ../shortcuts/data/messages:55
-#: ../showDesktop/data/messages:59 ../slider/data/messages:61
-#: ../stack/data/messages:57 ../switcher/data/messages:49
-#: ../systray/data/messages:47 ../template/data/messages:55
-#: ../terminal/data/messages:55 ../tomboy/data/messages:65
-#: ../weather/data/messages:63 ../weblets/data/messages:55
-#: ../wifi/data/messages:61
-msgid "Should be visible on all desktops?"
-msgstr ""
-
-#: ../Application-Menu/data/messages:51 ../Application-Menu/data/messages:163
-#: ../Application-Menu/data/messages:253 ../Clipper/data/messages:57
-#: ../Composite-Manager/data/messages:53 ../Disks/data/messages:53
-#: ../Doncky/data/messages:55 ../Folders/data/messages:69
-#: ../GMenu/data/messages:57 ../Global-Menu/data/messages:51
-#: ../Impulse/data/messages:55 ../MeMenu/data/messages:51
-#: ../Messaging-Menu/data/messages:63 ../Network-Monitor/data/messages:65
-#: ../RSSreader/data/messages:59 ../Recent-Events/data/messages:57
-#: ../Sound-Menu/data/messages:53 ../Sound-Menu/data/messages:143
-#: ../Status-Notifier/data/messages:67 ../System-Monitor/data/messages:63
-#: ../Toons/data/messages:63 ../Xgamma/data/messages:59
-#: ../alsaMixer/data/messages:65 ../clock/data/messages:65
-#: ../dnd2share/data/messages:53 ../dustbin/data/messages:53
-#: ../keyboard-indicator/data/messages:63 ../logout/data/messages:57
-#: ../mail/data/messages:63 ../musicPlayer/data/messages:65
-#: ../netspeed/data/messages:63 ../powermanager/data/messages:65
-#: ../quick-browser/data/messages:59 ../shortcuts/data/messages:57
-#: ../showDesktop/data/messages:61 ../slider/data/messages:63
-#: ../stack/data/messages:59 ../switcher/data/messages:51
-#: ../systray/data/messages:49 ../template/data/messages:57
-#: ../terminal/data/messages:57 ../tomboy/data/messages:67
-#: ../weather/data/messages:65 ../weblets/data/messages:57
-#: ../wifi/data/messages:63
-msgid "Decorations"
-msgstr ""
-
-#: ../Application-Menu/data/messages:53 ../Application-Menu/data/messages:165
-#: ../Application-Menu/data/messages:255 ../Clipper/data/messages:59
-#: ../Composite-Manager/data/messages:55 ../Disks/data/messages:55
-#: ../Doncky/data/messages:57 ../Folders/data/messages:71
-#: ../GMenu/data/messages:59 ../Global-Menu/data/messages:53
-#: ../Impulse/data/messages:57 ../MeMenu/data/messages:53
-#: ../Messaging-Menu/data/messages:65 ../Network-Monitor/data/messages:67
-#: ../RSSreader/data/messages:61 ../Recent-Events/data/messages:59
-#: ../Sound-Menu/data/messages:55 ../Sound-Menu/data/messages:145
-#: ../Status-Notifier/data/messages:69 ../System-Monitor/data/messages:65
-#: ../Toons/data/messages:65 ../Xgamma/data/messages:61
-#: ../alsaMixer/data/messages:67 ../clock/data/messages:67
-#: ../dnd2share/data/messages:55 ../dustbin/data/messages:55
-#: ../keyboard-indicator/data/messages:65 ../logout/data/messages:59
-#: ../mail/data/messages:65 ../musicPlayer/data/messages:67
-#: ../netspeed/data/messages:65 ../powermanager/data/messages:67
-#: ../quick-browser/data/messages:61 ../shortcuts/data/messages:59
-#: ../showDesktop/data/messages:63 ../slider/data/messages:65
-#: ../stack/data/messages:61 ../switcher/data/messages:53
-#: ../systray/data/messages:51 ../template/data/messages:59
-#: ../terminal/data/messages:59 ../tomboy/data/messages:69
-#: ../weather/data/messages:67 ../weblets/data/messages:59
-#: ../wifi/data/messages:65
-msgid "Choose 'Custom decorations' to define your own decorations below."
-msgstr ""
-
-#: ../Application-Menu/data/messages:55 ../Application-Menu/data/messages:167
-#: ../Application-Menu/data/messages:257 ../Clipper/data/messages:61
-#: ../Composite-Manager/data/messages:57 ../Disks/data/messages:57
-#: ../Doncky/data/messages:59 ../Folders/data/messages:73
-#: ../GMenu/data/messages:61 ../Global-Menu/data/messages:55
-#: ../Impulse/data/messages:59 ../MeMenu/data/messages:55
-#: ../Messaging-Menu/data/messages:67 ../Network-Monitor/data/messages:69
-#: ../RSSreader/data/messages:63 ../Recent-Events/data/messages:61
-#: ../Sound-Menu/data/messages:57 ../Sound-Menu/data/messages:147
-#: ../Status-Notifier/data/messages:71 ../System-Monitor/data/messages:67
-#: ../Toons/data/messages:67 ../Xgamma/data/messages:63
-#: ../alsaMixer/data/messages:69 ../clock/data/messages:69
-#: ../dnd2share/data/messages:57 ../dustbin/data/messages:57
-#: ../keyboard-indicator/data/messages:67 ../logout/data/messages:61
-#: ../mail/data/messages:67 ../musicPlayer/data/messages:69
-#: ../netspeed/data/messages:67 ../powermanager/data/messages:69
-#: ../quick-browser/data/messages:63 ../shortcuts/data/messages:61
-#: ../showDesktop/data/messages:65 ../slider/data/messages:67
-#: ../stack/data/messages:63 ../switcher/data/messages:55
-#: ../systray/data/messages:53 ../template/data/messages:61
-#: ../terminal/data/messages:61 ../tomboy/data/messages:71
-#: ../weather/data/messages:69 ../weblets/data/messages:61
-#: ../wifi/data/messages:67
-msgid "Choose a decoration theme for this desklet:"
-msgstr ""
-
-#: ../Application-Menu/data/messages:57 ../Application-Menu/data/messages:169
-#: ../Application-Menu/data/messages:259 ../Clipper/data/messages:63
-#: ../Composite-Manager/data/messages:59 ../Disks/data/messages:59
-#: ../Doncky/data/messages:61 ../Folders/data/messages:75
-#: ../GMenu/data/messages:63 ../Global-Menu/data/messages:57
-#: ../Impulse/data/messages:61 ../MeMenu/data/messages:57
-#: ../Messaging-Menu/data/messages:69 ../Network-Monitor/data/messages:71
-#: ../RSSreader/data/messages:65 ../Recent-Events/data/messages:63
-#: ../Sound-Menu/data/messages:59 ../Sound-Menu/data/messages:149
-#: ../Status-Notifier/data/messages:73 ../System-Monitor/data/messages:69
-#: ../Toons/data/messages:69 ../Xgamma/data/messages:65
-#: ../alsaMixer/data/messages:71 ../clock/data/messages:71
-#: ../dnd2share/data/messages:59 ../dustbin/data/messages:59
-#: ../keyboard-indicator/data/messages:69 ../logout/data/messages:63
-#: ../mail/data/messages:69 ../musicPlayer/data/messages:71
-#: ../netspeed/data/messages:69 ../powermanager/data/messages:71
-#: ../quick-browser/data/messages:65 ../shortcuts/data/messages:63
-#: ../showDesktop/data/messages:67 ../slider/data/messages:69
-#: ../stack/data/messages:65 ../switcher/data/messages:57
-#: ../systray/data/messages:55 ../template/data/messages:63
-#: ../terminal/data/messages:63 ../tomboy/data/messages:73
-#: ../weather/data/messages:71 ../weblets/data/messages:63
-#: ../wifi/data/messages:69
-msgid ""
-"Image to be displayed below drawings, e.g. a frame. Leave empty for no image."
-msgstr ""
-
-#: ../Application-Menu/data/messages:59 ../Application-Menu/data/messages:171
-#: ../Application-Menu/data/messages:261 ../Clipper/data/messages:65
-#: ../Composite-Manager/data/messages:61 ../Disks/data/messages:61
-#: ../Doncky/data/messages:63 ../Folders/data/messages:77
-#: ../GMenu/data/messages:65 ../Global-Menu/data/messages:59
-#: ../Impulse/data/messages:63 ../MeMenu/data/messages:59
-#: ../Messaging-Menu/data/messages:71 ../Network-Monitor/data/messages:73
-#: ../RSSreader/data/messages:67 ../Recent-Events/data/messages:65
-#: ../Sound-Menu/data/messages:61 ../Sound-Menu/data/messages:151
-#: ../Status-Notifier/data/messages:75 ../System-Monitor/data/messages:71
-#: ../Toons/data/messages:71 ../Xgamma/data/messages:67
-#: ../alsaMixer/data/messages:73 ../clock/data/messages:73
-#: ../clock/data/messages:167 ../dnd2share/data/messages:61
-#: ../dustbin/data/messages:61 ../keyboard-indicator/data/messages:71
-#: ../keyboard-indicator/data/messages:125 ../logout/data/messages:65
-#: ../mail/data/messages:71 ../musicPlayer/data/messages:73
-#: ../netspeed/data/messages:71 ../powermanager/data/messages:73
-#: ../quick-browser/data/messages:67 ../shortcuts/data/messages:65
-#: ../showDesktop/data/messages:69 ../slider/data/messages:71
-#: ../stack/data/messages:67 ../switcher/data/messages:59
-#: ../systray/data/messages:57 ../template/data/messages:65
-#: ../terminal/data/messages:65 ../tomboy/data/messages:75
-#: ../weather/data/messages:73 ../weblets/data/messages:65
-#: ../wifi/data/messages:71
-msgid "Background image:"
-msgstr ""
-
-#: ../Application-Menu/data/messages:61 ../Application-Menu/data/messages:173
-#: ../Application-Menu/data/messages:263 ../Clipper/data/messages:67
-#: ../Composite-Manager/data/messages:63 ../Disks/data/messages:63
-#: ../Doncky/data/messages:65 ../Folders/data/messages:79
-#: ../GMenu/data/messages:67 ../Global-Menu/data/messages:61
-#: ../Impulse/data/messages:65 ../MeMenu/data/messages:61
-#: ../Messaging-Menu/data/messages:73 ../Network-Monitor/data/messages:75
-#: ../RSSreader/data/messages:69 ../Recent-Events/data/messages:67
-#: ../Sound-Menu/data/messages:63 ../Sound-Menu/data/messages:153
-#: ../Status-Notifier/data/messages:77 ../System-Monitor/data/messages:73
-#: ../Toons/data/messages:73 ../Xgamma/data/messages:69
-#: ../alsaMixer/data/messages:75 ../clock/data/messages:75
-#: ../dnd2share/data/messages:63 ../dustbin/data/messages:63
-#: ../keyboard-indicator/data/messages:73 ../logout/data/messages:67
-#: ../mail/data/messages:73 ../musicPlayer/data/messages:75
-#: ../netspeed/data/messages:73 ../powermanager/data/messages:75
-#: ../quick-browser/data/messages:69 ../shortcuts/data/messages:67
-#: ../showDesktop/data/messages:71 ../slider/data/messages:73
-#: ../stack/data/messages:69 ../switcher/data/messages:61
-#: ../systray/data/messages:59 ../template/data/messages:67
-#: ../terminal/data/messages:67 ../tomboy/data/messages:77
-#: ../weather/data/messages:75 ../weblets/data/messages:67
-#: ../wifi/data/messages:73
-msgid "Background transparency:"
-msgstr ""
-
-#: ../Application-Menu/data/messages:63 ../Application-Menu/data/messages:175
-#: ../Application-Menu/data/messages:265 ../Clipper/data/messages:69
-#: ../Composite-Manager/data/messages:65 ../Disks/data/messages:71
-#: ../Doncky/data/messages:67 ../Folders/data/messages:81
-#: ../GMenu/data/messages:69 ../Global-Menu/data/messages:63
-#: ../Impulse/data/messages:67 ../MeMenu/data/messages:63
-#: ../Messaging-Menu/data/messages:75 ../Network-Monitor/data/messages:77
-#: ../RSSreader/data/messages:71 ../Recent-Events/data/messages:69
-#: ../Sound-Menu/data/messages:65 ../Sound-Menu/data/messages:155
-#: ../Status-Notifier/data/messages:79 ../System-Monitor/data/messages:75
-#: ../Toons/data/messages:75 ../Xgamma/data/messages:71
-#: ../alsaMixer/data/messages:77 ../clock/data/messages:77
-#: ../dnd2share/data/messages:65 ../dustbin/data/messages:65
-#: ../keyboard-indicator/data/messages:75 ../logout/data/messages:69
-#: ../mail/data/messages:75 ../musicPlayer/data/messages:77
-#: ../netspeed/data/messages:75 ../powermanager/data/messages:77
-#: ../quick-browser/data/messages:71 ../shortcuts/data/messages:69
-#: ../showDesktop/data/messages:73 ../slider/data/messages:75
-#: ../stack/data/messages:71 ../switcher/data/messages:63
-#: ../systray/data/messages:61 ../template/data/messages:69
-#: ../terminal/data/messages:69 ../tomboy/data/messages:79
-#: ../weather/data/messages:77 ../weblets/data/messages:69
-#: ../wifi/data/messages:75
-msgid "in pixels. Use this to adjust the left position of drawings."
-msgstr ""
-
-#: ../Application-Menu/data/messages:65 ../Application-Menu/data/messages:177
-#: ../Application-Menu/data/messages:267 ../Clipper/data/messages:71
-#: ../Composite-Manager/data/messages:67 ../Disks/data/messages:73
-#: ../Doncky/data/messages:69 ../Folders/data/messages:83
-#: ../GMenu/data/messages:71 ../Global-Menu/data/messages:65
-#: ../Impulse/data/messages:69 ../MeMenu/data/messages:65
-#: ../Messaging-Menu/data/messages:77 ../Network-Monitor/data/messages:79
-#: ../RSSreader/data/messages:73 ../Recent-Events/data/messages:71
-#: ../Sound-Menu/data/messages:67 ../Sound-Menu/data/messages:157
-#: ../Status-Notifier/data/messages:81 ../System-Monitor/data/messages:77
-#: ../Toons/data/messages:77 ../Xgamma/data/messages:73
-#: ../alsaMixer/data/messages:79 ../clock/data/messages:79
-#: ../dnd2share/data/messages:67 ../dustbin/data/messages:67
-#: ../keyboard-indicator/data/messages:77 ../logout/data/messages:71
-#: ../mail/data/messages:77 ../musicPlayer/data/messages:79
-#: ../netspeed/data/messages:77 ../powermanager/data/messages:79
-#: ../quick-browser/data/messages:73 ../shortcuts/data/messages:71
-#: ../showDesktop/data/messages:75 ../slider/data/messages:77
-#: ../stack/data/messages:73 ../switcher/data/messages:65
-#: ../systray/data/messages:63 ../template/data/messages:71
-#: ../terminal/data/messages:71 ../tomboy/data/messages:81
-#: ../weather/data/messages:79 ../weblets/data/messages:71
-#: ../wifi/data/messages:77
-msgid "Left offset:"
-msgstr ""
-
-#: ../Application-Menu/data/messages:67 ../Application-Menu/data/messages:179
-#: ../Application-Menu/data/messages:269 ../Clipper/data/messages:73
-#: ../Composite-Manager/data/messages:69 ../Disks/data/messages:75
-#: ../Doncky/data/messages:71 ../Folders/data/messages:85
-#: ../GMenu/data/messages:73 ../Global-Menu/data/messages:67
-#: ../Impulse/data/messages:71 ../MeMenu/data/messages:67
-#: ../Messaging-Menu/data/messages:79 ../Network-Monitor/data/messages:81
-#: ../RSSreader/data/messages:75 ../Recent-Events/data/messages:73
-#: ../Sound-Menu/data/messages:69 ../Sound-Menu/data/messages:159
-#: ../Status-Notifier/data/messages:83 ../System-Monitor/data/messages:79
-#: ../Toons/data/messages:79 ../Xgamma/data/messages:75
-#: ../alsaMixer/data/messages:81 ../clock/data/messages:81
-#: ../dnd2share/data/messages:69 ../dustbin/data/messages:69
-#: ../keyboard-indicator/data/messages:79 ../logout/data/messages:73
-#: ../mail/data/messages:79 ../musicPlayer/data/messages:81
-#: ../netspeed/data/messages:79 ../powermanager/data/messages:81
-#: ../quick-browser/data/messages:75 ../shortcuts/data/messages:73
-#: ../showDesktop/data/messages:77 ../slider/data/messages:79
-#: ../stack/data/messages:75 ../switcher/data/messages:67
-#: ../systray/data/messages:65 ../template/data/messages:73
-#: ../terminal/data/messages:73 ../tomboy/data/messages:83
-#: ../weather/data/messages:81 ../weblets/data/messages:73
-#: ../wifi/data/messages:79
-msgid "in pixels. Use this to adjust the top position of drawings."
-msgstr ""
-
-#: ../Application-Menu/data/messages:69 ../Application-Menu/data/messages:181
-#: ../Application-Menu/data/messages:271 ../Clipper/data/messages:75
-#: ../Composite-Manager/data/messages:71 ../Disks/data/messages:77
-#: ../Doncky/data/messages:73 ../Folders/data/messages:87
-#: ../GMenu/data/messages:75 ../Global-Menu/data/messages:69
-#: ../Impulse/data/messages:73 ../MeMenu/data/messages:69
-#: ../Messaging-Menu/data/messages:81 ../Network-Monitor/data/messages:83
-#: ../RSSreader/data/messages:77 ../Recent-Events/data/messages:75
-#: ../Sound-Menu/data/messages:71 ../Sound-Menu/data/messages:161
-#: ../Status-Notifier/data/messages:85 ../System-Monitor/data/messages:81
-#: ../Toons/data/messages:81 ../Xgamma/data/messages:77
-#: ../alsaMixer/data/messages:83 ../clock/data/messages:83
-#: ../dnd2share/data/messages:71 ../dustbin/data/messages:71
-#: ../keyboard-indicator/data/messages:81 ../logout/data/messages:75
-#: ../mail/data/messages:81 ../musicPlayer/data/messages:83
-#: ../netspeed/data/messages:81 ../powermanager/data/messages:83
-#: ../quick-browser/data/messages:77 ../shortcuts/data/messages:75
-#: ../showDesktop/data/messages:79 ../slider/data/messages:81
-#: ../stack/data/messages:77 ../switcher/data/messages:69
-#: ../systray/data/messages:67 ../template/data/messages:75
-#: ../terminal/data/messages:75 ../tomboy/data/messages:85
-#: ../weather/data/messages:83 ../weblets/data/messages:75
-#: ../wifi/data/messages:81
-msgid "Top offset:"
-msgstr ""
-
-#: ../Application-Menu/data/messages:71 ../Application-Menu/data/messages:183
-#: ../Application-Menu/data/messages:273 ../Clipper/data/messages:77
-#: ../Composite-Manager/data/messages:73 ../Disks/data/messages:79
-#: ../Doncky/data/messages:75 ../Folders/data/messages:89
-#: ../GMenu/data/messages:77 ../Global-Menu/data/messages:71
-#: ../Impulse/data/messages:75 ../MeMenu/data/messages:71
-#: ../Messaging-Menu/data/messages:83 ../Network-Monitor/data/messages:85
-#: ../RSSreader/data/messages:79 ../Recent-Events/data/messages:77
-#: ../Sound-Menu/data/messages:73 ../Sound-Menu/data/messages:163
-#: ../Status-Notifier/data/messages:87 ../System-Monitor/data/messages:83
-#: ../Toons/data/messages:83 ../Xgamma/data/messages:79
-#: ../alsaMixer/data/messages:85 ../clock/data/messages:85
-#: ../dnd2share/data/messages:73 ../dustbin/data/messages:73
-#: ../keyboard-indicator/data/messages:83 ../logout/data/messages:77
-#: ../mail/data/messages:83 ../musicPlayer/data/messages:85
-#: ../netspeed/data/messages:83 ../powermanager/data/messages:85
-#: ../quick-browser/data/messages:79 ../shortcuts/data/messages:77
-#: ../showDesktop/data/messages:81 ../slider/data/messages:83
-#: ../stack/data/messages:79 ../switcher/data/messages:71
-#: ../systray/data/messages:69 ../template/data/messages:77
-#: ../terminal/data/messages:77 ../tomboy/data/messages:87
-#: ../weather/data/messages:85 ../weblets/data/messages:77
-#: ../wifi/data/messages:83
-msgid "in pixels. Use this to adjust the right position of drawings."
-msgstr ""
-
-#: ../Application-Menu/data/messages:73 ../Application-Menu/data/messages:185
-#: ../Application-Menu/data/messages:275 ../Clipper/data/messages:79
-#: ../Composite-Manager/data/messages:75 ../Disks/data/messages:81
-#: ../Doncky/data/messages:77 ../Folders/data/messages:91
-#: ../GMenu/data/messages:79 ../Global-Menu/data/messages:73
-#: ../Impulse/data/messages:77 ../MeMenu/data/messages:73
-#: ../Messaging-Menu/data/messages:85 ../Network-Monitor/data/messages:87
-#: ../RSSreader/data/messages:81 ../Recent-Events/data/messages:79
-#: ../Sound-Menu/data/messages:75 ../Sound-Menu/data/messages:165
-#: ../Status-Notifier/data/messages:89 ../System-Monitor/data/messages:85
-#: ../Toons/data/messages:85 ../Xgamma/data/messages:81
-#: ../alsaMixer/data/messages:87 ../clock/data/messages:87
-#: ../dnd2share/data/messages:75 ../dustbin/data/messages:75
-#: ../keyboard-indicator/data/messages:85 ../logout/data/messages:79
-#: ../mail/data/messages:85 ../musicPlayer/data/messages:87
-#: ../netspeed/data/messages:85 ../powermanager/data/messages:87
-#: ../quick-browser/data/messages:81 ../shortcuts/data/messages:79
-#: ../showDesktop/data/messages:83 ../slider/data/messages:85
-#: ../stack/data/messages:81 ../switcher/data/messages:73
-#: ../systray/data/messages:71 ../template/data/messages:79
-#: ../terminal/data/messages:79 ../tomboy/data/messages:89
-#: ../weather/data/messages:87 ../weblets/data/messages:79
-#: ../wifi/data/messages:85
-msgid "Right offset:"
-msgstr ""
-
-#: ../Application-Menu/data/messages:75 ../Application-Menu/data/messages:187
-#: ../Application-Menu/data/messages:277 ../Clipper/data/messages:81
-#: ../Composite-Manager/data/messages:77 ../Disks/data/messages:83
-#: ../Doncky/data/messages:79 ../Folders/data/messages:93
-#: ../GMenu/data/messages:81 ../Global-Menu/data/messages:75
-#: ../Impulse/data/messages:79 ../MeMenu/data/messages:75
-#: ../Messaging-Menu/data/messages:87 ../Network-Monitor/data/messages:89
-#: ../RSSreader/data/messages:83 ../Recent-Events/data/messages:81
-#: ../Sound-Menu/data/messages:77 ../Sound-Menu/data/messages:167
-#: ../Status-Notifier/data/messages:91 ../System-Monitor/data/messages:87
-#: ../Toons/data/messages:87 ../Xgamma/data/messages:83
-#: ../alsaMixer/data/messages:89 ../clock/data/messages:89
-#: ../dnd2share/data/messages:77 ../dustbin/data/messages:77
-#: ../keyboard-indicator/data/messages:87 ../logout/data/messages:81
-#: ../mail/data/messages:87 ../musicPlayer/data/messages:89
-#: ../netspeed/data/messages:87 ../powermanager/data/messages:89
-#: ../quick-browser/data/messages:83 ../shortcuts/data/messages:81
-#: ../showDesktop/data/messages:85 ../slider/data/messages:87
-#: ../stack/data/messages:83 ../switcher/data/messages:75
-#: ../systray/data/messages:73 ../template/data/messages:81
-#: ../terminal/data/messages:81 ../tomboy/data/messages:91
-#: ../weather/data/messages:89 ../weblets/data/messages:81
-#: ../wifi/data/messages:87
-msgid "in pixels. Use this to adjust the bottom position of drawings."
-msgstr ""
-
-#: ../Application-Menu/data/messages:77 ../Application-Menu/data/messages:189
-#: ../Application-Menu/data/messages:279 ../Clipper/data/messages:83
-#: ../Composite-Manager/data/messages:79 ../Disks/data/messages:85
-#: ../Doncky/data/messages:81 ../Folders/data/messages:95
-#: ../GMenu/data/messages:83 ../Global-Menu/data/messages:77
-#: ../Impulse/data/messages:81 ../MeMenu/data/messages:77
-#: ../Messaging-Menu/data/messages:89 ../Network-Monitor/data/messages:91
-#: ../RSSreader/data/messages:85 ../Recent-Events/data/messages:83
-#: ../Sound-Menu/data/messages:79 ../Sound-Menu/data/messages:169
-#: ../Status-Notifier/data/messages:93 ../System-Monitor/data/messages:89
-#: ../Toons/data/messages:89 ../Xgamma/data/messages:85
-#: ../alsaMixer/data/messages:91 ../clock/data/messages:91
-#: ../dnd2share/data/messages:79 ../dustbin/data/messages:79
-#: ../keyboard-indicator/data/messages:89 ../logout/data/messages:83
-#: ../mail/data/messages:89 ../musicPlayer/data/messages:91
-#: ../netspeed/data/messages:89 ../powermanager/data/messages:91
-#: ../quick-browser/data/messages:85 ../shortcuts/data/messages:83
-#: ../showDesktop/data/messages:87 ../slider/data/messages:89
-#: ../stack/data/messages:85 ../switcher/data/messages:77
-#: ../systray/data/messages:75 ../template/data/messages:83
-#: ../terminal/data/messages:83 ../tomboy/data/messages:93
-#: ../weather/data/messages:91 ../weblets/data/messages:83
-#: ../wifi/data/messages:89
-msgid "Bottom offset:"
-msgstr ""
-
-#: ../Application-Menu/data/messages:79 ../Application-Menu/data/messages:191
-#: ../Application-Menu/data/messages:281 ../Clipper/data/messages:85
-#: ../Composite-Manager/data/messages:81 ../Disks/data/messages:65
-#: ../Doncky/data/messages:83 ../Folders/data/messages:97
-#: ../GMenu/data/messages:85 ../Global-Menu/data/messages:79
-#: ../Impulse/data/messages:83 ../MeMenu/data/messages:79
-#: ../Messaging-Menu/data/messages:91 ../Network-Monitor/data/messages:93
-#: ../RSSreader/data/messages:87 ../Recent-Events/data/messages:85
-#: ../Sound-Menu/data/messages:81 ../Sound-Menu/data/messages:171
-#: ../Status-Notifier/data/messages:95 ../System-Monitor/data/messages:91
-#: ../Toons/data/messages:91 ../Xgamma/data/messages:87
-#: ../alsaMixer/data/messages:93 ../clock/data/messages:93
-#: ../dnd2share/data/messages:81 ../dustbin/data/messages:81
-#: ../keyboard-indicator/data/messages:91 ../logout/data/messages:85
-#: ../mail/data/messages:91 ../musicPlayer/data/messages:93
-#: ../netspeed/data/messages:91 ../powermanager/data/messages:93
-#: ../quick-browser/data/messages:87 ../shortcuts/data/messages:85
-#: ../showDesktop/data/messages:89 ../slider/data/messages:91
-#: ../stack/data/messages:87 ../switcher/data/messages:79
-#: ../systray/data/messages:77 ../template/data/messages:85
-#: ../terminal/data/messages:85 ../tomboy/data/messages:95
-#: ../weather/data/messages:93 ../weblets/data/messages:85
-#: ../wifi/data/messages:91
-msgid ""
-"Image to be displayed above the drawings, e.g. a reflection. Leave empty for "
-"no image."
-msgstr ""
-
-#: ../Application-Menu/data/messages:81 ../Application-Menu/data/messages:193
-#: ../Application-Menu/data/messages:283 ../Clipper/data/messages:87
-#: ../Composite-Manager/data/messages:83 ../Disks/data/messages:67
-#: ../Doncky/data/messages:85 ../Folders/data/messages:99
-#: ../GMenu/data/messages:87 ../Global-Menu/data/messages:81
-#: ../Impulse/data/messages:85 ../MeMenu/data/messages:81
-#: ../Messaging-Menu/data/messages:93 ../Network-Monitor/data/messages:95
-#: ../RSSreader/data/messages:89 ../Recent-Events/data/messages:87
-#: ../Sound-Menu/data/messages:83 ../Sound-Menu/data/messages:173
-#: ../Status-Notifier/data/messages:97 ../System-Monitor/data/messages:93
-#: ../Toons/data/messages:93 ../Xgamma/data/messages:89
-#: ../alsaMixer/data/messages:95 ../clock/data/messages:95
-#: ../dnd2share/data/messages:83 ../dustbin/data/messages:83
-#: ../keyboard-indicator/data/messages:93 ../logout/data/messages:87
-#: ../mail/data/messages:93 ../musicPlayer/data/messages:95
-#: ../netspeed/data/messages:93 ../powermanager/data/messages:95
-#: ../quick-browser/data/messages:89 ../shortcuts/data/messages:87
-#: ../showDesktop/data/messages:91 ../slider/data/messages:93
-#: ../stack/data/messages:89 ../switcher/data/messages:81
-#: ../systray/data/messages:79 ../template/data/messages:87
-#: ../terminal/data/messages:87 ../tomboy/data/messages:97
-#: ../weather/data/messages:95 ../weblets/data/messages:87
-#: ../wifi/data/messages:93
-msgid "Foreground image:"
-msgstr ""
-
-#: ../Application-Menu/data/messages:83 ../Application-Menu/data/messages:195
-#: ../Application-Menu/data/messages:285 ../Clipper/data/messages:89
-#: ../Composite-Manager/data/messages:85 ../Disks/data/messages:69
-#: ../Doncky/data/messages:87 ../Folders/data/messages:101
-#: ../GMenu/data/messages:89 ../Global-Menu/data/messages:83
-#: ../Impulse/data/messages:87 ../MeMenu/data/messages:83
-#: ../Messaging-Menu/data/messages:95 ../Network-Monitor/data/messages:97
-#: ../RSSreader/data/messages:91 ../Recent-Events/data/messages:89
-#: ../Sound-Menu/data/messages:85 ../Sound-Menu/data/messages:175
-#: ../Status-Notifier/data/messages:99 ../System-Monitor/data/messages:95
-#: ../Toons/data/messages:95 ../Xgamma/data/messages:91
-#: ../alsaMixer/data/messages:97 ../clock/data/messages:97
-#: ../dnd2share/data/messages:85 ../dustbin/data/messages:85
-#: ../keyboard-indicator/data/messages:95 ../logout/data/messages:89
-#: ../mail/data/messages:95 ../musicPlayer/data/messages:97
-#: ../netspeed/data/messages:95 ../powermanager/data/messages:97
-#: ../quick-browser/data/messages:91 ../shortcuts/data/messages:89
-#: ../showDesktop/data/messages:93 ../slider/data/messages:95
-#: ../stack/data/messages:91 ../switcher/data/messages:83
-#: ../systray/data/messages:81 ../template/data/messages:89
-#: ../terminal/data/messages:89 ../tomboy/data/messages:99
-#: ../weather/data/messages:97 ../weblets/data/messages:89
-#: ../wifi/data/messages:95
-msgid "Foreground tansparency:"
-msgstr ""
-
-#: ../Application-Menu/data/messages:85 ../Application-Menu/data/messages:197
-#: ../Application-Menu/data/messages:287 ../Cairo-Penguin/data/messages:15
-#: ../Clipper/data/messages:91 ../Composite-Manager/data/messages:87
-#: ../Dbus/data/messages:1 ../Disks/data/messages:87
-#: ../Doncky/data/messages:89 ../Folders/data/messages:103
-#: ../GMenu/data/messages:91 ../Global-Menu/data/messages:85
-#: ../Impulse/data/messages:89 ../MeMenu/data/messages:85
-#: ../Messaging-Menu/data/messages:97 ../Network-Monitor/data/messages:99
-#: ../RSSreader/data/messages:93 ../Recent-Events/data/messages:91
-#: ../Remote-Control/data/messages:1 ../Scooby-Do/data/messages:1
-#: ../Sound-Menu/data/messages:87 ../Sound-Menu/data/messages:177
-#: ../Status-Notifier/data/messages:101 ../System-Monitor/data/messages:97
-#: ../Toons/data/messages:97 ../Xgamma/data/messages:93
-#: ../alsaMixer/data/messages:99 ../clock/data/messages:99
-#: ../dnd2share/data/messages:87 ../dustbin/data/messages:87
-#: ../keyboard-indicator/data/messages:97 ../logout/data/messages:91
-#: ../mail/data/messages:97 ../motion-blur/data/messages:1
-#: ../musicPlayer/data/messages:99 ../netspeed/data/messages:97
-#: ../powermanager/data/messages:99 ../quick-browser/data/messages:93
-#: ../shortcuts/data/messages:91 ../show-mouse/data/messages:1
-#: ../showDesktop/data/messages:95 ../slider/data/messages:97
-#: ../stack/data/messages:93 ../switcher/data/messages:85
-#: ../switcher/data/messages:87 ../systray/data/messages:83
-#: ../template/data/messages:91 ../terminal/data/messages:91
-#: ../tomboy/data/messages:101 ../weather/data/messages:99
-#: ../weather/data/messages:101 ../weblets/data/messages:91
-#: ../wifi/data/messages:97
-msgid "Configuration"
-msgstr ""
-
-#: ../Application-Menu/data/messages:87 ../Global-Menu/data/messages:87
-msgid ""
-"The applet can steal the top border of maximized windows, in which case it "
-"will display the window control buttons.\n"
-" The applet can steal the menu from the windows, in which case it will "
-"display a button to pop up the menu of the current window."
-msgstr ""
-
-#: ../Application-Menu/data/messages:89
-msgid "Behavior"
-msgstr ""
-
-#: ../Application-Menu/data/messages:91 ../Global-Menu/data/messages:91
-msgid "Steal window menu"
-msgstr ""
-
-#: ../Application-Menu/data/messages:93
-msgid "Steal window border"
-msgstr ""
-
-#: ../Application-Menu/data/messages:95 ../Global-Menu/data/messages:95
-msgid "Steal window menu and border"
-msgstr ""
-
-#: ../Application-Menu/data/messages:97 ../Global-Menu/data/messages:97
-msgid "Shortkey to pop up the menu"
-msgstr ""
-
-#: ../Application-Menu/data/messages:99 ../Global-Menu/data/messages:99
-msgid "Pop up the menu at mouse position"
-msgstr ""
-
-#: ../Application-Menu/data/messages:101 ../Global-Menu/data/messages:101
-msgid "Compact mode"
-msgstr ""
-
-#: ../Application-Menu/data/messages:103 ../Global-Menu/data/messages:111
-msgid "Image for the 'minimize' button"
-msgstr ""
-
-#: ../Application-Menu/data/messages:105 ../Global-Menu/data/messages:113
-msgid "Image for the 'maximize' button"
-msgstr ""
-
-#: ../Application-Menu/data/messages:107 ../Global-Menu/data/messages:115
-msgid "Image for the 'restore' button"
-msgstr ""
-
-#: ../Application-Menu/data/messages:109 ../Global-Menu/data/messages:117
-msgid "Image for the 'close' button"
-msgstr ""
-
-#: ../Application-Menu/data/messages:117 ../Application-Menu/data/messages:207
 #: ../Cairo-Penguin/data/messages:7 ../Clipper/data/messages:7
 #: ../Composite-Manager/data/messages:7 ../Disks/data/messages:7
 #: ../Doncky/data/messages:7 ../Folders/data/messages:9
 #: ../GMenu/data/messages:7 ../Messaging-Menu/data/messages:7
 #: ../Network-Monitor/data/messages:9 ../RSSreader/data/messages:9
-#: ../Recent-Events/data/messages:7 ../Sound-Menu/data/messages:7
-#: ../Sound-Menu/data/messages:97 ../Status-Notifier/data/messages:7
+#: ../Recent-Events/data/messages:7 ../Status-Notifier/data/messages:7
 #: ../System-Monitor/data/messages:7 ../Toons/data/messages:7
 #: ../Xgamma/data/messages:9 ../alsaMixer/data/messages:9
 #: ../clock/data/messages:9 ../dnd2share/data/messages:7
@@ -4812,105 +3711,107 @@
 msgid "Name of the icon as it will appear in its caption in the dock:"
 msgstr ""
 
-#: ../Application-Menu/data/messages:137 ../Application-Menu/data/messages:227
-#: ../Clipper/data/messages:31 ../Disks/data/messages:45
-#: ../Doncky/data/messages:29 ../Folders/data/messages:43
-#: ../GMenu/data/messages:31 ../MeMenu/data/messages:25
-#: ../Messaging-Menu/data/messages:37 ../Network-Monitor/data/messages:39
-#: ../RSSreader/data/messages:33 ../Sound-Menu/data/messages:27
-#: ../Sound-Menu/data/messages:117 ../System-Monitor/data/messages:37
-#: ../Toons/data/messages:37 ../Xgamma/data/messages:33
-#: ../dnd2share/data/messages:31 ../keyboard-indicator/data/messages:37
-#: ../logout/data/messages:31 ../mail/data/messages:37
-#: ../musicPlayer/data/messages:39 ../powermanager/data/messages:39
-#: ../quick-browser/data/messages:33 ../shortcuts/data/messages:31
-#: ../showDesktop/data/messages:35 ../slider/data/messages:37
-#: ../stack/data/messages:33 ../terminal/data/messages:31
-#: ../weather/data/messages:39 ../weblets/data/messages:31
-#: ../wifi/data/messages:37
-msgid ""
-"Depending on your WindowManager, you may be able to move this with ALT + "
-"left-click."
-msgstr ""
-
-#: ../Application-Menu/data/messages:199 ../Messaging-Menu/data/messages:99
-#: ../Sound-Menu/data/messages:89
-msgid ""
-"Animation of the icon when one of the application demands your attention :"
-msgstr ""
-
-#: ../Application-Menu/data/messages:289 ../Disks/data/messages:133
-#: ../Impulse/data/messages:91 ../Sound-Menu/data/messages:179
-#: ../Status-Notifier/data/messages:103 ../alsaMixer/data/messages:109
-#: ../keyboard-indicator/data/messages:109 ../mail/data/messages:103
-#: ../musicPlayer/data/messages:159 ../shortcuts/data/messages:93
-#: ../shortcuts/data/messages:103 ../slider/data/messages:163
-#: ../stack/data/messages:95 ../tomboy/data/messages:103
-#: ../weather/data/messages:129
-msgid "Display"
-msgstr ""
-
-#: ../Application-Menu/data/messages:291 ../Sound-Menu/data/messages:181
-#: ../alsaMixer/data/messages:111
-msgid "Display volume :"
-msgstr ""
-
-#: ../Application-Menu/data/messages:295 ../Disks/data/messages:141
-#: ../Network-Monitor/data/messages:121 ../Sound-Menu/data/messages:185
-#: ../System-Monitor/data/messages:167 ../alsaMixer/data/messages:115
-#: ../clock/data/messages:109 ../netspeed/data/messages:163
-msgid "On label"
-msgstr ""
-
-#: ../Application-Menu/data/messages:297 ../Disks/data/messages:139
-#: ../Network-Monitor/data/messages:119 ../Sound-Menu/data/messages:187
-#: ../System-Monitor/data/messages:165 ../alsaMixer/data/messages:117
-#: ../clock/data/messages:107 ../netspeed/data/messages:161
-msgid "On icon"
-msgstr ""
-
-#: ../Application-Menu/data/messages:299 ../Sound-Menu/data/messages:189
-msgid "How to represent the icon:"
-msgstr ""
-
-#: ../Application-Menu/data/messages:301 ../Network-Monitor/data/messages:187
-#: ../Network-Monitor/data/messages:217 ../Sound-Menu/data/messages:191
-#: ../powermanager/data/messages:107 ../powermanager/data/messages:137
-#: ../wifi/data/messages:105 ../wifi/data/messages:135
-msgid "Icons"
-msgstr ""
-
-#: ../Application-Menu/data/messages:303 ../Network-Monitor/data/messages:227
-#: ../Sound-Menu/data/messages:193 ../alsaMixer/data/messages:127
-#: ../wifi/data/messages:145
-msgid "Draw Bar"
-msgstr ""
-
-#: ../Application-Menu/data/messages:305 ../Disks/data/messages:91
-#: ../Disks/data/messages:95 ../Network-Monitor/data/messages:141
-#: ../Network-Monitor/data/messages:145 ../Network-Monitor/data/messages:183
-#: ../Network-Monitor/data/messages:189 ../Sound-Menu/data/messages:195
-#: ../System-Monitor/data/messages:101 ../System-Monitor/data/messages:105
-#: ../alsaMixer/data/messages:129 ../netspeed/data/messages:101
-#: ../netspeed/data/messages:105 ../powermanager/data/messages:103
-#: ../powermanager/data/messages:109 ../wifi/data/messages:101
-#: ../wifi/data/messages:107
-msgid "Gauge"
-msgstr ""
-
-#: ../Application-Menu/data/messages:309 ../Sound-Menu/data/messages:199
-#: ../alsaMixer/data/messages:133
-msgid "Default icon:"
-msgstr ""
-
-#: ../Application-Menu/data/messages:313 ../Sound-Menu/data/messages:203
-#: ../alsaMixer/data/messages:137
-msgid "Mute icon:"
-msgstr ""
-
-#: ../Application-Menu/data/messages:315 ../Cairo-Penguin/data/messages:17
-#: ../Disks/data/messages:97 ../Network-Monitor/data/messages:147
-#: ../Network-Monitor/data/messages:191 ../Sound-Menu/data/messages:205
+#: ../Cairo-Penguin/data/messages:9 ../Clipper/data/messages:13
+#: ../Composite-Manager/data/messages:9 ../Disks/data/messages:9
+#: ../Doncky/data/messages:13 ../Folders/data/messages:25
+#: ../GMenu/data/messages:13 ../Global-Menu/data/messages:7
+#: ../Impulse/data/messages:11 ../MeMenu/data/messages:7
+#: ../Messaging-Menu/data/messages:9 ../Network-Monitor/data/messages:11
+#: ../RSSreader/data/messages:15 ../Recent-Events/data/messages:13
+#: ../Status-Notifier/data/messages:13 ../System-Monitor/data/messages:9
+#: ../Toons/data/messages:9 ../Xgamma/data/messages:15
+#: ../alsaMixer/data/messages:11 ../clock/data/messages:11
+#: ../dnd2share/data/messages:13 ../dustbin/data/messages:9
+#: ../keyboard-indicator/data/messages:9 ../logout/data/messages:13
+#: ../mail/data/messages:9 ../musicPlayer/data/messages:11
+#: ../netspeed/data/messages:9 ../powermanager/data/messages:11
+#: ../quick-browser/data/messages:15 ../shortcuts/data/messages:13
+#: ../showDesktop/data/messages:17 ../slider/data/messages:9
+#: ../stack/data/messages:15 ../switcher/data/messages:13
+#: ../systray/data/messages:13 ../template/data/messages:13
+#: ../terminal/data/messages:13 ../tomboy/data/messages:23
+#: ../weather/data/messages:11 ../weblets/data/messages:13
+#: ../wifi/data/messages:9
+msgid "Set to 0 to use the default applet size"
+msgstr ""
+
+#: ../Cairo-Penguin/data/messages:11 ../Clipper/data/messages:15
+#: ../Composite-Manager/data/messages:11 ../Disks/data/messages:11
+#: ../Doncky/data/messages:15 ../Folders/data/messages:27
+#: ../GMenu/data/messages:15 ../Global-Menu/data/messages:9
+#: ../Impulse/data/messages:13 ../MeMenu/data/messages:9
+#: ../Messaging-Menu/data/messages:11 ../Network-Monitor/data/messages:13
+#: ../RSSreader/data/messages:17 ../Recent-Events/data/messages:15
+#: ../Status-Notifier/data/messages:15 ../System-Monitor/data/messages:11
+#: ../Toons/data/messages:11 ../Xgamma/data/messages:17
+#: ../alsaMixer/data/messages:13 ../clock/data/messages:13
+#: ../dnd2share/data/messages:15 ../dustbin/data/messages:11
+#: ../keyboard-indicator/data/messages:11 ../logout/data/messages:15
+#: ../mail/data/messages:11 ../musicPlayer/data/messages:13
+#: ../netspeed/data/messages:11 ../powermanager/data/messages:13
+#: ../quick-browser/data/messages:17 ../shortcuts/data/messages:15
+#: ../showDesktop/data/messages:19 ../slider/data/messages:11
+#: ../stack/data/messages:17 ../switcher/data/messages:15
+#: ../systray/data/messages:15 ../template/data/messages:15
+#: ../terminal/data/messages:15 ../tomboy/data/messages:25
+#: ../weather/data/messages:13 ../weblets/data/messages:15
+#: ../wifi/data/messages:11
+msgid "Desired icon size for this applet"
+msgstr ""
+
+#: ../Cairo-Penguin/data/messages:13 ../Clipper/data/messages:17
+#: ../Composite-Manager/data/messages:13 ../Disks/data/messages:13
+#: ../Folders/data/messages:29 ../GMenu/data/messages:17
+#: ../Global-Menu/data/messages:11 ../Impulse/data/messages:15
+#: ../MeMenu/data/messages:11 ../Messaging-Menu/data/messages:23
+#: ../Network-Monitor/data/messages:25 ../RSSreader/data/messages:19
+#: ../Recent-Events/data/messages:17 ../Scooby-Do/data/messages:115
+#: ../Status-Notifier/data/messages:27 ../System-Monitor/data/messages:23
+#: ../Toons/data/messages:23 ../Xgamma/data/messages:19
+#: ../alsaMixer/data/messages:25 ../clock/data/messages:25
+#: ../dnd2share/data/messages:17 ../dustbin/data/messages:13
+#: ../keyboard-indicator/data/messages:23 ../logout/data/messages:17
+#: ../mail/data/messages:23 ../musicPlayer/data/messages:25
+#: ../netspeed/data/messages:23 ../powermanager/data/messages:25
+#: ../quick-browser/data/messages:19 ../shortcuts/data/messages:17
+#: ../showDesktop/data/messages:21 ../slider/data/messages:23
+#: ../stack/data/messages:19 ../switcher/data/messages:17
+#: ../systray/data/messages:17 ../template/data/messages:17
+#: ../terminal/data/messages:17 ../tomboy/data/messages:27
+#: ../weather/data/messages:25 ../weblets/data/messages:17
+#: ../wifi/data/messages:23
+msgid "Applet's Handbook"
+msgstr ""
+
+#: ../Cairo-Penguin/data/messages:15 ../Clipper/data/messages:91
+#: ../Composite-Manager/data/messages:87 ../Dbus/data/messages:1
+#: ../Disks/data/messages:87 ../Doncky/data/messages:89
+#: ../Folders/data/messages:103 ../GMenu/data/messages:91
+#: ../Global-Menu/data/messages:85 ../Impulse/data/messages:89
+#: ../MeMenu/data/messages:85 ../Messaging-Menu/data/messages:97
+#: ../Network-Monitor/data/messages:99 ../RSSreader/data/messages:93
+#: ../Recent-Events/data/messages:91 ../Remote-Control/data/messages:1
+#: ../Scooby-Do/data/messages:1 ../Status-Notifier/data/messages:101
+#: ../System-Monitor/data/messages:97 ../Toons/data/messages:97
+#: ../Xgamma/data/messages:93 ../alsaMixer/data/messages:99
+#: ../clock/data/messages:99 ../dnd2share/data/messages:87
+#: ../dustbin/data/messages:87 ../keyboard-indicator/data/messages:97
+#: ../logout/data/messages:91 ../mail/data/messages:97
+#: ../motion-blur/data/messages:1 ../musicPlayer/data/messages:99
+#: ../netspeed/data/messages:97 ../powermanager/data/messages:99
+#: ../quick-browser/data/messages:93 ../shortcuts/data/messages:91
+#: ../show-mouse/data/messages:1 ../showDesktop/data/messages:95
+#: ../slider/data/messages:97 ../stack/data/messages:93
+#: ../switcher/data/messages:85 ../switcher/data/messages:87
+#: ../systray/data/messages:83 ../template/data/messages:91
+#: ../terminal/data/messages:91 ../tomboy/data/messages:101
+#: ../weather/data/messages:99 ../weather/data/messages:101
+#: ../weblets/data/messages:91 ../wifi/data/messages:97
+msgid "Configuration"
+msgstr ""
+
+#: ../Cairo-Penguin/data/messages:17 ../Disks/data/messages:97
+#: ../Network-Monitor/data/messages:147 ../Network-Monitor/data/messages:191
 #: ../System-Monitor/data/messages:107 ../Toons/data/messages:99
 #: ../alsaMixer/data/messages:139 ../dustbin/data/messages:91
 #: ../mail/data/messages:105 ../netspeed/data/messages:107
@@ -4919,17 +3820,6 @@
 msgid "Choose one of the available themes:"
 msgstr ""
 
-#: ../Application-Menu/data/messages:317 ../Impulse/data/messages:99
-#: ../Sound-Menu/data/messages:207 ../alsaMixer/data/messages:101
-msgid "Control"
-msgstr ""
-
-#: ../Application-Menu/data/messages:319 ../GMenu/data/messages:95
-#: ../Messaging-Menu/data/messages:101 ../Sound-Menu/data/messages:209
-#: ../quick-browser/data/messages:119
-msgid "Shortkey to show/hide the menu:"
-msgstr ""
-
 #: ../Cairo-Penguin/data/messages:19 ../Clipper/data/messages:139
 #: ../Disks/data/messages:143 ../Network-Monitor/data/messages:175
 #: ../System-Monitor/data/messages:169 ../System-Monitor/data/messages:215
@@ -4975,6 +3865,818 @@
 msgid "Image filename:"
 msgstr ""
 
+#: ../Clipper/data/messages:19 ../Composite-Manager/data/messages:15
+#: ../Disks/data/messages:15 ../Doncky/data/messages:17
+#: ../Folders/data/messages:31 ../GMenu/data/messages:19
+#: ../Global-Menu/data/messages:13 ../Impulse/data/messages:17
+#: ../MeMenu/data/messages:13 ../Messaging-Menu/data/messages:25
+#: ../Network-Monitor/data/messages:27 ../RSSreader/data/messages:21
+#: ../Recent-Events/data/messages:19 ../Status-Notifier/data/messages:29
+#: ../System-Monitor/data/messages:25 ../Toons/data/messages:25
+#: ../Xgamma/data/messages:21 ../alsaMixer/data/messages:27
+#: ../clock/data/messages:27 ../dnd2share/data/messages:19
+#: ../dustbin/data/messages:15 ../keyboard-indicator/data/messages:25
+#: ../logout/data/messages:19 ../mail/data/messages:25
+#: ../musicPlayer/data/messages:27 ../netspeed/data/messages:25
+#: ../powermanager/data/messages:27 ../quick-browser/data/messages:21
+#: ../shortcuts/data/messages:19 ../show-mouse/data/messages:13
+#: ../showDesktop/data/messages:23 ../slider/data/messages:25
+#: ../stack/data/messages:21 ../switcher/data/messages:19
+#: ../systray/data/messages:19 ../template/data/messages:19
+#: ../terminal/data/messages:19 ../tomboy/data/messages:29
+#: ../weather/data/messages:27 ../weblets/data/messages:19
+#: ../wifi/data/messages:25
+msgid "Desklet"
+msgstr ""
+
+#: ../Clipper/data/messages:21 ../Composite-Manager/data/messages:17
+#: ../Disks/data/messages:39 ../Doncky/data/messages:19
+#: ../Folders/data/messages:33 ../GMenu/data/messages:21
+#: ../Global-Menu/data/messages:15 ../Impulse/data/messages:19
+#: ../MeMenu/data/messages:15 ../Messaging-Menu/data/messages:27
+#: ../Network-Monitor/data/messages:29 ../RSSreader/data/messages:23
+#: ../Recent-Events/data/messages:21 ../Status-Notifier/data/messages:31
+#: ../System-Monitor/data/messages:27 ../Toons/data/messages:27
+#: ../Xgamma/data/messages:23 ../alsaMixer/data/messages:29
+#: ../clock/data/messages:29 ../dnd2share/data/messages:21
+#: ../dustbin/data/messages:17 ../keyboard-indicator/data/messages:27
+#: ../logout/data/messages:21 ../mail/data/messages:27
+#: ../musicPlayer/data/messages:29 ../netspeed/data/messages:27
+#: ../powermanager/data/messages:29 ../quick-browser/data/messages:23
+#: ../shortcuts/data/messages:21 ../showDesktop/data/messages:25
+#: ../slider/data/messages:27 ../stack/data/messages:23
+#: ../switcher/data/messages:21 ../systray/data/messages:21
+#: ../template/data/messages:21 ../terminal/data/messages:21
+#: ../tomboy/data/messages:31 ../weather/data/messages:29
+#: ../weblets/data/messages:21 ../wifi/data/messages:27
+msgid "Position"
+msgstr ""
+
+#: ../Clipper/data/messages:23 ../Composite-Manager/data/messages:19
+#: ../Disks/data/messages:41 ../Doncky/data/messages:21
+#: ../Folders/data/messages:35 ../GMenu/data/messages:23
+#: ../Global-Menu/data/messages:17 ../Impulse/data/messages:21
+#: ../MeMenu/data/messages:17 ../Messaging-Menu/data/messages:29
+#: ../Network-Monitor/data/messages:31 ../RSSreader/data/messages:25
+#: ../Recent-Events/data/messages:23 ../Status-Notifier/data/messages:33
+#: ../System-Monitor/data/messages:29 ../Toons/data/messages:29
+#: ../Xgamma/data/messages:25 ../alsaMixer/data/messages:31
+#: ../clock/data/messages:31 ../dnd2share/data/messages:23
+#: ../dustbin/data/messages:19 ../keyboard-indicator/data/messages:29
+#: ../logout/data/messages:23 ../mail/data/messages:29
+#: ../musicPlayer/data/messages:31 ../netspeed/data/messages:29
+#: ../powermanager/data/messages:31 ../quick-browser/data/messages:25
+#: ../shortcuts/data/messages:23 ../showDesktop/data/messages:27
+#: ../slider/data/messages:29 ../stack/data/messages:25
+#: ../switcher/data/messages:23 ../systray/data/messages:23
+#: ../template/data/messages:23 ../terminal/data/messages:23
+#: ../tomboy/data/messages:33 ../weather/data/messages:31
+#: ../weblets/data/messages:23 ../wifi/data/messages:29
+msgid ""
+"If locked, the desklet cannot be moved by simply dragging it with the left "
+"mouse button. It can still be moved with ALT + left-click."
+msgstr ""
+
+#: ../Clipper/data/messages:25 ../Composite-Manager/data/messages:21
+#: ../Disks/data/messages:43 ../Doncky/data/messages:23
+#: ../Folders/data/messages:37 ../GMenu/data/messages:25
+#: ../Global-Menu/data/messages:19 ../Impulse/data/messages:23
+#: ../MeMenu/data/messages:19 ../Messaging-Menu/data/messages:31
+#: ../Network-Monitor/data/messages:33 ../RSSreader/data/messages:27
+#: ../Recent-Events/data/messages:25 ../Status-Notifier/data/messages:35
+#: ../System-Monitor/data/messages:31 ../Toons/data/messages:31
+#: ../Xgamma/data/messages:27 ../alsaMixer/data/messages:33
+#: ../clock/data/messages:33 ../dnd2share/data/messages:25
+#: ../dustbin/data/messages:21 ../keyboard-indicator/data/messages:31
+#: ../logout/data/messages:25 ../mail/data/messages:31
+#: ../musicPlayer/data/messages:33 ../netspeed/data/messages:31
+#: ../powermanager/data/messages:33 ../quick-browser/data/messages:27
+#: ../shortcuts/data/messages:25 ../showDesktop/data/messages:29
+#: ../slider/data/messages:31 ../stack/data/messages:27
+#: ../switcher/data/messages:25 ../systray/data/messages:25
+#: ../template/data/messages:25 ../terminal/data/messages:25
+#: ../tomboy/data/messages:35 ../weather/data/messages:33
+#: ../weblets/data/messages:25 ../wifi/data/messages:31
+msgid "Lock position?"
+msgstr ""
+
+#: ../Clipper/data/messages:27 ../Composite-Manager/data/messages:23
+#: ../Disks/data/messages:21 ../Doncky/data/messages:25
+#: ../Folders/data/messages:39 ../GMenu/data/messages:27
+#: ../Global-Menu/data/messages:21 ../Impulse/data/messages:25
+#: ../MeMenu/data/messages:21 ../Messaging-Menu/data/messages:33
+#: ../Network-Monitor/data/messages:35 ../RSSreader/data/messages:29
+#: ../Recent-Events/data/messages:27 ../Status-Notifier/data/messages:37
+#: ../System-Monitor/data/messages:33 ../Toons/data/messages:33
+#: ../Xgamma/data/messages:29 ../alsaMixer/data/messages:35
+#: ../clock/data/messages:35 ../dnd2share/data/messages:27
+#: ../dustbin/data/messages:23 ../keyboard-indicator/data/messages:33
+#: ../logout/data/messages:27 ../mail/data/messages:33
+#: ../musicPlayer/data/messages:35 ../netspeed/data/messages:33
+#: ../powermanager/data/messages:35 ../quick-browser/data/messages:29
+#: ../shortcuts/data/messages:27 ../showDesktop/data/messages:31
+#: ../slider/data/messages:33 ../stack/data/messages:29
+#: ../switcher/data/messages:27 ../template/data/messages:27
+#: ../terminal/data/messages:27 ../tomboy/data/messages:37
+#: ../weather/data/messages:35 ../weblets/data/messages:27
+#: ../wifi/data/messages:33
+msgid ""
+"Depending on your WindowManager, you may be able to resize this with ALT + "
+"middle-click or ALT + left-click."
+msgstr ""
+
+#: ../Clipper/data/messages:29 ../Composite-Manager/data/messages:25
+#: ../Disks/data/messages:23 ../Doncky/data/messages:27
+#: ../Folders/data/messages:41 ../GMenu/data/messages:29
+#: ../Global-Menu/data/messages:23 ../Impulse/data/messages:27
+#: ../MeMenu/data/messages:23 ../Messaging-Menu/data/messages:35
+#: ../Network-Monitor/data/messages:37 ../RSSreader/data/messages:31
+#: ../Recent-Events/data/messages:29 ../Status-Notifier/data/messages:39
+#: ../System-Monitor/data/messages:35 ../Toons/data/messages:35
+#: ../Xgamma/data/messages:31 ../alsaMixer/data/messages:37
+#: ../clock/data/messages:37 ../dnd2share/data/messages:29
+#: ../dustbin/data/messages:25 ../keyboard-indicator/data/messages:35
+#: ../logout/data/messages:29 ../mail/data/messages:35
+#: ../musicPlayer/data/messages:37 ../netspeed/data/messages:35
+#: ../powermanager/data/messages:37 ../quick-browser/data/messages:31
+#: ../shortcuts/data/messages:29 ../showDesktop/data/messages:33
+#: ../slider/data/messages:35 ../stack/data/messages:31
+#: ../switcher/data/messages:29 ../template/data/messages:29
+#: ../terminal/data/messages:29 ../tomboy/data/messages:39
+#: ../weather/data/messages:37 ../weblets/data/messages:29
+#: ../wifi/data/messages:35
+msgid "Desklet dimensions (width x height):"
+msgstr ""
+
+#: ../Clipper/data/messages:31 ../Disks/data/messages:45
+#: ../Doncky/data/messages:29 ../Folders/data/messages:43
+#: ../GMenu/data/messages:31 ../MeMenu/data/messages:25
+#: ../Messaging-Menu/data/messages:37 ../Network-Monitor/data/messages:39
+#: ../RSSreader/data/messages:33 ../System-Monitor/data/messages:37
+#: ../Toons/data/messages:37 ../Xgamma/data/messages:33
+#: ../dnd2share/data/messages:31 ../keyboard-indicator/data/messages:37
+#: ../logout/data/messages:31 ../mail/data/messages:37
+#: ../musicPlayer/data/messages:39 ../powermanager/data/messages:39
+#: ../quick-browser/data/messages:33 ../shortcuts/data/messages:31
+#: ../showDesktop/data/messages:35 ../slider/data/messages:37
+#: ../stack/data/messages:33 ../terminal/data/messages:31
+#: ../weather/data/messages:39 ../weblets/data/messages:31
+#: ../wifi/data/messages:37
+msgid ""
+"Depending on your WindowManager, you may be able to move this with ALT + "
+"left-click."
+msgstr ""
+
+#: ../Clipper/data/messages:33 ../Composite-Manager/data/messages:29
+#: ../Disks/data/messages:47 ../Doncky/data/messages:31
+#: ../Folders/data/messages:45 ../GMenu/data/messages:33
+#: ../Global-Menu/data/messages:27 ../Impulse/data/messages:31
+#: ../MeMenu/data/messages:27 ../Messaging-Menu/data/messages:39
+#: ../Network-Monitor/data/messages:41 ../RSSreader/data/messages:35
+#: ../Recent-Events/data/messages:33 ../Status-Notifier/data/messages:43
+#: ../System-Monitor/data/messages:39 ../Toons/data/messages:39
+#: ../Xgamma/data/messages:35 ../alsaMixer/data/messages:41
+#: ../clock/data/messages:41 ../dnd2share/data/messages:33
+#: ../dustbin/data/messages:29 ../keyboard-indicator/data/messages:39
+#: ../logout/data/messages:33 ../mail/data/messages:39
+#: ../musicPlayer/data/messages:41 ../netspeed/data/messages:39
+#: ../powermanager/data/messages:41 ../quick-browser/data/messages:35
+#: ../shortcuts/data/messages:33 ../showDesktop/data/messages:37
+#: ../slider/data/messages:39 ../stack/data/messages:35
+#: ../switcher/data/messages:31 ../systray/data/messages:29
+#: ../template/data/messages:33 ../terminal/data/messages:33
+#: ../tomboy/data/messages:43 ../weather/data/messages:41
+#: ../weblets/data/messages:33 ../wifi/data/messages:39
+msgid "Desklet position (x, y):"
+msgstr ""
+
+#: ../Clipper/data/messages:35 ../Composite-Manager/data/messages:31
+#: ../Disks/data/messages:49 ../Doncky/data/messages:33
+#: ../Folders/data/messages:47 ../GMenu/data/messages:35
+#: ../Global-Menu/data/messages:29 ../Impulse/data/messages:33
+#: ../MeMenu/data/messages:29 ../Messaging-Menu/data/messages:41
+#: ../Network-Monitor/data/messages:43 ../RSSreader/data/messages:37
+#: ../Recent-Events/data/messages:35 ../Status-Notifier/data/messages:45
+#: ../System-Monitor/data/messages:41 ../Toons/data/messages:41
+#: ../Xgamma/data/messages:37 ../alsaMixer/data/messages:43
+#: ../clock/data/messages:43 ../dustbin/data/messages:31
+#: ../keyboard-indicator/data/messages:41 ../logout/data/messages:35
+#: ../mail/data/messages:41 ../musicPlayer/data/messages:43
+#: ../netspeed/data/messages:41 ../powermanager/data/messages:43
+#: ../quick-browser/data/messages:37 ../shortcuts/data/messages:35
+#: ../showDesktop/data/messages:39 ../slider/data/messages:41
+#: ../stack/data/messages:37 ../template/data/messages:35
+#: ../terminal/data/messages:35 ../tomboy/data/messages:45
+#: ../weather/data/messages:43 ../weblets/data/messages:35
+#: ../wifi/data/messages:41
+msgid ""
+"You can quickly rotate the desklet with the mouse, by dragging the little "
+"buttons on its left and top sides."
+msgstr ""
+
+#: ../Clipper/data/messages:37 ../Composite-Manager/data/messages:33
+#: ../Disks/data/messages:51 ../Doncky/data/messages:35
+#: ../Folders/data/messages:49 ../GMenu/data/messages:37
+#: ../Global-Menu/data/messages:31 ../Impulse/data/messages:35
+#: ../MeMenu/data/messages:31 ../Messaging-Menu/data/messages:43
+#: ../Network-Monitor/data/messages:45 ../RSSreader/data/messages:39
+#: ../Recent-Events/data/messages:37 ../Status-Notifier/data/messages:47
+#: ../System-Monitor/data/messages:43 ../Toons/data/messages:43
+#: ../Xgamma/data/messages:39 ../alsaMixer/data/messages:45
+#: ../clock/data/messages:45 ../dustbin/data/messages:33
+#: ../keyboard-indicator/data/messages:43 ../logout/data/messages:37
+#: ../mail/data/messages:43 ../musicPlayer/data/messages:45
+#: ../netspeed/data/messages:43 ../powermanager/data/messages:45
+#: ../quick-browser/data/messages:39 ../shortcuts/data/messages:37
+#: ../showDesktop/data/messages:41 ../slider/data/messages:43
+#: ../stack/data/messages:39 ../template/data/messages:37
+#: ../terminal/data/messages:37 ../tomboy/data/messages:47
+#: ../weather/data/messages:45 ../weblets/data/messages:37
+#: ../wifi/data/messages:43
+msgid "Rotation:"
+msgstr ""
+
+#: ../Clipper/data/messages:39 ../Composite-Manager/data/messages:35
+#: ../Doncky/data/messages:37 ../Folders/data/messages:51
+#: ../GMenu/data/messages:39 ../Global-Menu/data/messages:33
+#: ../Impulse/data/messages:37 ../MeMenu/data/messages:33
+#: ../Messaging-Menu/data/messages:45 ../Network-Monitor/data/messages:47
+#: ../RSSreader/data/messages:41 ../Recent-Events/data/messages:39
+#: ../Status-Notifier/data/messages:49 ../System-Monitor/data/messages:45
+#: ../Toons/data/messages:45 ../Xgamma/data/messages:41
+#: ../alsaMixer/data/messages:47 ../clock/data/messages:47
+#: ../dnd2share/data/messages:35 ../dustbin/data/messages:35
+#: ../keyboard-indicator/data/messages:45 ../logout/data/messages:39
+#: ../mail/data/messages:45 ../musicPlayer/data/messages:47
+#: ../netspeed/data/messages:45 ../powermanager/data/messages:47
+#: ../quick-browser/data/messages:41 ../shortcuts/data/messages:39
+#: ../showDesktop/data/messages:43 ../slider/data/messages:45
+#: ../stack/data/messages:41 ../switcher/data/messages:33
+#: ../systray/data/messages:31 ../template/data/messages:39
+#: ../terminal/data/messages:39 ../tomboy/data/messages:49
+#: ../weather/data/messages:47 ../weblets/data/messages:39
+#: ../wifi/data/messages:45
+msgid "Visibility"
+msgstr ""
+
+#: ../Clipper/data/messages:41 ../Composite-Manager/data/messages:37
+#: ../Disks/data/messages:19 ../Doncky/data/messages:39
+#: ../Folders/data/messages:53 ../GMenu/data/messages:41
+#: ../Global-Menu/data/messages:35 ../Impulse/data/messages:39
+#: ../MeMenu/data/messages:35 ../Messaging-Menu/data/messages:47
+#: ../Network-Monitor/data/messages:49 ../RSSreader/data/messages:43
+#: ../Recent-Events/data/messages:41 ../Scooby-Do/data/messages:25
+#: ../Status-Notifier/data/messages:51 ../System-Monitor/data/messages:47
+#: ../Toons/data/messages:47 ../Xgamma/data/messages:43
+#: ../alsaMixer/data/messages:49 ../clock/data/messages:49
+#: ../dnd2share/data/messages:37 ../dustbin/data/messages:37
+#: ../keyboard-indicator/data/messages:47 ../logout/data/messages:41
+#: ../mail/data/messages:47 ../musicPlayer/data/messages:49
+#: ../netspeed/data/messages:47 ../powermanager/data/messages:49
+#: ../quick-browser/data/messages:43 ../shortcuts/data/messages:41
+#: ../showDesktop/data/messages:45 ../slider/data/messages:47
+#: ../stack/data/messages:43 ../switcher/data/messages:35
+#: ../systray/data/messages:33 ../template/data/messages:41
+#: ../terminal/data/messages:41 ../tomboy/data/messages:51
+#: ../weather/data/messages:49 ../weblets/data/messages:41
+#: ../wifi/data/messages:47
+msgid "Is detached from the dock"
+msgstr ""
+
+#: ../Clipper/data/messages:43 ../Composite-Manager/data/messages:39
+#: ../Disks/data/messages:25 ../Doncky/data/messages:41
+#: ../Folders/data/messages:55 ../GMenu/data/messages:43
+#: ../Global-Menu/data/messages:37 ../Impulse/data/messages:41
+#: ../MeMenu/data/messages:37 ../Messaging-Menu/data/messages:49
+#: ../Network-Monitor/data/messages:51 ../RSSreader/data/messages:45
+#: ../Recent-Events/data/messages:43 ../Status-Notifier/data/messages:53
+#: ../System-Monitor/data/messages:49 ../Toons/data/messages:49
+#: ../Xgamma/data/messages:45 ../alsaMixer/data/messages:51
+#: ../clock/data/messages:51 ../dnd2share/data/messages:39
+#: ../dustbin/data/messages:39 ../keyboard-indicator/data/messages:49
+#: ../logout/data/messages:43 ../mail/data/messages:49
+#: ../musicPlayer/data/messages:51 ../netspeed/data/messages:49
+#: ../powermanager/data/messages:51 ../quick-browser/data/messages:45
+#: ../shortcuts/data/messages:43 ../showDesktop/data/messages:47
+#: ../slider/data/messages:49 ../stack/data/messages:45
+#: ../switcher/data/messages:37 ../systray/data/messages:35
+#: ../template/data/messages:43 ../terminal/data/messages:43
+#: ../tomboy/data/messages:53 ../weather/data/messages:51
+#: ../weblets/data/messages:43 ../wifi/data/messages:49
+msgid "Visibility:"
+msgstr ""
+
+#: ../Clipper/data/messages:47 ../Composite-Manager/data/messages:43
+#: ../Disks/data/messages:29 ../Doncky/data/messages:45
+#: ../Folders/data/messages:59 ../GMenu/data/messages:47
+#: ../Global-Menu/data/messages:41 ../Impulse/data/messages:45
+#: ../MeMenu/data/messages:41 ../Messaging-Menu/data/messages:53
+#: ../Network-Monitor/data/messages:55 ../RSSreader/data/messages:49
+#: ../Recent-Events/data/messages:47 ../Status-Notifier/data/messages:57
+#: ../System-Monitor/data/messages:53 ../Toons/data/messages:53
+#: ../Xgamma/data/messages:49 ../alsaMixer/data/messages:55
+#: ../clock/data/messages:55 ../dnd2share/data/messages:43
+#: ../dustbin/data/messages:43 ../keyboard-indicator/data/messages:53
+#: ../logout/data/messages:47 ../mail/data/messages:53
+#: ../musicPlayer/data/messages:55 ../netspeed/data/messages:53
+#: ../powermanager/data/messages:55 ../quick-browser/data/messages:49
+#: ../shortcuts/data/messages:47 ../showDesktop/data/messages:51
+#: ../slider/data/messages:53 ../stack/data/messages:49
+#: ../switcher/data/messages:41 ../systray/data/messages:39
+#: ../template/data/messages:47 ../terminal/data/messages:47
+#: ../tomboy/data/messages:57 ../weather/data/messages:55
+#: ../weblets/data/messages:47 ../wifi/data/messages:53
+msgid "Keep above"
+msgstr ""
+
+#: ../Clipper/data/messages:49 ../Composite-Manager/data/messages:45
+#: ../Disks/data/messages:31 ../Doncky/data/messages:47
+#: ../Folders/data/messages:61 ../GMenu/data/messages:49
+#: ../Global-Menu/data/messages:43 ../Impulse/data/messages:47
+#: ../MeMenu/data/messages:43 ../Messaging-Menu/data/messages:55
+#: ../Network-Monitor/data/messages:57 ../RSSreader/data/messages:51
+#: ../Recent-Events/data/messages:49 ../Status-Notifier/data/messages:59
+#: ../System-Monitor/data/messages:55 ../Toons/data/messages:55
+#: ../Xgamma/data/messages:51 ../alsaMixer/data/messages:57
+#: ../clock/data/messages:57 ../dnd2share/data/messages:45
+#: ../dustbin/data/messages:45 ../keyboard-indicator/data/messages:55
+#: ../logout/data/messages:49 ../mail/data/messages:55
+#: ../musicPlayer/data/messages:57 ../netspeed/data/messages:55
+#: ../powermanager/data/messages:57 ../quick-browser/data/messages:51
+#: ../shortcuts/data/messages:49 ../showDesktop/data/messages:53
+#: ../slider/data/messages:55 ../stack/data/messages:51
+#: ../switcher/data/messages:43 ../systray/data/messages:41
+#: ../template/data/messages:49 ../terminal/data/messages:49
+#: ../tomboy/data/messages:59 ../weather/data/messages:57
+#: ../weblets/data/messages:49 ../wifi/data/messages:55
+msgid "Keep below"
+msgstr ""
+
+#: ../Clipper/data/messages:51 ../Composite-Manager/data/messages:47
+#: ../Disks/data/messages:33 ../Doncky/data/messages:49
+#: ../Folders/data/messages:63 ../GMenu/data/messages:51
+#: ../Global-Menu/data/messages:45 ../Impulse/data/messages:49
+#: ../MeMenu/data/messages:45 ../Messaging-Menu/data/messages:57
+#: ../Network-Monitor/data/messages:59 ../RSSreader/data/messages:53
+#: ../Recent-Events/data/messages:51 ../Status-Notifier/data/messages:61
+#: ../System-Monitor/data/messages:57 ../Toons/data/messages:57
+#: ../Xgamma/data/messages:53 ../alsaMixer/data/messages:59
+#: ../clock/data/messages:59 ../dnd2share/data/messages:47
+#: ../dustbin/data/messages:47 ../keyboard-indicator/data/messages:57
+#: ../logout/data/messages:51 ../mail/data/messages:57
+#: ../musicPlayer/data/messages:59 ../netspeed/data/messages:57
+#: ../powermanager/data/messages:59 ../quick-browser/data/messages:53
+#: ../shortcuts/data/messages:51 ../showDesktop/data/messages:55
+#: ../slider/data/messages:57 ../stack/data/messages:53
+#: ../switcher/data/messages:45 ../systray/data/messages:43
+#: ../template/data/messages:51 ../terminal/data/messages:51
+#: ../tomboy/data/messages:61 ../weather/data/messages:59
+#: ../weblets/data/messages:51 ../wifi/data/messages:57
+msgid "Keep on widget layer"
+msgstr ""
+
+#: ../Clipper/data/messages:53 ../Composite-Manager/data/messages:49
+#: ../Disks/data/messages:35 ../Doncky/data/messages:51
+#: ../Folders/data/messages:65 ../GMenu/data/messages:53
+#: ../Global-Menu/data/messages:47 ../Impulse/data/messages:51
+#: ../MeMenu/data/messages:47 ../Messaging-Menu/data/messages:59
+#: ../Network-Monitor/data/messages:61 ../RSSreader/data/messages:55
+#: ../Recent-Events/data/messages:53 ../Status-Notifier/data/messages:63
+#: ../System-Monitor/data/messages:59 ../Toons/data/messages:59
+#: ../Xgamma/data/messages:55 ../alsaMixer/data/messages:61
+#: ../clock/data/messages:61 ../dnd2share/data/messages:49
+#: ../dustbin/data/messages:49 ../keyboard-indicator/data/messages:59
+#: ../logout/data/messages:53 ../mail/data/messages:59
+#: ../musicPlayer/data/messages:61 ../netspeed/data/messages:59
+#: ../powermanager/data/messages:61 ../quick-browser/data/messages:55
+#: ../shortcuts/data/messages:53 ../showDesktop/data/messages:57
+#: ../slider/data/messages:59 ../stack/data/messages:55
+#: ../switcher/data/messages:47 ../systray/data/messages:45
+#: ../template/data/messages:53 ../terminal/data/messages:53
+#: ../tomboy/data/messages:63 ../weather/data/messages:61
+#: ../weblets/data/messages:53 ../wifi/data/messages:59
+msgid "Reserve space"
+msgstr ""
+
+#: ../Clipper/data/messages:55 ../Composite-Manager/data/messages:51
+#: ../Disks/data/messages:37 ../Doncky/data/messages:53
+#: ../Folders/data/messages:67 ../GMenu/data/messages:55
+#: ../Global-Menu/data/messages:49 ../Impulse/data/messages:53
+#: ../MeMenu/data/messages:49 ../Messaging-Menu/data/messages:61
+#: ../Network-Monitor/data/messages:63 ../RSSreader/data/messages:57
+#: ../Recent-Events/data/messages:55 ../Status-Notifier/data/messages:65
+#: ../System-Monitor/data/messages:61 ../Toons/data/messages:61
+#: ../Xgamma/data/messages:57 ../alsaMixer/data/messages:63
+#: ../clock/data/messages:63 ../dnd2share/data/messages:51
+#: ../dustbin/data/messages:51 ../keyboard-indicator/data/messages:61
+#: ../logout/data/messages:55 ../mail/data/messages:61
+#: ../musicPlayer/data/messages:63 ../netspeed/data/messages:61
+#: ../powermanager/data/messages:63 ../quick-browser/data/messages:57
+#: ../shortcuts/data/messages:55 ../showDesktop/data/messages:59
+#: ../slider/data/messages:61 ../stack/data/messages:57
+#: ../switcher/data/messages:49 ../systray/data/messages:47
+#: ../template/data/messages:55 ../terminal/data/messages:55
+#: ../tomboy/data/messages:65 ../weather/data/messages:63
+#: ../weblets/data/messages:55 ../wifi/data/messages:61
+msgid "Should be visible on all desktops?"
+msgstr ""
+
+#: ../Clipper/data/messages:57 ../Composite-Manager/data/messages:53
+#: ../Disks/data/messages:53 ../Doncky/data/messages:55
+#: ../Folders/data/messages:69 ../GMenu/data/messages:57
+#: ../Global-Menu/data/messages:51 ../Impulse/data/messages:55
+#: ../MeMenu/data/messages:51 ../Messaging-Menu/data/messages:63
+#: ../Network-Monitor/data/messages:65 ../RSSreader/data/messages:59
+#: ../Recent-Events/data/messages:57 ../Status-Notifier/data/messages:67
+#: ../System-Monitor/data/messages:63 ../Toons/data/messages:63
+#: ../Xgamma/data/messages:59 ../alsaMixer/data/messages:65
+#: ../clock/data/messages:65 ../dnd2share/data/messages:53
+#: ../dustbin/data/messages:53 ../keyboard-indicator/data/messages:63
+#: ../logout/data/messages:57 ../mail/data/messages:63
+#: ../musicPlayer/data/messages:65 ../netspeed/data/messages:63
+#: ../powermanager/data/messages:65 ../quick-browser/data/messages:59
+#: ../shortcuts/data/messages:57 ../showDesktop/data/messages:61
+#: ../slider/data/messages:63 ../stack/data/messages:59
+#: ../switcher/data/messages:51 ../systray/data/messages:49
+#: ../template/data/messages:57 ../terminal/data/messages:57
+#: ../tomboy/data/messages:67 ../weather/data/messages:65
+#: ../weblets/data/messages:57 ../wifi/data/messages:63
+msgid "Decorations"
+msgstr ""
+
+#: ../Clipper/data/messages:59 ../Composite-Manager/data/messages:55
+#: ../Disks/data/messages:55 ../Doncky/data/messages:57
+#: ../Folders/data/messages:71 ../GMenu/data/messages:59
+#: ../Global-Menu/data/messages:53 ../Impulse/data/messages:57
+#: ../MeMenu/data/messages:53 ../Messaging-Menu/data/messages:65
+#: ../Network-Monitor/data/messages:67 ../RSSreader/data/messages:61
+#: ../Recent-Events/data/messages:59 ../Status-Notifier/data/messages:69
+#: ../System-Monitor/data/messages:65 ../Toons/data/messages:65
+#: ../Xgamma/data/messages:61 ../alsaMixer/data/messages:67
+#: ../clock/data/messages:67 ../dnd2share/data/messages:55
+#: ../dustbin/data/messages:55 ../keyboard-indicator/data/messages:65
+#: ../logout/data/messages:59 ../mail/data/messages:65
+#: ../musicPlayer/data/messages:67 ../netspeed/data/messages:65
+#: ../powermanager/data/messages:67 ../quick-browser/data/messages:61
+#: ../shortcuts/data/messages:59 ../showDesktop/data/messages:63
+#: ../slider/data/messages:65 ../stack/data/messages:61
+#: ../switcher/data/messages:53 ../systray/data/messages:51
+#: ../template/data/messages:59 ../terminal/data/messages:59
+#: ../tomboy/data/messages:69 ../weather/data/messages:67
+#: ../weblets/data/messages:59 ../wifi/data/messages:65
+msgid "Choose 'Custom decorations' to define your own decorations below."
+msgstr ""
+
+#: ../Clipper/data/messages:61 ../Composite-Manager/data/messages:57
+#: ../Disks/data/messages:57 ../Doncky/data/messages:59
+#: ../Folders/data/messages:73 ../GMenu/data/messages:61
+#: ../Global-Menu/data/messages:55 ../Impulse/data/messages:59
+#: ../MeMenu/data/messages:55 ../Messaging-Menu/data/messages:67
+#: ../Network-Monitor/data/messages:69 ../RSSreader/data/messages:63
+#: ../Recent-Events/data/messages:61 ../Status-Notifier/data/messages:71
+#: ../System-Monitor/data/messages:67 ../Toons/data/messages:67
+#: ../Xgamma/data/messages:63 ../alsaMixer/data/messages:69
+#: ../clock/data/messages:69 ../dnd2share/data/messages:57
+#: ../dustbin/data/messages:57 ../keyboard-indicator/data/messages:67
+#: ../logout/data/messages:61 ../mail/data/messages:67
+#: ../musicPlayer/data/messages:69 ../netspeed/data/messages:67
+#: ../powermanager/data/messages:69 ../quick-browser/data/messages:63
+#: ../shortcuts/data/messages:61 ../showDesktop/data/messages:65
+#: ../slider/data/messages:67 ../stack/data/messages:63
+#: ../switcher/data/messages:55 ../systray/data/messages:53
+#: ../template/data/messages:61 ../terminal/data/messages:61
+#: ../tomboy/data/messages:71 ../weather/data/messages:69
+#: ../weblets/data/messages:61 ../wifi/data/messages:67
+msgid "Choose a decoration theme for this desklet:"
+msgstr ""
+
+#: ../Clipper/data/messages:63 ../Composite-Manager/data/messages:59
+#: ../Disks/data/messages:59 ../Doncky/data/messages:61
+#: ../Folders/data/messages:75 ../GMenu/data/messages:63
+#: ../Global-Menu/data/messages:57 ../Impulse/data/messages:61
+#: ../MeMenu/data/messages:57 ../Messaging-Menu/data/messages:69
+#: ../Network-Monitor/data/messages:71 ../RSSreader/data/messages:65
+#: ../Recent-Events/data/messages:63 ../Status-Notifier/data/messages:73
+#: ../System-Monitor/data/messages:69 ../Toons/data/messages:69
+#: ../Xgamma/data/messages:65 ../alsaMixer/data/messages:71
+#: ../clock/data/messages:71 ../dnd2share/data/messages:59
+#: ../dustbin/data/messages:59 ../keyboard-indicator/data/messages:69
+#: ../logout/data/messages:63 ../mail/data/messages:69
+#: ../musicPlayer/data/messages:71 ../netspeed/data/messages:69
+#: ../powermanager/data/messages:71 ../quick-browser/data/messages:65
+#: ../shortcuts/data/messages:63 ../showDesktop/data/messages:67
+#: ../slider/data/messages:69 ../stack/data/messages:65
+#: ../switcher/data/messages:57 ../systray/data/messages:55
+#: ../template/data/messages:63 ../terminal/data/messages:63
+#: ../tomboy/data/messages:73 ../weather/data/messages:71
+#: ../weblets/data/messages:63 ../wifi/data/messages:69
+msgid ""
+"Image to be displayed below drawings, e.g. a frame. Leave empty for no image."
+msgstr ""
+
+#: ../Clipper/data/messages:65 ../Composite-Manager/data/messages:61
+#: ../Disks/data/messages:61 ../Doncky/data/messages:63
+#: ../Folders/data/messages:77 ../GMenu/data/messages:65
+#: ../Global-Menu/data/messages:59 ../Impulse/data/messages:63
+#: ../MeMenu/data/messages:59 ../Messaging-Menu/data/messages:71
+#: ../Network-Monitor/data/messages:73 ../RSSreader/data/messages:67
+#: ../Recent-Events/data/messages:65 ../Status-Notifier/data/messages:75
+#: ../System-Monitor/data/messages:71 ../Toons/data/messages:71
+#: ../Xgamma/data/messages:67 ../alsaMixer/data/messages:73
+#: ../clock/data/messages:73 ../clock/data/messages:167
+#: ../dnd2share/data/messages:61 ../dustbin/data/messages:61
+#: ../keyboard-indicator/data/messages:71
+#: ../keyboard-indicator/data/messages:125 ../logout/data/messages:65
+#: ../mail/data/messages:71 ../musicPlayer/data/messages:73
+#: ../netspeed/data/messages:71 ../powermanager/data/messages:73
+#: ../quick-browser/data/messages:67 ../shortcuts/data/messages:65
+#: ../showDesktop/data/messages:69 ../slider/data/messages:71
+#: ../stack/data/messages:67 ../switcher/data/messages:59
+#: ../systray/data/messages:57 ../template/data/messages:65
+#: ../terminal/data/messages:65 ../tomboy/data/messages:75
+#: ../weather/data/messages:73 ../weblets/data/messages:65
+#: ../wifi/data/messages:71
+msgid "Background image:"
+msgstr ""
+
+#: ../Clipper/data/messages:67 ../Composite-Manager/data/messages:63
+#: ../Disks/data/messages:63 ../Doncky/data/messages:65
+#: ../Folders/data/messages:79 ../GMenu/data/messages:67
+#: ../Global-Menu/data/messages:61 ../Impulse/data/messages:65
+#: ../MeMenu/data/messages:61 ../Messaging-Menu/data/messages:73
+#: ../Network-Monitor/data/messages:75 ../RSSreader/data/messages:69
+#: ../Recent-Events/data/messages:67 ../Status-Notifier/data/messages:77
+#: ../System-Monitor/data/messages:73 ../Toons/data/messages:73
+#: ../Xgamma/data/messages:69 ../alsaMixer/data/messages:75
+#: ../clock/data/messages:75 ../dnd2share/data/messages:63
+#: ../dustbin/data/messages:63 ../keyboard-indicator/data/messages:73
+#: ../logout/data/messages:67 ../mail/data/messages:73
+#: ../musicPlayer/data/messages:75 ../netspeed/data/messages:73
+#: ../powermanager/data/messages:75 ../quick-browser/data/messages:69
+#: ../shortcuts/data/messages:67 ../showDesktop/data/messages:71
+#: ../slider/data/messages:73 ../stack/data/messages:69
+#: ../switcher/data/messages:61 ../systray/data/messages:59
+#: ../template/data/messages:67 ../terminal/data/messages:67
+#: ../tomboy/data/messages:77 ../weather/data/messages:75
+#: ../weblets/data/messages:67 ../wifi/data/messages:73
+msgid "Background transparency:"
+msgstr ""
+
+#: ../Clipper/data/messages:69 ../Composite-Manager/data/messages:65
+#: ../Disks/data/messages:71 ../Doncky/data/messages:67
+#: ../Folders/data/messages:81 ../GMenu/data/messages:69
+#: ../Global-Menu/data/messages:63 ../Impulse/data/messages:67
+#: ../MeMenu/data/messages:63 ../Messaging-Menu/data/messages:75
+#: ../Network-Monitor/data/messages:77 ../RSSreader/data/messages:71
+#: ../Recent-Events/data/messages:69 ../Status-Notifier/data/messages:79
+#: ../System-Monitor/data/messages:75 ../Toons/data/messages:75
+#: ../Xgamma/data/messages:71 ../alsaMixer/data/messages:77
+#: ../clock/data/messages:77 ../dnd2share/data/messages:65
+#: ../dustbin/data/messages:65 ../keyboard-indicator/data/messages:75
+#: ../logout/data/messages:69 ../mail/data/messages:75
+#: ../musicPlayer/data/messages:77 ../netspeed/data/messages:75
+#: ../powermanager/data/messages:77 ../quick-browser/data/messages:71
+#: ../shortcuts/data/messages:69 ../showDesktop/data/messages:73
+#: ../slider/data/messages:75 ../stack/data/messages:71
+#: ../switcher/data/messages:63 ../systray/data/messages:61
+#: ../template/data/messages:69 ../terminal/data/messages:69
+#: ../tomboy/data/messages:79 ../weather/data/messages:77
+#: ../weblets/data/messages:69 ../wifi/data/messages:75
+msgid "in pixels. Use this to adjust the left position of drawings."
+msgstr ""
+
+#: ../Clipper/data/messages:71 ../Composite-Manager/data/messages:67
+#: ../Disks/data/messages:73 ../Doncky/data/messages:69
+#: ../Folders/data/messages:83 ../GMenu/data/messages:71
+#: ../Global-Menu/data/messages:65 ../Impulse/data/messages:69
+#: ../MeMenu/data/messages:65 ../Messaging-Menu/data/messages:77
+#: ../Network-Monitor/data/messages:79 ../RSSreader/data/messages:73
+#: ../Recent-Events/data/messages:71 ../Status-Notifier/data/messages:81
+#: ../System-Monitor/data/messages:77 ../Toons/data/messages:77
+#: ../Xgamma/data/messages:73 ../alsaMixer/data/messages:79
+#: ../clock/data/messages:79 ../dnd2share/data/messages:67
+#: ../dustbin/data/messages:67 ../keyboard-indicator/data/messages:77
+#: ../logout/data/messages:71 ../mail/data/messages:77
+#: ../musicPlayer/data/messages:79 ../netspeed/data/messages:77
+#: ../powermanager/data/messages:79 ../quick-browser/data/messages:73
+#: ../shortcuts/data/messages:71 ../showDesktop/data/messages:75
+#: ../slider/data/messages:77 ../stack/data/messages:73
+#: ../switcher/data/messages:65 ../systray/data/messages:63
+#: ../template/data/messages:71 ../terminal/data/messages:71
+#: ../tomboy/data/messages:81 ../weather/data/messages:79
+#: ../weblets/data/messages:71 ../wifi/data/messages:77
+msgid "Left offset:"
+msgstr ""
+
+#: ../Clipper/data/messages:73 ../Composite-Manager/data/messages:69
+#: ../Disks/data/messages:75 ../Doncky/data/messages:71
+#: ../Folders/data/messages:85 ../GMenu/data/messages:73
+#: ../Global-Menu/data/messages:67 ../Impulse/data/messages:71
+#: ../MeMenu/data/messages:67 ../Messaging-Menu/data/messages:79
+#: ../Network-Monitor/data/messages:81 ../RSSreader/data/messages:75
+#: ../Recent-Events/data/messages:73 ../Status-Notifier/data/messages:83
+#: ../System-Monitor/data/messages:79 ../Toons/data/messages:79
+#: ../Xgamma/data/messages:75 ../alsaMixer/data/messages:81
+#: ../clock/data/messages:81 ../dnd2share/data/messages:69
+#: ../dustbin/data/messages:69 ../keyboard-indicator/data/messages:79
+#: ../logout/data/messages:73 ../mail/data/messages:79
+#: ../musicPlayer/data/messages:81 ../netspeed/data/messages:79
+#: ../powermanager/data/messages:81 ../quick-browser/data/messages:75
+#: ../shortcuts/data/messages:73 ../showDesktop/data/messages:77
+#: ../slider/data/messages:79 ../stack/data/messages:75
+#: ../switcher/data/messages:67 ../systray/data/messages:65
+#: ../template/data/messages:73 ../terminal/data/messages:73
+#: ../tomboy/data/messages:83 ../weather/data/messages:81
+#: ../weblets/data/messages:73 ../wifi/data/messages:79
+msgid "in pixels. Use this to adjust the top position of drawings."
+msgstr ""
+
+#: ../Clipper/data/messages:75 ../Composite-Manager/data/messages:71
+#: ../Disks/data/messages:77 ../Doncky/data/messages:73
+#: ../Folders/data/messages:87 ../GMenu/data/messages:75
+#: ../Global-Menu/data/messages:69 ../Impulse/data/messages:73
+#: ../MeMenu/data/messages:69 ../Messaging-Menu/data/messages:81
+#: ../Network-Monitor/data/messages:83 ../RSSreader/data/messages:77
+#: ../Recent-Events/data/messages:75 ../Status-Notifier/data/messages:85
+#: ../System-Monitor/data/messages:81 ../Toons/data/messages:81
+#: ../Xgamma/data/messages:77 ../alsaMixer/data/messages:83
+#: ../clock/data/messages:83 ../dnd2share/data/messages:71
+#: ../dustbin/data/messages:71 ../keyboard-indicator/data/messages:81
+#: ../logout/data/messages:75 ../mail/data/messages:81
+#: ../musicPlayer/data/messages:83 ../netspeed/data/messages:81
+#: ../powermanager/data/messages:83 ../quick-browser/data/messages:77
+#: ../shortcuts/data/messages:75 ../showDesktop/data/messages:79
+#: ../slider/data/messages:81 ../stack/data/messages:77
+#: ../switcher/data/messages:69 ../systray/data/messages:67
+#: ../template/data/messages:75 ../terminal/data/messages:75
+#: ../tomboy/data/messages:85 ../weather/data/messages:83
+#: ../weblets/data/messages:75 ../wifi/data/messages:81
+msgid "Top offset:"
+msgstr ""
+
+#: ../Clipper/data/messages:77 ../Composite-Manager/data/messages:73
+#: ../Disks/data/messages:79 ../Doncky/data/messages:75
+#: ../Folders/data/messages:89 ../GMenu/data/messages:77
+#: ../Global-Menu/data/messages:71 ../Impulse/data/messages:75
+#: ../MeMenu/data/messages:71 ../Messaging-Menu/data/messages:83
+#: ../Network-Monitor/data/messages:85 ../RSSreader/data/messages:79
+#: ../Recent-Events/data/messages:77 ../Status-Notifier/data/messages:87
+#: ../System-Monitor/data/messages:83 ../Toons/data/messages:83
+#: ../Xgamma/data/messages:79 ../alsaMixer/data/messages:85
+#: ../clock/data/messages:85 ../dnd2share/data/messages:73
+#: ../dustbin/data/messages:73 ../keyboard-indicator/data/messages:83
+#: ../logout/data/messages:77 ../mail/data/messages:83
+#: ../musicPlayer/data/messages:85 ../netspeed/data/messages:83
+#: ../powermanager/data/messages:85 ../quick-browser/data/messages:79
+#: ../shortcuts/data/messages:77 ../showDesktop/data/messages:81
+#: ../slider/data/messages:83 ../stack/data/messages:79
+#: ../switcher/data/messages:71 ../systray/data/messages:69
+#: ../template/data/messages:77 ../terminal/data/messages:77
+#: ../tomboy/data/messages:87 ../weather/data/messages:85
+#: ../weblets/data/messages:77 ../wifi/data/messages:83
+msgid "in pixels. Use this to adjust the right position of drawings."
+msgstr ""
+
+#: ../Clipper/data/messages:79 ../Composite-Manager/data/messages:75
+#: ../Disks/data/messages:81 ../Doncky/data/messages:77
+#: ../Folders/data/messages:91 ../GMenu/data/messages:79
+#: ../Global-Menu/data/messages:73 ../Impulse/data/messages:77
+#: ../MeMenu/data/messages:73 ../Messaging-Menu/data/messages:85
+#: ../Network-Monitor/data/messages:87 ../RSSreader/data/messages:81
+#: ../Recent-Events/data/messages:79 ../Status-Notifier/data/messages:89
+#: ../System-Monitor/data/messages:85 ../Toons/data/messages:85
+#: ../Xgamma/data/messages:81 ../alsaMixer/data/messages:87
+#: ../clock/data/messages:87 ../dnd2share/data/messages:75
+#: ../dustbin/data/messages:75 ../keyboard-indicator/data/messages:85
+#: ../logout/data/messages:79 ../mail/data/messages:85
+#: ../musicPlayer/data/messages:87 ../netspeed/data/messages:85
+#: ../powermanager/data/messages:87 ../quick-browser/data/messages:81
+#: ../shortcuts/data/messages:79 ../showDesktop/data/messages:83
+#: ../slider/data/messages:85 ../stack/data/messages:81
+#: ../switcher/data/messages:73 ../systray/data/messages:71
+#: ../template/data/messages:79 ../terminal/data/messages:79
+#: ../tomboy/data/messages:89 ../weather/data/messages:87
+#: ../weblets/data/messages:79 ../wifi/data/messages:85
+msgid "Right offset:"
+msgstr ""
+
+#: ../Clipper/data/messages:81 ../Composite-Manager/data/messages:77
+#: ../Disks/data/messages:83 ../Doncky/data/messages:79
+#: ../Folders/data/messages:93 ../GMenu/data/messages:81
+#: ../Global-Menu/data/messages:75 ../Impulse/data/messages:79
+#: ../MeMenu/data/messages:75 ../Messaging-Menu/data/messages:87
+#: ../Network-Monitor/data/messages:89 ../RSSreader/data/messages:83
+#: ../Recent-Events/data/messages:81 ../Status-Notifier/data/messages:91
+#: ../System-Monitor/data/messages:87 ../Toons/data/messages:87
+#: ../Xgamma/data/messages:83 ../alsaMixer/data/messages:89
+#: ../clock/data/messages:89 ../dnd2share/data/messages:77
+#: ../dustbin/data/messages:77 ../keyboard-indicator/data/messages:87
+#: ../logout/data/messages:81 ../mail/data/messages:87
+#: ../musicPlayer/data/messages:89 ../netspeed/data/messages:87
+#: ../powermanager/data/messages:89 ../quick-browser/data/messages:83
+#: ../shortcuts/data/messages:81 ../showDesktop/data/messages:85
+#: ../slider/data/messages:87 ../stack/data/messages:83
+#: ../switcher/data/messages:75 ../systray/data/messages:73
+#: ../template/data/messages:81 ../terminal/data/messages:81
+#: ../tomboy/data/messages:91 ../weather/data/messages:89
+#: ../weblets/data/messages:81 ../wifi/data/messages:87
+msgid "in pixels. Use this to adjust the bottom position of drawings."
+msgstr ""
+
+#: ../Clipper/data/messages:83 ../Composite-Manager/data/messages:79
+#: ../Disks/data/messages:85 ../Doncky/data/messages:81
+#: ../Folders/data/messages:95 ../GMenu/data/messages:83
+#: ../Global-Menu/data/messages:77 ../Impulse/data/messages:81
+#: ../MeMenu/data/messages:77 ../Messaging-Menu/data/messages:89
+#: ../Network-Monitor/data/messages:91 ../RSSreader/data/messages:85
+#: ../Recent-Events/data/messages:83 ../Status-Notifier/data/messages:93
+#: ../System-Monitor/data/messages:89 ../Toons/data/messages:89
+#: ../Xgamma/data/messages:85 ../alsaMixer/data/messages:91
+#: ../clock/data/messages:91 ../dnd2share/data/messages:79
+#: ../dustbin/data/messages:79 ../keyboard-indicator/data/messages:89
+#: ../logout/data/messages:83 ../mail/data/messages:89
+#: ../musicPlayer/data/messages:91 ../netspeed/data/messages:89
+#: ../powermanager/data/messages:91 ../quick-browser/data/messages:85
+#: ../shortcuts/data/messages:83 ../showDesktop/data/messages:87
+#: ../slider/data/messages:89 ../stack/data/messages:85
+#: ../switcher/data/messages:77 ../systray/data/messages:75
+#: ../template/data/messages:83 ../terminal/data/messages:83
+#: ../tomboy/data/messages:93 ../weather/data/messages:91
+#: ../weblets/data/messages:83 ../wifi/data/messages:89
+msgid "Bottom offset:"
+msgstr ""
+
+#: ../Clipper/data/messages:85 ../Composite-Manager/data/messages:81
+#: ../Disks/data/messages:65 ../Doncky/data/messages:83
+#: ../Folders/data/messages:97 ../GMenu/data/messages:85
+#: ../Global-Menu/data/messages:79 ../Impulse/data/messages:83
+#: ../MeMenu/data/messages:79 ../Messaging-Menu/data/messages:91
+#: ../Network-Monitor/data/messages:93 ../RSSreader/data/messages:87
+#: ../Recent-Events/data/messages:85 ../Status-Notifier/data/messages:95
+#: ../System-Monitor/data/messages:91 ../Toons/data/messages:91
+#: ../Xgamma/data/messages:87 ../alsaMixer/data/messages:93
+#: ../clock/data/messages:93 ../dnd2share/data/messages:81
+#: ../dustbin/data/messages:81 ../keyboard-indicator/data/messages:91
+#: ../logout/data/messages:85 ../mail/data/messages:91
+#: ../musicPlayer/data/messages:93 ../netspeed/data/messages:91
+#: ../powermanager/data/messages:93 ../quick-browser/data/messages:87
+#: ../shortcuts/data/messages:85 ../showDesktop/data/messages:89
+#: ../slider/data/messages:91 ../stack/data/messages:87
+#: ../switcher/data/messages:79 ../systray/data/messages:77
+#: ../template/data/messages:85 ../terminal/data/messages:85
+#: ../tomboy/data/messages:95 ../weather/data/messages:93
+#: ../weblets/data/messages:85 ../wifi/data/messages:91
+msgid ""
+"Image to be displayed above the drawings, e.g. a reflection. Leave empty for "
+"no image."
+msgstr ""
+
+#: ../Clipper/data/messages:87 ../Composite-Manager/data/messages:83
+#: ../Disks/data/messages:67 ../Doncky/data/messages:85
+#: ../Folders/data/messages:99 ../GMenu/data/messages:87
+#: ../Global-Menu/data/messages:81 ../Impulse/data/messages:85
+#: ../MeMenu/data/messages:81 ../Messaging-Menu/data/messages:93
+#: ../Network-Monitor/data/messages:95 ../RSSreader/data/messages:89
+#: ../Recent-Events/data/messages:87 ../Status-Notifier/data/messages:97
+#: ../System-Monitor/data/messages:93 ../Toons/data/messages:93
+#: ../Xgamma/data/messages:89 ../alsaMixer/data/messages:95
+#: ../clock/data/messages:95 ../dnd2share/data/messages:83
+#: ../dustbin/data/messages:83 ../keyboard-indicator/data/messages:93
+#: ../logout/data/messages:87 ../mail/data/messages:93
+#: ../musicPlayer/data/messages:95 ../netspeed/data/messages:93
+#: ../powermanager/data/messages:95 ../quick-browser/data/messages:89
+#: ../shortcuts/data/messages:87 ../showDesktop/data/messages:91
+#: ../slider/data/messages:93 ../stack/data/messages:89
+#: ../switcher/data/messages:81 ../systray/data/messages:79
+#: ../template/data/messages:87 ../terminal/data/messages:87
+#: ../tomboy/data/messages:97 ../weather/data/messages:95
+#: ../weblets/data/messages:87 ../wifi/data/messages:93
+msgid "Foreground image:"
+msgstr ""
+
+#: ../Clipper/data/messages:89 ../Composite-Manager/data/messages:85
+#: ../Disks/data/messages:69 ../Doncky/data/messages:87
+#: ../Folders/data/messages:101 ../GMenu/data/messages:89
+#: ../Global-Menu/data/messages:83 ../Impulse/data/messages:87
+#: ../MeMenu/data/messages:83 ../Messaging-Menu/data/messages:95
+#: ../Network-Monitor/data/messages:97 ../RSSreader/data/messages:91
+#: ../Recent-Events/data/messages:89 ../Status-Notifier/data/messages:99
+#: ../System-Monitor/data/messages:95 ../Toons/data/messages:95
+#: ../Xgamma/data/messages:91 ../alsaMixer/data/messages:97
+#: ../clock/data/messages:97 ../dnd2share/data/messages:85
+#: ../dustbin/data/messages:85 ../keyboard-indicator/data/messages:95
+#: ../logout/data/messages:89 ../mail/data/messages:95
+#: ../musicPlayer/data/messages:97 ../netspeed/data/messages:95
+#: ../powermanager/data/messages:97 ../quick-browser/data/messages:91
+#: ../shortcuts/data/messages:89 ../showDesktop/data/messages:93
+#: ../slider/data/messages:95 ../stack/data/messages:91
+#: ../switcher/data/messages:83 ../systray/data/messages:81
+#: ../template/data/messages:89 ../terminal/data/messages:89
+#: ../tomboy/data/messages:99 ../weather/data/messages:97
+#: ../weblets/data/messages:89 ../wifi/data/messages:95
+msgid "Foreground tansparency:"
+msgstr ""
+
 #: ../Clipper/data/messages:93
 msgid "Items"
 msgstr ""
@@ -5085,6 +4787,17 @@
 msgid "A list of persistent items which can be accessed with middle-click:"
 msgstr ""
 
+#: ../Composite-Manager/data/messages:27 ../Global-Menu/data/messages:25
+#: ../Impulse/data/messages:29 ../Recent-Events/data/messages:31
+#: ../Status-Notifier/data/messages:41 ../alsaMixer/data/messages:39
+#: ../clock/data/messages:39 ../dustbin/data/messages:27
+#: ../netspeed/data/messages:37 ../systray/data/messages:27
+#: ../template/data/messages:31 ../tomboy/data/messages:41
+msgid ""
+"Depending on your WindowManager, you may be able to move this with ALT + "
+"left-click.. Negative values are counted from the right/bottom of the screen"
+msgstr ""
+
 #: ../Composite-Manager/data/messages:89 ../Impulse/data/messages:123
 #: ../clock/data/messages:133
 msgid "Style"
@@ -5212,6 +4925,17 @@
 msgid "Choose the style of the display: "
 msgstr ""
 
+#: ../Disks/data/messages:91 ../Disks/data/messages:95
+#: ../Network-Monitor/data/messages:141 ../Network-Monitor/data/messages:145
+#: ../Network-Monitor/data/messages:183 ../Network-Monitor/data/messages:189
+#: ../System-Monitor/data/messages:101 ../System-Monitor/data/messages:105
+#: ../alsaMixer/data/messages:129 ../netspeed/data/messages:101
+#: ../netspeed/data/messages:105 ../powermanager/data/messages:103
+#: ../powermanager/data/messages:109 ../wifi/data/messages:101
+#: ../wifi/data/messages:107
+msgid "Gauge"
+msgstr ""
+
 #: ../Disks/data/messages:93 ../Disks/data/messages:107
 #: ../Network-Monitor/data/messages:143 ../Network-Monitor/data/messages:149
 #: ../Network-Monitor/data/messages:185 ../Network-Monitor/data/messages:193
@@ -5308,10 +5032,32 @@
 msgid "Show all values on same graph?"
 msgstr ""
 
+#: ../Disks/data/messages:133 ../Impulse/data/messages:91
+#: ../Status-Notifier/data/messages:103 ../alsaMixer/data/messages:109
+#: ../keyboard-indicator/data/messages:109 ../mail/data/messages:103
+#: ../musicPlayer/data/messages:159 ../shortcuts/data/messages:93
+#: ../shortcuts/data/messages:103 ../slider/data/messages:163
+#: ../stack/data/messages:95 ../tomboy/data/messages:103
+#: ../weather/data/messages:129
+msgid "Display"
+msgstr ""
+
 #: ../Disks/data/messages:135
 msgid "Display values"
 msgstr ""
 
+#: ../Disks/data/messages:139 ../Network-Monitor/data/messages:119
+#: ../System-Monitor/data/messages:165 ../alsaMixer/data/messages:117
+#: ../clock/data/messages:107 ../netspeed/data/messages:161
+msgid "On icon"
+msgstr ""
+
+#: ../Disks/data/messages:141 ../Network-Monitor/data/messages:121
+#: ../System-Monitor/data/messages:167 ../alsaMixer/data/messages:115
+#: ../clock/data/messages:109 ../netspeed/data/messages:163
+msgid "On label"
+msgstr ""
+
 #: ../Disks/data/messages:145
 msgid "Refresh time"
 msgstr ""
@@ -5400,7 +5146,8 @@
 msgstr ""
 
 #: ../Doncky/data/messages:117 ../RSSreader/data/messages:181
-msgid "You can have more attractive backgrounds using the Desklet decorations"
+msgid ""
+"You can have more attractive backgrounds using the Desklet decorations"
 msgstr ""
 
 #: ../Doncky/data/messages:119 ../RSSreader/data/messages:183
@@ -5510,6 +5257,11 @@
 msgid "Display icons in the menu?"
 msgstr ""
 
+#: ../GMenu/data/messages:95 ../Messaging-Menu/data/messages:101
+#: ../quick-browser/data/messages:119
+msgid "Shortkey to show/hide the menu:"
+msgstr ""
+
 #: ../GMenu/data/messages:97
 msgid "Shortkey to show/hide the quick-launch dialog:"
 msgstr ""
@@ -5550,10 +5302,38 @@
 msgid "Show Logout and/or Shutdown : "
 msgstr ""
 
+#: ../Global-Menu/data/messages:87
+msgid ""
+"The applet can steal the top border of maximized windows, in which case it "
+"will display the window control buttons.\n"
+" The applet can steal the menu from the windows, in which case it will "
+"display a button to pop up the menu of the current window."
+msgstr ""
+
+#: ../Global-Menu/data/messages:91
+msgid "Steal window menu"
+msgstr ""
+
 #: ../Global-Menu/data/messages:93
 msgid "Steal window decoration"
 msgstr ""
 
+#: ../Global-Menu/data/messages:95
+msgid "Steal window menu and border"
+msgstr ""
+
+#: ../Global-Menu/data/messages:97
+msgid "Shortkey to pop up the menu"
+msgstr ""
+
+#: ../Global-Menu/data/messages:99
+msgid "Pop up the menu at mouse position"
+msgstr ""
+
+#: ../Global-Menu/data/messages:101
+msgid "Compact mode"
+msgstr ""
+
 #: ../Global-Menu/data/messages:103
 msgid "Order of the buttons: "
 msgstr ""
@@ -5570,6 +5350,22 @@
 msgid "Close button at first"
 msgstr ""
 
+#: ../Global-Menu/data/messages:111
+msgid "Image for the 'minimize' button"
+msgstr ""
+
+#: ../Global-Menu/data/messages:113
+msgid "Image for the 'maximize' button"
+msgstr ""
+
+#: ../Global-Menu/data/messages:115
+msgid "Image for the 'restore' button"
+msgstr ""
+
+#: ../Global-Menu/data/messages:117
+msgid "Image for the 'close' button"
+msgstr ""
+
 #: ../Impulse/data/messages:93
 msgid "Animation of the icons:"
 msgstr ""
@@ -5584,6 +5380,10 @@
 msgid "Stop animations sooner?"
 msgstr ""
 
+#: ../Impulse/data/messages:99 ../alsaMixer/data/messages:101
+msgid "Control"
+msgstr ""
+
 #: ../Impulse/data/messages:101
 msgid ""
 "It's the sensitivity in order to know if the animation is played or not."
@@ -5690,6 +5490,11 @@
 msgid "Background color to add in this case"
 msgstr ""
 
+#: ../Messaging-Menu/data/messages:99
+msgid ""
+"Animation of the icon when one of the application demands your attention :"
+msgstr ""
+
 #: ../Network-Monitor/data/messages:7
 msgid "Leave empty to use the connection name."
 msgstr ""
@@ -5785,6 +5590,12 @@
 msgid "Choose the style of the display:"
 msgstr ""
 
+#: ../Network-Monitor/data/messages:187 ../Network-Monitor/data/messages:217
+#: ../powermanager/data/messages:107 ../powermanager/data/messages:137
+#: ../wifi/data/messages:105 ../wifi/data/messages:135
+msgid "Icons"
+msgstr ""
+
 #: ../Network-Monitor/data/messages:219 ../wifi/data/messages:137
 msgid "Effect to apply on the icon according to strength :"
 msgstr ""
@@ -5799,6 +5610,11 @@
 msgid "Transparency"
 msgstr ""
 
+#: ../Network-Monitor/data/messages:227 ../alsaMixer/data/messages:127
+#: ../wifi/data/messages:145
+msgid "Draw Bar"
+msgstr ""
+
 #: ../Network-Monitor/data/messages:229 ../Network-Monitor/data/messages:233
 #: ../Network-Monitor/data/messages:237 ../Network-Monitor/data/messages:241
 #: ../Network-Monitor/data/messages:245 ../Network-Monitor/data/messages:249
@@ -6453,10 +6269,22 @@
 msgid "Hide the scale when mouse leaves the desklet?"
 msgstr ""
 
+#: ../alsaMixer/data/messages:111
+msgid "Display volume :"
+msgstr ""
+
 #: ../alsaMixer/data/messages:119
 msgid "Effect to apply to the icon when adjusting volume:"
 msgstr ""
 
+#: ../alsaMixer/data/messages:133
+msgid "Default icon:"
+msgstr ""
+
+#: ../alsaMixer/data/messages:137
+msgid "Mute icon:"
+msgstr ""
+
 #: ../alsaMixer/data/messages:151
 msgid "Broken icon:"
 msgstr ""
@@ -7033,7 +6861,8 @@
 msgstr ""
 
 #: ../dock-rendering/data/messages:117
-msgid "0 represents a flat wave, 1 means the wave is identical to other views."
+msgid ""
+"0 represents a flat wave, 1 means the wave is identical to other views."
 msgstr ""
 
 #: ../dock-rendering/data/messages:121
@@ -7163,7 +6992,8 @@
 msgstr ""
 
 #: ../icon-effect/data/messages:71
-msgid "This will slightly alter your colours, so you may have to modify them."
+msgid ""
+"This will slightly alter your colours, so you may have to modify them."
 msgstr ""
 
 #: ../icon-effect/data/messages:73 ../icon-effect/data/messages:185
@@ -7396,7 +7226,8 @@
 msgstr ""
 
 #: ../mail/data/messages:115
-msgid "If checked, the number of mails will be shown even if there is no mail."
+msgid ""
+"If checked, the number of mails will be shown even if there is no mail."
 msgstr ""
 
 #: ../mail/data/messages:117
@@ -7480,7 +7311,8 @@
 msgstr ""
 
 #: ../musicPlayer/data/messages:7
-msgid "Leave it empty to display the name of the player currently controlled."
+msgid ""
+"Leave it empty to display the name of the player currently controlled."
 msgstr ""
 
 #: ../musicPlayer/data/messages:101
@@ -8425,7 +8257,8 @@
 msgstr ""
 
 #: ../weblets/data/messages:105
-msgid "This lets you right-click on the desklet to pop up the Cairo-Dock menu."
+msgid ""
+"This lets you right-click on the desklet to pop up the Cairo-Dock menu."
 msgstr ""
 
 #: ../weblets/data/messages:107
 
=== modified file 'po/cairo-dock.pot'
--- po/cairo-dock.pot	2012-03-21 11:26:14 +0000
+++ po/cairo-dock.pot	2012-04-17 13:08:18 +0000
@@ -65,35 +65,6 @@
 msgid "Spot"
 msgstr ""
 
-#: ../Application-Menu/src/applet-init.c:30
-msgid "Application Menu"
-msgstr ""
-
-#: ../Application-Menu/src/applet-init.c:33
-#: ../Global-Menu/src/applet-init.c:33
-msgid ""
-"This applet allows you to control the current active window:\n"
-"  close, minimize, maximize, and display the application menu.To display the menu, applications have to support this feature, which is the case on Ubuntu by default.\n"
-"You can bind a shortkey to this action."
-msgstr ""
-
-#: ../Application-Menu/src/applet-init.c:83
-#: ../Application-Menu/src/applet-init.c:148
-#: ../Global-Menu/src/applet-init.c:108 ../Global-Menu/src/applet-init.c:210
-msgid "Show/hide the current application menu"
-msgstr ""
-
-#: ../Application-Menu/src/applet-notifications.c:52
-#: ../Global-Menu/src/applet-notifications.c:52
-msgid "The application didn't send its menu to us."
-msgstr ""
-
-#: ../Application-Menu/src/indicator-sound.c:228
-#: ../Sound-Menu/src/indicator-sound.c:228
-#, c-format
-msgid "Volume (%'.0f%%)"
-msgstr ""
-
 #: ../Cairo-Penguin/src/applet-init.c:33
 msgid ""
 "Add a lively Penguin in your dock !\n"
@@ -203,6 +174,14 @@
 msgid "The clipboard history is empty."
 msgstr ""
 
+#: ../Clipper/src/applet-notifications.c:89
+msgid "Clear clipboard History"
+msgstr ""
+
+#: ../Clipper/src/applet-notifications.c:91
+msgid "Paste all copied items"
+msgstr ""
+
 #: ../Clipper/src/applet-notifications.c:99
 msgid ""
 "No persistent items.\n"
@@ -265,7 +244,7 @@
 #: ../Composite-Manager/src/applet-notifications.c:154
 #: ../Composite-Manager/src/applet-notifications.c:163
 #: ../Folders/src/applet-notifications.c:365
-#: ../GMenu/src/applet-notifications.c:74
+#: ../GMenu/src/applet-notifications.c:81
 #: ../RSSreader/src/applet-notifications.c:129
 #: ../System-Monitor/src/applet-notifications.c:106
 #: ../Xgamma/src/applet-notifications.c:87
@@ -277,9 +256,9 @@
 #: ../quick-browser/src/applet-notifications.c:41
 #: ../shortcuts/src/applet-notifications.c:249
 #: ../shortcuts/src/applet-notifications.c:269
-#: ../showDesktop/src/applet-notifications.c:153
 #: ../showDesktop/src/applet-notifications.c:165
 #: ../showDesktop/src/applet-notifications.c:177
+#: ../showDesktop/src/applet-notifications.c:189
 #: ../slider/src/applet-notifications.c:223
 #: ../slider/src/applet-notifications.c:265
 #: ../stack/src/applet-notifications.c:181
@@ -296,16 +275,16 @@
 msgstr ""
 
 #: ../Composite-Manager/src/applet-notifications.c:136
-#: ../showDesktop/src/applet-notifications.c:153
-#: ../showDesktop/src/applet-notifications.c:155
+#: ../showDesktop/src/applet-notifications.c:165
+#: ../showDesktop/src/applet-notifications.c:167
 #: ../Composite-Manager/data/messages:133 ../showDesktop/data/messages:103
 #: ../showDesktop/data/messages:117 ../switcher/data/messages:113
 msgid "Show desktop"
 msgstr ""
 
 #: ../Composite-Manager/src/applet-notifications.c:145
-#: ../showDesktop/src/applet-notifications.c:165
-#: ../showDesktop/src/applet-notifications.c:167
+#: ../showDesktop/src/applet-notifications.c:177
+#: ../showDesktop/src/applet-notifications.c:179
 #: ../switcher/src/applet-notifications.c:314
 #: ../Composite-Manager/data/messages:135 ../showDesktop/data/messages:111
 #: ../showDesktop/data/messages:125 ../switcher/data/messages:115
@@ -319,8 +298,8 @@
 msgstr ""
 
 #: ../Composite-Manager/src/applet-notifications.c:163
-#: ../showDesktop/src/applet-notifications.c:177
-#: ../showDesktop/src/applet-notifications.c:179
+#: ../showDesktop/src/applet-notifications.c:189
+#: ../showDesktop/src/applet-notifications.c:191
 #: ../Composite-Manager/data/messages:139 ../showDesktop/data/messages:109
 #: ../showDesktop/data/messages:123
 msgid "Show the Widget Layer"
@@ -520,22 +499,21 @@
 
 #: ../Folders/src/applet-notifications.c:184
 #: ../Folders/src/applet-notifications.c:185
-#: ../Folders/src/applet-notifications.c:186
-#: ../Application-Menu/data/messages:293 ../Disks/data/messages:101
+#: ../Folders/src/applet-notifications.c:186 ../Disks/data/messages:101
 #: ../Disks/data/messages:137 ../Messaging-Menu/data/messages:15
 #: ../Network-Monitor/data/messages:17 ../Network-Monitor/data/messages:117
-#: ../RSSreader/data/messages:113 ../Sound-Menu/data/messages:183
-#: ../Status-Notifier/data/messages:19 ../System-Monitor/data/messages:15
-#: ../System-Monitor/data/messages:111 ../System-Monitor/data/messages:163
-#: ../Toons/data/messages:15 ../alsaMixer/data/messages:17
-#: ../alsaMixer/data/messages:113 ../alsaMixer/data/messages:143
-#: ../clock/data/messages:17 ../clock/data/messages:105
-#: ../keyboard-indicator/data/messages:15 ../mail/data/messages:15
-#: ../musicPlayer/data/messages:17 ../netspeed/data/messages:15
-#: ../netspeed/data/messages:111 ../netspeed/data/messages:159
-#: ../powermanager/data/messages:17 ../shortcuts/data/messages:119
-#: ../slider/data/messages:15 ../slider/data/messages:167
-#: ../weather/data/messages:17 ../wifi/data/messages:15
+#: ../RSSreader/data/messages:113 ../Status-Notifier/data/messages:19
+#: ../System-Monitor/data/messages:15 ../System-Monitor/data/messages:111
+#: ../System-Monitor/data/messages:163 ../Toons/data/messages:15
+#: ../alsaMixer/data/messages:17 ../alsaMixer/data/messages:113
+#: ../alsaMixer/data/messages:143 ../clock/data/messages:17
+#: ../clock/data/messages:105 ../keyboard-indicator/data/messages:15
+#: ../mail/data/messages:15 ../musicPlayer/data/messages:17
+#: ../netspeed/data/messages:15 ../netspeed/data/messages:111
+#: ../netspeed/data/messages:159 ../powermanager/data/messages:17
+#: ../shortcuts/data/messages:119 ../slider/data/messages:15
+#: ../slider/data/messages:167 ../weather/data/messages:17
+#: ../wifi/data/messages:15
 msgid "No"
 msgstr ""
 
@@ -681,15 +659,15 @@
 msgid "Shutdown"
 msgstr ""
 
-#: ../GMenu/src/applet-notifications.c:74
+#: ../GMenu/src/applet-notifications.c:81
 msgid "Quick launch"
 msgstr ""
 
-#: ../GMenu/src/applet-notifications.c:78
+#: ../GMenu/src/applet-notifications.c:105
 msgid "Configure menu"
 msgstr ""
 
-#: ../GMenu/src/applet-notifications.c:81
+#: ../GMenu/src/applet-notifications.c:108
 msgid "Clear recent"
 msgstr ""
 
@@ -709,6 +687,21 @@
 msgid "Global Menu"
 msgstr ""
 
+#: ../Global-Menu/src/applet-init.c:33
+msgid ""
+"This applet allows you to control the current active window:\n"
+"  close, minimize, maximize, and display the application menu.To display the menu, applications have to support this feature, which is the case on Ubuntu by default.\n"
+"You can bind a shortkey to this action."
+msgstr ""
+
+#: ../Global-Menu/src/applet-init.c:108 ../Global-Menu/src/applet-init.c:210
+msgid "Show/hide the current application menu"
+msgstr ""
+
+#: ../Global-Menu/src/applet-notifications.c:52
+msgid "The application didn't send its menu to us."
+msgstr ""
+
 #: ../Impulse/src/applet-impulse.c:170
 msgid ""
 "There is something wrong with PulseAudio.\n"
@@ -781,7 +774,7 @@
 msgstr ""
 
 #: ../Network-Monitor/src/applet-draw.c:30
-#: ../powermanager/src/powermanager-draw.c:172 ../wifi/src/applet-draw.c:31
+#: ../powermanager/src/powermanager-draw.c:174 ../wifi/src/applet-draw.c:31
 #: ../Clipper/data/messages:99 ../GMenu/data/messages:119
 #: ../Network-Monitor/data/messages:221 ../alsaMixer/data/messages:121
 #: ../dnd2share/data/messages:111 ../dustbin/data/messages:101
@@ -848,8 +841,8 @@
 #: ../Network-Monitor/src/applet-draw.c:148
 #: ../musicPlayer/src/applet-draw.c:152 ../musicPlayer/src/applet-draw.c:154
 #: ../musicPlayer/src/applet-draw.c:156
-#: ../powermanager/src/powermanager-draw.c:201
-#: ../powermanager/src/powermanager-draw.c:254
+#: ../powermanager/src/powermanager-draw.c:203
+#: ../powermanager/src/powermanager-draw.c:256
 msgid "Unknown"
 msgstr ""
 
@@ -1233,30 +1226,6 @@
 msgid "Enter your search"
 msgstr ""
 
-#: ../Sound-Menu/src/applet-init.c:38
-msgid "Sound Menu"
-msgstr ""
-
-#: ../Sound-Menu/src/applet-init.c:41
-msgid ""
-"A menu to control the volume of each current audio sources.\n"
-"It requires the Sound service, which is available on Ubuntu by default."
-msgstr ""
-
-#: ../Sound-Menu/src/applet-init.c:91 ../alsaMixer/src/applet-init.c:118
-msgid "Show/hide the Sound menu"
-msgstr ""
-
-#: ../Sound-Menu/src/applet-notifications.c:35
-msgid ""
-"The Sound service did not reply.\n"
-"Please check that it is correctly installed."
-msgstr ""
-
-#: ../Sound-Menu/src/applet-sound.c:200 ../alsaMixer/src/applet-draw.c:64
-msgid "Volume"
-msgstr ""
-
 #: ../Status-Notifier/src/applet-init.c:33
 msgid ""
 "A <b>notification area</b> for your dock\n"
@@ -1432,42 +1401,39 @@
 msgstr ""
 
 #: ../alsaMixer/src/applet-backend-alsamixer.c:46
-#: ../alsaMixer/src/applet-mixer.c:51
 #, c-format
 msgid "I couldn't open card '%s'"
 msgstr ""
 
 #: ../alsaMixer/src/applet-backend-alsamixer.c:51
-#: ../alsaMixer/src/applet-mixer.c:56
 #, c-format
 msgid "Card '%s' opened but I couldn't get any info"
 msgstr ""
 
 #: ../alsaMixer/src/applet-backend-alsamixer.c:59
-#: ../alsaMixer/src/applet-mixer.c:64
 msgid "I couldn't open the mixer"
 msgstr ""
 
 #: ../alsaMixer/src/applet-backend-alsamixer.c:66
-#: ../alsaMixer/src/applet-mixer.c:71
 msgid "I couldn't attach the mixer to the card"
 msgstr ""
 
 #: ../alsaMixer/src/applet-backend-alsamixer.c:73
-#: ../alsaMixer/src/applet-mixer.c:78
 msgid "I couldn't register options"
 msgstr ""
 
 #: ../alsaMixer/src/applet-backend-alsamixer.c:80
-#: ../alsaMixer/src/applet-mixer.c:86
 msgid "I couldn't load the mixer"
 msgstr ""
 
 #: ../alsaMixer/src/applet-backend-alsamixer.c:261
-#: ../alsaMixer/src/applet-mixer.c:286
 msgid "Set up volume:"
 msgstr ""
 
+#: ../alsaMixer/src/applet-draw.c:64
+msgid "Volume"
+msgstr ""
+
 #: ../alsaMixer/src/applet-init.c:34
 msgid ""
 "This applet lets you control the sound volume from the dock.\n"
@@ -1481,6 +1447,10 @@
 msgid "Sound Control"
 msgstr ""
 
+#: ../alsaMixer/src/applet-init.c:118
+msgid "Show/hide the Sound menu"
+msgstr ""
+
 #: ../alsaMixer/src/applet-notifications.c:80
 msgid "Adjust channels"
 msgstr ""
@@ -2545,66 +2515,66 @@
 msgid "Re-check interface"
 msgstr ""
 
-#: ../powermanager/src/powermanager-draw.c:128
+#: ../powermanager/src/powermanager-draw.c:130
 msgid "Battery charged"
 msgstr ""
 
-#: ../powermanager/src/powermanager-draw.c:150
+#: ../powermanager/src/powermanager-draw.c:152
 msgid "Time before empty"
 msgstr ""
 
-#: ../powermanager/src/powermanager-draw.c:150
+#: ../powermanager/src/powermanager-draw.c:152
 msgid "Time before full"
 msgstr ""
 
-#: ../powermanager/src/powermanager-draw.c:207
+#: ../powermanager/src/powermanager-draw.c:209
 msgid "Laptop on Battery."
 msgstr ""
 
-#: ../powermanager/src/powermanager-draw.c:208
-#: ../powermanager/src/powermanager-draw.c:217
+#: ../powermanager/src/powermanager-draw.c:210
+#: ../powermanager/src/powermanager-draw.c:219
 msgid "Battery charged at:"
 msgstr ""
 
-#: ../powermanager/src/powermanager-draw.c:209
+#: ../powermanager/src/powermanager-draw.c:211
 msgid "Estimated time before empty:"
 msgstr ""
 
-#: ../powermanager/src/powermanager-draw.c:216
+#: ../powermanager/src/powermanager-draw.c:218
 msgid "Laptop on Charge."
 msgstr ""
 
-#: ../powermanager/src/powermanager-draw.c:218
+#: ../powermanager/src/powermanager-draw.c:220
 msgid "Estimated time before full:"
 msgstr ""
 
-#: ../powermanager/src/powermanager-draw.c:225
+#: ../powermanager/src/powermanager-draw.c:227
 msgid "Model"
 msgstr ""
 
-#: ../powermanager/src/powermanager-draw.c:233
+#: ../powermanager/src/powermanager-draw.c:235