diffstat for xfce4-session-4.10.0 xfce4-session-4.10.1 ChangeLog | 285 INSTALL | 8 Makefile.am | 4 Makefile.in | 276 NEWS | 14 aclocal.m4 | 502 - compile | 10 config.guess | 43 config.h.in | 8 config.sub | 75 configure | 441 - configure.ac | 216 configure.in | 217 debian/changelog | 12 debian/control | 6 debian/patches/0001-Handle-multiple-interactive-session-save-bug-5379.patch | 151 debian/patches/series | 1 debian/rules | 3 depcomp | 452 - doc/Makefile.in | 57 engines/Makefile.in | 205 engines/balou/Makefile.in | 222 engines/balou/scripts/Makefile.in | 59 engines/balou/themes/Default/Makefile.in | 58 engines/balou/themes/Makefile.in | 205 engines/mice/Makefile.in | 159 engines/simple/Makefile.in | 158 engines/simple/preview.h | 3198 ++++------ icons/128x128/Makefile.in | 58 icons/48x48/Makefile.in | 58 icons/Makefile.in | 207 icons/scalable/Makefile.in | 58 install-sh | 14 libxfsm/Makefile.am | 2 libxfsm/Makefile.in | 166 missing | 412 - mkinstalldirs | 162 po/ar.po | 606 + po/bg.po | 504 - po/el.po | 118 po/es.po | 52 po/hr.po | 82 po/id.po | 127 po/pl.po | 54 po/sr.po | 1203 +++ po/sv.po | 844 +- po/tr.po | 19 po/ug.po | 927 +- scripts/Makefile.in | 62 settings/Makefile.in | 150 xfce4-session-logout/Makefile.in | 169 xfce4-session-logout/main.c | 10 xfce4-session/Makefile.am | 18 xfce4-session/Makefile.in | 304 xfce4-session/main.c | 6 xfce4-session/sm-layer.c | 2 xfce4-session/xfsm-compat-gnome.c | 50 xfce4-session/xfsm-manager.c | 81 xfce4-session/xfsm-shutdown.c | 41 xfce4-session/xfsm-startup.c | 52 xfce4-session/xfsm-systemd.c | 229 xfce4-session/xfsm-systemd.h | 55 xfsm-shutdown-helper/Makefile.in | 135 63 files changed, 7970 insertions(+), 6112 deletions(-) diff -Nru xfce4-session-4.10.0/ChangeLog xfce4-session-4.10.1/ChangeLog --- xfce4-session-4.10.0/ChangeLog 2012-04-28 20:43:40.000000000 +0000 +++ xfce4-session-4.10.1/ChangeLog 2013-05-05 15:34:06.000000000 +0000 @@ -1,3 +1,288 @@ +commit c0409d7433795e041b701d568e35fdd99068f733 +Author: Nick Schermer +Date: Sun May 5 17:33:53 2013 +0200 + + Updates for release. + +commit ab6be105489d53e0ae4886a06b1cbb0ebf2a8ad3 +Author: Nick Schermer +Date: Fri May 4 20:19:00 2012 +0200 + + Remove xfce environment functions and use glib. + + All the functions are provided by glib, except for + xfce_putenv, which requires splitting the value + for g_setenv. + + (cherry picked from commit 54002463867cdd01d5639e6a44f3bc74cd50f9ff) + +commit a9da851bffd32a604e703472857c4206d9479347 +Author: Nick Schermer +Date: Sun Nov 4 21:23:36 2012 +0100 + + Add shutdown/reboot functionality for systemd (bug #8729). + + Based on patch by Christian Hesse and Evangelos Foutras. + + (cherry picked from commit ae28aef315a7a6b90f1649ce6d1f30b842791cbf) + +commit 51e19f01cb5d8f432f58f03a785c703f9afbf9e0 +Author: Nick Schermer +Date: Sun Jul 22 11:44:49 2012 +0200 + + Fix logic of the --fast action (bug #8857). + + (cherry picked from commit 499a719019e03da90b6901bb0f8a89d06ae167ee) + +commit 53f4835ff550e72e45268f0437e213c35ba8ea77 +Author: Jérôme Guelfucci +Date: Sat Aug 18 13:36:09 2012 +0200 + + Bump copyright year. + + (cherry picked from commit ac943f6da13178bfc06e9917c02d85302be3bdb7) + +commit 3ed422cb352b65bc7c4ff6d68b1ed89bd278464f +Author: Nick Schermer +Date: Fri Apr 26 20:05:10 2013 +0200 + + Store the watch function id to avoid possible double free (bug #9709). + + (cherry picked from commit ab391138cacc62ab184a338e237c4430356b41f9) + +commit 801e7ee5458a0037cb6a7a548eeec73a74330db4 +Author: Nick Schermer +Date: Fri Apr 26 19:46:29 2013 +0200 + + Use the async spawn function of glib. + + (cherry picked from commit dee0200fa5dc4de064f288281ddd13199ba7fcde) + +commit 22d083fc8dd6f49a230625c1758a654d2f138f08 +Author: Nick Schermer +Date: Sun Jan 6 12:20:26 2013 +0100 + + Autotools updates. + + (cherry picked from commit 6a1e12ffe71c2807e6d889b1520821afdb663320) + +commit b9726ea92ced234666c147d9da1fb106632297d3 +Author: Ardjuna +Date: Sat Mar 23 16:04:14 2013 +0100 + + l10n: Updated Indonesian (id) translation to 100% + + New status: 208 messages complete with 0 fuzzies and 0 untranslated. + + Transmitted-via: Transifex (translations.xfce.org). + +commit 1b3c9fcd59285ba92cbd6fb9bd9431bf0864f30f +Author: larsson +Date: Sun Mar 17 21:45:49 2013 +0100 + + l10n: Updated Swedish (sv) translation to 94% + + New status: 196 messages complete with 4 fuzzies and 8 untranslated. + + Transmitted-via: Transifex (translations.xfce.org). + +commit f4031fdab4cb4611fccc8e7af4ce7869e692131a +Author: Adolfo Jayme Barrientos +Date: Sat Mar 2 22:37:13 2013 +0100 + + l10n: Updated Spanish (Castilian) (es) translation to 100% + + New status: 208 messages complete with 0 fuzzies and 0 untranslated. + + Transmitted-via: Transifex (translations.xfce.org). + +commit e3540e64ff12ed562ce5fdecd2da093460d0a828 +Author: Kiril Kirilov +Date: Thu Jan 31 21:56:11 2013 +0100 + + l10n: Updated Bulgarian (bg) translation to 100% + + New status: 208 messages complete with 0 fuzzies and 0 untranslated. + + Transmitted-via: Transifex (translations.xfce.org). + +commit 4648296012b450d551994d3c1a344c846b79c19e +Author: Ivica Kolić +Date: Mon Dec 3 23:36:10 2012 +0100 + + l10n: Updated Croatian (hr) translation to 100% + + New status: 208 messages complete with 0 fuzzies and 0 untranslated. + + Transmitted-via: Transifex (translations.xfce.org). + +commit 6cb3937aa9cf0c9905a77d0bc2b5be8cc2536e44 +Author: Dimitar Zhekov +Date: Thu Aug 30 22:52:14 2012 +0200 + + Handle multiple interactive session save (bug #5379). + + Additionnaly, we now use SmSaveGlobal on log out / shutdown without + session save which avoids data loss. Previously clients would not save + anything on log out without session save. + + Based on original work by Chris Bainbridge (chris.bainbridge@gmail.com). + +commit e4adcaf8a0321c39b59db4b6d2dbd20e77804e5d +Author: محمد الحرقان +Date: Wed Nov 7 04:45:48 2012 +0100 + + l10n: Updated Arabic (ar) translation to 100% + + New status: 208 messages complete with 0 fuzzies and 0 untranslated. + + Transmitted-via: Transifex (translations.xfce.org). + +commit 58d7b787c736887681d7963a8914c3b278dc6bbb +Author: Gheyret Kenji +Date: Wed Oct 24 05:50:58 2012 +0200 + + l10n: Updated Uyghur (ug) translation to 100% + + New status: 208 messages complete with 0 fuzzies and 0 untranslated. + + Transmitted-via: Transifex (translations.xfce.org). + +commit ffe7c1dc2255d91504ae3084b377d931991f422b +Author: Gheyret Kenji +Date: Wed Oct 24 04:51:54 2012 +0200 + + l10n: Updated Uyghur (ug) translation to 100% + + New status: 208 messages complete with 0 fuzzies and 0 untranslated. + + Transmitted-via: Transifex (translations.xfce.org). + +commit d12140c0c3cf933270a67289a04ce3f797d5472f +Author: Marcin Romańczuk +Date: Sun Oct 7 11:38:34 2012 +0200 + + l10n: Updated Polish (pl) translation to 100% + + New status: 208 messages complete with 0 fuzzies and 0 untranslated. + + Transmitted-via: Transifex (translations.xfce.org). + +commit 59130e6d6312cce75310d265ff5e2babfd11b73a +Author: Georgios Stefanakis +Date: Sat Oct 6 21:41:59 2012 +0200 + + l10n: Updated Greek (el) translation to 100% + + New status: 208 messages complete with 0 fuzzies and 0 untranslated. + + Transmitted-via: Transifex (translations.xfce.org). + +commit 829be8c993c0df73cfba8ba2aa62cec1768415b3 +Author: Marcin Romańczuk +Date: Sat Oct 6 18:52:59 2012 +0200 + + l10n: Updated Polish (pl) translation to 99% + + New status: 207 messages complete with 0 fuzzies and 1 untranslated. + + Transmitted-via: Transifex (translations.xfce.org). + +commit 7fadf4e6fac68b9f5bfe6d903dc409d47be2a779 +Author: Gheyret Kenji +Date: Wed Aug 1 08:28:21 2012 +0200 + + l10n: Updated Uyghur (ug) translation to 100% + + New status: 208 messages complete with 0 fuzzies and 0 untranslated. + + Transmitted-via: Transifex (translations.xfce.org). + +commit f29e75633ce53c7fff5c39468368b3f4d3c91795 +Author: Gheyret Kenji +Date: Fri Jul 27 08:25:28 2012 +0200 + + l10n: Updated Uyghur (ug) translation to 100% + + New status: 208 messages complete with 0 fuzzies and 0 untranslated. + + Transmitted-via: Transifex (translations.xfce.org). + +commit 76d28c478dc1f2caed7298f034dded16c1ec37e9 +Author: Gheyret Kenji +Date: Fri Jul 27 08:19:23 2012 +0200 + + l10n: Updated Uyghur (ug) translation to 99% + + New status: 207 messages complete with 0 fuzzies and 1 untranslated. + + Transmitted-via: Transifex (translations.xfce.org). + +commit 2757b8cda880dfd1cf4b43419f9accf3b521991e +Author: Gheyret Kenji +Date: Mon Jul 16 08:06:15 2012 +0200 + + l10n: Updated Uyghur (ug) translation to 99% + + New status: 206 messages complete with 0 fuzzies and 2 untranslated. + + Transmitted-via: Transifex (translations.xfce.org). + +commit ea0c23287004de2cdc7f368cf5c72f49c9a4b684 +Author: Gheyret Kenji +Date: Thu Jul 12 07:51:58 2012 +0200 + + l10n: Updated Uyghur (ug) translation to 87% + + New status: 182 messages complete with 0 fuzzies and 26 untranslated. + + Transmitted-via: Transifex (translations.xfce.org). + +commit 05b9995f60443a45cfee9001fea89c3212fe3fc3 +Author: Мирослав Николић +Date: Sun Jun 10 08:24:20 2012 +0200 + + l10n: New Serbian translation, author salepetronije + + New status: 208 messages complete with 0 fuzzies and 0 untranslated. + + Transmitted-via: Transifex (translations.xfce.org). + +commit c9595661727f520da82f98270847f976b994e80b +Author: necdetyucel +Date: Sun May 6 15:26:58 2012 +0200 + + l10n: Updated Turkish (tr) translation to 100% + + New status: 208 messages complete with 0 fuzzies and 0 untranslated. + + Transmitted-via: Transifex (translations.xfce.org). + +commit 1f0daa856adb5a4a7376a241a265565adb351bfc +Author: Alper Tekinalp +Date: Sun May 6 13:42:37 2012 +0200 + + l10n: Updated Turkish (tr) translation to 99% + + New status: 206 messages complete with 1 fuzzy and 1 untranslated. + + Transmitted-via: Transifex (translations.xfce.org). + +commit 7a75a8a0f7089b716e702e6bb0cf13fc3194e3db +Author: Nick Schermer +Date: Sun Apr 29 13:35:37 2012 +0200 + + Remove gnome-keyring remains. + + Not required anymore. gnome_keyring_daemon_prepare_environment_sync + is a stub function that does nothing. + +commit 7ad718fdfcac3fdedd7d11ffe3bda33a29d73277 +Author: Nick Schermer +Date: Sat Apr 28 22:45:39 2012 +0200 + + Post release tag bump. + commit 3692e7675b7d4a9894eaa2d7d6dba33927a6b7eb Author: Nick Schermer Date: Sat Apr 28 22:43:23 2012 +0200 diff -Nru xfce4-session-4.10.0/INSTALL xfce4-session-4.10.1/INSTALL --- xfce4-session-4.10.0/INSTALL 2012-04-28 20:43:34.000000000 +0000 +++ xfce4-session-4.10.1/INSTALL 2013-05-05 15:33:59.000000000 +0000 @@ -1,7 +1,7 @@ Installation Instructions ************************* -Copyright (C) 1994-1996, 1999-2002, 2004-2011 Free Software Foundation, +Copyright (C) 1994-1996, 1999-2002, 2004-2012 Free Software Foundation, Inc. Copying and distribution of this file, with or without modification, @@ -309,9 +309,10 @@ overridden in the site shell script). Unfortunately, this technique does not work for `CONFIG_SHELL' due to -an Autoconf bug. Until the bug is fixed you can use this workaround: +an Autoconf limitation. Until the limitation is lifted, you can use +this workaround: - CONFIG_SHELL=/bin/bash /bin/bash ./configure CONFIG_SHELL=/bin/bash + CONFIG_SHELL=/bin/bash ./configure CONFIG_SHELL=/bin/bash `configure' Invocation ====================== @@ -367,4 +368,3 @@ `configure' also accepts some other, not widely useful, options. Run `configure --help' for more details. - diff -Nru xfce4-session-4.10.0/Makefile.am xfce4-session-4.10.1/Makefile.am --- xfce4-session-4.10.0/Makefile.am 2012-04-28 20:43:27.000000000 +0000 +++ xfce4-session-4.10.1/Makefile.am 2013-05-05 15:33:55.000000000 +0000 @@ -32,10 +32,6 @@ intltool-update \ $(desktop_DATA) -AUTOMAKE_OPTIONS = \ - 1.8 \ - dist-bzip2 - distclean-local: rm -rf *.cache *~ diff -Nru xfce4-session-4.10.0/Makefile.in xfce4-session-4.10.1/Makefile.in --- xfce4-session-4.10.0/Makefile.in 2012-04-28 20:43:34.000000000 +0000 +++ xfce4-session-4.10.1/Makefile.in 2013-05-05 15:33:59.000000000 +0000 @@ -1,9 +1,8 @@ -# Makefile.in generated by automake 1.11.5 from Makefile.am. +# Makefile.in generated by automake 1.13.1 from Makefile.am. # @configure_input@ -# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software -# Foundation, Inc. +# Copyright (C) 1994-2012 Free Software Foundation, Inc. + # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -52,36 +51,43 @@ build_triplet = @build@ host_triplet = @host@ subdir = . -DIST_COMMON = README $(am__configure_deps) $(srcdir)/Makefile.am \ - $(srcdir)/Makefile.in $(srcdir)/config.h.in \ - $(top_srcdir)/configure AUTHORS COPYING ChangeLog INSTALL NEWS \ - TODO compile config.guess config.sub depcomp install-sh \ - ltmain.sh missing mkinstalldirs +DIST_COMMON = INSTALL NEWS README AUTHORS ChangeLog \ + $(srcdir)/Makefile.in $(srcdir)/Makefile.am \ + $(top_srcdir)/configure $(am__configure_deps) \ + $(srcdir)/config.h.in COPYING TODO compile config.guess \ + config.sub install-sh missing ltmain.sh ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -am__aclocal_m4_deps = $(top_srcdir)/configure.in +am__aclocal_m4_deps = $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) am__CONFIG_DISTCLEAN_FILES = config.status config.cache config.log \ configure.lineno config.status.lineno -mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs +mkinstalldirs = $(install_sh) -d CONFIG_HEADER = config.h CONFIG_CLEAN_FILES = CONFIG_CLEAN_VPATH_FILES = +AM_V_P = $(am__v_P_@AM_V@) +am__v_P_ = $(am__v_P_@AM_DEFAULT_V@) +am__v_P_0 = false +am__v_P_1 = : AM_V_GEN = $(am__v_GEN_@AM_V@) am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) -am__v_GEN_0 = @echo " GEN " $@; +am__v_GEN_0 = @echo " GEN " $@; +am__v_GEN_1 = AM_V_at = $(am__v_at_@AM_V@) am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) am__v_at_0 = @ +am__v_at_1 = SOURCES = DIST_SOURCES = -RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \ - html-recursive info-recursive install-data-recursive \ - install-dvi-recursive install-exec-recursive \ - install-html-recursive install-info-recursive \ - install-pdf-recursive install-ps-recursive install-recursive \ - installcheck-recursive installdirs-recursive pdf-recursive \ - ps-recursive uninstall-recursive +RECURSIVE_TARGETS = all-recursive check-recursive cscopelist-recursive \ + ctags-recursive dvi-recursive html-recursive info-recursive \ + install-data-recursive install-dvi-recursive \ + install-exec-recursive install-html-recursive \ + install-info-recursive install-pdf-recursive \ + install-ps-recursive install-recursive installcheck-recursive \ + installdirs-recursive pdf-recursive ps-recursive \ + tags-recursive uninstall-recursive am__can_run_installinfo = \ case $$AM_UPDATE_INFO_DIR in \ n|no|NO) false;; \ @@ -118,11 +124,33 @@ DATA = $(desktop_DATA) RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive \ distclean-recursive maintainer-clean-recursive -AM_RECURSIVE_TARGETS = $(RECURSIVE_TARGETS:-recursive=) \ - $(RECURSIVE_CLEAN_TARGETS:-recursive=) tags TAGS ctags CTAGS \ - distdir dist dist-all distcheck +am__recursive_targets = \ + $(RECURSIVE_TARGETS) \ + $(RECURSIVE_CLEAN_TARGETS) \ + $(am__extra_recursive_targets) +AM_RECURSIVE_TARGETS = $(am__recursive_targets:-recursive=) TAGS CTAGS \ + cscope distdir dist dist-all distcheck +am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) \ + $(LISP)config.h.in +# Read a list of newline-separated strings from the standard input, +# and print each of them once, without duplicates. Input order is +# *not* preserved. +am__uniquify_input = $(AWK) '\ + BEGIN { nonempty = 0; } \ + { items[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in items) print i; }; } \ +' +# Make sure the list of sources is unique. This is necessary because, +# e.g., the same source file might be shared among _SOURCES variables +# for different programs/libraries. +am__define_uniq_tagged_files = \ + list='$(am__tagged_files)'; \ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | $(am__uniquify_input)` ETAGS = etags CTAGS = ctags +CSCOPE = cscope DIST_SUBDIRS = $(SUBDIRS) DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) distdir = $(PACKAGE)-$(VERSION) @@ -133,6 +161,7 @@ && rm -rf "$(distdir)" \ || { sleep 5 && rm -rf "$(distdir)"; }; \ else :; fi +am__post_remove_distdir = $(am__remove_distdir) am__relativize = \ dir0=`pwd`; \ sed_first='s,^\([^/]*\)/.*$$,\1,'; \ @@ -158,8 +187,9 @@ dir1=`echo "$$dir1" | sed -e "$$sed_rest"`; \ done; \ reldir="$$dir2" -DIST_ARCHIVES = $(distdir).tar.gz $(distdir).tar.bz2 GZIP_ENV = --best +DIST_ARCHIVES = $(distdir).tar.bz2 +DIST_TARGETS = dist-bzip2 am__distuninstallcheck_listfiles = $(distuninstallcheck_listfiles) \ | sed 's|^\./|$(prefix)/|' | grep -v '$(infodir)/dir$$' distcleancheck_listfiles = find . -type f -print @@ -207,10 +237,6 @@ GMODULE_VERSION = @GMODULE_VERSION@ GMOFILES = @GMOFILES@ GMSGFMT = @GMSGFMT@ -GNOME_KEYRING_CFLAGS = @GNOME_KEYRING_CFLAGS@ -GNOME_KEYRING_LIBS = @GNOME_KEYRING_LIBS@ -GNOME_KEYRING_REQUIRED_VERSION = @GNOME_KEYRING_REQUIRED_VERSION@ -GNOME_KEYRING_VERSION = @GNOME_KEYRING_VERSION@ GREP = @GREP@ GTK_CFLAGS = @GTK_CFLAGS@ GTK_LIBS = @GTK_LIBS@ @@ -295,6 +321,10 @@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ STRIP = @STRIP@ +SYSTEMD_CFLAGS = @SYSTEMD_CFLAGS@ +SYSTEMD_LIBS = @SYSTEMD_LIBS@ +SYSTEMD_REQUIRED_VERSION = @SYSTEMD_REQUIRED_VERSION@ +SYSTEMD_VERSION = @SYSTEMD_VERSION@ USE_NLS = @USE_NLS@ VERSION = @VERSION@ XFCE_GLADE_CATALOG_PATH = @XFCE_GLADE_CATALOG_PATH@ @@ -398,10 +428,6 @@ intltool-update \ $(desktop_DATA) -AUTOMAKE_OPTIONS = \ - 1.8 \ - dist-bzip2 - DISTCHECK_CONFIGURE_FLAGS = \ --with-xsession-prefix=/tmp/$(PACKAGE)-distcheck @@ -490,12 +516,12 @@ dir='$(DESTDIR)$(desktopdir)'; $(am__uninstall_files_from_dir) # This directory's subdirectories are mostly independent; you can cd -# into them and run `make' without going through this Makefile. -# To change the values of `make' variables: instead of editing Makefiles, -# (1) if the variable is set in `config.status', edit `config.status' -# (which will cause the Makefiles to be regenerated when you run `make'); -# (2) otherwise, pass the desired values on the `make' command line. -$(RECURSIVE_TARGETS): +# into them and run 'make' without going through this Makefile. +# To change the values of 'make' variables: instead of editing Makefiles, +# (1) if the variable is set in 'config.status', edit 'config.status' +# (which will cause the Makefiles to be regenerated when you run 'make'); +# (2) otherwise, pass the desired values on the 'make' command line. +$(am__recursive_targets): @fail= failcom='exit 1'; \ for f in x $$MAKEFLAGS; do \ case $$f in \ @@ -505,7 +531,11 @@ done; \ dot_seen=no; \ target=`echo $@ | sed s/-recursive//`; \ - list='$(SUBDIRS)'; for subdir in $$list; do \ + case "$@" in \ + distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \ + *) list='$(SUBDIRS)' ;; \ + esac; \ + for subdir in $$list; do \ echo "Making $$target in $$subdir"; \ if test "$$subdir" = "."; then \ dot_seen=yes; \ @@ -520,57 +550,12 @@ $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \ fi; test -z "$$fail" -$(RECURSIVE_CLEAN_TARGETS): - @fail= failcom='exit 1'; \ - for f in x $$MAKEFLAGS; do \ - case $$f in \ - *=* | --[!k]*);; \ - *k*) failcom='fail=yes';; \ - esac; \ - done; \ - dot_seen=no; \ - case "$@" in \ - distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \ - *) list='$(SUBDIRS)' ;; \ - esac; \ - rev=''; for subdir in $$list; do \ - if test "$$subdir" = "."; then :; else \ - rev="$$subdir $$rev"; \ - fi; \ - done; \ - rev="$$rev ."; \ - target=`echo $@ | sed s/-recursive//`; \ - for subdir in $$rev; do \ - echo "Making $$target in $$subdir"; \ - if test "$$subdir" = "."; then \ - local_target="$$target-am"; \ - else \ - local_target="$$target"; \ - fi; \ - ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \ - || eval $$failcom; \ - done && test -z "$$fail" -tags-recursive: - list='$(SUBDIRS)'; for subdir in $$list; do \ - test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \ - done -ctags-recursive: - list='$(SUBDIRS)'; for subdir in $$list; do \ - test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \ - done - -ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ - mkid -fID $$unique -tags: TAGS +ID: $(am__tagged_files) + $(am__define_uniq_tagged_files); mkid -fID $$unique +tags: tags-recursive +TAGS: tags -TAGS: tags-recursive $(HEADERS) $(SOURCES) config.h.in $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) +tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) set x; \ here=`pwd`; \ if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \ @@ -586,12 +571,7 @@ set "$$@" "$$include_option=$$here/$$subdir/TAGS"; \ fi; \ done; \ - list='$(SOURCES) $(HEADERS) config.h.in $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ + $(am__define_uniq_tagged_files); \ shift; \ if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \ test -n "$$unique" || unique=$$empty_fix; \ @@ -603,15 +583,11 @@ $$unique; \ fi; \ fi -ctags: CTAGS -CTAGS: ctags-recursive $(HEADERS) $(SOURCES) config.h.in $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) - list='$(SOURCES) $(HEADERS) config.h.in $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ +ctags: ctags-recursive + +CTAGS: ctags +ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) + $(am__define_uniq_tagged_files); \ test -z "$(CTAGS_ARGS)$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ $$unique @@ -620,9 +596,31 @@ here=`$(am__cd) $(top_builddir) && pwd` \ && $(am__cd) $(top_srcdir) \ && gtags -i $(GTAGS_ARGS) "$$here" +cscope: cscope.files + test ! -s cscope.files \ + || $(CSCOPE) -b -q $(AM_CSCOPEFLAGS) $(CSCOPEFLAGS) -i cscope.files $(CSCOPE_ARGS) +clean-cscope: + -rm -f cscope.files +cscope.files: clean-cscope cscopelist +cscopelist: cscopelist-recursive + +cscopelist-am: $(am__tagged_files) + list='$(am__tagged_files)'; \ + case "$(srcdir)" in \ + [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \ + *) sdir=$(subdir)/$(srcdir) ;; \ + esac; \ + for i in $$list; do \ + if test -f "$$i"; then \ + echo "$(subdir)/$$i"; \ + else \ + echo "$$sdir/$$i"; \ + fi; \ + done >> $(top_builddir)/cscope.files distclean-tags: -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags + -rm -f cscope.out cscope.in.out cscope.po.out cscope.files distdir: $(DISTFILES) $(am__remove_distdir) @@ -693,40 +691,35 @@ || chmod -R a+r "$(distdir)" dist-gzip: distdir tardir=$(distdir) && $(am__tar) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).tar.gz - $(am__remove_distdir) + $(am__post_remove_distdir) dist-bzip2: distdir tardir=$(distdir) && $(am__tar) | BZIP2=$${BZIP2--9} bzip2 -c >$(distdir).tar.bz2 - $(am__remove_distdir) + $(am__post_remove_distdir) dist-lzip: distdir tardir=$(distdir) && $(am__tar) | lzip -c $${LZIP_OPT--9} >$(distdir).tar.lz - $(am__remove_distdir) - -dist-lzma: distdir - tardir=$(distdir) && $(am__tar) | lzma -9 -c >$(distdir).tar.lzma - $(am__remove_distdir) + $(am__post_remove_distdir) dist-xz: distdir tardir=$(distdir) && $(am__tar) | XZ_OPT=$${XZ_OPT--e} xz -c >$(distdir).tar.xz - $(am__remove_distdir) + $(am__post_remove_distdir) dist-tarZ: distdir tardir=$(distdir) && $(am__tar) | compress -c >$(distdir).tar.Z - $(am__remove_distdir) + $(am__post_remove_distdir) dist-shar: distdir shar $(distdir) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).shar.gz - $(am__remove_distdir) + $(am__post_remove_distdir) dist-zip: distdir -rm -f $(distdir).zip zip -rq $(distdir).zip $(distdir) - $(am__remove_distdir) + $(am__post_remove_distdir) -dist dist-all: distdir - tardir=$(distdir) && $(am__tar) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).tar.gz - tardir=$(distdir) && $(am__tar) | BZIP2=$${BZIP2--9} bzip2 -c >$(distdir).tar.bz2 - $(am__remove_distdir) +dist dist-all: + $(MAKE) $(AM_MAKEFLAGS) $(DIST_TARGETS) am__post_remove_distdir='@:' + $(am__post_remove_distdir) # This target untars the dist file and tries a VPATH configuration. Then # it guarantees that the distribution is self-contained by making another @@ -737,8 +730,6 @@ GZIP=$(GZIP_ENV) gzip -dc $(distdir).tar.gz | $(am__untar) ;;\ *.tar.bz2*) \ bzip2 -dc $(distdir).tar.bz2 | $(am__untar) ;;\ - *.tar.lzma*) \ - lzma -dc $(distdir).tar.lzma | $(am__untar) ;;\ *.tar.lz*) \ lzip -dc $(distdir).tar.lz | $(am__untar) ;;\ *.tar.xz*) \ @@ -750,9 +741,9 @@ *.zip*) \ unzip $(distdir).zip ;;\ esac - chmod -R a-w $(distdir); chmod a+w $(distdir) - mkdir $(distdir)/_build - mkdir $(distdir)/_inst + chmod -R a-w $(distdir) + chmod u+w $(distdir) + mkdir $(distdir)/_build $(distdir)/_inst chmod a-w $(distdir) test -d $(distdir)/_build || exit 0; \ dc_install_base=`$(am__cd) $(distdir)/_inst && pwd | sed -e 's,^[^:\\/]:[\\/],/,'` \ @@ -784,7 +775,7 @@ && $(MAKE) $(AM_MAKEFLAGS) distcleancheck \ && cd "$$am__cwd" \ || exit 1 - $(am__remove_distdir) + $(am__post_remove_distdir) @(echo "$(distdir) archives ready for distribution: "; \ list='$(DIST_ARCHIVES)'; for i in $$list; do echo $$i; done) | \ sed -e 1h -e 1s/./=/g -e 1p -e 1x -e '$$p' -e '$$x' @@ -923,26 +914,25 @@ uninstall-am: uninstall-desktopDATA -.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) all \ - ctags-recursive install-am install-strip tags-recursive +.MAKE: $(am__recursive_targets) all install-am install-strip -.PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \ - all all-am am--refresh check check-am clean clean-generic \ - clean-libtool ctags ctags-recursive dist dist-all dist-bzip2 \ - dist-gzip dist-hook dist-lzip dist-lzma dist-shar dist-tarZ \ - dist-xz dist-zip distcheck distclean distclean-generic \ - distclean-hdr distclean-libtool distclean-local distclean-tags \ - distcleancheck distdir distuninstallcheck dvi dvi-am html \ - html-am info info-am install install-am install-data \ - install-data-am install-desktopDATA install-dvi install-dvi-am \ - install-exec install-exec-am install-html install-html-am \ - install-info install-info-am install-man install-pdf \ - install-pdf-am install-ps install-ps-am install-strip \ - installcheck installcheck-am installdirs installdirs-am \ - maintainer-clean maintainer-clean-generic mostlyclean \ - mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ - tags tags-recursive uninstall uninstall-am \ - uninstall-desktopDATA +.PHONY: $(am__recursive_targets) CTAGS GTAGS TAGS all all-am \ + am--refresh check check-am clean clean-cscope clean-generic \ + clean-libtool cscope cscopelist-am ctags ctags-am dist \ + dist-all dist-bzip2 dist-gzip dist-hook dist-lzip dist-shar \ + dist-tarZ dist-xz dist-zip distcheck distclean \ + distclean-generic distclean-hdr distclean-libtool \ + distclean-local distclean-tags distcleancheck distdir \ + distuninstallcheck dvi dvi-am html html-am info info-am \ + install install-am install-data install-data-am \ + install-desktopDATA install-dvi install-dvi-am install-exec \ + install-exec-am install-html install-html-am install-info \ + install-info-am install-man install-pdf install-pdf-am \ + install-ps install-ps-am install-strip installcheck \ + installcheck-am installdirs installdirs-am maintainer-clean \ + maintainer-clean-generic mostlyclean mostlyclean-generic \ + mostlyclean-libtool pdf pdf-am ps ps-am tags tags-am uninstall \ + uninstall-am uninstall-desktopDATA @INTLTOOL_DESKTOP_RULE@ diff -Nru xfce4-session-4.10.0/NEWS xfce4-session-4.10.1/NEWS --- xfce4-session-4.10.0/NEWS 2012-04-28 20:43:27.000000000 +0000 +++ xfce4-session-4.10.1/NEWS 2013-05-05 15:33:55.000000000 +0000 @@ -1,3 +1,17 @@ +4.10.1 +====== +- Remove xfce environment functions and use glib. +- Add shutdown/reboot functionality for systemd (bug #8729). +- Fix logic of the --fast action (bug #8857). +- Bump copyright year. +- Store the watch function id to avoid possible double free (bug #9709). +- Use the async spawn function of glib. +- Autotools updates. +- Remove gnome-keyring remains. +- Handle multiple interactive session save (bug #5379). +- Translation updates: Arabic, Bulgarian, Greek, Spanish (Castilian), + Croatian, Indonesian, Polish, Serbian, Swedish, Turkish, Uyghur. + 4.10.0 ====== - Remove remaining code to shutdown gconf. diff -Nru xfce4-session-4.10.0/aclocal.m4 xfce4-session-4.10.1/aclocal.m4 --- xfce4-session-4.10.0/aclocal.m4 2012-04-28 20:43:31.000000000 +0000 +++ xfce4-session-4.10.1/aclocal.m4 2013-05-05 15:33:57.000000000 +0000 @@ -1,8 +1,7 @@ -# generated automatically by aclocal 1.11.5 -*- Autoconf -*- +# generated automatically by aclocal 1.13.1 -*- Autoconf -*- + +# Copyright (C) 1996-2012 Free Software Foundation, Inc. -# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, -# 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software Foundation, -# Inc. # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -12,13 +11,14 @@ # even the implied warranty of MERCHANTABILITY or FITNESS FOR A # PARTICULAR PURPOSE. +m4_ifndef([AC_CONFIG_MACRO_DIRS], [m4_defun([_AM_CONFIG_MACRO_DIRS], [])m4_defun([AC_CONFIG_MACRO_DIRS], [_AM_CONFIG_MACRO_DIRS($@)])]) m4_ifndef([AC_AUTOCONF_VERSION], [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl m4_if(m4_defn([AC_AUTOCONF_VERSION]), [2.69],, [m4_warning([this file was generated for autoconf 2.69. You have another version of autoconf. It may work, but is not guaranteed to. If you have problems, you may need to regenerate the build system entirely. -To do so, use the procedure documented by the package, typically `autoreconf'.])]) +To do so, use the procedure documented by the package, typically 'autoreconf'.])]) # Copyright (C) 1995-2002 Free Software Foundation, Inc. # Copyright (C) 2001-2003,2004 Red Hat, Inc. @@ -9260,7 +9260,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-2010 Free Software Foundation, +dnl Copyright (C) 1995-2003, 2005-2006, 2008-2013 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, @@ -9452,25 +9452,77 @@ fi[]dnl ])# PKG_CHECK_MODULES -# Copyright (C) 2002, 2003, 2005, 2006, 2007, 2008, 2011 Free Software -# Foundation, Inc. + +# PKG_INSTALLDIR(DIRECTORY) +# ------------------------- +# Substitutes the variable pkgconfigdir as the location where a module +# should install pkg-config .pc files. By default the directory is +# $libdir/pkgconfig, but the default can be changed by passing +# DIRECTORY. The user can override through the --with-pkgconfigdir +# parameter. +AC_DEFUN([PKG_INSTALLDIR], +[m4_pushdef([pkg_default], [m4_default([$1], ['${libdir}/pkgconfig'])]) +m4_pushdef([pkg_description], + [pkg-config installation directory @<:@]pkg_default[@:>@]) +AC_ARG_WITH([pkgconfigdir], + [AS_HELP_STRING([--with-pkgconfigdir], pkg_description)],, + [with_pkgconfigdir=]pkg_default) +AC_SUBST([pkgconfigdir], [$with_pkgconfigdir]) +m4_popdef([pkg_default]) +m4_popdef([pkg_description]) +]) dnl PKG_INSTALLDIR + + +# PKG_NOARCH_INSTALLDIR(DIRECTORY) +# ------------------------- +# Substitutes the variable noarch_pkgconfigdir as the location where a +# module should install arch-independent pkg-config .pc files. By +# default the directory is $datadir/pkgconfig, but the default can be +# changed by passing DIRECTORY. The user can override through the +# --with-noarch-pkgconfigdir parameter. +AC_DEFUN([PKG_NOARCH_INSTALLDIR], +[m4_pushdef([pkg_default], [m4_default([$1], ['${datadir}/pkgconfig'])]) +m4_pushdef([pkg_description], + [pkg-config arch-independent installation directory @<:@]pkg_default[@:>@]) +AC_ARG_WITH([noarch-pkgconfigdir], + [AS_HELP_STRING([--with-noarch-pkgconfigdir], pkg_description)],, + [with_noarch_pkgconfigdir=]pkg_default) +AC_SUBST([noarch_pkgconfigdir], [$with_noarch_pkgconfigdir]) +m4_popdef([pkg_default]) +m4_popdef([pkg_description]) +]) dnl PKG_NOARCH_INSTALLDIR + + +# PKG_CHECK_VAR(VARIABLE, MODULE, CONFIG-VARIABLE, +# [ACTION-IF-FOUND], [ACTION-IF-NOT-FOUND]) +# ------------------------------------------- +# Retrieves the value of the pkg-config variable for the given module. +AC_DEFUN([PKG_CHECK_VAR], +[AC_REQUIRE([PKG_PROG_PKG_CONFIG])dnl +AC_ARG_VAR([$1], [value of $3 for $2, overriding pkg-config])dnl + +_PKG_CONFIG([$1], [variable="][$3]["], [$2]) +AS_VAR_COPY([$1], [pkg_cv_][$1]) + +AS_VAR_IF([$1], [""], [$5], [$4])dnl +])# PKG_CHECK_VAR + +# Copyright (C) 2002-2013 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. -# serial 1 - # AM_AUTOMAKE_VERSION(VERSION) # ---------------------------- # Automake X.Y traces this macro to ensure aclocal.m4 has been # generated from the m4 files accompanying Automake X.Y. # (This private macro should not be called outside this file.) AC_DEFUN([AM_AUTOMAKE_VERSION], -[am__api_version='1.11' +[am__api_version='1.13' dnl Some users find AM_AUTOMAKE_VERSION and mistake it for a way to dnl require some minimum version. Point them to the right macro. -m4_if([$1], [1.11.5], [], +m4_if([$1], [1.13.1], [], [AC_FATAL([Do not call $0, use AM_INIT_AUTOMAKE([$1]).])])dnl ]) @@ -9486,24 +9538,22 @@ # Call AM_AUTOMAKE_VERSION and AM_AUTOMAKE_VERSION so they can be traced. # This function is AC_REQUIREd by AM_INIT_AUTOMAKE. AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION], -[AM_AUTOMAKE_VERSION([1.11.5])dnl +[AM_AUTOMAKE_VERSION([1.13.1])dnl m4_ifndef([AC_AUTOCONF_VERSION], [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl _AM_AUTOCONF_VERSION(m4_defn([AC_AUTOCONF_VERSION]))]) # AM_AUX_DIR_EXPAND -*- Autoconf -*- -# Copyright (C) 2001, 2003, 2005, 2011 Free Software Foundation, Inc. +# Copyright (C) 2001-2013 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. -# serial 1 - # For projects using AC_CONFIG_AUX_DIR([foo]), Autoconf sets -# $ac_aux_dir to `$srcdir/foo'. In other projects, it is set to -# `$srcdir', `$srcdir/..', or `$srcdir/../..'. +# $ac_aux_dir to '$srcdir/foo'. In other projects, it is set to +# '$srcdir', '$srcdir/..', or '$srcdir/../..'. # # Of course, Automake must honor this variable whenever it calls a # tool from the auxiliary directory. The problem is that $srcdir (and @@ -9522,7 +9572,7 @@ # # The reason of the latter failure is that $top_srcdir and $ac_aux_dir # are both prefixed by $srcdir. In an in-source build this is usually -# harmless because $srcdir is `.', but things will broke when you +# harmless because $srcdir is '.', but things will broke when you # start a VPATH build or use an absolute $srcdir. # # So we could use something similar to $top_srcdir/$ac_aux_dir/missing, @@ -9548,22 +9598,19 @@ # AM_CONDITIONAL -*- Autoconf -*- -# Copyright (C) 1997, 2000, 2001, 2003, 2004, 2005, 2006, 2008 -# Free Software Foundation, Inc. +# Copyright (C) 1997-2013 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. -# serial 9 - # AM_CONDITIONAL(NAME, SHELL-CONDITION) # ------------------------------------- # Define a conditional. AC_DEFUN([AM_CONDITIONAL], -[AC_PREREQ(2.52)dnl - ifelse([$1], [TRUE], [AC_FATAL([$0: invalid condition: $1])], - [$1], [FALSE], [AC_FATAL([$0: invalid condition: $1])])dnl +[AC_PREREQ([2.52])dnl + m4_if([$1], [TRUE], [AC_FATAL([$0: invalid condition: $1])], + [$1], [FALSE], [AC_FATAL([$0: invalid condition: $1])])dnl AC_SUBST([$1_TRUE])dnl AC_SUBST([$1_FALSE])dnl _AM_SUBST_NOTMAKE([$1_TRUE])dnl @@ -9582,16 +9629,14 @@ Usually this means the macro was only invoked conditionally.]]) fi])]) -# Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2009, -# 2010, 2011 Free Software Foundation, Inc. +# Copyright (C) 1999-2013 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. -# serial 12 -# There are a few dirty hacks below to avoid letting `AC_PROG_CC' be +# There are a few dirty hacks below to avoid letting 'AC_PROG_CC' be # written in clear, in which case automake, when reading aclocal.m4, # will think it sees a *use*, and therefore will trigger all it's # C support machinery. Also note that it means that autoscan, seeing @@ -9601,7 +9646,7 @@ # _AM_DEPENDENCIES(NAME) # ---------------------- # See how the compiler implements dependency checking. -# NAME is "CC", "CXX", "GCJ", or "OBJC". +# NAME is "CC", "CXX", "OBJC", "OBJCXX", "UPC", or "GJC". # We try a few techniques and use that to set a single cache variable. # # We don't AC_REQUIRE the corresponding AC_PROG_CC since the latter was @@ -9614,12 +9659,13 @@ AC_REQUIRE([AM_MAKE_INCLUDE])dnl AC_REQUIRE([AM_DEP_TRACK])dnl -ifelse([$1], CC, [depcc="$CC" am_compiler_list=], - [$1], CXX, [depcc="$CXX" am_compiler_list=], - [$1], OBJC, [depcc="$OBJC" am_compiler_list='gcc3 gcc'], - [$1], UPC, [depcc="$UPC" am_compiler_list=], - [$1], GCJ, [depcc="$GCJ" am_compiler_list='gcc3 gcc'], - [depcc="$$1" am_compiler_list=]) +m4_if([$1], [CC], [depcc="$CC" am_compiler_list=], + [$1], [CXX], [depcc="$CXX" am_compiler_list=], + [$1], [OBJC], [depcc="$OBJC" am_compiler_list='gcc3 gcc'], + [$1], [OBJCXX], [depcc="$OBJCXX" am_compiler_list='gcc3 gcc'], + [$1], [UPC], [depcc="$UPC" am_compiler_list=], + [$1], [GCJ], [depcc="$GCJ" am_compiler_list='gcc3 gcc'], + [depcc="$$1" am_compiler_list=]) AC_CACHE_CHECK([dependency style of $depcc], [am_cv_$1_dependencies_compiler_type], @@ -9627,8 +9673,8 @@ # We make a subdir and do the tests there. Otherwise we can end up # making bogus files that we don't know about and never remove. For # instance it was reported that on HP-UX the gcc test will end up - # making a dummy file named `D' -- because `-MD' means `put the output - # in D'. + # making a dummy file named 'D' -- because '-MD' means "put the output + # in D". rm -rf conftest.dir mkdir conftest.dir # Copy depcomp to subdir because otherwise we won't find it if we're @@ -9668,16 +9714,16 @@ : > sub/conftest.c for i in 1 2 3 4 5 6; do echo '#include "conftst'$i'.h"' >> sub/conftest.c - # Using `: > sub/conftst$i.h' creates only sub/conftst1.h with - # Solaris 8's {/usr,}/bin/sh. - touch sub/conftst$i.h + # Using ": > sub/conftst$i.h" creates only sub/conftst1.h with + # Solaris 10 /bin/sh. + echo '/* dummy */' > sub/conftst$i.h done echo "${am__include} ${am__quote}sub/conftest.Po${am__quote}" > confmf - # We check with `-c' and `-o' for the sake of the "dashmstdout" + # We check with '-c' and '-o' for the sake of the "dashmstdout" # mode. It turns out that the SunPro C++ compiler does not properly - # handle `-M -o', and we need to detect this. Also, some Intel - # versions had trouble with output in subdirs + # handle '-M -o', and we need to detect this. Also, some Intel + # versions had trouble with output in subdirs. am__obj=sub/conftest.${OBJEXT-o} am__minus_obj="-o $am__obj" case $depmode in @@ -9686,8 +9732,8 @@ test "$am__universal" = false || continue ;; nosideeffect) - # after this tag, mechanisms are not by side-effect, so they'll - # only be used when explicitly requested + # After this tag, mechanisms are not by side-effect, so they'll + # only be used when explicitly requested. if test "x$enable_dependency_tracking" = xyes; then continue else @@ -9695,7 +9741,7 @@ fi ;; msvc7 | msvc7msys | msvisualcpp | msvcmsys) - # This compiler won't grok `-c -o', but also, the minuso test has + # This compiler won't grok '-c -o', but also, the minuso test has # not run yet. These depmodes are late enough in the game, and # so weak that their functioning should not be impacted. am__obj=conftest.${OBJEXT-o} @@ -9743,7 +9789,7 @@ # AM_SET_DEPDIR # ------------- # Choose a directory name for dependency files. -# This macro is AC_REQUIREd in _AM_DEPENDENCIES +# This macro is AC_REQUIREd in _AM_DEPENDENCIES. AC_DEFUN([AM_SET_DEPDIR], [AC_REQUIRE([AM_SET_LEADING_DOT])dnl AC_SUBST([DEPDIR], ["${am__leading_dot}deps"])dnl @@ -9753,9 +9799,13 @@ # AM_DEP_TRACK # ------------ AC_DEFUN([AM_DEP_TRACK], -[AC_ARG_ENABLE(dependency-tracking, -[ --disable-dependency-tracking speeds up one-time build - --enable-dependency-tracking do not reject slow dependency extractors]) +[AC_ARG_ENABLE([dependency-tracking], [dnl +AS_HELP_STRING( + [--enable-dependency-tracking], + [do not reject slow dependency extractors]) +AS_HELP_STRING( + [--disable-dependency-tracking], + [speeds up one-time build])]) if test "x$enable_dependency_tracking" != xno; then am_depcomp="$ac_aux_dir/depcomp" AMDEPBACKSLASH='\' @@ -9770,20 +9820,18 @@ # Generate code to set up dependency tracking. -*- Autoconf -*- -# Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2008 -# Free Software Foundation, Inc. +# Copyright (C) 1999-2013 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. -#serial 5 # _AM_OUTPUT_DEPENDENCY_COMMANDS # ------------------------------ AC_DEFUN([_AM_OUTPUT_DEPENDENCY_COMMANDS], [{ - # Autoconf 2.62 quotes --file arguments for eval, but not when files + # Older Autoconf quotes --file arguments for eval, but not when files # are listed without --file. Let's play safe and only enable the eval # if we detect the quoting. case $CONFIG_FILES in @@ -9796,7 +9844,7 @@ # Strip MF so we end up with the name of the file. mf=`echo "$mf" | sed -e 's/:.*$//'` # Check whether this is an Automake generated Makefile or not. - # We used to match only the files named `Makefile.in', but + # We used to match only the files named 'Makefile.in', but # some people rename them; so instead we look at the file content. # Grep'ing the first line is not enough: some people post-process # each Makefile.in and add a new line on top of each file to say so. @@ -9808,21 +9856,19 @@ continue fi # Extract the definition of DEPDIR, am__include, and am__quote - # from the Makefile without running `make'. + # from the Makefile without running 'make'. DEPDIR=`sed -n 's/^DEPDIR = //p' < "$mf"` test -z "$DEPDIR" && continue am__include=`sed -n 's/^am__include = //p' < "$mf"` test -z "am__include" && continue am__quote=`sed -n 's/^am__quote = //p' < "$mf"` - # When using ansi2knr, U may be empty or an underscore; expand it - U=`sed -n 's/^U = //p' < "$mf"` # Find all dependency output files, they are included files with # $(DEPDIR) in their names. We invoke sed twice because it is the # simplest approach to changing $(DEPDIR) to its actual value in the # expansion. for file in `sed -n " s/^$am__include $am__quote\(.*(DEPDIR).*\)$am__quote"'$/\1/p' <"$mf" | \ - sed -e 's/\$(DEPDIR)/'"$DEPDIR"'/g' -e 's/\$U/'"$U"'/g'`; do + sed -e 's/\$(DEPDIR)/'"$DEPDIR"'/g'`; do # Make sure the directory exists. test -f "$dirpart/$file" && continue fdir=`AS_DIRNAME(["$file"])` @@ -9840,7 +9886,7 @@ # This macro should only be invoked once -- use via AC_REQUIRE. # # This code is only required when automatic dependency tracking -# is enabled. FIXME. This creates each `.P' file that we will +# is enabled. FIXME. This creates each '.P' file that we will # need in order to bootstrap the dependency handling code. AC_DEFUN([AM_OUTPUT_DEPENDENCY_COMMANDS], [AC_CONFIG_COMMANDS([depfiles], @@ -9848,29 +9894,14 @@ [AMDEP_TRUE="$AMDEP_TRUE" ac_aux_dir="$ac_aux_dir"]) ]) -# Copyright (C) 1996, 1997, 2000, 2001, 2003, 2005 -# Free Software Foundation, Inc. -# -# This file is free software; the Free Software Foundation -# gives unlimited permission to copy and/or distribute it, -# with or without modifications, as long as this notice is preserved. - -# serial 8 - -# AM_CONFIG_HEADER is obsolete. It has been replaced by AC_CONFIG_HEADERS. -AU_DEFUN([AM_CONFIG_HEADER], [AC_CONFIG_HEADERS($@)]) - # Do all the work for Automake. -*- Autoconf -*- -# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, -# 2005, 2006, 2008, 2009 Free Software Foundation, Inc. +# Copyright (C) 1996-2013 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. -# serial 16 - # This macro actually does too much. Some checks are only needed if # your package does certain things. But this isn't really a big deal. @@ -9886,7 +9917,7 @@ # arguments mandatory, and then we can depend on a new Autoconf # release and drop the old call support. AC_DEFUN([AM_INIT_AUTOMAKE], -[AC_PREREQ([2.62])dnl +[AC_PREREQ([2.65])dnl dnl Autoconf wants to disallow AM_ names. We explicitly allow dnl the ones we care about. m4_pattern_allow([^AM_[A-Z]+FLAGS$])dnl @@ -9915,31 +9946,40 @@ # Define the identity of the package. dnl Distinguish between old-style and new-style calls. m4_ifval([$2], -[m4_ifval([$3], [_AM_SET_OPTION([no-define])])dnl +[AC_DIAGNOSE([obsolete], + [$0: two- and three-arguments forms are deprecated.]) +m4_ifval([$3], [_AM_SET_OPTION([no-define])])dnl AC_SUBST([PACKAGE], [$1])dnl AC_SUBST([VERSION], [$2])], [_AM_SET_OPTIONS([$1])dnl dnl Diagnose old-style AC_INIT with new-style AM_AUTOMAKE_INIT. -m4_if(m4_ifdef([AC_PACKAGE_NAME], 1)m4_ifdef([AC_PACKAGE_VERSION], 1), 11,, +m4_if( + m4_ifdef([AC_PACKAGE_NAME], [ok]):m4_ifdef([AC_PACKAGE_VERSION], [ok]), + [ok:ok],, [m4_fatal([AC_INIT should be called with package and version arguments])])dnl AC_SUBST([PACKAGE], ['AC_PACKAGE_TARNAME'])dnl AC_SUBST([VERSION], ['AC_PACKAGE_VERSION'])])dnl _AM_IF_OPTION([no-define],, -[AC_DEFINE_UNQUOTED(PACKAGE, "$PACKAGE", [Name of package]) - AC_DEFINE_UNQUOTED(VERSION, "$VERSION", [Version number of package])])dnl +[AC_DEFINE_UNQUOTED([PACKAGE], ["$PACKAGE"], [Name of package]) + AC_DEFINE_UNQUOTED([VERSION], ["$VERSION"], [Version number of package])])dnl # Some tools Automake needs. AC_REQUIRE([AM_SANITY_CHECK])dnl AC_REQUIRE([AC_ARG_PROGRAM])dnl -AM_MISSING_PROG(ACLOCAL, aclocal-${am__api_version}) -AM_MISSING_PROG(AUTOCONF, autoconf) -AM_MISSING_PROG(AUTOMAKE, automake-${am__api_version}) -AM_MISSING_PROG(AUTOHEADER, autoheader) -AM_MISSING_PROG(MAKEINFO, makeinfo) +AM_MISSING_PROG([ACLOCAL], [aclocal-${am__api_version}]) +AM_MISSING_PROG([AUTOCONF], [autoconf]) +AM_MISSING_PROG([AUTOMAKE], [automake-${am__api_version}]) +AM_MISSING_PROG([AUTOHEADER], [autoheader]) +AM_MISSING_PROG([MAKEINFO], [makeinfo]) AC_REQUIRE([AM_PROG_INSTALL_SH])dnl AC_REQUIRE([AM_PROG_INSTALL_STRIP])dnl -AC_REQUIRE([AM_PROG_MKDIR_P])dnl +AC_REQUIRE([AC_PROG_MKDIR_P])dnl +# For better backward compatibility. To be removed once Automake 1.9.x +# dies out for good. For more background, see: +# +# +AC_SUBST([mkdir_p], ['$(MKDIR_P)']) # We need awk for the "check" target. The system "awk" is bad on # some platforms. AC_REQUIRE([AC_PROG_AWK])dnl @@ -9950,28 +9990,32 @@ [_AM_PROG_TAR([v7])])]) _AM_IF_OPTION([no-dependencies],, [AC_PROVIDE_IFELSE([AC_PROG_CC], - [_AM_DEPENDENCIES(CC)], - [define([AC_PROG_CC], - defn([AC_PROG_CC])[_AM_DEPENDENCIES(CC)])])dnl + [_AM_DEPENDENCIES([CC])], + [m4_define([AC_PROG_CC], + m4_defn([AC_PROG_CC])[_AM_DEPENDENCIES([CC])])])dnl AC_PROVIDE_IFELSE([AC_PROG_CXX], - [_AM_DEPENDENCIES(CXX)], - [define([AC_PROG_CXX], - defn([AC_PROG_CXX])[_AM_DEPENDENCIES(CXX)])])dnl + [_AM_DEPENDENCIES([CXX])], + [m4_define([AC_PROG_CXX], + m4_defn([AC_PROG_CXX])[_AM_DEPENDENCIES([CXX])])])dnl AC_PROVIDE_IFELSE([AC_PROG_OBJC], - [_AM_DEPENDENCIES(OBJC)], - [define([AC_PROG_OBJC], - defn([AC_PROG_OBJC])[_AM_DEPENDENCIES(OBJC)])])dnl -]) -_AM_IF_OPTION([silent-rules], [AC_REQUIRE([AM_SILENT_RULES])])dnl -dnl The `parallel-tests' driver may need to know about EXEEXT, so add the -dnl `am__EXEEXT' conditional if _AM_COMPILER_EXEEXT was seen. This macro -dnl is hooked onto _AC_COMPILER_EXEEXT early, see below. + [_AM_DEPENDENCIES([OBJC])], + [m4_define([AC_PROG_OBJC], + m4_defn([AC_PROG_OBJC])[_AM_DEPENDENCIES([OBJC])])])dnl +AC_PROVIDE_IFELSE([AC_PROG_OBJCXX], + [_AM_DEPENDENCIES([OBJCXX])], + [m4_define([AC_PROG_OBJCXX], + m4_defn([AC_PROG_OBJCXX])[_AM_DEPENDENCIES([OBJCXX])])])dnl +]) +AC_REQUIRE([AM_SILENT_RULES])dnl +dnl The testsuite driver may need to know about EXEEXT, so add the +dnl 'am__EXEEXT' conditional if _AM_COMPILER_EXEEXT was seen. This +dnl macro is hooked onto _AC_COMPILER_EXEEXT early, see below. AC_CONFIG_COMMANDS_PRE(dnl [m4_provide_if([_AM_COMPILER_EXEEXT], [AM_CONDITIONAL([am__EXEEXT], [test -n "$EXEEXT"])])])dnl ]) -dnl Hook into `_AC_COMPILER_EXEEXT' early to learn its expansion. Do not +dnl Hook into '_AC_COMPILER_EXEEXT' early to learn its expansion. Do not dnl add the conditional right here, as _AC_COMPILER_EXEEXT may be further dnl mangled by Autoconf and run in a shell conditional statement. m4_define([_AC_COMPILER_EXEEXT], @@ -9999,15 +10043,12 @@ done echo "timestamp for $_am_arg" >`AS_DIRNAME(["$_am_arg"])`/stamp-h[]$_am_stamp_count]) -# Copyright (C) 2001, 2003, 2005, 2008, 2011 Free Software Foundation, -# Inc. +# Copyright (C) 2001-2013 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. -# serial 1 - # AM_PROG_INSTALL_SH # ------------------ # Define $install_sh. @@ -10021,16 +10062,14 @@ install_sh="\${SHELL} $am_aux_dir/install-sh" esac fi -AC_SUBST(install_sh)]) +AC_SUBST([install_sh])]) -# Copyright (C) 2003, 2005 Free Software Foundation, Inc. +# Copyright (C) 2003-2013 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. -# serial 2 - # Check whether the underlying file-system supports filenames # with a leading dot. For instance MS-DOS doesn't. AC_DEFUN([AM_SET_LEADING_DOT], @@ -10047,20 +10086,17 @@ # Add --enable-maintainer-mode option to configure. -*- Autoconf -*- # From Jim Meyering -# Copyright (C) 1996, 1998, 2000, 2001, 2002, 2003, 2004, 2005, 2008, -# 2011 Free Software Foundation, Inc. +# Copyright (C) 1996-2013 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. -# serial 5 - # AM_MAINTAINER_MODE([DEFAULT-MODE]) # ---------------------------------- # Control maintainer-specific portions of Makefiles. -# Default is to disable them, unless `enable' is passed literally. -# For symmetry, `disable' may be passed as well. Anyway, the user +# Default is to disable them, unless 'enable' is passed literally. +# For symmetry, 'disable' may be passed as well. Anyway, the user # can override the default with the --enable/--disable switch. AC_DEFUN([AM_MAINTAINER_MODE], [m4_case(m4_default([$1], [disable]), @@ -10071,10 +10107,11 @@ AC_MSG_CHECKING([whether to enable maintainer-specific portions of Makefiles]) dnl maintainer-mode's default is 'disable' unless 'enable' is passed AC_ARG_ENABLE([maintainer-mode], -[ --][am_maintainer_other][-maintainer-mode am_maintainer_other make rules and dependencies not useful - (and sometimes confusing) to the casual installer], - [USE_MAINTAINER_MODE=$enableval], - [USE_MAINTAINER_MODE=]m4_if(am_maintainer_other, [enable], [no], [yes])) + [AS_HELP_STRING([--]am_maintainer_other[-maintainer-mode], + am_maintainer_other[ make rules and dependencies not useful + (and sometimes confusing) to the casual installer])], + [USE_MAINTAINER_MODE=$enableval], + [USE_MAINTAINER_MODE=]m4_if(am_maintainer_other, [enable], [no], [yes])) AC_MSG_RESULT([$USE_MAINTAINER_MODE]) AM_CONDITIONAL([MAINTAINER_MODE], [test $USE_MAINTAINER_MODE = yes]) MAINT=$MAINTAINER_MODE_TRUE @@ -10082,18 +10119,14 @@ ] ) -AU_DEFUN([jm_MAINTAINER_MODE], [AM_MAINTAINER_MODE]) - # Check to see how 'make' treats includes. -*- Autoconf -*- -# Copyright (C) 2001, 2002, 2003, 2005, 2009 Free Software Foundation, Inc. +# Copyright (C) 2001-2013 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. -# serial 4 - # AM_MAKE_INCLUDE() # ----------------- # Check to see how make treats includes. @@ -10111,7 +10144,7 @@ _am_result=none # First try GNU make style include. echo "include confinc" > confmf -# Ignore all kinds of additional output from `make'. +# Ignore all kinds of additional output from 'make'. case `$am_make -s -f confmf 2> /dev/null` in #( *the\ am__doit\ target*) am__include=include @@ -10136,15 +10169,12 @@ rm -f confinc confmf ]) -# Copyright (C) 1999, 2000, 2001, 2003, 2004, 2005, 2008 -# Free Software Foundation, Inc. +# Copyright (C) 1999-2013 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. -# serial 6 - # AM_PROG_CC_C_O # -------------- # Like AC_PROG_CC_C_O, but changed for automake. @@ -10173,15 +10203,12 @@ # Fake the existence of programs that GNU maintainers use. -*- Autoconf -*- -# Copyright (C) 1997, 1999, 2000, 2001, 2003, 2004, 2005, 2008 -# Free Software Foundation, Inc. +# Copyright (C) 1997-2013 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. -# serial 6 - # AM_MISSING_PROG(NAME, PROGRAM) # ------------------------------ AC_DEFUN([AM_MISSING_PROG], @@ -10189,11 +10216,10 @@ $1=${$1-"${am_missing_run}$2"} AC_SUBST($1)]) - # AM_MISSING_HAS_RUN # ------------------ -# Define MISSING if not defined so far and test if it supports --run. -# If it does, set am_missing_run to use it, otherwise, to nothing. +# Define MISSING if not defined so far and test if it is modern enough. +# If it is, set am_missing_run to use it, otherwise, to nothing. AC_DEFUN([AM_MISSING_HAS_RUN], [AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl AC_REQUIRE_AUX_FILE([missing])dnl @@ -10206,54 +10232,22 @@ esac fi # Use eval to expand $SHELL -if eval "$MISSING --run true"; then - am_missing_run="$MISSING --run " +if eval "$MISSING --is-lightweight"; then + am_missing_run="$MISSING " else am_missing_run= - AC_MSG_WARN([`missing' script is too old or missing]) + AC_MSG_WARN(['missing' script is too old or missing]) fi ]) -# Copyright (C) 2003, 2004, 2005, 2006, 2011 Free Software Foundation, -# Inc. -# -# This file is free software; the Free Software Foundation -# gives unlimited permission to copy and/or distribute it, -# with or without modifications, as long as this notice is preserved. - -# serial 1 - -# AM_PROG_MKDIR_P -# --------------- -# Check for `mkdir -p'. -AC_DEFUN([AM_PROG_MKDIR_P], -[AC_PREREQ([2.60])dnl -AC_REQUIRE([AC_PROG_MKDIR_P])dnl -dnl Automake 1.8 to 1.9.6 used to define mkdir_p. We now use MKDIR_P, -dnl while keeping a definition of mkdir_p for backward compatibility. -dnl @MKDIR_P@ is magic: AC_OUTPUT adjusts its value for each Makefile. -dnl However we cannot define mkdir_p as $(MKDIR_P) for the sake of -dnl Makefile.ins that do not define MKDIR_P, so we do our own -dnl adjustment using top_builddir (which is defined more often than -dnl MKDIR_P). -AC_SUBST([mkdir_p], ["$MKDIR_P"])dnl -case $mkdir_p in - [[\\/$]]* | ?:[[\\/]]*) ;; - */*) mkdir_p="\$(top_builddir)/$mkdir_p" ;; -esac -]) - # Helper functions for option handling. -*- Autoconf -*- -# Copyright (C) 2001, 2002, 2003, 2005, 2008, 2010 Free Software -# Foundation, Inc. +# Copyright (C) 2001-2013 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. -# serial 5 - # _AM_MANGLE_OPTION(NAME) # ----------------------- AC_DEFUN([_AM_MANGLE_OPTION], @@ -10263,7 +10257,7 @@ # -------------------- # Set option NAME. Presently that only means defining a flag for this option. AC_DEFUN([_AM_SET_OPTION], -[m4_define(_AM_MANGLE_OPTION([$1]), 1)]) +[m4_define(_AM_MANGLE_OPTION([$1]), [1])]) # _AM_SET_OPTIONS(OPTIONS) # ------------------------ @@ -10277,24 +10271,35 @@ AC_DEFUN([_AM_IF_OPTION], [m4_ifset(_AM_MANGLE_OPTION([$1]), [$2], [$3])]) +# Copyright (C) 2001-2013 Free Software Foundation, Inc. +# +# This file is free software; the Free Software Foundation +# gives unlimited permission to copy and/or distribute it, +# with or without modifications, as long as this notice is preserved. + +# AM_RUN_LOG(COMMAND) +# ------------------- +# Run COMMAND, save the exit status in ac_status, and log it. +# (This has been adapted from Autoconf's _AC_RUN_LOG macro.) +AC_DEFUN([AM_RUN_LOG], +[{ echo "$as_me:$LINENO: $1" >&AS_MESSAGE_LOG_FD + ($1) >&AS_MESSAGE_LOG_FD 2>&AS_MESSAGE_LOG_FD + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&AS_MESSAGE_LOG_FD + (exit $ac_status); }]) + # Check to make sure that the build environment is sane. -*- Autoconf -*- -# Copyright (C) 1996, 1997, 2000, 2001, 2003, 2005, 2008 -# Free Software Foundation, Inc. +# Copyright (C) 1996-2013 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. -# serial 5 - # AM_SANITY_CHECK # --------------- AC_DEFUN([AM_SANITY_CHECK], [AC_MSG_CHECKING([whether build environment is sane]) -# Just in case -sleep 1 -echo timestamp > conftest.file # Reject unsafe characters in $srcdir or the absolute working directory # name. Accept space and tab only in the latter. am_lf=' @@ -10305,32 +10310,40 @@ esac case $srcdir in *[[\\\"\#\$\&\'\`$am_lf\ \ ]]*) - AC_MSG_ERROR([unsafe srcdir value: `$srcdir']);; + AC_MSG_ERROR([unsafe srcdir value: '$srcdir']);; esac -# Do `set' in a subshell so we don't clobber the current shell's +# Do 'set' in a subshell so we don't clobber the current shell's # arguments. Must try -L first in case configure is actually a # symlink; some systems play weird games with the mod time of symlinks # (eg FreeBSD returns the mod time of the symlink's containing # directory). if ( - set X `ls -Lt "$srcdir/configure" conftest.file 2> /dev/null` - if test "$[*]" = "X"; then - # -L didn't work. - set X `ls -t "$srcdir/configure" conftest.file` - fi - rm -f conftest.file - if test "$[*]" != "X $srcdir/configure conftest.file" \ - && test "$[*]" != "X conftest.file $srcdir/configure"; then - - # If neither matched, then we have a broken ls. This can happen - # if, for instance, CONFIG_SHELL is bash and it inherits a - # broken ls alias from the environment. This has actually - # happened. Such a system could not be considered "sane". - AC_MSG_ERROR([ls -t appears to fail. Make sure there is not a broken -alias in your environment]) - fi + am_has_slept=no + for am_try in 1 2; do + echo "timestamp, slept: $am_has_slept" > conftest.file + set X `ls -Lt "$srcdir/configure" conftest.file 2> /dev/null` + if test "$[*]" = "X"; then + # -L didn't work. + set X `ls -t "$srcdir/configure" conftest.file` + fi + if test "$[*]" != "X $srcdir/configure conftest.file" \ + && test "$[*]" != "X conftest.file $srcdir/configure"; then + # If neither matched, then we have a broken ls. This can happen + # if, for instance, CONFIG_SHELL is bash and it inherits a + # broken ls alias from the environment. This has actually + # happened. Such a system could not be considered "sane". + AC_MSG_ERROR([ls -t appears to fail. Make sure there is not a broken + alias in your environment]) + fi + if test "$[2]" = conftest.file || test $am_try -eq 2; then + break + fi + # Just in case. + sleep 1 + am_has_slept=yes + done test "$[2]" = conftest.file ) then @@ -10340,31 +10353,50 @@ AC_MSG_ERROR([newly created file is older than distributed files! Check your system clock]) fi -AC_MSG_RESULT(yes)]) +AC_MSG_RESULT([yes]) +# If we didn't sleep, we still need to ensure time stamps of config.status and +# generated files are strictly newer. +am_sleep_pid= +if grep 'slept: no' conftest.file >/dev/null 2>&1; then + ( sleep 1 ) & + am_sleep_pid=$! +fi +AC_CONFIG_COMMANDS_PRE( + [AC_MSG_CHECKING([that generated files are newer than configure]) + if test -n "$am_sleep_pid"; then + # Hide warnings about reused PIDs. + wait $am_sleep_pid 2>/dev/null + fi + AC_MSG_RESULT([done])]) +rm -f conftest.file +]) -# Copyright (C) 2009, 2011 Free Software Foundation, Inc. +# Copyright (C) 2009-2013 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. -# serial 2 - # AM_SILENT_RULES([DEFAULT]) # -------------------------- # Enable less verbose build rules; with the default set to DEFAULT -# (`yes' being less verbose, `no' or empty being verbose). +# ("yes" being less verbose, "no" or empty being verbose). AC_DEFUN([AM_SILENT_RULES], -[AC_ARG_ENABLE([silent-rules], -[ --enable-silent-rules less verbose build output (undo: `make V=1') - --disable-silent-rules verbose build output (undo: `make V=0')]) -case $enable_silent_rules in -yes) AM_DEFAULT_VERBOSITY=0;; -no) AM_DEFAULT_VERBOSITY=1;; -*) AM_DEFAULT_VERBOSITY=m4_if([$1], [yes], [0], [1]);; +[AC_ARG_ENABLE([silent-rules], [dnl +AS_HELP_STRING( + [--enable-silent-rules], + [less verbose build output (undo: "make V=1")]) +AS_HELP_STRING( + [--disable-silent-rules], + [verbose build output (undo: "make V=0")])dnl +]) +case $enable_silent_rules in @%:@ ((( + yes) AM_DEFAULT_VERBOSITY=0;; + no) AM_DEFAULT_VERBOSITY=1;; + *) AM_DEFAULT_VERBOSITY=m4_if([$1], [yes], [0], [1]);; esac dnl -dnl A few `make' implementations (e.g., NonStop OS and NextStep) +dnl A few 'make' implementations (e.g., NonStop OS and NextStep) dnl do not support nested variable expansions. dnl See automake bug#9928 and bug#10237. am_make=${MAKE-make} @@ -10382,7 +10414,7 @@ am_cv_make_support_nested_variables=no fi]) if test $am_cv_make_support_nested_variables = yes; then - dnl Using `$V' instead of `$(V)' breaks IRIX make. + dnl Using '$V' instead of '$(V)' breaks IRIX make. AM_V='$(V)' AM_DEFAULT_V='$(AM_DEFAULT_VERBOSITY)' else @@ -10399,44 +10431,40 @@ _AM_SUBST_NOTMAKE([AM_BACKSLASH])dnl ]) -# Copyright (C) 2001, 2003, 2005, 2011 Free Software Foundation, Inc. +# Copyright (C) 2001-2013 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. -# serial 1 - # AM_PROG_INSTALL_STRIP # --------------------- -# One issue with vendor `install' (even GNU) is that you can't +# One issue with vendor 'install' (even GNU) is that you can't # specify the program used to strip binaries. This is especially # annoying in cross-compiling environments, where the build's strip # is unlikely to handle the host's binaries. # Fortunately install-sh will honor a STRIPPROG variable, so we -# always use install-sh in `make install-strip', and initialize +# always use install-sh in "make install-strip", and initialize # STRIPPROG with the value of the STRIP variable (set by the user). AC_DEFUN([AM_PROG_INSTALL_STRIP], [AC_REQUIRE([AM_PROG_INSTALL_SH])dnl -# Installed binaries are usually stripped using `strip' when the user -# run `make install-strip'. However `strip' might not be the right +# Installed binaries are usually stripped using 'strip' when the user +# run "make install-strip". However 'strip' might not be the right # tool to use in cross-compilation environments, therefore Automake -# will honor the `STRIP' environment variable to overrule this program. -dnl Don't test for $cross_compiling = yes, because it might be `maybe'. +# will honor the 'STRIP' environment variable to overrule this program. +dnl Don't test for $cross_compiling = yes, because it might be 'maybe'. if test "$cross_compiling" != no; then AC_CHECK_TOOL([STRIP], [strip], :) fi INSTALL_STRIP_PROGRAM="\$(install_sh) -c -s" AC_SUBST([INSTALL_STRIP_PROGRAM])]) -# Copyright (C) 2006, 2008, 2010 Free Software Foundation, Inc. +# Copyright (C) 2006-2013 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. -# serial 3 - # _AM_SUBST_NOTMAKE(VARIABLE) # --------------------------- # Prevent Automake from outputting VARIABLE = @VARIABLE@ in Makefile.in. @@ -10450,18 +10478,16 @@ # Check how to create a tarball. -*- Autoconf -*- -# Copyright (C) 2004, 2005, 2012 Free Software Foundation, Inc. +# Copyright (C) 2004-2013 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. -# serial 2 - # _AM_PROG_TAR(FORMAT) # -------------------- # Check how to create a tarball in format FORMAT. -# FORMAT should be one of `v7', `ustar', or `pax'. +# FORMAT should be one of 'v7', 'ustar', or 'pax'. # # Substitute a variable $(am__tar) that is a command # writing to stdout a FORMAT-tarball containing the directory @@ -10484,7 +10510,7 @@ _am_tools='gnutar m4_if([$1], [ustar], [plaintar]) pax cpio none' _am_tools=${am_cv_prog_tar_$1-$_am_tools} # Do not fold the above two line into one, because Tru64 sh and -# Solaris sh will not grok spaces in the rhs of `-'. +# Solaris sh will not grok spaces in the rhs of '-'. for _am_tool in $_am_tools do case $_am_tool in @@ -10929,7 +10955,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]) @@ -10963,10 +10989,10 @@ -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" - CPPFLAGS="$CPPFLAGS -D_FORTIFY_SOURCE=2" + -Wnested-externs" + CPPFLAGS="$CPPFLAGS" if test x`uname` = x"Linux"; then xdt_cv_additional_CFLAGS="$xdt_cv_additional_CFLAGS -fstack-protector" @@ -11033,7 +11059,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); @@ -11046,7 +11072,7 @@ test_hidden (); return 0; } - ]), + ])], [ have_gnuc_visibility=yes AC_MSG_RESULT([yes]) diff -Nru xfce4-session-4.10.0/compile xfce4-session-4.10.1/compile --- xfce4-session-4.10.0/compile 2012-04-28 20:43:32.000000000 +0000 +++ xfce4-session-4.10.1/compile 2013-05-05 15:33:59.000000000 +0000 @@ -1,10 +1,9 @@ #! /bin/sh # Wrapper for compilers which do not understand '-c -o'. -scriptversion=2012-03-05.13; # UTC +scriptversion=2012-10-14.11; # UTC -# Copyright (C) 1999, 2000, 2003, 2004, 2005, 2009, 2010, 2012 Free -# Software Foundation, Inc. +# Copyright (C) 1999-2013 Free Software Foundation, Inc. # Written by Tom Tromey . # # This program is free software; you can redistribute it and/or modify @@ -113,6 +112,11 @@ lib=$dir/$lib.lib break fi + if test -f "$dir/lib$lib.a"; then + found=yes + lib=$dir/lib$lib.a + break + fi done IFS=$save_IFS diff -Nru xfce4-session-4.10.0/config.guess xfce4-session-4.10.1/config.guess --- xfce4-session-4.10.0/config.guess 2012-04-28 20:43:32.000000000 +0000 +++ xfce4-session-4.10.1/config.guess 2013-05-05 15:33:59.000000000 +0000 @@ -2,13 +2,13 @@ # Attempt to guess a canonical system name. # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, # 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, -# 2011, 2012 Free Software Foundation, Inc. +# 2011, 2012, 2013 Free Software Foundation, Inc. -timestamp='2012-02-10' +timestamp='2012-12-29' # 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 -# the Free Software Foundation; either version 2 of the License, or +# the Free Software Foundation; either version 3 of the License, or # (at your option) any later version. # # This program is distributed in the hope that it will be useful, but @@ -22,19 +22,17 @@ # As a special exception to the GNU General Public License, if you # distribute this file as part of a program that contains a # configuration script generated by Autoconf, you may include it under -# the same distribution terms that you use for the rest of that program. - - -# Originally written by Per Bothner. Please send patches (context -# diff format) to and include a ChangeLog -# entry. +# the same distribution terms that you use for the rest of that +# program. This Exception is an additional permission under section 7 +# of the GNU General Public License, version 3 ("GPLv3"). # -# This script attempts to guess a canonical system name similar to -# config.sub. If it succeeds, it prints the system name on stdout, and -# exits with 0. Otherwise, it exits with 1. +# Originally written by Per Bothner. # # You can get the latest version of this script from: # http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.guess;hb=HEAD +# +# Please send patches with a ChangeLog entry to config-patches@gnu.org. + me=`echo "$0" | sed -e 's,.*/,,'` @@ -55,8 +53,8 @@ Originally written by Per Bothner. Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, -2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012 -Free Software Foundation, Inc. +2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, +2012, 2013 Free Software Foundation, Inc. This is free software; see the source for copying conditions. There is NO warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE." @@ -200,6 +198,10 @@ # CPU_TYPE-MANUFACTURER-OPERATING_SYSTEM is used. echo "${machine}-${os}${release}" exit ;; + *:Bitrig:*:*) + UNAME_MACHINE_ARCH=`arch | sed 's/Bitrig.//'` + echo ${UNAME_MACHINE_ARCH}-unknown-bitrig${UNAME_RELEASE} + exit ;; *:OpenBSD:*:*) UNAME_MACHINE_ARCH=`arch | sed 's/OpenBSD.//'` echo ${UNAME_MACHINE_ARCH}-unknown-openbsd${UNAME_RELEASE} @@ -302,7 +304,7 @@ arm:RISC*:1.[012]*:*|arm:riscix:1.[012]*:*) echo arm-acorn-riscix${UNAME_RELEASE} exit ;; - arm:riscos:*:*|arm:RISCOS:*:*) + arm*:riscos:*:*|arm*:RISCOS:*:*) echo arm-unknown-riscos exit ;; SR2?01:HI-UX/MPP:*:* | SR8000:HI-UX/MPP:*:*) @@ -801,6 +803,9 @@ i*:CYGWIN*:*) echo ${UNAME_MACHINE}-pc-cygwin exit ;; + *:MINGW64*:*) + echo ${UNAME_MACHINE}-pc-mingw64 + exit ;; *:MINGW*:*) echo ${UNAME_MACHINE}-pc-mingw32 exit ;; @@ -1201,6 +1206,9 @@ BePC:Haiku:*:*) # Haiku running on Intel PC compatible. echo i586-pc-haiku exit ;; + x86_64:Haiku:*:*) + echo x86_64-unknown-haiku + exit ;; SX-4:SUPER-UX:*:*) echo sx4-nec-superux${UNAME_RELEASE} exit ;; @@ -1256,7 +1264,7 @@ NEO-?:NONSTOP_KERNEL:*:*) echo neo-tandem-nsk${UNAME_RELEASE} exit ;; - NSE-?:NONSTOP_KERNEL:*:*) + NSE-*:NONSTOP_KERNEL:*:*) echo nse-tandem-nsk${UNAME_RELEASE} exit ;; NSR-?:NONSTOP_KERNEL:*:*) @@ -1330,9 +1338,6 @@ exit ;; esac -#echo '(No uname command or uname output not recognized.)' 1>&2 -#echo "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" 1>&2 - eval $set_cc_for_build cat >$dummy.c <= 2.22 present */ -#undef HAVE_GNOME_KEYRING - /* Define to 1 if you have the header file. */ #undef HAVE_INTTYPES_H @@ -111,6 +108,9 @@ /* Define to 1 if you have the `sync' function. */ #undef HAVE_SYNC +/* Define if polkit-gobject-1 >= 0.100 present */ +#undef HAVE_SYSTEMD + /* Define to 1 if you have the header file. */ #undef HAVE_SYS_PARAM_H diff -Nru xfce4-session-4.10.0/config.sub xfce4-session-4.10.1/config.sub --- xfce4-session-4.10.0/config.sub 2012-04-28 20:43:32.000000000 +0000 +++ xfce4-session-4.10.1/config.sub 2013-05-05 15:33:59.000000000 +0000 @@ -2,23 +2,19 @@ # Configuration validation subroutine script. # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, # 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, -# 2011, 2012 Free Software Foundation, Inc. +# 2011, 2012, 2013 Free Software Foundation, Inc. -timestamp='2012-02-10' +timestamp='2012-12-29' -# This file is (in principle) common to ALL GNU software. -# The presence of a machine in this file suggests that SOME GNU software -# can handle that machine. It does not imply ALL GNU software can. -# -# 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 -# the Free Software Foundation; either version 2 of the License, or +# 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 +# the Free Software Foundation; either version 3 of the License, or # (at your option) any later version. # -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. +# This program is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +# General Public License for more details. # # You should have received a copy of the GNU General Public License # along with this program; if not, see . @@ -26,11 +22,12 @@ # As a special exception to the GNU General Public License, if you # distribute this file as part of a program that contains a # configuration script generated by Autoconf, you may include it under -# the same distribution terms that you use for the rest of that program. +# the same distribution terms that you use for the rest of that +# program. This Exception is an additional permission under section 7 +# of the GNU General Public License, version 3 ("GPLv3"). -# Please send patches to . Submit a context -# diff and a properly formatted GNU ChangeLog entry. +# Please send patches with a ChangeLog entry to config-patches@gnu.org. # # Configuration subroutine to validate and canonicalize a configuration type. # Supply the specified configuration type as an argument. @@ -74,8 +71,8 @@ GNU config.sub ($timestamp) Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, -2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012 -Free Software Foundation, Inc. +2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, +2012, 2013 Free Software Foundation, Inc. This is free software; see the source for copying conditions. There is NO warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE." @@ -123,7 +120,7 @@ maybe_os=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\2/'` case $maybe_os in nto-qnx* | linux-gnu* | linux-android* | linux-dietlibc | linux-newlib* | \ - linux-uclibc* | uclinux-uclibc* | uclinux-gnu* | kfreebsd*-gnu* | \ + linux-musl* | linux-uclibc* | uclinux-uclibc* | uclinux-gnu* | kfreebsd*-gnu* | \ knetbsd*-gnu* | netbsd*-gnu* | \ kopensolaris*-gnu* | \ storm-chaos* | os2-emx* | rtmk-nova*) @@ -156,7 +153,7 @@ -convergent* | -ncr* | -news | -32* | -3600* | -3100* | -hitachi* |\ -c[123]* | -convex* | -sun | -crds | -omron* | -dg | -ultra | -tti* | \ -harris | -dolphin | -highlevel | -gould | -cbm | -ns | -masscomp | \ - -apple | -axis | -knuth | -cray | -microblaze) + -apple | -axis | -knuth | -cray | -microblaze*) os= basic_machine=$1 ;; @@ -225,6 +222,12 @@ -isc*) basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'` ;; + -lynx*178) + os=-lynxos178 + ;; + -lynx*5) + os=-lynxos5 + ;; -lynx*) os=-lynxos ;; @@ -253,8 +256,10 @@ | alpha | alphaev[4-8] | alphaev56 | alphaev6[78] | alphapca5[67] \ | alpha64 | alpha64ev[4-8] | alpha64ev56 | alpha64ev6[78] | alpha64pca5[67] \ | am33_2.0 \ - | arc | arm | arm[bl]e | arme[lb] | armv[2345] | armv[345][lb] | avr | avr32 \ - | be32 | be64 \ + | arc \ + | arm | arm[bl]e | arme[lb] | armv[2-8] | armv[3-8][lb] | armv7[arm] \ + | avr | avr32 \ + | be32 | be64 \ | bfin \ | c4x | clipper \ | d10v | d30v | dlx | dsp16xx \ @@ -267,7 +272,7 @@ | le32 | le64 \ | lm32 \ | m32c | m32r | m32rle | m68000 | m68k | m88k \ - | maxq | mb | microblaze | mcore | mep | metag \ + | maxq | mb | microblaze | microblazeel | mcore | mep | metag \ | mips | mipsbe | mipseb | mipsel | mipsle \ | mips16 \ | mips64 | mips64el \ @@ -383,7 +388,8 @@ | lm32-* \ | m32c-* | m32r-* | m32rle-* \ | m68000-* | m680[012346]0-* | m68360-* | m683?2-* | m68k-* \ - | m88110-* | m88k-* | maxq-* | mcore-* | metag-* | microblaze-* \ + | m88110-* | m88k-* | maxq-* | mcore-* | metag-* \ + | microblaze-* | microblazeel-* \ | mips-* | mipsbe-* | mipseb-* | mipsel-* | mipsle-* \ | mips16-* \ | mips64-* | mips64el-* \ @@ -782,9 +788,13 @@ basic_machine=ns32k-utek os=-sysv ;; - microblaze) + microblaze*) basic_machine=microblaze-xilinx ;; + mingw64) + basic_machine=x86_64-pc + os=-mingw64 + ;; mingw32) basic_machine=i386-pc os=-mingw32 @@ -1013,7 +1023,11 @@ basic_machine=i586-unknown os=-pw32 ;; - rdos) + rdos | rdos64) + basic_machine=x86_64-pc + os=-rdos + ;; + rdos32) basic_machine=i386-pc os=-rdos ;; @@ -1346,15 +1360,15 @@ | -nindy* | -vxsim* | -vxworks* | -ebmon* | -hms* | -mvs* \ | -clix* | -riscos* | -uniplus* | -iris* | -rtu* | -xenix* \ | -hiux* | -386bsd* | -knetbsd* | -mirbsd* | -netbsd* \ - | -openbsd* | -solidbsd* \ + | -bitrig* | -openbsd* | -solidbsd* \ | -ekkobsd* | -kfreebsd* | -freebsd* | -riscix* | -lynxos* \ | -bosx* | -nextstep* | -cxux* | -aout* | -elf* | -oabi* \ | -ptx* | -coff* | -ecoff* | -winnt* | -domain* | -vsta* \ | -udi* | -eabi* | -lites* | -ieee* | -go32* | -aux* \ | -chorusos* | -chorusrdb* | -cegcc* \ | -cygwin* | -msys* | -pe* | -psos* | -moss* | -proelf* | -rtems* \ - | -mingw32* | -linux-gnu* | -linux-android* \ - | -linux-newlib* | -linux-uclibc* \ + | -mingw32* | -mingw64* | -linux-gnu* | -linux-android* \ + | -linux-newlib* | -linux-musl* | -linux-uclibc* \ | -uxpv* | -beos* | -mpeix* | -udk* \ | -interix* | -uwin* | -mks* | -rhapsody* | -darwin* | -opened* \ | -openstep* | -oskit* | -conix* | -pw32* | -nonstopux* \ @@ -1537,6 +1551,9 @@ c4x-* | tic4x-*) os=-coff ;; + hexagon-*) + os=-elf + ;; tic54x-*) os=-coff ;; diff -Nru xfce4-session-4.10.0/configure xfce4-session-4.10.1/configure --- xfce4-session-4.10.0/configure 2012-04-28 20:43:34.000000000 +0000 +++ xfce4-session-4.10.1/configure 2013-05-05 15:34:00.000000000 +0000 @@ -1,7 +1,7 @@ #! /bin/sh -# From configure.in Id. +# From configure.ac Id. # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.69 for xfce4-session 4.10.0. +# Generated by GNU Autoconf 2.69 for xfce4-session 4.10.1. # # Report bugs to . # @@ -596,8 +596,8 @@ # Identity of this package. PACKAGE_NAME='xfce4-session' PACKAGE_TARNAME='xfce4-session' -PACKAGE_VERSION='4.10.0' -PACKAGE_STRING='xfce4-session 4.10.0' +PACKAGE_VERSION='4.10.1' +PACKAGE_STRING='xfce4-session 4.10.1' PACKAGE_BUGREPORT='http://bugs.xfce.org/' PACKAGE_URL='' @@ -647,12 +647,12 @@ RM XSESSION_PREFIX ICEAUTH -HAVE_GNOME_KEYRING_FALSE -HAVE_GNOME_KEYRING_TRUE -GNOME_KEYRING_REQUIRED_VERSION -GNOME_KEYRING_LIBS -GNOME_KEYRING_CFLAGS -GNOME_KEYRING_VERSION +HAVE_SYSTEMD_FALSE +HAVE_SYSTEMD_TRUE +SYSTEMD_REQUIRED_VERSION +SYSTEMD_LIBS +SYSTEMD_CFLAGS +SYSTEMD_VERSION XFCONF_REQUIRED_VERSION XFCONF_LIBS XFCONF_CFLAGS @@ -799,13 +799,13 @@ CFLAGS CC HELPER_PATH_PREFIX +MAINT +MAINTAINER_MODE_FALSE +MAINTAINER_MODE_TRUE AM_BACKSLASH AM_DEFAULT_VERBOSITY AM_DEFAULT_V AM_V -MAINT -MAINTAINER_MODE_FALSE -MAINTAINER_MODE_TRUE am__untar am__tar AMTAR @@ -870,8 +870,8 @@ ac_subst_files='' ac_user_opts=' enable_option_checking -enable_maintainer_mode enable_silent_rules +enable_maintainer_mode with_helper_path_prefix enable_dependency_tracking enable_nls @@ -884,7 +884,7 @@ enable_libtool_lock with_x with_locales_dir -enable_libgnome_keyring +enable_systemd enable_debug enable_linker_opts with_xsession_prefix @@ -1443,7 +1443,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 xfce4-session 4.10.0 to adapt to many kinds of systems. +\`configure' configures xfce4-session 4.10.1 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1517,7 +1517,7 @@ if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of xfce4-session 4.10.0:";; + short | recursive ) echo "Configuration of xfce4-session 4.10.1:";; esac cat <<\_ACEOF @@ -1525,24 +1525,24 @@ --disable-option-checking ignore unrecognized --enable/--with options --disable-FEATURE do not include FEATURE (same as --enable-FEATURE=no) --enable-FEATURE[=ARG] include FEATURE [ARG=yes] - --enable-maintainer-mode enable make rules and dependencies not useful - (and sometimes confusing) to the casual installer - --enable-silent-rules less verbose build output (undo: `make V=1') - --disable-silent-rules verbose build output (undo: `make V=0') - --disable-dependency-tracking speeds up one-time build - --enable-dependency-tracking do not reject slow dependency extractors + --enable-silent-rules less verbose build output (undo: "make V=1") + --disable-silent-rules verbose build output (undo: "make V=0") + --enable-maintainer-mode + enable make rules and dependencies not useful (and + sometimes confusing) to the casual installer + --enable-dependency-tracking + do not reject slow dependency extractors + --disable-dependency-tracking + speeds up one-time build --disable-nls do not use Native Language Support --enable-static[=PKGS] build static libraries [default=no] --enable-shared[=PKGS] build shared libraries [default=yes] --enable-fast-install[=PKGS] optimize for fast installation [default=yes] --disable-libtool-lock avoid locking (might break parallel builds) - --enable-libgnome-keyring - Enable checking for Extra gnome-keyring - compatibility support (default=[no]) - --disable-libgnome-keyring - Disable checking for Extra gnome-keyring - compatibility support + --enable-systemd Enable checking for Systemd support (through polit) + (default=[]) + --disable-systemd Disable checking for Systemd support (through polit) --enable-debug[=no|minimum|yes|full] Build with debugging support [default=[minimum]] @@ -1652,7 +1652,7 @@ test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -xfce4-session configure 4.10.0 +xfce4-session configure 4.10.1 generated by GNU Autoconf 2.69 Copyright (C) 2012 Free Software Foundation, Inc. @@ -2026,7 +2026,7 @@ This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by xfce4-session $as_me 4.10.0, which was +It was created by xfce4-session $as_me 4.10.1, which was generated by GNU Autoconf 2.69. Invocation command line was $ $0 $@ @@ -2408,7 +2408,7 @@ fi -am__api_version='1.11' +am__api_version='1.13' ac_aux_dir= for ac_dir in "$srcdir" "$srcdir/.." "$srcdir/../.."; do @@ -2534,9 +2534,6 @@ { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether build environment is sane" >&5 $as_echo_n "checking whether build environment is sane... " >&6; } -# Just in case -sleep 1 -echo timestamp > conftest.file # Reject unsafe characters in $srcdir or the absolute working directory # name. Accept space and tab only in the latter. am_lf=' @@ -2547,32 +2544,40 @@ esac case $srcdir in *[\\\"\#\$\&\'\`$am_lf\ \ ]*) - as_fn_error $? "unsafe srcdir value: \`$srcdir'" "$LINENO" 5;; + as_fn_error $? "unsafe srcdir value: '$srcdir'" "$LINENO" 5;; esac -# Do `set' in a subshell so we don't clobber the current shell's +# Do 'set' in a subshell so we don't clobber the current shell's # arguments. Must try -L first in case configure is actually a # symlink; some systems play weird games with the mod time of symlinks # (eg FreeBSD returns the mod time of the symlink's containing # directory). if ( - set X `ls -Lt "$srcdir/configure" conftest.file 2> /dev/null` - if test "$*" = "X"; then - # -L didn't work. - set X `ls -t "$srcdir/configure" conftest.file` - fi - rm -f conftest.file - if test "$*" != "X $srcdir/configure conftest.file" \ - && test "$*" != "X conftest.file $srcdir/configure"; then - - # If neither matched, then we have a broken ls. This can happen - # if, for instance, CONFIG_SHELL is bash and it inherits a - # broken ls alias from the environment. This has actually - # happened. Such a system could not be considered "sane". - as_fn_error $? "ls -t appears to fail. Make sure there is not a broken -alias in your environment" "$LINENO" 5 - fi + am_has_slept=no + for am_try in 1 2; do + echo "timestamp, slept: $am_has_slept" > conftest.file + set X `ls -Lt "$srcdir/configure" conftest.file 2> /dev/null` + if test "$*" = "X"; then + # -L didn't work. + set X `ls -t "$srcdir/configure" conftest.file` + fi + if test "$*" != "X $srcdir/configure conftest.file" \ + && test "$*" != "X conftest.file $srcdir/configure"; then + # If neither matched, then we have a broken ls. This can happen + # if, for instance, CONFIG_SHELL is bash and it inherits a + # broken ls alias from the environment. This has actually + # happened. Such a system could not be considered "sane". + as_fn_error $? "ls -t appears to fail. Make sure there is not a broken + alias in your environment" "$LINENO" 5 + fi + if test "$2" = conftest.file || test $am_try -eq 2; then + break + fi + # Just in case. + sleep 1 + am_has_slept=yes + done test "$2" = conftest.file ) then @@ -2584,6 +2589,16 @@ fi { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 $as_echo "yes" >&6; } +# If we didn't sleep, we still need to ensure time stamps of config.status and +# generated files are strictly newer. +am_sleep_pid= +if grep 'slept: no' conftest.file >/dev/null 2>&1; then + ( sleep 1 ) & + am_sleep_pid=$! +fi + +rm -f conftest.file + test "$program_prefix" != NONE && program_transform_name="s&^&$program_prefix&;$program_transform_name" # Use a double $ so make ignores it. @@ -2606,12 +2621,12 @@ esac fi # Use eval to expand $SHELL -if eval "$MISSING --run true"; then - am_missing_run="$MISSING --run " +if eval "$MISSING --is-lightweight"; then + am_missing_run="$MISSING " else am_missing_run= - { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: \`missing' script is too old or missing" >&5 -$as_echo "$as_me: WARNING: \`missing' script is too old or missing" >&2;} + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: 'missing' script is too old or missing" >&5 +$as_echo "$as_me: WARNING: 'missing' script is too old or missing" >&2;} fi if test x"${install_sh}" != xset; then @@ -2623,10 +2638,10 @@ esac fi -# Installed binaries are usually stripped using `strip' when the user -# run `make install-strip'. However `strip' might not be the right +# Installed binaries are usually stripped using 'strip' when the user +# run "make install-strip". However 'strip' might not be the right # tool to use in cross-compilation environments, therefore Automake -# will honor the `STRIP' environment variable to overrule this program. +# will honor the 'STRIP' environment variable to overrule this program. if test "$cross_compiling" != no; then if test -n "$ac_tool_prefix"; then # Extract the first word of "${ac_tool_prefix}strip", so it can be a program name with args. @@ -2765,12 +2780,6 @@ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MKDIR_P" >&5 $as_echo "$MKDIR_P" >&6; } -mkdir_p="$MKDIR_P" -case $mkdir_p in - [\\/$]* | ?:[\\/]*) ;; - */*) mkdir_p="\$(top_builddir)/$mkdir_p" ;; -esac - for ac_prog in gawk mawk nawk awk do # Extract the first word of "$ac_prog", so it can be a program name with args. @@ -2822,6 +2831,45 @@ fi rmdir .tst 2>/dev/null +# Check whether --enable-silent-rules was given. +if test "${enable_silent_rules+set}" = set; then : + enableval=$enable_silent_rules; +fi + +case $enable_silent_rules in # ((( + yes) AM_DEFAULT_VERBOSITY=0;; + no) AM_DEFAULT_VERBOSITY=1;; + *) AM_DEFAULT_VERBOSITY=1;; +esac +am_make=${MAKE-make} +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $am_make supports nested variables" >&5 +$as_echo_n "checking whether $am_make supports nested variables... " >&6; } +if ${am_cv_make_support_nested_variables+:} false; then : + $as_echo_n "(cached) " >&6 +else + if $as_echo 'TRUE=$(BAR$(V)) +BAR0=false +BAR1=true +V=1 +am__doit: + @$(TRUE) +.PHONY: am__doit' | $am_make -f - >/dev/null 2>&1; then + am_cv_make_support_nested_variables=yes +else + am_cv_make_support_nested_variables=no +fi +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_make_support_nested_variables" >&5 +$as_echo "$am_cv_make_support_nested_variables" >&6; } +if test $am_cv_make_support_nested_variables = yes; then + AM_V='$(V)' + AM_DEFAULT_V='$(AM_DEFAULT_VERBOSITY)' +else + AM_V=$AM_DEFAULT_VERBOSITY + AM_DEFAULT_V=$AM_DEFAULT_VERBOSITY +fi +AM_BACKSLASH='\' + if test "`cd $srcdir && pwd`" != "`pwd`"; then # Use -I$(srcdir) only when $(srcdir) != ., so that make's output # is not polluted with repeated "-I." @@ -2843,8 +2891,8 @@ # Define the identity of the package. - PACKAGE=xfce4-session - VERSION=4.10.0 + PACKAGE='xfce4-session' + VERSION='4.10.1' cat >>confdefs.h <<_ACEOF @@ -2872,13 +2920,100 @@ MAKEINFO=${MAKEINFO-"${am_missing_run}makeinfo"} +# For better backward compatibility. To be removed once Automake 1.9.x +# dies out for good. For more background, see: +# +# +mkdir_p='$(MKDIR_P)' + # We need awk for the "check" target. The system "awk" is bad on # some platforms. # Always define AMTAR for backward compatibility. Yes, it's still used # in the wild :-( We should find a proper way to deprecate it ... AMTAR='$${TAR-tar}' -am__tar='$${TAR-tar} chof - "$$tardir"' am__untar='$${TAR-tar} xf -' + +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to create a ustar tar archive" >&5 +$as_echo_n "checking how to create a ustar tar archive... " >&6; } +# Loop over all known methods to create a tar archive until one works. +_am_tools='gnutar plaintar pax cpio none' +_am_tools=${am_cv_prog_tar_ustar-$_am_tools} +# Do not fold the above two line into one, because Tru64 sh and +# Solaris sh will not grok spaces in the rhs of '-'. +for _am_tool in $_am_tools +do + case $_am_tool in + gnutar) + for _am_tar in tar gnutar gtar; + do + { echo "$as_me:$LINENO: $_am_tar --version" >&5 + ($_am_tar --version) >&5 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && break + done + am__tar="$_am_tar --format=ustar -chf - "'"$$tardir"' + am__tar_="$_am_tar --format=ustar -chf - "'"$tardir"' + am__untar="$_am_tar -xf -" + ;; + plaintar) + # Must skip GNU tar: if it does not support --format= it doesn't create + # ustar tarball either. + (tar --version) >/dev/null 2>&1 && continue + am__tar='tar chf - "$$tardir"' + am__tar_='tar chf - "$tardir"' + am__untar='tar xf -' + ;; + pax) + am__tar='pax -L -x ustar -w "$$tardir"' + am__tar_='pax -L -x ustar -w "$tardir"' + am__untar='pax -r' + ;; + cpio) + am__tar='find "$$tardir" -print | cpio -o -H ustar -L' + am__tar_='find "$tardir" -print | cpio -o -H ustar -L' + am__untar='cpio -i -H ustar -d' + ;; + none) + am__tar=false + am__tar_=false + am__untar=false + ;; + esac + + # If the value was cached, stop now. We just wanted to have am__tar + # and am__untar set. + test -n "${am_cv_prog_tar_ustar}" && break + + # tar/untar a dummy directory, and stop if the command works + rm -rf conftest.dir + mkdir conftest.dir + echo GrepMe > conftest.dir/file + { echo "$as_me:$LINENO: tardir=conftest.dir && eval $am__tar_ >conftest.tar" >&5 + (tardir=conftest.dir && eval $am__tar_ >conftest.tar) >&5 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } + rm -rf conftest.dir + if test -s conftest.tar; then + { echo "$as_me:$LINENO: $am__untar &5 + ($am__untar &5 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } + grep GrepMe conftest.dir/file >/dev/null 2>&1 && break + fi +done +rm -rf conftest.dir + +if ${am_cv_prog_tar_ustar+:} false; then : + $as_echo_n "(cached) " >&6 +else + am_cv_prog_tar_ustar=$_am_tool +fi + +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_prog_tar_ustar" >&5 +$as_echo "$am_cv_prog_tar_ustar" >&6; } @@ -2914,10 +3049,10 @@ enableval=$enable_silent_rules; fi -case $enable_silent_rules in -yes) AM_DEFAULT_VERBOSITY=0;; -no) AM_DEFAULT_VERBOSITY=1;; -*) AM_DEFAULT_VERBOSITY=0;; +case $enable_silent_rules in # ((( + yes) AM_DEFAULT_VERBOSITY=0;; + no) AM_DEFAULT_VERBOSITY=1;; + *) AM_DEFAULT_VERBOSITY=0;; esac am_make=${MAKE-make} { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $am_make supports nested variables" >&5 @@ -2978,7 +3113,7 @@ _am_result=none # First try GNU make style include. echo "include confinc" > confmf -# Ignore all kinds of additional output from `make'. +# Ignore all kinds of additional output from 'make'. case `$am_make -s -f confmf 2> /dev/null` in #( *the\ am__doit\ target*) am__include=include @@ -3822,8 +3957,8 @@ # We make a subdir and do the tests there. Otherwise we can end up # making bogus files that we don't know about and never remove. For # instance it was reported that on HP-UX the gcc test will end up - # making a dummy file named `D' -- because `-MD' means `put the output - # in D'. + # making a dummy file named 'D' -- because '-MD' means "put the output + # in D". rm -rf conftest.dir mkdir conftest.dir # Copy depcomp to subdir because otherwise we won't find it if we're @@ -3858,16 +3993,16 @@ : > sub/conftest.c for i in 1 2 3 4 5 6; do echo '#include "conftst'$i'.h"' >> sub/conftest.c - # Using `: > sub/conftst$i.h' creates only sub/conftst1.h with - # Solaris 8's {/usr,}/bin/sh. - touch sub/conftst$i.h + # Using ": > sub/conftst$i.h" creates only sub/conftst1.h with + # Solaris 10 /bin/sh. + echo '/* dummy */' > sub/conftst$i.h done echo "${am__include} ${am__quote}sub/conftest.Po${am__quote}" > confmf - # We check with `-c' and `-o' for the sake of the "dashmstdout" + # We check with '-c' and '-o' for the sake of the "dashmstdout" # mode. It turns out that the SunPro C++ compiler does not properly - # handle `-M -o', and we need to detect this. Also, some Intel - # versions had trouble with output in subdirs + # handle '-M -o', and we need to detect this. Also, some Intel + # versions had trouble with output in subdirs. am__obj=sub/conftest.${OBJEXT-o} am__minus_obj="-o $am__obj" case $depmode in @@ -3876,8 +4011,8 @@ test "$am__universal" = false || continue ;; nosideeffect) - # after this tag, mechanisms are not by side-effect, so they'll - # only be used when explicitly requested + # After this tag, mechanisms are not by side-effect, so they'll + # only be used when explicitly requested. if test "x$enable_dependency_tracking" = xyes; then continue else @@ -3885,7 +4020,7 @@ fi ;; msvc7 | msvc7msys | msvisualcpp | msvcmsys) - # This compiler won't grok `-c -o', but also, the minuso test has + # This compiler won't grok '-c -o', but also, the minuso test has # not run yet. These depmodes are late enough in the game, and # so weak that their functioning should not be impacted. am__obj=conftest.${OBJEXT-o} @@ -4962,8 +5097,8 @@ # We make a subdir and do the tests there. Otherwise we can end up # making bogus files that we don't know about and never remove. For # instance it was reported that on HP-UX the gcc test will end up - # making a dummy file named `D' -- because `-MD' means `put the output - # in D'. + # making a dummy file named 'D' -- because '-MD' means "put the output + # in D". rm -rf conftest.dir mkdir conftest.dir # Copy depcomp to subdir because otherwise we won't find it if we're @@ -4998,16 +5133,16 @@ : > sub/conftest.c for i in 1 2 3 4 5 6; do echo '#include "conftst'$i'.h"' >> sub/conftest.c - # Using `: > sub/conftst$i.h' creates only sub/conftst1.h with - # Solaris 8's {/usr,}/bin/sh. - touch sub/conftst$i.h + # Using ": > sub/conftst$i.h" creates only sub/conftst1.h with + # Solaris 10 /bin/sh. + echo '/* dummy */' > sub/conftst$i.h done echo "${am__include} ${am__quote}sub/conftest.Po${am__quote}" > confmf - # We check with `-c' and `-o' for the sake of the "dashmstdout" + # We check with '-c' and '-o' for the sake of the "dashmstdout" # mode. It turns out that the SunPro C++ compiler does not properly - # handle `-M -o', and we need to detect this. Also, some Intel - # versions had trouble with output in subdirs + # handle '-M -o', and we need to detect this. Also, some Intel + # versions had trouble with output in subdirs. am__obj=sub/conftest.${OBJEXT-o} am__minus_obj="-o $am__obj" case $depmode in @@ -5016,8 +5151,8 @@ test "$am__universal" = false || continue ;; nosideeffect) - # after this tag, mechanisms are not by side-effect, so they'll - # only be used when explicitly requested + # After this tag, mechanisms are not by side-effect, so they'll + # only be used when explicitly requested. if test "x$enable_dependency_tracking" = xyes; then continue else @@ -5025,7 +5160,7 @@ fi ;; msvc7 | msvc7msys | msvisualcpp | msvcmsys) - # This compiler won't grok `-c -o', but also, the minuso test has + # This compiler won't grok '-c -o', but also, the minuso test has # not run yet. These depmodes are late enough in the game, and # so weak that their functioning should not be impacted. am__obj=conftest.${OBJEXT-o} @@ -14153,7 +14288,7 @@ - ALL_LINGUAS="am ar ast az be bg bn_IN bn ca cs da de dz el en_GB eo es_MX es et eu fa fi fr gl gu he hi hr hu id is it ja ka kk ko lt lv mk mr ms nb nl nn pa pl pt_BR pt ro ru si sk sq sv ta te tr ug uk ur_PK ur vi zh_CN zh_TW " + ALL_LINGUAS="am ar ast az be bg bn bn_IN ca cs da de dz el en_GB eo es es_MX et eu fa fi fr gl gu he hi hr hu id is it ja ka kk ko lt lv mk mr ms nb nl nn pa pl pt pt_BR ro ru si sk sq sr sv ta te tr ug uk ur ur_PK vi zh_CN zh_TW " for ac_header in locale.h do : @@ -16465,16 +16600,16 @@ - # Check whether --enable-libgnome-keyring was given. -if test "${enable_libgnome_keyring+set}" = set; then : - enableval=$enable_libgnome_keyring; xdt_cv_GNOME_KEYRING_check=$enableval + # Check whether --enable-systemd was given. +if test "${enable_systemd+set}" = set; then : + enableval=$enable_systemd; xdt_cv_SYSTEMD_check=$enableval else - xdt_cv_GNOME_KEYRING_check=no + xdt_cv_SYSTEMD_check=yes fi - if test x"$xdt_cv_GNOME_KEYRING_check" = x"yes"; then - if $PKG_CONFIG --exists "gnome-keyring-1 >= 2.22" >/dev/null 2>&1; then + if test x"$xdt_cv_SYSTEMD_check" = x"yes"; then + if $PKG_CONFIG --exists "polkit-gobject-1 >= 0.100" >/dev/null 2>&1; then # minimum supported version of pkg-config @@ -16615,26 +16750,26 @@ - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for gnome-keyring-1 >= 2.22" >&5 -$as_echo_n "checking for gnome-keyring-1 >= 2.22... " >&6; } - if $PKG_CONFIG "--atleast-version=2.22" "gnome-keyring-1" >/dev/null 2>&1; then - GNOME_KEYRING_VERSION=`$PKG_CONFIG --modversion "gnome-keyring-1"` - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $GNOME_KEYRING_VERSION" >&5 -$as_echo "$GNOME_KEYRING_VERSION" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for polkit-gobject-1 >= 0.100" >&5 +$as_echo_n "checking for polkit-gobject-1 >= 0.100... " >&6; } + if $PKG_CONFIG "--atleast-version=0.100" "polkit-gobject-1" >/dev/null 2>&1; then + SYSTEMD_VERSION=`$PKG_CONFIG --modversion "polkit-gobject-1"` + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $SYSTEMD_VERSION" >&5 +$as_echo "$SYSTEMD_VERSION" >&6; } - { $as_echo "$as_me:${as_lineno-$LINENO}: checking GNOME_KEYRING_CFLAGS" >&5 -$as_echo_n "checking GNOME_KEYRING_CFLAGS... " >&6; } - GNOME_KEYRING_CFLAGS=`$PKG_CONFIG --cflags "gnome-keyring-1"` - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $GNOME_KEYRING_CFLAGS" >&5 -$as_echo "$GNOME_KEYRING_CFLAGS" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: checking SYSTEMD_CFLAGS" >&5 +$as_echo_n "checking SYSTEMD_CFLAGS... " >&6; } + SYSTEMD_CFLAGS=`$PKG_CONFIG --cflags "polkit-gobject-1"` + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $SYSTEMD_CFLAGS" >&5 +$as_echo "$SYSTEMD_CFLAGS" >&6; } - { $as_echo "$as_me:${as_lineno-$LINENO}: checking GNOME_KEYRING_LIBS" >&5 -$as_echo_n "checking GNOME_KEYRING_LIBS... " >&6; } - GNOME_KEYRING_LIBS=`$PKG_CONFIG --libs "gnome-keyring-1"` - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $GNOME_KEYRING_LIBS" >&5 -$as_echo "$GNOME_KEYRING_LIBS" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: checking SYSTEMD_LIBS" >&5 +$as_echo_n "checking SYSTEMD_LIBS... " >&6; } + SYSTEMD_LIBS=`$PKG_CONFIG --libs "polkit-gobject-1"` + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $SYSTEMD_LIBS" >&5 +$as_echo "$SYSTEMD_LIBS" >&6; } - GNOME_KEYRING_REQUIRED_VERSION=2.22 + SYSTEMD_REQUIRED_VERSION=0.100 @@ -16643,19 +16778,19 @@ -$as_echo "#define HAVE_GNOME_KEYRING 1" >>confdefs.h +$as_echo "#define HAVE_SYSTEMD 1" >>confdefs.h - GNOME_KEYRING_FOUND="yes" + SYSTEMD_FOUND="yes" - elif $PKG_CONFIG --exists "gnome-keyring-1" >/dev/null 2>&1; then - xdt_cv_version=`$PKG_CONFIG --modversion "gnome-keyring-1"` + elif $PKG_CONFIG --exists "polkit-gobject-1" >/dev/null 2>&1; then + xdt_cv_version=`$PKG_CONFIG --modversion "polkit-gobject-1"` { $as_echo "$as_me:${as_lineno-$LINENO}: result: found, but $xdt_cv_version" >&5 $as_echo "found, but $xdt_cv_version" >&6; } - echo "*** The required package gnome-keyring-1 was found on your system," + echo "*** The required package polkit-gobject-1 was found on your system," echo "*** but the installed version ($xdt_cv_version) is too old." - echo "*** Please upgrade gnome-keyring-1 to atleast version 2.22, or adjust" + echo "*** Please upgrade polkit-gobject-1 to atleast version 0.100, or adjust" echo "*** the PKG_CONFIG_PATH environment variable if you installed" echo "*** the new version of the package in a nonstandard prefix so" echo "*** pkg-config is able to find it." @@ -16666,8 +16801,8 @@ $as_echo "not found" >&6; } - echo "*** The required package gnome-keyring-1 was not found on your system." - echo "*** Please install gnome-keyring-1 (atleast version 2.22) or adjust" + echo "*** The required package polkit-gobject-1 was not found on your system." + echo "*** Please install polkit-gobject-1 (atleast version 0.100) or adjust" echo "*** the PKG_CONFIG_PATH environment variable if you" echo "*** installed the package in a nonstandard prefix so that" echo "*** pkg-config is able to find it." @@ -16676,24 +16811,24 @@ fi else - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for optional package gnome-keyring-1 >= 2.22" >&5 -$as_echo_n "checking for optional package gnome-keyring-1 >= 2.22... " >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for optional package polkit-gobject-1 >= 0.100" >&5 +$as_echo_n "checking for optional package polkit-gobject-1 >= 0.100... " >&6; } { $as_echo "$as_me:${as_lineno-$LINENO}: result: not found" >&5 $as_echo "not found" >&6; } fi else - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for optional package gnome-keyring-1" >&5 -$as_echo_n "checking for optional package gnome-keyring-1... " >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for optional package polkit-gobject-1" >&5 +$as_echo_n "checking for optional package polkit-gobject-1... " >&6; } { $as_echo "$as_me:${as_lineno-$LINENO}: result: disabled" >&5 $as_echo "disabled" >&6; } fi - if test x"$GNOME_KEYRING_FOUND" = x"yes"; then - HAVE_GNOME_KEYRING_TRUE= - HAVE_GNOME_KEYRING_FALSE='#' + if test x"$SYSTEMD_FOUND" = x"yes"; then + HAVE_SYSTEMD_TRUE= + HAVE_SYSTEMD_FALSE='#' else - HAVE_GNOME_KEYRING_TRUE='#' - HAVE_GNOME_KEYRING_FALSE= + HAVE_SYSTEMD_TRUE='#' + HAVE_SYSTEMD_FALSE= fi @@ -16721,10 +16856,10 @@ -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" - CPPFLAGS="$CPPFLAGS -D_FORTIFY_SOURCE=2" + -Wnested-externs" + CPPFLAGS="$CPPFLAGS" if test x`uname` = x"Linux"; then xdt_cv_additional_CFLAGS="$xdt_cv_additional_CFLAGS -fstack-protector" @@ -17109,6 +17244,14 @@ LTLIBOBJS=$ac_ltlibobjs +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking that generated files are newer than configure" >&5 +$as_echo_n "checking that generated files are newer than configure... " >&6; } + if test -n "$am_sleep_pid"; then + # Hide warnings about reused PIDs. + wait $am_sleep_pid 2>/dev/null + fi + { $as_echo "$as_me:${as_lineno-$LINENO}: result: done" >&5 +$as_echo "done" >&6; } if test -n "$EXEEXT"; then am__EXEEXT_TRUE= am__EXEEXT_FALSE='#' @@ -17141,8 +17284,8 @@ ac_config_commands="$ac_config_commands po/stamp-it" -if test -z "${HAVE_GNOME_KEYRING_TRUE}" && test -z "${HAVE_GNOME_KEYRING_FALSE}"; then - as_fn_error $? "conditional \"HAVE_GNOME_KEYRING\" was never defined. +if test -z "${HAVE_SYSTEMD_TRUE}" && test -z "${HAVE_SYSTEMD_FALSE}"; then + as_fn_error $? "conditional \"HAVE_SYSTEMD\" was never defined. Usually this means the macro was only invoked conditionally." "$LINENO" 5 fi @@ -17542,7 +17685,7 @@ # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by xfce4-session $as_me 4.10.0, which was +This file was extended by xfce4-session $as_me 4.10.1, which was generated by GNU Autoconf 2.69. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -17608,7 +17751,7 @@ cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`" ac_cs_version="\\ -xfce4-session config.status 4.10.0 +xfce4-session config.status 4.10.1 configured by $0, generated by GNU Autoconf 2.69, with options \\"\$ac_cs_config\\" @@ -18638,7 +18781,7 @@ case $ac_file$ac_mode in "depfiles":C) test x"$AMDEP_TRUE" != x"" || { - # Autoconf 2.62 quotes --file arguments for eval, but not when files + # Older Autoconf quotes --file arguments for eval, but not when files # are listed without --file. Let's play safe and only enable the eval # if we detect the quoting. case $CONFIG_FILES in @@ -18651,7 +18794,7 @@ # Strip MF so we end up with the name of the file. mf=`echo "$mf" | sed -e 's/:.*$//'` # Check whether this is an Automake generated Makefile or not. - # We used to match only the files named `Makefile.in', but + # We used to match only the files named 'Makefile.in', but # some people rename them; so instead we look at the file content. # Grep'ing the first line is not enough: some people post-process # each Makefile.in and add a new line on top of each file to say so. @@ -18685,21 +18828,19 @@ continue fi # Extract the definition of DEPDIR, am__include, and am__quote - # from the Makefile without running `make'. + # from the Makefile without running 'make'. DEPDIR=`sed -n 's/^DEPDIR = //p' < "$mf"` test -z "$DEPDIR" && continue am__include=`sed -n 's/^am__include = //p' < "$mf"` test -z "am__include" && continue am__quote=`sed -n 's/^am__quote = //p' < "$mf"` - # When using ansi2knr, U may be empty or an underscore; expand it - U=`sed -n 's/^U = //p' < "$mf"` # Find all dependency output files, they are included files with # $(DEPDIR) in their names. We invoke sed twice because it is the # simplest approach to changing $(DEPDIR) to its actual value in the # expansion. for file in `sed -n " s/^$am__include $am__quote\(.*(DEPDIR).*\)$am__quote"'$/\1/p' <"$mf" | \ - sed -e 's/\$(DEPDIR)/'"$DEPDIR"'/g' -e 's/\$U/'"$U"'/g'`; do + sed -e 's/\$(DEPDIR)/'"$DEPDIR"'/g'`; do # Make sure the directory exists. test -f "$dirpart/$file" && continue fdir=`$as_dirname -- "$file" || diff -Nru xfce4-session-4.10.0/configure.ac xfce4-session-4.10.1/configure.ac --- xfce4-session-4.10.0/configure.ac 1970-01-01 00:00:00.000000000 +0000 +++ xfce4-session-4.10.1/configure.ac 2013-05-05 15:33:55.000000000 +0000 @@ -0,0 +1,216 @@ +dnl +dnl This file was autogenerated from "configure.ac.in". +dnl Edit that file instead! +dnl + +dnl +dnl Copyright (c) 2003-2009 +dnl The Xfce development team. All rights reserved. +dnl +dnl Written for Xfce by Benedikt Meurer . +dnl + +dnl Version information +m4_define([xfsm_version_major], [4]) +m4_define([xfsm_version_minor], [10]) +m4_define([xfsm_version_micro], [1]) +m4_define([xfsm_version_nano], []) dnl leave this empty to have no nano version +m4_define([xfsm_version_build], [c0409d7]) +m4_define([xfsm_version_tag], []) +m4_define([xfsm_version], [xfsm_version_major().xfsm_version_minor().xfsm_version_micro()ifelse(xfsm_version_nano(), [], [], [.xfsm_version_nano()])ifelse(xfsm_version_tag(), [git], [xfsm_version_tag()-xfsm_version_build()], [xfsm_version_tag()])]) + +m4_define([xfsm_debug_default], [ifelse(xfsm_version_tag(), [git], [full], [minimum])]) + +dnl Initialize autoconf +AC_COPYRIGHT([Copyright (c) 2003-2011 + The Xfce development team. All rights reserved. + +Written for Xfce by Benedikt Meurer .]) +AC_INIT([xfce4-session], [xfsm_version], [http://bugs.xfce.org/]) +AC_PREREQ([2.59c]) +AC_REVISION([$Id$]) +AC_PROG_MAKE_SET() + +dnl Initialize automake +AM_INIT_AUTOMAKE([1.8 dist-bzip2 tar-ustar no-dist-gzip]) +AC_CONFIG_HEADERS([config.h]) +AM_MAINTAINER_MODE() +m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])]) + +dnl Set helper path prefix +AC_ARG_WITH([helper-path-prefix], + [AC_HELP_STRING([--with-helper-path-prefix=PATH], + [Path prefix under which helper executables will be installed (default: $libdir)])], + [HELPER_PATH_PREFIX="$withval"], + [HELPER_PATH_PREFIX="$libdir"]) +AC_SUBST([HELPER_PATH_PREFIX]) + +dnl check for UNIX variants +AC_USE_SYSTEM_EXTENSIONS +AM_CONDITIONAL([HAVE_OS_CYGWIN], [test x"`uname | grep \"CYGWIN\"`" != x""]) +if test x"`uname | grep \"CYGWIN\"`" != x""; then + AC_DEFINE([HAVE_OS_CYGWIN], [1], [Compiling under cygwin]) +fi + +dnl check for basic programs +AC_PROG_CC() +AM_PROG_CC_C_O() +AC_PROG_INSTALL() +AC_PROG_INTLTOOL() +m4_ifdef([AC_PROG_SED], [AC_PROG_SED], [AC_CHECK_PROG(SED, sed, sed)]) + +dnl check for libtool +LT_PREREQ([2.2.6]) +LT_INIT([disable-static]) + +dnl check for standard header files +AC_HEADER_STDC +AC_CHECK_HEADERS([asm/unistd.h errno.h fcntl.h limits.h \ + netdb.h pwd.h signal.h stdarg.h sys/param.h sys/resource.h \ + sys/socket.h sys/time.h sys/wait.h sys/utsname.h time.h \ + unistd.h sys/param.h sys/user.h sys/sysctl.h math.h sys/types.h]) +AC_CHECK_FUNCS([getaddrinfo gethostbyname gethostname getpwuid setsid \ + sigaction strdup sync vfork]) + +dnl Check for required libraries +AC_CHECK_LIBM +AC_SUBST(LIBM) + +dnl Check for X11 installed +XDT_CHECK_LIBX11_REQUIRE() + +dnl Check for session management support +XDT_CHECK_LIBSM() + +dnl Check for _IceTransNoListen +ac_LIBS="$LIBS" +LIBS="$LIBS $LIBSM_LDFLAGS $LIBSM_LIBS" +AC_CHECK_FUNCS([_IceTransNoListen]) +LIBS="$ac_LIBS" + +dnl Check for i18n support +XDT_I18N([am ar ast az be bg bn bn_IN ca cs da de dz el en_GB eo es es_MX et eu fa fi fr gl gu he hi hr hu id is it ja ka kk ko lt lv mk mr ms nb nl nn pa pl pt pt_BR ro ru si sk sq sr sv ta te tr ug uk ur ur_PK vi zh_CN zh_TW ]) + +dnl Check for required packages +XDT_CHECK_PACKAGE([LIBXFCE4UTIL], [libxfce4util-1.0], [4.9.0]) +XDT_CHECK_PACKAGE([LIBXFCE4UI], [libxfce4ui-1], [4.9.0]) +XDT_CHECK_PACKAGE([GTK], [gtk+-2.0], [2.20.0]) +XDT_CHECK_PACKAGE([GMODULE], [gmodule-2.0], [2.24.0]) +XDT_CHECK_PACKAGE([LIBWNCK], [libwnck-1.0], [2.30]) +XDT_CHECK_PACKAGE([DBUS], [dbus-1], [1.1.0]) +XDT_CHECK_PACKAGE([DBUS_GLIB], [dbus-glib-1], [0.84]) +XDT_CHECK_PACKAGE([XFCONF], [libxfconf-0], [4.9.0]) + +dnl Check for polkit / systemd integration +XDT_CHECK_OPTIONAL_PACKAGE([SYSTEMD], [polkit-gobject-1], [0.100], + [systemd], [Systemd support (through polit)]) + +dnl Check for debugging support +XDT_FEATURE_DEBUG([xfsm_debug_default]) + +dnl Check for linker optimizations +XDT_FEATURE_LINKER_OPTS() + +dnl Check for iceauth +AC_PATH_PROG([ICEAUTH], [iceauth]) +if test x"$ICEAUTH" != x""; then + AC_DEFINE_UNQUOTED([ICEAUTH_CMD], ["$ICEAUTH"], [path to iceauth]) +else + AC_MSG_ERROR([iceauth missing, please check your X11 installation]) +fi + +dnl Find a location for the session desktop file +AC_MSG_CHECKING([what xsession-prefix to use]) +AC_ARG_WITH([xsession-prefix], + AC_HELP_STRING([--with-xsession-prefix=XSESSION_PREFIX], [What should be the prefix for the xsession .desktop file?]), + [], [with_xsession_prefix="/usr"]) +XSESSION_PREFIX=$with_xsession_prefix +AC_SUBST([XSESSION_PREFIX]) +AC_MSG_RESULT([$with_xsession_prefix]) + +dnl Check for rm +AC_PATH_PROG([RM], [rm]) +if test x"$RM" != x""; then + AC_DEFINE_UNQUOTED([RM_CMD], ["$RM"], [path to rm]) +fi + +dnl Check for legacy session management +AC_ARG_ENABLE([legacy-sm], +AC_HELP_STRING([--enable-legacy-sm], [Enable X11R5 session management]) +AC_HELP_STRING([--disable-legacy-sm], [Disable X11R5 session management]), + [], [enable_legacy_sm=yes]) +AC_MSG_CHECKING([whether to enable X11R5 session management]) +if test x"$enable_legacy_sm" != x"yes"; then + AC_MSG_RESULT([no]) +else + AC_DEFINE([LEGACY_SESSION_MANAGEMENT], [1], [Define for X11R5 sm compat]) + AC_MSG_RESULT([yes]) +fi + +dnl check for linux/ioprio.h, and also check that the header actually +dnl works, as some kernels have bad headers. using AC_CHECK_HEADERS() +dnl prints a scary warning with a request to report a bug if it fails, +dnl but we do not want that. +AC_MSG_CHECKING([whether linux/ioprio.h exists and actually works]) +AC_COMPILE_IFELSE([ +AC_INCLUDES_DEFAULT +#include + ], [linux_ioprio_works=yes], [linux_ioprio_works=no]) +AC_MSG_RESULT([$linux_ioprio_works]) +if test "x$linux_ioprio_works" = "xyes"; then + AC_DEFINE([HAVE_WORKING_LINUX_IOPRIO_H], [1], + [Defined if linux/ioprio.h not only exists, but works properly]) +fi + +dnl check for location Xfce glade files were installed to +XFCE_GLADE_CATALOG_PATH="`pkg-config --variable glade_catalogdir libxfce4ui-1`" +XFCE_GLADE_PIXMAP_PATH="`pkg-config --variable glade_pixmapdir libxfce4ui-1`" +XFCE_GLADE_MODULE_PATH="`pkg-config --variable glade_moduledir libxfce4ui-1`" +AC_SUBST(XFCE_GLADE_CATALOG_PATH) +AC_SUBST(XFCE_GLADE_PIXMAP_PATH) +AC_SUBST(XFCE_GLADE_MODULE_PATH) + +AC_OUTPUT([ +Makefile +doc/Makefile +engines/Makefile +engines/balou/Makefile +engines/balou/scripts/Makefile +engines/balou/themes/Makefile +engines/balou/themes/Default/Makefile +engines/mice/Makefile +engines/simple/Makefile +icons/Makefile +icons/48x48/Makefile +icons/128x128/Makefile +icons/scalable/Makefile +libxfsm/Makefile +libxfsm/xfce4-session-2.0.pc +po/Makefile.in +settings/Makefile +scripts/Makefile +scripts/xinitrc.in +xfce4-session/Makefile +xfce4-session-logout/Makefile +xfsm-shutdown-helper/Makefile +]) + +dnl *************************** +dnl *** Print configuration *** +dnl *************************** +echo +echo "Build Configuration:" +echo +echo " * Debugging support: $enable_debug" +if test x"$enable_legacy_sm" = x"yes"; then +echo " * Legacy session management: yes" +else +echo " * Legacy session management: no" +fi +if test x"$GNOME_KEYRING_FOUND" = x"yes"; then +echo " * Gnome Keyring support: yes" +else +echo " * Gnome Keyring support: no" +fi + +echo diff -Nru xfce4-session-4.10.0/configure.in xfce4-session-4.10.1/configure.in --- xfce4-session-4.10.0/configure.in 2012-04-28 20:43:29.000000000 +0000 +++ xfce4-session-4.10.1/configure.in 1970-01-01 00:00:00.000000000 +0000 @@ -1,217 +0,0 @@ -dnl -dnl This file was autogenerated from "configure.in.in". -dnl Edit that file instead! -dnl - -dnl -dnl Copyright (c) 2003-2009 -dnl The Xfce development team. All rights reserved. -dnl -dnl Written for Xfce by Benedikt Meurer . -dnl - -dnl Version information -m4_define([xfsm_version_major], [4]) -m4_define([xfsm_version_minor], [10]) -m4_define([xfsm_version_micro], [0]) -m4_define([xfsm_version_nano], []) dnl leave this empty to have no nano version -m4_define([xfsm_version_build], [3692e76]) -m4_define([xfsm_version_tag], []) -m4_define([xfsm_version], [xfsm_version_major().xfsm_version_minor().xfsm_version_micro()ifelse(xfsm_version_nano(), [], [], [.xfsm_version_nano()])ifelse(xfsm_version_tag(), [git], [xfsm_version_tag()-xfsm_version_build()], [xfsm_version_tag()])]) - -m4_define([xfsm_debug_default], [ifelse(xfsm_version_tag(), [git], [full], [minimum])]) - -dnl Initialize autoconf -AC_COPYRIGHT([Copyright (c) 2003-2011 - The Xfce development team. All rights reserved. - -Written for Xfce by Benedikt Meurer .]) -AC_INIT([xfce4-session], [xfsm_version], [http://bugs.xfce.org/]) -AC_PREREQ([2.59c]) -AC_REVISION([$Id$]) -AC_PROG_MAKE_SET() - -dnl Initialize automake -AM_INIT_AUTOMAKE([AC_PACKAGE_TARNAME()], [AC_PACKAGE_VERSION()]) -AM_CONFIG_HEADER([config.h]) -AM_MAINTAINER_MODE() -m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])]) - -dnl Set helper path prefix -AC_ARG_WITH([helper-path-prefix], - [AC_HELP_STRING([--with-helper-path-prefix=PATH], - [Path prefix under which helper executables will be installed (default: $libdir)])], - [HELPER_PATH_PREFIX="$withval"], - [HELPER_PATH_PREFIX="$libdir"]) -AC_SUBST([HELPER_PATH_PREFIX]) - -dnl check for UNIX variants -AC_USE_SYSTEM_EXTENSIONS -AM_CONDITIONAL([HAVE_OS_CYGWIN], [test x"`uname | grep \"CYGWIN\"`" != x""]) -if test x"`uname | grep \"CYGWIN\"`" != x""; then - AC_DEFINE([HAVE_OS_CYGWIN], [1], [Compiling under cygwin]) -fi - -dnl check for basic programs -AC_PROG_CC() -AM_PROG_CC_C_O() -AC_PROG_INSTALL() -AC_PROG_INTLTOOL() -m4_ifdef([AC_PROG_SED], [AC_PROG_SED], [AC_CHECK_PROG(SED, sed, sed)]) - -dnl check for libtool -LT_PREREQ([2.2.6]) -LT_INIT([disable-static]) - -dnl check for standard header files -AC_HEADER_STDC -AC_CHECK_HEADERS([asm/unistd.h errno.h fcntl.h limits.h \ - netdb.h pwd.h signal.h stdarg.h sys/param.h sys/resource.h \ - sys/socket.h sys/time.h sys/wait.h sys/utsname.h time.h \ - unistd.h sys/param.h sys/user.h sys/sysctl.h math.h sys/types.h]) -AC_CHECK_FUNCS([getaddrinfo gethostbyname gethostname getpwuid setsid \ - sigaction strdup sync vfork]) - -dnl Check for required libraries -AC_CHECK_LIBM -AC_SUBST(LIBM) - -dnl Check for X11 installed -XDT_CHECK_LIBX11_REQUIRE() - -dnl Check for session management support -XDT_CHECK_LIBSM() - -dnl Check for _IceTransNoListen -ac_LIBS="$LIBS" -LIBS="$LIBS $LIBSM_LDFLAGS $LIBSM_LIBS" -AC_CHECK_FUNCS([_IceTransNoListen]) -LIBS="$ac_LIBS" - -dnl Check for i18n support -XDT_I18N([am ar ast az be bg bn_IN bn ca cs da de dz el en_GB eo es_MX es et eu fa fi fr gl gu he hi hr hu id is it ja ka kk ko lt lv mk mr ms nb nl nn pa pl pt_BR pt ro ru si sk sq sv ta te tr ug uk ur_PK ur vi zh_CN zh_TW ]) - -dnl Check for required packages -XDT_CHECK_PACKAGE([LIBXFCE4UTIL], [libxfce4util-1.0], [4.9.0]) -XDT_CHECK_PACKAGE([LIBXFCE4UI], [libxfce4ui-1], [4.9.0]) -XDT_CHECK_PACKAGE([GTK], [gtk+-2.0], [2.20.0]) -XDT_CHECK_PACKAGE([GMODULE], [gmodule-2.0], [2.24.0]) -XDT_CHECK_PACKAGE([LIBWNCK], [libwnck-1.0], [2.30]) -XDT_CHECK_PACKAGE([DBUS], [dbus-1], [1.1.0]) -XDT_CHECK_PACKAGE([DBUS_GLIB], [dbus-glib-1], [0.84]) -XDT_CHECK_PACKAGE([XFCONF], [libxfconf-0], [4.9.0]) - -dnl Check for gnome support -XDT_CHECK_OPTIONAL_PACKAGE([GNOME_KEYRING], [gnome-keyring-1], [2.22], - [libgnome-keyring], - [Extra gnome-keyring compatibility support], [no]) - -dnl Check for debugging support -XDT_FEATURE_DEBUG([xfsm_debug_default]) - -dnl Check for linker optimizations -XDT_FEATURE_LINKER_OPTS() - -dnl Check for iceauth -AC_PATH_PROG([ICEAUTH], [iceauth]) -if test x"$ICEAUTH" != x""; then - AC_DEFINE_UNQUOTED([ICEAUTH_CMD], ["$ICEAUTH"], [path to iceauth]) -else - AC_MSG_ERROR([iceauth missing, please check your X11 installation]) -fi - -dnl Find a location for the session desktop file -AC_MSG_CHECKING([what xsession-prefix to use]) -AC_ARG_WITH([xsession-prefix], - AC_HELP_STRING([--with-xsession-prefix=XSESSION_PREFIX], [What should be the prefix for the xsession .desktop file?]), - [], [with_xsession_prefix="/usr"]) -XSESSION_PREFIX=$with_xsession_prefix -AC_SUBST([XSESSION_PREFIX]) -AC_MSG_RESULT([$with_xsession_prefix]) - -dnl Check for rm -AC_PATH_PROG([RM], [rm]) -if test x"$RM" != x""; then - AC_DEFINE_UNQUOTED([RM_CMD], ["$RM"], [path to rm]) -fi - -dnl Check for legacy session management -AC_ARG_ENABLE([legacy-sm], -AC_HELP_STRING([--enable-legacy-sm], [Enable X11R5 session management]) -AC_HELP_STRING([--disable-legacy-sm], [Disable X11R5 session management]), - [], [enable_legacy_sm=yes]) -AC_MSG_CHECKING([whether to enable X11R5 session management]) -if test x"$enable_legacy_sm" != x"yes"; then - AC_MSG_RESULT([no]) -else - AC_DEFINE([LEGACY_SESSION_MANAGEMENT], [1], [Define for X11R5 sm compat]) - AC_MSG_RESULT([yes]) -fi - -dnl check for linux/ioprio.h, and also check that the header actually -dnl works, as some kernels have bad headers. using AC_CHECK_HEADERS() -dnl prints a scary warning with a request to report a bug if it fails, -dnl but we do not want that. -AC_MSG_CHECKING([whether linux/ioprio.h exists and actually works]) -AC_COMPILE_IFELSE([ -AC_INCLUDES_DEFAULT -#include - ], [linux_ioprio_works=yes], [linux_ioprio_works=no]) -AC_MSG_RESULT([$linux_ioprio_works]) -if test "x$linux_ioprio_works" = "xyes"; then - AC_DEFINE([HAVE_WORKING_LINUX_IOPRIO_H], [1], - [Defined if linux/ioprio.h not only exists, but works properly]) -fi - -dnl check for location Xfce glade files were installed to -XFCE_GLADE_CATALOG_PATH="`pkg-config --variable glade_catalogdir libxfce4ui-1`" -XFCE_GLADE_PIXMAP_PATH="`pkg-config --variable glade_pixmapdir libxfce4ui-1`" -XFCE_GLADE_MODULE_PATH="`pkg-config --variable glade_moduledir libxfce4ui-1`" -AC_SUBST(XFCE_GLADE_CATALOG_PATH) -AC_SUBST(XFCE_GLADE_PIXMAP_PATH) -AC_SUBST(XFCE_GLADE_MODULE_PATH) - -AC_OUTPUT([ -Makefile -doc/Makefile -engines/Makefile -engines/balou/Makefile -engines/balou/scripts/Makefile -engines/balou/themes/Makefile -engines/balou/themes/Default/Makefile -engines/mice/Makefile -engines/simple/Makefile -icons/Makefile -icons/48x48/Makefile -icons/128x128/Makefile -icons/scalable/Makefile -libxfsm/Makefile -libxfsm/xfce4-session-2.0.pc -po/Makefile.in -settings/Makefile -scripts/Makefile -scripts/xinitrc.in -xfce4-session/Makefile -xfce4-session-logout/Makefile -xfsm-shutdown-helper/Makefile -]) - -dnl *************************** -dnl *** Print configuration *** -dnl *************************** -echo -echo "Build Configuration:" -echo -echo " * Debugging support: $enable_debug" -if test x"$enable_legacy_sm" = x"yes"; then -echo " * Legacy session management: yes" -else -echo " * Legacy session management: no" -fi -if test x"$GNOME_KEYRING_FOUND" = x"yes"; then -echo " * Gnome Keyring support: yes" -else -echo " * Gnome Keyring support: no" -fi - -echo diff -Nru xfce4-session-4.10.0/debian/changelog xfce4-session-4.10.1/debian/changelog --- xfce4-session-4.10.0/debian/changelog 2012-10-13 13:42:10.000000000 +0000 +++ xfce4-session-4.10.1/debian/changelog 2013-05-06 09:54:16.000000000 +0000 @@ -1,3 +1,15 @@ +xfce4-session (4.10.1-SprezzOS1) unstable; urgency=low + + * New upstream + + -- Nick Black Mon, 06 May 2013 05:47:00 -0400 + +xfce4-session (4.10.0-SprezzOS1) unstable; urgency=low + + * SprezzOS build + + -- Nick Black Mon, 07 Jan 2013 03:11:26 -0500 + xfce4-session (4.10.0-2) experimental; urgency=low * debian/control: diff -Nru xfce4-session-4.10.0/debian/control xfce4-session-4.10.1/debian/control --- xfce4-session-4.10.0/debian/control 2012-08-05 08:46:57.000000000 +0000 +++ xfce4-session-4.10.1/debian/control 2013-05-06 09:54:16.000000000 +0000 @@ -1,14 +1,14 @@ Source: xfce4-session Section: xfce Priority: optional -Maintainer: Debian Xfce Maintainers -Uploaders: Yves-Alexis Perez , Lionel Le Folgoc +Maintainer: Nick Black +XSBC-Original-Maintainer: Debian Xfce Maintainers Build-Depends: debhelper (>= 9), libx11-dev, libxml-parser-perl, libdbus-1-dev, libdbus-glib-1-dev, libxfce4util-dev (>= 4.10.0), libxfce4ui-1-dev (>= 4.10.0), libwnck-dev, x11-xserver-utils, libxfconf-0-dev (>= 4.10.0), libglade2-dev, intltool (>= 0.31), dpkg-dev (>= 1.16.1) -Standards-Version: 3.9.3 +Standards-Version: 3.9.4 Homepage: http://www.xfce.org/ Vcs-Svn: svn://svn.debian.org/pkg-xfce/desktop/trunk/xfce4-session/ Vcs-Browser: http://svn.debian.org/wsvn/pkg-xfce/desktop/trunk/xfce4-session/ diff -Nru xfce4-session-4.10.0/debian/patches/0001-Handle-multiple-interactive-session-save-bug-5379.patch xfce4-session-4.10.1/debian/patches/0001-Handle-multiple-interactive-session-save-bug-5379.patch --- xfce4-session-4.10.0/debian/patches/0001-Handle-multiple-interactive-session-save-bug-5379.patch 2012-09-02 12:48:02.000000000 +0000 +++ xfce4-session-4.10.1/debian/patches/0001-Handle-multiple-interactive-session-save-bug-5379.patch 1970-01-01 00:00:00.000000000 +0000 @@ -1,151 +0,0 @@ -From 9f3077be682355e1cd07e9a9463e76307292208c Mon Sep 17 00:00:00 2001 -From: Dimitar Zhekov -Date: Thu, 30 Aug 2012 22:52:14 +0200 -Subject: [PATCH] Handle multiple interactive session save (bug #5379). - -Additionnaly, we now use SmSaveGlobal on log out / shutdown without -session save which avoids data loss. Previously clients would not save -anything on log out without session save. - -Based on original work by Chris Bainbridge (chris.bainbridge@gmail.com). ---- - xfce4-session/xfsm-manager.c | 81 ++++++++++++++++++++++++------------------ - 1 file changed, 47 insertions(+), 34 deletions(-) - -diff --git a/xfce4-session/xfsm-manager.c b/xfce4-session/xfsm-manager.c -index bf6a446..35811c5 100644 ---- a/xfce4-session/xfsm-manager.c -+++ b/xfce4-session/xfsm-manager.c -@@ -98,6 +98,7 @@ struct _XfsmManager - - XfsmShutdownType shutdown_type; - XfsmShutdown *shutdown_helper; -+ gboolean save_session; - - gboolean session_chooser; - gchar *session_name; -@@ -230,6 +231,7 @@ xfsm_manager_init (XfsmManager *manager) - manager->failsafe_mode = TRUE; - manager->shutdown_type = XFSM_SHUTDOWN_LOGOUT; - manager->shutdown_helper = xfsm_shutdown_get (); -+ manager->save_session = TRUE; - - manager->pending_properties = g_queue_new (); - manager->starting_properties = g_queue_new (); -@@ -989,7 +991,9 @@ xfsm_manager_interact (XfsmManager *manager, - XfsmClient *cl = lp->data; - if (xfsm_client_get_state (cl) == XFSM_CLIENT_INTERACTING) - { -- xfsm_client_set_state (cl, XFSM_CLIENT_WAITFORINTERACT); -+ /* a client is already interacting, so new client has to wait */ -+ xfsm_client_set_state (client, XFSM_CLIENT_WAITFORINTERACT); -+ xfsm_manager_cancel_client_save_timeout(manager, client); - return; - } - } -@@ -1138,44 +1142,47 @@ xfsm_manager_save_yourself_global (XfsmManager *manager, - } - } - -- if (!shutdown || shutdown_save) -+ /* don't save the session if shutting down without save */ -+ manager->save_session = !shutdown || shutdown_save; -+ -+ if (save_type == SmSaveBoth && !manager->save_session) - { -- xfsm_manager_set_state (manager, -- shutdown -- ? XFSM_MANAGER_SHUTDOWN -- : XFSM_MANAGER_CHECKPOINT); -+ /* saving the session, so clients should -+ * (prompt to) save the user data only */ -+ save_type = SmSaveGlobal; -+ } - -- /* handle legacy applications first! */ -- xfsm_legacy_perform_session_save (); -+ xfsm_manager_set_state (manager, -+ shutdown -+ ? XFSM_MANAGER_SHUTDOWN -+ : XFSM_MANAGER_CHECKPOINT); - -- for (lp = g_queue_peek_nth_link (manager->running_clients, 0); -- lp; -- lp = lp->next) -- { -- XfsmClient *client = lp->data; -- XfsmProperties *properties = xfsm_client_get_properties (client); -- const gchar *program; -+ /* handle legacy applications first! */ -+ if (manager->save_session) -+ xfsm_legacy_perform_session_save (); - -- /* xterm's session management is broken, so we won't -- * send a SAVE YOURSELF to xterms */ -- program = xfsm_properties_get_string (properties, SmProgram); -- if (program != NULL && strcasecmp (program, "xterm") == 0) -- continue; -+ for (lp = g_queue_peek_nth_link (manager->running_clients, 0); -+ lp; -+ lp = lp->next) -+ { -+ XfsmClient *client = lp->data; -+ XfsmProperties *properties = xfsm_client_get_properties (client); -+ const gchar *program; - -- if (xfsm_client_get_state (client) != XFSM_CLIENT_SAVINGLOCAL) -- { -- SmsSaveYourself (xfsm_client_get_sms_connection (client), save_type, shutdown, -- interact_style, fast); -- } -+ /* xterm's session management is broken, so we won't -+ * send a SAVE YOURSELF to xterms */ -+ program = xfsm_properties_get_string (properties, SmProgram); -+ if (program != NULL && strcasecmp (program, "xterm") == 0) -+ continue; - -- xfsm_client_set_state (client, XFSM_CLIENT_SAVING); -- xfsm_manager_start_client_save_timeout (manager, client); -+ if (xfsm_client_get_state (client) != XFSM_CLIENT_SAVINGLOCAL) -+ { -+ SmsSaveYourself (xfsm_client_get_sms_connection (client), save_type, shutdown, -+ interact_style, fast); - } -- } -- else -- { -- /* shutdown session without saving */ -- xfsm_manager_perform_shutdown (manager); -+ -+ xfsm_client_set_state (client, XFSM_CLIENT_SAVING); -+ xfsm_manager_start_client_save_timeout (manager, client); - } - } - -@@ -1249,7 +1256,12 @@ xfsm_manager_save_yourself_done (XfsmManager *manager, - XfsmClient *client, - gboolean success) - { -- if (xfsm_client_get_state (client) != XFSM_CLIENT_SAVING && xfsm_client_get_state (client) != XFSM_CLIENT_SAVINGLOCAL) -+ /* In xfsm_manager_interact_done we send SmsShutdownCancelled to clients in -+ XFSM_CLIENT_WAITFORINTERACT state. They respond with SmcSaveYourselfDone -+ (xsmp_shutdown_cancelled in libxfce4ui library) so we allow it here. */ -+ if (xfsm_client_get_state (client) != XFSM_CLIENT_SAVING && -+ xfsm_client_get_state (client) != XFSM_CLIENT_SAVINGLOCAL && -+ xfsm_client_get_state (client) != XFSM_CLIENT_WAITFORINTERACT) - { - xfsm_verbose ("Client Id = %s send SAVE YOURSELF DONE, while not being " - "in save mode. Prepare to be nuked!\n", -@@ -1521,7 +1533,8 @@ xfsm_manager_complete_saveyourself (XfsmManager *manager) - xfsm_verbose ("Manager finished SAVE YOURSELF, session data will be stored now.\n\n"); - - /* all clients done, store session data */ -- xfsm_manager_store_session (manager); -+ if (manager->save_session) -+ xfsm_manager_store_session (manager); - - if (manager->state == XFSM_MANAGER_CHECKPOINT) - { --- -1.7.10.4 - diff -Nru xfce4-session-4.10.0/debian/patches/series xfce4-session-4.10.1/debian/patches/series --- xfce4-session-4.10.0/debian/patches/series 2012-09-02 12:48:02.000000000 +0000 +++ xfce4-session-4.10.1/debian/patches/series 1970-01-01 00:00:00.000000000 +0000 @@ -1 +0,0 @@ -0001-Handle-multiple-interactive-session-save-bug-5379.patch diff -Nru xfce4-session-4.10.0/debian/rules xfce4-session-4.10.1/debian/rules --- xfce4-session-4.10.0/debian/rules 2012-04-08 20:05:04.000000000 +0000 +++ xfce4-session-4.10.1/debian/rules 2013-05-06 09:54:16.000000000 +0000 @@ -3,6 +3,9 @@ export DEB_LDFLAGS_MAINT_APPEND=-Wl,-z,defs -Wl,--as-needed -Wl,-O1 export DEB_BUILD_MAINT_OPTIONS=hardening=+pie,+bindnow +override_dh_auto_configure: + dh_auto_configure -- --enable-libgnome-keyring + override_dh_install: chmod 755 debian/tmp/etc/xdg/xfce4/xinitrc dh_install --fail-missing -X .la diff -Nru xfce4-session-4.10.0/depcomp xfce4-session-4.10.1/depcomp --- xfce4-session-4.10.0/depcomp 2012-04-28 20:43:34.000000000 +0000 +++ xfce4-session-4.10.1/depcomp 2013-05-05 15:33:59.000000000 +0000 @@ -1,10 +1,9 @@ #! /bin/sh # depcomp - compile a program generating dependencies as side-effects -scriptversion=2012-03-27.16; # UTC +scriptversion=2012-10-18.11; # UTC -# Copyright (C) 1999, 2000, 2003, 2004, 2005, 2006, 2007, 2009, 2010, -# 2011, 2012 Free Software Foundation, Inc. +# Copyright (C) 1999-2013 Free Software Foundation, Inc. # 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 @@ -28,9 +27,9 @@ case $1 in '') - echo "$0: No command. Try '$0 --help' for more information." 1>&2 - exit 1; - ;; + echo "$0: No command. Try '$0 --help' for more information." 1>&2 + exit 1; + ;; -h | --h*) cat <<\EOF Usage: depcomp [--help] [--version] PROGRAM [ARGS] @@ -57,11 +56,65 @@ ;; esac +# Get the directory component of the given path, and save it in the +# global variables '$dir'. Note that this directory component will +# be either empty or ending with a '/' character. This is deliberate. +set_dir_from () +{ + case $1 in + */*) dir=`echo "$1" | sed -e 's|/[^/]*$|/|'`;; + *) dir=;; + esac +} + +# Get the suffix-stripped basename of the given path, and save it the +# global variable '$base'. +set_base_from () +{ + base=`echo "$1" | sed -e 's|^.*/||' -e 's/\.[^.]*$//'` +} + +# If no dependency file was actually created by the compiler invocation, +# we still have to create a dummy depfile, to avoid errors with the +# Makefile "include basename.Plo" scheme. +make_dummy_depfile () +{ + echo "#dummy" > "$depfile" +} + +# Factor out some common post-processing of the generated depfile. +# Requires the auxiliary global variable '$tmpdepfile' to be set. +aix_post_process_depfile () +{ + # If the compiler actually managed to produce a dependency file, + # post-process it. + if test -f "$tmpdepfile"; then + # Each line is of the form 'foo.o: dependency.h'. + # Do two passes, one to just change these to + # $object: dependency.h + # and one to simply output + # dependency.h: + # which is needed to avoid the deleted-header problem. + { sed -e "s,^.*\.[$lower]*:,$object:," < "$tmpdepfile" + sed -e "s,^.*\.[$lower]*:[$tab ]*,," -e 's,$,:,' < "$tmpdepfile" + } > "$depfile" + rm -f "$tmpdepfile" + else + make_dummy_depfile + fi +} + # A tabulation character. tab=' ' # A newline character. nl=' ' +# Character ranges might be problematic outside the C locale. +# These definitions help. +upper=ABCDEFGHIJKLMNOPQRSTUVWXYZ +lower=abcdefghijklmnopqrstuvwxyz +digits=0123456789 +alpha=${upper}${lower} if test -z "$depmode" || test -z "$source" || test -z "$object"; then echo "depcomp: Variables source, object and depmode must be set" 1>&2 @@ -75,6 +128,9 @@ rm -f "$tmpdepfile" +# Avoid interferences from the environment. +gccflag= dashmflag= + # Some modes work just like other modes, but use different flags. We # parameterize here, but still list the modes in the big case below, # to make depend.m4 easier to write. Note that we *cannot* use a case @@ -86,32 +142,32 @@ fi if test "$depmode" = dashXmstdout; then - # This is just like dashmstdout with a different argument. - dashmflag=-xM - depmode=dashmstdout + # This is just like dashmstdout with a different argument. + dashmflag=-xM + depmode=dashmstdout fi cygpath_u="cygpath -u -f -" if test "$depmode" = msvcmsys; then - # This is just like msvisualcpp but w/o cygpath translation. - # Just convert the backslash-escaped backslashes to single forward - # slashes to satisfy depend.m4 - cygpath_u='sed s,\\\\,/,g' - depmode=msvisualcpp + # This is just like msvisualcpp but w/o cygpath translation. + # Just convert the backslash-escaped backslashes to single forward + # slashes to satisfy depend.m4 + cygpath_u='sed s,\\\\,/,g' + depmode=msvisualcpp fi if test "$depmode" = msvc7msys; then - # This is just like msvc7 but w/o cygpath translation. - # Just convert the backslash-escaped backslashes to single forward - # slashes to satisfy depend.m4 - cygpath_u='sed s,\\\\,/,g' - depmode=msvc7 + # This is just like msvc7 but w/o cygpath translation. + # Just convert the backslash-escaped backslashes to single forward + # slashes to satisfy depend.m4 + cygpath_u='sed s,\\\\,/,g' + depmode=msvc7 fi if test "$depmode" = xlc; then - # IBM C/C++ Compilers xlc/xlC can output gcc-like dependency informations. - gccflag=-qmakedep=gcc,-MF - depmode=gcc + # IBM C/C++ Compilers xlc/xlC can output gcc-like dependency information. + gccflag=-qmakedep=gcc,-MF + depmode=gcc fi case "$depmode" in @@ -134,8 +190,7 @@ done "$@" stat=$? - if test $stat -eq 0; then : - else + if test $stat -ne 0; then rm -f "$tmpdepfile" exit $stat fi @@ -143,13 +198,17 @@ ;; gcc) +## Note that this doesn't just cater to obsosete pre-3.x GCC compilers. +## but also to in-use compilers like IMB xlc/xlC and the HP C compiler. +## (see the conditional assignment to $gccflag above). ## There are various ways to get dependency output from gcc. Here's ## why we pick this rather obscure method: ## - Don't want to use -MD because we'd like the dependencies to end ## up in a subdir. Having to rename by hand is ugly. ## (We might end up doing this anyway to support other compilers.) ## - The DEPENDENCIES_OUTPUT environment variable makes gcc act like -## -MM, not -M (despite what the docs say). +## -MM, not -M (despite what the docs say). Also, it might not be +## supported by the other compilers which use the 'gcc' depmode. ## - Using -M directly means running the compiler twice (even worse ## than renaming). if test -z "$gccflag"; then @@ -157,15 +216,14 @@ fi "$@" -Wp,"$gccflag$tmpdepfile" stat=$? - if test $stat -eq 0; then : - else + if test $stat -ne 0; then rm -f "$tmpdepfile" exit $stat fi rm -f "$depfile" echo "$object : \\" > "$depfile" - alpha=ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz -## The second -e expression handles DOS-style file names with drive letters. + # The second -e expression handles DOS-style file names with drive + # letters. sed -e 's/^[^:]*: / /' \ -e 's/^['$alpha']:\/[^:]*: / /' < "$tmpdepfile" >> "$depfile" ## This next piece of magic avoids the "deleted header file" problem. @@ -174,15 +232,15 @@ ## typically no way to rebuild the header). We avoid this by adding ## dummy dependencies for each header file. Too bad gcc doesn't do ## this for us directly. - tr ' ' "$nl" < "$tmpdepfile" | ## Some versions of gcc put a space before the ':'. On the theory ## that the space means something, we add a space to the output as ## well. hp depmode also adds that space, but also prefixes the VPATH ## to the object. Take care to not repeat it in the output. ## Some versions of the HPUX 10.20 sed can't process this invocation ## correctly. Breaking it into two sed invocations is a workaround. - sed -e 's/^\\$//' -e '/^$/d' -e "s|.*$object$||" -e '/:$/d' \ - | sed -e 's/$/ :/' >> "$depfile" + tr ' ' "$nl" < "$tmpdepfile" \ + | sed -e 's/^\\$//' -e '/^$/d' -e "s|.*$object$||" -e '/:$/d' \ + | sed -e 's/$/ :/' >> "$depfile" rm -f "$tmpdepfile" ;; @@ -200,8 +258,7 @@ "$@" -MDupdate "$tmpdepfile" fi stat=$? - if test $stat -eq 0; then : - else + if test $stat -ne 0; then rm -f "$tmpdepfile" exit $stat fi @@ -209,7 +266,6 @@ if test -f "$tmpdepfile"; then # yes, the sourcefile depend on other files echo "$object : \\" > "$depfile" - # Clip off the initial element (the dependent). Don't try to be # clever and replace this with sed code, as IRIX sed won't handle # lines with more than a fixed number of characters (4096 in @@ -217,19 +273,15 @@ # the IRIX cc adds comments like '#:fec' to the end of the # dependency line. tr ' ' "$nl" < "$tmpdepfile" \ - | sed -e 's/^.*\.o://' -e 's/#.*$//' -e '/^$/ d' | \ - tr "$nl" ' ' >> "$depfile" + | sed -e 's/^.*\.o://' -e 's/#.*$//' -e '/^$/ d' \ + | tr "$nl" ' ' >> "$depfile" echo >> "$depfile" - # The second pass generates a dummy entry for each header file. tr ' ' "$nl" < "$tmpdepfile" \ - | sed -e 's/^.*\.o://' -e 's/#.*$//' -e '/^$/ d' -e 's/$/:/' \ - >> "$depfile" + | sed -e 's/^.*\.o://' -e 's/#.*$//' -e '/^$/ d' -e 's/$/:/' \ + >> "$depfile" else - # The sourcefile does not contain any dependencies, so just - # store a dummy comment line, to avoid errors with the Makefile - # "include basename.Plo" scheme. - echo "#dummy" > "$depfile" + make_dummy_depfile fi rm -f "$tmpdepfile" ;; @@ -247,9 +299,8 @@ # current directory. Also, the AIX compiler puts '$object:' at the # start of each line; $object doesn't have directory information. # Version 6 uses the directory in both cases. - dir=`echo "$object" | sed -e 's|/[^/]*$|/|'` - test "x$dir" = "x$object" && dir= - base=`echo "$object" | sed -e 's|^.*/||' -e 's/\.o$//' -e 's/\.lo$//'` + set_dir_from "$object" + set_base_from "$object" if test "$libtool" = yes; then tmpdepfile1=$dir$base.u tmpdepfile2=$base.u @@ -262,9 +313,7 @@ "$@" -M fi stat=$? - - if test $stat -eq 0; then : - else + if test $stat -ne 0; then rm -f "$tmpdepfile1" "$tmpdepfile2" "$tmpdepfile3" exit $stat fi @@ -273,65 +322,113 @@ do test -f "$tmpdepfile" && break done - if test -f "$tmpdepfile"; then - # Each line is of the form 'foo.o: dependent.h'. - # Do two passes, one to just change these to - # '$object: dependent.h' and one to simply 'dependent.h:'. - sed -e "s,^.*\.[a-z]*:,$object:," < "$tmpdepfile" > "$depfile" - sed -e 's,^.*\.[a-z]*:['"$tab"' ]*,,' -e 's,$,:,' < "$tmpdepfile" >> "$depfile" - else - # The sourcefile does not contain any dependencies, so just - # store a dummy comment line, to avoid errors with the Makefile - # "include basename.Plo" scheme. - echo "#dummy" > "$depfile" + aix_post_process_depfile + ;; + +tcc) + # tcc (Tiny C Compiler) understand '-MD -MF file' since version 0.9.26 + # FIXME: That version still under development at the moment of writing. + # Make that this statement remains true also for stable, released + # versions. + # It will wrap lines (doesn't matter whether long or short) with a + # trailing '\', as in: + # + # foo.o : \ + # foo.c \ + # foo.h \ + # + # It will put a trailing '\' even on the last line, and will use leading + # spaces rather than leading tabs (at least since its commit 0394caf7 + # "Emit spaces for -MD"). + "$@" -MD -MF "$tmpdepfile" + stat=$? + if test $stat -ne 0; then + rm -f "$tmpdepfile" + exit $stat fi + rm -f "$depfile" + # Each non-empty line is of the form 'foo.o : \' or ' dep.h \'. + # We have to change lines of the first kind to '$object: \'. + sed -e "s|.*:|$object :|" < "$tmpdepfile" > "$depfile" + # And for each line of the second kind, we have to emit a 'dep.h:' + # dummy dependency, to avoid the deleted-header problem. + sed -n -e 's|^ *\(.*\) *\\$|\1:|p' < "$tmpdepfile" >> "$depfile" rm -f "$tmpdepfile" ;; -icc) - # Intel's C compiler anf tcc (Tiny C Compiler) understand '-MD -MF file'. - # However on - # $CC -MD -MF foo.d -c -o sub/foo.o sub/foo.c - # ICC 7.0 will fill foo.d with something like - # foo.o: sub/foo.c - # foo.o: sub/foo.h - # which is wrong. We want - # sub/foo.o: sub/foo.c - # sub/foo.o: sub/foo.h - # sub/foo.c: - # sub/foo.h: - # ICC 7.1 will output +## The order of this option in the case statement is important, since the +## shell code in configure will try each of these formats in the order +## listed in this file. A plain '-MD' option would be understood by many +## compilers, so we must ensure this comes after the gcc and icc options. +pgcc) + # Portland's C compiler understands '-MD'. + # Will always output deps to 'file.d' where file is the root name of the + # source file under compilation, even if file resides in a subdirectory. + # The object file name does not affect the name of the '.d' file. + # pgcc 10.2 will output # foo.o: sub/foo.c sub/foo.h - # and will wrap long lines using '\': + # and will wrap long lines using '\' : # foo.o: sub/foo.c ... \ # sub/foo.h ... \ # ... - # tcc 0.9.26 (FIXME still under development at the moment of writing) - # will emit a similar output, but also prepend the continuation lines - # with horizontal tabulation characters. - "$@" -MD -MF "$tmpdepfile" - stat=$? - if test $stat -eq 0; then : - else + set_dir_from "$object" + # Use the source, not the object, to determine the base name, since + # that's sadly what pgcc will do too. + set_base_from "$source" + tmpdepfile=$base.d + + # For projects that build the same source file twice into different object + # files, the pgcc approach of using the *source* file root name can cause + # problems in parallel builds. Use a locking strategy to avoid stomping on + # the same $tmpdepfile. + lockdir=$base.d-lock + trap " + echo '$0: caught signal, cleaning up...' >&2 + rmdir '$lockdir' + exit 1 + " 1 2 13 15 + numtries=100 + i=$numtries + while test $i -gt 0; do + # mkdir is a portable test-and-set. + if mkdir "$lockdir" 2>/dev/null; then + # This process acquired the lock. + "$@" -MD + stat=$? + # Release the lock. + rmdir "$lockdir" + break + else + # If the lock is being held by a different process, wait + # until the winning process is done or we timeout. + while test -d "$lockdir" && test $i -gt 0; do + sleep 1 + i=`expr $i - 1` + done + fi + i=`expr $i - 1` + done + trap - 1 2 13 15 + if test $i -le 0; then + echo "$0: failed to acquire lock after $numtries attempts" >&2 + echo "$0: check lockdir '$lockdir'" >&2 + exit 1 + fi + + if test $stat -ne 0; then rm -f "$tmpdepfile" exit $stat fi rm -f "$depfile" - # Each line is of the form 'foo.o: dependent.h', - # or 'foo.o: dep1.h dep2.h \', or ' dep3.h dep4.h \'. + # Each line is of the form `foo.o: dependent.h', + # or `foo.o: dep1.h dep2.h \', or ` dep3.h dep4.h \'. # Do two passes, one to just change these to - # '$object: dependent.h' and one to simply 'dependent.h:'. - sed -e "s/^[ $tab][ $tab]*/ /" -e "s,^[^:]*:,$object :," \ - < "$tmpdepfile" > "$depfile" - sed ' - s/[ '"$tab"'][ '"$tab"']*/ /g - s/^ *// - s/ *\\*$// - s/^[^:]*: *// - /^$/d - /:$/d - s/$/ :/ - ' < "$tmpdepfile" >> "$depfile" + # `$object: dependent.h' and one to simply `dependent.h:'. + sed "s,^[^:]*:,$object :," < "$tmpdepfile" > "$depfile" + # Some versions of the HPUX 10.20 sed can't process this invocation + # correctly. Breaking it into two sed invocations is a workaround. + sed 's,^[^:]*: \(.*\)$,\1,;s/^\\$//;/^$/d;/:$/d' < "$tmpdepfile" \ + | sed -e 's/$/ :/' >> "$depfile" rm -f "$tmpdepfile" ;; @@ -342,9 +439,8 @@ # 'foo.d', which lands next to the object file, wherever that # happens to be. # Much of this is similar to the tru64 case; see comments there. - dir=`echo "$object" | sed -e 's|/[^/]*$|/|'` - test "x$dir" = "x$object" && dir= - base=`echo "$object" | sed -e 's|^.*/||' -e 's/\.o$//' -e 's/\.lo$//'` + set_dir_from "$object" + set_base_from "$object" if test "$libtool" = yes; then tmpdepfile1=$dir$base.d tmpdepfile2=$dir.libs/$base.d @@ -355,8 +451,7 @@ "$@" +Maked fi stat=$? - if test $stat -eq 0; then : - else + if test $stat -ne 0; then rm -f "$tmpdepfile1" "$tmpdepfile2" exit $stat fi @@ -366,76 +461,61 @@ test -f "$tmpdepfile" && break done if test -f "$tmpdepfile"; then - sed -e "s,^.*\.[a-z]*:,$object:," "$tmpdepfile" > "$depfile" + sed -e "s,^.*\.[$lower]*:,$object:," "$tmpdepfile" > "$depfile" # Add 'dependent.h:' lines. sed -ne '2,${ - s/^ *// - s/ \\*$// - s/$/:/ - p - }' "$tmpdepfile" >> "$depfile" + s/^ *// + s/ \\*$// + s/$/:/ + p + }' "$tmpdepfile" >> "$depfile" else - echo "#dummy" > "$depfile" + make_dummy_depfile fi rm -f "$tmpdepfile" "$tmpdepfile2" ;; tru64) - # The Tru64 compiler uses -MD to generate dependencies as a side - # effect. 'cc -MD -o foo.o ...' puts the dependencies into 'foo.o.d'. - # At least on Alpha/Redhat 6.1, Compaq CCC V6.2-504 seems to put - # dependencies in 'foo.d' instead, so we check for that too. - # Subdirectories are respected. - dir=`echo "$object" | sed -e 's|/[^/]*$|/|'` - test "x$dir" = "x$object" && dir= - base=`echo "$object" | sed -e 's|^.*/||' -e 's/\.o$//' -e 's/\.lo$//'` - - if test "$libtool" = yes; then - # With Tru64 cc, shared objects can also be used to make a - # static library. This mechanism is used in libtool 1.4 series to - # handle both shared and static libraries in a single compilation. - # With libtool 1.4, dependencies were output in $dir.libs/$base.lo.d. - # - # With libtool 1.5 this exception was removed, and libtool now - # generates 2 separate objects for the 2 libraries. These two - # compilations output dependencies in $dir.libs/$base.o.d and - # in $dir$base.o.d. We have to check for both files, because - # one of the two compilations can be disabled. We should prefer - # $dir$base.o.d over $dir.libs/$base.o.d because the latter is - # automatically cleaned when .libs/ is deleted, while ignoring - # the former would cause a distcleancheck panic. - tmpdepfile1=$dir.libs/$base.lo.d # libtool 1.4 - tmpdepfile2=$dir$base.o.d # libtool 1.5 - tmpdepfile3=$dir.libs/$base.o.d # libtool 1.5 - tmpdepfile4=$dir.libs/$base.d # Compaq CCC V6.2-504 - "$@" -Wc,-MD - else - tmpdepfile1=$dir$base.o.d - tmpdepfile2=$dir$base.d - tmpdepfile3=$dir$base.d - tmpdepfile4=$dir$base.d - "$@" -MD - fi + # The Tru64 compiler uses -MD to generate dependencies as a side + # effect. 'cc -MD -o foo.o ...' puts the dependencies into 'foo.o.d'. + # At least on Alpha/Redhat 6.1, Compaq CCC V6.2-504 seems to put + # dependencies in 'foo.d' instead, so we check for that too. + # Subdirectories are respected. + set_dir_from "$object" + set_base_from "$object" + + if test "$libtool" = yes; then + # Libtool generates 2 separate objects for the 2 libraries. These + # two compilations output dependencies in $dir.libs/$base.o.d and + # in $dir$base.o.d. We have to check for both files, because + # one of the two compilations can be disabled. We should prefer + # $dir$base.o.d over $dir.libs/$base.o.d because the latter is + # automatically cleaned when .libs/ is deleted, while ignoring + # the former would cause a distcleancheck panic. + tmpdepfile1=$dir$base.o.d # libtool 1.5 + tmpdepfile2=$dir.libs/$base.o.d # Likewise. + tmpdepfile3=$dir.libs/$base.d # Compaq CCC V6.2-504 + "$@" -Wc,-MD + else + tmpdepfile1=$dir$base.d + tmpdepfile2=$dir$base.d + tmpdepfile3=$dir$base.d + "$@" -MD + fi + + stat=$? + if test $stat -ne 0; then + rm -f "$tmpdepfile1" "$tmpdepfile2" "$tmpdepfile3" + exit $stat + fi - stat=$? - if test $stat -eq 0; then : - else - rm -f "$tmpdepfile1" "$tmpdepfile2" "$tmpdepfile3" "$tmpdepfile4" - exit $stat - fi - - for tmpdepfile in "$tmpdepfile1" "$tmpdepfile2" "$tmpdepfile3" "$tmpdepfile4" - do - test -f "$tmpdepfile" && break - done - if test -f "$tmpdepfile"; then - sed -e "s,^.*\.[a-z]*:,$object:," < "$tmpdepfile" > "$depfile" - sed -e 's,^.*\.[a-z]*:['"$tab"' ]*,,' -e 's,$,:,' < "$tmpdepfile" >> "$depfile" - else - echo "#dummy" > "$depfile" - fi - rm -f "$tmpdepfile" - ;; + for tmpdepfile in "$tmpdepfile1" "$tmpdepfile2" "$tmpdepfile3" + do + test -f "$tmpdepfile" && break + done + # Same post-processing that is required for AIX mode. + aix_post_process_depfile + ;; msvc7) if test "$libtool" = yes; then @@ -446,8 +526,7 @@ "$@" $showIncludes > "$tmpdepfile" stat=$? grep -v '^Note: including file: ' "$tmpdepfile" - if test "$stat" = 0; then : - else + if test $stat -ne 0; then rm -f "$tmpdepfile" exit $stat fi @@ -524,13 +603,14 @@ # in the target name. This is to cope with DOS-style filenames: # a dependency such as 'c:/foo/bar' could be seen as target 'c' otherwise. "$@" $dashmflag | - sed 's:^['"$tab"' ]*[^:'"$tab"' ][^:][^:]*\:['"$tab"' ]*:'"$object"'\: :' > "$tmpdepfile" + sed "s|^[$tab ]*[^:$tab ][^:][^:]*:[$tab ]*|$object: |" > "$tmpdepfile" rm -f "$depfile" cat < "$tmpdepfile" > "$depfile" - tr ' ' "$nl" < "$tmpdepfile" | \ -## Some versions of the HPUX 10.20 sed can't process this invocation -## correctly. Breaking it into two sed invocations is a workaround. - sed -e 's/^\\$//' -e '/^$/d' -e '/:$/d' | sed -e 's/$/ :/' >> "$depfile" + # Some versions of the HPUX 10.20 sed can't process this sed invocation + # correctly. Breaking it into two sed invocations is a workaround. + tr ' ' "$nl" < "$tmpdepfile" \ + | sed -e 's/^\\$//' -e '/^$/d' -e '/:$/d' \ + | sed -e 's/$/ :/' >> "$depfile" rm -f "$tmpdepfile" ;; @@ -583,10 +663,12 @@ # makedepend may prepend the VPATH from the source file name to the object. # No need to regex-escape $object, excess matching of '.' is harmless. sed "s|^.*\($object *:\)|\1|" "$tmpdepfile" > "$depfile" - sed '1,2d' "$tmpdepfile" | tr ' ' "$nl" | \ -## Some versions of the HPUX 10.20 sed can't process this invocation -## correctly. Breaking it into two sed invocations is a workaround. - sed -e 's/^\\$//' -e '/^$/d' -e '/:$/d' | sed -e 's/$/ :/' >> "$depfile" + # Some versions of the HPUX 10.20 sed can't process the last invocation + # correctly. Breaking it into two sed invocations is a workaround. + sed '1,2d' "$tmpdepfile" \ + | tr ' ' "$nl" \ + | sed -e 's/^\\$//' -e '/^$/d' -e '/:$/d' \ + | sed -e 's/$/ :/' >> "$depfile" rm -f "$tmpdepfile" "$tmpdepfile".bak ;; @@ -622,10 +704,10 @@ esac done - "$@" -E | - sed -n -e '/^# [0-9][0-9]* "\([^"]*\)".*/ s:: \1 \\:p' \ - -e '/^#line [0-9][0-9]* "\([^"]*\)".*/ s:: \1 \\:p' | - sed '$ s: \\$::' > "$tmpdepfile" + "$@" -E \ + | sed -n -e '/^# [0-9][0-9]* "\([^"]*\)".*/ s:: \1 \\:p' \ + -e '/^#line [0-9][0-9]* "\([^"]*\)".*/ s:: \1 \\:p' \ + | sed '$ s: \\$::' > "$tmpdepfile" rm -f "$depfile" echo "$object : \\" > "$depfile" cat < "$tmpdepfile" >> "$depfile" @@ -657,15 +739,15 @@ shift ;; "-Gm"|"/Gm"|"-Gi"|"/Gi"|"-ZI"|"/ZI") - set fnord "$@" - shift - shift - ;; + set fnord "$@" + shift + shift + ;; *) - set fnord "$@" "$arg" - shift - shift - ;; + set fnord "$@" "$arg" + shift + shift + ;; esac done "$@" -E 2>/dev/null | diff -Nru xfce4-session-4.10.0/doc/Makefile.in xfce4-session-4.10.1/doc/Makefile.in --- xfce4-session-4.10.0/doc/Makefile.in 2012-04-28 20:43:33.000000000 +0000 +++ xfce4-session-4.10.1/doc/Makefile.in 2013-05-05 15:33:59.000000000 +0000 @@ -1,9 +1,8 @@ -# Makefile.in generated by automake 1.11.5 from Makefile.am. +# Makefile.in generated by automake 1.13.1 from Makefile.am. # @configure_input@ -# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software -# Foundation, Inc. +# Copyright (C) 1994-2012 Free Software Foundation, Inc. + # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -52,21 +51,27 @@ build_triplet = @build@ host_triplet = @host@ subdir = doc -DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in +DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -am__aclocal_m4_deps = $(top_srcdir)/configure.in +am__aclocal_m4_deps = $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) -mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs +mkinstalldirs = $(install_sh) -d CONFIG_HEADER = $(top_builddir)/config.h CONFIG_CLEAN_FILES = CONFIG_CLEAN_VPATH_FILES = +AM_V_P = $(am__v_P_@AM_V@) +am__v_P_ = $(am__v_P_@AM_DEFAULT_V@) +am__v_P_0 = false +am__v_P_1 = : AM_V_GEN = $(am__v_GEN_@AM_V@) am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) -am__v_GEN_0 = @echo " GEN " $@; +am__v_GEN_0 = @echo " GEN " $@; +am__v_GEN_1 = AM_V_at = $(am__v_at_@AM_V@) am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) am__v_at_0 = @ +am__v_at_1 = SOURCES = DIST_SOURCES = am__can_run_installinfo = \ @@ -75,6 +80,7 @@ *) (install-info --version) >/dev/null 2>&1;; \ esac DATA = $(noinst_DATA) +am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP) DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) ACLOCAL = @ACLOCAL@ ALL_LINGUAS = @ALL_LINGUAS@ @@ -120,10 +126,6 @@ GMODULE_VERSION = @GMODULE_VERSION@ GMOFILES = @GMOFILES@ GMSGFMT = @GMSGFMT@ -GNOME_KEYRING_CFLAGS = @GNOME_KEYRING_CFLAGS@ -GNOME_KEYRING_LIBS = @GNOME_KEYRING_LIBS@ -GNOME_KEYRING_REQUIRED_VERSION = @GNOME_KEYRING_REQUIRED_VERSION@ -GNOME_KEYRING_VERSION = @GNOME_KEYRING_VERSION@ GREP = @GREP@ GTK_CFLAGS = @GTK_CFLAGS@ GTK_LIBS = @GTK_LIBS@ @@ -208,6 +210,10 @@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ STRIP = @STRIP@ +SYSTEMD_CFLAGS = @SYSTEMD_CFLAGS@ +SYSTEMD_LIBS = @SYSTEMD_LIBS@ +SYSTEMD_REQUIRED_VERSION = @SYSTEMD_REQUIRED_VERSION@ +SYSTEMD_VERSION = @SYSTEMD_VERSION@ USE_NLS = @USE_NLS@ VERSION = @VERSION@ XFCE_GLADE_CATALOG_PATH = @XFCE_GLADE_CATALOG_PATH@ @@ -326,11 +332,11 @@ clean-libtool: -rm -rf .libs _libs -tags: TAGS -TAGS: +tags TAGS: + +ctags CTAGS: -ctags: CTAGS -CTAGS: +cscope cscopelist: distdir: $(DISTFILES) @@ -466,15 +472,16 @@ .MAKE: install-am install-strip .PHONY: all all-am check check-am clean clean-generic clean-libtool \ - distclean distclean-generic distclean-libtool distdir dvi \ - dvi-am html html-am info info-am install install-am \ - install-data install-data-am install-dvi install-dvi-am \ - install-exec install-exec-am install-html install-html-am \ - install-info install-info-am install-man install-pdf \ - install-pdf-am install-ps install-ps-am install-strip \ - installcheck installcheck-am installdirs maintainer-clean \ - maintainer-clean-generic mostlyclean mostlyclean-generic \ - mostlyclean-libtool pdf pdf-am ps ps-am uninstall uninstall-am + cscopelist-am ctags-am distclean distclean-generic \ + distclean-libtool distdir dvi dvi-am html html-am info info-am \ + install install-am install-data install-data-am install-dvi \ + install-dvi-am install-exec install-exec-am install-html \ + install-html-am install-info install-info-am install-man \ + install-pdf install-pdf-am install-ps install-ps-am \ + install-strip installcheck installcheck-am installdirs \ + maintainer-clean maintainer-clean-generic mostlyclean \ + mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ + tags-am uninstall uninstall-am @SET_MAKE@ diff -Nru xfce4-session-4.10.0/engines/Makefile.in xfce4-session-4.10.1/engines/Makefile.in --- xfce4-session-4.10.0/engines/Makefile.in 2012-04-28 20:43:33.000000000 +0000 +++ xfce4-session-4.10.1/engines/Makefile.in 2013-05-05 15:33:59.000000000 +0000 @@ -1,9 +1,8 @@ -# Makefile.in generated by automake 1.11.5 from Makefile.am. +# Makefile.in generated by automake 1.13.1 from Makefile.am. # @configure_input@ -# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software -# Foundation, Inc. +# Copyright (C) 1994-2012 Free Software Foundation, Inc. + # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -51,30 +50,37 @@ build_triplet = @build@ host_triplet = @host@ subdir = engines -DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in +DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -am__aclocal_m4_deps = $(top_srcdir)/configure.in +am__aclocal_m4_deps = $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) -mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs +mkinstalldirs = $(install_sh) -d CONFIG_HEADER = $(top_builddir)/config.h CONFIG_CLEAN_FILES = CONFIG_CLEAN_VPATH_FILES = +AM_V_P = $(am__v_P_@AM_V@) +am__v_P_ = $(am__v_P_@AM_DEFAULT_V@) +am__v_P_0 = false +am__v_P_1 = : AM_V_GEN = $(am__v_GEN_@AM_V@) am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) -am__v_GEN_0 = @echo " GEN " $@; +am__v_GEN_0 = @echo " GEN " $@; +am__v_GEN_1 = AM_V_at = $(am__v_at_@AM_V@) am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) am__v_at_0 = @ +am__v_at_1 = SOURCES = DIST_SOURCES = -RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \ - html-recursive info-recursive install-data-recursive \ - install-dvi-recursive install-exec-recursive \ - install-html-recursive install-info-recursive \ - install-pdf-recursive install-ps-recursive install-recursive \ - installcheck-recursive installdirs-recursive pdf-recursive \ - ps-recursive uninstall-recursive +RECURSIVE_TARGETS = all-recursive check-recursive cscopelist-recursive \ + ctags-recursive dvi-recursive html-recursive info-recursive \ + install-data-recursive install-dvi-recursive \ + install-exec-recursive install-html-recursive \ + install-info-recursive install-pdf-recursive \ + install-ps-recursive install-recursive installcheck-recursive \ + installdirs-recursive pdf-recursive ps-recursive \ + tags-recursive uninstall-recursive am__can_run_installinfo = \ case $$AM_UPDATE_INFO_DIR in \ n|no|NO) false;; \ @@ -82,9 +88,29 @@ esac RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive \ distclean-recursive maintainer-clean-recursive -AM_RECURSIVE_TARGETS = $(RECURSIVE_TARGETS:-recursive=) \ - $(RECURSIVE_CLEAN_TARGETS:-recursive=) tags TAGS ctags CTAGS \ +am__recursive_targets = \ + $(RECURSIVE_TARGETS) \ + $(RECURSIVE_CLEAN_TARGETS) \ + $(am__extra_recursive_targets) +AM_RECURSIVE_TARGETS = $(am__recursive_targets:-recursive=) TAGS CTAGS \ distdir +am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP) +# Read a list of newline-separated strings from the standard input, +# and print each of them once, without duplicates. Input order is +# *not* preserved. +am__uniquify_input = $(AWK) '\ + BEGIN { nonempty = 0; } \ + { items[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in items) print i; }; } \ +' +# Make sure the list of sources is unique. This is necessary because, +# e.g., the same source file might be shared among _SOURCES variables +# for different programs/libraries. +am__define_uniq_tagged_files = \ + list='$(am__tagged_files)'; \ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | $(am__uniquify_input)` ETAGS = etags CTAGS = ctags DIST_SUBDIRS = $(SUBDIRS) @@ -158,10 +184,6 @@ GMODULE_VERSION = @GMODULE_VERSION@ GMOFILES = @GMOFILES@ GMSGFMT = @GMSGFMT@ -GNOME_KEYRING_CFLAGS = @GNOME_KEYRING_CFLAGS@ -GNOME_KEYRING_LIBS = @GNOME_KEYRING_LIBS@ -GNOME_KEYRING_REQUIRED_VERSION = @GNOME_KEYRING_REQUIRED_VERSION@ -GNOME_KEYRING_VERSION = @GNOME_KEYRING_VERSION@ GREP = @GREP@ GTK_CFLAGS = @GTK_CFLAGS@ GTK_LIBS = @GTK_LIBS@ @@ -246,6 +268,10 @@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ STRIP = @STRIP@ +SYSTEMD_CFLAGS = @SYSTEMD_CFLAGS@ +SYSTEMD_LIBS = @SYSTEMD_LIBS@ +SYSTEMD_REQUIRED_VERSION = @SYSTEMD_REQUIRED_VERSION@ +SYSTEMD_VERSION = @SYSTEMD_VERSION@ USE_NLS = @USE_NLS@ VERSION = @VERSION@ XFCE_GLADE_CATALOG_PATH = @XFCE_GLADE_CATALOG_PATH@ @@ -363,12 +389,12 @@ -rm -rf .libs _libs # This directory's subdirectories are mostly independent; you can cd -# into them and run `make' without going through this Makefile. -# To change the values of `make' variables: instead of editing Makefiles, -# (1) if the variable is set in `config.status', edit `config.status' -# (which will cause the Makefiles to be regenerated when you run `make'); -# (2) otherwise, pass the desired values on the `make' command line. -$(RECURSIVE_TARGETS): +# into them and run 'make' without going through this Makefile. +# To change the values of 'make' variables: instead of editing Makefiles, +# (1) if the variable is set in 'config.status', edit 'config.status' +# (which will cause the Makefiles to be regenerated when you run 'make'); +# (2) otherwise, pass the desired values on the 'make' command line. +$(am__recursive_targets): @fail= failcom='exit 1'; \ for f in x $$MAKEFLAGS; do \ case $$f in \ @@ -378,7 +404,11 @@ done; \ dot_seen=no; \ target=`echo $@ | sed s/-recursive//`; \ - list='$(SUBDIRS)'; for subdir in $$list; do \ + case "$@" in \ + distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \ + *) list='$(SUBDIRS)' ;; \ + esac; \ + for subdir in $$list; do \ echo "Making $$target in $$subdir"; \ if test "$$subdir" = "."; then \ dot_seen=yes; \ @@ -393,57 +423,12 @@ $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \ fi; test -z "$$fail" -$(RECURSIVE_CLEAN_TARGETS): - @fail= failcom='exit 1'; \ - for f in x $$MAKEFLAGS; do \ - case $$f in \ - *=* | --[!k]*);; \ - *k*) failcom='fail=yes';; \ - esac; \ - done; \ - dot_seen=no; \ - case "$@" in \ - distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \ - *) list='$(SUBDIRS)' ;; \ - esac; \ - rev=''; for subdir in $$list; do \ - if test "$$subdir" = "."; then :; else \ - rev="$$subdir $$rev"; \ - fi; \ - done; \ - rev="$$rev ."; \ - target=`echo $@ | sed s/-recursive//`; \ - for subdir in $$rev; do \ - echo "Making $$target in $$subdir"; \ - if test "$$subdir" = "."; then \ - local_target="$$target-am"; \ - else \ - local_target="$$target"; \ - fi; \ - ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \ - || eval $$failcom; \ - done && test -z "$$fail" -tags-recursive: - list='$(SUBDIRS)'; for subdir in $$list; do \ - test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \ - done -ctags-recursive: - list='$(SUBDIRS)'; for subdir in $$list; do \ - test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \ - done +ID: $(am__tagged_files) + $(am__define_uniq_tagged_files); mkid -fID $$unique +tags: tags-recursive +TAGS: tags -ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ - mkid -fID $$unique -tags: TAGS - -TAGS: tags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) +tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) set x; \ here=`pwd`; \ if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \ @@ -459,12 +444,7 @@ set "$$@" "$$include_option=$$here/$$subdir/TAGS"; \ fi; \ done; \ - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ + $(am__define_uniq_tagged_files); \ shift; \ if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \ test -n "$$unique" || unique=$$empty_fix; \ @@ -476,15 +456,11 @@ $$unique; \ fi; \ fi -ctags: CTAGS -CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ +ctags: ctags-recursive + +CTAGS: ctags +ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) + $(am__define_uniq_tagged_files); \ test -z "$(CTAGS_ARGS)$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ $$unique @@ -493,6 +469,21 @@ here=`$(am__cd) $(top_builddir) && pwd` \ && $(am__cd) $(top_srcdir) \ && gtags -i $(GTAGS_ARGS) "$$here" +cscopelist: cscopelist-recursive + +cscopelist-am: $(am__tagged_files) + list='$(am__tagged_files)'; \ + case "$(srcdir)" in \ + [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \ + *) sdir=$(subdir)/$(srcdir) ;; \ + esac; \ + for i in $$list; do \ + if test -f "$$i"; then \ + echo "$(subdir)/$$i"; \ + else \ + echo "$$sdir/$$i"; \ + fi; \ + done >> $(top_builddir)/cscope.files distclean-tags: -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags @@ -653,22 +644,20 @@ uninstall-am: -.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) ctags-recursive \ - install-am install-strip tags-recursive +.MAKE: $(am__recursive_targets) install-am install-strip -.PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \ - all all-am check check-am clean clean-generic clean-libtool \ - ctags ctags-recursive distclean distclean-generic \ - distclean-libtool distclean-tags distdir dvi dvi-am html \ - html-am info info-am install install-am install-data \ - install-data-am install-dvi install-dvi-am install-exec \ - install-exec-am install-html install-html-am install-info \ - install-info-am install-man install-pdf install-pdf-am \ - install-ps install-ps-am install-strip installcheck \ - installcheck-am installdirs installdirs-am maintainer-clean \ - maintainer-clean-generic mostlyclean mostlyclean-generic \ - mostlyclean-libtool pdf pdf-am ps ps-am tags tags-recursive \ - uninstall uninstall-am +.PHONY: $(am__recursive_targets) CTAGS GTAGS TAGS all all-am check \ + check-am clean clean-generic clean-libtool cscopelist-am ctags \ + ctags-am distclean distclean-generic distclean-libtool \ + distclean-tags distdir dvi dvi-am html html-am info info-am \ + install install-am install-data install-data-am install-dvi \ + install-dvi-am install-exec install-exec-am install-html \ + install-html-am install-info install-info-am install-man \ + install-pdf install-pdf-am install-ps install-ps-am \ + install-strip installcheck installcheck-am installdirs \ + installdirs-am maintainer-clean maintainer-clean-generic \ + mostlyclean mostlyclean-generic mostlyclean-libtool pdf pdf-am \ + ps ps-am tags tags-am uninstall uninstall-am # Tell versions [3.59,3.63) of GNU make to not export all variables. diff -Nru xfce4-session-4.10.0/engines/balou/Makefile.in xfce4-session-4.10.1/engines/balou/Makefile.in --- xfce4-session-4.10.0/engines/balou/Makefile.in 2012-04-28 20:43:33.000000000 +0000 +++ xfce4-session-4.10.1/engines/balou/Makefile.in 2013-05-05 15:33:59.000000000 +0000 @@ -1,9 +1,8 @@ -# Makefile.in generated by automake 1.11.5 from Makefile.am. +# Makefile.in generated by automake 1.13.1 from Makefile.am. # @configure_input@ -# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software -# Foundation, Inc. +# Copyright (C) 1994-2012 Free Software Foundation, Inc. + # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -52,12 +51,13 @@ build_triplet = @build@ host_triplet = @host@ subdir = engines/balou -DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in TODO +DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \ + $(top_srcdir)/depcomp TODO ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -am__aclocal_m4_deps = $(top_srcdir)/configure.in +am__aclocal_m4_deps = $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) -mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs +mkinstalldirs = $(install_sh) -d CONFIG_HEADER = $(top_builddir)/config.h CONFIG_CLEAN_FILES = CONFIG_CLEAN_VPATH_FILES = @@ -98,9 +98,22 @@ AM_V_lt = $(am__v_lt_@AM_V@) am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@) am__v_lt_0 = --silent +am__v_lt_1 = libbalou_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \ $(LIBTOOLFLAGS) --mode=link $(CCLD) $(libbalou_la_CFLAGS) \ $(CFLAGS) $(libbalou_la_LDFLAGS) $(LDFLAGS) -o $@ +AM_V_P = $(am__v_P_@AM_V@) +am__v_P_ = $(am__v_P_@AM_DEFAULT_V@) +am__v_P_0 = false +am__v_P_1 = : +AM_V_GEN = $(am__v_GEN_@AM_V@) +am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) +am__v_GEN_0 = @echo " GEN " $@; +am__v_GEN_1 = +AM_V_at = $(am__v_at_@AM_V@) +am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) +am__v_at_0 = @ +am__v_at_1 = DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir) depcomp = $(SHELL) $(top_srcdir)/depcomp am__depfiles_maybe = depfiles @@ -113,29 +126,26 @@ $(AM_CFLAGS) $(CFLAGS) AM_V_CC = $(am__v_CC_@AM_V@) am__v_CC_ = $(am__v_CC_@AM_DEFAULT_V@) -am__v_CC_0 = @echo " CC " $@; -AM_V_at = $(am__v_at_@AM_V@) -am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) -am__v_at_0 = @ +am__v_CC_0 = @echo " CC " $@; +am__v_CC_1 = CCLD = $(CC) LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \ $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ $(AM_LDFLAGS) $(LDFLAGS) -o $@ AM_V_CCLD = $(am__v_CCLD_@AM_V@) am__v_CCLD_ = $(am__v_CCLD_@AM_DEFAULT_V@) -am__v_CCLD_0 = @echo " CCLD " $@; -AM_V_GEN = $(am__v_GEN_@AM_V@) -am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) -am__v_GEN_0 = @echo " GEN " $@; +am__v_CCLD_0 = @echo " CCLD " $@; +am__v_CCLD_1 = SOURCES = $(libbalou_la_SOURCES) DIST_SOURCES = $(libbalou_la_SOURCES) -RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \ - html-recursive info-recursive install-data-recursive \ - install-dvi-recursive install-exec-recursive \ - install-html-recursive install-info-recursive \ - install-pdf-recursive install-ps-recursive install-recursive \ - installcheck-recursive installdirs-recursive pdf-recursive \ - ps-recursive uninstall-recursive +RECURSIVE_TARGETS = all-recursive check-recursive cscopelist-recursive \ + ctags-recursive dvi-recursive html-recursive info-recursive \ + install-data-recursive install-dvi-recursive \ + install-exec-recursive install-html-recursive \ + install-info-recursive install-pdf-recursive \ + install-ps-recursive install-recursive installcheck-recursive \ + installdirs-recursive pdf-recursive ps-recursive \ + tags-recursive uninstall-recursive am__can_run_installinfo = \ case $$AM_UPDATE_INFO_DIR in \ n|no|NO) false;; \ @@ -143,9 +153,29 @@ esac RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive \ distclean-recursive maintainer-clean-recursive -AM_RECURSIVE_TARGETS = $(RECURSIVE_TARGETS:-recursive=) \ - $(RECURSIVE_CLEAN_TARGETS:-recursive=) tags TAGS ctags CTAGS \ +am__recursive_targets = \ + $(RECURSIVE_TARGETS) \ + $(RECURSIVE_CLEAN_TARGETS) \ + $(am__extra_recursive_targets) +AM_RECURSIVE_TARGETS = $(am__recursive_targets:-recursive=) TAGS CTAGS \ distdir +am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP) +# Read a list of newline-separated strings from the standard input, +# and print each of them once, without duplicates. Input order is +# *not* preserved. +am__uniquify_input = $(AWK) '\ + BEGIN { nonempty = 0; } \ + { items[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in items) print i; }; } \ +' +# Make sure the list of sources is unique. This is necessary because, +# e.g., the same source file might be shared among _SOURCES variables +# for different programs/libraries. +am__define_uniq_tagged_files = \ + list='$(am__tagged_files)'; \ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | $(am__uniquify_input)` ETAGS = etags CTAGS = ctags DIST_SUBDIRS = $(SUBDIRS) @@ -219,10 +249,6 @@ GMODULE_VERSION = @GMODULE_VERSION@ GMOFILES = @GMOFILES@ GMSGFMT = @GMSGFMT@ -GNOME_KEYRING_CFLAGS = @GNOME_KEYRING_CFLAGS@ -GNOME_KEYRING_LIBS = @GNOME_KEYRING_LIBS@ -GNOME_KEYRING_REQUIRED_VERSION = @GNOME_KEYRING_REQUIRED_VERSION@ -GNOME_KEYRING_VERSION = @GNOME_KEYRING_VERSION@ GREP = @GREP@ GTK_CFLAGS = @GTK_CFLAGS@ GTK_LIBS = @GTK_LIBS@ @@ -307,6 +333,10 @@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ STRIP = @STRIP@ +SYSTEMD_CFLAGS = @SYSTEMD_CFLAGS@ +SYSTEMD_LIBS = @SYSTEMD_LIBS@ +SYSTEMD_REQUIRED_VERSION = @SYSTEMD_REQUIRED_VERSION@ +SYSTEMD_VERSION = @SYSTEMD_VERSION@ USE_NLS = @USE_NLS@ VERSION = @VERSION@ XFCE_GLADE_CATALOG_PATH = @XFCE_GLADE_CATALOG_PATH@ @@ -449,6 +479,7 @@ $(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh $(am__aclocal_m4_deps): + install-balouLTLIBRARIES: $(balou_LTLIBRARIES) @$(NORMAL_INSTALL) @list='$(balou_LTLIBRARIES)'; test -n "$(baloudir)" || list=; \ @@ -475,12 +506,14 @@ clean-balouLTLIBRARIES: -test -z "$(balou_LTLIBRARIES)" || rm -f $(balou_LTLIBRARIES) - @list='$(balou_LTLIBRARIES)'; for p in $$list; do \ - dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \ - test "$$dir" != "$$p" || dir=.; \ - echo "rm -f \"$${dir}/so_locations\""; \ - rm -f "$${dir}/so_locations"; \ - done + @list='$(balou_LTLIBRARIES)'; \ + locs=`for p in $$list; do echo $$p; done | \ + sed 's|^[^/]*$$|.|; s|/[^/]*$$||; s|$$|/so_locations|' | \ + sort -u`; \ + test -z "$$locs" || { \ + echo rm -f $${locs}; \ + rm -f $${locs}; \ + } libbalou.la: $(libbalou_la_OBJECTS) $(libbalou_la_DEPENDENCIES) $(EXTRA_libbalou_la_DEPENDENCIES) $(AM_V_CCLD)$(libbalou_la_LINK) -rpath $(baloudir) $(libbalou_la_OBJECTS) $(libbalou_la_LIBADD) $(LIBS) @@ -559,12 +592,12 @@ -rm -rf .libs _libs # This directory's subdirectories are mostly independent; you can cd -# into them and run `make' without going through this Makefile. -# To change the values of `make' variables: instead of editing Makefiles, -# (1) if the variable is set in `config.status', edit `config.status' -# (which will cause the Makefiles to be regenerated when you run `make'); -# (2) otherwise, pass the desired values on the `make' command line. -$(RECURSIVE_TARGETS): +# into them and run 'make' without going through this Makefile. +# To change the values of 'make' variables: instead of editing Makefiles, +# (1) if the variable is set in 'config.status', edit 'config.status' +# (which will cause the Makefiles to be regenerated when you run 'make'); +# (2) otherwise, pass the desired values on the 'make' command line. +$(am__recursive_targets): @fail= failcom='exit 1'; \ for f in x $$MAKEFLAGS; do \ case $$f in \ @@ -574,7 +607,11 @@ done; \ dot_seen=no; \ target=`echo $@ | sed s/-recursive//`; \ - list='$(SUBDIRS)'; for subdir in $$list; do \ + case "$@" in \ + distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \ + *) list='$(SUBDIRS)' ;; \ + esac; \ + for subdir in $$list; do \ echo "Making $$target in $$subdir"; \ if test "$$subdir" = "."; then \ dot_seen=yes; \ @@ -589,57 +626,12 @@ $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \ fi; test -z "$$fail" -$(RECURSIVE_CLEAN_TARGETS): - @fail= failcom='exit 1'; \ - for f in x $$MAKEFLAGS; do \ - case $$f in \ - *=* | --[!k]*);; \ - *k*) failcom='fail=yes';; \ - esac; \ - done; \ - dot_seen=no; \ - case "$@" in \ - distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \ - *) list='$(SUBDIRS)' ;; \ - esac; \ - rev=''; for subdir in $$list; do \ - if test "$$subdir" = "."; then :; else \ - rev="$$subdir $$rev"; \ - fi; \ - done; \ - rev="$$rev ."; \ - target=`echo $@ | sed s/-recursive//`; \ - for subdir in $$rev; do \ - echo "Making $$target in $$subdir"; \ - if test "$$subdir" = "."; then \ - local_target="$$target-am"; \ - else \ - local_target="$$target"; \ - fi; \ - ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \ - || eval $$failcom; \ - done && test -z "$$fail" -tags-recursive: - list='$(SUBDIRS)'; for subdir in $$list; do \ - test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \ - done -ctags-recursive: - list='$(SUBDIRS)'; for subdir in $$list; do \ - test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \ - done - -ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ - mkid -fID $$unique -tags: TAGS +ID: $(am__tagged_files) + $(am__define_uniq_tagged_files); mkid -fID $$unique +tags: tags-recursive +TAGS: tags -TAGS: tags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) +tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) set x; \ here=`pwd`; \ if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \ @@ -655,12 +647,7 @@ set "$$@" "$$include_option=$$here/$$subdir/TAGS"; \ fi; \ done; \ - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ + $(am__define_uniq_tagged_files); \ shift; \ if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \ test -n "$$unique" || unique=$$empty_fix; \ @@ -672,15 +659,11 @@ $$unique; \ fi; \ fi -ctags: CTAGS -CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ +ctags: ctags-recursive + +CTAGS: ctags +ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) + $(am__define_uniq_tagged_files); \ test -z "$(CTAGS_ARGS)$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ $$unique @@ -689,6 +672,21 @@ here=`$(am__cd) $(top_builddir) && pwd` \ && $(am__cd) $(top_srcdir) \ && gtags -i $(GTAGS_ARGS) "$$here" +cscopelist: cscopelist-recursive + +cscopelist-am: $(am__tagged_files) + list='$(am__tagged_files)'; \ + case "$(srcdir)" in \ + [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \ + *) sdir=$(subdir)/$(srcdir) ;; \ + esac; \ + for i in $$list; do \ + if test -f "$$i"; then \ + echo "$(subdir)/$$i"; \ + else \ + echo "$$sdir/$$i"; \ + fi; \ + done >> $(top_builddir)/cscope.files distclean-tags: -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags @@ -857,12 +855,11 @@ uninstall-am: uninstall-balouLTLIBRARIES -.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) ctags-recursive \ - install-am install-strip tags-recursive +.MAKE: $(am__recursive_targets) install-am install-strip -.PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \ - all all-am check check-am clean clean-balouLTLIBRARIES \ - clean-generic clean-libtool ctags ctags-recursive distclean \ +.PHONY: $(am__recursive_targets) CTAGS GTAGS TAGS all all-am check \ + check-am clean clean-balouLTLIBRARIES clean-generic \ + clean-libtool cscopelist-am ctags ctags-am distclean \ distclean-compile distclean-generic distclean-libtool \ distclean-tags distdir dvi dvi-am html html-am info info-am \ install install-am install-balouLTLIBRARIES install-data \ @@ -873,8 +870,7 @@ installcheck-am installdirs installdirs-am maintainer-clean \ maintainer-clean-generic mostlyclean mostlyclean-compile \ mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ - tags tags-recursive uninstall uninstall-am \ - uninstall-balouLTLIBRARIES + tags tags-am uninstall uninstall-am uninstall-balouLTLIBRARIES # Tell versions [3.59,3.63) of GNU make to not export all variables. diff -Nru xfce4-session-4.10.0/engines/balou/scripts/Makefile.in xfce4-session-4.10.1/engines/balou/scripts/Makefile.in --- xfce4-session-4.10.0/engines/balou/scripts/Makefile.in 2012-04-28 20:43:33.000000000 +0000 +++ xfce4-session-4.10.1/engines/balou/scripts/Makefile.in 2013-05-05 15:33:59.000000000 +0000 @@ -1,9 +1,8 @@ -# Makefile.in generated by automake 1.11.5 from Makefile.am. +# Makefile.in generated by automake 1.13.1 from Makefile.am. # @configure_input@ -# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software -# Foundation, Inc. +# Copyright (C) 1994-2012 Free Software Foundation, Inc. + # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -52,12 +51,12 @@ build_triplet = @build@ host_triplet = @host@ subdir = engines/balou/scripts -DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in +DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -am__aclocal_m4_deps = $(top_srcdir)/configure.in +am__aclocal_m4_deps = $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) -mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs +mkinstalldirs = $(install_sh) -d CONFIG_HEADER = $(top_builddir)/config.h CONFIG_CLEAN_FILES = CONFIG_CLEAN_VPATH_FILES = @@ -90,12 +89,18 @@ } am__installdirs = "$(DESTDIR)$(baloursciptsdir)" SCRIPTS = $(balourscipts_SCRIPTS) +AM_V_P = $(am__v_P_@AM_V@) +am__v_P_ = $(am__v_P_@AM_DEFAULT_V@) +am__v_P_0 = false +am__v_P_1 = : AM_V_GEN = $(am__v_GEN_@AM_V@) am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) -am__v_GEN_0 = @echo " GEN " $@; +am__v_GEN_0 = @echo " GEN " $@; +am__v_GEN_1 = AM_V_at = $(am__v_at_@AM_V@) am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) am__v_at_0 = @ +am__v_at_1 = SOURCES = DIST_SOURCES = am__can_run_installinfo = \ @@ -103,6 +108,7 @@ n|no|NO) false;; \ *) (install-info --version) >/dev/null 2>&1;; \ esac +am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP) DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) ACLOCAL = @ACLOCAL@ ALL_LINGUAS = @ALL_LINGUAS@ @@ -148,10 +154,6 @@ GMODULE_VERSION = @GMODULE_VERSION@ GMOFILES = @GMOFILES@ GMSGFMT = @GMSGFMT@ -GNOME_KEYRING_CFLAGS = @GNOME_KEYRING_CFLAGS@ -GNOME_KEYRING_LIBS = @GNOME_KEYRING_LIBS@ -GNOME_KEYRING_REQUIRED_VERSION = @GNOME_KEYRING_REQUIRED_VERSION@ -GNOME_KEYRING_VERSION = @GNOME_KEYRING_VERSION@ GREP = @GREP@ GTK_CFLAGS = @GTK_CFLAGS@ GTK_LIBS = @GTK_LIBS@ @@ -236,6 +238,10 @@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ STRIP = @STRIP@ +SYSTEMD_CFLAGS = @SYSTEMD_CFLAGS@ +SYSTEMD_LIBS = @SYSTEMD_LIBS@ +SYSTEMD_REQUIRED_VERSION = @SYSTEMD_REQUIRED_VERSION@ +SYSTEMD_VERSION = @SYSTEMD_VERSION@ USE_NLS = @USE_NLS@ VERSION = @VERSION@ XFCE_GLADE_CATALOG_PATH = @XFCE_GLADE_CATALOG_PATH@ @@ -387,11 +393,11 @@ clean-libtool: -rm -rf .libs _libs -tags: TAGS -TAGS: +tags TAGS: + +ctags CTAGS: -ctags: CTAGS -CTAGS: +cscope cscopelist: distdir: $(DISTFILES) @@ -530,16 +536,17 @@ .MAKE: install-am install-strip .PHONY: all all-am check check-am clean clean-generic clean-libtool \ - distclean distclean-generic distclean-libtool distdir dvi \ - dvi-am html html-am info info-am install install-am \ - install-baloursciptsSCRIPTS install-data install-data-am \ - install-dvi install-dvi-am install-exec install-exec-am \ - install-html install-html-am install-info install-info-am \ - install-man install-pdf install-pdf-am install-ps \ - install-ps-am install-strip installcheck installcheck-am \ - installdirs maintainer-clean maintainer-clean-generic \ - mostlyclean mostlyclean-generic mostlyclean-libtool pdf pdf-am \ - ps ps-am uninstall uninstall-am uninstall-baloursciptsSCRIPTS + cscopelist-am ctags-am distclean distclean-generic \ + distclean-libtool distdir dvi dvi-am html html-am info info-am \ + install install-am install-baloursciptsSCRIPTS install-data \ + install-data-am install-dvi install-dvi-am install-exec \ + install-exec-am install-html install-html-am install-info \ + install-info-am install-man install-pdf install-pdf-am \ + install-ps install-ps-am install-strip installcheck \ + installcheck-am installdirs maintainer-clean \ + maintainer-clean-generic mostlyclean mostlyclean-generic \ + mostlyclean-libtool pdf pdf-am ps ps-am tags-am uninstall \ + uninstall-am uninstall-baloursciptsSCRIPTS # Tell versions [3.59,3.63) of GNU make to not export all variables. diff -Nru xfce4-session-4.10.0/engines/balou/themes/Default/Makefile.in xfce4-session-4.10.1/engines/balou/themes/Default/Makefile.in --- xfce4-session-4.10.0/engines/balou/themes/Default/Makefile.in 2012-04-28 20:43:33.000000000 +0000 +++ xfce4-session-4.10.1/engines/balou/themes/Default/Makefile.in 2013-05-05 15:33:59.000000000 +0000 @@ -1,9 +1,8 @@ -# Makefile.in generated by automake 1.11.5 from Makefile.am. +# Makefile.in generated by automake 1.13.1 from Makefile.am. # @configure_input@ -# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software -# Foundation, Inc. +# Copyright (C) 1994-2012 Free Software Foundation, Inc. + # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -52,21 +51,27 @@ build_triplet = @build@ host_triplet = @host@ subdir = engines/balou/themes/Default -DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in +DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -am__aclocal_m4_deps = $(top_srcdir)/configure.in +am__aclocal_m4_deps = $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) -mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs +mkinstalldirs = $(install_sh) -d CONFIG_HEADER = $(top_builddir)/config.h CONFIG_CLEAN_FILES = CONFIG_CLEAN_VPATH_FILES = +AM_V_P = $(am__v_P_@AM_V@) +am__v_P_ = $(am__v_P_@AM_DEFAULT_V@) +am__v_P_0 = false +am__v_P_1 = : AM_V_GEN = $(am__v_GEN_@AM_V@) am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) -am__v_GEN_0 = @echo " GEN " $@; +am__v_GEN_0 = @echo " GEN " $@; +am__v_GEN_1 = AM_V_at = $(am__v_at_@AM_V@) am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) am__v_at_0 = @ +am__v_at_1 = SOURCES = DIST_SOURCES = am__can_run_installinfo = \ @@ -103,6 +108,7 @@ } am__installdirs = "$(DESTDIR)$(themedir)" DATA = $(theme_DATA) +am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP) DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) ACLOCAL = @ACLOCAL@ ALL_LINGUAS = @ALL_LINGUAS@ @@ -148,10 +154,6 @@ GMODULE_VERSION = @GMODULE_VERSION@ GMOFILES = @GMOFILES@ GMSGFMT = @GMSGFMT@ -GNOME_KEYRING_CFLAGS = @GNOME_KEYRING_CFLAGS@ -GNOME_KEYRING_LIBS = @GNOME_KEYRING_LIBS@ -GNOME_KEYRING_REQUIRED_VERSION = @GNOME_KEYRING_REQUIRED_VERSION@ -GNOME_KEYRING_VERSION = @GNOME_KEYRING_VERSION@ GREP = @GREP@ GTK_CFLAGS = @GTK_CFLAGS@ GTK_LIBS = @GTK_LIBS@ @@ -236,6 +238,10 @@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ STRIP = @STRIP@ +SYSTEMD_CFLAGS = @SYSTEMD_CFLAGS@ +SYSTEMD_LIBS = @SYSTEMD_LIBS@ +SYSTEMD_REQUIRED_VERSION = @SYSTEMD_REQUIRED_VERSION@ +SYSTEMD_VERSION = @SYSTEMD_VERSION@ USE_NLS = @USE_NLS@ VERSION = @VERSION@ XFCE_GLADE_CATALOG_PATH = @XFCE_GLADE_CATALOG_PATH@ @@ -375,11 +381,11 @@ @list='$(theme_DATA)'; test -n "$(themedir)" || list=; \ files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \ dir='$(DESTDIR)$(themedir)'; $(am__uninstall_files_from_dir) -tags: TAGS -TAGS: +tags TAGS: + +ctags CTAGS: -ctags: CTAGS -CTAGS: +cscope cscopelist: distdir: $(DISTFILES) @@ -518,16 +524,16 @@ .MAKE: install-am install-strip .PHONY: all all-am check check-am clean clean-generic clean-libtool \ - distclean distclean-generic distclean-libtool distdir dvi \ - dvi-am html html-am info info-am install install-am \ - install-data install-data-am install-dvi install-dvi-am \ - install-exec install-exec-am install-html install-html-am \ - install-info install-info-am install-man install-pdf \ - install-pdf-am install-ps install-ps-am install-strip \ - install-themeDATA installcheck installcheck-am installdirs \ - maintainer-clean maintainer-clean-generic mostlyclean \ - mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ - uninstall uninstall-am uninstall-themeDATA + cscopelist-am ctags-am distclean distclean-generic \ + distclean-libtool distdir dvi dvi-am html html-am info info-am \ + install install-am install-data install-data-am install-dvi \ + install-dvi-am install-exec install-exec-am install-html \ + install-html-am install-info install-info-am install-man \ + install-pdf install-pdf-am install-ps install-ps-am \ + install-strip install-themeDATA installcheck installcheck-am \ + installdirs maintainer-clean maintainer-clean-generic \ + mostlyclean mostlyclean-generic mostlyclean-libtool pdf pdf-am \ + ps ps-am tags-am uninstall uninstall-am uninstall-themeDATA # Tell versions [3.59,3.63) of GNU make to not export all variables. diff -Nru xfce4-session-4.10.0/engines/balou/themes/Makefile.in xfce4-session-4.10.1/engines/balou/themes/Makefile.in --- xfce4-session-4.10.0/engines/balou/themes/Makefile.in 2012-04-28 20:43:33.000000000 +0000 +++ xfce4-session-4.10.1/engines/balou/themes/Makefile.in 2013-05-05 15:33:59.000000000 +0000 @@ -1,9 +1,8 @@ -# Makefile.in generated by automake 1.11.5 from Makefile.am. +# Makefile.in generated by automake 1.13.1 from Makefile.am. # @configure_input@ -# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software -# Foundation, Inc. +# Copyright (C) 1994-2012 Free Software Foundation, Inc. + # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -51,30 +50,37 @@ build_triplet = @build@ host_triplet = @host@ subdir = engines/balou/themes -DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in +DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -am__aclocal_m4_deps = $(top_srcdir)/configure.in +am__aclocal_m4_deps = $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) -mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs +mkinstalldirs = $(install_sh) -d CONFIG_HEADER = $(top_builddir)/config.h CONFIG_CLEAN_FILES = CONFIG_CLEAN_VPATH_FILES = +AM_V_P = $(am__v_P_@AM_V@) +am__v_P_ = $(am__v_P_@AM_DEFAULT_V@) +am__v_P_0 = false +am__v_P_1 = : AM_V_GEN = $(am__v_GEN_@AM_V@) am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) -am__v_GEN_0 = @echo " GEN " $@; +am__v_GEN_0 = @echo " GEN " $@; +am__v_GEN_1 = AM_V_at = $(am__v_at_@AM_V@) am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) am__v_at_0 = @ +am__v_at_1 = SOURCES = DIST_SOURCES = -RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \ - html-recursive info-recursive install-data-recursive \ - install-dvi-recursive install-exec-recursive \ - install-html-recursive install-info-recursive \ - install-pdf-recursive install-ps-recursive install-recursive \ - installcheck-recursive installdirs-recursive pdf-recursive \ - ps-recursive uninstall-recursive +RECURSIVE_TARGETS = all-recursive check-recursive cscopelist-recursive \ + ctags-recursive dvi-recursive html-recursive info-recursive \ + install-data-recursive install-dvi-recursive \ + install-exec-recursive install-html-recursive \ + install-info-recursive install-pdf-recursive \ + install-ps-recursive install-recursive installcheck-recursive \ + installdirs-recursive pdf-recursive ps-recursive \ + tags-recursive uninstall-recursive am__can_run_installinfo = \ case $$AM_UPDATE_INFO_DIR in \ n|no|NO) false;; \ @@ -82,9 +88,29 @@ esac RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive \ distclean-recursive maintainer-clean-recursive -AM_RECURSIVE_TARGETS = $(RECURSIVE_TARGETS:-recursive=) \ - $(RECURSIVE_CLEAN_TARGETS:-recursive=) tags TAGS ctags CTAGS \ +am__recursive_targets = \ + $(RECURSIVE_TARGETS) \ + $(RECURSIVE_CLEAN_TARGETS) \ + $(am__extra_recursive_targets) +AM_RECURSIVE_TARGETS = $(am__recursive_targets:-recursive=) TAGS CTAGS \ distdir +am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP) +# Read a list of newline-separated strings from the standard input, +# and print each of them once, without duplicates. Input order is +# *not* preserved. +am__uniquify_input = $(AWK) '\ + BEGIN { nonempty = 0; } \ + { items[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in items) print i; }; } \ +' +# Make sure the list of sources is unique. This is necessary because, +# e.g., the same source file might be shared among _SOURCES variables +# for different programs/libraries. +am__define_uniq_tagged_files = \ + list='$(am__tagged_files)'; \ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | $(am__uniquify_input)` ETAGS = etags CTAGS = ctags DIST_SUBDIRS = $(SUBDIRS) @@ -158,10 +184,6 @@ GMODULE_VERSION = @GMODULE_VERSION@ GMOFILES = @GMOFILES@ GMSGFMT = @GMSGFMT@ -GNOME_KEYRING_CFLAGS = @GNOME_KEYRING_CFLAGS@ -GNOME_KEYRING_LIBS = @GNOME_KEYRING_LIBS@ -GNOME_KEYRING_REQUIRED_VERSION = @GNOME_KEYRING_REQUIRED_VERSION@ -GNOME_KEYRING_VERSION = @GNOME_KEYRING_VERSION@ GREP = @GREP@ GTK_CFLAGS = @GTK_CFLAGS@ GTK_LIBS = @GTK_LIBS@ @@ -246,6 +268,10 @@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ STRIP = @STRIP@ +SYSTEMD_CFLAGS = @SYSTEMD_CFLAGS@ +SYSTEMD_LIBS = @SYSTEMD_LIBS@ +SYSTEMD_REQUIRED_VERSION = @SYSTEMD_REQUIRED_VERSION@ +SYSTEMD_VERSION = @SYSTEMD_VERSION@ USE_NLS = @USE_NLS@ VERSION = @VERSION@ XFCE_GLADE_CATALOG_PATH = @XFCE_GLADE_CATALOG_PATH@ @@ -359,12 +385,12 @@ -rm -rf .libs _libs # This directory's subdirectories are mostly independent; you can cd -# into them and run `make' without going through this Makefile. -# To change the values of `make' variables: instead of editing Makefiles, -# (1) if the variable is set in `config.status', edit `config.status' -# (which will cause the Makefiles to be regenerated when you run `make'); -# (2) otherwise, pass the desired values on the `make' command line. -$(RECURSIVE_TARGETS): +# into them and run 'make' without going through this Makefile. +# To change the values of 'make' variables: instead of editing Makefiles, +# (1) if the variable is set in 'config.status', edit 'config.status' +# (which will cause the Makefiles to be regenerated when you run 'make'); +# (2) otherwise, pass the desired values on the 'make' command line. +$(am__recursive_targets): @fail= failcom='exit 1'; \ for f in x $$MAKEFLAGS; do \ case $$f in \ @@ -374,7 +400,11 @@ done; \ dot_seen=no; \ target=`echo $@ | sed s/-recursive//`; \ - list='$(SUBDIRS)'; for subdir in $$list; do \ + case "$@" in \ + distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \ + *) list='$(SUBDIRS)' ;; \ + esac; \ + for subdir in $$list; do \ echo "Making $$target in $$subdir"; \ if test "$$subdir" = "."; then \ dot_seen=yes; \ @@ -389,57 +419,12 @@ $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \ fi; test -z "$$fail" -$(RECURSIVE_CLEAN_TARGETS): - @fail= failcom='exit 1'; \ - for f in x $$MAKEFLAGS; do \ - case $$f in \ - *=* | --[!k]*);; \ - *k*) failcom='fail=yes';; \ - esac; \ - done; \ - dot_seen=no; \ - case "$@" in \ - distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \ - *) list='$(SUBDIRS)' ;; \ - esac; \ - rev=''; for subdir in $$list; do \ - if test "$$subdir" = "."; then :; else \ - rev="$$subdir $$rev"; \ - fi; \ - done; \ - rev="$$rev ."; \ - target=`echo $@ | sed s/-recursive//`; \ - for subdir in $$rev; do \ - echo "Making $$target in $$subdir"; \ - if test "$$subdir" = "."; then \ - local_target="$$target-am"; \ - else \ - local_target="$$target"; \ - fi; \ - ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \ - || eval $$failcom; \ - done && test -z "$$fail" -tags-recursive: - list='$(SUBDIRS)'; for subdir in $$list; do \ - test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \ - done -ctags-recursive: - list='$(SUBDIRS)'; for subdir in $$list; do \ - test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \ - done +ID: $(am__tagged_files) + $(am__define_uniq_tagged_files); mkid -fID $$unique +tags: tags-recursive +TAGS: tags -ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ - mkid -fID $$unique -tags: TAGS - -TAGS: tags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) +tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) set x; \ here=`pwd`; \ if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \ @@ -455,12 +440,7 @@ set "$$@" "$$include_option=$$here/$$subdir/TAGS"; \ fi; \ done; \ - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ + $(am__define_uniq_tagged_files); \ shift; \ if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \ test -n "$$unique" || unique=$$empty_fix; \ @@ -472,15 +452,11 @@ $$unique; \ fi; \ fi -ctags: CTAGS -CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ +ctags: ctags-recursive + +CTAGS: ctags +ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) + $(am__define_uniq_tagged_files); \ test -z "$(CTAGS_ARGS)$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ $$unique @@ -489,6 +465,21 @@ here=`$(am__cd) $(top_builddir) && pwd` \ && $(am__cd) $(top_srcdir) \ && gtags -i $(GTAGS_ARGS) "$$here" +cscopelist: cscopelist-recursive + +cscopelist-am: $(am__tagged_files) + list='$(am__tagged_files)'; \ + case "$(srcdir)" in \ + [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \ + *) sdir=$(subdir)/$(srcdir) ;; \ + esac; \ + for i in $$list; do \ + if test -f "$$i"; then \ + echo "$(subdir)/$$i"; \ + else \ + echo "$$sdir/$$i"; \ + fi; \ + done >> $(top_builddir)/cscope.files distclean-tags: -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags @@ -649,22 +640,20 @@ uninstall-am: -.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) ctags-recursive \ - install-am install-strip tags-recursive +.MAKE: $(am__recursive_targets) install-am install-strip -.PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \ - all all-am check check-am clean clean-generic clean-libtool \ - ctags ctags-recursive distclean distclean-generic \ - distclean-libtool distclean-tags distdir dvi dvi-am html \ - html-am info info-am install install-am install-data \ - install-data-am install-dvi install-dvi-am install-exec \ - install-exec-am install-html install-html-am install-info \ - install-info-am install-man install-pdf install-pdf-am \ - install-ps install-ps-am install-strip installcheck \ - installcheck-am installdirs installdirs-am maintainer-clean \ - maintainer-clean-generic mostlyclean mostlyclean-generic \ - mostlyclean-libtool pdf pdf-am ps ps-am tags tags-recursive \ - uninstall uninstall-am +.PHONY: $(am__recursive_targets) CTAGS GTAGS TAGS all all-am check \ + check-am clean clean-generic clean-libtool cscopelist-am ctags \ + ctags-am distclean distclean-generic distclean-libtool \ + distclean-tags distdir dvi dvi-am html html-am info info-am \ + install install-am install-data install-data-am install-dvi \ + install-dvi-am install-exec install-exec-am install-html \ + install-html-am install-info install-info-am install-man \ + install-pdf install-pdf-am install-ps install-ps-am \ + install-strip installcheck installcheck-am installdirs \ + installdirs-am maintainer-clean maintainer-clean-generic \ + mostlyclean mostlyclean-generic mostlyclean-libtool pdf pdf-am \ + ps ps-am tags tags-am uninstall uninstall-am # Tell versions [3.59,3.63) of GNU make to not export all variables. diff -Nru xfce4-session-4.10.0/engines/mice/Makefile.in xfce4-session-4.10.1/engines/mice/Makefile.in --- xfce4-session-4.10.0/engines/mice/Makefile.in 2012-04-28 20:43:33.000000000 +0000 +++ xfce4-session-4.10.1/engines/mice/Makefile.in 2013-05-05 15:33:59.000000000 +0000 @@ -1,9 +1,8 @@ -# Makefile.in generated by automake 1.11.5 from Makefile.am. +# Makefile.in generated by automake 1.13.1 from Makefile.am. # @configure_input@ -# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software -# Foundation, Inc. +# Copyright (C) 1994-2012 Free Software Foundation, Inc. + # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -54,12 +53,13 @@ host_triplet = @host@ noinst_PROGRAMS = generate$(EXEEXT) subdir = engines/mice -DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in +DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \ + $(top_srcdir)/depcomp ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -am__aclocal_m4_deps = $(top_srcdir)/configure.in +am__aclocal_m4_deps = $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) -mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs +mkinstalldirs = $(install_sh) -d CONFIG_HEADER = $(top_builddir)/config.h CONFIG_CLEAN_FILES = CONFIG_CLEAN_VPATH_FILES = @@ -98,6 +98,7 @@ AM_V_lt = $(am__v_lt_@AM_V@) am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@) am__v_lt_0 = --silent +am__v_lt_1 = libmice_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \ $(LIBTOOLFLAGS) --mode=link $(CCLD) $(libmice_la_CFLAGS) \ $(CFLAGS) $(libmice_la_LDFLAGS) $(LDFLAGS) -o $@ @@ -108,6 +109,18 @@ generate_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \ $(LIBTOOLFLAGS) --mode=link $(CCLD) $(generate_CFLAGS) \ $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@ +AM_V_P = $(am__v_P_@AM_V@) +am__v_P_ = $(am__v_P_@AM_DEFAULT_V@) +am__v_P_0 = false +am__v_P_1 = : +AM_V_GEN = $(am__v_GEN_@AM_V@) +am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) +am__v_GEN_0 = @echo " GEN " $@; +am__v_GEN_1 = +AM_V_at = $(am__v_at_@AM_V@) +am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) +am__v_at_0 = @ +am__v_at_1 = DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir) depcomp = $(SHELL) $(top_srcdir)/depcomp am__depfiles_maybe = depfiles @@ -120,20 +133,16 @@ $(AM_CFLAGS) $(CFLAGS) AM_V_CC = $(am__v_CC_@AM_V@) am__v_CC_ = $(am__v_CC_@AM_DEFAULT_V@) -am__v_CC_0 = @echo " CC " $@; -AM_V_at = $(am__v_at_@AM_V@) -am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) -am__v_at_0 = @ +am__v_CC_0 = @echo " CC " $@; +am__v_CC_1 = CCLD = $(CC) LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \ $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ $(AM_LDFLAGS) $(LDFLAGS) -o $@ AM_V_CCLD = $(am__v_CCLD_@AM_V@) am__v_CCLD_ = $(am__v_CCLD_@AM_DEFAULT_V@) -am__v_CCLD_0 = @echo " CCLD " $@; -AM_V_GEN = $(am__v_GEN_@AM_V@) -am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) -am__v_GEN_0 = @echo " GEN " $@; +am__v_CCLD_0 = @echo " CCLD " $@; +am__v_CCLD_1 = SOURCES = $(libmice_la_SOURCES) $(generate_SOURCES) DIST_SOURCES = $(libmice_la_SOURCES) $(generate_SOURCES) am__can_run_installinfo = \ @@ -141,6 +150,23 @@ n|no|NO) false;; \ *) (install-info --version) >/dev/null 2>&1;; \ esac +am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP) +# Read a list of newline-separated strings from the standard input, +# and print each of them once, without duplicates. Input order is +# *not* preserved. +am__uniquify_input = $(AWK) '\ + BEGIN { nonempty = 0; } \ + { items[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in items) print i; }; } \ +' +# Make sure the list of sources is unique. This is necessary because, +# e.g., the same source file might be shared among _SOURCES variables +# for different programs/libraries. +am__define_uniq_tagged_files = \ + list='$(am__tagged_files)'; \ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | $(am__uniquify_input)` ETAGS = etags CTAGS = ctags DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) @@ -188,10 +214,6 @@ GMODULE_VERSION = @GMODULE_VERSION@ GMOFILES = @GMOFILES@ GMSGFMT = @GMSGFMT@ -GNOME_KEYRING_CFLAGS = @GNOME_KEYRING_CFLAGS@ -GNOME_KEYRING_LIBS = @GNOME_KEYRING_LIBS@ -GNOME_KEYRING_REQUIRED_VERSION = @GNOME_KEYRING_REQUIRED_VERSION@ -GNOME_KEYRING_VERSION = @GNOME_KEYRING_VERSION@ GREP = @GREP@ GTK_CFLAGS = @GTK_CFLAGS@ GTK_LIBS = @GTK_LIBS@ @@ -276,6 +298,10 @@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ STRIP = @STRIP@ +SYSTEMD_CFLAGS = @SYSTEMD_CFLAGS@ +SYSTEMD_LIBS = @SYSTEMD_LIBS@ +SYSTEMD_REQUIRED_VERSION = @SYSTEMD_REQUIRED_VERSION@ +SYSTEMD_VERSION = @SYSTEMD_VERSION@ USE_NLS = @USE_NLS@ VERSION = @VERSION@ XFCE_GLADE_CATALOG_PATH = @XFCE_GLADE_CATALOG_PATH@ @@ -427,6 +453,7 @@ $(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh $(am__aclocal_m4_deps): + install-miceLTLIBRARIES: $(mice_LTLIBRARIES) @$(NORMAL_INSTALL) @list='$(mice_LTLIBRARIES)'; test -n "$(micedir)" || list=; \ @@ -453,12 +480,14 @@ clean-miceLTLIBRARIES: -test -z "$(mice_LTLIBRARIES)" || rm -f $(mice_LTLIBRARIES) - @list='$(mice_LTLIBRARIES)'; for p in $$list; do \ - dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \ - test "$$dir" != "$$p" || dir=.; \ - echo "rm -f \"$${dir}/so_locations\""; \ - rm -f "$${dir}/so_locations"; \ - done + @list='$(mice_LTLIBRARIES)'; \ + locs=`for p in $$list; do echo $$p; done | \ + sed 's|^[^/]*$$|.|; s|/[^/]*$$||; s|$$|/so_locations|' | \ + sort -u`; \ + test -z "$$locs" || { \ + echo rm -f $${locs}; \ + rm -f $${locs}; \ + } libmice.la: $(libmice_la_OBJECTS) $(libmice_la_DEPENDENCIES) $(EXTRA_libmice_la_DEPENDENCIES) $(AM_V_CCLD)$(libmice_la_LINK) -rpath $(micedir) $(libmice_la_OBJECTS) $(libmice_la_LIBADD) $(LIBS) @@ -531,26 +560,15 @@ clean-libtool: -rm -rf .libs _libs -ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ - mkid -fID $$unique -tags: TAGS +ID: $(am__tagged_files) + $(am__define_uniq_tagged_files); mkid -fID $$unique +tags: tags-am +TAGS: tags -TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) +tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) set x; \ here=`pwd`; \ - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ + $(am__define_uniq_tagged_files); \ shift; \ if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \ test -n "$$unique" || unique=$$empty_fix; \ @@ -562,15 +580,11 @@ $$unique; \ fi; \ fi -ctags: CTAGS -CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ +ctags: ctags-am + +CTAGS: ctags +ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) + $(am__define_uniq_tagged_files); \ test -z "$(CTAGS_ARGS)$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ $$unique @@ -579,6 +593,21 @@ here=`$(am__cd) $(top_builddir) && pwd` \ && $(am__cd) $(top_srcdir) \ && gtags -i $(GTAGS_ARGS) "$$here" +cscopelist: cscopelist-am + +cscopelist-am: $(am__tagged_files) + list='$(am__tagged_files)'; \ + case "$(srcdir)" in \ + [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \ + *) sdir=$(subdir)/$(srcdir) ;; \ + esac; \ + for i in $$list; do \ + if test -f "$$i"; then \ + echo "$(subdir)/$$i"; \ + else \ + echo "$$sdir/$$i"; \ + fi; \ + done >> $(top_builddir)/cscope.files distclean-tags: -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags @@ -727,20 +756,20 @@ .MAKE: all check install install-am install-strip -.PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \ - clean-libtool clean-miceLTLIBRARIES clean-noinstPROGRAMS ctags \ - distclean distclean-compile distclean-generic \ - distclean-libtool distclean-tags distdir dvi dvi-am html \ - html-am info info-am install install-am install-data \ - install-data-am install-dvi install-dvi-am install-exec \ - install-exec-am install-html install-html-am install-info \ - install-info-am install-man install-miceLTLIBRARIES \ - install-pdf install-pdf-am install-ps install-ps-am \ - install-strip installcheck installcheck-am installdirs \ - maintainer-clean maintainer-clean-generic mostlyclean \ - mostlyclean-compile mostlyclean-generic mostlyclean-libtool \ - pdf pdf-am ps ps-am tags uninstall uninstall-am \ - uninstall-miceLTLIBRARIES +.PHONY: CTAGS GTAGS TAGS all all-am check check-am clean clean-generic \ + clean-libtool clean-miceLTLIBRARIES clean-noinstPROGRAMS \ + cscopelist-am ctags ctags-am distclean distclean-compile \ + distclean-generic distclean-libtool distclean-tags distdir dvi \ + dvi-am html html-am info info-am install install-am \ + install-data install-data-am install-dvi install-dvi-am \ + install-exec install-exec-am install-html install-html-am \ + install-info install-info-am install-man \ + install-miceLTLIBRARIES install-pdf install-pdf-am install-ps \ + install-ps-am install-strip installcheck installcheck-am \ + installdirs maintainer-clean maintainer-clean-generic \ + mostlyclean mostlyclean-compile mostlyclean-generic \ + mostlyclean-libtool pdf pdf-am ps ps-am tags tags-am uninstall \ + uninstall-am uninstall-miceLTLIBRARIES @MAINTAINER_MODE_TRUE@preview.h: $(srcdir)/preview.png diff -Nru xfce4-session-4.10.0/engines/simple/Makefile.in xfce4-session-4.10.1/engines/simple/Makefile.in --- xfce4-session-4.10.0/engines/simple/Makefile.in 2012-04-28 20:43:33.000000000 +0000 +++ xfce4-session-4.10.1/engines/simple/Makefile.in 2013-05-05 15:33:59.000000000 +0000 @@ -1,9 +1,8 @@ -# Makefile.in generated by automake 1.11.5 from Makefile.am. +# Makefile.in generated by automake 1.13.1 from Makefile.am. # @configure_input@ -# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software -# Foundation, Inc. +# Copyright (C) 1994-2012 Free Software Foundation, Inc. + # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -52,12 +51,13 @@ build_triplet = @build@ host_triplet = @host@ subdir = engines/simple -DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in +DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \ + $(top_srcdir)/depcomp ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -am__aclocal_m4_deps = $(top_srcdir)/configure.in +am__aclocal_m4_deps = $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) -mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs +mkinstalldirs = $(install_sh) -d CONFIG_HEADER = $(top_builddir)/config.h CONFIG_CLEAN_FILES = CONFIG_CLEAN_VPATH_FILES = @@ -96,9 +96,22 @@ AM_V_lt = $(am__v_lt_@AM_V@) am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@) am__v_lt_0 = --silent +am__v_lt_1 = libsimple_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \ $(LIBTOOLFLAGS) --mode=link $(CCLD) $(libsimple_la_CFLAGS) \ $(CFLAGS) $(libsimple_la_LDFLAGS) $(LDFLAGS) -o $@ +AM_V_P = $(am__v_P_@AM_V@) +am__v_P_ = $(am__v_P_@AM_DEFAULT_V@) +am__v_P_0 = false +am__v_P_1 = : +AM_V_GEN = $(am__v_GEN_@AM_V@) +am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) +am__v_GEN_0 = @echo " GEN " $@; +am__v_GEN_1 = +AM_V_at = $(am__v_at_@AM_V@) +am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) +am__v_at_0 = @ +am__v_at_1 = DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir) depcomp = $(SHELL) $(top_srcdir)/depcomp am__depfiles_maybe = depfiles @@ -111,20 +124,16 @@ $(AM_CFLAGS) $(CFLAGS) AM_V_CC = $(am__v_CC_@AM_V@) am__v_CC_ = $(am__v_CC_@AM_DEFAULT_V@) -am__v_CC_0 = @echo " CC " $@; -AM_V_at = $(am__v_at_@AM_V@) -am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) -am__v_at_0 = @ +am__v_CC_0 = @echo " CC " $@; +am__v_CC_1 = CCLD = $(CC) LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \ $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ $(AM_LDFLAGS) $(LDFLAGS) -o $@ AM_V_CCLD = $(am__v_CCLD_@AM_V@) am__v_CCLD_ = $(am__v_CCLD_@AM_DEFAULT_V@) -am__v_CCLD_0 = @echo " CCLD " $@; -AM_V_GEN = $(am__v_GEN_@AM_V@) -am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) -am__v_GEN_0 = @echo " GEN " $@; +am__v_CCLD_0 = @echo " CCLD " $@; +am__v_CCLD_1 = SOURCES = $(libsimple_la_SOURCES) DIST_SOURCES = $(libsimple_la_SOURCES) am__can_run_installinfo = \ @@ -132,6 +141,23 @@ n|no|NO) false;; \ *) (install-info --version) >/dev/null 2>&1;; \ esac +am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP) +# Read a list of newline-separated strings from the standard input, +# and print each of them once, without duplicates. Input order is +# *not* preserved. +am__uniquify_input = $(AWK) '\ + BEGIN { nonempty = 0; } \ + { items[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in items) print i; }; } \ +' +# Make sure the list of sources is unique. This is necessary because, +# e.g., the same source file might be shared among _SOURCES variables +# for different programs/libraries. +am__define_uniq_tagged_files = \ + list='$(am__tagged_files)'; \ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | $(am__uniquify_input)` ETAGS = etags CTAGS = ctags DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) @@ -179,10 +205,6 @@ GMODULE_VERSION = @GMODULE_VERSION@ GMOFILES = @GMOFILES@ GMSGFMT = @GMSGFMT@ -GNOME_KEYRING_CFLAGS = @GNOME_KEYRING_CFLAGS@ -GNOME_KEYRING_LIBS = @GNOME_KEYRING_LIBS@ -GNOME_KEYRING_REQUIRED_VERSION = @GNOME_KEYRING_REQUIRED_VERSION@ -GNOME_KEYRING_VERSION = @GNOME_KEYRING_VERSION@ GREP = @GREP@ GTK_CFLAGS = @GTK_CFLAGS@ GTK_LIBS = @GTK_LIBS@ @@ -267,6 +289,10 @@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ STRIP = @STRIP@ +SYSTEMD_CFLAGS = @SYSTEMD_CFLAGS@ +SYSTEMD_LIBS = @SYSTEMD_LIBS@ +SYSTEMD_REQUIRED_VERSION = @SYSTEMD_REQUIRED_VERSION@ +SYSTEMD_VERSION = @SYSTEMD_VERSION@ USE_NLS = @USE_NLS@ VERSION = @VERSION@ XFCE_GLADE_CATALOG_PATH = @XFCE_GLADE_CATALOG_PATH@ @@ -412,6 +438,7 @@ $(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh $(am__aclocal_m4_deps): + install-simpleLTLIBRARIES: $(simple_LTLIBRARIES) @$(NORMAL_INSTALL) @list='$(simple_LTLIBRARIES)'; test -n "$(simpledir)" || list=; \ @@ -438,12 +465,14 @@ clean-simpleLTLIBRARIES: -test -z "$(simple_LTLIBRARIES)" || rm -f $(simple_LTLIBRARIES) - @list='$(simple_LTLIBRARIES)'; for p in $$list; do \ - dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \ - test "$$dir" != "$$p" || dir=.; \ - echo "rm -f \"$${dir}/so_locations\""; \ - rm -f "$${dir}/so_locations"; \ - done + @list='$(simple_LTLIBRARIES)'; \ + locs=`for p in $$list; do echo $$p; done | \ + sed 's|^[^/]*$$|.|; s|/[^/]*$$||; s|$$|/so_locations|' | \ + sort -u`; \ + test -z "$$locs" || { \ + echo rm -f $${locs}; \ + rm -f $${locs}; \ + } libsimple.la: $(libsimple_la_OBJECTS) $(libsimple_la_DEPENDENCIES) $(EXTRA_libsimple_la_DEPENDENCIES) $(AM_V_CCLD)$(libsimple_la_LINK) -rpath $(simpledir) $(libsimple_la_OBJECTS) $(libsimple_la_LIBADD) $(LIBS) @@ -489,26 +518,15 @@ clean-libtool: -rm -rf .libs _libs -ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ - mkid -fID $$unique -tags: TAGS +ID: $(am__tagged_files) + $(am__define_uniq_tagged_files); mkid -fID $$unique +tags: tags-am +TAGS: tags -TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) +tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) set x; \ here=`pwd`; \ - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ + $(am__define_uniq_tagged_files); \ shift; \ if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \ test -n "$$unique" || unique=$$empty_fix; \ @@ -520,15 +538,11 @@ $$unique; \ fi; \ fi -ctags: CTAGS -CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ +ctags: ctags-am + +CTAGS: ctags +ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) + $(am__define_uniq_tagged_files); \ test -z "$(CTAGS_ARGS)$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ $$unique @@ -537,6 +551,21 @@ here=`$(am__cd) $(top_builddir) && pwd` \ && $(am__cd) $(top_srcdir) \ && gtags -i $(GTAGS_ARGS) "$$here" +cscopelist: cscopelist-am + +cscopelist-am: $(am__tagged_files) + list='$(am__tagged_files)'; \ + case "$(srcdir)" in \ + [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \ + *) sdir=$(subdir)/$(srcdir) ;; \ + esac; \ + for i in $$list; do \ + if test -f "$$i"; then \ + echo "$(subdir)/$$i"; \ + else \ + echo "$$sdir/$$i"; \ + fi; \ + done >> $(top_builddir)/cscope.files distclean-tags: -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags @@ -685,19 +714,20 @@ .MAKE: all check install install-am install-strip -.PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \ - clean-libtool clean-simpleLTLIBRARIES ctags distclean \ - distclean-compile distclean-generic distclean-libtool \ - distclean-tags distdir dvi dvi-am html html-am info info-am \ - install install-am install-data install-data-am install-dvi \ - install-dvi-am install-exec install-exec-am install-html \ - install-html-am install-info install-info-am install-man \ - install-pdf install-pdf-am install-ps install-ps-am \ - install-simpleLTLIBRARIES install-strip installcheck \ - installcheck-am installdirs maintainer-clean \ - maintainer-clean-generic mostlyclean mostlyclean-compile \ - mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ - tags uninstall uninstall-am uninstall-simpleLTLIBRARIES +.PHONY: CTAGS GTAGS TAGS all all-am check check-am clean clean-generic \ + clean-libtool clean-simpleLTLIBRARIES cscopelist-am ctags \ + ctags-am distclean distclean-compile distclean-generic \ + distclean-libtool distclean-tags distdir dvi dvi-am html \ + html-am info info-am install install-am install-data \ + install-data-am install-dvi install-dvi-am install-exec \ + install-exec-am install-html install-html-am install-info \ + install-info-am install-man install-pdf install-pdf-am \ + install-ps install-ps-am install-simpleLTLIBRARIES \ + install-strip installcheck installcheck-am installdirs \ + maintainer-clean maintainer-clean-generic mostlyclean \ + mostlyclean-compile mostlyclean-generic mostlyclean-libtool \ + pdf pdf-am ps ps-am tags tags-am uninstall uninstall-am \ + uninstall-simpleLTLIBRARIES @MAINTAINER_MODE_TRUE@fallback.h: $(srcdir)/fallback.png diff -Nru xfce4-session-4.10.0/engines/simple/preview.h xfce4-session-4.10.1/engines/simple/preview.h --- xfce4-session-4.10.0/engines/simple/preview.h 2012-04-28 20:43:40.000000000 +0000 +++ xfce4-session-4.10.1/engines/simple/preview.h 2013-05-05 15:34:06.000000000 +0000 @@ -11,8 +11,8 @@ { "" /* Pixbuf magic (0x47646b50) */ "GdkP" - /* length: header (24) + pixel_data (60936) */ - "\0\0\356\40" + /* length: header (24) + pixel_data (60833) */ + "\0\0\355\271" /* pixdata_type (0x2010001) */ "\2\1\0\1" /* rowstride (676) */ @@ -22,200 +22,199 @@ /* height (240) */ "\0\0\0\360" /* pixel_data: */ - "\377\0\0\0\342\0\0\0\2\345\12\17\31\35*\377E\35*\336E\35*\4E\25\36""2" - "\0\0\0\345\17\25\"(\377:_(\336:_(\4:_\35*E\0\0\0\345\17\25\"\203(:_\3" - "):`*;a+c.Af1Ch2Di3E\202j3E\377j4E\314j4E\202j3E\23j2Di0Bh.@e+=b);" - "`(:_(:_\35*E\0\0\0\345\17\25\"(:_);`,\77d2Dh9Jn>PsBSuCUwD\202UxD\377" - "VxD\314VxD\24UxCUwARu=Or7Hm0Bg+=b);`(:_\35*E\0\0\0\345\17\25\"(:_+c3EjARuRc\204`p\216kz\227" - "o~\232q\200\234q\200\377\234r\201\313\234r\201\27\234q\201\234q\200\234" - "o~\231hx\225]m\214M]\177=Or0Bh*Tq}\227\205\221\251\206\222\252\207\211\223\253\207\1\223" - "\253\206\202\222\252\206\22\222\252\205\221\252\205\221\251\204\220\250" - "\203\220\250\202\217\247\200\215\246|\210\241s\177\230bo\210P\\uHa:D[9CZ6@U1:P0:O/8M+3" - "G)0E)1E)\2021F)\12""1G*2G*2H*2H+4I.6M=H_s\200\231\205\221\252\206\222" - "\252\207\246\223\253\207\30\223\253\206\223\253\205\222\252\202\217\250" - "z\210\242l{\230Vf\206CTv3Di+=b(:_\35*E\0\0\0\345\17\25\"(:`-\77d6HlF" - "Xz\\m\213n}\232|\212\244\202\217\250\204\220\251\204\221\251\245\206" - "\222\253\202\205\221\252\17\204\220\252\203\217\250\202\216\247z\206" - "\240Wc|8B[ITpZf\203Yf\203GRmCNhmy\223\201\216\247\203\217\250\204\220" - "\251\206\205\221\252\16\204\220\251\203\217\250\200\215\246iu\220CMf" - "FQlXd\201O[w:C\\R\\vz\206\240\202\216\247\203\217\250\204\220\252\204" - "\205\221\252\6\203\217\250`k\2044=U1:Q3;R6\77X\2059BZ\2;D]@Je\202AKf" - "\203AKg\7FQlIUqKVsQ]y{\207\241\204\220\252\205\221\252\210\206\222\253" - "\204\205\221\252\21\204\220\251\203\217\250\202\216\250\202\216\247\177" - "\213\245w\203\234bn\211KVp7AX,5L,4M7@YEPjQ]yT`|o|\226\202\216\250\202" - "\205\221\252\202\206\222\253\202\205\221\252\4\202\216\247[f\2005>V6" - "\77X\2029C[\21;E_\77JeAKfBMhHSnIUqKVrMYtO[wP\\xQ]zTa}Ub\177Wc\177Zg\205" - "bo\213\177\213\244\202\205\221\252\247\206\222\253\27\205\221\252\204" - "\220\251\201\216\247y\207\241l{\227Te\206CTv3Di+=b(:_\35*E\0\0\0\345" - "\17\25\"(:`-\77d6HlFWz\\l\213n}\232|\211\243\201\216\247\203\220\251" - "\203\220\245\251\205\221\22\251\204\220\250\203\217\250\202\216\247\201" - "\215\246y\206\236Vaz9C[HSmYf\201[h\204[h\204Wc~AKeHRlt\200\231\201\215" - "\246\202\216\247\203\217\204\250\204\220\20\250\203\217\250\202\216\247" - "\200\214\245p|\225EPhALeVc\177Zg\203Yf\202LXs9C[T_xw\203\234\201\215" - "\246\202\217\247\203\217\203\250\204\220\4\250\203\217\250q~\227Zg\203" - "Xe\210\200Xe\1\201Yf\203\202Yf\203\202Zg\7\203[h\204\\i\205_l\210~\212" - "\243\203\220\250\204\220\250\205\221\206\251\205\221\2\251\204\220\250" - "\204\220\202\250\203\217\23\247\202\216\247\201\215\246\200\214\245~" - "\212\243t\200\231U`y=F]-6L/8N;D]ITnR^yXd\200Zg\202[h\204Xe\200ht\217" - "\177\213\244\203\217\202\250\204\220\1\251\205\221\202\251\204\220\10" - "\250\203\217\250o|\225Zf\202Ye\201Yf\201Xe\201Ye\201Yf\202\202Yf\1\202" - "Zg\204\203[h\203\204[h\202\204\\i\5\205]j\205bo\212~\212\244\204\220" - "\250\204\220\247\251\205\221\30\251\204\220\251\203\220\251\200\216\247" - "x\206\241kz\227Te\205BTv2Di+=b(:_\35*E\0\0\0\345\17\25\"(:`-\77d6HlF" - "Wy[k\213m|\231z\211\243\200\216\247\202\217\250\202\217\250\203\244\220" - "\251\203&\220\251\202\217\250\201\216\250\200\215\246x\206\240Wc}5>W" - "GSoXe\202Zh\205[i\205[i\205Zh\204Tb}=HaNZtw\204\237\177\214\246\201\216" - "\247\201\216\250\202\217\250\202\217\250\201\216\250\200\215\246\177" - "\214\246r\177\231LWrWGSmQ^zWd\200Yf\203Yg\203Zh\205Zh\205[i\205Xf\202`m\212|\211" - "\243\202\217\250\202\217\250\203\202\220\251\203\5\220\251\202\217\250" - "\202\217\250p}\230\\j\206[\211i\205[\2i\206[i\206\\\205j\206\\\4j\206" - "]k\207ao\213}\212\244\203\251\220\251\203\25\220\251\202\217\250\177" - "\215\246w\205\240jy\227Td\205BSv2Di+=b(:_\35*E\0\0\0\345\17\25\"(:`," - "\77d5HlEWyZk\213l{\227y\207\242\177\214\246\202\200\216\247\245\202\217" - "\250\23\201\216\247\177\215\246x\206\237Q]x6AYIVrXf\201Zh\204Zh\205[" - "i\205Zi\205Zh\204Yg\203P]y;E]Vb{v\204\235~\213\245\177\215\245\202\177" - "\215\246\7\177\214\245~\213\244v\203\235MXr:E^Q_zYg\203\204Zh\204\7X" - "g\203KXs7BZP\\vu\202\234\200\215\246\201\216\247\202\201\217\247\4\201" - "\216\247r\177\231\\j\206[i\206\205[i\205\204[i\206\202[j\206\206\\j\206" - "\2_m\210|\212\243\206\202\217\250\203\201\216\247\16\200\215\246\177" - "\214\245~\213\244{\211\242p}\226Ubz6AY+4I7AYN\\xVd\177Xf\201Xg\202Yg" - "\203\202Zh\204\203[i\205\3Xf\202\\i\203y\207\240\202\201\216\247\1\201" - "\217\247\202\202\217\250\4\201\217\247\201\216\247o}\227\\j\206\203[" - "i\206\1[i\205\204[i\206\203\\j\206\1\\k\206\206]k\207\2bp\213}\213\244" - "\251\202\217\250\30\201\217\247\200\216\247~\213\245v\204\237ix\225S" - "d\205BSu2Di+=b(:_\35*E\0\0\0\345\17\25\"(:`,\77d5HlEWyZk\212kz\227y\207" - "\242~\213\245\200\216\246\200\216\246\201\216\244\247\201\216\24\247" - "\200\216\246{\210\241]j\2046@YGSnYg\202Zh\203Zh\204[i\205[i\205Zi\205" - "Zh\205Yh\203We\200GSn;E_]i\204{\210\241}\213\244~\213\202\244}\213\21" - "\244w\204\235[g\2017AYJWqXf\201Yg\202Zh\204[i\205[i\205Zi\204Zh\204Y" - "g\203JVq:D^_m\207}\212\243\201\216\203\247\201\216\3\247q\177\231\\j" - "\206[i\207\205[i\4\205\\j\206\\j\206\\k\206]k\206\207]k\3\207_n\211}" - "\212\243\201\216\204\247\201\216\23\247\200\216\246\200\215\246\177\215" - "\246\177\214\245~\213\244}\212\243y\207\237er\215@Kd.7M5@WHToTb}Wf\200" - "Xf\201Yg\202Yh\203Zh\204[i\204\205[i\6\205Zh\204Yf\202t\201\233\200\215" - "\246\200\216\246\201\216\204\247\201\216\2\247o}\226[j\206\205[i\6\205" - "[j\205\\j\206\\j\206\\k\206]k\207]l\202\207^l\204\210^l\3\207bq\213}" - "\213\244\201\217\251\247\201\216\27\247\200\216\246}\212\244u\204\237" - "iw\225Sd\204ASu2Di+=b(:_\35*E\0\0\0\345\17\25\"(:`,\77d5GlEVyYj\211k" - "y\226x\206\240}\212\244\177\214\246\177\214\246\200\245\216\247\200\5" - "\216\247\177\215\246n{\224Zg\202Zh\204Z\205i\205Z\23i\205Yh\205Xg\203" - "Xg\202Vd\200CPk;E_es\214y\207\240{\211\242{\211\242x\207\237Zg\2006A" - "YJWrVe\201Xg\202Yh\204Yh\205Z\203i\205Z\6i\205[j\206_n\212t\203\236\207" - "\225\256\202\220\251\200\203\216\247\200\3\216\247p\177\231\\k\206[\210" - "j\206[\5j\206\\k\207]l\207]l\210^m\210^\203m\211^\5m\211]l\210`n\212" - "|\212\243\201\217\250\200\202\216\247\200\24\216\247\177\215\246\177" - "\215\246~\214\245}\213\244|\212\243{\211\242r\200\232NZt0:Q1IeEPiiv\220y\207\241w\205\237" - "cp\212;G_AMgUc\177We\201Xf\203Yg\204Yh\204Zh\205\202[i\206\6\\j\206_" - "n\212|\212\245\242\257\305\222\237\267\201\217\251\204\177\214\246\2" + "\377\0\0\0\342\0\0\0\2\0\12\17\31\35*\377E\35*\336E\35*\4E\25\36""2\0" + "\0\0\0\17\25\"(\377:_(\336:_(\4:_\35*E\0\0\0\0\17\25\"\203(:_\3):`*;" + "a+c.Af1Ch2Di3E\202j3E\377j4E\314j4E\202j3E\23j2Di0Bh.@e+=b);`(:_(:_" + "\35*E\0\0\0\0\17\25\"(:_);`,\77d2Dh9Jn>PsBSuCUwD\202UxD\377VxD\314Vx" + "D\24UxCUwARu=Or7Hm0Bg+=b);`(:_\35*E\0\0\0\0\17\25\"(:_+c3EjARuRc\204`p\216kz\227o~\232q\200\234" + "q\200\377\234r\201\313\234r\201\27\234q\201\234q\200\234o~\231hx\225" + "]m\214M]\177=Or0Bh*Tq}\227\205\221\251\206\222" + "\252\207\211\223\253\207\1\223\253\206\202\222\252\206\22\222\252\205" + "\221\252\205\221\251\204\220\250\203\220\250\202\217\247\200\215\246" + "|\210\241s\177\230bo\210P\\uHa:D[9CZ6@U1:P0:O/8M+3G)0E)1E)\2021F)\12""1G*2G*2H*2H+4I.6M" + "=H_s\200\231\205\221\252\206\222\252\207\246\223\253\207\30\223\253\206" + "\223\253\205\222\252\202\217\250z\210\242l{\230Vf\206CTv3Di+=b(:_\35" + "*E\0\0\0\0\17\25\"(:`-\77d6HlFXz\\m\213n}\232|\212\244\202\217\250\204" + "\220\251\204\221\251\245\206\222\253\202\205\221\252\17\204\220\252\203" + "\217\250\202\216\247z\206\240Wc|8B[ITpZf\203Yf\203GRmCNhmy\223\201\216" + "\247\203\217\250\204\220\251\206\205\221\252\16\204\220\251\203\217\250" + "\200\215\246iu\220CMfFQlXd\201O[w:C\\R\\vz\206\240\202\216\247\203\217" + "\250\204\220\252\204\205\221\252\6\203\217\250`k\2044=U1:Q3;R6\77X\205" + "9BZ\2;D]@Je\202AKf\203AKg\7FQlIUqKVsQ]y{\207\241\204\220\252\205\221" + "\252\210\206\222\253\204\205\221\252\21\204\220\251\203\217\250\202\216" + "\250\202\216\247\177\213\245w\203\234bn\211KVp7AX,5L,4M7@YEPjQ]yT`|o" + "|\226\202\216\250\202\205\221\252\202\206\222\253\202\205\221\252\4\202" + "\216\247[f\2005>V6\77X\2029C[\21;E_\77JeAKfBMhHSnIUqKVrMYtO[wP\\xQ]z" + "Ta}Ub\177Wc\177Zg\205bo\213\177\213\244\202\205\221\252\247\206\222\253" + "\27\205\221\252\204\220\251\201\216\247y\207\241l{\227Te\206CTv3Di+=" + "b(:_\35*E\0\0\0\0\17\25\"(:`-\77d6HlFWz\\l\213n}\232|\211\243\201\216" + "\247\203\220\251\203\220\245\251\205\221\22\251\204\220\250\203\217\250" + "\202\216\247\201\215\246y\206\236Vaz9C[HSmYf\201[h\204[h\204Wc~AKeHR" + "lt\200\231\201\215\246\202\216\247\203\217\204\250\204\220\20\250\203" + "\217\250\202\216\247\200\214\245p|\225EPhALeVc\177Zg\203Yf\202LXs9C[" + "T_xw\203\234\201\215\246\202\217\247\203\217\203\250\204\220\4\250\203" + "\217\250q~\227Zg\203Xe\210\200Xe\1\201Yf\203\202Yf\203\202Zg\7\203[h" + "\204\\i\205_l\210~\212\243\203\220\250\204\220\250\205\221\206\251\205" + "\221\2\251\204\220\250\204\220\202\250\203\217\23\247\202\216\247\201" + "\215\246\200\214\245~\212\243t\200\231U`y=F]-6L/8N;D]ITnR^yXd\200Zg\202" + "[h\204Xe\200ht\217\177\213\244\203\217\202\250\204\220\1\251\205\221" + "\202\251\204\220\10\250\203\217\250o|\225Zf\202Ye\201Yf\201Xe\201Ye\201" + "Yf\202\202Yf\1\202Zg\204\203[h\203\204[h\202\204\\i\5\205]j\205bo\212" + "~\212\244\204\220\250\204\220\247\251\205\221\30\251\204\220\251\203" + "\220\251\200\216\247x\206\241kz\227Te\205BTv2Di+=b(:_\35*E\0\0\0\0\17" + "\25\"(:`-\77d6HlFWy[k\213m|\231z\211\243\200\216\247\202\217\250\202" + "\217\250\203\244\220\251\203&\220\251\202\217\250\201\216\250\200\215" + "\246x\206\240Wc}5>WGSoXe\202Zh\205[i\205[i\205Zh\204Tb}=HaNZtw\204\237" + "\177\214\246\201\216\247\201\216\250\202\217\250\202\217\250\201\216" + "\250\200\215\246\177\214\246r\177\231LWrWGSmQ^zWd\200Yf\203Yg\203Zh\205Zh\205[i\205" + "Xf\202`m\212|\211\243\202\217\250\202\217\250\203\202\220\251\203\5\220" + "\251\202\217\250\202\217\250p}\230\\j\206[\211i\205[\2i\206[i\206\\\205" + "j\206\\\4j\206]k\207ao\213}\212\244\203\251\220\251\203\25\220\251\202" + "\217\250\177\215\246w\205\240jy\227Td\205BSv2Di+=b(:_\35*E\0\0\0\0\17" + "\25\"(:`,\77d5HlEWyZk\213l{\227y\207\242\177\214\246\202\200\216\247" + "\245\202\217\250\23\201\216\247\177\215\246x\206\237Q]x6AYIVrXf\201Z" + "h\204Zh\205[i\205Zi\205Zh\204Yg\203P]y;E]Vb{v\204\235~\213\245\177\215" + "\245\202\177\215\246\7\177\214\245~\213\244v\203\235MXr:E^Q_zYg\203\204" + "Zh\204\7Xg\203KXs7BZP\\vu\202\234\200\215\246\201\216\247\202\201\217" + "\247\4\201\216\247r\177\231\\j\206[i\206\205[i\205\204[i\206\202[j\206" + "\206\\j\206\2_m\210|\212\243\206\202\217\250\203\201\216\247\16\200\215" + "\246\177\214\245~\213\244{\211\242p}\226Ubz6AY+4I7AYN\\xVd\177Xf\201" + "Xg\202Yg\203\202Zh\204\203[i\205\3Xf\202\\i\203y\207\240\202\201\216" + "\247\1\201\217\247\202\202\217\250\4\201\217\247\201\216\247o}\227\\" + "j\206\203[i\206\1[i\205\204[i\206\203\\j\206\1\\k\206\206]k\207\2bp\213" + "}\213\244\251\202\217\250\30\201\217\247\200\216\247~\213\245v\204\237" + "ix\225Sd\205BSu2Di+=b(:_\35*E\0\0\0\0\17\25\"(:`,\77d5HlEWyZk\212kz\227" + "y\207\242~\213\245\200\216\246\200\216\246\201\216\244\247\201\216\24" + "\247\200\216\246{\210\241]j\2046@YGSnYg\202Zh\203Zh\204[i\205[i\205Z" + "i\205Zh\205Yh\203We\200GSn;E_]i\204{\210\241}\213\244~\213\202\244}\213" + "\21\244w\204\235[g\2017AYJWqXf\201Yg\202Zh\204[i\205[i\205Zi\204Zh\204" + "Yg\203JVq:D^_m\207}\212\243\201\216\203\247\201\216\3\247q\177\231\\" + "j\206[i\207\205[i\4\205\\j\206\\j\206\\k\206]k\206\207]k\3\207_n\211" + "}\212\243\201\216\204\247\201\216\23\247\200\216\246\200\215\246\177" + "\215\246\177\214\245~\213\244}\212\243y\207\237er\215@Kd.7M5@WHToTb}" + "Wf\200Xf\201Yg\202Yh\203Zh\204[i\204\205[i\6\205Zh\204Yf\202t\201\233" + "\200\215\246\200\216\246\201\216\204\247\201\216\2\247o}\226[j\206\205" + "[i\6\205[j\205\\j\206\\j\206\\k\206]k\207]l\202\207^l\204\210^l\3\207" + "bq\213}\213\244\201\217\251\247\201\216\27\247\200\216\246}\212\244u" + "\204\237iw\225Sd\204ASu2Di+=b(:_\35*E\0\0\0\0\17\25\"(:`,\77d5GlEVyY" + "j\211ky\226x\206\240}\212\244\177\214\246\177\214\246\200\245\216\247" + "\200\5\216\247\177\215\246n{\224Zg\202Zh\204Z\205i\205Z\23i\205Yh\205" + "Xg\203Xg\202Vd\200CPk;E_es\214y\207\240{\211\242{\211\242x\207\237Zg" + "\2006AYJWrVe\201Xg\202Yh\204Yh\205Z\203i\205Z\6i\205[j\206_n\212t\203" + "\236\207\225\256\202\220\251\200\203\216\247\200\3\216\247p\177\231\\" + "k\206[\210j\206[\5j\206\\k\207]l\207]l\210^m\210^\203m\211^\5m\211]l" + "\210`n\212|\212\243\201\217\250\200\202\216\247\200\24\216\247\177\215" + "\246\177\215\246~\214\245}\213\244|\212\243{\211\242r\200\232NZt0:Q1" + "IeEPiiv\220y\207\241w\205" + "\237cp\212;G_AMgUc\177We\201Xf\203Yg\204Yh\204Zh\205\202[i\206\6\\j\206" + "_n\212|\212\245\242\257\305\222\237\267\201\217\251\204\177\214\246\2" "p~\230[i\206\207Zh\205\17[i\206[j\206]k\210^m\211`n\213`o\214ao\214b" "p\215bp\216bp\215bq\215dr\216}\213\245\200\216\247\177\215\247\202\177" "\214\246\202~\213\245\16}\212\244|\211\243z\207\241jx\222GRk.7Nc5GkDUxXh\210ix\225u\204\237z\210" + "u2Di+=b(:_\35*E\0\0\0\0\17\25\"(:`,>c5GkDUxXh\210ix\225u\204\237z\210" "\243}\212\244}\212\244~\213\244\245~\213(\245\177\214\246\200\215\247" "\210\224\255\247\262\310\226\243\274hv\223\\j\207[i\206Zh\205Zh\205Y" "g\204Yg\204Xf\203Wf\202We\201Uc\200Q^z8C[FRkn{\225er\215>Ib=HbR_|Vd\200" @@ -240,7 +239,7 @@ "\310\333\276\311\333\302\316\337\306\321\341\306\320\340\311\322\342" "\272\305\326\221\236\266\200\215\247\177\214\246~\213\246\245~\213\30" "\245}\212\245|\211\244z\210\242r\201\235fu\223Qb\203@Ru2Di+=b(:_\35*" - "E\0\0\0\345\17\25\"(:`,>c5GkDUxWh\210hw\224t\203\236y\207\242|\211\243" + "E\0\0\0\0\17\25\"(:`,>c5GkDUxWh\210hw\224t\203\236y\207\242|\211\243" "|\211\243}\244\212\244}\32\212\244~\213\245~\213\245\200\214\246\214" "\230\261\251\264\312\224\240\271hu\221\\j\206Zh\205Zg\204Yg\203Xf\202" "Xf\202We\201Wd\201Ub\177Ta\177JVs6AZDOi\77Jc8C]O[xUa~Vc\200W\202e\201" @@ -256,7 +255,7 @@ "\221\236\265\246\261\306\242\256\303\237\253\301\237\252\300\231\245" "\274\226\242\272\225\241\271\220\234\264\210\225\256\202\216\250~\213" "\245~\213\245}\247\212\244}\27\212\244|\211\243y\207\242q\200\234et\222" - "Qb\203@Rt2Di+=b(:_\35*E\0\0\0\345\17\25\"(:`,>c5GkCUxWh\210gv\224s\202" + "Qb\203@Rt2Di+=b(:_\35*E\0\0\0\0\17\25\"(:`,>c5GkCUxWh\210gv\224s\202" "\236y\207\242{\210\243{\211\243\245|\211\243\14}\212\244~\213\244~\213" "\245\200\215\247\214\231\261\247\263\310\213\230\261es\220[i\206Zh\204" "Yg\204Xf\202\202We\201\13Vd\200Uc\200Ub\177S`}EQm.8P4>VKWtTa~Ub\177V" @@ -271,1349 +270,1342 @@ "\251~\213\245}\212\244\204|\211\243\2ky\223Xf\202\206We\201\4Xf\202X" "f\203Zh\204u\202\235\210\177\214\246\202~\213\245\202}\212\244\250|\211" "\243\27{\210\243x\206\241p\177\233ds\222Pa\202@Qt2Di+=b(:_\35*E\0\0\0" - "\345\17\25\"(:`,>c5GkCTwVg\207fv\223s\201\235w\206\241y\207\242y\207" - "\242z\211\245\243z\211%\243{\211\243|\212\244|\213\245~\215\246\216\234" - "\264\245\263\310\211\230\261br\216Yh\205Wg\204Vf\202Ve\201Ue\201Ud\200" - "Tc\200Sb\177Sa~R_}MZvN\\xR`}Sa~Tc\177Td\200Ue\201Ve\201Wf\202Xg\204[" - "k\207n~\232\234\253\302\235\253\301\202\221\252}\214\246|\213\245{\212" - "\244{\211\204\243z\211\3\243kz\225Vf\202Ue\206\201Ue\4\201Ve\201Wf\202" - "p\177\231|\212\207\244|\212\2\244{\212\244{\211\202\243z\211\40\243y" - "\210\242x\207\241w\205\237n|\227HUn7B[LYvR`}Sa~Sb\177Tc\177Td\200Ue\201" - "Ve\201Wf\202Wg\204Yi\205\\k\210kz\226\205\224\255\244\262\310\270\303" - "\326\270\304\325\250\265\312\230\246\275\212\230\261\204\223\254\200" - "\217\250~\214\246|\212\244{\212\244z\211\204\243z\211\2\243ix\223Ve\207" - "\201Ue\4\201Ud\201Ve\201q\200\232z\210\207\242z\210\1\242z\211\252\243" - "z\211\27\243z\210\242y\207\242w\205\240o~\233cs\221Pa\202@Qt2Di+=b(:" - "_\35*E\0\0\0\345\17\25\"(:`,>c5GkCTwVf\207fu\223r\200\234v\205\241x\206" - "\242y\246\207\242y\22\207\242z\210\242z\210\243{\211\244|\212\244\177" - "\215\250\222\240\267\243\260\307\177\216\251^m\212Wf\204Ve\202Ud\201" - "Tc\200Tc\200Sb\177Sa\177Sa~S\204`~S\20a\177Sa\177Tb\200Ud\200Ve\201W" - "f\203Yh\205m|\230\230\246\276\241\256\305\207\225\256}\213\245{\211\244" - "{\211\243z\210\243z\210\242y\203\207\242y\3\207\242jx\224Ud\201T\207" - "c\200T\4c\200Uc\200m{\227y\207\241x\205\206\241x\1\206\241y\204\207\241" - "y\40\207\241x\206\241w\205\240t\202\234\\i\2057C[EQmR_}R_}S`~Sa\177S" - "a\177Tb\200Ud\201Ve\201Ve\202Xg\204_n\214z\210\245\245\263\311\267\302" - "\326\256\272\316\230\245\275\213\230\261\202\217\252\177\214\247}\213" - "\246}\213\245|\212\245{\211\244{\211\243z\210\243y\204\207\242y\2\207" - "\242hv\222U\207c\200T\16c\200Sb\177Ta\177n|\227v\204\237v\204\237u\203" - "\237u\203\236u\203\236v\204\236v\204\237w\205\240x\206\240y\207\241y" - "\251\207\242y\25\207\242x\206\242v\204\240o}\232cr\221Pa\202\77Qt2Di" - "+=b(:_\35*E\0\0\0\345\17\25\"(:`,>c4FkBSwVf\206et\222q\177\233u\204\236" - "\202x\206\240\250x\207\241\15y\210\242z\210\243{\211\244~\215\247\221" - "\237\267\245\263\311\200\220\252[k\207Vf\202Ud\201Tc\200Sb\177Sa\177" - "\203Sa~\1R`}\203Sa~\15Sa\177Sb\177Tc\200Ue\201Xg\204gw\224\230\247\277" - "\240\256\304\203\222\253|\212\245z\211\243y\210\242y\207\242\206x\207" - "\241\2iw\223Tc\200\206Sb\177\1Sa\177\202Sa~\3jy\224u\203\236t\203\235" - "\204s\202\235!t\203\235u\203\236u\204\236v\205\237w\205\240w\206\240" - "v\205\237u\204\236hv\222EQlANiO]zQ_|R`}S`~Sa~Sa\177Sb\177Tc\200Ue\201" - "Xh\204dt\222\231\247\277\264\301\324\245\262\307\214\232\263\200\217" - "\250}\214\246|\213\245{\212\244{\211\244z\211\243z\210\243\202y\210\242" - "\1y\207\242\206x\207\241\1gu\221\207Sb\177\17Sa~R`}O\\yZg\202R`zKXqI" - "UnBOf>Ibc4FkBSwUf\206dt\222p\177\233t\202\236v\205\237w\205\237x\206" - "\250\241x\206\13\241y\207\242z\210\243{\211\244\177\215\247\223\241\271" - "\240\255\306v\204\240\\k\210Ud\201Tb\200Sa\202\177Sa\1\177S`\204~S`\16" - "~Sa\177Sa\177Tb\200Tc\200Wf\203gv\223\221\237\271\235\252\302\206\224" - "\256|\212\244z\210\243y\207\242y\207\242x\206\206\241x\206\3\241iw\223" - "Tb\200Sa\205\177Sa\5\177S`~R`}P]{Wd\200We\202~Vc\202}Uc\202}Vc\4~We\177" - "bp\215t\202\235v\204\202\237v\204\30\237t\202\235Xe\202\77KeLYwQ^|R_" - "}S`~S`~Sa\177Sa\177Tb\200Uc\201Wf\204iw\225\225\243\274\251\266\313\221" - "\237\270\202\220\252}\213\246|\212\244{\211\244z\210\243z\210\243y\207" - "\202\242y\207\1\242x\207\210\241x\206\2\241gu\221Sa\206\177Sa\20\177" - "S`~R_}GTq0:R!)>!)>\"*\77#,A$.C&/E*4JIVoq\200\233v\204\237w\205\240x\206" - "\247\241x\206\30\241w\205\240v\204\237s\202\235m|\230aq\220O`\202\77" - "Pt1Ch+c4FjASvTe\205cs\221o~\232s\201" - "\235u\203\237u\203\237v\251\205\237v\13\205\237w\206\240x\207\241y\210" - "\241}\214\245\223\242\271\235\254\303r\202\237Wg\204Sb\177Sa~R\210`}" - "R\13`}Sa~Tc\200et\221\220\240\270\240\256\304\204\222\254z\211\242x\207" - "\241w\206\240w\206\240v\207\205\237v\3\205\237gv\221Sa~R\205`}R\6`}Q" - "_|P^{JXu/:R\37(;\37\204':\36\5':\37':\40)=>Kdq\200\232t\202\203\235t" - "\6\203\235o~\230IVqBOkO]zP^{Q\202_|Q\15_|R`}R`}Sa~Tc\200aq\215\220\240" - "\270\243\261\306\203\222\254z\211\243y\210\242y\210\242x\207\241w\203" - "\206\240w\1\206\240v\212\205\237v\2\205\237et\217R\206`}R\20`}Q_|Q_|" - "N\\yHVqCQlERnERnFTpHVrIWtLZv^l\207s\202\234u\204\236u\204\236v\250\205" - "\237v\25\204\237u\203\236r\201\235l{\230`q\217N_\200>Ps1Ch+c4FjASvTd\205br\221n}\231r\201\235\202s\202\236" - "\252t\203\237\12u\204\237u\204\240v\205\240w\205\241{\212\245\224\242" - "\273\226\244\277k{\230Tc\201Q_~\211P^}\7Q_~]l\213\213\233\266\233\252" - "\302\203\222\254w\206\242v\205\240\202u\204\240\211t\203\237\2ft\221" - "Q_~\206P^}\6P]|O]{M[yERo@Mh\77Mh\204\77Lg\16\77Mh@MiTb~r\200\234r\201" - "\235s\201\235r\201\235iw\224DRnIWuN\\{O\\{O]|P^|\202P^}\13Q_~R`~Ve\204" - "t\204\242\226\244\275\205\223\255x\207\242w\206\241v\205\241v\205\240" - "u\204\240\202u\203\237\215t\203\237\2dr\217Q_}\206P^}\5P^|O]|N\\{N\\" - "zM[y\204LZx\5M[xM[z]l\211s\201\235s\202\236\251t\203\237\26t\203\236" - "s\202\236q\200\234kz\226`p\217N^\200>Ps1Ch+c4EjARuSc\204bq\220m|\230q\200\234r\201\254\235s\202\1\235t\202" - "\202\236t\202\7\236t\203\236|\212\245\224\242\273\213\233\265Zj\210P" - "]|O]\210{O]\6{P]|We\202{\211\243|\213\245t\203\236s\202\214\235s\202" - "\3\235es\217P^|O]\205{O]\7{O\\{N\\zN[yM[xLZwLYwKY\203vKY\4vLYwLZx\\j" - "\206r\200\202\234r\201\10\234q\200\233bp\213GTpLZwN[yN\\zN\\zO]\202{" - "O]\14{P^|Q^}[j\211\205\224\257\204\223\256w\206\241v\204\237u\204\237" - "t\203\236t\203\236t\202\236s\202\216\235s\202\3\235cq\215P]|O]\207{O" - "]\3{N\\zN\\yN\\\204yN[\202yN\\\3y]k\210r\201\234s\202\252\235s\202\26" - "\235r\201\235p\200\234jy\226_o\216M^\177>Os1Ch+c3Ej@RuSc\204ap\217l{\227p\177\234r\201\235r\252\201\235s\2" - "\201\235r\201\234r\203\200\234r\6\200\234n|\230Zg\203@LeHVrO\\zO\210" - "\\{O\10\\{M[yBNk0;SKWrjy\224q\177\233q\177\233r\202\200\234r\1\200\234" - "s\207\201\235s\3\201\235dr\217P]|O\207\\{O\3\\zN[yN[yM\207ZxM\2Zx]j\207" - "r\202\200\234r\10\200\234q\177\233]k\207GSpMZxN[yN[yO\\zO\202\\{O\11" - "\\{P]|Q^}`o\215\200\216\251x\206\242u\203\237t\202\236t\202\236s\221" - "\201\235s\3\201\235bp\215O]{O\220\\{O\2\\{^l\211s\252\201\235s\202\201" - "\235r\26\201\235p\177\233ix\225^n\216M]\177=Or0Ch+c3Ej@RuRb\203_p\216kz\227o\177\232p\200\234q\200\234\251" - "r\201\234\202q\200\233\202p\177\233\7o~\232l{\227S`{2>V4@ZIWtM[x\210" - "N\\z\12M[yM[xJYv7D^,7OLZtiy\224o~\232o\177\232p\177\233\202q\200\233" - "\1q\201\234\206r\201\234\2cr\216O]{\211N\\z\1N\\y\210M\\y\1\\k\207\202" - "q\201\234\4q\200\234n~\231[j\206JXv\202M[x\1M\\y\205N\\z\4O]{[j\207{" - "\212\245s\203\236\202r\201\235\223r\201\234\1ap\214\210N\\z\4N\\{O]{" - "O]|O^|\205P^|\2O^|^m\212\202r\201\235\251r\201\234\30q\201\234p\200\234" - "o~\232hw\225]n\215M]\177=Or0Ch+c3Ej" - "@RuQb\203_o\216kz\226n}\231p\177\232p\177\232q\200\246\234q\200\202\234" - "p\177\14\233p\177\233o~\232n}\232m|\231ix\224S`|-8P2=WFTrKYwLZxM[\203" - "yM[\203zM[\2yM[yLZ\202xKY\11wHVt8E_+5LKYtgv\222m|\230n}\232o~\232p\177" - "\202\233p\177\205\234q\200\3\234bp\216N\\zM[\207yM[\3zN\\{N\\{O]\202" - "|O]\204}O]\10|O]|]k\211q\200\235q\200\234q\200\234o~\232^m\212LZ\202" - "xLZ\207yM[\3ySa\177p\177\233p\177\210\234p\177\215\234q\200\2\234`n\214" - "M[\207yM[\2zN\\{N\\\202|P^\1}Q_\202~Q_\7\177Q_~Q_~P^}^m\212r\201\235" - "r\201\235q\200\250\234q\200\30\234p\177\233o\177\232n}\231hw\224\\m\214" - "L\\~=Nr0Ch+c3Ej@QtQa\202^n\215jy\225" - "m}\230o~\232o~\232p\246\177\233p\20\177\232o~\232o~\232n}\231n}\230l" - "{\227ix\224R_{/:Q2c3Ej@QtPa\202^m\215ix\225l|\230\202n~\231\246o~\232\202" - "n}\231\202m|\230\12lz\226fu\221O]y,7N0;TESoHUsIWuJXvKYw\202LZx\204M[" - "y\1LZx\202KYw\202JXv\12IWuHVsERp2=W*4KN[xfu\221lz\226m{\230m|\230\202" - "n}\231\204o~\232\2`o\214LZx\206KYw\6LZxM[yP_}iy\227|\214\247}\215\250" - "\203~\216\250\5}\216\250}\215\250{\212\246v\205\241t\203\237\202p\177" - "\233\3s\202\236jz\226M[z\207KYw\202JXv\3BNkR`|ix\224\203m|\230\210n}" - "\231\212o~\232\1^m\212\207KYw\202LZx\4Zi\210\226\244\276\270\305\330" - "\271\307\331\203\272\307\331\5\271\307\331\267\304\327\230\247\277w\206" - "\241p\177\233\252o~\232\26n}\231l{\227fu\223[l\213K[~c3Ej\77QtPa\202]m\214hw\224k{\227m}\231m}\246" - "\231n}&\230m|\230l|\227l{\227jz\225fu\221M[v-7N0c2Ei\77PtO`\201\\m\214gv\224" - "kz\226l|\227l\245|\227m(|\227l{\226k{\225kz\225iy\224fv\220N]w,7N-9Q" - "BOkEToGUqGVqHWrIXsJYuKZvM\\xcr\220\221\241\272\214\234\265]l\212M[xK" - "ZvJYuIXtIWsHWrHVrFUqETpBQl0;S*4JR_ygv\221jy\224kz\225l{\226l|\226m\202" - "|\227m\3|\227^m\210JXtI\205WsI\6WsJXtJYuM[xkz\224z\211\244{\205\213\245" - "{\14\212\244z\211\243u\205\237p\200\232n~\230n}\230o\177\231u\205\237" - "Wf\202KYvJXuJXtI\203WsI\14WsHVrGUqDRm2c2Ei\77PsN_\201[l\213" - "ft\222ix\226ky\227kz\227\244lz\227\34kz\226ky\226jx\225iw\224es\217M" - "Zv)4K/:SANjERoFSqGTqGTrHUsIVuJWvLZxYg\206\211\227\263\226\244\275\230" - "\246\276\201\220\255Xf\206LYxJXvIVuIVtHUs\202GTr\12ESqESpANj2c2D" - "i\77PsN_\201[k\213dt\222ix\225jy\226ky\244\226kz)\226jy\225jx\225iw\224" - "fu\221NZv+4K-8PAMiDRoESpFSqGTrGUrHVsIWuJXvSa\200y\211\246\224\242\273" - "}\213\246\177\216\251\225\243\274x\210\245R`\200JXvIWuIVtHUsGUrFTqFT" - "qESpDRoANk+5M,6NTa}gv\222ix\224jy\225kz\202\226kz\3\226]k\210HVsGU\206" - "rGU\4rHUsIWuap\214m|\206\230n|\202\230m{\1\230l{\202\227l{\10\227m{\230" - "t\202\237p\177\235R`\177IWuIVtHVsGU\202rGU\30rGTrFTqESpDRo>Kg-7O\35$" - "7#,@5@XFSnTa}[i\205^l\211`o\213bq\215ao\214_m\212^l\211[h\205[i\206e" - "s\220jx\225jy\225kz\202\226kz\3\226[i\206HUsGU\205rGU\6rGTrFTqFTq`n\213" - "hv\223gv\206\222gu\5\222hv\223hw\224ix\224jy\225ky\247\226kz\27\226j" - "y\226hw\225bq\220Xi\211IZ}PsM^\200Zk\212ds\221hw\225ix\225ix\225j\243y\226j\11y\226ix\225hw" - "\224et\221P]z'0H.9Q@NkCQnD\202SpE\36SqFTrGUsHVtIWvO]|t\204\242\223\242" - "\274y\210\245p\177\233p\177\234~\215\251\225\243\275p\200\236O]|HWvH" - "VuGUsFTrFTrESqESqDSpDRo@Mj.8Q,5MR_{gu\222ix\225j\202y\226j\3y\226[j\207" - "GUsF\207TrF\3TrGUs_m\213k\210z\227k\14z\227jy\226jy\226kz\227kz\227o" - "~\233~\216\252bq\221KYxHVuGUsGUsF\202TrF\27TrESqDSpDSpCQnBPm9E`,6O\40" - "'<\31!2\27\36""0\33\"5\36&9\37';#+@\40(<\37&:\36%:\32\"5\40)>Ub\177g" - "v\223ix\225j\202y\226j\2y\226Yh\205F\206TrF\10TrESqDSpV)2G(1F'1" - "E'\2020E'\10""0E(1F(1F+5KFSmet\221ix\225ix\225j\246y\226j\25y\226ix\225" - "gv\224aq\217Xi\210HY|;Mq/Bg*Pr" - "M^\200Yj\212cr\220gv\224\202hw\224\245ix\225\5gv\223P^y,5M.9R@Nk\202" - "DRo\1DSp\202ESq\10FTrGUsGVtL[zgw\225\221\240\273\201\217\253n}\232\202" - "m|\231\10p~\233\201\220\253\220\240\272hx\226KYxHVuGUsFTr\203ESq\202" - "DSp\6DRo@Nk-7Q5\77Y[i\206hw\224\203ix\225\2[i\207FTr\210ESq\2FTr^m\212" - "\213ix\225\10jy\226kz\227l{\230}\214\247w\207\245Ra\200HWuGUs\202FTr" - "\203ESq\202DSp\23DRoCQnBPmAOl>Kh9Fb3\77Y.8P+5M)4J'0F(3I+5L,6O/:S7C^b" - "q\215gv\223hw\224\203ix\225\2Yg\205FTr\206ESq\202DSp\4\77Lh0:S&0F&/E" - "\205%/D\5&/E(2HERmet\221hw\224\250ix\225\27hw\224gu\224`p\217Wh\210H" - "Y|;Mp/Bg*OrL]\177Xi\211aq\220f" - "u\223hw\224hw\224ix\243\225ix\7\225hw\224fu\222JWr9E`CQnDRoDS\202pDS" - "\12pESqESqFTrGUsIWv_o\216\216\236\272\201\220\254n}\232kz\203\227kz\11" - "\227n}\232\204\224\256\223\243\275`p\217KYxGUtFTrFTrES\204qES\5qGUsS" - "b\201et\221l{\230ix\203\225ix\2\225Zi\206ET\210qES\3qETq]l\211ix\213" - "\225ix\12\225jy\226jy\226r\201\236\206\226\262m~\235P^~GVtGUsFTrES\203" - "qES\11qDSpDRoDRoCQnBPmBPmAOlAOl@N\205k@N\13kAOlAOmCQnes\220gv\223hw\224" - "hw\224ix\225ix\225Xg\204ES\206qES\7qDSpDRoDQnBPmBPmANl@N\204k@N\7kAO" - "lBPmVd\201gv\223gv\223hw\224ix\245\225ix\30\225hw\224gv\224ft\222_o\216" - "Vh\207GY{;Lp/Bf*:>JDMaOZvTc\201Vd\203Ve\205Vf\205Wf\206Yi\210\370Zk\212\1Zj" - "\211\203Yi\210\1Zj\211\273Zk\212\26Yj\211Xi\210Td\205M^\177ARv7Hm.@e" - ");`(:_\35*E\0\0\0\345\17\25\"(:_*JCK_N" - "[vS`\177Ta\201Ud\203Ue\203Wf\205Wg\205Yj\210Yj\361\211Yj\13\211Xh\207" - "Ue\202Tc\200Sc\200Td\202Td\203Ue\203Vf\204Wf\205Xi\210Yj\270\211Yj\27" - "\211Yi\211Wh\210Sd\205M]\177ARu6Hl.@e);`(:_\35*E\0\0\0\345\17\25\"(:" - "_*6;F:\77M9\77K58B" - "6:EENeN[wQ_~Sa\201Tc\203Vg\206\267Wh\210\25Vg\207Uf\206Rb\203K\\~@Qt" - "6Gl-@e);`(:_\35*E\0\0\0\345\17\25\"(:_*MBJ`KXsQ]}R_\177S`\200Sa\201Tb\202Ud\204" - "Vf\206Vg\347\207Vg\21\207KXt9\77N9>LGRjO^|Q`\177Q`~KVq=CV9\77MEPiN[x" - "P^}Ra\200Tb\202Vf\206Vg\266\207Vg\24\207Tf\206Qa\202J[}\77Qt6Gl-\77e" - ");`(:_\35*E\0\0\0\345\17\25\"(:_*Pt6Gl-\77e);`(:_\35" - "*E\0\0\0\345\17\25\"(:_*N04=14=8>M@J_JUrMZxO]|Q]|Q_~Q`\200Rb" - "\202Sb\203Te\205\327Te\206\3Sc\203Ra\201R`\200\202Qa\201\1Rb\203\202" - "Sb\203\5Sd\204Te\205P_~ALbCOh\207O]}\7GRm=G[DPjJXtL[yP]}R`\200\266Te" - "\206\25Te\205Sc\204O`\201IZ|>Pt5Gl-\77d);`(:_\35*E\0\0\0\345\17\25\"" - "(:_*Pr5Fk-\77d);`(:" - "_\35*E\0\0\0\345\17\25\"(:_*03<.2:7>PDQlKZyM[{O^\177O^\177N\\|HVr" - "LZzM\207\\|M\12\\|FUrCOhHVqIXuNZzO^~Q`\201Sb\203Tc\204T\261c\205T\26" - "c\205Sc\204Sb\203Qa\203N^\200GX{>Or5Fk-\77d);`(:_\35*E\0\0\0\345\17\25" - "\"(:_*Or5Fk-\77d);`" - "(:_\35*E\0\0\0\345\17\25\"(:_*c5GkCTwVg\207fv\223s\201\235w\206\241y\207\242y\207\242" + "z\211\245\243z\211%\243{\211\243|\212\244|\213\245~\215\246\216\234\264" + "\245\263\310\211\230\261br\216Yh\205Wg\204Vf\202Ve\201Ue\201Ud\200Tc" + "\200Sb\177Sa~R_}MZvN\\xR`}Sa~Tc\177Td\200Ue\201Ve\201Wf\202Xg\204[k\207" + "n~\232\234\253\302\235\253\301\202\221\252}\214\246|\213\245{\212\244" + "{\211\204\243z\211\3\243kz\225Vf\202Ue\206\201Ue\4\201Ve\201Wf\202p\177" + "\231|\212\207\244|\212\2\244{\212\244{\211\202\243z\211\40\243y\210\242" + "x\207\241w\205\237n|\227HUn7B[LYvR`}Sa~Sb\177Tc\177Td\200Ue\201Ve\201" + "Wf\202Wg\204Yi\205\\k\210kz\226\205\224\255\244\262\310\270\303\326\270" + "\304\325\250\265\312\230\246\275\212\230\261\204\223\254\200\217\250" + "~\214\246|\212\244{\212\244z\211\204\243z\211\2\243ix\223Ve\207\201U" + "e\4\201Ud\201Ve\201q\200\232z\210\207\242z\210\1\242z\211\252\243z\211" + "\27\243z\210\242y\207\242w\205\240o~\233cs\221Pa\202@Qt2Di+=b(:_\35*" + "E\0\0\0\0\17\25\"(:`,>c5GkCTwVf\207fu\223r\200\234v\205\241x\206\242" + "y\246\207\242y\22\207\242z\210\242z\210\243{\211\244|\212\244\177\215" + "\250\222\240\267\243\260\307\177\216\251^m\212Wf\204Ve\202Ud\201Tc\200" + "Tc\200Sb\177Sa\177Sa~S\204`~S\20a\177Sa\177Tb\200Ud\200Ve\201Wf\203Y" + "h\205m|\230\230\246\276\241\256\305\207\225\256}\213\245{\211\244{\211" + "\243z\210\243z\210\242y\203\207\242y\3\207\242jx\224Ud\201T\207c\200" + "T\4c\200Uc\200m{\227y\207\241x\205\206\241x\1\206\241y\204\207\241y\40" + "\207\241x\206\241w\205\240t\202\234\\i\2057C[EQmR_}R_}S`~Sa\177Sa\177" + "Tb\200Ud\201Ve\201Ve\202Xg\204_n\214z\210\245\245\263\311\267\302\326" + "\256\272\316\230\245\275\213\230\261\202\217\252\177\214\247}\213\246" + "}\213\245|\212\245{\211\244{\211\243z\210\243y\204\207\242y\2\207\242" + "hv\222U\207c\200T\16c\200Sb\177Ta\177n|\227v\204\237v\204\237u\203\237" + "u\203\236u\203\236v\204\236v\204\237w\205\240x\206\240y\207\241y\251" + "\207\242y\25\207\242x\206\242v\204\240o}\232cr\221Pa\202\77Qt2Di+=b(" + ":_\35*E\0\0\0\0\17\25\"(:`,>c4FkBSwVf\206et\222q\177\233u\204\236\202" + "x\206\240\250x\207\241\15y\210\242z\210\243{\211\244~\215\247\221\237" + "\267\245\263\311\200\220\252[k\207Vf\202Ud\201Tc\200Sb\177Sa\177\203" + "Sa~\1R`}\203Sa~\15Sa\177Sb\177Tc\200Ue\201Xg\204gw\224\230\247\277\240" + "\256\304\203\222\253|\212\245z\211\243y\210\242y\207\242\206x\207\241" + "\2iw\223Tc\200\206Sb\177\1Sa\177\202Sa~\3jy\224u\203\236t\203\235\204" + "s\202\235!t\203\235u\203\236u\204\236v\205\237w\205\240w\206\240v\205" + "\237u\204\236hv\222EQlANiO]zQ_|R`}S`~Sa~Sa\177Sb\177Tc\200Ue\201Xh\204" + "dt\222\231\247\277\264\301\324\245\262\307\214\232\263\200\217\250}\214" + "\246|\213\245{\212\244{\211\244z\211\243z\210\243\202y\210\242\1y\207" + "\242\206x\207\241\1gu\221\207Sb\177\17Sa~R`}O\\yZg\202R`zKXqIUnBOf>I" + "bc" + "4FkBSwUf\206dt\222p\177\233t\202\236v\205\237w\205\237x\206\250\241x" + "\206\13\241y\207\242z\210\243{\211\244\177\215\247\223\241\271\240\255" + "\306v\204\240\\k\210Ud\201Tb\200Sa\202\177Sa\1\177S`\204~S`\16~Sa\177" + "Sa\177Tb\200Tc\200Wf\203gv\223\221\237\271\235\252\302\206\224\256|\212" + "\244z\210\243y\207\242y\207\242x\206\206\241x\206\3\241iw\223Tb\200S" + "a\205\177Sa\5\177S`~R`}P]{Wd\200We\202~Vc\202}Uc\202}Vc\4~We\177bp\215" + "t\202\235v\204\202\237v\204\30\237t\202\235Xe\202\77KeLYwQ^|R_}S`~S`" + "~Sa\177Sa\177Tb\200Uc\201Wf\204iw\225\225\243\274\251\266\313\221\237" + "\270\202\220\252}\213\246|\212\244{\211\244z\210\243z\210\243y\207\202" + "\242y\207\1\242x\207\210\241x\206\2\241gu\221Sa\206\177Sa\20\177S`~R" + "_}GTq0:R!)>!)>\"*\77#,A$.C&/E*4JIVoq\200\233v\204\237w\205\240x\206\247" + "\241x\206\30\241w\205\240v\204\237s\202\235m|\230aq\220O`\202\77Pt1C" + "h+c4FjASvTe\205cs\221o~\232s\201\235u" + "\203\237u\203\237v\251\205\237v\13\205\237w\206\240x\207\241y\210\241" + "}\214\245\223\242\271\235\254\303r\202\237Wg\204Sb\177Sa~R\210`}R\13" + "`}Sa~Tc\200et\221\220\240\270\240\256\304\204\222\254z\211\242x\207\241" + "w\206\240w\206\240v\207\205\237v\3\205\237gv\221Sa~R\205`}R\6`}Q_|P^" + "{JXu/:R\37(;\37\204':\36\5':\37':\40)=>Kdq\200\232t\202\203\235t\6\203" + "\235o~\230IVqBOkO]zP^{Q\202_|Q\15_|R`}R`}Sa~Tc\200aq\215\220\240\270" + "\243\261\306\203\222\254z\211\243y\210\242y\210\242x\207\241w\203\206" + "\240w\1\206\240v\212\205\237v\2\205\237et\217R\206`}R\20`}Q_|Q_|N\\y" + "HVqCQlERnERnFTpHVrIWtLZv^l\207s\202\234u\204\236u\204\236v\250\205\237" + "v\25\204\237u\203\236r\201\235l{\230`q\217N_\200>Ps1Ch+c4FjASvTd\205br\221n}\231r\201\235\202s\202\236\252" + "t\203\237\12u\204\237u\204\240v\205\240w\205\241{\212\245\224\242\273" + "\226\244\277k{\230Tc\201Q_~\211P^}\7Q_~]l\213\213\233\266\233\252\302" + "\203\222\254w\206\242v\205\240\202u\204\240\211t\203\237\2ft\221Q_~\206" + "P^}\6P]|O]{M[yERo@Mh\77Mh\204\77Lg\16\77Mh@MiTb~r\200\234r\201\235s\201" + "\235r\201\235iw\224DRnIWuN\\{O\\{O]|P^|\202P^}\13Q_~R`~Ve\204t\204\242" + "\226\244\275\205\223\255x\207\242w\206\241v\205\241v\205\240u\204\240" + "\202u\203\237\215t\203\237\2dr\217Q_}\206P^}\5P^|O]|N\\{N\\zM[y\204L" + "Zx\5M[xM[z]l\211s\201\235s\202\236\251t\203\237\26t\203\236s\202\236" + "q\200\234kz\226`p\217N^\200>Ps1Ch+c4E" + "jARuSc\204bq\220m|\230q\200\234r\201\254\235s\202\1\235t\202\202\236" + "t\202\7\236t\203\236|\212\245\224\242\273\213\233\265Zj\210P]|O]\210" + "{O]\6{P]|We\202{\211\243|\213\245t\203\236s\202\214\235s\202\3\235es" + "\217P^|O]\205{O]\7{O\\{N\\zN[yM[xLZwLYwKY\203vKY\4vLYwLZx\\j\206r\200" + "\202\234r\201\10\234q\200\233bp\213GTpLZwN[yN\\zN\\zO]\202{O]\14{P^|" + "Q^}[j\211\205\224\257\204\223\256w\206\241v\204\237u\204\237t\203\236" + "t\203\236t\202\236s\202\216\235s\202\3\235cq\215P]|O]\207{O]\3{N\\zN" + "\\yN\\\204yN[\202yN\\\3y]k\210r\201\234s\202\252\235s\202\26\235r\201" + "\235p\200\234jy\226_o\216M^\177>Os1Ch+c3Ej@RuSc\204ap\217l{\227p\177\234r\201\235r\252\201\235s\2\201\235" + "r\201\234r\203\200\234r\6\200\234n|\230Zg\203@LeHVrO\\zO\210\\{O\10\\" + "{M[yBNk0;SKWrjy\224q\177\233q\177\233r\202\200\234r\1\200\234s\207\201" + "\235s\3\201\235dr\217P]|O\207\\{O\3\\zN[yN[yM\207ZxM\2Zx]j\207r\202\200" + "\234r\10\200\234q\177\233]k\207GSpMZxN[yN[yO\\zO\202\\{O\11\\{P]|Q^}" + "`o\215\200\216\251x\206\242u\203\237t\202\236t\202\236s\221\201\235s" + "\3\201\235bp\215O]{O\220\\{O\2\\{^l\211s\252\201\235s\202\201\235r\26" + "\201\235p\177\233ix\225^n\216M]\177=Or0Ch+c3Ej@RuRb\203_p\216kz\227o\177\232p\200\234q\200\234\251r\201\234" + "\202q\200\233\202p\177\233\7o~\232l{\227S`{2>V4@ZIWtM[x\210N\\z\12M[" + "yM[xJYv7D^,7OLZtiy\224o~\232o\177\232p\177\233\202q\200\233\1q\201\234" + "\206r\201\234\2cr\216O]{\211N\\z\1N\\y\210M\\y\1\\k\207\202q\201\234" + "\4q\200\234n~\231[j\206JXv\202M[x\1M\\y\205N\\z\4O]{[j\207{\212\245s" + "\203\236\202r\201\235\223r\201\234\1ap\214\210N\\z\4N\\{O]{O]|O^|\205" + "P^|\2O^|^m\212\202r\201\235\251r\201\234\30q\201\234p\200\234o~\232h" + "w\225]n\215M]\177=Or0Ch+c3Ej@RuQb\203" + "_o\216kz\226n}\231p\177\232p\177\232q\200\246\234q\200\202\234p\177\14" + "\233p\177\233o~\232n}\232m|\231ix\224S`|-8P2=WFTrKYwLZxM[\203yM[\203" + "zM[\2yM[yLZ\202xKY\11wHVt8E_+5LKYtgv\222m|\230n}\232o~\232p\177\202\233" + "p\177\205\234q\200\3\234bp\216N\\zM[\207yM[\3zN\\{N\\{O]\202|O]\204}" + "O]\10|O]|]k\211q\200\235q\200\234q\200\234o~\232^m\212LZ\202xLZ\207y" + "M[\3ySa\177p\177\233p\177\210\234p\177\215\234q\200\2\234`n\214M[\207" + "yM[\2zN\\{N\\\202|P^\1}Q_\202~Q_\7\177Q_~Q_~P^}^m\212r\201\235r\201\235" + "q\200\250\234q\200\30\234p\177\233o\177\232n}\231hw\224\\m\214L\\~=N" + "r0Ch+c3Ej@QtQa\202^n\215jy\225m}\230o" + "~\232o~\232p\246\177\233p\20\177\232o~\232o~\232n}\231n}\230l{\227ix" + "\224R_{/:Q2c3Ej@QtPa\202^m\215ix\225l|\230\202n~\231\246o~\232\202n}\231" + "\202m|\230\12lz\226fu\221O]y,7N0;TESoHUsIWuJXvKYw\202LZx\204M[y\1LZx" + "\202KYw\202JXv\12IWuHVsERp2=W*4KN[xfu\221lz\226m{\230m|\230\202n}\231" + "\204o~\232\2`o\214LZx\206KYw\6LZxM[yP_}iy\227|\214\247}\215\250\203~" + "\216\250\5}\216\250}\215\250{\212\246v\205\241t\203\237\202p\177\233" + "\3s\202\236jz\226M[z\207KYw\202JXv\3BNkR`|ix\224\203m|\230\210n}\231" + "\212o~\232\1^m\212\207KYw\202LZx\4Zi\210\226\244\276\270\305\330\271" + "\307\331\203\272\307\331\5\271\307\331\267\304\327\230\247\277w\206\241" + "p\177\233\252o~\232\26n}\231l{\227fu\223[l\213K[~c3Ej\77QtPa\202]m\214hw\224k{\227m}\231m}\246\231" + "n}&\230m|\230l|\227l{\227jz\225fu\221M[v-7N0c2Ei\77PtO`\201\\m\214gv\224kz\226l|\227l\245" + "|\227m(|\227l{\226k{\225kz\225iy\224fv\220N]w,7N-9QBOkEToGUqGVqHWrIX" + "sJYuKZvM\\xcr\220\221\241\272\214\234\265]l\212M[xKZvJYuIXtIWsHWrHVr" + "FUqETpBQl0;S*4JR_ygv\221jy\224kz\225l{\226l|\226m\202|\227m\3|\227^m" + "\210JXtI\205WsI\6WsJXtJYuM[xkz\224z\211\244{\205\213\245{\14\212\244" + "z\211\243u\205\237p\200\232n~\230n}\230o\177\231u\205\237Wf\202KYvJX" + "uJXtI\203WsI\14WsHVrGUqDRm2c2Ei\77PsN_\201[l\213ft\222ix\226ky" + "\227kz\227\244lz\227\34kz\226ky\226jx\225iw\224es\217MZv)4K/:SANjERo" + "FSqGTqGTrHUsIVuJWvLZxYg\206\211\227\263\226\244\275\230\246\276\201\220" + "\255Xf\206LYxJXvIVuIVtHUs\202GTr\12ESqESpANj2c2Di\77PsN_\201[k\213" + "dt\222ix\225jy\226ky\244\226kz)\226jy\225jx\225iw\224fu\221NZv+4K-8P" + "AMiDRoESpFSqGTrGUrHVsIWuJXvSa\200y\211\246\224\242\273}\213\246\177\216" + "\251\225\243\274x\210\245R`\200JXvIWuIVtHUsGUrFTqFTqESpDRoANk+5M,6NT" + "a}gv\222ix\224jy\225kz\202\226kz\3\226]k\210HVsGU\206rGU\4rHUsIWuap\214" + "m|\206\230n|\202\230m{\1\230l{\202\227l{\10\227m{\230t\202\237p\177\235" + "R`\177IWuIVtHVsGU\202rGU\30rGTrFTqESpDRo>Kg-7O\35$7#,@5@XFSnTa}[i\205" + "^l\211`o\213bq\215ao\214_m\212^l\211[h\205[i\206es\220jx\225jy\225kz" + "\202\226kz\3\226[i\206HUsGU\205rGU\6rGTrFTqFTq`n\213hv\223gv\206\222" + "gu\5\222hv\223hw\224ix\224jy\225ky\247\226kz\27\226jy\226hw\225bq\220" + "Xi\211IZ}PsM^\200Zk\212ds" + "\221hw\225ix\225ix\225j\243y\226j\11y\226ix\225hw\224et\221P]z'0H.9Q" + "@NkCQnD\202SpE\36SqFTrGUsHVtIWvO]|t\204\242\223\242\274y\210\245p\177" + "\233p\177\234~\215\251\225\243\275p\200\236O]|HWvHVuGUsFTrFTrESqESqD" + "SpDRo@Mj.8Q,5MR_{gu\222ix\225j\202y\226j\3y\226[j\207GUsF\207TrF\3Tr" + "GUs_m\213k\210z\227k\14z\227jy\226jy\226kz\227kz\227o~\233~\216\252b" + "q\221KYxHVuGUsGUsF\202TrF\27TrESqDSpDSpCQnBPm9E`,6O\40'<\31!2\27\36""0" + "\33\"5\36&9\37';#+@\40(<\37&:\36%:\32\"5\40)>Ub\177gv\223ix\225j\202" + "y\226j\2y\226Yh\205F\206TrF\10TrESqDSpV)2G(1F'1E'\2020E'\10""0E" + "(1F(1F+5KFSmet\221ix\225ix\225j\246y\226j\25y\226ix\225gv\224aq\217X" + "i\210HY|;Mq/Bg*PrM^\200Yj\212cr\220" + "gv\224\202hw\224\245ix\225\5gv\223P^y,5M.9R@Nk\202DRo\1DSp\202ESq\10" + "FTrGUsGVtL[zgw\225\221\240\273\201\217\253n}\232\202m|\231\10p~\233\201" + "\220\253\220\240\272hx\226KYxHVuGUsFTr\203ESq\202DSp\6DRo@Nk-7Q5\77Y" + "[i\206hw\224\203ix\225\2[i\207FTr\210ESq\2FTr^m\212\213ix\225\10jy\226" + "kz\227l{\230}\214\247w\207\245Ra\200HWuGUs\202FTr\203ESq\202DSp\23DR" + "oCQnBPmAOl>Kh9Fb3\77Y.8P+5M)4J'0F(3I+5L,6O/:S7C^bq\215gv\223hw\224\203" + "ix\225\2Yg\205FTr\206ESq\202DSp\4\77Lh0:S&0F&/E\205%/D\5&/E(2HERmet\221" + "hw\224\250ix\225\27hw\224gu\224`p\217Wh\210HY|;Mp/Bg*OrL]\177Xi\211aq\220fu\223hw\224hw\224ix\243\225" + "ix\7\225hw\224fu\222JWr9E`CQnDRoDS\202pDS\12pESqESqFTrGUsIWv_o\216\216" + "\236\272\201\220\254n}\232kz\203\227kz\11\227n}\232\204\224\256\223\243" + "\275`p\217KYxGUtFTrFTrES\204qES\5qGUsSb\201et\221l{\230ix\203\225ix\2" + "\225Zi\206ET\210qES\3qETq]l\211ix\213\225ix\12\225jy\226jy\226r\201\236" + "\206\226\262m~\235P^~GVtGUsFTrES\203qES\11qDSpDRoDRoCQnBPmBPmAOlAOl@" + "N\205k@N\13kAOlAOmCQnes\220gv\223hw\224hw\224ix\225ix\225Xg\204ES\206" + "qES\7qDSpDRoDQnBPmBPmANl@N\204k@N\7kAOlBPmVd\201gv\223gv\223hw\224ix" + "\245\225ix\30\225hw\224gv\224ft\222_o\216Vh\207GY{;Lp/Bf*:>JDMaOZvTc\201Vd\203Ve\205" + "Vf\205Wf\206Yi\210\370Zk\212\1Zj\211\203Yi\210\1Zj\211\273Zk\212\26Y" + "j\211Xi\210Td\205M^\177ARv7Hm.@e);`(:_\35*E\0\0\0\0\17\25\"(:_*JCK_N[vS`\177Ta\201Ud\203Ue\203Wf\205Wg\205Yj" + "\210Yj\361\211Yj\13\211Xh\207Ue\202Tc\200Sc\200Td\202Td\203Ue\203Vf\204" + "Wf\205Xi\210Yj\270\211Yj\27\211Yi\211Wh\210Sd\205M]\177ARu6Hl.@e);`(" + ":_\35*E\0\0\0\0\17\25\"(:_*6;F:\77M9\77K58B6:EENeN[wQ_~Sa\201Tc\203Vg\206\267Wh\210\25Vg\207" + "Uf\206Rb\203K\\~@Qt6Gl-@e);`(:_\35*E\0\0\0\0\17\25\"(:_*MBJ`KXsQ]}R_\177S`\200" + "Sa\201Tb\202Ud\204Vf\206Vg\347\207Vg\21\207KXt9\77N9>LGRjO^|Q`\177Q`" + "~KVq=CV9\77MEPiN[xP^}Ra\200Tb\202Vf\206Vg\266\207Vg\24\207Tf\206Qa\202" + "J[}\77Qt6Gl-\77e);`(:_\35*E\0\0\0\0\17\25\"(:_*P" + "t6Gl-\77e);`(:_\35*E\0\0\0\0\17\25\"(:_*N04=14=8>M@J_JUrMZxO" + "]|Q]|Q_~Q`\200Rb\202Sb\203Te\205\327Te\206\3Sc\203Ra\201R`\200\202Qa" + "\201\1Rb\203\202Sb\203\5Sd\204Te\205P_~ALbCOh\207O]}\7GRm=G[DPjJXtL[" + "yP]}R`\200\266Te\206\25Te\205Sc\204O`\201IZ|>Pt5Gl-\77d);`(:_\35*E\0" + "\0\0\0\17\25\"(:_*Pr5Fk-\77d);`(:_\35*E\0\0\0\0\17\25\"(:_*03<.2:7>PDQlKZyM[{O^\177O" + "^\177N\\|HVrLZzM\207\\|M\12\\|FUrCOhHVqIXuNZzO^~Q`\201Sb\203Tc\204T\261" + "c\205T\26c\205Sc\204Sb\203Qa\203N^\200GX{>Or5Fk-\77d);`(:_\35*E\0\0\0" + "\0\17\25\"(:_*Or5Fk-\77" + "d);`(:_\35*E\0\0\0\0\17\25\"(:_*IaESoGVvKZzO_\177KZyJ\210YxJ\11XxGTrGTrIWvJYyL[{O^" - "\177P`\201P`\201Q\222`\202Q\4`\202O_\200L\\}O^\177Q\234`\202Q\25`\202" - "P`\201O_\200K\\~FVz=Nq4Fk-\77d);`(:_\35*E\0\0\0\345\17\25\"(:_*-0;29I=HbE" - "RoHVvIWxJZ|L[}N]\177P_\200\303P`\201\4N^\200GUs>H`FTr\206IXx\10FUt;D" - "\\9BWBOjETqHWwO_\201JZz\211IXx\6GVuGTsHWwIXyKZyM\\}\202O_\201\222P`\201" - "\4P_\201ESp4JcESrGVvJ" - "WxKY{L[}M]~O_\301\200O_\5\200N]\177GVuBOjGVuHX\206wHX\10wCPl8CX>HbDQ" - "nGWuO`\202L\\}HX\210wHX\10wGVuFUsHWwJXxJYyM]~N^\200N^\222\200O_\16\200" - "M\\~>Jc06E>KdKZ|KZ|L[}M\\~M\\~IXxDQmJYzN^\200N^\223\200O_\26\200N^\200" - "M]\177JZ~DUyPsE" - "VyJ[~L]\177M^\200M\220^\200N\26^\200M^\200Qa\204Rb\205Rb\207Rc\211Tf" - "\212Ui\214Vj\215Wk\217Xm\220Xl\217Wl\220Wk\215Vj\215Xl\216bx\233t\213" - "\255y\222\265k\201\245Ug\214JY|G\203VwG\16UvBPo7AV-2>*.829J;G_DRoGTs" - "HVvIXyJYzL\\~M]\177N\275^\200N\5^\200M^\177M]~JXxFUuG\207VwG\10VwFUu" - ">Je9CZANjESpN_\201M]\200G\212VwG\7UtGUuHVwKZ{L]~M]\177M^\177N\221^\200" - "N\5^\200JYz=Hb>JeGWwI\203YzI\7YyBQn/5D.3ACQnJZ{L\\}M\202^\177N\217^\200" - "N\202^\200M\24]\200L\\\177HY|CUx;Mp3Ej,\77d);`(:_\35*E\0\0\0\345\17\25" + "a\202Qa\202P`\201L]\177FWz=Nq4Fk-\77d);`(:_\35*E\0\0\0\0\17\25\"(:_*" + "IaESoGVvKZzO_\177KZyJ\210YxJ\11XxGTrGTrIWvJYyL[{O^\177" + "P`\201P`\201Q\222`\202Q\4`\202O_\200L\\}O^\177Q\234`\202Q\25`\202P`\201" + "O_\200K\\~FVz=Nq4Fk-\77d);`(:_\35*E\0\0\0\0\17\25\"(:_*-0;29I=HbERoHVv" + "IWxJZ|L[}N]\177P_\200\303P`\201\4N^\200GUs>H`FTr\206IXx\10FUt;D\\9BW" + "BOjETqHWwO_\201JZz\211IXx\6GVuGTsHWwIXyKZyM\\}\202O_\201\222P`\201\4" + "P_\201ESp4JcESrGVvJWxKY{" + "L[}M]~O_\301\200O_\5\200N]\177GVuBOjGVuHX\206wHX\10wCPl8CX>HbDQnGWuO" + "`\202L\\}HX\210wHX\10wGVuFUsHWwJXxJYyM]~N^\200N^\222\200O_\16\200M\\" + "~>Jc06E>KdKZ|KZ|L[}M\\~M\\~IXxDQmJYzN^\200N^\223\200O_\26\200N^\200M" + "]\177JZ~DUyPsEVyJ" + "[~L]\177M^\200M\220^\200N\26^\200M^\200Qa\204Rb\205Rb\207Rc\211Tf\212" + "Ui\214Vj\215Wk\217Xm\220Xl\217Wl\220Wk\215Vj\215Xl\216bx\233t\213\255" + "y\222\265k\201\245Ug\214JY|G\203VwG\16UvBPo7AV-2>*.829J;G_DRoGTsHVvI" + "XyJYzL\\~M]\177N\275^\200N\5^\200M^\177M]~JXxFUuG\207VwG\10VwFUu>Je9" + "CZANjESpN_\201M]\200G\212VwG\7UtGUuHVwKZ{L]~M]\177M^\177N\221^\200N\5" + "^\200JYz=Hb>JeGWwI\203YzI\7YyBQn/5D.3ACQnJZ{L\\}M\202^\177N\217^\200" + "N\202^\200M\24]\200L\\\177HY|CUx;Mp3Ej,\77d);`(:_\35*E\0\0\0\0\17\25" "\"(:_*OrDUxIZ}K\\~\202L]\177\221M]\177\26M^\200N^\201O_\202" "Qa\204Qb\205Rc\206Rd\211Tg\212Ui\214Vj\215Wk\216Wl\217Wk\217Vk\216Vj" "\215Wk\216ax\235p\210\255t\215\260cy\235Oa\205GWx\203FUv\15FTu@Mj5>R" "+/;+0=6\77S\77LgDSqFTtGWwHXyJYzL]\177\275M]\177\202L]~\2K\\~GVw\211F" "Uv\6CRo:E^>JdBRoL\\}L]\200\211FUv\6FUwGVtHWxIXyJZ|L\\}\202L]~\1L]\177" "\221M]\177\5GVv>JdCQoIYzGXy\202GXx\5DQp3c):`(" - ":_\35*E\0\0\0\345\17\25\"(:_*;`-@e4Fk=NrCTwHY|IZ}J[~J[~K\225\\~K\14\\" - "\177L]\177M^\200O_\202O`\203Oa\205Pb\207Rf\213Th\214Vi\215Vk\220Vk\220" - "W\202l\220V\10k\217Xn\222bx\236p\210\254p\211\254Ym\221JZ}FUuE\202Tt" - "E\15TtCRp:D\\.5D).808J;GbAPnCSrFTuFVxIY{K[}K\271\\~K\6\\~J[}J[}M^\203" - "O_\203FUwE\210TtE\7TtAOn;G`>KfFVuM_\203GWzE\210TtE\6TtFVvGWxHXxIYzJZ" - "|J\202[}J\1[}K\217\\~K\23\\~J[}@OlJf.5E6@V^r\230^s\230" - "FUvETtGVwHXzJ[}J[}K\217\\~K\25\\~J[~IZ}FW{BSv:Lo2Dj,>c):`(:_\35*E\0\0" - "\0\345\17\25\"(:_*;`-@e3EjT=KgBQp" - "DSsEUuGVwIY|\271J[~\202JZ}\3O_\202Re\210GWw\211ETs\7DSrJgJZ" - "{IZ|EUuAOm2;Q1:NIY{ez\242Oa\205ERrETuFUwHXz\202JZ}\220J[~\26IZ}HY|FW" - "yBSu9Ko2Di,>c):`(:_\35*E\0\0\0\345\17\25\"(:_*;`-@e3Ej;MpBSvFWzHY|HY" - "}HY\233}IZ\13}J[~L]\200M^\201M^\202N_\205Pb\207Qf\213Sg\213Ti\215Uj\216" - "Uk\202\216Uj\7\216Zp\224f}\242m\206\253_u\232L^\201DTuCS\202rCS\15rB" - "RqKj@MlJ[}IY{DSs9E_.7I>Li" - "Uk\220Xm\223FWxDTtFUvGX{HY|HY}HY\220}IZ\26}HY}GY|EVyARu8Jn2Di,>c):`(" - ":_\35*E\0\0\0\345\17\25\"(:_);`-\77e3Ej;MpASuEVyFXzGX|H\235Y|H\23Y|J" - "Z}K\\\177L]\200L^\202M_\204N`\206Qd\207Rf\212Th\214Uj\216Uj\216Tj\216" - "Uj\217]t\232l\204\252j\203\247Uh\215EVyB\203RrB\14Rr\77Ml2=T(-;*1A5@" - "Z>MjBOoCQqDTvETvGWzH\265Y|H\6Y|GX{GXzJ[}Sg\213J\\\177B\211RrB\6RrAQq" - ":Fa5@X9D_@NnB\207RrB\13RrAOp9Ea4\77V3=S4\77V8B\\;Gc@LkBQpBRsC\202RsD" - "\202TvD\202TvE\2TvFVxH\205Y|H\24Y{GX{FVx=Kh@OnJ[\200GXz\77Nm1;Q4\77W" - "I\\\177[s\230L^\201CSsETuGWyGXyGXzGX{GX{H\217Y|H\25Y|GX|GXzDVx@Rt8Jn" - "1Ci,>c):`(:_\35*E\0\0\0\345\17\25\"(:_);`-\77d3Di;Lp@RuDVxFWz\202GXz" - "\236GX{\3GX|HY|J[~\202K\\\200\16K^\204N`\206Od\210Rf\212Th\215Uj\216" - "Uj\217Uk\220Xm\222az\237o\210\255f~\244M`\203CTt\203ARq\13@Po;Gc+1B&" - "*8/7L9Fb>MlBPpCStDTtFVw\265GX{\202GWz\4IZ}Rg\212Mb\206BRr\212ARq\5>N" - "l3>W0:P9EbAPo\207ARq\23AQo.6J2L" - "kWl\221Yo\225FVxDStEVwFVxFWyGWy\202GWz\220GX{\26GXzFWyCUx\77Qt8In1Ch" - ",>c):`(:_\35*E\0\0\0\345\17\25\"(:_);`,\77c3Di;Lo@RtDUxEWyFWzFW\241z" - "FX\22zHY|HY|J\\\177J]\201K^\203M`\206Ob\206Qf\213Sh\214Si\215Th\215U" - "i\216Zp\225h\200\247k\204\251Xl\220DVwAQ\203qAQ\13qNn@PpBPqCSsCS\202sDS\13sCSs\77KlFTwNa\206ARr4\77X7B^GX{]s\232" - "M`\204ET\202wEU\5xGX|HY|EWyEWyFW\220zFX\24zFWzEVyCTw\77Qs8In1Ch+>b(:" - "`(:_\35*E\0\0\0\345\17\25\"(:_);`,\77c2Di:Ko@QsCTwE\203VyE\243WzE\21" - "WyIZ~J[\177J[\200J\\\201L^\203M`\205Pe\211Qf\213Sh\215Sh\214Sh\215^u" - "\234j\202\251by\240L_\202AQrA\202PpA\14Pp@Oo4AZ(.=',;3=U:Hf>MlAOpARs" - "BRtDVxE\262WzE\202VyE\4UxBRtAPpAPqA\236PpA\40Pp@Nn;Ie5AZ/8M*1B%*6\"%" - ".\40#*!$-%*7.7K4@Z;Ig\77Ml\77OpAPqAQrBQrK]\201M`\204=Lk3\77X>NmYn\224" - "Vl\222EWyEUwFVyHY}IZ~IZ~E\203VyE\217WzE\24WyEVyDUxBTv>Ps7Hn1Bh+>b(:`" - "(:_\35*E\0\0\0\345\17\25\"(:_);`,\77c2Ci9Ko\77PsBTw\203DUx\244EVy\11" - "FWzFW{HZ}HZ~H[\200I\\\202M`\206Nb\210Pe\212\202Rg\214\6Ti\217Xn\225f" - "\177\245g\201\247Ti\217DUv\203\77Oo\13>Nm7D^)0B&+:.8N9GdMnAPqBRs" - "DUw\262EVy\5DUx>Ml+2F-6K=Kk\243\77Oo\6=Ll;If6C^0Or7Hm1Bg+>b(:`(:_\35*E\0\0\0\345\17" - "\25\"(:_);`,\77c2Ci9Kn>PrBSvDT\202xDU\1xEV\246yEV\21yFWzGX|HY}HZ\200" - "J]\202M`\204Nb\207Pe\212Rg\215Sg\216Si\216_v\235m\206\255`w\233I\\\200" - ">Np>N\202o>N\14n:Hf,4I#)6+5I6B_:Ii=Lm@OqAQsCSvEUxEV\212yEV\2yEUxCT\202" - "vCT\1vEV\236yEV\7yEUxDUx@Pq.8O(.@6C_>N\247o>N\21o>Mn;Jh6C]0:P',<\40#" - ",\37\"*%+:0;T[q\225e}\243FXzEWzUj\216g\201\250Uk\222FW\202zFW\7zFX}G" - "X|GX|HY}DUxDUxEV\217yEV\25yEUxDUxCTwASu=Or7Hm1Bg+>b(:`(:_\35*E\0\0\0" - "\345\17\25\"(:_);`,>c1Ch8Jn=OrASuB\253TwC\20TwDUxFW|GX}HZ\177J\\\202" - "K_\204Nb\210Od\211Qe\212Rf\213Wm\224e~\244f\177\244Ma\206@Qr=\202Mn=" - "\13Mn;Ii1;S$*9(0B4A]9Hg=Kl\77Op@PqBRtC\207TwC\12TwBSuAQsBRtCSvAQsAPq" - "BRtCSvBRtA\202QsA\1QsC\204SvC\227TwC\5Tv8Fb)2G5A]=Lm=\230Mn=\6Mn>NnH" - "Y{Yi\207Vf\205DUw=\215Mn=\15Mn;Ji7C`-7M$*8!%1(/@3=U:HfL`\204m\206\255" - "]s\232GY}E\202VyE\5W|FX\177FW|FX|EVyC\223TwC\25TwBTw@Rtc1Ch8Im=NqARuASvBTv\254BTw\16CUy" - "EW|EX}GZ\200J^\203L_\206Na\207Nc\210Oc\211Rg\215^u\234g\200\247Vj\221" - "@Qr\203No\77Oq@Qs\205BTw\3@PrAQs\77Pr\202" - ">Np\1>Mn\203>Ln\1>Mo\203>Np\1\77Np\203@Oq\1AQt\226BTw\5BTv@Pr1!&4'-\77""6C_EW{DUwBRtEUyEVyEVz\203EW{\2BTwB" - "Tv\222BTw\26BTvASv@Qtc1Ch7ImN\202p>N\25p=Lm9Gg1=V*3G#(7\37#.\36!*\36\"+\40%1$*:(/D,6L/" - ";S3@]6Db:Ff;HiN\202p>N\3p\77Np\77OpAR\202tAR\4tBSvBTvASuBT" - "\212vBT\6vARt9Gf+5L1>Y;Kl;K\224m;K\15mNq;K\220m;K\16" - "l9Hg2\77Z'/B\"(8*3I8Dc>NoARtCTwDTwEVyDVzBSvAS\222vBT\203vAS\23u\77Ps" - ";Mp5Gk0Bf+=b(:`(:_\35*E\0\0\0\345\17\25\"(:_):`,>c0Ch7Hl;Mp\77PsARtA" - "\202RuA\255SvA\17SvBTwEVzEW|FY\177H\\\202I^\204M`\206Ma\207Nc\211Uk\223" - "f\177\247b{\242I\\\201;Km:\202Jk:#Jk3A]$-@#)9/:S6Da8Gg;HjZ7Cb9Ij:JlMo\77Oq\77" - "Or\77Np\77\204Pr\77\1PsA\205SvA\5Rt>Np1=[*3K6Cc:\224Jk:\16Jk;KlGZ}Wn" - "\223BTx:JkJ]\204\212\243\305w\216\260L`\207Sh\216\210\240\277{\224\270" - "\77Ps:\222Jk:\11Jk7Ff/9R$*<'/C4@]Ps;Lp5Fk/Bf+=b(:`(:_\35*E\0\0\0\345\17\25\"(:_):`,>c0Ch6Gl;L" - "p>Ps@Qs\262ARt\15BSwDUzDV}EX\177H]\203J^\203L`\206La\210Nd\212]v\235" - "f\177\247Od\212=Nq\203:Jk\16""6Cb(/D\")9+6O4Ba5Da0=X%,=\33\36'\34\36" - "'\"'5,5L4B^:Ji\204:Jk\23:Ij8Ee2>Z,6N(/B#)9\37#0\35\37(\33\35$\32\35$" - "\34\36'\36#/$*:)2G.9R2=Z6Cb9Fg:Ik\202;Km\1Z:Ijc0Bg6Gl:Ko>Or\77" - "P\202s\77Q\1s@Q\260t@Q\16tBSwCTyCU{DW~EY\200H]\203K_\206K`\207Nd\213" - "Zq\232d}\245Si\221=Mo:I\202j:I\13j5B`&.B!'8)2J&-B\35!,\34\37)#*;/:T6" - "Ec:I\212j:I\26j9Hi7Fe5Ba2\77[-9Q'0E#):\36#/\34\37(\32\35$\32\35$\33\36" - "(\36#/!'6%-A*4K/:U3@]5Ca5Ec6Eg9F\202h9F\1i9G\202i9F\6h8Ef3@\\&/C\"(9" - "1\77\\:I\226j:I\15kEW|\213\245\307o\207\255Y#*=3@\\BTy@Ru,7M%,\77" - "7Ee:I\225j:I\12j5Ca(0G$,A/Oq@Q\222t@Q\25s\77Qs\77PsOr\77" - "\264Ps\77\15PsASwBTyBU{EX\177G\\\202I^\205J_\206La\210Wn\226g\202\247" - "Tk\222=Or8\202Hj8\10Hj4B`'0F\34\40,\34!,%-@0=X7Fg8\223Hj8\32Gj7Ee4A^" - "/Or\77\221Ps\77\202Ps>\22OrOr" - "\16>Ps\77QtASvATzBV}EY\177G\\\202H]\204J_\207Qh\217c|\243Vm\224=Nq7G" - "j\2027Gi\4""5De0=W2@]6Ef\2327Gi\24""7Fg5Ee4Bb2@^1>\\.;S(2I#+>\37%3\35" - "\".\34\40*\32\37(\32\36'\32\35'\32\36'\33\40)\36\"/%-@0Or\7=Or=Nr;Lp8Jn3" - "Ej.Ae*]1@^3Ba5De6F\232h6F\13h/;X\32\35(JYp" - "\332\346\363\275\314\335j\200\2415Dc(3H)4K2@]6F\231h6F\12h6Eg.:V'1H/" - "Pt@Rv@S{BU}" - "DY\177FZ\200H]\204Pg\217]x\237H]\2036Fh6\312Eg6\13Eg4Bc\36$3\30\32!a" - "n\202\321\333\346\360\364\370\264\276\314\264\303\326\216\245\304Mb\211" - "6\232Eg6\12Eg4Bc)5O,9S1A_3Cd7Fh9Il;MpPt\77Qv\77RxAT|DV|DY\200F[\201Nf\215J`\2057Hk\3145Eg\11" - "-:V\30\33#\24\25\30:BPqw\205EX{o}\231ht\210>On\2345Eg\10-Pu\77Qv>Rx@Sy@T" - "{6Eh-:W2Bb5D\314f5D\11f-:W\30\35&\22\22\24\21\21\22\22\22\23\22\23\25" - "\30\35&(4M5D\233f5D\11f2Ab.<[0@^4Bc5Df7Fj9Jn:Ko:L\220p:L\23o:Ko8Jn6G" - "l1Ch-\77e*c);a\202(:_\13\35*E\0\0\0\345\17\25\"(:_(:_*c);a(:" - "_(:_\35*E\0\0\0\345\17\25\"(:_(:_*'5R/\210@b/\316Ab/\14Ab0Acc);a(:_(:_\35*E\0\0\0\345\17\25\"\202(:_\5*;a,>d/Bg2Di4Gk" - "\2475Gk\2265Gl\4""4Ej&3P\36(@,;[\304/\77b\1/@b\221/@c\15""2CfXm\221\260" - "\276\323\347\355\364\270\303\321V\\f\30\35$\14\14\15\20\23\32\37(<4E" - "e@Rv4Eh\214/@c\16""0Ad5Hj;Ps=Qv=Pw>Qx@U|@Tz>T{=Ow9Ls9Lq6In5Gl\2205Hl" - "\2025Gl\5""4Fk2Di.@f,=c);a\202(:_\12\35*E\0\0\0\345\17\25\"(:_(:_*;a" - ",>d/Af1Dh3F\203k4G\202k5G\215l5G\252l5H\6l5Gk2Bd#/I$0K/\77b/@\324c/@" - "\20cBV{\210\236\276\316\333\351\230\240\2513=L\14\14\15\14\15\17\24\30" - "$\37(=4Fis\207\246\326\342\356\340\352\363b{\2370Ae/@\211c/@\17c2Df8" - "Lq>Ty=Sz>S{\77V}AW\177AX\177AW\177\77T{=Qw9Mt8Jp5Gk6H\220l6H\202l5H\25" - "l3Fk2Dh.Af+>c);a(:_(:_\35*E\0\0\0\345\17\25\"(:_(:_)c/Af1Di3Ek4F" - "k4Gk4Gk5\243Gl5\1Gl6\224Gm6\5Gl4Fk-=_\"-H)5T/\270\77a/\234@b/\21@b0A" - "dLc\211Zj\20605<\20\23\30\17\22\27\31!2%2M,;[9Lp\221\246\303\342\353" - "\364\302\320\335]k\2020\77]/\77b/\207@b/\21@b0Ac3Ej:NtT{@V}AX" - "~AY\177AX\177@V}=Sz:Mv9Lr7Jo6Hl6\217Hm6\1Hm5\202Hl5\13Gl4Ek2Di.Ae+>c" - ");a(:_(:_\35*E\0\0\0\345\17\25\"\202(:_\6)c/Af2Ci4Ej5Fl\2055Gl\265" - "5Hl\5""5Gl3Ej*8Z!-J*;[\227.\77b\276/\77b\6->`\34%;\20\23\36\30\36.\40" - "+B,;\\\202/\77b\10:Nt\214\242\301\350\361\370\242\264\313&0D\15\20\26" - "\36(\77.>`\206/\77b\11/@b2Cg9MqSz\77V}AW\200BY\201\202BX\200\6" - "@U}=Sy:Nu9Lr:Lr5Gl\2215Hl\2035Gl\5""3Ek2Ci.@f+=c)c.Af1Ch2Ek3F\202k4F\2k4Gl4G\217l5G\247m5G" - "\6m4Gl2Di'6U$2N,=_.\77\243a.\77\1a/\77\260b/\77\5b.\77a,;\\+:Z-=_/\77" - "\202b/\77\11b7Im\213\240\276\335\352\364\206\231\263&/A\12\14\16\24\32" - "(*9Y/\77\205b/\77\22b1Ae6IlSz>S{>T}@V~BX\201CZ\202BY\200BY\200@V" - "~=R{c.Af0Ch2Dj3Ej3Fk3Fk4\235Fl4\232Fl5\6Fl4Fk0A" - "d&4R&6S->`-\332\77a-\11\77a4Gkz\221\262\332\350\363\206\226\254\24\32" - "%\11\11\12\22\27#'6T-\204\77a-\23\77a/@c4Gj;Ov>Sz>S{\77T{AV\177CY\203" - "D[\204D[\205D[\205CZ\203BW\177\77U|c.Af0Ch2Ej3Ek\2024Fk\2024Fl\2504Gl\2165Gl\4""4Fl0Ad&4T*:Y\220->a\1-" - "\77b\312.\77b\10""0Bee}\241\275\320\344bp\204\17\21\27\12\13\17\27\37" - "0+:[\204.\77b\10/Ad4Gj:Ot=Rz>S{>S|@U}AX\200\202CZ\203\11D[\204CZ\203" - "AX\201@V~=Ry:Nw9Mt8Kp6In\2225Hm\2025Gm\10""4Gl4Fl4Fk2Ej0Ch-@f+=c);a\202" - "(:_\13\35*E\0\0\0\345\17\25\"(:_(:_);a,=d.@f0Bh2Dj3F\202k3F\267k4G\202" - "k3F\4j/Ad(7T+:\\,>\234a,>\275a->\11a-\77b>Tz}\230\272K[r\13\15\20\12" - "\14\20\35(\77*:\\->\202a->\24a.@c2Ei9MrT}AW\200BY\202DZ\203" - "D\\\205DZ\203CZ\202AW\177@U~=S{9Nv8Ls8Lq4G\225l4G\202k4G\23k3Fk2Di0B" - "h-\77e+=c);a(:`(:_\35*E\0\0\0\345\17\25\"(:_(:`);a+=c-\77e0Bh1Dj2\203" - "Ek3\267Fk3\5Fk2Fk.@d(7X+;^-\332\77a-\6\77b*;\\\23\31)\10\12\15\24\32" - ")$2Q-\202\77a-\25\77a/Ad3Gj:Nt=Tz>T{=T{\77V~BY\202BZ\203D\\\205E\\\206" - "D\\\205DZ\204AY\201AW\200=T{;Pw9Nv8Kr7Jp4\225Gl4\1Gl3\202Fl3\24Ek2Ek" - "1Dj/Bh-\77e*b\21,>a$2Q\31\"7\40" - "+D):[,>a->b.@d3Fj9Ot>Ty>T{=T|\77U~AX\201C[\204D\\\205\202E\\\206\12D" - "[\205CZ\202AX\201\77T}=Qz:Ox8Ls8Kq7Jo4Fl\2303Fl\26""2El2Ek1Di/Bg-\77" - "e*=b);a(:`(:_\35*E\0\0\0\345\17\25\"(:_(:`);a+=c-\77f/Bg1Dj2Ek2Ek3E\244" - "l3E\223l3F\6l3Ek3Ek-\77d)9\\,=`,>\270a,>\246a->\4a.@c3Gl8NuU~@V\177BZ\203D\\\205E]\206D\\\206D[\204BZ\203@W\200>V~a,\27>a.@d4Gl:OuU~AX\201BY" - "\203C[\205D\\\205D[\205D[\205BZ\202AX\201>U~U~AY\201C[\204D]\210D\\\206\202E]\206\11C[\204BY\202@W\177=U~;" - "Qy9Nw7Ks7Jq6Ip\2343Fl\2023El\2022Ek\24""0Cj.Ag,>e*e*b+\331=a+\26=a,>b0Dj5Io6Lt:Ow>T}AW\202BY\204D\\\205D[\206CZ\205" - "CY\203AW\202@U\177e*V\177d)d)e.@g/Bi0Cj1Ej1Ek1\266El1\6Ek0Dk0Dj3" - "Gn/Bi*=a*\330d0Ci2Gq7Mu:Qy;T}d*c1Dk3Hq6Kt8Mu6Mv6Mw6Lw5Jr5Jq5Ip2Fm1Fl1El\2451Em\2021E" - "l\24""1Ek0Dk/Bi-@g+>e*e*c\12'9Z\32&" - "D\35+J)9],e*=b+>\277c+>\1c,>\232d,>\12c$4V\26!=\32" - "&C%7Y);`,\77e.@g0Cj2Fn3G\253o3G\25n2Fm0Dk.Bi,\77f*b\40/M\22\35""5\32'C%5X);^,=c.Ah0Cj3Gn4\250Ho4" - "\16Ho3Go3Go2Fn1Ek/Bi,\77f*d-@g/Bi1El3Fn\2033Go\2654Ho\6""3Go1El!0P\17\30+\32&B+>b\253,\77" - "d\261,@e\12+\77c\40/N\22\34""3\33'D'8Z(<`->d/Bi2El3Ho\2514Hp\24""4Ho" - "3Fn1El/Ci,@f*=c);b(:`(:_\35*E\0\0\0\345\17\25\"(:`(:`);b+>d-@g/Cj1Em" - "3G\202o4H\244p4H\222p4I\6p1El$3U\16\25(\23\35""3'9]-@\272e-@\243f-@\12" - "f,>d\35+H\22\35""6\37,L'9\\*=b.Ag0Dj2El4I\243p5I\2p5Jq5J\202q5I\27p4" - "Ip4Hp3Go1Em/Cj,@f*=c);b(:`(:_\35*E\0\0\0\345\17\25\"(:`(:`);b+>d-@g0" - "Cj2Fm3Go4Hp4\203Ip5\262Jq5\6Ip3Gn\"1Q\16\25'\20\27,%6X-\337Af-\12Af*" - "=_\32(E\25\40""9!1R);^,=c/Bh1Dk4Ho5\247Jq5\15Jq4Ip3Go2Fm0Cj,@f*=c)d-@g0Dj2Fn4Ho5Ip\2655Jq\6" - "2Gm&6W\15\24&\20\30*%6V-Ae\341-Af\10(:_\30$@\31&C&7Y*=b.>d0Cj2El\217" - "5Jq\2276Jr\2035Jq\24""4Ho2Fm0Dk-@g*=d)d.Ah0Dk3Gn4Hp5J\203q5J\1q6J\232r6J\226r6K\6r5Jq*;^\22\33""2" - "\20\27+%5U.A\265g.A\1g/B\237h/B\6h1Ek1Fn3Go1El0Ci/B\210h/B\10h$3U\31" - "&B#2T)e0Cj2Fm5J\202r6K\245s6K\26r5Jq4Ip3Fn0Dk-@g*=d)e.Ah0Dk3Go5Iq5Jq6\203Kr6\257Ks6\6Ks5Jr" - "0Bh\26!;\17\26*&6X/\326Bh/\12Bh3Fn7Lt=Sz@X\200AZ\203>V\1778Mt2Fm/Ci/" - "\204Bh/\11Bh.\77e#1R#2T,d" - "*e.Ah1Dl3Go5Iq6Jr\2136K" - "s\2506Ls\5""4Ip$4V\21\32""0\37*H.Ag\244/Bh\263/Bi\14/Aj4Hp9Nw\77V\177" - "E]\210Lf\221Rl\225Ng\217E]\205:Ow3Gn0Cj\203/Bi\6+d0Bi1Dk3El\202" - "6Ks\2457Lt\26""6Ls6Ks5Jq3Go1Ek.@g+>d*d/B" - "i/B\203i/C\4i1El3Gn1Dk/C\312i/C\205i0C\30i->d-@e5Iqd*e*U~=S{:Ov5Jq2Fm\2760Dj\26.Af$3U'7Y4Ip=R|A" - "Y\202F]\206H`\212Jc\215Kd\216Kc\216Lf\220Oi\223Pi\223Kd\216BY\202=R{" - ";Py:Nv8Mt7Lt8Lt\2418Mu\2039Mu\2028Mu\25""8Lt6Ks5Ip2Fm.Ah+>e*c):`(:_\35" + "*E\0\0\0\0\17\25\"(:_*;`-@e4Fk=NrCTwHY|IZ}J[~J[~K\225\\~K\14\\\177L]" + "\177M^\200O_\202O`\203Oa\205Pb\207Rf\213Th\214Vi\215Vk\220Vk\220W\202" + "l\220V\10k\217Xn\222bx\236p\210\254p\211\254Ym\221JZ}FUuE\202TtE\15T" + "tCRp:D\\.5D).808J;GbAPnCSrFTuFVxIY{K[}K\271\\~K\6\\~J[}J[}M^\203O_\203" + "FUwE\210TtE\7TtAOn;G`>KfFVuM_\203GWzE\210TtE\6TtFVvGWxHXxIYzJZ|J\202" + "[}J\1[}K\217\\~K\23\\~J[}@OlJf.5E6@V^r\230^s\230FUvE" + "TtGVwHXzJ[}J[}K\217\\~K\25\\~J[~IZ}FW{BSv:Lo2Dj,>c):`(:_\35*E\0\0\0\0" + "\17\25\"(:_*;`-@e3EjT=KgBQpDSsEUu" + "GVwIY|\271J[~\202JZ}\3O_\202Re\210GWw\211ETs\7DSrJgJZ{IZ|EUuAO" + "m2;Q1:NIY{ez\242Oa\205ERrETuFUwHXz\202JZ}\220J[~\26IZ}HY|FWyBSu9Ko2D" + "i,>c):`(:_\35*E\0\0\0\0\17\25\"(:_*;`-@e3Ej;MpBSvFWzHY|HY}HY\233}IZ\13" + "}J[~L]\200M^\201M^\202N_\205Pb\207Qf\213Sg\213Ti\215Uj\216Uk\202\216" + "Uj\7\216Zp\224f}\242m\206\253_u\232L^\201DTuCS\202rCS\15rBRqKj@MlJ[}IY{DSs9E_.7I>LiUk\220Xm\223" + "FWxDTtFUvGX{HY|HY}HY\220}IZ\26}HY}GY|EVyARu8Jn2Di,>c):`(:_\35*E\0\0\0" + "\0\17\25\"(:_);`-\77e3Ej;MpASuEVyFXzGX|H\235Y|H\23Y|JZ}K\\\177L]\200" + "L^\202M_\204N`\206Qd\207Rf\212Th\214Uj\216Uj\216Tj\216Uj\217]t\232l\204" + "\252j\203\247Uh\215EVyB\203RrB\14Rr\77Ml2=T(-;*1A5@Z>MjBOoCQqDTvETvG" + "WzH\265Y|H\6Y|GX{GXzJ[}Sg\213J\\\177B\211RrB\6RrAQq:Fa5@X9D_@NnB\207" + "RrB\13RrAOp9Ea4\77V3=S4\77V8B\\;Gc@LkBQpBRsC\202RsD\202TvD\202TvE\2T" + "vFVxH\205Y|H\24Y{GX{FVx=Kh@OnJ[\200GXz\77Nm1;Q4\77WI\\\177[s\230L^\201" + "CSsETuGWyGXyGXzGX{GX{H\217Y|H\25Y|GX|GXzDVx@Rt8Jn1Ci,>c):`(:_\35*E\0" + "\0\0\0\17\25\"(:_);`-\77d3Di;Lp@RuDVxFWz\202GXz\236GX{\3GX|HY|J[~\202" + "K\\\200\16K^\204N`\206Od\210Rf\212Th\215Uj\216Uj\217Uk\220Xm\222az\237" + "o\210\255f~\244M`\203CTt\203ARq\13@Po;Gc+1B&*8/7L9Fb>MlBPpCStDTtFVw\265" + "GX{\202GWz\4IZ}Rg\212Mb\206BRr\212ARq\5>Nl3>W0:P9EbAPo\207ARq\23AQo<" + "Je4\77X.5I(.<$(3\"&.#&/%)5)/>.6J2LkWl\221Yo\225FVxDStEVwFVxFWyG" + "Wy\202GWz\220GX{\26GXzFWyCUx\77Qt8In1Ch,>c):`(:_\35*E\0\0\0\0\17\25\"" + "(:_);`,\77c3Di;Lo@RtDUxEWyFWzFW\241zFX\22zHY|HY|J\\\177J]\201K^\203M" + "`\206Ob\206Qf\213Sh\214Si\215Th\215Ui\216Zp\225h\200\247k\204\251Xl\220" + "DVwAQ\203qAQ\13qNn@PpBPqCSsCS\202sDS\13sCSs\77" + "KlFTwNa\206ARr4\77X7B^GX{]s\232M`\204ET\202wEU\5xGX|HY|EWyEWyFW\220z" + "FX\24zFWzEVyCTw\77Qs8In1Ch+>b(:`(:_\35*E\0\0\0\0\17\25\"(:_);`,\77c2" + "Di:Ko@QsCTwE\203VyE\243WzE\21WyIZ~J[\177J[\200J\\\201L^\203M`\205Pe\211" + "Qf\213Sh\215Sh\214Sh\215^u\234j\202\251by\240L_\202AQrA\202PpA\14Pp@" + "Oo4AZ(.=',;3=U:Hf>MlAOpARsBRtDVxE\262WzE\202VyE\4UxBRtAPpAPqA\236PpA" + "\40Pp@Nn;Ie5AZ/8M*1B%*6\"%.\40#*!$-%*7.7K4@Z;Ig\77Ml\77OpAPqAQrBQrK]" + "\201M`\204=Lk3\77X>NmYn\224Vl\222EWyEUwFVyHY}IZ~IZ~E\203VyE\217WzE\24" + "WyEVyDUxBTv>Ps7Hn1Bh+>b(:`(:_\35*E\0\0\0\0\17\25\"(:_);`,\77c2Ci9Ko\77" + "PsBTw\203DUx\244EVy\11FWzFW{HZ}HZ~H[\200I\\\202M`\206Nb\210Pe\212\202" + "Rg\214\6Ti\217Xn\225f\177\245g\201\247Ti\217DUv\203\77Oo\13>Nm7D^)0B" + "&+:.8N9GdMnAPqBRsDUw\262EVy\5DUx>Ml+2F-6K=Kk\243\77Oo\6=Ll;If6C^" + "0Or7Hm1Bg+" + ">b(:`(:_\35*E\0\0\0\0\17\25\"(:_);`,\77c2Ci9Kn>PrBSvDT\202xDU\1xEV\246" + "yEV\21yFWzGX|HY}HZ\200J]\202M`\204Nb\207Pe\212Rg\215Sg\216Si\216_v\235" + "m\206\255`w\233I\\\200>Np>N\202o>N\14n:Hf,4I#)6+5I6B_:Ii=Lm@OqAQsCSv" + "EUxEV\212yEV\2yEUxCT\202vCT\1vEV\236yEV\7yEUxDUx@Pq.8O(.@6C_>N\247o>" + "N\21o>Mn;Jh6C]0:P',<\40#,\37\"*%+:0;T[q\225e}\243FXzEWzUj\216g\201\250" + "Uk\222FW\202zFW\7zFX}GX|GX|HY}DUxDUxEV\217yEV\25yEUxDUxCTwASu=Or7Hm1" + "Bg+>b(:`(:_\35*E\0\0\0\0\17\25\"(:_);`,>c1Ch8Jn=OrASuB\253TwC\20TwDU" + "xFW|GX}HZ\177J\\\202K_\204Nb\210Od\211Qe\212Rf\213Wm\224e~\244f\177\244" + "Ma\206@Qr=\202Mn=\13Mn;Ii1;S$*9(0B4A]9Hg=Kl\77Op@PqBRtC\207TwC\12TwB" + "SuAQsBRtCSvAQsAPqBRtCSvBRtA\202QsA\1QsC\204SvC\227TwC\5Tv8Fb)2G5A]=L" + "m=\230Mn=\6Mn>NnHY{Yi\207Vf\205DUw=\215Mn=\15Mn;Ji7C`-7M$*8!%1(/@3=U" + ":HfL`\204m\206\255]s\232GY}E\202VyE\5W|FX\177FW|FX|EVyC\223TwC\25TwB" + "Tw@Rtc1Ch8Im=NqARuASv" + "BTv\254BTw\16CUyEW|EX}GZ\200J^\203L_\206Na\207Nc\210Oc\211Rg\215^u\234" + "g\200\247Vj\221@Qr\203No\77Oq@Qs\205BT" + "w\3@PrAQs\77Pr\202>Np\1>Mn\203>Ln\1>Mo\203>Np\1\77Np\203@Oq\1AQt\226" + "BTw\5BTv@Pr1!&4'-\77""6C_EW{DUwBRtEUyEVy" + "EVz\203EW{\2BTwBTv\222BTw\26BTvASv@Qtc1Ch7ImN\202p>N\25p=Lm9Gg1=V*3G#(7\37#.\36!*\36\"+\40" + "%1$*:(/D,6L/;S3@]6Db:Ff;HiN\202p>N\3p\77Np\77OpAR\202tAR\4" + "tBSvBTvASuBT\212vBT\6vARt9Gf+5L1>Y;Kl;K\224m;K\15mNq" + ";K\220m;K\16l9Hg2\77Z'/B\"(8*3I8Dc>NoARtCTwDTwEVyDVzBSvAS\222vBT\203" + "vAS\23u\77Ps;Mp5Gk0Bf+=b(:`(:_\35*E\0\0\0\0\17\25\"(:_):`,>c0Ch7Hl;M" + "p\77PsARtA\202RuA\255SvA\17SvBTwEVzEW|FY\177H\\\202I^\204M`\206Ma\207" + "Nc\211Uk\223f\177\247b{\242I\\\201;Km:\202Jk:#Jk3A]$-@#)9/:S6Da8Gg;H" + "jZ7Cb9Ij:JlMo\77Oq\77Or\77Np\77\204Pr\77\1PsA\205SvA\5Rt>Np1=[*3K6Cc:\224Jk:" + "\16Jk;KlGZ}Wn\223BTx:JkJ]\204\212\243\305w\216\260L`\207Sh\216\210\240" + "\277{\224\270\77Ps:\222Jk:\11Jk7Ff/9R$*<'/C4@]Ps;Lp5Fk/Bf+=b(:`(:_\35*E\0\0\0\0\17\25\"(:_):`" + ",>c0Ch6Gl;Lp>Ps@Qs\262ARt\15BSwDUzDV}EX\177H]\203J^\203L`\206La\210N" + "d\212]v\235f\177\247Od\212=Nq\203:Jk\16""6Cb(/D\")9+6O4Ba5Da0=X%,=\33" + "\36'\34\36'\"'5,5L4B^:Ji\204:Jk\23:Ij8Ee2>Z,6N(/B#)9\37#0\35\37(\33\35" + "$\32\35$\34\36'\36#/$*:)2G.9R2=Z6Cb9Fg:Ik\202;Km\1Z:Ijc0Bg6Gl:Ko>O" + "r\77P\202s\77Q\1s@Q\260t@Q\16tBSwCTyCU{DW~EY\200H]\203K_\206K`\207Nd" + "\213Zq\232d}\245Si\221=Mo:I\202j:I\13j5B`&.B!'8)2J&-B\35!,\34\37)#*;" + "/:T6Ec:I\212j:I\26j9Hi7Fe5Ba2\77[-9Q'0E#):\36#/\34\37(\32\35$\32\35$" + "\33\36(\36#/!'6%-A*4K/:U3@]5Ca5Ec6Eg9F\202h9F\1i9G\202i9F\6h8Ef3@\\&" + "/C\"(91\77\\:I\226j:I\15kEW|\213\245\307o\207\255Y#*=3@\\BTy@Ru" + ",7M%,\77""7Ee:I\225j:I\12j5Ca(0G$,A/Oq@Q\222t@Q\25s\77" + "Qs\77PsOr\77\264Ps\77\15PsASwBTyBU{EX\177G\\\202I^\205J_\206La\210Wn\226" + "g\202\247Tk\222=Or8\202Hj8\10Hj4B`'0F\34\40,\34!,%-@0=X7Fg8\223Hj8\32" + "Gj7Ee4A^/Or\77\221Ps\77\202Ps>\22Or<" + "Mq9Jo4Ej.Af*Or\16>Ps\77QtASvATzBV}EY\177G\\\202H]\204J_\207Qh\217c|\243Vm\224" + "=Nq7Gj\2027Gi\4""5De0=W2@]6Ef\2327Gi\24""7Fg5Ee4Bb2@^1>\\.;S(2I#+>\37" + "%3\35\".\34\40*\32\37(\32\36'\32\35'\32\36'\33\40)\36\"/%-@0Or\7=Or=Nr;" + "Lp8Jn3Ej.Ae*]1@^3Ba5De6F\232h6F\13h/;X\32\35" + "(JYp\332\346\363\275\314\335j\200\2415Dc(3H)4K2@]6F\231h6F\12h6Eg.:V" + "'1H/Pt@Rv@S{B" + "U}DY\177FZ\200H]\204Pg\217]x\237H]\2036Fh6\312Eg6\13Eg4Bc\36$3\30\32" + "!an\202\321\333\346\360\364\370\264\276\314\264\303\326\216\245\304M" + "b\2116\232Eg6\12Eg4Bc)5O,9S1A_3Cd7Fh9Il;MpPt\77Qv\77RxAT|DV|DY\200F[\201Nf\215J`\2057Hk\3145E" + "g\11-:V\30\33#\24\25\30:BPqw\205EX{o}\231ht\210>On\2345Eg\10-Pu\77Qv>Rx@" + "Sy@T{6Eh-:W2Bb5D\314f5D\11f-:W\30\35&\22\22\24\21\21\22\22\22\23\22\23" + "\25\30\35&(4M5D\233f5D\11f2Ab.<[0@^4Bc5Df7Fj9Jn:Ko:L\220p:L\23o:Ko8J" + "n6Gl1Ch-\77e*c);a\202(:_\13\35*E\0\0\0\0\17\25\"(:_(:_*c);a(:_(:_\35*E\0\0" + "\0\0\17\25\"(:_(:_*'5R/\210@b/\316Ab/\14Ab0Acc);a(:_(:_\35*E\0\0\0\0\17\25\"\202(:_\5*;a,>d/Bg2Di4Gk\2475Gk\2265" + "Gl\4""4Ej&3P\36(@,;[\304/\77b\1/@b\221/@c\15""2CfXm\221\260\276\323\347" + "\355\364\270\303\321V\\f\30\35$\14\14\15\20\23\32\37(<4Ee@Rv4Eh\214/" + "@c\16""0Ad5Hj;Ps=Qv=Pw>Qx@U|@Tz>T{=Ow9Ls9Lq6In5Gl\2205Hl\2025Gl\5""4" + "Fk2Di.@f,=c);a\202(:_\12\35*E\0\0\0\0\17\25\"(:_(:_*;a,>d/Af1Dh3F\203" + "k4G\202k5G\215l5G\252l5H\6l5Gk2Bd#/I$0K/\77b/@\324c/@\20cBV{\210\236" + "\276\316\333\351\230\240\2513=L\14\14\15\14\15\17\24\30$\37(=4Fis\207" + "\246\326\342\356\340\352\363b{\2370Ae/@\211c/@\17c2Df8Lq>Ty=Sz>S{\77" + "V}AW\177AX\177AW\177\77T{=Qw9Mt8Jp5Gk6H\220l6H\202l5H\25l3Fk2Dh.Af+>" + "c);a(:_(:_\35*E\0\0\0\0\17\25\"(:_(:_)c/Af1Di3Ek4Fk4Gk4Gk5\243Gl" + "5\1Gl6\224Gm6\5Gl4Fk-=_\"-H)5T/\270\77a/\234@b/\21@b0AdLc\211Zj\2060" + "5<\20\23\30\17\22\27\31!2%2M,;[9Lp\221\246\303\342\353\364\302\320\335" + "]k\2020\77]/\77b/\207@b/\21@b0Ac3Ej:NtT{@V}AX~AY\177AX\177@V}" + "=Sz:Mv9Lr7Jo6Hl6\217Hm6\1Hm5\202Hl5\13Gl4Ek2Di.Ae+>c);a(:_(:_\35*E\0" + "\0\0\0\17\25\"\202(:_\6)c/Af2Ci4Ej5Fl\2055Gl\2655Hl\5""5Gl3Ej*8Z" + "!-J*;[\227.\77b\276/\77b\6->`\34%;\20\23\36\30\36.\40+B,;\\\202/\77b" + "\10:Nt\214\242\301\350\361\370\242\264\313&0D\15\20\26\36(\77.>`\206" + "/\77b\11/@b2Cg9MqSz\77V}AW\200BY\201\202BX\200\6@U}=Sy:Nu9Lr:" + "Lr5Gl\2215Hl\2035Gl\5""3Ek2Ci.@f+=c)c.Af1Ch2Ek3F\202k4F\2k4Gl4G\217l5G\247m5G\6m4Gl2Di'6U$2N," + "=_.\77\243a.\77\1a/\77\260b/\77\5b.\77a,;\\+:Z-=_/\77\202b/\77\11b7I" + "m\213\240\276\335\352\364\206\231\263&/A\12\14\16\24\32(*9Y/\77\205b" + "/\77\22b1Ae6IlSz>S{>T}@V~BX\201CZ\202BY\200BY\200@V~=R{c.Af0Ch2Dj3Ej3Fk3Fk4\235Fl4\232Fl5\6Fl4Fk0Ad&4R&6S->`-\332" + "\77a-\11\77a4Gkz\221\262\332\350\363\206\226\254\24\32%\11\11\12\22\27" + "#'6T-\204\77a-\23\77a/@c4Gj;Ov>Sz>S{\77T{AV\177CY\203D[\204D[\205D[\205" + "CZ\203BW\177\77U|c.Af0Ch2Ej3Ek\202" + "4Fk\2024Fl\2504Gl\2165Gl\4""4Fl0Ad&4T*:Y\220->a\1-\77b\312.\77b\10""0" + "Bee}\241\275\320\344bp\204\17\21\27\12\13\17\27\37""0+:[\204.\77b\10" + "/Ad4Gj:Ot=Rz>S{>S|@U}AX\200\202CZ\203\11D[\204CZ\203AX\201@V~=Ry:Nw9" + "Mt8Kp6In\2225Hm\2025Gm\10""4Gl4Fl4Fk2Ej0Ch-@f+=c);a\202(:_\13\35*E\0" + "\0\0\0\17\25\"(:_(:_);a,=d.@f0Bh2Dj3F\202k3F\267k4G\202k3F\4j/Ad(7T+" + ":\\,>\234a,>\275a->\11a-\77b>Tz}\230\272K[r\13\15\20\12\14\20\35(\77" + "*:\\->\202a->\24a.@c2Ei9MrT}AW\200BY\202DZ\203D\\\205DZ\203" + "CZ\202AW\177@U~=S{9Nv8Ls8Lq4G\225l4G\202k4G\23k3Fk2Di0Bh-\77e+=c);a(" + ":`(:_\35*E\0\0\0\0\17\25\"(:_(:`);a+=c-\77e0Bh1Dj2\203Ek3\267Fk3\5Fk" + "2Fk.@d(7X+;^-\332\77a-\6\77b*;\\\23\31)\10\12\15\24\32)$2Q-\202\77a-" + "\25\77a/Ad3Gj:Nt=Tz>T{=T{\77V~BY\202BZ\203D\\\205E\\\206D\\\205DZ\204" + "AY\201AW\200=T{;Pw9Nv8Kr7Jp4\225Gl4\1Gl3\202Fl3\24Ek2Ek1Dj/Bh-\77e*<" + "b);a(:`(:_\35*E\0\0\0\0\17\25\"(:_(:`);a+=c-\77e/Bh1Di1Dk\2022Ek\202" + "3Fk\2653Fl\5""3Fk2Ek.@d(8[,=a\332,>b\21,>a$2Q\31\"7\40+D):[,>a->b.@d" + "3Fj9Ot>Ty>T{=T|\77U~AX\201C[\204D\\\205\202E\\\206\12D[\205CZ\202AX\201" + "\77T}=Qz:Ox8Ls8Kq7Jo4Fl\2303Fl\26""2El2Ek1Di/Bg-\77e*=b);a(:`(:_\35*" + "E\0\0\0\0\17\25\"(:_(:`);a+=c-\77f/Bg1Dj2Ek2Ek3E\244l3E\223l3F\6l3Ek" + "3Ek-\77d)9\\,=`,>\270a,>\246a->\4a.@c3Gl8NuU~@V\177BZ\203" + "D\\\205E]\206D\\\206D[\204BZ\203@W\200>V~a,\27>a.@d4Gl:OuU~AX\201BY\203C[\205D\\\205D" + "[\205D[\205BZ\202AX\201>U~U~AY\201C[\204D]\210" + "D\\\206\202E]\206\11C[\204BY\202@W\177=U~;Qy9Nw7Ks7Jq6Ip\2343Fl\2023" + "El\2022Ek\24""0Cj.Ag,>e*e*b+\331=a+\26=a,>b0D" + "j5Io6Lt:Ow>T}AW\202BY\204D\\\205D[\206CZ\205CY\203AW\202@U\177e*V\177d)d)e.@g/Bi0Cj1Ej1Ek1\266El1\6Ek0Dk0Dj3Gn/Bi*=a*\330d0Ci2G" + "q7Mu:Qy;T}" + "d*c1Dk3Hq6Kt8Mu6Mv" + "6Mw6Lw5Jr5Jq5Ip2Fm1Fl1El\2451Em\2021El\24""1Ek0Dk/Bi-@g+>e*e*c\12'9Z\32&D\35+J)9],e*=b+>\277c+>" + "\1c,>\232d,>\12c$4V\26!=\32&C%7Y);`,\77e.@g0Cj2Fn3G\253o3G\25n2Fm0Dk" + ".Bi,\77f*b\40/M\22\35""5\32'C" + "%5X);^,=c.Ah0Cj3Gn4\250Ho4\16Ho3Go3Go2Fn1Ek/Bi,\77f*d-@g/Bi1El3Fn\2033Go\2654Ho\6""3Go1El!" + "0P\17\30+\32&B+>b\253,\77d\261,@e\12+\77c\40/N\22\34""3\33'D'8Z(<`->" + "d/Bi2El3Ho\2514Hp\24""4Ho3Fn1El/Ci,@f*=c);b(:`(:_\35*E\0\0\0\0\17\25" + "\"(:`(:`);b+>d-@g/Cj1Em3G\202o4H\244p4H\222p4I\6p1El$3U\16\25(\23\35" + "3'9]-@\272e-@\243f-@\12f,>d\35+H\22\35""6\37,L'9\\*=b.Ag0Dj2El4I\243" + "p5I\2p5Jq5J\202q5I\27p4Ip4Hp3Go1Em/Cj,@f*=c);b(:`(:_\35*E\0\0\0\0\17" + "\25\"(:`(:`);b+>d-@g0Cj2Fm3Go4Hp4\203Ip5\262Jq5\6Ip3Gn\"1Q\16\25'\20" + "\27,%6X-\337Af-\12Af*=_\32(E\25\40""9!1R);^,=c/Bh1Dk4Ho5\247Jq5\15Jq" + "4Ip3Go2Fm0Cj,@f*=c)d-@g0D" + "j2Fn4Ho5Ip\2655Jq\6""2Gm&6W\15\24&\20\30*%6V-Ae\341-Af\10(:_\30$@\31" + "&C&7Y*=b.>d0Cj2El\2175Jq\2276Jr\2035Jq\24""4Ho2Fm0Dk-@g*=d)d.Ah0Dk3Gn4Hp5J\203q5J\1q6J\232r6J\226r" + "6K\6r5Jq*;^\22\33""2\20\27+%5U.A\265g.A\1g/B\237h/B\6h1Ek1Fn3Go1El0C" + "i/B\210h/B\10h$3U\31&B#2T)e0Cj2Fm5J\202r6K\245s6K\26r5Jq4Ip3Fn0D" + "k-@g*=d)e.Ah0Dk3Go5Iq5Jq6\203" + "Kr6\257Ks6\6Ks5Jr0Bh\26!;\17\26*&6X/\326Bh/\12Bh3Fn7Lt=Sz@X\200AZ\203" + ">V\1778Mt2Fm/Ci/\204Bh/\11Bh.\77e#1R#2T,d*e.Ah1Dl3" + "Go5Iq6Jr\2136Ks\2506Ls\5""4Ip$4V\21\32""0\37*H.Ag\244/Bh\263/Bi\14/A" + "j4Hp9Nw\77V\177E]\210Lf\221Rl\225Ng\217E]\205:Ow3Gn0Cj\203/Bi\6+d0Bi1Dk3El\2026Ks\2457Lt\26""6Ls6Ks5Jq3Go1Ek.@g+>d*d/Bi/B\203i/C\4i1El3Gn1Dk/C\312i/C\205i0C\30i->d-@e5Iqd*e*U~=S{:Ov5Jq2Fm\2760Dj\26.Af$3U'7Y4" + "Ip=R|AY\202F]\206H`\212Jc\215Kd\216Kc\216Lf\220Oi\223Pi\223Kd\216BY\202" + "=R{;Py:Nv8Mt7Lt8Lt\2418Mu\2039Mu\2028Mu\25""8Lt6Ks5Ip2Fm.Ah+>e*T~=Rz;P" - "w8Mu8Mu9N\245v9N\26v8Mu7Ls5Ip2Fm.Ah+>e*T}\77V\200BX\202D[\204F^\210Ia\214Kd\217Oh\223Sl\230Vo\234Ys\235" - "Yr\234Sl\230Pi\224Le\216G_\211C[\205@V\200T|@W\177BZ\203D]\207G`\211Ha\213Kd\215Me\217" - "Kd\217Jb\216Kc\216Nh\222Me\217AY\2008Ls1\216Ek1\23Fl):_\34(I%5X3Hn:O" - "w>T|D[\204G^\210Jb\215Le\217Le\220Ld\217Jb\214Ga\213F]\205@V\200=S{>" - "S{9\202Nv9\243Ow9\203Ov9\25Nu7Lt5Iq2Fn.Bi+>e*" - "U\177BZ\203E\\\206G`\212H`\212Ha\213\77U~0@f0Ci\2071Fl\12""3Gm:Pv@V~" - "BX\200CZ\203F^\210Ia\213Kd\216Mf\221Oh\224\202Oh\225\11Oi\225Mg\221O" - "h\224Oi\225Qk\225Sm\227Tn\227Tn\231To\230\202Tn\227\7Sm\227Qk\224Mh\222" - "Mg\222Le\216Kd\215Jc\214\207Ib\214\202Ic\214\2Kd\214Lf\217\202Mg\221" - "\11Mg\222Mg\220Lg\220Lg\221Mg\221Le\220Le\221Le\216Kd\216\203Jc\215\11" - "Jb\215Kc\215Lf\220Rl\227Xr\236Wq\234Le\217>T|4Ip\2141Fl\12""0Ek(8[\34" - ")F)8\\6Jr7Mt=R|AW\201D\\\206G`\212\202Ib\213\7Ha\213G`\212D\\\206@W\202" - ">T}>T|9Nv\234:Ow\211:Px\30:Ow9Ow9Nv8Lt5Jq2Gn.Bi+\77e*T}AX\202D]\207G`\212Ib\214Kd\216Jc\2157Lt-=a2Fl2F\205m2F\13" - "m3Gn:PxBY\177CX\201C[\205F_\211Kd\216Mf\220Oh\223Qj\226Qk\203\227Qk\7" - "\227Qj\226Rk\227Qk\226Pk\224Oi\224Oh\224Oi\202\225Oj\202\224Pj\203\225" - "Pj\202\226Pk\202\225Oj\207\224Oj\3\224Nh\223Mg\220Mg\203\221Mf\5\221" - "Le\217Mf\220Ng\222Mg\222Mf\202\221Mg\4\223Ng\223Oh\224Pi\224Pj\203\224" - "Pk\11\224Pj\225Qk\227Wr\235^z\244^z\242Sl\226>U~4Hp2F\212m2F\23m1Dk\"" - "1R\37,L/Ag4Ho9Nv;Qy\77V\200D[\204E]\207E^\210E^\210E]\206DZ\203@V\201" - "\77U}=R{9Ow:P\246x:P\26x9Ow8Mu6Jr3Gn/Bi,\77f*T|\77U\177@X\202E]\206" - "H`\212Ib\214Jb\214@Y\203-\77e,=c2\205Fm2\12Fm3Hp=T{CZ\201CY\202E]\207" - "H`\212Jc\215Kd\216Mf\220N\202g\221N\202g\222N\11g\221Oi\223Pj\226Pj\226" - "Qk\226Rl\226Rm\227Sm\230Sm\230R\202m\227R\4l\227Rl\227Qk\227Pj\226P\204" - "j\226O\212j\225O\202j\226O\202j\226P\2j\226Qk\227R\202l\227R\203m\227" - "R\2m\230Sm\230R\205l\226Q\13l\226Rl\227Rm\227Ql\226Vp\232^z\244d\177" - "\250Zu\234G_\210:Px3Ho2\210Gm2\21Gm-@e\"2S(:a1Bj6Jq9NvT}\77V\202" - "AW\202CX\202\77V\202\77V\201\77U}=S{;Qy;\247Py;\26Py:Ow8Nu6Kr3Go/Ci," - "\77f*V}\202CY\202\5E\\\205H`\212Ib\213Jc\214Kd\215\202Jc\215\1Jc\214\203" - "Ia\212\6Jc\214Kd\216Le\216Lf\217Nh\221Oh\223\204Pj\224\2Rl\227Rk\227" - "\203Rl\227\207Ql\227\202Rl\227\207Ql\227\1Rl\227\202Rl\230\202Rk\230" - "\2Rl\230Qk\226\203Pj\224\204Oh\222\1Nh\222\202Oh\222\14Pj\224Pi\223O" - "i\222Oi\223Tn\230]x\241a}\246Zt\237Kc\215=S{5Jq3Ho\2063Gn\11""1El*>c" - "+>c1Cj4Ip7Ks:Pw;Px>T|\202\77U}\3\77U~\77U}T|@V~@V\200@W\202@W\201>U\1771Dj'8[0Dk3G\202n3G\16" - "n3Ho:PyE\\\204E]\204D[\204F^\206Ib\213Jc\214Kd\215Kd\216Jc\215Ia\211" - "H_\210D]\202\210C]\202\210E^\16\210H_\210H`\212Hc\215Jc\215Kc\215Ke\217" - "Le\217Mg\221Nh\222Ng\221Ng\221Oh\222Oi\223Pj\205\224Pj\2\224Qk\226Pj" - "\203\224Pj\2\224Qk\226Pj\207\224Pj\2\224Oh\222Ng\202\221Ng\202\221Mg" - "\13\221Kd\216Kc\215Kc\215Ld\215Kc\215Jc\215Kc\215Kd\216Le\217Ng\221P" - "i\202\223Pi\11\223Oi\223Tn\230[u\240a}\246`{\244Up\230E\\\2048Nw3H\205" - "o3H\10o4Ho3Gn3Gn5Ip7Ks;Px;Py;P\203y;Q\253z;Q\32y;Qy;Py9Ow7Ls4Ho/Cj,\77" - "f*T}\77\202U~\77\27U~;Px.\77d);^2Fm3Ho3Ho5Kr\77W\200Ib\213" - "F^\207D[\205G`\211Kd\215Le\217Mf\220Kd\216Jc\215G`\212E\\\205BZ\204A" - "X\202@W\200@\202W\200A\7X\202AX\204BZ\205E\\\205F\\\206F^\210F`\212H" - "\203a\212J\6c\214Je\216Je\216Ke\217Ke\217Le\217M\202f\220M\10f\220Ng" - "\220Ng\220Mf\217Oh\222Oh\222Mf\217Ng\220M\204f\220M\4f\220Lf\220Ke\217" - "Ke\217J\202e\216J\4b\213Ja\212Ha\212F`\212E\203_\212F\1_\211F\202\\\206" - "F\35^\211G`\212Ja\213Ke\216Mf\217Ng\221Oi\223Pj\224Qk\226Sl\230To\232" - "Yt\236^z\244d\177\250^y\241Nh\221AX\2018Nu5Ks4Iq7Lu\77W\201:Ow7Lt8Mv" - "9Ow;Qx;Qy;Qy<\256Rz<\26Rz;Qy:Ow7Ls4Hp/Cj,\77f*`/Af\2024Ip\20""9OuKd\214Pk\224G`\212D\\\206G`\212Jc\214Kd\215Ke\216" - "Kd\216Ib\213Ga\212E\\\207AX\202AW\177>T|\204>T}\4>T|@V~AW\200AX\202\202" - "AX\203\202CZ\203\1CZ\205\203C]\210\1D]\210\210H_\210\2I`\212Ia\212\206" - "H_\210\1F^\210\205C]\210\2C\\\210C[\206\202CZ\203\207AX\203\32BY\203" - "C[\206F^\210H`\211Hb\214Le\216Mg\221Oh\222Pj\223Qk\225Rl\227Qk\226Tn" - "\230[u\237b~\247c\177\247\\w\237Rl\226Ld\216Pi\222Oh\222\77U};Qy:Ow:" - "Px;Qy\202;Qz\226T|=S\204{=S\7{>T|@W\177\77V~=S{" - "\77U}@W\177AW\203\200AX\203\201AX\202\201BX\2\201BY\203BY\214\204BY\2" - "\204AX\202AX\207\201AX\1\200BX\205\201BX\16\201AX\200@W\177AW\200AX\201" - "BX\201BY\204D[\206F_\212Ib\213Ke\217Mf\217Oh\222Pi\223Qk\203\225Qk\13" - "\225Tn\230[u\236`z\245c\177\247^y\242Ng\221CZ\203@W\200\77U~=S{\265S|>\25S|=R{BX\201b|\241" - "\200\227\267}\226\267y\226\274d\201\251Kd\216F^\210Ib\214Ke\217Mf\220" - "Lf\220Ke\217Jc\214G_\210CZ\205BX\201BX\201=S{>\211S|>\13S|\77T}>S|\77" - "T}@U~BW\200CY\201@V~\77U}@V~CY\201B\216X\201B\11X\201CY\202CY\202@V\177" - "\77U~\77U~AW\200CY\202CY\202@\206U~@\37U~\77T}>S|\77T}@U~AV\177BX\201" - "BX\202CZ\204D]\210Ha\212Ic\214Le\216Ng\221Pi\222Qk\225Ql\225Rl\226Rm" - "\227Sm\230Rl\227Rm\227Qk\225Mf\220Ia\213F^\210CY\204BW\200\77T}=R{=R" - "{>\202S|>\252T|>\31S|>S|=S{S|\215>T|\23=S{CY\201c|\243" - "\214\243\301\210\241\300^y\241Kb\213Jb\214Le\216Mf\217Oh\221Ng\220Le" - "\217Jc\215G_\210DZ\205CY\201AW\177\77U}\226>T|\1@V\177\214BW\200\1>T" - "}\224>T|\13\77U}AW\200BX\200CY\202CZ\205F\\\205G_\211Kb\213Ld\216Ph\221" - "Pi\224\202Rl\226\202Un\232\10Uo\232Sm\226Qj\224Mg\220Lc\215E^\210BY\202" - "CY\201\261>T|\26=S{;Qy8Nu5Iq0Dl-@g*=c(;a(:`\35*E\0\0\0\345\17\25#(:`" - "(;a*=d.Ah2Em5Jr:OwT\203|>T\265}>T\11}=T|=T|AW\177BY\202C[\205" - "G`\210Kb\213Mf\220Oh\202\221Oh\7\221Mf\217Ic\214Ha\213D\\\206CZ\202A" - "W\177>U\274}>U\14}@V\177CY\202CY\202CZ\204D\\\210E]\211I`\212Jc\215N" - "f\217Nh\222Oi\223Qk\202\224Qk\11\224Oi\222Mf\220Jc\215E]\210CZ\203CY" - "\202>T}>T}\77U\253~\77U\31~>U}>U}>T|>S|;Qz9Nv5Jq0Dl-@g*=c(;a(:`\35*E" - "\0\0\0\345\17\25#(:`(;a*=d.Ah2Fm6Ks:PwS|>\202T}>\224U}>\1U}\77\241" - "U~\77\21U~>T}\77U~CZ\203BZ\204F]\210Ic\215Lf\220Mh\222Ni\222Ng\221Mf" - "\220Jc\214E]\210C[\206CZ\203AX\201\77\300U~\77\2U~BX\201D\202Z\203D\17" - "[\206F]\210H`\212Jc\214Ke\216Lf\220Ng\221Mg\220Ng\221Jd\215G_\211E]\210" - "D[\204AW\200>U}\77\235U~\77\221V~\77\27U~\77U~>T|T}\203\77U~\266\77" - "V~\17\77U~\77V~D[\204D[\205G^\210Je\216Mf\217Nh\221Nh\222Me\217Jc\215" - "F^\211D[\205CZ\203BX\201\256\77V~\225\77V\177\20@W\200BY\202CZ\203D[" - "\204E[\205E]\210G_\212Ia\212Ja\213Jc\215Ja\213H_\212D]\210D[\205CZ\203" - "AW\200\254\77V\177\203@V\177\32\77V\177\77V~>U}=S{:Ow6Kr1El-@g*=c(;a" - "(:`\35*E\0\0\0\345\17\25#(:`(;a+>d.Ah2Gn7Ls;Qy=S|>U}\77V~\77V\177\77" - "V\267\177@V\6\177\77V\177CY\202E[\205F]\210Ha\214Kc\202\214Lc\5\214G" - "`\213G]\207E[\205CZ\203@V\275\177@V\212\177@W\6\177BX\201BY\201D[\203" - "E\\\204E\\\205E\\\203\207E\\\3\206E\\\204DZ\203@W\257\177@W\202\177@" - "V\27\177\77V\177\77U~=S{:Ox6Kr1El-Ag*=c(;a(:`\35*E\0\0\0\345\17\25#(" - ":`(;a+>d.Bi2Gn7Lt;Qy=S|\77V~\77\221V\177@\250W\177@\6W\177\77V\177AX" - "\201E\\\204E\\\205E]\206F\202^\211F\4^\210E\\\205E\\\204D[\203@\235W" - "\177@\256W\200@\7W\200AX\200AW\200D[\203F\\\205E\\\205AX\201A\264W\200" - "@\27W\177\77V~=T|:Px6Kr1Em-Ag*=c(;a(:`\35*E\0\0\0\345\17\25#(:`(;a+>" - "d.Bi2Gn7LtT}\77V~@W\177\236@W\200\234AW\200\3@W\200BX\201D[\204\204" - "F\\\205\3DZ\203BX\201@W\200\316AW\200\203CY\202\1BX\201\252AW\200\210" - "AX\201\202AW\200\27@W\200\77V\177>T|;Px7Ks2Em-Ag+=c(;a(:`\35*E\0\0\0" - "\345\17\25#(:`);a+>d.Bi3Go8LtT};Qy7Lt2Fm.Ag+=c(;a(:`\35*E" - "\0\0\0\345\17\25#(:`);a+>d/Bi3Ho8Mud/Bi3Hp8Nu=S{\77V~AW\200\202AX\201\267" - "BX\201\377BY\202\223BY\202\27BX\201AW\200\77V~;Qz7Lt2Fm.Ah+=d(;a(:`\35" - "*E\0\0\0\345\17\25#(:`);a+>e/Bi3Hp8Nu=S{@V\177AX\201BY\202\202BY\1\202" - "CZ\377\203CZ\310\203CZ\30\203BY\202AX\201@V\177e/Bi3Hp9Nv=S|@W\200AX\201BY\202C\324Z\203" - "C\320[\204C\243[\204D\202[\204C\27Z\203CZ\203BX\201@V\177e/Cj4Ip9Ov>T|@W\200BY\202\203" - "CZ\203\205C[\204\3BZ\203=T|:Pw\205:Ov\4;Qx=T|\77V\177BZ\203\236C[\204" - "\210D[\204\7>U}):]\35+I\35*H\36,K-\77dBX\201\377D[\204\213D[\204\27C" - "[\204CZ\203@W\200=R{9Mv3Gn.Bh+>d);a(:`\35*E\0\0\0\345\17\25#(:`);b+\77" - "e/Cj5Ip9Ow>T}AW\200CZ\203C[\207\204D[\4\204\77U~\40/O\22\33""5\21\32" - "\2043\21\32\7""3\23\34""6\27#\77\33(G%4V4Hm@W\177D[\243\204D[\10\204" - ">T|!1Q\24\36:\24\36""9\25\37;(9[BY\202D\\\210\205D\\\10\205CZ\2036Kr" - ",>b,>a-\77c5IoBY\202D\\\371\205D\\\27\205D[\204CZ\203AW\200=S{9Nv3Gn" - ".Bh+>d);a(:`\35*E\0\0\0\345\17\25#(:`);b+\77e/Cj5Iq:Ow\77T}AX\201CZ\203" - "D\203[\204D\204\\\205D\4\\\205CZ\203,>c\40/P\37\204.O\37\11.O\35,L\31" - "&D\26!=\22\34""4\16\30""0\30$A2FkBY\201D\241\\\205D\3\\\205CZ\2032Gn" - "*\202=c*\2=c6LsD\211\\\205D\10\\\205AY\201$4T\20\31""1\20\31""0\20\32" - "2\40/N@W\200D\236\\\205D\333\\\205E\30\\\205D\\\205C[\204AX\201=T|9N" - "v3Gn.Bi+>d);a(:`\35*E\0\0\0\345\17\25#(:`);b+\77e0Cj5Iq:Ow\77U~BY\202" - "C[\204D\\\205\210E\\\205\1""4Ho\204+>d\203,\77e\202+>d\6);a\"2U\27#@" - "\25\40;1ChCY\202\223E\\\205\216E\\\206\2DZ\2043Ho\203+>e\1""7Mu\212E" - "\\\206\2E\\\2053Gn\203&7\\\2""1DkD[\205\254E\\\206\316E]\206\30E\\\205" - "D[\204BX\201>T}9Nw3Ho.Bi+>d);a(:`\35*E\0\0\0\345\17\25#(:`);b+\77e0C" - "j5Jq:Px\77U~CY\202D[\204E\\\205E\\\207\206E\\\2\2064Hp+\77\202e+\77\16" - "e8PyQm\231Yu\242So\232E_\2114Js,@f+\77e*>d\40/P\27$A0DhD\\\205E]\206" - "\206E]\6\206BZ\202=S|U}:Ow4Ho.Bi+>d);a(:`\35*E\0\0\0\345\17" - "\25#(:`);b+\77e0Cj5Jq:Px@V\177CZ\203E\\\205E\202]\206E\206]\206F\2]\206" - "5Ip,\202\77e,\16\77f@X\202j\207\261t\222\272x\227\277~\235\305j\207\263" - "E^\211-Ah,\77e+>d\40/P!1R\77U}F\203]\207F\14]\207CZ\2037Ls#2S\31%B\24" - "\37;\24\37:\27#\77\40.N1CiAX\201E]\206F\202]\207F\21]\207E]\206AX\201" - "0Ch\37-L\26\">\24\37;\24\37:\24\37;\30#@\35*I%5W9NvE\\\206F]\207E[\205" - "4Ip,\202\77f,\2\77f8NvF\202]\207F\40]\206c,>c&6X'8]" - ",\77e,\77f+>d(9^&6X#3T#3T,>b\77U~F]\207F]\207E\\\205=S{-\77c\36+J\27" - "\">\24\37:\25\37;\31$A%4V7KrCZ\203F\203]\207F\17]\207;Px'7Z#3T#3T);^" - "9Ov5Io\40/O\26\">\24\37;\30$A(9[U}:Ow4Ho.Bi+>d);a(:`\35*E\0\0\0\345\17\25#(:`);b" - "+\77e0Cj6Jr;Px@W\177CZ\203E\\\205F]\206\210F]\207\1""5Jq\203,\77f\16" - "3HoD[\205F]\207F^\207Kc\214b}\246j\210\264@Y\204-Ah,\77f*=c\40""0Q5J" - "rE\\\205\202F]\207\14>T|$4U\20\32""3\23\36""8\31&C\35+J\35+K\33(E\25" - "\40;\17\31""2\40/O:Px\203F]\207\20>T}\"1S\20\32""3\25!;\33)F\35+K\35" - ",K\35+J\32(D\27\"=\23\36""9*<`CZ\204F]\207E\\\2054Ip\203,\77f\22""8N" - "vF]\207F]\206d!1R\24\40:\202\22\35""6\20\35+J;QyF^\207D\\\2052Gl\27#@\17" - "\31""2\26\"=\33)F\35,K\35+J\32&C\22\35""6\20\31""3&7Y\77U}\203F^\207" - "\2""7Kr\25\40<\202\22\35""6\13\26\">\36-M\22\35""8\25\40;\33)G\35+J\32" - "'D\22\35""6\35+Jd);a(:`\35*E\0\0\0\345\17\25#(:`);b+\77e0Ck6Kr;QyAW\200D[\204E]" - "\206F^\202\207F^\1\207G^\205\210G^\2\2106Js-@\202h-@\3h4HqE\\\205G^\202" - "\210G^+\210H`\212Vp\232Rl\2271Fo-@h-@g(9_2EkD[\204G^\210@W\177#3T\26" - "!>\"2U+=d0Dl9Ox;Qz4Ir,\77g&7[\27$B\37.O@V\177G^\210E\\\206/Bg\32'F&7" - "[,>f1En8Nwe:OwG^\210G^\210E]\2065Jr-@\202h-@\16h9OwF^\207" - "f-@\202h-@\2h,\77f+=\202" - "d*=\25d0DkCZ\204F^\2077Lr\31&D\34*J(9_,\77f0Dm5Kt3Hq.Ai*=c#3V\26#\77" - "&7ZC[\204G_\210G_\210AX\201+=\202d*=\14d$5Y\33)H$5X3Gp3Hr.Bj-@h(:_\32" - "(G#4V@W\177G_\260\210G_\245\211G_\30\210F^\207F]\206C[\204\77U~:Px4H" - "p/Cj+>d);a(:`\35*E\0\0\0\345\17\25#(:`);b,\77e0Dk6Kr;QyAW\200D[\204F" - "]\206G^\210G\202_\210G\205_\211G\2_\2116Ks-\202@i-\3@i4HqE]\206G\203" - "_\211G*_\211Ia\212Le\2206Lv-@i-@i*=d0DkE]\206E]\2062Fm\33)I(:`-@i3Ir" - "To\233\177\236\310\204\245\316j\210\263V\201-Aj-@i.Aj;R~Sn\233Ws\240W" - "s\240Oj\226Ld\217@W\200$5X\37/Q+>f-@i7NxYu\242t\223\276i\210\264D^\212" - "/Cl-@i&7]\33)I7MtF^\207G`\211BZ\203-\202Ai-\15Ai+\77f2GpWu\241r\221\274" - "n\215\270Hc\2170Dn-Ai)d);b(:`\35*E\0\0\0\345\17\25#(:`);b,\77e0Dk6Kr;Qy" - "AX\201D\\\205F^\207\203G_\211\206G`\211\1""6Lt\203-Ai\2""4IrE^\207\205" - "G`\211\2Ib\2135Ks\202-Ai$,@g1FmF_\210B[\203)<`&9]-Ai/ClKe\222j\207\262" - "Up\231Pi\222c\177\250So\2321Gp-Ai':`(:^AY\201G_\2116Ls-Ah-Ai.BkIb\211" - "Kd\213G_\210Ng\220Zu\237l\211\262u\223\274]x\243Jc\215G`\211F^\2105J" - "s\202-Ai\23-@i0Ek\37/P\32'G)e-Ai2GqZw\243o\215\266_{\244g\204\255k\211\264\77X\203" - ".Aj,Ah%7[,@eD\\\205G`\211CZ\203\203-Ai\14""0EnNi\225o\214\265`|\245d" - "\201\252j\207\262AZ\206-Aj-Ai':_/CjD\\\204\233G`\211\271H`\212\202G`" - "\211\27F^\207D\\\205@V\177;Py4Ip/Cj+>d);b(:`\35*E\0\0\0\345\17\25#(:" - "`)b,>b0Bh;Px.Bk-Aj,@i+=c>T|Jb\214@W\201/Cl-Aj);a" - "\26#@\24\40<\32'E!0Q*;_:OwIa\213Le\217Ia\213H`\212G^\2106Kt-Aj-Aj+>f" - "!1T\32(G(:a/ClF`\214k\212\265]x\241Kc\215H`\203\212H`\6\2128Nw-Aj-Aj" - ".Bj7MuIa\203\212Ia\24\212H`\2128Mt);a.Bj.Bk6MwYs\235Oh\222Ia\212Jb\213" - "Wq\232G`\2131En.Bj+\77e.AgD\\\205Ia\212D[\204.B\202j.B\15j4JsTn\231P" - "i\222Ia\212Ia\212Wp\232Ib\215/Dl.Bj+>d,\77dD\\\204Ia\324\212Ia\31\212" - "H`\212G_\210E\\\205@W\200;Qy5Ip/Cj+>d);b(:`\35*E\0\0\0\345\17\25#(:`" - ")e.Bj.Bj0Em\77U\177Jb\214" - "@W\177/Ci.Bj.Bj+\77e\35+K\22\35""8\21\202\33""6\21\3\33""6\31&E*=c.\202" - "Bj.\35Ah@W\200Me\217Vp\233=T\177/Cl.Bj*=d!1S\33(F\26\">\22\35""7\17\30" - "2\30%B:OvH_\211Ia\212H_\2117Lt.Bj.Bj-Ai*e.Bj/Ck9" - "OxMe\217Ia\213Ia\212Ia\212Ld\215F]\2070Em.Bj.Bj0DkBY\202Ia\212D[\205" - ".\202Bj.\3Bj6KtH`\212I\202a\212I\10a\212Jb\214CZ\2041En.Bj-Ai.AhH_\211" - "I\207a\212I\316a\213I\27a\212G_\211E]\206@W\200;Qy5Iq/Cj+>d);b(:`\35" - "*E\0\0\0\345\17\25#(:`)e%6[\33(G\40/P=S|" - "Ia\213H_\2117Lu\203.Bk\1/Cl\202.Bk\3(:`+<`=S{\206Ia\213\1""9Ox\203.B" - "k\1""7Mv\205Ia\213\1>U~\203.Bk\2""4IrH`\212\204Ia\213\1>U~\203.Bk\4""4" - "IrF^\210Ia\213D[\205\203.Bk\2""2FoD\\\206\204Ia\213\1>U\177\203.Bk\1" - "2Gp\226Ia\213\276Jb\213\203Ia\213\26G`\211E]\206AW\200;Rz5Iq0Cj+>d);" - "b(:`\35*E\0\0\0\345\17\25#(:`)f.Bk/Cl8NxTn\230Me\217Ld\2168Mv/Ck/Ck2HqWs\240r\221\274u\224\206\276" - "u\224\36\276j\207\262Vp\232Jb\213Me\216a|\245|\232\303\200\240\312q\220" - "\272e\203\256[v\241Ib\2166Ku/Cl-Ai$5X9NvJb\213I`\2128Mu/Ck/Ck1FoC[\206" - ";R}0Dm-@g\36,M%4WBY\202Jb\204\213Jb\2\213:Py/C\202k/C\2k8NwJb\204\213" - "Jb\3\214E\\\2053Hq/C\202k.B\2jF]\207Jb\202\213Jb\17\213H`\2117Lt-Ai/" - "Ck/Ck;QzLe\216Jb\213E\\\206/Ck/Cl/Cl-Ai@W\201Jb\202\214Jb\10\214Ia\213" - "9Nw-Ai/Cl0Dm7MwKc\215Jb\325\214Jb\27\213H`\212F]\207AX\201e);b(:`\35*E\0\0\0\345\17\25#(:`)e);b(:`\35*E\0\0\0\345\17\25#(:`)T|D[\204G_\210Ia\213Jb\214\210Jc\214\1""8Nw\202/Dl%/Ck$5" - "X\30%B\23\37:\21\34""6\15\26/\26#\77%7[.Ck/Dl2HpLh\223d\201\253Oh\222" - "Jc\214Oh\221Qk\2266Lv/Dl-Ai\37""0Q'9\\\77V~Ha\212Ib\213BZ\2026Kq&7X\31" - "%C,>bG`\211G`\210.Bg\40/O-@e:PwD]\205\202Ib\213\11CZ\2026Jq/Dl0Dm2Gp" - "E]\206Kc\215Ia\2138Nw\2030Dm(\77V\200g\203\255_{\2509Oz0Dm+>e\32'F$4" - "WC[\204Jc\214Kc\215Kd\215\77V\2002Fo0Dm.Bj#4W$4V):\\+<_9OvIa\212Vp\232" - "D]\2071Fo0Dm*=c\35+L,>c;Qy5Ip\40""0Q#3V/Cl0Dm8NxTo\232Ng\220Kc\215F]" - "\207\2030Dm\14,\77g\36-O+>c:Pw7Ls$5W!1T/Dl0Dm5KtNg\222Ng\221\324Kc\215" - "\202Jc\214\26Ia\213G^\210BY\202e);b(:`\35*E\0\0\0\345\17\25" - "#(:`)T|D[\204G_\211Jb\213Jc\202\214Jc\1\214Kc\205\215K" - "c\2\2159Nx0D\202m0D0m+=e$4X\"1U%6[+>e.Bj0Dm0Dm7LwRn\232n\212\265Ys\235" - "Kc\215Kc\215Mf\220_z\244Oj\2264Jt0Dm(;`\30%D\21\34""7\22\35""8\22\35" - "8\21\34""7\21\34""7\25!=\40/R=R{Kc\215Kc\2159Mu\33)H\23\36""9\21\34""7" - "\21\34""7\22\35""8\22\35""9\23\37;\40""0R/Ck1EnAX\204Rl\226Kc\215Ja\213" - "9Nw0D\202m0D)m=S|Pi\223i\206\257a}\252;Q|0En*=e\33)J%5XAW\201Kc\215M" - "f\220Qj\2267Mx0Dm0Dm);b\31&D\23\37""9\24\40:,>bH`\212Tm\227a|\250@X\204" - "1Fo0Dm$4X\25!>\21\34""8\23\36""9\35,M,@h0Dm7MwRn\232^x\242Me\217Kc\215" - "F^\2070D\202m0D\15m1Eo)T}D[\205H_\211Jb\214K\203c\215K\205d\216K\2d\2169Oy0\210En0\7E" - "n5KuIe\221g\205\262x\225\277[v\237Le\217K\202d\216K!d\216Tn\230m\212" - "\265Uq\2378Mx0Dm-\77g%6Y\"2S\"1S$4W):`/Ck1FoBY\203Ld\216Ld\216AW\201" - "0Dm,\77g'8]#3U\"1R\"2S'8\\.Bj1EoS}Ld\216Rk\225l\211\263Wr\2376Lv0En+>f\32'F&7ZE\\\205Nf\220" - "_{\244Oj\2278Nx1\204En1\25En\77U\177Ld\216Mf\220a{\245g\205\261C[\207" - "2Fp0Dm,\77f&7\\);`/Bk1En6LwXt\242l\212\264Qj\224Ld\216Ld\216G^\2101\202" - "En1\14En;R}Kf\2235Js'8^(:_.Bk1Eo3HrId\220j\207\262Vo\232L\325d\217L\31" - "d\217Kc\215Jb\214H_\211CZ\203=S|6Jr0Dk,\77e);b(:`\35*E\0\0\0\345\17\25" - "#(:`)T}E\\\205H`\212Jb\214Kd\216Ld\216\206Ld\217\3Ph\223" - "Up\234]x\246\205^z\250\7c\177\255n\214\271x\227\303\203\243\316\202\237" - "\310p\213\264Sk\226\205Ld\217\25Le\220Xr\234x\224\276z\231\304\\w\245" - "Le\221D\\\210BZ\206C[\207Ia\215Sm\231d\201\257x\227\304d\200\254Og\223" - "Oh\222a}\250k\211\266[v\243Mf\221E^\212\202BZ\206\35E^\211Mg\222c\200" - "\255z\231\304g\202\255Oh\222Ld\217Pi\223Vp\235]z\247^{\250\\x\245Uo\233" - "Ng\221Ld\217Qj\225m\212\264i\210\264^{\250^{\247Xs\237AW\177@W\200Kd" - "\216Sl\227v\223\275~\236\310k\211\266_|\251\202^{\250\21\\x\245Sn\231" - "Ng\222Ld\217Ng\222g\202\254|\232\305l\213\267Qm\231E^\212BZ\206C[\207" - "Jc\217]z\246v\225\301t\221\272Vp\232\203Ld\217\1G_\211\2031Eo\13""9O" - "zi\203\256t\223\276Vr\236F_\213C[\207Ib\216b\177\255t\222\275Zu\237M" - "e\220\252Ld\217\253Le\217\202Ld\217\27Jc\214H`\212CZ\203=T|6Jr0Dk,\77" - "e);b(:`\35*E\0\0\0\345\17\25#(:`)T|6Ks1Dk,\77e);b(:`\35*E\0\0\0\345" - "\17\25#(:`)T}7Ks1Dk,\77" - "f);b(:`\35*E\0\0\0\345\17\25#(;`)T}7Ks1Ek,\77f);b(:`\35*E\0\0\0\345\17\25#(;`)U}7Ks1Ek,\77f);b(:`\35*E\0\0\0\345\17\25#(" - ";`)S}F^\210Oh\223\242Pi\224\2BY\203#3W\202\31" - "&H\3\35+N\24\40\4>\26#B0DkNg\222Pj\241\225Qj\10\225F^\210(9_\40""0S\40" - "0S\"2VAX\202Pi\224Qj\250\225Qj\277\225Qk\10\225Oi\223c)<`*V\201\2035Kv\2""7Mx:Q" - "|\205;R}\2:Q}G`\212\243Qk\226\2Uo\232Tp\234\202Yv\242\3Uq\235Up\232R" - "l\227\225Qk\226\324Rl\226\1C[\205\2033Ir\2;S}Oi\223\234Rl\226\27Qk\226" - "Pi\224Me\220H`\211AX\2008Nu2Fl,\77f)\40""0TIb\214" - "Rm\227Ql\226G_\2110Dj\34+L\23\37>\22\37<\22\37=\23\37>\33*L/DjF^\210" - "Ql\226R\202m\227R\17m\227Ib\214)U~#5Y\23\40\77\22" - "\37=\22\36=\35,O8NuPj\224R\202m\227R\27m\227Ke\217);a\37.Q\37.Q!2V8N" - "w:Py\35-O\22\37=\22\36<\26$E*U~\37.Q\23\37>\22\37=\23" - "\40@#4Y@W\201Ql\226R\204m\227R\5m\227Lf\2209Ow\40""0S\23\40\77\22\202" - "\37=\22\5\37=\30&G-@fF^\210Rl\226S\202m\227S\35m\227Jb\214*U~$5Y\23\40@\22\37=\23\36=\35,O8MuPj\224Sm\227Oh\2233Ho\"2W" - "*=d3Is6Mx5Lw-Ah#4X\37.Q\37.Q$6[Ia\214S\226m\227S\202m\227R\27l\226Qj" - "\225Mg\221H`\212BX\2018Nv2Fm-@f)f%6[\31&G-AgMg\221Sm\230To\2316Lt\37" - "/R\35+N\34*M/BiNg\222\203Sm\230\11Mf\220);a\34*M\35+N!0T>U}Tn\230G_\211" - "%7\\\202\35+N\36\37/RBX\203Rl\227Sm\230Ib\214&8^\35,O\35+N\36-P-Ah\34" - "+N\33*K(:`+\77g3GpPi\224Rl\227AX\201!1T\24!A\40/S(;a+>f+\77g);b\40""0" - "T\25!A\40""0S@W\200Rl\227\202Sm\230\17Kd\216'9_\35,O\35+N\35,O&7^\32" - "(J\33*K':`+\77f*=c\37""0S\32)K=S}Qj\225\202Sm\230\2Ng\222%6\\\202\35" - "+N\22\35-P#4Z\31(I\37.R)f$6Z\31'I);a3Hr\33)L\36-P);b+\77f(:`\33*" - "L#4YG_\212\204Sm\230\15G_\212);a\24!A\35,N':_+>f+\77g)f&7]6Lw=U\2029Q}6My6My1Gp$6" - "Z=S|Rl\227Xs\235_{\245AZ\2066My5Kv.AjH_\211Tm\230Tm\230Sl\227AX\201-" - "Ai6Lw8NzAZ\207c\177\252Wq\234Pi\223;R}7M\202y7M/yMf\220Tm\230Tm\230Q" - "j\225V\202Pj\226Vq\235Hb\216:R}5K" - "v$6[!1VE]\210Sm\230Tn\230Rl\226g\34+N\30\204%F\30\3%G!1UE]\207T\202n\231T\2" - "n\231E]\2107\203Nz7\36MyIc\220o\215\270\177\236\307g\205\261>V\2037N" - "z7Nz/Cm;PzSl\227Tn\231c\200\252Ni\2268O{6Mx-@i>U\177Qk\226Tn\231Qk\226" - "9Oy0Dn7Nz:R~Rn\232a|\247Uo\232Pi\224;R~7\202Nz7\"NzMf\221Tn\231Tn\231" - "Qk\226T\177$6\\2Hs7N{AZ\207i\207\263\217\255" - "\323\225\262\327\203\242\312Sn\2349P}5Kw'8`4IsPi\225Tn\232Rl\230V\203[v\243`{\246Vp\233Vp\233Qk\226V\2019P|9P|:R~Sn\230Yt\237Vp\233Vp\233" - "Sm\230>V\2029\202P|9\2P|Mg\222V\202p\233V\22p\233U\201Sm\230Vp\233Nh\223;R}9P|9P|6My(;b\35,N\33\202*L\33" - "\23*L\"2W4Ju9P|9P|8OzKd\217Vp\233Tn\231>V\2019P|9P|:R~Sn\230Yt\237Vp" - "\233Vp\233Sm\230>V\2029\202P|9\2P|Mg\222V\202p\233V\2p\233Ha\2149\202" - "P|9\3P|AY\205Tn\231V\233p\233V\30p\233Uo\232Sm\230Pj\224Jb\214CZ\203" - "9Ow2Gn-@g*V\201\2029P|\3""9Q}Oi\224Wq\234\204Vp\233\2Qj\225" - "=T\200\2039P|\1Qk\226\204Vp\233\1Rl\227\2039P|\5V\202\2039P|\1Lf\221\203Vq\234\2Sm\230>V\201\2039Q}\1Nh\223\203" - "Vq\234\1V\202Sn\231Vq\234Sn\231@X\204\2029Q}\3:R~AZ\207" - "Ga\215\203Gb\216\2Hb\216Hc\217\202Hc\220\5Hc\217To\232Vq\234To\232>W" - "\202\2039Q}\1Lf\221\203Vq\234\2Sm\230>V\202\2039Q}\1Nh\223\203Vq\234" - "\1Hb\215\2039Q}\2AZ\206To\232\234Vq\234\30Uo\233Tn\231Pj\225Kc\215CZ" - "\203:Ow3Gn-@g*V\2029Q\202}9Q\2}Mg\222Vq\204\234Vq\24\234W" - "q\235B\\\2109Q}9Q}7NzIa\214Tn\231Vq\234Vq\234Tn\231G`\2136Ny9Q}9Q}B[" - "\207Vq\235Vq\234To\232>W\2029Q\202}9Q\2}Lf\221Vq\202\234Vq\3\234Sm\230" - ">V\2029Q\202}9Q\2}Nh\223Vq\202\234Vq\6\234V\202:Q\202}:Q\2}Nh\223Wq" - "\202\234Wq\2\234Ib\215:Q\202}:Q\3}BZ\206Uo\232Wq\221\234Wq\1\234Wr\207" - "\235Wr\32\235Wq\234Wq\234Vp\233Tn\231Qk\225Kc\216C[\204:Pw3Gn-@g*V\201:\202Q}:\6Q" - "}Pj\225Wq\234Wq\234Tn\231\77W\202:\202Q}:\2Q}Ng\223W\204q\234W\24q\234" - "_{\245Lg\223;S\177:R~5Lw3HrLf\221Wr\235Wr\235Le\2203Hq5Lw:R~;S\177Kf" - "\222_|\246Wr\235Up\233\77X\204:\202R~:\2R~Mg\222W\202r\235W\3r\235Tn" - "\231\77W\203:\202R~:\2R~Oi\224W\202r\235W\6r\235=U\201:R~:R~;S\177Lf" - "\222W\202r\235W\2r\235E_\212:\202R~:\2R~E^\212W\202r\235W\2r\235Nh\223" - ":\202R~:\14R~\77W\203To\232Wr\235\\x\242Rn\232=V\203:R~7NzV\202\203:R~\1Pj\225\202Wr\235\2To\232\77W\203" - "\203:R~\1Nh\223\205Wr\235\23_z\245`|\250B[\211:R~7O{':a'9a9Nx9Oy'9`&" - "9a7O{:R~B[\210_{\247_{\245Wr\235Up\233\77X\204\203:R~\1Mg\222\203Wr\235" - "\2Tn\231\77W\203\203:R~\1Oi\224\203Wr\235\1=U\201\202:R~\2;S\177Lf\222" - "\203Wr\235\1E_\212\203:R~\1E^\212\203Wr\235\1Nh\223\203:R~\26\77X\204" - "To\232Wr\235[w\241e\202\255E`\215;S\1779P|)X\205Zv\243c~\251Xs\236Wr\202\235Wr\3\235Sn\231>W\203:S\202\177" - ":S\6\177Qk\226Xs\236Xs\236Up\233\77X\204:S\202\177:S\2\177Oi\224Xs\204" - "\236Xs\24\236[v\241p\215\267^{\250@Z\207:S\1775Kv#5[\26$G\26$G#6\\5L" - "x:S\177@Y\206]z\247p\216\267\\w\242Xs\236Vq\234\77Y\205:S\202\177:S\2" - "\177Mh\223Xs\202\236Xs\3\236To\232\77X\204:S\202\177:S\2\177Pj\226Xs" - "\202\236Xs\6\236=V\203:S\177:S\177;T\200Mg\223Xs\202\236Xs\2\236F`\214" - ":S\202\177:S\2\177E_\213Xs\202\236Xs\2\236Ni\224:S\202\177:S\27\177\77" - "X\205Up\234Xs\236Yu\240l\210\261g\205\261D^\214:S\1775My$6\\\24!D\21" - "\35=\21\34=\22\36\77\27%G\40""1V-BkGa\215Xs\236Xs\236Vq\234\77Y\205:" - "S\202\177:S\2\177Mg\223Xs\202\236Xs\3\236To\233\77X\205:S\202\177:S\17" - "\177Pj\226Xs\236Xs\236Zu\240b}\251Ic\222:S\200:S\1776Nz(X\205Rm\231Xs\237Xs\237V" - "q\235C\\\211\77X\206\77Y\206>X\205Pk\227X\205s\237X\27s\237a}\250}\233" - "\304i\207\263Hc\220=W\2049Q~5Mx5Lx9Q~=V\204Gb\217g\205\262}\233\304b" - "~\251Xs\237Xs\237Wr\236C]\212\77X\206\77Y\206>X\206Oj\226X\202s\237X" - "\13s\237Up\234B\\\211\77X\206\77Y\206>X\206Ql\230Xs\237Xs\237Yt\240A" - "[\210\77\202Y\206\77\2Y\206Oi\226X\202s\237X\2s\237Hc\217\77\202Y\206" - "\77#Y\206Hb\217Xt\237Xs\237Xs\237Pk\227>X\206\77Y\206\77Y\206C]\212V" - "q\235Xs\237Xs\237]x\244z\230\300u\225\277Qm\233@Y\2079Q~4Kv2Is2Hr3Jt" - "7O{\77Y\206Ga\216Sn\232Yu\240Xs\237Wr\236C]\212\77Y\206\77Y\206>X\206" - "Oj\226X\202s\237X\7s\237Up\234B\\\211\77Y\206\77Y\206>X\206Ql\230X\202" - "s\237X\6s\237i\205\260q\220\273Qn\233D^\213\77Y\207\77\202Y\206\77\2" - "Y\206Ic\217X\231s\237X\27s\236Vq\234Sm\230Le\217E\\\205;Px3Go-Ag*T|G^\207Nh\222Tm\231Vq\234Xs\236" - "\203Xs\237\204Xt\237\3]x\244j\210\263x\227\300\211z\231\302\13x\227\300" - "j\210\262]x\244Xt\237[w\242i\206\261v\225\277z\231\302y\230\301k\211" - "\264]z\244\202Xt\237\7[w\242j\210\262w\226\300z\231\302x\227\300k\210" - "\263\\x\243\204Xt\237\3Zv\241o\215\265x\230\302\203z\231\302\2z\231\303" - "j\206\261\205Xt\237\2a~\250o\216\270\202z\231\302\12t\222\275c\201\253" - "Yu\240Xt\237`|\250o\215\267y\230\302z\231\302u\224\276f\203\256\207X" - "t\237\5f\203\255\204\243\311\212\253\321t\224\275`\177\253\202Xu\242" - "\5a\177\253s\221\273\210\250\317\206\244\313g\203\256\203Yt\240\6`{\250" - "o\214\267y\230\301z\231\302v\224\277h\204\260\203Yt\240\6b}\251p\215" - "\270z\230\302z\231\302u\223\276f\203\256\202Yt\240\2`{\247n\214\270\202" - "z\231\302\13v\224\276f\202\256Zu\241Yt\240\\w\243i\206\262z\231\302z" - "\232\302x\227\300j\210\263]y\244\202Yt\240\6g\204\257u\225\276z\232\302" - "z\231\302o\215\270a}\250\203Yt\240\25a}\250}\232\302\220\257\325{\232" - "\303h\207\261\\z\247Xu\243Yv\244b\200\253o\215\267~\235\305\220\257\325" - "y\226\277]x\244Yt\240`|\247o\214\267y\231\301z\232\302v\225\277h\205" - "\260\203Yt\240\6a}\251p\216\270z\231\302z\232\302u\224\276f\203\256\203" - "Yt\240\5^y\245x\226\276\222\262\327\210\250\317|\233\304\202z\232\302" - "\3x\227\300k\210\263\\x\243\227Yt\240\30Xt\237Xs\237Wq\234Sm\230Mf\220" - "E]\206;Px4Go-Ag*T|G^\210Oi\223" - "Tn\231Wr\235Xs\202\237Xt\1\237Yt\204\240Yt\4\240\\x\243r\216\267\201" - "\236\305\203\240\210\306\203\240\25\306\202\236\305r\216\267\\x\243Y" - "t\240[v\242n\212\264\200\235\304\203\240\306\202\237\305s\217\270^y\244" - "Yt\240Yt\240\\v\242q\215\266\201\236\304\203\240\306\201\236\305r\216" - "\267]w\243Yt\204\240Yt\10\240`{\247z\226\276\203\240\306\203\240\306" - "\202\237\305u\221\272_z\246Yt\204\240Yt\17\240b~\251y\225\276\203\240" - "\306\203\240\306~\233\302f\201\254Zu\241Yt\240a}\250x\225\275\203\237" - "\305\203\240\306\177\234\303i\205\260Yt\207\240Yt\13\240^y\245o\213\265" - "\207\243\311\221\256\323\222\260\324\222\260\324\222\256\323\211\245" - "\313r\216\267_z\245Zt\203\240Yt\7\240`{\247x\224\274\203\237\305\203" - "\240\306\200\234\303k\206\261Yt\202\240Yt\40\240b}\250y\225\275\203\237" - "\306\203\240\306\177\234\303i\204\257Yt\240Yt\240_z\246y\225\275\203" - "\240\306\203\240\306\177\234\303j\205\260[v\241Yt\240\\w\243p\214\266" - "\203\237\306\203\240\306\202\236\305r\216\267\\x\243Yt\240Yt\240j\205" - "\260\200\234\303\203\240\306\203\237\305x\224\275a|\250Zt\203\240Zt\25" - "\240\\v\242h\202\255\202\236\304\224\257\321\223\257\324\223\260\324" - "\223\257\324\224\257\323\217\252\316\177\233\302j\206\260]x\243Zt\240" - "Zt\240`{\247x\224\274\203\237\305\203\240\306\200\234\303l\206\261Zt" - "\202\240Zt\7\240b}\250z\225\275\203\237\306\203\240\306\177\234\303i" - "\204\257Zt\203\240Zt\12\240[v\242e\200\253u\221\271\202\236\304\203\240" - "\306\203\240\306\202\236\304r\215\266\\w\243Zt\226\240Zt\31\240Yt\240" - "Xs\237Wr\235Sn\230Nf\220F]\206d);a(:`\35*E\0\0\0\345\17\25#(:`(;" - "a*=d-@g1El5Iq8Mu:Pxd,\77f-@f-\377@g-\316@g-\14@g,@f,\77e+>d)>>\0\0\0\236\236\236\377\377\377\256" - "\256\256\0\310\0\0\0\1\0\0\345\245\0\0\0\37\14\14\14\306\306\306\334" - "\334\334HHH\34\34\34***'''\251\251\251\370\370\370\326\326\326\227\227" - "\227MMM\277\277\277\316\316\316\304\304\304iii\1\1\1\206\206\206\236" - "\236\236\177\177\177\227\227\227\247\247\247\370\370\370\327\327\327" - "\233\233\233\\\\\\\250\250\250---777\256\256\256\217\217\217\202\302" - "\302\302\10""444\0\0\0UUU\301\301\301\304\304\304\261\261\261\226\226" - "\226\16\16\16\202\0\0\0\21\7\7\7\254\254\254\370\370\370\324\324\324" - "\222\222\222\205\205\205\350\350\350\237\237\237\321\321\321\250\250" - "\250\32\32\32\10\10\10XXX\275\275\275\312\312\312\234\234\234\"\"\"\203" - "\0\0\0)555\345\345\345\227\227\227\16\16\16OOO\351\351\351\257\257\257" - "\11\11\11\27\27\27\226\226\226\304\304\304\305\305\305hhh\7\7\7]]]\273" - "\273\273\311\311\311\262\262\262'''\265\265\265\314\314\314\37\37\37" - "\203\203\203\232\232\232\201\201\201\363\363\363\352\352\352\271\271" - "\271(((ccc\312\312\312\322\322\322\223\223\223\37\37\37\0\0\0\220\220" - "\220\242\242\242\247\247\247\322\322\322ttt\13\13\13\203\0\0\0+888\346" - "\346\346\371\371\371\245\245\245333\344\344\344\372\372\372\256\256\256" - "\3\3\3\231\231\231\311\311\311\320\320\320\243\243\243)))...\257\257" - "\257\217\217\217\275\275\275\305\305\305\77\77\77\0\0\0\207\207\207\307" - "\307\307\320\320\320\260\260\260333\12\12\12lll\315\315\315\275\275\275" - "\263\263\263\177\177\177\0\0\0,,,\240\240\240\306\306\306\303\303\303" - "LLL\16\16\16\251\251\251\215\215\215\214\214\214mmm\246\0\0\0\1\345\0" - "\0\244\0\0\0=\0\4\4\4\237\237\237\373\373\373\335\335\335\275\275\275" + "w8Mu8Mu9N\245v9N\26v8Mu7Ls5Ip2Fm.Ah+>e*T}\77V\200BX\202D[\204F^\210Ia\214Kd\217Oh\223Sl\230Vo\234Ys\235Y" + "r\234Sl\230Pi\224Le\216G_\211C[\205@V\200T|@W\177BZ\203D]\207G`\211Ha\213Kd\215Me\217Kd\217" + "Jb\216Kc\216Nh\222Me\217AY\2008Ls1\216Ek1\23Fl):_\34(I%5X3Hn:Ow>T|D[" + "\204G^\210Jb\215Le\217Le\220Ld\217Jb\214Ga\213F]\205@V\200=S{>S{9\202" + "Nv9\243Ow9\203Ov9\25Nu7Lt5Iq2Fn.Bi+>e*U\177BZ\203" + "E\\\206G`\212H`\212Ha\213\77U~0@f0Ci\2071Fl\12""3Gm:Pv@V~BX\200CZ\203" + "F^\210Ia\213Kd\216Mf\221Oh\224\202Oh\225\11Oi\225Mg\221Oh\224Oi\225Q" + "k\225Sm\227Tn\227Tn\231To\230\202Tn\227\7Sm\227Qk\224Mh\222Mg\222Le\216" + "Kd\215Jc\214\207Ib\214\202Ic\214\2Kd\214Lf\217\202Mg\221\11Mg\222Mg\220" + "Lg\220Lg\221Mg\221Le\220Le\221Le\216Kd\216\203Jc\215\11Jb\215Kc\215L" + "f\220Rl\227Xr\236Wq\234Le\217>T|4Ip\2141Fl\12""0Ek(8[\34)F)8\\6Jr7Mt" + "=R|AW\201D\\\206G`\212\202Ib\213\7Ha\213G`\212D\\\206@W\202>T}>T|9Nv" + "\234:Ow\211:Px\30:Ow9Ow9Nv8Lt5Jq2Gn.Bi+\77e*T" + "}AX\202D]\207G`\212Ib\214Kd\216Jc\2157Lt-=a2Fl2F\205m2F\13m3Gn:PxBY\177" + "CX\201C[\205F_\211Kd\216Mf\220Oh\223Qj\226Qk\203\227Qk\7\227Qj\226Rk" + "\227Qk\226Pk\224Oi\224Oh\224Oi\202\225Oj\202\224Pj\203\225Pj\202\226" + "Pk\202\225Oj\207\224Oj\3\224Nh\223Mg\220Mg\203\221Mf\5\221Le\217Mf\220" + "Ng\222Mg\222Mf\202\221Mg\4\223Ng\223Oh\224Pi\224Pj\203\224Pk\11\224P" + "j\225Qk\227Wr\235^z\244^z\242Sl\226>U~4Hp2F\212m2F\23m1Dk\"1R\37,L/A" + "g4Ho9Nv;Qy\77V\200D[\204E]\207E^\210E^\210E]\206DZ\203@V\201\77U}=R{" + "9Ow:P\246x:P\26x9Ow8Mu6Jr3Gn/Bi,\77f*T|\77U\177@X\202E]\206H`\212I" + "b\214Jb\214@Y\203-\77e,=c2\205Fm2\12Fm3Hp=T{CZ\201CY\202E]\207H`\212" + "Jc\215Kd\216Mf\220N\202g\221N\202g\222N\11g\221Oi\223Pj\226Pj\226Qk\226" + "Rl\226Rm\227Sm\230Sm\230R\202m\227R\4l\227Rl\227Qk\227Pj\226P\204j\226" + "O\212j\225O\202j\226O\202j\226P\2j\226Qk\227R\202l\227R\203m\227R\2m" + "\230Sm\230R\205l\226Q\13l\226Rl\227Rm\227Ql\226Vp\232^z\244d\177\250" + "Zu\234G_\210:Px3Ho2\210Gm2\21Gm-@e\"2S(:a1Bj6Jq9NvT}\77V\202AW\202" + "CX\202\77V\202\77V\201\77U}=S{;Qy;\247Py;\26Py:Ow8Nu6Kr3Go/Ci,\77f*<" + "c(;`(:_\35*E\0\0\0\0\17\25\"(:`(;a*V" + "}\202CY\202\5E\\\205H`\212Ib\213Jc\214Kd\215\202Jc\215\1Jc\214\203Ia" + "\212\6Jc\214Kd\216Le\216Lf\217Nh\221Oh\223\204Pj\224\2Rl\227Rk\227\203" + "Rl\227\207Ql\227\202Rl\227\207Ql\227\1Rl\227\202Rl\230\202Rk\230\2Rl" + "\230Qk\226\203Pj\224\204Oh\222\1Nh\222\202Oh\222\14Pj\224Pi\223Oi\222" + "Oi\223Tn\230]x\241a}\246Zt\237Kc\215=S{5Jq3Ho\2063Gn\11""1El*>c+>c1C" + "j4Ip7Ks:Pw;Px>T|\202\77U}\3\77U~\77U}T|@V~@V\200@W\202@W\201>U\1771Dj'8[0Dk3G\202n3G\16n3Ho:Py" + "E\\\204E]\204D[\204F^\206Ib\213Jc\214Kd\215Kd\216Jc\215Ia\211H_\210D" + "]\202\210C]\202\210E^\16\210H_\210H`\212Hc\215Jc\215Kc\215Ke\217Le\217" + "Mg\221Nh\222Ng\221Ng\221Oh\222Oi\223Pj\205\224Pj\2\224Qk\226Pj\203\224" + "Pj\2\224Qk\226Pj\207\224Pj\2\224Oh\222Ng\202\221Ng\202\221Mg\13\221K" + "d\216Kc\215Kc\215Ld\215Kc\215Jc\215Kc\215Kd\216Le\217Ng\221Pi\202\223" + "Pi\11\223Oi\223Tn\230[u\240a}\246`{\244Up\230E\\\2048Nw3H\205o3H\10o" + "4Ho3Gn3Gn5Ip7Ks;Px;Py;P\203y;Q\253z;Q\32y;Qy;Py9Ow7Ls4Ho/Cj,\77f*T}\77\202U~\77\27U~;Px.\77d);^2Fm3Ho3Ho5Kr\77W\200Ib\213F^\207" + "D[\205G`\211Kd\215Le\217Mf\220Kd\216Jc\215G`\212E\\\205BZ\204AX\202@" + "W\200@\202W\200A\7X\202AX\204BZ\205E\\\205F\\\206F^\210F`\212H\203a\212" + "J\6c\214Je\216Je\216Ke\217Ke\217Le\217M\202f\220M\10f\220Ng\220Ng\220" + "Mf\217Oh\222Oh\222Mf\217Ng\220M\204f\220M\4f\220Lf\220Ke\217Ke\217J\202" + "e\216J\4b\213Ja\212Ha\212F`\212E\203_\212F\1_\211F\202\\\206F\35^\211" + "G`\212Ja\213Ke\216Mf\217Ng\221Oi\223Pj\224Qk\226Sl\230To\232Yt\236^z" + "\244d\177\250^y\241Nh\221AX\2018Nu5Ks4Iq7Lu\77W\201:Ow7Lt8Mv9Ow;Qx;Q" + "y;Qy<\256Rz<\26Rz;Qy:Ow7Ls4Hp/Cj,\77f*`/Af\202" + "4Ip\20""9OuKd\214Pk\224G`\212D\\\206G`\212Jc\214Kd\215Ke\216Kd\216Ib" + "\213Ga\212E\\\207AX\202AW\177>T|\204>T}\4>T|@V~AW\200AX\202\202AX\203" + "\202CZ\203\1CZ\205\203C]\210\1D]\210\210H_\210\2I`\212Ia\212\206H_\210" + "\1F^\210\205C]\210\2C\\\210C[\206\202CZ\203\207AX\203\32BY\203C[\206" + "F^\210H`\211Hb\214Le\216Mg\221Oh\222Pj\223Qk\225Rl\227Qk\226Tn\230[u" + "\237b~\247c\177\247\\w\237Rl\226Ld\216Pi\222Oh\222\77U};Qy:Ow:Px;Qy\202" + ";Qz\226T|=S\204{=S\7{>T|@W\177\77V~=S{\77U}@W\177A" + "W\203\200AX\203\201AX\202\201BX\2\201BY\203BY\214\204BY\2\204AX\202A" + "X\207\201AX\1\200BX\205\201BX\16\201AX\200@W\177AW\200AX\201BX\201BY" + "\204D[\206F_\212Ib\213Ke\217Mf\217Oh\222Pi\223Qk\203\225Qk\13\225Tn\230" + "[u\236`z\245c\177\247^y\242Ng\221CZ\203@W\200\77U~=S{\265S|>\25S|=R{BX\201b|\241\200\227\267" + "}\226\267y\226\274d\201\251Kd\216F^\210Ib\214Ke\217Mf\220Lf\220Ke\217" + "Jc\214G_\210CZ\205BX\201BX\201=S{>\211S|>\13S|\77T}>S|\77T}@U~BW\200" + "CY\201@V~\77U}@V~CY\201B\216X\201B\11X\201CY\202CY\202@V\177\77U~\77" + "U~AW\200CY\202CY\202@\206U~@\37U~\77T}>S|\77T}@U~AV\177BX\201BX\202C" + "Z\204D]\210Ha\212Ic\214Le\216Ng\221Pi\222Qk\225Ql\225Rl\226Rm\227Sm\230" + "Rl\227Rm\227Qk\225Mf\220Ia\213F^\210CY\204BW\200\77T}=R{=R{>\202S|>\252" + "T|>\31S|>S|=S{S|\215>T|\23=S{CY\201c|\243\214\243\301\210" + "\241\300^y\241Kb\213Jb\214Le\216Mf\217Oh\221Ng\220Le\217Jc\215G_\210" + "DZ\205CY\201AW\177\77U}\226>T|\1@V\177\214BW\200\1>T}\224>T|\13\77U}" + "AW\200BX\200CY\202CZ\205F\\\205G_\211Kb\213Ld\216Ph\221Pi\224\202Rl\226" + "\202Un\232\10Uo\232Sm\226Qj\224Mg\220Lc\215E^\210BY\202CY\201\261>T|" + "\26=S{;Qy8Nu5Iq0Dl-@g*=c(;a(:`\35*E\0\0\0\0\17\25#(:`(;a*=d.Ah2Em5Jr" + ":OwT\203|>T\265}>T\11}=T|=T|AW\177BY\202C[\205G`\210Kb\213Mf\220" + "Oh\202\221Oh\7\221Mf\217Ic\214Ha\213D\\\206CZ\202AW\177>U\274}>U\14}" + "@V\177CY\202CY\202CZ\204D\\\210E]\211I`\212Jc\215Nf\217Nh\222Oi\223Q" + "k\202\224Qk\11\224Oi\222Mf\220Jc\215E]\210CZ\203CY\202>T}>T}\77U\253" + "~\77U\31~>U}>U}>T|>S|;Qz9Nv5Jq0Dl-@g*=c(;a(:`\35*E\0\0\0\0\17\25#(:`" + "(;a*=d.Ah2Fm6Ks:PwS|>\202T}>\224U}>\1U}\77\241U~\77\21U~>T}\77U~" + "CZ\203BZ\204F]\210Ic\215Lf\220Mh\222Ni\222Ng\221Mf\220Jc\214E]\210C[" + "\206CZ\203AX\201\77\300U~\77\2U~BX\201D\202Z\203D\17[\206F]\210H`\212" + "Jc\214Ke\216Lf\220Ng\221Mg\220Ng\221Jd\215G_\211E]\210D[\204AW\200>U" + "}\77\235U~\77\221V~\77\27U~\77U~>T|T}\203\77U~\266\77V~\17\77U~\77V" + "~D[\204D[\205G^\210Je\216Mf\217Nh\221Nh\222Me\217Jc\215F^\211D[\205C" + "Z\203BX\201\256\77V~\225\77V\177\20@W\200BY\202CZ\203D[\204E[\205E]\210" + "G_\212Ia\212Ja\213Jc\215Ja\213H_\212D]\210D[\205CZ\203AW\200\254\77V" + "\177\203@V\177\32\77V\177\77V~>U}=S{:Ow6Kr1El-@g*=c(;a(:`\35*E\0\0\0" + "\0\17\25#(:`(;a+>d.Ah2Gn7Ls;Qy=S|>U}\77V~\77V\177\77V\267\177@V\6\177" + "\77V\177CY\202E[\205F]\210Ha\214Kc\202\214Lc\5\214G`\213G]\207E[\205" + "CZ\203@V\275\177@V\212\177@W\6\177BX\201BY\201D[\203E\\\204E\\\205E\\" + "\203\207E\\\3\206E\\\204DZ\203@W\257\177@W\202\177@V\27\177\77V\177\77" + "U~=S{:Ox6Kr1El-Ag*=c(;a(:`\35*E\0\0\0\0\17\25#(:`(;a+>d.Bi2Gn7Lt;Qy=" + "S|\77V~\77\221V\177@\250W\177@\6W\177\77V\177AX\201E\\\204E\\\205E]\206" + "F\202^\211F\4^\210E\\\205E\\\204D[\203@\235W\177@\256W\200@\7W\200AX" + "\200AW\200D[\203F\\\205E\\\205AX\201A\264W\200@\27W\177\77V~=T|:Px6K" + "r1Em-Ag*=c(;a(:`\35*E\0\0\0\0\17\25#(:`(;a+>d.Bi2Gn7LtT}\77V~@W\177" + "\236@W\200\234AW\200\3@W\200BX\201D[\204\204F\\\205\3DZ\203BX\201@W\200" + "\316AW\200\203CY\202\1BX\201\252AW\200\210AX\201\202AW\200\27@W\200\77" + "V\177>T|;Px7Ks2Em-Ag+=c(;a(:`\35*E\0\0\0\0\17\25#(:`);a+>d.Bi3Go8Lt<" + "Rz\77T}@V\177@W\276\200AW\1\200@W\216\200AW\1\200AX\374\201AX\26\201" + "AW\200@W\177>T};Qy7Lt2Fm.Ag+=c(;a(:`\35*E\0\0\0\0\17\25#(:`);a+>d/Bi" + "3Ho8Mud" + "/Bi3Hp8Nu=S{\77V~AW\200\202AX\201\267BX\201\377BY\202\223BY\202\27BX" + "\201AW\200\77V~;Qz7Lt2Fm.Ah+=d(;a(:`\35*E\0\0\0\0\17\25#(:`);a+>e/Bi" + "3Hp8Nu=S{@V\177AX\201BY\202\202BY\1\202CZ\377\203CZ\310\203CZ\30\203" + "BY\202AX\201@V\177e" + "/Bi3Hp9Nv=S|@W\200AX\201BY\202C\324Z\203C\320[\204C\243[\204D\202[\204" + "C\27Z\203CZ\203BX\201@V\177e/Cj4Ip9Ov>T|@W\200BY\202\203CZ\203\205C[\204\3BZ\203=T|:Pw\205" + ":Ov\4;Qx=T|\77V\177BZ\203\236C[\204\210D[\204\7>U}):]\35+I\35*H\36,K" + "-\77dBX\201\377D[\204\213D[\204\27C[\204CZ\203@W\200=R{9Mv3Gn.Bh+>d)" + ";a(:`\35*E\0\0\0\0\17\25#(:`);b+\77e/Cj5Ip9Ow>T}AW\200CZ\203C[\207\204" + "D[\4\204\77U~\40/O\22\33""5\21\32\2043\21\32\7""3\23\34""6\27#\77\33" + "(G%4V4Hm@W\177D[\243\204D[\10\204>T|!1Q\24\36:\24\36""9\25\37;(9[BY\202" + "D\\\210\205D\\\10\205CZ\2036Kr,>b,>a-\77c5IoBY\202D\\\371\205D\\\27\205" + "D[\204CZ\203AW\200=S{9Nv3Gn.Bh+>d);a(:`\35*E\0\0\0\0\17\25#(:`);b+\77" + "e/Cj5Iq:Ow\77T}AX\201CZ\203D\203[\204D\204\\\205D\4\\\205CZ\203,>c\40" + "/P\37\204.O\37\11.O\35,L\31&D\26!=\22\34""4\16\30""0\30$A2FkBY\201D\241" + "\\\205D\3\\\205CZ\2032Gn*\202=c*\2=c6LsD\211\\\205D\10\\\205AY\201$4" + "T\20\31""1\20\31""0\20\32""2\40/N@W\200D\236\\\205D\333\\\205E\30\\\205" + "D\\\205C[\204AX\201=T|9Nv3Gn.Bi+>d);a(:`\35*E\0\0\0\0\17\25#(:`);b+\77" + "e0Cj5Iq:Ow\77U~BY\202C[\204D\\\205\210E\\\205\1""4Ho\204+>d\203,\77e" + "\202+>d\6);a\"2U\27#@\25\40;1ChCY\202\223E\\\205\216E\\\206\2DZ\2043" + "Ho\203+>e\1""7Mu\212E\\\206\2E\\\2053Gn\203&7\\\2""1DkD[\205\254E\\\206" + "\316E]\206\30E\\\205D[\204BX\201>T}9Nw3Ho.Bi+>d);a(:`\35*E\0\0\0\0\17" + "\25#(:`);b+\77e0Cj5Jq:Px\77U~CY\202D[\204E\\\205E\\\207\206E\\\2\206" + "4Hp+\77\202e+\77\16e8PyQm\231Yu\242So\232E_\2114Js,@f+\77e*>d\40/P\27" + "$A0DhD\\\205E]\206\206E]\6\206BZ\202=S|U}:Ow4Ho.Bi+>d);" + "a(:`\35*E\0\0\0\0\17\25#(:`);b+\77e0Cj5Jq:Px@V\177CZ\203E\\\205E\202" + "]\206E\206]\206F\2]\2065Ip,\202\77e,\16\77f@X\202j\207\261t\222\272x" + "\227\277~\235\305j\207\263E^\211-Ah,\77e+>d\40/P!1R\77U}F\203]\207F\14" + "]\207CZ\2037Ls#2S\31%B\24\37;\24\37:\27#\77\40.N1CiAX\201E]\206F\202" + "]\207F\21]\207E]\206AX\2010Ch\37-L\26\">\24\37;\24\37:\24\37;\30#@\35" + "*I%5W9NvE\\\206F]\207E[\2054Ip,\202\77f,\2\77f8NvF\202]\207F\40]\206" + "c,>c&6X'8],\77e,\77f+>d(9^&6X#3T#3T,>b\77U~F]\207F]" + "\207E\\\205=S{-\77c\36+J\27\">\24\37:\25\37;\31$A%4V7KrCZ\203F\203]\207" + "F\17]\207;Px'7Z#3T#3T);^9Ov5Io\40/O\26\">\24\37;\30$A(9[U}:Ow4Ho.Bi+>d);a(:`\35*" + "E\0\0\0\0\17\25#(:`);b+\77e0Cj6Jr;Px@W\177CZ\203E\\\205F]\206\210F]\207" + "\1""5Jq\203,\77f\16""3HoD[\205F]\207F^\207Kc\214b}\246j\210\264@Y\204" + "-Ah,\77f*=c\40""0Q5JrE\\\205\202F]\207\14>T|$4U\20\32""3\23\36""8\31" + "&C\35+J\35+K\33(E\25\40;\17\31""2\40/O:Px\203F]\207\20>T}\"1S\20\32""3" + "\25!;\33)F\35+K\35,K\35+J\32(D\27\"=\23\36""9*<`CZ\204F]\207E\\\2054" + "Ip\203,\77f\22""8NvF]\207F]\206d!1R\24\40:\202\22\35""6\20\35+J;QyF^\207" + "D\\\2052Gl\27#@\17\31""2\26\"=\33)F\35,K\35+J\32&C\22\35""6\20\31""3" + "&7Y\77U}\203F^\207\2""7Kr\25\40<\202\22\35""6\13\26\">\36-M\22\35""8" + "\25\40;\33)G\35+J\32'D\22\35""6\35+Jd);a(:`\35*E\0\0\0\0\17\25#(:`);b+\77e0Ck6Kr;Q" + "yAW\200D[\204E]\206F^\202\207F^\1\207G^\205\210G^\2\2106Js-@\202h-@\3" + "h4HqE\\\205G^\202\210G^+\210H`\212Vp\232Rl\2271Fo-@h-@g(9_2EkD[\204G" + "^\210@W\177#3T\26!>\"2U+=d0Dl9Ox;Qz4Ir,\77g&7[\27$B\37.O@V\177G^\210" + "E\\\206/Bg\32'F&7[,>f1En8Nwe:OwG^\210G^\210E]\2065Jr-@" + "\202h-@\16h9OwF^\207f" + "-@\202h-@\2h,\77f+=\202d*=\25d0DkCZ\204F^\2077Lr\31&D\34*J(9_,\77f0D" + "m5Kt3Hq.Ai*=c#3V\26#\77&7ZC[\204G_\210G_\210AX\201+=\202d*=\14d$5Y\33" + ")H$5X3Gp3Hr.Bj-@h(:_\32(G#4V@W\177G_\260\210G_\245\211G_\30\210F^\207" + "F]\206C[\204\77U~:Px4Hp/Cj+>d);a(:`\35*E\0\0\0\0\17\25#(:`);b,\77e0D" + "k6Kr;QyAW\200D[\204F]\206G^\210G\202_\210G\205_\211G\2_\2116Ks-\202@" + "i-\3@i4HqE]\206G\203_\211G*_\211Ia\212Le\2206Lv-@i-@i*=d0DkE]\206E]\206" + "2Fm\33)I(:`-@i3IrTo\233\177\236\310\204\245\316j\210\263V\201-Aj-@i." + "Aj;R~Sn\233Ws\240Ws\240Oj\226Ld\217@W\200$5X\37/Q+>f-@i7NxYu\242t\223" + "\276i\210\264D^\212/Cl-@i&7]\33)I7MtF^\207G`\211BZ\203-\202Ai-\15Ai+" + "\77f2GpWu\241r\221\274n\215\270Hc\2170Dn-Ai)d);b(:`\35*E\0\0\0\0\17\25#(" + ":`);b,\77e0Dk6Kr;QyAX\201D\\\205F^\207\203G_\211\206G`\211\1""6Lt\203" + "-Ai\2""4IrE^\207\205G`\211\2Ib\2135Ks\202-Ai$,@g1FmF_\210B[\203)<`&9" + "]-Ai/ClKe\222j\207\262Up\231Pi\222c\177\250So\2321Gp-Ai':`(:^AY\201G" + "_\2116Ls-Ah-Ai.BkIb\211Kd\213G_\210Ng\220Zu\237l\211\262u\223\274]x\243" + "Jc\215G`\211F^\2105Js\202-Ai\23-@i0Ek\37/P\32'G)e-Ai2GqZw\243o\215\266_{\244g\204" + "\255k\211\264\77X\203.Aj,Ah%7[,@eD\\\205G`\211CZ\203\203-Ai\14""0EnN" + "i\225o\214\265`|\245d\201\252j\207\262AZ\206-Aj-Ai':_/CjD\\\204\233G" + "`\211\271H`\212\202G`\211\27F^\207D\\\205@V\177;Py4Ip/Cj+>d);b(:`\35" + "*E\0\0\0\0\17\25#(:`)b,>b0Bh;Px.Bk-Aj,@i+=c>T|J" + "b\214@W\201/Cl-Aj);a\26#@\24\40<\32'E!0Q*;_:OwIa\213Le\217Ia\213H`\212" + "G^\2106Kt-Aj-Aj+>f!1T\32(G(:a/ClF`\214k\212\265]x\241Kc\215H`\203\212" + "H`\6\2128Nw-Aj-Aj.Bj7MuIa\203\212Ia\24\212H`\2128Mt);a.Bj.Bk6MwYs\235" + "Oh\222Ia\212Jb\213Wq\232G`\2131En.Bj+\77e.AgD\\\205Ia\212D[\204.B\202" + "j.B\15j4JsTn\231Pi\222Ia\212Ia\212Wp\232Ib\215/Dl.Bj+>d,\77dD\\\204I" + "a\324\212Ia\31\212H`\212G_\210E\\\205@W\200;Qy5Ip/Cj+>d);b(:`\35*E\0" + "\0\0\0\17\25#(:`)e.Bj.Bj" + "0Em\77U\177Jb\214@W\177/Ci.Bj.Bj+\77e\35+K\22\35""8\21\202\33""6\21\3" + "\33""6\31&E*=c.\202Bj.\35Ah@W\200Me\217Vp\233=T\177/Cl.Bj*=d!1S\33(F" + "\26\">\22\35""7\17\30""2\30%B:OvH_\211Ia\212H_\2117Lt.Bj.Bj-Ai*e.Bj/Ck9OxMe\217Ia\213Ia\212Ia\212Ld\215F]\2070Em.Bj.B" + "j0DkBY\202Ia\212D[\205.\202Bj.\3Bj6KtH`\212I\202a\212I\10a\212Jb\214" + "CZ\2041En.Bj-Ai.AhH_\211I\207a\212I\316a\213I\27a\212G_\211E]\206@W\200" + ";Qy5Iq/Cj+>d);b(:`\35*E\0\0\0\0\17\25#(:`)e%6[\33(G\40/P=S|Ia\213H_\2117Lu\203.Bk\1/Cl\202.Bk\3(:`+<`=S{\206I" + "a\213\1""9Ox\203.Bk\1""7Mv\205Ia\213\1>U~\203.Bk\2""4IrH`\212\204Ia\213" + "\1>U~\203.Bk\4""4IrF^\210Ia\213D[\205\203.Bk\2""2FoD\\\206\204Ia\213" + "\1>U\177\203.Bk\1""2Gp\226Ia\213\276Jb\213\203Ia\213\26G`\211E]\206A" + "W\200;Rz5Iq0Cj+>d);b(:`\35*E\0\0\0\0\17\25#(:`)f.Bk/Cl8NxTn\230Me\217Ld\2168Mv/Ck/Ck2HqWs\240r\221" + "\274u\224\206\276u\224\36\276j\207\262Vp\232Jb\213Me\216a|\245|\232\303" + "\200\240\312q\220\272e\203\256[v\241Ib\2166Ku/Cl-Ai$5X9NvJb\213I`\212" + "8Mu/Ck/Ck1FoC[\206;R}0Dm-@g\36,M%4WBY\202Jb\204\213Jb\2\213:Py/C\202" + "k/C\2k8NwJb\204\213Jb\3\214E\\\2053Hq/C\202k.B\2jF]\207Jb\202\213Jb\17" + "\213H`\2117Lt-Ai/Ck/Ck;QzLe\216Jb\213E\\\206/Ck/Cl/Cl-Ai@W\201Jb\202" + "\214Jb\10\214Ia\2139Nw-Ai/Cl0Dm7MwKc\215Jb\325\214Jb\27\213H`\212F]\207" + "AX\201e);b(:`\35*E\0\0\0\0\17\25#(:`)e);b(:`\35*E\0\0\0\0\17" + "\25#(:`)T|D[\204G_\210Ia\213Jb\214\210Jc\214\1""8Nw\202" + "/Dl%/Ck$5X\30%B\23\37:\21\34""6\15\26/\26#\77%7[.Ck/Dl2HpLh\223d\201" + "\253Oh\222Jc\214Oh\221Qk\2266Lv/Dl-Ai\37""0Q'9\\\77V~Ha\212Ib\213BZ\202" + "6Kq&7X\31%C,>bG`\211G`\210.Bg\40/O-@e:PwD]\205\202Ib\213\11CZ\2026Jq" + "/Dl0Dm2GpE]\206Kc\215Ia\2138Nw\2030Dm(\77V\200g\203\255_{\2509Oz0Dm+" + ">e\32'F$4WC[\204Jc\214Kc\215Kd\215\77V\2002Fo0Dm.Bj#4W$4V):\\+<_9OvI" + "a\212Vp\232D]\2071Fo0Dm*=c\35+L,>c;Qy5Ip\40""0Q#3V/Cl0Dm8NxTo\232Ng\220" + "Kc\215F]\207\2030Dm\14,\77g\36-O+>c:Pw7Ls$5W!1T/Dl0Dm5KtNg\222Ng\221" + "\324Kc\215\202Jc\214\26Ia\213G^\210BY\202e);b(:`\35*E\0\0" + "\0\0\17\25#(:`)T|D[\204G_\211Jb\213Jc\202\214Jc\1\214K" + "c\205\215Kc\2\2159Nx0D\202m0D0m+=e$4X\"1U%6[+>e.Bj0Dm0Dm7LwRn\232n\212" + "\265Ys\235Kc\215Kc\215Mf\220_z\244Oj\2264Jt0Dm(;`\30%D\21\34""7\22\35" + "8\22\35""8\21\34""7\21\34""7\25!=\40/R=R{Kc\215Kc\2159Mu\33)H\23\36""9" + "\21\34""7\21\34""7\22\35""8\22\35""9\23\37;\40""0R/Ck1EnAX\204Rl\226" + "Kc\215Ja\2139Nw0D\202m0D)m=S|Pi\223i\206\257a}\252;Q|0En*=e\33)J%5XA" + "W\201Kc\215Mf\220Qj\2267Mx0Dm0Dm);b\31&D\23\37""9\24\40:,>bH`\212Tm\227" + "a|\250@X\2041Fo0Dm$4X\25!>\21\34""8\23\36""9\35,M,@h0Dm7MwRn\232^x\242" + "Me\217Kc\215F^\2070D\202m0D\15m1Eo)T}D[\205H_\211Jb\214K\203c\215K\205d\216K\2d\2169Oy0" + "\210En0\7En5KuIe\221g\205\262x\225\277[v\237Le\217K\202d\216K!d\216T" + "n\230m\212\265Uq\2378Mx0Dm-\77g%6Y\"2S\"1S$4W):`/Ck1FoBY\203Ld\216Ld" + "\216AW\2010Dm,\77g'8]#3U\"1R\"2S'8\\.Bj1EoS}Ld\216Rk\225l\211\263Wr\2376Lv0En+>f\32'F&7ZE" + "\\\205Nf\220_{\244Oj\2278Nx1\204En1\25En\77U\177Ld\216Mf\220a{\245g\205" + "\261C[\2072Fp0Dm,\77f&7\\);`/Bk1En6LwXt\242l\212\264Qj\224Ld\216Ld\216" + "G^\2101\202En1\14En;R}Kf\2235Js'8^(:_.Bk1Eo3HrId\220j\207\262Vo\232L" + "\325d\217L\31d\217Kc\215Jb\214H_\211CZ\203=S|6Jr0Dk,\77e);b(:`\35*E\0" + "\0\0\0\17\25#(:`)T}E\\\205H`\212Jb\214Kd\216Ld\216\206Ld" + "\217\3Ph\223Up\234]x\246\205^z\250\7c\177\255n\214\271x\227\303\203\243" + "\316\202\237\310p\213\264Sk\226\205Ld\217\25Le\220Xr\234x\224\276z\231" + "\304\\w\245Le\221D\\\210BZ\206C[\207Ia\215Sm\231d\201\257x\227\304d\200" + "\254Og\223Oh\222a}\250k\211\266[v\243Mf\221E^\212\202BZ\206\35E^\211" + "Mg\222c\200\255z\231\304g\202\255Oh\222Ld\217Pi\223Vp\235]z\247^{\250" + "\\x\245Uo\233Ng\221Ld\217Qj\225m\212\264i\210\264^{\250^{\247Xs\237A" + "W\177@W\200Kd\216Sl\227v\223\275~\236\310k\211\266_|\251\202^{\250\21" + "\\x\245Sn\231Ng\222Ld\217Ng\222g\202\254|\232\305l\213\267Qm\231E^\212" + "BZ\206C[\207Jc\217]z\246v\225\301t\221\272Vp\232\203Ld\217\1G_\211\203" + "1Eo\13""9Ozi\203\256t\223\276Vr\236F_\213C[\207Ib\216b\177\255t\222\275" + "Zu\237Me\220\252Ld\217\253Le\217\202Ld\217\27Jc\214H`\212CZ\203=T|6J" + "r0Dk,\77e);b(:`\35*E\0\0\0\0\17\25#(:`)T|6Ks1Dk,\77e);b(:`\35*E\0\0\0" + "\0\17\25#(:`)T}7Ks1" + "Dk,\77f);b(:`\35*E\0\0\0\0\17\25#(;`)T}7Ks1Ek,\77f);b(:`\35*E\0\0\0\0\17\25#(;`)U}7Ks1Ek,\77f);b(:`\35*E\0\0\0\0\17\25#(;`" + ")S}F^\210Oh\223\242Pi\224\2BY\203#3W\202\31&H\3\35+" + "N\24" + "\40\4>\26#B0DkNg\222Pj\241\225Qj\10\225F^\210(9_\40""0S\40""0S\"2VAX" + "\202Pi\224Qj\250\225Qj\277\225Qk\10\225Oi\223c)<`*V\201\2035Kv\2""7Mx:Q|\205;R}\2" + ":Q}G`\212\243Qk\226\2Uo\232Tp\234\202Yv\242\3Uq\235Up\232Rl\227\225Q" + "k\226\324Rl\226\1C[\205\2033Ir\2;S}Oi\223\234Rl\226\27Qk\226Pi\224Me" + "\220H`\211AX\2008Nu2Fl,\77f)\40""0TIb\214Rm\227Ql\226G_\2110Dj" + "\34+L\23\37>\22\37<\22\37=\23\37>\33*L/DjF^\210Ql\226R\202m\227R\17m" + "\227Ib\214)U~#5Y\23\40\77\22\37=\22\36=\35,O8NuPj" + "\224R\202m\227R\27m\227Ke\217);a\37.Q\37.Q!2V8Nw:Py\35-O\22\37=\22\36" + "<\26$E*U~\37.Q\23\37>\22\37=\23\40@#4Y@W\201Ql\226R\204" + "m\227R\5m\227Lf\2209Ow\40""0S\23\40\77\22\202\37=\22\5\37=\30&G-@fF^" + "\210Rl\226S\202m\227S\35m\227Jb\214*U~$5Y\23\40@\22" + "\37=\23\36=\35,O8MuPj\224Sm\227Oh\2233Ho\"2W*=d3Is6Mx5Lw-Ah#4X\37.Q\37" + ".Q$6[Ia\214S\226m\227S\202m\227R\27l\226Qj\225Mg\221H`\212BX\2018Nv2" + "Fm-@f)f%6[\31&G-AgMg\221Sm\230To\2316Lt\37/R\35+N\34*M/BiNg\222\203Sm\230" + "\11Mf\220);a\34*M\35+N!0T>U}Tn\230G_\211%7\\\202\35+N\36\37/RBX\203R" + "l\227Sm\230Ib\214&8^\35,O\35+N\36-P-Ah\34+N\33*K(:`+\77g3GpPi\224Rl\227" + "AX\201!1T\24!A\40/S(;a+>f+\77g);b\40""0T\25!A\40""0S@W\200Rl\227\202" + "Sm\230\17Kd\216'9_\35,O\35+N\35,O&7^\32(J\33*K':`+\77f*=c\37""0S\32)" + "K=S}Qj\225\202Sm\230\2Ng\222%6\\\202\35+N\22\35-P#4Z\31(I\37.R)f" + "$6Z\31'I);a3Hr\33)L\36-P);b+\77f(:`\33*L#4YG_\212\204Sm\230\15G_\212" + ");a\24!A\35,N':_+>f+\77g)f&7]6Lw=U\2029Q}6My6My1Gp$6Z=S|Rl\227Xs\235_{\245AZ\2066My" + "5Kv.AjH_\211Tm\230Tm\230Sl\227AX\201-Ai6Lw8NzAZ\207c\177\252Wq\234Pi" + "\223;R}7M\202y7M/yMf\220Tm\230Tm\230Qj\225V\202Pj\226Vq\235Hb\216:R}5Kv$6[!1VE]\210Sm\230Tn\230Rl\226g\34+N\30\204%" + "F\30\3%G!1UE]\207T\202n\231T\2n\231E]\2107\203Nz7\36MyIc\220o\215\270" + "\177\236\307g\205\261>V\2037Nz7Nz/Cm;PzSl\227Tn\231c\200\252Ni\2268O" + "{6Mx-@i>U\177Qk\226Tn\231Qk\2269Oy0Dn7Nz:R~Rn\232a|\247Uo\232Pi\224;" + "R~7\202Nz7\"NzMf\221Tn\231Tn\231Qk\226T\177" + "$6\\2Hs7N{AZ\207i\207\263\217\255\323\225\262\327\203\242\312Sn\2349" + "P}5Kw'8`4IsPi\225Tn\232Rl\230V\203[v\243`{\246Vp\233Vp" + "\233Qk\226V\2019P|9P|:R~Sn\230" + "Yt\237Vp\233Vp\233Sm\230>V\2029\202P|9\2P|Mg\222V\202p\233V\22p\233<" + "S\1779P|9P|;T\200Qk\227Wr\235Vp\233Vp\233D]\2109P|9P|:R~Ic\220Yt\237" + "Vp\233Vp\233Lf\2219\202P|9\13P|>U\201Sm\230Vp\233Nh\223;R}9P|9P|6My(" + ";b\35,N\33\202*L\33\23*L\"2W4Ju9P|9P|8OzKd\217Vp\233Tn\231>V\2019P|9" + "P|:R~Sn\230Yt\237Vp\233Vp\233Sm\230>V\2029\202P|9\2P|Mg\222V\202p\233" + "V\2p\233Ha\2149\202P|9\3P|AY\205Tn\231V\233p\233V\30p\233Uo\232Sm\230" + "Pj\224Jb\214CZ\2039Ow2Gn-@g*V\201\2029P|\3""9Q}Oi\224" + "Wq\234\204Vp\233\2Qj\225=T\200\2039P|\1Qk\226\204Vp\233\1Rl\227\2039" + "P|\5V\202\2039P|\1Lf\221\203Vq\234\2Sm\230>" + "V\201\2039Q}\1Nh\223\203Vq\234\1V\202Sn\231Vq\234Sn" + "\231@X\204\2029Q}\3:R~AZ\207Ga\215\203Gb\216\2Hb\216Hc\217\202Hc\220" + "\5Hc\217To\232Vq\234To\232>W\202\2039Q}\1Lf\221\203Vq\234\2Sm\230>V\202" + "\2039Q}\1Nh\223\203Vq\234\1Hb\215\2039Q}\2AZ\206To\232\234Vq\234\30U" + "o\233Tn\231Pj\225Kc\215CZ\203:Ow3Gn-@g*V\2029Q\202}9Q\2}Mg" + "\222Vq\204\234Vq\24\234Wq\235B\\\2109Q}9Q}7NzIa\214Tn\231Vq\234Vq\234" + "Tn\231G`\2136Ny9Q}9Q}B[\207Vq\235Vq\234To\232>W\2029Q\202}9Q\2}Lf\221" + "Vq\202\234Vq\3\234Sm\230>V\2029Q\202}9Q\2}Nh\223Vq\202\234Vq\6\234V" + "\202:Q\202}:Q\2}Nh\223Wq\202\234Wq\2\234Ib\215:Q\202}:Q\3}BZ\206Uo\232" + "Wq\221\234Wq\1\234Wr\207\235Wr\32\235Wq\234Wq\234Vp\233Tn\231Qk\225K" + "c\216C[\204:Pw3Gn-@g*V\201:\202Q}:\6Q}Pj\225Wq\234Wq\234Tn\231\77W\202:\202Q}:\2Q}" + "Ng\223W\204q\234W\24q\234_{\245Lg\223;S\177:R~5Lw3HrLf\221Wr\235Wr\235" + "Le\2203Hq5Lw:R~;S\177Kf\222_|\246Wr\235Up\233\77X\204:\202R~:\2R~Mg\222" + "W\202r\235W\3r\235Tn\231\77W\203:\202R~:\2R~Oi\224W\202r\235W\6r\235" + "=U\201:R~:R~;S\177Lf\222W\202r\235W\2r\235E_\212:\202R~:\2R~E^\212W\202" + "r\235W\2r\235Nh\223:\202R~:\14R~\77W\203To\232Wr\235\\x\242Rn\232=V\203" + ":R~7NzV\202\203:R~\1Pj\225\202Wr\235" + "\2To\232\77W\203\203:R~\1Nh\223\205Wr\235\23_z\245`|\250B[\211:R~7O{" + "':a'9a9Nx9Oy'9`&9a7O{:R~B[\210_{\247_{\245Wr\235Up\233\77X\204\203:R" + "~\1Mg\222\203Wr\235\2Tn\231\77W\203\203:R~\1Oi\224\203Wr\235\1=U\201" + "\202:R~\2;S\177Lf\222\203Wr\235\1E_\212\203:R~\1E^\212\203Wr\235\1Nh" + "\223\203:R~\26\77X\204To\232Wr\235[w\241e\202\255E`\215;S\1779P|)X\205Zv\243c~\251Xs\236Wr\202\235Wr\3\235Sn" + "\231>W\203:S\202\177:S\6\177Qk\226Xs\236Xs\236Up\233\77X\204:S\202\177" + ":S\2\177Oi\224Xs\204\236Xs\24\236[v\241p\215\267^{\250@Z\207:S\1775K" + "v#5[\26$G\26$G#6\\5Lx:S\177@Y\206]z\247p\216\267\\w\242Xs\236Vq\234\77" + "Y\205:S\202\177:S\2\177Mh\223Xs\202\236Xs\3\236To\232\77X\204:S\202\177" + ":S\2\177Pj\226Xs\202\236Xs\6\236=V\203:S\177:S\177;T\200Mg\223Xs\202" + "\236Xs\2\236F`\214:S\202\177:S\2\177E_\213Xs\202\236Xs\2\236Ni\224:S" + "\202\177:S\27\177\77X\205Up\234Xs\236Yu\240l\210\261g\205\261D^\214:" + "S\1775My$6\\\24!D\21\35=\21\34=\22\36\77\27%G\40""1V-BkGa\215Xs\236X" + "s\236Vq\234\77Y\205:S\202\177:S\2\177Mg\223Xs\202\236Xs\3\236To\233\77" + "X\205:S\202\177:S\17\177Pj\226Xs\236Xs\236Zu\240b}\251Ic\222:S\200:S" + "\1776Nz(X\205" + "Rm\231Xs\237Xs\237Vq\235C\\\211\77X\206\77Y\206>X\205Pk\227X\205s\237" + "X\27s\237a}\250}\233\304i\207\263Hc\220=W\2049Q~5Mx5Lx9Q~=V\204Gb\217" + "g\205\262}\233\304b~\251Xs\237Xs\237Wr\236C]\212\77X\206\77Y\206>X\206" + "Oj\226X\202s\237X\13s\237Up\234B\\\211\77X\206\77Y\206>X\206Ql\230Xs" + "\237Xs\237Yt\240A[\210\77\202Y\206\77\2Y\206Oi\226X\202s\237X\2s\237" + "Hc\217\77\202Y\206\77#Y\206Hb\217Xt\237Xs\237Xs\237Pk\227>X\206\77Y\206" + "\77Y\206C]\212Vq\235Xs\237Xs\237]x\244z\230\300u\225\277Qm\233@Y\207" + "9Q~4Kv2Is2Hr3Jt7O{\77Y\206Ga\216Sn\232Yu\240Xs\237Wr\236C]\212\77Y\206" + "\77Y\206>X\206Oj\226X\202s\237X\7s\237Up\234B\\\211\77Y\206\77Y\206>" + "X\206Ql\230X\202s\237X\6s\237i\205\260q\220\273Qn\233D^\213\77Y\207\77" + "\202Y\206\77\2Y\206Ic\217X\231s\237X\27s\236Vq\234Sm\230Le\217E\\\205" + ";Px3Go-Ag*T|G^\207Nh\222Tm\231" + "Vq\234Xs\236\203Xs\237\204Xt\237\3]x\244j\210\263x\227\300\211z\231\302" + "\13x\227\300j\210\262]x\244Xt\237[w\242i\206\261v\225\277z\231\302y\230" + "\301k\211\264]z\244\202Xt\237\7[w\242j\210\262w\226\300z\231\302x\227" + "\300k\210\263\\x\243\204Xt\237\3Zv\241o\215\265x\230\302\203z\231\302" + "\2z\231\303j\206\261\205Xt\237\2a~\250o\216\270\202z\231\302\12t\222" + "\275c\201\253Yu\240Xt\237`|\250o\215\267y\230\302z\231\302u\224\276f" + "\203\256\207Xt\237\5f\203\255\204\243\311\212\253\321t\224\275`\177\253" + "\202Xu\242\5a\177\253s\221\273\210\250\317\206\244\313g\203\256\203Y" + "t\240\6`{\250o\214\267y\230\301z\231\302v\224\277h\204\260\203Yt\240" + "\6b}\251p\215\270z\230\302z\231\302u\223\276f\203\256\202Yt\240\2`{\247" + "n\214\270\202z\231\302\13v\224\276f\202\256Zu\241Yt\240\\w\243i\206\262" + "z\231\302z\232\302x\227\300j\210\263]y\244\202Yt\240\6g\204\257u\225" + "\276z\232\302z\231\302o\215\270a}\250\203Yt\240\25a}\250}\232\302\220" + "\257\325{\232\303h\207\261\\z\247Xu\243Yv\244b\200\253o\215\267~\235" + "\305\220\257\325y\226\277]x\244Yt\240`|\247o\214\267y\231\301z\232\302" + "v\225\277h\205\260\203Yt\240\6a}\251p\216\270z\231\302z\232\302u\224" + "\276f\203\256\203Yt\240\5^y\245x\226\276\222\262\327\210\250\317|\233" + "\304\202z\232\302\3x\227\300k\210\263\\x\243\227Yt\240\30Xt\237Xs\237" + "Wq\234Sm\230Mf\220E]\206;Px4Go-Ag*T|G^\210Oi\223Tn\231Wr\235Xs\202\237Xt\1\237Yt\204\240Yt\4\240\\" + "x\243r\216\267\201\236\305\203\240\210\306\203\240\25\306\202\236\305" + "r\216\267\\x\243Yt\240[v\242n\212\264\200\235\304\203\240\306\202\237" + "\305s\217\270^y\244Yt\240Yt\240\\v\242q\215\266\201\236\304\203\240\306" + "\201\236\305r\216\267]w\243Yt\204\240Yt\10\240`{\247z\226\276\203\240" + "\306\203\240\306\202\237\305u\221\272_z\246Yt\204\240Yt\17\240b~\251" + "y\225\276\203\240\306\203\240\306~\233\302f\201\254Zu\241Yt\240a}\250" + "x\225\275\203\237\305\203\240\306\177\234\303i\205\260Yt\207\240Yt\13" + "\240^y\245o\213\265\207\243\311\221\256\323\222\260\324\222\260\324\222" + "\256\323\211\245\313r\216\267_z\245Zt\203\240Yt\7\240`{\247x\224\274" + "\203\237\305\203\240\306\200\234\303k\206\261Yt\202\240Yt\40\240b}\250" + "y\225\275\203\237\306\203\240\306\177\234\303i\204\257Yt\240Yt\240_z" + "\246y\225\275\203\240\306\203\240\306\177\234\303j\205\260[v\241Yt\240" + "\\w\243p\214\266\203\237\306\203\240\306\202\236\305r\216\267\\x\243" + "Yt\240Yt\240j\205\260\200\234\303\203\240\306\203\237\305x\224\275a|" + "\250Zt\203\240Zt\25\240\\v\242h\202\255\202\236\304\224\257\321\223\257" + "\324\223\260\324\223\257\324\224\257\323\217\252\316\177\233\302j\206" + "\260]x\243Zt\240Zt\240`{\247x\224\274\203\237\305\203\240\306\200\234" + "\303l\206\261Zt\202\240Zt\7\240b}\250z\225\275\203\237\306\203\240\306" + "\177\234\303i\204\257Zt\203\240Zt\12\240[v\242e\200\253u\221\271\202" + "\236\304\203\240\306\203\240\306\202\236\304r\215\266\\w\243Zt\226\240" + "Zt\31\240Yt\240Xs\237Wr\235Sn\230Nf\220F]\206d);a(:`\35*E\0\0\0\0\17\25#(:`(;a*=d-@g1" + "El5Iq8Mu:Pxd,\77f-@f-\377@g-\316@g-\14@g,@f,\77e+>d)>>\0\0\0\236\236\236\377\377\377\256\256\256\0\356\0\0\0\37\14\14\14" + "\306\306\306\334\334\334HHH\34\34\34***'''\251\251\251\370\370\370\326" + "\326\326\227\227\227MMM\277\277\277\316\316\316\304\304\304iii\1\1\1" + "\206\206\206\236\236\236\177\177\177\227\227\227\247\247\247\370\370" + "\370\327\327\327\233\233\233\\\\\\\250\250\250---777\256\256\256\217" + "\217\217\202\302\302\302\10""444\0\0\0UUU\301\301\301\304\304\304\261" + "\261\261\226\226\226\16\16\16\202\0\0\0\21\7\7\7\254\254\254\370\370" + "\370\324\324\324\222\222\222\205\205\205\350\350\350\237\237\237\321" + "\321\321\250\250\250\32\32\32\10\10\10XXX\275\275\275\312\312\312\234" + "\234\234\"\"\"\203\0\0\0)555\345\345\345\227\227\227\16\16\16OOO\351" + "\351\351\257\257\257\11\11\11\27\27\27\226\226\226\304\304\304\305\305" + "\305hhh\7\7\7]]]\273\273\273\311\311\311\262\262\262'''\265\265\265\314" + "\314\314\37\37\37\203\203\203\232\232\232\201\201\201\363\363\363\352" + "\352\352\271\271\271(((ccc\312\312\312\322\322\322\223\223\223\37\37" + "\37\0\0\0\220\220\220\242\242\242\247\247\247\322\322\322ttt\13\13\13" + "\203\0\0\0+888\346\346\346\371\371\371\245\245\245333\344\344\344\372" + "\372\372\256\256\256\3\3\3\231\231\231\311\311\311\320\320\320\243\243" + "\243)))...\257\257\257\217\217\217\275\275\275\305\305\305\77\77\77\0" + "\0\0\207\207\207\307\307\307\320\320\320\260\260\260333\12\12\12lll\315" + "\315\315\275\275\275\263\263\263\177\177\177\0\0\0,,,\240\240\240\306" + "\306\306\303\303\303LLL\16\16\16\251\251\251\215\215\215\214\214\214" + "mmm\313\0\0\0=\0\4\4\4\237\237\237\373\373\373\335\335\335\275\275\275" "sss\22\22\22sss\355\355\355\233\233\233FFF:::YYYOOO\274\274\274\345\345" "\345\26\26\26\271\271\271\362\362\362\277\277\277\233\233\233ppp\355" "\355\355\236\236\236HHHwww\342\342\342<<>>\344\344\344zzz\16\16\16ttt\342\342\342<<>>777\40\40\40(((\6\6\6\37\37" - "\37###\2\2\2\0\0\0\2\2\2\36\36\36@@@...\25\25\25'''\12\12\12\15\15\15" - "(((\17\17\17\4\4\4###\35\35\35\0\0\0GGGVVV^^^\333\333\333\255\255\255" - "\14\14\14\0\202\0\0\0\21\0\0\2\2\2!!!@@@***\27\27\27&&&\11\11\11\12\12" - "\12'''\23\23\23\0\0\0\20\20\20""222HHH777\25\25\25\0\202\0\0\0)\0\0\11" - "\11\11'''+++***\"\"\"\14\14\14\0\0\0\0\0\0\2\2\2\40\40\40>>>FFF)))\15" - "\15\15***GGG@@@\37\37\37\1\1\1\37\37\37###\3\3\3\27\27\27***\16\16\16" - "\23\23\23""999:::\11\11\11\24\24\24\77\77\77III\"\"\"\4\4\4\0\0\0\306" - "\306\306\315\315\315999666\17\17\17\0\203\0\0\0*\0\0\12\12\12'''\24\24" - "\24\0\0\0\0\0\0\6\6\6%%%\36\36\36\1\1\1)))CCC$$$(((\31\31\31\13\13\13" - ")))\21\21\21\3\3\3\"\"\"\40\40\40\0\0\0###DDD'''&&&\35\35\35\15\15\15" - "OOOSSSddd\370\370\370\207\207\207\0\0\0\6\6\6###CCCDDD!!!\7\7\7(((\32" - "\32\32\0\247\0\0\0\1\0\0\345\310\0\0\0\6\223\223\223\342\342\342\345" - "\345\345\276\276\276===\1\1\1\271\0\0\0\3\261\261\261\262\262\262\6\6" - "\6\240\0\0\0\6\24\24\24\254\254\254\343\343\343\344\344\344\250\250\250" - "&&&\261\0\0\0\1\345\0\0\307\0\0\0\6\0\12\12\12\22\22\22\22\22\22\14\14" - "\14\1\1\1\0\0\271\0\0\0\3\0\16\16\16\16\16\16\0\0\240\0\0\0\7\0\1\1\1" - "\14\14\14\23\23\23\22\22\22\11\11\11\1\1\1\0\0\260\0\0\0\1\0\345\0\377" - "\0\0\0\341\0\0\0\1\0\0\345"}; + "\312\312\312...\351\351\351\345\345\345\271\271\271ooo\0\0\313\0\0\0" + ")\0\0\13\13\13fff\245\245\245\324\324\324\374\374\374\200\200\200CCC" + "\345\345\345hhh\2\2\2BBB\274\274\274\313\313\313\343\343\343\355\355" + "\355###\271\271\271\313\313\313\17\17\17\0\0\0\77\77\77\344\344\344l" + "ll\0\0\0ttt\342\342\342<<>>\344\344\344zzz\16\16\16ttt\342" + "\342\342<<>>777\40\40\40(((\6\6\6\37" + "\37\37###\2\2\2\0\0\0\2\2\2\36\36\36@@@...\25\25\25'''\12\12\12\15\15" + "\15(((\17\17\17\4\4\4###\35\35\35\0\0\0GGGVVV^^^\333\333\333\255\255" + "\255\14\14\14\0\202\0\0\0\21\0\0\2\2\2!!!@@@***\27\27\27&&&\11\11\11" + "\12\12\12'''\23\23\23\0\0\0\20\20\20""222HHH777\25\25\25\0\202\0\0\0" + ")\0\0\11\11\11'''+++***\"\"\"\14\14\14\0\0\0\0\0\0\2\2\2\40\40\40>>>" + "FFF)))\15\15\15***GGG@@@\37\37\37\1\1\1\37\37\37###\3\3\3\27\27\27**" + "*\16\16\16\23\23\23""999:::\11\11\11\24\24\24\77\77\77III\"\"\"\4\4\4" + "\0\0\0\306\306\306\315\315\315999666\17\17\17\0\203\0\0\0*\0\0\12\12" + "\12'''\24\24\24\0\0\0\0\0\0\6\6\6%%%\36\36\36\1\1\1)))CCC$$$(((\31\31" + "\31\13\13\13)))\21\21\21\3\3\3\"\"\"\40\40\40\0\0\0###DDD'''&&&\35\35" + "\35\15\15\15OOOSSSddd\370\370\370\207\207\207\0\0\0\6\6\6###CCCDDD!!" + "!\7\7\7(((\32\32\32\0\360\0\0\0\6\223\223\223\342\342\342\345\345\345" + "\276\276\276===\1\1\1\271\0\0\0\3\261\261\261\262\262\262\6\6\6\240\0" + "\0\0\6\24\24\24\254\254\254\343\343\343\344\344\344\250\250\250&&&\371" + "\0\0\0\6\0\12\12\12\22\22\22\22\22\22\14\14\14\1\1\1\0\0\271\0\0\0\3" + "\0\16\16\16\16\16\16\0\0\240\0\0\0\7\0\1\1\1\14\14\14\23\23\23\22\22" + "\22\11\11\11\1\1\1\0\0\377\0\0\0\377\0\0\0\224\0\0\0"}; diff -Nru xfce4-session-4.10.0/icons/128x128/Makefile.in xfce4-session-4.10.1/icons/128x128/Makefile.in --- xfce4-session-4.10.0/icons/128x128/Makefile.in 2012-04-28 20:43:33.000000000 +0000 +++ xfce4-session-4.10.1/icons/128x128/Makefile.in 2013-05-05 15:33:59.000000000 +0000 @@ -1,9 +1,8 @@ -# Makefile.in generated by automake 1.11.5 from Makefile.am. +# Makefile.in generated by automake 1.13.1 from Makefile.am. # @configure_input@ -# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software -# Foundation, Inc. +# Copyright (C) 1994-2012 Free Software Foundation, Inc. + # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -52,21 +51,27 @@ build_triplet = @build@ host_triplet = @host@ subdir = icons/128x128 -DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in +DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -am__aclocal_m4_deps = $(top_srcdir)/configure.in +am__aclocal_m4_deps = $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) -mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs +mkinstalldirs = $(install_sh) -d CONFIG_HEADER = $(top_builddir)/config.h CONFIG_CLEAN_FILES = CONFIG_CLEAN_VPATH_FILES = +AM_V_P = $(am__v_P_@AM_V@) +am__v_P_ = $(am__v_P_@AM_DEFAULT_V@) +am__v_P_0 = false +am__v_P_1 = : AM_V_GEN = $(am__v_GEN_@AM_V@) am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) -am__v_GEN_0 = @echo " GEN " $@; +am__v_GEN_0 = @echo " GEN " $@; +am__v_GEN_1 = AM_V_at = $(am__v_at_@AM_V@) am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) am__v_at_0 = @ +am__v_at_1 = SOURCES = DIST_SOURCES = am__can_run_installinfo = \ @@ -103,6 +108,7 @@ } am__installdirs = "$(DESTDIR)$(iconsdir)" DATA = $(icons_DATA) +am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP) DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) ACLOCAL = @ACLOCAL@ ALL_LINGUAS = @ALL_LINGUAS@ @@ -148,10 +154,6 @@ GMODULE_VERSION = @GMODULE_VERSION@ GMOFILES = @GMOFILES@ GMSGFMT = @GMSGFMT@ -GNOME_KEYRING_CFLAGS = @GNOME_KEYRING_CFLAGS@ -GNOME_KEYRING_LIBS = @GNOME_KEYRING_LIBS@ -GNOME_KEYRING_REQUIRED_VERSION = @GNOME_KEYRING_REQUIRED_VERSION@ -GNOME_KEYRING_VERSION = @GNOME_KEYRING_VERSION@ GREP = @GREP@ GTK_CFLAGS = @GTK_CFLAGS@ GTK_LIBS = @GTK_LIBS@ @@ -236,6 +238,10 @@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ STRIP = @STRIP@ +SYSTEMD_CFLAGS = @SYSTEMD_CFLAGS@ +SYSTEMD_LIBS = @SYSTEMD_LIBS@ +SYSTEMD_REQUIRED_VERSION = @SYSTEMD_REQUIRED_VERSION@ +SYSTEMD_VERSION = @SYSTEMD_VERSION@ USE_NLS = @USE_NLS@ VERSION = @VERSION@ XFCE_GLADE_CATALOG_PATH = @XFCE_GLADE_CATALOG_PATH@ @@ -372,11 +378,11 @@ @list='$(icons_DATA)'; test -n "$(iconsdir)" || list=; \ files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \ dir='$(DESTDIR)$(iconsdir)'; $(am__uninstall_files_from_dir) -tags: TAGS -TAGS: +tags TAGS: + +ctags CTAGS: -ctags: CTAGS -CTAGS: +cscope cscopelist: distdir: $(DISTFILES) @@ -515,16 +521,16 @@ .MAKE: install-am install-strip .PHONY: all all-am check check-am clean clean-generic clean-libtool \ - distclean distclean-generic distclean-libtool distdir dvi \ - dvi-am html html-am info info-am install install-am \ - install-data install-data-am install-dvi install-dvi-am \ - install-exec install-exec-am install-html install-html-am \ - install-iconsDATA install-info install-info-am install-man \ - install-pdf install-pdf-am install-ps install-ps-am \ - install-strip installcheck installcheck-am installdirs \ - maintainer-clean maintainer-clean-generic mostlyclean \ - mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ - uninstall uninstall-am uninstall-iconsDATA + cscopelist-am ctags-am distclean distclean-generic \ + distclean-libtool distdir dvi dvi-am html html-am info info-am \ + install install-am install-data install-data-am install-dvi \ + install-dvi-am install-exec install-exec-am install-html \ + install-html-am install-iconsDATA install-info install-info-am \ + install-man install-pdf install-pdf-am install-ps \ + install-ps-am install-strip installcheck installcheck-am \ + installdirs maintainer-clean maintainer-clean-generic \ + mostlyclean mostlyclean-generic mostlyclean-libtool pdf pdf-am \ + ps ps-am tags-am uninstall uninstall-am uninstall-iconsDATA # Tell versions [3.59,3.63) of GNU make to not export all variables. diff -Nru xfce4-session-4.10.0/icons/48x48/Makefile.in xfce4-session-4.10.1/icons/48x48/Makefile.in --- xfce4-session-4.10.0/icons/48x48/Makefile.in 2012-04-28 20:43:33.000000000 +0000 +++ xfce4-session-4.10.1/icons/48x48/Makefile.in 2013-05-05 15:33:59.000000000 +0000 @@ -1,9 +1,8 @@ -# Makefile.in generated by automake 1.11.5 from Makefile.am. +# Makefile.in generated by automake 1.13.1 from Makefile.am. # @configure_input@ -# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software -# Foundation, Inc. +# Copyright (C) 1994-2012 Free Software Foundation, Inc. + # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -52,21 +51,27 @@ build_triplet = @build@ host_triplet = @host@ subdir = icons/48x48 -DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in +DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -am__aclocal_m4_deps = $(top_srcdir)/configure.in +am__aclocal_m4_deps = $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) -mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs +mkinstalldirs = $(install_sh) -d CONFIG_HEADER = $(top_builddir)/config.h CONFIG_CLEAN_FILES = CONFIG_CLEAN_VPATH_FILES = +AM_V_P = $(am__v_P_@AM_V@) +am__v_P_ = $(am__v_P_@AM_DEFAULT_V@) +am__v_P_0 = false +am__v_P_1 = : AM_V_GEN = $(am__v_GEN_@AM_V@) am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) -am__v_GEN_0 = @echo " GEN " $@; +am__v_GEN_0 = @echo " GEN " $@; +am__v_GEN_1 = AM_V_at = $(am__v_at_@AM_V@) am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) am__v_at_0 = @ +am__v_at_1 = SOURCES = DIST_SOURCES = am__can_run_installinfo = \ @@ -103,6 +108,7 @@ } am__installdirs = "$(DESTDIR)$(iconsdir)" DATA = $(icons_DATA) +am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP) DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) ACLOCAL = @ACLOCAL@ ALL_LINGUAS = @ALL_LINGUAS@ @@ -148,10 +154,6 @@ GMODULE_VERSION = @GMODULE_VERSION@ GMOFILES = @GMOFILES@ GMSGFMT = @GMSGFMT@ -GNOME_KEYRING_CFLAGS = @GNOME_KEYRING_CFLAGS@ -GNOME_KEYRING_LIBS = @GNOME_KEYRING_LIBS@ -GNOME_KEYRING_REQUIRED_VERSION = @GNOME_KEYRING_REQUIRED_VERSION@ -GNOME_KEYRING_VERSION = @GNOME_KEYRING_VERSION@ GREP = @GREP@ GTK_CFLAGS = @GTK_CFLAGS@ GTK_LIBS = @GTK_LIBS@ @@ -236,6 +238,10 @@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ STRIP = @STRIP@ +SYSTEMD_CFLAGS = @SYSTEMD_CFLAGS@ +SYSTEMD_LIBS = @SYSTEMD_LIBS@ +SYSTEMD_REQUIRED_VERSION = @SYSTEMD_REQUIRED_VERSION@ +SYSTEMD_VERSION = @SYSTEMD_VERSION@ USE_NLS = @USE_NLS@ VERSION = @VERSION@ XFCE_GLADE_CATALOG_PATH = @XFCE_GLADE_CATALOG_PATH@ @@ -378,11 +384,11 @@ @list='$(icons_DATA)'; test -n "$(iconsdir)" || list=; \ files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \ dir='$(DESTDIR)$(iconsdir)'; $(am__uninstall_files_from_dir) -tags: TAGS -TAGS: +tags TAGS: + +ctags CTAGS: -ctags: CTAGS -CTAGS: +cscope cscopelist: distdir: $(DISTFILES) @@ -521,16 +527,16 @@ .MAKE: install-am install-strip .PHONY: all all-am check check-am clean clean-generic clean-libtool \ - distclean distclean-generic distclean-libtool distdir dvi \ - dvi-am html html-am info info-am install install-am \ - install-data install-data-am install-dvi install-dvi-am \ - install-exec install-exec-am install-html install-html-am \ - install-iconsDATA install-info install-info-am install-man \ - install-pdf install-pdf-am install-ps install-ps-am \ - install-strip installcheck installcheck-am installdirs \ - maintainer-clean maintainer-clean-generic mostlyclean \ - mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ - uninstall uninstall-am uninstall-iconsDATA + cscopelist-am ctags-am distclean distclean-generic \ + distclean-libtool distdir dvi dvi-am html html-am info info-am \ + install install-am install-data install-data-am install-dvi \ + install-dvi-am install-exec install-exec-am install-html \ + install-html-am install-iconsDATA install-info install-info-am \ + install-man install-pdf install-pdf-am install-ps \ + install-ps-am install-strip installcheck installcheck-am \ + installdirs maintainer-clean maintainer-clean-generic \ + mostlyclean mostlyclean-generic mostlyclean-libtool pdf pdf-am \ + ps ps-am tags-am uninstall uninstall-am uninstall-iconsDATA # Tell versions [3.59,3.63) of GNU make to not export all variables. diff -Nru xfce4-session-4.10.0/icons/Makefile.in xfce4-session-4.10.1/icons/Makefile.in --- xfce4-session-4.10.0/icons/Makefile.in 2012-04-28 20:43:33.000000000 +0000 +++ xfce4-session-4.10.1/icons/Makefile.in 2013-05-05 15:33:59.000000000 +0000 @@ -1,9 +1,8 @@ -# Makefile.in generated by automake 1.11.5 from Makefile.am. +# Makefile.in generated by automake 1.13.1 from Makefile.am. # @configure_input@ -# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software -# Foundation, Inc. +# Copyright (C) 1994-2012 Free Software Foundation, Inc. + # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -53,30 +52,37 @@ build_triplet = @build@ host_triplet = @host@ subdir = icons -DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in +DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -am__aclocal_m4_deps = $(top_srcdir)/configure.in +am__aclocal_m4_deps = $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) -mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs +mkinstalldirs = $(install_sh) -d CONFIG_HEADER = $(top_builddir)/config.h CONFIG_CLEAN_FILES = CONFIG_CLEAN_VPATH_FILES = +AM_V_P = $(am__v_P_@AM_V@) +am__v_P_ = $(am__v_P_@AM_DEFAULT_V@) +am__v_P_0 = false +am__v_P_1 = : AM_V_GEN = $(am__v_GEN_@AM_V@) am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) -am__v_GEN_0 = @echo " GEN " $@; +am__v_GEN_0 = @echo " GEN " $@; +am__v_GEN_1 = AM_V_at = $(am__v_at_@AM_V@) am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) am__v_at_0 = @ +am__v_at_1 = SOURCES = DIST_SOURCES = -RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \ - html-recursive info-recursive install-data-recursive \ - install-dvi-recursive install-exec-recursive \ - install-html-recursive install-info-recursive \ - install-pdf-recursive install-ps-recursive install-recursive \ - installcheck-recursive installdirs-recursive pdf-recursive \ - ps-recursive uninstall-recursive +RECURSIVE_TARGETS = all-recursive check-recursive cscopelist-recursive \ + ctags-recursive dvi-recursive html-recursive info-recursive \ + install-data-recursive install-dvi-recursive \ + install-exec-recursive install-html-recursive \ + install-info-recursive install-pdf-recursive \ + install-ps-recursive install-recursive installcheck-recursive \ + installdirs-recursive pdf-recursive ps-recursive \ + tags-recursive uninstall-recursive am__can_run_installinfo = \ case $$AM_UPDATE_INFO_DIR in \ n|no|NO) false;; \ @@ -84,9 +90,29 @@ esac RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive \ distclean-recursive maintainer-clean-recursive -AM_RECURSIVE_TARGETS = $(RECURSIVE_TARGETS:-recursive=) \ - $(RECURSIVE_CLEAN_TARGETS:-recursive=) tags TAGS ctags CTAGS \ +am__recursive_targets = \ + $(RECURSIVE_TARGETS) \ + $(RECURSIVE_CLEAN_TARGETS) \ + $(am__extra_recursive_targets) +AM_RECURSIVE_TARGETS = $(am__recursive_targets:-recursive=) TAGS CTAGS \ distdir +am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP) +# Read a list of newline-separated strings from the standard input, +# and print each of them once, without duplicates. Input order is +# *not* preserved. +am__uniquify_input = $(AWK) '\ + BEGIN { nonempty = 0; } \ + { items[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in items) print i; }; } \ +' +# Make sure the list of sources is unique. This is necessary because, +# e.g., the same source file might be shared among _SOURCES variables +# for different programs/libraries. +am__define_uniq_tagged_files = \ + list='$(am__tagged_files)'; \ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | $(am__uniquify_input)` ETAGS = etags CTAGS = ctags DIST_SUBDIRS = $(SUBDIRS) @@ -160,10 +186,6 @@ GMODULE_VERSION = @GMODULE_VERSION@ GMOFILES = @GMOFILES@ GMSGFMT = @GMSGFMT@ -GNOME_KEYRING_CFLAGS = @GNOME_KEYRING_CFLAGS@ -GNOME_KEYRING_LIBS = @GNOME_KEYRING_LIBS@ -GNOME_KEYRING_REQUIRED_VERSION = @GNOME_KEYRING_REQUIRED_VERSION@ -GNOME_KEYRING_VERSION = @GNOME_KEYRING_VERSION@ GREP = @GREP@ GTK_CFLAGS = @GTK_CFLAGS@ GTK_LIBS = @GTK_LIBS@ @@ -248,6 +270,10 @@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ STRIP = @STRIP@ +SYSTEMD_CFLAGS = @SYSTEMD_CFLAGS@ +SYSTEMD_LIBS = @SYSTEMD_LIBS@ +SYSTEMD_REQUIRED_VERSION = @SYSTEMD_REQUIRED_VERSION@ +SYSTEMD_VERSION = @SYSTEMD_VERSION@ USE_NLS = @USE_NLS@ VERSION = @VERSION@ XFCE_GLADE_CATALOG_PATH = @XFCE_GLADE_CATALOG_PATH@ @@ -366,12 +392,12 @@ -rm -rf .libs _libs # This directory's subdirectories are mostly independent; you can cd -# into them and run `make' without going through this Makefile. -# To change the values of `make' variables: instead of editing Makefiles, -# (1) if the variable is set in `config.status', edit `config.status' -# (which will cause the Makefiles to be regenerated when you run `make'); -# (2) otherwise, pass the desired values on the `make' command line. -$(RECURSIVE_TARGETS): +# into them and run 'make' without going through this Makefile. +# To change the values of 'make' variables: instead of editing Makefiles, +# (1) if the variable is set in 'config.status', edit 'config.status' +# (which will cause the Makefiles to be regenerated when you run 'make'); +# (2) otherwise, pass the desired values on the 'make' command line. +$(am__recursive_targets): @fail= failcom='exit 1'; \ for f in x $$MAKEFLAGS; do \ case $$f in \ @@ -381,7 +407,11 @@ done; \ dot_seen=no; \ target=`echo $@ | sed s/-recursive//`; \ - list='$(SUBDIRS)'; for subdir in $$list; do \ + case "$@" in \ + distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \ + *) list='$(SUBDIRS)' ;; \ + esac; \ + for subdir in $$list; do \ echo "Making $$target in $$subdir"; \ if test "$$subdir" = "."; then \ dot_seen=yes; \ @@ -396,57 +426,12 @@ $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \ fi; test -z "$$fail" -$(RECURSIVE_CLEAN_TARGETS): - @fail= failcom='exit 1'; \ - for f in x $$MAKEFLAGS; do \ - case $$f in \ - *=* | --[!k]*);; \ - *k*) failcom='fail=yes';; \ - esac; \ - done; \ - dot_seen=no; \ - case "$@" in \ - distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \ - *) list='$(SUBDIRS)' ;; \ - esac; \ - rev=''; for subdir in $$list; do \ - if test "$$subdir" = "."; then :; else \ - rev="$$subdir $$rev"; \ - fi; \ - done; \ - rev="$$rev ."; \ - target=`echo $@ | sed s/-recursive//`; \ - for subdir in $$rev; do \ - echo "Making $$target in $$subdir"; \ - if test "$$subdir" = "."; then \ - local_target="$$target-am"; \ - else \ - local_target="$$target"; \ - fi; \ - ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \ - || eval $$failcom; \ - done && test -z "$$fail" -tags-recursive: - list='$(SUBDIRS)'; for subdir in $$list; do \ - test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \ - done -ctags-recursive: - list='$(SUBDIRS)'; for subdir in $$list; do \ - test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \ - done +ID: $(am__tagged_files) + $(am__define_uniq_tagged_files); mkid -fID $$unique +tags: tags-recursive +TAGS: tags -ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ - mkid -fID $$unique -tags: TAGS - -TAGS: tags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) +tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) set x; \ here=`pwd`; \ if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \ @@ -462,12 +447,7 @@ set "$$@" "$$include_option=$$here/$$subdir/TAGS"; \ fi; \ done; \ - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ + $(am__define_uniq_tagged_files); \ shift; \ if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \ test -n "$$unique" || unique=$$empty_fix; \ @@ -479,15 +459,11 @@ $$unique; \ fi; \ fi -ctags: CTAGS -CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ +ctags: ctags-recursive + +CTAGS: ctags +ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) + $(am__define_uniq_tagged_files); \ test -z "$(CTAGS_ARGS)$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ $$unique @@ -496,6 +472,21 @@ here=`$(am__cd) $(top_builddir) && pwd` \ && $(am__cd) $(top_srcdir) \ && gtags -i $(GTAGS_ARGS) "$$here" +cscopelist: cscopelist-recursive + +cscopelist-am: $(am__tagged_files) + list='$(am__tagged_files)'; \ + case "$(srcdir)" in \ + [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \ + *) sdir=$(subdir)/$(srcdir) ;; \ + esac; \ + for i in $$list; do \ + if test -f "$$i"; then \ + echo "$(subdir)/$$i"; \ + else \ + echo "$$sdir/$$i"; \ + fi; \ + done >> $(top_builddir)/cscope.files distclean-tags: -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags @@ -657,22 +648,22 @@ uninstall-am: -.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) ctags-recursive \ - install-am install-data-am install-strip tags-recursive +.MAKE: $(am__recursive_targets) install-am install-data-am \ + install-strip -.PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \ - all all-am check check-am clean clean-generic clean-libtool \ - ctags ctags-recursive distclean distclean-generic \ - distclean-libtool distclean-tags distdir dvi dvi-am html \ - html-am info info-am install install-am install-data \ - install-data-am install-data-hook install-dvi install-dvi-am \ - install-exec install-exec-am install-html install-html-am \ - install-info install-info-am install-man install-pdf \ - install-pdf-am install-ps install-ps-am install-strip \ - installcheck installcheck-am installdirs installdirs-am \ - maintainer-clean maintainer-clean-generic mostlyclean \ - mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ - tags tags-recursive uninstall uninstall-am +.PHONY: $(am__recursive_targets) CTAGS GTAGS TAGS all all-am check \ + check-am clean clean-generic clean-libtool cscopelist-am ctags \ + ctags-am distclean distclean-generic distclean-libtool \ + distclean-tags distdir dvi dvi-am html html-am info info-am \ + install install-am install-data install-data-am \ + install-data-hook install-dvi install-dvi-am install-exec \ + install-exec-am install-html install-html-am install-info \ + install-info-am install-man install-pdf install-pdf-am \ + install-ps install-ps-am install-strip installcheck \ + installcheck-am installdirs installdirs-am maintainer-clean \ + maintainer-clean-generic mostlyclean mostlyclean-generic \ + mostlyclean-libtool pdf pdf-am ps ps-am tags tags-am uninstall \ + uninstall-am install-data-hook: diff -Nru xfce4-session-4.10.0/icons/scalable/Makefile.in xfce4-session-4.10.1/icons/scalable/Makefile.in --- xfce4-session-4.10.0/icons/scalable/Makefile.in 2012-04-28 20:43:33.000000000 +0000 +++ xfce4-session-4.10.1/icons/scalable/Makefile.in 2013-05-05 15:33:59.000000000 +0000 @@ -1,9 +1,8 @@ -# Makefile.in generated by automake 1.11.5 from Makefile.am. +# Makefile.in generated by automake 1.13.1 from Makefile.am. # @configure_input@ -# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software -# Foundation, Inc. +# Copyright (C) 1994-2012 Free Software Foundation, Inc. + # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -52,21 +51,27 @@ build_triplet = @build@ host_triplet = @host@ subdir = icons/scalable -DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in +DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -am__aclocal_m4_deps = $(top_srcdir)/configure.in +am__aclocal_m4_deps = $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) -mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs +mkinstalldirs = $(install_sh) -d CONFIG_HEADER = $(top_builddir)/config.h CONFIG_CLEAN_FILES = CONFIG_CLEAN_VPATH_FILES = +AM_V_P = $(am__v_P_@AM_V@) +am__v_P_ = $(am__v_P_@AM_DEFAULT_V@) +am__v_P_0 = false +am__v_P_1 = : AM_V_GEN = $(am__v_GEN_@AM_V@) am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) -am__v_GEN_0 = @echo " GEN " $@; +am__v_GEN_0 = @echo " GEN " $@; +am__v_GEN_1 = AM_V_at = $(am__v_at_@AM_V@) am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) am__v_at_0 = @ +am__v_at_1 = SOURCES = DIST_SOURCES = am__can_run_installinfo = \ @@ -103,6 +108,7 @@ } am__installdirs = "$(DESTDIR)$(iconsdir)" DATA = $(icons_DATA) +am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP) DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) ACLOCAL = @ACLOCAL@ ALL_LINGUAS = @ALL_LINGUAS@ @@ -148,10 +154,6 @@ GMODULE_VERSION = @GMODULE_VERSION@ GMOFILES = @GMOFILES@ GMSGFMT = @GMSGFMT@ -GNOME_KEYRING_CFLAGS = @GNOME_KEYRING_CFLAGS@ -GNOME_KEYRING_LIBS = @GNOME_KEYRING_LIBS@ -GNOME_KEYRING_REQUIRED_VERSION = @GNOME_KEYRING_REQUIRED_VERSION@ -GNOME_KEYRING_VERSION = @GNOME_KEYRING_VERSION@ GREP = @GREP@ GTK_CFLAGS = @GTK_CFLAGS@ GTK_LIBS = @GTK_LIBS@ @@ -236,6 +238,10 @@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ STRIP = @STRIP@ +SYSTEMD_CFLAGS = @SYSTEMD_CFLAGS@ +SYSTEMD_LIBS = @SYSTEMD_LIBS@ +SYSTEMD_REQUIRED_VERSION = @SYSTEMD_REQUIRED_VERSION@ +SYSTEMD_VERSION = @SYSTEMD_VERSION@ USE_NLS = @USE_NLS@ VERSION = @VERSION@ XFCE_GLADE_CATALOG_PATH = @XFCE_GLADE_CATALOG_PATH@ @@ -373,11 +379,11 @@ @list='$(icons_DATA)'; test -n "$(iconsdir)" || list=; \ files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \ dir='$(DESTDIR)$(iconsdir)'; $(am__uninstall_files_from_dir) -tags: TAGS -TAGS: +tags TAGS: + +ctags CTAGS: -ctags: CTAGS -CTAGS: +cscope cscopelist: distdir: $(DISTFILES) @@ -516,16 +522,16 @@ .MAKE: install-am install-strip .PHONY: all all-am check check-am clean clean-generic clean-libtool \ - distclean distclean-generic distclean-libtool distdir dvi \ - dvi-am html html-am info info-am install install-am \ - install-data install-data-am install-dvi install-dvi-am \ - install-exec install-exec-am install-html install-html-am \ - install-iconsDATA install-info install-info-am install-man \ - install-pdf install-pdf-am install-ps install-ps-am \ - install-strip installcheck installcheck-am installdirs \ - maintainer-clean maintainer-clean-generic mostlyclean \ - mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ - uninstall uninstall-am uninstall-iconsDATA + cscopelist-am ctags-am distclean distclean-generic \ + distclean-libtool distdir dvi dvi-am html html-am info info-am \ + install install-am install-data install-data-am install-dvi \ + install-dvi-am install-exec install-exec-am install-html \ + install-html-am install-iconsDATA install-info install-info-am \ + install-man install-pdf install-pdf-am install-ps \ + install-ps-am install-strip installcheck installcheck-am \ + installdirs maintainer-clean maintainer-clean-generic \ + mostlyclean mostlyclean-generic mostlyclean-libtool pdf pdf-am \ + ps ps-am tags-am uninstall uninstall-am uninstall-iconsDATA # Tell versions [3.59,3.63) of GNU make to not export all variables. diff -Nru xfce4-session-4.10.0/install-sh xfce4-session-4.10.1/install-sh --- xfce4-session-4.10.0/install-sh 2012-04-28 20:43:32.000000000 +0000 +++ xfce4-session-4.10.1/install-sh 2013-05-05 15:33:59.000000000 +0000 @@ -1,7 +1,7 @@ #!/bin/sh # install - install a program, script, or datafile -scriptversion=2011-01-19.21; # UTC +scriptversion=2011-11-20.07; # UTC # This originates from X11R5 (mit/util/scripts/install.sh), which was # later released in X11R6 (xc/config/util/install.sh) with the @@ -35,7 +35,7 @@ # FSF changes to this file are in the public domain. # # Calling this script install-sh is preferred over install.sh, to prevent -# `make' implicit rules from creating a file called install from it +# 'make' implicit rules from creating a file called install from it # when there is no Makefile. # # This script is compatible with the BSD install script, but was written @@ -156,7 +156,7 @@ -s) stripcmd=$stripprog;; -t) dst_arg=$2 - # Protect names problematic for `test' and other utilities. + # Protect names problematic for 'test' and other utilities. case $dst_arg in -* | [=\(\)!]) dst_arg=./$dst_arg;; esac @@ -190,7 +190,7 @@ fi shift # arg dst_arg=$arg - # Protect names problematic for `test' and other utilities. + # Protect names problematic for 'test' and other utilities. case $dst_arg in -* | [=\(\)!]) dst_arg=./$dst_arg;; esac @@ -202,7 +202,7 @@ echo "$0: no input file specified." >&2 exit 1 fi - # It's OK to call `install-sh -d' without argument. + # It's OK to call 'install-sh -d' without argument. # This can happen when creating conditional directories. exit 0 fi @@ -240,7 +240,7 @@ for src do - # Protect names problematic for `test' and other utilities. + # Protect names problematic for 'test' and other utilities. case $src in -* | [=\(\)!]) src=./$src;; esac @@ -354,7 +354,7 @@ if test -z "$dir_arg" || { # Check for POSIX incompatibilities with -m. # HP-UX 11.23 and IRIX 6.5 mkdir -m -p sets group- or - # other-writeable bit of parent directory when it shouldn't. + # other-writable bit of parent directory when it shouldn't. # FreeBSD 6.1 mkdir -m -p sets mode of existing directory. ls_ld_tmpdir=`ls -ld "$tmpdir"` case $ls_ld_tmpdir in diff -Nru xfce4-session-4.10.0/libxfsm/Makefile.am xfce4-session-4.10.1/libxfsm/Makefile.am --- xfce4-session-4.10.0/libxfsm/Makefile.am 2012-04-28 20:43:27.000000000 +0000 +++ xfce4-session-4.10.1/libxfsm/Makefile.am 2013-05-05 15:33:55.000000000 +0000 @@ -1,4 +1,4 @@ -INCLUDES = \ +AM_CPPFLAGS = \ -I$(top_srcdir) # common library diff -Nru xfce4-session-4.10.0/libxfsm/Makefile.in xfce4-session-4.10.1/libxfsm/Makefile.in --- xfce4-session-4.10.0/libxfsm/Makefile.in 2012-04-28 20:43:33.000000000 +0000 +++ xfce4-session-4.10.1/libxfsm/Makefile.in 2013-05-05 15:33:59.000000000 +0000 @@ -1,9 +1,8 @@ -# Makefile.in generated by automake 1.11.5 from Makefile.am. +# Makefile.in generated by automake 1.13.1 from Makefile.am. # @configure_input@ -# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software -# Foundation, Inc. +# Copyright (C) 1994-2012 Free Software Foundation, Inc. + # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -57,13 +56,14 @@ @HAVE_OS_CYGWIN_TRUE@ -no-undefined subdir = libxfsm -DIST_COMMON = $(libxfsminclude_HEADERS) $(srcdir)/Makefile.am \ - $(srcdir)/Makefile.in $(srcdir)/xfce4-session-2.0.pc.in +DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \ + $(srcdir)/xfce4-session-2.0.pc.in $(top_srcdir)/depcomp \ + $(libxfsminclude_HEADERS) ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -am__aclocal_m4_deps = $(top_srcdir)/configure.in +am__aclocal_m4_deps = $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) -mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs +mkinstalldirs = $(install_sh) -d CONFIG_HEADER = $(top_builddir)/config.h CONFIG_CLEAN_FILES = xfce4-session-2.0.pc CONFIG_CLEAN_VPATH_FILES = @@ -106,10 +106,23 @@ AM_V_lt = $(am__v_lt_@AM_V@) am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@) am__v_lt_0 = --silent +am__v_lt_1 = libxfsm_4_6_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC \ $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CCLD) \ $(libxfsm_4_6_la_CFLAGS) $(CFLAGS) $(libxfsm_4_6_la_LDFLAGS) \ $(LDFLAGS) -o $@ +AM_V_P = $(am__v_P_@AM_V@) +am__v_P_ = $(am__v_P_@AM_DEFAULT_V@) +am__v_P_0 = false +am__v_P_1 = : +AM_V_GEN = $(am__v_GEN_@AM_V@) +am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) +am__v_GEN_0 = @echo " GEN " $@; +am__v_GEN_1 = +AM_V_at = $(am__v_at_@AM_V@) +am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) +am__v_at_0 = @ +am__v_at_1 = DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir) depcomp = $(SHELL) $(top_srcdir)/depcomp am__depfiles_maybe = depfiles @@ -122,20 +135,16 @@ $(AM_CFLAGS) $(CFLAGS) AM_V_CC = $(am__v_CC_@AM_V@) am__v_CC_ = $(am__v_CC_@AM_DEFAULT_V@) -am__v_CC_0 = @echo " CC " $@; -AM_V_at = $(am__v_at_@AM_V@) -am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) -am__v_at_0 = @ +am__v_CC_0 = @echo " CC " $@; +am__v_CC_1 = CCLD = $(CC) LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \ $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ $(AM_LDFLAGS) $(LDFLAGS) -o $@ AM_V_CCLD = $(am__v_CCLD_@AM_V@) am__v_CCLD_ = $(am__v_CCLD_@AM_DEFAULT_V@) -am__v_CCLD_0 = @echo " CCLD " $@; -AM_V_GEN = $(am__v_GEN_@AM_V@) -am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) -am__v_GEN_0 = @echo " GEN " $@; +am__v_CCLD_0 = @echo " CCLD " $@; +am__v_CCLD_1 = SOURCES = $(libxfsm_4_6_la_SOURCES) DIST_SOURCES = $(libxfsm_4_6_la_SOURCES) am__can_run_installinfo = \ @@ -145,6 +154,23 @@ esac DATA = $(pkgconfig_DATA) HEADERS = $(libxfsminclude_HEADERS) +am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP) +# Read a list of newline-separated strings from the standard input, +# and print each of them once, without duplicates. Input order is +# *not* preserved. +am__uniquify_input = $(AWK) '\ + BEGIN { nonempty = 0; } \ + { items[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in items) print i; }; } \ +' +# Make sure the list of sources is unique. This is necessary because, +# e.g., the same source file might be shared among _SOURCES variables +# for different programs/libraries. +am__define_uniq_tagged_files = \ + list='$(am__tagged_files)'; \ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | $(am__uniquify_input)` ETAGS = etags CTAGS = ctags DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) @@ -192,10 +218,6 @@ GMODULE_VERSION = @GMODULE_VERSION@ GMOFILES = @GMOFILES@ GMSGFMT = @GMSGFMT@ -GNOME_KEYRING_CFLAGS = @GNOME_KEYRING_CFLAGS@ -GNOME_KEYRING_LIBS = @GNOME_KEYRING_LIBS@ -GNOME_KEYRING_REQUIRED_VERSION = @GNOME_KEYRING_REQUIRED_VERSION@ -GNOME_KEYRING_VERSION = @GNOME_KEYRING_VERSION@ GREP = @GREP@ GTK_CFLAGS = @GTK_CFLAGS@ GTK_LIBS = @GTK_LIBS@ @@ -280,6 +302,10 @@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ STRIP = @STRIP@ +SYSTEMD_CFLAGS = @SYSTEMD_CFLAGS@ +SYSTEMD_LIBS = @SYSTEMD_LIBS@ +SYSTEMD_REQUIRED_VERSION = @SYSTEMD_REQUIRED_VERSION@ +SYSTEMD_VERSION = @SYSTEMD_VERSION@ USE_NLS = @USE_NLS@ VERSION = @VERSION@ XFCE_GLADE_CATALOG_PATH = @XFCE_GLADE_CATALOG_PATH@ @@ -351,7 +377,7 @@ top_build_prefix = @top_build_prefix@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ -INCLUDES = \ +AM_CPPFLAGS = \ -I$(top_srcdir) @@ -420,6 +446,7 @@ $(am__aclocal_m4_deps): xfce4-session-2.0.pc: $(top_builddir)/config.status $(srcdir)/xfce4-session-2.0.pc.in cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ + install-libLTLIBRARIES: $(lib_LTLIBRARIES) @$(NORMAL_INSTALL) @list='$(lib_LTLIBRARIES)'; test -n "$(libdir)" || list=; \ @@ -446,12 +473,14 @@ clean-libLTLIBRARIES: -test -z "$(lib_LTLIBRARIES)" || rm -f $(lib_LTLIBRARIES) - @list='$(lib_LTLIBRARIES)'; for p in $$list; do \ - dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \ - test "$$dir" != "$$p" || dir=.; \ - echo "rm -f \"$${dir}/so_locations\""; \ - rm -f "$${dir}/so_locations"; \ - done + @list='$(lib_LTLIBRARIES)'; \ + locs=`for p in $$list; do echo $$p; done | \ + sed 's|^[^/]*$$|.|; s|/[^/]*$$||; s|$$|/so_locations|' | \ + sort -u`; \ + test -z "$$locs" || { \ + echo rm -f $${locs}; \ + rm -f $${locs}; \ + } libxfsm-4.6.la: $(libxfsm_4_6_la_OBJECTS) $(libxfsm_4_6_la_DEPENDENCIES) $(EXTRA_libxfsm_4_6_la_DEPENDENCIES) $(AM_V_CCLD)$(libxfsm_4_6_la_LINK) -rpath $(libdir) $(libxfsm_4_6_la_OBJECTS) $(libxfsm_4_6_la_LIBADD) $(LIBS) @@ -547,26 +576,15 @@ files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \ dir='$(DESTDIR)$(libxfsmincludedir)'; $(am__uninstall_files_from_dir) -ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ - mkid -fID $$unique -tags: TAGS +ID: $(am__tagged_files) + $(am__define_uniq_tagged_files); mkid -fID $$unique +tags: tags-am +TAGS: tags -TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) +tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) set x; \ here=`pwd`; \ - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ + $(am__define_uniq_tagged_files); \ shift; \ if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \ test -n "$$unique" || unique=$$empty_fix; \ @@ -578,15 +596,11 @@ $$unique; \ fi; \ fi -ctags: CTAGS -CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ +ctags: ctags-am + +CTAGS: ctags +ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) + $(am__define_uniq_tagged_files); \ test -z "$(CTAGS_ARGS)$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ $$unique @@ -595,6 +609,21 @@ here=`$(am__cd) $(top_builddir) && pwd` \ && $(am__cd) $(top_srcdir) \ && gtags -i $(GTAGS_ARGS) "$$here" +cscopelist: cscopelist-am + +cscopelist-am: $(am__tagged_files) + list='$(am__tagged_files)'; \ + case "$(srcdir)" in \ + [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \ + *) sdir=$(subdir)/$(srcdir) ;; \ + esac; \ + for i in $$list; do \ + if test -f "$$i"; then \ + echo "$(subdir)/$$i"; \ + else \ + echo "$$sdir/$$i"; \ + fi; \ + done >> $(top_builddir)/cscope.files distclean-tags: -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags @@ -740,21 +769,22 @@ .MAKE: install-am install-strip -.PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \ - clean-libLTLIBRARIES clean-libtool ctags distclean \ - distclean-compile distclean-generic distclean-libtool \ - distclean-tags distdir dvi dvi-am html html-am info info-am \ - install install-am install-data install-data-am install-dvi \ - install-dvi-am install-exec install-exec-am install-html \ - install-html-am install-info install-info-am \ - install-libLTLIBRARIES install-libxfsmincludeHEADERS \ - install-man install-pdf install-pdf-am install-pkgconfigDATA \ - install-ps install-ps-am install-strip installcheck \ - installcheck-am installdirs maintainer-clean \ - maintainer-clean-generic mostlyclean mostlyclean-compile \ - mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ - tags uninstall uninstall-am uninstall-libLTLIBRARIES \ - uninstall-libxfsmincludeHEADERS uninstall-pkgconfigDATA +.PHONY: CTAGS GTAGS TAGS all all-am check check-am clean clean-generic \ + clean-libLTLIBRARIES clean-libtool cscopelist-am ctags \ + ctags-am distclean distclean-compile distclean-generic \ + distclean-libtool distclean-tags distdir dvi dvi-am html \ + html-am info info-am install install-am install-data \ + install-data-am install-dvi install-dvi-am install-exec \ + install-exec-am install-html install-html-am install-info \ + install-info-am install-libLTLIBRARIES \ + install-libxfsmincludeHEADERS install-man install-pdf \ + install-pdf-am install-pkgconfigDATA install-ps install-ps-am \ + install-strip installcheck installcheck-am installdirs \ + maintainer-clean maintainer-clean-generic mostlyclean \ + mostlyclean-compile mostlyclean-generic mostlyclean-libtool \ + pdf pdf-am ps ps-am tags tags-am uninstall uninstall-am \ + uninstall-libLTLIBRARIES uninstall-libxfsmincludeHEADERS \ + uninstall-pkgconfigDATA # Tell versions [3.59,3.63) of GNU make to not export all variables. diff -Nru xfce4-session-4.10.0/missing xfce4-session-4.10.1/missing --- xfce4-session-4.10.0/missing 2012-04-28 20:43:32.000000000 +0000 +++ xfce4-session-4.10.1/missing 2013-05-05 15:33:59.000000000 +0000 @@ -1,11 +1,10 @@ #! /bin/sh -# Common stub for a few missing GNU programs while installing. +# Common wrapper for a few potentially missing GNU programs. -scriptversion=2012-01-06.13; # UTC +scriptversion=2012-06-26.16; # UTC -# Copyright (C) 1996, 1997, 1999, 2000, 2002, 2003, 2004, 2005, 2006, -# 2008, 2009, 2010, 2011, 2012 Free Software Foundation, Inc. -# Originally by Fran,cois Pinard , 1996. +# Copyright (C) 1996-2013 Free Software Foundation, Inc. +# Originally written by Fran,cois Pinard , 1996. # 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 @@ -26,68 +25,40 @@ # the same distribution terms that you use for the rest of that program. if test $# -eq 0; then - echo 1>&2 "Try \`$0 --help' for more information" + echo 1>&2 "Try '$0 --help' for more information" exit 1 fi -run=: -sed_output='s/.* --output[ =]\([^ ]*\).*/\1/p' -sed_minuso='s/.* -o \([^ ]*\).*/\1/p' - -# In the cases where this matters, `missing' is being run in the -# srcdir already. -if test -f configure.ac; then - configure_ac=configure.ac -else - configure_ac=configure.in -fi +case $1 in -msg="missing on your system" + --is-lightweight) + # Used by our autoconf macros to check whether the available missing + # script is modern enough. + exit 0 + ;; -case $1 in ---run) - # Try to run requested program, and just exit if it succeeds. - run= - shift - "$@" && exit 0 - # Exit code 63 means version mismatch. This often happens - # when the user try to use an ancient version of a tool on - # a file that requires a minimum version. In this case we - # we should proceed has if the program had been absent, or - # if --run hadn't been passed. - if test $? = 63; then - run=: - msg="probably too old" - fi - ;; + --run) + # Back-compat with the calling convention used by older automake. + shift + ;; -h|--h|--he|--hel|--help) echo "\ $0 [OPTION]... PROGRAM [ARGUMENT]... -Handle \`PROGRAM [ARGUMENT]...' for when PROGRAM is missing, or return an -error status if there is no known handling for PROGRAM. +Run 'PROGRAM [ARGUMENT]...', returning a proper advice when this fails due +to PROGRAM being missing or too old. Options: -h, --help display this help and exit -v, --version output version information and exit - --run try to run the given command, and emulate it if it fails Supported PROGRAM values: - aclocal touch file \`aclocal.m4' - autoconf touch file \`configure' - autoheader touch file \`config.h.in' - autom4te touch the output file, or create a stub one - automake touch all \`Makefile.in' files - bison create \`y.tab.[ch]', if possible, from existing .[ch] - flex create \`lex.yy.c', if possible, from existing .c - help2man touch the output file - lex create \`lex.yy.c', if possible, from existing .c - makeinfo touch the output file - yacc create \`y.tab.[ch]', if possible, from existing .[ch] + aclocal autoconf autoheader autom4te automake makeinfo + bison yacc flex lex help2man -Version suffixes to PROGRAM as well as the prefixes \`gnu-', \`gnu', and -\`g' are ignored when checking the name. +Version suffixes to PROGRAM as well as the prefixes 'gnu-', 'gnu', and +'g' are ignored when checking the name. Send bug reports to ." exit $? @@ -99,228 +70,141 @@ ;; -*) - echo 1>&2 "$0: Unknown \`$1' option" - echo 1>&2 "Try \`$0 --help' for more information" + echo 1>&2 "$0: unknown '$1' option" + echo 1>&2 "Try '$0 --help' for more information" exit 1 ;; esac -# normalize program name to check for. -program=`echo "$1" | sed ' - s/^gnu-//; t - s/^gnu//; t - s/^g//; t'` - -# Now exit if we have it, but it failed. Also exit now if we -# don't have it and --version was passed (most likely to detect -# the program). This is about non-GNU programs, so use $1 not -# $program. -case $1 in - lex*|yacc*) - # Not GNU programs, they don't have --version. - ;; +# Run the given program, remember its exit status. +"$@"; st=$? - *) - if test -z "$run" && ($1 --version) > /dev/null 2>&1; then - # We have it, but it failed. - exit 1 - elif test "x$2" = "x--version" || test "x$2" = "x--help"; then - # Could not run --version or --help. This is probably someone - # running `$TOOL --version' or `$TOOL --help' to check whether - # $TOOL exists and not knowing $TOOL uses missing. - exit 1 - fi - ;; -esac - -# If it does not exist, or fails to run (possibly an outdated version), -# try to emulate it. -case $program in - aclocal*) - echo 1>&2 "\ -WARNING: \`$1' is $msg. You should only need it if - you modified \`acinclude.m4' or \`${configure_ac}'. You might want - to install the \`Automake' and \`Perl' packages. Grab them from - any GNU archive site." - touch aclocal.m4 - ;; - - autoconf*) - echo 1>&2 "\ -WARNING: \`$1' is $msg. You should only need it if - you modified \`${configure_ac}'. You might want to install the - \`Autoconf' and \`GNU m4' packages. Grab them from any GNU - archive site." - touch configure - ;; - - autoheader*) - echo 1>&2 "\ -WARNING: \`$1' is $msg. You should only need it if - you modified \`acconfig.h' or \`${configure_ac}'. You might want - to install the \`Autoconf' and \`GNU m4' packages. Grab them - from any GNU archive site." - files=`sed -n 's/^[ ]*A[CM]_CONFIG_HEADER(\([^)]*\)).*/\1/p' ${configure_ac}` - test -z "$files" && files="config.h" - touch_files= - for f in $files; do - case $f in - *:*) touch_files="$touch_files "`echo "$f" | - sed -e 's/^[^:]*://' -e 's/:.*//'`;; - *) touch_files="$touch_files $f.in";; - esac - done - touch $touch_files - ;; +# If it succeeded, we are done. +test $st -eq 0 && exit 0 - automake*) - echo 1>&2 "\ -WARNING: \`$1' is $msg. You should only need it if - you modified \`Makefile.am', \`acinclude.m4' or \`${configure_ac}'. - You might want to install the \`Automake' and \`Perl' packages. - Grab them from any GNU archive site." - find . -type f -name Makefile.am -print | - sed 's/\.am$/.in/' | - while read f; do touch "$f"; done - ;; - - autom4te*) - echo 1>&2 "\ -WARNING: \`$1' is needed, but is $msg. - You might have modified some files without having the - proper tools for further handling them. - You can get \`$1' as part of \`Autoconf' from any GNU - archive site." - - file=`echo "$*" | sed -n "$sed_output"` - test -z "$file" && file=`echo "$*" | sed -n "$sed_minuso"` - if test -f "$file"; then - touch $file - else - test -z "$file" || exec >$file - echo "#! /bin/sh" - echo "# Created by GNU Automake missing as a replacement of" - echo "# $ $@" - echo "exit 0" - chmod +x $file - exit 1 - fi - ;; - - bison*|yacc*) - echo 1>&2 "\ -WARNING: \`$1' $msg. You should only need it if - you modified a \`.y' file. You may need the \`Bison' package - in order for those modifications to take effect. You can get - \`Bison' from any GNU archive site." - rm -f y.tab.c y.tab.h - if test $# -ne 1; then - eval LASTARG=\${$#} - case $LASTARG in - *.y) - SRCFILE=`echo "$LASTARG" | sed 's/y$/c/'` - if test -f "$SRCFILE"; then - cp "$SRCFILE" y.tab.c - fi - SRCFILE=`echo "$LASTARG" | sed 's/y$/h/'` - if test -f "$SRCFILE"; then - cp "$SRCFILE" y.tab.h - fi - ;; - esac - fi - if test ! -f y.tab.h; then - echo >y.tab.h - fi - if test ! -f y.tab.c; then - echo 'main() { return 0; }' >y.tab.c - fi - ;; - - lex*|flex*) - echo 1>&2 "\ -WARNING: \`$1' is $msg. You should only need it if - you modified a \`.l' file. You may need the \`Flex' package - in order for those modifications to take effect. You can get - \`Flex' from any GNU archive site." - rm -f lex.yy.c - if test $# -ne 1; then - eval LASTARG=\${$#} - case $LASTARG in - *.l) - SRCFILE=`echo "$LASTARG" | sed 's/l$/c/'` - if test -f "$SRCFILE"; then - cp "$SRCFILE" lex.yy.c - fi - ;; - esac - fi - if test ! -f lex.yy.c; then - echo 'main() { return 0; }' >lex.yy.c - fi - ;; - - help2man*) - echo 1>&2 "\ -WARNING: \`$1' is $msg. You should only need it if - you modified a dependency of a manual page. You may need the - \`Help2man' package in order for those modifications to take - effect. You can get \`Help2man' from any GNU archive site." - - file=`echo "$*" | sed -n "$sed_output"` - test -z "$file" && file=`echo "$*" | sed -n "$sed_minuso"` - if test -f "$file"; then - touch $file - else - test -z "$file" || exec >$file - echo ".ab help2man is required to generate this page" - exit $? - fi - ;; - - makeinfo*) - echo 1>&2 "\ -WARNING: \`$1' is $msg. You should only need it if - you modified a \`.texi' or \`.texinfo' file, or any other file - indirectly affecting the aspect of the manual. The spurious - call might also be the consequence of using a buggy \`make' (AIX, - DU, IRIX). You might want to install the \`Texinfo' package or - the \`GNU make' package. Grab either from any GNU archive site." - # The file to touch is that specified with -o ... - file=`echo "$*" | sed -n "$sed_output"` - test -z "$file" && file=`echo "$*" | sed -n "$sed_minuso"` - if test -z "$file"; then - # ... or it is the one specified with @setfilename ... - infile=`echo "$*" | sed 's/.* \([^ ]*\) *$/\1/'` - file=`sed -n ' - /^@setfilename/{ - s/.* \([^ ]*\) *$/\1/ - p - q - }' $infile` - # ... or it is derived from the source name (dir/f.texi becomes f.info) - test -z "$file" && file=`echo "$infile" | sed 's,.*/,,;s,.[^.]*$,,'`.info - fi - # If the file does not exist, the user really needs makeinfo; - # let's fail without touching anything. - test -f $file || exit 1 - touch $file - ;; - - *) - echo 1>&2 "\ -WARNING: \`$1' is needed, and is $msg. - You might have modified some files without having the - proper tools for further handling them. Check the \`README' file, - it often tells you about the needed prerequisites for installing - this package. You may also peek at any GNU archive site, in case - some other package would contain this missing \`$1' program." - exit 1 - ;; -esac +# Also exit now if we it failed (or wasn't found), and '--version' was +# passed; such an option is passed most likely to detect whether the +# program is present and works. +case $2 in --version|--help) exit $st;; esac + +# Exit code 63 means version mismatch. This often happens when the user +# tries to use an ancient version of a tool on a file that requires a +# minimum version. +if test $st -eq 63; then + msg="probably too old" +elif test $st -eq 127; then + # Program was missing. + msg="missing on your system" +else + # Program was found and executed, but failed. Give up. + exit $st +fi -exit 0 +perl_URL=http://www.perl.org/ +flex_URL=http://flex.sourceforge.net/ +gnu_software_URL=http://www.gnu.org/software + +program_details () +{ + case $1 in + aclocal|automake) + echo "The '$1' program is part of the GNU Automake package:" + echo "<$gnu_software_URL/automake>" + echo "It also requires GNU Autoconf, GNU m4 and Perl in order to run:" + echo "<$gnu_software_URL/autoconf>" + echo "<$gnu_software_URL/m4/>" + echo "<$perl_URL>" + ;; + autoconf|autom4te|autoheader) + echo "The '$1' program is part of the GNU Autoconf package:" + echo "<$gnu_software_URL/autoconf/>" + echo "It also requires GNU m4 and Perl in order to run:" + echo "<$gnu_software_URL/m4/>" + echo "<$perl_URL>" + ;; + esac +} + +give_advice () +{ + # Normalize program name to check for. + normalized_program=`echo "$1" | sed ' + s/^gnu-//; t + s/^gnu//; t + s/^g//; t'` + + printf '%s\n' "'$1' is $msg." + + configure_deps="'configure.ac' or m4 files included by 'configure.ac'" + case $normalized_program in + autoconf*) + echo "You should only need it if you modified 'configure.ac'," + echo "or m4 files included by it." + program_details 'autoconf' + ;; + autoheader*) + echo "You should only need it if you modified 'acconfig.h' or" + echo "$configure_deps." + program_details 'autoheader' + ;; + automake*) + echo "You should only need it if you modified 'Makefile.am' or" + echo "$configure_deps." + program_details 'automake' + ;; + aclocal*) + echo "You should only need it if you modified 'acinclude.m4' or" + echo "$configure_deps." + program_details 'aclocal' + ;; + autom4te*) + echo "You might have modified some maintainer files that require" + echo "the 'automa4te' program to be rebuilt." + program_details 'autom4te' + ;; + bison*|yacc*) + echo "You should only need it if you modified a '.y' file." + echo "You may want to install the GNU Bison package:" + echo "<$gnu_software_URL/bison/>" + ;; + lex*|flex*) + echo "You should only need it if you modified a '.l' file." + echo "You may want to install the Fast Lexical Analyzer package:" + echo "<$flex_URL>" + ;; + help2man*) + echo "You should only need it if you modified a dependency" \ + "of a man page." + echo "You may want to install the GNU Help2man package:" + echo "<$gnu_software_URL/help2man/>" + ;; + makeinfo*) + echo "You should only need it if you modified a '.texi' file, or" + echo "any other file indirectly affecting the aspect of the manual." + echo "You might want to install the Texinfo package:" + echo "<$gnu_software_URL/texinfo/>" + echo "The spurious makeinfo call might also be the consequence of" + echo "using a buggy 'make' (AIX, DU, IRIX), in which case you might" + echo "want to install GNU make:" + echo "<$gnu_software_URL/make/>" + ;; + *) + echo "You might have modified some files without having the proper" + echo "tools for further handling them. Check the 'README' file, it" + echo "often tells you about the needed prerequisites for installing" + echo "this package. You may also peek at any GNU archive site, in" + echo "case some other package contains this missing '$1' program." + ;; + esac +} + +give_advice "$1" | sed -e '1s/^/WARNING: /' \ + -e '2,$s/^/ /' >&2 + +# Propagate the correct exit status (expected to be 127 for a program +# not found, 63 for a program that failed due to version mismatch). +exit $st # Local variables: # eval: (add-hook 'write-file-hooks 'time-stamp) diff -Nru xfce4-session-4.10.0/mkinstalldirs xfce4-session-4.10.1/mkinstalldirs --- xfce4-session-4.10.0/mkinstalldirs 2012-04-28 20:43:34.000000000 +0000 +++ xfce4-session-4.10.1/mkinstalldirs 1970-01-01 00:00:00.000000000 +0000 @@ -1,162 +0,0 @@ -#! /bin/sh -# mkinstalldirs --- make directory hierarchy - -scriptversion=2009-04-28.21; # UTC - -# Original author: Noah Friedman -# Created: 1993-05-16 -# Public domain. -# -# This file is maintained in Automake, please report -# bugs to or send patches to -# . - -nl=' -' -IFS=" "" $nl" -errstatus=0 -dirmode= - -usage="\ -Usage: mkinstalldirs [-h] [--help] [--version] [-m MODE] DIR ... - -Create each directory DIR (with mode MODE, if specified), including all -leading file name components. - -Report bugs to ." - -# process command line arguments -while test $# -gt 0 ; do - case $1 in - -h | --help | --h*) # -h for help - echo "$usage" - exit $? - ;; - -m) # -m PERM arg - shift - test $# -eq 0 && { echo "$usage" 1>&2; exit 1; } - dirmode=$1 - shift - ;; - --version) - echo "$0 $scriptversion" - exit $? - ;; - --) # stop option processing - shift - break - ;; - -*) # unknown option - echo "$usage" 1>&2 - exit 1 - ;; - *) # first non-opt arg - break - ;; - esac -done - -for file -do - if test -d "$file"; then - shift - else - break - fi -done - -case $# in - 0) exit 0 ;; -esac - -# Solaris 8's mkdir -p isn't thread-safe. If you mkdir -p a/b and -# mkdir -p a/c at the same time, both will detect that a is missing, -# one will create a, then the other will try to create a and die with -# a "File exists" error. This is a problem when calling mkinstalldirs -# from a parallel make. We use --version in the probe to restrict -# ourselves to GNU mkdir, which is thread-safe. -case $dirmode in - '') - if mkdir -p --version . >/dev/null 2>&1 && test ! -d ./--version; then - echo "mkdir -p -- $*" - exec mkdir -p -- "$@" - else - # On NextStep and OpenStep, the `mkdir' command does not - # recognize any option. It will interpret all options as - # directories to create, and then abort because `.' already - # exists. - test -d ./-p && rmdir ./-p - test -d ./--version && rmdir ./--version - fi - ;; - *) - if mkdir -m "$dirmode" -p --version . >/dev/null 2>&1 && - test ! -d ./--version; then - echo "mkdir -m $dirmode -p -- $*" - exec mkdir -m "$dirmode" -p -- "$@" - else - # Clean up after NextStep and OpenStep mkdir. - for d in ./-m ./-p ./--version "./$dirmode"; - do - test -d $d && rmdir $d - done - fi - ;; -esac - -for file -do - case $file in - /*) pathcomp=/ ;; - *) pathcomp= ;; - esac - oIFS=$IFS - IFS=/ - set fnord $file - shift - IFS=$oIFS - - for d - do - test "x$d" = x && continue - - pathcomp=$pathcomp$d - case $pathcomp in - -*) pathcomp=./$pathcomp ;; - esac - - if test ! -d "$pathcomp"; then - echo "mkdir $pathcomp" - - mkdir "$pathcomp" || lasterr=$? - - if test ! -d "$pathcomp"; then - errstatus=$lasterr - else - if test ! -z "$dirmode"; then - echo "chmod $dirmode $pathcomp" - lasterr= - chmod "$dirmode" "$pathcomp" || lasterr=$? - - if test ! -z "$lasterr"; then - errstatus=$lasterr - fi - fi - fi - fi - - pathcomp=$pathcomp/ - done -done - -exit $errstatus - -# Local Variables: -# mode: shell-script -# sh-indentation: 2 -# eval: (add-hook 'write-file-hooks 'time-stamp) -# time-stamp-start: "scriptversion=" -# time-stamp-format: "%:y-%02m-%02d.%02H" -# time-stamp-time-zone: "UTC" -# time-stamp-end: "; # UTC" -# End: diff -Nru xfce4-session-4.10.0/po/ar.po xfce4-session-4.10.1/po/ar.po --- xfce4-session-4.10.0/po/ar.po 2012-04-28 20:43:27.000000000 +0000 +++ xfce4-session-4.10.1/po/ar.po 2013-05-05 15:33:55.000000000 +0000 @@ -5,23 +5,26 @@ # Saleh Alhathal , 2004. # Ahmed MANSOUR <911freak@gmail.com>, 2007. # كريم أولاد الشلحة , 2012. -# +# محمد الحرقان , 2012. msgid "" msgstr "" "Project-Id-Version: ar\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2011-12-25 07:42+0000\n" -"PO-Revision-Date: 2011-01-11 21:42-0000\n" -"Last-Translator: كريم أولاد الشلحة \n" -"Language-Team: Arabic \n" +"POT-Creation-Date: 2012-11-06 13:09+0000\n" +"PO-Revision-Date: 2012-11-07 06:41+0300\n" +"Last-Translator: محمد الحرقان \n" +"Language-Team: http://www.vertaal.com.ar/files/factory/ar/list/\n" +"Language: ar\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"Language: ar\n" +"Plural-Forms: nplurals=6; plural=n==0 ? 0 : n==1 ? 1 : n==2 ? 2 : n%100>=3 " +"&& n%100<=10 ? 3 : n%100>=11 ? 4 : 5;\n" +"X-Generator: Virtaal 0.7.1\n" #: ../xfce.desktop.in.h:1 msgid "Use this session to run Xfce as your desktop environment" -msgstr "إستعمل هذه الجلسة لتشغيل إكسفس كسطح مكتبك" +msgstr "إستعمل هذه الجلسة لتشغيل إكسفس كسطح مكتب" #: ../xfce.desktop.in.h:2 msgid "Xfce Session" @@ -38,7 +41,7 @@ #: ../engines/balou/config.c:336 #, c-format msgid "Unable to install splash theme from file \"%s\"" -msgstr "عاجز عن تثبيت سمة شاشة البدء من الملف \"%s\"" +msgstr "غير قادرعلى تثبيت سمة شاشة البدء من الملف \"%s\"" #: ../engines/balou/config.c:339 msgid "Theme File Error" @@ -46,20 +49,20 @@ #: ../engines/balou/config.c:342 msgid "Please check that the file is a valid splash theme archive." -msgstr "الرجاء نحقق من أن هذا الملف أرشيف سمة شاشة البدء سليم." +msgstr "الرجاء تحقق من أن ملف أرشيف سمة شاشة البدء صالح." #: ../engines/balou/config.c:402 #, c-format msgid "Unable to remove splash theme \"%s\" from directory %s." -msgstr "عاجز عن إزالة سمة البدأ \"%s\" من المجلد %s." +msgstr "غير قادر على إزالة سمة البداية \"%s\" من المجلد %s." #: ../engines/balou/config.c:491 msgid "Choose theme filename..." -msgstr "إختر إسم ملف السمة" +msgstr "إختر إسم ملف السمة..." #: ../engines/balou/config.c:624 msgid "_Install new theme" -msgstr "تثبيت سمة جد_يدة" +msgstr "_تثبيت سمة جديدة" #: ../engines/balou/config.c:633 msgid "_Remove theme" @@ -75,7 +78,7 @@ #: ../engines/balou/config.c:951 msgid "Configure Balou..." -msgstr "إعدادات بالو" +msgstr "إعدادات بالو..." #: ../engines/balou/config.c:994 msgid "Balou" @@ -139,49 +142,59 @@ #: ../engines/simple/simple.c:498 msgid "Simple Splash Engine" -msgstr "أداة بسيطة لشاشة بدء " +msgstr "أداة بسيطة لشاشة بدء" + +#: ../scripts/xscreensaver.desktop.in.h:1 +msgid "Launch screensaver and locker program" +msgstr "شغّل برنامج حافظة الشاشة" + +#: ../scripts/xscreensaver.desktop.in.h:2 +msgid "Screensaver" +msgstr "حافظة الشاشة" #: ../settings/main.c:43 msgid "Settings manager socket" -msgstr "مفبس مدير الإعدادات" +msgstr "ضبط مدير المنافذ" #: ../settings/main.c:43 msgid "SOCKET ID" -msgstr "مقبس المعرف" +msgstr "معرف المنفذ" #: ../settings/main.c:44 msgid "Version information" msgstr "معلومات النسخة" -#: ../settings/main.c:74 +#: ../settings/main.c:75 ../xfce4-session/main.c:257 #, c-format msgid "Type '%s --help' for usage." -msgstr "جرب '%s --help' لإستعمال." +msgstr "اكتب '%s --help' لإستعمال." -#: ../settings/main.c:86 ../xfce4-session/main.c:219 +#: ../settings/main.c:87 ../xfce4-session/main.c:267 +#: ../xfce4-session-logout/main.c:135 msgid "The Xfce development team. All rights reserved." -msgstr "فريق التطوير إكسفس.جميع الحقوق محفوظة." +msgstr "فريق تطوير إكسفس. جميع الحقوق محفوظة." -#: ../settings/main.c:87 ../xfce4-session/main.c:225 +#: ../settings/main.c:88 ../xfce4-session/main.c:268 +#: ../xfce4-session-logout/main.c:138 #, c-format msgid "Please report bugs to <%s>." msgstr "الرجاء الإبلاغ عن الخلل في <%s>." -#: ../settings/main.c:96 ../xfce4-session/main.c:231 +#: ../settings/main.c:97 ../xfce4-session/main.c:276 msgid "Unable to contact settings server" -msgstr "عجز الإتصال بخادك الإعدادات" +msgstr "غير قادر على الإتصال بخادم الإعدادات" -#: ../settings/main.c:115 +#: ../settings/main.c:116 msgid "Unable to create user interface from embedded definition data" -msgstr "غير قادر على إنشاء واجهة من بيانات تعريف مضمنة" +msgstr "غير قادر على إنشاء واجهة من بيانات التعريف المضمنة" #: ../settings/main.c:128 msgid "_Application Autostart" -msgstr "تطبيق تلقائي التشغيل" +msgstr "_تطبيق تلقائي التشغيل" #: ../settings/session-editor.c:61 msgid "If running" -msgstr "إذا كان بعمل" +msgstr "إذا كان يعمل" #: ../settings/session-editor.c:62 msgid "Always" @@ -209,7 +222,7 @@ #: ../settings/session-editor.c:171 msgid "Are you sure you want to empty the session cache?" -msgstr "هل أنت متأكد من أنك تريد إفراغ ملفات المؤقتة للجلسة؟" +msgstr "متأكد أنك تريد إفراغ الملفات المؤقتة للجلسة؟" #: ../settings/session-editor.c:172 msgid "" @@ -222,54 +235,57 @@ msgstr "_تقدم" #: ../settings/session-editor.c:212 -msgid "You might need to delete some files manually in " -msgstr "ربما تحتاج لحذف بعض الملفات يدويا" +#, c-format +msgid "You might need to delete some files manually in \"%s\"." +msgstr "قد تحتاج حذف بعض الملفات يدويا \"%s\"." -#: ../settings/session-editor.c:216 +#: ../settings/session-editor.c:215 msgid "All Xfce cache files could not be cleared" msgstr "لا يمكن محو جميع ملفات المؤقتة لـ إكسفس" -#: ../settings/session-editor.c:250 +#: ../settings/session-editor.c:249 #, c-format msgid "Are you sure you want to terminate \"%s\"?" -msgstr "هل أنت متأكد من انك تود إتهاء \"%s\"?" +msgstr "متأكد انك تود إنهاء \"%s\"؟" -#: ../settings/session-editor.c:253 ../settings/session-editor.c:281 +#: ../settings/session-editor.c:252 ../settings/session-editor.c:280 msgid "Terminate Program" msgstr "إنهاء البرنامج" -#: ../settings/session-editor.c:255 +#: ../settings/session-editor.c:254 msgid "" "The application will lose any unsaved state and will not be restarted in " "your next session." -msgstr "التطبيق سيفقدك كل البيانات الغير محفوظة و لن يتم إعادة تشغيلها في الجلسة التالية." +msgstr "" +"التطبيق سيفقدك كل البيانات غير المحفوظة و لن يتم إعادة تشغيلها في الجلسة " +"التالية." -#: ../settings/session-editor.c:257 -#: ../settings/xfce4-session-settings.glade.h:37 +#: ../settings/session-editor.c:256 +#: ../settings/xfce4-session-settings.glade.h:40 msgid "_Quit Program" msgstr "_خروج من البرنامج" -#: ../settings/session-editor.c:282 +#: ../settings/session-editor.c:281 msgid "Unable to terminate program." -msgstr "عاجز عن إنهاء البرنامج." +msgstr "غير قادر على إنهاء البرنامج." -#: ../settings/session-editor.c:460 +#: ../settings/session-editor.c:459 msgid "(Unknown program)" msgstr "(برنامج مجهول)" -#: ../settings/session-editor.c:680 +#: ../settings/session-editor.c:679 msgid "Priority" -msgstr "الأولويّة:" +msgstr "أولوية" -#: ../settings/session-editor.c:688 +#: ../settings/session-editor.c:687 msgid "PID" msgstr "PID" -#: ../settings/session-editor.c:694 +#: ../settings/session-editor.c:693 msgid "Program" msgstr "برنامج" -#: ../settings/session-editor.c:719 +#: ../settings/session-editor.c:718 msgid "Restart Style" msgstr "نمط إعادة التشغيل" @@ -291,84 +307,84 @@ msgid "Description:" msgstr "وصف:" -#: ../settings/xfae-dialog.c:124 +#: ../settings/xfae-dialog.c:124 ../settings/xfae-model.c:479 msgid "Command:" msgstr "أمر:" #: ../settings/xfae-dialog.c:184 msgid "Select a command" -msgstr "إختر أمر:" +msgstr "إختر أمر" #: ../settings/xfae-dialog.c:233 msgid "Edit application" msgstr "حرر تطبيقا" -#: ../settings/xfae-model.c:562 +#: ../settings/xfae-model.c:611 #, c-format msgid "Failed to unlink %s: %s" msgstr "فشل فك‌ربط %s: %s" -#: ../settings/xfae-model.c:651 +#: ../settings/xfae-model.c:700 #, c-format msgid "Failed to create file %s" msgstr "فشل إنشاء ملف %s" -#: ../settings/xfae-model.c:673 +#: ../settings/xfae-model.c:723 #, c-format msgid "Failed to write file %s" msgstr "فشل كتابة الملف ·%s" -#: ../settings/xfae-model.c:732 +#: ../settings/xfae-model.c:782 #, c-format msgid "Failed to open %s for reading" msgstr "فشل فتح %s للقراءة" -#: ../settings/xfae-model.c:841 ../settings/xfae-model.c:898 +#: ../settings/xfae-model.c:891 ../settings/xfae-model.c:948 #, c-format msgid "Failed to open %s for writing" msgstr "فشل في فتح الملف %s من أجل الكتابة" -#: ../settings/xfae-window.c:101 +#: ../settings/xfae-window.c:102 msgid "" "Below is the list of applications that will be started automatically when " "you login to your Xfce desktop, in addition to the applications that were " -"saved when you logged out last time:" +"saved when you logged out last time. Cursive applications belong to another " +"desktop environment, but you can still enable them if you want." msgstr "" -"هذه لائحة البرامج التي ستشغل بصفة تلقائية\n" -"عندما تقوم بالدخول الى سطح المكتب اكسفس\n" -"زيادة على البرامج التي سجلت عند آخر مرة\n" -"قمت فيها بالدخول:" +"هذه لائحة البرامج التي ستعمل تلقائياً عند تسجيل الدخول لسطح المكتب اكسفس " +"زيادة على البرامج التي سجلت عند آخر مرة قمت فيها بالدخول. التطبيقات التي تخص " +"بيئة سطح المكتب الأخرى يمكن تفعيلها إذا أردت." -#: ../settings/xfae-window.c:289 +#: ../settings/xfae-window.c:293 #, c-format msgid "Failed adding \"%s\"" msgstr "فشل إضافة \"%s\"" -#: ../settings/xfae-window.c:320 ../settings/xfae-window.c:334 +#: ../settings/xfae-window.c:324 ../settings/xfae-window.c:338 msgid "Failed to remove item" msgstr "فشل حذف العنصر" -#: ../settings/xfae-window.c:326 +#: ../settings/xfae-window.c:330 msgid "" "This will permanently remove the application from the list of automatically " "started applications" msgstr "هذا سيحذف نهائيا التطبيقات من قائمة التطبيقات مشغلة تلقائيا" -#: ../settings/xfae-window.c:328 +#: ../settings/xfae-window.c:332 #, c-format msgid "Are you sure you want to remove \"%s\"" -msgstr "هل أنت متأكد من أنك تريد حذف \"%s\"" +msgstr "متأكد أنك تريد حذف \"%s\"" -#: ../settings/xfae-window.c:362 +#: ../settings/xfae-window.c:366 msgid "Failed to edit item" msgstr "فشل تحرير العنصر" -#: ../settings/xfae-window.c:382 +#: ../settings/xfae-window.c:386 #, c-format msgid "Failed to edit item \"%s\"" msgstr "فشل تحرير العنصر \"%s\"" -#: ../settings/xfae-window.c:410 +#: ../settings/xfae-window.c:414 msgid "Failed to toggle item" msgstr "فشل تبديل العنصر" @@ -376,85 +392,23 @@ msgid "Disable binding to TCP ports" msgstr "تعطيل ربط إلى المنفذ TCP" -#: ../xfce4-session/main.c:77 ../xfce4-session-logout/main.c:93 +#: ../xfce4-session/main.c:77 ../xfce4-session-logout/main.c:91 msgid "Print version information and exit" msgstr "طباعة معلومات الإصدار والخروج" #: ../xfce4-session/main.c:140 msgid "Loading desktop settings" -msgstr "تحميل إعدادت سطح‌المكتب" - -#: ../xfce4-session/main.c:220 -msgid "Written by Benedikt Meurer ." -msgstr "كتب منطرف Benedikt Meurer ." - -#: ../xfce4-session/main.c:221 -#, c-format -msgid "Built with Gtk+-%d.%d.%d, running with Gtk+-%d.%d.%d" -msgstr "تم البناء بـ جتك+-%d.%d.%d, يعمل بـ جتك+-%d.%d.%d" +msgstr "تحميل إعدادت سطح‌ المكتب" #. verify that the DNS settings are ok -#: ../xfce4-session/main.c:253 +#: ../xfce4-session/main.c:298 msgid "Verifying DNS settings" msgstr "التحقق من إعدادات DNS" -#: ../xfce4-session/main.c:257 +#: ../xfce4-session/main.c:302 msgid "Loading session data" msgstr "تحميل بيانات الجلسة" -#: ../xfce4-session/shutdown.c:372 -#, c-format -msgid "Log out %s" -msgstr "خروج %s" - -#: ../xfce4-session/shutdown.c:422 -msgid "_Log Out" -msgstr "تسجيل ال_خروج" - -#: ../xfce4-session/shutdown.c:457 -msgid "_Restart" -msgstr "إعادة ال_تشغيل" - -#: ../xfce4-session/shutdown.c:499 -msgid "Shut _Down" -msgstr "إ_طفاء الجهاز" - -#: ../xfce4-session/shutdown.c:561 -msgid "Sus_pend" -msgstr "ت_عليق" - -#: ../xfce4-session/shutdown.c:599 -msgid "_Hibernate" -msgstr "أ_سبِت" - -#: ../xfce4-session/shutdown.c:608 -msgid "_Save session for future logins" -msgstr "_حفظ الجلسة ﻹستخدامات مستقبلية" - -#: ../xfce4-session/shutdown.c:668 -msgid "Please enter your password:" -msgstr "أدخل كلمة السر من فظلك:" - -#: ../xfce4-session/shutdown.c:700 -msgid "An error occurred" -msgstr "حدث خطأ" - -#: ../xfce4-session/shutdown.c:714 -msgid "" -"Either the password you entered is invalid, or the system administrator " -"disallows shutting down this computer with your user account." -msgstr "" -"إما أنك أدخلت كلمة السر الخاطئة، أو أن مدير الجهاز قام بإلغاء غلق الجهاز " -"إنطلاقا من حسابك." - -#: ../xfce4-session/shutdown.c:833 ../xfce4-session/xfsm-manager.c:1122 -msgid "Shutdown Failed" -msgstr "فشل إطفاء الجهاز" - -#: ../xfce4-session/shutdown.c:835 -msgid "Unable to perform shutdown" -msgstr "عاجز عن إطفاء الجهاز" - #: ../xfce4-session/xfsm-chooser.c:90 #, c-format msgid "Last accessed: %s" @@ -492,13 +446,13 @@ msgid "The client doesn't have any properties set yet" msgstr "العميل لا يتوفر على خصائص محددة بعد" -#: ../xfce4-session/xfsm-compat-gnome.c:246 +#: ../xfce4-session/xfsm-compat-gnome.c:239 msgid "Starting The Gnome Keyring Daemon" -msgstr "بداية خدمة المفاتيح جنوم " +msgstr "تشغيل بريمج حلقة مفاتيح جنوم" #: ../xfce4-session/xfsm-compat-kde.c:124 msgid "Starting KDE services" -msgstr "بدء خدمات كدي" +msgstr "تشغيل خدمات كدي" #: ../xfce4-session/xfsm-dns.c:78 msgid "(Unknown)" @@ -513,100 +467,124 @@ "%s to the file /etc/hosts on your system." msgstr "" "فشل في العثور على عنوان %s.\n" -"هذا سيمنع Xfce من الإشتغال بصفة سليمة.\n" -"يمكن إصلاح المشكلة بإضافة %s ﻹلى الملف /etc/hosts في النظام." +"هذا سيمنع اكسفيس من العمل بصفة سليمة.\n" +"يمكن إصلاح المشكلة بإضافة\n" +"%s لملف /etc/hosts في النظام." #: ../xfce4-session/xfsm-dns.c:154 msgid "Continue anyway" -msgstr "إستمرار رغم كل شيء" +msgstr "استمرار على أي حال" #: ../xfce4-session/xfsm-dns.c:155 msgid "Try again" -msgstr "حاول مجددا" +msgstr "محاولة مرة أخرى" -#: ../xfce4-session/xfsm-manager.c:604 +#: ../xfce4-session/xfsm-manager.c:609 #, c-format msgid "" "Unable to determine failsafe session name. Possible causes: xfconfd isn't " "running (D-Bus setup problem); environment variable $XDG_CONFIG_DIRS is set " "incorrectly (must include \"%s\"), or xfce4-session is installed incorrectly." -msgstr "غير قادر على تحديد إسم الجلسة الأمنة. الأسباب المحتملة: xfconfd لا يعمل (D-Bus setup problem); متغير البيئة $XDG_CONFIG_DIRS تم تحديده بطريقة غير سليم (يجب أن تشمل \"%s\"), أو xfce4-session متبت بطريقة غير سليمة." +msgstr "" +"غير قادر على تحديد إسم الجلسة الأمنة. الأسباب المحتملة: xfconfd لا يعمل " +"(D-Bus setup problem); متغير البيئة $XDG_CONFIG_DIRS تم تحديده بطريقة غير " +"سليم (يجب أن تشمل \"%s\"), أو جلسة اكسفيس4 متبت بطريقة غير سليمة." -#: ../xfce4-session/xfsm-manager.c:615 +#: ../xfce4-session/xfsm-manager.c:620 #, c-format msgid "" "The specified failsafe session (\"%s\") is not marked as a failsafe session." msgstr "الجلسة الأمنة المحددة (\"%s\") غير معلمة كجلسة امنة." -#: ../xfce4-session/xfsm-manager.c:662 +#: ../xfce4-session/xfsm-manager.c:667 msgid "The list of applications in the failsafe session is empty." msgstr "قائمة التطبيقات في الجلسة الأمنة فارغة." #. FIXME: migrate this into the splash screen somehow so the #. * window doesn't look ugly (right now now WM is running, so it #. * won't have window decorations). -#: ../xfce4-session/xfsm-manager.c:709 +#: ../xfce4-session/xfsm-manager.c:714 msgid "Session Manager Error" msgstr "خطأ في مدير الجلسة" -#: ../xfce4-session/xfsm-manager.c:711 +#: ../xfce4-session/xfsm-manager.c:716 msgid "Unable to load a failsafe session" msgstr "غير قادر على تحميل الجلسة الأمنة" -#: ../xfce4-session/xfsm-manager.c:1125 +#: ../xfce4-session/xfsm-manager.c:1123 +msgid "Shutdown Failed" +msgstr "فشل إطفاء الجهاز" + +#: ../xfce4-session/xfsm-manager.c:1126 msgid "Failed to suspend session" msgstr "فشل تعليق الجلسة" -#: ../xfce4-session/xfsm-manager.c:1126 +#: ../xfce4-session/xfsm-manager.c:1127 msgid "Failed to hibernate session" msgstr "فشل إسبات الجلسة" -#: ../xfce4-session/xfsm-manager.c:1414 +#: ../xfce4-session/xfsm-manager.c:1393 #, c-format msgid "Can only terminate clients when in the idle state" -msgstr "يمكن إنهاء العملاء فقط عنذما تكون في حالة خمول" +msgstr "يمكن إنهاء العملاء فقط عنذما يكونون في حالة خمول" -#: ../xfce4-session/xfsm-manager.c:1955 +#: ../xfce4-session/xfsm-manager.c:1956 #, c-format msgid "Session manager must be in idle state when requesting a checkpoint" -msgstr "مدير الجلسات يجب أن يكون في حالة خمول عند طلب نقطة التفتيش" +msgstr "مدير الجلسات يجب أن يكون في حالة خمول عند طلب نقطة فحص" -#: ../xfce4-session/xfsm-manager.c:1996 +#: ../xfce4-session/xfsm-manager.c:1997 #, c-format msgid "Session manager must be in idle state when requesting a shutdown" -msgstr "مدير الجلسات يجب أن يكون في حالة خمول عند طلب إطفاء الجهاز" +msgstr "مدير الجلسات يجب أن يكون في حالة خمول عند طلب إطفاء الجهاز" -#: ../xfce4-session/xfsm-manager.c:2003 +#: ../xfce4-session/xfsm-logout-dialog.c:188 #, c-format -msgid "Invalid shutdown type \"%u\"" -msgstr "إطفاء غير سليم \"%u\"" +msgid "Log out %s" +msgstr "تسجيل الخروج %s" -#: ../xfce4-session/xfsm-shutdown-helper.c:1601 -#, c-format -msgid "Error sending command to shutdown helper: %s" -msgstr "خطأ أثناء إرسال الأمر إلى مساعد إطفاء الحاسوب: %s" +#. * +#. * Logout +#. * +#: ../xfce4-session/xfsm-logout-dialog.c:246 +msgid "_Log Out" +msgstr "_تسجيل الخروج" -#: ../xfce4-session/xfsm-shutdown-helper.c:1615 -#, c-format -msgid "Error receiving response from shutdown helper: %s" -msgstr "خطأ أثناء إستقبال الأمر من مساعد إطفاء الحاسوب: %s" +#: ../xfce4-session/xfsm-logout-dialog.c:266 +msgid "_Restart" +msgstr "_إعادة التشغيل" -#: ../xfce4-session/xfsm-shutdown-helper.c:1624 -#, c-format -msgid "Shutdown command failed" -msgstr "فشل امر الإطفاء" +#: ../xfce4-session/xfsm-logout-dialog.c:286 +msgid "Shut _Down" +msgstr "إ_طفاء الجهاز" + +#: ../xfce4-session/xfsm-logout-dialog.c:309 +msgid "Sus_pend" +msgstr "ت_عليق" + +#: ../xfce4-session/xfsm-logout-dialog.c:343 +msgid "_Hibernate" +msgstr "_أسبِت" -#: ../xfce4-session/xfsm-shutdown-helper.c:1802 -msgid "Suspend failed, no backend supported" -msgstr "فشل التعليقة, العمل في الخلفية غير مدعوم" - -#: ../xfce4-session/xfsm-shutdown-helper.c:1829 -msgid "Hibernate failed, no backend supported" -msgstr "فشل إسبات, العمل في الخلفية غير مدعوم" - -#: ../xfce4-session/xfsm-shutdown-helper.c:1859 -msgid "Shutdown Command not found" -msgstr "لم يتم العثور على أمر إطفاء الجهاز" +#: ../xfce4-session/xfsm-logout-dialog.c:368 +msgid "_Save session for future logins" +msgstr "_حفظ الجلسة ﻹستخدامات مستقبلية" + +#: ../xfce4-session/xfsm-logout-dialog.c:395 +msgid "Please enter your password" +msgstr "من فضلك أدخل كلمة المرور" + +#: ../xfce4-session/xfsm-logout-dialog.c:427 +msgid "An error occurred" +msgstr "حدث خطأ" + +#: ../xfce4-session/xfsm-logout-dialog.c:433 +msgid "" +"Either the password you entered is invalid, or the system administrator " +"disallows shutting down this computer with your user account." +msgstr "" +"إما أنك أدخلت كلمة مرور خاطئة، أو أن مسئول النظام ألغى إمكانية غلق الجهاز من " +"جلستك." #: ../xfce4-session/xfsm-splash-screen.c:178 msgid "Choose session" @@ -620,88 +598,88 @@ msgid "Choose a name for the new session:" msgstr "إختر إسم الجلسة الجديدة:" -#: ../xfce4-session/xfsm-startup.c:115 +#: ../xfce4-session/xfsm-startup.c:347 msgid "Starting the Volume Controller" msgstr "بدء متحكم الصوت" -#: ../xfce4-session/xfsm-startup.c:117 +#: ../xfce4-session/xfsm-startup.c:349 msgid "Starting the Panel" msgstr "بدء الشريط" -#: ../xfce4-session/xfsm-startup.c:119 +#: ../xfce4-session/xfsm-startup.c:351 msgid "Starting the Desktop Manager" msgstr "بدء مدير سطح المكتب" -#: ../xfce4-session/xfsm-startup.c:121 +#: ../xfce4-session/xfsm-startup.c:353 msgid "Starting the Taskbar" msgstr "بدء شريط المهام" -#: ../xfce4-session/xfsm-startup.c:123 +#: ../xfce4-session/xfsm-startup.c:355 msgid "Starting the Window Manager" msgstr "بدء مدير النوافذ" -#: ../xfce4-session/xfsm-startup.c:127 +#: ../xfce4-session/xfsm-startup.c:359 msgid "Starting the Gnome Terminal Emulator" msgstr "بدء محاكي طرفية جنوم" -#: ../xfce4-session/xfsm-startup.c:131 +#: ../xfce4-session/xfsm-startup.c:363 msgid "Starting the KDE Advanced Text Editor" msgstr "بدء محرر نصوص المتقدم كدي" -#: ../xfce4-session/xfsm-startup.c:133 +#: ../xfce4-session/xfsm-startup.c:365 msgid "Starting the KDE Clipboard Manager" -msgstr "بدء مدير الذاكرة النصوص كدي" +msgstr "بدء مدير الذاكرة النصوص كدي" -#: ../xfce4-session/xfsm-startup.c:135 +#: ../xfce4-session/xfsm-startup.c:367 msgid "Starting the KDE Mail Reader" msgstr "بدء قارء البريد الالكتروني لـ كدي" -#: ../xfce4-session/xfsm-startup.c:137 +#: ../xfce4-session/xfsm-startup.c:369 msgid "Starting the KDE News Reader" msgstr "بدء قارء الأخبار كدي" -#: ../xfce4-session/xfsm-startup.c:139 +#: ../xfce4-session/xfsm-startup.c:371 msgid "Starting the Konqueror" msgstr "بدء كونكيرور" -#: ../xfce4-session/xfsm-startup.c:141 +#: ../xfce4-session/xfsm-startup.c:373 msgid "Starting the KDE Terminal Emulator" -msgstr "بدء محاطي طرفية كدي" +msgstr "بدء محاكي طرفية كدي" -#: ../xfce4-session/xfsm-startup.c:145 +#: ../xfce4-session/xfsm-startup.c:377 msgid "Starting the Beep Media Player" msgstr "بدء Beep مشغل الوسائط" -#: ../xfce4-session/xfsm-startup.c:147 +#: ../xfce4-session/xfsm-startup.c:379 msgid "Starting The Gimp" -msgstr "بداية جيمب" +msgstr "بداية جمب" -#: ../xfce4-session/xfsm-startup.c:149 +#: ../xfce4-session/xfsm-startup.c:381 msgid "Starting the VI Improved Editor" msgstr "بدء محرر النصوص VI" -#: ../xfce4-session/xfsm-startup.c:151 +#: ../xfce4-session/xfsm-startup.c:383 msgid "Starting the Session Management Proxy" msgstr "بدء بروكسي مدير الجلسة" -#: ../xfce4-session/xfsm-startup.c:153 +#: ../xfce4-session/xfsm-startup.c:385 msgid "Starting the X-Chat IRC Client" msgstr "بدء X-Chat·IRC" -#: ../xfce4-session/xfsm-startup.c:155 +#: ../xfce4-session/xfsm-startup.c:387 msgid "Starting the X Multimedia System" msgstr "بدء نظام الوسائط X" -#: ../xfce4-session/xfsm-startup.c:157 +#: ../xfce4-session/xfsm-startup.c:389 msgid "Starting the X Terminal Emulator" msgstr "بدء محاكي الطرفية X" -#: ../xfce4-session/xfsm-startup.c:159 +#: ../xfce4-session/xfsm-startup.c:391 #, c-format msgid "Starting %s" msgstr "بدء %s" -#: ../xfce4-session/xfsm-startup.c:283 +#: ../xfce4-session/xfsm-startup.c:515 #, c-format msgid "" "The location and the format of the autostart directory has changed.\n" @@ -720,67 +698,87 @@ "\n" " %s\n" "\n" -"حيث يمكنك وضع ملفات .desktop التي تصف\n" +"حيث يمكنك وضع ملفات سطح المكتب التي تصف\n" "البرامج المشغلة تلقائيا عند دخول المكتب.\n" -"الملفات القديمة الموجودة في مجلد autostart تم نقلها الى المكان \n" -"الجديد.\n" +"الملفات القديمة الموجودة في مجلد التشغيل التلقائي تم نقلها لمكان\n" +"جديد.\n" "عليك حذف هذا الملف الآن.\n" -#: ../xfce4-session/xfsm-startup.c:458 +#: ../xfce4-session/xfsm-startup.c:684 msgid "Performing Autostart..." msgstr "أداء بدء تلقائي..." -#: ../xfce4-session/xfsm-startup.c:564 +#: ../xfce4-session/xfsm-startup.c:790 msgid "Starting Assistive Technologies" -msgstr "بدء تقنيات المساعدة" +msgstr "بدء التقنيات المساعدة" + +#: ../xfce4-session/xfsm-shutdown.c:414 +#, c-format +msgid "Error sending command to shutdown helper: %s" +msgstr "خطأ أثناء إرسال الأمر إلى مساعد إطفاء الحاسوب: %s" + +#: ../xfce4-session/xfsm-shutdown.c:427 +#, c-format +msgid "Error receiving response from shutdown helper: %s" +msgstr "خطأ أثناء إستقبال الأمر من مساعد إطفاء الحاسوب: %s" + +#: ../xfce4-session/xfsm-shutdown.c:435 +#, c-format +msgid "Shutdown command failed" +msgstr "فشل امر الإطفاء" -#: ../xfce4-session-logout/main.c:69 +#: ../xfce4-session/xfsm-shutdown.c:540 +msgid "Shutdown is blocked by the kiosk settings" +msgstr "إيقاف التشغيل محظور بواسطة إعدادات kiosk" + +#: ../xfce4-session/xfsm-shutdown.c:623 +#, c-format +msgid "Unknown shutdown method %d" +msgstr "اسلوب إيقاف تشغيل غير معروف %d" + +#: ../xfce4-session-logout/main.c:67 msgid "Log out without displaying the logout dialog" msgstr "الخروج بدون عرض حوار الخروج" -#: ../xfce4-session-logout/main.c:73 +#: ../xfce4-session-logout/main.c:71 msgid "Halt without displaying the logout dialog" msgstr "إيقاف بدون عرض حوار الإيقاف" -#: ../xfce4-session-logout/main.c:77 +#: ../xfce4-session-logout/main.c:75 msgid "Reboot without displaying the logout dialog" msgstr "إعادة التشغيل بدون عرض حوار إعادة التشغيل" -#: ../xfce4-session-logout/main.c:81 +#: ../xfce4-session-logout/main.c:79 msgid "Suspend without displaying the logout dialog" msgstr "تعليق بدون عرض حوار التعليق" -#: ../xfce4-session-logout/main.c:85 +#: ../xfce4-session-logout/main.c:83 msgid "Hibernate without displaying the logout dialog" msgstr "إسبات بدون عرض حوار الإسبات" -#: ../xfce4-session-logout/main.c:89 +#: ../xfce4-session-logout/main.c:87 msgid "Log out quickly; don't save the session" msgstr "الخروج سريعا; بدون حفظ الجلسة" -#: ../xfce4-session-logout/main.c:107 -msgid "Logout Error" -msgstr "خطأ عنذ تسجيل الخروج" - -#: ../xfce4-session-logout/main.c:110 ../xfce4-session-logout/main.c:117 +#: ../xfce4-session-logout/main.c:110 msgid "Unknown error" msgstr "خطأ غبر معروف" -#: ../xfce4-session-logout/main.c:178 -msgid "Unable to contact D-Bus session bus." -msgstr "غير قادر على الإتصال بجلسة D-Bus." - -#: ../xfce4-session-logout/main.c:190 -msgid "Failed to create new D-Bus message" -msgstr "فشل في إنشاء رسالة D-Bus جديدة" - -#: ../xfce4-session-logout/main.c:206 -msgid "Failed to receive a reply from the session manager" -msgstr "فشل الإستقبال رد من مدير الجلسات" +#: ../xfce4-session-logout/main.c:136 +msgid "Written by Benedikt Meurer " +msgstr "كتب بواسطة Benedikt Meurer " + +#: ../xfce4-session-logout/main.c:137 +msgid "and Brian Tarricone ." +msgstr "وبريان تركون ." + +#: ../xfce4-session-logout/main.c:147 +msgid "Unable to contact D-Bus session bus" +msgstr "غير قادر على الاتصال بجلسة D-Bus" -#: ../xfce4-session-logout/main.c:214 +#: ../xfce4-session-logout/main.c:223 msgid "Received error while trying to log out" -msgstr "ورد خطأ عنذ محولة تسجيل الخروج" +msgstr "حصل خطأ أثناء محاولة تسجيل الخروج" #: ../xfce4-session-logout/xfce4-session-logout.desktop.in.h:1 msgid "Log Out" @@ -791,14 +789,14 @@ msgstr "تسجيل الخروج من سطح المكتب إكسفس" #: ../settings/xfce-session-settings.desktop.in.h:1 -#: ../settings/xfce4-session-settings.glade.h:14 +#: ../settings/xfce4-session-settings.glade.h:15 msgid "Customize desktop startup and splash screen" -msgstr "بدء التشغيل و شاشة البدء مخصصة لسطح المكتب" +msgstr "بدء التشغيل و شاشة بدء مخصصة لسطح المكتب" #: ../settings/xfce-session-settings.desktop.in.h:2 -#: ../settings/xfce4-session-settings.glade.h:28 +#: ../settings/xfce4-session-settings.glade.h:30 msgid "Session and Startup" -msgstr "الجلسة والبدء التشغيل" +msgstr "الجلسة وبدء التشغيل" #: ../settings/xfce4-session-settings.glade.h:1 msgid "Author:" @@ -810,11 +808,11 @@ #: ../settings/xfce4-session-settings.glade.h:3 msgid "Description:" -msgstr ":وصف" +msgstr "وصف :" #: ../settings/xfce4-session-settings.glade.h:4 msgid "Homepage:" -msgstr ":الصفحة الرئيسية" +msgstr "الصفحة الرئيسية:" #: ../settings/xfce4-session-settings.glade.h:5 msgid "Information" @@ -833,129 +831,171 @@ msgstr "محدد الجلسات" #: ../settings/xfce4-session-settings.glade.h:9 -msgid "Version:" -msgstr ":إصدار" +msgid "Shutdown" +msgstr "إيقاف التشغيل" #: ../settings/xfce4-session-settings.glade.h:10 +msgid "Version:" +msgstr "إصدار:" + +#: ../settings/xfce4-session-settings.glade.h:11 msgid "Ad_vanced" msgstr "م_تقدم" -#: ../settings/xfce4-session-settings.glade.h:11 +#: ../settings/xfce4-session-settings.glade.h:12 msgid "Always save the session when logging out" -msgstr "حفظ تلقائي للجلسة عند الخروج في كل الأحوال" +msgstr "حفظ تلقائي للجلسة عند الخروج دائما" -#: ../settings/xfce4-session-settings.glade.h:12 +#: ../settings/xfce4-session-settings.glade.h:13 msgid "Automatically save session on _logout" msgstr "حفظ تل_قائي للجلسة عند الخروج" -#: ../settings/xfce4-session-settings.glade.h:13 +#: ../settings/xfce4-session-settings.glade.h:14 msgid "Con_figure" msgstr "الإ_عدادات" -#: ../settings/xfce4-session-settings.glade.h:15 +#: ../settings/xfce4-session-settings.glade.h:16 msgid "Demonstrates the selected splash screen" msgstr "توضيح شاشة البدء المختارة" -#: ../settings/xfce4-session-settings.glade.h:16 +#: ../settings/xfce4-session-settings.glade.h:17 msgid "Display the session chooser every time Xfce starts" msgstr "إظهار محدد الجلسات في كل مرة يتم بدء إكسفس فيها" -#: ../settings/xfce4-session-settings.glade.h:17 +#: ../settings/xfce4-session-settings.glade.h:18 msgid "Empty the session cache" msgstr "إفراغ ذاكرة التخزين المؤقتة للجلسة" -#: ../settings/xfce4-session-settings.glade.h:18 +#: ../settings/xfce4-session-settings.glade.h:19 msgid "Launch GN_OME services on startup" msgstr "أطلاق خدمات جنو_م عند البداية" -#: ../settings/xfce4-session-settings.glade.h:19 +#: ../settings/xfce4-session-settings.glade.h:20 msgid "Launch _KDE services on startup" msgstr "أ_طلاق خدمات كدي عند البداية" -#: ../settings/xfce4-session-settings.glade.h:20 +#: ../settings/xfce4-session-settings.glade.h:21 msgid "Manage _remote applications" -msgstr "غدارة البطبيقات ال_بعيدة" +msgstr "إدارة التطبيقات ال_بعيدة" -#: ../settings/xfce4-session-settings.glade.h:21 +#: ../settings/xfce4-session-settings.glade.h:22 msgid "" "Manage remote applications over the network (this may be a security risk)" msgstr "إدارة التطبيقات البعيدة عبر الشبكة (هذا يمكن أن يشكل خطرا أمنيا)" -#: ../settings/xfce4-session-settings.glade.h:22 +#: ../settings/xfce4-session-settings.glade.h:23 msgid "Opens the configuration panel for the selected splash screen" msgstr "فتح لوحة الإعدادات لإختيار شاشة البدء" -#: ../settings/xfce4-session-settings.glade.h:23 +#: ../settings/xfce4-session-settings.glade.h:24 msgid "Prompt for confirmation when logging out" msgstr "موجه لتسجيل الخروج مع التأكيد" -#: ../settings/xfce4-session-settings.glade.h:24 +#: ../settings/xfce4-session-settings.glade.h:25 msgid "Quit the program, and remove it from the session" msgstr "خروج من البرنامج, و حذفه من الجلسة" -#: ../settings/xfce4-session-settings.glade.h:25 +#: ../settings/xfce4-session-settings.glade.h:26 +msgid "Run xflock4 before suspending or hibernating the system" +msgstr "تشغيل xflock4 قبل تعليق أو إسبات النظام" + +#: ../settings/xfce4-session-settings.glade.h:27 msgid "S_plash" msgstr "شاشة الب_دء" -#: ../settings/xfce4-session-settings.glade.h:26 +#: ../settings/xfce4-session-settings.glade.h:28 msgid "Save Sessio_n" -msgstr "_حفظ الجلسة" +msgstr "حفظ الجلسة" -#: ../settings/xfce4-session-settings.glade.h:27 +#: ../settings/xfce4-session-settings.glade.h:29 msgid "Saving Session" msgstr "حفظ الجلسة" -#: ../settings/xfce4-session-settings.glade.h:29 -msgid "" -"Start GNOME services, such as gnome-keyring and the GNOME accessibility " -"framework" -msgstr "بدء خدمات جنوم, مثل gnome-keyring و GNOME accessibility framework" +#: ../settings/xfce4-session-settings.glade.h:31 +msgid "Start GNOME services, such as gnome-keyring" +msgstr "بدء تشغيل خدمات جنوم، مثل حلقة مفاتيح جنوم" -#: ../settings/xfce4-session-settings.glade.h:30 -msgid "Start KDE services, such as \"kdeinit,\" DCOP, and ARTS" -msgstr "بدء خدمات كدي, مثل \"kdeinit,\" DCOP, و ARTS" +#: ../settings/xfce4-session-settings.glade.h:32 +msgid "Start KDE services, such as kdeinit" +msgstr "بدء تشغيل خدمات كدي، مثل kdeinit" -#: ../settings/xfce4-session-settings.glade.h:31 +#: ../settings/xfce4-session-settings.glade.h:33 msgid "" "These applications are a part of the currently-running session, and can be " "saved when you log out. Changes below will only take effect when the " "session is saved." -msgstr "هذه التطبيقات جزء من الجلسة المشغلة حاليا, و يمكن حفظها غند تسجيل الخروج, التغيرات أدناه سوف يتم أخد فقط التأتيرات عند حفظ الخلسة." +msgstr "" +"هذه التطبيقات جزء من جلسة التشغيل حاليا، ويمكن حفظها عند تسجيل الخروج. " +"التغييرات أدناه ستدخل حيز التنفيذ فقط عند حفظ الجلسة." -#: ../settings/xfce4-session-settings.glade.h:32 +#: ../settings/xfce4-session-settings.glade.h:34 msgid "" "Your session is being saved. If you do not wish to wait, you may close this " "window." -msgstr "يجري حفظ جلستك. إن لم ترغب بالإنتظار, يمكن إغلاق النافذة." +msgstr "يجري حفظ جلستك. إن لم ترغب بالإنتظار, يمكن إغلاق النافذة." -#: ../settings/xfce4-session-settings.glade.h:33 +#: ../settings/xfce4-session-settings.glade.h:35 msgid "_Clear saved sessions" -msgstr "محو الجل_سات المحفوظة" +msgstr "_محو السجلات المحفوظة" -#: ../settings/xfce4-session-settings.glade.h:34 +#: ../settings/xfce4-session-settings.glade.h:36 msgid "_Display chooser on login" -msgstr "أظهر الإ_ختيار عند الدخول" +msgstr "_عرض الإختيار عند الدخول" -#: ../settings/xfce4-session-settings.glade.h:35 +#: ../settings/xfce4-session-settings.glade.h:37 msgid "_General" msgstr "_عام" -#: ../settings/xfce4-session-settings.glade.h:36 +#: ../settings/xfce4-session-settings.glade.h:38 +msgid "_Lock screen before sleep" +msgstr "_قفل الشاشة قبل الإسبات" + +#: ../settings/xfce4-session-settings.glade.h:39 msgid "_Prompt on logout" -msgstr "تسخيل الخ_روج سريع" +msgstr "_تسجيل الخروج السريع" -#: ../settings/xfce4-session-settings.glade.h:38 +#: ../settings/xfce4-session-settings.glade.h:41 msgid "_Session" msgstr "_جلسة" -#: ../settings/xfce4-session-settings.glade.h:39 +#: ../settings/xfce4-session-settings.glade.h:42 msgid "_Test" msgstr "_تجريب" -#: ../settings/xfce4-session-settings.glade.h:40 +#: ../settings/xfce4-session-settings.glade.h:43 msgid "label" msgstr "وسم" +#~ msgid "Built with Gtk+-%d.%d.%d, running with Gtk+-%d.%d.%d" +#~ msgstr "تم البناء بـ جتك+-%d.%d.%d, يعمل بـ جتك+-%d.%d.%d" + +#~ msgid "Log out %s" +#~ msgstr "خروج %s" + +#~ msgid "Unable to perform shutdown" +#~ msgstr "عاجز عن إطفاء الجهاز" + +#~ msgid "Invalid shutdown type \"%u\"" +#~ msgstr "إطفاء غير سليم \"%u\"" + +#~ msgid "Suspend failed, no backend supported" +#~ msgstr "فشل التعليقة, العمل في الخلفية غير مدعوم" + +#~ msgid "Hibernate failed, no backend supported" +#~ msgstr "فشل إسبات, العمل في الخلفية غير مدعوم" + +#~ msgid "Shutdown Command not found" +#~ msgstr "لم يتم العثور على أمر إطفاء الجهاز" + +#~ msgid "Logout Error" +#~ msgstr "خطأ عنذ تسجيل الخروج" + +#~ msgid "Failed to create new D-Bus message" +#~ msgstr "فشل في إنشاء رسالة D-Bus جديدة" + +#~ msgid "Failed to receive a reply from the session manager" +#~ msgstr "فشل الإستقبال رد من مدير الجلسات" + #~ msgid "Session" #~ msgstr "جلسة" diff -Nru xfce4-session-4.10.0/po/bg.po xfce4-session-4.10.1/po/bg.po --- xfce4-session-4.10.0/po/bg.po 2012-04-28 20:43:27.000000000 +0000 +++ xfce4-session-4.10.1/po/bg.po 2013-05-05 15:33:55.000000000 +0000 @@ -7,9 +7,9 @@ msgstr "" "Project-Id-Version: xfce4-sseion.master\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2012-01-01 10:30+0000\n" -"PO-Revision-Date: 2012-01-01 17:20+0200\n" -"Last-Translator: Milen Milev \n" +"POT-Creation-Date: 2013-01-31 19:36+0000\n" +"PO-Revision-Date: 2013-01-31 22:55+0200\n" +"Last-Translator: Cybercop \n" "Language-Team: BULGARIAN\n" "Language: \n" "MIME-Version: 1.0\n" @@ -21,7 +21,7 @@ #: ../xfce.desktop.in.h:1 msgid "Use this session to run Xfce as your desktop environment" -msgstr "Използвайте тази сесия за изпълнение на Xfce като ваша графична среда" +msgstr "Използвайте тази сесия за стартиране на Xfce като вашата графична среда" #: ../xfce.desktop.in.h:2 msgid "Xfce Session" @@ -55,7 +55,7 @@ #: ../engines/balou/config.c:491 msgid "Choose theme filename..." -msgstr "Избери име на темата:" +msgstr "Избери име на темата..." #: ../engines/balou/config.c:624 msgid "_Install new theme" @@ -95,7 +95,7 @@ #: ../engines/simple/simple.c:346 msgid "Configure Simple..." -msgstr "Опции на Основна..." +msgstr "Опции на основната тема..." #: ../engines/simple/simple.c:357 msgid "Font" @@ -141,6 +141,14 @@ msgid "Simple Splash Engine" msgstr "Основна Splash Engine" +#: ../scripts/xscreensaver.desktop.in.h:1 +msgid "Launch screensaver and locker program" +msgstr "Стартиране на предпазителя на екрана програмата за заключване" + +#: ../scripts/xscreensaver.desktop.in.h:2 +msgid "Screensaver" +msgstr "Предпазител на екрана" + #: ../settings/main.c:43 msgid "Settings manager socket" msgstr "Гнездо за управление на настройките" @@ -153,28 +161,31 @@ msgid "Version information" msgstr "Информация за версията" -#: ../settings/main.c:74 +#: ../settings/main.c:75 +#: ../xfce4-session/main.c:257 #, c-format msgid "Type '%s --help' for usage." msgstr "Напишете '%s --help' за начин на употреба." -#: ../settings/main.c:86 -#: ../xfce4-session/main.c:219 +#: ../settings/main.c:87 +#: ../xfce4-session/main.c:267 +#: ../xfce4-session-logout/main.c:135 msgid "The Xfce development team. All rights reserved." msgstr "Екипът за разработка на Xfce. Всички права запазени." -#: ../settings/main.c:87 -#: ../xfce4-session/main.c:225 +#: ../settings/main.c:88 +#: ../xfce4-session/main.c:268 +#: ../xfce4-session-logout/main.c:138 #, c-format msgid "Please report bugs to <%s>." msgstr "Докладвайте за грешки на <%s>." -#: ../settings/main.c:96 -#: ../xfce4-session/main.c:231 +#: ../settings/main.c:97 +#: ../xfce4-session/main.c:276 msgid "Unable to contact settings server" msgstr "Не може да се свърже със сървъра за настройки" -#: ../settings/main.c:115 +#: ../settings/main.c:116 msgid "Unable to create user interface from embedded definition data" msgstr "Не може да се създаде потребителски интерфейс от въведените данни" @@ -184,7 +195,7 @@ #: ../settings/session-editor.c:61 msgid "If running" -msgstr "ако е стартирана" +msgstr "Ако е стартирана" #: ../settings/session-editor.c:62 msgid "Always" @@ -212,7 +223,7 @@ #: ../settings/session-editor.c:171 msgid "Are you sure you want to empty the session cache?" -msgstr "Наистина ли искате да опразните кеша на сесията?" +msgstr "Наистина ли искате да изчистите кеша на сесията?" #: ../settings/session-editor.c:172 msgid "The saved states of your applications will not be restored during your next login." @@ -223,53 +234,54 @@ msgstr "Продължи" #: ../settings/session-editor.c:212 -msgid "You might need to delete some files manually in " -msgstr "Трябва да изтриете някои файлове ръчно" +#, c-format +msgid "You might need to delete some files manually in \"%s\"." +msgstr "Трябва да изтриете някои файлове ръчно от \"%s\"." -#: ../settings/session-editor.c:216 +#: ../settings/session-editor.c:215 msgid "All Xfce cache files could not be cleared" -msgstr "Всички Xfce кеш файлове не могат да се опразват" +msgstr "Не могат да се изчистят всички Xfce кеш файлове" -#: ../settings/session-editor.c:250 +#: ../settings/session-editor.c:249 #, c-format msgid "Are you sure you want to terminate \"%s\"?" msgstr "Наистина ли искате да спрете \"%s\"?" -#: ../settings/session-editor.c:253 -#: ../settings/session-editor.c:281 +#: ../settings/session-editor.c:252 +#: ../settings/session-editor.c:280 msgid "Terminate Program" -msgstr "Спри програма" +msgstr "Спри програмата" -#: ../settings/session-editor.c:255 +#: ../settings/session-editor.c:254 msgid "The application will lose any unsaved state and will not be restarted in your next session." msgstr "Програмата ще загуби всяко незапазено състояние и няма да бъде стартирана при следващата сесия" -#: ../settings/session-editor.c:257 -#: ../settings/xfce4-session-settings.glade.h:37 +#: ../settings/session-editor.c:256 +#: ../settings/xfce4-session-settings.glade.h:40 msgid "_Quit Program" -msgstr "Излез от програмата" +msgstr "Изход от програмата" -#: ../settings/session-editor.c:282 +#: ../settings/session-editor.c:281 msgid "Unable to terminate program." msgstr "Не може да се спре програмата." -#: ../settings/session-editor.c:460 +#: ../settings/session-editor.c:459 msgid "(Unknown program)" msgstr "(Непозната програма)" -#: ../settings/session-editor.c:680 +#: ../settings/session-editor.c:679 msgid "Priority" msgstr "Приоритет" -#: ../settings/session-editor.c:688 +#: ../settings/session-editor.c:687 msgid "PID" msgstr "PID" -#: ../settings/session-editor.c:694 +#: ../settings/session-editor.c:693 msgid "Program" msgstr "Програма" -#: ../settings/session-editor.c:719 +#: ../settings/session-editor.c:718 msgid "Restart Style" msgstr "Рестартирай стила" @@ -294,6 +306,7 @@ msgstr "Описание:" #: ../settings/xfae-dialog.c:124 +#: ../settings/xfae-model.c:479 msgid "Command:" msgstr "Команда:" @@ -305,65 +318,65 @@ msgid "Edit application" msgstr "Редактирай приложение" -#: ../settings/xfae-model.c:562 +#: ../settings/xfae-model.c:611 #, c-format msgid "Failed to unlink %s: %s" msgstr "Неуспех при премахването на връзка %s: %s" -#: ../settings/xfae-model.c:651 +#: ../settings/xfae-model.c:700 #, c-format msgid "Failed to create file %s" -msgstr "Неуспех при създаването на %s" +msgstr "Неуспех при създаването на файл %s" -#: ../settings/xfae-model.c:673 +#: ../settings/xfae-model.c:723 #, c-format msgid "Failed to write file %s" msgstr "Не може да се запише файла %s" -#: ../settings/xfae-model.c:732 +#: ../settings/xfae-model.c:782 #, c-format msgid "Failed to open %s for reading" msgstr "Не може да се отвори %s за четене" -#: ../settings/xfae-model.c:841 -#: ../settings/xfae-model.c:898 +#: ../settings/xfae-model.c:891 +#: ../settings/xfae-model.c:948 #, c-format msgid "Failed to open %s for writing" msgstr "Не може да се отвори %s за запис" -#: ../settings/xfae-window.c:101 -msgid "Below is the list of applications that will be started automatically when you login to your Xfce desktop, in addition to the applications that were saved when you logged out last time:" -msgstr "Отдолу е списъкът с програми, които ще бъдат автоматично стартирани, когато влезете във Вашата Xfce система, в сравнение с програмите които са били запазени при последното Ви влизане: " +#: ../settings/xfae-window.c:102 +msgid "Below is the list of applications that will be started automatically when you login to your Xfce desktop, in addition to the applications that were saved when you logged out last time. Cursive applications belong to another desktop environment, but you can still enable them if you want." +msgstr "Отдолу е списъкът с програми, които ще бъдат автоматично стартирани, когато влезете във Вашата Xfce система, в допълнение на програмите които са били запазени при последното Ви влизане." -#: ../settings/xfae-window.c:289 +#: ../settings/xfae-window.c:293 #, c-format msgid "Failed adding \"%s\"" msgstr "Не може да се добави \"%s\"" -#: ../settings/xfae-window.c:320 -#: ../settings/xfae-window.c:334 +#: ../settings/xfae-window.c:324 +#: ../settings/xfae-window.c:338 msgid "Failed to remove item" msgstr "Не може да се премахне обект" -#: ../settings/xfae-window.c:326 +#: ../settings/xfae-window.c:330 msgid "This will permanently remove the application from the list of automatically started applications" msgstr "Това ще премахне програмата от списъка с автоматично стартираните програми." -#: ../settings/xfae-window.c:328 +#: ../settings/xfae-window.c:332 #, c-format msgid "Are you sure you want to remove \"%s\"" msgstr "Наистина ли искате да премахнете \"%s\"?" -#: ../settings/xfae-window.c:362 +#: ../settings/xfae-window.c:366 msgid "Failed to edit item" msgstr "Не може да се редактира обект" -#: ../settings/xfae-window.c:382 +#: ../settings/xfae-window.c:386 #, c-format msgid "Failed to edit item \"%s\"" msgstr "Не може да се редактира обекта \"%s\"" -#: ../settings/xfae-window.c:410 +#: ../settings/xfae-window.c:414 msgid "Failed to toggle item" msgstr "Не може да се нагласи обекта" @@ -372,86 +385,27 @@ msgstr "Забрани свързването към TCP портове." #: ../xfce4-session/main.c:77 -#: ../xfce4-session-logout/main.c:93 +#: ../xfce4-session-logout/main.c:91 msgid "Print version information and exit" -msgstr "Изписва инфо за версията и изход" +msgstr "Изписване на информация за версията и изход" #: ../xfce4-session/main.c:140 msgid "Loading desktop settings" -msgstr "Зареди настройки на десктопа" - -#: ../xfce4-session/main.c:220 -msgid "Written by Benedikt Meurer ." -msgstr "Написано от Benedikt Meurer ." - -#: ../xfce4-session/main.c:221 -#, c-format -msgid "Built with Gtk+-%d.%d.%d, running with Gtk+-%d.%d.%d" -msgstr "Изграден с GTK+ %d.%d.%d ,изпълнено с GTK+ %d.%d.%d." +msgstr "Зареждане настройките на десктопа" #. verify that the DNS settings are ok -#: ../xfce4-session/main.c:253 +#: ../xfce4-session/main.c:298 msgid "Verifying DNS settings" msgstr "Проверка на DNS настройките" -#: ../xfce4-session/main.c:257 +#: ../xfce4-session/main.c:302 msgid "Loading session data" msgstr "Зареждане на данните за сесията" -#: ../xfce4-session/shutdown.c:372 -#, c-format -msgid "Log out %s" -msgstr "Изход %s" - -#: ../xfce4-session/shutdown.c:422 -msgid "_Log Out" -msgstr "Изход" - -#: ../xfce4-session/shutdown.c:457 -msgid "_Restart" -msgstr "Рестартиране" - -#: ../xfce4-session/shutdown.c:499 -msgid "Shut _Down" -msgstr "Изключване" - -#: ../xfce4-session/shutdown.c:561 -msgid "Sus_pend" -msgstr "Приспиване" - -#: ../xfce4-session/shutdown.c:599 -msgid "_Hibernate" -msgstr "Дълбоко приспиване" - -#: ../xfce4-session/shutdown.c:608 -msgid "_Save session for future logins" -msgstr "Запази сесията за бъдещи влизания в системата" - -#: ../xfce4-session/shutdown.c:668 -msgid "Please enter your password:" -msgstr "Въведете Вашата парола:" - -#: ../xfce4-session/shutdown.c:700 -msgid "An error occurred" -msgstr "Възникна грешка" - -#: ../xfce4-session/shutdown.c:714 -msgid "Either the password you entered is invalid, or the system administrator disallows shutting down this computer with your user account." -msgstr "Или въведената паролата е грешна, или системният администратор е забранил на Вашият потребител да изключва този компютър." - -#: ../xfce4-session/shutdown.c:833 -#: ../xfce4-session/xfsm-manager.c:1122 -msgid "Shutdown Failed" -msgstr "Изключването е неуспешно" - -#: ../xfce4-session/shutdown.c:835 -msgid "Unable to perform shutdown" -msgstr " Не мога да се изпълни Изключване" - #: ../xfce4-session/xfsm-chooser.c:90 #, c-format msgid "Last accessed: %s" -msgstr "Достъп: %s" +msgstr "Последен достъп: %s" #: ../xfce4-session/xfsm-chooser.c:172 msgid "Choose the session you want to restore. You can simply double-click the session name to restore it." @@ -482,7 +436,7 @@ msgid "The client doesn't have any properties set yet" msgstr "Клиентът все още няма зададени настройки" -#: ../xfce4-session/xfsm-compat-gnome.c:246 +#: ../xfce4-session/xfsm-compat-gnome.c:239 msgid "Starting The Gnome Keyring Daemon" msgstr "Стартиране на Gnome Keyring Daemon" @@ -515,89 +469,105 @@ msgid "Try again" msgstr "Опитай отново" -#: ../xfce4-session/xfsm-manager.c:604 +#: ../xfce4-session/xfsm-manager.c:611 #, c-format msgid "Unable to determine failsafe session name. Possible causes: xfconfd isn't running (D-Bus setup problem); environment variable $XDG_CONFIG_DIRS is set incorrectly (must include \"%s\"), or xfce4-session is installed incorrectly." msgstr "Не може да се определи името на безопасната сесия. Възможни причини: xfconfd не работи (D-Bus проблем с настройките); променливата на средата $XDG_CONFIG_DIRS не е зададена коректно (трябва да включва \"%s\"), или xfce4-session е инсталирана неправилно." -#: ../xfce4-session/xfsm-manager.c:615 +#: ../xfce4-session/xfsm-manager.c:622 #, c-format msgid "The specified failsafe session (\"%s\") is not marked as a failsafe session." msgstr "Посочената безопасна сесия (\"%s\" не е маркирана като такава." -#: ../xfce4-session/xfsm-manager.c:662 +#: ../xfce4-session/xfsm-manager.c:669 msgid "The list of applications in the failsafe session is empty." msgstr "Списъкът с програми за безопасна сесия е празен." #. FIXME: migrate this into the splash screen somehow so the #. * window doesn't look ugly (right now now WM is running, so it #. * won't have window decorations). -#: ../xfce4-session/xfsm-manager.c:709 +#: ../xfce4-session/xfsm-manager.c:716 msgid "Session Manager Error" msgstr "Грешка в управлението на сесиите" -#: ../xfce4-session/xfsm-manager.c:711 +#: ../xfce4-session/xfsm-manager.c:718 msgid "Unable to load a failsafe session" msgstr "Не може да се зареди безопасна сесия" -#: ../xfce4-session/xfsm-manager.c:1125 +#: ../xfce4-session/xfsm-manager.c:1127 +msgid "Shutdown Failed" +msgstr "Изключването е неуспешно" + +#: ../xfce4-session/xfsm-manager.c:1130 msgid "Failed to suspend session" msgstr "Не може да се приспи сесията" -#: ../xfce4-session/xfsm-manager.c:1126 +#: ../xfce4-session/xfsm-manager.c:1131 msgid "Failed to hibernate session" msgstr "Не може дълбоко да се приспи сесията" -#: ../xfce4-session/xfsm-manager.c:1414 +#: ../xfce4-session/xfsm-manager.c:1405 #, c-format msgid "Can only terminate clients when in the idle state" msgstr "Може да се спират клиенти само когато са в готовност." -#: ../xfce4-session/xfsm-manager.c:1955 +#: ../xfce4-session/xfsm-manager.c:1969 #, c-format msgid "Session manager must be in idle state when requesting a checkpoint" msgstr "Управлението на сесиите трябва да е в готовност при заявка за проверка" -#: ../xfce4-session/xfsm-manager.c:1996 +#: ../xfce4-session/xfsm-manager.c:2010 #, c-format msgid "Session manager must be in idle state when requesting a shutdown" msgstr "Управлението на сесиите трябва да е в готовност при заявка за изключване" -#: ../xfce4-session/xfsm-manager.c:2003 +#: ../xfce4-session/xfsm-logout-dialog.c:188 #, c-format -msgid "Invalid shutdown type \"%u\"" -msgstr "Невалиден тип на изключване \"%u\"" +msgid "Log out %s" +msgstr "Изход от %s" -#: ../xfce4-session/xfsm-shutdown-helper.c:1601 -#, c-format -msgid "Error sending command to shutdown helper: %s" -msgstr "Грешка при изпращане на команда към помощника за изключване: %s" +#. * +#. * Logout +#. * +#: ../xfce4-session/xfsm-logout-dialog.c:246 +msgid "_Log Out" +msgstr "Изход" -#: ../xfce4-session/xfsm-shutdown-helper.c:1615 -#, c-format -msgid "Error receiving response from shutdown helper: %s" -msgstr "Грешка при получаване на отговор от помощника за изключване: %s" +#: ../xfce4-session/xfsm-logout-dialog.c:266 +msgid "_Restart" +msgstr "Рестартиране" -#: ../xfce4-session/xfsm-shutdown-helper.c:1624 -#, c-format -msgid "Shutdown command failed" -msgstr "Командата за изключване пропадна" +#: ../xfce4-session/xfsm-logout-dialog.c:286 +msgid "Shut _Down" +msgstr "Изключване" + +#: ../xfce4-session/xfsm-logout-dialog.c:309 +msgid "Sus_pend" +msgstr "Приспиване" + +#: ../xfce4-session/xfsm-logout-dialog.c:343 +msgid "_Hibernate" +msgstr "Дълбоко приспиване" -#: ../xfce4-session/xfsm-shutdown-helper.c:1802 -msgid "Suspend failed, no backend supported" -msgstr "Приспиването пропадна, не се поддържа" - -#: ../xfce4-session/xfsm-shutdown-helper.c:1829 -msgid "Hibernate failed, no backend supported" -msgstr "Дълбокото приспиване пропадна, не се поддържа" - -#: ../xfce4-session/xfsm-shutdown-helper.c:1859 -msgid "Shutdown Command not found" -msgstr "Командата за изключване не е намерена" +#: ../xfce4-session/xfsm-logout-dialog.c:368 +msgid "_Save session for future logins" +msgstr "Запази сесията за бъдещи влизания в системата" + +#: ../xfce4-session/xfsm-logout-dialog.c:395 +msgid "Please enter your password" +msgstr "Моля, въведете Вашата парола" + +#: ../xfce4-session/xfsm-logout-dialog.c:427 +msgid "An error occurred" +msgstr "Възникна грешка" + +#: ../xfce4-session/xfsm-logout-dialog.c:433 +msgid "Either the password you entered is invalid, or the system administrator disallows shutting down this computer with your user account." +msgstr "Или въведената паролата е грешна, или системният администратор е забранил на Вашият потребител да изключва този компютър." #: ../xfce4-session/xfsm-splash-screen.c:178 msgid "Choose session" -msgstr "Избери сесия" +msgstr "Избор на сесия" #: ../xfce4-session/xfsm-splash-screen.c:208 msgid "Choose session name" @@ -607,88 +577,88 @@ msgid "Choose a name for the new session:" msgstr "Избери име за новата сесия:" -#: ../xfce4-session/xfsm-startup.c:115 +#: ../xfce4-session/xfsm-startup.c:347 msgid "Starting the Volume Controller" msgstr "Стартиране управлението на звука" -#: ../xfce4-session/xfsm-startup.c:117 +#: ../xfce4-session/xfsm-startup.c:349 msgid "Starting the Panel" msgstr "Стартиране на панела" -#: ../xfce4-session/xfsm-startup.c:119 +#: ../xfce4-session/xfsm-startup.c:351 msgid "Starting the Desktop Manager" msgstr "Стартиране управлението на десктопа" -#: ../xfce4-session/xfsm-startup.c:121 +#: ../xfce4-session/xfsm-startup.c:353 msgid "Starting the Taskbar" msgstr "Стартиране на лентата за задачите" -#: ../xfce4-session/xfsm-startup.c:123 +#: ../xfce4-session/xfsm-startup.c:355 msgid "Starting the Window Manager" msgstr "Стартиране на управлението на прозорците" -#: ../xfce4-session/xfsm-startup.c:127 +#: ../xfce4-session/xfsm-startup.c:359 msgid "Starting the Gnome Terminal Emulator" msgstr "Стартиране на терминала на Gnome" -#: ../xfce4-session/xfsm-startup.c:131 +#: ../xfce4-session/xfsm-startup.c:363 msgid "Starting the KDE Advanced Text Editor" msgstr "Стартиране на KDE Advanced Text Editor" -#: ../xfce4-session/xfsm-startup.c:133 +#: ../xfce4-session/xfsm-startup.c:365 msgid "Starting the KDE Clipboard Manager" msgstr "Стартиране на KDE Clipboard Manager" -#: ../xfce4-session/xfsm-startup.c:135 +#: ../xfce4-session/xfsm-startup.c:367 msgid "Starting the KDE Mail Reader" msgstr "Стартиране на KDE Mail Reader" -#: ../xfce4-session/xfsm-startup.c:137 +#: ../xfce4-session/xfsm-startup.c:369 msgid "Starting the KDE News Reader" msgstr "Стартиране на KDE News Reader" -#: ../xfce4-session/xfsm-startup.c:139 +#: ../xfce4-session/xfsm-startup.c:371 msgid "Starting the Konqueror" msgstr "Стартиране на Konqueror" -#: ../xfce4-session/xfsm-startup.c:141 +#: ../xfce4-session/xfsm-startup.c:373 msgid "Starting the KDE Terminal Emulator" msgstr "Стартиране на терминала на KDE" -#: ../xfce4-session/xfsm-startup.c:145 +#: ../xfce4-session/xfsm-startup.c:377 msgid "Starting the Beep Media Player" msgstr "Стартиране на Beep Media Player" -#: ../xfce4-session/xfsm-startup.c:147 +#: ../xfce4-session/xfsm-startup.c:379 msgid "Starting The Gimp" msgstr "Стартиране на Gimp" -#: ../xfce4-session/xfsm-startup.c:149 +#: ../xfce4-session/xfsm-startup.c:381 msgid "Starting the VI Improved Editor" msgstr "Стартиране на VI подобрен редактор" -#: ../xfce4-session/xfsm-startup.c:151 +#: ../xfce4-session/xfsm-startup.c:383 msgid "Starting the Session Management Proxy" msgstr "Стартиране на Session Management Proxy" -#: ../xfce4-session/xfsm-startup.c:153 +#: ../xfce4-session/xfsm-startup.c:385 msgid "Starting the X-Chat IRC Client" msgstr "Стартиране на X-Chat IRC клиент" -#: ../xfce4-session/xfsm-startup.c:155 +#: ../xfce4-session/xfsm-startup.c:387 msgid "Starting the X Multimedia System" msgstr "Стартиране на X Мултимедийна система" -#: ../xfce4-session/xfsm-startup.c:157 +#: ../xfce4-session/xfsm-startup.c:389 msgid "Starting the X Terminal Emulator" msgstr "Стартиране терминала на X" -#: ../xfce4-session/xfsm-startup.c:159 +#: ../xfce4-session/xfsm-startup.c:391 #, c-format msgid "Starting %s" msgstr "Стартиране на %s" -#: ../xfce4-session/xfsm-startup.c:283 +#: ../xfce4-session/xfsm-startup.c:515 #, c-format msgid "" "The location and the format of the autostart directory has changed.\n" @@ -712,60 +682,79 @@ "папка за автостартиране, бяха успешно пренесени в новата.\n" "Трябва да изтриете тази папка сега.\n" -#: ../xfce4-session/xfsm-startup.c:458 +#: ../xfce4-session/xfsm-startup.c:684 msgid "Performing Autostart..." msgstr "Автостартиране..." -#: ../xfce4-session/xfsm-startup.c:564 +#: ../xfce4-session/xfsm-startup.c:790 msgid "Starting Assistive Technologies" msgstr "Стартиране на помощни технологии" -#: ../xfce4-session-logout/main.c:69 +#: ../xfce4-session/xfsm-shutdown.c:414 +#, c-format +msgid "Error sending command to shutdown helper: %s" +msgstr "Грешка при изпращане на команда към помощника за изключване: %s" + +#: ../xfce4-session/xfsm-shutdown.c:427 +#, c-format +msgid "Error receiving response from shutdown helper: %s" +msgstr "Грешка при получаване на отговор от помощника за изключване: %s" + +#: ../xfce4-session/xfsm-shutdown.c:435 +#, c-format +msgid "Shutdown command failed" +msgstr "Командата за изключване пропадна" + +#: ../xfce4-session/xfsm-shutdown.c:540 +msgid "Shutdown is blocked by the kiosk settings" +msgstr "Изключването е блокирано от настройките на kiosk" + +#: ../xfce4-session/xfsm-shutdown.c:623 +#, c-format +msgid "Unknown shutdown method %d" +msgstr "Непознат метод за изключване %d" + +#: ../xfce4-session-logout/main.c:67 msgid "Log out without displaying the logout dialog" msgstr "Излизане без показване диалога за изход" -#: ../xfce4-session-logout/main.c:73 +#: ../xfce4-session-logout/main.c:71 msgid "Halt without displaying the logout dialog" msgstr "Изключване без показване диалога за изход" -#: ../xfce4-session-logout/main.c:77 +#: ../xfce4-session-logout/main.c:75 msgid "Reboot without displaying the logout dialog" msgstr "Рестартиране без показване диалога за изход" -#: ../xfce4-session-logout/main.c:81 +#: ../xfce4-session-logout/main.c:79 msgid "Suspend without displaying the logout dialog" msgstr "Приспиване без показване диалога за изход" -#: ../xfce4-session-logout/main.c:85 +#: ../xfce4-session-logout/main.c:83 msgid "Hibernate without displaying the logout dialog" msgstr "Дълбоко приспиване без показване диалога за изход" -#: ../xfce4-session-logout/main.c:89 +#: ../xfce4-session-logout/main.c:87 msgid "Log out quickly; don't save the session" msgstr "Бърз изход; не запазвай сесията" -#: ../xfce4-session-logout/main.c:107 -msgid "Logout Error" -msgstr "Грешка при Изход" - #: ../xfce4-session-logout/main.c:110 -#: ../xfce4-session-logout/main.c:117 msgid "Unknown error" msgstr "Непозната грешка" -#: ../xfce4-session-logout/main.c:178 -msgid "Unable to contact D-Bus session bus." -msgstr "Не може да се свърже с системата за съобщения" - -#: ../xfce4-session-logout/main.c:190 -msgid "Failed to create new D-Bus message" -msgstr "Не може да се създаде ново D-Bus съобщение" - -#: ../xfce4-session-logout/main.c:206 -msgid "Failed to receive a reply from the session manager" -msgstr "Не може да се получи отговор от управлението на сесите" +#: ../xfce4-session-logout/main.c:136 +msgid "Written by Benedikt Meurer " +msgstr "Написано от Benedikt Meurer " + +#: ../xfce4-session-logout/main.c:137 +msgid "and Brian Tarricone ." +msgstr "и Brian Tarricone ." + +#: ../xfce4-session-logout/main.c:147 +msgid "Unable to contact D-Bus session bus" +msgstr "Не може да се свърже със системата за съобщения" -#: ../xfce4-session-logout/main.c:214 +#: ../xfce4-session-logout/main.c:223 msgid "Received error while trying to log out" msgstr "Получи грешка при опита за изход" @@ -778,12 +767,12 @@ msgstr "Изход от Xfce работна среда." #: ../settings/xfce-session-settings.desktop.in.h:1 -#: ../settings/xfce4-session-settings.glade.h:14 +#: ../settings/xfce4-session-settings.glade.h:15 msgid "Customize desktop startup and splash screen" msgstr "Промени стартирането на десктопа и splash екрана" #: ../settings/xfce-session-settings.desktop.in.h:2 -#: ../settings/xfce4-session-settings.glade.h:28 +#: ../settings/xfce4-session-settings.glade.h:30 msgid "Session and Startup" msgstr "Сесия и стартиране" @@ -820,118 +809,159 @@ msgstr "Избор на сесия" #: ../settings/xfce4-session-settings.glade.h:9 +msgid "Shutdown" +msgstr "Изключване" + +#: ../settings/xfce4-session-settings.glade.h:10 msgid "Version:" msgstr "Версия:" -#: ../settings/xfce4-session-settings.glade.h:10 +#: ../settings/xfce4-session-settings.glade.h:11 msgid "Ad_vanced" msgstr "Допълнителни" -#: ../settings/xfce4-session-settings.glade.h:11 +#: ../settings/xfce4-session-settings.glade.h:12 msgid "Always save the session when logging out" msgstr "Винаги запазвай сесията при изход от системата" -#: ../settings/xfce4-session-settings.glade.h:12 +#: ../settings/xfce4-session-settings.glade.h:13 msgid "Automatically save session on _logout" msgstr "Автоматично запазване сесията при изход" -#: ../settings/xfce4-session-settings.glade.h:13 +#: ../settings/xfce4-session-settings.glade.h:14 msgid "Con_figure" msgstr "Конфигурирай" -#: ../settings/xfce4-session-settings.glade.h:15 +#: ../settings/xfce4-session-settings.glade.h:16 msgid "Demonstrates the selected splash screen" msgstr "Демонстрира избраният splash екран" -#: ../settings/xfce4-session-settings.glade.h:16 +#: ../settings/xfce4-session-settings.glade.h:17 msgid "Display the session chooser every time Xfce starts" -msgstr "Покажи възможност за избор на сесия при всеки старт на Xfce" +msgstr "Покажи възможност за избор на сесия при всяко стартиране на Xfce" -#: ../settings/xfce4-session-settings.glade.h:17 +#: ../settings/xfce4-session-settings.glade.h:18 msgid "Empty the session cache" msgstr "Опразни кеша на сесията" -#: ../settings/xfce4-session-settings.glade.h:18 +#: ../settings/xfce4-session-settings.glade.h:19 msgid "Launch GN_OME services on startup" msgstr "Стартира GNOME услуги при влизане в системата" -#: ../settings/xfce4-session-settings.glade.h:19 +#: ../settings/xfce4-session-settings.glade.h:20 msgid "Launch _KDE services on startup" msgstr "Стартира KDE услуги при влизане в системата" -#: ../settings/xfce4-session-settings.glade.h:20 +#: ../settings/xfce4-session-settings.glade.h:21 msgid "Manage _remote applications" msgstr "Управлявай отдалечени програми" -#: ../settings/xfce4-session-settings.glade.h:21 +#: ../settings/xfce4-session-settings.glade.h:22 msgid "Manage remote applications over the network (this may be a security risk)" msgstr "Управлява отдалечени програми през мрежата (представлява риск за сигурността)" -#: ../settings/xfce4-session-settings.glade.h:22 +#: ../settings/xfce4-session-settings.glade.h:23 msgid "Opens the configuration panel for the selected splash screen" msgstr "Отваря панела за настройки на избраният splash екран" -#: ../settings/xfce4-session-settings.glade.h:23 +#: ../settings/xfce4-session-settings.glade.h:24 msgid "Prompt for confirmation when logging out" msgstr "Питай за потвърждение при изход" -#: ../settings/xfce4-session-settings.glade.h:24 +#: ../settings/xfce4-session-settings.glade.h:25 msgid "Quit the program, and remove it from the session" msgstr "Излез от програмата и я премахни от сесията" -#: ../settings/xfce4-session-settings.glade.h:25 +#: ../settings/xfce4-session-settings.glade.h:26 +msgid "Run xflock4 before suspending or hibernating the system" +msgstr "Стартиране на xflock4 (заключване на екрана) преди приспиване или хибернация на системата" + +#: ../settings/xfce4-session-settings.glade.h:27 msgid "S_plash" msgstr "S_plash" -#: ../settings/xfce4-session-settings.glade.h:26 +#: ../settings/xfce4-session-settings.glade.h:28 msgid "Save Sessio_n" msgstr " Запази сесията" -#: ../settings/xfce4-session-settings.glade.h:27 +#: ../settings/xfce4-session-settings.glade.h:29 msgid "Saving Session" msgstr "Запазване на сесията" -#: ../settings/xfce4-session-settings.glade.h:29 -msgid "Start GNOME services, such as gnome-keyring and the GNOME accessibility framework" -msgstr "Стартирай Gnome услуги, като gnome-keyring и GNOME accessibility framework" +#: ../settings/xfce4-session-settings.glade.h:31 +msgid "Start GNOME services, such as gnome-keyring" +msgstr "Стартирай Gnome услуги, като gnome-keyring" -#: ../settings/xfce4-session-settings.glade.h:30 -msgid "Start KDE services, such as \"kdeinit,\" DCOP, and ARTS" -msgstr "Стартирай KDE услуги, като \"kdeinit,\" DCOP, и ARTS" +#: ../settings/xfce4-session-settings.glade.h:32 +msgid "Start KDE services, such as kdeinit" +msgstr "Стартирай KDE услуги, като kdeinit" -#: ../settings/xfce4-session-settings.glade.h:31 +#: ../settings/xfce4-session-settings.glade.h:33 msgid "These applications are a part of the currently-running session, and can be saved when you log out. Changes below will only take effect when the session is saved." -msgstr "Тези програми са част от текущо работещата сесия, и могат да се запазят при изход. Промените по долу ще са валидни само при запазване на сесията." +msgstr "Тези програми са част от текущо работещата сесия, и могат да се запазят при изход. Промените по- долу ще са валидни само при запазване на сесията." -#: ../settings/xfce4-session-settings.glade.h:32 +#: ../settings/xfce4-session-settings.glade.h:34 msgid "Your session is being saved. If you do not wish to wait, you may close this window." msgstr "Сесията Ви се запазва. Ако не Ви се чака, може да затворите този прозорец." -#: ../settings/xfce4-session-settings.glade.h:33 +#: ../settings/xfce4-session-settings.glade.h:35 msgid "_Clear saved sessions" msgstr "Изчисти запазените сесии" -#: ../settings/xfce4-session-settings.glade.h:34 +#: ../settings/xfce4-session-settings.glade.h:36 msgid "_Display chooser on login" msgstr "Възможност за избор на сесия при вход" -#: ../settings/xfce4-session-settings.glade.h:35 +#: ../settings/xfce4-session-settings.glade.h:37 msgid "_General" msgstr "_Общи" -#: ../settings/xfce4-session-settings.glade.h:36 +#: ../settings/xfce4-session-settings.glade.h:38 +msgid "_Lock screen before sleep" +msgstr "Заключване на екрана преди приспиване" + +#: ../settings/xfce4-session-settings.glade.h:39 msgid "_Prompt on logout" msgstr "Питай при изход" -#: ../settings/xfce4-session-settings.glade.h:38 +#: ../settings/xfce4-session-settings.glade.h:41 msgid "_Session" msgstr "Сесия" -#: ../settings/xfce4-session-settings.glade.h:39 +#: ../settings/xfce4-session-settings.glade.h:42 msgid "_Test" msgstr "_Тест" -#: ../settings/xfce4-session-settings.glade.h:40 +#: ../settings/xfce4-session-settings.glade.h:43 msgid "label" msgstr "етикет" +#~ msgid "Built with Gtk+-%d.%d.%d, running with Gtk+-%d.%d.%d" +#~ msgstr "Изграден с GTK+ %d.%d.%d ,изпълнено с GTK+ %d.%d.%d." + +#~ msgid "Log out %s" +#~ msgstr "Изход %s" + +#~ msgid "Unable to perform shutdown" +#~ msgstr " Не мога да се изпълни Изключване" + +#~ msgid "Invalid shutdown type \"%u\"" +#~ msgstr "Невалиден тип на изключване \"%u\"" + +#~ msgid "Suspend failed, no backend supported" +#~ msgstr "Приспиването пропадна, не се поддържа" + +#~ msgid "Hibernate failed, no backend supported" +#~ msgstr "Дълбокото приспиване пропадна, не се поддържа" + +#~ msgid "Shutdown Command not found" +#~ msgstr "Командата за изключване не е намерена" + +#~ msgid "Logout Error" +#~ msgstr "Грешка при Изход" + +#~ msgid "Failed to create new D-Bus message" +#~ msgstr "Не може да се създаде ново D-Bus съобщение" + +#~ msgid "Failed to receive a reply from the session manager" +#~ msgstr "Не може да се получи отговор от управлението на сесите" diff -Nru xfce4-session-4.10.0/po/el.po xfce4-session-4.10.1/po/el.po --- xfce4-session-4.10.0/po/el.po 2012-04-28 20:43:27.000000000 +0000 +++ xfce4-session-4.10.1/po/el.po 2013-05-05 15:33:55.000000000 +0000 @@ -1,23 +1,23 @@ # Copyright (C) 2003-2006 The Xfce development team. # This file is distributed under the same license as the xfce4-session package. -# +# # Stavros Giannouris , 2005, 2006, 2007. # Stathis Kamperis , 2006. # Evaggelos Balaskas , 2009. # Efstathios Iosifidis , 2012. -# +# msgid "" msgstr "" "Project-Id-Version: xfce4-session git version\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2012-04-08 14:12+0000\n" +"POT-Creation-Date: 2012-10-06 18:51+0000\n" "PO-Revision-Date: 2012-04-11 21:24+0300\n" "Last-Translator: Efstathios Iosifidis \n" "Language-Team: Ελληνικά, Σύγχρονα \n" -"Language: el\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" +"Language: el\n" "Plural-Forms: nplurals=2; plural=(n!=1);\n" "X-Poedit-Language: Greek\n" "X-Poedit-SourceCharset: utf-8\n" @@ -174,13 +174,13 @@ msgstr "Πληκτρολογήστε '%s --help' για βοήθεια." #: ../settings/main.c:87 ../xfce4-session/main.c:267 -#: ../xfce4-session-logout/main.c:124 +#: ../xfce4-session-logout/main.c:135 msgid "The Xfce development team. All rights reserved." msgstr "" "Η ομάδα ανάπτυξης του xfce. Με την επιφύλαξη παντός νόμιμου δικαιώματος." #: ../settings/main.c:88 ../xfce4-session/main.c:268 -#: ../xfce4-session-logout/main.c:127 +#: ../xfce4-session-logout/main.c:138 #, c-format msgid "Please report bugs to <%s>." msgstr "Παρακαλώ να αναφέρετε σφάλματα στο <%s>" @@ -245,23 +245,24 @@ msgstr "_Συνέχεια" #: ../settings/session-editor.c:212 -msgid "You might need to delete some files manually in " -msgstr "Μπορεί να χρειαστείτε να διαγράψετε μερικά αρχεία χειροκίνητα στο" +#, c-format +msgid "You might need to delete some files manually in \"%s\"." +msgstr "Μπορεί να χρειαστείτε να διαγράψετε μερικά αρχεία χειροκίνητα στο \"%s\"." -#: ../settings/session-editor.c:216 +#: ../settings/session-editor.c:215 msgid "All Xfce cache files could not be cleared" msgstr "Αδυναμία εκκαθάρισης όλων των αρχείων της λανθάνουσας μνήμης του Xfce" -#: ../settings/session-editor.c:250 +#: ../settings/session-editor.c:249 #, c-format msgid "Are you sure you want to terminate \"%s\"?" msgstr "Είστε σίγουροι ότι θέλετε να τερματίσετε το \"%s\";" -#: ../settings/session-editor.c:253 ../settings/session-editor.c:281 +#: ../settings/session-editor.c:252 ../settings/session-editor.c:280 msgid "Terminate Program" msgstr "Τερματισμός προγράμματος" -#: ../settings/session-editor.c:255 +#: ../settings/session-editor.c:254 msgid "" "The application will lose any unsaved state and will not be restarted in " "your next session." @@ -269,32 +270,32 @@ "Η εφαρμογή θα χάσει την μη αποθηκευμένη κατάσταση και δεν θα ξεκινήσει στην " "επόμενη συνεδρία σας." -#: ../settings/session-editor.c:257 +#: ../settings/session-editor.c:256 #: ../settings/xfce4-session-settings.glade.h:40 msgid "_Quit Program" msgstr "Τ_ερματισμός προγράμματος" -#: ../settings/session-editor.c:282 +#: ../settings/session-editor.c:281 msgid "Unable to terminate program." msgstr "Αδυναμία τερματισμού προγράμματος." -#: ../settings/session-editor.c:460 +#: ../settings/session-editor.c:459 msgid "(Unknown program)" msgstr "(Άγνωστο πρόγραμμα)" -#: ../settings/session-editor.c:680 +#: ../settings/session-editor.c:679 msgid "Priority" msgstr "Προτεραιότητα" -#: ../settings/session-editor.c:688 +#: ../settings/session-editor.c:687 msgid "PID" msgstr "PID" -#: ../settings/session-editor.c:694 +#: ../settings/session-editor.c:693 msgid "Program" msgstr "Πρόγραμμα" -#: ../settings/session-editor.c:719 +#: ../settings/session-editor.c:718 msgid "Restart Style" msgstr "Στυλ επανεκκίνησης" @@ -354,7 +355,6 @@ msgstr "Αδυναμία ανοίγματος του '%s' για εγγραφή" #: ../settings/xfae-window.c:102 -#, fuzzy msgid "" "Below is the list of applications that will be started automatically when " "you login to your Xfce desktop, in addition to the applications that were " @@ -406,7 +406,7 @@ msgid "Disable binding to TCP ports" msgstr "Απενεργοποίηση δέσμευσης θυρών TCP" -#: ../xfce4-session/main.c:77 ../xfce4-session-logout/main.c:81 +#: ../xfce4-session/main.c:77 ../xfce4-session-logout/main.c:91 msgid "Print version information and exit" msgstr "Εμφάνιση πληροφοριών έκδοσης" @@ -460,7 +460,7 @@ msgid "The client doesn't have any properties set yet" msgstr "Ο πελάτης δεν έχεις ορίσει καμία από τις ιδιότητες μέχρι στιγμής" -#: ../xfce4-session/xfsm-compat-gnome.c:246 +#: ../xfce4-session/xfsm-compat-gnome.c:239 msgid "Starting The Gnome Keyring Daemon" msgstr "Εκκίνηση του δαίμονα GNOME Keyring." @@ -540,19 +540,19 @@ msgid "Failed to hibernate session" msgstr "Αδυναμία αδρανοποίησης συνεδρίας" -#: ../xfce4-session/xfsm-manager.c:1413 +#: ../xfce4-session/xfsm-manager.c:1393 #, c-format msgid "Can only terminate clients when in the idle state" msgstr "Μπορείτε μόνο να τερματίσετε πελάτες όταν είναι σε κατάσταση αδράνειας" -#: ../xfce4-session/xfsm-manager.c:1976 +#: ../xfce4-session/xfsm-manager.c:1956 #, c-format msgid "Session manager must be in idle state when requesting a checkpoint" msgstr "" "Ο διαχειριστής συνεδριών μπορεί να είναι σε κατάσταση αδράνειας όταν φτάσει " "σε ένα σημείο ελέγχου" -#: ../xfce4-session/xfsm-manager.c:2017 +#: ../xfce4-session/xfsm-manager.c:1997 #, c-format msgid "Session manager must be in idle state when requesting a shutdown" msgstr "" @@ -619,88 +619,88 @@ msgid "Choose a name for the new session:" msgstr "Επιλέξτε ένα όνομα για τη νέα συνεδρία:" -#: ../xfce4-session/xfsm-startup.c:115 +#: ../xfce4-session/xfsm-startup.c:347 msgid "Starting the Volume Controller" msgstr "Εκκίνηση του Ρυθμιστή της έντασης ήχου" -#: ../xfce4-session/xfsm-startup.c:117 +#: ../xfce4-session/xfsm-startup.c:349 msgid "Starting the Panel" msgstr "Εκκίνηση του Ταμπλό" -#: ../xfce4-session/xfsm-startup.c:119 +#: ../xfce4-session/xfsm-startup.c:351 msgid "Starting the Desktop Manager" msgstr "Εκκίνηση του Διαχειριστή επιφάνειας εργασίας" -#: ../xfce4-session/xfsm-startup.c:121 +#: ../xfce4-session/xfsm-startup.c:353 msgid "Starting the Taskbar" msgstr "Εκκίνηση της Μπάρας εργασιών" -#: ../xfce4-session/xfsm-startup.c:123 +#: ../xfce4-session/xfsm-startup.c:355 msgid "Starting the Window Manager" msgstr "Εκκίνηση του Διαχειριστή παραθύρων" -#: ../xfce4-session/xfsm-startup.c:127 +#: ../xfce4-session/xfsm-startup.c:359 msgid "Starting the Gnome Terminal Emulator" msgstr "Εκκίνηση του Τερματικού του Gnome" -#: ../xfce4-session/xfsm-startup.c:131 +#: ../xfce4-session/xfsm-startup.c:363 msgid "Starting the KDE Advanced Text Editor" msgstr "Εκκίνηση του Προχωρημένου επεξεργαστή κειμένου του KDE" -#: ../xfce4-session/xfsm-startup.c:133 +#: ../xfce4-session/xfsm-startup.c:365 msgid "Starting the KDE Clipboard Manager" msgstr "Εφαρμογίδιο διαχείρισης προχείρου του KDE" -#: ../xfce4-session/xfsm-startup.c:135 +#: ../xfce4-session/xfsm-startup.c:367 msgid "Starting the KDE Mail Reader" msgstr "Εκκίνηση του Αναγνώστη ηλεκ. αλληλογραφίας του KDE" -#: ../xfce4-session/xfsm-startup.c:137 +#: ../xfce4-session/xfsm-startup.c:369 msgid "Starting the KDE News Reader" msgstr "Εκκίνηση του Αναγνώστη ειδήσεων του KDE" -#: ../xfce4-session/xfsm-startup.c:139 +#: ../xfce4-session/xfsm-startup.c:371 msgid "Starting the Konqueror" msgstr "Εκκίνηση του Konqueror" -#: ../xfce4-session/xfsm-startup.c:141 +#: ../xfce4-session/xfsm-startup.c:373 msgid "Starting the KDE Terminal Emulator" msgstr "Εκκίνηση του Τερματικού του KDE" -#: ../xfce4-session/xfsm-startup.c:145 +#: ../xfce4-session/xfsm-startup.c:377 msgid "Starting the Beep Media Player" msgstr "Εκκίνηση του Αναπαραγωγέα μέσων Beep" -#: ../xfce4-session/xfsm-startup.c:147 +#: ../xfce4-session/xfsm-startup.c:379 msgid "Starting The Gimp" msgstr "Εκκίνηση του Gimp" -#: ../xfce4-session/xfsm-startup.c:149 +#: ../xfce4-session/xfsm-startup.c:381 msgid "Starting the VI Improved Editor" msgstr "Εκκίνηση του Επεξεργαστή κειμένου VI Improved" -#: ../xfce4-session/xfsm-startup.c:151 +#: ../xfce4-session/xfsm-startup.c:383 msgid "Starting the Session Management Proxy" msgstr "Εκκίνηση του Μεσολαβητή διαχείρισης συνεδρίας" -#: ../xfce4-session/xfsm-startup.c:153 +#: ../xfce4-session/xfsm-startup.c:385 msgid "Starting the X-Chat IRC Client" msgstr "Εκκίνηση του X-Chat" -#: ../xfce4-session/xfsm-startup.c:155 +#: ../xfce4-session/xfsm-startup.c:387 msgid "Starting the X Multimedia System" msgstr "Εκκίνηση του XMMS" -#: ../xfce4-session/xfsm-startup.c:157 +#: ../xfce4-session/xfsm-startup.c:389 msgid "Starting the X Terminal Emulator" msgstr "Εκκίνηση του Τερματικού Xterm" -#: ../xfce4-session/xfsm-startup.c:159 +#: ../xfce4-session/xfsm-startup.c:391 #, c-format msgid "Starting %s" msgstr "Εκκίνηση του %s " -#: ../xfce4-session/xfsm-startup.c:283 +#: ../xfce4-session/xfsm-startup.c:515 #, c-format msgid "" "The location and the format of the autostart directory has changed.\n" @@ -725,11 +725,11 @@ "νέα θέση.\n" "Τώρα μπορείτε να σβήσετε αυτό τον κατάλογο.\n" -#: ../xfce4-session/xfsm-startup.c:452 +#: ../xfce4-session/xfsm-startup.c:684 msgid "Performing Autostart..." msgstr "Αυτόματη εκκίνηση..." -#: ../xfce4-session/xfsm-startup.c:558 +#: ../xfce4-session/xfsm-startup.c:790 msgid "Starting Assistive Technologies" msgstr "Εκκίνηση τεχνολογιών υποβοήθησης" @@ -757,47 +757,47 @@ msgid "Unknown shutdown method %d" msgstr "Άγνωστη μέθοδος τερματισμού %d" -#: ../xfce4-session-logout/main.c:57 +#: ../xfce4-session-logout/main.c:67 msgid "Log out without displaying the logout dialog" msgstr "Αποσύνδεση χωρίς την εμφάνιση του διαλόγου αποσύνδεσης" -#: ../xfce4-session-logout/main.c:61 +#: ../xfce4-session-logout/main.c:71 msgid "Halt without displaying the logout dialog" msgstr "Κλείσιμο χωρίς την εμφάνιση του διαλόγου αποσύνδεσης" -#: ../xfce4-session-logout/main.c:65 +#: ../xfce4-session-logout/main.c:75 msgid "Reboot without displaying the logout dialog" msgstr "Επανεκκίνηση χωρίς την εμφάνιση του διαλόγου αποσύνδεσης" -#: ../xfce4-session-logout/main.c:69 +#: ../xfce4-session-logout/main.c:79 msgid "Suspend without displaying the logout dialog" msgstr "Αναστολή χωρίς την εμφάνιση του διαλόγου αποσύνδεσης" -#: ../xfce4-session-logout/main.c:73 +#: ../xfce4-session-logout/main.c:83 msgid "Hibernate without displaying the logout dialog" msgstr "Αδρανοποίηση χωρίς την εμφάνιση του διαλόγου αποσύνδεσης" -#: ../xfce4-session-logout/main.c:77 +#: ../xfce4-session-logout/main.c:87 msgid "Log out quickly; don't save the session" msgstr "Γρήγορη αποσύνδεση: να μην αποθηκευτεί η συνεδρία" -#: ../xfce4-session-logout/main.c:100 +#: ../xfce4-session-logout/main.c:110 msgid "Unknown error" msgstr "(Άγνωστο σφάλμα)" -#: ../xfce4-session-logout/main.c:125 +#: ../xfce4-session-logout/main.c:136 msgid "Written by Benedikt Meurer " msgstr "Γραμμένο από τον Benedikt Meuer " -#: ../xfce4-session-logout/main.c:126 +#: ../xfce4-session-logout/main.c:137 msgid "and Brian Tarricone ." msgstr "και Brian Tarricone ." -#: ../xfce4-session-logout/main.c:136 +#: ../xfce4-session-logout/main.c:147 msgid "Unable to contact D-Bus session bus" msgstr "Αδυναμία επικοινωνίας με τον δίαυλο συνεδρίας D-Bus" -#: ../xfce4-session-logout/main.c:186 +#: ../xfce4-session-logout/main.c:223 msgid "Received error while trying to log out" msgstr "Λήφθηκε σφάλμα κατά την προσπάθεια αποσύνδεσης" diff -Nru xfce4-session-4.10.0/po/es.po xfce4-session-4.10.1/po/es.po --- xfce4-session-4.10.0/po/es.po 2012-04-28 20:43:27.000000000 +0000 +++ xfce4-session-4.10.1/po/es.po 2013-05-05 15:33:55.000000000 +0000 @@ -9,16 +9,16 @@ msgstr "" "Project-Id-Version: xfce4-session 4.4.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2012-04-24 15:27+0000\n" +"POT-Creation-Date: 2013-03-02 16:30+0000\n" "PO-Revision-Date: 2012-04-23 23:07-0600\n" "Last-Translator: Sergio García \n" "Language-Team: Spanish/ES \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" +"X-Poedit-Country: SPAIN\n" "Language: \n" "X-Poedit-Language: Spanish\n" -"X-Poedit-Country: SPAIN\n" #: ../xfce.desktop.in.h:1 msgid "Use this session to run Xfce as your desktop environment" @@ -30,16 +30,16 @@ #: ../engines/balou/balou-theme.c:110 msgid "No description given" -msgstr "No se dio ninguna descripción" +msgstr "No se proporcionó ninguna descripción" #: ../engines/balou/config.c:324 msgid "Choose theme file to install..." -msgstr "Escoja el archivo de tema a instalar..." +msgstr "Elija el archivo de tema a instalar…" #: ../engines/balou/config.c:336 #, c-format msgid "Unable to install splash theme from file \"%s\"" -msgstr "Imposible instalar el tema de pantalla de inicio del archivo \"%s\"." +msgstr "No se puede instalar el tema de pantalla de inicio a partir del archivo «%s»." #: ../engines/balou/config.c:339 msgid "Theme File Error" @@ -59,7 +59,7 @@ #: ../engines/balou/config.c:491 msgid "Choose theme filename..." -msgstr "Elija el nombre de archivo del tema..." +msgstr "Elija el nombre de archivo del tema…" #: ../engines/balou/config.c:624 msgid "_Install new theme" @@ -79,7 +79,7 @@ #: ../engines/balou/config.c:951 msgid "Configure Balou..." -msgstr "Configurar Balou..." +msgstr "Configurar Balou…" #: ../engines/balou/config.c:994 msgid "Balou" @@ -99,11 +99,11 @@ #: ../engines/simple/simple.c:346 msgid "Configure Simple..." -msgstr "Configurar Simple..." +msgstr "Configurar Simple…" #: ../engines/simple/simple.c:357 msgid "Font" -msgstr "Tipo de letra" +msgstr "Tipografía" #: ../engines/simple/simple.c:367 msgid "Colors" @@ -127,7 +127,7 @@ #: ../engines/simple/simple.c:413 msgid "Choose image..." -msgstr "Elegir imagen..." +msgstr "Elija una imagen…" #: ../engines/simple/simple.c:419 msgid "Images" @@ -151,7 +151,7 @@ #: ../scripts/xscreensaver.desktop.in.h:2 msgid "Screensaver" -msgstr "Protector de pantalla" +msgstr "Salvapantallas" #: ../settings/main.c:43 msgid "Settings manager socket" @@ -168,7 +168,7 @@ #: ../settings/main.c:75 ../xfce4-session/main.c:257 #, c-format msgid "Type '%s --help' for usage." -msgstr "Escriba '%s --help' para ver opciones de uso." +msgstr "Escriba «%s --help» para ver opciones de uso." #: ../settings/main.c:87 ../xfce4-session/main.c:267 #: ../xfce4-session-logout/main.c:135 @@ -179,7 +179,7 @@ #: ../xfce4-session-logout/main.c:138 #, c-format msgid "Please report bugs to <%s>." -msgstr "Por favor, informe de fallos a <%s>." +msgstr "Informe de fallos a <%s>." #: ../settings/main.c:97 ../xfce4-session/main.c:276 msgid "Unable to contact settings server" @@ -225,7 +225,7 @@ #: ../settings/session-editor.c:171 msgid "Are you sure you want to empty the session cache?" -msgstr "Está seguro de querer limpiar el caché de la sesión?" +msgstr "¿Está seguro de que quiere limpiar el caché de la sesión?" #: ../settings/session-editor.c:172 msgid "" @@ -457,7 +457,7 @@ msgid "The client doesn't have any properties set yet" msgstr "El cliente no tiene aún ninguna propiedad" -#: ../xfce4-session/xfsm-compat-gnome.c:247 +#: ../xfce4-session/xfsm-compat-gnome.c:239 msgid "Starting The Gnome Keyring Daemon" msgstr "Iniciando GNOME Keyring Daemon" @@ -490,7 +490,7 @@ msgid "Try again" msgstr "Intentar otra vez" -#: ../xfce4-session/xfsm-manager.c:609 +#: ../xfce4-session/xfsm-manager.c:611 #, c-format msgid "" "Unable to determine failsafe session name. Possible causes: xfconfd isn't " @@ -503,7 +503,7 @@ "(debe incluir \"%s\"), o xfce4-session se encuentra instalado " "incorrectamente." -#: ../xfce4-session/xfsm-manager.c:620 +#: ../xfce4-session/xfsm-manager.c:622 #, c-format msgid "" "The specified failsafe session (\"%s\") is not marked as a failsafe session." @@ -511,46 +511,46 @@ "La sesión a prueba de fallos (\"%s\") no está marcada como una sesión a " "prueba de fallos." -#: ../xfce4-session/xfsm-manager.c:667 +#: ../xfce4-session/xfsm-manager.c:669 msgid "The list of applications in the failsafe session is empty." msgstr "La lista de aplicaciones en la sesión a prueba de fallos está vacía." #. FIXME: migrate this into the splash screen somehow so the #. * window doesn't look ugly (right now now WM is running, so it #. * won't have window decorations). -#: ../xfce4-session/xfsm-manager.c:714 +#: ../xfce4-session/xfsm-manager.c:716 msgid "Session Manager Error" msgstr "Error de gestor de sesión" -#: ../xfce4-session/xfsm-manager.c:716 +#: ../xfce4-session/xfsm-manager.c:718 msgid "Unable to load a failsafe session" msgstr "Imposible cargar una sesión a prueba de fallos" -#: ../xfce4-session/xfsm-manager.c:1123 +#: ../xfce4-session/xfsm-manager.c:1127 msgid "Shutdown Failed" msgstr "Fallo al apagar" -#: ../xfce4-session/xfsm-manager.c:1126 +#: ../xfce4-session/xfsm-manager.c:1130 msgid "Failed to suspend session" msgstr "Fallo al suspender la sesión" -#: ../xfce4-session/xfsm-manager.c:1127 +#: ../xfce4-session/xfsm-manager.c:1131 msgid "Failed to hibernate session" msgstr "Fallo al hibernar la sesión" -#: ../xfce4-session/xfsm-manager.c:1393 +#: ../xfce4-session/xfsm-manager.c:1405 #, c-format msgid "Can only terminate clients when in the idle state" msgstr "Sólo se pueden terminar clientes cuando están en estado inactivo" -#: ../xfce4-session/xfsm-manager.c:1956 +#: ../xfce4-session/xfsm-manager.c:1969 #, c-format msgid "Session manager must be in idle state when requesting a checkpoint" msgstr "" "El gestor de sesión debe estar en estado inactivo al solicitar un punto de " "comprobación" -#: ../xfce4-session/xfsm-manager.c:1997 +#: ../xfce4-session/xfsm-manager.c:2010 #, c-format msgid "Session manager must be in idle state when requesting a shutdown" msgstr "" diff -Nru xfce4-session-4.10.0/po/hr.po xfce4-session-4.10.1/po/hr.po --- xfce4-session-4.10.0/po/hr.po 2012-04-28 20:43:27.000000000 +0000 +++ xfce4-session-4.10.1/po/hr.po 2013-05-05 15:33:55.000000000 +0000 @@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: xfce4-session 4.4.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2012-04-16 11:57+0000\n" +"POT-Creation-Date: 2012-12-03 17:51+0000\n" "PO-Revision-Date: 2010-05-25 22:47+0200\n" "Last-Translator: Petar Koretić <>\n" "Language-Team: Croatian <>\n" @@ -189,7 +189,7 @@ #: ../settings/session-editor.c:61 msgid "If running" -msgstr "Ako je pokrenuti" +msgstr "Ako je pokrenut" #: ../settings/session-editor.c:62 msgid "Always" @@ -444,7 +444,7 @@ msgid "The client doesn't have any properties set yet" msgstr "Klijent nema postavljenih detalja." -#: ../xfce4-session/xfsm-compat-gnome.c:246 +#: ../xfce4-session/xfsm-compat-gnome.c:239 msgid "Starting The Gnome Keyring Daemon" msgstr "Pokrećem Gnome Keyring Daemon (pozadinski program za ključeve)" @@ -477,7 +477,7 @@ msgid "Try again" msgstr "Pokušaj ponovno" -#: ../xfce4-session/xfsm-manager.c:609 +#: ../xfce4-session/xfsm-manager.c:611 #, c-format msgid "" "Unable to determine failsafe session name. Possible causes: xfconfd isn't " @@ -489,53 +489,53 @@ "dobro postavljena (ne sadrži \"%s\"), ili xfce4-session nije uredno " "instalirano." -#: ../xfce4-session/xfsm-manager.c:620 +#: ../xfce4-session/xfsm-manager.c:622 #, c-format msgid "" "The specified failsafe session (\"%s\") is not marked as a failsafe session." msgstr "" "Odabrana sigurnosna sesija (\"%s\") nije označena kao sigurnosna sesija." -#: ../xfce4-session/xfsm-manager.c:667 +#: ../xfce4-session/xfsm-manager.c:669 msgid "The list of applications in the failsafe session is empty." msgstr "Lista aplikacija u sigurnosnoj sesiji je prazna." #. FIXME: migrate this into the splash screen somehow so the #. * window doesn't look ugly (right now now WM is running, so it #. * won't have window decorations). -#: ../xfce4-session/xfsm-manager.c:714 +#: ../xfce4-session/xfsm-manager.c:716 msgid "Session Manager Error" msgstr "Greška Upravitelja Sesijom" -#: ../xfce4-session/xfsm-manager.c:716 +#: ../xfce4-session/xfsm-manager.c:718 msgid "Unable to load a failsafe session" msgstr "Ne mogu učitati sigurnosnu sesiju" -#: ../xfce4-session/xfsm-manager.c:1123 +#: ../xfce4-session/xfsm-manager.c:1127 msgid "Shutdown Failed" msgstr "Neuspjelo isključivanje" -#: ../xfce4-session/xfsm-manager.c:1126 +#: ../xfce4-session/xfsm-manager.c:1130 msgid "Failed to suspend session" msgstr "Neuspjela suspenzija sesije" -#: ../xfce4-session/xfsm-manager.c:1127 +#: ../xfce4-session/xfsm-manager.c:1131 msgid "Failed to hibernate session" msgstr "Neuspjela hibernacija sesije" -#: ../xfce4-session/xfsm-manager.c:1393 +#: ../xfce4-session/xfsm-manager.c:1405 #, c-format msgid "Can only terminate clients when in the idle state" msgstr "Mogu samo ugasiti kada je u stanju mirovanja" -#: ../xfce4-session/xfsm-manager.c:1956 +#: ../xfce4-session/xfsm-manager.c:1969 #, c-format msgid "Session manager must be in idle state when requesting a checkpoint" msgstr "" "Upravitelj sesijom mora biti u stanju mirovanja prilikom zahtjeva kontrolne " "točke" -#: ../xfce4-session/xfsm-manager.c:1997 +#: ../xfce4-session/xfsm-manager.c:2010 #, c-format msgid "Session manager must be in idle state when requesting a shutdown" msgstr "" @@ -601,88 +601,88 @@ msgid "Choose a name for the new session:" msgstr "Odaberi ime nove sesije" -#: ../xfce4-session/xfsm-startup.c:115 +#: ../xfce4-session/xfsm-startup.c:347 msgid "Starting the Volume Controller" msgstr "Pokrećem Upravitelja Glasnoćom" -#: ../xfce4-session/xfsm-startup.c:117 +#: ../xfce4-session/xfsm-startup.c:349 msgid "Starting the Panel" -msgstr "Pokretanje Panea" +msgstr "Pokretanje panela" -#: ../xfce4-session/xfsm-startup.c:119 +#: ../xfce4-session/xfsm-startup.c:351 msgid "Starting the Desktop Manager" msgstr "Pokrećem upravitelja radne površine" -#: ../xfce4-session/xfsm-startup.c:121 +#: ../xfce4-session/xfsm-startup.c:353 msgid "Starting the Taskbar" -msgstr "Pokretanje Alatne Trake" +msgstr "Pokretanje trake zadataka" -#: ../xfce4-session/xfsm-startup.c:123 +#: ../xfce4-session/xfsm-startup.c:355 msgid "Starting the Window Manager" msgstr "Pokrećem upravitelja prozora" -#: ../xfce4-session/xfsm-startup.c:127 +#: ../xfce4-session/xfsm-startup.c:359 msgid "Starting the Gnome Terminal Emulator" msgstr "Pokrećem Gnome Terminal Emulator" -#: ../xfce4-session/xfsm-startup.c:131 +#: ../xfce4-session/xfsm-startup.c:363 msgid "Starting the KDE Advanced Text Editor" msgstr "Pokrećem KDE napredni uređivača teksta" -#: ../xfce4-session/xfsm-startup.c:133 +#: ../xfce4-session/xfsm-startup.c:365 msgid "Starting the KDE Clipboard Manager" msgstr "Pokrećem KDE Clipboard Manager" -#: ../xfce4-session/xfsm-startup.c:135 +#: ../xfce4-session/xfsm-startup.c:367 msgid "Starting the KDE Mail Reader" msgstr "Pokrećem KDE čitač pošte" -#: ../xfce4-session/xfsm-startup.c:137 +#: ../xfce4-session/xfsm-startup.c:369 msgid "Starting the KDE News Reader" msgstr "Pokrećem KDE News Reader" -#: ../xfce4-session/xfsm-startup.c:139 +#: ../xfce4-session/xfsm-startup.c:371 msgid "Starting the Konqueror" msgstr "Pokrećem Konqueror" -#: ../xfce4-session/xfsm-startup.c:141 +#: ../xfce4-session/xfsm-startup.c:373 msgid "Starting the KDE Terminal Emulator" msgstr "Pokrećem KDE Terminal Emulator" -#: ../xfce4-session/xfsm-startup.c:145 +#: ../xfce4-session/xfsm-startup.c:377 msgid "Starting the Beep Media Player" msgstr "Pokrećem Beep Media Player" -#: ../xfce4-session/xfsm-startup.c:147 +#: ../xfce4-session/xfsm-startup.c:379 msgid "Starting The Gimp" msgstr "Pokrećem Gimp" -#: ../xfce4-session/xfsm-startup.c:149 +#: ../xfce4-session/xfsm-startup.c:381 msgid "Starting the VI Improved Editor" msgstr "Pokrećem unaprijeđeni VI uređivač" -#: ../xfce4-session/xfsm-startup.c:151 +#: ../xfce4-session/xfsm-startup.c:383 msgid "Starting the Session Management Proxy" msgstr "Pokrećem Ovlašenje Upravitelja Sesijom" -#: ../xfce4-session/xfsm-startup.c:153 +#: ../xfce4-session/xfsm-startup.c:385 msgid "Starting the X-Chat IRC Client" msgstr "Pokretanje X-Chat IRC klijenta" -#: ../xfce4-session/xfsm-startup.c:155 +#: ../xfce4-session/xfsm-startup.c:387 msgid "Starting the X Multimedia System" msgstr "Pokrećem X Multimedijalni Sustav" -#: ../xfce4-session/xfsm-startup.c:157 +#: ../xfce4-session/xfsm-startup.c:389 msgid "Starting the X Terminal Emulator" msgstr "Pokrećem X Terminal Emulator" -#: ../xfce4-session/xfsm-startup.c:159 +#: ../xfce4-session/xfsm-startup.c:391 #, c-format msgid "Starting %s" msgstr "Pokrećem %s" -#: ../xfce4-session/xfsm-startup.c:283 +#: ../xfce4-session/xfsm-startup.c:515 #, c-format msgid "" "The location and the format of the autostart directory has changed.\n" @@ -706,11 +706,11 @@ "Datoteke iz stare mape su uspješno premještene u novu.\n" "Možete izbrisati staru mapu.\n" -#: ../xfce4-session/xfsm-startup.c:452 +#: ../xfce4-session/xfsm-startup.c:684 msgid "Performing Autostart..." -msgstr "Radim Automatsko Pokretanje..." +msgstr "Radim automatsko pokretanje..." -#: ../xfce4-session/xfsm-startup.c:558 +#: ../xfce4-session/xfsm-startup.c:790 msgid "Starting Assistive Technologies" msgstr "Pokrećem programe podrške" @@ -788,7 +788,7 @@ #: ../xfce4-session-logout/xfce4-session-logout.desktop.in.h:2 msgid "Log out of the Xfce Desktop" -msgstr "Odjava Xfce Desktop" +msgstr "Odjava iz Xfce desktop-a" #: ../settings/xfce-session-settings.desktop.in.h:1 #: ../settings/xfce4-session-settings.glade.h:15 diff -Nru xfce4-session-4.10.0/po/id.po xfce4-session-4.10.1/po/id.po --- xfce4-session-4.10.0/po/id.po 2012-04-28 20:43:27.000000000 +0000 +++ xfce4-session-4.10.1/po/id.po 2013-05-05 15:33:55.000000000 +0000 @@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: xfce4-session 4.4.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2012-03-28 23:39+0000\n" +"POT-Creation-Date: 2013-03-23 10:03+0000\n" "PO-Revision-Date: 2010-07-01 11:43+0700\n" "Last-Translator: Andhika Padmawan \n" "Language-Team: Indonesian \n" @@ -165,12 +165,12 @@ msgstr "Ketik '%s --help' untuk penggunaan." #: ../settings/main.c:87 ../xfce4-session/main.c:267 -#: ../xfce4-session-logout/main.c:124 +#: ../xfce4-session-logout/main.c:135 msgid "The Xfce development team. All rights reserved." msgstr "Tim pengembang Xfce. Hak cipta dilindungi undang-undang." #: ../settings/main.c:88 ../xfce4-session/main.c:268 -#: ../xfce4-session-logout/main.c:127 +#: ../xfce4-session-logout/main.c:138 #, c-format msgid "Please report bugs to <%s>." msgstr "Silakan laporkan kutu ke <%s>." @@ -232,23 +232,24 @@ msgstr "_Lanjutkan" #: ../settings/session-editor.c:212 -msgid "You might need to delete some files manually in " -msgstr "Anda mungkin perlu menghapus beberapa berkas secara manual di" +#, c-format +msgid "You might need to delete some files manually in \"%s\"." +msgstr "Anda mungkin perlu menghapus beberapa berkas secara manual di \"%s\"." -#: ../settings/session-editor.c:216 +#: ../settings/session-editor.c:215 msgid "All Xfce cache files could not be cleared" msgstr "Semua berkas tembolok Xfce tak dapat dihapus" -#: ../settings/session-editor.c:250 +#: ../settings/session-editor.c:249 #, c-format msgid "Are you sure you want to terminate \"%s\"?" msgstr "Anda yakin ingin mematikan \"%s\"?" -#: ../settings/session-editor.c:253 ../settings/session-editor.c:281 +#: ../settings/session-editor.c:252 ../settings/session-editor.c:280 msgid "Terminate Program" msgstr "Matikan Program" -#: ../settings/session-editor.c:255 +#: ../settings/session-editor.c:254 msgid "" "The application will lose any unsaved state and will not be restarted in " "your next session." @@ -256,32 +257,32 @@ "Aplikasi akan kehilangan kondisi tak tersimpan apapun dan tak akan " "dijalankan ulang pada sesi anda berikutnya." -#: ../settings/session-editor.c:257 +#: ../settings/session-editor.c:256 #: ../settings/xfce4-session-settings.glade.h:40 msgid "_Quit Program" msgstr "_Keluar Program" -#: ../settings/session-editor.c:282 +#: ../settings/session-editor.c:281 msgid "Unable to terminate program." msgstr "Tak dapat mematikan program." -#: ../settings/session-editor.c:460 +#: ../settings/session-editor.c:459 msgid "(Unknown program)" msgstr "(Program tak diketahui)" -#: ../settings/session-editor.c:680 +#: ../settings/session-editor.c:679 msgid "Priority" msgstr "Prioritas" -#: ../settings/session-editor.c:688 +#: ../settings/session-editor.c:687 msgid "PID" msgstr "PID" -#: ../settings/session-editor.c:694 +#: ../settings/session-editor.c:693 msgid "Program" msgstr "Program" -#: ../settings/session-editor.c:719 +#: ../settings/session-editor.c:718 msgid "Restart Style" msgstr "Gaya Start Ulang" @@ -390,7 +391,7 @@ msgid "Disable binding to TCP ports" msgstr "Nonaktifkan pengikatan ke pangkalan TCP" -#: ../xfce4-session/main.c:77 ../xfce4-session-logout/main.c:81 +#: ../xfce4-session/main.c:77 ../xfce4-session-logout/main.c:91 msgid "Print version information and exit" msgstr "Cetak informasi versi dan keluar" @@ -444,7 +445,7 @@ msgid "The client doesn't have any properties set yet" msgstr "Klien belum memiliki pengaturan properti apapun" -#: ../xfce4-session/xfsm-compat-gnome.c:246 +#: ../xfce4-session/xfsm-compat-gnome.c:239 msgid "Starting The Gnome Keyring Daemon" msgstr "Memulai Jurik Keyring Gnome" @@ -477,7 +478,7 @@ msgid "Try again" msgstr "Coba lagi" -#: ../xfce4-session/xfsm-manager.c:609 +#: ../xfce4-session/xfsm-manager.c:611 #, c-format msgid "" "Unable to determine failsafe session name. Possible causes: xfconfd isn't " @@ -489,52 +490,52 @@ "tak benar diatur (harus menyertakan \"%s\"), atau xfce4-session tak diinstal " "secara benar." -#: ../xfce4-session/xfsm-manager.c:620 +#: ../xfce4-session/xfsm-manager.c:622 #, c-format msgid "" "The specified failsafe session (\"%s\") is not marked as a failsafe session." msgstr "" "Sesi darurat yang ditentukan (\"%s\") tidak ditandai sebagai sesi darurat." -#: ../xfce4-session/xfsm-manager.c:667 +#: ../xfce4-session/xfsm-manager.c:669 msgid "The list of applications in the failsafe session is empty." msgstr "Senarai aplikasi di sesi darurat kosong." #. FIXME: migrate this into the splash screen somehow so the #. * window doesn't look ugly (right now now WM is running, so it #. * won't have window decorations). -#: ../xfce4-session/xfsm-manager.c:714 +#: ../xfce4-session/xfsm-manager.c:716 msgid "Session Manager Error" msgstr "Galat Manajer Sesi" -#: ../xfce4-session/xfsm-manager.c:716 +#: ../xfce4-session/xfsm-manager.c:718 msgid "Unable to load a failsafe session" msgstr "Tak dapat memuat sesi darurat" -#: ../xfce4-session/xfsm-manager.c:1123 +#: ../xfce4-session/xfsm-manager.c:1127 msgid "Shutdown Failed" msgstr "Matikan Gagal" -#: ../xfce4-session/xfsm-manager.c:1126 +#: ../xfce4-session/xfsm-manager.c:1130 msgid "Failed to suspend session" msgstr "Gagal menyuspensi sesi" -#: ../xfce4-session/xfsm-manager.c:1127 +#: ../xfce4-session/xfsm-manager.c:1131 msgid "Failed to hibernate session" msgstr "Gagal menghibernasi sesi" -#: ../xfce4-session/xfsm-manager.c:1413 +#: ../xfce4-session/xfsm-manager.c:1405 #, c-format msgid "Can only terminate clients when in the idle state" msgstr "Hanya dapat mematikan klien ketika dalam kondisi tak aktif" -#: ../xfce4-session/xfsm-manager.c:1976 +#: ../xfce4-session/xfsm-manager.c:1969 #, c-format msgid "Session manager must be in idle state when requesting a checkpoint" msgstr "" "Manajer sesi harus dalam kondisi tak aktif ketika meminta titik pemeriksaan" -#: ../xfce4-session/xfsm-manager.c:2017 +#: ../xfce4-session/xfsm-manager.c:2010 #, c-format msgid "Session manager must be in idle state when requesting a shutdown" msgstr "" @@ -600,88 +601,88 @@ msgid "Choose a name for the new session:" msgstr "Pilih nama untuk sesi baru:" -#: ../xfce4-session/xfsm-startup.c:115 +#: ../xfce4-session/xfsm-startup.c:347 msgid "Starting the Volume Controller" msgstr "Memulai Pengendali Volume" -#: ../xfce4-session/xfsm-startup.c:117 +#: ../xfce4-session/xfsm-startup.c:349 msgid "Starting the Panel" msgstr "Memulai Panel" -#: ../xfce4-session/xfsm-startup.c:119 +#: ../xfce4-session/xfsm-startup.c:351 msgid "Starting the Desktop Manager" msgstr "Memulai Manajer Destop" -#: ../xfce4-session/xfsm-startup.c:121 +#: ../xfce4-session/xfsm-startup.c:353 msgid "Starting the Taskbar" msgstr "Memulai Batang Tugas" -#: ../xfce4-session/xfsm-startup.c:123 +#: ../xfce4-session/xfsm-startup.c:355 msgid "Starting the Window Manager" msgstr "Memulai Manajer Jendela" -#: ../xfce4-session/xfsm-startup.c:127 +#: ../xfce4-session/xfsm-startup.c:359 msgid "Starting the Gnome Terminal Emulator" msgstr "Memulai Emulator Terminal Gnome" -#: ../xfce4-session/xfsm-startup.c:131 +#: ../xfce4-session/xfsm-startup.c:363 msgid "Starting the KDE Advanced Text Editor" msgstr "Memulai Penyunting Teks Tingkat Lanjut KDE" -#: ../xfce4-session/xfsm-startup.c:133 +#: ../xfce4-session/xfsm-startup.c:365 msgid "Starting the KDE Clipboard Manager" msgstr "Memulai Manajer Papan Klip KDE" -#: ../xfce4-session/xfsm-startup.c:135 +#: ../xfce4-session/xfsm-startup.c:367 msgid "Starting the KDE Mail Reader" msgstr "Memulai Pembaca Surat KDE" -#: ../xfce4-session/xfsm-startup.c:137 +#: ../xfce4-session/xfsm-startup.c:369 msgid "Starting the KDE News Reader" msgstr "Memulai Pembaca Berita KDE" -#: ../xfce4-session/xfsm-startup.c:139 +#: ../xfce4-session/xfsm-startup.c:371 msgid "Starting the Konqueror" msgstr "Memulai Konqueror" -#: ../xfce4-session/xfsm-startup.c:141 +#: ../xfce4-session/xfsm-startup.c:373 msgid "Starting the KDE Terminal Emulator" msgstr "Memulai Emulator Terminal KDE" -#: ../xfce4-session/xfsm-startup.c:145 +#: ../xfce4-session/xfsm-startup.c:377 msgid "Starting the Beep Media Player" msgstr "Memulai Pemutar Media Beep" -#: ../xfce4-session/xfsm-startup.c:147 +#: ../xfce4-session/xfsm-startup.c:379 msgid "Starting The Gimp" msgstr "Memulai Gimp" -#: ../xfce4-session/xfsm-startup.c:149 +#: ../xfce4-session/xfsm-startup.c:381 msgid "Starting the VI Improved Editor" msgstr "Memulai Penyunting VI Improved" -#: ../xfce4-session/xfsm-startup.c:151 +#: ../xfce4-session/xfsm-startup.c:383 msgid "Starting the Session Management Proxy" msgstr "Memulai Sesi Manajemen Proxy" -#: ../xfce4-session/xfsm-startup.c:153 +#: ../xfce4-session/xfsm-startup.c:385 msgid "Starting the X-Chat IRC Client" msgstr "Memulai Klien IRC X-Chat" -#: ../xfce4-session/xfsm-startup.c:155 +#: ../xfce4-session/xfsm-startup.c:387 msgid "Starting the X Multimedia System" msgstr "Memulai Sistem Multimedia X" -#: ../xfce4-session/xfsm-startup.c:157 +#: ../xfce4-session/xfsm-startup.c:389 msgid "Starting the X Terminal Emulator" msgstr "Memulai Emulator Terminal X" -#: ../xfce4-session/xfsm-startup.c:159 +#: ../xfce4-session/xfsm-startup.c:391 #, c-format msgid "Starting %s" msgstr "Memulai %s" -#: ../xfce4-session/xfsm-startup.c:283 +#: ../xfce4-session/xfsm-startup.c:515 #, c-format msgid "" "The location and the format of the autostart directory has changed.\n" @@ -706,11 +707,11 @@ "baru.\n" "Anda dapat menghapus direktori ini sekarang.\n" -#: ../xfce4-session/xfsm-startup.c:452 +#: ../xfce4-session/xfsm-startup.c:684 msgid "Performing Autostart..." msgstr "Melakukan Start Otomatis..." -#: ../xfce4-session/xfsm-startup.c:558 +#: ../xfce4-session/xfsm-startup.c:790 msgid "Starting Assistive Technologies" msgstr "Memulai Teknologi Bantuan" @@ -738,47 +739,47 @@ msgid "Unknown shutdown method %d" msgstr "Metode matikan tidak dikenal %d" -#: ../xfce4-session-logout/main.c:57 +#: ../xfce4-session-logout/main.c:67 msgid "Log out without displaying the logout dialog" msgstr "Keluar tanpa menampilkan dialog keluar" -#: ../xfce4-session-logout/main.c:61 +#: ../xfce4-session-logout/main.c:71 msgid "Halt without displaying the logout dialog" msgstr "Matikan tanpa menampilkan dialog keluar" -#: ../xfce4-session-logout/main.c:65 +#: ../xfce4-session-logout/main.c:75 msgid "Reboot without displaying the logout dialog" msgstr "Hidupkan ulang tanpa menampilkan dialog keluar" -#: ../xfce4-session-logout/main.c:69 +#: ../xfce4-session-logout/main.c:79 msgid "Suspend without displaying the logout dialog" msgstr "Suspensi tanpa menampilkan dialog keluar" -#: ../xfce4-session-logout/main.c:73 +#: ../xfce4-session-logout/main.c:83 msgid "Hibernate without displaying the logout dialog" msgstr "Hibernasi tanpa menampilkan dialog keluar" -#: ../xfce4-session-logout/main.c:77 +#: ../xfce4-session-logout/main.c:87 msgid "Log out quickly; don't save the session" msgstr "Keluar secara cepat; jangan simpan sesi" -#: ../xfce4-session-logout/main.c:100 +#: ../xfce4-session-logout/main.c:110 msgid "Unknown error" msgstr "Galat tak diketahui" -#: ../xfce4-session-logout/main.c:125 +#: ../xfce4-session-logout/main.c:136 msgid "Written by Benedikt Meurer " msgstr "Ditulis oleh Benedikt Meurer " -#: ../xfce4-session-logout/main.c:126 +#: ../xfce4-session-logout/main.c:137 msgid "and Brian Tarricone ." msgstr "dan Brian Tarricone ." -#: ../xfce4-session-logout/main.c:136 +#: ../xfce4-session-logout/main.c:147 msgid "Unable to contact D-Bus session bus" msgstr "Tak dapat menghubungi bus sesi D-BUS" -#: ../xfce4-session-logout/main.c:186 +#: ../xfce4-session-logout/main.c:223 msgid "Received error while trying to log out" msgstr "Menerima galat ketika mencoba log keluar" diff -Nru xfce4-session-4.10.0/po/pl.po xfce4-session-4.10.1/po/pl.po --- xfce4-session-4.10.0/po/pl.po 2012-04-28 20:43:27.000000000 +0000 +++ xfce4-session-4.10.1/po/pl.po 2013-05-05 15:33:55.000000000 +0000 @@ -11,7 +11,7 @@ msgstr "" "Project-Id-Version: xfce4-session 4.4.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2012-04-19 14:42+0000\n" +"POT-Creation-Date: 2012-10-07 05:33+0000\n" "PO-Revision-Date: 2012-04-12 10:00+0200\n" "Last-Translator: Piotr Sokół \n" "Language-Team: polski <>\n" @@ -448,7 +448,7 @@ msgid "The client doesn't have any properties set yet" msgstr "Klient nie posiada jeszcze żadnych ustawionych właściwości" -#: ../xfce4-session/xfsm-compat-gnome.c:246 +#: ../xfce4-session/xfsm-compat-gnome.c:239 msgid "Starting The Gnome Keyring Daemon" msgstr "Uruchamiam demona Gnome Keyring" @@ -529,7 +529,7 @@ #: ../xfce4-session/xfsm-manager.c:1393 #, c-format msgid "Can only terminate clients when in the idle state" -msgstr "" +msgstr "Można jedynie zakończyć klientów w stanie bezczynności" #: ../xfce4-session/xfsm-manager.c:1956 #, c-format @@ -604,88 +604,88 @@ msgid "Choose a name for the new session:" msgstr "Wybierz nazwę dla nowej sesji:" -#: ../xfce4-session/xfsm-startup.c:115 +#: ../xfce4-session/xfsm-startup.c:347 msgid "Starting the Volume Controller" msgstr "Uruchamianie regulacji głośności" -#: ../xfce4-session/xfsm-startup.c:117 +#: ../xfce4-session/xfsm-startup.c:349 msgid "Starting the Panel" msgstr "Uruchamianie panelu" -#: ../xfce4-session/xfsm-startup.c:119 +#: ../xfce4-session/xfsm-startup.c:351 msgid "Starting the Desktop Manager" msgstr "Uruchamianie menedżera pulpitu" -#: ../xfce4-session/xfsm-startup.c:121 +#: ../xfce4-session/xfsm-startup.c:353 msgid "Starting the Taskbar" msgstr "Uruchamianie paska zadań" -#: ../xfce4-session/xfsm-startup.c:123 +#: ../xfce4-session/xfsm-startup.c:355 msgid "Starting the Window Manager" msgstr "Uruchamianie menedżera okien" -#: ../xfce4-session/xfsm-startup.c:127 +#: ../xfce4-session/xfsm-startup.c:359 msgid "Starting the Gnome Terminal Emulator" msgstr "Uruchamianie emulatora terminala Gnome" -#: ../xfce4-session/xfsm-startup.c:131 +#: ../xfce4-session/xfsm-startup.c:363 msgid "Starting the KDE Advanced Text Editor" msgstr "Uruchamianie edytora tekstu Kate" -#: ../xfce4-session/xfsm-startup.c:133 +#: ../xfce4-session/xfsm-startup.c:365 msgid "Starting the KDE Clipboard Manager" msgstr "Uruchamianie menedżera schowka KDE" -#: ../xfce4-session/xfsm-startup.c:135 +#: ../xfce4-session/xfsm-startup.c:367 msgid "Starting the KDE Mail Reader" msgstr "Uruchamianie programu pocztowego KDE" -#: ../xfce4-session/xfsm-startup.c:137 +#: ../xfce4-session/xfsm-startup.c:369 msgid "Starting the KDE News Reader" msgstr "Uruchamianie czytnika News KDE" -#: ../xfce4-session/xfsm-startup.c:139 +#: ../xfce4-session/xfsm-startup.c:371 msgid "Starting the Konqueror" msgstr "Uruchamianie przeglądarki Konqueror" -#: ../xfce4-session/xfsm-startup.c:141 +#: ../xfce4-session/xfsm-startup.c:373 msgid "Starting the KDE Terminal Emulator" msgstr "Uruchamianie emulatora terminala KDE" -#: ../xfce4-session/xfsm-startup.c:145 +#: ../xfce4-session/xfsm-startup.c:377 msgid "Starting the Beep Media Player" msgstr "Uruchamianie odtwarzacza mediów Beep" -#: ../xfce4-session/xfsm-startup.c:147 +#: ../xfce4-session/xfsm-startup.c:379 msgid "Starting The Gimp" msgstr "Uruchamianie programu Gimp" -#: ../xfce4-session/xfsm-startup.c:149 +#: ../xfce4-session/xfsm-startup.c:381 msgid "Starting the VI Improved Editor" msgstr "Uruchamianie edytora tekstu VIM" -#: ../xfce4-session/xfsm-startup.c:151 +#: ../xfce4-session/xfsm-startup.c:383 msgid "Starting the Session Management Proxy" msgstr "Uruchamianie pośrednika menadżera sesji" -#: ../xfce4-session/xfsm-startup.c:153 +#: ../xfce4-session/xfsm-startup.c:385 msgid "Starting the X-Chat IRC Client" msgstr "Uruchamianie klienta IRC X-Chat" -#: ../xfce4-session/xfsm-startup.c:155 +#: ../xfce4-session/xfsm-startup.c:387 msgid "Starting the X Multimedia System" msgstr "Uruchamianie X Multimedia System" -#: ../xfce4-session/xfsm-startup.c:157 +#: ../xfce4-session/xfsm-startup.c:389 msgid "Starting the X Terminal Emulator" msgstr "Uruchamianie emulatora terminala X" -#: ../xfce4-session/xfsm-startup.c:159 +#: ../xfce4-session/xfsm-startup.c:391 #, c-format msgid "Starting %s" msgstr "Uruchamianie %s" -#: ../xfce4-session/xfsm-startup.c:283 +#: ../xfce4-session/xfsm-startup.c:515 #, c-format msgid "" "The location and the format of the autostart directory has changed.\n" @@ -710,11 +710,11 @@ "położenia.\n" "Stary katalog może zostać usunięty.\n" -#: ../xfce4-session/xfsm-startup.c:452 +#: ../xfce4-session/xfsm-startup.c:684 msgid "Performing Autostart..." msgstr "Automatyczne uruchamianie programów..." -#: ../xfce4-session/xfsm-startup.c:558 +#: ../xfce4-session/xfsm-startup.c:790 msgid "Starting Assistive Technologies" msgstr "Uruchamianie technik ułatwień dostępu" @@ -735,7 +735,7 @@ #: ../xfce4-session/xfsm-shutdown.c:540 msgid "Shutdown is blocked by the kiosk settings" -msgstr "" +msgstr "Wyłączanie jest zablokowane przez ustawienia urządzenia" #: ../xfce4-session/xfsm-shutdown.c:623 #, c-format diff -Nru xfce4-session-4.10.0/po/sr.po xfce4-session-4.10.1/po/sr.po --- xfce4-session-4.10.0/po/sr.po 1970-01-01 00:00:00.000000000 +0000 +++ xfce4-session-4.10.1/po/sr.po 2013-05-05 15:33:55.000000000 +0000 @@ -0,0 +1,1203 @@ +# salepetronije , 2012. +msgid "" +msgstr "" +"Project-Id-Version: xfce4-session 4.4.0\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2012-04-19 03:12+0000\n" +"PO-Revision-Date: 2012-06-10 08:20+0200\n" +"Last-Translator: salepetronije \n" +"Language-Team: српски \n" +"Language: sr\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\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" + +#: ../xfce.desktop.in.h:1 +msgid "Use this session to run Xfce as your desktop environment" +msgstr "Користите ову сесију да покренете ИксФЦЕ као ваше радно окружење" + +#: ../xfce.desktop.in.h:2 +msgid "Xfce Session" +msgstr "ИксФЦЕ сесија" + +#: ../engines/balou/balou-theme.c:110 +msgid "No description given" +msgstr "Није дат опис" + +#: ../engines/balou/config.c:324 +msgid "Choose theme file to install..." +msgstr "Изабери датотеку теме за инсталирање..." + +#: ../engines/balou/config.c:336 +#, c-format +msgid "Unable to install splash theme from file \"%s\"" +msgstr "Не могу да инсталирам поздравну тему из датотеке „%s“" + +#: ../engines/balou/config.c:339 +msgid "Theme File Error" +msgstr "Грешка у датотеци теме" + +#: ../engines/balou/config.c:342 +msgid "Please check that the file is a valid splash theme archive." +msgstr "Молим, проверите да ли је датотека исправна архива поздравне теме." + +#: ../engines/balou/config.c:402 +#, c-format +msgid "Unable to remove splash theme \"%s\" from directory %s." +msgstr "Не могу да уклоним поздравну тему „%s“ из фасцикле %s." + +#: ../engines/balou/config.c:491 +msgid "Choose theme filename..." +msgstr "Изаберите име теме..." + +#: ../engines/balou/config.c:624 +msgid "_Install new theme" +msgstr "_Инсталирај нову тему" + +#: ../engines/balou/config.c:633 +msgid "_Remove theme" +msgstr "_Уклони тему" + +#: ../engines/balou/config.c:650 +msgid "_Export theme" +msgstr "_Извези тему" + +#: ../engines/balou/config.c:866 +msgid "Balou theme" +msgstr "Балу тема" + +#: ../engines/balou/config.c:951 +msgid "Configure Balou..." +msgstr "Подесите Балу..." + +#: ../engines/balou/config.c:994 +msgid "Balou" +msgstr "Балу" + +#: ../engines/balou/config.c:995 +msgid "Balou Splash Engine" +msgstr "Погон Балу поздравне теме" + +#: ../engines/mice/mice.c:373 +msgid "Mice" +msgstr "Миш" + +#: ../engines/mice/mice.c:374 +msgid "Mice Splash Engine" +msgstr "Погон Миш поздравне теме" + +#: ../engines/simple/simple.c:346 +msgid "Configure Simple..." +msgstr "Подеси примерак..." + +#: ../engines/simple/simple.c:357 +msgid "Font" +msgstr "Словни лик" + +#: ../engines/simple/simple.c:367 +msgid "Colors" +msgstr "Боје" + +#: ../engines/simple/simple.c:375 +msgid "Background color:" +msgstr "Боја позадине:" + +#: ../engines/simple/simple.c:388 +msgid "Text color:" +msgstr "Боја текста:" + +#: ../engines/simple/simple.c:401 +msgid "Image" +msgstr "Слика" + +#: ../engines/simple/simple.c:409 +msgid "Use custom image" +msgstr "Користите произвољну слику" + +#: ../engines/simple/simple.c:413 +msgid "Choose image..." +msgstr "Изаберите слику..." + +#: ../engines/simple/simple.c:419 +msgid "Images" +msgstr "Слике" + +#: ../engines/simple/simple.c:425 +msgid "All files" +msgstr "Све датотеке" + +#: ../engines/simple/simple.c:497 +msgid "Simple" +msgstr "Примерак" + +#: ../engines/simple/simple.c:498 +msgid "Simple Splash Engine" +msgstr "Погон примерка поздравне теме" + +#: ../scripts/xscreensaver.desktop.in.h:1 +msgid "Launch screensaver and locker program" +msgstr "Покрените чувар екрана и програм за закључавање" + +#: ../scripts/xscreensaver.desktop.in.h:2 +msgid "Screensaver" +msgstr "Чувар екрана" + +#: ../settings/main.c:43 +msgid "Settings manager socket" +msgstr "Прикључница управника подешавања" + +#: ../settings/main.c:43 +msgid "SOCKET ID" +msgstr "ИБ ПРИКЉУЧНИЦЕ" + +#: ../settings/main.c:44 +msgid "Version information" +msgstr "Подаци о издању" + +#: ../settings/main.c:75 ../xfce4-session/main.c:257 +#, c-format +msgid "Type '%s --help' for usage." +msgstr "Упишите „%s --help“ за коришћење." + +#: ../settings/main.c:87 ../xfce4-session/main.c:267 +#: ../xfce4-session-logout/main.c:135 +msgid "The Xfce development team. All rights reserved." +msgstr "ИксФЦЕ развојна дружина. Сва права су задржана." + +#: ../settings/main.c:88 ../xfce4-session/main.c:268 +#: ../xfce4-session-logout/main.c:138 +#, c-format +msgid "Please report bugs to <%s>." +msgstr "Молим пријавите грешку на <%s>." + +#: ../settings/main.c:97 ../xfce4-session/main.c:276 +msgid "Unable to contact settings server" +msgstr "Не могу да успоставим везу са сервером подешавања" + +#: ../settings/main.c:116 +msgid "Unable to create user interface from embedded definition data" +msgstr "Не могу да направим корисничко сучеље из угњеждених података одредница" + +#: ../settings/main.c:128 +msgid "_Application Autostart" +msgstr "_Почетни програми" + +#: ../settings/session-editor.c:61 +msgid "If running" +msgstr "Ако је покренут" + +#: ../settings/session-editor.c:62 +msgid "Always" +msgstr "Увек" + +#: ../settings/session-editor.c:63 +msgid "Immediately" +msgstr "Одмах" + +#: ../settings/session-editor.c:64 +msgid "Never" +msgstr "Никад" + +#: ../settings/session-editor.c:129 +msgid "Session Save Error" +msgstr "Грешка чувања сесије" + +#: ../settings/session-editor.c:130 +msgid "Unable to save the session" +msgstr "Не могу да сачувам сесију" + +#: ../settings/session-editor.c:170 +msgid "Clear sessions" +msgstr "Обриши сесије" + +#: ../settings/session-editor.c:171 +msgid "Are you sure you want to empty the session cache?" +msgstr "Да ли сте сигурни да желите испразнити оставу сесије?" + +#: ../settings/session-editor.c:172 +msgid "" +"The saved states of your applications will not be restored during your next " +"login." +msgstr "" +"Сачувана стања ваших програма неће бити повраћена приликом ваше следеће " +"пријаве." + +#: ../settings/session-editor.c:174 +msgid "_Proceed" +msgstr "_Настави" + +#: ../settings/session-editor.c:212 +#, c-format +msgid "You might need to delete some files manually in \"%s\"." +msgstr "Можда ћете морати ручно да обришете неке датотеке у „%s“." + +#: ../settings/session-editor.c:215 +msgid "All Xfce cache files could not be cleared" +msgstr "Нису све датотеке у ИксФЦЕ остави могле бити обрисане" + +#: ../settings/session-editor.c:249 +#, c-format +msgid "Are you sure you want to terminate \"%s\"?" +msgstr "Да ли сте сигурни да желите да окончате „%s“?" + +#: ../settings/session-editor.c:252 ../settings/session-editor.c:280 +msgid "Terminate Program" +msgstr "Окончај програм" + +#: ../settings/session-editor.c:254 +msgid "" +"The application will lose any unsaved state and will not be restarted in " +"your next session." +msgstr "" +"Програм ће изгубити сва несачувана стања и неће бити покренут са вашом " +"следећом сесијом." + +#: ../settings/session-editor.c:256 +#: ../settings/xfce4-session-settings.glade.h:40 +msgid "_Quit Program" +msgstr "_Напусти програм" + +#: ../settings/session-editor.c:281 +msgid "Unable to terminate program." +msgstr "Не могу да окончам програм." + +#: ../settings/session-editor.c:459 +msgid "(Unknown program)" +msgstr "(Непознати програм)" + +#: ../settings/session-editor.c:679 +msgid "Priority" +msgstr "Предност" + +#: ../settings/session-editor.c:687 +msgid "PID" +msgstr "ПИД" + +#: ../settings/session-editor.c:693 +msgid "Program" +msgstr "Програм" + +#: ../settings/session-editor.c:718 +msgid "Restart Style" +msgstr "Начин поновног покретања" + +#: ../settings/splash-settings.c:291 ../settings/splash-settings.c:294 +#: ../settings/splash-settings.c:297 ../settings/splash-settings.c:300 +#: ../settings/splash-settings.c:357 +msgid "None" +msgstr "Ништа" + +#: ../settings/xfae-dialog.c:78 +msgid "Add application" +msgstr "Додај програм" + +#: ../settings/xfae-dialog.c:92 +msgid "Name:" +msgstr "Назив:" + +#: ../settings/xfae-dialog.c:109 +msgid "Description:" +msgstr "Опис:" + +#: ../settings/xfae-dialog.c:124 ../settings/xfae-model.c:479 +msgid "Command:" +msgstr "Наредба:" + +#: ../settings/xfae-dialog.c:184 +msgid "Select a command" +msgstr "Изаберите наредбу" + +#: ../settings/xfae-dialog.c:233 +msgid "Edit application" +msgstr "Уреди програм" + +#: ../settings/xfae-model.c:611 +#, c-format +msgid "Failed to unlink %s: %s" +msgstr "Нисам успео да прекинем везу %s: %s" + +#: ../settings/xfae-model.c:700 +#, c-format +msgid "Failed to create file %s" +msgstr "Нисам успео да направим датотеку %s" + +#: ../settings/xfae-model.c:723 +#, c-format +msgid "Failed to write file %s" +msgstr "Нисам успео да упишем датотеку %s" + +#: ../settings/xfae-model.c:782 +#, c-format +msgid "Failed to open %s for reading" +msgstr "Нисам успео да отворим %s за читање" + +#: ../settings/xfae-model.c:891 ../settings/xfae-model.c:948 +#, c-format +msgid "Failed to open %s for writing" +msgstr "Нисам успео да отворим %s за писање" + +#: ../settings/xfae-window.c:102 +msgid "" +"Below is the list of applications that will be started automatically when " +"you login to your Xfce desktop, in addition to the applications that were " +"saved when you logged out last time. Cursive applications belong to another " +"desktop environment, but you can still enable them if you want." +msgstr "" +"Испод је списак програма који ће бити покренути када се пријавите на ваше " +"ИксФЦЕ окружење, који су додати програмима који су сачувани када сте се " +"одјавили последњи пут. Косим словима су исписани програми који припадају " +"другим радним окружењима, али их ипак можете омогућити ако то желите." + +#: ../settings/xfae-window.c:293 +#, c-format +msgid "Failed adding \"%s\"" +msgstr "Нисам успео да додам „%s“" + +#: ../settings/xfae-window.c:324 ../settings/xfae-window.c:338 +msgid "Failed to remove item" +msgstr "Нисам успео да уклоним ставку" + +#: ../settings/xfae-window.c:330 +msgid "" +"This will permanently remove the application from the list of automatically " +"started applications" +msgstr "Ово ће трајно уклонити програм са списка почетних програма" + +#: ../settings/xfae-window.c:332 +#, c-format +msgid "Are you sure you want to remove \"%s\"" +msgstr "Да ли сигурно желите да уклоните „%s“" + +#: ../settings/xfae-window.c:366 +msgid "Failed to edit item" +msgstr "Нисам успео да уредим ставку" + +#: ../settings/xfae-window.c:386 +#, c-format +msgid "Failed to edit item \"%s\"" +msgstr "Нисам успео да уредим ставку „%s“" + +#: ../settings/xfae-window.c:414 +msgid "Failed to toggle item" +msgstr "Нисам успео да заменим ставку" + +#: ../xfce4-session/main.c:76 +msgid "Disable binding to TCP ports" +msgstr "Искључује повезивање на ТЦП прикључке" + +#: ../xfce4-session/main.c:77 ../xfce4-session-logout/main.c:91 +msgid "Print version information and exit" +msgstr "Штампа податке о издању и излази" + +#: ../xfce4-session/main.c:140 +msgid "Loading desktop settings" +msgstr "Учитавам подешавања радног окружења" + +#. verify that the DNS settings are ok +#: ../xfce4-session/main.c:298 +msgid "Verifying DNS settings" +msgstr "Проверавам ДНС подешавања" + +#: ../xfce4-session/main.c:302 +msgid "Loading session data" +msgstr "Учитавам податке сесије" + +#: ../xfce4-session/xfsm-chooser.c:90 +#, c-format +msgid "Last accessed: %s" +msgstr "Последњи приступ: %s" + +#: ../xfce4-session/xfsm-chooser.c:172 +msgid "" +"Choose the session you want to restore. You can simply double-click the " +"session name to restore it." +msgstr "" +"Одаберите сесију коју желите да повратите. Можете једноставно кликнути " +"двапут на назив сесије да је повратите." + +#. "Logout" button +#: ../xfce4-session/xfsm-chooser.c:198 +msgid "Log out" +msgstr "Одјави ме" + +#: ../xfce4-session/xfsm-chooser.c:200 +msgid "Cancel the login attempt and return to the login screen." +msgstr "Откажите покушај пријављивања и вратите се на екран за пријављивање." + +#. "New" button +#: ../xfce4-session/xfsm-chooser.c:207 +msgid "New session" +msgstr "Нова сесија" + +#: ../xfce4-session/xfsm-chooser.c:208 +msgid "Create a new session." +msgstr "Направите нову сесију." + +#: ../xfce4-session/xfsm-client.c:506 ../xfce4-session/xfsm-client.c:532 +#: ../xfce4-session/xfsm-client.c:571 +#, c-format +msgid "The client doesn't have any properties set yet" +msgstr "Клијент још увек нема никаква подешавања" + +#: ../xfce4-session/xfsm-compat-gnome.c:246 +msgid "Starting The Gnome Keyring Daemon" +msgstr "Покрећем демона Гномовог привеска кључева" + +#: ../xfce4-session/xfsm-compat-kde.c:124 +msgid "Starting KDE services" +msgstr "Покрећем КДЕ услуге" + +#: ../xfce4-session/xfsm-dns.c:78 +msgid "(Unknown)" +msgstr "(Непознато)" + +#: ../xfce4-session/xfsm-dns.c:147 +#, c-format +msgid "" +"Could not look up internet address for %s.\n" +"This will prevent Xfce from operating correctly.\n" +"It may be possible to correct the problem by adding\n" +"%s to the file /etc/hosts on your system." +msgstr "" +"Нисам могао приступити мрежној адреси %s.\n" +"То ће спречити ИксФЦЕ да ради исправно\n" +"Могуће је да ће проблем бити исправљен додавањем\n" +"%s у датотеку „/etc/hosts“ на вашем рачунару." + +#: ../xfce4-session/xfsm-dns.c:154 +msgid "Continue anyway" +msgstr "Ипак настави" + +#: ../xfce4-session/xfsm-dns.c:155 +msgid "Try again" +msgstr "Покушај поново" + +#: ../xfce4-session/xfsm-manager.c:609 +#, c-format +msgid "" +"Unable to determine failsafe session name. Possible causes: xfconfd isn't " +"running (D-Bus setup problem); environment variable $XDG_CONFIG_DIRS is set " +"incorrectly (must include \"%s\"), or xfce4-session is installed incorrectly." +msgstr "" +"Не могу да одредим назив сесије отпорне на грешке. Могући разлози: " +"„xfconfd“ није покренут (грешка у подешавањима Д-сабирнице); променљива " +"окружења „$XDG_CONFIG_DIRS“ је одређена погрешно (мора укључити „%s“), или " +"је „xfce4-session“ погрешно инсталиран." + +#: ../xfce4-session/xfsm-manager.c:620 +#, c-format +msgid "" +"The specified failsafe session (\"%s\") is not marked as a failsafe session." +msgstr "" +"Одређена сесија отпорна на грешке („%s“) није обележена као сесија отпорна " +"на грешке." + +#: ../xfce4-session/xfsm-manager.c:667 +msgid "The list of applications in the failsafe session is empty." +msgstr "Списак програма сесије отпорне на грешке је празан." + +#. FIXME: migrate this into the splash screen somehow so the +#. * window doesn't look ugly (right now now WM is running, so it +#. * won't have window decorations). +#: ../xfce4-session/xfsm-manager.c:714 +msgid "Session Manager Error" +msgstr "Грешка управника сесије" + +#: ../xfce4-session/xfsm-manager.c:716 +msgid "Unable to load a failsafe session" +msgstr "Не могу да учитам сесију отпорну на грешке" + +#: ../xfce4-session/xfsm-manager.c:1123 +msgid "Shutdown Failed" +msgstr "Није успело гашење" + +#: ../xfce4-session/xfsm-manager.c:1126 +msgid "Failed to suspend session" +msgstr "Нисам успео да обуставим сесију" + +#: ../xfce4-session/xfsm-manager.c:1127 +msgid "Failed to hibernate session" +msgstr "Нисам успео да замрзнем сесију" + +#: ../xfce4-session/xfsm-manager.c:1393 +#, c-format +msgid "Can only terminate clients when in the idle state" +msgstr "Клијент може бити окончан само у стању неактивности" + +#: ../xfce4-session/xfsm-manager.c:1956 +#, c-format +msgid "Session manager must be in idle state when requesting a checkpoint" +msgstr "" +"Управник сесије мора бити у стању неактивности при захтеву за контролном " +"тачком" + +#: ../xfce4-session/xfsm-manager.c:1997 +#, c-format +msgid "Session manager must be in idle state when requesting a shutdown" +msgstr "Управник сесије мора бити у стању неактивности при захтеву за гашењем" + +#: ../xfce4-session/xfsm-logout-dialog.c:188 +#, c-format +msgid "Log out %s" +msgstr "Одјава %s" + +#. * +#. * Logout +#. * +#: ../xfce4-session/xfsm-logout-dialog.c:246 +msgid "_Log Out" +msgstr "_Одјави" + +#: ../xfce4-session/xfsm-logout-dialog.c:266 +msgid "_Restart" +msgstr "_Поново покрени" + +#: ../xfce4-session/xfsm-logout-dialog.c:286 +msgid "Shut _Down" +msgstr "_Угаси" + +#: ../xfce4-session/xfsm-logout-dialog.c:309 +msgid "Sus_pend" +msgstr "Обу_стави" + +#: ../xfce4-session/xfsm-logout-dialog.c:343 +msgid "_Hibernate" +msgstr "_Замрзни" + +#: ../xfce4-session/xfsm-logout-dialog.c:368 +msgid "_Save session for future logins" +msgstr "_Сачувај сесију за следеће пријаве" + +#: ../xfce4-session/xfsm-logout-dialog.c:395 +msgid "Please enter your password" +msgstr "Молим унесите вашу лизинку" + +#: ../xfce4-session/xfsm-logout-dialog.c:427 +msgid "An error occurred" +msgstr "Дошло је до грешке" + +#: ../xfce4-session/xfsm-logout-dialog.c:433 +msgid "" +"Either the password you entered is invalid, or the system administrator " +"disallows shutting down this computer with your user account." +msgstr "" +"Или је лозинка коју сте унели погрешна, или одржавалац система не дозвољава " +"гашење рачунара са вашег корисничког налога." + +#: ../xfce4-session/xfsm-splash-screen.c:178 +msgid "Choose session" +msgstr "Изаберите сесију" + +#: ../xfce4-session/xfsm-splash-screen.c:208 +msgid "Choose session name" +msgstr "Изаберите назив сесије" + +#: ../xfce4-session/xfsm-splash-screen.c:222 +msgid "Choose a name for the new session:" +msgstr "Изаберите назив нове сесије:" + +#: ../xfce4-session/xfsm-startup.c:115 +msgid "Starting the Volume Controller" +msgstr "Покрећем управљање звуком" + +#: ../xfce4-session/xfsm-startup.c:117 +msgid "Starting the Panel" +msgstr "Покрећем панел" + +#: ../xfce4-session/xfsm-startup.c:119 +msgid "Starting the Desktop Manager" +msgstr "Покрећем управника радног окружења" + +#: ../xfce4-session/xfsm-startup.c:121 +msgid "Starting the Taskbar" +msgstr "Покрећем траку задатака" + +#: ../xfce4-session/xfsm-startup.c:123 +msgid "Starting the Window Manager" +msgstr "Покрећем управника прозора" + +#: ../xfce4-session/xfsm-startup.c:127 +msgid "Starting the Gnome Terminal Emulator" +msgstr "Покрећем Гномов терминал" + +#: ../xfce4-session/xfsm-startup.c:131 +msgid "Starting the KDE Advanced Text Editor" +msgstr "Покрећем напредни уређивач текста КДЕ-а" + +#: ../xfce4-session/xfsm-startup.c:133 +msgid "Starting the KDE Clipboard Manager" +msgstr "Покрећем управника списка исечака за КДЕ" + +#: ../xfce4-session/xfsm-startup.c:135 +msgid "Starting the KDE Mail Reader" +msgstr "Покрећем поштанско сандуче КДЕ-а" + +#: ../xfce4-session/xfsm-startup.c:137 +msgid "Starting the KDE News Reader" +msgstr "Покрећем КДЕ читаоца вести" + +#: ../xfce4-session/xfsm-startup.c:139 +msgid "Starting the Konqueror" +msgstr "Покрећем K-освајача" + +#: ../xfce4-session/xfsm-startup.c:141 +msgid "Starting the KDE Terminal Emulator" +msgstr "Покрећем КДЕ терминал" + +#: ../xfce4-session/xfsm-startup.c:145 +msgid "Starting the Beep Media Player" +msgstr "Покрећем Бип медијски програм" + +#: ../xfce4-session/xfsm-startup.c:147 +msgid "Starting The Gimp" +msgstr "Покрећем Гнуов програм за обраду слика" + +#: ../xfce4-session/xfsm-startup.c:149 +msgid "Starting the VI Improved Editor" +msgstr "Покрећем ВИ унапређени уређивач текста" + +#: ../xfce4-session/xfsm-startup.c:151 +msgid "Starting the Session Management Proxy" +msgstr "Покрећем посредника управљања сесијом" + +#: ../xfce4-session/xfsm-startup.c:153 +msgid "Starting the X-Chat IRC Client" +msgstr "Покрећем ИРЦ клијента Икс-ћаскања" + +#: ../xfce4-session/xfsm-startup.c:155 +msgid "Starting the X Multimedia System" +msgstr "Покрећем Иксов мултимедијски систем" + +#: ../xfce4-session/xfsm-startup.c:157 +msgid "Starting the X Terminal Emulator" +msgstr "Покрећем Иксов терминал" + +#: ../xfce4-session/xfsm-startup.c:159 +#, c-format +msgid "Starting %s" +msgstr "Покрећем %s" + +#: ../xfce4-session/xfsm-startup.c:283 +#, c-format +msgid "" +"The location and the format of the autostart directory has changed.\n" +"The new location is\n" +"\n" +" %s\n" +"\n" +"where you can place .desktop files to, that describe the applications\n" +"to start when you login to your Xfce desktop. The files in your old\n" +"autostart directory have been successfully migrated to the new\n" +"location.\n" +"You should delete this directory now.\n" +msgstr "" +"Путања и формат фасцикле почетних програма је измењена.\n" +"Нова путања је\n" +"\n" +" %s\n" +"\n" +"где можете сместити датотеке радне површи, које говоре програмима\n" +"да се покрену кад се пријавите на ваше ИксФЦЕ окружење. Датотеке у вашој " +"старој\n" +"фасцикли су успешно премештене на ново\n" +"место.\n" +"Треба да обришете ову фасциклу сада.\n" + +#: ../xfce4-session/xfsm-startup.c:452 +msgid "Performing Autostart..." +msgstr "Покрећем почетне програме..." + +#: ../xfce4-session/xfsm-startup.c:558 +msgid "Starting Assistive Technologies" +msgstr "Покрећем технологије приступачности" + +#: ../xfce4-session/xfsm-shutdown.c:414 +#, c-format +msgid "Error sending command to shutdown helper: %s" +msgstr "Грешка слања наредбе помоћнику гашења: %s" + +#: ../xfce4-session/xfsm-shutdown.c:427 +#, c-format +msgid "Error receiving response from shutdown helper: %s" +msgstr "Грешка пријема одзива од помоћника гашења: %s" + +#: ../xfce4-session/xfsm-shutdown.c:435 +#, c-format +msgid "Shutdown command failed" +msgstr "Наредба гашења није успела" + +#: ../xfce4-session/xfsm-shutdown.c:540 +msgid "Shutdown is blocked by the kiosk settings" +msgstr "Гашење је онемогућено киоск подешавањима" + +#: ../xfce4-session/xfsm-shutdown.c:623 +#, c-format +msgid "Unknown shutdown method %d" +msgstr "Непознати начин гашења %d" + +#: ../xfce4-session-logout/main.c:67 +msgid "Log out without displaying the logout dialog" +msgstr "Одјава без приказивања прозорчета одјаве" + +#: ../xfce4-session-logout/main.c:71 +msgid "Halt without displaying the logout dialog" +msgstr "Гашење без приказивања прозорчета одјаве" + +#: ../xfce4-session-logout/main.c:75 +msgid "Reboot without displaying the logout dialog" +msgstr "Поновно покретање без приказивања прозорчета одјаве" + +#: ../xfce4-session-logout/main.c:79 +msgid "Suspend without displaying the logout dialog" +msgstr "Обустављање без приказивања прозорчета одјаве" + +#: ../xfce4-session-logout/main.c:83 +msgid "Hibernate without displaying the logout dialog" +msgstr "Успављивање без приказивања прозорчета одјаве" + +#: ../xfce4-session-logout/main.c:87 +msgid "Log out quickly; don't save the session" +msgstr "Одјављује се брзо; без чувања сесије" + +#: ../xfce4-session-logout/main.c:110 +msgid "Unknown error" +msgstr "Непозната грешка" + +#: ../xfce4-session-logout/main.c:136 +msgid "Written by Benedikt Meurer " +msgstr "Написао Бенедикт Мејрер " + +#: ../xfce4-session-logout/main.c:137 +msgid "and Brian Tarricone ." +msgstr "и Брајан Тариконе ." + +#: ../xfce4-session-logout/main.c:147 +msgid "Unable to contact D-Bus session bus" +msgstr "Не могу да ступим у везу са сабирницу сесије Д-сабирнице" + +#: ../xfce4-session-logout/main.c:223 +msgid "Received error while trying to log out" +msgstr "Примио сам грешку приликом одјављивања" + +#: ../xfce4-session-logout/xfce4-session-logout.desktop.in.h:1 +msgid "Log Out" +msgstr "Одјава" + +#: ../xfce4-session-logout/xfce4-session-logout.desktop.in.h:2 +msgid "Log out of the Xfce Desktop" +msgstr "Одјавите се са ИксФЦЕ радног окружења" + +#: ../settings/xfce-session-settings.desktop.in.h:1 +#: ../settings/xfce4-session-settings.glade.h:15 +msgid "Customize desktop startup and splash screen" +msgstr "Пролагодите радно окружење и поздравни екран" + +#: ../settings/xfce-session-settings.desktop.in.h:2 +#: ../settings/xfce4-session-settings.glade.h:30 +msgid "Session and Startup" +msgstr "Сесија и почетни програми" + +#: ../settings/xfce4-session-settings.glade.h:1 +msgid "Author:" +msgstr "Аутор:" + +#: ../settings/xfce4-session-settings.glade.h:2 +msgid "Compatibility" +msgstr "Усаглашеност" + +#: ../settings/xfce4-session-settings.glade.h:3 +msgid "Description:" +msgstr "Опис:" + +#: ../settings/xfce4-session-settings.glade.h:4 +msgid "Homepage:" +msgstr "Почетна страница:" + +#: ../settings/xfce4-session-settings.glade.h:5 +msgid "Information" +msgstr "Информације" + +#: ../settings/xfce4-session-settings.glade.h:6 +msgid "Logout Settings" +msgstr "Подешавања одјаве" + +#: ../settings/xfce4-session-settings.glade.h:7 +msgid "Security" +msgstr "Безбедност" + +#: ../settings/xfce4-session-settings.glade.h:8 +msgid "Session Chooser" +msgstr "Избирач сесије" + +#: ../settings/xfce4-session-settings.glade.h:9 +msgid "Shutdown" +msgstr "Гашење" + +#: ../settings/xfce4-session-settings.glade.h:10 +msgid "Version:" +msgstr "Издање:" + +#: ../settings/xfce4-session-settings.glade.h:11 +msgid "Ad_vanced" +msgstr "На_предно" + +#: ../settings/xfce4-session-settings.glade.h:12 +msgid "Always save the session when logging out" +msgstr "Увек сачувај сесију при одјави" + +#: ../settings/xfce4-session-settings.glade.h:13 +msgid "Automatically save session on _logout" +msgstr "Сам сачувај сесију при _одјави" + +#: ../settings/xfce4-session-settings.glade.h:14 +msgid "Con_figure" +msgstr "При_лагоди" + +#: ../settings/xfce4-session-settings.glade.h:16 +msgid "Demonstrates the selected splash screen" +msgstr "Прикажи изабрани поздравни екран" + +#: ../settings/xfce4-session-settings.glade.h:17 +msgid "Display the session chooser every time Xfce starts" +msgstr "Прикажи избирач сесије при сваком покретању ИксФЦЕ-а" + +#: ../settings/xfce4-session-settings.glade.h:18 +msgid "Empty the session cache" +msgstr "Испразни оставу сесије" + +#: ../settings/xfce4-session-settings.glade.h:19 +msgid "Launch GN_OME services on startup" +msgstr "Покрени сервисе _Гнома на покретању" + +#: ../settings/xfce4-session-settings.glade.h:20 +msgid "Launch _KDE services on startup" +msgstr "Покрени сервисе КДЕ-а на покретању" + +#: ../settings/xfce4-session-settings.glade.h:21 +msgid "Manage _remote applications" +msgstr "Управљај удаљеним програмима" + +#: ../settings/xfce4-session-settings.glade.h:22 +msgid "" +"Manage remote applications over the network (this may be a security risk)" +msgstr "" +"Управљајте удаљеним програмима преко мреже (ово може бити сигурносни ризик)" + +#: ../settings/xfce4-session-settings.glade.h:23 +msgid "Opens the configuration panel for the selected splash screen" +msgstr "Отвара панел поставки изабраног поздравног екрана" + +#: ../settings/xfce4-session-settings.glade.h:24 +msgid "Prompt for confirmation when logging out" +msgstr "Упитај за потврду приликом одајве" + +#: ../settings/xfce4-session-settings.glade.h:25 +msgid "Quit the program, and remove it from the session" +msgstr "Затвори програм и уклони га из сесије" + +#: ../settings/xfce4-session-settings.glade.h:26 +msgid "Run xflock4 before suspending or hibernating the system" +msgstr "Покрени „xflock4“ пре успављивања или замрзавања система" + +#: ../settings/xfce4-session-settings.glade.h:27 +msgid "S_plash" +msgstr "П_оздравни екран" + +#: ../settings/xfce4-session-settings.glade.h:28 +msgid "Save Sessio_n" +msgstr "Сачувај _сесију" + +#: ../settings/xfce4-session-settings.glade.h:29 +msgid "Saving Session" +msgstr "Чувам сесију" + +#: ../settings/xfce4-session-settings.glade.h:31 +msgid "Start GNOME services, such as gnome-keyring" +msgstr "Покрени Гномове услуге, као што је гномов привезак" + +#: ../settings/xfce4-session-settings.glade.h:32 +msgid "Start KDE services, such as kdeinit" +msgstr "Покрени КДЕ услуге, као што је кде покретање" + +#: ../settings/xfce4-session-settings.glade.h:33 +msgid "" +"These applications are a part of the currently-running session, and can be " +"saved when you log out. Changes below will only take effect when the " +"session is saved." +msgstr "" +"Ови програми су део тренутно покренуте сесије, и могу бити сачувани када се " +"одјавите. Промене испод ће ступити на снагу само ако је сесија сачувана." + +#: ../settings/xfce4-session-settings.glade.h:34 +msgid "" +"Your session is being saved. If you do not wish to wait, you may close this " +"window." +msgstr "" +"Ваша сесија је сачувана. Ако не желите да чекате, можете затворити овај " +"прозор." + +#: ../settings/xfce4-session-settings.glade.h:35 +msgid "_Clear saved sessions" +msgstr "_Очисти сачуване сесије" + +#: ../settings/xfce4-session-settings.glade.h:36 +msgid "_Display chooser on login" +msgstr "_Прикажи бирач приликом пријаве" + +#: ../settings/xfce4-session-settings.glade.h:37 +msgid "_General" +msgstr "_Опште" + +#: ../settings/xfce4-session-settings.glade.h:38 +msgid "_Lock screen before sleep" +msgstr "_Закључај екран пре успављивања" + +#: ../settings/xfce4-session-settings.glade.h:39 +msgid "_Prompt on logout" +msgstr "_Питај при одјављивању" + +#: ../settings/xfce4-session-settings.glade.h:41 +msgid "_Session" +msgstr "_Сесија" + +#: ../settings/xfce4-session-settings.glade.h:42 +msgid "_Test" +msgstr "_Тест" + +#: ../settings/xfce4-session-settings.glade.h:43 +msgid "label" +msgstr "натпис" + +#~ msgid "Session" +#~ msgstr "Session" + +#~ msgid "Loc_k screen" +#~ msgstr "Loc_k screen" + +#~ msgid "_Suspend" +#~ msgstr "_Suspend" + +#~ msgid "_Reboot" +#~ msgstr "_Reboot" + +#~ msgid "Shut _down" +#~ msgstr "Shut _down" + +#~ msgid "_Log out" +#~ msgstr "_Log out" + +#~ msgid "Are you sure you want to log out?" +#~ msgstr "Are you sure you want to log out?" + +#~ msgid "You will be logged out in %u seconds." +#~ msgstr "You will be logged out in %u seconds." + +#~ msgid "Failed to log out." +#~ msgstr "Failed to log out." + +#~ msgid "Are you sure you want to shut down?" +#~ msgstr "Are you sure you want to shut down?" + +#~ msgid "Your system will shut down in %u seconds." +#~ msgstr "Your system will shut down in %u seconds." + +#~ msgid "Failed to shut down." +#~ msgstr "Failed to shut down." + +#~ msgid "Are you sure you want to reboot?" +#~ msgstr "Are you sure you want to reboot?" + +#~ msgid "Your system will reboot in %u seconds." +#~ msgstr "Your system will reboot in %u seconds." + +#~ msgid "Failed to reboot." +#~ msgstr "Failed to reboot." + +#~ msgid "Failed to suspend" +#~ msgstr "Failed to suspend" + +#~ msgid "Failed to hibernate" +#~ msgstr "Failed to hibernate" + +#~ msgid "Built with Gtk+-%d.%d.%d, running with Gtk+-%d.%d.%d" +#~ msgstr "Built with Gtk+-%d.%d.%d, running with Gtk+-%d.%d.%d" + +#~ msgid "Log out %s" +#~ msgstr "Log out %s" + +#~ msgid "Hibernate" +#~ msgstr "Hibernate" + +#~ msgid "Unable to perform shutdown" +#~ msgstr "Unable to perform shutdown" + +#~ msgid "Invalid shutdown type \"%u\"" +#~ msgstr "Invalid shutdown type \"%u\"" + +#~ msgid "Suspend failed, no backend supported" +#~ msgstr "Suspend failed, no backend supported" + +#~ msgid "Hibernate failed, no backend supported" +#~ msgstr "Hibernate failed, no backend supported" + +#~ msgid "Shutdown Command not found" +#~ msgstr "Shutdown Command not found" + +#~ msgid "Tips and Tricks" +#~ msgstr "Tips and Tricks" + +#~ msgid "Fortunes" +#~ msgstr "Fortunes" + +#~ msgid "Could not load tips database (%s)." +#~ msgstr "Could not load tips database (%s)." + +#~ msgid "Invalid output of fortune." +#~ msgstr "Invalid output of fortune." + +#~ msgid "Executing fortune failed (%s)" +#~ msgstr "Executing fortune failed (%s)" + +#~ msgid "Error while loading tips." +#~ msgstr "Error while loading tips." + +#~ msgid "Display tips on _startup" +#~ msgstr "Display tips on _startup" + +#~ msgid "Next" +#~ msgstr "Next" + +#~ msgid "Logout Error" +#~ msgstr "Logout Error" + +#~ msgid "Failed to create new D-Bus message" +#~ msgstr "Failed to create new D-Bus message" + +#~ msgid "Failed to receive a reply from the session manager" +#~ msgstr "Failed to receive a reply from the session manager" + +#~ msgid "Session Menu" +#~ msgstr "Session Menu" + +#~ msgid "" +#~ "Shows a menu with options to lock the screen, suspend, shutdown, or log " +#~ "out" +#~ msgstr "" +#~ "Shows a menu with options to lock the screen, suspend, shutdown, or log " +#~ "out" + +#~ msgid "Tips and tricks" +#~ msgstr "Tips and tricks" + +#~ msgid "xfce4-tips" +#~ msgstr "xfce4-tips" + +#~ msgid "Session Error" +#~ msgstr "Choose session name" + +#~ msgid "Session Settings" +#~ msgstr "Session and Startup Settings" + +#~ msgid "Unable to create parent pipe: %s" +#~ msgstr "Failed to create file %s" + +#~ msgid "Unable to create child pipe: %s" +#~ msgstr "Failed to create file %s" + +#~ msgid "Session and Startup Settings" +#~ msgstr "Session and Startup Settings" + +#~ msgid "Sessions and Startup Settings" +#~ msgstr "Sessions and Startup Settings" + +#~ msgid "Xfce 4 Sessions and Startup Settings" +#~ msgstr "Xfce 4 Sessions and Startup Settings" + +#~ msgid "Remove the selected application from the session." +#~ msgstr "Demonstrates the selected splash screen." + +#~ msgid "" +#~ "If set, the session manager will ask you to choose a session every time " +#~ "you log in to Xfce." +#~ msgstr "" +#~ "If set, the session manager will ask you to choose a session every time " +#~ "you log in to Xfce." + +#~ msgid "" +#~ "This option instructs the session manager to save the current session " +#~ "automatically when you log out. If you don't select this option you'll be " +#~ "prompted whether you want to save the current session on each logout." +#~ msgstr "" +#~ "This option instructs the session manager to save the current session " +#~ "automatically when you log out. If you don't select this option you'll be " +#~ "prompted whether you want to save the current session on each logout." + +#~ msgid "" +#~ "This option disables the logout confirmation dialog. Whether the session " +#~ "will be saved or not depends on whether you enabled the automatic saving " +#~ "of sessions on logout or not." +#~ msgstr "" +#~ "This option disables the logout confirmation dialogue. Whether the " +#~ "session will be saved or not depends on whether you enabled the automatic " +#~ "saving of sessions on logout or not." + +#~ msgid "Launch Gnome services on startup" +#~ msgstr "Launch Gnome services on startup" + +#~ msgid "" +#~ "Enable this if you plan to use Gnome applications. This will instruct the " +#~ "session manager to start some vital Gnome services for you. You should " +#~ "also enable this if you want to use the Assistive Technologies that ship " +#~ "with Gnome." +#~ msgstr "" +#~ "Enable this if you plan to use Gnome applications. This will instruct the " +#~ "session manager to start some vital Gnome services for you. You should " +#~ "also enable this if you want to use the Assistive Technologies that ship " +#~ "with Gnome." + +#~ msgid "" +#~ "Enable this option if you plan to run KDE applications as part of your " +#~ "Xfce Desktop session. This will notably increase the startup time, but on " +#~ "the other hand, KDE applications will startup faster. Some KDE " +#~ "applications may not work at all if you don't enable this option." +#~ msgstr "" +#~ "Enable this option if you plan to run KDE applications as part of your " +#~ "Xfce Desktop session. This will notably increase the startup time, but on " +#~ "the other hand, KDE applications will startup faster. Some KDE " +#~ "applications may not work at all if you don't enable this option." + +#~ msgid "Security" +#~ msgstr "Security" + +#~ msgid "" +#~ "Allow the session manager to manage applications running on remote hosts. " +#~ "Do not enable this option unless you know what you are doing." +#~ msgstr "" +#~ "Allow the session manager to manage applications running on remote hosts. " +#~ "Do not enable this option unless you know what you are doing." + +#~ msgid "Button Label|Sessions and Startup" +#~ msgstr "Sessions and Startup" + +#~ msgid "Splash Screen Settings" +#~ msgstr "Splash Screen Settings" + +#~ msgid "Button Label|Splash Screen" +#~ msgstr "Splash Screen" + +#~ msgid "Autostarted applications" +#~ msgstr "Autostarted applications" + +#~ msgid "Xfce 4 Splash Screen Settings" +#~ msgstr "Xfce 4 Splash Screen Settings" + +#~ msgid "Autostarted Applications" +#~ msgstr "Autostarted Applications" + +#~ msgid "Edit the list of autostarted applications" +#~ msgstr "Edit the list of autostarted applications" + +#~ msgid "Xfce 4 Autostarted Applications" +#~ msgstr "Xfce 4 Autostarted Applications" diff -Nru xfce4-session-4.10.0/po/sv.po xfce4-session-4.10.1/po/sv.po --- xfce4-session-4.10.0/po/sv.po 2012-04-28 20:43:27.000000000 +0000 +++ xfce4-session-4.10.1/po/sv.po 2013-05-05 15:33:55.000000000 +0000 @@ -9,7 +9,7 @@ msgstr "" "Project-Id-Version: xfce4-session\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2011-02-28 05:11+0000\n" +"POT-Creation-Date: 2013-03-17 20:18+0000\n" "PO-Revision-Date: 2010-10-17 17:15+0100\n" "Last-Translator: Daniel Nylander \n" "Language-Team: Swedish \n" @@ -19,6 +19,14 @@ "Language: sv\n" "Plural-Forms: nplurals=2; plural=n != 1;\n" +#: ../xfce.desktop.in.h:1 +msgid "Use this session to run Xfce as your desktop environment" +msgstr "Använd denna session för att köra Xfce som din skrivbordsmiljö" + +#: ../xfce.desktop.in.h:2 +msgid "Xfce Session" +msgstr "Xfce Session" + #: ../engines/balou/balou-theme.c:110 msgid "No description given" msgstr "Ingen beskrivning angiven" @@ -133,97 +141,13 @@ msgid "Simple Splash Engine" msgstr "Startbildsmotorn Simple" -#: ../panel-plugin/xfsm-logout-plugin.c:86 -msgid "Session" -msgstr "Session" - -#: ../panel-plugin/xfsm-logout-plugin.c:87 -msgid "Loc_k screen" -msgstr "Lås s_kärmen" - -#: ../panel-plugin/xfsm-logout-plugin.c:88 -#: ../panel-plugin/xfsm-logout-plugin.c:128 -msgid "_Suspend" -msgstr "Vä_nteläge" - -#: ../panel-plugin/xfsm-logout-plugin.c:89 -#: ../panel-plugin/xfsm-logout-plugin.c:135 ../xfce4-session/shutdown.c:599 -msgid "_Hibernate" -msgstr "V_iloläge" - -#: ../panel-plugin/xfsm-logout-plugin.c:90 -#: ../panel-plugin/xfsm-logout-plugin.c:121 -msgid "_Reboot" -msgstr "Starta _om" - -#: ../panel-plugin/xfsm-logout-plugin.c:91 -#: ../panel-plugin/xfsm-logout-plugin.c:114 -msgid "Shut _down" -msgstr "Stän_g av" - -#: ../panel-plugin/xfsm-logout-plugin.c:92 -#: ../panel-plugin/xfsm-logout-plugin.c:107 -msgid "_Log out" -msgstr "_Logga ut" - -#. XFSM_SHUTDOWN_ASK -#. XFSM_SHUTDOWN_LOGOUT -#: ../panel-plugin/xfsm-logout-plugin.c:105 -msgid "Are you sure you want to log out?" -msgstr "Är du säker på att du vill logga ut?" - -#: ../panel-plugin/xfsm-logout-plugin.c:106 -#, c-format -msgid "You will be logged out in %u seconds." -msgstr "Du kommer att loggas ut om %u sekunder." - -#: ../panel-plugin/xfsm-logout-plugin.c:109 -msgid "Failed to log out." -msgstr "Misslyckades med att logga ut." - -#. XFSM_SHUTDOWN_HALT -#: ../panel-plugin/xfsm-logout-plugin.c:112 -msgid "Are you sure you want to shut down?" -msgstr "Är du säker på att du vill stänga av datorn?" - -#: ../panel-plugin/xfsm-logout-plugin.c:113 -#, c-format -msgid "Your system will shut down in %u seconds." -msgstr "Ditt system kommer att stängas av om %u sekunder." - -#: ../panel-plugin/xfsm-logout-plugin.c:116 -msgid "Failed to shut down." -msgstr "Misslyckades med att stänga av datorn." - -#. XFSM_SHUTDOWN_REBOOT -#: ../panel-plugin/xfsm-logout-plugin.c:119 -msgid "Are you sure you want to reboot?" -msgstr "Är du säker på att du vill starta om datorn?" - -#: ../panel-plugin/xfsm-logout-plugin.c:120 -#, c-format -msgid "Your system will reboot in %u seconds." -msgstr "Ditt system kommer om %u sekunder att startas om." - -#: ../panel-plugin/xfsm-logout-plugin.c:123 -msgid "Failed to reboot." -msgstr "Misslyckades med att starta om datorn." - -#: ../panel-plugin/xfsm-logout-plugin.c:130 -msgid "Failed to suspend" -msgstr "Misslyckades med att försätta i vänteläge" - -#: ../panel-plugin/xfsm-logout-plugin.c:137 -msgid "Failed to hibernate" -msgstr "Misslyckades med att försätta i viloläge" - -#: ../panel-plugin/xfsm-logout-plugin.c:150 -msgid "Xflock4 could not be launched" -msgstr "Xflock4 kunde inte startas" +#: ../scripts/xscreensaver.desktop.in.h:1 +msgid "Launch screensaver and locker program" +msgstr "" -#: ../panel-plugin/xfsm-logout-plugin.c:222 -msgid "Close Session" -msgstr "Stäng session" +#: ../scripts/xscreensaver.desktop.in.h:2 +msgid "Screensaver" +msgstr "" #: ../settings/main.c:43 msgid "Settings manager socket" @@ -237,16 +161,18 @@ msgid "Version information" msgstr "Versionsinformation" -#: ../settings/main.c:74 +#: ../settings/main.c:75 ../xfce4-session/main.c:257 #, c-format msgid "Type '%s --help' for usage." msgstr "Ange \"%s --help\" för användningsinformation." -#: ../settings/main.c:86 ../xfce4-session/main.c:226 +#: ../settings/main.c:87 ../xfce4-session/main.c:267 +#: ../xfce4-session-logout/main.c:135 msgid "The Xfce development team. All rights reserved." msgstr "The Xfce development team. Alla rättigheter är reserverade." -#: ../settings/main.c:87 ../xfce4-session/main.c:232 +#: ../settings/main.c:88 ../xfce4-session/main.c:268 +#: ../xfce4-session-logout/main.c:138 #, c-format msgid "Please report bugs to <%s>." msgstr "" @@ -254,11 +180,11 @@ "Skicka synpunkter på översättningen till\n" "." -#: ../settings/main.c:96 ../xfce4-session/main.c:238 +#: ../settings/main.c:97 ../xfce4-session/main.c:276 msgid "Unable to contact settings server" msgstr "Kunde inte kontakta inställningsservern" -#: ../settings/main.c:115 +#: ../settings/main.c:116 msgid "Unable to create user interface from embedded definition data" msgstr "Kunde inte skapa användargränssnitt från inbäddad definitionsdata" @@ -266,69 +192,104 @@ msgid "_Application Autostart" msgstr "Autostart av pr_ogram" -#: ../settings/session-editor.c:60 +#: ../settings/session-editor.c:61 msgid "If running" msgstr "Om körande" -#: ../settings/session-editor.c:61 +#: ../settings/session-editor.c:62 msgid "Always" msgstr "Alltid" -#: ../settings/session-editor.c:62 +#: ../settings/session-editor.c:63 msgid "Immediately" msgstr "Omedelbart" -#: ../settings/session-editor.c:63 +#: ../settings/session-editor.c:64 msgid "Never" msgstr "Aldrig" -#: ../settings/session-editor.c:128 +#: ../settings/session-editor.c:129 msgid "Session Save Error" msgstr "Fel vid sparande av session" -#: ../settings/session-editor.c:129 +#: ../settings/session-editor.c:130 msgid "Unable to save the session" msgstr "Kunde inte spara sessionen" -#: ../settings/session-editor.c:184 +#: ../settings/session-editor.c:170 +msgid "Clear sessions" +msgstr "Rensa sessioner" + +#: ../settings/session-editor.c:171 +#, fuzzy +msgid "Are you sure you want to empty the session cache?" +msgstr "Är du säker på att du vill terminera \"%s\"?" + +#: ../settings/session-editor.c:172 +#, fuzzy +msgid "" +"The saved states of your applications will not be restored during your next " +"login." +msgstr "" +"Programmet kommer att förlora allt osparat data och kommer inte kunna " +"startas om i din nästa session." + +#: ../settings/session-editor.c:174 +msgid "_Proceed" +msgstr "" + +#: ../settings/session-editor.c:212 +#, c-format +msgid "You might need to delete some files manually in \"%s\"." +msgstr "" + +#: ../settings/session-editor.c:215 +msgid "All Xfce cache files could not be cleared" +msgstr "Kunde inte rensa alla Xfce cache-filer" + +#: ../settings/session-editor.c:249 #, c-format msgid "Are you sure you want to terminate \"%s\"?" msgstr "Är du säker på att du vill terminera \"%s\"?" -#: ../settings/session-editor.c:187 ../settings/session-editor.c:215 +#: ../settings/session-editor.c:252 ../settings/session-editor.c:280 msgid "Terminate Program" msgstr "Terminera program" -#: ../settings/session-editor.c:189 -msgid "The application will lose any unsaved state and will not be restarted in your next session." -msgstr "Programmet kommer att förlora allt osparat data och kommer inte kunna startas om i din nästa session." +#: ../settings/session-editor.c:254 +msgid "" +"The application will lose any unsaved state and will not be restarted in " +"your next session." +msgstr "" +"Programmet kommer att förlora allt osparat data och kommer inte kunna " +"startas om i din nästa session." -#: ../settings/session-editor.c:191 -#: ../settings/xfce4-session-settings.glade.h:35 +#: ../settings/session-editor.c:256 +#: ../settings/xfce4-session-settings.glade.h:40 msgid "_Quit Program" msgstr "A_vsluta program" -#: ../settings/session-editor.c:216 +#: ../settings/session-editor.c:281 msgid "Unable to terminate program." msgstr "Kunde inte terminera program." -#: ../settings/session-editor.c:394 +#: ../settings/session-editor.c:459 msgid "(Unknown program)" msgstr "(Okänt program)" -#: ../settings/session-editor.c:614 +#: ../settings/session-editor.c:679 msgid "Priority" msgstr "Prioritet" -#: ../settings/session-editor.c:622 +#: ../settings/session-editor.c:687 msgid "PID" msgstr "PID" -#: ../settings/session-editor.c:628 +#: ../settings/session-editor.c:693 msgid "Program" msgstr "Program" -#: ../settings/session-editor.c:653 +#: ../settings/session-editor.c:718 msgid "Restart Style" msgstr "Omstartstyp" @@ -350,7 +311,7 @@ msgid "Description:" msgstr "Beskrivning:" -#: ../settings/xfae-dialog.c:124 +#: ../settings/xfae-dialog.c:124 ../settings/xfae-model.c:479 msgid "Command:" msgstr "Kommando:" @@ -362,63 +323,74 @@ msgid "Edit application" msgstr "Redigera program" -#: ../settings/xfae-model.c:562 +#: ../settings/xfae-model.c:611 #, c-format msgid "Failed to unlink %s: %s" msgstr "Kunde inte avlänka %s: %s" -#: ../settings/xfae-model.c:651 +#: ../settings/xfae-model.c:700 #, c-format msgid "Failed to create file %s" msgstr "Kunde inte skapa filen %s" -#: ../settings/xfae-model.c:673 +#: ../settings/xfae-model.c:723 #, c-format msgid "Failed to write file %s" msgstr "Kunde inte skriva till filen %s" -#: ../settings/xfae-model.c:732 +#: ../settings/xfae-model.c:782 #, c-format msgid "Failed to open %s for reading" msgstr "Misslyckades med att öppna %s för läsning" -#: ../settings/xfae-model.c:841 ../settings/xfae-model.c:898 +#: ../settings/xfae-model.c:891 ../settings/xfae-model.c:948 #, c-format msgid "Failed to open %s for writing" msgstr "Kunde inte öppna %s för skrivning" -#: ../settings/xfae-window.c:101 -msgid "Below is the list of applications that will be started automatically when you login to your Xfce desktop, in addition to the applications that were saved when you logged out last time:" -msgstr "Nedan finns en lista över program som kommer att startas automatiskt när du loggar in i Xfce-skrivbordet, i tillägg till de program som sparades förra gången som du loggade ut:" +#: ../settings/xfae-window.c:102 +msgid "" +"Below is the list of applications that will be started automatically when " +"you login to your Xfce desktop, in addition to the applications that were " +"saved when you logged out last time. Cursive applications belong to another " +"desktop environment, but you can still enable them if you want." +msgstr "" +"Nedan finns en lista över program som kommer att startas automatiskt när du " +"loggar in i Xfce-skrivbordet, i tillägg till de program som sparades förra " +"gången som du loggade ut:" -#: ../settings/xfae-window.c:289 +#: ../settings/xfae-window.c:293 #, c-format msgid "Failed adding \"%s\"" msgstr "Misslyckades med att lägga till \"%s\"" -#: ../settings/xfae-window.c:320 ../settings/xfae-window.c:334 +#: ../settings/xfae-window.c:324 ../settings/xfae-window.c:338 msgid "Failed to remove item" msgstr "Misslyckades med att ta bort objektet" -#: ../settings/xfae-window.c:326 -msgid "This will permanently remove the application from the list of automatically started applications" -msgstr "Detta kommer permanent att ta bort programmet från listan över automatiskt startade program" +#: ../settings/xfae-window.c:330 +msgid "" +"This will permanently remove the application from the list of automatically " +"started applications" +msgstr "" +"Detta kommer permanent att ta bort programmet från listan över automatiskt " +"startade program" -#: ../settings/xfae-window.c:328 +#: ../settings/xfae-window.c:332 #, c-format msgid "Are you sure you want to remove \"%s\"" msgstr "Är du säker på att du vill ta bort \"%s\"" -#: ../settings/xfae-window.c:362 +#: ../settings/xfae-window.c:366 msgid "Failed to edit item" msgstr "Kunde inte redigera objektet" -#: ../settings/xfae-window.c:382 +#: ../settings/xfae-window.c:386 #, c-format msgid "Failed to edit item \"%s\"" msgstr "Misslyckades med att redigera objektet \"%s\"" -#: ../settings/xfae-window.c:410 +#: ../settings/xfae-window.c:414 msgid "Failed to toggle item" msgstr "Misslyckades med att växla objektet" @@ -426,7 +398,7 @@ msgid "Disable binding to TCP ports" msgstr "Inaktivera bindning till TCP-portar" -#: ../xfce4-session/main.c:77 ../xfce4-session-logout/main.c:93 +#: ../xfce4-session/main.c:77 ../xfce4-session-logout/main.c:91 msgid "Print version information and exit" msgstr "Skriv ut versionsinformation och avsluta" @@ -434,93 +406,43 @@ msgid "Loading desktop settings" msgstr "Läser in skrivbordsinställningar" -#: ../xfce4-session/main.c:227 -msgid "Written by Benedikt Meurer ." -msgstr "Skriven av Benedikt Meurer ." - -#: ../xfce4-session/main.c:228 -#, c-format -msgid "Built with Gtk+-%d.%d.%d, running with Gtk+-%d.%d.%d" -msgstr "Byggd med Gtk+-%d.%d.%d, kör med Gtk+-%d.%d.%d" - #. verify that the DNS settings are ok -#: ../xfce4-session/main.c:258 +#: ../xfce4-session/main.c:298 msgid "Verifying DNS settings" msgstr "Verifierar DNS-inställningar" -#: ../xfce4-session/main.c:261 +#: ../xfce4-session/main.c:302 msgid "Loading session data" msgstr "Läser in sessionsdata" -#: ../xfce4-session/shutdown.c:372 -#, c-format -msgid "Log out %s" -msgstr "Logga ut %s" - -#: ../xfce4-session/shutdown.c:422 -msgid "_Log Out" -msgstr "_Logga ut" - -#: ../xfce4-session/shutdown.c:457 -msgid "_Restart" -msgstr "Starta _om" - -#: ../xfce4-session/shutdown.c:499 -msgid "Shut _Down" -msgstr "Stäng a_v" - -#: ../xfce4-session/shutdown.c:561 -msgid "Sus_pend" -msgstr "Vän_teläge" - -#: ../xfce4-session/shutdown.c:608 -msgid "_Save session for future logins" -msgstr "_Spara session för framtida inloggningar" - -#: ../xfce4-session/shutdown.c:668 -msgid "Please enter your password:" -msgstr "Ange ditt lösenord:" - -#: ../xfce4-session/shutdown.c:700 -msgid "An error occurred" -msgstr "Ett fel inträffade" - -#: ../xfce4-session/shutdown.c:714 -msgid "Either the password you entered is invalid, or the system administrator disallows shutting down this computer with your user account." -msgstr "Antingen är lösenordet som du angav felaktigt eller så tillåter inte systemadministratören att din användare får stänga av datorn." - -#: ../xfce4-session/shutdown.c:833 ../xfce4-session/xfsm-manager.c:1122 -msgid "Shutdown Failed" -msgstr "Avstängning misslyckades" - -#: ../xfce4-session/shutdown.c:835 -msgid "Unable to perform shutdown" -msgstr "Kunde inte genomföra avstängning" - -#: ../xfce4-session/xfsm-chooser.c:91 +#: ../xfce4-session/xfsm-chooser.c:90 #, c-format msgid "Last accessed: %s" msgstr "Senaste åtkomst: %s" -#: ../xfce4-session/xfsm-chooser.c:177 -msgid "Choose the session you want to restore. You can simply double-click the session name to restore it." -msgstr "Välj den session som du vill återställa. Du kan helt enkelt dubbelklicka på sessionsnamnet för att återställa den." +#: ../xfce4-session/xfsm-chooser.c:172 +msgid "" +"Choose the session you want to restore. You can simply double-click the " +"session name to restore it." +msgstr "" +"Välj den session som du vill återställa. Du kan helt enkelt dubbelklicka på " +"sessionsnamnet för att återställa den." #. "Logout" button -#: ../xfce4-session/xfsm-chooser.c:203 +#: ../xfce4-session/xfsm-chooser.c:198 msgid "Log out" msgstr "Logga ut" -#: ../xfce4-session/xfsm-chooser.c:205 +#: ../xfce4-session/xfsm-chooser.c:200 msgid "Cancel the login attempt and return to the login screen." msgstr "Avbryt inloggningsförsöket och återgå till inloggningsskärmen." #. "New" button -#: ../xfce4-session/xfsm-chooser.c:212 +#: ../xfce4-session/xfsm-chooser.c:207 msgid "New session" msgstr "Ny session" -#: ../xfce4-session/xfsm-chooser.c:213 +#: ../xfce4-session/xfsm-chooser.c:208 msgid "Create a new session." msgstr "Skapa en ny session." @@ -530,7 +452,7 @@ msgid "The client doesn't have any properties set yet" msgstr "Klienten har inte några egenskaper inställda än" -#: ../xfce4-session/xfsm-compat-gnome.c:246 +#: ../xfce4-session/xfsm-compat-gnome.c:239 msgid "Starting The Gnome Keyring Daemon" msgstr "Startar Gnomes nyckelringsdemon" @@ -564,85 +486,119 @@ msgid "Try again" msgstr "Försök igen" -#: ../xfce4-session/xfsm-manager.c:604 +#: ../xfce4-session/xfsm-manager.c:611 #, c-format -msgid "Unable to determine failsafe session name. Possible causes: xfconfd isn't running (D-Bus setup problem); environment variable $XDG_CONFIG_DIRS is set incorrectly (must include \"%s\"), or xfce4-session is installed incorrectly." -msgstr "Kunde inte fastställa namn för felsäker session. Möjliga orsaker: xfconfd körs inte (D-Bus-konfigurationsproblem); miljövariabeln $XDG_CONFIG_DIRS är felaktigt inställd (måste inkludera \"%s\") eller att xfce4-session är felaktigt installerad." +msgid "" +"Unable to determine failsafe session name. Possible causes: xfconfd isn't " +"running (D-Bus setup problem); environment variable $XDG_CONFIG_DIRS is set " +"incorrectly (must include \"%s\"), or xfce4-session is installed incorrectly." +msgstr "" +"Kunde inte fastställa namn för felsäker session. Möjliga orsaker: xfconfd " +"körs inte (D-Bus-konfigurationsproblem); miljövariabeln $XDG_CONFIG_DIRS är " +"felaktigt inställd (måste inkludera \"%s\") eller att xfce4-session är " +"felaktigt installerad." -#: ../xfce4-session/xfsm-manager.c:615 +#: ../xfce4-session/xfsm-manager.c:622 #, c-format -msgid "The specified failsafe session (\"%s\") is not marked as a failsafe session." -msgstr "Den angivna felsäkra sessionen (\"%s\") är inte markerad som en felsäker session." +msgid "" +"The specified failsafe session (\"%s\") is not marked as a failsafe session." +msgstr "" +"Den angivna felsäkra sessionen (\"%s\") är inte markerad som en felsäker " +"session." -#: ../xfce4-session/xfsm-manager.c:662 +#: ../xfce4-session/xfsm-manager.c:669 msgid "The list of applications in the failsafe session is empty." msgstr "Listan över program i den felsäkra sessionen är tom." #. FIXME: migrate this into the splash screen somehow so the #. * window doesn't look ugly (right now now WM is running, so it #. * won't have window decorations). -#: ../xfce4-session/xfsm-manager.c:709 +#: ../xfce4-session/xfsm-manager.c:716 msgid "Session Manager Error" msgstr "Fel i sessionshanterare" -#: ../xfce4-session/xfsm-manager.c:711 +#: ../xfce4-session/xfsm-manager.c:718 msgid "Unable to load a failsafe session" msgstr "Kunde inte läsa in en felsäker session" -#: ../xfce4-session/xfsm-manager.c:1125 +#: ../xfce4-session/xfsm-manager.c:1127 +msgid "Shutdown Failed" +msgstr "Avstängning misslyckades" + +#: ../xfce4-session/xfsm-manager.c:1130 msgid "Failed to suspend session" msgstr "Misslyckades med att försätta session i vänteläge" -#: ../xfce4-session/xfsm-manager.c:1126 +#: ../xfce4-session/xfsm-manager.c:1131 msgid "Failed to hibernate session" msgstr "Misslyckades med att försätta session i viloläge" -#: ../xfce4-session/xfsm-manager.c:1414 +#: ../xfce4-session/xfsm-manager.c:1405 #, c-format msgid "Can only terminate clients when in the idle state" -msgstr "Kan endast terminera klienter som befinner sig i ett overksamt tillstånd" +msgstr "" +"Kan endast terminera klienter som befinner sig i ett overksamt tillstånd" -#: ../xfce4-session/xfsm-manager.c:1951 +#: ../xfce4-session/xfsm-manager.c:1969 #, c-format msgid "Session manager must be in idle state when requesting a checkpoint" -msgstr "Sessionshanteraren måste befinna sig i ett overksamt tillstånd när begäran sker" +msgstr "" +"Sessionshanteraren måste befinna sig i ett overksamt tillstånd när begäran " +"sker" -#: ../xfce4-session/xfsm-manager.c:1992 +#: ../xfce4-session/xfsm-manager.c:2010 #, c-format msgid "Session manager must be in idle state when requesting a shutdown" -msgstr "Sessionshanteraren måste vara i overksamt tillstånd när en avstängning begärs" +msgstr "" +"Sessionshanteraren måste vara i overksamt tillstånd när en avstängning begärs" -#: ../xfce4-session/xfsm-manager.c:1999 +#: ../xfce4-session/xfsm-logout-dialog.c:188 #, c-format -msgid "Invalid shutdown type \"%u\"" -msgstr "Ogiltig avstängningstyp \"%u\"" +msgid "Log out %s" +msgstr "Logga ut %s" -#: ../xfce4-session/xfsm-shutdown-helper.c:1601 -#, c-format -msgid "Error sending command to shutdown helper: %s" -msgstr "Fel vid sändning av kommando till avstängningshjälpare: %s" +#. * +#. * Logout +#. * +#: ../xfce4-session/xfsm-logout-dialog.c:246 +msgid "_Log Out" +msgstr "_Logga ut" -#: ../xfce4-session/xfsm-shutdown-helper.c:1615 -#, c-format -msgid "Error receiving response from shutdown helper: %s" -msgstr "Fel vid mottagning av svar från avstängningshjälpare: %s" +#: ../xfce4-session/xfsm-logout-dialog.c:266 +msgid "_Restart" +msgstr "Starta _om" -#: ../xfce4-session/xfsm-shutdown-helper.c:1624 -#, c-format -msgid "Shutdown command failed" -msgstr "Avstängningskommandot misslyckades" +#: ../xfce4-session/xfsm-logout-dialog.c:286 +msgid "Shut _Down" +msgstr "Stäng a_v" -#: ../xfce4-session/xfsm-shutdown-helper.c:1802 -msgid "Suspend failed, no backend supported" -msgstr "Vänteläge misslyckades, inget stöd i bakänden" - -#: ../xfce4-session/xfsm-shutdown-helper.c:1829 -msgid "Hibernate failed, no backend supported" -msgstr "Viloläge misslyckades, inget stöd i bakänden" - -#: ../xfce4-session/xfsm-shutdown-helper.c:1859 -msgid "Shutdown Command not found" -msgstr "Avstängningskommandot hittades inte" +#: ../xfce4-session/xfsm-logout-dialog.c:309 +msgid "Sus_pend" +msgstr "Vän_teläge" + +#: ../xfce4-session/xfsm-logout-dialog.c:343 +msgid "_Hibernate" +msgstr "V_iloläge" + +#: ../xfce4-session/xfsm-logout-dialog.c:368 +msgid "_Save session for future logins" +msgstr "_Spara session för framtida inloggningar" + +#: ../xfce4-session/xfsm-logout-dialog.c:395 +msgid "Please enter your password" +msgstr "Ange ditt lösenord:" + +#: ../xfce4-session/xfsm-logout-dialog.c:427 +msgid "An error occurred" +msgstr "Ett fel inträffade" + +#: ../xfce4-session/xfsm-logout-dialog.c:433 +msgid "" +"Either the password you entered is invalid, or the system administrator " +"disallows shutting down this computer with your user account." +msgstr "" +"Antingen är lösenordet som du angav felaktigt eller så tillåter inte " +"systemadministratören att din användare får stänga av datorn." #: ../xfce4-session/xfsm-splash-screen.c:178 msgid "Choose session" @@ -656,88 +612,88 @@ msgid "Choose a name for the new session:" msgstr "Välj ett namn på den nya sessionen:" -#: ../xfce4-session/xfsm-startup.c:115 +#: ../xfce4-session/xfsm-startup.c:347 msgid "Starting the Volume Controller" msgstr "Startar volymkontrollen" -#: ../xfce4-session/xfsm-startup.c:117 +#: ../xfce4-session/xfsm-startup.c:349 msgid "Starting the Panel" msgstr "Startar panelen" -#: ../xfce4-session/xfsm-startup.c:119 +#: ../xfce4-session/xfsm-startup.c:351 msgid "Starting the Desktop Manager" msgstr "Startar skrivbordshanteraren" -#: ../xfce4-session/xfsm-startup.c:121 +#: ../xfce4-session/xfsm-startup.c:353 msgid "Starting the Taskbar" msgstr "Startar aktivitetsfältet" -#: ../xfce4-session/xfsm-startup.c:123 +#: ../xfce4-session/xfsm-startup.c:355 msgid "Starting the Window Manager" msgstr "Startar fönsterhanteraren" -#: ../xfce4-session/xfsm-startup.c:127 +#: ../xfce4-session/xfsm-startup.c:359 msgid "Starting the Gnome Terminal Emulator" msgstr "Startar Gnomes terminalemulator" -#: ../xfce4-session/xfsm-startup.c:131 +#: ../xfce4-session/xfsm-startup.c:363 msgid "Starting the KDE Advanced Text Editor" msgstr "Startar Kate" -#: ../xfce4-session/xfsm-startup.c:133 +#: ../xfce4-session/xfsm-startup.c:365 msgid "Starting the KDE Clipboard Manager" msgstr "Startar KDE:s urklippshanterare" -#: ../xfce4-session/xfsm-startup.c:135 +#: ../xfce4-session/xfsm-startup.c:367 msgid "Starting the KDE Mail Reader" msgstr "Startar KDE:s e-postklient" -#: ../xfce4-session/xfsm-startup.c:137 +#: ../xfce4-session/xfsm-startup.c:369 msgid "Starting the KDE News Reader" msgstr "Startar KDE:s nyhetsklient" -#: ../xfce4-session/xfsm-startup.c:139 +#: ../xfce4-session/xfsm-startup.c:371 msgid "Starting the Konqueror" msgstr "Startar Konqueror" -#: ../xfce4-session/xfsm-startup.c:141 +#: ../xfce4-session/xfsm-startup.c:373 msgid "Starting the KDE Terminal Emulator" msgstr "Startar KDE:s terminalemulator" -#: ../xfce4-session/xfsm-startup.c:145 +#: ../xfce4-session/xfsm-startup.c:377 msgid "Starting the Beep Media Player" msgstr "Startar Beep Media Player" -#: ../xfce4-session/xfsm-startup.c:147 +#: ../xfce4-session/xfsm-startup.c:379 msgid "Starting The Gimp" msgstr "Startar The Gimp" -#: ../xfce4-session/xfsm-startup.c:149 +#: ../xfce4-session/xfsm-startup.c:381 msgid "Starting the VI Improved Editor" msgstr "Startar VI Improved Editor" -#: ../xfce4-session/xfsm-startup.c:151 +#: ../xfce4-session/xfsm-startup.c:383 msgid "Starting the Session Management Proxy" msgstr "Startar sessionshanterarproxyn" -#: ../xfce4-session/xfsm-startup.c:153 +#: ../xfce4-session/xfsm-startup.c:385 msgid "Starting the X-Chat IRC Client" msgstr "Startar IRC-klienten X-Chat" -#: ../xfce4-session/xfsm-startup.c:155 +#: ../xfce4-session/xfsm-startup.c:387 msgid "Starting the X Multimedia System" msgstr "Startar X Multimedia System" -#: ../xfce4-session/xfsm-startup.c:157 +#: ../xfce4-session/xfsm-startup.c:389 msgid "Starting the X Terminal Emulator" msgstr "Startar X-terminalemulator" -#: ../xfce4-session/xfsm-startup.c:159 +#: ../xfce4-session/xfsm-startup.c:391 #, c-format msgid "Starting %s" msgstr "Startar %s" -#: ../xfce4-session/xfsm-startup.c:283 +#: ../xfce4-session/xfsm-startup.c:515 #, c-format msgid "" "The location and the format of the autostart directory has changed.\n" @@ -761,59 +717,79 @@ "autostartkatalog har migrerats till den nya platsen.\n" "Du kan ta bort den gamla autostartkatalog nu.\n" -#: ../xfce4-session/xfsm-startup.c:458 +#: ../xfce4-session/xfsm-startup.c:684 msgid "Performing Autostart..." msgstr "Genomför autostart..." -#: ../xfce4-session/xfsm-startup.c:564 +#: ../xfce4-session/xfsm-startup.c:790 msgid "Starting Assistive Technologies" msgstr "Startar hjälpmedelsfunktioner" -#: ../xfce4-session-logout/main.c:69 +#: ../xfce4-session/xfsm-shutdown.c:414 +#, c-format +msgid "Error sending command to shutdown helper: %s" +msgstr "Fel vid sändning av kommando till avstängningshjälpare: %s" + +#: ../xfce4-session/xfsm-shutdown.c:427 +#, c-format +msgid "Error receiving response from shutdown helper: %s" +msgstr "Fel vid mottagning av svar från avstängningshjälpare: %s" + +#: ../xfce4-session/xfsm-shutdown.c:435 +#, c-format +msgid "Shutdown command failed" +msgstr "Avstängningskommandot misslyckades" + +#: ../xfce4-session/xfsm-shutdown.c:540 +msgid "Shutdown is blocked by the kiosk settings" +msgstr "" + +#: ../xfce4-session/xfsm-shutdown.c:623 +#, c-format +msgid "Unknown shutdown method %d" +msgstr "" + +#: ../xfce4-session-logout/main.c:67 msgid "Log out without displaying the logout dialog" msgstr "Logga ut utan att visa utloggningsdialogen" -#: ../xfce4-session-logout/main.c:73 +#: ../xfce4-session-logout/main.c:71 msgid "Halt without displaying the logout dialog" msgstr "Stoppa utan att visa utloggningsdialogen" -#: ../xfce4-session-logout/main.c:77 +#: ../xfce4-session-logout/main.c:75 msgid "Reboot without displaying the logout dialog" msgstr "Starta om utan att visa utloggningsdialogen" -#: ../xfce4-session-logout/main.c:81 +#: ../xfce4-session-logout/main.c:79 msgid "Suspend without displaying the logout dialog" msgstr "Försätt i vänteläge utan att visa utloggningsdialogen" -#: ../xfce4-session-logout/main.c:85 +#: ../xfce4-session-logout/main.c:83 msgid "Hibernate without displaying the logout dialog" msgstr "Försätt i viloläge utan att visa utloggningsdialogen" -#: ../xfce4-session-logout/main.c:89 +#: ../xfce4-session-logout/main.c:87 msgid "Log out quickly; don't save the session" msgstr "Logga ut snabbt utan att spara sessionen" -#: ../xfce4-session-logout/main.c:107 -msgid "Logout Error" -msgstr "Utloggningsfel" - -#: ../xfce4-session-logout/main.c:110 ../xfce4-session-logout/main.c:117 +#: ../xfce4-session-logout/main.c:110 msgid "Unknown error" msgstr "Okänt fel" -#: ../xfce4-session-logout/main.c:178 -msgid "Unable to contact D-Bus session bus." -msgstr "Kunde inte kontakta D-Bus-sessionsbussen." +#: ../xfce4-session-logout/main.c:136 +msgid "Written by Benedikt Meurer " +msgstr "Skriven av Benedikt Meurer ." -#: ../xfce4-session-logout/main.c:190 -msgid "Failed to create new D-Bus message" -msgstr "Misslyckades med att skapa nytt D-Bus-meddelande" - -#: ../xfce4-session-logout/main.c:206 -msgid "Failed to receive a reply from the session manager" -msgstr "Misslyckades med att ta emot ett svar från sessionshanteraren" +#: ../xfce4-session-logout/main.c:137 +msgid "and Brian Tarricone ." +msgstr "och Brian Tarricone ." -#: ../xfce4-session-logout/main.c:214 +#: ../xfce4-session-logout/main.c:147 +msgid "Unable to contact D-Bus session bus" +msgstr "Kunde inte kontakta D-Bus-sessionsbussen." + +#: ../xfce4-session-logout/main.c:223 msgid "Received error while trying to log out" msgstr "Tog emot ett fel vid försök att logga ut" @@ -825,21 +801,13 @@ msgid "Log out of the Xfce Desktop" msgstr "Logga ut från Xfce-skrivbordet" -#: ../panel-plugin/xfsm-logout-plugin.desktop.in.h:1 -msgid "Session Menu" -msgstr "Sessionsmeny" - -#: ../panel-plugin/xfsm-logout-plugin.desktop.in.h:2 -msgid "Shows a menu with options to lock the screen, suspend, shutdown, or log out" -msgstr "Visar en meny med alternativ för att låsa skärmen, försätta datorn i viloläge/vänteläge eller logga ut" - #: ../settings/xfce-session-settings.desktop.in.h:1 -#: ../settings/xfce4-session-settings.glade.h:14 +#: ../settings/xfce4-session-settings.glade.h:15 msgid "Customize desktop startup and splash screen" msgstr "Anpassa skrivbordsuppstart och startbild" #: ../settings/xfce-session-settings.desktop.in.h:2 -#: ../settings/xfce4-session-settings.glade.h:27 +#: ../settings/xfce4-session-settings.glade.h:30 msgid "Session and Startup" msgstr "Session och uppstart" @@ -876,113 +844,237 @@ msgstr "Sessionsväljare" #: ../settings/xfce4-session-settings.glade.h:9 +#, fuzzy +msgid "Shutdown" +msgstr "Författare:" + +#: ../settings/xfce4-session-settings.glade.h:10 msgid "Version:" msgstr "Version:" -#: ../settings/xfce4-session-settings.glade.h:10 +#: ../settings/xfce4-session-settings.glade.h:11 msgid "Ad_vanced" msgstr "A_vancerat" -#: ../settings/xfce4-session-settings.glade.h:11 +#: ../settings/xfce4-session-settings.glade.h:12 msgid "Always save the session when logging out" msgstr "Spara alltid sessionen vid utloggning" -#: ../settings/xfce4-session-settings.glade.h:12 +#: ../settings/xfce4-session-settings.glade.h:13 msgid "Automatically save session on _logout" msgstr "Spara automatiskt sessionen vid ut_loggning" -#: ../settings/xfce4-session-settings.glade.h:13 +#: ../settings/xfce4-session-settings.glade.h:14 msgid "Con_figure" msgstr "Kon_figurera" -#: ../settings/xfce4-session-settings.glade.h:15 +#: ../settings/xfce4-session-settings.glade.h:16 msgid "Demonstrates the selected splash screen" msgstr "Demonstrerar den valda startbilden" -#: ../settings/xfce4-session-settings.glade.h:16 +#: ../settings/xfce4-session-settings.glade.h:17 msgid "Display the session chooser every time Xfce starts" msgstr "Visa sessionsväljaren varje gång som Xfce startas" -#: ../settings/xfce4-session-settings.glade.h:17 +#: ../settings/xfce4-session-settings.glade.h:18 +#, fuzzy +msgid "Empty the session cache" +msgstr "Välj sessionsnamn" + +#: ../settings/xfce4-session-settings.glade.h:19 msgid "Launch GN_OME services on startup" msgstr "Starta GN_OME-tjänster vid uppstart" -#: ../settings/xfce4-session-settings.glade.h:18 +#: ../settings/xfce4-session-settings.glade.h:20 msgid "Launch _KDE services on startup" msgstr "Starta _KDE-tjänster vid uppstart" -#: ../settings/xfce4-session-settings.glade.h:19 +#: ../settings/xfce4-session-settings.glade.h:21 msgid "Manage _remote applications" msgstr "Hantera _fjärrprogram" -#: ../settings/xfce4-session-settings.glade.h:20 -msgid "Manage remote applications over the network (this may be a security risk)" +#: ../settings/xfce4-session-settings.glade.h:22 +msgid "" +"Manage remote applications over the network (this may be a security risk)" msgstr "Hantera fjärrprogram över nätverket (detta kan vara en säkerhetsrisk)" -#: ../settings/xfce4-session-settings.glade.h:21 +#: ../settings/xfce4-session-settings.glade.h:23 msgid "Opens the configuration panel for the selected splash screen" msgstr "Öppnar konfigurationspanelen för den valda startbilden" -#: ../settings/xfce4-session-settings.glade.h:22 +#: ../settings/xfce4-session-settings.glade.h:24 msgid "Prompt for confirmation when logging out" msgstr "Fråga efter bekräftelse vid utloggning" -#: ../settings/xfce4-session-settings.glade.h:23 +#: ../settings/xfce4-session-settings.glade.h:25 msgid "Quit the program, and remove it from the session" msgstr "Avsluta programmet och ta bort det från sessionen" -#: ../settings/xfce4-session-settings.glade.h:24 +#: ../settings/xfce4-session-settings.glade.h:26 +msgid "Run xflock4 before suspending or hibernating the system" +msgstr "" + +#: ../settings/xfce4-session-settings.glade.h:27 msgid "S_plash" msgstr "S_tartbild" -#: ../settings/xfce4-session-settings.glade.h:25 +#: ../settings/xfce4-session-settings.glade.h:28 msgid "Save Sessio_n" msgstr "Spara sessio_n" -#: ../settings/xfce4-session-settings.glade.h:26 +#: ../settings/xfce4-session-settings.glade.h:29 msgid "Saving Session" msgstr "Sparar session" -#: ../settings/xfce4-session-settings.glade.h:28 -msgid "Start GNOME services, such as gnome-keyring and the GNOME accessibility framework" -msgstr "Starta GNOME-tjänster, såsom gnome-keyring och GNOME:s hjälpmedelsramverk" +#: ../settings/xfce4-session-settings.glade.h:31 +msgid "Start GNOME services, such as gnome-keyring" +msgstr "" +"Starta GNOME-tjänster, såsom gnome-keyring och GNOME:s hjälpmedelsramverk" -#: ../settings/xfce4-session-settings.glade.h:29 -msgid "Start KDE services, such as \"kdeinit,\" DCOP, and ARTS" -msgstr "Starta KDE-tjänster, såsom \"kdeinit,\" DCOP och ARTS" +#: ../settings/xfce4-session-settings.glade.h:32 +msgid "Start KDE services, such as kdeinit" +msgstr "Starta KDE-tjänster, såsom kdeinit" -#: ../settings/xfce4-session-settings.glade.h:30 -msgid "These applications are a part of the currently-running session, and can be saved when you log out. Changes below will only take effect when the session is saved." -msgstr "Dessa program är en del av den för närvarande körande sessionen och kan sparas när du loggar ut. Nedanstående ändringar kommer endast att bli aktiva när sessionen sparats." +#: ../settings/xfce4-session-settings.glade.h:33 +msgid "" +"These applications are a part of the currently-running session, and can be " +"saved when you log out. Changes below will only take effect when the " +"session is saved." +msgstr "" +"Dessa program är en del av den för närvarande körande sessionen och kan " +"sparas när du loggar ut. Nedanstående ändringar kommer endast att bli " +"aktiva när sessionen sparats." -#: ../settings/xfce4-session-settings.glade.h:31 -msgid "Your session is being saved. If you do not wish to wait, you may close this window." -msgstr "Din session sparas nu. Om du inte vill vänta så kan du stänga detta fönster." +#: ../settings/xfce4-session-settings.glade.h:34 +msgid "" +"Your session is being saved. If you do not wish to wait, you may close this " +"window." +msgstr "" +"Din session sparas nu. Om du inte vill vänta så kan du stänga detta fönster." -#: ../settings/xfce4-session-settings.glade.h:32 +#: ../settings/xfce4-session-settings.glade.h:35 +msgid "_Clear saved sessions" +msgstr "Rensa sparade sessioner" + +#: ../settings/xfce4-session-settings.glade.h:36 msgid "_Display chooser on login" msgstr "_Visa väljare vid inloggning" -#: ../settings/xfce4-session-settings.glade.h:33 +#: ../settings/xfce4-session-settings.glade.h:37 msgid "_General" msgstr "A_llmänt" -#: ../settings/xfce4-session-settings.glade.h:34 +#: ../settings/xfce4-session-settings.glade.h:38 +msgid "_Lock screen before sleep" +msgstr "" + +#: ../settings/xfce4-session-settings.glade.h:39 msgid "_Prompt on logout" msgstr "_Fråga vid utloggning" -#: ../settings/xfce4-session-settings.glade.h:36 +#: ../settings/xfce4-session-settings.glade.h:41 msgid "_Session" msgstr "_Session" -#: ../settings/xfce4-session-settings.glade.h:37 +#: ../settings/xfce4-session-settings.glade.h:42 msgid "_Test" msgstr "_Testa" -#: ../settings/xfce4-session-settings.glade.h:38 +#: ../settings/xfce4-session-settings.glade.h:43 msgid "label" msgstr "etikett" +#~ msgid "Session" +#~ msgstr "Session" + +#~ msgid "Loc_k screen" +#~ msgstr "Lås s_kärmen" + +#~ msgid "_Suspend" +#~ msgstr "Vä_nteläge" + +#~ msgid "_Reboot" +#~ msgstr "Starta _om" + +#~ msgid "Shut _down" +#~ msgstr "Stän_g av" + +#~ msgid "_Log out" +#~ msgstr "_Logga ut" + +#~ msgid "Are you sure you want to log out?" +#~ msgstr "Är du säker på att du vill logga ut?" + +#~ msgid "You will be logged out in %u seconds." +#~ msgstr "Du kommer att loggas ut om %u sekunder." + +#~ msgid "Failed to log out." +#~ msgstr "Misslyckades med att logga ut." + +#~ msgid "Are you sure you want to shut down?" +#~ msgstr "Är du säker på att du vill stänga av datorn?" + +#~ msgid "Your system will shut down in %u seconds." +#~ msgstr "Ditt system kommer att stängas av om %u sekunder." + +#~ msgid "Failed to shut down." +#~ msgstr "Misslyckades med att stänga av datorn." + +#~ msgid "Are you sure you want to reboot?" +#~ msgstr "Är du säker på att du vill starta om datorn?" + +#~ msgid "Your system will reboot in %u seconds." +#~ msgstr "Ditt system kommer om %u sekunder att startas om." + +#~ msgid "Failed to reboot." +#~ msgstr "Misslyckades med att starta om datorn." + +#~ msgid "Failed to suspend" +#~ msgstr "Misslyckades med att försätta i vänteläge" + +#~ msgid "Failed to hibernate" +#~ msgstr "Misslyckades med att försätta i viloläge" + +#~ msgid "Built with Gtk+-%d.%d.%d, running with Gtk+-%d.%d.%d" +#~ msgstr "Byggd med Gtk+-%d.%d.%d, kör med Gtk+-%d.%d.%d" + +#~ msgid "Log out %s" +#~ msgstr "Logga ut %s" + +#~ msgid "Unable to perform shutdown" +#~ msgstr "Kunde inte genomföra avstängning" + +#~ msgid "Invalid shutdown type \"%u\"" +#~ msgstr "Ogiltig avstängningstyp \"%u\"" + +#~ msgid "Suspend failed, no backend supported" +#~ msgstr "Vänteläge misslyckades, inget stöd i bakänden" + +#~ msgid "Hibernate failed, no backend supported" +#~ msgstr "Viloläge misslyckades, inget stöd i bakänden" + +#~ msgid "Shutdown Command not found" +#~ msgstr "Avstängningskommandot hittades inte" + +#~ msgid "Logout Error" +#~ msgstr "Utloggningsfel" + +#~ msgid "Failed to create new D-Bus message" +#~ msgstr "Misslyckades med att skapa nytt D-Bus-meddelande" + +#~ msgid "Failed to receive a reply from the session manager" +#~ msgstr "Misslyckades med att ta emot ett svar från sessionshanteraren" + +#~ msgid "Session Menu" +#~ msgstr "Sessionsmeny" + +#~ msgid "" +#~ "Shows a menu with options to lock the screen, suspend, shutdown, or log " +#~ "out" +#~ msgstr "" +#~ "Visar en meny med alternativ för att låsa skärmen, försätta datorn i " +#~ "viloläge/vänteläge eller logga ut" + #~ msgid "Hibernate" #~ msgstr "Viloläge" @@ -1026,22 +1118,24 @@ #~ msgstr "Internt fel" #~ msgid "This is likely a problem with your Xfce installation" -#~ msgstr "Detta innebär sannolikt att det är ett problem med din Xfce-installation" +#~ msgstr "" +#~ "Detta innebär sannolikt att det är ett problem med din Xfce-installation" #~ msgid "Terminate \"%s\"" #~ msgstr "Terminera \"%s\"" -#~ msgid "Xfce Session Manager" -#~ msgstr "Xfce Sessionshanterare" - #~ msgid "Invalid shutdown type" #~ msgstr "Ogiltig avstängningstyp" #~ msgid "No HAL method for command %d" #~ msgstr "Ingen HAL-metod för kommando %d" -#~ msgid "Program \"sudo\" was not found. You will not be able to shutdown your system from within Xfce." -#~ msgstr "Programmet \"sudo\" hittades inte. Du kommer inte att kunna stänga av ditt system inifrån Xfce." +#~ msgid "" +#~ "Program \"sudo\" was not found. You will not be able to shutdown your " +#~ "system from within Xfce." +#~ msgstr "" +#~ "Programmet \"sudo\" hittades inte. Du kommer inte att kunna stänga av " +#~ "ditt system inifrån Xfce." #~ msgid "Unable to create parent pipe: %s" #~ msgstr "Kunde inte skapa huvudrör: %s" @@ -1064,8 +1158,10 @@ #~ msgid "Got unexpected reply from sudo shutdown helper" #~ msgstr "Fick oväntat svar från avstängningshjälparen" -#~ msgid "Suspend and Hibernate are only supported through HAL, which is unavailable" -#~ msgstr "Vänteläge och viloläge stöds endast genom HAL, vilken är otillgänglig" +#~ msgid "" +#~ "Suspend and Hibernate are only supported through HAL, which is unavailable" +#~ msgstr "" +#~ "Vänteläge och viloläge stöds endast genom HAL, vilken är otillgänglig" #~ msgid "Unexpected error from HAL" #~ msgstr "Oväntat fel från HAL" @@ -1088,29 +1184,67 @@ #~ msgid "Remove the selected application from the session." #~ msgstr "Demonstrerar det valda startbildstemat" -#~ msgid "If set, the session manager will ask you to choose a session every time you log in to Xfce." -#~ msgstr "Om du aktiverar den här inställningen kommer sessionsväljaren att väljas varje gång du loggar in i Xfce." - -#~ msgid "This option instructs the session manager to save the current session automatically when you log out. If you don't select this option you'll be prompted whether you want to save the current session on each logout." -#~ msgstr "Den här inställningen instruerar sessionshanteraren att spara sessionen automatisk när du loggar ut. Om du inte väljer den här inställningen kommer du att förfrågas om huruvida du vill spara sessionen vid varje utloggning." - -#~ msgid "This option disables the logout confirmation dialog. Whether the session will be saved or not depends on whether you enabled the automatic saving of sessions on logout or not." -#~ msgstr "Den här inställningen aktiverar dialogen för bekräftelse av utloggning Huruvida sessionen kommer att sparas eller inte då den här inställningen inte är vald beror på om du har aktiverat automatiskt sparande av sessionen eller inte." +#~ msgid "" +#~ "If set, the session manager will ask you to choose a session every time " +#~ "you log in to Xfce." +#~ msgstr "" +#~ "Om du aktiverar den här inställningen kommer sessionsväljaren att väljas " +#~ "varje gång du loggar in i Xfce." + +#~ msgid "" +#~ "This option instructs the session manager to save the current session " +#~ "automatically when you log out. If you don't select this option you'll be " +#~ "prompted whether you want to save the current session on each logout." +#~ msgstr "" +#~ "Den här inställningen instruerar sessionshanteraren att spara sessionen " +#~ "automatisk när du loggar ut. Om du inte väljer den här inställningen " +#~ "kommer du att förfrågas om huruvida du vill spara sessionen vid varje " +#~ "utloggning." + +#~ msgid "" +#~ "This option disables the logout confirmation dialog. Whether the session " +#~ "will be saved or not depends on whether you enabled the automatic saving " +#~ "of sessions on logout or not." +#~ msgstr "" +#~ "Den här inställningen aktiverar dialogen för bekräftelse av utloggning " +#~ "Huruvida sessionen kommer att sparas eller inte då den här inställningen " +#~ "inte är vald beror på om du har aktiverat automatiskt sparande av " +#~ "sessionen eller inte." #~ msgid "Launch Gnome services on startup" #~ msgstr "Starta Gnome-tjänster vid start" -#~ msgid "Enable this if you plan to use Gnome applications. This will instruct the session manager to start some vital Gnome services for you. You should also enable this if you want to use the Assistive Technologies that ship with Gnome." -#~ msgstr "Välj den här inställningen om du använder Gnome-applikationer. Det kommer att instruera sessionshanteraren att starta några viktiga Gnome-tjänster för dig. Du ska också aktivera den här inställningen om du vill använda hjälpmedelsteknologierna i Gnome." - -#~ msgid "Enable this option if you plan to run KDE applications as part of your Xfce Desktop session. This will notably increase the startup time, but on the other hand, KDE applications will startup faster. Some KDE applications may not work at all if you don't enable this option." -#~ msgstr "Välj den här inställningen om du planerar att köra KDE-applikationer i Xfce. Det här kommer att göra att Xfce startar betydligt långsammare, men KDE-applikationer kommer att starta snabbare. Det är möjligt att vissa KDE-applikationer inte startar om du inte väljer den här inställningen." +#~ msgid "" +#~ "Enable this if you plan to use Gnome applications. This will instruct the " +#~ "session manager to start some vital Gnome services for you. You should " +#~ "also enable this if you want to use the Assistive Technologies that ship " +#~ "with Gnome." +#~ msgstr "" +#~ "Välj den här inställningen om du använder Gnome-applikationer. Det kommer " +#~ "att instruera sessionshanteraren att starta några viktiga Gnome-tjänster " +#~ "för dig. Du ska också aktivera den här inställningen om du vill använda " +#~ "hjälpmedelsteknologierna i Gnome." + +#~ msgid "" +#~ "Enable this option if you plan to run KDE applications as part of your " +#~ "Xfce Desktop session. This will notably increase the startup time, but on " +#~ "the other hand, KDE applications will startup faster. Some KDE " +#~ "applications may not work at all if you don't enable this option." +#~ msgstr "" +#~ "Välj den här inställningen om du planerar att köra KDE-applikationer i " +#~ "Xfce. Det här kommer att göra att Xfce startar betydligt långsammare, men " +#~ "KDE-applikationer kommer att starta snabbare. Det är möjligt att vissa " +#~ "KDE-applikationer inte startar om du inte väljer den här inställningen." #~ msgid "Security" #~ msgstr "Säkerhet" -#~ msgid "Allow the session manager to manage applications running on remote hosts. Do not enable this option unless you know what you are doing." -#~ msgstr "Tillåt sessionshanteraren att hantera applikationer som inte körs på den lokala datorn. Välj inte den här inställningen om du inte vet vad du gör." +#~ msgid "" +#~ "Allow the session manager to manage applications running on remote hosts. " +#~ "Do not enable this option unless you know what you are doing." +#~ msgstr "" +#~ "Tillåt sessionshanteraren att hantera applikationer som inte körs på den " +#~ "lokala datorn. Välj inte den här inställningen om du inte vet vad du gör." #~ msgid "Button Label|Sessions and Startup" #~ msgstr "Sessioner och uppstart" diff -Nru xfce4-session-4.10.0/po/tr.po xfce4-session-4.10.1/po/tr.po --- xfce4-session-4.10.0/po/tr.po 2012-04-28 20:43:27.000000000 +0000 +++ xfce4-session-4.10.1/po/tr.po 2013-05-05 15:33:55.000000000 +0000 @@ -10,7 +10,7 @@ msgstr "" "Project-Id-Version: xfce4-session 4.5.91\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2012-04-25 08:42+0000\n" +"POT-Creation-Date: 2012-05-06 10:03+0000\n" "PO-Revision-Date: 2009-09-17 02:41+0200\n" "Last-Translator: Utku Aydın \n" "Language-Team: Turkish \n" @@ -231,7 +231,7 @@ #: ../settings/session-editor.c:174 msgid "_Proceed" -msgstr "" +msgstr "_Devam et" #: ../settings/session-editor.c:212 #, c-format @@ -344,7 +344,6 @@ msgstr "%s dosyasında yazmaya uygun açılamıyor" #: ../settings/xfae-window.c:102 -#, fuzzy msgid "" "Below is the list of applications that will be started automatically when " "you login to your Xfce desktop, in addition to the applications that were " @@ -387,7 +386,6 @@ msgstr "\"%s\"' düzenleme başarısız." #: ../settings/xfae-window.c:414 -#, fuzzy msgid "Failed to toggle item" msgstr "Öğe değiştirilemedi" @@ -449,7 +447,7 @@ msgid "The client doesn't have any properties set yet" msgstr "İstemcinin henüz ayarları yapılmamış" -#: ../xfce4-session/xfsm-compat-gnome.c:247 +#: ../xfce4-session/xfsm-compat-gnome.c:239 msgid "Starting The Gnome Keyring Daemon" msgstr "Gnome Keyring Hizmeti Başlatılıyor" @@ -544,17 +542,16 @@ msgstr "Kapatma istenirken oturum yöneticisi uzakta durumunda olmak zorunda" #: ../xfce4-session/xfsm-logout-dialog.c:188 -#, fuzzy, c-format +#, c-format msgid "Log out %s" -msgstr "Çıkış" +msgstr "%s 'den çık" #. * #. * Logout #. * #: ../xfce4-session/xfsm-logout-dialog.c:246 -#, fuzzy msgid "_Log Out" -msgstr "Çıkış" +msgstr "_Çıkış" #: ../xfce4-session/xfsm-logout-dialog.c:266 msgid "_Restart" @@ -713,9 +710,8 @@ msgstr "Oto-Başlat Çalışıyor..." #: ../xfce4-session/xfsm-startup.c:790 -#, fuzzy msgid "Starting Assistive Technologies" -msgstr "Gnome Yardımcı Teknolojileri Başlatılıyor" +msgstr "Yardımcı Teknolojiler Başlatılıyor" #: ../xfce4-session/xfsm-shutdown.c:414 #, c-format @@ -778,7 +774,6 @@ msgstr "ve Brian Tarricone ." #: ../xfce4-session-logout/main.c:147 -#, fuzzy msgid "Unable to contact D-Bus session bus" msgstr "D-Bus oturum yolu ile iletişim kurulamıyor." diff -Nru xfce4-session-4.10.0/po/ug.po xfce4-session-4.10.1/po/ug.po --- xfce4-session-4.10.0/po/ug.po 2012-04-28 20:43:27.000000000 +0000 +++ xfce4-session-4.10.1/po/ug.po 2013-05-05 15:33:55.000000000 +0000 @@ -1,35 +1,41 @@ -# $Id$ -# -# Uyghur translations for xfce4-session package. -# Copyright (C) 2003-2006 The Xfce development team. -# This file is distributed under the same license as the xfce4-session package. -# Gheyret T.Kenji , 2010. -# +# Uyghur translation for xfce4-session. +# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER +# This file is distributed under the same license as the PACKAGE package. +# Gheyret Kenji , YEAR. +# msgid "" msgstr "" -"Project-Id-Version: xfce4-session 4.4.0\n" +"Project-Id-Version: xfce4-session\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2011-01-16 17:35+0100\n" -"PO-Revision-Date: 2010-02-11 15:29+0900\n" -"Last-Translator: Gheyret T.Kenji \n" -"Language-Team:Uyghur Computer Science Association \n" +"POT-Creation-Date: 2012-10-23 22:48+0000\n" +"PO-Revision-Date: 2011-11-09 16:10+0900\n" +"Last-Translator: Gheyret Kenji \n" +"Language-Team: Uyghur Computer Science Association \n" "Language: \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" +#: ../xfce.desktop.in.h:1 +msgid "Use this session to run Xfce as your desktop environment" +msgstr "مەزكۇر ئەڭگىمەدە ئۈستەلئۈستى ئۈچۈن Xfce ئىشلىتىلىدۇ" + +#: ../xfce.desktop.in.h:2 +msgid "Xfce Session" +msgstr "Xfce ئەڭگىمەسى" + #: ../engines/balou/balou-theme.c:110 msgid "No description given" msgstr "چۈشەندۈرۈشى يوق" #: ../engines/balou/config.c:324 msgid "Choose theme file to install..." -msgstr "ئورنىتىدىغان ئۇسلۇب ھۆججىتىنى تاللا..." +msgstr "ئورنىتىدىغان ئۆرنەك ھۆججىتىنى تاللا..." #: ../engines/balou/config.c:336 #, c-format msgid "Unable to install splash theme from file \"%s\"" -msgstr "قوزغىلىش ئېكرانى ئۇسلۇبىنى ھۆججەت \"%s\" نىڭدىن ئوقۇيالمىدى" +msgstr "قوزغىلىش ئېكرانى ئۆرنىكىنى ھۆججەت «%s» نىڭدىن ئوقۇيالمىدى" #: ../engines/balou/config.c:339 msgid "Theme File Error" @@ -37,52 +43,52 @@ #: ../engines/balou/config.c:342 msgid "Please check that the file is a valid splash theme archive." -msgstr "ھۆججەت ئىناۋەتلىك قوزغىلىش ئېكرانى ئۇسلۇب ھۆججىتىمۇ ئەمەسمۇ تەكشۈرۈڭ." +msgstr "ھۆججەت ئىناۋەتلىك قوزغىلىش ئېكرانى ئۆرنىكى ھۆججىتىمۇ ئەمەسمۇ تەكشۈرۈڭ." #: ../engines/balou/config.c:402 #, c-format msgid "Unable to remove splash theme \"%s\" from directory %s." -msgstr "قوزغىلىش ئېكرانى ئۇسلۇبى \"%s\" نى مۇندەرىجە %s دىن ئۆچۈرەلمىدى." +msgstr "قوزغىلىش ئېكرانى ئۆرنىكى «%s» نى مۇندەرىجە %s دىن ئۆچۈرەلمىدى." #: ../engines/balou/config.c:491 msgid "Choose theme filename..." -msgstr "ئۇسلۇب ھۆججەت ئاتىنى تاللاڭ..." +msgstr "ئۆرنەك ھۆججەت ئاتىنى تاللاڭ..." #: ../engines/balou/config.c:624 msgid "_Install new theme" -msgstr "يېڭى ئۇسلۇب ئورنات(_I)" +msgstr "يېڭى ئۆرنەك ئورنات(_I)" #: ../engines/balou/config.c:633 msgid "_Remove theme" -msgstr "ئۇسلۇب ئۆچۈر(_R)" +msgstr "ئۆرنەك ئۆچۈر(_R)" #: ../engines/balou/config.c:650 msgid "_Export theme" -msgstr "ئۇسلۇب ئېكسپورت قىل(_E)" +msgstr "ئۆرنەك ئېكسپورت قىل(_E)" #: ../engines/balou/config.c:866 msgid "Balou theme" -msgstr "Balou ئۇسلۇبى" +msgstr "بالوئۇ(Balou) ئۆرنىكى" #: ../engines/balou/config.c:951 msgid "Configure Balou..." -msgstr "Balou نى سەپلەش..." +msgstr "بالوئۇ(Balou) نى سەپلەش..." #: ../engines/balou/config.c:994 msgid "Balou" -msgstr "Balou" +msgstr "بالوئۇ(Balou)" #: ../engines/balou/config.c:995 msgid "Balou Splash Engine" -msgstr "Balou Splash ماتورى" +msgstr "بالوئۇ(Balou) Splash ماتورى" #: ../engines/mice/mice.c:373 msgid "Mice" -msgstr "Mice" +msgstr "چاشقىنەك" #: ../engines/mice/mice.c:374 msgid "Mice Splash Engine" -msgstr "Mice Splash Engine" +msgstr "چاشقىنەك Splash ماتورى" #: ../engines/simple/simple.c:346 msgid "Configure Simple..." @@ -110,7 +116,7 @@ #: ../engines/simple/simple.c:409 msgid "Use custom image" -msgstr "كۆرسىتىلگەن سۈرەتنى ئىشلىتىش" +msgstr "ئىختىيارىي سۈرەتنى ئىشلىتىش" #: ../engines/simple/simple.c:413 msgid "Choose image..." @@ -130,214 +136,154 @@ #: ../engines/simple/simple.c:498 msgid "Simple Splash Engine" -msgstr "ئاددىي Splash Engine" - -#: ../panel-plugin/xfsm-logout-plugin.c:86 -msgid "Session" -msgstr "ئەڭگىمە" - -#: ../panel-plugin/xfsm-logout-plugin.c:87 -msgid "Loc_k screen" -msgstr "ئېكران قۇلۇپلا(_K)" - -#: ../panel-plugin/xfsm-logout-plugin.c:88 -#: ../panel-plugin/xfsm-logout-plugin.c:128 -msgid "_Suspend" -msgstr "ئارام ئال(_S)" - -#: ../panel-plugin/xfsm-logout-plugin.c:89 -#: ../panel-plugin/xfsm-logout-plugin.c:135 -msgid "_Hibernate" -msgstr "ئۈچەككە كىر(_H)" - -#: ../panel-plugin/xfsm-logout-plugin.c:90 -#: ../panel-plugin/xfsm-logout-plugin.c:121 -msgid "_Reboot" -msgstr "قايتا قوزغات(_R)" +msgstr "ئاددىي Splash ماتورى" -# NOTE: changed for the actual behavior -#: ../panel-plugin/xfsm-logout-plugin.c:91 -#: ../panel-plugin/xfsm-logout-plugin.c:114 -msgid "Shut _down" -msgstr "توكنى ئۈز(_D)" - -#: ../panel-plugin/xfsm-logout-plugin.c:92 -#: ../panel-plugin/xfsm-logout-plugin.c:107 -msgid "_Log out" -msgstr "تىزىمدىن چىق(_L)" - -#. XFSM_SHUTDOWN_ASK -#. XFSM_SHUTDOWN_LOGOUT -#: ../panel-plugin/xfsm-logout-plugin.c:105 -msgid "Are you sure you want to log out?" -msgstr "تىزىمدىن راستلا چىقامسىز؟" - -#: ../panel-plugin/xfsm-logout-plugin.c:106 -#, c-format -msgid "You will be logged out in %u seconds." -msgstr "سىز %u سېكۇنتتىن كېيىن تىزىمدىن چىقىسىز." - -#: ../panel-plugin/xfsm-logout-plugin.c:109 -msgid "Failed to log out." -msgstr "تىزىمدىن چىقىش مەغلۇپ بولدى." - -#. XFSM_SHUTDOWN_HALT -#: ../panel-plugin/xfsm-logout-plugin.c:112 -msgid "Are you sure you want to shut down?" -msgstr "راستلا توكنى ئۈزەمسىز؟" - -#: ../panel-plugin/xfsm-logout-plugin.c:113 -#, c-format -msgid "Your system will shut down in %u seconds." -msgstr "سىستېمىنىڭ توكى %u سېكۇنتتىن كېيىن ئۆچىدۇ." - -#: ../panel-plugin/xfsm-logout-plugin.c:116 -msgid "Failed to shut down." -msgstr "توكنى ئۈزۈش مەغلۇپ بولدى." - -#. XFSM_SHUTDOWN_REBOOT -#: ../panel-plugin/xfsm-logout-plugin.c:119 -msgid "Are you sure you want to reboot?" -msgstr "راستلا قايتا قوزغىتامسىز؟" - -#: ../panel-plugin/xfsm-logout-plugin.c:120 -#, c-format -msgid "Your system will reboot in %u seconds." -msgstr "سىستېما %u سېكۇنتتىن كېيىن قايتا قوزغىلىدۇ." - -#: ../panel-plugin/xfsm-logout-plugin.c:123 -msgid "Failed to reboot." -msgstr "قايتا قوزغىتىش مەغلۇپ بولدى." - -#: ../panel-plugin/xfsm-logout-plugin.c:130 -msgid "Failed to suspend" -msgstr "ئارام ئېلىش مەغلۇپ بولدى" - -#: ../panel-plugin/xfsm-logout-plugin.c:137 -msgid "Failed to hibernate" -msgstr "ئۈچەككە كىرىش مەغلۇپ بولدى." - -#: ../panel-plugin/xfsm-logout-plugin.c:150 -#, fuzzy -msgid "Xflock4 could not be launched" -msgstr "Xfclock4 ئىجرا بولۇنمىدى" - -# Dialog title -#: ../panel-plugin/xfsm-logout-plugin.c:222 -msgid "Close Session" -msgstr "ئەڭگىمە يېپىش" +#: ../scripts/xscreensaver.desktop.in.h:1 +msgid "Launch screensaver and locker program" +msgstr "ئېكران قوغدىغۇچ ۋە قۇلۇپلىغۇچ پروگراممىسىنى قوزغات" + +#: ../scripts/xscreensaver.desktop.in.h:2 +msgid "Screensaver" +msgstr "ئېكران قوغدىغۇچ" -#: ../settings/main.c:42 +#: ../settings/main.c:43 msgid "Settings manager socket" -msgstr "manager socket نىڭ تەڭشەكلىرى" +msgstr "باشقۇرغۇچى سوكېتنىڭ تەڭشەكلىرى" -#: ../settings/main.c:42 +#: ../settings/main.c:43 msgid "SOCKET ID" msgstr "SOCKET ID" -#: ../settings/main.c:43 +#: ../settings/main.c:44 msgid "Version information" msgstr "نەشر ئۇچۇرى" -#: ../settings/main.c:73 +#: ../settings/main.c:75 ../xfce4-session/main.c:257 #, c-format msgid "Type '%s --help' for usage." msgstr "'%s --help' كىرگۈزسە ئىشلىتىش ئۇسۇلىنى كۆرگىلى بولىدۇ" -#: ../settings/main.c:85 ../xfce4-session/main.c:226 +#: ../settings/main.c:87 ../xfce4-session/main.c:267 +#: ../xfce4-session-logout/main.c:135 msgid "The Xfce development team. All rights reserved." -msgstr "Xfce ئىجادىيەت گۇرۇپپىسى. All rights reserved." +msgstr "Xfce ئىجادىيەت گۇرۇپپىسى. نەشر ھوقۇقى ئۆزىمىزگە تەۋە." -#: ../settings/main.c:86 ../xfce4-session/main.c:232 +#: ../settings/main.c:88 ../xfce4-session/main.c:268 +#: ../xfce4-session-logout/main.c:138 #, c-format msgid "Please report bugs to <%s>." msgstr "كەمتۈكنى <%s> غا دوكلات قىلىڭ." -#: ../settings/main.c:95 ../xfce4-session/main.c:238 ../xfce4-tips/main.c:270 +#: ../settings/main.c:97 ../xfce4-session/main.c:276 msgid "Unable to contact settings server" msgstr "تەڭشەك مۇلازىمېتىر بىلەن ئۇلىنالمىدى" -#: ../settings/main.c:114 +#: ../settings/main.c:116 msgid "Unable to create user interface from embedded definition data" -msgstr "سىڭدۈرمە سانلىق-ئاساسلاردىن كۆرۈنمە يۈز ياسىغىلى بولمىدى" +msgstr "سىڭدۈرمە سانلىق-مەلۇماتلاردىن كۆرۈنمە يۈز ياسىغىلى بولمىدى" -#: ../settings/main.c:127 +#: ../settings/main.c:128 msgid "_Application Autostart" msgstr "ئاپتوماتىك قوزغىلىدىغان پروگرامما(_A)" -#: ../settings/session-editor.c:60 +#: ../settings/session-editor.c:61 msgid "If running" msgstr "ئىجرا بولۇۋاتقان ئەھۋالدا" -#: ../settings/session-editor.c:61 +#: ../settings/session-editor.c:62 msgid "Always" msgstr "ھەمىشە" -#: ../settings/session-editor.c:62 +#: ../settings/session-editor.c:63 msgid "Immediately" msgstr "دەرھال" -#: ../settings/session-editor.c:63 +#: ../settings/session-editor.c:64 msgid "Never" msgstr "زادىلا" -#: ../settings/session-editor.c:128 +#: ../settings/session-editor.c:129 msgid "Session Save Error" -msgstr "Session ساقلاشقا خاتالىق كۆرۈلدى" +msgstr "ئەڭگىمەنى ساقلاشقا خاتالىق كۆرۈلدى" -#: ../settings/session-editor.c:129 +#: ../settings/session-editor.c:130 msgid "Unable to save the session" -msgstr "Session نى ساقلىغىلى بولمىدى" +msgstr "ئەڭگىمەنى ساقلىغىلى بولمىدى" + +#: ../settings/session-editor.c:170 +msgid "Clear sessions" +msgstr "ئەڭگىمەلەرنى تازىلا" + +#: ../settings/session-editor.c:171 +msgid "Are you sure you want to empty the session cache?" +msgstr "ئەڭگىمە غەملىكىنى راستلا قۇرۇقدامسىز؟" + +#: ../settings/session-editor.c:172 +msgid "" +"The saved states of your applications will not be restored during your next " +"login." +msgstr "پروگراممىنىڭ ساقلانغان ھالىتى كېيىنكى قېتىم كىرگەندە ئەسلىگە كەلتۈرۈلمەيدۇ." + +#: ../settings/session-editor.c:174 +msgid "_Proceed" +msgstr "داۋاملاشتۇر(_P)" -#: ../settings/session-editor.c:184 +#: ../settings/session-editor.c:212 +#, c-format +msgid "You might need to delete some files manually in \"%s\"." +msgstr "بۇ «%s» نىڭ ئىچىدىكى بەزى ھۆججەتلەرنى قولدا ئۆچۈرمىسىڭىز بولمايدىغاندەك تۇرىدۇ." + +#: ../settings/session-editor.c:215 +msgid "All Xfce cache files could not be cleared" +msgstr "بارلىق Xfce غەملەك ھۆججەتلىرىنى تازىلىغىلى بولمىدى" + +#: ../settings/session-editor.c:249 #, c-format msgid "Are you sure you want to terminate \"%s\"?" -msgstr "\"%s\" ئاخىرلاشتۇرسۇنمۇ؟" +msgstr "«%s» ئاخىرلاشتۇرسۇنمۇ؟" -#: ../settings/session-editor.c:187 ../settings/session-editor.c:215 +#: ../settings/session-editor.c:252 ../settings/session-editor.c:280 msgid "Terminate Program" msgstr "پروگراممىنى ئاخىرلاشتۇرۇش" -#: ../settings/session-editor.c:189 +#: ../settings/session-editor.c:254 msgid "" "The application will lose any unsaved state and will not be restarted in " "your next session." -msgstr "" -"پروگرامما ساقلانمىغان ھالەتلەرنىڭ ھەممىسى يوقىتىپ قويىدۇ، كېيىنكى ئەڭگىمەدە " -"قوزغالماسلىقى مۇمكىن." +msgstr "پروگرامما ساقلانمىغان ھالەتلەرنىڭ ھەممىسى يوقىتىپ قويىدۇ، كېيىنكى ئەڭگىمەدە قوزغالماسلىقى مۇمكىن." -#: ../settings/session-editor.c:191 -#: ../settings/xfce4-session-settings.glade.h:35 +#: ../settings/session-editor.c:256 +#: ../settings/xfce4-session-settings.glade.h:40 msgid "_Quit Program" msgstr "پروگراممىنى ئاخىرلاشتۇر(_Q)" -#: ../settings/session-editor.c:216 +#: ../settings/session-editor.c:281 msgid "Unable to terminate program." msgstr "پروگراممىنى ئاخىرلاشتۇرغىلى بولمىدى" -#: ../settings/session-editor.c:394 +#: ../settings/session-editor.c:459 msgid "(Unknown program)" msgstr "(نامەلۇم پروگرامما)" -#: ../settings/session-editor.c:614 +#: ../settings/session-editor.c:679 msgid "Priority" -msgstr "ئالدىنلىق" +msgstr "مەرتىۋىسى" -#: ../settings/session-editor.c:622 +#: ../settings/session-editor.c:687 msgid "PID" msgstr "PID" -#: ../settings/session-editor.c:628 +#: ../settings/session-editor.c:693 msgid "Program" msgstr "پروگرامما" -#: ../settings/session-editor.c:653 +#: ../settings/session-editor.c:718 msgid "Restart Style" msgstr "قايتا قوزغىتىش ئۇسلۇبى" -#: ../settings/splash-settings.c:286 ../settings/splash-settings.c:289 -#: ../settings/splash-settings.c:292 ../settings/splash-settings.c:295 -#: ../settings/splash-settings.c:352 +#: ../settings/splash-settings.c:291 ../settings/splash-settings.c:294 +#: ../settings/splash-settings.c:297 ../settings/splash-settings.c:300 +#: ../settings/splash-settings.c:357 msgid "None" msgstr "يوق" @@ -353,7 +299,7 @@ msgid "Description:" msgstr "چۈشەندۈرۈش:" -#: ../settings/xfae-dialog.c:124 +#: ../settings/xfae-dialog.c:124 ../settings/xfae-model.c:479 msgid "Command:" msgstr "بۇيرۇق:" @@ -365,189 +311,119 @@ msgid "Edit application" msgstr "پروگرامما تەھرىرلە" -#: ../settings/xfae-model.c:562 +#: ../settings/xfae-model.c:611 #, c-format msgid "Failed to unlink %s: %s" msgstr "%s غا بىلەن بولغان باغلىنىشنى ئۈزۈش مەغلۇپ بولدى: %s" -#: ../settings/xfae-model.c:651 +#: ../settings/xfae-model.c:700 #, c-format msgid "Failed to create file %s" msgstr "ھۆججەت %s نى قۇرۇش مەغلۇپ بولدى" -#: ../settings/xfae-model.c:673 +#: ../settings/xfae-model.c:723 #, c-format msgid "Failed to write file %s" msgstr "ھۆججەت %s نىڭغا يېزىش مەغلۇپ بولدى" -#: ../settings/xfae-model.c:732 +#: ../settings/xfae-model.c:782 #, c-format msgid "Failed to open %s for reading" msgstr "ھۆججەت %s نى ئوقۇش مەغلۇپ بولدى." -#: ../settings/xfae-model.c:841 ../settings/xfae-model.c:898 +#: ../settings/xfae-model.c:891 ../settings/xfae-model.c:948 #, c-format msgid "Failed to open %s for writing" -msgstr "ھۆججەت %s نىڭغا يېزىش ئۈچۈن ئېچىش مەغلۇپ بولدى" +msgstr "يېزىش مەقسىتىدە %s نى ئېچىش مەغلۇپ بولدى" -#: ../settings/xfae-window.c:101 +#: ../settings/xfae-window.c:102 msgid "" "Below is the list of applications that will be started automatically when " "you login to your Xfce desktop, in addition to the applications that were " -"saved when you logged out last time:" -msgstr "" -"تۆۋەندىكىلەر Xfce قا كىرگەندە ئاپتوماتىك ئىجرا بولىدىغان پروگراممىلارنىڭ " -"تىزىملىكىدۇر. يەنە ئەڭ ئاخىرى سىستېمىدىن چىققاندا قوشۇلغان پروگراممىمۇ " -"قوشۇلىدۇ:" +"saved when you logged out last time. Cursive applications belong to another " +"desktop environment, but you can still enable them if you want." +msgstr "تۆۋەندىكىلەر Xfce ئۈستەلئۈستى مۇھىتىغا كىرگەندە ئاپتوماتىك ئىجرا بولىدىغان پروگراممىلاردۇر. يازمىچە كۆرسىتىلگەن پروگراممىلار بولسا باشقا ئۈستەلئۈستى مۇھىتىغا تەۋە پروگراممىلار بولۇپ، خالىسىڭىز ئۇنىمۇ ئىناۋەتلىك قىلالايسىز." -#: ../settings/xfae-window.c:289 +#: ../settings/xfae-window.c:293 #, c-format msgid "Failed adding \"%s\"" -msgstr "\"%s\" نى قوشۇۋاتقاندا مەغلۇپ " +msgstr "«%s» نى قوشۇۋاتقاندا مەغلۇپ" -#: ../settings/xfae-window.c:320 ../settings/xfae-window.c:334 +#: ../settings/xfae-window.c:324 ../settings/xfae-window.c:338 msgid "Failed to remove item" msgstr "تۈرنى ئۆچۈرۈش مەغلۇپ بولدى" -#: ../settings/xfae-window.c:326 +#: ../settings/xfae-window.c:330 msgid "" "This will permanently remove the application from the list of automatically " "started applications" -msgstr "" -"بۇ ئاپتوماتىك قوزغىلىدىغان پروگرامما تىزىملىكىدىن بۇ پروگراممىنى ئۆچۈرىدۇ." +msgstr "بۇ ئاپتوماتىك قوزغىلىدىغان پروگرامما تىزىملىكىدىن بۇ پروگراممىنى ئۆچۈرىدۇ." -#: ../settings/xfae-window.c:328 +#: ../settings/xfae-window.c:332 #, c-format msgid "Are you sure you want to remove \"%s\"" -msgstr "\"%s\" نى راستلا ئۆچۈرەمسىز" +msgstr "«%s» نى راستلا ئۆچۈرەمسىز" -#: ../settings/xfae-window.c:362 +#: ../settings/xfae-window.c:366 msgid "Failed to edit item" msgstr "تۈرنى تەھرىرلەش مەغلۇپ بولدى" -#: ../settings/xfae-window.c:382 +#: ../settings/xfae-window.c:386 #, c-format msgid "Failed to edit item \"%s\"" -msgstr "تۈر \"%s\" نى تەھرىرلەش مەغلۇپ بولدى." +msgstr "تۈر «%s» نى تەھرىرلەش مەغلۇپ بولدى." -#: ../settings/xfae-window.c:410 +#: ../settings/xfae-window.c:414 msgid "Failed to toggle item" -msgstr "تۈرنى toggle قىلىش مەغلۇپ بولدى" +msgstr "تۈرنى يېيىش مەغلۇپ بولدى" #: ../xfce4-session/main.c:76 msgid "Disable binding to TCP ports" msgstr "TCP ئېغىزىغا باغلاشنى چەكلە" -#: ../xfce4-session/main.c:77 ../xfce4-session-logout/main.c:93 +#: ../xfce4-session/main.c:77 ../xfce4-session-logout/main.c:91 msgid "Print version information and exit" msgstr "نەشر ئۇچۇرىنى كۆرسىتىپ ئاخىرلاشتۇرۇش" #: ../xfce4-session/main.c:140 msgid "Loading desktop settings" -msgstr "ئۈستەل يۈزى تەڭشىكى" - -#: ../xfce4-session/main.c:227 -msgid "Written by Benedikt Meurer ." -msgstr "ئىجادىيەتچى: Benedikt Meurer " - -#: ../xfce4-session/main.c:228 -#, c-format -msgid "Built with Gtk+-%d.%d.%d, running with Gtk+-%d.%d.%d" -msgstr "Gtk+-%d.%d.%d دا ياسالغان. Gtk+-%d.%d.%d دا ئىجرا بولۇۋاتىدۇ." +msgstr "ئۈستەلئۈستى تەڭشىكى" #. verify that the DNS settings are ok -#: ../xfce4-session/main.c:258 +#: ../xfce4-session/main.c:298 msgid "Verifying DNS settings" msgstr "DNS تەڭشىكىنى تەكشۈرۈۋاتىدۇ" -#: ../xfce4-session/main.c:261 +#: ../xfce4-session/main.c:302 msgid "Loading session data" -msgstr "session نىڭ سانلىق-ئاساسلىرىنى ئوقۇۋاتىدۇ" - -# In ja translation: unification of the term 'Log off' to 'Logout'. -#: ../xfce4-session/shutdown.c:372 -#, c-format -msgid "Log out %s" -msgstr "%s دىن چىق" - -#: ../xfce4-session/shutdown.c:422 -#: ../xfce4-session-logout/xfce4-session-logout.desktop.in.h:1 -msgid "Log Out" -msgstr "تىزىمدىن چىقىش" - -#: ../xfce4-session/shutdown.c:457 -msgid "Restart" -msgstr "قايتا قوزغات" - -# NOTE: changed for the actual behavior -#: ../xfce4-session/shutdown.c:499 -msgid "Shut Down" -msgstr "توكنى ئۈز" - -#: ../xfce4-session/shutdown.c:561 -msgid "Suspend" -msgstr "ئارام ئال" - -#: ../xfce4-session/shutdown.c:599 -msgid "Hibernate" -msgstr "ئۈچەككە كىر" - -#: ../xfce4-session/shutdown.c:608 -msgid "_Save session for future logins" -msgstr "كېيىنكى كىرگەندە ئىشلىتىش ئۈچۈن session نى ساقلا(_S)" - -#: ../xfce4-session/shutdown.c:668 -msgid "Please enter your password:" -msgstr "ئىمنى كىرگۈز:" - -#: ../xfce4-session/shutdown.c:700 -msgid "An error occurred" -msgstr "خاتالىق كۆرۈلدى" - -#: ../xfce4-session/shutdown.c:714 -msgid "" -"Either the password you entered is invalid, or the system administrator " -"disallows shutting down this computer with your user account." -msgstr "" -"كىرگۈزگەن ئىم خاتا، ياكى سىستېما باشقۇرغۇچىسى سىزگە كومپيۇتېرنىڭ توكنى ئۈزۈش " -"ھوقۇقىنى بەرمىگەن بەرمىگەن" - -#: ../xfce4-session/shutdown.c:833 ../xfce4-session/xfsm-manager.c:1119 -msgid "Shutdown Failed" -msgstr "توكنى ئۈزۈش مەغلۇپ بولدى" - -#: ../xfce4-session/shutdown.c:835 -msgid "Unable to perform shutdown" -msgstr "توك ئۈزۈش مەشغۇلاتىنى قىلغىلى بولمىدى" +msgstr "ئەڭگىمە سانلىق-مەلۇماتلىرىنى ئوقۇۋاتىدۇ" -#: ../xfce4-session/xfsm-chooser.c:91 +#: ../xfce4-session/xfsm-chooser.c:90 #, c-format msgid "Last accessed: %s" msgstr "ئەڭ ئاخىرقى زىيارەت: %s" -#: ../xfce4-session/xfsm-chooser.c:177 +#: ../xfce4-session/xfsm-chooser.c:172 msgid "" "Choose the session you want to restore. You can simply double-click the " "session name to restore it." -msgstr "" -"ئەسلىگە كەلتۈرمەكچى بولغان session نى تاللاڭ. چاشقىنەكنى قوش چەكسىڭىزلا " -"بولىدۇ." +msgstr "ئەسلىگە كەلتۈرمەكچى بولغان ئەڭگىمەنى تاللاڭ. چاشقىنەكنى قوش چەكسىڭىزلا بولىدۇ." #. "Logout" button -#: ../xfce4-session/xfsm-chooser.c:203 +#: ../xfce4-session/xfsm-chooser.c:198 msgid "Log out" -msgstr "تىزىمدىن چىق" +msgstr "چىق" -#: ../xfce4-session/xfsm-chooser.c:205 +#: ../xfce4-session/xfsm-chooser.c:200 msgid "Cancel the login attempt and return to the login screen." -msgstr "كىرىش مەشغۇلاتىدىن ۋاز كېچىپ، كىرىش كۆزنىكىگە قايت" +msgstr "كىرىش مەشغۇلاتىدىن ۋاز كېچىپ، كىرىش كۆزنىكىگە قايتىدۇ." #. "New" button -#: ../xfce4-session/xfsm-chooser.c:212 +#: ../xfce4-session/xfsm-chooser.c:207 msgid "New session" msgstr "يېڭى ئەڭگىمە" -#: ../xfce4-session/xfsm-chooser.c:213 +#: ../xfce4-session/xfsm-chooser.c:208 msgid "Create a new session." msgstr "يېڭى ئەڭگىمە قۇرىدۇ." @@ -555,19 +431,15 @@ #: ../xfce4-session/xfsm-client.c:571 #, c-format msgid "The client doesn't have any properties set yet" -msgstr "client نىڭ ھېچقانداق خاسلىقى تەڭشەلمىگەن" +msgstr "خېرىدارنىڭ ھېچقانداق خاسلىقى تەڭشەلمىگەن" -#: ../xfce4-session/xfsm-compat-gnome.c:301 +#: ../xfce4-session/xfsm-compat-gnome.c:239 msgid "Starting The Gnome Keyring Daemon" -msgstr "GNOME Keyring Daemon نى قوزغىتىش" - -#: ../xfce4-session/xfsm-compat-gnome.c:313 -msgid "Starting Gnome Assistive Technologies" -msgstr "GNOME Assistive Technologies نى قوزغىتىش" +msgstr "گىنوم(GNOME) ئاچقۇچ ھالقىسى(Keyring) مۇئەككىلىنى قوزغىتىش" #: ../xfce4-session/xfsm-compat-kde.c:124 msgid "Starting KDE services" -msgstr "KDE مۇلازىمەتلىرىنى قوزغىتىش" +msgstr "ك د ئې (KDE) مۇلازىمەتلىرىنى قوزغىتىش" #: ../xfce4-session/xfsm-dns.c:78 msgid "(Unknown)" @@ -580,8 +452,7 @@ "This will prevent Xfce from operating correctly.\n" "It may be possible to correct the problem by adding\n" "%s to the file /etc/hosts on your system." -msgstr "" -"%s نىڭ ئىنتېرنېت ئادرېسىنى تاپقىلى بولمىدى.\n" +msgstr "%s نىڭ ئىنتېرنېت ئادرېسىنى تاپقىلى بولمىدى.\n" "بۇ Xfce نىڭ نورمال مەشغۇلات قىلىشىنى توسۇپ قويىدۇ..\n" "بۇ مەسىلىنى ھەر قىلىش ئۈچۈن\n" "سىستېمىدىكى /etc/hosts دېگەن ھۆججەت ھۆججەتكە %s نى قوشۇپ قويۇشتۇر." @@ -592,98 +463,109 @@ #: ../xfce4-session/xfsm-dns.c:155 msgid "Try again" -msgstr "قايتا سىناپ كور" +msgstr "قايتا سىناپ كۆر" -#: ../xfce4-session/xfsm-manager.c:602 +#: ../xfce4-session/xfsm-manager.c:609 #, c-format msgid "" "Unable to determine failsafe session name. Possible causes: xfconfd isn't " "running (D-Bus setup problem); environment variable $XDG_CONFIG_DIRS is set " "incorrectly (must include \"%s\"), or xfce4-session is installed incorrectly." -msgstr "" -"بىخەتەر ئەڭگىمە(failsafe session) ئاتىنى بىلگىلى بولمىدى. سەۋەبلىرى: " -"xfconfd ئىجرا قىلىنمىغان بولۇشى مۇمكىن(D-Bus نى ئورنىتىشتىكى مەسىلە) مۇھىت " -"ئۆزگەرگۈچىسى(environment variable) $XDG_CONFIG_DIRS توغرا بېكىتىلمىگەن( \"%s" -"\" نى ئوز ئىچىگە ئېلىشى كېرەك) ياكى xfce4-session توغرا ئورنىتىلمىغان " -"بولۇشى مۇمكىن." +msgstr "بىخەتەر ئەڭگىمە(failsafe session) ئاتىنى بىلگىلى بولمىدى. سەۋەبلىرى: xfconfd ئىجرا قىلىنمىغان بولۇشى مۇمكىن(D-Bus نى ئورنىتىشتىكى مەسىلە) مۇھىت ئۆزگەرگۈچىسى(environment variable) $XDG_CONFIG_DIRS توغرا بېكىتىلمىگەن( «%s» نى ئوز ئىچىگە ئېلىشى كېرەك) ياكى xfce4-session توغرا ئورنىتىلمىغان بولۇشى مۇمكىن." -#: ../xfce4-session/xfsm-manager.c:613 +#: ../xfce4-session/xfsm-manager.c:620 #, c-format msgid "" "The specified failsafe session (\"%s\") is not marked as a failsafe session." -msgstr "" -"كۆرسىتىلگەن failsafe session (\"%s\") تېخى بىخەتەر ئەڭگىمە(failsafe session) " -"قىلىپ تەڭشەلمىگەن." +msgstr "كۆرسىتىلگەن بىخەتەر ئەڭگىمە(failsafe session) («%s») تېخى بىخەتەر ئەڭگىمە(failsafe session) قىلىپ تەڭشەلمىگەن." -#: ../xfce4-session/xfsm-manager.c:660 +#: ../xfce4-session/xfsm-manager.c:667 msgid "The list of applications in the failsafe session is empty." -msgstr "بىخەتەر ئەڭگىمە(failsafe session) ئىچىدىكى پروگرامما تىزىملىكى قۇرۇق." +msgstr "بىخەتەر ئەڭگىمە(failsafe session) ئىچىدىكى پروگرامما تىزىمى قۇرۇق." #. FIXME: migrate this into the splash screen somehow so the #. * window doesn't look ugly (right now now WM is running, so it #. * won't have window decorations). -#: ../xfce4-session/xfsm-manager.c:707 +#: ../xfce4-session/xfsm-manager.c:714 msgid "Session Manager Error" msgstr "ئەڭگىمە باشقۇرغۇدىكى خاتالىق" -#: ../xfce4-session/xfsm-manager.c:709 +#: ../xfce4-session/xfsm-manager.c:716 msgid "Unable to load a failsafe session" msgstr "بىخەتەر ئەڭگىمە(failsafe session)نى ئوقۇغىلى بولمىدى" -#: ../xfce4-session/xfsm-manager.c:1122 +#: ../xfce4-session/xfsm-manager.c:1123 +msgid "Shutdown Failed" +msgstr "توكنى ئۈزۈش مەغلۇپ بولدى" + +#: ../xfce4-session/xfsm-manager.c:1126 msgid "Failed to suspend session" msgstr "ئەڭگىمەنى ئارام ئالدۇرۇش مەغلۇپ بولدى" -#: ../xfce4-session/xfsm-manager.c:1123 +#: ../xfce4-session/xfsm-manager.c:1127 msgid "Failed to hibernate session" msgstr "ئەڭگىمەنى ئۈچەككە كىرگۈزۈش مەغلۇپ بولدى" -#: ../xfce4-session/xfsm-manager.c:1411 +#: ../xfce4-session/xfsm-manager.c:1393 #, c-format msgid "Can only terminate clients when in the idle state" -msgstr "بىكار بولغان client لارنىلا ئاخىرلاشتۇرغىلى بولىدۇ" +msgstr "بىكار بولغان خېرىدارلارنىلا ئاخىرلاشتۇرغىلى بولىدۇ" -#: ../xfce4-session/xfsm-manager.c:1942 +#: ../xfce4-session/xfsm-manager.c:1956 #, c-format msgid "Session manager must be in idle state when requesting a checkpoint" -msgstr "checkpoint ئىلتىماس قىلغاندا ئەڭگىمە باشقۇرغۇ چوقۇم بىكار بولۇشى كېرەك" +msgstr "تەكشۈرۈش نۇقتىسى(checkpoint) ئىلتىماس قىلغاندا ئەڭگىمە باشقۇرغۇ چوقۇم بىكار بولۇشى كېرەك" -#: ../xfce4-session/xfsm-manager.c:1983 +#: ../xfce4-session/xfsm-manager.c:1997 #, c-format msgid "Session manager must be in idle state when requesting a shutdown" -msgstr "توك ئۇز ئىلتىماسى قىلغاندا ئەڭگىمە باشقۇرغۇ چوقۇم بىكار بولۇشى كېرەك" +msgstr "توكنى ئۈز ئىلتىماسىنى قىلغاندا ئەڭگىمە باشقۇرغۇ چوقۇم بىكار بولۇشى كېرەك" -#: ../xfce4-session/xfsm-manager.c:1990 +#: ../xfce4-session/xfsm-logout-dialog.c:188 #, c-format -msgid "Invalid shutdown type \"%u\"" -msgstr "توكنى ئۇزنىڭ تىپى \"%u\" ئىناۋەتسىز" +msgid "Log out %s" +msgstr "%s چىقىش" -#: ../xfce4-session/xfsm-shutdown-helper.c:1601 -#, c-format -msgid "Error sending command to shutdown helper: %s" -msgstr "توكنى ئۈزۈش helper گە بۇيرۇق ئەۋەتىشتە خاتالىق كۆرۈلدى: %s" +#. * +#. * Logout +#. * +#: ../xfce4-session/xfsm-logout-dialog.c:246 +msgid "_Log Out" +msgstr "چىق(_L)" -#: ../xfce4-session/xfsm-shutdown-helper.c:1615 -#, c-format -msgid "Error receiving response from shutdown helper: %s" -msgstr "توكنى ئۈزۈش helper دىن بۇيرۇق قوبۇللاشتا خاتالىق كۆرۈلدى: %s" +#: ../xfce4-session/xfsm-logout-dialog.c:266 +msgid "_Restart" +msgstr "قايتا قوزغات(_R)" -#: ../xfce4-session/xfsm-shutdown-helper.c:1624 -#, c-format -msgid "Shutdown command failed" -msgstr "توكنى ئۇز بۇيرۇقى مەغلۇپ بولدى" +#: ../xfce4-session/xfsm-logout-dialog.c:286 +msgid "Shut _Down" +msgstr "تاقا(_D)" + +#: ../xfce4-session/xfsm-logout-dialog.c:309 +msgid "Sus_pend" +msgstr "توڭلات(_P)" -#: ../xfce4-session/xfsm-shutdown-helper.c:1802 -msgid "Suspend failed, no backend supported" -msgstr "ئارام ئېلىش مەغلۇپ بولدى. backend نى ئىشلەتكىلى بولمايدىكەن" - -#: ../xfce4-session/xfsm-shutdown-helper.c:1829 -msgid "Hibernate failed, no backend supported" -msgstr "ئۈچەككە كىرىش مەغلۇپ بولدى. backend نى ئىشلەتكىلى بولمايدىكەن" - -#: ../xfce4-session/xfsm-shutdown-helper.c:1859 -msgid "Shutdown Command not found" -msgstr "توكنى ئۇز بۇيرۇقى تېپىلمىدى" +#: ../xfce4-session/xfsm-logout-dialog.c:343 +msgid "_Hibernate" +msgstr "ئۈچەككە كىر(_H)" + +#: ../xfce4-session/xfsm-logout-dialog.c:368 +msgid "_Save session for future logins" +msgstr "كېيىنكى كىرگەندە ئىشلىتىش ئۈچۈن ئەڭگىمەنى ساقلا(_S)" + +#: ../xfce4-session/xfsm-logout-dialog.c:395 +msgid "Please enter your password" +msgstr "ئىمىڭىزنى كىرگۈزۈڭ" + +#: ../xfce4-session/xfsm-logout-dialog.c:427 +msgid "An error occurred" +msgstr "خاتالىق كۆرۈلدى" + +#: ../xfce4-session/xfsm-logout-dialog.c:433 +msgid "" +"Either the password you entered is invalid, or the system administrator " +"disallows shutting down this computer with your user account." +msgstr "كىرگۈزگەن ئىم خاتا، ياكى سىستېما باشقۇرغۇچىسى سىزگە كومپيۇتېرنىڭ توكنى ئۈزۈش ھوقۇقىنى بەرمىگەن بەرمىگەن" #: ../xfce4-session/xfsm-splash-screen.c:178 msgid "Choose session" @@ -697,88 +579,88 @@ msgid "Choose a name for the new session:" msgstr "يېڭى ئەڭگىمەنىڭ ئاتىنى تاللا:" -#: ../xfce4-session/xfsm-startup.c:115 +#: ../xfce4-session/xfsm-startup.c:347 msgid "Starting the Volume Controller" -msgstr "ئۈن كونتروللىغۇنى قوزغىتىۋاتىدۇ" +msgstr "ئۈن كونتروللىغۇچنى قوزغىتىۋاتىدۇ" -#: ../xfce4-session/xfsm-startup.c:117 +#: ../xfce4-session/xfsm-startup.c:349 msgid "Starting the Panel" -msgstr "Panel قوزغىتىۋاتىدۇ" +msgstr "كۆزنەك قوزغىتىۋاتىدۇ" -#: ../xfce4-session/xfsm-startup.c:119 +#: ../xfce4-session/xfsm-startup.c:351 msgid "Starting the Desktop Manager" -msgstr "ئۈستەليۈزىنى قوزغىتىۋاتىدۇ" +msgstr "ئۈستەلئۈستىنى قوزغىتىۋاتىدۇ" -#: ../xfce4-session/xfsm-startup.c:121 +#: ../xfce4-session/xfsm-startup.c:353 msgid "Starting the Taskbar" -msgstr "ۋەزىپە تاياقچىنى قوزغىتىۋاتىدۇ" +msgstr "ۋەزىپە بالدىقىنى قوزغىتىۋاتىدۇ" -#: ../xfce4-session/xfsm-startup.c:123 +#: ../xfce4-session/xfsm-startup.c:355 msgid "Starting the Window Manager" msgstr "كۆزنەك باشقۇرغۇنى قوزغىتىۋاتىدۇ" -#: ../xfce4-session/xfsm-startup.c:127 +#: ../xfce4-session/xfsm-startup.c:359 msgid "Starting the Gnome Terminal Emulator" -msgstr "GNOME تېرمىنال تەقلىدلىگۈنى نى قوزغىتىۋاتىدۇ" +msgstr "گىنوم(GNOME) تېرمىنال تەقلىدلىگۈنى نى قوزغىتىۋاتىدۇ" -#: ../xfce4-session/xfsm-startup.c:131 +#: ../xfce4-session/xfsm-startup.c:363 msgid "Starting the KDE Advanced Text Editor" -msgstr "KDE ئالىي تېكىست تەھرىرلىگۈنى قوزغىتىۋاتىدۇ" +msgstr "ك د ئە(KDE) ئالىي تېكىست تەھرىرلىگۈنى قوزغىتىۋاتىدۇ" -#: ../xfce4-session/xfsm-startup.c:133 +#: ../xfce4-session/xfsm-startup.c:365 msgid "Starting the KDE Clipboard Manager" -msgstr "KDE Clipboard باشقۇرغۇنى قوزغىتىۋاتىدۇ" +msgstr "ك د ئە(KDE) ساقلاش تاختىسى باشقۇرغۇنى قوزغىتىۋاتىدۇ" -#: ../xfce4-session/xfsm-startup.c:135 +#: ../xfce4-session/xfsm-startup.c:367 msgid "Starting the KDE Mail Reader" -msgstr "KDE ئېلخەت دېتالىنى قوزغىتىۋاتىدۇ" +msgstr "ك د ئە(KDE) ئېلخەت دېتالىنى قوزغىتىۋاتىدۇ" -#: ../xfce4-session/xfsm-startup.c:137 +#: ../xfce4-session/xfsm-startup.c:369 msgid "Starting the KDE News Reader" -msgstr "KDE خەۋەر دېتالىنى قوزغىتىۋاتىدۇ" +msgstr "ك د ئە(KDE) خەۋەر دېتالىنى قوزغىتىۋاتىدۇ" -#: ../xfce4-session/xfsm-startup.c:139 +#: ../xfce4-session/xfsm-startup.c:371 msgid "Starting the Konqueror" msgstr "Konqueror نى قوزغىتىۋاتىدۇ" -#: ../xfce4-session/xfsm-startup.c:141 +#: ../xfce4-session/xfsm-startup.c:373 msgid "Starting the KDE Terminal Emulator" -msgstr "KDE تېرمىنال تەقلىدلىگۈنى نى قوزغىتىۋاتىدۇ" +msgstr "ك د ئە(KDE) تېرمىنال تەقلىدلىگۈنى نى قوزغىتىۋاتىدۇ" -#: ../xfce4-session/xfsm-startup.c:145 +#: ../xfce4-session/xfsm-startup.c:377 msgid "Starting the Beep Media Player" -msgstr "Beep Media چالغۇنى قوزغىتىۋاتىدۇ" +msgstr "Beep ۋاسىتە قويغۇنى قوزغىتىۋاتىدۇ" -#: ../xfce4-session/xfsm-startup.c:147 +#: ../xfce4-session/xfsm-startup.c:379 msgid "Starting The Gimp" msgstr "GIMP نى قوزغىتىۋاتىدۇ" -#: ../xfce4-session/xfsm-startup.c:149 +#: ../xfce4-session/xfsm-startup.c:381 msgid "Starting the VI Improved Editor" msgstr "Vim تەھرىرلىگۈنى قوزغىتىۋاتىدۇ" -#: ../xfce4-session/xfsm-startup.c:151 +#: ../xfce4-session/xfsm-startup.c:383 msgid "Starting the Session Management Proxy" msgstr "ئەڭگىمە باشقۇرغۇ ۋاكالەتچىسىنى قوزغىتىۋاتىدۇ" -#: ../xfce4-session/xfsm-startup.c:153 +#: ../xfce4-session/xfsm-startup.c:385 msgid "Starting the X-Chat IRC Client" -msgstr "X-Chat IRC Client نى قوزغىتىۋاتىدۇ" +msgstr "X-Chat IRC خېرىدارىنى قوزغىتىۋاتىدۇ" -#: ../xfce4-session/xfsm-startup.c:155 +#: ../xfce4-session/xfsm-startup.c:387 msgid "Starting the X Multimedia System" msgstr "XMMS نى قوزغىتىۋاتىدۇ" -#: ../xfce4-session/xfsm-startup.c:157 +#: ../xfce4-session/xfsm-startup.c:389 msgid "Starting the X Terminal Emulator" msgstr "X تېرمىنال تەقلىدلىگۈنى قوزغىتىۋاتىدۇ" -#: ../xfce4-session/xfsm-startup.c:159 +#: ../xfce4-session/xfsm-startup.c:391 #, c-format msgid "Starting %s" msgstr "%s نى قوزغىتىۋاتىدۇ" -#: ../xfce4-session/xfsm-startup.c:283 +#: ../xfce4-session/xfsm-startup.c:515 #, c-format msgid "" "The location and the format of the autostart directory has changed.\n" @@ -791,130 +673,108 @@ "autostart directory have been successfully migrated to the new\n" "location.\n" "You should delete this directory now.\n" -msgstr "" -"autostart مۇندەرىجىسىنىڭ ئورنى ۋە فورماتى ئۆزگەرتىلىپتۇ.\n" +msgstr "autostart مۇندەرىجىسىنىڭ ئورنى ۋە فورماتى ئۆزگەرتىلىپتۇ.\n" "يېڭى ئورنى\n" "\n" " %s\n" "\n" -"بۇ يەرگە .desktop ھۆججىتىنى قويۇشقا بولىدۇ. بۇ ھۆججەتتە پروگراممىغا " -"مۇناسىۋەتلىك \n" +"بۇ يەرگە .desktop ھۆججىتىنى قويۇشقا بولىدۇ. بۇ ھۆججەتتە پروگراممىغا مۇناسىۋەتلىك \n" "چۈشەندۈرۈشلەر بار. كونا autostart مۇندەرىجىسىدىكى ھۆججەتلەر\n" "يېڭى ئورۇنغا كۆچۈرۈلۈپ.\n" "بولدى.\n" "ئەمدى بۇ مۇندەرىجىنى ئۆچۈرۈۋەتسىڭىز بولىدۇ.\n" -#: ../xfce4-session/xfsm-startup.c:441 +#: ../xfce4-session/xfsm-startup.c:684 msgid "Performing Autostart..." msgstr "ئاپتوماتىك قوزغىلىدىغان پروگراممىلارنى ئىجرا قىلىۋاتىدۇ..." -# FIXME: should be revised -#: ../xfce4-tips/main.c:48 ../xfce4-tips/main.c:284 -msgid "Tips and Tricks" -msgstr "ئەسكەرتمە ۋە ھۈنەرلەر" - -#: ../xfce4-tips/main.c:49 -msgid "Fortunes" -msgstr "تەلەي" +#: ../xfce4-session/xfsm-startup.c:790 +msgid "Starting Assistive Technologies" +msgstr "ياردەمچى تېخنىكىلارنى قوزغىتىش" -#: ../xfce4-tips/main.c:75 +#: ../xfce4-session/xfsm-shutdown.c:414 #, c-format -msgid "Could not load tips database (%s)." -msgstr "ئەسكەرتمە ساندىنى (%s) نى ئوقۇغىلى بولمىدى." +msgid "Error sending command to shutdown helper: %s" +msgstr "توكنى ئۈزۈش ياردەمچىسىگە بۇيرۇق ئەۋەتىشتە خاتالىق كۆرۈلدى: %s" -#. converting it from the user's locale failed too, we give up -#: ../xfce4-tips/main.c:190 +#: ../xfce4-session/xfsm-shutdown.c:427 #, c-format -msgid "Invalid output of fortune." -msgstr "تەلەي چىقىرىش ئىناۋەتسىز." +msgid "Error receiving response from shutdown helper: %s" +msgstr "توكنى ئۈزۈش ياردەمچىسىدىن بۇيرۇق قوبۇللاشتا خاتالىق كۆرۈلدى: %s" -#: ../xfce4-tips/main.c:195 ../xfce4-tips/main.c:203 +#: ../xfce4-session/xfsm-shutdown.c:435 #, c-format -msgid "Executing fortune failed (%s)" -msgstr "تەلەينى ئىجرا قىلىش مەغلۇپ بولدى(%s)" - -#: ../xfce4-tips/main.c:228 -msgid "Error while loading tips." -msgstr "ئەسكەرتمىلەرنى ئوقۇشتا خاتالىق كۆرۈلدى." +msgid "Shutdown command failed" +msgstr "توكنى ئۈز بۇيرۇقى مەغلۇپ بولدى" -#: ../xfce4-tips/main.c:314 -msgid "Display tips on _startup" -msgstr "قوزغالغان چاغدا tips نى كۆرسەت(_S)" +#: ../xfce4-session/xfsm-shutdown.c:540 +msgid "Shutdown is blocked by the kiosk settings" +msgstr "توكنى ئۈز بۇيرۇقى kiosk تەڭشىكى تەرىپىدىن توسۇۋېتىلدى" -#: ../xfce4-tips/main.c:338 -msgid "Next" -msgstr "كېيىنكىسى" +#: ../xfce4-session/xfsm-shutdown.c:623 +#, c-format +msgid "Unknown shutdown method %d" +msgstr "نامەلۇم توكنى ئۈز ئۇسۇلى %d" -#: ../xfce4-session-logout/main.c:69 +#: ../xfce4-session-logout/main.c:67 msgid "Log out without displaying the logout dialog" -msgstr "تىزىمدىن چىقىش سوزلەشكۇسىنى چىقارمايلا تىزىمدىن چىق" +msgstr "چىقىش سۆزلەشكۈسىنى چىقارمايلا چىق" -#: ../xfce4-session-logout/main.c:73 +#: ../xfce4-session-logout/main.c:71 msgid "Halt without displaying the logout dialog" -msgstr "تىزىمدىن چىقىش سوزلەشكۇسىنى چىقارمايلا توختات" +msgstr "تىزىمدىن چىقىش سۆزلەشكۈسىنى چىقارمايلا توختات" -#: ../xfce4-session-logout/main.c:77 +#: ../xfce4-session-logout/main.c:75 msgid "Reboot without displaying the logout dialog" -msgstr "تىزىمدىن چىقىش سوزلەشكۇسىنى چىقارمايلا قايتا قوزغات" +msgstr "چىقىش سۆزلەشكۈسىنى چىقارمايلا قايتا قوزغات" -#: ../xfce4-session-logout/main.c:81 +#: ../xfce4-session-logout/main.c:79 msgid "Suspend without displaying the logout dialog" -msgstr "تىزىمدىن چىقىش سوزلەشكۇسىنى چىقارمايلا ئارام ئال" +msgstr "چىقىش سۆزلەشكۈسىنى چىقارمايلا توڭلات" -#: ../xfce4-session-logout/main.c:85 +#: ../xfce4-session-logout/main.c:83 msgid "Hibernate without displaying the logout dialog" -msgstr "تىزىمدىن چىقىش سوزلەشكۇسىنى چىقارمايلا ئوچەككە كىر" +msgstr "تىزىمدىن چىقىش سۆزلەشكۈسىنى چىقارمايلا ئۈچەككە كىر" -#: ../xfce4-session-logout/main.c:89 +#: ../xfce4-session-logout/main.c:87 msgid "Log out quickly; don't save the session" -msgstr "تىزىمدىن تەز چىقىش؛ ئەڭگىمەنى ساقلىمايدۇ" - -#: ../xfce4-session-logout/main.c:107 -msgid "Logout Error" -msgstr "چىقىشتا خاتالىق كۆرۈلدى" +msgstr "تىزىمدىن تېز چىقىش؛ ئەڭگىمەنى ساقلىمايدۇ" -#: ../xfce4-session-logout/main.c:110 ../xfce4-session-logout/main.c:117 +#: ../xfce4-session-logout/main.c:110 msgid "Unknown error" msgstr "نامەلۇم خاتالىق" -#: ../xfce4-session-logout/main.c:177 -msgid "Unable to contact D-Bus session bus." -msgstr "D-Bus session باش لىنىيىسىگە باغلىنالمىدى" - -#: ../xfce4-session-logout/main.c:189 -msgid "Failed to create new D-Bus message" -msgstr "يېڭى D-Bus ئۇچۇرى قۇرۇش مەغلۇپ بولدى" - -#: ../xfce4-session-logout/main.c:205 -msgid "Failed to receive a reply from the session manager" -msgstr "ئەڭگىمە باشقۇرغۇنىڭ جاۋابىنى تاپشۇرۇپ ئېلىش مەغلۇپ بولدى" +#: ../xfce4-session-logout/main.c:136 +msgid "Written by Benedikt Meurer " +msgstr "ئىجادىيەتچى Benedikt Meurer " + +#: ../xfce4-session-logout/main.c:137 +msgid "and Brian Tarricone ." +msgstr "ۋە Brian Tarricone ." + +#: ../xfce4-session-logout/main.c:147 +msgid "Unable to contact D-Bus session bus" +msgstr "D-Bus ئەڭگىمە باش لىنىيىسى بىلەن ئالاقە قىلغىلى بولمىدى" -#: ../xfce4-session-logout/main.c:213 +#: ../xfce4-session-logout/main.c:223 msgid "Received error while trying to log out" msgstr "سىستېمىدىن چىقىپ كېتەي دېگەندە خاتالىق كۆرۈلدى" +#: ../xfce4-session-logout/xfce4-session-logout.desktop.in.h:1 +msgid "Log Out" +msgstr "چىقىش" + #: ../xfce4-session-logout/xfce4-session-logout.desktop.in.h:2 msgid "Log out of the Xfce Desktop" -msgstr "Xfce ئۇستەل يۇزىدىن چىقىش" - -#: ../panel-plugin/xfsm-logout-plugin.desktop.in.h:1 -msgid "Session Menu" -msgstr "ئەڭگىمە تىزىملىكى" - -#: ../panel-plugin/xfsm-logout-plugin.desktop.in.h:2 -msgid "" -"Shows a menu with options to lock the screen, suspend, shutdown, or log out" -msgstr "" -"ئېكران قۇلۇپلا، ئارام ئال، توكنى ئۇز ياكى تىزىمدىن چىق دېگەن تاللانمىلىرى " -"بار تىزىملىكنى كۆرسەت" +msgstr "Xfce ئۈستەلئۈستىدىن چىقىش" #: ../settings/xfce-session-settings.desktop.in.h:1 -#: ../settings/xfce4-session-settings.glade.h:14 +#: ../settings/xfce4-session-settings.glade.h:15 msgid "Customize desktop startup and splash screen" -msgstr "ئۈستەليۈزىنى قوزغىتىش ۋە قوزغىلىش ئېكراننى ئۆزلەشتۈرۈش" +msgstr "ئۈستەلئۈستىنى قوزغىتىش ۋە قوزغىلىش ئېكراننى ئۆزلەشتۈرۈش" #: ../settings/xfce-session-settings.desktop.in.h:2 -#: ../settings/xfce4-session-settings.glade.h:27 +#: ../settings/xfce4-session-settings.glade.h:30 msgid "Session and Startup" msgstr "ئەڭگىمە ۋە قوزغىتىش" @@ -932,7 +792,7 @@ #: ../settings/xfce4-session-settings.glade.h:4 msgid "Homepage:" -msgstr "Homepage:" +msgstr "باش بەت:" #: ../settings/xfce4-session-settings.glade.h:5 msgid "Information" @@ -951,200 +811,135 @@ msgstr "ئەڭگىمە تاللىغۇ" #: ../settings/xfce4-session-settings.glade.h:9 +msgid "Shutdown" +msgstr "تاقاش" + +#: ../settings/xfce4-session-settings.glade.h:10 msgid "Version:" msgstr "نەشرى:" -#: ../settings/xfce4-session-settings.glade.h:10 +#: ../settings/xfce4-session-settings.glade.h:11 msgid "Ad_vanced" msgstr "ئالىي(_V)" -#: ../settings/xfce4-session-settings.glade.h:11 +#: ../settings/xfce4-session-settings.glade.h:12 msgid "Always save the session when logging out" -msgstr "سىستېمىدىن چىققان چاغدا session نى ھەمىشە ساقلىسۇن" +msgstr "سىستېمىدىن چىققان چاغدا ئەڭگىمەنى ھەمىشە ساقلايدۇ" -#: ../settings/xfce4-session-settings.glade.h:12 +#: ../settings/xfce4-session-settings.glade.h:13 msgid "Automatically save session on _logout" -msgstr "سىستېمىدىن چىققان چاغدا session نى ئاپتوماتىك ساقلا(_L)" +msgstr "سىستېمىدىن چىققان چاغدا ئەڭگىمەنى ئاپتوماتىك ساقلىسۇن(_L)" -#: ../settings/xfce4-session-settings.glade.h:13 +#: ../settings/xfce4-session-settings.glade.h:14 msgid "Con_figure" msgstr "تەڭشە(_F)" -#: ../settings/xfce4-session-settings.glade.h:15 +#: ../settings/xfce4-session-settings.glade.h:16 msgid "Demonstrates the selected splash screen" msgstr "تاللانغان قوزغىلىش ئېكرانىنى سىناق قىل" -#: ../settings/xfce4-session-settings.glade.h:16 +#: ../settings/xfce4-session-settings.glade.h:17 msgid "Display the session chooser every time Xfce starts" msgstr "ھەر قېتىم Xfce قوزغالغاندا ئەڭگىمە تاللىغۇنى كۆرسەت" -#: ../settings/xfce4-session-settings.glade.h:17 +#: ../settings/xfce4-session-settings.glade.h:18 +msgid "Empty the session cache" +msgstr "ئەڭگىمە غەملىكىنى تازىلايدۇ" + +#: ../settings/xfce4-session-settings.glade.h:19 msgid "Launch GN_OME services on startup" -msgstr "قوزغالغاندا GNOME مۇلازىمەتلىرىنى ئىجرا قىل(_O)" +msgstr "قوزغالغاندا GNOME مۇلازىمەتلىرىنى ئىجرا قىلسۇن(_O)" -#: ../settings/xfce4-session-settings.glade.h:18 +#: ../settings/xfce4-session-settings.glade.h:20 msgid "Launch _KDE services on startup" -msgstr "قوزغالغاندا KDE مۇلازىمەتلىرىنى ئىجرا قىل(_K)" +msgstr "قوزغالغاندا KDE مۇلازىمەتلىرىنى ئىجرا قىلسۇن(_K)" -#: ../settings/xfce4-session-settings.glade.h:19 +#: ../settings/xfce4-session-settings.glade.h:21 msgid "Manage _remote applications" -msgstr "يىراقتىن باشقۇرۇلىدىغان پروگراممىلارنى باشقۇر(_R)" +msgstr "يىراقتىن باشقۇرۇلىدىغان پروگراممىلارنى باشقۇرسۇن(_R)" -#: ../settings/xfce4-session-settings.glade.h:20 +#: ../settings/xfce4-session-settings.glade.h:22 msgid "" "Manage remote applications over the network (this may be a security risk)" -msgstr "" -"توردىكى يىراقتىن باشقۇرۇلىدىغان پروگراممىلارنى باشقۇرىدۇ(بىخەتەرلىك جەھەتتە " -"خەتىرى بار)" +msgstr "توردىكى يىراقتىن باشقۇرۇلىدىغان پروگراممىلارنى باشقۇرىدۇ(بىخەتەرلىك جەھەتتە خەتىرى بار)" -#: ../settings/xfce4-session-settings.glade.h:21 +#: ../settings/xfce4-session-settings.glade.h:23 msgid "Opens the configuration panel for the selected splash screen" -msgstr "تاللانغان قوزغىلىش ئېكرانىنىڭ تەڭشەك panel نى ئاچىدۇ" +msgstr "تاللانغان قوزغىلىش ئېكرانىنىڭ تەڭشەك كۆزنىكىنى ئاچىدۇ" -#: ../settings/xfce4-session-settings.glade.h:22 +#: ../settings/xfce4-session-settings.glade.h:24 msgid "Prompt for confirmation when logging out" msgstr "سىستېمىدىن چىقىدىغان چاغدا كۆرسەتمە چىقار" -#: ../settings/xfce4-session-settings.glade.h:23 +#: ../settings/xfce4-session-settings.glade.h:25 msgid "Quit the program, and remove it from the session" msgstr "پروگراممىنى ئاخىرلاشتۇرۇپ، ئەڭگىمەدىن ئۆچۈرىدۇ" -#: ../settings/xfce4-session-settings.glade.h:24 +#: ../settings/xfce4-session-settings.glade.h:26 +msgid "Run xflock4 before suspending or hibernating the system" +msgstr "سىستېمىنى توڭلىتىش ياكى ئۇخلىتىشتىن ئاۋۋال xflock4 نى ئىجرا قىلسۇن" + +#: ../settings/xfce4-session-settings.glade.h:27 msgid "S_plash" msgstr "قوزغىلىش ئېكرانى(_S)" -#: ../settings/xfce4-session-settings.glade.h:25 +#: ../settings/xfce4-session-settings.glade.h:28 msgid "Save Sessio_n" -msgstr "ئەڭگىمە نى ساقلا(_N)" +msgstr "ئەڭگىمەنى ساقلا(_N)" -#: ../settings/xfce4-session-settings.glade.h:26 +#: ../settings/xfce4-session-settings.glade.h:29 msgid "Saving Session" -msgstr "ئەڭگىمەنى ساقلاۋاتىدۇ" +msgstr "ئەڭگىمەنى ساقلاش" -#: ../settings/xfce4-session-settings.glade.h:28 -msgid "" -"Start GNOME services, such as gnome-keyring and the GNOME accessibility " -"framework" -msgstr "" -"gnome-keyring ۋە GNOME accessibility framework قاتارلىق GNOME " -"مۇلازىمەتلىرىنى قوزغات" +#: ../settings/xfce4-session-settings.glade.h:31 +msgid "Start GNOME services, such as gnome-keyring" +msgstr "گىنومنىڭ gnome-keyring دېگەندەك مۇلازىمەتلىرىنى قوزغاتسۇن" -#: ../settings/xfce4-session-settings.glade.h:29 -msgid "Start KDE services, such as \"kdeinit,\" DCOP, and ARTS" -msgstr "\"kdeinit\"، DCOP، ARTS قاتارلىق KDE مۇلازىمەتلىرىنى قوزغات" +#: ../settings/xfce4-session-settings.glade.h:32 +msgid "Start KDE services, such as kdeinit" +msgstr "ك د ئە(KDE) kdeinit دېگەندەك مۇلازىمەتلىرىنى قوزغاتسۇن" -#: ../settings/xfce4-session-settings.glade.h:30 +#: ../settings/xfce4-session-settings.glade.h:33 msgid "" "These applications are a part of the currently-running session, and can be " "saved when you log out. Changes below will only take effect when the " "session is saved." -msgstr "" -"بۇ پروگراممىلار ھازىرقى session نىڭ بىر قىسمىدۇر. سىستېمىدىن چىققان چاغدا " -"ساقلىۋېلىشقا بولىدۇ. تۆۋەندىكى ئۆزگىرىشلەر session دىلا ئاندىن كۈچكە ئىگە " -"بولىدۇ." +msgstr "بۇ پروگراممىلار ھازىرقى ئەڭگىمەنىڭ بىر قىسمىدۇر. سىستېمىدىن چىققان چاغدا ساقلىۋېلىشقا بولىدۇ. تۆۋەندىكى ئۆزگىرىشلەر ئەڭگىمەدىلا ئاندىن كۈچكە ئىگە بولىدۇ." -#: ../settings/xfce4-session-settings.glade.h:31 +#: ../settings/xfce4-session-settings.glade.h:34 msgid "" "Your session is being saved. If you do not wish to wait, you may close this " "window." -msgstr "" -"session ساقلىنىۋاتىدۇ. ساقلاپ تۇرغۇڭىز كەلمىسە بۇ كۆزنەكنى تاقىۋەتسىڭىزلا " -"بولىدۇ." +msgstr "ئەڭگىمە ساقلىنىۋاتىدۇ. كۈتۈپ تۇرغۇڭىز كەلمىسە بۇ كۆزنەكنى تاقىۋەتسىڭىزلا بولىدۇ." -#: ../settings/xfce4-session-settings.glade.h:32 +#: ../settings/xfce4-session-settings.glade.h:35 +msgid "_Clear saved sessions" +msgstr "ساقلانغان ئەڭگىمەلەرنى ئۆچۈر(_C)" + +#: ../settings/xfce4-session-settings.glade.h:36 msgid "_Display chooser on login" -msgstr "تىزىمغا كىرگەندە تاللىغۇنى كۆرسەت(_D)" +msgstr "كىرگەندە تاللىغۇنى كۆرسەت(_D)" -#: ../settings/xfce4-session-settings.glade.h:33 +#: ../settings/xfce4-session-settings.glade.h:37 msgid "_General" msgstr "ئادەتتىكى(_G)" -#: ../settings/xfce4-session-settings.glade.h:34 +#: ../settings/xfce4-session-settings.glade.h:38 +msgid "_Lock screen before sleep" +msgstr "ئۇخلاشتىن ئاۋۋال ئېكراننى قۇلۇپلىسۇن(_L)" + +#: ../settings/xfce4-session-settings.glade.h:39 msgid "_Prompt on logout" msgstr "سىستېمىدىن چىققاندا كۆرسەتمە چىقار(_P)" -#: ../settings/xfce4-session-settings.glade.h:36 +#: ../settings/xfce4-session-settings.glade.h:41 msgid "_Session" msgstr "ئەڭگىمە(_S)" -#: ../settings/xfce4-session-settings.glade.h:37 +#: ../settings/xfce4-session-settings.glade.h:42 msgid "_Test" msgstr "سىناق(_T)" -#: ../settings/xfce4-session-settings.glade.h:38 +#: ../settings/xfce4-session-settings.glade.h:43 msgid "label" msgstr "ئەن" - -#: ../xfce4-tips/xfce4-tips-autostart.desktop.in.h:1 -msgid "Tips and tricks" -msgstr "ئەسكەرتمە ۋە ھۈنەرلەر" - -#: ../xfce4-tips/xfce4-tips-autostart.desktop.in.h:2 -msgid "xfce4-tips" -msgstr "Xfce4 ھۈنەرلىرى" - -#~ msgid "Terminate \"%s\"" -#~ msgstr "\"%s\" نى ئاخىرلاشتۇر" - -#~ msgid "No HAL method for command %d" -#~ msgstr "بۇيرۇق %d دا HAL method يوق ئىكەن" - -#~ msgid "" -#~ "Program \"sudo\" was not found. You will not be able to shutdown your " -#~ "system from within Xfce." -#~ msgstr "" -#~ "پروگرامما \"sudo\" تېپىلمىدى. Xfce دە تۇرۇپ سىستېمىنىڭ توكىنى ئۈزەلمەيسىز." - -#~ msgid "Unable to create parent pipe: %s" -#~ msgstr "ئاتا pipe نى قۇرغىلى بولمىدى: %s" - -#~ msgid "Unable to create child pipe: %s" -#~ msgstr "بالا pipe نى قۇرغىلى بولمىدى: %s" - -#~ msgid "Unable to fork sudo helper: %s" -#~ msgstr "sudo helper نى fork قىلغىلى بولمىدى: %s" - -#~ msgid "Unable to read response from sudo helper: %s" -#~ msgstr "sudo helper نىڭ جاۋابىنى ئوقۇغىلى بولمىدى: %s" - -#~ msgid "Unable to open parent pipe: %s" -#~ msgstr "ئاتا pipe نى ئاچقىلى بولمىدى: %s" - -#~ msgid "Unable to open child pipe: %s" -#~ msgstr "بالا pipe نى ئاچقىلى بولمىدى: %s" - -#~ msgid "Got unexpected reply from sudo shutdown helper" -#~ msgstr "sudo shutdown helper دىن ئويلىمىغان جاۋاب تاپشۇرۇۋالدى" - -#~ msgid "" -#~ "Suspend and Hibernate are only supported through HAL, which is unavailable" -#~ msgstr "" -#~ "ئارام ئېلىش ۋە ئۈچەككە كىرىشنى پەقەتلا HAL نىڭ ياردىمى ئارقىلىقلا قىلغىلى " -#~ "بولىدۇ. بىراق ئۇ ھازىر چەكلەنگەن ئىكەن." - -#~ msgid "Xfce Session Manager" -#~ msgstr "Xfce ئەڭگىمە باشقۇرغۇ" - -#~ msgid "Session Error" -#~ msgstr "ئەڭگىمە خاتالىقى" - -#~ msgid "Session Settings" -#~ msgstr "ئەڭگىمە تەڭشىكى" - -#~ msgid "Internal Error" -#~ msgstr "内部エラー" - -#~ msgid "This is likely a problem with your Xfce installation" -#~ msgstr "これは Xfce のインストールの問題と思われます" - -#~ msgid "Unexpected error from HAL" -#~ msgstr "HAL から予期せぬエラーが返されました" - -#~ msgid "gtk-close" -#~ msgstr "閉じる" - -#~ msgid "gtk-help" -#~ msgstr "ヘルプ" - -#~ msgid "Invalid shutdown type" -#~ msgstr "توكنى ئۇزنىڭ تىپى ئىناۋەتسىز" diff -Nru xfce4-session-4.10.0/scripts/Makefile.in xfce4-session-4.10.1/scripts/Makefile.in --- xfce4-session-4.10.0/scripts/Makefile.in 2012-04-28 20:43:33.000000000 +0000 +++ xfce4-session-4.10.1/scripts/Makefile.in 2013-05-05 15:33:59.000000000 +0000 @@ -1,9 +1,8 @@ -# Makefile.in generated by automake 1.11.5 from Makefile.am. +# Makefile.in generated by automake 1.13.1 from Makefile.am. # @configure_input@ -# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software -# Foundation, Inc. +# Copyright (C) 1994-2012 Free Software Foundation, Inc. + # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -53,13 +52,13 @@ build_triplet = @build@ host_triplet = @host@ subdir = scripts -DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \ +DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \ $(srcdir)/xinitrc.in.in ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -am__aclocal_m4_deps = $(top_srcdir)/configure.in +am__aclocal_m4_deps = $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) -mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs +mkinstalldirs = $(install_sh) -d CONFIG_HEADER = $(top_builddir)/config.h CONFIG_CLEAN_FILES = xinitrc.in CONFIG_CLEAN_VPATH_FILES = @@ -93,12 +92,18 @@ am__installdirs = "$(DESTDIR)$(bindir)" "$(DESTDIR)$(autostartdir)" \ "$(DESTDIR)$(conffilesdir)" SCRIPTS = $(bin_SCRIPTS) +AM_V_P = $(am__v_P_@AM_V@) +am__v_P_ = $(am__v_P_@AM_DEFAULT_V@) +am__v_P_0 = false +am__v_P_1 = : AM_V_GEN = $(am__v_GEN_@AM_V@) am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) -am__v_GEN_0 = @echo " GEN " $@; +am__v_GEN_0 = @echo " GEN " $@; +am__v_GEN_1 = AM_V_at = $(am__v_at_@AM_V@) am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) am__v_at_0 = @ +am__v_at_1 = SOURCES = DIST_SOURCES = am__can_run_installinfo = \ @@ -107,6 +112,7 @@ *) (install-info --version) >/dev/null 2>&1;; \ esac DATA = $(autostart_DATA) $(conffiles_DATA) +am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP) DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) ACLOCAL = @ACLOCAL@ ALL_LINGUAS = @ALL_LINGUAS@ @@ -152,10 +158,6 @@ GMODULE_VERSION = @GMODULE_VERSION@ GMOFILES = @GMOFILES@ GMSGFMT = @GMSGFMT@ -GNOME_KEYRING_CFLAGS = @GNOME_KEYRING_CFLAGS@ -GNOME_KEYRING_LIBS = @GNOME_KEYRING_LIBS@ -GNOME_KEYRING_REQUIRED_VERSION = @GNOME_KEYRING_REQUIRED_VERSION@ -GNOME_KEYRING_VERSION = @GNOME_KEYRING_VERSION@ GREP = @GREP@ GTK_CFLAGS = @GTK_CFLAGS@ GTK_LIBS = @GTK_LIBS@ @@ -240,6 +242,10 @@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ STRIP = @STRIP@ +SYSTEMD_CFLAGS = @SYSTEMD_CFLAGS@ +SYSTEMD_LIBS = @SYSTEMD_LIBS@ +SYSTEMD_REQUIRED_VERSION = @SYSTEMD_REQUIRED_VERSION@ +SYSTEMD_VERSION = @SYSTEMD_VERSION@ USE_NLS = @USE_NLS@ VERSION = @VERSION@ XFCE_GLADE_CATALOG_PATH = @XFCE_GLADE_CATALOG_PATH@ @@ -461,11 +467,11 @@ @list='$(conffiles_DATA)'; test -n "$(conffilesdir)" || list=; \ files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \ dir='$(DESTDIR)$(conffilesdir)'; $(am__uninstall_files_from_dir) -tags: TAGS -TAGS: +tags TAGS: + +ctags CTAGS: -ctags: CTAGS -CTAGS: +cscope cscopelist: distdir: $(DISTFILES) @@ -606,18 +612,18 @@ .MAKE: install-am install-strip .PHONY: all all-am check check-am clean clean-generic clean-libtool \ - distclean distclean-generic distclean-libtool distdir dvi \ - dvi-am html html-am info info-am install install-am \ - install-autostartDATA install-binSCRIPTS install-conffilesDATA \ - install-data install-data-am install-dvi install-dvi-am \ - install-exec install-exec-am install-html install-html-am \ - install-info install-info-am install-man install-pdf \ - install-pdf-am install-ps install-ps-am install-strip \ - installcheck installcheck-am installdirs maintainer-clean \ - maintainer-clean-generic mostlyclean mostlyclean-generic \ - mostlyclean-libtool pdf pdf-am ps ps-am uninstall uninstall-am \ - uninstall-autostartDATA uninstall-binSCRIPTS \ - uninstall-conffilesDATA + cscopelist-am ctags-am distclean distclean-generic \ + distclean-libtool distdir dvi dvi-am html html-am info info-am \ + install install-am install-autostartDATA install-binSCRIPTS \ + install-conffilesDATA install-data install-data-am install-dvi \ + install-dvi-am install-exec install-exec-am install-html \ + install-html-am install-info install-info-am install-man \ + install-pdf install-pdf-am install-ps install-ps-am \ + install-strip installcheck installcheck-am installdirs \ + maintainer-clean maintainer-clean-generic mostlyclean \ + mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ + tags-am uninstall uninstall-am uninstall-autostartDATA \ + uninstall-binSCRIPTS uninstall-conffilesDATA startxfce4: Makefile $(srcdir)/startxfce4.in diff -Nru xfce4-session-4.10.0/settings/Makefile.in xfce4-session-4.10.1/settings/Makefile.in --- xfce4-session-4.10.0/settings/Makefile.in 2012-04-28 20:43:33.000000000 +0000 +++ xfce4-session-4.10.1/settings/Makefile.in 2013-05-05 15:33:59.000000000 +0000 @@ -1,9 +1,8 @@ -# Makefile.in generated by automake 1.11.5 from Makefile.am. +# Makefile.in generated by automake 1.13.1 from Makefile.am. # @configure_input@ -# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software -# Foundation, Inc. +# Copyright (C) 1994-2012 Free Software Foundation, Inc. + # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -54,12 +53,13 @@ host_triplet = @host@ bin_PROGRAMS = xfce4-session-settings$(EXEEXT) subdir = settings -DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in +DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \ + $(top_srcdir)/depcomp ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -am__aclocal_m4_deps = $(top_srcdir)/configure.in +am__aclocal_m4_deps = $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) -mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs +mkinstalldirs = $(install_sh) -d CONFIG_HEADER = $(top_builddir)/config.h CONFIG_CLEAN_FILES = CONFIG_CLEAN_VPATH_FILES = @@ -80,10 +80,23 @@ AM_V_lt = $(am__v_lt_@AM_V@) am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@) am__v_lt_0 = --silent +am__v_lt_1 = xfce4_session_settings_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC \ $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CCLD) \ $(xfce4_session_settings_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \ $(LDFLAGS) -o $@ +AM_V_P = $(am__v_P_@AM_V@) +am__v_P_ = $(am__v_P_@AM_DEFAULT_V@) +am__v_P_0 = false +am__v_P_1 = : +AM_V_GEN = $(am__v_GEN_@AM_V@) +am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) +am__v_GEN_0 = @echo " GEN " $@; +am__v_GEN_1 = +AM_V_at = $(am__v_at_@AM_V@) +am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) +am__v_at_0 = @ +am__v_at_1 = DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir) depcomp = $(SHELL) $(top_srcdir)/depcomp am__depfiles_maybe = depfiles @@ -96,20 +109,16 @@ $(AM_CFLAGS) $(CFLAGS) AM_V_CC = $(am__v_CC_@AM_V@) am__v_CC_ = $(am__v_CC_@AM_DEFAULT_V@) -am__v_CC_0 = @echo " CC " $@; -AM_V_at = $(am__v_at_@AM_V@) -am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) -am__v_at_0 = @ +am__v_CC_0 = @echo " CC " $@; +am__v_CC_1 = CCLD = $(CC) LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \ $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ $(AM_LDFLAGS) $(LDFLAGS) -o $@ AM_V_CCLD = $(am__v_CCLD_@AM_V@) am__v_CCLD_ = $(am__v_CCLD_@AM_DEFAULT_V@) -am__v_CCLD_0 = @echo " CCLD " $@; -AM_V_GEN = $(am__v_GEN_@AM_V@) -am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) -am__v_GEN_0 = @echo " GEN " $@; +am__v_CCLD_0 = @echo " CCLD " $@; +am__v_CCLD_1 = SOURCES = $(xfce4_session_settings_SOURCES) DIST_SOURCES = $(xfce4_session_settings_SOURCES) am__can_run_installinfo = \ @@ -145,6 +154,23 @@ $(am__cd) "$$dir" && rm -f $$files; }; \ } DATA = $(desktop_DATA) $(settings_DATA) +am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP) +# Read a list of newline-separated strings from the standard input, +# and print each of them once, without duplicates. Input order is +# *not* preserved. +am__uniquify_input = $(AWK) '\ + BEGIN { nonempty = 0; } \ + { items[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in items) print i; }; } \ +' +# Make sure the list of sources is unique. This is necessary because, +# e.g., the same source file might be shared among _SOURCES variables +# for different programs/libraries. +am__define_uniq_tagged_files = \ + list='$(am__tagged_files)'; \ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | $(am__uniquify_input)` ETAGS = etags CTAGS = ctags DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) @@ -192,10 +218,6 @@ GMODULE_VERSION = @GMODULE_VERSION@ GMOFILES = @GMOFILES@ GMSGFMT = @GMSGFMT@ -GNOME_KEYRING_CFLAGS = @GNOME_KEYRING_CFLAGS@ -GNOME_KEYRING_LIBS = @GNOME_KEYRING_LIBS@ -GNOME_KEYRING_REQUIRED_VERSION = @GNOME_KEYRING_REQUIRED_VERSION@ -GNOME_KEYRING_VERSION = @GNOME_KEYRING_VERSION@ GREP = @GREP@ GTK_CFLAGS = @GTK_CFLAGS@ GTK_LIBS = @GTK_LIBS@ @@ -280,6 +302,10 @@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ STRIP = @STRIP@ +SYSTEMD_CFLAGS = @SYSTEMD_CFLAGS@ +SYSTEMD_LIBS = @SYSTEMD_LIBS@ +SYSTEMD_REQUIRED_VERSION = @SYSTEMD_REQUIRED_VERSION@ +SYSTEMD_VERSION = @SYSTEMD_VERSION@ USE_NLS = @USE_NLS@ VERSION = @VERSION@ XFCE_GLADE_CATALOG_PATH = @XFCE_GLADE_CATALOG_PATH@ @@ -456,10 +482,12 @@ fi; \ for p in $$list; do echo "$$p $$p"; done | \ sed 's/$(EXEEXT)$$//' | \ - while read p p1; do if test -f $$p || test -f $$p1; \ - then echo "$$p"; echo "$$p"; else :; fi; \ + while read p p1; do if test -f $$p \ + || test -f $$p1 \ + ; then echo "$$p"; echo "$$p"; else :; fi; \ done | \ - sed -e 'p;s,.*/,,;n;h' -e 's|.*|.|' \ + sed -e 'p;s,.*/,,;n;h' \ + -e 's|.*|.|' \ -e 'p;x;s,.*/,,;s/$(EXEEXT)$$//;$(transform);s/$$/$(EXEEXT)/' | \ sed 'N;N;N;s,\n, ,g' | \ $(AWK) 'BEGIN { files["."] = ""; dirs["."] = 1 } \ @@ -480,7 +508,8 @@ @list='$(bin_PROGRAMS)'; test -n "$(bindir)" || list=; \ files=`for p in $$list; do echo "$$p"; done | \ sed -e 'h;s,^.*/,,;s/$(EXEEXT)$$//;$(transform)' \ - -e 's/$$/$(EXEEXT)/' `; \ + -e 's/$$/$(EXEEXT)/' \ + `; \ test -n "$$list" || exit 0; \ echo " ( cd '$(DESTDIR)$(bindir)' && rm -f" $$files ")"; \ cd "$(DESTDIR)$(bindir)" && rm -f $$files @@ -693,26 +722,15 @@ files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \ dir='$(DESTDIR)$(settingsdir)'; $(am__uninstall_files_from_dir) -ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ - mkid -fID $$unique -tags: TAGS +ID: $(am__tagged_files) + $(am__define_uniq_tagged_files); mkid -fID $$unique +tags: tags-am +TAGS: tags -TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) +tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) set x; \ here=`pwd`; \ - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ + $(am__define_uniq_tagged_files); \ shift; \ if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \ test -n "$$unique" || unique=$$empty_fix; \ @@ -724,15 +742,11 @@ $$unique; \ fi; \ fi -ctags: CTAGS -CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ +ctags: ctags-am + +CTAGS: ctags +ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) + $(am__define_uniq_tagged_files); \ test -z "$(CTAGS_ARGS)$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ $$unique @@ -741,6 +755,21 @@ here=`$(am__cd) $(top_builddir) && pwd` \ && $(am__cd) $(top_srcdir) \ && gtags -i $(GTAGS_ARGS) "$$here" +cscopelist: cscopelist-am + +cscopelist-am: $(am__tagged_files) + list='$(am__tagged_files)'; \ + case "$(srcdir)" in \ + [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \ + *) sdir=$(subdir)/$(srcdir) ;; \ + esac; \ + for i in $$list; do \ + if test -f "$$i"; then \ + echo "$(subdir)/$$i"; \ + else \ + echo "$$sdir/$$i"; \ + fi; \ + done >> $(top_builddir)/cscope.files distclean-tags: -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags @@ -889,19 +918,20 @@ .MAKE: all check install install-am install-strip -.PHONY: CTAGS GTAGS all all-am check check-am clean clean-binPROGRAMS \ - clean-generic clean-libtool ctags distclean distclean-compile \ - distclean-generic distclean-libtool distclean-tags distdir dvi \ - dvi-am html html-am info info-am install install-am \ - install-binPROGRAMS install-data install-data-am \ - install-desktopDATA install-dvi install-dvi-am install-exec \ - install-exec-am install-html install-html-am install-info \ - install-info-am install-man install-pdf install-pdf-am \ - install-ps install-ps-am install-settingsDATA install-strip \ - installcheck installcheck-am installdirs maintainer-clean \ +.PHONY: CTAGS GTAGS TAGS all all-am check check-am clean \ + clean-binPROGRAMS clean-generic clean-libtool cscopelist-am \ + ctags ctags-am distclean distclean-compile distclean-generic \ + distclean-libtool distclean-tags distdir dvi dvi-am html \ + html-am info info-am install install-am install-binPROGRAMS \ + install-data install-data-am install-desktopDATA install-dvi \ + install-dvi-am install-exec install-exec-am install-html \ + install-html-am install-info install-info-am install-man \ + install-pdf install-pdf-am install-ps install-ps-am \ + install-settingsDATA install-strip installcheck \ + installcheck-am installdirs maintainer-clean \ maintainer-clean-generic mostlyclean mostlyclean-compile \ mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ - tags uninstall uninstall-am uninstall-binPROGRAMS \ + tags tags-am uninstall uninstall-am uninstall-binPROGRAMS \ uninstall-desktopDATA uninstall-settingsDATA diff -Nru xfce4-session-4.10.0/xfce4-session/Makefile.am xfce4-session-4.10.1/xfce4-session/Makefile.am --- xfce4-session-4.10.0/xfce4-session/Makefile.am 2012-04-28 20:43:27.000000000 +0000 +++ xfce4-session-4.10.1/xfce4-session/Makefile.am 2013-05-05 15:33:55.000000000 +0000 @@ -1,5 +1,5 @@ -INCLUDES = \ +AM_CPPFLAGS = \ -I$(top_builddir) \ -I$(top_srcdir) \ -DG_LOG_DOMAIN=\"xfce4-session\" \ @@ -38,8 +38,6 @@ xfsm-compat-gnome.h \ xfsm-compat-kde.c \ xfsm-compat-kde.h \ - xfsm-consolekit.c \ - xfsm-consolekit.h \ xfsm-dns.c \ xfsm-dns.h \ xfsm-error.c \ @@ -65,14 +63,24 @@ xfsm-upower.c \ xfsm-upower.h +if HAVE_SYSTEMD +xfce4_session_SOURCES += \ + xfsm-systemd.c \ + xfsm-systemd.h +else +xfce4_session_SOURCES += \ + xfsm-consolekit.c \ + xfsm-consolekit.h +endif + xfce4_session_CFLAGS = \ - $(GNOME_KEYRING_CFLAGS) \ $(LIBSM_CFLAGS) \ $(LIBX11_CFLAGS) \ $(LIBXFCE4UI_CFLAGS) \ $(DBUS_CFLAGS) \ $(DBUS_GLIB_CFLAGS) \ $(LIBWNCK_CFLAGS) \ + $(SYSTEMD_CFLAGS) \ $(XFCONF_CFLAGS) \ $(GMODULE_CFLAGS) \ $(PLATFORM_CFLAGS) @@ -92,8 +100,8 @@ $(DBUS_LIBS) \ $(DBUS_GLIB_LIBS) \ $(LIBWNCK_LIBS) \ + $(SYSTEMD_LIBS) \ $(XFCONF_LIBS) \ - $(GNOME_KEYRING_LIBS) \ -lm xfce4_session_DEPENDENCIES = \ diff -Nru xfce4-session-4.10.0/xfce4-session/Makefile.in xfce4-session-4.10.1/xfce4-session/Makefile.in --- xfce4-session-4.10.0/xfce4-session/Makefile.in 2012-04-28 20:43:34.000000000 +0000 +++ xfce4-session-4.10.1/xfce4-session/Makefile.in 2013-05-05 15:33:59.000000000 +0000 @@ -1,9 +1,8 @@ -# Makefile.in generated by automake 1.11.5 from Makefile.am. +# Makefile.in generated by automake 1.13.1 from Makefile.am. # @configure_input@ -# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software -# Foundation, Inc. +# Copyright (C) 1994-2012 Free Software Foundation, Inc. + # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -52,19 +51,46 @@ build_triplet = @build@ host_triplet = @host@ bin_PROGRAMS = xfce4-session$(EXEEXT) +@HAVE_SYSTEMD_TRUE@am__append_1 = \ +@HAVE_SYSTEMD_TRUE@ xfsm-systemd.c \ +@HAVE_SYSTEMD_TRUE@ xfsm-systemd.h + +@HAVE_SYSTEMD_FALSE@am__append_2 = \ +@HAVE_SYSTEMD_FALSE@ xfsm-consolekit.c \ +@HAVE_SYSTEMD_FALSE@ xfsm-consolekit.h + subdir = xfce4-session -DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in +DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \ + $(top_srcdir)/depcomp ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -am__aclocal_m4_deps = $(top_srcdir)/configure.in +am__aclocal_m4_deps = $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) -mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs +mkinstalldirs = $(install_sh) -d CONFIG_HEADER = $(top_builddir)/config.h CONFIG_CLEAN_FILES = CONFIG_CLEAN_VPATH_FILES = am__installdirs = "$(DESTDIR)$(bindir)" "$(DESTDIR)$(man1dir)" PROGRAMS = $(bin_PROGRAMS) +am__xfce4_session_SOURCES_DIST = xfsm-chooser-icon.h \ + xfsm-client-dbus.h xfsm-manager-dbus.h xfsm-marshal.c \ + xfsm-marshal.h ice-layer.c ice-layer.h main.c sm-layer.c \ + sm-layer.h xfsm-chooser.c xfsm-chooser.h xfsm-client.c \ + xfsm-client.h xfsm-compat-gnome.c xfsm-compat-gnome.h \ + xfsm-compat-kde.c xfsm-compat-kde.h xfsm-dns.c xfsm-dns.h \ + xfsm-error.c xfsm-error.h xfsm-fadeout.c xfsm-fadeout.h \ + xfsm-global.c xfsm-global.h xfsm-legacy.c xfsm-legacy.h \ + xfsm-logout-dialog.c xfsm-logout-dialog.h xfsm-manager.c \ + xfsm-manager.h xfsm-properties.c xfsm-properties.h \ + xfsm-shutdown.c xfsm-shutdown.h xfsm-splash-screen.c \ + xfsm-splash-screen.h xfsm-startup.c xfsm-startup.h \ + xfsm-upower.c xfsm-upower.h xfsm-systemd.c xfsm-systemd.h \ + xfsm-consolekit.c xfsm-consolekit.h am__objects_1 = xfce4_session-xfsm-marshal.$(OBJEXT) +@HAVE_SYSTEMD_TRUE@am__objects_2 = \ +@HAVE_SYSTEMD_TRUE@ xfce4_session-xfsm-systemd.$(OBJEXT) +@HAVE_SYSTEMD_FALSE@am__objects_3 = \ +@HAVE_SYSTEMD_FALSE@ xfce4_session-xfsm-consolekit.$(OBJEXT) am_xfce4_session_OBJECTS = $(am__objects_1) \ xfce4_session-ice-layer.$(OBJEXT) xfce4_session-main.$(OBJEXT) \ xfce4_session-sm-layer.$(OBJEXT) \ @@ -72,7 +98,6 @@ xfce4_session-xfsm-client.$(OBJEXT) \ xfce4_session-xfsm-compat-gnome.$(OBJEXT) \ xfce4_session-xfsm-compat-kde.$(OBJEXT) \ - xfce4_session-xfsm-consolekit.$(OBJEXT) \ xfce4_session-xfsm-dns.$(OBJEXT) \ xfce4_session-xfsm-error.$(OBJEXT) \ xfce4_session-xfsm-fadeout.$(OBJEXT) \ @@ -84,15 +109,29 @@ xfce4_session-xfsm-shutdown.$(OBJEXT) \ xfce4_session-xfsm-splash-screen.$(OBJEXT) \ xfce4_session-xfsm-startup.$(OBJEXT) \ - xfce4_session-xfsm-upower.$(OBJEXT) + xfce4_session-xfsm-upower.$(OBJEXT) $(am__objects_2) \ + $(am__objects_3) xfce4_session_OBJECTS = $(am_xfce4_session_OBJECTS) am__DEPENDENCIES_1 = AM_V_lt = $(am__v_lt_@AM_V@) am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@) am__v_lt_0 = --silent +am__v_lt_1 = xfce4_session_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \ $(LIBTOOLFLAGS) --mode=link $(CCLD) $(xfce4_session_CFLAGS) \ $(CFLAGS) $(xfce4_session_LDFLAGS) $(LDFLAGS) -o $@ +AM_V_P = $(am__v_P_@AM_V@) +am__v_P_ = $(am__v_P_@AM_DEFAULT_V@) +am__v_P_0 = false +am__v_P_1 = : +AM_V_GEN = $(am__v_GEN_@AM_V@) +am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) +am__v_GEN_0 = @echo " GEN " $@; +am__v_GEN_1 = +AM_V_at = $(am__v_at_@AM_V@) +am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) +am__v_at_0 = @ +am__v_at_1 = DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir) depcomp = $(SHELL) $(top_srcdir)/depcomp am__depfiles_maybe = depfiles @@ -105,22 +144,18 @@ $(AM_CFLAGS) $(CFLAGS) AM_V_CC = $(am__v_CC_@AM_V@) am__v_CC_ = $(am__v_CC_@AM_DEFAULT_V@) -am__v_CC_0 = @echo " CC " $@; -AM_V_at = $(am__v_at_@AM_V@) -am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) -am__v_at_0 = @ +am__v_CC_0 = @echo " CC " $@; +am__v_CC_1 = CCLD = $(CC) LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \ $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ $(AM_LDFLAGS) $(LDFLAGS) -o $@ AM_V_CCLD = $(am__v_CCLD_@AM_V@) am__v_CCLD_ = $(am__v_CCLD_@AM_DEFAULT_V@) -am__v_CCLD_0 = @echo " CCLD " $@; -AM_V_GEN = $(am__v_GEN_@AM_V@) -am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) -am__v_GEN_0 = @echo " GEN " $@; +am__v_CCLD_0 = @echo " CCLD " $@; +am__v_CCLD_1 = SOURCES = $(xfce4_session_SOURCES) -DIST_SOURCES = $(xfce4_session_SOURCES) +DIST_SOURCES = $(am__xfce4_session_SOURCES_DIST) am__can_run_installinfo = \ case $$AM_UPDATE_INFO_DIR in \ n|no|NO) false;; \ @@ -156,6 +191,23 @@ man1dir = $(mandir)/man1 NROFF = nroff MANS = $(man_MANS) +am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP) +# Read a list of newline-separated strings from the standard input, +# and print each of them once, without duplicates. Input order is +# *not* preserved. +am__uniquify_input = $(AWK) '\ + BEGIN { nonempty = 0; } \ + { items[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in items) print i; }; } \ +' +# Make sure the list of sources is unique. This is necessary because, +# e.g., the same source file might be shared among _SOURCES variables +# for different programs/libraries. +am__define_uniq_tagged_files = \ + list='$(am__tagged_files)'; \ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | $(am__uniquify_input)` ETAGS = etags CTAGS = ctags DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) @@ -203,10 +255,6 @@ GMODULE_VERSION = @GMODULE_VERSION@ GMOFILES = @GMOFILES@ GMSGFMT = @GMSGFMT@ -GNOME_KEYRING_CFLAGS = @GNOME_KEYRING_CFLAGS@ -GNOME_KEYRING_LIBS = @GNOME_KEYRING_LIBS@ -GNOME_KEYRING_REQUIRED_VERSION = @GNOME_KEYRING_REQUIRED_VERSION@ -GNOME_KEYRING_VERSION = @GNOME_KEYRING_VERSION@ GREP = @GREP@ GTK_CFLAGS = @GTK_CFLAGS@ GTK_LIBS = @GTK_LIBS@ @@ -291,6 +339,10 @@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ STRIP = @STRIP@ +SYSTEMD_CFLAGS = @SYSTEMD_CFLAGS@ +SYSTEMD_LIBS = @SYSTEMD_LIBS@ +SYSTEMD_REQUIRED_VERSION = @SYSTEMD_REQUIRED_VERSION@ +SYSTEMD_VERSION = @SYSTEMD_VERSION@ USE_NLS = @USE_NLS@ VERSION = @VERSION@ XFCE_GLADE_CATALOG_PATH = @XFCE_GLADE_CATALOG_PATH@ @@ -362,7 +414,7 @@ top_build_prefix = @top_build_prefix@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ -INCLUDES = \ +AM_CPPFLAGS = \ -I$(top_builddir) \ -I$(top_srcdir) \ -DG_LOG_DOMAIN=\"xfce4-session\" \ @@ -382,57 +434,26 @@ xfsm-marshal.c \ xfsm-marshal.h -xfce4_session_SOURCES = \ - $(xfce4_session_built_sources) \ - ice-layer.c \ - ice-layer.h \ - main.c \ - sm-layer.c \ - sm-layer.h \ - xfsm-chooser.c \ - xfsm-chooser.h \ - xfsm-client.c \ - xfsm-client.h \ - xfsm-client-dbus.h \ - xfsm-compat-gnome.c \ - xfsm-compat-gnome.h \ - xfsm-compat-kde.c \ - xfsm-compat-kde.h \ - xfsm-consolekit.c \ - xfsm-consolekit.h \ - xfsm-dns.c \ - xfsm-dns.h \ - xfsm-error.c \ - xfsm-error.h \ - xfsm-fadeout.c \ - xfsm-fadeout.h \ - xfsm-global.c \ - xfsm-global.h \ - xfsm-legacy.c \ - xfsm-legacy.h \ - xfsm-logout-dialog.c \ - xfsm-logout-dialog.h \ - xfsm-manager.c \ - xfsm-manager.h \ - xfsm-properties.c \ - xfsm-properties.h \ - xfsm-shutdown.c \ - xfsm-shutdown.h \ - xfsm-splash-screen.c \ - xfsm-splash-screen.h \ - xfsm-startup.c \ - xfsm-startup.h \ - xfsm-upower.c \ - xfsm-upower.h - +xfce4_session_SOURCES = $(xfce4_session_built_sources) ice-layer.c \ + ice-layer.h main.c sm-layer.c sm-layer.h xfsm-chooser.c \ + xfsm-chooser.h xfsm-client.c xfsm-client.h xfsm-client-dbus.h \ + xfsm-compat-gnome.c xfsm-compat-gnome.h xfsm-compat-kde.c \ + xfsm-compat-kde.h xfsm-dns.c xfsm-dns.h xfsm-error.c \ + xfsm-error.h xfsm-fadeout.c xfsm-fadeout.h xfsm-global.c \ + xfsm-global.h xfsm-legacy.c xfsm-legacy.h xfsm-logout-dialog.c \ + xfsm-logout-dialog.h xfsm-manager.c xfsm-manager.h \ + xfsm-properties.c xfsm-properties.h xfsm-shutdown.c \ + xfsm-shutdown.h xfsm-splash-screen.c xfsm-splash-screen.h \ + xfsm-startup.c xfsm-startup.h xfsm-upower.c xfsm-upower.h \ + $(am__append_1) $(am__append_2) xfce4_session_CFLAGS = \ - $(GNOME_KEYRING_CFLAGS) \ $(LIBSM_CFLAGS) \ $(LIBX11_CFLAGS) \ $(LIBXFCE4UI_CFLAGS) \ $(DBUS_CFLAGS) \ $(DBUS_GLIB_CFLAGS) \ $(LIBWNCK_CFLAGS) \ + $(SYSTEMD_CFLAGS) \ $(XFCONF_CFLAGS) \ $(GMODULE_CFLAGS) \ $(PLATFORM_CFLAGS) @@ -452,8 +473,8 @@ $(DBUS_LIBS) \ $(DBUS_GLIB_LIBS) \ $(LIBWNCK_LIBS) \ + $(SYSTEMD_LIBS) \ $(XFCONF_LIBS) \ - $(GNOME_KEYRING_LIBS) \ -lm xfce4_session_DEPENDENCIES = \ @@ -516,10 +537,12 @@ fi; \ for p in $$list; do echo "$$p $$p"; done | \ sed 's/$(EXEEXT)$$//' | \ - while read p p1; do if test -f $$p || test -f $$p1; \ - then echo "$$p"; echo "$$p"; else :; fi; \ + while read p p1; do if test -f $$p \ + || test -f $$p1 \ + ; then echo "$$p"; echo "$$p"; else :; fi; \ done | \ - sed -e 'p;s,.*/,,;n;h' -e 's|.*|.|' \ + sed -e 'p;s,.*/,,;n;h' \ + -e 's|.*|.|' \ -e 'p;x;s,.*/,,;s/$(EXEEXT)$$//;$(transform);s/$$/$(EXEEXT)/' | \ sed 'N;N;N;s,\n, ,g' | \ $(AWK) 'BEGIN { files["."] = ""; dirs["."] = 1 } \ @@ -540,7 +563,8 @@ @list='$(bin_PROGRAMS)'; test -n "$(bindir)" || list=; \ files=`for p in $$list; do echo "$$p"; done | \ sed -e 'h;s,^.*/,,;s/$(EXEEXT)$$//;$(transform)' \ - -e 's/$$/$(EXEEXT)/' `; \ + -e 's/$$/$(EXEEXT)/' \ + `; \ test -n "$$list" || exit 0; \ echo " ( cd '$(DESTDIR)$(bindir)' && rm -f" $$files ")"; \ cd "$(DESTDIR)$(bindir)" && rm -f $$files @@ -583,6 +607,7 @@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/xfce4_session-xfsm-shutdown.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/xfce4_session-xfsm-splash-screen.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/xfce4_session-xfsm-startup.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/xfce4_session-xfsm-systemd.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/xfce4_session-xfsm-upower.Po@am__quote@ .c.o: @@ -718,20 +743,6 @@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ @am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(xfce4_session_CFLAGS) $(CFLAGS) -c -o xfce4_session-xfsm-compat-kde.obj `if test -f 'xfsm-compat-kde.c'; then $(CYGPATH_W) 'xfsm-compat-kde.c'; else $(CYGPATH_W) '$(srcdir)/xfsm-compat-kde.c'; fi` -xfce4_session-xfsm-consolekit.o: xfsm-consolekit.c -@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(xfce4_session_CFLAGS) $(CFLAGS) -MT xfce4_session-xfsm-consolekit.o -MD -MP -MF $(DEPDIR)/xfce4_session-xfsm-consolekit.Tpo -c -o xfce4_session-xfsm-consolekit.o `test -f 'xfsm-consolekit.c' || echo '$(srcdir)/'`xfsm-consolekit.c -@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/xfce4_session-xfsm-consolekit.Tpo $(DEPDIR)/xfce4_session-xfsm-consolekit.Po -@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='xfsm-consolekit.c' object='xfce4_session-xfsm-consolekit.o' libtool=no @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(xfce4_session_CFLAGS) $(CFLAGS) -c -o xfce4_session-xfsm-consolekit.o `test -f 'xfsm-consolekit.c' || echo '$(srcdir)/'`xfsm-consolekit.c - -xfce4_session-xfsm-consolekit.obj: xfsm-consolekit.c -@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(xfce4_session_CFLAGS) $(CFLAGS) -MT xfce4_session-xfsm-consolekit.obj -MD -MP -MF $(DEPDIR)/xfce4_session-xfsm-consolekit.Tpo -c -o xfce4_session-xfsm-consolekit.obj `if test -f 'xfsm-consolekit.c'; then $(CYGPATH_W) 'xfsm-consolekit.c'; else $(CYGPATH_W) '$(srcdir)/xfsm-consolekit.c'; fi` -@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/xfce4_session-xfsm-consolekit.Tpo $(DEPDIR)/xfce4_session-xfsm-consolekit.Po -@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='xfsm-consolekit.c' object='xfce4_session-xfsm-consolekit.obj' libtool=no @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(xfce4_session_CFLAGS) $(CFLAGS) -c -o xfce4_session-xfsm-consolekit.obj `if test -f 'xfsm-consolekit.c'; then $(CYGPATH_W) 'xfsm-consolekit.c'; else $(CYGPATH_W) '$(srcdir)/xfsm-consolekit.c'; fi` - xfce4_session-xfsm-dns.o: xfsm-dns.c @am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(xfce4_session_CFLAGS) $(CFLAGS) -MT xfce4_session-xfsm-dns.o -MD -MP -MF $(DEPDIR)/xfce4_session-xfsm-dns.Tpo -c -o xfce4_session-xfsm-dns.o `test -f 'xfsm-dns.c' || echo '$(srcdir)/'`xfsm-dns.c @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/xfce4_session-xfsm-dns.Tpo $(DEPDIR)/xfce4_session-xfsm-dns.Po @@ -900,6 +911,34 @@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ @am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(xfce4_session_CFLAGS) $(CFLAGS) -c -o xfce4_session-xfsm-upower.obj `if test -f 'xfsm-upower.c'; then $(CYGPATH_W) 'xfsm-upower.c'; else $(CYGPATH_W) '$(srcdir)/xfsm-upower.c'; fi` +xfce4_session-xfsm-systemd.o: xfsm-systemd.c +@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(xfce4_session_CFLAGS) $(CFLAGS) -MT xfce4_session-xfsm-systemd.o -MD -MP -MF $(DEPDIR)/xfce4_session-xfsm-systemd.Tpo -c -o xfce4_session-xfsm-systemd.o `test -f 'xfsm-systemd.c' || echo '$(srcdir)/'`xfsm-systemd.c +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/xfce4_session-xfsm-systemd.Tpo $(DEPDIR)/xfce4_session-xfsm-systemd.Po +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='xfsm-systemd.c' object='xfce4_session-xfsm-systemd.o' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(xfce4_session_CFLAGS) $(CFLAGS) -c -o xfce4_session-xfsm-systemd.o `test -f 'xfsm-systemd.c' || echo '$(srcdir)/'`xfsm-systemd.c + +xfce4_session-xfsm-systemd.obj: xfsm-systemd.c +@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(xfce4_session_CFLAGS) $(CFLAGS) -MT xfce4_session-xfsm-systemd.obj -MD -MP -MF $(DEPDIR)/xfce4_session-xfsm-systemd.Tpo -c -o xfce4_session-xfsm-systemd.obj `if test -f 'xfsm-systemd.c'; then $(CYGPATH_W) 'xfsm-systemd.c'; else $(CYGPATH_W) '$(srcdir)/xfsm-systemd.c'; fi` +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/xfce4_session-xfsm-systemd.Tpo $(DEPDIR)/xfce4_session-xfsm-systemd.Po +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='xfsm-systemd.c' object='xfce4_session-xfsm-systemd.obj' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(xfce4_session_CFLAGS) $(CFLAGS) -c -o xfce4_session-xfsm-systemd.obj `if test -f 'xfsm-systemd.c'; then $(CYGPATH_W) 'xfsm-systemd.c'; else $(CYGPATH_W) '$(srcdir)/xfsm-systemd.c'; fi` + +xfce4_session-xfsm-consolekit.o: xfsm-consolekit.c +@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(xfce4_session_CFLAGS) $(CFLAGS) -MT xfce4_session-xfsm-consolekit.o -MD -MP -MF $(DEPDIR)/xfce4_session-xfsm-consolekit.Tpo -c -o xfce4_session-xfsm-consolekit.o `test -f 'xfsm-consolekit.c' || echo '$(srcdir)/'`xfsm-consolekit.c +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/xfce4_session-xfsm-consolekit.Tpo $(DEPDIR)/xfce4_session-xfsm-consolekit.Po +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='xfsm-consolekit.c' object='xfce4_session-xfsm-consolekit.o' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(xfce4_session_CFLAGS) $(CFLAGS) -c -o xfce4_session-xfsm-consolekit.o `test -f 'xfsm-consolekit.c' || echo '$(srcdir)/'`xfsm-consolekit.c + +xfce4_session-xfsm-consolekit.obj: xfsm-consolekit.c +@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(xfce4_session_CFLAGS) $(CFLAGS) -MT xfce4_session-xfsm-consolekit.obj -MD -MP -MF $(DEPDIR)/xfce4_session-xfsm-consolekit.Tpo -c -o xfce4_session-xfsm-consolekit.obj `if test -f 'xfsm-consolekit.c'; then $(CYGPATH_W) 'xfsm-consolekit.c'; else $(CYGPATH_W) '$(srcdir)/xfsm-consolekit.c'; fi` +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/xfce4_session-xfsm-consolekit.Tpo $(DEPDIR)/xfce4_session-xfsm-consolekit.Po +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='xfsm-consolekit.c' object='xfce4_session-xfsm-consolekit.obj' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(xfce4_session_CFLAGS) $(CFLAGS) -c -o xfce4_session-xfsm-consolekit.obj `if test -f 'xfsm-consolekit.c'; then $(CYGPATH_W) 'xfsm-consolekit.c'; else $(CYGPATH_W) '$(srcdir)/xfsm-consolekit.c'; fi` + mostlyclean-libtool: -rm -f *.lo @@ -949,26 +988,15 @@ -e 's,\.[0-9a-z]*$$,,;$(transform);G;s,\n,.,'`; \ dir='$(DESTDIR)$(man1dir)'; $(am__uninstall_files_from_dir) -ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ - mkid -fID $$unique -tags: TAGS +ID: $(am__tagged_files) + $(am__define_uniq_tagged_files); mkid -fID $$unique +tags: tags-am +TAGS: tags -TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) +tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) set x; \ here=`pwd`; \ - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ + $(am__define_uniq_tagged_files); \ shift; \ if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \ test -n "$$unique" || unique=$$empty_fix; \ @@ -980,15 +1008,11 @@ $$unique; \ fi; \ fi -ctags: CTAGS -CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ +ctags: ctags-am + +CTAGS: ctags +ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) + $(am__define_uniq_tagged_files); \ test -z "$(CTAGS_ARGS)$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ $$unique @@ -997,24 +1021,26 @@ here=`$(am__cd) $(top_builddir) && pwd` \ && $(am__cd) $(top_srcdir) \ && gtags -i $(GTAGS_ARGS) "$$here" +cscopelist: cscopelist-am + +cscopelist-am: $(am__tagged_files) + list='$(am__tagged_files)'; \ + case "$(srcdir)" in \ + [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \ + *) sdir=$(subdir)/$(srcdir) ;; \ + esac; \ + for i in $$list; do \ + if test -f "$$i"; then \ + echo "$(subdir)/$$i"; \ + else \ + echo "$$sdir/$$i"; \ + fi; \ + done >> $(top_builddir)/cscope.files distclean-tags: -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags distdir: $(DISTFILES) - @list='$(MANS)'; if test -n "$$list"; then \ - list=`for p in $$list; do \ - if test -f $$p; then d=; else d="$(srcdir)/"; fi; \ - if test -f "$$d$$p"; then echo "$$d$$p"; else :; fi; done`; \ - if test -n "$$list" && \ - grep 'ab help2man is required to generate this page' $$list >/dev/null; then \ - echo "error: found man pages containing the \`missing help2man' replacement text:" >&2; \ - grep -l 'ab help2man is required to generate this page' $$list | sed 's/^/ /' >&2; \ - echo " to fix them, install help2man, remove and regenerate the man pages;" >&2; \ - echo " typically \`make maintainer-clean' will remove them" >&2; \ - exit 1; \ - else :; fi; \ - else :; fi @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ list='$(DISTFILES)'; \ @@ -1159,20 +1185,20 @@ .MAKE: all check install install-am install-strip -.PHONY: CTAGS GTAGS all all-am check check-am clean clean-binPROGRAMS \ - clean-generic clean-libtool ctags distclean distclean-compile \ - distclean-generic distclean-libtool distclean-tags distdir dvi \ - dvi-am html html-am info info-am install install-am \ - install-binPROGRAMS install-data install-data-am install-dvi \ - install-dvi-am install-exec install-exec-am install-html \ - install-html-am install-info install-info-am install-man \ - install-man1 install-pdf install-pdf-am install-ps \ - install-ps-am install-strip installcheck installcheck-am \ - installdirs maintainer-clean maintainer-clean-generic \ - mostlyclean mostlyclean-compile mostlyclean-generic \ - mostlyclean-libtool pdf pdf-am ps ps-am tags uninstall \ - uninstall-am uninstall-binPROGRAMS uninstall-man \ - uninstall-man1 +.PHONY: CTAGS GTAGS TAGS all all-am check check-am clean \ + clean-binPROGRAMS clean-generic clean-libtool cscopelist-am \ + ctags ctags-am distclean distclean-compile distclean-generic \ + distclean-libtool distclean-tags distdir dvi dvi-am html \ + html-am info info-am install install-am install-binPROGRAMS \ + install-data install-data-am install-dvi install-dvi-am \ + install-exec install-exec-am install-html install-html-am \ + install-info install-info-am install-man install-man1 \ + install-pdf install-pdf-am install-ps install-ps-am \ + install-strip installcheck installcheck-am installdirs \ + maintainer-clean maintainer-clean-generic mostlyclean \ + mostlyclean-compile mostlyclean-generic mostlyclean-libtool \ + pdf pdf-am ps ps-am tags tags-am uninstall uninstall-am \ + uninstall-binPROGRAMS uninstall-man uninstall-man1 @MAINTAINER_MODE_TRUE@xfsm-chooser-icon.h: $(srcdir)/xfsm-chooser-icon.png diff -Nru xfce4-session-4.10.0/xfce4-session/main.c xfce4-session-4.10.1/xfce4-session/main.c --- xfce4-session-4.10.0/xfce4-session/main.c 2012-04-28 20:43:27.000000000 +0000 +++ xfce4-session-4.10.1/xfce4-session/main.c 2013-05-05 15:33:55.000000000 +0000 @@ -99,14 +99,14 @@ xfsm_enable_verbose (); /* pass correct DISPLAY to children, in case of --display in argv */ - xfce_setenv ("DISPLAY", gdk_display_get_name (gdk_display_get_default ()), TRUE); + g_setenv ("DISPLAY", gdk_display_get_name (gdk_display_get_default ()), TRUE); /* this is for compatibility with the GNOME Display Manager */ lang = g_getenv ("GDM_LANG"); if (lang != NULL && strlen (lang) > 0) { - xfce_setenv ("LANG", lang, TRUE); - xfce_unsetenv ("GDM_LANG"); + g_setenv ("LANG", lang, TRUE); + g_unsetenv ("GDM_LANG"); } /* check access to $ICEAUTHORITY or $HOME/.ICEauthority if unset */ diff -Nru xfce4-session-4.10.0/xfce4-session/sm-layer.c xfce4-session-4.10.1/xfce4-session/sm-layer.c --- xfce4-session-4.10.0/xfce4-session/sm-layer.c 2012-04-28 20:43:27.000000000 +0000 +++ xfce4-session-4.10.1/xfce4-session/sm-layer.c 2013-05-05 15:33:55.000000000 +0000 @@ -140,7 +140,7 @@ ice_setup_listeners (num_listeners, listen_objs, manager); network_idlist = IceComposeNetworkIdList (num_listeners, listen_objs); - xfce_setenv ("SESSION_MANAGER", network_idlist, TRUE); + g_setenv ("SESSION_MANAGER", network_idlist, TRUE); free (network_idlist); } diff -Nru xfce4-session-4.10.0/xfce4-session/xfsm-compat-gnome.c xfce4-session-4.10.1/xfce4-session/xfsm-compat-gnome.c --- xfce4-session-4.10.0/xfce4-session/xfsm-compat-gnome.c 2012-04-28 20:43:27.000000000 +0000 +++ xfce4-session-4.10.1/xfce4-session/xfsm-compat-gnome.c 2013-05-05 15:33:55.000000000 +0000 @@ -59,10 +59,6 @@ #include -#ifdef HAVE_GNOME_KEYRING -#include -#endif - #include #define GNOME_KEYRING_DAEMON "gnome-keyring-daemon" @@ -96,15 +92,17 @@ static void gnome_keyring_daemon_startup (void) { - GError *error = NULL; - gchar *sout; - gchar **lines; - gsize lineno; - gint status; - long pid; - gchar *pid_str; - gchar *end; - char *argv[3]; + GError *error = NULL; + gchar *sout; + gchar **lines; + gsize lineno; + gint status; + glong pid; + gchar *end; + gchar *argv[3]; + gchar *p; + gchar *name; + const gchar *value; /* Pipe to slave keyring lifetime to */ if (pipe (keyring_lifetime_pipe)) @@ -140,24 +138,26 @@ for (lineno = 0; lines[lineno] != NULL; lineno++) { - xfce_putenv (lines[lineno]); + p = strchr (lines[lineno], '='); + if (p == NULL) + continue; + + name = g_strndup (lines[lineno], p - lines[lineno]); + value = p + 1; + + g_setenv (name, value, TRUE); - if (g_str_has_prefix (lines[lineno], "GNOME_KEYRING_PID=")) + if (g_strcmp0 (name, "GNOME_KEYRING_PID") == 0) { - pid_str = lines[lineno] + strlen ("GNOME_KEYRING_PID="); - pid = strtol (pid_str, &end, 10); - if (end != pid_str) - { - gnome_keyring_daemon_pid = pid; - } + pid = strtol (value, &end, 10); + if (end != value) + gnome_keyring_daemon_pid = pid; } + + g_free (name); } g_strfreev (lines); - -#ifdef HAVE_GNOME_KEYRING - gnome_keyring_daemon_prepare_environment_sync (); -#endif } else { diff -Nru xfce4-session-4.10.0/xfce4-session/xfsm-manager.c xfce4-session-4.10.1/xfce4-session/xfsm-manager.c --- xfce4-session-4.10.0/xfce4-session/xfsm-manager.c 2012-04-28 20:43:27.000000000 +0000 +++ xfce4-session-4.10.1/xfce4-session/xfsm-manager.c 2013-05-05 15:33:55.000000000 +0000 @@ -98,6 +98,7 @@ XfsmShutdownType shutdown_type; XfsmShutdown *shutdown_helper; + gboolean save_session; gboolean session_chooser; gchar *session_name; @@ -230,6 +231,7 @@ manager->failsafe_mode = TRUE; manager->shutdown_type = XFSM_SHUTDOWN_LOGOUT; manager->shutdown_helper = xfsm_shutdown_get (); + manager->save_session = TRUE; manager->pending_properties = g_queue_new (); manager->starting_properties = g_queue_new (); @@ -989,7 +991,9 @@ XfsmClient *cl = lp->data; if (xfsm_client_get_state (cl) == XFSM_CLIENT_INTERACTING) { - xfsm_client_set_state (cl, XFSM_CLIENT_WAITFORINTERACT); + /* a client is already interacting, so new client has to wait */ + xfsm_client_set_state (client, XFSM_CLIENT_WAITFORINTERACT); + xfsm_manager_cancel_client_save_timeout(manager, client); return; } } @@ -1138,44 +1142,47 @@ } } - if (!shutdown || shutdown_save) + /* don't save the session if shutting down without save */ + manager->save_session = !shutdown || shutdown_save; + + if (save_type == SmSaveBoth && !manager->save_session) { - xfsm_manager_set_state (manager, - shutdown - ? XFSM_MANAGER_SHUTDOWN - : XFSM_MANAGER_CHECKPOINT); + /* saving the session, so clients should + * (prompt to) save the user data only */ + save_type = SmSaveGlobal; + } + + xfsm_manager_set_state (manager, + shutdown + ? XFSM_MANAGER_SHUTDOWN + : XFSM_MANAGER_CHECKPOINT); - /* handle legacy applications first! */ + /* handle legacy applications first! */ + if (manager->save_session) xfsm_legacy_perform_session_save (); - for (lp = g_queue_peek_nth_link (manager->running_clients, 0); - lp; - lp = lp->next) - { - XfsmClient *client = lp->data; - XfsmProperties *properties = xfsm_client_get_properties (client); - const gchar *program; - - /* xterm's session management is broken, so we won't - * send a SAVE YOURSELF to xterms */ - program = xfsm_properties_get_string (properties, SmProgram); - if (program != NULL && strcasecmp (program, "xterm") == 0) - continue; + for (lp = g_queue_peek_nth_link (manager->running_clients, 0); + lp; + lp = lp->next) + { + XfsmClient *client = lp->data; + XfsmProperties *properties = xfsm_client_get_properties (client); + const gchar *program; - if (xfsm_client_get_state (client) != XFSM_CLIENT_SAVINGLOCAL) - { - SmsSaveYourself (xfsm_client_get_sms_connection (client), save_type, shutdown, - interact_style, fast); - } + /* xterm's session management is broken, so we won't + * send a SAVE YOURSELF to xterms */ + program = xfsm_properties_get_string (properties, SmProgram); + if (program != NULL && strcasecmp (program, "xterm") == 0) + continue; - xfsm_client_set_state (client, XFSM_CLIENT_SAVING); - xfsm_manager_start_client_save_timeout (manager, client); + if (xfsm_client_get_state (client) != XFSM_CLIENT_SAVINGLOCAL) + { + SmsSaveYourself (xfsm_client_get_sms_connection (client), save_type, shutdown, + interact_style, fast); } - } - else - { - /* shutdown session without saving */ - xfsm_manager_perform_shutdown (manager); + + xfsm_client_set_state (client, XFSM_CLIENT_SAVING); + xfsm_manager_start_client_save_timeout (manager, client); } } @@ -1249,7 +1256,12 @@ XfsmClient *client, gboolean success) { - if (xfsm_client_get_state (client) != XFSM_CLIENT_SAVING && xfsm_client_get_state (client) != XFSM_CLIENT_SAVINGLOCAL) + /* In xfsm_manager_interact_done we send SmsShutdownCancelled to clients in + XFSM_CLIENT_WAITFORINTERACT state. They respond with SmcSaveYourselfDone + (xsmp_shutdown_cancelled in libxfce4ui library) so we allow it here. */ + if (xfsm_client_get_state (client) != XFSM_CLIENT_SAVING && + xfsm_client_get_state (client) != XFSM_CLIENT_SAVINGLOCAL && + xfsm_client_get_state (client) != XFSM_CLIENT_WAITFORINTERACT) { xfsm_verbose ("Client Id = %s send SAVE YOURSELF DONE, while not being " "in save mode. Prepare to be nuked!\n", @@ -1521,7 +1533,8 @@ xfsm_verbose ("Manager finished SAVE YOURSELF, session data will be stored now.\n\n"); /* all clients done, store session data */ - xfsm_manager_store_session (manager); + if (manager->save_session) + xfsm_manager_store_session (manager); if (manager->state == XFSM_MANAGER_CHECKPOINT) { diff -Nru xfce4-session-4.10.0/xfce4-session/xfsm-shutdown.c xfce4-session-4.10.1/xfce4-session/xfsm-shutdown.c --- xfce4-session-4.10.0/xfce4-session/xfsm-shutdown.c 2012-04-28 20:43:27.000000000 +0000 +++ xfce4-session-4.10.1/xfce4-session/xfsm-shutdown.c 2013-05-05 15:33:55.000000000 +0000 @@ -66,10 +66,13 @@ #include #include #include -#include #include - +#ifdef HAVE_SYSTEMD +#include +#else +#include +#endif static void xfsm_shutdown_finalize (GObject *object); static void xfsm_shutdown_sudo_free (XfsmShutdown *shutdown); @@ -93,7 +96,11 @@ { GObject __parent__; +#ifdef HAVE_SYSTEMD + XfsmSystemd *systemd; +#else XfsmConsolekit *consolekit; +#endif XfsmUPower *upower; /* kiosk settings */ @@ -131,7 +138,11 @@ { XfceKiosk *kiosk; +#ifdef HAVE_SYSTEMD + shutdown->systemd = xfsm_systemd_get (); +#else shutdown->consolekit = xfsm_consolekit_get (); +#endif shutdown->upower = xfsm_upower_get (); shutdown->helper_state = SUDO_NOT_INITIAZED; shutdown->helper_require_password = FALSE; @@ -150,7 +161,11 @@ { XfsmShutdown *shutdown = XFSM_SHUTDOWN (object); +#ifdef HAVE_SYSTEMD + g_object_unref (G_OBJECT (shutdown->systemd)); +#else g_object_unref (G_OBJECT (shutdown->consolekit)); +#endif g_object_unref (G_OBJECT (shutdown->upower)); /* close down helper */ @@ -269,9 +284,9 @@ signal (SIGPIPE, SIG_IGN); /* setup environment */ - xfce_setenv ("LC_ALL", "C", TRUE); - xfce_setenv ("LANG", "C", TRUE); - xfce_setenv ("LANGUAGE", "C", TRUE); + g_setenv ("LC_ALL", "C", TRUE); + g_setenv ("LANG", "C", TRUE); + g_setenv ("LANGUAGE", "C", TRUE); /* setup the 3 standard file handles */ dup2 (child_pipe[0], STDIN_FILENO); @@ -641,7 +656,11 @@ if (shutdown->helper_state == SUDO_AVAILABLE) return xfsm_shutdown_sudo_try_action (shutdown, XFSM_SHUTDOWN_RESTART, error); else +#ifdef HAVE_SYSTEMD + return xfsm_systemd_try_restart (shutdown->systemd, error); +#else return xfsm_consolekit_try_restart (shutdown->consolekit, error); +#endif } @@ -658,7 +677,11 @@ if (shutdown->helper_state == SUDO_AVAILABLE) return xfsm_shutdown_sudo_try_action (shutdown, XFSM_SHUTDOWN_SHUTDOWN, error); else +#ifdef HAVE_SYSTEMD + return xfsm_systemd_try_shutdown (shutdown->systemd, error); +#else return xfsm_consolekit_try_shutdown (shutdown->consolekit, error); +#endif } @@ -698,7 +721,11 @@ return TRUE; } +#ifdef HAVE_SYSTEMD + if (xfsm_systemd_can_restart (shutdown->systemd, can_restart, error)) +#else if (xfsm_consolekit_can_restart (shutdown->consolekit, can_restart, error)) +#endif return TRUE; if (xfsm_shutdown_sudo_init (shutdown, error)) @@ -725,7 +752,11 @@ return TRUE; } +#ifdef HAVE_SYSTEMD + if (xfsm_systemd_can_shutdown (shutdown->systemd, can_shutdown, error)) +#else if (xfsm_consolekit_can_shutdown (shutdown->consolekit, can_shutdown, error)) +#endif return TRUE; if (xfsm_shutdown_sudo_init (shutdown, error)) diff -Nru xfce4-session-4.10.0/xfce4-session/xfsm-startup.c xfce4-session-4.10.1/xfce4-session/xfsm-startup.c --- xfce4-session-4.10.0/xfce4-session/xfsm-startup.c 2012-04-28 20:43:27.000000000 +0000 +++ xfce4-session-4.10.1/xfce4-session/xfsm-startup.c 2013-05-05 15:33:55.000000000 +0000 @@ -864,6 +864,7 @@ gint n; const gchar *current_directory; GPid pid; + GError *error = NULL; /* release any possible old resources related to a previous startup */ xfsm_properties_set_default_child_watch (properties); @@ -878,49 +879,34 @@ current_directory = xfsm_properties_get_string (properties, SmCurrentDirectory); - /* fork a new process for the application */ -#ifdef HAVE_VFORK - /* vfork() doesn't allow you to do anything but call exec*() or _exit(), - * so if we need to set the working directory, we can't use vfork() */ - if (current_directory == NULL) - pid = vfork (); - else -#endif - pid = fork (); - - /* handle the child process */ - if (pid == 0) + if (!g_spawn_async (current_directory, + argv, NULL, + G_SPAWN_DO_NOT_REAP_CHILD | G_SPAWN_SEARCH_PATH, + NULL, NULL, + &pid, &error)) { - /* execute the application here */ - if (current_directory) - { - if (chdir (current_directory)) - g_warning ("Unable to chdir to \"%s\": %s", current_directory, strerror (errno)); - } - execvp (argv[0], argv); - _exit (127); - } - - /* cleanup */ - g_strfreev (argv); + g_warning ("Unable to launch \"%s\": %s", + *argv, error->message); + g_error_free (error); + g_strfreev (argv); - /* check if we failed to fork */ - if (G_UNLIKELY (pid < 0)) - { - /* tell the user that we failed to fork */ - perror ("Failed to fork new process"); return FALSE; } + xfsm_verbose ("Launched command \"%s\" with PID %dn", *argv, (gint) pid); + + g_strfreev (argv); + properties->pid = pid; /* set a watch to make sure the child doesn't quit before registering */ - child_watch_data = g_new (XfsmStartupData, 1); + child_watch_data = g_new0 (XfsmStartupData, 1); child_watch_data->manager = g_object_ref (manager); child_watch_data->properties = properties; - g_child_watch_add_full (G_PRIORITY_LOW, properties->pid, - xfsm_startup_child_watch, child_watch_data, - (GDestroyNotify) xfsm_startup_data_free); + child_watch_data->properties->child_watch_id = + g_child_watch_add_full (G_PRIORITY_LOW, properties->pid, + xfsm_startup_child_watch, child_watch_data, + (GDestroyNotify) xfsm_startup_data_free); /* set a timeout -- client must register in a a certain amount of time * or it's assumed to be broken/have issues. */ diff -Nru xfce4-session-4.10.0/xfce4-session/xfsm-systemd.c xfce4-session-4.10.1/xfce4-session/xfsm-systemd.c --- xfce4-session-4.10.0/xfce4-session/xfsm-systemd.c 1970-01-01 00:00:00.000000000 +0000 +++ xfce4-session-4.10.1/xfce4-session/xfsm-systemd.c 2013-05-05 15:33:55.000000000 +0000 @@ -0,0 +1,229 @@ +/*- + * Copyright (C) 2012 Christian Hesse + * + * 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, or (at your option) + * any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, + * MA 02110-1301 USA. + */ + +#include + +#include +#include +#include +#include + +#include + + + +#define SYSTEMD_DBUS_NAME "org.freedesktop.login1" +#define SYSTEMD_DBUS_PATH "/org/freedesktop/login1" +#define SYSTEMD_DBUS_INTERFACE "org.freedesktop.login1.Manager" +#define SYSTEMD_REBOOT_ACTION "Reboot" +#define SYSTEMD_POWEROFF_ACTION "PowerOff" +#define SYSTEMD_REBOOT_TEST "org.freedesktop.login1.reboot" +#define SYSTEMD_POWEROFF_TEST "org.freedesktop.login1.power-off" + + + +static void xfsm_systemd_finalize (GObject *object); + + + +struct _XfsmSystemdClass +{ + GObjectClass __parent__; +}; + +struct _XfsmSystemd +{ + GObject __parent__; + + PolkitAuthority *authority; + PolkitSubject *subject; +}; + + + +G_DEFINE_TYPE (XfsmSystemd, xfsm_systemd, G_TYPE_OBJECT) + + + +static void +xfsm_systemd_class_init (XfsmSystemdClass *klass) +{ + GObjectClass *gobject_class; + + gobject_class = G_OBJECT_CLASS (klass); + gobject_class->finalize = xfsm_systemd_finalize; +} + + + +static void +xfsm_systemd_init (XfsmSystemd *systemd) +{ + systemd->authority = polkit_authority_get_sync (NULL, NULL); + systemd->subject = polkit_unix_process_new (getpid()); +} + + + +static void +xfsm_systemd_finalize (GObject *object) +{ + XfsmSystemd *systemd = XFSM_SYSTEMD (object); + + g_object_unref (G_OBJECT (systemd->authority)); + g_object_unref (G_OBJECT (systemd->subject)); + + (*G_OBJECT_CLASS (xfsm_systemd_parent_class)->finalize) (object); +} + + +static gboolean +xfsm_systemd_can_method (XfsmSystemd *systemd, + gboolean *can_method, + const gchar *method, + GError **error) +{ + PolkitAuthorizationResult *res; + GError *local_error = NULL; + + *can_method = FALSE; + + res = polkit_authority_check_authorization_sync (systemd->authority, + systemd->subject, + method, + NULL, + POLKIT_CHECK_AUTHORIZATION_FLAGS_NONE, + NULL, + &local_error); + + if (res == NULL) + { + g_propagate_error (error, local_error); + return FALSE; + } + + *can_method = polkit_authorization_result_get_is_authorized (res) + || polkit_authorization_result_get_is_challenge (res); + + g_object_unref (G_OBJECT (res)); + + return TRUE; +} + + + +static gboolean +xfsm_systemd_try_method (XfsmSystemd *systemd, + const gchar *method, + GError **error) +{ + GDBusConnection *bus; + GError *local_error = NULL; + + bus = g_bus_get_sync (G_BUS_TYPE_SYSTEM, NULL, error); + if (G_UNLIKELY (bus == NULL)) + return FALSE; + + g_dbus_connection_call_sync (bus, + SYSTEMD_DBUS_NAME, + SYSTEMD_DBUS_PATH, + SYSTEMD_DBUS_INTERFACE, + method, + g_variant_new ("(b)", TRUE), + NULL, 0, G_MAXINT, NULL, + &local_error); + + g_object_unref (G_OBJECT (bus)); + + if (local_error != NULL) + { + g_propagate_error (error, local_error); + return FALSE; + } + + return TRUE; +} + + + +XfsmSystemd * +xfsm_systemd_get (void) +{ + static XfsmSystemd *object = NULL; + + if (G_LIKELY (object != NULL)) + { + g_object_ref (G_OBJECT (object)); + } + else + { + object = g_object_new (XFSM_TYPE_SYSTEMD, NULL); + g_object_add_weak_pointer (G_OBJECT (object), (gpointer) &object); + } + + return object; +} + + + +gboolean +xfsm_systemd_try_restart (XfsmSystemd *systemd, + GError **error) +{ + return xfsm_systemd_try_method (systemd, + SYSTEMD_REBOOT_ACTION, + error); +} + + + +gboolean +xfsm_systemd_try_shutdown (XfsmSystemd *systemd, + GError **error) +{ + return xfsm_systemd_try_method (systemd, + SYSTEMD_POWEROFF_ACTION, + error); +} + + + +gboolean +xfsm_systemd_can_restart (XfsmSystemd *systemd, + gboolean *can_restart, + GError **error) +{ + return xfsm_systemd_can_method (systemd, + can_restart, + SYSTEMD_REBOOT_TEST, + error); +} + + + +gboolean +xfsm_systemd_can_shutdown (XfsmSystemd *systemd, + gboolean *can_shutdown, + GError **error) +{ + return xfsm_systemd_can_method (systemd, + can_shutdown, + SYSTEMD_POWEROFF_TEST, + error); +} diff -Nru xfce4-session-4.10.0/xfce4-session/xfsm-systemd.h xfce4-session-4.10.1/xfce4-session/xfsm-systemd.h --- xfce4-session-4.10.0/xfce4-session/xfsm-systemd.h 1970-01-01 00:00:00.000000000 +0000 +++ xfce4-session-4.10.1/xfce4-session/xfsm-systemd.h 2013-05-05 15:33:55.000000000 +0000 @@ -0,0 +1,55 @@ +/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- + * + * Copyright (C) 2012 Christian Hesse + * + * Licensed under the GNU General Public License Version 2 + * + * 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 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. + */ + +#ifndef __XFSM_SYSTEMD_H__ +#define __XFSM_SYSTEMD_H__ + +typedef struct _XfsmSystemdClass XfsmSystemdClass; +typedef struct _XfsmSystemd XfsmSystemd; + +#define XFSM_TYPE_SYSTEMD (xfsm_systemd_get_type ()) +#define XFSM_SYSTEMD(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), XFSM_TYPE_SYSTEMD, XfsmSystemd)) +#define XFSM_SYSTEMD_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), XFSM_TYPE_SYSTEMD, XfsmSystemdClass)) +#define XFSM_IS_SYSTEMD(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), XFSM_TYPE_SYSTEMD)) +#define XFSM_IS_SYSTEMD_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), XFSM_TYPE_SYSTEMD)) +#define XFSM_SYSTEMD_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), XFSM_TYPE_SYSTEMD, XfsmSystemdClass)) + +GType xfsm_systemd_get_type (void) G_GNUC_CONST; + +XfsmSystemd *xfsm_systemd_get (void); + +gboolean xfsm_systemd_try_restart (XfsmSystemd *systemd, + GError **error); + +gboolean xfsm_systemd_try_shutdown (XfsmSystemd *systemd, + GError **error); + +gboolean xfsm_systemd_can_restart (XfsmSystemd *systemd, + gboolean *can_restart, + GError **error); + +gboolean xfsm_systemd_can_shutdown (XfsmSystemd *systemd, + gboolean *can_shutdown, + GError **error); + +G_END_DECLS + +#endif /* __XFSM_SYSTEMD_H__ */ diff -Nru xfce4-session-4.10.0/xfce4-session-logout/Makefile.in xfce4-session-4.10.1/xfce4-session-logout/Makefile.in --- xfce4-session-4.10.0/xfce4-session-logout/Makefile.in 2012-04-28 20:43:33.000000000 +0000 +++ xfce4-session-4.10.1/xfce4-session-logout/Makefile.in 2013-05-05 15:33:59.000000000 +0000 @@ -1,9 +1,8 @@ -# Makefile.in generated by automake 1.11.5 from Makefile.am. +# Makefile.in generated by automake 1.13.1 from Makefile.am. # @configure_input@ -# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software -# Foundation, Inc. +# Copyright (C) 1994-2012 Free Software Foundation, Inc. + # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -54,12 +53,13 @@ host_triplet = @host@ bin_PROGRAMS = xfce4-session-logout$(EXEEXT) subdir = xfce4-session-logout -DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in +DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \ + $(top_srcdir)/depcomp ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -am__aclocal_m4_deps = $(top_srcdir)/configure.in +am__aclocal_m4_deps = $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) -mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs +mkinstalldirs = $(install_sh) -d CONFIG_HEADER = $(top_builddir)/config.h CONFIG_CLEAN_FILES = CONFIG_CLEAN_VPATH_FILES = @@ -72,10 +72,23 @@ AM_V_lt = $(am__v_lt_@AM_V@) am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@) am__v_lt_0 = --silent +am__v_lt_1 = xfce4_session_logout_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC \ $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CCLD) \ $(xfce4_session_logout_CFLAGS) $(CFLAGS) \ $(xfce4_session_logout_LDFLAGS) $(LDFLAGS) -o $@ +AM_V_P = $(am__v_P_@AM_V@) +am__v_P_ = $(am__v_P_@AM_DEFAULT_V@) +am__v_P_0 = false +am__v_P_1 = : +AM_V_GEN = $(am__v_GEN_@AM_V@) +am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) +am__v_GEN_0 = @echo " GEN " $@; +am__v_GEN_1 = +AM_V_at = $(am__v_at_@AM_V@) +am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) +am__v_at_0 = @ +am__v_at_1 = DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir) depcomp = $(SHELL) $(top_srcdir)/depcomp am__depfiles_maybe = depfiles @@ -88,20 +101,16 @@ $(AM_CFLAGS) $(CFLAGS) AM_V_CC = $(am__v_CC_@AM_V@) am__v_CC_ = $(am__v_CC_@AM_DEFAULT_V@) -am__v_CC_0 = @echo " CC " $@; -AM_V_at = $(am__v_at_@AM_V@) -am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) -am__v_at_0 = @ +am__v_CC_0 = @echo " CC " $@; +am__v_CC_1 = CCLD = $(CC) LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \ $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ $(AM_LDFLAGS) $(LDFLAGS) -o $@ AM_V_CCLD = $(am__v_CCLD_@AM_V@) am__v_CCLD_ = $(am__v_CCLD_@AM_DEFAULT_V@) -am__v_CCLD_0 = @echo " CCLD " $@; -AM_V_GEN = $(am__v_GEN_@AM_V@) -am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) -am__v_GEN_0 = @echo " GEN " $@; +am__v_CCLD_0 = @echo " CCLD " $@; +am__v_CCLD_1 = SOURCES = $(xfce4_session_logout_SOURCES) DIST_SOURCES = $(xfce4_session_logout_SOURCES) am__can_run_installinfo = \ @@ -140,6 +149,23 @@ NROFF = nroff MANS = $(man_MANS) DATA = $(desktop_DATA) +am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP) +# Read a list of newline-separated strings from the standard input, +# and print each of them once, without duplicates. Input order is +# *not* preserved. +am__uniquify_input = $(AWK) '\ + BEGIN { nonempty = 0; } \ + { items[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in items) print i; }; } \ +' +# Make sure the list of sources is unique. This is necessary because, +# e.g., the same source file might be shared among _SOURCES variables +# for different programs/libraries. +am__define_uniq_tagged_files = \ + list='$(am__tagged_files)'; \ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | $(am__uniquify_input)` ETAGS = etags CTAGS = ctags DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) @@ -187,10 +213,6 @@ GMODULE_VERSION = @GMODULE_VERSION@ GMOFILES = @GMOFILES@ GMSGFMT = @GMSGFMT@ -GNOME_KEYRING_CFLAGS = @GNOME_KEYRING_CFLAGS@ -GNOME_KEYRING_LIBS = @GNOME_KEYRING_LIBS@ -GNOME_KEYRING_REQUIRED_VERSION = @GNOME_KEYRING_REQUIRED_VERSION@ -GNOME_KEYRING_VERSION = @GNOME_KEYRING_VERSION@ GREP = @GREP@ GTK_CFLAGS = @GTK_CFLAGS@ GTK_LIBS = @GTK_LIBS@ @@ -275,6 +297,10 @@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ STRIP = @STRIP@ +SYSTEMD_CFLAGS = @SYSTEMD_CFLAGS@ +SYSTEMD_LIBS = @SYSTEMD_LIBS@ +SYSTEMD_REQUIRED_VERSION = @SYSTEMD_REQUIRED_VERSION@ +SYSTEMD_VERSION = @SYSTEMD_VERSION@ USE_NLS = @USE_NLS@ VERSION = @VERSION@ XFCE_GLADE_CATALOG_PATH = @XFCE_GLADE_CATALOG_PATH@ @@ -417,10 +443,12 @@ fi; \ for p in $$list; do echo "$$p $$p"; done | \ sed 's/$(EXEEXT)$$//' | \ - while read p p1; do if test -f $$p || test -f $$p1; \ - then echo "$$p"; echo "$$p"; else :; fi; \ + while read p p1; do if test -f $$p \ + || test -f $$p1 \ + ; then echo "$$p"; echo "$$p"; else :; fi; \ done | \ - sed -e 'p;s,.*/,,;n;h' -e 's|.*|.|' \ + sed -e 'p;s,.*/,,;n;h' \ + -e 's|.*|.|' \ -e 'p;x;s,.*/,,;s/$(EXEEXT)$$//;$(transform);s/$$/$(EXEEXT)/' | \ sed 'N;N;N;s,\n, ,g' | \ $(AWK) 'BEGIN { files["."] = ""; dirs["."] = 1 } \ @@ -441,7 +469,8 @@ @list='$(bin_PROGRAMS)'; test -n "$(bindir)" || list=; \ files=`for p in $$list; do echo "$$p"; done | \ sed -e 'h;s,^.*/,,;s/$(EXEEXT)$$//;$(transform)' \ - -e 's/$$/$(EXEEXT)/' `; \ + -e 's/$$/$(EXEEXT)/' \ + `; \ test -n "$$list" || exit 0; \ echo " ( cd '$(DESTDIR)$(bindir)' && rm -f" $$files ")"; \ cd "$(DESTDIR)$(bindir)" && rm -f $$files @@ -571,26 +600,15 @@ files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \ dir='$(DESTDIR)$(desktopdir)'; $(am__uninstall_files_from_dir) -ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ - mkid -fID $$unique -tags: TAGS +ID: $(am__tagged_files) + $(am__define_uniq_tagged_files); mkid -fID $$unique +tags: tags-am +TAGS: tags -TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) +tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) set x; \ here=`pwd`; \ - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ + $(am__define_uniq_tagged_files); \ shift; \ if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \ test -n "$$unique" || unique=$$empty_fix; \ @@ -602,15 +620,11 @@ $$unique; \ fi; \ fi -ctags: CTAGS -CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ +ctags: ctags-am + +CTAGS: ctags +ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) + $(am__define_uniq_tagged_files); \ test -z "$(CTAGS_ARGS)$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ $$unique @@ -619,24 +633,26 @@ here=`$(am__cd) $(top_builddir) && pwd` \ && $(am__cd) $(top_srcdir) \ && gtags -i $(GTAGS_ARGS) "$$here" +cscopelist: cscopelist-am + +cscopelist-am: $(am__tagged_files) + list='$(am__tagged_files)'; \ + case "$(srcdir)" in \ + [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \ + *) sdir=$(subdir)/$(srcdir) ;; \ + esac; \ + for i in $$list; do \ + if test -f "$$i"; then \ + echo "$(subdir)/$$i"; \ + else \ + echo "$$sdir/$$i"; \ + fi; \ + done >> $(top_builddir)/cscope.files distclean-tags: -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags distdir: $(DISTFILES) - @list='$(MANS)'; if test -n "$$list"; then \ - list=`for p in $$list; do \ - if test -f $$p; then d=; else d="$(srcdir)/"; fi; \ - if test -f "$$d$$p"; then echo "$$d$$p"; else :; fi; done`; \ - if test -n "$$list" && \ - grep 'ab help2man is required to generate this page' $$list >/dev/null; then \ - echo "error: found man pages containing the \`missing help2man' replacement text:" >&2; \ - grep -l 'ab help2man is required to generate this page' $$list | sed 's/^/ /' >&2; \ - echo " to fix them, install help2man, remove and regenerate the man pages;" >&2; \ - echo " typically \`make maintainer-clean' will remove them" >&2; \ - exit 1; \ - else :; fi; \ - else :; fi @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ list='$(DISTFILES)'; \ @@ -779,20 +795,21 @@ .MAKE: install-am install-strip -.PHONY: CTAGS GTAGS all all-am check check-am clean clean-binPROGRAMS \ - clean-generic clean-libtool ctags distclean distclean-compile \ - distclean-generic distclean-libtool distclean-tags distdir dvi \ - dvi-am html html-am info info-am install install-am \ - install-binPROGRAMS install-data install-data-am \ - install-desktopDATA install-dvi install-dvi-am install-exec \ - install-exec-am install-html install-html-am install-info \ - install-info-am install-man install-man1 install-pdf \ - install-pdf-am install-ps install-ps-am install-strip \ - installcheck installcheck-am installdirs maintainer-clean \ - maintainer-clean-generic mostlyclean mostlyclean-compile \ - mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ - tags uninstall uninstall-am uninstall-binPROGRAMS \ - uninstall-desktopDATA uninstall-man uninstall-man1 +.PHONY: CTAGS GTAGS TAGS all all-am check check-am clean \ + clean-binPROGRAMS clean-generic clean-libtool cscopelist-am \ + ctags ctags-am distclean distclean-compile distclean-generic \ + distclean-libtool distclean-tags distdir dvi dvi-am html \ + html-am info info-am install install-am install-binPROGRAMS \ + install-data install-data-am install-desktopDATA install-dvi \ + install-dvi-am install-exec install-exec-am install-html \ + install-html-am install-info install-info-am install-man \ + install-man1 install-pdf install-pdf-am install-ps \ + install-ps-am install-strip installcheck installcheck-am \ + installdirs maintainer-clean maintainer-clean-generic \ + mostlyclean mostlyclean-compile mostlyclean-generic \ + mostlyclean-libtool pdf pdf-am ps ps-am tags tags-am uninstall \ + uninstall-am uninstall-binPROGRAMS uninstall-desktopDATA \ + uninstall-man uninstall-man1 @INTLTOOL_DESKTOP_RULE@ diff -Nru xfce4-session-4.10.0/xfce4-session-logout/main.c xfce4-session-4.10.1/xfce4-session-logout/main.c --- xfce4-session-4.10.0/xfce4-session-logout/main.c 2012-04-28 20:43:27.000000000 +0000 +++ xfce4-session-4.10.1/xfce4-session-logout/main.c 2013-05-05 15:33:55.000000000 +0000 @@ -48,7 +48,7 @@ gboolean opt_reboot = FALSE; gboolean opt_suspend = FALSE; gboolean opt_hibernate = FALSE; -gboolean allow_save = FALSE; +gboolean opt_fast = FALSE; gboolean opt_version = FALSE; enum @@ -83,7 +83,7 @@ N_("Hibernate without displaying the logout dialog"), NULL }, - { "fast", 'f', G_OPTION_FLAG_IN_MAIN, G_OPTION_ARG_NONE, &allow_save, + { "fast", 'f', G_OPTION_FLAG_IN_MAIN, G_OPTION_ARG_NONE, &opt_fast, N_("Log out quickly; don't save the session"), NULL }, @@ -123,6 +123,7 @@ gboolean show_dialog; gboolean result = FALSE; guint shutdown_type; + gboolean allow_save; xfce_textdomain (GETTEXT_PACKAGE, PACKAGE_LOCALE_DIR, "UTF-8"); @@ -131,7 +132,7 @@ if (opt_version) { g_print ("%s %s (Xfce %s)\n\n", PACKAGE_NAME, PACKAGE_VERSION, xfce_version_string ()); - g_print ("%s\n", "Copyright (c) 2004-2011"); + g_print ("%s\n", "Copyright (c) 2004-2012"); g_print ("\t%s\n\n", _("The Xfce development team. All rights reserved.")); g_print ("%s\n", _("Written by Benedikt Meurer ")); g_print ("%s\n\n", _("and Brian Tarricone .")); @@ -149,6 +150,9 @@ return EXIT_FAILURE; } + /* save the session, unless fast is provided */ + allow_save = !opt_fast; + /* create messsage */ proxy = dbus_g_proxy_new_for_name_owner (conn, "org.xfce.SessionManager", diff -Nru xfce4-session-4.10.0/xfsm-shutdown-helper/Makefile.in xfce4-session-4.10.1/xfsm-shutdown-helper/Makefile.in --- xfce4-session-4.10.0/xfsm-shutdown-helper/Makefile.in 2012-04-28 20:43:34.000000000 +0000 +++ xfce4-session-4.10.1/xfsm-shutdown-helper/Makefile.in 2013-05-05 15:33:59.000000000 +0000 @@ -1,9 +1,8 @@ -# Makefile.in generated by automake 1.11.5 from Makefile.am. +# Makefile.in generated by automake 1.13.1 from Makefile.am. # @configure_input@ -# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software -# Foundation, Inc. +# Copyright (C) 1994-2012 Free Software Foundation, Inc. + # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -53,12 +52,13 @@ host_triplet = @host@ xfsm_shutdown_helper_PROGRAMS = xfsm-shutdown-helper$(EXEEXT) subdir = xfsm-shutdown-helper -DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in +DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \ + $(top_srcdir)/depcomp ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -am__aclocal_m4_deps = $(top_srcdir)/configure.in +am__aclocal_m4_deps = $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) -mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs +mkinstalldirs = $(install_sh) -d CONFIG_HEADER = $(top_builddir)/config.h CONFIG_CLEAN_FILES = CONFIG_CLEAN_VPATH_FILES = @@ -70,10 +70,23 @@ AM_V_lt = $(am__v_lt_@AM_V@) am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@) am__v_lt_0 = --silent +am__v_lt_1 = xfsm_shutdown_helper_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC \ $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CCLD) \ $(xfsm_shutdown_helper_CFLAGS) $(CFLAGS) \ $(xfsm_shutdown_helper_LDFLAGS) $(LDFLAGS) -o $@ +AM_V_P = $(am__v_P_@AM_V@) +am__v_P_ = $(am__v_P_@AM_DEFAULT_V@) +am__v_P_0 = false +am__v_P_1 = : +AM_V_GEN = $(am__v_GEN_@AM_V@) +am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) +am__v_GEN_0 = @echo " GEN " $@; +am__v_GEN_1 = +AM_V_at = $(am__v_at_@AM_V@) +am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) +am__v_at_0 = @ +am__v_at_1 = DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir) depcomp = $(SHELL) $(top_srcdir)/depcomp am__depfiles_maybe = depfiles @@ -86,20 +99,16 @@ $(AM_CFLAGS) $(CFLAGS) AM_V_CC = $(am__v_CC_@AM_V@) am__v_CC_ = $(am__v_CC_@AM_DEFAULT_V@) -am__v_CC_0 = @echo " CC " $@; -AM_V_at = $(am__v_at_@AM_V@) -am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) -am__v_at_0 = @ +am__v_CC_0 = @echo " CC " $@; +am__v_CC_1 = CCLD = $(CC) LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \ $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ $(AM_LDFLAGS) $(LDFLAGS) -o $@ AM_V_CCLD = $(am__v_CCLD_@AM_V@) am__v_CCLD_ = $(am__v_CCLD_@AM_DEFAULT_V@) -am__v_CCLD_0 = @echo " CCLD " $@; -AM_V_GEN = $(am__v_GEN_@AM_V@) -am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) -am__v_GEN_0 = @echo " GEN " $@; +am__v_CCLD_0 = @echo " CCLD " $@; +am__v_CCLD_1 = SOURCES = $(xfsm_shutdown_helper_SOURCES) DIST_SOURCES = $(xfsm_shutdown_helper_SOURCES) am__can_run_installinfo = \ @@ -107,6 +116,23 @@ n|no|NO) false;; \ *) (install-info --version) >/dev/null 2>&1;; \ esac +am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP) +# Read a list of newline-separated strings from the standard input, +# and print each of them once, without duplicates. Input order is +# *not* preserved. +am__uniquify_input = $(AWK) '\ + BEGIN { nonempty = 0; } \ + { items[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in items) print i; }; } \ +' +# Make sure the list of sources is unique. This is necessary because, +# e.g., the same source file might be shared among _SOURCES variables +# for different programs/libraries. +am__define_uniq_tagged_files = \ + list='$(am__tagged_files)'; \ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | $(am__uniquify_input)` ETAGS = etags CTAGS = ctags DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) @@ -154,10 +180,6 @@ GMODULE_VERSION = @GMODULE_VERSION@ GMOFILES = @GMOFILES@ GMSGFMT = @GMSGFMT@ -GNOME_KEYRING_CFLAGS = @GNOME_KEYRING_CFLAGS@ -GNOME_KEYRING_LIBS = @GNOME_KEYRING_LIBS@ -GNOME_KEYRING_REQUIRED_VERSION = @GNOME_KEYRING_REQUIRED_VERSION@ -GNOME_KEYRING_VERSION = @GNOME_KEYRING_VERSION@ GREP = @GREP@ GTK_CFLAGS = @GTK_CFLAGS@ GTK_LIBS = @GTK_LIBS@ @@ -242,6 +264,10 @@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ STRIP = @STRIP@ +SYSTEMD_CFLAGS = @SYSTEMD_CFLAGS@ +SYSTEMD_LIBS = @SYSTEMD_LIBS@ +SYSTEMD_REQUIRED_VERSION = @SYSTEMD_REQUIRED_VERSION@ +SYSTEMD_VERSION = @SYSTEMD_VERSION@ USE_NLS = @USE_NLS@ VERSION = @VERSION@ XFCE_GLADE_CATALOG_PATH = @XFCE_GLADE_CATALOG_PATH@ @@ -367,10 +393,12 @@ fi; \ for p in $$list; do echo "$$p $$p"; done | \ sed 's/$(EXEEXT)$$//' | \ - while read p p1; do if test -f $$p || test -f $$p1; \ - then echo "$$p"; echo "$$p"; else :; fi; \ + while read p p1; do if test -f $$p \ + || test -f $$p1 \ + ; then echo "$$p"; echo "$$p"; else :; fi; \ done | \ - sed -e 'p;s,.*/,,;n;h' -e 's|.*|.|' \ + sed -e 'p;s,.*/,,;n;h' \ + -e 's|.*|.|' \ -e 'p;x;s,.*/,,;s/$(EXEEXT)$$//;$(transform);s/$$/$(EXEEXT)/' | \ sed 'N;N;N;s,\n, ,g' | \ $(AWK) 'BEGIN { files["."] = ""; dirs["."] = 1 } \ @@ -391,7 +419,8 @@ @list='$(xfsm_shutdown_helper_PROGRAMS)'; test -n "$(xfsm_shutdown_helperdir)" || list=; \ files=`for p in $$list; do echo "$$p"; done | \ sed -e 'h;s,^.*/,,;s/$(EXEEXT)$$//;$(transform)' \ - -e 's/$$/$(EXEEXT)/' `; \ + -e 's/$$/$(EXEEXT)/' \ + `; \ test -n "$$list" || exit 0; \ echo " ( cd '$(DESTDIR)$(xfsm_shutdown_helperdir)' && rm -f" $$files ")"; \ cd "$(DESTDIR)$(xfsm_shutdown_helperdir)" && rm -f $$files @@ -457,26 +486,15 @@ clean-libtool: -rm -rf .libs _libs -ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ - mkid -fID $$unique -tags: TAGS +ID: $(am__tagged_files) + $(am__define_uniq_tagged_files); mkid -fID $$unique +tags: tags-am +TAGS: tags -TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) +tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) set x; \ here=`pwd`; \ - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ + $(am__define_uniq_tagged_files); \ shift; \ if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \ test -n "$$unique" || unique=$$empty_fix; \ @@ -488,15 +506,11 @@ $$unique; \ fi; \ fi -ctags: CTAGS -CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ +ctags: ctags-am + +CTAGS: ctags +ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) + $(am__define_uniq_tagged_files); \ test -z "$(CTAGS_ARGS)$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ $$unique @@ -505,6 +519,21 @@ here=`$(am__cd) $(top_builddir) && pwd` \ && $(am__cd) $(top_srcdir) \ && gtags -i $(GTAGS_ARGS) "$$here" +cscopelist: cscopelist-am + +cscopelist-am: $(am__tagged_files) + list='$(am__tagged_files)'; \ + case "$(srcdir)" in \ + [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \ + *) sdir=$(subdir)/$(srcdir) ;; \ + esac; \ + for i in $$list; do \ + if test -f "$$i"; then \ + echo "$(subdir)/$$i"; \ + else \ + echo "$$sdir/$$i"; \ + fi; \ + done >> $(top_builddir)/cscope.files distclean-tags: -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags @@ -649,9 +678,9 @@ .MAKE: install-am install-strip -.PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \ - clean-libtool clean-xfsm_shutdown_helperPROGRAMS ctags \ - distclean distclean-compile distclean-generic \ +.PHONY: CTAGS GTAGS TAGS all all-am check check-am clean clean-generic \ + clean-libtool clean-xfsm_shutdown_helperPROGRAMS cscopelist-am \ + ctags ctags-am distclean distclean-compile distclean-generic \ distclean-libtool distclean-tags distdir dvi dvi-am html \ html-am info info-am install install-am install-data \ install-data-am install-dvi install-dvi-am install-exec \ @@ -662,7 +691,7 @@ installcheck-am installdirs maintainer-clean \ maintainer-clean-generic mostlyclean mostlyclean-compile \ mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ - tags uninstall uninstall-am \ + tags tags-am uninstall uninstall-am \ uninstall-xfsm_shutdown_helperPROGRAMS