diff -Nru cairo-dock-plug-ins-3.3.1/Animated-icons/data/Animated-icons.conf.in cairo-dock-plug-ins-3.3.2/Animated-icons/data/Animated-icons.conf.in --- cairo-dock-plug-ins-3.3.1/Animated-icons/data/Animated-icons.conf.in 2013-10-03 11:04:33.000000000 +0000 +++ cairo-dock-plug-ins-3.3.2/Animated-icons/data/Animated-icons.conf.in 2013-10-29 10:24:45.000000000 +0000 @@ -18,6 +18,9 @@ #i+[1;5] Number of times the animation will play: nb rounds launchers = 1 +#b Repeat these effects until the corresponding application opens? +opening animation = true + #F-[when clicking on an application] frame_appli = diff -Nru cairo-dock-plug-ins-3.3.1/Animated-icons/src/applet-config.c cairo-dock-plug-ins-3.3.2/Animated-icons/src/applet-config.c --- cairo-dock-plug-ins-3.3.1/Animated-icons/src/applet-config.c 2013-10-03 11:04:33.000000000 +0000 +++ cairo-dock-plug-ins-3.3.2/Animated-icons/src/applet-config.c 2013-10-29 10:24:45.000000000 +0000 @@ -44,6 +44,7 @@ CD_CONFIG_GET_INTEGER_LIST ("Global", "click launchers", CD_ANIMATIONS_NB_EFFECTS, (int *)myConfig.iEffectsOnClick[CAIRO_DOCK_LAUNCHER]); myConfig.iNbRoundsOnClick[CAIRO_DOCK_LAUNCHER] = CD_CONFIG_GET_INTEGER ("Global", "nb rounds launchers"); + myConfig.bOpeningAnimation = CD_CONFIG_GET_BOOLEAN_WITH_DEFAULT ("Global", "opening animation", TRUE); CD_CONFIG_GET_INTEGER_LIST ("Global", "click applis", CD_ANIMATIONS_NB_EFFECTS, (int *)myConfig.iEffectsOnClick[CAIRO_DOCK_APPLI]); diff -Nru cairo-dock-plug-ins-3.3.1/Animated-icons/src/applet-notifications.c cairo-dock-plug-ins-3.3.2/Animated-icons/src/applet-notifications.c --- cairo-dock-plug-ins-3.3.1/Animated-icons/src/applet-notifications.c 2013-10-03 11:04:33.000000000 +0000 +++ cairo-dock-plug-ins-3.3.2/Animated-icons/src/applet-notifications.c 2013-10-29 10:24:45.000000000 +0000 @@ -245,7 +245,8 @@ } -#define _will_continue(bRepeat) ((pData->iNumRound > 0) || (pIcon->iAnimationState == CAIRO_DOCK_STATE_MOUSE_HOVERED && bRepeat && pIcon->bPointed && pDock->container.bInside) || (pIcon->iAnimationState == CAIRO_DOCK_STATE_CLICKED && gldi_icon_is_launching (pIcon))) +#define _will_continue(bRepeat) ((pData->iNumRound > 0) || (pIcon->iAnimationState == CAIRO_DOCK_STATE_MOUSE_HOVERED && bRepeat && pIcon->bPointed && pDock->container.bInside) || (pIcon->iAnimationState == CAIRO_DOCK_STATE_CLICKED && myConfig.bOpeningAnimation && gldi_icon_is_launching (pIcon))) + gboolean cd_animations_update_icon (gpointer pUserData, Icon *pIcon, CairoDock *pDock, gboolean *bContinueAnimation) { CDAnimationData *pData = CD_APPLET_GET_MY_ICON_DATA (pIcon); diff -Nru cairo-dock-plug-ins-3.3.1/Animated-icons/src/applet-struct.h cairo-dock-plug-ins-3.3.2/Animated-icons/src/applet-struct.h --- cairo-dock-plug-ins-3.3.1/Animated-icons/src/applet-struct.h 2013-10-03 11:04:33.000000000 +0000 +++ cairo-dock-plug-ins-3.3.2/Animated-icons/src/applet-struct.h 2013-10-29 10:24:45.000000000 +0000 @@ -104,6 +104,7 @@ CDAnimationsEffects iEffectsOnMouseOver[CD_ANIMATIONS_NB_EFFECTS]; CDAnimationsEffects iEffectsOnClick[CAIRO_DOCK_NB_GROUPS][CD_ANIMATIONS_NB_EFFECTS]; gint iNbRoundsOnClick[CAIRO_DOCK_NB_GROUPS]; + gboolean bOpeningAnimation; gboolean bContinue[CD_ANIMATIONS_NB_EFFECTS]; } ; diff -Nru cairo-dock-plug-ins-3.3.1/CMakeLists.txt cairo-dock-plug-ins-3.3.2/CMakeLists.txt --- cairo-dock-plug-ins-3.3.1/CMakeLists.txt 2013-10-08 16:09:17.000000000 +0000 +++ cairo-dock-plug-ins-3.3.2/CMakeLists.txt 2013-10-29 10:27:30.000000000 +0000 @@ -11,7 +11,7 @@ ########### project ############### project ("cairo-dock-plugins") -set (VERSION "3.3.1") +set (VERSION "3.3.2") add_definitions (-std=c99 -Wall -Werror-implicit-function-declaration) # -Wextra -Wwrite-strings -Wuninitialized -Werror-implicit-function-declaration -Wstrict-prototypes -Wreturn-type -Wparentheses -Warray-bounds) if (NOT DEFINED CMAKE_BUILD_TYPE) diff -Nru cairo-dock-plug-ins-3.3.1/Dbus/src/applet-dbus.c cairo-dock-plug-ins-3.3.2/Dbus/src/applet-dbus.c --- cairo-dock-plug-ins-3.3.1/Dbus/src/applet-dbus.c 2013-10-03 11:04:33.000000000 +0000 +++ cairo-dock-plug-ins-3.3.2/Dbus/src/applet-dbus.c 2013-10-29 10:23:19.000000000 +0000 @@ -516,13 +516,7 @@ //\____________ create the main object on the bus. myData.pMainObject = g_object_new (cd_dbus_main_get_type(), NULL); // call cd_dbus_main_class_init() and cd_dbus_main_init(). - //\____________ register the applets installed in the default folders. - gboolean bAppletRegistered = FALSE; - bAppletRegistered |= _cd_dbus_register_all_applets_in_dir (MY_APPLET_SHARE_DATA_DIR); - - bAppletRegistered |= _cd_dbus_register_all_applets_in_dir (g_cCairoDockDataDir); - - //\____________ internationalize the applets. + //\____________ internationalize the applets (we need to do that before registering applets). gchar *cLocaleDir = g_strdup_printf ("%s/"CD_DBUS_APPLETS_FOLDER"/"LOCALE_DIR_NAME, g_cCairoDockDataDir); // user version of /usr/share/locale if (! g_file_test (cLocaleDir, G_FILE_TEST_EXISTS)) // translations not downloaded yet. { @@ -559,6 +553,12 @@ bind_textdomain_codeset (GETTEXT_NAME_EXTRAS, "UTF-8"); g_free (cLocaleDir); + //\____________ register the applets installed in the default folders. + gboolean bAppletRegistered = FALSE; + bAppletRegistered |= _cd_dbus_register_all_applets_in_dir (MY_APPLET_SHARE_DATA_DIR); + + bAppletRegistered |= _cd_dbus_register_all_applets_in_dir (g_cCairoDockDataDir); + //\____________ download in background the list of existing applets. if (bAppletRegistered) // only if some third-party applets are present on the disk. { diff -Nru cairo-dock-plug-ins-3.3.1/GMenu/src/applet-apps.c cairo-dock-plug-ins-3.3.2/GMenu/src/applet-apps.c --- cairo-dock-plug-ins-3.3.1/GMenu/src/applet-apps.c 2013-10-03 11:04:33.000000000 +0000 +++ cairo-dock-plug-ins-3.3.2/GMenu/src/applet-apps.c 2013-10-29 10:25:58.000000000 +0000 @@ -20,6 +20,7 @@ #include "applet-struct.h" #include "applet-apps.h" +static gboolean s_bDesktopEnvDef = TRUE; // can we use g_app_info_should_show()? void cd_menu_register_app (GDesktopAppInfo *pAppInfo) { @@ -37,6 +38,22 @@ } } +/** + * Returns true if the app should be shown in the menu + */ +gboolean cd_menu_app_should_show (GDesktopAppInfo *pAppInfo) +{ + // should_show = NoDisplay + OnlyShowIn + if (s_bDesktopEnvDef) + return g_app_info_should_show (G_APP_INFO (pAppInfo)); + + // XDG_CURRENT_DESKTOP is not defined => only check 'NoDisplay', if available + #if GLIB_CHECK_VERSION (2, 30, 0) + return ! g_desktop_app_info_get_nodisplay (pAppInfo); + #else + return TRUE; + #endif +} static void _on_answer_launch_recent (int iClickedButton, GtkWidget *pInteractiveWidget, gpointer data, CairoDialog *pDialog) { @@ -62,6 +79,7 @@ void cd_menu_check_for_new_apps (void) { + gldi_dialogs_remove_on_icon (myIcon); /// TODO: just replace the combo box if (myData.pNewApps != NULL) { const gchar *cQuestion = D_("Launch this new application?"); @@ -75,6 +93,7 @@ { gtk_combo_box_text_append_text (GTK_COMBO_BOX_TEXT (pInteractiveWidget), g_app_info_get_name (a->data)); } + gtk_combo_box_set_active (GTK_COMBO_BOX (pInteractiveWidget), 0); // select the first one } else { @@ -99,6 +118,7 @@ { g_hash_table_destroy (myData.pKnownApplications); g_slist_free (myData.pApps); + g_list_free (myData.pNewApps); } @@ -106,10 +126,27 @@ { if (! myData.pKnownApplications) // only init once { + // check the XDG_CURRENT_DESKTOP env variable, it is used to match the 'OnlyShowIn' key in the .desktop files in gio and libgnomemenu const gchar *cDesktopEnv = g_getenv ("XDG_CURRENT_DESKTOP"); - if (cDesktopEnv) - g_desktop_app_info_set_desktop_env (cDesktopEnv); - + if (! cDesktopEnv) // the system didn't set the variable: this is probably a bug, so let's try to set a value ourselves (this is needed for both gio and libgnomemenu); this is a workaround, most of the time the value will be set correctly. + { + switch (g_iDesktopEnv) + { + case CAIRO_DOCK_GNOME: cDesktopEnv = "GNOME"; break; + case CAIRO_DOCK_XFCE: cDesktopEnv = "XFCE"; break; + case CAIRO_DOCK_KDE: cDesktopEnv = "KDE"; break; + default: break; + } + // if we found something, set the env variable, because libgnomemenu uses it directly, and if it is not set, will drop any element that has a OnlyShowIn key... + if (cDesktopEnv) + g_setenv ("XDG_CURRENT_DESKTOP", cDesktopEnv, TRUE); + } + + if (cDesktopEnv) // also set it for g_app_info_should_show() in gio + g_desktop_app_info_set_desktop_env (cDesktopEnv); + + s_bDesktopEnvDef = (cDesktopEnv != NULL); // if cDesktopEnv is NULL, g_app_info_should_show will drop any element that has a OnlyShowIn key (it does a direct comparison), so we won't use this function, as it's better to show more apps than having missing apps. + myData.bFirstLaunch = TRUE; myData.pKnownApplications = g_hash_table_new_full (g_str_hash, g_str_equal, diff -Nru cairo-dock-plug-ins-3.3.1/GMenu/src/applet-apps.h cairo-dock-plug-ins-3.3.2/GMenu/src/applet-apps.h --- cairo-dock-plug-ins-3.3.1/GMenu/src/applet-apps.h 2013-10-03 11:04:33.000000000 +0000 +++ cairo-dock-plug-ins-3.3.2/GMenu/src/applet-apps.h 2013-10-29 10:23:19.000000000 +0000 @@ -26,6 +26,9 @@ void cd_menu_register_app (GDesktopAppInfo *pAppInfo); +gboolean cd_menu_app_should_show (GDesktopAppInfo *pAppInfo); + + void cd_menu_check_for_new_apps (void); diff -Nru cairo-dock-plug-ins-3.3.1/GMenu/src/applet-entry.c cairo-dock-plug-ins-3.3.2/GMenu/src/applet-entry.c --- cairo-dock-plug-ins-3.3.1/GMenu/src/applet-entry.c 2013-10-08 16:09:17.000000000 +0000 +++ cairo-dock-plug-ins-3.3.2/GMenu/src/applet-entry.c 2013-10-29 10:24:45.000000000 +0000 @@ -390,8 +390,13 @@ static gboolean _on_key_pressed_menu (GtkWidget *pMenu, GdkEventKey *pEvent, GldiModuleInstance *myApplet) { - // redirect the signal to the entry + /* redirect the signal to the entry: + * with GTK 3.10, it seems that this redirection is no longer needed and + * cause a bug: each character is doubled... + */ + #if ! GTK_CHECK_VERSION (3, 10, 0) g_signal_emit_by_name (myData.pEntry, "key-press-event", pEvent, myApplet); + #endif if (s_pOtherEntries != NULL) { diff -Nru cairo-dock-plug-ins-3.3.1/GMenu/src/applet-tree.c cairo-dock-plug-ins-3.3.2/GMenu/src/applet-tree.c --- cairo-dock-plug-ins-3.3.1/GMenu/src/applet-tree.c 2013-10-03 11:04:33.000000000 +0000 +++ cairo-dock-plug-ins-3.3.2/GMenu/src/applet-tree.c 2013-10-29 10:23:19.000000000 +0000 @@ -202,7 +202,7 @@ // ignore entry that are not shown in the menu if (gmenu_tree_entry_get_is_excluded (entry)) return; - if (! g_app_info_should_show (G_APP_INFO (pAppInfo))) // should_show = NoDisplay + OnlyShowIn + if (! cd_menu_app_should_show (pAppInfo)) return; // create an entry diff -Nru cairo-dock-plug-ins-3.3.1/System-Monitor/src/applet-monitor.c cairo-dock-plug-ins-3.3.2/System-Monitor/src/applet-monitor.c --- cairo-dock-plug-ins-3.3.1/System-Monitor/src/applet-monitor.c 2013-10-03 11:04:33.000000000 +0000 +++ cairo-dock-plug-ins-3.3.2/System-Monitor/src/applet-monitor.c 2013-10-29 10:24:45.000000000 +0000 @@ -167,7 +167,7 @@ } if (myConfig.bShowSwap) { - s_fValues[i++] = (myData.swapTotal ? (myConfig.bShowFreeMemory ? (double)myData.swapFree : (double)myData.swapUsed) / myData.swapTotal : 0.); + s_fValues[i++] = myData.fSwapPercent / 100.; } if (myConfig.bShowNvidia) { diff -Nru cairo-dock-plug-ins-3.3.1/System-Monitor/src/applet-rame.c cairo-dock-plug-ins-3.3.2/System-Monitor/src/applet-rame.c --- cairo-dock-plug-ins-3.3.1/System-Monitor/src/applet-rame.c 2013-10-03 11:04:33.000000000 +0000 +++ cairo-dock-plug-ins-3.3.2/System-Monitor/src/applet-rame.c 2013-10-29 10:24:45.000000000 +0000 @@ -106,7 +106,7 @@ myData.swapUsed = myData.swapTotal - myData.swapFree; - myData.fSwapPercent = 100. * myData.swapUsed / myData.swapTotal; // que faire de SwapCached ?... + myData.fSwapPercent = 100. * (myData.swapTotal ? (myConfig.bShowFreeMemory ? (double)myData.swapFree : (double)myData.swapUsed) / myData.swapTotal : 0.); // que faire de SwapCached ?... if (fabs (myData.fSwapPercent - myData.fPrevSwapPercent) > 1) { myData.fPrevSwapPercent = myData.fSwapPercent; diff -Nru cairo-dock-plug-ins-3.3.1/System-Monitor/src/applet-struct.h cairo-dock-plug-ins-3.3.2/System-Monitor/src/applet-struct.h --- cairo-dock-plug-ins-3.3.1/System-Monitor/src/applet-struct.h 2013-10-03 11:04:33.000000000 +0000 +++ cairo-dock-plug-ins-3.3.2/System-Monitor/src/applet-struct.h 2013-10-29 10:24:45.000000000 +0000 @@ -23,7 +23,7 @@ #include -#define CD_SYSMONITOR_NB_MAX_VALUES 4 +#define CD_SYSMONITOR_NB_MAX_VALUES 6 #define CD_SYSMONITOR_PROC_FS "/proc" diff -Nru cairo-dock-plug-ins-3.3.1/debian/changelog cairo-dock-plug-ins-3.3.2/debian/changelog --- cairo-dock-plug-ins-3.3.1/debian/changelog 2013-10-08 16:39:31.000000000 +0000 +++ cairo-dock-plug-ins-3.3.2/debian/changelog 2013-10-29 14:18:18.000000000 +0000 @@ -1,8 +1,8 @@ -cairo-dock-plug-ins (3.3.1-0ubuntu0~saucy) saucy; urgency=low +cairo-dock-plug-ins (3.3.2-0ubuntu0~saucy) saucy; urgency=low - * New Upstream Version (3.3.1). + * New Upstream Version (3.3.2). - -- Matthieu Baerts (matttbe) Tue, 08 Oct 2013 18:39:31 +0200 + -- Matthieu Baerts (matttbe) Tue, 29 Oct 2013 15:18:18 +0100 cairo-dock-plug-ins (2.2.0-0beta4-0ubuntu1) maverick; urgency=low diff -Nru cairo-dock-plug-ins-3.3.1/dock-rendering/src/rendering-panel.c cairo-dock-plug-ins-3.3.2/dock-rendering/src/rendering-panel.c --- cairo-dock-plug-ins-3.3.1/dock-rendering/src/rendering-panel.c 2013-10-03 11:04:33.000000000 +0000 +++ cairo-dock-plug-ins-3.3.2/dock-rendering/src/rendering-panel.c 2013-10-29 10:23:19.000000000 +0000 @@ -745,85 +745,166 @@ g_return_if_fail (pData != NULL); gboolean bValidGroup = FALSE; // valid = non-empty + gboolean bHasGroups = FALSE; + double xi; + double w = pData->fGroupGap - 4 * my_fPanelRadius; // all groups have the same width + double h = pDock->iMaxDockHeight; // we use iMaxDockHeight instead of the actual window size, because at this time, the dock's window may not have its definite size. + #if (GTK_MAJOR_VERSION < 3) cairo_t *pCairoContext = gdk_cairo_create (pDock->pShapeBitmap); - if (pCairoContext != NULL) + g_return_if_fail (pCairoContext != NULL); + cairo_set_source_rgba (pCairoContext, 0.0f, 0.0f, 0.0f, 0.0f); + cairo_set_operator (pCairoContext, CAIRO_OPERATOR_SOURCE); + #else + cairo_rectangle_int_t rect; + #endif + + GList *ic; + Icon *pIcon; + for (ic = pDock->icons; ic != NULL; ic = ic->next) { - cairo_set_source_rgba (pCairoContext, 0.0f, 0.0f, 0.0f, 0.0f); - cairo_set_operator (pCairoContext, CAIRO_OPERATOR_SOURCE); - - GList *ic; - Icon *pIcon; - for (ic = pDock->icons; ic != NULL; ic = ic->next) + pIcon = ic->data; + if (CAIRO_DOCK_ICON_TYPE_IS_SEPARATOR (pIcon)) { - pIcon = ic->data; - if (CAIRO_DOCK_ICON_TYPE_IS_SEPARATOR (pIcon)) + if (bValidGroup) { - if (bValidGroup) + xi = pIcon->fXAtRest + 2 * my_fPanelRadius; // we let a few pixels to be able to grab the separtator, and to avoid leaving the dock too easily. + #if (GTK_MAJOR_VERSION < 3) + if (pDock->container.bIsHorizontal) + { + cairo_rectangle (pCairoContext, + xi, + 0, + w, + h); + } + else + { + cairo_rectangle (pCairoContext, + 0, + xi, + h, + w); + } + cairo_fill (pCairoContext); + #else + if (pDock->container.bIsHorizontal) { - if (pDock->container.bIsHorizontal) - { - cairo_rectangle (pCairoContext, - pIcon->fXAtRest + 2 * my_fPanelRadius, // we let a few pixels to be able to grab the separtator, and to avoid leaving the dock too easily. - 0, - pData->fGroupGap - 4 * my_fPanelRadius, - pDock->iMaxDockHeight); // we use iMaxDockHeight instead of the actual window size, because at this time, the dock's window may not have its definite size. - } - else - { - cairo_rectangle (pCairoContext, - 0, - pIcon->fXAtRest + 2 * my_fPanelRadius, // we let a few pixels to be able to grab the separtator, and to avoid leaving the dock too easily. - pDock->iMaxDockHeight, - pData->fGroupGap - 4 * my_fPanelRadius); - } - cairo_fill (pCairoContext); - bValidGroup = FALSE; + rect.x = xi; + rect.y = 0; + rect.width = w; + rect.height = h; + cd_debug ("rect %d; %d", (int)rect.x, (int)rect.width); } + else + { + rect.x = 0; + rect.y = xi; + rect.width = h; + rect.height = w; + } + cairo_region_subtract_rectangle (pDock->pShapeBitmap, &rect); + #endif + bValidGroup = FALSE; + bHasGroups = TRUE; + } + } + else + { + bValidGroup = TRUE; + } + } + + // if there is only a single group, make the outside transparent + if (! bHasGroups) + { + // left screen edge -> first icon + if (pDock->fAlign > 0) + { + xi = pDock->fAlign * pData->fGroupGap - my_fPanelRadius; + #if (GTK_MAJOR_VERSION < 3) + if (pDock->container.bIsHorizontal) + { + cairo_rectangle (pCairoContext, + 0., // left screen edge + 0., + xi, // to first icon + h); + } + else + { + cairo_rectangle (pCairoContext, + 0, + 0., + h, + xi); + } + cairo_fill (pCairoContext); + #else + if (pDock->container.bIsHorizontal) + { + rect.x = 0.; // left screen edge + rect.y = 0; + rect.width = xi; // to first icon + rect.height = h; + g_print ("rect %d; %d (%s)\n", (int)rect.x, (int)rect.width, pIcon->cName); } else { - bValidGroup = TRUE; + rect.x = 0; + rect.y = 0.; + rect.width = h; + rect.height = xi; } + cairo_region_subtract_rectangle (pDock->pShapeBitmap, &rect); + #endif } - cairo_destroy (pCairoContext); - } - #else - cairo_rectangle_int_t rect; - GList *ic; - Icon *pIcon; - for (ic = pDock->icons; ic != NULL; ic = ic->next) + // last icon -> right screen edge + if (pDock->fAlign < 1) { - pIcon = ic->data; - if (CAIRO_DOCK_ICON_TYPE_IS_SEPARATOR (pIcon)) + xi = pDock->iMaxDockWidth - (1 - pDock->fAlign) * pData->fGroupGap + my_fPanelRadius; + #if (GTK_MAJOR_VERSION < 3) + if (pDock->container.bIsHorizontal) { - if (bValidGroup) - { - if (pDock->container.bIsHorizontal) - { - rect.x = pIcon->fXAtRest + 2 * my_fPanelRadius; // we let a few pixels to be able to grab the separtator, and to avoid leaving the dock too easily. - rect.y = 0; - rect.width = pData->fGroupGap - 4 * my_fPanelRadius; - rect.height = pDock->iMaxDockHeight; // we use iMaxDockHeight instead of the actual window size, because at this time, the dock's window may not have its definite size. - cd_debug ("rect %d; %d", (int)rect.x, (int)rect.width); - } - else - { - rect.x = 0; - rect.y = pIcon->fXAtRest + 2 * my_fPanelRadius; // we let a few pixels to be able to grab the separtator, and to avoid leaving the dock too easily. - rect.width = pDock->iMaxDockHeight; - rect.height = pData->fGroupGap - 4 * my_fPanelRadius; - } - cairo_region_subtract_rectangle (pDock->pShapeBitmap, &rect); - bValidGroup = FALSE; - } + cairo_rectangle (pCairoContext, + xi, // last icon + 0., + pDock->iMaxDockWidth - xi, // to right screen edge + h); + } + else + { + cairo_rectangle (pCairoContext, + 0, + xi, + h, + pDock->iMaxDockWidth - xi); + } + cairo_fill (pCairoContext); + #else + if (pDock->container.bIsHorizontal) + { + rect.x = xi; // last icon + rect.y = 0; + rect.width = pDock->iMaxDockWidth - xi; // to right screen edge + rect.height = h; + cd_debug ("rect %d; %d", (int)rect.x, (int)rect.width); } else { - bValidGroup = TRUE; + rect.x = 0; + rect.y = xi; + rect.width = h; + rect.height = pDock->iMaxDockWidth - xi; } + cairo_region_subtract_rectangle (pDock->pShapeBitmap, &rect); + #endif } + } + + #if (GTK_MAJOR_VERSION < 3) + cairo_destroy (pCairoContext); #endif } } diff -Nru cairo-dock-plug-ins-3.3.1/icon-effect/data/icon-effect.conf.in cairo-dock-plug-ins-3.3.2/icon-effect/data/icon-effect.conf.in --- cairo-dock-plug-ins-3.3.1/icon-effect/data/icon-effect.conf.in 2013-10-03 11:04:33.000000000 +0000 +++ cairo-dock-plug-ins-3.3.2/icon-effect/data/icon-effect.conf.in 2013-10-29 10:24:45.000000000 +0000 @@ -15,6 +15,9 @@ #V+[Fire;Stars;Rain;Snow;Storm;Firework] Effects used on launcher: click launchers = 0 +#b Repeat these effects until the corresponding application opens? +opening animation = false + #F-[when clicking on an application] frame_appli = @@ -31,9 +34,6 @@ #b+ Rotate effects with dock? rotate = false -#b Repeat these effects until the corresponding application opens? -opening animation = false - #[@icon_effectsdatadir@/icon-fire.svg] [Fire] diff -Nru cairo-dock-plug-ins-3.3.1/icon-effect/src/applet-config.c cairo-dock-plug-ins-3.3.2/icon-effect/src/applet-config.c --- cairo-dock-plug-ins-3.3.1/icon-effect/src/applet-config.c 2013-10-03 11:04:33.000000000 +0000 +++ cairo-dock-plug-ins-3.3.2/icon-effect/src/applet-config.c 2013-10-29 10:24:45.000000000 +0000 @@ -39,7 +39,7 @@ CD_APPLET_GET_CONFIG_BEGIN myConfig.bBackGround = CD_CONFIG_GET_BOOLEAN ("Global", "background"); myConfig.bRotateEffects = CD_CONFIG_GET_BOOLEAN ("Global", "rotate"); - myConfig.bOpeningAnimation = CD_CONFIG_GET_BOOLEAN_WITH_DEFAULT ("Global", "opening animation", FALSE); + myConfig.bOpeningAnimation = CD_CONFIG_GET_BOOLEAN_WITH_DEFAULT ("Global", "opening animation", FALSE); // These effects are maybe a bit too intrusive/indiscreet: disable it by default int i,j; for (i = 0; i < CD_ICON_EFFECT_NB_EFFECTS; i ++) { diff -Nru cairo-dock-plug-ins-3.3.1/logout/src/applet-logout.c cairo-dock-plug-ins-3.3.2/logout/src/applet-logout.c --- cairo-dock-plug-ins-3.3.1/logout/src/applet-logout.c 2013-10-08 16:09:17.000000000 +0000 +++ cairo-dock-plug-ins-3.3.2/logout/src/applet-logout.c 2013-10-29 10:23:19.000000000 +0000 @@ -1,4 +1,4 @@ - /** +/** * This file is a part of the Cairo-Dock project * * Copyright : (C) see the 'copyright' file. diff -Nru cairo-dock-plug-ins-3.3.1/musicPlayer/src/applet-init.c cairo-dock-plug-ins-3.3.2/musicPlayer/src/applet-init.c --- cairo-dock-plug-ins-3.3.1/musicPlayer/src/applet-init.c 2013-10-03 11:04:33.000000000 +0000 +++ cairo-dock-plug-ins-3.3.2/musicPlayer/src/applet-init.c 2013-10-29 10:24:45.000000000 +0000 @@ -99,7 +99,9 @@ } else if (myIcon->cName == NULL || *myIcon->cName == '\0') { - CD_APPLET_SET_NAME_FOR_MY_ICON (cd_musicplayer_get_string_with_first_char_to_upper (myConfig.cMusicPlayer)); + gchar *cDefaultName = cd_musicplayer_get_string_with_first_char_to_upper (myConfig.cMusicPlayer); + CD_APPLET_SET_NAME_FOR_MY_ICON (cDefaultName); + g_free (cDefaultName); } cairo_dock_set_icon_ignore_quicklist (myIcon); // ignore additional actions in the menu, as the applet already adds the actions supported by any player. diff -Nru cairo-dock-plug-ins-3.3.1/musicPlayer/src/applet-musicplayer.c cairo-dock-plug-ins-3.3.2/musicPlayer/src/applet-musicplayer.c --- cairo-dock-plug-ins-3.3.1/musicPlayer/src/applet-musicplayer.c 2013-10-03 11:04:33.000000000 +0000 +++ cairo-dock-plug-ins-3.3.2/musicPlayer/src/applet-musicplayer.c 2013-10-29 10:24:45.000000000 +0000 @@ -424,7 +424,9 @@ { if (strcmp (myData.pCurrentHandler->name, "Mpris2") == 0) { - CD_APPLET_SET_NAME_FOR_MY_ICON (cd_musicplayer_get_string_with_first_char_to_upper (myData.pCurrentHandler->launch)); + gchar *cDefaultName = cd_musicplayer_get_string_with_first_char_to_upper (myData.pCurrentHandler->launch); + CD_APPLET_SET_NAME_FOR_MY_ICON (cDefaultName); + g_free (cDefaultName); } else { diff -Nru cairo-dock-plug-ins-3.3.1/musicPlayer/src/applet-notifications.c cairo-dock-plug-ins-3.3.2/musicPlayer/src/applet-notifications.c --- cairo-dock-plug-ins-3.3.1/musicPlayer/src/applet-notifications.c 2013-10-03 11:04:33.000000000 +0000 +++ cairo-dock-plug-ins-3.3.2/musicPlayer/src/applet-notifications.c 2013-10-29 10:24:45.000000000 +0000 @@ -122,8 +122,12 @@ // write it down into our conf file cairo_dock_update_conf_file (CD_APPLET_MY_CONF_FILE, G_TYPE_STRING, "Configuration", "current-player", cPlayerName, + G_TYPE_STRING, "Configuration", "desktop-entry", "", // reset the desktop filename, we'll get the new one from the "DesktopEntry" property of the new player G_TYPE_INVALID); + g_free (myConfig.cMusicPlayer); myConfig.cMusicPlayer = g_strdup (cPlayerName); + g_free (myConfig.cLastKnownDesktopFile); + myConfig.cLastKnownDesktopFile = NULL; // set the handler with this value. cd_musicplayer_set_current_handler (myConfig.cMusicPlayer); @@ -144,8 +148,12 @@ // write it down into our conf file cairo_dock_update_conf_file (CD_APPLET_MY_CONF_FILE, G_TYPE_STRING, "Configuration", "current-player", cPlayerName, + G_TYPE_STRING, "Configuration", "desktop-entry", "", // reset the desktop filename, we'll get the new one from the "DesktopEntry" property of the new player G_TYPE_INVALID); + g_free (myConfig.cMusicPlayer); myConfig.cMusicPlayer = g_strdup (cPlayerName); + g_free (myConfig.cLastKnownDesktopFile); + myConfig.cLastKnownDesktopFile = NULL; // set the handler with this value. cd_musicplayer_set_current_handler (myConfig.cMusicPlayer); // launch it, if it's already running, it's likely to have no effect diff -Nru cairo-dock-plug-ins-3.3.1/po/ca.po cairo-dock-plug-ins-3.3.2/po/ca.po --- cairo-dock-plug-ins-3.3.1/po/ca.po 2013-10-03 11:04:33.000000000 +0000 +++ cairo-dock-plug-ins-3.3.2/po/ca.po 2013-10-29 10:26:57.000000000 +0000 @@ -8,14 +8,14 @@ "Project-Id-Version: cairo-dock-plug-ins\n" "Report-Msgid-Bugs-To: fabounet@glx-dock.org\n" "POT-Creation-Date: 2013-09-23 10:57+0000\n" -"PO-Revision-Date: 2013-08-21 16:30+0000\n" -"Last-Translator: Miquel Escarrà \n" +"PO-Revision-Date: 2013-10-25 22:37+0000\n" +"Last-Translator: Sergi Parra i Ramírez \n" "Language-Team: Catalan \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2013-09-24 06:10+0000\n" -"X-Generator: Launchpad (build 16771)\n" +"X-Launchpad-Export-Date: 2013-10-26 05:53+0000\n" +"X-Generator: Launchpad (build 16810)\n" #: ../Animated-icons/src/applet-blink.c:77 ../Animated-icons/data/messages:11 #: ../Animated-icons/data/messages:31 ../Animated-icons/data/messages:53 @@ -228,7 +228,7 @@ #: ../Composite-Manager/src/applet-composite-manager.c:430 #: ../Composite-Manager/src/applet-composite-manager.c:445 msgid "No compositor is available." -msgstr "" +msgstr "Cap compositor està disponible." #: ../Composite-Manager/src/applet-composite-manager.c:453 #: ../Composite-Manager/src/applet-composite-manager.c:468 @@ -399,7 +399,7 @@ #: ../Network-Monitor/src/applet-netspeed.c:58 #: ../netspeed/src/applet-netspeed.c:64 msgid "KB" -msgstr "" +msgstr "kB" #: ../Disks/src/applet-disks.c:69 ../Folders/src/applet-notifications.c:138 #: ../Network-Monitor/src/applet-netspeed.c:66 @@ -407,29 +407,29 @@ #: ../netspeed/src/applet-notifications.c:37 #: ../netspeed/src/applet-notifications.c:38 msgid "MB" -msgstr "" +msgstr "MiB" #: ../Disks/src/applet-disks.c:77 ../Network-Monitor/src/applet-netspeed.c:74 #: ../netspeed/src/applet-netspeed.c:80 msgid "GB" -msgstr "" +msgstr "GB" #: ../Disks/src/applet-disks.c:85 ../Network-Monitor/src/applet-netspeed.c:82 #: ../netspeed/src/applet-netspeed.c:88 msgid "TB" -msgstr "" +msgstr "TB" #: ../Disks/src/applet-disks.c:171 msgid "r" -msgstr "" +msgstr "r" #: ../Disks/src/applet-disks.c:171 msgid "w" -msgstr "" +msgstr "w" #: ../Disks/src/applet-disks.c:175 msgid "N/A" -msgstr "" +msgstr "N/D" #: ../Disks/src/applet-init.c:29 msgid "Disks" @@ -776,7 +776,7 @@ #: ../GMenu-old/src/applet-notifications.c:116 #: ../GMenu/src/applet-notifications.c:102 msgid "None of these applications seems available:" -msgstr "" +msgstr "Cap d'aquestes aplicacions sembla disponible:" #: ../GMenu-old/src/applet-notifications.c:124 #: ../GMenu/src/applet-notifications.c:110 @@ -802,7 +802,7 @@ #: ../GMenu/src/applet-entry.c:435 msgid "Launch this command" -msgstr "" +msgstr "Executa aquesta comanda" #: ../Global-Menu/src/applet-init.c:30 msgid "Global Menu" @@ -885,7 +885,7 @@ #: ../MeMenu/src/applet-init.c:30 msgid "Me Menu" -msgstr "" +msgstr "Menú Jo" #: ../MeMenu/src/applet-init.c:33 msgid "" @@ -1015,7 +1015,7 @@ #: ../Network-Monitor/src/applet-init.c:41 msgid "Network Monitor" -msgstr "" +msgstr "Monitor de xarxa" #: ../Network-Monitor/src/applet-netspeed.c:202 #: ../System-Monitor/src/applet-monitor.c:95 @@ -1032,23 +1032,23 @@ #: ../Network-Monitor/src/applet-notifications.c:82 #: ../wifi/src/applet-notifications.c:92 msgid "Network Administration" -msgstr "" +msgstr "Administració de xarxa" #: ../Network-Monitor/src/applet-notifications.c:86 msgid "Activate network" -msgstr "" +msgstr "Activa xarxa" #: ../Network-Monitor/src/applet-notifications.c:86 msgid "Deactivate network" -msgstr "" +msgstr "Desactiva xarxa" #: ../Network-Monitor/src/applet-notifications.c:90 msgid "Deactivate wifi" -msgstr "" +msgstr "Desactiva la wifi" #: ../Network-Monitor/src/applet-notifications.c:90 msgid "Activate wifi" -msgstr "" +msgstr "Activa la wifi" #: ../RSSreader/src/applet-init.c:31 msgid "RSSreader" @@ -1070,11 +1070,11 @@ #: ../RSSreader/src/applet-init.c:65 ../RSSreader/src/applet-init.c:125 #: ../RSSreader/src/applet-notifications.c:56 msgid "Retrieving data..." -msgstr "" +msgstr "Rebent dades..." #: ../RSSreader/src/applet-notifications.c:69 msgid "It doesn't seem to be a valid URL." -msgstr "" +msgstr "Sembla no ser una URL vàlida." #: ../RSSreader/src/applet-notifications.c:124 msgid "Paste a new RSS Url (drag and drop)" @@ -1082,40 +1082,41 @@ #: ../RSSreader/src/applet-notifications.c:128 msgid "Open with your web browser" -msgstr "" +msgstr "Obre amb el teu navegador" #: ../RSSreader/src/applet-notifications.c:129 #: ../switcher/src/applet-notifications.c:335 msgid "Refresh" -msgstr "" +msgstr "Actualitza" #: ../RSSreader/src/applet-rss.c:400 msgid "Warning: couldn't retrieve data last time we tried." msgstr "" +"Advertència: no es van poder rebre dades l'últim cop que es va intentar." #: ../RSSreader/src/applet-rss.c:436 msgid "No URL is defined." -msgstr "" +msgstr "No està definida una URL." #: ../RSSreader/src/applet-rss.c:437 msgid "No data (no connection?)" -msgstr "" +msgstr "Sense dades (sense connexió?)" #: ../RSSreader/src/applet-rss.c:468 ../RSSreader/src/applet-rss.c:487 msgid "Invalid data (invalid RSS/Atom feed?)" -msgstr "" +msgstr "Dades invalides (canal RSS/Atom invàlid?)" #: ../RSSreader/src/applet-rss.c:551 msgid "No data" -msgstr "" +msgstr "Sense dades" #: ../RSSreader/src/applet-rss.c:589 msgid "No modification" -msgstr "" +msgstr "Cap modificació" #: ../RSSreader/src/applet-rss.c:614 msgid "This RSS feed has been modified..." -msgstr "" +msgstr "Aquest canal RSS ha estat modificat..." #: ../RSSreader/src/applet-rss.c:780 msgid "" @@ -1123,6 +1124,9 @@ "You can define one by copying the URL in the clipboard,\n" " and selecting \"Paste the URL\" in the menu." msgstr "" +"Cap URL definida\n" +"Pots definir una copiant la URL al portapapers,\n" +" i seleccionant \"Enganxa la URL\" al menú." #: ../RSSreader/src/applet-rss.c:786 msgid "" @@ -1130,6 +1134,9 @@ "Did you set a valid RSS feed?\n" "Is your connection alive?" msgstr "" +"Cap dada\n" +"Has establert un canal RSS vàlid?\n" +"Està la teva connexió activa?" #: ../Recent-Events/src/applet-dialog.c:320 #: ../Screenshot/src/applet-screenshot.c:319 @@ -1142,51 +1149,51 @@ #: ../Screenshot/src/applet-screenshot.c:281 #: ../quick-browser/src/applet-menu.c:360 msgid "Copy the location" -msgstr "" +msgstr "Copia la localització" #: ../Recent-Events/src/applet-dialog.c:325 msgid "Delete this event" -msgstr "" +msgstr "Esborra aquest esdeveneniment" #: ../Recent-Events/src/applet-dialog.c:409 msgid "All" -msgstr "" +msgstr "Tot" #: ../Recent-Events/src/applet-dialog.c:410 msgid "Applications" -msgstr "" +msgstr "Aplicacions" #: ../Recent-Events/src/applet-dialog.c:411 msgid "Document" -msgstr "" +msgstr "Document" #: ../Recent-Events/src/applet-dialog.c:413 ../logout/data/messages:117 msgid "Image" -msgstr "" +msgstr "Imatge" #: ../Recent-Events/src/applet-dialog.c:414 msgid "Audio" -msgstr "" +msgstr "Àudio" #: ../Recent-Events/src/applet-dialog.c:415 msgid "Video" -msgstr "" +msgstr "Vídeo" #: ../Recent-Events/src/applet-dialog.c:416 msgid "Web" -msgstr "" +msgstr "Web" #: ../Recent-Events/src/applet-dialog.c:417 msgid "Other" -msgstr "" +msgstr "Altre" #: ../Recent-Events/src/applet-dialog.c:418 msgid "Top Results" -msgstr "" +msgstr "Resultats principals" #: ../Recent-Events/src/applet-dialog.c:424 msgid "Look for events" -msgstr "" +msgstr "Cerca esdeveniments" #: ../Recent-Events/src/applet-dialog.c:432 msgid "" @@ -1200,11 +1207,11 @@ #: ../Recent-Events/src/applet-dialog.c:475 #: ../Screenshot/src/applet-screenshot.c:489 msgid "File name" -msgstr "" +msgstr "Nom del fitxer" #: ../Recent-Events/src/applet-dialog.c:482 msgid "Last access" -msgstr "" +msgstr "Darrer accés" #: ../Recent-Events/src/applet-dialog.c:531 msgid "You need to install the Zeitgeist data engine." @@ -1212,33 +1219,33 @@ #: ../Recent-Events/src/applet-dialog.c:579 msgid "Browse and search in recent events" -msgstr "" +msgstr "Navega i cerca als esdeveniments recents" #: ../Recent-Events/src/applet-init.c:29 msgid "Recent-Events" -msgstr "" +msgstr "Esdeveniments recents" #: ../Recent-Events/src/applet-init.c:58 msgid "Show/hide the Recent Events" -msgstr "" +msgstr "Mostra/oculta els esdeveniments recents" #: ../Recent-Events/src/applet-notifications.c:74 #, c-format msgid "%d event(s) deleted" -msgstr "" +msgstr "%d esdeveniment(s) esborrat(s)" #: ../Recent-Events/src/applet-notifications.c:114 #: ../Scooby-Do/src/applet-backend-recent.c:213 ../Scooby-Do/data/messages:105 msgid "Recent files" -msgstr "" +msgstr "Fitxers recents" #: ../Recent-Events/src/applet-notifications.c:187 msgid "Delete today's events" -msgstr "" +msgstr "Esborra els esdeveniments d'avui" #: ../Recent-Events/src/applet-notifications.c:189 msgid "Delete all events" -msgstr "" +msgstr "Esborra tots els esdeveniments" #: ../Remote-Control/src/applet-init.c:32 msgid "" @@ -1253,10 +1260,20 @@ "middle click, and Ctrl+Enter for left click\n" "Escape or the same shortkey will cancel." msgstr "" +"Aquest complement et permet controlar el teu dock des del teclat\n" +"Prem la drecera (per defecte Super + Retorn), llavors:\n" +" - prem el número de l'icona que desitges activar - o fes servir les fletxes " +"per navegar als docks i els sub-docks (Ctrl + Re/Av Pàg per canviar a un " +"altre dock principal)\n" +" - o escriu el nom de un llançador i prem Tab per automàticament saltar al " +"següent llançador apropiat\n" +"Prem Intro per clicar a l'icona, Shift+Intro per Shift+clicar, Alt+Intro per " +"un clic central, i Ctrl+Intro per un clic esquerra\n" +"Esc o la mateixa drecera ho cancel·larà." #: ../Remote-Control/src/applet-init.c:42 msgid "Control from keyboard" -msgstr "" +msgstr "Control des del teclat" #: ../Remote-Control/src/applet-init.c:49 msgid "Enable/disable the keyboard control of the dock" diff -Nru cairo-dock-plug-ins-3.3.1/po/de.po cairo-dock-plug-ins-3.3.2/po/de.po --- cairo-dock-plug-ins-3.3.1/po/de.po 2013-10-03 11:04:33.000000000 +0000 +++ cairo-dock-plug-ins-3.3.2/po/de.po 2013-10-29 10:26:57.000000000 +0000 @@ -9,16 +9,20 @@ "Project-Id-Version: cairo-dock-plug-ins\n" "Report-Msgid-Bugs-To: fabounet@glx-dock.org\n" "POT-Creation-Date: 2013-09-23 10:57+0000\n" -"PO-Revision-Date: 2013-07-21 19:52+0000\n" -"Last-Translator: Michael Konrad \n" +"PO-Revision-Date: 2013-10-29 02:10+0000\n" +"Last-Translator: Tobias B. \n" "Language-Team: German \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2013-09-24 06:11+0000\n" -"X-Generator: Launchpad (build 16771)\n" +"X-Launchpad-Export-Date: 2013-10-29 04:59+0000\n" +"X-Generator: Launchpad (build 16818)\n" "Language: de\n" +#: ../shortcuts/src/applet-init.c:32 +msgid "shortcuts" +msgstr "Lesezeichen" + #: ../Animated-icons/src/applet-blink.c:77 ../Animated-icons/data/messages:11 #: ../Animated-icons/data/messages:31 ../Animated-icons/data/messages:53 #: ../Animated-icons/data/messages:171 @@ -784,7 +788,7 @@ #: ../GMenu-old/src/applet-init.c:41 ../GMenu/src/applet-init.c:37 msgid "Applications Menu" -msgstr "Applikationsmenü" +msgstr "Anwendungsmenü" #: ../GMenu-old/src/applet-init.c:134 ../GMenu/src/applet-init.c:63 msgid "Show/hide the Applications menu" @@ -797,7 +801,7 @@ #: ../GMenu-old/src/applet-menu-callbacks.c:177 ../GMenu/src/applet-menu.c:173 #: ../GMenu-old/data/messages:113 ../GMenu/data/messages:113 msgid "Logout" -msgstr "Ausloggen" +msgstr "Abmelden" #: ../GMenu-old/src/applet-menu-callbacks.c:180 ../GMenu/src/applet-menu.c:176 #: ../GMenu-old/data/messages:115 ../GMenu/data/messages:115 @@ -817,7 +821,7 @@ #: ../GMenu-old/src/applet-notifications.c:116 #: ../GMenu/src/applet-notifications.c:102 msgid "None of these applications seems available:" -msgstr "" +msgstr "Keine dieser Applikationen scheint verfügbar zu sein :" #: ../GMenu-old/src/applet-notifications.c:124 #: ../GMenu/src/applet-notifications.c:110 @@ -839,11 +843,11 @@ #: ../GMenu/src/applet-apps.c:67 msgid "Launch this new application?" -msgstr "" +msgstr "Diese neue Applikation starten ?" #: ../GMenu/src/applet-entry.c:435 msgid "Launch this command" -msgstr "" +msgstr "Dieses Kommando ausführen" #: ../Global-Menu/src/applet-init.c:30 msgid "Global Menu" @@ -1054,7 +1058,7 @@ #: ../Network-Monitor/src/applet-init.c:41 msgid "Network Monitor" -msgstr "" +msgstr "Netzwerkmonitor" #: ../Network-Monitor/src/applet-netspeed.c:202 #: ../System-Monitor/src/applet-monitor.c:95 @@ -2197,7 +2201,7 @@ #: ../dnd2share/src/applet-backend-uppix.c:31 #: ../dnd2share/src/applet-backend-videobin.c:32 msgid "Direct Link" -msgstr "" +msgstr "Direkter Link" #: ../dnd2share/src/applet-backend-codepad.c:51 #: ../dnd2share/src/applet-backend-custom.c:75 @@ -2206,24 +2210,26 @@ #: ../dnd2share/src/applet-backend-pastebin.c:45 msgid "Your text is empty and couldn't be uploaded to this server" msgstr "" +"Ihr Text ist leergelassen worden und kann nicht auf diesen Server " +"hochgeladen werden." #: ../dnd2share/src/applet-backend-dropbox.c:63 #: ../dnd2share/src/applet-backend-ubuntuone.c:59 msgid "This directory seems not valid:" -msgstr "" +msgstr "Dieses Verzeichnis scheint nicht gültig zu sein :" #: ../dnd2share/src/applet-backend-imageshack.c:31 #: ../dnd2share/src/applet-backend-uppix.c:31 msgid "Thumbnail" -msgstr "" +msgstr "Vorschaubild" #: ../dnd2share/src/applet-backend-imgur.c:33 msgid "Display Image" -msgstr "" +msgstr "Bild anzeigen" #: ../dnd2share/src/applet-backend-imgur.c:33 msgid "Large" -msgstr "" +msgstr "Groß" #: ../dnd2share/src/applet-backend-imgur.c:33 #: ../dock-rendering/data/messages:41 @@ -2232,11 +2238,11 @@ #: ../dnd2share/src/applet-dnd2share.c:44 msgid "No text" -msgstr "" +msgstr "Kein Text" #: ../dnd2share/src/applet-dnd2share.c:55 msgid "Text:" -msgstr "" +msgstr "Text :" #: ../dnd2share/src/applet-dnd2share.c:317 msgid "" @@ -2274,6 +2280,8 @@ "Couldn't upload the file to %s, check that your internet connection is " "active." msgstr "" +"Die Datei konnte nicht zu %s hochgeldaden werden, überprüfen Sie bitte ihre " +"Internetverbindung." #: ../dnd2share/src/applet-dnd2share.h:32 #, c-format @@ -2282,6 +2290,9 @@ "Check that your internet connection is active and '%s' is correctly " "installed and running" msgstr "" +"Die Datei konnte nicht zu %s hochgeldaden werden.\n" +"Überprüfen Sie bitte, ob ihre Internetverbindung aktiv, %s korrekt " +"installiert ist und läuft." #: ../dnd2share/src/applet-init.c:46 msgid "" @@ -2655,7 +2666,7 @@ #: ../logout/src/applet-logout.c:271 ../logout/data/messages:97 msgid "Shut down" -msgstr "Ausschalten" +msgstr "Herunterfahren" #: ../logout/src/applet-logout.c:277 msgid "Restart" @@ -2673,13 +2684,16 @@ #: ../logout/src/applet-logout.c:290 msgid "Hybrid Sleep" -msgstr "" +msgstr "Hybridschlaf" #: ../logout/src/applet-logout.c:291 msgid "" "Your computer will still consume a small amount of energy but after some " "time, the computer will suspend to disk and not consume any energy." msgstr "" +"Ihr Rechner wird immernoch eine kleine Menge Energie verbrauchen, nach einer " +"gewissen Zeit wird er jedoch in den suspend-to-disk-Modus gehen und keine " +"Energie mehr verbrauchen." #: ../logout/src/applet-logout.c:296 #: ../powermanager/src/powermanager-menu-functions.c:99 @@ -2728,13 +2742,16 @@ #: ../logout/src/applet-logout.c:627 msgid "Logind has returned this error:" -msgstr "" +msgstr "Logind hat diesen Fehlerwert zurückgegeben :" #: ../logout/src/applet-logout.c:629 msgid "" "Please check that you can do this action\n" "(e.g. you can't power the computer off if another session is active)" msgstr "" +"Bitte überprüfen Sie, ob Sie dieses Aktion ausführen dürfen.\n" +"(z.B. können Sie den Rechner nicht herunterfahren, wenn noch eine andere " +"Sitzung aktiv ist)." #: ../logout/src/applet-logout.c:694 #, c-format @@ -2822,7 +2839,7 @@ #: ../mail/src/cd-mail-applet-accounts.c:39 msgid "Specific icon file when using multiple accounts" -msgstr "" +msgstr "Besondere Symbolbilddatei, wenn mehrere Konten benutzt werden" #: ../mail/src/cd-mail-applet-accounts.c:39 msgid "Directory on server:" @@ -2905,7 +2922,7 @@ #: ../mail/src/cd-mail-applet-init.c:33 msgid "mail" -msgstr "Mail" +msgstr "E-Mail" #: ../mail/src/cd-mail-applet-init.c:36 msgid "" @@ -2963,7 +2980,7 @@ #: ../mail/src/cd-mail-applet-notifications.c:346 msgid "Mail" -msgstr "Mail" +msgstr "E-Mail" #: ../motion-blur/src/applet-init.c:28 msgid "motion blur" @@ -3186,19 +3203,19 @@ #: ../powermanager/src/powermanager-draw.c:202 msgid "h" -msgstr "" +msgstr "Std." #: ../powermanager/src/powermanager-draw.c:204 msgid "mn" -msgstr "" +msgstr "Monat" #: ../powermanager/src/powermanager-draw.c:213 msgid "remaining" -msgstr "" +msgstr "verbleibend" #: ../powermanager/src/powermanager-draw.c:213 msgid "until charged" -msgstr "" +msgstr "bis geladen" #: ../powermanager/src/powermanager-draw.c:231 ../wifi/src/applet-draw.c:30 #: ../Clipper/data/messages:97 ../GMenu-old/data/messages:111 @@ -3404,10 +3421,6 @@ msgid "%s is now unmounted" msgstr "%s ist jetzt ausgehängt" -#: ../shortcuts/src/applet-init.c:32 -msgid "shortcuts" -msgstr "Kürzel" - #: ../shortcuts/src/applet-init.c:35 msgid "" "An applet that let you access quickly to all of your shortcuts.\n" @@ -3419,13 +3432,13 @@ "The applet can also display valuable information about your disks, like free " "space, type, etc." msgstr "" -"Ein Applet, dass Sie auf all Ihre Tastenkombinationen zugreifen läßt.\n" +"Ein Applet, dass Sie auf all Ihre Lesezeichen zugreifen lässt.\n" "Es verwaltet Datenträger, Netzwerkpunkte und Nautilus-Lesezeichen (selbst " "wenn Sie Nautilus nicht haben).\n" "Ziehen Sie einen Ordner auf das Hauptsymbol oder das Unterdock, um ein " "Lesezeichen hinzuzufügen.\n" -"Mittelklick auf das Hauptsymbol zeigt Ihren Home-Ordner an. \n" -"Ein Mittelklick auf das Symbol eines Einhängepunkts hängt das Objekt aus " +"Mittelklick auf das Hauptsymbol zeigt Ihren persönlichen Ordner an. \n" +"Ein Mittelklick auf das Symbol eines Einhängepunktes hängt das Objekt aus " "oder ein.\n" "Das Applet kann außerdem Informationen über Ihre Datenträger anzeigen, z.B. " "wie den freien Platz, Typ usw." @@ -3451,7 +3464,7 @@ #: ../shortcuts/src/applet-notifications.c:285 msgid "Open Home directory" -msgstr "Öffne Home-Ordner" +msgstr "Persönlichen Ordner öffnen" #: ../shortcuts/src/applet-notifications.c:293 msgid "Connect to Server..." @@ -3852,7 +3865,7 @@ #: ../tomboy/src/applet-backend-default.c:160 msgid "Note:" -msgstr "" +msgstr "Hinweis :" #: ../tomboy/src/applet-backend-default.c:208 msgid "Title:" @@ -3934,7 +3947,7 @@ #: ../tomboy/src/tomboy-notifications.c:277 msgid "No description" -msgstr "" +msgstr "Keine Beschreibung" #: ../weather/src/applet-config.c:120 msgid "" @@ -6212,14 +6225,17 @@ "The settings menu file is sometimes available in a settings.menu file but " "its content can also be available in the main .menu file used by the dock" msgstr "" +"Die Datei für das Einstellungsmenü ist manchmal in einer settings.menu Datei " +"verfügbar, aber ihr Inhalt kann außerdem in der vom Dock benutzten main.menu " +"Datei zu finden sein." #: ../GMenu-old/data/messages:101 ../GMenu/data/messages:101 msgid "Load settings' menu?" -msgstr "" +msgstr "Das Menü für die Einstellungen laden ?" #: ../GMenu-old/data/messages:103 ../GMenu/data/messages:103 msgid "Display the description in search's results?" -msgstr "" +msgstr "Die Beschreibung in den Suchergebnissen anzeigen ?" #: ../GMenu-old/data/messages:105 ../GMenu/data/messages:105 msgid "Command to use for configuring the menu:" @@ -6227,7 +6243,7 @@ #: ../GMenu-old/data/messages:109 ../GMenu/data/messages:109 msgid "Show Logout and/or Shutdown : " -msgstr "Ausloggen oder Herunterfahren zeigen : " +msgstr "Abmelden und/oder Herunterfahren anzeigen: " #: ../Global-Menu/data/messages:85 msgid "" @@ -7495,12 +7511,12 @@ #: ../dialog-rendering/data/messages:5 ../dialog-rendering/data/messages:13 #: ../dialog-rendering/data/messages:23 ../dialog-rendering/data/messages:31 msgid "Border width:" -msgstr "Rahmenbreite :" +msgstr "Rahmenbreite:" #: ../dialog-rendering/data/messages:7 ../dialog-rendering/data/messages:15 #: ../dialog-rendering/data/messages:25 ../dialog-rendering/data/messages:33 msgid "Bubble's line colour:" -msgstr "Sprechblasen-Linienfarbe :" +msgstr "Linienfarbe der Sprechblasen:" #: ../dialog-rendering/data/messages:9 msgid "Modern" @@ -7621,7 +7637,7 @@ #: ../dnd2share/data/messages:141 msgid "Uppix.com" -msgstr "" +msgstr "Uppix.com" #: ../dnd2share/data/messages:143 msgid "Imagebin.ca" @@ -7633,7 +7649,7 @@ #: ../dnd2share/data/messages:147 msgid "Imgur.com" -msgstr "" +msgstr "Imgur.com" #: ../dnd2share/data/messages:149 msgid "Preferred site for videos hosting :" @@ -7688,10 +7704,12 @@ msgid "" "Leave empty to upload files into '~/Dropbox/Public' or '~/Ubuntu One'." msgstr "" +"Leer lassen, um die Dateien nach '~/Dropbox/Public' oder '~/Ubuntu One' " +"hochzuladen." #: ../dnd2share/data/messages:183 msgid "Path of a custom DropBox / UbuntuOne folder :" -msgstr "" +msgstr "Pfad zu einem benutzerdefinierten DropBox / UbuntuOne Verzeichnis :" #: ../dnd2share/data/messages:185 msgid "Otherwise, your user name will be used when possible." @@ -8110,6 +8128,7 @@ #: ../icon-effect/data/messages:55 msgid "Repeat these effects until the corresponding application opens?" msgstr "" +"Diese Effekte wiederholen, bis die dazugehörige Applikation sich öffnet ?" #: ../icon-effect/data/messages:59 msgid "In ms. Set 0 to not use this effect." @@ -8350,7 +8369,7 @@ #: ../logout/data/messages:123 msgid "User-defined command to execute for logout:" -msgstr "Bneutzerdefinertes Kommando zum Ausführen des Logouts :" +msgstr "Benutzerdefiniertes Kommando zum Ausführen des Abmeldens:" #: ../logout/data/messages:125 msgid "" @@ -8365,17 +8384,20 @@ #: ../logout/data/messages:127 msgid "User-defined command to execute for shutdown:" -msgstr "Benutzerdefiniertes Kommando, um herunterfahren auszuführen :" +msgstr "Benutzerdefiniertes Kommando zum Ausführen des Herunterfahrens:" #: ../logout/data/messages:129 msgid "" "Leave empty to execute the default command. If not empty, it will execute " "this command with the name of the user (or nothing for guest session)" msgstr "" +"Leer lassen, um das Standardkommando auszuführen. Wenn es nicht leer ist, " +"wird dieses Kommando in Verbindung mit dem Namen des Benutzers ausgeführt " +"(für Gastsitzung leer lassen)." #: ../logout/data/messages:131 msgid "User-defined command to execute for changing user:" -msgstr "" +msgstr "Benutzerdefiniertes Kommando zum Ausführen des Benutzerwechsels:" #: ../mail/data/messages:99 msgid "" @@ -8457,19 +8479,19 @@ #: ../mail/data/messages:145 msgid "Mail application" -msgstr "Mailapplikation :" +msgstr "E-Mail-Anwendung" #: ../mail/data/messages:147 msgid "for instance \"thunderbird\" or \"firefox mail.google.com\"" -msgstr "zum Beispiel \"thunderbird\" oder \"firefox.mail.google.com\"" +msgstr "zum Beispiel \"thunderbird\" oder \"firefox mail.google.com\"" #: ../mail/data/messages:149 msgid "Preferred mail application to launch on left-click :" -msgstr "Gewünschte Mailapplikation zum Starten bei Linksklick :" +msgstr "Gewünschte E-Mail-Anwendung zum Starten bei Linksklick:" #: ../mail/data/messages:151 msgid "Add a mail account (you've to launch the applet)" -msgstr "Ein Mailkonto hinzufügen (Sie müssen das Applet starten)" +msgstr "Ein E-Mail-Konto hinzufügen (Sie müssen das Applet starten)" #: ../mail/data/messages:153 msgid "The new account will be created with the specified type and name." @@ -9334,35 +9356,36 @@ #: ../terminal/data/messages:105 msgid "Use a custom font?" -msgstr "" +msgstr "Eine benutzerdefinierte Schriftart verwenden ?" #: ../terminal/data/messages:107 msgid "Custom font:" -msgstr "" +msgstr "Benutzerdefinierte Schriftart :" #: ../terminal/data/messages:111 msgid "Automatically scroll to the bottom when new data are received" msgstr "" +"Automatisch ganz nach unten scrollen, wenn neue Daten empfangen werden" #: ../terminal/data/messages:113 msgid "Scroll on output" -msgstr "" +msgstr "Bei Ausgabe nach uten scrollen" #: ../terminal/data/messages:115 msgid "Automatically scroll to the bottom when a key is pressed" -msgstr "" +msgstr "Automatisch ganz nach unten scrollen wenn eine Taste gedrückt wird" #: ../terminal/data/messages:117 msgid "Scroll on keystroke" -msgstr "" +msgstr "Bei Tastendruck scrollen" #: ../terminal/data/messages:119 msgid "Limited scrollback buffer" -msgstr "" +msgstr "Begrenzter Scrollback-Puffer" #: ../terminal/data/messages:121 msgid "Length of the scrollback buffer" -msgstr "" +msgstr "Länge des Scrollback-Puffers" #: ../terminal/data/messages:125 msgid "" diff -Nru cairo-dock-plug-ins-3.3.1/po/it.po cairo-dock-plug-ins-3.3.2/po/it.po --- cairo-dock-plug-ins-3.3.1/po/it.po 2013-10-03 11:04:33.000000000 +0000 +++ cairo-dock-plug-ins-3.3.2/po/it.po 2013-10-29 10:26:57.000000000 +0000 @@ -8,14 +8,14 @@ "Project-Id-Version: 1.0.0\n" "Report-Msgid-Bugs-To: fabounet@glx-dock.org\n" "POT-Creation-Date: 2013-09-23 10:57+0000\n" -"PO-Revision-Date: 2013-09-09 23:13+0000\n" +"PO-Revision-Date: 2013-10-19 13:32+0000\n" "Last-Translator: Wonderfulheart \n" "Language-Team: Italian \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2013-09-24 06:11+0000\n" -"X-Generator: Launchpad (build 16771)\n" +"X-Launchpad-Export-Date: 2013-10-20 04:42+0000\n" +"X-Generator: Launchpad (build 16807)\n" "Language: it\n" #: ../Animated-icons/src/applet-blink.c:77 ../Animated-icons/data/messages:11 @@ -197,7 +197,7 @@ #: ../Clipper/src/applet-init.c:87 msgid "Pop-up the items menu" -msgstr "Voci del menu a comparsa" +msgstr "Voci del menù a comparsa" #: ../Clipper/src/applet-notifications.c:33 msgid "The clipboard history is empty." @@ -258,16 +258,15 @@ "You can define in the configuration a Window-Manager that will provide the " "composite, and another as a fallback." msgstr "" -"Quest'applet ti permette di gestire accendendo/spegnendo il " -"composite.\n" +"Quest'applet ti permette di attivare o disattivare il composite.\n" "Il composite è ciò che permette la trasparenza del desktop, ma potrebbe " "rallentare il tuo PC, specialmente durante i giochi.\n" -"Clicca sull'icona per accendere/spegnere il composite. Puoi impostare " -"una scorciatoia per quest'azione.\n" -"L'applet ti permette anche di accedere a qualche configurazione del Gestore-" -"Finestre, con clic centrale e dal menu.\n" -"Puoi anche impostare nella configurazione, un Gestore-Finestre che abbia " -"abilitato il composite, ed un altro in modalità fallback." +"Clicca sull'icona per attivare o disattivare il composite. Puoi " +"definire una scorciatoia per quest'azione.\n" +"L'applet ti permette anche di accedere ad alcune azioni del Gestore di " +"Finestre, dal clic centrale e dal menù.\n" +"Nella configurazione puoi anche definire un Gestore di Finestre che fornisca " +"il composite oppure un altro in modalità fallback (di riserva)." #: ../Composite-Manager/src/applet-init.c:52 msgid "Toggle the composite ON/OFF" @@ -467,34 +466,41 @@ " - Find actions : left, middle click, drop and wheel.\n" " - Fill menu with actions.\n" msgstr "" -"Controllo velocità dischi e spazio.\n" +"Controllo della velocità e spazio dischi.\n" "\n" -"Questa applet mostra le informazioni sui dischi. Puoi attivare entrambe le " -"opzioni contemporaneamente, anche se si consiglia di tenerle separate in due " +"Quest'applet mostra le informazioni sui dischi. Puoi attivare entrambe le " +"opzioni contemporaneamente anche se si consiglia di tenerle separate in due " "diverse istanze dell'applet. Usarle insieme nella stessa applet potrebbe " "causare problemi con la visualizzazione della velocità, la quale potrebbe " "non scalare.\n" "\n" -"Velocità disco: mostra la velocità di trasferimento dei dischi. Fino " -"a 10 partizioni.\n" +"Spazio dischi: mostra lo spazio occupato nei dischi. Fino a 10 " +"partizioni.\n" " Devi configurare il punto di mount di ogni partizione da controllare, come " -"/ o /home\n" -" Si visualizza meglio in un indicatore, con 30/60 come tasso di " -"aggiornamento ed un breve, se non nullo, ritardo.\n" +"\"/ \" oppure \"/home\"\n" +" Si visualizza meglio in un indicatore, con velocità di aggiornamento di 30 " +"o 60 il ritardo è piuttosto breve, se non nullo.\n" +"\n" +"Velocità dischi: mostra la velocità di trasferimento dei dischi. Fino " +"a 5 dischi\n" +" Devi configurare il nome di ciascun disco da controllare indicando il suo " +"nome di dispositivo, come \"sda\" o \"sdb\"\n" +" Si visualizza meglio in un indicatore, con velocità di aggiornamento di 2 " +"o 3 non si ha ritardo fra le transizioni.\n" "\n" "Seconda release, c'è da fare ancora molto:\n" " Spazio libero:\n" " - Notifiche con informazioni dettagliate.\n" " - Etichette modificabili?\n" " Velocità:\n" -" - Opzione tutti i dischi.\n" -" - Notifiche che mostrano informazioni sui dischi per sapere cosa aggiungere " -"alla lista.\n" +" - Opzione su tutti i dischi.\n" +" - Notifiche che mostrano le informazioni sui dischi per sapere cosa " +"aggiungere all'elenco.\n" " - Etichette modificabili?\n" " - Ottenere la reale dimensione dei blocchi dei dischi\n" " Globale:\n" -" - Trova azioni: clic sinistro/centrale, trascinamento e scroll.\n" -" - Riempire il menu con azioni.\n" +" - Trova azioni: clic sinistro o centrale, trascinamento e scroll.\n" +" - Riempire il menù con azioni.\n" #: ../Disks/src/applet-notifications.c:72 #: ../System-Monitor/src/applet-init.c:35 @@ -761,21 +767,21 @@ "a shortkey for it, like ALT+F2)\n" "You can also set up a shortkey to pop up the menu (like ALT+F1)" msgstr "" -"Visualizza il menu delle Applicazioni classico ed i file Recentemente " -"utilizzati.\n" -"È compatibile con ogni menu XDG (Gnome, XFCE, KDE, ...)\n" +"Visualizza il menù delle Applicazioni classico e i file utilizzati " +"Recentemente.\n" +"È compatibile con ogni menù dipendente da XDG (Gnome, XFCE, KDE, ...)\n" "Clic centrale per aprire una finestra di dialogo per lanciare velocemente " "ogni comando (puoi impostare delle scorciatoie da tastiera per farlo, come " "ALT+F2)\n" -"Puoi anche impostare una scorciatoia per aprire il menu (come ALT+F1)" +"Puoi anche impostare una scorciatoia per far comparire il menù (come ALT+F1)" #: ../GMenu-old/src/applet-init.c:41 ../GMenu/src/applet-init.c:37 msgid "Applications Menu" -msgstr "Menu Applicazioni" +msgstr "Menù Applicazioni" #: ../GMenu-old/src/applet-init.c:134 ../GMenu/src/applet-init.c:63 msgid "Show/hide the Applications menu" -msgstr "Mostra/Nascondi il menu delle Applicazioni" +msgstr "Mostrare o nascondere il menù delle Applicazioni" #: ../GMenu-old/src/applet-init.c:139 ../GMenu/src/applet-init.c:68 msgid "Show/hide the quick-launch dialog" @@ -799,7 +805,7 @@ #: ../GMenu-old/src/applet-notifications.c:111 #: ../GMenu/src/applet-notifications.c:97 msgid "Configure menu" -msgstr "Menu di configurazione" +msgstr "Configurazione del menù" #: ../GMenu-old/src/applet-notifications.c:116 #: ../GMenu/src/applet-notifications.c:102 @@ -830,11 +836,11 @@ #: ../GMenu/src/applet-entry.c:435 msgid "Launch this command" -msgstr "" +msgstr "Lancia questo comando" #: ../Global-Menu/src/applet-init.c:30 msgid "Global Menu" -msgstr "Menu Globale" +msgstr "Menù Globale" #: ../Global-Menu/src/applet-init.c:33 msgid "" @@ -844,19 +850,19 @@ "by default.\n" "You can bind a shortkey to this action." msgstr "" -"Questa applet consente di controllare l'attuale finestra attiva:\n" -" chiudere, minimizzare, massimizzare e visualizzare il menu delle " -"applicazioni. Per visualizzare il menu, le applicazioni devono supportare " +"Quest'applet consente di controllare la finestra attiva:\n" +" chiudere, minimizzare, massimizzare e visualizzare il menù delle " +"applicazioni. Per visualizzare il menù, le applicazioni devono supportare " "questa funzionalità, la quale è la modalità predefinita di Ubuntu.\n" "Puoi associare una scorciatoia per questa azione." #: ../Global-Menu/src/applet-init.c:112 ../Global-Menu/src/applet-init.c:211 msgid "Show/hide the current application menu" -msgstr "Mostra/Nasconde il menu dell'applicazione attuale" +msgstr "Mostrare o nascondere il menù dell'applicazione attuale" #: ../Global-Menu/src/applet-notifications.c:99 msgid "The application didn't send its menu to us." -msgstr "L'applicazione non ci mostrerà il suo menu." +msgstr "L'applicazione non ci mostrerà il suo menù." #: ../Impulse/src/applet-impulse.c:169 msgid "" @@ -894,7 +900,7 @@ msgstr "" "Questo plug-in può visualizzare tutti gli indicatori disponibili nella tua " "dock.\n" -"Gli indicatori forniscono informazioni su qualcosa, e un menu per agire su " +"Gli indicatori forniscono informazioni su qualcosa, e un menù per agire su " "di esso:\n" " per esempio, un indicatore per controllare i lavori della stampante. Gli " "indicatori dormienti vengono automaticamente nascosti.\n" @@ -920,7 +926,7 @@ "A menu that lets you access quickly to your information, your online status, " "your friends." msgstr "" -"Un menu che ti permette di accedere velocemente a tutte le tue informazioni, " +"Un menù che ti permette di accedere velocemente a tutte le tue informazioni, " "il tuo status online, i tuoi contatti." #: ../MeMenu/src/applet-notifications.c:31 @@ -937,7 +943,7 @@ "It handles Evolution, Pidgin, Empathy, etc\n" "It requires the Messaging service, which is available on Ubuntu by default." msgstr "" -"Un menu che ti informa dei nuovi messaggi dalle applicazioni di Posta o " +"Un menù che ti informa dei nuovi messaggi dalle applicazioni di Posta o " "Chat.\n" "Gestisce Evolution, Pidgin, Empathy, ecc\n" "Richiede il servizio di Messaggistica il quale è disponibile su Ubuntu in " @@ -945,7 +951,7 @@ #: ../Messaging-Menu/src/applet-init.c:103 msgid "Show/hide the Messaging menu" -msgstr "Mostra/Nascondi il menu di Messaggistica" +msgstr "Mostra o nascondi il menù di Messaggistica" #: ../Messaging-Menu/src/applet-notifications.c:78 msgid "" @@ -1095,15 +1101,15 @@ " or copy it and use \"Paste a new RSS Url\" in the menu.\n" " or edit the Configuration Panel." msgstr "" -"Questa applet è un lettore di feed RSS/Atom.\n" -"Puoi avviare diverse istanze di essa quante volte si desidera.\n" +"Questa applet è un lettore di feed RSS o Atom.\n" +"Puoi avviare diverse istanze di essa quante volte desideri.\n" "UTILIZZO:\n" " - Clic sinistro: visualizza le linee di feed complete in una finestra di " "dialogo.\n" " - Clic centrale: aggiorna il feed.\n" " - Scorrimento sulla desklet: rende le linee di feed scorrevoli.\n" " - Trascina e rilascia un URL valido sull'icona per utilizzarlo,\n" -" o copialo e usa \"Incolla un nuovo URL RSS\" nel menu.\n" +" o copialo e usa \"Incolla un nuovo URL RSS\" nel menù.\n" " o modifica il Pannello di Configurazione." #: ../RSSreader/src/applet-init.c:65 ../RSSreader/src/applet-init.c:125 @@ -1165,7 +1171,7 @@ "Non è stato definito nessun URL\n" "Puoi definirne uno copiando l'URL nella clipboard,\n" " e selezionando \"Incolla l'URL\"\n" -" nel menu." +" nel menù." #: ../RSSreader/src/applet-rss.c:786 msgid "" @@ -1802,12 +1808,12 @@ "The applet can either use the Ubuntu Sound-menu or the Alsa driver." msgstr "" "Questa applet ti permette di controllare il volume dei suoni dalla dock.\n" -"Scorri su/giù sull'icona per alzare/abbassare il volume.\n" -"Clicca sull'icona per mostrare/nascondere il controllo del volume (puoi " +"Scorri su o giù sull'icona per alzare o abbassare il volume.\n" +"Clicca sull'icona per mostrare o nascondere il controllo del volume (puoi " "impostare una scorciatoia da tastiera per esso)\n" "Clic centrale del mouse per attivare o togliere il suono, doppio clic per " "far apparire i canali del mixer.\n" -"L'applet può usare uno fra il menu del Suono di Ubuntu o il driver Alsa." +"L'applet può usare uno fra il menù del Suono di Ubuntu o il driver Alsa." #: ../alsaMixer/src/applet-init.c:40 msgid "Sound Control" @@ -1815,7 +1821,7 @@ #: ../alsaMixer/src/applet-init.c:141 msgid "Show/hide the Sound menu" -msgstr "Mostra/Nascondi il menu del Suono" +msgstr "Mostra o nascondi il menù del Suono" #: ../alsaMixer/src/applet-notifications.c:80 msgid "Adjust channels" @@ -2102,31 +2108,31 @@ #: ../desklet-rendering/src/rendering-desklet-decorations.c:46 msgid "frame&reflects" -msgstr "cornici&riflessi" +msgstr "cornici e riflessi" #: ../desklet-rendering/src/rendering-desklet-decorations.c:55 msgid "scotch sellotape" -msgstr "Scotch" +msgstr "scotch" #: ../desklet-rendering/src/rendering-desklet-decorations.c:64 msgid "frame with sellotape" -msgstr "Cornice con scotch" +msgstr "cornice con scotch" #: ../desklet-rendering/src/rendering-desklet-decorations.c:73 msgid "CD box" -msgstr "Box CD" +msgstr "scatola CD" #: ../desklet-rendering/src/rendering-desklet-decorations.c:81 msgid "dark" -msgstr "scuro" +msgstr "scura" #: ../desklet-rendering/src/rendering-desklet-decorations.c:89 msgid "clear" -msgstr "pulito" +msgstr "pulita" #: ../desklet-rendering/src/rendering-desklet-decorations.c:97 msgid "light" -msgstr "leggero" +msgstr "leggera" #: ../desklet-rendering/src/rendering-desklet-decorations.c:105 msgid "water drop" @@ -2138,12 +2144,12 @@ #: ../desklet-rendering/src/rendering-desklet-decorations.c:121 msgid "futuristic" -msgstr "futuristico" +msgstr "futuristica" #: ../desklet-rendering/src/rendering-desklet-decorations.c:129 #: ../slider/data/messages:137 msgid "none" -msgstr "nessuno" +msgstr "nessuna" #: ../desklet-rendering/src/rendering-desklet-decorations.c:137 msgid "board" @@ -2613,7 +2619,7 @@ "spegnere, riavviare, ibernare, sospendere, fare il log out, bloccare lo " "schermo, cambiare utente o programmare uno spegnimento automatico.\n" "Ti informerà anche se il tuo Sistema necessita di essere riavviato.\n" -"Clic sull'icona per far comparire il menu.\n" +"Clic sull'icona per far comparire il menù.\n" "Puoi impostare una scorciatoia per essa, anche per bloccare lo " "schermo." @@ -2628,7 +2634,7 @@ #: ../logout/src/applet-init.c:71 msgid "Show the log-out menu" -msgstr "Mostra il menu di log-out" +msgstr "Mostra il menù di log-out" #: ../logout/src/applet-logout.c:271 ../logout/data/messages:97 msgid "Shut down" @@ -3283,14 +3289,14 @@ msgstr "" "Quest'applet permette di esplorare una cartella e le sue sotto-cartelle " "velocemente.\n" -"Puoi impostare una scorciatoia di tasti per far comparire il menu.\n" +"Puoi impostare una scorciatoia di tasti per far comparire il menù.\n" "Clic centrale apre la cartella principale.\n" "Quest'applet può essere lanciata più volte, se vuoi esplorare differenti " "cartelle." #: ../quick-browser/src/applet-init.c:64 msgid "Show/hide the folder menu" -msgstr "Mostra/Nascondi il menu della cartella" +msgstr "Mostra o nascondi il menù della cartella" #: ../quick-browser/src/applet-menu.c:106 #: ../quick-browser/src/applet-menu.c:112 @@ -3499,9 +3505,9 @@ " e anche: le desklet, il Livello Widget, o tutte le scrivanie " "contemporaneamente.\n" "Può essere utilizzata altresì per cambiare rapidamente la risoluzione dello " -"schermo dal menu (click destro).\n" -"Clic sinistro per mostrare/nascondere la Scrivania.\n" -"Clic centrale per mostrare/nascondere sia la Scrivania, le desklet, il " +"schermo dal menù (click destro).\n" +"Clic sinistro per mostrare o nascondere la Scrivania.\n" +"Clic centrale per mostrare o nascondere sia la Scrivania, le desklet, il " "Livello Widget, o tutte le scrivanie contemporaneamente." #: ../showDesktop/src/applet-notifications.c:209 @@ -3655,12 +3661,12 @@ "It has 2 modes : compact (on 1 icon) and expanded (with a sub-dock)." msgstr "" "Quest'applet permette di interagire con i tuoi spazi di lavoro:\n" -" - passaggio tra spazi di lavoro (scroll su/giù del mouse),\n" +" - passaggio tra spazi di lavoro (scroll su o giù del mouse),\n" " - dargli un nome (nella configurazione),\n" -" - aggiungere/rimuovere uno spazio di lavoro (nel menu),\n" -" - mostrare la scrivania (clic centrale o nel menu),\n" +" - aggiungere o rimuovere uno spazio di lavoro (nel menù),\n" +" - mostrare la scrivania (clic centrale o nel menù),\n" " - lista di tutte le finestre per ciascun spazio di lavoro (clic centrale o " -"nel menu)\n" +"nel menù)\n" "Ha due tipologie: compatta (in 1 icona) ed espansa (con una sub-dock)." #: ../switcher/src/applet-notifications.c:248 @@ -4340,7 +4346,7 @@ #: ../Animated-icons/data/messages:153 msgid "Pulse max zoom:" -msgstr "Zoom massimo della pulsazione:" +msgstr "Ingrandimento massimo della pulsazione:" #: ../Animated-icons/data/messages:155 msgid "Pulse follows icon shape?" @@ -4364,7 +4370,7 @@ #: ../Animated-icons/data/messages:175 msgid "Blink duration:" -msgstr "Durata del tremolìo:" +msgstr "Durata dell'intermittenza:" #: ../Animated-icons/data/messages:183 msgid "Busy duration:" @@ -4480,7 +4486,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 "Nome dell'icona come apparirà sull'etichetta nella dock:" +msgstr "Nome dell'icona che apparirà sulla didascalia nella dock:" #: ../Cairo-Penguin/data/messages:9 ../Clipper/data/messages:9 #: ../Composite-Manager/data/messages:9 ../Disks/data/messages:9 @@ -5605,11 +5611,11 @@ #: ../Clipper/data/messages:123 msgid "Shortkey to pop-up the items menu:" -msgstr "Scorcatoie di tastiera per rendere a comparsa gli oggetti del menu:" +msgstr "Scorcatoie di tastiera per rendere a comparsa gli oggetti del menù:" #: ../Clipper/data/messages:125 msgid "Pop-up menus at mouse position?" -msgstr "Menu a comparsa in una posizione del mouse?" +msgstr "Menù a comparsa nella posizione del mouse?" #: ../Clipper/data/messages:127 msgid "Actions" @@ -5637,7 +5643,7 @@ #: ../Clipper/data/messages:139 msgid "Duration of the action menu:" -msgstr "Durata del menu azioni:" +msgstr "Durata del menù azioni:" #: ../Clipper/data/messages:141 msgid "Persistent items" @@ -6147,7 +6153,7 @@ #: ../GMenu-old/data/messages:91 ../GMenu/data/messages:91 #: ../Messaging-Menu/data/messages:101 ../quick-browser/data/messages:117 msgid "Shortkey to show/hide the menu:" -msgstr "Scorciatoia per nascondere/mostrare il menu:" +msgstr "Scorciatoia per nascondere o mostrare il menù:" #: ../GMenu-old/data/messages:93 ../GMenu/data/messages:93 msgid "Shortkey to show/hide the quick-launch dialog:" @@ -6166,21 +6172,21 @@ "The settings menu file is sometimes available in a settings.menu file but " "its content can also be available in the main .menu file used by the dock" msgstr "" -"Il file delle impostazioni del menu talvolta è disponibile in un file " -"settings.menu ma il suo contenuto può essere disponibile anche nel file " -"principale .menu utilizzato dalla dock" +"Il file delle impostazioni del menù talvolta è disponibile in un file " +"\"settings.menu\" ma il suo contenuto può essere disponibile anche nel file " +"principale \".menu\" utilizzato dalla dock" #: ../GMenu-old/data/messages:101 ../GMenu/data/messages:101 msgid "Load settings' menu?" -msgstr "Carico il menu delle impostazioni?" +msgstr "Carico il menù delle impostazioni?" #: ../GMenu-old/data/messages:103 ../GMenu/data/messages:103 msgid "Display the description in search's results?" -msgstr "" +msgstr "Visualizzo la descrizione nei risultati della ricerca?" #: ../GMenu-old/data/messages:105 ../GMenu/data/messages:105 msgid "Command to use for configuring the menu:" -msgstr "Comando da utilizzare per configurare il menu:" +msgstr "Comando da utilizzare per configurare il menù:" #: ../GMenu-old/data/messages:109 ../GMenu/data/messages:109 msgid "Show Logout and/or Shutdown : " @@ -6195,12 +6201,12 @@ msgstr "" "L'applet può togliere il bordo superiore delle finestre massimizzate, in tal " "caso essa visualizzerà i pulsanti di controllo della finestra.\n" -" L'applet può togliere il menu dalle finestre, in tal caso essa visualizzerà " -"un pulsante per la comparsa del menu della finestra attuale." +" L'applet può togliere il menù dalle finestre, in tal caso essa visualizzerà " +"un pulsante per la comparsa del menù della finestra attuale." #: ../Global-Menu/data/messages:89 msgid "Steal window menu" -msgstr "Togliere il menu della finestra" +msgstr "Togliere il menù della finestra" #: ../Global-Menu/data/messages:91 msgid "Steal window decoration" @@ -6208,15 +6214,15 @@ #: ../Global-Menu/data/messages:93 msgid "Steal window menu and border" -msgstr "Togliere il bordo e il menu della finestra" +msgstr "Togliere il bordo e il menù della finestra" #: ../Global-Menu/data/messages:95 msgid "Shortkey to pop up the menu" -msgstr "Scorciatoia per il menu a comparsa" +msgstr "Scorciatoia per il menù a comparsa" #: ../Global-Menu/data/messages:97 msgid "Pop up the menu at mouse position" -msgstr "Comparsa del menu nella posizione del mouse" +msgstr "Comparsa del menù nella posizione del mouse" #: ../Global-Menu/data/messages:99 msgid "Compact mode" @@ -6994,7 +7000,7 @@ #: ../Status-Notifier/data/messages:119 msgid "Left click pops up the items' menu" -msgstr "Clic sinistro mostra gli oggetti del menu" +msgstr "Clic sinistro mostra gli oggetti del menù" #: ../System-Monitor/data/messages:99 ../alsaMixer/data/messages:109 #: ../powermanager/data/messages:101 ../wifi/data/messages:99 @@ -7823,7 +7829,7 @@ #: ../dock-rendering/data/messages:105 msgid "Space between icons and their captions:" -msgstr "Spazio tra le icone e le loro etichette:" +msgstr "Spazio tra le icone e le loro didascalie:" #: ../dock-rendering/data/messages:107 msgid "" @@ -7835,7 +7841,7 @@ #: ../dock-rendering/data/messages:109 msgid "Draw captions while unfolding?" -msgstr "Disegna le etichette durante lo sfogliamento?" +msgstr "Disegnare le didascalie durante il dispiegamento?" #: ../dock-rendering/data/messages:115 msgid "Space between icons:" @@ -7938,8 +7944,8 @@ "Labels are also clickable." msgstr "" "Una vista parabolica\n" -"Perfetta per le sub-dock medie aventi da 3 a 10 icone.\n" -"Le etichette sono cliccabili." +"Perfetta per le sub-dock di media grandezza aventi da 3 a 10 icone.\n" +"Anche le etichette sono cliccabili." #: ../dock-rendering/data/messages:146 msgid "" @@ -8264,7 +8270,7 @@ #: ../logout/data/messages:103 msgid "Shortkey to show the menu" -msgstr "Scorciatoia per mostrare il menu" +msgstr "Scorciatoia per mostrare il menù" #: ../logout/data/messages:105 msgid "Demand confirmation before closing" @@ -8734,7 +8740,7 @@ #: ../quick-browser/data/messages:103 msgid "Menu" -msgstr "Menu" +msgstr "Menù" #: ../quick-browser/data/messages:105 msgid "It can be CPU intense to load a lot of icons." @@ -8742,7 +8748,7 @@ #: ../quick-browser/data/messages:107 msgid "Display icons in the menu?" -msgstr "Mostra le icone nel menu?" +msgstr "Mostrare le icone nel menù?" #: ../quick-browser/data/messages:109 msgid "Icon size :" @@ -8770,7 +8776,7 @@ #: ../quick-browser/data/messages:121 msgid "Build menu gradually:" -msgstr "Costruzione graduale del menu:" +msgstr "Costruzione graduale del menù:" #: ../shortcuts/data/messages:93 msgid "List drives and volumes?" @@ -9477,8 +9483,8 @@ msgid "" "This lets you right-click on the desklet to pop up the Cairo-Dock menu." msgstr "" -"Questo ti permette di visualizzare come notifica a comparsa il menu di Cairo-" -"Dock con il clic destro." +"Il clic destro sulla desklet ti consente di visualizzare il menù di Cairo-" +"Dock con una notifica a comparsa." #: ../weblets/data/messages:105 msgid "Right margin width, in pixels:" @@ -9505,7 +9511,7 @@ #: ../weblets/data/messages:115 msgid "Predefined bookmarks to show in applet menu:" -msgstr "Segnalibri predefiniti da mostrare nel menu dell'applet:" +msgstr "Segnalibri predefiniti da mostrare nel menù dell'applet:" #: ../wifi/data/messages:139 msgid "\"No signal\" icon" diff -Nru cairo-dock-plug-ins-3.3.1/po/ru.po cairo-dock-plug-ins-3.3.2/po/ru.po --- cairo-dock-plug-ins-3.3.1/po/ru.po 2013-10-03 11:04:33.000000000 +0000 +++ cairo-dock-plug-ins-3.3.2/po/ru.po 2013-10-29 10:26:57.000000000 +0000 @@ -8,14 +8,14 @@ "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: fabounet@glx-dock.org\n" "POT-Creation-Date: 2013-09-23 10:57+0000\n" -"PO-Revision-Date: 2013-07-21 20:03+0000\n" -"Last-Translator: Matthieu Baerts \n" +"PO-Revision-Date: 2013-10-23 10:36+0000\n" +"Last-Translator: fossil \n" "Language-Team: LANGUAGE \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2013-09-24 06:12+0000\n" -"X-Generator: Launchpad (build 16771)\n" +"X-Launchpad-Export-Date: 2013-10-24 04:48+0000\n" +"X-Generator: Launchpad (build 16810)\n" "Language: \n" #: ../Cairo-Penguin/src/applet-init.c:33 @@ -52,7 +52,7 @@ #: ../Animated-icons/data/messages:41 ../Animated-icons/data/messages:63 #: ../Animated-icons/data/messages:179 msgid "Busy" -msgstr "" +msgstr "Не беспокоить" #: ../Animated-icons/src/applet-init.c:39 msgid "Animated icons" @@ -258,20 +258,20 @@ "You can define in the configuration a Window-Manager that will provide the " "composite, and another as a fallback." msgstr "" -"С помощью этого апплета можно включать или выключать композитный " +"С помощью этого апплета можно включать или выключать композитный " "менеджер.\n" "Композитность позволяет использовать прозрачность на рабочем столе, но она " "может замедлить работу компьютера.\n" "Щелчок на значке, чтобы переключить композитность ВКЛ/ВЫКЛ. Можно " "назначить быструю клавишу.\n" -"Кроме того, апплет обеспечивает доступ до некоторых функций ОМ, сркдний " +"Кроме того, апплет обеспечивает доступ до некоторых функций ОМ, средний " "щелчок - меню.\n" "В настройках можно назначить основной композитный менеджер, который будет " "обеспечивать композитность, а также запасной, на случай сбоев." #: ../Composite-Manager/src/applet-init.c:52 msgid "Toggle the composite ON/OFF" -msgstr "" +msgstr "Переключить композитность ВКЛ/ВЫКЛ" #: ../Composite-Manager/src/applet-notifications.c:43 msgid "Toggle composite?" @@ -548,7 +548,7 @@ #: ../Folders/src/applet-notifications.c:159 msgid "Mime Type" -msgstr "" +msgstr "Тип Mime" #: ../Folders/src/applet-notifications.c:173 msgid "User ID" @@ -801,7 +801,7 @@ #: ../Global-Menu/src/applet-init.c:30 msgid "Global Menu" -msgstr "" +msgstr "Глобальное меню" #: ../Global-Menu/src/applet-init.c:33 msgid "" @@ -994,7 +994,7 @@ #: ../Network-Monitor/src/applet-init.c:41 msgid "Network Monitor" -msgstr "" +msgstr "Сетевой монитор" #: ../Network-Monitor/src/applet-netspeed.c:202 #: ../System-Monitor/src/applet-monitor.c:95 @@ -1406,11 +1406,11 @@ #: ../Screenshot/src/applet-init.c:53 msgid "Take a screenshot" -msgstr "" +msgstr "Сделать скриншот" #: ../Screenshot/src/applet-notifications.c:49 msgid "Screenshot" -msgstr "" +msgstr "Скриншот" #: ../Screenshot/src/applet-notifications.c:61 msgid "Screenshot with options" @@ -1438,7 +1438,7 @@ #: ../Screenshot/src/applet-screenshot.c:457 msgid "Delay" -msgstr "" +msgstr "Задержка" #: ../Screenshot/src/applet-screenshot.c:479 msgid "Grab the current window instead of the all screen" @@ -1457,11 +1457,11 @@ #: ../Screenshot/src/applet-screenshot.c:498 msgid "Directory" -msgstr "" +msgstr "Папка" #: ../Sound-Effects/src/applet-init.c:29 msgid "Sound Effects" -msgstr "" +msgstr "Звуковые эффекты" #: ../Sound-Effects/src/applet-init.c:32 msgid "" @@ -1716,7 +1716,7 @@ #: ../alsaMixer/src/applet-draw.c:37 msgid "Volume" -msgstr "" +msgstr "Громкость" #: ../alsaMixer/src/applet-init.c:32 msgid "" @@ -2050,11 +2050,11 @@ #: ../desklet-rendering/src/rendering-desklet-decorations.c:105 msgid "water drop" -msgstr "" +msgstr "брызги" #: ../desklet-rendering/src/rendering-desklet-decorations.c:113 msgid "water" -msgstr "" +msgstr "вода" #: ../desklet-rendering/src/rendering-desklet-decorations.c:121 msgid "futuristic" @@ -2103,7 +2103,7 @@ #: ../dnd2share/src/applet-backend-uppix.c:31 #: ../dnd2share/src/applet-backend-videobin.c:32 msgid "Direct Link" -msgstr "" +msgstr "Прямая ссылка" #: ../dnd2share/src/applet-backend-codepad.c:51 #: ../dnd2share/src/applet-backend-custom.c:75 @@ -2121,7 +2121,7 @@ #: ../dnd2share/src/applet-backend-imageshack.c:31 #: ../dnd2share/src/applet-backend-uppix.c:31 msgid "Thumbnail" -msgstr "" +msgstr "Миниатюра" #: ../dnd2share/src/applet-backend-imgur.c:33 msgid "Display Image" @@ -2967,11 +2967,11 @@ #: ../musicPlayer/src/applet-notifications.c:336 msgid "Shuffle" -msgstr "" +msgstr "Перемешать" #: ../musicPlayer/src/applet-notifications.c:344 msgid "Repeat" -msgstr "" +msgstr "Повторить" #: ../musicPlayer/src/applet-notifications.c:352 msgid "Rate this song" @@ -3042,15 +3042,15 @@ #: ../powermanager/src/powermanager-draw.c:202 msgid "h" -msgstr "" +msgstr "ч" #: ../powermanager/src/powermanager-draw.c:204 msgid "mn" -msgstr "" +msgstr "мн" #: ../powermanager/src/powermanager-draw.c:213 msgid "remaining" -msgstr "" +msgstr "осталось" #: ../powermanager/src/powermanager-draw.c:213 msgid "until charged" @@ -3194,36 +3194,36 @@ #: ../shortcuts/src/applet-disk-usage.c:179 #: ../shortcuts/src/applet-disk-usage.c:208 msgid "Mount point:" -msgstr "" +msgstr "Точка монтирования:" #: ../shortcuts/src/applet-disk-usage.c:180 #: ../shortcuts/src/applet-disk-usage.c:209 msgid "File system:" -msgstr "" +msgstr "Файловая система:" #: ../shortcuts/src/applet-disk-usage.c:181 #: ../shortcuts/src/applet-disk-usage.c:210 msgid "Device:" -msgstr "" +msgstr "Устройство:" #: ../shortcuts/src/applet-disk-usage.c:182 #: ../shortcuts/src/applet-disk-usage.c:211 msgid "Mount options:" -msgstr "" +msgstr "Параметры монтирования:" #: ../shortcuts/src/applet-disk-usage.c:214 msgid "Backup frequency:" -msgstr "" +msgstr "Частота резервного копирования:" #: ../shortcuts/src/applet-disk-usage.c:214 msgid "days" -msgstr "" +msgstr "дней" #: ../shortcuts/src/applet-disk-usage.c:237 #: ../shortcuts/src/applet-disk-usage.c:247 #: ../shortcuts/src/applet-disk-usage.c:252 msgid "Name:" -msgstr "" +msgstr "Имя:" #: ../shortcuts/src/applet-disk-usage.c:238 msgid "Capacity:" @@ -3231,11 +3231,11 @@ #: ../shortcuts/src/applet-disk-usage.c:239 msgid "Free space:" -msgstr "" +msgstr "Свободно:" #: ../shortcuts/src/applet-disk-usage.c:247 msgid "Not mounted" -msgstr "" +msgstr "Не подключено" #: ../shortcuts/src/applet-disk-usage.c:253 ../RSSreader/data/messages:97 msgid "URL:" @@ -3694,7 +3694,7 @@ #: ../tomboy/src/applet-backend-default.c:160 msgid "Note:" -msgstr "" +msgstr "Примечание:" #: ../tomboy/src/applet-backend-default.c:208 msgid "Title:" @@ -6072,7 +6072,7 @@ #: ../Global-Menu/data/messages:99 msgid "Compact mode" -msgstr "" +msgstr "Компактынй режим" #: ../Global-Menu/data/messages:101 msgid "Order of the buttons: " @@ -6080,7 +6080,7 @@ #: ../Global-Menu/data/messages:103 msgid "Auto" -msgstr "" +msgstr "Авто" #: ../Global-Menu/data/messages:105 msgid "Close button at the end" @@ -6795,7 +6795,7 @@ #: ../Sound-Effects/data/messages:7 ../Sound-Effects/data/messages:13 #: ../Sound-Effects/data/messages:19 msgid "Sound file" -msgstr "" +msgstr "Звуковой файл" #: ../Sound-Effects/data/messages:9 msgid "Play a sound on middle click ?" @@ -6807,7 +6807,7 @@ #: ../Sound-Effects/data/messages:21 msgid "Volume:" -msgstr "" +msgstr "Громкость:" #: ../Sound-Effects/data/messages:25 msgid "High" @@ -6848,7 +6848,7 @@ #: ../System-Monitor/data/messages:99 ../alsaMixer/data/messages:109 #: ../powermanager/data/messages:101 ../wifi/data/messages:99 msgid "Display style" -msgstr "" +msgstr "Стиль отображения" #: ../System-Monitor/data/messages:107 ../alsaMixer/data/messages:121 #: ../powermanager/data/messages:111 ../wifi/data/messages:109 @@ -7233,7 +7233,7 @@ #: ../clock/data/messages:161 msgid "Outline colour:" -msgstr "" +msgstr "Цвет контура:" #: ../clock/data/messages:163 msgid "Layout of the text:" @@ -7417,7 +7417,7 @@ #: ../dnd2share/data/messages:141 msgid "Uppix.com" -msgstr "" +msgstr "Uppix.com" #: ../dnd2share/data/messages:143 msgid "Imagebin.ca" @@ -7429,7 +7429,7 @@ #: ../dnd2share/data/messages:147 msgid "Imgur.com" -msgstr "" +msgstr "Imgur.com" #: ../dnd2share/data/messages:149 msgid "Preferred site for videos hosting :" @@ -9090,7 +9090,7 @@ #: ../terminal/data/messages:107 msgid "Custom font:" -msgstr "" +msgstr "Свой шрифт:" #: ../terminal/data/messages:111 msgid "Automatically scroll to the bottom when new data are received" diff -Nru cairo-dock-plug-ins-3.3.1/po/sr.po cairo-dock-plug-ins-3.3.2/po/sr.po --- cairo-dock-plug-ins-3.3.1/po/sr.po 2013-10-03 11:04:33.000000000 +0000 +++ cairo-dock-plug-ins-3.3.2/po/sr.po 2013-10-29 10:26:57.000000000 +0000 @@ -6,14 +6,14 @@ "Project-Id-Version: то\n" "Report-Msgid-Bugs-To: fabounet@glx-dock.org\n" "POT-Creation-Date: 2013-09-23 10:57+0000\n" -"PO-Revision-Date: 2013-09-09 06:23+0000\n" +"PO-Revision-Date: 2013-10-01 05:55+0000\n" "Last-Translator: Саша Петровић \n" "Language-Team: српски \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2013-09-24 06:12+0000\n" -"X-Generator: Launchpad (build 16771)\n" +"X-Launchpad-Export-Date: 2013-10-02 05:20+0000\n" +"X-Generator: Launchpad (build 16774)\n" "Language: sr\n" #: ../Animated-icons/src/applet-blink.c:77 ../Animated-icons/data/messages:11 @@ -824,7 +824,7 @@ #: ../GMenu/src/applet-entry.c:435 msgid "Launch this command" -msgstr "" +msgstr "Покрени ову наредбу" #: ../Global-Menu/src/applet-init.c:30 msgid "Global Menu" @@ -6137,7 +6137,7 @@ #: ../GMenu-old/data/messages:103 ../GMenu/data/messages:103 msgid "Display the description in search's results?" -msgstr "" +msgstr "Да ли приказивати опис у излазиме претраге?" #: ../GMenu-old/data/messages:105 ../GMenu/data/messages:105 msgid "Command to use for configuring the menu:" diff -Nru cairo-dock-plug-ins-3.3.1/po/uk.po cairo-dock-plug-ins-3.3.2/po/uk.po --- cairo-dock-plug-ins-3.3.1/po/uk.po 2013-10-03 11:04:33.000000000 +0000 +++ cairo-dock-plug-ins-3.3.2/po/uk.po 2013-10-29 10:26:57.000000000 +0000 @@ -8,14 +8,14 @@ "Project-Id-Version: cairo-dock-plug-ins\n" "Report-Msgid-Bugs-To: fabounet@glx-dock.org\n" "POT-Creation-Date: 2013-09-23 10:57+0000\n" -"PO-Revision-Date: 2013-09-24 20:46+0000\n" +"PO-Revision-Date: 2013-10-14 21:07+0000\n" "Last-Translator: ma$terok \n" "Language-Team: Ukrainian \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2013-09-25 05:32+0000\n" -"X-Generator: Launchpad (build 16771)\n" +"X-Launchpad-Export-Date: 2013-10-15 04:44+0000\n" +"X-Generator: Launchpad (build 16799)\n" "Language: uk\n" #: ../Animated-icons/src/applet-blink.c:77 ../Animated-icons/data/messages:11 @@ -83,14 +83,14 @@ "be added easily." msgstr "" "Додає кумедного пінгвіна на вашу панель!\n" -"Ліве клацання змінює анімацію,\n" -"Клацання середньою кнопкою турбує його ^_^\n" -"Tux зображення взяті з Pingus, деякі інші персонажі вже є або можуть бути " +"Клацання лівою клавішею змінює анімацію,\n" +"Клацання середньою клавішею турбує його ^_^\n" +"Зображення Тукса взяті з Pingus, деякі інші персонажі вже є або можуть бути " "легко додані." #: ../Cairo-Penguin/src/applet-init.c:39 msgid "Cairo-Penguin" -msgstr "Cairo-Penguin" +msgstr "Cairo-Пінгвін" #: ../Cairo-Penguin/src/applet-notifications.c:29 msgid "Hey, I'm here!" @@ -104,8 +104,8 @@ msgid "" "I don't have time to play with you, I have to dig and mine all these icons." msgstr "" -"У мене немає часу гратися з тобою, Я повинен копати і замінувати всі ці " -"іконки" +"У мене немає часу гратися з тобою, Я повинен підкопати і замінувати всі ці " +"іконки." #: ../Cairo-Penguin/src/applet-notifications.c:32 msgid "Your dock is so messy! Let me clean it." @@ -117,7 +117,7 @@ #: ../Cairo-Penguin/src/applet-notifications.c:34 msgid "Wait, do you want to kill me?!" -msgstr "Стій! Ти хочеш мене вбити?" +msgstr "Стій! Ти що, мені пір’я пошкодити хочеш?" #: ../Cairo-Penguin/src/applet-notifications.c:35 msgid "Do you know how painful it is to be clicked on??" @@ -144,8 +144,8 @@ "- Gee, Brain, what do you want to do tonight?\n" "- The same thing we do every night, Pinky : try to take over the Dock!" msgstr "" -"Чим ми сьогодні займемося, Кортекс?\n" -"Як і щоночі, Мінус. Намагатимемося дременути з панелі!" +"- Агов, Брейн, що будемо робити сьогодні вночі?\n" +"- Те саме, що і завжди Пінкі, спробуємо захопити панель!" #: ../Cairo-Penguin/src/applet-notifications.c:41 msgid "For Aiur!" @@ -182,14 +182,14 @@ "Drop text on the icon to create persistent items, and middle-clck to recall " "them." msgstr "" -"Цей додаток відслідковує буфер обміну та виділені мишою шматки,\n" +"Цей додаток відслідковує буфер обміну та виділені мишою фрагменти,\n" "для того, щоб ви в будь-який момент могли їх викликати. Клон популярного " "Klipper.\n" -"Підтримує буфер обміну та виділення мишею, передустановлені дії та постійні " +"Підтримує буфер обміну та виділення мишею, перед встановлені дії та постійні " "елементи.\n" -"Ліве клацання, щоб показати історію буферу обміну та виділення мишею,\n" -"Перетягніть текст на значок, щоб створити постійний елемент, середнє " -"клацання для його виклику." +"Клацання лівою клавішею показує історію буферу обміну та виділення мишею,\n" +"Перетягніть текст на іконку, щоб створити постійний елемент і використовуйте " +"середнє клацання для його виклику." #: ../Clipper/src/applet-init.c:39 msgid "Clipboard history" @@ -1073,7 +1073,7 @@ #: ../RSSreader/src/applet-init.c:31 msgid "RSSreader" -msgstr "RSSreader" +msgstr "Подачі" #: ../RSSreader/src/applet-init.c:34 msgid "" @@ -1087,15 +1087,15 @@ " or copy it and use \"Paste a new RSS Url\" in the menu.\n" " or edit the Configuration Panel." msgstr "" -"Аплет читання RSS/Atom стрічок.\n" +"Аплет читання RSS/Atom подач.\n" "Можна запускати кілька копій.\n" "Використання:\n" -" - Ліве клацання: Показати у вікні всю стрічку.\n" -" - Середнє клацання: Оновити стрічку.\n" -" - Прокручування: прокрутити стрічку.\n" -" - Щоб почати читання стрічки, перетягніть її URL на значок\n" +" - Ліве клацання: Показати у вікні всю подачу.\n" +" - Середнє клацання: Оновити подачу.\n" +" - Прокручування: прокрутити подачу.\n" +" - Щоб почати читання подачі, перетягніть її URL на значок\n" " або скопіюйте його до буферу обміну, а потім використайте пункт меню " -"\"Вставити URL стрічки\"\n" +"\"Вставити URL подачі\"\n" " або скористайтеся панеллю налаштувань." #: ../RSSreader/src/applet-init.c:65 ../RSSreader/src/applet-init.c:125 diff -Nru cairo-dock-plug-ins-3.3.1/shortcuts/src/applet-bookmarks.c cairo-dock-plug-ins-3.3.2/shortcuts/src/applet-bookmarks.c --- cairo-dock-plug-ins-3.3.1/shortcuts/src/applet-bookmarks.c 2013-10-08 16:09:17.000000000 +0000 +++ cairo-dock-plug-ins-3.3.2/shortcuts/src/applet-bookmarks.c 2013-10-29 10:23:19.000000000 +0000 @@ -52,11 +52,10 @@ cd_message ("The bookmarks list has changed"); //\____________________ On lit le fichier des signets. - gchar *cBookmarkFilePath = g_strdup_printf ("%s/"GTK_BOOKMARKS_PATH, g_getenv ("HOME")); gchar *cContent = NULL; gsize length=0; GError *erreur = NULL; - g_file_get_contents (cBookmarkFilePath, &cContent, &length, &erreur); + g_file_get_contents (myData.cBookmarksURI, &cContent, &length, &erreur); if (erreur != NULL) { cd_warning ("when trying to get the bookmarks : %s", erreur->message); @@ -196,21 +195,19 @@ pIconsList = CD_APPLET_MY_ICONS_LIST; cairo_dock_sort_icons_by_order (pIconsList); // again, since 'Home Folder' is always the first bookmark, the head of the list won't change even if there are only bookmarks (so we don't need to re-assigne it to the container). } - g_free (cBookmarkFilePath); } CD_APPLET_LEAVE(); } -void cd_shortcuts_remove_one_bookmark (const gchar *cURI) +void cd_shortcuts_remove_one_bookmark (const gchar *cURI, GldiModuleInstance *myApplet) { g_return_if_fail (cURI != NULL); cd_message ("%s (%s)", __func__, cURI); - gchar *cBookmarkFilePath = g_strdup_printf ("%s/"GTK_BOOKMARKS_PATH, g_getenv ("HOME")); gchar *cContent = NULL; gsize length=0; GError *erreur = NULL; - g_file_get_contents (cBookmarkFilePath, &cContent, &length, &erreur); + g_file_get_contents (myData.cBookmarksURI, &cContent, &length, &erreur); if (erreur != NULL) { cd_warning ("while trying to read bookmarks file : %s", erreur->message); @@ -253,7 +250,7 @@ else { cContent = g_strjoinv ("\n", cBookmarksList); - g_file_set_contents (cBookmarkFilePath, cContent, -1, &erreur); + g_file_set_contents (myData.cBookmarksURI, cContent, -1, &erreur); if (erreur != NULL) { cd_warning ("while trying to write bookmarks file : %s", erreur->message); @@ -263,19 +260,17 @@ } g_strfreev (cBookmarksList); } - g_free (cBookmarkFilePath); } -void cd_shortcuts_rename_one_bookmark (const gchar *cURI, const gchar *cName) +void cd_shortcuts_rename_one_bookmark (const gchar *cURI, const gchar *cName, GldiModuleInstance *myApplet) { g_return_if_fail (cURI != NULL); cd_message ("%s (%s, %s)", __func__, cURI, cName); - gchar *cBookmarkFilePath = g_strdup_printf ("%s/"GTK_BOOKMARKS_PATH, g_getenv ("HOME")); gchar *cContent = NULL; gsize length=0; GError *erreur = NULL; - g_file_get_contents (cBookmarkFilePath, &cContent, &length, &erreur); + g_file_get_contents (myData.cBookmarksURI, &cContent, &length, &erreur); if (erreur != NULL) { cd_warning ("while trying to read bookmarks file : %s", erreur->message); @@ -309,7 +304,7 @@ else { cContent = g_strjoinv ("\n", cBookmarksList); - g_file_set_contents (cBookmarkFilePath, cContent, -1, &erreur); + g_file_set_contents (myData.cBookmarksURI, cContent, -1, &erreur); if (erreur != NULL) { cd_warning ("while trying to write bookmarks file : %s", erreur->message); @@ -319,20 +314,17 @@ } g_strfreev (cBookmarksList); } - g_free (cBookmarkFilePath); } -void cd_shortcuts_add_one_bookmark (const gchar *cURI) +void cd_shortcuts_add_one_bookmark (const gchar *cURI, GldiModuleInstance *myApplet) { g_return_if_fail (cURI != NULL); cd_message ("%s (%s)", __func__, cURI); - gchar *cBookmarkFilePath = g_strdup_printf ("%s/"GTK_BOOKMARKS_PATH, g_getenv ("HOME")); - // see if we need to add a new line before the new URI. gchar *cContent = NULL; gsize length = 0; - g_file_get_contents (cBookmarkFilePath, + g_file_get_contents (myData.cBookmarksURI, &cContent, &length, NULL); @@ -340,7 +332,7 @@ g_free (cContent); // append the new URI to the file. - FILE *f = fopen (cBookmarkFilePath, "a"); + FILE *f = fopen (myData.cBookmarksURI, "a"); if (f != NULL) { gchar *cNewLine = g_strdup_printf ("%s%s\n", bAddNewLine ? "\n" : "", cURI); @@ -348,7 +340,6 @@ g_free (cNewLine); fclose (f); } - g_free (cBookmarkFilePath); } static Icon * _cd_shortcuts_get_icon (gchar *cFileName, const gchar *cUserName, double fCurrentOrder) diff -Nru cairo-dock-plug-ins-3.3.1/shortcuts/src/applet-bookmarks.h cairo-dock-plug-ins-3.3.2/shortcuts/src/applet-bookmarks.h --- cairo-dock-plug-ins-3.3.1/shortcuts/src/applet-bookmarks.h 2013-10-08 16:09:17.000000000 +0000 +++ cairo-dock-plug-ins-3.3.2/shortcuts/src/applet-bookmarks.h 2013-10-29 10:23:19.000000000 +0000 @@ -17,26 +17,22 @@ * along with this program. If not, see . */ - #ifndef __APPLET_BOOKMARKS__ #define __APPLET_BOOKMARKS__ #include -#if GTK_CHECK_VERSION (3, 6, 0) -#define GTK_BOOKMARKS_PATH ".config/gtk-3.0/bookmarks" -#else -#define GTK_BOOKMARKS_PATH ".gtk-bookmarks" -#endif +#define GTK_BOOKMARKS_PATH ".config/gtk-3.0/bookmarks" // from 3.6 +#define GTK_BOOKMARKS_PATH_OLD ".gtk-bookmarks" void cd_shortcuts_on_bookmarks_event (CairoDockFMEventType iEventType, const gchar *cURI, GldiModuleInstance *myApplet); -void cd_shortcuts_remove_one_bookmark (const gchar *cURI); +void cd_shortcuts_remove_one_bookmark (const gchar *cURI, GldiModuleInstance *myApplet); -void cd_shortcuts_rename_one_bookmark (const gchar *cURI, const gchar *cName); +void cd_shortcuts_rename_one_bookmark (const gchar *cURI, const gchar *cName, GldiModuleInstance *myApplet); -void cd_shortcuts_add_one_bookmark (const gchar *cURI); +void cd_shortcuts_add_one_bookmark (const gchar *cURI, GldiModuleInstance *myApplet); GList *cd_shortcuts_list_bookmarks (gchar *cBookmarkFilePath, GldiModuleInstance *myApplet); diff -Nru cairo-dock-plug-ins-3.3.1/shortcuts/src/applet-load-icons.c cairo-dock-plug-ins-3.3.2/shortcuts/src/applet-load-icons.c --- cairo-dock-plug-ins-3.3.1/shortcuts/src/applet-load-icons.c 2013-10-08 16:09:17.000000000 +0000 +++ cairo-dock-plug-ins-3.3.2/shortcuts/src/applet-load-icons.c 2013-10-29 10:23:19.000000000 +0000 @@ -213,11 +213,54 @@ if (pSharedMemory->bListBookmarks) { - gchar *cBookmarkFilePath = g_strdup_printf ("%s/"GTK_BOOKMARKS_PATH, g_getenv ("HOME")); - if (! g_file_test (cBookmarkFilePath, G_FILE_TEST_EXISTS)) // on le cree pour pouvoir ajouter des signets. + // guess the file we should use (from GTK 3.6, the new one should be used, but some system (like Mint-14) didn't switch on time and still use the old one...) + gchar *cBookmarkFilePath = NULL; + #if GTK_CHECK_VERSION (3, 6, 0) + gchar *cBookmarkFilePathNew = g_strdup_printf ("%s/"GTK_BOOKMARKS_PATH, g_getenv ("HOME")); + gchar *cBookmarkFilePathOld = g_strdup_printf ("%s/"GTK_BOOKMARKS_PATH_OLD, g_getenv ("HOME")); + if (! g_file_test (cBookmarkFilePathNew, G_FILE_TEST_EXISTS)) // the new file doesn't exist yet, it's either that the old one is used, or that none is used { + if (g_file_test (cBookmarkFilePathOld, G_FILE_TEST_EXISTS)) + { + cBookmarkFilePath = cBookmarkFilePathOld; + cBookmarkFilePathOld = NULL; + } + else // none are used, use the new one + { + cBookmarkFilePath = cBookmarkFilePathNew; + cBookmarkFilePathNew = NULL; + } + } + else // the new one exists -> take it, unless it's empty and the old one exists too (may happen if we created the new one when the old one was still used, in version 3.3.1) + { + if (cairo_dock_get_file_size (cBookmarkFilePathNew) == 0 && g_file_test (cBookmarkFilePathOld, G_FILE_TEST_EXISTS) && cairo_dock_get_file_size (cBookmarkFilePathOld) != 0) + { + cBookmarkFilePath = cBookmarkFilePathOld; + cBookmarkFilePathOld = NULL; + } + else // none are used, use the new one + { + cBookmarkFilePath = cBookmarkFilePathNew; + cBookmarkFilePathNew = NULL; + } + } + g_free (cBookmarkFilePathOld); + g_free (cBookmarkFilePathNew); + #else + cBookmarkFilePath = g_strdup_printf ("%s/"GTK_BOOKMARKS_PATH_OLD, g_getenv ("HOME")); + #endif + // we create this file if it doesn't exist in order to be able to add bookmarks later + if (! g_file_test (cBookmarkFilePath, G_FILE_TEST_EXISTS)) + { + // first, we need to be sure that its directory exists + char *str = strrchr (cBookmarkFilePath, '/'); // last occurrence of '/' + *str = '\0'; + g_mkdir_with_parents (cBookmarkFilePath, 7*8*8+7*8+5); + *str = '/'; + // create the empty file FILE *f = fopen (cBookmarkFilePath, "a"); - fclose (f); + if (f) + fclose (f); } GList *pIconList2 = cd_shortcuts_list_bookmarks (cBookmarkFilePath, pSharedMemory->pApplet); diff -Nru cairo-dock-plug-ins-3.3.1/shortcuts/src/applet-notifications.c cairo-dock-plug-ins-3.3.2/shortcuts/src/applet-notifications.c --- cairo-dock-plug-ins-3.3.1/shortcuts/src/applet-notifications.c 2013-10-03 11:04:33.000000000 +0000 +++ cairo-dock-plug-ins-3.3.2/shortcuts/src/applet-notifications.c 2013-10-29 10:23:19.000000000 +0000 @@ -164,9 +164,11 @@ CD_APPLET_ON_MIDDLE_CLICK_END -static void _cd_shortcuts_remove_bookmark (GtkMenuItem *menu_item, const gchar *cURI) +static void _cd_shortcuts_remove_bookmark (GtkMenuItem *menu_item, gpointer *data) { - cd_shortcuts_remove_one_bookmark (cURI); + GldiModuleInstance *myApplet = data[0]; + Icon *pIcon = data[1]; + cd_shortcuts_remove_one_bookmark (pIcon->cBaseURI, myApplet); } static void _on_got_bookmark_name (int iClickedButton, GtkWidget *pInteractiveWidget, gpointer *data, CairoDialog *pDialog) @@ -180,7 +182,7 @@ const gchar *cNewName = gtk_entry_get_text (GTK_ENTRY (pInteractiveWidget)); if (cNewName != NULL) { - cd_shortcuts_rename_one_bookmark (pIcon->cCommand, cNewName); + cd_shortcuts_rename_one_bookmark (pIcon->cCommand, cNewName, myApplet); } } CD_APPLET_LEAVE (); @@ -304,7 +306,7 @@ if (CD_APPLET_CLICKED_ICON->iGroup == (CairoDockIconGroup) CD_BOOKMARK_GROUP) // clic sur un signet. { CD_APPLET_ADD_IN_MENU_WITH_STOCK_AND_DATA (D_("Rename this bookmark"), NULL, _cd_shortcuts_rename_bookmark, CD_APPLET_MY_MENU, data); - CD_APPLET_ADD_IN_MENU_WITH_STOCK_AND_DATA (D_("Remove this bookmark"), GTK_STOCK_REMOVE, _cd_shortcuts_remove_bookmark, CD_APPLET_MY_MENU, CD_APPLET_CLICKED_ICON->cBaseURI); + CD_APPLET_ADD_IN_MENU_WITH_STOCK_AND_DATA (D_("Remove this bookmark"), GTK_STOCK_REMOVE, _cd_shortcuts_remove_bookmark, CD_APPLET_MY_MENU, data); CD_APPLET_LEAVE (GLDI_NOTIFICATION_INTERCEPT); } else if (CD_APPLET_CLICKED_ICON->iGroup == (CairoDockIconGroup) CD_DRIVE_GROUP && CD_APPLET_CLICKED_ICON->cBaseURI != NULL) // clic sur un volume. @@ -349,7 +351,7 @@ } else { - cd_shortcuts_add_one_bookmark (cURI); + cd_shortcuts_add_one_bookmark (cURI, myApplet); } } else diff -Nru cairo-dock-plug-ins-3.3.1/shortcuts/src/applet-struct.h cairo-dock-plug-ins-3.3.2/shortcuts/src/applet-struct.h --- cairo-dock-plug-ins-3.3.1/shortcuts/src/applet-struct.h 2013-10-03 11:04:33.000000000 +0000 +++ cairo-dock-plug-ins-3.3.2/shortcuts/src/applet-struct.h 2013-10-29 10:23:19.000000000 +0000 @@ -23,8 +23,6 @@ #include -#define SHORTCUTS_DEFAULT_NAME "_shortcuts_" - typedef enum { CD_SHOW_NOTHING=0, diff -Nru cairo-dock-plug-ins-3.3.1/weather/src/applet-notifications.c cairo-dock-plug-ins-3.3.2/weather/src/applet-notifications.c --- cairo-dock-plug-ins-3.3.1/weather/src/applet-notifications.c 2013-10-03 11:04:33.000000000 +0000 +++ cairo-dock-plug-ins-3.3.2/weather/src/applet-notifications.c 2013-10-29 10:23:19.000000000 +0000 @@ -41,12 +41,14 @@ static int _get_num_day_from_icon (GldiModuleInstance *myApplet, Icon *pIcon) { /// TODO: determiner le jour exact... - return (pIcon == myIcon ? 0 : pIcon->fOrder/2); // la 1ere icone est le plus souvent celle d'aujourd'hui, toutefois cela peut ne pas etre vrai, surtout la nuit autour du changement de jour. + return (pIcon == myIcon ? -1 : pIcon->fOrder/2); // la 1ere icone est le plus souvent celle d'aujourd'hui, toutefois cela peut ne pas etre vrai, surtout la nuit autour du changement de jour. } static inline void _go_to_site (GldiModuleInstance *myApplet, int iNumDay) { gchar *cURI; - if (iNumDay == 0) + if (iNumDay == -1) + cURI = g_strdup_printf ("http://www.weather.com/weather/hourbyhour/graph/%s", myConfig.cLocationCode); + else if (iNumDay == 0) cURI = g_strdup_printf ("http://www.weather.com/weather/today/%s", myConfig.cLocationCode); else if (iNumDay == 1) cURI = g_strdup_printf ("http://www.weather.com/weather/tomorrow/%s", myConfig.cLocationCode);