cairo-dock-team team mailing list archive
-
cairo-dock-team team
-
Mailing list archive
-
Message #02356
[Merge] lp:~cairo-dock-team/cairo-dock-plug-ins/ubuntu into lp:ubuntu/cairo-dock-plug-ins
Didier Roche has proposed merging lp:~cairo-dock-team/cairo-dock-plug-ins/ubuntu into lp:ubuntu/cairo-dock-plug-ins.
Requested reviews:
Cairo-Dock Team (cairo-dock-team)
Related bugs:
#449422 Cairo-Dock resize problem
https://bugs.launchpad.net/bugs/449422
#455261 Cannot Modify / Add Custom Launchers
https://bugs.launchpad.net/bugs/455261
#483963 Dustbin applet does not display trash on all volumes
https://bugs.launchpad.net/bugs/483963
#485159 Some applications have problem with Systray
https://bugs.launchpad.net/bugs/485159
#489349 showDesktop Applet only seems to work every second time you click on it.
https://bugs.launchpad.net/bugs/489349
#500677 xsession-errors log
https://bugs.launchpad.net/bugs/500677
#500979 shortcuts display order gets messed up
https://bugs.launchpad.net/bugs/500979
#519915 Create a cairo dock plugin
https://bugs.launchpad.net/bugs/519915
#521531 mail plugin crashes on Maildir
https://bugs.launchpad.net/bugs/521531
#521536 Please update cairo-dock-plug-ins to 2.1.3-3 version
https://bugs.launchpad.net/bugs/521536
#523447 MusicPlayer applet crashes on tracks with russians symbols
https://bugs.launchpad.net/bugs/523447
#526138 GMenu does not handle desktop file exec strings properly
https://bugs.launchpad.net/bugs/526138
#526742 The system monitor plugin and netspeed plugin inverts upside-down continuously
https://bugs.launchpad.net/bugs/526742
#531317 cairo-dock-plugins does not support prefix on make install
https://bugs.launchpad.net/bugs/531317
#531319 please check the version of cairo-dock when building the plugin
https://bugs.launchpad.net/bugs/531319
#537115 Click at the position where icon label was, the icon and dock still receive the event
https://bugs.launchpad.net/bugs/537115
#537943 Terminal applet shortkey behaviour
https://bugs.launchpad.net/bugs/537943
#538637 Trash applet doesn't create *.trashinfo files on Xfce
https://bugs.launchpad.net/bugs/538637
#568083 Please update Cairo-Dock to v2.1.3-10
https://bugs.launchpad.net/bugs/568083
#568258 [lucid] cannot start cairo-dock since last updates
https://bugs.launchpad.net/bugs/568258
#575178 music-player applet crashes on change songs automatically
https://bugs.launchpad.net/bugs/575178
#576647 Please update Cairo-Dock with the following patches
https://bugs.launchpad.net/bugs/576647
#582452 GMenu does not contain any applications
https://bugs.launchpad.net/bugs/582452
#604034 Change terminal tab's name lost the color
https://bugs.launchpad.net/bugs/604034
#614625 Please update cairo-dock to 2.2.0 version
https://bugs.launchpad.net/bugs/614625
#616176 Dust Bin Hang and Incorrect Configuration
https://bugs.launchpad.net/bugs/616176
#632054 Please update cairo-dock-plug-ins to the latest 2.2.0 version
https://bugs.launchpad.net/bugs/632054
#638529 Please update cairo-dock-plug-ins to the final 2.2.0 version
https://bugs.launchpad.net/bugs/638529
--
The attached diff has been truncated due to its size.
https://code.launchpad.net/~cairo-dock-team/cairo-dock-plug-ins/ubuntu/+merge/36278
Your team Cairo-Dock Team is requested to review the proposed merge of lp:~cairo-dock-team/cairo-dock-plug-ins/ubuntu into lp:ubuntu/cairo-dock-plug-ins.
=== modified file 'CMakeLists.txt'
--- CMakeLists.txt 2010-09-07 00:39:20 +0000
+++ CMakeLists.txt 2010-09-22 10:43:43 +0000
@@ -10,7 +10,7 @@
########### project ###############
project ("cairo-dock-plugins")
-set (VERSION "2.2.0-0rc1")
+set (VERSION "2.2.0-2")
add_definitions (-std=c99 -Wstrict-prototypes -Wextra -Wwrite-strings -Wuninitialized -Werror-implicit-function-declaration) #-Wunreachable-code -Wno-unused-parameter -Wall
if (NOT ${CMAKE_BUILD_TYPE})
@@ -23,7 +23,7 @@
set (CPACK_SOURCE_GENERATOR "TGZ")
set (CPACK_SOURCE_PACKAGE_FILE_NAME "${CMAKE_PROJECT_NAME}-${VERSION}")
set (CPACK_SOURCE_IGNORE_FILES
- "/build/;/.bzr/;bzrignore$;/misc/;/en_GB.po$;~$;${CPACK_SOURCE_IGNORE_FILES}")
+ "/build/;/.bzr/;bzrignore$;/misc/;en_GB.po$;~$;${CPACK_SOURCE_IGNORE_FILES}")
include (CPack)
add_custom_target( dist
@@ -62,12 +62,10 @@
endif()
set (GETTEXT_PLUGINS "cairo-dock-plugins")
-if( CMAKE_SIZEOF_VOID_P EQUAL 8 AND "${LIB_SUFFIX}" STREQUAL "" AND "${FORCE_NOT_LIB64}" STREQUAL "" )
- set (libdir lib64/cairo-dock)
-elseif( CMAKE_SIZEOF_VOID_P EQUAL 8 AND NOT "${FORCE_NOT_LIB64}" STREQUAL "" )
- set (libdir lib${LIB_SUFFIX}/cairo-dock)
+if( CMAKE_SIZEOF_VOID_P EQUAL 8 AND NOT "${FORCE_LIB64}" STREQUAL "") # 64bits and force install in lib64
+ set (libdir ${prefix}/lib64)
else()
- set (libdir lib${LIB_SUFFIX}/cairo-dock)
+ set (libdir ${prefix}/lib${LIB_SUFFIX})
endif()
if (NOT "${pluginsdir}" STREQUAL "${CMAKE_INSTALL_PREFIX}/${libdir}")
@@ -559,7 +557,7 @@
add_subdirectory (terminal)
endif()
-############# OY #################
+############# TOMBOY #################
set (GETTEXT_TOMBOY ${GETTEXT_PLUGINS})
set (VERSION_TOMBOY "1.3.0")
set (PACKAGE_TOMBOY "cd-tomboy")
@@ -643,6 +641,6 @@
set (VERSION_REMOTE_CONTROL "0.0.1")
set (PACKAGE_REMOTE_CONTROL "cd-Remote-Control")
set (remote_controldatadir "${pluginsdatadir}/Remote-Control")
- configure_file (Remote-Control/data/Remote-Control.conf.in ${CMAKE_CURRENT_SOURCE_DIR}/Remote-Control/data/Remote-Control.conf)
+ configure_file (${CMAKE_CURRENT_SOURCE_DIR}/Remote-Control/data/Remote-Control.conf.in ${CMAKE_CURRENT_BINARY_DIR}/Remote-Control/data/Remote-Control.conf)
add_subdirectory (Remote-Control)
endif()
=== modified file 'Dbus/src/applet-dbus.c'
--- Dbus/src/applet-dbus.c 2010-09-07 00:39:20 +0000
+++ Dbus/src/applet-dbus.c 2010-09-22 10:43:43 +0000
@@ -434,7 +434,7 @@
gpointer invocation_hint G_GNUC_UNUSED,
gpointer marshal_data)
{
- g_print ("%s ()\n", __func__);
+ //g_print ("%s ()\n", __func__);
typedef void (*GMarshalFunc_VOID__INT_STRING) (gpointer data1,
gint arg_1,
gchar *arg_2,
@@ -468,7 +468,7 @@
gpointer invocation_hint G_GNUC_UNUSED,
gpointer marshal_data)
{
- g_print ("%s ()\n", __func__);
+ //g_print ("%s ()\n", __func__);
typedef void (*GMarshalFunc_VOID__BOOLEAN_STRING) (gpointer data1,
gboolean arg_1,
gchar *arg_2,
@@ -502,7 +502,7 @@
gpointer invocation_hint G_GNUC_UNUSED,
gpointer marshal_data)
{
- g_print ("%s ()\n", __func__);
+ //g_print ("%s ()\n", __func__);
typedef void (*GMarshalFunc_VOID__STRING_STRING) (gpointer data1,
gchar *arg_1,
gchar *arg_2,
@@ -536,7 +536,7 @@
gpointer invocation_hint G_GNUC_UNUSED,
gpointer marshal_data)
{
- g_print ("%s ()\n", __func__);
+ //g_print ("%s ()\n", __func__);
typedef void (*GMarshalFunc_VOID__VALUE) (gpointer data1,
GValue *arg_1,
gpointer data2);
@@ -568,7 +568,7 @@
gpointer invocation_hint G_GNUC_UNUSED,
gpointer marshal_data)
{
- g_print ("%s ()\n", __func__);
+ //g_print ("%s ()\n", __func__);
typedef void (*GMarshalFunc_VOID__INT_VALUE) (gpointer data1,
gint arg_1,
GValue *arg_2,
@@ -602,7 +602,7 @@
gpointer invocation_hint G_GNUC_UNUSED,
gpointer marshal_data)
{
- g_print ("%s ()\n", __func__);
+ //g_print ("%s ()\n", __func__);
typedef void (*GMarshalFunc_VOID__VALUE_STRING) (gpointer data1,
GValue *arg_1,
gchar *arg_2,
=== modified file 'Dbus/src/interface-applet-methods.c'
--- Dbus/src/interface-applet-methods.c 2010-08-07 01:43:25 +0000
+++ Dbus/src/interface-applet-methods.c 2010-09-22 10:43:43 +0000
@@ -1145,7 +1145,7 @@
}
if (! cShortkeys[i]) // raccourci non trouve dans la nouvelle liste => on l'enleve
{
- g_print (" shortkey '%s' not wanted anymore\n", key);
+ //g_print (" shortkey '%s' not wanted anymore\n", key);
cd_keybinder_unbind (key, (CDBindkeyHandler) cd_dbus_applet_emit_on_shortkey);
pDbusApplet->pShortkeyList = g_list_delete_link (pDbusApplet->pShortkeyList, sk);
}
@@ -1165,7 +1165,7 @@
}
if (! sk) // raccourci non encore lie => on lie.
{
- g_print (" shortkey '%s' wanted\n", cShortkey);
+ //g_print (" shortkey '%s' wanted\n", cShortkey);
bCouldBind = cd_keybinder_bind (cShortkey, (CDBindkeyHandler) cd_dbus_applet_emit_on_shortkey, pDbusApplet);
if (bCouldBind)
pDbusApplet->pShortkeyList = g_list_prepend (pDbusApplet->pShortkeyList, g_strdup (cShortkey));
=== modified file 'Dbus/src/interface-applet-signals.c'
--- Dbus/src/interface-applet-signals.c 2010-08-07 01:43:25 +0000
+++ Dbus/src/interface-applet-signals.c 2010-09-22 10:43:43 +0000
@@ -632,7 +632,7 @@
}
const gchar *cText = gtk_entry_get_text (GTK_ENTRY (pEntry));
- g_print (" -> %s\n", cText);
+ //g_print (" -> %s\n", cText);
g_value_set_string (&v, cText);
_emit_answer_dialog (pDbusApplet, pDialog, iClickedButton, &v);
}
=== modified file 'Folders/src/applet-notifications.c'
--- Folders/src/applet-notifications.c 2010-09-07 00:39:20 +0000
+++ Folders/src/applet-notifications.c 2010-09-22 10:43:43 +0000
@@ -51,10 +51,10 @@
}
else if (CD_APPLET_CLICKED_ICON != NULL)
{
- g_print ("clic on %s\n", CD_APPLET_CLICKED_ICON->cBaseURI);
+ //g_print ("clic on %s\n", CD_APPLET_CLICKED_ICON->cBaseURI);
if (CD_APPLET_CLICKED_ICON->iVolumeID == -1)
{
- g_print ("folder\n");
+ //g_print ("folder\n");
/// lister le repertoire dans un thread.
@@ -350,7 +350,7 @@
app[1] = CD_APPLET_CLICKED_CONTAINER;
app[2] = myApplet;
app[3] = g_strdup (pAppInfo[1]);
- g_print (" + %s (%s ; %s)\n", pAppInfo[0], pAppInfo[1], pAppInfo[2]);
+ //g_print (" + %s (%s ; %s)\n", pAppInfo[0], pAppInfo[1], pAppInfo[2]);
myData.pAppList = g_list_prepend (myData.pAppList, app);
if (pAppInfo[2] != NULL)
@@ -364,7 +364,7 @@
g_list_free (pApps);
}
else
- g_print ("no apps list for '%s'\n", CD_APPLET_CLICKED_ICON->cBaseURI);
+ //g_print ("no apps list for '%s'\n", CD_APPLET_CLICKED_ICON->cBaseURI);
CD_APPLET_ADD_SEPARATOR_IN_MENU (CD_APPLET_MY_MENU);
CD_APPLET_ADD_IN_MENU_WITH_STOCK_AND_DATA (D_("Properties"), GTK_STOCK_PROPERTIES, _cd_folders_show_file_properties, CD_APPLET_MY_MENU, data);
@@ -381,7 +381,7 @@
gboolean cd_folders_on_drop_data (gpointer data, const gchar *cReceivedData, Icon *icon, double fOrder, CairoContainer *pContainer)
{
- g_print ("Folders received '%s'\n", cReceivedData);
+ //g_print ("Folders received '%s'\n", cReceivedData);
if (fOrder == CAIRO_DOCK_LAST_ORDER) // lachage sur une icone.
return CAIRO_DOCK_LET_PASS_NOTIFICATION;
@@ -394,7 +394,7 @@
if (g_file_test (cPath, G_FILE_TEST_IS_DIR))
{
- g_print (" ajout d'un repertoire...\n");
+ //g_print (" ajout d'un repertoire...\n");
CairoDockModule *pModule = cairo_dock_find_module_from_name ("Folders");
g_return_val_if_fail (pModule != NULL, CAIRO_DOCK_LET_PASS_NOTIFICATION);
=== modified file 'GMenu/src/applet-util.c'
--- GMenu/src/applet-util.c 2010-08-07 01:43:25 +0000
+++ GMenu/src/applet-util.c 2010-09-22 10:43:43 +0000
@@ -188,7 +188,7 @@
else
cCommandExpanded = g_strdup (cCommand);
#endif //CD_EXPAND_FIELD_CODES
- g_print ("cCommandExpanded : %s\n", cCommandExpanded);
+ //g_print ("cCommandExpanded : %s\n", cCommandExpanded);
return cCommandExpanded;
}
static void _launch_from_file (const gchar *cDesktopFilePath)
=== modified file 'MeMenu/src/applet-me.c'
--- MeMenu/src/applet-me.c 2010-08-07 01:43:25 +0000
+++ MeMenu/src/applet-me.c 2010-09-22 10:43:43 +0000
@@ -46,14 +46,14 @@
static void
username_cb (DBusGProxy * proxy, const char * username, GError *error, CairoDockModuleInstance *myApplet)
{
- g_print (" + new username: '%s'\n", username);
+ //g_print (" + new username: '%s'\n", username);
CD_APPLET_SET_NAME_FOR_MY_ICON (username); // username peut etre NULL ou vide, c'est pas genant.
}
static void
username_changed (DBusGProxy * proxy, gchar * username, CairoDockModuleInstance *myApplet)
{
- g_print ("Changing username: '%s'\n", username);
+ //g_print ("Changing username: '%s'\n", username);
return username_cb(proxy, username, NULL, myApplet);
}
@@ -63,7 +63,7 @@
{
g_return_if_fail(icons != NULL);
g_return_if_fail(icons[0] != '\0');
- g_print (" + new icon: '%s'\n", icons);
+ //g_print (" + new icon: '%s'\n", icons);
cd_indicator_set_icon (myData.pIndicator, icons);
CD_APPLET_REDRAW_MY_ICON;
@@ -74,7 +74,7 @@
static void
status_icon_changed (DBusGProxy * proxy, gchar * icon, CairoDockModuleInstance *myApplet)
{
- g_print ("Changing status icon: '%s'\n", icon);
+ //g_print ("Changing status icon: '%s'\n", icon);
return status_icon_cb(proxy, icon, NULL, myApplet);
}
=== modified file 'MeMenu/src/applet-menu.c'
--- MeMenu/src/applet-menu.c 2010-08-07 01:43:25 +0000
+++ MeMenu/src/applet-menu.c 2010-09-22 10:43:43 +0000
@@ -56,7 +56,7 @@
g_value_init (&value, G_TYPE_STRING);
g_value_set_static_string (&value, gtk_entry_get_text (entry));
- g_print ("user typed: %s\n", g_value_get_string (&value));
+ //g_print ("user typed: %s\n", g_value_get_string (&value));
dbusmenu_menuitem_handle_event (mi, "send", &value, gtk_get_current_event_time());
}
=== modified file 'Messaging-Menu/src/applet-menu.c'
--- Messaging-Menu/src/applet-menu.c 2010-08-07 01:43:25 +0000
+++ Messaging-Menu/src/applet-menu.c 2010-09-22 10:43:43 +0000
@@ -67,7 +67,7 @@
static gboolean
new_application_item (DbusmenuMenuitem * newitem, DbusmenuMenuitem * parent, DbusmenuClient * client)
{
- g_print ("%s ()\n", __func__);
+ //g_print ("%s ()\n", __func__);
GtkMenuItem * gmi = GTK_MENU_ITEM(gtk_image_menu_item_new());
gint padding = 4;
@@ -86,7 +86,7 @@
gtk_widget_show(icon);
/* Application name in a label */
- g_print (" name : %s\n", dbusmenu_menuitem_property_get(newitem, APPLICATION_MENUITEM_PROP_NAME));
+ //g_print (" name : %s\n", dbusmenu_menuitem_property_get(newitem, APPLICATION_MENUITEM_PROP_NAME));
GtkWidget * label = gtk_label_new(dbusmenu_menuitem_property_get(newitem, APPLICATION_MENUITEM_PROP_NAME));
gtk_misc_set_alignment(GTK_MISC(label), 0.0, 0.5);
gtk_box_pack_start(GTK_BOX(hbox), label, TRUE, TRUE, padding);
@@ -131,7 +131,7 @@
static void
indicator_prop_change_cb (DbusmenuMenuitem * mi, gchar * prop, GValue * value, indicator_item_t * mi_data)
{
- g_print ("%s (%s)\n", __func__, prop);
+ //g_print ("%s (%s)\n", __func__, prop);
if (!g_strcmp0(prop, INDICATOR_MENUITEM_PROP_LABEL)) {
/* Set the main label */
gtk_label_set_text(GTK_LABEL(mi_data->label), g_value_get_string(value));
@@ -180,7 +180,7 @@
static gboolean
new_indicator_item (DbusmenuMenuitem * newitem, DbusmenuMenuitem * parent, DbusmenuClient * client)
{
- g_print ("%s ()\n", __func__);
+ //g_print ("%s ()\n", __func__);
g_return_val_if_fail(DBUSMENU_IS_MENUITEM(newitem), FALSE);
g_return_val_if_fail(DBUSMENU_IS_GTKCLIENT(client), FALSE);
/* Note: not checking parent, it's reasonable for it to be NULL */
=== modified file 'Messaging-Menu/src/applet-messaging.c'
--- Messaging-Menu/src/applet-messaging.c 2010-08-07 01:43:25 +0000
+++ Messaging-Menu/src/applet-messaging.c 2010-09-22 10:43:43 +0000
@@ -38,7 +38,7 @@
static void
attention_changed_cb (DBusGProxy * proxy, gboolean dot, CairoDockModuleInstance *myApplet)
{
- g_print ("%s (attention : %d)\n", __func__, dot);
+ //g_print ("%s (attention : %d)\n", __func__, dot);
if (dot)
{
cd_indicator_set_icon (myData.pIndicator, "indicator-messages-new");
@@ -58,7 +58,7 @@
static void
icon_changed_cb (DBusGProxy * proxy, gboolean hidden, CairoDockModuleInstance *myApplet)
{
- g_print ("%s (hidden : %d)\n", __func__, hidden);
+ //g_print ("%s (hidden : %d)\n", __func__, hidden);
if (hidden)
{
myIcon->fAlpha = .5;
@@ -116,7 +116,7 @@
void cd_messaging_on_disconnect (CairoDockModuleInstance *myApplet)
{
- g_print ("disconnected\n");
+ //g_print ("disconnected\n");
cd_indicator_set_icon (myData.pIndicator, DEFAULT_ICON); // If we're disconnecting, go back to offline.
}
=== added directory 'Remote-Control'
=== added file 'Remote-Control/CMakeLists.txt'
--- Remote-Control/CMakeLists.txt 1970-01-01 00:00:00 +0000
+++ Remote-Control/CMakeLists.txt 2010-09-22 10:43:43 +0000
@@ -0,0 +1,2 @@
+add_subdirectory(src)
+add_subdirectory(data)
=== added directory 'Remote-Control/data'
=== added file 'Remote-Control/data/CMakeLists.txt'
--- Remote-Control/data/CMakeLists.txt 1970-01-01 00:00:00 +0000
+++ Remote-Control/data/CMakeLists.txt 2010-09-22 10:43:43 +0000
@@ -0,0 +1,11 @@
+########### subdirs if any ###############
+
+
+########### install files ###############
+
+install (FILES ${CMAKE_CURRENT_BINARY_DIR}/Remote-Control.conf
+ preview.jpg
+ icon.png
+ arrows.svg
+ DESTINATION ${remote_controldatadir})
+
=== added file 'Remote-Control/data/Remote-Control.conf.in'
--- Remote-Control/data/Remote-Control.conf.in 1970-01-01 00:00:00 +0000
+++ Remote-Control/data/Remote-Control.conf.in 2010-09-22 10:43:43 +0000
@@ -0,0 +1,14 @@
+#!en;@VERSION_REMOTE_CONTROL@
+
+#[gtk-preferences]
+[Configuration]
+
+#k Shortkey to trigger the applet:
+shortkey = <Control>F9
+
+#a+ Animation of the current icon :
+animation=pulse
+
+#I[0;2000] Duration of the stop animation :
+#{In ms.}
+stop duration = 800
=== added file 'Remote-Control/data/arrows.svg'
--- Remote-Control/data/arrows.svg 1970-01-01 00:00:00 +0000
+++ Remote-Control/data/arrows.svg 2010-09-22 10:43:43 +0000
@@ -0,0 +1,289 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+<svg
+ xmlns:dc="http://purl.org/dc/elements/1.1/";
+ xmlns:cc="http://creativecommons.org/ns#";
+ xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#";
+ xmlns:svg="http://www.w3.org/2000/svg";
+ xmlns="http://www.w3.org/2000/svg";
+ xmlns:xlink="http://www.w3.org/1999/xlink";
+ xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd";
+ xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape";
+ width="128"
+ height="128"
+ id="svg2391"
+ sodipodi:version="0.32"
+ inkscape:version="0.46"
+ version="1.0"
+ sodipodi:docname="arrows.svg"
+ inkscape:output_extension="org.inkscape.output.svg.inkscape">
+ <defs
+ id="defs2393">
+ <linearGradient
+ id="linearGradient2076">
+ <stop
+ id="stop2078"
+ offset="0.0000000"
+ style="stop-color:#afd9ed;stop-opacity:1.0000000;" />
+ <stop
+ id="stop2080"
+ offset="1.0000000"
+ style="stop-color:#cfc3db;stop-opacity:1.0000000;" />
+ </linearGradient>
+ <linearGradient
+ gradientTransform="matrix(-1.186331,0,0,-0.780016,61.16353,67.13542)"
+ gradientUnits="userSpaceOnUse"
+ id="linearGradient2082"
+ x1="12.615197"
+ x2="48.374069"
+ xlink:href="#linearGradient2076"
+ y1="25.909756"
+ y2="62.720371" />
+ <linearGradient
+ id="linearGradient2088">
+ <stop
+ id="stop2090"
+ offset="0.0000000"
+ style="stop-color:#87a8b7;stop-opacity:1.0000000;" />
+ <stop
+ id="stop2092"
+ offset="1.0000000"
+ style="stop-color:#7f718e;stop-opacity:1.0000000;" />
+ </linearGradient>
+ <linearGradient
+ gradientTransform="matrix(-1.186331,0,0,-0.780016,63.3302,67.13542)"
+ gradientUnits="userSpaceOnUse"
+ id="linearGradient2086"
+ x1="12.615197"
+ x2="48.374069"
+ xlink:href="#linearGradient2088"
+ y1="25.909756"
+ y2="62.720371" />
+ <inkscape:perspective
+ sodipodi:type="inkscape:persp3d"
+ inkscape:vp_x="0 : 526.18109 : 1"
+ inkscape:vp_y="0 : 1000 : 0"
+ inkscape:vp_z="744.09448 : 526.18109 : 1"
+ inkscape:persp3d-origin="372.04724 : 350.78739 : 1"
+ id="perspective2399" />
+ <linearGradient
+ inkscape:collect="always"
+ xlink:href="#linearGradient2088"
+ id="linearGradient2420"
+ gradientUnits="userSpaceOnUse"
+ gradientTransform="matrix(-1.186331,0,0,-0.780016,63.3302,67.13542)"
+ x1="12.615197"
+ y1="25.909756"
+ x2="48.374069"
+ y2="62.720371" />
+ <linearGradient
+ inkscape:collect="always"
+ xlink:href="#linearGradient2076"
+ id="linearGradient2422"
+ gradientUnits="userSpaceOnUse"
+ gradientTransform="matrix(-1.186331,0,0,-0.780016,61.16353,67.13542)"
+ x1="12.615197"
+ y1="25.909756"
+ x2="48.374069"
+ y2="62.720371" />
+ <linearGradient
+ inkscape:collect="always"
+ xlink:href="#linearGradient2088"
+ id="linearGradient2434"
+ gradientUnits="userSpaceOnUse"
+ gradientTransform="matrix(-1.186331,0,0,-0.780016,63.3302,67.13542)"
+ x1="12.615197"
+ y1="25.909756"
+ x2="48.374069"
+ y2="62.720371" />
+ <linearGradient
+ inkscape:collect="always"
+ xlink:href="#linearGradient2076"
+ id="linearGradient2436"
+ gradientUnits="userSpaceOnUse"
+ gradientTransform="matrix(-1.186331,0,0,-0.780016,61.16353,67.13542)"
+ x1="12.615197"
+ y1="25.909756"
+ x2="48.374069"
+ y2="62.720371" />
+ <linearGradient
+ inkscape:collect="always"
+ xlink:href="#linearGradient2088"
+ id="linearGradient2448"
+ gradientUnits="userSpaceOnUse"
+ gradientTransform="matrix(-1.186331,0,0,-0.780016,63.3302,67.13542)"
+ x1="12.615197"
+ y1="25.909756"
+ x2="48.374069"
+ y2="62.720371" />
+ <linearGradient
+ inkscape:collect="always"
+ xlink:href="#linearGradient2076"
+ id="linearGradient2450"
+ gradientUnits="userSpaceOnUse"
+ gradientTransform="matrix(-1.186331,0,0,-0.780016,61.16353,67.13542)"
+ x1="12.615197"
+ y1="25.909756"
+ x2="48.374069"
+ y2="62.720371" />
+ <linearGradient
+ inkscape:collect="always"
+ xlink:href="#linearGradient2088"
+ id="linearGradient2462"
+ gradientUnits="userSpaceOnUse"
+ gradientTransform="matrix(-1.186331,0,0,-0.780016,63.3302,67.13542)"
+ x1="12.615197"
+ y1="25.909756"
+ x2="48.374069"
+ y2="62.720371" />
+ <linearGradient
+ inkscape:collect="always"
+ xlink:href="#linearGradient2076"
+ id="linearGradient2464"
+ gradientUnits="userSpaceOnUse"
+ gradientTransform="matrix(-1.186331,0,0,-0.780016,61.16353,67.13542)"
+ x1="12.615197"
+ y1="25.909756"
+ x2="48.374069"
+ y2="62.720371" />
+ </defs>
+ <sodipodi:namedview
+ id="base"
+ pagecolor="#ffffff"
+ bordercolor="#666666"
+ borderopacity="1.0"
+ inkscape:pageopacity="0.0"
+ inkscape:pageshadow="2"
+ inkscape:zoom="1.3277206"
+ inkscape:cx="117.47785"
+ inkscape:cy="-15.977159"
+ inkscape:document-units="px"
+ inkscape:current-layer="layer1"
+ showgrid="false"
+ showguides="true"
+ inkscape:guide-bbox="true"
+ inkscape:window-width="641"
+ inkscape:window-height="719"
+ inkscape:window-x="293"
+ inkscape:window-y="0" />
+ <metadata
+ id="metadata2396">
+ <rdf:RDF>
+ <cc:Work
+ rdf:about="">
+ <dc:format>image/svg+xml</dc:format>
+ <dc:type
+ rdf:resource="http://purl.org/dc/dcmitype/StillImage"; />
+ </cc:Work>
+ </rdf:RDF>
+ </metadata>
+ <g
+ inkscape:label="Calque 1"
+ inkscape:groupmode="layer"
+ id="layer1">
+ <g
+ id="g2409"
+ transform="matrix(0,0.8161651,-1.764176,0,125.43391,77.398373)">
+ <path
+ d="M 32.186126,52.104166 C 32.931029,52.568927 46.362619,43.287677 47.107522,42.822916 C 47.852425,42.358155 62,34.471188 62,33.541666 C 62,32.612144 47.852425,24.693927 47.107522,24.229166 C 46.362619,23.764405 32.931028,14.483154 32.186126,14.947916 C 31.736229,15.228616 31.839046,20.824428 31.983704,26.041666 L 5.900179,26.041666 C 5.643855,26.041666 5.4375,26.264666 5.4375,26.541666 L 5.4375,40.541666 C 5.4375,40.818666 5.643855,41.041666 5.900179,41.041666 L 31.983704,41.041666 C 31.839045,46.258903 31.73623,51.823466 32.186126,52.104166 z"
+ id="path2084"
+ style="fill:url(#linearGradient2420);fill-opacity:1;stroke:none;stroke-width:0.375;stroke-miterlimit:4;stroke-opacity:1" />
+ <path
+ d="M 30.019459,52.104166 C 30.764362,52.568927 44.195952,43.287677 44.940855,42.822916 C 45.685758,42.358155 59.833333,34.471188 59.833333,33.541666 C 59.833333,32.612144 45.685758,24.693927 44.940855,24.229166 C 44.195952,23.764405 30.764361,14.483154 30.019459,14.947916 C 29.569562,15.228616 29.672379,20.824428 29.817037,26.041666 L 3.733512,26.041666 C 3.477188,26.041666 3.270833,26.264666 3.270833,26.541666 L 3.270833,40.541666 C 3.270833,40.818666 3.477188,41.041666 3.733512,41.041666 L 29.817037,41.041666 C 29.672378,46.258903 29.569563,51.823466 30.019459,52.104166 z"
+ id="rect1303"
+ style="fill:url(#linearGradient2422);fill-opacity:1;stroke:none;stroke-width:0.375;stroke-miterlimit:4;stroke-opacity:1" />
+ <path
+ d="M 56,32.498092 C 56,32.498092 46.143163,28.758884 45.393163,27.459846 C 44.643163,26.160808 31.765602,20.067541 32.131627,18.701516 C 32.497652,17.33549 43.893163,24.86177 43.893163,24.86177 C 43.893163,24.86177 52.611644,28.295956 56,32.498092 z"
+ id="path2096"
+ style="fill:#d0f1fc;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
+ <rect
+ height="1"
+ id="rect2098"
+ rx="0.5"
+ ry="0.5"
+ style="fill:#d0f1fc;fill-opacity:1;stroke:none;stroke-width:0.375;stroke-miterlimit:4;stroke-opacity:1"
+ transform="scale(-1,-1)"
+ width="23"
+ x="-27.270832"
+ y="-28" />
+ </g>
+ <g
+ id="g2424"
+ transform="matrix(0,-0.8161651,-1.6782543,0,122.04356,52.382073)">
+ <path
+ d="M 32.186126,52.104166 C 32.931029,52.568927 46.362619,43.287677 47.107522,42.822916 C 47.852425,42.358155 62,34.471188 62,33.541666 C 62,32.612144 47.852425,24.693927 47.107522,24.229166 C 46.362619,23.764405 32.931028,14.483154 32.186126,14.947916 C 31.736229,15.228616 31.839046,20.824428 31.983704,26.041666 L 5.900179,26.041666 C 5.643855,26.041666 5.4375,26.264666 5.4375,26.541666 L 5.4375,40.541666 C 5.4375,40.818666 5.643855,41.041666 5.900179,41.041666 L 31.983704,41.041666 C 31.839045,46.258903 31.73623,51.823466 32.186126,52.104166 z"
+ id="path2426"
+ style="fill:url(#linearGradient2434);fill-opacity:1;stroke:none;stroke-width:0.375;stroke-miterlimit:4;stroke-opacity:1" />
+ <path
+ d="M 30.019459,52.104166 C 30.764362,52.568927 44.195952,43.287677 44.940855,42.822916 C 45.685758,42.358155 59.833333,34.471188 59.833333,33.541666 C 59.833333,32.612144 45.685758,24.693927 44.940855,24.229166 C 44.195952,23.764405 30.764361,14.483154 30.019459,14.947916 C 29.569562,15.228616 29.672379,20.824428 29.817037,26.041666 L 3.733512,26.041666 C 3.477188,26.041666 3.270833,26.264666 3.270833,26.541666 L 3.270833,40.541666 C 3.270833,40.818666 3.477188,41.041666 3.733512,41.041666 L 29.817037,41.041666 C 29.672378,46.258903 29.569563,51.823466 30.019459,52.104166 z"
+ id="path2428"
+ style="fill:url(#linearGradient2436);fill-opacity:1;stroke:none;stroke-width:0.375;stroke-miterlimit:4;stroke-opacity:1" />
+ <path
+ d="M 56,32.498092 C 56,32.498092 46.143163,28.758884 45.393163,27.459846 C 44.643163,26.160808 31.765602,20.067541 32.131627,18.701516 C 32.497652,17.33549 43.893163,24.86177 43.893163,24.86177 C 43.893163,24.86177 52.611644,28.295956 56,32.498092 z"
+ id="path2430"
+ style="fill:#d0f1fc;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
+ <rect
+ height="1"
+ id="rect2432"
+ rx="0.5"
+ ry="0.5"
+ style="fill:#d0f1fc;fill-opacity:1;stroke:none;stroke-width:0.375;stroke-miterlimit:4;stroke-opacity:1"
+ transform="scale(-1,-1)"
+ width="23"
+ x="-27.270832"
+ y="-28" />
+ </g>
+ <g
+ id="g2438"
+ transform="matrix(-0.8161651,0,0,-1.6496137,51.134197,122.05924)">
+ <path
+ d="M 32.186126,52.104166 C 32.931029,52.568927 46.362619,43.287677 47.107522,42.822916 C 47.852425,42.358155 62,34.471188 62,33.541666 C 62,32.612144 47.852425,24.693927 47.107522,24.229166 C 46.362619,23.764405 32.931028,14.483154 32.186126,14.947916 C 31.736229,15.228616 31.839046,20.824428 31.983704,26.041666 L 5.900179,26.041666 C 5.643855,26.041666 5.4375,26.264666 5.4375,26.541666 L 5.4375,40.541666 C 5.4375,40.818666 5.643855,41.041666 5.900179,41.041666 L 31.983704,41.041666 C 31.839045,46.258903 31.73623,51.823466 32.186126,52.104166 z"
+ id="path2440"
+ style="fill:url(#linearGradient2448);fill-opacity:1;stroke:none;stroke-width:0.375;stroke-miterlimit:4;stroke-opacity:1" />
+ <path
+ d="M 30.019459,52.104166 C 30.764362,52.568927 44.195952,43.287677 44.940855,42.822916 C 45.685758,42.358155 59.833333,34.471188 59.833333,33.541666 C 59.833333,32.612144 45.685758,24.693927 44.940855,24.229166 C 44.195952,23.764405 30.764361,14.483154 30.019459,14.947916 C 29.569562,15.228616 29.672379,20.824428 29.817037,26.041666 L 3.733512,26.041666 C 3.477188,26.041666 3.270833,26.264666 3.270833,26.541666 L 3.270833,40.541666 C 3.270833,40.818666 3.477188,41.041666 3.733512,41.041666 L 29.817037,41.041666 C 29.672378,46.258903 29.569563,51.823466 30.019459,52.104166 z"
+ id="path2442"
+ style="fill:url(#linearGradient2450);fill-opacity:1;stroke:none;stroke-width:0.375;stroke-miterlimit:4;stroke-opacity:1" />
+ <path
+ d="M 56,32.498092 C 56,32.498092 46.143163,28.758884 45.393163,27.459846 C 44.643163,26.160808 31.765602,20.067541 32.131627,18.701516 C 32.497652,17.33549 43.893163,24.86177 43.893163,24.86177 C 43.893163,24.86177 52.611644,28.295956 56,32.498092 z"
+ id="path2444"
+ style="fill:#d0f1fc;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
+ <rect
+ height="1"
+ id="rect2446"
+ rx="0.5"
+ ry="0.5"
+ style="fill:#d0f1fc;fill-opacity:1;stroke:none;stroke-width:0.375;stroke-miterlimit:4;stroke-opacity:1"
+ transform="scale(-1,-1)"
+ width="23"
+ x="-27.270832"
+ y="-28" />
+ </g>
+ <g
+ id="g2452"
+ transform="matrix(0.8161651,0,0,-1.6496137,77.748214,121.52667)">
+ <path
+ d="M 32.186126,52.104166 C 32.931029,52.568927 46.362619,43.287677 47.107522,42.822916 C 47.852425,42.358155 62,34.471188 62,33.541666 C 62,32.612144 47.852425,24.693927 47.107522,24.229166 C 46.362619,23.764405 32.931028,14.483154 32.186126,14.947916 C 31.736229,15.228616 31.839046,20.824428 31.983704,26.041666 L 5.900179,26.041666 C 5.643855,26.041666 5.4375,26.264666 5.4375,26.541666 L 5.4375,40.541666 C 5.4375,40.818666 5.643855,41.041666 5.900179,41.041666 L 31.983704,41.041666 C 31.839045,46.258903 31.73623,51.823466 32.186126,52.104166 z"
+ id="path2454"
+ style="fill:url(#linearGradient2462);fill-opacity:1;stroke:none;stroke-width:0.375;stroke-miterlimit:4;stroke-opacity:1" />
+ <path
+ d="M 30.019459,52.104166 C 30.764362,52.568927 44.195952,43.287677 44.940855,42.822916 C 45.685758,42.358155 59.833333,34.471188 59.833333,33.541666 C 59.833333,32.612144 45.685758,24.693927 44.940855,24.229166 C 44.195952,23.764405 30.764361,14.483154 30.019459,14.947916 C 29.569562,15.228616 29.672379,20.824428 29.817037,26.041666 L 3.733512,26.041666 C 3.477188,26.041666 3.270833,26.264666 3.270833,26.541666 L 3.270833,40.541666 C 3.270833,40.818666 3.477188,41.041666 3.733512,41.041666 L 29.817037,41.041666 C 29.672378,46.258903 29.569563,51.823466 30.019459,52.104166 z"
+ id="path2456"
+ style="fill:url(#linearGradient2464);fill-opacity:1;stroke:none;stroke-width:0.375;stroke-miterlimit:4;stroke-opacity:1" />
+ <path
+ d="M 56,32.498092 C 56,32.498092 46.143163,28.758884 45.393163,27.459846 C 44.643163,26.160808 31.765602,20.067541 32.131627,18.701516 C 32.497652,17.33549 43.893163,24.86177 43.893163,24.86177 C 43.893163,24.86177 52.611644,28.295956 56,32.498092 z"
+ id="path2458"
+ style="fill:#d0f1fc;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
+ <rect
+ height="1"
+ id="rect2460"
+ rx="0.5"
+ ry="0.5"
+ style="fill:#d0f1fc;fill-opacity:1;stroke:none;stroke-width:0.375;stroke-miterlimit:4;stroke-opacity:1"
+ transform="scale(-1,-1)"
+ width="23"
+ x="-27.270832"
+ y="-28" />
+ </g>
+ </g>
+</svg>
=== added file 'Remote-Control/data/icon.png'
Binary files Remote-Control/data/icon.png 1970-01-01 00:00:00 +0000 and Remote-Control/data/icon.png 2010-09-22 10:43:43 +0000 differ
=== added file 'Remote-Control/data/preview.jpg'
Binary files Remote-Control/data/preview.jpg 1970-01-01 00:00:00 +0000 and Remote-Control/data/preview.jpg 2010-09-22 10:43:43 +0000 differ
=== added directory 'Remote-Control/src'
=== added file 'Remote-Control/src/CMakeLists.txt'
--- Remote-Control/src/CMakeLists.txt 1970-01-01 00:00:00 +0000
+++ Remote-Control/src/CMakeLists.txt 2010-09-22 10:43:43 +0000
@@ -0,0 +1,40 @@
+
+########### sources ###############
+
+SET(MODULE_SRCS
+ applet-struct.h
+ applet-init.c applet-init.h
+ applet-config.c applet-config.h
+ applet-session.c applet-session.h
+ applet-icon-finder.c applet-icon-finder.h
+ applet-notifications.c applet-notifications.h
+)
+
+add_library(${PACKAGE_REMOTE_CONTROL} SHARED ${MODULE_SRCS})
+
+########### compil ###############
+add_definitions (-DMY_APPLET_SHARE_DATA_DIR="${remote_controldatadir}")
+add_definitions (-DMY_APPLET_PREVIEW_FILE="preview.jpg")
+add_definitions (-DMY_APPLET_CONF_FILE="Remote-Control.conf")
+add_definitions (-DMY_APPLET_USER_DATA_DIR="Remote-Control")
+add_definitions (-DMY_APPLET_VERSION="${VERSION_REMOTE_CONTROL}")
+add_definitions (-DMY_APPLET_GETTEXT_DOMAIN="${GETTEXT_REMOTE_CONTROL}")
+add_definitions (-DMY_APPLET_DOCK_VERSION="${dock_version}")
+add_definitions (-DMY_APPLET_ICON_FILE="icon.png")
+### 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.
+#add_definitions (-DGL_GLEXT_PROTOTYPES="1")
+
+include_directories (
+ ${PACKAGE_INCLUDE_DIRS})
+
+link_directories (
+ ${PACKAGE_LIBRARY_DIRS})
+
+target_link_libraries (${PACKAGE_REMOTE_CONTROL}
+ ${PACKAGE_LIBRARIES})
+
+########### install files ###############
+
+install(TARGETS ${PACKAGE_REMOTE_CONTROL} DESTINATION ${pluginsdir})
=== added file 'Remote-Control/src/applet-config.c'
--- Remote-Control/src/applet-config.c 1970-01-01 00:00:00 +0000
+++ Remote-Control/src/applet-config.c 2010-09-22 10:43:43 +0000
@@ -0,0 +1,51 @@
+/**
+* This file is a part of the Cairo-Dock project
+*
+* Copyright : (C) see the 'copyright' file.
+* E-mail : see the 'copyright' file.
+*
+* This program is free software; you can redistribute it and/or
+* modify it under the terms of the GNU General Public License
+* as published by the Free Software Foundation; either version 3
+* of the License, or (at your option) any later version.
+*
+* This program is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+* GNU General Public License for more details.
+* You should have received a copy of the GNU General Public License
+* along with this program. If not, see <http://www.gnu.org/licenses/>.
+*/
+
+#include <string.h>
+#include <cairo-dock.h>
+
+#include "applet-struct.h"
+#include "applet-notifications.h"
+#include "applet-config.h"
+
+
+//\_________________ Here you have to get all your parameters from the conf file. Use the macros CD_CONFIG_GET_BOOLEAN, CD_CONFIG_GET_INTEGER, CD_CONFIG_GET_STRING, etc. myConfig has been reseted to 0 at this point. This function is called at the beginning of init and reload.
+CD_APPLET_GET_CONFIG_BEGIN
+ myConfig.cShortkeyNav = CD_CONFIG_GET_STRING ("Configuration", "shortkey");
+ myConfig.iCloseDuration = CD_CONFIG_GET_INTEGER ("Configuration", "stop duration");
+ myConfig.cIconAnimation = CD_CONFIG_GET_STRING ("Configuration", "animation");
+
+CD_APPLET_GET_CONFIG_END
+
+
+//\_________________ Here you have to free all ressources allocated for myConfig. This one will be reseted to 0 at the end of this function. This function is called right before you get the applet's config, and when your applet is stopped, in the end.
+CD_APPLET_RESET_CONFIG_BEGIN
+ if (myConfig.cShortkeyNav)
+ {
+ cd_keybinder_unbind (myConfig.cShortkeyNav, (CDBindkeyHandler) cd_do_on_shortkey_nav);
+ g_free (myConfig.cShortkeyNav);
+ }
+
+CD_APPLET_RESET_CONFIG_END
+
+
+//\_________________ Here you have to free all ressources allocated for myData. This one will be reseted to 0 at the end of this function. This function is called when your applet is stopped, in the very end.
+CD_APPLET_RESET_DATA_BEGIN
+
+CD_APPLET_RESET_DATA_END
=== added file 'Remote-Control/src/applet-config.h'
--- Remote-Control/src/applet-config.h 1970-01-01 00:00:00 +0000
+++ Remote-Control/src/applet-config.h 2010-09-22 10:43:43 +0000
@@ -0,0 +1,30 @@
+/**
+* This file is a part of the Cairo-Dock project
+*
+* Copyright : (C) see the 'copyright' file.
+* E-mail : see the 'copyright' file.
+*
+* This program is free software; you can redistribute it and/or
+* modify it under the terms of the GNU General Public License
+* as published by the Free Software Foundation; either version 3
+* of the License, or (at your option) any later version.
+*
+* This program is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+* GNU General Public License for more details.
+* You should have received a copy of the GNU General Public License
+* along with this program. If not, see <http://www.gnu.org/licenses/>.
+*/
+
+
+#ifndef __APPLET_CONFIG__
+#define __APPLET_CONFIG__
+
+#include <cairo-dock.h>
+
+
+CD_APPLET_CONFIG_H
+
+
+#endif
=== added file 'Remote-Control/src/applet-icon-finder.c'
--- Remote-Control/src/applet-icon-finder.c 1970-01-01 00:00:00 +0000
+++ Remote-Control/src/applet-icon-finder.c 2010-09-22 10:43:43 +0000
@@ -0,0 +1,257 @@
+/**
+* This file is a part of the Cairo-Dock project
+*
+* Copyright : (C) see the 'copyright' file.
+* E-mail : see the 'copyright' file.
+*
+* This program is free software; you can redistribute it and/or
+* modify it under the terms of the GNU General Public License
+* as published by the Free Software Foundation; either version 3
+* of the License, or (at your option) any later version.
+*
+* This program is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+* GNU General Public License for more details.
+* You should have received a copy of the GNU General Public License
+* along with this program. If not, see <http://www.gnu.org/licenses/>.
+*/
+
+#include <stdlib.h>
+#include <string.h>
+
+#include "applet-struct.h"
+#include "applet-session.h"
+#include "applet-notifications.h"
+#include "applet-icon-finder.h"
+
+static inline gboolean _cd_do_icon_match (Icon *pIcon, const gchar *cCommandPrefix, int length)
+{
+ gboolean bMatch = FALSE;
+ if (pIcon->cBaseURI != NULL)
+ {
+ gchar *cFile = g_path_get_basename (pIcon->cCommand);
+ bMatch = (cFile && g_ascii_strncasecmp (cCommandPrefix, cFile, length) == 0);
+ g_free (cFile);
+ }
+ else if (pIcon->cCommand)
+ {
+ bMatch = (g_ascii_strncasecmp (cCommandPrefix, pIcon->cCommand, length) == 0);
+ if (!bMatch)
+ {
+ gchar *str = strchr (pIcon->cCommand, '-'); // on se limite au 1er tiret.
+ if (str && *(str-1) != ' ') // on verifie qu'il n'est pas un tiret d'option
+ {
+ str ++;
+ bMatch = (g_strncasecmp (str, cCommandPrefix, length) == 0);
+ }
+ if (!bMatch && pIcon->cName)
+ bMatch = (g_ascii_strncasecmp (cCommandPrefix, pIcon->cName, length) == 0);
+ }
+ }
+ return bMatch;
+}
+
+static void _find_icon_in_dock_with_command (Icon *pIcon, CairoDock *pDock, gpointer *data)
+{
+ gchar *cCommandPrefix = data[0];
+ int length = GPOINTER_TO_INT (data[1]);
+ Icon *pAfterIcon = data[2];
+ Icon **pFoundIcon = data[3];
+ CairoDock **pFoundDock = data[4];
+ Icon **pFirstIcon = data[5];
+ CairoDock **pFirstParentDock = data[6];
+ if (pDock == g_pMainDock || *pFoundIcon != NULL) // on a deja cherche dans le main dock, ou deja trouve ce qu'on cherchait.
+ return ;
+
+ gboolean bFound = _cd_do_icon_match (pIcon, cCommandPrefix, length);
+ if (bFound)
+ {
+ if (pAfterIcon == NULL)
+ {
+ *pFoundIcon = pIcon;
+ *pFoundDock = pDock;
+ }
+ else
+ {
+ if (*pFirstIcon == NULL) // on garde une trace de la 1ere icone pour boucler dans la liste.
+ {
+ *pFirstIcon = pIcon;
+ *pFirstParentDock = g_pMainDock;
+ }
+ if (pIcon == pAfterIcon)
+ {
+ data[2] = NULL;
+ }
+ }
+ }
+}
+Icon *cd_do_search_icon_by_command (const gchar *cCommandPrefix, Icon *pAfterIcon, CairoDock **pDock)
+{
+ g_return_val_if_fail (cCommandPrefix != NULL, NULL);
+
+ //\_________________ on cherche en premier dans le main dock, car il est deja visible.
+ int length = strlen (cCommandPrefix);
+ Icon *pIcon, *pFirstIcon = NULL;
+ CairoDock *pParentDock, *pFirstParentDock = NULL;
+ GList *ic;
+ for (ic = g_pMainDock->icons; ic != NULL; ic = ic->next)
+ {
+ pIcon = ic->data;
+ if (pIcon->cCommand && g_ascii_strncasecmp (cCommandPrefix, pIcon->cCommand, length) == 0)
+ {
+ if (pAfterIcon == NULL)
+ {
+ *pDock = g_pMainDock;
+ return pIcon;
+ }
+ else
+ {
+ if (pFirstIcon == NULL) // on garde une trace de la 1ere icone pour boucler dans la liste.
+ {
+ pFirstIcon = pIcon;
+ pFirstParentDock = g_pMainDock;
+ }
+ if (pIcon == pAfterIcon)
+ {
+ pAfterIcon = NULL;
+ }
+ }
+ }
+ }
+
+ //\_________________ si on a rien trouve on cherche dans tous les docks.
+ pIcon = NULL;
+ *pDock = NULL;
+ gpointer data[7];
+ data[0] = (gchar *)cCommandPrefix;
+ data[1] = GINT_TO_POINTER (length);
+ data[2] = pAfterIcon;
+ data[3] = &pIcon;
+ data[4] = pDock;
+ data[5] = &pFirstIcon;
+ data[6] = &pFirstParentDock;
+ cairo_dock_foreach_icons_in_docks ((CairoDockForeachIconFunc) _find_icon_in_dock_with_command, data);
+
+ if (pIcon == NULL)
+ {
+ pIcon = pFirstIcon;
+ *pDock = pFirstParentDock;
+ }
+ return pIcon;
+}
+
+
+void cd_do_change_current_icon (Icon *pIcon, CairoDock *pDock)
+{
+ //\_________________ 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.
+ {
+ cairo_dock_emit_leave_signal (CAIRO_CONTAINER (myData.pCurrentDock));
+ cairo_dock_remove_notification_func_on_container (CAIRO_CONTAINER (myData.pCurrentDock), CAIRO_DOCK_RENDER_DOCK, (CairoDockNotificationFunc) cd_do_render, NULL);
+ cairo_dock_remove_notification_func_on_container (CAIRO_CONTAINER (myData.pCurrentDock), CAIRO_DOCK_UPDATE_DOCK, (CairoDockNotificationFunc) cd_do_update_container, NULL);
+ }
+ if (pDock != NULL && pDock != myData.pCurrentDock) // on montre le nouveau dock
+ {
+ if (pDock != NULL)
+ {
+ if (pDock->iRefCount > 0)
+ {
+ CairoDock *pParentDock = NULL;
+ Icon *pPointingIcon = cairo_dock_search_icon_pointing_on_dock (pDock, &pParentDock);
+ if (pPointingIcon != NULL)
+ {
+ cairo_dock_show_subdock (pPointingIcon, pParentDock); // utile pour le montrage des sous-docks au clic.
+ }
+ }
+ else
+ {
+ /// utile de faire ca si on entre dedans ?...
+ if (pDock->bAutoHide)
+ cairo_dock_start_showing (pDock);
+ if (pDock->iVisibility == CAIRO_DOCK_VISI_KEEP_BELOW)
+ cairo_dock_pop_up (pDock);
+ }
+ cairo_dock_emit_enter_signal (CAIRO_CONTAINER (pDock));
+ }
+
+ cairo_dock_register_notification_on_container (CAIRO_CONTAINER (pDock),
+ CAIRO_DOCK_UPDATE_DOCK,
+ (CairoDockNotificationFunc) cd_do_update_container,
+ CAIRO_DOCK_RUN_AFTER, NULL);
+ cairo_dock_register_notification_on_container (CAIRO_CONTAINER (pDock),
+ CAIRO_DOCK_RENDER_DOCK,
+ (CairoDockNotificationFunc) cd_do_render,
+ CAIRO_DOCK_RUN_AFTER, NULL);
+ }
+ if (pDock != NULL)
+ {
+ gtk_window_present (GTK_WINDOW (pDock->container.pWidget));
+ }
+
+ //\_________________ on gere l'allumage et l'eteignage de l'icone precedente et actuelle.
+ if (myData.pCurrentIcon != NULL && pIcon != myData.pCurrentIcon) // on remet au repos l'icone precedemment anime.
+ {
+ myData.bIgnoreIconState = TRUE;
+ cairo_dock_stop_icon_animation (myData.pCurrentIcon);
+ myData.bIgnoreIconState = FALSE;
+ cairo_dock_redraw_icon (myData.pCurrentIcon, CAIRO_CONTAINER (myData.pCurrentDock)); /// utile ?...
+ }
+ if (pIcon != NULL && myData.pCurrentIcon != pIcon) // on anime la nouvelle icone.
+ {
+ int x = pIcon->fXAtRest + pIcon->fWidth/2 + (- pDock->fFlatDockWidth + pDock->iMaxDockWidth)/2;
+ int y = pIcon->fDrawY + pIcon->fHeight/2 * pIcon->fScale;
+ if (1||myData.pCurrentDock != pDock)
+ {
+ cairo_dock_emit_motion_signal (pDock,
+ x,
+ y);
+ }
+ else
+ {
+ myData.iPrevMouseX = myData.iMouseX;
+ myData.iPrevMouseY = myData.iMouseY;
+ myData.iMotionCount = 10;
+ }
+ myData.iMouseX = x;
+ myData.iMouseY = y;
+ cairo_dock_request_icon_animation (pIcon, pDock, myConfig.cIconAnimation, 1e6); // interrompt l'animation de "mouse over".
+ cairo_dock_launch_animation (CAIRO_CONTAINER (pDock));
+ //if (myAccessibility.bShowSubDockOnClick)
+ // cairo_dock_show_subdock (pIcon, pDock, FALSE);
+ }
+
+ myData.pCurrentDock = pDock;
+ myData.pCurrentIcon = pIcon;
+ if (myData.pCurrentDock == NULL)
+ gtk_window_present (GTK_WINDOW (g_pMainDock->container.pWidget));
+}
+
+
+void cd_do_search_current_icon (gboolean bLoopSearch)
+{
+ //\_________________ on cherche un lanceur correspondant.
+ CairoDock *pDock;
+ Icon *pIcon = cd_do_search_icon_by_command (myData.sCurrentText->str, (bLoopSearch ? myData.pCurrentIcon : NULL), &pDock);
+ cd_debug ("found icon : %s\n", pIcon ? pIcon->cName : "none");
+
+ //\_________________ on gere le changement d'icone/dock.
+ cd_do_change_current_icon (pIcon, pDock);
+}
+
+
+gboolean cairo_dock_emit_motion_signal (CairoDock *pDock, int iMouseX, int iMouseY)
+{
+ static gboolean bReturn;
+ static GdkEventMotion motion;
+ motion.state = 0;
+ motion.x = iMouseX;
+ motion.y = iMouseY;
+ motion.x_root = pDock->container.iWindowPositionX + pDock->container.iMouseX;
+ motion.y_root = pDock->container.iWindowPositionY + pDock->container.iMouseY;
+ motion.time = 0;
+ motion.window = pDock->container.pWidget->window;
+ motion.device = gdk_device_get_core_pointer ();
+ g_signal_emit_by_name (pDock->container.pWidget, "motion-notify-event", &motion, &bReturn);
+ return FALSE;
+}
=== added file 'Remote-Control/src/applet-icon-finder.h'
--- Remote-Control/src/applet-icon-finder.h 1970-01-01 00:00:00 +0000
+++ Remote-Control/src/applet-icon-finder.h 2010-09-22 10:43:43 +0000
@@ -0,0 +1,40 @@
+/**
+* This file is a part of the Cairo-Dock project
+*
+* Copyright : (C) see the 'copyright' file.
+* E-mail : see the 'copyright' file.
+*
+* This program is free software; you can redistribute it and/or
+* modify it under the terms of the GNU General Public License
+* as published by the Free Software Foundation; either version 3
+* of the License, or (at your option) any later version.
+*
+* This program is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+* GNU General Public License for more details.
+* You should have received a copy of the GNU General Public License
+* along with this program. If not, see <http://www.gnu.org/licenses/>.
+*/
+
+
+#ifndef __APPLET_ICON_FINDER__
+#define __APPLET_ICON_FINDER__
+
+#include <cairo-dock.h>
+#include "applet-struct.h"
+
+
+Icon *cd_do_search_icon_by_command (const gchar *cCommandPrefix, Icon *pAfterIcon, CairoDock **pDock);
+
+
+void cd_do_change_current_icon (Icon *pIcon, CairoDock *pDock);
+
+
+void cd_do_search_current_icon (gboolean bLoopSearch);
+
+
+gboolean cairo_dock_emit_motion_signal (CairoDock *pDock, int iMouseX, int iMouseY);
+
+
+#endif
=== added file 'Remote-Control/src/applet-init.c'
--- Remote-Control/src/applet-init.c 1970-01-01 00:00:00 +0000
+++ Remote-Control/src/applet-init.c 2010-09-22 10:43:43 +0000
@@ -0,0 +1,66 @@
+/**
+* This file is a part of the Cairo-Dock project
+*
+* Copyright : (C) see the 'copyright' file.
+* E-mail : see the 'copyright' file.
+*
+* This program is free software; you can redistribute it and/or
+* modify it under the terms of the GNU General Public License
+* as published by the Free Software Foundation; either version 3
+* of the License, or (at your option) any later version.
+*
+* This program is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+* GNU General Public License for more details.
+* You should have received a copy of the GNU General Public License
+* along with this program. If not, see <http://www.gnu.org/licenses/>.
+*/
+
+#include "stdlib.h"
+
+#include "applet-struct.h"
+#include "applet-config.h"
+#include "applet-notifications.h"
+#include "applet-session.h"
+#include "applet-init.h"
+
+
+CD_APPLET_DEFINE_BEGIN (("Remote-Control"),
+ 2, 2, 0,
+ CAIRO_DOCK_CATEGORY_APPLET_FUN,
+ ("This plug-in lets you control your dock from the keyboard,\n"
+ " or even a remote controller.\n"
+ "Press the shortcut (by default CTRL + F9),\n"
+ " then use the arrows to navigate into the docks and sub-docks,\n"
+ " or type the name of a launcher and press Tab to automatically jump to the next suitable launcher\n"
+ "Press Enter to click on the icon, Shift+Enter for Shift+click, Alt+Enter for middle click, and Ctrl+Enter for left click\n"
+ "Escape or the same shortkey will cancel."),
+ "Fabounet (Fabrice Rey)")
+ CD_APPLET_DEFINE_COMMON_APPLET_INTERFACE
+ CD_APPLET_SET_CONTAINER_TYPE (CAIRO_DOCK_MODULE_IS_PLUGIN);
+CD_APPLET_DEFINE_END
+
+
+//\___________ Here is where you initiate your applet. myConfig is already set at this point, and also myIcon, myContainer, myDock, myDesklet (and myDrawContext if you're in dock mode). The macro CD_APPLET_MY_CONF_FILE and CD_APPLET_MY_KEY_FILE can give you access to the applet's conf-file and its corresponding key-file (also available during reload). If you're in desklet mode, myDrawContext is still NULL, and myIcon's buffers has not been filled, because you may not need them then (idem when reloading).
+CD_APPLET_INIT_BEGIN
+ cd_keybinder_bind (myConfig.cShortkeyNav, (CDBindkeyHandler) cd_do_on_shortkey_nav, myApplet);
+
+CD_APPLET_INIT_END
+
+
+//\___________ Here is where you stop your applet. myConfig and myData are still valid, but will be reseted to 0 at the end of the function. In the end, your applet will go back to its original state, as if it had never been activated.
+CD_APPLET_STOP_BEGIN
+ cd_do_exit_session ();
+
+CD_APPLET_STOP_END
+
+
+//\___________ The reload occurs in 2 occasions : when the user changes the applet's config, and when the user reload the cairo-dock's config or modify the desklet's size. The macro CD_APPLET_MY_CONFIG_CHANGED can tell you this. myConfig has already been reloaded at this point if you're in the first case, myData is untouched. You also have the macro CD_APPLET_MY_CONTAINER_TYPE_CHANGED that can tell you if you switched from dock/desklet to desklet/dock mode.
+CD_APPLET_RELOAD_BEGIN
+ if (CD_APPLET_MY_CONFIG_CHANGED)
+ {
+ cd_keybinder_bind (myConfig.cShortkeyNav, (CDBindkeyHandler) cd_do_on_shortkey_nav, myApplet); // shortkey were unbinded during reset_config.
+
+ }
+CD_APPLET_RELOAD_END
=== added file 'Remote-Control/src/applet-init.h'
--- Remote-Control/src/applet-init.h 1970-01-01 00:00:00 +0000
+++ Remote-Control/src/applet-init.h 2010-09-22 10:43:43 +0000
@@ -0,0 +1,31 @@
+/**
+* This file is a part of the Cairo-Dock project
+*
+* Copyright : (C) see the 'copyright' file.
+* E-mail : see the 'copyright' file.
+*
+* This program is free software; you can redistribute it and/or
+* modify it under the terms of the GNU General Public License
+* as published by the Free Software Foundation; either version 3
+* of the License, or (at your option) any later version.
+*
+* This program is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+* GNU General Public License for more details.
+* You should have received a copy of the GNU General Public License
+* along with this program. If not, see <http://www.gnu.org/licenses/>.
+*/
+
+
+#ifndef __APPLET_INIT__
+#define __APPLET_INIT__
+
+
+#include <cairo-dock.h>
+
+
+CD_APPLET_H
+
+
+#endif
=== added file 'Remote-Control/src/applet-notifications.c'
--- Remote-Control/src/applet-notifications.c 1970-01-01 00:00:00 +0000
+++ Remote-Control/src/applet-notifications.c 2010-09-22 10:43:43 +0000
@@ -0,0 +1,480 @@
+/**
+* This file is a part of the Cairo-Dock project
+*
+* Copyright : (C) see the 'copyright' file.
+* E-mail : see the 'copyright' file.
+*
+* This program is free software; you can redistribute it and/or
+* modify it under the terms of the GNU General Public License
+* as published by the Free Software Foundation; either version 3
+* of the License, or (at your option) any later version.
+*
+* This program is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+* GNU General Public License for more details.
+* You should have received a copy of the GNU General Public License
+* along with this program. If not, see <http://www.gnu.org/licenses/>.
+*/
+
+#include <stdlib.h>
+#include <string.h>
+#include <math.h>
+#include <gdk/gdkkeysyms.h>
+
+#include "applet-struct.h"
+#include "applet-icon-finder.h"
+#include "applet-session.h"
+#include "applet-notifications.h"
+
+#define _alpha_prompt(k,n) cos (G_PI/2*fabs ((double) ((k % (2*n)) - n) / n));
+
+const int s_iNbPromptAnimationSteps = 40;
+
+
+static inline int _orient_arrow (CairoContainer *pContainer, int iKeyVal)
+{
+ switch (iKeyVal)
+ {
+ case GDK_Up :
+ if (pContainer->bIsHorizontal)
+ {
+ if (!pContainer->bDirectionUp)
+ iKeyVal = GDK_Down;
+ }
+ else
+ {
+ iKeyVal = GDK_Left;
+ }
+ break;
+
+ case GDK_Down :
+ if (pContainer->bIsHorizontal)
+ {
+ if (!pContainer->bDirectionUp)
+ iKeyVal = GDK_Up;
+ }
+ else
+ {
+ iKeyVal = GDK_Right;
+ }
+ break;
+
+ case GDK_Left :
+ if (!pContainer->bIsHorizontal)
+ {
+ if (pContainer->bDirectionUp)
+ iKeyVal = GDK_Up;
+ else
+ iKeyVal = GDK_Down;
+ }
+ break;
+
+ case GDK_Right :
+ if (!pContainer->bIsHorizontal)
+ {
+ if (pContainer->bDirectionUp)
+ iKeyVal = GDK_Down;
+ else
+ iKeyVal = GDK_Up;
+ }
+ break;
+ default:
+ break;
+
+ }
+ return iKeyVal;
+}
+static void _find_next_dock (CairoDock *pDock, gpointer *data)
+{
+ if (data[3] == NULL) // first root dock in the list.
+ data[3] = pDock;
+ if (data[0] == pDock) // this dock is the current one, we'll take the next one.
+ data[2] = GINT_TO_POINTER (TRUE);
+ else if (data[2]) // we take this one.
+ data[1] = pDock;
+}
+gboolean cd_do_key_pressed (gpointer pUserData, CairoContainer *pContainer, guint iKeyVal, guint iModifierType, const gchar *string)
+{
+ g_return_val_if_fail (cd_do_session_is_running (), CAIRO_DOCK_LET_PASS_NOTIFICATION);
+
+ const gchar *cKeyName = gdk_keyval_name (iKeyVal);
+ guint32 iUnicodeChar = gdk_keyval_to_unicode (iKeyVal);
+ cd_debug ("+ cKeyName : %s (%c, %s)\n", cKeyName, iUnicodeChar, string);
+
+ if (iKeyVal == GDK_Escape) // on clot la session.
+ {
+ cd_do_close_session ();
+ }
+ else if (iKeyVal == GDK_space && myData.sCurrentText->len == 0) // pas d'espace en debut de chaine.
+ {
+ // on rejette.
+ }
+ else if (iKeyVal >= GDK_Shift_L && iKeyVal <= GDK_Hyper_R) // on n'ecrit pas les modificateurs.
+ {
+ // on rejette.
+ }
+ else if (iKeyVal == GDK_Menu) // emulation du clic droit.
+ {
+ if (myData.pCurrentIcon != NULL && myData.pCurrentDock != NULL)
+ {
+ myData.bIgnoreIconState = TRUE;
+ cairo_dock_stop_icon_animation (myData.pCurrentIcon); // car on va perdre le focus.
+ myData.bIgnoreIconState = FALSE;
+
+ GtkWidget *menu = cairo_dock_build_menu (myData.pCurrentIcon, CAIRO_CONTAINER (myData.pCurrentDock));
+ cairo_dock_popup_menu_on_icon (menu, myData.pCurrentIcon, CAIRO_CONTAINER (myData.pCurrentDock));
+ }
+ }
+ else if (iKeyVal == GDK_BackSpace) // on efface la derniere lettre.
+ {
+ if (myData.sCurrentText->len > 0)
+ {
+ cd_debug ("on efface la derniere lettre de %s (%d)\n", myData.sCurrentText->str, myData.sCurrentText->len);
+
+ g_string_truncate (myData.sCurrentText, myData.sCurrentText->len-1);
+
+ // on relance la recherche.
+ if (myData.pCurrentIcon == NULL) // sinon l'icone actuelle convient toujours.
+ cd_do_search_current_icon (FALSE);
+ }
+ }
+ else if (iKeyVal == GDK_Tab) // jump to next icon.
+ {
+ if (myData.sCurrentText->len > 0)
+ {
+ gboolean bPrevious = iModifierType & GDK_SHIFT_MASK;
+ // on cherche l'icone suivante.
+ cd_do_search_current_icon (TRUE); // pCurrentIcon peut etre NULL si elle s'est faite detruire pendant la recherche, auquel cas on cherchera juste normalement.
+ }
+ }
+ else if (iKeyVal == GDK_Return)
+ {
+ if (myData.pCurrentIcon != NULL && myData.pCurrentDock != NULL)
+ {
+ cd_debug ("on clique sur l'icone '%s' [%d, %d]\n", myData.pCurrentIcon->cName, iModifierType, GDK_SHIFT_MASK);
+
+ myData.bIgnoreIconState = TRUE;
+ if (iModifierType & GDK_MOD1_MASK) // ALT
+ {
+ myData.bIgnoreIconState = TRUE;
+ cairo_dock_stop_icon_animation (myData.pCurrentIcon); // car aucune animation ne va la remplacer.
+ myData.bIgnoreIconState = FALSE;
+ cairo_dock_notify (CAIRO_DOCK_MIDDLE_CLICK_ICON, myData.pCurrentIcon, myData.pCurrentDock);
+ }
+ else if (iModifierType & GDK_CONTROL_MASK) // CTRL
+ {
+ myData.bIgnoreIconState = TRUE;
+ cairo_dock_stop_icon_animation (myData.pCurrentIcon); // car on va perdre le focus.
+ myData.bIgnoreIconState = FALSE;
+
+ myData.pCurrentDock->bMenuVisible = TRUE;
+ GtkWidget *menu = cairo_dock_build_menu (myData.pCurrentIcon, CAIRO_CONTAINER (myData.pCurrentDock));
+ cairo_dock_popup_menu_on_icon (menu, myData.pCurrentIcon, CAIRO_CONTAINER (myData.pCurrentDock));
+ }
+ else if (myData.pCurrentIcon != NULL)
+ {
+ cairo_dock_notify (CAIRO_DOCK_CLICK_ICON, myData.pCurrentIcon, myData.pCurrentDock, iModifierType);
+ if (CAIRO_DOCK_IS_APPLI (myData.pCurrentIcon))
+ myData.iPreviouslyActiveWindow = 0;
+ }
+ if (myData.pCurrentIcon != NULL)
+ cairo_dock_start_icon_animation (myData.pCurrentIcon, myData.pCurrentDock);
+ myData.bIgnoreIconState = FALSE;
+ myData.pCurrentIcon = NULL; // sinon on va interrompre l'animation en fermant la session.
+ }
+ cd_do_close_session ();
+ }
+ else if (iKeyVal == GDK_Left || iKeyVal == GDK_Right || iKeyVal == GDK_Up || iKeyVal == GDK_Down)
+ {
+ iKeyVal = _orient_arrow (pContainer, iKeyVal);
+ if (iKeyVal == GDK_Up)
+ {
+ if (myData.pCurrentIcon != NULL && myData.pCurrentIcon->pSubDock != NULL)
+ {
+ cd_debug ("on monte dans le sous-dock %s\n", myData.pCurrentIcon->cName);
+ Icon *pIcon = cairo_dock_get_first_icon (myData.pCurrentIcon->pSubDock->icons);
+ cd_do_change_current_icon (pIcon, myData.pCurrentIcon->pSubDock);
+ }
+ }
+ else if (iKeyVal == GDK_Down)
+ {
+ if (myData.pCurrentDock != NULL && myData.pCurrentDock->iRefCount > 0)
+ {
+ CairoDock *pParentDock = NULL;
+ Icon *pPointingIcon = cairo_dock_search_icon_pointing_on_dock (myData.pCurrentDock, &pParentDock);
+ if (pPointingIcon != NULL)
+ {
+ cd_debug ("on redescend dans le dock parent via %s\n", pPointingIcon->cName);
+ cd_do_change_current_icon (pPointingIcon, pParentDock);
+ }
+ }
+ }
+ else if (iKeyVal == GDK_Left)
+ {
+ if (myData.pCurrentDock == NULL) // on initialise le deplacement.
+ {
+ myData.pCurrentDock = g_pMainDock;
+ int n = g_list_length (g_pMainDock->icons);
+ if (n > 0)
+ {
+ myData.pCurrentIcon = g_list_nth_data (g_pMainDock->icons, (n-1) / 2);
+ if (CAIRO_DOCK_IS_SEPARATOR (myData.pCurrentIcon) && n > 1)
+ myData.pCurrentIcon = g_list_nth_data (g_pMainDock->icons, (n+1) / 2);
+ }
+ }
+ if (myData.pCurrentDock->icons != NULL)
+ {
+ Icon *pPrevIcon = cairo_dock_get_previous_icon (myData.pCurrentDock->icons, myData.pCurrentIcon);
+ if (CAIRO_DOCK_IS_SEPARATOR (pPrevIcon))
+ pPrevIcon = cairo_dock_get_previous_icon (myData.pCurrentDock->icons, pPrevIcon);
+ if (pPrevIcon == NULL) // pas trouve ou bien 1ere icone.
+ {
+ pPrevIcon = cairo_dock_get_last_icon (myData.pCurrentDock->icons);
+ }
+
+ cd_debug ("on se deplace a gauche sur %s\n", pPrevIcon ? pPrevIcon->cName : "none");
+ cd_do_change_current_icon (pPrevIcon, myData.pCurrentDock);
+ }
+ }
+ else // Gdk_Right.
+ {
+ if (myData.pCurrentDock == NULL) // on initialise le deplacement.
+ {
+ myData.pCurrentDock = g_pMainDock;
+ int n = g_list_length (g_pMainDock->icons);
+ if (n > 0)
+ {
+ myData.pCurrentIcon = g_list_nth_data (g_pMainDock->icons, (n-1) / 2);
+ if (CAIRO_DOCK_IS_SEPARATOR (myData.pCurrentIcon) && n > 1)
+ myData.pCurrentIcon = g_list_nth_data (g_pMainDock->icons, (n+1) / 2);
+ }
+ }
+ if (myData.pCurrentDock->icons != NULL)
+ {
+ Icon *pNextIcon = cairo_dock_get_next_icon (myData.pCurrentDock->icons, myData.pCurrentIcon);
+ if (CAIRO_DOCK_IS_SEPARATOR (pNextIcon))
+ pNextIcon = cairo_dock_get_next_icon (myData.pCurrentDock->icons, pNextIcon);
+ if (pNextIcon == NULL) // pas trouve ou bien 1ere icone.
+ {
+ pNextIcon = cairo_dock_get_first_icon (myData.pCurrentDock->icons);
+ }
+
+ cd_debug ("on se deplace a gauche sur %s\n", pNextIcon ? pNextIcon->cName : "none");
+ cd_do_change_current_icon (pNextIcon, myData.pCurrentDock);
+ }
+ }
+ }
+ else if (iKeyVal == GDK_Page_Down || iKeyVal == GDK_Page_Up || iKeyVal == GDK_Home || iKeyVal == GDK_End)
+ {
+ if (iModifierType & GDK_CONTROL_MASK) // changement de dock principal
+ {
+ gpointer data[4] = {myData.pCurrentDock, NULL, GINT_TO_POINTER (FALSE), NULL};
+ cairo_dock_foreach_root_docks ((GFunc) _find_next_dock, data);
+ CairoDock *pNextDock = data[1];
+ if (pNextDock == NULL)
+ pNextDock = data[3];
+ if (pNextDock != NULL)
+ {
+ Icon *pNextIcon = NULL;
+ int n = g_list_length (pNextDock->icons);
+ if (n > 0)
+ {
+ pNextIcon = g_list_nth_data (pNextDock->icons, (n-1) / 2);
+ if (CAIRO_DOCK_IS_SEPARATOR (pNextIcon) && n > 1)
+ pNextIcon = g_list_nth_data (pNextDock->icons, (n+1) / 2);
+ }
+ cd_do_change_current_icon (pNextIcon, pNextDock);
+ }
+ }
+
+ Icon *pIcon = (iKeyVal == GDK_Page_Up || iKeyVal == GDK_Home ? cairo_dock_get_first_icon (myData.pCurrentDock->icons) : cairo_dock_get_last_icon (myData.pCurrentDock->icons));
+ cd_debug ("on se deplace a l'extremite sur %s\n", pIcon ? pIcon->cName : "none");
+ cd_do_change_current_icon (pIcon, myData.pCurrentDock);
+ }
+ else if (string) /// utiliser l'unichar ...
+ {
+ cd_debug ("string:'%s'\n", string);
+ g_string_append_c (myData.sCurrentText, *string);
+
+ cd_do_search_current_icon (FALSE);
+ }
+
+ return CAIRO_DOCK_INTERCEPT_NOTIFICATION;
+}
+
+
+void cd_do_on_shortkey_nav (const char *keystring, gpointer data)
+{
+ if (! cd_do_session_is_running ())
+ {
+ cd_do_open_session ();
+ }
+ else
+ {
+ cd_do_close_session ();
+ }
+}
+
+
+gboolean cd_do_update_container (gpointer pUserData, CairoContainer *pContainer, gboolean *bContinueAnimation)
+{
+ g_return_val_if_fail (!cd_do_session_is_off (), CAIRO_DOCK_LET_PASS_NOTIFICATION);
+
+ if (myData.iMotionCount != 0)
+ {
+ myData.iMotionCount --;
+ double f = (double) myData.iMotionCount / 10;
+ cairo_dock_emit_motion_signal (CAIRO_DOCK (pContainer),
+ f * myData.iPrevMouseX + (1-f) * myData.iMouseX,
+ f * myData.iPrevMouseY + (1-f) * myData.iMouseY);
+ *bContinueAnimation = TRUE;
+ }
+
+ int iDeltaT = cairo_dock_get_animation_delta_t (pContainer);
+ if (cd_do_session_is_closing ())
+ {
+ //\___________________ animation de fermeture de la session (disparition des lettres ou du prompt).
+ myData.iCloseTime -= iDeltaT;
+ if (myData.iCloseTime <= 0)
+ cd_do_exit_session ();
+ else
+ *bContinueAnimation = TRUE;
+ cairo_dock_redraw_container (pContainer);
+ }
+ else if (cd_do_session_is_running ())
+ {
+ //\___________________ animation du prompt.
+ myData.iPromptAnimationCount ++;
+ *bContinueAnimation = TRUE;
+
+ cairo_dock_redraw_container (pContainer);
+ }
+
+ return CAIRO_DOCK_LET_PASS_NOTIFICATION;
+}
+
+
+gboolean cd_do_check_icon_stopped (gpointer pUserData, Icon *pIcon)
+{
+ if (pIcon == myData.pCurrentIcon && ! myData.bIgnoreIconState)
+ {
+ cd_debug ("notre icone vient de se faire stopper\n");
+ myData.pCurrentIcon = NULL;
+ myData.pCurrentDock = NULL;
+
+ // eventuellement emuler un TAB pour trouver la suivante ...
+ }
+
+ return CAIRO_DOCK_LET_PASS_NOTIFICATION;
+}
+
+
+static void _check_dock_is_active (gchar *cDockName, CairoDock *pDock, Window *data)
+{
+ Window xActiveWindow = data[0];
+ if (GDK_WINDOW_XID (pDock->container.pWidget->window) == xActiveWindow)
+ data[1] = 1;
+}
+gboolean cd_do_check_active_dock (gpointer pUserData, Window *XActiveWindow)
+{
+ if (myData.sCurrentText == NULL || XActiveWindow == NULL)
+ return CAIRO_DOCK_LET_PASS_NOTIFICATION;
+ Window data[2] = {*XActiveWindow, 0};
+ cairo_dock_foreach_docks ((GHFunc) _check_dock_is_active, data);
+
+ if (data[1] == 0)
+ gtk_window_present (GTK_WINDOW (g_pMainDock->container.pWidget));
+ return CAIRO_DOCK_LET_PASS_NOTIFICATION;
+}
+
+
+static void _render_cairo (CairoContainer *pContainer, cairo_t *pCairoContext)
+{
+ double fAlpha;
+ if (myData.iCloseTime != 0) // animation de fin
+ fAlpha = (double) myData.iCloseTime / myConfig.iCloseDuration;
+ else
+ fAlpha = 1.;
+
+ if (myData.pArrowImage->pSurface != NULL)
+ {
+ double fFrameWidth = myData.pArrowImage->iWidth;
+ double fFrameHeight = myData.pArrowImage->iHeight;
+
+ double fDockOffsetX, fDockOffsetY; // Offset du coin haut gauche du prompt.
+ if (pContainer->bIsHorizontal)
+ {
+ fDockOffsetX = (pContainer->iWidth - fFrameWidth) / 2;
+ fDockOffsetY = (pContainer->iHeight - fFrameHeight) / 2;
+ }
+ else
+ {
+ fDockOffsetY = (pContainer->iWidth - fFrameWidth) / 2;
+ fDockOffsetX = (pContainer->iHeight - fFrameHeight) / 2;
+ }
+
+ fAlpha *= _alpha_prompt (myData.iPromptAnimationCount, s_iNbPromptAnimationSteps);
+
+ if (fAlpha != 0)
+ {
+ cairo_translate (pCairoContext, fDockOffsetX, fDockOffsetY);
+ cairo_dock_draw_surface (pCairoContext, myData.pArrowImage->pSurface, fFrameWidth, fFrameHeight, pContainer->bDirectionUp, pContainer->bIsHorizontal, fAlpha);
+ }
+ }
+}
+
+static void _render_opengl (CairoContainer *pContainer)
+{
+ double fAlpha;
+ if (myData.iCloseTime != 0) // animation de fin
+ fAlpha = (double) myData.iCloseTime / myConfig.iCloseDuration;
+ else
+ fAlpha = 1.;
+
+ if (myData.pArrowImage->iTexture != 0)
+ {
+ double fFrameWidth = myData.pArrowImage->iWidth;
+ double fFrameHeight = myData.pArrowImage->iHeight;
+
+ double fDockOffsetX, fDockOffsetY; // Offset du coin haut gauche du prompt.
+ fDockOffsetX = (pContainer->iWidth - fFrameWidth) / 2;
+ fDockOffsetY = (pContainer->iHeight - fFrameHeight) / 2;
+
+ fAlpha *= _alpha_prompt (myData.iPromptAnimationCount, s_iNbPromptAnimationSteps);
+
+ if (fAlpha != 0)
+ {
+ glPushMatrix ();
+
+ cairo_dock_set_container_orientation_opengl (pContainer);
+
+ glTranslatef (pContainer->iWidth/2, pContainer->iHeight/2, 0.);
+
+ _cairo_dock_enable_texture ();
+ _cairo_dock_set_blend_alpha ();
+
+ _cairo_dock_apply_texture_at_size_with_alpha (myData.pArrowImage->iTexture, fFrameWidth, fFrameHeight, fAlpha);
+
+ _cairo_dock_disable_texture ();
+
+ glPopMatrix();
+ }
+ }
+}
+
+gboolean cd_do_render (gpointer pUserData, CairoContainer *pContainer, cairo_t *pCairoContext)
+{
+ g_return_val_if_fail (!cd_do_session_is_off (), CAIRO_DOCK_LET_PASS_NOTIFICATION);
+
+ if (pCairoContext != NULL)
+ {
+ _render_cairo (pContainer, pCairoContext);
+ }
+ else
+ {
+ _render_opengl (pContainer);
+ }
+
+ return CAIRO_DOCK_LET_PASS_NOTIFICATION;
+}
=== added file 'Remote-Control/src/applet-notifications.h'
--- Remote-Control/src/applet-notifications.h 1970-01-01 00:00:00 +0000
+++ Remote-Control/src/applet-notifications.h 2010-09-22 10:43:43 +0000
@@ -0,0 +1,45 @@
+/**
+* This file is a part of the Cairo-Dock project
+*
+* Copyright : (C) see the 'copyright' file.
+* E-mail : see the 'copyright' file.
+*
+* This program is free software; you can redistribute it and/or
+* modify it under the terms of the GNU General Public License
+* as published by the Free Software Foundation; either version 3
+* of the License, or (at your option) any later version.
+*
+* This program is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+* GNU General Public License for more details.
+* You should have received a copy of the GNU General Public License
+* along with this program. If not, see <http://www.gnu.org/licenses/>.
+*/
+
+
+#ifndef __APPLET_NOTIFICATIONS__
+#define __APPLET_NOTIFICATIONS__
+
+#include <cairo-dock.h>
+
+
+gboolean cd_do_key_pressed (gpointer pUserData, CairoContainer *pContainer, guint iKeyVal, guint iModifierType, const gchar *string);
+
+
+void cd_do_on_shortkey_nav (const char *keystring, gpointer data);
+
+
+gboolean cd_do_update_container (gpointer pUserData, CairoContainer *pContainer, gboolean *bContinueAnimation);
+
+
+gboolean cd_do_check_icon_stopped (gpointer pUserData, Icon *pIcon);
+
+
+gboolean cd_do_check_active_dock (gpointer pUserData, Window *XActiveWindow);
+
+
+gboolean cd_do_render (gpointer pUserData, CairoContainer *pContainer, cairo_t *pCairoContext);
+
+
+#endif
=== added file 'Remote-Control/src/applet-session.c'
--- Remote-Control/src/applet-session.c 1970-01-01 00:00:00 +0000
+++ Remote-Control/src/applet-session.c 2010-09-22 10:43:43 +0000
@@ -0,0 +1,154 @@
+/**
+* This file is a part of the Cairo-Dock project
+*
+* Copyright : (C) see the 'copyright' file.
+* E-mail : see the 'copyright' file.
+*
+* This program is free software; you can redistribute it and/or
+* modify it under the terms of the GNU General Public License
+* as published by the Free Software Foundation; either version 3
+* of the License, or (at your option) any later version.
+*
+* This program is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+* GNU General Public License for more details.
+* You should have received a copy of the GNU General Public License
+* along with this program. If not, see <http://www.gnu.org/licenses/>.
+*/
+
+#include <stdlib.h>
+#include <string.h>
+
+#include "applet-struct.h"
+#include "applet-notifications.h"
+#include "applet-icon-finder.h"
+#include "applet-session.h"
+
+
+void cd_do_open_session (void)
+{
+ if (cd_do_session_is_running ()) // session already running
+ return;
+
+ // register to draw on dock.
+ /**if (cd_do_session_is_off ())
+ {
+ cairo_dock_register_notification_on_container (CAIRO_CONTAINER (g_pMainDock),
+ CAIRO_DOCK_UPDATE_DOCK,
+ (CairoDockNotificationFunc) cd_do_update_container,
+ CAIRO_DOCK_RUN_AFTER, NULL);
+ cairo_dock_register_notification_on_container (CAIRO_CONTAINER (g_pMainDock),
+ CAIRO_DOCK_RENDER_DOCK,
+ (CairoDockNotificationFunc) cd_do_render,
+ CAIRO_DOCK_RUN_AFTER, NULL);
+ }*/
+
+ // wait for keyboard input.
+ cairo_dock_register_notification (CAIRO_DOCK_KEY_PRESSED, (CairoDockNotificationFunc) cd_do_key_pressed, CAIRO_DOCK_RUN_AFTER, NULL);
+ cairo_dock_register_notification (CAIRO_DOCK_STOP_ICON, (CairoDockNotificationFunc) cd_do_check_icon_stopped, CAIRO_DOCK_RUN_AFTER, NULL);
+ cairo_dock_register_notification (CAIRO_DOCK_WINDOW_ACTIVATED, (CairoDockNotificationFunc) cd_do_check_active_dock, CAIRO_DOCK_RUN_AFTER, NULL);
+
+ myData.sCurrentText = g_string_sized_new (20);
+ myData.iPromptAnimationCount = 0;
+ if (myData.pArrowImage == NULL)
+ {
+ myData.pArrowImage = cairo_dock_create_image_buffer (MY_APPLET_SHARE_DATA_DIR"/arrows.svg",
+ g_pMainDock->iMaxDockHeight,
+ g_pMainDock->iMaxDockHeight,
+ CAIRO_DOCK_KEEP_RATIO);
+ }
+
+ // set initial position.
+ myData.pCurrentDock = NULL;
+ myData.pCurrentIcon = NULL;
+
+ CairoDock *pDock = g_pMainDock;
+ Icon *pIcon = NULL;
+ int n = g_list_length (g_pMainDock->icons);
+ if (n > 0)
+ {
+ pIcon = g_list_nth_data (pDock->icons, (n-1) / 2);
+ if (CAIRO_DOCK_IS_SEPARATOR (pIcon) && n > 1)
+ pIcon = g_list_nth_data (pDock->icons, (n+1) / 2);
+ }
+ cd_do_change_current_icon (pIcon, pDock);
+
+ // show main dock.
+ myData.bIgnoreIconState = TRUE;
+ cairo_dock_emit_enter_signal (CAIRO_CONTAINER (g_pMainDock));
+ myData.bIgnoreIconState = FALSE;
+
+ // give focus to main dock for inputs.
+ myData.iPreviouslyActiveWindow = cairo_dock_get_active_xwindow ();
+
+ ///gtk_window_present (GTK_WINDOW (g_pMainDock->container.pWidget));
+ gtk_window_present_with_time (GTK_WINDOW (g_pMainDock->container.pWidget), gdk_x11_get_server_time (g_pMainDock->container.pWidget->window)); // pour eviter la prevention du vol de focus.
+ cairo_dock_freeze_docks (TRUE);
+
+ // launch animation.
+ cairo_dock_launch_animation (CAIRO_CONTAINER (g_pMainDock));
+
+ myData.iSessionState = 2;
+}
+
+void cd_do_close_session (void)
+{
+ if (! cd_do_session_is_running ()) // session not running
+ return;
+
+ // no more keyboard input.
+ cairo_dock_remove_notification_func (CAIRO_DOCK_KEY_PRESSED, (CairoDockNotificationFunc) cd_do_key_pressed, NULL);
+ cairo_dock_remove_notification_func (CAIRO_DOCK_STOP_ICON, (CairoDockNotificationFunc) cd_do_check_icon_stopped, NULL);
+ cairo_dock_remove_notification_func (CAIRO_DOCK_WINDOW_ACTIVATED, (CairoDockNotificationFunc) cd_do_check_active_dock, NULL);
+
+ g_string_free (myData.sCurrentText, TRUE);
+ myData.sCurrentText = NULL;
+
+ // give back focus.
+ if (myData.iPreviouslyActiveWindow != 0)
+ {
+ // ne le faire que si on a encore le focus, sinon c'est que l'utilisateur a change lui-meme de fenetre...
+ Window iActiveWindow = cairo_dock_get_active_xwindow ();
+ if (myData.pCurrentDock && iActiveWindow == GDK_WINDOW_XID (myData.pCurrentDock->container.pWidget->window))
+ cairo_dock_show_xwindow (myData.iPreviouslyActiveWindow);
+
+ myData.iPreviouslyActiveWindow = 0;
+ }
+
+ // reset session state.
+ if (myData.pCurrentIcon != NULL)
+ {
+ myData.bIgnoreIconState = TRUE;
+ cairo_dock_stop_icon_animation (myData.pCurrentIcon);
+ myData.bIgnoreIconState = FALSE;
+ myData.pCurrentIcon = NULL;
+ }
+
+ if (myData.pCurrentDock != NULL)
+ {
+ cairo_dock_emit_leave_signal (CAIRO_CONTAINER (myData.pCurrentDock));
+ }
+
+ // launch closing animation.
+ myData.iCloseTime = myConfig.iCloseDuration;
+ cairo_dock_launch_animation (CAIRO_CONTAINER (g_pMainDock));
+ cairo_dock_freeze_docks (FALSE);
+
+ myData.iSessionState = 1;
+}
+
+
+void cd_do_exit_session (void)
+{
+ if (cd_do_session_is_off ()) // session already off
+ return;
+
+ cd_do_close_session ();
+
+ myData.iCloseTime = 0;
+
+ cd_do_change_current_icon (NULL, NULL);
+
+ myData.iSessionState = 0;
+}
=== added file 'Remote-Control/src/applet-session.h'
--- Remote-Control/src/applet-session.h 1970-01-01 00:00:00 +0000
+++ Remote-Control/src/applet-session.h 2010-09-22 10:43:43 +0000
@@ -0,0 +1,38 @@
+/**
+* This file is a part of the Cairo-Dock project
+*
+* Copyright : (C) see the 'copyright' file.
+* E-mail : see the 'copyright' file.
+*
+* This program is free software; you can redistribute it and/or
+* modify it under the terms of the GNU General Public License
+* as published by the Free Software Foundation; either version 3
+* of the License, or (at your option) any later version.
+*
+* This program is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+* GNU General Public License for more details.
+* You should have received a copy of the GNU General Public License
+* along with this program. If not, see <http://www.gnu.org/licenses/>.
+*/
+
+#ifndef __APPLET_SESSION__
+#define __APPLET_SESSION__
+
+#include <cairo-dock.h>
+#include "applet-struct.h"
+
+
+void cd_do_open_session (void);
+
+void cd_do_close_session (void);
+
+void cd_do_exit_session (void);
+
+#define cd_do_session_is_running(...) (myData.iSessionState == 2)
+#define cd_do_session_is_closing(...) (myData.iSessionState == 1)
+#define cd_do_session_is_off(...) (myData.iSessionState == 0)
+
+
+#endif
=== added file 'Remote-Control/src/applet-struct.h'
--- Remote-Control/src/applet-struct.h 1970-01-01 00:00:00 +0000
+++ Remote-Control/src/applet-struct.h 2010-09-22 10:43:43 +0000
@@ -0,0 +1,51 @@
+/**
+* This file is a part of the Cairo-Dock project
+*
+* Copyright : (C) see the 'copyright' file.
+* E-mail : see the 'copyright' file.
+*
+* This program is free software; you can redistribute it and/or
+* modify it under the terms of the GNU General Public License
+* as published by the Free Software Foundation; either version 3
+* of the License, or (at your option) any later version.
+*
+* This program is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+* GNU General Public License for more details.
+* You should have received a copy of the GNU General Public License
+* along with this program. If not, see <http://www.gnu.org/licenses/>.
+*/
+
+
+#ifndef __CD_APPLET_STRUCT__
+#define __CD_APPLET_STRUCT__
+
+#include <cairo-dock.h>
+
+//\___________ structure containing the applet's configuration parameters.
+struct _AppletConfig {
+ gchar *cShortkeyNav;
+ gchar *cIconAnimation;
+ gint iCloseDuration;
+ } ;
+
+//\___________ structure containing the applet's data, like surfaces, dialogs, results of calculus, etc.
+struct _AppletData {
+ gint iSessionState; // 0:no session, 1: session closing, 2: session running
+ GString *sCurrentText;
+ CairoDockImageBuffer *pArrowImage;
+ gint iPromptAnimationCount;
+ gint iCloseTime;
+ Window iPreviouslyActiveWindow;
+ Icon *pCurrentIcon;
+ CairoDock *pCurrentDock;
+ gboolean bIgnoreIconState;
+
+ int iPrevMouseX, iPrevMouseY;
+ int iMouseX, iMouseY;
+ int iMotionCount;
+ } ;
+
+
+#endif
=== modified file 'Scooby-Do/data/CMakeLists.txt'
--- Scooby-Do/data/CMakeLists.txt 2010-08-07 01:43:25 +0000
+++ Scooby-Do/data/CMakeLists.txt 2010-09-22 10:43:43 +0000
@@ -9,7 +9,6 @@
install (FILES ${CMAKE_CURRENT_BINARY_DIR}/Scooby-Do.conf
preview.jpg
icon.png
- arrows.svg
active-button.svg
inactive-button.svg
internet.png
=== modified file 'Scooby-Do/data/Scooby-Do.conf.in'
--- Scooby-Do/data/Scooby-Do.conf.in 2010-08-07 01:43:25 +0000
+++ Scooby-Do/data/Scooby-Do.conf.in 2010-09-22 10:43:43 +0000
@@ -6,9 +6,6 @@
#k Shortkey to enable/disable the finder mode:
shortkey search = <Control>Return
-#k Shortkey to enable/disable the navigation mode:
-shortkey = <Control>F9
-
#i[10;200] Maximum number of results :
#{Maximum number of mails that will be previewed. Put -1 to show the maximum possible.}
nb results = 80
=== removed file 'Scooby-Do/data/arrows.svg'
--- Scooby-Do/data/arrows.svg 2009-10-05 19:27:17 +0000
+++ Scooby-Do/data/arrows.svg 1970-01-01 00:00:00 +0000
@@ -1,289 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-<svg
- xmlns:dc="http://purl.org/dc/elements/1.1/";
- xmlns:cc="http://creativecommons.org/ns#";
- xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#";
- xmlns:svg="http://www.w3.org/2000/svg";
- xmlns="http://www.w3.org/2000/svg";
- xmlns:xlink="http://www.w3.org/1999/xlink";
- xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd";
- xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape";
- width="128"
- height="128"
- id="svg2391"
- sodipodi:version="0.32"
- inkscape:version="0.46"
- version="1.0"
- sodipodi:docname="arrows.svg"
- inkscape:output_extension="org.inkscape.output.svg.inkscape">
- <defs
- id="defs2393">
- <linearGradient
- id="linearGradient2076">
- <stop
- id="stop2078"
- offset="0.0000000"
- style="stop-color:#afd9ed;stop-opacity:1.0000000;" />
- <stop
- id="stop2080"
- offset="1.0000000"
- style="stop-color:#cfc3db;stop-opacity:1.0000000;" />
- </linearGradient>
- <linearGradient
- gradientTransform="matrix(-1.186331,0,0,-0.780016,61.16353,67.13542)"
- gradientUnits="userSpaceOnUse"
- id="linearGradient2082"
- x1="12.615197"
- x2="48.374069"
- xlink:href="#linearGradient2076"
- y1="25.909756"
- y2="62.720371" />
- <linearGradient
- id="linearGradient2088">
- <stop
- id="stop2090"
- offset="0.0000000"
- style="stop-color:#87a8b7;stop-opacity:1.0000000;" />
- <stop
- id="stop2092"
- offset="1.0000000"
- style="stop-color:#7f718e;stop-opacity:1.0000000;" />
- </linearGradient>
- <linearGradient
- gradientTransform="matrix(-1.186331,0,0,-0.780016,63.3302,67.13542)"
- gradientUnits="userSpaceOnUse"
- id="linearGradient2086"
- x1="12.615197"
- x2="48.374069"
- xlink:href="#linearGradient2088"
- y1="25.909756"
- y2="62.720371" />
- <inkscape:perspective
- sodipodi:type="inkscape:persp3d"
- inkscape:vp_x="0 : 526.18109 : 1"
- inkscape:vp_y="0 : 1000 : 0"
- inkscape:vp_z="744.09448 : 526.18109 : 1"
- inkscape:persp3d-origin="372.04724 : 350.78739 : 1"
- id="perspective2399" />
- <linearGradient
- inkscape:collect="always"
- xlink:href="#linearGradient2088"
- id="linearGradient2420"
- gradientUnits="userSpaceOnUse"
- gradientTransform="matrix(-1.186331,0,0,-0.780016,63.3302,67.13542)"
- x1="12.615197"
- y1="25.909756"
- x2="48.374069"
- y2="62.720371" />
- <linearGradient
- inkscape:collect="always"
- xlink:href="#linearGradient2076"
- id="linearGradient2422"
- gradientUnits="userSpaceOnUse"
- gradientTransform="matrix(-1.186331,0,0,-0.780016,61.16353,67.13542)"
- x1="12.615197"
- y1="25.909756"
- x2="48.374069"
- y2="62.720371" />
- <linearGradient
- inkscape:collect="always"
- xlink:href="#linearGradient2088"
- id="linearGradient2434"
- gradientUnits="userSpaceOnUse"
- gradientTransform="matrix(-1.186331,0,0,-0.780016,63.3302,67.13542)"
- x1="12.615197"
- y1="25.909756"
- x2="48.374069"
- y2="62.720371" />
- <linearGradient
- inkscape:collect="always"
- xlink:href="#linearGradient2076"
- id="linearGradient2436"
- gradientUnits="userSpaceOnUse"
- gradientTransform="matrix(-1.186331,0,0,-0.780016,61.16353,67.13542)"
- x1="12.615197"
- y1="25.909756"
- x2="48.374069"
- y2="62.720371" />
- <linearGradient
- inkscape:collect="always"
- xlink:href="#linearGradient2088"
- id="linearGradient2448"
- gradientUnits="userSpaceOnUse"
- gradientTransform="matrix(-1.186331,0,0,-0.780016,63.3302,67.13542)"
- x1="12.615197"
- y1="25.909756"
- x2="48.374069"
- y2="62.720371" />
- <linearGradient
- inkscape:collect="always"
- xlink:href="#linearGradient2076"
- id="linearGradient2450"
- gradientUnits="userSpaceOnUse"
- gradientTransform="matrix(-1.186331,0,0,-0.780016,61.16353,67.13542)"
- x1="12.615197"
- y1="25.909756"
- x2="48.374069"
- y2="62.720371" />
- <linearGradient
- inkscape:collect="always"
- xlink:href="#linearGradient2088"
- id="linearGradient2462"
- gradientUnits="userSpaceOnUse"
- gradientTransform="matrix(-1.186331,0,0,-0.780016,63.3302,67.13542)"
- x1="12.615197"
- y1="25.909756"
- x2="48.374069"
- y2="62.720371" />
- <linearGradient
- inkscape:collect="always"
- xlink:href="#linearGradient2076"
- id="linearGradient2464"
- gradientUnits="userSpaceOnUse"
- gradientTransform="matrix(-1.186331,0,0,-0.780016,61.16353,67.13542)"
- x1="12.615197"
- y1="25.909756"
- x2="48.374069"
- y2="62.720371" />
- </defs>
- <sodipodi:namedview
- id="base"
- pagecolor="#ffffff"
- bordercolor="#666666"
- borderopacity="1.0"
- inkscape:pageopacity="0.0"
- inkscape:pageshadow="2"
- inkscape:zoom="1.3277206"
- inkscape:cx="117.47785"
- inkscape:cy="-15.977159"
- inkscape:document-units="px"
- inkscape:current-layer="layer1"
- showgrid="false"
- showguides="true"
- inkscape:guide-bbox="true"
- inkscape:window-width="641"
- inkscape:window-height="719"
- inkscape:window-x="293"
- inkscape:window-y="0" />
- <metadata
- id="metadata2396">
- <rdf:RDF>
- <cc:Work
- rdf:about="">
- <dc:format>image/svg+xml</dc:format>
- <dc:type
- rdf:resource="http://purl.org/dc/dcmitype/StillImage"; />
- </cc:Work>
- </rdf:RDF>
- </metadata>
- <g
- inkscape:label="Calque 1"
- inkscape:groupmode="layer"
- id="layer1">
- <g
- id="g2409"
- transform="matrix(0,0.8161651,-1.764176,0,125.43391,77.398373)">
- <path
- d="M 32.186126,52.104166 C 32.931029,52.568927 46.362619,43.287677 47.107522,42.822916 C 47.852425,42.358155 62,34.471188 62,33.541666 C 62,32.612144 47.852425,24.693927 47.107522,24.229166 C 46.362619,23.764405 32.931028,14.483154 32.186126,14.947916 C 31.736229,15.228616 31.839046,20.824428 31.983704,26.041666 L 5.900179,26.041666 C 5.643855,26.041666 5.4375,26.264666 5.4375,26.541666 L 5.4375,40.541666 C 5.4375,40.818666 5.643855,41.041666 5.900179,41.041666 L 31.983704,41.041666 C 31.839045,46.258903 31.73623,51.823466 32.186126,52.104166 z"
- id="path2084"
- style="fill:url(#linearGradient2420);fill-opacity:1;stroke:none;stroke-width:0.375;stroke-miterlimit:4;stroke-opacity:1" />
- <path
- d="M 30.019459,52.104166 C 30.764362,52.568927 44.195952,43.287677 44.940855,42.822916 C 45.685758,42.358155 59.833333,34.471188 59.833333,33.541666 C 59.833333,32.612144 45.685758,24.693927 44.940855,24.229166 C 44.195952,23.764405 30.764361,14.483154 30.019459,14.947916 C 29.569562,15.228616 29.672379,20.824428 29.817037,26.041666 L 3.733512,26.041666 C 3.477188,26.041666 3.270833,26.264666 3.270833,26.541666 L 3.270833,40.541666 C 3.270833,40.818666 3.477188,41.041666 3.733512,41.041666 L 29.817037,41.041666 C 29.672378,46.258903 29.569563,51.823466 30.019459,52.104166 z"
- id="rect1303"
- style="fill:url(#linearGradient2422);fill-opacity:1;stroke:none;stroke-width:0.375;stroke-miterlimit:4;stroke-opacity:1" />
- <path
- d="M 56,32.498092 C 56,32.498092 46.143163,28.758884 45.393163,27.459846 C 44.643163,26.160808 31.765602,20.067541 32.131627,18.701516 C 32.497652,17.33549 43.893163,24.86177 43.893163,24.86177 C 43.893163,24.86177 52.611644,28.295956 56,32.498092 z"
- id="path2096"
- style="fill:#d0f1fc;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
- <rect
- height="1"
- id="rect2098"
- rx="0.5"
- ry="0.5"
- style="fill:#d0f1fc;fill-opacity:1;stroke:none;stroke-width:0.375;stroke-miterlimit:4;stroke-opacity:1"
- transform="scale(-1,-1)"
- width="23"
- x="-27.270832"
- y="-28" />
- </g>
- <g
- id="g2424"
- transform="matrix(0,-0.8161651,-1.6782543,0,122.04356,52.382073)">
- <path
- d="M 32.186126,52.104166 C 32.931029,52.568927 46.362619,43.287677 47.107522,42.822916 C 47.852425,42.358155 62,34.471188 62,33.541666 C 62,32.612144 47.852425,24.693927 47.107522,24.229166 C 46.362619,23.764405 32.931028,14.483154 32.186126,14.947916 C 31.736229,15.228616 31.839046,20.824428 31.983704,26.041666 L 5.900179,26.041666 C 5.643855,26.041666 5.4375,26.264666 5.4375,26.541666 L 5.4375,40.541666 C 5.4375,40.818666 5.643855,41.041666 5.900179,41.041666 L 31.983704,41.041666 C 31.839045,46.258903 31.73623,51.823466 32.186126,52.104166 z"
- id="path2426"
- style="fill:url(#linearGradient2434);fill-opacity:1;stroke:none;stroke-width:0.375;stroke-miterlimit:4;stroke-opacity:1" />
- <path
- d="M 30.019459,52.104166 C 30.764362,52.568927 44.195952,43.287677 44.940855,42.822916 C 45.685758,42.358155 59.833333,34.471188 59.833333,33.541666 C 59.833333,32.612144 45.685758,24.693927 44.940855,24.229166 C 44.195952,23.764405 30.764361,14.483154 30.019459,14.947916 C 29.569562,15.228616 29.672379,20.824428 29.817037,26.041666 L 3.733512,26.041666 C 3.477188,26.041666 3.270833,26.264666 3.270833,26.541666 L 3.270833,40.541666 C 3.270833,40.818666 3.477188,41.041666 3.733512,41.041666 L 29.817037,41.041666 C 29.672378,46.258903 29.569563,51.823466 30.019459,52.104166 z"
- id="path2428"
- style="fill:url(#linearGradient2436);fill-opacity:1;stroke:none;stroke-width:0.375;stroke-miterlimit:4;stroke-opacity:1" />
- <path
- d="M 56,32.498092 C 56,32.498092 46.143163,28.758884 45.393163,27.459846 C 44.643163,26.160808 31.765602,20.067541 32.131627,18.701516 C 32.497652,17.33549 43.893163,24.86177 43.893163,24.86177 C 43.893163,24.86177 52.611644,28.295956 56,32.498092 z"
- id="path2430"
- style="fill:#d0f1fc;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
- <rect
- height="1"
- id="rect2432"
- rx="0.5"
- ry="0.5"
- style="fill:#d0f1fc;fill-opacity:1;stroke:none;stroke-width:0.375;stroke-miterlimit:4;stroke-opacity:1"
- transform="scale(-1,-1)"
- width="23"
- x="-27.270832"
- y="-28" />
- </g>
- <g
- id="g2438"
- transform="matrix(-0.8161651,0,0,-1.6496137,51.134197,122.05924)">
- <path
- d="M 32.186126,52.104166 C 32.931029,52.568927 46.362619,43.287677 47.107522,42.822916 C 47.852425,42.358155 62,34.471188 62,33.541666 C 62,32.612144 47.852425,24.693927 47.107522,24.229166 C 46.362619,23.764405 32.931028,14.483154 32.186126,14.947916 C 31.736229,15.228616 31.839046,20.824428 31.983704,26.041666 L 5.900179,26.041666 C 5.643855,26.041666 5.4375,26.264666 5.4375,26.541666 L 5.4375,40.541666 C 5.4375,40.818666 5.643855,41.041666 5.900179,41.041666 L 31.983704,41.041666 C 31.839045,46.258903 31.73623,51.823466 32.186126,52.104166 z"
- id="path2440"
- style="fill:url(#linearGradient2448);fill-opacity:1;stroke:none;stroke-width:0.375;stroke-miterlimit:4;stroke-opacity:1" />
- <path
- d="M 30.019459,52.104166 C 30.764362,52.568927 44.195952,43.287677 44.940855,42.822916 C 45.685758,42.358155 59.833333,34.471188 59.833333,33.541666 C 59.833333,32.612144 45.685758,24.693927 44.940855,24.229166 C 44.195952,23.764405 30.764361,14.483154 30.019459,14.947916 C 29.569562,15.228616 29.672379,20.824428 29.817037,26.041666 L 3.733512,26.041666 C 3.477188,26.041666 3.270833,26.264666 3.270833,26.541666 L 3.270833,40.541666 C 3.270833,40.818666 3.477188,41.041666 3.733512,41.041666 L 29.817037,41.041666 C 29.672378,46.258903 29.569563,51.823466 30.019459,52.104166 z"
- id="path2442"
- style="fill:url(#linearGradient2450);fill-opacity:1;stroke:none;stroke-width:0.375;stroke-miterlimit:4;stroke-opacity:1" />
- <path
- d="M 56,32.498092 C 56,32.498092 46.143163,28.758884 45.393163,27.459846 C 44.643163,26.160808 31.765602,20.067541 32.131627,18.701516 C 32.497652,17.33549 43.893163,24.86177 43.893163,24.86177 C 43.893163,24.86177 52.611644,28.295956 56,32.498092 z"
- id="path2444"
- style="fill:#d0f1fc;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
- <rect
- height="1"
- id="rect2446"
- rx="0.5"
- ry="0.5"
- style="fill:#d0f1fc;fill-opacity:1;stroke:none;stroke-width:0.375;stroke-miterlimit:4;stroke-opacity:1"
- transform="scale(-1,-1)"
- width="23"
- x="-27.270832"
- y="-28" />
- </g>
- <g
- id="g2452"
- transform="matrix(0.8161651,0,0,-1.6496137,77.748214,121.52667)">
- <path
- d="M 32.186126,52.104166 C 32.931029,52.568927 46.362619,43.287677 47.107522,42.822916 C 47.852425,42.358155 62,34.471188 62,33.541666 C 62,32.612144 47.852425,24.693927 47.107522,24.229166 C 46.362619,23.764405 32.931028,14.483154 32.186126,14.947916 C 31.736229,15.228616 31.839046,20.824428 31.983704,26.041666 L 5.900179,26.041666 C 5.643855,26.041666 5.4375,26.264666 5.4375,26.541666 L 5.4375,40.541666 C 5.4375,40.818666 5.643855,41.041666 5.900179,41.041666 L 31.983704,41.041666 C 31.839045,46.258903 31.73623,51.823466 32.186126,52.104166 z"
- id="path2454"
- style="fill:url(#linearGradient2462);fill-opacity:1;stroke:none;stroke-width:0.375;stroke-miterlimit:4;stroke-opacity:1" />
- <path
- d="M 30.019459,52.104166 C 30.764362,52.568927 44.195952,43.287677 44.940855,42.822916 C 45.685758,42.358155 59.833333,34.471188 59.833333,33.541666 C 59.833333,32.612144 45.685758,24.693927 44.940855,24.229166 C 44.195952,23.764405 30.764361,14.483154 30.019459,14.947916 C 29.569562,15.228616 29.672379,20.824428 29.817037,26.041666 L 3.733512,26.041666 C 3.477188,26.041666 3.270833,26.264666 3.270833,26.541666 L 3.270833,40.541666 C 3.270833,40.818666 3.477188,41.041666 3.733512,41.041666 L 29.817037,41.041666 C 29.672378,46.258903 29.569563,51.823466 30.019459,52.104166 z"
- id="path2456"
- style="fill:url(#linearGradient2464);fill-opacity:1;stroke:none;stroke-width:0.375;stroke-miterlimit:4;stroke-opacity:1" />
- <path
- d="M 56,32.498092 C 56,32.498092 46.143163,28.758884 45.393163,27.459846 C 44.643163,26.160808 31.765602,20.067541 32.131627,18.701516 C 32.497652,17.33549 43.893163,24.86177 43.893163,24.86177 C 43.893163,24.86177 52.611644,28.295956 56,32.498092 z"
- id="path2458"
- style="fill:#d0f1fc;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
- <rect
- height="1"
- id="rect2460"
- rx="0.5"
- ry="0.5"
- style="fill:#d0f1fc;fill-opacity:1;stroke:none;stroke-width:0.375;stroke-miterlimit:4;stroke-opacity:1"
- transform="scale(-1,-1)"
- width="23"
- x="-27.270832"
- y="-28" />
- </g>
- </g>
-</svg>
=== modified file 'Scooby-Do/src/applet-appli-finder.h'
--- Scooby-Do/src/applet-appli-finder.h 2009-10-05 19:27:17 +0000
+++ Scooby-Do/src/applet-appli-finder.h 2010-09-22 10:43:43 +0000
@@ -17,11 +17,9 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-
#ifndef __APPLET_APPLI_FINDER__
#define __APPLET_APPLI_FINDER__
-
#include <cairo-dock.h>
#include "applet-struct.h"
=== modified file 'Scooby-Do/src/applet-config.c'
--- Scooby-Do/src/applet-config.c 2010-08-07 01:43:25 +0000
+++ Scooby-Do/src/applet-config.c 2010-09-22 10:43:43 +0000
@@ -60,7 +60,6 @@
//\_________________ Here you have to get all your parameters from the conf file. Use the macros CD_CONFIG_GET_BOOLEAN, CD_CONFIG_GET_INTEGER, CD_CONFIG_GET_STRING, etc. myConfig has been reseted to 0 at this point. This function is called at the beginning of init and reload.
CD_APPLET_GET_CONFIG_BEGIN
- myConfig.cShortkeyNav = CD_CONFIG_GET_STRING ("Configuration", "shortkey");
myConfig.cShortkeySearch = CD_CONFIG_GET_STRING ("Configuration", "shortkey search");
myConfig.iAppearanceDuration = CD_CONFIG_GET_INTEGER ("Configuration", "appear duration");
myConfig.iCloseDuration = CD_CONFIG_GET_INTEGER ("Configuration", "stop duration");
@@ -126,10 +125,6 @@
//\_________________ Here you have to free all ressources allocated for myConfig. This one will be reseted to 0 at the end of this function. This function is called right before you get the applet's config, and when your applet is stopped, in the end.
CD_APPLET_RESET_CONFIG_BEGIN
- //g_print ("%s / %s\n", myConfig.cShortkeyNav, myConfig.cShortkeySearch);
- if (myConfig.cShortkeyNav)
- cd_keybinder_unbind (myConfig.cShortkeyNav, (CDBindkeyHandler) cd_do_on_shortkey_nav);
- g_free (myConfig.cShortkeyNav);
if (myConfig.cShortkeySearch)
cd_keybinder_unbind (myConfig.cShortkeySearch, (CDBindkeyHandler) cd_do_on_shortkey_search);
g_free (myConfig.cShortkeySearch);
@@ -154,10 +149,6 @@
cairo_surface_destroy (myData.pPromptSurface);
if (myData.iPromptTexture != 0)
_cairo_dock_delete_texture (myData.iPromptTexture);
- if (myData.pArrowSurface != NULL)
- cairo_surface_destroy (myData.pArrowSurface);
- if (myData.iArrowTexture != 0)
- _cairo_dock_delete_texture (myData.iArrowTexture);
if (myData.pScoobySurface != NULL)
cairo_surface_destroy (myData.pScoobySurface);
if (myData.pActiveButtonSurface != NULL)
=== modified file 'Scooby-Do/src/applet-draw.c'
--- Scooby-Do/src/applet-draw.c 2010-08-07 01:43:25 +0000
+++ Scooby-Do/src/applet-draw.c 2010-09-22 10:43:43 +0000
@@ -91,7 +91,7 @@
if (myData.pCharList == NULL && myData.pListingHistory == NULL) // aucune lettre de tapee => on montre le prompt.
{
- if (! myData.bNavigationMode && myData.pPromptSurface != NULL)
+ if (myData.pPromptSurface != NULL)
{
double fFrameWidth = myData.iPromptWidth;
double fFrameHeight = myData.iPromptHeight;
@@ -105,30 +105,11 @@
if (fAlpha != 0)
{
cairo_translate (pCairoContext, fDockOffsetX, fDockOffsetY);
- cairo_dock_draw_surface (pCairoContext, myData.pArrowSurface, fFrameWidth, fFrameHeight, pMainDock->container.bDirectionUp, pMainDock->container.bIsHorizontal, fAlpha);
+ cairo_dock_draw_surface (pCairoContext, myData.pPromptSurface, fFrameWidth, fFrameHeight, pMainDock->container.bDirectionUp, pMainDock->container.bIsHorizontal, fAlpha);
//cairo_set_source_surface (pCairoContext, myData.pPromptSurface, 0., 0.);
//cairo_paint_with_alpha (pCairoContext, fAlpha);
}
}
- else if (myData.bNavigationMode && myData.pArrowSurface != NULL)
- {
- double fFrameWidth = myData.iArrowWidth;
- double fFrameHeight = myData.iArrowHeight;
-
- double fDockOffsetX, fDockOffsetY; // Offset du coin haut gauche du prompt.
- fDockOffsetX = (pMainDock->container.iWidth - fFrameWidth) / 2;
- fDockOffsetY = (pMainDock->container.iHeight - fFrameHeight) / 2;
-
- fAlpha *= _alpha_prompt (myData.iPromptAnimationCount, s_iNbPromptAnimationSteps);
-
- if (fAlpha != 0)
- {
- cairo_translate (pCairoContext, fDockOffsetX, fDockOffsetY);
- cairo_dock_draw_surface (pCairoContext, myData.pArrowSurface, fFrameWidth, fFrameHeight, pMainDock->container.bDirectionUp, pMainDock->container.bIsHorizontal, fAlpha);
- //cairo_set_source_surface (pCairoContext, myData.pArrowSurface, 0., 0.);
- //cairo_paint_with_alpha (pCairoContext, fAlpha);
- }
- }
}
else // si du texte a ete entre, on le dessine, ainsi que eventuellement la liste des icones correspondantes.
{
@@ -282,7 +263,7 @@
if (myData.pCharList == NULL && myData.pListingHistory == NULL) // aucune lettre de tapee => on montre le prompt.
{
- if (! myData.bNavigationMode && myData.iPromptTexture != 0)
+ if (myData.iPromptTexture != 0)
{
double fFrameWidth = myData.iPromptWidth;
double fFrameHeight = myData.iPromptHeight;
@@ -310,34 +291,6 @@
glPopMatrix();
}
}
- else if (myData.bNavigationMode && myData.iArrowTexture != 0)
- {
- double fFrameWidth = myData.iArrowWidth;
- double fFrameHeight = myData.iArrowHeight;
-
- double fDockOffsetX, fDockOffsetY; // Offset du coin haut gauche du prompt.
- fDockOffsetX = (pMainDock->container.iWidth - fFrameWidth) / 2;
- fDockOffsetY = (pMainDock->container.iHeight - fFrameHeight) / 2;
-
- fAlpha *= _alpha_prompt (myData.iPromptAnimationCount, s_iNbPromptAnimationSteps);
-
- if (fAlpha != 0)
- {
- glPushMatrix ();
- if (! pMainDock->container.bIsHorizontal)
- glRotatef (pMainDock->container.bDirectionUp ? 90. : -90., 0., 0., 1.);
- glTranslatef (pMainDock->container.iWidth/2, pMainDock->container.iHeight/2, 0.);
-
- _cairo_dock_enable_texture ();
- _cairo_dock_set_blend_alpha ();
-
- _cairo_dock_apply_texture_at_size_with_alpha (myData.iArrowTexture, fFrameWidth, fFrameHeight, fAlpha);
-
- _cairo_dock_disable_texture ();
-
- glPopMatrix();
- }
- }
}
else // si du texte a ete entre, on le dessine, ainsi que eventuellement la liste des icones correspondantes.
{
=== modified file 'Scooby-Do/src/applet-icon-finder.c'
--- Scooby-Do/src/applet-icon-finder.c 2010-08-07 01:43:25 +0000
+++ Scooby-Do/src/applet-icon-finder.c 2010-09-22 10:43:43 +0000
@@ -52,197 +52,6 @@
return bMatch;
}
-static void _find_icon_in_dock_with_command (Icon *pIcon, CairoDock *pDock, gpointer *data)
-{
- gchar *cCommandPrefix = data[0];
- int length = GPOINTER_TO_INT (data[1]);
- Icon *pAfterIcon = data[2];
- Icon **pFoundIcon = data[3];
- CairoDock **pFoundDock = data[4];
- Icon **pFirstIcon = data[5];
- CairoDock **pFirstParentDock = data[6];
- if (pDock == g_pMainDock || *pFoundIcon != NULL) // on a deja cherche dans le main dock, ou deja trouve ce qu'on cherchait.
- return ;
-
- gboolean bFound = _cd_do_icon_match (pIcon, cCommandPrefix, length);
- if (bFound)
- {
- if (pAfterIcon == NULL)
- {
- *pFoundIcon = pIcon;
- *pFoundDock = pDock;
- }
- else
- {
- if (*pFirstIcon == NULL) // on garde une trace de la 1ere icone pour boucler dans la liste.
- {
- *pFirstIcon = pIcon;
- *pFirstParentDock = g_pMainDock;
- }
- if (pIcon == pAfterIcon)
- {
- data[2] = NULL;
- }
- }
- }
-}
-Icon *cd_do_search_icon_by_command (const gchar *cCommandPrefix, Icon *pAfterIcon, CairoDock **pDock)
-{
- g_return_val_if_fail (cCommandPrefix != NULL, NULL);
-
- //\_________________ on cherche en premier dans le main dock, car il est deja visible.
- int length = strlen (cCommandPrefix);
- Icon *pIcon, *pFirstIcon = NULL;
- CairoDock *pParentDock, *pFirstParentDock = NULL;
- GList *ic;
- for (ic = g_pMainDock->icons; ic != NULL; ic = ic->next)
- {
- pIcon = ic->data;
- if (pIcon->cCommand && g_ascii_strncasecmp (cCommandPrefix, pIcon->cCommand, length) == 0)
- {
- if (pAfterIcon == NULL)
- {
- *pDock = g_pMainDock;
- return pIcon;
- }
- else
- {
- if (pFirstIcon == NULL) // on garde une trace de la 1ere icone pour boucler dans la liste.
- {
- pFirstIcon = pIcon;
- pFirstParentDock = g_pMainDock;
- }
- if (pIcon == pAfterIcon)
- {
- pAfterIcon = NULL;
- }
- }
- }
- }
-
- //\_________________ si on a rien trouve on cherche dans tous les docks.
- pIcon = NULL;
- *pDock = NULL;
- gpointer data[7];
- data[0] = (gchar *)cCommandPrefix;
- data[1] = GINT_TO_POINTER (length);
- data[2] = pAfterIcon;
- data[3] = &pIcon;
- data[4] = pDock;
- data[5] = &pFirstIcon;
- data[6] = &pFirstParentDock;
- cairo_dock_foreach_icons_in_docks ((CairoDockForeachIconFunc) _find_icon_in_dock_with_command, data);
-
- if (pIcon == NULL)
- {
- pIcon = pFirstIcon;
- *pDock = pFirstParentDock;
- }
- return pIcon;
-}
-
-
-void cd_do_change_current_icon (Icon *pIcon, CairoDock *pDock)
-{
- //\_________________ on gere le cachage et le montrage du dock precedent et actuel.
- if (myData.pCurrentDock != NULL && pDock != myData.pCurrentDock && myData.pCurrentDock != g_pMainDock) // on remet au repos dock precedemment anime.
- {
- cairo_dock_emit_leave_signal (myData.pCurrentDock);
- }
- if (pDock != NULL && pDock != g_pMainDock && pDock != myData.pCurrentDock) // on montre le nouveau dock
- {
- if (pDock != NULL)
- {
- if (pDock->iRefCount > 0)
- {
- CairoDock *pParentDock = NULL;
- Icon *pPointingIcon = cairo_dock_search_icon_pointing_on_dock (pDock, &pParentDock);
- if (pPointingIcon != NULL)
- {
- cairo_dock_show_subdock (pPointingIcon, pParentDock); // utile pour le montrage des sous-docks au clic.
- }
- }
- else
- {
- ///cairo_dock_pop_up (pDock);
- }
- cairo_dock_emit_enter_signal (pDock);
- }
- }
- if (pDock != NULL)
- {
-
- gtk_window_present (GTK_WINDOW (pDock->container.pWidget));
- }
-
- //\_________________ on gere l'allumage et l'eteignage de l'icone precedente et actuelle.
- if (myData.pCurrentIcon != NULL && pIcon != myData.pCurrentIcon) // on remet au repos l'icone precedemment anime.
- {
- myData.bIgnoreIconState = TRUE;
- cairo_dock_stop_icon_animation (myData.pCurrentIcon);
- myData.bIgnoreIconState = FALSE;
- cairo_dock_redraw_icon (myData.pCurrentIcon, CAIRO_CONTAINER (myData.pCurrentDock)); /// utile ?...
- }
- if (pIcon != NULL && myData.pCurrentIcon != pIcon) // on anime la nouvelle icone.
- {
- int x = pIcon->fXAtRest + pIcon->fWidth/2 + (- pDock->fFlatDockWidth + pDock->iMaxDockWidth)/2;
- int y = pIcon->fDrawY + pIcon->fHeight/2 * pIcon->fScale;
- if (1||myData.pCurrentDock != pDock)
- {
- cairo_dock_emit_motion_signal (pDock,
- x,
- y);
- }
- else
- {
- myData.iPrevMouseX = myData.iMouseX;
- myData.iPrevMouseY = myData.iMouseY;
- myData.iMotionCount = 10;
- }
- myData.iMouseX = x;
- myData.iMouseY = y;
- cairo_dock_request_icon_animation (pIcon, pDock, myConfig.cIconAnimation, 1e6); // interrompt l'animation de "mouse over".
- cairo_dock_launch_animation (CAIRO_CONTAINER (pDock));
- //if (myAccessibility.bShowSubDockOnClick)
- // cairo_dock_show_subdock (pIcon, pDock, FALSE);
- }
-
- myData.pCurrentDock = pDock;
- myData.pCurrentIcon = pIcon;
- if (myData.pCurrentDock == NULL)
- gtk_window_present (GTK_WINDOW (g_pMainDock->container.pWidget));
-}
-
-
-void cd_do_search_current_icon (gboolean bLoopSearch)
-{
- //\_________________ on cherche un lanceur correspondant.
- CairoDock *pDock;
- Icon *pIcon = cd_do_search_icon_by_command (myData.sCurrentText->str, (bLoopSearch ? myData.pCurrentIcon : NULL), &pDock);
- cd_debug ("found icon : %s\n", pIcon ? pIcon->cName : "none");
-
- //\_________________ on gere le changement d'icone/dock.
- cd_do_change_current_icon (pIcon, pDock);
-}
-
-
-gboolean cairo_dock_emit_motion_signal (CairoDock *pDock, int iMouseX, int iMouseY)
-{
- static gboolean bReturn;
- static GdkEventMotion motion;
- motion.state = 0;
- motion.x = iMouseX;
- motion.y = iMouseY;
- motion.x_root = pDock->container.iWindowPositionX + pDock->container.iMouseX;
- motion.y_root = pDock->container.iWindowPositionY + pDock->container.iMouseY;
- motion.time = 0;
- motion.window = pDock->container.pWidget->window;
- motion.device = gdk_device_get_core_pointer ();
- g_signal_emit_by_name (pDock->container.pWidget, "motion-notify-event", &motion, &bReturn);
- return FALSE;
-}
-
-
static inline void _cd_do_search_matching_icons_in_dock (CairoDock *pDock)
{
@@ -270,7 +79,7 @@
return;
cd_debug ("%s (%s)\n", __func__, myData.sCurrentText->str);
gchar *str = strchr (myData.sCurrentText->str, ' '); // on ne compte pas les arguments d'une eventuelle commande deja tapee.
- int length = myData.sCurrentText->len;
+ guint length = myData.sCurrentText->len;
if (str != NULL)
{
g_string_set_size (myData.sCurrentText, str - myData.sCurrentText->str + 1);
@@ -279,22 +88,13 @@
if (myData.pMatchingIcons == NULL)
{
- if (myData.bSessionStartedAutomatically) // on cherche dans le dock courant.
- {
- cd_debug ("on cherche dans le dock\n");
- _cd_do_search_matching_icons_in_dock (myData.pCurrentDock);
- myData.pMatchingIcons = g_list_reverse (myData.pMatchingIcons);
- }
- else
- {
- cd_debug ("on cherche tout\n");
- // on parcours tous les docks.
- cairo_dock_foreach_icons_in_docks ((CairoDockForeachIconFunc) _cd_do_search_in_one_dock, NULL);
- myData.pMatchingIcons = g_list_reverse (myData.pMatchingIcons);
-
- // on rajoute les icones ne venant pas du dock.
- cd_do_find_matching_applications ();
- }
+ cd_debug ("on cherche tout\n");
+ // on parcours tous les docks.
+ cairo_dock_foreach_icons_in_docks ((CairoDockForeachIconFunc) _cd_do_search_in_one_dock, NULL);
+ myData.pMatchingIcons = g_list_reverse (myData.pMatchingIcons);
+
+ // on rajoute les icones ne venant pas du dock.
+ cd_do_find_matching_applications ();
}
else // optimisation : on peut se contenter de chercher parmi les icones deja trouvees.
{
@@ -317,7 +117,7 @@
myData.iCurrentMatchingOffset = 0;
if (myData.pCurrentApplicationToLoad != NULL) // on va continuer le chargement sur la sous-liste.
myData.pCurrentApplicationToLoad = myData.pMatchingIcons; // comme l'ordre de la liste n'a pas ete altere, on n'est sur de ne pas sauter d'icone.
- cairo_dock_redraw_container (CAIRO_CONTAINER (myData.pCurrentDock));
+ cairo_dock_redraw_container (CAIRO_CONTAINER (g_pMainDock));
//g_print ("%d / %d\n", length , myData.sCurrentText->len);
if (length != myData.sCurrentText->len)
g_string_set_size (myData.sCurrentText, length);
=== modified file 'Scooby-Do/src/applet-icon-finder.h'
--- Scooby-Do/src/applet-icon-finder.h 2009-10-05 19:27:17 +0000
+++ Scooby-Do/src/applet-icon-finder.h 2010-09-22 10:43:43 +0000
@@ -17,7 +17,6 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-
#ifndef __APPLET_ICON_FINDER__
#define __APPLET_ICON_FINDER__
=== modified file 'Scooby-Do/src/applet-init.c'
--- Scooby-Do/src/applet-init.c 2010-08-07 01:43:25 +0000
+++ Scooby-Do/src/applet-init.c 2010-09-22 10:43:43 +0000
@@ -36,22 +36,18 @@
CD_APPLET_DEFINE_BEGIN ("Scooby-Do",
2, 1, 4,
CAIRO_DOCK_CATEGORY_APPLET_SYSTEM,
- N_("This plug-in allows you to make different actions directly from the keyboard.\n"
- "It has 2 modes, each one being triggered by a keyboard shortcut:\n\n"
- "- the finder mode (default shortcut : CTRL + Enter) :\n"
- " It lets you find and launch applications, files, recent files, firefox bookmarks, commands, and even calculations.\n"
- " Type what you want to search, the results will be displayed in real time.\n"
- " The first results of each category are displayed in the main listing.\n"
- " Use the up/down arrows to navigate inside the list,\n"
- " and use the left/right arrows to enter into a category, or to display more actions (when a little arrow is drawn next to text).\n"
- " Once inside a category, you can filter the results by typing some letters.\n"
- " Press Enter to validate, maintain SHIFT or ALT to keep the list of results opened.\n\n"
- "- the navigation mode (default shortcut : CTRL + F9) :\n"
- " use the arrows to navigate into the docks and sub-docks,\n"
- " or type the name of a launcher and press Tab to automatically jump to the next suitable launcher\n"
- " press Enter to click on the icon, Shift+Enter for Shift+click, Alt+Enter for middle click, and Ctrl+Enter for left click\n"
+ ("This plug-in allows you to make different actions directly from the keyboard.\n"
+ "It is triggered by a keyboard shortcut (by default: CTRL + Enter):\n"
+ "It lets you find and launch applications, files, recent files, firefox bookmarks, commands, and even calculations.\n"
+ "Type what you want to search, the results will be displayed in real time.\n"
+ "The first results of each category are displayed in the main listing.\n"
+ "Use the up/down arrows to navigate inside the list,\n"
+ " and use the left/right arrows to enter into a category, or to display more actions (when a little arrow is drawn next to text).\n"
+ "Once inside a category, you can filter the results by typing some letters.\n"
+ "Press Enter to validate, maintain SHIFT or ALT to keep the list of results opened.\n"
"Escape or the same shortkey will cancel."),
"Fabounet (Fabrice Rey)")
+ CD_APPLET_DEFINE_COMMON_APPLET_INTERFACE
CD_APPLET_SET_CONTAINER_TYPE (CAIRO_DOCK_MODULE_IS_PLUGIN);
CD_APPLET_DEFINE_END
@@ -70,7 +66,6 @@
CD_APPLET_INIT_BEGIN
cairo_dock_register_notification (CAIRO_DOCK_KEY_PRESSED, (CairoDockNotificationFunc) cd_do_key_pressed, CAIRO_DOCK_RUN_AFTER, NULL);
- cd_keybinder_bind (myConfig.cShortkeyNav, (CDBindkeyHandler) cd_do_on_shortkey_nav, myApplet);
cd_keybinder_bind (myConfig.cShortkeySearch, (CDBindkeyHandler) cd_do_on_shortkey_search, myApplet);
_register_backends ();
@@ -97,7 +92,6 @@
cd_do_destroy_listing (myData.pListing);
myData.pListing = NULL;
- cd_keybinder_bind (myConfig.cShortkeyNav, (CDBindkeyHandler) cd_do_on_shortkey_nav, myApplet); // shortkey were unbinded during reset_config.
cd_keybinder_bind (myConfig.cShortkeySearch, (CDBindkeyHandler) cd_do_on_shortkey_search, myApplet); // shortkey were unbinded during reset_config.
if (myData.sCurrentText != NULL) // peu probable.
=== modified file 'Scooby-Do/src/applet-notifications.c'
--- Scooby-Do/src/applet-notifications.c 2010-08-07 01:43:25 +0000
+++ Scooby-Do/src/applet-notifications.c 2010-09-22 10:43:43 +0000
@@ -32,7 +32,7 @@
gboolean cd_do_render (gpointer pUserData, CairoContainer *pContainer, cairo_t *pCairoContext)
{
- g_return_val_if_fail (cd_do_session_is_running (), CAIRO_DOCK_LET_PASS_NOTIFICATION);
+ g_return_val_if_fail (!cd_do_session_is_off (), CAIRO_DOCK_LET_PASS_NOTIFICATION);
if (pCairoContext != NULL)
{
@@ -49,17 +49,7 @@
gboolean cd_do_update_container (gpointer pUserData, CairoContainer *pContainer, gboolean *bContinueAnimation)
{
- g_return_val_if_fail (cd_do_session_is_running (), CAIRO_DOCK_LET_PASS_NOTIFICATION);
-
- if (myData.iMotionCount != 0)
- {
- myData.iMotionCount --;
- double f = (double) myData.iMotionCount / 10;
- cairo_dock_emit_motion_signal (CAIRO_DOCK (pContainer),
- f * myData.iPrevMouseX + (1-f) * myData.iMouseX,
- f * myData.iPrevMouseY + (1-f) * myData.iMouseY);
- *bContinueAnimation = TRUE;
- }
+ g_return_val_if_fail (!cd_do_session_is_off (), CAIRO_DOCK_LET_PASS_NOTIFICATION);
int iDeltaT = cairo_dock_get_animation_delta_t (pContainer);
if (cd_do_session_is_closing ())
@@ -72,7 +62,7 @@
*bContinueAnimation = TRUE;
cairo_dock_redraw_container (pContainer);
}
- else if (cd_do_session_is_waiting_for_input ())
+ else if (cd_do_session_is_running ())
{
if (myData.pCharList == NULL)
{
@@ -137,31 +127,6 @@
}*/
-gboolean cd_do_check_icon_stopped (gpointer pUserData, Icon *pIcon)
-{
- if (pIcon == myData.pCurrentIcon && ! myData.bIgnoreIconState)
- {
- cd_debug ("notre icone vient de se faire stopper\n");
- myData.pCurrentIcon = NULL;
- myData.pCurrentDock = NULL;
-
- // eventuellement emuler un TAB pour trouver la suivante ...
- }
- if (myData.pMatchingIcons != NULL)
- {
- myData.pMatchingIcons = g_list_remove (myData.pMatchingIcons, pIcon);
- if (myData.pCurrentMatchingElement && myData.pCurrentMatchingElement->data == pIcon)
- myData.pCurrentMatchingElement = NULL;
- if (myData.pCurrentApplicationToLoad && myData.pCurrentApplicationToLoad->data == pIcon)
- {
- myData.pCurrentApplicationToLoad = myData.pCurrentApplicationToLoad->next;
- }
- }
-
- return CAIRO_DOCK_LET_PASS_NOTIFICATION;
-}
-
-
static void _check_dock_is_active (gchar *cDockName, CairoDock *pDock, Window *data)
{
Window xActiveWindow = data[0];
@@ -170,6 +135,8 @@
}
gboolean cd_do_check_active_dock (gpointer pUserData, Window *XActiveWindow)
{
+ g_return_val_if_fail (cd_do_session_is_running (), CAIRO_DOCK_LET_PASS_NOTIFICATION);
+
if (myData.sCurrentText == NULL || XActiveWindow == NULL)
return CAIRO_DOCK_LET_PASS_NOTIFICATION;
Window data[2] = {*XActiveWindow, 0};
@@ -181,73 +148,10 @@
}
-static void _place_menu (GtkMenu *menu,
- gint *x,
- gint *y,
- gboolean *push_in,
- gpointer user_data)
-{
- /// gerer les docks verticaux ...
- *x = myData.pCurrentDock->container.iWindowPositionX + myData.pCurrentDock->container.iMouseX;
- *y = myData.pCurrentDock->container.iWindowPositionY;
- *push_in = TRUE;
-}
-
-static inline int _orient_arrow (CairoContainer *pContainer, int iKeyVal)
-{
- switch (iKeyVal)
- {
- case GDK_Up :
- if (pContainer->bIsHorizontal)
- {
- if (!pContainer->bDirectionUp)
- iKeyVal = GDK_Down;
- }
- else
- {
- iKeyVal = GDK_Left;
- }
- break;
-
- case GDK_Down :
- if (pContainer->bIsHorizontal)
- {
- if (!pContainer->bDirectionUp)
- iKeyVal = GDK_Up;
- }
- else
- {
- iKeyVal = GDK_Right;
- }
- break;
-
- case GDK_Left :
- if (!pContainer->bIsHorizontal)
- {
- if (pContainer->bDirectionUp)
- iKeyVal = GDK_Up;
- else
- iKeyVal = GDK_Down;
- }
- break;
-
- case GDK_Right :
- if (!pContainer->bIsHorizontal)
- {
- if (pContainer->bDirectionUp)
- iKeyVal = GDK_Down;
- else
- iKeyVal = GDK_Up;
- }
- break;
- default:
- break;
-
- }
- return iKeyVal;
-}
gboolean cd_do_key_pressed (gpointer pUserData, CairoContainer *pContainer, guint iKeyVal, guint iModifierType, const gchar *string)
{
+ g_return_val_if_fail (cd_do_session_is_running (), CAIRO_DOCK_LET_PASS_NOTIFICATION);
+
if (myData.sCurrentText == NULL)
return CAIRO_DOCK_LET_PASS_NOTIFICATION;
@@ -267,30 +171,6 @@
{
// on rejette.
}
- else if (iKeyVal == GDK_Menu) // emulation du clic droit.
- {
- if (myData.bNavigationMode)
- {
- if (myData.pCurrentIcon != NULL)
- {
- myData.bIgnoreIconState = TRUE;
- cairo_dock_stop_icon_animation (myData.pCurrentIcon); // car on va perdre le focus.
- myData.bIgnoreIconState = FALSE;
- }
- if (myData.pCurrentDock == NULL)
- myData.pCurrentDock = g_pMainDock;
- myData.pCurrentDock->bMenuVisible = TRUE;
- GtkWidget *menu = cairo_dock_build_menu (myData.pCurrentIcon, CAIRO_CONTAINER (myData.pCurrentDock));
- gtk_widget_show_all (menu);
- gtk_menu_popup (GTK_MENU (menu),
- NULL,
- NULL,
- (GtkMenuPositionFunc) _place_menu, // pour positionner le menu sur le dock plutot que sur la souris.
- NULL,
- 1,
- gtk_get_current_event_time ());
- }
- }
else if (iKeyVal == GDK_BackSpace) // on efface la derniere lettre.
{
if (myData.iNbValidCaracters > 0)
@@ -303,38 +183,31 @@
cd_do_delete_invalid_caracters ();
// on relance la recherche.
- if (myData.bNavigationMode)
- {
- if (myData.pCurrentIcon == NULL) // sinon l'icone actuelle convient toujours.
- cd_do_search_current_icon (FALSE);
- }
- else // mode recherche.
- {
- if (myData.pListingHistory == NULL) // recherche principale.
- {
- g_list_free (myData.pMatchingIcons);
- myData.pMatchingIcons = NULL;
- cd_do_search_matching_icons ();
- if (myData.pMatchingIcons == NULL && myData.sCurrentText->len > 0) // on n'a trouve aucun programme, on cherche des entrees.
- {
- if (myData.iSidLoadExternAppliIdle != 0)
- {
- g_source_remove (myData.iSidLoadExternAppliIdle);
- myData.iSidLoadExternAppliIdle = 0;
- }
- cd_do_launch_all_backends ();
- }
- else // on a trouve au moins un programme, on cache le listing des fichiers.
- {
-
- cd_do_hide_listing ();
- }
- }
- else // sous-recherche => on filtre.
- {
- cd_do_filter_current_listing ();
- }
- }
+ if (myData.pListingHistory == NULL) // recherche principale.
+ {
+ g_list_free (myData.pMatchingIcons);
+ myData.pMatchingIcons = NULL;
+ cd_do_search_matching_icons ();
+ if (myData.pMatchingIcons == NULL && myData.sCurrentText->len > 0) // on n'a trouve aucun programme, on cherche des entrees.
+ {
+ if (myData.iSidLoadExternAppliIdle != 0)
+ {
+ g_source_remove (myData.iSidLoadExternAppliIdle);
+ myData.iSidLoadExternAppliIdle = 0;
+ }
+ cd_do_launch_all_backends ();
+ }
+ else // on a trouve au moins un programme, on cache le listing des fichiers.
+ {
+
+ cd_do_hide_listing ();
+ }
+ }
+ else // sous-recherche => on filtre.
+ {
+ cd_do_filter_current_listing ();
+ }
+
// on repositionne les caracteres et on anime tout ca.
cd_do_launch_appearance_animation ();
@@ -345,176 +218,45 @@
if (myData.iNbValidCaracters > 0)
{
gboolean bPrevious = iModifierType & GDK_SHIFT_MASK;
- if (myData.bNavigationMode)
+ if (myData.pMatchingIcons != NULL)
{
- // on cherche l'icone suivante.
- cd_do_search_current_icon (TRUE); // pCurrentIcon peut etre NULL si elle s'est faite detruire pendant la recherche, auquel cas on cherchera juste normalement.
+ cd_do_select_previous_next_matching_icon (!bPrevious);
}
- else
+ else
{
- if (myData.pMatchingIcons != NULL)
- {
- cd_do_select_previous_next_matching_icon (!bPrevious);
- }
- else
- {
- // faire un truc ?...
- }
+ // faire un truc ?...
}
}
}
else if (iKeyVal == GDK_Return)
{
cd_debug ("Enter (%s)\n", myData.cSearchText);
- if (myData.bNavigationMode)
- {
- if (myData.pCurrentIcon != NULL && myData.pCurrentDock != NULL)
- {
- cd_debug ("on clique sur l'icone '%s' [%d, %d]\n", myData.pCurrentIcon->cName, iModifierType, GDK_SHIFT_MASK);
-
- myData.bIgnoreIconState = TRUE;
- if (iModifierType & GDK_MOD1_MASK) // ALT
- {
- myData.bIgnoreIconState = TRUE;
- cairo_dock_stop_icon_animation (myData.pCurrentIcon); // car aucune animation ne va la remplacer.
- myData.bIgnoreIconState = FALSE;
- cairo_dock_notify (CAIRO_DOCK_MIDDLE_CLICK_ICON, myData.pCurrentIcon, myData.pCurrentDock);
- }
- else if (iModifierType & GDK_CONTROL_MASK) // CTRL
- {
- myData.bIgnoreIconState = TRUE;
- cairo_dock_stop_icon_animation (myData.pCurrentIcon); // car on va perdre le focus.
- myData.bIgnoreIconState = FALSE;
-
- myData.pCurrentDock->bMenuVisible = TRUE;
- GtkWidget *menu = cairo_dock_build_menu (myData.pCurrentIcon, CAIRO_CONTAINER (myData.pCurrentDock));
- gtk_widget_show_all (menu);
- gtk_menu_popup (GTK_MENU (menu),
- NULL,
- NULL,
- NULL,
- NULL,
- 1,
- gtk_get_current_event_time ());
- }
- else if (myData.pCurrentIcon != NULL)
- cairo_dock_notify (CAIRO_DOCK_CLICK_ICON, myData.pCurrentIcon, myData.pCurrentDock, iModifierType);
- if (myData.pCurrentIcon != NULL)
- cairo_dock_start_icon_animation (myData.pCurrentIcon, myData.pCurrentDock);
- myData.bIgnoreIconState = FALSE;
- myData.pCurrentIcon = NULL; // sinon on va interrompre l'animation en fermant la session.
- }
+ if (myData.pMatchingIcons != NULL) // on a une appli a lancer.
+ {
+ Icon *pIcon = (myData.pCurrentMatchingElement ? myData.pCurrentMatchingElement->data : myData.pMatchingIcons->data);
+ cairo_dock_launch_command (pIcon->cCommand);
+ }
+ else if (myData.pListing && myData.pListing->pCurrentEntry) // pas d'appli mais une entree => on l'execute.
+ {
+ CDEntry *pEntry = myData.pListing->pCurrentEntry->data;
+ cd_debug ("on valide l'entree '%s ; %s'\n", pEntry->cName, pEntry->cPath);
+ if (pEntry->execute)
+ pEntry->execute (pEntry);
+ else
+ return CAIRO_DOCK_INTERCEPT_NOTIFICATION;
+ }
+ else if (myData.iNbValidCaracters > 0) // pas d'entree mais du texte => on l'execute tel quel.
+ {
+ cd_debug ("on execute '%s'\n", myData.sCurrentText->str);
+ cairo_dock_launch_command (myData.sCurrentText->str);
+ }
+
+ if (!(iModifierType & GDK_CONTROL_MASK) && !(iModifierType & GDK_MOD1_MASK) && !(iModifierType & GDK_SHIFT_MASK))
cd_do_close_session ();
- }
- else // mode recherche.
- {
- if (myData.pMatchingIcons != NULL) // on a une appli a lancer.
- {
- Icon *pIcon = (myData.pCurrentMatchingElement ? myData.pCurrentMatchingElement->data : myData.pMatchingIcons->data);
- cairo_dock_launch_command (pIcon->cCommand);
- }
- else if (myData.pListing && myData.pListing->pCurrentEntry) // pas d'appli mais une entree => on l'execute.
- {
- CDEntry *pEntry = myData.pListing->pCurrentEntry->data;
- cd_debug ("on valide l'entree '%s ; %s'\n", pEntry->cName, pEntry->cPath);
- if (pEntry->execute)
- pEntry->execute (pEntry);
- else
- return CAIRO_DOCK_INTERCEPT_NOTIFICATION;
- }
- else if (myData.iNbValidCaracters > 0) // pas d'entree mais du texte => on l'execute tel quel.
- {
- cd_debug ("on execute '%s'\n", myData.sCurrentText->str);
- cairo_dock_launch_command (myData.sCurrentText->str);
- }
-
- if (!(iModifierType & GDK_CONTROL_MASK) && !(iModifierType & GDK_MOD1_MASK) && !(iModifierType & GDK_SHIFT_MASK))
- cd_do_close_session ();
- }
}
else if (iKeyVal == GDK_Left || iKeyVal == GDK_Right || iKeyVal == GDK_Up || iKeyVal == GDK_Down)
{
- if (myData.bNavigationMode)
- {
- iKeyVal = _orient_arrow (pContainer, iKeyVal);
- if (iKeyVal == GDK_Up)
- {
- if (myData.pCurrentIcon != NULL && myData.pCurrentIcon->pSubDock != NULL)
- {
- cd_debug ("on monte dans le sous-dock %s\n", myData.pCurrentIcon->cName);
- Icon *pIcon = cairo_dock_get_first_icon (myData.pCurrentIcon->pSubDock->icons);
- cd_do_change_current_icon (pIcon, myData.pCurrentIcon->pSubDock);
- }
- }
- else if (iKeyVal == GDK_Down)
- {
- if (myData.pCurrentDock != NULL && myData.pCurrentDock->iRefCount > 0)
- {
- CairoDock *pParentDock = NULL;
- Icon *pPointingIcon = cairo_dock_search_icon_pointing_on_dock (myData.pCurrentDock, &pParentDock);
- if (pPointingIcon != NULL)
- {
- cd_debug ("on redescend dans le dock parent via %s\n", pPointingIcon->cName);
- cd_do_change_current_icon (pPointingIcon, pParentDock);
- }
- }
- }
- else if (iKeyVal == GDK_Left)
- {
- if (myData.pCurrentDock == NULL) // on initialise le deplacement.
- {
- myData.pCurrentDock = g_pMainDock;
- int n = g_list_length (g_pMainDock->icons);
- if (n > 0)
- {
- myData.pCurrentIcon = g_list_nth_data (g_pMainDock->icons, (n-1) / 2);
- if (CAIRO_DOCK_IS_SEPARATOR (myData.pCurrentIcon) && n > 1)
- myData.pCurrentIcon = g_list_nth_data (g_pMainDock->icons, (n+1) / 2);
- }
- }
- if (myData.pCurrentDock->icons != NULL)
- {
- Icon *pPrevIcon = cairo_dock_get_previous_icon (myData.pCurrentDock->icons, myData.pCurrentIcon);
- if (CAIRO_DOCK_IS_SEPARATOR (pPrevIcon))
- pPrevIcon = cairo_dock_get_previous_icon (myData.pCurrentDock->icons, pPrevIcon);
- if (pPrevIcon == NULL) // pas trouve ou bien 1ere icone.
- {
- pPrevIcon = cairo_dock_get_last_icon (myData.pCurrentDock->icons);
- }
-
- cd_debug ("on se deplace a gauche sur %s\n", pPrevIcon ? pPrevIcon->cName : "none");
- cd_do_change_current_icon (pPrevIcon, myData.pCurrentDock);
- }
- }
- else // Gdk_Right.
- {
- if (myData.pCurrentDock == NULL) // on initialise le deplacement.
- {
- myData.pCurrentDock = g_pMainDock;
- int n = g_list_length (g_pMainDock->icons);
- if (n > 0)
- {
- myData.pCurrentIcon = g_list_nth_data (g_pMainDock->icons, (n-1) / 2);
- if (CAIRO_DOCK_IS_SEPARATOR (myData.pCurrentIcon) && n > 1)
- myData.pCurrentIcon = g_list_nth_data (g_pMainDock->icons, (n+1) / 2);
- }
- }
- if (myData.pCurrentDock->icons != NULL)
- {
- Icon *pNextIcon = cairo_dock_get_next_icon (myData.pCurrentDock->icons, myData.pCurrentIcon);
- if (CAIRO_DOCK_IS_SEPARATOR (pNextIcon))
- pNextIcon = cairo_dock_get_next_icon (myData.pCurrentDock->icons, pNextIcon);
- if (pNextIcon == NULL) // pas trouve ou bien 1ere icone.
- {
- pNextIcon = cairo_dock_get_first_icon (myData.pCurrentDock->icons);
- }
-
- cd_debug ("on se deplace a gauche sur %s\n", pNextIcon ? pNextIcon->cName : "none");
- cd_do_change_current_icon (pNextIcon, myData.pCurrentDock);
- }
- }
- }
- else if (myData.pMatchingIcons != NULL)
+ if (myData.pMatchingIcons != NULL)
{
cd_do_select_previous_next_matching_icon (iKeyVal == GDK_Right || iKeyVal == GDK_Down);
}
@@ -540,15 +282,7 @@
}
else if (iKeyVal == GDK_Page_Down || iKeyVal == GDK_Page_Up || iKeyVal == GDK_Home || iKeyVal == GDK_End)
{
- if (myData.bNavigationMode)
- {
- if (myData.pCurrentDock == NULL) // on initialise le deplacement.
- myData.pCurrentDock = g_pMainDock;
- Icon *pIcon = (iKeyVal == GDK_Page_Up || iKeyVal == GDK_Home ? cairo_dock_get_first_icon (myData.pCurrentDock->icons) : cairo_dock_get_last_icon (myData.pCurrentDock->icons));
- cd_debug ("on se deplace a l'extremite sur %s\n", pIcon ? pIcon->cName : "none");
- cd_do_change_current_icon (pIcon, myData.pCurrentDock);
- }
- else if (myData.pListing != NULL)
+ if (myData.pListing != NULL)
{
if (iKeyVal == GDK_Page_Down || iKeyVal == GDK_Page_Up)
cd_do_select_prev_next_page_in_listing (iKeyVal == GDK_Page_Down); // TRUE <=> next page
@@ -558,7 +292,7 @@
}
else if (iKeyVal >= GDK_F1 && iKeyVal <= GDK_F9)
{
- if (! myData.bNavigationMode && myData.pListing != NULL && GTK_WIDGET_VISIBLE (myData.pListing->container.pWidget))
+ if (myData.pListing != NULL && GTK_WIDGET_VISIBLE (myData.pListing->container.pWidget))
{
cd_debug ("modification du filtre : option n°%d", iKeyVal - GDK_F1);
cd_do_activate_filter_option (iKeyVal - GDK_F1);
@@ -568,7 +302,7 @@
else if (string) /// utiliser l'unichar ...
{
cd_debug ("string:'%s'\n", string);
- int iNbNewChar = 0;
+ guint iNbNewChar = 0;
if ((iModifierType & GDK_CONTROL_MASK) && iUnicodeChar == 'v') // CTRL+v
{
cd_debug ("CTRL+v\n");
@@ -597,30 +331,25 @@
myData.iNbValidCaracters = myData.sCurrentText->len; // l'utilisateur valide la nouvelle lettre ainsi que celles precedemment ajoutee par completion.
}
- if (myData.bNavigationMode) // on cherche un lanceur correspondant.
+
+ // on cherche la liste des icones qui correspondent.
+ if (myData.pListingHistory == NULL)
{
- cd_do_search_current_icon (FALSE);
+ //if (! (myData.bFoundNothing || (myData.pListing && myData.pListing->pEntries))) // on n'est pas deja dans une recherche de fichiers
+ if (myData.iNbValidCaracters == iNbNewChar || myData.pMatchingIcons != NULL) // 1er ajout de lettre ou precedente recherche d'icones fructueuse => on remet ca.
+ {
+ cd_do_search_matching_icons ();
+ }
+
+ // si on n'a trouve aucun lanceur, on lance la recherche dans les backends.
+ if (myData.pMatchingIcons == NULL)
+ {
+ cd_do_launch_all_backends ();
+ }
}
- else // on cherche la liste des icones qui correspondent.
+ else
{
- if (myData.pListingHistory == NULL)
- {
- //if (! (myData.bFoundNothing || (myData.pListing && myData.pListing->pEntries))) // on n'est pas deja dans une recherche de fichiers
- if (myData.iNbValidCaracters == iNbNewChar || myData.pMatchingIcons != NULL) // 1er ajout de lettre ou precedente recherche d'icones fructueuse => on remet ca.
- {
- cd_do_search_matching_icons ();
- }
-
- // si on n'a trouve aucun lanceur, on lance la recherche dans les backends.
- if (myData.pMatchingIcons == NULL)
- {
- cd_do_launch_all_backends ();
- }
- }
- else
- {
- cd_do_filter_current_listing ();
- }
+ cd_do_filter_current_listing ();
}
// on rajoute une surface/texture pour la/les nouvelle(s) lettre(s).
@@ -636,22 +365,14 @@
}
-#define _cd_do_on_shortkey(bNewModeNav) \
- if (myData.sCurrentText == NULL) { \
- myData.bNavigationMode = bNewModeNav; \
- cd_do_open_session (); } \
- else { \
- cd_do_close_session (); \
- if (myData.bNavigationMode != bNewModeNav) { \
- cd_do_open_session (); \
- myData.bNavigationMode = bNewModeNav; } }
-
-void cd_do_on_shortkey_nav (const char *keystring, gpointer data)
-{
- _cd_do_on_shortkey (TRUE);
-}
-
void cd_do_on_shortkey_search (const char *keystring, gpointer data)
{
- _cd_do_on_shortkey (FALSE);
+ if (! cd_do_session_is_running ())
+ {
+ cd_do_open_session ();
+ }
+ else
+ {
+ cd_do_close_session ();
+ }
}
=== modified file 'Scooby-Do/src/applet-notifications.h'
--- Scooby-Do/src/applet-notifications.h 2009-10-05 19:27:17 +0000
+++ Scooby-Do/src/applet-notifications.h 2010-09-22 10:43:43 +0000
@@ -35,16 +35,12 @@
//gboolean cd_do_enter_container (gpointer pUserData, CairoContainer *pContainer, gboolean *bStartAnimation);
-gboolean cd_do_check_icon_stopped (gpointer pUserData, Icon *pIcon);
-
-
gboolean cd_do_check_active_dock (gpointer pUserData, Window *XActiveWindow);
gboolean cd_do_key_pressed (gpointer pUserData, CairoContainer *pContainer, guint iKeyVal, guint iModifierType, const gchar *string);
-void cd_do_on_shortkey_nav (const char *keystring, gpointer data);
void cd_do_on_shortkey_search (const char *keystring, gpointer data);
=== modified file 'Scooby-Do/src/applet-search.c'
--- Scooby-Do/src/applet-search.c 2010-08-07 01:43:25 +0000
+++ Scooby-Do/src/applet-search.c 2010-09-22 10:43:43 +0000
@@ -70,7 +70,7 @@
pBackend->bFoundNothing = FALSE;
pBackend->bTooManyResults = FALSE;
- if (! cd_do_session_is_waiting_for_input () || myData.pListingHistory != NULL) // on a quitte la session ou on a choisi une entree en cours de route.
+ if (! cd_do_session_is_running () || myData.pListingHistory != NULL) // on a quitte la session ou on a choisi une entree en cours de route.
{
cd_debug (" on a quitte la session ou on a choisi une entree en cours de route\n");
_discard_results (pBackend);
=== modified file 'Scooby-Do/src/applet-session.c'
--- Scooby-Do/src/applet-session.c 2010-08-07 01:43:25 +0000
+++ Scooby-Do/src/applet-session.c 2010-09-22 10:43:43 +0000
@@ -29,22 +29,34 @@
void cd_do_open_session (void)
{
- // on termine l'animation de fin de la precedente session.
+ if (cd_do_session_is_running ()) // session already running
+ return;
+
+ // on termine la precedente session.
cd_do_exit_session ();
cd_do_stop_all_backends (); // on le fait maintenant pour ne pas bloquer au exit.
- // on s'abonne aux notifications dont on aura besoin pour la session.
- cairo_dock_register_notification_on_container (CAIRO_CONTAINER (g_pMainDock), CAIRO_DOCK_UPDATE_DOCK, (CairoDockNotificationFunc) cd_do_update_container, CAIRO_DOCK_RUN_AFTER, NULL);
- cairo_dock_register_notification_on_container (CAIRO_CONTAINER (g_pMainDock), CAIRO_DOCK_RENDER_DOCK, (CairoDockNotificationFunc) cd_do_render, CAIRO_DOCK_RUN_AFTER, NULL);
- cairo_dock_register_notification (CAIRO_DOCK_STOP_ICON, (CairoDockNotificationFunc) cd_do_check_icon_stopped, CAIRO_DOCK_RUN_AFTER, NULL);
+ // register to draw on dock.
+ if (cd_do_session_is_off ())
+ {
+ cairo_dock_register_notification_on_container (CAIRO_CONTAINER (g_pMainDock),
+ CAIRO_DOCK_UPDATE_DOCK,
+ (CairoDockNotificationFunc) cd_do_update_container,
+ CAIRO_DOCK_RUN_AFTER, NULL);
+ cairo_dock_register_notification_on_container (CAIRO_CONTAINER (g_pMainDock),
+ CAIRO_DOCK_RENDER_DOCK,
+ (CairoDockNotificationFunc) cd_do_render,
+ CAIRO_DOCK_RUN_AFTER, NULL);
+ }
+
+ // wait for keyboard input.
+ cairo_dock_register_notification (CAIRO_DOCK_KEY_PRESSED, (CairoDockNotificationFunc) cd_do_key_pressed, CAIRO_DOCK_RUN_AFTER, NULL);
cairo_dock_register_notification (CAIRO_DOCK_WINDOW_ACTIVATED, (CairoDockNotificationFunc) cd_do_check_active_dock, CAIRO_DOCK_RUN_AFTER, NULL);
- //cairo_dock_register_notification (CAIRO_DOCK_ENTER_DOCK, (CairoDockNotificationFunc) cd_do_enter_container, CAIRO_DOCK_RUN_FIRST, NULL);
- // on se met en attente de texte.
myData.sCurrentText = g_string_sized_new (20);
myConfig.labelDescription.iSize = myConfig.fFontSizeRatio * g_pMainDock->iMaxDockHeight;
myData.iPromptAnimationCount = 0;
- if (! myData.bNavigationMode && myData.pPromptSurface == NULL)
+ if (myData.pPromptSurface == NULL)
{
cairo_t *pCairoContext = cairo_dock_create_context_from_window (CAIRO_CONTAINER (g_pMainDock));
myData.pPromptSurface = cairo_dock_create_surface_from_text (D_("Enter your search"), &myConfig.labelDescription, &myData.iPromptWidth, &myData.iPromptHeight);
@@ -54,22 +66,9 @@
myData.iPromptTexture = cairo_dock_create_texture_from_surface (myData.pPromptSurface);
}
}
- else if (myData.bNavigationMode && myData.pArrowSurface == NULL)
- {
- cairo_t *pCairoContext = cairo_dock_create_context_from_window (CAIRO_CONTAINER (g_pMainDock));
- myData.pArrowSurface = cairo_dock_create_surface_for_icon (MY_APPLET_SHARE_DATA_DIR"/arrows.svg", g_pMainDock->iMaxDockHeight, g_pMainDock->iMaxDockHeight);
- myData.iArrowWidth = g_pMainDock->iMaxDockHeight;
- myData.iArrowHeight = g_pMainDock->iMaxDockHeight;
- cairo_destroy (pCairoContext);
- if (g_bUseOpenGL)
- {
- myData.iArrowTexture = cairo_dock_create_texture_from_surface (myData.pArrowSurface);
- }
- }
+
// on montre le main dock.
- myData.bIgnoreIconState = TRUE;
- cairo_dock_emit_enter_signal (g_pMainDock);
- myData.bIgnoreIconState = FALSE;
+ cairo_dock_emit_enter_signal (CAIRO_CONTAINER (g_pMainDock));
// le main dock prend le focus.
myData.iPreviouslyActiveWindow = cairo_dock_get_active_xwindow ();
@@ -81,24 +80,23 @@
// On lance l'animation d'attente.
cairo_dock_launch_animation (CAIRO_CONTAINER (g_pMainDock));
+
+ myData.iSessionState = 2;
}
void cd_do_close_session (void)
{
- // on ne veut plus de texte.
+ if (! cd_do_session_is_running ()) // session not running
+ return;
+
+ // no more keyboard input.
+ cairo_dock_remove_notification_func (CAIRO_DOCK_KEY_PRESSED, (CairoDockNotificationFunc) cd_do_key_pressed, NULL);
+ cairo_dock_remove_notification_func (CAIRO_DOCK_WINDOW_ACTIVATED, (CairoDockNotificationFunc) cd_do_check_active_dock, NULL);
+
g_string_free (myData.sCurrentText, TRUE);
myData.sCurrentText = NULL;
myData.iNbValidCaracters = 0;
- // on remet a zero la session.
- if (myData.pCurrentIcon != NULL)
- {
- myData.bIgnoreIconState = TRUE;
- cairo_dock_stop_icon_animation (myData.pCurrentIcon);
- myData.bIgnoreIconState = FALSE;
- myData.pCurrentIcon = NULL;
- }
-
// on cache les resultats
cd_do_hide_listing ();
@@ -106,16 +104,7 @@
myData.cSearchText = NULL;
myData.iCurrentFilter = 0;
- if (myData.pCurrentDock != NULL)
- {
- //cairo_dock_leave_from_main_dock (myData.pCurrentDock); /// voir avec un emit_leave_signal ...
- cairo_dock_emit_leave_signal (myData.pCurrentDock);
- myData.pCurrentDock = NULL;
- }
- if (myData.pCurrentDock != g_pMainDock)
- {
- cairo_dock_emit_leave_signal (g_pMainDock);
- }
+ cairo_dock_emit_leave_signal (CAIRO_CONTAINER (g_pMainDock));
// on redonne le focus a l'ancienne fenetre.
if (myData.iPreviouslyActiveWindow != 0)
@@ -131,20 +120,26 @@
myData.iCloseTime = myConfig.iCloseDuration;
cairo_dock_launch_animation (CAIRO_CONTAINER (g_pMainDock));
cairo_dock_freeze_docks (FALSE);
+
+ myData.iSessionState = 1;
}
void cd_do_exit_session (void)
{
+ if (cd_do_session_is_off ()) // session already off
+ return;
+
+
+ cd_do_close_session ();
+
+ myData.iCloseTime = 0;
+
cairo_dock_remove_notification_func_on_container (CAIRO_CONTAINER (g_pMainDock), CAIRO_DOCK_RENDER_DOCK, (CairoDockNotificationFunc) cd_do_render, NULL);
cairo_dock_remove_notification_func_on_container (CAIRO_CONTAINER (g_pMainDock), CAIRO_DOCK_UPDATE_DOCK, (CairoDockNotificationFunc) cd_do_update_container, NULL);
- cairo_dock_remove_notification_func (CAIRO_DOCK_STOP_ICON, (CairoDockNotificationFunc) cd_do_check_icon_stopped, NULL);
- cairo_dock_remove_notification_func (CAIRO_DOCK_WINDOW_ACTIVATED, (CairoDockNotificationFunc) cd_do_check_active_dock, NULL);
- //cairo_dock_remove_notification_func (CAIRO_DOCK_ENTER_DOCK, (CairoDockNotificationFunc) cd_do_enter_container, NULL);
-
- // arreter les backends...
-
-
- myData.iCloseTime = 0;
+
+ /// arreter les backends...
+
+
if (myData.pCharList != NULL)
{
cd_do_free_char_list (myData.pCharList);
@@ -179,6 +174,8 @@
myData.iPreviousMatchingOffset = 0;
myData.iCurrentMatchingOffset = 0;
}
+
+ myData.iSessionState = 0;
}
@@ -214,7 +211,8 @@
CDChar *pChar;
cairo_t *pCairoContext = cairo_dock_create_context_from_window (CAIRO_CONTAINER (g_pMainDock));
int iDeltaT = cairo_dock_get_animation_delta_t (g_pMainDock);
- int i, iOffsetX=0;
+ guint i;
+ int iOffsetX=0;
for (i = myData.iNbValidCaracters-0; i < myData.sCurrentText->len; i++)
{
//g_print (" on charge la lettre '%c' (%d) tex:%d\n", myData.sCurrentText->str[i], i, bLoadTexture);
@@ -297,7 +295,7 @@
// on efface les lettres precedentes jusqu'a la derniere position validee.
CDChar *pChar;
GList *c = g_list_last (myData.pCharList), *c_prev;
- int i;
+ guint i;
for (i = myData.iNbValidCaracters; i < myData.sCurrentText->len && c != NULL; i ++)
{
//g_print ("on efface '%c'\n", myData.sCurrentText->str[i]);
=== modified file 'Scooby-Do/src/applet-session.h'
--- Scooby-Do/src/applet-session.h 2009-10-05 19:27:17 +0000
+++ Scooby-Do/src/applet-session.h 2010-09-22 10:43:43 +0000
@@ -31,11 +31,9 @@
void cd_do_exit_session (void);
-#define cd_do_session_is_waiting_for_input(...) (myData.sCurrentText != NULL)
-#define cd_do_session_is_closing(...) (myData.iCloseTime != 0)
-#define cd_do_session_is_running(...) (cd_do_session_is_waiting_for_input () || cd_do_session_is_closing ())
-#define cd_do_session_is_in_navigation_mode(...) (myData.pCharList == NULL)
-#define cd_do_session_is_in_selection_mode(...) (myData.pCharList != NUUL)
+#define cd_do_session_is_running(...) (myData.iSessionState == 2)
+#define cd_do_session_is_closing(...) (myData.iSessionState == 1)
+#define cd_do_session_is_off(...) (myData.iSessionState == 0)
void cd_do_free_char (CDChar *pChar);
void cd_do_free_char_list (GList *pCharList);
=== modified file 'Scooby-Do/src/applet-struct.h'
--- Scooby-Do/src/applet-struct.h 2010-02-14 00:51:22 +0000
+++ Scooby-Do/src/applet-struct.h 2010-09-22 10:43:43 +0000
@@ -23,30 +23,11 @@
#include <cairo-dock.h>
-/**Le concept de ce plug-in est le suivant :
- * - l'utilisateur l'active par la combinaison de touches pre-definie :
- * => mode navigation : les fleches deplacent l'icone courante
- * une lettre deplace sur la 1ere icone correspondante au mot courant
- * TAB deplace sur l'icone suivante corespondante au mot courant
- * la completion est automatique
- * si aucune icone n'est trouvee, la completion elargie est utilisee.
- * => mode recherche : les fleches deplacent parmi la liste d'icones correspondantes
- * une lettre reduit/elargit la liste courante
- * les icones de la liste sont affichees dans le dock principal, zoomees si necessaire
- * completion: idem
- * - l'utilisateur appuie sur une lettre en ayant la souris dans un dock ayant le focus :
- * => le mode navigation est active avec cette 1ere lettre
- * seule le dock courant est pris en compte
- * en cas de sortie du dock, la session est terminee
- * la completion est automatique sur les icones trouvees seulement.
- * */
-
//\___________ structure containing the applet's configuration parameters.
struct _AppletConfig {
gdouble fFontSizeRatio; // 1 <=> taille du dock
gboolean bTextOnTop;
CairoDockLabelDescription labelDescription;
- gchar *cShortkeyNav;
gchar *cShortkeySearch;
gchar *cIconAnimation;
gdouble pFrameColor[4];
@@ -167,31 +148,19 @@
//\___________ structure containing the applet's data, like surfaces, dialogs, results of calculation, etc.
struct _AppletData {
+ gint iSessionState; // 0:no session, 1: session closing, 2: session running
GString *sCurrentText;
- gint iStopCount;
- gint iNbValidCaracters;
+ guint iNbValidCaracters;
Window iPreviouslyActiveWindow;
- Icon *pCurrentIcon;
- CairoDock *pCurrentDock;
gint iTextWidth, iTextHeight;
gint iCloseTime;
GList *pCharList;
- gboolean bIgnoreIconState;
gint iAppearanceTime;
- gint iPrevMouseX, iPrevMouseY;
- gint iMouseX, iMouseY;
- gint iMotionCount;
-
- gboolean bNavigationMode;
- gboolean bSessionStartedAutomatically;
gint iPromptAnimationCount;
cairo_surface_t *pPromptSurface;
gint iPromptWidth, iPromptHeight;
GLuint iPromptTexture;
- cairo_surface_t *pArrowSurface;
- gint iArrowWidth, iArrowHeight;
- GLuint iArrowTexture;
GList *pMatchingIcons;
GList *pCurrentMatchingElement;
=== modified file 'Status-Notifier/src/applet-draw.c'
--- Status-Notifier/src/applet-draw.c 2010-09-07 00:39:20 +0000
+++ Status-Notifier/src/applet-draw.c 2010-09-22 10:43:43 +0000
@@ -62,13 +62,13 @@
myData.iItemSize = iSize;
}
}
- g_print ("satus_notifier : %dx%d\n", myData.iNbLines, myData.iNbColumns);
+ //g_print ("satus_notifier : %dx%d\n", myData.iNbLines, myData.iNbColumns);
}
void cd_satus_notifier_draw_compact_icon (void)
{
- g_print ("%s ()\n", __func__);
+ //g_print ("%s ()\n", __func__);
int iWidth, iHeight;
CD_APPLET_GET_MY_ICON_EXTENT (&iWidth, &iHeight);
@@ -133,13 +133,13 @@
void cd_satus_notifier_reload_compact_mode (void)
{
- g_print ("%s ()\n", __func__);
+ //g_print ("%s ()\n", __func__);
// re-compute the grid.
int iPrevSize = myData.iItemSize;
cd_satus_notifier_compute_grid ();
// reload surfaces if their size has changed.
- g_print (" size: %d -> %d\n", iPrevSize, myData.iItemSize);
+ //g_print (" size: %d -> %d\n", iPrevSize, myData.iItemSize);
CDStatusNotifierItem *pItem;
GList *it;
for (it = myData.pItems; it != NULL; it = it->next)
@@ -172,9 +172,10 @@
return NULL;
int iMouseX, iMouseY;
- iMouseX = myContainer->iMouseX;
- iMouseY = myContainer->iMouseY;
+ iMouseX = myContainer->iMouseX - myIcon->fDrawX;
+ iMouseY = myContainer->iMouseY - myIcon->fDrawY;
+ //g_print ("%s (%d;%d)\n", __func__, iMouseX, iMouseY);
// get index on the grid.
int iWidth, iHeight;
CD_APPLET_GET_MY_ICON_EXTENT (&iWidth, &iHeight);
@@ -194,17 +195,17 @@
pItem = it->data;
if (pItem->pSurface != NULL && pItem->iStatus != CD_STATUS_PASSIVE)
{
- j ++;
- if (j == myData.iNbColumns) // next line.
- {
- j = 0;
- i ++;
- }
if (i == line && j == col)
{
pFoundItem = pItem;
break;
}
+ j ++;
+ if (j == myData.iNbColumns) // next line.
+ {
+ j = 0;
+ i ++;
+ }
}
}
=== modified file 'Status-Notifier/src/applet-host.c'
--- Status-Notifier/src/applet-host.c 2010-09-07 00:39:20 +0000
+++ Status-Notifier/src/applet-host.c 2010-09-22 10:43:43 +0000
@@ -49,7 +49,7 @@
gpointer invocation_hint G_GNUC_UNUSED,
gpointer marshal_data)
{
- g_print ("%s ()\n", __func__);
+ //g_print ("%s ()\n", __func__);
typedef void (*GMarshalFunc_VOID__STRING_INT_STRING_STRING_STRING_STRING_STRING) (
gpointer data1,
gchar *arg_1,
@@ -169,7 +169,7 @@
static void on_new_item (DBusGProxy *proxy_watcher, const gchar *cService, CairoDockModuleInstance *myApplet)
{
CD_APPLET_ENTER;
- g_print ("%s (%s)\n", __func__, cService);
+ //g_print ("%s (%s)\n", __func__, cService);
_add_new_item (cService, NULL, -1); // on suppose que leur indicator-application ne mettra jamais -1 comme position.
@@ -179,7 +179,7 @@
static void on_removed_item (DBusGProxy *proxy_watcher, const gchar *cService, CairoDockModuleInstance *myApplet)
{
CD_APPLET_ENTER;
- g_print ("%s (%s)\n", __func__, cService);
+ //g_print ("%s (%s)\n", __func__, cService);
gchar *str = strchr (cService, '/');
if (str)
@@ -193,7 +193,7 @@
static void on_new_application (DBusGProxy *proxy_watcher, const gchar *cIconName, gint iPosition, const gchar *cAdress, const gchar *cObjectPath, const gchar *cIconThemePath, const gchar *cLabel, const gchar *cLabelGuide, CairoDockModuleInstance *myApplet)
{
CD_APPLET_ENTER;
- g_print ("%s (%s, %s, %s, %s, %d)\n", __func__, cAdress, cObjectPath, cIconName, cIconThemePath, iPosition);
+ //g_print ("%s (%s, %s, %s, %s, %d)\n", __func__, cAdress, cObjectPath, cIconName, cIconThemePath, iPosition);
_add_new_item (cAdress, cObjectPath, iPosition);
@@ -203,7 +203,7 @@
static void on_removed_application (DBusGProxy *proxy_watcher, gint iPosition, CairoDockModuleInstance *myApplet)
{
CD_APPLET_ENTER;
- g_print ("%s (%d)\n", __func__, iPosition);
+ //g_print ("%s (%d)\n", __func__, iPosition);
_remove_item (NULL, iPosition);
@@ -217,7 +217,7 @@
static void _on_get_applications_from_service (DBusGProxy *proxy, DBusGProxyCall *call_id, CairoDockModuleInstance *myApplet)
{
- g_print ("%s ()\n", __func__);
+ //g_print ("%s ()\n", __func__);
CD_APPLET_ENTER;
myData.pGetApplicationsCall = NULL;
@@ -252,7 +252,7 @@
GValueArray *va;
GValue *v;
CDStatusNotifierItem *pItem=NULL;
- g_print ("%d apps in the systray\n", pApplications->len);
+ //g_print ("%d apps in the systray\n", pApplications->len);
for (i = 0; i < pApplications->len; i ++)
{
va = pApplications->pdata[i];
@@ -295,14 +295,14 @@
if (v && G_VALUE_HOLDS_STRING (v))
cLabelGuide = g_value_get_string (v);
- g_print (" + item {%s ; %d ; %s ; %s ; %s ; %s ; %s}\n",
+ /*g_print (" + item {%s ; %d ; %s ; %s ; %s ; %s ; %s}\n",
cIconName,
iPosition,
cAdress,
cObjectPath,
cIconThemePath,
cLabel,
- cLabelGuide);
+ cLabelGuide);*/
pItem = cd_satus_notifier_create_item (cAdress, cObjectPath);
if (! pItem)
@@ -326,7 +326,7 @@
static void _cd_satus_notifier_get_indicator_application (void)
{
- g_print ("%s ()\n", __func__);
+ //g_print ("%s ()\n", __func__);
// get the service
myData.pProxyIndicatorApplicationService = cairo_dock_create_new_session_proxy (
CD_INDICATOR_APPLICATION_ADDR,
@@ -364,7 +364,7 @@
static void _on_get_applications_from_watcher (DBusGProxy *proxy, DBusGProxyCall *call_id, CairoDockModuleInstance *myApplet)
{
- g_print ("%s ()\n", __func__);
+ //g_print ("%s ()\n", __func__);
CD_APPLET_ENTER;
myData.pGetApplicationsCall = NULL;
@@ -408,7 +408,7 @@
}
else // un watcher asocial comme celui d'Ubuntu, on essaye avec l'"indicator-application".
{
- g_print ("this watcher is not so friendly, let's try the 'application indicator'\n");
+ //g_print ("this watcher is not so friendly, let's try the 'application indicator'\n");
_cd_satus_notifier_get_indicator_application ();
}
CD_APPLET_LEAVE ();
@@ -416,7 +416,7 @@
static void _on_register_host (DBusGProxy *proxy, DBusGProxyCall *call_id, CairoDockModuleInstance *myApplet)
{
- g_print ("%s ()\n", __func__);
+ //g_print ("%s ()\n", __func__);
CD_APPLET_ENTER;
GError *erreur = NULL;
gboolean bSuccess = dbus_g_proxy_end_call (proxy,
@@ -433,7 +433,7 @@
if (bSuccess) // il y'a un watcher.
{
- g_print ("found a friendly watcher, now ask for the items...\n");
+ //g_print ("found a friendly watcher, now ask for the items...\n");
// get the items
DBusGProxy *pProxyWatcherProps = cairo_dock_create_new_session_proxy (
CD_STATUS_NOTIFIER_WATCHER_ADDR,
@@ -460,7 +460,7 @@
}
else // pas de watcher, ou un asocial comme celui d'Ubuntu, on essaye avec l'"indicator-application".
{
- g_print ("no friendy watcher, let's try the 'application indicator'\n");
+ //g_print ("no friendy watcher, let's try the 'application indicator'\n");
_cd_satus_notifier_get_indicator_application ();
}
CD_APPLET_LEAVE ();
@@ -468,7 +468,7 @@
static void _cd_satus_notifier_register_host (void)
{
// register to the watcher.
- g_print ("registering to the watcher...\n");
+ //g_print ("registering to the watcher...\n");
myData.pRegisterHostCall = dbus_g_proxy_begin_call (myData.pProxyWatcher, "RegisterNotificationHost",
(DBusGProxyCallNotify)_on_register_host,
myApplet,
@@ -500,18 +500,18 @@
// Register the service name on the bus.
pid_t pid = getpid ();
myData.cHostName = g_strdup_printf (CD_STATUS_NOTIFIER_HOST_ADDR"-%d", pid);
- g_print ("registering name '%s' on the bus ...\n", myData.cHostName);
+ //g_print ("registering name '%s' on the bus ...\n", myData.cHostName);
cairo_dock_register_service_name (myData.cHostName);
// get the watcher.
- g_print ("getting the watcher ...\n");
+ //g_print ("getting the watcher ...\n");
myData.pProxyWatcher = cairo_dock_create_new_session_proxy (
CD_STATUS_NOTIFIER_WATCHER_ADDR,
CD_STATUS_NOTIFIER_WATCHER_OBJ,
CD_STATUS_NOTIFIER_WATCHER_IFACE); /// dbus_g_proxy_new_for_name_owner ?...
if (myData.pProxyWatcher == NULL) // no watcher yet, let's try again in a few moment.
{
- g_print ("no watcher yet, let's try again in a few moment\n");
+ //g_print ("no watcher yet, let's try again in a few moment\n");
myData.iSidGetWatcher = g_timeout_add (1000., (GSourceFunc)_get_watcher, myApplet);
return;
}
=== modified file 'Status-Notifier/src/applet-init.c'
--- Status-Notifier/src/applet-init.c 2010-09-07 00:39:20 +0000
+++ Status-Notifier/src/applet-init.c 2010-09-22 10:43:43 +0000
@@ -32,7 +32,7 @@
CD_APPLET_DEFINITION (N_("Status Notifier"),
2, 2, 0,
CAIRO_DOCK_CATEGORY_APPLET_DESKTOP,
- N_("A <b>notification area</b> for your dock\n"
+ ("A <b>notification area</b> for your dock\n"
"Also called 'systray'.\n"
"It is designed to work on any desktop that supports the latest systray specifications (KDE, Gnome, etc)"),
"Fabounet (Fabrice Rey)")
@@ -43,6 +43,9 @@
if (! cairo_dock_reserve_data_slot (myApplet))
return;
+ if (myConfig.bCompactMode)
+ CD_APPLET_SET_STATIC_ICON;
+
if (myDesklet)
{
CD_APPLET_SET_DESKLET_RENDERER ("Simple");
=== modified file 'Status-Notifier/src/applet-item.c'
--- Status-Notifier/src/applet-item.c 2010-09-07 00:39:20 +0000
+++ Status-Notifier/src/applet-item.c 2010-09-22 10:43:43 +0000
@@ -140,11 +140,11 @@
static void on_new_item_icon (DBusGProxy *proxy_item, CDStatusNotifierItem *pItem)
{
CD_APPLET_ENTER;
- g_print ("%s ()\n", __func__);
+ //g_print ("%s ()\n", __func__);
g_free (pItem->cIconName);
pItem->cIconName = cairo_dock_dbus_get_property_as_string (pItem->pProxyProps, CD_STATUS_NOTIFIER_ITEM_IFACE, "IconName");
- g_print (" new icon : %s\n", pItem->cIconName);
+ //g_print (" new icon : %s\n", pItem->cIconName);
if (pItem->iStatus != CD_STATUS_NEEDS_ATTENTION)
{
@@ -156,11 +156,11 @@
static void on_new_item_attention_icon (DBusGProxy *proxy_item, CDStatusNotifierItem *pItem)
{
CD_APPLET_ENTER;
- g_print ("%s ()\n", __func__);
+ //g_print ("%s ()\n", __func__);
g_free (pItem->cAttentionIconName);
pItem->cAttentionIconName = cairo_dock_dbus_get_property_as_string (pItem->pProxyProps, CD_STATUS_NOTIFIER_ITEM_IFACE, "AttentionIconName");
- g_print (" new attention icon : %s\n", pItem->cAttentionIconName);
+ //g_print (" new attention icon : %s\n", pItem->cAttentionIconName);
if (pItem->iStatus == CD_STATUS_NEEDS_ATTENTION)
{
@@ -172,7 +172,7 @@
static void on_new_item_status (DBusGProxy *proxy_item, const gchar *cStatus, CDStatusNotifierItem *pItem)
{
CD_APPLET_ENTER;
- g_print ("%s (%s)\n", __func__, cStatus);
+ //g_print ("%s (%s)\n", __func__, cStatus);
// get the new status
CDStatusEnum iPrevStatus = pItem->iStatus;
@@ -213,7 +213,7 @@
static void on_new_item_label (DBusGProxy *proxy_item, const gchar *cLabel, const gchar *cLabelGuide, CDStatusNotifierItem *pItem)
{
CD_APPLET_ENTER;
- g_print ("%s (%s, %s)\n", __func__, cLabel, cLabelGuide);
+ //g_print ("%s (%s, %s)\n", __func__, cLabel, cLabelGuide);
g_free (pItem->cLabel);
pItem->cLabel = g_strdup (cLabel);
@@ -227,7 +227,7 @@
static void on_new_item_theme_path (DBusGProxy *proxy_item, const gchar *cNewThemePath, CDStatusNotifierItem *pItem)
{
CD_APPLET_ENTER;
- g_print ("%s (%s)\n", __func__, cNewThemePath);
+ //g_print ("%s (%s)\n", __func__, cNewThemePath);
g_free (pItem->cIconThemePath);
pItem->cIconThemePath = g_strdup (cNewThemePath);
@@ -241,11 +241,11 @@
static void on_new_item_title (DBusGProxy *proxy_item, CDStatusNotifierItem *pItem)
{
CD_APPLET_ENTER;
- g_print ("%s ()\n", __func__);
+ //g_print ("%s ()\n", __func__);
g_free (pItem->cTitle);
pItem->cTitle = cairo_dock_dbus_get_property_as_string (pItem->pProxyProps, CD_STATUS_NOTIFIER_ITEM_IFACE, "Title");
- g_print (" new title : %s\n", pItem->cTitle);
+ //g_print (" new title : %s\n", pItem->cTitle);
//cairo_dock_set_icon_name (cTitle, pIcon, CAIRO_CONTAINER (myIcon->pSubDock));
@@ -255,11 +255,11 @@
static void on_new_item_overlay_icon (DBusGProxy *proxy_item, CDStatusNotifierItem *pItem)
{
CD_APPLET_ENTER;
- g_print ("%s ()\n", __func__);
+ //g_print ("%s ()\n", __func__);
g_free (pItem->cOverlayIconName);
pItem->cOverlayIconName = cairo_dock_dbus_get_property_as_string (pItem->pProxyProps, CD_STATUS_NOTIFIER_ITEM_IFACE, "OverlayIconName");
- g_print (" new overlay : %s\n", pItem->cOverlayIconName);
+ //g_print (" new overlay : %s\n", pItem->cOverlayIconName);
/*if (pIcon->pIconBuffer)
{
@@ -284,7 +284,7 @@
static void on_new_item_tooltip (DBusGProxy *proxy_item, CDStatusNotifierItem *pItem)
{
CD_APPLET_ENTER;
- g_print ("%s ()\n", __func__);
+ //g_print ("%s ()\n", __func__);
cd_free_tooltip (pItem->pToolTip);
pItem->pToolTip = NULL;
@@ -308,7 +308,7 @@
if (pItem->bInvalid)
return;
CD_APPLET_ENTER;
- g_print ("this item (%s) was suddenly removed\n", __func__, pItem->cService);
+ //g_print ("this item (%s) was suddenly removed\n", __func__, pItem->cService);
myData.pItems = g_list_remove (myData.pItems, pItem);
@@ -356,7 +356,7 @@
gchar *str = strchr (cService, '/');
if (str)
*str = '\0';
- g_print ("%s (%s)\n", __func__, cService);
+ //g_print ("%s (%s)\n", __func__, cService);
// special case for Ubuntu indicators: we don't know their object path.
if (cObjectPath != NULL && strncmp (cObjectPath, CD_INDICATOR_APPLICATION_ITEM_OBJ, strlen (CD_INDICATOR_APPLICATION_ITEM_OBJ)) == 0)
@@ -377,9 +377,9 @@
DBUS_INTERFACE_PROPERTIES);
if (pProxyItemProp == NULL)
return NULL;
- g_print ("owner : %s\n", dbus_g_proxy_get_bus_name (pProxyItemProp));
+ //g_print ("owner : %s\n", dbus_g_proxy_get_bus_name (pProxyItemProp));
- g_print ("getting properties ...\n");
+ //g_print ("getting properties ...\n");
GHashTable *hProps = cairo_dock_dbus_get_all_properties (pProxyItemProp, CD_STATUS_NOTIFIER_ITEM_IFACE);
if (hProps == NULL)
return NULL;
@@ -392,7 +392,7 @@
{
cId = g_value_get_string (v);
}
- g_print (" ID '%s'\n", cId);
+ //g_print (" ID '%s'\n", cId);
const gchar *cCategory = NULL;
v = g_hash_table_lookup (hProps, "Category"); // (ApplicationStatus, Communications, SystemServices, Hardware) -> fOrder
@@ -400,7 +400,7 @@
{
cCategory = g_value_get_string (v);
}
- g_print (" Category '%s'\n", cCategory);
+ //g_print (" Category '%s'\n", cCategory);
const gchar *cStatus = NULL;
v = g_hash_table_lookup (hProps, "Status"); // (Passive, Active, NeedsAttention) -> demands attention
@@ -408,7 +408,7 @@
{
cStatus = g_value_get_string (v);
}
- g_print (" Status '%s'\n", cStatus);
+ //g_print (" Status '%s'\n", cStatus);
const gchar *cIconName = NULL;
v = g_hash_table_lookup (hProps, "IconName"); // -> cIFileName
@@ -416,7 +416,7 @@
{
cIconName = g_value_get_string (v);
}
- g_print (" IconName '%s'\n", cIconName);
+ //g_print (" IconName '%s'\n", cIconName);
const gchar *cIconThemePath = NULL;
v = g_hash_table_lookup (hProps, "IconThemePath");
@@ -424,7 +424,7 @@
{
cIconThemePath = g_value_get_string (v);
}
- g_print (" IconThemePath '%s'\n", cIconThemePath);
+ //g_print (" IconThemePath '%s'\n", cIconThemePath);
const gchar *cAttentionIconName = NULL;
v = g_hash_table_lookup (hProps, "AttentionIconName"); // -> keep for demands of attention
@@ -432,7 +432,7 @@
{
cAttentionIconName = g_value_get_string (v);
}
- g_print (" AttentionIconName '%s'\n", cAttentionIconName);
+ //g_print (" AttentionIconName '%s'\n", cAttentionIconName);
// properties supported by Ubuntu.
const gchar *cMenuPath = NULL;
@@ -441,7 +441,7 @@
{
cMenuPath = (gchar*) g_value_get_boxed (v);
}
- g_print (" cMenuPath '%s'\n", cMenuPath);
+ //g_print (" cMenuPath '%s'\n", cMenuPath);
const gchar *cLabel = NULL;
v = g_hash_table_lookup (hProps, "XAyatanaLabel");
@@ -449,7 +449,7 @@
{
cLabel = g_value_get_string (v);
}
- g_print (" cLabel '%s'\n", cLabel);
+ //g_print (" cLabel '%s'\n", cLabel);
const gchar *cLabelGuide = NULL;
v = g_hash_table_lookup (hProps, "XAyatanaLabelGuide");
@@ -457,7 +457,7 @@
{
cLabelGuide = g_value_get_string (v);
}
- g_print (" cLabelGuide '%s'\n", cLabelGuide);
+ //g_print (" cLabelGuide '%s'\n", cLabelGuide);
// properties supported by KDE.
const gchar *cTitle = NULL;
@@ -466,7 +466,7 @@
{
cTitle = g_value_get_string (v);
}
- g_print (" Title '%s\n", cTitle);
+ //g_print (" Title '%s\n", cTitle);
v = g_hash_table_lookup (hProps, "WindowId");
guint iWindowId = 0;
@@ -474,7 +474,7 @@
{
iWindowId = g_value_get_uint (v);
}
- g_print (" WindowId '%d'\n", iWindowId);
+ //g_print (" WindowId '%d'\n", iWindowId);
const gchar *cOverlayIconName = NULL;
v = g_hash_table_lookup (hProps, "OverlayIconName"); // -> emblem
@@ -482,7 +482,7 @@
{
cOverlayIconName = g_value_get_string (v);
}
- g_print (" OverlayIconName '%s'\n", cOverlayIconName);
+ //g_print (" OverlayIconName '%s'\n", cOverlayIconName);
const gchar *cAttentionMovieName = NULL;
v = g_hash_table_lookup (hProps, "AttentionMovieName"); // -> idem
@@ -490,7 +490,7 @@
{
cAttentionMovieName = g_value_get_string (v);
}
- g_print (" AttentionMovieName '%s'\n", cAttentionMovieName);
+ //g_print (" AttentionMovieName '%s'\n", cAttentionMovieName);
GValueArray *pToolTipTab = NULL;
v = g_hash_table_lookup (hProps, "ToolTip");
@@ -532,15 +532,9 @@
{
cd_satus_notifier_add_theme_path (pItem->cIconThemePath);
}
- /*if (myConfig.bCompactMode && myData.iItemSize != 0 && pItem->iStatus != CD_STATUS_PASSIVE)
- {
- gchar *cIconPath = cd_satus_notifier_search_item_icon_s_path (pItem);
- if (cIconPath != NULL)
- {
- pItem->pSurface = cairo_dock_create_surface_from_icon (cIconPath, myData.iItemSize, myData.iItemSize);
- g_free (cIconPath);
- }
- }*/
+
+ if (pItem->cMenuPath != NULL)
+ pItem->pMenu = dbusmenu_gtkmenu_new ((gchar *)pItem->cService, (gchar *)pItem->cMenuPath);
//\_________________ track any changes in the item.
// signals supported by both.
=== modified file 'Status-Notifier/src/applet-notifications.c'
--- Status-Notifier/src/applet-notifications.c 2010-09-07 00:39:20 +0000
+++ Status-Notifier/src/applet-notifications.c 2010-09-22 10:43:43 +0000
@@ -39,7 +39,7 @@
*x = pContainer->iWindowPositionY + (pContainer->bDirectionUp ? 0 : pContainer->iHeight);
*y = pContainer->iWindowPositionX + pIcon->fDrawX + pIcon->fWidth * pIcon->fScale/2;
}
- g_print ("click position : %d;%d\n", *x, *y);
+ //g_print ("click position : %d;%d\n", *x, *y);
}
static inline gboolean _emit_click (CDStatusNotifierItem *pItem, Icon *pIcon, CairoContainer *pContainer, const gchar *cSignal)
{
@@ -54,7 +54,7 @@
G_TYPE_INVALID);
if (erreur != NULL)
{
- g_print ("method %s failed (%s)\n", cSignal, erreur->message);
+ //g_print ("method %s failed (%s)\n", cSignal, erreur->message);
g_error_free (erreur);
return FALSE;
}
@@ -84,13 +84,12 @@
CD_APPLET_ON_CLICK_BEGIN
CDStatusNotifierItem *pItem = _get_item (CD_APPLET_CLICKED_ICON, CD_APPLET_CLICKED_CONTAINER);
+ //g_print ("click on item '%s'\n", pItem?pItem->cService:"none");
if (pItem != NULL)
{
gboolean r = _emit_click (pItem, CD_APPLET_CLICKED_ICON, CD_APPLET_CLICKED_CONTAINER, "Activate");
if (!r)
{
- CDStatusNotifierItem *pItem = cd_satus_notifier_get_item_from_icon (CD_APPLET_CLICKED_ICON);
- g_return_val_if_fail (pItem != NULL, CAIRO_DOCK_LET_PASS_NOTIFICATION);
if (pItem->cId != NULL)
{
cairo_dock_launch_command (pItem->cId); // lancer une nouvelle fois l'appli montre sa fenetre (enfin, generalement).
@@ -121,7 +120,7 @@
G_TYPE_INVALID);
if (erreur != NULL)
{
- g_print ("method %s failed (%s)\n", "Scroll", erreur->message);
+ //g_print ("method %s failed (%s)\n", "Scroll", erreur->message);
g_error_free (erreur);
}
}
@@ -173,7 +172,7 @@
if (pItemData != NULL && pItemData->pToolTip != NULL)
{
myDialogs.dialogTextDescription.bUseMarkup = TRUE;
- g_print ("pItemData->pToolTip->cMessage : %s\n", pItemData->pToolTip->cMessage);
+ //g_print ("pItemData->pToolTip->cMessage : %s\n", pItemData->pToolTip->cMessage);
gchar *cText = g_strdup_printf ("<b>%s</b>\n%s", pItemData->pToolTip->cTitle, pItemData->pToolTip->cMessage);
gchar *cIconPath = NULL;
if (pItemData->pToolTip->cIconName)
=== modified file 'System-Monitor/src/applet-config.c'
--- System-Monitor/src/applet-config.c 2010-08-07 01:43:25 +0000
+++ System-Monitor/src/applet-config.c 2010-09-22 10:43:43 +0000
@@ -48,12 +48,6 @@
CD_CONFIG_GET_COLOR_RVB ("Configuration", "high color", myConfig.fHigholor);
CD_CONFIG_GET_COLOR ("Configuration", "bg color", myConfig.fBgColor);
- /*myConfig.fAlpha = CD_CONFIG_GET_DOUBLE ("Configuration", "watermark alpha");
- if (myConfig.fAlpha != 0)
- {
- myConfig.cWatermarkImagePath = CD_CONFIG_GET_FILE_PATH ("Configuration", "watermark image", MY_APPLET_ICON_FILE);
- }*/
-
myConfig.iLowerLimit = CD_CONFIG_GET_INTEGER_WITH_DEFAULT ("Configuration", "llt", 50);
myConfig.iUpperLimit = MAX (myConfig.iLowerLimit+1, CD_CONFIG_GET_INTEGER_WITH_DEFAULT ("Configuration", "ult", 110));
myConfig.iAlertLimit = CD_CONFIG_GET_INTEGER_WITH_DEFAULT ("Configuration", "alt", 100);
@@ -102,7 +96,6 @@
g_free (myConfig.cGThemePath);
g_free (myConfig.defaultTitle);
cairo_dock_free_label_description (myConfig.pTopTextDescription);
- g_free (myConfig.cWatermarkImagePath);
g_free (myConfig.cSystemMonitorCommand);
g_free (myConfig.cSystemMonitorClass);
CD_APPLET_RESET_CONFIG_END
=== modified file 'System-Monitor/src/applet-struct.h'
--- System-Monitor/src/applet-struct.h 2010-08-07 01:43:25 +0000
+++ System-Monitor/src/applet-struct.h 2010-09-22 10:43:43 +0000
@@ -34,6 +34,14 @@
CD_SYSMONITOR_NB_TYPES
} CDSysmonitorDisplayType;
+typedef struct {
+ gint iLowerLimit;
+ gint iUpperLimit;
+ gint iAlertLimit;
+ gboolean bAlert;
+ gboolean bAlertSound;
+ } CDAlertParam;
+
struct _AppletConfig {
gchar *defaultTitle;
gint iCheckInterval;
@@ -46,8 +54,6 @@
CairoDockInfoDisplay iInfoDisplay;
gchar *cGThemePath;
- gchar *cWatermarkImagePath;
- gdouble fAlpha;
CDSysmonitorDisplayType iDisplayType;
CairoDockTypeGraph iGraphType;
@@ -108,6 +114,10 @@
gdouble fPrevRamPercent, fPrevSwapPercent;
gdouble fGpuTempPercent;
gdouble fPrevGpuTempPercent;
+ gdouble fCpuTempPercent;
+ gdouble fPrevCpuTempPercent;
+ gdouble fFanSpeedPercent;
+ gdouble fPrevFanSpeedPercent;
gboolean bNeedsUpdate;
gint iTimerCount;
// end of shared memory.
=== modified file 'clock/src/CMakeLists.txt'
--- clock/src/CMakeLists.txt 2010-08-07 01:43:25 +0000
+++ clock/src/CMakeLists.txt 2010-09-22 10:43:43 +0000
@@ -4,9 +4,10 @@
SET(cd-clock_LIB_SRCS
applet-struct.h
applet-init.c applet-init.h
- applet-draw.c applet-draw.h
applet-config.c applet-config.h
applet-notifications.c applet-notifications.h
+ applet-draw.c applet-draw.h
+ applet-timer.c applet-timer.h
applet-theme.c applet-theme.h
applet-calendar.c applet-calendar.h
applet-task-editor.c applet-task-editor.h
=== modified file 'clock/src/applet-backend-default.c'
--- clock/src/applet-backend-default.c 2010-08-07 01:43:25 +0000
+++ clock/src/applet-backend-default.c 2010-09-22 10:43:43 +0000
@@ -45,46 +45,72 @@
}
gchar *cFile = g_strdup_printf ("%s/%s", cDirPath, "tasks.conf");
GKeyFile *pKeyFile = cairo_dock_open_key_file (cFile);
- g_free (cFile);
+
g_free (cDirPath);
if (pKeyFile == NULL) // encore aucune taches.
+ {
+ g_free (cFile);
return NULL;
+ }
gsize length=0;
gchar **pGroupList = g_key_file_get_groups (pKeyFile, &length);
if (pGroupList == NULL)
{
g_key_file_free (pKeyFile);
+ g_free (cFile);
return NULL;
}
CDClockTask *pTask;
gchar *cTaskID;
GList *pTaskList = NULL;
+ guint iMonth = myData.currentTime.tm_mon;
+ guint iYear = myData.currentTime.tm_year + 1900;
+ guint y, m, freq;
+ gboolean bUpdateFile = FALSE;
guint i;
for (i = 0; i < length; i ++)
{
cTaskID = pGroupList[i];
+
+ // discard tasks older than 1 year (clean the file too).
+ y = g_key_file_get_integer (pKeyFile, cTaskID, "year", NULL);
+ m = g_key_file_get_integer (pKeyFile, cTaskID, "month", NULL);
+ freq = g_key_file_get_integer (pKeyFile, cTaskID, "freq", NULL);
+ if (freq == CD_TASK_DONT_REPEAT && (iYear < y -1 || iYear == y - 1 && iMonth < m))
+ {
+ g_key_file_remove_group (pKeyFile, cTaskID, NULL);
+ bUpdateFile = TRUE;
+ g_free (cTaskID);
+ continue;
+ }
+
+ // append the task.
pTask = g_new0 (CDClockTask, 1);
- //g_print ("+ task %s\n", cTaskID);
-
pTask->cID = cTaskID;
pTask->iDay = g_key_file_get_integer (pKeyFile, cTaskID, "day", NULL);
- pTask->iMonth = g_key_file_get_integer (pKeyFile, cTaskID, "month", NULL);
- pTask->iYear = g_key_file_get_integer (pKeyFile, cTaskID, "year", NULL);
+ pTask->iMonth = m;
+ pTask->iYear = y;
pTask->cTitle = g_key_file_get_string (pKeyFile, cTaskID, "title", NULL);
pTask->cText = g_key_file_get_string (pKeyFile, cTaskID, "text", NULL);
pTask->cTags = g_key_file_get_string (pKeyFile, cTaskID, "tags", NULL);
pTask->iHour = g_key_file_get_integer (pKeyFile, cTaskID, "hour", NULL);
pTask->iMinute = g_key_file_get_integer (pKeyFile, cTaskID, "minute", NULL);
- pTask->iFrequency = g_key_file_get_integer (pKeyFile, cTaskID, "freq", NULL);
+ pTask->iFrequency = freq;
+ pTask->bAcknowledged = g_key_file_get_boolean (pKeyFile, cTaskID, "ack", NULL);
pTaskList = g_list_prepend (pTaskList, pTask);
s_iCounter = MAX (s_iCounter, atoi (cTaskID));
}
g_free (pGroupList); // les elements sont les IDs et sont integres dans les taches.
+
+ if (bUpdateFile)
+ cairo_dock_write_keys_to_file (pKeyFile, cFile);
+
g_key_file_free (pKeyFile);
+ g_free (cFile);
return pTaskList;
}
@@ -107,6 +133,7 @@
g_key_file_set_integer (pKeyFile, pTask->cID, "hour", pTask->iHour);
g_key_file_set_integer (pKeyFile, pTask->cID, "minute", pTask->iMinute);
g_key_file_set_integer (pKeyFile, pTask->cID, "freq", pTask->iFrequency);
+ g_key_file_set_boolean (pKeyFile, pTask->cID, "ack", pTask->bAcknowledged);
cairo_dock_write_keys_to_file (pKeyFile, cFile);
g_free (cFile);
@@ -143,6 +170,7 @@
g_key_file_set_integer (pKeyFile, pTask->cID, "hour", pTask->iHour);
g_key_file_set_integer (pKeyFile, pTask->cID, "minute", pTask->iMinute);
g_key_file_set_integer (pKeyFile, pTask->cID, "freq", pTask->iFrequency);
+ g_key_file_set_boolean (pKeyFile, pTask->cID, "ack", pTask->bAcknowledged);
cairo_dock_write_keys_to_file (pKeyFile, cFile);
g_free (cFile);
=== modified file 'clock/src/applet-backend-ical.c'
--- clock/src/applet-backend-ical.c 2010-08-07 01:43:25 +0000
+++ clock/src/applet-backend-ical.c 2010-09-22 10:43:43 +0000
@@ -173,7 +173,7 @@
pTask->iYear = liCalStartDate.year;
pTask->iHour = liCalStartDate.hour;
pTask->iMinute = liCalStartDate.minute;
-
+
pTask->iFrequency = CD_TASK_DONT_REPEAT;
// TODO: really do the frequency management. If possible.
icalproperty *rrule = NULL;
@@ -191,6 +191,8 @@
pTask->cText = g_strdup(icalcomponent_get_description(piCalComponent));
pTask->cTags = g_strdup(icalcomponent_get_comment(piCalComponent));
+ pTask->bAcknowledged = TRUE; /// a recuperer si possible ...
+
pTaskList = g_list_prepend (pTaskList, pTask);
}
@@ -293,7 +295,7 @@
static gboolean delete_task (CDClockTask *pTask, CairoDockModuleInstance *myApplet)
{
- g_print ("%s (%s)\n", __func__, pTask->cTitle);
+ //g_print ("%s (%s)\n", __func__, pTask->cTitle);
if( !_assert_data() ) return FALSE;
if( pTask == NULL ) return FALSE;
@@ -314,7 +316,7 @@
static gboolean update_task (CDClockTask *pTask, CairoDockModuleInstance *myApplet)
{
- g_print ("%s (%s, '%s')\n", __func__, pTask->cTitle, pTask->cText);
+ //g_print ("%s (%s, '%s')\n", __func__, pTask->cTitle, pTask->cText);
//if( !delete_task (pTask, myApplet) ) return FALSE;
if( !create_task (pTask, myApplet) ) return FALSE;
=== modified file 'clock/src/applet-calendar.c'
--- clock/src/applet-calendar.c 2010-08-07 01:43:25 +0000
+++ clock/src/applet-calendar.c 2010-09-22 10:43:43 +0000
@@ -131,6 +131,7 @@
void cd_clock_remove_task_from_list (CDClockTask *pTask, CairoDockModuleInstance *myApplet)
{
myData.pTasks = g_list_remove (myData.pTasks, pTask);
+ myData.pMissedTasks = g_list_remove (myData.pMissedTasks, pTask);
myData.pNextTask = cd_clock_get_next_scheduled_task (myApplet);
myData.pNextAnniversary = cd_clock_get_next_anniversary (myApplet);
}
@@ -154,8 +155,10 @@
{
g_list_foreach (myData.pTasks, (GFunc)cd_clock_free_task, NULL);
g_list_free (myData.pTasks);
+ g_list_free (myData.pMissedTasks);
myData.pTasks = NULL;
myData.pNextTask = NULL;
+ myData.pMissedTasks = NULL;
}
CDClockTask *cd_clock_get_task_by_id (const gchar *cID, CairoDockModuleInstance *myApplet)
@@ -384,6 +387,94 @@
}
+GList *cd_clock_get_missed_tasks (CairoDockModuleInstance *myApplet)
+{
+ GList *pTaskList = NULL;
+ guint iDay = myData.currentTime.tm_mday;
+ guint iMonth = myData.currentTime.tm_mon;
+ guint iYear = myData.currentTime.tm_year + 1900;
+ guint iHour = myData.currentTime.tm_hour;
+ guint iMinute = myData.currentTime.tm_min;
+
+ GDate* pCurrentDate = g_date_new_dmy (iDay, iMonth + 1, iYear);
+ GDate* pDate = g_date_new ();
+ guint d, m, y;
+ int iDelta;
+ CDClockTask *pTask;
+ GList *t;
+ for (t = myData.pTasks; t != NULL; t = t->next)
+ {
+ pTask = t->data;
+ if (pTask->bAcknowledged)
+ continue;
+
+ switch (pTask->iFrequency)
+ {
+ case CD_TASK_DONT_REPEAT:
+ default:
+ d = pTask->iDay;
+ m = pTask->iMonth+1;
+ y = pTask->iYear;
+ g_date_set_dmy (pDate, d, m, y);
+ iDelta = g_date_days_between (pCurrentDate, pDate);
+ break;
+
+ case CD_TASK_EACH_MONTH:
+ d = pTask->iDay;
+ m = iMonth+1;
+ y = iYear;
+ g_date_set_dmy (pDate, d, m, y);
+ iDelta = g_date_days_between (pCurrentDate, pDate);
+ if (iDelta > 0) // pDate est apres pCurrentDate => on teste le mois d'avant.
+ {
+ if (iMonth > 0)
+ {
+ m = iMonth;
+ g_date_set_dmy (pDate, d, m, y);
+ }
+ else
+ {
+ m = 12;
+ y = pTask->iYear - 1;
+ g_date_set_dmy (pDate, d, m, y);
+ }
+ iDelta = g_date_days_between (pCurrentDate, pDate);
+ }
+ break;
+
+ case CD_TASK_EACH_YEAR:
+ d = pTask->iDay;
+ m = pTask->iMonth+1;
+ y = iYear;
+ g_date_set_dmy (pDate, d, m, y);
+ iDelta = g_date_days_between (pCurrentDate, pDate);
+ //g_print ("iDelta : %d/%d/%d -> %d (%s)\n", d, m, y, iDelta, pTask->cTitle);
+ if (iDelta > 0) // pDate est apres pCurrentDate => on teste l'annee d'avant.
+ {
+ y = iYear - 1;
+ g_date_set_dmy (pDate, d, m, y);
+ iDelta = g_date_days_between (pCurrentDate, pDate);
+ }
+ break;
+ }
+
+ if (iDelta <= 0 && iDelta > -7)
+ {
+ if (iDelta == 0) // today's task, check time
+ {
+ if (pTask->iHour > iHour || (pTask->iHour == iHour && pTask->iMinute > iMinute)) // it's in the future, skip it.
+ continue;
+ }
+ pTaskList = g_list_prepend (pTaskList, pTask);
+ } // on n'arrete pas le parcours si iDelta > 7 pour prendre en compte aussi les anniv.
+ }
+ g_date_free (pCurrentDate);
+ g_date_free (pDate);
+
+ return pTaskList;
+}
+
+
//////////////
// CALENDAR //
//////////////
=== modified file 'clock/src/applet-calendar.h'
--- clock/src/applet-calendar.h 2010-08-07 01:43:25 +0000
+++ clock/src/applet-calendar.h 2010-09-22 10:43:43 +0000
@@ -52,6 +52,8 @@
CDClockTask *cd_clock_get_next_anniversary (CairoDockModuleInstance *myApplet);
+GList *cd_clock_get_missed_tasks (CairoDockModuleInstance *myApplet);
+
void cd_clock_update_calendar_marks (CairoDockModuleInstance *myApplet);
=== modified file 'clock/src/applet-config.c'
--- clock/src/applet-config.c 2010-09-07 00:39:20 +0000
+++ clock/src/applet-config.c 2010-09-22 10:43:43 +0000
@@ -24,6 +24,7 @@
#include "applet-draw.h"
#include "applet-theme.h"
#include "applet-calendar.h"
+#include "applet-timer.h"
#include "applet-config.h"
#define CD_CLOCK_TIMEZONE_DIR "/usr/share/zoneinfo"
=== modified file 'clock/src/applet-draw.c'
--- clock/src/applet-draw.c 2010-09-07 00:39:20 +0000
+++ clock/src/applet-draw.c 2010-09-22 10:43:43 +0000
@@ -24,383 +24,18 @@
#include <math.h>
#include "applet-struct.h"
-#include "applet-config.h"
-#include "applet-digital.h" //Digital html like renderer
-#include "applet-calendar.h"
+//#include "applet-digital.h" //Digital html like renderer
#include "applet-draw.h"
#define CD_CLOCK_DATE_BUFFER_LENGTH 50
static char s_cDateBuffer[CD_CLOCK_DATE_BUFFER_LENGTH+1];
-
-void cd_clock_free_alarm (CDClockAlarm *pAlarm)
-{
- g_free (pAlarm->cMessage);
- g_free (pAlarm);
-}
-
-static void _set_warning_repetition (int iClickedButton, GtkWidget *pInteractiveWidget, CDClockTask *pTask, CairoDialog *pDialog);
-static gboolean _task_warning (CDClockTask *pTask, const gchar *cMessage)
-{
- cd_debug ("%s (%s)", __func__, cMessage);
- CairoDockModuleInstance *myApplet = pTask->pApplet;
-
- GtkWidget *pScale = gtk_hscale_new_with_range (1, 60, 1); // 1mn-60mn et 1 cran/mn.
- gtk_scale_set_digits (GTK_SCALE (pScale), 0);
- gtk_range_set_value (GTK_RANGE (pScale), pTask->iWarningDelay != 0 ? pTask->iWarningDelay : 15); // 15mn par defaut.
- gtk_widget_set (pScale, "width-request", CAIRO_DIALOG_MIN_SCALE_WIDTH, NULL);
-
- GtkWidget *pExtendedWidget = gtk_hbox_new (FALSE, 0);
- GtkWidget *label = gtk_label_new (D_("1mn"));
- GtkWidget *pAlign = gtk_alignment_new (1., 1., 0., 0.);
- gtk_container_add (GTK_CONTAINER (pAlign), label);
- gtk_box_pack_start (GTK_BOX (pExtendedWidget), pAlign, FALSE, FALSE, 0);
- gtk_box_pack_start (GTK_BOX (pExtendedWidget), pScale, FALSE, FALSE, 0);
- label = gtk_label_new (D_("1h"));
- pAlign = gtk_alignment_new (1., 1., 0., 0.);
- gtk_container_add (GTK_CONTAINER (pAlign), label);
- gtk_box_pack_start (GTK_BOX (pExtendedWidget), pAlign, FALSE, FALSE, 0);
-
- cairo_dock_dialog_unreference (pTask->pWarningDialog);
- myDialogs.dialogTextDescription.bUseMarkup = TRUE;
- pTask->pWarningDialog = cairo_dock_show_dialog_full (cMessage,
- myIcon, myContainer,
- (pTask->iWarningDelay != 0 ? MIN (pTask->iWarningDelay-.1, 15.) : 15) * 60e3, // on laisse le dialogue visible le plus longtemps possible, jusqu'a 15mn.
- MY_APPLET_SHARE_DATA_DIR"/icon-task.png",
- pExtendedWidget,
- (CairoDockActionOnAnswerFunc) _set_warning_repetition,
- pTask,
- NULL);
- myDialogs.dialogTextDescription.bUseMarkup = FALSE;
-
- CD_APPLET_DEMANDS_ATTENTION (NULL, 3600); // ~ 1h, pour si on loupe le dialogue.
- return TRUE;
-}
-static gboolean _task_warning_repeat (CDClockTask *pTask, const gchar *cMessage)
-{
- gchar *cText = g_strdup_printf ("%s %d:%02d\n<b>%s</b>\n %s\n\n%s",
- D_("The following task was scheduled at"), pTask->iHour, pTask->iMinute,
- pTask->cTitle?pTask->cTitle:D_("No title"),
- pTask->cText?pTask->cText:"",
- D_("Repeat this message every:"));
- _task_warning (pTask, cText);
- g_free (cText);
- return TRUE;
-}
-static void _set_warning_repetition (int iClickedButton, GtkWidget *pInteractiveWidget, CDClockTask *pTask, CairoDialog *pDialog)
-{
- cd_debug ("%s (%d)", __func__, iClickedButton);
- GList *cl = gtk_container_get_children (GTK_CONTAINER (pInteractiveWidget));
- g_return_if_fail (cl != NULL && cl->next != NULL);
- GtkWidget *pScale = cl->next->data;
- g_return_if_fail (pScale != NULL);
-
- int dt = gtk_range_get_value (GTK_RANGE (pScale));
- if (dt == 0 || (iClickedButton != 0 && iClickedButton != -1))
- {
- if (pTask->iSidWarning != 0)
- {
- g_source_remove (pTask->iSidWarning);
- pTask->iSidWarning = 0;
- }
- }
- else
- {
- if (pTask->iSidWarning != 0 && dt != pTask->iWarningDelay)
- {
- g_source_remove (pTask->iSidWarning);
- pTask->iSidWarning = 0;
- }
- if (pTask->iSidWarning == 0)
- {
- pTask->iSidWarning = g_timeout_add_seconds (dt*60, (GSourceFunc) _task_warning_repeat, pTask);
- pTask->iWarningDelay = dt;
- }
- }
- pTask->pWarningDialog = NULL;
- CairoDockModuleInstance *myApplet = pTask->pApplet;
- CD_APPLET_STOP_DEMANDING_ATTENTION;
-}
-
-static inline void _get_current_time (time_t epoch, CairoDockModuleInstance *myApplet)
-{
- if (myConfig.cLocation != NULL)
- {
- g_setenv ("TZ", myConfig.cLocation, TRUE);
- tzset ();
- }
- localtime_r (&epoch, &myData.currentTime);
- if (myConfig.cLocation != NULL)
- {
- if (myData.cSystemLocation != NULL)
- g_setenv ("TZ", myData.cSystemLocation, TRUE);
- else
- g_unsetenv ("TZ");
- }
-}
-
-void cd_clock_init_time (CairoDockModuleInstance *myApplet)
-{
- time_t epoch = (time_t) time (NULL);
- _get_current_time (epoch, myApplet);
-}
-
-gboolean cd_clock_update_with_time (CairoDockModuleInstance *myApplet)
-{
- CD_APPLET_ENTER;
- //\________________ On recupere l'heure courante.
- time_t epoch = (time_t) time (NULL);
- _get_current_time (epoch, myApplet);
-
- //\________________ On change la date si necessaire.
- int iWidth, iHeight;
- CD_APPLET_GET_MY_ICON_EXTENT (&iWidth, &iHeight);
- gboolean bNewDate = (myData.currentTime.tm_mday != myData.iLastCheckedDay || myData.currentTime.tm_mon != myData.iLastCheckedMonth || myData.currentTime.tm_year != myData.iLastCheckedYear);
- if (bNewDate)
- {
- strftime (s_cDateBuffer, CD_CLOCK_DATE_BUFFER_LENGTH, "%a %d %b", &myData.currentTime);
- myData.iLastCheckedDay = myData.currentTime.tm_mday;
- myData.iLastCheckedMonth = myData.currentTime.tm_mon;
- myData.iLastCheckedYear = myData.currentTime.tm_year;
- }
- if (CD_APPLET_MY_CONTAINER_IS_OPENGL && myConfig.bOldStyle && myConfig.iShowDate == CAIRO_DOCK_INFO_ON_ICON)
- {
- if (bNewDate || myData.iDateTexture == 0)
- {
- strftime (s_cDateBuffer, CD_CLOCK_DATE_BUFFER_LENGTH, "%a %d %b", &myData.currentTime);
-
- if (myData.iDateTexture != 0)
- _cairo_dock_delete_texture (myData.iDateTexture);
-
- double fScale = (double) iWidth / (double) myData.DimensionData.width;
- CairoDockLabelDescription labelDescription;
- labelDescription.iSize = 10;
- labelDescription.cFont = (gchar*)"Sans"; // on peut caster car on ne liberera rien.
- labelDescription.iWeight = cairo_dock_get_pango_weight_from_1_9 (5);
- labelDescription.iStyle = PANGO_STYLE_NORMAL;
- labelDescription.fColorStart[0] = myConfig.fDateColor[0];
- labelDescription.fColorStart[1] = myConfig.fDateColor[1];
- labelDescription.fColorStart[2] = myConfig.fDateColor[2];
- memcpy (&labelDescription.fColorStop[0], &labelDescription.fColorStart[0], sizeof (labelDescription.fColorStop));
- labelDescription.fBackgroundColor[3] = 0;
- labelDescription.bOutlined = FALSE;
- labelDescription.iMargin = 0;
- cairo_surface_t *pDateSurface = cairo_dock_create_surface_from_text_full (s_cDateBuffer,
- &labelDescription,
- fScale,
- iWidth,
- &myData.iDateWidth, &myData.iDateHeight,
- NULL, NULL);
- myData.iDateWidth *= fScale;
- myData.iDateHeight *= fScale;
- //g_print ("date : %dx%d\n", myData.iDateWidth, myData.iDateHeight);
- myData.iDateTexture = cairo_dock_create_texture_from_surface (pDateSurface);
- cairo_surface_destroy (pDateSurface);
- }
- }
- if (bNewDate && myConfig.iShowDate == CAIRO_DOCK_INFO_ON_LABEL)
- {
- CD_APPLET_SET_NAME_FOR_MY_ICON (s_cDateBuffer);
- }
-
- //\________________ On dessine avec cette heure.
- myData.iSmoothAnimationStep = 0;
- if (myConfig.bOldStyle)
- {
- if (CD_APPLET_MY_CONTAINER_IS_OPENGL)
- cd_clock_render_analogic_to_texture (myApplet, iWidth, iHeight, &myData.currentTime, 0.);
- else
- cd_clock_draw_analogic (myApplet, iWidth, iHeight, &myData.currentTime);
- }
- else
- {
- cd_clock_draw_text (myApplet, iWidth, iHeight, &myData.currentTime);
- if (CD_APPLET_MY_CONTAINER_IS_OPENGL) // on ne sait pas bien dessiner du texte, donc on le fait en cairo, et on transfere tout sur notre texture.
- cairo_dock_update_icon_texture (myIcon);
- }
-
- if (myDock && ! CD_APPLET_MY_CONTAINER_IS_OPENGL) // les reflets pour cairo.
- {
- CD_APPLET_UPDATE_REFLECT_ON_MY_ICON;
- }
-
- //\________________ On redessine notre icone.
- CD_APPLET_REDRAW_MY_ICON;
-
- //\________________ On teste les alarmes et les taches.
- if (!myConfig.bShowSeconds || myData.currentTime.tm_min != myData.iLastCheckedMinute) // un g_timeout de 1min ne s'effectue pas forcement a exectement 1 minute d'intervalle, et donc pourrait "sauter" la minute de l'alarme, d'ou le test sur bShowSeconds dans le cas ou l'applet ne verifie que chaque minute.
- {
- myData.iLastCheckedMinute = myData.currentTime.tm_min;
-
- // les alarmes.
- CDClockAlarm *pAlarm;
- guint i;
- for (i = 0; i < myConfig.pAlarms->len; i ++)
- {
- pAlarm = g_ptr_array_index (myConfig.pAlarms, i);
-
- if (myData.currentTime.tm_hour == pAlarm->iHour && myData.currentTime.tm_min == pAlarm->iMinute)
- {
- gboolean bShowAlarm = FALSE, bRemoveAlarm = FALSE;
- if (pAlarm->iDayOfWeek > 0)
- {
- if (pAlarm->iDayOfWeek == 1)
- bShowAlarm = TRUE;
- else if (pAlarm->iDayOfWeek - 1 == myData.currentTime.tm_wday)
- bShowAlarm = TRUE;
- else if (myData.currentTime.tm_wday == 0 || myData.currentTime.tm_wday == 6) // week-end
- {
- if (pAlarm->iDayOfWeek == 9)
- bShowAlarm = TRUE;
- }
- else if (pAlarm->iDayOfWeek == 8)
- bShowAlarm = TRUE;
- }
- else if (pAlarm->iDayOfMonth > 0)
- bShowAlarm = (pAlarm->iDayOfMonth - 1 == myData.currentTime.tm_mday);
- else // c'est une alarme qui ne se repete pas.
- {
- bShowAlarm = TRUE;
- bRemoveAlarm = TRUE;
- }
-
- if (bShowAlarm)
- {
- cd_message ("Dring ! %s", pAlarm->cMessage);
- cairo_dock_show_temporary_dialog (pAlarm->cMessage, myIcon, myContainer, 60e3);
- if (pAlarm->cCommand != NULL)
- {
- if (myData.iAlarmPID > 0)
- {
- kill (myData.iAlarmPID, 1);
- myData.iAlarmPID = 0;
- }
- GError *erreur = NULL;
- gchar **argv = g_strsplit (pAlarm->cCommand, " ", -1);
- g_spawn_async (NULL,
- argv,
- NULL,
- 0,
- NULL,
- NULL,
- &myData.iAlarmPID,
- &erreur);
- if (erreur != NULL)
- {
- cd_warning ("clock : when trying to execute '%s' : %s", pAlarm->cCommand, erreur->message);
- g_error_free (erreur);
- myData.iAlarmPID = 0;
- }
- g_strfreev (argv);
- cd_message (" --> child_pid : %d", myData.iAlarmPID);
- }
- }
-
- if (bRemoveAlarm)
- {
- cd_message ("Cette alarme ne sera pas repetee");
- g_ptr_array_remove_index (myConfig.pAlarms, i);
- cd_clock_free_alarm (pAlarm);
- /// A FAIRE : effacer l'heure dans le fichier de conf pour cette alarme.
- }
- }
- }
-
- // les taches.
- if (myData.pNextTask != NULL)
- {
- //g_print ("next task : %s\n", myData.pNextTask->cTitle);
- struct tm st;
- st.tm_min = myData.pNextTask->iMinute;
- st.tm_hour = myData.pNextTask->iHour;
- st.tm_mday = myData.pNextTask->iDay;
- st.tm_mon = myData.pNextTask->iMonth;
- st.tm_year = myData.pNextTask->iYear - 1900;
- st.tm_sec = 0;
- st.tm_isdst = myData.currentTime.tm_isdst;
- time_t t = mktime (&st);
- //g_print ("time : %ld, task : %ld\n", epoch, t);
- if (t < epoch) // la tache est depassee.
- {
- myData.pNextTask = cd_clock_get_next_scheduled_task (myApplet);
- }
- else if (t < epoch + 15*60 && t >= epoch)
- {
- if (! myData.pNextTask->b15mnWarning)
- {
- //g_print ("15 mn warning\n");
- myData.pNextTask->b15mnWarning = TRUE;
- myDialogs.dialogTextDescription.bUseMarkup = TRUE;
- cairo_dock_show_temporary_dialog_with_icon_printf ("%s\n<b>%s</b>\n %s",
- myIcon, myContainer,
- 60e3,
- MY_APPLET_SHARE_DATA_DIR"/icon-task.png",
- D_("This task will begin in 15 minutes:"),
- myData.pNextTask->cTitle?myData.pNextTask->cTitle:D_("No title"),
- myData.pNextTask->cText?myData.pNextTask->cText:"");
- myDialogs.dialogTextDescription.bUseMarkup = FALSE;
- CD_APPLET_DEMANDS_ATTENTION (NULL, 60);
- }
- else if (t < epoch + 60)
- {
- if (! myData.pNextTask->bFirstWarning)
- {
- //g_print ("first warning\n");
- myData.pNextTask->bFirstWarning = TRUE;
- myDialogs.dialogTextDescription.bUseMarkup = TRUE;
- gchar *cText = g_strdup_printf ("%s\n<b>%s</b>\n %s\n\n%s",
- D_("It's time for the following task:"),
- myData.pNextTask->cTitle?myData.pNextTask->cTitle:D_("No title"),
- myData.pNextTask->cText?myData.pNextTask->cText:"",
- D_("Repeat this message every:"));
- _task_warning (myData.pNextTask, cText);
- g_free (cText);
- }
- }
- }
-
- if (myData.pNextAnniversary != NULL)
- {
- if (!myData.pNextAnniversary->b1DayWarning && ! myData.pNextAnniversary->bFirstWarning && ! myData.pNextTask->b15mnWarning)
- {
- GDate* pCurrentDate = g_date_new_dmy (myData.currentTime.tm_mday, myData.currentTime.tm_mon + 1, myData.currentTime.tm_year+1900);
- GDate* pAnnivDate = g_date_new_dmy (myData.pNextAnniversary->iDay, myData.pNextAnniversary->iMonth + 1, myData.currentTime.tm_year+1900);
- gint iDaysToNextAnniversary = g_date_days_between (pCurrentDate, pAnnivDate);
- if (iDaysToNextAnniversary >= 0 && iDaysToNextAnniversary <= 1)
- {
- myData.pNextAnniversary->b1DayWarning = TRUE;
- gchar *cText = g_strdup_printf ("%s\n<b>%s</b>\n %s\n\n%s",
- iDaysToNextAnniversary == 0 ? D_("Today is the following anniversary:") : D_("Tomorrow is the following anniversary:"),
- myData.pNextTask->cTitle?myData.pNextTask->cTitle:D_("No title"),
- myData.pNextTask->cText?myData.pNextTask->cText:"",
- D_("Repeat this message every:"));
- _task_warning (myData.pNextTask, cText);
- g_free (cText);
- myData.pNextAnniversary = cd_clock_get_next_anniversary (myApplet);
- }
- g_date_free (pCurrentDate);
- g_date_free (pAnnivDate);
- }
- }
- }
- }
-
- CD_APPLET_LEAVE(TRUE);
- //return TRUE;
-}
-
-/*void cd_clock_draw_text (CairoDockModuleInstance *myApplet, int width, int height, double fMaxScale, struct tm *pTime) {
- cd_clock_draw_frames (myApplet);
- cd_clock_put_text_on_frames (myApplet, width, height, fMaxScale, pTime);
-}*/
-
#define GAPX .12
#define GAPY .02
#define MAX_RATIO 2.
+
void cd_clock_draw_text (CairoDockModuleInstance *myApplet, int iWidth, int iHeight, struct tm *pTime)
{
- GString *sFormat = g_string_new ("");
-
cairo_dock_erase_cairo_context (myDrawContext);
if (myData.pNumericBgSurface != NULL)
{
@@ -418,22 +53,23 @@
PangoLayout *pLayout = pango_cairo_create_layout (myDrawContext);
pango_layout_set_font_description (pLayout, pDesc);
+ const gchar *cFormat;
if (myConfig.b24Mode)
{
if (myConfig.bShowSeconds)
- g_string_assign (sFormat, "%T");
+ cFormat = "%T";
else
- g_string_assign (sFormat, "%R");
+ cFormat = "%R";
}
else
{
if (myConfig.bShowSeconds)
- g_string_assign (sFormat, "%r"); // equivalent a %I:%M:%S %p
+ cFormat = "%r"; // equivalent a %I:%M:%S %p
else
- g_string_printf (sFormat, "%%I:%%M %%p");
+ cFormat = "%I:%M %p";
}
- strftime (s_cDateBuffer, CD_CLOCK_DATE_BUFFER_LENGTH, sFormat->str, pTime);
+ strftime (s_cDateBuffer, CD_CLOCK_DATE_BUFFER_LENGTH, cFormat, pTime);
pango_layout_set_text (pLayout, s_cDateBuffer, -1);
PangoRectangle ink, log;
pango_layout_get_pixel_extents (pLayout, &ink, &log);
@@ -647,15 +283,15 @@
}
-
-void cd_clock_draw_analogic_opengl (CairoDockModuleInstance *myApplet, int iWidth, int iHeight, struct tm *pTime, double fFraction)
+void cd_clock_render_analogic_to_texture (CairoDockModuleInstance *myApplet, int iWidth, int iHeight, struct tm *pTime, double fFraction)
{
+ CD_APPLET_START_DRAWING_MY_ICON_OR_RETURN ();
+
int iSeconds = pTime->tm_sec;
int iMinutes = pTime->tm_min;
int iHours = pTime->tm_hour;
_cairo_dock_enable_texture ();
-
//_cairo_dock_set_blend_over (); // bof
_cairo_dock_set_blend_alpha (); // pas mal
//_cairo_dock_set_blend_pbuffer ();
@@ -673,7 +309,7 @@
glPopMatrix ();
}
- // heure
+ // hour
glPushMatrix ();
glRotatef (-(iHours % 12 + iMinutes/60.) * 30. + 90., 0., 0., 1.);
glTranslatef (myData.iNeedleWidth/2 - myData.fNeedleScale * myData.iNeedleOffsetX, 0., 0.);
@@ -687,7 +323,7 @@
cairo_dock_apply_texture_at_size (myData.iMinuteNeedleTexture, myData.iNeedleWidth, myData.iNeedleHeight+1);
glPopMatrix ();
- // seconde
+ // second
if (myConfig.bShowSeconds)
{
glPushMatrix ();
@@ -701,13 +337,6 @@
cairo_dock_apply_texture_at_size (myData.iFgTexture, iWidth, iHeight);
_cairo_dock_disable_texture ();
-}
-
-void cd_clock_render_analogic_to_texture (CairoDockModuleInstance *myApplet, int iWidth, int iHeight, struct tm *pTime, double fFraction)
-{
- CD_APPLET_START_DRAWING_MY_ICON_OR_RETURN ();
-
- cd_clock_draw_analogic_opengl (myApplet, iWidth, iHeight, pTime, fFraction);
CD_APPLET_FINISH_DRAWING_MY_ICON;
}
=== modified file 'clock/src/applet-draw.h'
--- clock/src/applet-draw.h 2010-08-07 01:43:25 +0000
+++ clock/src/applet-draw.h 2010-09-22 10:43:43 +0000
@@ -17,31 +17,19 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-
#ifndef __CD_CLOCK_DRAW__
#define __CD_CLOCK_DRAW__
-
#include <cairo-dock.h>
#include "applet-struct.h"
-void cd_clock_free_alarm (CDClockAlarm *pAlarm);
-
-
-void cd_clock_init_time (CairoDockModuleInstance *myApplet);
-
-gboolean cd_clock_update_with_time (CairoDockModuleInstance *myApplet);
-
-
void cd_clock_draw_text (CairoDockModuleInstance *myApplet, int iWidth, int iHeight, struct tm *pTime);
void cd_clock_draw_analogic (CairoDockModuleInstance *myApplet, int iWidth, int iHeight, struct tm *pTime);
-void cd_clock_draw_analogic_opengl (CairoDockModuleInstance *myApplet, int iWidth, int iHeight, struct tm *pTime, double fFraction);
-
void cd_clock_render_analogic_to_texture (CairoDockModuleInstance *myApplet, int iWidth, int iHeight, struct tm *pTime, double fFraction);
=== modified file 'clock/src/applet-init.c'
--- clock/src/applet-init.c 2010-09-07 00:39:20 +0000
+++ clock/src/applet-init.c 2010-09-22 10:43:43 +0000
@@ -22,7 +22,7 @@
#include "applet-struct.h"
#include "applet-draw.h"
-#include "applet-digital.h" //Digital html like renderer
+#include "applet-timer.h"
#include "applet-config.h"
#include "applet-theme.h"
#include "applet-calendar.h"
@@ -65,8 +65,6 @@
if (CD_APPLET_MY_CONTAINER_IS_OPENGL)
cd_clock_load_textures (myApplet);
- ///cd_clock_configure_digital (myApplet); // mis en commentaire jusqu'a ce que ca soit fini.
-
myData.cSystemLocation = g_strdup (g_getenv ("TZ"));
myData.iLastCheckedMinute = -1;
myData.iLastCheckedDay = -1;
@@ -117,9 +115,6 @@
CD_APPLET_RELOAD_BEGIN
- //\_______________ On recharge les donnees qui ont pu changer.
- ///cd_clock_configure_digital (myApplet); // mis en commentaire jusqu'a ce que ca soit fini.
-
myData.iTextLayout = myConfig.iPreferedTextLayout; // on recalcule l'orientation si elle est automatique.
if (CD_APPLET_MY_CONFIG_CHANGED)
{
=== modified file 'clock/src/applet-struct.h'
--- clock/src/applet-struct.h 2010-09-07 00:39:20 +0000
+++ clock/src/applet-struct.h 2010-09-22 10:43:43 +0000
@@ -120,6 +120,7 @@
gint iWarningDelay; // en minutes.
guint iSidWarning;
CairoDialog *pWarningDialog;
+ gboolean bAcknowledged;
} CDClockTask;
typedef struct {
@@ -197,6 +198,8 @@
guint iButtonPressTime;
CDClockTask *pNextTask;
CDClockTask *pNextAnniversary;
+ gboolean bTaskCheckedOnce;
+ GList *pMissedTasks;
} ;
#endif
=== added file 'clock/src/applet-timer.c'
--- clock/src/applet-timer.c 1970-01-01 00:00:00 +0000
+++ clock/src/applet-timer.c 2010-09-22 10:43:43 +0000
@@ -0,0 +1,506 @@
+/**
+* This file is a part of the Cairo-Dock project
+*
+* Copyright : (C) see the 'copyright' file.
+* E-mail : see the 'copyright' file.
+*
+* This program is free software; you can redistribute it and/or
+* modify it under the terms of the GNU General Public License
+* as published by the Free Software Foundation; either version 3
+* of the License, or (at your option) any later version.
+*
+* This program is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+* GNU General Public License for more details.
+* You should have received a copy of the GNU General Public License
+* along with this program. If not, see <http://www.gnu.org/licenses/>.
+*/
+
+#include <stdlib.h>
+#define __USE_POSIX
+#include <time.h>
+#include <signal.h>
+#include <math.h>
+
+#include "applet-struct.h"
+#include "applet-config.h"
+#include "applet-digital.h" //Digital html like renderer
+#include "applet-calendar.h"
+#include "applet-draw.h"
+#include "applet-timer.h"
+
+#define CD_CLOCK_DATE_BUFFER_LENGTH 50
+static char s_cDateBuffer[CD_CLOCK_DATE_BUFFER_LENGTH+1];
+
+
+void cd_clock_free_alarm (CDClockAlarm *pAlarm)
+{
+ g_free (pAlarm->cMessage);
+ g_free (pAlarm);
+}
+
+static void _set_warning_repetition (int iClickedButton, GtkWidget *pInteractiveWidget, CDClockTask *pTask, CairoDialog *pDialog);
+static gboolean _task_warning (CDClockTask *pTask, const gchar *cMessage)
+{
+ cd_debug ("%s (%s)", __func__, cMessage);
+ CairoDockModuleInstance *myApplet = pTask->pApplet;
+
+ GtkWidget *pScale = gtk_hscale_new_with_range (1, 60, 1); // 1mn-60mn et 1 cran/mn.
+ gtk_scale_set_digits (GTK_SCALE (pScale), 0);
+ gtk_range_set_value (GTK_RANGE (pScale), pTask->iWarningDelay != 0 ? pTask->iWarningDelay : 15); // 15mn par defaut.
+ gtk_widget_set (pScale, "width-request", CAIRO_DIALOG_MIN_SCALE_WIDTH, NULL);
+
+ GtkWidget *pExtendedWidget = gtk_hbox_new (FALSE, 0);
+ GtkWidget *label = gtk_label_new (D_("1mn"));
+ GtkWidget *pAlign = gtk_alignment_new (1., 1., 0., 0.);
+ gtk_container_add (GTK_CONTAINER (pAlign), label);
+ gtk_box_pack_start (GTK_BOX (pExtendedWidget), pAlign, FALSE, FALSE, 0);
+ gtk_box_pack_start (GTK_BOX (pExtendedWidget), pScale, FALSE, FALSE, 0);
+ label = gtk_label_new (D_("1h"));
+ pAlign = gtk_alignment_new (1., 1., 0., 0.);
+ gtk_container_add (GTK_CONTAINER (pAlign), label);
+ gtk_box_pack_start (GTK_BOX (pExtendedWidget), pAlign, FALSE, FALSE, 0);
+
+ cairo_dock_dialog_unreference (pTask->pWarningDialog);
+ myDialogs.dialogTextDescription.bUseMarkup = TRUE;
+ pTask->pWarningDialog = cairo_dock_show_dialog_full (cMessage,
+ myIcon, myContainer,
+ (pTask->iWarningDelay != 0 ? MIN (pTask->iWarningDelay-.1, 15.) : 15) * 60e3, // on laisse le dialogue visible le plus longtemps possible, jusqu'a 15mn.
+ MY_APPLET_SHARE_DATA_DIR"/icon-task.png",
+ pExtendedWidget,
+ (CairoDockActionOnAnswerFunc) _set_warning_repetition,
+ pTask,
+ NULL);
+ myDialogs.dialogTextDescription.bUseMarkup = FALSE;
+
+ CD_APPLET_DEMANDS_ATTENTION (NULL, 3600); // ~ 1h, pour si on loupe le dialogue.
+ return TRUE;
+}
+static gboolean _task_warning_repeat (CDClockTask *pTask, const gchar *cMessage)
+{
+ gchar *cText = g_strdup_printf ("%s %d:%02d\n<b>%s</b>\n %s\n\n%s",
+ D_("The following task was scheduled at"), pTask->iHour, pTask->iMinute,
+ pTask->cTitle?pTask->cTitle:D_("No title"),
+ pTask->cText?pTask->cText:"",
+ D_("Repeat this message every:"));
+ _task_warning (pTask, cText);
+ g_free (cText);
+ return TRUE;
+}
+static void _set_warning_repetition (int iClickedButton, GtkWidget *pInteractiveWidget, CDClockTask *pTask, CairoDialog *pDialog)
+{
+ cd_debug ("%s (%d)", __func__, iClickedButton);
+ GList *cl = gtk_container_get_children (GTK_CONTAINER (pInteractiveWidget));
+ g_return_if_fail (cl != NULL && cl->next != NULL);
+ GtkWidget *pScale = cl->next->data;
+ g_return_if_fail (pScale != NULL);
+
+ int dt = gtk_range_get_value (GTK_RANGE (pScale));
+ if (dt == 0 || (iClickedButton != 0 && iClickedButton != -1))
+ {
+ if (pTask->iSidWarning != 0)
+ {
+ g_source_remove (pTask->iSidWarning);
+ pTask->iSidWarning = 0;
+ }
+ }
+ else
+ {
+ if (pTask->iSidWarning != 0 && dt != pTask->iWarningDelay)
+ {
+ g_source_remove (pTask->iSidWarning);
+ pTask->iSidWarning = 0;
+ }
+ if (pTask->iSidWarning == 0)
+ {
+ pTask->iSidWarning = g_timeout_add_seconds (dt*60, (GSourceFunc) _task_warning_repeat, pTask);
+ pTask->iWarningDelay = dt;
+ }
+ }
+ pTask->pWarningDialog = NULL;
+ CairoDockModuleInstance *myApplet = pTask->pApplet;
+ CD_APPLET_STOP_DEMANDING_ATTENTION;
+}
+
+static inline void _get_current_time (time_t epoch, CairoDockModuleInstance *myApplet)
+{
+ if (myConfig.cLocation != NULL)
+ {
+ g_setenv ("TZ", myConfig.cLocation, TRUE);
+ tzset ();
+ }
+ localtime_r (&epoch, &myData.currentTime);
+ if (myConfig.cLocation != NULL)
+ {
+ if (myData.cSystemLocation != NULL)
+ g_setenv ("TZ", myData.cSystemLocation, TRUE);
+ else
+ g_unsetenv ("TZ");
+ }
+}
+
+void cd_clock_init_time (CairoDockModuleInstance *myApplet)
+{
+ time_t epoch = (time_t) time (NULL);
+ _get_current_time (epoch, myApplet);
+}
+
+static gchar *_make_missed_task_message (CDClockTask *pTask, CairoDockModuleInstance *myApplet)
+{
+ //g_print ("%s (%s)\n", __func__, pTask->cID);
+ struct tm st;
+ memset (&st, 0, sizeof (st));
+ st.tm_min = pTask->iMinute;
+ st.tm_hour = pTask->iHour;
+ st.tm_mday = pTask->iDay;
+ st.tm_mon = pTask->iMonth;
+ st.tm_year = pTask->iYear - 1900;
+ st.tm_sec = 0;
+ st.tm_isdst = myData.currentTime.tm_isdst;
+ char cDateBuffer[200+1];
+ memset (cDateBuffer, 0, 200);
+ const gchar *cFormat;
+ if (myConfig.b24Mode)
+ cFormat = "%a %d %b, %R";
+ else
+ cFormat = "%a %d %b, %I:%M %p";
+ strftime (cDateBuffer, 200, cFormat, &st);
+ return g_strdup_printf ("%s\n\n %s\n %s\n\n %s",
+ D_("The following task has felt due:"),
+ cDateBuffer,
+ pTask->cTitle?pTask->cTitle:D_("No title"),
+ pTask->cText?pTask->cText:"");
+}
+static void _on_next_missed_task (int iClickedButton, GtkWidget *pInteractiveWidget, CairoDockModuleInstance *myApplet, CairoDialog *pDialog)
+{
+ g_return_if_fail (myData.pMissedTasks != NULL);
+ //g_print ("%s ()\n", __func__);
+
+ // acknowledge this task
+ CDClockTask *pTask = myData.pMissedTasks->data;
+ pTask->bAcknowledged = TRUE;
+ myData.pBackend->update_task (pTask, myApplet);
+
+ // jump to next task.
+ if (iClickedButton == -1 || iClickedButton == 1) // 'enter' or 2nd button
+ {
+ myData.pMissedTasks = g_list_delete_link (myData.pMissedTasks, myData.pMissedTasks);
+ if (myData.pMissedTasks != NULL)
+ {
+ // display next task.
+ pTask = myData.pMissedTasks->data;
+ //g_print ("display task '%s'\n", pTask->cID);
+ gchar *cMessage = _make_missed_task_message (pTask, myApplet);
+ cairo_dock_set_dialog_message (pDialog, cMessage);
+ g_free (cMessage);
+
+ // remove 'next' button if no more task will follow.
+ if (myData.pMissedTasks->next == NULL && pDialog->pButtons != NULL && pDialog->iNbButtons > 1)
+ {
+ // remove 'next' button
+ cairo_surface_t *pSurface;
+ GLuint iTexture;
+ int i = 1;
+ pSurface = pDialog->pButtons[i].pSurface;
+ if (pSurface != NULL)
+ {
+ cairo_surface_destroy (pSurface);
+ pDialog->pButtons[i].pSurface = NULL;
+ }
+ iTexture = pDialog->pButtons[i].iTexture;
+ if (iTexture != 0)
+ {
+ _cairo_dock_delete_texture (iTexture);
+ pDialog->pButtons[i].iTexture = 0;
+ }
+ pDialog->iNbButtons = 1; // only the 'ok' button will stay.
+
+ // transform 'cancel' into 'ok'
+ i = 0;
+ pDialog->pButtons[i].iDefaultType = 1;
+ }
+ cairo_dock_dialog_reference (pDialog); // keep the dialog alive.
+ }
+ }
+ else // dismiss next missed tasks and let the dialog close itself.
+ {
+ g_list_free (myData.pMissedTasks);
+ myData.pMissedTasks = NULL;
+ }
+}
+
+gboolean cd_clock_update_with_time (CairoDockModuleInstance *myApplet)
+{
+ CD_APPLET_ENTER;
+ //\________________ On recupere l'heure courante.
+ time_t epoch = (time_t) time (NULL);
+ _get_current_time (epoch, myApplet);
+
+ //\________________ On change la date si necessaire.
+ int iWidth, iHeight;
+ CD_APPLET_GET_MY_ICON_EXTENT (&iWidth, &iHeight);
+ gboolean bNewDate = (myData.currentTime.tm_mday != myData.iLastCheckedDay || myData.currentTime.tm_mon != myData.iLastCheckedMonth || myData.currentTime.tm_year != myData.iLastCheckedYear);
+ if (bNewDate)
+ {
+ strftime (s_cDateBuffer, CD_CLOCK_DATE_BUFFER_LENGTH, "%a %d %b", &myData.currentTime);
+ myData.iLastCheckedDay = myData.currentTime.tm_mday;
+ myData.iLastCheckedMonth = myData.currentTime.tm_mon;
+ myData.iLastCheckedYear = myData.currentTime.tm_year;
+ }
+ if (CD_APPLET_MY_CONTAINER_IS_OPENGL && myConfig.bOldStyle && myConfig.iShowDate == CAIRO_DOCK_INFO_ON_ICON)
+ {
+ if (bNewDate || myData.iDateTexture == 0)
+ {
+ if (myData.iDateTexture != 0)
+ _cairo_dock_delete_texture (myData.iDateTexture);
+
+ double fScale = (double) iWidth / (double) myData.DimensionData.width;
+ CairoDockLabelDescription labelDescription;
+ labelDescription.iSize = 10;
+ labelDescription.cFont = (gchar*)"Sans"; // on peut caster car on ne liberera rien.
+ labelDescription.iWeight = cairo_dock_get_pango_weight_from_1_9 (5);
+ labelDescription.iStyle = PANGO_STYLE_NORMAL;
+ labelDescription.fColorStart[0] = myConfig.fDateColor[0];
+ labelDescription.fColorStart[1] = myConfig.fDateColor[1];
+ labelDescription.fColorStart[2] = myConfig.fDateColor[2];
+ memcpy (&labelDescription.fColorStop[0], &labelDescription.fColorStart[0], sizeof (labelDescription.fColorStop));
+ labelDescription.fBackgroundColor[3] = 0;
+ labelDescription.bOutlined = FALSE;
+ labelDescription.iMargin = 0;
+ cairo_surface_t *pDateSurface = cairo_dock_create_surface_from_text_full (s_cDateBuffer,
+ &labelDescription,
+ fScale,
+ iWidth,
+ &myData.iDateWidth, &myData.iDateHeight,
+ NULL, NULL);
+ myData.iDateWidth *= fScale;
+ myData.iDateHeight *= fScale;
+ //g_print ("date : %dx%d\n", myData.iDateWidth, myData.iDateHeight);
+ myData.iDateTexture = cairo_dock_create_texture_from_surface (pDateSurface);
+ cairo_surface_destroy (pDateSurface);
+ }
+ }
+ if (bNewDate && myConfig.iShowDate == CAIRO_DOCK_INFO_ON_LABEL)
+ {
+ CD_APPLET_SET_NAME_FOR_MY_ICON (s_cDateBuffer);
+ }
+
+ //\________________ On dessine avec cette heure.
+ myData.iSmoothAnimationStep = 0;
+ if (myConfig.bOldStyle)
+ {
+ if (CD_APPLET_MY_CONTAINER_IS_OPENGL)
+ cd_clock_render_analogic_to_texture (myApplet, iWidth, iHeight, &myData.currentTime, 0.);
+ else
+ cd_clock_draw_analogic (myApplet, iWidth, iHeight, &myData.currentTime);
+ }
+ else
+ {
+ cd_clock_draw_text (myApplet, iWidth, iHeight, &myData.currentTime);
+ if (CD_APPLET_MY_CONTAINER_IS_OPENGL) // on ne sait pas bien dessiner du texte, donc on le fait en cairo, et on transfere tout sur notre texture.
+ cairo_dock_update_icon_texture (myIcon);
+ }
+
+ if (myDock && ! CD_APPLET_MY_CONTAINER_IS_OPENGL) // les reflets pour cairo.
+ {
+ CD_APPLET_UPDATE_REFLECT_ON_MY_ICON;
+ }
+
+ CD_APPLET_REDRAW_MY_ICON;
+
+ //\________________ On teste les alarmes et les taches.
+ if (!myConfig.bShowSeconds || myData.currentTime.tm_min != myData.iLastCheckedMinute) // un g_timeout de 1min ne s'effectue pas forcement a exectement 1 minute d'intervalle, et donc pourrait "sauter" la minute de l'alarme, d'ou le test sur bShowSeconds dans le cas ou l'applet ne verifie que chaque minute.
+ {
+ myData.iLastCheckedMinute = myData.currentTime.tm_min;
+
+ // les alarmes.
+ CDClockAlarm *pAlarm;
+ guint i;
+ for (i = 0; i < myConfig.pAlarms->len; i ++)
+ {
+ pAlarm = g_ptr_array_index (myConfig.pAlarms, i);
+
+ if (myData.currentTime.tm_hour == pAlarm->iHour && myData.currentTime.tm_min == pAlarm->iMinute)
+ {
+ gboolean bShowAlarm = FALSE, bRemoveAlarm = FALSE;
+ if (pAlarm->iDayOfWeek > 0)
+ {
+ if (pAlarm->iDayOfWeek == 1)
+ bShowAlarm = TRUE;
+ else if (pAlarm->iDayOfWeek - 1 == myData.currentTime.tm_wday)
+ bShowAlarm = TRUE;
+ else if (myData.currentTime.tm_wday == 0 || myData.currentTime.tm_wday == 6) // week-end
+ {
+ if (pAlarm->iDayOfWeek == 9)
+ bShowAlarm = TRUE;
+ }
+ else if (pAlarm->iDayOfWeek == 8)
+ bShowAlarm = TRUE;
+ }
+ else if (pAlarm->iDayOfMonth > 0)
+ bShowAlarm = (pAlarm->iDayOfMonth - 1 == myData.currentTime.tm_mday);
+ else // c'est une alarme qui ne se repete pas.
+ {
+ bShowAlarm = TRUE;
+ bRemoveAlarm = TRUE;
+ }
+
+ if (bShowAlarm)
+ {
+ cd_message ("Dring ! %s", pAlarm->cMessage);
+ cairo_dock_show_temporary_dialog (pAlarm->cMessage, myIcon, myContainer, 60e3);
+ if (pAlarm->cCommand != NULL)
+ {
+ if (myData.iAlarmPID > 0)
+ {
+ kill (myData.iAlarmPID, 1);
+ myData.iAlarmPID = 0;
+ }
+ GError *erreur = NULL;
+ gchar **argv = g_strsplit (pAlarm->cCommand, " ", -1);
+ g_spawn_async (NULL,
+ argv,
+ NULL,
+ 0,
+ NULL,
+ NULL,
+ &myData.iAlarmPID,
+ &erreur);
+ if (erreur != NULL)
+ {
+ cd_warning ("clock : when trying to execute '%s' : %s", pAlarm->cCommand, erreur->message);
+ g_error_free (erreur);
+ myData.iAlarmPID = 0;
+ }
+ g_strfreev (argv);
+ cd_message (" --> child_pid : %d", myData.iAlarmPID);
+ }
+ }
+
+ if (bRemoveAlarm)
+ {
+ cd_message ("Cette alarme ne sera pas repetee");
+ g_ptr_array_remove_index (myConfig.pAlarms, i);
+ cd_clock_free_alarm (pAlarm);
+ /// A FAIRE : effacer l'heure dans le fichier de conf pour cette alarme.
+ }
+ }
+ }
+
+ // display missed tasks.
+ if (!myData.bTaskCheckedOnce)
+ {
+ myData.bTaskCheckedOnce = TRUE;
+ myData.pMissedTasks = cd_clock_get_missed_tasks (myApplet);
+ }
+ if (myData.pMissedTasks != NULL) // so if the dialog was closed before we could acknowledge all the tasks, it will re-open.
+ {
+ CDClockTask *pTask = myData.pMissedTasks->data;
+ gchar *cMessage = _make_missed_task_message (pTask, myApplet);
+ CairoDialogAttribute attr;
+ memset (&attr, 0, sizeof (CairoDialogAttribute));
+ attr.cText = cMessage;
+ attr.cImageFilePath = (gchar *)MY_APPLET_SHARE_DATA_DIR"/icon-task.png";
+ const gchar *cButtonsImage[3] = {"ok", NULL, NULL};
+ if (myData.pMissedTasks->next != NULL)
+ {
+ cButtonsImage[0] = "cancel";
+ cButtonsImage[1] = "next.png";
+ }
+ attr.cButtonsImage = cButtonsImage;
+ attr.pActionFunc = (CairoDockActionOnAnswerFunc)_on_next_missed_task;
+ attr.pUserData = myApplet;
+ attr.pFreeDataFunc = NULL;
+ attr.iTimeLength = 0;
+ CairoDialog *pDialog = cairo_dock_build_dialog (&attr, myIcon, myContainer);
+ g_free (cMessage);
+ }
+
+ // display next task.
+ if (myData.pNextTask != NULL)
+ {
+ //g_print ("next task : %s\n", myData.pNextTask->cTitle);
+ struct tm st;
+ st.tm_min = myData.pNextTask->iMinute;
+ st.tm_hour = myData.pNextTask->iHour;
+ st.tm_mday = myData.pNextTask->iDay;
+ st.tm_mon = myData.pNextTask->iMonth;
+ st.tm_year = myData.pNextTask->iYear - 1900;
+ st.tm_sec = 0;
+ st.tm_isdst = myData.currentTime.tm_isdst;
+ time_t t = mktime (&st);
+ //g_print ("time : %ld, task : %ld\n", epoch, t);
+ if (t < epoch) // la tache est depassee.
+ {
+ // acknowledge this task
+ myData.pNextTask->bAcknowledged = TRUE;
+ myData.pBackend->update_task (myData.pNextTask, myApplet);
+
+ // look for next task.
+ myData.pNextTask = cd_clock_get_next_scheduled_task (myApplet);
+ }
+ else if (t < epoch + 15*60 && t >= epoch)
+ {
+ if (t < epoch + 60)
+ {
+ if (! myData.pNextTask->bFirstWarning)
+ {
+ //g_print ("first warning\n");
+ myData.pNextTask->bFirstWarning = TRUE;
+ myDialogs.dialogTextDescription.bUseMarkup = TRUE;
+ gchar *cText = g_strdup_printf ("%s\n<b>%s</b>\n %s\n\n%s",
+ D_("It's time for the following task:"),
+ myData.pNextTask->cTitle?myData.pNextTask->cTitle:D_("No title"),
+ myData.pNextTask->cText?myData.pNextTask->cText:"",
+ D_("Repeat this message every:"));
+ _task_warning (myData.pNextTask, cText);
+ g_free (cText);
+ }
+ }
+ else if (! myData.pNextTask->b15mnWarning)
+ {
+ //g_print ("15 mn warning\n");
+ myData.pNextTask->b15mnWarning = TRUE;
+ myDialogs.dialogTextDescription.bUseMarkup = TRUE;
+ cairo_dock_show_temporary_dialog_with_icon_printf ("%s\n<b>%s</b>\n %s",
+ myIcon, myContainer,
+ 60e3,
+ MY_APPLET_SHARE_DATA_DIR"/icon-task.png",
+ D_("This task will begin in 15 minutes:"),
+ myData.pNextTask->cTitle?myData.pNextTask->cTitle:D_("No title"),
+ myData.pNextTask->cText?myData.pNextTask->cText:"");
+ myDialogs.dialogTextDescription.bUseMarkup = FALSE;
+ CD_APPLET_DEMANDS_ATTENTION (NULL, 60);
+ }
+ }
+
+ // display next anniversary if it is scheduled in less than 1 day, because anniversary require time to prepare.
+ if (myData.pNextAnniversary != NULL)
+ {
+ if (!myData.pNextAnniversary->b1DayWarning && ! myData.pNextAnniversary->bFirstWarning && ! myData.pNextAnniversary->b15mnWarning)
+ {
+ GDate* pCurrentDate = g_date_new_dmy (myData.currentTime.tm_mday, myData.currentTime.tm_mon + 1, myData.currentTime.tm_year+1900);
+ GDate* pAnnivDate = g_date_new_dmy (myData.pNextAnniversary->iDay, myData.pNextAnniversary->iMonth + 1, myData.currentTime.tm_year+1900);
+ gint iDaysToNextAnniversary = g_date_days_between (pCurrentDate, pAnnivDate);
+ if (iDaysToNextAnniversary >= 0 && iDaysToNextAnniversary <= 1)
+ {
+ myData.pNextAnniversary->b1DayWarning = TRUE;
+ gchar *cText = g_strdup_printf ("%s\n<b>%s</b>\n %s\n\n%s",
+ iDaysToNextAnniversary == 0 ? D_("Today is the following anniversary:") : D_("Tomorrow is the following anniversary:"),
+ myData.pNextTask->cTitle?myData.pNextTask->cTitle:D_("No title"),
+ myData.pNextTask->cText?myData.pNextTask->cText:"",
+ D_("Repeat this message every:"));
+ _task_warning (myData.pNextTask, cText);
+ g_free (cText);
+ myData.pNextAnniversary = cd_clock_get_next_anniversary (myApplet);
+ }
+ g_date_free (pCurrentDate);
+ g_date_free (pAnnivDate);
+ }
+ }
+ }
+ }
+
+ CD_APPLET_LEAVE(TRUE);
+}
=== added file 'clock/src/applet-timer.h'
--- clock/src/applet-timer.h 1970-01-01 00:00:00 +0000
+++ clock/src/applet-timer.h 2010-09-22 10:43:43 +0000
@@ -0,0 +1,35 @@
+/**
+* This file is a part of the Cairo-Dock project
+*
+* Copyright : (C) see the 'copyright' file.
+* E-mail : see the 'copyright' file.
+*
+* This program is free software; you can redistribute it and/or
+* modify it under the terms of the GNU General Public License
+* as published by the Free Software Foundation; either version 3
+* of the License, or (at your option) any later version.
+*
+* This program is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+* GNU General Public License for more details.
+* You should have received a copy of the GNU General Public License
+* along with this program. If not, see <http://www.gnu.org/licenses/>.
+*/
+
+#ifndef __CD_CLOCK_TIMER__
+#define __CD_CLOCK_TIMER__
+
+#include <cairo-dock.h>
+#include "applet-struct.h"
+
+
+void cd_clock_free_alarm (CDClockAlarm *pAlarm);
+
+
+void cd_clock_init_time (CairoDockModuleInstance *myApplet);
+
+gboolean cd_clock_update_with_time (CairoDockModuleInstance *myApplet);
+
+
+#endif
=== modified file 'debian/changelog'
--- debian/changelog 2010-09-07 00:39:20 +0000
+++ debian/changelog 2010-09-22 10:43:43 +0000
@@ -1,3 +1,21 @@
+cairo-dock-plug-ins (2.2.0~2-0ubuntu1) maverick; urgency=low
+
+ * New Upstream Version (LP: #638529)
+ * Fixed a few bugs on LP:
+ - Fixed a crash in rainbow view when the cone is completely opened
+ - Fixed a crash in rainbow view if the subdock is empty
+ - Installed in lib directory by default even in 64bits arch
+ - Status-Notifier: fixed few bugs
+ - Clock applet:
+ - Notify of missed tasks (moved some functions to a new file)
+ - Fixed a little memory leak
+ - Removed some 'g_print' (LP: #500677: xsession-errors log)
+ * Updated translations
+ * debian/control
+ - Updated the version of cairo-dock-dev and cairo-dock-core
+
+ -- Matthieu Baerts (matttbe) <matttbe@xxxxxxxxx> Sat, 18 Sep 2010 14:20:27 +0200
+
cairo-dock-plug-ins (2.2.0~0rc1-0ubuntu1) maverick; urgency=low
* New Upstream Version (LP: #632054)
=== modified file 'debian/control'
--- debian/control 2010-09-07 00:39:20 +0000
+++ debian/control 2010-09-22 10:43:43 +0000
@@ -15,8 +15,8 @@
libxml2-dev,
libxtst-dev,
libglib2.0-dev (>= 2.20),
- cairo-dock-dev (>= 2.2.0~0rc1-0ubuntu1),
- cairo-dock-core (>= 2.2.0~0rc1-0ubuntu1),
+ cairo-dock-dev (>= 2.2.0~2),
+ cairo-dock-core (>= 2.2.0~2),
libasound2-dev,
libvte-dev,
x11proto-xf86vidmode-dev,
=== modified file 'dock-rendering/src/rendering-rainbow.c'
--- dock-rendering/src/rendering-rainbow.c 2010-09-07 00:39:20 +0000
+++ dock-rendering/src/rendering-rainbow.c 2010-09-22 10:43:43 +0000
@@ -70,7 +70,7 @@
//g_print ("pDock->fFoldingFactor : %.2f\n", pDock->fFoldingFactor);
double fMaxScale = 1. + my_fRainbowMagnitude * g_fAmplitude;
double fRadius=0;
- if (my_fRainbowColor[3] != 0)
+ if (my_fRainbowColor[3] != 0 && pDock->icons != NULL)
{
cairo_save (pCairoContext);
if (! pDock->container.bIsHorizontal)
@@ -84,7 +84,7 @@
cairo_translate (pCairoContext, 0., pDock->container.iHeight);
cairo_scale (pCairoContext, 1., -1.);
}
- //\____________________ On trace le cadre.
+ //\____________________ On fait un clip du cone.
cairo_move_to (pCairoContext, 0., pDock->container.iHeight * (1 - sin (my_fRainbowConeOffset)));
cairo_line_to (pCairoContext, pDock->container.iWidth/2, pDock->container.iHeight);
cairo_line_to (pCairoContext, pDock->container.iWidth, pDock->container.iHeight * (1 - sin (my_fRainbowConeOffset)));
@@ -93,7 +93,7 @@
cairo_close_path (pCairoContext);
cairo_clip (pCairoContext);
- //\____________________ On dessine les decorations dedans.
+ //\____________________ On dessine chaque rayure dedans.
cairo_pattern_t *pGradationPattern = cairo_pattern_create_radial (pDock->container.iWidth/2,
pDock->container.iHeight,
0.,
@@ -505,7 +505,7 @@
}
-static double *_generate_cos_sin (double fConeOffset, double fDelta, double *pTabValues)
+static void _generate_cos_sin (double fConeOffset, double fDelta, double *pTabValues)
{
int i, n = (int) ceil ((G_PI/2 - fConeOffset) / fDelta);
pTabValues[2*n] = 0.; // point au milieu.
@@ -521,9 +521,8 @@
pTabValues[2*(2*n-i)] = - pTabValues[2*i];
pTabValues[2*(2*n-i)+1] = pTabValues[2*i+1];
}
- return pTabValues;
}
-static GLfloat *_generate_sector_path (double fConeOffset, double fRadius1, double fRadius2, double fDelta, double *pCosSinTab, GLfloat *pTabValues)
+static void _generate_sector_path (double fConeOffset, double fRadius1, double fRadius2, double fDelta, double *pCosSinTab, GLfloat *pTabValues)
{
int i, n = (int) ceil ((G_PI/2 - fConeOffset) / fDelta), N = (2*n+1) * 2;
for (i = 0; i < 2*n+1; i ++)
@@ -538,25 +537,24 @@
pTabValues[3*N+1] = pTabValues[3*0+1];
pTabValues[3*(N+1)] = pTabValues[3*1];
pTabValues[3*(N+1)+1] = pTabValues[3*1+1];
-
- return pTabValues;
}
static void cd_rendering_render_rainbow_opengl (CairoDock *pDock)
{
static double fDelta = 1.;
+ int n = ceil (180./fDelta+1) + 1; // nb points max, +1 for safety with rounded calculations.
if (pCosSinTab == NULL)
{
- pCosSinTab = g_new0 (double, (180./fDelta+1) * 2);
+ pCosSinTab = g_new0 (double, n * 2);
_generate_cos_sin (my_fRainbowConeOffset, fDelta/180.*G_PI, pCosSinTab);
}
if (pVertexTab == NULL)
- pVertexTab = g_new0 (GLfloat, ((180./fDelta+1) * 2) * 3);
+ pVertexTab = g_new0 (GLfloat, (n * 2) * 3);
if (pColorTab == NULL)
{
- pColorTab = g_new0 (GLfloat, ((180./fDelta+1) * 2) * 4);
+ pColorTab = g_new0 (GLfloat, (n * 2) * 4);
int i;
- for (i = 0; i < (180./fDelta+1); i ++)
+ for (i = 0; i < n; i ++)
{
pColorTab[4*2*i+0] = my_fRainbowColor[0];
pColorTab[4*2*i+1] = my_fRainbowColor[1];
@@ -567,7 +565,7 @@
double fMaxScale = 1. + my_fRainbowMagnitude * g_fAmplitude;
double fRadius=0;
- if (my_fRainbowColor[3] != 0)
+ if (my_fRainbowColor[3] != 0 && pDock->icons != NULL)
{
//\____________________ On trace le cadre.
//\____________________ On dessine les decorations dedans.
@@ -582,7 +580,7 @@
glEnableClientState(GL_COLOR_ARRAY);
glLineWidth (1);
- int i, n = (int) ceil ((G_PI/2 - my_fRainbowConeOffset) / (fDelta/180.*G_PI)), N = (2*n+1) * 2;
+ int n = (int) ceil ((G_PI/2 - my_fRainbowConeOffset) / (fDelta/180.*G_PI)), N = (2*n+1) * 2;
glPushMatrix ();
if (! pDock->container.bIsHorizontal)
@@ -722,6 +720,8 @@
pColorTab = NULL;
g_free (pCosSinTab);
pCosSinTab = NULL;
+ g_free (pVertexTab);
+ pVertexTab = NULL;
}
=== modified file 'kde-integration/src/applet-vfs.c'
--- kde-integration/src/applet-vfs.c 2010-08-07 01:43:25 +0000
+++ kde-integration/src/applet-vfs.c 2010-09-22 10:43:43 +0000
@@ -788,6 +788,7 @@
static gchar *_cd_find_target_uri (const gchar *cBaseURI)
+
{
GError *erreur = NULL;
GFile *pFile = g_file_new_for_uri (cBaseURI);
@@ -1275,7 +1276,7 @@
gsize vfs_backend_measure_directory (const gchar *cBaseURI, gint iCountType, gboolean bRecursive, gint *pCancel)
{
g_return_val_if_fail (cBaseURI != NULL, 0);
- g_print ("%s (%s)\n", __func__, cBaseURI);
+ //g_print ("%s (%s)\n", __func__, cBaseURI);
GError *erreur = NULL;
gchar *cDirectory = (*cBaseURI == '/' ? (gchar*)cBaseURI : g_filename_from_uri (cBaseURI, NULL, &erreur));
=== modified file 'mail/src/cd-mail-applet-etpan.c'
--- mail/src/cd-mail-applet-etpan.c 2010-08-07 01:43:25 +0000
+++ mail/src/cd-mail-applet-etpan.c 2010-09-22 10:43:43 +0000
@@ -344,7 +344,7 @@
struct mail_flags *pFlags = NULL;
// on marque le message comme lu.
- g_print ("Fetching message number %d (uid %s)...", i, cMessageUid);
+ //g_print ("Fetching message number %d (uid %s)...", i, cMessageUid);
r = mailfolder_get_message_by_uid (pMailAccount->folder, cMessageUid, &pMessage); /// or result_messages - i ?...
if (r != MAIL_NO_ERROR || pMessage == NULL)
=== modified file 'mail/src/cd-mail-applet-notifications.c'
--- mail/src/cd-mail-applet-notifications.c 2010-09-07 00:39:20 +0000
+++ mail/src/cd-mail-applet-notifications.c 2010-09-22 10:43:43 +0000
@@ -103,6 +103,11 @@
}
}
+static void _cd_mail_update_all_accounts (GtkMenuItem *menu_item, CairoDockModuleInstance *myApplet)
+{
+ _cd_mail_force_update (myApplet);
+}
+
CD_APPLET_ON_MIDDLE_CLICK_BEGIN
_cd_mail_force_update(myApplet);
@@ -131,29 +136,44 @@
_cd_mail_force_update(myApplet);
}
CD_APPLET_ON_BUILD_MENU_BEGIN
-
GtkWidget *pSubMenu = CD_APPLET_CREATE_MY_SUB_MENU ();
+
+ // Main Menu
if(myData.pMailAccounts && myData.pMailAccounts->len > 0)
{
- /* add a "update account" item for each mailbox */
- GtkWidget *pRefreshAccountSubMenu = CD_APPLET_ADD_SUB_MENU (D_("Refresh a mail account"), pSubMenu);
-
+ if (myData.pMailAccounts->len > 1) // many accounts -> list them in a sub-menu
+ {
+ // add a "update account" item for each mailbox
+ GtkWidget *pRefreshAccountSubMenu = CD_APPLET_ADD_SUB_MENU_WITH_IMAGE (D_("Refresh a mail account"), CD_APPLET_MY_MENU, GTK_STOCK_REFRESH);
guint i;
for (i = 0; i < myData.pMailAccounts->len; i ++)
{
- CDMailAccount *pMailAccount = g_ptr_array_index (myData.pMailAccounts, i);
- CD_APPLET_ADD_IN_MENU_WITH_DATA (pMailAccount->name, _cd_mail_update_account, pRefreshAccountSubMenu, pMailAccount);
+ CDMailAccount *pMailAccount = g_ptr_array_index (myData.pMailAccounts, i);
+ CD_APPLET_ADD_IN_MENU_WITH_DATA (pMailAccount->name, _cd_mail_update_account, pRefreshAccountSubMenu, pMailAccount);
}
+ CD_APPLET_ADD_IN_MENU_WITH_STOCK_AND_DATA (D_("Refresh all (Middle-click)"), GTK_STOCK_REFRESH, _cd_mail_update_all_accounts, CD_APPLET_MY_MENU, myApplet);
+ }
+ else // 1 account -> in main menu
+ {
+ CDMailAccount *pMailAccount = g_ptr_array_index (myData.pMailAccounts, 0);
+ gchar *cLabel = g_strdup_printf (D_("Refresh %s"), pMailAccount->name);
+ CD_APPLET_ADD_IN_MENU_WITH_STOCK_AND_DATA (cLabel, GTK_STOCK_REFRESH, _cd_mail_update_account, CD_APPLET_MY_MENU, pMailAccount);
+ g_free (cLabel);
+ }
}
- CD_APPLET_ADD_IN_MENU (D_("Mark all emails as read"), _cd_mail_mark_all_as_read, pSubMenu);
+
+ CD_APPLET_ADD_IN_MENU_WITH_STOCK (D_("Mark all emails as read"), GTK_STOCK_OK, _cd_mail_mark_all_as_read, CD_APPLET_MY_MENU);
if (myConfig.cMailApplication)
{
gchar *cLabel = g_strdup_printf (D_("Launch %s"), myConfig.cMailApplication);
- CD_APPLET_ADD_IN_MENU (cLabel, _cd_mail_launch_mail_appli, pSubMenu);
+ CD_APPLET_ADD_IN_MENU_WITH_STOCK (cLabel, GTK_STOCK_EXECUTE, _cd_mail_launch_mail_appli, CD_APPLET_MY_MENU);
g_free (cLabel);
}
+
+ // Sub-Menu
+ if (pSubMenu == CD_APPLET_MY_MENU)
+ CD_APPLET_ADD_SEPARATOR_IN_MENU (CD_APPLET_MY_MENU);
CD_APPLET_ADD_ABOUT_IN_MENU (pSubMenu);
-
CD_APPLET_ON_BUILD_MENU_END
void _cd_mail_show_current_mail(CDMailAccount *pMailAccount)
=== modified file 'musicPlayer/src/applet-rhythmbox.c'
--- musicPlayer/src/applet-rhythmbox.c 2010-08-07 01:43:25 +0000
+++ musicPlayer/src/applet-rhythmbox.c 2010-09-22 10:43:43 +0000
@@ -112,7 +112,7 @@
}
else
{
- cd_warning (" can't get song properties");
+ cd_debug (" can't get song properties");
g_free (myData.cPlayingUri);
myData.cPlayingUri = NULL;
g_free (myData.cTitle);
=== modified file 'po/ar.po'
--- po/ar.po 2010-09-07 00:39:20 +0000
+++ po/ar.po 2010-09-22 10:43:43 +0000
@@ -7,14 +7,14 @@
msgstr ""
"Project-Id-Version: cairo-dock-plug-ins\n"
"Report-Msgid-Bugs-To: fabounet@xxxxxxxxxxxx\n"
-"POT-Creation-Date: 2010-08-11 00:19+0000\n"
-"PO-Revision-Date: 2010-08-16 19:46+0000\n"
-"Last-Translator: eslam basha <Unknown>\n"
+"POT-Creation-Date: 2010-08-29 00:59+0000\n"
+"PO-Revision-Date: 2010-09-07 04:05+0000\n"
+"Last-Translator: Matthieu Baerts <matttbe@xxxxxxxxx>\n"
"Language-Team: Arabic <ar@xxxxxx>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-08-17 07:07+0000\n"
+"X-Launchpad-Export-Date: 2010-09-08 04:50+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#: ../Animated-icons/src/applet-init.c:32
@@ -583,7 +583,7 @@
#: ../Network-Monitor/src/applet-netspeed.c:200
#: ../System-Monitor/src/applet-monitor.c:82
-#: ../netspeed/src/applet-netspeed.c:183
+#: ../netspeed/src/applet-netspeed.c:196
msgid "Loading"
msgstr "جاري التØميل"
@@ -1042,6 +1042,14 @@
msgid "Adjust channels"
msgstr ""
+#: ../alsaMixer/src/applet-notifications.c:59
+msgid "Unmute"
+msgstr ""
+
+#: ../alsaMixer/src/applet-notifications.c:61
+msgid "Mute"
+msgstr ""
+
#: ../clock/src/applet-calendar.c:190 ../clock/src/applet-calendar.c:271
#: ../clock/src/applet-calendar.c:437 ../clock/src/applet-calendar.c:442
#: ../clock/src/applet-draw.c:83 ../clock/src/applet-draw.c:339
@@ -1256,7 +1264,7 @@
msgid "Right-click to add a new task."
msgstr ""
-#: ../clock/src/applet-task-editor.c:397 ../musicPlayer/src/applet-draw.c:340
+#: ../clock/src/applet-task-editor.c:397 ../musicPlayer/src/applet-draw.c:338
#: ../RSSreader/data/messages:135
msgid "Title"
msgstr ""
@@ -1574,8 +1582,8 @@
"dock."
msgstr ""
-#: ../dustbin/src/applet-draw.c:155 ../dustbin/src/applet-trashes-manager.c:94
-#: ../dustbin/src/applet-trashes-manager.c:123
+#: ../dustbin/src/applet-draw.c:155 ../dustbin/src/applet-trashes-manager.c:98
+#: ../dustbin/src/applet-trashes-manager.c:127
msgid "calculating"
msgstr ""
@@ -1603,45 +1611,53 @@
msgid "You're about to delete all files in all dustbins. Sure ?"
msgstr ""
-#: ../dustbin/src/applet-notifications.c:63
+#: ../dustbin/src/applet-notifications.c:80
msgid "The trash contains"
msgstr ""
-#: ../dustbin/src/applet-notifications.c:65
+#: ../dustbin/src/applet-notifications.c:82
msgid "files"
msgstr ""
-#: ../dustbin/src/applet-notifications.c:67
+#: ../dustbin/src/applet-notifications.c:82
+msgid "elements"
+msgstr ""
+
+#: ../dustbin/src/applet-notifications.c:84
msgid "Mo"
msgstr ""
-#: ../dustbin/src/applet-notifications.c:67
+#: ../dustbin/src/applet-notifications.c:84
msgid "Ko"
msgstr ""
-#: ../dustbin/src/applet-notifications.c:73
+#: ../dustbin/src/applet-notifications.c:100
+msgid "Counting total size and files number..."
+msgstr ""
+
+#: ../dustbin/src/applet-notifications.c:136
msgid "Show Trash (click)"
msgstr ""
-#: ../dustbin/src/applet-notifications.c:74
+#: ../dustbin/src/applet-notifications.c:137
msgid "Empty Trash (middle-click)"
msgstr ""
-#: ../dustbin/src/applet-notifications.c:76
+#: ../dustbin/src/applet-notifications.c:139
msgid "Display dustbins information"
msgstr ""
-#: ../dustbin/src/applet-notifications.c:88
+#: ../dustbin/src/applet-notifications.c:151
#, c-format
msgid "%s successfully unmounted"
msgstr ""
-#: ../dustbin/src/applet-notifications.c:92
+#: ../dustbin/src/applet-notifications.c:155
#, c-format
msgid "failed to unmount %s"
msgstr ""
-#: ../dustbin/src/applet-notifications.c:116
+#: ../dustbin/src/applet-notifications.c:179
#: ../shortcuts/src/applet-notifications.c:167
msgid "Unmouting this volume ..."
msgstr ""
@@ -1760,7 +1776,7 @@
msgid "Program an automatic shut-down"
msgstr ""
-#: ../logout/src/applet-notifications.c:157
+#: ../logout/src/applet-notifications.c:158
msgid "Your computer will shut-down in 1 minute."
msgstr ""
@@ -1951,7 +1967,7 @@
msgid "Artist"
msgstr ""
-#: ../musicPlayer/src/applet-draw.c:338
+#: ../musicPlayer/src/applet-draw.c:340
msgid "Album"
msgstr ""
@@ -1971,11 +1987,11 @@
msgid "There is no media playing."
msgstr ""
-#: ../musicPlayer/src/applet-init.c:47
+#: ../musicPlayer/src/applet-init.c:48
msgid "musicPlayer"
msgstr ""
-#: ../musicPlayer/src/applet-init.c:50
+#: ../musicPlayer/src/applet-init.c:51
msgid ""
"This applet lets you control any music player.\n"
"Left click to Play/Pause, middle-click to play Next song.\n"
@@ -2335,7 +2351,7 @@
msgid "stack"
msgstr ""
-#: ../stack/src/applet-init.c:34
+#: ../stack/src/applet-init.c:34 ../stacks/src/applet-init.c:33
msgid ""
"This applet allows you to build a stack of files, just like the Stacks "
"applet of MacOS X.\n"
@@ -2392,6 +2408,18 @@
msgid "Clear the stack"
msgstr ""
+#: ../stacks/src/applet-init.c:30
+msgid "stacks"
+msgstr ""
+
+#: ../stacks/src/applet-notifications.c:44
+msgid "Reload Stacks"
+msgstr ""
+
+#: ../stacks/src/applet-notifications.c:45
+msgid "Clean local directory"
+msgstr ""
+
#: ../switcher/src/applet-draw.c:612 ../switcher/src/applet-draw.c:619
#: ../switcher/src/applet-load-icons.c:43
#: ../switcher/src/applet-notifications.c:393
@@ -2900,11 +2928,11 @@
#: ../netspeed/data/messages:41 ../powermanager/data/messages:43
#: ../quick-browser/data/messages:47 ../shortcuts/data/messages:45
#: ../showDesktop/data/messages:49 ../slider/data/messages:43
-#: ../stack/data/messages:47 ../switcher/data/messages:37
-#: ../systray/data/messages:37 ../template/data/messages:45
-#: ../terminal/data/messages:45 ../tomboy/data/messages:55
-#: ../weather/data/messages:43 ../weblets/data/messages:45
-#: ../wifi/data/messages:43
+#: ../stack/data/messages:47 ../stacks/data/messages:43
+#: ../switcher/data/messages:37 ../systray/data/messages:37
+#: ../template/data/messages:45 ../terminal/data/messages:45
+#: ../tomboy/data/messages:55 ../weather/data/messages:43
+#: ../weblets/data/messages:45 ../wifi/data/messages:43
msgid "Normal"
msgstr ""
@@ -2922,7 +2950,7 @@
#: ../Animated-icons/data/messages:105 ../Animated-icons/data/messages:109
#: ../Clipper/data/messages:9 ../Doncky/data/messages:9
-#: ../Doncky/data/messages:91 ../Folders/data/messages:21
+#: ../Doncky/data/messages:91 ../Folders/data/messages:23
#: ../GMenu/data/messages:9 ../GMenu/data/messages:99
#: ../RSSreader/data/messages:11 ../RSSreader/data/messages:129
#: ../System-Monitor/data/messages:157 ../System-Monitor/data/messages:165
@@ -2931,9 +2959,10 @@
#: ../dnd2share/data/messages:9 ../logout/data/messages:9
#: ../quick-browser/data/messages:11 ../shortcuts/data/messages:9
#: ../showDesktop/data/messages:9 ../stack/data/messages:11
-#: ../switcher/data/messages:9 ../switcher/data/messages:141
-#: ../systray/data/messages:9 ../template/data/messages:9
-#: ../terminal/data/messages:9 ../weblets/data/messages:9
+#: ../stacks/data/messages:9 ../switcher/data/messages:9
+#: ../switcher/data/messages:141 ../systray/data/messages:9
+#: ../template/data/messages:9 ../terminal/data/messages:9
+#: ../weblets/data/messages:9
msgid "Leave empty to use the default one."
msgstr ""
@@ -3071,11 +3100,11 @@
#: ../netspeed/data/messages:1 ../powermanager/data/messages:1
#: ../quick-browser/data/messages:1 ../shortcuts/data/messages:1
#: ../showDesktop/data/messages:1 ../slider/data/messages:1
-#: ../stack/data/messages:1 ../switcher/data/messages:1
-#: ../systray/data/messages:1 ../template/data/messages:1
-#: ../terminal/data/messages:1 ../tomboy/data/messages:1
-#: ../weather/data/messages:1 ../weblets/data/messages:1
-#: ../wifi/data/messages:1
+#: ../stack/data/messages:1 ../stacks/data/messages:1
+#: ../switcher/data/messages:1 ../systray/data/messages:1
+#: ../template/data/messages:1 ../terminal/data/messages:1
+#: ../tomboy/data/messages:1 ../weather/data/messages:1
+#: ../weblets/data/messages:1 ../wifi/data/messages:1
msgid "Icon"
msgstr ""
@@ -3093,11 +3122,11 @@
#: ../netspeed/data/messages:3 ../powermanager/data/messages:3
#: ../quick-browser/data/messages:3 ../shortcuts/data/messages:3
#: ../showDesktop/data/messages:3 ../slider/data/messages:3
-#: ../stack/data/messages:3 ../switcher/data/messages:3
-#: ../systray/data/messages:3 ../template/data/messages:3
-#: ../terminal/data/messages:3 ../tomboy/data/messages:3
-#: ../weather/data/messages:3 ../weblets/data/messages:3
-#: ../wifi/data/messages:3
+#: ../stack/data/messages:3 ../stacks/data/messages:3
+#: ../switcher/data/messages:3 ../systray/data/messages:3
+#: ../template/data/messages:3 ../terminal/data/messages:3
+#: ../tomboy/data/messages:3 ../weather/data/messages:3
+#: ../weblets/data/messages:3 ../wifi/data/messages:3
msgid "Set to 0 to use the default applet size"
msgstr ""
@@ -3110,7 +3139,7 @@
msgstr ""
#: ../Cairo-Penguin/data/messages:9 ../Clipper/data/messages:13
-#: ../Doncky/data/messages:13 ../Folders/data/messages:25
+#: ../Doncky/data/messages:13 ../Folders/data/messages:11
#: ../GMenu/data/messages:13 ../MeMenu/data/messages:7
#: ../Messaging-Menu/data/messages:9 ../Network-Monitor/data/messages:11
#: ../RSSreader/data/messages:15 ../Status-Notifier/data/messages:13
@@ -3123,11 +3152,11 @@
#: ../netspeed/data/messages:9 ../powermanager/data/messages:9
#: ../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:9
-#: ../weather/data/messages:11 ../weblets/data/messages:13
-#: ../wifi/data/messages:9
+#: ../stack/data/messages:15 ../stacks/data/messages:13
+#: ../switcher/data/messages:13 ../systray/data/messages:13
+#: ../template/data/messages:13 ../terminal/data/messages:13
+#: ../tomboy/data/messages:9 ../weather/data/messages:11
+#: ../weblets/data/messages:13 ../wifi/data/messages:9
msgid "Name of the dock it belongs to:"
msgstr ""
@@ -3169,12 +3198,12 @@
#: ../powermanager/data/messages:89 ../quick-browser/data/messages:93
#: ../shortcuts/data/messages:91 ../show-mouse/data/messages:1
#: ../showDesktop/data/messages:95 ../slider/data/messages:89
-#: ../stack/data/messages:93 ../switcher/data/messages:83
-#: ../switcher/data/messages:85 ../systray/data/messages:83
-#: ../template/data/messages:91 ../terminal/data/messages:91
-#: ../tomboy/data/messages:101 ../weather/data/messages:89
-#: ../weather/data/messages:91 ../weblets/data/messages:91
-#: ../wifi/data/messages:89
+#: ../stack/data/messages:93 ../stacks/data/messages:89
+#: ../switcher/data/messages:83 ../switcher/data/messages:85
+#: ../systray/data/messages:83 ../template/data/messages:91
+#: ../terminal/data/messages:91 ../tomboy/data/messages:101
+#: ../weather/data/messages:89 ../weather/data/messages:91
+#: ../weblets/data/messages:91 ../wifi/data/messages:89
msgid "Configuration"
msgstr ""
@@ -3191,7 +3220,7 @@
#: ../Network-Monitor/data/messages:167 ../System-Monitor/data/messages:149
#: ../System-Monitor/data/messages:185 ../Toons/data/messages:93
#: ../dnd2share/data/messages:93 ../mail/data/messages:115
-#: ../musicPlayer/data/messages:137 ../netspeed/data/messages:131
+#: ../musicPlayer/data/messages:139 ../netspeed/data/messages:131
#: ../powermanager/data/messages:145 ../shortcuts/data/messages:129
#: ../slider/data/messages:107 ../tomboy/data/messages:115
#: ../wifi/data/messages:165
@@ -3233,10 +3262,11 @@
#: ../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
+#: ../stacks/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 "Desired icon size for this applet"
msgstr ""
@@ -3252,21 +3282,22 @@
#: ../musicPlayer/data/messages:9 ../netspeed/data/messages:7
#: ../quick-browser/data/messages:9 ../shortcuts/data/messages:7
#: ../showDesktop/data/messages:7 ../slider/data/messages:7
-#: ../stack/data/messages:9 ../switcher/data/messages:7
-#: ../template/data/messages:7 ../weather/data/messages:9
-#: ../weblets/data/messages:7 ../wifi/data/messages:7
+#: ../stack/data/messages:9 ../stacks/data/messages:7
+#: ../switcher/data/messages:7 ../template/data/messages:7
+#: ../weather/data/messages:9 ../weblets/data/messages:7
+#: ../wifi/data/messages:7
msgid "Name of the icon as it will appear in its caption in the dock:"
msgstr ""
#: ../Clipper/data/messages:11 ../Doncky/data/messages:11
-#: ../Folders/data/messages:23 ../GMenu/data/messages:11
+#: ../Folders/data/messages:25 ../GMenu/data/messages:11
#: ../RSSreader/data/messages:13 ../Xgamma/data/messages:11
#: ../dnd2share/data/messages:11 ../logout/data/messages:11
#: ../quick-browser/data/messages:13 ../shortcuts/data/messages:11
#: ../showDesktop/data/messages:11 ../stack/data/messages:13
-#: ../switcher/data/messages:11 ../systray/data/messages:11
-#: ../template/data/messages:11 ../terminal/data/messages:11
-#: ../weblets/data/messages:11
+#: ../stacks/data/messages:11 ../switcher/data/messages:11
+#: ../systray/data/messages:11 ../template/data/messages:11
+#: ../terminal/data/messages:11 ../weblets/data/messages:11
msgid "Image filename:"
msgstr ""
@@ -3284,10 +3315,11 @@
#: ../powermanager/data/messages:15 ../quick-browser/data/messages:19
#: ../shortcuts/data/messages:17 ../showDesktop/data/messages:21
#: ../slider/data/messages:15 ../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:15
-#: ../weblets/data/messages:17 ../wifi/data/messages:15
+#: ../stacks/data/messages:15 ../switcher/data/messages:17
+#: ../systray/data/messages:17 ../template/data/messages:17
+#: ../terminal/data/messages:17 ../tomboy/data/messages:27
+#: ../weather/data/messages:15 ../weblets/data/messages:17
+#: ../wifi/data/messages:15
msgid "Desklet"
msgstr ""
@@ -3305,10 +3337,11 @@
#: ../powermanager/data/messages:17 ../quick-browser/data/messages:21
#: ../shortcuts/data/messages:19 ../showDesktop/data/messages:23
#: ../slider/data/messages:17 ../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:17
-#: ../weblets/data/messages:19 ../wifi/data/messages:17
+#: ../stacks/data/messages:17 ../switcher/data/messages:19
+#: ../systray/data/messages:19 ../template/data/messages:19
+#: ../terminal/data/messages:19 ../tomboy/data/messages:29
+#: ../weather/data/messages:17 ../weblets/data/messages:19
+#: ../wifi/data/messages:17
msgid "Position"
msgstr ""
@@ -3326,10 +3359,11 @@
#: ../powermanager/data/messages:19 ../quick-browser/data/messages:23
#: ../shortcuts/data/messages:21 ../showDesktop/data/messages:25
#: ../slider/data/messages:19 ../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:19
-#: ../weblets/data/messages:21 ../wifi/data/messages:19
+#: ../stacks/data/messages:19 ../switcher/data/messages:21
+#: ../systray/data/messages:21 ../template/data/messages:21
+#: ../terminal/data/messages:21 ../tomboy/data/messages:31
+#: ../weather/data/messages:19 ../weblets/data/messages:21
+#: ../wifi/data/messages:19
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."
@@ -3349,10 +3383,11 @@
#: ../powermanager/data/messages:21 ../quick-browser/data/messages:25
#: ../shortcuts/data/messages:23 ../showDesktop/data/messages:27
#: ../slider/data/messages:21 ../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:21
-#: ../weblets/data/messages:23 ../wifi/data/messages:21
+#: ../stacks/data/messages:21 ../switcher/data/messages:23
+#: ../systray/data/messages:23 ../template/data/messages:23
+#: ../terminal/data/messages:23 ../tomboy/data/messages:33
+#: ../weather/data/messages:21 ../weblets/data/messages:23
+#: ../wifi/data/messages:21
msgid "Lock position?"
msgstr ""
@@ -3370,10 +3405,10 @@
#: ../powermanager/data/messages:23 ../quick-browser/data/messages:27
#: ../shortcuts/data/messages:25 ../showDesktop/data/messages:29
#: ../slider/data/messages:23 ../stack/data/messages:27
-#: ../switcher/data/messages:25 ../template/data/messages:25
-#: ../terminal/data/messages:25 ../tomboy/data/messages:35
-#: ../weather/data/messages:23 ../weblets/data/messages:25
-#: ../wifi/data/messages:23
+#: ../stacks/data/messages:23 ../switcher/data/messages:25
+#: ../template/data/messages:25 ../terminal/data/messages:25
+#: ../tomboy/data/messages:35 ../weather/data/messages:23
+#: ../weblets/data/messages:25 ../wifi/data/messages:23
msgid ""
"Depending on your WindowManager, you may be able to resize this with ALT + "
"middle-click or ALT + left-click."
@@ -3393,10 +3428,10 @@
#: ../powermanager/data/messages:25 ../quick-browser/data/messages:29
#: ../shortcuts/data/messages:27 ../showDesktop/data/messages:31
#: ../slider/data/messages:25 ../stack/data/messages:29
-#: ../switcher/data/messages:27 ../template/data/messages:27
-#: ../terminal/data/messages:27 ../tomboy/data/messages:37
-#: ../weather/data/messages:25 ../weblets/data/messages:27
-#: ../wifi/data/messages:25
+#: ../stacks/data/messages:25 ../switcher/data/messages:27
+#: ../template/data/messages:27 ../terminal/data/messages:27
+#: ../tomboy/data/messages:37 ../weather/data/messages:25
+#: ../weblets/data/messages:27 ../wifi/data/messages:25
msgid "Desklet dimensions (width x height):"
msgstr ""
@@ -3411,9 +3446,9 @@
#: ../musicPlayer/data/messages:27 ../powermanager/data/messages:27
#: ../quick-browser/data/messages:31 ../shortcuts/data/messages:29
#: ../showDesktop/data/messages:33 ../slider/data/messages:27
-#: ../stack/data/messages:31 ../terminal/data/messages:29
-#: ../weather/data/messages:27 ../weblets/data/messages:29
-#: ../wifi/data/messages:27
+#: ../stack/data/messages:31 ../stacks/data/messages:27
+#: ../terminal/data/messages:29 ../weather/data/messages:27
+#: ../weblets/data/messages:29 ../wifi/data/messages:27
msgid ""
"Depending on your WindowManager, you may be able to move this with ALT + "
"left-click."
@@ -3433,10 +3468,11 @@
#: ../powermanager/data/messages:29 ../quick-browser/data/messages:33
#: ../shortcuts/data/messages:31 ../showDesktop/data/messages:35
#: ../slider/data/messages:29 ../stack/data/messages:33
-#: ../switcher/data/messages:29 ../systray/data/messages:27
-#: ../template/data/messages:31 ../terminal/data/messages:31
-#: ../tomboy/data/messages:41 ../weather/data/messages:29
-#: ../weblets/data/messages:31 ../wifi/data/messages:29
+#: ../stacks/data/messages:29 ../switcher/data/messages:29
+#: ../systray/data/messages:27 ../template/data/messages:31
+#: ../terminal/data/messages:31 ../tomboy/data/messages:41
+#: ../weather/data/messages:29 ../weblets/data/messages:31
+#: ../wifi/data/messages:29
msgid "Desklet position (x, y):"
msgstr ""
@@ -3453,10 +3489,10 @@
#: ../netspeed/data/messages:29 ../powermanager/data/messages:31
#: ../quick-browser/data/messages:35 ../shortcuts/data/messages:33
#: ../showDesktop/data/messages:37 ../slider/data/messages:31
-#: ../stack/data/messages:35 ../template/data/messages:33
-#: ../terminal/data/messages:33 ../tomboy/data/messages:43
-#: ../weather/data/messages:31 ../weblets/data/messages:33
-#: ../wifi/data/messages:31
+#: ../stack/data/messages:35 ../stacks/data/messages:31
+#: ../template/data/messages:33 ../terminal/data/messages:33
+#: ../tomboy/data/messages:43 ../weather/data/messages:31
+#: ../weblets/data/messages:33 ../wifi/data/messages:31
msgid ""
"You can quickly rotate the desklet with the mouse, by dragging the little "
"buttons on its left and top sides."
@@ -3475,10 +3511,10 @@
#: ../netspeed/data/messages:31 ../powermanager/data/messages:33
#: ../quick-browser/data/messages:37 ../shortcuts/data/messages:35
#: ../showDesktop/data/messages:39 ../slider/data/messages:33
-#: ../stack/data/messages:37 ../template/data/messages:35
-#: ../terminal/data/messages:35 ../tomboy/data/messages:45
-#: ../weather/data/messages:33 ../weblets/data/messages:35
-#: ../wifi/data/messages:33
+#: ../stack/data/messages:37 ../stacks/data/messages:33
+#: ../template/data/messages:35 ../terminal/data/messages:35
+#: ../tomboy/data/messages:45 ../weather/data/messages:33
+#: ../weblets/data/messages:35 ../wifi/data/messages:33
msgid "Rotation:"
msgstr ""
@@ -3496,10 +3532,11 @@
#: ../powermanager/data/messages:35 ../quick-browser/data/messages:39
#: ../shortcuts/data/messages:37 ../showDesktop/data/messages:41
#: ../slider/data/messages:35 ../stack/data/messages:39
-#: ../switcher/data/messages:31 ../systray/data/messages:29
-#: ../template/data/messages:37 ../terminal/data/messages:37
-#: ../tomboy/data/messages:47 ../weather/data/messages:35
-#: ../weblets/data/messages:37 ../wifi/data/messages:35
+#: ../stacks/data/messages:35 ../switcher/data/messages:31
+#: ../systray/data/messages:29 ../template/data/messages:37
+#: ../terminal/data/messages:37 ../tomboy/data/messages:47
+#: ../weather/data/messages:35 ../weblets/data/messages:37
+#: ../wifi/data/messages:35
msgid "Visibility"
msgstr ""
@@ -3517,11 +3554,11 @@
#: ../netspeed/data/messages:35 ../powermanager/data/messages:37
#: ../quick-browser/data/messages:41 ../shortcuts/data/messages:39
#: ../showDesktop/data/messages:43 ../slider/data/messages:37
-#: ../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:37 ../weblets/data/messages:39
-#: ../wifi/data/messages:37
+#: ../stack/data/messages:41 ../stacks/data/messages:37
+#: ../switcher/data/messages:33 ../systray/data/messages:31
+#: ../template/data/messages:39 ../terminal/data/messages:39
+#: ../tomboy/data/messages:49 ../weather/data/messages:37
+#: ../weblets/data/messages:39 ../wifi/data/messages:37
msgid "Is detached from the dock"
msgstr ""
@@ -3539,10 +3576,10 @@
#: ../powermanager/data/messages:39 ../quick-browser/data/messages:43
#: ../shortcuts/data/messages:41 ../showDesktop/data/messages:45
#: ../slider/data/messages:39 ../stack/data/messages:43
-#: ../systray/data/messages:33 ../template/data/messages:41
-#: ../terminal/data/messages:41 ../tomboy/data/messages:51
-#: ../weather/data/messages:39 ../weblets/data/messages:41
-#: ../wifi/data/messages:39
+#: ../stacks/data/messages:39 ../systray/data/messages:33
+#: ../template/data/messages:41 ../terminal/data/messages:41
+#: ../tomboy/data/messages:51 ../weather/data/messages:39
+#: ../weblets/data/messages:41 ../wifi/data/messages:39
msgid ""
"for CompizFusion's \"widget layer\", set behaviour in Compiz to: "
"(class=Cairo-dock & type=utility)"
@@ -3562,10 +3599,11 @@
#: ../powermanager/data/messages:41 ../quick-browser/data/messages:45
#: ../shortcuts/data/messages:43 ../showDesktop/data/messages:47
#: ../slider/data/messages:41 ../stack/data/messages:45
-#: ../switcher/data/messages:35 ../systray/data/messages:35
-#: ../template/data/messages:43 ../terminal/data/messages:43
-#: ../tomboy/data/messages:53 ../weather/data/messages:41
-#: ../weblets/data/messages:43 ../wifi/data/messages:41
+#: ../stacks/data/messages:41 ../switcher/data/messages:35
+#: ../systray/data/messages:35 ../template/data/messages:43
+#: ../terminal/data/messages:43 ../tomboy/data/messages:53
+#: ../weather/data/messages:41 ../weblets/data/messages:43
+#: ../wifi/data/messages:41
msgid "Visibility:"
msgstr ""
@@ -3583,10 +3621,11 @@
#: ../powermanager/data/messages:45 ../quick-browser/data/messages:49
#: ../shortcuts/data/messages:47 ../showDesktop/data/messages:51
#: ../slider/data/messages:45 ../stack/data/messages:49
-#: ../switcher/data/messages:39 ../systray/data/messages:39
-#: ../template/data/messages:47 ../terminal/data/messages:47
-#: ../tomboy/data/messages:57 ../weather/data/messages:45
-#: ../weblets/data/messages:47 ../wifi/data/messages:45
+#: ../stacks/data/messages:45 ../switcher/data/messages:39
+#: ../systray/data/messages:39 ../template/data/messages:47
+#: ../terminal/data/messages:47 ../tomboy/data/messages:57
+#: ../weather/data/messages:45 ../weblets/data/messages:47
+#: ../wifi/data/messages:45
msgid "Keep above"
msgstr ""
@@ -3604,10 +3643,11 @@
#: ../powermanager/data/messages:47 ../quick-browser/data/messages:51
#: ../shortcuts/data/messages:49 ../showDesktop/data/messages:53
#: ../slider/data/messages:47 ../stack/data/messages:51
-#: ../switcher/data/messages:41 ../systray/data/messages:41
-#: ../template/data/messages:49 ../terminal/data/messages:49
-#: ../tomboy/data/messages:59 ../weather/data/messages:47
-#: ../weblets/data/messages:49 ../wifi/data/messages:47
+#: ../stacks/data/messages:47 ../switcher/data/messages:41
+#: ../systray/data/messages:41 ../template/data/messages:49
+#: ../terminal/data/messages:49 ../tomboy/data/messages:59
+#: ../weather/data/messages:47 ../weblets/data/messages:49
+#: ../wifi/data/messages:47
msgid "Keep below"
msgstr ""
@@ -3625,10 +3665,11 @@
#: ../powermanager/data/messages:49 ../quick-browser/data/messages:53
#: ../shortcuts/data/messages:51 ../showDesktop/data/messages:55
#: ../slider/data/messages:49 ../stack/data/messages:53
-#: ../switcher/data/messages:43 ../systray/data/messages:43
-#: ../template/data/messages:51 ../terminal/data/messages:51
-#: ../tomboy/data/messages:61 ../weather/data/messages:49
-#: ../weblets/data/messages:51 ../wifi/data/messages:49
+#: ../stacks/data/messages:49 ../switcher/data/messages:43
+#: ../systray/data/messages:43 ../template/data/messages:51
+#: ../terminal/data/messages:51 ../tomboy/data/messages:61
+#: ../weather/data/messages:49 ../weblets/data/messages:51
+#: ../wifi/data/messages:49
msgid "Keep on widget layer"
msgstr ""
@@ -3646,10 +3687,11 @@
#: ../powermanager/data/messages:51 ../quick-browser/data/messages:55
#: ../shortcuts/data/messages:53 ../showDesktop/data/messages:57
#: ../slider/data/messages:51 ../stack/data/messages:55
-#: ../switcher/data/messages:45 ../systray/data/messages:45
-#: ../template/data/messages:53 ../terminal/data/messages:53
-#: ../tomboy/data/messages:63 ../weather/data/messages:51
-#: ../weblets/data/messages:53 ../wifi/data/messages:51
+#: ../stacks/data/messages:51 ../switcher/data/messages:45
+#: ../systray/data/messages:45 ../template/data/messages:53
+#: ../terminal/data/messages:53 ../tomboy/data/messages:63
+#: ../weather/data/messages:51 ../weblets/data/messages:53
+#: ../wifi/data/messages:51
msgid "Reserve space"
msgstr ""
@@ -3667,10 +3709,11 @@
#: ../powermanager/data/messages:53 ../quick-browser/data/messages:57
#: ../shortcuts/data/messages:55 ../showDesktop/data/messages:59
#: ../slider/data/messages:53 ../stack/data/messages:57
-#: ../switcher/data/messages:47 ../systray/data/messages:47
-#: ../template/data/messages:55 ../terminal/data/messages:55
-#: ../tomboy/data/messages:65 ../weather/data/messages:53
-#: ../weblets/data/messages:55 ../wifi/data/messages:53
+#: ../stacks/data/messages:53 ../switcher/data/messages:47
+#: ../systray/data/messages:47 ../template/data/messages:55
+#: ../terminal/data/messages:55 ../tomboy/data/messages:65
+#: ../weather/data/messages:53 ../weblets/data/messages:55
+#: ../wifi/data/messages:53
msgid "Should be visible on all desktops?"
msgstr ""
@@ -3688,10 +3731,11 @@
#: ../powermanager/data/messages:55 ../quick-browser/data/messages:59
#: ../shortcuts/data/messages:57 ../showDesktop/data/messages:61
#: ../slider/data/messages:55 ../stack/data/messages:59
-#: ../switcher/data/messages:49 ../systray/data/messages:49
-#: ../template/data/messages:57 ../terminal/data/messages:57
-#: ../tomboy/data/messages:67 ../weather/data/messages:55
-#: ../weblets/data/messages:57 ../wifi/data/messages:55
+#: ../stacks/data/messages:55 ../switcher/data/messages:49
+#: ../systray/data/messages:49 ../template/data/messages:57
+#: ../terminal/data/messages:57 ../tomboy/data/messages:67
+#: ../weather/data/messages:55 ../weblets/data/messages:57
+#: ../wifi/data/messages:55
msgid "Decorations"
msgstr ""
@@ -3709,10 +3753,11 @@
#: ../powermanager/data/messages:57 ../quick-browser/data/messages:61
#: ../shortcuts/data/messages:59 ../showDesktop/data/messages:63
#: ../slider/data/messages:57 ../stack/data/messages:61
-#: ../switcher/data/messages:51 ../systray/data/messages:51
-#: ../template/data/messages:59 ../terminal/data/messages:59
-#: ../tomboy/data/messages:69 ../weather/data/messages:57
-#: ../weblets/data/messages:59 ../wifi/data/messages:57
+#: ../stacks/data/messages:57 ../switcher/data/messages:51
+#: ../systray/data/messages:51 ../template/data/messages:59
+#: ../terminal/data/messages:59 ../tomboy/data/messages:69
+#: ../weather/data/messages:57 ../weblets/data/messages:59
+#: ../wifi/data/messages:57
msgid "Choose 'Custom decorations' to define your own decorations below."
msgstr ""
@@ -3730,10 +3775,11 @@
#: ../powermanager/data/messages:59 ../quick-browser/data/messages:63
#: ../shortcuts/data/messages:61 ../showDesktop/data/messages:65
#: ../slider/data/messages:59 ../stack/data/messages:63
-#: ../switcher/data/messages:53 ../systray/data/messages:53
-#: ../template/data/messages:61 ../terminal/data/messages:61
-#: ../tomboy/data/messages:71 ../weather/data/messages:59
-#: ../weblets/data/messages:61 ../wifi/data/messages:59
+#: ../stacks/data/messages:59 ../switcher/data/messages:53
+#: ../systray/data/messages:53 ../template/data/messages:61
+#: ../terminal/data/messages:61 ../tomboy/data/messages:71
+#: ../weather/data/messages:59 ../weblets/data/messages:61
+#: ../wifi/data/messages:59
msgid "Choose a decoration theme for this desklet:"
msgstr ""
@@ -3751,10 +3797,11 @@
#: ../powermanager/data/messages:61 ../quick-browser/data/messages:65
#: ../shortcuts/data/messages:63 ../showDesktop/data/messages:67
#: ../slider/data/messages:61 ../stack/data/messages:65
-#: ../switcher/data/messages:55 ../systray/data/messages:55
-#: ../template/data/messages:63 ../terminal/data/messages:63
-#: ../tomboy/data/messages:73 ../weather/data/messages:61
-#: ../weblets/data/messages:63 ../wifi/data/messages:61
+#: ../stacks/data/messages:61 ../switcher/data/messages:55
+#: ../systray/data/messages:55 ../template/data/messages:63
+#: ../terminal/data/messages:63 ../tomboy/data/messages:73
+#: ../weather/data/messages:61 ../weblets/data/messages:63
+#: ../wifi/data/messages:61
msgid ""
"Image to be displayed below drawings, e.g. a frame. Leave empty for no image."
msgstr ""
@@ -3774,11 +3821,11 @@
#: ../netspeed/data/messages:61 ../powermanager/data/messages:63
#: ../quick-browser/data/messages:67 ../shortcuts/data/messages:65
#: ../showDesktop/data/messages:69 ../slider/data/messages:63
-#: ../stack/data/messages:67 ../switcher/data/messages:57
-#: ../systray/data/messages:57 ../template/data/messages:65
-#: ../terminal/data/messages:65 ../tomboy/data/messages:75
-#: ../weather/data/messages:63 ../weblets/data/messages:65
-#: ../wifi/data/messages:63
+#: ../stack/data/messages:67 ../stacks/data/messages:63
+#: ../switcher/data/messages:57 ../systray/data/messages:57
+#: ../template/data/messages:65 ../terminal/data/messages:65
+#: ../tomboy/data/messages:75 ../weather/data/messages:63
+#: ../weblets/data/messages:65 ../wifi/data/messages:63
msgid "Background image:"
msgstr ""
@@ -3796,10 +3843,11 @@
#: ../powermanager/data/messages:65 ../quick-browser/data/messages:69
#: ../shortcuts/data/messages:67 ../showDesktop/data/messages:71
#: ../slider/data/messages:65 ../stack/data/messages:69
-#: ../switcher/data/messages:59 ../systray/data/messages:59
-#: ../template/data/messages:67 ../terminal/data/messages:67
-#: ../tomboy/data/messages:77 ../weather/data/messages:65
-#: ../weblets/data/messages:67 ../wifi/data/messages:65
+#: ../stacks/data/messages:65 ../switcher/data/messages:59
+#: ../systray/data/messages:59 ../template/data/messages:67
+#: ../terminal/data/messages:67 ../tomboy/data/messages:77
+#: ../weather/data/messages:65 ../weblets/data/messages:67
+#: ../wifi/data/messages:65
msgid "Background transparency:"
msgstr ""
@@ -3817,10 +3865,11 @@
#: ../powermanager/data/messages:67 ../quick-browser/data/messages:71
#: ../shortcuts/data/messages:69 ../showDesktop/data/messages:73
#: ../slider/data/messages:67 ../stack/data/messages:71
-#: ../switcher/data/messages:61 ../systray/data/messages:61
-#: ../template/data/messages:69 ../terminal/data/messages:69
-#: ../tomboy/data/messages:79 ../weather/data/messages:67
-#: ../weblets/data/messages:69 ../wifi/data/messages:67
+#: ../stacks/data/messages:67 ../switcher/data/messages:61
+#: ../systray/data/messages:61 ../template/data/messages:69
+#: ../terminal/data/messages:69 ../tomboy/data/messages:79
+#: ../weather/data/messages:67 ../weblets/data/messages:69
+#: ../wifi/data/messages:67
msgid "in pixels. Use this to adjust the left position of drawings."
msgstr ""
@@ -3838,10 +3887,11 @@
#: ../powermanager/data/messages:69 ../quick-browser/data/messages:73
#: ../shortcuts/data/messages:71 ../showDesktop/data/messages:75
#: ../slider/data/messages:69 ../stack/data/messages:73
-#: ../switcher/data/messages:63 ../systray/data/messages:63
-#: ../template/data/messages:71 ../terminal/data/messages:71
-#: ../tomboy/data/messages:81 ../weather/data/messages:69
-#: ../weblets/data/messages:71 ../wifi/data/messages:69
+#: ../stacks/data/messages:69 ../switcher/data/messages:63
+#: ../systray/data/messages:63 ../template/data/messages:71
+#: ../terminal/data/messages:71 ../tomboy/data/messages:81
+#: ../weather/data/messages:69 ../weblets/data/messages:71
+#: ../wifi/data/messages:69
msgid "Left offset:"
msgstr ""
@@ -3859,10 +3909,11 @@
#: ../powermanager/data/messages:71 ../quick-browser/data/messages:75
#: ../shortcuts/data/messages:73 ../showDesktop/data/messages:77
#: ../slider/data/messages:71 ../stack/data/messages:75
-#: ../switcher/data/messages:65 ../systray/data/messages:65
-#: ../template/data/messages:73 ../terminal/data/messages:73
-#: ../tomboy/data/messages:83 ../weather/data/messages:71
-#: ../weblets/data/messages:73 ../wifi/data/messages:71
+#: ../stacks/data/messages:71 ../switcher/data/messages:65
+#: ../systray/data/messages:65 ../template/data/messages:73
+#: ../terminal/data/messages:73 ../tomboy/data/messages:83
+#: ../weather/data/messages:71 ../weblets/data/messages:73
+#: ../wifi/data/messages:71
msgid "in pixels. Use this to adjust the top position of drawings."
msgstr ""
@@ -3880,10 +3931,11 @@
#: ../powermanager/data/messages:73 ../quick-browser/data/messages:77
#: ../shortcuts/data/messages:75 ../showDesktop/data/messages:79
#: ../slider/data/messages:73 ../stack/data/messages:77
-#: ../switcher/data/messages:67 ../systray/data/messages:67
-#: ../template/data/messages:75 ../terminal/data/messages:75
-#: ../tomboy/data/messages:85 ../weather/data/messages:73
-#: ../weblets/data/messages:75 ../wifi/data/messages:73
+#: ../stacks/data/messages:73 ../switcher/data/messages:67
+#: ../systray/data/messages:67 ../template/data/messages:75
+#: ../terminal/data/messages:75 ../tomboy/data/messages:85
+#: ../weather/data/messages:73 ../weblets/data/messages:75
+#: ../wifi/data/messages:73
msgid "Top offset:"
msgstr ""
@@ -3901,10 +3953,11 @@
#: ../powermanager/data/messages:75 ../quick-browser/data/messages:79
#: ../shortcuts/data/messages:77 ../showDesktop/data/messages:81
#: ../slider/data/messages:75 ../stack/data/messages:79
-#: ../switcher/data/messages:69 ../systray/data/messages:69
-#: ../template/data/messages:77 ../terminal/data/messages:77
-#: ../tomboy/data/messages:87 ../weather/data/messages:75
-#: ../weblets/data/messages:77 ../wifi/data/messages:75
+#: ../stacks/data/messages:75 ../switcher/data/messages:69
+#: ../systray/data/messages:69 ../template/data/messages:77
+#: ../terminal/data/messages:77 ../tomboy/data/messages:87
+#: ../weather/data/messages:75 ../weblets/data/messages:77
+#: ../wifi/data/messages:75
msgid "in pixels. Use this to adjust the right position of drawings."
msgstr ""
@@ -3922,10 +3975,11 @@
#: ../powermanager/data/messages:77 ../quick-browser/data/messages:81
#: ../shortcuts/data/messages:79 ../showDesktop/data/messages:83
#: ../slider/data/messages:77 ../stack/data/messages:81
-#: ../switcher/data/messages:71 ../systray/data/messages:71
-#: ../template/data/messages:79 ../terminal/data/messages:79
-#: ../tomboy/data/messages:89 ../weather/data/messages:77
-#: ../weblets/data/messages:79 ../wifi/data/messages:77
+#: ../stacks/data/messages:77 ../switcher/data/messages:71
+#: ../systray/data/messages:71 ../template/data/messages:79
+#: ../terminal/data/messages:79 ../tomboy/data/messages:89
+#: ../weather/data/messages:77 ../weblets/data/messages:79
+#: ../wifi/data/messages:77
msgid "Right offset:"
msgstr ""
@@ -3943,10 +3997,11 @@
#: ../powermanager/data/messages:79 ../quick-browser/data/messages:83
#: ../shortcuts/data/messages:81 ../showDesktop/data/messages:85
#: ../slider/data/messages:79 ../stack/data/messages:83
-#: ../switcher/data/messages:73 ../systray/data/messages:73
-#: ../template/data/messages:81 ../terminal/data/messages:81
-#: ../tomboy/data/messages:91 ../weather/data/messages:79
-#: ../weblets/data/messages:81 ../wifi/data/messages:79
+#: ../stacks/data/messages:79 ../switcher/data/messages:73
+#: ../systray/data/messages:73 ../template/data/messages:81
+#: ../terminal/data/messages:81 ../tomboy/data/messages:91
+#: ../weather/data/messages:79 ../weblets/data/messages:81
+#: ../wifi/data/messages:79
msgid "in pixels. Use this to adjust the bottom position of drawings."
msgstr ""
@@ -3964,10 +4019,11 @@
#: ../powermanager/data/messages:81 ../quick-browser/data/messages:85
#: ../shortcuts/data/messages:83 ../showDesktop/data/messages:87
#: ../slider/data/messages:81 ../stack/data/messages:85
-#: ../switcher/data/messages:75 ../systray/data/messages:75
-#: ../template/data/messages:83 ../terminal/data/messages:83
-#: ../tomboy/data/messages:93 ../weather/data/messages:81
-#: ../weblets/data/messages:83 ../wifi/data/messages:81
+#: ../stacks/data/messages:81 ../switcher/data/messages:75
+#: ../systray/data/messages:75 ../template/data/messages:83
+#: ../terminal/data/messages:83 ../tomboy/data/messages:93
+#: ../weather/data/messages:81 ../weblets/data/messages:83
+#: ../wifi/data/messages:81
msgid "Bottom offset:"
msgstr ""
@@ -3985,10 +4041,11 @@
#: ../powermanager/data/messages:83 ../quick-browser/data/messages:87
#: ../shortcuts/data/messages:85 ../showDesktop/data/messages:89
#: ../slider/data/messages:83 ../stack/data/messages:87
-#: ../switcher/data/messages:77 ../systray/data/messages:77
-#: ../template/data/messages:85 ../terminal/data/messages:85
-#: ../tomboy/data/messages:95 ../weather/data/messages:83
-#: ../weblets/data/messages:85 ../wifi/data/messages:83
+#: ../stacks/data/messages:83 ../switcher/data/messages:77
+#: ../systray/data/messages:77 ../template/data/messages:85
+#: ../terminal/data/messages:85 ../tomboy/data/messages:95
+#: ../weather/data/messages:83 ../weblets/data/messages:85
+#: ../wifi/data/messages:83
msgid ""
"Image to be displayed above the drawings, e.g. a reflection. Leave empty for "
"no image."
@@ -4008,10 +4065,11 @@
#: ../powermanager/data/messages:85 ../quick-browser/data/messages:89
#: ../shortcuts/data/messages:87 ../showDesktop/data/messages:91
#: ../slider/data/messages:85 ../stack/data/messages:89
-#: ../switcher/data/messages:79 ../systray/data/messages:79
-#: ../template/data/messages:87 ../terminal/data/messages:87
-#: ../tomboy/data/messages:97 ../weather/data/messages:85
-#: ../weblets/data/messages:87 ../wifi/data/messages:85
+#: ../stacks/data/messages:85 ../switcher/data/messages:79
+#: ../systray/data/messages:79 ../template/data/messages:87
+#: ../terminal/data/messages:87 ../tomboy/data/messages:97
+#: ../weather/data/messages:85 ../weblets/data/messages:87
+#: ../wifi/data/messages:85
msgid "Foreground image:"
msgstr ""
@@ -4029,10 +4087,11 @@
#: ../powermanager/data/messages:87 ../quick-browser/data/messages:91
#: ../shortcuts/data/messages:89 ../showDesktop/data/messages:93
#: ../slider/data/messages:87 ../stack/data/messages:91
-#: ../switcher/data/messages:81 ../systray/data/messages:81
-#: ../template/data/messages:89 ../terminal/data/messages:89
-#: ../tomboy/data/messages:99 ../weather/data/messages:87
-#: ../weblets/data/messages:89 ../wifi/data/messages:87
+#: ../stacks/data/messages:87 ../switcher/data/messages:81
+#: ../systray/data/messages:81 ../template/data/messages:89
+#: ../terminal/data/messages:89 ../tomboy/data/messages:99
+#: ../weather/data/messages:87 ../weblets/data/messages:89
+#: ../wifi/data/messages:87
msgid "Foreground tansparency:"
msgstr ""
@@ -4290,23 +4349,23 @@
msgid "Let empty to use the name of the folder."
msgstr ""
-#: ../Folders/data/messages:11
+#: ../Folders/data/messages:13
msgid "How to render the icon :"
msgstr ""
-#: ../Folders/data/messages:13
+#: ../Folders/data/messages:15
msgid "Use an image"
msgstr ""
-#: ../Folders/data/messages:15
+#: ../Folders/data/messages:17
msgid "Draw sub-dock's content as emblems"
msgstr ""
-#: ../Folders/data/messages:17
+#: ../Folders/data/messages:19
msgid "Draw sub-dock's content as stack"
msgstr ""
-#: ../Folders/data/messages:19
+#: ../Folders/data/messages:21
msgid "Draw sub-dock's content inside a box"
msgstr ""
@@ -4620,9 +4679,9 @@
#: ../compiz-icon/data/messages:173 ../compiz-icon/data/messages:177
#: ../compiz-icon/data/messages:181 ../compiz-icon/data/messages:185
#: ../compiz-icon/data/messages:189 ../compiz-icon/data/messages:193
-#: ../musicPlayer/data/messages:171 ../musicPlayer/data/messages:175
-#: ../musicPlayer/data/messages:179 ../musicPlayer/data/messages:183
-#: ../musicPlayer/data/messages:187 ../tomboy/data/messages:13
+#: ../musicPlayer/data/messages:173 ../musicPlayer/data/messages:177
+#: ../musicPlayer/data/messages:181 ../musicPlayer/data/messages:185
+#: ../musicPlayer/data/messages:189 ../tomboy/data/messages:13
#: ../tomboy/data/messages:17 ../tomboy/data/messages:21
#: ../tomboy/data/messages:105 ../wifi/data/messages:139
#: ../wifi/data/messages:143 ../wifi/data/messages:147
@@ -5266,7 +5325,7 @@
msgstr ""
#: ../alsaMixer/data/messages:115 ../keyboard-indicator/data/messages:97
-#: ../musicPlayer/data/messages:143 ../shortcuts/data/messages:93
+#: ../musicPlayer/data/messages:145 ../shortcuts/data/messages:93
#: ../shortcuts/data/messages:103 ../slider/data/messages:145
#: ../stack/data/messages:95 ../tomboy/data/messages:103
#: ../weather/data/messages:119
@@ -5563,8 +5622,8 @@
#: ../compiz-icon/data/messages:159 ../mail/data/messages:91
#: ../shortcuts/data/messages:105 ../stack/data/messages:97
-#: ../switcher/data/messages:145 ../tomboy/data/messages:119
-#: ../weather/data/messages:123
+#: ../stacks/data/messages:115 ../switcher/data/messages:145
+#: ../tomboy/data/messages:119 ../weather/data/messages:123
msgid "Leave empty to use default sub-dock view."
msgstr ""
@@ -5579,12 +5638,12 @@
msgid "Images"
msgstr ""
-#: ../compiz-icon/data/messages:167 ../musicPlayer/data/messages:173
+#: ../compiz-icon/data/messages:167 ../musicPlayer/data/messages:175
#: ../tomboy/data/messages:15
msgid "'Default' icon image name:"
msgstr ""
-#: ../compiz-icon/data/messages:171 ../musicPlayer/data/messages:189
+#: ../compiz-icon/data/messages:171 ../musicPlayer/data/messages:191
#: ../tomboy/data/messages:23
msgid "'Broken' icon image name:"
msgstr ""
@@ -6433,132 +6492,136 @@
msgstr ""
#: ../musicPlayer/data/messages:107
+msgid "GMusicBrowser"
+msgstr ""
+
+#: ../musicPlayer/data/messages:109
msgid "Guayadeque"
msgstr ""
-#: ../musicPlayer/data/messages:109
+#: ../musicPlayer/data/messages:111
msgid "Listen"
msgstr ""
-#: ../musicPlayer/data/messages:111
+#: ../musicPlayer/data/messages:113
msgid "Qmmp"
msgstr ""
-#: ../musicPlayer/data/messages:113
+#: ../musicPlayer/data/messages:115
msgid "QuodLibet"
msgstr ""
-#: ../musicPlayer/data/messages:115
+#: ../musicPlayer/data/messages:117
msgid "Rhythmbox"
msgstr ""
-#: ../musicPlayer/data/messages:117
+#: ../musicPlayer/data/messages:119
msgid "Songbird"
msgstr ""
-#: ../musicPlayer/data/messages:119
+#: ../musicPlayer/data/messages:121
msgid "XMMS 2"
msgstr ""
-#: ../musicPlayer/data/messages:121
+#: ../musicPlayer/data/messages:123
msgid "XMMS"
msgstr ""
-#: ../musicPlayer/data/messages:123
+#: ../musicPlayer/data/messages:125
msgid ""
"This will prevent the player icon appearing in the taskbar. The applet's "
"icon will then behave as a launcher, an application and an applet."
msgstr ""
-#: ../musicPlayer/data/messages:125
+#: ../musicPlayer/data/messages:127
msgid "Steal the player's icon from the taskbar?"
msgstr ""
-#: ../musicPlayer/data/messages:127
+#: ../musicPlayer/data/messages:129
msgid "Actions on click and middle-click :"
msgstr ""
-#: ../musicPlayer/data/messages:129
+#: ../musicPlayer/data/messages:131
msgid "Play/Pause on click, Next on middle-click"
msgstr ""
-#: ../musicPlayer/data/messages:131
+#: ../musicPlayer/data/messages:133
msgid "Show/Hide player on click, Play/Pause on middle-click"
msgstr ""
-#: ../musicPlayer/data/messages:133
+#: ../musicPlayer/data/messages:135
msgid "Action on music change"
msgstr ""
-#: ../musicPlayer/data/messages:135
+#: ../musicPlayer/data/messages:137
msgid "Show tooltips?"
msgstr ""
-#: ../musicPlayer/data/messages:139
+#: ../musicPlayer/data/messages:141
msgid "Time length of tooltips:"
msgstr ""
-#: ../musicPlayer/data/messages:141
+#: ../musicPlayer/data/messages:143
msgid "Animation when music changes:"
msgstr ""
-#: ../musicPlayer/data/messages:145 ../wifi/data/messages:179
+#: ../musicPlayer/data/messages:147 ../wifi/data/messages:179
msgid "Information to display on the icon :"
msgstr ""
-#: ../musicPlayer/data/messages:147
+#: ../musicPlayer/data/messages:149
msgid "Nothing"
msgstr ""
-#: ../musicPlayer/data/messages:149
+#: ../musicPlayer/data/messages:151
msgid "Time Elapsed"
msgstr ""
-#: ../musicPlayer/data/messages:151
+#: ../musicPlayer/data/messages:153
msgid "Time Remaining"
msgstr ""
-#: ../musicPlayer/data/messages:153
+#: ../musicPlayer/data/messages:155
msgid "Track number"
msgstr ""
-#: ../musicPlayer/data/messages:155
+#: ../musicPlayer/data/messages:157
msgid "Display album's cover?"
msgstr ""
-#: ../musicPlayer/data/messages:157
+#: ../musicPlayer/data/messages:159
msgid "You need to be connected to the Internet."
msgstr ""
-#: ../musicPlayer/data/messages:159
+#: ../musicPlayer/data/messages:161
msgid "Allow Cairo-Dock to download missing covers?"
msgstr ""
-#: ../musicPlayer/data/messages:161 ../musicPlayer/data/messages:165
+#: ../musicPlayer/data/messages:163 ../musicPlayer/data/messages:167
msgid "requires OpenGL."
msgstr ""
-#: ../musicPlayer/data/messages:163
+#: ../musicPlayer/data/messages:165
msgid "Use 3D themes?"
msgstr ""
-#: ../musicPlayer/data/messages:167
+#: ../musicPlayer/data/messages:169
msgid "List of available 3D themes for covers :"
msgstr ""
-#: ../musicPlayer/data/messages:169 ../tomboy/data/messages:11
+#: ../musicPlayer/data/messages:171 ../tomboy/data/messages:11
msgid "Customisation"
msgstr ""
-#: ../musicPlayer/data/messages:177
+#: ../musicPlayer/data/messages:179
msgid "Name of the image for the 'play' icon :"
msgstr ""
-#: ../musicPlayer/data/messages:181
+#: ../musicPlayer/data/messages:183
msgid "Name of the image for the 'stop' icon :"
msgstr ""
-#: ../musicPlayer/data/messages:185
+#: ../musicPlayer/data/messages:187
msgid "Name of the image for the 'pause' icon :"
msgstr ""
@@ -7003,13 +7066,13 @@
msgid "Options"
msgstr ""
-#: ../stack/data/messages:117
+#: ../stack/data/messages:117 ../stacks/data/messages:107
msgid ""
"These options allow you to prevent some files from displaying in stacks "
"based on their type (video, image, etc.)"
msgstr ""
-#: ../stack/data/messages:119
+#: ../stack/data/messages:119 ../stacks/data/messages:109
msgid "Filter files on MIME type?"
msgstr ""
@@ -7017,7 +7080,7 @@
msgid "E.g. image, text, video, audio, application..."
msgstr ""
-#: ../stack/data/messages:123
+#: ../stack/data/messages:123 ../stacks/data/messages:113
msgid "Here you can specify a list of MIME types to ignore:"
msgstr ""
@@ -7043,6 +7106,51 @@
msgid "When copying/pasting/cutting, use the selection clipboard?"
msgstr ""
+#: ../stacks/data/messages:91
+msgid "Directory & Options"
+msgstr ""
+
+#: ../stacks/data/messages:93
+msgid ""
+"Stacks will act as a the shortcut applet's but with files. To add a file, "
+"just drag and drop it on the Stacks icon"
+msgstr ""
+
+#: ../stacks/data/messages:95
+msgid "Use only Stacks local directory ?"
+msgstr ""
+
+#: ../stacks/data/messages:97
+msgid ""
+"You can use '_LocalDirectory_' tag to have both stack local and all "
+"monitored directories. Ensure 'Use only Stacks local directory' is unticked."
+msgstr ""
+
+#: ../stacks/data/messages:99
+msgid "Monitored Directories :"
+msgstr ""
+
+#: ../stacks/data/messages:101
+msgid ""
+"This option with large files lists can slow down the dock, use it properly."
+msgstr ""
+
+#: ../stacks/data/messages:103
+msgid "List hidden files ?"
+msgstr ""
+
+#: ../stacks/data/messages:105
+msgid "Separate different directories with separators ?"
+msgstr ""
+
+#: ../stacks/data/messages:111
+msgid "Eg: image, text, video, audio, application..."
+msgstr ""
+
+#: ../stacks/data/messages:117
+msgid "Name of the view used for the sub-dock :"
+msgstr ""
+
#: ../switcher/data/messages:87
msgid ""
"All desktops will be drawn on the main icon. Otherwise a sub-dock will "
=== modified file 'po/cairo-dock.pot'
--- po/cairo-dock.pot 2010-09-07 00:39:20 +0000
+++ po/cairo-dock.pot 2010-09-22 10:43:43 +0000
@@ -130,29 +130,25 @@
msgid "For Aiur!"
msgstr ""
-#: ../Cairo-Penguin/src/applet-notifications.c:123
-msgid "Hey, you there!"
-msgstr ""
-
-#: ../Cairo-Penguin/src/applet-notifications.c:127
+#: ../Cairo-Penguin/src/applet-notifications.c:126
msgid "Wake up"
msgstr ""
-#: ../Cairo-Penguin/src/applet-notifications.c:131
+#: ../Cairo-Penguin/src/applet-notifications.c:130
msgid "Keep quiet"
msgstr ""
+#: ../Cairo-Penguin/src/applet-notifications.c:133
+#: ../Scooby-Do/data/messages:99
+msgid "Start XPenguins"
+msgstr ""
+
#: ../Cairo-Penguin/src/applet-notifications.c:134
-#: ../Scooby-Do/data/messages:101
-msgid "Start XPenguins"
-msgstr ""
-
-#: ../Cairo-Penguin/src/applet-notifications.c:135
msgid "Stop XPenguins"
msgstr ""
-#: ../Cairo-Penguin/src/applet-notifications.c:158
-#: ../Cairo-Penguin/src/applet-notifications.c:160
+#: ../Cairo-Penguin/src/applet-notifications.c:157
+#: ../Cairo-Penguin/src/applet-notifications.c:159
msgid "Zzzzz"
msgstr ""
@@ -173,7 +169,7 @@
msgid "Clipboard history"
msgstr ""
-#: ../Clipper/src/applet-notifications.c:99
+#: ../Clipper/src/applet-notifications.c:101
msgid ""
"No persistent items.\n"
"You can add some by drag and dropping some text on the icon."
@@ -289,32 +285,36 @@
"and that the new name does not already exist."
msgstr ""
-#: ../Folders/src/applet-notifications.c:319
-msgid "Open with"
-msgstr ""
-
-#: ../Folders/src/applet-notifications.c:352
+#: ../Folders/src/applet-notifications.c:322
+msgid "Open the folder (middle-click)"
+msgstr ""
+
+#: ../Folders/src/applet-notifications.c:328
+msgid "Rename this file"
+msgstr ""
+
+#: ../Folders/src/applet-notifications.c:329
msgid "Delete this file"
msgstr ""
-#: ../Folders/src/applet-notifications.c:354
-msgid "Rename this file"
-msgstr ""
-
-#: ../Folders/src/applet-notifications.c:356
+#: ../Folders/src/applet-notifications.c:330
msgid "Move this file"
msgstr ""
-#: ../Folders/src/applet-notifications.c:358
+#: ../Folders/src/applet-notifications.c:336
+msgid "Open with"
+msgstr ""
+
+#: ../Folders/src/applet-notifications.c:370
msgid "Properties"
msgstr ""
-#: ../Folders/src/applet-notifications.c:360
+#: ../Folders/src/applet-notifications.c:373
msgid "Create a new file"
msgstr ""
-#: ../Folders/src/applet-notifications.c:364
-msgid "Open the folder (middle-click)"
+#: ../Folders/src/applet-notifications.c:374
+msgid "Create a new folder"
msgstr ""
#: ../GMenu/src/applet-init.c:33
@@ -329,15 +329,15 @@
msgid "Applications Menu"
msgstr ""
-#: ../GMenu/src/applet-notifications.c:147
-msgid "Quick launch"
+#: ../GMenu/src/applet-notifications.c:75
+msgid "Quick launch (Middle-click)"
msgstr ""
-#: ../GMenu/src/applet-notifications.c:148
+#: ../GMenu/src/applet-notifications.c:77
msgid "Configure menu"
msgstr ""
-#: ../GMenu/src/applet-notifications.c:149
+#: ../GMenu/src/applet-notifications.c:80
msgid "Clear recent"
msgstr ""
@@ -349,7 +349,7 @@
msgid "Clear the list of the recently used documents?"
msgstr ""
-#: ../GMenu/src/applet-run-dialog.c:349 ../Scooby-Do/data/messages:113
+#: ../GMenu/src/applet-run-dialog.c:349 ../Scooby-Do/data/messages:111
msgid "Enter a command to launch:"
msgstr ""
@@ -531,12 +531,12 @@
msgstr ""
#: ../Network-Monitor/src/applet-notifications.c:100
-#: ../wifi/src/applet-notifications.c:75
+#: ../wifi/src/applet-notifications.c:76
msgid "Check for Wireless Extension"
msgstr ""
#: ../Network-Monitor/src/applet-notifications.c:101
-#: ../wifi/src/applet-notifications.c:76
+#: ../wifi/src/applet-notifications.c:77
msgid "Network Administration"
msgstr ""
@@ -690,16 +690,16 @@
msgstr ""
#: ../Scooby-Do/src/applet-backend-firefox.c:433
-#: ../dnd2share/src/applet-notifications.c:461
+#: ../dnd2share/src/applet-notifications.c:470
msgid "Open file"
msgstr ""
#: ../Scooby-Do/src/applet-backend-firefox.c:496
-#: ../Scooby-Do/data/messages:105
+#: ../Scooby-Do/data/messages:103
msgid "Firefox bookmarks"
msgstr ""
-#: ../Scooby-Do/src/applet-backend-recent.c:212 ../Scooby-Do/data/messages:107
+#: ../Scooby-Do/src/applet-backend-recent.c:212 ../Scooby-Do/data/messages:105
msgid "Recent files"
msgstr ""
@@ -727,27 +727,6 @@
msgid "Amazon"
msgstr ""
-#: ../Scooby-Do/src/applet-init.c:39
-msgid ""
-"This plug-in allows you to make different actions directly from the keyboard.\n"
-"It has 2 modes, each one being triggered by a keyboard shortcut:\n"
-"\n"
-"- the finder mode (default shortcut : CTRL + Enter) :\n"
-" It lets you find and launch applications, files, recent files, firefox bookmarks, commands, and even calculations.\n"
-" Type what you want to search, the results will be displayed in real time.\n"
-" The first results of each category are displayed in the main listing.\n"
-" Use the up/down arrows to navigate inside the list,\n"
-" and use the left/right arrows to enter into a category, or to display more actions (when a little arrow is drawn next to text).\n"
-" Once inside a category, you can filter the results by typing some letters.\n"
-" Press Enter to validate, maintain SHIFT or ALT to keep the list of results opened.\n"
-"\n"
-"- the navigation mode (default shortcut : CTRL + F9) :\n"
-" use the arrows to navigate into the docks and sub-docks,\n"
-" or type the name of a launcher and press Tab to automatically jump to the next suitable launcher\n"
-" press Enter to click on the icon, Shift+Enter for Shift+click, Alt+Enter for middle click, and Ctrl+Enter for left click\n"
-"Escape or the same shortkey will cancel."
-msgstr ""
-
#: ../Scooby-Do/src/applet-listing.c:510
msgid "(F1) Match case"
msgstr ""
@@ -794,22 +773,17 @@
msgid "Searching ..."
msgstr ""
-#: ../Scooby-Do/src/applet-session.c:50
+#: ../Scooby-Do/src/applet-session.c:62
msgid "Enter your search"
msgstr ""
-#: ../Status-Notifier/src/applet-init.c:31
+#: ../Status-Notifier/src/applet-init.c:32
msgid "Status Notifier"
msgstr ""
-#: ../Status-Notifier/src/applet-init.c:34
-msgid ""
-"A <b>notification area</b> for your dock\n"
-"Also called 'systray'.\n"
-"It is designed to work on any desktop that supports the latest systray specifications (KDE, Gnome, etc)"
-msgstr ""
-
#: ../System-Monitor/src/applet-init.c:30
+#: ../System-Monitor/src/applet-notifications.c:116
+#: ../netspeed/src/applet-notifications.c:72
msgid "System Monitor"
msgstr ""
@@ -884,12 +858,8 @@
msgid "Buffers"
msgstr ""
-#: ../System-Monitor/src/applet-notifications.c:115
-#: ../netspeed/src/applet-notifications.c:70
-msgid "Monitor System"
-msgstr ""
-
#: ../System-Monitor/src/applet-nvidia.c:141
+#: ../System-Monitor/src/applet-sensors.c:161
#, c-format
msgid "Alert! Graphic Card core temperature has reached %d°C"
msgstr ""
@@ -919,7 +889,7 @@
msgid "Set up gamma:"
msgstr ""
-#: ../Xgamma/src/applet-notifications.c:61
+#: ../Xgamma/src/applet-notifications.c:62
msgid "Apply current luminosity on startup"
msgstr ""
@@ -967,155 +937,122 @@
msgid "Set up volume:"
msgstr ""
-#: ../alsaMixer/src/applet-notifications.c:57
+#: ../alsaMixer/src/applet-notifications.c:58
msgid "Adjust channels"
msgstr ""
#: ../alsaMixer/src/applet-notifications.c:59
-msgid "Unmute"
-msgstr ""
-
-#: ../alsaMixer/src/applet-notifications.c:61
-msgid "Mute"
-msgstr ""
-
-#: ../clock/src/applet-calendar.c:190 ../clock/src/applet-calendar.c:271
-#: ../clock/src/applet-calendar.c:437 ../clock/src/applet-calendar.c:442
-#: ../clock/src/applet-draw.c:83 ../clock/src/applet-draw.c:339
-#: ../clock/src/applet-draw.c:353 ../clock/src/applet-draw.c:374
-#: ../clock/src/applet-task-editor.c:119
+msgid "Unmute (middle-click)"
+msgstr ""
+
+#: ../alsaMixer/src/applet-notifications.c:59
+msgid "Mute (middle-click)"
+msgstr ""
+
+#: ../clock/src/applet-calendar.c:193 ../clock/src/applet-calendar.c:274
+#: ../clock/src/applet-calendar.c:519 ../clock/src/applet-calendar.c:524
+#: ../clock/src/applet-task-editor.c:119 ../clock/src/applet-timer.c:84
+#: ../clock/src/applet-timer.c:172 ../clock/src/applet-timer.c:454
+#: ../clock/src/applet-timer.c:471 ../clock/src/applet-timer.c:491
msgid "No title"
msgstr ""
-#: ../clock/src/applet-calendar.c:438
+#: ../clock/src/applet-calendar.c:520
msgid "years"
msgstr ""
-#: ../clock/src/applet-calendar.c:555
+#: ../clock/src/applet-calendar.c:637
msgid "Calendar and tasks"
msgstr ""
-#: ../clock/src/applet-config.c:35 ../clock/data/messages:157
+#: ../clock/src/applet-config.c:36 ../clock/data/messages:165
msgid "Alarm"
msgstr ""
-#: ../clock/src/applet-config.c:35
+#: ../clock/src/applet-config.c:36
msgid "Time you want to be notified:"
msgstr ""
-#: ../clock/src/applet-config.c:35
+#: ../clock/src/applet-config.c:36
msgid "In the form xx:xx. E.g.: 20:35 for 8:35pm"
msgstr ""
-#: ../clock/src/applet-config.c:35
+#: ../clock/src/applet-config.c:36
msgid "Never"
msgstr ""
-#: ../clock/src/applet-config.c:35
+#: ../clock/src/applet-config.c:36
msgid "Day"
msgstr ""
-#: ../clock/src/applet-config.c:35 ../weather/src/applet-load-icons.c:26
+#: ../clock/src/applet-config.c:36 ../weather/src/applet-load-icons.c:26
msgid "Monday"
msgstr ""
-#: ../clock/src/applet-config.c:35 ../weather/src/applet-load-icons.c:26
+#: ../clock/src/applet-config.c:36 ../weather/src/applet-load-icons.c:26
msgid "Tuesday"
msgstr ""
-#: ../clock/src/applet-config.c:35 ../weather/src/applet-load-icons.c:26
+#: ../clock/src/applet-config.c:36 ../weather/src/applet-load-icons.c:26
msgid "Wednesday"
msgstr ""
-#: ../clock/src/applet-config.c:35 ../weather/src/applet-load-icons.c:26
+#: ../clock/src/applet-config.c:36 ../weather/src/applet-load-icons.c:26
msgid "Thursday"
msgstr ""
-#: ../clock/src/applet-config.c:35 ../weather/src/applet-load-icons.c:26
+#: ../clock/src/applet-config.c:36 ../weather/src/applet-load-icons.c:26
msgid "Friday"
msgstr ""
-#: ../clock/src/applet-config.c:35 ../weather/src/applet-load-icons.c:26
+#: ../clock/src/applet-config.c:36 ../weather/src/applet-load-icons.c:26
msgid "Saturday"
msgstr ""
-#: ../clock/src/applet-config.c:35 ../weather/src/applet-load-icons.c:26
+#: ../clock/src/applet-config.c:36 ../weather/src/applet-load-icons.c:26
msgid "Sunday"
msgstr ""
-#: ../clock/src/applet-config.c:35
+#: ../clock/src/applet-config.c:36
msgid "Week Day"
msgstr ""
-#: ../clock/src/applet-config.c:35
+#: ../clock/src/applet-config.c:36
msgid "Week End"
msgstr ""
-#: ../clock/src/applet-config.c:35
+#: ../clock/src/applet-config.c:36
msgid "Month"
msgstr ""
-#: ../clock/src/applet-config.c:35
+#: ../clock/src/applet-config.c:36
msgid "Repeat every:"
msgstr ""
-#: ../clock/src/applet-config.c:35
+#: ../clock/src/applet-config.c:36
msgid "If every month, which day of the month?"
msgstr ""
-#: ../clock/src/applet-config.c:35
+#: ../clock/src/applet-config.c:36
msgid "Message you want to use to be notified:"
msgstr ""
-#: ../clock/src/applet-config.c:35
+#: ../clock/src/applet-config.c:36
msgid "Tea Time!"
msgstr ""
-#: ../clock/src/applet-config.c:35
+#: ../clock/src/applet-config.c:36
msgid "Command to launch:"
msgstr ""
-#: ../clock/src/applet-config.c:35
+#: ../clock/src/applet-config.c:36
msgid "E.g.:"
msgstr ""
-#: ../clock/src/applet-config.c:492 ../weather/src/applet-config.c:180
+#: ../clock/src/applet-config.c:495 ../weather/src/applet-config.c:180
msgid "Search for your location :"
msgstr ""
-#: ../clock/src/applet-draw.c:54
-msgid "1mn"
-msgstr ""
-
-#: ../clock/src/applet-draw.c:59
-msgid "1h"
-msgstr ""
-
-#: ../clock/src/applet-draw.c:82
-msgid "The following task was scheduled at"
-msgstr ""
-
-#: ../clock/src/applet-draw.c:85 ../clock/src/applet-draw.c:355
-#: ../clock/src/applet-draw.c:376
-msgid "Repeat this message every:"
-msgstr ""
-
-#: ../clock/src/applet-draw.c:338
-msgid "This task will begin in 15 minutes:"
-msgstr ""
-
-#: ../clock/src/applet-draw.c:352
-msgid "It's time for the following task:"
-msgstr ""
-
-#: ../clock/src/applet-draw.c:373
-msgid "Today is the following anniversary:"
-msgstr ""
-
-#: ../clock/src/applet-draw.c:373
-msgid "Tomorrow is the following anniversary:"
-msgstr ""
-
#: ../clock/src/applet-init.c:35
msgid "clock"
msgstr ""
@@ -1145,18 +1082,18 @@
"You can add tasks by clicking on the applet to open the calendar, and then double-clicking on a day."
msgstr ""
-#: ../clock/src/applet-notifications.c:90
-msgid "Set up time and date"
-msgstr ""
-
-#: ../clock/src/applet-notifications.c:91
+#: ../clock/src/applet-notifications.c:92
msgid "Show today's tasks"
msgstr ""
-#: ../clock/src/applet-notifications.c:92
+#: ../clock/src/applet-notifications.c:93
msgid "Show this week's tasks"
msgstr ""
+#: ../clock/src/applet-notifications.c:96
+msgid "Set up time and date"
+msgstr ""
+
#: ../clock/src/applet-task-editor.c:156
msgid "Add a new task"
msgstr ""
@@ -1212,6 +1149,43 @@
msgid "Tags"
msgstr ""
+#: ../clock/src/applet-timer.c:55
+msgid "1mn"
+msgstr ""
+
+#: ../clock/src/applet-timer.c:60
+msgid "1h"
+msgstr ""
+
+#: ../clock/src/applet-timer.c:83
+msgid "The following task was scheduled at"
+msgstr ""
+
+#: ../clock/src/applet-timer.c:86 ../clock/src/applet-timer.c:456
+#: ../clock/src/applet-timer.c:493
+msgid "Repeat this message every:"
+msgstr ""
+
+#: ../clock/src/applet-timer.c:170
+msgid "The following task has felt due:"
+msgstr ""
+
+#: ../clock/src/applet-timer.c:453
+msgid "It's time for the following task:"
+msgstr ""
+
+#: ../clock/src/applet-timer.c:470
+msgid "This task will begin in 15 minutes:"
+msgstr ""
+
+#: ../clock/src/applet-timer.c:490
+msgid "Today is the following anniversary:"
+msgstr ""
+
+#: ../clock/src/applet-timer.c:490
+msgid "Tomorrow is the following anniversary:"
+msgstr ""
+
#: ../compiz-icon/src/applet-init.c:31
msgid "compiz-icon"
msgstr ""
@@ -1229,7 +1203,7 @@
msgstr ""
#: ../compiz-icon/src/applet-load-icon.c:31
-#: ../compiz-icon/src/applet-notifications.c:178
+#: ../compiz-icon/src/applet-notifications.c:180
msgid "Emerald Manager"
msgstr ""
@@ -1251,27 +1225,27 @@
" through your package manager (Synaptic, YasT, etc)"
msgstr ""
-#: ../compiz-icon/src/applet-notifications.c:179
+#: ../compiz-icon/src/applet-notifications.c:181
msgid "Reload Emerald"
msgstr ""
-#: ../compiz-icon/src/applet-notifications.c:183
+#: ../compiz-icon/src/applet-notifications.c:184
msgid "Switch Windows Manager"
msgstr ""
-#: ../compiz-icon/src/applet-notifications.c:184
+#: ../compiz-icon/src/applet-notifications.c:185
msgid "Switch Windows Decorator"
msgstr ""
-#: ../compiz-icon/src/applet-notifications.c:193
+#: ../compiz-icon/src/applet-notifications.c:194
msgid "Toggle Exposition Mode"
msgstr ""
-#: ../compiz-icon/src/applet-notifications.c:194
+#: ../compiz-icon/src/applet-notifications.c:195
msgid "Toggle Widget Layer"
msgstr ""
-#: ../compiz-icon/src/applet-notifications.c:196
+#: ../compiz-icon/src/applet-notifications.c:198
msgid "Toggle Show Desktop"
msgstr ""
@@ -1438,17 +1412,21 @@
msgstr ""
#: ../dnd2share/src/applet-notifications.c:398
-msgid "Clear History"
+msgid "History"
msgstr ""
-#: ../dnd2share/src/applet-notifications.c:463
+#: ../dnd2share/src/applet-notifications.c:472
msgid "Get text"
msgstr ""
-#: ../dnd2share/src/applet-notifications.c:465
+#: ../dnd2share/src/applet-notifications.c:474
msgid "Remove from history"
msgstr ""
+#: ../dnd2share/src/applet-notifications.c:477
+msgid "Clear History"
+msgstr ""
+
#: ../dock-rendering/src/rendering-init.c:34
msgid "Caroussel"
msgstr ""
@@ -1549,29 +1527,29 @@
msgid "Counting total size and files number..."
msgstr ""
-#: ../dustbin/src/applet-notifications.c:136
+#: ../dustbin/src/applet-notifications.c:117
msgid "Show Trash (click)"
msgstr ""
-#: ../dustbin/src/applet-notifications.c:137
+#: ../dustbin/src/applet-notifications.c:118
msgid "Empty Trash (middle-click)"
msgstr ""
-#: ../dustbin/src/applet-notifications.c:139
+#: ../dustbin/src/applet-notifications.c:120
msgid "Display dustbins information"
msgstr ""
-#: ../dustbin/src/applet-notifications.c:151
+#: ../dustbin/src/applet-notifications.c:133
#, c-format
msgid "%s successfully unmounted"
msgstr ""
-#: ../dustbin/src/applet-notifications.c:155
+#: ../dustbin/src/applet-notifications.c:137
#, c-format
msgid "failed to unmount %s"
msgstr ""
-#: ../dustbin/src/applet-notifications.c:179
+#: ../dustbin/src/applet-notifications.c:161
#: ../shortcuts/src/applet-notifications.c:167
msgid "Unmouting this volume ..."
msgstr ""
@@ -1673,11 +1651,11 @@
" (you can invert the buttons if you prefer to shutdown on left-click)."
msgstr ""
-#: ../logout/src/applet-notifications.c:101
+#: ../logout/src/applet-notifications.c:100
msgid "Choose in how many minutes your PC will stop:"
msgstr ""
-#: ../logout/src/applet-notifications.c:126
+#: ../logout/src/applet-notifications.c:125
msgid "Lock screen"
msgstr ""
@@ -1685,7 +1663,7 @@
msgid "Program an automatic shut-down"
msgstr ""
-#: ../logout/src/applet-notifications.c:158
+#: ../logout/src/applet-notifications.c:159
msgid "Your computer will shut-down in 1 minute."
msgstr ""
@@ -1829,20 +1807,29 @@
"you can change it in the configuration panel of this module"
msgstr ""
-#: ../mail/src/cd-mail-applet-notifications.c:139
+#: ../mail/src/cd-mail-applet-notifications.c:147
msgid "Refresh a mail account"
msgstr ""
-#: ../mail/src/cd-mail-applet-notifications.c:148
+#: ../mail/src/cd-mail-applet-notifications.c:154
+msgid "Refresh all (Middle-click)"
+msgstr ""
+
+#: ../mail/src/cd-mail-applet-notifications.c:159
+#, c-format
+msgid "Refresh %s"
+msgstr ""
+
+#: ../mail/src/cd-mail-applet-notifications.c:165
msgid "Mark all emails as read"
msgstr ""
-#: ../mail/src/cd-mail-applet-notifications.c:151
+#: ../mail/src/cd-mail-applet-notifications.c:168
#, c-format
msgid "Launch %s"
msgstr ""
-#: ../mail/src/cd-mail-applet-notifications.c:326
+#: ../mail/src/cd-mail-applet-notifications.c:346
msgid "Mail"
msgstr ""
@@ -1910,56 +1897,56 @@
" For Exaile 0.3, you have to activate its MPRIS plug-in"
msgstr ""
-#: ../musicPlayer/src/applet-notifications.c:70
+#: ../musicPlayer/src/applet-notifications.c:74
msgid ""
"Sorry, I couldn't detect any player.\n"
"If it is running, it is maybe because its version is too old and does not offer such service."
msgstr ""
-#: ../musicPlayer/src/applet-notifications.c:162
+#: ../musicPlayer/src/applet-notifications.c:172
msgid "Find opened player"
msgstr ""
-#: ../musicPlayer/src/applet-notifications.c:169
+#: ../musicPlayer/src/applet-notifications.c:179
msgid "Previous"
msgstr ""
-#: ../musicPlayer/src/applet-notifications.c:171
+#: ../musicPlayer/src/applet-notifications.c:181
msgid "Play/Pause (left-click)"
msgstr ""
-#: ../musicPlayer/src/applet-notifications.c:173
+#: ../musicPlayer/src/applet-notifications.c:183
msgid "Next (middle-click)"
msgstr ""
-#: ../musicPlayer/src/applet-notifications.c:175
+#: ../musicPlayer/src/applet-notifications.c:185
msgid "Stop"
msgstr ""
-#: ../musicPlayer/src/applet-notifications.c:177
+#: ../musicPlayer/src/applet-notifications.c:189
+msgid "Information"
+msgstr ""
+
+#: ../musicPlayer/src/applet-notifications.c:192
msgid "Show the Window"
msgstr ""
-#: ../musicPlayer/src/applet-notifications.c:179
+#: ../musicPlayer/src/applet-notifications.c:198
msgid "Show JumpBox"
msgstr ""
-#: ../musicPlayer/src/applet-notifications.c:181
+#: ../musicPlayer/src/applet-notifications.c:200
msgid "Toggle Shuffle"
msgstr ""
-#: ../musicPlayer/src/applet-notifications.c:183
+#: ../musicPlayer/src/applet-notifications.c:202
msgid "Toggle Repeat"
msgstr ""
-#: ../musicPlayer/src/applet-notifications.c:185
+#: ../musicPlayer/src/applet-notifications.c:204
msgid "Rate this song"
msgstr ""
-#: ../musicPlayer/src/applet-notifications.c:187
-msgid "Information"
-msgstr ""
-
#: ../netspeed/src/applet-init.c:29
msgid "netspeed"
msgstr ""
@@ -1991,7 +1978,7 @@
" Do you want to do it now?"
msgstr ""
-#: ../netspeed/src/applet-notifications.c:72
+#: ../netspeed/src/applet-notifications.c:76
msgid "Re-check interface"
msgstr ""
@@ -2141,31 +2128,31 @@
msgid "Enter a name for this bookmark:"
msgstr ""
-#: ../shortcuts/src/applet-notifications.c:250
+#: ../shortcuts/src/applet-notifications.c:252
+msgid "Rename this bookmark"
+msgstr ""
+
+#: ../shortcuts/src/applet-notifications.c:253
msgid "Remove this bookmark"
msgstr ""
-#: ../shortcuts/src/applet-notifications.c:251
-msgid "Rename this bookmark"
-msgstr ""
-
-#: ../shortcuts/src/applet-notifications.c:257
+#: ../shortcuts/src/applet-notifications.c:259
msgid "Eject"
msgstr ""
-#: ../shortcuts/src/applet-notifications.c:262
+#: ../shortcuts/src/applet-notifications.c:264
msgid "Unmount (middle-click)"
msgstr ""
-#: ../shortcuts/src/applet-notifications.c:262
+#: ../shortcuts/src/applet-notifications.c:264
msgid "Mount (middle-click)"
msgstr ""
-#: ../shortcuts/src/applet-notifications.c:264
+#: ../shortcuts/src/applet-notifications.c:266
msgid "Get disk info"
msgstr ""
-#: ../shortcuts/src/applet-notifications.c:289
+#: ../shortcuts/src/applet-notifications.c:292
msgid "Only folders can be bookmarked."
msgstr ""
@@ -2199,20 +2186,20 @@
msgid "Change screen resolution"
msgstr ""
-#: ../showDesktop/src/applet-notifications.c:299
+#: ../showDesktop/src/applet-notifications.c:305
msgid "Move to the Desktop"
msgstr ""
-#: ../showDesktop/src/applet-notifications.c:300
+#: ../showDesktop/src/applet-notifications.c:306
msgid "Copy to the Desktop"
msgstr ""
-#: ../showDesktop/src/applet-notifications.c:301
-#: ../showDesktop/src/applet-notifications.c:305
+#: ../showDesktop/src/applet-notifications.c:307
+#: ../showDesktop/src/applet-notifications.c:311
msgid "Link to the Desktop"
msgstr ""
-#: ../showDesktop/src/applet-notifications.c:306
+#: ../showDesktop/src/applet-notifications.c:312
msgid "Download onto the Desktop"
msgstr ""
@@ -2228,19 +2215,19 @@
"Middle-click to open the images folder."
msgstr ""
-#: ../slider/src/applet-notifications.c:166
+#: ../slider/src/applet-notifications.c:167
msgid "Play"
msgstr ""
-#: ../slider/src/applet-notifications.c:166
+#: ../slider/src/applet-notifications.c:167
msgid "Pause"
msgstr ""
-#: ../slider/src/applet-notifications.c:169
+#: ../slider/src/applet-notifications.c:170
msgid "Open current image"
msgstr ""
-#: ../slider/src/applet-notifications.c:171
+#: ../slider/src/applet-notifications.c:172
msgid "Browse images folder"
msgstr ""
@@ -2270,38 +2257,38 @@
msgid "Set new name for this item:"
msgstr ""
-#: ../stack/src/applet-notifications.c:165
+#: ../stack/src/applet-notifications.c:167
+msgid "Paste (drag'n'drop)"
+msgstr ""
+
+#: ../stack/src/applet-notifications.c:170
+msgid "Clear the stack"
+msgstr ""
+
+#: ../stack/src/applet-notifications.c:177
+msgid "Open (click)"
+msgstr ""
+
+#: ../stack/src/applet-notifications.c:179
+msgid "Open parent folder"
+msgstr ""
+
+#: ../stack/src/applet-notifications.c:181
msgid "Copy (middle click)"
msgstr ""
-#: ../stack/src/applet-notifications.c:166
+#: ../stack/src/applet-notifications.c:182
msgid "Cut"
msgstr ""
-#: ../stack/src/applet-notifications.c:167
+#: ../stack/src/applet-notifications.c:185
msgid "Rename this item"
msgstr ""
-#: ../stack/src/applet-notifications.c:168
+#: ../stack/src/applet-notifications.c:186
msgid "Remove this item"
msgstr ""
-#: ../stack/src/applet-notifications.c:172
-msgid "Open (click)"
-msgstr ""
-
-#: ../stack/src/applet-notifications.c:174
-msgid "Open folder"
-msgstr ""
-
-#: ../stack/src/applet-notifications.c:179
-msgid "Paste (drag'n'drop)"
-msgstr ""
-
-#: ../stack/src/applet-notifications.c:180
-msgid "Clear the stack"
-msgstr ""
-
#: ../stacks/src/applet-init.c:30
msgid "stacks"
msgstr ""
@@ -2316,7 +2303,7 @@
#: ../switcher/src/applet-draw.c:612 ../switcher/src/applet-draw.c:619
#: ../switcher/src/applet-load-icons.c:43
-#: ../switcher/src/applet-notifications.c:393
+#: ../switcher/src/applet-notifications.c:400
msgid "Current"
msgstr ""
@@ -2324,8 +2311,8 @@
#: ../switcher/src/applet-load-icons.c:49
#: ../switcher/src/applet-notifications.c:213
#: ../switcher/src/applet-notifications.c:225
-#: ../switcher/src/applet-notifications.c:385
-#: ../switcher/src/applet-notifications.c:450
+#: ../switcher/src/applet-notifications.c:392
+#: ../switcher/src/applet-notifications.c:452
msgid "Desktop"
msgstr ""
@@ -2345,41 +2332,41 @@
msgstr ""
#: ../switcher/src/applet-notifications.c:214
-#: ../switcher/src/applet-notifications.c:272
+#: ../switcher/src/applet-notifications.c:273
msgid "Rename this workspace"
msgstr ""
-#: ../switcher/src/applet-notifications.c:259
-msgid "Add a desktop"
-msgstr ""
-
-#: ../switcher/src/applet-notifications.c:263
-msgid "Remove last desktop"
-msgstr ""
-
-#: ../switcher/src/applet-notifications.c:279
-msgid "Move current Desktop to this Desktop"
-msgstr ""
-
-#: ../switcher/src/applet-notifications.c:284
+#: ../switcher/src/applet-notifications.c:260
+msgid "Add a workspace"
+msgstr ""
+
+#: ../switcher/src/applet-notifications.c:264
+msgid "Remove last workspace"
+msgstr ""
+
+#: ../switcher/src/applet-notifications.c:280
+msgid "Move current workspace to this workspace"
+msgstr ""
+
+#: ../switcher/src/applet-notifications.c:285
msgid "This will move all windows from the current desktop to the one you clicked on."
msgstr ""
-#: ../switcher/src/applet-notifications.c:290
+#: ../switcher/src/applet-notifications.c:294
msgid "Windows List"
msgstr ""
-#: ../switcher/src/applet-notifications.c:295 ../showDesktop/data/messages:103
+#: ../switcher/src/applet-notifications.c:299 ../showDesktop/data/messages:103
#: ../showDesktop/data/messages:117
msgid "Show the desktop"
msgstr ""
-#: ../switcher/src/applet-notifications.c:302 ../showDesktop/data/messages:111
+#: ../switcher/src/applet-notifications.c:306 ../showDesktop/data/messages:111
#: ../showDesktop/data/messages:125 ../switcher/data/messages:107
msgid "Expose all the desktops (Compiz)"
msgstr ""
-#: ../switcher/src/applet-notifications.c:308
+#: ../switcher/src/applet-notifications.c:314
msgid "Refresh"
msgstr ""
@@ -2431,16 +2418,16 @@
"To close a tab : type 'CTRL+w' or middle-click on it."
msgstr ""
-#: ../terminal/src/terminal-menu-functions.c:78
+#: ../terminal/src/terminal-menu-functions.c:79
#: ../terminal/src/terminal-widget.c:374
msgid "New Tab"
msgstr ""
-#: ../terminal/src/terminal-menu-functions.c:79
+#: ../terminal/src/terminal-menu-functions.c:80
msgid "Rename current Tab"
msgstr ""
-#: ../terminal/src/terminal-menu-functions.c:80
+#: ../terminal/src/terminal-menu-functions.c:81
msgid "Close current Tab"
msgstr ""
@@ -2505,39 +2492,39 @@
msgid "Search for tag:"
msgstr ""
-#: ../tomboy/src/tomboy-notifications.c:186
-msgid "Reload notes"
-msgstr ""
-
-#: ../tomboy/src/tomboy-notifications.c:187
+#: ../tomboy/src/tomboy-notifications.c:195
msgid "Add a note"
msgstr ""
-#: ../tomboy/src/tomboy-notifications.c:193
+#: ../tomboy/src/tomboy-notifications.c:199
msgid "Delete this note"
msgstr ""
-#: ../tomboy/src/tomboy-notifications.c:196
+#: ../tomboy/src/tomboy-notifications.c:202
+msgid "Reload notes"
+msgstr ""
+
+#: ../tomboy/src/tomboy-notifications.c:208
msgid "Search"
msgstr ""
-#: ../tomboy/src/tomboy-notifications.c:197
+#: ../tomboy/src/tomboy-notifications.c:209
msgid "Search for tag"
msgstr ""
-#: ../tomboy/src/tomboy-notifications.c:199
+#: ../tomboy/src/tomboy-notifications.c:211
msgid "Search for today's note"
msgstr ""
-#: ../tomboy/src/tomboy-notifications.c:200
+#: ../tomboy/src/tomboy-notifications.c:212
msgid "Search for this week's note"
msgstr ""
-#: ../tomboy/src/tomboy-notifications.c:201
+#: ../tomboy/src/tomboy-notifications.c:213
msgid "Search for next week's note"
msgstr ""
-#: ../tomboy/src/tomboy-notifications.c:211
+#: ../tomboy/src/tomboy-notifications.c:223
msgid "Reset marks"
msgstr ""
@@ -2620,60 +2607,60 @@
msgid "Data are being retrieved, please wait a moment."
msgstr ""
-#: ../weather/src/applet-notifications.c:84
+#: ../weather/src/applet-notifications.c:85
msgid "Reload now"
msgstr ""
-#: ../weather/src/applet-notifications.c:108
+#: ../weather/src/applet-notifications.c:110
msgid ""
"No data available\n"
" is your connection alive?"
msgstr ""
-#: ../weather/src/applet-notifications.c:127
-#: ../weather/src/applet-notifications.c:163
+#: ../weather/src/applet-notifications.c:129
+#: ../weather/src/applet-notifications.c:165
msgid "Temperature"
msgstr ""
-#: ../weather/src/applet-notifications.c:128
+#: ../weather/src/applet-notifications.c:130
msgid "Precipitation probability"
msgstr ""
-#: ../weather/src/applet-notifications.c:129
-#: ../weather/src/applet-notifications.c:164
+#: ../weather/src/applet-notifications.c:131
+#: ../weather/src/applet-notifications.c:166
msgid "Wind"
msgstr ""
-#: ../weather/src/applet-notifications.c:130
-#: ../weather/src/applet-notifications.c:165
+#: ../weather/src/applet-notifications.c:132
+#: ../weather/src/applet-notifications.c:167
msgid "Humidity"
msgstr ""
-#: ../weather/src/applet-notifications.c:131
-#: ../weather/src/applet-notifications.c:166
+#: ../weather/src/applet-notifications.c:133
+#: ../weather/src/applet-notifications.c:168
msgid "Sunrise"
msgstr ""
-#: ../weather/src/applet-notifications.c:131
-#: ../weather/src/applet-notifications.c:166
+#: ../weather/src/applet-notifications.c:133
+#: ../weather/src/applet-notifications.c:168
msgid "Sunset"
msgstr ""
-#: ../weather/src/applet-notifications.c:139
+#: ../weather/src/applet-notifications.c:141
msgid "Data are being fetched, please re-try in a few seconds."
msgstr ""
-#: ../weather/src/applet-notifications.c:149
+#: ../weather/src/applet-notifications.c:151
msgid ""
"No data available\n"
"Retrying now..."
msgstr ""
-#: ../weather/src/applet-notifications.c:163
+#: ../weather/src/applet-notifications.c:165
msgid "Feels like"
msgstr ""
-#: ../weather/src/applet-notifications.c:165
+#: ../weather/src/applet-notifications.c:167
msgid "Pressure"
msgstr ""
@@ -2765,10 +2752,10 @@
#: ../Animated-icons/data/messages:79 ../Animated-icons/data/messages:97
#: ../Animated-icons/data/messages:149 ../Animated-icons/data/messages:161
#: ../Animated-icons/data/messages:173 ../Animated-icons/data/messages:187
-#: ../Scooby-Do/data/messages:17 ../Scooby-Do/data/messages:21
-#: ../icon-effect/data/messages:101 ../icon-effect/data/messages:123
-#: ../icon-effect/data/messages:145 ../icon-effect/data/messages:167
-#: ../icon-effect/data/messages:187
+#: ../Remote-Control/data/messages:7 ../Scooby-Do/data/messages:15
+#: ../Scooby-Do/data/messages:19 ../icon-effect/data/messages:101
+#: ../icon-effect/data/messages:123 ../icon-effect/data/messages:145
+#: ../icon-effect/data/messages:167 ../icon-effect/data/messages:187
msgid "In ms."
msgstr ""
@@ -3045,7 +3032,7 @@
#: ../Folders/data/messages:27 ../GMenu/data/messages:15
#: ../MeMenu/data/messages:9 ../Messaging-Menu/data/messages:11
#: ../Network-Monitor/data/messages:15 ../RSSreader/data/messages:17
-#: ../Scooby-Do/data/messages:117 ../Status-Notifier/data/messages:15
+#: ../Scooby-Do/data/messages:115 ../Status-Notifier/data/messages:15
#: ../System-Monitor/data/messages:13 ../Toons/data/messages:13
#: ../Xgamma/data/messages:15 ../alsaMixer/data/messages:13
#: ../clock/data/messages:15 ../compiz-icon/data/messages:11
@@ -3068,23 +3055,24 @@
#: ../Folders/data/messages:103 ../GMenu/data/messages:91
#: ../MeMenu/data/messages:85 ../Messaging-Menu/data/messages:87
#: ../Network-Monitor/data/messages:91 ../RSSreader/data/messages:93
-#: ../Scooby-Do/data/messages:1 ../Status-Notifier/data/messages:91
-#: ../System-Monitor/data/messages:89 ../Toons/data/messages:89
-#: ../Xgamma/data/messages:91 ../alsaMixer/data/messages:89
-#: ../clock/data/messages:91 ../compiz-icon/data/messages:87
-#: ../dnd2share/data/messages:87 ../dustbin/data/messages:87
-#: ../keyboard-indicator/data/messages:87 ../logout/data/messages:91
-#: ../mail/data/messages:87 ../motion-blur/data/messages:1
-#: ../musicPlayer/data/messages:89 ../netspeed/data/messages:87
-#: ../powermanager/data/messages:89 ../quick-browser/data/messages:93
-#: ../shortcuts/data/messages:91 ../show-mouse/data/messages:1
-#: ../showDesktop/data/messages:95 ../slider/data/messages:89
-#: ../stack/data/messages:93 ../stacks/data/messages:89
-#: ../switcher/data/messages:83 ../switcher/data/messages:85
-#: ../systray/data/messages:83 ../template/data/messages:91
-#: ../terminal/data/messages:91 ../tomboy/data/messages:101
-#: ../weather/data/messages:89 ../weather/data/messages:91
-#: ../weblets/data/messages:91 ../wifi/data/messages:89
+#: ../Remote-Control/data/messages:1 ../Scooby-Do/data/messages:1
+#: ../Status-Notifier/data/messages:91 ../System-Monitor/data/messages:89
+#: ../Toons/data/messages:89 ../Xgamma/data/messages:91
+#: ../alsaMixer/data/messages:89 ../clock/data/messages:91
+#: ../compiz-icon/data/messages:87 ../dnd2share/data/messages:87
+#: ../dustbin/data/messages:87 ../keyboard-indicator/data/messages:87
+#: ../logout/data/messages:91 ../mail/data/messages:87
+#: ../motion-blur/data/messages:1 ../musicPlayer/data/messages:89
+#: ../netspeed/data/messages:87 ../powermanager/data/messages:89
+#: ../quick-browser/data/messages:93 ../shortcuts/data/messages:91
+#: ../show-mouse/data/messages:1 ../showDesktop/data/messages:95
+#: ../slider/data/messages:89 ../stack/data/messages:93
+#: ../stacks/data/messages:89 ../switcher/data/messages:83
+#: ../switcher/data/messages:85 ../systray/data/messages:83
+#: ../template/data/messages:91 ../terminal/data/messages:91
+#: ../tomboy/data/messages:101 ../weather/data/messages:89
+#: ../weather/data/messages:91 ../weblets/data/messages:91
+#: ../wifi/data/messages:89
msgid "Configuration"
msgstr ""
@@ -3417,7 +3405,7 @@
#: ../Folders/data/messages:51 ../GMenu/data/messages:39
#: ../MeMenu/data/messages:33 ../Messaging-Menu/data/messages:35
#: ../Network-Monitor/data/messages:39 ../RSSreader/data/messages:41
-#: ../Scooby-Do/data/messages:27 ../Status-Notifier/data/messages:39
+#: ../Scooby-Do/data/messages:25 ../Status-Notifier/data/messages:39
#: ../System-Monitor/data/messages:37 ../Toons/data/messages:37
#: ../Xgamma/data/messages:39 ../alsaMixer/data/messages:37
#: ../clock/data/messages:39 ../compiz-icon/data/messages:35
@@ -3683,7 +3671,7 @@
#: ../Status-Notifier/data/messages:65 ../System-Monitor/data/messages:63
#: ../Toons/data/messages:63 ../Xgamma/data/messages:65
#: ../alsaMixer/data/messages:63 ../clock/data/messages:65
-#: ../clock/data/messages:149 ../compiz-icon/data/messages:61
+#: ../clock/data/messages:157 ../compiz-icon/data/messages:61
#: ../dnd2share/data/messages:61 ../dustbin/data/messages:61
#: ../keyboard-indicator/data/messages:61
#: ../keyboard-indicator/data/messages:113 ../logout/data/messages:65
@@ -4251,7 +4239,7 @@
msgid "Sort folders before files?"
msgstr ""
-#: ../Folders/data/messages:117 ../Scooby-Do/data/messages:103
+#: ../Folders/data/messages:117 ../Scooby-Do/data/messages:101
#: ../quick-browser/data/messages:103
msgid "Show hidden files?"
msgstr ""
@@ -4730,199 +4718,199 @@
msgid "big"
msgstr ""
+#: ../Remote-Control/data/messages:3
+msgid "Shortkey to trigger the applet:"
+msgstr ""
+
+#: ../Remote-Control/data/messages:5 ../Scooby-Do/data/messages:23
+msgid "Animation of the current icon :"
+msgstr ""
+
+#: ../Remote-Control/data/messages:9 ../Scooby-Do/data/messages:21
+msgid "Duration of the stop animation :"
+msgstr ""
+
#: ../Scooby-Do/data/messages:3
msgid "Shortkey to enable/disable the finder mode:"
msgstr ""
#: ../Scooby-Do/data/messages:5
-msgid "Shortkey to enable/disable the navigation mode:"
+msgid "Maximum number of mails that will be previewed. Put -1 to show the maximum possible."
msgstr ""
#: ../Scooby-Do/data/messages:7
-msgid "Maximum number of mails that will be previewed. Put -1 to show the maximum possible."
+msgid "Maximum number of results :"
msgstr ""
#: ../Scooby-Do/data/messages:9
-msgid "Maximum number of results :"
+msgid "Number of lines of the listing. If there are more results, the listing will scroll when you go up or down with the arrows."
msgstr ""
#: ../Scooby-Do/data/messages:11
-msgid "Number of lines of the listing. If there are more results, the listing will scroll when you go up or down with the arrows."
+msgid "Number of lines to display :"
msgstr ""
#: ../Scooby-Do/data/messages:13
-msgid "Number of lines to display :"
-msgstr ""
-
-#: ../Scooby-Do/data/messages:15
msgid "Animations"
msgstr ""
-#: ../Scooby-Do/data/messages:19
+#: ../Scooby-Do/data/messages:17
msgid "Duration of the appearance animation :"
msgstr ""
-#: ../Scooby-Do/data/messages:23
-msgid "Duration of the stop animation :"
-msgstr ""
-
-#: ../Scooby-Do/data/messages:25
-msgid "Animation of the current icon :"
+#: ../Scooby-Do/data/messages:27
+msgid "Font used to display what you type:"
msgstr ""
#: ../Scooby-Do/data/messages:29
-msgid "Font used to display what you type:"
+msgid "Color of the text's frame :"
msgstr ""
#: ../Scooby-Do/data/messages:31
-msgid "Color of the text's frame :"
+msgid "Font size, relative to the dock size:"
msgstr ""
#: ../Scooby-Do/data/messages:33
-msgid "Font size, relative to the dock size:"
+msgid "between 1 and 9, the higher, the bigger."
msgstr ""
#: ../Scooby-Do/data/messages:35
-msgid "between 1 and 9, the higher, the bigger."
-msgstr ""
-
-#: ../Scooby-Do/data/messages:37
msgid "Text size:"
msgstr ""
-#: ../Scooby-Do/data/messages:39 ../keyboard-indicator/data/messages:103
+#: ../Scooby-Do/data/messages:37 ../keyboard-indicator/data/messages:103
msgid "Outline text?"
msgstr ""
-#: ../Scooby-Do/data/messages:41 ../clock/data/messages:145
+#: ../Scooby-Do/data/messages:39 ../clock/data/messages:145
msgid "Text colour:"
msgstr ""
+#: ../Scooby-Do/data/messages:41
+msgid "Character background colour:"
+msgstr ""
+
#: ../Scooby-Do/data/messages:43
-msgid "Character background colour:"
+msgid "Write text on the top of the dock?"
msgstr ""
#: ../Scooby-Do/data/messages:45
-msgid "Write text on the top of the dock?"
+msgid "Favorite applications"
msgstr ""
#: ../Scooby-Do/data/messages:47
-msgid "Favorite applications"
+msgid "FAvorite applications starting with 'a' :"
msgstr ""
#: ../Scooby-Do/data/messages:49
-msgid "FAvorite applications starting with 'a' :"
+msgid "Favorite application starting with 'b' :"
msgstr ""
#: ../Scooby-Do/data/messages:51
-msgid "Favorite application starting with 'b' :"
+msgid "Favorite application(s) starting with 'c' :"
msgstr ""
#: ../Scooby-Do/data/messages:53
-msgid "Favorite application(s) starting with 'c' :"
+msgid "Favorite application(s starting with 'd' :"
msgstr ""
#: ../Scooby-Do/data/messages:55
-msgid "Favorite application(s starting with 'd' :"
+msgid "Favorite application(s) starting with 'e' :"
msgstr ""
#: ../Scooby-Do/data/messages:57
-msgid "Favorite application(s) starting with 'e' :"
+msgid "Favorite application(s) starting with 'f' :"
msgstr ""
#: ../Scooby-Do/data/messages:59
-msgid "Favorite application(s) starting with 'f' :"
+msgid "Favorite application(s) starting with 'g' :"
msgstr ""
#: ../Scooby-Do/data/messages:61
-msgid "Favorite application(s) starting with 'g' :"
+msgid "Favorite application(s) starting with 'h' :"
msgstr ""
#: ../Scooby-Do/data/messages:63
-msgid "Favorite application(s) starting with 'h' :"
+msgid "Favorite application(s) starting with 'i' :"
msgstr ""
#: ../Scooby-Do/data/messages:65
-msgid "Favorite application(s) starting with 'i' :"
+msgid "Favorite application(s) starting with 'j' :"
msgstr ""
#: ../Scooby-Do/data/messages:67
-msgid "Favorite application(s) starting with 'j' :"
+msgid "Favorite application(s) starting with 'k' :"
msgstr ""
#: ../Scooby-Do/data/messages:69
-msgid "Favorite application(s) starting with 'k' :"
+msgid "Favorite application(s) starting with 'l' :"
msgstr ""
#: ../Scooby-Do/data/messages:71
-msgid "Favorite application(s) starting with 'l' :"
+msgid "Favorite application(s) starting with 'm' :"
msgstr ""
#: ../Scooby-Do/data/messages:73
-msgid "Favorite application(s) starting with 'm' :"
+msgid "Favorite application(s) starting with 'n' :"
msgstr ""
#: ../Scooby-Do/data/messages:75
-msgid "Favorite application(s) starting with 'n' :"
+msgid "Favorite application(s) starting with 'o' :"
msgstr ""
#: ../Scooby-Do/data/messages:77
-msgid "Favorite application(s) starting with 'o' :"
+msgid "Favorite application(s) starting with 'p' :"
msgstr ""
#: ../Scooby-Do/data/messages:79
-msgid "Favorite application(s) starting with 'p' :"
+msgid "Favorite application(s) starting with 'q' :"
msgstr ""
#: ../Scooby-Do/data/messages:81
-msgid "Favorite application(s) starting with 'q' :"
+msgid "Favorite application(s) starting with 'r' :"
msgstr ""
#: ../Scooby-Do/data/messages:83
-msgid "Favorite application(s) starting with 'r' :"
+msgid "Favorite application(s) starting with 's' :"
msgstr ""
#: ../Scooby-Do/data/messages:85
-msgid "Favorite application(s) starting with 's' :"
+msgid "Favorite application(s) starting with 't' :"
msgstr ""
#: ../Scooby-Do/data/messages:87
-msgid "Favorite application(s) starting with 't' :"
+msgid "Favorite application(s) starting with 'u' :"
msgstr ""
#: ../Scooby-Do/data/messages:89
-msgid "Favorite application(s) starting with 'u' :"
+msgid "Favorite application(s) starting with 'v' :"
msgstr ""
#: ../Scooby-Do/data/messages:91
-msgid "Favorite application(s) starting with 'v' :"
+msgid "Favorite application(s) starting with 'w' :"
msgstr ""
#: ../Scooby-Do/data/messages:93
-msgid "Favorite application(s) starting with 'w' :"
+msgid "Favorite application(s) starting with 'x' :"
msgstr ""
#: ../Scooby-Do/data/messages:95
-msgid "Favorite application(s) starting with 'x' :"
+msgid "Favorite application(s) starting with 'y' :"
msgstr ""
#: ../Scooby-Do/data/messages:97
-msgid "Favorite application(s) starting with 'y' :"
-msgstr ""
-
-#: ../Scooby-Do/data/messages:99
msgid "Favorite application(s) starting with 'z' :"
msgstr ""
+#: ../Scooby-Do/data/messages:107
+msgid "Propose some web search engines ?"
+msgstr ""
+
#: ../Scooby-Do/data/messages:109
-msgid "Propose some web search engines ?"
-msgstr ""
-
-#: ../Scooby-Do/data/messages:111
msgid "It can launch commands and even do some calculations."
msgstr ""
-#: ../Scooby-Do/data/messages:115
+#: ../Scooby-Do/data/messages:113
msgid "Help"
msgstr ""
@@ -5282,26 +5270,42 @@
msgstr ""
#: ../clock/data/messages:147
+msgid "Layout of the text:"
+msgstr ""
+
+#: ../clock/data/messages:149
+msgid "Automatic"
+msgstr ""
+
+#: ../clock/data/messages:151
+msgid "On 1 line"
+msgstr ""
+
+#: ../clock/data/messages:153
+msgid "On 2 lines"
+msgstr ""
+
+#: ../clock/data/messages:155
msgid "Ratio to apply on text :"
msgstr ""
-#: ../clock/data/messages:151
+#: ../clock/data/messages:159
msgid "Configure time and date"
msgstr ""
-#: ../clock/data/messages:153
+#: ../clock/data/messages:161
msgid "Leave empty to use the default command."
msgstr ""
-#: ../clock/data/messages:155
+#: ../clock/data/messages:163
msgid "Specific command to run:"
msgstr ""
-#: ../clock/data/messages:159
+#: ../clock/data/messages:167
msgid "The new alarm will be added to the end / the last alarm will be removed."
msgstr ""
-#: ../clock/data/messages:161
+#: ../clock/data/messages:169
msgid "Add or remove an alarm:"
msgstr ""
@@ -6871,14 +6875,6 @@
msgid "Manual order"
msgstr ""
-#: ../stack/data/messages:135
-msgid "It is the selection made by the mouse, as opposed to usual ctrl+c/ctrl+v clipboard"
-msgstr ""
-
-#: ../stack/data/messages:137
-msgid "When copying/pasting/cutting, use the selection clipboard?"
-msgstr ""
-
#: ../stacks/data/messages:91
msgid "Directory & Options"
msgstr ""
=== modified file 'po/cs.po'
--- po/cs.po 2010-09-07 00:39:20 +0000
+++ po/cs.po 2010-09-22 10:43:43 +0000
@@ -8,13 +8,13 @@
"Project-Id-Version: cairo-dock-plug-ins\n"
"Report-Msgid-Bugs-To: fabounet@xxxxxxxxxxxx\n"
"POT-Creation-Date: 2010-08-29 00:59+0000\n"
-"PO-Revision-Date: 2010-09-03 05:04+0000\n"
+"PO-Revision-Date: 2010-09-07 04:03+0000\n"
"Last-Translator: Matthieu Baerts <matttbe@xxxxxxxxx>\n"
"Language-Team: Czech <cs@xxxxxx>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-09-04 04:52+0000\n"
+"X-Launchpad-Export-Date: 2010-09-08 04:51+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#: ../Animated-icons/src/applet-init.c:32
=== modified file 'po/de.po'
--- po/de.po 2010-09-07 00:39:20 +0000
+++ po/de.po 2010-09-22 10:43:43 +0000
@@ -8,13 +8,13 @@
"Project-Id-Version: cairo-dock-plug-ins\n"
"Report-Msgid-Bugs-To: fabounet@xxxxxxxxxxxx\n"
"POT-Creation-Date: 2010-08-29 00:59+0000\n"
-"PO-Revision-Date: 2010-09-03 05:05+0000\n"
+"PO-Revision-Date: 2010-09-07 03:59+0000\n"
"Last-Translator: Matthieu Baerts <matttbe@xxxxxxxxx>\n"
"Language-Team: German <de@xxxxxx>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-09-04 04:53+0000\n"
+"X-Launchpad-Export-Date: 2010-09-08 04:51+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#: ../Animated-icons/src/applet-init.c:32
=== modified file 'po/en.po'
--- po/en.po 2010-09-07 00:39:20 +0000
+++ po/en.po 2010-09-22 10:43:43 +0000
@@ -8,13 +8,13 @@
"Project-Id-Version: cairo-dock-plug-ins\n"
"Report-Msgid-Bugs-To: fabounet@xxxxxxxxxxxx\n"
"POT-Creation-Date: 2010-08-29 00:59+0000\n"
-"PO-Revision-Date: 2010-09-03 05:06+0000\n"
+"PO-Revision-Date: 2010-09-07 03:57+0000\n"
"Last-Translator: Matthieu Baerts <matttbe@xxxxxxxxx>\n"
"Language-Team: English (United Kingdom) <en_GB@xxxxxx>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-09-04 04:54+0000\n"
+"X-Launchpad-Export-Date: 2010-09-08 04:53+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#: ../Animated-icons/src/applet-init.c:32
=== modified file 'po/es.po'
--- po/es.po 2010-09-07 00:39:20 +0000
+++ po/es.po 2010-09-22 10:43:43 +0000
@@ -7,14 +7,14 @@
msgstr ""
"Project-Id-Version: cairo-dock-plug-ins\n"
"Report-Msgid-Bugs-To: fabounet@xxxxxxxxxxxx\n"
-"POT-Creation-Date: 2010-08-29 00:59+0000\n"
-"PO-Revision-Date: 2010-09-03 05:07+0000\n"
-"Last-Translator: Jonay <jonay.santana@xxxxxxxxx>\n"
+"POT-Creation-Date: 2010-09-13 00:36+0000\n"
+"PO-Revision-Date: 2010-09-13 20:11+0000\n"
+"Last-Translator: sebikul <Unknown>\n"
"Language-Team: Spanish <es@xxxxxx>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-09-04 04:54+0000\n"
+"X-Launchpad-Export-Date: 2010-09-14 05:01+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
"X-Poedit-Language: Spanish\n"
"X-Poedit-SourceCharset: utf-8\n"
@@ -146,29 +146,25 @@
msgid "For Aiur!"
msgstr "¡Para Aiur!"
-#: ../Cairo-Penguin/src/applet-notifications.c:123
-msgid "Hey, you there!"
-msgstr "¡Oye tú!"
-
-#: ../Cairo-Penguin/src/applet-notifications.c:127
+#: ../Cairo-Penguin/src/applet-notifications.c:126
msgid "Wake up"
msgstr "Despierta"
-#: ../Cairo-Penguin/src/applet-notifications.c:131
+#: ../Cairo-Penguin/src/applet-notifications.c:130
msgid "Keep quiet"
msgstr "Quedate quieto"
-#: ../Cairo-Penguin/src/applet-notifications.c:134
-#: ../Scooby-Do/data/messages:101
+#: ../Cairo-Penguin/src/applet-notifications.c:133
+#: ../Scooby-Do/data/messages:99
msgid "Start XPenguins"
msgstr "Iniciar XPenguins"
-#: ../Cairo-Penguin/src/applet-notifications.c:135
+#: ../Cairo-Penguin/src/applet-notifications.c:134
msgid "Stop XPenguins"
msgstr "Detener XPenguins"
-#: ../Cairo-Penguin/src/applet-notifications.c:158
-#: ../Cairo-Penguin/src/applet-notifications.c:160
+#: ../Cairo-Penguin/src/applet-notifications.c:157
+#: ../Cairo-Penguin/src/applet-notifications.c:159
msgid "Zzzzz"
msgstr "Zzzzz"
@@ -198,9 +194,9 @@
#: ../Clipper/src/applet-init.c:39
msgid "Clipboard history"
-msgstr ""
+msgstr "Historial del portapapeles"
-#: ../Clipper/src/applet-notifications.c:99
+#: ../Clipper/src/applet-notifications.c:101
msgid ""
"No persistent items.\n"
"You can add some by drag and dropping some text on the icon."
@@ -353,33 +349,37 @@
"Compruebe los permisos del archivo\n"
"y que el nombre no exista ya."
-#: ../Folders/src/applet-notifications.c:319
-msgid "Open with"
-msgstr "Abrir con"
-
-#: ../Folders/src/applet-notifications.c:352
+#: ../Folders/src/applet-notifications.c:322
+msgid "Open the folder (middle-click)"
+msgstr "Abrir la carpeta (botón central)"
+
+#: ../Folders/src/applet-notifications.c:328
+msgid "Rename this file"
+msgstr "Renombrar este archivo"
+
+#: ../Folders/src/applet-notifications.c:329
msgid "Delete this file"
msgstr "Eliminar este archivo"
-#: ../Folders/src/applet-notifications.c:354
-msgid "Rename this file"
-msgstr "Renombrar este archivo"
-
-#: ../Folders/src/applet-notifications.c:356
+#: ../Folders/src/applet-notifications.c:330
msgid "Move this file"
msgstr "Mover este archivo"
-#: ../Folders/src/applet-notifications.c:358
+#: ../Folders/src/applet-notifications.c:336
+msgid "Open with"
+msgstr "Abrir con"
+
+#: ../Folders/src/applet-notifications.c:370
msgid "Properties"
msgstr "Propiedades"
-#: ../Folders/src/applet-notifications.c:360
+#: ../Folders/src/applet-notifications.c:373
msgid "Create a new file"
msgstr "Crear un archivo nuevo"
-#: ../Folders/src/applet-notifications.c:364
-msgid "Open the folder (middle-click)"
-msgstr "Abrir la carpeta (botón central)"
+#: ../Folders/src/applet-notifications.c:374
+msgid "Create a new folder"
+msgstr "Crear una nueva carpeta"
#: ../GMenu/src/applet-init.c:33
msgid ""
@@ -401,15 +401,15 @@
msgid "Applications Menu"
msgstr "Menú de aplicaciones"
-#: ../GMenu/src/applet-notifications.c:147
-msgid "Quick launch"
-msgstr "Inicio rápido"
+#: ../GMenu/src/applet-notifications.c:75
+msgid "Quick launch (Middle-click)"
+msgstr "Lanzamiento rapido (Click-medio)"
-#: ../GMenu/src/applet-notifications.c:148
+#: ../GMenu/src/applet-notifications.c:77
msgid "Configure menu"
msgstr "Menú de configuración"
-#: ../GMenu/src/applet-notifications.c:149
+#: ../GMenu/src/applet-notifications.c:80
msgid "Clear recent"
msgstr "Limpiar recientes"
@@ -421,7 +421,7 @@
msgid "Clear the list of the recently used documents?"
msgstr "¿Borrar la lista de documentos usados recientemente?"
-#: ../GMenu/src/applet-run-dialog.c:349 ../Scooby-Do/data/messages:113
+#: ../GMenu/src/applet-run-dialog.c:349 ../Scooby-Do/data/messages:111
msgid "Enter a command to launch:"
msgstr "Introduce un comando a lanzar :"
@@ -621,12 +621,12 @@
msgstr "Cargando"
#: ../Network-Monitor/src/applet-notifications.c:100
-#: ../wifi/src/applet-notifications.c:75
+#: ../wifi/src/applet-notifications.c:76
msgid "Check for Wireless Extension"
msgstr "Verificar una extensión inalámbrica."
#: ../Network-Monitor/src/applet-notifications.c:101
-#: ../wifi/src/applet-notifications.c:76
+#: ../wifi/src/applet-notifications.c:77
msgid "Network Administration"
msgstr "Administración de red"
@@ -798,16 +798,16 @@
msgstr "Abrir en una ventana nueva"
#: ../Scooby-Do/src/applet-backend-firefox.c:433
-#: ../dnd2share/src/applet-notifications.c:461
+#: ../dnd2share/src/applet-notifications.c:470
msgid "Open file"
msgstr "Abrir archivo"
#: ../Scooby-Do/src/applet-backend-firefox.c:496
-#: ../Scooby-Do/data/messages:105
+#: ../Scooby-Do/data/messages:103
msgid "Firefox bookmarks"
msgstr "Marcadores de Firefox"
-#: ../Scooby-Do/src/applet-backend-recent.c:212 ../Scooby-Do/data/messages:107
+#: ../Scooby-Do/src/applet-backend-recent.c:212 ../Scooby-Do/data/messages:105
msgid "Recent files"
msgstr "Archivos recientes"
@@ -835,60 +835,6 @@
msgid "Amazon"
msgstr "Tienda Amazon"
-#: ../Scooby-Do/src/applet-init.c:39
-msgid ""
-"This plug-in allows you to make different actions directly from the "
-"keyboard.\n"
-"It has 2 modes, each one being triggered by a keyboard shortcut:\n"
-"\n"
-"- the finder mode (default shortcut : CTRL + Enter) :\n"
-" It lets you find and launch applications, files, recent files, firefox "
-"bookmarks, commands, and even calculations.\n"
-" Type what you want to search, the results will be displayed in real "
-"time.\n"
-" The first results of each category are displayed in the main listing.\n"
-" Use the up/down arrows to navigate inside the list,\n"
-" and use the left/right arrows to enter into a category, or to display "
-"more actions (when a little arrow is drawn next to text).\n"
-" Once inside a category, you can filter the results by typing some "
-"letters.\n"
-" Press Enter to validate, maintain SHIFT or ALT to keep the list of "
-"results opened.\n"
-"\n"
-"- the navigation mode (default shortcut : CTRL + F9) :\n"
-" use the arrows to navigate into the docks and sub-docks,\n"
-" or type the name of a launcher and press Tab to automatically jump to "
-"the next suitable launcher\n"
-" press Enter to click on the icon, Shift+Enter for Shift+click, Alt+Enter "
-"for middle click, and Ctrl+Enter for left click\n"
-"Escape or the same shortkey will cancel."
-msgstr ""
-"Esta mini-aplicación le permite hacer diferentes acciones directamente desde "
-"el teclado.\n"
-"Tiene dos modos, cada uno de ellos activado por un atajo de teclado:\n"
-"\n"
-"-El modo búsqueda (atajo predeterminado: Ctrl+Intro):\n"
-" Le permite encontrar y ejecutar aplicaciones, archivos, archivos "
-"recientes, marcadores, comandos e incluso cálculos.\n"
-" Escriba lo que quiere buscar, los resultados se mostrarán en tiempo "
-"real.\n"
-" Los primeros resultados de cada categorÃa se muestran en la lista "
-"principal.\n"
-" Use las flechas arriba/abajo para entrar en una categorÃa, o para "
-"mostrar mas acciones (cuando aparezca una pequeña flecha junto al texto).\n"
-" Una vez dentro de una categorÃa. puede filtrar los resultados "
-"escribiendo algo de texto.\n"
-" Pulse Intro para validar, mantenga Shift o Alt para mantener la lista de "
-"resultados abierta.\n"
-"\n"
-"-El modo de navegación (atajo predeterminado: Ctrl+F9):\n"
-" utilice las flechas para navegar entre las barras y sub-barras,\n"
-" o escriba el nombre de un lanzador y presione Tab para automáticamente "
-"saltar al siguiente lanzador adecuado\n"
-" presione Intro para hacer clic en el icono, Shift+Intro para Shift+clic, "
-"Alt+Intro para clic medio, y Ctrl+Intro para clic izquierdo\n"
-"Esc cancela."
-
#: ../Scooby-Do/src/applet-listing.c:510
msgid "(F1) Match case"
msgstr "(F1) Coincidir mayúsculas/minúsculas"
@@ -935,27 +881,17 @@
msgid "Searching ..."
msgstr "Buscando..."
-#: ../Scooby-Do/src/applet-session.c:50
+#: ../Scooby-Do/src/applet-session.c:62
msgid "Enter your search"
msgstr "Introduzca una búsqueda"
-#: ../Status-Notifier/src/applet-init.c:31
+#: ../Status-Notifier/src/applet-init.c:32
msgid "Status Notifier"
msgstr "Notificador de estado"
-#: ../Status-Notifier/src/applet-init.c:34
-msgid ""
-"A <b>notification area</b> for your dock\n"
-"Also called 'systray'.\n"
-"It is designed to work on any desktop that supports the latest systray "
-"specifications (KDE, Gnome, etc)"
-msgstr ""
-"Un <b>área de notificación</b> para su dock\n"
-"También llamando «bandeja del sistema».\n"
-"Está diseñado para funcionar en cualquier escritorio que soporte las últimas "
-"especificaciones de la bandeja del sistema (KDE, Gnome, etc)"
-
#: ../System-Monitor/src/applet-init.c:30
+#: ../System-Monitor/src/applet-notifications.c:116
+#: ../netspeed/src/applet-notifications.c:72
msgid "System Monitor"
msgstr "Monitor del sistema"
@@ -1042,12 +978,8 @@
msgid "Buffers"
msgstr "Búferes"
-#: ../System-Monitor/src/applet-notifications.c:115
-#: ../netspeed/src/applet-notifications.c:70
-msgid "Monitor System"
-msgstr "Sistema de monitor"
-
#: ../System-Monitor/src/applet-nvidia.c:141
+#: ../System-Monitor/src/applet-sensors.c:161
#, c-format
msgid "Alert! Graphic Card core temperature has reached %d°C"
msgstr "¡Alerta! El núcleo de la Tarjeta Gráfica ha alcanzado %d°C"
@@ -1085,7 +1017,7 @@
msgid "Set up gamma:"
msgstr "Configurar gamma:"
-#: ../Xgamma/src/applet-notifications.c:61
+#: ../Xgamma/src/applet-notifications.c:62
msgid "Apply current luminosity on startup"
msgstr "Aplicar la luminosidad actual al inicio"
@@ -1145,155 +1077,122 @@
msgid "Set up volume:"
msgstr "Establecer volumen :"
-#: ../alsaMixer/src/applet-notifications.c:57
+#: ../alsaMixer/src/applet-notifications.c:58
msgid "Adjust channels"
msgstr "Ajustar canales"
#: ../alsaMixer/src/applet-notifications.c:59
-msgid "Unmute"
-msgstr ""
-
-#: ../alsaMixer/src/applet-notifications.c:61
-msgid "Mute"
-msgstr ""
-
-#: ../clock/src/applet-calendar.c:190 ../clock/src/applet-calendar.c:271
-#: ../clock/src/applet-calendar.c:437 ../clock/src/applet-calendar.c:442
-#: ../clock/src/applet-draw.c:83 ../clock/src/applet-draw.c:339
-#: ../clock/src/applet-draw.c:353 ../clock/src/applet-draw.c:374
-#: ../clock/src/applet-task-editor.c:119
+msgid "Unmute (middle-click)"
+msgstr ""
+
+#: ../alsaMixer/src/applet-notifications.c:59
+msgid "Mute (middle-click)"
+msgstr "Silenciar (Click-medio)"
+
+#: ../clock/src/applet-calendar.c:193 ../clock/src/applet-calendar.c:274
+#: ../clock/src/applet-calendar.c:519 ../clock/src/applet-calendar.c:524
+#: ../clock/src/applet-task-editor.c:119 ../clock/src/applet-timer.c:84
+#: ../clock/src/applet-timer.c:172 ../clock/src/applet-timer.c:454
+#: ../clock/src/applet-timer.c:471 ../clock/src/applet-timer.c:491
msgid "No title"
msgstr "Sin tÃtulo"
-#: ../clock/src/applet-calendar.c:438
+#: ../clock/src/applet-calendar.c:520
msgid "years"
msgstr "años"
-#: ../clock/src/applet-calendar.c:555
+#: ../clock/src/applet-calendar.c:637
msgid "Calendar and tasks"
msgstr "Calendario y tareas"
-#: ../clock/src/applet-config.c:35 ../clock/data/messages:157
+#: ../clock/src/applet-config.c:36 ../clock/data/messages:165
msgid "Alarm"
msgstr "Alarma"
-#: ../clock/src/applet-config.c:35
+#: ../clock/src/applet-config.c:36
msgid "Time you want to be notified:"
msgstr "Hora a la que quiere que se le notifique:"
-#: ../clock/src/applet-config.c:35
+#: ../clock/src/applet-config.c:36
msgid "In the form xx:xx. E.g.: 20:35 for 8:35pm"
msgstr "En la forma xx:xx. Por ejemplo: 20:35 for 8:35pm"
-#: ../clock/src/applet-config.c:35
+#: ../clock/src/applet-config.c:36
msgid "Never"
msgstr "Nunca"
-#: ../clock/src/applet-config.c:35
+#: ../clock/src/applet-config.c:36
msgid "Day"
msgstr "DÃa"
-#: ../clock/src/applet-config.c:35 ../weather/src/applet-load-icons.c:26
+#: ../clock/src/applet-config.c:36 ../weather/src/applet-load-icons.c:26
msgid "Monday"
msgstr "Lunes"
-#: ../clock/src/applet-config.c:35 ../weather/src/applet-load-icons.c:26
+#: ../clock/src/applet-config.c:36 ../weather/src/applet-load-icons.c:26
msgid "Tuesday"
msgstr "Martes"
-#: ../clock/src/applet-config.c:35 ../weather/src/applet-load-icons.c:26
+#: ../clock/src/applet-config.c:36 ../weather/src/applet-load-icons.c:26
msgid "Wednesday"
msgstr "Miércoles"
-#: ../clock/src/applet-config.c:35 ../weather/src/applet-load-icons.c:26
+#: ../clock/src/applet-config.c:36 ../weather/src/applet-load-icons.c:26
msgid "Thursday"
msgstr "Jueves"
-#: ../clock/src/applet-config.c:35 ../weather/src/applet-load-icons.c:26
+#: ../clock/src/applet-config.c:36 ../weather/src/applet-load-icons.c:26
msgid "Friday"
msgstr "Viernes"
-#: ../clock/src/applet-config.c:35 ../weather/src/applet-load-icons.c:26
+#: ../clock/src/applet-config.c:36 ../weather/src/applet-load-icons.c:26
msgid "Saturday"
msgstr "Sábado"
-#: ../clock/src/applet-config.c:35 ../weather/src/applet-load-icons.c:26
+#: ../clock/src/applet-config.c:36 ../weather/src/applet-load-icons.c:26
msgid "Sunday"
msgstr "Domingo"
-#: ../clock/src/applet-config.c:35
+#: ../clock/src/applet-config.c:36
msgid "Week Day"
msgstr "DÃa de la semana"
-#: ../clock/src/applet-config.c:35
+#: ../clock/src/applet-config.c:36
msgid "Week End"
msgstr "Fin de semana"
-#: ../clock/src/applet-config.c:35
+#: ../clock/src/applet-config.c:36
msgid "Month"
msgstr "Mes"
-#: ../clock/src/applet-config.c:35
+#: ../clock/src/applet-config.c:36
msgid "Repeat every:"
msgstr "Repetir cada:"
-#: ../clock/src/applet-config.c:35
+#: ../clock/src/applet-config.c:36
msgid "If every month, which day of the month?"
msgstr "Si ha de ser cada mes, ¿qué dÃa del mes?"
-#: ../clock/src/applet-config.c:35
+#: ../clock/src/applet-config.c:36
msgid "Message you want to use to be notified:"
msgstr "Mensaje que quiere que se le notifique:"
-#: ../clock/src/applet-config.c:35
+#: ../clock/src/applet-config.c:36
msgid "Tea Time!"
msgstr "¡Hora del té!"
-#: ../clock/src/applet-config.c:35
+#: ../clock/src/applet-config.c:36
msgid "Command to launch:"
msgstr "Orden a lanzar:"
-#: ../clock/src/applet-config.c:35
+#: ../clock/src/applet-config.c:36
msgid "E.g.:"
msgstr "P. ej.:"
-#: ../clock/src/applet-config.c:492 ../weather/src/applet-config.c:180
+#: ../clock/src/applet-config.c:495 ../weather/src/applet-config.c:180
msgid "Search for your location :"
msgstr "Busque su ubucación:"
-#: ../clock/src/applet-draw.c:54
-msgid "1mn"
-msgstr "1mn"
-
-#: ../clock/src/applet-draw.c:59
-msgid "1h"
-msgstr "1h"
-
-#: ../clock/src/applet-draw.c:82
-msgid "The following task was scheduled at"
-msgstr "La siguiente tarea estaba programada en"
-
-#: ../clock/src/applet-draw.c:85 ../clock/src/applet-draw.c:355
-#: ../clock/src/applet-draw.c:376
-msgid "Repeat this message every:"
-msgstr "Repetir este mensaje cada:"
-
-#: ../clock/src/applet-draw.c:338
-msgid "This task will begin in 15 minutes:"
-msgstr "Esta tarea podria empezar en 15 minutos:"
-
-#: ../clock/src/applet-draw.c:352
-msgid "It's time for the following task:"
-msgstr "Es momento para la siguiente tarea:"
-
-#: ../clock/src/applet-draw.c:373
-msgid "Today is the following anniversary:"
-msgstr "Hoy es el siguiente cumpleaños:"
-
-#: ../clock/src/applet-draw.c:373
-msgid "Tomorrow is the following anniversary:"
-msgstr "Mañana es el siguiente aniversario:"
-
#: ../clock/src/applet-init.c:35
msgid "clock"
msgstr "reloj"
@@ -1345,18 +1244,18 @@
"Puede añadir tareas al aplastar en el applet para abrir el calendario, y "
"luego dar doble-click en un dÃa."
-#: ../clock/src/applet-notifications.c:90
-msgid "Set up time and date"
-msgstr "Establacer fecha y hora"
-
-#: ../clock/src/applet-notifications.c:91
+#: ../clock/src/applet-notifications.c:92
msgid "Show today's tasks"
msgstr "Mostrar las tareas de hoy"
-#: ../clock/src/applet-notifications.c:92
+#: ../clock/src/applet-notifications.c:93
msgid "Show this week's tasks"
msgstr "Mostrar las tareas de esta semana"
+#: ../clock/src/applet-notifications.c:96
+msgid "Set up time and date"
+msgstr "Establacer fecha y hora"
+
#: ../clock/src/applet-task-editor.c:156
msgid "Add a new task"
msgstr "Añadir una nueva tarea"
@@ -1412,6 +1311,43 @@
msgid "Tags"
msgstr "Etiquetas"
+#: ../clock/src/applet-timer.c:55
+msgid "1mn"
+msgstr "1mn"
+
+#: ../clock/src/applet-timer.c:60
+msgid "1h"
+msgstr "1h"
+
+#: ../clock/src/applet-timer.c:83
+msgid "The following task was scheduled at"
+msgstr "La siguiente tarea estaba programada en"
+
+#: ../clock/src/applet-timer.c:86 ../clock/src/applet-timer.c:456
+#: ../clock/src/applet-timer.c:493
+msgid "Repeat this message every:"
+msgstr "Repetir este mensaje cada:"
+
+#: ../clock/src/applet-timer.c:170
+msgid "The following task has felt due:"
+msgstr ""
+
+#: ../clock/src/applet-timer.c:453
+msgid "It's time for the following task:"
+msgstr "Es momento para la siguiente tarea:"
+
+#: ../clock/src/applet-timer.c:470
+msgid "This task will begin in 15 minutes:"
+msgstr "Esta tarea podria empezar en 15 minutos:"
+
+#: ../clock/src/applet-timer.c:490
+msgid "Today is the following anniversary:"
+msgstr "Hoy es el siguiente cumpleaños:"
+
+#: ../clock/src/applet-timer.c:490
+msgid "Tomorrow is the following anniversary:"
+msgstr "Mañana es el siguiente aniversario:"
+
#: ../compiz-icon/src/applet-init.c:31
msgid "compiz-icon"
msgstr "icono-de-compiz"
@@ -1436,7 +1372,7 @@
msgstr "Configurar Compiz"
#: ../compiz-icon/src/applet-load-icon.c:31
-#: ../compiz-icon/src/applet-notifications.c:178
+#: ../compiz-icon/src/applet-notifications.c:180
msgid "Emerald Manager"
msgstr "Administrador de temas Emerald"
@@ -1460,27 +1396,27 @@
"Para configurar Compiz necesita instalar CCSM\n"
" mediante su gestor de paquetes (Synaptic, YasT, etc)"
-#: ../compiz-icon/src/applet-notifications.c:179
+#: ../compiz-icon/src/applet-notifications.c:181
msgid "Reload Emerald"
msgstr "Recargar Emerald"
-#: ../compiz-icon/src/applet-notifications.c:183
+#: ../compiz-icon/src/applet-notifications.c:184
msgid "Switch Windows Manager"
msgstr "Cambiar el administrador de ventanas"
-#: ../compiz-icon/src/applet-notifications.c:184
+#: ../compiz-icon/src/applet-notifications.c:185
msgid "Switch Windows Decorator"
msgstr "Cambar el decorador de ventanas"
-#: ../compiz-icon/src/applet-notifications.c:193
+#: ../compiz-icon/src/applet-notifications.c:194
msgid "Toggle Exposition Mode"
msgstr "Activar el modo de exposicion"
-#: ../compiz-icon/src/applet-notifications.c:194
+#: ../compiz-icon/src/applet-notifications.c:195
msgid "Toggle Widget Layer"
msgstr "Conmutar la capa de componentes (widgets)"
-#: ../compiz-icon/src/applet-notifications.c:196
+#: ../compiz-icon/src/applet-notifications.c:198
msgid "Toggle Show Desktop"
msgstr "Conmutar la capa del escritorio"
@@ -1683,17 +1619,21 @@
msgstr "EnvÃa el contenido del portapapeles"
#: ../dnd2share/src/applet-notifications.c:398
-msgid "Clear History"
-msgstr "Limpiar Historial"
+msgid "History"
+msgstr "Historial"
-#: ../dnd2share/src/applet-notifications.c:463
+#: ../dnd2share/src/applet-notifications.c:472
msgid "Get text"
msgstr "Obtener texto"
-#: ../dnd2share/src/applet-notifications.c:465
+#: ../dnd2share/src/applet-notifications.c:474
msgid "Remove from history"
msgstr "Remover del historial"
+#: ../dnd2share/src/applet-notifications.c:477
+msgid "Clear History"
+msgstr "Limpiar Historial"
+
#: ../dock-rendering/src/rendering-init.c:34
msgid "Caroussel"
msgstr "Carrusel"
@@ -1775,6 +1715,10 @@
"icon.\n"
"Middle-click on the icon will empty the dustbin."
msgstr ""
+"Esta miniaplicación administra la papelera.\n"
+"Puede eliminar archivos e incluso desmontar unidades arrastrando sus iconos "
+"aquÃ.\n"
+"Puede vaciar la papelera con el clic central del ratón."
#: ../dustbin/src/applet-notifications.c:32
msgid "You're about to delete all files in all dustbins. Sure ?"
@@ -1790,7 +1734,7 @@
#: ../dustbin/src/applet-notifications.c:82
msgid "elements"
-msgstr ""
+msgstr "Elementos"
#: ../dustbin/src/applet-notifications.c:84
msgid "Mo"
@@ -1802,31 +1746,31 @@
#: ../dustbin/src/applet-notifications.c:100
msgid "Counting total size and files number..."
-msgstr ""
+msgstr "Contando tamaño total y número de archivos."
-#: ../dustbin/src/applet-notifications.c:136
+#: ../dustbin/src/applet-notifications.c:117
msgid "Show Trash (click)"
msgstr "Mostrar papelera (pulsar)"
-#: ../dustbin/src/applet-notifications.c:137
+#: ../dustbin/src/applet-notifications.c:118
msgid "Empty Trash (middle-click)"
msgstr "Vaciar papelera (pulsación central)"
-#: ../dustbin/src/applet-notifications.c:139
+#: ../dustbin/src/applet-notifications.c:120
msgid "Display dustbins information"
msgstr "Mostrar información de las papeleras"
-#: ../dustbin/src/applet-notifications.c:151
+#: ../dustbin/src/applet-notifications.c:133
#, c-format
msgid "%s successfully unmounted"
msgstr "%s ahora está desmontado"
-#: ../dustbin/src/applet-notifications.c:155
+#: ../dustbin/src/applet-notifications.c:137
#, c-format
msgid "failed to unmount %s"
msgstr "no se pudo desmontar %s"
-#: ../dustbin/src/applet-notifications.c:179
+#: ../dustbin/src/applet-notifications.c:161
#: ../shortcuts/src/applet-notifications.c:167
msgid "Unmouting this volume ..."
msgstr "Desmontando este volumen..."
@@ -1958,11 +1902,11 @@
"reiniciar.\n"
" (se puede cambiar los botones si prefiere apagar con click izquirdo)"
-#: ../logout/src/applet-notifications.c:101
+#: ../logout/src/applet-notifications.c:100
msgid "Choose in how many minutes your PC will stop:"
msgstr "Seleccione en cuantos minutos su pc se detendrá :"
-#: ../logout/src/applet-notifications.c:126
+#: ../logout/src/applet-notifications.c:125
msgid "Lock screen"
msgstr "Bloquear pantalla"
@@ -1970,7 +1914,7 @@
msgid "Program an automatic shut-down"
msgstr "Programar un apagado automatico"
-#: ../logout/src/applet-notifications.c:158
+#: ../logout/src/applet-notifications.c:159
msgid "Your computer will shut-down in 1 minute."
msgstr "Su computador se apagara en un minuto"
@@ -2129,20 +2073,29 @@
"Si «%s» no es su cliente de correo electrónico cotidiano,\n"
"puede cambiarlo en el panel de configuración de éste módulo."
-#: ../mail/src/cd-mail-applet-notifications.c:139
+#: ../mail/src/cd-mail-applet-notifications.c:147
msgid "Refresh a mail account"
msgstr "Actualizar la cuenta de correo"
-#: ../mail/src/cd-mail-applet-notifications.c:148
+#: ../mail/src/cd-mail-applet-notifications.c:154
+msgid "Refresh all (Middle-click)"
+msgstr "Refrescar todos (Click-medio)"
+
+#: ../mail/src/cd-mail-applet-notifications.c:159
+#, c-format
+msgid "Refresh %s"
+msgstr "Refrescar %s"
+
+#: ../mail/src/cd-mail-applet-notifications.c:165
msgid "Mark all emails as read"
msgstr "Marcar todos los correos como leÃdos"
-#: ../mail/src/cd-mail-applet-notifications.c:151
+#: ../mail/src/cd-mail-applet-notifications.c:168
#, c-format
msgid "Launch %s"
msgstr "Lanzar %s"
-#: ../mail/src/cd-mail-applet-notifications.c:326
+#: ../mail/src/cd-mail-applet-notifications.c:346
msgid "Mail"
msgstr "Correo"
@@ -2221,7 +2174,7 @@
" Para SongBird, debe instalar su agregado dbus.\n"
" Para Exaile 0.3, debe activar su agregado MPRIS."
-#: ../musicPlayer/src/applet-notifications.c:70
+#: ../musicPlayer/src/applet-notifications.c:74
msgid ""
"Sorry, I couldn't detect any player.\n"
"If it is running, it is maybe because its version is too old and does not "
@@ -2231,50 +2184,50 @@
"Si está en ejecución, tal vez se deba a que es muy antiguo y no soporta tal "
"servicio."
-#: ../musicPlayer/src/applet-notifications.c:162
+#: ../musicPlayer/src/applet-notifications.c:172
msgid "Find opened player"
msgstr "Encontrar el reproductor abierto"
-#: ../musicPlayer/src/applet-notifications.c:169
+#: ../musicPlayer/src/applet-notifications.c:179
msgid "Previous"
msgstr "Anterior"
-#: ../musicPlayer/src/applet-notifications.c:171
+#: ../musicPlayer/src/applet-notifications.c:181
msgid "Play/Pause (left-click)"
msgstr "Reproducir/Detener (click izquierdo)"
-#: ../musicPlayer/src/applet-notifications.c:173
+#: ../musicPlayer/src/applet-notifications.c:183
msgid "Next (middle-click)"
msgstr "Siguiente (clic central)"
-#: ../musicPlayer/src/applet-notifications.c:175
+#: ../musicPlayer/src/applet-notifications.c:185
msgid "Stop"
msgstr "Detener"
-#: ../musicPlayer/src/applet-notifications.c:177
+#: ../musicPlayer/src/applet-notifications.c:189
+msgid "Information"
+msgstr "Información"
+
+#: ../musicPlayer/src/applet-notifications.c:192
msgid "Show the Window"
msgstr "Mostrar la ventana"
-#: ../musicPlayer/src/applet-notifications.c:179
+#: ../musicPlayer/src/applet-notifications.c:198
msgid "Show JumpBox"
msgstr "Mostrar JumpBox"
-#: ../musicPlayer/src/applet-notifications.c:181
+#: ../musicPlayer/src/applet-notifications.c:200
msgid "Toggle Shuffle"
msgstr "Conmutar mezcla"
-#: ../musicPlayer/src/applet-notifications.c:183
+#: ../musicPlayer/src/applet-notifications.c:202
msgid "Toggle Repeat"
msgstr "Repetir conmutación"
-#: ../musicPlayer/src/applet-notifications.c:185
+#: ../musicPlayer/src/applet-notifications.c:204
msgid "Rate this song"
msgstr "Calificar esta canción"
-#: ../musicPlayer/src/applet-notifications.c:187
-msgid "Information"
-msgstr "Información"
-
#: ../netspeed/src/applet-init.c:29
msgid "netspeed"
msgstr "netspeed"
@@ -2315,7 +2268,7 @@
" Tal vez tenga que configurar la interfaz que desea monitorizar.\n"
" Desea hacerlo en este momento?"
-#: ../netspeed/src/applet-notifications.c:72
+#: ../netspeed/src/applet-notifications.c:76
msgid "Re-check interface"
msgstr "Volver a verificar la interfaz"
@@ -2495,31 +2448,31 @@
msgid "Enter a name for this bookmark:"
msgstr "Introduzca un nombre para este marcador:"
-#: ../shortcuts/src/applet-notifications.c:250
+#: ../shortcuts/src/applet-notifications.c:252
+msgid "Rename this bookmark"
+msgstr "Renombrar este marcador"
+
+#: ../shortcuts/src/applet-notifications.c:253
msgid "Remove this bookmark"
msgstr "Eliminar este marcador"
-#: ../shortcuts/src/applet-notifications.c:251
-msgid "Rename this bookmark"
-msgstr "Renombrar este marcador"
-
-#: ../shortcuts/src/applet-notifications.c:257
+#: ../shortcuts/src/applet-notifications.c:259
msgid "Eject"
msgstr "Expulsar"
-#: ../shortcuts/src/applet-notifications.c:262
+#: ../shortcuts/src/applet-notifications.c:264
msgid "Unmount (middle-click)"
msgstr "Desmontar (pulsación central)"
-#: ../shortcuts/src/applet-notifications.c:262
+#: ../shortcuts/src/applet-notifications.c:264
msgid "Mount (middle-click)"
msgstr "Montar (pulsación central)"
-#: ../shortcuts/src/applet-notifications.c:264
+#: ../shortcuts/src/applet-notifications.c:266
msgid "Get disk info"
msgstr "Obtener información del disco"
-#: ../shortcuts/src/applet-notifications.c:289
+#: ../shortcuts/src/applet-notifications.c:292
msgid "Only folders can be bookmarked."
msgstr "Sólo se pueden marcar carpetas."
@@ -2568,20 +2521,20 @@
msgid "Change screen resolution"
msgstr "Cambiar la resolución de la pantalla"
-#: ../showDesktop/src/applet-notifications.c:299
+#: ../showDesktop/src/applet-notifications.c:305
msgid "Move to the Desktop"
msgstr "Mover al Escritorio"
-#: ../showDesktop/src/applet-notifications.c:300
+#: ../showDesktop/src/applet-notifications.c:306
msgid "Copy to the Desktop"
msgstr "Copiar al Escritorio"
-#: ../showDesktop/src/applet-notifications.c:301
-#: ../showDesktop/src/applet-notifications.c:305
+#: ../showDesktop/src/applet-notifications.c:307
+#: ../showDesktop/src/applet-notifications.c:311
msgid "Link to the Desktop"
msgstr "Enlazar al Escritorio"
-#: ../showDesktop/src/applet-notifications.c:306
+#: ../showDesktop/src/applet-notifications.c:312
msgid "Download onto the Desktop"
msgstr "Descargar en el Escritorio"
@@ -2602,19 +2555,19 @@
"Pulse para reproducir/pausar o editar la imagen actual.\n"
"Pulse el botón intermedio para abrir la carpeta de imagenes."
-#: ../slider/src/applet-notifications.c:166
+#: ../slider/src/applet-notifications.c:167
msgid "Play"
msgstr "Reproducir"
-#: ../slider/src/applet-notifications.c:166
+#: ../slider/src/applet-notifications.c:167
msgid "Pause"
msgstr "Pausa"
-#: ../slider/src/applet-notifications.c:169
+#: ../slider/src/applet-notifications.c:170
msgid "Open current image"
msgstr "Abrir la imagen actual"
-#: ../slider/src/applet-notifications.c:171
+#: ../slider/src/applet-notifications.c:172
msgid "Browse images folder"
msgstr "Explorar la carpeta de imágenes"
@@ -2657,38 +2610,38 @@
msgid "Set new name for this item:"
msgstr "Establecer nuevo nombre para este elemento:"
-#: ../stack/src/applet-notifications.c:165
+#: ../stack/src/applet-notifications.c:167
+msgid "Paste (drag'n'drop)"
+msgstr "Pegar (Arrastre y suelte)"
+
+#: ../stack/src/applet-notifications.c:170
+msgid "Clear the stack"
+msgstr "Limpiar la pila"
+
+#: ../stack/src/applet-notifications.c:177
+msgid "Open (click)"
+msgstr "Abrir (botón izquierdo del ratón)"
+
+#: ../stack/src/applet-notifications.c:179
+msgid "Open parent folder"
+msgstr "Abrir la carpeta superior"
+
+#: ../stack/src/applet-notifications.c:181
msgid "Copy (middle click)"
msgstr "Copiar (botón central de ratón)"
-#: ../stack/src/applet-notifications.c:166
+#: ../stack/src/applet-notifications.c:182
msgid "Cut"
msgstr "Cortar"
-#: ../stack/src/applet-notifications.c:167
+#: ../stack/src/applet-notifications.c:185
msgid "Rename this item"
msgstr "Renombrar este artÃculo"
-#: ../stack/src/applet-notifications.c:168
+#: ../stack/src/applet-notifications.c:186
msgid "Remove this item"
msgstr "Eliminar este artÃculo"
-#: ../stack/src/applet-notifications.c:172
-msgid "Open (click)"
-msgstr "Abrir (botón izquierdo del ratón)"
-
-#: ../stack/src/applet-notifications.c:174
-msgid "Open folder"
-msgstr "Abrir carpeta"
-
-#: ../stack/src/applet-notifications.c:179
-msgid "Paste (drag'n'drop)"
-msgstr "Pegar (Arrastre y suelte)"
-
-#: ../stack/src/applet-notifications.c:180
-msgid "Clear the stack"
-msgstr "Limpiar la pila"
-
#: ../stacks/src/applet-init.c:30
msgid "stacks"
msgstr "pilas"
@@ -2703,7 +2656,7 @@
#: ../switcher/src/applet-draw.c:612 ../switcher/src/applet-draw.c:619
#: ../switcher/src/applet-load-icons.c:43
-#: ../switcher/src/applet-notifications.c:393
+#: ../switcher/src/applet-notifications.c:400
msgid "Current"
msgstr "Actual"
@@ -2711,8 +2664,8 @@
#: ../switcher/src/applet-load-icons.c:49
#: ../switcher/src/applet-notifications.c:213
#: ../switcher/src/applet-notifications.c:225
-#: ../switcher/src/applet-notifications.c:385
-#: ../switcher/src/applet-notifications.c:450
+#: ../switcher/src/applet-notifications.c:392
+#: ../switcher/src/applet-notifications.c:452
msgid "Desktop"
msgstr "Escritorio"
@@ -2742,23 +2695,23 @@
"(despliega un lanzador secundario)."
#: ../switcher/src/applet-notifications.c:214
-#: ../switcher/src/applet-notifications.c:272
+#: ../switcher/src/applet-notifications.c:273
msgid "Rename this workspace"
msgstr "Renombrar este espacio de trabajo"
-#: ../switcher/src/applet-notifications.c:259
-msgid "Add a desktop"
+#: ../switcher/src/applet-notifications.c:260
+msgid "Add a workspace"
msgstr "Agregar un escritorio"
-#: ../switcher/src/applet-notifications.c:263
-msgid "Remove last desktop"
+#: ../switcher/src/applet-notifications.c:264
+msgid "Remove last workspace"
msgstr "Eliminar ultimo escritorio"
-#: ../switcher/src/applet-notifications.c:279
-msgid "Move current Desktop to this Desktop"
+#: ../switcher/src/applet-notifications.c:280
+msgid "Move current workspace to this workspace"
msgstr "Mover el escritorio actual a este escritorio"
-#: ../switcher/src/applet-notifications.c:284
+#: ../switcher/src/applet-notifications.c:285
msgid ""
"This will move all windows from the current desktop to the one you clicked "
"on."
@@ -2766,21 +2719,21 @@
"Ésto moverá todas las ventanas del escritorio actual al escritorio que haya "
"seleccionado."
-#: ../switcher/src/applet-notifications.c:290
+#: ../switcher/src/applet-notifications.c:294
msgid "Windows List"
msgstr "Lista de ventanas"
-#: ../switcher/src/applet-notifications.c:295 ../showDesktop/data/messages:103
+#: ../switcher/src/applet-notifications.c:299 ../showDesktop/data/messages:103
#: ../showDesktop/data/messages:117
msgid "Show the desktop"
msgstr "Mostrar el escritorio"
-#: ../switcher/src/applet-notifications.c:302 ../showDesktop/data/messages:111
+#: ../switcher/src/applet-notifications.c:306 ../showDesktop/data/messages:111
#: ../showDesktop/data/messages:125 ../switcher/data/messages:107
msgid "Expose all the desktops (Compiz)"
msgstr "Mostrar todos los escritorios (Compiz)"
-#: ../switcher/src/applet-notifications.c:308
+#: ../switcher/src/applet-notifications.c:314
msgid "Refresh"
msgstr "Actualizar"
@@ -2859,16 +2812,16 @@
"Para cerrar una pestaña: presione «CTRL+w» o pulse con el botón intermedio "
"del ratón sobre ella."
-#: ../terminal/src/terminal-menu-functions.c:78
+#: ../terminal/src/terminal-menu-functions.c:79
#: ../terminal/src/terminal-widget.c:374
msgid "New Tab"
msgstr "Pestaña nueva"
-#: ../terminal/src/terminal-menu-functions.c:79
+#: ../terminal/src/terminal-menu-functions.c:80
msgid "Rename current Tab"
msgstr "Renombrar pestaña actual"
-#: ../terminal/src/terminal-menu-functions.c:80
+#: ../terminal/src/terminal-menu-functions.c:81
msgid "Close current Tab"
msgstr "Cerrar pestaña actual"
@@ -2940,39 +2893,39 @@
msgid "Search for tag:"
msgstr "Buscar por etiqueta:"
-#: ../tomboy/src/tomboy-notifications.c:186
-msgid "Reload notes"
-msgstr "Recarga notas"
-
-#: ../tomboy/src/tomboy-notifications.c:187
+#: ../tomboy/src/tomboy-notifications.c:195
msgid "Add a note"
msgstr "Añadir una nota"
-#: ../tomboy/src/tomboy-notifications.c:193
+#: ../tomboy/src/tomboy-notifications.c:199
msgid "Delete this note"
msgstr "Eliminar esta nota"
-#: ../tomboy/src/tomboy-notifications.c:196
+#: ../tomboy/src/tomboy-notifications.c:202
+msgid "Reload notes"
+msgstr "Recarga notas"
+
+#: ../tomboy/src/tomboy-notifications.c:208
msgid "Search"
msgstr "Buscar"
-#: ../tomboy/src/tomboy-notifications.c:197
+#: ../tomboy/src/tomboy-notifications.c:209
msgid "Search for tag"
msgstr "Buscar la etiqueta"
-#: ../tomboy/src/tomboy-notifications.c:199
+#: ../tomboy/src/tomboy-notifications.c:211
msgid "Search for today's note"
msgstr "Buscar las notas de hoy"
-#: ../tomboy/src/tomboy-notifications.c:200
+#: ../tomboy/src/tomboy-notifications.c:212
msgid "Search for this week's note"
msgstr "Buscar las notas de esta semana"
-#: ../tomboy/src/tomboy-notifications.c:201
+#: ../tomboy/src/tomboy-notifications.c:213
msgid "Search for next week's note"
msgstr "Buscar las notas de esta semana"
-#: ../tomboy/src/tomboy-notifications.c:211
+#: ../tomboy/src/tomboy-notifications.c:223
msgid "Reset marks"
msgstr "Reiniciar marcas"
@@ -3070,11 +3023,11 @@
msgid "Data are being retrieved, please wait a moment."
msgstr "Recibiendo datos, espere un momento."
-#: ../weather/src/applet-notifications.c:84
+#: ../weather/src/applet-notifications.c:85
msgid "Reload now"
msgstr "Recargar ahora."
-#: ../weather/src/applet-notifications.c:108
+#: ../weather/src/applet-notifications.c:110
msgid ""
"No data available\n"
" is your connection alive?"
@@ -3082,42 +3035,42 @@
"No hay datos disponibles.\n"
"¿Está conectado a internet?"
-#: ../weather/src/applet-notifications.c:127
-#: ../weather/src/applet-notifications.c:163
+#: ../weather/src/applet-notifications.c:129
+#: ../weather/src/applet-notifications.c:165
msgid "Temperature"
msgstr "Temperatura"
-#: ../weather/src/applet-notifications.c:128
+#: ../weather/src/applet-notifications.c:130
msgid "Precipitation probability"
msgstr "Precipitación probable"
-#: ../weather/src/applet-notifications.c:129
-#: ../weather/src/applet-notifications.c:164
+#: ../weather/src/applet-notifications.c:131
+#: ../weather/src/applet-notifications.c:166
msgid "Wind"
msgstr "Viento"
-#: ../weather/src/applet-notifications.c:130
-#: ../weather/src/applet-notifications.c:165
+#: ../weather/src/applet-notifications.c:132
+#: ../weather/src/applet-notifications.c:167
msgid "Humidity"
msgstr "Humedad"
-#: ../weather/src/applet-notifications.c:131
-#: ../weather/src/applet-notifications.c:166
+#: ../weather/src/applet-notifications.c:133
+#: ../weather/src/applet-notifications.c:168
msgid "Sunrise"
msgstr "Amanecer"
-#: ../weather/src/applet-notifications.c:131
-#: ../weather/src/applet-notifications.c:166
+#: ../weather/src/applet-notifications.c:133
+#: ../weather/src/applet-notifications.c:168
msgid "Sunset"
msgstr "Atardecer"
-#: ../weather/src/applet-notifications.c:139
+#: ../weather/src/applet-notifications.c:141
msgid "Data are being fetched, please re-try in a few seconds."
msgstr ""
"Los datos están siendo descargados, por favor vuelva a intentarlo en unos "
"segundos."
-#: ../weather/src/applet-notifications.c:149
+#: ../weather/src/applet-notifications.c:151
msgid ""
"No data available\n"
"Retrying now..."
@@ -3125,11 +3078,11 @@
"No hay datos disponibles\n"
"Volviendo a intentar..."
-#: ../weather/src/applet-notifications.c:163
+#: ../weather/src/applet-notifications.c:165
msgid "Feels like"
msgstr "Se siente como"
-#: ../weather/src/applet-notifications.c:165
+#: ../weather/src/applet-notifications.c:167
msgid "Pressure"
msgstr "Presión"
@@ -3238,10 +3191,10 @@
#: ../Animated-icons/data/messages:79 ../Animated-icons/data/messages:97
#: ../Animated-icons/data/messages:149 ../Animated-icons/data/messages:161
#: ../Animated-icons/data/messages:173 ../Animated-icons/data/messages:187
-#: ../Scooby-Do/data/messages:17 ../Scooby-Do/data/messages:21
-#: ../icon-effect/data/messages:101 ../icon-effect/data/messages:123
-#: ../icon-effect/data/messages:145 ../icon-effect/data/messages:167
-#: ../icon-effect/data/messages:187
+#: ../Remote-Control/data/messages:7 ../Scooby-Do/data/messages:15
+#: ../Scooby-Do/data/messages:19 ../icon-effect/data/messages:101
+#: ../icon-effect/data/messages:123 ../icon-effect/data/messages:145
+#: ../icon-effect/data/messages:167 ../icon-effect/data/messages:187
msgid "In ms."
msgstr "En milisegundos."
@@ -3518,7 +3471,7 @@
#: ../Folders/data/messages:27 ../GMenu/data/messages:15
#: ../MeMenu/data/messages:9 ../Messaging-Menu/data/messages:11
#: ../Network-Monitor/data/messages:15 ../RSSreader/data/messages:17
-#: ../Scooby-Do/data/messages:117 ../Status-Notifier/data/messages:15
+#: ../Scooby-Do/data/messages:115 ../Status-Notifier/data/messages:15
#: ../System-Monitor/data/messages:13 ../Toons/data/messages:13
#: ../Xgamma/data/messages:15 ../alsaMixer/data/messages:13
#: ../clock/data/messages:15 ../compiz-icon/data/messages:11
@@ -3541,23 +3494,24 @@
#: ../Folders/data/messages:103 ../GMenu/data/messages:91
#: ../MeMenu/data/messages:85 ../Messaging-Menu/data/messages:87
#: ../Network-Monitor/data/messages:91 ../RSSreader/data/messages:93
-#: ../Scooby-Do/data/messages:1 ../Status-Notifier/data/messages:91
-#: ../System-Monitor/data/messages:89 ../Toons/data/messages:89
-#: ../Xgamma/data/messages:91 ../alsaMixer/data/messages:89
-#: ../clock/data/messages:91 ../compiz-icon/data/messages:87
-#: ../dnd2share/data/messages:87 ../dustbin/data/messages:87
-#: ../keyboard-indicator/data/messages:87 ../logout/data/messages:91
-#: ../mail/data/messages:87 ../motion-blur/data/messages:1
-#: ../musicPlayer/data/messages:89 ../netspeed/data/messages:87
-#: ../powermanager/data/messages:89 ../quick-browser/data/messages:93
-#: ../shortcuts/data/messages:91 ../show-mouse/data/messages:1
-#: ../showDesktop/data/messages:95 ../slider/data/messages:89
-#: ../stack/data/messages:93 ../stacks/data/messages:89
-#: ../switcher/data/messages:83 ../switcher/data/messages:85
-#: ../systray/data/messages:83 ../template/data/messages:91
-#: ../terminal/data/messages:91 ../tomboy/data/messages:101
-#: ../weather/data/messages:89 ../weather/data/messages:91
-#: ../weblets/data/messages:91 ../wifi/data/messages:89
+#: ../Remote-Control/data/messages:1 ../Scooby-Do/data/messages:1
+#: ../Status-Notifier/data/messages:91 ../System-Monitor/data/messages:89
+#: ../Toons/data/messages:89 ../Xgamma/data/messages:91
+#: ../alsaMixer/data/messages:89 ../clock/data/messages:91
+#: ../compiz-icon/data/messages:87 ../dnd2share/data/messages:87
+#: ../dustbin/data/messages:87 ../keyboard-indicator/data/messages:87
+#: ../logout/data/messages:91 ../mail/data/messages:87
+#: ../motion-blur/data/messages:1 ../musicPlayer/data/messages:89
+#: ../netspeed/data/messages:87 ../powermanager/data/messages:89
+#: ../quick-browser/data/messages:93 ../shortcuts/data/messages:91
+#: ../show-mouse/data/messages:1 ../showDesktop/data/messages:95
+#: ../slider/data/messages:89 ../stack/data/messages:93
+#: ../stacks/data/messages:89 ../switcher/data/messages:83
+#: ../switcher/data/messages:85 ../systray/data/messages:83
+#: ../template/data/messages:91 ../terminal/data/messages:91
+#: ../tomboy/data/messages:101 ../weather/data/messages:89
+#: ../weather/data/messages:91 ../weblets/data/messages:91
+#: ../wifi/data/messages:89
msgid "Configuration"
msgstr "Configuración:"
@@ -3906,7 +3860,7 @@
#: ../Folders/data/messages:51 ../GMenu/data/messages:39
#: ../MeMenu/data/messages:33 ../Messaging-Menu/data/messages:35
#: ../Network-Monitor/data/messages:39 ../RSSreader/data/messages:41
-#: ../Scooby-Do/data/messages:27 ../Status-Notifier/data/messages:39
+#: ../Scooby-Do/data/messages:25 ../Status-Notifier/data/messages:39
#: ../System-Monitor/data/messages:37 ../Toons/data/messages:37
#: ../Xgamma/data/messages:39 ../alsaMixer/data/messages:37
#: ../clock/data/messages:39 ../compiz-icon/data/messages:35
@@ -4182,7 +4136,7 @@
#: ../Status-Notifier/data/messages:65 ../System-Monitor/data/messages:63
#: ../Toons/data/messages:63 ../Xgamma/data/messages:65
#: ../alsaMixer/data/messages:63 ../clock/data/messages:65
-#: ../clock/data/messages:149 ../compiz-icon/data/messages:61
+#: ../clock/data/messages:157 ../compiz-icon/data/messages:61
#: ../dnd2share/data/messages:61 ../dustbin/data/messages:61
#: ../keyboard-indicator/data/messages:61
#: ../keyboard-indicator/data/messages:113 ../logout/data/messages:65
@@ -4798,7 +4752,7 @@
msgid "Sort folders before files?"
msgstr "¿Ordenar carpetas antes que los archivos?"
-#: ../Folders/data/messages:117 ../Scooby-Do/data/messages:103
+#: ../Folders/data/messages:117 ../Scooby-Do/data/messages:101
#: ../quick-browser/data/messages:103
msgid "Show hidden files?"
msgstr "¿Mostrar archivos ocultos?"
@@ -5293,15 +5247,23 @@
msgid "big"
msgstr "grande"
+#: ../Remote-Control/data/messages:3
+msgid "Shortkey to trigger the applet:"
+msgstr ""
+
+#: ../Remote-Control/data/messages:5 ../Scooby-Do/data/messages:23
+msgid "Animation of the current icon :"
+msgstr "Animación del icono actual:"
+
+#: ../Remote-Control/data/messages:9 ../Scooby-Do/data/messages:21
+msgid "Duration of the stop animation :"
+msgstr "Duración de la animación de parada:"
+
#: ../Scooby-Do/data/messages:3
msgid "Shortkey to enable/disable the finder mode:"
msgstr "Atajo del teclado para activar/desactivar la modalidad buscador:"
#: ../Scooby-Do/data/messages:5
-msgid "Shortkey to enable/disable the navigation mode:"
-msgstr "Atajo del teclado para activar/desactivar la modalidad navegador:"
-
-#: ../Scooby-Do/data/messages:7
msgid ""
"Maximum number of mails that will be previewed. Put -1 to show the maximum "
"possible."
@@ -5309,11 +5271,11 @@
"Número máximo de mensajes de correo electrónico que pueden ser "
"previsualizados. Establezca a -1 para mostrar la mayor cantidad posible."
-#: ../Scooby-Do/data/messages:9
+#: ../Scooby-Do/data/messages:7
msgid "Maximum number of results :"
msgstr "Número máximo de resultados:"
-#: ../Scooby-Do/data/messages:11
+#: ../Scooby-Do/data/messages:9
msgid ""
"Number of lines of the listing. If there are more results, the listing will "
"scroll when you go up or down with the arrows."
@@ -5321,179 +5283,171 @@
"Número de lÃneas en el listado. Si hay más resultados, el listado se "
"desplazará hacia arriba y abajo mediante las flechas."
-#: ../Scooby-Do/data/messages:13
+#: ../Scooby-Do/data/messages:11
msgid "Number of lines to display :"
msgstr "Número de lÃneas a visualizar:"
-#: ../Scooby-Do/data/messages:15
+#: ../Scooby-Do/data/messages:13
msgid "Animations"
msgstr "Animaciones"
-#: ../Scooby-Do/data/messages:19
+#: ../Scooby-Do/data/messages:17
msgid "Duration of the appearance animation :"
msgstr "Duración de la animación de aparición:"
-#: ../Scooby-Do/data/messages:23
-msgid "Duration of the stop animation :"
-msgstr "Duración de la animación de parada:"
-
-#: ../Scooby-Do/data/messages:25
-msgid "Animation of the current icon :"
-msgstr "Animación del icono actual:"
-
-#: ../Scooby-Do/data/messages:29
+#: ../Scooby-Do/data/messages:27
msgid "Font used to display what you type:"
msgstr "Tipo de letra utilizada para mostrar lo que escribe:"
-#: ../Scooby-Do/data/messages:31
+#: ../Scooby-Do/data/messages:29
msgid "Color of the text's frame :"
msgstr "Color del marco del texto:"
-#: ../Scooby-Do/data/messages:33
+#: ../Scooby-Do/data/messages:31
msgid "Font size, relative to the dock size:"
msgstr "Tamaño del tipo de letra, relativo al tamaño de la barra:"
-#: ../Scooby-Do/data/messages:35
+#: ../Scooby-Do/data/messages:33
msgid "between 1 and 9, the higher, the bigger."
msgstr "entre uno y nueve, entre más alto, más grande."
-#: ../Scooby-Do/data/messages:37
+#: ../Scooby-Do/data/messages:35
msgid "Text size:"
msgstr "Tamaño del texto:"
-#: ../Scooby-Do/data/messages:39 ../keyboard-indicator/data/messages:103
+#: ../Scooby-Do/data/messages:37 ../keyboard-indicator/data/messages:103
msgid "Outline text?"
msgstr "Texto con contorno?"
-#: ../Scooby-Do/data/messages:41 ../clock/data/messages:145
+#: ../Scooby-Do/data/messages:39 ../clock/data/messages:145
msgid "Text colour:"
msgstr "Color del texto:"
-#: ../Scooby-Do/data/messages:43
+#: ../Scooby-Do/data/messages:41
msgid "Character background colour:"
msgstr "Color de fondo de los caracteres:"
-#: ../Scooby-Do/data/messages:45
+#: ../Scooby-Do/data/messages:43
msgid "Write text on the top of the dock?"
msgstr "Escribir texto sobre el lanzador?"
-#: ../Scooby-Do/data/messages:47
+#: ../Scooby-Do/data/messages:45
msgid "Favorite applications"
msgstr "Aplicaciones preferidas"
-#: ../Scooby-Do/data/messages:49
+#: ../Scooby-Do/data/messages:47
msgid "FAvorite applications starting with 'a' :"
msgstr "Aplicaciones preferidas que empiecen con 'a' :"
-#: ../Scooby-Do/data/messages:51
+#: ../Scooby-Do/data/messages:49
msgid "Favorite application starting with 'b' :"
msgstr "Aplicaciones preferidas que empiecen con 'b' :"
-#: ../Scooby-Do/data/messages:53
+#: ../Scooby-Do/data/messages:51
msgid "Favorite application(s) starting with 'c' :"
msgstr "Aplicaciones preferidas que empiecen con 'c' :"
-#: ../Scooby-Do/data/messages:55
+#: ../Scooby-Do/data/messages:53
msgid "Favorite application(s starting with 'd' :"
msgstr "Aplicaciones preferidas que empiecen con 'd' :"
-#: ../Scooby-Do/data/messages:57
+#: ../Scooby-Do/data/messages:55
msgid "Favorite application(s) starting with 'e' :"
msgstr "Aplicaciones preferidas que empiecen con 'e' :"
-#: ../Scooby-Do/data/messages:59
+#: ../Scooby-Do/data/messages:57
msgid "Favorite application(s) starting with 'f' :"
msgstr "Aplicaciones preferidas que empiecen con 'f' :"
-#: ../Scooby-Do/data/messages:61
+#: ../Scooby-Do/data/messages:59
msgid "Favorite application(s) starting with 'g' :"
msgstr "Aplicaciones preferidas que empiecen con 'g' :"
-#: ../Scooby-Do/data/messages:63
+#: ../Scooby-Do/data/messages:61
msgid "Favorite application(s) starting with 'h' :"
msgstr "Aplicaciones preferidas que empiecen con 'h' :"
-#: ../Scooby-Do/data/messages:65
+#: ../Scooby-Do/data/messages:63
msgid "Favorite application(s) starting with 'i' :"
msgstr "Aplicaciones preferidas que empiecen con 'i' :"
-#: ../Scooby-Do/data/messages:67
+#: ../Scooby-Do/data/messages:65
msgid "Favorite application(s) starting with 'j' :"
msgstr "Aplicaciones preferidas que empiecen con 'j' :"
-#: ../Scooby-Do/data/messages:69
+#: ../Scooby-Do/data/messages:67
msgid "Favorite application(s) starting with 'k' :"
msgstr "Aplicaciones preferidas que empiecen con 'k' :"
-#: ../Scooby-Do/data/messages:71
+#: ../Scooby-Do/data/messages:69
msgid "Favorite application(s) starting with 'l' :"
msgstr "Aplicaciones preferidas que empiecen con 'l' :"
-#: ../Scooby-Do/data/messages:73
+#: ../Scooby-Do/data/messages:71
msgid "Favorite application(s) starting with 'm' :"
msgstr "Aplicaciones preferidas que empiecen con 'm' :"
-#: ../Scooby-Do/data/messages:75
+#: ../Scooby-Do/data/messages:73
msgid "Favorite application(s) starting with 'n' :"
msgstr "Aplicaciones preferidas que empiecen con 'n' :"
-#: ../Scooby-Do/data/messages:77
+#: ../Scooby-Do/data/messages:75
msgid "Favorite application(s) starting with 'o' :"
msgstr "Aplicaciones preferidas que empiecen con 'o' :"
-#: ../Scooby-Do/data/messages:79
+#: ../Scooby-Do/data/messages:77
msgid "Favorite application(s) starting with 'p' :"
msgstr "Aplicaciones preferidas que empiecen con 'p' :"
-#: ../Scooby-Do/data/messages:81
+#: ../Scooby-Do/data/messages:79
msgid "Favorite application(s) starting with 'q' :"
msgstr "Aplicaciones preferidas que empiecen con 'q' :"
-#: ../Scooby-Do/data/messages:83
+#: ../Scooby-Do/data/messages:81
msgid "Favorite application(s) starting with 'r' :"
msgstr "Aplicaciones preferidas que empiecen con 'r' :"
-#: ../Scooby-Do/data/messages:85
+#: ../Scooby-Do/data/messages:83
msgid "Favorite application(s) starting with 's' :"
msgstr "Aplicaciones preferidas que empiecen con 's' :"
-#: ../Scooby-Do/data/messages:87
+#: ../Scooby-Do/data/messages:85
msgid "Favorite application(s) starting with 't' :"
msgstr "Aplicaciones preferidas que empiecen con 't' :"
-#: ../Scooby-Do/data/messages:89
+#: ../Scooby-Do/data/messages:87
msgid "Favorite application(s) starting with 'u' :"
msgstr "Aplicaciones preferidas que empiecen con 'u' :"
-#: ../Scooby-Do/data/messages:91
+#: ../Scooby-Do/data/messages:89
msgid "Favorite application(s) starting with 'v' :"
msgstr "Aplicaciones preferidas que empiecen con 'v' :"
-#: ../Scooby-Do/data/messages:93
+#: ../Scooby-Do/data/messages:91
msgid "Favorite application(s) starting with 'w' :"
msgstr "Aplicaciones preferidas que empiecen con 'w' :"
-#: ../Scooby-Do/data/messages:95
+#: ../Scooby-Do/data/messages:93
msgid "Favorite application(s) starting with 'x' :"
msgstr "Aplicaciones preferidas que empiecen con 'x' :"
-#: ../Scooby-Do/data/messages:97
+#: ../Scooby-Do/data/messages:95
msgid "Favorite application(s) starting with 'y' :"
msgstr "Aplicaciones preferidas que empiecen con 'y' :"
-#: ../Scooby-Do/data/messages:99
+#: ../Scooby-Do/data/messages:97
msgid "Favorite application(s) starting with 'z' :"
msgstr "Aplicaciones preferidas que empiecen con 'z' :"
-#: ../Scooby-Do/data/messages:109
+#: ../Scooby-Do/data/messages:107
msgid "Propose some web search engines ?"
msgstr "Proponer buscadores Web?"
-#: ../Scooby-Do/data/messages:111
+#: ../Scooby-Do/data/messages:109
msgid "It can launch commands and even do some calculations."
msgstr "Puede ejecutar comandos e incluso hacer ciertos cálculos."
-#: ../Scooby-Do/data/messages:115
+#: ../Scooby-Do/data/messages:113
msgid "Help"
msgstr "Ayuda"
@@ -5523,7 +5477,7 @@
#: ../Status-Notifier/data/messages:93
msgid "Display items in compact mode?"
-msgstr ""
+msgstr "¿Mostrar elementos en modo compacto?"
#: ../System-Monitor/data/messages:115 ../powermanager/data/messages:117
msgid "It's the colour of the graphic for high values."
@@ -5895,28 +5849,44 @@
msgstr "Tipo de letra:"
#: ../clock/data/messages:147
+msgid "Layout of the text:"
+msgstr "Estilo del texto:"
+
+#: ../clock/data/messages:149
+msgid "Automatic"
+msgstr "AutomaÌtico"
+
+#: ../clock/data/messages:151
+msgid "On 1 line"
+msgstr "En 1 linea"
+
+#: ../clock/data/messages:153
+msgid "On 2 lines"
+msgstr "En 2 lineas"
+
+#: ../clock/data/messages:155
msgid "Ratio to apply on text :"
msgstr "Relación a aplicar en el texto:"
-#: ../clock/data/messages:151
+#: ../clock/data/messages:159
msgid "Configure time and date"
msgstr "Configure fecha y hora"
-#: ../clock/data/messages:153
+#: ../clock/data/messages:161
msgid "Leave empty to use the default command."
msgstr "Deje vacÃo para usar el comando predeterminado."
-#: ../clock/data/messages:155
+#: ../clock/data/messages:163
msgid "Specific command to run:"
msgstr "Especificar comando a ejecutar:"
-#: ../clock/data/messages:159
+#: ../clock/data/messages:167
msgid ""
"The new alarm will be added to the end / the last alarm will be removed."
msgstr ""
"La nueva alarma será añadida al final / la última alarma será eliminada."
-#: ../clock/data/messages:161
+#: ../clock/data/messages:169
msgid "Add or remove an alarm:"
msgstr "Agregar o eliminar una alarma:"
@@ -6929,7 +6899,7 @@
#: ../mail/data/messages:125
msgid "Show '0' if there is no mail?"
-msgstr ""
+msgstr "¿Mostrar '0' si no hay correo?"
#: ../mail/data/messages:127
msgid "Mail application"
@@ -7001,7 +6971,7 @@
#: ../musicPlayer/data/messages:107
msgid "GMusicBrowser"
-msgstr ""
+msgstr "Explorador GMusic"
#: ../musicPlayer/data/messages:109
msgid "Guayadeque"
@@ -7621,18 +7591,6 @@
msgid "Manual order"
msgstr "Orden manual"
-#: ../stack/data/messages:135
-msgid ""
-"It is the selection made by the mouse, as opposed to usual ctrl+c/ctrl+v "
-"clipboard"
-msgstr ""
-"Es la selección realizada con el ratón, en lugar del Ctrl+c/Ctrl+v del "
-"portapapeles."
-
-#: ../stack/data/messages:137
-msgid "When copying/pasting/cutting, use the selection clipboard?"
-msgstr "Al copiar/pegar/cortar, usar la selección del portapapeles?"
-
#: ../stacks/data/messages:91
msgid "Directory & Options"
msgstr "Directorio y opciones"
@@ -8123,6 +8081,12 @@
#~ msgid "Free"
#~ msgstr "Libre"
+#~ msgid "Quick launch"
+#~ msgstr "Inicio rápido"
+
+#~ msgid "Monitor System"
+#~ msgstr "Sistema de monitor"
+
#~ msgid ""
#~ "A Gnome-Do-like plug-in that lets you control your dock from the keyboard.\n"
#~ "It has 2 modes, each one being triggered by a keyboard shortcut:\n"
@@ -8206,6 +8170,9 @@
#~ msgid "showDesklets"
#~ msgstr "MostrarComplementosDelEscritorio"
+#~ msgid "Open folder"
+#~ msgstr "Abrir carpeta"
+
#~ msgid "in seconds"
#~ msgstr "En segundos"
@@ -8320,6 +8287,9 @@
#~ msgid "By default, this option is activated"
#~ msgstr "Por defecto esta opción está activada"
+#~ msgid "Add a desktop"
+#~ msgstr "Agregar un escritorio"
+
#~ msgid "Foreground image :"
#~ msgstr "Imagen de frente:"
@@ -8341,6 +8311,9 @@
#~ msgid "Icons size :"
#~ msgstr "Tamaño de los iconos:"
+#~ msgid "Hey, you there!"
+#~ msgstr "¡Oye tú!"
+
#~ msgid "ToolTip"
#~ msgstr "sugerencia"
@@ -8359,6 +8332,59 @@
#~ msgid "Alert when battery charge is critical?"
#~ msgstr "Avisar cuando la carga de la baterÃa sea crÃtica."
+#~ msgid ""
+#~ "This plug-in allows you to make different actions directly from the "
+#~ "keyboard.\n"
+#~ "It has 2 modes, each one being triggered by a keyboard shortcut:\n"
+#~ "\n"
+#~ "- the finder mode (default shortcut : CTRL + Enter) :\n"
+#~ " It lets you find and launch applications, files, recent files, firefox "
+#~ "bookmarks, commands, and even calculations.\n"
+#~ " Type what you want to search, the results will be displayed in real "
+#~ "time.\n"
+#~ " The first results of each category are displayed in the main listing.\n"
+#~ " Use the up/down arrows to navigate inside the list,\n"
+#~ " and use the left/right arrows to enter into a category, or to display "
+#~ "more actions (when a little arrow is drawn next to text).\n"
+#~ " Once inside a category, you can filter the results by typing some "
+#~ "letters.\n"
+#~ " Press Enter to validate, maintain SHIFT or ALT to keep the list of "
+#~ "results opened.\n"
+#~ "\n"
+#~ "- the navigation mode (default shortcut : CTRL + F9) :\n"
+#~ " use the arrows to navigate into the docks and sub-docks,\n"
+#~ " or type the name of a launcher and press Tab to automatically jump to "
+#~ "the next suitable launcher\n"
+#~ " press Enter to click on the icon, Shift+Enter for Shift+click, Alt+Enter "
+#~ "for middle click, and Ctrl+Enter for left click\n"
+#~ "Escape or the same shortkey will cancel."
+#~ msgstr ""
+#~ "Esta mini-aplicación le permite hacer diferentes acciones directamente desde "
+#~ "el teclado.\n"
+#~ "Tiene dos modos, cada uno de ellos activado por un atajo de teclado:\n"
+#~ "\n"
+#~ "-El modo búsqueda (atajo predeterminado: Ctrl+Intro):\n"
+#~ " Le permite encontrar y ejecutar aplicaciones, archivos, archivos "
+#~ "recientes, marcadores, comandos e incluso cálculos.\n"
+#~ " Escriba lo que quiere buscar, los resultados se mostrarán en tiempo "
+#~ "real.\n"
+#~ " Los primeros resultados de cada categorÃa se muestran en la lista "
+#~ "principal.\n"
+#~ " Use las flechas arriba/abajo para entrar en una categorÃa, o para "
+#~ "mostrar mas acciones (cuando aparezca una pequeña flecha junto al texto).\n"
+#~ " Una vez dentro de una categorÃa. puede filtrar los resultados "
+#~ "escribiendo algo de texto.\n"
+#~ " Pulse Intro para validar, mantenga Shift o Alt para mantener la lista de "
+#~ "resultados abierta.\n"
+#~ "\n"
+#~ "-El modo de navegación (atajo predeterminado: Ctrl+F9):\n"
+#~ " utilice las flechas para navegar entre las barras y sub-barras,\n"
+#~ " o escriba el nombre de un lanzador y presione Tab para automáticamente "
+#~ "saltar al siguiente lanzador adecuado\n"
+#~ " presione Intro para hacer clic en el icono, Shift+Intro para Shift+clic, "
+#~ "Alt+Intro para clic medio, y Ctrl+Intro para clic izquierdo\n"
+#~ "Esc cancela."
+
#, c-format
#~ msgid "You are about to delete all files in %s. Continue?"
#~ msgstr "¿Está seguro de querer eliminar todos los archivos en %s?"
@@ -8373,6 +8399,9 @@
#~ "Si '%s' no es su explorador de archivos predefinido\n"
#~ "puede cambiar esta configuración en el panel de este módulo."
+#~ msgid "Remove last desktop"
+#~ msgstr "Eliminar ultimo escritorio"
+
#~ msgid "Specify a title :"
#~ msgstr "Especificar un tÃtulo:"
@@ -8403,6 +8432,12 @@
#~ msgid "Doncky"
#~ msgstr "Doncky"
+#~ msgid "Move current Desktop to this Desktop"
+#~ msgstr "Mover el escritorio actual a este escritorio"
+
+#~ msgid "Shortkey to enable/disable the navigation mode:"
+#~ msgstr "Atajo del teclado para activar/desactivar la modalidad navegador:"
+
#~ msgid "Choose an action for middle click on the icon:"
#~ msgstr ""
#~ "Seleccione una acción para la pulsación con el botón intermedio del ratón en "
@@ -8477,6 +8512,16 @@
#~ msgid "Delay between measurements:"
#~ msgstr "Intervalo entre mediciones:"
+#~ msgid ""
+#~ "It is the selection made by the mouse, as opposed to usual ctrl+c/ctrl+v "
+#~ "clipboard"
+#~ msgstr ""
+#~ "Es la selección realizada con el ratón, en lugar del Ctrl+c/Ctrl+v del "
+#~ "portapapeles."
+
+#~ msgid "When copying/pasting/cutting, use the selection clipboard?"
+#~ msgstr "Al copiar/pegar/cortar, usar la selección del portapapeles?"
+
#~ msgid "Name of an image for the 'empty' icon :"
#~ msgstr "Nombre de la imagen para el icono «vacÃo»:"
@@ -8555,6 +8600,17 @@
#~ msgstr "Menús de indicadores"
#~ msgid ""
+#~ "A <b>notification area</b> for your dock\n"
+#~ "Also called 'systray'.\n"
+#~ "It is designed to work on any desktop that supports the latest systray "
+#~ "specifications (KDE, Gnome, etc)"
+#~ msgstr ""
+#~ "Un <b>área de notificación</b> para su dock\n"
+#~ "También llamando «bandeja del sistema».\n"
+#~ "Está diseñado para funcionar en cualquier escritorio que soporte las últimas "
+#~ "especificaciones de la bandeja del sistema (KDE, Gnome, etc)"
+
+#~ msgid ""
#~ "e size=true\n"
#~ "F[Decorations;gtk-orientation-portrait]"
#~ msgstr ""
@@ -8566,12 +8622,3 @@
#~ msgid "On Widget Layer"
#~ msgstr "Sobre la capa de Widgets"
-
-#~ msgid "Add a workspace"
-#~ msgstr "Agregar un escritorio"
-
-#~ msgid "Remove last workspace"
-#~ msgstr "Eliminar ultimo escritorio"
-
-#~ msgid "Move current workspace to this workspace"
-#~ msgstr "Mover el escritorio actual a este escritorio"
=== modified file 'po/et.po'
--- po/et.po 2010-09-07 00:39:20 +0000
+++ po/et.po 2010-09-22 10:43:43 +0000
@@ -6,15 +6,15 @@
msgid ""
msgstr ""
"Project-Id-Version: cairo-dock-plug-ins\n"
-"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2010-08-29 00:59+0000\n"
-"PO-Revision-Date: 2010-09-05 18:22+0000\n"
-"Last-Translator: lyyser <Unknown>\n"
+"Report-Msgid-Bugs-To: fabounet@xxxxxxxxxxxx\n"
+"POT-Creation-Date: 2010-09-13 00:36+0000\n"
+"PO-Revision-Date: 2010-09-17 16:30+0000\n"
+"Last-Translator: olavi tohver <Unknown>\n"
"Language-Team: Estonian <et@xxxxxx>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-09-06 05:07+0000\n"
+"X-Launchpad-Export-Date: 2010-09-18 05:35+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#: ../Animated-icons/src/applet-init.c:32
@@ -135,29 +135,25 @@
msgid "For Aiur!"
msgstr ""
-#: ../Cairo-Penguin/src/applet-notifications.c:123
-msgid "Hey, you there!"
-msgstr "Hei sina seal!"
-
-#: ../Cairo-Penguin/src/applet-notifications.c:127
+#: ../Cairo-Penguin/src/applet-notifications.c:126
msgid "Wake up"
msgstr "Äratus"
-#: ../Cairo-Penguin/src/applet-notifications.c:131
+#: ../Cairo-Penguin/src/applet-notifications.c:130
msgid "Keep quiet"
msgstr "Ole vait"
-#: ../Cairo-Penguin/src/applet-notifications.c:134
-#: ../Scooby-Do/data/messages:101
+#: ../Cairo-Penguin/src/applet-notifications.c:133
+#: ../Scooby-Do/data/messages:99
msgid "Start XPenguins"
msgstr "Käivita XPenguins"
-#: ../Cairo-Penguin/src/applet-notifications.c:135
+#: ../Cairo-Penguin/src/applet-notifications.c:134
msgid "Stop XPenguins"
msgstr "Sule XPenguins"
-#: ../Cairo-Penguin/src/applet-notifications.c:158
-#: ../Cairo-Penguin/src/applet-notifications.c:160
+#: ../Cairo-Penguin/src/applet-notifications.c:157
+#: ../Cairo-Penguin/src/applet-notifications.c:159
msgid "Zzzzz"
msgstr "Zzzzz"
@@ -180,7 +176,7 @@
msgid "Clipboard history"
msgstr "Lõikepuhvri ajalugu"
-#: ../Clipper/src/applet-notifications.c:99
+#: ../Clipper/src/applet-notifications.c:101
msgid ""
"No persistent items.\n"
"You can add some by drag and dropping some text on the icon."
@@ -320,33 +316,37 @@
"Kontrolli faili õiguseid \n"
"ja et nimi juba ei eksisteeri."
-#: ../Folders/src/applet-notifications.c:319
-msgid "Open with"
-msgstr "Ava koos"
-
-#: ../Folders/src/applet-notifications.c:352
+#: ../Folders/src/applet-notifications.c:322
+msgid "Open the folder (middle-click)"
+msgstr "Ava kaust ( keskmine hiireklahv)"
+
+#: ../Folders/src/applet-notifications.c:328
+msgid "Rename this file"
+msgstr "Nimet ümber see fail"
+
+#: ../Folders/src/applet-notifications.c:329
msgid "Delete this file"
msgstr "Kustuta see fail"
-#: ../Folders/src/applet-notifications.c:354
-msgid "Rename this file"
-msgstr "Nimet ümber see fail"
-
-#: ../Folders/src/applet-notifications.c:356
+#: ../Folders/src/applet-notifications.c:330
msgid "Move this file"
msgstr "Liiguta seda faili"
-#: ../Folders/src/applet-notifications.c:358
+#: ../Folders/src/applet-notifications.c:336
+msgid "Open with"
+msgstr "Ava koos"
+
+#: ../Folders/src/applet-notifications.c:370
msgid "Properties"
msgstr "Seaded"
-#: ../Folders/src/applet-notifications.c:360
+#: ../Folders/src/applet-notifications.c:373
msgid "Create a new file"
msgstr "Loo uus fail"
-#: ../Folders/src/applet-notifications.c:364
-msgid "Open the folder (middle-click)"
-msgstr "Ava kaust ( keskmine hiireklahv)"
+#: ../Folders/src/applet-notifications.c:374
+msgid "Create a new folder"
+msgstr "Loo uus kataloog"
#: ../GMenu/src/applet-init.c:33
msgid ""
@@ -366,15 +366,15 @@
msgid "Applications Menu"
msgstr "Rakenduste menüü"
-#: ../GMenu/src/applet-notifications.c:147
-msgid "Quick launch"
-msgstr "Kiirkäivitus"
+#: ../GMenu/src/applet-notifications.c:75
+msgid "Quick launch (Middle-click)"
+msgstr "Kiirkäivitus (Keskmine hiireklikk)"
-#: ../GMenu/src/applet-notifications.c:148
+#: ../GMenu/src/applet-notifications.c:77
msgid "Configure menu"
msgstr "Seadete menüü"
-#: ../GMenu/src/applet-notifications.c:149
+#: ../GMenu/src/applet-notifications.c:80
msgid "Clear recent"
msgstr "Tühjenda hiljutised"
@@ -386,7 +386,7 @@
msgid "Clear the list of the recently used documents?"
msgstr "Tühjendan hiljuti kasutatud dokumendid?"
-#: ../GMenu/src/applet-run-dialog.c:349 ../Scooby-Do/data/messages:113
+#: ../GMenu/src/applet-run-dialog.c:349 ../Scooby-Do/data/messages:111
msgid "Enter a command to launch:"
msgstr "Sisesta käsk käivitamiseks:"
@@ -541,12 +541,17 @@
"Left-click to pop-up some info,Scroll on the icon to switch the display "
"between net speed and wifi."
msgstr ""
+"See vidin lubab sul jälgida võrguühendusi.\n"
+"Vidin võimaldab kuvada alla/üleslaadimiskiirusi ja wifi signaalikvaliteeti.\n"
+"Kui võrguhaldur töötab, siis on võimalik valida wifi võrke.\n"
+"Vasak hiireklahv kuvab mõningast infot. Ikoonil kerimine võimaldab vahetada "
+"võrgu kiiruse ja võrgu nime kuvamise vahel."
#: ../Network-Monitor/src/applet-netspeed.c:42
#: ../Network-Monitor/src/applet-netspeed.c:50
#: ../netspeed/src/applet-netspeed.c:42 ../netspeed/src/applet-netspeed.c:50
msgid "B"
-msgstr ""
+msgstr "B"
#: ../Network-Monitor/src/applet-netspeed.c:58
#: ../netspeed/src/applet-netspeed.c:58
@@ -577,12 +582,12 @@
msgstr "Laadimine"
#: ../Network-Monitor/src/applet-notifications.c:100
-#: ../wifi/src/applet-notifications.c:75
+#: ../wifi/src/applet-notifications.c:76
msgid "Check for Wireless Extension"
msgstr ""
#: ../Network-Monitor/src/applet-notifications.c:101
-#: ../wifi/src/applet-notifications.c:76
+#: ../wifi/src/applet-notifications.c:77
msgid "Network Administration"
msgstr "Võrgu administraator"
@@ -732,7 +737,7 @@
#: ../Scooby-Do/src/applet-backend-files.c:243
msgid "Mail file"
-msgstr ""
+msgstr "E-posti fail"
#: ../Scooby-Do/src/applet-backend-files.c:390
msgid "Pick up a directory"
@@ -751,16 +756,16 @@
msgstr "Ava uues aknas"
#: ../Scooby-Do/src/applet-backend-firefox.c:433
-#: ../dnd2share/src/applet-notifications.c:461
+#: ../dnd2share/src/applet-notifications.c:470
msgid "Open file"
msgstr "Ava fail"
#: ../Scooby-Do/src/applet-backend-firefox.c:496
-#: ../Scooby-Do/data/messages:105
+#: ../Scooby-Do/data/messages:103
msgid "Firefox bookmarks"
msgstr "Firefox'i järjehoidjad"
-#: ../Scooby-Do/src/applet-backend-recent.c:212 ../Scooby-Do/data/messages:107
+#: ../Scooby-Do/src/applet-backend-recent.c:212 ../Scooby-Do/data/messages:105
msgid "Recent files"
msgstr "Viimati kasutatud"
@@ -788,35 +793,6 @@
msgid "Amazon"
msgstr "Amazon"
-#: ../Scooby-Do/src/applet-init.c:39
-msgid ""
-"This plug-in allows you to make different actions directly from the "
-"keyboard.\n"
-"It has 2 modes, each one being triggered by a keyboard shortcut:\n"
-"\n"
-"- the finder mode (default shortcut : CTRL + Enter) :\n"
-" It lets you find and launch applications, files, recent files, firefox "
-"bookmarks, commands, and even calculations.\n"
-" Type what you want to search, the results will be displayed in real "
-"time.\n"
-" The first results of each category are displayed in the main listing.\n"
-" Use the up/down arrows to navigate inside the list,\n"
-" and use the left/right arrows to enter into a category, or to display "
-"more actions (when a little arrow is drawn next to text).\n"
-" Once inside a category, you can filter the results by typing some "
-"letters.\n"
-" Press Enter to validate, maintain SHIFT or ALT to keep the list of "
-"results opened.\n"
-"\n"
-"- the navigation mode (default shortcut : CTRL + F9) :\n"
-" use the arrows to navigate into the docks and sub-docks,\n"
-" or type the name of a launcher and press Tab to automatically jump to "
-"the next suitable launcher\n"
-" press Enter to click on the icon, Shift+Enter for Shift+click, Alt+Enter "
-"for middle click, and Ctrl+Enter for left click\n"
-"Escape or the same shortkey will cancel."
-msgstr ""
-
#: ../Scooby-Do/src/applet-listing.c:510
msgid "(F1) Match case"
msgstr "(F1) Tõstutundlik"
@@ -863,23 +839,17 @@
msgid "Searching ..."
msgstr "Otsin ..."
-#: ../Scooby-Do/src/applet-session.c:50
+#: ../Scooby-Do/src/applet-session.c:62
msgid "Enter your search"
msgstr "Sisesta oma otsing"
-#: ../Status-Notifier/src/applet-init.c:31
+#: ../Status-Notifier/src/applet-init.c:32
msgid "Status Notifier"
msgstr "Oleku teavitus"
-#: ../Status-Notifier/src/applet-init.c:34
-msgid ""
-"A <b>notification area</b> for your dock\n"
-"Also called 'systray'.\n"
-"It is designed to work on any desktop that supports the latest systray "
-"specifications (KDE, Gnome, etc)"
-msgstr ""
-
#: ../System-Monitor/src/applet-init.c:30
+#: ../System-Monitor/src/applet-notifications.c:116
+#: ../netspeed/src/applet-notifications.c:72
msgid "System Monitor"
msgstr "Süsteemi jälgija"
@@ -946,7 +916,7 @@
#: ../System-Monitor/src/applet-notifications.c:81
msgid "Activity time"
-msgstr ""
+msgstr "Aktiivsusaeg"
#: ../System-Monitor/src/applet-notifications.c:82
msgid "Memory"
@@ -964,19 +934,15 @@
msgid "Buffers"
msgstr "Puhvrid"
-#: ../System-Monitor/src/applet-notifications.c:115
-#: ../netspeed/src/applet-notifications.c:70
-msgid "Monitor System"
-msgstr "Süsteemi jälgija"
-
#: ../System-Monitor/src/applet-nvidia.c:141
+#: ../System-Monitor/src/applet-sensors.c:161
#, c-format
msgid "Alert! Graphic Card core temperature has reached %d°C"
msgstr "Häire! Graafikakaardi tuuma temperatuur on saavutanud %d°C"
#: ../Toons/src/applet-init.c:29
msgid "Toons"
-msgstr ""
+msgstr "Multikad"
#: ../Toons/src/applet-init.c:32
msgid "This applet displays a toon that will look at your mouse."
@@ -998,9 +964,9 @@
#: ../Xgamma/src/applet-notifications.c:36 ../Xgamma/src/applet-xgamma.c:159
msgid "Set up gamma:"
-msgstr ""
+msgstr "Seadista gamma"
-#: ../Xgamma/src/applet-notifications.c:61
+#: ../Xgamma/src/applet-notifications.c:62
msgid "Apply current luminosity on startup"
msgstr ""
@@ -1050,155 +1016,122 @@
msgid "Set up volume:"
msgstr ""
-#: ../alsaMixer/src/applet-notifications.c:57
+#: ../alsaMixer/src/applet-notifications.c:58
msgid "Adjust channels"
msgstr "Reguleeri kanaleid"
#: ../alsaMixer/src/applet-notifications.c:59
-msgid "Unmute"
-msgstr ""
-
-#: ../alsaMixer/src/applet-notifications.c:61
-msgid "Mute"
-msgstr ""
-
-#: ../clock/src/applet-calendar.c:190 ../clock/src/applet-calendar.c:271
-#: ../clock/src/applet-calendar.c:437 ../clock/src/applet-calendar.c:442
-#: ../clock/src/applet-draw.c:83 ../clock/src/applet-draw.c:339
-#: ../clock/src/applet-draw.c:353 ../clock/src/applet-draw.c:374
-#: ../clock/src/applet-task-editor.c:119
+msgid "Unmute (middle-click)"
+msgstr ""
+
+#: ../alsaMixer/src/applet-notifications.c:59
+msgid "Mute (middle-click)"
+msgstr "Vaigista (keskmine hiireklikk)"
+
+#: ../clock/src/applet-calendar.c:193 ../clock/src/applet-calendar.c:274
+#: ../clock/src/applet-calendar.c:519 ../clock/src/applet-calendar.c:524
+#: ../clock/src/applet-task-editor.c:119 ../clock/src/applet-timer.c:84
+#: ../clock/src/applet-timer.c:172 ../clock/src/applet-timer.c:454
+#: ../clock/src/applet-timer.c:471 ../clock/src/applet-timer.c:491
msgid "No title"
msgstr "Pealkirja pole"
-#: ../clock/src/applet-calendar.c:438
+#: ../clock/src/applet-calendar.c:520
msgid "years"
msgstr "aastad"
-#: ../clock/src/applet-calendar.c:555
+#: ../clock/src/applet-calendar.c:637
msgid "Calendar and tasks"
msgstr "Kalender ja ülesanded"
-#: ../clock/src/applet-config.c:35 ../clock/data/messages:157
+#: ../clock/src/applet-config.c:36 ../clock/data/messages:165
msgid "Alarm"
msgstr "Alarm"
-#: ../clock/src/applet-config.c:35
+#: ../clock/src/applet-config.c:36
msgid "Time you want to be notified:"
msgstr ""
-#: ../clock/src/applet-config.c:35
+#: ../clock/src/applet-config.c:36
msgid "In the form xx:xx. E.g.: 20:35 for 8:35pm"
-msgstr ""
+msgstr "Vormingus xx:xx. Nt. 8:35pm on 20:35"
-#: ../clock/src/applet-config.c:35
+#: ../clock/src/applet-config.c:36
msgid "Never"
msgstr "Mitte kunagi"
-#: ../clock/src/applet-config.c:35
+#: ../clock/src/applet-config.c:36
msgid "Day"
msgstr "Päev"
-#: ../clock/src/applet-config.c:35 ../weather/src/applet-load-icons.c:26
+#: ../clock/src/applet-config.c:36 ../weather/src/applet-load-icons.c:26
msgid "Monday"
msgstr "Esmaspäev"
-#: ../clock/src/applet-config.c:35 ../weather/src/applet-load-icons.c:26
+#: ../clock/src/applet-config.c:36 ../weather/src/applet-load-icons.c:26
msgid "Tuesday"
msgstr "Teisipäev"
-#: ../clock/src/applet-config.c:35 ../weather/src/applet-load-icons.c:26
+#: ../clock/src/applet-config.c:36 ../weather/src/applet-load-icons.c:26
msgid "Wednesday"
msgstr "Kolmapäev"
-#: ../clock/src/applet-config.c:35 ../weather/src/applet-load-icons.c:26
+#: ../clock/src/applet-config.c:36 ../weather/src/applet-load-icons.c:26
msgid "Thursday"
msgstr "Neljapäev"
-#: ../clock/src/applet-config.c:35 ../weather/src/applet-load-icons.c:26
+#: ../clock/src/applet-config.c:36 ../weather/src/applet-load-icons.c:26
msgid "Friday"
msgstr "Reede"
-#: ../clock/src/applet-config.c:35 ../weather/src/applet-load-icons.c:26
+#: ../clock/src/applet-config.c:36 ../weather/src/applet-load-icons.c:26
msgid "Saturday"
msgstr "Laupäev"
-#: ../clock/src/applet-config.c:35 ../weather/src/applet-load-icons.c:26
+#: ../clock/src/applet-config.c:36 ../weather/src/applet-load-icons.c:26
msgid "Sunday"
msgstr "Pühapäev"
-#: ../clock/src/applet-config.c:35
+#: ../clock/src/applet-config.c:36
msgid "Week Day"
msgstr "Nädalapäev"
-#: ../clock/src/applet-config.c:35
+#: ../clock/src/applet-config.c:36
msgid "Week End"
msgstr "Nädala lõpp"
-#: ../clock/src/applet-config.c:35
+#: ../clock/src/applet-config.c:36
msgid "Month"
msgstr "Kuu"
-#: ../clock/src/applet-config.c:35
+#: ../clock/src/applet-config.c:36
msgid "Repeat every:"
msgstr "Korda iga:"
-#: ../clock/src/applet-config.c:35
+#: ../clock/src/applet-config.c:36
msgid "If every month, which day of the month?"
msgstr ""
-#: ../clock/src/applet-config.c:35
+#: ../clock/src/applet-config.c:36
msgid "Message you want to use to be notified:"
msgstr ""
-#: ../clock/src/applet-config.c:35
+#: ../clock/src/applet-config.c:36
msgid "Tea Time!"
-msgstr ""
+msgstr "Teejoomise aeg!"
-#: ../clock/src/applet-config.c:35
+#: ../clock/src/applet-config.c:36
msgid "Command to launch:"
msgstr ""
-#: ../clock/src/applet-config.c:35
+#: ../clock/src/applet-config.c:36
msgid "E.g.:"
msgstr "Nt. :"
-#: ../clock/src/applet-config.c:492 ../weather/src/applet-config.c:180
+#: ../clock/src/applet-config.c:495 ../weather/src/applet-config.c:180
msgid "Search for your location :"
msgstr "Otsi oma asukoht:"
-#: ../clock/src/applet-draw.c:54
-msgid "1mn"
-msgstr ""
-
-#: ../clock/src/applet-draw.c:59
-msgid "1h"
-msgstr "1t"
-
-#: ../clock/src/applet-draw.c:82
-msgid "The following task was scheduled at"
-msgstr ""
-
-#: ../clock/src/applet-draw.c:85 ../clock/src/applet-draw.c:355
-#: ../clock/src/applet-draw.c:376
-msgid "Repeat this message every:"
-msgstr "Korda seda teadet iga:"
-
-#: ../clock/src/applet-draw.c:338
-msgid "This task will begin in 15 minutes:"
-msgstr ""
-
-#: ../clock/src/applet-draw.c:352
-msgid "It's time for the following task:"
-msgstr ""
-
-#: ../clock/src/applet-draw.c:373
-msgid "Today is the following anniversary:"
-msgstr "Täna on järgmine tähtpäev:"
-
-#: ../clock/src/applet-draw.c:373
-msgid "Tomorrow is the following anniversary:"
-msgstr "Homme on järgmine tähtpäev:"
-
#: ../clock/src/applet-init.c:35
msgid "clock"
msgstr "kell"
@@ -1232,18 +1165,18 @@
"double-clicking on a day."
msgstr ""
-#: ../clock/src/applet-notifications.c:90
-msgid "Set up time and date"
-msgstr "Sea kellaeg ja kuupäeva"
-
-#: ../clock/src/applet-notifications.c:91
+#: ../clock/src/applet-notifications.c:92
msgid "Show today's tasks"
msgstr "Näita tänaseid tegevusi"
-#: ../clock/src/applet-notifications.c:92
+#: ../clock/src/applet-notifications.c:93
msgid "Show this week's tasks"
msgstr "Näita selle nädala ülesandeid"
+#: ../clock/src/applet-notifications.c:96
+msgid "Set up time and date"
+msgstr "Sea kellaeg ja kuupäeva"
+
#: ../clock/src/applet-task-editor.c:156
msgid "Add a new task"
msgstr "Lisa uus ülesanne"
@@ -1299,6 +1232,43 @@
msgid "Tags"
msgstr "Sildid"
+#: ../clock/src/applet-timer.c:55
+msgid "1mn"
+msgstr "1 min"
+
+#: ../clock/src/applet-timer.c:60
+msgid "1h"
+msgstr "1t"
+
+#: ../clock/src/applet-timer.c:83
+msgid "The following task was scheduled at"
+msgstr ""
+
+#: ../clock/src/applet-timer.c:86 ../clock/src/applet-timer.c:456
+#: ../clock/src/applet-timer.c:493
+msgid "Repeat this message every:"
+msgstr "Korda seda teadet iga:"
+
+#: ../clock/src/applet-timer.c:170
+msgid "The following task has felt due:"
+msgstr ""
+
+#: ../clock/src/applet-timer.c:453
+msgid "It's time for the following task:"
+msgstr ""
+
+#: ../clock/src/applet-timer.c:470
+msgid "This task will begin in 15 minutes:"
+msgstr ""
+
+#: ../clock/src/applet-timer.c:490
+msgid "Today is the following anniversary:"
+msgstr "Täna on järgmine tähtpäev:"
+
+#: ../clock/src/applet-timer.c:490
+msgid "Tomorrow is the following anniversary:"
+msgstr "Homme on järgmine tähtpäev:"
+
#: ../compiz-icon/src/applet-init.c:31
msgid "compiz-icon"
msgstr ""
@@ -1311,15 +1281,19 @@
"You can bind one of these actions with the middle-click.\n"
"The configuration panel gives you some options to launch Compiz."
msgstr ""
+"See vidin lubab sul hallata compiz-i ja teisi aknahaldureid. Alamdokk\n"
+"annab ligipääsu CCSM-le, Emeraldile ja mõnele Compiz seadistusele.\n"
+"Võite seostada keskmise hiireklikki ühele neist toimingutest.\n"
+"Seadistupaneel pakub Compiz-i käivitamiseks valikuid."
#: ../compiz-icon/src/applet-load-icon.c:31
msgid "Configure Compiz"
-msgstr ""
+msgstr "Seadista Compiz-i"
#: ../compiz-icon/src/applet-load-icon.c:31
-#: ../compiz-icon/src/applet-notifications.c:178
+#: ../compiz-icon/src/applet-notifications.c:180
msgid "Emerald Manager"
-msgstr ""
+msgstr "Emeraldi haldur"
#: ../compiz-icon/src/applet-load-icon.c:31
msgid "Reload WM"
@@ -1331,7 +1305,7 @@
#: ../compiz-icon/src/applet-load-icon.c:31 ../compiz-icon/data/messages:99
msgid "Widget Layer"
-msgstr ""
+msgstr "Vidinate kiht"
#: ../compiz-icon/src/applet-notifications.c:94
msgid ""
@@ -1339,27 +1313,27 @@
" through your package manager (Synaptic, YasT, etc)"
msgstr ""
-#: ../compiz-icon/src/applet-notifications.c:179
+#: ../compiz-icon/src/applet-notifications.c:181
msgid "Reload Emerald"
msgstr ""
-#: ../compiz-icon/src/applet-notifications.c:183
+#: ../compiz-icon/src/applet-notifications.c:184
msgid "Switch Windows Manager"
msgstr "Lülita Windows Manager"
-#: ../compiz-icon/src/applet-notifications.c:184
+#: ../compiz-icon/src/applet-notifications.c:185
msgid "Switch Windows Decorator"
msgstr "Lülita Windows Decorator"
-#: ../compiz-icon/src/applet-notifications.c:193
+#: ../compiz-icon/src/applet-notifications.c:194
msgid "Toggle Exposition Mode"
msgstr ""
-#: ../compiz-icon/src/applet-notifications.c:194
+#: ../compiz-icon/src/applet-notifications.c:195
msgid "Toggle Widget Layer"
msgstr ""
-#: ../compiz-icon/src/applet-notifications.c:196
+#: ../compiz-icon/src/applet-notifications.c:198
msgid "Toggle Show Desktop"
msgstr ""
@@ -1532,17 +1506,21 @@
msgstr "Saada lõikepuhvri sisu"
#: ../dnd2share/src/applet-notifications.c:398
-msgid "Clear History"
-msgstr "Puhasta ajalugu"
+msgid "History"
+msgstr ""
-#: ../dnd2share/src/applet-notifications.c:463
+#: ../dnd2share/src/applet-notifications.c:472
msgid "Get text"
msgstr "Hangi tekst"
-#: ../dnd2share/src/applet-notifications.c:465
+#: ../dnd2share/src/applet-notifications.c:474
msgid "Remove from history"
msgstr "Eemalda ajalugu"
+#: ../dnd2share/src/applet-notifications.c:477
+msgid "Clear History"
+msgstr "Puhasta ajalugu"
+
#: ../dock-rendering/src/rendering-init.c:34
msgid "Caroussel"
msgstr ""
@@ -1647,29 +1625,29 @@
msgid "Counting total size and files number..."
msgstr ""
-#: ../dustbin/src/applet-notifications.c:136
+#: ../dustbin/src/applet-notifications.c:117
msgid "Show Trash (click)"
msgstr ""
-#: ../dustbin/src/applet-notifications.c:137
+#: ../dustbin/src/applet-notifications.c:118
msgid "Empty Trash (middle-click)"
msgstr ""
-#: ../dustbin/src/applet-notifications.c:139
+#: ../dustbin/src/applet-notifications.c:120
msgid "Display dustbins information"
msgstr "Näita prügikastide infot"
-#: ../dustbin/src/applet-notifications.c:151
+#: ../dustbin/src/applet-notifications.c:133
#, c-format
msgid "%s successfully unmounted"
msgstr "%s edukalt lahtihaagitud"
-#: ../dustbin/src/applet-notifications.c:155
+#: ../dustbin/src/applet-notifications.c:137
#, c-format
msgid "failed to unmount %s"
msgstr ""
-#: ../dustbin/src/applet-notifications.c:179
+#: ../dustbin/src/applet-notifications.c:161
#: ../shortcuts/src/applet-notifications.c:167
msgid "Unmouting this volume ..."
msgstr ""
@@ -1776,11 +1754,11 @@
" (you can invert the buttons if you prefer to shutdown on left-click)."
msgstr ""
-#: ../logout/src/applet-notifications.c:101
+#: ../logout/src/applet-notifications.c:100
msgid "Choose in how many minutes your PC will stop:"
msgstr ""
-#: ../logout/src/applet-notifications.c:126
+#: ../logout/src/applet-notifications.c:125
msgid "Lock screen"
msgstr "Ekraani lukustamine"
@@ -1788,7 +1766,7 @@
msgid "Program an automatic shut-down"
msgstr "Programm automaatselt seiskub"
-#: ../logout/src/applet-notifications.c:158
+#: ../logout/src/applet-notifications.c:159
msgid "Your computer will shut-down in 1 minute."
msgstr ""
@@ -1798,7 +1776,7 @@
#: ../mail/src/cd-mail-applet-accounts.c:39
msgid "myHost"
-msgstr ""
+msgstr "minuMasin"
#: ../mail/src/cd-mail-applet-accounts.c:39
msgid "Username:"
@@ -1936,20 +1914,29 @@
"you can change it in the configuration panel of this module"
msgstr ""
-#: ../mail/src/cd-mail-applet-notifications.c:139
+#: ../mail/src/cd-mail-applet-notifications.c:147
msgid "Refresh a mail account"
msgstr ""
-#: ../mail/src/cd-mail-applet-notifications.c:148
+#: ../mail/src/cd-mail-applet-notifications.c:154
+msgid "Refresh all (Middle-click)"
+msgstr ""
+
+#: ../mail/src/cd-mail-applet-notifications.c:159
+#, c-format
+msgid "Refresh %s"
+msgstr ""
+
+#: ../mail/src/cd-mail-applet-notifications.c:165
msgid "Mark all emails as read"
msgstr ""
-#: ../mail/src/cd-mail-applet-notifications.c:151
+#: ../mail/src/cd-mail-applet-notifications.c:168
#, c-format
msgid "Launch %s"
msgstr "Käivita %s"
-#: ../mail/src/cd-mail-applet-notifications.c:326
+#: ../mail/src/cd-mail-applet-notifications.c:346
msgid "Mail"
msgstr "E-Kiri"
@@ -2018,57 +2005,57 @@
" For Exaile 0.3, you have to activate its MPRIS plug-in"
msgstr ""
-#: ../musicPlayer/src/applet-notifications.c:70
+#: ../musicPlayer/src/applet-notifications.c:74
msgid ""
"Sorry, I couldn't detect any player.\n"
"If it is running, it is maybe because its version is too old and does not "
"offer such service."
msgstr ""
-#: ../musicPlayer/src/applet-notifications.c:162
+#: ../musicPlayer/src/applet-notifications.c:172
msgid "Find opened player"
msgstr ""
-#: ../musicPlayer/src/applet-notifications.c:169
+#: ../musicPlayer/src/applet-notifications.c:179
msgid "Previous"
msgstr "Eelmine"
-#: ../musicPlayer/src/applet-notifications.c:171
+#: ../musicPlayer/src/applet-notifications.c:181
msgid "Play/Pause (left-click)"
msgstr "Mängi/Pausi (vasak-klik)"
-#: ../musicPlayer/src/applet-notifications.c:173
+#: ../musicPlayer/src/applet-notifications.c:183
msgid "Next (middle-click)"
msgstr "Järgmine (kesk-klik)"
-#: ../musicPlayer/src/applet-notifications.c:175
+#: ../musicPlayer/src/applet-notifications.c:185
msgid "Stop"
msgstr "Peata"
-#: ../musicPlayer/src/applet-notifications.c:177
+#: ../musicPlayer/src/applet-notifications.c:189
+msgid "Information"
+msgstr "Info"
+
+#: ../musicPlayer/src/applet-notifications.c:192
msgid "Show the Window"
msgstr "Näita akent"
-#: ../musicPlayer/src/applet-notifications.c:179
+#: ../musicPlayer/src/applet-notifications.c:198
msgid "Show JumpBox"
msgstr "Näita JumpBox'i"
-#: ../musicPlayer/src/applet-notifications.c:181
+#: ../musicPlayer/src/applet-notifications.c:200
msgid "Toggle Shuffle"
msgstr ""
-#: ../musicPlayer/src/applet-notifications.c:183
+#: ../musicPlayer/src/applet-notifications.c:202
msgid "Toggle Repeat"
msgstr ""
-#: ../musicPlayer/src/applet-notifications.c:185
+#: ../musicPlayer/src/applet-notifications.c:204
msgid "Rate this song"
msgstr "Hinda seda laulu"
-#: ../musicPlayer/src/applet-notifications.c:187
-msgid "Information"
-msgstr "Info"
-
#: ../netspeed/src/applet-init.c:29
msgid "netspeed"
msgstr "netikiirus"
@@ -2101,7 +2088,7 @@
" Do you want to do it now?"
msgstr ""
-#: ../netspeed/src/applet-notifications.c:72
+#: ../netspeed/src/applet-notifications.c:76
msgid "Re-check interface"
msgstr ""
@@ -2254,31 +2241,31 @@
msgid "Enter a name for this bookmark:"
msgstr "Sisestage nimi sellele järjehoidjale:"
-#: ../shortcuts/src/applet-notifications.c:250
+#: ../shortcuts/src/applet-notifications.c:252
+msgid "Rename this bookmark"
+msgstr ""
+
+#: ../shortcuts/src/applet-notifications.c:253
msgid "Remove this bookmark"
msgstr ""
-#: ../shortcuts/src/applet-notifications.c:251
-msgid "Rename this bookmark"
-msgstr ""
-
-#: ../shortcuts/src/applet-notifications.c:257
+#: ../shortcuts/src/applet-notifications.c:259
msgid "Eject"
msgstr "Väljasta"
-#: ../shortcuts/src/applet-notifications.c:262
+#: ../shortcuts/src/applet-notifications.c:264
msgid "Unmount (middle-click)"
msgstr ""
-#: ../shortcuts/src/applet-notifications.c:262
+#: ../shortcuts/src/applet-notifications.c:264
msgid "Mount (middle-click)"
msgstr ""
-#: ../shortcuts/src/applet-notifications.c:264
+#: ../shortcuts/src/applet-notifications.c:266
msgid "Get disk info"
msgstr ""
-#: ../shortcuts/src/applet-notifications.c:289
+#: ../shortcuts/src/applet-notifications.c:292
msgid "Only folders can be bookmarked."
msgstr ""
@@ -2316,20 +2303,20 @@
msgid "Change screen resolution"
msgstr "Ekraani eraldusvõime muutmine"
-#: ../showDesktop/src/applet-notifications.c:299
+#: ../showDesktop/src/applet-notifications.c:305
msgid "Move to the Desktop"
msgstr "Pane töölauale"
-#: ../showDesktop/src/applet-notifications.c:300
+#: ../showDesktop/src/applet-notifications.c:306
msgid "Copy to the Desktop"
msgstr "Kopeeri töölauale"
-#: ../showDesktop/src/applet-notifications.c:301
-#: ../showDesktop/src/applet-notifications.c:305
+#: ../showDesktop/src/applet-notifications.c:307
+#: ../showDesktop/src/applet-notifications.c:311
msgid "Link to the Desktop"
msgstr ""
-#: ../showDesktop/src/applet-notifications.c:306
+#: ../showDesktop/src/applet-notifications.c:312
msgid "Download onto the Desktop"
msgstr ""
@@ -2345,19 +2332,19 @@
"Middle-click to open the images folder."
msgstr ""
-#: ../slider/src/applet-notifications.c:166
+#: ../slider/src/applet-notifications.c:167
msgid "Play"
msgstr "Esita"
-#: ../slider/src/applet-notifications.c:166
+#: ../slider/src/applet-notifications.c:167
msgid "Pause"
msgstr "Paus"
-#: ../slider/src/applet-notifications.c:169
+#: ../slider/src/applet-notifications.c:170
msgid "Open current image"
msgstr ""
-#: ../slider/src/applet-notifications.c:171
+#: ../slider/src/applet-notifications.c:172
msgid "Browse images folder"
msgstr "Sirvi piltide kaustas"
@@ -2390,38 +2377,38 @@
msgid "Set new name for this item:"
msgstr ""
-#: ../stack/src/applet-notifications.c:165
+#: ../stack/src/applet-notifications.c:167
+msgid "Paste (drag'n'drop)"
+msgstr "Kleebi (lohistamisega)"
+
+#: ../stack/src/applet-notifications.c:170
+msgid "Clear the stack"
+msgstr ""
+
+#: ../stack/src/applet-notifications.c:177
+msgid "Open (click)"
+msgstr "Ava (klik)"
+
+#: ../stack/src/applet-notifications.c:179
+msgid "Open parent folder"
+msgstr ""
+
+#: ../stack/src/applet-notifications.c:181
msgid "Copy (middle click)"
msgstr ""
-#: ../stack/src/applet-notifications.c:166
+#: ../stack/src/applet-notifications.c:182
msgid "Cut"
msgstr "Lõika"
-#: ../stack/src/applet-notifications.c:167
+#: ../stack/src/applet-notifications.c:185
msgid "Rename this item"
msgstr "Nimeta ümber see element"
-#: ../stack/src/applet-notifications.c:168
+#: ../stack/src/applet-notifications.c:186
msgid "Remove this item"
msgstr "Eemalda see element"
-#: ../stack/src/applet-notifications.c:172
-msgid "Open (click)"
-msgstr "Ava (klik)"
-
-#: ../stack/src/applet-notifications.c:174
-msgid "Open folder"
-msgstr "Ava kataloog"
-
-#: ../stack/src/applet-notifications.c:179
-msgid "Paste (drag'n'drop)"
-msgstr "Kleebi (lohistamisega)"
-
-#: ../stack/src/applet-notifications.c:180
-msgid "Clear the stack"
-msgstr ""
-
#: ../stacks/src/applet-init.c:30
msgid "stacks"
msgstr ""
@@ -2436,7 +2423,7 @@
#: ../switcher/src/applet-draw.c:612 ../switcher/src/applet-draw.c:619
#: ../switcher/src/applet-load-icons.c:43
-#: ../switcher/src/applet-notifications.c:393
+#: ../switcher/src/applet-notifications.c:400
msgid "Current"
msgstr "Aktiivne"
@@ -2444,8 +2431,8 @@
#: ../switcher/src/applet-load-icons.c:49
#: ../switcher/src/applet-notifications.c:213
#: ../switcher/src/applet-notifications.c:225
-#: ../switcher/src/applet-notifications.c:385
-#: ../switcher/src/applet-notifications.c:450
+#: ../switcher/src/applet-notifications.c:392
+#: ../switcher/src/applet-notifications.c:452
msgid "Desktop"
msgstr "Töölaud"
@@ -2465,43 +2452,43 @@
msgstr ""
#: ../switcher/src/applet-notifications.c:214
-#: ../switcher/src/applet-notifications.c:272
+#: ../switcher/src/applet-notifications.c:273
msgid "Rename this workspace"
msgstr "Nimeta ümber see tööruum"
-#: ../switcher/src/applet-notifications.c:259
-msgid "Add a desktop"
-msgstr "Lisa töölauale"
-
-#: ../switcher/src/applet-notifications.c:263
-msgid "Remove last desktop"
-msgstr "Eemalda viimane töölaud"
-
-#: ../switcher/src/applet-notifications.c:279
-msgid "Move current Desktop to this Desktop"
-msgstr ""
-
-#: ../switcher/src/applet-notifications.c:284
+#: ../switcher/src/applet-notifications.c:260
+msgid "Add a workspace"
+msgstr ""
+
+#: ../switcher/src/applet-notifications.c:264
+msgid "Remove last workspace"
+msgstr ""
+
+#: ../switcher/src/applet-notifications.c:280
+msgid "Move current workspace to this workspace"
+msgstr ""
+
+#: ../switcher/src/applet-notifications.c:285
msgid ""
"This will move all windows from the current desktop to the one you clicked "
"on."
msgstr ""
-#: ../switcher/src/applet-notifications.c:290
+#: ../switcher/src/applet-notifications.c:294
msgid "Windows List"
msgstr ""
-#: ../switcher/src/applet-notifications.c:295 ../showDesktop/data/messages:103
+#: ../switcher/src/applet-notifications.c:299 ../showDesktop/data/messages:103
#: ../showDesktop/data/messages:117
msgid "Show the desktop"
msgstr "Töölaua näitamine"
-#: ../switcher/src/applet-notifications.c:302 ../showDesktop/data/messages:111
+#: ../switcher/src/applet-notifications.c:306 ../showDesktop/data/messages:111
#: ../showDesktop/data/messages:125 ../switcher/data/messages:107
msgid "Expose all the desktops (Compiz)"
msgstr "Näita kõiki töölaudasi (Compiz)"
-#: ../switcher/src/applet-notifications.c:308
+#: ../switcher/src/applet-notifications.c:314
msgid "Refresh"
msgstr "Uuenda"
@@ -2558,16 +2545,16 @@
"To close a tab : type 'CTRL+w' or middle-click on it."
msgstr ""
-#: ../terminal/src/terminal-menu-functions.c:78
+#: ../terminal/src/terminal-menu-functions.c:79
#: ../terminal/src/terminal-widget.c:374
msgid "New Tab"
msgstr "Uus sakk"
-#: ../terminal/src/terminal-menu-functions.c:79
+#: ../terminal/src/terminal-menu-functions.c:80
msgid "Rename current Tab"
msgstr ""
-#: ../terminal/src/terminal-menu-functions.c:80
+#: ../terminal/src/terminal-menu-functions.c:81
msgid "Close current Tab"
msgstr ""
@@ -2632,39 +2619,39 @@
msgid "Search for tag:"
msgstr ""
-#: ../tomboy/src/tomboy-notifications.c:186
-msgid "Reload notes"
-msgstr ""
-
-#: ../tomboy/src/tomboy-notifications.c:187
+#: ../tomboy/src/tomboy-notifications.c:195
msgid "Add a note"
msgstr "Lisa märkus"
-#: ../tomboy/src/tomboy-notifications.c:193
+#: ../tomboy/src/tomboy-notifications.c:199
msgid "Delete this note"
msgstr "Kustuta see märkus"
-#: ../tomboy/src/tomboy-notifications.c:196
+#: ../tomboy/src/tomboy-notifications.c:202
+msgid "Reload notes"
+msgstr ""
+
+#: ../tomboy/src/tomboy-notifications.c:208
msgid "Search"
msgstr "Otsi"
-#: ../tomboy/src/tomboy-notifications.c:197
+#: ../tomboy/src/tomboy-notifications.c:209
msgid "Search for tag"
msgstr ""
-#: ../tomboy/src/tomboy-notifications.c:199
+#: ../tomboy/src/tomboy-notifications.c:211
msgid "Search for today's note"
msgstr ""
-#: ../tomboy/src/tomboy-notifications.c:200
+#: ../tomboy/src/tomboy-notifications.c:212
msgid "Search for this week's note"
msgstr ""
-#: ../tomboy/src/tomboy-notifications.c:201
+#: ../tomboy/src/tomboy-notifications.c:213
msgid "Search for next week's note"
msgstr ""
-#: ../tomboy/src/tomboy-notifications.c:211
+#: ../tomboy/src/tomboy-notifications.c:223
msgid "Reset marks"
msgstr ""
@@ -2752,11 +2739,11 @@
msgid "Data are being retrieved, please wait a moment."
msgstr ""
-#: ../weather/src/applet-notifications.c:84
+#: ../weather/src/applet-notifications.c:85
msgid "Reload now"
msgstr "Lae nüüd"
-#: ../weather/src/applet-notifications.c:108
+#: ../weather/src/applet-notifications.c:110
msgid ""
"No data available\n"
" is your connection alive?"
@@ -2764,40 +2751,40 @@
"Andmed pole saadaval\n"
" on teie ühendus elus?"
-#: ../weather/src/applet-notifications.c:127
-#: ../weather/src/applet-notifications.c:163
+#: ../weather/src/applet-notifications.c:129
+#: ../weather/src/applet-notifications.c:165
msgid "Temperature"
msgstr "Temperatuur"
-#: ../weather/src/applet-notifications.c:128
+#: ../weather/src/applet-notifications.c:130
msgid "Precipitation probability"
msgstr "Sademete tõenäosus"
-#: ../weather/src/applet-notifications.c:129
-#: ../weather/src/applet-notifications.c:164
+#: ../weather/src/applet-notifications.c:131
+#: ../weather/src/applet-notifications.c:166
msgid "Wind"
msgstr "Tuul"
-#: ../weather/src/applet-notifications.c:130
-#: ../weather/src/applet-notifications.c:165
+#: ../weather/src/applet-notifications.c:132
+#: ../weather/src/applet-notifications.c:167
msgid "Humidity"
msgstr "Niiskus"
-#: ../weather/src/applet-notifications.c:131
-#: ../weather/src/applet-notifications.c:166
+#: ../weather/src/applet-notifications.c:133
+#: ../weather/src/applet-notifications.c:168
msgid "Sunrise"
msgstr "Päikesetõus"
-#: ../weather/src/applet-notifications.c:131
-#: ../weather/src/applet-notifications.c:166
+#: ../weather/src/applet-notifications.c:133
+#: ../weather/src/applet-notifications.c:168
msgid "Sunset"
msgstr "Päikeseloojang"
-#: ../weather/src/applet-notifications.c:139
+#: ../weather/src/applet-notifications.c:141
msgid "Data are being fetched, please re-try in a few seconds."
msgstr ""
-#: ../weather/src/applet-notifications.c:149
+#: ../weather/src/applet-notifications.c:151
msgid ""
"No data available\n"
"Retrying now..."
@@ -2805,11 +2792,11 @@
"Andmeid pole saadaval\n"
"Proovitakse uuesti nüüd ..."
-#: ../weather/src/applet-notifications.c:163
+#: ../weather/src/applet-notifications.c:165
msgid "Feels like"
msgstr "Tundub nagu"
-#: ../weather/src/applet-notifications.c:165
+#: ../weather/src/applet-notifications.c:167
msgid "Pressure"
msgstr "Õhurõhk"
@@ -2904,10 +2891,10 @@
#: ../Animated-icons/data/messages:79 ../Animated-icons/data/messages:97
#: ../Animated-icons/data/messages:149 ../Animated-icons/data/messages:161
#: ../Animated-icons/data/messages:173 ../Animated-icons/data/messages:187
-#: ../Scooby-Do/data/messages:17 ../Scooby-Do/data/messages:21
-#: ../icon-effect/data/messages:101 ../icon-effect/data/messages:123
-#: ../icon-effect/data/messages:145 ../icon-effect/data/messages:167
-#: ../icon-effect/data/messages:187
+#: ../Remote-Control/data/messages:7 ../Scooby-Do/data/messages:15
+#: ../Scooby-Do/data/messages:19 ../icon-effect/data/messages:101
+#: ../icon-effect/data/messages:123 ../icon-effect/data/messages:145
+#: ../icon-effect/data/messages:167 ../icon-effect/data/messages:187
msgid "In ms."
msgstr ""
@@ -3184,7 +3171,7 @@
#: ../Folders/data/messages:27 ../GMenu/data/messages:15
#: ../MeMenu/data/messages:9 ../Messaging-Menu/data/messages:11
#: ../Network-Monitor/data/messages:15 ../RSSreader/data/messages:17
-#: ../Scooby-Do/data/messages:117 ../Status-Notifier/data/messages:15
+#: ../Scooby-Do/data/messages:115 ../Status-Notifier/data/messages:15
#: ../System-Monitor/data/messages:13 ../Toons/data/messages:13
#: ../Xgamma/data/messages:15 ../alsaMixer/data/messages:13
#: ../clock/data/messages:15 ../compiz-icon/data/messages:11
@@ -3207,23 +3194,24 @@
#: ../Folders/data/messages:103 ../GMenu/data/messages:91
#: ../MeMenu/data/messages:85 ../Messaging-Menu/data/messages:87
#: ../Network-Monitor/data/messages:91 ../RSSreader/data/messages:93
-#: ../Scooby-Do/data/messages:1 ../Status-Notifier/data/messages:91
-#: ../System-Monitor/data/messages:89 ../Toons/data/messages:89
-#: ../Xgamma/data/messages:91 ../alsaMixer/data/messages:89
-#: ../clock/data/messages:91 ../compiz-icon/data/messages:87
-#: ../dnd2share/data/messages:87 ../dustbin/data/messages:87
-#: ../keyboard-indicator/data/messages:87 ../logout/data/messages:91
-#: ../mail/data/messages:87 ../motion-blur/data/messages:1
-#: ../musicPlayer/data/messages:89 ../netspeed/data/messages:87
-#: ../powermanager/data/messages:89 ../quick-browser/data/messages:93
-#: ../shortcuts/data/messages:91 ../show-mouse/data/messages:1
-#: ../showDesktop/data/messages:95 ../slider/data/messages:89
-#: ../stack/data/messages:93 ../stacks/data/messages:89
-#: ../switcher/data/messages:83 ../switcher/data/messages:85
-#: ../systray/data/messages:83 ../template/data/messages:91
-#: ../terminal/data/messages:91 ../tomboy/data/messages:101
-#: ../weather/data/messages:89 ../weather/data/messages:91
-#: ../weblets/data/messages:91 ../wifi/data/messages:89
+#: ../Remote-Control/data/messages:1 ../Scooby-Do/data/messages:1
+#: ../Status-Notifier/data/messages:91 ../System-Monitor/data/messages:89
+#: ../Toons/data/messages:89 ../Xgamma/data/messages:91
+#: ../alsaMixer/data/messages:89 ../clock/data/messages:91
+#: ../compiz-icon/data/messages:87 ../dnd2share/data/messages:87
+#: ../dustbin/data/messages:87 ../keyboard-indicator/data/messages:87
+#: ../logout/data/messages:91 ../mail/data/messages:87
+#: ../motion-blur/data/messages:1 ../musicPlayer/data/messages:89
+#: ../netspeed/data/messages:87 ../powermanager/data/messages:89
+#: ../quick-browser/data/messages:93 ../shortcuts/data/messages:91
+#: ../show-mouse/data/messages:1 ../showDesktop/data/messages:95
+#: ../slider/data/messages:89 ../stack/data/messages:93
+#: ../stacks/data/messages:89 ../switcher/data/messages:83
+#: ../switcher/data/messages:85 ../systray/data/messages:83
+#: ../template/data/messages:91 ../terminal/data/messages:91
+#: ../tomboy/data/messages:101 ../weather/data/messages:89
+#: ../weather/data/messages:91 ../weblets/data/messages:91
+#: ../wifi/data/messages:89
msgid "Configuration"
msgstr "Seaded"
@@ -3564,7 +3552,7 @@
#: ../Folders/data/messages:51 ../GMenu/data/messages:39
#: ../MeMenu/data/messages:33 ../Messaging-Menu/data/messages:35
#: ../Network-Monitor/data/messages:39 ../RSSreader/data/messages:41
-#: ../Scooby-Do/data/messages:27 ../Status-Notifier/data/messages:39
+#: ../Scooby-Do/data/messages:25 ../Status-Notifier/data/messages:39
#: ../System-Monitor/data/messages:37 ../Toons/data/messages:37
#: ../Xgamma/data/messages:39 ../alsaMixer/data/messages:37
#: ../clock/data/messages:39 ../compiz-icon/data/messages:35
@@ -3833,7 +3821,7 @@
#: ../Status-Notifier/data/messages:65 ../System-Monitor/data/messages:63
#: ../Toons/data/messages:63 ../Xgamma/data/messages:65
#: ../alsaMixer/data/messages:63 ../clock/data/messages:65
-#: ../clock/data/messages:149 ../compiz-icon/data/messages:61
+#: ../clock/data/messages:157 ../compiz-icon/data/messages:61
#: ../dnd2share/data/messages:61 ../dustbin/data/messages:61
#: ../keyboard-indicator/data/messages:61
#: ../keyboard-indicator/data/messages:113 ../logout/data/messages:65
@@ -4413,7 +4401,7 @@
msgid "Sort folders before files?"
msgstr ""
-#: ../Folders/data/messages:117 ../Scooby-Do/data/messages:103
+#: ../Folders/data/messages:117 ../Scooby-Do/data/messages:101
#: ../quick-browser/data/messages:103
msgid "Show hidden files?"
msgstr ""
@@ -4898,203 +4886,203 @@
msgid "big"
msgstr "suur"
+#: ../Remote-Control/data/messages:3
+msgid "Shortkey to trigger the applet:"
+msgstr ""
+
+#: ../Remote-Control/data/messages:5 ../Scooby-Do/data/messages:23
+msgid "Animation of the current icon :"
+msgstr ""
+
+#: ../Remote-Control/data/messages:9 ../Scooby-Do/data/messages:21
+msgid "Duration of the stop animation :"
+msgstr ""
+
#: ../Scooby-Do/data/messages:3
msgid "Shortkey to enable/disable the finder mode:"
msgstr ""
#: ../Scooby-Do/data/messages:5
-msgid "Shortkey to enable/disable the navigation mode:"
-msgstr ""
-
-#: ../Scooby-Do/data/messages:7
msgid ""
"Maximum number of mails that will be previewed. Put -1 to show the maximum "
"possible."
msgstr ""
+#: ../Scooby-Do/data/messages:7
+msgid "Maximum number of results :"
+msgstr ""
+
#: ../Scooby-Do/data/messages:9
-msgid "Maximum number of results :"
-msgstr ""
-
-#: ../Scooby-Do/data/messages:11
msgid ""
"Number of lines of the listing. If there are more results, the listing will "
"scroll when you go up or down with the arrows."
msgstr ""
+#: ../Scooby-Do/data/messages:11
+msgid "Number of lines to display :"
+msgstr ""
+
#: ../Scooby-Do/data/messages:13
-msgid "Number of lines to display :"
-msgstr ""
-
-#: ../Scooby-Do/data/messages:15
msgid "Animations"
msgstr "Animatsioonid"
-#: ../Scooby-Do/data/messages:19
+#: ../Scooby-Do/data/messages:17
msgid "Duration of the appearance animation :"
msgstr ""
-#: ../Scooby-Do/data/messages:23
-msgid "Duration of the stop animation :"
-msgstr ""
-
-#: ../Scooby-Do/data/messages:25
-msgid "Animation of the current icon :"
+#: ../Scooby-Do/data/messages:27
+msgid "Font used to display what you type:"
msgstr ""
#: ../Scooby-Do/data/messages:29
-msgid "Font used to display what you type:"
+msgid "Color of the text's frame :"
msgstr ""
#: ../Scooby-Do/data/messages:31
-msgid "Color of the text's frame :"
+msgid "Font size, relative to the dock size:"
msgstr ""
#: ../Scooby-Do/data/messages:33
-msgid "Font size, relative to the dock size:"
+msgid "between 1 and 9, the higher, the bigger."
msgstr ""
#: ../Scooby-Do/data/messages:35
-msgid "between 1 and 9, the higher, the bigger."
-msgstr ""
-
-#: ../Scooby-Do/data/messages:37
msgid "Text size:"
msgstr "Teksti suurus:"
-#: ../Scooby-Do/data/messages:39 ../keyboard-indicator/data/messages:103
+#: ../Scooby-Do/data/messages:37 ../keyboard-indicator/data/messages:103
msgid "Outline text?"
msgstr ""
-#: ../Scooby-Do/data/messages:41 ../clock/data/messages:145
+#: ../Scooby-Do/data/messages:39 ../clock/data/messages:145
msgid "Text colour:"
msgstr "Teksti värv:"
+#: ../Scooby-Do/data/messages:41
+msgid "Character background colour:"
+msgstr ""
+
#: ../Scooby-Do/data/messages:43
-msgid "Character background colour:"
+msgid "Write text on the top of the dock?"
msgstr ""
#: ../Scooby-Do/data/messages:45
-msgid "Write text on the top of the dock?"
+msgid "Favorite applications"
msgstr ""
#: ../Scooby-Do/data/messages:47
-msgid "Favorite applications"
+msgid "FAvorite applications starting with 'a' :"
msgstr ""
#: ../Scooby-Do/data/messages:49
-msgid "FAvorite applications starting with 'a' :"
+msgid "Favorite application starting with 'b' :"
msgstr ""
#: ../Scooby-Do/data/messages:51
-msgid "Favorite application starting with 'b' :"
+msgid "Favorite application(s) starting with 'c' :"
msgstr ""
#: ../Scooby-Do/data/messages:53
-msgid "Favorite application(s) starting with 'c' :"
+msgid "Favorite application(s starting with 'd' :"
msgstr ""
#: ../Scooby-Do/data/messages:55
-msgid "Favorite application(s starting with 'd' :"
+msgid "Favorite application(s) starting with 'e' :"
msgstr ""
#: ../Scooby-Do/data/messages:57
-msgid "Favorite application(s) starting with 'e' :"
+msgid "Favorite application(s) starting with 'f' :"
msgstr ""
#: ../Scooby-Do/data/messages:59
-msgid "Favorite application(s) starting with 'f' :"
+msgid "Favorite application(s) starting with 'g' :"
msgstr ""
#: ../Scooby-Do/data/messages:61
-msgid "Favorite application(s) starting with 'g' :"
+msgid "Favorite application(s) starting with 'h' :"
msgstr ""
#: ../Scooby-Do/data/messages:63
-msgid "Favorite application(s) starting with 'h' :"
+msgid "Favorite application(s) starting with 'i' :"
msgstr ""
#: ../Scooby-Do/data/messages:65
-msgid "Favorite application(s) starting with 'i' :"
+msgid "Favorite application(s) starting with 'j' :"
msgstr ""
#: ../Scooby-Do/data/messages:67
-msgid "Favorite application(s) starting with 'j' :"
+msgid "Favorite application(s) starting with 'k' :"
msgstr ""
#: ../Scooby-Do/data/messages:69
-msgid "Favorite application(s) starting with 'k' :"
+msgid "Favorite application(s) starting with 'l' :"
msgstr ""
#: ../Scooby-Do/data/messages:71
-msgid "Favorite application(s) starting with 'l' :"
+msgid "Favorite application(s) starting with 'm' :"
msgstr ""
#: ../Scooby-Do/data/messages:73
-msgid "Favorite application(s) starting with 'm' :"
+msgid "Favorite application(s) starting with 'n' :"
msgstr ""
#: ../Scooby-Do/data/messages:75
-msgid "Favorite application(s) starting with 'n' :"
+msgid "Favorite application(s) starting with 'o' :"
msgstr ""
#: ../Scooby-Do/data/messages:77
-msgid "Favorite application(s) starting with 'o' :"
+msgid "Favorite application(s) starting with 'p' :"
msgstr ""
#: ../Scooby-Do/data/messages:79
-msgid "Favorite application(s) starting with 'p' :"
+msgid "Favorite application(s) starting with 'q' :"
msgstr ""
#: ../Scooby-Do/data/messages:81
-msgid "Favorite application(s) starting with 'q' :"
+msgid "Favorite application(s) starting with 'r' :"
msgstr ""
#: ../Scooby-Do/data/messages:83
-msgid "Favorite application(s) starting with 'r' :"
+msgid "Favorite application(s) starting with 's' :"
msgstr ""
#: ../Scooby-Do/data/messages:85
-msgid "Favorite application(s) starting with 's' :"
+msgid "Favorite application(s) starting with 't' :"
msgstr ""
#: ../Scooby-Do/data/messages:87
-msgid "Favorite application(s) starting with 't' :"
+msgid "Favorite application(s) starting with 'u' :"
msgstr ""
#: ../Scooby-Do/data/messages:89
-msgid "Favorite application(s) starting with 'u' :"
+msgid "Favorite application(s) starting with 'v' :"
msgstr ""
#: ../Scooby-Do/data/messages:91
-msgid "Favorite application(s) starting with 'v' :"
+msgid "Favorite application(s) starting with 'w' :"
msgstr ""
#: ../Scooby-Do/data/messages:93
-msgid "Favorite application(s) starting with 'w' :"
+msgid "Favorite application(s) starting with 'x' :"
msgstr ""
#: ../Scooby-Do/data/messages:95
-msgid "Favorite application(s) starting with 'x' :"
+msgid "Favorite application(s) starting with 'y' :"
msgstr ""
#: ../Scooby-Do/data/messages:97
-msgid "Favorite application(s) starting with 'y' :"
-msgstr ""
-
-#: ../Scooby-Do/data/messages:99
msgid "Favorite application(s) starting with 'z' :"
msgstr ""
+#: ../Scooby-Do/data/messages:107
+msgid "Propose some web search engines ?"
+msgstr ""
+
#: ../Scooby-Do/data/messages:109
-msgid "Propose some web search engines ?"
-msgstr ""
-
-#: ../Scooby-Do/data/messages:111
msgid "It can launch commands and even do some calculations."
msgstr ""
-#: ../Scooby-Do/data/messages:115
+#: ../Scooby-Do/data/messages:113
msgid "Help"
msgstr "Abi"
@@ -5470,27 +5458,43 @@
msgstr "Font:"
#: ../clock/data/messages:147
+msgid "Layout of the text:"
+msgstr ""
+
+#: ../clock/data/messages:149
+msgid "Automatic"
+msgstr ""
+
+#: ../clock/data/messages:151
+msgid "On 1 line"
+msgstr ""
+
+#: ../clock/data/messages:153
+msgid "On 2 lines"
+msgstr ""
+
+#: ../clock/data/messages:155
msgid "Ratio to apply on text :"
msgstr ""
-#: ../clock/data/messages:151
+#: ../clock/data/messages:159
msgid "Configure time and date"
msgstr ""
-#: ../clock/data/messages:153
+#: ../clock/data/messages:161
msgid "Leave empty to use the default command."
msgstr ""
-#: ../clock/data/messages:155
+#: ../clock/data/messages:163
msgid "Specific command to run:"
msgstr ""
-#: ../clock/data/messages:159
+#: ../clock/data/messages:167
msgid ""
"The new alarm will be added to the end / the last alarm will be removed."
msgstr ""
-#: ../clock/data/messages:161
+#: ../clock/data/messages:169
msgid "Add or remove an alarm:"
msgstr ""
@@ -7116,16 +7120,6 @@
msgid "Manual order"
msgstr ""
-#: ../stack/data/messages:135
-msgid ""
-"It is the selection made by the mouse, as opposed to usual ctrl+c/ctrl+v "
-"clipboard"
-msgstr ""
-
-#: ../stack/data/messages:137
-msgid "When copying/pasting/cutting, use the selection clipboard?"
-msgstr ""
-
#: ../stacks/data/messages:91
msgid "Directory & Options"
msgstr ""
@@ -7441,7 +7435,7 @@
#: ../weather/data/messages:101
msgid "in seconds. Set 0 to have never-ending dialogs."
-msgstr ""
+msgstr "sekundites. Säti 0 kui soovid püsivat dialoogiakent."
#: ../weather/data/messages:103
msgid "Dialog duration:"
@@ -7579,3 +7573,18 @@
#: ../wifi/data/messages:189
msgid "Overwrite the default label with the connection point name?"
msgstr ""
+
+#~ msgid "Hey, you there!"
+#~ msgstr "Hei sina seal!"
+
+#~ msgid "Monitor System"
+#~ msgstr "Süsteemi jälgija"
+
+#~ msgid "Open folder"
+#~ msgstr "Ava kataloog"
+
+#~ msgid "Add a desktop"
+#~ msgstr "Lisa töölauale"
+
+#~ msgid "Remove last desktop"
+#~ msgstr "Eemalda viimane töölaud"
=== modified file 'po/fr.po'
--- po/fr.po 2010-09-07 00:39:20 +0000
+++ po/fr.po 2010-09-22 10:43:43 +0000
@@ -7,14 +7,14 @@
msgstr ""
"Project-Id-Version: 1.0.0\n"
"Report-Msgid-Bugs-To: fabounet@xxxxxxxxxxxx\n"
-"POT-Creation-Date: 2010-08-29 00:59+0000\n"
-"PO-Revision-Date: 2010-09-04 03:57+0000\n"
+"POT-Creation-Date: 2010-09-13 00:36+0000\n"
+"PO-Revision-Date: 2010-09-16 02:28+0000\n"
"Last-Translator: Matthieu Baerts <matttbe@xxxxxxxxx>\n"
"Language-Team: Cairo-Dock <LL@xxxxxx>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-09-05 04:53+0000\n"
+"X-Launchpad-Export-Date: 2010-09-17 05:32+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#: ../Animated-icons/src/applet-init.c:32
@@ -143,29 +143,25 @@
msgid "For Aiur!"
msgstr "Pour Aïur !"
-#: ../Cairo-Penguin/src/applet-notifications.c:123
-msgid "Hey, you there!"
-msgstr "Hé, vous là !"
-
-#: ../Cairo-Penguin/src/applet-notifications.c:127
+#: ../Cairo-Penguin/src/applet-notifications.c:126
msgid "Wake up"
msgstr "Réveille-toi !"
-#: ../Cairo-Penguin/src/applet-notifications.c:131
+#: ../Cairo-Penguin/src/applet-notifications.c:130
msgid "Keep quiet"
msgstr "Reste tranquille !"
-#: ../Cairo-Penguin/src/applet-notifications.c:134
-#: ../Scooby-Do/data/messages:101
+#: ../Cairo-Penguin/src/applet-notifications.c:133
+#: ../Scooby-Do/data/messages:99
msgid "Start XPenguins"
msgstr "Lancer XPenguins"
-#: ../Cairo-Penguin/src/applet-notifications.c:135
+#: ../Cairo-Penguin/src/applet-notifications.c:134
msgid "Stop XPenguins"
msgstr "Arrêter XPenguins"
-#: ../Cairo-Penguin/src/applet-notifications.c:158
-#: ../Cairo-Penguin/src/applet-notifications.c:160
+#: ../Cairo-Penguin/src/applet-notifications.c:157
+#: ../Cairo-Penguin/src/applet-notifications.c:159
msgid "Zzzzz"
msgstr "Zzzzz"
@@ -198,7 +194,7 @@
msgid "Clipboard history"
msgstr "Presse-papier"
-#: ../Clipper/src/applet-notifications.c:99
+#: ../Clipper/src/applet-notifications.c:101
msgid ""
"No persistent items.\n"
"You can add some by drag and dropping some text on the icon."
@@ -347,33 +343,37 @@
"Vérifiez les droits d'écriture \n"
"et que le nom n'existe pas déjà ."
-#: ../Folders/src/applet-notifications.c:319
-msgid "Open with"
-msgstr "Ouvrir avec"
-
-#: ../Folders/src/applet-notifications.c:352
+#: ../Folders/src/applet-notifications.c:322
+msgid "Open the folder (middle-click)"
+msgstr "Ouvrir le dossier (clic du milieu)"
+
+#: ../Folders/src/applet-notifications.c:328
+msgid "Rename this file"
+msgstr "Renommer ce fichier"
+
+#: ../Folders/src/applet-notifications.c:329
msgid "Delete this file"
msgstr "Effacer ce fichier"
-#: ../Folders/src/applet-notifications.c:354
-msgid "Rename this file"
-msgstr "Renommer ce fichier"
-
-#: ../Folders/src/applet-notifications.c:356
+#: ../Folders/src/applet-notifications.c:330
msgid "Move this file"
msgstr "Déplacer ce fichier"
-#: ../Folders/src/applet-notifications.c:358
+#: ../Folders/src/applet-notifications.c:336
+msgid "Open with"
+msgstr "Ouvrir avec"
+
+#: ../Folders/src/applet-notifications.c:370
msgid "Properties"
msgstr "Propriétés"
-#: ../Folders/src/applet-notifications.c:360
+#: ../Folders/src/applet-notifications.c:373
msgid "Create a new file"
msgstr "Créer un nouveau fichier"
-#: ../Folders/src/applet-notifications.c:364
-msgid "Open the folder (middle-click)"
-msgstr "Ouvrir le dossier (clic du milieu)"
+#: ../Folders/src/applet-notifications.c:374
+msgid "Create a new folder"
+msgstr "Créer un nouveau dossier"
#: ../GMenu/src/applet-init.c:33
msgid ""
@@ -395,15 +395,15 @@
msgid "Applications Menu"
msgstr "Menu d'Applications"
-#: ../GMenu/src/applet-notifications.c:147
-msgid "Quick launch"
-msgstr "Lancement rapide"
+#: ../GMenu/src/applet-notifications.c:75
+msgid "Quick launch (Middle-click)"
+msgstr "Lancement rapide (clic du milieu)"
-#: ../GMenu/src/applet-notifications.c:148
+#: ../GMenu/src/applet-notifications.c:77
msgid "Configure menu"
msgstr "Configurer le menu"
-#: ../GMenu/src/applet-notifications.c:149
+#: ../GMenu/src/applet-notifications.c:80
msgid "Clear recent"
msgstr "Vider les documents récents"
@@ -415,7 +415,7 @@
msgid "Clear the list of the recently used documents?"
msgstr "Vider la liste des Documents récents ?"
-#: ../GMenu/src/applet-run-dialog.c:349 ../Scooby-Do/data/messages:113
+#: ../GMenu/src/applet-run-dialog.c:349 ../Scooby-Do/data/messages:111
msgid "Enter a command to launch:"
msgstr "Entrez une commande à lancer :"
@@ -618,12 +618,12 @@
msgstr "Chargement"
#: ../Network-Monitor/src/applet-notifications.c:100
-#: ../wifi/src/applet-notifications.c:75
+#: ../wifi/src/applet-notifications.c:76
msgid "Check for Wireless Extension"
msgstr "Vérifier les extensions wifi"
#: ../Network-Monitor/src/applet-notifications.c:101
-#: ../wifi/src/applet-notifications.c:76
+#: ../wifi/src/applet-notifications.c:77
msgid "Network Administration"
msgstr "Administration du Réseau"
@@ -796,16 +796,16 @@
msgstr "Ouvrir dans une nouvelle fenêtre"
#: ../Scooby-Do/src/applet-backend-firefox.c:433
-#: ../dnd2share/src/applet-notifications.c:461
+#: ../dnd2share/src/applet-notifications.c:470
msgid "Open file"
msgstr "Ouvrir le fichier"
#: ../Scooby-Do/src/applet-backend-firefox.c:496
-#: ../Scooby-Do/data/messages:105
+#: ../Scooby-Do/data/messages:103
msgid "Firefox bookmarks"
msgstr "Signets de Firefox"
-#: ../Scooby-Do/src/applet-backend-recent.c:212 ../Scooby-Do/data/messages:107
+#: ../Scooby-Do/src/applet-backend-recent.c:212 ../Scooby-Do/data/messages:105
msgid "Recent files"
msgstr "Fichiers récents"
@@ -833,65 +833,6 @@
msgid "Amazon"
msgstr "Amazon"
-#: ../Scooby-Do/src/applet-init.c:39
-msgid ""
-"This plug-in allows you to make different actions directly from the "
-"keyboard.\n"
-"It has 2 modes, each one being triggered by a keyboard shortcut:\n"
-"\n"
-"- the finder mode (default shortcut : CTRL + Enter) :\n"
-" It lets you find and launch applications, files, recent files, firefox "
-"bookmarks, commands, and even calculations.\n"
-" Type what you want to search, the results will be displayed in real "
-"time.\n"
-" The first results of each category are displayed in the main listing.\n"
-" Use the up/down arrows to navigate inside the list,\n"
-" and use the left/right arrows to enter into a category, or to display "
-"more actions (when a little arrow is drawn next to text).\n"
-" Once inside a category, you can filter the results by typing some "
-"letters.\n"
-" Press Enter to validate, maintain SHIFT or ALT to keep the list of "
-"results opened.\n"
-"\n"
-"- the navigation mode (default shortcut : CTRL + F9) :\n"
-" use the arrows to navigate into the docks and sub-docks,\n"
-" or type the name of a launcher and press Tab to automatically jump to "
-"the next suitable launcher\n"
-" press Enter to click on the icon, Shift+Enter for Shift+click, Alt+Enter "
-"for middle click, and Ctrl+Enter for left click\n"
-"Escape or the same shortkey will cancel."
-msgstr ""
-"Ce plug-in vous permet de faire différentes actions directement depuis le "
-"clavier.\n"
-"Il a 2 modes, chacun déclenché par un raccourci clavier :\n"
-"\n"
-"-le mode chercheur (raccourci par défaut: CTRL + Entrer) :\n"
-" Il vous laisse trouver et exécuter des applications, fichiers, fichiers "
-"récents, marque-pages de firefox, commandes, et même des calculs\n"
-" Tapez ce que vous voulez chercher, les résultats s'afficheront en temps "
-"réel.\n"
-" Les premiers résultats de chaque catégorie sont affichés dans la liste "
-"principale.\n"
-" Utilisez les touches fléchées haut/bas pour naviguer parmi les résultats "
-"de la liste,\n"
-" et utilisez les touches fléchées gauche/droite pour entrer dans une "
-"catégorie, ou pour afficher plus d'informations (quand une petite flèche est "
-"dessinée à coté du texte).\n"
-" Une fois dans la liste, vous pouvez filtrer les résultats en entrant "
-"quelques lettres.\n"
-" Appuyez sur Entrer pour valider. (maintenir SHIFT ou ALT pour garder la "
-"liste des résultats ouverte)\n"
-"\n"
-"- le mode navigation (raccourci par défaut: CTRL + F9) :\n"
-" utilisez les touches fléchées pour naviguer dans le dock et les sous-"
-"docks,\n"
-" ou tapez le nom d'un lanceur et appuyez sur Tab pour passer au lanceur "
-"suivant\n"
-" appuyez sur Entrer pour cliquer sur l'icône, Shift+Entrer pour "
-"Shift+cliquer, Alt+Entrer pour un clic de molette et Ctrl+Entrer pour un "
-"clic gauche\n"
-"Echap ou la touche raccourci pour sortir."
-
#: ../Scooby-Do/src/applet-listing.c:510
msgid "(F1) Match case"
msgstr "(F1) Respecter la casse"
@@ -938,27 +879,17 @@
msgid "Searching ..."
msgstr "Recherche..."
-#: ../Scooby-Do/src/applet-session.c:50
+#: ../Scooby-Do/src/applet-session.c:62
msgid "Enter your search"
msgstr "Entrez votre recherche"
-#: ../Status-Notifier/src/applet-init.c:31
+#: ../Status-Notifier/src/applet-init.c:32
msgid "Status Notifier"
msgstr "Barre de Status"
-#: ../Status-Notifier/src/applet-init.c:34
-msgid ""
-"A <b>notification area</b> for your dock\n"
-"Also called 'systray'.\n"
-"It is designed to work on any desktop that supports the latest systray "
-"specifications (KDE, Gnome, etc)"
-msgstr ""
-"Une <b>zone de notification</b> pour votre dock.\n"
-"Aussi appelée 'systray'.\n"
-"Il a été conçu pour fonctionner avec tout environnement qui supporte les "
-"dernières spécifications du systray (KDE, Gnome, etc.)"
-
#: ../System-Monitor/src/applet-init.c:30
+#: ../System-Monitor/src/applet-notifications.c:116
+#: ../netspeed/src/applet-notifications.c:72
msgid "System Monitor"
msgstr "Moniteur Système"
@@ -1044,12 +975,8 @@
msgid "Buffers"
msgstr "Tampons"
-#: ../System-Monitor/src/applet-notifications.c:115
-#: ../netspeed/src/applet-notifications.c:70
-msgid "Monitor System"
-msgstr "Moniteur système"
-
#: ../System-Monitor/src/applet-nvidia.c:141
+#: ../System-Monitor/src/applet-sensors.c:161
#, c-format
msgid "Alert! Graphic Card core temperature has reached %d°C"
msgstr ""
@@ -1087,7 +1014,7 @@
msgid "Set up gamma:"
msgstr "Réglez le gamma :"
-#: ../Xgamma/src/applet-notifications.c:61
+#: ../Xgamma/src/applet-notifications.c:62
msgid "Apply current luminosity on startup"
msgstr "Appliquer la luminosité actuelle au démarrage"
@@ -1145,155 +1072,122 @@
msgid "Set up volume:"
msgstr "Réglez le volume :"
-#: ../alsaMixer/src/applet-notifications.c:57
+#: ../alsaMixer/src/applet-notifications.c:58
msgid "Adjust channels"
msgstr "Ajustez les canaux"
#: ../alsaMixer/src/applet-notifications.c:59
-msgid "Unmute"
-msgstr ""
-
-#: ../alsaMixer/src/applet-notifications.c:61
-msgid "Mute"
-msgstr ""
-
-#: ../clock/src/applet-calendar.c:190 ../clock/src/applet-calendar.c:271
-#: ../clock/src/applet-calendar.c:437 ../clock/src/applet-calendar.c:442
-#: ../clock/src/applet-draw.c:83 ../clock/src/applet-draw.c:339
-#: ../clock/src/applet-draw.c:353 ../clock/src/applet-draw.c:374
-#: ../clock/src/applet-task-editor.c:119
+msgid "Unmute (middle-click)"
+msgstr "Désactiver le son (clic du milieu)"
+
+#: ../alsaMixer/src/applet-notifications.c:59
+msgid "Mute (middle-click)"
+msgstr "Activer le son (clic du milieu)"
+
+#: ../clock/src/applet-calendar.c:193 ../clock/src/applet-calendar.c:274
+#: ../clock/src/applet-calendar.c:519 ../clock/src/applet-calendar.c:524
+#: ../clock/src/applet-task-editor.c:119 ../clock/src/applet-timer.c:84
+#: ../clock/src/applet-timer.c:172 ../clock/src/applet-timer.c:454
+#: ../clock/src/applet-timer.c:471 ../clock/src/applet-timer.c:491
msgid "No title"
msgstr "Sans titre"
-#: ../clock/src/applet-calendar.c:438
+#: ../clock/src/applet-calendar.c:520
msgid "years"
msgstr "années"
-#: ../clock/src/applet-calendar.c:555
+#: ../clock/src/applet-calendar.c:637
msgid "Calendar and tasks"
msgstr "Calendrier et tâches"
-#: ../clock/src/applet-config.c:35 ../clock/data/messages:157
+#: ../clock/src/applet-config.c:36 ../clock/data/messages:165
msgid "Alarm"
msgstr "Alarme"
-#: ../clock/src/applet-config.c:35
+#: ../clock/src/applet-config.c:36
msgid "Time you want to be notified:"
msgstr "L'heure désirée pour être averti(e) :"
-#: ../clock/src/applet-config.c:35
+#: ../clock/src/applet-config.c:36
msgid "In the form xx:xx. E.g.: 20:35 for 8:35pm"
msgstr "Sous la forme xx:xx. Exemple: 20:35 pour 8.35pm ou 20h35"
-#: ../clock/src/applet-config.c:35
+#: ../clock/src/applet-config.c:36
msgid "Never"
msgstr "Jamais"
-#: ../clock/src/applet-config.c:35
+#: ../clock/src/applet-config.c:36
msgid "Day"
msgstr "Jour"
-#: ../clock/src/applet-config.c:35 ../weather/src/applet-load-icons.c:26
+#: ../clock/src/applet-config.c:36 ../weather/src/applet-load-icons.c:26
msgid "Monday"
msgstr "Lundi"
-#: ../clock/src/applet-config.c:35 ../weather/src/applet-load-icons.c:26
+#: ../clock/src/applet-config.c:36 ../weather/src/applet-load-icons.c:26
msgid "Tuesday"
msgstr "Mardi"
-#: ../clock/src/applet-config.c:35 ../weather/src/applet-load-icons.c:26
+#: ../clock/src/applet-config.c:36 ../weather/src/applet-load-icons.c:26
msgid "Wednesday"
msgstr "Mercredi"
-#: ../clock/src/applet-config.c:35 ../weather/src/applet-load-icons.c:26
+#: ../clock/src/applet-config.c:36 ../weather/src/applet-load-icons.c:26
msgid "Thursday"
msgstr "Jeudi"
-#: ../clock/src/applet-config.c:35 ../weather/src/applet-load-icons.c:26
+#: ../clock/src/applet-config.c:36 ../weather/src/applet-load-icons.c:26
msgid "Friday"
msgstr "Vendredi"
-#: ../clock/src/applet-config.c:35 ../weather/src/applet-load-icons.c:26
+#: ../clock/src/applet-config.c:36 ../weather/src/applet-load-icons.c:26
msgid "Saturday"
msgstr "Samedi"
-#: ../clock/src/applet-config.c:35 ../weather/src/applet-load-icons.c:26
+#: ../clock/src/applet-config.c:36 ../weather/src/applet-load-icons.c:26
msgid "Sunday"
msgstr "Dimanche"
-#: ../clock/src/applet-config.c:35
+#: ../clock/src/applet-config.c:36
msgid "Week Day"
msgstr "Lundi au Vendredi"
-#: ../clock/src/applet-config.c:35
+#: ../clock/src/applet-config.c:36
msgid "Week End"
msgstr "Week-End"
-#: ../clock/src/applet-config.c:35
+#: ../clock/src/applet-config.c:36
msgid "Month"
msgstr "Mois"
-#: ../clock/src/applet-config.c:35
+#: ../clock/src/applet-config.c:36
msgid "Repeat every:"
msgstr "Répété chaque :"
-#: ../clock/src/applet-config.c:35
+#: ../clock/src/applet-config.c:36
msgid "If every month, which day of the month?"
msgstr "Si c'est tous les mois, quel jour du mois ?"
-#: ../clock/src/applet-config.c:35
+#: ../clock/src/applet-config.c:36
msgid "Message you want to use to be notified:"
msgstr "Message de notification de l'alarme :"
-#: ../clock/src/applet-config.c:35
+#: ../clock/src/applet-config.c:36
msgid "Tea Time!"
msgstr "C'est l'heure du thé !"
-#: ../clock/src/applet-config.c:35
+#: ../clock/src/applet-config.c:36
msgid "Command to launch:"
msgstr "Commande à lancer :"
-#: ../clock/src/applet-config.c:35
+#: ../clock/src/applet-config.c:36
msgid "E.g.:"
msgstr "Exemple :"
-#: ../clock/src/applet-config.c:492 ../weather/src/applet-config.c:180
+#: ../clock/src/applet-config.c:495 ../weather/src/applet-config.c:180
msgid "Search for your location :"
msgstr "Cherchez votre emplacement :"
-#: ../clock/src/applet-draw.c:54
-msgid "1mn"
-msgstr "1min"
-
-#: ../clock/src/applet-draw.c:59
-msgid "1h"
-msgstr "1h"
-
-#: ../clock/src/applet-draw.c:82
-msgid "The following task was scheduled at"
-msgstr "La tâche suivante était programmée à "
-
-#: ../clock/src/applet-draw.c:85 ../clock/src/applet-draw.c:355
-#: ../clock/src/applet-draw.c:376
-msgid "Repeat this message every:"
-msgstr "Répéter ce message chaque :"
-
-#: ../clock/src/applet-draw.c:338
-msgid "This task will begin in 15 minutes:"
-msgstr "Cette tâche va commencer dans 15 minutes :"
-
-#: ../clock/src/applet-draw.c:352
-msgid "It's time for the following task:"
-msgstr "Il est temps d'accomplir la tâche suivante :"
-
-#: ../clock/src/applet-draw.c:373
-msgid "Today is the following anniversary:"
-msgstr "Aujourd'hui, nous souhaitons un bon anniversaire à :"
-
-#: ../clock/src/applet-draw.c:373
-msgid "Tomorrow is the following anniversary:"
-msgstr "Demain, il y aura l'anniversaire de :"
-
#: ../clock/src/applet-init.c:35
msgid "clock"
msgstr "Horloge"
@@ -1346,18 +1240,18 @@
"Vous pouvez ajouter des tâches en cliquant sur l'applet pour ouvrir le "
"calendrier, puis double-cliquez sur un jour."
-#: ../clock/src/applet-notifications.c:90
-msgid "Set up time and date"
-msgstr "Régler la date et l'heure"
-
-#: ../clock/src/applet-notifications.c:91
+#: ../clock/src/applet-notifications.c:92
msgid "Show today's tasks"
msgstr "Afficher les tâches du jour"
-#: ../clock/src/applet-notifications.c:92
+#: ../clock/src/applet-notifications.c:93
msgid "Show this week's tasks"
msgstr "Afficher les tâches de la semaine"
+#: ../clock/src/applet-notifications.c:96
+msgid "Set up time and date"
+msgstr "Régler la date et l'heure"
+
#: ../clock/src/applet-task-editor.c:156
msgid "Add a new task"
msgstr "Ajouter une nouvelle tâche"
@@ -1413,6 +1307,43 @@
msgid "Tags"
msgstr "Étiquettes"
+#: ../clock/src/applet-timer.c:55
+msgid "1mn"
+msgstr "1min"
+
+#: ../clock/src/applet-timer.c:60
+msgid "1h"
+msgstr "1h"
+
+#: ../clock/src/applet-timer.c:83
+msgid "The following task was scheduled at"
+msgstr "La tâche suivante était programmée à "
+
+#: ../clock/src/applet-timer.c:86 ../clock/src/applet-timer.c:456
+#: ../clock/src/applet-timer.c:493
+msgid "Repeat this message every:"
+msgstr "Répéter ce message chaque :"
+
+#: ../clock/src/applet-timer.c:170
+msgid "The following task has felt due:"
+msgstr "La tâche suivante est terminée en raison :"
+
+#: ../clock/src/applet-timer.c:453
+msgid "It's time for the following task:"
+msgstr "Il est temps d'accomplir la tâche suivante :"
+
+#: ../clock/src/applet-timer.c:470
+msgid "This task will begin in 15 minutes:"
+msgstr "Cette tâche va commencer dans 15 minutes :"
+
+#: ../clock/src/applet-timer.c:490
+msgid "Today is the following anniversary:"
+msgstr "Aujourd'hui, nous souhaitons un bon anniversaire à :"
+
+#: ../clock/src/applet-timer.c:490
+msgid "Tomorrow is the following anniversary:"
+msgstr "Demain, il y aura l'anniversaire de :"
+
#: ../compiz-icon/src/applet-init.c:31
msgid "compiz-icon"
msgstr "Options de Compiz"
@@ -1437,7 +1368,7 @@
msgstr "Configurer Compiz"
#: ../compiz-icon/src/applet-load-icon.c:31
-#: ../compiz-icon/src/applet-notifications.c:178
+#: ../compiz-icon/src/applet-notifications.c:180
msgid "Emerald Manager"
msgstr "Gestionnaire Emerald"
@@ -1461,27 +1392,27 @@
"Pour configurer Compiz, vous devez avoir installé CCSM\n"
" avec votre gestionnaire de paquets (Synaptic, YasT, etc)"
-#: ../compiz-icon/src/applet-notifications.c:179
+#: ../compiz-icon/src/applet-notifications.c:181
msgid "Reload Emerald"
msgstr "Recharger Emerald"
-#: ../compiz-icon/src/applet-notifications.c:183
+#: ../compiz-icon/src/applet-notifications.c:184
msgid "Switch Windows Manager"
msgstr "Changer de Gestionnaire de Fenêtres"
-#: ../compiz-icon/src/applet-notifications.c:184
+#: ../compiz-icon/src/applet-notifications.c:185
msgid "Switch Windows Decorator"
msgstr "Changer le Décorateur de Fenêtres"
-#: ../compiz-icon/src/applet-notifications.c:193
+#: ../compiz-icon/src/applet-notifications.c:194
msgid "Toggle Exposition Mode"
msgstr "Activer le Mode Exposition"
-#: ../compiz-icon/src/applet-notifications.c:194
+#: ../compiz-icon/src/applet-notifications.c:195
msgid "Toggle Widget Layer"
msgstr "Activer la Couche des Widgets"
-#: ../compiz-icon/src/applet-notifications.c:196
+#: ../compiz-icon/src/applet-notifications.c:198
msgid "Toggle Show Desktop"
msgstr "Montrer le Bureau"
@@ -1685,17 +1616,21 @@
msgstr "Envoyer le contenu du presse-papier"
#: ../dnd2share/src/applet-notifications.c:398
-msgid "Clear History"
-msgstr "Vider l'Historique"
+msgid "History"
+msgstr "Historique"
-#: ../dnd2share/src/applet-notifications.c:463
+#: ../dnd2share/src/applet-notifications.c:472
msgid "Get text"
msgstr "Récupérer le texte"
-#: ../dnd2share/src/applet-notifications.c:465
+#: ../dnd2share/src/applet-notifications.c:474
msgid "Remove from history"
msgstr "Enlever de l'Historique"
+#: ../dnd2share/src/applet-notifications.c:477
+msgid "Clear History"
+msgstr "Vider l'Historique"
+
#: ../dock-rendering/src/rendering-init.c:34
msgid "Caroussel"
msgstr "Caroussel"
@@ -1796,7 +1731,7 @@
#: ../dustbin/src/applet-notifications.c:82
msgid "elements"
-msgstr ""
+msgstr "éléments"
#: ../dustbin/src/applet-notifications.c:84
msgid "Mo"
@@ -1808,31 +1743,31 @@
#: ../dustbin/src/applet-notifications.c:100
msgid "Counting total size and files number..."
-msgstr ""
+msgstr "Comptage de la taille totale et du nombre de fichiers..."
-#: ../dustbin/src/applet-notifications.c:136
+#: ../dustbin/src/applet-notifications.c:117
msgid "Show Trash (click)"
msgstr "Afficher la Corbeille (clic gauche)"
-#: ../dustbin/src/applet-notifications.c:137
+#: ../dustbin/src/applet-notifications.c:118
msgid "Empty Trash (middle-click)"
msgstr "Videz la Corbeille (clic du millieu)"
-#: ../dustbin/src/applet-notifications.c:139
+#: ../dustbin/src/applet-notifications.c:120
msgid "Display dustbins information"
msgstr "Afficher des informations sur la/les corbeille(s)"
-#: ../dustbin/src/applet-notifications.c:151
+#: ../dustbin/src/applet-notifications.c:133
#, c-format
msgid "%s successfully unmounted"
msgstr "%s est maintenant démonté"
-#: ../dustbin/src/applet-notifications.c:155
+#: ../dustbin/src/applet-notifications.c:137
#, c-format
msgid "failed to unmount %s"
msgstr "échec au démontage de %s"
-#: ../dustbin/src/applet-notifications.c:179
+#: ../dustbin/src/applet-notifications.c:161
#: ../shortcuts/src/applet-notifications.c:167
msgid "Unmouting this volume ..."
msgstr "Démontage de ce volume ..."
@@ -1964,11 +1899,11 @@
" (Vous pouvez inverser les bouttons si vous préférez éteindre avec le "
"boutton gauche)."
-#: ../logout/src/applet-notifications.c:101
+#: ../logout/src/applet-notifications.c:100
msgid "Choose in how many minutes your PC will stop:"
msgstr "Choisissez dans combien de minutes votre PC s'arrêtera :"
-#: ../logout/src/applet-notifications.c:126
+#: ../logout/src/applet-notifications.c:125
msgid "Lock screen"
msgstr "Vérrouiller l'écran"
@@ -1976,7 +1911,7 @@
msgid "Program an automatic shut-down"
msgstr "Programmez une extinction automatique"
-#: ../logout/src/applet-notifications.c:158
+#: ../logout/src/applet-notifications.c:159
msgid "Your computer will shut-down in 1 minute."
msgstr "Votre ordinateur s'eteindra dans 1 minute"
@@ -2137,20 +2072,29 @@
"Si '%s' n'est pas votre application mail par défaut,\n"
"vous pouvez le modifier dans le panneau de configuration de ce module"
-#: ../mail/src/cd-mail-applet-notifications.c:139
+#: ../mail/src/cd-mail-applet-notifications.c:147
msgid "Refresh a mail account"
msgstr "Rafraîchir un compte e-mail"
-#: ../mail/src/cd-mail-applet-notifications.c:148
+#: ../mail/src/cd-mail-applet-notifications.c:154
+msgid "Refresh all (Middle-click)"
+msgstr "Actualiser tout (Clic du milieu)"
+
+#: ../mail/src/cd-mail-applet-notifications.c:159
+#, c-format
+msgid "Refresh %s"
+msgstr "Actualiser %s"
+
+#: ../mail/src/cd-mail-applet-notifications.c:165
msgid "Mark all emails as read"
msgstr "Marquer tous les messages comme lus."
-#: ../mail/src/cd-mail-applet-notifications.c:151
+#: ../mail/src/cd-mail-applet-notifications.c:168
#, c-format
msgid "Launch %s"
msgstr "Lancer %s"
-#: ../mail/src/cd-mail-applet-notifications.c:326
+#: ../mail/src/cd-mail-applet-notifications.c:346
msgid "Mail"
msgstr "Mail"
@@ -2231,7 +2175,7 @@
" Pour SongBird, vous devez installer le greffon DBus.\n"
" Pour Exaile 0.3, vous devez activer son greffon MPRIS."
-#: ../musicPlayer/src/applet-notifications.c:70
+#: ../musicPlayer/src/applet-notifications.c:74
msgid ""
"Sorry, I couldn't detect any player.\n"
"If it is running, it is maybe because its version is too old and does not "
@@ -2241,50 +2185,50 @@
"S'il est bien lancé, la raison est peut-être que la version est trop vieille "
"et n'offre pas assez de services."
-#: ../musicPlayer/src/applet-notifications.c:162
+#: ../musicPlayer/src/applet-notifications.c:172
msgid "Find opened player"
msgstr "Trouver le lecteur ouvert"
-#: ../musicPlayer/src/applet-notifications.c:169
+#: ../musicPlayer/src/applet-notifications.c:179
msgid "Previous"
msgstr "Précédent"
-#: ../musicPlayer/src/applet-notifications.c:171
+#: ../musicPlayer/src/applet-notifications.c:181
msgid "Play/Pause (left-click)"
msgstr "Jouer/Pause (clic gauche)"
-#: ../musicPlayer/src/applet-notifications.c:173
+#: ../musicPlayer/src/applet-notifications.c:183
msgid "Next (middle-click)"
msgstr "Suivant (clic du milieu)"
-#: ../musicPlayer/src/applet-notifications.c:175
+#: ../musicPlayer/src/applet-notifications.c:185
msgid "Stop"
msgstr "Stop"
-#: ../musicPlayer/src/applet-notifications.c:177
+#: ../musicPlayer/src/applet-notifications.c:189
+msgid "Information"
+msgstr "Informations"
+
+#: ../musicPlayer/src/applet-notifications.c:192
msgid "Show the Window"
msgstr "Afficher la fenêtre"
-#: ../musicPlayer/src/applet-notifications.c:179
+#: ../musicPlayer/src/applet-notifications.c:198
msgid "Show JumpBox"
msgstr "Montrer la boite de Recherche"
-#: ../musicPlayer/src/applet-notifications.c:181
+#: ../musicPlayer/src/applet-notifications.c:200
msgid "Toggle Shuffle"
msgstr "Lecture Aléatoire"
-#: ../musicPlayer/src/applet-notifications.c:183
+#: ../musicPlayer/src/applet-notifications.c:202
msgid "Toggle Repeat"
msgstr "Répétition de la Liste"
-#: ../musicPlayer/src/applet-notifications.c:185
+#: ../musicPlayer/src/applet-notifications.c:204
msgid "Rate this song"
msgstr "Noter cette chanson"
-#: ../musicPlayer/src/applet-notifications.c:187
-msgid "Information"
-msgstr "Informations"
-
#: ../netspeed/src/applet-init.c:29
msgid "netspeed"
msgstr "Vitesse réseau"
@@ -2324,7 +2268,7 @@
"Vous devez probablement choisir l'interface que vous voulez surveiller.\n"
"Voulez-vous le faire maintenant ?"
-#: ../netspeed/src/applet-notifications.c:72
+#: ../netspeed/src/applet-notifications.c:76
msgid "Re-check interface"
msgstr "Revérifier l'interface"
@@ -2505,31 +2449,31 @@
msgid "Enter a name for this bookmark:"
msgstr "Entrez un nom pour ce signet :"
-#: ../shortcuts/src/applet-notifications.c:250
+#: ../shortcuts/src/applet-notifications.c:252
+msgid "Rename this bookmark"
+msgstr "Renommer ce signet"
+
+#: ../shortcuts/src/applet-notifications.c:253
msgid "Remove this bookmark"
msgstr "Supprimer ce signet"
-#: ../shortcuts/src/applet-notifications.c:251
-msgid "Rename this bookmark"
-msgstr "Renommer ce signet"
-
-#: ../shortcuts/src/applet-notifications.c:257
+#: ../shortcuts/src/applet-notifications.c:259
msgid "Eject"
msgstr "Éjecter"
-#: ../shortcuts/src/applet-notifications.c:262
+#: ../shortcuts/src/applet-notifications.c:264
msgid "Unmount (middle-click)"
msgstr "Démonter (clic du milieu)"
-#: ../shortcuts/src/applet-notifications.c:262
+#: ../shortcuts/src/applet-notifications.c:264
msgid "Mount (middle-click)"
msgstr "Monter (clic du milieu)"
-#: ../shortcuts/src/applet-notifications.c:264
+#: ../shortcuts/src/applet-notifications.c:266
msgid "Get disk info"
msgstr "Récupérer les informations du disque"
-#: ../shortcuts/src/applet-notifications.c:289
+#: ../shortcuts/src/applet-notifications.c:292
msgid "Only folders can be bookmarked."
msgstr "Uniquement les dossiers seront ajoutés à la liste des signets."
@@ -2580,20 +2524,20 @@
msgid "Change screen resolution"
msgstr "Modifier la résolution de l'écran"
-#: ../showDesktop/src/applet-notifications.c:299
+#: ../showDesktop/src/applet-notifications.c:305
msgid "Move to the Desktop"
msgstr "Déplacer vers le Bureau"
-#: ../showDesktop/src/applet-notifications.c:300
+#: ../showDesktop/src/applet-notifications.c:306
msgid "Copy to the Desktop"
msgstr "Copier vers le bureau"
-#: ../showDesktop/src/applet-notifications.c:301
-#: ../showDesktop/src/applet-notifications.c:305
+#: ../showDesktop/src/applet-notifications.c:307
+#: ../showDesktop/src/applet-notifications.c:311
msgid "Link to the Desktop"
msgstr "Lier vers le bureau"
-#: ../showDesktop/src/applet-notifications.c:306
+#: ../showDesktop/src/applet-notifications.c:312
msgid "Download onto the Desktop"
msgstr "Télécharger vers le bureau"
@@ -2614,19 +2558,19 @@
"Clic gauche pour Play/Pause ou pour éditer l'image actuelle\n"
"Clic du milieu pour ouvrir le dossier des images."
-#: ../slider/src/applet-notifications.c:166
+#: ../slider/src/applet-notifications.c:167
msgid "Play"
msgstr "Jouer"
-#: ../slider/src/applet-notifications.c:166
+#: ../slider/src/applet-notifications.c:167
msgid "Pause"
msgstr "Pause"
-#: ../slider/src/applet-notifications.c:169
+#: ../slider/src/applet-notifications.c:170
msgid "Open current image"
msgstr "Ouvrir l'image courante"
-#: ../slider/src/applet-notifications.c:171
+#: ../slider/src/applet-notifications.c:172
msgid "Browse images folder"
msgstr "Parcourir le dossier d'images"
@@ -2670,38 +2614,38 @@
msgid "Set new name for this item:"
msgstr "Définir un nouveau nom pour cet objet :"
-#: ../stack/src/applet-notifications.c:165
+#: ../stack/src/applet-notifications.c:167
+msgid "Paste (drag'n'drop)"
+msgstr "Coller (glisser-déposer)"
+
+#: ../stack/src/applet-notifications.c:170
+msgid "Clear the stack"
+msgstr "Vider la pile"
+
+#: ../stack/src/applet-notifications.c:177
+msgid "Open (click)"
+msgstr "Ouvrir (clic)"
+
+#: ../stack/src/applet-notifications.c:179
+msgid "Open parent folder"
+msgstr "Ouvrir le dossier parent"
+
+#: ../stack/src/applet-notifications.c:181
msgid "Copy (middle click)"
msgstr "Copier (clic du milieu)"
-#: ../stack/src/applet-notifications.c:166
+#: ../stack/src/applet-notifications.c:182
msgid "Cut"
msgstr "Couper"
-#: ../stack/src/applet-notifications.c:167
+#: ../stack/src/applet-notifications.c:185
msgid "Rename this item"
msgstr "Renommer cet objet"
-#: ../stack/src/applet-notifications.c:168
+#: ../stack/src/applet-notifications.c:186
msgid "Remove this item"
msgstr "Enlever cet objet"
-#: ../stack/src/applet-notifications.c:172
-msgid "Open (click)"
-msgstr "Ouvrir (clic)"
-
-#: ../stack/src/applet-notifications.c:174
-msgid "Open folder"
-msgstr "Ouvrir le dossier"
-
-#: ../stack/src/applet-notifications.c:179
-msgid "Paste (drag'n'drop)"
-msgstr "Coller (glisser-déposer)"
-
-#: ../stack/src/applet-notifications.c:180
-msgid "Clear the stack"
-msgstr "Vider la pile"
-
#: ../stacks/src/applet-init.c:30
msgid "stacks"
msgstr "Piles"
@@ -2716,7 +2660,7 @@
#: ../switcher/src/applet-draw.c:612 ../switcher/src/applet-draw.c:619
#: ../switcher/src/applet-load-icons.c:43
-#: ../switcher/src/applet-notifications.c:393
+#: ../switcher/src/applet-notifications.c:400
msgid "Current"
msgstr "Courant"
@@ -2724,8 +2668,8 @@
#: ../switcher/src/applet-load-icons.c:49
#: ../switcher/src/applet-notifications.c:213
#: ../switcher/src/applet-notifications.c:225
-#: ../switcher/src/applet-notifications.c:385
-#: ../switcher/src/applet-notifications.c:450
+#: ../switcher/src/applet-notifications.c:392
+#: ../switcher/src/applet-notifications.c:452
msgid "Desktop"
msgstr "Bureau"
@@ -2752,23 +2696,23 @@
"Elle a 2 modes : compacte (sur 1 icône) et étendu (avec un sous-dock)."
#: ../switcher/src/applet-notifications.c:214
-#: ../switcher/src/applet-notifications.c:272
+#: ../switcher/src/applet-notifications.c:273
msgid "Rename this workspace"
msgstr "Renommer cet espace de travail"
-#: ../switcher/src/applet-notifications.c:259
-msgid "Add a desktop"
-msgstr "Ajouter un bureau"
-
-#: ../switcher/src/applet-notifications.c:263
-msgid "Remove last desktop"
-msgstr "Retirer le dernier bureau"
-
-#: ../switcher/src/applet-notifications.c:279
-msgid "Move current Desktop to this Desktop"
-msgstr "Déplacer le bureau courant vers ce bureau"
-
-#: ../switcher/src/applet-notifications.c:284
+#: ../switcher/src/applet-notifications.c:260
+msgid "Add a workspace"
+msgstr "Ajouter un espace de travail"
+
+#: ../switcher/src/applet-notifications.c:264
+msgid "Remove last workspace"
+msgstr "Retirer le dernier espace de travail"
+
+#: ../switcher/src/applet-notifications.c:280
+msgid "Move current workspace to this workspace"
+msgstr "Déplacer l'espace de travail courant vers celui-ci"
+
+#: ../switcher/src/applet-notifications.c:285
msgid ""
"This will move all windows from the current desktop to the one you clicked "
"on."
@@ -2776,21 +2720,21 @@
"Cela déplacera toutes les fenêtres du bureau courant vers celui que vous "
"avez cliqué."
-#: ../switcher/src/applet-notifications.c:290
+#: ../switcher/src/applet-notifications.c:294
msgid "Windows List"
msgstr "Liste des fenêtres"
-#: ../switcher/src/applet-notifications.c:295 ../showDesktop/data/messages:103
+#: ../switcher/src/applet-notifications.c:299 ../showDesktop/data/messages:103
#: ../showDesktop/data/messages:117
msgid "Show the desktop"
msgstr "Montrer le bureau"
-#: ../switcher/src/applet-notifications.c:302 ../showDesktop/data/messages:111
+#: ../switcher/src/applet-notifications.c:306 ../showDesktop/data/messages:111
#: ../showDesktop/data/messages:125 ../switcher/data/messages:107
msgid "Expose all the desktops (Compiz)"
msgstr "Exposé de tous les bureaux (Compiz)"
-#: ../switcher/src/applet-notifications.c:308
+#: ../switcher/src/applet-notifications.c:314
msgid "Refresh"
msgstr "Rafraîchir"
@@ -2869,16 +2813,16 @@
"onglet\n"
"Pour fermer un onglet, tapez 'CTRL+w' ou clic milieu dessus."
-#: ../terminal/src/terminal-menu-functions.c:78
+#: ../terminal/src/terminal-menu-functions.c:79
#: ../terminal/src/terminal-widget.c:374
msgid "New Tab"
msgstr "Nouvel onglet"
-#: ../terminal/src/terminal-menu-functions.c:79
+#: ../terminal/src/terminal-menu-functions.c:80
msgid "Rename current Tab"
msgstr "Renommer l'onglet courant"
-#: ../terminal/src/terminal-menu-functions.c:80
+#: ../terminal/src/terminal-menu-functions.c:81
msgid "Close current Tab"
msgstr "Fermer l'onglet courant"
@@ -2947,39 +2891,39 @@
msgid "Search for tag:"
msgstr "Chercher le tag :"
-#: ../tomboy/src/tomboy-notifications.c:186
-msgid "Reload notes"
-msgstr "Recharger les notes"
-
-#: ../tomboy/src/tomboy-notifications.c:187
+#: ../tomboy/src/tomboy-notifications.c:195
msgid "Add a note"
msgstr "Ajouter une note"
-#: ../tomboy/src/tomboy-notifications.c:193
+#: ../tomboy/src/tomboy-notifications.c:199
msgid "Delete this note"
msgstr "Supprimer cette note"
-#: ../tomboy/src/tomboy-notifications.c:196
+#: ../tomboy/src/tomboy-notifications.c:202
+msgid "Reload notes"
+msgstr "Recharger les notes"
+
+#: ../tomboy/src/tomboy-notifications.c:208
msgid "Search"
msgstr "Chercher"
-#: ../tomboy/src/tomboy-notifications.c:197
+#: ../tomboy/src/tomboy-notifications.c:209
msgid "Search for tag"
msgstr "Chercher le tag"
-#: ../tomboy/src/tomboy-notifications.c:199
+#: ../tomboy/src/tomboy-notifications.c:211
msgid "Search for today's note"
msgstr "Chercher la note du jour"
-#: ../tomboy/src/tomboy-notifications.c:200
+#: ../tomboy/src/tomboy-notifications.c:212
msgid "Search for this week's note"
msgstr "Chercher la note de la semaine"
-#: ../tomboy/src/tomboy-notifications.c:201
+#: ../tomboy/src/tomboy-notifications.c:213
msgid "Search for next week's note"
msgstr "Chercher la note de la semaine prochaine"
-#: ../tomboy/src/tomboy-notifications.c:211
+#: ../tomboy/src/tomboy-notifications.c:223
msgid "Reset marks"
msgstr "Effacer les marques"
@@ -3076,11 +3020,11 @@
msgid "Data are being retrieved, please wait a moment."
msgstr "Données en cours de récupération, merci d'attendre un moment."
-#: ../weather/src/applet-notifications.c:84
+#: ../weather/src/applet-notifications.c:85
msgid "Reload now"
msgstr "Recharger maintenant"
-#: ../weather/src/applet-notifications.c:108
+#: ../weather/src/applet-notifications.c:110
msgid ""
"No data available\n"
" is your connection alive?"
@@ -3088,41 +3032,41 @@
"Aucune donnée disponible\n"
" la connexion est-elle établie ?"
-#: ../weather/src/applet-notifications.c:127
-#: ../weather/src/applet-notifications.c:163
+#: ../weather/src/applet-notifications.c:129
+#: ../weather/src/applet-notifications.c:165
msgid "Temperature"
msgstr "Température"
-#: ../weather/src/applet-notifications.c:128
+#: ../weather/src/applet-notifications.c:130
msgid "Precipitation probability"
msgstr "Probabilité de précipitation"
-#: ../weather/src/applet-notifications.c:129
-#: ../weather/src/applet-notifications.c:164
+#: ../weather/src/applet-notifications.c:131
+#: ../weather/src/applet-notifications.c:166
msgid "Wind"
msgstr "Vent"
-#: ../weather/src/applet-notifications.c:130
-#: ../weather/src/applet-notifications.c:165
+#: ../weather/src/applet-notifications.c:132
+#: ../weather/src/applet-notifications.c:167
msgid "Humidity"
msgstr "Humidité"
-#: ../weather/src/applet-notifications.c:131
-#: ../weather/src/applet-notifications.c:166
+#: ../weather/src/applet-notifications.c:133
+#: ../weather/src/applet-notifications.c:168
msgid "Sunrise"
msgstr "Lever du soleil"
-#: ../weather/src/applet-notifications.c:131
-#: ../weather/src/applet-notifications.c:166
+#: ../weather/src/applet-notifications.c:133
+#: ../weather/src/applet-notifications.c:168
msgid "Sunset"
msgstr "Coucher du soleil"
-#: ../weather/src/applet-notifications.c:139
+#: ../weather/src/applet-notifications.c:141
msgid "Data are being fetched, please re-try in a few seconds."
msgstr ""
"Données en cours de récupération, veuillez re-essayer dans quelques secondes."
-#: ../weather/src/applet-notifications.c:149
+#: ../weather/src/applet-notifications.c:151
msgid ""
"No data available\n"
"Retrying now..."
@@ -3130,11 +3074,11 @@
"Aucune donnée disponible\n"
"Nouvel essai ..."
-#: ../weather/src/applet-notifications.c:163
+#: ../weather/src/applet-notifications.c:165
msgid "Feels like"
msgstr "ressentie"
-#: ../weather/src/applet-notifications.c:165
+#: ../weather/src/applet-notifications.c:167
msgid "Pressure"
msgstr "Pression"
@@ -3241,10 +3185,10 @@
#: ../Animated-icons/data/messages:79 ../Animated-icons/data/messages:97
#: ../Animated-icons/data/messages:149 ../Animated-icons/data/messages:161
#: ../Animated-icons/data/messages:173 ../Animated-icons/data/messages:187
-#: ../Scooby-Do/data/messages:17 ../Scooby-Do/data/messages:21
-#: ../icon-effect/data/messages:101 ../icon-effect/data/messages:123
-#: ../icon-effect/data/messages:145 ../icon-effect/data/messages:167
-#: ../icon-effect/data/messages:187
+#: ../Remote-Control/data/messages:7 ../Scooby-Do/data/messages:15
+#: ../Scooby-Do/data/messages:19 ../icon-effect/data/messages:101
+#: ../icon-effect/data/messages:123 ../icon-effect/data/messages:145
+#: ../icon-effect/data/messages:167 ../icon-effect/data/messages:187
msgid "In ms."
msgstr "En ms"
@@ -3521,7 +3465,7 @@
#: ../Folders/data/messages:27 ../GMenu/data/messages:15
#: ../MeMenu/data/messages:9 ../Messaging-Menu/data/messages:11
#: ../Network-Monitor/data/messages:15 ../RSSreader/data/messages:17
-#: ../Scooby-Do/data/messages:117 ../Status-Notifier/data/messages:15
+#: ../Scooby-Do/data/messages:115 ../Status-Notifier/data/messages:15
#: ../System-Monitor/data/messages:13 ../Toons/data/messages:13
#: ../Xgamma/data/messages:15 ../alsaMixer/data/messages:13
#: ../clock/data/messages:15 ../compiz-icon/data/messages:11
@@ -3544,23 +3488,24 @@
#: ../Folders/data/messages:103 ../GMenu/data/messages:91
#: ../MeMenu/data/messages:85 ../Messaging-Menu/data/messages:87
#: ../Network-Monitor/data/messages:91 ../RSSreader/data/messages:93
-#: ../Scooby-Do/data/messages:1 ../Status-Notifier/data/messages:91
-#: ../System-Monitor/data/messages:89 ../Toons/data/messages:89
-#: ../Xgamma/data/messages:91 ../alsaMixer/data/messages:89
-#: ../clock/data/messages:91 ../compiz-icon/data/messages:87
-#: ../dnd2share/data/messages:87 ../dustbin/data/messages:87
-#: ../keyboard-indicator/data/messages:87 ../logout/data/messages:91
-#: ../mail/data/messages:87 ../motion-blur/data/messages:1
-#: ../musicPlayer/data/messages:89 ../netspeed/data/messages:87
-#: ../powermanager/data/messages:89 ../quick-browser/data/messages:93
-#: ../shortcuts/data/messages:91 ../show-mouse/data/messages:1
-#: ../showDesktop/data/messages:95 ../slider/data/messages:89
-#: ../stack/data/messages:93 ../stacks/data/messages:89
-#: ../switcher/data/messages:83 ../switcher/data/messages:85
-#: ../systray/data/messages:83 ../template/data/messages:91
-#: ../terminal/data/messages:91 ../tomboy/data/messages:101
-#: ../weather/data/messages:89 ../weather/data/messages:91
-#: ../weblets/data/messages:91 ../wifi/data/messages:89
+#: ../Remote-Control/data/messages:1 ../Scooby-Do/data/messages:1
+#: ../Status-Notifier/data/messages:91 ../System-Monitor/data/messages:89
+#: ../Toons/data/messages:89 ../Xgamma/data/messages:91
+#: ../alsaMixer/data/messages:89 ../clock/data/messages:91
+#: ../compiz-icon/data/messages:87 ../dnd2share/data/messages:87
+#: ../dustbin/data/messages:87 ../keyboard-indicator/data/messages:87
+#: ../logout/data/messages:91 ../mail/data/messages:87
+#: ../motion-blur/data/messages:1 ../musicPlayer/data/messages:89
+#: ../netspeed/data/messages:87 ../powermanager/data/messages:89
+#: ../quick-browser/data/messages:93 ../shortcuts/data/messages:91
+#: ../show-mouse/data/messages:1 ../showDesktop/data/messages:95
+#: ../slider/data/messages:89 ../stack/data/messages:93
+#: ../stacks/data/messages:89 ../switcher/data/messages:83
+#: ../switcher/data/messages:85 ../systray/data/messages:83
+#: ../template/data/messages:91 ../terminal/data/messages:91
+#: ../tomboy/data/messages:101 ../weather/data/messages:89
+#: ../weather/data/messages:91 ../weblets/data/messages:91
+#: ../wifi/data/messages:89
msgid "Configuration"
msgstr "Configuration"
@@ -3910,7 +3855,7 @@
#: ../Folders/data/messages:51 ../GMenu/data/messages:39
#: ../MeMenu/data/messages:33 ../Messaging-Menu/data/messages:35
#: ../Network-Monitor/data/messages:39 ../RSSreader/data/messages:41
-#: ../Scooby-Do/data/messages:27 ../Status-Notifier/data/messages:39
+#: ../Scooby-Do/data/messages:25 ../Status-Notifier/data/messages:39
#: ../System-Monitor/data/messages:37 ../Toons/data/messages:37
#: ../Xgamma/data/messages:39 ../alsaMixer/data/messages:37
#: ../clock/data/messages:39 ../compiz-icon/data/messages:35
@@ -4185,7 +4130,7 @@
#: ../Status-Notifier/data/messages:65 ../System-Monitor/data/messages:63
#: ../Toons/data/messages:63 ../Xgamma/data/messages:65
#: ../alsaMixer/data/messages:63 ../clock/data/messages:65
-#: ../clock/data/messages:149 ../compiz-icon/data/messages:61
+#: ../clock/data/messages:157 ../compiz-icon/data/messages:61
#: ../dnd2share/data/messages:61 ../dustbin/data/messages:61
#: ../keyboard-indicator/data/messages:61
#: ../keyboard-indicator/data/messages:113 ../logout/data/messages:65
@@ -4791,7 +4736,7 @@
msgid "Sort folders before files?"
msgstr "Afficher les répertoires avant les fichiers ?"
-#: ../Folders/data/messages:117 ../Scooby-Do/data/messages:103
+#: ../Folders/data/messages:117 ../Scooby-Do/data/messages:101
#: ../quick-browser/data/messages:103
msgid "Show hidden files?"
msgstr "Montrer les fichiers cachés ?"
@@ -5290,15 +5235,23 @@
msgid "big"
msgstr "grand"
+#: ../Remote-Control/data/messages:3
+msgid "Shortkey to trigger the applet:"
+msgstr "Raccourci pour activer l'applet :"
+
+#: ../Remote-Control/data/messages:5 ../Scooby-Do/data/messages:23
+msgid "Animation of the current icon :"
+msgstr "Animation de l'icône sélectionnée :"
+
+#: ../Remote-Control/data/messages:9 ../Scooby-Do/data/messages:21
+msgid "Duration of the stop animation :"
+msgstr "Durée de l'animation d'arrêt"
+
#: ../Scooby-Do/data/messages:3
msgid "Shortkey to enable/disable the finder mode:"
msgstr "Raccourci pour activer/désactiver le mode recherche :"
#: ../Scooby-Do/data/messages:5
-msgid "Shortkey to enable/disable the navigation mode:"
-msgstr "Raccourci pour activer/désactiver le mode navigation :"
-
-#: ../Scooby-Do/data/messages:7
msgid ""
"Maximum number of mails that will be previewed. Put -1 to show the maximum "
"possible."
@@ -5306,11 +5259,11 @@
"Nombre maximum de mails qui seront visibles. Indiquez -1 pour en montrer un "
"maximum."
-#: ../Scooby-Do/data/messages:9
+#: ../Scooby-Do/data/messages:7
msgid "Maximum number of results :"
msgstr "Nombre maximal de résultats :"
-#: ../Scooby-Do/data/messages:11
+#: ../Scooby-Do/data/messages:9
msgid ""
"Number of lines of the listing. If there are more results, the listing will "
"scroll when you go up or down with the arrows."
@@ -5318,180 +5271,172 @@
"Nombre de lignes à afficher. S'il y a plus de résultats, l'affichage de tous "
"les éléments se fera grâce aux flèches du haut et du bas."
-#: ../Scooby-Do/data/messages:13
+#: ../Scooby-Do/data/messages:11
msgid "Number of lines to display :"
msgstr "Nombre de lignes à afficher :"
-#: ../Scooby-Do/data/messages:15
+#: ../Scooby-Do/data/messages:13
msgid "Animations"
msgstr "Animations"
-#: ../Scooby-Do/data/messages:19
+#: ../Scooby-Do/data/messages:17
msgid "Duration of the appearance animation :"
msgstr "Durée de l'animation d'apparition :"
-#: ../Scooby-Do/data/messages:23
-msgid "Duration of the stop animation :"
-msgstr "Durée de l'animation d'arrêt"
-
-#: ../Scooby-Do/data/messages:25
-msgid "Animation of the current icon :"
-msgstr "Animation de l'icône sélectionnée :"
-
-#: ../Scooby-Do/data/messages:29
+#: ../Scooby-Do/data/messages:27
msgid "Font used to display what you type:"
msgstr "Police utilisée pour afficher ce que vous tapez :"
-#: ../Scooby-Do/data/messages:31
+#: ../Scooby-Do/data/messages:29
msgid "Color of the text's frame :"
msgstr "Couleur du cadre du texte :"
-#: ../Scooby-Do/data/messages:33
+#: ../Scooby-Do/data/messages:31
msgid "Font size, relative to the dock size:"
msgstr "Taille de la police, en pourcentage de la taille du dock :"
-#: ../Scooby-Do/data/messages:35
+#: ../Scooby-Do/data/messages:33
msgid "between 1 and 9, the higher, the bigger."
msgstr "entre 1 et 9, du plus fin au plus large."
-#: ../Scooby-Do/data/messages:37
+#: ../Scooby-Do/data/messages:35
msgid "Text size:"
msgstr "Poids du texte :"
-#: ../Scooby-Do/data/messages:39 ../keyboard-indicator/data/messages:103
+#: ../Scooby-Do/data/messages:37 ../keyboard-indicator/data/messages:103
msgid "Outline text?"
msgstr "Tracer le contour du texte ?"
-#: ../Scooby-Do/data/messages:41 ../clock/data/messages:145
+#: ../Scooby-Do/data/messages:39 ../clock/data/messages:145
msgid "Text colour:"
msgstr "Couleur du texte :"
-#: ../Scooby-Do/data/messages:43
+#: ../Scooby-Do/data/messages:41
msgid "Character background colour:"
msgstr "Couleur d'arrière plan des caractères :"
-#: ../Scooby-Do/data/messages:45
+#: ../Scooby-Do/data/messages:43
msgid "Write text on the top of the dock?"
msgstr "Écrire le texte sur le haut du dock ?"
-#: ../Scooby-Do/data/messages:47
+#: ../Scooby-Do/data/messages:45
msgid "Favorite applications"
msgstr "Applications préférées"
-#: ../Scooby-Do/data/messages:49
+#: ../Scooby-Do/data/messages:47
msgid "FAvorite applications starting with 'a' :"
msgstr "Application préférée commençant avec la lettre 'a'"
-#: ../Scooby-Do/data/messages:51
+#: ../Scooby-Do/data/messages:49
msgid "Favorite application starting with 'b' :"
msgstr "Application préférée commençant avec la lettre 'b'"
-#: ../Scooby-Do/data/messages:53
+#: ../Scooby-Do/data/messages:51
msgid "Favorite application(s) starting with 'c' :"
msgstr "Application préférée commençant avec la lettre 'c'"
-#: ../Scooby-Do/data/messages:55
+#: ../Scooby-Do/data/messages:53
msgid "Favorite application(s starting with 'd' :"
msgstr "Application préférée commençant avec la lettre 'd'"
-#: ../Scooby-Do/data/messages:57
+#: ../Scooby-Do/data/messages:55
msgid "Favorite application(s) starting with 'e' :"
msgstr "Application préférée commençant avec la lettre 'e'"
-#: ../Scooby-Do/data/messages:59
+#: ../Scooby-Do/data/messages:57
msgid "Favorite application(s) starting with 'f' :"
msgstr "Application préférée commençant avec la lettre 'f'"
-#: ../Scooby-Do/data/messages:61
+#: ../Scooby-Do/data/messages:59
msgid "Favorite application(s) starting with 'g' :"
msgstr "Application préférée commençant avec la lettre 'g'"
-#: ../Scooby-Do/data/messages:63
+#: ../Scooby-Do/data/messages:61
msgid "Favorite application(s) starting with 'h' :"
msgstr "Application préférée commençant avec la lettre 'h'"
-#: ../Scooby-Do/data/messages:65
+#: ../Scooby-Do/data/messages:63
msgid "Favorite application(s) starting with 'i' :"
msgstr "Application préférée commençant avec la lettre 'i'"
-#: ../Scooby-Do/data/messages:67
+#: ../Scooby-Do/data/messages:65
msgid "Favorite application(s) starting with 'j' :"
msgstr "Application préférée commençant avec la lettre 'j'"
-#: ../Scooby-Do/data/messages:69
+#: ../Scooby-Do/data/messages:67
msgid "Favorite application(s) starting with 'k' :"
msgstr "Application préférée commençant avec la lettre 'k'"
-#: ../Scooby-Do/data/messages:71
+#: ../Scooby-Do/data/messages:69
msgid "Favorite application(s) starting with 'l' :"
msgstr "Application préférée commençant avec la lettre 'l'"
-#: ../Scooby-Do/data/messages:73
+#: ../Scooby-Do/data/messages:71
msgid "Favorite application(s) starting with 'm' :"
msgstr "Application préférée commençant avec la lettre 'm'"
-#: ../Scooby-Do/data/messages:75
+#: ../Scooby-Do/data/messages:73
msgid "Favorite application(s) starting with 'n' :"
msgstr "Application préférée commençant avec la lettre 'n'"
-#: ../Scooby-Do/data/messages:77
+#: ../Scooby-Do/data/messages:75
msgid "Favorite application(s) starting with 'o' :"
msgstr "Application préférée commençant avec la lettre 'o'"
-#: ../Scooby-Do/data/messages:79
+#: ../Scooby-Do/data/messages:77
msgid "Favorite application(s) starting with 'p' :"
msgstr "Application préférée commençant avec la lettre 'p'"
-#: ../Scooby-Do/data/messages:81
+#: ../Scooby-Do/data/messages:79
msgid "Favorite application(s) starting with 'q' :"
msgstr "Application préférée commençant avec la lettre 'q'"
-#: ../Scooby-Do/data/messages:83
+#: ../Scooby-Do/data/messages:81
msgid "Favorite application(s) starting with 'r' :"
msgstr "Application préférée commençant avec la lettre 'r'"
-#: ../Scooby-Do/data/messages:85
+#: ../Scooby-Do/data/messages:83
msgid "Favorite application(s) starting with 's' :"
msgstr "Application préférée commençant avec la lettre 's'"
-#: ../Scooby-Do/data/messages:87
+#: ../Scooby-Do/data/messages:85
msgid "Favorite application(s) starting with 't' :"
msgstr "Application préférée commençant avec la lettre 't'"
-#: ../Scooby-Do/data/messages:89
+#: ../Scooby-Do/data/messages:87
msgid "Favorite application(s) starting with 'u' :"
msgstr "Application préférée commençant avec la lettre 'u'"
-#: ../Scooby-Do/data/messages:91
+#: ../Scooby-Do/data/messages:89
msgid "Favorite application(s) starting with 'v' :"
msgstr "Application préférée commençant avec la lettre 'v'"
-#: ../Scooby-Do/data/messages:93
+#: ../Scooby-Do/data/messages:91
msgid "Favorite application(s) starting with 'w' :"
msgstr "Application préférée commençant avec la lettre 'w'"
-#: ../Scooby-Do/data/messages:95
+#: ../Scooby-Do/data/messages:93
msgid "Favorite application(s) starting with 'x' :"
msgstr "Application préférée commençant avec la lettre 'x'"
-#: ../Scooby-Do/data/messages:97
+#: ../Scooby-Do/data/messages:95
msgid "Favorite application(s) starting with 'y' :"
msgstr "Application préférée commençant avec la lettre 'y'"
-#: ../Scooby-Do/data/messages:99
+#: ../Scooby-Do/data/messages:97
msgid "Favorite application(s) starting with 'z' :"
msgstr "Application préférée commençant avec la lettre 'z'"
-#: ../Scooby-Do/data/messages:109
+#: ../Scooby-Do/data/messages:107
msgid "Propose some web search engines ?"
msgstr "Proposer des moteurs de recherche du web?"
-#: ../Scooby-Do/data/messages:111
+#: ../Scooby-Do/data/messages:109
msgid "It can launch commands and even do some calculations."
msgstr ""
"Il est possible d'exécuter des commandes et même des faire des calculs"
-#: ../Scooby-Do/data/messages:115
+#: ../Scooby-Do/data/messages:113
msgid "Help"
msgstr "Aide"
@@ -5889,28 +5834,44 @@
msgstr "Police"
#: ../clock/data/messages:147
+msgid "Layout of the text:"
+msgstr "Agencement du texte :"
+
+#: ../clock/data/messages:149
+msgid "Automatic"
+msgstr "Automatique"
+
+#: ../clock/data/messages:151
+msgid "On 1 line"
+msgstr "Sur une ligne"
+
+#: ../clock/data/messages:153
+msgid "On 2 lines"
+msgstr "Sur deux lignes"
+
+#: ../clock/data/messages:155
msgid "Ratio to apply on text :"
msgstr "Ratio à appliquer sur le texte :"
-#: ../clock/data/messages:151
+#: ../clock/data/messages:159
msgid "Configure time and date"
msgstr "Régler la date et l'heure"
-#: ../clock/data/messages:153
+#: ../clock/data/messages:161
msgid "Leave empty to use the default command."
msgstr "Laissez vide pour utiliser la commande par défaut."
-#: ../clock/data/messages:155
+#: ../clock/data/messages:163
msgid "Specific command to run:"
msgstr "Commande spécifique à exécuter :"
-#: ../clock/data/messages:159
+#: ../clock/data/messages:167
msgid ""
"The new alarm will be added to the end / the last alarm will be removed."
msgstr ""
"La nouvelle alarme sera ajoutée à la fin / la dernière alarme sera enlevée."
-#: ../clock/data/messages:161
+#: ../clock/data/messages:169
msgid "Add or remove an alarm:"
msgstr "Ajoute ou retire une alarme :"
@@ -6987,7 +6948,7 @@
#: ../musicPlayer/data/messages:107
msgid "GMusicBrowser"
-msgstr ""
+msgstr "GMusicBrowser"
#: ../musicPlayer/data/messages:109
msgid "Guayadeque"
@@ -7605,18 +7566,6 @@
msgid "Manual order"
msgstr "Ordre manuel"
-#: ../stack/data/messages:135
-msgid ""
-"It is the selection made by the mouse, as opposed to usual ctrl+c/ctrl+v "
-"clipboard"
-msgstr ""
-"C'est la sélection faite à la souris, par opposition à celle de Ctrl+C / "
-"Ctrl+V"
-
-#: ../stack/data/messages:137
-msgid "When copying/pasting/cutting, use the selection clipboard?"
-msgstr "Lors d'un copier/coller/couper, utiliser la sélection souris ?"
-
#: ../stacks/data/messages:91
msgid "Directory & Options"
msgstr "Répertoire & Options"
@@ -8097,6 +8046,109 @@
msgid "Overwrite the default label with the connection point name?"
msgstr "Écraser l'étiquette par défaut avec le nom du point d'accès ?"
+#~ msgid "Quick launch"
+#~ msgstr "Lancement rapide"
+
+#~ msgid "Monitor System"
+#~ msgstr "Moniteur système"
+
+#~ msgid "Open folder"
+#~ msgstr "Ouvrir le dossier"
+
+#~ msgid "Add a desktop"
+#~ msgstr "Ajouter un bureau"
+
+#~ msgid "Remove last desktop"
+#~ msgstr "Retirer le dernier bureau"
+
+#~ msgid "Hey, you there!"
+#~ msgstr "Hé, vous là !"
+
+#~ msgid "Move current Desktop to this Desktop"
+#~ msgstr "Déplacer le bureau courant vers ce bureau"
+
+#~ msgid "Shortkey to enable/disable the navigation mode:"
+#~ msgstr "Raccourci pour activer/désactiver le mode navigation :"
+
+#~ msgid "When copying/pasting/cutting, use the selection clipboard?"
+#~ msgstr "Lors d'un copier/coller/couper, utiliser la sélection souris ?"
+
+#~ msgid ""
+#~ "It is the selection made by the mouse, as opposed to usual ctrl+c/ctrl+v "
+#~ "clipboard"
+#~ msgstr ""
+#~ "C'est la sélection faite à la souris, par opposition à celle de Ctrl+C / "
+#~ "Ctrl+V"
+
+#~ msgid ""
+#~ "This plug-in allows you to make different actions directly from the "
+#~ "keyboard.\n"
+#~ "It has 2 modes, each one being triggered by a keyboard shortcut:\n"
+#~ "\n"
+#~ "- the finder mode (default shortcut : CTRL + Enter) :\n"
+#~ " It lets you find and launch applications, files, recent files, firefox "
+#~ "bookmarks, commands, and even calculations.\n"
+#~ " Type what you want to search, the results will be displayed in real "
+#~ "time.\n"
+#~ " The first results of each category are displayed in the main listing.\n"
+#~ " Use the up/down arrows to navigate inside the list,\n"
+#~ " and use the left/right arrows to enter into a category, or to display "
+#~ "more actions (when a little arrow is drawn next to text).\n"
+#~ " Once inside a category, you can filter the results by typing some "
+#~ "letters.\n"
+#~ " Press Enter to validate, maintain SHIFT or ALT to keep the list of "
+#~ "results opened.\n"
+#~ "\n"
+#~ "- the navigation mode (default shortcut : CTRL + F9) :\n"
+#~ " use the arrows to navigate into the docks and sub-docks,\n"
+#~ " or type the name of a launcher and press Tab to automatically jump to "
+#~ "the next suitable launcher\n"
+#~ " press Enter to click on the icon, Shift+Enter for Shift+click, Alt+Enter "
+#~ "for middle click, and Ctrl+Enter for left click\n"
+#~ "Escape or the same shortkey will cancel."
+#~ msgstr ""
+#~ "Ce plug-in vous permet de faire différentes actions directement depuis le "
+#~ "clavier.\n"
+#~ "Il a 2 modes, chacun déclenché par un raccourci clavier :\n"
+#~ "\n"
+#~ "-le mode chercheur (raccourci par défaut: CTRL + Entrer) :\n"
+#~ " Il vous laisse trouver et exécuter des applications, fichiers, fichiers "
+#~ "récents, marque-pages de firefox, commandes, et même des calculs\n"
+#~ " Tapez ce que vous voulez chercher, les résultats s'afficheront en temps "
+#~ "réel.\n"
+#~ " Les premiers résultats de chaque catégorie sont affichés dans la liste "
+#~ "principale.\n"
+#~ " Utilisez les touches fléchées haut/bas pour naviguer parmi les résultats "
+#~ "de la liste,\n"
+#~ " et utilisez les touches fléchées gauche/droite pour entrer dans une "
+#~ "catégorie, ou pour afficher plus d'informations (quand une petite flèche est "
+#~ "dessinée à coté du texte).\n"
+#~ " Une fois dans la liste, vous pouvez filtrer les résultats en entrant "
+#~ "quelques lettres.\n"
+#~ " Appuyez sur Entrer pour valider. (maintenir SHIFT ou ALT pour garder la "
+#~ "liste des résultats ouverte)\n"
+#~ "\n"
+#~ "- le mode navigation (raccourci par défaut: CTRL + F9) :\n"
+#~ " utilisez les touches fléchées pour naviguer dans le dock et les sous-"
+#~ "docks,\n"
+#~ " ou tapez le nom d'un lanceur et appuyez sur Tab pour passer au lanceur "
+#~ "suivant\n"
+#~ " appuyez sur Entrer pour cliquer sur l'icône, Shift+Entrer pour "
+#~ "Shift+cliquer, Alt+Entrer pour un clic de molette et Ctrl+Entrer pour un "
+#~ "clic gauche\n"
+#~ "Echap ou la touche raccourci pour sortir."
+
+#~ msgid ""
+#~ "A <b>notification area</b> for your dock\n"
+#~ "Also called 'systray'.\n"
+#~ "It is designed to work on any desktop that supports the latest systray "
+#~ "specifications (KDE, Gnome, etc)"
+#~ msgstr ""
+#~ "Une <b>zone de notification</b> pour votre dock.\n"
+#~ "Aussi appelée 'systray'.\n"
+#~ "Il a été conçu pour fonctionner avec tout environnement qui supporte les "
+#~ "dernières spécifications du systray (KDE, Gnome, etc.)"
+
#~ msgid ""
#~ "An applet that let you access quickly to all of your shortcuts.\n"
#~ "It can manage disks, network points, and Nautilus bookmarks (even if you "
@@ -8118,12 +8170,3 @@
#~ "rapidement.\n"
#~ "L'applet peut aussi afficher des informations intéressantes à propos de vos "
#~ "disques, comme l'espace disponible, le type, etc."
-
-#~ msgid "Add a workspace"
-#~ msgstr "Ajouter un espace de travail"
-
-#~ msgid "Remove last workspace"
-#~ msgstr "Retirer le dernier espace de travail"
-
-#~ msgid "Move current workspace to this workspace"
-#~ msgstr "Déplacer l'espace de travail courant vers celui-ci"
=== modified file 'po/hu.po'
--- po/hu.po 2010-09-07 00:39:20 +0000
+++ po/hu.po 2010-09-22 10:43:43 +0000
@@ -8,13 +8,13 @@
"Project-Id-Version: cairo-dock-plug-ins\n"
"Report-Msgid-Bugs-To: fabounet@xxxxxxxxxxxx\n"
"POT-Creation-Date: 2010-08-29 00:59+0000\n"
-"PO-Revision-Date: 2010-09-03 05:08+0000\n"
+"PO-Revision-Date: 2010-09-07 03:52+0000\n"
"Last-Translator: Krasznecz Zoltán <zoltan.krasznecz@xxxxxxxxx>\n"
"Language-Team: Hungarian <hu@xxxxxx>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-09-04 04:53+0000\n"
+"X-Launchpad-Export-Date: 2010-09-08 04:51+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#: ../Animated-icons/src/applet-init.c:32
=== modified file 'po/it.po'
--- po/it.po 2010-09-07 00:39:20 +0000
+++ po/it.po 2010-09-22 10:43:43 +0000
@@ -7,14 +7,14 @@
msgstr ""
"Project-Id-Version: 1.0.0\n"
"Report-Msgid-Bugs-To: fabounet@xxxxxxxxxxxx\n"
-"POT-Creation-Date: 2010-08-29 00:59+0000\n"
-"PO-Revision-Date: 2010-09-03 05:09+0000\n"
-"Last-Translator: Mattia Tavernini <maathias@xxxxxxxxxxxx>\n"
+"POT-Creation-Date: 2010-09-13 00:36+0000\n"
+"PO-Revision-Date: 2010-09-13 10:12+0000\n"
+"Last-Translator: Andrea Amoroso <andrea.amoroso@xxxxxxxx>\n"
"Language-Team: Italian <LL@xxxxxx>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-09-04 04:53+0000\n"
+"X-Launchpad-Export-Date: 2010-09-14 05:00+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#: ../Animated-icons/src/applet-init.c:32
@@ -144,29 +144,25 @@
msgid "For Aiur!"
msgstr "Per Aiur!"
-#: ../Cairo-Penguin/src/applet-notifications.c:123
-msgid "Hey, you there!"
-msgstr "Hey, tu là !"
-
-#: ../Cairo-Penguin/src/applet-notifications.c:127
+#: ../Cairo-Penguin/src/applet-notifications.c:126
msgid "Wake up"
msgstr "Sveglia!"
-#: ../Cairo-Penguin/src/applet-notifications.c:131
+#: ../Cairo-Penguin/src/applet-notifications.c:130
msgid "Keep quiet"
msgstr "Stai calmo!"
-#: ../Cairo-Penguin/src/applet-notifications.c:134
-#: ../Scooby-Do/data/messages:101
+#: ../Cairo-Penguin/src/applet-notifications.c:133
+#: ../Scooby-Do/data/messages:99
msgid "Start XPenguins"
msgstr "Lancia XPenguins"
-#: ../Cairo-Penguin/src/applet-notifications.c:135
+#: ../Cairo-Penguin/src/applet-notifications.c:134
msgid "Stop XPenguins"
msgstr "Arresta XPenguins"
-#: ../Cairo-Penguin/src/applet-notifications.c:158
-#: ../Cairo-Penguin/src/applet-notifications.c:160
+#: ../Cairo-Penguin/src/applet-notifications.c:157
+#: ../Cairo-Penguin/src/applet-notifications.c:159
msgid "Zzzzz"
msgstr "Zzzzz"
@@ -196,7 +192,7 @@
msgid "Clipboard history"
msgstr "Cronologia degli appunti"
-#: ../Clipper/src/applet-notifications.c:99
+#: ../Clipper/src/applet-notifications.c:101
msgid ""
"No persistent items.\n"
"You can add some by drag and dropping some text on the icon."
@@ -346,33 +342,37 @@
"Controlla i permessi del file \n"
"e che il nome scelto non esista già ."
-#: ../Folders/src/applet-notifications.c:319
-msgid "Open with"
-msgstr "Apri con"
-
-#: ../Folders/src/applet-notifications.c:352
+#: ../Folders/src/applet-notifications.c:322
+msgid "Open the folder (middle-click)"
+msgstr "Apri la cartella (click centrale)"
+
+#: ../Folders/src/applet-notifications.c:328
+msgid "Rename this file"
+msgstr "Rinomina questo file"
+
+#: ../Folders/src/applet-notifications.c:329
msgid "Delete this file"
msgstr "Elimina questo file"
-#: ../Folders/src/applet-notifications.c:354
-msgid "Rename this file"
-msgstr "Rinomina questo file"
-
-#: ../Folders/src/applet-notifications.c:356
+#: ../Folders/src/applet-notifications.c:330
msgid "Move this file"
msgstr "Muovi questo file"
-#: ../Folders/src/applet-notifications.c:358
+#: ../Folders/src/applet-notifications.c:336
+msgid "Open with"
+msgstr "Apri con"
+
+#: ../Folders/src/applet-notifications.c:370
msgid "Properties"
msgstr "Proprietà "
-#: ../Folders/src/applet-notifications.c:360
+#: ../Folders/src/applet-notifications.c:373
msgid "Create a new file"
msgstr "Crea un nuovo file"
-#: ../Folders/src/applet-notifications.c:364
-msgid "Open the folder (middle-click)"
-msgstr "Apri la cartella (click centrale)"
+#: ../Folders/src/applet-notifications.c:374
+msgid "Create a new folder"
+msgstr "Crea una nuova cartella"
#: ../GMenu/src/applet-init.c:33
msgid ""
@@ -392,15 +392,15 @@
msgid "Applications Menu"
msgstr "Menu Applicazioni"
-#: ../GMenu/src/applet-notifications.c:147
-msgid "Quick launch"
-msgstr "Avvio veloce"
+#: ../GMenu/src/applet-notifications.c:75
+msgid "Quick launch (Middle-click)"
+msgstr "Avvio rapido (Tasto centrale)"
-#: ../GMenu/src/applet-notifications.c:148
+#: ../GMenu/src/applet-notifications.c:77
msgid "Configure menu"
msgstr "Menu di configurazione"
-#: ../GMenu/src/applet-notifications.c:149
+#: ../GMenu/src/applet-notifications.c:80
msgid "Clear recent"
msgstr "Cancella i dati recenti"
@@ -412,7 +412,7 @@
msgid "Clear the list of the recently used documents?"
msgstr "Cancella la lista dei documenti usati di recente?"
-#: ../GMenu/src/applet-run-dialog.c:349 ../Scooby-Do/data/messages:113
+#: ../GMenu/src/applet-run-dialog.c:349 ../Scooby-Do/data/messages:111
msgid "Enter a command to launch:"
msgstr "Inserisci un comando da lanciare:"
@@ -612,12 +612,12 @@
msgstr "Caricamento in corso"
#: ../Network-Monitor/src/applet-notifications.c:100
-#: ../wifi/src/applet-notifications.c:75
+#: ../wifi/src/applet-notifications.c:76
msgid "Check for Wireless Extension"
msgstr "Verifica dell'Estensione Wireless"
#: ../Network-Monitor/src/applet-notifications.c:101
-#: ../wifi/src/applet-notifications.c:76
+#: ../wifi/src/applet-notifications.c:77
msgid "Network Administration"
msgstr "Amministrazione della Rete"
@@ -787,16 +787,16 @@
msgstr "Apri in una nuova finestra"
#: ../Scooby-Do/src/applet-backend-firefox.c:433
-#: ../dnd2share/src/applet-notifications.c:461
+#: ../dnd2share/src/applet-notifications.c:470
msgid "Open file"
msgstr "Apri file"
#: ../Scooby-Do/src/applet-backend-firefox.c:496
-#: ../Scooby-Do/data/messages:105
+#: ../Scooby-Do/data/messages:103
msgid "Firefox bookmarks"
msgstr "Segnalibri Firefox"
-#: ../Scooby-Do/src/applet-backend-recent.c:212 ../Scooby-Do/data/messages:107
+#: ../Scooby-Do/src/applet-backend-recent.c:212 ../Scooby-Do/data/messages:105
msgid "Recent files"
msgstr "File recenti"
@@ -824,62 +824,6 @@
msgid "Amazon"
msgstr "Amazon"
-#: ../Scooby-Do/src/applet-init.c:39
-msgid ""
-"This plug-in allows you to make different actions directly from the "
-"keyboard.\n"
-"It has 2 modes, each one being triggered by a keyboard shortcut:\n"
-"\n"
-"- the finder mode (default shortcut : CTRL + Enter) :\n"
-" It lets you find and launch applications, files, recent files, firefox "
-"bookmarks, commands, and even calculations.\n"
-" Type what you want to search, the results will be displayed in real "
-"time.\n"
-" The first results of each category are displayed in the main listing.\n"
-" Use the up/down arrows to navigate inside the list,\n"
-" and use the left/right arrows to enter into a category, or to display "
-"more actions (when a little arrow is drawn next to text).\n"
-" Once inside a category, you can filter the results by typing some "
-"letters.\n"
-" Press Enter to validate, maintain SHIFT or ALT to keep the list of "
-"results opened.\n"
-"\n"
-"- the navigation mode (default shortcut : CTRL + F9) :\n"
-" use the arrows to navigate into the docks and sub-docks,\n"
-" or type the name of a launcher and press Tab to automatically jump to "
-"the next suitable launcher\n"
-" press Enter to click on the icon, Shift+Enter for Shift+click, Alt+Enter "
-"for middle click, and Ctrl+Enter for left click\n"
-"Escape or the same shortkey will cancel."
-msgstr ""
-"Questo plugin ti permette di compiere differenti azioni direttamente dalla "
-"tastiera.\n"
-"Ha due modalità , ciascuna attivabile da una scorciatoia di tastiera:\n"
-"\n"
-"- la modalità ricerca (scorciatoia predefinita Ctrl + Invio):\n"
-" Ti permette di cercare e lanciare le applicazioni, file, file recenti, "
-"segnalibri di firefox, comandi, e anche calcoli.\n"
-" Scrivi quello che vuoi cercare, il risultato viene mostrato in tempo "
-"reale.\n"
-" Il primo risultato di ciascuna categoria è mostrato nella lista "
-"principale.\n"
-" Utilizza le frecce su/giù per navigare nella lista,\n"
-" e usa le frecce sinistra/destra per entrare in una categoria, o per "
-"mostrare ulteriori azioni (quando una piccola freccia è disegnata dopo il "
-"testo).\n"
-" Quando sei dentro una categoria, puoi filtrare i risultati digitando "
-"delle lettere.\n"
-" Premi Invio per confermare, mantenendo Shift o Alt premuti se si vuole "
-"lasciare aperta la lista dei risultati.\n"
-"\n"
-"- la modalità navigazione (scorciatoia di default Ctrl + F9):\n"
-" utilizza le frecce per navigare nella dock e nelle sub-dock,\n"
-" o digita il nome del lanciatore e premi Tab per saltare automaticamente "
-"al successivo lanciatore\n"
-" premi Invio per cliccare sull'icona, Shift+Invio come Shift+click del "
-"mouse, Alt+Invio come click centrale, Ctrl+Invio come click sinistro\n"
-"Esc o la stessa scorciatoia cancellerà l'operazione."
-
#: ../Scooby-Do/src/applet-listing.c:510
msgid "(F1) Match case"
msgstr "(F1) Risultato idoneo"
@@ -926,27 +870,17 @@
msgid "Searching ..."
msgstr "Ricerca in corso..."
-#: ../Scooby-Do/src/applet-session.c:50
+#: ../Scooby-Do/src/applet-session.c:62
msgid "Enter your search"
msgstr "Inserisci la tua ricerca"
-#: ../Status-Notifier/src/applet-init.c:31
+#: ../Status-Notifier/src/applet-init.c:32
msgid "Status Notifier"
msgstr "Notifiche di status"
-#: ../Status-Notifier/src/applet-init.c:34
-msgid ""
-"A <b>notification area</b> for your dock\n"
-"Also called 'systray'.\n"
-"It is designed to work on any desktop that supports the latest systray "
-"specifications (KDE, Gnome, etc)"
-msgstr ""
-"Un'<b>area di notifica</b> per la tua dock\n"
-"Chiamata anche 'systray' (o Area di notifica).\n"
-"E' designata a lavorare su tutti i desktop che supportano le ultimissime "
-"specifiche systray (KDE, Gnome, etc)"
-
#: ../System-Monitor/src/applet-init.c:30
+#: ../System-Monitor/src/applet-notifications.c:116
+#: ../netspeed/src/applet-notifications.c:72
msgid "System Monitor"
msgstr "Monitor di Sistema"
@@ -1032,12 +966,8 @@
msgid "Buffers"
msgstr "Amplificazioni"
-#: ../System-Monitor/src/applet-notifications.c:115
-#: ../netspeed/src/applet-notifications.c:70
-msgid "Monitor System"
-msgstr "Monitorare il sistema"
-
#: ../System-Monitor/src/applet-nvidia.c:141
+#: ../System-Monitor/src/applet-sensors.c:161
#, c-format
msgid "Alert! Graphic Card core temperature has reached %d°C"
msgstr ""
@@ -1075,7 +1005,7 @@
msgid "Set up gamma:"
msgstr "Regolare il valore gamma:"
-#: ../Xgamma/src/applet-notifications.c:61
+#: ../Xgamma/src/applet-notifications.c:62
msgid "Apply current luminosity on startup"
msgstr "Applica l'attuale luminosità all'avvio"
@@ -1133,155 +1063,122 @@
msgid "Set up volume:"
msgstr "Regola il volume:"
-#: ../alsaMixer/src/applet-notifications.c:57
+#: ../alsaMixer/src/applet-notifications.c:58
msgid "Adjust channels"
msgstr "Aggiusta i canali"
#: ../alsaMixer/src/applet-notifications.c:59
-msgid "Unmute"
-msgstr "Attiva audio"
-
-#: ../alsaMixer/src/applet-notifications.c:61
-msgid "Mute"
-msgstr "Escludi audio"
-
-#: ../clock/src/applet-calendar.c:190 ../clock/src/applet-calendar.c:271
-#: ../clock/src/applet-calendar.c:437 ../clock/src/applet-calendar.c:442
-#: ../clock/src/applet-draw.c:83 ../clock/src/applet-draw.c:339
-#: ../clock/src/applet-draw.c:353 ../clock/src/applet-draw.c:374
-#: ../clock/src/applet-task-editor.c:119
+msgid "Unmute (middle-click)"
+msgstr "Attiva audio (tasto centrale)"
+
+#: ../alsaMixer/src/applet-notifications.c:59
+msgid "Mute (middle-click)"
+msgstr "Muto (tasto centrale)"
+
+#: ../clock/src/applet-calendar.c:193 ../clock/src/applet-calendar.c:274
+#: ../clock/src/applet-calendar.c:519 ../clock/src/applet-calendar.c:524
+#: ../clock/src/applet-task-editor.c:119 ../clock/src/applet-timer.c:84
+#: ../clock/src/applet-timer.c:172 ../clock/src/applet-timer.c:454
+#: ../clock/src/applet-timer.c:471 ../clock/src/applet-timer.c:491
msgid "No title"
msgstr "Nessun titolo"
-#: ../clock/src/applet-calendar.c:438
+#: ../clock/src/applet-calendar.c:520
msgid "years"
msgstr "anni"
-#: ../clock/src/applet-calendar.c:555
+#: ../clock/src/applet-calendar.c:637
msgid "Calendar and tasks"
msgstr "Calendario e attività "
-#: ../clock/src/applet-config.c:35 ../clock/data/messages:157
+#: ../clock/src/applet-config.c:36 ../clock/data/messages:165
msgid "Alarm"
msgstr "Allarme"
-#: ../clock/src/applet-config.c:35
+#: ../clock/src/applet-config.c:36
msgid "Time you want to be notified:"
msgstr "Ora alla quale vuoi essere avvertito:"
-#: ../clock/src/applet-config.c:35
+#: ../clock/src/applet-config.c:36
msgid "In the form xx:xx. E.g.: 20:35 for 8:35pm"
msgstr "Nel formato xx:xx Es.: 20:35 per 8:35pm"
-#: ../clock/src/applet-config.c:35
+#: ../clock/src/applet-config.c:36
msgid "Never"
msgstr "Mai"
-#: ../clock/src/applet-config.c:35
+#: ../clock/src/applet-config.c:36
msgid "Day"
msgstr "Giorni"
-#: ../clock/src/applet-config.c:35 ../weather/src/applet-load-icons.c:26
+#: ../clock/src/applet-config.c:36 ../weather/src/applet-load-icons.c:26
msgid "Monday"
msgstr "Lunedì"
-#: ../clock/src/applet-config.c:35 ../weather/src/applet-load-icons.c:26
+#: ../clock/src/applet-config.c:36 ../weather/src/applet-load-icons.c:26
msgid "Tuesday"
msgstr "Martedì"
-#: ../clock/src/applet-config.c:35 ../weather/src/applet-load-icons.c:26
+#: ../clock/src/applet-config.c:36 ../weather/src/applet-load-icons.c:26
msgid "Wednesday"
msgstr "Mercoledì"
-#: ../clock/src/applet-config.c:35 ../weather/src/applet-load-icons.c:26
+#: ../clock/src/applet-config.c:36 ../weather/src/applet-load-icons.c:26
msgid "Thursday"
msgstr "Giovedì"
-#: ../clock/src/applet-config.c:35 ../weather/src/applet-load-icons.c:26
+#: ../clock/src/applet-config.c:36 ../weather/src/applet-load-icons.c:26
msgid "Friday"
msgstr "Venerdì"
-#: ../clock/src/applet-config.c:35 ../weather/src/applet-load-icons.c:26
+#: ../clock/src/applet-config.c:36 ../weather/src/applet-load-icons.c:26
msgid "Saturday"
msgstr "Sabato"
-#: ../clock/src/applet-config.c:35 ../weather/src/applet-load-icons.c:26
+#: ../clock/src/applet-config.c:36 ../weather/src/applet-load-icons.c:26
msgid "Sunday"
msgstr "Domenica"
-#: ../clock/src/applet-config.c:35
+#: ../clock/src/applet-config.c:36
msgid "Week Day"
msgstr "Giorni della settimana"
-#: ../clock/src/applet-config.c:35
+#: ../clock/src/applet-config.c:36
msgid "Week End"
msgstr "Week End"
-#: ../clock/src/applet-config.c:35
+#: ../clock/src/applet-config.c:36
msgid "Month"
msgstr "Mesi"
-#: ../clock/src/applet-config.c:35
+#: ../clock/src/applet-config.c:36
msgid "Repeat every:"
msgstr "Ripeti ogni:"
-#: ../clock/src/applet-config.c:35
+#: ../clock/src/applet-config.c:36
msgid "If every month, which day of the month?"
msgstr "Se ogni mese, quale giorno del mese?"
-#: ../clock/src/applet-config.c:35
+#: ../clock/src/applet-config.c:36
msgid "Message you want to use to be notified:"
msgstr "Messaggio che vuoi utilizzare per essere avvertito:"
-#: ../clock/src/applet-config.c:35
+#: ../clock/src/applet-config.c:36
msgid "Tea Time!"
msgstr "Ora del Thè!"
-#: ../clock/src/applet-config.c:35
+#: ../clock/src/applet-config.c:36
msgid "Command to launch:"
msgstr "Comando da lanciare:"
-#: ../clock/src/applet-config.c:35
+#: ../clock/src/applet-config.c:36
msgid "E.g.:"
msgstr "Es.:"
-#: ../clock/src/applet-config.c:492 ../weather/src/applet-config.c:180
+#: ../clock/src/applet-config.c:495 ../weather/src/applet-config.c:180
msgid "Search for your location :"
msgstr "Ricerca della tua località :"
-#: ../clock/src/applet-draw.c:54
-msgid "1mn"
-msgstr "1m"
-
-#: ../clock/src/applet-draw.c:59
-msgid "1h"
-msgstr "1h"
-
-#: ../clock/src/applet-draw.c:82
-msgid "The following task was scheduled at"
-msgstr "La seguente attività è stata pianificata..."
-
-#: ../clock/src/applet-draw.c:85 ../clock/src/applet-draw.c:355
-#: ../clock/src/applet-draw.c:376
-msgid "Repeat this message every:"
-msgstr "Ripeti questo messaggio ogni:"
-
-#: ../clock/src/applet-draw.c:338
-msgid "This task will begin in 15 minutes:"
-msgstr "Questa attività comincerà tra 15 minuti:"
-
-#: ../clock/src/applet-draw.c:352
-msgid "It's time for the following task:"
-msgstr "E' tempo di svolgere questa attività :"
-
-#: ../clock/src/applet-draw.c:373
-msgid "Today is the following anniversary:"
-msgstr "Oggi ricorre il seguente anniversario:"
-
-#: ../clock/src/applet-draw.c:373
-msgid "Tomorrow is the following anniversary:"
-msgstr "Domani è il seguente anniversario:"
-
#: ../clock/src/applet-init.c:35
msgid "clock"
msgstr "orologio"
@@ -1333,18 +1230,18 @@
"Puoi aggiungere un'attività cliccando sull'applet per aprire il calendario e "
"successivamente con doppio click sul giorno prescelto."
-#: ../clock/src/applet-notifications.c:90
-msgid "Set up time and date"
-msgstr "Regola data e ora"
-
-#: ../clock/src/applet-notifications.c:91
+#: ../clock/src/applet-notifications.c:92
msgid "Show today's tasks"
msgstr "Mostra le attività di oggi"
-#: ../clock/src/applet-notifications.c:92
+#: ../clock/src/applet-notifications.c:93
msgid "Show this week's tasks"
msgstr "Mostra le attività della settimana"
+#: ../clock/src/applet-notifications.c:96
+msgid "Set up time and date"
+msgstr "Regola data e ora"
+
#: ../clock/src/applet-task-editor.c:156
msgid "Add a new task"
msgstr "Aggiungi una nuova attività "
@@ -1400,6 +1297,43 @@
msgid "Tags"
msgstr "Etichette"
+#: ../clock/src/applet-timer.c:55
+msgid "1mn"
+msgstr "1m"
+
+#: ../clock/src/applet-timer.c:60
+msgid "1h"
+msgstr "1h"
+
+#: ../clock/src/applet-timer.c:83
+msgid "The following task was scheduled at"
+msgstr "La seguente attività è stata pianificata..."
+
+#: ../clock/src/applet-timer.c:86 ../clock/src/applet-timer.c:456
+#: ../clock/src/applet-timer.c:493
+msgid "Repeat this message every:"
+msgstr "Ripeti questo messaggio ogni:"
+
+#: ../clock/src/applet-timer.c:170
+msgid "The following task has felt due:"
+msgstr "Il compito seguente è fallito perchè:"
+
+#: ../clock/src/applet-timer.c:453
+msgid "It's time for the following task:"
+msgstr "E' tempo di svolgere questa attività :"
+
+#: ../clock/src/applet-timer.c:470
+msgid "This task will begin in 15 minutes:"
+msgstr "Questa attività comincerà tra 15 minuti:"
+
+#: ../clock/src/applet-timer.c:490
+msgid "Today is the following anniversary:"
+msgstr "Oggi ricorre il seguente anniversario:"
+
+#: ../clock/src/applet-timer.c:490
+msgid "Tomorrow is the following anniversary:"
+msgstr "Domani è il seguente anniversario:"
+
#: ../compiz-icon/src/applet-init.c:31
msgid "compiz-icon"
msgstr "Compiz-icon"
@@ -1424,7 +1358,7 @@
msgstr "Configura Compiz"
#: ../compiz-icon/src/applet-load-icon.c:31
-#: ../compiz-icon/src/applet-notifications.c:178
+#: ../compiz-icon/src/applet-notifications.c:180
msgid "Emerald Manager"
msgstr "Gestione Emerald"
@@ -1448,27 +1382,27 @@
"Per configurare Compiz, devi installare CCSM\n"
" tramite il tuo gestore di pacchetti (Synaptic, YasT, etc)"
-#: ../compiz-icon/src/applet-notifications.c:179
+#: ../compiz-icon/src/applet-notifications.c:181
msgid "Reload Emerald"
msgstr "Ricarica Emerald"
-#: ../compiz-icon/src/applet-notifications.c:183
+#: ../compiz-icon/src/applet-notifications.c:184
msgid "Switch Windows Manager"
msgstr "Cambia Gestore Finestre"
-#: ../compiz-icon/src/applet-notifications.c:184
+#: ../compiz-icon/src/applet-notifications.c:185
msgid "Switch Windows Decorator"
msgstr "Cambia Decoratore Finestre"
-#: ../compiz-icon/src/applet-notifications.c:193
+#: ../compiz-icon/src/applet-notifications.c:194
msgid "Toggle Exposition Mode"
msgstr "Attiva Modalità Expo"
-#: ../compiz-icon/src/applet-notifications.c:194
+#: ../compiz-icon/src/applet-notifications.c:195
msgid "Toggle Widget Layer"
msgstr "Attiva Livello Widget"
-#: ../compiz-icon/src/applet-notifications.c:196
+#: ../compiz-icon/src/applet-notifications.c:198
msgid "Toggle Show Desktop"
msgstr "Attiva Mostra Scrivania"
@@ -1669,17 +1603,21 @@
msgstr "Spedisci il contenuto della clipboard"
#: ../dnd2share/src/applet-notifications.c:398
-msgid "Clear History"
-msgstr "Azzera cronologia"
+msgid "History"
+msgstr "Cronologia"
-#: ../dnd2share/src/applet-notifications.c:463
+#: ../dnd2share/src/applet-notifications.c:472
msgid "Get text"
msgstr "Ottieni testo"
-#: ../dnd2share/src/applet-notifications.c:465
+#: ../dnd2share/src/applet-notifications.c:474
msgid "Remove from history"
msgstr "Rimuovi dalla cronologia"
+#: ../dnd2share/src/applet-notifications.c:477
+msgid "Clear History"
+msgstr "Azzera cronologia"
+
#: ../dock-rendering/src/rendering-init.c:34
msgid "Caroussel"
msgstr "Carosello"
@@ -1793,29 +1731,29 @@
msgid "Counting total size and files number..."
msgstr "Conteggio delle dimensioni totali e del numero di file..."
-#: ../dustbin/src/applet-notifications.c:136
+#: ../dustbin/src/applet-notifications.c:117
msgid "Show Trash (click)"
msgstr "Mostra il Cestino (click)"
-#: ../dustbin/src/applet-notifications.c:137
+#: ../dustbin/src/applet-notifications.c:118
msgid "Empty Trash (middle-click)"
msgstr "Svuota il Cestino (click centrale)"
-#: ../dustbin/src/applet-notifications.c:139
+#: ../dustbin/src/applet-notifications.c:120
msgid "Display dustbins information"
msgstr "Mostra le informazioni dei cestini"
-#: ../dustbin/src/applet-notifications.c:151
+#: ../dustbin/src/applet-notifications.c:133
#, c-format
msgid "%s successfully unmounted"
msgstr "%s adesso è smontato"
-#: ../dustbin/src/applet-notifications.c:155
+#: ../dustbin/src/applet-notifications.c:137
#, c-format
msgid "failed to unmount %s"
msgstr "impossibile smontare %s"
-#: ../dustbin/src/applet-notifications.c:179
+#: ../dustbin/src/applet-notifications.c:161
#: ../shortcuts/src/applet-notifications.c:167
msgid "Unmouting this volume ..."
msgstr "Smonta questo volume..."
@@ -1944,11 +1882,11 @@
"per spegnere o riavviare il pc\n"
" (puoi invertire l'ordine se preferisci l'arresto al click sinistro)."
-#: ../logout/src/applet-notifications.c:101
+#: ../logout/src/applet-notifications.c:100
msgid "Choose in how many minutes your PC will stop:"
msgstr "Scegli in quanti minuti il tuo PC si spegnerà :"
-#: ../logout/src/applet-notifications.c:126
+#: ../logout/src/applet-notifications.c:125
msgid "Lock screen"
msgstr "Blocca lo schermo"
@@ -1956,7 +1894,7 @@
msgid "Program an automatic shut-down"
msgstr "Programma lo spegnimento in automatico"
-#: ../logout/src/applet-notifications.c:158
+#: ../logout/src/applet-notifications.c:159
msgid "Your computer will shut-down in 1 minute."
msgstr "Il tuo computer si spegnerà tra 1 minuto."
@@ -2116,20 +2054,29 @@
"Se '%s' non è l'applicazione mail predefinita,\n"
"potete cambiarla nel pannello di configurazione di quest'applet."
-#: ../mail/src/cd-mail-applet-notifications.c:139
+#: ../mail/src/cd-mail-applet-notifications.c:147
msgid "Refresh a mail account"
msgstr "Aggiorna un account di posta"
-#: ../mail/src/cd-mail-applet-notifications.c:148
+#: ../mail/src/cd-mail-applet-notifications.c:154
+msgid "Refresh all (Middle-click)"
+msgstr "Aggiorna tutto (Tasto centrale)"
+
+#: ../mail/src/cd-mail-applet-notifications.c:159
+#, c-format
+msgid "Refresh %s"
+msgstr "Aggiorna %s"
+
+#: ../mail/src/cd-mail-applet-notifications.c:165
msgid "Mark all emails as read"
msgstr "Marca tutte le mail come lette"
-#: ../mail/src/cd-mail-applet-notifications.c:151
+#: ../mail/src/cd-mail-applet-notifications.c:168
#, c-format
msgid "Launch %s"
msgstr "Lancia %s"
-#: ../mail/src/cd-mail-applet-notifications.c:326
+#: ../mail/src/cd-mail-applet-notifications.c:346
msgid "Mail"
msgstr "Mail"
@@ -2209,7 +2156,7 @@
" Per Songbird, devi installare il suo add-on dbus.\n"
" Per Exaile 0.3, devi attivare il suo plugin MPRIS."
-#: ../musicPlayer/src/applet-notifications.c:70
+#: ../musicPlayer/src/applet-notifications.c:74
msgid ""
"Sorry, I couldn't detect any player.\n"
"If it is running, it is maybe because its version is too old and does not "
@@ -2219,50 +2166,50 @@
"Se è attivo, è probabile che la sua versione sia troppo datata e non offra "
"nessun servizio."
-#: ../musicPlayer/src/applet-notifications.c:162
+#: ../musicPlayer/src/applet-notifications.c:172
msgid "Find opened player"
msgstr "Cerca un player aperto"
-#: ../musicPlayer/src/applet-notifications.c:169
+#: ../musicPlayer/src/applet-notifications.c:179
msgid "Previous"
msgstr "Precedente"
-#: ../musicPlayer/src/applet-notifications.c:171
+#: ../musicPlayer/src/applet-notifications.c:181
msgid "Play/Pause (left-click)"
msgstr "Play/Pausa (click sinistro)"
-#: ../musicPlayer/src/applet-notifications.c:173
+#: ../musicPlayer/src/applet-notifications.c:183
msgid "Next (middle-click)"
msgstr "Seguente (click centrale)"
-#: ../musicPlayer/src/applet-notifications.c:175
+#: ../musicPlayer/src/applet-notifications.c:185
msgid "Stop"
msgstr "Ferma"
-#: ../musicPlayer/src/applet-notifications.c:177
+#: ../musicPlayer/src/applet-notifications.c:189
+msgid "Information"
+msgstr "Informazione"
+
+#: ../musicPlayer/src/applet-notifications.c:192
msgid "Show the Window"
msgstr "Mostra la Finestra"
-#: ../musicPlayer/src/applet-notifications.c:179
+#: ../musicPlayer/src/applet-notifications.c:198
msgid "Show JumpBox"
msgstr "Mostra JumpBox"
-#: ../musicPlayer/src/applet-notifications.c:181
+#: ../musicPlayer/src/applet-notifications.c:200
msgid "Toggle Shuffle"
msgstr "Selezione casuale"
-#: ../musicPlayer/src/applet-notifications.c:183
+#: ../musicPlayer/src/applet-notifications.c:202
msgid "Toggle Repeat"
msgstr "Ripetizione"
-#: ../musicPlayer/src/applet-notifications.c:185
+#: ../musicPlayer/src/applet-notifications.c:204
msgid "Rate this song"
msgstr "Vota questa canzone"
-#: ../musicPlayer/src/applet-notifications.c:187
-msgid "Information"
-msgstr "Informazione"
-
#: ../netspeed/src/applet-init.c:29
msgid "netspeed"
msgstr "netspeed"
@@ -2303,7 +2250,7 @@
" Potresti avere bisogno di impostare l'interfaccia che vuoi controllare.\n"
" Vuoi farlo in questo momento?"
-#: ../netspeed/src/applet-notifications.c:72
+#: ../netspeed/src/applet-notifications.c:76
msgid "Re-check interface"
msgstr "Ri-verifica dell'interfaccia"
@@ -2480,31 +2427,31 @@
msgid "Enter a name for this bookmark:"
msgstr "Inserisci un nome per questo segnalibro:"
-#: ../shortcuts/src/applet-notifications.c:250
+#: ../shortcuts/src/applet-notifications.c:252
+msgid "Rename this bookmark"
+msgstr "Rinomina questo segnalibro"
+
+#: ../shortcuts/src/applet-notifications.c:253
msgid "Remove this bookmark"
msgstr "Rimuovi questo segnalibro"
-#: ../shortcuts/src/applet-notifications.c:251
-msgid "Rename this bookmark"
-msgstr "Rinomina questo segnalibro"
-
-#: ../shortcuts/src/applet-notifications.c:257
+#: ../shortcuts/src/applet-notifications.c:259
msgid "Eject"
msgstr "Espelli"
-#: ../shortcuts/src/applet-notifications.c:262
+#: ../shortcuts/src/applet-notifications.c:264
msgid "Unmount (middle-click)"
msgstr "Smonta (click centrale)"
-#: ../shortcuts/src/applet-notifications.c:262
+#: ../shortcuts/src/applet-notifications.c:264
msgid "Mount (middle-click)"
msgstr "Monta (click centrale)"
-#: ../shortcuts/src/applet-notifications.c:264
+#: ../shortcuts/src/applet-notifications.c:266
msgid "Get disk info"
msgstr "Ottieni info sul disco"
-#: ../shortcuts/src/applet-notifications.c:289
+#: ../shortcuts/src/applet-notifications.c:292
msgid "Only folders can be bookmarked."
msgstr "Soltanto le cartelle possono diventare segnalibri."
@@ -2552,20 +2499,20 @@
msgid "Change screen resolution"
msgstr "Cambia la risoluzione dello schermo"
-#: ../showDesktop/src/applet-notifications.c:299
+#: ../showDesktop/src/applet-notifications.c:305
msgid "Move to the Desktop"
msgstr "Muovi sul Desktop"
-#: ../showDesktop/src/applet-notifications.c:300
+#: ../showDesktop/src/applet-notifications.c:306
msgid "Copy to the Desktop"
msgstr "Copia sul Desktop"
-#: ../showDesktop/src/applet-notifications.c:301
-#: ../showDesktop/src/applet-notifications.c:305
+#: ../showDesktop/src/applet-notifications.c:307
+#: ../showDesktop/src/applet-notifications.c:311
msgid "Link to the Desktop"
msgstr "Link sul Desktop"
-#: ../showDesktop/src/applet-notifications.c:306
+#: ../showDesktop/src
Follow ups
