diff -Nru xfdesktop4-4.11.4/aclocal.m4 xfdesktop4-4.11.5/aclocal.m4 --- xfdesktop4-4.11.4/aclocal.m4 2014-03-18 16:41:46.000000000 +0000 +++ xfdesktop4-4.11.5/aclocal.m4 2014-03-31 17:31:39.000000000 +0000 @@ -11041,7 +11041,7 @@ AC_MSG_CHECKING([if $CC supports $flag]) saved_CFLAGS="$CFLAGS" CFLAGS="$CFLAGS $flag" - AC_COMPILE_IFELSE([AC_LANG_SOURCE([ ])], [flag_supported=yes], [flag_supported=no]) + AC_COMPILE_IFELSE([ ], [flag_supported=yes], [flag_supported=no]) CFLAGS="$saved_CFLAGS" AC_MSG_RESULT([$flag_supported]) @@ -11075,9 +11075,9 @@ -Wdeclaration-after-statement \ -Wmissing-declarations \ -Wmissing-noreturn -Wshadow -Wpointer-arith \ - -Wcast-align -Wformat -Wformat-security -Wformat-y2k \ + -Wcast-align -Wformat-security \ -Winit-self -Wmissing-include-dirs -Wundef \ - -Wnested-externs" + -Wmissing-format-attribute -Wnested-externs" CPPFLAGS="$CPPFLAGS" if test x`uname` = x"Linux"; then @@ -11092,7 +11092,7 @@ if test x"$enable_debug" = x"full"; then AC_DEFINE([DEBUG_TRACE], [1], [Define for tracing support]) xdt_cv_additional_CFLAGS="$xdt_cv_additional_CFLAGS -O0 -g -Werror" - CPPFLAGS="$CPPFLAGS -DG_ENABLE_DEBUG" + CPPFLAGS="$CPPFLAGS -DG_ENABLE_DEBUG -DGDK_DISABLE_DEPRECATED -DGTK_DISABLE_DEPRECATED -DG_DISABLE_DEPRECATED -DGSEAL_ENABLE" AC_MSG_RESULT([full]) else xdt_cv_additional_CFLAGS="$xdt_cv_additional_CFLAGS -g" @@ -11103,7 +11103,7 @@ ifelse([$CXX], , , [ dnl FIXME: should test on c++ compiler, but the following line causes - dnl autoconf errors for projects that don't check for a + dnl autoconf errors for projects that do nott check for a dnl c++ compiler at all. dnl AC_LANG_PUSH([C++]) dnl XDT_SUPPORTED_FLAGS([supported_CXXFLAGS], [$xdt_cv_additional_CFLAGS]) @@ -11145,7 +11145,7 @@ saved_CFLAGS="$CFLAGS" CFLAGS="$CFLAGS $xdt_vis_test_cflags" AC_MSG_CHECKING([whether $CC supports the GNUC visibility attribute]) - AC_COMPILE_IFELSE([AC_LANG_SOURCE( + AC_COMPILE_IFELSE(AC_LANG_SOURCE( [ void test_default (void); void test_hidden (void); @@ -11158,7 +11158,7 @@ test_hidden (); return 0; } - ])], + ]), [ have_gnuc_visibility=yes AC_MSG_RESULT([yes]) diff -Nru xfdesktop4-4.11.4/ChangeLog xfdesktop4-4.11.5/ChangeLog --- xfdesktop4-4.11.4/ChangeLog 2014-03-18 16:41:56.000000000 +0000 +++ xfdesktop4-4.11.5/ChangeLog 2014-03-31 17:31:44.000000000 +0000 @@ -1,3 +1,135 @@ +commit f3f876d5dd501dba794153341b8f7747037f9c32 +Author: Eric Koegel +Date: Sun Mar 30 20:27:57 2014 +0300 + + Filter out changed events for special icons (Bug 10755) + + Special file icons are the trash, home, and filesystem icons. The + only events that would require a refesh would be an add/delete + event for the trash can. This patch filters out all the change, + attribute change, and changes done hints to prevent the icons + from being reloaded due to those events. + +commit d48b40f6623a758ff128f5b22b2bd3e581b5b2a3 +Author: Eric Koegel +Date: Sun Mar 30 19:12:05 2014 +0300 + + Use GIO directly for delete/trash operations (Bug 10778) + + Instead of passing the list of files over to Thunar via D-Bus to + trash or delete files, just use the async GIO functions directly. + We'll continue to use Thunar for the other operations because of + the file transfer dialog. + +commit 6c8f56c4ec06c8bc333d3d17bdd91eb7dd5a8dff +Author: Eric Koegel +Date: Sun Mar 30 10:37:21 2014 +0300 + + G_CONST_RETURN has been deprecated + +commit cdbba947379540fa2c89fda34b96bf336070fe47 +Author: Eric Koegel +Date: Thu Mar 27 18:50:21 2014 +0300 + + Reset the icon_view style on style change (Bug 10605) + + Since xfdesktop now properly responds to xfsettingsd changes we + need to handle the race condition at launch. This patch changes + it so that the style change for the icon view happens in a low + priority callback. This ensures that the style gets reset only + once if there's a batch of changes to process and will happen + after xfdesktop has loaded. This is different from the previous + callback patch in that the entire icon view doesn't get recreated. + +commit 7df7e74c7c3aba98948fd7376c569325d2653587 +Author: Piotr Sokół +Date: Thu Mar 27 12:32:51 2014 +0100 + + I18n: Update translation pl (100%). + + 216 translated messages. + + Transifex (https://www.transifex.com/projects/p/xfce/). + +commit 565ccdfd80f0b4c6e6c67314224bb5c8128177c2 +Author: Eric Koegel +Date: Wed Mar 26 08:10:21 2014 +0300 + + Fix for images not appearing in settings app (Bug 10685) + + We need to add images to the list in the main thread and not our + worker thread. Otherwise images won't always display right away, + espeically when the system is under a high load. + +commit 5203d9aa93e40dbddc81895fa60c8d1c99dd95f3 +Author: Eric Koegel +Date: Tue Mar 25 20:50:34 2014 +0300 + + Additional default icon size setting + +commit 7975bd4457f8f0422712100b02ac9717836d1f17 +Author: Eric Koegel +Date: Mon Mar 24 12:07:46 2014 +0300 + + Disconnect the directory signal handler + + When changing folders ensure we disconnect the old directory + monitor signal handler and always release the directory monitor. + Additionally, this patch removes a clip call in the icon view + as it's not required at all. + +commit 0e3ee6895c26edbfdbe8c8f78e92a9acf9c8483d +Author: Rafael Ferreira +Date: Mon Mar 24 18:33:22 2014 +0100 + + I18n: Update translation pt_BR (100%). + + 216 translated messages. + + Transifex (https://www.transifex.com/projects/p/xfce/). + +commit ffcabdf94438d8022188c004f4197ee6f27226df +Author: Alois Nešpor +Date: Mon Mar 24 00:32:21 2014 +0100 + + I18n: Update translation cs (100%). + + 216 translated messages. + + Transifex (https://www.transifex.com/projects/p/xfce/). + +commit 0f6ade7872cde03c69e679b2505e1d86d9e944bb +Author: PavelNicklasson +Date: Sat Mar 22 12:32:48 2014 +0100 + + I18n: Update translation sv (100%). + + 216 translated messages. + + Transifex (https://www.transifex.com/projects/p/xfce/). + +commit db188b2ab53055dec4225b81647f5d7f1c4566dd +Author: Ivica Kolić +Date: Thu Mar 20 12:32:12 2014 +0100 + + I18n: Update translation hr (100%). + + 216 translated messages. + + Transifex (https://www.transifex.com/projects/p/xfce/). + +commit 49bc6563f7f61e74be2b87109e60d29f9a4a9372 +Author: Eric Koegel +Date: Tue Mar 18 19:53:15 2014 +0300 + + Post release tag bump. + +commit c38ccd5f183966799444b63117d21a87ab39b63a +Author: Eric Koegel +Date: Tue Mar 18 19:43:37 2014 +0300 + + Updates for release. + commit 46bf9f74cb3099c5f233f9e773e8a8bf937837ef Author: pkon Date: Tue Mar 18 00:32:01 2014 +0100 diff -Nru xfdesktop4-4.11.4/configure xfdesktop4-4.11.5/configure --- xfdesktop4-4.11.4/configure 2014-03-18 16:41:47.000000000 +0000 +++ xfdesktop4-4.11.5/configure 2014-03-31 17:31:40.000000000 +0000 @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.69 for xfdesktop 4.11.4. +# Generated by GNU Autoconf 2.69 for xfdesktop 4.11.5. # # Report bugs to . # @@ -590,8 +590,8 @@ # Identity of this package. PACKAGE_NAME='xfdesktop' PACKAGE_TARNAME='xfdesktop' -PACKAGE_VERSION='4.11.4' -PACKAGE_STRING='xfdesktop 4.11.4' +PACKAGE_VERSION='4.11.5' +PACKAGE_STRING='xfdesktop 4.11.5' PACKAGE_BUGREPORT='http://bugzilla.xfce.org/' PACKAGE_URL='' @@ -1468,7 +1468,7 @@ # Omit some internal or obsolete options to make the list less imposing. # This message is too long to be a string in the A/UX 3.1 sh. cat <<_ACEOF -\`configure' configures xfdesktop 4.11.4 to adapt to many kinds of systems. +\`configure' configures xfdesktop 4.11.5 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1542,7 +1542,7 @@ if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of xfdesktop 4.11.4:";; + short | recursive ) echo "Configuration of xfdesktop 4.11.5:";; esac cat <<\_ACEOF @@ -1688,7 +1688,7 @@ test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -xfdesktop configure 4.11.4 +xfdesktop configure 4.11.5 generated by GNU Autoconf 2.69 Copyright (C) 2012 Free Software Foundation, Inc. @@ -2057,7 +2057,7 @@ This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by xfdesktop $as_me 4.11.4, which was +It was created by xfdesktop $as_me 4.11.5, which was generated by GNU Autoconf 2.69. Invocation command line was $ $0 $@ @@ -2922,7 +2922,7 @@ # Define the identity of the package. PACKAGE='xfdesktop' - VERSION='4.11.4' + VERSION='4.11.5' cat >>confdefs.h <<_ACEOF @@ -18228,9 +18228,9 @@ -Wdeclaration-after-statement \ -Wmissing-declarations \ -Wmissing-noreturn -Wshadow -Wpointer-arith \ - -Wcast-align -Wformat -Wformat-security -Wformat-y2k \ + -Wcast-align -Wformat-security \ -Winit-self -Wmissing-include-dirs -Wundef \ - -Wnested-externs" + -Wmissing-format-attribute -Wnested-externs" CPPFLAGS="$CPPFLAGS" if test x`uname` = x"Linux"; then @@ -18246,7 +18246,7 @@ $as_echo "#define DEBUG_TRACE 1" >>confdefs.h xdt_cv_additional_CFLAGS="$xdt_cv_additional_CFLAGS -O0 -g -Werror" - CPPFLAGS="$CPPFLAGS -DG_ENABLE_DEBUG" + CPPFLAGS="$CPPFLAGS -DG_ENABLE_DEBUG -DGDK_DISABLE_DEPRECATED -DGTK_DISABLE_DEPRECATED -DG_DISABLE_DEPRECATED -DGSEAL_ENABLE" { $as_echo "$as_me:${as_lineno-$LINENO}: result: full" >&5 $as_echo "full" >&6; } else @@ -18873,7 +18873,7 @@ # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by xfdesktop $as_me 4.11.4, which was +This file was extended by xfdesktop $as_me 4.11.5, which was generated by GNU Autoconf 2.69. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -18939,7 +18939,7 @@ cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`" ac_cs_version="\\ -xfdesktop config.status 4.11.4 +xfdesktop config.status 4.11.5 configured by $0, generated by GNU Autoconf 2.69, with options \\"\$ac_cs_config\\" diff -Nru xfdesktop4-4.11.4/configure.ac xfdesktop4-4.11.5/configure.ac --- xfdesktop4-4.11.4/configure.ac 2014-03-18 16:41:44.000000000 +0000 +++ xfdesktop4-4.11.5/configure.ac 2014-03-31 17:31:38.000000000 +0000 @@ -11,9 +11,9 @@ dnl version info m4_define([xfdesktop_version_major], [4]) m4_define([xfdesktop_version_minor], [11]) -m4_define([xfdesktop_version_micro], [4]) +m4_define([xfdesktop_version_micro], [5]) m4_define([xfdesktop_version_nano], []) -m4_define([xfdesktop_version_build], [46bf9f7]) +m4_define([xfdesktop_version_build], [f3f876d]) m4_define([xfdesktop_version_tag],[]) m4_define([xfdesktop_version], [xfdesktop_version_major().xfdesktop_version_minor().xfdesktop_version_micro()ifelse(xfdesktop_version_nano(), [], [], [.xfdesktop_version_nano()])ifelse(xfdesktop_version_tag(), [git], [xfdesktop_version_tag()-xfdesktop_version_build()], [xfdesktop_version_tag()])]) diff -Nru xfdesktop4-4.11.4/debian/changelog xfdesktop4-4.11.5/debian/changelog --- xfdesktop4-4.11.4/debian/changelog 2014-03-31 13:16:00.000000000 +0000 +++ xfdesktop4-4.11.5/debian/changelog 2014-04-02 08:45:06.000000000 +0000 @@ -1,3 +1,10 @@ +xfdesktop4 (4.11.5-0ubuntu1) trusty; urgency=medium + + * New upstream release. LP: #1294209 + * Drop patches taken from git, fixed upstream. + + -- Jackson Doak Wed, 02 Apr 2014 06:58:37 +1100 + xfdesktop4 (4.11.4-1ubuntu2) trusty; urgency=medium * Add patches from upstream git: diff -Nru xfdesktop4-4.11.4/debian/patches/git-desktop-icons-have-background.patch xfdesktop4-4.11.5/debian/patches/git-desktop-icons-have-background.patch --- xfdesktop4-4.11.4/debian/patches/git-desktop-icons-have-background.patch 2014-03-31 13:16:00.000000000 +0000 +++ xfdesktop4-4.11.5/debian/patches/git-desktop-icons-have-background.patch 1970-01-01 00:00:00.000000000 +0000 @@ -1,104 +0,0 @@ -Origin: upstream -Author: Eric Koegel -Description: Reset the icon_view style on style change - Since xfdesktop now properly responds to xfsettingsd changes we - need to handle the race condition at launch. This patch changes - it so that the style change for the icon view happens in a low - priority callback. This ensures that the style gets reset only - once if there's a batch of changes to process and will happen - after xfdesktop has loaded. This is different from the previous - callback patch in that the entire icon view doesn't get recreated. -Bug: https://bugzilla.xfce.org/show_bug.cgi?id=10605 -Bug-Ubuntu: https://launchpad.net/bugs/1270261 -Applied-Upstream: commit:cdbba947379540fa2c89fda34b96bf336070fe47 - ---- - src/xfce-desktop.c | 38 ++++++++++++++++++++++++++++++++------ - 1 file changed, 32 insertions(+), 6 deletions(-) - ---- a/src/xfce-desktop.c -+++ b/src/xfce-desktop.c -@@ -115,6 +115,7 @@ struct _XfceDesktopPriv - gboolean icons_font_size_set; - guint icons_font_size; - guint icons_size; -+ gint style_refresh_timer; - GtkWidget *icon_view; - gdouble system_font_size; - #endif -@@ -994,6 +995,9 @@ xfce_desktop_finalize(GObject *object) - g_object_unref(G_OBJECT(desktop->priv->channel)); - g_free(desktop->priv->property_prefix); - -+ if(desktop->priv->style_refresh_timer != 0) -+ g_source_remove(desktop->priv->style_refresh_timer); -+ - G_OBJECT_CLASS(xfce_desktop_parent_class)->finalize(object); - } - -@@ -1351,8 +1355,8 @@ xfce_desktop_delete_event(GtkWidget *w, - return TRUE; - } - --static void --xfce_desktop_style_set(GtkWidget *w, GtkStyle *old_style) -+static gboolean -+style_refresh_cb(gpointer *w) - { - XfceDesktop *desktop = XFCE_DESKTOP(w); - #ifdef ENABLE_DESKTOP_ICONS -@@ -1361,13 +1365,15 @@ xfce_desktop_style_set(GtkWidget *w, Gtk - - TRACE("entering"); - -- g_return_if_fail(XFCE_IS_DESKTOP(desktop)); -+ desktop->priv->style_refresh_timer = 0; -+ -+ g_return_val_if_fail(XFCE_IS_DESKTOP(desktop), FALSE); - - if(!gtk_widget_get_realized(GTK_WIDGET(desktop))) -- return; -+ return FALSE; - - if(desktop->priv->workspaces == NULL) -- return; -+ return FALSE; - - if(GDK_IS_WINDOW(desktop->priv->bg_pixmap)) - gdk_window_set_back_pixmap(gtk_widget_get_window(GTK_WIDGET(desktop)), desktop->priv->bg_pixmap, FALSE); -@@ -1376,7 +1382,7 @@ xfce_desktop_style_set(GtkWidget *w, Gtk - - #ifdef ENABLE_DESKTOP_ICONS - if(!desktop->priv->icon_view || !XFDESKTOP_IS_ICON_VIEW(desktop->priv->icon_view)) -- return; -+ return FALSE; - - /* reset the icon view style */ - gtk_widget_set_style(desktop->priv->icon_view, NULL); -@@ -1390,6 +1396,26 @@ xfce_desktop_style_set(GtkWidget *w, Gtk - desktop->priv->system_font_size); - } - #endif -+ -+ return FALSE; -+} -+ -+static void -+xfce_desktop_style_set(GtkWidget *w, GtkStyle *old_style) -+{ -+ XfceDesktop *desktop = XFCE_DESKTOP(w); -+ -+ TRACE("entering"); -+ -+ if(desktop->priv->style_refresh_timer != 0) -+ g_source_remove(desktop->priv->style_refresh_timer); -+ -+ desktop->priv->style_refresh_timer = g_idle_add_full(G_PRIORITY_LOW, -+ (GSourceFunc)style_refresh_cb, -+ w, -+ NULL); -+ -+ GTK_WIDGET_CLASS(xfce_desktop_parent_class)->style_set(w, old_style); - } - - static void diff -Nru xfdesktop4-4.11.4/debian/patches/git-fix-default-icon-size.patch xfdesktop4-4.11.5/debian/patches/git-fix-default-icon-size.patch --- xfdesktop4-4.11.4/debian/patches/git-fix-default-icon-size.patch 2014-03-31 13:16:00.000000000 +0000 +++ xfdesktop4-4.11.5/debian/patches/git-fix-default-icon-size.patch 1970-01-01 00:00:00.000000000 +0000 @@ -1,22 +0,0 @@ -Origin: upstream -Author: Eric Koegel -Description: Explicitly define the desktop icon size -Bug: https://bugzilla.xfce.org/show_bug.cgi?id=9199 -Bug-Ubuntu: https://launchpad.net/bugs/1272057 -Applied-Upstream: commit:5203d9aa93e40dbddc81895fa60c8d1c99dd95f3 - ---- - src/xfce-desktop.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - ---- a/src/xfce-desktop.c -+++ b/src/xfce-desktop.c -@@ -936,7 +936,7 @@ xfce_desktop_class_init(XfceDesktopClass - g_param_spec_uint("icon-size", - "icon size", - "icon size", -- 8, 192, 36, -+ 8, 192, DEFAULT_ICON_SIZE, - XFDESKTOP_PARAM_FLAGS)); - - g_object_class_install_property(gobject_class, PROP_ICON_FONT_SIZE, diff -Nru xfdesktop4-4.11.4/debian/patches/git-missing-images-in-settings-app.patch xfdesktop4-4.11.5/debian/patches/git-missing-images-in-settings-app.patch --- xfdesktop4-4.11.4/debian/patches/git-missing-images-in-settings-app.patch 2014-03-31 13:16:00.000000000 +0000 +++ xfdesktop4-4.11.5/debian/patches/git-missing-images-in-settings-app.patch 1970-01-01 00:00:00.000000000 +0000 @@ -1,125 +0,0 @@ -Origin: upstream -Author: Eric Koegel -Description: Fix for images not appearing in settings app - We need to add images to the list in the main thread and not our - worker thread. Otherwise images won't always display right away, - espeically when the system is under a high load. -Bug: https://bugzilla.xfce.org/show_bug.cgi?id=10695 -Bug-Ubuntu: https://launchpad.net/bugs/1282227 -Applied-Upstream: commit:565ccdfd80f0b4c6e6c67314224bb5c8128177c2 - ---- - settings/main.c | 65 ++++++++++++++++++++++++++++++++++++++++---------------- - 1 file changed, 47 insertions(+), 18 deletions(-) - ---- a/settings/main.c -+++ b/settings/main.c -@@ -87,6 +87,7 @@ typedef struct - { - GtkTreeModel *model; - GtkTreeIter *iter; -+ GdkPixbuf *pix; - } PreviewData; - - typedef struct -@@ -169,13 +170,50 @@ static gchar *xfdesktop_settings_generat - const gchar* property); - static gchar *xfdesktop_settings_get_backdrop_image(AppearancePanel *panel); - -+ -+ -+static void -+xfdesktop_settings_free_pdata(gpointer data) -+{ -+ PreviewData *pdata = data; -+ -+ g_object_unref(pdata->model); -+ -+ gtk_tree_iter_free(pdata->iter); -+ -+ if(pdata->pix) -+ g_object_unref(pdata->pix); -+ -+ g_free(pdata); -+} -+ -+static gboolean -+list_store_set(PreviewData *pdata) -+{ -+ g_return_val_if_fail(pdata, FALSE); -+ -+ gtk_list_store_set(GTK_LIST_STORE(pdata->model), pdata->iter, -+ COL_PIX, pdata->pix, -+ -1); -+ -+ xfdesktop_settings_free_pdata(pdata); -+ -+ return FALSE; -+} -+ - static void --xfdesktop_settings_do_single_preview(GtkTreeModel *model, -- GtkTreeIter *iter) -+xfdesktop_settings_do_single_preview(PreviewData *pdata) - { -+ GtkTreeModel *model; -+ GtkTreeIter *iter; - gchar *filename = NULL, *thumbnail = NULL; - GdkPixbuf *pix; - -+ g_return_if_fail(pdata); -+ -+ model = pdata->model; -+ iter = pdata->iter; -+ - gtk_tree_model_get(model, iter, - COL_FILENAME, &filename, - COL_THUMBNAIL, &thumbnail, -@@ -197,23 +235,15 @@ xfdesktop_settings_do_single_preview(Gtk - g_free(filename); - - if(pix) { -- gtk_list_store_set(GTK_LIST_STORE(model), iter, -- COL_PIX, pix, -- -1); -+ pdata->pix = pix; - -- g_object_unref(G_OBJECT(pix)); -+ /* We must add the images to the list in the main thread */ -+ g_main_context_invoke(NULL, (GSourceFunc)list_store_set, pdata); -+ } else { -+ xfdesktop_settings_free_pdata(pdata); - } - } - --static void --xfdesktop_settings_free_pdata(gpointer data) --{ -- PreviewData *pdata = data; -- g_object_unref(G_OBJECT(pdata->model)); -- gtk_tree_iter_free(pdata->iter); -- g_free(pdata); --} -- - static gpointer - xfdesktop_settings_create_previews(gpointer data) - { -@@ -225,9 +255,7 @@ xfdesktop_settings_create_previews(gpoin - /* Block and wait for another preview to create */ - pdata = g_async_queue_pop(panel->preview_queue); - -- xfdesktop_settings_do_single_preview(pdata->model, pdata->iter); -- -- xfdesktop_settings_free_pdata(pdata); -+ xfdesktop_settings_do_single_preview(pdata); - } - - return NULL; -@@ -293,6 +321,7 @@ cb_thumbnail_ready(XfdesktopThumbnailer - pdata = g_new0(PreviewData, 1); - pdata->model = g_object_ref(G_OBJECT(model)); - pdata->iter = gtk_tree_iter_copy(&iter); -+ pdata->pix = NULL; - - /* Create the preview image */ - xfdesktop_settings_add_file_to_queue(panel, pdata); diff -Nru xfdesktop4-4.11.4/debian/patches/series xfdesktop4-4.11.5/debian/patches/series --- xfdesktop4-4.11.4/debian/patches/series 2014-03-31 13:16:00.000000000 +0000 +++ xfdesktop4-4.11.5/debian/patches/series 2014-04-02 08:45:06.000000000 +0000 @@ -1,5 +1,2 @@ xubuntu_set-accountsservice-user-bg.patch xubuntu_improve-nautilus-interactions.patch -git-desktop-icons-have-background.patch -git-missing-images-in-settings-app.patch -git-fix-default-icon-size.patch diff -Nru xfdesktop4-4.11.4/debian/patches/xubuntu_improve-nautilus-interactions.patch xfdesktop4-4.11.5/debian/patches/xubuntu_improve-nautilus-interactions.patch --- xfdesktop4-4.11.4/debian/patches/xubuntu_improve-nautilus-interactions.patch 2014-03-31 13:16:00.000000000 +0000 +++ xfdesktop4-4.11.5/debian/patches/xubuntu_improve-nautilus-interactions.patch 2014-04-02 08:45:06.000000000 +0000 @@ -17,7 +17,7 @@ --- a/src/xfce-desktop.c +++ b/src/xfce-desktop.c -@@ -811,8 +811,8 @@ screen_set_selection(XfceDesktop *deskto +@@ -812,8 +812,8 @@ screen_set_selection(XfceDesktop *deskto { Window xwin; gint xscreen; @@ -28,7 +28,7 @@ xwin = GDK_WINDOW_XID(gtk_widget_get_window(GTK_WIDGET(desktop))); xscreen = gdk_screen_get_number(desktop->priv->gscreen); -@@ -821,6 +821,9 @@ screen_set_selection(XfceDesktop *deskto +@@ -822,6 +822,9 @@ screen_set_selection(XfceDesktop *deskto selection_atom = XInternAtom(gdk_x11_get_default_xdisplay(), selection_name, False); manager_atom = XInternAtom(gdk_x11_get_default_xdisplay(), "MANAGER", False); @@ -38,7 +38,7 @@ /* the previous check in src/main.c occurs too early, so workaround by * adding this one. */ if(XGetSelectionOwner(gdk_x11_get_default_xdisplay(), selection_atom) != None) { -@@ -828,8 +831,16 @@ screen_set_selection(XfceDesktop *deskto +@@ -829,8 +832,16 @@ screen_set_selection(XfceDesktop *deskto exit(0); } diff -Nru xfdesktop4-4.11.4/debian/patches/xubuntu_set-accountsservice-user-bg.patch xfdesktop4-4.11.5/debian/patches/xubuntu_set-accountsservice-user-bg.patch --- xfdesktop4-4.11.4/debian/patches/xubuntu_set-accountsservice-user-bg.patch 2014-03-31 13:16:00.000000000 +0000 +++ xfdesktop4-4.11.5/debian/patches/xubuntu_set-accountsservice-user-bg.patch 2014-04-02 08:45:06.000000000 +0000 @@ -17,7 +17,7 @@ #ifdef ENABLE_DESKTOP_ICONS #include "xfdesktop-icon-view.h" -@@ -351,6 +352,88 @@ create_bg_pixmap(GdkScreen *gscreen, gpo +@@ -352,6 +353,88 @@ create_bg_pixmap(GdkScreen *gscreen, gpo } static void @@ -106,7 +106,7 @@ backdrop_changed_cb(XfceBackdrop *backdrop, gpointer user_data) { XfceDesktop *desktop = XFCE_DESKTOP(user_data); -@@ -386,6 +469,10 @@ backdrop_changed_cb(XfceBackdrop *backdr +@@ -387,6 +470,10 @@ backdrop_changed_cb(XfceBackdrop *backdr } if(monitor == -1) return; diff -Nru xfdesktop4-4.11.4/NEWS xfdesktop4-4.11.5/NEWS --- xfdesktop4-4.11.4/NEWS 2014-03-18 16:41:10.000000000 +0000 +++ xfdesktop4-4.11.5/NEWS 2014-03-31 17:30:07.000000000 +0000 @@ -1,3 +1,22 @@ +4.11.5 +====== +[Please note that this is a development release.] + +Seventh development release of xfdesktop targeting for Xfce 4.12. +Please report all problems at bugzilla.xfce.org. + +* Miscellaneous bug fixes: + - Disconnect the directory signal handler when changing folders. + - Correct an additional default icon size setting. + - Fix for images not appearing in settings app (Bug 10685) + - Reset the icon_view style on style change (Bug 10605) + - Filter out changed events for special icons (Bug 10755) + - Use GIO directly for delete/trash operations (Bug 10778) + - G_CONST_RETURN has been deprecated + +* Translation updates: Czech (cs), Croatian (hr), Polish (pl), + Portuguese (Brazilian) (pt_BR), Swedish (sv) + 4.11.4 ====== [Please note that this is a development release.] diff -Nru xfdesktop4-4.11.4/po/cs.po xfdesktop4-4.11.5/po/cs.po --- xfdesktop4-4.11.4/po/cs.po 2014-01-25 05:47:57.000000000 +0000 +++ xfdesktop4-4.11.5/po/cs.po 2014-03-25 17:51:09.000000000 +0000 @@ -5,6 +5,7 @@ # Translators: # Alois Nespor , 2004 # Alois Nešpor , 2013 +# Alois Nešpor , 2014 # Libor Schejbal , 2013 # Lukáš Konarovský , 2003 # Michal Várady , 2014 @@ -12,9 +13,9 @@ msgstr "" "Project-Id-Version: Xfdesktop\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2013-12-15 00:31+0100\n" -"PO-Revision-Date: 2014-01-18 23:28+0000\n" -"Last-Translator: Michal Várady \n" +"POT-Creation-Date: 2014-02-24 12:32+0100\n" +"PO-Revision-Date: 2014-03-23 20:09+0000\n" +"Last-Translator: Alois Nešpor \n" "Language-Team: Czech (http://www.transifex.com/projects/p/xfce/language/cs/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -22,37 +23,37 @@ "Language: cs\n" "Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n" -#: ../settings/main.c:372 ../src/xfdesktop-special-file-icon.c:295 +#: ../settings/main.c:375 ../src/xfdesktop-special-file-icon.c:295 #: ../src/xfdesktop-special-file-icon.c:479 msgid "Home" msgstr "Domovská složka" -#: ../settings/main.c:374 +#: ../settings/main.c:377 msgid "Filesystem" msgstr "Systém souborů" -#: ../settings/main.c:376 +#: ../settings/main.c:379 msgid "Trash" msgstr "Koš" -#: ../settings/main.c:378 +#: ../settings/main.c:381 msgid "Removable Devices" msgstr "Vyměnitelné jednotky" -#: ../settings/main.c:380 +#: ../settings/main.c:383 msgid "Network Shares" msgstr "Sdílení sítě" -#: ../settings/main.c:382 +#: ../settings/main.c:385 msgid "Disks and Drives" msgstr "Disk a ovladače" -#: ../settings/main.c:384 -msgid "Other Items" -msgstr "Ostatní položky" +#: ../settings/main.c:387 +msgid "Other Devices" +msgstr "Jiná zařízení" #. Display the file name, file type, and file size in the tooltip. -#: ../settings/main.c:497 +#: ../settings/main.c:500 #, c-format msgid "" "%s\n" @@ -60,97 +61,95 @@ "Size: %s" msgstr "%s⏎\nTyp: %s⏎\nVelikost: %s" -#: ../settings/main.c:681 +#: ../settings/main.c:686 #, c-format msgid "Wallpaper for Monitor %d (%s)" msgstr "Tapeta pro monitor %d (%s)" -#: ../settings/main.c:684 +#: ../settings/main.c:689 #, c-format msgid "Wallpaper for Monitor %d" msgstr "Tapeta pro monitor %d" -#: ../settings/main.c:690 -msgid "" -"You are using more than one display, move this dialog to the display you " -"want to edit the settings for." -msgstr "Používáte více než jeden displej, přesuňte dialogové okno na displej, jehož nastavení chcete změnit." +#: ../settings/main.c:695 +msgid "Move this dialog to the display you want to edit the settings for." +msgstr "Přesuňte toto dialogové okno na displej, jehož nastavení chcete měnit." -#: ../settings/main.c:698 +#: ../settings/main.c:702 #, c-format msgid "Wallpaper for %s on Monitor %d (%s)" msgstr "Tapeta pro %s na monitoru %d (%s)" -#: ../settings/main.c:702 +#: ../settings/main.c:706 #, c-format msgid "Wallpaper for %s on Monitor %d" msgstr "Tapeta pro %s na monitoru %d" -#: ../settings/main.c:709 +#: ../settings/main.c:713 msgid "" -"You are using more than one display, move this dialog to the display and " -"workspace you want to edit the settings for." -msgstr "Používáte více než jeden displej, přesuňte dialogové okno na displej a pracovní prostor, jejichž nastavení chcete změnit." +"Move this dialog to the display and workspace you want to edit the settings " +"for." +msgstr "Přesuňte toto dialogové okno na displej a pracovní plochu, jehož nastavení chcete měnit." #. Single monitor and single workspace -#: ../settings/main.c:717 +#: ../settings/main.c:720 #, c-format msgid "Wallpaper for my desktop" msgstr "Tapeta pro můj desktop" #. Single monitor and per workspace wallpaper -#: ../settings/main.c:723 +#: ../settings/main.c:726 #, c-format msgid "Wallpaper for %s" msgstr "Tapeta pro %s" -#: ../settings/main.c:728 +#: ../settings/main.c:731 msgid "Move this dialog to the workspace you want to edit the settings for." msgstr "Přesuňte toto dialogové okno na pracovní prostor, jehož nastavení chcete měnit." -#: ../settings/main.c:1131 +#: ../settings/main.c:1134 msgid "Image selection is unavailable while the image style is set to None." msgstr "Výběr obrazu není k dispozici, pokud je styl obrazu nastaven na hodnotu Žádný." -#: ../settings/main.c:1483 +#: ../settings/main.c:1481 msgid "Spanning screens" msgstr "Rozložení přes obrazovky" -#: ../settings/main.c:1788 +#: ../settings/main.c:1786 msgid "Image files" msgstr "Soubory s obrázky" -#: ../settings/main.c:1945 +#: ../settings/main.c:1958 msgid "Settings manager socket" msgstr "Soket správce nastavení" -#: ../settings/main.c:1945 +#: ../settings/main.c:1958 msgid "SOCKET ID" msgstr "SOCKET ID" -#: ../settings/main.c:1946 +#: ../settings/main.c:1959 msgid "Version information" msgstr "Informace o verzi" -#: ../settings/main.c:1973 +#: ../settings/main.c:1986 #, c-format msgid "Type '%s --help' for usage." msgstr "Informace o použití získáte příkazem '%s --help'." -#: ../settings/main.c:1985 +#: ../settings/main.c:1998 msgid "The Xfce development team. All rights reserved." msgstr "Tým vývojářů Xfce. Všechna práva vyhrazena." -#: ../settings/main.c:1986 +#: ../settings/main.c:1999 #, c-format msgid "Please report bugs to <%s>." msgstr "Prosíme, abyste chyby hlásili na <%s>." -#: ../settings/main.c:1993 +#: ../settings/main.c:2006 msgid "Desktop Settings" msgstr "Nastavení plochy" -#: ../settings/main.c:1995 +#: ../settings/main.c:2008 msgid "Unable to contact settings server" msgstr "Spojení se serverem nastavení nelze navázat" @@ -183,16 +182,16 @@ msgstr "_Soubor:" #: ../settings/xfdesktop-settings-appearance-frame-ui.glade.h:6 -msgid "Choose the folder to select wallpapers from" -msgstr "Vyberte složku, ze které chcete vybrat tapety" +msgid "Choose the folder to select wallpapers from." +msgstr "Vyberte složku, ze které chcete vybrat tapety." #: ../settings/xfdesktop-settings-appearance-frame-ui.glade.h:7 msgid "St_yle:" msgstr "St_yl:" #: ../settings/xfdesktop-settings-appearance-frame-ui.glade.h:8 -msgid "Specify how the image will be resized to fit the screen" -msgstr "Zadejte způsob přizpůsobení obrázku velikosti obrazovky" +msgid "Specify how the image will be resized to fit the screen." +msgstr "Vyberte způsob, jak má být obrázek přizpůsobený velikosti obrazovky." #: ../settings/xfdesktop-settings-appearance-frame-ui.glade.h:9 #: ../settings/xfdesktop-settings-ui.glade.h:4 @@ -228,11 +227,11 @@ msgstr "B_arva:" #: ../settings/xfdesktop-settings-appearance-frame-ui.glade.h:17 -msgid "Specify the style of the color drawn behind the backdrop image" -msgstr "Zadejte styl barvy vykreslené pod obrázkem pozadí" +msgid "Specify the style of the color drawn behind the backdrop image." +msgstr "Zadejte styl barvy vykreslené pod obrázkem pozadí." #: ../settings/xfdesktop-settings-appearance-frame-ui.glade.h:18 -msgid "Specifies the solid color, or the \"left\" or \"top\" color of the gradient" +msgid "Specifies the solid color, or the \"left\" or \"top\" color of the gradient." msgstr "Určuje jednotnou barvu nebo \"levou\" nebo \"horní\" barvu barevného přechodu" #: ../settings/xfdesktop-settings-appearance-frame-ui.glade.h:19 @@ -240,8 +239,8 @@ msgstr "Vyberte _první barvu:" #: ../settings/xfdesktop-settings-appearance-frame-ui.glade.h:20 -msgid "Specifies the \"right\" or \"bottom\" color of the gradient" -msgstr "Určuje \"pravou\" nebo \"spodní\" barvu barevného přechodu" +msgid "Specifies the \"right\" or \"bottom\" color of the gradient." +msgstr "Určuje \"pravou\" nebo \"spodní\" barvu barevného přechodu." #: ../settings/xfdesktop-settings-appearance-frame-ui.glade.h:21 msgid "Select Second Color" @@ -261,8 +260,8 @@ msgstr "Automaticky vybrat jiné pozadí z aktuálního adresáře." #: ../settings/xfdesktop-settings-appearance-frame-ui.glade.h:25 -msgid "Specify how often the background will change" -msgstr "Určete, jak často se má měnit pozadí" +msgid "Specify how often the background will change." +msgstr "Určete, jak často se má pozadí měnit." #: ../settings/xfdesktop-settings-appearance-frame-ui.glade.h:26 msgid "in seconds:" @@ -338,7 +337,7 @@ msgid "File/launcher icons" msgstr "Ikony souborů a spouštěčů" -#: ../settings/xfdesktop-settings-ui.glade.h:10 ../src/xfce-desktop.c:1010 +#: ../settings/xfdesktop-settings-ui.glade.h:10 ../src/xfce-desktop.c:1015 msgid "Desktop" msgstr "Plocha" @@ -517,250 +516,249 @@ msgid "_Remove Workspace '%s'" msgstr "_Odebrat pracovní plochu '%s'" -#: ../src/xfdesktop-application.c:772 +#: ../src/xfdesktop-application.c:768 msgid "Display version information" msgstr "Zobrazit informace o verzi" -#: ../src/xfdesktop-application.c:773 +#: ../src/xfdesktop-application.c:769 msgid "Reload all settings" msgstr "Znovu načíst všechna nastavení" -#: ../src/xfdesktop-application.c:774 +#: ../src/xfdesktop-application.c:770 msgid "Pop up the menu (at the current mouse position)" msgstr "Otevře nabídku (na aktuální pozici kurzoru myši)" -#: ../src/xfdesktop-application.c:775 +#: ../src/xfdesktop-application.c:771 msgid "Pop up the window list (at the current mouse position)" msgstr "Otevře seznam oken (na aktuální pozici kurzoru myši)" -#: ../src/xfdesktop-application.c:777 +#: ../src/xfdesktop-application.c:773 msgid "Automatically arrange all the icons on the desktop" msgstr "Automaticky uspořádat všechny ikony na pracovní ploše" -#: ../src/xfdesktop-application.c:779 +#: ../src/xfdesktop-application.c:775 msgid "Do not wait for a window manager on startup" msgstr "Nečekat na správce oken při startu" -#: ../src/xfdesktop-application.c:780 +#: ../src/xfdesktop-application.c:776 msgid "Cause xfdesktop to quit" msgstr "Ukončí správce plochy xfdesktop" -#: ../src/xfdesktop-application.c:795 +#: ../src/xfdesktop-application.c:791 #, c-format msgid "Failed to parse arguments: %s\n" msgstr "Zpracování parametrů se nezdařilo: %s\n" -#: ../src/xfdesktop-application.c:806 +#: ../src/xfdesktop-application.c:802 #, c-format msgid "This is %s version %s, running on Xfce %s.\n" msgstr "Toto je aplikace %s ve verzi %s, spuštěná v prostředí %s.\n" -#: ../src/xfdesktop-application.c:808 +#: ../src/xfdesktop-application.c:804 #, c-format msgid "Built with GTK+ %d.%d.%d, linked with GTK+ %d.%d.%d." msgstr "Sestaveno s GTK+ %d.%d.%d, slinkováno s GTK+ %d.%d.%d." -#: ../src/xfdesktop-application.c:812 +#: ../src/xfdesktop-application.c:808 #, c-format msgid "Build options:\n" msgstr "Volby při sestavování:\n" -#: ../src/xfdesktop-application.c:813 +#: ../src/xfdesktop-application.c:809 #, c-format msgid " Desktop Menu: %s\n" msgstr "Hlavní nabídka: %s\n" -#: ../src/xfdesktop-application.c:815 ../src/xfdesktop-application.c:822 -#: ../src/xfdesktop-application.c:829 +#: ../src/xfdesktop-application.c:811 ../src/xfdesktop-application.c:818 +#: ../src/xfdesktop-application.c:825 msgid "enabled" msgstr "povoleno" -#: ../src/xfdesktop-application.c:817 ../src/xfdesktop-application.c:824 -#: ../src/xfdesktop-application.c:831 +#: ../src/xfdesktop-application.c:813 ../src/xfdesktop-application.c:820 +#: ../src/xfdesktop-application.c:827 msgid "disabled" msgstr "zakázáno" -#: ../src/xfdesktop-application.c:820 +#: ../src/xfdesktop-application.c:816 #, c-format msgid " Desktop Icons: %s\n" msgstr "Ikony plochy: %s\n" -#: ../src/xfdesktop-application.c:827 +#: ../src/xfdesktop-application.c:823 #, c-format msgid " Desktop File Icons: %s\n" msgstr "Ikony souborů plochy: %s\n" -#: ../src/xfdesktop-file-icon-manager.c:578 -#: ../src/xfdesktop-file-icon-manager.c:595 +#: ../src/xfdesktop-file-icon-manager.c:522 +#: ../src/xfdesktop-file-icon-manager.c:539 #, c-format msgid "Could not create the desktop folder \"%s\"" msgstr "Nelze vytvořit složku na ploše \"%s\"" -#: ../src/xfdesktop-file-icon-manager.c:583 -#: ../src/xfdesktop-file-icon-manager.c:600 +#: ../src/xfdesktop-file-icon-manager.c:527 +#: ../src/xfdesktop-file-icon-manager.c:544 msgid "Desktop Folder Error" msgstr "Chyba složky na ploše" -#: ../src/xfdesktop-file-icon-manager.c:602 +#: ../src/xfdesktop-file-icon-manager.c:546 msgid "" "A normal file with the same name already exists. Please delete or rename it." msgstr "Soubor se stejným názvem již existuje. Smažte jej, nebo přejmenujte" -#: ../src/xfdesktop-file-icon-manager.c:685 ../src/xfdesktop-file-utils.c:716 -#: ../src/xfdesktop-file-utils.c:769 +#: ../src/xfdesktop-file-icon-manager.c:629 ../src/xfdesktop-file-utils.c:723 +#: ../src/xfdesktop-file-utils.c:776 msgid "Rename Error" msgstr "Chyba přejmenování" -#: ../src/xfdesktop-file-icon-manager.c:686 ../src/xfdesktop-file-utils.c:770 +#: ../src/xfdesktop-file-icon-manager.c:630 ../src/xfdesktop-file-utils.c:777 msgid "The files could not be renamed" msgstr "Soubor nelze přejmenovat" -#: ../src/xfdesktop-file-icon-manager.c:687 +#: ../src/xfdesktop-file-icon-manager.c:631 msgid "None of the icons selected support being renamed." msgstr "Žádná z vybraných ikon nepodporuje přejmenování." -#: ../src/xfdesktop-file-icon-manager.c:731 -#: ../src/xfdesktop-file-icon-manager.c:775 ../src/xfdesktop-file-utils.c:869 -#: ../src/xfdesktop-file-utils.c:906 +#: ../src/xfdesktop-file-icon-manager.c:675 +#: ../src/xfdesktop-file-icon-manager.c:719 ../src/xfdesktop-file-utils.c:876 +#: ../src/xfdesktop-file-utils.c:913 msgid "Trash Error" msgstr "Chyba koše" -#: ../src/xfdesktop-file-icon-manager.c:732 -#: ../src/xfdesktop-file-icon-manager.c:776 +#: ../src/xfdesktop-file-icon-manager.c:676 +#: ../src/xfdesktop-file-icon-manager.c:720 msgid "The selected files could not be trashed" msgstr "Vybrané soubory nelze přesunout do koše" -#: ../src/xfdesktop-file-icon-manager.c:733 -#: ../src/xfdesktop-file-icon-manager.c:777 ../src/xfdesktop-file-utils.c:718 -#: ../src/xfdesktop-file-utils.c:771 ../src/xfdesktop-file-utils.c:821 -#: ../src/xfdesktop-file-utils.c:952 ../src/xfdesktop-file-utils.c:999 -#: ../src/xfdesktop-file-utils.c:1040 ../src/xfdesktop-file-utils.c:1081 -#: ../src/xfdesktop-file-utils.c:1183 ../src/xfdesktop-file-utils.c:1235 -#: ../src/xfdesktop-file-utils.c:1308 ../src/xfdesktop-file-utils.c:1386 +#: ../src/xfdesktop-file-icon-manager.c:677 +#: ../src/xfdesktop-file-icon-manager.c:721 ../src/xfdesktop-file-utils.c:725 +#: ../src/xfdesktop-file-utils.c:778 ../src/xfdesktop-file-utils.c:828 +#: ../src/xfdesktop-file-utils.c:959 ../src/xfdesktop-file-utils.c:1006 +#: ../src/xfdesktop-file-utils.c:1047 ../src/xfdesktop-file-utils.c:1088 +#: ../src/xfdesktop-file-utils.c:1190 ../src/xfdesktop-file-utils.c:1242 +#: ../src/xfdesktop-file-utils.c:1315 ../src/xfdesktop-file-utils.c:1393 msgid "" "This feature requires a file manager service to be present (such as the one " "supplied by Thunar)." msgstr "Tato vlastnost vyžaduje přítomnost služby správce souborů (například aplikaci Thunar)." #. printf is to be translator-friendly -#: ../src/xfdesktop-file-icon-manager.c:877 -#: ../src/xfdesktop-file-icon-manager.c:1335 +#: ../src/xfdesktop-file-icon-manager.c:821 +#: ../src/xfdesktop-file-icon-manager.c:1279 #, c-format msgid "Unable to launch \"%s\":" msgstr "Nelze spustit \"%s\":" -#: ../src/xfdesktop-file-icon-manager.c:879 -#: ../src/xfdesktop-file-icon-manager.c:1140 -#: ../src/xfdesktop-file-icon-manager.c:1336 ../src/xfdesktop-file-utils.c:657 -#: ../src/xfdesktop-file-utils.c:1079 ../src/xfdesktop-file-utils.c:1156 -#: ../src/xfdesktop-file-utils.c:1181 ../src/xfdesktop-file-utils.c:1233 +#: ../src/xfdesktop-file-icon-manager.c:823 +#: ../src/xfdesktop-file-icon-manager.c:1084 +#: ../src/xfdesktop-file-icon-manager.c:1280 ../src/xfdesktop-file-utils.c:664 +#: ../src/xfdesktop-file-utils.c:1086 ../src/xfdesktop-file-utils.c:1163 +#: ../src/xfdesktop-file-utils.c:1188 ../src/xfdesktop-file-utils.c:1240 msgid "Launch Error" msgstr "Chyba při spuštění" -#: ../src/xfdesktop-file-icon-manager.c:1064 +#: ../src/xfdesktop-file-icon-manager.c:1008 #, c-format msgid "_Open With \"%s\"" msgstr "_Otevřít pomocí \"%s\"" -#: ../src/xfdesktop-file-icon-manager.c:1067 +#: ../src/xfdesktop-file-icon-manager.c:1011 #, c-format msgid "Open With \"%s\"" msgstr "Otevřít pomocí \"%s\"" -#: ../src/xfdesktop-file-icon-manager.c:1142 +#: ../src/xfdesktop-file-icon-manager.c:1086 msgid "" "Unable to launch \"exo-desktop-item-edit\", which is required to create and " "edit launchers and links on the desktop." msgstr "Nelze spustit \"exo-desktop-item-edit\". Tato aplikace je vyžadována pro vytváření a úpravu spouštěčů a odkazů na ploše." -#: ../src/xfdesktop-file-icon-manager.c:1393 +#: ../src/xfdesktop-file-icon-manager.c:1337 msgid "_Open all" msgstr "_Otevřít vše" -#: ../src/xfdesktop-file-icon-manager.c:1409 +#: ../src/xfdesktop-file-icon-manager.c:1353 msgid "_Open in New Window" msgstr "_Otevřít v novém okně" -#: ../src/xfdesktop-file-icon-manager.c:1411 -#: ../src/xfdesktop-special-file-icon.c:547 ../src/xfdesktop-volume-icon.c:810 -#: ../src/xfdesktop-volume-icon.c:814 +#: ../src/xfdesktop-file-icon-manager.c:1355 +#: ../src/xfdesktop-special-file-icon.c:547 ../src/xfdesktop-volume-icon.c:813 msgid "_Open" msgstr "_Otevřít" #. create launcher item -#: ../src/xfdesktop-file-icon-manager.c:1430 +#: ../src/xfdesktop-file-icon-manager.c:1374 msgid "Create _Launcher..." msgstr "Vytvořit _spouštěč..." #. create link item -#: ../src/xfdesktop-file-icon-manager.c:1446 +#: ../src/xfdesktop-file-icon-manager.c:1390 msgid "Create _URL Link..." msgstr "Vytvořit odkaz _URL..." #. create folder item -#: ../src/xfdesktop-file-icon-manager.c:1462 +#: ../src/xfdesktop-file-icon-manager.c:1406 msgid "Create _Folder..." msgstr "Vytvořit _složku..." -#: ../src/xfdesktop-file-icon-manager.c:1477 +#: ../src/xfdesktop-file-icon-manager.c:1421 msgid "Create From _Template" msgstr "Vytvořit _ze šablony" -#: ../src/xfdesktop-file-icon-manager.c:1506 +#: ../src/xfdesktop-file-icon-manager.c:1450 msgid "_Empty File" msgstr "_Prázdný soubor" -#: ../src/xfdesktop-file-icon-manager.c:1523 +#: ../src/xfdesktop-file-icon-manager.c:1467 msgid "_Execute" msgstr "_Spustit" -#: ../src/xfdesktop-file-icon-manager.c:1543 +#: ../src/xfdesktop-file-icon-manager.c:1487 msgid "_Edit Launcher" msgstr "_Upravit spouštěč" -#: ../src/xfdesktop-file-icon-manager.c:1578 +#: ../src/xfdesktop-file-icon-manager.c:1522 msgid "Open With" msgstr "Otevřít pomocí" -#: ../src/xfdesktop-file-icon-manager.c:1604 +#: ../src/xfdesktop-file-icon-manager.c:1548 msgid "Open With Other _Application..." msgstr "Otevřít v jiné _aplikaci..." #. Rename -#: ../src/xfdesktop-file-icon-manager.c:1704 +#: ../src/xfdesktop-file-icon-manager.c:1651 msgid "_Rename..." msgstr "Přej_menovat..." -#: ../src/xfdesktop-file-icon-manager.c:1732 +#: ../src/xfdesktop-file-icon-manager.c:1679 msgid "Arrange Desktop _Icons" msgstr "_Uspořádat ikony na ploše" -#: ../src/xfdesktop-file-icon-manager.c:1743 +#: ../src/xfdesktop-file-icon-manager.c:1690 msgid "Desktop _Settings..." msgstr "_Nastavení plochy..." -#: ../src/xfdesktop-file-icon-manager.c:1754 -#: ../src/xfdesktop-volume-icon.c:856 +#: ../src/xfdesktop-file-icon-manager.c:1701 +#: ../src/xfdesktop-volume-icon.c:855 msgid "P_roperties..." msgstr "_Vlastnosti..." -#: ../src/xfdesktop-file-icon-manager.c:2744 +#: ../src/xfdesktop-file-icon-manager.c:2716 msgid "Load Error" msgstr "Chyba při načítání" -#: ../src/xfdesktop-file-icon-manager.c:2746 +#: ../src/xfdesktop-file-icon-manager.c:2718 msgid "Failed to load the desktop folder" msgstr "Složku pracovní plochu se nepodařilo načíst" -#: ../src/xfdesktop-file-icon-manager.c:3286 +#: ../src/xfdesktop-file-icon-manager.c:3262 msgid "Copy _Here" msgstr "_Zkopírovat sem" -#: ../src/xfdesktop-file-icon-manager.c:3286 +#: ../src/xfdesktop-file-icon-manager.c:3262 msgid "_Move Here" msgstr "_Přesunout sem" -#: ../src/xfdesktop-file-icon-manager.c:3286 +#: ../src/xfdesktop-file-icon-manager.c:3262 msgid "_Link Here" msgstr "_Vytvořit zde odkaz" @@ -793,88 +791,88 @@ msgid "Unknown" msgstr "Neznámý(neznámý)" -#: ../src/xfdesktop-file-utils.c:658 +#: ../src/xfdesktop-file-utils.c:665 msgid "The folder could not be opened" msgstr "Složku nelze otevřít" -#: ../src/xfdesktop-file-utils.c:675 +#: ../src/xfdesktop-file-utils.c:682 msgid "Error" msgstr "Chyba" -#: ../src/xfdesktop-file-utils.c:676 +#: ../src/xfdesktop-file-utils.c:683 msgid "The requested operation could not be completed" msgstr "Požadovaná operace nemohla být dokončena" -#: ../src/xfdesktop-file-utils.c:717 +#: ../src/xfdesktop-file-utils.c:724 msgid "The file could not be renamed" msgstr "Soubor nelze přejmenovat" -#: ../src/xfdesktop-file-utils.c:819 +#: ../src/xfdesktop-file-utils.c:826 msgid "Delete Error" msgstr "Chyba při mazání" -#: ../src/xfdesktop-file-utils.c:820 +#: ../src/xfdesktop-file-utils.c:827 msgid "The selected files could not be deleted" msgstr "Vybrané soubory nelze smazat" -#: ../src/xfdesktop-file-utils.c:870 +#: ../src/xfdesktop-file-utils.c:877 msgid "The selected files could not be moved to the trash" msgstr "Vybrané soubory nelze přesunout do koše" -#: ../src/xfdesktop-file-utils.c:871 ../src/xfdesktop-file-utils.c:908 +#: ../src/xfdesktop-file-utils.c:878 ../src/xfdesktop-file-utils.c:915 msgid "" "This feature requires a trash service to be present (such as the one " "supplied by Thunar)." msgstr "Tato vlastnost vyžaduje přítomnost služby koše (například dodávanou v rámci aplikace Thunar)." -#: ../src/xfdesktop-file-utils.c:907 +#: ../src/xfdesktop-file-utils.c:914 msgid "Could not empty the trash" msgstr "Nelze vysypat koš" -#: ../src/xfdesktop-file-utils.c:950 +#: ../src/xfdesktop-file-utils.c:957 msgid "Create File Error" msgstr "Chyba při vytváření souboru" -#: ../src/xfdesktop-file-utils.c:951 +#: ../src/xfdesktop-file-utils.c:958 msgid "Could not create a new file" msgstr "Nelze vytvořit nový soubor" -#: ../src/xfdesktop-file-utils.c:997 +#: ../src/xfdesktop-file-utils.c:1004 msgid "Create Document Error" msgstr "Chyba při vytváření dokumentu" -#: ../src/xfdesktop-file-utils.c:998 +#: ../src/xfdesktop-file-utils.c:1005 msgid "Could not create a new document from the template" msgstr "Nový dokument ze šablony nelze vytvořit" -#: ../src/xfdesktop-file-utils.c:1038 +#: ../src/xfdesktop-file-utils.c:1045 msgid "File Properties Error" msgstr "Chyba vlastností souboru" -#: ../src/xfdesktop-file-utils.c:1039 +#: ../src/xfdesktop-file-utils.c:1046 msgid "The file properties dialog could not be opened" msgstr "Dialogové okno vlastnosti souboru nelze otevřít" -#: ../src/xfdesktop-file-utils.c:1080 +#: ../src/xfdesktop-file-utils.c:1087 msgid "The file could not be opened" msgstr "Soubor nelze otevřít" -#: ../src/xfdesktop-file-utils.c:1153 ../src/xfdesktop-file-utils.c:1178 +#: ../src/xfdesktop-file-utils.c:1160 ../src/xfdesktop-file-utils.c:1185 #, c-format msgid "Failed to run \"%s\"" msgstr "Spuštění \"%s\" se nezdařilo" -#: ../src/xfdesktop-file-utils.c:1234 +#: ../src/xfdesktop-file-utils.c:1241 msgid "The application chooser could not be opened" msgstr "Výběr aplikace nebylo možné otevřít" -#: ../src/xfdesktop-file-utils.c:1292 ../src/xfdesktop-file-utils.c:1306 -#: ../src/xfdesktop-file-utils.c:1368 ../src/xfdesktop-file-utils.c:1384 +#: ../src/xfdesktop-file-utils.c:1299 ../src/xfdesktop-file-utils.c:1313 +#: ../src/xfdesktop-file-utils.c:1375 ../src/xfdesktop-file-utils.c:1391 msgid "Transfer Error" msgstr "Chyba při přenosu" -#: ../src/xfdesktop-file-utils.c:1293 ../src/xfdesktop-file-utils.c:1307 -#: ../src/xfdesktop-file-utils.c:1369 ../src/xfdesktop-file-utils.c:1385 +#: ../src/xfdesktop-file-utils.c:1300 ../src/xfdesktop-file-utils.c:1314 +#: ../src/xfdesktop-file-utils.c:1376 ../src/xfdesktop-file-utils.c:1392 msgid "The file transfer could not be performed" msgstr "Přenos souboru nelze uskutečnit" @@ -998,15 +996,15 @@ msgid "Mount Failed" msgstr "Připojení se nezdařilo" -#: ../src/xfdesktop-volume-icon.c:829 +#: ../src/xfdesktop-volume-icon.c:828 msgid "E_ject Volume" msgstr "_Vysunout svazek" -#: ../src/xfdesktop-volume-icon.c:836 +#: ../src/xfdesktop-volume-icon.c:835 msgid "_Unmount Volume" msgstr "_Odpojit svazek" -#: ../src/xfdesktop-volume-icon.c:843 +#: ../src/xfdesktop-volume-icon.c:842 msgid "_Mount Volume" msgstr "_Připojit svazek" diff -Nru xfdesktop4-4.11.4/po/hr.po xfdesktop4-4.11.5/po/hr.po --- xfdesktop4-4.11.4/po/hr.po 2014-03-02 07:21:58.000000000 +0000 +++ xfdesktop4-4.11.5/po/hr.po 2014-03-25 17:51:09.000000000 +0000 @@ -5,15 +5,15 @@ # Translators: # schizo , 2014 # Ivica Kolić , 2010 -# Ivica Kolić , 2013 +# Ivica Kolić , 2013-2014 # Ivica Kolić , 2013 msgid "" msgstr "" "Project-Id-Version: Xfdesktop\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2014-02-24 12:32+0100\n" -"PO-Revision-Date: 2014-02-28 23:24+0000\n" -"Last-Translator: schizo \n" +"PO-Revision-Date: 2014-03-20 06:05+0000\n" +"Last-Translator: Ivica Kolić \n" "Language-Team: Croatian (http://www.transifex.com/projects/p/xfce/language/hr/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -71,7 +71,7 @@ #: ../settings/main.c:695 msgid "Move this dialog to the display you want to edit the settings for." -msgstr "Premjesti okvir do rzaslona za kojeg želite mijenjati postavke." +msgstr "Premjesti okvir do zaslona za kojeg želite mijenjati postavke." #: ../settings/main.c:702 #, c-format @@ -107,7 +107,7 @@ #: ../settings/main.c:1134 msgid "Image selection is unavailable while the image style is set to None." -msgstr "Izbor slika je nedostupan kada je stil slike postavljen na \"Ništa\"." +msgstr "Izbor slika je nedostupan kada je stil slike postavljen na Ništa." #: ../settings/main.c:1481 msgid "Spanning screens" @@ -246,11 +246,11 @@ #: ../settings/xfdesktop-settings-appearance-frame-ui.glade.h:22 msgid "Apply to all _workspaces" -msgstr "Primjeni na sve ra_dne prostore" +msgstr "Primjeni na sve radne _prostore" #: ../settings/xfdesktop-settings-appearance-frame-ui.glade.h:23 msgid "Change the _background " -msgstr "Promijeni poza_dinu" +msgstr "Promijeni _pozadinu" #: ../settings/xfdesktop-settings-appearance-frame-ui.glade.h:24 msgid "" @@ -291,7 +291,7 @@ #: ../settings/xfdesktop-settings-appearance-frame-ui.glade.h:33 msgid "Amount of time before a different background is selected." -msgstr "Količina vremena prije nego je pozadina izabrana." +msgstr "Količina vremena prije nego je drugačija pozadina izabrana." #: ../settings/xfdesktop-settings-appearance-frame-ui.glade.h:34 msgid "_Random Order" @@ -397,11 +397,11 @@ #: ../settings/xfdesktop-settings-ui.glade.h:25 msgid "Show s_ticky windows only in active workspace" -msgstr "Pokaži l_ijepljive prozore samo na aktivnim radnim prostorima" +msgstr "Pokaži lj_epljive prozore samo na aktivnim radnim prostorima" #: ../settings/xfdesktop-settings-ui.glade.h:26 msgid "Show a_dd and remove workspace options in list" -msgstr "Pokaži _dodaj i ukloni opcije za radne prostore na listi" +msgstr "Pokaži d_odaj i ukloni opcije za radne prostore na listi" #: ../settings/xfdesktop-settings-ui.glade.h:27 msgid "Window List Menu" @@ -795,7 +795,7 @@ #: ../src/xfdesktop-file-utils.c:682 msgid "Error" -msgstr "Grešla" +msgstr "Greška" #: ../src/xfdesktop-file-utils.c:683 msgid "The requested operation could not be completed" diff -Nru xfdesktop4-4.11.4/po/pl.po xfdesktop4-4.11.5/po/pl.po --- xfdesktop4-4.11.4/po/pl.po 2014-03-04 18:15:52.000000000 +0000 +++ xfdesktop4-4.11.5/po/pl.po 2014-03-27 15:54:25.000000000 +0000 @@ -18,8 +18,8 @@ "Project-Id-Version: Xfdesktop\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2014-02-24 12:32+0100\n" -"PO-Revision-Date: 2014-03-03 06:03+0000\n" -"Last-Translator: hoek \n" +"PO-Revision-Date: 2014-03-27 11:20+0000\n" +"Last-Translator: Piotr Sokół \n" "Language-Team: Polish (http://www.transifex.com/projects/p/xfce/language/pl/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -77,7 +77,7 @@ #: ../settings/main.c:695 msgid "Move this dialog to the display you want to edit the settings for." -msgstr "Przenieść to okno na ekran, którego ustawienia chcesz edytować." +msgstr "Proszę przemieścić to okno na ekran, którego ustawienia mają zostać zmodyfikowane." #: ../settings/main.c:702 #, c-format @@ -93,7 +93,7 @@ msgid "" "Move this dialog to the display and workspace you want to edit the settings " "for." -msgstr "Przenieś to okno dialogowe na obszar roboczy, który ma zostać skonfigurowany." +msgstr "Proszę przemieścić to okno na ekran i obszar roboczy, których ustawienia mają zostać zmodyfikowane." #. Single monitor and single workspace #: ../settings/main.c:720 @@ -187,7 +187,7 @@ #: ../settings/xfdesktop-settings-appearance-frame-ui.glade.h:6 msgid "Choose the folder to select wallpapers from." -msgstr "Wybierz katalog z tapetami." +msgstr "Wskazuje katalog z tapetami." #: ../settings/xfdesktop-settings-appearance-frame-ui.glade.h:7 msgid "St_yle:" @@ -265,7 +265,7 @@ #: ../settings/xfdesktop-settings-appearance-frame-ui.glade.h:25 msgid "Specify how often the background will change." -msgstr "Określ, jak często ma być zmieniana tapeta." +msgstr "Określa, jak często ma być zmieniane tło pulpitu." #: ../settings/xfdesktop-settings-appearance-frame-ui.glade.h:26 msgid "in seconds:" diff -Nru xfdesktop4-4.11.4/po/pt_BR.po xfdesktop4-4.11.5/po/pt_BR.po --- xfdesktop4-4.11.4/po/pt_BR.po 2013-12-19 16:30:47.000000000 +0000 +++ xfdesktop4-4.11.5/po/pt_BR.po 2014-03-25 17:51:09.000000000 +0000 @@ -9,15 +9,15 @@ # Fábio Nogueira , 2008 # Henrique P. Machado , 2013 # Og Maciel , 2008 -# Rafael Ferreira , 2013 +# Rafael Ferreira , 2013-2014 # secipolla , 2011 # secipolla , 2011 msgid "" msgstr "" "Project-Id-Version: Xfdesktop\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2013-12-15 00:31+0100\n" -"PO-Revision-Date: 2013-12-17 03:55+0000\n" +"POT-Creation-Date: 2014-02-24 12:32+0100\n" +"PO-Revision-Date: 2014-03-24 14:30+0000\n" "Last-Translator: Rafael Ferreira \n" "Language-Team: Portuguese (Brazil) (http://www.transifex.com/projects/p/xfce/language/pt_BR/)\n" "MIME-Version: 1.0\n" @@ -26,37 +26,37 @@ "Language: pt_BR\n" "Plural-Forms: nplurals=2; plural=(n > 1);\n" -#: ../settings/main.c:372 ../src/xfdesktop-special-file-icon.c:295 +#: ../settings/main.c:375 ../src/xfdesktop-special-file-icon.c:295 #: ../src/xfdesktop-special-file-icon.c:479 msgid "Home" msgstr "Início" -#: ../settings/main.c:374 +#: ../settings/main.c:377 msgid "Filesystem" msgstr "Sistema de arquivos" -#: ../settings/main.c:376 +#: ../settings/main.c:379 msgid "Trash" msgstr "Lixeira" -#: ../settings/main.c:378 +#: ../settings/main.c:381 msgid "Removable Devices" msgstr "Dispositivos removíveis" -#: ../settings/main.c:380 +#: ../settings/main.c:383 msgid "Network Shares" msgstr "Compartilhamentos de Rede" -#: ../settings/main.c:382 +#: ../settings/main.c:385 msgid "Disks and Drives" msgstr "Discos e Unidades" -#: ../settings/main.c:384 -msgid "Other Items" -msgstr "Outros Itens" +#: ../settings/main.c:387 +msgid "Other Devices" +msgstr "Outros dispositivos" #. Display the file name, file type, and file size in the tooltip. -#: ../settings/main.c:497 +#: ../settings/main.c:500 #, c-format msgid "" "%s\n" @@ -64,97 +64,95 @@ "Size: %s" msgstr "%s\nTipo: %s\nTamanho: %s" -#: ../settings/main.c:681 +#: ../settings/main.c:686 #, c-format msgid "Wallpaper for Monitor %d (%s)" msgstr "Papel de parede do monitor %d (%s)" -#: ../settings/main.c:684 +#: ../settings/main.c:689 #, c-format msgid "Wallpaper for Monitor %d" msgstr "Papel de parede do monitor %d" -#: ../settings/main.c:690 -msgid "" -"You are using more than one display, move this dialog to the display you " -"want to edit the settings for." -msgstr "Você está usando mais de uma tela, mova este diálogo para a tela a qual você deseja editar as configurações." +#: ../settings/main.c:695 +msgid "Move this dialog to the display you want to edit the settings for." +msgstr "Mova esse diálogo para a tela cujas configurações você deseja editar." -#: ../settings/main.c:698 +#: ../settings/main.c:702 #, c-format msgid "Wallpaper for %s on Monitor %d (%s)" msgstr "Papel de parede para %s no monitor %d (%s)" -#: ../settings/main.c:702 +#: ../settings/main.c:706 #, c-format msgid "Wallpaper for %s on Monitor %d" msgstr "Papel de parede para %s no monitor %d" -#: ../settings/main.c:709 +#: ../settings/main.c:713 msgid "" -"You are using more than one display, move this dialog to the display and " -"workspace you want to edit the settings for." -msgstr "Você está usando mais de uma tela, mova este diálogo para a tela e espaço de trabalho que você deseja editar as configurações." +"Move this dialog to the display and workspace you want to edit the settings " +"for." +msgstr "Mova esse diálogo para a tela e espaço de trabalho cujas configurações você deseja editar." #. Single monitor and single workspace -#: ../settings/main.c:717 +#: ../settings/main.c:720 #, c-format msgid "Wallpaper for my desktop" msgstr "Papel de parede da minha área de trabalho" #. Single monitor and per workspace wallpaper -#: ../settings/main.c:723 +#: ../settings/main.c:726 #, c-format msgid "Wallpaper for %s" msgstr "Papel de parede de %s" -#: ../settings/main.c:728 +#: ../settings/main.c:731 msgid "Move this dialog to the workspace you want to edit the settings for." msgstr "Mova este diálogo para o espaço de trabalho que você deseja editar as configurações." -#: ../settings/main.c:1131 +#: ../settings/main.c:1134 msgid "Image selection is unavailable while the image style is set to None." msgstr "A seleção de imagem fica indisponível enquanto o estilo da imagem está definido como Nenhum." -#: ../settings/main.c:1483 +#: ../settings/main.c:1481 msgid "Spanning screens" msgstr "Telas estendidas" -#: ../settings/main.c:1788 +#: ../settings/main.c:1786 msgid "Image files" msgstr "Arquivos de imagem" -#: ../settings/main.c:1945 +#: ../settings/main.c:1958 msgid "Settings manager socket" msgstr "Socket do gerenciador de configurações" -#: ../settings/main.c:1945 +#: ../settings/main.c:1958 msgid "SOCKET ID" msgstr "ID DO SOCKET" -#: ../settings/main.c:1946 +#: ../settings/main.c:1959 msgid "Version information" msgstr "Informação da versão" -#: ../settings/main.c:1973 +#: ../settings/main.c:1986 #, c-format msgid "Type '%s --help' for usage." msgstr "Digite \"%s --help\" para ver como usar." -#: ../settings/main.c:1985 +#: ../settings/main.c:1998 msgid "The Xfce development team. All rights reserved." msgstr "A equipe de desenvolvimento do Xfce. Todos os direitos reservados." -#: ../settings/main.c:1986 +#: ../settings/main.c:1999 #, c-format msgid "Please report bugs to <%s>." msgstr "Por favor, relate erros para <%s>." -#: ../settings/main.c:1993 +#: ../settings/main.c:2006 msgid "Desktop Settings" msgstr "Configurações da área de trabalho" -#: ../settings/main.c:1995 +#: ../settings/main.c:2008 msgid "Unable to contact settings server" msgstr "Não foi possível contatar o servidor de configurações" @@ -187,16 +185,16 @@ msgstr "_Pasta:" #: ../settings/xfdesktop-settings-appearance-frame-ui.glade.h:6 -msgid "Choose the folder to select wallpapers from" -msgstr "Escolha a pasta para selecionar papéis de parede" +msgid "Choose the folder to select wallpapers from." +msgstr "Escolha a pasta da qual deseja selecionar papéis de parede." #: ../settings/xfdesktop-settings-appearance-frame-ui.glade.h:7 msgid "St_yle:" msgstr "Est_ilo:" #: ../settings/xfdesktop-settings-appearance-frame-ui.glade.h:8 -msgid "Specify how the image will be resized to fit the screen" -msgstr "Especificar como a imagem será redimensionada para caber na tela" +msgid "Specify how the image will be resized to fit the screen." +msgstr "Especifique como a imagem que será redimensionada para ajustar à imagem." #: ../settings/xfdesktop-settings-appearance-frame-ui.glade.h:9 #: ../settings/xfdesktop-settings-ui.glade.h:4 @@ -232,20 +230,20 @@ msgstr "C_or:" #: ../settings/xfdesktop-settings-appearance-frame-ui.glade.h:17 -msgid "Specify the style of the color drawn behind the backdrop image" -msgstr "Especificar o estilo da cor desenhada por trás da imagem de fundo" +msgid "Specify the style of the color drawn behind the backdrop image." +msgstr "Especifica o estilo da cor desenhada atrás da imagem da plano de fundo." #: ../settings/xfdesktop-settings-appearance-frame-ui.glade.h:18 -msgid "Specifies the solid color, or the \"left\" or \"top\" color of the gradient" -msgstr "Especifica a cor sólida ou a cor \"esquerda\" ou \"superior\" do degradê" +msgid "Specifies the solid color, or the \"left\" or \"top\" color of the gradient." +msgstr "Especifica a cor sólida, ou a cor \"esquerda\" ou \"superior\" do degradê." #: ../settings/xfdesktop-settings-appearance-frame-ui.glade.h:19 msgid "Select First Color" msgstr "Selecione a primeira cor" #: ../settings/xfdesktop-settings-appearance-frame-ui.glade.h:20 -msgid "Specifies the \"right\" or \"bottom\" color of the gradient" -msgstr "Especifica a cor \"direita\" ou \"inferior\" do degradê" +msgid "Specifies the \"right\" or \"bottom\" color of the gradient." +msgstr "Especifica a cor \"direita\" ou \"inferior\" do degradê." #: ../settings/xfdesktop-settings-appearance-frame-ui.glade.h:21 msgid "Select Second Color" @@ -265,8 +263,8 @@ msgstr "Seleciona automaticamente um plano de fundo diferente a partir da pasta atual." #: ../settings/xfdesktop-settings-appearance-frame-ui.glade.h:25 -msgid "Specify how often the background will change" -msgstr "Especificar com que frequência o plano de fundo mudará" +msgid "Specify how often the background will change." +msgstr "Especifica o quão frequente o plano de fundo será alterado." #: ../settings/xfdesktop-settings-appearance-frame-ui.glade.h:26 msgid "in seconds:" @@ -342,7 +340,7 @@ msgid "File/launcher icons" msgstr "Ícones de arquivos/lançadores" -#: ../settings/xfdesktop-settings-ui.glade.h:10 ../src/xfce-desktop.c:1010 +#: ../settings/xfdesktop-settings-ui.glade.h:10 ../src/xfce-desktop.c:1015 msgid "Desktop" msgstr "Área de trabalho" @@ -521,250 +519,249 @@ msgid "_Remove Workspace '%s'" msgstr "_Remover espaço de trabalho '%s'" -#: ../src/xfdesktop-application.c:772 +#: ../src/xfdesktop-application.c:768 msgid "Display version information" msgstr "Exibir informação da versão" -#: ../src/xfdesktop-application.c:773 +#: ../src/xfdesktop-application.c:769 msgid "Reload all settings" msgstr "Recarregar todas as configurações" -#: ../src/xfdesktop-application.c:774 +#: ../src/xfdesktop-application.c:770 msgid "Pop up the menu (at the current mouse position)" msgstr "Abre o menu (na posição atual do mouse)" -#: ../src/xfdesktop-application.c:775 +#: ../src/xfdesktop-application.c:771 msgid "Pop up the window list (at the current mouse position)" msgstr "Abre a lista de janelas (na posição atual do mouse)" -#: ../src/xfdesktop-application.c:777 +#: ../src/xfdesktop-application.c:773 msgid "Automatically arrange all the icons on the desktop" msgstr "Posiciona automaticamente todos os ícones na área de trabalho" -#: ../src/xfdesktop-application.c:779 +#: ../src/xfdesktop-application.c:775 msgid "Do not wait for a window manager on startup" msgstr "Não aguardar por um gerenciador de janelas ao iniciar" -#: ../src/xfdesktop-application.c:780 +#: ../src/xfdesktop-application.c:776 msgid "Cause xfdesktop to quit" msgstr "Interrompe o xfdesktop" -#: ../src/xfdesktop-application.c:795 +#: ../src/xfdesktop-application.c:791 #, c-format msgid "Failed to parse arguments: %s\n" msgstr "Falha ao analisar os argumentos: %s\n" -#: ../src/xfdesktop-application.c:806 +#: ../src/xfdesktop-application.c:802 #, c-format msgid "This is %s version %s, running on Xfce %s.\n" msgstr "Este é o %s versão %s, executando no Xfce %s.\n" -#: ../src/xfdesktop-application.c:808 +#: ../src/xfdesktop-application.c:804 #, c-format msgid "Built with GTK+ %d.%d.%d, linked with GTK+ %d.%d.%d." msgstr "Compilado com GTK+ %d.%d.%d, linkado com GTK+ %d.%d.%d." -#: ../src/xfdesktop-application.c:812 +#: ../src/xfdesktop-application.c:808 #, c-format msgid "Build options:\n" msgstr "Opções de compilação:\n" -#: ../src/xfdesktop-application.c:813 +#: ../src/xfdesktop-application.c:809 #, c-format msgid " Desktop Menu: %s\n" msgstr "Menu da área de trabalho: %s\n" -#: ../src/xfdesktop-application.c:815 ../src/xfdesktop-application.c:822 -#: ../src/xfdesktop-application.c:829 +#: ../src/xfdesktop-application.c:811 ../src/xfdesktop-application.c:818 +#: ../src/xfdesktop-application.c:825 msgid "enabled" msgstr "habilitado" -#: ../src/xfdesktop-application.c:817 ../src/xfdesktop-application.c:824 -#: ../src/xfdesktop-application.c:831 +#: ../src/xfdesktop-application.c:813 ../src/xfdesktop-application.c:820 +#: ../src/xfdesktop-application.c:827 msgid "disabled" msgstr "desabilitado" -#: ../src/xfdesktop-application.c:820 +#: ../src/xfdesktop-application.c:816 #, c-format msgid " Desktop Icons: %s\n" msgstr "Ícones da área de trabalho: %s\n" -#: ../src/xfdesktop-application.c:827 +#: ../src/xfdesktop-application.c:823 #, c-format msgid " Desktop File Icons: %s\n" msgstr "Ícones de arquivos da área de trabalho: %s\n" -#: ../src/xfdesktop-file-icon-manager.c:578 -#: ../src/xfdesktop-file-icon-manager.c:595 +#: ../src/xfdesktop-file-icon-manager.c:522 +#: ../src/xfdesktop-file-icon-manager.c:539 #, c-format msgid "Could not create the desktop folder \"%s\"" msgstr "Não foi possível criar a pasta da área de trabalho \"%s\"" -#: ../src/xfdesktop-file-icon-manager.c:583 -#: ../src/xfdesktop-file-icon-manager.c:600 +#: ../src/xfdesktop-file-icon-manager.c:527 +#: ../src/xfdesktop-file-icon-manager.c:544 msgid "Desktop Folder Error" msgstr "Erro na pasta da área de trabalho" -#: ../src/xfdesktop-file-icon-manager.c:602 +#: ../src/xfdesktop-file-icon-manager.c:546 msgid "" "A normal file with the same name already exists. Please delete or rename it." msgstr "Um arquivo comum com o mesmo nome já existe. Por favor, apague-o ou renomeie-o." -#: ../src/xfdesktop-file-icon-manager.c:685 ../src/xfdesktop-file-utils.c:716 -#: ../src/xfdesktop-file-utils.c:769 +#: ../src/xfdesktop-file-icon-manager.c:629 ../src/xfdesktop-file-utils.c:723 +#: ../src/xfdesktop-file-utils.c:776 msgid "Rename Error" msgstr "Erro ao renomear" -#: ../src/xfdesktop-file-icon-manager.c:686 ../src/xfdesktop-file-utils.c:770 +#: ../src/xfdesktop-file-icon-manager.c:630 ../src/xfdesktop-file-utils.c:777 msgid "The files could not be renamed" msgstr "Os arquivos não puderam ser renomeados" -#: ../src/xfdesktop-file-icon-manager.c:687 +#: ../src/xfdesktop-file-icon-manager.c:631 msgid "None of the icons selected support being renamed." msgstr "Nenhum dos ícones selecionados podem ser renomeados." -#: ../src/xfdesktop-file-icon-manager.c:731 -#: ../src/xfdesktop-file-icon-manager.c:775 ../src/xfdesktop-file-utils.c:869 -#: ../src/xfdesktop-file-utils.c:906 +#: ../src/xfdesktop-file-icon-manager.c:675 +#: ../src/xfdesktop-file-icon-manager.c:719 ../src/xfdesktop-file-utils.c:876 +#: ../src/xfdesktop-file-utils.c:913 msgid "Trash Error" msgstr "Erro ao mover para a lixeira" -#: ../src/xfdesktop-file-icon-manager.c:732 -#: ../src/xfdesktop-file-icon-manager.c:776 +#: ../src/xfdesktop-file-icon-manager.c:676 +#: ../src/xfdesktop-file-icon-manager.c:720 msgid "The selected files could not be trashed" msgstr "Os arquivos selecionados não puderam ser movidos para a lixeira" -#: ../src/xfdesktop-file-icon-manager.c:733 -#: ../src/xfdesktop-file-icon-manager.c:777 ../src/xfdesktop-file-utils.c:718 -#: ../src/xfdesktop-file-utils.c:771 ../src/xfdesktop-file-utils.c:821 -#: ../src/xfdesktop-file-utils.c:952 ../src/xfdesktop-file-utils.c:999 -#: ../src/xfdesktop-file-utils.c:1040 ../src/xfdesktop-file-utils.c:1081 -#: ../src/xfdesktop-file-utils.c:1183 ../src/xfdesktop-file-utils.c:1235 -#: ../src/xfdesktop-file-utils.c:1308 ../src/xfdesktop-file-utils.c:1386 +#: ../src/xfdesktop-file-icon-manager.c:677 +#: ../src/xfdesktop-file-icon-manager.c:721 ../src/xfdesktop-file-utils.c:725 +#: ../src/xfdesktop-file-utils.c:778 ../src/xfdesktop-file-utils.c:828 +#: ../src/xfdesktop-file-utils.c:959 ../src/xfdesktop-file-utils.c:1006 +#: ../src/xfdesktop-file-utils.c:1047 ../src/xfdesktop-file-utils.c:1088 +#: ../src/xfdesktop-file-utils.c:1190 ../src/xfdesktop-file-utils.c:1242 +#: ../src/xfdesktop-file-utils.c:1315 ../src/xfdesktop-file-utils.c:1393 msgid "" "This feature requires a file manager service to be present (such as the one " "supplied by Thunar)." msgstr "Este recurso requer um serviço de gerenciador de arquivos presente (como o provido pelo Thunar)." #. printf is to be translator-friendly -#: ../src/xfdesktop-file-icon-manager.c:877 -#: ../src/xfdesktop-file-icon-manager.c:1335 +#: ../src/xfdesktop-file-icon-manager.c:821 +#: ../src/xfdesktop-file-icon-manager.c:1279 #, c-format msgid "Unable to launch \"%s\":" msgstr "Não foi possível lançar \"%s\":" -#: ../src/xfdesktop-file-icon-manager.c:879 -#: ../src/xfdesktop-file-icon-manager.c:1140 -#: ../src/xfdesktop-file-icon-manager.c:1336 ../src/xfdesktop-file-utils.c:657 -#: ../src/xfdesktop-file-utils.c:1079 ../src/xfdesktop-file-utils.c:1156 -#: ../src/xfdesktop-file-utils.c:1181 ../src/xfdesktop-file-utils.c:1233 +#: ../src/xfdesktop-file-icon-manager.c:823 +#: ../src/xfdesktop-file-icon-manager.c:1084 +#: ../src/xfdesktop-file-icon-manager.c:1280 ../src/xfdesktop-file-utils.c:664 +#: ../src/xfdesktop-file-utils.c:1086 ../src/xfdesktop-file-utils.c:1163 +#: ../src/xfdesktop-file-utils.c:1188 ../src/xfdesktop-file-utils.c:1240 msgid "Launch Error" msgstr "Erro ao lançar" -#: ../src/xfdesktop-file-icon-manager.c:1064 +#: ../src/xfdesktop-file-icon-manager.c:1008 #, c-format msgid "_Open With \"%s\"" msgstr "Abrir c_om \"%s\"" -#: ../src/xfdesktop-file-icon-manager.c:1067 +#: ../src/xfdesktop-file-icon-manager.c:1011 #, c-format msgid "Open With \"%s\"" msgstr "Abrir com \"%s\"" -#: ../src/xfdesktop-file-icon-manager.c:1142 +#: ../src/xfdesktop-file-icon-manager.c:1086 msgid "" "Unable to launch \"exo-desktop-item-edit\", which is required to create and " "edit launchers and links on the desktop." msgstr "Não foi possível executar \"exo-desktop-item-edit\", que é necessário para criar e editar lançadores e ligações na área de trabalho." -#: ../src/xfdesktop-file-icon-manager.c:1393 +#: ../src/xfdesktop-file-icon-manager.c:1337 msgid "_Open all" msgstr "A_brir todos" -#: ../src/xfdesktop-file-icon-manager.c:1409 +#: ../src/xfdesktop-file-icon-manager.c:1353 msgid "_Open in New Window" msgstr "Ab_rir em nova janela" -#: ../src/xfdesktop-file-icon-manager.c:1411 -#: ../src/xfdesktop-special-file-icon.c:547 ../src/xfdesktop-volume-icon.c:810 -#: ../src/xfdesktop-volume-icon.c:814 +#: ../src/xfdesktop-file-icon-manager.c:1355 +#: ../src/xfdesktop-special-file-icon.c:547 ../src/xfdesktop-volume-icon.c:813 msgid "_Open" msgstr "A_brir" #. create launcher item -#: ../src/xfdesktop-file-icon-manager.c:1430 +#: ../src/xfdesktop-file-icon-manager.c:1374 msgid "Create _Launcher..." msgstr "Criar _lançador..." #. create link item -#: ../src/xfdesktop-file-icon-manager.c:1446 +#: ../src/xfdesktop-file-icon-manager.c:1390 msgid "Create _URL Link..." msgstr "Criar ligação para _URL..." #. create folder item -#: ../src/xfdesktop-file-icon-manager.c:1462 +#: ../src/xfdesktop-file-icon-manager.c:1406 msgid "Create _Folder..." msgstr "Criar _pasta..." -#: ../src/xfdesktop-file-icon-manager.c:1477 +#: ../src/xfdesktop-file-icon-manager.c:1421 msgid "Create From _Template" msgstr "Criar a partir do _modelo" -#: ../src/xfdesktop-file-icon-manager.c:1506 +#: ../src/xfdesktop-file-icon-manager.c:1450 msgid "_Empty File" msgstr "Ar_quivo vazio" -#: ../src/xfdesktop-file-icon-manager.c:1523 +#: ../src/xfdesktop-file-icon-manager.c:1467 msgid "_Execute" msgstr "_Executar" -#: ../src/xfdesktop-file-icon-manager.c:1543 +#: ../src/xfdesktop-file-icon-manager.c:1487 msgid "_Edit Launcher" msgstr "_Editar lançador" -#: ../src/xfdesktop-file-icon-manager.c:1578 +#: ../src/xfdesktop-file-icon-manager.c:1522 msgid "Open With" msgstr "Abrir com" -#: ../src/xfdesktop-file-icon-manager.c:1604 +#: ../src/xfdesktop-file-icon-manager.c:1548 msgid "Open With Other _Application..." msgstr "Abrir com outro _aplicativo..." #. Rename -#: ../src/xfdesktop-file-icon-manager.c:1704 +#: ../src/xfdesktop-file-icon-manager.c:1651 msgid "_Rename..." msgstr "_Renomear..." -#: ../src/xfdesktop-file-icon-manager.c:1732 +#: ../src/xfdesktop-file-icon-manager.c:1679 msgid "Arrange Desktop _Icons" msgstr "_Posicionar ícones da área de trabalho" -#: ../src/xfdesktop-file-icon-manager.c:1743 +#: ../src/xfdesktop-file-icon-manager.c:1690 msgid "Desktop _Settings..." msgstr "_Configurações da área de trabalho..." -#: ../src/xfdesktop-file-icon-manager.c:1754 -#: ../src/xfdesktop-volume-icon.c:856 +#: ../src/xfdesktop-file-icon-manager.c:1701 +#: ../src/xfdesktop-volume-icon.c:855 msgid "P_roperties..." msgstr "_Propriedades..." -#: ../src/xfdesktop-file-icon-manager.c:2744 +#: ../src/xfdesktop-file-icon-manager.c:2716 msgid "Load Error" msgstr "Erro ao carregar" -#: ../src/xfdesktop-file-icon-manager.c:2746 +#: ../src/xfdesktop-file-icon-manager.c:2718 msgid "Failed to load the desktop folder" msgstr "Falha ao carregar a pasta da área de trabalho" -#: ../src/xfdesktop-file-icon-manager.c:3286 +#: ../src/xfdesktop-file-icon-manager.c:3262 msgid "Copy _Here" msgstr "_Copiar aqui" -#: ../src/xfdesktop-file-icon-manager.c:3286 +#: ../src/xfdesktop-file-icon-manager.c:3262 msgid "_Move Here" msgstr "_Mover aqui" -#: ../src/xfdesktop-file-icon-manager.c:3286 +#: ../src/xfdesktop-file-icon-manager.c:3262 msgid "_Link Here" msgstr "_Ligação aqui" @@ -797,88 +794,88 @@ msgid "Unknown" msgstr "Desconhecido" -#: ../src/xfdesktop-file-utils.c:658 +#: ../src/xfdesktop-file-utils.c:665 msgid "The folder could not be opened" msgstr "A pasta não pôde ser aberta" -#: ../src/xfdesktop-file-utils.c:675 +#: ../src/xfdesktop-file-utils.c:682 msgid "Error" msgstr "Erro" -#: ../src/xfdesktop-file-utils.c:676 +#: ../src/xfdesktop-file-utils.c:683 msgid "The requested operation could not be completed" msgstr "A operação requisitada não pôde ser concluída" -#: ../src/xfdesktop-file-utils.c:717 +#: ../src/xfdesktop-file-utils.c:724 msgid "The file could not be renamed" msgstr "O arquivo não pôde ser renomeado" -#: ../src/xfdesktop-file-utils.c:819 +#: ../src/xfdesktop-file-utils.c:826 msgid "Delete Error" msgstr "Erro ao excluir" -#: ../src/xfdesktop-file-utils.c:820 +#: ../src/xfdesktop-file-utils.c:827 msgid "The selected files could not be deleted" msgstr "Os arquivos selecionados não puderam ser excluídos" -#: ../src/xfdesktop-file-utils.c:870 +#: ../src/xfdesktop-file-utils.c:877 msgid "The selected files could not be moved to the trash" msgstr "Os arquivos selecionados não puderam ser movidos para a lixeira" -#: ../src/xfdesktop-file-utils.c:871 ../src/xfdesktop-file-utils.c:908 +#: ../src/xfdesktop-file-utils.c:878 ../src/xfdesktop-file-utils.c:915 msgid "" "This feature requires a trash service to be present (such as the one " "supplied by Thunar)." msgstr "Este recurso requer um serviço de lixeira presente (como o provido pelo Thunar)." -#: ../src/xfdesktop-file-utils.c:907 +#: ../src/xfdesktop-file-utils.c:914 msgid "Could not empty the trash" msgstr "Não foi possível esvaziar a lixeira" -#: ../src/xfdesktop-file-utils.c:950 +#: ../src/xfdesktop-file-utils.c:957 msgid "Create File Error" msgstr "Erro ao criar arquivo" -#: ../src/xfdesktop-file-utils.c:951 +#: ../src/xfdesktop-file-utils.c:958 msgid "Could not create a new file" msgstr "Não foi possível criar um novo arquivo" -#: ../src/xfdesktop-file-utils.c:997 +#: ../src/xfdesktop-file-utils.c:1004 msgid "Create Document Error" msgstr "Erro ao criar documento" -#: ../src/xfdesktop-file-utils.c:998 +#: ../src/xfdesktop-file-utils.c:1005 msgid "Could not create a new document from the template" msgstr "Não foi possível criar um novo documento a partir do modelo" -#: ../src/xfdesktop-file-utils.c:1038 +#: ../src/xfdesktop-file-utils.c:1045 msgid "File Properties Error" msgstr "Erro nas propriedades de arquivo" -#: ../src/xfdesktop-file-utils.c:1039 +#: ../src/xfdesktop-file-utils.c:1046 msgid "The file properties dialog could not be opened" msgstr "O diálogo de propriedades do arquivo não pôde ser aberto" -#: ../src/xfdesktop-file-utils.c:1080 +#: ../src/xfdesktop-file-utils.c:1087 msgid "The file could not be opened" msgstr "O arquivo não pôde ser aberto" -#: ../src/xfdesktop-file-utils.c:1153 ../src/xfdesktop-file-utils.c:1178 +#: ../src/xfdesktop-file-utils.c:1160 ../src/xfdesktop-file-utils.c:1185 #, c-format msgid "Failed to run \"%s\"" msgstr "Falha ao executar \"%s\"" -#: ../src/xfdesktop-file-utils.c:1234 +#: ../src/xfdesktop-file-utils.c:1241 msgid "The application chooser could not be opened" msgstr "O selecionador de aplicativos não pôde ser aberto" -#: ../src/xfdesktop-file-utils.c:1292 ../src/xfdesktop-file-utils.c:1306 -#: ../src/xfdesktop-file-utils.c:1368 ../src/xfdesktop-file-utils.c:1384 +#: ../src/xfdesktop-file-utils.c:1299 ../src/xfdesktop-file-utils.c:1313 +#: ../src/xfdesktop-file-utils.c:1375 ../src/xfdesktop-file-utils.c:1391 msgid "Transfer Error" msgstr "Erro ao transferir" -#: ../src/xfdesktop-file-utils.c:1293 ../src/xfdesktop-file-utils.c:1307 -#: ../src/xfdesktop-file-utils.c:1369 ../src/xfdesktop-file-utils.c:1385 +#: ../src/xfdesktop-file-utils.c:1300 ../src/xfdesktop-file-utils.c:1314 +#: ../src/xfdesktop-file-utils.c:1376 ../src/xfdesktop-file-utils.c:1392 msgid "The file transfer could not be performed" msgstr "A transferência do arquivo não pôde ser realizada" @@ -1002,15 +999,15 @@ msgid "Mount Failed" msgstr "Falha ao montar" -#: ../src/xfdesktop-volume-icon.c:829 +#: ../src/xfdesktop-volume-icon.c:828 msgid "E_ject Volume" msgstr "E_jetar volume" -#: ../src/xfdesktop-volume-icon.c:836 +#: ../src/xfdesktop-volume-icon.c:835 msgid "_Unmount Volume" msgstr "_Desmontar volume" -#: ../src/xfdesktop-volume-icon.c:843 +#: ../src/xfdesktop-volume-icon.c:842 msgid "_Mount Volume" msgstr "_Montar volume" diff -Nru xfdesktop4-4.11.4/po/sv.po xfdesktop4-4.11.5/po/sv.po --- xfdesktop4-4.11.4/po/sv.po 2014-02-10 13:00:18.000000000 +0000 +++ xfdesktop4-4.11.5/po/sv.po 2014-03-25 17:51:09.000000000 +0000 @@ -6,13 +6,15 @@ # Alexander Toresson , 2006 # Daniel Nylander , 2008 # FredN , 2013 +# FredN , 2013 +# PavelNicklasson , 2014 # PavelNicklasson , 2014 msgid "" msgstr "" "Project-Id-Version: Xfdesktop\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2013-12-15 00:31+0100\n" -"PO-Revision-Date: 2014-02-09 21:36+0000\n" +"POT-Creation-Date: 2014-02-24 12:32+0100\n" +"PO-Revision-Date: 2014-03-22 09:37+0000\n" "Last-Translator: PavelNicklasson \n" "Language-Team: Swedish (http://www.transifex.com/projects/p/xfce/language/sv/)\n" "MIME-Version: 1.0\n" @@ -21,37 +23,37 @@ "Language: sv\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -#: ../settings/main.c:372 ../src/xfdesktop-special-file-icon.c:295 +#: ../settings/main.c:375 ../src/xfdesktop-special-file-icon.c:295 #: ../src/xfdesktop-special-file-icon.c:479 msgid "Home" msgstr "Hem" -#: ../settings/main.c:374 +#: ../settings/main.c:377 msgid "Filesystem" msgstr "Filsystem" -#: ../settings/main.c:376 +#: ../settings/main.c:379 msgid "Trash" msgstr "Papperskorg" -#: ../settings/main.c:378 +#: ../settings/main.c:381 msgid "Removable Devices" msgstr "Flyttbara enheter" -#: ../settings/main.c:380 +#: ../settings/main.c:383 msgid "Network Shares" msgstr "Nätverksdelning" -#: ../settings/main.c:382 +#: ../settings/main.c:385 msgid "Disks and Drives" msgstr "Diskar och enheter" -#: ../settings/main.c:384 -msgid "Other Items" -msgstr "Andra objekt" +#: ../settings/main.c:387 +msgid "Other Devices" +msgstr "Andra enheter" #. Display the file name, file type, and file size in the tooltip. -#: ../settings/main.c:497 +#: ../settings/main.c:500 #, c-format msgid "" "%s\n" @@ -59,97 +61,95 @@ "Size: %s" msgstr "%s\nTyp: %s\nStorlek: %s" -#: ../settings/main.c:681 +#: ../settings/main.c:686 #, c-format msgid "Wallpaper for Monitor %d (%s)" msgstr "Bakgrundsbild för monitor %d (%s)" -#: ../settings/main.c:684 +#: ../settings/main.c:689 #, c-format msgid "Wallpaper for Monitor %d" msgstr "Bakgrundsbild för monitor %d" -#: ../settings/main.c:690 -msgid "" -"You are using more than one display, move this dialog to the display you " -"want to edit the settings for." -msgstr "Du använder mer än skärm, flytta den här dialogrutan till den skärm du vill ändra inställningarna för." +#: ../settings/main.c:695 +msgid "Move this dialog to the display you want to edit the settings for." +msgstr "Flytta denna dialogruta till skärmen som du vill ändra inställningar för." -#: ../settings/main.c:698 +#: ../settings/main.c:702 #, c-format msgid "Wallpaper for %s on Monitor %d (%s)" msgstr "Bakgrundsbild för %s på monitor %d (%s)" -#: ../settings/main.c:702 +#: ../settings/main.c:706 #, c-format msgid "Wallpaper for %s on Monitor %d" msgstr "Bakgrundsbild för %s på monitor %d" -#: ../settings/main.c:709 +#: ../settings/main.c:713 msgid "" -"You are using more than one display, move this dialog to the display and " -"workspace you want to edit the settings for." -msgstr "Du använder mer än skärm, flytta den här dialogrutan till den skärm och arbetsyta du vill ändra inställningarna för." +"Move this dialog to the display and workspace you want to edit the settings " +"for." +msgstr "Flytta denna dialog till skärmen och arbetsyta som du vill ändra inställningar för." #. Single monitor and single workspace -#: ../settings/main.c:717 +#: ../settings/main.c:720 #, c-format msgid "Wallpaper for my desktop" msgstr "Bakgrundsbild för mitt skrivbord" #. Single monitor and per workspace wallpaper -#: ../settings/main.c:723 +#: ../settings/main.c:726 #, c-format msgid "Wallpaper for %s" msgstr "Bakgrundsbild för %s" -#: ../settings/main.c:728 +#: ../settings/main.c:731 msgid "Move this dialog to the workspace you want to edit the settings for." msgstr "Flytta den här dialogrutan till den arbetsyta du vill ändra inställningarna för." -#: ../settings/main.c:1131 +#: ../settings/main.c:1134 msgid "Image selection is unavailable while the image style is set to None." msgstr "Bildval är inte tillgängligt när bildstil är satt till Ingen." -#: ../settings/main.c:1483 +#: ../settings/main.c:1481 msgid "Spanning screens" msgstr "Över flera skärmar" -#: ../settings/main.c:1788 +#: ../settings/main.c:1786 msgid "Image files" msgstr "Bildfiler" -#: ../settings/main.c:1945 +#: ../settings/main.c:1958 msgid "Settings manager socket" msgstr "Uttag för inställningshanterare" -#: ../settings/main.c:1945 +#: ../settings/main.c:1958 msgid "SOCKET ID" msgstr "UTTAGS-ID" -#: ../settings/main.c:1946 +#: ../settings/main.c:1959 msgid "Version information" msgstr "Versionsinformation" -#: ../settings/main.c:1973 +#: ../settings/main.c:1986 #, c-format msgid "Type '%s --help' for usage." msgstr "Ange \"%s --help\" för användningsinformation." -#: ../settings/main.c:1985 +#: ../settings/main.c:1998 msgid "The Xfce development team. All rights reserved." msgstr "The Xfce development team. Alla rättigheter reserverade." -#: ../settings/main.c:1986 +#: ../settings/main.c:1999 #, c-format msgid "Please report bugs to <%s>." msgstr "Rapportera fel till <%s>." -#: ../settings/main.c:1993 +#: ../settings/main.c:2006 msgid "Desktop Settings" msgstr "Skrivbordsinställningar" -#: ../settings/main.c:1995 +#: ../settings/main.c:2008 msgid "Unable to contact settings server" msgstr "Kunde inte kontakta inställningsservern" @@ -182,16 +182,16 @@ msgstr "_Mapp:" #: ../settings/xfdesktop-settings-appearance-frame-ui.glade.h:6 -msgid "Choose the folder to select wallpapers from" -msgstr "Välj en katalog att hämta bakgrundsbilder från" +msgid "Choose the folder to select wallpapers from." +msgstr "Välj mapp att välja bakgrunder från." #: ../settings/xfdesktop-settings-appearance-frame-ui.glade.h:7 msgid "St_yle:" msgstr "S_til:" #: ../settings/xfdesktop-settings-appearance-frame-ui.glade.h:8 -msgid "Specify how the image will be resized to fit the screen" -msgstr "Ange hur bilden ska storleksändras för att passa skärmen" +msgid "Specify how the image will be resized to fit the screen." +msgstr "Ange hur bilden ska skalas för att passa skärmen." #: ../settings/xfdesktop-settings-appearance-frame-ui.glade.h:9 #: ../settings/xfdesktop-settings-ui.glade.h:4 @@ -227,20 +227,20 @@ msgstr "F_ärg" #: ../settings/xfdesktop-settings-appearance-frame-ui.glade.h:17 -msgid "Specify the style of the color drawn behind the backdrop image" -msgstr "Ange stilen för färgen som ritas ut bakom bakgrundsbilden" +msgid "Specify the style of the color drawn behind the backdrop image." +msgstr "Ange stilen på färgen som ritas bakom bakgrundsbilden." #: ../settings/xfdesktop-settings-appearance-frame-ui.glade.h:18 -msgid "Specifies the solid color, or the \"left\" or \"top\" color of the gradient" -msgstr "Anger en färg, eller \"vänster\" eller \"övre\" färg av gradienten" +msgid "Specifies the solid color, or the \"left\" or \"top\" color of the gradient." +msgstr "Anger färgen, eller den \"vänstra\" eller \"översta\" färgen i gradienten." #: ../settings/xfdesktop-settings-appearance-frame-ui.glade.h:19 msgid "Select First Color" msgstr "Välj första färgen" #: ../settings/xfdesktop-settings-appearance-frame-ui.glade.h:20 -msgid "Specifies the \"right\" or \"bottom\" color of the gradient" -msgstr "Anger \"höger\" eller \"nedre\" färg av gradienten" +msgid "Specifies the \"right\" or \"bottom\" color of the gradient." +msgstr "Anger den \"högra\" eller \"nedersta\" färgen i gradienten." #: ../settings/xfdesktop-settings-appearance-frame-ui.glade.h:21 msgid "Select Second Color" @@ -260,8 +260,8 @@ msgstr "Välj automatiskt en annan bakgrundsbild från den nuvarande katalogen." #: ../settings/xfdesktop-settings-appearance-frame-ui.glade.h:25 -msgid "Specify how often the background will change" -msgstr "Ange hur ofta bakgrundsbilden ska ändras" +msgid "Specify how often the background will change." +msgstr "Anger hur ofta bakgrunden kommer att ändras." #: ../settings/xfdesktop-settings-appearance-frame-ui.glade.h:26 msgid "in seconds:" @@ -337,7 +337,7 @@ msgid "File/launcher icons" msgstr "Ikoner för filer och programstartare" -#: ../settings/xfdesktop-settings-ui.glade.h:10 ../src/xfce-desktop.c:1010 +#: ../settings/xfdesktop-settings-ui.glade.h:10 ../src/xfce-desktop.c:1015 msgid "Desktop" msgstr "Skrivbord" @@ -516,250 +516,249 @@ msgid "_Remove Workspace '%s'" msgstr "_Ta bort arbetsytan \"%s\"" -#: ../src/xfdesktop-application.c:772 +#: ../src/xfdesktop-application.c:768 msgid "Display version information" msgstr "Visa versionsinformation" -#: ../src/xfdesktop-application.c:773 +#: ../src/xfdesktop-application.c:769 msgid "Reload all settings" msgstr "Läs om alla inställningar" -#: ../src/xfdesktop-application.c:774 +#: ../src/xfdesktop-application.c:770 msgid "Pop up the menu (at the current mouse position)" msgstr "Öppna menyn (vid muspekarens position)" -#: ../src/xfdesktop-application.c:775 +#: ../src/xfdesktop-application.c:771 msgid "Pop up the window list (at the current mouse position)" msgstr "Öppna fönsterlistan (vid muspekarens position)" -#: ../src/xfdesktop-application.c:777 +#: ../src/xfdesktop-application.c:773 msgid "Automatically arrange all the icons on the desktop" msgstr "Ordna alla skrivbordsikoner automatiskt" -#: ../src/xfdesktop-application.c:779 +#: ../src/xfdesktop-application.c:775 msgid "Do not wait for a window manager on startup" msgstr "Vänta inte på att en fönsterhanterare skall starta" -#: ../src/xfdesktop-application.c:780 +#: ../src/xfdesktop-application.c:776 msgid "Cause xfdesktop to quit" msgstr "Gör så att xfdesktop avslutas" -#: ../src/xfdesktop-application.c:795 +#: ../src/xfdesktop-application.c:791 #, c-format msgid "Failed to parse arguments: %s\n" msgstr "Misslyckades med att tolka argument: %s\n" -#: ../src/xfdesktop-application.c:806 +#: ../src/xfdesktop-application.c:802 #, c-format msgid "This is %s version %s, running on Xfce %s.\n" msgstr "Detta är %s version %s, som körs i Xfce %s.\n" -#: ../src/xfdesktop-application.c:808 +#: ../src/xfdesktop-application.c:804 #, c-format msgid "Built with GTK+ %d.%d.%d, linked with GTK+ %d.%d.%d." msgstr "Byggt med GTK+ %d.%d.%d, länkat med GTK+ %d.%d,%d" -#: ../src/xfdesktop-application.c:812 +#: ../src/xfdesktop-application.c:808 #, c-format msgid "Build options:\n" msgstr "Kompileringsflaggor:\n" -#: ../src/xfdesktop-application.c:813 +#: ../src/xfdesktop-application.c:809 #, c-format msgid " Desktop Menu: %s\n" msgstr "Skrivbordsmeny: %s\n" -#: ../src/xfdesktop-application.c:815 ../src/xfdesktop-application.c:822 -#: ../src/xfdesktop-application.c:829 +#: ../src/xfdesktop-application.c:811 ../src/xfdesktop-application.c:818 +#: ../src/xfdesktop-application.c:825 msgid "enabled" msgstr "aktiverad" -#: ../src/xfdesktop-application.c:817 ../src/xfdesktop-application.c:824 -#: ../src/xfdesktop-application.c:831 +#: ../src/xfdesktop-application.c:813 ../src/xfdesktop-application.c:820 +#: ../src/xfdesktop-application.c:827 msgid "disabled" msgstr "inaktiverad" -#: ../src/xfdesktop-application.c:820 +#: ../src/xfdesktop-application.c:816 #, c-format msgid " Desktop Icons: %s\n" msgstr "Skrivbordsikoner: %s\n" -#: ../src/xfdesktop-application.c:827 +#: ../src/xfdesktop-application.c:823 #, c-format msgid " Desktop File Icons: %s\n" msgstr "Skrivbordsikoner för filer: %s\n" -#: ../src/xfdesktop-file-icon-manager.c:578 -#: ../src/xfdesktop-file-icon-manager.c:595 +#: ../src/xfdesktop-file-icon-manager.c:522 +#: ../src/xfdesktop-file-icon-manager.c:539 #, c-format msgid "Could not create the desktop folder \"%s\"" msgstr "Kunde inte skapa skrivbordsmappen \"%s\"" -#: ../src/xfdesktop-file-icon-manager.c:583 -#: ../src/xfdesktop-file-icon-manager.c:600 +#: ../src/xfdesktop-file-icon-manager.c:527 +#: ../src/xfdesktop-file-icon-manager.c:544 msgid "Desktop Folder Error" msgstr "Skrivbordsfel" -#: ../src/xfdesktop-file-icon-manager.c:602 +#: ../src/xfdesktop-file-icon-manager.c:546 msgid "" "A normal file with the same name already exists. Please delete or rename it." msgstr "En vanlig fil med samma namn finns redan. Ta bort eller byt namn på den." -#: ../src/xfdesktop-file-icon-manager.c:685 ../src/xfdesktop-file-utils.c:716 -#: ../src/xfdesktop-file-utils.c:769 +#: ../src/xfdesktop-file-icon-manager.c:629 ../src/xfdesktop-file-utils.c:723 +#: ../src/xfdesktop-file-utils.c:776 msgid "Rename Error" msgstr "Fel vid namnbyte" -#: ../src/xfdesktop-file-icon-manager.c:686 ../src/xfdesktop-file-utils.c:770 +#: ../src/xfdesktop-file-icon-manager.c:630 ../src/xfdesktop-file-utils.c:777 msgid "The files could not be renamed" msgstr "Filerna kunde inte döpas om" -#: ../src/xfdesktop-file-icon-manager.c:687 +#: ../src/xfdesktop-file-icon-manager.c:631 msgid "None of the icons selected support being renamed." msgstr "Ingen av de markerade ikonerna stödjer namnbyte" -#: ../src/xfdesktop-file-icon-manager.c:731 -#: ../src/xfdesktop-file-icon-manager.c:775 ../src/xfdesktop-file-utils.c:869 -#: ../src/xfdesktop-file-utils.c:906 +#: ../src/xfdesktop-file-icon-manager.c:675 +#: ../src/xfdesktop-file-icon-manager.c:719 ../src/xfdesktop-file-utils.c:876 +#: ../src/xfdesktop-file-utils.c:913 msgid "Trash Error" msgstr "Papperskorgsfel" -#: ../src/xfdesktop-file-icon-manager.c:732 -#: ../src/xfdesktop-file-icon-manager.c:776 +#: ../src/xfdesktop-file-icon-manager.c:676 +#: ../src/xfdesktop-file-icon-manager.c:720 msgid "The selected files could not be trashed" msgstr "De markerade filerna kunde inte tas bort" -#: ../src/xfdesktop-file-icon-manager.c:733 -#: ../src/xfdesktop-file-icon-manager.c:777 ../src/xfdesktop-file-utils.c:718 -#: ../src/xfdesktop-file-utils.c:771 ../src/xfdesktop-file-utils.c:821 -#: ../src/xfdesktop-file-utils.c:952 ../src/xfdesktop-file-utils.c:999 -#: ../src/xfdesktop-file-utils.c:1040 ../src/xfdesktop-file-utils.c:1081 -#: ../src/xfdesktop-file-utils.c:1183 ../src/xfdesktop-file-utils.c:1235 -#: ../src/xfdesktop-file-utils.c:1308 ../src/xfdesktop-file-utils.c:1386 +#: ../src/xfdesktop-file-icon-manager.c:677 +#: ../src/xfdesktop-file-icon-manager.c:721 ../src/xfdesktop-file-utils.c:725 +#: ../src/xfdesktop-file-utils.c:778 ../src/xfdesktop-file-utils.c:828 +#: ../src/xfdesktop-file-utils.c:959 ../src/xfdesktop-file-utils.c:1006 +#: ../src/xfdesktop-file-utils.c:1047 ../src/xfdesktop-file-utils.c:1088 +#: ../src/xfdesktop-file-utils.c:1190 ../src/xfdesktop-file-utils.c:1242 +#: ../src/xfdesktop-file-utils.c:1315 ../src/xfdesktop-file-utils.c:1393 msgid "" "This feature requires a file manager service to be present (such as the one " "supplied by Thunar)." msgstr "Den här funktionen kräver att en filhanterartjänst körs (som till exempel den som tillhandahålls av Thunar)." #. printf is to be translator-friendly -#: ../src/xfdesktop-file-icon-manager.c:877 -#: ../src/xfdesktop-file-icon-manager.c:1335 +#: ../src/xfdesktop-file-icon-manager.c:821 +#: ../src/xfdesktop-file-icon-manager.c:1279 #, c-format msgid "Unable to launch \"%s\":" msgstr "Kunde inte starta \"%s\":" -#: ../src/xfdesktop-file-icon-manager.c:879 -#: ../src/xfdesktop-file-icon-manager.c:1140 -#: ../src/xfdesktop-file-icon-manager.c:1336 ../src/xfdesktop-file-utils.c:657 -#: ../src/xfdesktop-file-utils.c:1079 ../src/xfdesktop-file-utils.c:1156 -#: ../src/xfdesktop-file-utils.c:1181 ../src/xfdesktop-file-utils.c:1233 +#: ../src/xfdesktop-file-icon-manager.c:823 +#: ../src/xfdesktop-file-icon-manager.c:1084 +#: ../src/xfdesktop-file-icon-manager.c:1280 ../src/xfdesktop-file-utils.c:664 +#: ../src/xfdesktop-file-utils.c:1086 ../src/xfdesktop-file-utils.c:1163 +#: ../src/xfdesktop-file-utils.c:1188 ../src/xfdesktop-file-utils.c:1240 msgid "Launch Error" msgstr "Startfel" -#: ../src/xfdesktop-file-icon-manager.c:1064 +#: ../src/xfdesktop-file-icon-manager.c:1008 #, c-format msgid "_Open With \"%s\"" msgstr "_Öppna med \"%s\"" -#: ../src/xfdesktop-file-icon-manager.c:1067 +#: ../src/xfdesktop-file-icon-manager.c:1011 #, c-format msgid "Open With \"%s\"" msgstr "Öppna med \"%s\"" -#: ../src/xfdesktop-file-icon-manager.c:1142 +#: ../src/xfdesktop-file-icon-manager.c:1086 msgid "" "Unable to launch \"exo-desktop-item-edit\", which is required to create and " "edit launchers and links on the desktop." msgstr "Kunde inte starta \"exo-desktop-item-edit\", som krävs för att skapa och redigera programstartare och länkar på skrivbordet." -#: ../src/xfdesktop-file-icon-manager.c:1393 +#: ../src/xfdesktop-file-icon-manager.c:1337 msgid "_Open all" msgstr "_Öppna alla" -#: ../src/xfdesktop-file-icon-manager.c:1409 +#: ../src/xfdesktop-file-icon-manager.c:1353 msgid "_Open in New Window" msgstr "_Öppna i nytt fönster" -#: ../src/xfdesktop-file-icon-manager.c:1411 -#: ../src/xfdesktop-special-file-icon.c:547 ../src/xfdesktop-volume-icon.c:810 -#: ../src/xfdesktop-volume-icon.c:814 +#: ../src/xfdesktop-file-icon-manager.c:1355 +#: ../src/xfdesktop-special-file-icon.c:547 ../src/xfdesktop-volume-icon.c:813 msgid "_Open" msgstr "_Öppna" #. create launcher item -#: ../src/xfdesktop-file-icon-manager.c:1430 +#: ../src/xfdesktop-file-icon-manager.c:1374 msgid "Create _Launcher..." msgstr "Skapa _programstartare..." #. create link item -#: ../src/xfdesktop-file-icon-manager.c:1446 +#: ../src/xfdesktop-file-icon-manager.c:1390 msgid "Create _URL Link..." msgstr "Skapa _URL-länk..." #. create folder item -#: ../src/xfdesktop-file-icon-manager.c:1462 +#: ../src/xfdesktop-file-icon-manager.c:1406 msgid "Create _Folder..." msgstr "Skapa _katalog..." -#: ../src/xfdesktop-file-icon-manager.c:1477 +#: ../src/xfdesktop-file-icon-manager.c:1421 msgid "Create From _Template" msgstr "Skapa från _mall" -#: ../src/xfdesktop-file-icon-manager.c:1506 +#: ../src/xfdesktop-file-icon-manager.c:1450 msgid "_Empty File" msgstr "_Tom fil" -#: ../src/xfdesktop-file-icon-manager.c:1523 +#: ../src/xfdesktop-file-icon-manager.c:1467 msgid "_Execute" msgstr "_Kör" -#: ../src/xfdesktop-file-icon-manager.c:1543 +#: ../src/xfdesktop-file-icon-manager.c:1487 msgid "_Edit Launcher" msgstr "_Redigera programstartare" -#: ../src/xfdesktop-file-icon-manager.c:1578 +#: ../src/xfdesktop-file-icon-manager.c:1522 msgid "Open With" msgstr "Öppna med" -#: ../src/xfdesktop-file-icon-manager.c:1604 +#: ../src/xfdesktop-file-icon-manager.c:1548 msgid "Open With Other _Application..." msgstr "Öppna med ett annat _program..." #. Rename -#: ../src/xfdesktop-file-icon-manager.c:1704 +#: ../src/xfdesktop-file-icon-manager.c:1651 msgid "_Rename..." msgstr "_Byt namn..." -#: ../src/xfdesktop-file-icon-manager.c:1732 +#: ../src/xfdesktop-file-icon-manager.c:1679 msgid "Arrange Desktop _Icons" msgstr "Ordna skrivbordsikoner" -#: ../src/xfdesktop-file-icon-manager.c:1743 +#: ../src/xfdesktop-file-icon-manager.c:1690 msgid "Desktop _Settings..." msgstr "S_krivbordsinställningar..." -#: ../src/xfdesktop-file-icon-manager.c:1754 -#: ../src/xfdesktop-volume-icon.c:856 +#: ../src/xfdesktop-file-icon-manager.c:1701 +#: ../src/xfdesktop-volume-icon.c:855 msgid "P_roperties..." msgstr "_Egenskaper..." -#: ../src/xfdesktop-file-icon-manager.c:2744 +#: ../src/xfdesktop-file-icon-manager.c:2716 msgid "Load Error" msgstr "Inläsningsfel" -#: ../src/xfdesktop-file-icon-manager.c:2746 +#: ../src/xfdesktop-file-icon-manager.c:2718 msgid "Failed to load the desktop folder" msgstr "Misslyckades med att läsa in skrivbordskatalogen" -#: ../src/xfdesktop-file-icon-manager.c:3286 +#: ../src/xfdesktop-file-icon-manager.c:3262 msgid "Copy _Here" msgstr "Kopiera _hit" -#: ../src/xfdesktop-file-icon-manager.c:3286 +#: ../src/xfdesktop-file-icon-manager.c:3262 msgid "_Move Here" msgstr "_Flytta hit" -#: ../src/xfdesktop-file-icon-manager.c:3286 +#: ../src/xfdesktop-file-icon-manager.c:3262 msgid "_Link Here" msgstr "_Länka hit" @@ -792,88 +791,88 @@ msgid "Unknown" msgstr "Okänd" -#: ../src/xfdesktop-file-utils.c:658 +#: ../src/xfdesktop-file-utils.c:665 msgid "The folder could not be opened" msgstr "Mappen kunde inte öppnas" -#: ../src/xfdesktop-file-utils.c:675 +#: ../src/xfdesktop-file-utils.c:682 msgid "Error" msgstr "Fel" -#: ../src/xfdesktop-file-utils.c:676 +#: ../src/xfdesktop-file-utils.c:683 msgid "The requested operation could not be completed" msgstr "Den valda åtgärden kunde inte genomföras" -#: ../src/xfdesktop-file-utils.c:717 +#: ../src/xfdesktop-file-utils.c:724 msgid "The file could not be renamed" msgstr "Kunde inte byta namn på filen" -#: ../src/xfdesktop-file-utils.c:819 +#: ../src/xfdesktop-file-utils.c:826 msgid "Delete Error" msgstr "Fel vid borttagning" -#: ../src/xfdesktop-file-utils.c:820 +#: ../src/xfdesktop-file-utils.c:827 msgid "The selected files could not be deleted" msgstr "De markerade filerna kunde inte tas bort" -#: ../src/xfdesktop-file-utils.c:870 +#: ../src/xfdesktop-file-utils.c:877 msgid "The selected files could not be moved to the trash" msgstr "De markerade filerna kunde inte flyttas till papperskorgen" -#: ../src/xfdesktop-file-utils.c:871 ../src/xfdesktop-file-utils.c:908 +#: ../src/xfdesktop-file-utils.c:878 ../src/xfdesktop-file-utils.c:915 msgid "" "This feature requires a trash service to be present (such as the one " "supplied by Thunar)." msgstr "Den här funktionen kräver att att en papperskorgstjänst körs (som till exempel den som tillhandahålls av Thunar)." -#: ../src/xfdesktop-file-utils.c:907 +#: ../src/xfdesktop-file-utils.c:914 msgid "Could not empty the trash" msgstr "Kunde inte tömma papperskorgen" -#: ../src/xfdesktop-file-utils.c:950 +#: ../src/xfdesktop-file-utils.c:957 msgid "Create File Error" msgstr "Fel vid borttagning av fil" -#: ../src/xfdesktop-file-utils.c:951 +#: ../src/xfdesktop-file-utils.c:958 msgid "Could not create a new file" msgstr "Kunde inte skapa en ny fil" -#: ../src/xfdesktop-file-utils.c:997 +#: ../src/xfdesktop-file-utils.c:1004 msgid "Create Document Error" msgstr "Fel vid skapande av dokument" -#: ../src/xfdesktop-file-utils.c:998 +#: ../src/xfdesktop-file-utils.c:1005 msgid "Could not create a new document from the template" msgstr "Kunde inte skapa ett nytt dokument från mallen" -#: ../src/xfdesktop-file-utils.c:1038 +#: ../src/xfdesktop-file-utils.c:1045 msgid "File Properties Error" msgstr "Fel i filegenskaper" -#: ../src/xfdesktop-file-utils.c:1039 +#: ../src/xfdesktop-file-utils.c:1046 msgid "The file properties dialog could not be opened" msgstr "Dialogrutan för filegenskaper kunde inte öppnas" -#: ../src/xfdesktop-file-utils.c:1080 +#: ../src/xfdesktop-file-utils.c:1087 msgid "The file could not be opened" msgstr "Filen kunde inte öppnas" -#: ../src/xfdesktop-file-utils.c:1153 ../src/xfdesktop-file-utils.c:1178 +#: ../src/xfdesktop-file-utils.c:1160 ../src/xfdesktop-file-utils.c:1185 #, c-format msgid "Failed to run \"%s\"" msgstr "Misslyckades med att köra \"%s\"" -#: ../src/xfdesktop-file-utils.c:1234 +#: ../src/xfdesktop-file-utils.c:1241 msgid "The application chooser could not be opened" msgstr "Programväljaren kunde inte öppnas" -#: ../src/xfdesktop-file-utils.c:1292 ../src/xfdesktop-file-utils.c:1306 -#: ../src/xfdesktop-file-utils.c:1368 ../src/xfdesktop-file-utils.c:1384 +#: ../src/xfdesktop-file-utils.c:1299 ../src/xfdesktop-file-utils.c:1313 +#: ../src/xfdesktop-file-utils.c:1375 ../src/xfdesktop-file-utils.c:1391 msgid "Transfer Error" msgstr "Överföringsfel" -#: ../src/xfdesktop-file-utils.c:1293 ../src/xfdesktop-file-utils.c:1307 -#: ../src/xfdesktop-file-utils.c:1369 ../src/xfdesktop-file-utils.c:1385 +#: ../src/xfdesktop-file-utils.c:1300 ../src/xfdesktop-file-utils.c:1314 +#: ../src/xfdesktop-file-utils.c:1376 ../src/xfdesktop-file-utils.c:1392 msgid "The file transfer could not be performed" msgstr "Filöverföringen kunde inte genomföras" @@ -997,15 +996,15 @@ msgid "Mount Failed" msgstr "Montering misslyckades" -#: ../src/xfdesktop-volume-icon.c:829 +#: ../src/xfdesktop-volume-icon.c:828 msgid "E_ject Volume" msgstr "Mata _ut volym" -#: ../src/xfdesktop-volume-icon.c:836 +#: ../src/xfdesktop-volume-icon.c:835 msgid "_Unmount Volume" msgstr "Avmontera volym" -#: ../src/xfdesktop-volume-icon.c:843 +#: ../src/xfdesktop-volume-icon.c:842 msgid "_Mount Volume" msgstr "_Montera volym" diff -Nru xfdesktop4-4.11.4/settings/main.c xfdesktop4-4.11.5/settings/main.c --- xfdesktop4-4.11.4/settings/main.c 2014-03-14 17:50:13.000000000 +0000 +++ xfdesktop4-4.11.5/settings/main.c 2014-03-30 07:38:48.000000000 +0000 @@ -87,6 +87,7 @@ { GtkTreeModel *model; GtkTreeIter *iter; + GdkPixbuf *pix; } PreviewData; typedef struct @@ -169,13 +170,50 @@ const gchar* property); static gchar *xfdesktop_settings_get_backdrop_image(AppearancePanel *panel); + + static void -xfdesktop_settings_do_single_preview(GtkTreeModel *model, - GtkTreeIter *iter) +xfdesktop_settings_free_pdata(gpointer data) { + PreviewData *pdata = data; + + g_object_unref(pdata->model); + + gtk_tree_iter_free(pdata->iter); + + if(pdata->pix) + g_object_unref(pdata->pix); + + g_free(pdata); +} + +static gboolean +list_store_set(PreviewData *pdata) +{ + g_return_val_if_fail(pdata, FALSE); + + gtk_list_store_set(GTK_LIST_STORE(pdata->model), pdata->iter, + COL_PIX, pdata->pix, + -1); + + xfdesktop_settings_free_pdata(pdata); + + return FALSE; +} + +static void +xfdesktop_settings_do_single_preview(PreviewData *pdata) +{ + GtkTreeModel *model; + GtkTreeIter *iter; gchar *filename = NULL, *thumbnail = NULL; GdkPixbuf *pix; + g_return_if_fail(pdata); + + model = pdata->model; + iter = pdata->iter; + gtk_tree_model_get(model, iter, COL_FILENAME, &filename, COL_THUMBNAIL, &thumbnail, @@ -197,23 +235,15 @@ g_free(filename); if(pix) { - gtk_list_store_set(GTK_LIST_STORE(model), iter, - COL_PIX, pix, - -1); + pdata->pix = pix; - g_object_unref(G_OBJECT(pix)); + /* We must add the images to the list in the main thread */ + g_main_context_invoke(NULL, (GSourceFunc)list_store_set, pdata); + } else { + xfdesktop_settings_free_pdata(pdata); } } -static void -xfdesktop_settings_free_pdata(gpointer data) -{ - PreviewData *pdata = data; - g_object_unref(G_OBJECT(pdata->model)); - gtk_tree_iter_free(pdata->iter); - g_free(pdata); -} - static gpointer xfdesktop_settings_create_previews(gpointer data) { @@ -225,9 +255,7 @@ /* Block and wait for another preview to create */ pdata = g_async_queue_pop(panel->preview_queue); - xfdesktop_settings_do_single_preview(pdata->model, pdata->iter); - - xfdesktop_settings_free_pdata(pdata); + xfdesktop_settings_do_single_preview(pdata); } return NULL; @@ -293,6 +321,7 @@ pdata = g_new0(PreviewData, 1); pdata->model = g_object_ref(G_OBJECT(model)); pdata->iter = gtk_tree_iter_copy(&iter); + pdata->pix = NULL; /* Create the preview image */ xfdesktop_settings_add_file_to_queue(panel, pdata); @@ -1953,7 +1982,7 @@ gint width, height; /* don't save the state for full-screen windows */ - state = gdk_window_get_state(GTK_WIDGET(dialog)->window); + state = gdk_window_get_state(gtk_widget_get_window(dialog)); if ((state & (GDK_WINDOW_STATE_MAXIMIZED | GDK_WINDOW_STATE_FULLSCREEN)) == 0) { /* save window size */ diff -Nru xfdesktop4-4.11.4/src/xfce-backdrop.c xfdesktop4-4.11.5/src/xfce-backdrop.c --- xfdesktop4-4.11.4/src/xfce-backdrop.c 2014-02-26 06:58:42.000000000 +0000 +++ xfdesktop4-4.11.5/src/xfce-backdrop.c 2014-03-30 07:38:48.000000000 +0000 @@ -363,8 +363,13 @@ backdrop->priv->image_files = list_image_files_in_dir(backdrop->priv->image_path); - if(backdrop->priv->monitor) + if(backdrop->priv->monitor) { + g_signal_handlers_disconnect_by_func(G_OBJECT(backdrop->priv->monitor), + G_CALLBACK(cb_xfce_backdrop__image_files_changed), + backdrop); + g_object_unref(backdrop->priv->monitor); + } /* monitor the new directory for changes */ backdrop->priv->monitor = g_file_monitor(gfile, G_FILE_MONITOR_NONE, NULL, NULL); @@ -637,6 +642,15 @@ xfce_backdrop_clear_cached_image(backdrop); + if(backdrop->priv->monitor) { + g_signal_handlers_disconnect_by_func(G_OBJECT(backdrop->priv->monitor), + G_CALLBACK(cb_xfce_backdrop__image_files_changed), + backdrop); + + g_object_unref(backdrop->priv->monitor); + backdrop->priv->monitor = NULL; + } + /* Free the image files list */ if(backdrop->priv->image_files) { g_list_free_full(backdrop->priv->image_files, g_free); @@ -999,6 +1013,16 @@ if(g_strcmp0(old_dir, new_dir) != 0) { g_list_free_full(backdrop->priv->image_files, g_free); backdrop->priv->image_files = NULL; + + /* release the directory monitor */ + if(backdrop->priv->monitor) { + g_signal_handlers_disconnect_by_func(G_OBJECT(backdrop->priv->monitor), + G_CALLBACK(cb_xfce_backdrop__image_files_changed), + backdrop); + + g_object_unref(backdrop->priv->monitor); + backdrop->priv->monitor = NULL; + } } g_free(old_dir); @@ -1018,7 +1042,7 @@ g_signal_emit(G_OBJECT(backdrop), backdrop_signals[BACKDROP_CHANGED], 0); } -G_CONST_RETURN gchar * +const gchar * xfce_backdrop_get_image_filename(XfceBackdrop *backdrop) { g_return_val_if_fail(XFCE_IS_BACKDROP(backdrop), NULL); diff -Nru xfdesktop4-4.11.4/src/xfce-backdrop.h xfdesktop4-4.11.5/src/xfce-backdrop.h --- xfdesktop4-4.11.4/src/xfce-backdrop.h 2013-11-13 06:36:11.000000000 +0000 +++ xfdesktop4-4.11.5/src/xfce-backdrop.h 2014-03-30 07:38:48.000000000 +0000 @@ -123,7 +123,7 @@ void xfce_backdrop_set_image_filename (XfceBackdrop *backdrop, const gchar *filename); -G_CONST_RETURN gchar *xfce_backdrop_get_image_filename +const gchar *xfce_backdrop_get_image_filename (XfceBackdrop *backdrop); void xfce_backdrop_set_cycle_backdrop (XfceBackdrop *backdrop, diff -Nru xfdesktop4-4.11.4/src/xfce-desktop.c xfdesktop4-4.11.5/src/xfce-desktop.c --- xfdesktop4-4.11.4/src/xfce-desktop.c 2014-03-17 17:26:07.000000000 +0000 +++ xfdesktop4-4.11.5/src/xfce-desktop.c 2014-03-27 15:54:30.000000000 +0000 @@ -114,6 +114,7 @@ gboolean icons_font_size_set; guint icons_font_size; guint icons_size; + gint style_refresh_timer; GtkWidget *icon_view; gdouble system_font_size; #endif @@ -839,7 +840,7 @@ g_param_spec_uint("icon-size", "icon size", "icon size", - 8, 192, 36, + 8, 192, DEFAULT_ICON_SIZE, XFDESKTOP_PARAM_FLAGS)); g_object_class_install_property(gobject_class, PROP_ICON_FONT_SIZE, @@ -898,6 +899,9 @@ g_object_unref(G_OBJECT(desktop->priv->channel)); g_free(desktop->priv->property_prefix); + if(desktop->priv->style_refresh_timer != 0) + g_source_remove(desktop->priv->style_refresh_timer); + G_OBJECT_CLASS(xfce_desktop_parent_class)->finalize(object); } @@ -1255,8 +1259,8 @@ return TRUE; } -static void -xfce_desktop_style_set(GtkWidget *w, GtkStyle *old_style) +static gboolean +style_refresh_cb(gpointer *w) { XfceDesktop *desktop = XFCE_DESKTOP(w); #ifdef ENABLE_DESKTOP_ICONS @@ -1265,13 +1269,15 @@ TRACE("entering"); - g_return_if_fail(XFCE_IS_DESKTOP(desktop)); + desktop->priv->style_refresh_timer = 0; + + g_return_val_if_fail(XFCE_IS_DESKTOP(desktop), FALSE); if(!gtk_widget_get_realized(GTK_WIDGET(desktop))) - return; + return FALSE; if(desktop->priv->workspaces == NULL) - return; + return FALSE; if(GDK_IS_WINDOW(desktop->priv->bg_pixmap)) gdk_window_set_back_pixmap(gtk_widget_get_window(GTK_WIDGET(desktop)), desktop->priv->bg_pixmap, FALSE); @@ -1280,7 +1286,7 @@ #ifdef ENABLE_DESKTOP_ICONS if(!desktop->priv->icon_view || !XFDESKTOP_IS_ICON_VIEW(desktop->priv->icon_view)) - return; + return FALSE; /* reset the icon view style */ gtk_widget_set_style(desktop->priv->icon_view, NULL); @@ -1294,6 +1300,26 @@ desktop->priv->system_font_size); } #endif + + return FALSE; +} + +static void +xfce_desktop_style_set(GtkWidget *w, GtkStyle *old_style) +{ + XfceDesktop *desktop = XFCE_DESKTOP(w); + + TRACE("entering"); + + if(desktop->priv->style_refresh_timer != 0) + g_source_remove(desktop->priv->style_refresh_timer); + + desktop->priv->style_refresh_timer = g_idle_add_full(G_PRIORITY_LOW, + (GSourceFunc)style_refresh_cb, + w, + NULL); + + GTK_WIDGET_CLASS(xfce_desktop_parent_class)->style_set(w, old_style); } static void diff -Nru xfdesktop4-4.11.4/src/xfdesktop-file-utils.c xfdesktop4-4.11.5/src/xfdesktop-file-utils.c --- xfdesktop4-4.11.4/src/xfdesktop-file-utils.c 2014-02-04 16:04:46.000000000 +0000 +++ xfdesktop4-4.11.5/src/xfdesktop-file-utils.c 2014-03-30 17:33:25.000000000 +0000 @@ -781,54 +781,38 @@ } } +static void +delete_files(gpointer data, gpointer user_data) +{ + if(data == NULL) + return; + + if(!G_IS_FILE(data)) + return; + + g_file_delete_async(G_FILE(data), G_PRIORITY_DEFAULT, NULL, NULL, NULL); +} + +static void +trash_files(gpointer data, gpointer user_data) +{ + if(data == NULL) + return; + + if(!G_IS_FILE(data)) + return; + + g_file_trash_async(G_FILE(data), G_PRIORITY_DEFAULT, NULL, NULL, NULL); +} + void xfdesktop_file_utils_unlink_files(GList *files, GdkScreen *screen, GtkWindow *parent) { - DBusGProxy *fileman_proxy; - g_return_if_fail(files != NULL && G_IS_FILE(files->data)); - g_return_if_fail(GDK_IS_SCREEN(screen) || GTK_IS_WINDOW(parent)); - - if(!screen) - screen = gtk_widget_get_screen(GTK_WIDGET(parent)); - fileman_proxy = xfdesktop_file_utils_peek_filemanager_proxy(); - if(fileman_proxy) { - guint nfiles = g_list_length(files); - gchar **uris = g_new0(gchar *, nfiles+1); - gchar *display_name = gdk_screen_make_display_name(screen); - gchar *startup_id = g_strdup_printf("_TIME%d", gtk_get_current_event_time()); - GList *lp; - gint n; - - /* convert GFile list into an array of URIs */ - for(n = 0, lp = files; lp != NULL; ++n, lp = lp->next) - uris[n] = g_file_get_uri(lp->data); - uris[n] = NULL; - - xfdesktop_file_utils_set_window_cursor(parent, GDK_WATCH); - - xfdesktop_file_manager_proxy_unlink_files_async(fileman_proxy, - NULL, (const gchar **)uris, - display_name, startup_id, - (xfdesktop_file_manager_proxy_unlink_files_reply)xfdesktop_file_utils_async_cb, - parent); - - xfdesktop_file_utils_set_window_cursor(parent, GDK_LEFT_PTR); - - g_free(startup_id); - g_strfreev(uris); - g_free(display_name); - } else { - xfce_message_dialog(parent, - _("Delete Error"), GTK_STOCK_DIALOG_ERROR, - _("The selected files could not be deleted"), - _("This feature requires a file manager service to " - "be present (such as the one supplied by Thunar)."), - GTK_STOCK_CLOSE, GTK_RESPONSE_ACCEPT, NULL); - } + g_list_foreach(files, (GFunc)delete_files, NULL); } void @@ -836,49 +820,9 @@ GdkScreen *screen, GtkWindow *parent) { - DBusGProxy *trash_proxy; - g_return_if_fail(files != NULL && G_IS_FILE(files->data)); - g_return_if_fail(GDK_IS_SCREEN(screen) || GTK_IS_WINDOW(parent)); - if(!screen) - screen = gtk_widget_get_screen(GTK_WIDGET(parent)); - - trash_proxy = xfdesktop_file_utils_peek_trash_proxy(); - if(trash_proxy) { - guint nfiles = g_list_length(files); - gchar **uris = g_new0(gchar *, nfiles+1); - gchar *display_name = gdk_screen_make_display_name(screen); - gchar *startup_id = g_strdup_printf("_TIME%d", gtk_get_current_event_time()); - GList *lp; - gint n; - - /* convert GFile list into an array of URIs */ - for(n = 0, lp = files; lp != NULL; ++n, lp = lp->next) - uris[n] = g_file_get_uri(lp->data); - uris[n] = NULL; - - xfdesktop_file_utils_set_window_cursor(parent, GDK_WATCH); - - xfdesktop_trash_proxy_move_to_trash_async(trash_proxy, - (const gchar **)uris, - display_name, startup_id, - (xfdesktop_trash_proxy_move_to_trash_reply)xfdesktop_file_utils_async_cb, - parent); - - xfdesktop_file_utils_set_window_cursor(parent, GDK_LEFT_PTR); - - g_free(startup_id); - g_strfreev(uris); - g_free(display_name); - } else { - xfce_message_dialog(parent, - _("Trash Error"), GTK_STOCK_DIALOG_ERROR, - _("The selected files could not be moved to the trash"), - _("This feature requires a trash service to " - "be present (such as the one supplied by Thunar)."), - GTK_STOCK_CLOSE, GTK_RESPONSE_ACCEPT, NULL); - } + g_list_foreach(files, (GFunc)trash_files, NULL); } void diff -Nru xfdesktop4-4.11.4/src/xfdesktop-icon.c xfdesktop4-4.11.5/src/xfdesktop-icon.c --- xfdesktop4-4.11.4/src/xfdesktop-icon.c 2014-02-11 08:35:31.000000000 +0000 +++ xfdesktop4-4.11.5/src/xfdesktop-icon.c 2014-03-30 07:38:48.000000000 +0000 @@ -218,7 +218,7 @@ } /*< required >*/ -G_CONST_RETURN gchar * +const gchar * xfdesktop_icon_peek_label(XfdesktopIcon *icon) { XfdesktopIconClass *klass; @@ -323,7 +323,7 @@ } /*< optional >*/ -G_CONST_RETURN gchar * +const gchar * xfdesktop_icon_peek_tooltip(XfdesktopIcon *icon) { XfdesktopIconClass *klass; diff -Nru xfdesktop4-4.11.4/src/xfdesktop-icon.h xfdesktop4-4.11.5/src/xfdesktop-icon.h --- xfdesktop4-4.11.4/src/xfdesktop-icon.h 2014-02-11 08:35:31.000000000 +0000 +++ xfdesktop4-4.11.5/src/xfdesktop-icon.h 2014-03-30 07:38:48.000000000 +0000 @@ -64,7 +64,7 @@ /*< virtual functions >*/ GdkPixbuf *(*peek_pixbuf)(XfdesktopIcon *icon, gint width, gint height); - G_CONST_RETURN gchar *(*peek_label)(XfdesktopIcon *icon); + const gchar *(*peek_label)(XfdesktopIcon *icon); GdkDragAction (*get_allowed_drag_actions)(XfdesktopIcon *icon); @@ -72,7 +72,7 @@ gboolean (*do_drop_dest)(XfdesktopIcon *icon, XfdesktopIcon *src_icon, GdkDragAction action); GdkPixbuf *(*peek_tooltip_pixbuf)(XfdesktopIcon *icon, gint width, gint height); - G_CONST_RETURN gchar *(*peek_tooltip)(XfdesktopIcon *icon); + const gchar *(*peek_tooltip)(XfdesktopIcon *icon); gchar *(*get_identifier)(XfdesktopIcon *icon); @@ -90,11 +90,11 @@ GdkPixbuf *xfdesktop_icon_peek_pixbuf(XfdesktopIcon *icon, gint width, gint height); -G_CONST_RETURN gchar *xfdesktop_icon_peek_label(XfdesktopIcon *icon); +const gchar *xfdesktop_icon_peek_label(XfdesktopIcon *icon); GdkPixbuf *xfdesktop_icon_peek_tooltip_pixbuf(XfdesktopIcon *icon, gint width, gint height); -G_CONST_RETURN gchar *xfdesktop_icon_peek_tooltip(XfdesktopIcon *icon); +const gchar *xfdesktop_icon_peek_tooltip(XfdesktopIcon *icon); /* returns a unique identifier for the icon, free when done using it */ gchar *xfdesktop_icon_get_identifier(XfdesktopIcon *icon); diff -Nru xfdesktop4-4.11.4/src/xfdesktop-icon-view.c xfdesktop4-4.11.5/src/xfdesktop-icon-view.c --- xfdesktop4-4.11.4/src/xfdesktop-icon-view.c 2014-03-17 17:26:07.000000000 +0000 +++ xfdesktop4-4.11.5/src/xfdesktop-icon-view.c 2014-03-25 17:51:19.000000000 +0000 @@ -3040,9 +3040,6 @@ { cairo_save(cr); - gdk_cairo_rectangle(cr, rect); - cairo_clip(cr); - gdk_cairo_set_source_pixbuf(cr, pix, rect->x, rect->y); cairo_paint(cr); diff -Nru xfdesktop4-4.11.4/src/xfdesktop-regular-file-icon.c xfdesktop4-4.11.5/src/xfdesktop-regular-file-icon.c --- xfdesktop4-4.11.4/src/xfdesktop-regular-file-icon.c 2014-03-14 17:50:17.000000000 +0000 +++ xfdesktop4-4.11.5/src/xfdesktop-regular-file-icon.c 2014-03-30 07:38:48.000000000 +0000 @@ -79,11 +79,11 @@ static GdkPixbuf *xfdesktop_regular_file_icon_peek_pixbuf(XfdesktopIcon *icon, gint width, gint height); -static G_CONST_RETURN gchar *xfdesktop_regular_file_icon_peek_label(XfdesktopIcon *icon); +static const gchar *xfdesktop_regular_file_icon_peek_label(XfdesktopIcon *icon); static gchar *xfdesktop_regular_file_icon_get_identifier(XfdesktopIcon *icon); static GdkPixbuf *xfdesktop_regular_file_icon_peek_tooltip_pixbuf(XfdesktopIcon *icon, gint width, gint height); -static G_CONST_RETURN gchar *xfdesktop_regular_file_icon_peek_tooltip(XfdesktopIcon *icon); +static const gchar *xfdesktop_regular_file_icon_peek_tooltip(XfdesktopIcon *icon); static GdkDragAction xfdesktop_regular_file_icon_get_allowed_drag_actions(XfdesktopIcon *icon); static GdkDragAction xfdesktop_regular_file_icon_get_allowed_drop_actions(XfdesktopIcon *icon, GdkDragAction *suggested_action); @@ -525,7 +525,7 @@ return tooltip_pix; } -static G_CONST_RETURN gchar * +static const gchar * xfdesktop_regular_file_icon_peek_label(XfdesktopIcon *icon) { XfdesktopRegularFileIcon *regular_file_icon = XFDESKTOP_REGULAR_FILE_ICON(icon); @@ -697,7 +697,7 @@ return result; } -static G_CONST_RETURN gchar * +static const gchar * xfdesktop_regular_file_icon_peek_tooltip(XfdesktopIcon *icon) { XfdesktopRegularFileIcon *regular_file_icon = XFDESKTOP_REGULAR_FILE_ICON(icon); diff -Nru xfdesktop4-4.11.4/src/xfdesktop-special-file-icon.c xfdesktop4-4.11.5/src/xfdesktop-special-file-icon.c --- xfdesktop4-4.11.4/src/xfdesktop-special-file-icon.c 2013-12-14 19:05:40.000000000 +0000 +++ xfdesktop4-4.11.5/src/xfdesktop-special-file-icon.c 2014-03-31 17:27:02.000000000 +0000 @@ -70,11 +70,11 @@ static GdkPixbuf *xfdesktop_special_file_icon_peek_pixbuf(XfdesktopIcon *icon, gint width, gint height); -static G_CONST_RETURN gchar *xfdesktop_special_file_icon_peek_label(XfdesktopIcon *icon); +static const gchar *xfdesktop_special_file_icon_peek_label(XfdesktopIcon *icon); static gchar *xfdesktop_special_file_icon_get_identifier(XfdesktopIcon *icon); static GdkPixbuf *xfdesktop_special_file_icon_peek_tooltip_pixbuf(XfdesktopIcon *icon, gint width, gint height); -static G_CONST_RETURN gchar *xfdesktop_special_file_icon_peek_tooltip(XfdesktopIcon *icon); +static const gchar *xfdesktop_special_file_icon_peek_tooltip(XfdesktopIcon *icon); static GdkDragAction xfdesktop_special_file_icon_get_allowed_drag_actions(XfdesktopIcon *icon); static GdkDragAction xfdesktop_special_file_icon_get_allowed_drop_actions(XfdesktopIcon *icon, GdkDragAction *suggested_action); @@ -285,7 +285,7 @@ return tooltip_pix; } -static G_CONST_RETURN gchar * +static const gchar * xfdesktop_special_file_icon_peek_label(XfdesktopIcon *icon) { XfdesktopSpecialFileIcon *special_file_icon = XFDESKTOP_SPECIAL_FILE_ICON(icon); @@ -446,7 +446,7 @@ return result; } -static G_CONST_RETURN gchar * +static const gchar * xfdesktop_special_file_icon_peek_tooltip(XfdesktopIcon *icon) { XfdesktopSpecialFileIcon *special_file_icon = XFDESKTOP_SPECIAL_FILE_ICON(icon); @@ -608,6 +608,12 @@ g_return_if_fail(G_IS_FILE(file)); g_return_if_fail(XFDESKTOP_IS_SPECIAL_FILE_ICON(special_file_icon)); + /* We don't care about change events only created/deleted */ + if(event == G_FILE_MONITOR_EVENT_CHANGED || + event == G_FILE_MONITOR_EVENT_ATTRIBUTE_CHANGED || + event == G_FILE_MONITOR_EVENT_CHANGES_DONE_HINT) + return; + /* release the old file information */ if(special_file_icon->priv->file_info) { g_object_unref(special_file_icon->priv->file_info); diff -Nru xfdesktop4-4.11.4/src/xfdesktop-volume-icon.c xfdesktop4-4.11.5/src/xfdesktop-volume-icon.c --- xfdesktop4-4.11.4/src/xfdesktop-volume-icon.c 2014-01-25 05:48:02.000000000 +0000 +++ xfdesktop4-4.11.5/src/xfdesktop-volume-icon.c 2014-03-30 07:38:48.000000000 +0000 @@ -76,11 +76,11 @@ static GdkPixbuf *xfdesktop_volume_icon_peek_pixbuf(XfdesktopIcon *icon, gint width, gint height); -static G_CONST_RETURN gchar *xfdesktop_volume_icon_peek_label(XfdesktopIcon *icon); +static const gchar *xfdesktop_volume_icon_peek_label(XfdesktopIcon *icon); static gchar *xfdesktop_volume_icon_get_identifier(XfdesktopIcon *icon); static GdkPixbuf *xfdesktop_volume_icon_peek_tooltip_pixbuf(XfdesktopIcon *icon, gint width, gint height); -static G_CONST_RETURN gchar *xfdesktop_volume_icon_peek_tooltip(XfdesktopIcon *icon); +static const gchar *xfdesktop_volume_icon_peek_tooltip(XfdesktopIcon *icon); static GdkDragAction xfdesktop_volume_icon_get_allowed_drag_actions(XfdesktopIcon *icon); static GdkDragAction xfdesktop_volume_icon_get_allowed_drop_actions(XfdesktopIcon *icon, GdkDragAction *suggested_action); @@ -306,7 +306,7 @@ return tooltip_pix; } -G_CONST_RETURN gchar * +const gchar * xfdesktop_volume_icon_peek_label(XfdesktopIcon *icon) { XfdesktopVolumeIcon *volume_icon = XFDESKTOP_VOLUME_ICON(icon); @@ -456,7 +456,7 @@ return result; } -static G_CONST_RETURN gchar * +static const gchar * xfdesktop_volume_icon_peek_tooltip(XfdesktopIcon *icon) { XfdesktopVolumeIcon *volume_icon = XFDESKTOP_VOLUME_ICON(icon); diff -Nru xfdesktop4-4.11.4/src/xfdesktop-window-icon.c xfdesktop4-4.11.5/src/xfdesktop-window-icon.c --- xfdesktop4-4.11.4/src/xfdesktop-window-icon.c 2014-02-11 08:35:31.000000000 +0000 +++ xfdesktop4-4.11.5/src/xfdesktop-window-icon.c 2014-03-30 07:38:48.000000000 +0000 @@ -43,7 +43,7 @@ static GdkPixbuf *xfdesktop_window_icon_peek_pixbuf(XfdesktopIcon *icon, gint width, gint height); -static G_CONST_RETURN gchar *xfdesktop_window_icon_peek_label(XfdesktopIcon *icon); +static const gchar *xfdesktop_window_icon_peek_label(XfdesktopIcon *icon); static gchar *xfdesktop_window_icon_get_identifier(XfdesktopIcon *icon); static gboolean xfdesktop_window_icon_activated(XfdesktopIcon *icon); @@ -156,7 +156,7 @@ return pix; } -static G_CONST_RETURN gchar * +static const gchar * xfdesktop_window_icon_peek_label(XfdesktopIcon *icon) { XfdesktopWindowIcon *window_icon = XFDESKTOP_WINDOW_ICON(icon);