diff -Nru xfdesktop4-4.11.6/aclocal.m4 xfdesktop4-4.19.2/aclocal.m4 --- xfdesktop4-4.11.6/aclocal.m4 2014-04-07 10:24:07.000000000 +0000 +++ xfdesktop4-4.19.2/aclocal.m4 2014-09-15 05:46:02.000000000 +0000 @@ -9247,7 +9247,7 @@ m4_ifndef([_LT_PROG_CXX], [AC_DEFUN([_LT_PROG_CXX])]) # nls.m4 serial 5 (gettext-0.18) -dnl Copyright (C) 1995-2003, 2005-2006, 2008-2013 Free Software Foundation, +dnl Copyright (C) 1995-2003, 2005-2006, 2008-2014 Free Software Foundation, dnl Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, @@ -11041,7 +11041,7 @@ AC_MSG_CHECKING([if $CC supports $flag]) saved_CFLAGS="$CFLAGS" CFLAGS="$CFLAGS $flag" - AC_COMPILE_IFELSE([ ], [flag_supported=yes], [flag_supported=no]) + AC_COMPILE_IFELSE([AC_LANG_SOURCE([ ])], [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-security \ + -Wcast-align -Wformat -Wformat-security -Wformat-y2k \ -Winit-self -Wmissing-include-dirs -Wundef \ - -Wmissing-format-attribute -Wnested-externs" + -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 -DGDK_DISABLE_DEPRECATED -DGTK_DISABLE_DEPRECATED -DG_DISABLE_DEPRECATED -DGSEAL_ENABLE" + CPPFLAGS="$CPPFLAGS -DG_ENABLE_DEBUG" 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 do nott check for a + dnl autoconf errors for projects that don't 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]) Binary files /tmp/tmpYW9Ud1/TUbmrhx7aK/xfdesktop4-4.11.6/backgrounds/hdpanto-wall.png and /tmp/tmpYW9Ud1/AoZXo45c15/xfdesktop4-4.19.2/backgrounds/hdpanto-wall.png differ Binary files /tmp/tmpYW9Ud1/TUbmrhx7aK/xfdesktop4-4.11.6/backgrounds/hdwall2.png and /tmp/tmpYW9Ud1/AoZXo45c15/xfdesktop4-4.19.2/backgrounds/hdwall2.png differ diff -Nru xfdesktop4-4.11.6/backgrounds/Makefile.am xfdesktop4-4.19.2/backgrounds/Makefile.am --- xfdesktop4-4.11.6/backgrounds/Makefile.am 2013-11-02 06:39:46.000000000 +0000 +++ xfdesktop4-4.19.2/backgrounds/Makefile.am 2015-11-21 12:19:21.000000000 +0000 @@ -3,6 +3,6 @@ backgroundsdir = $(datadir)/backgrounds/xfce -backgrounds_DATA = xfce-blue.jpg +backgrounds_DATA = xfce-blue.jpg panto.jpg EXTRA_DIST = $(backgrounds_DATA) diff -Nru xfdesktop4-4.11.6/backgrounds/Makefile.in xfdesktop4-4.19.2/backgrounds/Makefile.in --- xfdesktop4-4.11.6/backgrounds/Makefile.in 2014-04-07 10:24:08.000000000 +0000 +++ xfdesktop4-4.19.2/backgrounds/Makefile.in 2016-02-03 20:41:48.000000000 +0000 @@ -363,7 +363,16 @@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ backgroundsdir = $(datadir)/backgrounds/xfce -backgrounds_DATA = xfce-blue.jpg +backgrounds_DATA = \ + xfce-blue.jpg \ + hdpanto-wall.png \ + hdwall2.png \ + OTF_Dark_Grunge_07.jpg \ + OTF_Dark_Grunge_08.jpg \ + OTF_Dark_Grunge_09.jpg \ + panto-wallHD.png \ + panto.jpg + EXTRA_DIST = $(backgrounds_DATA) all: all-am Binary files /tmp/tmpYW9Ud1/TUbmrhx7aK/xfdesktop4-4.11.6/backgrounds/OTF_Dark_Grunge_07.jpg and /tmp/tmpYW9Ud1/AoZXo45c15/xfdesktop4-4.19.2/backgrounds/OTF_Dark_Grunge_07.jpg differ Binary files /tmp/tmpYW9Ud1/TUbmrhx7aK/xfdesktop4-4.11.6/backgrounds/OTF_Dark_Grunge_08.jpg and /tmp/tmpYW9Ud1/AoZXo45c15/xfdesktop4-4.19.2/backgrounds/OTF_Dark_Grunge_08.jpg differ Binary files /tmp/tmpYW9Ud1/TUbmrhx7aK/xfdesktop4-4.11.6/backgrounds/OTF_Dark_Grunge_09.jpg and /tmp/tmpYW9Ud1/AoZXo45c15/xfdesktop4-4.19.2/backgrounds/OTF_Dark_Grunge_09.jpg differ Binary files /tmp/tmpYW9Ud1/TUbmrhx7aK/xfdesktop4-4.11.6/backgrounds/panto.jpg and /tmp/tmpYW9Ud1/AoZXo45c15/xfdesktop4-4.19.2/backgrounds/panto.jpg differ Binary files /tmp/tmpYW9Ud1/TUbmrhx7aK/xfdesktop4-4.11.6/backgrounds/panto-wallHD.png and /tmp/tmpYW9Ud1/AoZXo45c15/xfdesktop4-4.19.2/backgrounds/panto-wallHD.png differ Binary files /tmp/tmpYW9Ud1/TUbmrhx7aK/xfdesktop4-4.11.6/backgrounds/xfce-blue.jpg and /tmp/tmpYW9Ud1/AoZXo45c15/xfdesktop4-4.19.2/backgrounds/xfce-blue.jpg differ diff -Nru xfdesktop4-4.11.6/ChangeLog xfdesktop4-4.19.2/ChangeLog --- xfdesktop4-4.11.6/ChangeLog 2014-04-07 10:24:12.000000000 +0000 +++ xfdesktop4-4.19.2/ChangeLog 2014-09-15 05:46:07.000000000 +0000 @@ -1,3 +1,785 @@ +commit 5ae9de5e6db2fc194102b4c61bace25bba2eda5f +Author: Eric Koegel +Date: Mon Sep 15 08:21:12 2014 +0300 + + Remove the drag highlight code (Bug 10450) + + When dragging icons on the desktop there was a box showing which + cell the icon was going to be placed in. The issue is that the + bounding box doesn't always get cleared and ends up causing + different artifacts on different systems. For now, remove this + feature until it can be correctly implemented. + +commit 04d0f16f3895fff5f5f1f189a966dd733f6ca1c6 +Author: Theppitak Karoonboonyanan +Date: Sat Sep 13 12:32:00 2014 +0200 + + I18n: Update translation th (100%). + + 220 translated messages. + + Transifex (https://www.transifex.com/projects/p/xfce/). + +commit ad3b91b34fbb014ce93e337eaf6df493513e489a +Author: Eric Koegel +Date: Mon Sep 8 14:54:20 2014 +0300 + + Don't show infobar when there's only 1 workspace (Bug 11134) + +commit 2f212e306f269aa984f522497578380239f24369 +Author: Eric Koegel +Date: Mon Sep 8 14:28:26 2014 +0300 + + Fix icon loading for .desktop files (Bug 11078) + + This code now checks multiple different ways that an icon can be + declared in a desktop file. It checks the absolute path, if it's + in the icon theme, if it's in the icon theme without an extension, + and finally if the icon is in the pixmaps folder. + +commit c3b288864a634c75e3de7a65fcbf22913bdd16c9 +Author: Eric Koegel +Date: Mon Sep 8 19:22:11 2014 +0300 + + --enable-debug option added to xfdesktop-settings + +commit bfdb4cad4e4108057fbcd1aebe101e3c57f8be47 +Author: Sergey Alyoshin +Date: Thu Sep 4 00:31:59 2014 +0200 + + I18n: Update translation ru (100%). + + 220 translated messages. + + Transifex (https://www.transifex.com/projects/p/xfce/). + +commit d2d2153b444b515503d6fc3f79e647a90f2afdca +Author: Michal Várady +Date: Thu Sep 4 00:31:59 2014 +0200 + + I18n: Update translation cs (100%). + + 220 translated messages. + + Transifex (https://www.transifex.com/projects/p/xfce/). + +commit b8b11ad4180f3b41dbb07bde88da1b1a6a1230ac +Author: Eric Koegel +Date: Mon Sep 1 11:08:30 2014 +0300 + + Hardcode the infobar label color (Bug 11100) + + The GtkInfoBar hard codes the background color which makes the + label impossible to read with dark themes. This patch hard codes + the label's color so you can read it with any theme. + +commit 605f6dea3798eb73b92b70f35da38bb8dc06cdea +Author: Alois Nešpor +Date: Mon Sep 1 00:32:17 2014 +0200 + + I18n: Update translation cs (100%). + + 220 translated messages. + + Transifex (https://www.transifex.com/projects/p/xfce/). + +commit 824050c60b3febe1f731964d343432dce32372dc +Author: Eric Koegel +Date: Tue Aug 26 19:49:30 2014 +0300 + + settings: Fix background color loading + + The issue was launching xfdesktop-settings changed the + wallpaper background color, either to black or #7f000 or + some other color. + There's a bit of a mixup in the code, there's color 2s where + there should be color 1s. With these corrected the colors + should properly be loaded and old versions should be migrated. + Bug reported to launchpad but never sent up to xfce's bugzilla: + https://bugs.launchpad.net/ubuntu/+source/xfdesktop4/+bug/1313728 + +commit 0ad1d2a2b2df3be5a05b0368cfe348486ce05f0a +Author: Seong-ho Cho +Date: Sun Aug 24 12:32:01 2014 +0200 + + I18n: Update translation ko (100%). + + 220 translated messages. + + Transifex (https://www.transifex.com/projects/p/xfce/). + +commit 5cd69905cef874c3b138d80078a13b0496f7b758 +Author: Baurzhan Muftakhidinov +Date: Fri Aug 22 06:31:58 2014 +0200 + + I18n: Update translation kk (100%). + + 220 translated messages. + + Transifex (https://www.transifex.com/projects/p/xfce/). + +commit c9820367b285e9e3f32805b5b43459e76450b38f +Author: Eric Koegel +Date: Mon Aug 18 12:07:07 2014 +0300 + + Fix xfdesktop --reload in spanning mode (Bug 10853) + + When issuing an xfdesktop --reload while in spanning wallpaper + mode, all the monitors would update their backdrop which means + the wallpaper of the last monitor would then be shown. This + fixes the logic to continue to show the wallpaper for the first + monitor as intended. + +commit d6c2ce021f49202174fb0fba5a94a9bd899b699d +Author: Piotr Strębski +Date: Wed Aug 13 12:32:05 2014 +0200 + + I18n: Update translation pl (100%). + + 220 translated messages. + + Transifex (https://www.transifex.com/projects/p/xfce/). + +commit a8a3065c405e74c80518b1ca9878885e2271c643 +Author: Cristian Marchi +Date: Wed Aug 13 12:32:05 2014 +0200 + + I18n: Update translation it (100%). + + 220 translated messages. + + Transifex (https://www.transifex.com/projects/p/xfce/). + +commit cab024b4896f5726e480efbc5535714409c4f006 +Author: Masato HASHIMOTO +Date: Mon Aug 11 18:31:52 2014 +0200 + + I18n: Update translation ja (100%). + + 220 translated messages. + + Transifex (https://www.transifex.com/projects/p/xfce/). + +commit bb38644bec064c1a71ed978a9e30327080cd39d8 +Author: Eric Koegel +Date: Mon Aug 11 10:47:54 2014 +0300 + + Post release tag bump. + +commit 629d09dfb64be67a839d65e2216f2884a1a380df +Author: Eric Koegel +Date: Mon Aug 11 10:42:41 2014 +0300 + + Updates for release. + +commit d829bd9495651b4503b7f851a75c3eac662100ff +Author: Michael Findlay +Date: Sun Aug 10 12:32:06 2014 +0200 + + I18n: Update translation en_AU (100%). + + 220 translated messages. + + Transifex (https://www.transifex.com/projects/p/xfce/). + +commit f9d7ae8681cb31ce5dbd942836592dbb312e9a95 +Author: Walter Cheuk +Date: Wed Aug 6 18:33:51 2014 +0200 + + I18n: Update translation zh_TW (100%). + + 220 translated messages. + + Transifex (https://www.transifex.com/projects/p/xfce/). + +commit 4f5d88ba1003d8b9c6a92ab59f9d8d85248b56e9 +Author: abuyop +Date: Wed Aug 6 00:32:05 2014 +0200 + + I18n: Update translation ms (100%). + + 220 translated messages. + + Transifex (https://www.transifex.com/projects/p/xfce/). + +commit f29e2ec24dc96930cc444a6ed664642ff874e62b +Author: Pablo Roberto Francisco Lezaeta Reyes +Date: Wed Aug 6 00:32:05 2014 +0200 + + I18n: Update translation es (100%). + + 220 translated messages. + + Transifex (https://www.transifex.com/projects/p/xfce/). + +commit 3f31fa54722dbe35da3b0a522dcbdec0d07e4b22 +Author: Yarema aka Knedlyk +Date: Tue Aug 5 12:32:04 2014 +0200 + + I18n: Update translation uk (100%). + + 220 translated messages. + + Transifex (https://www.transifex.com/projects/p/xfce/). + +commit 980946c28ad8c82a6624f8011f5edf6c57a50413 +Author: Pjotr +Date: Tue Aug 5 12:32:04 2014 +0200 + + I18n: Update translation nl (100%). + + 220 translated messages. + + Transifex (https://www.transifex.com/projects/p/xfce/). + +commit 94be4a70ebe8761d790e51570077dfee2d1db6fb +Author: Edin Veskovic +Date: Tue Aug 5 12:32:04 2014 +0200 + + I18n: Update translation hr (100%). + + 220 translated messages. + + Transifex (https://www.transifex.com/projects/p/xfce/). + +commit 87b50159168ed9a0be9638aba446eb0dc052d6c6 +Author: André Miranda +Date: Tue Aug 5 00:31:50 2014 +0200 + + I18n: Update translation pt_BR (100%). + + 220 translated messages. + + Transifex (https://www.transifex.com/projects/p/xfce/). + +commit 97ea86701363d00dced9208504a3e333f75980b1 +Author: Pablo Roberto Francisco Lezaeta Reyes +Date: Mon Aug 4 12:31:55 2014 +0200 + + I18n: Update translation es (100%). + + 220 translated messages. + + Transifex (https://www.transifex.com/projects/p/xfce/). + +commit ec8bac0ce179b73c61883ba5a80745d3a3e6d6eb +Author: Eric Koegel +Date: Sun Aug 3 10:52:21 2014 +0300 + + A value must be returned from the function + +commit e5bbfcc150a3f1596c2264fecb1294599f7e5217 +Author: Eric Koegel +Date: Sun Aug 3 10:37:48 2014 +0300 + + Fix build with --disable-desktop-icons + +commit 4fb565bc7b42683df3dbc7b1617eafaf047258b8 +Author: Eric Koegel +Date: Sun Aug 3 09:04:53 2014 +0300 + + Add an option to show hidden files (Bug 8132) + + This patch adds an option to toggle the display of hidden files + on the desktop. + +commit 318996b92055b1ed40cff4bd35f4534e0db3dcc3 +Author: Eric Koegel +Date: Fri Aug 1 10:03:27 2014 +0300 + + Add a --next option to force wallpaper changes (Bug 10754) + + Several users have external scripts telling xfdesktop when to + change the wallpaper. This patch adds a --next option so that + users can advance the wallpaper on the current workspace when + they want with those scripts, rather than being limited to only + the time based events that are built into xfdesktop. + +commit f32e70e57692c381c878022697f3f1567fcc65ff +Author: Seong-ho Cho +Date: Sun Aug 3 00:31:57 2014 +0200 + + I18n: Update translation ko (100%). + + 218 translated messages. + + Transifex (https://www.transifex.com/projects/p/xfce/). + +commit 5f4103211266745d5beab0c47ebfc350fda04db3 +Author: Cristian Marchi +Date: Sat Aug 2 18:31:57 2014 +0200 + + I18n: Update translation it (100%). + + 218 translated messages. + + Transifex (https://www.transifex.com/projects/p/xfce/). + +commit 1afc65608ed0c1922fc6e17fe94b37c77163a7e4 +Author: Yannick Le Guen +Date: Sat Aug 2 00:32:09 2014 +0200 + + I18n: Update translation fr (100%). + + 218 translated messages. + + Transifex (https://www.transifex.com/projects/p/xfce/). + +commit 24abfe73c7798db68396627f90cdf5e84f7b8db8 +Author: Masato HASHIMOTO +Date: Fri Aug 1 18:31:53 2014 +0200 + + I18n: Update translation ja (100%). + + 218 translated messages. + + Transifex (https://www.transifex.com/projects/p/xfce/). + +commit 0c743258add9a25cf334a292ce36fcd0f95d0434 +Author: Theppitak Karoonboonyanan +Date: Wed Jul 30 18:32:18 2014 +0200 + + I18n: Update translation th (100%). + + 218 translated messages. + + Transifex (https://www.transifex.com/projects/p/xfce/). + +commit fd133af67452e9b1d93494d62309f9f815f40ff4 +Author: Pjotr +Date: Wed Jul 30 12:32:02 2014 +0200 + + I18n: Update translation nl (100%). + + 218 translated messages. + + Transifex (https://www.transifex.com/projects/p/xfce/). + +commit e152c641ad0e70539aa3b19919628b2e70a40c23 +Author: Harald +Date: Tue Jul 29 18:32:01 2014 +0200 + + I18n: Update translation nb (100%). + + 218 translated messages. + + Transifex (https://www.transifex.com/projects/p/xfce/). + +commit fd78e30e48ebf2ad685e6073b9bc6a26f1e4c2a8 +Author: Piotr Sokół +Date: Tue Jul 29 12:31:57 2014 +0200 + + I18n: Update translation pl (100%). + + 218 translated messages. + + Transifex (https://www.transifex.com/projects/p/xfce/). + +commit 41e1953205f4e7d86e7b27de5a7e199fb8df37db +Author: André Miranda +Date: Tue Jul 29 06:31:57 2014 +0200 + + I18n: Update translation pt_BR (100%). + + 218 translated messages. + + Transifex (https://www.transifex.com/projects/p/xfce/). + +commit 8288ed8bc769fce3ac47bbb1888a8066cbec78d2 +Author: Yannick Le Guen +Date: Mon Jul 28 12:31:54 2014 +0200 + + I18n: Update translation fr (100%). + + 217 translated messages. + + Transifex (https://www.transifex.com/projects/p/xfce/). + +commit 24e1ec3f6ca2d44b6bb0f6b04b0ce125d2c87590 +Author: Eric Koegel +Date: Mon Jul 28 10:47:21 2014 +0300 + + Add runtime debug support + + This patch adds the ability to enable and disable debug messages + for xfdesktop while it is running. It also converts most of the + DBG messages to XF_DEBUG ones except where it would cause a lot + of noise. Additionally, when built with --enable-debug=full the + XF_DEBUG messages will be on by default. The point of this patch + is to allow the users to easily provide more details in their bug + reports. + +commit 6b8e12f8eaa5832918a088fc2a59184ce3fa974f +Author: Eric Koegel +Date: Sun Jul 27 23:11:31 2014 +0300 + + Add a move to trash menu option (Bug 10980) + + This adds a "move to trash" menu option to better match Thunar's + menu. Since there's a trash option now, the delete option always + deletes the file. + +commit 86e63808af48184d18e6f3a1a643886d3a614c0e +Author: Eric Koegel +Date: Sun Jul 20 16:55:02 2014 +0300 + + Change behaviour to behavior (Bug 8746) + +commit ae4013a095820417b090db14a6d037e8956fb67c +Author: Matias De lellis +Date: Fri Jul 18 14:55:17 2014 -0300 + + Fix display desktop file that include extension in icon name.. + + Signed-off-by: Eric Koegel + +commit 5d4f5fc73e6b29abf15ffb513175c985c26ebe9d +Author: Eric Koegel +Date: Fri Jul 18 19:48:10 2014 +0300 + + Additional temp files to ignore + +commit d6dc96a944f58a93b554e7b06edf9c16617e6400 +Author: Matias De lellis +Date: Fri Jul 18 01:29:54 2014 -0300 + + Fix missing thumbnail on xfdesktop when thumbler fails to create it. Need check if exist thumbnail file before emit THUMBNAIL_READY. Seems that thumber not returns the full path. So xfdesktop assumes two directories. Checked to see if the file exists in the first folder but not the second!. + +commit 834392c175bdf97670eff434b1fe0a7913e619c8 +Author: Yannick Le Guen +Date: Mon Jul 14 00:32:00 2014 +0200 + + I18n: Update translation fr (100%). + + 216 translated messages. + + Transifex (https://www.transifex.com/projects/p/xfce/). + +commit 34f068d9b7695cee6d09f425c81bfeb84ba2d1d1 +Author: Eric Koegel +Date: Sun Jul 6 22:03:02 2014 +0300 + + Add autogenerated files to POTFILES.skip + + This keeps FreeBSD and OpenBSD building with a gmake distcheck. + +commit 3d8b381ebe4d20d08074857fd726fb3ed9eec3a4 +Author: Eric Koegel +Date: Sun Jul 6 17:07:18 2014 +0300 + + Fix build warnings with --disable-desktop-menu + +commit c46bb2933f49305558587b250fd3f3870f5386d7 +Author: Eric Koegel +Date: Sun Jul 6 16:42:15 2014 +0300 + + Fix build warnings with --disable-file-icons + + And g_memmove was deprecated in glib 2.40. + +commit 0d24437ea02803057467e0695725f83f0f2dd76e +Author: Eric Koegel +Date: Sun Jul 6 16:25:04 2014 +0300 + + Fix building with --disable-desktop-icons + +commit 46633b7b129689037bd733a55870a72ad888f166 +Author: Ḷḷumex03 +Date: Sun Jun 15 12:31:58 2014 +0200 + + I18n: Update translation ast (99%). + + 214 translated messages, 2 untranslated messages. + + Transifex (https://www.transifex.com/projects/p/xfce/). + +commit 28ce1f295348da81260f3c3b1b2d42e1206424b8 +Author: Ḷḷumex03 +Date: Sat Jun 14 18:31:50 2014 +0200 + + I18n: Update translation ast (95%). + + 207 translated messages, 9 untranslated messages. + + Transifex (https://www.transifex.com/projects/p/xfce/). + +commit c79f244f8f1f2d08892a54cbb820211abad3287d +Author: Eric Koegel +Date: Mon Jun 2 09:41:57 2014 +0300 + + Revert "Use GIO directly for delete/trash operations (Bug 10778)" + + This reverts commit d48b40f6623a758ff128f5b22b2bd3e581b5b2a3. + + This doesn't fix the issue for everyone and removes the confirmation + dialog. Reverting this brings the confirm dialog back (Bug 10857). + +commit 4ca92661a9ab495a59cd9e611b658bd89a511b0d +Author: Eric Koegel +Date: Mon Jun 2 09:41:44 2014 +0300 + + Revert "g_file_trash_async is too new (Bug 10786)" + + This reverts commit f88ce1c815455bb207d3ac608bb8e7bcedfbcc89. + +commit 8d66666c8c68cec34d4f0771133063cd71946c01 +Author: OSWorld +Date: Mon Jun 2 00:32:38 2014 +0200 + + I18n: Update translation pl (100%). + + 216 translated messages. + + Transifex (https://www.transifex.com/projects/p/xfce/). + +commit c2e627b4288ac6f459ea8428a4fa0bd83e804349 +Author: Eric Koegel +Date: Thu May 29 19:42:58 2014 +0300 + + Don't free a passed in pointer + + xfce_backdrop_image_data_release tries to null a pointer given + as argument after free. This patch fixes it by freeing the data + in the calling functions. + +commit 57cf66d194c22be0cbeca63f9d96bbf5913621e6 +Author: Tornes Llume +Date: Wed May 28 12:32:00 2014 +0200 + + I18n: Update translation ast (87%). + + 189 translated messages, 27 untranslated messages. + + Transifex (https://www.transifex.com/projects/p/xfce/). + +commit d29e62d01344dfe7b948d84a8bf46267a6419af6 +Author: Anonymous +Date: Sat May 24 18:32:04 2014 +0200 + + I18n: Update translation de (100%). + + 216 translated messages. + + Transifex (https://www.transifex.com/projects/p/xfce/). + +commit efc4ad6a6644bd9cd13eab1f059b2027805cbd13 +Author: Sveinn í Felli +Date: Fri May 23 18:32:05 2014 +0200 + + I18n: Update translation is (100%). + + 216 translated messages. + + Transifex (https://www.transifex.com/projects/p/xfce/). + +commit a857028e5d4740f0be0ff6d17b23c8c4011f67fa +Author: Yarema aka Knedlyk +Date: Sun May 18 18:32:19 2014 +0200 + + I18n: Update translation uk (100%). + + 216 translated messages. + + Transifex (https://www.transifex.com/projects/p/xfce/). + +commit d7e9fb30788c6b4af012c5957fb021ac5b6c89c9 +Author: Sérgio Marques +Date: Wed May 14 18:32:17 2014 +0200 + + I18n: Update translation pt (100%). + + 216 translated messages. + + Transifex (https://www.transifex.com/projects/p/xfce/). + +commit 7eefcb31687d5f1c8807c189debf8acc4040aa00 +Author: kingu +Date: Sun May 11 18:32:05 2014 +0200 + + I18n: Update translation nb (100%). + + 216 translated messages. + + Transifex (https://www.transifex.com/projects/p/xfce/). + +commit 10d2afa6431bab7f8218b0ce7d1c034ab1ca0636 +Author: Anonymous +Date: Fri May 9 18:31:48 2014 +0200 + + I18n: Update translation de (98%). + + 213 translated messages, 3 untranslated messages. + + Transifex (https://www.transifex.com/projects/p/xfce/). + +commit e37722d1f9ae6e2451954d4f1ae61abe18d86719 +Author: Yarema aka Knedlyk +Date: Fri May 9 00:31:51 2014 +0200 + + I18n: Update translation uk (94%). + + 205 translated messages, 11 untranslated messages. + + Transifex (https://www.transifex.com/projects/p/xfce/). + +commit 93b754174034b7f71c894289e03fb9f98ab9701f +Author: haarek +Date: Thu May 8 00:31:46 2014 +0200 + + I18n: Update translation nb (90%). + + 196 translated messages, 20 untranslated messages. + + Transifex (https://www.transifex.com/projects/p/xfce/). + +commit cc29315947d076414164624bfeea4f4f4fc4064f +Author: haarek +Date: Wed Apr 30 00:31:51 2014 +0200 + + I18n: Update translation nb (84%). + + 182 translated messages, 34 untranslated messages. + + Transifex (https://www.transifex.com/projects/p/xfce/). + +commit 101448f74ae40b19100943ae619fff1f50f857d5 +Author: Rafael Ferreira +Date: Tue Apr 29 12:31:58 2014 +0200 + + I18n: Update translation pt_BR (100%). + + 216 translated messages. + + Transifex (https://www.transifex.com/projects/p/xfce/). + +commit 0f489427b73ec7c0ab5ab7c63aa4d0021907a6a2 +Author: haarek +Date: Sun Apr 27 18:32:09 2014 +0200 + + I18n: Update translation nb (81%). + + 176 translated messages, 40 untranslated messages. + + Transifex (https://www.transifex.com/projects/p/xfce/). + +commit a2ae21af42dcc47a705e03bbf1e43770a42896d9 +Author: abuyop +Date: Sun Apr 27 06:32:07 2014 +0200 + + I18n: Update translation ms (100%). + + 216 translated messages. + + Transifex (https://www.transifex.com/projects/p/xfce/). + +commit 17451974e0f51b131904e90ef4350d31cb859b4d +Author: schizo +Date: Thu Apr 24 12:32:00 2014 +0200 + + I18n: Update translation hr (100%). + + 216 translated messages. + + Transifex (https://www.transifex.com/projects/p/xfce/). + +commit fef61bf487c97da773fc2b932c54e421ea617b67 +Author: cri +Date: Thu Apr 24 00:31:45 2014 +0200 + + I18n: Update translation it (100%). + + 216 translated messages. + + Transifex (https://www.transifex.com/projects/p/xfce/). + +commit 8cea74f3422d79957219d9d2052526586a8c552d +Author: Tornes Llume +Date: Wed Apr 23 12:31:51 2014 +0200 + + I18n: Update translation ast (86%). + + 187 translated messages, 29 untranslated messages. + + Transifex (https://www.transifex.com/projects/p/xfce/). + +commit 310e8cf0faae87124247ab55e8fb46dd3deb1f00 +Author: Mauro Giubileo +Date: Sun Apr 20 17:32:31 2014 +0300 + + Fix icon position saving on resolution change (Bug 10813) + + This patch does the following: + 1) Alter the SAVE_DELAY factor from 7 seconds to 1 second, so that when you + change/move some icon on the desktop, you don't have to wait 7 seconds + before xfdesktop saves the icons and you can safely logout. + 2) When you change your screen resolution with one never used so far, + now xfdesktop will save your icon positions even if you don't change + the icons positions. + + Signed-off-by: Eric Koegel + +commit 520af35d36729f24b92f4692068b3209aec72a0e +Author: 柏諺 黃 +Date: Wed Apr 16 18:32:08 2014 +0200 + + I18n: Update translation zh_TW (100%). + + 216 translated messages. + + Transifex (https://www.transifex.com/projects/p/xfce/). + +commit ae6a28a1822f5a2487a2abbd3833319b6198ad7f +Author: asvl +Date: Sun Apr 13 18:31:57 2014 +0200 + + I18n: Update translation ru (100%). + + 216 translated messages. + + Transifex (https://www.transifex.com/projects/p/xfce/). + +commit 06714bc7a9a8dc5c6168de0b4f3c7cc8ccae8556 +Author: Darkcircle +Date: Sat Apr 12 12:31:48 2014 +0200 + + I18n: Update translation ko (100%). + + 216 translated messages. + + Transifex (https://www.transifex.com/projects/p/xfce/). + +commit 94529d1011d4cdfb621b356b0814ec15606981a0 +Author: Kyrill Detinov +Date: Thu Apr 10 18:32:08 2014 +0200 + + I18n: Update translation ru (100%). + + 216 translated messages. + + Transifex (https://www.transifex.com/projects/p/xfce/). + +commit f52198963e09603054a56f878aa78c28d3419a86 +Author: Darkcircle +Date: Tue Apr 8 12:33:13 2014 +0200 + + I18n: Update translation ko (100%). + + 216 translated messages. + + Transifex (https://www.transifex.com/projects/p/xfce/). + +commit 9f7a7fe85bbb61c9cf61ee425c7cf313835b3781 +Author: Eric Koegel +Date: Mon Apr 7 13:29:15 2014 +0300 + + Post release tag bump. + +commit a05721253e0cea414dcd7b82545ad4d45f7fee8a +Author: Eric Koegel +Date: Mon Apr 7 13:25:47 2014 +0300 + + Updates for release. + commit 132d0582c7d7228465552fc572948ece5b6750ff Author: Alois Nešpor Date: Mon Apr 7 00:32:01 2014 +0200 diff -Nru xfdesktop4-4.11.6/common/xfdesktop-common.c xfdesktop4-4.19.2/common/xfdesktop-common.c --- xfdesktop4-4.11.6/common/xfdesktop-common.c 2014-04-05 18:59:16.000000000 +0000 +++ xfdesktop4-4.19.2/common/xfdesktop-common.c 2014-09-08 16:22:50.000000000 +0000 @@ -63,7 +63,7 @@ path_a = g_file_get_path(a); path_b = g_file_get_path(b); - DBG("a %s, b %s", path_a, path_b); + XF_DEBUG("a %s, b %s", path_a, path_b); ret = g_strcmp0(path_a, path_b); @@ -192,3 +192,42 @@ return timestamp; } + + +#ifdef G_ENABLE_DEBUG +/* With --enable-debug=full turn on debugging messages from the start */ +static gboolean enable_debug = TRUE; +#else +static gboolean enable_debug = FALSE; +#endif /* G_ENABLE_DEBUG */ + +#if defined(G_HAVE_ISO_VARARGS) +void +xfdesktop_debug(const char *func, const char *file, int line, const char *format, ...) +{ + va_list args; + + if(!enable_debug) + return; + + va_start(args, format); + + fprintf(stdout, "DBG[%s:%d] %s(): ", file, line, func); + vfprintf(stdout, format, args); + fprintf(stdout, "\n"); + + va_end(args); +} +#endif /* defined(G_HAVE_ISO_VARARGS) */ + +/** + * xfdesktop_debug_set: + * debug: TRUE to turn on the XF_DEBUG mesages. + */ +void +xfdesktop_debug_set(gboolean debug) +{ + enable_debug = debug; + if(enable_debug) + XF_DEBUG("debugging enabled"); +} diff -Nru xfdesktop4-4.11.6/common/xfdesktop-common.h xfdesktop4-4.19.2/common/xfdesktop-common.h --- xfdesktop4-4.11.6/common/xfdesktop-common.h 2014-04-05 18:59:16.000000000 +0000 +++ xfdesktop4-4.19.2/common/xfdesktop-common.h 2014-08-03 06:05:39.000000000 +0000 @@ -32,6 +32,8 @@ #include +#include + #define XFDESKTOP_CHANNEL "xfce4-desktop" #define DEFAULT_BACKDROP DATADIR "/backgrounds/xfce/xfce-blue.jpg" #define DEFAULT_ICON_FONT_SIZE 12 @@ -54,6 +56,7 @@ #define SINGLE_WORKSPACE_NUMBER "/backdrop/single-workspace-number" #define DESKTOP_ICONS_SHOW_THUMBNAILS "/desktop-icons/show-thumbnails" +#define DESKTOP_ICONS_SHOW_HIDDEN_FILES "/desktop-icons/show-hidden-files" #define DESKTOP_ICONS_SHOW_NETWORK_REMOVABLE "/desktop-icons/file-icons/show-network-removable" #define DESKTOP_ICONS_SHOW_DEVICE_REMOVABLE "/desktop-icons/file-icons/show-device-removable" #define DESKTOP_ICONS_SHOW_UNKNWON_REMOVABLE "/desktop-icons/file-icons/show-unknown-removable" @@ -97,6 +100,21 @@ guint32 xfdesktop_popup_keyboard_grab_available(GdkWindow *win); + +#if defined(G_HAVE_ISO_VARARGS) + +#define XF_DEBUG(...) xfdesktop_debug (__func__, __FILE__, __LINE__, __VA_ARGS__) + +void xfdesktop_debug(const char *func, const char *file, int line, const char *format, ...) __attribute__((format (printf,4,5))); + +#else /* defined(G_HAVE_ISO_VARARGS) */ + +#define XF_DEBUG(...) + +#endif /* defined(G_HAVE_ISO_VARARGS) */ + +void xfdesktop_debug_set(gboolean debug); + G_END_DECLS #endif diff -Nru xfdesktop4-4.11.6/common/xfdesktop-thumbnailer.c xfdesktop4-4.19.2/common/xfdesktop-thumbnailer.c --- xfdesktop4-4.11.6/common/xfdesktop-thumbnailer.c 2014-03-15 20:12:34.000000000 +0000 +++ xfdesktop4-4.19.2/common/xfdesktop-thumbnailer.c 2014-09-08 16:22:50.000000000 +0000 @@ -281,7 +281,7 @@ mime_type = xfdesktop_get_file_mimetype(file); if(mime_type == NULL) { - DBG("File %s has no mime type", file); + XF_DEBUG("File %s has no mime type", file); return FALSE; } @@ -315,7 +315,7 @@ g_return_val_if_fail(file != NULL, FALSE); if(!xfdesktop_thumbnailer_is_supported(thumbnailer, file)) { - DBG("file: %s not supported", file); + XF_DEBUG("file: %s not supported", file); return FALSE; } if(thumbnailer->priv->request_timer_id) { @@ -330,8 +330,8 @@ { /* If this fails it usually means there's a thumbnail already * being processed, no big deal */ - DBG("Dequeue of thumbnailer->priv->handle: %d failed", - thumbnailer->priv->handle); + XF_DEBUG("Dequeue of thumbnailer->priv->handle: %d failed", + thumbnailer->priv->handle); } thumbnailer->priv->handle = 0; @@ -387,8 +387,8 @@ { /* If this fails it usually means there's a thumbnail already * being processed, no big deal */ - DBG("Dequeue of thumbnailer->priv->handle: %d failed", - thumbnailer->priv->handle); + XF_DEBUG("Dequeue of thumbnailer->priv->handle: %d failed", + thumbnailer->priv->handle); } } thumbnailer->priv->handle = 0; @@ -561,15 +561,17 @@ filename, NULL); } - DBG("thumbnail-ready src: %s thumbnail: %s", - (char*)iter->data, - thumbnail_location); - - g_signal_emit(G_OBJECT(thumbnailer), - thumbnailer_signals[THUMBNAIL_READY], - 0, - iter->data, - thumbnail_location); + XF_DEBUG("thumbnail-ready src: %s thumbnail: %s", + (char*)iter->data, + thumbnail_location); + + if(g_file_test(thumbnail_location, G_FILE_TEST_EXISTS)) { + g_signal_emit(G_OBJECT(thumbnailer), + thumbnailer_signals[THUMBNAIL_READY], + 0, + iter->data, + thumbnail_location); + } temp = iter->data; thumbnailer->priv->queue = g_slist_remove(thumbnailer->priv->queue, diff -Nru xfdesktop4-4.11.6/config.guess xfdesktop4-4.19.2/config.guess --- xfdesktop4-4.11.6/config.guess 2014-04-07 10:24:08.000000000 +0000 +++ xfdesktop4-4.19.2/config.guess 2014-09-15 05:46:03.000000000 +0000 @@ -2,7 +2,7 @@ # Attempt to guess a canonical system name. # Copyright 1992-2014 Free Software Foundation, Inc. -timestamp='2014-02-12' +timestamp='2014-03-23' # This file is free software; you can redistribute it and/or modify it # under the terms of the GNU General Public License as published by @@ -826,7 +826,7 @@ *:MINGW*:*) echo ${UNAME_MACHINE}-pc-mingw32 exit ;; - i*:MSYS*:*) + *:MSYS*:*) echo ${UNAME_MACHINE}-pc-msys exit ;; i*:windows32*:*) @@ -969,10 +969,10 @@ eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep '^CPU'` test x"${CPU}" != x && { echo "${CPU}-unknown-linux-${LIBC}"; exit; } ;; - or1k:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-${LIBC} + openrisc*:Linux:*:*) + echo or1k-unknown-linux-${LIBC} exit ;; - or32:Linux:*:*) + or32:Linux:*:* | or1k*:Linux:*:*) echo ${UNAME_MACHINE}-unknown-linux-${LIBC} exit ;; padre:Linux:*:*) diff -Nru xfdesktop4-4.11.6/config.sub xfdesktop4-4.19.2/config.sub --- xfdesktop4-4.11.6/config.sub 2014-04-07 10:24:08.000000000 +0000 +++ xfdesktop4-4.19.2/config.sub 2014-09-15 05:46:03.000000000 +0000 @@ -2,7 +2,7 @@ # Configuration validation subroutine script. # Copyright 1992-2014 Free Software Foundation, Inc. -timestamp='2014-01-01' +timestamp='2014-07-28' # This file is free software; you can redistribute it and/or modify it # under the terms of the GNU General Public License as published by @@ -283,8 +283,10 @@ | mips64vr5900 | mips64vr5900el \ | mipsisa32 | mipsisa32el \ | mipsisa32r2 | mipsisa32r2el \ + | mipsisa32r6 | mipsisa32r6el \ | mipsisa64 | mipsisa64el \ | mipsisa64r2 | mipsisa64r2el \ + | mipsisa64r6 | mipsisa64r6el \ | mipsisa64sb1 | mipsisa64sb1el \ | mipsisa64sr71k | mipsisa64sr71kel \ | mipsr5900 | mipsr5900el \ @@ -296,8 +298,7 @@ | nds32 | nds32le | nds32be \ | nios | nios2 | nios2eb | nios2el \ | ns16k | ns32k \ - | open8 \ - | or1k | or32 \ + | open8 | or1k | or1knd | or32 \ | pdp10 | pdp11 | pj | pjl \ | powerpc | powerpc64 | powerpc64le | powerpcle \ | pyramid \ @@ -402,8 +403,10 @@ | mips64vr5900-* | mips64vr5900el-* \ | mipsisa32-* | mipsisa32el-* \ | mipsisa32r2-* | mipsisa32r2el-* \ + | mipsisa32r6-* | mipsisa32r6el-* \ | mipsisa64-* | mipsisa64el-* \ | mipsisa64r2-* | mipsisa64r2el-* \ + | mipsisa64r6-* | mipsisa64r6el-* \ | mipsisa64sb1-* | mipsisa64sb1el-* \ | mipsisa64sr71k-* | mipsisa64sr71kel-* \ | mipsr5900-* | mipsr5900el-* \ @@ -415,6 +418,7 @@ | nios-* | nios2-* | nios2eb-* | nios2el-* \ | none-* | np1-* | ns16k-* | ns32k-* \ | open8-* \ + | or1k*-* \ | orion-* \ | pdp10-* | pdp11-* | pj-* | pjl-* | pn-* | power-* \ | powerpc-* | powerpc64-* | powerpc64le-* | powerpcle-* \ @@ -842,6 +846,10 @@ basic_machine=powerpc-unknown os=-morphos ;; + moxiebox) + basic_machine=moxie-unknown + os=-moxiebox + ;; msdos) basic_machine=i386-pc os=-msdos @@ -1387,14 +1395,14 @@ | -cygwin* | -msys* | -pe* | -psos* | -moss* | -proelf* | -rtems* \ | -mingw32* | -mingw64* | -linux-gnu* | -linux-android* \ | -linux-newlib* | -linux-musl* | -linux-uclibc* \ - | -uxpv* | -beos* | -mpeix* | -udk* \ + | -uxpv* | -beos* | -mpeix* | -udk* | -moxiebox* \ | -interix* | -uwin* | -mks* | -rhapsody* | -darwin* | -opened* \ | -openstep* | -oskit* | -conix* | -pw32* | -nonstopux* \ | -storm-chaos* | -tops10* | -tenex* | -tops20* | -its* | -irx* \ | -os2* | -vos* | -palmos* | -uclinux* | -nucleus* \ | -morphos* | -superux* | -rtmk* | -rtmk-nova* | -windiss* \ | -powermax* | -dnix* | -nx6 | -nx7 | -sei* | -dragonfly* \ - | -skyos* | -haiku* | -rdos* | -toppers* | -drops* | -es*) + | -skyos* | -haiku* | -rdos* | -toppers* | -drops* | -es* | -tirtos*) # Remember, each alternative MUST END IN *, to match a version number. ;; -qnx*) @@ -1612,9 +1620,6 @@ mips*-*) os=-elf ;; - or1k-*) - os=-elf - ;; or32-*) os=-coff ;; diff -Nru xfdesktop4-4.11.6/configure xfdesktop4-4.19.2/configure --- xfdesktop4-4.11.6/configure 2014-04-07 10:24:08.000000000 +0000 +++ xfdesktop4-4.19.2/configure 2014-09-15 05:46:03.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.6. +# Generated by GNU Autoconf 2.69 for xfdesktop 4.11.8. # # Report bugs to . # @@ -590,8 +590,8 @@ # Identity of this package. PACKAGE_NAME='xfdesktop' PACKAGE_TARNAME='xfdesktop' -PACKAGE_VERSION='4.11.6' -PACKAGE_STRING='xfdesktop 4.11.6' +PACKAGE_VERSION='4.11.8' +PACKAGE_STRING='xfdesktop 4.11.8' 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.6 to adapt to many kinds of systems. +\`configure' configures xfdesktop 4.11.8 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.6:";; + short | recursive ) echo "Configuration of xfdesktop 4.11.8:";; 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.6 +xfdesktop configure 4.11.8 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.6, which was +It was created by xfdesktop $as_me 4.11.8, 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.6' + VERSION='4.11.8' cat >>confdefs.h <<_ACEOF @@ -18228,9 +18228,9 @@ -Wdeclaration-after-statement \ -Wmissing-declarations \ -Wmissing-noreturn -Wshadow -Wpointer-arith \ - -Wcast-align -Wformat-security \ + -Wcast-align -Wformat -Wformat-security -Wformat-y2k \ -Winit-self -Wmissing-include-dirs -Wundef \ - -Wmissing-format-attribute -Wnested-externs" + -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 -DGDK_DISABLE_DEPRECATED -DGTK_DISABLE_DEPRECATED -DG_DISABLE_DEPRECATED -DGSEAL_ENABLE" + CPPFLAGS="$CPPFLAGS -DG_ENABLE_DEBUG" { $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.6, which was +This file was extended by xfdesktop $as_me 4.11.8, 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.6 +xfdesktop config.status 4.11.8 configured by $0, generated by GNU Autoconf 2.69, with options \\"\$ac_cs_config\\" diff -Nru xfdesktop4-4.11.6/configure.ac xfdesktop4-4.19.2/configure.ac --- xfdesktop4-4.11.6/configure.ac 2014-04-07 10:24:05.000000000 +0000 +++ xfdesktop4-4.19.2/configure.ac 2014-09-15 05:46:01.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], [6]) +m4_define([xfdesktop_version_micro], [8]) m4_define([xfdesktop_version_nano], []) -m4_define([xfdesktop_version_build], [132d058]) +m4_define([xfdesktop_version_build], [5ae9de5]) 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.6/debian/changelog xfdesktop4-4.19.2/debian/changelog --- xfdesktop4-4.11.6/debian/changelog 2014-04-09 07:36:35.000000000 +0000 +++ xfdesktop4-4.19.2/debian/changelog 2016-06-25 13:36:10.000000000 +0000 @@ -1,3 +1,12 @@ +xfdesktop4 (4.19.2-3ubuntu1) trusty; urgency=medium + + * New upstream development and bugfix release (LP: #1365965) + * debian/patches/xubuntu_set-accountsservice-user-bg.patch: update + patch to only update on first workspace filename change + * xfdesktop package only for panto. + + -- Cyber sec Sat, 27 Sep 2014 16:53:04 -0400 + xfdesktop4 (4.11.6-1ubuntu1) trusty; urgency=medium * Merge from Debian experimental. Remaining changes: diff -Nru xfdesktop4-4.11.6/debian/patches/xubuntu_set-accountsservice-user-bg.patch xfdesktop4-4.19.2/debian/patches/xubuntu_set-accountsservice-user-bg.patch --- xfdesktop4-4.11.6/debian/patches/xubuntu_set-accountsservice-user-bg.patch 2014-04-09 07:35:36.000000000 +0000 +++ xfdesktop4-4.19.2/debian/patches/xubuntu_set-accountsservice-user-bg.patch 2014-08-12 02:21:01.000000000 +0000 @@ -17,7 +17,16 @@ #ifdef ENABLE_DESKTOP_ICONS #include "xfdesktop-icon-view.h" -@@ -352,6 +353,88 @@ create_bg_pixmap(GdkScreen *gscreen, gpo +@@ -118,6 +119,8 @@ + GtkWidget *icon_view; + gdouble system_font_size; + #endif ++ ++ gchar *last_filename; + }; + + enum +@@ -359,11 +362,94 @@ } static void @@ -106,14 +115,41 @@ backdrop_changed_cb(XfceBackdrop *backdrop, gpointer user_data) { XfceDesktop *desktop = XFCE_DESKTOP(user_data); -@@ -387,6 +470,10 @@ backdrop_changed_cb(XfceBackdrop *backdr + GdkPixmap *pmap = desktop->priv->bg_pixmap; + GdkScreen *gscreen = desktop->priv->gscreen; ++ gchar *new_filename = NULL; + GdkRectangle rect; + GdkRegion *clip_region = NULL; + gint i, monitor = -1, current_workspace; +@@ -394,6 +480,20 @@ } if(monitor == -1) return; + /* notify Accountsservice of the new bg (only for monitor0) */ + if(monitor == 0) ++ { + if (xfce_desktop_get_current_workspace(desktop) == 0) -+ set_accountsservice_user_bg(xfce_backdrop_get_image_filename(backdrop)); ++ { ++ new_filename = g_strdup(xfce_backdrop_get_image_filename(backdrop)); ++ if (g_strcmp0(desktop->priv->last_filename, new_filename) != 0) ++ { ++ desktop->priv->last_filename = g_strdup(new_filename); ++ set_accountsservice_user_bg(xfce_backdrop_get_image_filename(backdrop)); ++ } ++ g_free(new_filename); ++ } ++ } #ifdef G_ENABLE_DEBUG monitor_name = gdk_screen_get_monitor_plug_name(gscreen, monitor); +@@ -1405,7 +1505,9 @@ + desktop->priv->property_prefix = g_strdup(property_prefix); + + xfce_desktop_connect_settings(desktop); +- ++ ++ desktop->priv->last_filename = g_strdup(""); ++ + return GTK_WIDGET(desktop); + } + diff -Nru xfdesktop4-4.11.6/debian/source/format xfdesktop4-4.19.2/debian/source/format --- xfdesktop4-4.11.6/debian/source/format 2014-04-09 07:35:36.000000000 +0000 +++ xfdesktop4-4.19.2/debian/source/format 2015-10-29 17:03:47.000000000 +0000 @@ -1 +1 @@ -3.0 (quilt) +3.0 (native) diff -Nru xfdesktop4-4.11.6/doc/README.xfconf xfdesktop4-4.19.2/doc/README.xfconf --- xfdesktop4-4.11.6/doc/README.xfconf 2013-12-14 19:05:44.000000000 +0000 +++ xfdesktop4-4.19.2/doc/README.xfconf 2014-08-03 06:05:39.000000000 +0000 @@ -45,6 +45,7 @@ + diff -Nru xfdesktop4-4.11.6/NEWS xfdesktop4-4.19.2/NEWS --- xfdesktop4-4.11.6/NEWS 2014-04-07 10:22:00.000000000 +0000 +++ xfdesktop4-4.19.2/NEWS 2014-09-15 05:44:47.000000000 +0000 @@ -1,3 +1,49 @@ +4.11.8 +====== +[Please note that this is a development release.] + +Development release of xfdesktop targeting for Xfce 4.12. +Please report all problems at bugzilla.xfce.org. + +* Miscellaneous bug fixes: + - Fix xfdesktop --reload in spanning mode (Bug 10853) + - settings: Fix background color loading + - Add an --enable-debug option added to xfdesktop-settings + - Fix icon loading for .desktop files (Bug 11078) + - Don't show infobar when there's only 1 workspace (Bug 11134) + - Remove the drag highlight code (Bug 10450) + +* Translation updates: + Czech (cs), Italian (it), Kazakh (kk), Korean (ko), + Polish (pl), Russian (ru), Thai (th) + +4.11.7 +====== +[Please note that this is a development release.] + +Eighth development release of xfdesktop targeting for Xfce 4.12. +Please report all problems at bugzilla.xfce.org. + +* Miscellaneous bug fixes: + - Add an option to show hidden files (Bug 8132) + - Add a --next option to force wallpaper changes (Bug 10754) + - Add runtime debug support + - Add a move to trash menu option (Bug 10980) + - Change behaviour to behavior (Bug 8746) + - Matias De lellis: Fix display desktop file that include extension + in icon name + - Matias De lellis: Fix missing thumbnail on xfdesktop when thumbler + fails to create it. + - Mauro Giubileo: Fix icon position saving on resolution change (Bug 10813) + +* Translation updates: + Asturian (ast), Chinese (Taiwan) (zh_TW), Croatian (hr), + Dutch (Flemish) (nl), English (Australia) (en_AU), + French (fr), German (de), Icelandic (is), Italian (it), + Japanese (ja), Korean (ko), Malay (ms), Norwegian Bokmål (nb), + Polish (pl), Portuguese (pt), Portuguese (Brazilian) (pt_BR), + Russian (ru), Spanish (Castilian) (es), Thai (th), Ukrainian (uk). + 4.11.6 ====== [Please note that this is a development release.] diff -Nru xfdesktop4-4.11.6/.pc/applied-patches xfdesktop4-4.19.2/.pc/applied-patches --- xfdesktop4-4.11.6/.pc/applied-patches 1970-01-01 00:00:00.000000000 +0000 +++ xfdesktop4-4.19.2/.pc/applied-patches 2015-10-29 17:03:30.000000000 +0000 @@ -0,0 +1,2 @@ +xubuntu_set-accountsservice-user-bg.patch +xubuntu_improve-nautilus-interactions.patch diff -Nru xfdesktop4-4.11.6/.pc/.quilt_patches xfdesktop4-4.19.2/.pc/.quilt_patches --- xfdesktop4-4.11.6/.pc/.quilt_patches 1970-01-01 00:00:00.000000000 +0000 +++ xfdesktop4-4.19.2/.pc/.quilt_patches 2015-10-29 17:03:30.000000000 +0000 @@ -0,0 +1 @@ +debian/patches diff -Nru xfdesktop4-4.11.6/.pc/.quilt_series xfdesktop4-4.19.2/.pc/.quilt_series --- xfdesktop4-4.11.6/.pc/.quilt_series 1970-01-01 00:00:00.000000000 +0000 +++ xfdesktop4-4.19.2/.pc/.quilt_series 2015-10-29 17:03:30.000000000 +0000 @@ -0,0 +1 @@ +series diff -Nru xfdesktop4-4.11.6/.pc/.version xfdesktop4-4.19.2/.pc/.version --- xfdesktop4-4.11.6/.pc/.version 1970-01-01 00:00:00.000000000 +0000 +++ xfdesktop4-4.19.2/.pc/.version 2015-10-29 17:03:30.000000000 +0000 @@ -0,0 +1 @@ +2 diff -Nru xfdesktop4-4.11.6/.pc/xubuntu_improve-nautilus-interactions.patch/src/xfce-desktop.c xfdesktop4-4.19.2/.pc/xubuntu_improve-nautilus-interactions.patch/src/xfce-desktop.c --- xfdesktop4-4.11.6/.pc/xubuntu_improve-nautilus-interactions.patch/src/xfce-desktop.c 1970-01-01 00:00:00.000000000 +0000 +++ xfdesktop4-4.19.2/.pc/xubuntu_improve-nautilus-interactions.patch/src/xfce-desktop.c 2015-10-29 17:03:30.000000000 +0000 @@ -0,0 +1,1895 @@ +/* + * xfdesktop - xfce4's desktop manager + * + * Copyright (c) 2004-2007 Brian Tarricone, + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Library General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software Foundation, + * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA + * + * Random portions taken from or inspired by the original xfdesktop for xfce4: + * Copyright (C) 2002-2003 Jasper Huijsmans (huysmans@users.sourceforge.net) + * Copyright (C) 2003 Benedikt Meurer + */ + +#ifdef HAVE_CONFIG_H +#include +#endif + +#include + +#ifdef HAVE_STDLIB_H +#include +#endif + +#ifdef HAVE_STRING_H +#include +#endif + +#ifdef HAVE_SYS_TYPES_H +#include +#endif +#ifdef HAVE_SYS_STAT_H +#include +#endif +#ifdef HAVE_UNISTD_H +#include +#endif + +#ifdef HAVE_FCNTL_H +#include +#endif + +#include +#include + +#ifdef HAVE_TIME_H +#include +#endif + +#include +#include + +#include +#include +#include +#include + +#ifdef ENABLE_DESKTOP_ICONS +#include "xfdesktop-icon-view.h" +#include "xfdesktop-window-icon-manager.h" +# ifdef ENABLE_FILE_ICONS +# include "xfdesktop-file-icon-manager.h" +# include "xfdesktop-special-file-icon.h" +# endif +#endif + +#include +#include + +#include +#include + +#include "xfdesktop-common.h" +#include "xfce-desktop.h" +#include "xfce-desktop-enum-types.h" +#include "xfce-workspace.h" + +/* disable setting the x background for bug 7442 */ +//#define DISABLE_FOR_BUG7442 + +struct _XfceDesktopPriv +{ + GdkScreen *gscreen; + WnckScreen *wnck_screen; + gboolean updates_frozen; + + XfconfChannel *channel; + gchar *property_prefix; + + GdkPixmap *bg_pixmap; + + gint nworkspaces; + XfceWorkspace **workspaces; + gint current_workspace; + + gboolean single_workspace_mode; + gint single_workspace_num; + + SessionLogoutFunc session_logout_func; + + guint32 grab_time; + +#ifdef ENABLE_DESKTOP_ICONS + XfceDesktopIconStyle icons_style; + gboolean icons_font_size_set; + guint icons_font_size; + guint icons_size; + gint style_refresh_timer; + GtkWidget *icon_view; + gdouble system_font_size; +#endif + + gchar *last_filename; +}; + +enum +{ + SIG_POPULATE_ROOT_MENU = 0, + SIG_POPULATE_SECONDARY_ROOT_MENU, + N_SIGNALS +}; + +enum +{ + PROP_0 = 0, +#ifdef ENABLE_DESKTOP_ICONS + PROP_ICON_STYLE, + PROP_ICON_SIZE, + PROP_ICON_FONT_SIZE, + PROP_ICON_FONT_SIZE_SET, +#endif + PROP_SINGLE_WORKSPACE_MODE, + PROP_SINGLE_WORKSPACE_NUMBER, +}; + + +static void xfce_desktop_finalize(GObject *object); +static void xfce_desktop_set_property(GObject *object, + guint property_id, + const GValue *value, + GParamSpec *pspec); +static void xfce_desktop_get_property(GObject *object, + guint property_id, + GValue *value, + GParamSpec *pspec); + +static void xfce_desktop_realize(GtkWidget *widget); +static void xfce_desktop_unrealize(GtkWidget *widget); +static gboolean xfce_desktop_button_press_event(GtkWidget *widget, + GdkEventButton *evt); +static gboolean xfce_desktop_button_release_event(GtkWidget *widget, + GdkEventButton *evt); +static gboolean xfce_desktop_popup_menu(GtkWidget *widget); + +static gboolean xfce_desktop_expose(GtkWidget *w, + GdkEventExpose *evt); +static gboolean xfce_desktop_delete_event(GtkWidget *w, + GdkEventAny *evt); +static void xfce_desktop_style_set(GtkWidget *w, + GtkStyle *old_style); + +static void xfce_desktop_set_single_workspace_mode(XfceDesktop *desktop, + gboolean single_workspace); +static void xfce_desktop_set_single_workspace_number(XfceDesktop *desktop, + gint workspace_num); + +static gboolean xfce_desktop_get_single_workspace_mode(XfceDesktop *desktop); +static gint xfce_desktop_get_current_workspace(XfceDesktop *desktop); + +#ifdef ENABLE_DESKTOP_ICONS +static void hidden_state_changed_cb(GObject *object, XfceDesktop *desktop); +#endif + + +static guint signals[N_SIGNALS] = { 0, }; + +/* private functions */ + +#ifdef ENABLE_DESKTOP_ICONS +static gdouble +xfce_desktop_ensure_system_font_size(XfceDesktop *desktop) +{ + GdkScreen *gscreen; + GtkSettings *settings; + gchar *font_name = NULL; + PangoFontDescription *pfd; + + gscreen = gtk_widget_get_screen(GTK_WIDGET(desktop)); + + settings = gtk_settings_get_for_screen(gscreen); + g_object_get(G_OBJECT(settings), "gtk-font-name", &font_name, NULL); + + pfd = pango_font_description_from_string(font_name); + desktop->priv->system_font_size = pango_font_description_get_size(pfd); + /* FIXME: this seems backwards from the documentation */ + if(!pango_font_description_get_size_is_absolute(pfd)) { + XF_DEBUG("dividing by PANGO_SCALE"); + desktop->priv->system_font_size /= PANGO_SCALE; + } + XF_DEBUG("system font size is %.05f", desktop->priv->system_font_size); + + g_free(font_name); + pango_font_description_free(pfd); + + return desktop->priv->system_font_size; +} + +static void +xfce_desktop_setup_icon_view(XfceDesktop *desktop) +{ + XfdesktopIconViewManager *manager = NULL; + + switch(desktop->priv->icons_style) { + case XFCE_DESKTOP_ICON_STYLE_NONE: + /* nada */ + break; + + case XFCE_DESKTOP_ICON_STYLE_WINDOWS: + manager = xfdesktop_window_icon_manager_new(desktop->priv->gscreen); + break; + +#ifdef ENABLE_FILE_ICONS + case XFCE_DESKTOP_ICON_STYLE_FILES: + { + GFile *file; + const gchar *desktop_path; + + desktop_path = g_get_user_special_dir(G_USER_DIRECTORY_DESKTOP); + file = g_file_new_for_path(desktop_path); + manager = xfdesktop_file_icon_manager_new(file, desktop->priv->channel); + g_object_unref(file); + } + break; +#endif + + default: + g_critical("Unusable XfceDesktopIconStyle: %d. Unable to " \ + "display desktop icons.", + desktop->priv->icons_style); + break; + } + + if(manager) { + xfce_desktop_ensure_system_font_size(desktop); + + desktop->priv->icon_view = xfdesktop_icon_view_new(manager); + /* If the user set a custom font size, use it. Otherwise use the system + * font size */ + xfdesktop_icon_view_set_font_size(XFDESKTOP_ICON_VIEW(desktop->priv->icon_view), + (!desktop->priv->icons_font_size_set) + ? desktop->priv->system_font_size + : desktop->priv->icons_font_size); + if(desktop->priv->icons_size > 0) { + xfdesktop_icon_view_set_icon_size(XFDESKTOP_ICON_VIEW(desktop->priv->icon_view), + desktop->priv->icons_size); + } + gtk_widget_show(desktop->priv->icon_view); + gtk_container_add(GTK_CONTAINER(desktop), desktop->priv->icon_view); + + g_signal_connect(G_OBJECT(manager), "hidden-state-changed", G_CALLBACK(hidden_state_changed_cb), desktop); + } + + gtk_widget_queue_draw(GTK_WIDGET(desktop)); +} +#endif + +static void +set_imgfile_root_property(XfceDesktop *desktop, const gchar *filename, + gint monitor) +{ + gchar property_name[128]; + + gdk_error_trap_push(); + + g_snprintf(property_name, 128, XFDESKTOP_IMAGE_FILE_FMT, monitor); + if(filename) { + gdk_property_change(gdk_screen_get_root_window(desktop->priv->gscreen), + gdk_atom_intern(property_name, FALSE), + gdk_x11_xatom_to_atom(XA_STRING), 8, + GDK_PROP_MODE_REPLACE, + (guchar *)filename, strlen(filename)+1); + } else { + gdk_property_delete(gdk_screen_get_root_window(desktop->priv->gscreen), + gdk_atom_intern(property_name, FALSE)); + } + + gdk_error_trap_pop(); +} + +static void +set_real_root_window_pixmap(GdkScreen *gscreen, + GdkPixmap *pmap) +{ +#ifndef DISABLE_FOR_BUG7442 + Window xid; + GdkWindow *groot; + + xid = GDK_DRAWABLE_XID(pmap); + groot = gdk_screen_get_root_window(gscreen); + + gdk_error_trap_push(); + + /* set root property for transparent Eterms */ + gdk_property_change(groot, + gdk_atom_intern("_XROOTPMAP_ID", FALSE), + gdk_atom_intern("PIXMAP", FALSE), 32, + GDK_PROP_MODE_REPLACE, (guchar *)&xid, 1); + /* and set the root window's BG pixmap, because aterm is somewhat lame. */ + gdk_window_set_back_pixmap(groot, pmap, FALSE); + /* there really should be a standard for this crap... */ + + gdk_error_trap_pop(); +#endif +} + +static GdkPixmap * +create_bg_pixmap(GdkScreen *gscreen, gpointer user_data) +{ + XfceDesktop *desktop = user_data; + gint w, h; + + TRACE("entering"); + + g_return_val_if_fail(XFCE_IS_DESKTOP(desktop), NULL); + + /* If the workspaces haven't been created yet there's no need to do the + * background pixmap */ + if(desktop->priv->workspaces == NULL) { + XF_DEBUG("exiting, desktop->priv->workspaces == NULL"); + return NULL; + } + + TRACE("really entering"); + + w = gdk_screen_get_width(gscreen); + h = gdk_screen_get_height(gscreen); + gtk_widget_set_size_request(GTK_WIDGET(desktop), w, h); + gtk_window_resize(GTK_WINDOW(desktop), w, h); + + if(desktop->priv->bg_pixmap) + g_object_unref(G_OBJECT(desktop->priv->bg_pixmap)); + desktop->priv->bg_pixmap = gdk_pixmap_new(GDK_DRAWABLE(gtk_widget_get_window(GTK_WIDGET(desktop))), + w, h, -1); + + if(!GDK_IS_PIXMAP(desktop->priv->bg_pixmap)) + return NULL; + + gdk_window_set_back_pixmap(gtk_widget_get_window(GTK_WIDGET(desktop)), + desktop->priv->bg_pixmap, FALSE); + + return desktop->priv->bg_pixmap; +} + +static void +set_accountsservice_user_bg(const gchar *filename) +{ + GDBusProxy *proxy = NULL; + GDBusProxy *user = NULL; + GVariant *variant = NULL; + GError *error = NULL; + gchar *object_path = NULL; + const gchar *user_name = g_get_user_name(); + + proxy = g_dbus_proxy_new_for_bus_sync(G_BUS_TYPE_SYSTEM, + G_DBUS_PROXY_FLAGS_NONE, + NULL, + "org.freedesktop.Accounts", + "/org/freedesktop/Accounts", + "org.freedesktop.Accounts", + NULL, + &error); + + if(!proxy) { + DBG("Failed to contact accounts service: %s", error->message); + g_error_free(error); + return; + } + + variant = g_dbus_proxy_call_sync(proxy, + "FindUserByName", + g_variant_new("(s)", user_name), + G_DBUS_CALL_FLAGS_NONE, + -1, + NULL, + &error); + + if(!variant) { + DBG("Could not contact accounts service to look up '%s': %s", + user_name, error->message); + g_error_free(error); + goto bail; + } + + g_variant_get(variant, "(o)", &object_path); + user = g_dbus_proxy_new_for_bus_sync(G_BUS_TYPE_SYSTEM, + G_DBUS_PROXY_FLAGS_NONE, + NULL, + "org.freedesktop.Accounts", + object_path, + "org.freedesktop.Accounts.User", + NULL, + &error); + g_free(object_path); + + if(!user) { + DBG("Could not create proxy for user '%s': %s", + g_variant_get_string(variant, NULL), error->message); + g_error_free(error); + goto bail; + } + g_variant_unref(variant); + + variant = g_dbus_proxy_call_sync(user, + "SetBackgroundFile", + g_variant_new("(s)", filename), + G_DBUS_CALL_FLAGS_NONE, + -1, + NULL, + &error); + + if(!variant) { + DBG("Failed to set the background '%s': %s", filename, error->message); + g_error_free(error); + goto bail; + } + +bail: + if(user) + g_object_unref(user); + if(proxy) + g_object_unref(proxy); + if(variant) + g_variant_unref(variant); +} + +static void +backdrop_changed_cb(XfceBackdrop *backdrop, gpointer user_data) +{ + XfceDesktop *desktop = XFCE_DESKTOP(user_data); + GdkPixmap *pmap = desktop->priv->bg_pixmap; + GdkScreen *gscreen = desktop->priv->gscreen; + gchar *new_filename = NULL; + GdkRectangle rect; + GdkRegion *clip_region = NULL; + gint i, monitor = -1, current_workspace; +#ifdef G_ENABLE_DEBUG + gchar *monitor_name = NULL; +#endif + + TRACE("entering"); + + g_return_if_fail(XFCE_IS_DESKTOP(desktop)); + + if(!XFCE_IS_BACKDROP(backdrop)) + return; + + if(desktop->priv->updates_frozen || !gtk_widget_get_realized(GTK_WIDGET(desktop))) + return; + + TRACE("really entering"); + + current_workspace = xfce_desktop_get_current_workspace(desktop); + + /* Find out which monitor the backdrop is on */ + for(i = 0; i < xfce_desktop_get_n_monitors(desktop); i++) { + if(backdrop == xfce_workspace_get_backdrop(desktop->priv->workspaces[current_workspace], i)) { + monitor = i; + break; + } + } + if(monitor == -1) + return; + /* notify Accountsservice of the new bg (only for monitor0) */ + if(monitor == 0) + { + if (xfce_desktop_get_current_workspace(desktop) == 0) + { + new_filename = g_strdup(xfce_backdrop_get_image_filename(backdrop)); + if (g_strcmp0(desktop->priv->last_filename, new_filename) != 0) + { + desktop->priv->last_filename = g_strdup(new_filename); + set_accountsservice_user_bg(xfce_backdrop_get_image_filename(backdrop)); + } + g_free(new_filename); + } + } + +#ifdef G_ENABLE_DEBUG + monitor_name = gdk_screen_get_monitor_plug_name(gscreen, monitor); + + XF_DEBUG("backdrop changed for workspace %d, monitor %d (%s)", current_workspace, monitor, monitor_name); + + g_free(monitor_name); +#endif + + if(xfce_desktop_get_n_monitors(desktop) > 1 + && xfce_workspace_get_xinerama_stretch(desktop->priv->workspaces[current_workspace])) { + /* Spanning screens */ + GdkRectangle monitor_rect; + + gdk_screen_get_monitor_geometry(gscreen, 0, &rect); + /* Get the lowest x and y value for all the monitors in + * case none of them start at 0,0 for whatever reason. + */ + for(i = 1; i < xfce_desktop_get_n_monitors(desktop); i++) { + gdk_screen_get_monitor_geometry(gscreen, i, &monitor_rect); + + if(monitor_rect.x < rect.x) + rect.x = monitor_rect.x; + if(monitor_rect.y < rect.y) + rect.y = monitor_rect.y; + } + + rect.width = gdk_screen_get_width(gscreen); + rect.height = gdk_screen_get_height(gscreen); + XF_DEBUG("xinerama_stretch x %d, y %d, width %d, height %d", + rect.x, rect.y, rect.width, rect.height); + } else { + gdk_screen_get_monitor_geometry(gscreen, monitor, &rect); + XF_DEBUG("monitor x %d, y %d, width %d, height %d", + rect.x, rect.y, rect.width, rect.height); + } + + xfce_backdrop_set_size(backdrop, rect.width, rect.height); + + if(monitor > 0 + && !xfce_workspace_get_xinerama_stretch(desktop->priv->workspaces[current_workspace])) { + clip_region = gdk_region_rectangle(&rect); + + XF_DEBUG("clip_region: x: %d, y: %d, w: %d, h: %d", + rect.x, rect.y, rect.width, rect.height); + + /* If we are not monitor 0 on a multi-monitor setup we need to subtract + * all the previous monitor regions so we don't draw over them. This + * should prevent the overlap and double backdrop drawing bugs. + */ + for(i = 0; i < monitor; i++) { + GdkRectangle previous_monitor; + GdkRegion *previous_region; + gdk_screen_get_monitor_geometry(gscreen, i, &previous_monitor); + + XF_DEBUG("previous_monitor: x: %d, y: %d, w: %d, h: %d", + previous_monitor.x, previous_monitor.y, + previous_monitor.width, previous_monitor.height); + + previous_region = gdk_region_rectangle(&previous_monitor); + + gdk_region_subtract(clip_region, previous_region); + + gdk_region_destroy(previous_region); + } + } + + if(clip_region != NULL) { + /* Update the area to redraw to limit the icons/area painted */ + gdk_region_get_clipbox(clip_region, &rect); + XF_DEBUG("area to update: x: %d, y: %d, w: %d, h: %d", + rect.x, rect.y, rect.width, rect.height); + } + + if(rect.width != 0 && rect.height != 0) { + /* get the composited backdrop pixmap */ + GdkPixbuf *pix = xfce_backdrop_get_pixbuf(backdrop); + cairo_t *cr; + + /* create the backdrop if needed */ + if(!pix) { + xfce_backdrop_generate_async(backdrop); + + if(clip_region != NULL) + gdk_region_destroy(clip_region); + + return; + } + + /* Create the background pixmap if it isn't already */ + if(!GDK_IS_PIXMAP(pmap)) { + pmap = create_bg_pixmap(gscreen, desktop); + + if(!GDK_IS_PIXMAP(pmap)) { + g_object_unref(pix); + + if(clip_region != NULL) + gdk_region_destroy(clip_region); + + return; + } + } + + cr = gdk_cairo_create(GDK_DRAWABLE(pmap)); + gdk_cairo_set_source_pixbuf(cr, pix, rect.x, rect.y); + + /* clip the area so we don't draw over a previous wallpaper */ + if(clip_region != NULL) { + gdk_cairo_region(cr, clip_region); + cairo_clip(cr); + } + + cairo_paint(cr); + + /* tell gtk to redraw the repainted area */ + gtk_widget_queue_draw_area(GTK_WIDGET(desktop), rect.x, rect.y, + rect.width, rect.height); + + set_imgfile_root_property(desktop, + xfce_backdrop_get_image_filename(backdrop), + monitor); + + /* do this again so apps watching the root win notice the update */ + set_real_root_window_pixmap(gscreen, pmap); + + g_object_unref(G_OBJECT(pix)); + cairo_destroy(cr); + gtk_widget_show(GTK_WIDGET(desktop)); + } + + if(clip_region != NULL) + gdk_region_destroy(clip_region); +} + +static void +screen_size_changed_cb(GdkScreen *gscreen, gpointer user_data) +{ + XfceDesktop *desktop = user_data; + gint current_workspace; + + TRACE("entering"); + + current_workspace = xfce_desktop_get_current_workspace(desktop); + + if(desktop->priv->nworkspaces <= current_workspace) + return; + + if(current_workspace < 0) + return; + + /* release the bg_pixmap since the dimensions may have changed */ + if(desktop->priv->bg_pixmap) { + g_object_unref(desktop->priv->bg_pixmap); + desktop->priv->bg_pixmap = NULL; + } + + /* special case for 1 backdrop to handle xinerama stretching */ + if(xfce_workspace_get_xinerama_stretch(desktop->priv->workspaces[current_workspace])) { + backdrop_changed_cb(xfce_workspace_get_backdrop(desktop->priv->workspaces[current_workspace], 0), desktop); + } else { + gint i; + + for(i = 0; i < xfce_desktop_get_n_monitors(desktop); i++) { + XfceBackdrop *current_backdrop; + current_backdrop = xfce_workspace_get_backdrop(desktop->priv->workspaces[current_workspace], i); + backdrop_changed_cb(current_backdrop, desktop); + } + } +} + +static void +screen_composited_changed_cb(GdkScreen *gscreen, + gpointer user_data) +{ + TRACE("entering"); + /* fake a screen size changed, so the background is properly set */ + screen_size_changed_cb(gscreen, user_data); +} + +static void +xfce_desktop_monitors_changed(GdkScreen *gscreen, + gpointer user_data) +{ + XfceDesktop *desktop = XFCE_DESKTOP(user_data); + gint i; + + TRACE("entering"); + + /* Update the workspaces */ + for(i = 0; i < desktop->priv->nworkspaces; i++) { + xfce_workspace_monitors_changed(desktop->priv->workspaces[i], + gscreen); + } + + /* fake a screen size changed, so the background is properly set */ + screen_size_changed_cb(gscreen, user_data); +} + +static void +workspace_backdrop_changed_cb(XfceWorkspace *workspace, + XfceBackdrop *backdrop, + gpointer user_data) +{ + XfceDesktop *desktop = XFCE_DESKTOP(user_data); + gint current_workspace = 0, monitor = 0, i; + + TRACE("entering"); + + g_return_if_fail(XFCE_IS_WORKSPACE(workspace) && XFCE_IS_BACKDROP(backdrop)); + + current_workspace = xfce_desktop_get_current_workspace(desktop); + + /* Find out which monitor the backdrop is on */ + for(i = 0; i < xfce_desktop_get_n_monitors(desktop); i++) { + if(backdrop == xfce_workspace_get_backdrop(desktop->priv->workspaces[current_workspace], i)) { + monitor = i; + break; + } + } + + if(xfce_desktop_get_current_workspace(desktop) == xfce_workspace_get_workspace_num(workspace)) { + /* Update the backdrop! + * In spanning mode, ignore updates to monitors other than the primary + */ + if(!xfce_workspace_get_xinerama_stretch(workspace) || monitor == 0) { + backdrop_changed_cb(backdrop, user_data); + } + } +} + +static void +workspace_changed_cb(WnckScreen *wnck_screen, + WnckWorkspace *previously_active_space, + gpointer user_data) +{ + XfceDesktop *desktop = XFCE_DESKTOP(user_data); + gint current_workspace, new_workspace, i; + XfceBackdrop *backdrop; + + TRACE("entering"); + + current_workspace = desktop->priv->current_workspace; + new_workspace = xfce_desktop_get_current_workspace(desktop); + + if(new_workspace < 0 || new_workspace >= desktop->priv->nworkspaces) + return; + + desktop->priv->current_workspace = new_workspace; + + XF_DEBUG("current_workspace %d, new_workspace %d", + current_workspace, new_workspace); + + for(i = 0; i < xfce_desktop_get_n_monitors(desktop); i++) { + backdrop = xfce_workspace_get_backdrop(desktop->priv->workspaces[new_workspace], i); + /* update it */ + backdrop_changed_cb(backdrop, user_data); + + /* When we're spanning screens we only care about the first monitor */ + if(xfce_workspace_get_xinerama_stretch(desktop->priv->workspaces[new_workspace])) + break; + } +} + +static void +workspace_created_cb(WnckScreen *wnck_screen, + WnckWorkspace *new_workspace, + gpointer user_data) +{ + XfceDesktop *desktop = XFCE_DESKTOP(user_data); + gint nlast_workspace; + TRACE("entering"); + + nlast_workspace = desktop->priv->nworkspaces; + + /* add one more workspace */ + desktop->priv->nworkspaces = nlast_workspace + 1; + + /* allocate size for it */ + desktop->priv->workspaces = g_realloc(desktop->priv->workspaces, + desktop->priv->nworkspaces * sizeof(XfceWorkspace *)); + + /* create the new workspace and set it up */ + desktop->priv->workspaces[nlast_workspace] = xfce_workspace_new(desktop->priv->gscreen, + desktop->priv->channel, + desktop->priv->property_prefix, + nlast_workspace); + + xfce_workspace_monitors_changed(desktop->priv->workspaces[nlast_workspace], + desktop->priv->gscreen); + + g_signal_connect(desktop->priv->workspaces[nlast_workspace], + "workspace-backdrop-changed", + G_CALLBACK(workspace_backdrop_changed_cb), desktop); +} + +static void +workspace_destroyed_cb(WnckScreen *wnck_screen, + WnckWorkspace *old_workspace, + gpointer user_data) +{ + XfceDesktop *desktop = XFCE_DESKTOP(user_data); + gint nlast_workspace; + TRACE("entering"); + + g_return_if_fail(XFCE_IS_DESKTOP(desktop)); + g_return_if_fail(desktop->priv->nworkspaces - 1 >= 0); + g_return_if_fail(XFCE_IS_WORKSPACE(desktop->priv->workspaces[desktop->priv->nworkspaces-1])); + + nlast_workspace = desktop->priv->nworkspaces - 1; + + g_signal_handlers_disconnect_by_func(desktop->priv->workspaces[nlast_workspace], + G_CALLBACK(workspace_backdrop_changed_cb), + desktop); + + g_object_unref(desktop->priv->workspaces[nlast_workspace]); + + /* Remove one workspace */ + desktop->priv->nworkspaces = nlast_workspace; + + /* deallocate it */ + desktop->priv->workspaces = g_realloc(desktop->priv->workspaces, + desktop->priv->nworkspaces * sizeof(XfceWorkspace *)); + + /* Make sure we stay within bounds now that we removed a workspace */ + if(desktop->priv->current_workspace > desktop->priv->nworkspaces) + desktop->priv->current_workspace = desktop->priv->nworkspaces; +} + +static void +screen_set_selection(XfceDesktop *desktop) +{ + Window xwin; + gint xscreen; + gchar selection_name[100]; + Atom selection_atom, manager_atom; + + xwin = GDK_WINDOW_XID(gtk_widget_get_window(GTK_WIDGET(desktop))); + xscreen = gdk_screen_get_number(desktop->priv->gscreen); + + g_snprintf(selection_name, 100, XFDESKTOP_SELECTION_FMT, xscreen); + selection_atom = XInternAtom(gdk_x11_get_default_xdisplay(), selection_name, False); + manager_atom = XInternAtom(gdk_x11_get_default_xdisplay(), "MANAGER", False); + + /* 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) { + g_warning("%s: already running, quitting.", PACKAGE); + exit(0); + } + + XSelectInput(gdk_x11_get_default_xdisplay(), xwin, PropertyChangeMask | ButtonPressMask); + XSetSelectionOwner(gdk_x11_get_default_xdisplay(), selection_atom, xwin, GDK_CURRENT_TIME); + + /* Check to see if we managed to claim the selection. If not, + * we treat it as if we got it then immediately lost it */ + if(XGetSelectionOwner(gdk_x11_get_default_xdisplay(), selection_atom) == xwin) { + XClientMessageEvent xev; + Window xroot = GDK_WINDOW_XID(gdk_screen_get_root_window(desktop->priv->gscreen)); + + xev.type = ClientMessage; + xev.window = xroot; + xev.message_type = manager_atom; + xev.format = 32; + xev.data.l[0] = GDK_CURRENT_TIME; + xev.data.l[1] = selection_atom; + xev.data.l[2] = xwin; + xev.data.l[3] = 0; /* manager specific data */ + xev.data.l[4] = 0; /* manager specific data */ + + XSendEvent(gdk_x11_get_default_xdisplay(), xroot, False, StructureNotifyMask, (XEvent *)&xev); + } else { + g_error("%s: could not set selection ownership", PACKAGE); + exit(1); + } +} + + + +/* gobject-related functions */ + + +G_DEFINE_TYPE(XfceDesktop, xfce_desktop, GTK_TYPE_WINDOW) + + +static void +xfce_desktop_class_init(XfceDesktopClass *klass) +{ + GObjectClass *gobject_class = (GObjectClass *)klass; + GtkWidgetClass *widget_class = (GtkWidgetClass *)klass; + + g_type_class_add_private(klass, sizeof(XfceDesktopPriv)); + + gobject_class->finalize = xfce_desktop_finalize; + gobject_class->set_property = xfce_desktop_set_property; + gobject_class->get_property = xfce_desktop_get_property; + + widget_class->realize = xfce_desktop_realize; + widget_class->unrealize = xfce_desktop_unrealize; + widget_class->button_press_event = xfce_desktop_button_press_event; + widget_class->button_release_event = xfce_desktop_button_release_event; + widget_class->expose_event = xfce_desktop_expose; + widget_class->delete_event = xfce_desktop_delete_event; + widget_class->popup_menu = xfce_desktop_popup_menu; + widget_class->style_set = xfce_desktop_style_set; + + signals[SIG_POPULATE_ROOT_MENU] = g_signal_new("populate-root-menu", + XFCE_TYPE_DESKTOP, + G_SIGNAL_RUN_LAST, + G_STRUCT_OFFSET(XfceDesktopClass, + populate_root_menu), + NULL, NULL, + g_cclosure_marshal_VOID__OBJECT, + G_TYPE_NONE, 1, + GTK_TYPE_MENU_SHELL); + + signals[SIG_POPULATE_SECONDARY_ROOT_MENU] = g_signal_new("populate-secondary-root-menu", + XFCE_TYPE_DESKTOP, + G_SIGNAL_RUN_LAST, + G_STRUCT_OFFSET(XfceDesktopClass, + populate_secondary_root_menu), + NULL, NULL, + g_cclosure_marshal_VOID__OBJECT, + G_TYPE_NONE, 1, + GTK_TYPE_MENU_SHELL); + +#define XFDESKTOP_PARAM_FLAGS (G_PARAM_READWRITE \ + | G_PARAM_CONSTRUCT \ + | G_PARAM_STATIC_NAME \ + | G_PARAM_STATIC_NICK \ + | G_PARAM_STATIC_BLURB) + +#ifdef ENABLE_DESKTOP_ICONS + g_object_class_install_property(gobject_class, PROP_ICON_STYLE, + g_param_spec_enum("icon-style", + "icon style", + "icon style", + XFCE_TYPE_DESKTOP_ICON_STYLE, +#ifdef ENABLE_FILE_ICONS + XFCE_DESKTOP_ICON_STYLE_FILES, +#else + XFCE_DESKTOP_ICON_STYLE_WINDOWS, +#endif /* ENABLE_FILE_ICONS */ + XFDESKTOP_PARAM_FLAGS)); + + g_object_class_install_property(gobject_class, PROP_ICON_SIZE, + g_param_spec_uint("icon-size", + "icon size", + "icon size", + 8, 192, DEFAULT_ICON_SIZE, + XFDESKTOP_PARAM_FLAGS)); + + g_object_class_install_property(gobject_class, PROP_ICON_FONT_SIZE, + g_param_spec_uint("icon-font-size", + "icon font size", + "icon font size", + 0, 144, 12, + XFDESKTOP_PARAM_FLAGS)); + + g_object_class_install_property(gobject_class, PROP_ICON_FONT_SIZE_SET, + g_param_spec_boolean("icon-font-size-set", + "icon font size set", + "icon font size set", + FALSE, + XFDESKTOP_PARAM_FLAGS)); + +#endif /* ENABLE_DESKTOP_ICONS */ + + g_object_class_install_property(gobject_class, PROP_SINGLE_WORKSPACE_MODE, + g_param_spec_boolean("single-workspace-mode", + "single-workspace-mode", + "single-workspace-mode", + TRUE, + XFDESKTOP_PARAM_FLAGS)); + + g_object_class_install_property(gobject_class, PROP_SINGLE_WORKSPACE_NUMBER, + g_param_spec_int("single-workspace-number", + "single-workspace-number", + "single-workspace-number", + 0, G_MAXINT16, 0, + XFDESKTOP_PARAM_FLAGS)); + +#undef XFDESKTOP_PARAM_FLAGS +} + +static void +xfce_desktop_init(XfceDesktop *desktop) +{ + desktop->priv = G_TYPE_INSTANCE_GET_PRIVATE(desktop, XFCE_TYPE_DESKTOP, + XfceDesktopPriv); + + gtk_window_set_type_hint(GTK_WINDOW(desktop), GDK_WINDOW_TYPE_HINT_DESKTOP); + /* Accept focus is needed for the menu pop up either by the menu key on + * the keyboard or Shift+F10. */ + gtk_window_set_accept_focus(GTK_WINDOW(desktop), TRUE); + /* Can focus is needed for the gtk_grab_add/remove commands */ + gtk_widget_set_can_focus(GTK_WIDGET(desktop), TRUE); + gtk_window_set_resizable(GTK_WINDOW(desktop), FALSE); +} + +static void +xfce_desktop_finalize(GObject *object) +{ + XfceDesktop *desktop = XFCE_DESKTOP(object); + + g_object_unref(G_OBJECT(desktop->priv->channel)); + g_free(desktop->priv->property_prefix); + +#ifdef ENABLE_DESKTOP_ICONS + if(desktop->priv->style_refresh_timer != 0) + g_source_remove(desktop->priv->style_refresh_timer); +#endif + + G_OBJECT_CLASS(xfce_desktop_parent_class)->finalize(object); +} + +static void +xfce_desktop_set_property(GObject *object, + guint property_id, + const GValue *value, + GParamSpec *pspec) +{ + XfceDesktop *desktop = XFCE_DESKTOP(object); + + switch(property_id) { +#ifdef ENABLE_DESKTOP_ICONS + case PROP_ICON_STYLE: + xfce_desktop_set_icon_style(desktop, + g_value_get_enum(value)); + break; + + case PROP_ICON_SIZE: + xfce_desktop_set_icon_size(desktop, + g_value_get_uint(value)); + break; + + case PROP_ICON_FONT_SIZE: + xfce_desktop_set_icon_font_size(desktop, + g_value_get_uint(value)); + break; + + case PROP_ICON_FONT_SIZE_SET: + xfce_desktop_set_use_icon_font_size(desktop, + g_value_get_boolean(value)); + break; + +#endif + case PROP_SINGLE_WORKSPACE_MODE: + xfce_desktop_set_single_workspace_mode(desktop, + g_value_get_boolean(value)); + break; + + case PROP_SINGLE_WORKSPACE_NUMBER: + xfce_desktop_set_single_workspace_number(desktop, + g_value_get_int(value)); + break; + + default: + G_OBJECT_WARN_INVALID_PROPERTY_ID(object, property_id, pspec); + break; + } +} + +static void +xfce_desktop_get_property(GObject *object, + guint property_id, + GValue *value, + GParamSpec *pspec) +{ + XfceDesktop *desktop = XFCE_DESKTOP(object); + + switch(property_id) { +#ifdef ENABLE_DESKTOP_ICONS + case PROP_ICON_STYLE: + g_value_set_enum(value, desktop->priv->icons_style); + break; + + case PROP_ICON_SIZE: + g_value_set_uint(value, desktop->priv->icons_size); + break; + + case PROP_ICON_FONT_SIZE: + g_value_set_uint(value, desktop->priv->icons_font_size); + break; + + case PROP_ICON_FONT_SIZE_SET: + g_value_set_boolean(value, desktop->priv->icons_font_size_set); + break; + +#endif + case PROP_SINGLE_WORKSPACE_MODE: + g_value_set_boolean(value, desktop->priv->single_workspace_mode); + break; + + case PROP_SINGLE_WORKSPACE_NUMBER: + g_value_set_int(value, desktop->priv->single_workspace_num); + break; + + default: + G_OBJECT_WARN_INVALID_PROPERTY_ID(object, property_id, pspec); + break; + } +} + +static void +xfce_desktop_realize(GtkWidget *widget) +{ + XfceDesktop *desktop = XFCE_DESKTOP(widget); + GdkAtom atom; + gint sw, sh; + Window xid; + GdkWindow *groot; + WnckScreen *wnck_screen; + + TRACE("entering"); + + gtk_window_set_screen(GTK_WINDOW(desktop), desktop->priv->gscreen); + sw = gdk_screen_get_width(desktop->priv->gscreen); + sh = gdk_screen_get_height(desktop->priv->gscreen); + + g_signal_connect(G_OBJECT(desktop->priv->gscreen), + "monitors-changed", + G_CALLBACK(xfce_desktop_monitors_changed), + desktop); + + /* chain up */ + GTK_WIDGET_CLASS(xfce_desktop_parent_class)->realize(widget); + + gtk_window_set_title(GTK_WINDOW(desktop), _("Desktop")); + + gtk_widget_set_size_request(GTK_WIDGET(desktop), sw, sh); + gtk_window_move(GTK_WINDOW(desktop), 0, 0); + + atom = gdk_atom_intern("_NET_WM_WINDOW_TYPE_DESKTOP", FALSE); + gdk_property_change(gtk_widget_get_window(GTK_WIDGET(desktop)), + gdk_atom_intern("_NET_WM_WINDOW_TYPE", FALSE), + gdk_atom_intern("ATOM", FALSE), 32, + GDK_PROP_MODE_REPLACE, (guchar *)&atom, 1); + + xid = GDK_WINDOW_XID(gtk_widget_get_window(GTK_WIDGET(desktop))); + groot = gdk_screen_get_root_window(desktop->priv->gscreen); + + gdk_property_change(groot, + gdk_atom_intern("XFCE_DESKTOP_WINDOW", FALSE), + gdk_atom_intern("WINDOW", FALSE), 32, + GDK_PROP_MODE_REPLACE, (guchar *)&xid, 1); + + gdk_property_change(groot, + gdk_atom_intern("NAUTILUS_DESKTOP_WINDOW_ID", FALSE), + gdk_atom_intern("WINDOW", FALSE), 32, + GDK_PROP_MODE_REPLACE, (guchar *)&xid, 1); + + screen_set_selection(desktop); + + wnck_screen = wnck_screen_get(gdk_screen_get_number(desktop->priv->gscreen)); + desktop->priv->wnck_screen = wnck_screen; + + /* Watch for single workspace setting changes */ + xfconf_g_property_bind(desktop->priv->channel, + SINGLE_WORKSPACE_MODE, G_TYPE_BOOLEAN, + G_OBJECT(desktop), "single-workspace-mode"); + xfconf_g_property_bind(desktop->priv->channel, + SINGLE_WORKSPACE_NUMBER, G_TYPE_INT, + G_OBJECT(desktop), "single-workspace-number"); + + /* watch for workspace changes */ + g_signal_connect(desktop->priv->wnck_screen, "active-workspace-changed", + G_CALLBACK(workspace_changed_cb), desktop); + g_signal_connect(desktop->priv->wnck_screen, "workspace-created", + G_CALLBACK(workspace_created_cb), desktop); + g_signal_connect(desktop->priv->wnck_screen, "workspace-destroyed", + G_CALLBACK(workspace_destroyed_cb), desktop); + + /* watch for screen changes */ + g_signal_connect(G_OBJECT(desktop->priv->gscreen), "size-changed", + G_CALLBACK(screen_size_changed_cb), desktop); + g_signal_connect(G_OBJECT(desktop->priv->gscreen), "composited-changed", + G_CALLBACK(screen_composited_changed_cb), desktop); + + gtk_widget_add_events(GTK_WIDGET(desktop), GDK_EXPOSURE_MASK); + +#ifdef ENABLE_DESKTOP_ICONS + xfce_desktop_setup_icon_view(desktop); +#endif + + TRACE("exiting"); +} + +static void +xfce_desktop_unrealize(GtkWidget *widget) +{ + XfceDesktop *desktop = XFCE_DESKTOP(widget); + gint i; + GdkWindow *groot; + gchar property_name[128]; + + g_return_if_fail(XFCE_IS_DESKTOP(desktop)); + + /* disconnect all the xfconf settings to this desktop */ + xfconf_g_property_unbind_all(G_OBJECT(desktop)); + + g_signal_handlers_disconnect_by_func(G_OBJECT(desktop->priv->gscreen), + G_CALLBACK(xfce_desktop_monitors_changed), + desktop); + + if(gtk_widget_get_mapped(widget)) + gtk_widget_unmap(widget); + gtk_widget_set_mapped(widget, FALSE); + + gtk_container_forall(GTK_CONTAINER(widget), + (GtkCallback)gtk_widget_unrealize, + NULL); + + g_signal_handlers_disconnect_by_func(G_OBJECT(desktop->priv->gscreen), + G_CALLBACK(screen_size_changed_cb), desktop); + g_signal_handlers_disconnect_by_func(G_OBJECT(desktop->priv->gscreen), + G_CALLBACK(screen_composited_changed_cb), desktop); + + gdk_error_trap_push(); + + groot = gdk_screen_get_root_window(desktop->priv->gscreen); + gdk_property_delete(groot, gdk_atom_intern("XFCE_DESKTOP_WINDOW", FALSE)); + gdk_property_delete(groot, gdk_atom_intern("NAUTILUS_DESKTOP_WINDOW_ID", FALSE)); + +#ifndef DISABLE_FOR_BUG7442 + gdk_property_delete(groot, gdk_atom_intern("_XROOTPMAP_ID", FALSE)); + gdk_property_delete(groot, gdk_atom_intern("ESETROOT_PMAP_ID", FALSE)); + gdk_window_set_back_pixmap(groot, NULL, FALSE); +#endif + + if(desktop->priv->workspaces) { + for(i = 0; i < desktop->priv->nworkspaces; i++) { + g_snprintf(property_name, 128, XFDESKTOP_IMAGE_FILE_FMT, i); + gdk_property_delete(groot, gdk_atom_intern(property_name, FALSE)); + g_object_unref(G_OBJECT(desktop->priv->workspaces[i])); + } + g_free(desktop->priv->workspaces); + desktop->priv->workspaces = NULL; + } + + gdk_flush(); + gdk_error_trap_pop(); + + if(desktop->priv->bg_pixmap) { + g_object_unref(G_OBJECT(desktop->priv->bg_pixmap)); + desktop->priv->bg_pixmap = NULL; + } + + gtk_window_set_icon(GTK_WINDOW(widget), NULL); + + gtk_style_detach(gtk_widget_get_style(widget)); + g_object_unref(G_OBJECT(gtk_widget_get_window(widget))); + gtk_widget_set_window(widget, NULL); + + gtk_selection_remove_all(widget); + + gtk_widget_set_realized(widget, FALSE); +} + +static gboolean +xfce_desktop_button_press_event(GtkWidget *w, + GdkEventButton *evt) +{ + guint button = evt->button; + guint state = evt->state; + XfceDesktop *desktop = XFCE_DESKTOP(w); + + TRACE("entering"); + + g_return_val_if_fail(XFCE_IS_DESKTOP(w), FALSE); + + if(evt->type == GDK_BUTTON_PRESS) { + if(button == 3 || (button == 1 && (state & GDK_SHIFT_MASK))) { +#ifdef ENABLE_DESKTOP_ICONS + /* Let the icon view handle these menu pop ups */ + if(desktop->priv->icons_style != XFCE_DESKTOP_ICON_STYLE_NONE) + return FALSE; +#endif + /* no icons on the desktop, grab the focus and pop up the menu */ + if(!gtk_widget_has_grab(w)) + gtk_grab_add(w); + + xfce_desktop_popup_root_menu(desktop, button, evt->time); + return TRUE; + } else if(button == 2 || (button == 1 && (state & GDK_SHIFT_MASK) + && (state & GDK_CONTROL_MASK))) + { + /* always grab the focus and pop up the menu */ + if(!gtk_widget_has_grab(w)) + gtk_grab_add(w); + + xfce_desktop_popup_secondary_root_menu(desktop, button, evt->time); + return TRUE; + } + } + + return FALSE; +} + +static gboolean +xfce_desktop_button_release_event(GtkWidget *w, + GdkEventButton *evt) +{ + TRACE("entering"); + + gtk_grab_remove(w); + + return FALSE; +} + +/* This function gets called when the user presses the menu key on the keyboard. + * Or Shift+F10 or whatever key binding the user has chosen. */ +static gboolean +xfce_desktop_popup_menu(GtkWidget *w) +{ + GdkEventButton *evt; + guint button, etime; + + TRACE("entering"); + + evt = (GdkEventButton *)gtk_get_current_event(); + if(evt && GDK_BUTTON_PRESS == evt->type) { + button = evt->button; + etime = evt->time; + } else { + button = 0; + etime = gtk_get_current_event_time(); + } + + xfce_desktop_popup_root_menu(XFCE_DESKTOP(w), button, etime); + + gdk_event_free((GdkEvent*)evt); + return TRUE; +} + +static gboolean +xfce_desktop_expose(GtkWidget *w, + GdkEventExpose *evt) +{ + GList *children, *l; + + /*TRACE("entering");*/ + + if(evt->count != 0) + return FALSE; + + gdk_window_clear_area(gtk_widget_get_window(w), evt->area.x, evt->area.y, + evt->area.width, evt->area.height); + + children = gtk_container_get_children(GTK_CONTAINER(w)); + for(l = children; l; l = l->next) { + gtk_container_propagate_expose(GTK_CONTAINER(w), + GTK_WIDGET(l->data), + evt); + } + g_list_free(children); + + return FALSE; +} + +static gboolean +xfce_desktop_delete_event(GtkWidget *w, + GdkEventAny *evt) +{ + if(XFCE_DESKTOP(w)->priv->session_logout_func) + XFCE_DESKTOP(w)->priv->session_logout_func(); + + return TRUE; +} + +#ifdef ENABLE_DESKTOP_ICONS +static gboolean +style_refresh_cb(gpointer *w) +{ + XfceDesktop *desktop = XFCE_DESKTOP(w); + gdouble old_font_size; + + TRACE("entering"); + + 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 FALSE; + + if(desktop->priv->workspaces == NULL) + 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); + + gtk_widget_queue_draw(GTK_WIDGET(desktop)); + + if(!desktop->priv->icon_view || !XFDESKTOP_IS_ICON_VIEW(desktop->priv->icon_view)) + return FALSE; + + /* reset the icon view style */ + gtk_widget_set_style(desktop->priv->icon_view, NULL); + gtk_widget_reset_rc_styles(desktop->priv->icon_view); + + old_font_size = desktop->priv->system_font_size; + if(xfce_desktop_ensure_system_font_size(desktop) != old_font_size + && desktop->priv->icon_view && !desktop->priv->icons_font_size_set) + { + xfdesktop_icon_view_set_font_size(XFDESKTOP_ICON_VIEW(desktop->priv->icon_view), + desktop->priv->system_font_size); + } + + return FALSE; +} +#endif + +static void +xfce_desktop_style_set(GtkWidget *w, GtkStyle *old_style) +{ +#ifdef ENABLE_DESKTOP_ICONS + 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); +#endif +} + +static void +xfce_desktop_connect_settings(XfceDesktop *desktop) +{ +#ifdef ENABLE_DESKTOP_ICONS +#define ICONS_PREFIX "/desktop-icons/" + XfconfChannel *channel = desktop->priv->channel; + + xfce_desktop_freeze_updates(desktop); + + xfconf_g_property_bind(channel, ICONS_PREFIX "style", + XFCE_TYPE_DESKTOP_ICON_STYLE, + G_OBJECT(desktop), "icon-style"); + xfconf_g_property_bind(channel, ICONS_PREFIX "icon-size", G_TYPE_UINT, + G_OBJECT(desktop), "icon-size"); + xfconf_g_property_bind(channel, ICONS_PREFIX "font-size", G_TYPE_UINT, + G_OBJECT(desktop), "icon-font-size"); + xfconf_g_property_bind(channel, ICONS_PREFIX "use-custom-font-size", + G_TYPE_BOOLEAN, + G_OBJECT(desktop), "icon-font-size-set"); + + xfce_desktop_thaw_updates(desktop); +#undef ICONS_PREFIX +#endif +} + +static gboolean +xfce_desktop_get_single_workspace_mode(XfceDesktop *desktop) +{ + g_return_val_if_fail(XFCE_IS_DESKTOP(desktop), TRUE); + + return desktop->priv->single_workspace_mode; +} + +static gint +xfce_desktop_get_current_workspace(XfceDesktop *desktop) +{ + WnckWorkspace *wnck_workspace; + gint workspace_num, current_workspace; + + g_return_val_if_fail(XFCE_IS_DESKTOP(desktop), -1); + + wnck_workspace = wnck_screen_get_active_workspace(desktop->priv->wnck_screen); + + if(wnck_workspace != NULL) { + workspace_num = wnck_workspace_get_number(wnck_workspace); + } else { + workspace_num = desktop->priv->nworkspaces; + } + + /* If we're in single_workspace mode we need to return the workspace that + * it was set to, if possible, otherwise return the current workspace */ + if(xfce_desktop_get_single_workspace_mode(desktop) && + desktop->priv->single_workspace_num < desktop->priv->nworkspaces) { + current_workspace = desktop->priv->single_workspace_num; + } else { + current_workspace = workspace_num; + } + + XF_DEBUG("workspace_num %d, single_workspace_num %d, current_workspace %d, max workspaces %d", + workspace_num, desktop->priv->single_workspace_num, current_workspace, + desktop->priv->nworkspaces); + + return current_workspace; +} + +/* public api */ + +/** + * xfce_desktop_new: + * @gscreen: The current #GdkScreen. + * @channel: An #XfconfChannel to use for settings. + * @property_prefix: String prefix for per-screen properties. + * + * Creates a new #XfceDesktop for the specified #GdkScreen. If @gscreen is + * %NULL, the default screen will be used. + * + * Return value: A new #XfceDesktop. + **/ +GtkWidget * +xfce_desktop_new(GdkScreen *gscreen, + XfconfChannel *channel, + const gchar *property_prefix) +{ + XfceDesktop *desktop; + + g_return_val_if_fail(channel && property_prefix, NULL); + + desktop = g_object_new(XFCE_TYPE_DESKTOP, NULL); + + if(!gscreen) + gscreen = gdk_display_get_default_screen(gdk_display_get_default()); + gtk_window_set_screen(GTK_WINDOW(desktop), gscreen); + desktop->priv->gscreen = gscreen; + + desktop->priv->channel = g_object_ref(G_OBJECT(channel)); + desktop->priv->property_prefix = g_strdup(property_prefix); + + xfce_desktop_connect_settings(desktop); + + desktop->priv->last_filename = g_strdup(""); + + return GTK_WIDGET(desktop); +} + +gint +xfce_desktop_get_n_monitors(XfceDesktop *desktop) +{ + g_return_val_if_fail(XFCE_IS_DESKTOP(desktop), 0); + + return gdk_screen_get_n_monitors(desktop->priv->gscreen); +} + +gint +xfce_desktop_get_width(XfceDesktop *desktop) +{ + g_return_val_if_fail(XFCE_IS_DESKTOP(desktop), -1); + + return gdk_screen_get_width(desktop->priv->gscreen); +} + +gint +xfce_desktop_get_height(XfceDesktop *desktop) +{ + g_return_val_if_fail(XFCE_IS_DESKTOP(desktop), -1); + + return gdk_screen_get_height(desktop->priv->gscreen); +} + +void +xfce_desktop_set_icon_style(XfceDesktop *desktop, + XfceDesktopIconStyle style) +{ + g_return_if_fail(XFCE_IS_DESKTOP(desktop) + && style <= XFCE_DESKTOP_ICON_STYLE_FILES); + +#ifdef ENABLE_DESKTOP_ICONS + if(style == desktop->priv->icons_style) + return; + + if(desktop->priv->icon_view) { + gtk_widget_destroy(desktop->priv->icon_view); + desktop->priv->icon_view = NULL; + } + + desktop->priv->icons_style = style; + if(gtk_widget_get_realized(GTK_WIDGET(desktop))) + xfce_desktop_setup_icon_view(desktop); +#endif +} + +#ifdef ENABLE_DESKTOP_ICONS +static gboolean +hidden_idle_cb(gpointer user_data) +{ + XfceDesktop *desktop; + + g_return_val_if_fail(XFCE_IS_DESKTOP(user_data), FALSE); + + desktop = XFCE_DESKTOP(user_data); + + /* destroy and load the icon view so that it adds or removes + * the hidden icons from the desktop */ + if(desktop->priv->icon_view) { + gtk_widget_destroy(desktop->priv->icon_view); + desktop->priv->icon_view = NULL; + } + + if(gtk_widget_get_realized(GTK_WIDGET(desktop))) + xfce_desktop_setup_icon_view(desktop); + + return FALSE; +} + +static void +hidden_state_changed_cb(GObject *object, + XfceDesktop *desktop) +{ + g_return_if_fail(XFCE_IS_DESKTOP(desktop)); + + if(desktop->priv->icon_view) { + g_signal_handlers_disconnect_by_func(object, + G_CALLBACK(hidden_state_changed_cb), + desktop); + } + + /* We have to do this in an idle callback */ + g_idle_add(hidden_idle_cb, desktop); +} +#endif /* ENABLE_DESKTOP_ICONS */ + +XfceDesktopIconStyle +xfce_desktop_get_icon_style(XfceDesktop *desktop) +{ + g_return_val_if_fail(XFCE_IS_DESKTOP(desktop), XFCE_DESKTOP_ICON_STYLE_NONE); + +#ifdef ENABLE_DESKTOP_ICONS + return desktop->priv->icons_style; +#else + return XFCE_DESKTOP_ICON_STYLE_NONE; +#endif +} + +void +xfce_desktop_set_icon_size(XfceDesktop *desktop, + guint icon_size) +{ + g_return_if_fail(XFCE_IS_DESKTOP(desktop)); + +#ifdef ENABLE_DESKTOP_ICONS + if(icon_size == desktop->priv->icons_size) + return; + + desktop->priv->icons_size = icon_size; + + if(desktop->priv->icon_view) { + xfdesktop_icon_view_set_icon_size(XFDESKTOP_ICON_VIEW(desktop->priv->icon_view), + icon_size); + } +#endif +} + +void +xfce_desktop_set_icon_font_size(XfceDesktop *desktop, + guint font_size_points) +{ + g_return_if_fail(XFCE_IS_DESKTOP(desktop)); + +#ifdef ENABLE_DESKTOP_ICONS + if(font_size_points == desktop->priv->icons_font_size) + return; + + desktop->priv->icons_font_size = font_size_points; + + if(desktop->priv->icons_font_size_set && desktop->priv->icon_view) { + xfdesktop_icon_view_set_font_size(XFDESKTOP_ICON_VIEW(desktop->priv->icon_view), + font_size_points); + } +#endif +} + +void +xfce_desktop_set_use_icon_font_size(XfceDesktop *desktop, + gboolean use_icon_font_size) +{ + g_return_if_fail(XFCE_IS_DESKTOP(desktop)); + +#ifdef ENABLE_DESKTOP_ICONS + if(use_icon_font_size == desktop->priv->icons_font_size_set) + return; + + desktop->priv->icons_font_size_set = use_icon_font_size; + + if(desktop->priv->icon_view) { + if(!use_icon_font_size) { + xfce_desktop_ensure_system_font_size(desktop); + xfdesktop_icon_view_set_font_size(XFDESKTOP_ICON_VIEW(desktop->priv->icon_view), + desktop->priv->system_font_size); + } else { + xfdesktop_icon_view_set_font_size(XFDESKTOP_ICON_VIEW(desktop->priv->icon_view), + desktop->priv->icons_font_size); + } + } +#endif +} + +static void +xfce_desktop_set_single_workspace_mode(XfceDesktop *desktop, + gboolean single_workspace) +{ + g_return_if_fail(XFCE_IS_DESKTOP(desktop)); + + if(single_workspace == desktop->priv->single_workspace_mode) + return; + + desktop->priv->single_workspace_mode = single_workspace; + + XF_DEBUG("single_workspace_mode now %s", single_workspace ? "TRUE" : "FALSE"); + + + /* If the desktop has been realized then fake a screen size change to + * update the backdrop. There's no reason to if there's no desktop yet */ + if(gtk_widget_get_realized(GTK_WIDGET(desktop))) + screen_size_changed_cb(desktop->priv->gscreen, desktop); +} + +static void +xfce_desktop_set_single_workspace_number(XfceDesktop *desktop, + gint workspace_num) +{ + g_return_if_fail(XFCE_IS_DESKTOP(desktop)); + + if(workspace_num == desktop->priv->single_workspace_num) + return; + + XF_DEBUG("single_workspace_num now %d", workspace_num); + + desktop->priv->single_workspace_num = workspace_num; + + if(xfce_desktop_get_single_workspace_mode(desktop)) { + /* Fake a screen size changed to update the backdrop */ + screen_size_changed_cb(desktop->priv->gscreen, desktop); + } +} + +void +xfce_desktop_set_session_logout_func(XfceDesktop *desktop, + SessionLogoutFunc logout_func) +{ + g_return_if_fail(XFCE_IS_DESKTOP(desktop)); + desktop->priv->session_logout_func = logout_func; +} + +void +xfce_desktop_freeze_updates(XfceDesktop *desktop) +{ + g_return_if_fail(XFCE_IS_DESKTOP(desktop)); + desktop->priv->updates_frozen = TRUE; +} + +void +xfce_desktop_thaw_updates(XfceDesktop *desktop) +{ + g_return_if_fail(XFCE_IS_DESKTOP(desktop)); + + desktop->priv->updates_frozen = FALSE; + if(gtk_widget_get_realized(GTK_WIDGET(desktop))) + xfce_desktop_monitors_changed(desktop->priv->gscreen, desktop); +} + +static gboolean +xfce_desktop_menu_destroy_idled(gpointer data) +{ + gtk_widget_destroy(GTK_WIDGET(data)); + return FALSE; +} + +static void +xfce_desktop_do_menu_popup(XfceDesktop *desktop, + guint button, + guint activate_time, + guint populate_signal) +{ + GdkScreen *screen; + GtkWidget *menu; + GList *menu_children; + + TRACE("entering"); + + if(gtk_widget_has_screen(GTK_WIDGET(desktop))) + screen = gtk_widget_get_screen(GTK_WIDGET(desktop)); + else + screen = gdk_display_get_default_screen(gdk_display_get_default()); + + menu = gtk_menu_new(); + gtk_menu_set_screen(GTK_MENU(menu), screen); + g_signal_connect_swapped(G_OBJECT(menu), "deactivate", + G_CALLBACK(g_idle_add), + (gpointer)xfce_desktop_menu_destroy_idled); + + g_signal_emit(G_OBJECT(desktop), populate_signal, 0, menu); + + /* if nobody populated the menu, don't do anything */ + menu_children = gtk_container_get_children(GTK_CONTAINER(menu)); + if(!menu_children) { + gtk_widget_destroy(menu); + return; + } + + g_list_free(menu_children); + + gtk_menu_attach_to_widget(GTK_MENU(menu), GTK_WIDGET(desktop), NULL); + + /* Per gtk_menu_popup's documentation "for conflict-resolve initiation of + * concurrent requests for mouse/keyboard grab requests." */ + if(activate_time == 0) + activate_time = gtk_get_current_event_time(); + + gtk_menu_popup(GTK_MENU(menu), NULL, NULL, NULL, NULL, button, activate_time); +} + +void +xfce_desktop_popup_root_menu(XfceDesktop *desktop, + guint button, + guint activate_time) +{ + TRACE("entering"); + + /* If it's launched by xfdesktop --menu we won't have an event time. + * Grab the keyboard focus */ + if(activate_time == 0) + activate_time = xfdesktop_popup_keyboard_grab_available(gtk_widget_get_window(GTK_WIDGET(desktop))); + + xfce_desktop_do_menu_popup(desktop, button, activate_time, + signals[SIG_POPULATE_ROOT_MENU]); + +} + +void +xfce_desktop_popup_secondary_root_menu(XfceDesktop *desktop, + guint button, + guint activate_time) +{ + /* If it's launched by xfdesktop --windowlist we won't have an event time. + * Grab the keyboard focus */ + if(activate_time == 0) + activate_time = xfdesktop_popup_keyboard_grab_available(gtk_widget_get_window(GTK_WIDGET(desktop))); + + xfce_desktop_do_menu_popup(desktop, button, activate_time, + signals[SIG_POPULATE_SECONDARY_ROOT_MENU]); +} + +void +xfce_desktop_refresh(XfceDesktop *desktop, gboolean advance_wallpaper) +{ + gint i, current_workspace; + + TRACE("entering"); + + g_return_if_fail(XFCE_IS_DESKTOP(desktop)); + + if(!gtk_widget_get_realized(GTK_WIDGET(desktop))) + return; + + if(desktop->priv->workspaces == NULL) { + return; + } + + current_workspace = xfce_desktop_get_current_workspace(desktop); + + /* reload backgrounds */ + for(i = 0; i < xfce_desktop_get_n_monitors(desktop); i++) { + XfceBackdrop *backdrop; + + backdrop = xfce_workspace_get_backdrop(desktop->priv->workspaces[current_workspace], i); + + if(advance_wallpaper) { + /* We need to trigger a new wallpaper event */ + xfce_backdrop_force_cycle(backdrop); + } else { + /* Fake a changed event so we redraw the wallpaper */ + backdrop_changed_cb(backdrop, desktop); + } + } + + /* If we're only advancing the wallpaper we can exit here */ + if(advance_wallpaper) + return; + +#ifdef ENABLE_DESKTOP_ICONS + /* reload icon view */ + if(desktop->priv->icon_view) { + gtk_widget_destroy(desktop->priv->icon_view); + desktop->priv->icon_view = NULL; + } + xfce_desktop_setup_icon_view(desktop); +#endif + +} + +void xfce_desktop_arrange_icons(XfceDesktop *desktop) +{ + g_return_if_fail(XFCE_IS_DESKTOP(desktop)); + +#ifdef ENABLE_DESKTOP_ICONS + g_return_if_fail(XFDESKTOP_IS_ICON_VIEW(desktop->priv->icon_view)); + + xfdesktop_icon_view_sort_icons(XFDESKTOP_ICON_VIEW(desktop->priv->icon_view)); +#endif +} diff -Nru xfdesktop4-4.11.6/.pc/xubuntu_set-accountsservice-user-bg.patch/src/xfce-desktop.c xfdesktop4-4.19.2/.pc/xubuntu_set-accountsservice-user-bg.patch/src/xfce-desktop.c --- xfdesktop4-4.11.6/.pc/xubuntu_set-accountsservice-user-bg.patch/src/xfce-desktop.c 1970-01-01 00:00:00.000000000 +0000 +++ xfdesktop4-4.19.2/.pc/xubuntu_set-accountsservice-user-bg.patch/src/xfce-desktop.c 2014-09-08 16:22:50.000000000 +0000 @@ -0,0 +1,1793 @@ +/* + * xfdesktop - xfce4's desktop manager + * + * Copyright (c) 2004-2007 Brian Tarricone, + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Library General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software Foundation, + * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA + * + * Random portions taken from or inspired by the original xfdesktop for xfce4: + * Copyright (C) 2002-2003 Jasper Huijsmans (huysmans@users.sourceforge.net) + * Copyright (C) 2003 Benedikt Meurer + */ + +#ifdef HAVE_CONFIG_H +#include +#endif + +#include + +#ifdef HAVE_STDLIB_H +#include +#endif + +#ifdef HAVE_STRING_H +#include +#endif + +#ifdef HAVE_SYS_TYPES_H +#include +#endif +#ifdef HAVE_SYS_STAT_H +#include +#endif +#ifdef HAVE_UNISTD_H +#include +#endif + +#ifdef HAVE_FCNTL_H +#include +#endif + +#include +#include + +#ifdef HAVE_TIME_H +#include +#endif + +#include +#include + +#include +#include +#include + +#ifdef ENABLE_DESKTOP_ICONS +#include "xfdesktop-icon-view.h" +#include "xfdesktop-window-icon-manager.h" +# ifdef ENABLE_FILE_ICONS +# include "xfdesktop-file-icon-manager.h" +# include "xfdesktop-special-file-icon.h" +# endif +#endif + +#include +#include + +#include +#include + +#include "xfdesktop-common.h" +#include "xfce-desktop.h" +#include "xfce-desktop-enum-types.h" +#include "xfce-workspace.h" + +/* disable setting the x background for bug 7442 */ +//#define DISABLE_FOR_BUG7442 + +struct _XfceDesktopPriv +{ + GdkScreen *gscreen; + WnckScreen *wnck_screen; + gboolean updates_frozen; + + XfconfChannel *channel; + gchar *property_prefix; + + GdkPixmap *bg_pixmap; + + gint nworkspaces; + XfceWorkspace **workspaces; + gint current_workspace; + + gboolean single_workspace_mode; + gint single_workspace_num; + + SessionLogoutFunc session_logout_func; + + guint32 grab_time; + +#ifdef ENABLE_DESKTOP_ICONS + XfceDesktopIconStyle icons_style; + gboolean icons_font_size_set; + guint icons_font_size; + guint icons_size; + gint style_refresh_timer; + GtkWidget *icon_view; + gdouble system_font_size; +#endif +}; + +enum +{ + SIG_POPULATE_ROOT_MENU = 0, + SIG_POPULATE_SECONDARY_ROOT_MENU, + N_SIGNALS +}; + +enum +{ + PROP_0 = 0, +#ifdef ENABLE_DESKTOP_ICONS + PROP_ICON_STYLE, + PROP_ICON_SIZE, + PROP_ICON_FONT_SIZE, + PROP_ICON_FONT_SIZE_SET, +#endif + PROP_SINGLE_WORKSPACE_MODE, + PROP_SINGLE_WORKSPACE_NUMBER, +}; + + +static void xfce_desktop_finalize(GObject *object); +static void xfce_desktop_set_property(GObject *object, + guint property_id, + const GValue *value, + GParamSpec *pspec); +static void xfce_desktop_get_property(GObject *object, + guint property_id, + GValue *value, + GParamSpec *pspec); + +static void xfce_desktop_realize(GtkWidget *widget); +static void xfce_desktop_unrealize(GtkWidget *widget); +static gboolean xfce_desktop_button_press_event(GtkWidget *widget, + GdkEventButton *evt); +static gboolean xfce_desktop_button_release_event(GtkWidget *widget, + GdkEventButton *evt); +static gboolean xfce_desktop_popup_menu(GtkWidget *widget); + +static gboolean xfce_desktop_expose(GtkWidget *w, + GdkEventExpose *evt); +static gboolean xfce_desktop_delete_event(GtkWidget *w, + GdkEventAny *evt); +static void xfce_desktop_style_set(GtkWidget *w, + GtkStyle *old_style); + +static void xfce_desktop_set_single_workspace_mode(XfceDesktop *desktop, + gboolean single_workspace); +static void xfce_desktop_set_single_workspace_number(XfceDesktop *desktop, + gint workspace_num); + +static gboolean xfce_desktop_get_single_workspace_mode(XfceDesktop *desktop); +static gint xfce_desktop_get_current_workspace(XfceDesktop *desktop); + +#ifdef ENABLE_DESKTOP_ICONS +static void hidden_state_changed_cb(GObject *object, XfceDesktop *desktop); +#endif + + +static guint signals[N_SIGNALS] = { 0, }; + +/* private functions */ + +#ifdef ENABLE_DESKTOP_ICONS +static gdouble +xfce_desktop_ensure_system_font_size(XfceDesktop *desktop) +{ + GdkScreen *gscreen; + GtkSettings *settings; + gchar *font_name = NULL; + PangoFontDescription *pfd; + + gscreen = gtk_widget_get_screen(GTK_WIDGET(desktop)); + + settings = gtk_settings_get_for_screen(gscreen); + g_object_get(G_OBJECT(settings), "gtk-font-name", &font_name, NULL); + + pfd = pango_font_description_from_string(font_name); + desktop->priv->system_font_size = pango_font_description_get_size(pfd); + /* FIXME: this seems backwards from the documentation */ + if(!pango_font_description_get_size_is_absolute(pfd)) { + XF_DEBUG("dividing by PANGO_SCALE"); + desktop->priv->system_font_size /= PANGO_SCALE; + } + XF_DEBUG("system font size is %.05f", desktop->priv->system_font_size); + + g_free(font_name); + pango_font_description_free(pfd); + + return desktop->priv->system_font_size; +} + +static void +xfce_desktop_setup_icon_view(XfceDesktop *desktop) +{ + XfdesktopIconViewManager *manager = NULL; + + switch(desktop->priv->icons_style) { + case XFCE_DESKTOP_ICON_STYLE_NONE: + /* nada */ + break; + + case XFCE_DESKTOP_ICON_STYLE_WINDOWS: + manager = xfdesktop_window_icon_manager_new(desktop->priv->gscreen); + break; + +#ifdef ENABLE_FILE_ICONS + case XFCE_DESKTOP_ICON_STYLE_FILES: + { + GFile *file; + const gchar *desktop_path; + + desktop_path = g_get_user_special_dir(G_USER_DIRECTORY_DESKTOP); + file = g_file_new_for_path(desktop_path); + manager = xfdesktop_file_icon_manager_new(file, desktop->priv->channel); + g_object_unref(file); + } + break; +#endif + + default: + g_critical("Unusable XfceDesktopIconStyle: %d. Unable to " \ + "display desktop icons.", + desktop->priv->icons_style); + break; + } + + if(manager) { + xfce_desktop_ensure_system_font_size(desktop); + + desktop->priv->icon_view = xfdesktop_icon_view_new(manager); + /* If the user set a custom font size, use it. Otherwise use the system + * font size */ + xfdesktop_icon_view_set_font_size(XFDESKTOP_ICON_VIEW(desktop->priv->icon_view), + (!desktop->priv->icons_font_size_set) + ? desktop->priv->system_font_size + : desktop->priv->icons_font_size); + if(desktop->priv->icons_size > 0) { + xfdesktop_icon_view_set_icon_size(XFDESKTOP_ICON_VIEW(desktop->priv->icon_view), + desktop->priv->icons_size); + } + gtk_widget_show(desktop->priv->icon_view); + gtk_container_add(GTK_CONTAINER(desktop), desktop->priv->icon_view); + + g_signal_connect(G_OBJECT(manager), "hidden-state-changed", G_CALLBACK(hidden_state_changed_cb), desktop); + } + + gtk_widget_queue_draw(GTK_WIDGET(desktop)); +} +#endif + +static void +set_imgfile_root_property(XfceDesktop *desktop, const gchar *filename, + gint monitor) +{ + gchar property_name[128]; + + gdk_error_trap_push(); + + g_snprintf(property_name, 128, XFDESKTOP_IMAGE_FILE_FMT, monitor); + if(filename) { + gdk_property_change(gdk_screen_get_root_window(desktop->priv->gscreen), + gdk_atom_intern(property_name, FALSE), + gdk_x11_xatom_to_atom(XA_STRING), 8, + GDK_PROP_MODE_REPLACE, + (guchar *)filename, strlen(filename)+1); + } else { + gdk_property_delete(gdk_screen_get_root_window(desktop->priv->gscreen), + gdk_atom_intern(property_name, FALSE)); + } + + gdk_error_trap_pop(); +} + +static void +set_real_root_window_pixmap(GdkScreen *gscreen, + GdkPixmap *pmap) +{ +#ifndef DISABLE_FOR_BUG7442 + Window xid; + GdkWindow *groot; + + xid = GDK_DRAWABLE_XID(pmap); + groot = gdk_screen_get_root_window(gscreen); + + gdk_error_trap_push(); + + /* set root property for transparent Eterms */ + gdk_property_change(groot, + gdk_atom_intern("_XROOTPMAP_ID", FALSE), + gdk_atom_intern("PIXMAP", FALSE), 32, + GDK_PROP_MODE_REPLACE, (guchar *)&xid, 1); + /* and set the root window's BG pixmap, because aterm is somewhat lame. */ + gdk_window_set_back_pixmap(groot, pmap, FALSE); + /* there really should be a standard for this crap... */ + + gdk_error_trap_pop(); +#endif +} + +static GdkPixmap * +create_bg_pixmap(GdkScreen *gscreen, gpointer user_data) +{ + XfceDesktop *desktop = user_data; + gint w, h; + + TRACE("entering"); + + g_return_val_if_fail(XFCE_IS_DESKTOP(desktop), NULL); + + /* If the workspaces haven't been created yet there's no need to do the + * background pixmap */ + if(desktop->priv->workspaces == NULL) { + XF_DEBUG("exiting, desktop->priv->workspaces == NULL"); + return NULL; + } + + TRACE("really entering"); + + w = gdk_screen_get_width(gscreen); + h = gdk_screen_get_height(gscreen); + gtk_widget_set_size_request(GTK_WIDGET(desktop), w, h); + gtk_window_resize(GTK_WINDOW(desktop), w, h); + + if(desktop->priv->bg_pixmap) + g_object_unref(G_OBJECT(desktop->priv->bg_pixmap)); + desktop->priv->bg_pixmap = gdk_pixmap_new(GDK_DRAWABLE(gtk_widget_get_window(GTK_WIDGET(desktop))), + w, h, -1); + + if(!GDK_IS_PIXMAP(desktop->priv->bg_pixmap)) + return NULL; + + gdk_window_set_back_pixmap(gtk_widget_get_window(GTK_WIDGET(desktop)), + desktop->priv->bg_pixmap, FALSE); + + return desktop->priv->bg_pixmap; +} + +static void +backdrop_changed_cb(XfceBackdrop *backdrop, gpointer user_data) +{ + XfceDesktop *desktop = XFCE_DESKTOP(user_data); + GdkPixmap *pmap = desktop->priv->bg_pixmap; + GdkScreen *gscreen = desktop->priv->gscreen; + GdkRectangle rect; + GdkRegion *clip_region = NULL; + gint i, monitor = -1, current_workspace; +#ifdef G_ENABLE_DEBUG + gchar *monitor_name = NULL; +#endif + + TRACE("entering"); + + g_return_if_fail(XFCE_IS_DESKTOP(desktop)); + + if(!XFCE_IS_BACKDROP(backdrop)) + return; + + if(desktop->priv->updates_frozen || !gtk_widget_get_realized(GTK_WIDGET(desktop))) + return; + + TRACE("really entering"); + + current_workspace = xfce_desktop_get_current_workspace(desktop); + + /* Find out which monitor the backdrop is on */ + for(i = 0; i < xfce_desktop_get_n_monitors(desktop); i++) { + if(backdrop == xfce_workspace_get_backdrop(desktop->priv->workspaces[current_workspace], i)) { + monitor = i; + break; + } + } + if(monitor == -1) + return; + +#ifdef G_ENABLE_DEBUG + monitor_name = gdk_screen_get_monitor_plug_name(gscreen, monitor); + + XF_DEBUG("backdrop changed for workspace %d, monitor %d (%s)", current_workspace, monitor, monitor_name); + + g_free(monitor_name); +#endif + + if(xfce_desktop_get_n_monitors(desktop) > 1 + && xfce_workspace_get_xinerama_stretch(desktop->priv->workspaces[current_workspace])) { + /* Spanning screens */ + GdkRectangle monitor_rect; + + gdk_screen_get_monitor_geometry(gscreen, 0, &rect); + /* Get the lowest x and y value for all the monitors in + * case none of them start at 0,0 for whatever reason. + */ + for(i = 1; i < xfce_desktop_get_n_monitors(desktop); i++) { + gdk_screen_get_monitor_geometry(gscreen, i, &monitor_rect); + + if(monitor_rect.x < rect.x) + rect.x = monitor_rect.x; + if(monitor_rect.y < rect.y) + rect.y = monitor_rect.y; + } + + rect.width = gdk_screen_get_width(gscreen); + rect.height = gdk_screen_get_height(gscreen); + XF_DEBUG("xinerama_stretch x %d, y %d, width %d, height %d", + rect.x, rect.y, rect.width, rect.height); + } else { + gdk_screen_get_monitor_geometry(gscreen, monitor, &rect); + XF_DEBUG("monitor x %d, y %d, width %d, height %d", + rect.x, rect.y, rect.width, rect.height); + } + + xfce_backdrop_set_size(backdrop, rect.width, rect.height); + + if(monitor > 0 + && !xfce_workspace_get_xinerama_stretch(desktop->priv->workspaces[current_workspace])) { + clip_region = gdk_region_rectangle(&rect); + + XF_DEBUG("clip_region: x: %d, y: %d, w: %d, h: %d", + rect.x, rect.y, rect.width, rect.height); + + /* If we are not monitor 0 on a multi-monitor setup we need to subtract + * all the previous monitor regions so we don't draw over them. This + * should prevent the overlap and double backdrop drawing bugs. + */ + for(i = 0; i < monitor; i++) { + GdkRectangle previous_monitor; + GdkRegion *previous_region; + gdk_screen_get_monitor_geometry(gscreen, i, &previous_monitor); + + XF_DEBUG("previous_monitor: x: %d, y: %d, w: %d, h: %d", + previous_monitor.x, previous_monitor.y, + previous_monitor.width, previous_monitor.height); + + previous_region = gdk_region_rectangle(&previous_monitor); + + gdk_region_subtract(clip_region, previous_region); + + gdk_region_destroy(previous_region); + } + } + + if(clip_region != NULL) { + /* Update the area to redraw to limit the icons/area painted */ + gdk_region_get_clipbox(clip_region, &rect); + XF_DEBUG("area to update: x: %d, y: %d, w: %d, h: %d", + rect.x, rect.y, rect.width, rect.height); + } + + if(rect.width != 0 && rect.height != 0) { + /* get the composited backdrop pixmap */ + GdkPixbuf *pix = xfce_backdrop_get_pixbuf(backdrop); + cairo_t *cr; + + /* create the backdrop if needed */ + if(!pix) { + xfce_backdrop_generate_async(backdrop); + + if(clip_region != NULL) + gdk_region_destroy(clip_region); + + return; + } + + /* Create the background pixmap if it isn't already */ + if(!GDK_IS_PIXMAP(pmap)) { + pmap = create_bg_pixmap(gscreen, desktop); + + if(!GDK_IS_PIXMAP(pmap)) { + g_object_unref(pix); + + if(clip_region != NULL) + gdk_region_destroy(clip_region); + + return; + } + } + + cr = gdk_cairo_create(GDK_DRAWABLE(pmap)); + gdk_cairo_set_source_pixbuf(cr, pix, rect.x, rect.y); + + /* clip the area so we don't draw over a previous wallpaper */ + if(clip_region != NULL) { + gdk_cairo_region(cr, clip_region); + cairo_clip(cr); + } + + cairo_paint(cr); + + /* tell gtk to redraw the repainted area */ + gtk_widget_queue_draw_area(GTK_WIDGET(desktop), rect.x, rect.y, + rect.width, rect.height); + + set_imgfile_root_property(desktop, + xfce_backdrop_get_image_filename(backdrop), + monitor); + + /* do this again so apps watching the root win notice the update */ + set_real_root_window_pixmap(gscreen, pmap); + + g_object_unref(G_OBJECT(pix)); + cairo_destroy(cr); + gtk_widget_show(GTK_WIDGET(desktop)); + } + + if(clip_region != NULL) + gdk_region_destroy(clip_region); +} + +static void +screen_size_changed_cb(GdkScreen *gscreen, gpointer user_data) +{ + XfceDesktop *desktop = user_data; + gint current_workspace; + + TRACE("entering"); + + current_workspace = xfce_desktop_get_current_workspace(desktop); + + if(desktop->priv->nworkspaces <= current_workspace) + return; + + if(current_workspace < 0) + return; + + /* release the bg_pixmap since the dimensions may have changed */ + if(desktop->priv->bg_pixmap) { + g_object_unref(desktop->priv->bg_pixmap); + desktop->priv->bg_pixmap = NULL; + } + + /* special case for 1 backdrop to handle xinerama stretching */ + if(xfce_workspace_get_xinerama_stretch(desktop->priv->workspaces[current_workspace])) { + backdrop_changed_cb(xfce_workspace_get_backdrop(desktop->priv->workspaces[current_workspace], 0), desktop); + } else { + gint i; + + for(i = 0; i < xfce_desktop_get_n_monitors(desktop); i++) { + XfceBackdrop *current_backdrop; + current_backdrop = xfce_workspace_get_backdrop(desktop->priv->workspaces[current_workspace], i); + backdrop_changed_cb(current_backdrop, desktop); + } + } +} + +static void +screen_composited_changed_cb(GdkScreen *gscreen, + gpointer user_data) +{ + TRACE("entering"); + /* fake a screen size changed, so the background is properly set */ + screen_size_changed_cb(gscreen, user_data); +} + +static void +xfce_desktop_monitors_changed(GdkScreen *gscreen, + gpointer user_data) +{ + XfceDesktop *desktop = XFCE_DESKTOP(user_data); + gint i; + + TRACE("entering"); + + /* Update the workspaces */ + for(i = 0; i < desktop->priv->nworkspaces; i++) { + xfce_workspace_monitors_changed(desktop->priv->workspaces[i], + gscreen); + } + + /* fake a screen size changed, so the background is properly set */ + screen_size_changed_cb(gscreen, user_data); +} + +static void +workspace_backdrop_changed_cb(XfceWorkspace *workspace, + XfceBackdrop *backdrop, + gpointer user_data) +{ + XfceDesktop *desktop = XFCE_DESKTOP(user_data); + gint current_workspace = 0, monitor = 0, i; + + TRACE("entering"); + + g_return_if_fail(XFCE_IS_WORKSPACE(workspace) && XFCE_IS_BACKDROP(backdrop)); + + current_workspace = xfce_desktop_get_current_workspace(desktop); + + /* Find out which monitor the backdrop is on */ + for(i = 0; i < xfce_desktop_get_n_monitors(desktop); i++) { + if(backdrop == xfce_workspace_get_backdrop(desktop->priv->workspaces[current_workspace], i)) { + monitor = i; + break; + } + } + + if(xfce_desktop_get_current_workspace(desktop) == xfce_workspace_get_workspace_num(workspace)) { + /* Update the backdrop! + * In spanning mode, ignore updates to monitors other than the primary + */ + if(!xfce_workspace_get_xinerama_stretch(workspace) || monitor == 0) { + backdrop_changed_cb(backdrop, user_data); + } + } +} + +static void +workspace_changed_cb(WnckScreen *wnck_screen, + WnckWorkspace *previously_active_space, + gpointer user_data) +{ + XfceDesktop *desktop = XFCE_DESKTOP(user_data); + gint current_workspace, new_workspace, i; + XfceBackdrop *backdrop; + + TRACE("entering"); + + current_workspace = desktop->priv->current_workspace; + new_workspace = xfce_desktop_get_current_workspace(desktop); + + if(new_workspace < 0 || new_workspace >= desktop->priv->nworkspaces) + return; + + desktop->priv->current_workspace = new_workspace; + + XF_DEBUG("current_workspace %d, new_workspace %d", + current_workspace, new_workspace); + + for(i = 0; i < xfce_desktop_get_n_monitors(desktop); i++) { + backdrop = xfce_workspace_get_backdrop(desktop->priv->workspaces[new_workspace], i); + /* update it */ + backdrop_changed_cb(backdrop, user_data); + + /* When we're spanning screens we only care about the first monitor */ + if(xfce_workspace_get_xinerama_stretch(desktop->priv->workspaces[new_workspace])) + break; + } +} + +static void +workspace_created_cb(WnckScreen *wnck_screen, + WnckWorkspace *new_workspace, + gpointer user_data) +{ + XfceDesktop *desktop = XFCE_DESKTOP(user_data); + gint nlast_workspace; + TRACE("entering"); + + nlast_workspace = desktop->priv->nworkspaces; + + /* add one more workspace */ + desktop->priv->nworkspaces = nlast_workspace + 1; + + /* allocate size for it */ + desktop->priv->workspaces = g_realloc(desktop->priv->workspaces, + desktop->priv->nworkspaces * sizeof(XfceWorkspace *)); + + /* create the new workspace and set it up */ + desktop->priv->workspaces[nlast_workspace] = xfce_workspace_new(desktop->priv->gscreen, + desktop->priv->channel, + desktop->priv->property_prefix, + nlast_workspace); + + xfce_workspace_monitors_changed(desktop->priv->workspaces[nlast_workspace], + desktop->priv->gscreen); + + g_signal_connect(desktop->priv->workspaces[nlast_workspace], + "workspace-backdrop-changed", + G_CALLBACK(workspace_backdrop_changed_cb), desktop); +} + +static void +workspace_destroyed_cb(WnckScreen *wnck_screen, + WnckWorkspace *old_workspace, + gpointer user_data) +{ + XfceDesktop *desktop = XFCE_DESKTOP(user_data); + gint nlast_workspace; + TRACE("entering"); + + g_return_if_fail(XFCE_IS_DESKTOP(desktop)); + g_return_if_fail(desktop->priv->nworkspaces - 1 >= 0); + g_return_if_fail(XFCE_IS_WORKSPACE(desktop->priv->workspaces[desktop->priv->nworkspaces-1])); + + nlast_workspace = desktop->priv->nworkspaces - 1; + + g_signal_handlers_disconnect_by_func(desktop->priv->workspaces[nlast_workspace], + G_CALLBACK(workspace_backdrop_changed_cb), + desktop); + + g_object_unref(desktop->priv->workspaces[nlast_workspace]); + + /* Remove one workspace */ + desktop->priv->nworkspaces = nlast_workspace; + + /* deallocate it */ + desktop->priv->workspaces = g_realloc(desktop->priv->workspaces, + desktop->priv->nworkspaces * sizeof(XfceWorkspace *)); + + /* Make sure we stay within bounds now that we removed a workspace */ + if(desktop->priv->current_workspace > desktop->priv->nworkspaces) + desktop->priv->current_workspace = desktop->priv->nworkspaces; +} + +static void +screen_set_selection(XfceDesktop *desktop) +{ + Window xwin; + gint xscreen; + gchar selection_name[100]; + Atom selection_atom, manager_atom; + + xwin = GDK_WINDOW_XID(gtk_widget_get_window(GTK_WIDGET(desktop))); + xscreen = gdk_screen_get_number(desktop->priv->gscreen); + + g_snprintf(selection_name, 100, XFDESKTOP_SELECTION_FMT, xscreen); + selection_atom = XInternAtom(gdk_x11_get_default_xdisplay(), selection_name, False); + manager_atom = XInternAtom(gdk_x11_get_default_xdisplay(), "MANAGER", False); + + /* 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) { + g_warning("%s: already running, quitting.", PACKAGE); + exit(0); + } + + XSelectInput(gdk_x11_get_default_xdisplay(), xwin, PropertyChangeMask | ButtonPressMask); + XSetSelectionOwner(gdk_x11_get_default_xdisplay(), selection_atom, xwin, GDK_CURRENT_TIME); + + /* Check to see if we managed to claim the selection. If not, + * we treat it as if we got it then immediately lost it */ + if(XGetSelectionOwner(gdk_x11_get_default_xdisplay(), selection_atom) == xwin) { + XClientMessageEvent xev; + Window xroot = GDK_WINDOW_XID(gdk_screen_get_root_window(desktop->priv->gscreen)); + + xev.type = ClientMessage; + xev.window = xroot; + xev.message_type = manager_atom; + xev.format = 32; + xev.data.l[0] = GDK_CURRENT_TIME; + xev.data.l[1] = selection_atom; + xev.data.l[2] = xwin; + xev.data.l[3] = 0; /* manager specific data */ + xev.data.l[4] = 0; /* manager specific data */ + + XSendEvent(gdk_x11_get_default_xdisplay(), xroot, False, StructureNotifyMask, (XEvent *)&xev); + } else { + g_error("%s: could not set selection ownership", PACKAGE); + exit(1); + } +} + + + +/* gobject-related functions */ + + +G_DEFINE_TYPE(XfceDesktop, xfce_desktop, GTK_TYPE_WINDOW) + + +static void +xfce_desktop_class_init(XfceDesktopClass *klass) +{ + GObjectClass *gobject_class = (GObjectClass *)klass; + GtkWidgetClass *widget_class = (GtkWidgetClass *)klass; + + g_type_class_add_private(klass, sizeof(XfceDesktopPriv)); + + gobject_class->finalize = xfce_desktop_finalize; + gobject_class->set_property = xfce_desktop_set_property; + gobject_class->get_property = xfce_desktop_get_property; + + widget_class->realize = xfce_desktop_realize; + widget_class->unrealize = xfce_desktop_unrealize; + widget_class->button_press_event = xfce_desktop_button_press_event; + widget_class->button_release_event = xfce_desktop_button_release_event; + widget_class->expose_event = xfce_desktop_expose; + widget_class->delete_event = xfce_desktop_delete_event; + widget_class->popup_menu = xfce_desktop_popup_menu; + widget_class->style_set = xfce_desktop_style_set; + + signals[SIG_POPULATE_ROOT_MENU] = g_signal_new("populate-root-menu", + XFCE_TYPE_DESKTOP, + G_SIGNAL_RUN_LAST, + G_STRUCT_OFFSET(XfceDesktopClass, + populate_root_menu), + NULL, NULL, + g_cclosure_marshal_VOID__OBJECT, + G_TYPE_NONE, 1, + GTK_TYPE_MENU_SHELL); + + signals[SIG_POPULATE_SECONDARY_ROOT_MENU] = g_signal_new("populate-secondary-root-menu", + XFCE_TYPE_DESKTOP, + G_SIGNAL_RUN_LAST, + G_STRUCT_OFFSET(XfceDesktopClass, + populate_secondary_root_menu), + NULL, NULL, + g_cclosure_marshal_VOID__OBJECT, + G_TYPE_NONE, 1, + GTK_TYPE_MENU_SHELL); + +#define XFDESKTOP_PARAM_FLAGS (G_PARAM_READWRITE \ + | G_PARAM_CONSTRUCT \ + | G_PARAM_STATIC_NAME \ + | G_PARAM_STATIC_NICK \ + | G_PARAM_STATIC_BLURB) + +#ifdef ENABLE_DESKTOP_ICONS + g_object_class_install_property(gobject_class, PROP_ICON_STYLE, + g_param_spec_enum("icon-style", + "icon style", + "icon style", + XFCE_TYPE_DESKTOP_ICON_STYLE, +#ifdef ENABLE_FILE_ICONS + XFCE_DESKTOP_ICON_STYLE_FILES, +#else + XFCE_DESKTOP_ICON_STYLE_WINDOWS, +#endif /* ENABLE_FILE_ICONS */ + XFDESKTOP_PARAM_FLAGS)); + + g_object_class_install_property(gobject_class, PROP_ICON_SIZE, + g_param_spec_uint("icon-size", + "icon size", + "icon size", + 8, 192, DEFAULT_ICON_SIZE, + XFDESKTOP_PARAM_FLAGS)); + + g_object_class_install_property(gobject_class, PROP_ICON_FONT_SIZE, + g_param_spec_uint("icon-font-size", + "icon font size", + "icon font size", + 0, 144, 12, + XFDESKTOP_PARAM_FLAGS)); + + g_object_class_install_property(gobject_class, PROP_ICON_FONT_SIZE_SET, + g_param_spec_boolean("icon-font-size-set", + "icon font size set", + "icon font size set", + FALSE, + XFDESKTOP_PARAM_FLAGS)); + +#endif /* ENABLE_DESKTOP_ICONS */ + + g_object_class_install_property(gobject_class, PROP_SINGLE_WORKSPACE_MODE, + g_param_spec_boolean("single-workspace-mode", + "single-workspace-mode", + "single-workspace-mode", + TRUE, + XFDESKTOP_PARAM_FLAGS)); + + g_object_class_install_property(gobject_class, PROP_SINGLE_WORKSPACE_NUMBER, + g_param_spec_int("single-workspace-number", + "single-workspace-number", + "single-workspace-number", + 0, G_MAXINT16, 0, + XFDESKTOP_PARAM_FLAGS)); + +#undef XFDESKTOP_PARAM_FLAGS +} + +static void +xfce_desktop_init(XfceDesktop *desktop) +{ + desktop->priv = G_TYPE_INSTANCE_GET_PRIVATE(desktop, XFCE_TYPE_DESKTOP, + XfceDesktopPriv); + + gtk_window_set_type_hint(GTK_WINDOW(desktop), GDK_WINDOW_TYPE_HINT_DESKTOP); + /* Accept focus is needed for the menu pop up either by the menu key on + * the keyboard or Shift+F10. */ + gtk_window_set_accept_focus(GTK_WINDOW(desktop), TRUE); + /* Can focus is needed for the gtk_grab_add/remove commands */ + gtk_widget_set_can_focus(GTK_WIDGET(desktop), TRUE); + gtk_window_set_resizable(GTK_WINDOW(desktop), FALSE); +} + +static void +xfce_desktop_finalize(GObject *object) +{ + XfceDesktop *desktop = XFCE_DESKTOP(object); + + g_object_unref(G_OBJECT(desktop->priv->channel)); + g_free(desktop->priv->property_prefix); + +#ifdef ENABLE_DESKTOP_ICONS + if(desktop->priv->style_refresh_timer != 0) + g_source_remove(desktop->priv->style_refresh_timer); +#endif + + G_OBJECT_CLASS(xfce_desktop_parent_class)->finalize(object); +} + +static void +xfce_desktop_set_property(GObject *object, + guint property_id, + const GValue *value, + GParamSpec *pspec) +{ + XfceDesktop *desktop = XFCE_DESKTOP(object); + + switch(property_id) { +#ifdef ENABLE_DESKTOP_ICONS + case PROP_ICON_STYLE: + xfce_desktop_set_icon_style(desktop, + g_value_get_enum(value)); + break; + + case PROP_ICON_SIZE: + xfce_desktop_set_icon_size(desktop, + g_value_get_uint(value)); + break; + + case PROP_ICON_FONT_SIZE: + xfce_desktop_set_icon_font_size(desktop, + g_value_get_uint(value)); + break; + + case PROP_ICON_FONT_SIZE_SET: + xfce_desktop_set_use_icon_font_size(desktop, + g_value_get_boolean(value)); + break; + +#endif + case PROP_SINGLE_WORKSPACE_MODE: + xfce_desktop_set_single_workspace_mode(desktop, + g_value_get_boolean(value)); + break; + + case PROP_SINGLE_WORKSPACE_NUMBER: + xfce_desktop_set_single_workspace_number(desktop, + g_value_get_int(value)); + break; + + default: + G_OBJECT_WARN_INVALID_PROPERTY_ID(object, property_id, pspec); + break; + } +} + +static void +xfce_desktop_get_property(GObject *object, + guint property_id, + GValue *value, + GParamSpec *pspec) +{ + XfceDesktop *desktop = XFCE_DESKTOP(object); + + switch(property_id) { +#ifdef ENABLE_DESKTOP_ICONS + case PROP_ICON_STYLE: + g_value_set_enum(value, desktop->priv->icons_style); + break; + + case PROP_ICON_SIZE: + g_value_set_uint(value, desktop->priv->icons_size); + break; + + case PROP_ICON_FONT_SIZE: + g_value_set_uint(value, desktop->priv->icons_font_size); + break; + + case PROP_ICON_FONT_SIZE_SET: + g_value_set_boolean(value, desktop->priv->icons_font_size_set); + break; + +#endif + case PROP_SINGLE_WORKSPACE_MODE: + g_value_set_boolean(value, desktop->priv->single_workspace_mode); + break; + + case PROP_SINGLE_WORKSPACE_NUMBER: + g_value_set_int(value, desktop->priv->single_workspace_num); + break; + + default: + G_OBJECT_WARN_INVALID_PROPERTY_ID(object, property_id, pspec); + break; + } +} + +static void +xfce_desktop_realize(GtkWidget *widget) +{ + XfceDesktop *desktop = XFCE_DESKTOP(widget); + GdkAtom atom; + gint sw, sh; + Window xid; + GdkWindow *groot; + WnckScreen *wnck_screen; + + TRACE("entering"); + + gtk_window_set_screen(GTK_WINDOW(desktop), desktop->priv->gscreen); + sw = gdk_screen_get_width(desktop->priv->gscreen); + sh = gdk_screen_get_height(desktop->priv->gscreen); + + g_signal_connect(G_OBJECT(desktop->priv->gscreen), + "monitors-changed", + G_CALLBACK(xfce_desktop_monitors_changed), + desktop); + + /* chain up */ + GTK_WIDGET_CLASS(xfce_desktop_parent_class)->realize(widget); + + gtk_window_set_title(GTK_WINDOW(desktop), _("Desktop")); + + gtk_widget_set_size_request(GTK_WIDGET(desktop), sw, sh); + gtk_window_move(GTK_WINDOW(desktop), 0, 0); + + atom = gdk_atom_intern("_NET_WM_WINDOW_TYPE_DESKTOP", FALSE); + gdk_property_change(gtk_widget_get_window(GTK_WIDGET(desktop)), + gdk_atom_intern("_NET_WM_WINDOW_TYPE", FALSE), + gdk_atom_intern("ATOM", FALSE), 32, + GDK_PROP_MODE_REPLACE, (guchar *)&atom, 1); + + xid = GDK_WINDOW_XID(gtk_widget_get_window(GTK_WIDGET(desktop))); + groot = gdk_screen_get_root_window(desktop->priv->gscreen); + + gdk_property_change(groot, + gdk_atom_intern("XFCE_DESKTOP_WINDOW", FALSE), + gdk_atom_intern("WINDOW", FALSE), 32, + GDK_PROP_MODE_REPLACE, (guchar *)&xid, 1); + + gdk_property_change(groot, + gdk_atom_intern("NAUTILUS_DESKTOP_WINDOW_ID", FALSE), + gdk_atom_intern("WINDOW", FALSE), 32, + GDK_PROP_MODE_REPLACE, (guchar *)&xid, 1); + + screen_set_selection(desktop); + + wnck_screen = wnck_screen_get(gdk_screen_get_number(desktop->priv->gscreen)); + desktop->priv->wnck_screen = wnck_screen; + + /* Watch for single workspace setting changes */ + xfconf_g_property_bind(desktop->priv->channel, + SINGLE_WORKSPACE_MODE, G_TYPE_BOOLEAN, + G_OBJECT(desktop), "single-workspace-mode"); + xfconf_g_property_bind(desktop->priv->channel, + SINGLE_WORKSPACE_NUMBER, G_TYPE_INT, + G_OBJECT(desktop), "single-workspace-number"); + + /* watch for workspace changes */ + g_signal_connect(desktop->priv->wnck_screen, "active-workspace-changed", + G_CALLBACK(workspace_changed_cb), desktop); + g_signal_connect(desktop->priv->wnck_screen, "workspace-created", + G_CALLBACK(workspace_created_cb), desktop); + g_signal_connect(desktop->priv->wnck_screen, "workspace-destroyed", + G_CALLBACK(workspace_destroyed_cb), desktop); + + /* watch for screen changes */ + g_signal_connect(G_OBJECT(desktop->priv->gscreen), "size-changed", + G_CALLBACK(screen_size_changed_cb), desktop); + g_signal_connect(G_OBJECT(desktop->priv->gscreen), "composited-changed", + G_CALLBACK(screen_composited_changed_cb), desktop); + + gtk_widget_add_events(GTK_WIDGET(desktop), GDK_EXPOSURE_MASK); + +#ifdef ENABLE_DESKTOP_ICONS + xfce_desktop_setup_icon_view(desktop); +#endif + + TRACE("exiting"); +} + +static void +xfce_desktop_unrealize(GtkWidget *widget) +{ + XfceDesktop *desktop = XFCE_DESKTOP(widget); + gint i; + GdkWindow *groot; + gchar property_name[128]; + + g_return_if_fail(XFCE_IS_DESKTOP(desktop)); + + /* disconnect all the xfconf settings to this desktop */ + xfconf_g_property_unbind_all(G_OBJECT(desktop)); + + g_signal_handlers_disconnect_by_func(G_OBJECT(desktop->priv->gscreen), + G_CALLBACK(xfce_desktop_monitors_changed), + desktop); + + if(gtk_widget_get_mapped(widget)) + gtk_widget_unmap(widget); + gtk_widget_set_mapped(widget, FALSE); + + gtk_container_forall(GTK_CONTAINER(widget), + (GtkCallback)gtk_widget_unrealize, + NULL); + + g_signal_handlers_disconnect_by_func(G_OBJECT(desktop->priv->gscreen), + G_CALLBACK(screen_size_changed_cb), desktop); + g_signal_handlers_disconnect_by_func(G_OBJECT(desktop->priv->gscreen), + G_CALLBACK(screen_composited_changed_cb), desktop); + + gdk_error_trap_push(); + + groot = gdk_screen_get_root_window(desktop->priv->gscreen); + gdk_property_delete(groot, gdk_atom_intern("XFCE_DESKTOP_WINDOW", FALSE)); + gdk_property_delete(groot, gdk_atom_intern("NAUTILUS_DESKTOP_WINDOW_ID", FALSE)); + +#ifndef DISABLE_FOR_BUG7442 + gdk_property_delete(groot, gdk_atom_intern("_XROOTPMAP_ID", FALSE)); + gdk_property_delete(groot, gdk_atom_intern("ESETROOT_PMAP_ID", FALSE)); + gdk_window_set_back_pixmap(groot, NULL, FALSE); +#endif + + if(desktop->priv->workspaces) { + for(i = 0; i < desktop->priv->nworkspaces; i++) { + g_snprintf(property_name, 128, XFDESKTOP_IMAGE_FILE_FMT, i); + gdk_property_delete(groot, gdk_atom_intern(property_name, FALSE)); + g_object_unref(G_OBJECT(desktop->priv->workspaces[i])); + } + g_free(desktop->priv->workspaces); + desktop->priv->workspaces = NULL; + } + + gdk_flush(); + gdk_error_trap_pop(); + + if(desktop->priv->bg_pixmap) { + g_object_unref(G_OBJECT(desktop->priv->bg_pixmap)); + desktop->priv->bg_pixmap = NULL; + } + + gtk_window_set_icon(GTK_WINDOW(widget), NULL); + + gtk_style_detach(gtk_widget_get_style(widget)); + g_object_unref(G_OBJECT(gtk_widget_get_window(widget))); + gtk_widget_set_window(widget, NULL); + + gtk_selection_remove_all(widget); + + gtk_widget_set_realized(widget, FALSE); +} + +static gboolean +xfce_desktop_button_press_event(GtkWidget *w, + GdkEventButton *evt) +{ + guint button = evt->button; + guint state = evt->state; + XfceDesktop *desktop = XFCE_DESKTOP(w); + + TRACE("entering"); + + g_return_val_if_fail(XFCE_IS_DESKTOP(w), FALSE); + + if(evt->type == GDK_BUTTON_PRESS) { + if(button == 3 || (button == 1 && (state & GDK_SHIFT_MASK))) { +#ifdef ENABLE_DESKTOP_ICONS + /* Let the icon view handle these menu pop ups */ + if(desktop->priv->icons_style != XFCE_DESKTOP_ICON_STYLE_NONE) + return FALSE; +#endif + /* no icons on the desktop, grab the focus and pop up the menu */ + if(!gtk_widget_has_grab(w)) + gtk_grab_add(w); + + xfce_desktop_popup_root_menu(desktop, button, evt->time); + return TRUE; + } else if(button == 2 || (button == 1 && (state & GDK_SHIFT_MASK) + && (state & GDK_CONTROL_MASK))) + { + /* always grab the focus and pop up the menu */ + if(!gtk_widget_has_grab(w)) + gtk_grab_add(w); + + xfce_desktop_popup_secondary_root_menu(desktop, button, evt->time); + return TRUE; + } + } + + return FALSE; +} + +static gboolean +xfce_desktop_button_release_event(GtkWidget *w, + GdkEventButton *evt) +{ + TRACE("entering"); + + gtk_grab_remove(w); + + return FALSE; +} + +/* This function gets called when the user presses the menu key on the keyboard. + * Or Shift+F10 or whatever key binding the user has chosen. */ +static gboolean +xfce_desktop_popup_menu(GtkWidget *w) +{ + GdkEventButton *evt; + guint button, etime; + + TRACE("entering"); + + evt = (GdkEventButton *)gtk_get_current_event(); + if(evt && GDK_BUTTON_PRESS == evt->type) { + button = evt->button; + etime = evt->time; + } else { + button = 0; + etime = gtk_get_current_event_time(); + } + + xfce_desktop_popup_root_menu(XFCE_DESKTOP(w), button, etime); + + gdk_event_free((GdkEvent*)evt); + return TRUE; +} + +static gboolean +xfce_desktop_expose(GtkWidget *w, + GdkEventExpose *evt) +{ + GList *children, *l; + + /*TRACE("entering");*/ + + if(evt->count != 0) + return FALSE; + + gdk_window_clear_area(gtk_widget_get_window(w), evt->area.x, evt->area.y, + evt->area.width, evt->area.height); + + children = gtk_container_get_children(GTK_CONTAINER(w)); + for(l = children; l; l = l->next) { + gtk_container_propagate_expose(GTK_CONTAINER(w), + GTK_WIDGET(l->data), + evt); + } + g_list_free(children); + + return FALSE; +} + +static gboolean +xfce_desktop_delete_event(GtkWidget *w, + GdkEventAny *evt) +{ + if(XFCE_DESKTOP(w)->priv->session_logout_func) + XFCE_DESKTOP(w)->priv->session_logout_func(); + + return TRUE; +} + +#ifdef ENABLE_DESKTOP_ICONS +static gboolean +style_refresh_cb(gpointer *w) +{ + XfceDesktop *desktop = XFCE_DESKTOP(w); + gdouble old_font_size; + + TRACE("entering"); + + 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 FALSE; + + if(desktop->priv->workspaces == NULL) + 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); + + gtk_widget_queue_draw(GTK_WIDGET(desktop)); + + if(!desktop->priv->icon_view || !XFDESKTOP_IS_ICON_VIEW(desktop->priv->icon_view)) + return FALSE; + + /* reset the icon view style */ + gtk_widget_set_style(desktop->priv->icon_view, NULL); + gtk_widget_reset_rc_styles(desktop->priv->icon_view); + + old_font_size = desktop->priv->system_font_size; + if(xfce_desktop_ensure_system_font_size(desktop) != old_font_size + && desktop->priv->icon_view && !desktop->priv->icons_font_size_set) + { + xfdesktop_icon_view_set_font_size(XFDESKTOP_ICON_VIEW(desktop->priv->icon_view), + desktop->priv->system_font_size); + } + + return FALSE; +} +#endif + +static void +xfce_desktop_style_set(GtkWidget *w, GtkStyle *old_style) +{ +#ifdef ENABLE_DESKTOP_ICONS + 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); +#endif +} + +static void +xfce_desktop_connect_settings(XfceDesktop *desktop) +{ +#ifdef ENABLE_DESKTOP_ICONS +#define ICONS_PREFIX "/desktop-icons/" + XfconfChannel *channel = desktop->priv->channel; + + xfce_desktop_freeze_updates(desktop); + + xfconf_g_property_bind(channel, ICONS_PREFIX "style", + XFCE_TYPE_DESKTOP_ICON_STYLE, + G_OBJECT(desktop), "icon-style"); + xfconf_g_property_bind(channel, ICONS_PREFIX "icon-size", G_TYPE_UINT, + G_OBJECT(desktop), "icon-size"); + xfconf_g_property_bind(channel, ICONS_PREFIX "font-size", G_TYPE_UINT, + G_OBJECT(desktop), "icon-font-size"); + xfconf_g_property_bind(channel, ICONS_PREFIX "use-custom-font-size", + G_TYPE_BOOLEAN, + G_OBJECT(desktop), "icon-font-size-set"); + + xfce_desktop_thaw_updates(desktop); +#undef ICONS_PREFIX +#endif +} + +static gboolean +xfce_desktop_get_single_workspace_mode(XfceDesktop *desktop) +{ + g_return_val_if_fail(XFCE_IS_DESKTOP(desktop), TRUE); + + return desktop->priv->single_workspace_mode; +} + +static gint +xfce_desktop_get_current_workspace(XfceDesktop *desktop) +{ + WnckWorkspace *wnck_workspace; + gint workspace_num, current_workspace; + + g_return_val_if_fail(XFCE_IS_DESKTOP(desktop), -1); + + wnck_workspace = wnck_screen_get_active_workspace(desktop->priv->wnck_screen); + + if(wnck_workspace != NULL) { + workspace_num = wnck_workspace_get_number(wnck_workspace); + } else { + workspace_num = desktop->priv->nworkspaces; + } + + /* If we're in single_workspace mode we need to return the workspace that + * it was set to, if possible, otherwise return the current workspace */ + if(xfce_desktop_get_single_workspace_mode(desktop) && + desktop->priv->single_workspace_num < desktop->priv->nworkspaces) { + current_workspace = desktop->priv->single_workspace_num; + } else { + current_workspace = workspace_num; + } + + XF_DEBUG("workspace_num %d, single_workspace_num %d, current_workspace %d, max workspaces %d", + workspace_num, desktop->priv->single_workspace_num, current_workspace, + desktop->priv->nworkspaces); + + return current_workspace; +} + +/* public api */ + +/** + * xfce_desktop_new: + * @gscreen: The current #GdkScreen. + * @channel: An #XfconfChannel to use for settings. + * @property_prefix: String prefix for per-screen properties. + * + * Creates a new #XfceDesktop for the specified #GdkScreen. If @gscreen is + * %NULL, the default screen will be used. + * + * Return value: A new #XfceDesktop. + **/ +GtkWidget * +xfce_desktop_new(GdkScreen *gscreen, + XfconfChannel *channel, + const gchar *property_prefix) +{ + XfceDesktop *desktop; + + g_return_val_if_fail(channel && property_prefix, NULL); + + desktop = g_object_new(XFCE_TYPE_DESKTOP, NULL); + + if(!gscreen) + gscreen = gdk_display_get_default_screen(gdk_display_get_default()); + gtk_window_set_screen(GTK_WINDOW(desktop), gscreen); + desktop->priv->gscreen = gscreen; + + desktop->priv->channel = g_object_ref(G_OBJECT(channel)); + desktop->priv->property_prefix = g_strdup(property_prefix); + + xfce_desktop_connect_settings(desktop); + + return GTK_WIDGET(desktop); +} + +gint +xfce_desktop_get_n_monitors(XfceDesktop *desktop) +{ + g_return_val_if_fail(XFCE_IS_DESKTOP(desktop), 0); + + return gdk_screen_get_n_monitors(desktop->priv->gscreen); +} + +gint +xfce_desktop_get_width(XfceDesktop *desktop) +{ + g_return_val_if_fail(XFCE_IS_DESKTOP(desktop), -1); + + return gdk_screen_get_width(desktop->priv->gscreen); +} + +gint +xfce_desktop_get_height(XfceDesktop *desktop) +{ + g_return_val_if_fail(XFCE_IS_DESKTOP(desktop), -1); + + return gdk_screen_get_height(desktop->priv->gscreen); +} + +void +xfce_desktop_set_icon_style(XfceDesktop *desktop, + XfceDesktopIconStyle style) +{ + g_return_if_fail(XFCE_IS_DESKTOP(desktop) + && style <= XFCE_DESKTOP_ICON_STYLE_FILES); + +#ifdef ENABLE_DESKTOP_ICONS + if(style == desktop->priv->icons_style) + return; + + if(desktop->priv->icon_view) { + gtk_widget_destroy(desktop->priv->icon_view); + desktop->priv->icon_view = NULL; + } + + desktop->priv->icons_style = style; + if(gtk_widget_get_realized(GTK_WIDGET(desktop))) + xfce_desktop_setup_icon_view(desktop); +#endif +} + +#ifdef ENABLE_DESKTOP_ICONS +static gboolean +hidden_idle_cb(gpointer user_data) +{ + XfceDesktop *desktop; + + g_return_val_if_fail(XFCE_IS_DESKTOP(user_data), FALSE); + + desktop = XFCE_DESKTOP(user_data); + + /* destroy and load the icon view so that it adds or removes + * the hidden icons from the desktop */ + if(desktop->priv->icon_view) { + gtk_widget_destroy(desktop->priv->icon_view); + desktop->priv->icon_view = NULL; + } + + if(gtk_widget_get_realized(GTK_WIDGET(desktop))) + xfce_desktop_setup_icon_view(desktop); + + return FALSE; +} + +static void +hidden_state_changed_cb(GObject *object, + XfceDesktop *desktop) +{ + g_return_if_fail(XFCE_IS_DESKTOP(desktop)); + + if(desktop->priv->icon_view) { + g_signal_handlers_disconnect_by_func(object, + G_CALLBACK(hidden_state_changed_cb), + desktop); + } + + /* We have to do this in an idle callback */ + g_idle_add(hidden_idle_cb, desktop); +} +#endif /* ENABLE_DESKTOP_ICONS */ + +XfceDesktopIconStyle +xfce_desktop_get_icon_style(XfceDesktop *desktop) +{ + g_return_val_if_fail(XFCE_IS_DESKTOP(desktop), XFCE_DESKTOP_ICON_STYLE_NONE); + +#ifdef ENABLE_DESKTOP_ICONS + return desktop->priv->icons_style; +#else + return XFCE_DESKTOP_ICON_STYLE_NONE; +#endif +} + +void +xfce_desktop_set_icon_size(XfceDesktop *desktop, + guint icon_size) +{ + g_return_if_fail(XFCE_IS_DESKTOP(desktop)); + +#ifdef ENABLE_DESKTOP_ICONS + if(icon_size == desktop->priv->icons_size) + return; + + desktop->priv->icons_size = icon_size; + + if(desktop->priv->icon_view) { + xfdesktop_icon_view_set_icon_size(XFDESKTOP_ICON_VIEW(desktop->priv->icon_view), + icon_size); + } +#endif +} + +void +xfce_desktop_set_icon_font_size(XfceDesktop *desktop, + guint font_size_points) +{ + g_return_if_fail(XFCE_IS_DESKTOP(desktop)); + +#ifdef ENABLE_DESKTOP_ICONS + if(font_size_points == desktop->priv->icons_font_size) + return; + + desktop->priv->icons_font_size = font_size_points; + + if(desktop->priv->icons_font_size_set && desktop->priv->icon_view) { + xfdesktop_icon_view_set_font_size(XFDESKTOP_ICON_VIEW(desktop->priv->icon_view), + font_size_points); + } +#endif +} + +void +xfce_desktop_set_use_icon_font_size(XfceDesktop *desktop, + gboolean use_icon_font_size) +{ + g_return_if_fail(XFCE_IS_DESKTOP(desktop)); + +#ifdef ENABLE_DESKTOP_ICONS + if(use_icon_font_size == desktop->priv->icons_font_size_set) + return; + + desktop->priv->icons_font_size_set = use_icon_font_size; + + if(desktop->priv->icon_view) { + if(!use_icon_font_size) { + xfce_desktop_ensure_system_font_size(desktop); + xfdesktop_icon_view_set_font_size(XFDESKTOP_ICON_VIEW(desktop->priv->icon_view), + desktop->priv->system_font_size); + } else { + xfdesktop_icon_view_set_font_size(XFDESKTOP_ICON_VIEW(desktop->priv->icon_view), + desktop->priv->icons_font_size); + } + } +#endif +} + +static void +xfce_desktop_set_single_workspace_mode(XfceDesktop *desktop, + gboolean single_workspace) +{ + g_return_if_fail(XFCE_IS_DESKTOP(desktop)); + + if(single_workspace == desktop->priv->single_workspace_mode) + return; + + desktop->priv->single_workspace_mode = single_workspace; + + XF_DEBUG("single_workspace_mode now %s", single_workspace ? "TRUE" : "FALSE"); + + + /* If the desktop has been realized then fake a screen size change to + * update the backdrop. There's no reason to if there's no desktop yet */ + if(gtk_widget_get_realized(GTK_WIDGET(desktop))) + screen_size_changed_cb(desktop->priv->gscreen, desktop); +} + +static void +xfce_desktop_set_single_workspace_number(XfceDesktop *desktop, + gint workspace_num) +{ + g_return_if_fail(XFCE_IS_DESKTOP(desktop)); + + if(workspace_num == desktop->priv->single_workspace_num) + return; + + XF_DEBUG("single_workspace_num now %d", workspace_num); + + desktop->priv->single_workspace_num = workspace_num; + + if(xfce_desktop_get_single_workspace_mode(desktop)) { + /* Fake a screen size changed to update the backdrop */ + screen_size_changed_cb(desktop->priv->gscreen, desktop); + } +} + +void +xfce_desktop_set_session_logout_func(XfceDesktop *desktop, + SessionLogoutFunc logout_func) +{ + g_return_if_fail(XFCE_IS_DESKTOP(desktop)); + desktop->priv->session_logout_func = logout_func; +} + +void +xfce_desktop_freeze_updates(XfceDesktop *desktop) +{ + g_return_if_fail(XFCE_IS_DESKTOP(desktop)); + desktop->priv->updates_frozen = TRUE; +} + +void +xfce_desktop_thaw_updates(XfceDesktop *desktop) +{ + g_return_if_fail(XFCE_IS_DESKTOP(desktop)); + + desktop->priv->updates_frozen = FALSE; + if(gtk_widget_get_realized(GTK_WIDGET(desktop))) + xfce_desktop_monitors_changed(desktop->priv->gscreen, desktop); +} + +static gboolean +xfce_desktop_menu_destroy_idled(gpointer data) +{ + gtk_widget_destroy(GTK_WIDGET(data)); + return FALSE; +} + +static void +xfce_desktop_do_menu_popup(XfceDesktop *desktop, + guint button, + guint activate_time, + guint populate_signal) +{ + GdkScreen *screen; + GtkWidget *menu; + GList *menu_children; + + TRACE("entering"); + + if(gtk_widget_has_screen(GTK_WIDGET(desktop))) + screen = gtk_widget_get_screen(GTK_WIDGET(desktop)); + else + screen = gdk_display_get_default_screen(gdk_display_get_default()); + + menu = gtk_menu_new(); + gtk_menu_set_screen(GTK_MENU(menu), screen); + g_signal_connect_swapped(G_OBJECT(menu), "deactivate", + G_CALLBACK(g_idle_add), + (gpointer)xfce_desktop_menu_destroy_idled); + + g_signal_emit(G_OBJECT(desktop), populate_signal, 0, menu); + + /* if nobody populated the menu, don't do anything */ + menu_children = gtk_container_get_children(GTK_CONTAINER(menu)); + if(!menu_children) { + gtk_widget_destroy(menu); + return; + } + + g_list_free(menu_children); + + gtk_menu_attach_to_widget(GTK_MENU(menu), GTK_WIDGET(desktop), NULL); + + /* Per gtk_menu_popup's documentation "for conflict-resolve initiation of + * concurrent requests for mouse/keyboard grab requests." */ + if(activate_time == 0) + activate_time = gtk_get_current_event_time(); + + gtk_menu_popup(GTK_MENU(menu), NULL, NULL, NULL, NULL, button, activate_time); +} + +void +xfce_desktop_popup_root_menu(XfceDesktop *desktop, + guint button, + guint activate_time) +{ + TRACE("entering"); + + /* If it's launched by xfdesktop --menu we won't have an event time. + * Grab the keyboard focus */ + if(activate_time == 0) + activate_time = xfdesktop_popup_keyboard_grab_available(gtk_widget_get_window(GTK_WIDGET(desktop))); + + xfce_desktop_do_menu_popup(desktop, button, activate_time, + signals[SIG_POPULATE_ROOT_MENU]); + +} + +void +xfce_desktop_popup_secondary_root_menu(XfceDesktop *desktop, + guint button, + guint activate_time) +{ + /* If it's launched by xfdesktop --windowlist we won't have an event time. + * Grab the keyboard focus */ + if(activate_time == 0) + activate_time = xfdesktop_popup_keyboard_grab_available(gtk_widget_get_window(GTK_WIDGET(desktop))); + + xfce_desktop_do_menu_popup(desktop, button, activate_time, + signals[SIG_POPULATE_SECONDARY_ROOT_MENU]); +} + +void +xfce_desktop_refresh(XfceDesktop *desktop, gboolean advance_wallpaper) +{ + gint i, current_workspace; + + TRACE("entering"); + + g_return_if_fail(XFCE_IS_DESKTOP(desktop)); + + if(!gtk_widget_get_realized(GTK_WIDGET(desktop))) + return; + + if(desktop->priv->workspaces == NULL) { + return; + } + + current_workspace = xfce_desktop_get_current_workspace(desktop); + + /* reload backgrounds */ + for(i = 0; i < xfce_desktop_get_n_monitors(desktop); i++) { + XfceBackdrop *backdrop; + + backdrop = xfce_workspace_get_backdrop(desktop->priv->workspaces[current_workspace], i); + + if(advance_wallpaper) { + /* We need to trigger a new wallpaper event */ + xfce_backdrop_force_cycle(backdrop); + } else { + /* Fake a changed event so we redraw the wallpaper */ + backdrop_changed_cb(backdrop, desktop); + } + } + + /* If we're only advancing the wallpaper we can exit here */ + if(advance_wallpaper) + return; + +#ifdef ENABLE_DESKTOP_ICONS + /* reload icon view */ + if(desktop->priv->icon_view) { + gtk_widget_destroy(desktop->priv->icon_view); + desktop->priv->icon_view = NULL; + } + xfce_desktop_setup_icon_view(desktop); +#endif + +} + +void xfce_desktop_arrange_icons(XfceDesktop *desktop) +{ + g_return_if_fail(XFCE_IS_DESKTOP(desktop)); + +#ifdef ENABLE_DESKTOP_ICONS + g_return_if_fail(XFDESKTOP_IS_ICON_VIEW(desktop->priv->icon_view)); + + xfdesktop_icon_view_sort_icons(XFDESKTOP_ICON_VIEW(desktop->priv->icon_view)); +#endif +} Binary files /tmp/tmpYW9Ud1/TUbmrhx7aK/xfdesktop4-4.11.6/pixmaps/panto.png and /tmp/tmpYW9Ud1/AoZXo45c15/xfdesktop4-4.19.2/pixmaps/panto.png differ Binary files /tmp/tmpYW9Ud1/TUbmrhx7aK/xfdesktop4-4.11.6/pixmaps/xfce4_xicon1.png and /tmp/tmpYW9Ud1/AoZXo45c15/xfdesktop4-4.19.2/pixmaps/xfce4_xicon1.png differ Binary files /tmp/tmpYW9Ud1/TUbmrhx7aK/xfdesktop4-4.11.6/pixmaps/xfce4_xicon2.png and /tmp/tmpYW9Ud1/AoZXo45c15/xfdesktop4-4.19.2/pixmaps/xfce4_xicon2.png differ Binary files /tmp/tmpYW9Ud1/TUbmrhx7aK/xfdesktop4-4.11.6/pixmaps/xfce4_xicon3.png and /tmp/tmpYW9Ud1/AoZXo45c15/xfdesktop4-4.19.2/pixmaps/xfce4_xicon3.png differ Binary files /tmp/tmpYW9Ud1/TUbmrhx7aK/xfdesktop4-4.11.6/pixmaps/xfce4_xicon4.png and /tmp/tmpYW9Ud1/AoZXo45c15/xfdesktop4-4.19.2/pixmaps/xfce4_xicon4.png differ Binary files /tmp/tmpYW9Ud1/TUbmrhx7aK/xfdesktop4-4.11.6/pixmaps/xfce4_xicon.png and /tmp/tmpYW9Ud1/AoZXo45c15/xfdesktop4-4.19.2/pixmaps/xfce4_xicon.png differ diff -Nru xfdesktop4-4.11.6/po/ast.po xfdesktop4-4.19.2/po/ast.po --- xfdesktop4-4.11.6/po/ast.po 2013-11-02 06:39:46.000000000 +0000 +++ xfdesktop4-4.19.2/po/ast.po 2014-07-06 13:25:27.000000000 +0000 @@ -1,156 +1,153 @@ +# SOME DESCRIPTIVE TITLE. +# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER +# This file is distributed under the same license as the PACKAGE package. +# +# Translators: +# Ḷḷumex03 , 2014 +# Ḷḷumex03 , 2014 msgid "" msgstr "" -"Project-Id-Version: xfdesktop\n" +"Project-Id-Version: Xfdesktop\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2011-01-16 17:44+0100\n" -"PO-Revision-Date: 2009-09-10 23:54+0100\n" -"Last-Translator: astur \n" -"Language-Team: Asturian \n" -"Language: ast\n" +"POT-Creation-Date: 2014-04-03 18:32+0200\n" +"PO-Revision-Date: 2014-06-15 09:45+0000\n" +"Last-Translator: Ḷḷumex03 \n" +"Language-Team: Asturian (http://www.transifex.com/projects/p/xfdesktop/language/ast/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" +"Language: ast\n" +"Plural-Forms: nplurals=2; plural=(n != 1);\n" -#: ../common/xfdesktop-common.c:96 ../common/xfdesktop-common.c:200 -#, c-format -msgid "Backdrop list file is not valid" -msgstr "El ficheru de llista de fondos nun ye válidu" - -#. no need to escape markup; it's already done for us -#: ../settings/main.c:162 -#, c-format -msgid "" -"%s\n" -"Size: %dx%d" -msgstr "" -"%s\n" -"Tamañu: %dx%d" - -#: ../settings/main.c:272 ../src/xfdesktop-special-file-icon.c:247 -#: ../src/xfdesktop-special-file-icon.c:413 +#: ../settings/main.c:404 ../src/xfdesktop-special-file-icon.c:295 +#: ../src/xfdesktop-special-file-icon.c:479 msgid "Home" msgstr "Carpeta personal" -#: ../settings/main.c:274 +#: ../settings/main.c:406 msgid "Filesystem" msgstr "Sistema de ficheros" -#: ../settings/main.c:276 +#: ../settings/main.c:408 msgid "Trash" msgstr "Papelera" -#: ../settings/main.c:278 +#: ../settings/main.c:410 msgid "Removable Devices" msgstr "Preseos estrayíbles" -#: ../settings/main.c:458 -#, c-format -msgid "Cannot create backdrop list \"%s\"" -msgstr "Nun puede criase la llista de fondos \"%s\"" +#: ../settings/main.c:412 +msgid "Network Shares" +msgstr "Recursos compartíos de Windows" -#: ../settings/main.c:462 ../settings/main.c:779 -msgid "Backdrop List Error" -msgstr "Fallu de llista de fondos" +#: ../settings/main.c:414 +msgid "Disks and Drives" +msgstr "Discos y preseos" -#: ../settings/main.c:487 -msgid "Create/Load Backdrop List" -msgstr "Criar/cargar llista de fondos" +#: ../settings/main.c:416 +msgid "Other Devices" +msgstr "Otros preseos" -#: ../settings/main.c:511 +#. Display the file name, file type, and file size in the tooltip. +#: ../settings/main.c:529 #, c-format msgid "" -"File \"%s\" is not a valid backdrop list file. Do you wish to overwrite it?" -msgstr "" -"El ficheru \"%s\" nun ye un ficheru de llista de fondos válidu. ¿Quies " -"sobroescribilu?" +"%s\n" +"Type: %s\n" +"Size: %s" +msgstr "%s\nTriba: %s\nTamañu: %s" -#: ../settings/main.c:516 -msgid "Invalid List File" -msgstr "Ficheru de llista nun válidu" +#: ../settings/main.c:715 +#, c-format +msgid "Wallpaper for Monitor %d (%s)" +msgstr "Fondu pantalla pal monitor %d (%s)" -#: ../settings/main.c:519 -msgid "Overwriting the file will cause its contents to be lost." -msgstr "Sobroescribir el ficheru provocará la perda de los sos conteníos." +#: ../settings/main.c:718 +#, c-format +msgid "Wallpaper for Monitor %d" +msgstr "Fondu pantalla pal monitor %d" -#: ../settings/main.c:521 -msgid "Replace" -msgstr "Sustituyir" +#: ../settings/main.c:724 +msgid "Move this dialog to the display you want to edit the settings for." +msgstr "Muevi esti diálogu a la pantalla pa la que quiera editar los axustes." -#: ../settings/main.c:775 +#: ../settings/main.c:731 #, c-format -msgid "Failed to write backdrop list to \"%s\"" -msgstr "Fallu al escribir la llista de fondos en \"%s\"" +msgid "Wallpaper for %s on Monitor %d (%s)" +msgstr "Fondu pantalla pa %s nel monitor %d (%s)" -#: ../settings/main.c:802 -msgid "Add Image File(s)" -msgstr "Amestar ficheru(os) d'imaxe" - -#: ../settings/main.c:811 -msgid "Image files" -msgstr "Ficheros d'imaxe" +#: ../settings/main.c:735 +#, c-format +msgid "Wallpaper for %s on Monitor %d" +msgstr "Fondu pantalla pa %s nel monitor %d" -#: ../settings/main.c:816 -msgid "All files" -msgstr "Tolos ficheros" +#: ../settings/main.c:742 +msgid "" +"Move this dialog to the display and workspace you want to edit the settings " +"for." +msgstr "Muevi esti diálogu a la pantalla y estaya de trabayu pa las que quieras editar los axustes." -#: ../settings/main.c:1248 +#. Single monitor and single workspace +#: ../settings/main.c:749 #, c-format -msgid "Screen %d, Monitor %d (%s)" -msgstr "Pantalla %d, monitor %d (%s)" +msgid "Wallpaper for my desktop" +msgstr "Fondu pantalla pal mio escritoriu" -#: ../settings/main.c:1252 +#. Single monitor and per workspace wallpaper +#: ../settings/main.c:755 #, c-format -msgid "Screen %d, Monitor %d" -msgstr "Pantalla %d, monitor %d" +msgid "Wallpaper for %s" +msgstr "Fondu pantalla pa %s" -#: ../settings/main.c:1255 -#, c-format -msgid "Screen %d" -msgstr "Pantalla %d" +#: ../settings/main.c:760 +msgid "Move this dialog to the workspace you want to edit the settings for." +msgstr "Mover esti diálogu a la estaya de trabayu pa la que quieras editar los axustes." -#: ../settings/main.c:1260 -#, c-format -msgid "Monitor %d (%s)" -msgstr "Monitor %d (%s)" +#: ../settings/main.c:1174 +msgid "Image selection is unavailable while the image style is set to None." +msgstr "Ta desabilitada la seleición d'imaxe entrín l'estilu d'imaxe tea afitáu a Dengún" -#: ../settings/main.c:1264 -#, c-format -msgid "Monitor %d" -msgstr "Monitor %d" +#: ../settings/main.c:1523 +msgid "Spanning screens" +msgstr "" -#: ../settings/main.c:1477 +#: ../settings/main.c:1825 +msgid "Image files" +msgstr "Ficheros d'imaxe" + +#: ../settings/main.c:2001 msgid "Settings manager socket" msgstr "Socket del alministrador de configuración" -#: ../settings/main.c:1477 +#: ../settings/main.c:2001 msgid "SOCKET ID" msgstr "ID de SOCKET" -#: ../settings/main.c:1478 +#: ../settings/main.c:2002 msgid "Version information" msgstr "Información de versión" -#: ../settings/main.c:1498 +#: ../settings/main.c:2030 #, c-format msgid "Type '%s --help' for usage." -msgstr "Escribe '%s --help' pa ver opciones d'usu." +msgstr "Escribe '%s --help' pal d'usu." -#: ../settings/main.c:1510 +#: ../settings/main.c:2042 msgid "The Xfce development team. All rights reserved." msgstr "L'equipu de desendolcu de Xfce. Tolos drechos reservaos." -#: ../settings/main.c:1511 +#: ../settings/main.c:2043 #, c-format msgid "Please report bugs to <%s>." msgstr "Por favor, informa de fallos a <%s>." -#: ../settings/main.c:1518 +#: ../settings/main.c:2050 msgid "Desktop Settings" -msgstr "Configuración del escritoriu" +msgstr "Axustes del escritoriu" -#: ../settings/main.c:1520 +#: ../settings/main.c:2052 msgid "Unable to contact settings server" -msgstr "Nun pudo contautase col sirvidor de configuración" +msgstr "Nun pue contautase col sirvidor d'axustes" #: ../settings/xfce-backdrop-settings.desktop.in.h:1 msgid "Desktop " @@ -158,1340 +155,857 @@ #: ../settings/xfce-backdrop-settings.desktop.in.h:2 msgid "Set desktop background and menu and icon behaviour" -msgstr "Configura'l fondu d'escritoriu y el comportamientu de menús ya iconos" +msgstr "Afita'l comportamientu del fondu d'escritoriu y menú ya iconos" #: ../settings/xfdesktop-settings-appearance-frame-ui.glade.h:1 -msgid "Adjustments" -msgstr "Axustes" +msgid "Solid color" +msgstr "Color sólida" #: ../settings/xfdesktop-settings-appearance-frame-ui.glade.h:2 -msgid "Colors" -msgstr "Colores" +msgid "Horizontal gradient" +msgstr "Dilíu horizontal" #: ../settings/xfdesktop-settings-appearance-frame-ui.glade.h:3 -msgid "Image" -msgstr "Imaxe" +msgid "Vertical gradient" +msgstr "Dilíu vertical" #: ../settings/xfdesktop-settings-appearance-frame-ui.glade.h:4 -msgid "Images" -msgstr "Imáxenes" +msgid "Transparent" +msgstr "Tresparente" #: ../settings/xfdesktop-settings-appearance-frame-ui.glade.h:5 -msgid "Add an image to the list" -msgstr "Amestar una imaxe a la llista" +msgid "_Folder:" +msgstr "_Carpeta:" #: ../settings/xfdesktop-settings-appearance-frame-ui.glade.h:6 -#: ../settings/xfdesktop-settings-ui.glade.h:6 -msgid "Auto" -msgstr "" +msgid "Choose the folder to select wallpapers from." +msgstr "Escueyi'l direutoriu onde s'esbillarán los fondos de pantalla." #: ../settings/xfdesktop-settings-appearance-frame-ui.glade.h:7 -msgid "Automatically pick a random image from a list file" -msgstr "Seleicionar automáticamente una imaxe al debalu d'un ficheru de llista" +msgid "St_yle:" +msgstr "Est_ilu:" #: ../settings/xfdesktop-settings-appearance-frame-ui.glade.h:8 -msgid "B_rightness:" -msgstr "B_rillu:" +msgid "Specify how the image will be resized to fit the screen." +msgstr "Especifica como se redimensionará la imaxe p'axustase a la pantalla." #: ../settings/xfdesktop-settings-appearance-frame-ui.glade.h:9 -#: ../settings/xfdesktop-settings-ui.glade.h:8 -msgid "Centered" -msgstr "" +#: ../settings/xfdesktop-settings-ui.glade.h:4 +msgid "None" +msgstr "Dengún" #: ../settings/xfdesktop-settings-appearance-frame-ui.glade.h:10 -msgid "Create a new list, or load an existing one" -msgstr "Criar una nueva llista o cargar una esistente" +msgid "Centered" +msgstr "Centráu" #: ../settings/xfdesktop-settings-appearance-frame-ui.glade.h:11 -msgid "Don't display an image at all" -msgstr "Nun amosar denguna imaxe" +msgid "Tiled" +msgstr "Mosaicu" #: ../settings/xfdesktop-settings-appearance-frame-ui.glade.h:12 -#: ../settings/xfdesktop-settings-ui.glade.h:12 -msgid "Horizontal gradient" -msgstr "" +msgid "Stretched" +msgstr "Estiráu" #: ../settings/xfdesktop-settings-appearance-frame-ui.glade.h:13 -msgid "Image _list" -msgstr "_Llista d'imáxenes" +msgid "Scaled" +msgstr "Proporcionáu" #: ../settings/xfdesktop-settings-appearance-frame-ui.glade.h:14 -msgid "Increase or decrease the brightness of the final image" -msgstr "Aumentar o amenorgar el brillu de la imaxe final" +msgid "Zoomed" +msgstr "Averáu" #: ../settings/xfdesktop-settings-appearance-frame-ui.glade.h:15 -msgid "Increase or decrease the color saturation of the final image" -msgstr "Aumentar o amenorgar la saturación de color de la imaxe final" +msgid "Spanning Screens" +msgstr "" #: ../settings/xfdesktop-settings-appearance-frame-ui.glade.h:16 -msgid "Remove the selected image(s) from the list" -msgstr "Desaniciar les imáxenes seleicionaes de la llista" +msgid "C_olor:" +msgstr "C_olor:" #: ../settings/xfdesktop-settings-appearance-frame-ui.glade.h:17 -msgid "Sa_turation:" -msgstr "Sa_turación:" +msgid "Specify the style of the color drawn behind the backdrop image." +msgstr "Especificar l'estilu de la color dibuxada darrera la imaxe de fondu." #: ../settings/xfdesktop-settings-appearance-frame-ui.glade.h:18 -#: ../settings/xfdesktop-settings-ui.glade.h:23 -msgid "Scaled" -msgstr "" +msgid "Specifies the solid color, or the \"left\" or \"top\" color of the gradient." +msgstr "Especifica la color sólida, o la color \"esquierda\" o \"superior\" del dilíu." #: ../settings/xfdesktop-settings-appearance-frame-ui.glade.h:19 msgid "Select First Color" -msgstr "Seleicionar primer color" +msgstr "Esbillar color primariu" #: ../settings/xfdesktop-settings-appearance-frame-ui.glade.h:20 -msgid "Select Second Color" -msgstr "Seleicionar segundu color" +msgid "Specifies the \"right\" or \"bottom\" color of the gradient." +msgstr "Especifica la color \"drecha\" o \"inferior\" del dilíu." #: ../settings/xfdesktop-settings-appearance-frame-ui.glade.h:21 -msgid "Select a single image as the backdrop" -msgstr "Seleicionar una sola imaxe como fondu" +msgid "Select Second Color" +msgstr "Esbillar color secundariu" #: ../settings/xfdesktop-settings-appearance-frame-ui.glade.h:22 -#: ../settings/xfdesktop-settings-ui.glade.h:32 -msgid "Solid color" -msgstr "" +msgid "Apply to all _workspaces" +msgstr "Aplicar a toles esta_yes de trabayu" #: ../settings/xfdesktop-settings-appearance-frame-ui.glade.h:23 -msgid "Specifies the \"right\" or \"bottom\" color of the gradient" -msgstr "Especifica'l color de la parte \"drecha\" o \"inferior\" del gradiente" +msgid "Change the _background " +msgstr "Camudar el fondu pantalla" #: ../settings/xfdesktop-settings-appearance-frame-ui.glade.h:24 msgid "" -"Specifies the solid color, or the \"left\" or \"top\" color of the gradient" -msgstr "" -"Especifica'l color sólidu o el color de la parte \"esquierda\" o \"superior" -"\" del gradiente" +"Automatically select a different background from the current directory." +msgstr "Esbillar automáticamente un fondu pantalla distintu del direutoriu d'anguaño." #: ../settings/xfdesktop-settings-appearance-frame-ui.glade.h:25 -msgid "Specify how the image will be resized to fit the screen" -msgstr "Especificar cómo redimensionará la imaxe p'axustase a la pantalla" +msgid "Specify how often the background will change." +msgstr "Especifíca cada cuanto'l fondu pantalla camudará." #: ../settings/xfdesktop-settings-appearance-frame-ui.glade.h:26 -msgid "Specify the style of the color drawn behind the backdrop image" -msgstr "Especificar l'estilu del color dibuxáu al rodiu de la imaxe de fondu" +msgid "in seconds:" +msgstr "en segundos:" #: ../settings/xfdesktop-settings-appearance-frame-ui.glade.h:27 -msgid "St_yle:" -msgstr "Est_ilu:" +msgid "in minutes:" +msgstr "en minutos:" #: ../settings/xfdesktop-settings-appearance-frame-ui.glade.h:28 -#: ../settings/xfdesktop-settings-ui.glade.h:34 -msgid "Stretched" -msgstr "" +msgid "in hours:" +msgstr "n'hores:" #: ../settings/xfdesktop-settings-appearance-frame-ui.glade.h:29 -#: ../settings/xfdesktop-settings-ui.glade.h:35 -msgid "Tiled" -msgstr "" +msgid "at start up" +msgstr "nel aniciu" #: ../settings/xfdesktop-settings-appearance-frame-ui.glade.h:30 -#: ../settings/xfdesktop-settings-ui.glade.h:36 -msgid "Transparent" -msgstr "" +msgid "every hour" +msgstr "Cada hora" #: ../settings/xfdesktop-settings-appearance-frame-ui.glade.h:31 -#: ../settings/xfdesktop-settings-ui.glade.h:39 -msgid "Vertical gradient" -msgstr "" +msgid "every day" +msgstr "Caldía" #: ../settings/xfdesktop-settings-appearance-frame-ui.glade.h:32 -#: ../settings/xfdesktop-settings-ui.glade.h:40 -msgid "Zoomed" -msgstr "" +msgid "chronologically" +msgstr "Cronolóxicamente" #: ../settings/xfdesktop-settings-appearance-frame-ui.glade.h:33 -msgid "_None" -msgstr "_Dengún" +msgid "Amount of time before a different background is selected." +msgstr "Cantidá de tiempu enantes que s'esbille un fondu pantalla distintu." #: ../settings/xfdesktop-settings-appearance-frame-ui.glade.h:34 -msgid "_Single image" -msgstr "Imaxe _cenciella" +msgid "_Random Order" +msgstr "O_rde al debalu" + +#: ../settings/xfdesktop-settings-appearance-frame-ui.glade.h:35 +msgid "" +"Randomly selects another image from the same directory when the wallpaper is" +" to cycle." +msgstr "Esbilla al debalu otra imaxe del mesmu direutoriu cuando'l fondu pantalla vaiga a camudar" #: ../settings/xfdesktop-settings-ui.glade.h:1 -msgid "Appearance" -msgstr "Apariencia" +msgid "Left" +msgstr "Izquierda" #: ../settings/xfdesktop-settings-ui.glade.h:2 -msgid "Default Icons" -msgstr "Iconos predeterminaos" +msgid "Middle" +msgstr "Mediu" #: ../settings/xfdesktop-settings-ui.glade.h:3 -msgid "Desktop Menu" -msgstr "Menú d'escritoriu" - -#: ../settings/xfdesktop-settings-ui.glade.h:4 -msgid "Window List Menu" -msgstr "Menú de llista de ventanes" +msgid "Right" +msgstr "Drecha" #: ../settings/xfdesktop-settings-ui.glade.h:5 +msgid "Shift" +msgstr "Shift" + +#: ../settings/xfdesktop-settings-ui.glade.h:6 msgid "Alt" -msgstr "" +msgstr "Alt" #: ../settings/xfdesktop-settings-ui.glade.h:7 -msgid "B_utton:" -msgstr "B_otón:" +msgid "Control" +msgstr "Control" + +#: ../settings/xfdesktop-settings-ui.glade.h:8 +msgid "Minimized application icons" +msgstr "Iconos d'aplicaciones minimizadas" #: ../settings/xfdesktop-settings-ui.glade.h:9 -msgid "Control" -msgstr "" +msgid "File/launcher icons" +msgstr "Iconos de ficheru/llanzador" -#: ../settings/xfdesktop-settings-ui.glade.h:10 ../src/xfce-desktop.c:729 +#: ../settings/xfdesktop-settings-ui.glade.h:10 ../src/xfce-desktop.c:1020 msgid "Desktop" msgstr "Escritoriu" #: ../settings/xfdesktop-settings-ui.glade.h:11 -msgid "File/launcher icons" -msgstr "" +msgid "Set desktop background and menu and icon behavior" +msgstr "Afita'l comportamientu del fondu d'escritoriu y menú ya iconos" + +#: ../settings/xfdesktop-settings-ui.glade.h:12 +msgid "_Background" +msgstr "_Fondu" #: ../settings/xfdesktop-settings-ui.glade.h:13 -#, fuzzy -msgid "Icon _size:" -msgstr "_Triba d'iconu:" +msgid "Show applications menu on _desktop right click" +msgstr "Amosar menú d'aplicaciones al calcar col botón drechu sobro l'_escritoriu" #: ../settings/xfdesktop-settings-ui.glade.h:14 -msgid "Icon _type:" -msgstr "_Triba d'iconu:" +msgid "_Button:" +msgstr "_Botón:" #: ../settings/xfdesktop-settings-ui.glade.h:15 -msgid "Label trans_parency:" -msgstr "Tres_parencia d'etiqueta:" +msgid "Mo_difier:" +msgstr "Modifica_dor:" #: ../settings/xfdesktop-settings-ui.glade.h:16 -msgid "Left" -msgstr "" +msgid "Show _application icons in menu" +msgstr "Amosar iconos d'_aplicación nel menú" #: ../settings/xfdesktop-settings-ui.glade.h:17 -msgid "Middle" -msgstr "" +msgid "_Edit desktop menu" +msgstr "_Editar menú d'escritoriu" #: ../settings/xfdesktop-settings-ui.glade.h:18 -#, fuzzy -msgid "Minimized application icons" -msgstr "" -"Dengún\n" -"Iconos d'aplicación minimizaos\n" -"Ficheru/llanzador d'iconos" +msgid "Desktop Menu" +msgstr "Menú d'escritoriu" #: ../settings/xfdesktop-settings-ui.glade.h:19 -msgid "Mo_difier:" -msgstr "Camu_dador:" +msgid "Show _window list menu on desktop middle click" +msgstr "Amosar menú de llista de _ventanes al calcar col botón central sobro l'escritoriu" #: ../settings/xfdesktop-settings-ui.glade.h:20 -msgid "Modi_fier:" -msgstr "Camudado_r:" +msgid "B_utton:" +msgstr "B_otón:" #: ../settings/xfdesktop-settings-ui.glade.h:21 -msgid "None" -msgstr "Denguna" +msgid "Modi_fier:" +msgstr "Modi_ficador:" #: ../settings/xfdesktop-settings-ui.glade.h:22 -msgid "Right" -msgstr "" +msgid "Sh_ow application icons in menu" +msgstr "_Amosar iconos d'aplicación nel menú" + +#: ../settings/xfdesktop-settings-ui.glade.h:23 +msgid "Show workspace _names in list" +msgstr "Amosar _nomes d'estayes de trabayu na llista" #: ../settings/xfdesktop-settings-ui.glade.h:24 -msgid "Set desktop background and menu and icon behavior" -msgstr "Configura'l fondu d'escritoriu y el comportamientu de menús ya iconos" +msgid "Use _submenus for the windows in each workspace" +msgstr "Usar _submenús pa les ventanes en cada estaya de trabayu" #: ../settings/xfdesktop-settings-ui.glade.h:25 -msgid "Sh_ow application icons in menu" -msgstr "_Amosar iconos d'aplicación nel menú" +msgid "Show s_ticky windows only in active workspace" +msgstr "Amosar ventanes pe_gañoses namái na estaya de trabayu activa" #: ../settings/xfdesktop-settings-ui.glade.h:26 -msgid "Shift" -msgstr "" +msgid "Show a_dd and remove workspace options in list" +msgstr "Amosar na llista les opciones d'amestar y desaniciar" #: ../settings/xfdesktop-settings-ui.glade.h:27 -msgid "Show _application icons in menu" -msgstr "Amosar iconos d'_aplicación nel menú" +msgid "Window List Menu" +msgstr "Menú de llista de ventanes" #: ../settings/xfdesktop-settings-ui.glade.h:28 -msgid "Show _window list menu on desktop middle click" -msgstr "" -"Amosar menú de llista de _ventanes al calcar col botón central sobro " -"l'escritoriu" +msgid "_Menus" +msgstr "_Menús" #: ../settings/xfdesktop-settings-ui.glade.h:29 -msgid "Show applications menu on _desktop right click" -msgstr "" -"Amosar menú d'aplicaciones al calcar col botón drechu sobro l'_escritoriu" +msgid "Icon _type:" +msgstr "_Triba d'iconu:" #: ../settings/xfdesktop-settings-ui.glade.h:30 -msgid "Show s_ticky windows only in active workspace" -msgstr "Amosar ventanes pe_gañoses namái na estaya de trabayu activa" +msgid "Icon _size:" +msgstr "Tamañu l'_iconu" #: ../settings/xfdesktop-settings-ui.glade.h:31 -msgid "Show workspace _names in list" -msgstr "Amosar _nomes d'estayes de trabayu na llista" +msgid "Show t_humbnails" +msgstr "Amosar mini_atures" -#: ../settings/xfdesktop-settings-ui.glade.h:33 +#: ../settings/xfdesktop-settings-ui.glade.h:32 msgid "" -"Specify the transparency level for the rounded label drawn behind the icon " -"text" -msgstr "" -"Especificar el nivel de tresparencia pa la etiqueta redondeada debuxada al " -"rodiu del testu d'iconu" +"Select this option to display preview-able files on the desktop as " +"automatically generated thumbnail icons." +msgstr "Esbilla esta opción p'amosar ficheros que puean tener vista previa nel escritoriu como iconos de miniatura xeneraos automáticamente." -#: ../settings/xfdesktop-settings-ui.glade.h:37 -msgid "Use _submenus for the windows in each workspace" -msgstr "Usar _submenús pa les ventanes en cada estaya de trabayu" +#: ../settings/xfdesktop-settings-ui.glade.h:33 +msgid "Single _click to activate items" +msgstr "Namái un _clic pactivar los oxetos" -#: ../settings/xfdesktop-settings-ui.glade.h:38 -msgid "Use custom _font size:" -msgstr "Usar tamañu de _lletra personalizáu:" +#: ../settings/xfdesktop-settings-ui.glade.h:34 +msgid "Show icon tooltips. Size:" +msgstr "Amosar iconos d'indicador de funciones. Tamañu:" -#: ../settings/xfdesktop-settings-ui.glade.h:41 -msgid "_Background" -msgstr "_Fondu" +#: ../settings/xfdesktop-settings-ui.glade.h:35 +msgid "Size of the tooltip preview image." +msgstr "Tamañu de la vista previa del indicador de funciones." -#: ../settings/xfdesktop-settings-ui.glade.h:42 -msgid "_Button:" -msgstr "_Botón:" +#: ../settings/xfdesktop-settings-ui.glade.h:36 +msgid "Use custom _font size:" +msgstr "Usar tamañu de fonte personalizada:" -#: ../settings/xfdesktop-settings-ui.glade.h:43 -msgid "_Edit desktop menu" -msgstr "_Editar menú d'escritoriu" +#: ../settings/xfdesktop-settings-ui.glade.h:37 +msgid "Appearance" +msgstr "Aspeutu" + +#: ../settings/xfdesktop-settings-ui.glade.h:38 +msgid "Default Icons" +msgstr "Iconos por defeutu" -#: ../settings/xfdesktop-settings-ui.glade.h:44 +#: ../settings/xfdesktop-settings-ui.glade.h:39 msgid "_Icons" msgstr "_Iconos" -#: ../settings/xfdesktop-settings-ui.glade.h:45 -msgid "_Menus" -msgstr "_Menús" +#: ../src/menu.c:106 +msgid "_Applications" +msgstr "_Aplicaciones" + +#: ../src/windowlist.c:73 +#, c-format +msgid "Remove Workspace %d" +msgstr "Desaniciar estaya de trabayu %d" + +#: ../src/windowlist.c:74 +#, c-format +msgid "" +"Do you really want to remove workspace %d?\n" +"Note: You are currently on workspace %d." +msgstr "¿De xuru quies desaniciar la estaya de trabayu %d?\nNota: Ta anguaño na estaya de trabayu %d." + +#: ../src/windowlist.c:78 +#, c-format +msgid "Remove Workspace '%s'" +msgstr "Desaniciar estaya de trabayu '%s'" + +#: ../src/windowlist.c:79 +#, c-format +msgid "" +"Do you really want to remove workspace '%s'?\n" +"Note: You are currently on workspace '%s'." +msgstr "¿De xuru quies desaniciar la estaya de trabayu '%s'?\nNota: Tas anguaño na estaya de trabayu '%s'." + +#. Popup a dialog box confirming that the user wants to remove a +#. * workspace +#: ../src/windowlist.c:86 +msgid "Remove" +msgstr "Desanciar" + +#: ../src/windowlist.c:246 +msgid "Window List" +msgstr "Llista de ventanes" + +#: ../src/windowlist.c:272 +#, c-format +msgid "Workspace %d" +msgstr "Estaya de trabayu %d" + +#: ../src/windowlist.c:362 ../src/windowlist.c:365 +msgid "_Add Workspace" +msgstr "_Amestar estaya de trabayu" + +#: ../src/windowlist.c:373 +#, c-format +msgid "_Remove Workspace %d" +msgstr "Desanicia_r estaya de trabayu %d" + +#: ../src/windowlist.c:376 +#, c-format +msgid "_Remove Workspace '%s'" +msgstr "Desanicia_r estaya de trabayu '%s'" + +#: ../src/xfdesktop-app-menu-item.c:349 +#: ../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:1132 ../src/xfdesktop-file-utils.c:1209 +#: ../src/xfdesktop-file-utils.c:1234 ../src/xfdesktop-file-utils.c:1286 +msgid "Launch Error" +msgstr "Fallu de llanzamientu" -#: ../src/main.c:238 -#, fuzzy +#: ../src/xfdesktop-app-menu-item.c:351 +#: ../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 "Nun pue aniciase \"exo-desktop-item-edit\", que requierse pa crear y editar llanzadores y enllaces nel escritoriu." + +#: ../src/xfdesktop-application.c:768 msgid "Display version information" -msgstr "Información de versión" +msgstr "Amosar información de versión" -#: ../src/main.c:239 -#, fuzzy -msgid "Reload all settings, refresh image list" -msgstr "" -" --reload Recargar tola configuración. Anovar llista d'imáxenes\n" +#: ../src/xfdesktop-application.c:769 +msgid "Reload all settings" +msgstr "Recargar tolos axustes" -#: ../src/main.c:240 -#, fuzzy +#: ../src/xfdesktop-application.c:770 msgid "Pop up the menu (at the current mouse position)" -msgstr " --menu Amuesa'l menú (baxo la posición actual del mur)\n" +msgstr "Emerxer el menú (na posición actual del mur)" -#: ../src/main.c:241 -#, fuzzy +#: ../src/xfdesktop-application.c:771 msgid "Pop up the window list (at the current mouse position)" -msgstr "" -" --windowlist Amuesa llista de ventanes (baxo la posición actual del " -"mur)\n" +msgstr "Emerxer la llista de ventanes (na posición actual del mur)" + +#: ../src/xfdesktop-application.c:773 +msgid "Automatically arrange all the icons on the desktop" +msgstr "Organizar automáticamente tolos iconos nel escritoriu" -#: ../src/main.c:242 -#, fuzzy +#: ../src/xfdesktop-application.c:775 +msgid "Do not wait for a window manager on startup" +msgstr "Nun esperar pol alministrador de ventanes nel aniciu" + +#: ../src/xfdesktop-application.c:776 msgid "Cause xfdesktop to quit" -msgstr " --quit Fai que fine xfdesktop\n" +msgstr "Fai a xfdesktop colar" -#: ../src/main.c:262 -#, fuzzy, c-format +#: ../src/xfdesktop-application.c:791 +#, c-format msgid "Failed to parse arguments: %s\n" -msgstr "Fallu al executar \"%s\"" +msgstr "Fallu al analizar los argumentos: %s\n" -#: ../src/main.c:270 +#: ../src/xfdesktop-application.c:802 #, c-format msgid "This is %s version %s, running on Xfce %s.\n" -msgstr "Esto ye %s version %s, executándose en Xfce %s.\n" +msgstr "Esta ye la %s versión %s, executándose en Xfce %s.\n" -#: ../src/main.c:272 +#: ../src/xfdesktop-application.c:804 #, c-format msgid "Built with GTK+ %d.%d.%d, linked with GTK+ %d.%d.%d." -msgstr "Compiláu con GTK+ %d.%d.%d. Enllazáu con GTK+ %d.%d.%d." +msgstr "Contruyíu con GTK+ %d.%d.%d, enllazáu con GTK+ %d.%d.%d." -#: ../src/main.c:276 +#: ../src/xfdesktop-application.c:808 #, c-format msgid "Build options:\n" -msgstr "Opciones de compilación:\n" +msgstr "Opciones de contrucción:\n" -#: ../src/main.c:277 +#: ../src/xfdesktop-application.c:809 #, c-format msgid " Desktop Menu: %s\n" -msgstr " Menú d'escritoriu: %s\n" +msgstr "Menú d'escritoriu: %s\n" -#: ../src/main.c:279 ../src/main.c:286 ../src/main.c:293 +#: ../src/xfdesktop-application.c:811 ../src/xfdesktop-application.c:818 +#: ../src/xfdesktop-application.c:825 msgid "enabled" -msgstr "activáu" +msgstr "habilitáu" -#: ../src/main.c:281 ../src/main.c:288 ../src/main.c:295 +#: ../src/xfdesktop-application.c:813 ../src/xfdesktop-application.c:820 +#: ../src/xfdesktop-application.c:827 msgid "disabled" -msgstr "desactiváu" +msgstr "deshabilitáu" -#: ../src/main.c:284 +#: ../src/xfdesktop-application.c:816 #, c-format msgid " Desktop Icons: %s\n" -msgstr " Iconos d'escritoriu: %s\n" +msgstr "Iconos d'escritoiu: %s\n" -#: ../src/main.c:291 +#: ../src/xfdesktop-application.c:823 #, c-format msgid " Desktop File Icons: %s\n" -msgstr " Iconos de ficheru d'escritoriu: %s\n" - -#: ../src/main.c:322 -#, c-format -msgid "%s is not running.\n" -msgstr "%s nun ta executándose.\n" - -#: ../src/menu.c:106 -msgid "_Applications" -msgstr "_Aplicaciones" - -#: ../src/windowlist.c:235 -msgid "Window List" -msgstr "Llista de ventanes" - -#: ../src/windowlist.c:261 -#, c-format -msgid "Workspace %d" -msgstr "Estaya de trabayu %d" - -#: ../src/windowlist.c:270 -#, c-format -msgid "Workspace %d" -msgstr "Estaya de trabayu %d" - -#: ../src/windowlist.c:272 -#, c-format -msgid "Workspace %d" -msgstr "Estaya de trabayu %d" +msgstr "Iconos de ficheru del escritoiu: %s\n" -#: ../src/windowlist.c:368 ../src/windowlist.c:371 -msgid "_Add Workspace" -msgstr "_Amestar estaya de trabayu" - -#: ../src/windowlist.c:379 -#, c-format -msgid "_Remove Workspace %d" -msgstr "Desanicia_r estaya de trabayu %d" - -#: ../src/windowlist.c:382 +#: ../src/xfdesktop-file-icon-manager.c:522 +#: ../src/xfdesktop-file-icon-manager.c:539 #, c-format -msgid "_Remove Workspace '%s'" -msgstr "Desanicia_r estaya de trabayu '%s'" - -#: ../src/xfce-desktop.c:1006 -#, c-format -msgid "Unable to load image from backdrop list file \"%s\"" -msgstr "Nun pudo cargase la imaxe del ficheru cola llista de fondos \"%s\"" - -#: ../src/xfce-desktop.c:1008 -msgid "Desktop Error" -msgstr "Fallu d'escritoriu" - -#: ../src/xfdesktop-file-icon-manager.c:465 -#: ../src/xfdesktop-file-icon-manager.c:482 -#, fuzzy, c-format msgid "Could not create the desktop folder \"%s\"" -msgstr "Nun puede criase la llista de fondos \"%s\"" +msgstr "Nun pudo crease la carpeta d'escritoriu \"%s\"" -#: ../src/xfdesktop-file-icon-manager.c:470 -#: ../src/xfdesktop-file-icon-manager.c:487 -#, fuzzy +#: ../src/xfdesktop-file-icon-manager.c:527 +#: ../src/xfdesktop-file-icon-manager.c:544 msgid "Desktop Folder Error" -msgstr "Fallu d'escritoriu" +msgstr "Fallu de la carpeta d'escritoriu" -#: ../src/xfdesktop-file-icon-manager.c:489 +#: ../src/xfdesktop-file-icon-manager.c:546 msgid "" "A normal file with the same name already exists. Please delete or rename it." -msgstr "" +msgstr "Yá esiste un ficheru normal col mesmu nome. Por favor, desanicialu o renómalu." + +#: ../src/xfdesktop-file-icon-manager.c:629 ../src/xfdesktop-file-utils.c:723 +#: ../src/xfdesktop-file-utils.c:776 +msgid "Rename Error" +msgstr "Fallu al renomar" -#: ../src/xfdesktop-file-icon-manager.c:592 -#: ../src/xfdesktop-file-icon-manager.c:636 ../src/xfdesktop-file-utils.c:803 -#: ../src/xfdesktop-file-utils.c:818 ../src/xfdesktop-special-file-icon.c:447 +#: ../src/xfdesktop-file-icon-manager.c:630 ../src/xfdesktop-file-utils.c:777 +msgid "The files could not be renamed" +msgstr "Los ficheros nun puen renomase" + +#: ../src/xfdesktop-file-icon-manager.c:631 +msgid "None of the icons selected support being renamed." +msgstr "Dengún de los iconos esbillaos sofita'l ser renomáu." + +#: ../src/xfdesktop-file-icon-manager.c:675 +#: ../src/xfdesktop-file-icon-manager.c:719 ../src/xfdesktop-file-utils.c:921 +#: ../src/xfdesktop-file-utils.c:959 msgid "Trash Error" -msgstr "Fallu de papelera" +msgstr "Fallu de la papelera" -#: ../src/xfdesktop-file-icon-manager.c:593 -#: ../src/xfdesktop-file-icon-manager.c:637 -#, fuzzy +#: ../src/xfdesktop-file-icon-manager.c:676 +#: ../src/xfdesktop-file-icon-manager.c:720 msgid "The selected files could not be trashed" -msgstr "El seleutor d'aplicación nun pudo abrise." +msgstr "Nun puen dunviase a la papelera los ficheros esbillaos" -#: ../src/xfdesktop-file-icon-manager.c:594 -#: ../src/xfdesktop-file-icon-manager.c:638 ../src/xfdesktop-file-utils.c:652 -#: ../src/xfdesktop-file-utils.c:702 ../src/xfdesktop-file-utils.c:761 -#: ../src/xfdesktop-file-utils.c:873 ../src/xfdesktop-file-utils.c:929 -#: ../src/xfdesktop-file-utils.c:979 ../src/xfdesktop-file-utils.c:1029 -#: ../src/xfdesktop-file-utils.c:1106 ../src/xfdesktop-file-utils.c:1167 -#: ../src/xfdesktop-file-utils.c:1240 ../src/xfdesktop-file-utils.c:1318 -#, fuzzy +#: ../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:864 +#: ../src/xfdesktop-file-utils.c:1005 ../src/xfdesktop-file-utils.c:1052 +#: ../src/xfdesktop-file-utils.c:1093 ../src/xfdesktop-file-utils.c:1134 +#: ../src/xfdesktop-file-utils.c:1236 ../src/xfdesktop-file-utils.c:1288 +#: ../src/xfdesktop-file-utils.c:1361 ../src/xfdesktop-file-utils.c:1439 msgid "" "This feature requires a file manager service to be present (such as the one " "supplied by Thunar)." -msgstr "" -"Esta funcionalidá necesita la presencia d'un alministrador de ficheros " -"(como'l proporcionáu por Thunar)." +msgstr "Esta carauterística requier qu'un alministrador de ficheros tea presente (como'l dau por Thunar)" #. printf is to be translator-friendly -#: ../src/xfdesktop-file-icon-manager.c:738 -#: ../src/xfdesktop-file-icon-manager.c:1296 +#: ../src/xfdesktop-file-icon-manager.c:821 +#: ../src/xfdesktop-file-icon-manager.c:1279 #, c-format msgid "Unable to launch \"%s\":" -msgstr "Nun pudo llanzase \"%s\"" - -#: ../src/xfdesktop-file-icon-manager.c:740 -#: ../src/xfdesktop-file-icon-manager.c:984 -#: ../src/xfdesktop-file-icon-manager.c:1297 ../src/xfdesktop-file-utils.c:635 -#: ../src/xfdesktop-file-utils.c:650 ../src/xfdesktop-file-utils.c:1012 -#: ../src/xfdesktop-file-utils.c:1027 ../src/xfdesktop-file-utils.c:1079 -#: ../src/xfdesktop-file-utils.c:1104 ../src/xfdesktop-file-utils.c:1150 -#: ../src/xfdesktop-file-utils.c:1165 -msgid "Launch Error" -msgstr "Fallu d'aniciu" +msgstr "Nun pue llanzase \"%s\":" -#: ../src/xfdesktop-file-icon-manager.c:908 +#: ../src/xfdesktop-file-icon-manager.c:1008 #, c-format msgid "_Open With \"%s\"" msgstr "_Abrir con \"%s\"" -#: ../src/xfdesktop-file-icon-manager.c:911 +#: ../src/xfdesktop-file-icon-manager.c:1011 #, c-format msgid "Open With \"%s\"" msgstr "Abrir con \"%s\"" -#: ../src/xfdesktop-file-icon-manager.c:986 -msgid "" -"Unable to launch \"exo-desktop-item-edit\", which is required to create and " -"edit launchers and links on the desktop." -msgstr "" -"Nun pudo entamase \"exo-desktop-item-edit\", que necesítase pa criar y " -"editar llanzadores y enllaces nel escritoriu." - -#: ../src/xfdesktop-file-icon-manager.c:1354 +#: ../src/xfdesktop-file-icon-manager.c:1337 msgid "_Open all" msgstr "_Abrir too" -#: ../src/xfdesktop-file-icon-manager.c:1370 +#: ../src/xfdesktop-file-icon-manager.c:1353 msgid "_Open in New Window" -msgstr "_Abrir en ventana nueva" +msgstr "_Abrir nuna ventana nueva" -#: ../src/xfdesktop-file-icon-manager.c:1372 -#: ../src/xfdesktop-special-file-icon.c:570 ../src/xfdesktop-volume-icon.c:653 +#: ../src/xfdesktop-file-icon-manager.c:1355 +#: ../src/xfdesktop-special-file-icon.c:547 ../src/xfdesktop-volume-icon.c:813 msgid "_Open" msgstr "_Abrir" #. create launcher item -#: ../src/xfdesktop-file-icon-manager.c:1391 +#: ../src/xfdesktop-file-icon-manager.c:1374 msgid "Create _Launcher..." -msgstr "Criar _llanzador..." +msgstr "Crear _llanzador..." #. create link item -#: ../src/xfdesktop-file-icon-manager.c:1407 +#: ../src/xfdesktop-file-icon-manager.c:1390 msgid "Create _URL Link..." -msgstr "Criar enllaz _URL..." +msgstr "Crear enllaz _URL..." #. create folder item -#: ../src/xfdesktop-file-icon-manager.c:1423 +#: ../src/xfdesktop-file-icon-manager.c:1406 msgid "Create _Folder..." -msgstr "Criar _direutoriu..." +msgstr "Crear _carpeta..." -#. create from template submenu -#: ../src/xfdesktop-file-icon-manager.c:1438 +#: ../src/xfdesktop-file-icon-manager.c:1421 msgid "Create From _Template" -msgstr "Criar a partir de _plantía" +msgstr "Crear dende plan_tía" -#: ../src/xfdesktop-file-icon-manager.c:1464 +#: ../src/xfdesktop-file-icon-manager.c:1450 msgid "_Empty File" msgstr "Ficheru _baleru" -#: ../src/xfdesktop-file-icon-manager.c:1480 +#: ../src/xfdesktop-file-icon-manager.c:1467 msgid "_Execute" msgstr "_Executar" -#: ../src/xfdesktop-file-icon-manager.c:1500 +#: ../src/xfdesktop-file-icon-manager.c:1487 msgid "_Edit Launcher" msgstr "_Editar llanzador" -#: ../src/xfdesktop-file-icon-manager.c:1535 +#: ../src/xfdesktop-file-icon-manager.c:1522 msgid "Open With" msgstr "Abrir con" -#: ../src/xfdesktop-file-icon-manager.c:1561 +#: ../src/xfdesktop-file-icon-manager.c:1548 msgid "Open With Other _Application..." msgstr "Abrir con otra _aplicación" -#: ../src/xfdesktop-file-icon-manager.c:1649 +#. Rename +#: ../src/xfdesktop-file-icon-manager.c:1651 msgid "_Rename..." msgstr "_Renomar..." -#: ../src/xfdesktop-file-icon-manager.c:1667 +#: ../src/xfdesktop-file-icon-manager.c:1679 +msgid "Arrange Desktop _Icons" +msgstr "Ordenar _iconos d'escritoriu" + +#: ../src/xfdesktop-file-icon-manager.c:1690 msgid "Desktop _Settings..." msgstr "_Configuración d'escritoriu..." -#: ../src/xfdesktop-file-icon-manager.c:1677 -#: ../src/xfdesktop-volume-icon.c:701 +#: ../src/xfdesktop-file-icon-manager.c:1701 +#: ../src/xfdesktop-volume-icon.c:855 msgid "P_roperties..." msgstr "_Propiedaes..." -#: ../src/xfdesktop-file-icon-manager.c:2231 -#, fuzzy +#: ../src/xfdesktop-file-icon-manager.c:2642 msgid "Load Error" -msgstr "Fallu d'aniciu" +msgstr "Fallu de carga" -#: ../src/xfdesktop-file-icon-manager.c:2233 -#, fuzzy +#: ../src/xfdesktop-file-icon-manager.c:2644 msgid "Failed to load the desktop folder" -msgstr "Nun puede criase la llista de fondos \"%s\"" +msgstr "Fallu al cargar el ficheru d'escritoriu" + +#: ../src/xfdesktop-file-icon-manager.c:3189 +msgid "Copy _Here" +msgstr "Copiar _equí" + +#: ../src/xfdesktop-file-icon-manager.c:3189 +msgid "_Move Here" +msgstr "_Mover equí" + +#: ../src/xfdesktop-file-icon-manager.c:3189 +msgid "_Link Here" +msgstr "_Enllazar equí" #. TRANSLATORS: file was modified less than one day ago -#: ../src/xfdesktop-file-utils.c:137 +#: ../src/xfdesktop-file-utils.c:140 #, c-format msgid "Today at %X" -msgstr "" +msgstr "Güei a les %X" #. TRANSLATORS: file was modified less than two days ago -#: ../src/xfdesktop-file-utils.c:141 +#: ../src/xfdesktop-file-utils.c:144 #, c-format msgid "Yesterday at %X" -msgstr "" +msgstr "Ayeri a les %X" #. Days from last week -#: ../src/xfdesktop-file-utils.c:146 +#: ../src/xfdesktop-file-utils.c:149 #, c-format msgid "%A at %X" -msgstr "" +msgstr "%A en %X" #. Any other date -#: ../src/xfdesktop-file-utils.c:149 +#: ../src/xfdesktop-file-utils.c:152 #, c-format msgid "%x at %X" -msgstr "" +msgstr "%x en %X" #. the file_time is invalid -#: ../src/xfdesktop-file-utils.c:159 -#, fuzzy +#: ../src/xfdesktop-file-utils.c:162 msgid "Unknown" -msgstr "(desconocíu)" +msgstr "Desconocíu" -#: ../src/xfdesktop-file-utils.c:636 ../src/xfdesktop-file-utils.c:651 -#, fuzzy +#: ../src/xfdesktop-file-utils.c:665 msgid "The folder could not be opened" -msgstr "El seleutor d'aplicación nun pudo abrise." +msgstr "La carpeta nun pudo renomase" -#: ../src/xfdesktop-file-utils.c:685 ../src/xfdesktop-file-utils.c:700 -#, fuzzy -msgid "Rename Error" -msgstr "Fallu d'execución" +#: ../src/xfdesktop-file-utils.c:682 +msgid "Error" +msgstr "Fallu" + +#: ../src/xfdesktop-file-utils.c:683 +msgid "The requested operation could not be completed" +msgstr "La operación requerida nun pue completase" -#: ../src/xfdesktop-file-utils.c:686 ../src/xfdesktop-file-utils.c:701 -#, fuzzy +#: ../src/xfdesktop-file-utils.c:724 msgid "The file could not be renamed" -msgstr "El seleutor d'aplicación nun pudo abrise." +msgstr "El ficheru nun pudo renomase" -#: ../src/xfdesktop-file-utils.c:744 ../src/xfdesktop-file-utils.c:759 -#, fuzzy +#: ../src/xfdesktop-file-utils.c:862 msgid "Delete Error" -msgstr "Fallu de criación" +msgstr "Fallu de desaniciu" -#: ../src/xfdesktop-file-utils.c:745 ../src/xfdesktop-file-utils.c:760 -#, fuzzy +#: ../src/xfdesktop-file-utils.c:863 msgid "The selected files could not be deleted" -msgstr "L'aplicación asociada nun pudo alcontrase nin executase." +msgstr "Los ficheros esbillaos nun pudieron desaniciase" -#: ../src/xfdesktop-file-utils.c:804 ../src/xfdesktop-file-utils.c:819 -#, fuzzy +#: ../src/xfdesktop-file-utils.c:922 msgid "The selected files could not be moved to the trash" -msgstr "El seleutor d'aplicación nun pudo abrise." +msgstr "Los ficheros esbillaos nun pudieron movese a la papelera" -#: ../src/xfdesktop-file-utils.c:820 -#, fuzzy +#: ../src/xfdesktop-file-utils.c:923 ../src/xfdesktop-file-utils.c:961 msgid "" "This feature requires a trash service to be present (such as the one " "supplied by Thunar)." -msgstr "" -"Esta funcionalidá necesita la presencia d'un alministrador de ficheros " -"(como'l proporcionáu por Thunar)." +msgstr "Esta carauterística requier qu'un serviciu de papalera tea presente (como'l dau con Thunar)" + +#: ../src/xfdesktop-file-utils.c:960 +msgid "Could not empty the trash" +msgstr "Nun pudo vaciase la papelera" -#: ../src/xfdesktop-file-utils.c:856 ../src/xfdesktop-file-utils.c:871 -#, fuzzy +#: ../src/xfdesktop-file-utils.c:1003 msgid "Create File Error" -msgstr "Fallu de criación" +msgstr "Fallu al crear el ficheru" -#: ../src/xfdesktop-file-utils.c:857 ../src/xfdesktop-file-utils.c:872 -#, fuzzy +#: ../src/xfdesktop-file-utils.c:1004 msgid "Could not create a new file" -msgstr "Nun puede criase la llista de fondos \"%s\"" +msgstr "Nun pudo crease un ficheru nuevu" -#: ../src/xfdesktop-file-utils.c:912 ../src/xfdesktop-file-utils.c:927 -#, fuzzy +#: ../src/xfdesktop-file-utils.c:1050 msgid "Create Document Error" -msgstr "Fallu de criación" +msgstr "Fallu al crear el documentu" -#: ../src/xfdesktop-file-utils.c:913 ../src/xfdesktop-file-utils.c:928 -#, fuzzy +#: ../src/xfdesktop-file-utils.c:1051 msgid "Could not create a new document from the template" -msgstr "Criar documentu a partir de plantía \"%s\"" +msgstr "Nun pudo crease un documentu nuevu dende la palntía" -#: ../src/xfdesktop-file-utils.c:962 ../src/xfdesktop-file-utils.c:977 -#, fuzzy +#: ../src/xfdesktop-file-utils.c:1091 msgid "File Properties Error" -msgstr "Fallu de propiedaes" +msgstr "Fallu de propiedaes de ficheru" -#: ../src/xfdesktop-file-utils.c:963 ../src/xfdesktop-file-utils.c:978 -#, fuzzy +#: ../src/xfdesktop-file-utils.c:1092 msgid "The file properties dialog could not be opened" -msgstr "El seleutor d'aplicación nun pudo abrise." +msgstr "Nun puedo abrise'l diálogu de propiedaes de ficheru" -#: ../src/xfdesktop-file-utils.c:1013 ../src/xfdesktop-file-utils.c:1028 -#, fuzzy +#: ../src/xfdesktop-file-utils.c:1133 msgid "The file could not be opened" -msgstr "El seleutor d'aplicación nun pudo abrise." +msgstr "El ficheru nun pudo abrise" -#: ../src/xfdesktop-file-utils.c:1076 ../src/xfdesktop-file-utils.c:1101 -#, fuzzy, c-format +#: ../src/xfdesktop-file-utils.c:1206 ../src/xfdesktop-file-utils.c:1231 +#, c-format msgid "Failed to run \"%s\"" msgstr "Fallu al executar \"%s\"" -#: ../src/xfdesktop-file-utils.c:1151 ../src/xfdesktop-file-utils.c:1166 -#, fuzzy +#: ../src/xfdesktop-file-utils.c:1287 msgid "The application chooser could not be opened" -msgstr "El seleutor d'aplicación nun pudo abrise." +msgstr "El seleutor d'aplicaciones nun puedo abrise" -#: ../src/xfdesktop-file-utils.c:1224 ../src/xfdesktop-file-utils.c:1238 -#: ../src/xfdesktop-file-utils.c:1300 ../src/xfdesktop-file-utils.c:1316 -#, fuzzy +#: ../src/xfdesktop-file-utils.c:1345 ../src/xfdesktop-file-utils.c:1359 +#: ../src/xfdesktop-file-utils.c:1421 ../src/xfdesktop-file-utils.c:1437 msgid "Transfer Error" -msgstr "Fallu de papelera" +msgstr "Fallu de tresferencia" -#: ../src/xfdesktop-file-utils.c:1225 ../src/xfdesktop-file-utils.c:1239 -#: ../src/xfdesktop-file-utils.c:1301 ../src/xfdesktop-file-utils.c:1317 -#, fuzzy +#: ../src/xfdesktop-file-utils.c:1346 ../src/xfdesktop-file-utils.c:1360 +#: ../src/xfdesktop-file-utils.c:1422 ../src/xfdesktop-file-utils.c:1438 msgid "The file transfer could not be performed" -msgstr "El seleutor d'aplicación nun pudo abrise." +msgstr "La tresferencia de ficheros nun pudo facese" #. TRANSLATORS: Please use the same translation here as in Thunar -#: ../src/xfdesktop-notify.c:128 -#, fuzzy +#: ../src/xfdesktop-notify.c:127 msgid "Unmounting device" -msgstr "Fallu al desmontar" +msgstr "Desmontando'l preséu" #. TRANSLATORS: Please use the same translation here as in Thunar -#: ../src/xfdesktop-notify.c:131 +#: ../src/xfdesktop-notify.c:130 #, c-format msgid "" -"The device \"%s\" is being unmounted by the system. Please do not remove the " -"media or disconnect the drive" -msgstr "" +"The device \"%s\" is being unmounted by the system. Please do not remove the" +" media or disconnect the drive" +msgstr "El preséu \"%s\" ta desmontándose pol sistema. Por favor, nun desanicies ficheros o desconeutes el discu" #. TRANSLATORS: Please use the same translation here as in Thunar -#: ../src/xfdesktop-notify.c:138 ../src/xfdesktop-notify.c:262 +#: ../src/xfdesktop-notify.c:137 ../src/xfdesktop-notify.c:322 msgid "Writing data to device" -msgstr "" +msgstr "Escribiendo datos al preséu" #. TRANSLATORS: Please use the same translation here as in Thunar -#: ../src/xfdesktop-notify.c:141 ../src/xfdesktop-notify.c:265 +#: ../src/xfdesktop-notify.c:140 ../src/xfdesktop-notify.c:325 #, c-format msgid "" -"There is data that needs to be written to the device \"%s\" before it can be " -"removed. Please do not remove the media or disconnect the drive" -msgstr "" +"There is data that needs to be written to the device \"%s\" before it can be" +" removed. Please do not remove the media or disconnect the drive" +msgstr "Hai datos que necesiten escribise nel preséu \"%s\" enantes que puean desaniciase. Por favor, nun desanicies ficheros o desconeutes el discu " + +#: ../src/xfdesktop-notify.c:221 +msgid "Unmount Finished" +msgstr "Desmontaxe fináu" + +#: ../src/xfdesktop-notify.c:223 ../src/xfdesktop-notify.c:408 +#, c-format +msgid "The device \"%s\" has been safely removed from the system. " +msgstr "El preséu \"%s\" estrayóse del sistema con seguridá" #. TRANSLATORS: Please use the same translation here as in Thunar -#: ../src/xfdesktop-notify.c:253 -#, fuzzy +#: ../src/xfdesktop-notify.c:313 msgid "Ejecting device" -msgstr "Fallu al desmontar" +msgstr "Espulsando preséu" #. TRANSLATORS: Please use the same translation here as in Thunar -#: ../src/xfdesktop-notify.c:256 +#: ../src/xfdesktop-notify.c:316 #, c-format msgid "The device \"%s\" is being ejected. This may take some time" -msgstr "" +msgstr " El preséu \"%s\" ta espulsándose. Pue tardar un pocoñín" + +#: ../src/xfdesktop-notify.c:406 +msgid "Eject Finished" +msgstr "Espulsión finada" -#: ../src/xfdesktop-regular-file-icon.c:468 +#: ../src/xfdesktop-regular-file-icon.c:741 #, c-format msgid "" "Type: %s\n" "Size: %s\n" "Last modified: %s" -msgstr "" +msgstr "Triba: %s\nTamañu: %s\nCabera modificación: %s" -#: ../src/xfdesktop-special-file-icon.c:249 -#: ../src/xfdesktop-special-file-icon.c:411 -#, fuzzy +#: ../src/xfdesktop-special-file-icon.c:297 +#: ../src/xfdesktop-special-file-icon.c:477 msgid "File System" msgstr "Sistema de ficheros" -#: ../src/xfdesktop-special-file-icon.c:396 +#: ../src/xfdesktop-special-file-icon.c:462 msgid "Trash is empty" -msgstr "" +msgstr "La papelera ta balera" -#: ../src/xfdesktop-special-file-icon.c:399 +#: ../src/xfdesktop-special-file-icon.c:465 msgid "Trash contains one item" -msgstr "" +msgstr "La papelera contien un oxetu" -#: ../src/xfdesktop-special-file-icon.c:400 +#: ../src/xfdesktop-special-file-icon.c:466 #, c-format msgid "Trash contains %d items" -msgstr "" +msgstr "La papelera contien %d oxetos" -#: ../src/xfdesktop-special-file-icon.c:428 +#: ../src/xfdesktop-special-file-icon.c:495 #, c-format msgid "" "%s\n" "Size: %s\n" "Last modified: %s" -msgstr "" - -#: ../src/xfdesktop-special-file-icon.c:449 -msgid "Unable to contact the Xfce Trash service." -msgstr "Nun pudo contautase col serviciu de papelera de Xfce" - -#: ../src/xfdesktop-special-file-icon.c:450 -msgid "" -"Make sure you have a file manager installed that supports the Xfce Trash " -"service, such as Thunar." -msgstr "" -"Asegúrate de tener un alministrador de ficheros instaláu que sofite'l " -"serviciu de papelera de Xfce, como por exemplu Thunar." +msgstr "%s\nTamañu: %s\nCabera modificación: %s" -#: ../src/xfdesktop-special-file-icon.c:588 +#: ../src/xfdesktop-special-file-icon.c:564 msgid "_Empty Trash" msgstr "_Vaciar papelera" -#: ../src/xfdesktop-volume-icon.c:413 -#, fuzzy, c-format +#: ../src/xfdesktop-volume-icon.c:482 +#, c-format msgid "" "Removable Volume\n" "Mounted in \"%s\"\n" "%s left (%s total)" -msgstr "" -"Triba: volume estrayíble\n" -"Puntu de montaxe: %s\n" -"Espaciu llibre: %s" +msgstr "Volume estrayible\nMontáu en \"%s\"\nqueden%s (%s en total)" -#: ../src/xfdesktop-volume-icon.c:420 -#, fuzzy +#: ../src/xfdesktop-volume-icon.c:489 msgid "" "Removable Volume\n" "Not mounted yet" -msgstr "" -"Triba: volume estrayíble\n" -"Puntu de montaxe: %s\n" -"Espaciu llibre: %s" +msgstr "Volume estrayible\nEntá non montáu" -#: ../src/xfdesktop-volume-icon.c:446 ../src/xfdesktop-volume-icon.c:488 -#, fuzzy, c-format +#: ../src/xfdesktop-volume-icon.c:518 ../src/xfdesktop-volume-icon.c:563 +#, c-format msgid "Failed to eject \"%s\"" -msgstr "Nun pudo espulsase \"%s\":" +msgstr "Fallu al espulsar \"%s\"" -#: ../src/xfdesktop-volume-icon.c:451 ../src/xfdesktop-volume-icon.c:493 +#: ../src/xfdesktop-volume-icon.c:523 ../src/xfdesktop-volume-icon.c:568 msgid "Eject Failed" msgstr "Fallu al espulsar" -#: ../src/xfdesktop-volume-icon.c:525 -#, fuzzy, c-format +#: ../src/xfdesktop-volume-icon.c:600 +#, c-format msgid "Failed to mount \"%s\"" -msgstr "Fallu al executar \"%s\"" +msgstr "Fallu al montar \"%s\"" -#: ../src/xfdesktop-volume-icon.c:528 +#: ../src/xfdesktop-volume-icon.c:603 msgid "Mount Failed" msgstr "Fallu al montar" -#: ../src/xfdesktop-volume-icon.c:669 ../src/xfdesktop-volume-icon.c:672 +#: ../src/xfdesktop-volume-icon.c:828 msgid "E_ject Volume" msgstr "E_spulsar volume" -#: ../src/xfdesktop-volume-icon.c:679 +#: ../src/xfdesktop-volume-icon.c:835 +msgid "_Unmount Volume" +msgstr "_Desmontar volume" + +#: ../src/xfdesktop-volume-icon.c:842 msgid "_Mount Volume" msgstr "_Montar volume" -#, fuzzy -#~ msgid "Needs terminal" -#~ msgstr "Terminal" - -#, fuzzy -#~ msgid "Icon name" -#~ msgstr "Ta_mañu d'iconu:" - -#~ msgid "Unable to launch xfce4-menueditor: %s" -#~ msgstr "Nun pudo llanzase xfce4-menueditor: %s" - -#~ msgid "Select Icon" -#~ msgstr "Seleicionar iconu" - -#~ msgid "Select Menu File" -#~ msgstr "Seleicionar ficheru de menú" - -#~ msgid "All Files" -#~ msgstr "Tolos ficheros" - -#~ msgid "Image Files" -#~ msgstr "Ficheros d'imaxe" - -#~ msgid "Menu Files" -#~ msgstr "Ficheros de menú" - -#~ msgid "Xfce Menu" -#~ msgstr "Menú de Xfce" - -#~ msgid "Button" -#~ msgstr "Botón" - -#~ msgid "Button _title:" -#~ msgstr "_Títulu de botón" - -#~ msgid "_Show title in button" -#~ msgstr "Amo_sar títulu en botón" - -#~ msgid "Menu File" -#~ msgstr "Ficheru de menú" - -#~ msgid "Use default _desktop menu file" -#~ msgstr "Usar menú _d'escritoriu predetermináu" - -#~ msgid "Use _custom menu file:" -#~ msgstr "Usar fi_cheru de menú personalizáu" - -#~ msgid "_Edit Menu" -#~ msgstr "_Editar menú" - -#~ msgid "Icons" -#~ msgstr "Iconos" - -#~ msgid "_Button icon:" -#~ msgstr "Iconu del _botón:" - -#~ msgid "Show _icons in menu" -#~ msgstr "Amosar _iconos nel menú" - -#~ msgid "There is already a panel menu registered for this screen" -#~ msgstr "Yá hai un panel de menú rexistráu pa esta pantalla" - -#~ msgid "Edit Menu" -#~ msgstr "Editar menú" - -#~ msgid "Shows a menu containing categories of installed applications" -#~ msgstr "Amuesa un menú coles categoríes de les aplicaciones instalaes" - -#~ msgid "%s: Unknown option: %s\n" -#~ msgstr "%s: Opción desconocía: %s\n" - -#~ msgid "Options are:\n" -#~ msgstr "Les opciones son:\n" - -#~ msgid " --reload Reload all settings, refresh image list\n" -#~ msgstr "" -#~ " --reload Recargar tola configuración. Anovar llista d'imáxenes\n" - -#~ msgid " --menu Pop up the menu (at the current mouse position)\n" -#~ msgstr " --menu Amuesa'l menú (baxo la posición actual del mur)\n" - -#~ msgid "" -#~ " --windowlist Pop up the window list (at the current mouse position)\n" -#~ msgstr "" -#~ " --windowlist Amuesa llista de ventanes (baxo la posición actual del " -#~ "mur)\n" - -#~ msgid " --quit Cause xfdesktop to quit\n" -#~ msgstr " --quit Fai que fine xfdesktop\n" - -#~ msgid "" -#~ "Xfdesktop was unable to create the folder \"%s\" to store desktop items:" -#~ msgstr "" -#~ "Xfdesktop nun pudo criar el direutoriu \"%s\" p'atroxar los elementos " -#~ "d'escritoriu:" - -#~ msgid "Create Folder Failed" -#~ msgstr "Fallu al criar el direutoriu" - -#~ msgid "" -#~ "Xfdesktop is unable to use \"%s\" to hold desktop items because it is not " -#~ "a folder." -#~ msgstr "" -#~ "Xfdesktop nun puede usar \"%s\" pa caltener elementos d'escritoriu porque " -#~ "nun ye un direutoriu." - -#~ msgid "Please delete or rename the file." -#~ msgstr "Por favor, esborra o renoma'l ficheru." - -#~ msgid "Rename \"%s\"" -#~ msgstr "Renomar \"%s\"" - -#~ msgid "Enter the new name:" -#~ msgstr "Introduz el nuevu nome:" - -#~ msgid "Rename" -#~ msgstr "Renomar" - -#~ msgid "Are you sure that you want to delete \"%s\"?" -#~ msgstr "¿De xuru que quies desaniciar \"%s\"?" - -#~ msgid "Question" -#~ msgstr "Entruga" - -#~ msgid "If you delete a file, it is permanently lost." -#~ msgstr "Si desanicies un ficheru perderáse pa siempres." - -#~ msgid "Are you sure you want to delete the following %d files?" -#~ msgstr "¿De xuru que quies desaniciar los siguientes %d ficheros?" - -#~ msgid "Delete Multiple Files" -#~ msgstr "Desaniciar dellos ficheros" - -#~ msgid "The application chooser could not be opened." -#~ msgstr "El seleutor d'aplicación nun pudo abrise." - -#~ msgid "" -#~ "This feature requires a file manager service present (such as that " -#~ "supplied by Thunar)." -#~ msgstr "" -#~ "Esta funcionalidá necesita la presencia d'un alministrador de ficheros " -#~ "(como'l proporcionáu por Thunar)." - -#~ msgid "Unable to create folder named \"%s\":" -#~ msgstr "Nun pudo criase'l direutoriu con nome \"%s\":" - -#~ msgid "Create New Folder" -#~ msgstr "Criar nueva carpeta" - -#~ msgid "New Folder" -#~ msgstr "Nueva carpeta" - -#~ msgid "Create" -#~ msgstr "Criar" - -#~ msgid "Unable to create file named \"%s\":" -#~ msgstr "Nun pudo criase'l ficheru con nome \"%s\":" - -#~ msgid "Create File Failed" -#~ msgstr "Fallu al criar ficheru" - -#~ msgid "Create Document from template \"%s\"" -#~ msgstr "Criar documentu a partir de plantía \"%s\"" - -#~ msgid "Create Empty File" -#~ msgstr "Criar ficheru baleru" - -#~ msgid "New Empty File" -#~ msgstr "Nuevu ficheru baleru" - -#~ msgid "Unable to create file \"%s\":" -#~ msgstr "Nun pudo criase ficheru \"%s\":" - -#~ msgid "Create Error" -#~ msgstr "Fallu de criación" - -#~ msgid "Failed to run \"%s\":" -#~ msgstr "Fallu al executar \"%s\"" - -#~ msgid "Run Error" -#~ msgstr "Fallu d'execución" - -#~ msgid "The associated application could not be found or executed." -#~ msgstr "L'aplicación asociada nun pudo alcontrase nin executase." - -#~ msgid "Unable to set default application for \"%s\" to \"%s\":" -#~ msgstr "Nun pudo configurase \"%s\" como aplicación por defeutu pa \"%s\":" - -#~ msgid "Properties Error" -#~ msgstr "Fallu de propiedaes" - -#~ msgid "Write only" -#~ msgstr "Namái escritura" - -#~ msgid "Read only" -#~ msgstr "Namái llectura" - -#~ msgid "Read & Write" -#~ msgstr "Llectura y escritura" - -#~ msgid "General" -#~ msgstr "Xeneral" - -#~ msgid "Name:" -#~ msgstr "Nome:" - -#~ msgid "Kind:" -#~ msgstr "Triba:" - -#~ msgid "Link Target:" -#~ msgstr "Destín del enllaz:" - -#~ msgid "(unknown)" -#~ msgstr "(desconocíu)" - -#~ msgid "Open With:" -#~ msgstr "Abrir con:" - -#~ msgid "Modified:" -#~ msgstr "Camudáu:" - -#~ msgid "Accessed:" -#~ msgstr "Accedíu:" - -#~ msgid "Free Space:" -#~ msgstr "Espaciu llibre:" - -#~ msgid "Size:" -#~ msgstr "Tamañu:" - -#~ msgid "%s (%" -#~ msgstr "%s (%" - -#~ msgid "Permissions" -#~ msgstr "Permisos" - -#~ msgid "Owner:" -#~ msgstr "Propietariu:" - -#~ msgid "Access:" -#~ msgstr "Accesu:" - -#~ msgid "Group:" -#~ msgstr "Grupu:" - -#~ msgid "Others:" -#~ msgstr "Otros:" - -#~ msgid "Yes to _all" -#~ msgstr "Sí a _too" - -#~ msgid "There was an error moving \"%s\" to \"%s\":" -#~ msgstr "Hebo un fallu moviendo \"%s\" a \"%s\":" - -#~ msgid "There was an error copying \"%s\" to \"%s\":" -#~ msgstr "Hebo un fallu copiando \"%s\" en \"%s\":" - -#~ msgid "There was an error linking \"%s\" to \"%s\":" -#~ msgstr "Hebo un fallu enllazando \"%s\" con \"%s\":" - -#~ msgid "File Error" -#~ msgstr "Fallu de ficheru" - -#~ msgid "broken link" -#~ msgstr "enllaz frayáu" - -#~ msgid "link to %s" -#~ msgstr "enllaz a %s" - -#~ msgid "" -#~ "Kind: %s\n" -#~ "Modified:%s\n" -#~ "Size: %s" -#~ msgstr "" -#~ "Triba: %s\n" -#~ "Camudáu: %s\n" -#~ "Tamañu: %s" - -#~ msgid "Error" -#~ msgstr "Fallu" - -#~ msgid "Failed to rename \"%s\" to \"%s\":" -#~ msgstr "Fallu al renomar \"%s\" por \"%s\":" - -#~ msgid "Kind: Trash" -#~ msgstr "Triba: Papelera" - -#~ msgid "%s (%s total)" -#~ msgstr "%s (%s total)" - -#~ msgid "" -#~ "Kind: Removable Volume\n" -#~ "Mount Point: %s\n" -#~ "Free Space: %s" -#~ msgstr "" -#~ "Triba: volume estrayíble\n" -#~ "Puntu de montaxe: %s\n" -#~ "Espaciu llibre: %s" - -#~ msgid "Unable to mount \"%s\":" -#~ msgstr "Nun pudo montase \"%s\":" - -#~ msgid "Unable to unmount \"%s\":" -#~ msgstr "Nun pudo desmontase \"%s\":" - -#~ msgid "Unmount Failed" -#~ msgstr "Fallu al desmontar" - -#~ msgid "Unable to eject \"%s\":" -#~ msgstr "Nun pudo espulsase \"%s\":" - -#~ msgid "_Unmount Volume" -#~ msgstr "_Desmontar volume" - -#~ msgid "Accessories" -#~ msgstr "Accesorios" - -#~ msgid "Common desktop tools and applications" -#~ msgstr "Ferramientes y aplicaciones d'escritoriu comunes" - -#~ msgid "Development" -#~ msgstr "Desendolcu" - -#~ msgid "Software development tools" -#~ msgstr "Ferramientes de desarrollu de software" - -#~ msgid "Education" -#~ msgstr "Educación" - -#~ msgid "Educational software" -#~ msgstr "Software educativu" - -#~ msgid "Games" -#~ msgstr "Xuegos" - -#~ msgid "Games, puzzles, and other fun software" -#~ msgstr "Xuegos, puzzles y otru software divertíu" - -#~ msgid "Graphics" -#~ msgstr "Gráficos" - -#~ msgid "Graphics creation and manipulation applications" -#~ msgstr "Aplicaciones de criación y manipulación de gráficos" - -#~ msgid "Audio and video players and editors" -#~ msgstr "Reproductores y editores d'audiu y vídeu" - -#~ msgid "Multimedia" -#~ msgstr "Multimedia" - -#~ msgid "Network" -#~ msgstr "Rede" - -#~ msgid "Network applications and utilities" -#~ msgstr "Aplicaciones y utilidaes de rede" - -#~ msgid "Office" -#~ msgstr "Oficina" - -#~ msgid "Office and productivity applications" -#~ msgstr "Aplicaciones d'oficina y productividá" - -#~ msgid "Applications that don't fit into other categories" -#~ msgstr "Aplicaciones que nun concasen n'otres categoríes" - -#~ msgid "Other" -#~ msgstr "Otros" - -#~ msgid "Screensaver applets" -#~ msgstr "Miniaplicaciones de curiapantalles" - -#~ msgid "Screensavers" -#~ msgstr "Curiapantalles" - -#~ msgid "Desktop and system settings applications" -#~ msgstr "Aplicaciones de configuración d'escritoriu y sistema" - -#~ msgid "Settings" -#~ msgstr "Configuración" - -#~ msgid "System" -#~ msgstr "Sistema" - -#~ msgid "System tools and utilities" -#~ msgstr "Ferramientes y utilidaes de sistema" - -#~ msgid "About Xfce" -#~ msgstr "Tocante a Xfce" - -#~ msgid "Information about the Xfce Desktop Environment" -#~ msgstr "Información sobro l'entornu d'escritoriu Xfce" - -#~ msgid "File Manager" -#~ msgstr "Alministrador de ficheros" - -#~ msgid "Thunar file manager" -#~ msgstr "Alministrador de ficheros Thunar" - -#~ msgid "Help" -#~ msgstr "Aida" - -#~ msgid "Help using Xfce" -#~ msgstr "Aida pa usar Xfce" - -#~ msgid "Log Out" -#~ msgstr "Zarrar sesión" - -#~ msgid "Log out of the Xfce Desktop" -#~ msgstr "Colar del escritoriu Xfce" - -#~ msgid "Run Program..." -#~ msgstr "Executar programa..." - -#~ msgid "Run a program" -#~ msgstr "Executar un programa" - -#~ msgid "Terminal" -#~ msgstr "Terminal" - -#~ msgid "Terminal emulator" -#~ msgstr "Emulador de terminal" - -#~ msgid "Browse the web" -#~ msgstr "Restolar pela web" - -#~ msgid "Web Browser" -#~ msgstr "Restolador web" - -#~ msgid "" -#~ "Auto\n" -#~ "Centered\n" -#~ "Tiled\n" -#~ "Stretched\n" -#~ "Scaled\n" -#~ "Zoomed" -#~ msgstr "" -#~ "Auto\n" -#~ "Centráu\n" -#~ "Mosaicu\n" -#~ "Axustáu\n" -#~ "Escaláu\n" -#~ "Ampliáu" - -#~ msgid "" -#~ "Left\n" -#~ "Middle\n" -#~ "Right" -#~ msgstr "" -#~ "Esquierda\n" -#~ "Centru\n" -#~ "Drecha" - -#~ msgid "" -#~ "None\n" -#~ "Minimized application icons\n" -#~ "File/launcher icons" -#~ msgstr "" -#~ "Dengún\n" -#~ "Iconos d'aplicación minimizaos\n" -#~ "Ficheru/llanzador d'iconos" - -#~ msgid "" -#~ "None\n" -#~ "Shift\n" -#~ "Alt\n" -#~ "Control" -#~ msgstr "" -#~ "Dengún\n" -#~ "Mayús\n" -#~ "Alt\n" -#~ "Control" - -#~ msgid "" -#~ "Solid color\n" -#~ "Horizontal gradient\n" -#~ "Vertical gradient\n" -#~ "Transparent" -#~ msgstr "" -#~ "Color sólidu\n" -#~ "Gradiente horizontal\n" -#~ "Gradiente vertical\n" -#~ "Tresparente" - -#~ msgid "gtk-close" -#~ msgstr "gtk-close" - -#~ msgid "gtk-help" -#~ msgstr "gtk-help" - -#~ msgid "Science" -#~ msgstr "Ciencia" - -#~ msgid "Scientific software" -#~ msgstr "Software de ciencia" +#: ../src/xfdesktop-window-icon.c:195 +msgid "_Window Actions" +msgstr "_Aiciones de ventana" diff -Nru xfdesktop4-4.11.6/po/cs.po xfdesktop4-4.19.2/po/cs.po --- xfdesktop4-4.11.6/po/cs.po 2014-04-07 10:20:50.000000000 +0000 +++ xfdesktop4-4.19.2/po/cs.po 2014-09-08 16:22:41.000000000 +0000 @@ -4,7 +4,7 @@ # # Translators: # Alois Nespor , 2004 -# Alois Nešpor , 2013 +# Alois Nešpor , 2013-2014 # Alois Nešpor , 2014 # Libor Schejbal , 2013 # Lukáš Konarovský , 2003 @@ -13,10 +13,10 @@ msgstr "" "Project-Id-Version: Xfdesktop\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2014-04-03 18:32+0200\n" -"PO-Revision-Date: 2014-04-06 21:31+0000\n" -"Last-Translator: Alois Nešpor \n" -"Language-Team: Czech (http://www.transifex.com/projects/p/xfce/language/cs/)\n" +"POT-Creation-Date: 2014-08-03 12:32+0200\n" +"PO-Revision-Date: 2014-09-03 16:54+0000\n" +"Last-Translator: Michal Várady \n" +"Language-Team: Czech (http://www.transifex.com/projects/p/xfdesktop/language/cs/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" @@ -42,7 +42,7 @@ #: ../settings/main.c:412 msgid "Network Shares" -msgstr "Sdílení sítě" +msgstr "Složky na síti" #: ../settings/main.c:414 msgid "Disks and Drives" @@ -111,45 +111,45 @@ 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:1523 +#: ../settings/main.c:1524 msgid "Spanning screens" msgstr "Rozložení přes obrazovky" -#: ../settings/main.c:1825 +#: ../settings/main.c:1831 msgid "Image files" msgstr "Soubory s obrázky" -#: ../settings/main.c:2001 +#: ../settings/main.c:2010 msgid "Settings manager socket" msgstr "Soket správce nastavení" -#: ../settings/main.c:2001 +#: ../settings/main.c:2010 msgid "SOCKET ID" msgstr "SOCKET ID" -#: ../settings/main.c:2002 +#: ../settings/main.c:2011 msgid "Version information" msgstr "Informace o verzi" -#: ../settings/main.c:2030 +#: ../settings/main.c:2039 #, c-format msgid "Type '%s --help' for usage." msgstr "Informace o použití získáte příkazem '%s --help'." -#: ../settings/main.c:2042 +#: ../settings/main.c:2051 msgid "The Xfce development team. All rights reserved." msgstr "Tým vývojářů Xfce. Všechna práva vyhrazena." -#: ../settings/main.c:2043 +#: ../settings/main.c:2052 #, c-format msgid "Please report bugs to <%s>." msgstr "Prosíme, abyste chyby hlásili na <%s>." -#: ../settings/main.c:2050 +#: ../settings/main.c:2059 msgid "Desktop Settings" msgstr "Nastavení plochy" -#: ../settings/main.c:2052 +#: ../settings/main.c:2061 msgid "Unable to contact settings server" msgstr "Spojení se serverem nastavení nelze navázat" @@ -158,8 +158,9 @@ msgstr "Pracovní plocha" #: ../settings/xfce-backdrop-settings.desktop.in.h:2 -msgid "Set desktop background and menu and icon behaviour" -msgstr "Nastavení pozadí pracovní plochy a chování nabídky ikon" +#: ../settings/xfdesktop-settings-ui.glade.h:11 +msgid "Set desktop background and menu and icon behavior" +msgstr "Nastavení pozadí pracovní plochy a nabídky a chování ikon" #: ../settings/xfdesktop-settings-appearance-frame-ui.glade.h:1 msgid "Solid color" @@ -337,14 +338,10 @@ msgid "File/launcher icons" msgstr "Ikony souborů a spouštěčů" -#: ../settings/xfdesktop-settings-ui.glade.h:10 ../src/xfce-desktop.c:1020 +#: ../settings/xfdesktop-settings-ui.glade.h:10 ../src/xfce-desktop.c:1007 msgid "Desktop" msgstr "Plocha" -#: ../settings/xfdesktop-settings-ui.glade.h:11 -msgid "Set desktop background and menu and icon behavior" -msgstr "Nastavení pozadí pracovní plochy a nabídky a chování ikon" - #: ../settings/xfdesktop-settings-ui.glade.h:12 msgid "_Background" msgstr "_Pozadí" @@ -436,26 +433,30 @@ msgstr "_Aktivace položek jedním kliknutím" #: ../settings/xfdesktop-settings-ui.glade.h:34 +msgid "Show hidden files on the desktop" +msgstr "Zobrazit skryté soubory na ploše" + +#: ../settings/xfdesktop-settings-ui.glade.h:35 msgid "Show icon tooltips. Size:" msgstr "Zobrazit popisky ikon. Velikost:" -#: ../settings/xfdesktop-settings-ui.glade.h:35 +#: ../settings/xfdesktop-settings-ui.glade.h:36 msgid "Size of the tooltip preview image." msgstr "Velikost popisku náhledu obrázku." -#: ../settings/xfdesktop-settings-ui.glade.h:36 +#: ../settings/xfdesktop-settings-ui.glade.h:37 msgid "Use custom _font size:" msgstr "Uživatelsky de_finovaná velikost písma:" -#: ../settings/xfdesktop-settings-ui.glade.h:37 +#: ../settings/xfdesktop-settings-ui.glade.h:38 msgid "Appearance" msgstr "Vzhled" -#: ../settings/xfdesktop-settings-ui.glade.h:38 +#: ../settings/xfdesktop-settings-ui.glade.h:39 msgid "Default Icons" msgstr "Výchozí ikony" -#: ../settings/xfdesktop-settings-ui.glade.h:39 +#: ../settings/xfdesktop-settings-ui.glade.h:40 msgid "_Icons" msgstr "_Ikony" @@ -517,250 +518,267 @@ msgstr "_Odebrat pracovní plochu '%s'" #: ../src/xfdesktop-app-menu-item.c:349 -#: ../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:1132 ../src/xfdesktop-file-utils.c:1209 -#: ../src/xfdesktop-file-utils.c:1234 ../src/xfdesktop-file-utils.c:1286 +#: ../src/xfdesktop-file-icon-manager.c:860 +#: ../src/xfdesktop-file-icon-manager.c:1125 +#: ../src/xfdesktop-file-icon-manager.c:1321 ../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-app-menu-item.c:351 -#: ../src/xfdesktop-file-icon-manager.c:1086 +#: ../src/xfdesktop-file-icon-manager.c:1127 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-application.c:768 +#: ../src/xfdesktop-application.c:836 msgid "Display version information" msgstr "Zobrazit informace o verzi" -#: ../src/xfdesktop-application.c:769 +#: ../src/xfdesktop-application.c:837 msgid "Reload all settings" msgstr "Znovu načíst všechna nastavení" -#: ../src/xfdesktop-application.c:770 +#: ../src/xfdesktop-application.c:838 +msgid "Advance to the next wallpaper on the current workspace" +msgstr "Postoupit na další tapetu na aktuální pracovní ploše" + +#: ../src/xfdesktop-application.c:839 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:771 +#: ../src/xfdesktop-application.c:840 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:773 +#: ../src/xfdesktop-application.c:842 msgid "Automatically arrange all the icons on the desktop" msgstr "Automaticky uspořádat všechny ikony na pracovní ploše" -#: ../src/xfdesktop-application.c:775 +#: ../src/xfdesktop-application.c:844 +msgid "Enable debug messages" +msgstr "Povolit ladění" + +#: ../src/xfdesktop-application.c:845 +msgid "Disable debug messages" +msgstr "Zakázat ladění" + +#: ../src/xfdesktop-application.c:846 msgid "Do not wait for a window manager on startup" msgstr "Nečekat na správce oken při startu" -#: ../src/xfdesktop-application.c:776 +#: ../src/xfdesktop-application.c:847 msgid "Cause xfdesktop to quit" msgstr "Ukončí správce plochy xfdesktop" -#: ../src/xfdesktop-application.c:791 +#: ../src/xfdesktop-application.c:862 #, c-format msgid "Failed to parse arguments: %s\n" msgstr "Zpracování parametrů se nezdařilo: %s\n" -#: ../src/xfdesktop-application.c:802 +#: ../src/xfdesktop-application.c:873 #, 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:804 +#: ../src/xfdesktop-application.c:875 #, 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:808 +#: ../src/xfdesktop-application.c:879 #, c-format msgid "Build options:\n" msgstr "Volby při sestavování:\n" -#: ../src/xfdesktop-application.c:809 +#: ../src/xfdesktop-application.c:880 #, c-format msgid " Desktop Menu: %s\n" msgstr "Hlavní nabídka: %s\n" -#: ../src/xfdesktop-application.c:811 ../src/xfdesktop-application.c:818 -#: ../src/xfdesktop-application.c:825 +#: ../src/xfdesktop-application.c:882 ../src/xfdesktop-application.c:889 +#: ../src/xfdesktop-application.c:896 msgid "enabled" msgstr "povoleno" -#: ../src/xfdesktop-application.c:813 ../src/xfdesktop-application.c:820 -#: ../src/xfdesktop-application.c:827 +#: ../src/xfdesktop-application.c:884 ../src/xfdesktop-application.c:891 +#: ../src/xfdesktop-application.c:898 msgid "disabled" msgstr "zakázáno" -#: ../src/xfdesktop-application.c:816 +#: ../src/xfdesktop-application.c:887 #, c-format msgid " Desktop Icons: %s\n" msgstr "Ikony plochy: %s\n" -#: ../src/xfdesktop-application.c:823 +#: ../src/xfdesktop-application.c:894 #, c-format msgid " Desktop File Icons: %s\n" msgstr "Ikony souborů plochy: %s\n" -#: ../src/xfdesktop-file-icon-manager.c:522 -#: ../src/xfdesktop-file-icon-manager.c:539 +#: ../src/xfdesktop-file-icon-manager.c:559 +#: ../src/xfdesktop-file-icon-manager.c:576 #, 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:527 -#: ../src/xfdesktop-file-icon-manager.c:544 +#: ../src/xfdesktop-file-icon-manager.c:564 +#: ../src/xfdesktop-file-icon-manager.c:581 msgid "Desktop Folder Error" msgstr "Chyba složky na ploše" -#: ../src/xfdesktop-file-icon-manager.c:546 +#: ../src/xfdesktop-file-icon-manager.c:583 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:629 ../src/xfdesktop-file-utils.c:723 +#: ../src/xfdesktop-file-icon-manager.c:666 ../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:630 ../src/xfdesktop-file-utils.c:777 +#: ../src/xfdesktop-file-icon-manager.c:667 ../src/xfdesktop-file-utils.c:777 msgid "The files could not be renamed" msgstr "Soubor nelze přejmenovat" -#: ../src/xfdesktop-file-icon-manager.c:631 +#: ../src/xfdesktop-file-icon-manager.c:668 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:675 -#: ../src/xfdesktop-file-icon-manager.c:719 ../src/xfdesktop-file-utils.c:921 -#: ../src/xfdesktop-file-utils.c:959 +#: ../src/xfdesktop-file-icon-manager.c:712 +#: ../src/xfdesktop-file-icon-manager.c:756 ../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:676 -#: ../src/xfdesktop-file-icon-manager.c:720 +#: ../src/xfdesktop-file-icon-manager.c:713 +#: ../src/xfdesktop-file-icon-manager.c:757 msgid "The selected files could not be trashed" msgstr "Vybrané soubory nelze přesunout do koše" -#: ../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:864 -#: ../src/xfdesktop-file-utils.c:1005 ../src/xfdesktop-file-utils.c:1052 -#: ../src/xfdesktop-file-utils.c:1093 ../src/xfdesktop-file-utils.c:1134 -#: ../src/xfdesktop-file-utils.c:1236 ../src/xfdesktop-file-utils.c:1288 -#: ../src/xfdesktop-file-utils.c:1361 ../src/xfdesktop-file-utils.c:1439 +#: ../src/xfdesktop-file-icon-manager.c:714 +#: ../src/xfdesktop-file-icon-manager.c:758 ../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:821 -#: ../src/xfdesktop-file-icon-manager.c:1279 +#: ../src/xfdesktop-file-icon-manager.c:858 +#: ../src/xfdesktop-file-icon-manager.c:1320 #, c-format msgid "Unable to launch \"%s\":" msgstr "Nelze spustit \"%s\":" -#: ../src/xfdesktop-file-icon-manager.c:1008 +#: ../src/xfdesktop-file-icon-manager.c:1049 #, c-format msgid "_Open With \"%s\"" msgstr "_Otevřít pomocí \"%s\"" -#: ../src/xfdesktop-file-icon-manager.c:1011 +#: ../src/xfdesktop-file-icon-manager.c:1052 #, c-format msgid "Open With \"%s\"" msgstr "Otevřít pomocí \"%s\"" -#: ../src/xfdesktop-file-icon-manager.c:1337 +#: ../src/xfdesktop-file-icon-manager.c:1378 msgid "_Open all" msgstr "_Otevřít vše" -#: ../src/xfdesktop-file-icon-manager.c:1353 +#: ../src/xfdesktop-file-icon-manager.c:1394 msgid "_Open in New Window" msgstr "_Otevřít v novém okně" -#: ../src/xfdesktop-file-icon-manager.c:1355 +#: ../src/xfdesktop-file-icon-manager.c:1396 #: ../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:1374 +#: ../src/xfdesktop-file-icon-manager.c:1415 msgid "Create _Launcher..." msgstr "Vytvořit _spouštěč..." #. create link item -#: ../src/xfdesktop-file-icon-manager.c:1390 +#: ../src/xfdesktop-file-icon-manager.c:1431 msgid "Create _URL Link..." msgstr "Vytvořit odkaz _URL..." #. create folder item -#: ../src/xfdesktop-file-icon-manager.c:1406 +#: ../src/xfdesktop-file-icon-manager.c:1447 msgid "Create _Folder..." msgstr "Vytvořit _složku..." -#: ../src/xfdesktop-file-icon-manager.c:1421 +#: ../src/xfdesktop-file-icon-manager.c:1462 msgid "Create From _Template" msgstr "Vytvořit _ze šablony" -#: ../src/xfdesktop-file-icon-manager.c:1450 +#: ../src/xfdesktop-file-icon-manager.c:1491 msgid "_Empty File" msgstr "_Prázdný soubor" -#: ../src/xfdesktop-file-icon-manager.c:1467 +#: ../src/xfdesktop-file-icon-manager.c:1508 msgid "_Execute" msgstr "_Spustit" -#: ../src/xfdesktop-file-icon-manager.c:1487 +#: ../src/xfdesktop-file-icon-manager.c:1528 msgid "_Edit Launcher" msgstr "_Upravit spouštěč" -#: ../src/xfdesktop-file-icon-manager.c:1522 +#: ../src/xfdesktop-file-icon-manager.c:1563 msgid "Open With" msgstr "Otevřít pomocí" -#: ../src/xfdesktop-file-icon-manager.c:1548 +#: ../src/xfdesktop-file-icon-manager.c:1589 msgid "Open With Other _Application..." msgstr "Otevřít v jiné _aplikaci..." +#. Trash +#: ../src/xfdesktop-file-icon-manager.c:1676 +msgid "Mo_ve to Trash" +msgstr "Přesu_nout do koše" + #. Rename -#: ../src/xfdesktop-file-icon-manager.c:1651 +#: ../src/xfdesktop-file-icon-manager.c:1707 msgid "_Rename..." msgstr "Přej_menovat..." -#: ../src/xfdesktop-file-icon-manager.c:1679 +#: ../src/xfdesktop-file-icon-manager.c:1735 msgid "Arrange Desktop _Icons" msgstr "_Uspořádat ikony na ploše" -#: ../src/xfdesktop-file-icon-manager.c:1690 +#: ../src/xfdesktop-file-icon-manager.c:1746 msgid "Desktop _Settings..." msgstr "_Nastavení plochy..." -#: ../src/xfdesktop-file-icon-manager.c:1701 +#: ../src/xfdesktop-file-icon-manager.c:1757 #: ../src/xfdesktop-volume-icon.c:855 msgid "P_roperties..." msgstr "_Vlastnosti..." -#: ../src/xfdesktop-file-icon-manager.c:2642 +#: ../src/xfdesktop-file-icon-manager.c:2699 msgid "Load Error" msgstr "Chyba při načítání" -#: ../src/xfdesktop-file-icon-manager.c:2644 +#: ../src/xfdesktop-file-icon-manager.c:2701 msgid "Failed to load the desktop folder" msgstr "Složku pracovní plochu se nepodařilo načíst" -#: ../src/xfdesktop-file-icon-manager.c:3189 +#: ../src/xfdesktop-file-icon-manager.c:3242 msgid "Copy _Here" msgstr "_Zkopírovat sem" -#: ../src/xfdesktop-file-icon-manager.c:3189 +#: ../src/xfdesktop-file-icon-manager.c:3242 msgid "_Move Here" msgstr "_Přesunout sem" -#: ../src/xfdesktop-file-icon-manager.c:3189 +#: ../src/xfdesktop-file-icon-manager.c:3242 msgid "_Link Here" msgstr "_Vytvořit zde odkaz" @@ -809,72 +827,72 @@ msgid "The file could not be renamed" msgstr "Soubor nelze přejmenovat" -#: ../src/xfdesktop-file-utils.c:862 +#: ../src/xfdesktop-file-utils.c:826 msgid "Delete Error" msgstr "Chyba při mazání" -#: ../src/xfdesktop-file-utils.c:863 +#: ../src/xfdesktop-file-utils.c:827 msgid "The selected files could not be deleted" msgstr "Vybrané soubory nelze smazat" -#: ../src/xfdesktop-file-utils.c:922 +#: ../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:923 ../src/xfdesktop-file-utils.c:961 +#: ../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:960 +#: ../src/xfdesktop-file-utils.c:914 msgid "Could not empty the trash" msgstr "Nelze vysypat koš" -#: ../src/xfdesktop-file-utils.c:1003 +#: ../src/xfdesktop-file-utils.c:957 msgid "Create File Error" msgstr "Chyba při vytváření souboru" -#: ../src/xfdesktop-file-utils.c:1004 +#: ../src/xfdesktop-file-utils.c:958 msgid "Could not create a new file" msgstr "Nelze vytvořit nový soubor" -#: ../src/xfdesktop-file-utils.c:1050 +#: ../src/xfdesktop-file-utils.c:1004 msgid "Create Document Error" msgstr "Chyba při vytváření dokumentu" -#: ../src/xfdesktop-file-utils.c:1051 +#: ../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:1091 +#: ../src/xfdesktop-file-utils.c:1045 msgid "File Properties Error" msgstr "Chyba vlastností souboru" -#: ../src/xfdesktop-file-utils.c:1092 +#: ../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:1133 +#: ../src/xfdesktop-file-utils.c:1087 msgid "The file could not be opened" msgstr "Soubor nelze otevřít" -#: ../src/xfdesktop-file-utils.c:1206 ../src/xfdesktop-file-utils.c:1231 +#: ../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:1287 +#: ../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:1345 ../src/xfdesktop-file-utils.c:1359 -#: ../src/xfdesktop-file-utils.c:1421 ../src/xfdesktop-file-utils.c:1437 +#: ../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:1346 ../src/xfdesktop-file-utils.c:1360 -#: ../src/xfdesktop-file-utils.c:1422 ../src/xfdesktop-file-utils.c:1438 +#: ../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" @@ -928,7 +946,7 @@ msgid "Eject Finished" msgstr "Vysunout dokončené" -#: ../src/xfdesktop-regular-file-icon.c:741 +#: ../src/xfdesktop-regular-file-icon.c:748 #, c-format msgid "" "Type: %s\n" diff -Nru xfdesktop4-4.11.6/po/de.po xfdesktop4-4.19.2/po/de.po --- xfdesktop4-4.11.6/po/de.po 2014-02-26 06:58:29.000000000 +0000 +++ xfdesktop4-4.19.2/po/de.po 2014-05-29 16:45:19.000000000 +0000 @@ -14,47 +14,47 @@ 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-25 14:42+0000\n" -"Last-Translator: hjudt \n" -"Language-Team: German (http://www.transifex.com/projects/p/xfce/language/de/)\n" +"POT-Creation-Date: 2014-04-03 18:32+0200\n" +"PO-Revision-Date: 2014-05-24 14:12+0000\n" +"Last-Translator: to_ba\n" +"Language-Team: German (http://www.transifex.com/projects/p/xfdesktop/language/de/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Language: de\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -#: ../settings/main.c:375 ../src/xfdesktop-special-file-icon.c:295 +#: ../settings/main.c:404 ../src/xfdesktop-special-file-icon.c:295 #: ../src/xfdesktop-special-file-icon.c:479 msgid "Home" msgstr "Persönlicher Ordner" -#: ../settings/main.c:377 +#: ../settings/main.c:406 msgid "Filesystem" msgstr "Dateisystem" -#: ../settings/main.c:379 +#: ../settings/main.c:408 msgid "Trash" msgstr "Papierkorb" -#: ../settings/main.c:381 +#: ../settings/main.c:410 msgid "Removable Devices" msgstr "Entfernbare Datenträger" -#: ../settings/main.c:383 +#: ../settings/main.c:412 msgid "Network Shares" msgstr "Netzwerkfreigaben" -#: ../settings/main.c:385 +#: ../settings/main.c:414 msgid "Disks and Drives" msgstr "Festplatten und Laufwerke" -#: ../settings/main.c:387 +#: ../settings/main.c:416 msgid "Other Devices" msgstr "Andere Geräte" #. Display the file name, file type, and file size in the tooltip. -#: ../settings/main.c:500 +#: ../settings/main.c:529 #, c-format msgid "" "%s\n" @@ -62,95 +62,95 @@ "Size: %s" msgstr "%s\nTyp: %s\nGröße: %s" -#: ../settings/main.c:686 +#: ../settings/main.c:715 #, c-format msgid "Wallpaper for Monitor %d (%s)" msgstr "Hintergrundbild für Bildschirm %d (%s)" -#: ../settings/main.c:689 +#: ../settings/main.c:718 #, c-format msgid "Wallpaper for Monitor %d" msgstr "Hintergrundbild für Bildschirm %d" -#: ../settings/main.c:695 +#: ../settings/main.c:724 msgid "Move this dialog to the display you want to edit the settings for." msgstr "Verschieben Sie diesen Dialog auf den Bildschirm, für den Sie die Einstellungen bearbeiten wollen." -#: ../settings/main.c:702 +#: ../settings/main.c:731 #, c-format msgid "Wallpaper for %s on Monitor %d (%s)" msgstr "Hintergrundbild für %s auf Bildschirm %d (%s)" -#: ../settings/main.c:706 +#: ../settings/main.c:735 #, c-format msgid "Wallpaper for %s on Monitor %d" msgstr "Hintergrundbild für %s auf Bildschirm %d" -#: ../settings/main.c:713 +#: ../settings/main.c:742 msgid "" "Move this dialog to the display and workspace you want to edit the settings " "for." msgstr "Verschieben Sie diesen Dialog auf den Bildschirm und die Arbeitsfläche, für die Sie die Einstellungen bearbeiten wollen." #. Single monitor and single workspace -#: ../settings/main.c:720 +#: ../settings/main.c:749 #, c-format msgid "Wallpaper for my desktop" msgstr "Hintergrundbild für meinen Schreibtisch" #. Single monitor and per workspace wallpaper -#: ../settings/main.c:726 +#: ../settings/main.c:755 #, c-format msgid "Wallpaper for %s" msgstr "Hintergrundbild für %s" -#: ../settings/main.c:731 +#: ../settings/main.c:760 msgid "Move this dialog to the workspace you want to edit the settings for." msgstr "Verschieben Sie diesen Dialog auf die Arbeitsfläche, für die Sie die Einstellungen bearbeiten wollen." -#: ../settings/main.c:1134 +#: ../settings/main.c:1174 msgid "Image selection is unavailable while the image style is set to None." msgstr "Bildauswahl ist nicht verfügbar, während Stil auf \"kein Bild\" eingestellt ist." -#: ../settings/main.c:1481 +#: ../settings/main.c:1523 msgid "Spanning screens" msgstr "Bildschirmübergreifend" -#: ../settings/main.c:1786 +#: ../settings/main.c:1825 msgid "Image files" msgstr "Bilddateien" -#: ../settings/main.c:1958 +#: ../settings/main.c:2001 msgid "Settings manager socket" msgstr "Socket für die Sitzungsverwaltung" -#: ../settings/main.c:1958 +#: ../settings/main.c:2001 msgid "SOCKET ID" msgstr "SOCKET-NUMMER" -#: ../settings/main.c:1959 +#: ../settings/main.c:2002 msgid "Version information" msgstr "Versionsinformation" -#: ../settings/main.c:1986 +#: ../settings/main.c:2030 #, c-format msgid "Type '%s --help' for usage." msgstr "Geben Sie »%s --help« ein, um Hinweise zur Verwendung zu erhalten." -#: ../settings/main.c:1998 +#: ../settings/main.c:2042 msgid "The Xfce development team. All rights reserved." msgstr "Das Entwicklungsteam von Xfce. Alle Rechte vorbehalten." -#: ../settings/main.c:1999 +#: ../settings/main.c:2043 #, c-format msgid "Please report bugs to <%s>." msgstr "Bitte melden Sie Fehler an <%s>." -#: ../settings/main.c:2006 +#: ../settings/main.c:2050 msgid "Desktop Settings" msgstr "Schreibtischeinstellungen" -#: ../settings/main.c:2008 +#: ../settings/main.c:2052 msgid "Unable to contact settings server" msgstr "Der Einstellungsdienst konnte nicht kontaktiert werden." @@ -332,13 +332,13 @@ #: ../settings/xfdesktop-settings-ui.glade.h:8 msgid "Minimized application icons" -msgstr "Minimierte Anwendungssymbole" +msgstr "Verkleinerte Anwendungssymbole" #: ../settings/xfdesktop-settings-ui.glade.h:9 msgid "File/launcher icons" msgstr "Datei-/Startersymbole" -#: ../settings/xfdesktop-settings-ui.glade.h:10 ../src/xfce-desktop.c:1015 +#: ../settings/xfdesktop-settings-ui.glade.h:10 ../src/xfce-desktop.c:1020 msgid "Desktop" msgstr "Schreibtisch" @@ -517,6 +517,22 @@ msgid "_Remove Workspace '%s'" msgstr "A_rbeitsfläche »%s« entfernen" +#: ../src/xfdesktop-app-menu-item.c:349 +#: ../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:1132 ../src/xfdesktop-file-utils.c:1209 +#: ../src/xfdesktop-file-utils.c:1234 ../src/xfdesktop-file-utils.c:1286 +msgid "Launch Error" +msgstr "Fehler beim Ausführen" + +#: ../src/xfdesktop-app-menu-item.c:351 +#: ../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 "»exo-desktop-item-edit« kann nicht gestartet werden, was zum Erstellen und Bearbeiten von Startern und Verknüpfungen auf dem Schreibtisch benötigt wird." + #: ../src/xfdesktop-application.c:768 msgid "Display version information" msgstr "Versionsinformation anzeigen" @@ -539,7 +555,7 @@ #: ../src/xfdesktop-application.c:775 msgid "Do not wait for a window manager on startup" -msgstr "Beim Starten nicht auf einen Fenstermanager warten" +msgstr "Beim Starten nicht auf eine Fensterverwaltung warten" #: ../src/xfdesktop-application.c:776 msgid "Cause xfdesktop to quit" @@ -620,8 +636,8 @@ msgstr "Keines der ausgewählten Symbole unterstützt eine Umbenennung." #: ../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 +#: ../src/xfdesktop-file-icon-manager.c:719 ../src/xfdesktop-file-utils.c:921 +#: ../src/xfdesktop-file-utils.c:959 msgid "Trash Error" msgstr "Fehler" @@ -632,15 +648,15 @@ #: ../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 +#: ../src/xfdesktop-file-utils.c:778 ../src/xfdesktop-file-utils.c:864 +#: ../src/xfdesktop-file-utils.c:1005 ../src/xfdesktop-file-utils.c:1052 +#: ../src/xfdesktop-file-utils.c:1093 ../src/xfdesktop-file-utils.c:1134 +#: ../src/xfdesktop-file-utils.c:1236 ../src/xfdesktop-file-utils.c:1288 +#: ../src/xfdesktop-file-utils.c:1361 ../src/xfdesktop-file-utils.c:1439 msgid "" "This feature requires a file manager service to be present (such as the one " "supplied by Thunar)." -msgstr "Diese Funktion benötigt den Dienst eines Dateimanagers (wie er z.B. von Thunar bereitgestellt wird)." +msgstr "Diese Funktion benötigt den Dienst einer Dateiverwaltung (wie er z.B. von Thunar bereitgestellt wird)." #. printf is to be translator-friendly #: ../src/xfdesktop-file-icon-manager.c:821 @@ -649,14 +665,6 @@ msgid "Unable to launch \"%s\":" msgstr "»%s« konnte nicht gestartet werden:" -#: ../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 "Fehler beim Ausführen" - #: ../src/xfdesktop-file-icon-manager.c:1008 #, c-format msgid "_Open With \"%s\"" @@ -667,12 +675,6 @@ msgid "Open With \"%s\"" msgstr "Öffnen mit »%s«" -#: ../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 "»exo-desktop-item-edit« kann nicht gestartet werden, was zum Erstellen und Bearbeiten von Startern und Verknüpfungen auf dem Schreibtisch benötigt wird." - #: ../src/xfdesktop-file-icon-manager.c:1337 msgid "_Open all" msgstr "_Alle öffnen" @@ -743,23 +745,23 @@ msgid "P_roperties..." msgstr "_Eigenschaften …" -#: ../src/xfdesktop-file-icon-manager.c:2716 +#: ../src/xfdesktop-file-icon-manager.c:2642 msgid "Load Error" msgstr "Fehler beim Laden" -#: ../src/xfdesktop-file-icon-manager.c:2718 +#: ../src/xfdesktop-file-icon-manager.c:2644 msgid "Failed to load the desktop folder" msgstr "Schreibtischordner konnte nicht geladen werden" -#: ../src/xfdesktop-file-icon-manager.c:3262 +#: ../src/xfdesktop-file-icon-manager.c:3189 msgid "Copy _Here" msgstr "Hierher _kopieren" -#: ../src/xfdesktop-file-icon-manager.c:3262 +#: ../src/xfdesktop-file-icon-manager.c:3189 msgid "_Move Here" msgstr "Hierher _verschieben" -#: ../src/xfdesktop-file-icon-manager.c:3262 +#: ../src/xfdesktop-file-icon-manager.c:3189 msgid "_Link Here" msgstr "_Verknüpfung hier erstellen" @@ -808,72 +810,72 @@ msgid "The file could not be renamed" msgstr "Die Datei konnte nicht umbenannt werden" -#: ../src/xfdesktop-file-utils.c:826 +#: ../src/xfdesktop-file-utils.c:862 msgid "Delete Error" -msgstr "Fehler beim Löschen" +msgstr "Löschfehler" -#: ../src/xfdesktop-file-utils.c:827 +#: ../src/xfdesktop-file-utils.c:863 msgid "The selected files could not be deleted" -msgstr "Die ausgewählten Dateien konnten nicht entfernt werden" +msgstr "Die ausgewählten Dateien konnten nicht gelöscht werden" -#: ../src/xfdesktop-file-utils.c:877 +#: ../src/xfdesktop-file-utils.c:922 msgid "The selected files could not be moved to the trash" -msgstr "Die ausgewählte Datei konnte nicht in den Papierkorb verschoben werden." +msgstr "Die ausgewählten Dateien konnten nicht in den Papierkorb werden" -#: ../src/xfdesktop-file-utils.c:878 ../src/xfdesktop-file-utils.c:915 +#: ../src/xfdesktop-file-utils.c:923 ../src/xfdesktop-file-utils.c:961 msgid "" "This feature requires a trash service to be present (such as the one " "supplied by Thunar)." msgstr "Diese Funktion benötigt den Dienst eines Papierkorb-Managers (wie er z.B. von Thunar bereitgestellt wird)." -#: ../src/xfdesktop-file-utils.c:914 +#: ../src/xfdesktop-file-utils.c:960 msgid "Could not empty the trash" msgstr "Der Papierkorb konnte nicht geleert werden" -#: ../src/xfdesktop-file-utils.c:957 +#: ../src/xfdesktop-file-utils.c:1003 msgid "Create File Error" msgstr "Fehler beim Dateierstellen" -#: ../src/xfdesktop-file-utils.c:958 +#: ../src/xfdesktop-file-utils.c:1004 msgid "Could not create a new file" msgstr "Neue Datei konnte nicht erstellt werden" -#: ../src/xfdesktop-file-utils.c:1004 +#: ../src/xfdesktop-file-utils.c:1050 msgid "Create Document Error" msgstr "Fehler beim Dokumenterstellen" -#: ../src/xfdesktop-file-utils.c:1005 +#: ../src/xfdesktop-file-utils.c:1051 msgid "Could not create a new document from the template" msgstr "Aus der Vorlage konnte kein Dokument erstellt werden" -#: ../src/xfdesktop-file-utils.c:1045 +#: ../src/xfdesktop-file-utils.c:1091 msgid "File Properties Error" msgstr "Fehler bei Dateieigenschaften" -#: ../src/xfdesktop-file-utils.c:1046 +#: ../src/xfdesktop-file-utils.c:1092 msgid "The file properties dialog could not be opened" msgstr "Der Eigenschaftendialog konnte nicht geöffnet werden" -#: ../src/xfdesktop-file-utils.c:1087 +#: ../src/xfdesktop-file-utils.c:1133 msgid "The file could not be opened" msgstr "Die Datei konnte nicht geöffnet werden" -#: ../src/xfdesktop-file-utils.c:1160 ../src/xfdesktop-file-utils.c:1185 +#: ../src/xfdesktop-file-utils.c:1206 ../src/xfdesktop-file-utils.c:1231 #, c-format msgid "Failed to run \"%s\"" msgstr "»%s« konnte nicht ausgeführt werden" -#: ../src/xfdesktop-file-utils.c:1241 +#: ../src/xfdesktop-file-utils.c:1287 msgid "The application chooser could not be opened" msgstr "Der Anwendungswähler konnte nicht geöffnet werden" -#: ../src/xfdesktop-file-utils.c:1299 ../src/xfdesktop-file-utils.c:1313 -#: ../src/xfdesktop-file-utils.c:1375 ../src/xfdesktop-file-utils.c:1391 +#: ../src/xfdesktop-file-utils.c:1345 ../src/xfdesktop-file-utils.c:1359 +#: ../src/xfdesktop-file-utils.c:1421 ../src/xfdesktop-file-utils.c:1437 msgid "Transfer Error" msgstr "Übertragungsfehler" -#: ../src/xfdesktop-file-utils.c:1300 ../src/xfdesktop-file-utils.c:1314 -#: ../src/xfdesktop-file-utils.c:1376 ../src/xfdesktop-file-utils.c:1392 +#: ../src/xfdesktop-file-utils.c:1346 ../src/xfdesktop-file-utils.c:1360 +#: ../src/xfdesktop-file-utils.c:1422 ../src/xfdesktop-file-utils.c:1438 msgid "The file transfer could not be performed" msgstr "Die Datei konnte nicht übertragen werden." @@ -927,7 +929,7 @@ msgid "Eject Finished" msgstr "Gerät wurde ausgeworfen" -#: ../src/xfdesktop-regular-file-icon.c:603 +#: ../src/xfdesktop-regular-file-icon.c:741 #, c-format msgid "" "Type: %s\n" diff -Nru xfdesktop4-4.11.6/po/en_AU.po xfdesktop4-4.19.2/po/en_AU.po --- xfdesktop4-4.11.6/po/en_AU.po 2014-04-05 18:59:11.000000000 +0000 +++ xfdesktop4-4.19.2/po/en_AU.po 2014-08-11 07:27:27.000000000 +0000 @@ -3,15 +3,15 @@ # This file is distributed under the same license as the PACKAGE package. # # Translators: -# k3lt01 , 2013-2014 +# Michael Findlay , 2013-2014 msgid "" msgstr "" "Project-Id-Version: Xfdesktop\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2014-04-03 18:32+0200\n" -"PO-Revision-Date: 2014-04-04 08:36+0000\n" -"Last-Translator: k3lt01 \n" -"Language-Team: English (Australia) (http://www.transifex.com/projects/p/xfce/language/en_AU/)\n" +"POT-Creation-Date: 2014-08-03 12:32+0200\n" +"PO-Revision-Date: 2014-08-10 05:12+0000\n" +"Last-Translator: Michael Findlay \n" +"Language-Team: English (Australia) (http://www.transifex.com/projects/p/xfdesktop/language/en_AU/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" @@ -106,45 +106,45 @@ msgid "Image selection is unavailable while the image style is set to None." msgstr "Image selection is unavailable while the image style is set to None." -#: ../settings/main.c:1523 +#: ../settings/main.c:1524 msgid "Spanning screens" msgstr "Spanning screens" -#: ../settings/main.c:1825 +#: ../settings/main.c:1831 msgid "Image files" msgstr "Image files" -#: ../settings/main.c:2001 +#: ../settings/main.c:2010 msgid "Settings manager socket" msgstr "Settings manager socket" -#: ../settings/main.c:2001 +#: ../settings/main.c:2010 msgid "SOCKET ID" msgstr "SOCKET ID" -#: ../settings/main.c:2002 +#: ../settings/main.c:2011 msgid "Version information" msgstr "Version information" -#: ../settings/main.c:2030 +#: ../settings/main.c:2039 #, c-format msgid "Type '%s --help' for usage." msgstr "Type '%s --help' for usage." -#: ../settings/main.c:2042 +#: ../settings/main.c:2051 msgid "The Xfce development team. All rights reserved." msgstr "The Xfce development team. All rights reserved." -#: ../settings/main.c:2043 +#: ../settings/main.c:2052 #, c-format msgid "Please report bugs to <%s>." msgstr "Please report bugs to <%s>." -#: ../settings/main.c:2050 +#: ../settings/main.c:2059 msgid "Desktop Settings" msgstr "Desktop Settings" -#: ../settings/main.c:2052 +#: ../settings/main.c:2061 msgid "Unable to contact settings server" msgstr "Unable to contact settings server" @@ -153,7 +153,8 @@ msgstr "Desktop " #: ../settings/xfce-backdrop-settings.desktop.in.h:2 -msgid "Set desktop background and menu and icon behaviour" +#: ../settings/xfdesktop-settings-ui.glade.h:11 +msgid "Set desktop background and menu and icon behavior" msgstr "Set desktop background and menu and icon behaviour" #: ../settings/xfdesktop-settings-appearance-frame-ui.glade.h:1 @@ -332,14 +333,10 @@ msgid "File/launcher icons" msgstr "File/launcher icons" -#: ../settings/xfdesktop-settings-ui.glade.h:10 ../src/xfce-desktop.c:1020 +#: ../settings/xfdesktop-settings-ui.glade.h:10 ../src/xfce-desktop.c:1007 msgid "Desktop" msgstr "Desktop" -#: ../settings/xfdesktop-settings-ui.glade.h:11 -msgid "Set desktop background and menu and icon behavior" -msgstr "Set desktop background and menu and icon behaviour" - #: ../settings/xfdesktop-settings-ui.glade.h:12 msgid "_Background" msgstr "_Background" @@ -431,26 +428,30 @@ msgstr "Single _click to activate items" #: ../settings/xfdesktop-settings-ui.glade.h:34 +msgid "Show hidden files on the desktop" +msgstr "Show hidden files on the desktop" + +#: ../settings/xfdesktop-settings-ui.glade.h:35 msgid "Show icon tooltips. Size:" msgstr "Show icon tooltips. Size:" -#: ../settings/xfdesktop-settings-ui.glade.h:35 +#: ../settings/xfdesktop-settings-ui.glade.h:36 msgid "Size of the tooltip preview image." msgstr "Size of the tooltip preview image." -#: ../settings/xfdesktop-settings-ui.glade.h:36 +#: ../settings/xfdesktop-settings-ui.glade.h:37 msgid "Use custom _font size:" msgstr "Use custom _font size:" -#: ../settings/xfdesktop-settings-ui.glade.h:37 +#: ../settings/xfdesktop-settings-ui.glade.h:38 msgid "Appearance" msgstr "Appearance" -#: ../settings/xfdesktop-settings-ui.glade.h:38 +#: ../settings/xfdesktop-settings-ui.glade.h:39 msgid "Default Icons" msgstr "Default Icons" -#: ../settings/xfdesktop-settings-ui.glade.h:39 +#: ../settings/xfdesktop-settings-ui.glade.h:40 msgid "_Icons" msgstr "_Icons" @@ -512,250 +513,267 @@ msgstr "_Remove Workspace '%s'" #: ../src/xfdesktop-app-menu-item.c:349 -#: ../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:1132 ../src/xfdesktop-file-utils.c:1209 -#: ../src/xfdesktop-file-utils.c:1234 ../src/xfdesktop-file-utils.c:1286 +#: ../src/xfdesktop-file-icon-manager.c:860 +#: ../src/xfdesktop-file-icon-manager.c:1125 +#: ../src/xfdesktop-file-icon-manager.c:1321 ../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 "Launch Error" #: ../src/xfdesktop-app-menu-item.c:351 -#: ../src/xfdesktop-file-icon-manager.c:1086 +#: ../src/xfdesktop-file-icon-manager.c:1127 msgid "" "Unable to launch \"exo-desktop-item-edit\", which is required to create and " "edit launchers and links on the desktop." msgstr "Unable to launch \"exo-desktop-item-edit\", which is required to create and edit launchers and links on the desktop." -#: ../src/xfdesktop-application.c:768 +#: ../src/xfdesktop-application.c:836 msgid "Display version information" msgstr "Display version information" -#: ../src/xfdesktop-application.c:769 +#: ../src/xfdesktop-application.c:837 msgid "Reload all settings" msgstr "Reload all settings" -#: ../src/xfdesktop-application.c:770 +#: ../src/xfdesktop-application.c:838 +msgid "Advance to the next wallpaper on the current workspace" +msgstr "Advance to the next wallpaper on the current workspace" + +#: ../src/xfdesktop-application.c:839 msgid "Pop up the menu (at the current mouse position)" msgstr "Pop up the menu (at the current mouse position)" -#: ../src/xfdesktop-application.c:771 +#: ../src/xfdesktop-application.c:840 msgid "Pop up the window list (at the current mouse position)" msgstr "Pop up the window list (at the current mouse position)" -#: ../src/xfdesktop-application.c:773 +#: ../src/xfdesktop-application.c:842 msgid "Automatically arrange all the icons on the desktop" msgstr "Automatically arrange all the icons on the desktop" -#: ../src/xfdesktop-application.c:775 +#: ../src/xfdesktop-application.c:844 +msgid "Enable debug messages" +msgstr "Enable debug messages" + +#: ../src/xfdesktop-application.c:845 +msgid "Disable debug messages" +msgstr "Disable debug messages" + +#: ../src/xfdesktop-application.c:846 msgid "Do not wait for a window manager on startup" msgstr "Do not wait for a window manager on startup" -#: ../src/xfdesktop-application.c:776 +#: ../src/xfdesktop-application.c:847 msgid "Cause xfdesktop to quit" msgstr "Cause xfdesktop to quit" -#: ../src/xfdesktop-application.c:791 +#: ../src/xfdesktop-application.c:862 #, c-format msgid "Failed to parse arguments: %s\n" msgstr "Failed to parse arguments: %s\n" -#: ../src/xfdesktop-application.c:802 +#: ../src/xfdesktop-application.c:873 #, c-format msgid "This is %s version %s, running on Xfce %s.\n" msgstr "This is %s version %s, running on Xfce %s.\n" -#: ../src/xfdesktop-application.c:804 +#: ../src/xfdesktop-application.c:875 #, c-format msgid "Built with GTK+ %d.%d.%d, linked with GTK+ %d.%d.%d." msgstr "Built with GTK+ %d.%d.%d, linked with GTK+ %d.%d.%d." -#: ../src/xfdesktop-application.c:808 +#: ../src/xfdesktop-application.c:879 #, c-format msgid "Build options:\n" msgstr "Build options:\n" -#: ../src/xfdesktop-application.c:809 +#: ../src/xfdesktop-application.c:880 #, c-format msgid " Desktop Menu: %s\n" msgstr " Desktop Menu: %s\n" -#: ../src/xfdesktop-application.c:811 ../src/xfdesktop-application.c:818 -#: ../src/xfdesktop-application.c:825 +#: ../src/xfdesktop-application.c:882 ../src/xfdesktop-application.c:889 +#: ../src/xfdesktop-application.c:896 msgid "enabled" msgstr "enabled" -#: ../src/xfdesktop-application.c:813 ../src/xfdesktop-application.c:820 -#: ../src/xfdesktop-application.c:827 +#: ../src/xfdesktop-application.c:884 ../src/xfdesktop-application.c:891 +#: ../src/xfdesktop-application.c:898 msgid "disabled" msgstr "disabled" -#: ../src/xfdesktop-application.c:816 +#: ../src/xfdesktop-application.c:887 #, c-format msgid " Desktop Icons: %s\n" msgstr " Desktop Icons: %s\n" -#: ../src/xfdesktop-application.c:823 +#: ../src/xfdesktop-application.c:894 #, c-format msgid " Desktop File Icons: %s\n" msgstr " Desktop File Icons: %s\n" -#: ../src/xfdesktop-file-icon-manager.c:522 -#: ../src/xfdesktop-file-icon-manager.c:539 +#: ../src/xfdesktop-file-icon-manager.c:559 +#: ../src/xfdesktop-file-icon-manager.c:576 #, c-format msgid "Could not create the desktop folder \"%s\"" msgstr "Could not create the desktop folder \"%s\"" -#: ../src/xfdesktop-file-icon-manager.c:527 -#: ../src/xfdesktop-file-icon-manager.c:544 +#: ../src/xfdesktop-file-icon-manager.c:564 +#: ../src/xfdesktop-file-icon-manager.c:581 msgid "Desktop Folder Error" msgstr "Desktop Folder Error" -#: ../src/xfdesktop-file-icon-manager.c:546 +#: ../src/xfdesktop-file-icon-manager.c:583 msgid "" "A normal file with the same name already exists. Please delete or rename it." msgstr "A normal file with the same name already exists. Please delete or rename it." -#: ../src/xfdesktop-file-icon-manager.c:629 ../src/xfdesktop-file-utils.c:723 +#: ../src/xfdesktop-file-icon-manager.c:666 ../src/xfdesktop-file-utils.c:723 #: ../src/xfdesktop-file-utils.c:776 msgid "Rename Error" msgstr "Rename Error" -#: ../src/xfdesktop-file-icon-manager.c:630 ../src/xfdesktop-file-utils.c:777 +#: ../src/xfdesktop-file-icon-manager.c:667 ../src/xfdesktop-file-utils.c:777 msgid "The files could not be renamed" msgstr "The files could not be renamed" -#: ../src/xfdesktop-file-icon-manager.c:631 +#: ../src/xfdesktop-file-icon-manager.c:668 msgid "None of the icons selected support being renamed." msgstr "None of the icons selected support being renamed." -#: ../src/xfdesktop-file-icon-manager.c:675 -#: ../src/xfdesktop-file-icon-manager.c:719 ../src/xfdesktop-file-utils.c:921 -#: ../src/xfdesktop-file-utils.c:959 +#: ../src/xfdesktop-file-icon-manager.c:712 +#: ../src/xfdesktop-file-icon-manager.c:756 ../src/xfdesktop-file-utils.c:876 +#: ../src/xfdesktop-file-utils.c:913 msgid "Trash Error" msgstr "Rubbish Error" -#: ../src/xfdesktop-file-icon-manager.c:676 -#: ../src/xfdesktop-file-icon-manager.c:720 +#: ../src/xfdesktop-file-icon-manager.c:713 +#: ../src/xfdesktop-file-icon-manager.c:757 msgid "The selected files could not be trashed" msgstr "The selected files could not be rubbished" -#: ../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:864 -#: ../src/xfdesktop-file-utils.c:1005 ../src/xfdesktop-file-utils.c:1052 -#: ../src/xfdesktop-file-utils.c:1093 ../src/xfdesktop-file-utils.c:1134 -#: ../src/xfdesktop-file-utils.c:1236 ../src/xfdesktop-file-utils.c:1288 -#: ../src/xfdesktop-file-utils.c:1361 ../src/xfdesktop-file-utils.c:1439 +#: ../src/xfdesktop-file-icon-manager.c:714 +#: ../src/xfdesktop-file-icon-manager.c:758 ../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 "This feature requires a file manager service to be present (such as the one supplied by Thunar)." #. printf is to be translator-friendly -#: ../src/xfdesktop-file-icon-manager.c:821 -#: ../src/xfdesktop-file-icon-manager.c:1279 +#: ../src/xfdesktop-file-icon-manager.c:858 +#: ../src/xfdesktop-file-icon-manager.c:1320 #, c-format msgid "Unable to launch \"%s\":" msgstr "Unable to launch \"%s\":" -#: ../src/xfdesktop-file-icon-manager.c:1008 +#: ../src/xfdesktop-file-icon-manager.c:1049 #, c-format msgid "_Open With \"%s\"" msgstr "_Open With \"%s\"" -#: ../src/xfdesktop-file-icon-manager.c:1011 +#: ../src/xfdesktop-file-icon-manager.c:1052 #, c-format msgid "Open With \"%s\"" msgstr "Open With \"%s\"" -#: ../src/xfdesktop-file-icon-manager.c:1337 +#: ../src/xfdesktop-file-icon-manager.c:1378 msgid "_Open all" msgstr "_Open all" -#: ../src/xfdesktop-file-icon-manager.c:1353 +#: ../src/xfdesktop-file-icon-manager.c:1394 msgid "_Open in New Window" msgstr "_Open in New Window" -#: ../src/xfdesktop-file-icon-manager.c:1355 +#: ../src/xfdesktop-file-icon-manager.c:1396 #: ../src/xfdesktop-special-file-icon.c:547 ../src/xfdesktop-volume-icon.c:813 msgid "_Open" msgstr "_Open" #. create launcher item -#: ../src/xfdesktop-file-icon-manager.c:1374 +#: ../src/xfdesktop-file-icon-manager.c:1415 msgid "Create _Launcher..." msgstr "Create _Launcher..." #. create link item -#: ../src/xfdesktop-file-icon-manager.c:1390 +#: ../src/xfdesktop-file-icon-manager.c:1431 msgid "Create _URL Link..." msgstr "Create _URL Link..." #. create folder item -#: ../src/xfdesktop-file-icon-manager.c:1406 +#: ../src/xfdesktop-file-icon-manager.c:1447 msgid "Create _Folder..." msgstr "Create _Folder..." -#: ../src/xfdesktop-file-icon-manager.c:1421 +#: ../src/xfdesktop-file-icon-manager.c:1462 msgid "Create From _Template" msgstr "Create From _Template" -#: ../src/xfdesktop-file-icon-manager.c:1450 +#: ../src/xfdesktop-file-icon-manager.c:1491 msgid "_Empty File" msgstr "_Empty File" -#: ../src/xfdesktop-file-icon-manager.c:1467 +#: ../src/xfdesktop-file-icon-manager.c:1508 msgid "_Execute" msgstr "_Execute" -#: ../src/xfdesktop-file-icon-manager.c:1487 +#: ../src/xfdesktop-file-icon-manager.c:1528 msgid "_Edit Launcher" msgstr "_Edit Launcher" -#: ../src/xfdesktop-file-icon-manager.c:1522 +#: ../src/xfdesktop-file-icon-manager.c:1563 msgid "Open With" msgstr "Open With" -#: ../src/xfdesktop-file-icon-manager.c:1548 +#: ../src/xfdesktop-file-icon-manager.c:1589 msgid "Open With Other _Application..." msgstr "Open With Other _Application..." +#. Trash +#: ../src/xfdesktop-file-icon-manager.c:1676 +msgid "Mo_ve to Trash" +msgstr "Mo_ve to Rubbish" + #. Rename -#: ../src/xfdesktop-file-icon-manager.c:1651 +#: ../src/xfdesktop-file-icon-manager.c:1707 msgid "_Rename..." msgstr "_Rename..." -#: ../src/xfdesktop-file-icon-manager.c:1679 +#: ../src/xfdesktop-file-icon-manager.c:1735 msgid "Arrange Desktop _Icons" msgstr "Arrange Desktop _Icons" -#: ../src/xfdesktop-file-icon-manager.c:1690 +#: ../src/xfdesktop-file-icon-manager.c:1746 msgid "Desktop _Settings..." msgstr "Desktop _Settings..." -#: ../src/xfdesktop-file-icon-manager.c:1701 +#: ../src/xfdesktop-file-icon-manager.c:1757 #: ../src/xfdesktop-volume-icon.c:855 msgid "P_roperties..." msgstr "P_roperties..." -#: ../src/xfdesktop-file-icon-manager.c:2642 +#: ../src/xfdesktop-file-icon-manager.c:2699 msgid "Load Error" msgstr "Load Error" -#: ../src/xfdesktop-file-icon-manager.c:2644 +#: ../src/xfdesktop-file-icon-manager.c:2701 msgid "Failed to load the desktop folder" msgstr "Failed to load the desktop folder" -#: ../src/xfdesktop-file-icon-manager.c:3189 +#: ../src/xfdesktop-file-icon-manager.c:3242 msgid "Copy _Here" msgstr "Copy _Here" -#: ../src/xfdesktop-file-icon-manager.c:3189 +#: ../src/xfdesktop-file-icon-manager.c:3242 msgid "_Move Here" msgstr "_Move Here" -#: ../src/xfdesktop-file-icon-manager.c:3189 +#: ../src/xfdesktop-file-icon-manager.c:3242 msgid "_Link Here" msgstr "_Link Here" @@ -804,72 +822,72 @@ msgid "The file could not be renamed" msgstr "The file could not be renamed" -#: ../src/xfdesktop-file-utils.c:862 +#: ../src/xfdesktop-file-utils.c:826 msgid "Delete Error" msgstr "Delete Error" -#: ../src/xfdesktop-file-utils.c:863 +#: ../src/xfdesktop-file-utils.c:827 msgid "The selected files could not be deleted" msgstr "The selected files could not be deleted" -#: ../src/xfdesktop-file-utils.c:922 +#: ../src/xfdesktop-file-utils.c:877 msgid "The selected files could not be moved to the trash" msgstr "The selected files could not be moved to the rubbish bin" -#: ../src/xfdesktop-file-utils.c:923 ../src/xfdesktop-file-utils.c:961 +#: ../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 "This feature requires a rubbish service to be present (such as the one supplied by Thunar)." -#: ../src/xfdesktop-file-utils.c:960 +#: ../src/xfdesktop-file-utils.c:914 msgid "Could not empty the trash" msgstr "Could not empty the rubbish" -#: ../src/xfdesktop-file-utils.c:1003 +#: ../src/xfdesktop-file-utils.c:957 msgid "Create File Error" msgstr "Create File Error" -#: ../src/xfdesktop-file-utils.c:1004 +#: ../src/xfdesktop-file-utils.c:958 msgid "Could not create a new file" msgstr "Could not create a new file" -#: ../src/xfdesktop-file-utils.c:1050 +#: ../src/xfdesktop-file-utils.c:1004 msgid "Create Document Error" msgstr "Create Document Error" -#: ../src/xfdesktop-file-utils.c:1051 +#: ../src/xfdesktop-file-utils.c:1005 msgid "Could not create a new document from the template" msgstr "Could not create a new document from the template" -#: ../src/xfdesktop-file-utils.c:1091 +#: ../src/xfdesktop-file-utils.c:1045 msgid "File Properties Error" msgstr "File Properties Error" -#: ../src/xfdesktop-file-utils.c:1092 +#: ../src/xfdesktop-file-utils.c:1046 msgid "The file properties dialog could not be opened" msgstr "The file properties dialogue could not be opened" -#: ../src/xfdesktop-file-utils.c:1133 +#: ../src/xfdesktop-file-utils.c:1087 msgid "The file could not be opened" msgstr "The file could not be opened" -#: ../src/xfdesktop-file-utils.c:1206 ../src/xfdesktop-file-utils.c:1231 +#: ../src/xfdesktop-file-utils.c:1160 ../src/xfdesktop-file-utils.c:1185 #, c-format msgid "Failed to run \"%s\"" msgstr "Failed to run \"%s\"" -#: ../src/xfdesktop-file-utils.c:1287 +#: ../src/xfdesktop-file-utils.c:1241 msgid "The application chooser could not be opened" msgstr "The application chooser could not be opened" -#: ../src/xfdesktop-file-utils.c:1345 ../src/xfdesktop-file-utils.c:1359 -#: ../src/xfdesktop-file-utils.c:1421 ../src/xfdesktop-file-utils.c:1437 +#: ../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 "Transfer Error" -#: ../src/xfdesktop-file-utils.c:1346 ../src/xfdesktop-file-utils.c:1360 -#: ../src/xfdesktop-file-utils.c:1422 ../src/xfdesktop-file-utils.c:1438 +#: ../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 "The file transfer could not be performed" @@ -923,7 +941,7 @@ msgid "Eject Finished" msgstr "Eject Finished" -#: ../src/xfdesktop-regular-file-icon.c:741 +#: ../src/xfdesktop-regular-file-icon.c:748 #, c-format msgid "" "Type: %s\n" diff -Nru xfdesktop4-4.11.6/po/es.po xfdesktop4-4.19.2/po/es.po --- xfdesktop4-4.11.6/po/es.po 2014-04-05 18:59:11.000000000 +0000 +++ xfdesktop4-4.19.2/po/es.po 2014-08-11 07:27:27.000000000 +0000 @@ -3,16 +3,17 @@ # This file is distributed under the same license as the PACKAGE package. # # Translators: -# MC , 2013 -# Pablo Lezaeta , 2013-2014 +# gabrieltandil , 2014 +# mc , 2013 +# Pablo Roberto Francisco Lezaeta Reyes , 2013-2014 msgid "" msgstr "" "Project-Id-Version: Xfdesktop\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2014-04-03 18:32+0200\n" -"PO-Revision-Date: 2014-04-04 03:45+0000\n" -"Last-Translator: Pablo Lezaeta \n" -"Language-Team: Spanish (http://www.transifex.com/projects/p/xfce/language/es/)\n" +"POT-Creation-Date: 2014-08-03 12:32+0200\n" +"PO-Revision-Date: 2014-08-05 19:42+0000\n" +"Last-Translator: Pablo Roberto Francisco Lezaeta Reyes \n" +"Language-Team: Spanish (http://www.transifex.com/projects/p/xfdesktop/language/es/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" @@ -85,7 +86,7 @@ msgid "" "Move this dialog to the display and workspace you want to edit the settings " "for." -msgstr "Mueva este diálogo a la pantalla que desea modificar su configuración." +msgstr "Mueva este diálogo a la pantalla y área de trabajo que desea modificar su configuración." #. Single monitor and single workspace #: ../settings/main.c:749 @@ -107,45 +108,45 @@ msgid "Image selection is unavailable while the image style is set to None." msgstr "La selección de imágenes estará desactivada mientras el estilo utilizado sea None (Ninguno)." -#: ../settings/main.c:1523 +#: ../settings/main.c:1524 msgid "Spanning screens" -msgstr "Extención de pantallas" +msgstr "Extensión de pantallas" -#: ../settings/main.c:1825 +#: ../settings/main.c:1831 msgid "Image files" msgstr "Archivos de imagen" -#: ../settings/main.c:2001 +#: ../settings/main.c:2010 msgid "Settings manager socket" msgstr "Entrada de administración de configuración" -#: ../settings/main.c:2001 +#: ../settings/main.c:2010 msgid "SOCKET ID" msgstr "ID de SOCKET" -#: ../settings/main.c:2002 +#: ../settings/main.c:2011 msgid "Version information" msgstr "Información de versión" -#: ../settings/main.c:2030 +#: ../settings/main.c:2039 #, c-format msgid "Type '%s --help' for usage." msgstr "Escriba '%s --help' para opciones de uso." -#: ../settings/main.c:2042 +#: ../settings/main.c:2051 msgid "The Xfce development team. All rights reserved." msgstr "El equipo de desarrollo de Xfce. Todos los derechos reservados." -#: ../settings/main.c:2043 +#: ../settings/main.c:2052 #, c-format msgid "Please report bugs to <%s>." msgstr "Por favor, informe de errores a <%s>." -#: ../settings/main.c:2050 +#: ../settings/main.c:2059 msgid "Desktop Settings" msgstr "Configuración del escritorio" -#: ../settings/main.c:2052 +#: ../settings/main.c:2061 msgid "Unable to contact settings server" msgstr "No se puede contactar con el servidor de configuración" @@ -154,8 +155,9 @@ msgstr "Escritorio" #: ../settings/xfce-backdrop-settings.desktop.in.h:2 -msgid "Set desktop background and menu and icon behaviour" -msgstr "Configurar el fondo de pantalla, menús y comportamiento de los íconos" +#: ../settings/xfdesktop-settings-ui.glade.h:11 +msgid "Set desktop background and menu and icon behavior" +msgstr "Configure el fondo de escritorio y el comportamiento de menús e iconos" #: ../settings/xfdesktop-settings-appearance-frame-ui.glade.h:1 msgid "Solid color" @@ -216,7 +218,7 @@ #: ../settings/xfdesktop-settings-appearance-frame-ui.glade.h:15 msgid "Spanning Screens" -msgstr "Extención de pantallas" +msgstr "Extensión de pantallas" #: ../settings/xfdesktop-settings-appearance-frame-ui.glade.h:16 msgid "C_olor:" @@ -244,7 +246,7 @@ #: ../settings/xfdesktop-settings-appearance-frame-ui.glade.h:22 msgid "Apply to all _workspaces" -msgstr "Aplicar a todos los espacios de _trabajo" +msgstr "Aplicar a todas las áreas de _trabajo" #: ../settings/xfdesktop-settings-appearance-frame-ui.glade.h:23 msgid "Change the _background " @@ -333,14 +335,10 @@ msgid "File/launcher icons" msgstr "Iconos de archivo/lanzador" -#: ../settings/xfdesktop-settings-ui.glade.h:10 ../src/xfce-desktop.c:1020 +#: ../settings/xfdesktop-settings-ui.glade.h:10 ../src/xfce-desktop.c:1007 msgid "Desktop" msgstr "Escritorio" -#: ../settings/xfdesktop-settings-ui.glade.h:11 -msgid "Set desktop background and menu and icon behavior" -msgstr "Configure el fondo de escritorio y el comportamiento de menús e iconos" - #: ../settings/xfdesktop-settings-ui.glade.h:12 msgid "_Background" msgstr "_Fondo" @@ -432,26 +430,30 @@ msgstr "Un solo _clic para activar los elementos" #: ../settings/xfdesktop-settings-ui.glade.h:34 +msgid "Show hidden files on the desktop" +msgstr "Mostrar archivos ocultos en el escritorio" + +#: ../settings/xfdesktop-settings-ui.glade.h:35 msgid "Show icon tooltips. Size:" msgstr "Mostrar iconos en las descripciones emergentes. Tamaño:" -#: ../settings/xfdesktop-settings-ui.glade.h:35 +#: ../settings/xfdesktop-settings-ui.glade.h:36 msgid "Size of the tooltip preview image." msgstr "Tamaño de las previsualizaciones emergentes de las imágenes." -#: ../settings/xfdesktop-settings-ui.glade.h:36 +#: ../settings/xfdesktop-settings-ui.glade.h:37 msgid "Use custom _font size:" msgstr "Usar tamaño de _letra personalizado:" -#: ../settings/xfdesktop-settings-ui.glade.h:37 +#: ../settings/xfdesktop-settings-ui.glade.h:38 msgid "Appearance" msgstr "Apariencia" -#: ../settings/xfdesktop-settings-ui.glade.h:38 +#: ../settings/xfdesktop-settings-ui.glade.h:39 msgid "Default Icons" msgstr "Iconos predeterminados" -#: ../settings/xfdesktop-settings-ui.glade.h:39 +#: ../settings/xfdesktop-settings-ui.glade.h:40 msgid "_Icons" msgstr "_Iconos" @@ -462,7 +464,7 @@ #: ../src/windowlist.c:73 #, c-format msgid "Remove Workspace %d" -msgstr "Eliminar Area de Trabajo %d" +msgstr "Eliminar área de trabajo %d" #: ../src/windowlist.c:74 #, c-format @@ -474,7 +476,7 @@ #: ../src/windowlist.c:78 #, c-format msgid "Remove Workspace '%s'" -msgstr "Eliminar Area de Trabajo '%s'" +msgstr "Eliminar área de trabajo '%s'" #: ../src/windowlist.c:79 #, c-format @@ -513,250 +515,267 @@ msgstr "Elimina_r área de trabajo '%s'" #: ../src/xfdesktop-app-menu-item.c:349 -#: ../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:1132 ../src/xfdesktop-file-utils.c:1209 -#: ../src/xfdesktop-file-utils.c:1234 ../src/xfdesktop-file-utils.c:1286 +#: ../src/xfdesktop-file-icon-manager.c:860 +#: ../src/xfdesktop-file-icon-manager.c:1125 +#: ../src/xfdesktop-file-icon-manager.c:1321 ../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 "Error de inicio" #: ../src/xfdesktop-app-menu-item.c:351 -#: ../src/xfdesktop-file-icon-manager.c:1086 +#: ../src/xfdesktop-file-icon-manager.c:1127 msgid "" "Unable to launch \"exo-desktop-item-edit\", which is required to create and " "edit launchers and links on the desktop." msgstr "No se pudo iniciar \"exo-desktop-item-edit\", el cual se necesita para crear y editar lanzadores y enlaces en el escritorio." -#: ../src/xfdesktop-application.c:768 +#: ../src/xfdesktop-application.c:836 msgid "Display version information" msgstr "Mostrar información de versión" -#: ../src/xfdesktop-application.c:769 +#: ../src/xfdesktop-application.c:837 msgid "Reload all settings" msgstr "Recargar todas las configuraciones" -#: ../src/xfdesktop-application.c:770 +#: ../src/xfdesktop-application.c:838 +msgid "Advance to the next wallpaper on the current workspace" +msgstr "Avanzar al siguiente fondo de pantalla en la actual área de trabajo" + +#: ../src/xfdesktop-application.c:839 msgid "Pop up the menu (at the current mouse position)" msgstr "Mostrar el menú (en la posición actual del ratón)" -#: ../src/xfdesktop-application.c:771 +#: ../src/xfdesktop-application.c:840 msgid "Pop up the window list (at the current mouse position)" msgstr "Mostrar la lista de ventanas (en la posición actual del ratón)" -#: ../src/xfdesktop-application.c:773 +#: ../src/xfdesktop-application.c:842 msgid "Automatically arrange all the icons on the desktop" msgstr "Organizar automáticamente los iconos del escritorio" -#: ../src/xfdesktop-application.c:775 +#: ../src/xfdesktop-application.c:844 +msgid "Enable debug messages" +msgstr "Activar mensajes de depuración" + +#: ../src/xfdesktop-application.c:845 +msgid "Disable debug messages" +msgstr "Desactivar mensajes de depuración" + +#: ../src/xfdesktop-application.c:846 msgid "Do not wait for a window manager on startup" msgstr "No esperar a un gestor de ventanas al iniciar" -#: ../src/xfdesktop-application.c:776 +#: ../src/xfdesktop-application.c:847 msgid "Cause xfdesktop to quit" msgstr "Hace que xfdesktop termine" -#: ../src/xfdesktop-application.c:791 +#: ../src/xfdesktop-application.c:862 #, c-format msgid "Failed to parse arguments: %s\n" msgstr "Fallo al procesar argumentos: %s\n" -#: ../src/xfdesktop-application.c:802 +#: ../src/xfdesktop-application.c:873 #, c-format msgid "This is %s version %s, running on Xfce %s.\n" msgstr "Esto es %s version %s, ejecutándose en Xfce %s.\n" -#: ../src/xfdesktop-application.c:804 +#: ../src/xfdesktop-application.c:875 #, c-format msgid "Built with GTK+ %d.%d.%d, linked with GTK+ %d.%d.%d." msgstr "Compilado con GTK+ %d.%d.%d, Enlazado con GTK+ %d.%d.%d." -#: ../src/xfdesktop-application.c:808 +#: ../src/xfdesktop-application.c:879 #, c-format msgid "Build options:\n" msgstr "Opciones de compilación:\n" -#: ../src/xfdesktop-application.c:809 +#: ../src/xfdesktop-application.c:880 #, c-format msgid " Desktop Menu: %s\n" msgstr "Menú del escritorio: %s\n" -#: ../src/xfdesktop-application.c:811 ../src/xfdesktop-application.c:818 -#: ../src/xfdesktop-application.c:825 +#: ../src/xfdesktop-application.c:882 ../src/xfdesktop-application.c:889 +#: ../src/xfdesktop-application.c:896 msgid "enabled" msgstr "activado" -#: ../src/xfdesktop-application.c:813 ../src/xfdesktop-application.c:820 -#: ../src/xfdesktop-application.c:827 +#: ../src/xfdesktop-application.c:884 ../src/xfdesktop-application.c:891 +#: ../src/xfdesktop-application.c:898 msgid "disabled" msgstr "desactivado" -#: ../src/xfdesktop-application.c:816 +#: ../src/xfdesktop-application.c:887 #, c-format msgid " Desktop Icons: %s\n" msgstr "Iconos de escritorio: %s\n" -#: ../src/xfdesktop-application.c:823 +#: ../src/xfdesktop-application.c:894 #, c-format msgid " Desktop File Icons: %s\n" msgstr "Iconos de archivos del escritorio: %s\n" -#: ../src/xfdesktop-file-icon-manager.c:522 -#: ../src/xfdesktop-file-icon-manager.c:539 +#: ../src/xfdesktop-file-icon-manager.c:559 +#: ../src/xfdesktop-file-icon-manager.c:576 #, c-format msgid "Could not create the desktop folder \"%s\"" msgstr "No se pudo crear la carpeta de escritorio \"%s\"" -#: ../src/xfdesktop-file-icon-manager.c:527 -#: ../src/xfdesktop-file-icon-manager.c:544 +#: ../src/xfdesktop-file-icon-manager.c:564 +#: ../src/xfdesktop-file-icon-manager.c:581 msgid "Desktop Folder Error" msgstr "Error de escritorio" -#: ../src/xfdesktop-file-icon-manager.c:546 +#: ../src/xfdesktop-file-icon-manager.c:583 msgid "" "A normal file with the same name already exists. Please delete or rename it." msgstr "Ya existe un archivo con el mismo nombre. Por favor bórrelo o renómbrelo." -#: ../src/xfdesktop-file-icon-manager.c:629 ../src/xfdesktop-file-utils.c:723 +#: ../src/xfdesktop-file-icon-manager.c:666 ../src/xfdesktop-file-utils.c:723 #: ../src/xfdesktop-file-utils.c:776 msgid "Rename Error" msgstr "Error al renombrar" -#: ../src/xfdesktop-file-icon-manager.c:630 ../src/xfdesktop-file-utils.c:777 +#: ../src/xfdesktop-file-icon-manager.c:667 ../src/xfdesktop-file-utils.c:777 msgid "The files could not be renamed" msgstr "El archivo no puede ser renombrado" -#: ../src/xfdesktop-file-icon-manager.c:631 +#: ../src/xfdesktop-file-icon-manager.c:668 msgid "None of the icons selected support being renamed." msgstr "Ninguno de los iconos seleccionados soporta ser renombrado." -#: ../src/xfdesktop-file-icon-manager.c:675 -#: ../src/xfdesktop-file-icon-manager.c:719 ../src/xfdesktop-file-utils.c:921 -#: ../src/xfdesktop-file-utils.c:959 +#: ../src/xfdesktop-file-icon-manager.c:712 +#: ../src/xfdesktop-file-icon-manager.c:756 ../src/xfdesktop-file-utils.c:876 +#: ../src/xfdesktop-file-utils.c:913 msgid "Trash Error" msgstr "Error de papelera" -#: ../src/xfdesktop-file-icon-manager.c:676 -#: ../src/xfdesktop-file-icon-manager.c:720 +#: ../src/xfdesktop-file-icon-manager.c:713 +#: ../src/xfdesktop-file-icon-manager.c:757 msgid "The selected files could not be trashed" msgstr "Los archivos seleccionados no pudieron ser eliminados" -#: ../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:864 -#: ../src/xfdesktop-file-utils.c:1005 ../src/xfdesktop-file-utils.c:1052 -#: ../src/xfdesktop-file-utils.c:1093 ../src/xfdesktop-file-utils.c:1134 -#: ../src/xfdesktop-file-utils.c:1236 ../src/xfdesktop-file-utils.c:1288 -#: ../src/xfdesktop-file-utils.c:1361 ../src/xfdesktop-file-utils.c:1439 +#: ../src/xfdesktop-file-icon-manager.c:714 +#: ../src/xfdesktop-file-icon-manager.c:758 ../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 "Esta funcionalidad necesita la presencia de un servicio de administrador de archivos (como el proporcionado por Thunar)." #. printf is to be translator-friendly -#: ../src/xfdesktop-file-icon-manager.c:821 -#: ../src/xfdesktop-file-icon-manager.c:1279 +#: ../src/xfdesktop-file-icon-manager.c:858 +#: ../src/xfdesktop-file-icon-manager.c:1320 #, c-format msgid "Unable to launch \"%s\":" msgstr "No se pudo iniciar \"%s\"" -#: ../src/xfdesktop-file-icon-manager.c:1008 +#: ../src/xfdesktop-file-icon-manager.c:1049 #, c-format msgid "_Open With \"%s\"" msgstr "_Abrir con \"%s\"" -#: ../src/xfdesktop-file-icon-manager.c:1011 +#: ../src/xfdesktop-file-icon-manager.c:1052 #, c-format msgid "Open With \"%s\"" msgstr "Abrir con \"%s\"" -#: ../src/xfdesktop-file-icon-manager.c:1337 +#: ../src/xfdesktop-file-icon-manager.c:1378 msgid "_Open all" msgstr "_Abrir todo" -#: ../src/xfdesktop-file-icon-manager.c:1353 +#: ../src/xfdesktop-file-icon-manager.c:1394 msgid "_Open in New Window" msgstr "_Abrir en una nueva ventana" -#: ../src/xfdesktop-file-icon-manager.c:1355 +#: ../src/xfdesktop-file-icon-manager.c:1396 #: ../src/xfdesktop-special-file-icon.c:547 ../src/xfdesktop-volume-icon.c:813 msgid "_Open" msgstr "_Abrir" #. create launcher item -#: ../src/xfdesktop-file-icon-manager.c:1374 +#: ../src/xfdesktop-file-icon-manager.c:1415 msgid "Create _Launcher..." msgstr "Crear _lanzador..." #. create link item -#: ../src/xfdesktop-file-icon-manager.c:1390 +#: ../src/xfdesktop-file-icon-manager.c:1431 msgid "Create _URL Link..." msgstr "Crear enlace _URL..." #. create folder item -#: ../src/xfdesktop-file-icon-manager.c:1406 +#: ../src/xfdesktop-file-icon-manager.c:1447 msgid "Create _Folder..." msgstr "Crear _carpeta..." -#: ../src/xfdesktop-file-icon-manager.c:1421 +#: ../src/xfdesktop-file-icon-manager.c:1462 msgid "Create From _Template" msgstr "Crear a partir de _plantilla" -#: ../src/xfdesktop-file-icon-manager.c:1450 +#: ../src/xfdesktop-file-icon-manager.c:1491 msgid "_Empty File" msgstr "Archivo _vacío" -#: ../src/xfdesktop-file-icon-manager.c:1467 +#: ../src/xfdesktop-file-icon-manager.c:1508 msgid "_Execute" msgstr "_Ejecutar" -#: ../src/xfdesktop-file-icon-manager.c:1487 +#: ../src/xfdesktop-file-icon-manager.c:1528 msgid "_Edit Launcher" msgstr "_Editar lanzador" -#: ../src/xfdesktop-file-icon-manager.c:1522 +#: ../src/xfdesktop-file-icon-manager.c:1563 msgid "Open With" msgstr "Abrir con" -#: ../src/xfdesktop-file-icon-manager.c:1548 +#: ../src/xfdesktop-file-icon-manager.c:1589 msgid "Open With Other _Application..." msgstr "Abrir con _otra aplicación..." +#. Trash +#: ../src/xfdesktop-file-icon-manager.c:1676 +msgid "Mo_ve to Trash" +msgstr "Mo_ver a la papelera" + #. Rename -#: ../src/xfdesktop-file-icon-manager.c:1651 +#: ../src/xfdesktop-file-icon-manager.c:1707 msgid "_Rename..." msgstr "_Renombrar..." -#: ../src/xfdesktop-file-icon-manager.c:1679 +#: ../src/xfdesktop-file-icon-manager.c:1735 msgid "Arrange Desktop _Icons" msgstr "_Organizar Iconos del Escritorio" -#: ../src/xfdesktop-file-icon-manager.c:1690 +#: ../src/xfdesktop-file-icon-manager.c:1746 msgid "Desktop _Settings..." msgstr "_Configuración de escritorio..." -#: ../src/xfdesktop-file-icon-manager.c:1701 +#: ../src/xfdesktop-file-icon-manager.c:1757 #: ../src/xfdesktop-volume-icon.c:855 msgid "P_roperties..." msgstr "P_ropiedades" -#: ../src/xfdesktop-file-icon-manager.c:2642 +#: ../src/xfdesktop-file-icon-manager.c:2699 msgid "Load Error" msgstr "Error al cargar" -#: ../src/xfdesktop-file-icon-manager.c:2644 +#: ../src/xfdesktop-file-icon-manager.c:2701 msgid "Failed to load the desktop folder" msgstr "Error al cargar la carpeta de escritorio" -#: ../src/xfdesktop-file-icon-manager.c:3189 +#: ../src/xfdesktop-file-icon-manager.c:3242 msgid "Copy _Here" msgstr "Copiar _aquí" -#: ../src/xfdesktop-file-icon-manager.c:3189 +#: ../src/xfdesktop-file-icon-manager.c:3242 msgid "_Move Here" msgstr "_Mover aquí" -#: ../src/xfdesktop-file-icon-manager.c:3189 +#: ../src/xfdesktop-file-icon-manager.c:3242 msgid "_Link Here" msgstr "_Enlazar Acá" @@ -805,72 +824,72 @@ msgid "The file could not be renamed" msgstr "El archivo no puede ser renombrado" -#: ../src/xfdesktop-file-utils.c:862 +#: ../src/xfdesktop-file-utils.c:826 msgid "Delete Error" msgstr "Error al borrar" -#: ../src/xfdesktop-file-utils.c:863 +#: ../src/xfdesktop-file-utils.c:827 msgid "The selected files could not be deleted" msgstr "Los archivos seleccionados no pueden ser borrados" -#: ../src/xfdesktop-file-utils.c:922 +#: ../src/xfdesktop-file-utils.c:877 msgid "The selected files could not be moved to the trash" msgstr "Los archivos seleccionados no pueden ser movidos a la papelera" -#: ../src/xfdesktop-file-utils.c:923 ../src/xfdesktop-file-utils.c:961 +#: ../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 "Esta funcionalidad necesita la presencia de un servicio de papelera de archivos (como el proporcionado por Thunar)." -#: ../src/xfdesktop-file-utils.c:960 +#: ../src/xfdesktop-file-utils.c:914 msgid "Could not empty the trash" msgstr "No se pudo vaciar la papelera" -#: ../src/xfdesktop-file-utils.c:1003 +#: ../src/xfdesktop-file-utils.c:957 msgid "Create File Error" msgstr "Error al crear archivo" -#: ../src/xfdesktop-file-utils.c:1004 +#: ../src/xfdesktop-file-utils.c:958 msgid "Could not create a new file" msgstr "No se pudo crear nuevo archivo" -#: ../src/xfdesktop-file-utils.c:1050 +#: ../src/xfdesktop-file-utils.c:1004 msgid "Create Document Error" msgstr "Error al crear documento" -#: ../src/xfdesktop-file-utils.c:1051 +#: ../src/xfdesktop-file-utils.c:1005 msgid "Could not create a new document from the template" msgstr "No se pudo crear nuevo documento a partir de la plantilla" -#: ../src/xfdesktop-file-utils.c:1091 +#: ../src/xfdesktop-file-utils.c:1045 msgid "File Properties Error" msgstr "Error al abrir propiedades de archivo" -#: ../src/xfdesktop-file-utils.c:1092 +#: ../src/xfdesktop-file-utils.c:1046 msgid "The file properties dialog could not be opened" msgstr "La ventana de propiedades del archivo no pudo ser abierta" -#: ../src/xfdesktop-file-utils.c:1133 +#: ../src/xfdesktop-file-utils.c:1087 msgid "The file could not be opened" msgstr "El archivo no puede ser abierto" -#: ../src/xfdesktop-file-utils.c:1206 ../src/xfdesktop-file-utils.c:1231 +#: ../src/xfdesktop-file-utils.c:1160 ../src/xfdesktop-file-utils.c:1185 #, c-format msgid "Failed to run \"%s\"" msgstr "Fallo al ejecutar \"%s\"" -#: ../src/xfdesktop-file-utils.c:1287 +#: ../src/xfdesktop-file-utils.c:1241 msgid "The application chooser could not be opened" msgstr "El selector de aplicaciones no pudo abrirse" -#: ../src/xfdesktop-file-utils.c:1345 ../src/xfdesktop-file-utils.c:1359 -#: ../src/xfdesktop-file-utils.c:1421 ../src/xfdesktop-file-utils.c:1437 +#: ../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 "Error de trasferencia" -#: ../src/xfdesktop-file-utils.c:1346 ../src/xfdesktop-file-utils.c:1360 -#: ../src/xfdesktop-file-utils.c:1422 ../src/xfdesktop-file-utils.c:1438 +#: ../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 "La trasferencia de archivos no se pudo realizar" @@ -924,7 +943,7 @@ msgid "Eject Finished" msgstr "Expulsión finalizada" -#: ../src/xfdesktop-regular-file-icon.c:741 +#: ../src/xfdesktop-regular-file-icon.c:748 #, c-format msgid "" "Type: %s\n" diff -Nru xfdesktop4-4.11.6/po/fr.po xfdesktop4-4.19.2/po/fr.po --- xfdesktop4-4.11.6/po/fr.po 2014-03-02 07:21:58.000000000 +0000 +++ xfdesktop4-4.19.2/po/fr.po 2014-08-03 06:01:08.000000000 +0000 @@ -3,57 +3,58 @@ # This file is distributed under the same license as the PACKAGE package. # # Translators: -# filorin , 2014 +# Guillaume Bernard , 2014 # jc1 , 2013-2014 # Jean-Francois Wauthy , 2004 # Jérôme Guelfucci , 2009 # Mike Massonnet , 2008 # Olivier Fourdan , 2003 +# Yannick Le Guen , 2014 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 15:11+0000\n" -"Last-Translator: filorin \n" -"Language-Team: French (http://www.transifex.com/projects/p/xfce/language/fr/)\n" +"POT-Creation-Date: 2014-07-28 12:31+0200\n" +"PO-Revision-Date: 2014-08-01 18:23+0000\n" +"Last-Translator: Yannick Le Guen \n" +"Language-Team: French (http://www.transifex.com/projects/p/xfdesktop/language/fr/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Language: fr\n" "Plural-Forms: nplurals=2; plural=(n > 1);\n" -#: ../settings/main.c:375 ../src/xfdesktop-special-file-icon.c:295 +#: ../settings/main.c:404 ../src/xfdesktop-special-file-icon.c:295 #: ../src/xfdesktop-special-file-icon.c:479 msgid "Home" msgstr "Répertoire personnel" -#: ../settings/main.c:377 +#: ../settings/main.c:406 msgid "Filesystem" msgstr "Système de fichiers" -#: ../settings/main.c:379 +#: ../settings/main.c:408 msgid "Trash" msgstr "Corbeille" -#: ../settings/main.c:381 +#: ../settings/main.c:410 msgid "Removable Devices" msgstr "Périphériques amovibles" -#: ../settings/main.c:383 +#: ../settings/main.c:412 msgid "Network Shares" msgstr "Partages réseau" -#: ../settings/main.c:385 +#: ../settings/main.c:414 msgid "Disks and Drives" msgstr "Disques durs et lecteurs" -#: ../settings/main.c:387 +#: ../settings/main.c:416 msgid "Other Devices" msgstr "Autres périphériques" #. Display the file name, file type, and file size in the tooltip. -#: ../settings/main.c:500 +#: ../settings/main.c:529 #, c-format msgid "" "%s\n" @@ -61,95 +62,95 @@ "Size: %s" msgstr "%s\nType : %s\nTaille : %s" -#: ../settings/main.c:686 +#: ../settings/main.c:715 #, c-format msgid "Wallpaper for Monitor %d (%s)" msgstr "Fond d'écran pour le moniteur %d (% s)" -#: ../settings/main.c:689 +#: ../settings/main.c:718 #, c-format msgid "Wallpaper for Monitor %d" msgstr "Fond d'écran pour le moniteur %d " -#: ../settings/main.c:695 +#: ../settings/main.c:724 msgid "Move this dialog to the display you want to edit the settings for." -msgstr "Déplacer cette boite de dialogue vers l'écran que vous souhaitez modifier les paramètres." +msgstr "Déplacer cette fenêtre vers l'écran dont vous souhaitez modifier les paramètres." -#: ../settings/main.c:702 +#: ../settings/main.c:731 #, c-format msgid "Wallpaper for %s on Monitor %d (%s)" msgstr "Fond d'écran pour %s sur le moniteur %d (%s)" -#: ../settings/main.c:706 +#: ../settings/main.c:735 #, c-format msgid "Wallpaper for %s on Monitor %d" msgstr "Fond d'écran pour %s sur le moniteur %d" -#: ../settings/main.c:713 +#: ../settings/main.c:742 msgid "" "Move this dialog to the display and workspace you want to edit the settings " "for." -msgstr "Déplacer cette boite de dialogue vers l'écran et l'espace de travail que vous souhaitez modifier les paramètres." +msgstr "Déplacer cette fenêtre vers l'écran et l'espace de travail dont vous souhaitez modifier les paramètres." #. Single monitor and single workspace -#: ../settings/main.c:720 +#: ../settings/main.c:749 #, c-format msgid "Wallpaper for my desktop" msgstr "Fond d'écran pour mon bureau" #. Single monitor and per workspace wallpaper -#: ../settings/main.c:726 +#: ../settings/main.c:755 #, c-format msgid "Wallpaper for %s" msgstr "Fond d'écran pour %s" -#: ../settings/main.c:731 +#: ../settings/main.c:760 msgid "Move this dialog to the workspace you want to edit the settings for." -msgstr "Déplacer cette boite de dialogue vers l'espace de travail où vous souhaitez modifier les paramètres." +msgstr "Déplacer cette fenêtre vers l'espace de travail dont vous souhaitez modifier les paramètres." -#: ../settings/main.c:1134 +#: ../settings/main.c:1174 msgid "Image selection is unavailable while the image style is set to None." -msgstr "La sélection d'image est indisponible tant que le style d'image est réglé sur Aucune." +msgstr "La sélection d'image est indisponible tant que le style d'image est réglé sur Aucun." -#: ../settings/main.c:1481 +#: ../settings/main.c:1524 msgid "Spanning screens" msgstr "Écrans couvrant" -#: ../settings/main.c:1786 +#: ../settings/main.c:1826 msgid "Image files" msgstr "Fichiers images" -#: ../settings/main.c:1958 +#: ../settings/main.c:2002 msgid "Settings manager socket" msgstr "Paramètres du gestionnaire de socket" -#: ../settings/main.c:1958 +#: ../settings/main.c:2002 msgid "SOCKET ID" msgstr "ID SOCKET" -#: ../settings/main.c:1959 +#: ../settings/main.c:2003 msgid "Version information" msgstr "Informations sur la version" -#: ../settings/main.c:1986 +#: ../settings/main.c:2031 #, c-format msgid "Type '%s --help' for usage." -msgstr "Saisissez '%s --help' pour afficher les options." +msgstr "Taper « %s --help » pour plus d'aide." -#: ../settings/main.c:1998 +#: ../settings/main.c:2043 msgid "The Xfce development team. All rights reserved." msgstr "L'équipe de développement de Xfce. Tous droits réservés." -#: ../settings/main.c:1999 +#: ../settings/main.c:2044 #, c-format msgid "Please report bugs to <%s>." -msgstr "S'il vous plait rapporter les bogues à <%s>." +msgstr "Veuillez signaler les bogues à <%s>." -#: ../settings/main.c:2006 +#: ../settings/main.c:2051 msgid "Desktop Settings" msgstr "Paramètres du bureau" -#: ../settings/main.c:2008 +#: ../settings/main.c:2053 msgid "Unable to contact settings server" msgstr "Impossible de contacter le serveur de paramètres" @@ -158,8 +159,9 @@ msgstr "Bureau " #: ../settings/xfce-backdrop-settings.desktop.in.h:2 -msgid "Set desktop background and menu and icon behaviour" -msgstr "Régler le fond d'écran, le menu et le comportement des icônes" +#: ../settings/xfdesktop-settings-ui.glade.h:11 +msgid "Set desktop background and menu and icon behavior" +msgstr "Régler le fond d'écran du bureau, le menu et le comportement des icônes" #: ../settings/xfdesktop-settings-appearance-frame-ui.glade.h:1 msgid "Solid color" @@ -179,11 +181,11 @@ #: ../settings/xfdesktop-settings-appearance-frame-ui.glade.h:5 msgid "_Folder:" -msgstr "Dossier :" +msgstr "_Dossier :" #: ../settings/xfdesktop-settings-appearance-frame-ui.glade.h:6 msgid "Choose the folder to select wallpapers from." -msgstr "Choisissez le dossier à partir duquel sélectionner les fonds d'écran" +msgstr "Choisir le dossier à partir duquel sélectionner les fonds d'écran." #: ../settings/xfdesktop-settings-appearance-frame-ui.glade.h:7 msgid "St_yle:" @@ -196,7 +198,7 @@ #: ../settings/xfdesktop-settings-appearance-frame-ui.glade.h:9 #: ../settings/xfdesktop-settings-ui.glade.h:4 msgid "None" -msgstr "Aucune" +msgstr "Aucun" #: ../settings/xfdesktop-settings-appearance-frame-ui.glade.h:10 msgid "Centered" @@ -204,15 +206,15 @@ #: ../settings/xfdesktop-settings-appearance-frame-ui.glade.h:11 msgid "Tiled" -msgstr "Juxtaposé" +msgstr "Mosaïque" #: ../settings/xfdesktop-settings-appearance-frame-ui.glade.h:12 msgid "Stretched" -msgstr "Étiré" +msgstr "Étendu" #: ../settings/xfdesktop-settings-appearance-frame-ui.glade.h:13 msgid "Scaled" -msgstr "Étendu" +msgstr "Mis à l'échelle" #: ../settings/xfdesktop-settings-appearance-frame-ui.glade.h:14 msgid "Zoomed" @@ -232,7 +234,7 @@ #: ../settings/xfdesktop-settings-appearance-frame-ui.glade.h:18 msgid "Specifies the solid color, or the \"left\" or \"top\" color of the gradient." -msgstr "Spécifie la couleur de « gauche » ou du « haut » du dégradé." +msgstr "Spécifie la couleur unie, ou la couleur à « gauche » ou en « haut » du dégradé." #: ../settings/xfdesktop-settings-appearance-frame-ui.glade.h:19 msgid "Select First Color" @@ -240,7 +242,7 @@ #: ../settings/xfdesktop-settings-appearance-frame-ui.glade.h:20 msgid "Specifies the \"right\" or \"bottom\" color of the gradient." -msgstr "Spécifie la couleur de « droite » ou du « bas » du dégradé." +msgstr "Spécifie la couleur à « droite » ou en « bas » du dégradé." #: ../settings/xfdesktop-settings-appearance-frame-ui.glade.h:21 msgid "Select Second Color" @@ -248,11 +250,11 @@ #: ../settings/xfdesktop-settings-appearance-frame-ui.glade.h:22 msgid "Apply to all _workspaces" -msgstr "Appliquer à tous les espaces de travail" +msgstr "Appliquer à tous les espaces de _travail" #: ../settings/xfdesktop-settings-appearance-frame-ui.glade.h:23 msgid "Change the _background " -msgstr "Changer le fond d'écran" +msgstr "Changer le _fond d'écran" #: ../settings/xfdesktop-settings-appearance-frame-ui.glade.h:24 msgid "" @@ -261,7 +263,7 @@ #: ../settings/xfdesktop-settings-appearance-frame-ui.glade.h:25 msgid "Specify how often the background will change." -msgstr "Spécifier combien de fois l'arrière-plan va changer." +msgstr "Spécifier tous les combien de temps le fond d'écran va changer." #: ../settings/xfdesktop-settings-appearance-frame-ui.glade.h:26 msgid "in seconds:" @@ -293,17 +295,17 @@ #: ../settings/xfdesktop-settings-appearance-frame-ui.glade.h:33 msgid "Amount of time before a different background is selected." -msgstr "Temps avant qu'un arrière-plan différent soit sélectionné." +msgstr "Durée avant qu'un fond d'écran différent ne soit sélectionné." #: ../settings/xfdesktop-settings-appearance-frame-ui.glade.h:34 msgid "_Random Order" -msgstr "Ordre aléatoire" +msgstr "Ordre _aléatoire" #: ../settings/xfdesktop-settings-appearance-frame-ui.glade.h:35 msgid "" "Randomly selects another image from the same directory when the wallpaper is" " to cycle." -msgstr "Sélectionner aléatoirement une autre image du même répertoire lorsque le papier peint est du cycle." +msgstr "Sélectionne aléatoirement une autre image du même répertoire lorsque le fond d'écran change au cours du temps." #: ../settings/xfdesktop-settings-ui.glade.h:1 msgid "Left" @@ -335,16 +337,12 @@ #: ../settings/xfdesktop-settings-ui.glade.h:9 msgid "File/launcher icons" -msgstr "Icônes fichier / lanceur" +msgstr "Icônes des fichiers / lanceurs" -#: ../settings/xfdesktop-settings-ui.glade.h:10 ../src/xfce-desktop.c:1015 +#: ../settings/xfdesktop-settings-ui.glade.h:10 ../src/xfce-desktop.c:1000 msgid "Desktop" msgstr "Bureau" -#: ../settings/xfdesktop-settings-ui.glade.h:11 -msgid "Set desktop background and menu and icon behavior" -msgstr "Régler le fond d'écran du bureau, le menu et le comportement des icônes" - #: ../settings/xfdesktop-settings-ui.glade.h:12 msgid "_Background" msgstr "_Fond d'écran" @@ -359,7 +357,7 @@ #: ../settings/xfdesktop-settings-ui.glade.h:15 msgid "Mo_difier:" -msgstr "Mo_difieur :" +msgstr "Mo_dificateur :" #: ../settings/xfdesktop-settings-ui.glade.h:16 msgid "Show _application icons in menu" @@ -375,7 +373,7 @@ #: ../settings/xfdesktop-settings-ui.glade.h:19 msgid "Show _window list menu on desktop middle click" -msgstr "Afficher le menu listant les fenê_tres lors d'un clic milieu sur le bureau" +msgstr "Afficher le menu de la liste des _fenêtres lors d'un clic milieu sur le bureau" #: ../settings/xfdesktop-settings-ui.glade.h:20 msgid "B_utton:" @@ -383,7 +381,7 @@ #: ../settings/xfdesktop-settings-ui.glade.h:21 msgid "Modi_fier:" -msgstr "Modi_fieur :" +msgstr "Modi_ficateur :" #: ../settings/xfdesktop-settings-ui.glade.h:22 msgid "Sh_ow application icons in menu" @@ -399,15 +397,15 @@ #: ../settings/xfdesktop-settings-ui.glade.h:25 msgid "Show s_ticky windows only in active workspace" -msgstr "Lister les fenêtres _collantes uniquement dans l'espace de travail actif" +msgstr "Afficher les fenêtres _collantes uniquement dans l'espace de travail actif" #: ../settings/xfdesktop-settings-ui.glade.h:26 msgid "Show a_dd and remove workspace options in list" -msgstr "Afficher _ajouter et supprimer des options d'espace de travail dans la liste" +msgstr "Afficher les options _ajouter et supprimer des espaces de travail dans la liste" #: ../settings/xfdesktop-settings-ui.glade.h:27 msgid "Window List Menu" -msgstr "Menu de la liste de la fenêtre" +msgstr "Menu de la liste des fenêtres" #: ../settings/xfdesktop-settings-ui.glade.h:28 msgid "_Menus" @@ -423,13 +421,13 @@ #: ../settings/xfdesktop-settings-ui.glade.h:31 msgid "Show t_humbnails" -msgstr "_Afficher les vignettes" +msgstr "_Afficher les miniatures" #: ../settings/xfdesktop-settings-ui.glade.h:32 msgid "" "Select this option to display preview-able files on the desktop as " "automatically generated thumbnail icons." -msgstr "Sélectionnez cette option pour représenter les fichiers images ou vidéos sur le bureau sous forme d'icônes vignettes générées automatiquement." +msgstr "Sélectionner cette option pour afficher les fichiers images ou vidéos sur le bureau sous forme de miniatures générées automatiquement." #: ../settings/xfdesktop-settings-ui.glade.h:33 msgid "Single _click to activate items" @@ -437,11 +435,11 @@ #: ../settings/xfdesktop-settings-ui.glade.h:34 msgid "Show icon tooltips. Size:" -msgstr "Afficher l'icône des info-bulles. Taille :" +msgstr "Afficher les infobulles des icônes. Taille :" #: ../settings/xfdesktop-settings-ui.glade.h:35 msgid "Size of the tooltip preview image." -msgstr "Taille de l'image d'aperçu de l'info-bulle." +msgstr "Taille de l'aperçu d'image dans l'infobulle." #: ../settings/xfdesktop-settings-ui.glade.h:36 msgid "Use custom _font size:" @@ -473,7 +471,7 @@ msgid "" "Do you really want to remove workspace %d?\n" "Note: You are currently on workspace %d." -msgstr "Voulez-vous vraiment supprimer l'espace de travail %d\nRemarque : Vous êtes actuellement sur l'espace de travail %d." +msgstr "Voulez-vous vraiment supprimer l'espace de travail %d ?\nRemarque : Vous êtes actuellement sur l'espace de travail %d." #: ../src/windowlist.c:78 #, c-format @@ -485,7 +483,7 @@ msgid "" "Do you really want to remove workspace '%s'?\n" "Note: You are currently on workspace '%s'." -msgstr "Voulez-vous vraiment supprimer l'espace de travail « %s »\nRemarque : Vous êtes actuellement sur l'espace de travail « %s »." +msgstr "Voulez-vous vraiment supprimer l'espace de travail « %s » ?\nRemarque : Vous êtes actuellement sur l'espace de travail « %s »." #. Popup a dialog box confirming that the user wants to remove a #. * workspace @@ -516,94 +514,118 @@ msgid "_Remove Workspace '%s'" msgstr "_Supprimer l'espace de travail « %s »" -#: ../src/xfdesktop-application.c:768 +#: ../src/xfdesktop-app-menu-item.c:349 +#: ../src/xfdesktop-file-icon-manager.c:823 +#: ../src/xfdesktop-file-icon-manager.c:1088 +#: ../src/xfdesktop-file-icon-manager.c:1284 ../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 "Erreur lors du lancement" + +#: ../src/xfdesktop-app-menu-item.c:351 +#: ../src/xfdesktop-file-icon-manager.c:1090 +msgid "" +"Unable to launch \"exo-desktop-item-edit\", which is required to create and " +"edit launchers and links on the desktop." +msgstr "Impossible de lancer « exo-desktop-item-edit », qui est nécessaire à la création et l'édition des lanceurs et des liens sur le bureau." + +#: ../src/xfdesktop-application.c:800 msgid "Display version information" -msgstr "Afficher les informations de version" +msgstr "Afficher les informations sur la version" -#: ../src/xfdesktop-application.c:769 +#: ../src/xfdesktop-application.c:801 msgid "Reload all settings" msgstr "Recharger tous les paramètres" -#: ../src/xfdesktop-application.c:770 +#: ../src/xfdesktop-application.c:802 msgid "Pop up the menu (at the current mouse position)" msgstr "Faire apparaitre le menu (à la position actuelle de la souris)" -#: ../src/xfdesktop-application.c:771 +#: ../src/xfdesktop-application.c:803 msgid "Pop up the window list (at the current mouse position)" msgstr "Faire apparaitre la liste des fenêtres (à la position actuelle de la souris)" -#: ../src/xfdesktop-application.c:773 +#: ../src/xfdesktop-application.c:805 msgid "Automatically arrange all the icons on the desktop" msgstr "Organiser automatiquement toutes les icônes sur le bureau" -#: ../src/xfdesktop-application.c:775 +#: ../src/xfdesktop-application.c:807 +msgid "Enable debug messages" +msgstr "Activer les messages de débogage" + +#: ../src/xfdesktop-application.c:808 +msgid "Disable debug messages" +msgstr "Désactiver les messages de débogage" + +#: ../src/xfdesktop-application.c:809 msgid "Do not wait for a window manager on startup" msgstr "Ne pas attendre un gestionnaire de fenêtres au démarrage" -#: ../src/xfdesktop-application.c:776 +#: ../src/xfdesktop-application.c:810 msgid "Cause xfdesktop to quit" -msgstr "Cause xfdesktop pour quitter" +msgstr "Provoque l'arrêt de xfdesktop" -#: ../src/xfdesktop-application.c:791 +#: ../src/xfdesktop-application.c:825 #, c-format msgid "Failed to parse arguments: %s\n" msgstr "Échec de l'analyse des arguments : %s\n" -#: ../src/xfdesktop-application.c:802 +#: ../src/xfdesktop-application.c:836 #, c-format msgid "This is %s version %s, running on Xfce %s.\n" -msgstr "Ceci est la version%s %s, fonctionnant sur Xfce %s.\n" +msgstr "Ceci est %s en version %s, en cours d'exécution sur Xfce %s.\n" -#: ../src/xfdesktop-application.c:804 +#: ../src/xfdesktop-application.c:838 #, c-format msgid "Built with GTK+ %d.%d.%d, linked with GTK+ %d.%d.%d." -msgstr "Construit avec GTK+ %d.%d.%d, édition de lien avec GTK+ %d.%d.%d." +msgstr "Compilé avec GTK+ %d.%d.%d, lié avec GTK+ %d.%d.%d." -#: ../src/xfdesktop-application.c:808 +#: ../src/xfdesktop-application.c:842 #, c-format msgid "Build options:\n" -msgstr "Options de construction :\n" +msgstr "Options de compilation :\n" -#: ../src/xfdesktop-application.c:809 +#: ../src/xfdesktop-application.c:843 #, c-format msgid " Desktop Menu: %s\n" msgstr " Menu du bureau : %s\n" -#: ../src/xfdesktop-application.c:811 ../src/xfdesktop-application.c:818 -#: ../src/xfdesktop-application.c:825 +#: ../src/xfdesktop-application.c:845 ../src/xfdesktop-application.c:852 +#: ../src/xfdesktop-application.c:859 msgid "enabled" msgstr "activé" -#: ../src/xfdesktop-application.c:813 ../src/xfdesktop-application.c:820 -#: ../src/xfdesktop-application.c:827 +#: ../src/xfdesktop-application.c:847 ../src/xfdesktop-application.c:854 +#: ../src/xfdesktop-application.c:861 msgid "disabled" msgstr "désactivé" -#: ../src/xfdesktop-application.c:816 +#: ../src/xfdesktop-application.c:850 #, c-format msgid " Desktop Icons: %s\n" msgstr " Icônes du bureau : %s\n" -#: ../src/xfdesktop-application.c:823 +#: ../src/xfdesktop-application.c:857 #, c-format msgid " Desktop File Icons: %s\n" -msgstr " Icônes des fichiers du bureau : %s\n" +msgstr " Icônes des fichiers du bureau : %s\n" #: ../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 "Impossible de créer le répertoire du bureau « %s »" +msgstr "Impossible de créer le dossier du bureau « %s »" #: ../src/xfdesktop-file-icon-manager.c:527 #: ../src/xfdesktop-file-icon-manager.c:544 msgid "Desktop Folder Error" -msgstr "Erreur dans le répertoire du bureau" +msgstr "Erreur dans le dossier du bureau" #: ../src/xfdesktop-file-icon-manager.c:546 msgid "" "A normal file with the same name already exists. Please delete or rename it." -msgstr "Un fichier normal ayant le même nom existe déjà. Veuillez le supprimer ou le renommer." +msgstr "Un fichier normal avec le même nom existe déjà. Veuillez le supprimer ou le renommer." #: ../src/xfdesktop-file-icon-manager.c:629 ../src/xfdesktop-file-utils.c:723 #: ../src/xfdesktop-file-utils.c:776 @@ -616,7 +638,7 @@ #: ../src/xfdesktop-file-icon-manager.c:631 msgid "None of the icons selected support being renamed." -msgstr "Aucun des icônes sélectionnées ne peut être renommé." +msgstr "Aucune des icônes sélectionnées ne peut être renommée." #: ../src/xfdesktop-file-icon-manager.c:675 #: ../src/xfdesktop-file-icon-manager.c:719 ../src/xfdesktop-file-utils.c:876 @@ -627,7 +649,7 @@ #: ../src/xfdesktop-file-icon-manager.c:676 #: ../src/xfdesktop-file-icon-manager.c:720 msgid "The selected files could not be trashed" -msgstr "Les fichiers sélectionnés n'on pas pu être supprimés." +msgstr "Les fichiers sélectionnés n'ont pas pu être supprimés" #: ../src/xfdesktop-file-icon-manager.c:677 #: ../src/xfdesktop-file-icon-manager.c:721 ../src/xfdesktop-file-utils.c:725 @@ -643,122 +665,113 @@ #. printf is to be translator-friendly #: ../src/xfdesktop-file-icon-manager.c:821 -#: ../src/xfdesktop-file-icon-manager.c:1279 +#: ../src/xfdesktop-file-icon-manager.c:1283 #, c-format msgid "Unable to launch \"%s\":" msgstr "Impossible de lancer « %s » :" -#: ../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 "Erreur lors du lancement" - -#: ../src/xfdesktop-file-icon-manager.c:1008 +#: ../src/xfdesktop-file-icon-manager.c:1012 #, c-format msgid "_Open With \"%s\"" msgstr "_Ouvrir avec « %s »" -#: ../src/xfdesktop-file-icon-manager.c:1011 +#: ../src/xfdesktop-file-icon-manager.c:1015 #, c-format msgid "Open With \"%s\"" msgstr "Ouvrir avec « %s »" -#: ../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 "Impossible de lancer « exo-desktop-item-edit », qui est nécessaire à la création et l'édition des lanceurs et des liens sur le bureau." - -#: ../src/xfdesktop-file-icon-manager.c:1337 +#: ../src/xfdesktop-file-icon-manager.c:1341 msgid "_Open all" msgstr "_Ouvrir tous" -#: ../src/xfdesktop-file-icon-manager.c:1353 +#: ../src/xfdesktop-file-icon-manager.c:1357 msgid "_Open in New Window" msgstr "_Ouvrir dans une nouvelle fenêtre" -#: ../src/xfdesktop-file-icon-manager.c:1355 +#: ../src/xfdesktop-file-icon-manager.c:1359 #: ../src/xfdesktop-special-file-icon.c:547 ../src/xfdesktop-volume-icon.c:813 msgid "_Open" msgstr "_Ouvrir" #. create launcher item -#: ../src/xfdesktop-file-icon-manager.c:1374 +#: ../src/xfdesktop-file-icon-manager.c:1378 msgid "Create _Launcher..." msgstr "Créer un _lanceur..." #. create link item -#: ../src/xfdesktop-file-icon-manager.c:1390 +#: ../src/xfdesktop-file-icon-manager.c:1394 msgid "Create _URL Link..." msgstr "Créer un lien _URL..." #. create folder item -#: ../src/xfdesktop-file-icon-manager.c:1406 +#: ../src/xfdesktop-file-icon-manager.c:1410 msgid "Create _Folder..." msgstr "Créer un _dossier..." -#: ../src/xfdesktop-file-icon-manager.c:1421 +#: ../src/xfdesktop-file-icon-manager.c:1425 msgid "Create From _Template" msgstr "Créer à partir d'un _modèle" -#: ../src/xfdesktop-file-icon-manager.c:1450 +#: ../src/xfdesktop-file-icon-manager.c:1454 msgid "_Empty File" msgstr "_Fichier vide" -#: ../src/xfdesktop-file-icon-manager.c:1467 +#: ../src/xfdesktop-file-icon-manager.c:1471 msgid "_Execute" msgstr "_Exécuter" -#: ../src/xfdesktop-file-icon-manager.c:1487 +#: ../src/xfdesktop-file-icon-manager.c:1491 msgid "_Edit Launcher" msgstr "_Éditer le lanceur" -#: ../src/xfdesktop-file-icon-manager.c:1522 +#: ../src/xfdesktop-file-icon-manager.c:1526 msgid "Open With" msgstr "Ouvrir avec" -#: ../src/xfdesktop-file-icon-manager.c:1548 +#: ../src/xfdesktop-file-icon-manager.c:1552 msgid "Open With Other _Application..." msgstr "Ouvrir avec une autre _application..." +#. Trash +#: ../src/xfdesktop-file-icon-manager.c:1639 +msgid "Mo_ve to Trash" +msgstr "Dé_placer dans la corbeille" + #. Rename -#: ../src/xfdesktop-file-icon-manager.c:1651 +#: ../src/xfdesktop-file-icon-manager.c:1670 msgid "_Rename..." msgstr "_Renommer..." -#: ../src/xfdesktop-file-icon-manager.c:1679 +#: ../src/xfdesktop-file-icon-manager.c:1698 msgid "Arrange Desktop _Icons" msgstr "_Arranger les icônes du bureau" -#: ../src/xfdesktop-file-icon-manager.c:1690 +#: ../src/xfdesktop-file-icon-manager.c:1709 msgid "Desktop _Settings..." msgstr "Paramètres du _bureau..." -#: ../src/xfdesktop-file-icon-manager.c:1701 +#: ../src/xfdesktop-file-icon-manager.c:1720 #: ../src/xfdesktop-volume-icon.c:855 msgid "P_roperties..." msgstr "_Propriétés..." -#: ../src/xfdesktop-file-icon-manager.c:2716 +#: ../src/xfdesktop-file-icon-manager.c:2667 msgid "Load Error" msgstr "Erreur de chargement" -#: ../src/xfdesktop-file-icon-manager.c:2718 +#: ../src/xfdesktop-file-icon-manager.c:2669 msgid "Failed to load the desktop folder" -msgstr "Impossible de charger le répertoire du bureau" +msgstr "Impossible de charger le dossier du bureau" -#: ../src/xfdesktop-file-icon-manager.c:3262 +#: ../src/xfdesktop-file-icon-manager.c:3214 msgid "Copy _Here" msgstr "_Copier ici" -#: ../src/xfdesktop-file-icon-manager.c:3262 +#: ../src/xfdesktop-file-icon-manager.c:3214 msgid "_Move Here" msgstr "_Déplacer ici" -#: ../src/xfdesktop-file-icon-manager.c:3262 +#: ../src/xfdesktop-file-icon-manager.c:3214 msgid "_Link Here" msgstr "_Lier ici" @@ -793,7 +806,7 @@ #: ../src/xfdesktop-file-utils.c:665 msgid "The folder could not be opened" -msgstr "Le répertoire n'a pas pu être ouvert" +msgstr "Le dossier n'a pas pu être ouvert" #: ../src/xfdesktop-file-utils.c:682 msgid "Error" @@ -831,7 +844,7 @@ #: ../src/xfdesktop-file-utils.c:957 msgid "Create File Error" -msgstr "Erreur de création du fichier" +msgstr "Erreur à la création du fichier" #: ../src/xfdesktop-file-utils.c:958 msgid "Could not create a new file" @@ -839,7 +852,7 @@ #: ../src/xfdesktop-file-utils.c:1004 msgid "Create Document Error" -msgstr "Erreur de création du document" +msgstr "Erreur à la création du document" #: ../src/xfdesktop-file-utils.c:1005 msgid "Could not create a new document from the template" @@ -851,7 +864,7 @@ #: ../src/xfdesktop-file-utils.c:1046 msgid "The file properties dialog could not be opened" -msgstr "La boite de dialogue des propriétés du fichier n'a pas pu être ouvert" +msgstr "La boite de dialogue des propriétés du fichier n'a pas pu être ouverte" #: ../src/xfdesktop-file-utils.c:1087 msgid "The file could not be opened" @@ -887,7 +900,7 @@ msgid "" "The device \"%s\" is being unmounted by the system. Please do not remove the" " media or disconnect the drive" -msgstr "Le périphérique « %s » est en train d'être retiré du système. Veuillez ne pas retirer le média ou déconnecter le lecteur" +msgstr "Le périphérique « %s » est en cours de démontage par le système. Veuillez ne pas retirer le support ou déconnecter le lecteur" #. TRANSLATORS: Please use the same translation here as in Thunar #: ../src/xfdesktop-notify.c:137 ../src/xfdesktop-notify.c:322 @@ -900,11 +913,11 @@ msgid "" "There is data that needs to be written to the device \"%s\" before it can be" " removed. Please do not remove the media or disconnect the drive" -msgstr "Il y a des données qui doivent être écrites sur le périphérique « %s » avant qu'il ne puisse être enlevé. Veuillez ne pas retirer le média ou déconnecter le lecteur" +msgstr "Des données doivent être écrites sur le périphérique « %s » avant sa déconnexion. Veuillez ne pas retirer le support ou déconnecter le lecteur" #: ../src/xfdesktop-notify.c:221 msgid "Unmount Finished" -msgstr "Le démontage est fini" +msgstr "Le démontage est terminé" #: ../src/xfdesktop-notify.c:223 ../src/xfdesktop-notify.c:408 #, c-format @@ -924,9 +937,9 @@ #: ../src/xfdesktop-notify.c:406 msgid "Eject Finished" -msgstr "L'éjection est finie" +msgstr "L'éjection est terminée" -#: ../src/xfdesktop-regular-file-icon.c:603 +#: ../src/xfdesktop-regular-file-icon.c:748 #, c-format msgid "" "Type: %s\n" diff -Nru xfdesktop4-4.11.6/po/hr.po xfdesktop4-4.19.2/po/hr.po --- xfdesktop4-4.11.6/po/hr.po 2014-03-25 17:51:09.000000000 +0000 +++ xfdesktop4-4.19.2/po/hr.po 2014-08-11 07:27:27.000000000 +0000 @@ -3,7 +3,8 @@ # This file is distributed under the same license as the PACKAGE package. # # Translators: -# schizo , 2014 +# Edin Veskovic , 2014 +# Edin Veskovic , 2014 # Ivica Kolić , 2010 # Ivica Kolić , 2013-2014 # Ivica Kolić , 2013 @@ -11,47 +12,47 @@ 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-03-20 06:05+0000\n" -"Last-Translator: Ivica Kolić \n" -"Language-Team: Croatian (http://www.transifex.com/projects/p/xfce/language/hr/)\n" +"POT-Creation-Date: 2014-08-03 12:32+0200\n" +"PO-Revision-Date: 2014-08-05 09:17+0000\n" +"Last-Translator: Edin Veskovic \n" +"Language-Team: Croatian (http://www.transifex.com/projects/p/xfdesktop/language/hr/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Language: hr\n" "Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n" -#: ../settings/main.c:375 ../src/xfdesktop-special-file-icon.c:295 +#: ../settings/main.c:404 ../src/xfdesktop-special-file-icon.c:295 #: ../src/xfdesktop-special-file-icon.c:479 msgid "Home" msgstr "Osobna mapa" -#: ../settings/main.c:377 +#: ../settings/main.c:406 msgid "Filesystem" msgstr "Datotečni sustav" -#: ../settings/main.c:379 +#: ../settings/main.c:408 msgid "Trash" msgstr "Smeće" -#: ../settings/main.c:381 +#: ../settings/main.c:410 msgid "Removable Devices" msgstr "Uklonjivi uređaji" -#: ../settings/main.c:383 +#: ../settings/main.c:412 msgid "Network Shares" msgstr "Dijeljenja na mreži" -#: ../settings/main.c:385 +#: ../settings/main.c:414 msgid "Disks and Drives" msgstr "Diskovi i pogoni" -#: ../settings/main.c:387 +#: ../settings/main.c:416 msgid "Other Devices" msgstr "Ostali uređaji" #. Display the file name, file type, and file size in the tooltip. -#: ../settings/main.c:500 +#: ../settings/main.c:529 #, c-format msgid "" "%s\n" @@ -59,95 +60,95 @@ "Size: %s" msgstr "%s\nTip: %s\nVeličina: %s" -#: ../settings/main.c:686 +#: ../settings/main.c:715 #, c-format msgid "Wallpaper for Monitor %d (%s)" msgstr "Pozadinske slike za monitor %d (%s)" -#: ../settings/main.c:689 +#: ../settings/main.c:718 #, c-format msgid "Wallpaper for Monitor %d" msgstr "Pozadinske slike za monitor %d" -#: ../settings/main.c:695 +#: ../settings/main.c:724 msgid "Move this dialog to the display you want to edit the settings for." msgstr "Premjesti okvir do zaslona za kojeg želite mijenjati postavke." -#: ../settings/main.c:702 +#: ../settings/main.c:731 #, c-format msgid "Wallpaper for %s on Monitor %d (%s)" msgstr "Pozadinska slika za %s na monitoru %d (%s)" -#: ../settings/main.c:706 +#: ../settings/main.c:735 #, c-format msgid "Wallpaper for %s on Monitor %d" msgstr "Pozadinska slika za %s na monitoru %d" -#: ../settings/main.c:713 +#: ../settings/main.c:742 msgid "" "Move this dialog to the display and workspace you want to edit the settings " "for." msgstr "Premjesti okvir do radnog prostora i zaslona za kojeg želite mijenjati postavke." #. Single monitor and single workspace -#: ../settings/main.c:720 +#: ../settings/main.c:749 #, c-format msgid "Wallpaper for my desktop" msgstr "Pozadinske slike za moju radnu površinu" #. Single monitor and per workspace wallpaper -#: ../settings/main.c:726 +#: ../settings/main.c:755 #, c-format msgid "Wallpaper for %s" msgstr "Pozadinske slike za %s" -#: ../settings/main.c:731 +#: ../settings/main.c:760 msgid "Move this dialog to the workspace you want to edit the settings for." msgstr "Premjesti okvir do radnog prostora za kojeg želite mijenjati postavke." -#: ../settings/main.c:1134 +#: ../settings/main.c:1174 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." -#: ../settings/main.c:1481 +#: ../settings/main.c:1524 msgid "Spanning screens" msgstr "Obuhvaćeni zasloni" -#: ../settings/main.c:1786 +#: ../settings/main.c:1831 msgid "Image files" msgstr "Datoteke slika" -#: ../settings/main.c:1958 +#: ../settings/main.c:2010 msgid "Settings manager socket" msgstr "Socket upravitelja postavkama" -#: ../settings/main.c:1958 +#: ../settings/main.c:2010 msgid "SOCKET ID" msgstr "SOCKET ID" -#: ../settings/main.c:1959 +#: ../settings/main.c:2011 msgid "Version information" msgstr "Informacija o verziji" -#: ../settings/main.c:1986 +#: ../settings/main.c:2039 #, c-format msgid "Type '%s --help' for usage." msgstr "Upiši '%s -help' za upotrebu." -#: ../settings/main.c:1998 +#: ../settings/main.c:2051 msgid "The Xfce development team. All rights reserved." msgstr "Xfce razvojni tim.Sva prava pridržana." -#: ../settings/main.c:1999 +#: ../settings/main.c:2052 #, c-format msgid "Please report bugs to <%s>." msgstr "Prijavite probleme <%s>." -#: ../settings/main.c:2006 +#: ../settings/main.c:2059 msgid "Desktop Settings" msgstr "Postavke radne površine" -#: ../settings/main.c:2008 +#: ../settings/main.c:2061 msgid "Unable to contact settings server" msgstr "Ne mogu se spojiti na server za postavke" @@ -156,8 +157,9 @@ msgstr "Radna površina" #: ../settings/xfce-backdrop-settings.desktop.in.h:2 -msgid "Set desktop background and menu and icon behaviour" -msgstr "Postavi ponašanje pozadine i izbornika i ikona radne poveršine" +#: ../settings/xfdesktop-settings-ui.glade.h:11 +msgid "Set desktop background and menu and icon behavior" +msgstr "Postavi ponašanje pozadine radne površine i izbornika i ikona " #: ../settings/xfdesktop-settings-appearance-frame-ui.glade.h:1 msgid "Solid color" @@ -335,14 +337,10 @@ msgid "File/launcher icons" msgstr "Ikone datoteke/pokretača" -#: ../settings/xfdesktop-settings-ui.glade.h:10 ../src/xfce-desktop.c:1015 +#: ../settings/xfdesktop-settings-ui.glade.h:10 ../src/xfce-desktop.c:1007 msgid "Desktop" msgstr "Radna površina" -#: ../settings/xfdesktop-settings-ui.glade.h:11 -msgid "Set desktop background and menu and icon behavior" -msgstr "Postavi ponašanje pozadine radne površine i izbornika i ikona " - #: ../settings/xfdesktop-settings-ui.glade.h:12 msgid "_Background" msgstr "_Pozadina" @@ -434,26 +432,30 @@ msgstr "Jedan _klik za aktiviranje stavki" #: ../settings/xfdesktop-settings-ui.glade.h:34 +msgid "Show hidden files on the desktop" +msgstr "Pokazuj skrivene datoteke na radnoj površini" + +#: ../settings/xfdesktop-settings-ui.glade.h:35 msgid "Show icon tooltips. Size:" msgstr "Prikazuj oblačiće ikona. Veličina:" -#: ../settings/xfdesktop-settings-ui.glade.h:35 +#: ../settings/xfdesktop-settings-ui.glade.h:36 msgid "Size of the tooltip preview image." msgstr "Veličina slike pregleda oblačića. " -#: ../settings/xfdesktop-settings-ui.glade.h:36 +#: ../settings/xfdesktop-settings-ui.glade.h:37 msgid "Use custom _font size:" msgstr "Koristi prilagođenu _veličinu fonta:" -#: ../settings/xfdesktop-settings-ui.glade.h:37 +#: ../settings/xfdesktop-settings-ui.glade.h:38 msgid "Appearance" msgstr "Izgled" -#: ../settings/xfdesktop-settings-ui.glade.h:38 +#: ../settings/xfdesktop-settings-ui.glade.h:39 msgid "Default Icons" msgstr "" -#: ../settings/xfdesktop-settings-ui.glade.h:39 +#: ../settings/xfdesktop-settings-ui.glade.h:40 msgid "_Icons" msgstr "_Ikone" @@ -514,121 +516,149 @@ msgid "_Remove Workspace '%s'" msgstr "_Ukloni radni prostor '%s'" -#: ../src/xfdesktop-application.c:768 +#: ../src/xfdesktop-app-menu-item.c:349 +#: ../src/xfdesktop-file-icon-manager.c:860 +#: ../src/xfdesktop-file-icon-manager.c:1125 +#: ../src/xfdesktop-file-icon-manager.c:1321 ../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 "Greška pokretanja" + +#: ../src/xfdesktop-app-menu-item.c:351 +#: ../src/xfdesktop-file-icon-manager.c:1127 +msgid "" +"Unable to launch \"exo-desktop-item-edit\", which is required to create and " +"edit launchers and links on the desktop." +msgstr "Ne mogu pokrenuti \"exo-desktop-item-edit\" što je potrebno za kreiranje i uređivanje pokretača i poveznica na radnoj površini." + +#: ../src/xfdesktop-application.c:836 msgid "Display version information" msgstr "Prikaži informacije o verziji" -#: ../src/xfdesktop-application.c:769 +#: ../src/xfdesktop-application.c:837 msgid "Reload all settings" msgstr "Ponovno učitaj sve postavke" -#: ../src/xfdesktop-application.c:770 +#: ../src/xfdesktop-application.c:838 +msgid "Advance to the next wallpaper on the current workspace" +msgstr "Nastavi do slijedeće pozadine na trenutnom radnom prostoru." + +#: ../src/xfdesktop-application.c:839 msgid "Pop up the menu (at the current mouse position)" msgstr "Skočni prozor (na trenutnoj poziciji miša)" -#: ../src/xfdesktop-application.c:771 +#: ../src/xfdesktop-application.c:840 msgid "Pop up the window list (at the current mouse position)" msgstr "Skočni prozor liste prozora (na trenutnoj poziciji miša)" -#: ../src/xfdesktop-application.c:773 +#: ../src/xfdesktop-application.c:842 msgid "Automatically arrange all the icons on the desktop" msgstr "Automatski uredite sve ikone na radnoj površini" -#: ../src/xfdesktop-application.c:775 +#: ../src/xfdesktop-application.c:844 +msgid "Enable debug messages" +msgstr "Omogući poruke otklanjanja grešaka" + +#: ../src/xfdesktop-application.c:845 +msgid "Disable debug messages" +msgstr "Onemogući poruke otklanjanja grešaka" + +#: ../src/xfdesktop-application.c:846 msgid "Do not wait for a window manager on startup" msgstr "Ne čekaj upravitelja prozora pri pokretanju" -#: ../src/xfdesktop-application.c:776 +#: ../src/xfdesktop-application.c:847 msgid "Cause xfdesktop to quit" msgstr "Uzrokuje xfdesktop isključivanje" -#: ../src/xfdesktop-application.c:791 +#: ../src/xfdesktop-application.c:862 #, c-format msgid "Failed to parse arguments: %s\n" msgstr "Ne mogu analizirati arugmente: %s\n" -#: ../src/xfdesktop-application.c:802 +#: ../src/xfdesktop-application.c:873 #, c-format msgid "This is %s version %s, running on Xfce %s.\n" msgstr "Ovo je %s verzija %s, pokrenuta na Xfce %s.\n" -#: ../src/xfdesktop-application.c:804 +#: ../src/xfdesktop-application.c:875 #, c-format msgid "Built with GTK+ %d.%d.%d, linked with GTK+ %d.%d.%d." msgstr "Izrađeno sa GTK+ %d.%d.%d, povezan s GTK +%d.%d.%d." -#: ../src/xfdesktop-application.c:808 +#: ../src/xfdesktop-application.c:879 #, c-format msgid "Build options:\n" msgstr "Opcije izrade:\n" -#: ../src/xfdesktop-application.c:809 +#: ../src/xfdesktop-application.c:880 #, c-format msgid " Desktop Menu: %s\n" msgstr "Izbornik radne površine: %s\n" -#: ../src/xfdesktop-application.c:811 ../src/xfdesktop-application.c:818 -#: ../src/xfdesktop-application.c:825 +#: ../src/xfdesktop-application.c:882 ../src/xfdesktop-application.c:889 +#: ../src/xfdesktop-application.c:896 msgid "enabled" msgstr "omogućeno" -#: ../src/xfdesktop-application.c:813 ../src/xfdesktop-application.c:820 -#: ../src/xfdesktop-application.c:827 +#: ../src/xfdesktop-application.c:884 ../src/xfdesktop-application.c:891 +#: ../src/xfdesktop-application.c:898 msgid "disabled" msgstr "onemogućeno" -#: ../src/xfdesktop-application.c:816 +#: ../src/xfdesktop-application.c:887 #, c-format msgid " Desktop Icons: %s\n" msgstr "Ikone radne površine: %s\n" -#: ../src/xfdesktop-application.c:823 +#: ../src/xfdesktop-application.c:894 #, c-format msgid " Desktop File Icons: %s\n" msgstr "Ikone datoteke radne površine: %s\n" -#: ../src/xfdesktop-file-icon-manager.c:522 -#: ../src/xfdesktop-file-icon-manager.c:539 +#: ../src/xfdesktop-file-icon-manager.c:559 +#: ../src/xfdesktop-file-icon-manager.c:576 #, c-format msgid "Could not create the desktop folder \"%s\"" msgstr "Ne mogu kreirati mapu radne površine \"%s\"" -#: ../src/xfdesktop-file-icon-manager.c:527 -#: ../src/xfdesktop-file-icon-manager.c:544 +#: ../src/xfdesktop-file-icon-manager.c:564 +#: ../src/xfdesktop-file-icon-manager.c:581 msgid "Desktop Folder Error" msgstr "Greška mape radne površine" -#: ../src/xfdesktop-file-icon-manager.c:546 +#: ../src/xfdesktop-file-icon-manager.c:583 msgid "" "A normal file with the same name already exists. Please delete or rename it." msgstr "Normalna datoteka s istim imenom već postoji.Molim izbrišite je ili preimenujte." -#: ../src/xfdesktop-file-icon-manager.c:629 ../src/xfdesktop-file-utils.c:723 +#: ../src/xfdesktop-file-icon-manager.c:666 ../src/xfdesktop-file-utils.c:723 #: ../src/xfdesktop-file-utils.c:776 msgid "Rename Error" msgstr "Greška preimenovanja" -#: ../src/xfdesktop-file-icon-manager.c:630 ../src/xfdesktop-file-utils.c:777 +#: ../src/xfdesktop-file-icon-manager.c:667 ../src/xfdesktop-file-utils.c:777 msgid "The files could not be renamed" msgstr "Datoteke se ne može preimenovati" -#: ../src/xfdesktop-file-icon-manager.c:631 +#: ../src/xfdesktop-file-icon-manager.c:668 msgid "None of the icons selected support being renamed." msgstr "Nijedna izabrana ikona ne podržava preimenovanje." -#: ../src/xfdesktop-file-icon-manager.c:675 -#: ../src/xfdesktop-file-icon-manager.c:719 ../src/xfdesktop-file-utils.c:876 +#: ../src/xfdesktop-file-icon-manager.c:712 +#: ../src/xfdesktop-file-icon-manager.c:756 ../src/xfdesktop-file-utils.c:876 #: ../src/xfdesktop-file-utils.c:913 msgid "Trash Error" msgstr "Greška smeća" -#: ../src/xfdesktop-file-icon-manager.c:676 -#: ../src/xfdesktop-file-icon-manager.c:720 +#: ../src/xfdesktop-file-icon-manager.c:713 +#: ../src/xfdesktop-file-icon-manager.c:757 msgid "The selected files could not be trashed" msgstr "Odabrane datoteke ne mogu biti bačene u smeće" -#: ../src/xfdesktop-file-icon-manager.c:677 -#: ../src/xfdesktop-file-icon-manager.c:721 ../src/xfdesktop-file-utils.c:725 +#: ../src/xfdesktop-file-icon-manager.c:714 +#: ../src/xfdesktop-file-icon-manager.c:758 ../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 @@ -640,123 +670,114 @@ msgstr "Ova značajka zahtijeva prisutnost servisa upravitelja datotekama (kao što je dobivate od Thunar-a)." #. printf is to be translator-friendly -#: ../src/xfdesktop-file-icon-manager.c:821 -#: ../src/xfdesktop-file-icon-manager.c:1279 +#: ../src/xfdesktop-file-icon-manager.c:858 +#: ../src/xfdesktop-file-icon-manager.c:1320 #, c-format msgid "Unable to launch \"%s\":" msgstr "Nije moguće pokrenuti \"%s\":" -#: ../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 "Greška pokretanja" - -#: ../src/xfdesktop-file-icon-manager.c:1008 +#: ../src/xfdesktop-file-icon-manager.c:1049 #, c-format msgid "_Open With \"%s\"" msgstr "_Otvori pomoću \"%s\"" -#: ../src/xfdesktop-file-icon-manager.c:1011 +#: ../src/xfdesktop-file-icon-manager.c:1052 #, c-format msgid "Open With \"%s\"" msgstr "Otvori pomoću \"%s\"" -#: ../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 "Ne mogu pokrenuti \"exo-desktop-item-edit\" što je potrebno za kreiranje i uređivanje pokretača i poveznica na radnoj površini." - -#: ../src/xfdesktop-file-icon-manager.c:1337 +#: ../src/xfdesktop-file-icon-manager.c:1378 msgid "_Open all" msgstr "_Otvori sve" -#: ../src/xfdesktop-file-icon-manager.c:1353 +#: ../src/xfdesktop-file-icon-manager.c:1394 msgid "_Open in New Window" msgstr "_Otvori u novom prozoru" -#: ../src/xfdesktop-file-icon-manager.c:1355 +#: ../src/xfdesktop-file-icon-manager.c:1396 #: ../src/xfdesktop-special-file-icon.c:547 ../src/xfdesktop-volume-icon.c:813 msgid "_Open" msgstr "_Otvori" #. create launcher item -#: ../src/xfdesktop-file-icon-manager.c:1374 +#: ../src/xfdesktop-file-icon-manager.c:1415 msgid "Create _Launcher..." msgstr "Napravi _pokretač..." #. create link item -#: ../src/xfdesktop-file-icon-manager.c:1390 +#: ../src/xfdesktop-file-icon-manager.c:1431 msgid "Create _URL Link..." msgstr "Napravi _URL poveznicu..." #. create folder item -#: ../src/xfdesktop-file-icon-manager.c:1406 +#: ../src/xfdesktop-file-icon-manager.c:1447 msgid "Create _Folder..." msgstr "Napravi _mapu..." -#: ../src/xfdesktop-file-icon-manager.c:1421 +#: ../src/xfdesktop-file-icon-manager.c:1462 msgid "Create From _Template" msgstr "Napravi iz _predloška" -#: ../src/xfdesktop-file-icon-manager.c:1450 +#: ../src/xfdesktop-file-icon-manager.c:1491 msgid "_Empty File" msgstr "_Prazna datoteka" -#: ../src/xfdesktop-file-icon-manager.c:1467 +#: ../src/xfdesktop-file-icon-manager.c:1508 msgid "_Execute" msgstr "_Izvrši" -#: ../src/xfdesktop-file-icon-manager.c:1487 +#: ../src/xfdesktop-file-icon-manager.c:1528 msgid "_Edit Launcher" msgstr "_Uredi pokretač" -#: ../src/xfdesktop-file-icon-manager.c:1522 +#: ../src/xfdesktop-file-icon-manager.c:1563 msgid "Open With" msgstr "Otvori pomoću" -#: ../src/xfdesktop-file-icon-manager.c:1548 +#: ../src/xfdesktop-file-icon-manager.c:1589 msgid "Open With Other _Application..." msgstr "Otvori sa drugim _programom..." +#. Trash +#: ../src/xfdesktop-file-icon-manager.c:1676 +msgid "Mo_ve to Trash" +msgstr "Premje_sti u smeće" + #. Rename -#: ../src/xfdesktop-file-icon-manager.c:1651 +#: ../src/xfdesktop-file-icon-manager.c:1707 msgid "_Rename..." msgstr "_Preimenuj..." -#: ../src/xfdesktop-file-icon-manager.c:1679 +#: ../src/xfdesktop-file-icon-manager.c:1735 msgid "Arrange Desktop _Icons" msgstr "Uredite ikone _radne površine" -#: ../src/xfdesktop-file-icon-manager.c:1690 +#: ../src/xfdesktop-file-icon-manager.c:1746 msgid "Desktop _Settings..." msgstr "Postavke _radne površine..." -#: ../src/xfdesktop-file-icon-manager.c:1701 +#: ../src/xfdesktop-file-icon-manager.c:1757 #: ../src/xfdesktop-volume-icon.c:855 msgid "P_roperties..." msgstr "S_vojstva..." -#: ../src/xfdesktop-file-icon-manager.c:2716 +#: ../src/xfdesktop-file-icon-manager.c:2699 msgid "Load Error" msgstr "Greška učitavanja" -#: ../src/xfdesktop-file-icon-manager.c:2718 +#: ../src/xfdesktop-file-icon-manager.c:2701 msgid "Failed to load the desktop folder" msgstr "Neuspjelo učitavanje mape radne površine" -#: ../src/xfdesktop-file-icon-manager.c:3262 +#: ../src/xfdesktop-file-icon-manager.c:3242 msgid "Copy _Here" msgstr "Kopiraj _ovdje" -#: ../src/xfdesktop-file-icon-manager.c:3262 +#: ../src/xfdesktop-file-icon-manager.c:3242 msgid "_Move Here" msgstr "_Premjesti ovdje" -#: ../src/xfdesktop-file-icon-manager.c:3262 +#: ../src/xfdesktop-file-icon-manager.c:3242 msgid "_Link Here" msgstr "_Poveznica ovdje" @@ -807,15 +828,15 @@ #: ../src/xfdesktop-file-utils.c:826 msgid "Delete Error" -msgstr "Greška brisanja" +msgstr "Greška pri brisanju" #: ../src/xfdesktop-file-utils.c:827 msgid "The selected files could not be deleted" -msgstr "Izabrane datoteke se ne mogu izbrisati" +msgstr "Odabrane datoteke nisu mogle biti pobrisane" #: ../src/xfdesktop-file-utils.c:877 msgid "The selected files could not be moved to the trash" -msgstr "Izabrane datoteke se ne mogu premjestiti u smeće" +msgstr "Odabrane datoteke nisu mogle biti premještene u smeće" #: ../src/xfdesktop-file-utils.c:878 ../src/xfdesktop-file-utils.c:915 msgid "" @@ -924,7 +945,7 @@ msgid "Eject Finished" msgstr "Izbacivanje završeno" -#: ../src/xfdesktop-regular-file-icon.c:603 +#: ../src/xfdesktop-regular-file-icon.c:748 #, c-format msgid "" "Type: %s\n" diff -Nru xfdesktop4-4.11.6/po/is.po xfdesktop4-4.19.2/po/is.po --- xfdesktop4-4.11.6/po/is.po 2014-02-04 16:03:48.000000000 +0000 +++ xfdesktop4-4.19.2/po/is.po 2014-05-29 16:45:19.000000000 +0000 @@ -9,47 +9,47 @@ 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-30 06:11+0000\n" +"POT-Creation-Date: 2014-04-03 18:32+0200\n" +"PO-Revision-Date: 2014-05-23 14:20+0000\n" "Last-Translator: Sveinn í Felli \n" -"Language-Team: Icelandic (http://www.transifex.com/projects/p/xfce/language/is/)\n" +"Language-Team: Icelandic (http://www.transifex.com/projects/p/xfdesktop/language/is/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Language: is\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -#: ../settings/main.c:372 ../src/xfdesktop-special-file-icon.c:295 +#: ../settings/main.c:404 ../src/xfdesktop-special-file-icon.c:295 #: ../src/xfdesktop-special-file-icon.c:479 msgid "Home" msgstr "Heimasvæði" -#: ../settings/main.c:374 +#: ../settings/main.c:406 msgid "Filesystem" msgstr "Skráakerfi" -#: ../settings/main.c:376 +#: ../settings/main.c:408 msgid "Trash" msgstr "Rusl" -#: ../settings/main.c:378 +#: ../settings/main.c:410 msgid "Removable Devices" msgstr "Útskiptanleg tæki" -#: ../settings/main.c:380 +#: ../settings/main.c:412 msgid "Network Shares" msgstr "Netsameignir" -#: ../settings/main.c:382 +#: ../settings/main.c:414 msgid "Disks and Drives" msgstr "Diskar og drif" -#: ../settings/main.c:384 -msgid "Other Items" -msgstr "Önnur atriði" +#: ../settings/main.c:416 +msgid "Other Devices" +msgstr "Önnur tæki" #. Display the file name, file type, and file size in the tooltip. -#: ../settings/main.c:497 +#: ../settings/main.c:529 #, c-format msgid "" "%s\n" @@ -57,97 +57,95 @@ "Size: %s" msgstr "%s\nTegund: %s\nStærð: %s" -#: ../settings/main.c:681 +#: ../settings/main.c:715 #, c-format msgid "Wallpaper for Monitor %d (%s)" msgstr "Bakgrunnsmynd fyrir skjá %d (%s)" -#: ../settings/main.c:684 +#: ../settings/main.c:718 #, c-format msgid "Wallpaper for Monitor %d" msgstr "Bakgrunnsmynd fyrir skjá %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 "Þú ert að nota fleiri en einn skjá, færðu þennan glugga á skjáinn sem þú vilt breyta stillingum fyrir." +#: ../settings/main.c:724 +msgid "Move this dialog to the display you want to edit the settings for." +msgstr "Færðu þennan glugga á vinnusvæðið sem þú vilt breyta stillingum fyrir." -#: ../settings/main.c:698 +#: ../settings/main.c:731 #, c-format msgid "Wallpaper for %s on Monitor %d (%s)" msgstr "Bakgrunnsmynd fyrir %s á skjá %d (%s)" -#: ../settings/main.c:702 +#: ../settings/main.c:735 #, c-format msgid "Wallpaper for %s on Monitor %d" msgstr "Bakgrunnsmynd fyrir %s á skjá %d" -#: ../settings/main.c:709 +#: ../settings/main.c:742 msgid "" -"You are using more than one display, move this dialog to the display and " -"workspace you want to edit the settings for." -msgstr "Þú ert að nota fleiri en einn skjá, færðu þennan glugga á skjáinn og vinnusvæðið sem þú vilt breyta stillingum fyrir." +"Move this dialog to the display and workspace you want to edit the settings " +"for." +msgstr "Færðu þennan glugga á skjáinn og vinnusvæðið sem þú vilt breyta stillingum fyrir." #. Single monitor and single workspace -#: ../settings/main.c:717 +#: ../settings/main.c:749 #, c-format msgid "Wallpaper for my desktop" msgstr "Bakgrunnsmynd fyrir skjáborðið mitt" #. Single monitor and per workspace wallpaper -#: ../settings/main.c:723 +#: ../settings/main.c:755 #, c-format msgid "Wallpaper for %s" msgstr "Bakgrunnsmynd fyrir %s" -#: ../settings/main.c:728 +#: ../settings/main.c:760 msgid "Move this dialog to the workspace you want to edit the settings for." msgstr "Færðu þennan glugga á vinnusvæðið sem þú vilt breyta stillingum fyrir." -#: ../settings/main.c:1131 +#: ../settings/main.c:1174 msgid "Image selection is unavailable while the image style is set to None." msgstr "Ekki er hægt að velja myndir á meðan myndastíll er ekki virkur." -#: ../settings/main.c:1483 +#: ../settings/main.c:1523 msgid "Spanning screens" msgstr "Samliggjandi skjáir" -#: ../settings/main.c:1788 +#: ../settings/main.c:1825 msgid "Image files" msgstr "Myndskrár" -#: ../settings/main.c:1945 +#: ../settings/main.c:2001 msgid "Settings manager socket" msgstr "Sökkull stillingastjórnunar" -#: ../settings/main.c:1945 +#: ../settings/main.c:2001 msgid "SOCKET ID" msgstr "AUÐKENNI SÖKKULS - ID" -#: ../settings/main.c:1946 +#: ../settings/main.c:2002 msgid "Version information" msgstr "Útgáfuupplýsingar" -#: ../settings/main.c:1973 +#: ../settings/main.c:2030 #, c-format msgid "Type '%s --help' for usage." msgstr "Skrifaðu '%s --help' til að sjá hvernig á að nota þetta." -#: ../settings/main.c:1985 +#: ../settings/main.c:2042 msgid "The Xfce development team. All rights reserved." msgstr "Xfce þróunarteymið. Allur réttur áskilinn." -#: ../settings/main.c:1986 +#: ../settings/main.c:2043 #, c-format msgid "Please report bugs to <%s>." msgstr "Tilkynntu villur til <%s>." -#: ../settings/main.c:1993 +#: ../settings/main.c:2050 msgid "Desktop Settings" msgstr "Skjáborðsstillingar" -#: ../settings/main.c:1995 +#: ../settings/main.c:2052 msgid "Unable to contact settings server" msgstr "Gat ekki tengt við stillingaþjón" @@ -180,16 +178,16 @@ msgstr "_Mappa:" #: ../settings/xfdesktop-settings-appearance-frame-ui.glade.h:6 -msgid "Choose the folder to select wallpapers from" -msgstr "Veldu möppu til að velja úr bakgrunna" +msgid "Choose the folder to select wallpapers from." +msgstr "Veldu möppu til að velja úr bakgrunnsmyndir." #: ../settings/xfdesktop-settings-appearance-frame-ui.glade.h:7 msgid "St_yle:" msgstr "S_tíll:" #: ../settings/xfdesktop-settings-appearance-frame-ui.glade.h:8 -msgid "Specify how the image will be resized to fit the screen" -msgstr "Veldu hvernig mynd verður endurkvörðuð til að passa á skjá" +msgid "Specify how the image will be resized to fit the screen." +msgstr "Veldu hvernig mynd verður endurkvörðuð til að passa á skjáinn." #: ../settings/xfdesktop-settings-appearance-frame-ui.glade.h:9 #: ../settings/xfdesktop-settings-ui.glade.h:4 @@ -225,20 +223,20 @@ msgstr "L_itur:" #: ../settings/xfdesktop-settings-appearance-frame-ui.glade.h:17 -msgid "Specify the style of the color drawn behind the backdrop image" -msgstr "Tilgreindu hvernig litur er teiknaður aftan við bakgrunnsmynd" +msgid "Specify the style of the color drawn behind the backdrop image." +msgstr "Tilgreindu hvernig litur er teiknaður aftan við bakgrunnsmynd." #: ../settings/xfdesktop-settings-appearance-frame-ui.glade.h:18 -msgid "Specifies the solid color, or the \"left\" or \"top\" color of the gradient" -msgstr "Tiltekur heillit eða \"vinstri\" eða \"efri\" lit í litstigli" +msgid "Specifies the solid color, or the \"left\" or \"top\" color of the gradient." +msgstr "Tiltekur heillit eða \"vinstri\" eða \"efri\" lit í litstigli." #: ../settings/xfdesktop-settings-appearance-frame-ui.glade.h:19 msgid "Select First Color" msgstr "Velja fyrsta lit" #: ../settings/xfdesktop-settings-appearance-frame-ui.glade.h:20 -msgid "Specifies the \"right\" or \"bottom\" color of the gradient" -msgstr "Tiltekur \"hægri\" eða \"neðri\" lit í litstigli" +msgid "Specifies the \"right\" or \"bottom\" color of the gradient." +msgstr "Tiltekur \"hægri\" eða \"neðri\" lit í litstigli." #: ../settings/xfdesktop-settings-appearance-frame-ui.glade.h:21 msgid "Select Second Color" @@ -258,8 +256,8 @@ msgstr "Velja sjálfvirkt mismunandi bakgrunna úr þessari möppu." #: ../settings/xfdesktop-settings-appearance-frame-ui.glade.h:25 -msgid "Specify how often the background will change" -msgstr "Tiltaka hve oft eigi að skipta um bakgrunn" +msgid "Specify how often the background will change." +msgstr "Tiltaka hve oft eigi að skipta um bakgrunn." #: ../settings/xfdesktop-settings-appearance-frame-ui.glade.h:26 msgid "in seconds:" @@ -335,7 +333,7 @@ msgid "File/launcher icons" msgstr "Skráa/ræsitáknmyndir" -#: ../settings/xfdesktop-settings-ui.glade.h:10 ../src/xfce-desktop.c:1010 +#: ../settings/xfdesktop-settings-ui.glade.h:10 ../src/xfce-desktop.c:1020 msgid "Desktop" msgstr "Skjáborð" @@ -514,250 +512,251 @@ msgid "_Remove Workspace '%s'" msgstr "Fja_rlægja við vinnusvæði '%s'" -#: ../src/xfdesktop-application.c:772 +#: ../src/xfdesktop-app-menu-item.c:349 +#: ../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:1132 ../src/xfdesktop-file-utils.c:1209 +#: ../src/xfdesktop-file-utils.c:1234 ../src/xfdesktop-file-utils.c:1286 +msgid "Launch Error" +msgstr "Villa í ræsingu" + +#: ../src/xfdesktop-app-menu-item.c:351 +#: ../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 "Tókst ekki að keyra \"exo-desktop-item-edit\", sem er forsenda þess að hægt sé að búa til og breyta ræsum og tenglum á skjáborði." + +#: ../src/xfdesktop-application.c:768 msgid "Display version information" msgstr "Birta útgáfuupplýsingar" -#: ../src/xfdesktop-application.c:773 +#: ../src/xfdesktop-application.c:769 msgid "Reload all settings" msgstr "Endurlesa allar stillingar" -#: ../src/xfdesktop-application.c:774 +#: ../src/xfdesktop-application.c:770 msgid "Pop up the menu (at the current mouse position)" msgstr "Láta valmynd spretta upp (við músarbendil)" -#: ../src/xfdesktop-application.c:775 +#: ../src/xfdesktop-application.c:771 msgid "Pop up the window list (at the current mouse position)" msgstr "Láta gluggalista spretta upp (við músarbendil)" -#: ../src/xfdesktop-application.c:777 +#: ../src/xfdesktop-application.c:773 msgid "Automatically arrange all the icons on the desktop" msgstr "Raða táknmyndum sjálfvirkt á skjáborðinu" -#: ../src/xfdesktop-application.c:779 +#: ../src/xfdesktop-application.c:775 msgid "Do not wait for a window manager on startup" msgstr "Ekki bíða eftir gluggastjóra við ræsingu" -#: ../src/xfdesktop-application.c:780 +#: ../src/xfdesktop-application.c:776 msgid "Cause xfdesktop to quit" msgstr "Láta xfdesktop hætta" -#: ../src/xfdesktop-application.c:795 +#: ../src/xfdesktop-application.c:791 #, c-format msgid "Failed to parse arguments: %s\n" msgstr "Mistókst að þátta viðföng: %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 "Þetta er %s útgáfa %s, keyrandi á 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 með GTK+ %d.%d.%d, tengt með GTK+ %d.%d.%d." -#: ../src/xfdesktop-application.c:812 +#: ../src/xfdesktop-application.c:808 #, c-format msgid "Build options:\n" msgstr "Byggingamöguleikar:\n" -#: ../src/xfdesktop-application.c:813 +#: ../src/xfdesktop-application.c:809 #, c-format msgid " Desktop Menu: %s\n" msgstr " Skjáborðsvalmynd: %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 "virkt" -#: ../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 "óvirkt" -#: ../src/xfdesktop-application.c:820 +#: ../src/xfdesktop-application.c:816 #, c-format msgid " Desktop Icons: %s\n" msgstr " Skjáborðstáknmyndir: %s\n" -#: ../src/xfdesktop-application.c:827 +#: ../src/xfdesktop-application.c:823 #, c-format msgid " Desktop File Icons: %s\n" msgstr " Táknmyndir skjáborðsskráa: %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 "Ekki var hægt að búa til skjáborðsmöppuna \"%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 "Villa í skjáborðsmöppu" -#: ../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 "Venjuleg skrá er nú þegar með þetta heiti. Eyddu henni eða breyttu heitinu á skránni." -#: ../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 "Villa við endurnefningu" -#: ../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 "Ekki var hægt að endurnefna skrárnar" -#: ../src/xfdesktop-file-icon-manager.c:687 +#: ../src/xfdesktop-file-icon-manager.c:631 msgid "None of the icons selected support being renamed." msgstr "Ekki mátti endurnefna neinar af völdu táknmyndunum." -#: ../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:921 +#: ../src/xfdesktop-file-utils.c:959 msgid "Trash Error" msgstr "Villa í rusli" -#: ../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 "Ekki var hægt að eyða völdum skrám" -#: ../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:864 +#: ../src/xfdesktop-file-utils.c:1005 ../src/xfdesktop-file-utils.c:1052 +#: ../src/xfdesktop-file-utils.c:1093 ../src/xfdesktop-file-utils.c:1134 +#: ../src/xfdesktop-file-utils.c:1236 ../src/xfdesktop-file-utils.c:1288 +#: ../src/xfdesktop-file-utils.c:1361 ../src/xfdesktop-file-utils.c:1439 msgid "" "This feature requires a file manager service to be present (such as the one " "supplied by Thunar)." msgstr "Þetta krefst þess að skráastjórnunarþjónusta sé virk (eins og sú sem Thunar býður upp á)." #. 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 "Ekki tókst að keyra \"%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 -msgid "Launch Error" -msgstr "Villa í ræsingu" - -#: ../src/xfdesktop-file-icon-manager.c:1064 +#: ../src/xfdesktop-file-icon-manager.c:1008 #, c-format msgid "_Open With \"%s\"" msgstr "_Opna með \"%s\"" -#: ../src/xfdesktop-file-icon-manager.c:1067 +#: ../src/xfdesktop-file-icon-manager.c:1011 #, c-format msgid "Open With \"%s\"" msgstr "Opna með \"%s\"" -#: ../src/xfdesktop-file-icon-manager.c:1142 -msgid "" -"Unable to launch \"exo-desktop-item-edit\", which is required to create and " -"edit launchers and links on the desktop." -msgstr "Tókst ekki að keyra \"exo-desktop-item-edit\", sem er forsenda þess að hægt sé að búa til og breyta ræsum og tenglum á skjáborði." - -#: ../src/xfdesktop-file-icon-manager.c:1393 +#: ../src/xfdesktop-file-icon-manager.c:1337 msgid "_Open all" msgstr "_Opna allt" -#: ../src/xfdesktop-file-icon-manager.c:1409 +#: ../src/xfdesktop-file-icon-manager.c:1353 msgid "_Open in New Window" msgstr "_Opna í nýjum glugga" -#: ../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 "_Opna" #. create launcher item -#: ../src/xfdesktop-file-icon-manager.c:1430 +#: ../src/xfdesktop-file-icon-manager.c:1374 msgid "Create _Launcher..." msgstr "Búa til _ræsi..." #. create link item -#: ../src/xfdesktop-file-icon-manager.c:1446 +#: ../src/xfdesktop-file-icon-manager.c:1390 msgid "Create _URL Link..." msgstr "Búa til _URL tengil (slóð)..." #. create folder item -#: ../src/xfdesktop-file-icon-manager.c:1462 +#: ../src/xfdesktop-file-icon-manager.c:1406 msgid "Create _Folder..." msgstr "Búa til _möppu..." -#: ../src/xfdesktop-file-icon-manager.c:1477 +#: ../src/xfdesktop-file-icon-manager.c:1421 msgid "Create From _Template" msgstr "Búa _til frá sniðmáti" -#: ../src/xfdesktop-file-icon-manager.c:1506 +#: ../src/xfdesktop-file-icon-manager.c:1450 msgid "_Empty File" msgstr "_Tóm skrá" -#: ../src/xfdesktop-file-icon-manager.c:1523 +#: ../src/xfdesktop-file-icon-manager.c:1467 msgid "_Execute" msgstr "_Keyra" -#: ../src/xfdesktop-file-icon-manager.c:1543 +#: ../src/xfdesktop-file-icon-manager.c:1487 msgid "_Edit Launcher" msgstr "Br_eyta ræsi" -#: ../src/xfdesktop-file-icon-manager.c:1578 +#: ../src/xfdesktop-file-icon-manager.c:1522 msgid "Open With" msgstr "Opna með" -#: ../src/xfdesktop-file-icon-manager.c:1604 +#: ../src/xfdesktop-file-icon-manager.c:1548 msgid "Open With Other _Application..." msgstr "Opn_a með öðru forriti..." #. Rename -#: ../src/xfdesktop-file-icon-manager.c:1704 +#: ../src/xfdesktop-file-icon-manager.c:1651 msgid "_Rename..." msgstr "Endu_rnefna..." -#: ../src/xfdesktop-file-icon-manager.c:1732 +#: ../src/xfdesktop-file-icon-manager.c:1679 msgid "Arrange Desktop _Icons" msgstr "_Raða táknmyndum á skjáborði" -#: ../src/xfdesktop-file-icon-manager.c:1743 +#: ../src/xfdesktop-file-icon-manager.c:1690 msgid "Desktop _Settings..." msgstr "_Skjáborðsstillingar..." -#: ../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 "E_iginlegikar..." -#: ../src/xfdesktop-file-icon-manager.c:2744 +#: ../src/xfdesktop-file-icon-manager.c:2642 msgid "Load Error" msgstr "Hleðsluvilla" -#: ../src/xfdesktop-file-icon-manager.c:2746 +#: ../src/xfdesktop-file-icon-manager.c:2644 msgid "Failed to load the desktop folder" msgstr "Mistókst að hlaða inn skjáborðsmöppunni" -#: ../src/xfdesktop-file-icon-manager.c:3286 +#: ../src/xfdesktop-file-icon-manager.c:3189 msgid "Copy _Here" msgstr "Afrita _hingað" -#: ../src/xfdesktop-file-icon-manager.c:3286 +#: ../src/xfdesktop-file-icon-manager.c:3189 msgid "_Move Here" msgstr "_Færa hingað" -#: ../src/xfdesktop-file-icon-manager.c:3286 +#: ../src/xfdesktop-file-icon-manager.c:3189 msgid "_Link Here" msgstr "_Tengja hingað" @@ -790,88 +789,88 @@ msgid "Unknown" msgstr "Óþekkt" -#: ../src/xfdesktop-file-utils.c:658 +#: ../src/xfdesktop-file-utils.c:665 msgid "The folder could not be opened" msgstr "Ekki var hægt að opna möppuna" -#: ../src/xfdesktop-file-utils.c:675 +#: ../src/xfdesktop-file-utils.c:682 msgid "Error" msgstr "Villa" -#: ../src/xfdesktop-file-utils.c:676 +#: ../src/xfdesktop-file-utils.c:683 msgid "The requested operation could not be completed" msgstr "Ekki tókst að ljúka þessarri aðgerð" -#: ../src/xfdesktop-file-utils.c:717 +#: ../src/xfdesktop-file-utils.c:724 msgid "The file could not be renamed" msgstr "Ekki var hægt að endurnefna skrána" -#: ../src/xfdesktop-file-utils.c:819 +#: ../src/xfdesktop-file-utils.c:862 msgid "Delete Error" msgstr "Villa við eyðingu" -#: ../src/xfdesktop-file-utils.c:820 +#: ../src/xfdesktop-file-utils.c:863 msgid "The selected files could not be deleted" msgstr "Ekki var hægt að eyða völdum skrám" -#: ../src/xfdesktop-file-utils.c:870 +#: ../src/xfdesktop-file-utils.c:922 msgid "The selected files could not be moved to the trash" msgstr "Ekki var hægt að setja valdar skrár í ruslið" -#: ../src/xfdesktop-file-utils.c:871 ../src/xfdesktop-file-utils.c:908 +#: ../src/xfdesktop-file-utils.c:923 ../src/xfdesktop-file-utils.c:961 msgid "" "This feature requires a trash service to be present (such as the one " "supplied by Thunar)." msgstr "Þetta krefst þess að ruslþjónusta sé virk (eins og sú sem Thunar býður upp á)." -#: ../src/xfdesktop-file-utils.c:907 +#: ../src/xfdesktop-file-utils.c:960 msgid "Could not empty the trash" msgstr "Ekki var hægt að tæma ruslakörfu" -#: ../src/xfdesktop-file-utils.c:950 +#: ../src/xfdesktop-file-utils.c:1003 msgid "Create File Error" msgstr "Villa við að búa til skrá" -#: ../src/xfdesktop-file-utils.c:951 +#: ../src/xfdesktop-file-utils.c:1004 msgid "Could not create a new file" msgstr "Ekki var hægt að búa til nýja skrá" -#: ../src/xfdesktop-file-utils.c:997 +#: ../src/xfdesktop-file-utils.c:1050 msgid "Create Document Error" msgstr "Villa við að búa til skjal" -#: ../src/xfdesktop-file-utils.c:998 +#: ../src/xfdesktop-file-utils.c:1051 msgid "Could not create a new document from the template" msgstr "Tókst ekki að búa til skjal út frá þessu sniðmáti" -#: ../src/xfdesktop-file-utils.c:1038 +#: ../src/xfdesktop-file-utils.c:1091 msgid "File Properties Error" msgstr "Villa í eiginleikum skráar" -#: ../src/xfdesktop-file-utils.c:1039 +#: ../src/xfdesktop-file-utils.c:1092 msgid "The file properties dialog could not be opened" msgstr "Glugginn með eiginleikum skráar opnaðist ekki" -#: ../src/xfdesktop-file-utils.c:1080 +#: ../src/xfdesktop-file-utils.c:1133 msgid "The file could not be opened" msgstr "Ekki var hægt að opna skrána" -#: ../src/xfdesktop-file-utils.c:1153 ../src/xfdesktop-file-utils.c:1178 +#: ../src/xfdesktop-file-utils.c:1206 ../src/xfdesktop-file-utils.c:1231 #, c-format msgid "Failed to run \"%s\"" msgstr "Mistókst að keyra \"%s\"" -#: ../src/xfdesktop-file-utils.c:1234 +#: ../src/xfdesktop-file-utils.c:1287 msgid "The application chooser could not be opened" msgstr "Ekki var hægt að opna forritaveljarann" -#: ../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:1345 ../src/xfdesktop-file-utils.c:1359 +#: ../src/xfdesktop-file-utils.c:1421 ../src/xfdesktop-file-utils.c:1437 msgid "Transfer Error" msgstr "Flutningsvilla" -#: ../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:1346 ../src/xfdesktop-file-utils.c:1360 +#: ../src/xfdesktop-file-utils.c:1422 ../src/xfdesktop-file-utils.c:1438 msgid "The file transfer could not be performed" msgstr "Ekki var hægt að framkvæma skráaflutning" @@ -925,7 +924,7 @@ msgid "Eject Finished" msgstr "Útspýtingu lokið" -#: ../src/xfdesktop-regular-file-icon.c:603 +#: ../src/xfdesktop-regular-file-icon.c:741 #, c-format msgid "" "Type: %s\n" @@ -995,15 +994,15 @@ msgid "Mount Failed" msgstr "Tenging mistókst" -#: ../src/xfdesktop-volume-icon.c:829 +#: ../src/xfdesktop-volume-icon.c:828 msgid "E_ject Volume" msgstr "S_pýta út gagnahirslu" -#: ../src/xfdesktop-volume-icon.c:836 +#: ../src/xfdesktop-volume-icon.c:835 msgid "_Unmount Volume" msgstr "_Aftengja gagnahirslu" -#: ../src/xfdesktop-volume-icon.c:843 +#: ../src/xfdesktop-volume-icon.c:842 msgid "_Mount Volume" msgstr "_Tengja gagnahirslu" diff -Nru xfdesktop4-4.11.6/po/it.po xfdesktop4-4.19.2/po/it.po --- xfdesktop4-4.11.6/po/it.po 2014-04-05 18:59:11.000000000 +0000 +++ xfdesktop4-4.19.2/po/it.po 2014-08-18 09:10:13.000000000 +0000 @@ -3,18 +3,18 @@ # This file is distributed under the same license as the PACKAGE package. # # Translators: -# mitakpa, 2013 -# cri , 2010,2013-2014 +# Alessandro B, 2013 +# Cristian Marchi , 2010,2013-2014 # Fabio Riga , 2007,2009 # Gianluca Foddis , 2009 msgid "" msgstr "" "Project-Id-Version: Xfdesktop\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2014-04-03 18:32+0200\n" -"PO-Revision-Date: 2014-04-04 20:21+0000\n" -"Last-Translator: cri \n" -"Language-Team: Italian (http://www.transifex.com/projects/p/xfce/language/it/)\n" +"POT-Creation-Date: 2014-08-03 12:32+0200\n" +"PO-Revision-Date: 2014-08-13 10:19+0000\n" +"Last-Translator: Cristian Marchi \n" +"Language-Team: Italian (http://www.transifex.com/projects/p/xfdesktop/language/it/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" @@ -44,7 +44,7 @@ #: ../settings/main.c:414 msgid "Disks and Drives" -msgstr "Dicshi e dispositivi" +msgstr "Dischi e dispositivi" #: ../settings/main.c:416 msgid "Other Devices" @@ -109,45 +109,45 @@ msgid "Image selection is unavailable while the image style is set to None." msgstr "La selezione dell'immagine è disabilitata quando lo stile dell'immagine è impostato a \"Nessuno\"" -#: ../settings/main.c:1523 +#: ../settings/main.c:1524 msgid "Spanning screens" msgstr "Schermi estesi" -#: ../settings/main.c:1825 +#: ../settings/main.c:1831 msgid "Image files" msgstr "File immagine" -#: ../settings/main.c:2001 +#: ../settings/main.c:2010 msgid "Settings manager socket" msgstr "Socket del gestore delle impostazioni" -#: ../settings/main.c:2001 +#: ../settings/main.c:2010 msgid "SOCKET ID" msgstr "ID SOCKET" -#: ../settings/main.c:2002 +#: ../settings/main.c:2011 msgid "Version information" msgstr "Informazioni di versione" -#: ../settings/main.c:2030 +#: ../settings/main.c:2039 #, c-format msgid "Type '%s --help' for usage." msgstr "Digitare \"%s --help\" per le informazioni d'uso" -#: ../settings/main.c:2042 +#: ../settings/main.c:2051 msgid "The Xfce development team. All rights reserved." msgstr "Il gruppo di sviluppo di Xfce. Tutti i diritti riservati." -#: ../settings/main.c:2043 +#: ../settings/main.c:2052 #, c-format msgid "Please report bugs to <%s>." msgstr "Segnalare i problemi a <%s>." -#: ../settings/main.c:2050 +#: ../settings/main.c:2059 msgid "Desktop Settings" msgstr "Impostazioni della scrivania" -#: ../settings/main.c:2052 +#: ../settings/main.c:2061 msgid "Unable to contact settings server" msgstr "Impossibile contattare il server delle impostazioni" @@ -156,7 +156,8 @@ msgstr "Scrivania" #: ../settings/xfce-backdrop-settings.desktop.in.h:2 -msgid "Set desktop background and menu and icon behaviour" +#: ../settings/xfdesktop-settings-ui.glade.h:11 +msgid "Set desktop background and menu and icon behavior" msgstr "Impostazione dello sfondo della scrivania, del menu e del comportamento delle icone" #: ../settings/xfdesktop-settings-appearance-frame-ui.glade.h:1 @@ -335,14 +336,10 @@ msgid "File/launcher icons" msgstr "Icone di file e avviatori" -#: ../settings/xfdesktop-settings-ui.glade.h:10 ../src/xfce-desktop.c:1020 +#: ../settings/xfdesktop-settings-ui.glade.h:10 ../src/xfce-desktop.c:1007 msgid "Desktop" msgstr "Scrivania" -#: ../settings/xfdesktop-settings-ui.glade.h:11 -msgid "Set desktop background and menu and icon behavior" -msgstr "Impostazione dello sfondo della scrivania, del menu e del comportamento delle icone" - #: ../settings/xfdesktop-settings-ui.glade.h:12 msgid "_Background" msgstr "S_fondo" @@ -434,26 +431,30 @@ msgstr "Sin_golo clic per attivare gli elementi" #: ../settings/xfdesktop-settings-ui.glade.h:34 +msgid "Show hidden files on the desktop" +msgstr "Mostra file nascosti sulla Scrivania" + +#: ../settings/xfdesktop-settings-ui.glade.h:35 msgid "Show icon tooltips. Size:" msgstr "Mostra i suggerimenti dell'icona. Dimensione:" -#: ../settings/xfdesktop-settings-ui.glade.h:35 +#: ../settings/xfdesktop-settings-ui.glade.h:36 msgid "Size of the tooltip preview image." msgstr "Dimensione del suggerimento dell'anteprima immagine" -#: ../settings/xfdesktop-settings-ui.glade.h:36 +#: ../settings/xfdesktop-settings-ui.glade.h:37 msgid "Use custom _font size:" msgstr "Usa una dimensione del c_arattere personalizzata:" -#: ../settings/xfdesktop-settings-ui.glade.h:37 +#: ../settings/xfdesktop-settings-ui.glade.h:38 msgid "Appearance" msgstr "Aspetto" -#: ../settings/xfdesktop-settings-ui.glade.h:38 +#: ../settings/xfdesktop-settings-ui.glade.h:39 msgid "Default Icons" msgstr "Icone predefinite" -#: ../settings/xfdesktop-settings-ui.glade.h:39 +#: ../settings/xfdesktop-settings-ui.glade.h:40 msgid "_Icons" msgstr "Ic_one" @@ -515,250 +516,267 @@ msgstr "_Rimuovi spazio di lavoro \"%s\"" #: ../src/xfdesktop-app-menu-item.c:349 -#: ../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:1132 ../src/xfdesktop-file-utils.c:1209 -#: ../src/xfdesktop-file-utils.c:1234 ../src/xfdesktop-file-utils.c:1286 +#: ../src/xfdesktop-file-icon-manager.c:860 +#: ../src/xfdesktop-file-icon-manager.c:1125 +#: ../src/xfdesktop-file-icon-manager.c:1321 ../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 "Errore di avvio" #: ../src/xfdesktop-app-menu-item.c:351 -#: ../src/xfdesktop-file-icon-manager.c:1086 +#: ../src/xfdesktop-file-icon-manager.c:1127 msgid "" "Unable to launch \"exo-desktop-item-edit\", which is required to create and " "edit launchers and links on the desktop." msgstr "Impossibile avviare \"exo-desktop-item-edit\", necessario per creare e modificare avviatori e collegamenti sulla scrivania." -#: ../src/xfdesktop-application.c:768 +#: ../src/xfdesktop-application.c:836 msgid "Display version information" msgstr "Mostra le informazioni di versione" -#: ../src/xfdesktop-application.c:769 +#: ../src/xfdesktop-application.c:837 msgid "Reload all settings" msgstr "Ricarica tutte le impostazioni" -#: ../src/xfdesktop-application.c:770 +#: ../src/xfdesktop-application.c:838 +msgid "Advance to the next wallpaper on the current workspace" +msgstr "Vai allo sfondo successivo nello spazio di lavoro corrente" + +#: ../src/xfdesktop-application.c:839 msgid "Pop up the menu (at the current mouse position)" msgstr "Fa comparire il menu (in corrispondenza della posizione del mouse)" -#: ../src/xfdesktop-application.c:771 +#: ../src/xfdesktop-application.c:840 msgid "Pop up the window list (at the current mouse position)" msgstr "Fa comparire la lista delle finestre (in corrispondenza della posizione del mouse)" -#: ../src/xfdesktop-application.c:773 +#: ../src/xfdesktop-application.c:842 msgid "Automatically arrange all the icons on the desktop" msgstr "Ordina automaticamente tutte le icone sulla scrivania" -#: ../src/xfdesktop-application.c:775 +#: ../src/xfdesktop-application.c:844 +msgid "Enable debug messages" +msgstr "Abilita i messaggi di debug" + +#: ../src/xfdesktop-application.c:845 +msgid "Disable debug messages" +msgstr "Disabilita i messaggi di debug" + +#: ../src/xfdesktop-application.c:846 msgid "Do not wait for a window manager on startup" msgstr "Non attendere un gestore delle finestre all'avvio" -#: ../src/xfdesktop-application.c:776 +#: ../src/xfdesktop-application.c:847 msgid "Cause xfdesktop to quit" msgstr "Termina l'esecuzione di xfdesktop" -#: ../src/xfdesktop-application.c:791 +#: ../src/xfdesktop-application.c:862 #, c-format msgid "Failed to parse arguments: %s\n" msgstr "Impossibile elaborare l'argomento: %s\n" -#: ../src/xfdesktop-application.c:802 +#: ../src/xfdesktop-application.c:873 #, c-format msgid "This is %s version %s, running on Xfce %s.\n" msgstr "%s versione %s, in esecuzione su Xfce %s.\n" -#: ../src/xfdesktop-application.c:804 +#: ../src/xfdesktop-application.c:875 #, c-format msgid "Built with GTK+ %d.%d.%d, linked with GTK+ %d.%d.%d." msgstr "Compilato con GTK+ %d.%d.%d, collegato con GTK+ %d.%d.%d." -#: ../src/xfdesktop-application.c:808 +#: ../src/xfdesktop-application.c:879 #, c-format msgid "Build options:\n" msgstr "Opzioni di compilazione:\n" -#: ../src/xfdesktop-application.c:809 +#: ../src/xfdesktop-application.c:880 #, c-format msgid " Desktop Menu: %s\n" msgstr "Menu della scrivania: %s\n" -#: ../src/xfdesktop-application.c:811 ../src/xfdesktop-application.c:818 -#: ../src/xfdesktop-application.c:825 +#: ../src/xfdesktop-application.c:882 ../src/xfdesktop-application.c:889 +#: ../src/xfdesktop-application.c:896 msgid "enabled" msgstr "abilitato" -#: ../src/xfdesktop-application.c:813 ../src/xfdesktop-application.c:820 -#: ../src/xfdesktop-application.c:827 +#: ../src/xfdesktop-application.c:884 ../src/xfdesktop-application.c:891 +#: ../src/xfdesktop-application.c:898 msgid "disabled" msgstr "disabilitato" -#: ../src/xfdesktop-application.c:816 +#: ../src/xfdesktop-application.c:887 #, c-format msgid " Desktop Icons: %s\n" msgstr "Icone della scrivania: %s\n" -#: ../src/xfdesktop-application.c:823 +#: ../src/xfdesktop-application.c:894 #, c-format msgid " Desktop File Icons: %s\n" msgstr "Icone dei file della scrivania: %s\n" -#: ../src/xfdesktop-file-icon-manager.c:522 -#: ../src/xfdesktop-file-icon-manager.c:539 +#: ../src/xfdesktop-file-icon-manager.c:559 +#: ../src/xfdesktop-file-icon-manager.c:576 #, c-format msgid "Could not create the desktop folder \"%s\"" msgstr "Impossibile creare la cartella Scrivania \"%s\"" -#: ../src/xfdesktop-file-icon-manager.c:527 -#: ../src/xfdesktop-file-icon-manager.c:544 +#: ../src/xfdesktop-file-icon-manager.c:564 +#: ../src/xfdesktop-file-icon-manager.c:581 msgid "Desktop Folder Error" msgstr "Errore cartella Scrivania" -#: ../src/xfdesktop-file-icon-manager.c:546 +#: ../src/xfdesktop-file-icon-manager.c:583 msgid "" "A normal file with the same name already exists. Please delete or rename it." msgstr "Esiste già un file normale con lo stesso nome. Cancellarlo o rinominarlo." -#: ../src/xfdesktop-file-icon-manager.c:629 ../src/xfdesktop-file-utils.c:723 +#: ../src/xfdesktop-file-icon-manager.c:666 ../src/xfdesktop-file-utils.c:723 #: ../src/xfdesktop-file-utils.c:776 msgid "Rename Error" msgstr "Errore di rinomina" -#: ../src/xfdesktop-file-icon-manager.c:630 ../src/xfdesktop-file-utils.c:777 +#: ../src/xfdesktop-file-icon-manager.c:667 ../src/xfdesktop-file-utils.c:777 msgid "The files could not be renamed" msgstr "Il file non può essere rinominato" -#: ../src/xfdesktop-file-icon-manager.c:631 +#: ../src/xfdesktop-file-icon-manager.c:668 msgid "None of the icons selected support being renamed." msgstr "Nessuna delle icone selezionate supporta la rinominazione" -#: ../src/xfdesktop-file-icon-manager.c:675 -#: ../src/xfdesktop-file-icon-manager.c:719 ../src/xfdesktop-file-utils.c:921 -#: ../src/xfdesktop-file-utils.c:959 +#: ../src/xfdesktop-file-icon-manager.c:712 +#: ../src/xfdesktop-file-icon-manager.c:756 ../src/xfdesktop-file-utils.c:876 +#: ../src/xfdesktop-file-utils.c:913 msgid "Trash Error" msgstr "Errore nel cestino" -#: ../src/xfdesktop-file-icon-manager.c:676 -#: ../src/xfdesktop-file-icon-manager.c:720 +#: ../src/xfdesktop-file-icon-manager.c:713 +#: ../src/xfdesktop-file-icon-manager.c:757 msgid "The selected files could not be trashed" msgstr "I file selezionati non possono essere cestinati" -#: ../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:864 -#: ../src/xfdesktop-file-utils.c:1005 ../src/xfdesktop-file-utils.c:1052 -#: ../src/xfdesktop-file-utils.c:1093 ../src/xfdesktop-file-utils.c:1134 -#: ../src/xfdesktop-file-utils.c:1236 ../src/xfdesktop-file-utils.c:1288 -#: ../src/xfdesktop-file-utils.c:1361 ../src/xfdesktop-file-utils.c:1439 +#: ../src/xfdesktop-file-icon-manager.c:714 +#: ../src/xfdesktop-file-icon-manager.c:758 ../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 "Questa funzionalità richiede la presenza di un servizio di gestione dei file (come ad esempio quello fornito da Thunar)." #. printf is to be translator-friendly -#: ../src/xfdesktop-file-icon-manager.c:821 -#: ../src/xfdesktop-file-icon-manager.c:1279 +#: ../src/xfdesktop-file-icon-manager.c:858 +#: ../src/xfdesktop-file-icon-manager.c:1320 #, c-format msgid "Unable to launch \"%s\":" msgstr "Impossibile avviare \"%s\":" -#: ../src/xfdesktop-file-icon-manager.c:1008 +#: ../src/xfdesktop-file-icon-manager.c:1049 #, c-format msgid "_Open With \"%s\"" msgstr "_Apri con \"%s\"" -#: ../src/xfdesktop-file-icon-manager.c:1011 +#: ../src/xfdesktop-file-icon-manager.c:1052 #, c-format msgid "Open With \"%s\"" msgstr "Apri con \"%s\"" -#: ../src/xfdesktop-file-icon-manager.c:1337 +#: ../src/xfdesktop-file-icon-manager.c:1378 msgid "_Open all" msgstr "_Apri tutti" -#: ../src/xfdesktop-file-icon-manager.c:1353 +#: ../src/xfdesktop-file-icon-manager.c:1394 msgid "_Open in New Window" msgstr "Apri in una nuova _finestra" -#: ../src/xfdesktop-file-icon-manager.c:1355 +#: ../src/xfdesktop-file-icon-manager.c:1396 #: ../src/xfdesktop-special-file-icon.c:547 ../src/xfdesktop-volume-icon.c:813 msgid "_Open" msgstr "_Apri" #. create launcher item -#: ../src/xfdesktop-file-icon-manager.c:1374 +#: ../src/xfdesktop-file-icon-manager.c:1415 msgid "Create _Launcher..." msgstr "Crea a_vviatore..." #. create link item -#: ../src/xfdesktop-file-icon-manager.c:1390 +#: ../src/xfdesktop-file-icon-manager.c:1431 msgid "Create _URL Link..." msgstr "Crea collegamento _URL..." #. create folder item -#: ../src/xfdesktop-file-icon-manager.c:1406 +#: ../src/xfdesktop-file-icon-manager.c:1447 msgid "Create _Folder..." msgstr "Crea carte_lla..." -#: ../src/xfdesktop-file-icon-manager.c:1421 +#: ../src/xfdesktop-file-icon-manager.c:1462 msgid "Create From _Template" msgstr "Crea da m_odello" -#: ../src/xfdesktop-file-icon-manager.c:1450 +#: ../src/xfdesktop-file-icon-manager.c:1491 msgid "_Empty File" msgstr "File _vuoto" -#: ../src/xfdesktop-file-icon-manager.c:1467 +#: ../src/xfdesktop-file-icon-manager.c:1508 msgid "_Execute" msgstr "_Esegui" -#: ../src/xfdesktop-file-icon-manager.c:1487 +#: ../src/xfdesktop-file-icon-manager.c:1528 msgid "_Edit Launcher" msgstr "_Modifica avviatore" -#: ../src/xfdesktop-file-icon-manager.c:1522 +#: ../src/xfdesktop-file-icon-manager.c:1563 msgid "Open With" msgstr "Apri con" -#: ../src/xfdesktop-file-icon-manager.c:1548 +#: ../src/xfdesktop-file-icon-manager.c:1589 msgid "Open With Other _Application..." msgstr "Apri con un'altra app_licazione..." +#. Trash +#: ../src/xfdesktop-file-icon-manager.c:1676 +msgid "Mo_ve to Trash" +msgstr "Sposta nel _cestino" + #. Rename -#: ../src/xfdesktop-file-icon-manager.c:1651 +#: ../src/xfdesktop-file-icon-manager.c:1707 msgid "_Rename..." msgstr "_Rinomina..." -#: ../src/xfdesktop-file-icon-manager.c:1679 +#: ../src/xfdesktop-file-icon-manager.c:1735 msgid "Arrange Desktop _Icons" msgstr "_Ordina le icone della scrivania" -#: ../src/xfdesktop-file-icon-manager.c:1690 +#: ../src/xfdesktop-file-icon-manager.c:1746 msgid "Desktop _Settings..." msgstr "Impostazioni della sc_rivania..." -#: ../src/xfdesktop-file-icon-manager.c:1701 +#: ../src/xfdesktop-file-icon-manager.c:1757 #: ../src/xfdesktop-volume-icon.c:855 msgid "P_roperties..." msgstr "_Proprietà..." -#: ../src/xfdesktop-file-icon-manager.c:2642 +#: ../src/xfdesktop-file-icon-manager.c:2699 msgid "Load Error" msgstr "Errore di caricamento" -#: ../src/xfdesktop-file-icon-manager.c:2644 +#: ../src/xfdesktop-file-icon-manager.c:2701 msgid "Failed to load the desktop folder" msgstr "Impossibile caricare la cartella della scrivania" -#: ../src/xfdesktop-file-icon-manager.c:3189 +#: ../src/xfdesktop-file-icon-manager.c:3242 msgid "Copy _Here" msgstr "Copia _qui" -#: ../src/xfdesktop-file-icon-manager.c:3189 +#: ../src/xfdesktop-file-icon-manager.c:3242 msgid "_Move Here" msgstr "_Sposta qui" -#: ../src/xfdesktop-file-icon-manager.c:3189 +#: ../src/xfdesktop-file-icon-manager.c:3242 msgid "_Link Here" msgstr "_Collega qui" @@ -807,72 +825,72 @@ msgid "The file could not be renamed" msgstr "Il file non può essere rinominato" -#: ../src/xfdesktop-file-utils.c:862 +#: ../src/xfdesktop-file-utils.c:826 msgid "Delete Error" msgstr "Errore nella rimozione" -#: ../src/xfdesktop-file-utils.c:863 +#: ../src/xfdesktop-file-utils.c:827 msgid "The selected files could not be deleted" msgstr "Il file selezionato non può essere rimosso" -#: ../src/xfdesktop-file-utils.c:922 +#: ../src/xfdesktop-file-utils.c:877 msgid "The selected files could not be moved to the trash" msgstr "Il file selezionato non può essere spostato nel cestino" -#: ../src/xfdesktop-file-utils.c:923 ../src/xfdesktop-file-utils.c:961 +#: ../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 "Questa funzionalità richiede la presenza di un servizio di gestione del cestino (come ad esempio quello fornito da Thunar)." -#: ../src/xfdesktop-file-utils.c:960 +#: ../src/xfdesktop-file-utils.c:914 msgid "Could not empty the trash" msgstr "Impossibile svuotare il cestino" -#: ../src/xfdesktop-file-utils.c:1003 +#: ../src/xfdesktop-file-utils.c:957 msgid "Create File Error" msgstr "Errore nella creazione del file" -#: ../src/xfdesktop-file-utils.c:1004 +#: ../src/xfdesktop-file-utils.c:958 msgid "Could not create a new file" msgstr "Impossibile creare un nuovo file" -#: ../src/xfdesktop-file-utils.c:1050 +#: ../src/xfdesktop-file-utils.c:1004 msgid "Create Document Error" msgstr "Errore nella creazione del documento" -#: ../src/xfdesktop-file-utils.c:1051 +#: ../src/xfdesktop-file-utils.c:1005 msgid "Could not create a new document from the template" msgstr "Impossibile creare un nuovo documento dal modello" -#: ../src/xfdesktop-file-utils.c:1091 +#: ../src/xfdesktop-file-utils.c:1045 msgid "File Properties Error" msgstr "Errore nelle proprietà del file" -#: ../src/xfdesktop-file-utils.c:1092 +#: ../src/xfdesktop-file-utils.c:1046 msgid "The file properties dialog could not be opened" msgstr "La finestra delle proprietà del file non può essere aperta" -#: ../src/xfdesktop-file-utils.c:1133 +#: ../src/xfdesktop-file-utils.c:1087 msgid "The file could not be opened" msgstr "Il file non può essere aperto" -#: ../src/xfdesktop-file-utils.c:1206 ../src/xfdesktop-file-utils.c:1231 +#: ../src/xfdesktop-file-utils.c:1160 ../src/xfdesktop-file-utils.c:1185 #, c-format msgid "Failed to run \"%s\"" msgstr "Impossibile avviare \"%s\"" -#: ../src/xfdesktop-file-utils.c:1287 +#: ../src/xfdesktop-file-utils.c:1241 msgid "The application chooser could not be opened" msgstr "Il selettore delle applicazioni non può essere aperto" -#: ../src/xfdesktop-file-utils.c:1345 ../src/xfdesktop-file-utils.c:1359 -#: ../src/xfdesktop-file-utils.c:1421 ../src/xfdesktop-file-utils.c:1437 +#: ../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 "Errore di trasferimento" -#: ../src/xfdesktop-file-utils.c:1346 ../src/xfdesktop-file-utils.c:1360 -#: ../src/xfdesktop-file-utils.c:1422 ../src/xfdesktop-file-utils.c:1438 +#: ../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 "Il trasferimento dei file non è riuscito" @@ -926,7 +944,7 @@ msgid "Eject Finished" msgstr "Espulsione conclusa" -#: ../src/xfdesktop-regular-file-icon.c:741 +#: ../src/xfdesktop-regular-file-icon.c:748 #, c-format msgid "" "Type: %s\n" diff -Nru xfdesktop4-4.11.6/po/ja.po xfdesktop4-4.19.2/po/ja.po --- xfdesktop4-4.11.6/po/ja.po 2014-04-05 18:59:11.000000000 +0000 +++ xfdesktop4-4.19.2/po/ja.po 2014-08-18 09:10:13.000000000 +0000 @@ -4,15 +4,16 @@ # # Translators: # Nobuhiro Iwamatsu , 2008 +# Yuko Iwamatsu , 2008 # Zhao Ji , 2003 msgid "" msgstr "" "Project-Id-Version: Xfdesktop\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2014-04-03 18:32+0200\n" -"PO-Revision-Date: 2014-04-05 06:56+0000\n" +"POT-Creation-Date: 2014-08-03 12:32+0200\n" +"PO-Revision-Date: 2014-08-11 15:16+0000\n" "Last-Translator: Masato HASHIMOTO \n" -"Language-Team: Japanese (http://www.transifex.com/projects/p/xfce/language/ja/)\n" +"Language-Team: Japanese (http://www.transifex.com/projects/p/xfdesktop/language/ja/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" @@ -107,45 +108,45 @@ msgid "Image selection is unavailable while the image style is set to None." msgstr "画像のスタイルが「なし」の時、壁紙は無効になります。" -#: ../settings/main.c:1523 +#: ../settings/main.c:1524 msgid "Spanning screens" msgstr "複数画面にまたがって表示する" -#: ../settings/main.c:1825 +#: ../settings/main.c:1831 msgid "Image files" msgstr "画像ファイル" -#: ../settings/main.c:2001 +#: ../settings/main.c:2010 msgid "Settings manager socket" msgstr "設定マネージャーソケット" -#: ../settings/main.c:2001 +#: ../settings/main.c:2010 msgid "SOCKET ID" msgstr "SOCKET ID" -#: ../settings/main.c:2002 +#: ../settings/main.c:2011 msgid "Version information" msgstr "バージョン情報" -#: ../settings/main.c:2030 +#: ../settings/main.c:2039 #, c-format msgid "Type '%s --help' for usage." msgstr "'%s --help' で使用方法が表示されます。" -#: ../settings/main.c:2042 +#: ../settings/main.c:2051 msgid "The Xfce development team. All rights reserved." msgstr "The Xfce development team. All rights reserved." -#: ../settings/main.c:2043 +#: ../settings/main.c:2052 #, c-format msgid "Please report bugs to <%s>." msgstr "バグの報告は <%s> までおねがいします。" -#: ../settings/main.c:2050 +#: ../settings/main.c:2059 msgid "Desktop Settings" msgstr "デスクトップ設定" -#: ../settings/main.c:2052 +#: ../settings/main.c:2061 msgid "Unable to contact settings server" msgstr "設定サーバーに接続できません" @@ -154,7 +155,8 @@ msgstr "デスクトップ " #: ../settings/xfce-backdrop-settings.desktop.in.h:2 -msgid "Set desktop background and menu and icon behaviour" +#: ../settings/xfdesktop-settings-ui.glade.h:11 +msgid "Set desktop background and menu and icon behavior" msgstr "デスクトップの背景およびメニューとアイコンの振る舞いを設定します" #: ../settings/xfdesktop-settings-appearance-frame-ui.glade.h:1 @@ -333,14 +335,10 @@ msgid "File/launcher icons" msgstr "ファイル/ランチャーアイコン" -#: ../settings/xfdesktop-settings-ui.glade.h:10 ../src/xfce-desktop.c:1020 +#: ../settings/xfdesktop-settings-ui.glade.h:10 ../src/xfce-desktop.c:1007 msgid "Desktop" msgstr "デスクトップ" -#: ../settings/xfdesktop-settings-ui.glade.h:11 -msgid "Set desktop background and menu and icon behavior" -msgstr "デスクトップの背景およびメニューとアイコンの振る舞いを設定します" - #: ../settings/xfdesktop-settings-ui.glade.h:12 msgid "_Background" msgstr "背景(_B)" @@ -432,26 +430,30 @@ msgstr "シングルクリックでアイテムをアクティベートする(_C)" #: ../settings/xfdesktop-settings-ui.glade.h:34 +msgid "Show hidden files on the desktop" +msgstr "デスクトップに隠しファイルを表示する" + +#: ../settings/xfdesktop-settings-ui.glade.h:35 msgid "Show icon tooltips. Size:" msgstr "アイコンのツールチップを表示する サイズ:" -#: ../settings/xfdesktop-settings-ui.glade.h:35 +#: ../settings/xfdesktop-settings-ui.glade.h:36 msgid "Size of the tooltip preview image." msgstr "ツールチップのプレビュー画像のサイズを指定します。" -#: ../settings/xfdesktop-settings-ui.glade.h:36 +#: ../settings/xfdesktop-settings-ui.glade.h:37 msgid "Use custom _font size:" msgstr "指定フォントサイズを使用する(_F):" -#: ../settings/xfdesktop-settings-ui.glade.h:37 +#: ../settings/xfdesktop-settings-ui.glade.h:38 msgid "Appearance" msgstr "外観" -#: ../settings/xfdesktop-settings-ui.glade.h:38 +#: ../settings/xfdesktop-settings-ui.glade.h:39 msgid "Default Icons" msgstr "デフォルトアイコン" -#: ../settings/xfdesktop-settings-ui.glade.h:39 +#: ../settings/xfdesktop-settings-ui.glade.h:40 msgid "_Icons" msgstr "アイコン(_I)" @@ -513,250 +515,267 @@ msgstr "ワークスペース '%s' を削除(_R)" #: ../src/xfdesktop-app-menu-item.c:349 -#: ../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:1132 ../src/xfdesktop-file-utils.c:1209 -#: ../src/xfdesktop-file-utils.c:1234 ../src/xfdesktop-file-utils.c:1286 +#: ../src/xfdesktop-file-icon-manager.c:860 +#: ../src/xfdesktop-file-icon-manager.c:1125 +#: ../src/xfdesktop-file-icon-manager.c:1321 ../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 "実行エラー" #: ../src/xfdesktop-app-menu-item.c:351 -#: ../src/xfdesktop-file-icon-manager.c:1086 +#: ../src/xfdesktop-file-icon-manager.c:1127 msgid "" "Unable to launch \"exo-desktop-item-edit\", which is required to create and " "edit launchers and links on the desktop." msgstr "\"exo-desktop-item-edit\" を実行できません。これはデスクトップにランチャーやリンクを作成したり編集したりするために必要です。" -#: ../src/xfdesktop-application.c:768 +#: ../src/xfdesktop-application.c:836 msgid "Display version information" msgstr "バージョン情報を表示する" -#: ../src/xfdesktop-application.c:769 +#: ../src/xfdesktop-application.c:837 msgid "Reload all settings" msgstr "すべての設定を再読込みする" -#: ../src/xfdesktop-application.c:770 +#: ../src/xfdesktop-application.c:838 +msgid "Advance to the next wallpaper on the current workspace" +msgstr "現在の壁紙から次の壁紙へ進む" + +#: ../src/xfdesktop-application.c:839 msgid "Pop up the menu (at the current mouse position)" msgstr "現在のマウス位置でメニューをポップアップする" -#: ../src/xfdesktop-application.c:771 +#: ../src/xfdesktop-application.c:840 msgid "Pop up the window list (at the current mouse position)" msgstr "現在のマウス位置でウィンドウリストをポップアップする" -#: ../src/xfdesktop-application.c:773 +#: ../src/xfdesktop-application.c:842 msgid "Automatically arrange all the icons on the desktop" msgstr "デスクトップにあるすべてのアイコンを自動整列する" -#: ../src/xfdesktop-application.c:775 +#: ../src/xfdesktop-application.c:844 +msgid "Enable debug messages" +msgstr "デバッグメッセージを有効にする" + +#: ../src/xfdesktop-application.c:845 +msgid "Disable debug messages" +msgstr "デバッグメッセージを無効にする" + +#: ../src/xfdesktop-application.c:846 msgid "Do not wait for a window manager on startup" msgstr "起動時にウィンドウマネージャーを待たない" -#: ../src/xfdesktop-application.c:776 +#: ../src/xfdesktop-application.c:847 msgid "Cause xfdesktop to quit" msgstr "xfdesktop を終了させる" -#: ../src/xfdesktop-application.c:791 +#: ../src/xfdesktop-application.c:862 #, c-format msgid "Failed to parse arguments: %s\n" msgstr "引数の解析に失敗しました: %s\n" -#: ../src/xfdesktop-application.c:802 +#: ../src/xfdesktop-application.c:873 #, c-format msgid "This is %s version %s, running on Xfce %s.\n" msgstr "%s バージョン %s, Xfce %s で実行されています。\n" -#: ../src/xfdesktop-application.c:804 +#: ../src/xfdesktop-application.c:875 #, c-format msgid "Built with GTK+ %d.%d.%d, linked with GTK+ %d.%d.%d." msgstr "Gtk+ %d.%d.%d でビルド、Gtk+ %d.%d.%d で実行しています。" -#: ../src/xfdesktop-application.c:808 +#: ../src/xfdesktop-application.c:879 #, c-format msgid "Build options:\n" msgstr "ビルドオプション:\n" -#: ../src/xfdesktop-application.c:809 +#: ../src/xfdesktop-application.c:880 #, c-format msgid " Desktop Menu: %s\n" msgstr " メニュー: %s\n" -#: ../src/xfdesktop-application.c:811 ../src/xfdesktop-application.c:818 -#: ../src/xfdesktop-application.c:825 +#: ../src/xfdesktop-application.c:882 ../src/xfdesktop-application.c:889 +#: ../src/xfdesktop-application.c:896 msgid "enabled" msgstr "有効" -#: ../src/xfdesktop-application.c:813 ../src/xfdesktop-application.c:820 -#: ../src/xfdesktop-application.c:827 +#: ../src/xfdesktop-application.c:884 ../src/xfdesktop-application.c:891 +#: ../src/xfdesktop-application.c:898 msgid "disabled" msgstr "無効" -#: ../src/xfdesktop-application.c:816 +#: ../src/xfdesktop-application.c:887 #, c-format msgid " Desktop Icons: %s\n" msgstr " アイコン: %s\n" -#: ../src/xfdesktop-application.c:823 +#: ../src/xfdesktop-application.c:894 #, c-format msgid " Desktop File Icons: %s\n" msgstr " ファイルアイコン: %s\n" -#: ../src/xfdesktop-file-icon-manager.c:522 -#: ../src/xfdesktop-file-icon-manager.c:539 +#: ../src/xfdesktop-file-icon-manager.c:559 +#: ../src/xfdesktop-file-icon-manager.c:576 #, c-format msgid "Could not create the desktop folder \"%s\"" msgstr "デスクトップフォルダー \"%s\" を作成できませんでした" -#: ../src/xfdesktop-file-icon-manager.c:527 -#: ../src/xfdesktop-file-icon-manager.c:544 +#: ../src/xfdesktop-file-icon-manager.c:564 +#: ../src/xfdesktop-file-icon-manager.c:581 msgid "Desktop Folder Error" msgstr "デスクトップフォルダーエラー" -#: ../src/xfdesktop-file-icon-manager.c:546 +#: ../src/xfdesktop-file-icon-manager.c:583 msgid "" "A normal file with the same name already exists. Please delete or rename it." msgstr "同じ名前の通常ファイルがすでに存在します。そちらを削除または変名してください。" -#: ../src/xfdesktop-file-icon-manager.c:629 ../src/xfdesktop-file-utils.c:723 +#: ../src/xfdesktop-file-icon-manager.c:666 ../src/xfdesktop-file-utils.c:723 #: ../src/xfdesktop-file-utils.c:776 msgid "Rename Error" msgstr "名前の変更エラー" -#: ../src/xfdesktop-file-icon-manager.c:630 ../src/xfdesktop-file-utils.c:777 +#: ../src/xfdesktop-file-icon-manager.c:667 ../src/xfdesktop-file-utils.c:777 msgid "The files could not be renamed" msgstr "ファイルの名前を変更できませんでした" -#: ../src/xfdesktop-file-icon-manager.c:631 +#: ../src/xfdesktop-file-icon-manager.c:668 msgid "None of the icons selected support being renamed." msgstr "名前の変更がサポートされているアイコンが選択されていません。" -#: ../src/xfdesktop-file-icon-manager.c:675 -#: ../src/xfdesktop-file-icon-manager.c:719 ../src/xfdesktop-file-utils.c:921 -#: ../src/xfdesktop-file-utils.c:959 +#: ../src/xfdesktop-file-icon-manager.c:712 +#: ../src/xfdesktop-file-icon-manager.c:756 ../src/xfdesktop-file-utils.c:876 +#: ../src/xfdesktop-file-utils.c:913 msgid "Trash Error" msgstr "ゴミ箱エラー" -#: ../src/xfdesktop-file-icon-manager.c:676 -#: ../src/xfdesktop-file-icon-manager.c:720 +#: ../src/xfdesktop-file-icon-manager.c:713 +#: ../src/xfdesktop-file-icon-manager.c:757 msgid "The selected files could not be trashed" msgstr "選択したファイルをゴミ箱に捨てることができませんでした" -#: ../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:864 -#: ../src/xfdesktop-file-utils.c:1005 ../src/xfdesktop-file-utils.c:1052 -#: ../src/xfdesktop-file-utils.c:1093 ../src/xfdesktop-file-utils.c:1134 -#: ../src/xfdesktop-file-utils.c:1236 ../src/xfdesktop-file-utils.c:1288 -#: ../src/xfdesktop-file-utils.c:1361 ../src/xfdesktop-file-utils.c:1439 +#: ../src/xfdesktop-file-icon-manager.c:714 +#: ../src/xfdesktop-file-icon-manager.c:758 ../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 "この機能には (Thunar が提供するような) ファイルマネージャーサービスが必要です。" #. printf is to be translator-friendly -#: ../src/xfdesktop-file-icon-manager.c:821 -#: ../src/xfdesktop-file-icon-manager.c:1279 +#: ../src/xfdesktop-file-icon-manager.c:858 +#: ../src/xfdesktop-file-icon-manager.c:1320 #, c-format msgid "Unable to launch \"%s\":" msgstr "\"%s\" を実行できません:" -#: ../src/xfdesktop-file-icon-manager.c:1008 +#: ../src/xfdesktop-file-icon-manager.c:1049 #, c-format msgid "_Open With \"%s\"" msgstr "%s で開く(_O)" -#: ../src/xfdesktop-file-icon-manager.c:1011 +#: ../src/xfdesktop-file-icon-manager.c:1052 #, c-format msgid "Open With \"%s\"" msgstr "%s で開く" -#: ../src/xfdesktop-file-icon-manager.c:1337 +#: ../src/xfdesktop-file-icon-manager.c:1378 msgid "_Open all" msgstr "すべて開く(_O)" -#: ../src/xfdesktop-file-icon-manager.c:1353 +#: ../src/xfdesktop-file-icon-manager.c:1394 msgid "_Open in New Window" msgstr "新しいウィンドウで開く(_O)" -#: ../src/xfdesktop-file-icon-manager.c:1355 +#: ../src/xfdesktop-file-icon-manager.c:1396 #: ../src/xfdesktop-special-file-icon.c:547 ../src/xfdesktop-volume-icon.c:813 msgid "_Open" msgstr "開く(_O)" #. create launcher item -#: ../src/xfdesktop-file-icon-manager.c:1374 +#: ../src/xfdesktop-file-icon-manager.c:1415 msgid "Create _Launcher..." msgstr "ランチャーの作成(_L)..." #. create link item -#: ../src/xfdesktop-file-icon-manager.c:1390 +#: ../src/xfdesktop-file-icon-manager.c:1431 msgid "Create _URL Link..." msgstr "URL リンクの作成(_U)..." #. create folder item -#: ../src/xfdesktop-file-icon-manager.c:1406 +#: ../src/xfdesktop-file-icon-manager.c:1447 msgid "Create _Folder..." msgstr "フォルダーの作成(_F)..." -#: ../src/xfdesktop-file-icon-manager.c:1421 +#: ../src/xfdesktop-file-icon-manager.c:1462 msgid "Create From _Template" msgstr "テンプレートから作成(_T)" -#: ../src/xfdesktop-file-icon-manager.c:1450 +#: ../src/xfdesktop-file-icon-manager.c:1491 msgid "_Empty File" msgstr "空のファイル(_E)" -#: ../src/xfdesktop-file-icon-manager.c:1467 +#: ../src/xfdesktop-file-icon-manager.c:1508 msgid "_Execute" msgstr "実行(_E)" -#: ../src/xfdesktop-file-icon-manager.c:1487 +#: ../src/xfdesktop-file-icon-manager.c:1528 msgid "_Edit Launcher" msgstr "ランチャーの編集(_E)" -#: ../src/xfdesktop-file-icon-manager.c:1522 +#: ../src/xfdesktop-file-icon-manager.c:1563 msgid "Open With" msgstr "アプリケーションで開く" -#: ../src/xfdesktop-file-icon-manager.c:1548 +#: ../src/xfdesktop-file-icon-manager.c:1589 msgid "Open With Other _Application..." msgstr "他のアプリケーションで開く(_A)..." +#. Trash +#: ../src/xfdesktop-file-icon-manager.c:1676 +msgid "Mo_ve to Trash" +msgstr "ゴミ箱に捨てる(_V)" + #. Rename -#: ../src/xfdesktop-file-icon-manager.c:1651 +#: ../src/xfdesktop-file-icon-manager.c:1707 msgid "_Rename..." msgstr "名前の変更(_R)..." -#: ../src/xfdesktop-file-icon-manager.c:1679 +#: ../src/xfdesktop-file-icon-manager.c:1735 msgid "Arrange Desktop _Icons" msgstr "デスクトップアイコンの整列(_I)" -#: ../src/xfdesktop-file-icon-manager.c:1690 +#: ../src/xfdesktop-file-icon-manager.c:1746 msgid "Desktop _Settings..." msgstr "デスクトップの設定(_S)..." -#: ../src/xfdesktop-file-icon-manager.c:1701 +#: ../src/xfdesktop-file-icon-manager.c:1757 #: ../src/xfdesktop-volume-icon.c:855 msgid "P_roperties..." msgstr "プロパティ(_R)..." -#: ../src/xfdesktop-file-icon-manager.c:2642 +#: ../src/xfdesktop-file-icon-manager.c:2699 msgid "Load Error" msgstr "読み込みエラー" -#: ../src/xfdesktop-file-icon-manager.c:2644 +#: ../src/xfdesktop-file-icon-manager.c:2701 msgid "Failed to load the desktop folder" msgstr "デスクトップフォルダーの読み込みに失敗しました" -#: ../src/xfdesktop-file-icon-manager.c:3189 +#: ../src/xfdesktop-file-icon-manager.c:3242 msgid "Copy _Here" msgstr "ここにコピー(_H)" -#: ../src/xfdesktop-file-icon-manager.c:3189 +#: ../src/xfdesktop-file-icon-manager.c:3242 msgid "_Move Here" msgstr "ここに移動(_M)" -#: ../src/xfdesktop-file-icon-manager.c:3189 +#: ../src/xfdesktop-file-icon-manager.c:3242 msgid "_Link Here" msgstr "ここにリンクを作成(_L)" @@ -805,72 +824,72 @@ msgid "The file could not be renamed" msgstr "ファイルの名前を変更できませんでした" -#: ../src/xfdesktop-file-utils.c:862 +#: ../src/xfdesktop-file-utils.c:826 msgid "Delete Error" msgstr "削除エラー" -#: ../src/xfdesktop-file-utils.c:863 +#: ../src/xfdesktop-file-utils.c:827 msgid "The selected files could not be deleted" msgstr "選択したファイルを削除できませんでした" -#: ../src/xfdesktop-file-utils.c:922 +#: ../src/xfdesktop-file-utils.c:877 msgid "The selected files could not be moved to the trash" msgstr "選択したファイルをゴミ箱へ移動できませんでした" -#: ../src/xfdesktop-file-utils.c:923 ../src/xfdesktop-file-utils.c:961 +#: ../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 "この機能には (Thunar が提供するような) ゴミ箱サービスが必要です。" -#: ../src/xfdesktop-file-utils.c:960 +#: ../src/xfdesktop-file-utils.c:914 msgid "Could not empty the trash" msgstr "ゴミ箱を空にできませんでした" -#: ../src/xfdesktop-file-utils.c:1003 +#: ../src/xfdesktop-file-utils.c:957 msgid "Create File Error" msgstr "ファイル作成エラー" -#: ../src/xfdesktop-file-utils.c:1004 +#: ../src/xfdesktop-file-utils.c:958 msgid "Could not create a new file" msgstr "新しいファイルを作成できませんでした" -#: ../src/xfdesktop-file-utils.c:1050 +#: ../src/xfdesktop-file-utils.c:1004 msgid "Create Document Error" msgstr "ドキュメント作成エラー" -#: ../src/xfdesktop-file-utils.c:1051 +#: ../src/xfdesktop-file-utils.c:1005 msgid "Could not create a new document from the template" msgstr "テンプレートから新しいドキュメントを作成できませんでした" -#: ../src/xfdesktop-file-utils.c:1091 +#: ../src/xfdesktop-file-utils.c:1045 msgid "File Properties Error" msgstr "ファイルプロパティエラー" -#: ../src/xfdesktop-file-utils.c:1092 +#: ../src/xfdesktop-file-utils.c:1046 msgid "The file properties dialog could not be opened" msgstr "ファイルのプロパティダイアログを開けませんでした。" -#: ../src/xfdesktop-file-utils.c:1133 +#: ../src/xfdesktop-file-utils.c:1087 msgid "The file could not be opened" msgstr "ファイルを開けませんでした。" -#: ../src/xfdesktop-file-utils.c:1206 ../src/xfdesktop-file-utils.c:1231 +#: ../src/xfdesktop-file-utils.c:1160 ../src/xfdesktop-file-utils.c:1185 #, c-format msgid "Failed to run \"%s\"" msgstr "\"%s\" の実行に失敗しました" -#: ../src/xfdesktop-file-utils.c:1287 +#: ../src/xfdesktop-file-utils.c:1241 msgid "The application chooser could not be opened" msgstr "アプリケーション選択ウィンドウを開けませんでした" -#: ../src/xfdesktop-file-utils.c:1345 ../src/xfdesktop-file-utils.c:1359 -#: ../src/xfdesktop-file-utils.c:1421 ../src/xfdesktop-file-utils.c:1437 +#: ../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 "転送エラー" -#: ../src/xfdesktop-file-utils.c:1346 ../src/xfdesktop-file-utils.c:1360 -#: ../src/xfdesktop-file-utils.c:1422 ../src/xfdesktop-file-utils.c:1438 +#: ../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 "ファイル転送を実行できませんでした" @@ -924,7 +943,7 @@ msgid "Eject Finished" msgstr "取り出しが完了しました" -#: ../src/xfdesktop-regular-file-icon.c:741 +#: ../src/xfdesktop-regular-file-icon.c:748 #, c-format msgid "" "Type: %s\n" diff -Nru xfdesktop4-4.11.6/po/kk.po xfdesktop4-4.19.2/po/kk.po --- xfdesktop4-4.11.6/po/kk.po 2014-04-05 18:59:11.000000000 +0000 +++ xfdesktop4-4.19.2/po/kk.po 2014-08-26 16:54:57.000000000 +0000 @@ -8,10 +8,10 @@ msgstr "" "Project-Id-Version: Xfdesktop\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2014-04-03 18:32+0200\n" -"PO-Revision-Date: 2014-04-04 11:10+0000\n" +"POT-Creation-Date: 2014-08-03 12:32+0200\n" +"PO-Revision-Date: 2014-08-22 02:34+0000\n" "Last-Translator: Baurzhan Muftakhidinov \n" -"Language-Team: Kazakh (http://www.transifex.com/projects/p/xfce/language/kk/)\n" +"Language-Team: Kazakh (http://www.transifex.com/projects/p/xfdesktop/language/kk/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" @@ -106,45 +106,45 @@ msgid "Image selection is unavailable while the image style is set to None." msgstr "Сурет стилі ешнәрсе болып тұрған кезінде суретті таңдау мүмкін емес." -#: ../settings/main.c:1523 +#: ../settings/main.c:1524 msgid "Spanning screens" msgstr "Біріккен экрандар" -#: ../settings/main.c:1825 +#: ../settings/main.c:1831 msgid "Image files" msgstr "Сурет файлдары" -#: ../settings/main.c:2001 +#: ../settings/main.c:2010 msgid "Settings manager socket" msgstr "Баптаулар басқарушысының сокеті" -#: ../settings/main.c:2001 +#: ../settings/main.c:2010 msgid "SOCKET ID" msgstr "SOCKET ID" -#: ../settings/main.c:2002 +#: ../settings/main.c:2011 msgid "Version information" msgstr "Нұсқа ақпараты" -#: ../settings/main.c:2030 +#: ../settings/main.c:2039 #, c-format msgid "Type '%s --help' for usage." msgstr "Көмек үшін '%s --help' енгізіңіз." -#: ../settings/main.c:2042 +#: ../settings/main.c:2051 msgid "The Xfce development team. All rights reserved." msgstr "Xfce өндіру тобы. Барлық құқықтары қорғалған." -#: ../settings/main.c:2043 +#: ../settings/main.c:2052 #, c-format msgid "Please report bugs to <%s>." msgstr "Ақаулықтар жөнінде хабарласыңыз: <%s>." -#: ../settings/main.c:2050 +#: ../settings/main.c:2059 msgid "Desktop Settings" msgstr "Жұмыс үстел баптаулары" -#: ../settings/main.c:2052 +#: ../settings/main.c:2061 msgid "Unable to contact settings server" msgstr "Баптаулар қызметімен байланыс орнату мүмкін емес" @@ -153,7 +153,8 @@ msgstr "Жұмыс үстелі" #: ../settings/xfce-backdrop-settings.desktop.in.h:2 -msgid "Set desktop background and menu and icon behaviour" +#: ../settings/xfdesktop-settings-ui.glade.h:11 +msgid "Set desktop background and menu and icon behavior" msgstr "Жұмыс үстел суреті, мәзір мен таңбашалардың әрекеттерін баптау" #: ../settings/xfdesktop-settings-appearance-frame-ui.glade.h:1 @@ -332,14 +333,10 @@ msgid "File/launcher icons" msgstr "Файл/жөнелткіштер таңбашалары" -#: ../settings/xfdesktop-settings-ui.glade.h:10 ../src/xfce-desktop.c:1020 +#: ../settings/xfdesktop-settings-ui.glade.h:10 ../src/xfce-desktop.c:1007 msgid "Desktop" msgstr "Жұмыс үстелі" -#: ../settings/xfdesktop-settings-ui.glade.h:11 -msgid "Set desktop background and menu and icon behavior" -msgstr "Жұмыс үстел суреті, мәзір мен таңбашалардың әрекеттерін баптау" - #: ../settings/xfdesktop-settings-ui.glade.h:12 msgid "_Background" msgstr "_Фон" @@ -431,26 +428,30 @@ msgstr "Бірлік _шертумен белсендіру" #: ../settings/xfdesktop-settings-ui.glade.h:34 +msgid "Show hidden files on the desktop" +msgstr "Жұмыс үстелде жасырын файлдарды көрсету" + +#: ../settings/xfdesktop-settings-ui.glade.h:35 msgid "Show icon tooltips. Size:" msgstr "Таңбашаның қалқымалы көмегін көрсету. Өлшемі:" -#: ../settings/xfdesktop-settings-ui.glade.h:35 +#: ../settings/xfdesktop-settings-ui.glade.h:36 msgid "Size of the tooltip preview image." msgstr "Қалқымалы көмектің кіші сурет көрінісінің өлшемі." -#: ../settings/xfdesktop-settings-ui.glade.h:36 +#: ../settings/xfdesktop-settings-ui.glade.h:37 msgid "Use custom _font size:" msgstr "Басқа қарі_п өлшемін қолдану:" -#: ../settings/xfdesktop-settings-ui.glade.h:37 +#: ../settings/xfdesktop-settings-ui.glade.h:38 msgid "Appearance" msgstr "Сыртқы түрі" -#: ../settings/xfdesktop-settings-ui.glade.h:38 +#: ../settings/xfdesktop-settings-ui.glade.h:39 msgid "Default Icons" msgstr "Бастапқы таңбашалар" -#: ../settings/xfdesktop-settings-ui.glade.h:39 +#: ../settings/xfdesktop-settings-ui.glade.h:40 msgid "_Icons" msgstr "_Таңбашалар" @@ -512,250 +513,267 @@ msgstr "'%s' жұ_мыс орнын өшіру" #: ../src/xfdesktop-app-menu-item.c:349 -#: ../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:1132 ../src/xfdesktop-file-utils.c:1209 -#: ../src/xfdesktop-file-utils.c:1234 ../src/xfdesktop-file-utils.c:1286 +#: ../src/xfdesktop-file-icon-manager.c:860 +#: ../src/xfdesktop-file-icon-manager.c:1125 +#: ../src/xfdesktop-file-icon-manager.c:1321 ../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 "Жөнелту қатесі" #: ../src/xfdesktop-app-menu-item.c:351 -#: ../src/xfdesktop-file-icon-manager.c:1086 +#: ../src/xfdesktop-file-icon-manager.c:1127 msgid "" "Unable to launch \"exo-desktop-item-edit\", which is required to create and " "edit launchers and links on the desktop." msgstr "\"exo-desktop-item-edit\" жөнелту қатесі, ол жұмыс үстелінде жөнелткіштерді мен сілтемелерді жасау үшін керек." -#: ../src/xfdesktop-application.c:768 +#: ../src/xfdesktop-application.c:836 msgid "Display version information" msgstr "Нұсқа ақпаратын көрсету" -#: ../src/xfdesktop-application.c:769 +#: ../src/xfdesktop-application.c:837 msgid "Reload all settings" msgstr "Баптауларды қайта жүктеу" -#: ../src/xfdesktop-application.c:770 +#: ../src/xfdesktop-application.c:838 +msgid "Advance to the next wallpaper on the current workspace" +msgstr "Ағымдағы жұмыс ортасында келесі түсқағазға өту" + +#: ../src/xfdesktop-application.c:839 msgid "Pop up the menu (at the current mouse position)" msgstr "Мәзірді көрсету (тышқанның ағымдағы орнында)" -#: ../src/xfdesktop-application.c:771 +#: ../src/xfdesktop-application.c:840 msgid "Pop up the window list (at the current mouse position)" msgstr "Терезелер тізімін шығару (тышқанның ағымдағы орнында)" -#: ../src/xfdesktop-application.c:773 +#: ../src/xfdesktop-application.c:842 msgid "Automatically arrange all the icons on the desktop" msgstr "Жұмыс үстеліндегі барлық таңбашаларды автореттеу" -#: ../src/xfdesktop-application.c:775 +#: ../src/xfdesktop-application.c:844 +msgid "Enable debug messages" +msgstr "Жөндеуді хабарламаларын іске қосу" + +#: ../src/xfdesktop-application.c:845 +msgid "Disable debug messages" +msgstr "Жөндеуді хабарламаларын сөндіру" + +#: ../src/xfdesktop-application.c:846 msgid "Do not wait for a window manager on startup" msgstr "Іске қосылғанда, терезелер басқарушысын күтпеу" -#: ../src/xfdesktop-application.c:776 +#: ../src/xfdesktop-application.c:847 msgid "Cause xfdesktop to quit" msgstr "Xfdesktop жұмысын аяқтау" -#: ../src/xfdesktop-application.c:791 +#: ../src/xfdesktop-application.c:862 #, c-format msgid "Failed to parse arguments: %s\n" msgstr "Аргументтерді өндеу қатемен аяқталды: %s\n" -#: ../src/xfdesktop-application.c:802 +#: ../src/xfdesktop-application.c:873 #, c-format msgid "This is %s version %s, running on Xfce %s.\n" msgstr "Бұл %s, нұсқасы %s, Xfce %s қосылған.\n" -#: ../src/xfdesktop-application.c:804 +#: ../src/xfdesktop-application.c:875 #, c-format msgid "Built with GTK+ %d.%d.%d, linked with GTK+ %d.%d.%d." msgstr "Жиналған GTK+ %d.%d.%d нұсқасымен, байланысқан GTK+ %d.%d.%d." -#: ../src/xfdesktop-application.c:808 +#: ../src/xfdesktop-application.c:879 #, c-format msgid "Build options:\n" msgstr "Жинау опциялары:\n" -#: ../src/xfdesktop-application.c:809 +#: ../src/xfdesktop-application.c:880 #, c-format msgid " Desktop Menu: %s\n" msgstr " Жұмыс үстел мәзірі: %s\n" -#: ../src/xfdesktop-application.c:811 ../src/xfdesktop-application.c:818 -#: ../src/xfdesktop-application.c:825 +#: ../src/xfdesktop-application.c:882 ../src/xfdesktop-application.c:889 +#: ../src/xfdesktop-application.c:896 msgid "enabled" msgstr "қосулы" -#: ../src/xfdesktop-application.c:813 ../src/xfdesktop-application.c:820 -#: ../src/xfdesktop-application.c:827 +#: ../src/xfdesktop-application.c:884 ../src/xfdesktop-application.c:891 +#: ../src/xfdesktop-application.c:898 msgid "disabled" msgstr "сөндірулі" -#: ../src/xfdesktop-application.c:816 +#: ../src/xfdesktop-application.c:887 #, c-format msgid " Desktop Icons: %s\n" msgstr " Жұмыс үстел таңбашалары: %s\n" -#: ../src/xfdesktop-application.c:823 +#: ../src/xfdesktop-application.c:894 #, c-format msgid " Desktop File Icons: %s\n" msgstr " Жұмыс үстел файл таңбашалары: %s\n" -#: ../src/xfdesktop-file-icon-manager.c:522 -#: ../src/xfdesktop-file-icon-manager.c:539 +#: ../src/xfdesktop-file-icon-manager.c:559 +#: ../src/xfdesktop-file-icon-manager.c:576 #, c-format msgid "Could not create the desktop folder \"%s\"" msgstr "\"%s\" жұмыс үстел бумасын жасау мүмкін емес" -#: ../src/xfdesktop-file-icon-manager.c:527 -#: ../src/xfdesktop-file-icon-manager.c:544 +#: ../src/xfdesktop-file-icon-manager.c:564 +#: ../src/xfdesktop-file-icon-manager.c:581 msgid "Desktop Folder Error" msgstr "Жұмыс үстел бумасының қатесі" -#: ../src/xfdesktop-file-icon-manager.c:546 +#: ../src/xfdesktop-file-icon-manager.c:583 msgid "" "A normal file with the same name already exists. Please delete or rename it." msgstr "Ондай атауы бар файл бар болып тұр. Алдымен оны өшіріңіз не атын өзгертіңіз." -#: ../src/xfdesktop-file-icon-manager.c:629 ../src/xfdesktop-file-utils.c:723 +#: ../src/xfdesktop-file-icon-manager.c:666 ../src/xfdesktop-file-utils.c:723 #: ../src/xfdesktop-file-utils.c:776 msgid "Rename Error" msgstr "Атын ауыстыру қатесі" -#: ../src/xfdesktop-file-icon-manager.c:630 ../src/xfdesktop-file-utils.c:777 +#: ../src/xfdesktop-file-icon-manager.c:667 ../src/xfdesktop-file-utils.c:777 msgid "The files could not be renamed" msgstr "Файлдар аттарын ауыстыру мүмкін емес" -#: ../src/xfdesktop-file-icon-manager.c:631 +#: ../src/xfdesktop-file-icon-manager.c:668 msgid "None of the icons selected support being renamed." msgstr "Таңдалған таңбашалардың ешбірі де атын ауыстыруды қолдамайды." -#: ../src/xfdesktop-file-icon-manager.c:675 -#: ../src/xfdesktop-file-icon-manager.c:719 ../src/xfdesktop-file-utils.c:921 -#: ../src/xfdesktop-file-utils.c:959 +#: ../src/xfdesktop-file-icon-manager.c:712 +#: ../src/xfdesktop-file-icon-manager.c:756 ../src/xfdesktop-file-utils.c:876 +#: ../src/xfdesktop-file-utils.c:913 msgid "Trash Error" msgstr "Қоқыс шелек қатесі" -#: ../src/xfdesktop-file-icon-manager.c:676 -#: ../src/xfdesktop-file-icon-manager.c:720 +#: ../src/xfdesktop-file-icon-manager.c:713 +#: ../src/xfdesktop-file-icon-manager.c:757 msgid "The selected files could not be trashed" msgstr "Ерекшеленген файлдарды қоқыс шелегіне тастау мүмкін емес" -#: ../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:864 -#: ../src/xfdesktop-file-utils.c:1005 ../src/xfdesktop-file-utils.c:1052 -#: ../src/xfdesktop-file-utils.c:1093 ../src/xfdesktop-file-utils.c:1134 -#: ../src/xfdesktop-file-utils.c:1236 ../src/xfdesktop-file-utils.c:1288 -#: ../src/xfdesktop-file-utils.c:1361 ../src/xfdesktop-file-utils.c:1439 +#: ../src/xfdesktop-file-icon-manager.c:714 +#: ../src/xfdesktop-file-icon-manager.c:758 ../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 "Бұл мүмкіндік бар болып тұрған файлдар басқарушы қызметін талап етеді (Thunar ұсынатын қызмет сияқты)." #. printf is to be translator-friendly -#: ../src/xfdesktop-file-icon-manager.c:821 -#: ../src/xfdesktop-file-icon-manager.c:1279 +#: ../src/xfdesktop-file-icon-manager.c:858 +#: ../src/xfdesktop-file-icon-manager.c:1320 #, c-format msgid "Unable to launch \"%s\":" msgstr "\"%s\" жөнелту қатесі:" -#: ../src/xfdesktop-file-icon-manager.c:1008 +#: ../src/xfdesktop-file-icon-manager.c:1049 #, c-format msgid "_Open With \"%s\"" msgstr "\"%s\" _көмегімен ашу" -#: ../src/xfdesktop-file-icon-manager.c:1011 +#: ../src/xfdesktop-file-icon-manager.c:1052 #, c-format msgid "Open With \"%s\"" msgstr "\"%s\" көмегімен ашу" -#: ../src/xfdesktop-file-icon-manager.c:1337 +#: ../src/xfdesktop-file-icon-manager.c:1378 msgid "_Open all" msgstr "Б_арлығын ашу" -#: ../src/xfdesktop-file-icon-manager.c:1353 +#: ../src/xfdesktop-file-icon-manager.c:1394 msgid "_Open in New Window" msgstr "_Жаңа терезеде ашу" -#: ../src/xfdesktop-file-icon-manager.c:1355 +#: ../src/xfdesktop-file-icon-manager.c:1396 #: ../src/xfdesktop-special-file-icon.c:547 ../src/xfdesktop-volume-icon.c:813 msgid "_Open" msgstr "А_шу" #. create launcher item -#: ../src/xfdesktop-file-icon-manager.c:1374 +#: ../src/xfdesktop-file-icon-manager.c:1415 msgid "Create _Launcher..." msgstr "Жөне_лткішті жасау..." #. create link item -#: ../src/xfdesktop-file-icon-manager.c:1390 +#: ../src/xfdesktop-file-icon-manager.c:1431 msgid "Create _URL Link..." msgstr "URL сіл_темесін жасау..." #. create folder item -#: ../src/xfdesktop-file-icon-manager.c:1406 +#: ../src/xfdesktop-file-icon-manager.c:1447 msgid "Create _Folder..." msgstr "_Буманы жасау..." -#: ../src/xfdesktop-file-icon-manager.c:1421 +#: ../src/xfdesktop-file-icon-manager.c:1462 msgid "Create From _Template" msgstr "Үл_гіден жасау" -#: ../src/xfdesktop-file-icon-manager.c:1450 +#: ../src/xfdesktop-file-icon-manager.c:1491 msgid "_Empty File" msgstr "Б_ос файл" -#: ../src/xfdesktop-file-icon-manager.c:1467 +#: ../src/xfdesktop-file-icon-manager.c:1508 msgid "_Execute" msgstr "О_рындау" -#: ../src/xfdesktop-file-icon-manager.c:1487 +#: ../src/xfdesktop-file-icon-manager.c:1528 msgid "_Edit Launcher" msgstr "Жөн_елткішті түзету" -#: ../src/xfdesktop-file-icon-manager.c:1522 +#: ../src/xfdesktop-file-icon-manager.c:1563 msgid "Open With" msgstr "Көмегімен ашу" -#: ../src/xfdesktop-file-icon-manager.c:1548 +#: ../src/xfdesktop-file-icon-manager.c:1589 msgid "Open With Other _Application..." msgstr "Б_асқа қолданба көмегімен ашу..." +#. Trash +#: ../src/xfdesktop-file-icon-manager.c:1676 +msgid "Mo_ve to Trash" +msgstr "Қ_оқыс шелегіне тастау" + #. Rename -#: ../src/xfdesktop-file-icon-manager.c:1651 +#: ../src/xfdesktop-file-icon-manager.c:1707 msgid "_Rename..." msgstr "Атын ау_ыстыру..." -#: ../src/xfdesktop-file-icon-manager.c:1679 +#: ../src/xfdesktop-file-icon-manager.c:1735 msgid "Arrange Desktop _Icons" msgstr "Жұ_мыс үстел таңбашаларын реттеу" -#: ../src/xfdesktop-file-icon-manager.c:1690 +#: ../src/xfdesktop-file-icon-manager.c:1746 msgid "Desktop _Settings..." msgstr "Жұмыс ү_стелінің баптаулары..." -#: ../src/xfdesktop-file-icon-manager.c:1701 +#: ../src/xfdesktop-file-icon-manager.c:1757 #: ../src/xfdesktop-volume-icon.c:855 msgid "P_roperties..." msgstr "Қас_иеттері..." -#: ../src/xfdesktop-file-icon-manager.c:2642 +#: ../src/xfdesktop-file-icon-manager.c:2699 msgid "Load Error" msgstr "Жүктеу қатесі" -#: ../src/xfdesktop-file-icon-manager.c:2644 +#: ../src/xfdesktop-file-icon-manager.c:2701 msgid "Failed to load the desktop folder" msgstr "Жұмыс үстел бумасын жүктеу сәтсіз" -#: ../src/xfdesktop-file-icon-manager.c:3189 +#: ../src/xfdesktop-file-icon-manager.c:3242 msgid "Copy _Here" msgstr "Ос_ында көшіру" -#: ../src/xfdesktop-file-icon-manager.c:3189 +#: ../src/xfdesktop-file-icon-manager.c:3242 msgid "_Move Here" msgstr "Осында жы_лжыту" -#: ../src/xfdesktop-file-icon-manager.c:3189 +#: ../src/xfdesktop-file-icon-manager.c:3242 msgid "_Link Here" msgstr "Осында _сілтеме жасау" @@ -804,72 +822,72 @@ msgid "The file could not be renamed" msgstr "Файл атын ауыстыру мүмкін емес" -#: ../src/xfdesktop-file-utils.c:862 +#: ../src/xfdesktop-file-utils.c:826 msgid "Delete Error" msgstr "Өшіру қатесі" -#: ../src/xfdesktop-file-utils.c:863 +#: ../src/xfdesktop-file-utils.c:827 msgid "The selected files could not be deleted" msgstr "Таңдалған файлдарды өшіру мүмкін емес" -#: ../src/xfdesktop-file-utils.c:922 +#: ../src/xfdesktop-file-utils.c:877 msgid "The selected files could not be moved to the trash" msgstr "Таңдалған файлдарды қоқыс шелегіне тастау мүмкін емес" -#: ../src/xfdesktop-file-utils.c:923 ../src/xfdesktop-file-utils.c:961 +#: ../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 "Бұл мүмкіндік бар болып тұрған қоқыс шелегі қызметін талап етеді (Thunar ұсынатын қызмет сияқты)." -#: ../src/xfdesktop-file-utils.c:960 +#: ../src/xfdesktop-file-utils.c:914 msgid "Could not empty the trash" msgstr "Қоқыс шелегін тазарту мүмкін емес" -#: ../src/xfdesktop-file-utils.c:1003 +#: ../src/xfdesktop-file-utils.c:957 msgid "Create File Error" msgstr "Файлды жасау қатесі" -#: ../src/xfdesktop-file-utils.c:1004 +#: ../src/xfdesktop-file-utils.c:958 msgid "Could not create a new file" msgstr "Жаңа файлды жасау мүмкін емес" -#: ../src/xfdesktop-file-utils.c:1050 +#: ../src/xfdesktop-file-utils.c:1004 msgid "Create Document Error" msgstr "Құжатты жасау қатесі" -#: ../src/xfdesktop-file-utils.c:1051 +#: ../src/xfdesktop-file-utils.c:1005 msgid "Could not create a new document from the template" msgstr "Үлгіден жаңа құжатты жасау мүмкін емес" -#: ../src/xfdesktop-file-utils.c:1091 +#: ../src/xfdesktop-file-utils.c:1045 msgid "File Properties Error" msgstr "Файл қасиеттер қатесі" -#: ../src/xfdesktop-file-utils.c:1092 +#: ../src/xfdesktop-file-utils.c:1046 msgid "The file properties dialog could not be opened" msgstr "Файл қасиеттері сұхбатын ашу мүмкін емес" -#: ../src/xfdesktop-file-utils.c:1133 +#: ../src/xfdesktop-file-utils.c:1087 msgid "The file could not be opened" msgstr "Файлды ашу мүмкін емес" -#: ../src/xfdesktop-file-utils.c:1206 ../src/xfdesktop-file-utils.c:1231 +#: ../src/xfdesktop-file-utils.c:1160 ../src/xfdesktop-file-utils.c:1185 #, c-format msgid "Failed to run \"%s\"" msgstr "\"%s\" жөнелту сәтсіз" -#: ../src/xfdesktop-file-utils.c:1287 +#: ../src/xfdesktop-file-utils.c:1241 msgid "The application chooser could not be opened" msgstr "Қолданбаларды таңдаушысын ашу мүмкін емес" -#: ../src/xfdesktop-file-utils.c:1345 ../src/xfdesktop-file-utils.c:1359 -#: ../src/xfdesktop-file-utils.c:1421 ../src/xfdesktop-file-utils.c:1437 +#: ../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 "Алмасу қатесі" -#: ../src/xfdesktop-file-utils.c:1346 ../src/xfdesktop-file-utils.c:1360 -#: ../src/xfdesktop-file-utils.c:1422 ../src/xfdesktop-file-utils.c:1438 +#: ../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 "Файлдар алмасу үрдісін орындау мүмкін емес" @@ -923,7 +941,7 @@ msgid "Eject Finished" msgstr "Шығару аяқталды" -#: ../src/xfdesktop-regular-file-icon.c:741 +#: ../src/xfdesktop-regular-file-icon.c:748 #, c-format msgid "" "Type: %s\n" diff -Nru xfdesktop4-4.11.6/po/ko.po xfdesktop4-4.19.2/po/ko.po --- xfdesktop4-4.11.6/po/ko.po 2014-02-26 06:58:29.000000000 +0000 +++ xfdesktop4-4.19.2/po/ko.po 2014-08-26 16:54:57.000000000 +0000 @@ -3,56 +3,56 @@ # This file is distributed under the same license as the PACKAGE package. # # Translators: -# kentarch , 2013 +# Alan Lee , 2013 # ByungHyun Choi , 2005 -# Darkcircle , 2013 -# Darkcircle , 2013-2014 -# ujuc Gang , 2013 +# Seong-ho Cho , 2013 +# Seong-ho Cho , 2013-2014 +# Sungjin Kang , 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-24 21:24+0000\n" -"Last-Translator: Darkcircle \n" -"Language-Team: Korean (http://www.transifex.com/projects/p/xfce/language/ko/)\n" +"POT-Creation-Date: 2014-08-03 12:32+0200\n" +"PO-Revision-Date: 2014-08-24 09:40+0000\n" +"Last-Translator: Seong-ho Cho \n" +"Language-Team: Korean (http://www.transifex.com/projects/p/xfdesktop/language/ko/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Language: ko\n" "Plural-Forms: nplurals=1; plural=0;\n" -#: ../settings/main.c:375 ../src/xfdesktop-special-file-icon.c:295 +#: ../settings/main.c:404 ../src/xfdesktop-special-file-icon.c:295 #: ../src/xfdesktop-special-file-icon.c:479 msgid "Home" -msgstr "홈" +msgstr "내 폴더" -#: ../settings/main.c:377 +#: ../settings/main.c:406 msgid "Filesystem" msgstr "파일 시스템" -#: ../settings/main.c:379 +#: ../settings/main.c:408 msgid "Trash" msgstr "휴지통" -#: ../settings/main.c:381 +#: ../settings/main.c:410 msgid "Removable Devices" msgstr "이동식 장치" -#: ../settings/main.c:383 +#: ../settings/main.c:412 msgid "Network Shares" msgstr "네트워크 공유" -#: ../settings/main.c:385 +#: ../settings/main.c:414 msgid "Disks and Drives" msgstr "디스크와 드라이브" -#: ../settings/main.c:387 +#: ../settings/main.c:416 msgid "Other Devices" msgstr "기타 장치" #. Display the file name, file type, and file size in the tooltip. -#: ../settings/main.c:500 +#: ../settings/main.c:529 #, c-format msgid "" "%s\n" @@ -60,95 +60,95 @@ "Size: %s" msgstr "%s\n형식: %s\n크기: %s" -#: ../settings/main.c:686 +#: ../settings/main.c:715 #, c-format msgid "Wallpaper for Monitor %d (%s)" msgstr "%d번 모니터 바탕 화면 (%s)" -#: ../settings/main.c:689 +#: ../settings/main.c:718 #, c-format msgid "Wallpaper for Monitor %d" msgstr "%d번 모니터 바탕 화면" -#: ../settings/main.c:695 +#: ../settings/main.c:724 msgid "Move this dialog to the display you want to edit the settings for." msgstr "설정을 편집하려는 화면으로 이 대화상자를 이동하십시오." -#: ../settings/main.c:702 +#: ../settings/main.c:731 #, c-format msgid "Wallpaper for %s on Monitor %d (%s)" msgstr "화면 %2$d의 %1$s에 대한 배경 화면 (%3$s)" -#: ../settings/main.c:706 +#: ../settings/main.c:735 #, c-format msgid "Wallpaper for %s on Monitor %d" msgstr "모니터 %2$d의 %1$s에 대한 배경 화면" -#: ../settings/main.c:713 +#: ../settings/main.c:742 msgid "" "Move this dialog to the display and workspace you want to edit the settings " "for." msgstr "설정을 편집하려는 화면과 작업 공간으로 이 대화 상자를 이동하십시오." #. Single monitor and single workspace -#: ../settings/main.c:720 +#: ../settings/main.c:749 #, c-format msgid "Wallpaper for my desktop" msgstr "내 데스크톱 바탕 화면" #. Single monitor and per workspace wallpaper -#: ../settings/main.c:726 +#: ../settings/main.c:755 #, c-format msgid "Wallpaper for %s" msgstr "%s 바탕 화면" -#: ../settings/main.c:731 +#: ../settings/main.c:760 msgid "Move this dialog to the workspace you want to edit the settings for." msgstr "설정을 편집하려는 작업 공간으로 이 대화상자를 이동하십시오." -#: ../settings/main.c:1134 +#: ../settings/main.c:1174 msgid "Image selection is unavailable while the image style is set to None." msgstr "그림 방식을 없음으로 설정하였기 때문에 그림 선택을 사용할 수 없습니다." -#: ../settings/main.c:1481 +#: ../settings/main.c:1524 msgid "Spanning screens" msgstr "모니터 확장" -#: ../settings/main.c:1786 +#: ../settings/main.c:1831 msgid "Image files" msgstr "그림 파일" -#: ../settings/main.c:1958 +#: ../settings/main.c:2010 msgid "Settings manager socket" msgstr "관리자 소켓 설정" -#: ../settings/main.c:1958 +#: ../settings/main.c:2010 msgid "SOCKET ID" -msgstr "SOCKET ID" +msgstr "소켓 ID" -#: ../settings/main.c:1959 +#: ../settings/main.c:2011 msgid "Version information" msgstr "버전 정보" -#: ../settings/main.c:1986 +#: ../settings/main.c:2039 #, c-format msgid "Type '%s --help' for usage." msgstr "사용법을 보려면 '%s --help'를 입력합니다." -#: ../settings/main.c:1998 +#: ../settings/main.c:2051 msgid "The Xfce development team. All rights reserved." msgstr "Xfce 개발 팀. All rights reserved." -#: ../settings/main.c:1999 +#: ../settings/main.c:2052 #, c-format msgid "Please report bugs to <%s>." msgstr "<%s>(으)로 버그를 알려주십시오." -#: ../settings/main.c:2006 +#: ../settings/main.c:2059 msgid "Desktop Settings" msgstr "작업 공간 설정" -#: ../settings/main.c:2008 +#: ../settings/main.c:2061 msgid "Unable to contact settings server" msgstr "설정 서버에 연결할 수 없습니다." @@ -157,7 +157,8 @@ msgstr "데스크톱" #: ../settings/xfce-backdrop-settings.desktop.in.h:2 -msgid "Set desktop background and menu and icon behaviour" +#: ../settings/xfdesktop-settings-ui.glade.h:11 +msgid "Set desktop background and menu and icon behavior" msgstr "데스크톱 배경, 메뉴, 아이콘 동작을 설정합니다" #: ../settings/xfdesktop-settings-appearance-frame-ui.glade.h:1 @@ -336,14 +337,10 @@ msgid "File/launcher icons" msgstr "파일/실행 아이콘" -#: ../settings/xfdesktop-settings-ui.glade.h:10 ../src/xfce-desktop.c:1015 +#: ../settings/xfdesktop-settings-ui.glade.h:10 ../src/xfce-desktop.c:1007 msgid "Desktop" msgstr "데스크톱" -#: ../settings/xfdesktop-settings-ui.glade.h:11 -msgid "Set desktop background and menu and icon behavior" -msgstr "데스크톱 배경, 메뉴, 아이콘 동작을 설정합니다" - #: ../settings/xfdesktop-settings-ui.glade.h:12 msgid "_Background" msgstr "배경(_B)" @@ -435,26 +432,30 @@ msgstr "한 번 눌러서 항목 활성화(_C)" #: ../settings/xfdesktop-settings-ui.glade.h:34 +msgid "Show hidden files on the desktop" +msgstr "데스크톱 숨김 파일 표시" + +#: ../settings/xfdesktop-settings-ui.glade.h:35 msgid "Show icon tooltips. Size:" msgstr "아이콘 풍선 도움말을 보여줍니다. 크기:" -#: ../settings/xfdesktop-settings-ui.glade.h:35 +#: ../settings/xfdesktop-settings-ui.glade.h:36 msgid "Size of the tooltip preview image." msgstr "풍선 도움말 미리보기 그림의 크기입니다." -#: ../settings/xfdesktop-settings-ui.glade.h:36 +#: ../settings/xfdesktop-settings-ui.glade.h:37 msgid "Use custom _font size:" msgstr "사용자 정의 글꼴 크기 사용(_F):" -#: ../settings/xfdesktop-settings-ui.glade.h:37 +#: ../settings/xfdesktop-settings-ui.glade.h:38 msgid "Appearance" msgstr "모양새" -#: ../settings/xfdesktop-settings-ui.glade.h:38 +#: ../settings/xfdesktop-settings-ui.glade.h:39 msgid "Default Icons" msgstr "기본 아이콘" -#: ../settings/xfdesktop-settings-ui.glade.h:39 +#: ../settings/xfdesktop-settings-ui.glade.h:40 msgid "_Icons" msgstr "아이콘(_I)" @@ -515,121 +516,149 @@ msgid "_Remove Workspace '%s'" msgstr "작업 공간 '%s' 제거(_R)" -#: ../src/xfdesktop-application.c:768 +#: ../src/xfdesktop-app-menu-item.c:349 +#: ../src/xfdesktop-file-icon-manager.c:860 +#: ../src/xfdesktop-file-icon-manager.c:1125 +#: ../src/xfdesktop-file-icon-manager.c:1321 ../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 "실행 오류" + +#: ../src/xfdesktop-app-menu-item.c:351 +#: ../src/xfdesktop-file-icon-manager.c:1127 +msgid "" +"Unable to launch \"exo-desktop-item-edit\", which is required to create and " +"edit launchers and links on the desktop." +msgstr "데스크톱에 실행 아이콘과 링크를 만들고 수정하는데 필요한 \"exo-desktop-item-edit\"을 실행하지 못했습니다." + +#: ../src/xfdesktop-application.c:836 msgid "Display version information" msgstr "버전 정보를 표시합니다" -#: ../src/xfdesktop-application.c:769 +#: ../src/xfdesktop-application.c:837 msgid "Reload all settings" msgstr "모든 설정을 다시 읽어들입니다" -#: ../src/xfdesktop-application.c:770 +#: ../src/xfdesktop-application.c:838 +msgid "Advance to the next wallpaper on the current workspace" +msgstr "현재 작업 공간에 다음 배경 화면 표시 진행" + +#: ../src/xfdesktop-application.c:839 msgid "Pop up the menu (at the current mouse position)" msgstr "(현재 마우스 커서 위치에)단축 메뉴를 표시합니다" -#: ../src/xfdesktop-application.c:771 +#: ../src/xfdesktop-application.c:840 msgid "Pop up the window list (at the current mouse position)" msgstr "(현재 마우스 커서 위치에)창 목록을 표시합니다" -#: ../src/xfdesktop-application.c:773 +#: ../src/xfdesktop-application.c:842 msgid "Automatically arrange all the icons on the desktop" msgstr "모든 데스크톱의 아이콘을 자동으로 정렬합니다" -#: ../src/xfdesktop-application.c:775 +#: ../src/xfdesktop-application.c:844 +msgid "Enable debug messages" +msgstr "디버그 메시지 활성화" + +#: ../src/xfdesktop-application.c:845 +msgid "Disable debug messages" +msgstr "디버그 메시지 비활성화" + +#: ../src/xfdesktop-application.c:846 msgid "Do not wait for a window manager on startup" msgstr "시동시 창 관리자를 기다리지 않습니다" -#: ../src/xfdesktop-application.c:776 +#: ../src/xfdesktop-application.c:847 msgid "Cause xfdesktop to quit" msgstr "xfdesktop을 끝내게 합니다" -#: ../src/xfdesktop-application.c:791 +#: ../src/xfdesktop-application.c:862 #, c-format msgid "Failed to parse arguments: %s\n" msgstr "인자를 해석하는데 실패했습니다: %s\n" -#: ../src/xfdesktop-application.c:802 +#: ../src/xfdesktop-application.c:873 #, c-format msgid "This is %s version %s, running on Xfce %s.\n" msgstr "%s 버전 %s 입니다. xfce %s에서 실행중입니다.\n" -#: ../src/xfdesktop-application.c:804 +#: ../src/xfdesktop-application.c:875 #, c-format msgid "Built with GTK+ %d.%d.%d, linked with GTK+ %d.%d.%d." msgstr "GTK+ %d.%d.%d에서 빌드하고 GTK+ %d.%d.%d와 연결했습니다." -#: ../src/xfdesktop-application.c:808 +#: ../src/xfdesktop-application.c:879 #, c-format msgid "Build options:\n" msgstr "빌드 옵션:\n" -#: ../src/xfdesktop-application.c:809 +#: ../src/xfdesktop-application.c:880 #, c-format msgid " Desktop Menu: %s\n" msgstr "데스크톱 메뉴: %s\n" -#: ../src/xfdesktop-application.c:811 ../src/xfdesktop-application.c:818 -#: ../src/xfdesktop-application.c:825 +#: ../src/xfdesktop-application.c:882 ../src/xfdesktop-application.c:889 +#: ../src/xfdesktop-application.c:896 msgid "enabled" msgstr "활성화" -#: ../src/xfdesktop-application.c:813 ../src/xfdesktop-application.c:820 -#: ../src/xfdesktop-application.c:827 +#: ../src/xfdesktop-application.c:884 ../src/xfdesktop-application.c:891 +#: ../src/xfdesktop-application.c:898 msgid "disabled" msgstr "비활성화" -#: ../src/xfdesktop-application.c:816 +#: ../src/xfdesktop-application.c:887 #, c-format msgid " Desktop Icons: %s\n" msgstr "데스크톱 아이콘: %s\n" -#: ../src/xfdesktop-application.c:823 +#: ../src/xfdesktop-application.c:894 #, c-format msgid " Desktop File Icons: %s\n" msgstr "데스크톱 파일 아이콘: %s\n" -#: ../src/xfdesktop-file-icon-manager.c:522 -#: ../src/xfdesktop-file-icon-manager.c:539 +#: ../src/xfdesktop-file-icon-manager.c:559 +#: ../src/xfdesktop-file-icon-manager.c:576 #, c-format msgid "Could not create the desktop folder \"%s\"" msgstr "데스크톱 폴더 \"%s\"을(를) 만들 수 없습니다" -#: ../src/xfdesktop-file-icon-manager.c:527 -#: ../src/xfdesktop-file-icon-manager.c:544 +#: ../src/xfdesktop-file-icon-manager.c:564 +#: ../src/xfdesktop-file-icon-manager.c:581 msgid "Desktop Folder Error" msgstr "데스크톱 폴더 오류" -#: ../src/xfdesktop-file-icon-manager.c:546 +#: ../src/xfdesktop-file-icon-manager.c:583 msgid "" "A normal file with the same name already exists. Please delete or rename it." msgstr "같은 이름을 가진 일반 파일이 이미 존재합니다. 삭제하거나 이름을 바꿔 주십시오." -#: ../src/xfdesktop-file-icon-manager.c:629 ../src/xfdesktop-file-utils.c:723 +#: ../src/xfdesktop-file-icon-manager.c:666 ../src/xfdesktop-file-utils.c:723 #: ../src/xfdesktop-file-utils.c:776 msgid "Rename Error" msgstr "이름 바꾸기 오류" -#: ../src/xfdesktop-file-icon-manager.c:630 ../src/xfdesktop-file-utils.c:777 +#: ../src/xfdesktop-file-icon-manager.c:667 ../src/xfdesktop-file-utils.c:777 msgid "The files could not be renamed" msgstr "파일 이름을 변경할 수 없습니다." -#: ../src/xfdesktop-file-icon-manager.c:631 +#: ../src/xfdesktop-file-icon-manager.c:668 msgid "None of the icons selected support being renamed." msgstr "이름 바꾸기를 지원하려 선택한 아이콘이 없습니다." -#: ../src/xfdesktop-file-icon-manager.c:675 -#: ../src/xfdesktop-file-icon-manager.c:719 ../src/xfdesktop-file-utils.c:876 +#: ../src/xfdesktop-file-icon-manager.c:712 +#: ../src/xfdesktop-file-icon-manager.c:756 ../src/xfdesktop-file-utils.c:876 #: ../src/xfdesktop-file-utils.c:913 msgid "Trash Error" msgstr "휴지통 오류" -#: ../src/xfdesktop-file-icon-manager.c:676 -#: ../src/xfdesktop-file-icon-manager.c:720 +#: ../src/xfdesktop-file-icon-manager.c:713 +#: ../src/xfdesktop-file-icon-manager.c:757 msgid "The selected files could not be trashed" msgstr "선택한 파일을 휴지통에 버릴 수 없었습니다" -#: ../src/xfdesktop-file-icon-manager.c:677 -#: ../src/xfdesktop-file-icon-manager.c:721 ../src/xfdesktop-file-utils.c:725 +#: ../src/xfdesktop-file-icon-manager.c:714 +#: ../src/xfdesktop-file-icon-manager.c:758 ../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 @@ -641,123 +670,114 @@ msgstr "이 기능을 사용하시려면(투나에서 제공하는 것과 같은) 파일 관리자 서비스가 필요합니다." #. printf is to be translator-friendly -#: ../src/xfdesktop-file-icon-manager.c:821 -#: ../src/xfdesktop-file-icon-manager.c:1279 +#: ../src/xfdesktop-file-icon-manager.c:858 +#: ../src/xfdesktop-file-icon-manager.c:1320 #, c-format msgid "Unable to launch \"%s\":" msgstr "실행 실패 \"%s\":" -#: ../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 "실행 오류" - -#: ../src/xfdesktop-file-icon-manager.c:1008 +#: ../src/xfdesktop-file-icon-manager.c:1049 #, c-format msgid "_Open With \"%s\"" msgstr "\"%s\"(으)로 엽니다(_O)" -#: ../src/xfdesktop-file-icon-manager.c:1011 +#: ../src/xfdesktop-file-icon-manager.c:1052 #, c-format msgid "Open With \"%s\"" msgstr "\"%s\"(으)로 엽니다" -#: ../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 "데스크톱에 실행 아이콘과 링크를 만들고 수정하는데 필요한 \"exo-desktop-item-edit\"을 실행하지 못했습니다." - -#: ../src/xfdesktop-file-icon-manager.c:1337 +#: ../src/xfdesktop-file-icon-manager.c:1378 msgid "_Open all" msgstr "모두 열기(_O)" -#: ../src/xfdesktop-file-icon-manager.c:1353 +#: ../src/xfdesktop-file-icon-manager.c:1394 msgid "_Open in New Window" msgstr "새로운 창에서 열기(_O)" -#: ../src/xfdesktop-file-icon-manager.c:1355 +#: ../src/xfdesktop-file-icon-manager.c:1396 #: ../src/xfdesktop-special-file-icon.c:547 ../src/xfdesktop-volume-icon.c:813 msgid "_Open" msgstr "열기(_O)" #. create launcher item -#: ../src/xfdesktop-file-icon-manager.c:1374 +#: ../src/xfdesktop-file-icon-manager.c:1415 msgid "Create _Launcher..." msgstr "실행 아이콘 만들기(_L)..." #. create link item -#: ../src/xfdesktop-file-icon-manager.c:1390 +#: ../src/xfdesktop-file-icon-manager.c:1431 msgid "Create _URL Link..." msgstr "URL 연결 만들기(_U)..." #. create folder item -#: ../src/xfdesktop-file-icon-manager.c:1406 +#: ../src/xfdesktop-file-icon-manager.c:1447 msgid "Create _Folder..." msgstr "새로운 디렉토리 만들기(_F)..." -#: ../src/xfdesktop-file-icon-manager.c:1421 +#: ../src/xfdesktop-file-icon-manager.c:1462 msgid "Create From _Template" msgstr "서식에서 만들기(_T)" -#: ../src/xfdesktop-file-icon-manager.c:1450 +#: ../src/xfdesktop-file-icon-manager.c:1491 msgid "_Empty File" msgstr "빈 파일(_E)" -#: ../src/xfdesktop-file-icon-manager.c:1467 +#: ../src/xfdesktop-file-icon-manager.c:1508 msgid "_Execute" msgstr "실행(_E)" -#: ../src/xfdesktop-file-icon-manager.c:1487 +#: ../src/xfdesktop-file-icon-manager.c:1528 msgid "_Edit Launcher" msgstr "실행 아이콘 편집(_E)" -#: ../src/xfdesktop-file-icon-manager.c:1522 +#: ../src/xfdesktop-file-icon-manager.c:1563 msgid "Open With" msgstr "다음으로 열기" -#: ../src/xfdesktop-file-icon-manager.c:1548 +#: ../src/xfdesktop-file-icon-manager.c:1589 msgid "Open With Other _Application..." msgstr "다른 프로그램으로 열기(_A)..." +#. Trash +#: ../src/xfdesktop-file-icon-manager.c:1676 +msgid "Mo_ve to Trash" +msgstr "휴지통으로 이동(_V)" + #. Rename -#: ../src/xfdesktop-file-icon-manager.c:1651 +#: ../src/xfdesktop-file-icon-manager.c:1707 msgid "_Rename..." msgstr "이름 바꾸기(_R)..." -#: ../src/xfdesktop-file-icon-manager.c:1679 +#: ../src/xfdesktop-file-icon-manager.c:1735 msgid "Arrange Desktop _Icons" msgstr "데스크톱 아이콘 정렬(_I)" -#: ../src/xfdesktop-file-icon-manager.c:1690 +#: ../src/xfdesktop-file-icon-manager.c:1746 msgid "Desktop _Settings..." msgstr "데스크톱 설정(_S)..." -#: ../src/xfdesktop-file-icon-manager.c:1701 +#: ../src/xfdesktop-file-icon-manager.c:1757 #: ../src/xfdesktop-volume-icon.c:855 msgid "P_roperties..." msgstr "속성(_R)..." -#: ../src/xfdesktop-file-icon-manager.c:2716 +#: ../src/xfdesktop-file-icon-manager.c:2699 msgid "Load Error" msgstr "불러오기 오류" -#: ../src/xfdesktop-file-icon-manager.c:2718 +#: ../src/xfdesktop-file-icon-manager.c:2701 msgid "Failed to load the desktop folder" msgstr "데스크톱 폴더를 불러오는데 실패하였습니다" -#: ../src/xfdesktop-file-icon-manager.c:3262 +#: ../src/xfdesktop-file-icon-manager.c:3242 msgid "Copy _Here" msgstr "여기로 복사(_H)" -#: ../src/xfdesktop-file-icon-manager.c:3262 +#: ../src/xfdesktop-file-icon-manager.c:3242 msgid "_Move Here" msgstr "여기로 이동(_M)" -#: ../src/xfdesktop-file-icon-manager.c:3262 +#: ../src/xfdesktop-file-icon-manager.c:3242 msgid "_Link Here" msgstr "여기에 연결 만들기(_L)" @@ -925,7 +945,7 @@ msgid "Eject Finished" msgstr "추출이 끝났습니다" -#: ../src/xfdesktop-regular-file-icon.c:603 +#: ../src/xfdesktop-regular-file-icon.c:748 #, c-format msgid "" "Type: %s\n" diff -Nru xfdesktop4-4.11.6/po/ms.po xfdesktop4-4.19.2/po/ms.po --- xfdesktop4-4.11.6/po/ms.po 2014-03-02 07:21:58.000000000 +0000 +++ xfdesktop4-4.19.2/po/ms.po 2014-08-11 07:27:27.000000000 +0000 @@ -9,47 +9,47 @@ 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 12:12+0000\n" +"POT-Creation-Date: 2014-08-03 12:32+0200\n" +"PO-Revision-Date: 2014-08-05 17:15+0000\n" "Last-Translator: abuyop \n" -"Language-Team: Malay (http://www.transifex.com/projects/p/xfce/language/ms/)\n" +"Language-Team: Malay (http://www.transifex.com/projects/p/xfdesktop/language/ms/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Language: ms\n" "Plural-Forms: nplurals=1; plural=0;\n" -#: ../settings/main.c:375 ../src/xfdesktop-special-file-icon.c:295 +#: ../settings/main.c:404 ../src/xfdesktop-special-file-icon.c:295 #: ../src/xfdesktop-special-file-icon.c:479 msgid "Home" msgstr "Rumah" -#: ../settings/main.c:377 +#: ../settings/main.c:406 msgid "Filesystem" msgstr "Fail sistem" -#: ../settings/main.c:379 +#: ../settings/main.c:408 msgid "Trash" msgstr "Sampah" -#: ../settings/main.c:381 +#: ../settings/main.c:410 msgid "Removable Devices" msgstr "Peranti Boleh Ubah" -#: ../settings/main.c:383 +#: ../settings/main.c:412 msgid "Network Shares" msgstr "Perkongsian Rangkaian" -#: ../settings/main.c:385 +#: ../settings/main.c:414 msgid "Disks and Drives" msgstr "Cakera dan Peranti" -#: ../settings/main.c:387 +#: ../settings/main.c:416 msgid "Other Devices" msgstr "Peranti Lain" #. Display the file name, file type, and file size in the tooltip. -#: ../settings/main.c:500 +#: ../settings/main.c:529 #, c-format msgid "" "%s\n" @@ -57,95 +57,95 @@ "Size: %s" msgstr "%s\nJenis: %s\nSaiz: %s" -#: ../settings/main.c:686 +#: ../settings/main.c:715 #, c-format msgid "Wallpaper for Monitor %d (%s)" msgstr "Hiasan dinding untuk Monitor %d (%s)" -#: ../settings/main.c:689 +#: ../settings/main.c:718 #, c-format msgid "Wallpaper for Monitor %d" msgstr "Hiasan dinding untuk Monitor %d" -#: ../settings/main.c:695 +#: ../settings/main.c:724 msgid "Move this dialog to the display you want to edit the settings for." msgstr "Alih dialog ini ke paparan yang anda mahu suntingkan tetapannya." -#: ../settings/main.c:702 +#: ../settings/main.c:731 #, c-format msgid "Wallpaper for %s on Monitor %d (%s)" msgstr "Hiasan dinding untuk %s pada Monitor %d (%s)" -#: ../settings/main.c:706 +#: ../settings/main.c:735 #, c-format msgid "Wallpaper for %s on Monitor %d" msgstr "Hiasan dinding untuk %s pada Monitor %d" -#: ../settings/main.c:713 +#: ../settings/main.c:742 msgid "" "Move this dialog to the display and workspace you want to edit the settings " "for." msgstr "Alih dialog ini ke paparan dan ruang kerja yang anda mahu suntingkan tetapannya." #. Single monitor and single workspace -#: ../settings/main.c:720 +#: ../settings/main.c:749 #, c-format msgid "Wallpaper for my desktop" msgstr "Hiasan dinding untuk desktop saya" #. Single monitor and per workspace wallpaper -#: ../settings/main.c:726 +#: ../settings/main.c:755 #, c-format msgid "Wallpaper for %s" msgstr "Hiasan dinding untuk %s" -#: ../settings/main.c:731 +#: ../settings/main.c:760 msgid "Move this dialog to the workspace you want to edit the settings for." msgstr "Pindah dialog ini ke ruangkerja yang anda mahu sunting tetapannya." -#: ../settings/main.c:1134 +#: ../settings/main.c:1174 msgid "Image selection is unavailable while the image style is set to None." msgstr "Pilihan imej tidak didapati ketika gaya imej ditetapkan ke Tiada." -#: ../settings/main.c:1481 +#: ../settings/main.c:1524 msgid "Spanning screens" msgstr "Rentang skrin" -#: ../settings/main.c:1786 +#: ../settings/main.c:1831 msgid "Image files" msgstr "Fail imej" -#: ../settings/main.c:1958 +#: ../settings/main.c:2010 msgid "Settings manager socket" msgstr "Soket pengurus tetapan" -#: ../settings/main.c:1958 +#: ../settings/main.c:2010 msgid "SOCKET ID" msgstr "SOCKET ID" -#: ../settings/main.c:1959 +#: ../settings/main.c:2011 msgid "Version information" msgstr "Maklumat versi" -#: ../settings/main.c:1986 +#: ../settings/main.c:2039 #, c-format msgid "Type '%s --help' for usage." msgstr "Taip '%s --help' untuk penggunaan." -#: ../settings/main.c:1998 +#: ../settings/main.c:2051 msgid "The Xfce development team. All rights reserved." msgstr "Pasukan pembangunan Xfce. Semua hak cipta terpelihara." -#: ../settings/main.c:1999 +#: ../settings/main.c:2052 #, c-format msgid "Please report bugs to <%s>." msgstr "Sila laporkan pepijat ke <%s>." -#: ../settings/main.c:2006 +#: ../settings/main.c:2059 msgid "Desktop Settings" msgstr "Tetapan Desktop" -#: ../settings/main.c:2008 +#: ../settings/main.c:2061 msgid "Unable to contact settings server" msgstr "Tidak dapat menyambung ke tetapan pelayan" @@ -154,7 +154,8 @@ msgstr "Desktop " #: ../settings/xfce-backdrop-settings.desktop.in.h:2 -msgid "Set desktop background and menu and icon behaviour" +#: ../settings/xfdesktop-settings-ui.glade.h:11 +msgid "Set desktop background and menu and icon behavior" msgstr "Tetapkan latarbelakang desktop dan menu dan kelakuan ikon" #: ../settings/xfdesktop-settings-appearance-frame-ui.glade.h:1 @@ -333,14 +334,10 @@ msgid "File/launcher icons" msgstr "Ikon fail/pelancar" -#: ../settings/xfdesktop-settings-ui.glade.h:10 ../src/xfce-desktop.c:1015 +#: ../settings/xfdesktop-settings-ui.glade.h:10 ../src/xfce-desktop.c:1007 msgid "Desktop" msgstr "Desktop" -#: ../settings/xfdesktop-settings-ui.glade.h:11 -msgid "Set desktop background and menu and icon behavior" -msgstr "Tetapkan latarbelakang desktop dan menu dan kelakuan ikon" - #: ../settings/xfdesktop-settings-ui.glade.h:12 msgid "_Background" msgstr "_Latar belakang" @@ -432,26 +429,30 @@ msgstr "Klik sekali untuk aktifkan item" #: ../settings/xfdesktop-settings-ui.glade.h:34 +msgid "Show hidden files on the desktop" +msgstr "Tunjuk fail tersembunyi pada desktop" + +#: ../settings/xfdesktop-settings-ui.glade.h:35 msgid "Show icon tooltips. Size:" msgstr "Papar ikon tip alatan. Saiz:" -#: ../settings/xfdesktop-settings-ui.glade.h:35 +#: ../settings/xfdesktop-settings-ui.glade.h:36 msgid "Size of the tooltip preview image." msgstr "Saiz tip alatan pratonton imej." -#: ../settings/xfdesktop-settings-ui.glade.h:36 +#: ../settings/xfdesktop-settings-ui.glade.h:37 msgid "Use custom _font size:" msgstr "Guna saiz fon tersuai:" -#: ../settings/xfdesktop-settings-ui.glade.h:37 +#: ../settings/xfdesktop-settings-ui.glade.h:38 msgid "Appearance" msgstr "Penampilan" -#: ../settings/xfdesktop-settings-ui.glade.h:38 +#: ../settings/xfdesktop-settings-ui.glade.h:39 msgid "Default Icons" msgstr "Ikon Lalai" -#: ../settings/xfdesktop-settings-ui.glade.h:39 +#: ../settings/xfdesktop-settings-ui.glade.h:40 msgid "_Icons" msgstr "_Ikon" @@ -512,121 +513,149 @@ msgid "_Remove Workspace '%s'" msgstr "Buang _Ruang kerja '%s'" -#: ../src/xfdesktop-application.c:768 +#: ../src/xfdesktop-app-menu-item.c:349 +#: ../src/xfdesktop-file-icon-manager.c:860 +#: ../src/xfdesktop-file-icon-manager.c:1125 +#: ../src/xfdesktop-file-icon-manager.c:1321 ../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 "Ralat Dilancarkan" + +#: ../src/xfdesktop-app-menu-item.c:351 +#: ../src/xfdesktop-file-icon-manager.c:1127 +msgid "" +"Unable to launch \"exo-desktop-item-edit\", which is required to create and " +"edit launchers and links on the desktop." +msgstr "Tidak dapat melancarkan \"exo-desktop-item-edit\", yang diperlukan untuk mencipta dan menyunting pelancar dan capaian pada desktop." + +#: ../src/xfdesktop-application.c:836 msgid "Display version information" msgstr "Papar maklumat versi" -#: ../src/xfdesktop-application.c:769 +#: ../src/xfdesktop-application.c:837 msgid "Reload all settings" msgstr "Muat semula semua tetapan" -#: ../src/xfdesktop-application.c:770 +#: ../src/xfdesktop-application.c:838 +msgid "Advance to the next wallpaper on the current workspace" +msgstr "Maju ke kertas dinding berikutnya pada ruang kerja semasa" + +#: ../src/xfdesktop-application.c:839 msgid "Pop up the menu (at the current mouse position)" msgstr "Timbulkan menu (pada kedudukan tetikus semasa)" -#: ../src/xfdesktop-application.c:771 +#: ../src/xfdesktop-application.c:840 msgid "Pop up the window list (at the current mouse position)" msgstr "Timbulkan senarai tetingkap (pada kedudukan tetikus semasa)" -#: ../src/xfdesktop-application.c:773 +#: ../src/xfdesktop-application.c:842 msgid "Automatically arrange all the icons on the desktop" msgstr "Susun semua ikon diatas desktop secara automatik" -#: ../src/xfdesktop-application.c:775 +#: ../src/xfdesktop-application.c:844 +msgid "Enable debug messages" +msgstr "Benarkan mesej nyahpepijat" + +#: ../src/xfdesktop-application.c:845 +msgid "Disable debug messages" +msgstr "Lumpuhkan mesej nyahpepijat" + +#: ../src/xfdesktop-application.c:846 msgid "Do not wait for a window manager on startup" msgstr "Jangan tunggu pengurus tetingkap ketika permulaan" -#: ../src/xfdesktop-application.c:776 +#: ../src/xfdesktop-application.c:847 msgid "Cause xfdesktop to quit" msgstr "Sebab xfdesktop keluar" -#: ../src/xfdesktop-application.c:791 +#: ../src/xfdesktop-application.c:862 #, c-format msgid "Failed to parse arguments: %s\n" msgstr "Gagal menghurai argumen: %s\n" -#: ../src/xfdesktop-application.c:802 +#: ../src/xfdesktop-application.c:873 #, c-format msgid "This is %s version %s, running on Xfce %s.\n" msgstr "Ini adalah %s versi %s, berjalan dalam Xfce %s.\n" -#: ../src/xfdesktop-application.c:804 +#: ../src/xfdesktop-application.c:875 #, c-format msgid "Built with GTK+ %d.%d.%d, linked with GTK+ %d.%d.%d." msgstr "Binaan dengan GTK+ %d.%d.%d, dipaut dengan GTK+ %d.%d.%d." -#: ../src/xfdesktop-application.c:808 +#: ../src/xfdesktop-application.c:879 #, c-format msgid "Build options:\n" msgstr "Pilihan binaan:\n" -#: ../src/xfdesktop-application.c:809 +#: ../src/xfdesktop-application.c:880 #, c-format msgid " Desktop Menu: %s\n" msgstr "Menu Desktop: %s\n" -#: ../src/xfdesktop-application.c:811 ../src/xfdesktop-application.c:818 -#: ../src/xfdesktop-application.c:825 +#: ../src/xfdesktop-application.c:882 ../src/xfdesktop-application.c:889 +#: ../src/xfdesktop-application.c:896 msgid "enabled" msgstr "dibenarkan" -#: ../src/xfdesktop-application.c:813 ../src/xfdesktop-application.c:820 -#: ../src/xfdesktop-application.c:827 +#: ../src/xfdesktop-application.c:884 ../src/xfdesktop-application.c:891 +#: ../src/xfdesktop-application.c:898 msgid "disabled" msgstr "dilumpuhkan" -#: ../src/xfdesktop-application.c:816 +#: ../src/xfdesktop-application.c:887 #, c-format msgid " Desktop Icons: %s\n" msgstr "Ikon Desktop: %s\n" -#: ../src/xfdesktop-application.c:823 +#: ../src/xfdesktop-application.c:894 #, c-format msgid " Desktop File Icons: %s\n" msgstr "Ikon Fail Desktop: %s\n" -#: ../src/xfdesktop-file-icon-manager.c:522 -#: ../src/xfdesktop-file-icon-manager.c:539 +#: ../src/xfdesktop-file-icon-manager.c:559 +#: ../src/xfdesktop-file-icon-manager.c:576 #, c-format msgid "Could not create the desktop folder \"%s\"" msgstr "Tak dapat mencipta folder desktop \"%s\"" -#: ../src/xfdesktop-file-icon-manager.c:527 -#: ../src/xfdesktop-file-icon-manager.c:544 +#: ../src/xfdesktop-file-icon-manager.c:564 +#: ../src/xfdesktop-file-icon-manager.c:581 msgid "Desktop Folder Error" msgstr "Ralat Folder Desktop" -#: ../src/xfdesktop-file-icon-manager.c:546 +#: ../src/xfdesktop-file-icon-manager.c:583 msgid "" "A normal file with the same name already exists. Please delete or rename it." msgstr "Fail biasa dengan nama sama telah ada. Sila padam atau tukarkan namanya." -#: ../src/xfdesktop-file-icon-manager.c:629 ../src/xfdesktop-file-utils.c:723 +#: ../src/xfdesktop-file-icon-manager.c:666 ../src/xfdesktop-file-utils.c:723 #: ../src/xfdesktop-file-utils.c:776 msgid "Rename Error" msgstr "Ralat Menamakan Semula" -#: ../src/xfdesktop-file-icon-manager.c:630 ../src/xfdesktop-file-utils.c:777 +#: ../src/xfdesktop-file-icon-manager.c:667 ../src/xfdesktop-file-utils.c:777 msgid "The files could not be renamed" msgstr "Fail tidak boleh dinamakan semula" -#: ../src/xfdesktop-file-icon-manager.c:631 +#: ../src/xfdesktop-file-icon-manager.c:668 msgid "None of the icons selected support being renamed." msgstr "Tiada ikon yang dipilih menyokong untuk dinamakan semula." -#: ../src/xfdesktop-file-icon-manager.c:675 -#: ../src/xfdesktop-file-icon-manager.c:719 ../src/xfdesktop-file-utils.c:876 +#: ../src/xfdesktop-file-icon-manager.c:712 +#: ../src/xfdesktop-file-icon-manager.c:756 ../src/xfdesktop-file-utils.c:876 #: ../src/xfdesktop-file-utils.c:913 msgid "Trash Error" msgstr "Ralat Sampah" -#: ../src/xfdesktop-file-icon-manager.c:676 -#: ../src/xfdesktop-file-icon-manager.c:720 +#: ../src/xfdesktop-file-icon-manager.c:713 +#: ../src/xfdesktop-file-icon-manager.c:757 msgid "The selected files could not be trashed" msgstr "Fail yang dipilih tidak boleh dibuang" -#: ../src/xfdesktop-file-icon-manager.c:677 -#: ../src/xfdesktop-file-icon-manager.c:721 ../src/xfdesktop-file-utils.c:725 +#: ../src/xfdesktop-file-icon-manager.c:714 +#: ../src/xfdesktop-file-icon-manager.c:758 ../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 @@ -638,123 +667,114 @@ msgstr "Ciri ini memerlukan kehadiran perkhidmatan pengurus fail (seperti yang dibekalkan oleh Thunar)." #. printf is to be translator-friendly -#: ../src/xfdesktop-file-icon-manager.c:821 -#: ../src/xfdesktop-file-icon-manager.c:1279 +#: ../src/xfdesktop-file-icon-manager.c:858 +#: ../src/xfdesktop-file-icon-manager.c:1320 #, c-format msgid "Unable to launch \"%s\":" msgstr "Tidak dapat melancarkan \"%s\":" -#: ../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 "Ralat Dilancarkan" - -#: ../src/xfdesktop-file-icon-manager.c:1008 +#: ../src/xfdesktop-file-icon-manager.c:1049 #, c-format msgid "_Open With \"%s\"" msgstr "_Buka Dengan \"%s\"" -#: ../src/xfdesktop-file-icon-manager.c:1011 +#: ../src/xfdesktop-file-icon-manager.c:1052 #, c-format msgid "Open With \"%s\"" msgstr "Buka Dengan \"%s\"" -#: ../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 "Tidak dapat melancarkan \"exo-desktop-item-edit\", yang diperlukan untuk mencipta dan menyunting pelancar dan capaian pada desktop." - -#: ../src/xfdesktop-file-icon-manager.c:1337 +#: ../src/xfdesktop-file-icon-manager.c:1378 msgid "_Open all" msgstr "_Buka semua" -#: ../src/xfdesktop-file-icon-manager.c:1353 +#: ../src/xfdesktop-file-icon-manager.c:1394 msgid "_Open in New Window" msgstr "_Buka pada Tetingkap Baharu" -#: ../src/xfdesktop-file-icon-manager.c:1355 +#: ../src/xfdesktop-file-icon-manager.c:1396 #: ../src/xfdesktop-special-file-icon.c:547 ../src/xfdesktop-volume-icon.c:813 msgid "_Open" msgstr "_Buka" #. create launcher item -#: ../src/xfdesktop-file-icon-manager.c:1374 +#: ../src/xfdesktop-file-icon-manager.c:1415 msgid "Create _Launcher..." msgstr "Cipta Pe_lancar..." #. create link item -#: ../src/xfdesktop-file-icon-manager.c:1390 +#: ../src/xfdesktop-file-icon-manager.c:1431 msgid "Create _URL Link..." msgstr "Cipta Capaian _URL..." #. create folder item -#: ../src/xfdesktop-file-icon-manager.c:1406 +#: ../src/xfdesktop-file-icon-manager.c:1447 msgid "Create _Folder..." msgstr "Cipta _Folder..." -#: ../src/xfdesktop-file-icon-manager.c:1421 +#: ../src/xfdesktop-file-icon-manager.c:1462 msgid "Create From _Template" msgstr "Cipta Dari _Templat" -#: ../src/xfdesktop-file-icon-manager.c:1450 +#: ../src/xfdesktop-file-icon-manager.c:1491 msgid "_Empty File" msgstr "_Fail Kosong" -#: ../src/xfdesktop-file-icon-manager.c:1467 +#: ../src/xfdesktop-file-icon-manager.c:1508 msgid "_Execute" msgstr "_Laksanakan" -#: ../src/xfdesktop-file-icon-manager.c:1487 +#: ../src/xfdesktop-file-icon-manager.c:1528 msgid "_Edit Launcher" msgstr "Sunting P_elancar" -#: ../src/xfdesktop-file-icon-manager.c:1522 +#: ../src/xfdesktop-file-icon-manager.c:1563 msgid "Open With" msgstr "Buka Dengan" -#: ../src/xfdesktop-file-icon-manager.c:1548 +#: ../src/xfdesktop-file-icon-manager.c:1589 msgid "Open With Other _Application..." msgstr "Buka dengan _aplikasi lain..." +#. Trash +#: ../src/xfdesktop-file-icon-manager.c:1676 +msgid "Mo_ve to Trash" +msgstr "A_lih ke Tong Sampah" + #. Rename -#: ../src/xfdesktop-file-icon-manager.c:1651 +#: ../src/xfdesktop-file-icon-manager.c:1707 msgid "_Rename..." msgstr "_Namakan semula..." -#: ../src/xfdesktop-file-icon-manager.c:1679 +#: ../src/xfdesktop-file-icon-manager.c:1735 msgid "Arrange Desktop _Icons" msgstr "Menguruskan Ikon Desktop" -#: ../src/xfdesktop-file-icon-manager.c:1690 +#: ../src/xfdesktop-file-icon-manager.c:1746 msgid "Desktop _Settings..." msgstr "Tetapan De_sktop..." -#: ../src/xfdesktop-file-icon-manager.c:1701 +#: ../src/xfdesktop-file-icon-manager.c:1757 #: ../src/xfdesktop-volume-icon.c:855 msgid "P_roperties..." msgstr "C_iri-ciri..." -#: ../src/xfdesktop-file-icon-manager.c:2716 +#: ../src/xfdesktop-file-icon-manager.c:2699 msgid "Load Error" msgstr "Ralat Memuatkan" -#: ../src/xfdesktop-file-icon-manager.c:2718 +#: ../src/xfdesktop-file-icon-manager.c:2701 msgid "Failed to load the desktop folder" msgstr "Gagal untuk memuatkan folder desktop" -#: ../src/xfdesktop-file-icon-manager.c:3262 +#: ../src/xfdesktop-file-icon-manager.c:3242 msgid "Copy _Here" msgstr "Salin Sini" -#: ../src/xfdesktop-file-icon-manager.c:3262 +#: ../src/xfdesktop-file-icon-manager.c:3242 msgid "_Move Here" msgstr "_Pindah Sini" -#: ../src/xfdesktop-file-icon-manager.c:3262 +#: ../src/xfdesktop-file-icon-manager.c:3242 msgid "_Link Here" msgstr "_Paut Sini" @@ -805,15 +825,15 @@ #: ../src/xfdesktop-file-utils.c:826 msgid "Delete Error" -msgstr "Ralat Pembuangan" +msgstr "Ralat Padam" #: ../src/xfdesktop-file-utils.c:827 msgid "The selected files could not be deleted" -msgstr "Fail yang dipilih tidak boleh dibuang" +msgstr "Fail terpilih tidak dapat dipadam" #: ../src/xfdesktop-file-utils.c:877 msgid "The selected files could not be moved to the trash" -msgstr "Fail yang dipilih tidak boleh dipindah ke tong sampah" +msgstr "Fail terpilih tidak dapat dialih ke dalam tong sampah" #: ../src/xfdesktop-file-utils.c:878 ../src/xfdesktop-file-utils.c:915 msgid "" @@ -922,7 +942,7 @@ msgid "Eject Finished" msgstr "Selesai Dikeluarkan" -#: ../src/xfdesktop-regular-file-icon.c:603 +#: ../src/xfdesktop-regular-file-icon.c:748 #, c-format msgid "" "Type: %s\n" diff -Nru xfdesktop4-4.11.6/po/nb.po xfdesktop4-4.19.2/po/nb.po --- xfdesktop4-4.11.6/po/nb.po 2013-11-26 01:38:09.000000000 +0000 +++ xfdesktop4-4.19.2/po/nb.po 2014-08-03 06:01:08.000000000 +0000 @@ -3,153 +3,153 @@ # This file is distributed under the same license as the PACKAGE package. # # Translators: +# Allan Nordhøy , 2014 # Christian Lomsdalen , 2007 # Eskild Hustvedt , 2004 +# Harald , 2014 # Terje Uriansrud , 2010 # Terje Uriansrud , 2007 msgid "" msgstr "" "Project-Id-Version: Xfdesktop\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2013-11-15 00:31+0100\n" -"PO-Revision-Date: 2013-11-19 13:41+0000\n" -"Last-Translator: Xfce \n" -"Language-Team: Norwegian Bokmål (http://www.transifex.com/projects/p/xfce/language/nb/)\n" +"POT-Creation-Date: 2014-07-28 12:31+0200\n" +"PO-Revision-Date: 2014-07-29 14:27+0000\n" +"Last-Translator: Harald \n" +"Language-Team: Norwegian Bokmål (http://www.transifex.com/projects/p/xfdesktop/language/nb/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Language: nb\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -#: ../settings/main.c:371 ../src/xfdesktop-special-file-icon.c:295 +#: ../settings/main.c:404 ../src/xfdesktop-special-file-icon.c:295 #: ../src/xfdesktop-special-file-icon.c:479 msgid "Home" msgstr "Hjem" -#: ../settings/main.c:373 +#: ../settings/main.c:406 msgid "Filesystem" msgstr "Filsystem" -#: ../settings/main.c:375 +#: ../settings/main.c:408 msgid "Trash" msgstr "Papirkurv" -#: ../settings/main.c:377 +#: ../settings/main.c:410 msgid "Removable Devices" msgstr "Avmonterbare enheter" -#: ../settings/main.c:379 +#: ../settings/main.c:412 msgid "Network Shares" -msgstr "" +msgstr "Nettverksdelinger" -#: ../settings/main.c:381 +#: ../settings/main.c:414 msgid "Disks and Drives" -msgstr "" +msgstr "Disker og stasjoner" -#: ../settings/main.c:383 -msgid "Other Items" -msgstr "" +#: ../settings/main.c:416 +msgid "Other Devices" +msgstr "Andre enheter" #. Display the file name, file type, and file size in the tooltip. -#: ../settings/main.c:496 +#: ../settings/main.c:529 #, c-format msgid "" "%s\n" "Type: %s\n" "Size: %s" -msgstr "" +msgstr "%s\nFiltype: %s\nStørrelse: %s" -#: ../settings/main.c:680 +#: ../settings/main.c:715 #, c-format msgid "Wallpaper for Monitor %d (%s)" -msgstr "" +msgstr "Skrivebordsbakgrunn for skjerm %d (%s)" -#: ../settings/main.c:683 +#: ../settings/main.c:718 #, c-format msgid "Wallpaper for Monitor %d" -msgstr "" +msgstr "Skrivebordsbakgrunn for skjerm %d" -#: ../settings/main.c:689 -msgid "" -"You are using more than one display, move this dialog to the display you " -"want to edit the settings for." -msgstr "" +#: ../settings/main.c:724 +msgid "Move this dialog to the display you want to edit the settings for." +msgstr "Flytt denne dialogen til skjermen du vil endre innstillingene for" -#: ../settings/main.c:697 +#: ../settings/main.c:731 #, c-format msgid "Wallpaper for %s on Monitor %d (%s)" -msgstr "" +msgstr "Skrivebordsbakgrunn for %s på skjerm %d (%s)" -#: ../settings/main.c:701 +#: ../settings/main.c:735 #, c-format msgid "Wallpaper for %s on Monitor %d" -msgstr "" +msgstr "Skrivebordsbakgrunn for %s på skjerm %d" -#: ../settings/main.c:708 +#: ../settings/main.c:742 msgid "" -"You are using more than one display, move this dialog to the display and " -"workspace you want to edit the settings for." -msgstr "" +"Move this dialog to the display and workspace you want to edit the settings " +"for." +msgstr "Flytt denne dialogen til skjermen og arbeidsområdet du vil endre innstillingene for." #. Single monitor and single workspace -#: ../settings/main.c:716 +#: ../settings/main.c:749 #, c-format msgid "Wallpaper for my desktop" -msgstr "" +msgstr "Min skrivebordsbakgrunn" #. Single monitor and per workspace wallpaper -#: ../settings/main.c:722 +#: ../settings/main.c:755 #, c-format msgid "Wallpaper for %s" -msgstr "" +msgstr "Skrivebordsbakgrunn for %s" -#: ../settings/main.c:727 +#: ../settings/main.c:760 msgid "Move this dialog to the workspace you want to edit the settings for." -msgstr "" +msgstr "Flytt denne dialogboksen til arbeidsområdet du vil endre innstillinger for." -#: ../settings/main.c:1130 +#: ../settings/main.c:1174 msgid "Image selection is unavailable while the image style is set to None." -msgstr "" +msgstr "Bildevalg er ikke tilgjengelig når bildestil er satt til ingen." -#: ../settings/main.c:1482 +#: ../settings/main.c:1524 msgid "Spanning screens" -msgstr "" +msgstr "Spenn over flere skjermer" -#: ../settings/main.c:1787 +#: ../settings/main.c:1826 msgid "Image files" msgstr "Bildefiler" -#: ../settings/main.c:1939 +#: ../settings/main.c:2002 msgid "Settings manager socket" msgstr "Innstillingsbehandlersokkel" -#: ../settings/main.c:1939 +#: ../settings/main.c:2002 msgid "SOCKET ID" msgstr "SOKKEL-ID" -#: ../settings/main.c:1940 +#: ../settings/main.c:2003 msgid "Version information" msgstr "Versjonsinformasjon" -#: ../settings/main.c:1967 +#: ../settings/main.c:2031 #, c-format msgid "Type '%s --help' for usage." msgstr "Skriv '%s --help' for hjelp" -#: ../settings/main.c:1979 +#: ../settings/main.c:2043 msgid "The Xfce development team. All rights reserved." msgstr "Xfce utviklingsteam. Alle rettigheter reservert." -#: ../settings/main.c:1980 +#: ../settings/main.c:2044 #, c-format msgid "Please report bugs to <%s>." msgstr "Rapporter feil til <%s>." -#: ../settings/main.c:1987 +#: ../settings/main.c:2051 msgid "Desktop Settings" msgstr "Skrivebordsinnstillinger" -#: ../settings/main.c:1989 +#: ../settings/main.c:2053 msgid "Unable to contact settings server" msgstr "Klarte ikke få kontakt med Xfce innstillingstjenesten" @@ -158,12 +158,13 @@ msgstr "Skrivebord " #: ../settings/xfce-backdrop-settings.desktop.in.h:2 -msgid "Set desktop background and menu and icon behaviour" -msgstr "Sett bakgrunnsbilde og tilpass innstillinger for meny og ikoner" +#: ../settings/xfdesktop-settings-ui.glade.h:11 +msgid "Set desktop background and menu and icon behavior" +msgstr "Sett bakgrunnsbilde og innstillinger for menyen og ikoner" #: ../settings/xfdesktop-settings-appearance-frame-ui.glade.h:1 msgid "Solid color" -msgstr "Enfarget" +msgstr "Ensfarget" #: ../settings/xfdesktop-settings-appearance-frame-ui.glade.h:2 msgid "Horizontal gradient" @@ -179,19 +180,19 @@ #: ../settings/xfdesktop-settings-appearance-frame-ui.glade.h:5 msgid "_Folder:" -msgstr "" +msgstr "_Mappe:" #: ../settings/xfdesktop-settings-appearance-frame-ui.glade.h:6 -msgid "Choose the folder to select wallpapers from" -msgstr "" +msgid "Choose the folder to select wallpapers from." +msgstr "Velg mappen som bakgrunnsbilder skal velges fra." #: ../settings/xfdesktop-settings-appearance-frame-ui.glade.h:7 msgid "St_yle:" msgstr "St_il:" #: ../settings/xfdesktop-settings-appearance-frame-ui.glade.h:8 -msgid "Specify how the image will be resized to fit the screen" -msgstr "Velger hvordan bildet manipuleres for å passe til skjermen" +msgid "Specify how the image will be resized to fit the screen." +msgstr "Angi hvordan bildet vil bli endret for å passe til skjermen." #: ../settings/xfdesktop-settings-appearance-frame-ui.glade.h:9 #: ../settings/xfdesktop-settings-ui.glade.h:4 @@ -220,27 +221,27 @@ #: ../settings/xfdesktop-settings-appearance-frame-ui.glade.h:15 msgid "Spanning Screens" -msgstr "" +msgstr "Spenn over flere skjermer" #: ../settings/xfdesktop-settings-appearance-frame-ui.glade.h:16 msgid "C_olor:" -msgstr "" +msgstr "_Farge:" #: ../settings/xfdesktop-settings-appearance-frame-ui.glade.h:17 -msgid "Specify the style of the color drawn behind the backdrop image" -msgstr "Velger stil for fargen som tegnes bak bakgrunnsbildet" +msgid "Specify the style of the color drawn behind the backdrop image." +msgstr "Velger stil for bakgrunnsfargen til bakgrunnsbildet." #: ../settings/xfdesktop-settings-appearance-frame-ui.glade.h:18 -msgid "Specifies the solid color, or the \"left\" or \"top\" color of the gradient" -msgstr "Velger ensfarget verdi eller den «venstre» eller «øverste» fargen i fargeovergangen" +msgid "Specifies the solid color, or the \"left\" or \"top\" color of the gradient." +msgstr "Angir ensfarget farge eller den «venstre» eller «øverste» fargen for fargeovergangen." #: ../settings/xfdesktop-settings-appearance-frame-ui.glade.h:19 msgid "Select First Color" msgstr "Velg første farge" #: ../settings/xfdesktop-settings-appearance-frame-ui.glade.h:20 -msgid "Specifies the \"right\" or \"bottom\" color of the gradient" -msgstr "Velger den «høyre» eller «nederste» fargen i fargeovergangen" +msgid "Specifies the \"right\" or \"bottom\" color of the gradient." +msgstr "Angir den «høyre» eller «nederste» fargen i fargeovergangen." #: ../settings/xfdesktop-settings-appearance-frame-ui.glade.h:21 msgid "Select Second Color" @@ -248,62 +249,62 @@ #: ../settings/xfdesktop-settings-appearance-frame-ui.glade.h:22 msgid "Apply to all _workspaces" -msgstr "" +msgstr "Bruk for alle arbeidsområder" #: ../settings/xfdesktop-settings-appearance-frame-ui.glade.h:23 msgid "Change the _background " -msgstr "" +msgstr "Endre _bakgrunnen" #: ../settings/xfdesktop-settings-appearance-frame-ui.glade.h:24 msgid "" "Automatically select a different background from the current directory." -msgstr "" +msgstr "Automatisk velg en annen bakgrunn fra den valgte mappen." #: ../settings/xfdesktop-settings-appearance-frame-ui.glade.h:25 -msgid "Specify how often the background will change" -msgstr "" +msgid "Specify how often the background will change." +msgstr "Angi hvor ofte bakgrunnen vil endres." #: ../settings/xfdesktop-settings-appearance-frame-ui.glade.h:26 msgid "in seconds:" -msgstr "" +msgstr "i sekunder:" #: ../settings/xfdesktop-settings-appearance-frame-ui.glade.h:27 msgid "in minutes:" -msgstr "" +msgstr "i minutter:" #: ../settings/xfdesktop-settings-appearance-frame-ui.glade.h:28 msgid "in hours:" -msgstr "" +msgstr "i timer:" #: ../settings/xfdesktop-settings-appearance-frame-ui.glade.h:29 msgid "at start up" -msgstr "" +msgstr "ved oppstart" #: ../settings/xfdesktop-settings-appearance-frame-ui.glade.h:30 msgid "every hour" -msgstr "" +msgstr "hver time" #: ../settings/xfdesktop-settings-appearance-frame-ui.glade.h:31 msgid "every day" -msgstr "" +msgstr "hver dag" #: ../settings/xfdesktop-settings-appearance-frame-ui.glade.h:32 msgid "chronologically" -msgstr "" +msgstr "kronologisk" #: ../settings/xfdesktop-settings-appearance-frame-ui.glade.h:33 msgid "Amount of time before a different background is selected." -msgstr "" +msgstr "Tid før en annen bakgrunn velges." #: ../settings/xfdesktop-settings-appearance-frame-ui.glade.h:34 msgid "_Random Order" -msgstr "" +msgstr "_Tilfeldig rekkefølge" #: ../settings/xfdesktop-settings-appearance-frame-ui.glade.h:35 msgid "" "Randomly selects another image from the same directory when the wallpaper is" " to cycle." -msgstr "" +msgstr "Velger et annet bilde fra samme mappe tilfeldig når bakgrunnsbilde er satt til syklus." #: ../settings/xfdesktop-settings-ui.glade.h:1 msgid "Left" @@ -337,14 +338,10 @@ msgid "File/launcher icons" msgstr "Fil/snarvei-ikon" -#: ../settings/xfdesktop-settings-ui.glade.h:10 ../src/xfce-desktop.c:1016 +#: ../settings/xfdesktop-settings-ui.glade.h:10 ../src/xfce-desktop.c:1000 msgid "Desktop" msgstr "Skrivebord" -#: ../settings/xfdesktop-settings-ui.glade.h:11 -msgid "Set desktop background and menu and icon behavior" -msgstr "Sett bakgrunnsbilde og innstillinger for menyen og ikoner" - #: ../settings/xfdesktop-settings-ui.glade.h:12 msgid "_Background" msgstr "_Bakgrunn" @@ -402,56 +399,60 @@ msgstr "Vis _faste vinduer kun i aktivt arbeidsområde" #: ../settings/xfdesktop-settings-ui.glade.h:26 +msgid "Show a_dd and remove workspace options in list" +msgstr "Vis valg for till_egg til og fjerning av arbeidsområde i listen" + +#: ../settings/xfdesktop-settings-ui.glade.h:27 msgid "Window List Menu" msgstr "Vinduslistemeny" -#: ../settings/xfdesktop-settings-ui.glade.h:27 +#: ../settings/xfdesktop-settings-ui.glade.h:28 msgid "_Menus" msgstr "_Menyer" -#: ../settings/xfdesktop-settings-ui.glade.h:28 +#: ../settings/xfdesktop-settings-ui.glade.h:29 msgid "Icon _type:" msgstr "Ikon_type:" -#: ../settings/xfdesktop-settings-ui.glade.h:29 +#: ../settings/xfdesktop-settings-ui.glade.h:30 msgid "Icon _size:" msgstr "Ikon_størrelse:" -#: ../settings/xfdesktop-settings-ui.glade.h:30 +#: ../settings/xfdesktop-settings-ui.glade.h:31 msgid "Show t_humbnails" -msgstr "" +msgstr "Vis _miniatyrbilder" -#: ../settings/xfdesktop-settings-ui.glade.h:31 +#: ../settings/xfdesktop-settings-ui.glade.h:32 msgid "" "Select this option to display preview-able files on the desktop as " "automatically generated thumbnail icons." -msgstr "" +msgstr "Velg dette alternativet for at filer på skrivebordet der innholdet kan forhåndsvises som automatisk genererte miniatyrikoner." -#: ../settings/xfdesktop-settings-ui.glade.h:32 +#: ../settings/xfdesktop-settings-ui.glade.h:33 msgid "Single _click to activate items" -msgstr "" +msgstr "_Enkeltklikk for å aktivere elementer" -#: ../settings/xfdesktop-settings-ui.glade.h:33 +#: ../settings/xfdesktop-settings-ui.glade.h:34 msgid "Show icon tooltips. Size:" -msgstr "" +msgstr "Visning av ikoner for verktøystips. Størrelse:" -#: ../settings/xfdesktop-settings-ui.glade.h:34 +#: ../settings/xfdesktop-settings-ui.glade.h:35 msgid "Size of the tooltip preview image." -msgstr "" +msgstr "Størrelsen på verktøytipsets forhåndsvisnings-bilde." -#: ../settings/xfdesktop-settings-ui.glade.h:35 +#: ../settings/xfdesktop-settings-ui.glade.h:36 msgid "Use custom _font size:" msgstr "Valgfri s_kriftstørrelse:" -#: ../settings/xfdesktop-settings-ui.glade.h:36 +#: ../settings/xfdesktop-settings-ui.glade.h:37 msgid "Appearance" msgstr "Utseende" -#: ../settings/xfdesktop-settings-ui.glade.h:37 +#: ../settings/xfdesktop-settings-ui.glade.h:38 msgid "Default Icons" msgstr "Standardikoner" -#: ../settings/xfdesktop-settings-ui.glade.h:38 +#: ../settings/xfdesktop-settings-ui.glade.h:39 msgid "_Icons" msgstr "_Ikoner" @@ -459,305 +460,319 @@ msgid "_Applications" msgstr "_Programmer" -#: ../src/windowlist.c:72 +#: ../src/windowlist.c:73 #, c-format msgid "Remove Workspace %d" -msgstr "" +msgstr "Fjern arbeidsområde %d" -#: ../src/windowlist.c:73 +#: ../src/windowlist.c:74 #, c-format msgid "" "Do you really want to remove workspace %d?\n" "Note: You are currently on workspace %d." -msgstr "" +msgstr "Ønsker du virkelig å fjerne arbeidsområdet %d?\nMerk: Du befinner deg for øyeblikket på arbeidsområdet %d." -#: ../src/windowlist.c:77 +#: ../src/windowlist.c:78 #, c-format msgid "Remove Workspace '%s'" -msgstr "" +msgstr "Fjern arbeidsområde «%s»" -#: ../src/windowlist.c:78 +#: ../src/windowlist.c:79 #, c-format msgid "" "Do you really want to remove workspace '%s'?\n" "Note: You are currently on workspace '%s'." -msgstr "" +msgstr "Ønsker du virkelig å fjerne arbeidsområdet «%s»?\nMerk: Du befinner deg for øyeblikket på arbeidsområdet «%s»." #. Popup a dialog box confirming that the user wants to remove a #. * workspace -#: ../src/windowlist.c:85 +#: ../src/windowlist.c:86 msgid "Remove" -msgstr "" +msgstr "Fjern" -#: ../src/windowlist.c:245 +#: ../src/windowlist.c:246 msgid "Window List" msgstr "Vindusliste" -#: ../src/windowlist.c:271 +#: ../src/windowlist.c:272 #, c-format msgid "Workspace %d" msgstr "Skrivebord %d" -#: ../src/windowlist.c:360 ../src/windowlist.c:363 +#: ../src/windowlist.c:362 ../src/windowlist.c:365 msgid "_Add Workspace" msgstr "_Legg til skrivebord" -#: ../src/windowlist.c:371 +#: ../src/windowlist.c:373 #, c-format msgid "_Remove Workspace %d" msgstr "_Fjern skrivebordet %d" -#: ../src/windowlist.c:374 +#: ../src/windowlist.c:376 #, c-format msgid "_Remove Workspace '%s'" msgstr "_Fjern skrivebordet '%s'" -#: ../src/xfdesktop-application.c:773 +#: ../src/xfdesktop-app-menu-item.c:349 +#: ../src/xfdesktop-file-icon-manager.c:823 +#: ../src/xfdesktop-file-icon-manager.c:1088 +#: ../src/xfdesktop-file-icon-manager.c:1284 ../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 "Feil ved programstart" + +#: ../src/xfdesktop-app-menu-item.c:351 +#: ../src/xfdesktop-file-icon-manager.c:1090 +msgid "" +"Unable to launch \"exo-desktop-item-edit\", which is required to create and " +"edit launchers and links on the desktop." +msgstr "Klarte ikke å starte «exo-desktop-item-edit», som er påkrevet for opprette eller redigere snarveier og lenker på skrivebordet." + +#: ../src/xfdesktop-application.c:800 msgid "Display version information" -msgstr "" +msgstr "Vis versjonsinformasjon" -#: ../src/xfdesktop-application.c:774 +#: ../src/xfdesktop-application.c:801 msgid "Reload all settings" -msgstr "" +msgstr "Last inn innstillinger på ny" -#: ../src/xfdesktop-application.c:775 +#: ../src/xfdesktop-application.c:802 msgid "Pop up the menu (at the current mouse position)" -msgstr "" +msgstr "Vis menyen (ved gjeldende pekerposisjon)" -#: ../src/xfdesktop-application.c:776 +#: ../src/xfdesktop-application.c:803 msgid "Pop up the window list (at the current mouse position)" -msgstr "" +msgstr "Vis vinduslisten (ved gjeldende pekerposisjon)" -#: ../src/xfdesktop-application.c:778 +#: ../src/xfdesktop-application.c:805 msgid "Automatically arrange all the icons on the desktop" -msgstr "" +msgstr "Sorter automatisk alle skrivebordsikoner" + +#: ../src/xfdesktop-application.c:807 +msgid "Enable debug messages" +msgstr "Aktiver feilsøkingsmeldinger" -#: ../src/xfdesktop-application.c:780 +#: ../src/xfdesktop-application.c:808 +msgid "Disable debug messages" +msgstr "Deaktiver feilsøkingsmeldinger" + +#: ../src/xfdesktop-application.c:809 msgid "Do not wait for a window manager on startup" -msgstr "" +msgstr "Ikke vent på vindusbehandler ved oppstart" -#: ../src/xfdesktop-application.c:781 +#: ../src/xfdesktop-application.c:810 msgid "Cause xfdesktop to quit" -msgstr "" +msgstr "Sørger for å avslutte xfdesktop" -#: ../src/xfdesktop-application.c:796 +#: ../src/xfdesktop-application.c:825 #, c-format msgid "Failed to parse arguments: %s\n" -msgstr "" +msgstr "Klarte ikke å tolke argumentene: %s\n" -#: ../src/xfdesktop-application.c:807 +#: ../src/xfdesktop-application.c:836 #, c-format msgid "This is %s version %s, running on Xfce %s.\n" -msgstr "" +msgstr "Dette er %s versjon %s, kjørende på Xfce %s.\n" -#: ../src/xfdesktop-application.c:809 +#: ../src/xfdesktop-application.c:838 #, c-format msgid "Built with GTK+ %d.%d.%d, linked with GTK+ %d.%d.%d." -msgstr "" +msgstr "Bygd med GTK+ %d.%d.%d, lenket sammen med GTK+ %d.%d.%d." -#: ../src/xfdesktop-application.c:813 +#: ../src/xfdesktop-application.c:842 #, c-format msgid "Build options:\n" -msgstr "" +msgstr "Kompileringsvalg:\n" -#: ../src/xfdesktop-application.c:814 +#: ../src/xfdesktop-application.c:843 #, c-format msgid " Desktop Menu: %s\n" -msgstr "" +msgstr "Skrivebordsmeny: %s\n" -#: ../src/xfdesktop-application.c:816 ../src/xfdesktop-application.c:823 -#: ../src/xfdesktop-application.c:830 +#: ../src/xfdesktop-application.c:845 ../src/xfdesktop-application.c:852 +#: ../src/xfdesktop-application.c:859 msgid "enabled" -msgstr "" +msgstr "aktivert" -#: ../src/xfdesktop-application.c:818 ../src/xfdesktop-application.c:825 -#: ../src/xfdesktop-application.c:832 +#: ../src/xfdesktop-application.c:847 ../src/xfdesktop-application.c:854 +#: ../src/xfdesktop-application.c:861 msgid "disabled" -msgstr "" +msgstr "deaktivert" -#: ../src/xfdesktop-application.c:821 +#: ../src/xfdesktop-application.c:850 #, c-format msgid " Desktop Icons: %s\n" -msgstr "" +msgstr " Skrivebordsikoner: %s\n" -#: ../src/xfdesktop-application.c:828 +#: ../src/xfdesktop-application.c:857 #, c-format msgid " Desktop File Icons: %s\n" -msgstr "" +msgstr "Skrivebordsikoner for 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 "Klarte ikke lage skrivebordsmappen «%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 "Feil med skrivebordsmappe" -#: ../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 samme navn eksisterer allerede. Vennligst slett eller gi den et nytt navn" -#: ../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 "Feil ved endring av navn" -#: ../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 "" +msgstr "Filene kunne ikke gis nytt navn" -#: ../src/xfdesktop-file-icon-manager.c:687 +#: ../src/xfdesktop-file-icon-manager.c:631 msgid "None of the icons selected support being renamed." -msgstr "" +msgstr "Ingen av de valgte ikonene støtter å gis nytt navn." -#: ../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 "Papirkurvfeil" -#: ../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 "Valgte filer kunne ikke kastes" -#: ../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 "Denne funksjonen krever en filutforskertjeneste tilgjengelig (så som den som tilbys 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:1283 #, c-format msgid "Unable to launch \"%s\":" msgstr "Kunne ikke starte «%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 -msgid "Launch Error" -msgstr "Feil ved programstart" - -#: ../src/xfdesktop-file-icon-manager.c:1064 +#: ../src/xfdesktop-file-icon-manager.c:1012 #, c-format msgid "_Open With \"%s\"" msgstr "_Åpnes med «%s»" -#: ../src/xfdesktop-file-icon-manager.c:1067 +#: ../src/xfdesktop-file-icon-manager.c:1015 #, c-format msgid "Open With \"%s\"" msgstr "Åpnes med «%s»" -#: ../src/xfdesktop-file-icon-manager.c:1142 -msgid "" -"Unable to launch \"exo-desktop-item-edit\", which is required to create and " -"edit launchers and links on the desktop." -msgstr "Klarte ikke å starte «exo-desktop-item-edit», som er påkrevet for opprette eller redigere snarveier og lenker på skrivebordet." - -#: ../src/xfdesktop-file-icon-manager.c:1393 +#: ../src/xfdesktop-file-icon-manager.c:1341 msgid "_Open all" msgstr "_Åpne alle" -#: ../src/xfdesktop-file-icon-manager.c:1409 +#: ../src/xfdesktop-file-icon-manager.c:1357 msgid "_Open in New Window" msgstr "_Åpne i nytt vindu" -#: ../src/xfdesktop-file-icon-manager.c:1411 -#: ../src/xfdesktop-special-file-icon.c:550 ../src/xfdesktop-volume-icon.c:814 -#: ../src/xfdesktop-volume-icon.c:818 +#: ../src/xfdesktop-file-icon-manager.c:1359 +#: ../src/xfdesktop-special-file-icon.c:547 ../src/xfdesktop-volume-icon.c:813 msgid "_Open" msgstr "_Åpne" #. create launcher item -#: ../src/xfdesktop-file-icon-manager.c:1430 +#: ../src/xfdesktop-file-icon-manager.c:1378 msgid "Create _Launcher..." msgstr "Lag ny _snarvei..." #. create link item -#: ../src/xfdesktop-file-icon-manager.c:1446 +#: ../src/xfdesktop-file-icon-manager.c:1394 msgid "Create _URL Link..." msgstr "Lag ny _nettlenke..." #. create folder item -#: ../src/xfdesktop-file-icon-manager.c:1462 +#: ../src/xfdesktop-file-icon-manager.c:1410 msgid "Create _Folder..." msgstr "Lag ny _mappe..." -#: ../src/xfdesktop-file-icon-manager.c:1477 +#: ../src/xfdesktop-file-icon-manager.c:1425 msgid "Create From _Template" msgstr "Lag dokument fra m_al" -#: ../src/xfdesktop-file-icon-manager.c:1506 +#: ../src/xfdesktop-file-icon-manager.c:1454 msgid "_Empty File" msgstr "_Tom fil" -#: ../src/xfdesktop-file-icon-manager.c:1523 +#: ../src/xfdesktop-file-icon-manager.c:1471 msgid "_Execute" msgstr "_Kjør" -#: ../src/xfdesktop-file-icon-manager.c:1543 +#: ../src/xfdesktop-file-icon-manager.c:1491 msgid "_Edit Launcher" msgstr "_Endre programstarter" -#: ../src/xfdesktop-file-icon-manager.c:1578 +#: ../src/xfdesktop-file-icon-manager.c:1526 msgid "Open With" msgstr "Åpne med" -#: ../src/xfdesktop-file-icon-manager.c:1604 +#: ../src/xfdesktop-file-icon-manager.c:1552 msgid "Open With Other _Application..." msgstr "Åpne med et annet _Program" +#. Trash +#: ../src/xfdesktop-file-icon-manager.c:1639 +msgid "Mo_ve to Trash" +msgstr "Flytt til papirkurven" + #. Rename -#: ../src/xfdesktop-file-icon-manager.c:1704 +#: ../src/xfdesktop-file-icon-manager.c:1670 msgid "_Rename..." msgstr "_Gi nytt navn..." -#: ../src/xfdesktop-file-icon-manager.c:1732 +#: ../src/xfdesktop-file-icon-manager.c:1698 msgid "Arrange Desktop _Icons" -msgstr "" +msgstr "Sorter skrivebordsikoner" -#: ../src/xfdesktop-file-icon-manager.c:1743 +#: ../src/xfdesktop-file-icon-manager.c:1709 msgid "Desktop _Settings..." msgstr "Skrivebords_innstillinger ..." -#: ../src/xfdesktop-file-icon-manager.c:1754 -#: ../src/xfdesktop-volume-icon.c:860 +#: ../src/xfdesktop-file-icon-manager.c:1720 +#: ../src/xfdesktop-volume-icon.c:855 msgid "P_roperties..." msgstr "_Egenskaper" -#: ../src/xfdesktop-file-icon-manager.c:2747 +#: ../src/xfdesktop-file-icon-manager.c:2667 msgid "Load Error" msgstr "Feil ved lasting" -#: ../src/xfdesktop-file-icon-manager.c:2749 +#: ../src/xfdesktop-file-icon-manager.c:2669 msgid "Failed to load the desktop folder" msgstr "Klarte ikke laste skrivebordsmappen" -#: ../src/xfdesktop-file-icon-manager.c:3289 +#: ../src/xfdesktop-file-icon-manager.c:3214 msgid "Copy _Here" -msgstr "" +msgstr "_Kopier hit" -#: ../src/xfdesktop-file-icon-manager.c:3289 +#: ../src/xfdesktop-file-icon-manager.c:3214 msgid "_Move Here" -msgstr "" +msgstr "_Flytt hit" -#: ../src/xfdesktop-file-icon-manager.c:3289 +#: ../src/xfdesktop-file-icon-manager.c:3214 msgid "_Link Here" -msgstr "" +msgstr "_Lenke hit" #. TRANSLATORS: file was modified less than one day ago #: ../src/xfdesktop-file-utils.c:140 @@ -788,88 +803,88 @@ msgid "Unknown" msgstr "Ukjent" -#: ../src/xfdesktop-file-utils.c:658 +#: ../src/xfdesktop-file-utils.c:665 msgid "The folder could not be opened" msgstr "Mappen kunne ikke åpnes" -#: ../src/xfdesktop-file-utils.c:675 +#: ../src/xfdesktop-file-utils.c:682 msgid "Error" -msgstr "" +msgstr "Feil" -#: ../src/xfdesktop-file-utils.c:676 +#: ../src/xfdesktop-file-utils.c:683 msgid "The requested operation could not be completed" -msgstr "" +msgstr "Den forespurte handlingen kan ikke fullføres" -#: ../src/xfdesktop-file-utils.c:717 +#: ../src/xfdesktop-file-utils.c:724 msgid "The file could not be renamed" msgstr "Filen kunne ikke gis nytt navn" -#: ../src/xfdesktop-file-utils.c:819 +#: ../src/xfdesktop-file-utils.c:826 msgid "Delete Error" msgstr "Feil ved sletting" -#: ../src/xfdesktop-file-utils.c:820 +#: ../src/xfdesktop-file-utils.c:827 msgid "The selected files could not be deleted" -msgstr "Det tilknyttede programmet kunne ikke kjøres eller bli funnet." +msgstr "De valgte filene kunne ikke slettes" -#: ../src/xfdesktop-file-utils.c:870 +#: ../src/xfdesktop-file-utils.c:877 msgid "The selected files could not be moved to the trash" -msgstr "Valgte filer kunne ikke flyttes til papirkurven" +msgstr "De valgte filene kunne ikke flyttes til papirkurven" -#: ../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 "Denne funksjonen krever en papirkurvtjeneste tilgjengelig (så som den som tilbys av Thunar)." -#: ../src/xfdesktop-file-utils.c:907 +#: ../src/xfdesktop-file-utils.c:914 msgid "Could not empty the trash" msgstr "Klarte ikke tømme papirkurven" -#: ../src/xfdesktop-file-utils.c:950 +#: ../src/xfdesktop-file-utils.c:957 msgid "Create File Error" msgstr "Feil ved filopprettelse" -#: ../src/xfdesktop-file-utils.c:951 +#: ../src/xfdesktop-file-utils.c:958 msgid "Could not create a new file" msgstr "Klarte ikke lage ny fil" -#: ../src/xfdesktop-file-utils.c:997 +#: ../src/xfdesktop-file-utils.c:1004 msgid "Create Document Error" msgstr "Feil ved filopprettelse" -#: ../src/xfdesktop-file-utils.c:998 +#: ../src/xfdesktop-file-utils.c:1005 msgid "Could not create a new document from the template" msgstr "Klarte ikke lage nytt dokument fra malen" -#: ../src/xfdesktop-file-utils.c:1038 +#: ../src/xfdesktop-file-utils.c:1045 msgid "File Properties Error" msgstr "Feil i filegenskaper" -#: ../src/xfdesktop-file-utils.c:1039 +#: ../src/xfdesktop-file-utils.c:1046 msgid "The file properties dialog could not be opened" msgstr "Filegenskapsvindu kunne ikke åpnes" -#: ../src/xfdesktop-file-utils.c:1080 +#: ../src/xfdesktop-file-utils.c:1087 msgid "The file could not be opened" msgstr "Filen kunne ikke åpnes" -#: ../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 "Klarte ikke starte «%s»:" -#: ../src/xfdesktop-file-utils.c:1234 +#: ../src/xfdesktop-file-utils.c:1241 msgid "The application chooser could not be opened" msgstr "Applikasjonsvelgeren kunne ikke åpnes" -#: ../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 "Overføringsfeil" -#: ../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 "Filoverføringen kunne ikke gjennomføres" @@ -901,12 +916,12 @@ #: ../src/xfdesktop-notify.c:221 msgid "Unmount Finished" -msgstr "" +msgstr "Amontering fullført" #: ../src/xfdesktop-notify.c:223 ../src/xfdesktop-notify.c:408 #, c-format msgid "The device \"%s\" has been safely removed from the system. " -msgstr "" +msgstr "Enheten «%s» har blitt trygt fjernet i fra systemet." #. TRANSLATORS: Please use the same translation here as in Thunar #: ../src/xfdesktop-notify.c:313 @@ -921,9 +936,9 @@ #: ../src/xfdesktop-notify.c:406 msgid "Eject Finished" -msgstr "" +msgstr "Utløsing fullført" -#: ../src/xfdesktop-regular-file-icon.c:606 +#: ../src/xfdesktop-regular-file-icon.c:748 #, c-format msgid "" "Type: %s\n" @@ -949,7 +964,7 @@ msgid "Trash contains %d items" msgstr "Papirkurven inneholde %d elementer" -#: ../src/xfdesktop-special-file-icon.c:498 +#: ../src/xfdesktop-special-file-icon.c:495 #, c-format msgid "" "%s\n" @@ -957,11 +972,11 @@ "Last modified: %s" msgstr "%s\nStørrelse: %s\nSist endret: %s" -#: ../src/xfdesktop-special-file-icon.c:567 +#: ../src/xfdesktop-special-file-icon.c:564 msgid "_Empty Trash" msgstr "_Tøm papirkurven" -#: ../src/xfdesktop-volume-icon.c:486 +#: ../src/xfdesktop-volume-icon.c:482 #, c-format msgid "" "Removable Volume\n" @@ -969,42 +984,42 @@ "%s left (%s total)" msgstr "Avmonterbart volum\nMontert på «%s»\n%s ledig (%s totalt)" -#: ../src/xfdesktop-volume-icon.c:493 +#: ../src/xfdesktop-volume-icon.c:489 msgid "" "Removable Volume\n" "Not mounted yet" msgstr "Avmonterbart volum\nIkke montert" -#: ../src/xfdesktop-volume-icon.c:522 ../src/xfdesktop-volume-icon.c:567 +#: ../src/xfdesktop-volume-icon.c:518 ../src/xfdesktop-volume-icon.c:563 #, c-format msgid "Failed to eject \"%s\"" msgstr "Klarte ikke løse ut «%s»" -#: ../src/xfdesktop-volume-icon.c:527 ../src/xfdesktop-volume-icon.c:572 +#: ../src/xfdesktop-volume-icon.c:523 ../src/xfdesktop-volume-icon.c:568 msgid "Eject Failed" msgstr "Feilet å løse ut" -#: ../src/xfdesktop-volume-icon.c:604 +#: ../src/xfdesktop-volume-icon.c:600 #, c-format msgid "Failed to mount \"%s\"" msgstr "Klarte ikke montere «%s»" -#: ../src/xfdesktop-volume-icon.c:607 +#: ../src/xfdesktop-volume-icon.c:603 msgid "Mount Failed" msgstr "Montering feilet" -#: ../src/xfdesktop-volume-icon.c:833 +#: ../src/xfdesktop-volume-icon.c:828 msgid "E_ject Volume" msgstr "_Løs ut dataområde" -#: ../src/xfdesktop-volume-icon.c:840 +#: ../src/xfdesktop-volume-icon.c:835 msgid "_Unmount Volume" -msgstr "" +msgstr "_Avmonter enhet" -#: ../src/xfdesktop-volume-icon.c:847 +#: ../src/xfdesktop-volume-icon.c:842 msgid "_Mount Volume" msgstr "_Monter dataområde" #: ../src/xfdesktop-window-icon.c:195 msgid "_Window Actions" -msgstr "" +msgstr "_Vindushandlinger" diff -Nru xfdesktop4-4.11.6/po/nl.po xfdesktop4-4.19.2/po/nl.po --- xfdesktop4-4.11.6/po/nl.po 2014-04-05 18:59:11.000000000 +0000 +++ xfdesktop4-4.19.2/po/nl.po 2014-08-11 07:27:27.000000000 +0000 @@ -4,16 +4,16 @@ # # Translators: # Jasper Huijsmans , 2004 -# Pjotr123 , 2013-2014 +# Pjotr , 2013-2014 # Pjotr pjotrvertaalt@gmail.com , 2011,2013 msgid "" msgstr "" "Project-Id-Version: Xfdesktop\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2014-04-03 18:32+0200\n" -"PO-Revision-Date: 2014-04-04 13:00+0000\n" -"Last-Translator: Pjotr123 \n" -"Language-Team: Dutch (http://www.transifex.com/projects/p/xfce/language/nl/)\n" +"POT-Creation-Date: 2014-08-03 12:32+0200\n" +"PO-Revision-Date: 2014-08-05 09:42+0000\n" +"Last-Translator: Pjotr \n" +"Language-Team: Dutch (http://www.transifex.com/projects/p/xfdesktop/language/nl/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" @@ -108,45 +108,45 @@ msgid "Image selection is unavailable while the image style is set to None." msgstr "Afbeeldingkeuze is niet beschikbaar wanneer de afbeeldingstijl op Geen is ingesteld." -#: ../settings/main.c:1523 +#: ../settings/main.c:1524 msgid "Spanning screens" msgstr "Schermen overbruggen" -#: ../settings/main.c:1825 +#: ../settings/main.c:1831 msgid "Image files" msgstr "Afbeeldingbestanden" -#: ../settings/main.c:2001 +#: ../settings/main.c:2010 msgid "Settings manager socket" msgstr "Contactpunt voor instellingenbeheerder" -#: ../settings/main.c:2001 +#: ../settings/main.c:2010 msgid "SOCKET ID" msgstr "SOCKET ID" -#: ../settings/main.c:2002 +#: ../settings/main.c:2011 msgid "Version information" msgstr "Versie-informatie" -#: ../settings/main.c:2030 +#: ../settings/main.c:2039 #, c-format msgid "Type '%s --help' for usage." msgstr "Tik '%s --help' voor gebruiksinformatie." -#: ../settings/main.c:2042 +#: ../settings/main.c:2051 msgid "The Xfce development team. All rights reserved." msgstr "De Xfce-ontwikkelploeg. Alle rechten voorbehouden." -#: ../settings/main.c:2043 +#: ../settings/main.c:2052 #, c-format msgid "Please report bugs to <%s>." msgstr "Gelieve fouten te melden aan <%s>" -#: ../settings/main.c:2050 +#: ../settings/main.c:2059 msgid "Desktop Settings" msgstr "Bureaublad-instellingen" -#: ../settings/main.c:2052 +#: ../settings/main.c:2061 msgid "Unable to contact settings server" msgstr "Kan geen contact maken met de instellingendienst" @@ -155,8 +155,9 @@ msgstr "Bureaublad" #: ../settings/xfce-backdrop-settings.desktop.in.h:2 -msgid "Set desktop background and menu and icon behaviour" -msgstr "Stel de bureaubladachtergrond in en het gedrag van het menu en de pictogrammen" +#: ../settings/xfdesktop-settings-ui.glade.h:11 +msgid "Set desktop background and menu and icon behavior" +msgstr "Stel het gedrag in van de bureaubladachtergrond, het menu en de pictogrammen" #: ../settings/xfdesktop-settings-appearance-frame-ui.glade.h:1 msgid "Solid color" @@ -334,14 +335,10 @@ msgid "File/launcher icons" msgstr "Bestand/starterpictogrammen" -#: ../settings/xfdesktop-settings-ui.glade.h:10 ../src/xfce-desktop.c:1020 +#: ../settings/xfdesktop-settings-ui.glade.h:10 ../src/xfce-desktop.c:1007 msgid "Desktop" msgstr "Bureaublad" -#: ../settings/xfdesktop-settings-ui.glade.h:11 -msgid "Set desktop background and menu and icon behavior" -msgstr "Stel het gedrag in van de bureaubladachtergrond, het menu en de pictogrammen" - #: ../settings/xfdesktop-settings-ui.glade.h:12 msgid "_Background" msgstr "_Achtergrond" @@ -433,26 +430,30 @@ msgstr "Onderdelen activeren met enkele klik" #: ../settings/xfdesktop-settings-ui.glade.h:34 +msgid "Show hidden files on the desktop" +msgstr "Toon verborgen bestanden op het bureaublad" + +#: ../settings/xfdesktop-settings-ui.glade.h:35 msgid "Show icon tooltips. Size:" msgstr "Toon gereedschaptips bij pictogrammen. Afmeting:" -#: ../settings/xfdesktop-settings-ui.glade.h:35 +#: ../settings/xfdesktop-settings-ui.glade.h:36 msgid "Size of the tooltip preview image." msgstr "Grootte van de afbeelding-voorbeeldweergave van de gereedschaptip." -#: ../settings/xfdesktop-settings-ui.glade.h:36 +#: ../settings/xfdesktop-settings-ui.glade.h:37 msgid "Use custom _font size:" msgstr "Gebruik aangepaste _lettertypegrootte:" -#: ../settings/xfdesktop-settings-ui.glade.h:37 +#: ../settings/xfdesktop-settings-ui.glade.h:38 msgid "Appearance" msgstr "Uiterlijk" -#: ../settings/xfdesktop-settings-ui.glade.h:38 +#: ../settings/xfdesktop-settings-ui.glade.h:39 msgid "Default Icons" msgstr "Standaardpictogrammen" -#: ../settings/xfdesktop-settings-ui.glade.h:39 +#: ../settings/xfdesktop-settings-ui.glade.h:40 msgid "_Icons" msgstr "_Pictogrammen" @@ -514,250 +515,267 @@ msgstr "Werkblad '%s' _verwijderen" #: ../src/xfdesktop-app-menu-item.c:349 -#: ../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:1132 ../src/xfdesktop-file-utils.c:1209 -#: ../src/xfdesktop-file-utils.c:1234 ../src/xfdesktop-file-utils.c:1286 +#: ../src/xfdesktop-file-icon-manager.c:860 +#: ../src/xfdesktop-file-icon-manager.c:1125 +#: ../src/xfdesktop-file-icon-manager.c:1321 ../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 "Startfout" #: ../src/xfdesktop-app-menu-item.c:351 -#: ../src/xfdesktop-file-icon-manager.c:1086 +#: ../src/xfdesktop-file-icon-manager.c:1127 msgid "" "Unable to launch \"exo-desktop-item-edit\", which is required to create and " "edit launchers and links on the desktop." msgstr "Kon 'exo-desktop-item-edit' niet uitvoeren, hetgeen vereist is voor het maken en bewerken van starters en snelkoppelingen op het bureaublad." -#: ../src/xfdesktop-application.c:768 +#: ../src/xfdesktop-application.c:836 msgid "Display version information" msgstr "Toon versie-informatie" -#: ../src/xfdesktop-application.c:769 +#: ../src/xfdesktop-application.c:837 msgid "Reload all settings" msgstr "Herlaad alle instellingen" -#: ../src/xfdesktop-application.c:770 +#: ../src/xfdesktop-application.c:838 +msgid "Advance to the next wallpaper on the current workspace" +msgstr "Ga door naar de volgende bureaubladachtergrond op het huidige werkblad" + +#: ../src/xfdesktop-application.c:839 msgid "Pop up the menu (at the current mouse position)" msgstr "Laat het menu opduiken (op de huidige muispositie)" -#: ../src/xfdesktop-application.c:771 +#: ../src/xfdesktop-application.c:840 msgid "Pop up the window list (at the current mouse position)" msgstr "Laat de vensterlijst opduiken (op de huidige muispositie)" -#: ../src/xfdesktop-application.c:773 +#: ../src/xfdesktop-application.c:842 msgid "Automatically arrange all the icons on the desktop" msgstr "Alle pictogrammen op het bureaublad automatisch rangschikken" -#: ../src/xfdesktop-application.c:775 +#: ../src/xfdesktop-application.c:844 +msgid "Enable debug messages" +msgstr "Foutopsporingsberichten inschakelen" + +#: ../src/xfdesktop-application.c:845 +msgid "Disable debug messages" +msgstr "Foutopsporingsberichten uitschakelen" + +#: ../src/xfdesktop-application.c:846 msgid "Do not wait for a window manager on startup" msgstr "Wacht niet op een vensterbeheerder bij opstart" -#: ../src/xfdesktop-application.c:776 +#: ../src/xfdesktop-application.c:847 msgid "Cause xfdesktop to quit" msgstr "Maak dat xfdesktop volledig sluit" -#: ../src/xfdesktop-application.c:791 +#: ../src/xfdesktop-application.c:862 #, c-format msgid "Failed to parse arguments: %s\n" msgstr "Kon argumenten niet lezen: %s\n" -#: ../src/xfdesktop-application.c:802 +#: ../src/xfdesktop-application.c:873 #, c-format msgid "This is %s version %s, running on Xfce %s.\n" msgstr "Dit is %s versie %s, draaiend op Xfce %s.\n" -#: ../src/xfdesktop-application.c:804 +#: ../src/xfdesktop-application.c:875 #, c-format msgid "Built with GTK+ %d.%d.%d, linked with GTK+ %d.%d.%d." msgstr "Gemaakt met GTK+ %d.%d.%d, gekoppeld aan GTK+ %d.%d.%d." -#: ../src/xfdesktop-application.c:808 +#: ../src/xfdesktop-application.c:879 #, c-format msgid "Build options:\n" msgstr "Bouw-opties:\n" -#: ../src/xfdesktop-application.c:809 +#: ../src/xfdesktop-application.c:880 #, c-format msgid " Desktop Menu: %s\n" msgstr "Bureaubladmenu: %s\n" -#: ../src/xfdesktop-application.c:811 ../src/xfdesktop-application.c:818 -#: ../src/xfdesktop-application.c:825 +#: ../src/xfdesktop-application.c:882 ../src/xfdesktop-application.c:889 +#: ../src/xfdesktop-application.c:896 msgid "enabled" msgstr "ingeschakeld" -#: ../src/xfdesktop-application.c:813 ../src/xfdesktop-application.c:820 -#: ../src/xfdesktop-application.c:827 +#: ../src/xfdesktop-application.c:884 ../src/xfdesktop-application.c:891 +#: ../src/xfdesktop-application.c:898 msgid "disabled" msgstr "uitgeschakeld" -#: ../src/xfdesktop-application.c:816 +#: ../src/xfdesktop-application.c:887 #, c-format msgid " Desktop Icons: %s\n" msgstr "Bureaubladpictogrammen: %s\n" -#: ../src/xfdesktop-application.c:823 +#: ../src/xfdesktop-application.c:894 #, c-format msgid " Desktop File Icons: %s\n" msgstr "Pictogrammen van bureaubladbestanden: %s\n" -#: ../src/xfdesktop-file-icon-manager.c:522 -#: ../src/xfdesktop-file-icon-manager.c:539 +#: ../src/xfdesktop-file-icon-manager.c:559 +#: ../src/xfdesktop-file-icon-manager.c:576 #, c-format msgid "Could not create the desktop folder \"%s\"" msgstr "Kon de bureaubladmap '%s' niet maken" -#: ../src/xfdesktop-file-icon-manager.c:527 -#: ../src/xfdesktop-file-icon-manager.c:544 +#: ../src/xfdesktop-file-icon-manager.c:564 +#: ../src/xfdesktop-file-icon-manager.c:581 msgid "Desktop Folder Error" msgstr "Fout van bureaubladmap" -#: ../src/xfdesktop-file-icon-manager.c:546 +#: ../src/xfdesktop-file-icon-manager.c:583 msgid "" "A normal file with the same name already exists. Please delete or rename it." msgstr "Een normaal bestand met dezelfde naam bestaat al. Gelieve dit te verwijderen of te hernoemen." -#: ../src/xfdesktop-file-icon-manager.c:629 ../src/xfdesktop-file-utils.c:723 +#: ../src/xfdesktop-file-icon-manager.c:666 ../src/xfdesktop-file-utils.c:723 #: ../src/xfdesktop-file-utils.c:776 msgid "Rename Error" msgstr "Hernoemingsfout" -#: ../src/xfdesktop-file-icon-manager.c:630 ../src/xfdesktop-file-utils.c:777 +#: ../src/xfdesktop-file-icon-manager.c:667 ../src/xfdesktop-file-utils.c:777 msgid "The files could not be renamed" msgstr "De bestanden konden niet worden hernoemd" -#: ../src/xfdesktop-file-icon-manager.c:631 +#: ../src/xfdesktop-file-icon-manager.c:668 msgid "None of the icons selected support being renamed." msgstr "Geen der gekozen pictogrammen ondersteunen hernoeming." -#: ../src/xfdesktop-file-icon-manager.c:675 -#: ../src/xfdesktop-file-icon-manager.c:719 ../src/xfdesktop-file-utils.c:921 -#: ../src/xfdesktop-file-utils.c:959 +#: ../src/xfdesktop-file-icon-manager.c:712 +#: ../src/xfdesktop-file-icon-manager.c:756 ../src/xfdesktop-file-utils.c:876 +#: ../src/xfdesktop-file-utils.c:913 msgid "Trash Error" msgstr "Prullenbakfout" -#: ../src/xfdesktop-file-icon-manager.c:676 -#: ../src/xfdesktop-file-icon-manager.c:720 +#: ../src/xfdesktop-file-icon-manager.c:713 +#: ../src/xfdesktop-file-icon-manager.c:757 msgid "The selected files could not be trashed" msgstr "De gekozen bestanden konden niet naar de prullenbak worden verplaatst" -#: ../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:864 -#: ../src/xfdesktop-file-utils.c:1005 ../src/xfdesktop-file-utils.c:1052 -#: ../src/xfdesktop-file-utils.c:1093 ../src/xfdesktop-file-utils.c:1134 -#: ../src/xfdesktop-file-utils.c:1236 ../src/xfdesktop-file-utils.c:1288 -#: ../src/xfdesktop-file-utils.c:1361 ../src/xfdesktop-file-utils.c:1439 +#: ../src/xfdesktop-file-icon-manager.c:714 +#: ../src/xfdesktop-file-icon-manager.c:758 ../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 "Voor deze functie moet er een bestandbeheerdienst actief zijn (zoals die van Thunar)." #. printf is to be translator-friendly -#: ../src/xfdesktop-file-icon-manager.c:821 -#: ../src/xfdesktop-file-icon-manager.c:1279 +#: ../src/xfdesktop-file-icon-manager.c:858 +#: ../src/xfdesktop-file-icon-manager.c:1320 #, c-format msgid "Unable to launch \"%s\":" msgstr "Kan '%s' niet starten:" -#: ../src/xfdesktop-file-icon-manager.c:1008 +#: ../src/xfdesktop-file-icon-manager.c:1049 #, c-format msgid "_Open With \"%s\"" msgstr "_Openen met '%s'" -#: ../src/xfdesktop-file-icon-manager.c:1011 +#: ../src/xfdesktop-file-icon-manager.c:1052 #, c-format msgid "Open With \"%s\"" msgstr "Openen met '%s'" -#: ../src/xfdesktop-file-icon-manager.c:1337 +#: ../src/xfdesktop-file-icon-manager.c:1378 msgid "_Open all" msgstr "Alles _openen" -#: ../src/xfdesktop-file-icon-manager.c:1353 +#: ../src/xfdesktop-file-icon-manager.c:1394 msgid "_Open in New Window" msgstr "_Openen in nieuw venster" -#: ../src/xfdesktop-file-icon-manager.c:1355 +#: ../src/xfdesktop-file-icon-manager.c:1396 #: ../src/xfdesktop-special-file-icon.c:547 ../src/xfdesktop-volume-icon.c:813 msgid "_Open" msgstr "_Openen" #. create launcher item -#: ../src/xfdesktop-file-icon-manager.c:1374 +#: ../src/xfdesktop-file-icon-manager.c:1415 msgid "Create _Launcher..." msgstr "_Starter maken..." #. create link item -#: ../src/xfdesktop-file-icon-manager.c:1390 +#: ../src/xfdesktop-file-icon-manager.c:1431 msgid "Create _URL Link..." msgstr "_URL-koppeling maken..." #. create folder item -#: ../src/xfdesktop-file-icon-manager.c:1406 +#: ../src/xfdesktop-file-icon-manager.c:1447 msgid "Create _Folder..." msgstr "_Map maken..." -#: ../src/xfdesktop-file-icon-manager.c:1421 +#: ../src/xfdesktop-file-icon-manager.c:1462 msgid "Create From _Template" msgstr "Maak vanuit _sjabloon" -#: ../src/xfdesktop-file-icon-manager.c:1450 +#: ../src/xfdesktop-file-icon-manager.c:1491 msgid "_Empty File" msgstr "_Leeg bestand" -#: ../src/xfdesktop-file-icon-manager.c:1467 +#: ../src/xfdesktop-file-icon-manager.c:1508 msgid "_Execute" msgstr "_Uitvoeren" -#: ../src/xfdesktop-file-icon-manager.c:1487 +#: ../src/xfdesktop-file-icon-manager.c:1528 msgid "_Edit Launcher" msgstr "Starter _bewerken" -#: ../src/xfdesktop-file-icon-manager.c:1522 +#: ../src/xfdesktop-file-icon-manager.c:1563 msgid "Open With" msgstr "Openen met" -#: ../src/xfdesktop-file-icon-manager.c:1548 +#: ../src/xfdesktop-file-icon-manager.c:1589 msgid "Open With Other _Application..." msgstr "Open met andere _toepassing..." +#. Trash +#: ../src/xfdesktop-file-icon-manager.c:1676 +msgid "Mo_ve to Trash" +msgstr "Verplaats naar prullenbak" + #. Rename -#: ../src/xfdesktop-file-icon-manager.c:1651 +#: ../src/xfdesktop-file-icon-manager.c:1707 msgid "_Rename..." msgstr "He_rnoemen..." -#: ../src/xfdesktop-file-icon-manager.c:1679 +#: ../src/xfdesktop-file-icon-manager.c:1735 msgid "Arrange Desktop _Icons" msgstr "Bureaubladpictogrammen schikken" -#: ../src/xfdesktop-file-icon-manager.c:1690 +#: ../src/xfdesktop-file-icon-manager.c:1746 msgid "Desktop _Settings..." msgstr "Bureaublad-in_stellingen..." -#: ../src/xfdesktop-file-icon-manager.c:1701 +#: ../src/xfdesktop-file-icon-manager.c:1757 #: ../src/xfdesktop-volume-icon.c:855 msgid "P_roperties..." msgstr "_Eigenschappen..." -#: ../src/xfdesktop-file-icon-manager.c:2642 +#: ../src/xfdesktop-file-icon-manager.c:2699 msgid "Load Error" msgstr "Laadfout" -#: ../src/xfdesktop-file-icon-manager.c:2644 +#: ../src/xfdesktop-file-icon-manager.c:2701 msgid "Failed to load the desktop folder" msgstr "Kon de bureaubladmap niet laden" -#: ../src/xfdesktop-file-icon-manager.c:3189 +#: ../src/xfdesktop-file-icon-manager.c:3242 msgid "Copy _Here" msgstr "Hierheen kopiëren" -#: ../src/xfdesktop-file-icon-manager.c:3189 +#: ../src/xfdesktop-file-icon-manager.c:3242 msgid "_Move Here" msgstr "Hierheen verplaatsen" -#: ../src/xfdesktop-file-icon-manager.c:3189 +#: ../src/xfdesktop-file-icon-manager.c:3242 msgid "_Link Here" msgstr "Hier koppelen" @@ -806,72 +824,72 @@ msgid "The file could not be renamed" msgstr "Het bestand kon niet worden hernoemd" -#: ../src/xfdesktop-file-utils.c:862 +#: ../src/xfdesktop-file-utils.c:826 msgid "Delete Error" msgstr "Fout bij verwijderen" -#: ../src/xfdesktop-file-utils.c:863 +#: ../src/xfdesktop-file-utils.c:827 msgid "The selected files could not be deleted" msgstr "De geselecteerde bestanden konden niet worden verwijderd" -#: ../src/xfdesktop-file-utils.c:922 +#: ../src/xfdesktop-file-utils.c:877 msgid "The selected files could not be moved to the trash" msgstr "De geselecteerde bestanden konden niet worden verplaatst naar de prullenbak" -#: ../src/xfdesktop-file-utils.c:923 ../src/xfdesktop-file-utils.c:961 +#: ../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 "Voor deze mogelijkheid moet er een prullenbakdienst actief zijn (zoals die van Thunar)." -#: ../src/xfdesktop-file-utils.c:960 +#: ../src/xfdesktop-file-utils.c:914 msgid "Could not empty the trash" msgstr "Kon de prullenbak niet ledigen" -#: ../src/xfdesktop-file-utils.c:1003 +#: ../src/xfdesktop-file-utils.c:957 msgid "Create File Error" msgstr "Maakfout (bestand)" -#: ../src/xfdesktop-file-utils.c:1004 +#: ../src/xfdesktop-file-utils.c:958 msgid "Could not create a new file" msgstr "Kon geen nieuw bestand maken" -#: ../src/xfdesktop-file-utils.c:1050 +#: ../src/xfdesktop-file-utils.c:1004 msgid "Create Document Error" msgstr "Maakfout (document)" -#: ../src/xfdesktop-file-utils.c:1051 +#: ../src/xfdesktop-file-utils.c:1005 msgid "Could not create a new document from the template" msgstr "Kon geen nieuw document maken vanuit het sjabloon" -#: ../src/xfdesktop-file-utils.c:1091 +#: ../src/xfdesktop-file-utils.c:1045 msgid "File Properties Error" msgstr "Fout in bestandeigenschappen" -#: ../src/xfdesktop-file-utils.c:1092 +#: ../src/xfdesktop-file-utils.c:1046 msgid "The file properties dialog could not be opened" msgstr "De dialoog voor de bestandeigenschappen kon niet worden geopend" -#: ../src/xfdesktop-file-utils.c:1133 +#: ../src/xfdesktop-file-utils.c:1087 msgid "The file could not be opened" msgstr "Het bestand kon niet worden geopend" -#: ../src/xfdesktop-file-utils.c:1206 ../src/xfdesktop-file-utils.c:1231 +#: ../src/xfdesktop-file-utils.c:1160 ../src/xfdesktop-file-utils.c:1185 #, c-format msgid "Failed to run \"%s\"" msgstr "Kon '%s' niet uitvoeren" -#: ../src/xfdesktop-file-utils.c:1287 +#: ../src/xfdesktop-file-utils.c:1241 msgid "The application chooser could not be opened" msgstr "De toepassingskiezer kon niet worden geopend" -#: ../src/xfdesktop-file-utils.c:1345 ../src/xfdesktop-file-utils.c:1359 -#: ../src/xfdesktop-file-utils.c:1421 ../src/xfdesktop-file-utils.c:1437 +#: ../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 "Overbrengingsfout" -#: ../src/xfdesktop-file-utils.c:1346 ../src/xfdesktop-file-utils.c:1360 -#: ../src/xfdesktop-file-utils.c:1422 ../src/xfdesktop-file-utils.c:1438 +#: ../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 "Het overbrengen van het bestand kon niet worden uitgevoerd" @@ -925,7 +943,7 @@ msgid "Eject Finished" msgstr "Uitwerpen voltooid" -#: ../src/xfdesktop-regular-file-icon.c:741 +#: ../src/xfdesktop-regular-file-icon.c:748 #, c-format msgid "" "Type: %s\n" diff -Nru xfdesktop4-4.11.6/po/pl.po xfdesktop4-4.19.2/po/pl.po --- xfdesktop4-4.11.6/po/pl.po 2014-04-05 18:59:11.000000000 +0000 +++ xfdesktop4-4.19.2/po/pl.po 2014-08-18 09:10:13.000000000 +0000 @@ -4,23 +4,23 @@ # # Translators: # Cyryl Sochacki , 2013 -# hoek , 2014 -# OSWorld , 2013 -# OSWorld , 2013 +# Dawid , 2014 +# Michał Olber , 2013 +# Michał Olber , 2013 # Piotr Maliński , 2006 # Piotr Sokół , 2009,2011-2014 -# Piotr Strębski , 2013 +# Piotr Strębski , 2013-2014 # Robert Kurowski , 2005 # Szymon Kałasz , 2006 -# Xfce , 2014 +# Xfce Bot , 2014 msgid "" msgstr "" "Project-Id-Version: Xfdesktop\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2014-04-03 18:32+0200\n" -"PO-Revision-Date: 2014-04-05 08:59+0000\n" -"Last-Translator: Piotr Sokół \n" -"Language-Team: Polish (http://www.transifex.com/projects/p/xfce/language/pl/)\n" +"POT-Creation-Date: 2014-08-03 12:32+0200\n" +"PO-Revision-Date: 2014-08-13 10:18+0000\n" +"Last-Translator: Piotr Strębski \n" +"Language-Team: Polish (http://www.transifex.com/projects/p/xfdesktop/language/pl/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" @@ -115,45 +115,45 @@ msgid "Image selection is unavailable while the image style is set to None." msgstr "Wybór obrazów jest niedostępny dopóki styl obrazów jest ustawiony na Brak." -#: ../settings/main.c:1523 +#: ../settings/main.c:1524 msgid "Spanning screens" msgstr "Zakres monitorów" -#: ../settings/main.c:1825 +#: ../settings/main.c:1831 msgid "Image files" msgstr "Pliki obrazów" -#: ../settings/main.c:2001 +#: ../settings/main.c:2010 msgid "Settings manager socket" msgstr "Określa gniazdo menedżera ustawień" -#: ../settings/main.c:2001 +#: ../settings/main.c:2010 msgid "SOCKET ID" msgstr "ID_GNIAZDA" -#: ../settings/main.c:2002 +#: ../settings/main.c:2011 msgid "Version information" msgstr "Informacje o wersji" -#: ../settings/main.c:2030 +#: ../settings/main.c:2039 #, c-format msgid "Type '%s --help' for usage." msgstr "Proszę wprowadzić „%s --help”, aby wypisać komunikat pomocy." -#: ../settings/main.c:2042 +#: ../settings/main.c:2051 msgid "The Xfce development team. All rights reserved." msgstr "Zespół twórców środowiska graficznego Xfce. Wszystkie prawa zastrzeżone." -#: ../settings/main.c:2043 +#: ../settings/main.c:2052 #, c-format msgid "Please report bugs to <%s>." msgstr "Proszę zgłaszać błędy na adres <%s>." -#: ../settings/main.c:2050 +#: ../settings/main.c:2059 msgid "Desktop Settings" msgstr "Pulpit" -#: ../settings/main.c:2052 +#: ../settings/main.c:2061 msgid "Unable to contact settings server" msgstr "Nie można połączyć z serwerem ustawień" @@ -162,8 +162,9 @@ msgstr "Pulpit" #: ../settings/xfce-backdrop-settings.desktop.in.h:2 -msgid "Set desktop background and menu and icon behaviour" -msgstr "Konfiguruje tło pulpitu oraz ustawienia menu programów i ikon" +#: ../settings/xfdesktop-settings-ui.glade.h:11 +msgid "Set desktop background and menu and icon behavior" +msgstr "Konfiguruje tło pulpitu oraz ustawienia menu i ikon" #: ../settings/xfdesktop-settings-appearance-frame-ui.glade.h:1 msgid "Solid color" @@ -341,14 +342,10 @@ msgid "File/launcher icons" msgstr "Pliki i aktywatory" -#: ../settings/xfdesktop-settings-ui.glade.h:10 ../src/xfce-desktop.c:1020 +#: ../settings/xfdesktop-settings-ui.glade.h:10 ../src/xfce-desktop.c:1007 msgid "Desktop" msgstr "Pulpit" -#: ../settings/xfdesktop-settings-ui.glade.h:11 -msgid "Set desktop background and menu and icon behavior" -msgstr "Konfiguruje tło pulpitu oraz ustawienia menu i ikon" - #: ../settings/xfdesktop-settings-ui.glade.h:12 msgid "_Background" msgstr "_Tło" @@ -440,26 +437,30 @@ msgstr "Uruchamianie elementów jednokrotnym _kliknięciem" #: ../settings/xfdesktop-settings-ui.glade.h:34 +msgid "Show hidden files on the desktop" +msgstr "Pokaż ukryte pliki na pulpicie" + +#: ../settings/xfdesktop-settings-ui.glade.h:35 msgid "Show icon tooltips. Size:" msgstr "Rozmiar ikon podpowiedzi:" -#: ../settings/xfdesktop-settings-ui.glade.h:35 +#: ../settings/xfdesktop-settings-ui.glade.h:36 msgid "Size of the tooltip preview image." msgstr "Określa rozmiar ikon wyświetlanych w podpowiedzich" -#: ../settings/xfdesktop-settings-ui.glade.h:36 +#: ../settings/xfdesktop-settings-ui.glade.h:37 msgid "Use custom _font size:" msgstr "Wł_asny rozmiar czcionki:" -#: ../settings/xfdesktop-settings-ui.glade.h:37 +#: ../settings/xfdesktop-settings-ui.glade.h:38 msgid "Appearance" msgstr "Wygląd" -#: ../settings/xfdesktop-settings-ui.glade.h:38 +#: ../settings/xfdesktop-settings-ui.glade.h:39 msgid "Default Icons" msgstr "Domyślne" -#: ../settings/xfdesktop-settings-ui.glade.h:39 +#: ../settings/xfdesktop-settings-ui.glade.h:40 msgid "_Icons" msgstr "_Ikony" @@ -521,250 +522,267 @@ msgstr "_Usuń obszar roboczy „%s”" #: ../src/xfdesktop-app-menu-item.c:349 -#: ../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:1132 ../src/xfdesktop-file-utils.c:1209 -#: ../src/xfdesktop-file-utils.c:1234 ../src/xfdesktop-file-utils.c:1286 +#: ../src/xfdesktop-file-icon-manager.c:860 +#: ../src/xfdesktop-file-icon-manager.c:1125 +#: ../src/xfdesktop-file-icon-manager.c:1321 ../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 "Błąd uruchamiania" #: ../src/xfdesktop-app-menu-item.c:351 -#: ../src/xfdesktop-file-icon-manager.c:1086 +#: ../src/xfdesktop-file-icon-manager.c:1127 msgid "" "Unable to launch \"exo-desktop-item-edit\", which is required to create and " "edit launchers and links on the desktop." msgstr "Nie można uruchomić programu „exo-desktop-item-edit”, wymaganego do tworzenia oraz modyfikowania aktywatorów i odnośników na pulpicie." -#: ../src/xfdesktop-application.c:768 +#: ../src/xfdesktop-application.c:836 msgid "Display version information" msgstr "Wypisuje informacje o wersji" -#: ../src/xfdesktop-application.c:769 +#: ../src/xfdesktop-application.c:837 msgid "Reload all settings" msgstr "Wczytuje ponownie wszystkie ustawienia" -#: ../src/xfdesktop-application.c:770 +#: ../src/xfdesktop-application.c:838 +msgid "Advance to the next wallpaper on the current workspace" +msgstr "Przejdź do następnej tapety na bieżącym obszarze roboczym" + +#: ../src/xfdesktop-application.c:839 msgid "Pop up the menu (at the current mouse position)" msgstr "Wyświetla menu programów (w bieżącym położeniu kursora myszy)" -#: ../src/xfdesktop-application.c:771 +#: ../src/xfdesktop-application.c:840 msgid "Pop up the window list (at the current mouse position)" msgstr "Wyświetla listę okien (w bieżącym położeniu kursora myszy)" -#: ../src/xfdesktop-application.c:773 +#: ../src/xfdesktop-application.c:842 msgid "Automatically arrange all the icons on the desktop" msgstr "Automatycznie rozmieszcza wszystkie ikony na pulpicie" -#: ../src/xfdesktop-application.c:775 +#: ../src/xfdesktop-application.c:844 +msgid "Enable debug messages" +msgstr "Włącza komunikaty diagnozowania błędów" + +#: ../src/xfdesktop-application.c:845 +msgid "Disable debug messages" +msgstr "Wyłącza komunikaty diagnozowania błędów" + +#: ../src/xfdesktop-application.c:846 msgid "Do not wait for a window manager on startup" msgstr "Nie oczekuje na menedżera okien podczas uruchamiania" -#: ../src/xfdesktop-application.c:776 +#: ../src/xfdesktop-application.c:847 msgid "Cause xfdesktop to quit" msgstr "Kończy działanie programu" -#: ../src/xfdesktop-application.c:791 +#: ../src/xfdesktop-application.c:862 #, c-format msgid "Failed to parse arguments: %s\n" msgstr "Nie udało się przetworzyć argumentów: %s\n" -#: ../src/xfdesktop-application.c:802 +#: ../src/xfdesktop-application.c:873 #, c-format msgid "This is %s version %s, running on Xfce %s.\n" msgstr "Program %s wersja %s, uruchomiony w środowisku Xfce %s.\n" -#: ../src/xfdesktop-application.c:804 +#: ../src/xfdesktop-application.c:875 #, c-format msgid "Built with GTK+ %d.%d.%d, linked with GTK+ %d.%d.%d." msgstr "Skompilowano przy użyciu Gtk+ %d.%d.%d, zlinkowano przy użyciu Gtk+ %d.%d.%d." -#: ../src/xfdesktop-application.c:808 +#: ../src/xfdesktop-application.c:879 #, c-format msgid "Build options:\n" msgstr "Opcje kompilacji:\n" -#: ../src/xfdesktop-application.c:809 +#: ../src/xfdesktop-application.c:880 #, c-format msgid " Desktop Menu: %s\n" msgstr "Menu pulpitu: %s\n" -#: ../src/xfdesktop-application.c:811 ../src/xfdesktop-application.c:818 -#: ../src/xfdesktop-application.c:825 +#: ../src/xfdesktop-application.c:882 ../src/xfdesktop-application.c:889 +#: ../src/xfdesktop-application.c:896 msgid "enabled" msgstr "włączone" -#: ../src/xfdesktop-application.c:813 ../src/xfdesktop-application.c:820 -#: ../src/xfdesktop-application.c:827 +#: ../src/xfdesktop-application.c:884 ../src/xfdesktop-application.c:891 +#: ../src/xfdesktop-application.c:898 msgid "disabled" msgstr "wyłączone" -#: ../src/xfdesktop-application.c:816 +#: ../src/xfdesktop-application.c:887 #, c-format msgid " Desktop Icons: %s\n" msgstr "Ikony pulpitu: %s\n" -#: ../src/xfdesktop-application.c:823 +#: ../src/xfdesktop-application.c:894 #, c-format msgid " Desktop File Icons: %s\n" msgstr "Ikony plików pulpitu: %s\n" -#: ../src/xfdesktop-file-icon-manager.c:522 -#: ../src/xfdesktop-file-icon-manager.c:539 +#: ../src/xfdesktop-file-icon-manager.c:559 +#: ../src/xfdesktop-file-icon-manager.c:576 #, c-format msgid "Could not create the desktop folder \"%s\"" msgstr "Nie można utworzyć katalogu pulpitu „%s”" -#: ../src/xfdesktop-file-icon-manager.c:527 -#: ../src/xfdesktop-file-icon-manager.c:544 +#: ../src/xfdesktop-file-icon-manager.c:564 +#: ../src/xfdesktop-file-icon-manager.c:581 msgid "Desktop Folder Error" msgstr "Błąd katalogu pulpitu" -#: ../src/xfdesktop-file-icon-manager.c:546 +#: ../src/xfdesktop-file-icon-manager.c:583 msgid "" "A normal file with the same name already exists. Please delete or rename it." msgstr "Zwykły plik o tej samej nazwie już istnieje. Proszę go usunąć lub zmienić jego nazwę." -#: ../src/xfdesktop-file-icon-manager.c:629 ../src/xfdesktop-file-utils.c:723 +#: ../src/xfdesktop-file-icon-manager.c:666 ../src/xfdesktop-file-utils.c:723 #: ../src/xfdesktop-file-utils.c:776 msgid "Rename Error" msgstr "Błąd zmiany nazwy" -#: ../src/xfdesktop-file-icon-manager.c:630 ../src/xfdesktop-file-utils.c:777 +#: ../src/xfdesktop-file-icon-manager.c:667 ../src/xfdesktop-file-utils.c:777 msgid "The files could not be renamed" msgstr "Nie można zmienić nazwy plików" -#: ../src/xfdesktop-file-icon-manager.c:631 +#: ../src/xfdesktop-file-icon-manager.c:668 msgid "None of the icons selected support being renamed." msgstr "Nie zmieniono nazwy żadnej z zaznaczonych ikon." -#: ../src/xfdesktop-file-icon-manager.c:675 -#: ../src/xfdesktop-file-icon-manager.c:719 ../src/xfdesktop-file-utils.c:921 -#: ../src/xfdesktop-file-utils.c:959 +#: ../src/xfdesktop-file-icon-manager.c:712 +#: ../src/xfdesktop-file-icon-manager.c:756 ../src/xfdesktop-file-utils.c:876 +#: ../src/xfdesktop-file-utils.c:913 msgid "Trash Error" msgstr "Błąd kosza" -#: ../src/xfdesktop-file-icon-manager.c:676 -#: ../src/xfdesktop-file-icon-manager.c:720 +#: ../src/xfdesktop-file-icon-manager.c:713 +#: ../src/xfdesktop-file-icon-manager.c:757 msgid "The selected files could not be trashed" msgstr "Nie można usunąć zaznaczonych plików" -#: ../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:864 -#: ../src/xfdesktop-file-utils.c:1005 ../src/xfdesktop-file-utils.c:1052 -#: ../src/xfdesktop-file-utils.c:1093 ../src/xfdesktop-file-utils.c:1134 -#: ../src/xfdesktop-file-utils.c:1236 ../src/xfdesktop-file-utils.c:1288 -#: ../src/xfdesktop-file-utils.c:1361 ../src/xfdesktop-file-utils.c:1439 +#: ../src/xfdesktop-file-icon-manager.c:714 +#: ../src/xfdesktop-file-icon-manager.c:758 ../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 "Ta funkcja wymaga obecności menedżera plików (takiego jak program Thunar)." #. printf is to be translator-friendly -#: ../src/xfdesktop-file-icon-manager.c:821 -#: ../src/xfdesktop-file-icon-manager.c:1279 +#: ../src/xfdesktop-file-icon-manager.c:858 +#: ../src/xfdesktop-file-icon-manager.c:1320 #, c-format msgid "Unable to launch \"%s\":" msgstr "Nie można uruchomić „%s”:" -#: ../src/xfdesktop-file-icon-manager.c:1008 +#: ../src/xfdesktop-file-icon-manager.c:1049 #, c-format msgid "_Open With \"%s\"" msgstr "_Otwórz za pomocą „%s”" -#: ../src/xfdesktop-file-icon-manager.c:1011 +#: ../src/xfdesktop-file-icon-manager.c:1052 #, c-format msgid "Open With \"%s\"" msgstr "Otwórz za pomocą „%s”" -#: ../src/xfdesktop-file-icon-manager.c:1337 +#: ../src/xfdesktop-file-icon-manager.c:1378 msgid "_Open all" msgstr "Otwórz _wszystkie" -#: ../src/xfdesktop-file-icon-manager.c:1353 +#: ../src/xfdesktop-file-icon-manager.c:1394 msgid "_Open in New Window" msgstr "_Otwórz w nowym oknie" -#: ../src/xfdesktop-file-icon-manager.c:1355 +#: ../src/xfdesktop-file-icon-manager.c:1396 #: ../src/xfdesktop-special-file-icon.c:547 ../src/xfdesktop-volume-icon.c:813 msgid "_Open" msgstr "_Otwórz" #. create launcher item -#: ../src/xfdesktop-file-icon-manager.c:1374 +#: ../src/xfdesktop-file-icon-manager.c:1415 msgid "Create _Launcher..." msgstr "Utwórz _aktywator..." #. create link item -#: ../src/xfdesktop-file-icon-manager.c:1390 +#: ../src/xfdesktop-file-icon-manager.c:1431 msgid "Create _URL Link..." msgstr "Utwórz o_dnośnik..." #. create folder item -#: ../src/xfdesktop-file-icon-manager.c:1406 +#: ../src/xfdesktop-file-icon-manager.c:1447 msgid "Create _Folder..." msgstr "Utwórz _katalog..." -#: ../src/xfdesktop-file-icon-manager.c:1421 +#: ../src/xfdesktop-file-icon-manager.c:1462 msgid "Create From _Template" msgstr "Utwórz z _szablonu..." -#: ../src/xfdesktop-file-icon-manager.c:1450 +#: ../src/xfdesktop-file-icon-manager.c:1491 msgid "_Empty File" msgstr "_Pusty plik" -#: ../src/xfdesktop-file-icon-manager.c:1467 +#: ../src/xfdesktop-file-icon-manager.c:1508 msgid "_Execute" msgstr "_Uruchom" -#: ../src/xfdesktop-file-icon-manager.c:1487 +#: ../src/xfdesktop-file-icon-manager.c:1528 msgid "_Edit Launcher" msgstr "_Edytuj aktywator" -#: ../src/xfdesktop-file-icon-manager.c:1522 +#: ../src/xfdesktop-file-icon-manager.c:1563 msgid "Open With" msgstr "Otwórz za pomocą" -#: ../src/xfdesktop-file-icon-manager.c:1548 +#: ../src/xfdesktop-file-icon-manager.c:1589 msgid "Open With Other _Application..." msgstr "Otwórz za pomocą innego p_rogramu..." +#. Trash +#: ../src/xfdesktop-file-icon-manager.c:1676 +msgid "Mo_ve to Trash" +msgstr "_Przenieś do kosza" + #. Rename -#: ../src/xfdesktop-file-icon-manager.c:1651 +#: ../src/xfdesktop-file-icon-manager.c:1707 msgid "_Rename..." msgstr "_Zmień nazwę..." -#: ../src/xfdesktop-file-icon-manager.c:1679 +#: ../src/xfdesktop-file-icon-manager.c:1735 msgid "Arrange Desktop _Icons" msgstr "_Rozmieść ikony" -#: ../src/xfdesktop-file-icon-manager.c:1690 +#: ../src/xfdesktop-file-icon-manager.c:1746 msgid "Desktop _Settings..." msgstr "_Ustawienia pulpitu..." -#: ../src/xfdesktop-file-icon-manager.c:1701 +#: ../src/xfdesktop-file-icon-manager.c:1757 #: ../src/xfdesktop-volume-icon.c:855 msgid "P_roperties..." msgstr "_Właściwości..." -#: ../src/xfdesktop-file-icon-manager.c:2642 +#: ../src/xfdesktop-file-icon-manager.c:2699 msgid "Load Error" msgstr "Błąd wczytywania" -#: ../src/xfdesktop-file-icon-manager.c:2644 +#: ../src/xfdesktop-file-icon-manager.c:2701 msgid "Failed to load the desktop folder" msgstr "Nie udało się wczytać katalogu pulpitu" -#: ../src/xfdesktop-file-icon-manager.c:3189 +#: ../src/xfdesktop-file-icon-manager.c:3242 msgid "Copy _Here" msgstr "_Skopiuj tutaj" -#: ../src/xfdesktop-file-icon-manager.c:3189 +#: ../src/xfdesktop-file-icon-manager.c:3242 msgid "_Move Here" msgstr "_Przenieś tutaj" -#: ../src/xfdesktop-file-icon-manager.c:3189 +#: ../src/xfdesktop-file-icon-manager.c:3242 msgid "_Link Here" msgstr "_Dowiąż tutaj" @@ -813,72 +831,72 @@ msgid "The file could not be renamed" msgstr "Nie można zmienić nazwy pliku" -#: ../src/xfdesktop-file-utils.c:862 +#: ../src/xfdesktop-file-utils.c:826 msgid "Delete Error" msgstr "Błąd usuwania" -#: ../src/xfdesktop-file-utils.c:863 +#: ../src/xfdesktop-file-utils.c:827 msgid "The selected files could not be deleted" msgstr "Nie udało się usunąć zaznaczonych plików" -#: ../src/xfdesktop-file-utils.c:922 +#: ../src/xfdesktop-file-utils.c:877 msgid "The selected files could not be moved to the trash" msgstr "Nie udało się przenieść do kosza zaznaczonych plików" -#: ../src/xfdesktop-file-utils.c:923 ../src/xfdesktop-file-utils.c:961 +#: ../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 "Ta funkcja wymaga obecności usługi kosza (takiej jaką dostarcza program Thunar)." -#: ../src/xfdesktop-file-utils.c:960 +#: ../src/xfdesktop-file-utils.c:914 msgid "Could not empty the trash" msgstr "Nie można opróżnić kosza" -#: ../src/xfdesktop-file-utils.c:1003 +#: ../src/xfdesktop-file-utils.c:957 msgid "Create File Error" msgstr "Błąd tworzenia pliku" -#: ../src/xfdesktop-file-utils.c:1004 +#: ../src/xfdesktop-file-utils.c:958 msgid "Could not create a new file" msgstr "Nie można utworzyć nowego pliku" -#: ../src/xfdesktop-file-utils.c:1050 +#: ../src/xfdesktop-file-utils.c:1004 msgid "Create Document Error" msgstr "Błąd tworzenia dokumentu" -#: ../src/xfdesktop-file-utils.c:1051 +#: ../src/xfdesktop-file-utils.c:1005 msgid "Could not create a new document from the template" msgstr "Nie można utworzyć nowego dokumentu z szablonu" -#: ../src/xfdesktop-file-utils.c:1091 +#: ../src/xfdesktop-file-utils.c:1045 msgid "File Properties Error" msgstr "Błąd właściwości pliku" -#: ../src/xfdesktop-file-utils.c:1092 +#: ../src/xfdesktop-file-utils.c:1046 msgid "The file properties dialog could not be opened" msgstr "Nie można otworzyć okna właściwości pliku" -#: ../src/xfdesktop-file-utils.c:1133 +#: ../src/xfdesktop-file-utils.c:1087 msgid "The file could not be opened" msgstr "Nie można otworzyć pliku" -#: ../src/xfdesktop-file-utils.c:1206 ../src/xfdesktop-file-utils.c:1231 +#: ../src/xfdesktop-file-utils.c:1160 ../src/xfdesktop-file-utils.c:1185 #, c-format msgid "Failed to run \"%s\"" msgstr "Nie udało się uruchomić „%s”" -#: ../src/xfdesktop-file-utils.c:1287 +#: ../src/xfdesktop-file-utils.c:1241 msgid "The application chooser could not be opened" msgstr "Nie można otworzyć okna wyboru programu" -#: ../src/xfdesktop-file-utils.c:1345 ../src/xfdesktop-file-utils.c:1359 -#: ../src/xfdesktop-file-utils.c:1421 ../src/xfdesktop-file-utils.c:1437 +#: ../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 "Błąd przesyłania" -#: ../src/xfdesktop-file-utils.c:1346 ../src/xfdesktop-file-utils.c:1360 -#: ../src/xfdesktop-file-utils.c:1422 ../src/xfdesktop-file-utils.c:1438 +#: ../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 "Nie można przesłać pliku" @@ -932,7 +950,7 @@ msgid "Eject Finished" msgstr "Zakończono wysuwanie" -#: ../src/xfdesktop-regular-file-icon.c:741 +#: ../src/xfdesktop-regular-file-icon.c:748 #, c-format msgid "" "Type: %s\n" diff -Nru xfdesktop4-4.11.6/po/POTFILES.skip xfdesktop4-4.19.2/po/POTFILES.skip --- xfdesktop4-4.11.6/po/POTFILES.skip 2014-03-10 07:47:50.000000000 +0000 +++ xfdesktop4-4.19.2/po/POTFILES.skip 2014-07-06 19:04:23.000000000 +0000 @@ -1,3 +1,12 @@ # List of source files that shouldn't be translated. settings/xfce-backdrop-settings.desktop.in.in + +# Autogenerated files that already have translations. +# Add them here for FreeBSD and OpenBSD +settings/xfce-backdrop-settings.desktop.in.h +settings/xfdesktop-settings-appearance-frame-ui.glade.h +settings/xfdesktop-settings-ui.glade.h +settings/xfce-backdrop-settings.desktop.in.h +settings/xfdesktop-settings-appearance-frame-ui.glade.h +settings/xfdesktop-settings-ui.glade.h diff -Nru xfdesktop4-4.11.6/po/pt_BR.po xfdesktop4-4.19.2/po/pt_BR.po --- xfdesktop4-4.11.6/po/pt_BR.po 2014-03-25 17:51:09.000000000 +0000 +++ xfdesktop4-4.19.2/po/pt_BR.po 2014-08-11 07:27:27.000000000 +0000 @@ -4,7 +4,7 @@ # # Translators: # Adriano Winter Bess , 2006 -# AndreLDM , 2013 +# André Miranda , 2013-2014 # Antonio S. de A. Terceiro , 2004 # Fábio Nogueira , 2008 # Henrique P. Machado , 2013 @@ -16,47 +16,47 @@ 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-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" +"POT-Creation-Date: 2014-08-03 12:32+0200\n" +"PO-Revision-Date: 2014-08-04 18:10+0000\n" +"Last-Translator: André Miranda \n" +"Language-Team: Portuguese (Brazil) (http://www.transifex.com/projects/p/xfdesktop/language/pt_BR/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Language: pt_BR\n" "Plural-Forms: nplurals=2; plural=(n > 1);\n" -#: ../settings/main.c:375 ../src/xfdesktop-special-file-icon.c:295 +#: ../settings/main.c:404 ../src/xfdesktop-special-file-icon.c:295 #: ../src/xfdesktop-special-file-icon.c:479 msgid "Home" msgstr "Início" -#: ../settings/main.c:377 +#: ../settings/main.c:406 msgid "Filesystem" msgstr "Sistema de arquivos" -#: ../settings/main.c:379 +#: ../settings/main.c:408 msgid "Trash" msgstr "Lixeira" -#: ../settings/main.c:381 +#: ../settings/main.c:410 msgid "Removable Devices" msgstr "Dispositivos removíveis" -#: ../settings/main.c:383 +#: ../settings/main.c:412 msgid "Network Shares" msgstr "Compartilhamentos de Rede" -#: ../settings/main.c:385 +#: ../settings/main.c:414 msgid "Disks and Drives" msgstr "Discos e Unidades" -#: ../settings/main.c:387 +#: ../settings/main.c:416 msgid "Other Devices" msgstr "Outros dispositivos" #. Display the file name, file type, and file size in the tooltip. -#: ../settings/main.c:500 +#: ../settings/main.c:529 #, c-format msgid "" "%s\n" @@ -64,95 +64,95 @@ "Size: %s" msgstr "%s\nTipo: %s\nTamanho: %s" -#: ../settings/main.c:686 +#: ../settings/main.c:715 #, c-format msgid "Wallpaper for Monitor %d (%s)" msgstr "Papel de parede do monitor %d (%s)" -#: ../settings/main.c:689 +#: ../settings/main.c:718 #, c-format msgid "Wallpaper for Monitor %d" msgstr "Papel de parede do monitor %d" -#: ../settings/main.c:695 +#: ../settings/main.c:724 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:702 +#: ../settings/main.c:731 #, c-format msgid "Wallpaper for %s on Monitor %d (%s)" msgstr "Papel de parede para %s no monitor %d (%s)" -#: ../settings/main.c:706 +#: ../settings/main.c:735 #, c-format msgid "Wallpaper for %s on Monitor %d" msgstr "Papel de parede para %s no monitor %d" -#: ../settings/main.c:713 +#: ../settings/main.c:742 msgid "" "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:720 +#: ../settings/main.c:749 #, 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:726 +#: ../settings/main.c:755 #, c-format msgid "Wallpaper for %s" msgstr "Papel de parede de %s" -#: ../settings/main.c:731 +#: ../settings/main.c:760 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:1134 +#: ../settings/main.c:1174 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:1481 +#: ../settings/main.c:1524 msgid "Spanning screens" msgstr "Telas estendidas" -#: ../settings/main.c:1786 +#: ../settings/main.c:1831 msgid "Image files" msgstr "Arquivos de imagem" -#: ../settings/main.c:1958 +#: ../settings/main.c:2010 msgid "Settings manager socket" msgstr "Socket do gerenciador de configurações" -#: ../settings/main.c:1958 +#: ../settings/main.c:2010 msgid "SOCKET ID" msgstr "ID DO SOCKET" -#: ../settings/main.c:1959 +#: ../settings/main.c:2011 msgid "Version information" msgstr "Informação da versão" -#: ../settings/main.c:1986 +#: ../settings/main.c:2039 #, c-format msgid "Type '%s --help' for usage." msgstr "Digite \"%s --help\" para ver como usar." -#: ../settings/main.c:1998 +#: ../settings/main.c:2051 msgid "The Xfce development team. All rights reserved." msgstr "A equipe de desenvolvimento do Xfce. Todos os direitos reservados." -#: ../settings/main.c:1999 +#: ../settings/main.c:2052 #, c-format msgid "Please report bugs to <%s>." msgstr "Por favor, relate erros para <%s>." -#: ../settings/main.c:2006 +#: ../settings/main.c:2059 msgid "Desktop Settings" msgstr "Configurações da área de trabalho" -#: ../settings/main.c:2008 +#: ../settings/main.c:2061 msgid "Unable to contact settings server" msgstr "Não foi possível contatar o servidor de configurações" @@ -161,7 +161,8 @@ msgstr "Área de trabalho " #: ../settings/xfce-backdrop-settings.desktop.in.h:2 -msgid "Set desktop background and menu and icon behaviour" +#: ../settings/xfdesktop-settings-ui.glade.h:11 +msgid "Set desktop background and menu and icon behavior" msgstr "Define a imagem de fundo da área de trabalho e o comportamento do menu e ícones" #: ../settings/xfdesktop-settings-appearance-frame-ui.glade.h:1 @@ -340,14 +341,10 @@ msgid "File/launcher icons" msgstr "Ícones de arquivos/lançadores" -#: ../settings/xfdesktop-settings-ui.glade.h:10 ../src/xfce-desktop.c:1015 +#: ../settings/xfdesktop-settings-ui.glade.h:10 ../src/xfce-desktop.c:1007 msgid "Desktop" msgstr "Área de trabalho" -#: ../settings/xfdesktop-settings-ui.glade.h:11 -msgid "Set desktop background and menu and icon behavior" -msgstr "Define a imagem de fundo da área de trabalho e o comportamento do menu e ícones" - #: ../settings/xfdesktop-settings-ui.glade.h:12 msgid "_Background" msgstr "_Plano de fundo" @@ -439,26 +436,30 @@ msgstr "Clique _simples para ativar itens" #: ../settings/xfdesktop-settings-ui.glade.h:34 +msgid "Show hidden files on the desktop" +msgstr "Mostrar arquivos ocultos na área de trabalho" + +#: ../settings/xfdesktop-settings-ui.glade.h:35 msgid "Show icon tooltips. Size:" msgstr "Mostrar ícones de dica. Tamanho:" -#: ../settings/xfdesktop-settings-ui.glade.h:35 +#: ../settings/xfdesktop-settings-ui.glade.h:36 msgid "Size of the tooltip preview image." msgstr "Tamanho da dica de ferramenta de imagem de visualização." -#: ../settings/xfdesktop-settings-ui.glade.h:36 +#: ../settings/xfdesktop-settings-ui.glade.h:37 msgid "Use custom _font size:" msgstr "Usar tamanho de _fonte personalizado:" -#: ../settings/xfdesktop-settings-ui.glade.h:37 +#: ../settings/xfdesktop-settings-ui.glade.h:38 msgid "Appearance" msgstr "Aparência" -#: ../settings/xfdesktop-settings-ui.glade.h:38 +#: ../settings/xfdesktop-settings-ui.glade.h:39 msgid "Default Icons" msgstr "Ícones padrão" -#: ../settings/xfdesktop-settings-ui.glade.h:39 +#: ../settings/xfdesktop-settings-ui.glade.h:40 msgid "_Icons" msgstr "_Ícones" @@ -519,121 +520,149 @@ msgid "_Remove Workspace '%s'" msgstr "_Remover espaço de trabalho '%s'" -#: ../src/xfdesktop-application.c:768 +#: ../src/xfdesktop-app-menu-item.c:349 +#: ../src/xfdesktop-file-icon-manager.c:860 +#: ../src/xfdesktop-file-icon-manager.c:1125 +#: ../src/xfdesktop-file-icon-manager.c:1321 ../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-app-menu-item.c:351 +#: ../src/xfdesktop-file-icon-manager.c:1127 +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-application.c:836 msgid "Display version information" msgstr "Exibir informação da versão" -#: ../src/xfdesktop-application.c:769 +#: ../src/xfdesktop-application.c:837 msgid "Reload all settings" msgstr "Recarregar todas as configurações" -#: ../src/xfdesktop-application.c:770 +#: ../src/xfdesktop-application.c:838 +msgid "Advance to the next wallpaper on the current workspace" +msgstr "Avançar para o próximo papel de parede no espaço de trabalho atual" + +#: ../src/xfdesktop-application.c:839 msgid "Pop up the menu (at the current mouse position)" msgstr "Abre o menu (na posição atual do mouse)" -#: ../src/xfdesktop-application.c:771 +#: ../src/xfdesktop-application.c:840 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:773 +#: ../src/xfdesktop-application.c:842 msgid "Automatically arrange all the icons on the desktop" msgstr "Posiciona automaticamente todos os ícones na área de trabalho" -#: ../src/xfdesktop-application.c:775 +#: ../src/xfdesktop-application.c:844 +msgid "Enable debug messages" +msgstr "Habilitar mensagens de depuração" + +#: ../src/xfdesktop-application.c:845 +msgid "Disable debug messages" +msgstr "Desabilitar mensagens de depuração" + +#: ../src/xfdesktop-application.c:846 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:776 +#: ../src/xfdesktop-application.c:847 msgid "Cause xfdesktop to quit" msgstr "Interrompe o xfdesktop" -#: ../src/xfdesktop-application.c:791 +#: ../src/xfdesktop-application.c:862 #, c-format msgid "Failed to parse arguments: %s\n" msgstr "Falha ao analisar os argumentos: %s\n" -#: ../src/xfdesktop-application.c:802 +#: ../src/xfdesktop-application.c:873 #, 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:804 +#: ../src/xfdesktop-application.c:875 #, 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:808 +#: ../src/xfdesktop-application.c:879 #, c-format msgid "Build options:\n" msgstr "Opções de compilação:\n" -#: ../src/xfdesktop-application.c:809 +#: ../src/xfdesktop-application.c:880 #, c-format msgid " Desktop Menu: %s\n" msgstr "Menu da área de trabalho: %s\n" -#: ../src/xfdesktop-application.c:811 ../src/xfdesktop-application.c:818 -#: ../src/xfdesktop-application.c:825 +#: ../src/xfdesktop-application.c:882 ../src/xfdesktop-application.c:889 +#: ../src/xfdesktop-application.c:896 msgid "enabled" msgstr "habilitado" -#: ../src/xfdesktop-application.c:813 ../src/xfdesktop-application.c:820 -#: ../src/xfdesktop-application.c:827 +#: ../src/xfdesktop-application.c:884 ../src/xfdesktop-application.c:891 +#: ../src/xfdesktop-application.c:898 msgid "disabled" msgstr "desabilitado" -#: ../src/xfdesktop-application.c:816 +#: ../src/xfdesktop-application.c:887 #, c-format msgid " Desktop Icons: %s\n" msgstr "Ícones da área de trabalho: %s\n" -#: ../src/xfdesktop-application.c:823 +#: ../src/xfdesktop-application.c:894 #, c-format msgid " Desktop File Icons: %s\n" msgstr "Ícones de arquivos da área de trabalho: %s\n" -#: ../src/xfdesktop-file-icon-manager.c:522 -#: ../src/xfdesktop-file-icon-manager.c:539 +#: ../src/xfdesktop-file-icon-manager.c:559 +#: ../src/xfdesktop-file-icon-manager.c:576 #, 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:527 -#: ../src/xfdesktop-file-icon-manager.c:544 +#: ../src/xfdesktop-file-icon-manager.c:564 +#: ../src/xfdesktop-file-icon-manager.c:581 msgid "Desktop Folder Error" msgstr "Erro na pasta da área de trabalho" -#: ../src/xfdesktop-file-icon-manager.c:546 +#: ../src/xfdesktop-file-icon-manager.c:583 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:629 ../src/xfdesktop-file-utils.c:723 +#: ../src/xfdesktop-file-icon-manager.c:666 ../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:630 ../src/xfdesktop-file-utils.c:777 +#: ../src/xfdesktop-file-icon-manager.c:667 ../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:631 +#: ../src/xfdesktop-file-icon-manager.c:668 msgid "None of the icons selected support being renamed." msgstr "Nenhum dos ícones selecionados podem ser renomeados." -#: ../src/xfdesktop-file-icon-manager.c:675 -#: ../src/xfdesktop-file-icon-manager.c:719 ../src/xfdesktop-file-utils.c:876 +#: ../src/xfdesktop-file-icon-manager.c:712 +#: ../src/xfdesktop-file-icon-manager.c:756 ../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:676 -#: ../src/xfdesktop-file-icon-manager.c:720 +#: ../src/xfdesktop-file-icon-manager.c:713 +#: ../src/xfdesktop-file-icon-manager.c:757 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:677 -#: ../src/xfdesktop-file-icon-manager.c:721 ../src/xfdesktop-file-utils.c:725 +#: ../src/xfdesktop-file-icon-manager.c:714 +#: ../src/xfdesktop-file-icon-manager.c:758 ../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 @@ -645,123 +674,114 @@ 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:821 -#: ../src/xfdesktop-file-icon-manager.c:1279 +#: ../src/xfdesktop-file-icon-manager.c:858 +#: ../src/xfdesktop-file-icon-manager.c:1320 #, c-format msgid "Unable to launch \"%s\":" msgstr "Não foi possível lançar \"%s\":" -#: ../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:1008 +#: ../src/xfdesktop-file-icon-manager.c:1049 #, c-format msgid "_Open With \"%s\"" msgstr "Abrir c_om \"%s\"" -#: ../src/xfdesktop-file-icon-manager.c:1011 +#: ../src/xfdesktop-file-icon-manager.c:1052 #, c-format msgid "Open With \"%s\"" msgstr "Abrir com \"%s\"" -#: ../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:1337 +#: ../src/xfdesktop-file-icon-manager.c:1378 msgid "_Open all" msgstr "A_brir todos" -#: ../src/xfdesktop-file-icon-manager.c:1353 +#: ../src/xfdesktop-file-icon-manager.c:1394 msgid "_Open in New Window" msgstr "Ab_rir em nova janela" -#: ../src/xfdesktop-file-icon-manager.c:1355 +#: ../src/xfdesktop-file-icon-manager.c:1396 #: ../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:1374 +#: ../src/xfdesktop-file-icon-manager.c:1415 msgid "Create _Launcher..." msgstr "Criar _lançador..." #. create link item -#: ../src/xfdesktop-file-icon-manager.c:1390 +#: ../src/xfdesktop-file-icon-manager.c:1431 msgid "Create _URL Link..." msgstr "Criar ligação para _URL..." #. create folder item -#: ../src/xfdesktop-file-icon-manager.c:1406 +#: ../src/xfdesktop-file-icon-manager.c:1447 msgid "Create _Folder..." msgstr "Criar _pasta..." -#: ../src/xfdesktop-file-icon-manager.c:1421 +#: ../src/xfdesktop-file-icon-manager.c:1462 msgid "Create From _Template" msgstr "Criar a partir do _modelo" -#: ../src/xfdesktop-file-icon-manager.c:1450 +#: ../src/xfdesktop-file-icon-manager.c:1491 msgid "_Empty File" msgstr "Ar_quivo vazio" -#: ../src/xfdesktop-file-icon-manager.c:1467 +#: ../src/xfdesktop-file-icon-manager.c:1508 msgid "_Execute" msgstr "_Executar" -#: ../src/xfdesktop-file-icon-manager.c:1487 +#: ../src/xfdesktop-file-icon-manager.c:1528 msgid "_Edit Launcher" msgstr "_Editar lançador" -#: ../src/xfdesktop-file-icon-manager.c:1522 +#: ../src/xfdesktop-file-icon-manager.c:1563 msgid "Open With" msgstr "Abrir com" -#: ../src/xfdesktop-file-icon-manager.c:1548 +#: ../src/xfdesktop-file-icon-manager.c:1589 msgid "Open With Other _Application..." msgstr "Abrir com outro _aplicativo..." +#. Trash +#: ../src/xfdesktop-file-icon-manager.c:1676 +msgid "Mo_ve to Trash" +msgstr "Mo_ver para lixeira" + #. Rename -#: ../src/xfdesktop-file-icon-manager.c:1651 +#: ../src/xfdesktop-file-icon-manager.c:1707 msgid "_Rename..." msgstr "_Renomear..." -#: ../src/xfdesktop-file-icon-manager.c:1679 +#: ../src/xfdesktop-file-icon-manager.c:1735 msgid "Arrange Desktop _Icons" msgstr "_Posicionar ícones da área de trabalho" -#: ../src/xfdesktop-file-icon-manager.c:1690 +#: ../src/xfdesktop-file-icon-manager.c:1746 msgid "Desktop _Settings..." msgstr "_Configurações da área de trabalho..." -#: ../src/xfdesktop-file-icon-manager.c:1701 +#: ../src/xfdesktop-file-icon-manager.c:1757 #: ../src/xfdesktop-volume-icon.c:855 msgid "P_roperties..." msgstr "_Propriedades..." -#: ../src/xfdesktop-file-icon-manager.c:2716 +#: ../src/xfdesktop-file-icon-manager.c:2699 msgid "Load Error" msgstr "Erro ao carregar" -#: ../src/xfdesktop-file-icon-manager.c:2718 +#: ../src/xfdesktop-file-icon-manager.c:2701 msgid "Failed to load the desktop folder" msgstr "Falha ao carregar a pasta da área de trabalho" -#: ../src/xfdesktop-file-icon-manager.c:3262 +#: ../src/xfdesktop-file-icon-manager.c:3242 msgid "Copy _Here" msgstr "_Copiar aqui" -#: ../src/xfdesktop-file-icon-manager.c:3262 +#: ../src/xfdesktop-file-icon-manager.c:3242 msgid "_Move Here" msgstr "_Mover aqui" -#: ../src/xfdesktop-file-icon-manager.c:3262 +#: ../src/xfdesktop-file-icon-manager.c:3242 msgid "_Link Here" msgstr "_Ligação aqui" @@ -816,7 +836,7 @@ #: ../src/xfdesktop-file-utils.c:827 msgid "The selected files could not be deleted" -msgstr "Os arquivos selecionados não puderam ser excluídos" +msgstr "Não foi possível excluir os arquivos selecionados" #: ../src/xfdesktop-file-utils.c:877 msgid "The selected files could not be moved to the trash" @@ -929,7 +949,7 @@ msgid "Eject Finished" msgstr "Ejeção concluída" -#: ../src/xfdesktop-regular-file-icon.c:603 +#: ../src/xfdesktop-regular-file-icon.c:748 #, c-format msgid "" "Type: %s\n" diff -Nru xfdesktop4-4.11.6/po/pt.po xfdesktop4-4.19.2/po/pt.po --- xfdesktop4-4.11.6/po/pt.po 2014-01-13 07:25:31.000000000 +0000 +++ xfdesktop4-4.19.2/po/pt.po 2014-05-29 16:45:19.000000000 +0000 @@ -11,47 +11,47 @@ 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-12 23:22+0000\n" +"POT-Creation-Date: 2014-04-03 18:32+0200\n" +"PO-Revision-Date: 2014-05-14 11:15+0000\n" "Last-Translator: Sérgio Marques \n" -"Language-Team: Portuguese (http://www.transifex.com/projects/p/xfce/language/pt/)\n" +"Language-Team: Portuguese (http://www.transifex.com/projects/p/xfdesktop/language/pt/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Language: pt\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -#: ../settings/main.c:372 ../src/xfdesktop-special-file-icon.c:295 +#: ../settings/main.c:404 ../src/xfdesktop-special-file-icon.c:295 #: ../src/xfdesktop-special-file-icon.c:479 msgid "Home" msgstr "Pasta pessoal" -#: ../settings/main.c:374 +#: ../settings/main.c:406 msgid "Filesystem" msgstr "Sistema de ficheiros" -#: ../settings/main.c:376 +#: ../settings/main.c:408 msgid "Trash" msgstr "Lixo" -#: ../settings/main.c:378 +#: ../settings/main.c:410 msgid "Removable Devices" msgstr "Dispositivos amovíveis" -#: ../settings/main.c:380 +#: ../settings/main.c:412 msgid "Network Shares" msgstr "Partilhas de rede" -#: ../settings/main.c:382 +#: ../settings/main.c:414 msgid "Disks and Drives" msgstr "Discos e unidades" -#: ../settings/main.c:384 -msgid "Other Items" -msgstr "Outros itens" +#: ../settings/main.c:416 +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:529 #, c-format msgid "" "%s\n" @@ -59,97 +59,95 @@ "Size: %s" msgstr "%s\nTipo: %s\nTamanho: %s" -#: ../settings/main.c:681 +#: ../settings/main.c:715 #, c-format msgid "Wallpaper for Monitor %d (%s)" msgstr "Papel de parede do ecrã %d (%s)" -#: ../settings/main.c:684 +#: ../settings/main.c:718 #, c-format msgid "Wallpaper for Monitor %d" msgstr "Papel de parede do ecrã %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 "Está a utilizar mais do que um ecrã. Mova este diálogo para o ecrã que pretende editar as definições." +#: ../settings/main.c:724 +msgid "Move this dialog to the display you want to edit the settings for." +msgstr "Mova este diálogo para o ecrã que pretende editar as definições." -#: ../settings/main.c:698 +#: ../settings/main.c:731 #, 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:735 #, 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:742 msgid "" -"You are using more than one display, move this dialog to the display and " -"workspace you want to edit the settings for." -msgstr "Está a utilizar mais do que um ecrã. Mova este diálogo para o ecrã e área de trabalho que pretende editar as definições." +"Move this dialog to the display and workspace you want to edit the settings " +"for." +msgstr "Mova este diálogo para o ecrã e área de trabalho que pretende editar as definições." #. Single monitor and single workspace -#: ../settings/main.c:717 +#: ../settings/main.c:749 #, c-format msgid "Wallpaper for my desktop" msgstr "Papel de parede do ambiente de trabalho" #. Single monitor and per workspace wallpaper -#: ../settings/main.c:723 +#: ../settings/main.c:755 #, c-format msgid "Wallpaper for %s" msgstr "Papel de parede para %s" -#: ../settings/main.c:728 +#: ../settings/main.c:760 msgid "Move this dialog to the workspace you want to edit the settings for." msgstr "Mova este diálogo para o ecrã e área de trabalho que pretende editar as definições." -#: ../settings/main.c:1131 +#: ../settings/main.c:1174 msgid "Image selection is unavailable while the image style is set to None." msgstr "A seleção de imagens não está disponível se o estilo de imagem for nulo." -#: ../settings/main.c:1483 +#: ../settings/main.c:1523 msgid "Spanning screens" msgstr "Expandir ecrãs" -#: ../settings/main.c:1788 +#: ../settings/main.c:1825 msgid "Image files" msgstr "Ficheiros de imagem" -#: ../settings/main.c:1945 +#: ../settings/main.c:2001 msgid "Settings manager socket" msgstr "Gestor de definições" -#: ../settings/main.c:1945 +#: ../settings/main.c:2001 msgid "SOCKET ID" msgstr "ID do SOCKET" -#: ../settings/main.c:1946 +#: ../settings/main.c:2002 msgid "Version information" msgstr "Informações de versão" -#: ../settings/main.c:1973 +#: ../settings/main.c:2030 #, c-format msgid "Type '%s --help' for usage." msgstr "Digite '%s --help' para utilização." -#: ../settings/main.c:1985 +#: ../settings/main.c:2042 msgid "The Xfce development team. All rights reserved." msgstr "A equipa de desenvolvimento do Xfce. Todos os direitos reservados." -#: ../settings/main.c:1986 +#: ../settings/main.c:2043 #, c-format msgid "Please report bugs to <%s>." msgstr "Por favor reporte os erros em <%s>." -#: ../settings/main.c:1993 +#: ../settings/main.c:2050 msgid "Desktop Settings" msgstr "Definições do ambiente de trabalho" -#: ../settings/main.c:1995 +#: ../settings/main.c:2052 msgid "Unable to contact settings server" msgstr "Incapaz de contactar o servidor de definições" @@ -182,16 +180,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 obtenção de imagens" +msgid "Choose the folder to select wallpapers from." +msgstr "Escolha a pasta para obtenção de imagens." #: ../settings/xfdesktop-settings-appearance-frame-ui.glade.h:7 msgid "St_yle:" msgstr "E_stilo:" #: ../settings/xfdesktop-settings-appearance-frame-ui.glade.h:8 -msgid "Specify how the image will be resized to fit the screen" -msgstr "Especificar o tipo de ajuste ao ecrã da imagem" +msgid "Specify how the image will be resized to fit the screen." +msgstr "Especifique o tipo de redimensionamento para ajuste ao ecrã." #: ../settings/xfdesktop-settings-appearance-frame-ui.glade.h:9 #: ../settings/xfdesktop-settings-ui.glade.h:4 @@ -227,20 +225,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 por trás da imagem de fundo" +msgid "Specify the style of the color drawn behind the backdrop image." +msgstr "Especifique o estilo da cor por trás da imagem 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, à \"esquerda\" ou \"superior\" do gradiente" +msgid "Specifies the solid color, or the \"left\" or \"top\" color of the gradient." +msgstr "Especifica a cor sólida, à \"esquerda\" ou \"superior\" do gradiente." #: ../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 gradiente" +msgid "Specifies the \"right\" or \"bottom\" color of the gradient." +msgstr "Especifica a cor à \"direita\" ou \"inferior\" do gradiente." #: ../settings/xfdesktop-settings-appearance-frame-ui.glade.h:21 msgid "Select Second Color" @@ -260,8 +258,8 @@ msgstr "Selecionar automaticamente um fundo diferente a partir do atual diretório." #: ../settings/xfdesktop-settings-appearance-frame-ui.glade.h:25 -msgid "Specify how often the background will change" -msgstr "Especifique a frequência da alteração de imagem" +msgid "Specify how often the background will change." +msgstr "Especifique a frequência da alteração de imagem." #: ../settings/xfdesktop-settings-appearance-frame-ui.glade.h:26 msgid "in seconds:" @@ -337,7 +335,7 @@ msgid "File/launcher icons" msgstr "Ícones de ficheiro/lançador" -#: ../settings/xfdesktop-settings-ui.glade.h:10 ../src/xfce-desktop.c:1010 +#: ../settings/xfdesktop-settings-ui.glade.h:10 ../src/xfce-desktop.c:1020 msgid "Desktop" msgstr "Ambiente de trabalho" @@ -516,250 +514,251 @@ msgid "_Remove Workspace '%s'" msgstr "_Remover área de trabalho \"%s\"" -#: ../src/xfdesktop-application.c:772 +#: ../src/xfdesktop-app-menu-item.c:349 +#: ../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:1132 ../src/xfdesktop-file-utils.c:1209 +#: ../src/xfdesktop-file-utils.c:1234 ../src/xfdesktop-file-utils.c:1286 +msgid "Launch Error" +msgstr "Erro do lançador" + +#: ../src/xfdesktop-app-menu-item.c:351 +#: ../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 "Incapaz de iniciar \"exo-desktop-item-edit\", necessário para criar e editar lançadores e atalhos no ambiente de trabalho." + +#: ../src/xfdesktop-application.c:768 msgid "Display version information" msgstr "Mostrar informações da versão" -#: ../src/xfdesktop-application.c:773 +#: ../src/xfdesktop-application.c:769 msgid "Reload all settings" msgstr "Recarregar todas as definições" -#: ../src/xfdesktop-application.c:774 +#: ../src/xfdesktop-application.c:770 msgid "Pop up the menu (at the current mouse position)" msgstr "Mostrar menu (na posição do rato)" -#: ../src/xfdesktop-application.c:775 +#: ../src/xfdesktop-application.c:771 msgid "Pop up the window list (at the current mouse position)" msgstr "Mostrar lista de janelas (na posição do rato)" -#: ../src/xfdesktop-application.c:777 +#: ../src/xfdesktop-application.c:773 msgid "Automatically arrange all the icons on the desktop" msgstr "Dispor automaticamente os ícones no ecrã" -#: ../src/xfdesktop-application.c:779 +#: ../src/xfdesktop-application.c:775 msgid "Do not wait for a window manager on startup" msgstr "Não esperar pelo gestor de janelas ao arrancar" -#: ../src/xfdesktop-application.c:780 +#: ../src/xfdesktop-application.c:776 msgid "Cause xfdesktop to quit" msgstr "Obrigar ao fecho do xfdesktop" -#: ../src/xfdesktop-application.c:795 +#: ../src/xfdesktop-application.c:791 #, c-format msgid "Failed to parse arguments: %s\n" msgstr "Falha ao processar 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, executado 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 "Criado com GTK+ %d.%d.%d, vinculado ao GTK+ %d.%d.%d." -#: ../src/xfdesktop-application.c:812 +#: ../src/xfdesktop-application.c:808 #, c-format msgid "Build options:\n" msgstr "Opções da versão:\n" -#: ../src/xfdesktop-application.c:813 +#: ../src/xfdesktop-application.c:809 #, c-format msgid " Desktop Menu: %s\n" msgstr " Menu do ambiente 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 "ativo" -#: ../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 "inativo" -#: ../src/xfdesktop-application.c:820 +#: ../src/xfdesktop-application.c:816 #, c-format msgid " Desktop Icons: %s\n" msgstr " Ícones do ambiente de trabalho: %s\n" -#: ../src/xfdesktop-application.c:827 +#: ../src/xfdesktop-application.c:823 #, c-format msgid " Desktop File Icons: %s\n" msgstr " Ícones do ficheiro do ambiente 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 "Incapaz de criar a pasta do ambiente 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 do ambiente 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 "Já existe um ficheiro com este nome. Por favor apague-o ou dê outro nome." -#: ../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 mudar de nome" -#: ../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 ficheiros não foram 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 possuem suporte à renomeação." -#: ../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:921 +#: ../src/xfdesktop-file-utils.c:959 msgid "Trash Error" msgstr "Erro no lixo" -#: ../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 ficheiros selecionados não foram eliminados" -#: ../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:864 +#: ../src/xfdesktop-file-utils.c:1005 ../src/xfdesktop-file-utils.c:1052 +#: ../src/xfdesktop-file-utils.c:1093 ../src/xfdesktop-file-utils.c:1134 +#: ../src/xfdesktop-file-utils.c:1236 ../src/xfdesktop-file-utils.c:1288 +#: ../src/xfdesktop-file-utils.c:1361 ../src/xfdesktop-file-utils.c:1439 msgid "" "This feature requires a file manager service to be present (such as the one " "supplied by Thunar)." msgstr "Esta função requer um serviço do gestor de ficheiros (como aquele que é disponibilizado 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 "Incapaz de iniciar \"%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 -msgid "Launch Error" -msgstr "Erro do lançador" - -#: ../src/xfdesktop-file-icon-manager.c:1064 +#: ../src/xfdesktop-file-icon-manager.c:1008 #, c-format msgid "_Open With \"%s\"" msgstr "_Abrir com \"%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 -msgid "" -"Unable to launch \"exo-desktop-item-edit\", which is required to create and " -"edit launchers and links on the desktop." -msgstr "Incapaz de iniciar \"exo-desktop-item-edit\", necessário para criar e editar lançadores e atalhos no ambiente de trabalho." - -#: ../src/xfdesktop-file-icon-manager.c:1393 +#: ../src/xfdesktop-file-icon-manager.c:1337 msgid "_Open all" msgstr "_Abrir tudo" -#: ../src/xfdesktop-file-icon-manager.c:1409 +#: ../src/xfdesktop-file-icon-manager.c:1353 msgid "_Open in New Window" msgstr "_Abrir 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 "_Abrir" #. 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 _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 par_tir de modelo" -#: ../src/xfdesktop-file-icon-manager.c:1506 +#: ../src/xfdesktop-file-icon-manager.c:1450 msgid "_Empty File" msgstr "_Ficheiro 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 outra _aplicação..." #. Rename -#: ../src/xfdesktop-file-icon-manager.c:1704 +#: ../src/xfdesktop-file-icon-manager.c:1651 msgid "_Rename..." msgstr "_Mudar nome..." -#: ../src/xfdesktop-file-icon-manager.c:1732 +#: ../src/xfdesktop-file-icon-manager.c:1679 msgid "Arrange Desktop _Icons" msgstr "Dispor í_cones do ambiente de trabalho" -#: ../src/xfdesktop-file-icon-manager.c:1743 +#: ../src/xfdesktop-file-icon-manager.c:1690 msgid "Desktop _Settings..." msgstr "Definiçõe_s do ambiente 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:2642 msgid "Load Error" msgstr "Erro ao carregar" -#: ../src/xfdesktop-file-icon-manager.c:2746 +#: ../src/xfdesktop-file-icon-manager.c:2644 msgid "Failed to load the desktop folder" msgstr "Falha ao carregar a pasta de ambiente de trabalho" -#: ../src/xfdesktop-file-icon-manager.c:3286 +#: ../src/xfdesktop-file-icon-manager.c:3189 msgid "Copy _Here" msgstr "Copiar para _aqui" -#: ../src/xfdesktop-file-icon-manager.c:3286 +#: ../src/xfdesktop-file-icon-manager.c:3189 msgid "_Move Here" msgstr "_Mover para aqui" -#: ../src/xfdesktop-file-icon-manager.c:3286 +#: ../src/xfdesktop-file-icon-manager.c:3189 msgid "_Link Here" msgstr "Criar _ligação aqui" @@ -792,88 +791,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 "Não foi possível abrir a pasta" -#: ../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 solicitada não foi terminada" -#: ../src/xfdesktop-file-utils.c:717 +#: ../src/xfdesktop-file-utils.c:724 msgid "The file could not be renamed" msgstr "O ficheiro não pode ser renomeado" -#: ../src/xfdesktop-file-utils.c:819 +#: ../src/xfdesktop-file-utils.c:862 msgid "Delete Error" -msgstr "Erro ao apagar" +msgstr "Erro de eliminação" -#: ../src/xfdesktop-file-utils.c:820 +#: ../src/xfdesktop-file-utils.c:863 msgid "The selected files could not be deleted" -msgstr "Os ficheiros selecionados não foram apagados" +msgstr "Os ficheiros selecionados não foram eliminados" -#: ../src/xfdesktop-file-utils.c:870 +#: ../src/xfdesktop-file-utils.c:922 msgid "The selected files could not be moved to the trash" -msgstr "Os ficheiros selecionados não foram enviados para o lixo" +msgstr "Os ficheiros selecionados não foram movidos para o lixo" -#: ../src/xfdesktop-file-utils.c:871 ../src/xfdesktop-file-utils.c:908 +#: ../src/xfdesktop-file-utils.c:923 ../src/xfdesktop-file-utils.c:961 msgid "" "This feature requires a trash service to be present (such as the one " "supplied by Thunar)." msgstr "Esta função requer um serviço de lixo (como aquele que é disponibilizado pelo Thunar)." -#: ../src/xfdesktop-file-utils.c:907 +#: ../src/xfdesktop-file-utils.c:960 msgid "Could not empty the trash" msgstr "Não foi possível esvaziar o lixo" -#: ../src/xfdesktop-file-utils.c:950 +#: ../src/xfdesktop-file-utils.c:1003 msgid "Create File Error" msgstr "Erro ao criar ficheiro" -#: ../src/xfdesktop-file-utils.c:951 +#: ../src/xfdesktop-file-utils.c:1004 msgid "Could not create a new file" msgstr "Não foi possível criar o novo ficheiro" -#: ../src/xfdesktop-file-utils.c:997 +#: ../src/xfdesktop-file-utils.c:1050 msgid "Create Document Error" msgstr "Erro ao criar documento" -#: ../src/xfdesktop-file-utils.c:998 +#: ../src/xfdesktop-file-utils.c:1051 msgid "Could not create a new document from the template" msgstr "Não foi possível criar o documento com base no modelo" -#: ../src/xfdesktop-file-utils.c:1038 +#: ../src/xfdesktop-file-utils.c:1091 msgid "File Properties Error" msgstr "Erro nas propriedades do ficheiro" -#: ../src/xfdesktop-file-utils.c:1039 +#: ../src/xfdesktop-file-utils.c:1092 msgid "The file properties dialog could not be opened" msgstr "Não foi possível abrir a janela de propriedades do ficheiro" -#: ../src/xfdesktop-file-utils.c:1080 +#: ../src/xfdesktop-file-utils.c:1133 msgid "The file could not be opened" msgstr "Não foi possível abrir o ficheiro" -#: ../src/xfdesktop-file-utils.c:1153 ../src/xfdesktop-file-utils.c:1178 +#: ../src/xfdesktop-file-utils.c:1206 ../src/xfdesktop-file-utils.c:1231 #, c-format msgid "Failed to run \"%s\"" msgstr "Falha ao executar \"%s\"" -#: ../src/xfdesktop-file-utils.c:1234 +#: ../src/xfdesktop-file-utils.c:1287 msgid "The application chooser could not be opened" msgstr "Não foi possível abrir o seletor de aplicações" -#: ../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:1345 ../src/xfdesktop-file-utils.c:1359 +#: ../src/xfdesktop-file-utils.c:1421 ../src/xfdesktop-file-utils.c:1437 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:1346 ../src/xfdesktop-file-utils.c:1360 +#: ../src/xfdesktop-file-utils.c:1422 ../src/xfdesktop-file-utils.c:1438 msgid "The file transfer could not be performed" msgstr "Não foi possível transferir o ficheiro" @@ -927,7 +926,7 @@ msgid "Eject Finished" msgstr "Ejeção terminada" -#: ../src/xfdesktop-regular-file-icon.c:603 +#: ../src/xfdesktop-regular-file-icon.c:741 #, c-format msgid "" "Type: %s\n" @@ -997,15 +996,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 vol_ume" -#: ../src/xfdesktop-volume-icon.c:843 +#: ../src/xfdesktop-volume-icon.c:842 msgid "_Mount Volume" msgstr "_Montar volume" diff -Nru xfdesktop4-4.11.6/po/ru.po xfdesktop4-4.19.2/po/ru.po --- xfdesktop4-4.11.6/po/ru.po 2014-03-02 13:34:53.000000000 +0000 +++ xfdesktop4-4.19.2/po/ru.po 2014-09-08 16:22:41.000000000 +0000 @@ -4,7 +4,7 @@ # # Translators: # Aleksandr P , 2010-2011 -# AK , 2013 +# Aleksey Kabanov , 2013 # Alexandr Boltris , 2011 # Andrey Fedoseev , 2006 # Anthony Ivanoff , 2004-2005 @@ -13,54 +13,55 @@ # Dan Korostelev , 2003 # Denis Koryavov , 2010 # Ilya Shestopalov , 2009 +# Kyrill Detinov , 2014 # Poul Ionkin , 2003 -# asvl , 2013-2014 +# Sergey Alyoshin , 2013-2014 # Sergey Fedoseev , 2006 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-03-02 08:21+0000\n" -"Last-Translator: asvl \n" -"Language-Team: Russian (http://www.transifex.com/projects/p/xfce/language/ru/)\n" +"POT-Creation-Date: 2014-08-03 12:32+0200\n" +"PO-Revision-Date: 2014-09-03 18:23+0000\n" +"Last-Translator: Sergey Alyoshin \n" +"Language-Team: Russian (http://www.transifex.com/projects/p/xfdesktop/language/ru/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Language: ru\n" "Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n" -#: ../settings/main.c:375 ../src/xfdesktop-special-file-icon.c:295 +#: ../settings/main.c:404 ../src/xfdesktop-special-file-icon.c:295 #: ../src/xfdesktop-special-file-icon.c:479 msgid "Home" msgstr "Домашний каталог" -#: ../settings/main.c:377 +#: ../settings/main.c:406 msgid "Filesystem" msgstr "Файловая система" -#: ../settings/main.c:379 +#: ../settings/main.c:408 msgid "Trash" msgstr "Корзина" -#: ../settings/main.c:381 +#: ../settings/main.c:410 msgid "Removable Devices" msgstr "Съёмные устройства" -#: ../settings/main.c:383 +#: ../settings/main.c:412 msgid "Network Shares" msgstr "Сетевые ресурсы" -#: ../settings/main.c:385 +#: ../settings/main.c:414 msgid "Disks and Drives" msgstr "Диски и приводы" -#: ../settings/main.c:387 +#: ../settings/main.c:416 msgid "Other Devices" msgstr "Прочее" #. Display the file name, file type, and file size in the tooltip. -#: ../settings/main.c:500 +#: ../settings/main.c:529 #, c-format msgid "" "%s\n" @@ -68,95 +69,95 @@ "Size: %s" msgstr "%s\nТип: %s\nРазмер: %s" -#: ../settings/main.c:686 +#: ../settings/main.c:715 #, c-format msgid "Wallpaper for Monitor %d (%s)" msgstr "Фоновое изображение для монитора %d (%s)" -#: ../settings/main.c:689 +#: ../settings/main.c:718 #, c-format msgid "Wallpaper for Monitor %d" msgstr "Фоновое изображение для монитора %d" -#: ../settings/main.c:695 +#: ../settings/main.c:724 msgid "Move this dialog to the display you want to edit the settings for." msgstr "Переместите этот диалог на экран, настройки которого хотите изменить." -#: ../settings/main.c:702 +#: ../settings/main.c:731 #, c-format msgid "Wallpaper for %s on Monitor %d (%s)" msgstr "Фоновое изображение для %s на мониторе %d (%s)" -#: ../settings/main.c:706 +#: ../settings/main.c:735 #, c-format msgid "Wallpaper for %s on Monitor %d" msgstr "Фоновое изображение для %s на мониторе %d" -#: ../settings/main.c:713 +#: ../settings/main.c:742 msgid "" "Move this dialog to the display and workspace you want to edit the settings " "for." msgstr "Переместите этот диалог на экран и рабочее место, настройки которых хотите изменить." #. Single monitor and single workspace -#: ../settings/main.c:720 +#: ../settings/main.c:749 #, c-format msgid "Wallpaper for my desktop" msgstr "Фоновое изображение для рабочего стола" #. Single monitor and per workspace wallpaper -#: ../settings/main.c:726 +#: ../settings/main.c:755 #, c-format msgid "Wallpaper for %s" msgstr "Фоновое изображение для %s" -#: ../settings/main.c:731 +#: ../settings/main.c:760 msgid "Move this dialog to the workspace you want to edit the settings for." msgstr "Перенесите этот диалог на рабочее место настройки которого хотите изменить." -#: ../settings/main.c:1134 +#: ../settings/main.c:1174 msgid "Image selection is unavailable while the image style is set to None." msgstr "Выбор изображения недоступен, если не указан стиль изображения." -#: ../settings/main.c:1481 +#: ../settings/main.c:1524 msgid "Spanning screens" msgstr "Объединённые экраны" -#: ../settings/main.c:1786 +#: ../settings/main.c:1831 msgid "Image files" msgstr "Файлы изображений" -#: ../settings/main.c:1958 +#: ../settings/main.c:2010 msgid "Settings manager socket" msgstr "Сокет диспетчера настроек" -#: ../settings/main.c:1958 +#: ../settings/main.c:2010 msgid "SOCKET ID" msgstr "ID сокета" -#: ../settings/main.c:1959 +#: ../settings/main.c:2011 msgid "Version information" msgstr "Информация о версии" -#: ../settings/main.c:1986 +#: ../settings/main.c:2039 #, c-format msgid "Type '%s --help' for usage." msgstr "Наберите «%s --help» для информации об использовании." -#: ../settings/main.c:1998 +#: ../settings/main.c:2051 msgid "The Xfce development team. All rights reserved." msgstr "Команда разработчиков Xfce. Все права защищены." -#: ../settings/main.c:1999 +#: ../settings/main.c:2052 #, c-format msgid "Please report bugs to <%s>." msgstr "Об ошибках сообщайте на <%s>." -#: ../settings/main.c:2006 +#: ../settings/main.c:2059 msgid "Desktop Settings" msgstr "Настройки рабочего стола" -#: ../settings/main.c:2008 +#: ../settings/main.c:2061 msgid "Unable to contact settings server" msgstr "Не удаётся подключиться к серверу настроек" @@ -165,7 +166,8 @@ msgstr "Рабочий стол" #: ../settings/xfce-backdrop-settings.desktop.in.h:2 -msgid "Set desktop background and menu and icon behaviour" +#: ../settings/xfdesktop-settings-ui.glade.h:11 +msgid "Set desktop background and menu and icon behavior" msgstr "Задание фона рабочего стола и изменение настроек меню и значков" #: ../settings/xfdesktop-settings-appearance-frame-ui.glade.h:1 @@ -344,14 +346,10 @@ msgid "File/launcher icons" msgstr "Значки файлов и запуска" -#: ../settings/xfdesktop-settings-ui.glade.h:10 ../src/xfce-desktop.c:1015 +#: ../settings/xfdesktop-settings-ui.glade.h:10 ../src/xfce-desktop.c:1007 msgid "Desktop" msgstr "Рабочий стол" -#: ../settings/xfdesktop-settings-ui.glade.h:11 -msgid "Set desktop background and menu and icon behavior" -msgstr "Задание фона рабочего стола и изменение настроек меню и значков" - #: ../settings/xfdesktop-settings-ui.glade.h:12 msgid "_Background" msgstr "_Фон" @@ -443,26 +441,30 @@ msgstr "Открывать одним щел_чком" #: ../settings/xfdesktop-settings-ui.glade.h:34 +msgid "Show hidden files on the desktop" +msgstr "Показывать скрытые файлы на рабочем столе" + +#: ../settings/xfdesktop-settings-ui.glade.h:35 msgid "Show icon tooltips. Size:" msgstr "Показывать подсказки для значков. Размер:" -#: ../settings/xfdesktop-settings-ui.glade.h:35 +#: ../settings/xfdesktop-settings-ui.glade.h:36 msgid "Size of the tooltip preview image." msgstr "Размер эскиза во всплывающей подсказке." -#: ../settings/xfdesktop-settings-ui.glade.h:36 +#: ../settings/xfdesktop-settings-ui.glade.h:37 msgid "Use custom _font size:" msgstr "Задать размер _шрифта:" -#: ../settings/xfdesktop-settings-ui.glade.h:37 +#: ../settings/xfdesktop-settings-ui.glade.h:38 msgid "Appearance" msgstr "Внешний вид" -#: ../settings/xfdesktop-settings-ui.glade.h:38 +#: ../settings/xfdesktop-settings-ui.glade.h:39 msgid "Default Icons" msgstr "Стандартные значки" -#: ../settings/xfdesktop-settings-ui.glade.h:39 +#: ../settings/xfdesktop-settings-ui.glade.h:40 msgid "_Icons" msgstr "З_начки" @@ -523,121 +525,149 @@ msgid "_Remove Workspace '%s'" msgstr "_Удалить рабочее место «%s»" -#: ../src/xfdesktop-application.c:768 +#: ../src/xfdesktop-app-menu-item.c:349 +#: ../src/xfdesktop-file-icon-manager.c:860 +#: ../src/xfdesktop-file-icon-manager.c:1125 +#: ../src/xfdesktop-file-icon-manager.c:1321 ../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 "Ошибка запуска" + +#: ../src/xfdesktop-app-menu-item.c:351 +#: ../src/xfdesktop-file-icon-manager.c:1127 +msgid "" +"Unable to launch \"exo-desktop-item-edit\", which is required to create and " +"edit launchers and links on the desktop." +msgstr "Невозможно запустить «exo-desktop-item-edit», которая необходима для редактирования значков запуска и ссылок на рабочем столе." + +#: ../src/xfdesktop-application.c:836 msgid "Display version information" msgstr "Показать информацию о версии" -#: ../src/xfdesktop-application.c:769 +#: ../src/xfdesktop-application.c:837 msgid "Reload all settings" msgstr "Перезагрузить все настройки" -#: ../src/xfdesktop-application.c:770 +#: ../src/xfdesktop-application.c:838 +msgid "Advance to the next wallpaper on the current workspace" +msgstr "Перейти к следующему фоновому изображению на текущем рабочем месте" + +#: ../src/xfdesktop-application.c:839 msgid "Pop up the menu (at the current mouse position)" msgstr "Показать меню (под курсором мыши)" -#: ../src/xfdesktop-application.c:771 +#: ../src/xfdesktop-application.c:840 msgid "Pop up the window list (at the current mouse position)" msgstr "Показать список окон (под курсором мыши)" -#: ../src/xfdesktop-application.c:773 +#: ../src/xfdesktop-application.c:842 msgid "Automatically arrange all the icons on the desktop" msgstr "Автоматически выравнивать значки на рабочем столе" -#: ../src/xfdesktop-application.c:775 +#: ../src/xfdesktop-application.c:844 +msgid "Enable debug messages" +msgstr "Включить отладочные сообщения" + +#: ../src/xfdesktop-application.c:845 +msgid "Disable debug messages" +msgstr "Отключить отладочные сообщения" + +#: ../src/xfdesktop-application.c:846 msgid "Do not wait for a window manager on startup" msgstr "Не ожидать менеджера окон при запуске" -#: ../src/xfdesktop-application.c:776 +#: ../src/xfdesktop-application.c:847 msgid "Cause xfdesktop to quit" msgstr "Завершить выполнение xfdesktop" -#: ../src/xfdesktop-application.c:791 +#: ../src/xfdesktop-application.c:862 #, c-format msgid "Failed to parse arguments: %s\n" msgstr "Не удалось разобрать аргументы: %s\n" -#: ../src/xfdesktop-application.c:802 +#: ../src/xfdesktop-application.c:873 #, c-format msgid "This is %s version %s, running on Xfce %s.\n" msgstr "Это %s версии %s, запущенный на Xfce %s.\n" -#: ../src/xfdesktop-application.c:804 +#: ../src/xfdesktop-application.c:875 #, c-format msgid "Built with GTK+ %d.%d.%d, linked with GTK+ %d.%d.%d." msgstr "Собрано с GTK+ %d.%d.%d, скомпоновано с GTK+ %d.%d.%d." -#: ../src/xfdesktop-application.c:808 +#: ../src/xfdesktop-application.c:879 #, c-format msgid "Build options:\n" msgstr "Параметры сборки:\\n\n" -#: ../src/xfdesktop-application.c:809 +#: ../src/xfdesktop-application.c:880 #, c-format msgid " Desktop Menu: %s\n" msgstr "Меню рабочего стола: %s\n" -#: ../src/xfdesktop-application.c:811 ../src/xfdesktop-application.c:818 -#: ../src/xfdesktop-application.c:825 +#: ../src/xfdesktop-application.c:882 ../src/xfdesktop-application.c:889 +#: ../src/xfdesktop-application.c:896 msgid "enabled" msgstr "включено" -#: ../src/xfdesktop-application.c:813 ../src/xfdesktop-application.c:820 -#: ../src/xfdesktop-application.c:827 +#: ../src/xfdesktop-application.c:884 ../src/xfdesktop-application.c:891 +#: ../src/xfdesktop-application.c:898 msgid "disabled" msgstr "отключено" -#: ../src/xfdesktop-application.c:816 +#: ../src/xfdesktop-application.c:887 #, c-format msgid " Desktop Icons: %s\n" msgstr "Значки на рабочем столе: %s\n" -#: ../src/xfdesktop-application.c:823 +#: ../src/xfdesktop-application.c:894 #, c-format msgid " Desktop File Icons: %s\n" msgstr "Значки файлов на рабочем столе: %s\n" -#: ../src/xfdesktop-file-icon-manager.c:522 -#: ../src/xfdesktop-file-icon-manager.c:539 +#: ../src/xfdesktop-file-icon-manager.c:559 +#: ../src/xfdesktop-file-icon-manager.c:576 #, c-format msgid "Could not create the desktop folder \"%s\"" msgstr "Не удалось создать каталог рабочего стола «%s»" -#: ../src/xfdesktop-file-icon-manager.c:527 -#: ../src/xfdesktop-file-icon-manager.c:544 +#: ../src/xfdesktop-file-icon-manager.c:564 +#: ../src/xfdesktop-file-icon-manager.c:581 msgid "Desktop Folder Error" msgstr "Ошибка каталога рабочего стола" -#: ../src/xfdesktop-file-icon-manager.c:546 +#: ../src/xfdesktop-file-icon-manager.c:583 msgid "" "A normal file with the same name already exists. Please delete or rename it." msgstr "Уже существует обычный файл с таким именем. Переименуйте его или удалите." -#: ../src/xfdesktop-file-icon-manager.c:629 ../src/xfdesktop-file-utils.c:723 +#: ../src/xfdesktop-file-icon-manager.c:666 ../src/xfdesktop-file-utils.c:723 #: ../src/xfdesktop-file-utils.c:776 msgid "Rename Error" msgstr "Ошибка при переименовании" -#: ../src/xfdesktop-file-icon-manager.c:630 ../src/xfdesktop-file-utils.c:777 +#: ../src/xfdesktop-file-icon-manager.c:667 ../src/xfdesktop-file-utils.c:777 msgid "The files could not be renamed" msgstr "Не удалось переименовать файлы" -#: ../src/xfdesktop-file-icon-manager.c:631 +#: ../src/xfdesktop-file-icon-manager.c:668 msgid "None of the icons selected support being renamed." msgstr "Выбранные значки не поддерживают переименование." -#: ../src/xfdesktop-file-icon-manager.c:675 -#: ../src/xfdesktop-file-icon-manager.c:719 ../src/xfdesktop-file-utils.c:876 +#: ../src/xfdesktop-file-icon-manager.c:712 +#: ../src/xfdesktop-file-icon-manager.c:756 ../src/xfdesktop-file-utils.c:876 #: ../src/xfdesktop-file-utils.c:913 msgid "Trash Error" msgstr "Ошибка корзины" -#: ../src/xfdesktop-file-icon-manager.c:676 -#: ../src/xfdesktop-file-icon-manager.c:720 +#: ../src/xfdesktop-file-icon-manager.c:713 +#: ../src/xfdesktop-file-icon-manager.c:757 msgid "The selected files could not be trashed" msgstr "Выбранные файлы не удалось отправить в корзину" -#: ../src/xfdesktop-file-icon-manager.c:677 -#: ../src/xfdesktop-file-icon-manager.c:721 ../src/xfdesktop-file-utils.c:725 +#: ../src/xfdesktop-file-icon-manager.c:714 +#: ../src/xfdesktop-file-icon-manager.c:758 ../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 @@ -649,123 +679,114 @@ msgstr "Эта функция требует наличия службы файлового менеджера (например, предоставляемой Thunar)." #. printf is to be translator-friendly -#: ../src/xfdesktop-file-icon-manager.c:821 -#: ../src/xfdesktop-file-icon-manager.c:1279 +#: ../src/xfdesktop-file-icon-manager.c:858 +#: ../src/xfdesktop-file-icon-manager.c:1320 #, c-format msgid "Unable to launch \"%s\":" msgstr "Невозможно запустить «%s»:" -#: ../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 "Ошибка запуска" - -#: ../src/xfdesktop-file-icon-manager.c:1008 +#: ../src/xfdesktop-file-icon-manager.c:1049 #, c-format msgid "_Open With \"%s\"" msgstr "_Открыть с помощью «%s»" -#: ../src/xfdesktop-file-icon-manager.c:1011 +#: ../src/xfdesktop-file-icon-manager.c:1052 #, c-format msgid "Open With \"%s\"" msgstr "Открыть с помощью «%s»" -#: ../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 "Невозможно запустить «exo-desktop-item-edit», которая необходима для редактирования значков запуска и ссылок на рабочем столе." - -#: ../src/xfdesktop-file-icon-manager.c:1337 +#: ../src/xfdesktop-file-icon-manager.c:1378 msgid "_Open all" msgstr "Открыть _все" -#: ../src/xfdesktop-file-icon-manager.c:1353 +#: ../src/xfdesktop-file-icon-manager.c:1394 msgid "_Open in New Window" msgstr "Открыть в _новом окне" -#: ../src/xfdesktop-file-icon-manager.c:1355 +#: ../src/xfdesktop-file-icon-manager.c:1396 #: ../src/xfdesktop-special-file-icon.c:547 ../src/xfdesktop-volume-icon.c:813 msgid "_Open" msgstr "_Открыть" #. create launcher item -#: ../src/xfdesktop-file-icon-manager.c:1374 +#: ../src/xfdesktop-file-icon-manager.c:1415 msgid "Create _Launcher..." msgstr "Создать _значок запуска..." #. create link item -#: ../src/xfdesktop-file-icon-manager.c:1390 +#: ../src/xfdesktop-file-icon-manager.c:1431 msgid "Create _URL Link..." msgstr "Создать _ссылку URL..." #. create folder item -#: ../src/xfdesktop-file-icon-manager.c:1406 +#: ../src/xfdesktop-file-icon-manager.c:1447 msgid "Create _Folder..." msgstr "Создать _каталог..." -#: ../src/xfdesktop-file-icon-manager.c:1421 +#: ../src/xfdesktop-file-icon-manager.c:1462 msgid "Create From _Template" msgstr "Создать из _шаблона" -#: ../src/xfdesktop-file-icon-manager.c:1450 +#: ../src/xfdesktop-file-icon-manager.c:1491 msgid "_Empty File" msgstr "_Пустой файл" -#: ../src/xfdesktop-file-icon-manager.c:1467 +#: ../src/xfdesktop-file-icon-manager.c:1508 msgid "_Execute" msgstr "_Выполнить" -#: ../src/xfdesktop-file-icon-manager.c:1487 +#: ../src/xfdesktop-file-icon-manager.c:1528 msgid "_Edit Launcher" msgstr "_Изменить значок запуска" -#: ../src/xfdesktop-file-icon-manager.c:1522 +#: ../src/xfdesktop-file-icon-manager.c:1563 msgid "Open With" msgstr "Открыть с помощью" -#: ../src/xfdesktop-file-icon-manager.c:1548 +#: ../src/xfdesktop-file-icon-manager.c:1589 msgid "Open With Other _Application..." msgstr "Открыть с помощью _другого приложения..." +#. Trash +#: ../src/xfdesktop-file-icon-manager.c:1676 +msgid "Mo_ve to Trash" +msgstr "_Удалить в корзину" + #. Rename -#: ../src/xfdesktop-file-icon-manager.c:1651 +#: ../src/xfdesktop-file-icon-manager.c:1707 msgid "_Rename..." msgstr "_Переименовать..." -#: ../src/xfdesktop-file-icon-manager.c:1679 +#: ../src/xfdesktop-file-icon-manager.c:1735 msgid "Arrange Desktop _Icons" msgstr "В_ыстроить значки" -#: ../src/xfdesktop-file-icon-manager.c:1690 +#: ../src/xfdesktop-file-icon-manager.c:1746 msgid "Desktop _Settings..." msgstr "_Настройка рабочего стола..." -#: ../src/xfdesktop-file-icon-manager.c:1701 +#: ../src/xfdesktop-file-icon-manager.c:1757 #: ../src/xfdesktop-volume-icon.c:855 msgid "P_roperties..." msgstr "_Свойства..." -#: ../src/xfdesktop-file-icon-manager.c:2716 +#: ../src/xfdesktop-file-icon-manager.c:2699 msgid "Load Error" msgstr "Ошибка загрузки" -#: ../src/xfdesktop-file-icon-manager.c:2718 +#: ../src/xfdesktop-file-icon-manager.c:2701 msgid "Failed to load the desktop folder" msgstr "Не удалось загрузить каталог рабочего стола" -#: ../src/xfdesktop-file-icon-manager.c:3262 +#: ../src/xfdesktop-file-icon-manager.c:3242 msgid "Copy _Here" msgstr "_Копировать" -#: ../src/xfdesktop-file-icon-manager.c:3262 +#: ../src/xfdesktop-file-icon-manager.c:3242 msgid "_Move Here" msgstr "Пере_местить" -#: ../src/xfdesktop-file-icon-manager.c:3262 +#: ../src/xfdesktop-file-icon-manager.c:3242 msgid "_Link Here" msgstr "Создать с_сылку" @@ -933,7 +954,7 @@ msgid "Eject Finished" msgstr "Извлечение завершено" -#: ../src/xfdesktop-regular-file-icon.c:603 +#: ../src/xfdesktop-regular-file-icon.c:748 #, c-format msgid "" "Type: %s\n" diff -Nru xfdesktop4-4.11.6/po/th.po xfdesktop4-4.19.2/po/th.po --- xfdesktop4-4.11.6/po/th.po 2014-04-05 18:59:11.000000000 +0000 +++ xfdesktop4-4.19.2/po/th.po 2014-09-15 05:23:44.000000000 +0000 @@ -5,16 +5,16 @@ # Translators: # Tegegne Tefera , 2007 # Theppitak Karoonboonyanan , 2013 -# theppitak , 2013-2014 -# theppitak , 2013 +# Theppitak Karoonboonyanan , 2013-2014 +# Theppitak Karoonboonyanan , 2013 msgid "" msgstr "" "Project-Id-Version: Xfdesktop\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2014-04-03 18:32+0200\n" -"PO-Revision-Date: 2014-04-04 05:49+0000\n" -"Last-Translator: theppitak \n" -"Language-Team: Thai (http://www.transifex.com/projects/p/xfce/language/th/)\n" +"POT-Creation-Date: 2014-08-03 12:32+0200\n" +"PO-Revision-Date: 2014-09-13 06:21+0000\n" +"Last-Translator: Theppitak Karoonboonyanan \n" +"Language-Team: Thai (http://www.transifex.com/projects/p/xfdesktop/language/th/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" @@ -109,45 +109,45 @@ msgid "Image selection is unavailable while the image style is set to None." msgstr "ไม่สามารถเลือกรูปภาพได้ในระหว่างที่กำหนดสไตล์ของรูปภาพเป็น \"ไม่มี\"" -#: ../settings/main.c:1523 +#: ../settings/main.c:1524 msgid "Spanning screens" msgstr "หน้าจอขยายข้ามจอภาพ" -#: ../settings/main.c:1825 +#: ../settings/main.c:1831 msgid "Image files" msgstr "แฟ้มรูปภาพ" -#: ../settings/main.c:2001 +#: ../settings/main.c:2010 msgid "Settings manager socket" msgstr "ซ็อกเก็ตโปรแกรมจัดการค่าตั้ง" -#: ../settings/main.c:2001 +#: ../settings/main.c:2010 msgid "SOCKET ID" msgstr "หมายเลขซ็อกเก็ต" -#: ../settings/main.c:2002 +#: ../settings/main.c:2011 msgid "Version information" msgstr "ข้อมูลรุ่น" -#: ../settings/main.c:2030 +#: ../settings/main.c:2039 #, c-format msgid "Type '%s --help' for usage." msgstr "สั่ง '%s --help' เพื่อดูวิธีใช้" -#: ../settings/main.c:2042 +#: ../settings/main.c:2051 msgid "The Xfce development team. All rights reserved." msgstr "The Xfce development team. All rights reserved." -#: ../settings/main.c:2043 +#: ../settings/main.c:2052 #, c-format msgid "Please report bugs to <%s>." msgstr "หากพบปัญหา กรุณารายงานที่ <%s>" -#: ../settings/main.c:2050 +#: ../settings/main.c:2059 msgid "Desktop Settings" msgstr "การตั้งค่าพื้นโต๊ะ" -#: ../settings/main.c:2052 +#: ../settings/main.c:2061 msgid "Unable to contact settings server" msgstr "ไม่สามารถติดต่อกับเซิร์ฟเวอร์ค่าตั้ง" @@ -156,7 +156,8 @@ msgstr "พื้นโต๊ะ" #: ../settings/xfce-backdrop-settings.desktop.in.h:2 -msgid "Set desktop background and menu and icon behaviour" +#: ../settings/xfdesktop-settings-ui.glade.h:11 +msgid "Set desktop background and menu and icon behavior" msgstr "กำหนดพื้นหลังพื้นโต๊ะและพฤติกรรมของเมนูและไอคอน" #: ../settings/xfdesktop-settings-appearance-frame-ui.glade.h:1 @@ -335,14 +336,10 @@ msgid "File/launcher icons" msgstr "ไอคอนแฟ้มหรือไอคอนเรียกโปรแกรม" -#: ../settings/xfdesktop-settings-ui.glade.h:10 ../src/xfce-desktop.c:1020 +#: ../settings/xfdesktop-settings-ui.glade.h:10 ../src/xfce-desktop.c:1007 msgid "Desktop" msgstr "พื้นโต๊ะ" -#: ../settings/xfdesktop-settings-ui.glade.h:11 -msgid "Set desktop background and menu and icon behavior" -msgstr "กำหนดพื้นหลังพื้นโต๊ะและพฤติกรรมของเมนูและไอคอน" - #: ../settings/xfdesktop-settings-ui.glade.h:12 msgid "_Background" msgstr "_พื้นหลัง" @@ -434,26 +431,30 @@ msgstr "เรียกรายการโดยใช้_คลิกเดียว" #: ../settings/xfdesktop-settings-ui.glade.h:34 +msgid "Show hidden files on the desktop" +msgstr "แสดงแฟ้มซ่อนบนพื้นโต๊ะ" + +#: ../settings/xfdesktop-settings-ui.glade.h:35 msgid "Show icon tooltips. Size:" msgstr "แสดงคำแนะนำของไอคอน ขนาด:" -#: ../settings/xfdesktop-settings-ui.glade.h:35 +#: ../settings/xfdesktop-settings-ui.glade.h:36 msgid "Size of the tooltip preview image." msgstr "ขนาดของภาพตัวอย่างที่จะแสดงเป็นคำแนะนำเครื่องมือ" -#: ../settings/xfdesktop-settings-ui.glade.h:36 +#: ../settings/xfdesktop-settings-ui.glade.h:37 msgid "Use custom _font size:" msgstr "กำหนดขนาดอักษ_ร:" -#: ../settings/xfdesktop-settings-ui.glade.h:37 +#: ../settings/xfdesktop-settings-ui.glade.h:38 msgid "Appearance" msgstr "รูปลักษณ์" -#: ../settings/xfdesktop-settings-ui.glade.h:38 +#: ../settings/xfdesktop-settings-ui.glade.h:39 msgid "Default Icons" msgstr "ไอคอนปริยาย" -#: ../settings/xfdesktop-settings-ui.glade.h:39 +#: ../settings/xfdesktop-settings-ui.glade.h:40 msgid "_Icons" msgstr "ไ_อคอน" @@ -515,250 +516,267 @@ msgstr "_ลบพื้นที่ทำงาน '%s'" #: ../src/xfdesktop-app-menu-item.c:349 -#: ../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:1132 ../src/xfdesktop-file-utils.c:1209 -#: ../src/xfdesktop-file-utils.c:1234 ../src/xfdesktop-file-utils.c:1286 +#: ../src/xfdesktop-file-icon-manager.c:860 +#: ../src/xfdesktop-file-icon-manager.c:1125 +#: ../src/xfdesktop-file-icon-manager.c:1321 ../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 "เรียกทำงานผิดพลาด" #: ../src/xfdesktop-app-menu-item.c:351 -#: ../src/xfdesktop-file-icon-manager.c:1086 +#: ../src/xfdesktop-file-icon-manager.c:1127 msgid "" "Unable to launch \"exo-desktop-item-edit\", which is required to create and " "edit launchers and links on the desktop." msgstr "ไม่สามารถเรียกทำงาน \"exo-desktop-item-edit\" ซึ่งจำเป็นต้องใช้ในการสร้างและแก้ไขปุ่มเรียกโปรแกรมและลิงก์บนพื้นโต๊ะ" -#: ../src/xfdesktop-application.c:768 +#: ../src/xfdesktop-application.c:836 msgid "Display version information" msgstr "แสดงข้อมูลรุ่น" -#: ../src/xfdesktop-application.c:769 +#: ../src/xfdesktop-application.c:837 msgid "Reload all settings" msgstr "โหลดค่าตั้งทั้งหมดใหม่" -#: ../src/xfdesktop-application.c:770 +#: ../src/xfdesktop-application.c:838 +msgid "Advance to the next wallpaper on the current workspace" +msgstr "ขยับไปใช้ภาพพื้นหลังถัดไปบนพื้นที่ทำงานปัจจุบัน" + +#: ../src/xfdesktop-application.c:839 msgid "Pop up the menu (at the current mouse position)" msgstr "ผุดเมนูขึ้น (ที่ตำแหน่งตัวชี้เมาส์ปัจจุบัน)" -#: ../src/xfdesktop-application.c:771 +#: ../src/xfdesktop-application.c:840 msgid "Pop up the window list (at the current mouse position)" msgstr "ผุดรายชื่อหน้าต่างขึ้น (ที่ตำแหน่งตัวชี้เมาส์ปัจจุบัน)" -#: ../src/xfdesktop-application.c:773 +#: ../src/xfdesktop-application.c:842 msgid "Automatically arrange all the icons on the desktop" msgstr "จัดเรียงไอคอนบนพื้นโต๊ะทั้งหมดโดยอัตโนมัติ" -#: ../src/xfdesktop-application.c:775 +#: ../src/xfdesktop-application.c:844 +msgid "Enable debug messages" +msgstr "เปิดแสดงข้อความดีบั๊ก" + +#: ../src/xfdesktop-application.c:845 +msgid "Disable debug messages" +msgstr "ปิดการแสดงข้อความดีบั๊ก" + +#: ../src/xfdesktop-application.c:846 msgid "Do not wait for a window manager on startup" msgstr "ไม่ต้องรอให้โปรแกรมจัดการหน้าต่างเปิดทำงาน" -#: ../src/xfdesktop-application.c:776 +#: ../src/xfdesktop-application.c:847 msgid "Cause xfdesktop to quit" msgstr "ให้ xfdesktop จบการทำงาน" -#: ../src/xfdesktop-application.c:791 +#: ../src/xfdesktop-application.c:862 #, c-format msgid "Failed to parse arguments: %s\n" msgstr "แจงอาร์กิวเมนต์ไม่สำเร็จ: %s\n" -#: ../src/xfdesktop-application.c:802 +#: ../src/xfdesktop-application.c:873 #, c-format msgid "This is %s version %s, running on Xfce %s.\n" msgstr "นี่คือ %s รุ่น %s ทำงานบน Xfce %s\n" -#: ../src/xfdesktop-application.c:804 +#: ../src/xfdesktop-application.c:875 #, c-format msgid "Built with GTK+ %d.%d.%d, linked with GTK+ %d.%d.%d." msgstr "ประกอบสร้างด้วย GTK+ %d.%d.%d ลิงก์กับ GTK+ %d.%d.%d" -#: ../src/xfdesktop-application.c:808 +#: ../src/xfdesktop-application.c:879 #, c-format msgid "Build options:\n" msgstr "ตัวเลือกที่ใช้ประกอบสร้าง:\n" -#: ../src/xfdesktop-application.c:809 +#: ../src/xfdesktop-application.c:880 #, c-format msgid " Desktop Menu: %s\n" msgstr " เมนูพื้นโต๊ะ: %s\n" -#: ../src/xfdesktop-application.c:811 ../src/xfdesktop-application.c:818 -#: ../src/xfdesktop-application.c:825 +#: ../src/xfdesktop-application.c:882 ../src/xfdesktop-application.c:889 +#: ../src/xfdesktop-application.c:896 msgid "enabled" msgstr "เปิดใช้งาน" -#: ../src/xfdesktop-application.c:813 ../src/xfdesktop-application.c:820 -#: ../src/xfdesktop-application.c:827 +#: ../src/xfdesktop-application.c:884 ../src/xfdesktop-application.c:891 +#: ../src/xfdesktop-application.c:898 msgid "disabled" msgstr "ปิดใช้" -#: ../src/xfdesktop-application.c:816 +#: ../src/xfdesktop-application.c:887 #, c-format msgid " Desktop Icons: %s\n" msgstr " ไอคอนพื้นโต๊ะ: %s\n" -#: ../src/xfdesktop-application.c:823 +#: ../src/xfdesktop-application.c:894 #, c-format msgid " Desktop File Icons: %s\n" msgstr " ไอคอนแฟ้มบนพื้นโต๊ะ: %s\n" -#: ../src/xfdesktop-file-icon-manager.c:522 -#: ../src/xfdesktop-file-icon-manager.c:539 +#: ../src/xfdesktop-file-icon-manager.c:559 +#: ../src/xfdesktop-file-icon-manager.c:576 #, c-format msgid "Could not create the desktop folder \"%s\"" msgstr "ไม่สามารถสร้างโฟลเดอร์พื้นโต๊ะ \"%s\"" -#: ../src/xfdesktop-file-icon-manager.c:527 -#: ../src/xfdesktop-file-icon-manager.c:544 +#: ../src/xfdesktop-file-icon-manager.c:564 +#: ../src/xfdesktop-file-icon-manager.c:581 msgid "Desktop Folder Error" msgstr "ข้อผิดพลาดเกี่ยวกับโฟลเดอร์พื้นโต๊ะ" -#: ../src/xfdesktop-file-icon-manager.c:546 +#: ../src/xfdesktop-file-icon-manager.c:583 msgid "" "A normal file with the same name already exists. Please delete or rename it." msgstr "มีแฟ้มธรรมดาในชื่อเดียวกันอยู่ก่อนแล้ว กรุณาลบหรือเปลี่ยนชื่อแฟ้มดังกล่าว" -#: ../src/xfdesktop-file-icon-manager.c:629 ../src/xfdesktop-file-utils.c:723 +#: ../src/xfdesktop-file-icon-manager.c:666 ../src/xfdesktop-file-utils.c:723 #: ../src/xfdesktop-file-utils.c:776 msgid "Rename Error" msgstr "ผิดพลาดขณะเปลี่ยนชื่อ" -#: ../src/xfdesktop-file-icon-manager.c:630 ../src/xfdesktop-file-utils.c:777 +#: ../src/xfdesktop-file-icon-manager.c:667 ../src/xfdesktop-file-utils.c:777 msgid "The files could not be renamed" msgstr "ไม่สามารถเปลี่ยนชื่อแฟ้มได้" -#: ../src/xfdesktop-file-icon-manager.c:631 +#: ../src/xfdesktop-file-icon-manager.c:668 msgid "None of the icons selected support being renamed." msgstr "ไอคอนที่เลือกไม่มีไอคอนใดรองรับการเปลี่ยนชื่อ" -#: ../src/xfdesktop-file-icon-manager.c:675 -#: ../src/xfdesktop-file-icon-manager.c:719 ../src/xfdesktop-file-utils.c:921 -#: ../src/xfdesktop-file-utils.c:959 +#: ../src/xfdesktop-file-icon-manager.c:712 +#: ../src/xfdesktop-file-icon-manager.c:756 ../src/xfdesktop-file-utils.c:876 +#: ../src/xfdesktop-file-utils.c:913 msgid "Trash Error" msgstr "ผิดพลาดขณะทิ้งขยะ" -#: ../src/xfdesktop-file-icon-manager.c:676 -#: ../src/xfdesktop-file-icon-manager.c:720 +#: ../src/xfdesktop-file-icon-manager.c:713 +#: ../src/xfdesktop-file-icon-manager.c:757 msgid "The selected files could not be trashed" msgstr "ไม่สามารถทิ้งแฟ้มที่เลือกลงถังขยะได้" -#: ../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:864 -#: ../src/xfdesktop-file-utils.c:1005 ../src/xfdesktop-file-utils.c:1052 -#: ../src/xfdesktop-file-utils.c:1093 ../src/xfdesktop-file-utils.c:1134 -#: ../src/xfdesktop-file-utils.c:1236 ../src/xfdesktop-file-utils.c:1288 -#: ../src/xfdesktop-file-utils.c:1361 ../src/xfdesktop-file-utils.c:1439 +#: ../src/xfdesktop-file-icon-manager.c:714 +#: ../src/xfdesktop-file-icon-manager.c:758 ../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 "ความสามารถนี้ต้องอาศัยบริการจัดการแฟ้ม (เช่นที่ให้บริการโดย Thunar)" #. printf is to be translator-friendly -#: ../src/xfdesktop-file-icon-manager.c:821 -#: ../src/xfdesktop-file-icon-manager.c:1279 +#: ../src/xfdesktop-file-icon-manager.c:858 +#: ../src/xfdesktop-file-icon-manager.c:1320 #, c-format msgid "Unable to launch \"%s\":" msgstr "ไม่สามารถเรียกทำงาน \"%s\":" -#: ../src/xfdesktop-file-icon-manager.c:1008 +#: ../src/xfdesktop-file-icon-manager.c:1049 #, c-format msgid "_Open With \"%s\"" msgstr "_เปิดด้วย \"%s\"" -#: ../src/xfdesktop-file-icon-manager.c:1011 +#: ../src/xfdesktop-file-icon-manager.c:1052 #, c-format msgid "Open With \"%s\"" msgstr "เปิดด้วย \"%s\"" -#: ../src/xfdesktop-file-icon-manager.c:1337 +#: ../src/xfdesktop-file-icon-manager.c:1378 msgid "_Open all" msgstr "_เปิดทั้งหมด" -#: ../src/xfdesktop-file-icon-manager.c:1353 +#: ../src/xfdesktop-file-icon-manager.c:1394 msgid "_Open in New Window" msgstr "_เปิดในหน้าต่างใหม่" -#: ../src/xfdesktop-file-icon-manager.c:1355 +#: ../src/xfdesktop-file-icon-manager.c:1396 #: ../src/xfdesktop-special-file-icon.c:547 ../src/xfdesktop-volume-icon.c:813 msgid "_Open" msgstr "_เปิด" #. create launcher item -#: ../src/xfdesktop-file-icon-manager.c:1374 +#: ../src/xfdesktop-file-icon-manager.c:1415 msgid "Create _Launcher..." msgstr "สร้างปุ่มเ_รียก..." #. create link item -#: ../src/xfdesktop-file-icon-manager.c:1390 +#: ../src/xfdesktop-file-icon-manager.c:1431 msgid "Create _URL Link..." msgstr "สร้าง_ลิงก์ URL..." #. create folder item -#: ../src/xfdesktop-file-icon-manager.c:1406 +#: ../src/xfdesktop-file-icon-manager.c:1447 msgid "Create _Folder..." msgstr "สร้างโ_ฟลเดอร์..." -#: ../src/xfdesktop-file-icon-manager.c:1421 +#: ../src/xfdesktop-file-icon-manager.c:1462 msgid "Create From _Template" msgstr "สร้างจากแ_ม่แบบ" -#: ../src/xfdesktop-file-icon-manager.c:1450 +#: ../src/xfdesktop-file-icon-manager.c:1491 msgid "_Empty File" msgstr "แฟ้มเ_ปล่า" -#: ../src/xfdesktop-file-icon-manager.c:1467 +#: ../src/xfdesktop-file-icon-manager.c:1508 msgid "_Execute" msgstr "เ_รียกทำงาน" -#: ../src/xfdesktop-file-icon-manager.c:1487 +#: ../src/xfdesktop-file-icon-manager.c:1528 msgid "_Edit Launcher" msgstr "แ_ก้ไขปุ่มเรียกโปรแกรม" -#: ../src/xfdesktop-file-icon-manager.c:1522 +#: ../src/xfdesktop-file-icon-manager.c:1563 msgid "Open With" msgstr "เปิดด้วย" -#: ../src/xfdesktop-file-icon-manager.c:1548 +#: ../src/xfdesktop-file-icon-manager.c:1589 msgid "Open With Other _Application..." msgstr "เปิดด้วยโปรแกรม_อื่น..." +#. Trash +#: ../src/xfdesktop-file-icon-manager.c:1676 +msgid "Mo_ve to Trash" +msgstr "_ทิ้งลงถังขยะ" + #. Rename -#: ../src/xfdesktop-file-icon-manager.c:1651 +#: ../src/xfdesktop-file-icon-manager.c:1707 msgid "_Rename..." msgstr "เ_ปลี่ยนชื่อ..." -#: ../src/xfdesktop-file-icon-manager.c:1679 +#: ../src/xfdesktop-file-icon-manager.c:1735 msgid "Arrange Desktop _Icons" msgstr "จัดเรียงไ_อคอนบนพื้นโต๊ะ" -#: ../src/xfdesktop-file-icon-manager.c:1690 +#: ../src/xfdesktop-file-icon-manager.c:1746 msgid "Desktop _Settings..." msgstr "_ตั้งค่าพื้นโต๊ะ..." -#: ../src/xfdesktop-file-icon-manager.c:1701 +#: ../src/xfdesktop-file-icon-manager.c:1757 #: ../src/xfdesktop-volume-icon.c:855 msgid "P_roperties..." msgstr "คุณ_สมบัติ..." -#: ../src/xfdesktop-file-icon-manager.c:2642 +#: ../src/xfdesktop-file-icon-manager.c:2699 msgid "Load Error" msgstr "โหลดผิดพลาด" -#: ../src/xfdesktop-file-icon-manager.c:2644 +#: ../src/xfdesktop-file-icon-manager.c:2701 msgid "Failed to load the desktop folder" msgstr "โหลดโฟลเดอร์พื้นโต๊ะไม่สำเร็จ" -#: ../src/xfdesktop-file-icon-manager.c:3189 +#: ../src/xfdesktop-file-icon-manager.c:3242 msgid "Copy _Here" msgstr "คัดลอกมาที่_นี่" -#: ../src/xfdesktop-file-icon-manager.c:3189 +#: ../src/xfdesktop-file-icon-manager.c:3242 msgid "_Move Here" msgstr "_ย้ายมาที่นี่" -#: ../src/xfdesktop-file-icon-manager.c:3189 +#: ../src/xfdesktop-file-icon-manager.c:3242 msgid "_Link Here" msgstr "เ_ชื่อมโยงมาที่นี่" @@ -807,72 +825,72 @@ msgid "The file could not be renamed" msgstr "ไม่สามารถเปลี่ยนชื่อแฟ้มได้" -#: ../src/xfdesktop-file-utils.c:862 +#: ../src/xfdesktop-file-utils.c:826 msgid "Delete Error" msgstr "ผิดพลาดขณะลบ" -#: ../src/xfdesktop-file-utils.c:863 +#: ../src/xfdesktop-file-utils.c:827 msgid "The selected files could not be deleted" msgstr "ไม่สามารถลบแฟ้มที่เลือกได้" -#: ../src/xfdesktop-file-utils.c:922 +#: ../src/xfdesktop-file-utils.c:877 msgid "The selected files could not be moved to the trash" msgstr "ไม่สามารถย้ายแฟ้มที่เลือกไปลงถังขยะได้" -#: ../src/xfdesktop-file-utils.c:923 ../src/xfdesktop-file-utils.c:961 +#: ../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 "ความสามารถนี้ต้องอาศัยบริการถังขยะ (เช่นที่ให้บริการโดย Thunar)" -#: ../src/xfdesktop-file-utils.c:960 +#: ../src/xfdesktop-file-utils.c:914 msgid "Could not empty the trash" msgstr "ไม่สามารถเทขยะในถังขยะ" -#: ../src/xfdesktop-file-utils.c:1003 +#: ../src/xfdesktop-file-utils.c:957 msgid "Create File Error" msgstr "ผิดพลาดขณะสร้างแฟ้ม" -#: ../src/xfdesktop-file-utils.c:1004 +#: ../src/xfdesktop-file-utils.c:958 msgid "Could not create a new file" msgstr "ไม่สามารถสร้างแฟ้มใหม่" -#: ../src/xfdesktop-file-utils.c:1050 +#: ../src/xfdesktop-file-utils.c:1004 msgid "Create Document Error" msgstr "ผิดพลาดขณะสร้างเอกสาร" -#: ../src/xfdesktop-file-utils.c:1051 +#: ../src/xfdesktop-file-utils.c:1005 msgid "Could not create a new document from the template" msgstr "ไม่สามารถสร้างเอกสารใหม่จากแม่แบบ" -#: ../src/xfdesktop-file-utils.c:1091 +#: ../src/xfdesktop-file-utils.c:1045 msgid "File Properties Error" msgstr "ผิดพลาดขณะอ่านคุณสมบัติของแฟ้ม" -#: ../src/xfdesktop-file-utils.c:1092 +#: ../src/xfdesktop-file-utils.c:1046 msgid "The file properties dialog could not be opened" msgstr "ไม่สามารถเปิดกล่องโต้ตอบแสดงคุณสมบัติของแฟ้มได้" -#: ../src/xfdesktop-file-utils.c:1133 +#: ../src/xfdesktop-file-utils.c:1087 msgid "The file could not be opened" msgstr "ไม่สามารถเปิดแฟ้มได้" -#: ../src/xfdesktop-file-utils.c:1206 ../src/xfdesktop-file-utils.c:1231 +#: ../src/xfdesktop-file-utils.c:1160 ../src/xfdesktop-file-utils.c:1185 #, c-format msgid "Failed to run \"%s\"" msgstr "เรียกทำงาน \"%s\" ไม่สำเร็จ" -#: ../src/xfdesktop-file-utils.c:1287 +#: ../src/xfdesktop-file-utils.c:1241 msgid "The application chooser could not be opened" msgstr "ไม่สามารถเปิดเครื่องมือเลือกโปรแกรมได้" -#: ../src/xfdesktop-file-utils.c:1345 ../src/xfdesktop-file-utils.c:1359 -#: ../src/xfdesktop-file-utils.c:1421 ../src/xfdesktop-file-utils.c:1437 +#: ../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 "ผิดพลาดขณะถ่ายโอน" -#: ../src/xfdesktop-file-utils.c:1346 ../src/xfdesktop-file-utils.c:1360 -#: ../src/xfdesktop-file-utils.c:1422 ../src/xfdesktop-file-utils.c:1438 +#: ../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 "ไม่สามารถถ่ายโอนแฟ้มได้" @@ -926,7 +944,7 @@ msgid "Eject Finished" msgstr "ดันสื่อออกเรียบร้อยแล้ว" -#: ../src/xfdesktop-regular-file-icon.c:741 +#: ../src/xfdesktop-regular-file-icon.c:748 #, c-format msgid "" "Type: %s\n" diff -Nru xfdesktop4-4.11.6/po/uk.po xfdesktop4-4.19.2/po/uk.po --- xfdesktop4-4.11.6/po/uk.po 2013-12-22 12:14:15.000000000 +0000 +++ xfdesktop4-4.19.2/po/uk.po 2014-08-11 07:27:27.000000000 +0000 @@ -4,53 +4,53 @@ # # Translators: # Dmitry Nikitin , 2008 -# Yarema aka Knedlyk , 2013 -# zubr139 , 2013 +# Yarema aka Knedlyk , 2013-2014 +# zubr139, 2013-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: 2013-12-21 22:22+0000\n" +"POT-Creation-Date: 2014-08-03 12:32+0200\n" +"PO-Revision-Date: 2014-08-05 08:43+0000\n" "Last-Translator: Yarema aka Knedlyk \n" -"Language-Team: Ukrainian (http://www.transifex.com/projects/p/xfce/language/uk/)\n" +"Language-Team: Ukrainian (http://www.transifex.com/projects/p/xfdesktop/language/uk/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Language: uk\n" "Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n" -#: ../settings/main.c:372 ../src/xfdesktop-special-file-icon.c:295 +#: ../settings/main.c:404 ../src/xfdesktop-special-file-icon.c:295 #: ../src/xfdesktop-special-file-icon.c:479 msgid "Home" msgstr "Домашній каталог" -#: ../settings/main.c:374 +#: ../settings/main.c:406 msgid "Filesystem" msgstr "Файлова система" -#: ../settings/main.c:376 +#: ../settings/main.c:408 msgid "Trash" msgstr "Смітник" -#: ../settings/main.c:378 +#: ../settings/main.c:410 msgid "Removable Devices" msgstr "З'ємні пристрої" -#: ../settings/main.c:380 +#: ../settings/main.c:412 msgid "Network Shares" msgstr "Мережеві диски" -#: ../settings/main.c:382 +#: ../settings/main.c:414 msgid "Disks and Drives" msgstr "Диски" -#: ../settings/main.c:384 -msgid "Other Items" -msgstr "Інше" +#: ../settings/main.c:416 +msgid "Other Devices" +msgstr "Інші пристрої" #. Display the file name, file type, and file size in the tooltip. -#: ../settings/main.c:497 +#: ../settings/main.c:529 #, c-format msgid "" "%s\n" @@ -58,97 +58,95 @@ "Size: %s" msgstr "%s\nТип: %s\nРозмір: %s" -#: ../settings/main.c:681 +#: ../settings/main.c:715 #, c-format msgid "Wallpaper for Monitor %d (%s)" msgstr "Шпалери для монітору %d (%s)" -#: ../settings/main.c:684 +#: ../settings/main.c:718 #, c-format msgid "Wallpaper for Monitor %d" msgstr "Шпалери для монітору %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 "Ви використовуєте більш ніж один дисплей, перемістіть цей діалог на дисплей, який Ви бажаєте налаштувати." +#: ../settings/main.c:724 +msgid "Move this dialog to the display you want to edit the settings for." +msgstr "Перемістіть цей діалог на дисплей, який Ви бажаєте налаштувати." -#: ../settings/main.c:698 +#: ../settings/main.c:731 #, c-format msgid "Wallpaper for %s on Monitor %d (%s)" msgstr "Шпалери для %s на монітор %d (%s)" -#: ../settings/main.c:702 +#: ../settings/main.c:735 #, c-format msgid "Wallpaper for %s on Monitor %d" msgstr "Шпалери для %s на монітор %d" -#: ../settings/main.c:709 +#: ../settings/main.c:742 msgid "" -"You are using more than one display, move this dialog to the display and " -"workspace you want to edit the settings for." -msgstr "Ви використовуєте більш ніж один дисплей, перемістіть цей діалог на дисплей і робочу область, яку Ви бажаєте налаштувати." +"Move this dialog to the display and workspace you want to edit the settings " +"for." +msgstr "Перемістіть цей діалог на дисплей і робочу область, які Ви бажаєте налаштувати." #. Single monitor and single workspace -#: ../settings/main.c:717 +#: ../settings/main.c:749 #, c-format msgid "Wallpaper for my desktop" msgstr "Шпалери для мого робочого столу" #. Single monitor and per workspace wallpaper -#: ../settings/main.c:723 +#: ../settings/main.c:755 #, c-format msgid "Wallpaper for %s" msgstr "Шпалери для %s" -#: ../settings/main.c:728 +#: ../settings/main.c:760 msgid "Move this dialog to the workspace you want to edit the settings for." msgstr "Перемістіть цей діалог на робочу область, яку Ви бажаєте налаштувати." -#: ../settings/main.c:1131 +#: ../settings/main.c:1174 msgid "Image selection is unavailable while the image style is set to None." msgstr "Вибір малюнка недоступний, поки не встановлено стиль малюнка." -#: ../settings/main.c:1483 +#: ../settings/main.c:1524 msgid "Spanning screens" msgstr "Покриваючі екрани" -#: ../settings/main.c:1788 +#: ../settings/main.c:1831 msgid "Image files" msgstr "Файли зображень" -#: ../settings/main.c:1945 +#: ../settings/main.c:2010 msgid "Settings manager socket" msgstr "Сокет менеджера властивостей" -#: ../settings/main.c:1945 +#: ../settings/main.c:2010 msgid "SOCKET ID" msgstr "ID сокета" -#: ../settings/main.c:1946 +#: ../settings/main.c:2011 msgid "Version information" msgstr "Інформація про версію" -#: ../settings/main.c:1973 +#: ../settings/main.c:2039 #, c-format msgid "Type '%s --help' for usage." msgstr "Наберіть '%s --help' для використання." -#: ../settings/main.c:1985 +#: ../settings/main.c:2051 msgid "The Xfce development team. All rights reserved." msgstr "Команда розробників Xfce. Всі права застережено." -#: ../settings/main.c:1986 +#: ../settings/main.c:2052 #, c-format msgid "Please report bugs to <%s>." msgstr "По помилки повідомляйте для <%s>." -#: ../settings/main.c:1993 +#: ../settings/main.c:2059 msgid "Desktop Settings" msgstr "Параметри робочого столу" -#: ../settings/main.c:1995 +#: ../settings/main.c:2061 msgid "Unable to contact settings server" msgstr "Не вдається зв'язатися з сервером властивостей." @@ -157,7 +155,8 @@ msgstr "Стільниця" #: ../settings/xfce-backdrop-settings.desktop.in.h:2 -msgid "Set desktop background and menu and icon behaviour" +#: ../settings/xfdesktop-settings-ui.glade.h:11 +msgid "Set desktop background and menu and icon behavior" msgstr "Призначити фонове зображення стільниці, меню і значок заголовку" #: ../settings/xfdesktop-settings-appearance-frame-ui.glade.h:1 @@ -181,16 +180,16 @@ msgstr "_Тека:" #: ../settings/xfdesktop-settings-appearance-frame-ui.glade.h:6 -msgid "Choose the folder to select wallpapers from" -msgstr "Виберіть теку, з якої вибиратимуться шпалери" +msgid "Choose the folder to select wallpapers from." +msgstr "Виберіть теку, з якої вибиратимуться шпалери." #: ../settings/xfdesktop-settings-appearance-frame-ui.glade.h:7 msgid "St_yle:" msgstr "Ст_иль:" #: ../settings/xfdesktop-settings-appearance-frame-ui.glade.h:8 -msgid "Specify how the image will be resized to fit the screen" -msgstr "Призначити як зображення буде змінювати розмір до розмірів екрану" +msgid "Specify how the image will be resized to fit the screen." +msgstr "Визначити, яким чином малюнок буде змінювати розмір до розміру екрану." #: ../settings/xfdesktop-settings-appearance-frame-ui.glade.h:9 #: ../settings/xfdesktop-settings-ui.glade.h:4 @@ -226,20 +225,20 @@ msgstr "К_олір:" #: ../settings/xfdesktop-settings-appearance-frame-ui.glade.h:17 -msgid "Specify the style of the color drawn behind the backdrop image" -msgstr "Призначити стиль кольору, що буде відображатись під фоновим зображенням" +msgid "Specify the style of the color drawn behind the backdrop image." +msgstr "Визначити стиль кольору, що буде показуватися під фоновим зображенням" #: ../settings/xfdesktop-settings-appearance-frame-ui.glade.h:18 -msgid "Specifies the solid color, or the \"left\" or \"top\" color of the gradient" -msgstr "Призначити суцільний колір, або \"лівий\" чи \"верхній\" колір градієнту" +msgid "Specifies the solid color, or the \"left\" or \"top\" color of the gradient." +msgstr "Визначити суцільний колір, або \"лівий\" чи \"верхній\" колір градієнту." #: ../settings/xfdesktop-settings-appearance-frame-ui.glade.h:19 msgid "Select First Color" msgstr "Виберіть Перший колір" #: ../settings/xfdesktop-settings-appearance-frame-ui.glade.h:20 -msgid "Specifies the \"right\" or \"bottom\" color of the gradient" -msgstr "Призначити \"правий\" чи \"нижній\" колір градієнту" +msgid "Specifies the \"right\" or \"bottom\" color of the gradient." +msgstr "Визначити \"правий\" чи \"нижній\" колір градієнту." #: ../settings/xfdesktop-settings-appearance-frame-ui.glade.h:21 msgid "Select Second Color" @@ -259,8 +258,8 @@ msgstr "Автоматично вибирати різні малюнки тла з поточної теки." #: ../settings/xfdesktop-settings-appearance-frame-ui.glade.h:25 -msgid "Specify how often the background will change" -msgstr "Вкажіть, як часто буде змінюватися тло" +msgid "Specify how often the background will change." +msgstr "Вкажіть, як часто буде змінюватися тло." #: ../settings/xfdesktop-settings-appearance-frame-ui.glade.h:26 msgid "in seconds:" @@ -336,14 +335,10 @@ msgid "File/launcher icons" msgstr "Файл/запускач значки" -#: ../settings/xfdesktop-settings-ui.glade.h:10 ../src/xfce-desktop.c:1010 +#: ../settings/xfdesktop-settings-ui.glade.h:10 ../src/xfce-desktop.c:1007 msgid "Desktop" msgstr "Робочий стіл" -#: ../settings/xfdesktop-settings-ui.glade.h:11 -msgid "Set desktop background and menu and icon behavior" -msgstr "Призначити фонове зображення стільниці, меню і значок заголовку" - #: ../settings/xfdesktop-settings-ui.glade.h:12 msgid "_Background" msgstr "_Фонове зображення" @@ -366,7 +361,7 @@ #: ../settings/xfdesktop-settings-ui.glade.h:17 msgid "_Edit desktop menu" -msgstr "_Правка меню стільниці" +msgstr "_Редагування меню стільниці" #: ../settings/xfdesktop-settings-ui.glade.h:18 msgid "Desktop Menu" @@ -435,26 +430,30 @@ msgstr "Одинарне _клацання для активування" #: ../settings/xfdesktop-settings-ui.glade.h:34 +msgid "Show hidden files on the desktop" +msgstr "Показувати приховані файли на стільниці" + +#: ../settings/xfdesktop-settings-ui.glade.h:35 msgid "Show icon tooltips. Size:" msgstr "Показати підказки до значків. Розмір:" -#: ../settings/xfdesktop-settings-ui.glade.h:35 +#: ../settings/xfdesktop-settings-ui.glade.h:36 msgid "Size of the tooltip preview image." msgstr "Розмір малюнка підказки" -#: ../settings/xfdesktop-settings-ui.glade.h:36 +#: ../settings/xfdesktop-settings-ui.glade.h:37 msgid "Use custom _font size:" msgstr "Використовув_ати вибраний розмір шрифта:" -#: ../settings/xfdesktop-settings-ui.glade.h:37 +#: ../settings/xfdesktop-settings-ui.glade.h:38 msgid "Appearance" msgstr "Зовнішній вигляд" -#: ../settings/xfdesktop-settings-ui.glade.h:38 +#: ../settings/xfdesktop-settings-ui.glade.h:39 msgid "Default Icons" msgstr "Типові значки" -#: ../settings/xfdesktop-settings-ui.glade.h:39 +#: ../settings/xfdesktop-settings-ui.glade.h:40 msgid "_Icons" msgstr "_Значки" @@ -515,250 +514,268 @@ msgid "_Remove Workspace '%s'" msgstr "В_идалити робочу область \"%s\"" -#: ../src/xfdesktop-application.c:772 +#: ../src/xfdesktop-app-menu-item.c:349 +#: ../src/xfdesktop-file-icon-manager.c:860 +#: ../src/xfdesktop-file-icon-manager.c:1125 +#: ../src/xfdesktop-file-icon-manager.c:1321 ../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 "Помилка запуску" + +#: ../src/xfdesktop-app-menu-item.c:351 +#: ../src/xfdesktop-file-icon-manager.c:1127 +msgid "" +"Unable to launch \"exo-desktop-item-edit\", which is required to create and " +"edit launchers and links on the desktop." +msgstr "Неможливо запустити \"exo-desktop-item-edit\", яка потрібна для редагування значків запуску та посилань на робочому столі." + +#: ../src/xfdesktop-application.c:836 msgid "Display version information" msgstr "Відобразити інформація про версію" -#: ../src/xfdesktop-application.c:773 +#: ../src/xfdesktop-application.c:837 msgid "Reload all settings" msgstr "Перезавантажити усі параметри" -#: ../src/xfdesktop-application.c:774 +#: ../src/xfdesktop-application.c:838 +msgid "Advance to the next wallpaper on the current workspace" +msgstr "Перехід до наступної шпалери на поточній робочій області" + +#: ../src/xfdesktop-application.c:839 msgid "Pop up the menu (at the current mouse position)" msgstr "Показати меню (у місці, де знаходиться курсор миші)" -#: ../src/xfdesktop-application.c:775 +#: ../src/xfdesktop-application.c:840 msgid "Pop up the window list (at the current mouse position)" msgstr "Показати перелік вікон (у місці, де знаходиться курсор миші)" -#: ../src/xfdesktop-application.c:777 +#: ../src/xfdesktop-application.c:842 msgid "Automatically arrange all the icons on the desktop" msgstr "Автоматично розмістити всі значки на робочому столі" -#: ../src/xfdesktop-application.c:779 +#: ../src/xfdesktop-application.c:844 +msgid "Enable debug messages" +msgstr "Включити повідомлення відладки" + +#: ../src/xfdesktop-application.c:845 +msgid "Disable debug messages" +msgstr "Виключити повідомлення відладки" + +#: ../src/xfdesktop-application.c:846 msgid "Do not wait for a window manager on startup" msgstr "Не очікувати на запуск менеджера вікон" -#: ../src/xfdesktop-application.c:780 +#: ../src/xfdesktop-application.c:847 msgid "Cause xfdesktop to quit" msgstr "Вийти з xfdesktop" -#: ../src/xfdesktop-application.c:795 +#: ../src/xfdesktop-application.c:862 #, c-format msgid "Failed to parse arguments: %s\n" msgstr "Не вдається опрацювати аргументи: %s\n" -#: ../src/xfdesktop-application.c:806 +#: ../src/xfdesktop-application.c:873 #, c-format msgid "This is %s version %s, running on Xfce %s.\n" msgstr "Це %s версії %s, що виконується у Xfce %s.\n" -#: ../src/xfdesktop-application.c:808 +#: ../src/xfdesktop-application.c:875 #, c-format msgid "Built with GTK+ %d.%d.%d, linked with GTK+ %d.%d.%d." msgstr "Зібрано з GTK+ %d.%d.%d, зв'язано з GTK+ %d.%d.%d." -#: ../src/xfdesktop-application.c:812 +#: ../src/xfdesktop-application.c:879 #, c-format msgid "Build options:\n" msgstr "Параметри збирання:\n" -#: ../src/xfdesktop-application.c:813 +#: ../src/xfdesktop-application.c:880 #, c-format msgid " Desktop Menu: %s\n" msgstr " Меню робочого столу: %s\n" -#: ../src/xfdesktop-application.c:815 ../src/xfdesktop-application.c:822 -#: ../src/xfdesktop-application.c:829 +#: ../src/xfdesktop-application.c:882 ../src/xfdesktop-application.c:889 +#: ../src/xfdesktop-application.c:896 msgid "enabled" msgstr "увімкнено" -#: ../src/xfdesktop-application.c:817 ../src/xfdesktop-application.c:824 -#: ../src/xfdesktop-application.c:831 +#: ../src/xfdesktop-application.c:884 ../src/xfdesktop-application.c:891 +#: ../src/xfdesktop-application.c:898 msgid "disabled" msgstr "вимкнено" -#: ../src/xfdesktop-application.c:820 +#: ../src/xfdesktop-application.c:887 #, c-format msgid " Desktop Icons: %s\n" msgstr " Значки на робочому столі: %s\n" -#: ../src/xfdesktop-application.c:827 +#: ../src/xfdesktop-application.c:894 #, c-format msgid " Desktop File Icons: %s\n" msgstr " Значки файлів на робочому столі: %s\n" -#: ../src/xfdesktop-file-icon-manager.c:578 -#: ../src/xfdesktop-file-icon-manager.c:595 +#: ../src/xfdesktop-file-icon-manager.c:559 +#: ../src/xfdesktop-file-icon-manager.c:576 #, c-format msgid "Could not create the desktop folder \"%s\"" msgstr "Неможливо створити теку \"%s\" на стільниці" -#: ../src/xfdesktop-file-icon-manager.c:583 -#: ../src/xfdesktop-file-icon-manager.c:600 +#: ../src/xfdesktop-file-icon-manager.c:564 +#: ../src/xfdesktop-file-icon-manager.c:581 msgid "Desktop Folder Error" msgstr "Помилка теки стільниці" -#: ../src/xfdesktop-file-icon-manager.c:602 +#: ../src/xfdesktop-file-icon-manager.c:583 msgid "" "A normal file with the same name already exists. Please delete or rename it." msgstr "Звичайний файл з такою самою назвою вже існує. Будь ласка видаліть його, або перейменуйте." -#: ../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:666 ../src/xfdesktop-file-utils.c:723 +#: ../src/xfdesktop-file-utils.c:776 msgid "Rename Error" msgstr "Помилка при перейменуванні" -#: ../src/xfdesktop-file-icon-manager.c:686 ../src/xfdesktop-file-utils.c:770 +#: ../src/xfdesktop-file-icon-manager.c:667 ../src/xfdesktop-file-utils.c:777 msgid "The files could not be renamed" msgstr "Файли не можуть бути перейменовані" -#: ../src/xfdesktop-file-icon-manager.c:687 +#: ../src/xfdesktop-file-icon-manager.c:668 msgid "None of the icons selected support being renamed." msgstr "Жоден з вибраних значків не перейменовано." -#: ../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:712 +#: ../src/xfdesktop-file-icon-manager.c:756 ../src/xfdesktop-file-utils.c:876 +#: ../src/xfdesktop-file-utils.c:913 msgid "Trash Error" msgstr "Помилка смітника" -#: ../src/xfdesktop-file-icon-manager.c:732 -#: ../src/xfdesktop-file-icon-manager.c:776 +#: ../src/xfdesktop-file-icon-manager.c:713 +#: ../src/xfdesktop-file-icon-manager.c:757 msgid "The selected files could not be trashed" msgstr "Вибрані файли не можуть бути видалені" -#: ../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:714 +#: ../src/xfdesktop-file-icon-manager.c:758 ../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 "Ця функція вимагає наявності сервісу файлового менеджера (один з таких підтримується 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:858 +#: ../src/xfdesktop-file-icon-manager.c:1320 #, c-format msgid "Unable to launch \"%s\":" msgstr "Не вдається запустити \"%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 -msgid "Launch Error" -msgstr "Помилка запуску" - -#: ../src/xfdesktop-file-icon-manager.c:1064 +#: ../src/xfdesktop-file-icon-manager.c:1049 #, c-format msgid "_Open With \"%s\"" msgstr "_Відкрити у програмі \"%s\"" -#: ../src/xfdesktop-file-icon-manager.c:1067 +#: ../src/xfdesktop-file-icon-manager.c:1052 #, c-format msgid "Open With \"%s\"" msgstr "Відкрити у програмі \"%s\"" -#: ../src/xfdesktop-file-icon-manager.c:1142 -msgid "" -"Unable to launch \"exo-desktop-item-edit\", which is required to create and " -"edit launchers and links on the desktop." -msgstr "Неможливо запустити \"exo-desktop-item-edit\", яка потрібна для редагування значків запуску та посилань на робочому столі." - -#: ../src/xfdesktop-file-icon-manager.c:1393 +#: ../src/xfdesktop-file-icon-manager.c:1378 msgid "_Open all" msgstr "_Відкрити усе" -#: ../src/xfdesktop-file-icon-manager.c:1409 +#: ../src/xfdesktop-file-icon-manager.c:1394 msgid "_Open in New Window" msgstr "Відкрити в _новому вікні" -#: ../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:1396 +#: ../src/xfdesktop-special-file-icon.c:547 ../src/xfdesktop-volume-icon.c:813 msgid "_Open" msgstr "_Відкрити" #. create launcher item -#: ../src/xfdesktop-file-icon-manager.c:1430 +#: ../src/xfdesktop-file-icon-manager.c:1415 msgid "Create _Launcher..." msgstr "Створити _значок запуску..." #. create link item -#: ../src/xfdesktop-file-icon-manager.c:1446 +#: ../src/xfdesktop-file-icon-manager.c:1431 msgid "Create _URL Link..." msgstr "Створити _посилання URL..." #. create folder item -#: ../src/xfdesktop-file-icon-manager.c:1462 +#: ../src/xfdesktop-file-icon-manager.c:1447 msgid "Create _Folder..." msgstr "Створити _теку..." -#: ../src/xfdesktop-file-icon-manager.c:1477 +#: ../src/xfdesktop-file-icon-manager.c:1462 msgid "Create From _Template" msgstr "Створити з _шаблону" -#: ../src/xfdesktop-file-icon-manager.c:1506 +#: ../src/xfdesktop-file-icon-manager.c:1491 msgid "_Empty File" msgstr "_Порожній файл" -#: ../src/xfdesktop-file-icon-manager.c:1523 +#: ../src/xfdesktop-file-icon-manager.c:1508 msgid "_Execute" msgstr "Ви_конати" -#: ../src/xfdesktop-file-icon-manager.c:1543 +#: ../src/xfdesktop-file-icon-manager.c:1528 msgid "_Edit Launcher" msgstr "З_мінити значок запуску" -#: ../src/xfdesktop-file-icon-manager.c:1578 +#: ../src/xfdesktop-file-icon-manager.c:1563 msgid "Open With" msgstr "Відкрити у програмі" -#: ../src/xfdesktop-file-icon-manager.c:1604 +#: ../src/xfdesktop-file-icon-manager.c:1589 msgid "Open With Other _Application..." msgstr "Відкрити у іншій п_рограмі..." +#. Trash +#: ../src/xfdesktop-file-icon-manager.c:1676 +msgid "Mo_ve to Trash" +msgstr "_Перемістити у Смітник" + #. Rename -#: ../src/xfdesktop-file-icon-manager.c:1704 +#: ../src/xfdesktop-file-icon-manager.c:1707 msgid "_Rename..." msgstr "Переймен_увати..." -#: ../src/xfdesktop-file-icon-manager.c:1732 +#: ../src/xfdesktop-file-icon-manager.c:1735 msgid "Arrange Desktop _Icons" msgstr "_Упорядкувати значки робочого столу" -#: ../src/xfdesktop-file-icon-manager.c:1743 +#: ../src/xfdesktop-file-icon-manager.c:1746 msgid "Desktop _Settings..." msgstr "П_араметри робочого столу..." -#: ../src/xfdesktop-file-icon-manager.c:1754 -#: ../src/xfdesktop-volume-icon.c:856 +#: ../src/xfdesktop-file-icon-manager.c:1757 +#: ../src/xfdesktop-volume-icon.c:855 msgid "P_roperties..." msgstr "В_ластивості..." -#: ../src/xfdesktop-file-icon-manager.c:2744 +#: ../src/xfdesktop-file-icon-manager.c:2699 msgid "Load Error" msgstr "Помилка завантаження" -#: ../src/xfdesktop-file-icon-manager.c:2746 +#: ../src/xfdesktop-file-icon-manager.c:2701 msgid "Failed to load the desktop folder" msgstr "Неможливо завантажити теку стільниці" -#: ../src/xfdesktop-file-icon-manager.c:3286 +#: ../src/xfdesktop-file-icon-manager.c:3242 msgid "Copy _Here" msgstr "_Скопіювати сюди" -#: ../src/xfdesktop-file-icon-manager.c:3286 +#: ../src/xfdesktop-file-icon-manager.c:3242 msgid "_Move Here" msgstr "_Перемістити вгору" -#: ../src/xfdesktop-file-icon-manager.c:3286 +#: ../src/xfdesktop-file-icon-manager.c:3242 msgid "_Link Here" msgstr "_Тут посилання:" @@ -791,88 +808,88 @@ msgid "Unknown" msgstr "Невідомий" -#: ../src/xfdesktop-file-utils.c:658 +#: ../src/xfdesktop-file-utils.c:665 msgid "The folder could not be opened" msgstr "Теку неможливо відкрити" -#: ../src/xfdesktop-file-utils.c:675 +#: ../src/xfdesktop-file-utils.c:682 msgid "Error" msgstr "Помилка" -#: ../src/xfdesktop-file-utils.c:676 +#: ../src/xfdesktop-file-utils.c:683 msgid "The requested operation could not be completed" msgstr "Дану операцію неможливо завершити" -#: ../src/xfdesktop-file-utils.c:717 +#: ../src/xfdesktop-file-utils.c:724 msgid "The file could not be renamed" msgstr "Файл не може бути перейменований" -#: ../src/xfdesktop-file-utils.c:819 +#: ../src/xfdesktop-file-utils.c:826 msgid "Delete Error" msgstr "Помилка при видаленні" -#: ../src/xfdesktop-file-utils.c:820 +#: ../src/xfdesktop-file-utils.c:827 msgid "The selected files could not be deleted" -msgstr "Вибраний файл не може бути видалений" +msgstr "Вибрані файли не можуть бути вилучені" -#: ../src/xfdesktop-file-utils.c:870 +#: ../src/xfdesktop-file-utils.c:877 msgid "The selected files could not be moved to the trash" -msgstr "Вибраний файл не може бути переміщений в смітник" +msgstr "Вибрані файли не можуть бути переміщені в смітник" -#: ../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 "Ця функція вимагає наявності сервісу файлового менеджера (один з таких підтримується Thunar)." -#: ../src/xfdesktop-file-utils.c:907 +#: ../src/xfdesktop-file-utils.c:914 msgid "Could not empty the trash" msgstr "Не можу спорожнити смітник" -#: ../src/xfdesktop-file-utils.c:950 +#: ../src/xfdesktop-file-utils.c:957 msgid "Create File Error" msgstr "Помилка при створенні файлу" -#: ../src/xfdesktop-file-utils.c:951 +#: ../src/xfdesktop-file-utils.c:958 msgid "Could not create a new file" msgstr "Неможливо створити новий файл" -#: ../src/xfdesktop-file-utils.c:997 +#: ../src/xfdesktop-file-utils.c:1004 msgid "Create Document Error" msgstr "Помилка при створенні документу" -#: ../src/xfdesktop-file-utils.c:998 +#: ../src/xfdesktop-file-utils.c:1005 msgid "Could not create a new document from the template" msgstr "Неможливо створити документ з шаблону" -#: ../src/xfdesktop-file-utils.c:1038 +#: ../src/xfdesktop-file-utils.c:1045 msgid "File Properties Error" msgstr "Помилка у властивостях файлу" -#: ../src/xfdesktop-file-utils.c:1039 +#: ../src/xfdesktop-file-utils.c:1046 msgid "The file properties dialog could not be opened" msgstr "Неможливо відкрити діалог властивостей файлу" -#: ../src/xfdesktop-file-utils.c:1080 +#: ../src/xfdesktop-file-utils.c:1087 msgid "The file could not be opened" msgstr "Неможливо відкрити файл" -#: ../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 "Не вдалось запустити \"%s\"" -#: ../src/xfdesktop-file-utils.c:1234 +#: ../src/xfdesktop-file-utils.c:1241 msgid "The application chooser could not be opened" msgstr "Не вдалось відкрити вибір програм" -#: ../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 "Помилка передачі" -#: ../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 "Передача файлу не може бути виконана" @@ -926,7 +943,7 @@ msgid "Eject Finished" msgstr "Витягнення закінчено" -#: ../src/xfdesktop-regular-file-icon.c:603 +#: ../src/xfdesktop-regular-file-icon.c:748 #, c-format msgid "" "Type: %s\n" @@ -996,15 +1013,15 @@ msgid "Mount Failed" msgstr "Помилка підключення" -#: ../src/xfdesktop-volume-icon.c:829 +#: ../src/xfdesktop-volume-icon.c:828 msgid "E_ject Volume" msgstr "Вит_ягнути том" -#: ../src/xfdesktop-volume-icon.c:836 +#: ../src/xfdesktop-volume-icon.c:835 msgid "_Unmount Volume" msgstr "В_ідключити том" -#: ../src/xfdesktop-volume-icon.c:843 +#: ../src/xfdesktop-volume-icon.c:842 msgid "_Mount Volume" msgstr "_Підключити том" diff -Nru xfdesktop4-4.11.6/po/zh_TW.po xfdesktop4-4.19.2/po/zh_TW.po --- xfdesktop4-4.11.6/po/zh_TW.po 2014-03-02 07:21:58.000000000 +0000 +++ xfdesktop4-4.19.2/po/zh_TW.po 2014-08-11 07:27:27.000000000 +0000 @@ -6,55 +6,56 @@ # Ambrose Li , 2004 # Cheng-Chia Tseng , 2010,2013 # Hydonsingore Cia , 2004 -# sofyalai , 2013 +# Ying-Chun Lai , 2013 # umm , 2003 -# Walter Cheuk , 2013 -# sofyalai , 2013 +# Walter Cheuk , 2013-2014 +# Ying-Chun Lai , 2013 +# Jeff Huang , 2014 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-26 14:52+0000\n" -"Last-Translator: Cheng-Chia Tseng \n" -"Language-Team: Chinese (Taiwan) (http://www.transifex.com/projects/p/xfce/language/zh_TW/)\n" +"POT-Creation-Date: 2014-08-03 12:32+0200\n" +"PO-Revision-Date: 2014-08-06 14:51+0000\n" +"Last-Translator: Walter Cheuk \n" +"Language-Team: Chinese (Taiwan) (http://www.transifex.com/projects/p/xfdesktop/language/zh_TW/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Language: zh_TW\n" "Plural-Forms: nplurals=1; plural=0;\n" -#: ../settings/main.c:375 ../src/xfdesktop-special-file-icon.c:295 +#: ../settings/main.c:404 ../src/xfdesktop-special-file-icon.c:295 #: ../src/xfdesktop-special-file-icon.c:479 msgid "Home" msgstr "家目錄" -#: ../settings/main.c:377 +#: ../settings/main.c:406 msgid "Filesystem" msgstr "檔案系統" -#: ../settings/main.c:379 +#: ../settings/main.c:408 msgid "Trash" msgstr "垃圾桶" -#: ../settings/main.c:381 +#: ../settings/main.c:410 msgid "Removable Devices" msgstr "可移除式裝置" -#: ../settings/main.c:383 +#: ../settings/main.c:412 msgid "Network Shares" msgstr "網路共享資源" -#: ../settings/main.c:385 +#: ../settings/main.c:414 msgid "Disks and Drives" msgstr "磁碟和碟機" -#: ../settings/main.c:387 +#: ../settings/main.c:416 msgid "Other Devices" msgstr "其他裝置" #. Display the file name, file type, and file size in the tooltip. -#: ../settings/main.c:500 +#: ../settings/main.c:529 #, c-format msgid "" "%s\n" @@ -62,95 +63,95 @@ "Size: %s" msgstr "%s\n類型：%s\n大小：%s" -#: ../settings/main.c:686 +#: ../settings/main.c:715 #, c-format msgid "Wallpaper for Monitor %d (%s)" msgstr "螢幕 %d 的桌布 (%s)" -#: ../settings/main.c:689 +#: ../settings/main.c:718 #, c-format msgid "Wallpaper for Monitor %d" msgstr "螢幕 %d 的桌布" -#: ../settings/main.c:695 +#: ../settings/main.c:724 msgid "Move this dialog to the display you want to edit the settings for." msgstr "將此對話方塊移動到您想編輯其設定的顯示器。" -#: ../settings/main.c:702 +#: ../settings/main.c:731 #, c-format msgid "Wallpaper for %s on Monitor %d (%s)" msgstr "%s 的桌布，螢幕 %d (%s)" -#: ../settings/main.c:706 +#: ../settings/main.c:735 #, c-format msgid "Wallpaper for %s on Monitor %d" msgstr "%s 的桌布，螢幕 %d" -#: ../settings/main.c:713 +#: ../settings/main.c:742 msgid "" "Move this dialog to the display and workspace you want to edit the settings " "for." msgstr "將此對話方塊移動到您想編輯其設定的顯示器與工作空間。" #. Single monitor and single workspace -#: ../settings/main.c:720 +#: ../settings/main.c:749 #, c-format msgid "Wallpaper for my desktop" msgstr "我桌面的桌布" #. Single monitor and per workspace wallpaper -#: ../settings/main.c:726 +#: ../settings/main.c:755 #, c-format msgid "Wallpaper for %s" msgstr "%s 的桌布" -#: ../settings/main.c:731 +#: ../settings/main.c:760 msgid "Move this dialog to the workspace you want to edit the settings for." msgstr "請將此對話視窗移至您想要更改設定之工作區內。" -#: ../settings/main.c:1134 +#: ../settings/main.c:1174 msgid "Image selection is unavailable while the image style is set to None." msgstr "當影像樣式設為「無」的時候，無法選取影像。" -#: ../settings/main.c:1481 +#: ../settings/main.c:1524 msgid "Spanning screens" msgstr "橫跨螢幕" -#: ../settings/main.c:1786 +#: ../settings/main.c:1831 msgid "Image files" msgstr "影像檔案" -#: ../settings/main.c:1958 +#: ../settings/main.c:2010 msgid "Settings manager socket" msgstr "設定值管理員 socket" -#: ../settings/main.c:1958 +#: ../settings/main.c:2010 msgid "SOCKET ID" msgstr "SOCKET ID" -#: ../settings/main.c:1959 +#: ../settings/main.c:2011 msgid "Version information" msgstr "版本資訊" -#: ../settings/main.c:1986 +#: ../settings/main.c:2039 #, c-format msgid "Type '%s --help' for usage." msgstr "輸入 '%s --help' 以瞭解用法。" -#: ../settings/main.c:1998 +#: ../settings/main.c:2051 msgid "The Xfce development team. All rights reserved." msgstr "Xfce 開發團隊。保留所有權利。" -#: ../settings/main.c:1999 +#: ../settings/main.c:2052 #, c-format msgid "Please report bugs to <%s>." msgstr "請回報程式錯誤至 <%s>。" -#: ../settings/main.c:2006 +#: ../settings/main.c:2059 msgid "Desktop Settings" msgstr "桌面設定" -#: ../settings/main.c:2008 +#: ../settings/main.c:2061 msgid "Unable to contact settings server" msgstr "無法聯絡設定值伺服器" @@ -159,8 +160,9 @@ msgstr "桌面" #: ../settings/xfce-backdrop-settings.desktop.in.h:2 -msgid "Set desktop background and menu and icon behaviour" -msgstr "設定桌面背景、選單與圖示行為" +#: ../settings/xfdesktop-settings-ui.glade.h:11 +msgid "Set desktop background and menu and icon behavior" +msgstr "設定桌面背景、選單、圖示行為" #: ../settings/xfdesktop-settings-appearance-frame-ui.glade.h:1 msgid "Solid color" @@ -338,14 +340,10 @@ msgid "File/launcher icons" msgstr "檔案/啟動器圖示" -#: ../settings/xfdesktop-settings-ui.glade.h:10 ../src/xfce-desktop.c:1015 +#: ../settings/xfdesktop-settings-ui.glade.h:10 ../src/xfce-desktop.c:1007 msgid "Desktop" msgstr "桌面" -#: ../settings/xfdesktop-settings-ui.glade.h:11 -msgid "Set desktop background and menu and icon behavior" -msgstr "設定桌面背景、選單、圖示行為" - #: ../settings/xfdesktop-settings-ui.glade.h:12 msgid "_Background" msgstr "背景(_B)" @@ -437,26 +435,30 @@ msgstr "單一點擊啟動項目(_C)" #: ../settings/xfdesktop-settings-ui.glade.h:34 +msgid "Show hidden files on the desktop" +msgstr "在桌面顯示隱藏檔案" + +#: ../settings/xfdesktop-settings-ui.glade.h:35 msgid "Show icon tooltips. Size:" msgstr "顯示圖示工具提示。大小：" -#: ../settings/xfdesktop-settings-ui.glade.h:35 +#: ../settings/xfdesktop-settings-ui.glade.h:36 msgid "Size of the tooltip preview image." msgstr "工具提示預覽圖像的大小。" -#: ../settings/xfdesktop-settings-ui.glade.h:36 +#: ../settings/xfdesktop-settings-ui.glade.h:37 msgid "Use custom _font size:" msgstr "調整字型大小(_F)：" -#: ../settings/xfdesktop-settings-ui.glade.h:37 +#: ../settings/xfdesktop-settings-ui.glade.h:38 msgid "Appearance" msgstr "外觀" -#: ../settings/xfdesktop-settings-ui.glade.h:38 +#: ../settings/xfdesktop-settings-ui.glade.h:39 msgid "Default Icons" msgstr "預設圖示" -#: ../settings/xfdesktop-settings-ui.glade.h:39 +#: ../settings/xfdesktop-settings-ui.glade.h:40 msgid "_Icons" msgstr "圖示(_I)" @@ -517,121 +519,149 @@ msgid "_Remove Workspace '%s'" msgstr "移除工作區「%s」(_R)" -#: ../src/xfdesktop-application.c:768 +#: ../src/xfdesktop-app-menu-item.c:349 +#: ../src/xfdesktop-file-icon-manager.c:860 +#: ../src/xfdesktop-file-icon-manager.c:1125 +#: ../src/xfdesktop-file-icon-manager.c:1321 ../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 "啟動發生錯誤" + +#: ../src/xfdesktop-app-menu-item.c:351 +#: ../src/xfdesktop-file-icon-manager.c:1127 +msgid "" +"Unable to launch \"exo-desktop-item-edit\", which is required to create and " +"edit launchers and links on the desktop." +msgstr "無法啟動「exo-desktop-item-edit」，此為建立及編輯桌面啟動器和連結所必需。" + +#: ../src/xfdesktop-application.c:836 msgid "Display version information" msgstr "顯示版本資訊" -#: ../src/xfdesktop-application.c:769 +#: ../src/xfdesktop-application.c:837 msgid "Reload all settings" msgstr "重新載入所有設定值" -#: ../src/xfdesktop-application.c:770 +#: ../src/xfdesktop-application.c:838 +msgid "Advance to the next wallpaper on the current workspace" +msgstr "在目前工作區前進至下個桌布" + +#: ../src/xfdesktop-application.c:839 msgid "Pop up the menu (at the current mouse position)" msgstr "彈出選單 (於目前滑鼠位置)" -#: ../src/xfdesktop-application.c:771 +#: ../src/xfdesktop-application.c:840 msgid "Pop up the window list (at the current mouse position)" msgstr "彈出視窗清單 (於目前滑鼠位置)" -#: ../src/xfdesktop-application.c:773 +#: ../src/xfdesktop-application.c:842 msgid "Automatically arrange all the icons on the desktop" msgstr "自動排列桌面上的所有圖示" -#: ../src/xfdesktop-application.c:775 +#: ../src/xfdesktop-application.c:844 +msgid "Enable debug messages" +msgstr "啟用除錯訊息" + +#: ../src/xfdesktop-application.c:845 +msgid "Disable debug messages" +msgstr "停用除錯訊息" + +#: ../src/xfdesktop-application.c:846 msgid "Do not wait for a window manager on startup" msgstr "初始啟動時不要等待視窗管理員" -#: ../src/xfdesktop-application.c:776 +#: ../src/xfdesktop-application.c:847 msgid "Cause xfdesktop to quit" msgstr "導致 xfdesktop 退出" -#: ../src/xfdesktop-application.c:791 +#: ../src/xfdesktop-application.c:862 #, c-format msgid "Failed to parse arguments: %s\n" msgstr "無法解析引數：%s\n" -#: ../src/xfdesktop-application.c:802 +#: ../src/xfdesktop-application.c:873 #, c-format msgid "This is %s version %s, running on Xfce %s.\n" msgstr "這是 %s 版本 %s，運行於 Xfce %s。\n" -#: ../src/xfdesktop-application.c:804 +#: ../src/xfdesktop-application.c:875 #, c-format msgid "Built with GTK+ %d.%d.%d, linked with GTK+ %d.%d.%d." msgstr "依 GTK+ %d.%d.%d 建置，以 GTK+ %d.%d.%d 連結。" -#: ../src/xfdesktop-application.c:808 +#: ../src/xfdesktop-application.c:879 #, c-format msgid "Build options:\n" msgstr "建置選項：\n" -#: ../src/xfdesktop-application.c:809 +#: ../src/xfdesktop-application.c:880 #, c-format msgid " Desktop Menu: %s\n" msgstr "桌面選單：%s\n" -#: ../src/xfdesktop-application.c:811 ../src/xfdesktop-application.c:818 -#: ../src/xfdesktop-application.c:825 +#: ../src/xfdesktop-application.c:882 ../src/xfdesktop-application.c:889 +#: ../src/xfdesktop-application.c:896 msgid "enabled" msgstr "已啟用" -#: ../src/xfdesktop-application.c:813 ../src/xfdesktop-application.c:820 -#: ../src/xfdesktop-application.c:827 +#: ../src/xfdesktop-application.c:884 ../src/xfdesktop-application.c:891 +#: ../src/xfdesktop-application.c:898 msgid "disabled" msgstr "已停用" -#: ../src/xfdesktop-application.c:816 +#: ../src/xfdesktop-application.c:887 #, c-format msgid " Desktop Icons: %s\n" msgstr "桌面圖示：%s\n" -#: ../src/xfdesktop-application.c:823 +#: ../src/xfdesktop-application.c:894 #, c-format msgid " Desktop File Icons: %s\n" msgstr "桌面檔案圖示：%s\n" -#: ../src/xfdesktop-file-icon-manager.c:522 -#: ../src/xfdesktop-file-icon-manager.c:539 +#: ../src/xfdesktop-file-icon-manager.c:559 +#: ../src/xfdesktop-file-icon-manager.c:576 #, c-format msgid "Could not create the desktop folder \"%s\"" msgstr "無法建立桌面資料夾「%s」" -#: ../src/xfdesktop-file-icon-manager.c:527 -#: ../src/xfdesktop-file-icon-manager.c:544 +#: ../src/xfdesktop-file-icon-manager.c:564 +#: ../src/xfdesktop-file-icon-manager.c:581 msgid "Desktop Folder Error" msgstr "桌面資料夾發生錯誤" -#: ../src/xfdesktop-file-icon-manager.c:546 +#: ../src/xfdesktop-file-icon-manager.c:583 msgid "" "A normal file with the same name already exists. Please delete or rename it." msgstr "已存在相同名稱的正常檔案。請刪除或是重新命名。" -#: ../src/xfdesktop-file-icon-manager.c:629 ../src/xfdesktop-file-utils.c:723 +#: ../src/xfdesktop-file-icon-manager.c:666 ../src/xfdesktop-file-utils.c:723 #: ../src/xfdesktop-file-utils.c:776 msgid "Rename Error" msgstr "重新命名發生錯誤" -#: ../src/xfdesktop-file-icon-manager.c:630 ../src/xfdesktop-file-utils.c:777 +#: ../src/xfdesktop-file-icon-manager.c:667 ../src/xfdesktop-file-utils.c:777 msgid "The files could not be renamed" msgstr "無法重新命名檔案" -#: ../src/xfdesktop-file-icon-manager.c:631 +#: ../src/xfdesktop-file-icon-manager.c:668 msgid "None of the icons selected support being renamed." msgstr "選取的圖示皆不支援重新命名功能。" -#: ../src/xfdesktop-file-icon-manager.c:675 -#: ../src/xfdesktop-file-icon-manager.c:719 ../src/xfdesktop-file-utils.c:876 +#: ../src/xfdesktop-file-icon-manager.c:712 +#: ../src/xfdesktop-file-icon-manager.c:756 ../src/xfdesktop-file-utils.c:876 #: ../src/xfdesktop-file-utils.c:913 msgid "Trash Error" msgstr "垃圾桶發生錯誤" -#: ../src/xfdesktop-file-icon-manager.c:676 -#: ../src/xfdesktop-file-icon-manager.c:720 +#: ../src/xfdesktop-file-icon-manager.c:713 +#: ../src/xfdesktop-file-icon-manager.c:757 msgid "The selected files could not be trashed" msgstr "所選的檔案無法丟棄至垃圾桶" -#: ../src/xfdesktop-file-icon-manager.c:677 -#: ../src/xfdesktop-file-icon-manager.c:721 ../src/xfdesktop-file-utils.c:725 +#: ../src/xfdesktop-file-icon-manager.c:714 +#: ../src/xfdesktop-file-icon-manager.c:758 ../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 @@ -643,123 +673,114 @@ msgstr "這項功能需要檔案管理員服務才能呈現 (例如 Thunar 所提供的)。" #. printf is to be translator-friendly -#: ../src/xfdesktop-file-icon-manager.c:821 -#: ../src/xfdesktop-file-icon-manager.c:1279 +#: ../src/xfdesktop-file-icon-manager.c:858 +#: ../src/xfdesktop-file-icon-manager.c:1320 #, c-format msgid "Unable to launch \"%s\":" msgstr "無法啟動「%s」：" -#: ../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 "啟動發生錯誤" - -#: ../src/xfdesktop-file-icon-manager.c:1008 +#: ../src/xfdesktop-file-icon-manager.c:1049 #, c-format msgid "_Open With \"%s\"" msgstr "以「%s」開啟(_O)" -#: ../src/xfdesktop-file-icon-manager.c:1011 +#: ../src/xfdesktop-file-icon-manager.c:1052 #, c-format msgid "Open With \"%s\"" msgstr "以「%s」開啟" -#: ../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 "無法啟動「exo-desktop-item-edit」，此為建立及編輯桌面啟動器和連結所必需。" - -#: ../src/xfdesktop-file-icon-manager.c:1337 +#: ../src/xfdesktop-file-icon-manager.c:1378 msgid "_Open all" msgstr "開啟全部(_O)" -#: ../src/xfdesktop-file-icon-manager.c:1353 +#: ../src/xfdesktop-file-icon-manager.c:1394 msgid "_Open in New Window" msgstr "於新視窗內開啟(_O)" -#: ../src/xfdesktop-file-icon-manager.c:1355 +#: ../src/xfdesktop-file-icon-manager.c:1396 #: ../src/xfdesktop-special-file-icon.c:547 ../src/xfdesktop-volume-icon.c:813 msgid "_Open" msgstr "開啟(_O)" #. create launcher item -#: ../src/xfdesktop-file-icon-manager.c:1374 +#: ../src/xfdesktop-file-icon-manager.c:1415 msgid "Create _Launcher..." msgstr "建立啟動器(_L)..." #. create link item -#: ../src/xfdesktop-file-icon-manager.c:1390 +#: ../src/xfdesktop-file-icon-manager.c:1431 msgid "Create _URL Link..." msgstr "建立 URL 連結(_U)..." #. create folder item -#: ../src/xfdesktop-file-icon-manager.c:1406 +#: ../src/xfdesktop-file-icon-manager.c:1447 msgid "Create _Folder..." msgstr "建立資料夾(_F)" -#: ../src/xfdesktop-file-icon-manager.c:1421 +#: ../src/xfdesktop-file-icon-manager.c:1462 msgid "Create From _Template" msgstr "由模版建立文件(_T)" -#: ../src/xfdesktop-file-icon-manager.c:1450 +#: ../src/xfdesktop-file-icon-manager.c:1491 msgid "_Empty File" msgstr "空檔案(_E)" -#: ../src/xfdesktop-file-icon-manager.c:1467 +#: ../src/xfdesktop-file-icon-manager.c:1508 msgid "_Execute" msgstr "執行(_E)" -#: ../src/xfdesktop-file-icon-manager.c:1487 +#: ../src/xfdesktop-file-icon-manager.c:1528 msgid "_Edit Launcher" msgstr "編輯啟動器(_E)" -#: ../src/xfdesktop-file-icon-manager.c:1522 +#: ../src/xfdesktop-file-icon-manager.c:1563 msgid "Open With" msgstr "開啟程式" -#: ../src/xfdesktop-file-icon-manager.c:1548 +#: ../src/xfdesktop-file-icon-manager.c:1589 msgid "Open With Other _Application..." msgstr "以其它應用程式開啟(_A)..." +#. Trash +#: ../src/xfdesktop-file-icon-manager.c:1676 +msgid "Mo_ve to Trash" +msgstr "丟到垃圾桶(_V)" + #. Rename -#: ../src/xfdesktop-file-icon-manager.c:1651 +#: ../src/xfdesktop-file-icon-manager.c:1707 msgid "_Rename..." msgstr "重新命名(_R)..." -#: ../src/xfdesktop-file-icon-manager.c:1679 +#: ../src/xfdesktop-file-icon-manager.c:1735 msgid "Arrange Desktop _Icons" msgstr "重新排列桌面圖示(_I)" -#: ../src/xfdesktop-file-icon-manager.c:1690 +#: ../src/xfdesktop-file-icon-manager.c:1746 msgid "Desktop _Settings..." msgstr "桌面設定(_S)..." -#: ../src/xfdesktop-file-icon-manager.c:1701 +#: ../src/xfdesktop-file-icon-manager.c:1757 #: ../src/xfdesktop-volume-icon.c:855 msgid "P_roperties..." msgstr "屬性(_R)..." -#: ../src/xfdesktop-file-icon-manager.c:2716 +#: ../src/xfdesktop-file-icon-manager.c:2699 msgid "Load Error" msgstr "載入發生錯誤" -#: ../src/xfdesktop-file-icon-manager.c:2718 +#: ../src/xfdesktop-file-icon-manager.c:2701 msgid "Failed to load the desktop folder" msgstr "無法載入桌面資料夾" -#: ../src/xfdesktop-file-icon-manager.c:3262 +#: ../src/xfdesktop-file-icon-manager.c:3242 msgid "Copy _Here" msgstr "複製這裡(_H)" -#: ../src/xfdesktop-file-icon-manager.c:3262 +#: ../src/xfdesktop-file-icon-manager.c:3242 msgid "_Move Here" msgstr "移動這裡(_M)" -#: ../src/xfdesktop-file-icon-manager.c:3262 +#: ../src/xfdesktop-file-icon-manager.c:3242 msgid "_Link Here" msgstr "連結這裡(_L)" @@ -818,7 +839,7 @@ #: ../src/xfdesktop-file-utils.c:877 msgid "The selected files could not be moved to the trash" -msgstr "所選的檔案無法移動至垃圾桶" +msgstr "所選的檔案無法丟到垃圾桶" #: ../src/xfdesktop-file-utils.c:878 ../src/xfdesktop-file-utils.c:915 msgid "" @@ -927,7 +948,7 @@ msgid "Eject Finished" msgstr "退出完成" -#: ../src/xfdesktop-regular-file-icon.c:603 +#: ../src/xfdesktop-regular-file-icon.c:748 #, c-format msgid "" "Type: %s\n" diff -Nru xfdesktop4-4.11.6/settings/main.c xfdesktop4-4.19.2/settings/main.c --- xfdesktop4-4.11.6/settings/main.c 2014-04-06 19:43:56.000000000 +0000 +++ xfdesktop4-4.19.2/settings/main.c 2014-09-11 16:44:22.000000000 +0000 @@ -697,9 +697,10 @@ g_return_if_fail(panel->monitor >= 0 && panel->workspace >= 0); + screen = wnck_window_get_screen(panel->wnck_window); + /* If it's a pinned window get the active workspace */ if(wnck_workspace == NULL) { - screen = wnck_window_get_screen(panel->wnck_window); workspace = wnck_screen_get_workspace(screen, panel->active_workspace); } else { workspace = wnck_workspace; @@ -744,7 +745,8 @@ gtk_widget_set_visible(panel->infobar, TRUE); } } else { - if(gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(panel->chk_apply_to_all))) { + if(gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(panel->chk_apply_to_all)) || + (wnck_screen_get_workspace_count(screen) == 1)) { /* Single monitor and single workspace */ g_snprintf(buf, sizeof(buf), _("Wallpaper for my desktop")); @@ -786,7 +788,7 @@ property); } - DBG("name %s", buf); + XF_DEBUG("name %s", buf); return buf; } @@ -800,7 +802,7 @@ buf = g_strdup_printf("/backdrop/screen%d/monitor%d/%s", panel->screen, panel->monitor, property); - DBG("name %s", buf); + XF_DEBUG("name %s", buf); return buf; } @@ -870,18 +872,18 @@ /* check to see if the selection actually did change */ if(g_strcmp0(current_filename, filename) != 0) { if(panel->monitor_name == NULL) { - DBG("got %s, applying to screen %d monitor %d workspace %d", filename, - panel->screen, panel->monitor, panel->workspace); + XF_DEBUG("got %s, applying to screen %d monitor %d workspace %d", filename, + panel->screen, panel->monitor, panel->workspace); } else { - DBG("got %s, applying to screen %d monitor %s workspace %d", filename, - panel->screen, panel->monitor_name, panel->workspace); + XF_DEBUG("got %s, applying to screen %d monitor %s workspace %d", filename, + panel->screen, panel->monitor_name, panel->workspace); } /* Get the property location to save our changes, always save to new * location */ buf = xfdesktop_settings_generate_per_workspace_binding_string(panel, "last-image"); - DBG("Saving to %s/%s", buf, filename); + XF_DEBUG("Saving to %s/%s", buf, filename); xfconf_channel_set_string(panel->channel, buf, filename); } @@ -1118,7 +1120,7 @@ * button to something then it can't be changed with a set folder * call anymore. */ if(g_strcmp0(filename, dirname) == 0) { - DBG("folder didn't change"); + XF_DEBUG("folder didn't change"); g_free(dirname); g_free(filename); g_free(previous_filename); @@ -1231,7 +1233,7 @@ current_folder = xfdesktop_settings_get_backdrop_image(panel); dirname = g_path_get_dirname(current_folder); - DBG("current_folder %s, dirname %s", current_folder, dirname); + XF_DEBUG("current_folder %s, dirname %s", current_folder, dirname); gtk_file_chooser_set_current_folder((GtkFileChooser*)panel->btn_folder, dirname); @@ -1322,12 +1324,12 @@ /* If the first color doesn't exist, try to load the old one */ if(!xfconf_channel_has_property(channel, buf)) { GValue value = { 0, }; - old_property = xfdesktop_settings_generate_old_binding_string(panel, "color2"); + old_property = xfdesktop_settings_generate_old_binding_string(panel, "color1"); xfconf_channel_get_property(channel, old_property, &value); if(G_VALUE_HOLDS_BOXED(&value)) { - gtk_color_button_set_color(GTK_COLOR_BUTTON(panel->color2_btn), + gtk_color_button_set_color(GTK_COLOR_BUTTON(panel->color1_btn), g_value_get_boxed(&value)); g_value_unset(&value); } else { @@ -1357,12 +1359,12 @@ /* If the 2nd color doesn't exist, try to load the old one */ if(!xfconf_channel_has_property(channel, buf)) { GValue value = { 0, }; - old_property = xfdesktop_settings_generate_old_binding_string(panel, "color1"); + old_property = xfdesktop_settings_generate_old_binding_string(panel, "color2"); xfconf_channel_get_property(channel, old_property, &value); if(G_VALUE_HOLDS_BOXED(&value)) { - gtk_color_button_set_color(GTK_COLOR_BUTTON(panel->color1_btn), + gtk_color_button_set_color(GTK_COLOR_BUTTON(panel->color2_btn), g_value_get_boxed(&value)); g_value_unset(&value); } else { @@ -1497,7 +1499,7 @@ /* remove the old bindings if there are any */ if(panel->color1_btn_id || panel->color2_btn_id) { - DBG("removing old bindings"); + XF_DEBUG("removing old bindings"); xfdesktop_settings_background_tab_change_bindings(panel, TRUE); } @@ -1552,7 +1554,7 @@ if(new_num != -1) panel->active_workspace = new_num; - DBG("active_workspace now %d", panel->active_workspace); + XF_DEBUG("active_workspace now %d", panel->active_workspace); /* Call cb_update_background_tab in case this is a pinned window */ if(panel->wnck_window != NULL) @@ -1591,7 +1593,7 @@ if(wnck_window_get_xid(window) != GDK_WINDOW_XID(gtk_widget_get_window(toplevel))) return; - DBG("Found our window"); + XF_DEBUG("Found our window"); panel->wnck_window = window; /* These callbacks are for updating the image_iconview when the window @@ -1689,13 +1691,15 @@ GtkWidget *appearance_container, *chk_custom_font_size, *spin_font_size, *w, *box, *spin_icon_size, *chk_show_thumbnails, *chk_single_click, *appearance_settings, - *chk_show_tooltips, *spin_tooltip_size, *bnt_exit, *content_area; + *chk_show_tooltips, *spin_tooltip_size, *bnt_exit, *content_area, + *chk_show_hidden_files; GtkBuilder *appearance_gxml; GError *error = NULL; GtkFileFilter *filter; GdkScreen *screen; WnckScreen *wnck_screen; XfconfChannel *channel = panel->channel; + GdkColor color; TRACE("entering"); @@ -1730,6 +1734,10 @@ chk_single_click = GTK_WIDGET(gtk_builder_get_object(main_gxml, "chk_single_click")); + /* show hidden files */ + chk_show_hidden_files = GTK_WIDGET(gtk_builder_get_object(main_gxml, + "chk_show_hidden_files")); + /* tooltip options */ chk_show_tooltips = GTK_WIDGET(gtk_builder_get_object(main_gxml, "chk_show_tooltips")); spin_tooltip_size = GTK_WIDGET(gtk_builder_get_object(main_gxml, "spin_tooltip_size")); @@ -1800,6 +1808,8 @@ "infobar_header")); panel->infobar_label = gtk_label_new("This is some text"); + gdk_color_parse ("black", &color); + gtk_widget_modify_fg (panel->infobar_label, GTK_STATE_NORMAL, &color); gtk_widget_set_no_show_all(panel->infobar, TRUE); gtk_widget_show(panel->infobar_label); gtk_widget_show(panel->infobar); @@ -1957,6 +1967,9 @@ xfconf_g_property_bind(channel, DESKTOP_ICONS_TOOLTIP_SIZE_PROP, G_TYPE_DOUBLE, G_OBJECT(gtk_spin_button_get_adjustment(GTK_SPIN_BUTTON(spin_tooltip_size))), "value"); + xfconf_g_property_bind(channel, DESKTOP_ICONS_SHOW_HIDDEN_FILES, + G_TYPE_BOOLEAN, G_OBJECT(chk_show_hidden_files), + "active"); xfconf_g_property_bind(channel, DESKTOP_ICONS_SHOW_THUMBNAILS, G_TYPE_BOOLEAN, G_OBJECT(chk_show_thumbnails), "active"); @@ -1998,9 +2011,11 @@ static GdkNativeWindow opt_socket_id = 0; static gboolean opt_version = FALSE; +static gboolean opt_enable_debug = FALSE; static GOptionEntry option_entries[] = { { "socket-id", 's', G_OPTION_FLAG_IN_MAIN, G_OPTION_ARG_INT, &opt_socket_id, N_("Settings manager socket"), N_("SOCKET ID") }, { "version", 'V', G_OPTION_FLAG_IN_MAIN, G_OPTION_ARG_NONE, &opt_version, N_("Version information"), NULL }, + { "enable-debug", 'e', G_OPTION_FLAG_IN_MAIN, G_OPTION_ARG_NONE, &opt_enable_debug, N_("Enable debug messages"), NULL }, { NULL, }, }; @@ -2071,6 +2086,9 @@ channel = xfconf_channel_new(XFDESKTOP_CHANNEL); + if(opt_enable_debug) + xfdesktop_debug_set(TRUE); + if(opt_socket_id == 0) { GtkWidget *dialog; dialog = GTK_WIDGET(gtk_builder_get_object(gxml, "prefs_dialog")); diff -Nru xfdesktop4-4.11.6/settings/xfce-backdrop-settings.desktop.in xfdesktop4-4.19.2/settings/xfce-backdrop-settings.desktop.in --- xfdesktop4-4.11.6/settings/xfce-backdrop-settings.desktop.in 2014-04-07 10:24:12.000000000 +0000 +++ xfdesktop4-4.19.2/settings/xfce-backdrop-settings.desktop.in 1970-01-01 00:00:00.000000000 +0000 @@ -1,15 +0,0 @@ -[Desktop Entry] -Version=1.0 -_Name=Desktop -_Comment=Set desktop background and menu and icon behaviour -Exec=xfdesktop-settings -Icon=preferences-desktop-wallpaper -Terminal=false -Type=Application -Categories=XFCE;GTK;Settings;DesktopSettings;X-XFCE-SettingsDialog;X-XFCE-PersonalSettings; -OnlyShowIn=XFCE; -StartupNotify=true -X-XfcePluggable=true -X-XfceHelpComponent=xfdesktop -X-XfceHelpPage=start -X-XfceHelpVersion=4.11 diff -Nru xfdesktop4-4.11.6/settings/xfce-backdrop-settings.desktop.in.in xfdesktop4-4.19.2/settings/xfce-backdrop-settings.desktop.in.in --- xfdesktop4-4.11.6/settings/xfce-backdrop-settings.desktop.in.in 2014-03-09 17:46:57.000000000 +0000 +++ xfdesktop4-4.19.2/settings/xfce-backdrop-settings.desktop.in.in 2014-07-20 13:56:13.000000000 +0000 @@ -1,7 +1,7 @@ [Desktop Entry] Version=1.0 _Name=Desktop -_Comment=Set desktop background and menu and icon behaviour +_Comment=Set desktop background and menu and icon behavior Exec=xfdesktop-settings Icon=preferences-desktop-wallpaper Terminal=false diff -Nru xfdesktop4-4.11.6/settings/xfdesktop-settings-ui.glade xfdesktop4-4.19.2/settings/xfdesktop-settings-ui.glade --- xfdesktop4-4.11.6/settings/xfdesktop-settings-ui.glade 2014-02-24 07:18:42.000000000 +0000 +++ xfdesktop4-4.19.2/settings/xfdesktop-settings-ui.glade 2014-08-03 06:05:39.000000000 +0000 @@ -658,6 +658,16 @@ + + True + True + GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + Show hidden files on the desktop + True + True + + + True GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK diff -Nru xfdesktop4-4.11.6/settings/xfdesktop-settings-ui.h xfdesktop4-4.19.2/settings/xfdesktop-settings-ui.h --- xfdesktop4-4.11.6/settings/xfdesktop-settings-ui.h 2014-04-07 10:24:12.000000000 +0000 +++ xfdesktop4-4.19.2/settings/xfdesktop-settings-ui.h 2014-09-15 05:46:07.000000000 +0000 @@ -668,195 +668,208 @@ " True\n " " \n " " \n \n " - " \n " - " True\n GDK_PO" - "INTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MAS" - "K | GDK_BUTTON_RELEASE_MASK\n " - " 4\n " - " \n \n " - " True\n " - " True\n G" - "DK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRES" - "S_MASK | GDK_BUTTON_RELEASE_MASK\n " - " Show icon t" - "ooltips. Size:\n True\n " - " True\n " - " True\n \n " - " \n " - " False\n " - " \n \n" - " \n " - " \n" - " True" - "\n True\n True\n " - " GDK_POINTER_MOTION_MASK | GDK_POI" - "NTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK" - "\n adjustment_tooltip\n " - " Size o" - "f the tooltip preview image.\n " - " \n \n " - " False\n 1\n \n" - " \n " - " \n \n " - " False\n 2\n \n " - " \n \n " - " \n" - " True\n " - "GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRE" - "SS_MASK | GDK_BUTTON_RELEASE_MASK\n " - " 4\n " - " \n \n " - " True\n " - " True" - "\n GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BU" - "TTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK\n " - " Us" - "e custom _font size:\n " - " True\n " - " True\n" - " \n " - " \n False\n " - " \n \n " - " \n " - " \n " + " \n True\n True\n GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT" + "_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK\n " + " Show hidden files on the desktop\n " + " True\n " + " True" + "\n \n " + " \n \n " + " \n True\n GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_B" + "UTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK\n " + " 4\n " + " \n " + " \n " " True\n False\n True\n " - " GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTI" - "ON_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK\n adjustment4\n \n \n " - " False\n " - " 1\n \n " - " \n \n \n " - " False\n " - " 2\n " - " \n " - " \n \n " - " \n \n " - " \n \n " - " \n " - " True\n " + "y>\n True\n GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | G" + "DK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK\n " + " Show icon tooltips. Size:\n " + " True\n " + " True\n True\n \n " + " \n " + " False\n " + " \n " + " \n \n " + " \n True\n True\n " + " True\n " " GDK_POINTER_MOTION_" "MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTO" - "N_RELEASE_MASK\n <b>Appearance</b>\n" - " True\n \n \n \n \n " - " False\n " - " \n \n " - " \n \n True\n GDK_POINTER_M" - "OTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK" - "_BUTTON_RELEASE_MASK\n 0\n GTK_SHADOW_NONE\n \n \n Tru" - "e\n GDK" - "_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_" - "MASK | GDK_BUTTON_RELEASE_MASK\n " - "6\n " - " 6\n " - " \n \n True\n " - " True\n " - " GDK_POINTER_MOTION_MASK | GDK_POINTER" - "_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK\n GTK_POLICY_AUTOMATIC\n " - " GTK_POLICY_AUTOMATIC\n" - " GTK_SHAD" - "OW_ETCHED_IN\n \n " - " \n True\n True\n " - " GDK_POINTER_MOTION_MASK | GDK_POINTER_MO" - "TION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK\n False\n \n " - " \n <" - "/object>\n \n " - " \n \n " - " \n \n True\n GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BU" - "TTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK\n " - " <b>Defau" - "lt Icons</b>\n True\n \n" - " \n \n " - " \n 1\n \n " - " \n \n \n" - " \n \n True\n GDK_P" - "OINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MA" - "SK | GDK_BUTTON_RELEASE_MASK\n _Icons\n " - " True\n " - " \n \n 2\n False\n \n " - " \n \n \n \n \n 1" - "\n \n \n \n \n Tr" - "ue\n GDK_POINTER_MOTION" - "_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTT" - "ON_RELEASE_MASK\n \n \n True\n " - "True\n Tr" - "ue\n GDK_POINTER_MO" - "TION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_" - "BUTTON_RELEASE_MASK\n gtk-help\n True" - "\n \n \n " - " \n \n " + "N_RELEASE_MASK\n adjustment_tooltip\n " + " Size of the tooltip preview image.\n " + " \n " + "\n False\n 1\n " + " \n \n " + " \n \n F" + "alse\n 2\n \n " + " \n " + " \n \n True\n GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK |" + " GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK\n " + " 4\n " + " \n " + " \n" + " True" + "\n True\n GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HIN" + "T_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK\n " + " Use custom _font size:\n " + " True\n " + " T" + "rue\n \n " + " \n " + " False\n " + " \n " + "\n \n " + " \n True\n False\n " + " True\n " + " GDK_POINTER_MOTION_MASK |" + " GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELE" + "ASE_MASK\n adjustment4\n " + " \n \n" + " False" + "\n 1\n \n \n " + " \n \n " + " False\n 2" + "\n \n " + " \n \n" + " \n \n \n \n \n Tr" + "ue\n GD" + "K_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS" + "_MASK | GDK_BUTTON_RELEASE_MASK\n " + " <b>Appearance</" + "b>\n True\n \n " + " \n \n " + " \n Fals" + "e\n \n \n \n \n True\n GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTT" + "ON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK\n " + " 0\n " + " GTK_SHADOW_NONE\n " + " \n \n True\n GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK " + "| GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK\n " + " 6\n " + " 6\n " + " \n \n " " True\n " - " True\n True\n GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MA" - "SK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK\n " - " gtk-close\n " - " True\n " - "\n \n " - "1\n \n \n " - " \n \n " - "False\n GTK_PACK_END" - "\n \n \n \n " - " \n \n button2\n bnt_exit" - "\n \n \n\n" + " True\n " + " GDK_POINTER_MOTION" + "_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTT" + "ON_RELEASE_MASK\n GTK_POLICY_AUTOMATIC\n " + " GTK_POLICY_AUT" + "OMATIC\n GTK_SHADOW_ETCHED_IN\n " + " \n \n " + " True\n " + " True\n " + " GDK_POINTER_MOTION_MA" + "SK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_" + "RELEASE_MASK\n False\n " + " \n \n " + " \n \n " + " \n \n " + " \n <" + "object class=\"GtkLabel\" id=\"label15\">\n " + "True\n " + " GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION" + "_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK" + "\n <b>Default Icons</b>\n " + " True\n " + " \n \n " + " \n \n " + " 1\n \n \n \n " + " \n \n " + " \n True\n GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK" + " | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK\n " + " _Icons\n True\n \n \n " + " 2\n " + " False\n \n \n \n " + "\n \n \n 1\n \n \n \n \n True\n GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON" + "_PRESS_MASK | GDK_BUTTON_RELEASE_MASK\n \n" + " \n " + " True\n True\n True\n GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUT" + "TON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK\n gtk-help\n True\n \n " + " \n \n \n True\n True\n" + " True\n " + " GDK_POINTER_MOTION_MASK | GDK_P" + "OINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MA" + "SK\n gtk-close\n True\n " + " \n \n 1\n \n " + " \n \n \n False\n GTK_PACK_END\n \n \n \n \n \n button2\n bnt_exit\n \n \n\n" }; -static const unsigned xfdesktop_settings_ui_length = 58133u; +static const unsigned xfdesktop_settings_ui_length = 58972u; diff -Nru xfdesktop4-4.11.6/src/menu.c xfdesktop4-4.19.2/src/menu.c --- xfdesktop4-4.11.6/src/menu.c 2013-11-02 06:39:46.000000000 +0000 +++ xfdesktop4-4.19.2/src/menu.c 2014-07-06 14:07:44.000000000 +0000 @@ -68,7 +68,7 @@ } #endif -#if USE_DESKTOP_MENU +#ifdef USE_DESKTOP_MENU static void menu_populate(XfceDesktop *desktop, GtkMenuShell *menu, @@ -116,7 +116,7 @@ xfce_desktop_menu_populate_menu(desktop_menu, GTK_WIDGET(menu)); } } -#endif +#endif /* USE_DESKTOP_MENU */ #ifdef USE_DESKTOP_MENU static void @@ -174,11 +174,11 @@ void menu_attach(XfceDesktop *desktop) { -#if USE_DESKTOP_MENU +#ifdef USE_DESKTOP_MENU DBG("attached default menu"); g_signal_connect_after(G_OBJECT(desktop), "populate-root-menu", G_CALLBACK(menu_populate), NULL); -#endif +#endif /* USE_DESKTOP_MENU */ } void diff -Nru xfdesktop4-4.11.6/src/xfce-backdrop.c xfdesktop4-4.19.2/src/xfce-backdrop.c --- xfdesktop4-4.11.6/src/xfce-backdrop.c 2014-04-06 19:16:03.000000000 +0000 +++ xfdesktop4-4.19.2/src/xfce-backdrop.c 2014-08-03 06:01:14.000000000 +0000 @@ -487,7 +487,7 @@ /* Figure out which image to display based on what time of day it is * and how many images we have to work with */ epoch = (gdouble)g_date_time_get_hour(datetime) / (24.0f / MIN(n_items, 24.0f)); - DBG("epoch %d, hour %d, items %d", epoch, g_date_time_get_hour(datetime), n_items); + XF_DEBUG("epoch %d, hour %d, items %d", epoch, g_date_time_get_hour(datetime), n_items); new_file = g_list_nth(backdrop->priv->image_files, epoch); @@ -1147,7 +1147,7 @@ /* remove old timer first */ xfce_backdrop_remove_backdrop_timer(backdrop); - DBG("calling g_timeout_add_seconds, interval is %d", cycle_interval); + XF_DEBUG("calling g_timeout_add_seconds, interval is %d", cycle_interval); backdrop->priv->cycle_timer_id = g_timeout_add_seconds(cycle_interval, (GSourceFunc)xfce_backdrop_timer, backdrop); @@ -1239,7 +1239,7 @@ } if(cycle_interval != 0) { - DBG("calling g_timeout_add_seconds, interval is %d", cycle_interval); + XF_DEBUG("calling g_timeout_add_seconds, interval is %d", cycle_interval); backdrop->priv->cycle_timer_id = g_timeout_add_seconds(cycle_interval, (GSourceFunc)xfce_backdrop_timer, backdrop); @@ -1358,6 +1358,20 @@ return backdrop->priv->random_backdrop_order; } +void +xfce_backdrop_force_cycle(XfceBackdrop *backdrop) +{ + g_return_if_fail(XFCE_IS_BACKDROP(backdrop)); + + TRACE("entering"); + + /* force it to update */ + xfce_backdrop_cycle_backdrop(backdrop); + + /* Update the timer, if running */ + xfce_backdrop_timer(backdrop); +} + /* Generates the background that will either be displayed or will have the * image drawn on top of */ static GdkPixbuf * @@ -1410,10 +1424,6 @@ if(image_data->loader) g_object_unref(image_data->loader); - - g_free(image_data); - image_data = NULL; - } /** @@ -1478,7 +1488,7 @@ else image_path = DEFAULT_BACKDROP; - DBG("loading image %s", image_path); + XF_DEBUG("loading image %s", image_path); file = g_file_new_for_path(image_path); @@ -1584,6 +1594,7 @@ /* canceled? quit now */ if(g_cancellable_is_cancelled(image_data->cancellable)) { xfce_backdrop_image_data_release(image_data); + g_free(image_data); return; } @@ -1628,13 +1639,14 @@ /* no image and not canceled? return just the canvas */ if(!image && !g_cancellable_is_cancelled(image_data->cancellable)) { - DBG("image failed to load, displaying canvas only"); + XF_DEBUG("image failed to load, displaying canvas only"); backdrop->priv->pix = final_image; g_signal_emit(G_OBJECT(backdrop), backdrop_signals[BACKDROP_READY], 0); backdrop->priv->image_data = NULL; xfce_backdrop_image_data_release(image_data); + g_free(image_data); return; } @@ -1732,6 +1744,7 @@ backdrop->priv->image_data = NULL; xfce_backdrop_image_data_release(image_data); + g_free(image_data); } static void diff -Nru xfdesktop4-4.11.6/src/xfce-backdrop.h xfdesktop4-4.19.2/src/xfce-backdrop.h --- xfdesktop4-4.11.6/src/xfce-backdrop.h 2014-04-06 19:16:03.000000000 +0000 +++ xfdesktop4-4.19.2/src/xfce-backdrop.h 2014-08-03 06:01:14.000000000 +0000 @@ -143,12 +143,13 @@ gboolean random_order); gboolean xfce_backdrop_get_random_order (XfceBackdrop *backdrop); +void xfce_backdrop_force_cycle (XfceBackdrop *backdrop); + GdkPixbuf *xfce_backdrop_get_pixbuf (XfceBackdrop *backdrop); void xfce_backdrop_generate_async (XfceBackdrop *backdrop); - G_END_DECLS #endif diff -Nru xfdesktop4-4.11.6/src/xfce-desktop.c xfdesktop4-4.19.2/src/xfce-desktop.c --- xfdesktop4-4.11.6/src/xfce-desktop.c 2014-04-06 19:16:03.000000000 +0000 +++ xfdesktop4-4.19.2/src/xfce-desktop.c 2015-10-29 17:03:30.000000000 +0000 @@ -63,6 +63,7 @@ #include #include #include +#include #ifdef ENABLE_DESKTOP_ICONS #include "xfdesktop-icon-view.h" @@ -118,6 +119,8 @@ GtkWidget *icon_view; gdouble system_font_size; #endif + + gchar *last_filename; }; enum @@ -174,6 +177,11 @@ static gboolean xfce_desktop_get_single_workspace_mode(XfceDesktop *desktop); static gint xfce_desktop_get_current_workspace(XfceDesktop *desktop); +#ifdef ENABLE_DESKTOP_ICONS +static void hidden_state_changed_cb(GObject *object, XfceDesktop *desktop); +#endif + + static guint signals[N_SIGNALS] = { 0, }; /* private functions */ @@ -196,10 +204,10 @@ desktop->priv->system_font_size = pango_font_description_get_size(pfd); /* FIXME: this seems backwards from the documentation */ if(!pango_font_description_get_size_is_absolute(pfd)) { - DBG("dividing by PANGO_SCALE"); + XF_DEBUG("dividing by PANGO_SCALE"); desktop->priv->system_font_size /= PANGO_SCALE; } - DBG("system font size is %.05f", desktop->priv->system_font_size); + XF_DEBUG("system font size is %.05f", desktop->priv->system_font_size); g_free(font_name); pango_font_description_free(pfd); @@ -258,6 +266,8 @@ } gtk_widget_show(desktop->priv->icon_view); gtk_container_add(GTK_CONTAINER(desktop), desktop->priv->icon_view); + + g_signal_connect(G_OBJECT(manager), "hidden-state-changed", G_CALLBACK(hidden_state_changed_cb), desktop); } gtk_widget_queue_draw(GTK_WIDGET(desktop)); @@ -326,7 +336,7 @@ /* If the workspaces haven't been created yet there's no need to do the * background pixmap */ if(desktop->priv->workspaces == NULL) { - DBG("exiting, desktop->priv->workspaces == NULL"); + XF_DEBUG("exiting, desktop->priv->workspaces == NULL"); return NULL; } @@ -352,11 +362,94 @@ } static void +set_accountsservice_user_bg(const gchar *filename) +{ + GDBusProxy *proxy = NULL; + GDBusProxy *user = NULL; + GVariant *variant = NULL; + GError *error = NULL; + gchar *object_path = NULL; + const gchar *user_name = g_get_user_name(); + + proxy = g_dbus_proxy_new_for_bus_sync(G_BUS_TYPE_SYSTEM, + G_DBUS_PROXY_FLAGS_NONE, + NULL, + "org.freedesktop.Accounts", + "/org/freedesktop/Accounts", + "org.freedesktop.Accounts", + NULL, + &error); + + if(!proxy) { + DBG("Failed to contact accounts service: %s", error->message); + g_error_free(error); + return; + } + + variant = g_dbus_proxy_call_sync(proxy, + "FindUserByName", + g_variant_new("(s)", user_name), + G_DBUS_CALL_FLAGS_NONE, + -1, + NULL, + &error); + + if(!variant) { + DBG("Could not contact accounts service to look up '%s': %s", + user_name, error->message); + g_error_free(error); + goto bail; + } + + g_variant_get(variant, "(o)", &object_path); + user = g_dbus_proxy_new_for_bus_sync(G_BUS_TYPE_SYSTEM, + G_DBUS_PROXY_FLAGS_NONE, + NULL, + "org.freedesktop.Accounts", + object_path, + "org.freedesktop.Accounts.User", + NULL, + &error); + g_free(object_path); + + if(!user) { + DBG("Could not create proxy for user '%s': %s", + g_variant_get_string(variant, NULL), error->message); + g_error_free(error); + goto bail; + } + g_variant_unref(variant); + + variant = g_dbus_proxy_call_sync(user, + "SetBackgroundFile", + g_variant_new("(s)", filename), + G_DBUS_CALL_FLAGS_NONE, + -1, + NULL, + &error); + + if(!variant) { + DBG("Failed to set the background '%s': %s", filename, error->message); + g_error_free(error); + goto bail; + } + +bail: + if(user) + g_object_unref(user); + if(proxy) + g_object_unref(proxy); + if(variant) + g_variant_unref(variant); +} + +static void backdrop_changed_cb(XfceBackdrop *backdrop, gpointer user_data) { XfceDesktop *desktop = XFCE_DESKTOP(user_data); GdkPixmap *pmap = desktop->priv->bg_pixmap; GdkScreen *gscreen = desktop->priv->gscreen; + gchar *new_filename = NULL; GdkRectangle rect; GdkRegion *clip_region = NULL; gint i, monitor = -1, current_workspace; @@ -387,11 +480,25 @@ } if(monitor == -1) return; + /* notify Accountsservice of the new bg (only for monitor0) */ + if(monitor == 0) + { + if (xfce_desktop_get_current_workspace(desktop) == 0) + { + new_filename = g_strdup(xfce_backdrop_get_image_filename(backdrop)); + if (g_strcmp0(desktop->priv->last_filename, new_filename) != 0) + { + desktop->priv->last_filename = g_strdup(new_filename); + set_accountsservice_user_bg(xfce_backdrop_get_image_filename(backdrop)); + } + g_free(new_filename); + } + } #ifdef G_ENABLE_DEBUG monitor_name = gdk_screen_get_monitor_plug_name(gscreen, monitor); - DBG("backdrop changed for workspace %d, monitor %d (%s)", current_workspace, monitor, monitor_name); + XF_DEBUG("backdrop changed for workspace %d, monitor %d (%s)", current_workspace, monitor, monitor_name); g_free(monitor_name); #endif @@ -416,12 +523,12 @@ rect.width = gdk_screen_get_width(gscreen); rect.height = gdk_screen_get_height(gscreen); - DBG("xinerama_stretch x %d, y %d, width %d, height %d", - rect.x, rect.y, rect.width, rect.height); + XF_DEBUG("xinerama_stretch x %d, y %d, width %d, height %d", + rect.x, rect.y, rect.width, rect.height); } else { gdk_screen_get_monitor_geometry(gscreen, monitor, &rect); - DBG("monitor x %d, y %d, width %d, height %d", - rect.x, rect.y, rect.width, rect.height); + XF_DEBUG("monitor x %d, y %d, width %d, height %d", + rect.x, rect.y, rect.width, rect.height); } xfce_backdrop_set_size(backdrop, rect.width, rect.height); @@ -430,8 +537,8 @@ && !xfce_workspace_get_xinerama_stretch(desktop->priv->workspaces[current_workspace])) { clip_region = gdk_region_rectangle(&rect); - DBG("clip_region: x: %d, y: %d, w: %d, h: %d", - rect.x, rect.y, rect.width, rect.height); + XF_DEBUG("clip_region: x: %d, y: %d, w: %d, h: %d", + rect.x, rect.y, rect.width, rect.height); /* If we are not monitor 0 on a multi-monitor setup we need to subtract * all the previous monitor regions so we don't draw over them. This @@ -442,9 +549,9 @@ GdkRegion *previous_region; gdk_screen_get_monitor_geometry(gscreen, i, &previous_monitor); - DBG("previous_monitor: x: %d, y: %d, w: %d, h: %d", - previous_monitor.x, previous_monitor.y, - previous_monitor.width, previous_monitor.height); + XF_DEBUG("previous_monitor: x: %d, y: %d, w: %d, h: %d", + previous_monitor.x, previous_monitor.y, + previous_monitor.width, previous_monitor.height); previous_region = gdk_region_rectangle(&previous_monitor); @@ -457,8 +564,8 @@ if(clip_region != NULL) { /* Update the area to redraw to limit the icons/area painted */ gdk_region_get_clipbox(clip_region, &rect); - DBG("area to update: x: %d, y: %d, w: %d, h: %d", - rect.x, rect.y, rect.width, rect.height); + XF_DEBUG("area to update: x: %d, y: %d, w: %d, h: %d", + rect.x, rect.y, rect.width, rect.height); } if(rect.width != 0 && rect.height != 0) { @@ -591,13 +698,30 @@ gpointer user_data) { XfceDesktop *desktop = XFCE_DESKTOP(user_data); + gint current_workspace = 0, monitor = 0, i; TRACE("entering"); g_return_if_fail(XFCE_IS_WORKSPACE(workspace) && XFCE_IS_BACKDROP(backdrop)); - if(xfce_desktop_get_current_workspace(desktop) == xfce_workspace_get_workspace_num(workspace)) - backdrop_changed_cb(backdrop, user_data); + current_workspace = xfce_desktop_get_current_workspace(desktop); + + /* Find out which monitor the backdrop is on */ + for(i = 0; i < xfce_desktop_get_n_monitors(desktop); i++) { + if(backdrop == xfce_workspace_get_backdrop(desktop->priv->workspaces[current_workspace], i)) { + monitor = i; + break; + } + } + + if(xfce_desktop_get_current_workspace(desktop) == xfce_workspace_get_workspace_num(workspace)) { + /* Update the backdrop! + * In spanning mode, ignore updates to monitors other than the primary + */ + if(!xfce_workspace_get_xinerama_stretch(workspace) || monitor == 0) { + backdrop_changed_cb(backdrop, user_data); + } + } } static void @@ -619,8 +743,8 @@ desktop->priv->current_workspace = new_workspace; - DBG("current_workspace %d, new_workspace %d", - current_workspace, new_workspace); + XF_DEBUG("current_workspace %d, new_workspace %d", + current_workspace, new_workspace); for(i = 0; i < xfce_desktop_get_n_monitors(desktop); i++) { backdrop = xfce_workspace_get_backdrop(desktop->priv->workspaces[new_workspace], i); @@ -703,8 +827,8 @@ { Window xwin; gint xscreen; - gchar selection_name[100]; - Atom selection_atom, manager_atom; + gchar selection_name[100], common_selection_name[32]; + Atom selection_atom, common_selection_atom, manager_atom; xwin = GDK_WINDOW_XID(gtk_widget_get_window(GTK_WIDGET(desktop))); xscreen = gdk_screen_get_number(desktop->priv->gscreen); @@ -713,6 +837,9 @@ selection_atom = XInternAtom(gdk_x11_get_default_xdisplay(), selection_name, False); manager_atom = XInternAtom(gdk_x11_get_default_xdisplay(), "MANAGER", False); + g_snprintf(common_selection_name, 32, "_NET_DESKTOP_MANAGER_S%d", xscreen); + common_selection_atom = XInternAtom(gdk_x11_get_default_xdisplay(), common_selection_name, False); + /* 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) { @@ -720,8 +847,16 @@ exit(0); } + /* Check that _NET_DESKTOP_MANAGER_S%d isn't set, as it means another + * desktop manager is running, e.g. nautilus */ + if(XGetSelectionOwner (gdk_x11_get_default_xdisplay(), common_selection_atom) != None) { + g_warning("%s: another desktop manager is running.", PACKAGE); + exit(1); + } + XSelectInput(gdk_x11_get_default_xdisplay(), xwin, PropertyChangeMask | ButtonPressMask); XSetSelectionOwner(gdk_x11_get_default_xdisplay(), selection_atom, xwin, GDK_CURRENT_TIME); + XSetSelectionOwner(gdk_x11_get_default_xdisplay(), common_selection_atom, xwin, GDK_CURRENT_TIME); /* Check to see if we managed to claim the selection. If not, * we treat it as if we got it then immediately lost it */ @@ -877,8 +1012,10 @@ g_object_unref(G_OBJECT(desktop->priv->channel)); g_free(desktop->priv->property_prefix); +#ifdef ENABLE_DESKTOP_ICONS if(desktop->priv->style_refresh_timer != 0) g_source_remove(desktop->priv->style_refresh_timer); +#endif G_OBJECT_CLASS(xfce_desktop_parent_class)->finalize(object); } @@ -1237,13 +1374,12 @@ return TRUE; } +#ifdef ENABLE_DESKTOP_ICONS static gboolean style_refresh_cb(gpointer *w) { XfceDesktop *desktop = XFCE_DESKTOP(w); -#ifdef ENABLE_DESKTOP_ICONS gdouble old_font_size; -#endif TRACE("entering"); @@ -1262,7 +1398,6 @@ gtk_widget_queue_draw(GTK_WIDGET(desktop)); -#ifdef ENABLE_DESKTOP_ICONS if(!desktop->priv->icon_view || !XFDESKTOP_IS_ICON_VIEW(desktop->priv->icon_view)) return FALSE; @@ -1277,14 +1412,15 @@ xfdesktop_icon_view_set_font_size(XFDESKTOP_ICON_VIEW(desktop->priv->icon_view), desktop->priv->system_font_size); } -#endif return FALSE; } +#endif static void xfce_desktop_style_set(GtkWidget *w, GtkStyle *old_style) { +#ifdef ENABLE_DESKTOP_ICONS XfceDesktop *desktop = XFCE_DESKTOP(w); TRACE("entering"); @@ -1296,6 +1432,7 @@ (GSourceFunc)style_refresh_cb, w, NULL); +#endif } static void @@ -1356,9 +1493,9 @@ current_workspace = workspace_num; } - DBG("workspace_num %d, single_workspace_num %d, current_workspace %d, max workspaces %d", - workspace_num, desktop->priv->single_workspace_num, current_workspace, - desktop->priv->nworkspaces); + XF_DEBUG("workspace_num %d, single_workspace_num %d, current_workspace %d, max workspaces %d", + workspace_num, desktop->priv->single_workspace_num, current_workspace, + desktop->priv->nworkspaces); return current_workspace; } @@ -1396,7 +1533,9 @@ desktop->priv->property_prefix = g_strdup(property_prefix); xfce_desktop_connect_settings(desktop); - + + desktop->priv->last_filename = g_strdup(""); + return GTK_WIDGET(desktop); } @@ -1446,6 +1585,46 @@ #endif } +#ifdef ENABLE_DESKTOP_ICONS +static gboolean +hidden_idle_cb(gpointer user_data) +{ + XfceDesktop *desktop; + + g_return_val_if_fail(XFCE_IS_DESKTOP(user_data), FALSE); + + desktop = XFCE_DESKTOP(user_data); + + /* destroy and load the icon view so that it adds or removes + * the hidden icons from the desktop */ + if(desktop->priv->icon_view) { + gtk_widget_destroy(desktop->priv->icon_view); + desktop->priv->icon_view = NULL; + } + + if(gtk_widget_get_realized(GTK_WIDGET(desktop))) + xfce_desktop_setup_icon_view(desktop); + + return FALSE; +} + +static void +hidden_state_changed_cb(GObject *object, + XfceDesktop *desktop) +{ + g_return_if_fail(XFCE_IS_DESKTOP(desktop)); + + if(desktop->priv->icon_view) { + g_signal_handlers_disconnect_by_func(object, + G_CALLBACK(hidden_state_changed_cb), + desktop); + } + + /* We have to do this in an idle callback */ + g_idle_add(hidden_idle_cb, desktop); +} +#endif /* ENABLE_DESKTOP_ICONS */ + XfceDesktopIconStyle xfce_desktop_get_icon_style(XfceDesktop *desktop) { @@ -1532,7 +1711,7 @@ desktop->priv->single_workspace_mode = single_workspace; - DBG("single_workspace_mode now %s", single_workspace ? "TRUE" : "FALSE"); + XF_DEBUG("single_workspace_mode now %s", single_workspace ? "TRUE" : "FALSE"); /* If the desktop has been realized then fake a screen size change to @@ -1550,7 +1729,7 @@ if(workspace_num == desktop->priv->single_workspace_num) return; - DBG("single_workspace_num now %d", workspace_num); + XF_DEBUG("single_workspace_num now %d", workspace_num); desktop->priv->single_workspace_num = workspace_num; @@ -1666,8 +1845,9 @@ xfce_desktop_do_menu_popup(desktop, button, activate_time, signals[SIG_POPULATE_SECONDARY_ROOT_MENU]); } + void -xfce_desktop_refresh(XfceDesktop *desktop) +xfce_desktop_refresh(XfceDesktop *desktop, gboolean advance_wallpaper) { gint i, current_workspace; @@ -1690,9 +1870,19 @@ backdrop = xfce_workspace_get_backdrop(desktop->priv->workspaces[current_workspace], i); - backdrop_changed_cb(backdrop, desktop); + if(advance_wallpaper) { + /* We need to trigger a new wallpaper event */ + xfce_backdrop_force_cycle(backdrop); + } else { + /* Fake a changed event so we redraw the wallpaper */ + backdrop_changed_cb(backdrop, desktop); + } } + /* If we're only advancing the wallpaper we can exit here */ + if(advance_wallpaper) + return; + #ifdef ENABLE_DESKTOP_ICONS /* reload icon view */ if(desktop->priv->icon_view) { diff -Nru xfdesktop4-4.11.6/src/xfce-desktop.h xfdesktop4-4.19.2/src/xfce-desktop.h --- xfdesktop4-4.11.6/src/xfce-desktop.h 2013-11-02 06:39:46.000000000 +0000 +++ xfdesktop4-4.19.2/src/xfce-desktop.h 2014-08-03 06:01:14.000000000 +0000 @@ -108,7 +108,7 @@ guint button, guint activate_time); -void xfce_desktop_refresh(XfceDesktop *desktop); +void xfce_desktop_refresh(XfceDesktop *desktop, gboolean advance_wallpaper); void xfce_desktop_arrange_icons(XfceDesktop *desktop); diff -Nru xfdesktop4-4.11.6/src/xfce-workspace.c xfdesktop4-4.19.2/src/xfce-workspace.c --- xfdesktop4-4.11.6/src/xfce-workspace.c 2014-04-06 19:16:03.000000000 +0000 +++ xfdesktop4-4.19.2/src/xfce-workspace.c 2014-07-28 07:50:58.000000000 +0000 @@ -162,7 +162,7 @@ g_free(monitor_name); } - DBG("setting %s to %s", buf, value); + XF_DEBUG("setting %s to %s", buf, value); xfconf_channel_set_string(channel, buf, value); } @@ -220,7 +220,7 @@ for(i = 0; i < workspace->priv->nbackdrops; ++i) { if(backdrop == workspace->priv->backdrops[i]) { monitor_num = i; - DBG("monitor_num %d", monitor_num); + XF_DEBUG("monitor_num %d", monitor_num); break; } } @@ -324,7 +324,7 @@ workspace->priv->nbackdrops = n_monitors; for(i = 0; i < n_monitors; ++i) { - DBG("Adding workspace %d backdrop %d", workspace->priv->workspace_num, i); + XF_DEBUG("Adding workspace %d backdrop %d", workspace->priv->workspace_num, i); workspace->priv->backdrops[i] = xfce_backdrop_new(vis); xfce_workspace_connect_backdrop_settings(workspace, @@ -515,7 +515,7 @@ /* Try to lookup the old backdrop */ xfconf_channel_get_property(channel, buf, &value); - DBG("looking at %s", buf); + XF_DEBUG("looking at %s", buf); /* Either there was a backdrop to migrate from or we use the backdrop * we provide as a default */ @@ -613,7 +613,7 @@ } pp_len = strlen(buf); - DBG("prefix string: %s", buf); + XF_DEBUG("prefix string: %s", buf); g_strlcat(buf, "color-style", sizeof(buf)); if(!xfconf_channel_has_property(channel, buf)) { diff -Nru xfdesktop4-4.11.6/src/xfdesktop-application.c xfdesktop4-4.19.2/src/xfdesktop-application.c --- xfdesktop4-4.11.6/src/xfdesktop-application.c 2014-01-08 17:37:23.000000000 +0000 +++ xfdesktop4-4.19.2/src/xfdesktop-application.c 2014-08-03 06:01:14.000000000 +0000 @@ -73,6 +73,10 @@ GVariant *parameter, gpointer data); +static void cb_xfdesktop_application_next(GAction *action, + GVariant *parameter, + gpointer data); + static void xfdesktop_handle_quit_signals(gint sig, gpointer user_data); static void cb_xfdesktop_application_quit(GAction *action, GVariant *parameter, @@ -88,6 +92,10 @@ GVariant *parameter, gpointer data); +static void cb_xfdesktop_application_debug(GAction *action, + GVariant *parameter, + gpointer data); + static gboolean cb_wait_for_window_manager(gpointer data); static void cb_wait_for_window_manager_destroyed(gpointer data); @@ -182,6 +190,12 @@ xfdesktop_application_add_action(app, G_ACTION(action)); g_object_unref(action); + /* next action */ + action = g_simple_action_new("next", NULL); + g_signal_connect(action, "activate", G_CALLBACK(cb_xfdesktop_application_next), app); + xfdesktop_application_add_action(app, G_ACTION(action)); + g_object_unref(action); + /* quit action */ action = g_simple_action_new("quit", NULL); g_signal_connect(action, "activate", G_CALLBACK(cb_xfdesktop_application_quit), app); @@ -200,6 +214,12 @@ xfdesktop_application_add_action(app, G_ACTION(action)); g_object_unref(action); + /* debug action, parameter toggles debug state */ + action = g_simple_action_new("debug", G_VARIANT_TYPE_BOOLEAN); + g_signal_connect(action, "activate", G_CALLBACK(cb_xfdesktop_application_debug), app); + xfdesktop_application_add_action(app, G_ACTION(action)); + g_object_unref(action); + #if !GLIB_CHECK_VERSION (2, 32, 0) g_application_set_action_group(G_APPLICATION(app), (GActionGroup*)app->actions); #endif @@ -357,7 +377,7 @@ /* reload all the desktops */ for(i = 0; i < app->nscreens; ++i) { if(app->desktops[i]) - xfce_desktop_refresh(XFCE_DESKTOP(app->desktops[i])); + xfce_desktop_refresh(XFCE_DESKTOP(app->desktops[i]), FALSE); } menu_reload(); @@ -385,6 +405,31 @@ } static void +cb_xfdesktop_application_next(GAction *action, + GVariant *parameter, + gpointer data) +{ + XfdesktopApplication *app; + gint i; + + TRACE("entering"); + + g_return_if_fail(XFDESKTOP_IS_APPLICATION(data)); + + app = XFDESKTOP_APPLICATION(data); + + /* If xfdesktop never started there's nothing to do here */ + if(!app->desktops) + return; + + /* reload all the desktops forcing the wallpaper to advance */ + for(i = 0; i < app->nscreens; ++i) { + if(app->desktops[i]) + xfce_desktop_refresh(XFCE_DESKTOP(app->desktops[i]), TRUE); + } +} + +static void xfdesktop_handle_quit_signals(gint sig, gpointer user_data) { @@ -497,6 +542,26 @@ xfce_desktop_arrange_icons(XFCE_DESKTOP(app->desktops[screen_num])); } +/* parameter is a boolean that determines whether to enable or disable the + * debug messages */ +static void +cb_xfdesktop_application_debug(GAction *action, + GVariant *parameter, + gpointer data) +{ + TRACE("entering"); + + /* sanity checks */ + if(!data || !XFDESKTOP_IS_APPLICATION(data)) + return; + + if(!g_variant_is_of_type(parameter, G_VARIANT_TYPE_BOOLEAN)) + return; + + /* Toggle the debug state */ + xfdesktop_debug_set(g_variant_get_boolean(parameter)); +} + /* Cleans up the associated wait for wm resources */ static void wait_for_window_manager_cleanup(WaitForWM *wfwm) @@ -523,7 +588,7 @@ for(i = 0; i < wfwm->atom_count; i++) { if(XGetSelectionOwner(wfwm->dpy, wfwm->atoms[i]) == None) { - DBG("window manager not ready on screen %d", i); + XF_DEBUG("window manager not ready on screen %d", i); have_wm = FALSE; break; } @@ -557,7 +622,7 @@ g_printerr("No window manager registered on screen 0. " "To start the xfdesktop without this check, run with --disable-wm-check.\n"); } else { - DBG("found window manager after %d tries", wfwm->counter); + XF_DEBUG("found window manager after %d tries", wfwm->counter); } /* start loading the desktop, hopefully a window manager is found, but it @@ -759,19 +824,25 @@ GError *error = NULL; gboolean opt_version = FALSE; gboolean opt_reload = FALSE; + gboolean opt_next = FALSE; gboolean opt_menu = FALSE; gboolean opt_windowlist = FALSE; gboolean opt_arrange = FALSE; gboolean opt_quit = FALSE; + gboolean opt_enable_debug = FALSE; + gboolean opt_disable_debug = FALSE; gboolean option_set = FALSE; const GOptionEntry main_entries[] = { { "version", 'V', G_OPTION_FLAG_IN_MAIN, G_OPTION_ARG_NONE, &opt_version, N_("Display version information"), NULL }, { "reload", 'R', G_OPTION_FLAG_IN_MAIN, G_OPTION_ARG_NONE, &opt_reload, N_("Reload all settings"), NULL }, + { "next", 'N', G_OPTION_FLAG_IN_MAIN, G_OPTION_ARG_NONE, &opt_next, N_("Advance to the next wallpaper on the current workspace"), NULL }, { "menu", 'M', G_OPTION_FLAG_IN_MAIN, G_OPTION_ARG_NONE, &opt_menu, N_("Pop up the menu (at the current mouse position)"), NULL }, { "windowlist", 'W', G_OPTION_FLAG_IN_MAIN, G_OPTION_ARG_NONE, &opt_windowlist, N_("Pop up the window list (at the current mouse position)"), NULL }, #ifdef ENABLE_FILE_ICONS { "arrange", 'A', G_OPTION_FLAG_IN_MAIN, G_OPTION_ARG_NONE, &opt_arrange, N_("Automatically arrange all the icons on the desktop"), NULL }, #endif + { "enable-debug", 'e', G_OPTION_FLAG_IN_MAIN, G_OPTION_ARG_NONE, &opt_enable_debug, N_("Enable debug messages"), NULL }, + { "disable-debug", 'd', G_OPTION_FLAG_IN_MAIN, G_OPTION_ARG_NONE, &opt_disable_debug, N_("Disable debug messages"), NULL }, { "disable-wm-check", 'D', G_OPTION_FLAG_IN_MAIN, G_OPTION_ARG_NONE, &app->opt_disable_wm_check, N_("Do not wait for a window manager on startup"), NULL }, { "quit", 'Q', G_OPTION_FLAG_IN_MAIN, G_OPTION_ARG_NONE, &opt_quit, N_("Cause xfdesktop to quit"), NULL }, { NULL, 0, 0, 0, NULL, NULL, NULL } @@ -842,6 +913,9 @@ } else if(opt_reload) { g_action_group_activate_action(G_ACTION_GROUP(g_application), "reload", NULL); option_set = TRUE; + } else if(opt_next) { + g_action_group_activate_action(G_ACTION_GROUP(g_application), "next", NULL); + option_set = TRUE; } else if(opt_menu) { g_action_group_activate_action(G_ACTION_GROUP(g_application), "menu", g_variant_new_boolean(TRUE)); @@ -853,6 +927,14 @@ } else if(opt_arrange) { g_action_group_activate_action(G_ACTION_GROUP(g_application), "arrange", NULL); option_set = TRUE; + } else if(opt_enable_debug) { + g_action_group_activate_action(G_ACTION_GROUP(g_application), "debug", + g_variant_new_boolean(TRUE)); + option_set = TRUE; + } else if(opt_disable_debug) { + g_action_group_activate_action(G_ACTION_GROUP(g_application), "debug", + g_variant_new_boolean(FALSE)); + option_set = TRUE; } /* We handled the command line option */ diff -Nru xfdesktop4-4.11.6/src/xfdesktop-file-icon-manager.c xfdesktop4-4.19.2/src/xfdesktop-file-icon-manager.c --- xfdesktop4-4.11.6/src/xfdesktop-file-icon-manager.c 2014-04-06 05:41:17.000000000 +0000 +++ xfdesktop4-4.19.2/src/xfdesktop-file-icon-manager.c 2014-09-08 16:22:50.000000000 +0000 @@ -76,7 +76,7 @@ #include #include -#define SAVE_DELAY 7000 +#define SAVE_DELAY 1000 #define BORDER 8 typedef enum @@ -91,9 +91,17 @@ PROP_SHOW_DEVICE_VOLUME, PROP_SHOW_UNKNOWN_VOLUME, PROP_SHOW_THUMBNAILS, + PROP_SHOW_HIDDEN_FILES, PROP_MAX_TEMPLATES, } XfdesktopFileIconManagerProp; +typedef enum +{ + HIDDEN_STATE_CHANGED, + LAST_SIGNAL, +} XfdesktopFileIconManagerSignals; + + struct _XfdesktopFileIconManagerPrivate { gboolean inited; @@ -125,6 +133,7 @@ gboolean show_unknown_volumes; gboolean show_special[XFDESKTOP_SPECIAL_FILE_ICON_TRASH+1]; gboolean show_thumbnails; + gboolean show_hidden_files; guint save_icons_id; @@ -197,6 +206,8 @@ gboolean show_special_file); static void xfdesktop_file_icon_manager_set_show_thumbnails(XfdesktopFileIconManager *manager, gboolean show_thumbnails); +static void xfdesktop_file_icon_manager_set_show_hidden_files(XfdesktopFileIconManager *manager, + gboolean show_hidden_files); static void xfdesktop_file_icon_manager_set_show_removable_media(XfdesktopFileIconManager *manager, XfdesktopFileIconManagerProp prop, gboolean show); @@ -251,6 +262,8 @@ static GQuark xfdesktop_app_info_quark = 0; +static guint fmanager_signals[LAST_SIGNAL] = { 0, }; + static void xfdesktop_file_icon_manager_class_init(XfdesktopFileIconManagerClass *klass) @@ -262,7 +275,16 @@ gobject_class->set_property = xfdesktop_file_icon_manager_set_property; gobject_class->get_property = xfdesktop_file_icon_manager_get_property; gobject_class->finalize = xfdesktop_file_icon_manager_finalize; - + + fmanager_signals[HIDDEN_STATE_CHANGED] = g_signal_new("hidden-state-changed", + G_OBJECT_CLASS_TYPE(gobject_class), + G_SIGNAL_RUN_FIRST, + G_STRUCT_OFFSET(XfdesktopFileIconManagerClass, hidden_state_changed), + NULL, NULL, + g_cclosure_marshal_VOID__VOID, + G_TYPE_NONE, 0); + + g_object_class_install_property(gobject_class, PROP_FOLDER, g_param_spec_object("folder", "Desktop Folder", "Folder this icon manager manages", @@ -326,6 +348,12 @@ "show-thumbnails", TRUE, XFDESKTOP_PARAM_FLAGS)); + g_object_class_install_property(gobject_class, PROP_SHOW_HIDDEN_FILES, + g_param_spec_boolean("show-hidden-files", + "show-hidden-files", + "show-hidden-files", + FALSE, + XFDESKTOP_PARAM_FLAGS)); g_object_class_install_property(gobject_class, PROP_MAX_TEMPLATES, g_param_spec_uint("max-templates", "max-templates", @@ -402,6 +430,11 @@ g_value_get_boolean(value)); break; + case PROP_SHOW_HIDDEN_FILES: + xfdesktop_file_icon_manager_set_show_hidden_files(fmanager, + g_value_get_boolean(value)); + break; + case PROP_MAX_TEMPLATES: xfdesktop_file_icon_manager_set_max_templates(fmanager, g_value_get_uint(value)); @@ -460,6 +493,10 @@ g_value_set_boolean(value, fmanager->priv->show_thumbnails); break; + case PROP_SHOW_HIDDEN_FILES: + g_value_set_boolean(value, fmanager->priv->show_hidden_files); + break; + case PROP_MAX_TEMPLATES: g_value_set_int(value, fmanager->priv->max_templates); break; @@ -927,17 +964,21 @@ } static void +xfdesktop_file_icon_menu_trash(GtkWidget *widget, + gpointer user_data) +{ + XfdesktopFileIconManager *fmanager = XFDESKTOP_FILE_ICON_MANAGER(user_data); + + xfdesktop_file_icon_manager_delete_selected(fmanager, FALSE); +} + +static void xfdesktop_file_icon_menu_delete(GtkWidget *widget, gpointer user_data) { XfdesktopFileIconManager *fmanager = XFDESKTOP_FILE_ICON_MANAGER(user_data); - GdkModifierType state; - gboolean force_delete = FALSE; - - if(gtk_get_current_event_state(&state) && state & GDK_SHIFT_MASK) - force_delete = TRUE; - - xfdesktop_file_icon_manager_delete_selected(fmanager, force_delete); + + xfdesktop_file_icon_manager_delete_selected(fmanager, TRUE); } static void @@ -1631,6 +1672,21 @@ } else gtk_widget_set_sensitive(mi, FALSE); + /* Trash */ + mi = gtk_image_menu_item_new_with_mnemonic(_("Mo_ve to Trash")); + /* Add the trashcan image */ + img = gtk_image_new_from_icon_name("user-trash", GTK_ICON_SIZE_MENU); + gtk_widget_show(img); + gtk_image_menu_item_set_image(GTK_IMAGE_MENU_ITEM(mi), img); + gtk_widget_show(mi); + gtk_menu_shell_append(GTK_MENU_SHELL(menu), mi); + if(multi_sel || xfdesktop_file_icon_can_delete_file(file_icon)) { + g_signal_connect(G_OBJECT(mi), "activate", + G_CALLBACK(xfdesktop_file_icon_menu_trash), + fmanager); + } else + gtk_widget_set_sensitive(mi, FALSE); + /* Delete */ mi = gtk_image_menu_item_new_from_stock(GTK_STOCK_DELETE, NULL); gtk_widget_show(mi); @@ -1767,7 +1823,7 @@ if(!path) return FALSE; - DBG("saving to: %s", path); + XF_DEBUG("saving to: %s", path); tmppath = g_strconcat(path, ".new", NULL); @@ -1802,7 +1858,7 @@ unlink(tmppath); } } else { - DBG("didn't write anything in the RC file, desktop is probably empty"); + XF_DEBUG("didn't write anything in the RC file, desktop is probably empty"); } g_free(path); @@ -1828,6 +1884,12 @@ /* ***** */ +void +xfdesktop_file_icon_save(gpointer user_data) +{ + xfdesktop_file_icon_position_changed(NULL, user_data); +} + gboolean xfdesktop_file_icon_manager_get_cached_icon_position(XfdesktopFileIconManager *fmanager, const gchar *name, @@ -1901,7 +1963,7 @@ g_assert(g_list_find(_alive_icon_list, obj)); _alive_icon_list = g_list_remove(_alive_icon_list, obj); - DBG("icon finalized: '%s'", xfdesktop_icon_peek_label(XFDESKTOP_ICON(obj))); + XF_DEBUG("icon finalized: '%s'", xfdesktop_icon_peek_label(XFDESKTOP_ICON(obj))); } #endif @@ -1991,14 +2053,14 @@ * to the front of the pending icon queue, if it didn't then we place it * on the end */ if(row >= 0 && col >= 0) { - DBG("attempting to set icon '%s' to position (%d,%d)", name, row, col); + XF_DEBUG("attempting to set icon '%s' to position (%d,%d)", name, row, col); xfdesktop_icon_set_position(XFDESKTOP_ICON(icon), row, col); g_queue_push_head(fmanager->priv->pending_icons, icon); } else if(xfdesktop_file_icon_manager_get_cached_icon_position(fmanager, name, identifier, &row, &col)) { - DBG("attempting to set icon '%s' to position (%d,%d)", name, row, col); + XF_DEBUG("attempting to set icon '%s' to position (%d,%d)", name, row, col); xfdesktop_icon_set_position(XFDESKTOP_ICON(icon), row, col); g_queue_push_head(fmanager->priv->pending_icons, icon); } else { @@ -2036,7 +2098,7 @@ if(item && item->data && XFDESKTOP_IS_FILE_ICON(item->data)) { gchar *filename = g_file_get_path(xfdesktop_file_icon_peek_file(item->data)); - DBG("removing %s from pending queue", filename); + XF_DEBUG("removing %s from pending queue", filename); /* Icon was pending creation, dequeue the thumbnail and * remove it from the pending icons queue */ @@ -2047,7 +2109,7 @@ g_free(filename); } else { - DBG("removing icon %s from icon view", xfdesktop_icon_peek_label(XFDESKTOP_ICON(icon))); + XF_DEBUG("removing icon %s from icon view", xfdesktop_icon_peek_label(XFDESKTOP_ICON(icon))); /* Remove the icon from the icon_view */ xfdesktop_icon_view_remove_item(fmanager->priv->icon_view, XFDESKTOP_ICON(icon)); @@ -2087,7 +2149,7 @@ /* if it's a .desktop file, and it has Hidden=true, or an * OnlyShowIn Or NotShowIn that would hide it from Xfce, don't * show it on the desktop (bug #4022) */ - if(is_desktop_file) + if(is_desktop_file && !fmanager->priv->show_hidden_files) { gchar *path = g_file_get_path(file); XfceRc *rcfile = xfce_rc_simple_open(path, TRUE); @@ -2099,18 +2161,21 @@ xfce_rc_set_group(rcfile, "Desktop Entry"); if(xfce_rc_read_bool_entry(rcfile, "Hidden", FALSE)) { xfce_rc_close(rcfile); + XF_DEBUG("Not adding icon because it has the Hidden Desktop Entry set"); return NULL; } value = xfce_rc_read_entry(rcfile, "OnlyShowIn", NULL); if(value && strncmp(value, "XFCE;", 5) && !strstr(value, ";XFCE;")) { xfce_rc_close(rcfile); + XF_DEBUG("Not adding icon because it has the OnlyShowIn Desktop Entry set"); return NULL; } value = xfce_rc_read_entry(rcfile, "NotShowIn", NULL); if(value && (!strncmp(value, "XFCE;", 5) || strstr(value, ";XFCE;"))) { xfce_rc_close(rcfile); + XF_DEBUG("Not adding icon because it has the NotShowIn Desktop Entry set"); return NULL; } @@ -2119,8 +2184,12 @@ } /* If it's a hidden or backup file don't show it on the desktop */ - if(g_file_info_get_is_hidden(info) || g_file_info_get_is_backup(info)) - return NULL; + if(g_file_info_get_is_hidden(info) || g_file_info_get_is_backup(info)) { + if(!fmanager->priv->show_hidden_files) { + XF_DEBUG("Not adding icon because it is either hidden or a backup file"); + return NULL; + } + } /* should never return NULL */ icon = xfdesktop_regular_file_icon_new(file, info, fmanager->priv->gscreen, fmanager); @@ -2378,7 +2447,7 @@ switch(event) { case G_FILE_MONITOR_EVENT_MOVED: - DBG("got a moved event"); + XF_DEBUG("got a moved event"); icon = g_hash_table_lookup(fmanager->priv->icons, file); @@ -2391,7 +2460,7 @@ /* Failed to get position... not supported? */ row = col = 0; } - DBG("row %d, col %d", row, col); + XF_DEBUG("row %d, col %d", row, col); /* Remove the old icon */ xfdesktop_file_icon_manager_remove_icon(fmanager, icon); @@ -2408,13 +2477,13 @@ /* Failed to get position... not supported? */ row = col = 0; } - DBG("row %d, col %d", row, col); + XF_DEBUG("row %d, col %d", row, col); xfdesktop_file_icon_manager_remove_icon(fmanager, moved_icon); } if(xfdesktop_compare_paths(g_file_get_parent(other_file), fmanager->priv->folder)) { - DBG("icon moved off the desktop"); + XF_DEBUG("icon moved off the desktop"); /* Nothing moved, this is actually a delete */ if(file_info) g_object_unref(file_info); @@ -2423,29 +2492,22 @@ } if(file_info) { - gboolean is_hidden; - - - is_hidden = g_file_info_get_attribute_boolean(file_info, - G_FILE_ATTRIBUTE_STANDARD_IS_HIDDEN); - if(!is_hidden) { - /* Add the icon adding the row/col info */ - icon = xfdesktop_file_icon_manager_add_regular_icon(fmanager, - other_file, - file_info, - row, - col, - FALSE); - if(icon) - xfdesktop_file_icon_position_changed(icon, fmanager); - } + /* Add the icon adding the row/col info */ + icon = xfdesktop_file_icon_manager_add_regular_icon(fmanager, + other_file, + file_info, + row, + col, + FALSE); + if(icon) + xfdesktop_file_icon_position_changed(icon, fmanager); g_object_unref(file_info); } break; case G_FILE_MONITOR_EVENT_ATTRIBUTE_CHANGED: case G_FILE_MONITOR_EVENT_CHANGES_DONE_HINT: - DBG("got changed event"); + XF_DEBUG("got changed event"); icon = g_hash_table_lookup(fmanager->priv->icons, file); if(icon) { @@ -2463,7 +2525,7 @@ } break; case G_FILE_MONITOR_EVENT_CREATED: - DBG("got created event"); + XF_DEBUG("got created event"); /* make sure it's not the desktop folder itself */ if(g_file_equal(fmanager->priv->folder, file)) @@ -2480,20 +2542,16 @@ file_info = g_file_query_info(file, XFDESKTOP_FILE_INFO_NAMESPACE, G_FILE_QUERY_INFO_NONE, NULL, NULL); if(file_info) { - gboolean is_hidden = g_file_info_get_attribute_boolean(file_info, - G_FILE_ATTRIBUTE_STANDARD_IS_HIDDEN); - if(!is_hidden) { - xfdesktop_file_icon_manager_add_regular_icon(fmanager, - file, file_info, - -1, -1, - TRUE); - } + xfdesktop_file_icon_manager_add_regular_icon(fmanager, + file, file_info, + -1, -1, + TRUE); g_object_unref(file_info); } break; case G_FILE_MONITOR_EVENT_DELETED: - DBG("got deleted event"); + XF_DEBUG("got deleted event"); filename = g_file_get_path(file); @@ -2527,7 +2585,7 @@ g_hash_table_remove(fmanager->priv->icons, file); } else { if(g_file_equal(file, fmanager->priv->folder)) { - DBG("~/Desktop disappeared!"); + XF_DEBUG("~/Desktop disappeared!"); /* yes, refresh before and after is correct */ xfdesktop_file_icon_manager_refresh_icons(fmanager); xfdesktop_file_icon_manager_check_create_desktop_folder(fmanager->priv->folder); @@ -2594,7 +2652,7 @@ switch(event) { case G_FILE_MONITOR_EVENT_CHANGED: - DBG("metadata file changed event"); + XF_DEBUG("metadata file changed event"); /* cool down timer so we don't call this due to multiple file * changes at the same time. */ @@ -2621,7 +2679,6 @@ XfdesktopFileIconManager *fmanager; GError *error = NULL; GList *files, *l; - gboolean is_hidden; /* Sanity check */ if(user_data == NULL || !XFDESKTOP_IS_FILE_ICON_MANAGER(user_data)) @@ -2681,21 +2738,17 @@ } } else { for(l = files; l; l = l->next) { - DBG("got a GFileInfo: %s", g_file_info_get_display_name(l->data)); - - is_hidden = g_file_info_get_attribute_boolean(l->data, - G_FILE_ATTRIBUTE_STANDARD_IS_HIDDEN); - if(!is_hidden) { - const gchar *name = g_file_info_get_name(l->data); - GFile *file = g_file_get_child(fmanager->priv->folder, name); + const gchar *name = g_file_info_get_name(l->data); + GFile *file = g_file_get_child(fmanager->priv->folder, name); - xfdesktop_file_icon_manager_add_regular_icon(fmanager, - file, l->data, - -1, -1, - TRUE); + XF_DEBUG("got a GFileInfo: %s", g_file_info_get_display_name(l->data)); - g_object_unref(file); - } + xfdesktop_file_icon_manager_add_regular_icon(fmanager, + file, l->data, + -1, -1, + TRUE); + + g_object_unref(file); g_object_unref(l->data); } @@ -3417,8 +3470,8 @@ } } - DBG("finishing drop on desktop from external source: drop_ok=%s, copy_only=%s", - drop_ok?"TRUE":"FALSE", copy_only?"TRUE":"FALSE"); + XF_DEBUG("finishing drop on desktop from external source: drop_ok=%s, copy_only=%s", + drop_ok?"TRUE":"FALSE", copy_only?"TRUE":"FALSE"); gtk_drag_finish(context, drop_ok, !copy_only, time_); } @@ -3590,6 +3643,8 @@ G_OBJECT(fmanager), "show-unknown-volume"); xfconf_g_property_bind(channel, DESKTOP_ICONS_SHOW_THUMBNAILS, G_TYPE_BOOLEAN, G_OBJECT(fmanager), "show-thumbnails"); + xfconf_g_property_bind(channel, DESKTOP_ICONS_SHOW_HIDDEN_FILES, G_TYPE_BOOLEAN, + G_OBJECT(fmanager), "show-hidden-files"); xfconf_g_property_bind(channel, DESKTOP_MENU_MAX_TEMPLATE_FILES, G_TYPE_INT, G_OBJECT(fmanager), "max-templates"); @@ -3695,6 +3750,26 @@ } static void +xfdesktop_file_icon_manager_set_show_hidden_files(XfdesktopFileIconManager *manager, + gboolean show_hidden_files) +{ + g_return_if_fail(XFDESKTOP_IS_FILE_ICON_MANAGER(manager)); + + TRACE("entering show_hidden_files %s", show_hidden_files ? "TRUE" : "FALSE"); + + if(show_hidden_files == manager->priv->show_hidden_files) + return; + + manager->priv->show_hidden_files = show_hidden_files; + + if(!manager->priv->inited) + return; + + /* Emit a signal so the desktop knows to reload the icons */ + g_signal_emit(G_OBJECT(manager), fmanager_signals[HIDDEN_STATE_CHANGED], 0); +} + +static void xfdesktop_file_icon_manager_set_max_templates(XfdesktopFileIconManager *manager, gint max_templates) { diff -Nru xfdesktop4-4.11.6/src/xfdesktop-file-icon-manager.h xfdesktop4-4.19.2/src/xfdesktop-file-icon-manager.h --- xfdesktop4-4.11.6/src/xfdesktop-file-icon-manager.h 2014-02-11 08:35:31.000000000 +0000 +++ xfdesktop4-4.19.2/src/xfdesktop-file-icon-manager.h 2014-08-03 06:05:39.000000000 +0000 @@ -48,6 +48,9 @@ struct _XfdesktopFileIconManagerClass { GObjectClass parent; + + /*< signals >*/ + void (*hidden_state_changed)(XfdesktopFileIconManager *fmanager); }; GType xfdesktop_file_icon_manager_get_type(void) G_GNUC_CONST; @@ -55,6 +58,8 @@ XfdesktopIconViewManager *xfdesktop_file_icon_manager_new(GFile *folder, XfconfChannel *channel); +void xfdesktop_file_icon_save(gpointer user_data); + gboolean xfdesktop_file_icon_manager_get_cached_icon_position( XfdesktopFileIconManager *fmanager, const gchar *name, diff -Nru xfdesktop4-4.11.6/src/xfdesktop-file-utils.c xfdesktop4-4.19.2/src/xfdesktop-file-utils.c --- xfdesktop4-4.11.6/src/xfdesktop-file-utils.c 2014-04-03 13:41:34.000000000 +0000 +++ xfdesktop4-4.19.2/src/xfdesktop-file-utils.c 2014-06-02 06:45:38.000000000 +0000 @@ -781,47 +781,11 @@ } } -#if GLIB_CHECK_VERSION (2, 38, 0) -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); -} -#endif - -#if GLIB_CHECK_VERSION (2, 38, 0) -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); -} -#endif - void xfdesktop_file_utils_unlink_files(GList *files, GdkScreen *screen, GtkWindow *parent) { -#if GLIB_CHECK_VERSION (2, 38, 0) - g_return_if_fail(files != NULL && G_IS_FILE(files->data)); - - g_list_foreach(files, (GFunc)delete_files, NULL); - /* return statement to explicitly show we don't - * want to run any of the fallback code. */ - return; -#else DBusGProxy *fileman_proxy; g_return_if_fail(files != NULL && G_IS_FILE(files->data)); @@ -865,7 +829,6 @@ "be present (such as the one supplied by Thunar)."), GTK_STOCK_CLOSE, GTK_RESPONSE_ACCEPT, NULL); } -#endif } void @@ -873,14 +836,6 @@ GdkScreen *screen, GtkWindow *parent) { -#if GLIB_CHECK_VERSION (2, 38, 0) - g_return_if_fail(files != NULL && G_IS_FILE(files->data)); - - g_list_foreach(files, (GFunc)trash_files, NULL); - /* return statement to explicitly show we don't - * want to run any of the fallback code. */ - return; -#else DBusGProxy *trash_proxy; g_return_if_fail(files != NULL && G_IS_FILE(files->data)); @@ -924,7 +879,6 @@ "be present (such as the one supplied by Thunar)."), GTK_STOCK_CLOSE, GTK_RESPONSE_ACCEPT, NULL); } -#endif } void diff -Nru xfdesktop4-4.11.6/src/xfdesktop-icon-view.c xfdesktop4-4.19.2/src/xfdesktop-icon-view.c --- xfdesktop4-4.11.6/src/xfdesktop-icon-view.c 2014-03-25 17:51:19.000000000 +0000 +++ xfdesktop4-4.19.2/src/xfdesktop-icon-view.c 2014-09-15 05:23:51.000000000 +0000 @@ -233,9 +233,6 @@ gint x, gint y, guint time_); -static void xfdesktop_icon_view_drag_leave(GtkWidget *widget, - GdkDragContext *context, - guint time_); static gboolean xfdesktop_icon_view_drag_drop(GtkWidget *widget, GdkDragContext *context, gint x, @@ -409,7 +406,6 @@ widget_class->expose_event = xfdesktop_icon_view_expose; widget_class->drag_begin = xfdesktop_icon_view_drag_begin; widget_class->drag_motion = xfdesktop_icon_view_drag_motion; - widget_class->drag_leave = xfdesktop_icon_view_drag_leave; widget_class->drag_drop = xfdesktop_icon_view_drag_drop; widget_class->drag_data_get = xfdesktop_icon_view_drag_data_get; widget_class->drag_data_received = xfdesktop_icon_view_drag_data_received; @@ -1401,90 +1397,6 @@ *col = (x - icon_view->priv->xorigin - SCREEN_MARGIN) / CELL_SIZE; } -static inline void -xfdesktop_icon_view_clear_drag_highlight(XfdesktopIconView *icon_view, - GdkDragContext *context) -{ - GdkRectangle *cell_highlight; - - cell_highlight = g_object_get_qdata(G_OBJECT(context), - xfdesktop_cell_highlight_quark); - if(!cell_highlight) - return; - - if(0 == cell_highlight->width || 0 == cell_highlight->height) - return; - - /* When dragging an icon a box is drawn to indicate the cell where the - * icon could be moved to if dropped. We need to clear that box but make - * the length of the lines slightly longer to clear all the pixels */ - /* Left vertical line */ - gtk_widget_queue_draw_area(GTK_WIDGET(icon_view), - cell_highlight->x - 1, - cell_highlight->y - 1, - 2, - cell_highlight->height + 2); - /* Right vertical line */ - gtk_widget_queue_draw_area(GTK_WIDGET(icon_view), - cell_highlight->x + cell_highlight->width - 1, - cell_highlight->y, - 2, - cell_highlight->height + 2); - /* Top horizontal line */ - gtk_widget_queue_draw_area(GTK_WIDGET(icon_view), - cell_highlight->x, - cell_highlight->y - 1, - cell_highlight->width + 2, - 2); - /* Bottom horizontal line */ - gtk_widget_queue_draw_area(GTK_WIDGET(icon_view), - cell_highlight->x, - cell_highlight->y + cell_highlight->height - 1, - cell_highlight->width + 2, - 2); - - cell_highlight->width = cell_highlight->height = 0; -} - -static inline void -xfdesktop_icon_view_draw_drag_highlight(XfdesktopIconView *icon_view, - GdkDragContext *context, - guint16 row, - guint16 col) -{ - GtkWidget *widget = GTK_WIDGET(icon_view); - cairo_t *cr; - GdkRectangle *cell_highlight; - gint newx, newy; - - newx = SCREEN_MARGIN + icon_view->priv->xorigin + col * CELL_SIZE; - newy = SCREEN_MARGIN + icon_view->priv->yorigin + row * CELL_SIZE; - - cell_highlight = g_object_get_qdata(G_OBJECT(context), - xfdesktop_cell_highlight_quark); - - if(cell_highlight) { - if(newx != cell_highlight->x || newy != cell_highlight->y) - xfdesktop_icon_view_clear_drag_highlight(icon_view, context); - } else { - cell_highlight = g_new0(GdkRectangle, 1); - g_object_set_qdata_full(G_OBJECT(context), - xfdesktop_cell_highlight_quark, - cell_highlight, (GDestroyNotify)g_free); - } - - cell_highlight->x = newx; - cell_highlight->y = newy; - cell_highlight->width = cell_highlight->height = CELL_SIZE; - - cr = gdk_cairo_create(GDK_DRAWABLE(gtk_widget_get_window(widget))); - gdk_cairo_set_source_color(cr, >k_widget_get_style(widget)->bg[GTK_STATE_SELECTED]); - cairo_set_line_width(cr, 0.5); - cairo_rectangle(cr, newx, newy, CELL_SIZE, CELL_SIZE); - cairo_stroke(cr); - cairo_destroy(cr); -} - static gboolean xfdesktop_icon_view_drag_motion(GtkWidget *widget, GdkDragContext *context, @@ -1548,7 +1460,6 @@ if(xfdesktop_icon_get_position(sel_icon, &sel_row, &sel_col) && sel_row == hover_row && sel_col == hover_col) { - xfdesktop_icon_view_clear_drag_highlight(icon_view, context); return FALSE; } } @@ -1595,16 +1506,6 @@ return TRUE; } -static void -xfdesktop_icon_view_drag_leave(GtkWidget *widget, - GdkDragContext *context, - guint time_) -{ - xfdesktop_icon_view_clear_drag_highlight(XFDESKTOP_ICON_VIEW(widget), - context); -} - - static gboolean xfdesktop_icon_view_drag_drop(GtkWidget *widget, GdkDragContext *context, @@ -1631,7 +1532,7 @@ if(target == GDK_NONE) return FALSE; } - DBG("target=%ld (%s)", (glong)target, gdk_atom_name(target)); + XF_DEBUG("target=%ld (%s)", (glong)target, gdk_atom_name(target)); xfdesktop_xy_to_rowcol(icon_view, x, y, &row, &col); icon_on_dest = xfdesktop_icon_view_icon_in_cell(icon_view, row, col); @@ -1704,7 +1605,7 @@ xfdesktop_icon_view_invalidate_icon(icon_view, l->data, TRUE); } - DBG("drag succeeded"); + XF_DEBUG("drag succeeded"); gtk_drag_finish(context, TRUE, FALSE, time_); } else { @@ -1778,16 +1679,11 @@ context, data, info); - if(action == 0) - xfdesktop_icon_view_clear_drag_highlight(icon_view, context); - else - xfdesktop_icon_view_draw_drag_highlight(icon_view, context, - icon_view->priv->hover_row, - icon_view->priv->hover_col); gdk_drag_status(context, action, time_); } } +#ifdef ENABLE_FILE_ICONS static gint xfdesktop_icon_view_compare_icons(gconstpointer *a, gconstpointer *b) @@ -1808,7 +1704,9 @@ return g_utf8_collate(a_str, b_str); } +#endif /* ENABLE_FILE_ICONS */ +#ifdef ENABLE_FILE_ICONS static void xfdesktop_icon_view_append_icons(XfdesktopIconView *icon_view, GList *icon_list, @@ -1835,6 +1733,7 @@ xfdesktop_icon_view_invalidate_icon(icon_view, l->data, TRUE); } } +#endif /* ENABLE_FILE_ICONS */ void xfdesktop_icon_view_sort_icons(XfdesktopIconView *icon_view) @@ -1917,13 +1816,13 @@ icon_view->priv->shadow_color->blue ^= 0xffff; } - DBG("label alpha is %d\n", (gint)(icon_view->priv->label_alpha)); - DBG("shadow x offset is %d\n", (gint)(icon_view->priv->shadow_x_offset)); - DBG("shadow y offset is %d\n", (gint)(icon_view->priv->shadow_y_offset)); + XF_DEBUG("label alpha is %d\n", (gint)(icon_view->priv->label_alpha)); + XF_DEBUG("shadow x offset is %d\n", (gint)(icon_view->priv->shadow_x_offset)); + XF_DEBUG("shadow y offset is %d\n", (gint)(icon_view->priv->shadow_y_offset)); #if defined(DEBUG) && (DEBUG > 0) { gchar *color = gdk_color_to_string(icon_view->priv->shadow_color); - DBG("shadow color is %s\n", color); + XF_DEBUG("shadow color is %s\n", color); g_free(color); } #endif @@ -1943,16 +1842,16 @@ icon_view->priv->selected_shadow_color->blue ^= 0xffff; } - DBG("selected label alpha is %d\n", - (gint)(icon_view->priv->selected_label_alpha)); - DBG("selected shadow x offset is %d\n", - (gint)(icon_view->priv->selected_shadow_x_offset)); - DBG("selected shadow y offset is %d\n", - (gint)(icon_view->priv->selected_shadow_y_offset)); + XF_DEBUG("selected label alpha is %d\n", + (gint)(icon_view->priv->selected_label_alpha)); + XF_DEBUG("selected shadow x offset is %d\n", + (gint)(icon_view->priv->selected_shadow_x_offset)); + XF_DEBUG("selected shadow y offset is %d\n", + (gint)(icon_view->priv->selected_shadow_y_offset)); #if defined(DEBUG) && (DEBUG > 0) { gchar *color = gdk_color_to_string(icon_view->priv->selected_shadow_color); - DBG("shadow color is %s\n", color); + XF_DEBUG("shadow color is %s\n", color); g_free(color); } #endif @@ -1966,12 +1865,12 @@ "label-radius", &icon_view->priv->label_radius, NULL); - DBG("cell spacing is %d", icon_view->priv->cell_spacing); - DBG("cell padding is %d", icon_view->priv->cell_padding); - DBG("cell text width proportion is %f", icon_view->priv->cell_text_width_proportion); - DBG("ellipsize icon label is %s", icon_view->priv->ellipsize_icon_labels?"true":"false"); - DBG("tooltip size is %d", icon_view->priv->tooltip_size_from_style); - DBG("label radius is %f", icon_view->priv->label_radius); + XF_DEBUG("cell spacing is %d", icon_view->priv->cell_spacing); + XF_DEBUG("cell padding is %d", icon_view->priv->cell_padding); + XF_DEBUG("cell text width proportion is %f", icon_view->priv->cell_text_width_proportion); + XF_DEBUG("ellipsize icon label is %s", icon_view->priv->ellipsize_icon_labels?"true":"false"); + XF_DEBUG("tooltip size is %d", icon_view->priv->tooltip_size_from_style); + XF_DEBUG("label radius is %f", icon_view->priv->label_radius); if(icon_view->priv->selection_box_color) { gdk_color_free(icon_view->priv->selection_box_color); @@ -2710,8 +2609,8 @@ return; } - DBG("CELL_SIZE=%0.3f, TEXT_WIDTH=%0.3f, ICON_SIZE=%u", CELL_SIZE, TEXT_WIDTH, ICON_SIZE); - DBG("grid size is %dx%d", icon_view->priv->nrows, icon_view->priv->ncols); + XF_DEBUG("CELL_SIZE=%0.3f, TEXT_WIDTH=%0.3f, ICON_SIZE=%u", CELL_SIZE, TEXT_WIDTH, ICON_SIZE); + XF_DEBUG("grid size is %dx%d", icon_view->priv->nrows, icon_view->priv->ncols); if(icon_view->priv->grid_layout) { icon_view->priv->grid_layout = g_realloc(icon_view->priv->grid_layout, @@ -2724,7 +2623,7 @@ } else icon_view->priv->grid_layout = g_malloc0(new_size); - DBG("created grid_layout with %lu positions", (gulong)(new_size/sizeof(gpointer))); + XF_DEBUG("created grid_layout with %lu positions", (gulong)(new_size/sizeof(gpointer))); DUMP_GRID_LAYOUT(icon_view); xfdesktop_icon_view_setup_grids_xinerama(icon_view); @@ -2741,7 +2640,7 @@ if(xevt->type == PropertyNotify && XInternAtom(xevt->display, "_NET_WORKAREA", False) == xevt->atom) { - DBG("got _NET_WORKAREA change on rootwin!"); + XF_DEBUG("got _NET_WORKAREA change on rootwin!"); if(icon_view->priv->grid_resize_timeout) { g_source_remove(icon_view->priv->grid_resize_timeout); icon_view->priv->grid_resize_timeout = 0; @@ -3258,6 +3157,8 @@ if(fmanager == NULL) return; + xfdesktop_file_icon_save(fmanager); + /* add all cached icons back */ for(l = icon_view->priv->pending_icons; l; l = l->next) { gint16 row, col; @@ -3275,8 +3176,8 @@ &row, &col)) { - DBG("icon %s setting position row%dxcol%d", - xfdesktop_icon_peek_label(icon), row, col); + XF_DEBUG("icon %s setting position row%dxcol%d", + xfdesktop_icon_peek_label(icon), row, col); /* Make sure the spot is available */ if(xfdesktop_grid_is_free_position(icon_view, row, col)) { @@ -3317,8 +3218,8 @@ } if(xfdesktop_grid_is_free_position(icon_view, row, col)) { - DBG("adding icon %s position row %d x col %d", - xfdesktop_icon_peek_label(icon), row, col); + XF_DEBUG("adding icon %s position row %d x col %d", + xfdesktop_icon_peek_label(icon), row, col); xfdesktop_icon_view_add_item_internal(icon_view, icon); } else { leftovers = g_list_prepend(leftovers, icon); @@ -3792,11 +3693,11 @@ || !xfdesktop_grid_is_free_position(icon_view, row, col)) { if(xfdesktop_grid_get_next_free_position(icon_view, &row, &col)) { - DBG("old position didn't exist or isn't free, got (%d,%d) instead", - row, col); + XF_DEBUG("old position didn't exist or isn't free, got (%d,%d) instead", + row, col); xfdesktop_icon_set_position(icon, row, col); } else { - DBG("can't fit icon on screen"); + XF_DEBUG("can't fit icon on screen"); return FALSE; } } diff -Nru xfdesktop4-4.11.6/src/xfdesktop-regular-file-icon.c xfdesktop4-4.19.2/src/xfdesktop-regular-file-icon.c --- xfdesktop4-4.11.6/src/xfdesktop-regular-file-icon.c 2014-03-30 07:38:48.000000000 +0000 +++ xfdesktop4-4.19.2/src/xfdesktop-regular-file-icon.c 2014-09-09 16:18:50.000000000 +0000 @@ -263,7 +263,7 @@ g_object_get(regular_file_icon->priv->fmanager, "show-thumbnails", &show_thumbnails, NULL); if(regular_file_icon->priv->show_thumbnails != show_thumbnails) { - DBG("show-thumbnails changed! now: %s", show_thumbnails ? "TRUE" : "FALSE"); + XF_DEBUG("show-thumbnails changed! now: %s", show_thumbnails ? "TRUE" : "FALSE"); regular_file_icon->priv->show_thumbnails = show_thumbnails; xfdesktop_file_icon_invalidate_icon(XFDESKTOP_FILE_ICON(regular_file_icon)); xfdesktop_icon_invalidate_pixbuf(XFDESKTOP_ICON(regular_file_icon)); @@ -364,43 +364,88 @@ static GIcon * xfdesktop_load_icon_from_desktop_file(XfdesktopRegularFileIcon *regular_icon) { - gchar *contents; + gchar *contents, *icon_name; gsize length; GIcon *gicon = NULL; + gchar *p; + GKeyFile *key_file; /* try to load the file into memory */ - if(g_file_load_contents(regular_icon->priv->file, NULL, &contents, &length, - NULL, NULL)) - { - /* allocate a new key file */ - GKeyFile *key_file = g_key_file_new(); + if(!g_file_load_contents(regular_icon->priv->file, NULL, &contents, &length, NULL, NULL)) + return NULL; - /* try to parse the key file from the contents of the file */ - if (g_key_file_load_from_data(key_file, contents, length, 0, NULL)) { - gchar *icon_name; - /* try to determine the custom icon name */ - icon_name = g_key_file_get_string(key_file, - G_KEY_FILE_DESKTOP_GROUP, - G_KEY_FILE_DESKTOP_KEY_ICON, - NULL); - - if(icon_name && g_file_test(icon_name, G_FILE_TEST_IS_REGULAR)) { - /* icon_name is an absolute path, create it as a file icon */ - gicon = g_file_icon_new(g_file_new_for_path(icon_name)); - } else if(icon_name) { - /* otherwise create a themed icon for it */ - gicon = g_themed_icon_new(icon_name); - } + /* allocate a new key file */ + key_file = g_key_file_new(); - if(icon_name) - g_free(icon_name); - } + /* try to parse the key file from the contents of the file */ + if(!g_key_file_load_from_data(key_file, contents, length, 0, NULL)) { + g_free(contents); + return NULL; + } + + /* try to determine the custom icon name */ + icon_name = g_key_file_get_string(key_file, + G_KEY_FILE_DESKTOP_GROUP, + G_KEY_FILE_DESKTOP_KEY_ICON, + NULL); + /* No icon name in the desktop file */ + if(icon_name == NULL) { /* free key file and in-memory data */ g_key_file_free(key_file); g_free(contents); + return NULL; + } + + /* icon_name is an absolute path, create it as a file icon */ + if(g_file_test(icon_name, G_FILE_TEST_IS_REGULAR)) { + gicon = g_file_icon_new(g_file_new_for_path(icon_name)); + } + + /* check if the icon theme includes the icon name as-is */ + if(gicon == NULL) { + if(gtk_icon_theme_has_icon(gtk_icon_theme_get_default(), icon_name)) { + /* load it */ + gicon = g_themed_icon_new(icon_name); + } + } + + /* drop any suffix (e.g. '.png') from themed icons and try to laod that */ + if(gicon == NULL) { + gchar *tmp_name = NULL; + + p = strrchr(icon_name, '.'); + if(p != NULL) + tmp_name = g_strndup(icon_name, p - icon_name); + + /* check if the icon theme includes the icon name */ + if(tmp_name && gtk_icon_theme_has_icon(gtk_icon_theme_get_default(), tmp_name)) { + /* load it */ + gicon = g_themed_icon_new(tmp_name); + } + g_free(tmp_name); + } + + /* maybe it points to a file in the pixmaps folder */ + if(gicon == NULL) { + gchar *filename = g_build_filename("pixmaps", icon_name, NULL); + gchar *tmp_name = NULL; + + if(filename) + tmp_name = xfce_resource_lookup(XFCE_RESOURCE_DATA, filename); + + if(tmp_name) + gicon = g_file_icon_new(g_file_new_for_path(tmp_name)); + + g_free(filename); + g_free(tmp_name); } + /* free key file and in-memory data */ + g_key_file_free(key_file); + g_free(contents); + g_free(icon_name); + return gicon; } @@ -631,7 +676,7 @@ GFile *src_file; gboolean result = FALSE; - DBG("entering"); + TRACE("entering"); g_return_val_if_fail(regular_file_icon && src_file_icon, FALSE); g_return_val_if_fail(xfdesktop_regular_file_icon_get_allowed_drop_actions(icon, NULL) != 0, diff -Nru xfdesktop4-4.11.6/src/xfdesktop-special-file-icon.c xfdesktop4-4.19.2/src/xfdesktop-special-file-icon.c --- xfdesktop4-4.11.6/src/xfdesktop-special-file-icon.c 2014-03-31 17:27:02.000000000 +0000 +++ xfdesktop4-4.19.2/src/xfdesktop-special-file-icon.c 2014-09-08 16:22:50.000000000 +0000 @@ -355,14 +355,14 @@ if(g_file_info_get_attribute_boolean(info, G_FILE_ATTRIBUTE_ACCESS_CAN_WRITE)) { - DBG("can move, copy and link"); + XF_DEBUG("can move, copy and link"); actions = GDK_ACTION_MOVE | GDK_ACTION_COPY | GDK_ACTION_LINK; if(suggested_action) *suggested_action = GDK_ACTION_MOVE; } } } else { - DBG("can move"); + XF_DEBUG("can move"); actions = GDK_ACTION_MOVE; /* everything else is just silly */ if(suggested_action) *suggested_action = GDK_ACTION_MOVE; @@ -386,7 +386,7 @@ GFile *dest_file = NULL; gboolean result = FALSE; - DBG("entering"); + TRACE("entering"); g_return_val_if_fail(special_file_icon && src_file_icon, FALSE); g_return_val_if_fail(xfdesktop_special_file_icon_get_allowed_drop_actions(icon, NULL), @@ -401,7 +401,7 @@ if(special_file_icon->priv->type == XFDESKTOP_SPECIAL_FILE_ICON_TRASH) { GList files; - DBG("doing trash"); + XF_DEBUG("doing trash"); /* fake a file list */ files.data = src_file; @@ -416,15 +416,15 @@ switch(action) { case GDK_ACTION_MOVE: - DBG("doing move"); + XF_DEBUG("doing move"); dest_file = g_object_ref(special_file_icon->priv->file); break; case GDK_ACTION_COPY: - DBG("doing copy"); + XF_DEBUG("doing copy"); dest_file = g_file_get_child(special_file_icon->priv->file, name); break; case GDK_ACTION_LINK: - DBG("doing link"); + XF_DEBUG("doing link"); dest_file = g_object_ref(special_file_icon->priv->file); break; default: diff -Nru xfdesktop4-4.11.6/src/xfdesktop-volume-icon.c xfdesktop4-4.19.2/src/xfdesktop-volume-icon.c --- xfdesktop4-4.11.6/src/xfdesktop-volume-icon.c 2014-03-30 07:38:48.000000000 +0000 +++ xfdesktop4-4.19.2/src/xfdesktop-volume-icon.c 2014-09-08 16:22:50.000000000 +0000 @@ -398,7 +398,7 @@ gboolean result = FALSE; gchar *name; - DBG("entering"); + TRACE("entering"); g_return_val_if_fail(volume_icon && src_file_icon, FALSE); g_return_val_if_fail(xfdesktop_volume_icon_get_allowed_drop_actions(icon, NULL), @@ -424,17 +424,17 @@ switch(action) { case GDK_ACTION_MOVE: - DBG("doing move"); + XF_DEBUG("doing move"); dest_file = g_object_ref(volume_icon->priv->file); break; case GDK_ACTION_COPY: - DBG("doing copy"); + XF_DEBUG("doing copy"); dest_file = g_file_get_child(volume_icon->priv->file, name); break; case GDK_ACTION_LINK: - DBG("doing link"); + XF_DEBUG("doing link"); dest_file = g_object_ref(volume_icon->priv->file); break; @@ -895,7 +895,7 @@ g_return_if_fail(XFDESKTOP_IS_VOLUME_ICON(icon)); - DBG("entering"); + TRACE("entering"); /* just replace the file info here */ if(volume_icon->priv->file_info) @@ -962,7 +962,7 @@ g_return_val_if_fail(XFDESKTOP_IS_VOLUME_ICON(volume_icon), FALSE); - DBG("TIMEOUT"); + XF_DEBUG("TIMEOUT"); /* reset the icon's mount point information */ if(volume_icon->priv->file) { @@ -1004,7 +1004,7 @@ mounted_after = TRUE; } - DBG("MOUNTED BEFORE: %d, MOUNTED AFTER: %d", mounted_before, mounted_after); + XF_DEBUG("MOUNTED BEFORE: %d, MOUNTED AFTER: %d", mounted_before, mounted_after); if(mounted_before != mounted_after) { /* invalidate the tooltip */ @@ -1029,7 +1029,7 @@ volume_icon->priv->changed_timeout_id = 0; return FALSE; } else { - DBG("TRY AGAIN"); + XF_DEBUG("TRY AGAIN"); return TRUE; } } @@ -1042,7 +1042,7 @@ g_return_if_fail(G_IS_VOLUME(volume)); g_return_if_fail(XFDESKTOP_IS_VOLUME_ICON(volume_icon)); - DBG("VOLUME CHANGED"); + XF_DEBUG("VOLUME CHANGED"); /** * NOTE: We use a timeout here to check if the volume is diff -Nru xfdesktop4-4.11.6/src/xfdesktop-window-icon-manager.c xfdesktop4-4.19.2/src/xfdesktop-window-icon-manager.c --- xfdesktop4-4.11.6/src/xfdesktop-window-icon-manager.c 2013-11-02 06:39:46.000000000 +0000 +++ xfdesktop4-4.19.2/src/xfdesktop-window-icon-manager.c 2014-09-08 16:22:50.000000000 +0000 @@ -39,6 +39,7 @@ #include "xfdesktop-window-icon.h" #include "xfdesktop-window-icon-manager.h" #include "xfce-desktop.h" +#include "xfdesktop-common.h" static void xfdesktop_window_icon_manager_set_property(GObject *object, guint property_id, @@ -229,7 +230,7 @@ ws = wnck_screen_get_active_workspace(wmanager->priv->wnck_screen); if(!WNCK_IS_WORKSPACE(ws)) { - DBG("got weird failure of wnck_screen_get_active_workspace(), bailing"); + XF_DEBUG("got weird failure of wnck_screen_get_active_workspace(), bailing"); return; } @@ -285,9 +286,9 @@ sizeof(gpointer) * n_ws); if(ws_num != n_ws - 1) { - g_memmove(wmanager->priv->icon_workspaces + ws_num + 1, - wmanager->priv->icon_workspaces + ws_num, - sizeof(gpointer) * (n_ws - ws_num - 1)); + memmove(wmanager->priv->icon_workspaces + ws_num + 1, + wmanager->priv->icon_workspaces + ws_num, + sizeof(gpointer) * (n_ws - ws_num - 1)); } wmanager->priv->icon_workspaces[ws_num] = g_new0(XfdesktopWindowIconWorkspace, @@ -314,9 +315,9 @@ g_free(wmanager->priv->icon_workspaces[ws_num]); if(ws_num != n_ws) { - g_memmove(wmanager->priv->icon_workspaces + ws_num, - wmanager->priv->icon_workspaces + ws_num + 1, - sizeof(gpointer) * (n_ws - ws_num)); + memmove(wmanager->priv->icon_workspaces + ws_num, + wmanager->priv->icon_workspaces + ws_num + 1, + sizeof(gpointer) * (n_ws - ws_num)); } wmanager->priv->icon_workspaces = g_realloc(wmanager->priv->icon_workspaces, @@ -343,7 +344,7 @@ return; } - DBG("changed_mask indicates an action"); + XF_DEBUG("changed_mask indicates an action"); ws = wnck_window_get_workspace(window); if(ws) @@ -357,7 +358,7 @@ is_add = TRUE; } - DBG("is_add == %s", is_add?"TRUE":"FALSE"); + XF_DEBUG("is_add == %s", is_add?"TRUE":"FALSE"); /* this is a cute way of handling adding/removing from *all* workspaces * when we're dealing with a sticky windows, and just adding/removing @@ -382,7 +383,7 @@ continue; } - DBG("adding to WS %d", i); + XF_DEBUG("adding to WS %d", i); xfdesktop_window_icon_manager_add_icon(wmanager, window, i); } } else { @@ -397,7 +398,7 @@ if(wmanager->priv->icon_workspaces[i]->selected_icon == icon) wmanager->priv->icon_workspaces[i]->selected_icon = NULL; if(i == wmanager->priv->active_ws_num) { - DBG("removing from WS %d", i); + XF_DEBUG("removing from WS %d", i); xfdesktop_icon_view_remove_item(wmanager->priv->icon_view, XFDESKTOP_ICON(icon)); g_hash_table_remove(wmanager->priv->icon_workspaces[i]->icons, diff -Nru xfdesktop4-4.11.6/TODO xfdesktop4-4.19.2/TODO --- xfdesktop4-4.11.6/TODO 2013-11-02 06:39:46.000000000 +0000 +++ xfdesktop4-4.19.2/TODO 2014-09-15 05:44:54.000000000 +0000 @@ -1,16 +1,3 @@ -* move DnD handling to one place. right now there are about four copies of - it and they're mostly the same (and some of them are buggy). need to - preserve semantics where volume icon gets mounted before a file is dropped - on it. -* need a way to determine if the *source* file can be dropped onto another - icon. currently we only check to see if the destination icon can accept - a drop. this is needed to determine if we can trash a particular file, - and also so we don't try to move things like removable volumes. -* default move if file is on same volume, copy otherwise -* "arrange items"/"auto arrange" menu option -* rubber banding * free placement (no grid) -* 'paste' action * better tooltips for volumes and special icons (partially done) -* use thunar's file properties dialog -* progress dialog for copying/moving files +* implement other feature requests that are in bugzilla diff -Nru xfdesktop4-4.11.6/xfdesktop.1 xfdesktop4-4.19.2/xfdesktop.1 --- xfdesktop4-4.11.6/xfdesktop.1 2013-12-12 08:37:04.000000000 +0000 +++ xfdesktop4-4.19.2/xfdesktop.1 2014-08-03 06:01:14.000000000 +0000 @@ -1,4 +1,4 @@ -.TH XFDESKTOP 1 "December 2013" +.TH XFDESKTOP 1 "August 2014" .SH NAME xfdesktop \- The Xfce 4 Desktop Environment's desktop manager @@ -40,7 +40,11 @@ .TP .B \-R, --reload Causes an already-running instance of \fBxfdesktop\fP to reload all its -settings, including loading a new random backdrop if using a backdrop list. +settings and redraws the desktop background. +.TP +.B \-N, --next +Causes an already-running instance of \fBxfdesktop\fP to advance to the +next wallpaper on the current workspace. .TP .B \-M, --menu Causes an already-running instance of \fBxfdesktop\fP to pop up the @@ -56,6 +60,12 @@ .B \-D, --disable-wm-check Do not wait for a window manager on startup .TP +.B \-e, --enable-debug +Enable debug messages +.TP +.B \-d, --disable-debug +Disable debug messages +.TP .B \-Q, --quit Cause \fBxfdesktop\fP to quit .TP @@ -103,6 +113,4 @@ , Brian Tarricone , and Eric Koegel . -This manual page was originally written by Brian Tarricone -.br -. +This manual page was originally written by Brian Tarricone .