diff -Nru gnome-desktop3-3.12.0/aclocal.m4 gnome-desktop3-3.8.4/aclocal.m4 --- gnome-desktop3-3.12.0/aclocal.m4 2014-03-24 14:31:04.000000000 +0000 +++ gnome-desktop3-3.8.4/aclocal.m4 2013-09-04 11:29:45.000000000 +0000 @@ -20,2289 +20,2259 @@ 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'.])]) -# nls.m4 serial 5 (gettext-0.18) -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, -dnl with or without modifications, as long as this notice is preserved. -dnl -dnl This file can can be used in projects which are not available under -dnl the GNU General Public License or the GNU Library General Public -dnl License but which still want to provide support for the GNU gettext -dnl functionality. -dnl Please note that the actual code of the GNU gettext library is covered -dnl by the GNU Library General Public License, and the rest of the GNU -dnl gettext package package is covered by the GNU General Public License. -dnl They are *not* in the public domain. - -dnl Authors: -dnl Ulrich Drepper , 1995-2000. -dnl Bruno Haible , 2000-2003. - -AC_PREREQ([2.50]) - -AC_DEFUN([AM_NLS], -[ - AC_MSG_CHECKING([whether NLS is requested]) - dnl Default is enabled NLS - AC_ARG_ENABLE([nls], - [ --disable-nls do not use Native Language Support], - USE_NLS=$enableval, USE_NLS=yes) - AC_MSG_RESULT([$USE_NLS]) - AC_SUBST([USE_NLS]) -]) - -# pkg.m4 - Macros to locate and utilise pkg-config. -*- Autoconf -*- -# serial 1 (pkg-config-0.24) -# -# Copyright © 2004 Scott James Remnant . -# -# 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. +# Copyright (C) 1995-2002 Free Software Foundation, Inc. +# Copyright (C) 2001-2003,2004 Red Hat, Inc. # -# 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., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +# This file is free software, distributed under the terms of the GNU +# General Public License. As a special exception to the GNU General +# Public License, this file may be distributed as part of a program +# that contains a configuration script generated by Autoconf, under +# the same distribution terms as the rest of that program. # -# 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. - -# PKG_PROG_PKG_CONFIG([MIN-VERSION]) -# ---------------------------------- -AC_DEFUN([PKG_PROG_PKG_CONFIG], -[m4_pattern_forbid([^_?PKG_[A-Z_]+$]) -m4_pattern_allow([^PKG_CONFIG(_(PATH|LIBDIR|SYSROOT_DIR|ALLOW_SYSTEM_(CFLAGS|LIBS)))?$]) -m4_pattern_allow([^PKG_CONFIG_(DISABLE_UNINSTALLED|TOP_BUILD_DIR|DEBUG_SPEW)$]) -AC_ARG_VAR([PKG_CONFIG], [path to pkg-config utility]) -AC_ARG_VAR([PKG_CONFIG_PATH], [directories to add to pkg-config's search path]) -AC_ARG_VAR([PKG_CONFIG_LIBDIR], [path overriding pkg-config's built-in search path]) - -if test "x$ac_cv_env_PKG_CONFIG_set" != "xset"; then - AC_PATH_TOOL([PKG_CONFIG], [pkg-config]) -fi -if test -n "$PKG_CONFIG"; then - _pkg_min_version=m4_default([$1], [0.9.0]) - AC_MSG_CHECKING([pkg-config is at least version $_pkg_min_version]) - if $PKG_CONFIG --atleast-pkgconfig-version $_pkg_min_version; then - AC_MSG_RESULT([yes]) - else - AC_MSG_RESULT([no]) - PKG_CONFIG="" - fi -fi[]dnl -])# PKG_PROG_PKG_CONFIG - -# PKG_CHECK_EXISTS(MODULES, [ACTION-IF-FOUND], [ACTION-IF-NOT-FOUND]) +# This file can be copied and used freely without restrictions. It can +# be used in projects which are not available under the GNU Public License +# but which still want to provide support for the GNU gettext functionality. # -# Check to see whether a particular set of modules exists. Similar -# to PKG_CHECK_MODULES(), but does not set variables or print errors. +# Macro to add for using GNU gettext. +# Ulrich Drepper , 1995, 1996 # -# Please remember that m4 expands AC_REQUIRE([PKG_PROG_PKG_CONFIG]) -# only at the first occurence in configure.ac, so if the first place -# it's called might be skipped (such as if it is within an "if", you -# have to call PKG_CHECK_EXISTS manually -# -------------------------------------------------------------- -AC_DEFUN([PKG_CHECK_EXISTS], -[AC_REQUIRE([PKG_PROG_PKG_CONFIG])dnl -if test -n "$PKG_CONFIG" && \ - AC_RUN_LOG([$PKG_CONFIG --exists --print-errors "$1"]); then - m4_default([$2], [:]) -m4_ifvaln([$3], [else - $3])dnl -fi]) - -# _PKG_CONFIG([VARIABLE], [COMMAND], [MODULES]) -# --------------------------------------------- -m4_define([_PKG_CONFIG], -[if test -n "$$1"; then - pkg_cv_[]$1="$$1" - elif test -n "$PKG_CONFIG"; then - PKG_CHECK_EXISTS([$3], - [pkg_cv_[]$1=`$PKG_CONFIG --[]$2 "$3" 2>/dev/null` - test "x$?" != "x0" && pkg_failed=yes ], - [pkg_failed=yes]) - else - pkg_failed=untried -fi[]dnl -])# _PKG_CONFIG - -# _PKG_SHORT_ERRORS_SUPPORTED -# ----------------------------- -AC_DEFUN([_PKG_SHORT_ERRORS_SUPPORTED], -[AC_REQUIRE([PKG_PROG_PKG_CONFIG]) -if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then - _pkg_short_errors_supported=yes -else - _pkg_short_errors_supported=no -fi[]dnl -])# _PKG_SHORT_ERRORS_SUPPORTED - - -# PKG_CHECK_MODULES(VARIABLE-PREFIX, MODULES, [ACTION-IF-FOUND], -# [ACTION-IF-NOT-FOUND]) +# Modified to never use included libintl. +# Owen Taylor , 12/15/1998 # +# Major rework to remove unused code +# Owen Taylor , 12/11/2002 # -# Note that if there is a possibility the first call to -# PKG_CHECK_MODULES might not happen, you should be sure to include an -# explicit call to PKG_PROG_PKG_CONFIG in your configure.ac +# Added better handling of ALL_LINGUAS from GNU gettext version +# written by Bruno Haible, Owen Taylor 5/30/3002 # +# Modified to require ngettext +# Matthias Clasen 08/06/2004 # -# -------------------------------------------------------------- -AC_DEFUN([PKG_CHECK_MODULES], -[AC_REQUIRE([PKG_PROG_PKG_CONFIG])dnl -AC_ARG_VAR([$1][_CFLAGS], [C compiler flags for $1, overriding pkg-config])dnl -AC_ARG_VAR([$1][_LIBS], [linker flags for $1, overriding pkg-config])dnl +# We need this here as well, since someone might use autoconf-2.5x +# to configure GLib then an older version to configure a package +# using AM_GLIB_GNU_GETTEXT +AC_PREREQ(2.53) -pkg_failed=no -AC_MSG_CHECKING([for $1]) +dnl +dnl We go to great lengths to make sure that aclocal won't +dnl try to pull in the installed version of these macros +dnl when running aclocal in the glib directory. +dnl +m4_copy([AC_DEFUN],[glib_DEFUN]) +m4_copy([AC_REQUIRE],[glib_REQUIRE]) +dnl +dnl At the end, if we're not within glib, we'll define the public +dnl definitions in terms of our private definitions. +dnl -_PKG_CONFIG([$1][_CFLAGS], [cflags], [$2]) -_PKG_CONFIG([$1][_LIBS], [libs], [$2]) +# GLIB_LC_MESSAGES +#-------------------- +glib_DEFUN([GLIB_LC_MESSAGES], + [AC_CHECK_HEADERS([locale.h]) + if test $ac_cv_header_locale_h = yes; then + AC_CACHE_CHECK([for LC_MESSAGES], am_cv_val_LC_MESSAGES, + [AC_TRY_LINK([#include ], [return LC_MESSAGES], + am_cv_val_LC_MESSAGES=yes, am_cv_val_LC_MESSAGES=no)]) + if test $am_cv_val_LC_MESSAGES = yes; then + AC_DEFINE(HAVE_LC_MESSAGES, 1, + [Define if your file defines LC_MESSAGES.]) + fi + fi]) -m4_define([_PKG_TEXT], [Alternatively, you may set the environment variables $1[]_CFLAGS -and $1[]_LIBS to avoid the need to call pkg-config. -See the pkg-config man page for more details.]) +# GLIB_PATH_PROG_WITH_TEST +#---------------------------- +dnl GLIB_PATH_PROG_WITH_TEST(VARIABLE, PROG-TO-CHECK-FOR, +dnl TEST-PERFORMED-ON-FOUND_PROGRAM [, VALUE-IF-NOT-FOUND [, PATH]]) +glib_DEFUN([GLIB_PATH_PROG_WITH_TEST], +[# Extract the first word of "$2", so it can be a program name with args. +set dummy $2; ac_word=[$]2 +AC_MSG_CHECKING([for $ac_word]) +AC_CACHE_VAL(ac_cv_path_$1, +[case "[$]$1" in + /*) + ac_cv_path_$1="[$]$1" # Let the user override the test with a path. + ;; + *) + IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS="${IFS}:" + for ac_dir in ifelse([$5], , $PATH, [$5]); do + test -z "$ac_dir" && ac_dir=. + if test -f $ac_dir/$ac_word; then + if [$3]; then + ac_cv_path_$1="$ac_dir/$ac_word" + break + fi + fi + done + IFS="$ac_save_ifs" +dnl If no 4th arg is given, leave the cache variable unset, +dnl so AC_PATH_PROGS will keep looking. +ifelse([$4], , , [ test -z "[$]ac_cv_path_$1" && ac_cv_path_$1="$4" +])dnl + ;; +esac])dnl +$1="$ac_cv_path_$1" +if test ifelse([$4], , [-n "[$]$1"], ["[$]$1" != "$4"]); then + AC_MSG_RESULT([$]$1) +else + AC_MSG_RESULT(no) +fi +AC_SUBST($1)dnl +]) -if test $pkg_failed = yes; then - AC_MSG_RESULT([no]) - _PKG_SHORT_ERRORS_SUPPORTED - if test $_pkg_short_errors_supported = yes; then - $1[]_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "$2" 2>&1` - else - $1[]_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "$2" 2>&1` - fi - # Put the nasty error message in config.log where it belongs - echo "$$1[]_PKG_ERRORS" >&AS_MESSAGE_LOG_FD +# GLIB_WITH_NLS +#----------------- +glib_DEFUN([GLIB_WITH_NLS], + dnl NLS is obligatory + [USE_NLS=yes + AC_SUBST(USE_NLS) - m4_default([$4], [AC_MSG_ERROR( -[Package requirements ($2) were not met: + gt_cv_have_gettext=no -$$1_PKG_ERRORS + CATOBJEXT=NONE + XGETTEXT=: + INTLLIBS= -Consider adjusting the PKG_CONFIG_PATH environment variable if you -installed software in a non-standard prefix. + AC_CHECK_HEADER(libintl.h, + [gt_cv_func_dgettext_libintl="no" + libintl_extra_libs="" -_PKG_TEXT])[]dnl - ]) -elif test $pkg_failed = untried; then - AC_MSG_RESULT([no]) - m4_default([$4], [AC_MSG_FAILURE( -[The pkg-config script could not be found or is too old. Make sure it -is in your PATH or set the PKG_CONFIG environment variable to the full -path to pkg-config. - -_PKG_TEXT - -To get pkg-config, see .])[]dnl + # + # First check in libc + # + AC_CACHE_CHECK([for ngettext in libc], gt_cv_func_ngettext_libc, + [AC_TRY_LINK([ +#include +], + [return !ngettext ("","", 1)], + gt_cv_func_ngettext_libc=yes, + gt_cv_func_ngettext_libc=no) ]) -else - $1[]_CFLAGS=$pkg_cv_[]$1[]_CFLAGS - $1[]_LIBS=$pkg_cv_[]$1[]_LIBS - AC_MSG_RESULT([yes]) - $3 -fi[]dnl -])# PKG_CHECK_MODULES + + if test "$gt_cv_func_ngettext_libc" = "yes" ; then + AC_CACHE_CHECK([for dgettext in libc], gt_cv_func_dgettext_libc, + [AC_TRY_LINK([ +#include +], + [return !dgettext ("","")], + gt_cv_func_dgettext_libc=yes, + gt_cv_func_dgettext_libc=no) + ]) + fi + + if test "$gt_cv_func_ngettext_libc" = "yes" ; then + AC_CHECK_FUNCS(bind_textdomain_codeset) + fi + # + # If we don't have everything we want, check in libintl + # + if test "$gt_cv_func_dgettext_libc" != "yes" \ + || test "$gt_cv_func_ngettext_libc" != "yes" \ + || test "$ac_cv_func_bind_textdomain_codeset" != "yes" ; then + + AC_CHECK_LIB(intl, bindtextdomain, + [AC_CHECK_LIB(intl, ngettext, + [AC_CHECK_LIB(intl, dgettext, + gt_cv_func_dgettext_libintl=yes)])]) -# 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 + if test "$gt_cv_func_dgettext_libintl" != "yes" ; then + AC_MSG_CHECKING([if -liconv is needed to use gettext]) + AC_MSG_RESULT([]) + AC_CHECK_LIB(intl, ngettext, + [AC_CHECK_LIB(intl, dcgettext, + [gt_cv_func_dgettext_libintl=yes + libintl_extra_libs=-liconv], + :,-liconv)], + :,-liconv) + fi + # + # If we found libintl, then check in it for bind_textdomain_codeset(); + # we'll prefer libc if neither have bind_textdomain_codeset(), + # and both have dgettext and ngettext + # + if test "$gt_cv_func_dgettext_libintl" = "yes" ; then + glib_save_LIBS="$LIBS" + LIBS="$LIBS -lintl $libintl_extra_libs" + unset ac_cv_func_bind_textdomain_codeset + AC_CHECK_FUNCS(bind_textdomain_codeset) + LIBS="$glib_save_LIBS" -# 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 + if test "$ac_cv_func_bind_textdomain_codeset" = "yes" ; then + gt_cv_func_dgettext_libc=no + else + if test "$gt_cv_func_dgettext_libc" = "yes" \ + && test "$gt_cv_func_ngettext_libc" = "yes"; then + gt_cv_func_dgettext_libintl=no + fi + fi + fi + fi + if test "$gt_cv_func_dgettext_libc" = "yes" \ + || test "$gt_cv_func_dgettext_libintl" = "yes"; then + gt_cv_have_gettext=yes + fi + + if test "$gt_cv_func_dgettext_libintl" = "yes"; then + INTLLIBS="-lintl $libintl_extra_libs" + fi + + if test "$gt_cv_have_gettext" = "yes"; then + AC_DEFINE(HAVE_GETTEXT,1, + [Define if the GNU gettext() function is already present or preinstalled.]) + GLIB_PATH_PROG_WITH_TEST(MSGFMT, msgfmt, + [test -z "`$ac_dir/$ac_word -h 2>&1 | grep 'dv '`"], no)dnl + if test "$MSGFMT" != "no"; then + glib_save_LIBS="$LIBS" + LIBS="$LIBS $INTLLIBS" + AC_CHECK_FUNCS(dcgettext) + MSGFMT_OPTS= + AC_MSG_CHECKING([if msgfmt accepts -c]) + GLIB_RUN_PROG([$MSGFMT -c -o /dev/null],[ +msgid "" +msgstr "" +"Content-Type: text/plain; charset=UTF-8\n" +"Project-Id-Version: test 1.0\n" +"PO-Revision-Date: 2007-02-15 12:01+0100\n" +"Last-Translator: test \n" +"Language-Team: C \n" +"MIME-Version: 1.0\n" +"Content-Transfer-Encoding: 8bit\n" +], [MSGFMT_OPTS=-c; AC_MSG_RESULT([yes])], [AC_MSG_RESULT([no])]) + AC_SUBST(MSGFMT_OPTS) + AC_PATH_PROG(GMSGFMT, gmsgfmt, $MSGFMT) + GLIB_PATH_PROG_WITH_TEST(XGETTEXT, xgettext, + [test -z "`$ac_dir/$ac_word -h 2>&1 | grep '(HELP)'`"], :) + AC_TRY_LINK(, [extern int _nl_msg_cat_cntr; + return _nl_msg_cat_cntr], + [CATOBJEXT=.gmo + DATADIRNAME=share], + [case $host in + *-*-solaris*) + dnl On Solaris, if bind_textdomain_codeset is in libc, + dnl GNU format message catalog is always supported, + dnl since both are added to the libc all together. + dnl Hence, we'd like to go with DATADIRNAME=share and + dnl and CATOBJEXT=.gmo in this case. + AC_CHECK_FUNC(bind_textdomain_codeset, + [CATOBJEXT=.gmo + DATADIRNAME=share], + [CATOBJEXT=.mo + DATADIRNAME=lib]) + ;; + *-*-openbsd*) + CATOBJEXT=.mo + DATADIRNAME=share + ;; + *) + CATOBJEXT=.mo + DATADIRNAME=lib + ;; + esac]) + LIBS="$glib_save_LIBS" + INSTOBJEXT=.mo + else + gt_cv_have_gettext=no + fi + fi + ]) -# 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 + if test "$gt_cv_have_gettext" = "yes" ; then + AC_DEFINE(ENABLE_NLS, 1, + [always defined to indicate that i18n is enabled]) + fi -_PKG_CONFIG([$1], [variable="][$3]["], [$2]) -AS_VAR_COPY([$1], [pkg_cv_][$1]) + dnl Test whether we really found GNU xgettext. + if test "$XGETTEXT" != ":"; then + dnl If it is not GNU xgettext we define it as : so that the + dnl Makefiles still can work. + if $XGETTEXT --omit-header /dev/null 2> /dev/null; then + : ; + else + AC_MSG_RESULT( + [found xgettext program is not GNU xgettext; ignore it]) + XGETTEXT=":" + fi + fi -AS_VAR_IF([$1], [""], [$5], [$4])dnl -])# PKG_CHECK_VAR + # We need to process the po/ directory. + POSUB=po -AC_DEFUN([YELP_HELP_INIT], -[ -AC_REQUIRE([AC_PROG_LN_S]) -m4_pattern_allow([AM_V_at]) -m4_pattern_allow([AM_V_GEN]) -m4_pattern_allow([AM_DEFAULT_VERBOSITY]) -AC_ARG_WITH([help-dir], - AC_HELP_STRING([--with-help-dir=DIR], - [path where help files are installed]),, - [with_help_dir='${datadir}/help']) -HELP_DIR="$with_help_dir" -AC_SUBST(HELP_DIR) + AC_OUTPUT_COMMANDS( + [case "$CONFIG_FILES" in *po/Makefile.in*) + sed -e "/POTFILES =/r po/POTFILES" po/Makefile.in > po/Makefile + esac]) -AC_ARG_VAR([ITSTOOL], [Path to the `itstool` command]) -AC_CHECK_PROG([ITSTOOL], [itstool], [itstool]) -if test x"$ITSTOOL" = x; then - AC_MSG_ERROR([itstool not found]) -fi + dnl These rules are solely for the distribution goal. While doing this + dnl we only have to keep exactly one list of the available catalogs + dnl in configure.ac. + for lang in $ALL_LINGUAS; do + GMOFILES="$GMOFILES $lang.gmo" + POFILES="$POFILES $lang.po" + done -AC_ARG_VAR([XMLLINT], [Path to the `xmllint` command]) -AC_CHECK_PROG([XMLLINT], [xmllint], [xmllint]) -if test x"$XMLLINT" = x; then - AC_MSG_ERROR([xmllint not found]) -fi + dnl Make all variables we use known to autoconf. + AC_SUBST(CATALOGS) + AC_SUBST(CATOBJEXT) + AC_SUBST(DATADIRNAME) + AC_SUBST(GMOFILES) + AC_SUBST(INSTOBJEXT) + AC_SUBST(INTLLIBS) + AC_SUBST(PO_IN_DATADIR_TRUE) + AC_SUBST(PO_IN_DATADIR_FALSE) + AC_SUBST(POFILES) + AC_SUBST(POSUB) + ]) -YELP_HELP_RULES=' -HELP_ID ?= -HELP_POT ?= -HELP_FILES ?= -HELP_EXTRA ?= -HELP_MEDIA ?= -HELP_LINGUAS ?= +# AM_GLIB_GNU_GETTEXT +# ------------------- +# Do checks necessary for use of gettext. If a suitable implementation +# of gettext is found in either in libintl or in the C library, +# it will set INTLLIBS to the libraries needed for use of gettext +# and AC_DEFINE() HAVE_GETTEXT and ENABLE_NLS. (The shell variable +# gt_cv_have_gettext will be set to "yes".) It will also call AC_SUBST() +# on various variables needed by the Makefile.in.in installed by +# glib-gettextize. +dnl +glib_DEFUN([GLIB_GNU_GETTEXT], + [AC_REQUIRE([AC_PROG_CC])dnl + AC_REQUIRE([AC_HEADER_STDC])dnl + + GLIB_LC_MESSAGES + GLIB_WITH_NLS -_HELP_LINGUAS = $(if $(filter environment,$(origin LINGUAS)),$(filter $(LINGUAS),$(HELP_LINGUAS)),$(HELP_LINGUAS)) -_HELP_POTFILE = $(if $(HELP_POT),$(HELP_POT),$(if $(HELP_ID),$(HELP_ID).pot)) -_HELP_POFILES = $(if $(HELP_ID),$(foreach lc,$(_HELP_LINGUAS),$(lc)/$(lc).po)) -_HELP_MOFILES = $(patsubst %.po,%.mo,$(_HELP_POFILES)) -_HELP_C_FILES = $(foreach f,$(HELP_FILES),C/$(f)) -_HELP_C_EXTRA = $(foreach f,$(HELP_EXTRA),C/$(f)) -_HELP_C_MEDIA = $(foreach f,$(HELP_MEDIA),C/$(f)) -_HELP_LC_FILES = $(foreach lc,$(_HELP_LINGUAS),$(foreach f,$(HELP_FILES),$(lc)/$(f))) -_HELP_LC_STAMPS = $(foreach lc,$(_HELP_LINGUAS),$(lc)/$(lc).stamp) + if test "$gt_cv_have_gettext" = "yes"; then + if test "x$ALL_LINGUAS" = "x"; then + LINGUAS= + else + AC_MSG_CHECKING(for catalogs to be installed) + NEW_LINGUAS= + for presentlang in $ALL_LINGUAS; do + useit=no + if test "%UNSET%" != "${LINGUAS-%UNSET%}"; then + desiredlanguages="$LINGUAS" + else + desiredlanguages="$ALL_LINGUAS" + fi + for desiredlang in $desiredlanguages; do + # Use the presentlang catalog if desiredlang is + # a. equal to presentlang, or + # b. a variant of presentlang (because in this case, + # presentlang can be used as a fallback for messages + # which are not translated in the desiredlang catalog). + case "$desiredlang" in + "$presentlang"*) useit=yes;; + esac + done + if test $useit = yes; then + NEW_LINGUAS="$NEW_LINGUAS $presentlang" + fi + done + LINGUAS=$NEW_LINGUAS + AC_MSG_RESULT($LINGUAS) + fi -_HELP_DEFAULT_V = $(if $(AM_DEFAULT_VERBOSITY),$(AM_DEFAULT_VERBOSITY),1) -_HELP_V = $(if $(V),$(V),$(_HELP_DEFAULT_V)) -_HELP_LC_VERBOSE = $(_HELP_LC_VERBOSE_$(_HELP_V)) -_HELP_LC_VERBOSE_ = $(_HELP_LC_VERBOSE_$(_HELP_DEFAULT_V)) -_HELP_LC_VERBOSE_0 = @echo " GEN "$(dir [$]@); + dnl Construct list of names of catalog files to be constructed. + if test -n "$LINGUAS"; then + for lang in $LINGUAS; do CATALOGS="$CATALOGS $lang$CATOBJEXT"; done + fi + fi -all: $(_HELP_C_FILES) $(_HELP_C_EXTRA) $(_HELP_C_MEDIA) $(_HELP_LC_FILES) $(_HELP_POFILES) + dnl If the AC_CONFIG_AUX_DIR macro for autoconf is used we possibly + dnl find the mkinstalldirs script in another subdir but ($top_srcdir). + dnl Try to locate is. + MKINSTALLDIRS= + if test -n "$ac_aux_dir"; then + MKINSTALLDIRS="$ac_aux_dir/mkinstalldirs" + fi + if test -z "$MKINSTALLDIRS"; then + MKINSTALLDIRS="\$(top_srcdir)/mkinstalldirs" + fi + AC_SUBST(MKINSTALLDIRS) -.PHONY: pot -pot: $(_HELP_POTFILE) -$(_HELP_POTFILE): $(_HELP_C_FILES) $(_HELP_C_EXTRA) $(_HELP_C_MEDIA) - $(AM_V_GEN)if test -d "C"; then d=; else d="$(srcdir)/"; fi; \ - $(ITSTOOL) -o "[$]@" $(foreach f,$(_HELP_C_FILES),"$${d}$(f)") + dnl Generate list of files to be processed by xgettext which will + dnl be included in po/Makefile. + test -d po || mkdir po + if test "x$srcdir" != "x."; then + if test "x`echo $srcdir | sed 's@/.*@@'`" = "x"; then + posrcprefix="$srcdir/" + else + posrcprefix="../$srcdir/" + fi + else + posrcprefix="../" + fi + rm -f po/POTFILES + sed -e "/^#/d" -e "/^\$/d" -e "s,.*, $posrcprefix& \\\\," -e "\$s/\(.*\) \\\\/\1/" \ + < $srcdir/po/POTFILES.in > po/POTFILES + ]) -.PHONY: repo -repo: $(_HELP_POTFILE) - $(AM_V_at)for po in $(_HELP_POFILES); do \ - if test "x[$](_HELP_V)" = "x0"; then echo " GEN $${po}"; fi; \ - msgmerge -q -o "$${po}" "$${po}" "$(_HELP_POTFILE)"; \ - done +# AM_GLIB_DEFINE_LOCALEDIR(VARIABLE) +# ------------------------------- +# Define VARIABLE to the location where catalog files will +# be installed by po/Makefile. +glib_DEFUN([GLIB_DEFINE_LOCALEDIR], +[glib_REQUIRE([GLIB_GNU_GETTEXT])dnl +glib_save_prefix="$prefix" +glib_save_exec_prefix="$exec_prefix" +glib_save_datarootdir="$datarootdir" +test "x$prefix" = xNONE && prefix=$ac_default_prefix +test "x$exec_prefix" = xNONE && exec_prefix=$prefix +datarootdir=`eval echo "${datarootdir}"` +if test "x$CATOBJEXT" = "x.mo" ; then + localedir=`eval echo "${libdir}/locale"` +else + localedir=`eval echo "${datadir}/locale"` +fi +prefix="$glib_save_prefix" +exec_prefix="$glib_save_exec_prefix" +datarootdir="$glib_save_datarootdir" +AC_DEFINE_UNQUOTED($1, "$localedir", + [Define the location where the catalogs will be installed]) +]) -$(_HELP_POFILES): - $(AM_V_at)if ! test -d "$(dir [$]@)"; then mkdir "$(dir [$]@)"; fi - $(AM_V_at)if test ! -f "[$]@" -a -f "$(srcdir)/[$]@"; then cp "$(srcdir)/[$]@" "[$]@"; fi - $(AM_V_GEN)if ! test -f "[$]@"; then \ - (cd "$(dir [$]@)" && \ - $(ITSTOOL) -o "$(notdir [$]@).tmp" $(_HELP_C_FILES) && \ - mv "$(notdir [$]@).tmp" "$(notdir [$]@)"); \ - else \ - (cd "$(dir [$]@)" && \ - $(ITSTOOL) -o "$(notdir [$]@).tmp" $(_HELP_C_FILES) && \ - msgmerge -o "$(notdir [$]@)" "$(notdir [$]@)" "$(notdir [$]@).tmp" && \ - rm "$(notdir [$]@).tmp"); \ - fi +dnl +dnl Now the definitions that aclocal will find +dnl +ifdef(glib_configure_ac,[],[ +AC_DEFUN([AM_GLIB_GNU_GETTEXT],[GLIB_GNU_GETTEXT($@)]) +AC_DEFUN([AM_GLIB_DEFINE_LOCALEDIR],[GLIB_DEFINE_LOCALEDIR($@)]) +])dnl -$(_HELP_MOFILES): %.mo: %.po - $(AM_V_at)if ! test -d "$(dir [$]@)"; then mkdir "$(dir [$]@)"; fi - $(AM_V_GEN)msgfmt -o "[$]@" "$<" +# GLIB_RUN_PROG(PROGRAM, TEST-FILE, [ACTION-IF-PASS], [ACTION-IF-FAIL]) +# +# Create a temporary file with TEST-FILE as its contents and pass the +# file name to PROGRAM. Perform ACTION-IF-PASS if PROGRAM exits with +# 0 and perform ACTION-IF-FAIL for any other exit status. +AC_DEFUN([GLIB_RUN_PROG], +[cat >conftest.foo <<_ACEOF +$2 +_ACEOF +if AC_RUN_LOG([$1 conftest.foo]); then + m4_ifval([$3], [$3], [:]) +m4_ifvaln([$4], [else $4])dnl +echo "$as_me: failed input was:" >&AS_MESSAGE_LOG_FD +sed 's/^/| /' conftest.foo >&AS_MESSAGE_LOG_FD +fi]) -$(_HELP_LC_FILES): $(_HELP_LINGUAS) -$(_HELP_LINGUAS): $(_HELP_LC_STAMPS) -$(_HELP_LC_STAMPS): %.stamp: %.mo -$(_HELP_LC_STAMPS): $(_HELP_C_FILES) $(_HELP_C_EXTRA) - $(AM_V_at)if ! test -d "$(dir [$]@)"; then mkdir "$(dir [$]@)"; fi - $(_HELP_LC_VERBOSE)if test -d "C"; then d="../"; else d="$(abs_srcdir)/"; fi; \ - mo="$(dir [$]@)$(patsubst %/$(notdir [$]@),%,[$]@).mo"; \ - if test -f "$${mo}"; then mo="../$${mo}"; else mo="$(abs_srcdir)/$${mo}"; fi; \ - (cd "$(dir [$]@)" && $(ITSTOOL) -m "$${mo}" $(foreach f,$(_HELP_C_FILES),$${d}/$(f))) && \ - touch "[$]@" -.PHONY: clean-help -mostlyclean-am: $(if $(HELP_ID),clean-help) -clean-help: - rm -f $(_HELP_LC_FILES) $(_HELP_LC_STAMPS) $(_HELP_MOFILES) +# gnome-common.m4 +# +# serial 3 +# -EXTRA_DIST ?= -EXTRA_DIST += $(_HELP_C_EXTRA) $(_HELP_C_MEDIA) -EXTRA_DIST += $(foreach lc,$(HELP_LINGUAS),$(lc)/$(lc).stamp) -EXTRA_DIST += $(foreach lc,$(HELP_LINGUAS),$(lc)/$(lc).po) -EXTRA_DIST += $(foreach f,$(HELP_MEDIA),$(foreach lc,$(HELP_LINGUAS),$(wildcard $(lc)/$(f)))) +dnl GNOME_COMMON_INIT -distdir: distdir-help-files -distdir-help-files: - @for lc in C $(HELP_LINGUAS); do \ - $(MKDIR_P) "$(distdir)/$$lc"; \ - for file in $(HELP_FILES); do \ - if test -f "$$lc/$$file"; then d=./; else d=$(srcdir)/; fi; \ - cp -p "$$d$$lc/$$file" "$(distdir)/$$lc/" || exit 1; \ - done; \ - done; \ +AU_DEFUN([GNOME_COMMON_INIT], +[ + dnl this macro should come after AC_CONFIG_MACRO_DIR + AC_BEFORE([AC_CONFIG_MACRO_DIR], [$0]) -.PHONY: check-help -check: check-help -check-help: - for lc in C $(_HELP_LINGUAS); do \ - if test -d "$$lc"; \ - then d=; \ - xmlpath="$$lc"; \ - else \ - d="$(srcdir)/"; \ - xmlpath="$$lc:$(srcdir)/$$lc"; \ - fi; \ - for page in $(HELP_FILES); do \ - echo "$(XMLLINT) --noout --noent --path $$xmlpath --xinclude $$d$$lc/$$page"; \ - $(XMLLINT) --noout --noent --path "$$xmlpath" --xinclude "$$d$$lc/$$page"; \ - done; \ - done + dnl ensure that when the Automake generated makefile calls aclocal, + dnl it honours the $ACLOCAL_FLAGS environment variable + ACLOCAL_AMFLAGS="\${ACLOCAL_FLAGS}" + if test -n "$ac_macro_dir"; then + ACLOCAL_AMFLAGS="-I $ac_macro_dir $ACLOCAL_AMFLAGS" + fi + AC_SUBST([ACLOCAL_AMFLAGS]) +], +[[$0: This macro is deprecated. You should set put "ACLOCAL_AMFLAGS = -I m4 ${ACLOCAL_FLAGS}" +in your top-level Makefile.am, instead, where "m4" is the macro directory set +with AC_CONFIG_MACRO_DIR() in your configure.ac]]) -.PHONY: install-help -install-data-am: $(if $(HELP_ID),install-help) -install-help: - @for lc in C $(_HELP_LINGUAS); do \ - $(mkinstalldirs) "$(DESTDIR)$(HELP_DIR)/$$lc/$(HELP_ID)" || exit 1; \ - done - @for lc in C $(_HELP_LINGUAS); do for f in $(HELP_FILES); do \ - if test -f "$$lc/$$f"; then d=; else d="$(srcdir)/"; fi; \ - helpdir="$(DESTDIR)$(HELP_DIR)/$$lc/$(HELP_ID)/"; \ - if ! test -d "$$helpdir"; then $(mkinstalldirs) "$$helpdir"; fi; \ - echo "$(INSTALL_DATA) $$d$$lc/$$f $$helpdir`basename $$f`"; \ - $(INSTALL_DATA) "$$d$$lc/$$f" "$$helpdir`basename $$f`" || exit 1; \ - done; done - @for f in $(_HELP_C_EXTRA); do \ - lc=`dirname "$$f"`; lc=`basename "$$lc"`; \ - if test -f "$$f"; then d=; else d="$(srcdir)/"; fi; \ - helpdir="$(DESTDIR)$(HELP_DIR)/$$lc/$(HELP_ID)/"; \ - if ! test -d "$$helpdir"; then $(mkinstalldirs) "$$helpdir"; fi; \ - echo "$(INSTALL_DATA) $$d$$f $$helpdir`basename $$f`"; \ - $(INSTALL_DATA) "$$d$$f" "$$helpdir`basename $$f`" || exit 1; \ - done - @for f in $(HELP_MEDIA); do \ - for lc in C $(_HELP_LINGUAS); do \ - if test -f "$$lc$$f"; then d=; else d="$(srcdir)/"; fi; \ - helpdir="$(DESTDIR)$(HELP_DIR)/$$lc/$(HELP_ID)/"; \ - mdir=`dirname "$$f"`; \ - if test "x$mdir" = "x."; then mdir=""; fi; \ - if ! test -d "$$helpdir$$mdir"; then $(mkinstalldirs) "$$helpdir$$mdir"; fi; \ - if test -f "$$d$$lc/$$f"; then \ - echo "$(INSTALL_DATA) $$d$$lc/$$f $$helpdir$$f"; \ - $(INSTALL_DATA) "$$d$$lc/$$f" "$$helpdir$$f" || exit 1; \ - elif test "x$$lc" != "xC"; then \ - echo "$(LN_S) -f $(HELP_DIR)/C/$(HELP_ID)/$$f $$helpdir$$f"; \ - $(LN_S) -f "$(HELP_DIR)/C/$(HELP_ID)/$$f" "$$helpdir$$f" || exit 1; \ - fi; \ - done; \ - done +AC_DEFUN([GNOME_DEBUG_CHECK], +[ + AC_ARG_ENABLE([debug], + AC_HELP_STRING([--enable-debug], + [turn on debugging]),, + [enable_debug=no]) -.PHONY: uninstall-help -uninstall-am: $(if $(HELP_ID),uninstall-help) -uninstall-help: - for lc in C $(_HELP_LINGUAS); do for f in $(HELP_FILES); do \ - helpdir="$(DESTDIR)$(HELP_DIR)/$$lc/$(HELP_ID)/"; \ - echo "rm -f $$helpdir`basename $$f`"; \ - rm -f "$$helpdir`basename $$f`"; \ - done; done - @for f in $(_HELP_C_EXTRA); do \ - lc=`dirname "$$f"`; lc=`basename "$$lc"`; \ - helpdir="$(DESTDIR)$(HELP_DIR)/$$lc/$(HELP_ID)/"; \ - echo "rm -f $$helpdir`basename $$f`"; \ - rm -f "$$helpdir`basename $$f`"; \ - done - @for f in $(HELP_MEDIA); do \ - for lc in C $(_HELP_LINGUAS); do \ - helpdir="$(DESTDIR)$(HELP_DIR)/$$lc/$(HELP_ID)/"; \ - echo "rm -f $$helpdir$$f"; \ - rm -f "$$helpdir$$f"; \ - done; \ - done; -' -AC_SUBST([YELP_HELP_RULES]) -m4_ifdef([_AM_SUBST_NOTMAKE], [_AM_SUBST_NOTMAKE([YELP_HELP_RULES])]) + if test x$enable_debug = xyes ; then + AC_DEFINE(GNOME_ENABLE_DEBUG, 1, + [Enable additional debugging at the expense of performance and size]) + fi ]) -# 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. +dnl GNOME_MAINTAINER_MODE_DEFINES () +dnl define DISABLE_DEPRECATED +dnl +AC_DEFUN([GNOME_MAINTAINER_MODE_DEFINES], +[ + AC_REQUIRE([AM_MAINTAINER_MODE]) -# 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.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.13.4], [], - [AC_FATAL([Do not call $0, use AM_INIT_AUTOMAKE([$1]).])])dnl + DISABLE_DEPRECATED="" + if test $USE_MAINTAINER_MODE = yes; then + DOMAINS="GCONF BONOBO BONOBO_UI GNOME LIBGLADE GNOME_VFS WNCK LIBSOUP" + for DOMAIN in $DOMAINS; do + DISABLE_DEPRECATED="$DISABLE_DEPRECATED -D${DOMAIN}_DISABLE_DEPRECATED -D${DOMAIN}_DISABLE_SINGLE_INCLUDES" + done + fi + + AC_SUBST(DISABLE_DEPRECATED) ]) -# _AM_AUTOCONF_VERSION(VERSION) -# ----------------------------- -# aclocal traces this macro to find the Autoconf version. -# This is a private macro too. Using m4_define simplifies -# the logic in aclocal, which can simply ignore this definition. -m4_define([_AM_AUTOCONF_VERSION], []) +dnl GNOME_COMPILE_WARNINGS +dnl Turn on many useful compiler warnings and substitute the result into +dnl WARN_CFLAGS +dnl For now, only works on GCC +AC_DEFUN([GNOME_COMPILE_WARNINGS],[ + dnl ****************************** + dnl More compiler warnings + dnl ****************************** -# AM_SET_CURRENT_AUTOMAKE_VERSION -# ------------------------------- -# 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.13.4])dnl -m4_ifndef([AC_AUTOCONF_VERSION], - [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl -_AM_AUTOCONF_VERSION(m4_defn([AC_AUTOCONF_VERSION]))]) + AC_ARG_ENABLE(compile-warnings, + AC_HELP_STRING([--enable-compile-warnings=@<:@no/minimum/yes/maximum/error@:>@], + [Turn on compiler warnings]),, + [enable_compile_warnings="m4_default([$1],[yes])"]) -# AM_AUX_DIR_EXPAND -*- Autoconf -*- + if test "x$GCC" != xyes; then + enable_compile_warnings=no + fi -# 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. + warning_flags= + realsave_CFLAGS="$CFLAGS" -# 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/../..'. -# -# Of course, Automake must honor this variable whenever it calls a -# tool from the auxiliary directory. The problem is that $srcdir (and -# therefore $ac_aux_dir as well) can be either absolute or relative, -# depending on how configure is run. This is pretty annoying, since -# it makes $ac_aux_dir quite unusable in subdirectories: in the top -# source directory, any form will work fine, but in subdirectories a -# relative path needs to be adjusted first. -# -# $ac_aux_dir/missing -# fails when called from a subdirectory if $ac_aux_dir is relative -# $top_srcdir/$ac_aux_dir/missing -# fails if $ac_aux_dir is absolute, -# fails when called from a subdirectory in a VPATH build with -# a relative $ac_aux_dir -# -# 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 -# start a VPATH build or use an absolute $srcdir. -# -# So we could use something similar to $top_srcdir/$ac_aux_dir/missing, -# iff we strip the leading $srcdir from $ac_aux_dir. That would be: -# am_aux_dir='\$(top_srcdir)/'`expr "$ac_aux_dir" : "$srcdir//*\(.*\)"` -# and then we would define $MISSING as -# MISSING="\${SHELL} $am_aux_dir/missing" -# This will work as long as MISSING is not called from configure, because -# unfortunately $(top_srcdir) has no meaning in configure. -# However there are other variables, like CC, which are often used in -# configure, and could therefore not use this "fixed" $ac_aux_dir. -# -# Another solution, used here, is to always expand $ac_aux_dir to an -# absolute PATH. The drawback is that using absolute paths prevent a -# configured tree to be moved without reconfiguration. + dnl These are warning flags that aren't marked as fatal. Can be + dnl overridden on a per-project basis with -Wno-foo. + base_warn_flags=" \ + -Wall \ + -Wstrict-prototypes \ + -Wnested-externs \ + " -AC_DEFUN([AM_AUX_DIR_EXPAND], -[dnl Rely on autoconf to set up CDPATH properly. -AC_PREREQ([2.50])dnl -# expand $ac_aux_dir to an absolute path -am_aux_dir=`cd $ac_aux_dir && pwd` -]) + dnl These compiler flags typically indicate very broken or suspicious + dnl code. Some of them such as implicit-function-declaration are + dnl just not default because gcc compiles a lot of legacy code. + dnl We choose to make this set into explicit errors. + base_error_flags=" \ + -Werror=missing-prototypes \ + -Werror=implicit-function-declaration \ + -Werror=pointer-arith \ + -Werror=init-self \ + -Werror=format-security \ + -Werror=format=2 \ + -Werror=missing-include-dirs \ + " -# AM_CONDITIONAL -*- Autoconf -*- + case "$enable_compile_warnings" in + no) + warning_flags= + ;; + minimum) + warning_flags="-Wall" + ;; + yes) + warning_flags="$base_warn_flags $base_error_flags" + ;; + maximum|error) + warning_flags="$base_warn_flags $base_error_flags" + ;; + *) + AC_MSG_ERROR(Unknown argument '$enable_compile_warnings' to --enable-compile-warnings) + ;; + esac -# 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. + if test "$enable_compile_warnings" = "error" ; then + warning_flags="$warning_flags -Werror" + fi -# AM_CONDITIONAL(NAME, SHELL-CONDITION) -# ------------------------------------- -# Define a conditional. -AC_DEFUN([AM_CONDITIONAL], -[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 -_AM_SUBST_NOTMAKE([$1_FALSE])dnl -m4_define([_AM_COND_VALUE_$1], [$2])dnl -if $2; then - $1_TRUE= - $1_FALSE='#' -else - $1_TRUE='#' - $1_FALSE= -fi -AC_CONFIG_COMMANDS_PRE( -[if test -z "${$1_TRUE}" && test -z "${$1_FALSE}"; then - AC_MSG_ERROR([[conditional "$1" was never defined. -Usually this means the macro was only invoked conditionally.]]) -fi])]) + dnl Check whether GCC supports the warning options + for option in $warning_flags; do + save_CFLAGS="$CFLAGS" + CFLAGS="$CFLAGS $option" + AC_MSG_CHECKING([whether gcc understands $option]) + AC_TRY_COMPILE([], [], + has_option=yes, + has_option=no,) + CFLAGS="$save_CFLAGS" + AC_MSG_RESULT([$has_option]) + if test $has_option = yes; then + tested_warning_flags="$tested_warning_flags $option" + fi + unset has_option + unset save_CFLAGS + done + unset option + CFLAGS="$realsave_CFLAGS" + AC_MSG_CHECKING(what warning flags to pass to the C compiler) + AC_MSG_RESULT($tested_warning_flags) -# 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. - - -# 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 -# CC etc. in the Makefile, will ask for an AC_PROG_CC use... + AC_ARG_ENABLE(iso-c, + AC_HELP_STRING([--enable-iso-c], + [Try to warn if code is not ISO C ]),, + [enable_iso_c=no]) + AC_MSG_CHECKING(what language compliance flags to pass to the C compiler) + complCFLAGS= + if test "x$enable_iso_c" != "xno"; then + if test "x$GCC" = "xyes"; then + case " $CFLAGS " in + *[\ \ ]-ansi[\ \ ]*) ;; + *) complCFLAGS="$complCFLAGS -ansi" ;; + esac + case " $CFLAGS " in + *[\ \ ]-pedantic[\ \ ]*) ;; + *) complCFLAGS="$complCFLAGS -pedantic" ;; + esac + fi + fi + AC_MSG_RESULT($complCFLAGS) -# _AM_DEPENDENCIES(NAME) -# ---------------------- -# See how the compiler implements dependency checking. -# 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 -# modified to invoke _AM_DEPENDENCIES(CC); we would have a circular -# dependency, and given that the user is not expected to run this macro, -# just rely on AC_PROG_CC. -AC_DEFUN([_AM_DEPENDENCIES], -[AC_REQUIRE([AM_SET_DEPDIR])dnl -AC_REQUIRE([AM_OUTPUT_DEPENDENCY_COMMANDS])dnl -AC_REQUIRE([AM_MAKE_INCLUDE])dnl -AC_REQUIRE([AM_DEP_TRACK])dnl + WARN_CFLAGS="$tested_warning_flags $complCFLAGS" + AC_SUBST(WARN_CFLAGS) +]) -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=]) +dnl For C++, do basically the same thing. -AC_CACHE_CHECK([dependency style of $depcc], - [am_cv_$1_dependencies_compiler_type], -[if test -z "$AMDEP_TRUE" && test -f "$am_depcomp"; then - # 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". - rm -rf conftest.dir - mkdir conftest.dir - # Copy depcomp to subdir because otherwise we won't find it if we're - # using a relative directory. - cp "$am_depcomp" conftest.dir - cd conftest.dir - # We will build objects and dependencies in a subdirectory because - # it helps to detect inapplicable dependency modes. For instance - # both Tru64's cc and ICC support -MD to output dependencies as a - # side effect of compilation, but ICC will put the dependencies in - # the current directory while Tru64 will put them in the object - # directory. - mkdir sub +AC_DEFUN([GNOME_CXX_WARNINGS],[ + AC_ARG_ENABLE(cxx-warnings, + AC_HELP_STRING([--enable-cxx-warnings=@<:@no/minimum/yes@:>@] + [Turn on compiler warnings.]),, + [enable_cxx_warnings="m4_default([$1],[minimum])"]) - am_cv_$1_dependencies_compiler_type=none - if test "$am_compiler_list" = ""; then - am_compiler_list=`sed -n ['s/^#*\([a-zA-Z0-9]*\))$/\1/p'] < ./depcomp` + AC_MSG_CHECKING(what warning flags to pass to the C++ compiler) + warnCXXFLAGS= + if test "x$GXX" != xyes; then + enable_cxx_warnings=no fi - am__universal=false - m4_case([$1], [CC], - [case " $depcc " in #( - *\ -arch\ *\ -arch\ *) am__universal=true ;; - esac], - [CXX], - [case " $depcc " in #( - *\ -arch\ *\ -arch\ *) am__universal=true ;; - esac]) - - for depmode in $am_compiler_list; do - # Setup a source with many dependencies, because some compilers - # like to wrap large dependency lists on column 80 (with \), and - # we should not choose a depcomp mode which is confused by this. - # - # We need to recreate these files for each test, as the compiler may - # overwrite some of them when testing with obscure command lines. - # This happens at least with the AIX C compiler. - : > 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 10 /bin/sh. - echo '/* dummy */' > sub/conftst$i.h - done - echo "${am__include} ${am__quote}sub/conftest.Po${am__quote}" > confmf + if test "x$enable_cxx_warnings" != "xno"; then + if test "x$GXX" = "xyes"; then + case " $CXXFLAGS " in + *[\ \ ]-Wall[\ \ ]*) ;; + *) warnCXXFLAGS="-Wall -Wno-unused" ;; + esac - # 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. - am__obj=sub/conftest.${OBJEXT-o} - am__minus_obj="-o $am__obj" - case $depmode in - gcc) - # This depmode causes a compiler race in universal mode. - test "$am__universal" = false || continue - ;; - nosideeffect) - # 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 - break - fi - ;; - msvc7 | msvc7msys | msvisualcpp | msvcmsys) - # 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} - am__minus_obj= - ;; - none) break ;; - esac - if depmode=$depmode \ - source=sub/conftest.c object=$am__obj \ - depfile=sub/conftest.Po tmpdepfile=sub/conftest.TPo \ - $SHELL ./depcomp $depcc -c $am__minus_obj sub/conftest.c \ - >/dev/null 2>conftest.err && - grep sub/conftst1.h sub/conftest.Po > /dev/null 2>&1 && - grep sub/conftst6.h sub/conftest.Po > /dev/null 2>&1 && - grep $am__obj sub/conftest.Po > /dev/null 2>&1 && - ${MAKE-make} -s -f confmf > /dev/null 2>&1; then - # icc doesn't choke on unknown options, it will just issue warnings - # or remarks (even with -Werror). So we grep stderr for any message - # that says an option was ignored or not supported. - # When given -MP, icc 7.0 and 7.1 complain thusly: - # icc: Command line warning: ignoring option '-M'; no argument required - # The diagnosis changed in icc 8.0: - # icc: Command line remark: option '-MP' not supported - if (grep 'ignoring option' conftest.err || - grep 'not supported' conftest.err) >/dev/null 2>&1; then :; else - am_cv_$1_dependencies_compiler_type=$depmode - break + ## -W is not all that useful. And it cannot be controlled + ## with individual -Wno-xxx flags, unlike -Wall + if test "x$enable_cxx_warnings" = "xyes"; then + warnCXXFLAGS="$warnCXXFLAGS -Wshadow -Woverloaded-virtual" fi fi - done - - cd .. - rm -rf conftest.dir -else - am_cv_$1_dependencies_compiler_type=none -fi -]) -AC_SUBST([$1DEPMODE], [depmode=$am_cv_$1_dependencies_compiler_type]) -AM_CONDITIONAL([am__fastdep$1], [ - test "x$enable_dependency_tracking" != xno \ - && test "$am_cv_$1_dependencies_compiler_type" = gcc3]) -]) + fi + AC_MSG_RESULT($warnCXXFLAGS) + AC_ARG_ENABLE(iso-cxx, + AC_HELP_STRING([--enable-iso-cxx], + [Try to warn if code is not ISO C++ ]),, + [enable_iso_cxx=no]) -# AM_SET_DEPDIR -# ------------- -# Choose a directory name for dependency files. -# 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 -]) + AC_MSG_CHECKING(what language compliance flags to pass to the C++ compiler) + complCXXFLAGS= + if test "x$enable_iso_cxx" != "xno"; then + if test "x$GXX" = "xyes"; then + case " $CXXFLAGS " in + *[\ \ ]-ansi[\ \ ]*) ;; + *) complCXXFLAGS="$complCXXFLAGS -ansi" ;; + esac + case " $CXXFLAGS " in + *[\ \ ]-pedantic[\ \ ]*) ;; + *) complCXXFLAGS="$complCXXFLAGS -pedantic" ;; + esac + fi + fi + AC_MSG_RESULT($complCXXFLAGS) -# AM_DEP_TRACK -# ------------ -AC_DEFUN([AM_DEP_TRACK], -[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='\' - am__nodep='_no' -fi -AM_CONDITIONAL([AMDEP], [test "x$enable_dependency_tracking" != xno]) -AC_SUBST([AMDEPBACKSLASH])dnl -_AM_SUBST_NOTMAKE([AMDEPBACKSLASH])dnl -AC_SUBST([am__nodep])dnl -_AM_SUBST_NOTMAKE([am__nodep])dnl + WARN_CXXFLAGS="$CXXFLAGS $warnCXXFLAGS $complCXXFLAGS" + AC_SUBST(WARN_CXXFLAGS) ]) -# Generate code to set up dependency tracking. -*- Autoconf -*- +dnl -*- mode: autoconf -*- +dnl Copyright 2009 Johan Dahlin +dnl +dnl This file is free software; the author(s) gives unlimited +dnl permission to copy and/or distribute it, with or without +dnl modifications, as long as this notice is preserved. +dnl -# 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 1 +m4_define([_GOBJECT_INTROSPECTION_CHECK_INTERNAL], +[ + AC_BEFORE([AC_PROG_LIBTOOL],[$0])dnl setup libtool first + AC_BEFORE([AM_PROG_LIBTOOL],[$0])dnl setup libtool first + AC_BEFORE([LT_INIT],[$0])dnl setup libtool first -# _AM_OUTPUT_DEPENDENCY_COMMANDS -# ------------------------------ -AC_DEFUN([_AM_OUTPUT_DEPENDENCY_COMMANDS], -[{ - # 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 - *\'*) eval set x "$CONFIG_FILES" ;; - *) set x $CONFIG_FILES ;; - esac - shift - for mf - do - # 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 - # 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. - # Grep'ing the whole file is not good either: AIX grep has a line - # limit of 2048, but all sed's we know have understand at least 4000. - if sed -n 's,^#.*generated by automake.*,X,p' "$mf" | grep X >/dev/null 2>&1; then - dirpart=`AS_DIRNAME("$mf")` - else - continue - fi - # Extract the definition of DEPDIR, am__include, and am__quote - # 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"` - # 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'`; do - # Make sure the directory exists. - test -f "$dirpart/$file" && continue - fdir=`AS_DIRNAME(["$file"])` - AS_MKDIR_P([$dirpart/$fdir]) - # echo "creating $dirpart/$file" - echo '# dummy' > "$dirpart/$file" - done - done -} -])# _AM_OUTPUT_DEPENDENCY_COMMANDS - - -# AM_OUTPUT_DEPENDENCY_COMMANDS -# ----------------------------- -# 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 -# need in order to bootstrap the dependency handling code. -AC_DEFUN([AM_OUTPUT_DEPENDENCY_COMMANDS], -[AC_CONFIG_COMMANDS([depfiles], - [test x"$AMDEP_TRUE" != x"" || _AM_OUTPUT_DEPENDENCY_COMMANDS], - [AMDEP_TRUE="$AMDEP_TRUE" ac_aux_dir="$ac_aux_dir"]) -]) + dnl enable/disable introspection + m4_if([$2], [require], + [dnl + enable_introspection=yes + ],[dnl + AC_ARG_ENABLE(introspection, + AS_HELP_STRING([--enable-introspection[=@<:@no/auto/yes@:>@]], + [Enable introspection for this build]),, + [enable_introspection=auto]) + ])dnl -# Do all the work for Automake. -*- Autoconf -*- + AC_MSG_CHECKING([for gobject-introspection]) -# 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. + dnl presence/version checking + AS_CASE([$enable_introspection], + [no], [dnl + found_introspection="no (disabled, use --enable-introspection to enable)" + ],dnl + [yes],[dnl + PKG_CHECK_EXISTS([gobject-introspection-1.0],, + AC_MSG_ERROR([gobject-introspection-1.0 is not installed])) + PKG_CHECK_EXISTS([gobject-introspection-1.0 >= $1], + found_introspection=yes, + AC_MSG_ERROR([You need to have gobject-introspection >= $1 installed to build AC_PACKAGE_NAME])) + ],dnl + [auto],[dnl + PKG_CHECK_EXISTS([gobject-introspection-1.0 >= $1], found_introspection=yes, found_introspection=no) + dnl Canonicalize enable_introspection + enable_introspection=$found_introspection + ],dnl + [dnl + AC_MSG_ERROR([invalid argument passed to --enable-introspection, should be one of @<:@no/auto/yes@:>@]) + ])dnl -# 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. + AC_MSG_RESULT([$found_introspection]) -# AM_INIT_AUTOMAKE(PACKAGE, VERSION, [NO-DEFINE]) -# AM_INIT_AUTOMAKE([OPTIONS]) -# ----------------------------------------------- -# The call with PACKAGE and VERSION arguments is the old style -# call (pre autoconf-2.50), which is being phased out. PACKAGE -# and VERSION should now be passed to AC_INIT and removed from -# the call to AM_INIT_AUTOMAKE. -# We support both call styles for the transition. After -# the next Automake release, Autoconf can make the AC_INIT -# 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.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 -AC_REQUIRE([AM_SET_CURRENT_AUTOMAKE_VERSION])dnl -AC_REQUIRE([AC_PROG_INSTALL])dnl -if test "`cd $srcdir && pwd`" != "`pwd`"; then - # Use -I$(srcdir) only when $(srcdir) != ., so that make's output - # is not polluted with repeated "-I." - AC_SUBST([am__isrc], [' -I$(srcdir)'])_AM_SUBST_NOTMAKE([am__isrc])dnl - # test to see if srcdir already configured - if test -f $srcdir/config.status; then - AC_MSG_ERROR([source directory already configured; run "make distclean" there first]) - fi -fi + INTROSPECTION_SCANNER= + INTROSPECTION_COMPILER= + INTROSPECTION_GENERATE= + INTROSPECTION_GIRDIR= + INTROSPECTION_TYPELIBDIR= + if test "x$found_introspection" = "xyes"; then + INTROSPECTION_SCANNER=`$PKG_CONFIG --variable=g_ir_scanner gobject-introspection-1.0` + INTROSPECTION_COMPILER=`$PKG_CONFIG --variable=g_ir_compiler gobject-introspection-1.0` + INTROSPECTION_GENERATE=`$PKG_CONFIG --variable=g_ir_generate gobject-introspection-1.0` + INTROSPECTION_GIRDIR=`$PKG_CONFIG --variable=girdir gobject-introspection-1.0` + INTROSPECTION_TYPELIBDIR="$($PKG_CONFIG --variable=typelibdir gobject-introspection-1.0)" + INTROSPECTION_CFLAGS=`$PKG_CONFIG --cflags gobject-introspection-1.0` + INTROSPECTION_LIBS=`$PKG_CONFIG --libs gobject-introspection-1.0` + INTROSPECTION_MAKEFILE=`$PKG_CONFIG --variable=datadir gobject-introspection-1.0`/gobject-introspection-1.0/Makefile.introspection + fi + AC_SUBST(INTROSPECTION_SCANNER) + AC_SUBST(INTROSPECTION_COMPILER) + AC_SUBST(INTROSPECTION_GENERATE) + AC_SUBST(INTROSPECTION_GIRDIR) + AC_SUBST(INTROSPECTION_TYPELIBDIR) + AC_SUBST(INTROSPECTION_CFLAGS) + AC_SUBST(INTROSPECTION_LIBS) + AC_SUBST(INTROSPECTION_MAKEFILE) -# test whether we have cygpath -if test -z "$CYGPATH_W"; then - if (cygpath --version) >/dev/null 2>/dev/null; then - CYGPATH_W='cygpath -w' - else - CYGPATH_W=echo - fi -fi -AC_SUBST([CYGPATH_W]) + AM_CONDITIONAL(HAVE_INTROSPECTION, test "x$found_introspection" = "xyes") +]) -# Define the identity of the package. -dnl Distinguish between old-style and new-style calls. -m4_ifval([$2], -[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], [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 +dnl Usage: +dnl GOBJECT_INTROSPECTION_CHECK([minimum-g-i-version]) -# 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]) -AC_REQUIRE([AM_PROG_INSTALL_SH])dnl -AC_REQUIRE([AM_PROG_INSTALL_STRIP])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 -AC_REQUIRE([AC_PROG_MAKE_SET])dnl -AC_REQUIRE([AM_SET_LEADING_DOT])dnl -_AM_IF_OPTION([tar-ustar], [_AM_PROG_TAR([ustar])], - [_AM_IF_OPTION([tar-pax], [_AM_PROG_TAR([pax])], - [_AM_PROG_TAR([v7])])]) -_AM_IF_OPTION([no-dependencies],, -[AC_PROVIDE_IFELSE([AC_PROG_CC], - [_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])], - [m4_define([AC_PROG_CXX], - m4_defn([AC_PROG_CXX])[_AM_DEPENDENCIES([CXX])])])dnl -AC_PROVIDE_IFELSE([AC_PROG_OBJC], - [_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 +AC_DEFUN([GOBJECT_INTROSPECTION_CHECK], +[ + _GOBJECT_INTROSPECTION_CHECK_INTERNAL([$1]) ]) -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], -m4_defn([_AC_COMPILER_EXEEXT])[m4_provide([_AM_COMPILER_EXEEXT])]) +dnl Usage: +dnl GOBJECT_INTROSPECTION_REQUIRE([minimum-g-i-version]) -# When config.status generates a header, we must update the stamp-h file. -# This file resides in the same directory as the config header -# that is generated. The stamp files are numbered to have different names. +AC_DEFUN([GOBJECT_INTROSPECTION_REQUIRE], +[ + _GOBJECT_INTROSPECTION_CHECK_INTERNAL([$1], [require]) +]) -# Autoconf calls _AC_AM_CONFIG_HEADER_HOOK (when defined) in the -# loop where config.status creates the headers, so we can generate -# our stamp files there. -AC_DEFUN([_AC_AM_CONFIG_HEADER_HOOK], -[# Compute $1's index in $config_headers. -_am_arg=$1 -_am_stamp_count=1 -for _am_header in $config_headers :; do - case $_am_header in - $_am_arg | $_am_arg:* ) - break ;; - * ) - _am_stamp_count=`expr $_am_stamp_count + 1` ;; - esac -done -echo "timestamp for $_am_arg" >`AS_DIRNAME(["$_am_arg"])`/stamp-h[]$_am_stamp_count]) - -# 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_PROG_INSTALL_SH -# ------------------ -# Define $install_sh. -AC_DEFUN([AM_PROG_INSTALL_SH], -[AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl -if test x"${install_sh}" != xset; then - case $am_aux_dir in - *\ * | *\ *) - install_sh="\${SHELL} '$am_aux_dir/install-sh'" ;; - *) - install_sh="\${SHELL} $am_aux_dir/install-sh" - esac -fi -AC_SUBST([install_sh])]) +# nls.m4 serial 5 (gettext-0.18) +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, +dnl with or without modifications, as long as this notice is preserved. +dnl +dnl This file can can be used in projects which are not available under +dnl the GNU General Public License or the GNU Library General Public +dnl License but which still want to provide support for the GNU gettext +dnl functionality. +dnl Please note that the actual code of the GNU gettext library is covered +dnl by the GNU Library General Public License, and the rest of the GNU +dnl gettext package package is covered by the GNU General Public License. +dnl They are *not* in the public domain. -# 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. +dnl Authors: +dnl Ulrich Drepper , 1995-2000. +dnl Bruno Haible , 2000-2003. -# Check whether the underlying file-system supports filenames -# with a leading dot. For instance MS-DOS doesn't. -AC_DEFUN([AM_SET_LEADING_DOT], -[rm -rf .tst 2>/dev/null -mkdir .tst 2>/dev/null -if test -d .tst; then - am__leading_dot=. -else - am__leading_dot=_ -fi -rmdir .tst 2>/dev/null -AC_SUBST([am__leading_dot])]) +AC_PREREQ([2.50]) -# Add --enable-maintainer-mode option to configure. -*- Autoconf -*- -# From Jim Meyering +AC_DEFUN([AM_NLS], +[ + AC_MSG_CHECKING([whether NLS is requested]) + dnl Default is enabled NLS + AC_ARG_ENABLE([nls], + [ --disable-nls do not use Native Language Support], + USE_NLS=$enableval, USE_NLS=yes) + AC_MSG_RESULT([$USE_NLS]) + AC_SUBST([USE_NLS]) +]) -# Copyright (C) 1996-2013 Free Software Foundation, Inc. +# pkg.m4 - Macros to locate and utilise pkg-config. -*- Autoconf -*- +# serial 1 (pkg-config-0.24) +# +# Copyright © 2004 Scott James Remnant . # -# 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. +# 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., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +# +# 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. -# AM_MAINTAINER_MODE([DEFAULT-MODE]) +# PKG_PROG_PKG_CONFIG([MIN-VERSION]) # ---------------------------------- -# 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 -# can override the default with the --enable/--disable switch. -AC_DEFUN([AM_MAINTAINER_MODE], -[m4_case(m4_default([$1], [disable]), - [enable], [m4_define([am_maintainer_other], [disable])], - [disable], [m4_define([am_maintainer_other], [enable])], - [m4_define([am_maintainer_other], [enable]) - m4_warn([syntax], [unexpected argument to AM@&t@_MAINTAINER_MODE: $1])]) -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], - [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 - AC_SUBST([MAINT])dnl -] -) +AC_DEFUN([PKG_PROG_PKG_CONFIG], +[m4_pattern_forbid([^_?PKG_[A-Z_]+$]) +m4_pattern_allow([^PKG_CONFIG(_(PATH|LIBDIR|SYSROOT_DIR|ALLOW_SYSTEM_(CFLAGS|LIBS)))?$]) +m4_pattern_allow([^PKG_CONFIG_(DISABLE_UNINSTALLED|TOP_BUILD_DIR|DEBUG_SPEW)$]) +AC_ARG_VAR([PKG_CONFIG], [path to pkg-config utility]) +AC_ARG_VAR([PKG_CONFIG_PATH], [directories to add to pkg-config's search path]) +AC_ARG_VAR([PKG_CONFIG_LIBDIR], [path overriding pkg-config's built-in search path]) -# Check to see how 'make' treats includes. -*- Autoconf -*- +if test "x$ac_cv_env_PKG_CONFIG_set" != "xset"; then + AC_PATH_TOOL([PKG_CONFIG], [pkg-config]) +fi +if test -n "$PKG_CONFIG"; then + _pkg_min_version=m4_default([$1], [0.9.0]) + AC_MSG_CHECKING([pkg-config is at least version $_pkg_min_version]) + if $PKG_CONFIG --atleast-pkgconfig-version $_pkg_min_version; then + AC_MSG_RESULT([yes]) + else + AC_MSG_RESULT([no]) + PKG_CONFIG="" + fi +fi[]dnl +])# PKG_PROG_PKG_CONFIG -# Copyright (C) 2001-2013 Free Software Foundation, Inc. +# PKG_CHECK_EXISTS(MODULES, [ACTION-IF-FOUND], [ACTION-IF-NOT-FOUND]) # -# 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. +# Check to see whether a particular set of modules exists. Similar +# to PKG_CHECK_MODULES(), but does not set variables or print errors. +# +# Please remember that m4 expands AC_REQUIRE([PKG_PROG_PKG_CONFIG]) +# only at the first occurence in configure.ac, so if the first place +# it's called might be skipped (such as if it is within an "if", you +# have to call PKG_CHECK_EXISTS manually +# -------------------------------------------------------------- +AC_DEFUN([PKG_CHECK_EXISTS], +[AC_REQUIRE([PKG_PROG_PKG_CONFIG])dnl +if test -n "$PKG_CONFIG" && \ + AC_RUN_LOG([$PKG_CONFIG --exists --print-errors "$1"]); then + m4_default([$2], [:]) +m4_ifvaln([$3], [else + $3])dnl +fi]) -# AM_MAKE_INCLUDE() -# ----------------- -# Check to see how make treats includes. -AC_DEFUN([AM_MAKE_INCLUDE], -[am_make=${MAKE-make} -cat > confinc << 'END' -am__doit: - @echo this is the am__doit target -.PHONY: am__doit -END -# If we don't find an include directive, just comment out the code. -AC_MSG_CHECKING([for style of include used by $am_make]) -am__include="#" -am__quote= -_am_result=none -# First try GNU make style include. -echo "include confinc" > confmf -# 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 - am__quote= - _am_result=GNU - ;; -esac -# Now try BSD make style include. -if test "$am__include" = "#"; then - echo '.include "confinc"' > confmf - case `$am_make -s -f confmf 2> /dev/null` in #( - *the\ am__doit\ target*) - am__include=.include - am__quote="\"" - _am_result=BSD - ;; - esac -fi -AC_SUBST([am__include]) -AC_SUBST([am__quote]) -AC_MSG_RESULT([$_am_result]) -rm -f confinc confmf -]) +# _PKG_CONFIG([VARIABLE], [COMMAND], [MODULES]) +# --------------------------------------------- +m4_define([_PKG_CONFIG], +[if test -n "$$1"; then + pkg_cv_[]$1="$$1" + elif test -n "$PKG_CONFIG"; then + PKG_CHECK_EXISTS([$3], + [pkg_cv_[]$1=`$PKG_CONFIG --[]$2 "$3" 2>/dev/null` + test "x$?" != "x0" && pkg_failed=yes ], + [pkg_failed=yes]) + else + pkg_failed=untried +fi[]dnl +])# _PKG_CONFIG -# Fake the existence of programs that GNU maintainers use. -*- Autoconf -*- +# _PKG_SHORT_ERRORS_SUPPORTED +# ----------------------------- +AC_DEFUN([_PKG_SHORT_ERRORS_SUPPORTED], +[AC_REQUIRE([PKG_PROG_PKG_CONFIG]) +if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then + _pkg_short_errors_supported=yes +else + _pkg_short_errors_supported=no +fi[]dnl +])# _PKG_SHORT_ERRORS_SUPPORTED -# Copyright (C) 1997-2013 Free Software Foundation, Inc. + +# PKG_CHECK_MODULES(VARIABLE-PREFIX, MODULES, [ACTION-IF-FOUND], +# [ACTION-IF-NOT-FOUND]) # -# 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. +# +# Note that if there is a possibility the first call to +# PKG_CHECK_MODULES might not happen, you should be sure to include an +# explicit call to PKG_PROG_PKG_CONFIG in your configure.ac +# +# +# -------------------------------------------------------------- +AC_DEFUN([PKG_CHECK_MODULES], +[AC_REQUIRE([PKG_PROG_PKG_CONFIG])dnl +AC_ARG_VAR([$1][_CFLAGS], [C compiler flags for $1, overriding pkg-config])dnl +AC_ARG_VAR([$1][_LIBS], [linker flags for $1, overriding pkg-config])dnl -# AM_MISSING_PROG(NAME, PROGRAM) -# ------------------------------ -AC_DEFUN([AM_MISSING_PROG], -[AC_REQUIRE([AM_MISSING_HAS_RUN]) -$1=${$1-"${am_missing_run}$2"} -AC_SUBST($1)]) +pkg_failed=no +AC_MSG_CHECKING([for $1]) -# AM_MISSING_HAS_RUN -# ------------------ -# 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 -if test x"${MISSING+set}" != xset; then - case $am_aux_dir in - *\ * | *\ *) - MISSING="\${SHELL} \"$am_aux_dir/missing\"" ;; - *) - MISSING="\${SHELL} $am_aux_dir/missing" ;; - esac -fi -# Use eval to expand $SHELL -if eval "$MISSING --is-lightweight"; then - am_missing_run="$MISSING " -else - am_missing_run= - AC_MSG_WARN(['missing' script is too old or missing]) -fi -]) +_PKG_CONFIG([$1][_CFLAGS], [cflags], [$2]) +_PKG_CONFIG([$1][_LIBS], [libs], [$2]) -# Helper functions for option handling. -*- Autoconf -*- +m4_define([_PKG_TEXT], [Alternatively, you may set the environment variables $1[]_CFLAGS +and $1[]_LIBS to avoid the need to call pkg-config. +See the pkg-config man page for more details.]) -# 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. +if test $pkg_failed = yes; then + AC_MSG_RESULT([no]) + _PKG_SHORT_ERRORS_SUPPORTED + if test $_pkg_short_errors_supported = yes; then + $1[]_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "$2" 2>&1` + else + $1[]_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "$2" 2>&1` + fi + # Put the nasty error message in config.log where it belongs + echo "$$1[]_PKG_ERRORS" >&AS_MESSAGE_LOG_FD -# _AM_MANGLE_OPTION(NAME) -# ----------------------- -AC_DEFUN([_AM_MANGLE_OPTION], -[[_AM_OPTION_]m4_bpatsubst($1, [[^a-zA-Z0-9_]], [_])]) + m4_default([$4], [AC_MSG_ERROR( +[Package requirements ($2) were not met: -# _AM_SET_OPTION(NAME) -# -------------------- -# 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])]) +$$1_PKG_ERRORS -# _AM_SET_OPTIONS(OPTIONS) -# ------------------------ -# OPTIONS is a space-separated list of Automake options. -AC_DEFUN([_AM_SET_OPTIONS], -[m4_foreach_w([_AM_Option], [$1], [_AM_SET_OPTION(_AM_Option)])]) +Consider adjusting the PKG_CONFIG_PATH environment variable if you +installed software in a non-standard prefix. -# _AM_IF_OPTION(OPTION, IF-SET, [IF-NOT-SET]) -# ------------------------------------------- -# Execute IF-SET if OPTION is set, IF-NOT-SET otherwise. -AC_DEFUN([_AM_IF_OPTION], -[m4_ifset(_AM_MANGLE_OPTION([$1]), [$2], [$3])]) +_PKG_TEXT])[]dnl + ]) +elif test $pkg_failed = untried; then + AC_MSG_RESULT([no]) + m4_default([$4], [AC_MSG_FAILURE( +[The pkg-config script could not be found or is too old. Make sure it +is in your PATH or set the PKG_CONFIG environment variable to the full +path to pkg-config. -# 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. +_PKG_TEXT -# 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); }]) +To get pkg-config, see .])[]dnl + ]) +else + $1[]_CFLAGS=$pkg_cv_[]$1[]_CFLAGS + $1[]_LIBS=$pkg_cv_[]$1[]_LIBS + AC_MSG_RESULT([yes]) + $3 +fi[]dnl +])# PKG_CHECK_MODULES -# Check to make sure that the build environment is sane. -*- Autoconf -*- -# 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. +# 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 -# AM_SANITY_CHECK -# --------------- -AC_DEFUN([AM_SANITY_CHECK], -[AC_MSG_CHECKING([whether build environment is sane]) -# Reject unsafe characters in $srcdir or the absolute working directory -# name. Accept space and tab only in the latter. -am_lf=' -' -case `pwd` in - *[[\\\"\#\$\&\'\`$am_lf]]*) - AC_MSG_ERROR([unsafe absolute working directory name]);; -esac -case $srcdir in - *[[\\\"\#\$\&\'\`$am_lf\ \ ]]*) - AC_MSG_ERROR([unsafe srcdir value: '$srcdir']);; -esac -# 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 ( - 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 +# 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 - # 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 - # Ok. - : -else - AC_MSG_ERROR([newly created file is older than distributed files! -Check your system clock]) +AC_DEFUN([YELP_HELP_INIT], +[ +AC_REQUIRE([AC_PROG_LN_S]) +m4_pattern_allow([AM_V_at]) +m4_pattern_allow([AM_V_GEN]) +m4_pattern_allow([AM_DEFAULT_VERBOSITY]) +AC_ARG_WITH([help-dir], + AC_HELP_STRING([--with-help-dir=DIR], + [path where help files are installed]),, + [with_help_dir='${datadir}/help']) +HELP_DIR="$with_help_dir" +AC_SUBST(HELP_DIR) + +AC_ARG_VAR([ITSTOOL], [Path to the `itstool` command]) +AC_CHECK_PROG([ITSTOOL], [itstool], [itstool]) +if test x"$ITSTOOL" = x; then + AC_MSG_ERROR([itstool not found]) fi -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=$! + +AC_ARG_VAR([XMLLINT], [Path to the `xmllint` command]) +AC_CHECK_PROG([XMLLINT], [xmllint], [xmllint]) +if test x"$XMLLINT" = x; then + AC_MSG_ERROR([xmllint not found]) 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-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. +YELP_HELP_RULES=' +HELP_ID ?= +HELP_POT ?= +HELP_FILES ?= +HELP_EXTRA ?= +HELP_MEDIA ?= +HELP_LINGUAS ?= -# AM_SILENT_RULES([DEFAULT]) -# -------------------------- -# Enable less verbose build rules; with the default set to DEFAULT -# ("yes" being less verbose, "no" or empty being verbose). -AC_DEFUN([AM_SILENT_RULES], -[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 do not support nested variable expansions. -dnl See automake bug#9928 and bug#10237. -am_make=${MAKE-make} -AC_CACHE_CHECK([whether $am_make supports nested variables], - [am_cv_make_support_nested_variables], - [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]) -if test $am_cv_make_support_nested_variables = yes; then - dnl Using '$V' instead of '$(V)' breaks IRIX make. - AM_V='$(V)' - AM_DEFAULT_V='$(AM_DEFAULT_VERBOSITY)' -else - AM_V=$AM_DEFAULT_VERBOSITY - AM_DEFAULT_V=$AM_DEFAULT_VERBOSITY -fi -AC_SUBST([AM_V])dnl -AM_SUBST_NOTMAKE([AM_V])dnl -AC_SUBST([AM_DEFAULT_V])dnl -AM_SUBST_NOTMAKE([AM_DEFAULT_V])dnl -AC_SUBST([AM_DEFAULT_VERBOSITY])dnl -AM_BACKSLASH='\' -AC_SUBST([AM_BACKSLASH])dnl -_AM_SUBST_NOTMAKE([AM_BACKSLASH])dnl -]) - -# 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_PROG_INSTALL_STRIP -# --------------------- -# 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 -# 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 -# 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'. -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-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. +_HELP_LINGUAS = $(if $(filter environment,$(origin LINGUAS)),$(filter $(LINGUAS),$(HELP_LINGUAS)),$(HELP_LINGUAS)) +_HELP_POTFILE = $(if $(HELP_POT),$(HELP_POT),$(if $(HELP_ID),$(HELP_ID).pot)) +_HELP_POFILES = $(if $(HELP_ID),$(foreach lc,$(_HELP_LINGUAS),$(lc)/$(lc).po)) +_HELP_MOFILES = $(patsubst %.po,%.mo,$(_HELP_POFILES)) +_HELP_C_FILES = $(foreach f,$(HELP_FILES),C/$(f)) +_HELP_C_EXTRA = $(foreach f,$(HELP_EXTRA),C/$(f)) +_HELP_C_MEDIA = $(foreach f,$(HELP_MEDIA),C/$(f)) +_HELP_LC_FILES = $(foreach lc,$(_HELP_LINGUAS),$(foreach f,$(HELP_FILES),$(lc)/$(f))) +_HELP_LC_STAMPS = $(foreach lc,$(_HELP_LINGUAS),$(lc)/$(lc).stamp) -# _AM_SUBST_NOTMAKE(VARIABLE) -# --------------------------- -# Prevent Automake from outputting VARIABLE = @VARIABLE@ in Makefile.in. -# This macro is traced by Automake. -AC_DEFUN([_AM_SUBST_NOTMAKE]) +_HELP_DEFAULT_V = $(if $(AM_DEFAULT_VERBOSITY),$(AM_DEFAULT_VERBOSITY),1) +_HELP_V = $(if $(V),$(V),$(_HELP_DEFAULT_V)) +_HELP_LC_VERBOSE = $(_HELP_LC_VERBOSE_$(_HELP_V)) +_HELP_LC_VERBOSE_ = $(_HELP_LC_VERBOSE_$(_HELP_DEFAULT_V)) +_HELP_LC_VERBOSE_0 = @echo " GEN "$(dir [$]@); -# AM_SUBST_NOTMAKE(VARIABLE) -# -------------------------- -# Public sister of _AM_SUBST_NOTMAKE. -AC_DEFUN([AM_SUBST_NOTMAKE], [_AM_SUBST_NOTMAKE($@)]) +all: $(_HELP_C_FILES) $(_HELP_C_EXTRA) $(_HELP_C_MEDIA) $(_HELP_LC_FILES) $(_HELP_POFILES) -# Check how to create a tarball. -*- Autoconf -*- +.PHONY: pot +pot: $(_HELP_POTFILE) +$(_HELP_POTFILE): $(_HELP_C_FILES) $(_HELP_C_EXTRA) $(_HELP_C_MEDIA) + $(AM_V_GEN)$(ITSTOOL) -o "[$]@" $(_HELP_C_FILES) -# 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. +.PHONY: repo +repo: $(_HELP_POTFILE) + $(AM_V_at)for po in $(_HELP_POFILES); do \ + if test "x[$](_HELP_V)" = "x0"; then echo " GEN $${po}"; fi; \ + msgmerge -q -o "$${po}" "$${po}" "$(_HELP_POTFILE)"; \ + done -# _AM_PROG_TAR(FORMAT) -# -------------------- -# Check how to create a tarball in format FORMAT. -# 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 -# $tardir. -# tardir=directory && $(am__tar) > result.tar -# -# Substitute a variable $(am__untar) that extract such -# a tarball read from stdin. -# $(am__untar) < result.tar -# -AC_DEFUN([_AM_PROG_TAR], -[# Always define AMTAR for backward compatibility. Yes, it's still used -# in the wild :-( We should find a proper way to deprecate it ... -AC_SUBST([AMTAR], ['$${TAR-tar}']) +$(_HELP_POFILES): + $(AM_V_at)if ! test -d "$(dir [$]@)"; then mkdir "$(dir [$]@)"; fi + $(AM_V_at)if test ! -f "[$]@" -a -f "$(srcdir)/[$]@"; then cp "$(srcdir)/[$]@" "[$]@"; fi + $(AM_V_GEN)if ! test -f "[$]@"; then \ + (cd "$(dir [$]@)" && \ + $(ITSTOOL) -o "$(notdir [$]@).tmp" $(_HELP_C_FILES) && \ + mv "$(notdir [$]@).tmp" "$(notdir [$]@)"); \ + else \ + (cd "$(dir [$]@)" && \ + $(ITSTOOL) -o "$(notdir [$]@).tmp" $(_HELP_C_FILES) && \ + msgmerge -o "$(notdir [$]@)" "$(notdir [$]@)" "$(notdir [$]@).tmp" && \ + rm "$(notdir [$]@).tmp"); \ + fi -# We'll loop over all known methods to create a tar archive until one works. -_am_tools='gnutar m4_if([$1], [ustar], [plaintar]) pax cpio none' +$(_HELP_MOFILES): %.mo: %.po + $(AM_V_at)if ! test -d "$(dir [$]@)"; then mkdir "$(dir [$]@)"; fi + $(AM_V_GEN)msgfmt -o "[$]@" "$<" -m4_if([$1], [v7], - [am__tar='$${TAR-tar} chof - "$$tardir"' am__untar='$${TAR-tar} xf -'], +$(_HELP_LC_FILES): $(_HELP_LINGUAS) +$(_HELP_LINGUAS): $(_HELP_LC_STAMPS) +$(_HELP_LC_STAMPS): %.stamp: %.mo +$(_HELP_LC_STAMPS): $(_HELP_C_FILES) $(_HELP_C_EXTRA) + $(AM_V_at)if ! test -d "$(dir [$]@)"; then mkdir "$(dir [$]@)"; fi + $(_HELP_LC_VERBOSE)if test -d "C"; then d="../"; else d="$(abs_srcdir)/"; fi; \ + mo="$(dir [$]@)$(patsubst %/$(notdir [$]@),%,[$]@).mo"; \ + if test -f "$${mo}"; then mo="../$${mo}"; else mo="$(abs_srcdir)/$${mo}"; fi; \ + (cd "$(dir [$]@)" && $(ITSTOOL) -m "$${mo}" $(foreach f,$(_HELP_C_FILES),$${d}/$(f))) && \ + touch "[$]@" - [m4_case([$1], - [ustar], - [# The POSIX 1988 'ustar' format is defined with fixed-size fields. - # There is notably a 21 bits limit for the UID and the GID. In fact, - # the 'pax' utility can hang on bigger UID/GID (see automake bug#8343 - # and bug#13588). - am_max_uid=2097151 # 2^21 - 1 - am_max_gid=$am_max_uid - # The $UID and $GID variables are not portable, so we need to resort - # to the POSIX-mandated id(1) utility. Errors in the 'id' calls - # below are definitely unexpected, so allow the users to see them - # (that is, avoid stderr redirection). - am_uid=`id -u || echo unknown` - am_gid=`id -g || echo unknown` - AC_MSG_CHECKING([whether UID '$am_uid' is supported by ustar format]) - if test $am_uid -le $am_max_uid; then - AC_MSG_RESULT([yes]) - else - AC_MSG_RESULT([no]) - _am_tools=none - fi - AC_MSG_CHECKING([whether GID '$am_gid' is supported by ustar format]) - if test $am_gid -le $am_max_gid; then - AC_MSG_RESULT([yes]) - else - AC_MSG_RESULT([no]) - _am_tools=none - fi], +.PHONY: clean-help +mostlyclean-am: $(if $(HELP_ID),clean-help) +clean-help: + rm -f $(_HELP_LC_FILES) $(_HELP_LC_STAMPS) $(_HELP_MOFILES) - [pax], - [], +EXTRA_DIST ?= +EXTRA_DIST += $(_HELP_C_EXTRA) $(_HELP_C_MEDIA) +EXTRA_DIST += $(foreach lc,$(HELP_LINGUAS),$(lc)/$(lc).stamp) +EXTRA_DIST += $(foreach lc,$(HELP_LINGUAS),$(lc)/$(lc).po) +EXTRA_DIST += $(foreach f,$(HELP_MEDIA),$(foreach lc,$(HELP_LINGUAS),$(wildcard $(lc)/$(f)))) - [m4_fatal([Unknown tar format])]) +distdir: distdir-help-files +distdir-help-files: + @for lc in C $(HELP_LINGUAS); do \ + $(MKDIR_P) "$(distdir)/$$lc"; \ + for file in $(HELP_FILES); do \ + if test -f "$$lc/$$file"; then d=./; else d=$(srcdir)/; fi; \ + cp -p "$$d$$lc/$$file" "$(distdir)/$$lc/" || exit 1; \ + done; \ + done; \ - AC_MSG_CHECKING([how to create a $1 tar archive]) +.PHONY: check-help +check: check-help +check-help: + for lc in C $(_HELP_LINGUAS); do \ + if test -d "$$lc"; \ + then d=; \ + xmlpath="$$lc"; \ + else \ + d="$(srcdir)/"; \ + xmlpath="$$lc:$(srcdir)/$$lc"; \ + fi; \ + for page in $(HELP_FILES); do \ + echo "$(XMLLINT) --noout --noent --path $$xmlpath --xinclude $$d$$lc/$$page"; \ + $(XMLLINT) --noout --noent --path "$$xmlpath" --xinclude "$$d$$lc/$$page"; \ + done; \ + done - # Go ahead even if we have the value already cached. We do so because we - # need to set the values for the 'am__tar' and 'am__untar' variables. - _am_tools=${am_cv_prog_tar_$1-$_am_tools} - for _am_tool in $_am_tools; do - case $_am_tool in - gnutar) - for _am_tar in tar gnutar gtar; do - AM_RUN_LOG([$_am_tar --version]) && break - done - am__tar="$_am_tar --format=m4_if([$1], [pax], [posix], [$1]) -chf - "'"$$tardir"' - am__tar_="$_am_tar --format=m4_if([$1], [pax], [posix], [$1]) -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 $1 -w "$$tardir"' - am__tar_='pax -L -x $1 -w "$tardir"' - am__untar='pax -r' - ;; - cpio) - am__tar='find "$$tardir" -print | cpio -o -H $1 -L' - am__tar_='find "$tardir" -print | cpio -o -H $1 -L' - am__untar='cpio -i -H $1 -d' - ;; - none) - am__tar=false - am__tar_=false - am__untar=false - ;; - esac +.PHONY: install-help +install-data-am: $(if $(HELP_ID),install-help) +install-help: + @for lc in C $(_HELP_LINGUAS); do \ + $(mkinstalldirs) "$(DESTDIR)$(HELP_DIR)/$$lc/$(HELP_ID)" || exit 1; \ + done + @for lc in C $(_HELP_LINGUAS); do for f in $(HELP_FILES); do \ + if test -f "$$lc/$$f"; then d=; else d="$(srcdir)/"; fi; \ + helpdir="$(DESTDIR)$(HELP_DIR)/$$lc/$(HELP_ID)/"; \ + if ! test -d "$$helpdir"; then $(mkinstalldirs) "$$helpdir"; fi; \ + echo "$(INSTALL_DATA) $$d$$lc/$$f $$helpdir`basename $$f`"; \ + $(INSTALL_DATA) "$$d$$lc/$$f" "$$helpdir`basename $$f`" || exit 1; \ + done; done + @for f in $(_HELP_C_EXTRA); do \ + lc=`dirname "$$f"`; lc=`basename "$$lc"`; \ + if test -f "$$f"; then d=; else d="$(srcdir)/"; fi; \ + helpdir="$(DESTDIR)$(HELP_DIR)/$$lc/$(HELP_ID)/"; \ + if ! test -d "$$helpdir"; then $(mkinstalldirs) "$$helpdir"; fi; \ + echo "$(INSTALL_DATA) $$d$$f $$helpdir`basename $$f`"; \ + $(INSTALL_DATA) "$$d$$f" "$$helpdir`basename $$f`" || exit 1; \ + done + @for f in $(HELP_MEDIA); do \ + for lc in C $(_HELP_LINGUAS); do \ + if test -f "$$lc$$f"; then d=; else d="$(srcdir)/"; fi; \ + helpdir="$(DESTDIR)$(HELP_DIR)/$$lc/$(HELP_ID)/"; \ + mdir=`dirname "$$f"`; \ + if test "x$mdir" = "x."; then mdir=""; fi; \ + if ! test -d "$$helpdir$$mdir"; then $(mkinstalldirs) "$$helpdir$$mdir"; fi; \ + if test -f "$$d$$lc/$$f"; then \ + echo "$(INSTALL_DATA) $$d$$lc/$$f $$helpdir$$f"; \ + $(INSTALL_DATA) "$$d$$lc/$$f" "$$helpdir$$f" || exit 1; \ + elif test "x$$lc" != "xC"; then \ + echo "$(LN_S) -f $(HELP_DIR)/C/$(HELP_ID)/$$f $$helpdir$$f"; \ + $(LN_S) -f "$(HELP_DIR)/C/$(HELP_ID)/$$f" "$$helpdir$$f" || exit 1; \ + fi; \ + done; \ + done - # If the value was cached, stop now. We just wanted to have am__tar - # and am__untar set. - test -n "${am_cv_prog_tar_$1}" && break +.PHONY: uninstall-help +uninstall-am: $(if $(HELP_ID),uninstall-help) +uninstall-help: + for lc in C $(_HELP_LINGUAS); do for f in $(HELP_FILES); do \ + helpdir="$(DESTDIR)$(HELP_DIR)/$$lc/$(HELP_ID)/"; \ + echo "rm -f $$helpdir`basename $$f`"; \ + rm -f "$$helpdir`basename $$f`"; \ + done; done + @for f in $(_HELP_C_EXTRA); do \ + lc=`dirname "$$f"`; lc=`basename "$$lc"`; \ + helpdir="$(DESTDIR)$(HELP_DIR)/$$lc/$(HELP_ID)/"; \ + echo "rm -f $$helpdir`basename $$f`"; \ + rm -f "$$helpdir`basename $$f`"; \ + done + @for f in $(HELP_MEDIA); do \ + for lc in C $(_HELP_LINGUAS); do \ + helpdir="$(DESTDIR)$(HELP_DIR)/$$lc/$(HELP_ID)/"; \ + echo "rm -f $$helpdir$$f"; \ + rm -f "$$helpdir$$f"; \ + done; \ + done; +' +AC_SUBST([YELP_HELP_RULES]) +m4_ifdef([_AM_SUBST_NOTMAKE], [_AM_SUBST_NOTMAKE([YELP_HELP_RULES])]) +]) - # tar/untar a dummy directory, and stop if the command works. - rm -rf conftest.dir - mkdir conftest.dir - echo GrepMe > conftest.dir/file - AM_RUN_LOG([tardir=conftest.dir && eval $am__tar_ >conftest.tar]) - rm -rf conftest.dir - if test -s conftest.tar; then - AM_RUN_LOG([$am__untar /dev/null 2>&1 && break - fi - done - rm -rf conftest.dir +# 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. - AC_CACHE_VAL([am_cv_prog_tar_$1], [am_cv_prog_tar_$1=$_am_tool]) - AC_MSG_RESULT([$am_cv_prog_tar_$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.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.13.4], [], + [AC_FATAL([Do not call $0, use AM_INIT_AUTOMAKE([$1]).])])dnl +]) -AC_SUBST([am__tar]) -AC_SUBST([am__untar]) -]) # _AM_PROG_TAR +# _AM_AUTOCONF_VERSION(VERSION) +# ----------------------------- +# aclocal traces this macro to find the Autoconf version. +# This is a private macro too. Using m4_define simplifies +# the logic in aclocal, which can simply ignore this definition. +m4_define([_AM_AUTOCONF_VERSION], []) -# Copyright (C) 1995-2002 Free Software Foundation, Inc. -# Copyright (C) 2001-2003,2004 Red Hat, Inc. +# AM_SET_CURRENT_AUTOMAKE_VERSION +# ------------------------------- +# 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.13.4])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-2013 Free Software Foundation, Inc. # -# This file is free software, distributed under the terms of the GNU -# General Public License. As a special exception to the GNU General -# Public License, this file may be distributed as part of a program -# that contains a configuration script generated by Autoconf, under -# the same distribution terms as the rest of that program. +# 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. + +# 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/../..'. # -# This file can be copied and used freely without restrictions. It can -# be used in projects which are not available under the GNU Public License -# but which still want to provide support for the GNU gettext functionality. +# Of course, Automake must honor this variable whenever it calls a +# tool from the auxiliary directory. The problem is that $srcdir (and +# therefore $ac_aux_dir as well) can be either absolute or relative, +# depending on how configure is run. This is pretty annoying, since +# it makes $ac_aux_dir quite unusable in subdirectories: in the top +# source directory, any form will work fine, but in subdirectories a +# relative path needs to be adjusted first. # -# Macro to add for using GNU gettext. -# Ulrich Drepper , 1995, 1996 +# $ac_aux_dir/missing +# fails when called from a subdirectory if $ac_aux_dir is relative +# $top_srcdir/$ac_aux_dir/missing +# fails if $ac_aux_dir is absolute, +# fails when called from a subdirectory in a VPATH build with +# a relative $ac_aux_dir # -# Modified to never use included libintl. -# Owen Taylor , 12/15/1998 +# 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 +# start a VPATH build or use an absolute $srcdir. # -# Major rework to remove unused code -# Owen Taylor , 12/11/2002 +# So we could use something similar to $top_srcdir/$ac_aux_dir/missing, +# iff we strip the leading $srcdir from $ac_aux_dir. That would be: +# am_aux_dir='\$(top_srcdir)/'`expr "$ac_aux_dir" : "$srcdir//*\(.*\)"` +# and then we would define $MISSING as +# MISSING="\${SHELL} $am_aux_dir/missing" +# This will work as long as MISSING is not called from configure, because +# unfortunately $(top_srcdir) has no meaning in configure. +# However there are other variables, like CC, which are often used in +# configure, and could therefore not use this "fixed" $ac_aux_dir. # -# Added better handling of ALL_LINGUAS from GNU gettext version -# written by Bruno Haible, Owen Taylor 5/30/3002 +# Another solution, used here, is to always expand $ac_aux_dir to an +# absolute PATH. The drawback is that using absolute paths prevent a +# configured tree to be moved without reconfiguration. + +AC_DEFUN([AM_AUX_DIR_EXPAND], +[dnl Rely on autoconf to set up CDPATH properly. +AC_PREREQ([2.50])dnl +# expand $ac_aux_dir to an absolute path +am_aux_dir=`cd $ac_aux_dir && pwd` +]) + +# AM_CONDITIONAL -*- Autoconf -*- + +# Copyright (C) 1997-2013 Free Software Foundation, Inc. # -# Modified to require ngettext -# Matthias Clasen 08/06/2004 +# 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_CONDITIONAL(NAME, SHELL-CONDITION) +# ------------------------------------- +# Define a conditional. +AC_DEFUN([AM_CONDITIONAL], +[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 +_AM_SUBST_NOTMAKE([$1_FALSE])dnl +m4_define([_AM_COND_VALUE_$1], [$2])dnl +if $2; then + $1_TRUE= + $1_FALSE='#' +else + $1_TRUE='#' + $1_FALSE= +fi +AC_CONFIG_COMMANDS_PRE( +[if test -z "${$1_TRUE}" && test -z "${$1_FALSE}"; then + AC_MSG_ERROR([[conditional "$1" was never defined. +Usually this means the macro was only invoked conditionally.]]) +fi])]) + +# Copyright (C) 1999-2013 Free Software Foundation, Inc. # -# We need this here as well, since someone might use autoconf-2.5x -# to configure GLib then an older version to configure a package -# using AM_GLIB_GNU_GETTEXT -AC_PREREQ(2.53) +# 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. -dnl -dnl We go to great lengths to make sure that aclocal won't -dnl try to pull in the installed version of these macros -dnl when running aclocal in the glib directory. -dnl -m4_copy([AC_DEFUN],[glib_DEFUN]) -m4_copy([AC_REQUIRE],[glib_REQUIRE]) -dnl -dnl At the end, if we're not within glib, we'll define the public -dnl definitions in terms of our private definitions. -dnl -# GLIB_LC_MESSAGES -#-------------------- -glib_DEFUN([GLIB_LC_MESSAGES], - [AC_CHECK_HEADERS([locale.h]) - if test $ac_cv_header_locale_h = yes; then - AC_CACHE_CHECK([for LC_MESSAGES], am_cv_val_LC_MESSAGES, - [AC_TRY_LINK([#include ], [return LC_MESSAGES], - am_cv_val_LC_MESSAGES=yes, am_cv_val_LC_MESSAGES=no)]) - if test $am_cv_val_LC_MESSAGES = yes; then - AC_DEFINE(HAVE_LC_MESSAGES, 1, - [Define if your file defines LC_MESSAGES.]) - fi - fi]) +# 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 +# CC etc. in the Makefile, will ask for an AC_PROG_CC use... -# GLIB_PATH_PROG_WITH_TEST -#---------------------------- -dnl GLIB_PATH_PROG_WITH_TEST(VARIABLE, PROG-TO-CHECK-FOR, -dnl TEST-PERFORMED-ON-FOUND_PROGRAM [, VALUE-IF-NOT-FOUND [, PATH]]) -glib_DEFUN([GLIB_PATH_PROG_WITH_TEST], -[# Extract the first word of "$2", so it can be a program name with args. -set dummy $2; ac_word=[$]2 -AC_MSG_CHECKING([for $ac_word]) -AC_CACHE_VAL(ac_cv_path_$1, -[case "[$]$1" in - /*) - ac_cv_path_$1="[$]$1" # Let the user override the test with a path. - ;; - *) - IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS="${IFS}:" - for ac_dir in ifelse([$5], , $PATH, [$5]); do - test -z "$ac_dir" && ac_dir=. - if test -f $ac_dir/$ac_word; then - if [$3]; then - ac_cv_path_$1="$ac_dir/$ac_word" + +# _AM_DEPENDENCIES(NAME) +# ---------------------- +# See how the compiler implements dependency checking. +# 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 +# modified to invoke _AM_DEPENDENCIES(CC); we would have a circular +# dependency, and given that the user is not expected to run this macro, +# just rely on AC_PROG_CC. +AC_DEFUN([_AM_DEPENDENCIES], +[AC_REQUIRE([AM_SET_DEPDIR])dnl +AC_REQUIRE([AM_OUTPUT_DEPENDENCY_COMMANDS])dnl +AC_REQUIRE([AM_MAKE_INCLUDE])dnl +AC_REQUIRE([AM_DEP_TRACK])dnl + +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], +[if test -z "$AMDEP_TRUE" && test -f "$am_depcomp"; then + # 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". + rm -rf conftest.dir + mkdir conftest.dir + # Copy depcomp to subdir because otherwise we won't find it if we're + # using a relative directory. + cp "$am_depcomp" conftest.dir + cd conftest.dir + # We will build objects and dependencies in a subdirectory because + # it helps to detect inapplicable dependency modes. For instance + # both Tru64's cc and ICC support -MD to output dependencies as a + # side effect of compilation, but ICC will put the dependencies in + # the current directory while Tru64 will put them in the object + # directory. + mkdir sub + + am_cv_$1_dependencies_compiler_type=none + if test "$am_compiler_list" = ""; then + am_compiler_list=`sed -n ['s/^#*\([a-zA-Z0-9]*\))$/\1/p'] < ./depcomp` + fi + am__universal=false + m4_case([$1], [CC], + [case " $depcc " in #( + *\ -arch\ *\ -arch\ *) am__universal=true ;; + esac], + [CXX], + [case " $depcc " in #( + *\ -arch\ *\ -arch\ *) am__universal=true ;; + esac]) + + for depmode in $am_compiler_list; do + # Setup a source with many dependencies, because some compilers + # like to wrap large dependency lists on column 80 (with \), and + # we should not choose a depcomp mode which is confused by this. + # + # We need to recreate these files for each test, as the compiler may + # overwrite some of them when testing with obscure command lines. + # This happens at least with the AIX C compiler. + : > 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 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" + # 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. + am__obj=sub/conftest.${OBJEXT-o} + am__minus_obj="-o $am__obj" + case $depmode in + gcc) + # This depmode causes a compiler race in universal mode. + test "$am__universal" = false || continue + ;; + nosideeffect) + # 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 break fi + ;; + msvc7 | msvc7msys | msvisualcpp | msvcmsys) + # 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} + am__minus_obj= + ;; + none) break ;; + esac + if depmode=$depmode \ + source=sub/conftest.c object=$am__obj \ + depfile=sub/conftest.Po tmpdepfile=sub/conftest.TPo \ + $SHELL ./depcomp $depcc -c $am__minus_obj sub/conftest.c \ + >/dev/null 2>conftest.err && + grep sub/conftst1.h sub/conftest.Po > /dev/null 2>&1 && + grep sub/conftst6.h sub/conftest.Po > /dev/null 2>&1 && + grep $am__obj sub/conftest.Po > /dev/null 2>&1 && + ${MAKE-make} -s -f confmf > /dev/null 2>&1; then + # icc doesn't choke on unknown options, it will just issue warnings + # or remarks (even with -Werror). So we grep stderr for any message + # that says an option was ignored or not supported. + # When given -MP, icc 7.0 and 7.1 complain thusly: + # icc: Command line warning: ignoring option '-M'; no argument required + # The diagnosis changed in icc 8.0: + # icc: Command line remark: option '-MP' not supported + if (grep 'ignoring option' conftest.err || + grep 'not supported' conftest.err) >/dev/null 2>&1; then :; else + am_cv_$1_dependencies_compiler_type=$depmode + break + fi fi done - IFS="$ac_save_ifs" -dnl If no 4th arg is given, leave the cache variable unset, -dnl so AC_PATH_PROGS will keep looking. -ifelse([$4], , , [ test -z "[$]ac_cv_path_$1" && ac_cv_path_$1="$4" -])dnl - ;; -esac])dnl -$1="$ac_cv_path_$1" -if test ifelse([$4], , [-n "[$]$1"], ["[$]$1" != "$4"]); then - AC_MSG_RESULT([$]$1) + + cd .. + rm -rf conftest.dir else - AC_MSG_RESULT(no) + am_cv_$1_dependencies_compiler_type=none fi -AC_SUBST($1)dnl +]) +AC_SUBST([$1DEPMODE], [depmode=$am_cv_$1_dependencies_compiler_type]) +AM_CONDITIONAL([am__fastdep$1], [ + test "x$enable_dependency_tracking" != xno \ + && test "$am_cv_$1_dependencies_compiler_type" = gcc3]) ]) -# GLIB_WITH_NLS -#----------------- -glib_DEFUN([GLIB_WITH_NLS], - dnl NLS is obligatory - [USE_NLS=yes - AC_SUBST(USE_NLS) - gt_cv_have_gettext=no +# AM_SET_DEPDIR +# ------------- +# Choose a directory name for dependency files. +# 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 +]) - CATOBJEXT=NONE - XGETTEXT=: - INTLLIBS= - AC_CHECK_HEADER(libintl.h, - [gt_cv_func_dgettext_libintl="no" - libintl_extra_libs="" +# AM_DEP_TRACK +# ------------ +AC_DEFUN([AM_DEP_TRACK], +[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='\' + am__nodep='_no' +fi +AM_CONDITIONAL([AMDEP], [test "x$enable_dependency_tracking" != xno]) +AC_SUBST([AMDEPBACKSLASH])dnl +_AM_SUBST_NOTMAKE([AMDEPBACKSLASH])dnl +AC_SUBST([am__nodep])dnl +_AM_SUBST_NOTMAKE([am__nodep])dnl +]) - # - # First check in libc - # - AC_CACHE_CHECK([for ngettext in libc], gt_cv_func_ngettext_libc, - [AC_TRY_LINK([ -#include -], - [return !ngettext ("","", 1)], - gt_cv_func_ngettext_libc=yes, - gt_cv_func_ngettext_libc=no) - ]) - - if test "$gt_cv_func_ngettext_libc" = "yes" ; then - AC_CACHE_CHECK([for dgettext in libc], gt_cv_func_dgettext_libc, - [AC_TRY_LINK([ -#include -], - [return !dgettext ("","")], - gt_cv_func_dgettext_libc=yes, - gt_cv_func_dgettext_libc=no) - ]) - fi - - if test "$gt_cv_func_ngettext_libc" = "yes" ; then - AC_CHECK_FUNCS(bind_textdomain_codeset) - fi +# Generate code to set up dependency tracking. -*- Autoconf -*- - # - # If we don't have everything we want, check in libintl - # - if test "$gt_cv_func_dgettext_libc" != "yes" \ - || test "$gt_cv_func_ngettext_libc" != "yes" \ - || test "$ac_cv_func_bind_textdomain_codeset" != "yes" ; then - - AC_CHECK_LIB(intl, bindtextdomain, - [AC_CHECK_LIB(intl, ngettext, - [AC_CHECK_LIB(intl, dgettext, - gt_cv_func_dgettext_libintl=yes)])]) - - if test "$gt_cv_func_dgettext_libintl" != "yes" ; then - AC_MSG_CHECKING([if -liconv is needed to use gettext]) - AC_MSG_RESULT([]) - AC_CHECK_LIB(intl, ngettext, - [AC_CHECK_LIB(intl, dcgettext, - [gt_cv_func_dgettext_libintl=yes - libintl_extra_libs=-liconv], - :,-liconv)], - :,-liconv) - fi - - # - # If we found libintl, then check in it for bind_textdomain_codeset(); - # we'll prefer libc if neither have bind_textdomain_codeset(), - # and both have dgettext and ngettext - # - if test "$gt_cv_func_dgettext_libintl" = "yes" ; then - glib_save_LIBS="$LIBS" - LIBS="$LIBS -lintl $libintl_extra_libs" - unset ac_cv_func_bind_textdomain_codeset - AC_CHECK_FUNCS(bind_textdomain_codeset) - LIBS="$glib_save_LIBS" - - if test "$ac_cv_func_bind_textdomain_codeset" = "yes" ; then - gt_cv_func_dgettext_libc=no - else - if test "$gt_cv_func_dgettext_libc" = "yes" \ - && test "$gt_cv_func_ngettext_libc" = "yes"; then - gt_cv_func_dgettext_libintl=no - fi - fi - fi - fi - - if test "$gt_cv_func_dgettext_libc" = "yes" \ - || test "$gt_cv_func_dgettext_libintl" = "yes"; then - gt_cv_have_gettext=yes - fi - - if test "$gt_cv_func_dgettext_libintl" = "yes"; then - INTLLIBS="-lintl $libintl_extra_libs" - fi - - if test "$gt_cv_have_gettext" = "yes"; then - AC_DEFINE(HAVE_GETTEXT,1, - [Define if the GNU gettext() function is already present or preinstalled.]) - GLIB_PATH_PROG_WITH_TEST(MSGFMT, msgfmt, - [test -z "`$ac_dir/$ac_word -h 2>&1 | grep 'dv '`"], no)dnl - if test "$MSGFMT" != "no"; then - glib_save_LIBS="$LIBS" - LIBS="$LIBS $INTLLIBS" - AC_CHECK_FUNCS(dcgettext) - MSGFMT_OPTS= - AC_MSG_CHECKING([if msgfmt accepts -c]) - GLIB_RUN_PROG([$MSGFMT -c -o /dev/null],[ -msgid "" -msgstr "" -"Content-Type: text/plain; charset=UTF-8\n" -"Project-Id-Version: test 1.0\n" -"PO-Revision-Date: 2007-02-15 12:01+0100\n" -"Last-Translator: test \n" -"Language-Team: C \n" -"MIME-Version: 1.0\n" -"Content-Transfer-Encoding: 8bit\n" -], [MSGFMT_OPTS=-c; AC_MSG_RESULT([yes])], [AC_MSG_RESULT([no])]) - AC_SUBST(MSGFMT_OPTS) - AC_PATH_PROG(GMSGFMT, gmsgfmt, $MSGFMT) - GLIB_PATH_PROG_WITH_TEST(XGETTEXT, xgettext, - [test -z "`$ac_dir/$ac_word -h 2>&1 | grep '(HELP)'`"], :) - AC_TRY_LINK(, [extern int _nl_msg_cat_cntr; - return _nl_msg_cat_cntr], - [CATOBJEXT=.gmo - DATADIRNAME=share], - [case $host in - *-*-solaris*) - dnl On Solaris, if bind_textdomain_codeset is in libc, - dnl GNU format message catalog is always supported, - dnl since both are added to the libc all together. - dnl Hence, we'd like to go with DATADIRNAME=share and - dnl and CATOBJEXT=.gmo in this case. - AC_CHECK_FUNC(bind_textdomain_codeset, - [CATOBJEXT=.gmo - DATADIRNAME=share], - [CATOBJEXT=.mo - DATADIRNAME=lib]) - ;; - *-*-openbsd*) - CATOBJEXT=.mo - DATADIRNAME=share - ;; - *) - CATOBJEXT=.mo - DATADIRNAME=lib - ;; - esac]) - LIBS="$glib_save_LIBS" - INSTOBJEXT=.mo - else - gt_cv_have_gettext=no - fi - fi - ]) +# 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. - if test "$gt_cv_have_gettext" = "yes" ; then - AC_DEFINE(ENABLE_NLS, 1, - [always defined to indicate that i18n is enabled]) - fi - dnl Test whether we really found GNU xgettext. - if test "$XGETTEXT" != ":"; then - dnl If it is not GNU xgettext we define it as : so that the - dnl Makefiles still can work. - if $XGETTEXT --omit-header /dev/null 2> /dev/null; then - : ; - else - AC_MSG_RESULT( - [found xgettext program is not GNU xgettext; ignore it]) - XGETTEXT=":" - fi +# _AM_OUTPUT_DEPENDENCY_COMMANDS +# ------------------------------ +AC_DEFUN([_AM_OUTPUT_DEPENDENCY_COMMANDS], +[{ + # 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 + *\'*) eval set x "$CONFIG_FILES" ;; + *) set x $CONFIG_FILES ;; + esac + shift + for mf + do + # 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 + # 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. + # Grep'ing the whole file is not good either: AIX grep has a line + # limit of 2048, but all sed's we know have understand at least 4000. + if sed -n 's,^#.*generated by automake.*,X,p' "$mf" | grep X >/dev/null 2>&1; then + dirpart=`AS_DIRNAME("$mf")` + else + continue fi + # Extract the definition of DEPDIR, am__include, and am__quote + # 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"` + # 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'`; do + # Make sure the directory exists. + test -f "$dirpart/$file" && continue + fdir=`AS_DIRNAME(["$file"])` + AS_MKDIR_P([$dirpart/$fdir]) + # echo "creating $dirpart/$file" + echo '# dummy' > "$dirpart/$file" + done + done +} +])# _AM_OUTPUT_DEPENDENCY_COMMANDS - # We need to process the po/ directory. - POSUB=po - AC_OUTPUT_COMMANDS( - [case "$CONFIG_FILES" in *po/Makefile.in*) - sed -e "/POTFILES =/r po/POTFILES" po/Makefile.in > po/Makefile - esac]) +# AM_OUTPUT_DEPENDENCY_COMMANDS +# ----------------------------- +# 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 +# need in order to bootstrap the dependency handling code. +AC_DEFUN([AM_OUTPUT_DEPENDENCY_COMMANDS], +[AC_CONFIG_COMMANDS([depfiles], + [test x"$AMDEP_TRUE" != x"" || _AM_OUTPUT_DEPENDENCY_COMMANDS], + [AMDEP_TRUE="$AMDEP_TRUE" ac_aux_dir="$ac_aux_dir"]) +]) - dnl These rules are solely for the distribution goal. While doing this - dnl we only have to keep exactly one list of the available catalogs - dnl in configure.ac. - for lang in $ALL_LINGUAS; do - GMOFILES="$GMOFILES $lang.gmo" - POFILES="$POFILES $lang.po" - done +# Do all the work for Automake. -*- Autoconf -*- - dnl Make all variables we use known to autoconf. - AC_SUBST(CATALOGS) - AC_SUBST(CATOBJEXT) - AC_SUBST(DATADIRNAME) - AC_SUBST(GMOFILES) - AC_SUBST(INSTOBJEXT) - AC_SUBST(INTLLIBS) - AC_SUBST(PO_IN_DATADIR_TRUE) - AC_SUBST(PO_IN_DATADIR_FALSE) - AC_SUBST(POFILES) - AC_SUBST(POSUB) - ]) +# 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. -# AM_GLIB_GNU_GETTEXT -# ------------------- -# Do checks necessary for use of gettext. If a suitable implementation -# of gettext is found in either in libintl or in the C library, -# it will set INTLLIBS to the libraries needed for use of gettext -# and AC_DEFINE() HAVE_GETTEXT and ENABLE_NLS. (The shell variable -# gt_cv_have_gettext will be set to "yes".) It will also call AC_SUBST() -# on various variables needed by the Makefile.in.in installed by -# glib-gettextize. -dnl -glib_DEFUN([GLIB_GNU_GETTEXT], - [AC_REQUIRE([AC_PROG_CC])dnl - - GLIB_LC_MESSAGES - GLIB_WITH_NLS +# 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. - if test "$gt_cv_have_gettext" = "yes"; then - if test "x$ALL_LINGUAS" = "x"; then - LINGUAS= - else - AC_MSG_CHECKING(for catalogs to be installed) - NEW_LINGUAS= - for presentlang in $ALL_LINGUAS; do - useit=no - if test "%UNSET%" != "${LINGUAS-%UNSET%}"; then - desiredlanguages="$LINGUAS" - else - desiredlanguages="$ALL_LINGUAS" - fi - for desiredlang in $desiredlanguages; do - # Use the presentlang catalog if desiredlang is - # a. equal to presentlang, or - # b. a variant of presentlang (because in this case, - # presentlang can be used as a fallback for messages - # which are not translated in the desiredlang catalog). - case "$desiredlang" in - "$presentlang"*) useit=yes;; - esac - done - if test $useit = yes; then - NEW_LINGUAS="$NEW_LINGUAS $presentlang" - fi - done - LINGUAS=$NEW_LINGUAS - AC_MSG_RESULT($LINGUAS) - fi +# AM_INIT_AUTOMAKE(PACKAGE, VERSION, [NO-DEFINE]) +# AM_INIT_AUTOMAKE([OPTIONS]) +# ----------------------------------------------- +# The call with PACKAGE and VERSION arguments is the old style +# call (pre autoconf-2.50), which is being phased out. PACKAGE +# and VERSION should now be passed to AC_INIT and removed from +# the call to AM_INIT_AUTOMAKE. +# We support both call styles for the transition. After +# the next Automake release, Autoconf can make the AC_INIT +# 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.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 +AC_REQUIRE([AM_SET_CURRENT_AUTOMAKE_VERSION])dnl +AC_REQUIRE([AC_PROG_INSTALL])dnl +if test "`cd $srcdir && pwd`" != "`pwd`"; then + # Use -I$(srcdir) only when $(srcdir) != ., so that make's output + # is not polluted with repeated "-I." + AC_SUBST([am__isrc], [' -I$(srcdir)'])_AM_SUBST_NOTMAKE([am__isrc])dnl + # test to see if srcdir already configured + if test -f $srcdir/config.status; then + AC_MSG_ERROR([source directory already configured; run "make distclean" there first]) + fi +fi - dnl Construct list of names of catalog files to be constructed. - if test -n "$LINGUAS"; then - for lang in $LINGUAS; do CATALOGS="$CATALOGS $lang$CATOBJEXT"; done - fi - fi +# test whether we have cygpath +if test -z "$CYGPATH_W"; then + if (cygpath --version) >/dev/null 2>/dev/null; then + CYGPATH_W='cygpath -w' + else + CYGPATH_W=echo + fi +fi +AC_SUBST([CYGPATH_W]) - dnl If the AC_CONFIG_AUX_DIR macro for autoconf is used we possibly - dnl find the mkinstalldirs script in another subdir but ($top_srcdir). - dnl Try to locate is. - MKINSTALLDIRS= - if test -n "$ac_aux_dir"; then - MKINSTALLDIRS="$ac_aux_dir/mkinstalldirs" - fi - if test -z "$MKINSTALLDIRS"; then - MKINSTALLDIRS="\$(top_srcdir)/mkinstalldirs" - fi - AC_SUBST(MKINSTALLDIRS) +# Define the identity of the package. +dnl Distinguish between old-style and new-style calls. +m4_ifval([$2], +[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], [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 - dnl Generate list of files to be processed by xgettext which will - dnl be included in po/Makefile. - test -d po || mkdir po - if test "x$srcdir" != "x."; then - if test "x`echo $srcdir | sed 's@/.*@@'`" = "x"; then - posrcprefix="$srcdir/" - else - posrcprefix="../$srcdir/" - fi - else - posrcprefix="../" - fi - rm -f po/POTFILES - sed -e "/^#/d" -e "/^\$/d" -e "s,.*, $posrcprefix& \\\\," -e "\$s/\(.*\) \\\\/\1/" \ - < $srcdir/po/POTFILES.in > po/POTFILES - ]) +_AM_IF_OPTION([no-define],, +[AC_DEFINE_UNQUOTED([PACKAGE], ["$PACKAGE"], [Name of package]) + AC_DEFINE_UNQUOTED([VERSION], ["$VERSION"], [Version number of package])])dnl -# AM_GLIB_DEFINE_LOCALEDIR(VARIABLE) -# ------------------------------- -# Define VARIABLE to the location where catalog files will -# be installed by po/Makefile. -glib_DEFUN([GLIB_DEFINE_LOCALEDIR], -[glib_REQUIRE([GLIB_GNU_GETTEXT])dnl -glib_save_prefix="$prefix" -glib_save_exec_prefix="$exec_prefix" -glib_save_datarootdir="$datarootdir" -test "x$prefix" = xNONE && prefix=$ac_default_prefix -test "x$exec_prefix" = xNONE && exec_prefix=$prefix -datarootdir=`eval echo "${datarootdir}"` -if test "x$CATOBJEXT" = "x.mo" ; then - localedir=`eval echo "${libdir}/locale"` -else - localedir=`eval echo "${datadir}/locale"` -fi -prefix="$glib_save_prefix" -exec_prefix="$glib_save_exec_prefix" -datarootdir="$glib_save_datarootdir" -AC_DEFINE_UNQUOTED($1, "$localedir", - [Define the location where the catalogs will be installed]) +# 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]) +AC_REQUIRE([AM_PROG_INSTALL_SH])dnl +AC_REQUIRE([AM_PROG_INSTALL_STRIP])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 +AC_REQUIRE([AC_PROG_MAKE_SET])dnl +AC_REQUIRE([AM_SET_LEADING_DOT])dnl +_AM_IF_OPTION([tar-ustar], [_AM_PROG_TAR([ustar])], + [_AM_IF_OPTION([tar-pax], [_AM_PROG_TAR([pax])], + [_AM_PROG_TAR([v7])])]) +_AM_IF_OPTION([no-dependencies],, +[AC_PROVIDE_IFELSE([AC_PROG_CC], + [_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])], + [m4_define([AC_PROG_CXX], + m4_defn([AC_PROG_CXX])[_AM_DEPENDENCIES([CXX])])])dnl +AC_PROVIDE_IFELSE([AC_PROG_OBJC], + [_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 -dnl Now the definitions that aclocal will find -dnl -ifdef(glib_configure_ac,[],[ -AC_DEFUN([AM_GLIB_GNU_GETTEXT],[GLIB_GNU_GETTEXT($@)]) -AC_DEFUN([AM_GLIB_DEFINE_LOCALEDIR],[GLIB_DEFINE_LOCALEDIR($@)]) -])dnl +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], +m4_defn([_AC_COMPILER_EXEEXT])[m4_provide([_AM_COMPILER_EXEEXT])]) -# GLIB_RUN_PROG(PROGRAM, TEST-FILE, [ACTION-IF-PASS], [ACTION-IF-FAIL]) -# -# Create a temporary file with TEST-FILE as its contents and pass the -# file name to PROGRAM. Perform ACTION-IF-PASS if PROGRAM exits with -# 0 and perform ACTION-IF-FAIL for any other exit status. -AC_DEFUN([GLIB_RUN_PROG], -[cat >conftest.foo <<_ACEOF -$2 -_ACEOF -if AC_RUN_LOG([$1 conftest.foo]); then - m4_ifval([$3], [$3], [:]) -m4_ifvaln([$4], [else $4])dnl -echo "$as_me: failed input was:" >&AS_MESSAGE_LOG_FD -sed 's/^/| /' conftest.foo >&AS_MESSAGE_LOG_FD -fi]) +# When config.status generates a header, we must update the stamp-h file. +# This file resides in the same directory as the config header +# that is generated. The stamp files are numbered to have different names. + +# Autoconf calls _AC_AM_CONFIG_HEADER_HOOK (when defined) in the +# loop where config.status creates the headers, so we can generate +# our stamp files there. +AC_DEFUN([_AC_AM_CONFIG_HEADER_HOOK], +[# Compute $1's index in $config_headers. +_am_arg=$1 +_am_stamp_count=1 +for _am_header in $config_headers :; do + case $_am_header in + $_am_arg | $_am_arg:* ) + break ;; + * ) + _am_stamp_count=`expr $_am_stamp_count + 1` ;; + esac +done +echo "timestamp for $_am_arg" >`AS_DIRNAME(["$_am_arg"])`/stamp-h[]$_am_stamp_count]) -# gnome-common.m4 +# Copyright (C) 2001-2013 Free Software Foundation, Inc. # -# serial 3 -# +# 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. -dnl GNOME_COMMON_INIT +# AM_PROG_INSTALL_SH +# ------------------ +# Define $install_sh. +AC_DEFUN([AM_PROG_INSTALL_SH], +[AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl +if test x"${install_sh}" != xset; then + case $am_aux_dir in + *\ * | *\ *) + install_sh="\${SHELL} '$am_aux_dir/install-sh'" ;; + *) + install_sh="\${SHELL} $am_aux_dir/install-sh" + esac +fi +AC_SUBST([install_sh])]) -AU_DEFUN([GNOME_COMMON_INIT], -[ - dnl this macro should come after AC_CONFIG_MACRO_DIR - AC_BEFORE([AC_CONFIG_MACRO_DIR], [$0]) +# 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. - dnl ensure that when the Automake generated makefile calls aclocal, - dnl it honours the $ACLOCAL_FLAGS environment variable - ACLOCAL_AMFLAGS="\${ACLOCAL_FLAGS}" - if test -n "$ac_macro_dir"; then - ACLOCAL_AMFLAGS="-I $ac_macro_dir $ACLOCAL_AMFLAGS" - fi +# Check whether the underlying file-system supports filenames +# with a leading dot. For instance MS-DOS doesn't. +AC_DEFUN([AM_SET_LEADING_DOT], +[rm -rf .tst 2>/dev/null +mkdir .tst 2>/dev/null +if test -d .tst; then + am__leading_dot=. +else + am__leading_dot=_ +fi +rmdir .tst 2>/dev/null +AC_SUBST([am__leading_dot])]) - AC_SUBST([ACLOCAL_AMFLAGS]) -], -[[$0: This macro is deprecated. You should set put "ACLOCAL_AMFLAGS = -I m4 ${ACLOCAL_FLAGS}" -in your top-level Makefile.am, instead, where "m4" is the macro directory set -with AC_CONFIG_MACRO_DIR() in your configure.ac]]) +# Add --enable-maintainer-mode option to configure. -*- Autoconf -*- +# From Jim Meyering -AC_DEFUN([GNOME_DEBUG_CHECK], -[ - AC_ARG_ENABLE([debug], - AC_HELP_STRING([--enable-debug], - [turn on debugging]),, - [enable_debug=no]) +# 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. - if test x$enable_debug = xyes ; then - AC_DEFINE(GNOME_ENABLE_DEBUG, 1, - [Enable additional debugging at the expense of performance and size]) - fi -]) +# 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 +# can override the default with the --enable/--disable switch. +AC_DEFUN([AM_MAINTAINER_MODE], +[m4_case(m4_default([$1], [disable]), + [enable], [m4_define([am_maintainer_other], [disable])], + [disable], [m4_define([am_maintainer_other], [enable])], + [m4_define([am_maintainer_other], [enable]) + m4_warn([syntax], [unexpected argument to AM@&t@_MAINTAINER_MODE: $1])]) +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], + [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 + AC_SUBST([MAINT])dnl +] +) -dnl GNOME_MAINTAINER_MODE_DEFINES () -dnl define DISABLE_DEPRECATED -dnl -AC_DEFUN([GNOME_MAINTAINER_MODE_DEFINES], -[ - AC_REQUIRE([AM_MAINTAINER_MODE]) +# Check to see how 'make' treats includes. -*- Autoconf -*- - DISABLE_DEPRECATED="" - if test $USE_MAINTAINER_MODE = yes; then - DOMAINS="GCONF BONOBO BONOBO_UI GNOME LIBGLADE GNOME_VFS WNCK LIBSOUP" - for DOMAIN in $DOMAINS; do - DISABLE_DEPRECATED="$DISABLE_DEPRECATED -D${DOMAIN}_DISABLE_DEPRECATED -D${DOMAIN}_DISABLE_SINGLE_INCLUDES" - done - fi +# 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. - AC_SUBST(DISABLE_DEPRECATED) +# AM_MAKE_INCLUDE() +# ----------------- +# Check to see how make treats includes. +AC_DEFUN([AM_MAKE_INCLUDE], +[am_make=${MAKE-make} +cat > confinc << 'END' +am__doit: + @echo this is the am__doit target +.PHONY: am__doit +END +# If we don't find an include directive, just comment out the code. +AC_MSG_CHECKING([for style of include used by $am_make]) +am__include="#" +am__quote= +_am_result=none +# First try GNU make style include. +echo "include confinc" > confmf +# 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 + am__quote= + _am_result=GNU + ;; +esac +# Now try BSD make style include. +if test "$am__include" = "#"; then + echo '.include "confinc"' > confmf + case `$am_make -s -f confmf 2> /dev/null` in #( + *the\ am__doit\ target*) + am__include=.include + am__quote="\"" + _am_result=BSD + ;; + esac +fi +AC_SUBST([am__include]) +AC_SUBST([am__quote]) +AC_MSG_RESULT([$_am_result]) +rm -f confinc confmf ]) -# gnome-compiler-flags.m4 -# -# serial 2 +# Fake the existence of programs that GNU maintainers use. -*- Autoconf -*- + +# 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. -dnl GNOME_COMPILE_WARNINGS -dnl Turn on many useful compiler warnings and substitute the result into -dnl WARN_CFLAGS -dnl For now, only works on GCC -dnl Pass the default value of the --enable-compile-warnings configure option as -dnl the first argument to the macro, defaulting to 'yes'. -dnl Additional warning/error flags can be passed as an optional second argument. -dnl -dnl For example: GNOME_COMPILE_WARNINGS([maximum],[-Werror=some-flag -Wfoobar]) -AC_DEFUN([GNOME_COMPILE_WARNINGS],[ - dnl ****************************** - dnl More compiler warnings - dnl ****************************** +# AM_MISSING_PROG(NAME, PROGRAM) +# ------------------------------ +AC_DEFUN([AM_MISSING_PROG], +[AC_REQUIRE([AM_MISSING_HAS_RUN]) +$1=${$1-"${am_missing_run}$2"} +AC_SUBST($1)]) - AC_ARG_ENABLE(compile-warnings, - AC_HELP_STRING([--enable-compile-warnings=@<:@no/minimum/yes/maximum/error@:>@], - [Turn on compiler warnings]),, - [enable_compile_warnings="m4_default([$1],[yes])"]) +# AM_MISSING_HAS_RUN +# ------------------ +# 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 +if test x"${MISSING+set}" != xset; then + case $am_aux_dir in + *\ * | *\ *) + MISSING="\${SHELL} \"$am_aux_dir/missing\"" ;; + *) + MISSING="\${SHELL} $am_aux_dir/missing" ;; + esac +fi +# Use eval to expand $SHELL +if eval "$MISSING --is-lightweight"; then + am_missing_run="$MISSING " +else + am_missing_run= + AC_MSG_WARN(['missing' script is too old or missing]) +fi +]) - if test "x$GCC" != xyes; then - enable_compile_warnings=no - fi +# Helper functions for option handling. -*- Autoconf -*- - warning_flags= - realsave_CFLAGS="$CFLAGS" +# 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. - dnl These are warning flags that aren't marked as fatal. Can be - dnl overridden on a per-project basis with -Wno-foo. - base_warn_flags=" \ - -Wall \ - -Wstrict-prototypes \ - -Wnested-externs \ - " +# _AM_MANGLE_OPTION(NAME) +# ----------------------- +AC_DEFUN([_AM_MANGLE_OPTION], +[[_AM_OPTION_]m4_bpatsubst($1, [[^a-zA-Z0-9_]], [_])]) - dnl These compiler flags typically indicate very broken or suspicious - dnl code. Some of them such as implicit-function-declaration are - dnl just not default because gcc compiles a lot of legacy code. - dnl We choose to make this set into explicit errors. - base_error_flags=" \ - -Werror=missing-prototypes \ - -Werror=implicit-function-declaration \ - -Werror=pointer-arith \ - -Werror=init-self \ - -Werror=format-security \ - -Werror=format=2 \ - -Werror=missing-include-dirs \ - " +# _AM_SET_OPTION(NAME) +# -------------------- +# 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])]) - dnl Additional warning or error flags provided by the module author to - dnl allow stricter standards to be imposed on a per-module basis. - dnl The author can pass -W or -Werror flags here as they see fit. - additional_flags="m4_default([$2],[])" +# _AM_SET_OPTIONS(OPTIONS) +# ------------------------ +# OPTIONS is a space-separated list of Automake options. +AC_DEFUN([_AM_SET_OPTIONS], +[m4_foreach_w([_AM_Option], [$1], [_AM_SET_OPTION(_AM_Option)])]) - case "$enable_compile_warnings" in - no) - warning_flags= - ;; - minimum) - warning_flags="-Wall" - ;; - yes) - warning_flags="$base_warn_flags $base_error_flags $additional_flags" - ;; - maximum|error) - warning_flags="$base_warn_flags $base_error_flags $additional_flags" - ;; - *) - AC_MSG_ERROR(Unknown argument '$enable_compile_warnings' to --enable-compile-warnings) - ;; - esac +# _AM_IF_OPTION(OPTION, IF-SET, [IF-NOT-SET]) +# ------------------------------------------- +# Execute IF-SET if OPTION is set, IF-NOT-SET otherwise. +AC_DEFUN([_AM_IF_OPTION], +[m4_ifset(_AM_MANGLE_OPTION([$1]), [$2], [$3])]) - if test "$enable_compile_warnings" = "error" ; then - warning_flags="$warning_flags -Werror" - fi +# 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. - dnl Check whether GCC supports the warning options - for option in $warning_flags; do - save_CFLAGS="$CFLAGS" - CFLAGS="$CFLAGS $option" - AC_MSG_CHECKING([whether gcc understands $option]) - AC_TRY_COMPILE([], [], - has_option=yes, - has_option=no,) - CFLAGS="$save_CFLAGS" - AC_MSG_RESULT([$has_option]) - if test $has_option = yes; then - tested_warning_flags="$tested_warning_flags $option" - fi - unset has_option - unset save_CFLAGS - done - unset option - CFLAGS="$realsave_CFLAGS" - AC_MSG_CHECKING(what warning flags to pass to the C compiler) - AC_MSG_RESULT($tested_warning_flags) +# 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); }]) - AC_ARG_ENABLE(iso-c, - AC_HELP_STRING([--enable-iso-c], - [Try to warn if code is not ISO C ]),, - [enable_iso_c=no]) +# Check to make sure that the build environment is sane. -*- Autoconf -*- - AC_MSG_CHECKING(what language compliance flags to pass to the C compiler) - complCFLAGS= - if test "x$enable_iso_c" != "xno"; then - if test "x$GCC" = "xyes"; then - case " $CFLAGS " in - *[\ \ ]-ansi[\ \ ]*) ;; - *) complCFLAGS="$complCFLAGS -ansi" ;; - esac - case " $CFLAGS " in - *[\ \ ]-pedantic[\ \ ]*) ;; - *) complCFLAGS="$complCFLAGS -pedantic" ;; - esac - fi - fi - AC_MSG_RESULT($complCFLAGS) +# 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. - WARN_CFLAGS="$tested_warning_flags $complCFLAGS" - AC_SUBST(WARN_CFLAGS) -]) +# AM_SANITY_CHECK +# --------------- +AC_DEFUN([AM_SANITY_CHECK], +[AC_MSG_CHECKING([whether build environment is sane]) +# Reject unsafe characters in $srcdir or the absolute working directory +# name. Accept space and tab only in the latter. +am_lf=' +' +case `pwd` in + *[[\\\"\#\$\&\'\`$am_lf]]*) + AC_MSG_ERROR([unsafe absolute working directory name]);; +esac +case $srcdir in + *[[\\\"\#\$\&\'\`$am_lf\ \ ]]*) + AC_MSG_ERROR([unsafe srcdir value: '$srcdir']);; +esac -dnl For C++, do basically the same thing. +# 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 ( + 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 -AC_DEFUN([GNOME_CXX_WARNINGS],[ - AC_ARG_ENABLE(cxx-warnings, - AC_HELP_STRING([--enable-cxx-warnings=@<:@no/minimum/yes@:>@] - [Turn on compiler warnings.]),, - [enable_cxx_warnings="m4_default([$1],[minimum])"]) + # 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 + # Ok. + : +else + AC_MSG_ERROR([newly created file is older than distributed files! +Check your system clock]) +fi +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 +]) - AC_MSG_CHECKING(what warning flags to pass to the C++ compiler) - warnCXXFLAGS= - if test "x$GXX" != xyes; then - enable_cxx_warnings=no - fi - if test "x$enable_cxx_warnings" != "xno"; then - if test "x$GXX" = "xyes"; then - case " $CXXFLAGS " in - *[\ \ ]-Wall[\ \ ]*) ;; - *) warnCXXFLAGS="-Wall -Wno-unused" ;; - esac +# 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. - ## -W is not all that useful. And it cannot be controlled - ## with individual -Wno-xxx flags, unlike -Wall - if test "x$enable_cxx_warnings" = "xyes"; then - warnCXXFLAGS="$warnCXXFLAGS -Wshadow -Woverloaded-virtual" - fi - fi - fi - AC_MSG_RESULT($warnCXXFLAGS) +# AM_SILENT_RULES([DEFAULT]) +# -------------------------- +# Enable less verbose build rules; with the default set to DEFAULT +# ("yes" being less verbose, "no" or empty being verbose). +AC_DEFUN([AM_SILENT_RULES], +[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 do not support nested variable expansions. +dnl See automake bug#9928 and bug#10237. +am_make=${MAKE-make} +AC_CACHE_CHECK([whether $am_make supports nested variables], + [am_cv_make_support_nested_variables], + [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]) +if test $am_cv_make_support_nested_variables = yes; then + dnl Using '$V' instead of '$(V)' breaks IRIX make. + AM_V='$(V)' + AM_DEFAULT_V='$(AM_DEFAULT_VERBOSITY)' +else + AM_V=$AM_DEFAULT_VERBOSITY + AM_DEFAULT_V=$AM_DEFAULT_VERBOSITY +fi +AC_SUBST([AM_V])dnl +AM_SUBST_NOTMAKE([AM_V])dnl +AC_SUBST([AM_DEFAULT_V])dnl +AM_SUBST_NOTMAKE([AM_DEFAULT_V])dnl +AC_SUBST([AM_DEFAULT_VERBOSITY])dnl +AM_BACKSLASH='\' +AC_SUBST([AM_BACKSLASH])dnl +_AM_SUBST_NOTMAKE([AM_BACKSLASH])dnl +]) - AC_ARG_ENABLE(iso-cxx, - AC_HELP_STRING([--enable-iso-cxx], - [Try to warn if code is not ISO C++ ]),, - [enable_iso_cxx=no]) +# 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. - AC_MSG_CHECKING(what language compliance flags to pass to the C++ compiler) - complCXXFLAGS= - if test "x$enable_iso_cxx" != "xno"; then - if test "x$GXX" = "xyes"; then - case " $CXXFLAGS " in - *[\ \ ]-ansi[\ \ ]*) ;; - *) complCXXFLAGS="$complCXXFLAGS -ansi" ;; - esac +# AM_PROG_INSTALL_STRIP +# --------------------- +# 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 +# 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 +# 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'. +if test "$cross_compiling" != no; then + AC_CHECK_TOOL([STRIP], [strip], :) +fi +INSTALL_STRIP_PROGRAM="\$(install_sh) -c -s" +AC_SUBST([INSTALL_STRIP_PROGRAM])]) - case " $CXXFLAGS " in - *[\ \ ]-pedantic[\ \ ]*) ;; - *) complCXXFLAGS="$complCXXFLAGS -pedantic" ;; - esac - fi - fi - AC_MSG_RESULT($complCXXFLAGS) +# 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. - WARN_CXXFLAGS="$CXXFLAGS $warnCXXFLAGS $complCXXFLAGS" - AC_SUBST(WARN_CXXFLAGS) -]) +# _AM_SUBST_NOTMAKE(VARIABLE) +# --------------------------- +# Prevent Automake from outputting VARIABLE = @VARIABLE@ in Makefile.in. +# This macro is traced by Automake. +AC_DEFUN([_AM_SUBST_NOTMAKE]) -dnl -*- mode: autoconf -*- -dnl Copyright 2009 Johan Dahlin -dnl -dnl This file is free software; the author(s) gives unlimited -dnl permission to copy and/or distribute it, with or without -dnl modifications, as long as this notice is preserved. -dnl +# AM_SUBST_NOTMAKE(VARIABLE) +# -------------------------- +# Public sister of _AM_SUBST_NOTMAKE. +AC_DEFUN([AM_SUBST_NOTMAKE], [_AM_SUBST_NOTMAKE($@)]) -# serial 1 +# Check how to create a tarball. -*- Autoconf -*- -m4_define([_GOBJECT_INTROSPECTION_CHECK_INTERNAL], -[ - AC_BEFORE([AC_PROG_LIBTOOL],[$0])dnl setup libtool first - AC_BEFORE([AM_PROG_LIBTOOL],[$0])dnl setup libtool first - AC_BEFORE([LT_INIT],[$0])dnl setup libtool first +# 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. - dnl enable/disable introspection - m4_if([$2], [require], - [dnl - enable_introspection=yes - ],[dnl - AC_ARG_ENABLE(introspection, - AS_HELP_STRING([--enable-introspection[=@<:@no/auto/yes@:>@]], - [Enable introspection for this build]),, - [enable_introspection=auto]) - ])dnl +# _AM_PROG_TAR(FORMAT) +# -------------------- +# Check how to create a tarball in format FORMAT. +# 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 +# $tardir. +# tardir=directory && $(am__tar) > result.tar +# +# Substitute a variable $(am__untar) that extract such +# a tarball read from stdin. +# $(am__untar) < result.tar +# +AC_DEFUN([_AM_PROG_TAR], +[# Always define AMTAR for backward compatibility. Yes, it's still used +# in the wild :-( We should find a proper way to deprecate it ... +AC_SUBST([AMTAR], ['$${TAR-tar}']) - AC_MSG_CHECKING([for gobject-introspection]) +# We'll loop over all known methods to create a tar archive until one works. +_am_tools='gnutar m4_if([$1], [ustar], [plaintar]) pax cpio none' - dnl presence/version checking - AS_CASE([$enable_introspection], - [no], [dnl - found_introspection="no (disabled, use --enable-introspection to enable)" - ],dnl - [yes],[dnl - PKG_CHECK_EXISTS([gobject-introspection-1.0],, - AC_MSG_ERROR([gobject-introspection-1.0 is not installed])) - PKG_CHECK_EXISTS([gobject-introspection-1.0 >= $1], - found_introspection=yes, - AC_MSG_ERROR([You need to have gobject-introspection >= $1 installed to build AC_PACKAGE_NAME])) - ],dnl - [auto],[dnl - PKG_CHECK_EXISTS([gobject-introspection-1.0 >= $1], found_introspection=yes, found_introspection=no) - dnl Canonicalize enable_introspection - enable_introspection=$found_introspection - ],dnl - [dnl - AC_MSG_ERROR([invalid argument passed to --enable-introspection, should be one of @<:@no/auto/yes@:>@]) - ])dnl +m4_if([$1], [v7], + [am__tar='$${TAR-tar} chof - "$$tardir"' am__untar='$${TAR-tar} xf -'], - AC_MSG_RESULT([$found_introspection]) + [m4_case([$1], + [ustar], + [# The POSIX 1988 'ustar' format is defined with fixed-size fields. + # There is notably a 21 bits limit for the UID and the GID. In fact, + # the 'pax' utility can hang on bigger UID/GID (see automake bug#8343 + # and bug#13588). + am_max_uid=2097151 # 2^21 - 1 + am_max_gid=$am_max_uid + # The $UID and $GID variables are not portable, so we need to resort + # to the POSIX-mandated id(1) utility. Errors in the 'id' calls + # below are definitely unexpected, so allow the users to see them + # (that is, avoid stderr redirection). + am_uid=`id -u || echo unknown` + am_gid=`id -g || echo unknown` + AC_MSG_CHECKING([whether UID '$am_uid' is supported by ustar format]) + if test $am_uid -le $am_max_uid; then + AC_MSG_RESULT([yes]) + else + AC_MSG_RESULT([no]) + _am_tools=none + fi + AC_MSG_CHECKING([whether GID '$am_gid' is supported by ustar format]) + if test $am_gid -le $am_max_gid; then + AC_MSG_RESULT([yes]) + else + AC_MSG_RESULT([no]) + _am_tools=none + fi], - INTROSPECTION_SCANNER= - INTROSPECTION_COMPILER= - INTROSPECTION_GENERATE= - INTROSPECTION_GIRDIR= - INTROSPECTION_TYPELIBDIR= - if test "x$found_introspection" = "xyes"; then - INTROSPECTION_SCANNER=`$PKG_CONFIG --variable=g_ir_scanner gobject-introspection-1.0` - INTROSPECTION_COMPILER=`$PKG_CONFIG --variable=g_ir_compiler gobject-introspection-1.0` - INTROSPECTION_GENERATE=`$PKG_CONFIG --variable=g_ir_generate gobject-introspection-1.0` - INTROSPECTION_GIRDIR=`$PKG_CONFIG --variable=girdir gobject-introspection-1.0` - INTROSPECTION_TYPELIBDIR="$($PKG_CONFIG --variable=typelibdir gobject-introspection-1.0)" - INTROSPECTION_CFLAGS=`$PKG_CONFIG --cflags gobject-introspection-1.0` - INTROSPECTION_LIBS=`$PKG_CONFIG --libs gobject-introspection-1.0` - INTROSPECTION_MAKEFILE=`$PKG_CONFIG --variable=datadir gobject-introspection-1.0`/gobject-introspection-1.0/Makefile.introspection - fi - AC_SUBST(INTROSPECTION_SCANNER) - AC_SUBST(INTROSPECTION_COMPILER) - AC_SUBST(INTROSPECTION_GENERATE) - AC_SUBST(INTROSPECTION_GIRDIR) - AC_SUBST(INTROSPECTION_TYPELIBDIR) - AC_SUBST(INTROSPECTION_CFLAGS) - AC_SUBST(INTROSPECTION_LIBS) - AC_SUBST(INTROSPECTION_MAKEFILE) + [pax], + [], - AM_CONDITIONAL(HAVE_INTROSPECTION, test "x$found_introspection" = "xyes") -]) + [m4_fatal([Unknown tar format])]) + AC_MSG_CHECKING([how to create a $1 tar archive]) -dnl Usage: -dnl GOBJECT_INTROSPECTION_CHECK([minimum-g-i-version]) + # Go ahead even if we have the value already cached. We do so because we + # need to set the values for the 'am__tar' and 'am__untar' variables. + _am_tools=${am_cv_prog_tar_$1-$_am_tools} -AC_DEFUN([GOBJECT_INTROSPECTION_CHECK], -[ - _GOBJECT_INTROSPECTION_CHECK_INTERNAL([$1]) -]) + for _am_tool in $_am_tools; do + case $_am_tool in + gnutar) + for _am_tar in tar gnutar gtar; do + AM_RUN_LOG([$_am_tar --version]) && break + done + am__tar="$_am_tar --format=m4_if([$1], [pax], [posix], [$1]) -chf - "'"$$tardir"' + am__tar_="$_am_tar --format=m4_if([$1], [pax], [posix], [$1]) -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 $1 -w "$$tardir"' + am__tar_='pax -L -x $1 -w "$tardir"' + am__untar='pax -r' + ;; + cpio) + am__tar='find "$$tardir" -print | cpio -o -H $1 -L' + am__tar_='find "$tardir" -print | cpio -o -H $1 -L' + am__untar='cpio -i -H $1 -d' + ;; + none) + am__tar=false + am__tar_=false + am__untar=false + ;; + esac -dnl Usage: -dnl GOBJECT_INTROSPECTION_REQUIRE([minimum-g-i-version]) + # If the value was cached, stop now. We just wanted to have am__tar + # and am__untar set. + test -n "${am_cv_prog_tar_$1}" && break + + # tar/untar a dummy directory, and stop if the command works. + rm -rf conftest.dir + mkdir conftest.dir + echo GrepMe > conftest.dir/file + AM_RUN_LOG([tardir=conftest.dir && eval $am__tar_ >conftest.tar]) + rm -rf conftest.dir + if test -s conftest.tar; then + AM_RUN_LOG([$am__untar /dev/null 2>&1 && break + fi + done + rm -rf conftest.dir + AC_CACHE_VAL([am_cv_prog_tar_$1], [am_cv_prog_tar_$1=$_am_tool]) + AC_MSG_RESULT([$am_cv_prog_tar_$1])]) -AC_DEFUN([GOBJECT_INTROSPECTION_REQUIRE], -[ - _GOBJECT_INTROSPECTION_CHECK_INTERNAL([$1], [require]) -]) +AC_SUBST([am__tar]) +AC_SUBST([am__untar]) +]) # _AM_PROG_TAR m4_include([m4/gtk-doc.m4]) m4_include([m4/intltool.m4]) diff -Nru gnome-desktop3-3.12.0/ChangeLog gnome-desktop3-3.8.4/ChangeLog --- gnome-desktop3-3.12.0/ChangeLog 2014-03-24 14:32:32.000000000 +0000 +++ gnome-desktop3-3.8.4/ChangeLog 2013-09-04 11:30:23.000000000 +0000 @@ -1,1406 +1,39 @@ # Generated by Makefile. Do not edit. -commit 709a2957b22961114e2da69da5d5c849c2678027 +commit f6c6f404142c18415df0cb4e429cde199b9ab6da Author: Rui Matos -Date: Mon Mar 24 15:27:33 2014 +0100 +Date: Wed Sep 4 13:23:43 2013 +0200 - 3.12.0 + 3.8.4 M NEWS M configure.ac -commit 59443690fbd44fb9dde6395617d1d63c4ad1f1a1 -Author: Bastien Nocera -Date: Tue Mar 18 11:18:31 2014 +0100 - - 3.11.91 - -M NEWS -M configure.ac - -commit b5a423d104e8484f0a3dd1f987e04919b83e72da -Author: Giovanni Campagna -Date: Tue Mar 11 17:37:56 2014 +0100 - - GnomeRR: remove unused variables - - I forgot to do it before pushing. - -M libgnome-desktop/gnome-rr.c - -commit b84f31535f8e006200dcec2ea8c38286756911be -Author: Giovanni Campagna -Date: Mon Mar 10 20:27:53 2014 +0100 - - GnomeRR: force the DPMS mode change to mutter always - - Our cached DPMS mode value can be wrong in face of changes by - other clients we haven't seen yet, so always send the change - to mutter, and let it optimize away if needed (in practice, - it should never optimize, because the only reliable source - of DPMS state is the kernel driver, and several API calls - can reset DPMS without any change notification) - - https://bugzilla.gnome.org/show_bug.cgi?id=726055 - -M libgnome-desktop/gnome-rr.c - -commit 543dc327db81d741da093d8388c5bbf3901749ac -Author: Rafael Ferreira -Date: Fri Mar 7 23:11:50 2014 -0300 - - Updated Brazilian Portuguese translation - -M desktop-docs/gpl/pt_BR/pt_BR.po - -commit 0e25df1cc9d37ebf245423667c7fcd712828a3f1 -Author: Rui Matos -Date: Tue Feb 18 17:32:45 2014 +0100 - - 3.11.90 - -M NEWS -M configure.ac - -commit 8b25e9fcbf67f728d65b16aaa4d2116304ddd113 -Author: Rui Matos -Date: Mon Nov 18 15:42:02 2013 +0100 - - gnome-xkb-info: Apply main layout locale metadata to variants - - If a variant doesn't specify language/country metadata then we should - file it under its main layout's language/country. - - https://bugzilla.gnome.org/show_bug.cgi?id=711291 - -M libgnome-desktop/gnome-xkb-info.c - -commit 579456e7b66eaf0bccd07e1f6fb2a4f8101336b3 -Author: Rui Matos -Date: Wed Feb 12 22:07:56 2014 +0100 - - gnome-xkb-info: Remove xkbfile dependency - - This code was originally from gnome-settings-daemon but got moved here - so that we could be sure that all GnomeXkbInfo users were using the - same xkb rules file by getting it from the X server. - - As we move towards wayland though, we find ourselves in a position to - specify how and where xkb data resides so we can drop this - dependency. Instead, for now, we'll just hardcode the path to the xkb - data from the xkeyboard-config XKB_DATA compile time variable. - - https://bugzilla.gnome.org/show_bug.cgi?id=719942 - -M configure.ac -M libgnome-desktop/Makefile.am -M libgnome-desktop/gnome-desktop-3.0.pc.in -M libgnome-desktop/gnome-xkb-info.c -M libgnome-desktop/gnome-xkb-info.h -M libgnome-desktop/test-xkb-info.c - -commit eb752a07c75616724825006de48645d1ed148371 -Author: Rui Matos -Date: Mon Feb 3 18:37:37 2014 +0100 - - 3.11.5 - -M NEWS -M configure.ac - -commit 1b9b7a267ade221ad4000cd024547b42a3056bf4 -Author: Rui Matos -Date: Tue Jan 21 22:04:42 2014 +0100 - - wall-clock: Replace ratio with colon on non-UTF-8 locales - - Some of our translations use the ratio symbol which isn't convertible - to non-UTF-8 locale encodings which causes g_date_time_format() to - fail. Work around it by replacing the ratio symbol with a plain - colon. - - https://bugzilla.gnome.org/show_bug.cgi?id=722664 - -M libgnome-desktop/gnome-wall-clock.c - -commit b7826cca943bd3d64189931fd6ad1b250985ee8e -Author: Daniel Mustieles -Date: Thu Jan 23 12:55:35 2014 +0100 - - Updated FSF's address - -M libgnome-desktop/gnome-idle-monitor.c -M libgnome-desktop/gnome-idle-monitor.h -M libgnome-desktop/gnome-languages.c -M libgnome-desktop/gnome-languages.h -M libgnome-desktop/meta-xrandr-shared.h - -commit 87254c506f46d2f440304f15faf8542f5119ce5d -Author: GunChleoc -Date: Wed Jan 22 21:00:29 2014 +0100 - - Added Scottish Gaelic translation - -M po/LINGUAS -A po/gd.po - -commit 0b6821c3fc5c28932a92e9483d3d1f5e317595d1 -Author: Ray Strode -Date: Wed Jan 15 16:06:15 2014 -0500 - - configure: bump to 3.11.4 - -M configure.ac - -commit a38989a8eb526436293720edcbb22b12ce0c154a -Author: Ray Strode -Date: Wed Jan 15 16:06:01 2014 -0500 - - NEWS: update for release - -M NEWS - -commit 1be326f08b1127284500630dc7cf8830e5cb712c -Author: Cosimo Cecchi -Date: Tue Jan 7 10:16:22 2014 -0800 - - docs: update gnome-desktop3-sections.txt - - https://bugzilla.gnome.org/show_bug.cgi?id=721672 - -M docs/reference/gnome-desktop3/Makefile.am -M docs/reference/gnome-desktop3/gnome-desktop3-sections.txt - -commit 2b7b972485ceb6b37920029efe4003d10c274625 -Author: Cosimo Cecchi -Date: Tue Jan 7 10:03:22 2014 -0800 - - build: bump version - - Since we added new API - - https://bugzilla.gnome.org/show_bug.cgi?id=721672 - -M configure.ac - -commit 6040dbe44a2e0a9d73ae8713de749139c46d52a2 -Author: Cosimo Cecchi -Date: Mon Jan 6 19:05:56 2014 -0800 - - gnome-rr: add API to check whether rotation is supported - - Export a method on GnomeRROutputInfo to check which rotation options are - supported. - - https://bugzilla.gnome.org/show_bug.cgi?id=721672 - -M libgnome-desktop/gnome-rr-config.c -M libgnome-desktop/gnome-rr-config.h -M libgnome-desktop/gnome-rr-output-info.c -M libgnome-desktop/gnome-rr-private.h - -commit 11f32f153b395d3ead7af3176488e85e47d5504d -Author: Cosimo Cecchi -Date: Wed Jan 8 10:53:32 2014 -0800 - - gnome-rr: don't forget to copy display name - - https://bugzilla.gnome.org/show_bug.cgi?id=719928 - -M libgnome-desktop/gnome-rr.c - -commit 390c4d6d11fd12beb214e29e63f37afa9d74bdff -Author: Florian Weimer -Date: Fri Dec 20 11:59:08 2013 +0100 - - Remove locarchive.h - - This include file is no longer needed since the switch to - "locale -a" for listing locales. - - https://bugzilla.gnome.org/show_bug.cgi?id=720815 - -M libgnome-desktop/Makefile.am -D libgnome-desktop/locarchive.h - -commit f5561d740c26656da7796fdfd3163ce7ce00da31 -Author: Philip Withnall -Date: Thu Nov 7 12:01:58 2013 +0000 - - thumbnailer: Add documentation on thumbnailers and .thumbnailer files - - https://bugzilla.gnome.org/show_bug.cgi?id=711604 - -M libgnome-desktop/gnome-desktop-thumbnail.c - -commit b0414e293b30b8f9138fb82ece70b16e1188234a -Author: Ryan Lortie -Date: Sun Dec 8 19:18:39 2013 -0500 - - Update libgsystem version - -M libgnome-desktop/libgsystem - -commit d500fdde3602a0a2ef4504d6441fd5ac2eaf910d -Author: Rui Matos -Date: Wed Nov 27 15:06:05 2013 +0100 - - idle-monitor: Fix a GHashTable leak - -M libgnome-desktop/gnome-idle-monitor.c - -commit fff5475f4c320025e5bda847951cb478cd57982c -Author: Rui Matos -Date: Tue Nov 26 00:55:23 2013 +0100 - - idle-monitor: Check if a monitor exists before creating a proxy for it - - The fact that we know about a given device doesn't mean that mutter - also knows about it nor that it has created an idle monitor object on - the bus for it. - - To fix this race, instead of immediately trying to create a proxy for - the bus object, we instantiate an object manager and ask it whether - the object we want already exists and if it doesn't we wait - (indefinitely) until it shows up. - - https://bugzilla.gnome.org/show_bug.cgi?id=706229 - -M libgnome-desktop/gnome-idle-monitor.c - -commit a595e5af183ee28bd735a0a10ed1a9fd88e73213 -Author: Matthias Clasen -Date: Fri Nov 22 06:04:26 2013 -0500 - - 3.11.2 - -M NEWS -M configure.ac - -commit 01db4dd21cb288e71ccfa5256159578b8e08c2ce -Author: Shantha kumar -Date: Thu Nov 21 17:07:06 2013 +0530 - - Tamil Translations Updated - -M po/ta.po - -commit 5c857844aed9ff8f0b0816e00ace71ba2a9ac48f -Author: Bastien Nocera -Date: Wed Nov 20 12:20:27 2013 +0100 - - gnome-rr: Add dimensions in the debug output - -M libgnome-desktop/gnome-rr-debug.c - -commit 5e6139d8f7d9666c437ebe9a08c80292be7d2ac0 -Author: Sphinx Jiang -Date: Sun Nov 17 19:32:39 2013 +0800 - - Update Chinese simplified translation - -M po/zh_CN.po - -commit bf5920457ce6f39c851df7d9283ef2ea76443846 -Author: Sphinx Jiang -Date: Sun Nov 17 19:29:58 2013 +0800 - - Update Chinese simplified translation - -M po/zh_CN.po - -commit 57d75134317ec4b841244f341d80ebe0d76edd3e -Author: Daniel Korostil -Date: Sat Nov 16 11:01:47 2013 +0200 - - Uploaded Ukranian - -M po/uk.po - -commit 30a1d27a643e2b9f9d23a62f9adc872afcb1c595 -Author: Efstathios Iosifidis -Date: Wed Nov 6 08:20:16 2013 +0200 - - Updated Greek translation - -M po/el.po - -commit 8cf7814de5e52e1a12d675562ff813e3069f999c -Author: Bastien Nocera -Date: Wed Oct 30 11:49:55 2013 +0100 - - 3.11.1 - -M NEWS -M configure.ac - -commit c064fab680c287bfa6885b56da69c0b8de401dc6 -Author: Philip Withnall -Date: Thu Oct 10 14:22:12 2013 +0100 - - thumbnailer: Add missing cases to switch statement - - This shuts up a gcc warning by adding support for thumbnail directories being - unmounted or moved. - - https://bugzilla.gnome.org/show_bug.cgi?id=709819 - -M libgnome-desktop/gnome-desktop-thumbnail.c - -commit b778fb5efc2c580b977f0915722b4c771f8cdfff -Author: Asad Mehmood -Date: Thu Oct 17 16:21:42 2013 +0100 - - GnomeRR: gnome_rr_output_get_min_backlight_step - - Allows gnome-settings-daemon to read the min_backlight_step - so that it can support displays with less than 10 steps - - https://bugzilla.gnome.org/show_bug.cgi?id=710380 - -M libgnome-desktop/gnome-rr.c -M libgnome-desktop/gnome-rr.h - -commit f5848bc499a0506e7479bc5120b55e44763558bb -Author: Rui Matos -Date: Tue Oct 15 19:08:35 2013 +0200 - - 3.10.1 - -M NEWS -M configure.ac - -commit 613f2268968e4275d725dd9fad69b0fd0cfd56f3 -Author: Rui Matos -Date: Fri Oct 11 14:08:06 2013 +0200 - - default-input-sources: Add a default for Bulgaria - - Thanks to Alexander Todorov. - -M libgnome-desktop/default-input-sources.h - -commit 3d6eb06b9e9bc30170f58f1a6dc48bef35ccc72e -Author: Akom Chotiphantawanon -Date: Mon Oct 14 21:46:54 2013 +0700 - - Updated Thai translation. - -M po/th.po - -commit b2d6cc3542b8b2fa787253bb45c22b5a151ac164 -Author: Philip Withnall -Date: Thu Oct 10 14:22:35 2013 +0100 - - thumbnailer: Bail if no pixbuf loader could be created - - This prevents gdk_pixbuf_loader_close() from emitting a critical - error due to being called with a NULL loader. The loader can be NULL - if there was an error in the first read from the input stream. - - https://bugzilla.gnome.org/show_bug.cgi?id=709819 - -M libgnome-desktop/gnome-desktop-thumbnail.c - -commit 40ecc92f964540d4475febd96a7663f68fbdc3b1 -Author: Philip Withnall -Date: Thu Oct 10 14:21:46 2013 +0100 - - thumbnailer: Fix a signed/unsigned comparison - - This shuts up a gcc warning but shouldn’t result in functional changes. - - https://bugzilla.gnome.org/show_bug.cgi?id=709819 - -M libgnome-desktop/gnome-desktop-thumbnail.c - -commit 29c1bc757f34f1d0b32bc12fcc682faba05b8509 -Author: Philip Withnall -Date: Thu Oct 10 14:20:54 2013 +0100 - - thumbnailer: Remove duplicate function declarations - - This shuts up a gcc warning. - - https://bugzilla.gnome.org/show_bug.cgi?id=709819 - -M libgnome-desktop/gnome-desktop-thumbnail.c - -commit 856ffc037552a50859d65470486c1a9467862c2f -Author: Carles Ferrando -Date: Sun Oct 13 23:57:35 2013 +0200 - - [l10n] Updated Catalan (Valencian) translation - -M po/ca@valencia.po - -commit 15aef5ebbee65d7eb8cc2aa1bd6a7ed31cf749d8 -Author: Arash Mousavi -Date: Fri Oct 11 16:28:35 2013 +0330 - - L10N: Updated Persian translations - -M po/fa.po - -commit 6ba6ef3691d30ec0ade61be3578d774b97a5a788 -Author: Stefan Sperling -Date: Wed Oct 2 18:59:11 2013 +0200 - - languages: Remove unused struct "nameent" - - This struct was a left-over from the libc locale archive parsing code - removed in commit 91082e8d0ef7dc3fe372fb5228fd3bb5a26efa81. - -M libgnome-desktop/gnome-languages.c - -commit 682348997ebf8c94699dd19e44da40d5214c3d94 -Author: Stefan Sperling -Date: Wed Oct 2 18:58:17 2013 +0200 - - languages: Style fix in collect_locales_from_localebin() - - Use spare-before-paren syntax for function calls. - -M libgnome-desktop/gnome-languages.c - -commit dfc4ecac06eed41cd655e48ba01a7842409c3ad1 -Author: Bastien Nocera -Date: Wed Oct 2 16:36:32 2013 +0200 - - gnome-bg-slideshow: Fix memory leak of a filename - - https://bugzilla.gnome.org/show_bug.cgi?id=709271 - -M libgnome-desktop/gnome-bg-slide-show.c - -commit af0f0fbb835e5bb22b7bce4581d3f081462b5f5b -Author: Bastien Nocera -Date: Wed Oct 2 16:35:44 2013 +0200 - - gnome-bg: Fix memory leaks when using get_as_slideshow() - - get_as_slideshow() returns a reference to the slideshow, - which we need to get rid of when we're not using it anymore. - - https://bugzilla.gnome.org/show_bug.cgi?id=709271 - -M libgnome-desktop/gnome-bg.c - -commit 91082e8d0ef7dc3fe372fb5228fd3bb5a26efa81 -Author: Stefan Sperling -Date: Wed Aug 28 18:25:34 2013 +0200 - - Obtain supported locales from "locale -a" output. - - Instead of parsing the locale archive file which is private to glibc - (see https://bugzilla.redhat.com/show_bug.cgi?id=956993), run the - "locale -a" command to obtain the list of supported locales. - - "locale -a" is specified in POSIX and should thus exist on most UNIX-like - systems (e.g. on OpenBSD, which triggered the related bugzilla entry - because GNOME was unable to find a list of supported locales). - - Keep scanning the /usr/share/locale directory as a fallback. - - Remove code wrapped in #ifdef WITH_INCOMPLETE_LOCALES. This code was - inherited from gdm but is now unused. - - https://bugzilla.gnome.org/show_bug.cgi?id=698383 - -M libgnome-desktop/gnome-languages.c - -commit af5574a745a50d7cb7c5d300836fc073f5326c82 -Author: Muhammet Kara -Date: Sun Sep 29 20:22:00 2013 +0300 - - [l10n]Updated Turkish translation - -M po/tr.po - -commit 9936b0b01fbc687cbe3bfcc4c5abae679fea386a -Author: Gökhan Gurbetoğlu -Date: Sun Sep 29 20:15:17 2013 +0300 - - [l10n]Updated Turkish translation - -M po/tr.po - -commit 0df46b7d6171c81dfed61e6a173c4b43ef1f676a -Author: Alexander Larsson -Date: Fri Sep 27 09:49:01 2013 +0200 - - thumbnail loader: Support loading thumbnails from remote locations - - This broke with the previous addition of gs_file_read_noatime(). - - https://bugzilla.gnome.org/show_bug.cgi?id=708824 - -M libgnome-desktop/gnome-desktop-thumbnail.c - -commit 5e3ac2bc0c789f3b7c02fc98787d242c1b601fdd -Author: Ray Strode -Date: Thu Sep 26 17:04:54 2013 -0400 - - gnome-bg: set error when parsing XML file that's not a slide show - - While trying to reproduce a background handling bug in the shell I - decided to run: - - while true; do - for f in ~/Pictures/*; do - gsettings set org.gnome.desktop.background picture-uri "file:///$f" - sleep .4; - done; - done - - I noticed spew coming from gnome-shell: - - G_CRITICAL: g_task_return_error: assertion 'error != NULL' failed - - Turns out I had a non-slideshow XML file in there, and it was failing - because there were 0 slides, but not setting an error. - - This commit fixes that. - - https://bugzilla.gnome.org/show_bug.cgi?id=708877 - -M libgnome-desktop/gnome-bg-slide-show.c - -commit d0750ccc6b3ca9c43b456d201b5602a05a0fab5f -Author: Matthias Clasen -Date: Mon Sep 23 17:41:34 2013 -0400 - - 3.10.0 - -M NEWS -M configure.ac - -commit 6ef0e2e01346934f290494c06d2d2d434a8dd916 -Author: Mattias Põldaru -Date: Mon Sep 23 10:00:06 2013 +0300 - - [l10n] Updated Estonian translation - -M po/et.po - -commit c459ee4b4bd993f3bfcbde8d7b7ade7056b10edb -Author: Yosef Or Boczko -Date: Sun Sep 22 12:51:18 2013 +0300 - - Updated Hebrew translation - -M po/he.po - -commit 94c394b224aa188a32b3605124c2aeeb55c7d035 -Author: Khaled Hosny -Date: Sun Sep 22 10:09:28 2013 +0200 - - Update Arabic translation - -M po/ar.po - -commit 5fe0a84316572938720721324e7181bb847a90f2 -Author: Duarte Loreto -Date: Sun Sep 22 01:38:53 2013 +0100 - - Updated Portuguese translation - -M po/pt.po - -commit 1d6ee0aa99006584643ccab5234365a856ef3f84 -Author: Reinout van Schouwen -Date: Sun Sep 22 00:44:18 2013 +0200 - - Updated Dutch translation - -M po/nl.po - -commit ac0f5c6d423b5805105b7bd081ede2dfebdff4e5 -Author: Jiro Matsuzawa -Date: Sun Sep 22 06:06:13 2013 +0900 - - l10n: Update Japanese translation - -M po/ja.po - -commit 1e4f0b5ee41fcdee271d827645c99b61a890f1d9 -Author: Colin Walters -Date: Fri Sep 20 15:06:15 2013 -0400 - - build: Update for libgsystem changes - - I changed how the Makefile-libgsystem.am file works; includers now - have to specify whether libgsystem.la is noinst_ or not. - -M libgnome-desktop/Makefile.am - -commit ccc7ddaf4a0de1e1fbec69ca6ce37566445c94bf -Author: Bastien Nocera -Date: Fri Sep 20 12:38:33 2013 +0200 - - libgsystem: Update from master - - d045e367cc37c774e3d76839b65aaf947b2f65ad is expecting - gs_file_read_noatime to always return an error, but the - commit that did that was never pulled in to gnome-desktop. - - Do that now to fix possible crashers with nautilus. - - https://bugzilla.gnome.org/show_bug.cgi?id=708435 - -M libgnome-desktop/libgsystem - -commit 90c74408b54f90a149c0fa2e936b6eee4ba63a50 -Author: Rafael Ferreira -Date: Fri Sep 20 03:20:51 2013 -0300 - - Enabled Brazilian Portuguese translation for GPL doc - -M desktop-docs/gpl/Makefile.am - -commit b3a095b50548456f94407f9035eea925e74dd1cc -Author: Rafael Ferreira -Date: Fri Sep 20 03:20:19 2013 -0300 - - Updated Brazilian Portuguese translation for GPL doc - -A desktop-docs/gpl/pt_BR/pt_BR.po - -commit b96b8af9ea86765d8a75102a372e30a0656e7ca2 -Author: Giovanni Campagna -Date: Wed Sep 18 14:22:51 2013 +0200 - - GnomeRR: refresh the cached view of the screens when mutter restarts - - Mutter does a modeset when it starts, but doesn't emit signals, - so we must refresh our structures when we detect that. But most - important, we must ensure that our serial is properly updated, - otherwise any further operation will fail with AccessDenied. - - https://bugzilla.gnome.org/show_bug.cgi?id=708284 - -M libgnome-desktop/gnome-rr.c - -commit 64288dd127fe2445277d2d1af83522c123109afd -Author: Rui Matos -Date: Wed Sep 18 10:46:06 2013 +0200 - - 3.9.92 - -M NEWS -M configure.ac - -commit 4c91dd3f3e6477c87f2de40be4d66c23f2008513 -Author: Ask H. Larsen -Date: Tue Sep 17 18:40:38 2013 +0200 - - Updated Danish translation - -M po/da.po - -commit 9ea64f29e2bbfbcfa99117fe383f74820d08e1de -Author: Benjamin Steinwender -Date: Mon Sep 16 18:46:08 2013 +0200 - - Updated German translation - -M po/de.po - -commit 4ba02f637b1922bec54046e262f712157eec4a57 -Author: Dušan Kazik -Date: Sun Sep 15 00:41:42 2013 +0200 - - Updated slovak translation - -M po/sk.po - -commit 173c23f5b70c430fa61f5db8d901d965634f8cc5 -Author: Inaki Larranaga Murgoitio -Date: Sat Sep 14 12:19:11 2013 +0200 - - Updated Basque language - -M po/eu.po - -commit ced9dff9bb0a272ada715d75a3023d6a85130a39 -Author: Gil Forcada -Date: Sat Sep 14 01:34:11 2013 +0200 - - Oops - -D ca.po -M po/ca.po - -commit c8b6026e77d46f268d311c0163b5730a1851bc72 -Author: Gil Forcada -Date: Sat Sep 14 01:19:27 2013 +0200 - - [l10n] Update Catalan translation - -A ca.po - -commit a8ccea95ceedac09e74c0a83e1b47ec26c2b5e94 -Author: Nilamdyuti Goswami -Date: Thu Sep 12 18:17:42 2013 +0530 - - Assamese Translation Updated - -M po/as.po - -commit 5d7c6dc599355e33e81f3bf4fc08523d67a7fbbf -Author: Richard Hughes -Date: Thu Sep 12 09:14:22 2013 +0100 - - Correct the transposed bits of the red chromacity in the EDID parser - - This was noticed by Florian Höch, and isn't a huge problem as the value was only - different by 1dE as it's the lowest 2 bits of a 10-bit word that is affected. - -M libgnome-desktop/edid-parse.c - -commit 052f68ecdaaecceba39a7528b596dd44a9362069 -Author: Andika Triwidada -Date: Thu Sep 12 11:07:52 2013 +0700 - - Updated Indonesian translation - -M po/id.po - -commit d11d6e800e076f25c036b0855d56124dea83737f -Author: Rūdolfs Mazurs -Date: Wed Sep 11 22:11:18 2013 +0300 - - Updated Latvian translation - -M po/lv.po - -commit ac5693d8e8909c4d2ce791e47c03c011e82e91d6 -Author: Rafael Ferreira -Date: Tue Sep 10 18:59:34 2013 -0300 - - Updated Brazilian Portuguese translation - -M desktop-docs/fdl/pt_BR/pt_BR.po - -commit acd6ca78e0e542a7bd281b9db5487311ed5fa492 -Author: Ihar Hrachyshka -Date: Tue Sep 10 21:16:11 2013 +0300 - - Updated Belarusian translation. - -M po/be.po - -commit 491a74e4ab364ccaea4b22a760fb254371c33bdd -Author: A S Alam -Date: Mon Sep 9 14:28:41 2013 -0500 - - Punjabi Translation updated by Aman - -M po/pa.po - -commit d2db489a7dfc1bcb636d491a7a4622f0795606eb -Author: Changwoo Ryu -Date: Mon Sep 9 05:13:49 2013 +0900 - - Updated Korean translation - -M po/ko.po - -commit a9797d084094daa21f33b0fb326ee194f8919bcb -Author: Changwoo Ryu -Date: Mon Sep 9 05:11:29 2013 +0900 - - Updated Korean translation - -M po/ko.po - -commit c291fa3d9fd6943d7fbf1feaa87d9c744c84f348 -Author: Ville-Pekka Vainio -Date: Sat Sep 7 20:25:05 2013 +0300 - - Finnish translation update by Jiri Grönroos - -M po/fi.po - -commit 7e4a85c66d76b362992cc2d54b7ef2d18a665942 -Author: Luca Ferretti -Date: Fri Sep 6 22:34:25 2013 +0200 - - Updated Italian translation - -M po/it.po - -commit a4cf864edec6c49110b23eb2442c23f0b9c0870f -Author: Chao-Hsiung Liao -Date: Fri Sep 6 16:21:54 2013 +0800 - - Updated Traditional Chinese translation(Hong Kong and Taiwan) - -M po/zh_HK.po -M po/zh_TW.po - -commit 1e28ad96efcab7df6e9e34bc6d645eb72ca6202e -Author: Bastien Nocera -Date: Sat Aug 24 05:37:53 2013 +0200 - - thumbnailer: Check gdk_pixbuf_loader_close()'s retval - - https://bugzilla.gnome.org/show_bug.cgi?id=699252 - -M libgnome-desktop/gnome-desktop-thumbnail.c - -commit fef06300534883ed27321bb4cda19309ef028fe7 -Author: Bastien Nocera -Date: Sat Aug 24 05:37:28 2013 +0200 - - thumbnailer: Correctly check for errors - - By checking the retval, not whether error was set. - - https://bugzilla.gnome.org/show_bug.cgi?id=699252 - -M libgnome-desktop/gnome-desktop-thumbnail.c - -commit d045e367cc37c774e3d76839b65aaf947b2f65ad -Author: Bastien Nocera -Date: Sat Aug 24 05:36:45 2013 +0200 - - thumbnailer: Always print errors from gs_file_read_noatime() - - https://bugzilla.gnome.org/show_bug.cgi?id=699252 - -M libgnome-desktop/gnome-desktop-thumbnail.c - -commit 336e63c851cd34356a0de137fcadbd2f2a9eb25e -Author: Stas Solovey -Date: Thu Sep 5 09:50:23 2013 +0400 - - Updated Russian translation - -M po/ru.po - -commit 91727625fc92c5f44208c3d540ca6e12157a68d6 -Author: Giovanni Campagna -Date: Tue Sep 3 18:39:04 2013 +0200 - - IdleMonitor: protect watches from being freed while in flight - - If you added an idle watch and then immediately removed it, it - was possible that the watch was freed before the dbus call was - handled by mutter, thus causing a crash later one. - Prevent that by reference counting the watch structures. - - https://bugzilla.gnome.org/show_bug.cgi?id=707396 - -M libgnome-desktop/gnome-idle-monitor.c - -commit ec90f8cbcc771e547609ec59539b400cf5132d47 -Author: Мирослав Николић -Date: Wed Sep 4 05:57:32 2013 +0200 - - Updated Serbian translation - -M po/sr.po -M po/sr@latin.po - -commit e4e310cd1447bc06dfd37858f9e3deeb9cb4a686 -Author: Matthias Clasen -Date: Tue Sep 3 10:01:38 2013 -0400 - - 3.9.91 - -M NEWS -M configure.ac - -commit 04e94159d4987c84a0730198c7b97b8bbf454dca -Author: Fran Diéguez -Date: Mon Sep 2 23:03:56 2013 +0200 - - Added Galician translations for GPL license - -M desktop-docs/gpl/Makefile.am -A desktop-docs/gpl/gl/gl.po - -commit e9a98e6424b1d8e31d85ce872b0acb6b553f5c86 -Author: Baurzhan Muftakhidinov -Date: Sat Aug 31 17:21:48 2013 +0600 - - Update Kazakh translation - -M po/kk.po - -commit b61cdd7e55f2d3e3720898264b03b9e96e3f87e2 -Author: Aurimas Černius -Date: Tue Aug 27 23:59:33 2013 +0300 - - Updated Lithuanian translation - -M po/lt.po - -commit 97f24ab849e7773053574d29592eb52cce892d33 -Author: Richard Hughes -Date: Tue Aug 27 11:45:57 2013 +0100 - - GnomeRR: Do not assume outputs with the id of 'default' are built-in - - We are using this in all kinds of places to work out if a display is embedded - (like a laptop display) and cannot be removed. Some of the binary drivers do - not set a sensible ID, but it's not more sane to assume these default values are - either for internal or external panels. Assuming the former breaks VMVGA in - virtual machines. We should not return TRUE when there is no heuristic to use. - - Resolves: https://bugzilla.gnome.org/show_bug.cgi?id=706738 - -M libgnome-desktop/gnome-rr.c - -commit b1503715e81b44ff4089ca2581fd95dfd8ac3631 -Author: Giovanni Campagna -Date: Mon Aug 26 17:29:26 2013 +0200 - - GnomeRR: read the backlight value after asking mutter to change it - - Mutter now returns the new backlight value after a successfull call - to ChangeBacklight, so we need to read it. - - https://bugzilla.gnome.org/show_bug.cgi?id=706729 - -M libgnome-desktop/gnome-rr.c -M libgnome-desktop/xrandr.xml - -commit fbe2bb895c37340ac5e3fd346861e12533c46b87 -Author: Victor Ibragimov -Date: Mon Aug 26 11:46:32 2013 +0500 - - Tajik translation updated - -M po/tg.po - -commit 55a68eba857dd9cc3c2db7d1dd3d36bfc8f9c995 -Author: Rico Tzschichholz -Date: Sun Aug 25 21:39:47 2013 +0200 - - build: Bump soname for GnomeRR* ABI breaks - -M configure.ac - -commit 89366096d409e2e1c4a9622eca3b1c0719e974fa -Author: Rico Tzschichholz -Date: Sun Aug 25 11:17:14 2013 +0200 - - build: Add idle-monitor.xml to EXTRA_DIST - -M libgnome-desktop/Makefile.am - -commit 3185fd4acc8d20b83b35e76b0cab492f9291e6bb -Author: Balázs Úr -Date: Sun Aug 25 09:57:35 2013 +0200 - - Updated Hungarian translation - -M po/hu.po - -commit 545c774e967fa2f21f9b8ee1acbb50bffcee01d0 -Author: Giovanni Campagna -Date: Wed Aug 14 16:21:43 2013 +0200 - - GnomeIdleMonitor: use the new Mutter API instead of raw X calls - - This way we can track the user activity on wayland too. - - https://bugzilla.gnome.org/show_bug.cgi?id=706006 - -M libgnome-desktop/Makefile.am -M libgnome-desktop/gnome-idle-monitor.c -M libgnome-desktop/gnome-idle-monitor.h -A libgnome-desktop/idle-monitor.xml - -commit d15f925ef6b6ac704b820aa41d5efaeeaee4220c -Author: Enrico Nicoletto -Date: Thu Aug 22 23:38:07 2013 -0300 - - Updated Brazilian Portuguese translation - -M po/pt_BR.po - -commit 961fab9130b7a5eaf1a19b077afc0381d9a00bc2 -Author: Kjartan Maraas -Date: Thu Aug 22 15:55:48 2013 +0200 - - Updated Norwegian bokmål translation - -M po/nb.po - -commit 7caa9d3c1194e261df36b4476eedc75ed716b9e5 -Author: Alexandre Franke -Date: Thu Aug 22 12:13:59 2013 +0200 - - Update French translation - -M po/fr.po - -commit 4726bee39af5f2b82664a3ae00470e5e94b76004 -Author: Fran Diéguez -Date: Wed Aug 21 00:54:10 2013 +0200 - - Updated Galician translations - -M po/gl.po - -commit 5ec97ee71622f093d469baec6b64d116d22bad58 -Author: Piotr Drąg -Date: Tue Aug 20 22:41:01 2013 +0200 - - Updated Polish translation - -M po/pl.po - -commit e786d70bef39bd1aa1e25a0fba98623cd8e6422c -Author: Piotr Drąg -Date: Tue Aug 20 22:05:46 2013 +0200 - - Updated Polish translation - -M po/pl.po - -commit cabeca0501526ddcd8cef989f274c6a0a9135b64 -Author: Piotr Drąg -Date: Tue Aug 20 20:56:12 2013 +0200 - - Updated Polish translation - -M po/pl.po - -commit 63e7221ae1a839473ebcc28ed7b1b50c2b83c175 -Author: Daniel Mustieles -Date: Tue Aug 20 17:44:59 2013 +0200 - - Updated Spanish translation - -M po/es.po - -commit 464f10b3f3dff57d691a7bbf532f884bd1eaa2fb -Author: Matthias Clasen -Date: Tue Aug 20 09:49:30 2013 -0400 - - 3.9.90 - -M NEWS -M configure.ac - -commit 7d6deaab0af591d66755896098ef619a2eb9475f -Author: Matthias Clasen -Date: Tue Aug 20 09:56:03 2013 -0400 - - dist xrandr.xml - -M libgnome-desktop/Makefile.am - -commit ab2e60a60da70ab70941615835806d1c0fcca3b5 -Author: Giovanni Campagna -Date: Tue Aug 20 13:28:30 2013 +0200 - - GnomeRR: use a DBus signal instead of XRandR events to refresh - - Using a DBus signal we avoid the race, and make sure that we - get the updated values in the next call to mutter. - - https://bugzilla.gnome.org/show_bug.cgi?id=706383 - -M libgnome-desktop/gnome-rr.c -M libgnome-desktop/xrandr.xml - -commit f9dbf4ae8a12ce5da1d446b18be181646ac53bb0 -Author: Giovanni Campagna -Date: Tue Aug 20 10:15:26 2013 +0200 - - Revert "GnomeRRConfig: try again when failing application because of access denied" - - This reverts commit dc85c78445c3f543bf1a91cb0e7e69ef7db3a817. - Calling gnome_rr_screen_refresh() cause the emission of signals, - which in turn cause the configuration to be dropped (and then - a segfault) - We need a better solution. - -M libgnome-desktop/gnome-rr-config.c - -commit 8170cedbd6c753c86cfa9eb34089ef78a1b45c80 -Author: Marek Černocký -Date: Tue Aug 20 08:48:40 2013 +0200 - - Updated Czech translation - -M po/cs.po - -commit 375293f1a9adeb2a9c7e5bc065a41949a0911d00 -Author: Giovanni Campagna -Date: Mon Aug 19 17:52:52 2013 +0200 - - GnomeRR: read the physical output size for mutter - - And expose it in the API, so that the control center can use it - to show the diagonal and aspect ratio. - - https://bugzilla.gnome.org/show_bug.cgi?id=705919 - -M libgnome-desktop/gnome-rr.c -M libgnome-desktop/gnome-rr.h - -commit 8969c1127a4a1ee5abac653f3e4111b5abc8a9d3 -Author: Matej Urbančič -Date: Mon Aug 19 23:12:57 2013 +0200 - - Updated Slovenian translation - -M po/sl.po - -commit 0ae1292574700db82a1bb42722c9f9b0632a0582 -Author: Matej Urbančič -Date: Mon Aug 19 23:10:57 2013 +0200 - - Updated Slovenian translation - -M po/sl.po - -commit b233b093b7979438746c1194a58194ab37ba5ace -Author: Piotr Drąg -Date: Mon Aug 19 19:24:13 2013 +0200 - - Updated POTFILES.in - -M po/POTFILES.in - -commit 7f20bbe65be9d6f312ce0dcec64930df6b4b2a4d -Author: Bastien Nocera -Date: Thu Jul 25 11:40:58 2013 +0200 - - test-wall-clock: Print the clock straight away - - Stops us from waiting a minute in the default configuration. - -M libgnome-desktop/test-wall-clock.c - -commit 93ecd4ad2ad5a5890f98f708f1ad06b3af7eff86 -Author: Giovanni Campagna -Date: Mon Aug 19 10:05:52 2013 +0200 - - Fix srcdir != builddir - -M libgnome-desktop/Makefile.am - -commit eb34fd08196bdb75958087bfbf5e73ae8638465c -Author: Giovanni Campagna -Date: Sun Aug 18 01:14:04 2013 +0200 - - GnomeRR: add async construction of GnomeRRScreen - - We aren't going anywhere, if gnome-settings-daemon blocks on - mutter which is blocking on gnome-settings-daemon... - - https://bugzilla.gnome.org/show_bug.cgi?id=705510 - -M libgnome-desktop/gnome-rr-private.h -M libgnome-desktop/gnome-rr.c -M libgnome-desktop/gnome-rr.h - -commit dc85c78445c3f543bf1a91cb0e7e69ef7db3a817 -Author: Giovanni Campagna -Date: Sat Aug 17 17:54:45 2013 +0200 - - GnomeRRConfig: try again when failing application because of access denied - - If we get an error due to stale configuration information, try - again a second time after refreshing the screen. This can happen - when mutter is using the X11 backend, as that causes multiple events, - so a single ApplyConfiguration() can increase the serial multiple - times, and there is a race between when mutter gets the event - (increasing the serial) and when we get it, asking for the new - configuration. - - https://bugzilla.gnome.org/show_bug.cgi?id=705510 - -M libgnome-desktop/gnome-rr-config.c - -commit 65b69264c2b6d54bede4f3747fb5f1440c4a9662 -Author: Giovanni Campagna -Date: Sat Aug 17 12:35:58 2013 +0200 - - GnomeRR: fix gnome-rr-debug test case - - Use GnomeRR facilities to read the EDID instead of direct X access, - because the actual XID is not exposed in the API (although it is - exported on the bus) - - https://bugzilla.gnome.org/show_bug.cgi?id=705510 - -M libgnome-desktop/gnome-rr-debug.c - -commit a31024a1cd6d91a5022eb5922dded57e8a3ce38c -Author: Giovanni Campagna -Date: Thu Aug 8 13:43:04 2013 +0200 - - GnomeRR: restore support for raw EDID access - - The color plugin of gnome-settings-daemon needs it to build - the default ICC profile for uncalibrated displays. - - https://bugzilla.gnome.org/show_bug.cgi?id=705510 - -M libgnome-desktop/gnome-rr.c -M libgnome-desktop/gnome-rr.h - -commit 52662efd4ae83db5fbd5046e6dbc6260b6bf56fb -Author: Giovanni Campagna -Date: Fri Jul 26 14:22:37 2013 +0200 - - GnomeRR: restore support for gamma ramps - - The color panel of control center needs it. - - Note: the color panel and color g-s-d plugins will have different - changes for wayland support, but they still need the code in the - XRandR case. - - https://bugzilla.gnome.org/show_bug.cgi?id=705510 - -M libgnome-desktop/gnome-rr.c -M libgnome-desktop/gnome-rr.h - -commit 632dffb7887c8650154670ae0e76822ae11e22f3 -Author: Giovanni Campagna -Date: Fri Jul 26 13:40:41 2013 +0200 - - API: GnomeRR: replace direct XRandR calls with DBus calls to mutter - - Mutter now provides a DBus API that wraps XRandR and abstracts - away the detail of running X or wayland. - - A number of API changes are needed, as GnomeRR is no longer in - charge of maintaining the monitors.xml file updated. - - https://bugzilla.gnome.org/show_bug.cgi?id=705510 - -M libgnome-desktop/Makefile.am -D libgnome-desktop/display-name.c -M libgnome-desktop/edid.h -M libgnome-desktop/gnome-rr-config.c -M libgnome-desktop/gnome-rr-config.h -M libgnome-desktop/gnome-rr-debug.c -M libgnome-desktop/gnome-rr-output-info.c -M libgnome-desktop/gnome-rr-private.h -M libgnome-desktop/gnome-rr.c -M libgnome-desktop/gnome-rr.h -A libgnome-desktop/meta-xrandr-shared.h -A libgnome-desktop/xrandr.xml - -commit 5e66ef06786a99417e124c07fb07fdf518d76d27 -Author: Rafael Ferreira -Date: Sat Aug 17 07:34:58 2013 -0300 - - Updated Brazilian Portuguese translation proofread by Enrico Nicoletto - -M desktop-docs/lgpl/pt_BR/pt_BR.po - -commit b2195c46aa9c2595d81d2d0c19d5c4051bc9c19f -Author: Rafael Ferreira -Date: Sat Aug 17 07:13:45 2013 -0300 - - Updated Brazilian Portuguese translation proofread by Enrico Nicoletto - -M desktop-docs/fdl/Makefile.am -M desktop-docs/fdl/pt_BR/pt_BR.po - -commit a3233ff45ec9769600605e26c13707010451f19c -Author: Seán de Búrca -Date: Fri Aug 16 02:15:07 2013 -0600 - - Updated Irish translation - -M po/ga.po - -commit dd15190bdd31af5eccbe5dbf81d8439440ab74d1 -Author: Gil Forcada -Date: Tue Aug 13 22:28:30 2013 +0200 - - [l10n] Added partial translation of LGPL to Catalan - -M desktop-docs/lgpl/Makefile.am -A desktop-docs/lgpl/ca/ca.po - -commit 6c35f0a430096afa91b1182dc1d5c3a9c3bde3b7 -Author: Rui Matos -Date: Tue Aug 13 10:53:16 2013 +0200 - - gnome-xkb-info: Prevent a crash with unknown language/country codes - - https://bugzilla.gnome.org/show_bug.cgi?id=705885 - -M libgnome-desktop/gnome-xkb-info.c - -commit acc04b827b3ac3c70fc6e3ac3a96f05602039c73 -Author: Rafael Ferreira -Date: Mon Aug 5 23:40:56 2013 -0300 - - Updated Brazilian Portuguese translation - -M po/pt_BR.po - -commit 4f97400703aa1c2838794cca8de04cc569f4d3ba -Author: Victor Ibragimov -Date: Tue Jul 30 18:27:41 2013 +0100 - - Tajik translation updated - -M po/tg.po - -commit b4db806a0ce050ef70b92a428755f0d3dc7c844e -Author: Matthias Clasen -Date: Tue Jul 30 08:28:18 2013 -0400 - - 3.9.5 - -M NEWS -M configure.ac - -commit 80b400b717bc556fcd42f93b297410d3c4f56631 -Author: Richard Hughes -Date: Tue Jul 30 10:37:50 2013 +0100 - - Ensure EDID is at least 128 bytes and a multiple of 128 bytes - - Resolves: https://bugzilla.redhat.com/show_bug.cgi?id=956772 - -M libgnome-desktop/gnome-rr.c - -commit 47d405b044592063893451802f3649914b6e3ad9 -Author: Victor Ibragimov -Date: Mon Jul 29 16:06:20 2013 +0100 +commit 4040bb89eb4d1ee813fdb24470f5c338a493021f +Author: Rafael Ferreira +Date: Sat Aug 17 07:34:58 2013 -0300 - Tajik translation added + Updated Brazilian Portuguese translation proofread by Enrico Nicoletto -M po/LINGUAS -A po/tg.po +M desktop-docs/lgpl/pt_BR/pt_BR.po -commit bb821e2aba1b2fa1c67757c37c71081ad7885e2f -Author: Bastien Nocera -Date: Thu Jul 18 17:10:51 2013 +0200 +commit 6620b58e34b895def5bc96b8142d68fddcba6568 +Author: Rafael Ferreira +Date: Sat Aug 17 07:13:45 2013 -0300 - gnome-rr: Fix types of signal vfuncs - - ... in the class definition. They were missing the object itself. - - https://bugzilla.gnome.org/show_bug.cgi?id=704477 + Updated Brazilian Portuguese translation proofread by Enrico Nicoletto -M libgnome-desktop/gnome-rr.h +M desktop-docs/fdl/pt_BR/pt_BR.po -commit c262a12739a9c682e773ed1772c2814f2d4bd5a7 -Author: Benjamin Steinwender -Date: Tue Jul 23 17:51:46 2013 +0200 +commit ae43aa7dbd6885940fbc2d9aeb62192940d5a483 +Author: Enrico Nicoletto +Date: Mon Sep 2 14:27:13 2013 -0300 - Updated German translation + Added Brazilian Portuguese translation in DOC_LINGUAS -M po/de.po +M desktop-docs/fdl/Makefile.am -commit 0a7211428091f5668b31fe6b760930ec3ce8efea +commit 6df680a892bcbd739daf903ac1ca3dc17cf330af Author: Christophe Fergeau Date: Fri Jun 28 15:30:44 2013 +0200 @@ -1417,7 +50,29 @@ M libgnome-desktop/gnome-xkb-info.c -commit 4a95c179de8920ee8f78ae5e1f05df173e9d5bd8 +commit 3b11ac82000d52bf859d8b4997fe2a9c3da81a0b +Author: Rui Matos +Date: Tue Aug 13 10:53:16 2013 +0200 + + gnome-xkb-info: Prevent a crash with unknown language/country codes + + https://bugzilla.gnome.org/show_bug.cgi?id=705885 + +M libgnome-desktop/gnome-xkb-info.c + +commit 1b157d067fb168a6c80a70ba9a4aa3fb331d6302 +Author: Bastien Nocera +Date: Thu Jul 18 17:10:51 2013 +0200 + + gnome-rr: Fix types of signal vfuncs + + ... in the class definition. They were missing the object itself. + + https://bugzilla.gnome.org/show_bug.cgi?id=704477 + +M libgnome-desktop/gnome-rr.h + +commit 70b279794245807a613dd341c29bc5de99b02972 Author: Bastien Nocera Date: Tue Jun 25 11:00:58 2013 +0200 @@ -1430,7 +85,7 @@ M libgnome-desktop/gnome-rr.c -commit 4d6d8e096d0ecfb1e4f1345b6002befebe16558e +commit d677e0eb854330b742e136e52335922c17a0f7fa Author: Bastien Nocera Date: Mon Jun 24 10:52:53 2013 +0200 @@ -1443,7 +98,7 @@ M libgnome-desktop/pnp.ids -commit a4dd7815aba059c8798094a277acccfdbc2f7179 +commit 882943473dcc3bd24945cc71c5f2d117524eba0a Author: Giovanni Campagna Date: Sun May 12 18:50:05 2013 +0200 @@ -1456,34 +111,25 @@ M libgnome-desktop/gnome-wall-clock.c -commit d41c9a1ded63b778f261eb2671d5d8f01649a646 -Author: Baurzhan Muftakhidinov -Date: Sat Jun 22 15:04:25 2013 +0600 - - Updated Kazakh translation - -M po/kk.po - -commit e19df898281f83aa6db3d8fe57c720b29d98abee -Author: Sebastien Bacher -Date: Tue Jun 11 18:23:26 2013 +0200 +commit f6b5fe605e5797881993f85e1b84595048a06358 +Author: Rui Matos +Date: Fri Jun 7 22:29:00 2013 +0200 - gnome-bg: objects without a filename are not slideshows - - https://bugzilla.gnome.org/show_bug.cgi?id=702010 + 3.8.3 -M libgnome-desktop/gnome-bg.c +M NEWS +M configure.ac -commit 9694f26c3387e3c425a55e75c92db2d39de0c230 +commit a9edd5436e71f6a5995c411bd1a446fa6848ed3d Author: Cheng-Chia Tseng -Date: Tue Jun 4 21:08:08 2013 +0800 +Date: Tue Jun 4 21:08:48 2013 +0800 Updated Traditional Chinese translation(Hong Kong and Taiwan) M po/zh_HK.po M po/zh_TW.po -commit be73edf004922fe80e88b50df509499bc8a7c010 +commit 30a4e1a12f8c112f0ec71f3f14209a37385329ff Author: Rui Matos Date: Fri May 31 10:03:20 2013 +0200 @@ -1493,7 +139,7 @@ M libgnome-desktop/gnome-xkb-info.c -commit a32275872c279c790cf49263880aa401320580fa +commit d18494ebe5a97affdf34ec73586403b3edf68fa5 Author: Tim Lunn Date: Fri May 31 10:41:14 2013 +1000 @@ -1503,32 +149,7 @@ M libgnome-desktop/gnome-xkb-info.c -commit 0b6ade7e4e1c036cc716f625646cadf1c3ad1882 -Author: Matthias Clasen -Date: Wed May 29 14:34:24 2013 -0400 - - 3.9.1 - -M NEWS -M configure.ac - -commit 1917e020448f932a907e3ec8b6ca574b15612390 -Author: Aurimas Černius -Date: Sun May 26 22:00:56 2013 +0300 - - Updated Lithuanian translation - -M po/lt.po - -commit c2598fa54c80e6887f9f7c53ad5d08a2757e64ee -Author: Yaron Shahrabani -Date: Fri May 24 12:23:25 2013 +0300 - - Updated Hebrew translation. - -M po/he.po - -commit a78ba21248c4c7d18e8c35ef5cff351d53a4b3ab +commit 50e3a5a147e865ce7080be70ae26cf739293fb53 Author: Colin Walters Date: Thu May 23 17:46:08 2013 +0200 @@ -1538,23 +159,16 @@ M libgnome-desktop/gnome-desktop-thumbnail.c -commit 81b81d6dcdae97888b764a9fc00b2b449aff7b26 -Author: Kjartan Maraas -Date: Mon May 20 14:45:35 2013 +0200 - - Updated Norwegian bokmål translation - -M po/nb.po - -commit 6fab13b93ddcdf42548866ebb1a87afd633b4bf1 -Author: Yuri Myasoedov -Date: Sat May 18 18:20:47 2013 +0400 +commit 49e5133e6bdf14720421aa473eb8986a2fd2a237 +Author: Matthias Clasen +Date: Mon May 13 20:54:12 2013 -0400 - Updated Russian translation + 3.8.2 -M po/ru.po +M NEWS +M configure.ac -commit b85c5878f13eeb6b6777e2c6e6674b7c65db4e42 +commit e0ca686e671cb018acdca73c5de37fcca47b1e8a Author: Pavel Vasin Date: Mon Mar 4 15:48:08 2013 +0400 @@ -1564,7 +178,7 @@ M libgnome-desktop/gnome-bg-slide-show.c -commit fdb43e2fa9113f558264ce0b804cf488f1b3b9f2 +commit 6fce02a69382f1b2684704f2e457dd877d10721b Author: Rui Matos Date: Fri May 10 16:55:15 2013 +0200 @@ -1575,63 +189,7 @@ M libgnome-desktop/default-input-sources.h -commit 7ebd62fc25dadbf9a857f008b1c078e535766eda -Author: Matej Urbančič -Date: Wed May 1 20:33:21 2013 +0200 - - Updated Slovenian translation - -M po/sl.po - -commit c84016361c5b7d0e0dd8e202b3142465df5933db -Author: Gil Forcada -Date: Tue Apr 30 18:42:57 2013 +0200 - - [l10n] Update Catalan translation - -M desktop-docs/gpl/ca/ca.po - -commit 76c45895049375b2c6e660a6a9bff90e82137f22 -Author: Gil Forcada -Date: Tue Apr 30 18:37:17 2013 +0200 - - [l10n] Update Catalan translation - -M desktop-docs/fdl/ca/ca.po - -commit 16095e6d3552fe4ffc4c8a289311820495e39dcd -Author: Marek Černocký -Date: Sat Apr 27 02:02:15 2013 +0200 - - Updated Czech translation - -M po/cs.po - -commit 68e45429625a3c38b21150b6b9d2ba24787eb00f -Author: Dimitris Spingos -Date: Wed Apr 24 17:56:25 2013 +0300 - - Updated Greek translation - -M po/el.po - -commit 210a9e17d1b83eb2c1e3ed99646c63d875b25069 -Author: Daniel Mustieles -Date: Mon Apr 22 17:49:47 2013 +0200 - - Updated Spanish translation - -M po/es.po - -commit a3f5352ec194723faff7583a1932cd494bcf41a5 -Author: Fran Diéguez -Date: Sun Apr 21 23:31:24 2013 +0200 - - Updated Galician translations - -M po/gl.po - -commit 216a9a531332f9507e4ac1608955f4370e644745 +commit 209ba8a0168b13ea3fb13fd43551c7fb150870c5 Author: Wouter Bolsterlee Date: Fri Apr 19 22:37:06 2013 +0200 @@ -1639,15 +197,7 @@ M po/nl.po -commit 8fe716c6314ff6122dc2bc0463e7def4a35f449b -Author: Bastien Nocera -Date: Mon Apr 15 18:20:08 2013 +0200 - - GnomeBg: Remove unused variable - -M libgnome-desktop/gnome-bg.c - -commit 0d5284c6a894401611b5d9183942b391af04ee52 +commit 1ba73b301b8f7d66d08cec63cdd35d234fba1952 Author: Bruce Cowan Date: Sat Apr 6 17:29:20 2013 +0100 @@ -1655,7 +205,7 @@ M po/en_GB.po -commit 2e49001fdf251b1535cbc0ed33122ce2256e4a60 +commit 9112bccf9eb8c5f90c7fefde04157e9d9e3e42e0 Author: tuhaihe Date: Sat Apr 6 17:29:49 2013 +0800 @@ -1663,32 +213,16 @@ M po/zh_CN.po -commit cbbf02067ba9383c8d0e4e5d1a280c50c7c3f885 -Author: Matthias Clasen -Date: Sun Mar 31 19:48:04 2013 -0400 - - Bring ratio back for time formatting - - It is not causing problems in LTR languages, and it looks better. - This commit introduces en.po whose only difference to C is that - colons are replaced by ratios in date and time formats. - -M po/LINGUAS -A po/en.po - -commit 90c5ab625abe9a11ca55b14d0a095c4bf127d5a4 +commit 1957fe834838e88db6e36e75af3fcfa2ba4f7c5a Author: Giovanni Campagna -Date: Wed Mar 27 18:22:59 2013 +0100 +Date: Wed Mar 27 18:54:01 2013 +0100 - Revert "Add a keyboard drawing widget" - - This reverts commit c8d041318670e74f110a8c326e91352136b56770. + 3.8.0.1 -M libgnome-desktop/Makefile.am -D libgnome-desktop/gnome-keyboard-drawing.c -D libgnome-desktop/gnome-keyboard-drawing.h +M NEWS +M configure.ac -commit 79152ba3209d46413e2d1e54272c4bfc86086e0d +commit d96f350a378a13cd230daf54524d89765b1a1135 Author: Giovanni Campagna Date: Wed Mar 27 17:45:38 2013 +0100 @@ -1702,23 +236,16 @@ M libgnome-desktop/gnome-idle-monitor.c -commit c8d041318670e74f110a8c326e91352136b56770 -Author: Giovanni Campagna -Date: Mon Feb 25 00:50:13 2013 +0100 +commit 3419ebc79db8f2522c0c9bc9637f804c86d5e0e3 +Author: Matthias Clasen +Date: Tue Mar 26 16:27:50 2013 -0400 - Add a keyboard drawing widget - - Copied from libgnomekdb, which is now dead, and adapted for - gnome-desktop (mainly to remove the dependency on libxklavier - and to use the correct namespace) - - https://bugzilla.gnome.org/show_bug.cgi?id=694633 + 3.8.0 -M libgnome-desktop/Makefile.am -A libgnome-desktop/gnome-keyboard-drawing.c -A libgnome-desktop/gnome-keyboard-drawing.h +M NEWS +M configure.ac -commit a87ead14dfefcb0769dcf636eb2106c51b69d08c +commit 409cf54b3777351961da9c76925ae7efdba3ece8 Author: Colin Walters Date: Mon Mar 25 19:57:46 2013 -0400 @@ -1730,15 +257,7 @@ M libgnome-desktop/gnome-idle-monitor.c -commit 6281e31d054b8f41ff62c0597f50452d8e29618f -Author: Balázs Úr -Date: Tue Mar 26 00:22:26 2013 +0100 - - Updated Hungarian translation - -M po/hu.po - -commit 6654c59dc0fc9efd6a16a4d6bbcd8499506c42f9 +commit 1a439b1d7a8f03bd4ef0a5e7f9782d8442d07d92 Author: Jasper St. Pierre Date: Sun Mar 24 19:56:09 2013 -0400 @@ -1750,7 +269,7 @@ M libgnome-desktop/gnome-idle-monitor.c -commit 0c60eec051e01a2ed639e592a76dd023645ac6e4 +commit cbd90a05915aa09469479ede23a9830444f15379 Author: Jasper St. Pierre Date: Mon Mar 25 13:50:10 2013 -0400 @@ -1760,7 +279,7 @@ M libgnome-desktop/gnome-idle-monitor.c -commit 7baf58512cf488d8544e4ddab478b92c324949e2 +commit d9d0f859a28f3a377c01d40c37717c49daadf02e Author: Jasper St. Pierre Date: Sun Mar 24 19:51:09 2013 -0400 @@ -1778,7 +297,7 @@ M libgnome-desktop/gnome-idle-monitor.c -commit 634ef5e69f79f1d9bf57497e15b6c430b0a0583e +commit e58cd12a26838487cad0b20a3a95806572bd7909 Author: Jasper St. Pierre Date: Sun Mar 24 19:48:44 2013 -0400 @@ -1792,7 +311,7 @@ M libgnome-desktop/gnome-idle-monitor.c -commit fffcc2bd58f54e8e4725d9dc3a90869aa2d731cf +commit c9911a32f64e1939910f5e9e6e9c124b9e5301ae Author: Jasper St. Pierre Date: Mon Mar 25 15:55:40 2013 -0400 @@ -1802,7 +321,7 @@ M libgnome-desktop/gnome-idle-monitor.c -commit 29f08dd327d65f40e7535addf144a74d23215762 +commit 82cdd38f6de2bd17f1f21c6996ca95518e991d6c Author: Jasper St. Pierre Date: Sun Mar 24 19:52:05 2013 -0400 @@ -1812,7 +331,7 @@ M libgnome-desktop/gnome-idle-monitor.c -commit 09398901b3d3ac6edcdd7fd76a2ee7dccb0c7b6d +commit 34a0e5b431e556e1f02dd880ecedb0309531a2ca Author: Jasper St. Pierre Date: Mon Mar 25 13:47:17 2013 -0400 @@ -1825,66 +344,52 @@ M libgnome-desktop/gnome-idle-monitor.c -commit a14c4fd24c30b5eb38fa3f93bb0938dc187941e9 -Author: Bastien Nocera -Date: Mon Mar 25 11:30:04 2013 +0100 - - Revert "Use nice Unicode for date formatting" - - This reverts commit b9b5c04ccf348b93399522cf450bbfe6a5819578. - - See https://bugzilla.gnome.org/show_bug.cgi?id=621639 and - https://mail.gnome.org/archives/desktop-devel-list/2012-December/msg00022.html - -M libgnome-desktop/gnome-wall-clock.c - -commit edf75f60ca7a3fb23b5286f89832ef43b2ae6bcf -Author: Bastien Nocera -Date: Mon Mar 25 11:26:58 2013 +0100 +commit a84792c02db3fbae4e5c2bc903a4cdee93bc79d4 +Author: Inaki Larranaga Murgoitio +Date: Tue Mar 26 10:01:39 2013 +0100 - Revert "wall-clock: Do not use colon in time format" - - This reverts commit ecd92a8c91874363f26f8364d14241344ec7cf45. - - See https://bugzilla.gnome.org/show_bug.cgi?id=696497#c5 for - the reasoning. + Updated Basque language -M libgnome-desktop/gnome-wall-clock.c +M po/eu.po -commit ecd92a8c91874363f26f8364d14241344ec7cf45 -Author: Jiro Matsuzawa -Date: Mon Mar 25 01:46:13 2013 +0900 +commit 532230ac071d6f7610e1a4728aaf9b38d2aba29c +Author: Dirgita +Date: Tue Mar 26 15:50:06 2013 +0700 - wall-clock: Do not use colon in time format - - %R is the same as %H:%M. The separator is U+003A COLON. I replace it - with RATIO (U+2236). - - https://bugzilla.gnome.org/show_bug.cgi?id=696497 + Updated Indonesian translation -M libgnome-desktop/gnome-wall-clock.c +M po/id.po -commit 5ca4cfcec81f711252def5860e945ef2af7d4b64 +commit 72a2bccb41f276fc864e2705405ac9230b3cdda1 Author: Bastien Nocera -Date: Sat Mar 23 09:50:10 2013 +0100 +Date: Mon Mar 25 08:53:09 2013 +0100 idle-monitor: Make per-device monitor fallible + https://mail.gnome.org/archives/release-team/2013-March/msg00289.html + https://bugzilla.gnome.org/show_bug.cgi?id=696118 M libgnome-desktop/gnome-idle-monitor.c -M libgnome-desktop/gnome-idle-monitor.h M libgnome-desktop/test-idle-monitor.c -commit 96f4f0cacbacde139f8aec5553466a4b7934c232 -Author: Bastien Nocera -Date: Thu Mar 21 18:37:40 2013 +0100 +commit 170514f47f519a3f8384696e26de0bef914ce286 +Author: Ani Peter +Date: Mon Mar 25 16:35:15 2013 +0530 - Add myself as a maintainer + Completed for Malayalam -M gnome-desktop.doap +M po/ml.po -commit 6f7626c90ef14b29be35d9c20b6c3f1919e5f395 +commit 09498a83657e5c3c7c39ed3fe22b7e59a44ec648 +Author: Krishnababu Krothapalli +Date: Mon Mar 25 15:40:31 2013 +0530 + + Updated Telugu Translations + +M po/te.po + +commit 781a7affd86d847076a5a6fc92e37ac241eac074 Author: Jiro Matsuzawa Date: Mon Mar 25 12:23:01 2013 +0900 @@ -1892,7 +397,7 @@ M po/ja.po -commit 39942999e6986f9710c73382b3fc41db5cea3fd0 +commit a203a51ed88b6ad89ba7d5820ad6609b37621427 Author: Reşat SABIQ Date: Sun Mar 24 19:46:52 2013 -0500 @@ -1900,7 +405,7 @@ M po/crh.po -commit 9bcedb3e7120c1e33d49b2e34a5056c8e54f5b14 +commit 7d27f9d149f077481fdd2eb741af749e3c477632 Author: Petr Kovar Date: Sun Mar 24 18:41:14 2013 +0100 @@ -1908,7 +413,7 @@ M po/cs.po -commit b2207cb08ecda5ac52b1e6343ecae5be956c19d1 +commit e3c5546b1b7907b11ed4088244a2ab6f92f85488 Author: Yuri Myasoedov Date: Sat Mar 23 09:40:06 2013 +0400 @@ -1916,55 +421,80 @@ M po/ru.po -commit 8ef184098985a1c395d29fe82514a7a24a3e7818 +commit e4605ff9fbf1198ab1f996ba61803fb90e76c4ad Author: Arash Mousavi -Date: Fri Mar 22 17:56:14 2013 +0430 +Date: Fri Mar 22 17:56:35 2013 +0430 L10N: Updated Persian Translation M po/fa.po -commit cd81e59aa121a25a2f96a10a42545f86eff9dfb1 +commit 7a36beb1458ed9f74c1946e9c704d8ecefeacaa1 Author: ManojKumar Giri -Date: Fri Mar 22 18:35:52 2013 +0530 +Date: Fri Mar 22 18:36:59 2013 +0530 Updated Odia Language along with FUEL implementation M po/or.po -commit 26c1b346644964de8134d9dbbe8cba9efa81bef5 +commit 9d6eb117491b5be1cbae3782d74955f2eff59b8e +Author: Shantha kumar +Date: Fri Mar 22 15:36:13 2013 +0530 + + Tamil Translations Updated + +M po/ta.po + +commit 83038c81ee766d9770ca800afb7a13dad66f1b69 Author: Shantha kumar -Date: Fri Mar 22 15:24:45 2013 +0530 +Date: Fri Mar 22 15:29:09 2013 +0530 Tamil Translations Updated M po/ta.po -commit e16ffe7cc2b33c650fc6f32a70df0f63555237af +commit bf7b11c9536106fcb64f9fc0a65342b7b9e3ca02 Author: Sandeep Sheshrao Shedmake -Date: Fri Mar 22 13:27:47 2013 +0530 +Date: Fri Mar 22 13:29:37 2013 +0530 Updated Marathi Translations M po/mr.po -commit cdb05fc0e5f6073d381abba1b343aff196253197 +commit 5f0ed4dd78326712a43a4c4ca5793b5a9737edcd +Author: Rajesh Ranjan +Date: Thu Mar 21 15:08:42 2013 +0530 + + hindi translation + +M po/hi.po + +commit 5b93e74f8b02a6e240da2d30d660308d84abad95 +Author: Bastien Nocera +Date: Tue Mar 19 17:41:26 2013 +0100 + + 3.7.92 + +M NEWS +M configure.ac + +commit dde14aae9e215a40cded0a7faa3d7b9e225832c9 Author: Rūdolfs Mazurs -Date: Mon Mar 18 17:39:22 2013 +0200 +Date: Mon Mar 18 17:38:43 2013 +0200 Updated Latvian translation M po/lv.po -commit 57e241bedcf5dba9455da75055b83aebca2e4a1f +commit 3e399bbe06fc2785262eee0d0b69e10d67c88947 Author: Ask H. Larsen -Date: Sun Mar 17 14:50:28 2013 +0100 +Date: Sun Mar 17 14:50:40 2013 +0100 Updated Danish translation M po/da.po -commit 1968d92549cbc14b44b5133817caa6ad479ad64f +commit 6bbf146a1b019a03b23ec9b0cb23c343cfe70ec7 Author: Ihar Hrachyshka Date: Sun Mar 17 16:25:43 2013 +0300 @@ -1972,7 +502,7 @@ M po/be.po -commit d00f2d7ad6d2d64e930c36bd13dc87e909fde411 +commit 03388c7391740b4ae11dab32eabeb965658b65d9 Author: Balázs Úr Date: Sat Mar 16 19:36:17 2013 +0100 @@ -1980,15 +510,15 @@ M po/hu.po -commit fac5d3378cdb2f0d7aa0d23dde41a0c14c3c12ac +commit b448585b73b426643514a8e2d2b10af460997585 Author: Alexandre Franke -Date: Thu Mar 14 16:01:07 2013 +0100 +Date: Thu Mar 14 15:59:43 2013 +0100 Update French translation M po/fr.po -commit b8f4a289a813ba2152ea85cef075392721ff2b7b +commit 886a568ea6b53772674cdcda1a770a0093eaf9fb Author: Rui Matos Date: Thu Mar 7 11:34:28 2013 +0100 @@ -2007,23 +537,31 @@ M libgnome-desktop/gnome-xkb-info.c -commit 7cc4b6b78ebf643b57a017c6770d36ae1f194b64 +commit 175fc07e7bd9e6baca2bab13af5fd884efc32347 +Author: Sweta Kothari +Date: Thu Mar 14 12:24:16 2013 +0530 + + Updated gujarati file + +M po/gu.po + +commit 0d40a864ed74b42f48f108bec2f96e3c28f3615c Author: Mattias Põldaru -Date: Wed Mar 13 13:04:24 2013 +0200 +Date: Wed Mar 13 14:13:54 2013 +0200 [l10n] Updated Estonian translation M po/et.po -commit 2616a945537e0f4e514b3c51214cbd549dbaa147 +commit 834b4f2d034101b79d0dd917ace74caaf0c7a6ca Author: Ján Kyselica -Date: Tue Mar 12 21:57:42 2013 +0100 +Date: Tue Mar 12 21:56:50 2013 +0100 Updated slovak translation M po/sk.po -commit daa554f41c9177fb498cd901c333bdff44b89d26 +commit b31422be9241d1ad00648d17c42fe00a2e7f2616 Author: Changwoo Ryu Date: Wed Mar 13 01:45:17 2013 +0900 @@ -2031,31 +569,39 @@ M po/ko.po -commit 976a1bd116f326a097011112e46b3e2145d4cd88 +commit c985cbd00ed61699e9c6a7a4cb7dfd394e9ea781 Author: Shankar Prasad -Date: Tue Mar 12 16:46:53 2013 +0530 +Date: Tue Mar 12 16:45:21 2013 +0530 Updated kn translations M po/kn.po -commit 91dc167d193d144dfab4d691114501922297e255 +commit 99321f871a89c194e1d1a27a43c26c8a23ac63d7 +Author: Carles Ferrando +Date: Mon Mar 11 23:33:00 2013 +0100 + + [l10n] Updated Catalan (Valencian) translation + +M po/ca@valencia.po + +commit d608783e65357335b1e2aed7a708cad79e1e6a2c Author: Gil Forcada -Date: Mon Mar 11 23:32:31 2013 +0100 +Date: Mon Mar 11 23:32:51 2013 +0100 [l10n] Updated Catalan translation M po/ca.po -commit 8deab795deb4d5ccd402b868b9c33c9f9d81153e +commit 3ce03278f137551d5b466c5919a89e9ccfddc701 Author: Duarte Loreto -Date: Mon Mar 11 22:17:19 2013 +0000 +Date: Mon Mar 11 22:18:45 2013 +0000 Updated Portuguese translation and converted to New Spelling (Novo AO) M po/pt.po -commit 62a260af95c71989df618a0bd36aadf1e018e9b2 +commit a0636159614807af2eff75f0e0ccf0d9b2754d9d Author: Milo Casagrande Date: Mon Mar 11 21:53:19 2013 +0100 @@ -2063,31 +609,82 @@ M po/it.po -commit 3079c7b7fd0412a1615f2baa769263387c1b6c66 -Author: Khaled Hosny -Date: Sat Mar 9 23:32:26 2013 +0200 +commit 3cd985be84bcb46f7fd0fb503cdad360c0295bcf +Author: Aurimas Černius +Date: Sat Mar 9 17:11:30 2013 +0200 + + Updated Lithuanian translation + +M po/lt.po + +commit edf9f10030a944f1551c71d4e8e20a717ca55171 +Author: Dimitris Spingos +Date: Sat Mar 9 08:58:12 2013 +0200 - Update Arabic translation + Updated Greek translation -M po/ar.po +M po/el.po -commit 49ddd021f36c4799dbbddb06c7bfc3faccfae3a6 +commit a7d27ac8f59bb0dec0ac98570e0061b096495692 Author: Mario Blättermann -Date: Fri Mar 8 17:19:45 2013 +0100 +Date: Fri Mar 8 17:18:53 2013 +0100 [l10n] Updated German translation M po/de.po -commit f83faf4df700c10c730e6a4bc294fe28cf4f79ef +commit dffa81ef75bff3b5a587c1ca43d21383aa54e3d0 +Author: Ville-Pekka Vainio +Date: Thu Mar 7 20:09:43 2013 +0200 + + Finnish translation update by Jiri Grönroos + +M po/fi.po + +commit 34ef507c66f6be9b7e0bc8aa5a23504df9cbb5bd +Author: Matej Urbančič +Date: Thu Mar 7 17:19:20 2013 +0100 + + Updated Slovenian translation + +M po/sl.po + +commit 829e8eafa0317c3a5bf43e28d32bd5d9888fe469 +Author: Fran Diéguez +Date: Thu Mar 7 15:59:16 2013 +0100 + + Updated Galician translations + +M po/gl.po + +commit ea695d440c5bbda8bc85745a71fee02da202810a +Author: Gheyret Kenji +Date: Thu Mar 7 20:57:59 2013 +0900 + + Updated Uyghur translation + + Signed-off-by: Gheyret Kenji + +M po/ug.po + +commit dcd4f7d9c6d3b5c7b2c1f504dc29b86f700fc794 Author: Nilamdyuti Goswami -Date: Thu Mar 7 15:37:25 2013 +0530 +Date: Thu Mar 7 15:44:02 2013 +0530 Assamese translation updated for gnome 3.8 M po/as.po -commit 0dc033482f8e75f5ad5ef2870525409848aac1a1 +commit 4efad561c2980e303fdec79af63f04909b7f8658 +Author: Мирослав Николић +Date: Thu Mar 7 10:50:45 2013 +0100 + + Updated Serbian translation + +M po/sr.po +M po/sr@latin.po + +commit 3390256ed692d4141b0b532816cdd44c0095aed4 Author: Rafael Ferreira Date: Thu Mar 7 02:14:25 2013 -0300 @@ -2095,7 +692,24 @@ M po/pt_BR.po -commit 579a048feb5a5aafe6c95aa44c65c495d36ceb5b +commit 08857889ce83b924497b8e10afc5c5c1d560fa08 +Author: A S Alam +Date: Wed Mar 6 17:52:27 2013 +0530 + + Punjabi: Translation updated (aalam) + +M po/pa.po + +commit 350cb95a21c4c9ac8de8e461ad81cddf048d4deb +Author: Matthias Clasen +Date: Tue Mar 5 18:10:18 2013 -0500 + + 3.7.91 + +M NEWS +M configure.ac + +commit b28f8e5333b5e8dc3e0e797feb64f31a75ea6b6b Author: Piotr Drąg Date: Mon Mar 4 22:01:59 2013 +0100 @@ -2103,41 +717,25 @@ M po/pl.po -commit ea1f880a086b8519c904d572ff9333c21da4a3f3 +commit 494f82550dccb9cc0a5ab2e1394922a08e959f22 Author: Kjartan Maraas -Date: Mon Mar 4 14:44:54 2013 +0100 +Date: Mon Mar 4 14:49:14 2013 +0100 Updated Norwegian bokmål translation M po/nb.po -commit 7559edfbbdd1324eca4153e8caf9273b94b777cb -Author: Fran Diéguez -Date: Mon Mar 4 12:52:35 2013 +0100 - - Updated Galician translations - -M po/gl.po - -commit edbbc81b437e67753846ccab5928116cd779723c -Author: Bastien Nocera -Date: Mon Mar 4 12:52:10 2013 +0100 +commit 17938d10d465170178d90e2c4f0bd656d0ff4aaa +Author: Daniel Mustieles +Date: Mon Mar 4 14:12:59 2013 +0100 - build: Bump version number after branching + Updated Spanish translation -M configure.ac +M po/es.po -commit fee662fcc8ea8b71ebe80a843e4cf38cd9e6e51a +commit 4c11dc6a3c2f2757c8ae8e7f90d6119a5326ed91 Author: Bastien Nocera -Date: Mon Mar 4 12:32:46 2013 +0100 - - gnome-rr: Fix stray _is_laptop() call - -M libgnome-desktop/gnome-rr.c - -commit b3b1d5fd9c1825573628ad097d76d1fd6400dd2f -Author: Shih-Yuan Lee (FourDollars) -Date: Thu Jul 12 20:25:04 2012 +0800 +Date: Mon Feb 25 16:55:42 2013 +0100 gnome-rr: Use "Built-in Display" for internal displays @@ -2145,16 +743,9 @@ that will get detected as having internal displays, but aren't laptops. - Also rename all the functions with "laptop" in the name. - https://bugzilla.gnome.org/show_bug.cgi?id=679794 -M docs/reference/gnome-desktop3/gnome-desktop3-sections.txt -M libgnome-desktop/gnome-rr-config.c -M libgnome-desktop/gnome-rr-debug.c -M libgnome-desktop/gnome-rr-private.h M libgnome-desktop/gnome-rr.c -M libgnome-desktop/gnome-rr.h commit e91b55fb67025883b59d71109e12578fe0496b16 Author: Nguyễn Thái Ngọc Duy diff -Nru gnome-desktop3-3.12.0/config.guess gnome-desktop3-3.8.4/config.guess --- gnome-desktop3-3.12.0/config.guess 2014-03-24 14:31:07.000000000 +0000 +++ gnome-desktop3-3.8.4/config.guess 2013-09-04 11:29:46.000000000 +0000 @@ -1,10 +1,8 @@ #! /bin/sh # 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, 2013 Free Software Foundation, Inc. +# Copyright 1992-2013 Free Software Foundation, Inc. -timestamp='2012-12-29' +timestamp='2013-06-10' # 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 @@ -26,7 +24,7 @@ # program. This Exception is an additional permission under section 7 # of the GNU General Public License, version 3 ("GPLv3"). # -# Originally written by Per Bothner. +# 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 @@ -52,9 +50,7 @@ GNU config.guess ($timestamp) 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, 2013 Free Software Foundation, Inc. +Copyright 1992-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." @@ -136,6 +132,27 @@ UNAME_SYSTEM=`(uname -s) 2>/dev/null` || UNAME_SYSTEM=unknown UNAME_VERSION=`(uname -v) 2>/dev/null` || UNAME_VERSION=unknown +case "${UNAME_SYSTEM}" in +Linux|GNU|GNU/*) + # If the system lacks a compiler, then just pick glibc. + # We could probably try harder. + LIBC=gnu + + eval $set_cc_for_build + cat <<-EOF > $dummy.c + #include + #if defined(__UCLIBC__) + LIBC=uclibc + #elif defined(__dietlibc__) + LIBC=dietlibc + #else + LIBC=gnu + #endif + EOF + eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep '^LIBC'` + ;; +esac + # Note: order is significant - the case branches are not exclusive. case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in @@ -857,21 +874,21 @@ exit ;; *:GNU:*:*) # the GNU system - echo `echo ${UNAME_MACHINE}|sed -e 's,[-/].*$,,'`-unknown-gnu`echo ${UNAME_RELEASE}|sed -e 's,/.*$,,'` + echo `echo ${UNAME_MACHINE}|sed -e 's,[-/].*$,,'`-unknown-${LIBC}`echo ${UNAME_RELEASE}|sed -e 's,/.*$,,'` exit ;; *:GNU/*:*:*) # other systems with GNU libc and userland - echo ${UNAME_MACHINE}-unknown-`echo ${UNAME_SYSTEM} | sed 's,^[^/]*/,,' | tr '[A-Z]' '[a-z]'``echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`-gnu + echo ${UNAME_MACHINE}-unknown-`echo ${UNAME_SYSTEM} | sed 's,^[^/]*/,,' | tr '[A-Z]' '[a-z]'``echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`-${LIBC} exit ;; i*86:Minix:*:*) echo ${UNAME_MACHINE}-pc-minix exit ;; aarch64:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-gnu + echo ${UNAME_MACHINE}-unknown-linux-${LIBC} exit ;; aarch64_be:Linux:*:*) UNAME_MACHINE=aarch64_be - echo ${UNAME_MACHINE}-unknown-linux-gnu + echo ${UNAME_MACHINE}-unknown-linux-${LIBC} exit ;; alpha:Linux:*:*) case `sed -n '/^cpu model/s/^.*: \(.*\)/\1/p' < /proc/cpuinfo` in @@ -884,59 +901,54 @@ EV68*) UNAME_MACHINE=alphaev68 ;; esac objdump --private-headers /bin/sh | grep -q ld.so.1 - if test "$?" = 0 ; then LIBC="libc1" ; else LIBC="" ; fi - echo ${UNAME_MACHINE}-unknown-linux-gnu${LIBC} + if test "$?" = 0 ; then LIBC="gnulibc1" ; fi + echo ${UNAME_MACHINE}-unknown-linux-${LIBC} + exit ;; + arc:Linux:*:* | arceb:Linux:*:*) + echo ${UNAME_MACHINE}-unknown-linux-${LIBC} exit ;; arm*:Linux:*:*) eval $set_cc_for_build if echo __ARM_EABI__ | $CC_FOR_BUILD -E - 2>/dev/null \ | grep -q __ARM_EABI__ then - echo ${UNAME_MACHINE}-unknown-linux-gnu + echo ${UNAME_MACHINE}-unknown-linux-${LIBC} else if echo __ARM_PCS_VFP | $CC_FOR_BUILD -E - 2>/dev/null \ | grep -q __ARM_PCS_VFP then - echo ${UNAME_MACHINE}-unknown-linux-gnueabi + echo ${UNAME_MACHINE}-unknown-linux-${LIBC}eabi else - echo ${UNAME_MACHINE}-unknown-linux-gnueabihf + echo ${UNAME_MACHINE}-unknown-linux-${LIBC}eabihf fi fi exit ;; avr32*:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-gnu + echo ${UNAME_MACHINE}-unknown-linux-${LIBC} exit ;; cris:Linux:*:*) - echo ${UNAME_MACHINE}-axis-linux-gnu + echo ${UNAME_MACHINE}-axis-linux-${LIBC} exit ;; crisv32:Linux:*:*) - echo ${UNAME_MACHINE}-axis-linux-gnu + echo ${UNAME_MACHINE}-axis-linux-${LIBC} exit ;; frv:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-gnu + echo ${UNAME_MACHINE}-unknown-linux-${LIBC} exit ;; hexagon:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-gnu + echo ${UNAME_MACHINE}-unknown-linux-${LIBC} exit ;; i*86:Linux:*:*) - LIBC=gnu - eval $set_cc_for_build - sed 's/^ //' << EOF >$dummy.c - #ifdef __dietlibc__ - LIBC=dietlibc - #endif -EOF - eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep '^LIBC'` - echo "${UNAME_MACHINE}-pc-linux-${LIBC}" + echo ${UNAME_MACHINE}-pc-linux-${LIBC} exit ;; ia64:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-gnu + echo ${UNAME_MACHINE}-unknown-linux-${LIBC} exit ;; m32r*:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-gnu + echo ${UNAME_MACHINE}-unknown-linux-${LIBC} exit ;; m68*:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-gnu + echo ${UNAME_MACHINE}-unknown-linux-${LIBC} exit ;; mips:Linux:*:* | mips64:Linux:*:*) eval $set_cc_for_build @@ -955,54 +967,63 @@ #endif EOF eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep '^CPU'` - test x"${CPU}" != x && { echo "${CPU}-unknown-linux-gnu"; exit; } + test x"${CPU}" != x && { echo "${CPU}-unknown-linux-${LIBC}"; exit; } ;; + or1k:Linux:*:*) + echo ${UNAME_MACHINE}-unknown-linux-${LIBC} + exit ;; or32:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-gnu + echo ${UNAME_MACHINE}-unknown-linux-${LIBC} exit ;; padre:Linux:*:*) - echo sparc-unknown-linux-gnu + echo sparc-unknown-linux-${LIBC} exit ;; parisc64:Linux:*:* | hppa64:Linux:*:*) - echo hppa64-unknown-linux-gnu + echo hppa64-unknown-linux-${LIBC} exit ;; parisc:Linux:*:* | hppa:Linux:*:*) # Look for CPU level case `grep '^cpu[^a-z]*:' /proc/cpuinfo 2>/dev/null | cut -d' ' -f2` in - PA7*) echo hppa1.1-unknown-linux-gnu ;; - PA8*) echo hppa2.0-unknown-linux-gnu ;; - *) echo hppa-unknown-linux-gnu ;; + PA7*) echo hppa1.1-unknown-linux-${LIBC} ;; + PA8*) echo hppa2.0-unknown-linux-${LIBC} ;; + *) echo hppa-unknown-linux-${LIBC} ;; esac exit ;; ppc64:Linux:*:*) - echo powerpc64-unknown-linux-gnu + echo powerpc64-unknown-linux-${LIBC} exit ;; ppc:Linux:*:*) - echo powerpc-unknown-linux-gnu + echo powerpc-unknown-linux-${LIBC} + exit ;; + ppc64le:Linux:*:*) + echo powerpc64le-unknown-linux-${LIBC} + exit ;; + ppcle:Linux:*:*) + echo powerpcle-unknown-linux-${LIBC} exit ;; s390:Linux:*:* | s390x:Linux:*:*) - echo ${UNAME_MACHINE}-ibm-linux + echo ${UNAME_MACHINE}-ibm-linux-${LIBC} exit ;; sh64*:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-gnu + echo ${UNAME_MACHINE}-unknown-linux-${LIBC} exit ;; sh*:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-gnu + echo ${UNAME_MACHINE}-unknown-linux-${LIBC} exit ;; sparc:Linux:*:* | sparc64:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-gnu + echo ${UNAME_MACHINE}-unknown-linux-${LIBC} exit ;; tile*:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-gnu + echo ${UNAME_MACHINE}-unknown-linux-${LIBC} exit ;; vax:Linux:*:*) - echo ${UNAME_MACHINE}-dec-linux-gnu + echo ${UNAME_MACHINE}-dec-linux-${LIBC} exit ;; x86_64:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-gnu + echo ${UNAME_MACHINE}-unknown-linux-${LIBC} exit ;; xtensa*:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-gnu + echo ${UNAME_MACHINE}-unknown-linux-${LIBC} exit ;; i*86:DYNIX/ptx:4*:*) # ptx 4.0 does uname -s correctly, with DYNIX/ptx in there. @@ -1235,19 +1256,21 @@ exit ;; *:Darwin:*:*) UNAME_PROCESSOR=`uname -p` || UNAME_PROCESSOR=unknown - case $UNAME_PROCESSOR in - i386) - eval $set_cc_for_build - if [ "$CC_FOR_BUILD" != 'no_compiler_found' ]; then - if (echo '#ifdef __LP64__'; echo IS_64BIT_ARCH; echo '#endif') | \ - (CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) | \ - grep IS_64BIT_ARCH >/dev/null - then - UNAME_PROCESSOR="x86_64" - fi - fi ;; - unknown) UNAME_PROCESSOR=powerpc ;; - esac + eval $set_cc_for_build + if test "$UNAME_PROCESSOR" = unknown ; then + UNAME_PROCESSOR=powerpc + fi + if [ "$CC_FOR_BUILD" != 'no_compiler_found' ]; then + if (echo '#ifdef __LP64__'; echo IS_64BIT_ARCH; echo '#endif') | \ + (CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) | \ + grep IS_64BIT_ARCH >/dev/null + then + case $UNAME_PROCESSOR in + i386) UNAME_PROCESSOR=x86_64 ;; + powerpc) UNAME_PROCESSOR=powerpc64 ;; + esac + fi + fi echo ${UNAME_PROCESSOR}-apple-darwin${UNAME_RELEASE} exit ;; *:procnto*:*:* | *:QNX:[0123456789]*:*) diff -Nru gnome-desktop3-3.12.0/config.sub gnome-desktop3-3.8.4/config.sub --- gnome-desktop3-3.12.0/config.sub 2014-03-24 14:31:07.000000000 +0000 +++ gnome-desktop3-3.8.4/config.sub 2013-09-04 11:29:46.000000000 +0000 @@ -1,10 +1,8 @@ #! /bin/sh # 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, 2013 Free Software Foundation, Inc. +# Copyright 1992-2013 Free Software Foundation, Inc. -timestamp='2012-12-29' +timestamp='2013-04-24' # 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 @@ -70,9 +68,7 @@ version="\ 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, 2013 Free Software Foundation, Inc. +Copyright 1992-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." @@ -256,7 +252,7 @@ | alpha | alphaev[4-8] | alphaev56 | alphaev6[78] | alphapca5[67] \ | alpha64 | alpha64ev[4-8] | alpha64ev56 | alpha64ev6[78] | alpha64pca5[67] \ | am33_2.0 \ - | arc \ + | arc | arceb \ | arm | arm[bl]e | arme[lb] | armv[2-8] | armv[3-8][lb] | armv7[arm] \ | avr | avr32 \ | be32 | be64 \ @@ -290,16 +286,17 @@ | mipsisa64r2 | mipsisa64r2el \ | mipsisa64sb1 | mipsisa64sb1el \ | mipsisa64sr71k | mipsisa64sr71kel \ + | mipsr5900 | mipsr5900el \ | mipstx39 | mipstx39el \ | mn10200 | mn10300 \ | moxie \ | mt \ | msp430 \ | nds32 | nds32le | nds32be \ - | nios | nios2 \ + | nios | nios2 | nios2eb | nios2el \ | ns16k | ns32k \ | open8 \ - | or32 \ + | or1k | or32 \ | pdp10 | pdp11 | pj | pjl \ | powerpc | powerpc64 | powerpc64le | powerpcle \ | pyramid \ @@ -369,7 +366,7 @@ | aarch64-* | aarch64_be-* \ | alpha-* | alphaev[4-8]-* | alphaev56-* | alphaev6[78]-* \ | alpha64-* | alpha64ev[4-8]-* | alpha64ev56-* | alpha64ev6[78]-* \ - | alphapca5[67]-* | alpha64pca5[67]-* | arc-* \ + | alphapca5[67]-* | alpha64pca5[67]-* | arc-* | arceb-* \ | arm-* | armbe-* | armle-* | armeb-* | armv*-* \ | avr-* | avr32-* \ | be32-* | be64-* \ @@ -407,12 +404,13 @@ | mipsisa64r2-* | mipsisa64r2el-* \ | mipsisa64sb1-* | mipsisa64sb1el-* \ | mipsisa64sr71k-* | mipsisa64sr71kel-* \ + | mipsr5900-* | mipsr5900el-* \ | mipstx39-* | mipstx39el-* \ | mmix-* \ | mt-* \ | msp430-* \ | nds32-* | nds32le-* | nds32be-* \ - | nios-* | nios2-* \ + | nios-* | nios2-* | nios2eb-* | nios2el-* \ | none-* | np1-* | ns16k-* | ns32k-* \ | open8-* \ | orion-* \ @@ -1354,7 +1352,7 @@ -gnu* | -bsd* | -mach* | -minix* | -genix* | -ultrix* | -irix* \ | -*vms* | -sco* | -esix* | -isc* | -aix* | -cnk* | -sunos | -sunos[34]*\ | -hpux* | -unos* | -osf* | -luna* | -dgux* | -auroraux* | -solaris* \ - | -sym* | -kopensolaris* \ + | -sym* | -kopensolaris* | -plan9* \ | -amigaos* | -amigados* | -msdos* | -newsos* | -unicos* | -aof* \ | -aos* | -aros* \ | -nindy* | -vxsim* | -vxworks* | -ebmon* | -hms* | -mvs* \ @@ -1500,9 +1498,6 @@ -aros*) os=-aros ;; - -kaos*) - os=-kaos - ;; -zvmoe) os=-zvmoe ;; @@ -1594,6 +1589,9 @@ mips*-*) os=-elf ;; + or1k-*) + os=-elf + ;; or32-*) os=-coff ;; diff -Nru gnome-desktop3-3.12.0/configure gnome-desktop3-3.8.4/configure --- gnome-desktop3-3.12.0/configure 2014-03-24 14:31:05.000000000 +0000 +++ gnome-desktop3-3.8.4/configure 2013-09-04 11:29:45.000000000 +0000 @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.69 for gnome-desktop 3.12.0. +# Generated by GNU Autoconf 2.69 for gnome-desktop 3.8.4. # # Report bugs to . # @@ -591,8 +591,8 @@ # Identity of this package. PACKAGE_NAME='gnome-desktop' PACKAGE_TARNAME='gnome-desktop' -PACKAGE_VERSION='3.12.0' -PACKAGE_STRING='gnome-desktop 3.12.0' +PACKAGE_VERSION='3.8.4' +PACKAGE_STRING='gnome-desktop 3.8.4' PACKAGE_BUGREPORT='http://bugzilla.gnome.org/enter_bug.cgi?product=gnome-desktop' PACKAGE_URL='' @@ -1458,7 +1458,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 gnome-desktop 3.12.0 to adapt to many kinds of systems. +\`configure' configures gnome-desktop 3.8.4 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1532,7 +1532,7 @@ if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of gnome-desktop 3.12.0:";; + short | recursive ) echo "Configuration of gnome-desktop 3.8.4:";; esac cat <<\_ACEOF @@ -1677,7 +1677,7 @@ test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -gnome-desktop configure 3.12.0 +gnome-desktop configure 3.8.4 generated by GNU Autoconf 2.69 Copyright (C) 2012 Free Software Foundation, Inc. @@ -2046,7 +2046,7 @@ This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by gnome-desktop $as_me 3.12.0, which was +It was created by gnome-desktop $as_me 3.8.4, which was generated by GNU Autoconf 2.69. Invocation command line was $ $0 $@ @@ -2911,7 +2911,7 @@ # Define the identity of the package. PACKAGE='gnome-desktop' - VERSION='3.12.0' + VERSION='3.8.4' cat >>confdefs.h <<_ACEOF @@ -3154,7 +3154,7 @@ # change to C+1:0:0 # - If the interface is the same as the previous version, change to C:R+1:A -LT_VERSION=10:0:0 +LT_VERSION=7:0:0 @@ -6542,7 +6542,7 @@ rm -rf conftest* ;; -x86_64-*kfreebsd*-gnu|x86_64-*linux*|powerpc*-*linux*| \ +x86_64-*kfreebsd*-gnu|x86_64-*linux*|ppc*-*linux*|powerpc*-*linux*| \ s390*-*linux*|s390*-*tpf*|sparc*-*linux*) # Find out which ABI we are using. echo 'int i;' > conftest.$ac_ext @@ -6560,10 +6560,7 @@ x86_64-*linux*) LD="${LD-ld} -m elf_i386" ;; - powerpc64le-*linux*) - LD="${LD-ld} -m elf32lppclinux" - ;; - powerpc64-*linux*) + ppc64-*linux*|powerpc64-*linux*) LD="${LD-ld} -m elf32ppclinux" ;; s390x-*linux*) @@ -6582,10 +6579,7 @@ x86_64-*linux*) LD="${LD-ld} -m elf_x86_64" ;; - powerpcle-*linux*) - LD="${LD-ld} -m elf64lppc" - ;; - powerpc-*linux*) + ppc*-*linux*|powerpc*-*linux*) LD="${LD-ld} -m elf64ppc" ;; s390*-*linux*|s390*-*tpf*) @@ -13390,8 +13384,8 @@ fi GNOME_PLATFORM=3 -GNOME_MINOR=12 -GNOME_MICRO=0 +GNOME_MINOR=8 +GNOME_MICRO=4 GNOME_DISTRIBUTOR="GNOME.Org" GNOME_DATE=`date +"%Y-%m-%d"` @@ -13463,8 +13457,6 @@ -Werror=missing-include-dirs \ " - additional_flags="" - case "$enable_compile_warnings" in no) warning_flags= @@ -13473,10 +13465,10 @@ warning_flags="-Wall" ;; yes) - warning_flags="$base_warn_flags $base_error_flags $additional_flags" + warning_flags="$base_warn_flags $base_error_flags" ;; maximum|error) - warning_flags="$base_warn_flags $base_error_flags $additional_flags" + warning_flags="$base_warn_flags $base_error_flags" ;; *) as_fn_error $? "Unknown argument '$enable_compile_warnings' to --enable-compile-warnings" "$LINENO" 5 @@ -15054,6 +15046,7 @@ xrandr >= \$XRANDR_REQUIRED xext >= \$XEXT_REQUIRED xkeyboard-config + xkbfile iso-codes\""; } >&5 ($PKG_CONFIG --exists --print-errors "gdk-pixbuf-2.0 >= $GDK_PIXBUF_REQUIRED gtk+-3.0 >= $GTK_REQUIRED @@ -15063,6 +15056,7 @@ xrandr >= $XRANDR_REQUIRED xext >= $XEXT_REQUIRED xkeyboard-config + xkbfile iso-codes") 2>&5 ac_status=$? $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 @@ -15075,6 +15069,7 @@ xrandr >= $XRANDR_REQUIRED xext >= $XEXT_REQUIRED xkeyboard-config + xkbfile iso-codes" 2>/dev/null` test "x$?" != "x0" && pkg_failed=yes else @@ -15095,6 +15090,7 @@ xrandr >= \$XRANDR_REQUIRED xext >= \$XEXT_REQUIRED xkeyboard-config + xkbfile iso-codes\""; } >&5 ($PKG_CONFIG --exists --print-errors "gdk-pixbuf-2.0 >= $GDK_PIXBUF_REQUIRED gtk+-3.0 >= $GTK_REQUIRED @@ -15104,6 +15100,7 @@ xrandr >= $XRANDR_REQUIRED xext >= $XEXT_REQUIRED xkeyboard-config + xkbfile iso-codes") 2>&5 ac_status=$? $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 @@ -15116,6 +15113,7 @@ xrandr >= $XRANDR_REQUIRED xext >= $XEXT_REQUIRED xkeyboard-config + xkbfile iso-codes" 2>/dev/null` test "x$?" != "x0" && pkg_failed=yes else @@ -15145,6 +15143,7 @@ xrandr >= $XRANDR_REQUIRED xext >= $XEXT_REQUIRED xkeyboard-config + xkbfile iso-codes" 2>&1` else GNOME_DESKTOP_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "gdk-pixbuf-2.0 >= $GDK_PIXBUF_REQUIRED @@ -15155,6 +15154,7 @@ xrandr >= $XRANDR_REQUIRED xext >= $XEXT_REQUIRED xkeyboard-config + xkbfile iso-codes" 2>&1` fi # Put the nasty error message in config.log where it belongs @@ -15168,6 +15168,7 @@ xrandr >= $XRANDR_REQUIRED xext >= $XEXT_REQUIRED xkeyboard-config + xkbfile iso-codes) were not met: $GNOME_DESKTOP_PKG_ERRORS @@ -15378,8 +15379,7 @@ .PHONY: pot pot: $(_HELP_POTFILE) $(_HELP_POTFILE): $(_HELP_C_FILES) $(_HELP_C_EXTRA) $(_HELP_C_MEDIA) - $(AM_V_GEN)if test -d "C"; then d=; else d="$(srcdir)/"; fi; \ - $(ITSTOOL) -o "$@" $(foreach f,$(_HELP_C_FILES),"$${d}$(f)") + $(AM_V_GEN)$(ITSTOOL) -o "$@" $(_HELP_C_FILES) .PHONY: repo repo: $(_HELP_POTFILE) @@ -17217,7 +17217,7 @@ # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by gnome-desktop $as_me 3.12.0, which was +This file was extended by gnome-desktop $as_me 3.8.4, which was generated by GNU Autoconf 2.69. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -17283,7 +17283,7 @@ cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`" ac_cs_version="\\ -gnome-desktop config.status 3.12.0 +gnome-desktop config.status 3.8.4 configured by $0, generated by GNU Autoconf 2.69, with options \\"\$ac_cs_config\\" diff -Nru gnome-desktop3-3.12.0/configure.ac gnome-desktop3-3.8.4/configure.ac --- gnome-desktop3-3.12.0/configure.ac 2014-03-24 14:24:56.000000000 +0000 +++ gnome-desktop3-3.8.4/configure.ac 2013-09-04 11:23:12.000000000 +0000 @@ -1,6 +1,6 @@ m4_define(gnome_platform, 3) -m4_define(gnome_minor, 12) -m4_define(gnome_micro, 0) +m4_define(gnome_minor, 8) +m4_define(gnome_micro, 4) dnl gnome_sub is an optional sub-version which will not be advertised to the user dnl It allows to release a 2.30.1.1 which is just a better 2.30.1 dnl Leave empty if not needed @@ -28,7 +28,7 @@ # change to C+1:0:0 # - If the interface is the same as the previous version, change to C:R+1:A -LT_VERSION=10:0:0 +LT_VERSION=7:0:0 AC_SUBST(LT_VERSION) LT_PREREQ([2.2.6]) @@ -153,6 +153,7 @@ xrandr >= $XRANDR_REQUIRED xext >= $XEXT_REQUIRED xkeyboard-config + xkbfile iso-codes) XKB_BASE=$($PKG_CONFIG --variable xkb_base xkeyboard-config) diff -Nru gnome-desktop3-3.12.0/debian/changelog gnome-desktop3-3.8.4/debian/changelog --- gnome-desktop3-3.12.0/debian/changelog 2014-06-12 10:48:10.000000000 +0000 +++ gnome-desktop3-3.8.4/debian/changelog 2014-06-25 15:03:49.000000000 +0000 @@ -1,88 +1,43 @@ -gnome-desktop3 (3.12.0-0~eugenesan~utopic3) utopic; urgency=medium +gnome-desktop3 (3.8.4-0ubuntu3.01~eugenesan~utopic1) utopic; urgency=medium - * Import to ppa - - Merge changes from gnome3-team/gnome3-staging 3.12.0-0ubuntu1~utopic1 + * Import few upstream patches to avoid crashes in virtual sessions - -- Eugene San (eugenesan) Sun, 20 Apr 2014 12:44:53 +0300 + -- Eugene San (eugenesan) Wed, 25 Jun 2014 17:36:17 +0300 -gnome-desktop3 (3.12.0-0ubuntu1~utopic1) utopic; urgency=medium +gnome-desktop3 (3.8.4-0ubuntu3) utopic; urgency=medium - * New upstream release - - -- Tim Lunn Thu, 03 Apr 2014 17:11:47 +1100 - -gnome-desktop3 (3.11.91-0ubuntu1~utopic1) utopic; urgency=medium - - * New upstream release - - -- Tim Lunn Mon, 24 Mar 2014 08:38:42 +1100 - -gnome-desktop3 (3.11.90-0ubuntu1~utopic3) utopic; urgency=critical - - * New upstream release - * debian/control.in: - - Drop depend on libxkbfile-dev - - soname bump - * libgnome-desktop-3-10.symbols: update for removed symbols - - -- Tim Lunn Sun, 02 Mar 2014 15:31:56 +1100 - -gnome-desktop3 (3.11.5-0ubuntu1~utopic1) utopic; urgency=medium - - * New upstream release - - -- Tim Lunn Sat, 08 Feb 2014 15:27:23 +1100 - -gnome-desktop3 (3.11.4-0ubuntu1~utopic1) utopic; urgency=medium - - * New upstream release - * debian/libgnome-desktop-3-8.symbols: Add new symbol - - -- Tim Lunn Sat, 18 Jan 2014 18:48:15 +1100 - -gnome-desktop3 (3.11.2-0ubuntu1~utopic1) utopic; urgency=medium - - * New upstream release - - -- Rico Tzschichholz Mon, 02 Dec 2013 13:32:41 +0100 + * debian/patches/backlight-property-name.patch: + - Use the corrent backlight property name as specified in the XRANDR spec + (LP: #947919) -gnome-desktop3 (3.10.1-0ubuntu1~saucy1) saucy; urgency=medium + -- Robert Ancell Mon, 17 Mar 2014 17:28:55 +1300 - * New upstream release - * debian/patches/ubuntu_language.patch: - - Refreshed +gnome-desktop3 (3.8.4-0ubuntu2) utopic; urgency=low - -- Rico Tzschichholz Wed, 30 Oct 2013 13:05:42 +0100 + * debian/patches/ignore_errors_with_primary_outputs.patch: + - Ignore failures when setting the primary output (LP: 1224254). -gnome-desktop3 (3.10.0-0ubuntu1~saucy1) saucy; urgency=medium + -- Alberto Milone Tue, 03 Dec 2013 15:58:57 +0100 - * New upstream release +gnome-desktop3 (3.8.4-0ubuntu1) saucy; urgency=low - -- Rico Tzschichholz Tue, 24 Sep 2013 13:46:54 +0200 - -gnome-desktop3 (3.9.91-0ubuntu1~saucy2) saucy; urgency=medium - - * New upstream release - * debian/rules, libgnome-desktop-3-8.install: correct libexec install path - - -- Tim Lunn Wed, 18 Sep 2013 13:53:31 +1000 - -gnome-desktop3 (3.9.90-0ubuntu1~saucy2) saucy; urgency=medium - - * New upstream release - * debian/patches/02_refuse_to_break_GL_compositors.patch: Disable for - now needs to be ported to new mutter dbus API - * debian/libgnome-desktop-3-7.symbols: update with new rr api + * New upstream bugfix release + - Initialize gettext before constructing a wall clock + - Update pnp.ids from upstream hwdata + - Fix crash when XRRSetCrtcConfig() fails + - Prevent a crash with unknown language/country codes + - Ensure strings from xkeyboard-config are UTF-8 + - Translation updates - -- Tim Lunn Sat, 24 Aug 2013 16:26:20 +1000 + -- Jeremy Bicha Wed, 04 Sep 2013 15:08:54 -0400 -gnome-desktop3 (3.9.1.1-0ubuntu1~saucy1) saucy; urgency=medium +gnome-desktop3 (3.8.3-0ubuntu1) saucy; urgency=low * New upstream release - * debian/patches drop git patches - * debian/libgnome-desktop-3-7.symbols: updated for randr api change + * debian/control.in: + - Drop obsolete gnome-doc-utils and scrollkeeper build dependencies - -- Tim Lunn Tue, 16 Jul 2013 11:18:22 +1000 + -- Jeremy Bicha Mon, 22 Jul 2013 01:39:16 -0400 gnome-desktop3 (3.8.2-0ubuntu2) saucy; urgency=low diff -Nru gnome-desktop3-3.12.0/debian/control gnome-desktop3-3.8.4/debian/control --- gnome-desktop3-3.12.0/debian/control 2014-06-12 10:48:12.000000000 +0000 +++ gnome-desktop3-3.8.4/debian/control 2014-06-25 15:03:50.000000000 +0000 @@ -7,26 +7,25 @@ Priority: optional Maintainer: Ubuntu Developers XSBC-Original-Maintainer: Debian GNOME Maintainers -Uploaders: Debian GNOME Maintainers -Vcs-Svn: svn://anonscm.debian.org/svn/pkg-gnome/desktop/unstable/gnome-desktop3 +Uploaders: Debian GNOME Maintainers , Emilio Pozuelo Monfort , Jeremy Bicha +Vcs-Svn: svn://anonscm.debian.org/pkg-gnome/desktop/unstable/gnome-desktop3 Vcs-Browser: http://anonscm.debian.org/viewvc/pkg-gnome/desktop/unstable/gnome-desktop3 -Standards-Version: 3.9.3 +Standards-Version: 3.9.4 Build-Depends: debhelper (>= 8), dpkg-dev (>= 1.15.1), dh-autoreconf, libglib2.0-dev (>= 2.35.0), intltool (>= 0.40.6), iso-codes, - scrollkeeper, cdbs (>= 0.4.41), gnome-pkg-tools (>= 0.10), gtk-doc-tools (>= 1.4), docbook-xml, - gnome-doc-utils (>= 0.3.2), libx11-dev, libxrandr-dev (>= 1.3), libxext-dev, xkb-data, + libxkbfile-dev, libgdk-pixbuf2.0-dev (>= 2.21.3), libgl1-mesa-dev, libgtk-3-dev (>= 3.3.6), @@ -48,7 +47,7 @@ This package includes some files that are shared between several GNOME apps (internationalization files). -Package: libgnome-desktop-3-10 +Package: libgnome-desktop-3-7 Section: libs Architecture: any Depends: ${misc:Depends}, @@ -57,7 +56,6 @@ gnome-desktop3-data (>= ${source:Version}) Replaces: libgnome-desktop-3-2 (<< 3.5.2), libgnome-desktop-3-4 (<< 3.7.90), - libgnome-desktop-3-7 (<< 3.9.91), Recommends: hwdata (>= 0.227-1) Description: Utility library for loading .desktop files - runtime files This library is used by GNOME to load the .desktop files. @@ -66,10 +64,11 @@ Section: libdevel Architecture: any Depends: ${misc:Depends}, - libgnome-desktop-3-10 (= ${binary:Version}), + libgnome-desktop-3-7 (= ${binary:Version}), gir1.2-gnomedesktop-3.0 (= ${binary:Version}), libgtk-3-dev (>= 3.3.6), gsettings-desktop-schemas-dev, + libxkbfile-dev Description: Utility library for loading .desktop files - development files This package provides the include files and static library for the GNOME desktop library functions. @@ -80,6 +79,7 @@ Depends: ${misc:Depends}, ${shlibs:Depends}, ${gir:Depends} +Breaks: gnome-shell (<< 3.7.90) Description: Introspection data for GnomeDesktop This package provides the include files and static library for the GNOME desktop library functions. diff -Nru gnome-desktop3-3.12.0/debian/control.in gnome-desktop3-3.8.4/debian/control.in --- gnome-desktop3-3.12.0/debian/control.in 2014-03-02 13:59:49.000000000 +0000 +++ gnome-desktop3-3.8.4/debian/control.in 2014-03-17 04:30:24.000000000 +0000 @@ -4,25 +4,24 @@ Maintainer: Ubuntu Developers XSBC-Original-Maintainer: Debian GNOME Maintainers Uploaders: @GNOME_TEAM@ -Vcs-Svn: svn://anonscm.debian.org/svn/pkg-gnome/desktop/unstable/gnome-desktop3 +Vcs-Svn: svn://anonscm.debian.org/pkg-gnome/desktop/unstable/gnome-desktop3 Vcs-Browser: http://anonscm.debian.org/viewvc/pkg-gnome/desktop/unstable/gnome-desktop3 -Standards-Version: 3.9.3 +Standards-Version: 3.9.4 Build-Depends: debhelper (>= 8), dpkg-dev (>= 1.15.1), dh-autoreconf, libglib2.0-dev (>= 2.35.0), intltool (>= 0.40.6), iso-codes, - scrollkeeper, cdbs (>= 0.4.41), gnome-pkg-tools (>= 0.10), gtk-doc-tools (>= 1.4), docbook-xml, - gnome-doc-utils (>= 0.3.2), libx11-dev, libxrandr-dev (>= 1.3), libxext-dev, xkb-data, + libxkbfile-dev, libgdk-pixbuf2.0-dev (>= 2.21.3), libgl1-mesa-dev, libgtk-3-dev (>= 3.3.6), @@ -44,7 +43,7 @@ This package includes some files that are shared between several GNOME apps (internationalization files). -Package: libgnome-desktop-3-10 +Package: libgnome-desktop-3-7 Section: libs Architecture: any Depends: ${misc:Depends}, @@ -53,7 +52,6 @@ gnome-desktop3-data (>= ${source:Version}) Replaces: libgnome-desktop-3-2 (<< 3.5.2), libgnome-desktop-3-4 (<< 3.7.90), - libgnome-desktop-3-7 (<< 3.9.91), Recommends: hwdata (>= 0.227-1) Description: Utility library for loading .desktop files - runtime files This library is used by GNOME to load the .desktop files. @@ -62,10 +60,11 @@ Section: libdevel Architecture: any Depends: ${misc:Depends}, - libgnome-desktop-3-10 (= ${binary:Version}), + libgnome-desktop-3-7 (= ${binary:Version}), gir1.2-gnomedesktop-3.0 (= ${binary:Version}), libgtk-3-dev (>= 3.3.6), gsettings-desktop-schemas-dev, + libxkbfile-dev Description: Utility library for loading .desktop files - development files This package provides the include files and static library for the GNOME desktop library functions. @@ -76,6 +75,7 @@ Depends: ${misc:Depends}, ${shlibs:Depends}, ${gir:Depends} +Breaks: gnome-shell (<< 3.7.90) Description: Introspection data for GnomeDesktop This package provides the include files and static library for the GNOME desktop library functions. diff -Nru gnome-desktop3-3.12.0/debian/libgnome-desktop-3-10.install gnome-desktop3-3.8.4/debian/libgnome-desktop-3-10.install --- gnome-desktop3-3.12.0/debian/libgnome-desktop-3-10.install 2014-03-02 14:02:41.000000000 +0000 +++ gnome-desktop3-3.8.4/debian/libgnome-desktop-3-10.install 1970-01-01 00:00:00.000000000 +0000 @@ -1,2 +0,0 @@ -usr/lib/lib*.so.* -usr/lib/libgnome-desktop-3-10 diff -Nru gnome-desktop3-3.12.0/debian/libgnome-desktop-3-10.symbols gnome-desktop3-3.8.4/debian/libgnome-desktop-3-10.symbols --- gnome-desktop3-3.12.0/debian/libgnome-desktop-3-10.symbols 2014-03-02 05:11:24.000000000 +0000 +++ gnome-desktop3-3.8.4/debian/libgnome-desktop-3-10.symbols 1970-01-01 00:00:00.000000000 +0000 @@ -1,172 +0,0 @@ -libgnome-desktop-3.so.10 libgnome-desktop-3-10 #MINVER# - gnome_bg_changes_with_time@Base 3.2.0 - gnome_bg_create_frame_thumbnail@Base 3.2.0 - gnome_bg_create_surface@Base 3.2.0 - gnome_bg_create_thumbnail@Base 3.2.0 - gnome_bg_crossfade_get_type@Base 3.2.0 - gnome_bg_crossfade_is_started@Base 3.2.0 - gnome_bg_crossfade_new@Base 3.2.0 - gnome_bg_crossfade_set_end_surface@Base 3.2.0 - gnome_bg_crossfade_set_start_surface@Base 3.2.0 - gnome_bg_crossfade_start@Base 3.2.0 - gnome_bg_crossfade_stop@Base 3.2.0 - gnome_bg_draw@Base 3.2.0 - gnome_bg_get_color@Base 3.2.0 - gnome_bg_get_draw_background@Base 3.2.0 - gnome_bg_get_filename@Base 3.2.0 - gnome_bg_get_image_size@Base 3.2.0 - gnome_bg_get_placement@Base 3.2.0 - gnome_bg_get_surface_from_root@Base 3.2.0 - gnome_bg_get_type@Base 3.2.0 - gnome_bg_has_multiple_sizes@Base 3.2.0 - gnome_bg_is_dark@Base 3.2.0 - gnome_bg_load_from_preferences@Base 3.2.0 - gnome_bg_new@Base 3.2.0 - gnome_bg_save_to_preferences@Base 3.2.0 - gnome_bg_set_color@Base 3.2.0 - gnome_bg_set_draw_background@Base 3.2.0 - gnome_bg_set_filename@Base 3.2.0 - gnome_bg_set_placement@Base 3.2.0 - gnome_bg_set_surface_as_root@Base 3.2.0 - gnome_bg_set_surface_as_root_with_crossfade@Base 3.2.0 - gnome_bg_slide_show_get_current_slide@Base 3.7.90 - gnome_bg_slide_show_get_has_multiple_sizes@Base 3.7.90 - gnome_bg_slide_show_get_num_slides@Base 3.7.90 - gnome_bg_slide_show_get_slide@Base 3.7.90 - gnome_bg_slide_show_get_start_time@Base 3.7.90 - gnome_bg_slide_show_get_total_duration@Base 3.7.90 - gnome_bg_slide_show_get_type@Base 3.7.90 - gnome_bg_slide_show_load@Base 3.7.90 - gnome_bg_slide_show_load_async@Base 3.7.90 - gnome_bg_slide_show_new@Base 3.7.90 - gnome_desktop_thumbnail_factory_can_thumbnail@Base 3.2.0 - gnome_desktop_thumbnail_factory_create_failed_thumbnail@Base 3.2.0 - gnome_desktop_thumbnail_factory_generate_thumbnail@Base 3.2.0 - gnome_desktop_thumbnail_factory_get_type@Base 3.2.0 - gnome_desktop_thumbnail_factory_has_valid_failed_thumbnail@Base 3.2.0 - gnome_desktop_thumbnail_factory_lookup@Base 3.2.0 - gnome_desktop_thumbnail_factory_new@Base 3.2.0 - gnome_desktop_thumbnail_factory_save_thumbnail@Base 3.2.0 - gnome_desktop_thumbnail_has_uri@Base 3.2.0 - gnome_desktop_thumbnail_is_valid@Base 3.2.0 - gnome_desktop_thumbnail_md5@Base 3.2.0 - gnome_desktop_thumbnail_path_for_uri@Base 3.2.0 - gnome_desktop_thumbnail_scale_down_pixbuf@Base 3.2.0 - gnome_get_all_languages@Base 3.8.2-0ubuntu1 - gnome_get_all_locales@Base 3.7.90 - gnome_get_country_from_code@Base 3.7.90 - gnome_get_country_from_locale@Base 3.7.90 - gnome_get_input_source_from_locale@Base 3.7.90 - gnome_get_language_from_code@Base 3.7.90 - gnome_get_language_from_locale@Base 3.7.90 - gnome_idle_monitor_add_idle_watch@Base 3.7.90 - gnome_idle_monitor_add_user_active_watch@Base 3.7.90 - gnome_idle_monitor_get_idletime@Base 3.7.2 - gnome_idle_monitor_get_type@Base 3.7.2 - gnome_idle_monitor_new@Base 3.7.2 - gnome_idle_monitor_new_for_device@Base 3.7.2 - gnome_idle_monitor_remove_watch@Base 3.7.2 - gnome_language_has_translations@Base 3.7.5 - gnome_normalize_locale@Base 3.7.90 - gnome_parse_locale@Base 3.7.90 - gnome_pnp_ids_get_pnp_id@Base 3.4.0 - gnome_pnp_ids_get_type@Base 3.4.0 - gnome_pnp_ids_new@Base 3.4.0 - gnome_rr_config_applicable@Base 3.7.3 - gnome_rr_config_apply@Base 3.9.90 - gnome_rr_config_apply_persistent@Base 3.9.90 - gnome_rr_config_ensure_primary@Base 3.7.3 - gnome_rr_config_equal@Base 3.7.3 - gnome_rr_config_get_clone@Base 3.7.3 - gnome_rr_config_get_outputs@Base 3.7.3 - gnome_rr_config_get_type@Base 3.7.3 - gnome_rr_config_load_current@Base 3.7.3 - gnome_rr_config_match@Base 3.7.3 - gnome_rr_config_new_current@Base 3.7.3 - gnome_rr_config_sanitize@Base 3.7.3 - gnome_rr_config_set_clone@Base 3.7.3 - gnome_rr_crtc_can_drive_output@Base 3.7.3 - gnome_rr_crtc_get_current_mode@Base 3.7.3 - gnome_rr_crtc_get_current_rotation@Base 3.7.3 - gnome_rr_crtc_get_gamma@Base 3.7.3 - gnome_rr_crtc_get_id@Base 3.7.3 - gnome_rr_crtc_get_position@Base 3.7.3 - gnome_rr_crtc_get_rotations@Base 3.7.3 - gnome_rr_crtc_get_type@Base 3.7.3 - gnome_rr_crtc_set_gamma@Base 3.7.3 - gnome_rr_crtc_supports_rotation@Base 3.7.3 - gnome_rr_error_quark@Base 3.7.3 - gnome_rr_mode_get_freq@Base 3.7.3 - gnome_rr_mode_get_height@Base 3.7.3 - gnome_rr_mode_get_id@Base 3.7.3 - gnome_rr_mode_get_type@Base 3.7.3 - gnome_rr_mode_get_width@Base 3.7.3 - gnome_rr_output_can_clone@Base 3.7.3 - gnome_rr_output_get_backlight@Base 3.7.3 - gnome_rr_output_get_crtc@Base 3.7.3 - gnome_rr_output_get_current_mode@Base 3.7.3 - gnome_rr_output_get_display_name@Base 3.7.90 - gnome_rr_output_get_edid_data@Base 3.7.3 - gnome_rr_output_get_id@Base 3.7.3 - gnome_rr_output_get_ids_from_edid@Base 3.7.3 - gnome_rr_output_get_is_primary@Base 3.7.3 - gnome_rr_output_get_name@Base 3.7.3 - gnome_rr_output_get_min_backlight_step@Base 3.11.1 - gnome_rr_output_get_physical_size@Base 3.9.90 - gnome_rr_output_get_position@Base 3.7.3 - gnome_rr_output_get_preferred_mode@Base 3.7.3 - gnome_rr_output_get_type@Base 3.7.3 - gnome_rr_output_info_get_aspect_ratio@Base 3.7.3 - gnome_rr_output_info_get_display_name@Base 3.7.3 - gnome_rr_output_info_get_geometry@Base 3.7.3 - gnome_rr_output_info_get_name@Base 3.7.3 - gnome_rr_output_info_get_preferred_height@Base 3.7.3 - gnome_rr_output_info_get_preferred_width@Base 3.7.3 - gnome_rr_output_info_get_primary@Base 3.7.3 - gnome_rr_output_info_get_product@Base 3.7.3 - gnome_rr_output_info_get_refresh_rate@Base 3.7.3 - gnome_rr_output_info_get_rotation@Base 3.7.3 - gnome_rr_output_info_get_serial@Base 3.7.3 - gnome_rr_output_info_get_type@Base 3.7.3 - gnome_rr_output_info_get_vendor@Base 3.7.3 - gnome_rr_output_info_is_active@Base 3.7.3 - gnome_rr_output_info_is_connected@Base 3.7.3 - gnome_rr_output_info_set_active@Base 3.7.3 - gnome_rr_output_info_set_geometry@Base 3.7.3 - gnome_rr_output_info_set_primary@Base 3.7.3 - gnome_rr_output_info_set_refresh_rate@Base 3.7.3 - gnome_rr_output_info_set_rotation@Base 3.7.3 - gnome_rr_output_info_supports_rotation@Base 3.11.4 - gnome_rr_output_is_builtin_display@Base 3.9.0 - gnome_rr_output_list_modes@Base 3.7.3 - gnome_rr_output_set_backlight@Base 3.7.3 - gnome_rr_output_supports_mode@Base 3.7.3 - gnome_rr_screen_get_crtc_by_id@Base 3.7.3 - gnome_rr_screen_get_dpms_mode@Base 3.7.3 - gnome_rr_screen_get_output_by_id@Base 3.7.3 - gnome_rr_screen_get_output_by_name@Base 3.7.3 - gnome_rr_screen_get_ranges@Base 3.7.3 - gnome_rr_screen_get_type@Base 3.7.3 - gnome_rr_screen_list_clone_modes@Base 3.7.3 - gnome_rr_screen_list_crtcs@Base 3.7.3 - gnome_rr_screen_list_modes@Base 3.7.3 - gnome_rr_screen_list_outputs@Base 3.7.3 - gnome_rr_screen_new@Base 3.7.3 - gnome_rr_screen_new_async@Base 3.9.90 - gnome_rr_screen_new_finish@Base 3.9.90 - gnome_rr_screen_refresh@Base 3.7.3 - gnome_rr_screen_set_dpms_mode@Base 3.7.3 - gnome_wall_clock_get_clock@Base 3.2.0 - gnome_wall_clock_get_timezone@Base 3.7.90 - gnome_wall_clock_get_type@Base 3.2.0 - gnome_wall_clock_new@Base 3.7.90 - gnome_xkb_info_description_for_group@Base 3.7.2 - gnome_xkb_info_description_for_option@Base 3.5.90 - gnome_xkb_info_get_all_layouts@Base 3.5.2 - gnome_xkb_info_get_all_option_groups@Base 3.5.90 - gnome_xkb_info_get_layout_info@Base 3.5.2 - gnome_xkb_info_get_layouts_for_country@Base 3.7.90 - gnome_xkb_info_get_layouts_for_language@Base 3.7.90 - gnome_xkb_info_get_options_for_group@Base 3.5.90 - gnome_xkb_info_get_type@Base 3.5.2 - gnome_xkb_info_new@Base 3.5.2 diff -Nru gnome-desktop3-3.12.0/debian/libgnome-desktop-3-7.install gnome-desktop3-3.8.4/debian/libgnome-desktop-3-7.install --- gnome-desktop3-3.12.0/debian/libgnome-desktop-3-7.install 1970-01-01 00:00:00.000000000 +0000 +++ gnome-desktop3-3.8.4/debian/libgnome-desktop-3-7.install 2014-03-17 04:30:24.000000000 +0000 @@ -0,0 +1,2 @@ +usr/lib/lib*.so.* +usr/lib/libgnome-desktop-3-7 diff -Nru gnome-desktop3-3.12.0/debian/libgnome-desktop-3-7.symbols gnome-desktop3-3.8.4/debian/libgnome-desktop-3-7.symbols --- gnome-desktop3-3.12.0/debian/libgnome-desktop-3-7.symbols 1970-01-01 00:00:00.000000000 +0000 +++ gnome-desktop3-3.8.4/debian/libgnome-desktop-3-7.symbols 2014-03-17 04:30:24.000000000 +0000 @@ -0,0 +1,184 @@ +libgnome-desktop-3.so.7 libgnome-desktop-3-7 #MINVER# + gnome_bg_changes_with_time@Base 3.2.0 + gnome_bg_create_frame_thumbnail@Base 3.2.0 + gnome_bg_create_surface@Base 3.2.0 + gnome_bg_create_thumbnail@Base 3.2.0 + gnome_bg_crossfade_get_type@Base 3.2.0 + gnome_bg_crossfade_is_started@Base 3.2.0 + gnome_bg_crossfade_new@Base 3.2.0 + gnome_bg_crossfade_set_end_surface@Base 3.2.0 + gnome_bg_crossfade_set_start_surface@Base 3.2.0 + gnome_bg_crossfade_start@Base 3.2.0 + gnome_bg_crossfade_stop@Base 3.2.0 + gnome_bg_draw@Base 3.2.0 + gnome_bg_get_color@Base 3.2.0 + gnome_bg_get_draw_background@Base 3.2.0 + gnome_bg_get_filename@Base 3.2.0 + gnome_bg_get_image_size@Base 3.2.0 + gnome_bg_get_placement@Base 3.2.0 + gnome_bg_get_surface_from_root@Base 3.2.0 + gnome_bg_get_type@Base 3.2.0 + gnome_bg_has_multiple_sizes@Base 3.2.0 + gnome_bg_is_dark@Base 3.2.0 + gnome_bg_load_from_preferences@Base 3.2.0 + gnome_bg_new@Base 3.2.0 + gnome_bg_save_to_preferences@Base 3.2.0 + gnome_bg_set_color@Base 3.2.0 + gnome_bg_set_draw_background@Base 3.2.0 + gnome_bg_set_filename@Base 3.2.0 + gnome_bg_set_placement@Base 3.2.0 + gnome_bg_set_surface_as_root@Base 3.2.0 + gnome_bg_set_surface_as_root_with_crossfade@Base 3.2.0 + gnome_bg_slide_show_get_current_slide@Base 3.7.90 + gnome_bg_slide_show_get_has_multiple_sizes@Base 3.7.90 + gnome_bg_slide_show_get_num_slides@Base 3.7.90 + gnome_bg_slide_show_get_slide@Base 3.7.90 + gnome_bg_slide_show_get_start_time@Base 3.7.90 + gnome_bg_slide_show_get_total_duration@Base 3.7.90 + gnome_bg_slide_show_get_type@Base 3.7.90 + gnome_bg_slide_show_load@Base 3.7.90 + gnome_bg_slide_show_load_async@Base 3.7.90 + gnome_bg_slide_show_new@Base 3.7.90 + gnome_desktop_thumbnail_factory_can_thumbnail@Base 3.2.0 + gnome_desktop_thumbnail_factory_create_failed_thumbnail@Base 3.2.0 + gnome_desktop_thumbnail_factory_generate_thumbnail@Base 3.2.0 + gnome_desktop_thumbnail_factory_get_type@Base 3.2.0 + gnome_desktop_thumbnail_factory_has_valid_failed_thumbnail@Base 3.2.0 + gnome_desktop_thumbnail_factory_lookup@Base 3.2.0 + gnome_desktop_thumbnail_factory_new@Base 3.2.0 + gnome_desktop_thumbnail_factory_save_thumbnail@Base 3.2.0 + gnome_desktop_thumbnail_has_uri@Base 3.2.0 + gnome_desktop_thumbnail_is_valid@Base 3.2.0 + gnome_desktop_thumbnail_md5@Base 3.2.0 + gnome_desktop_thumbnail_path_for_uri@Base 3.2.0 + gnome_desktop_thumbnail_scale_down_pixbuf@Base 3.2.0 + gnome_get_all_languages@Base 3.8.2 + gnome_get_all_locales@Base 3.7.90 + gnome_get_country_from_code@Base 3.7.90 + gnome_get_country_from_locale@Base 3.7.90 + gnome_get_input_source_from_locale@Base 3.7.90 + gnome_get_language_from_code@Base 3.7.90 + gnome_get_language_from_locale@Base 3.7.90 + gnome_idle_monitor_add_idle_watch@Base 3.7.90 + gnome_idle_monitor_add_user_active_watch@Base 3.7.90 + gnome_idle_monitor_get_idletime@Base 3.7.2 + gnome_idle_monitor_get_type@Base 3.7.2 + gnome_idle_monitor_new@Base 3.7.2 + gnome_idle_monitor_new_for_device@Base 3.7.2 + gnome_idle_monitor_remove_watch@Base 3.7.2 + gnome_language_has_translations@Base 3.7.5 + gnome_normalize_locale@Base 3.7.90 + gnome_parse_locale@Base 3.7.90 + gnome_pnp_ids_get_pnp_id@Base 3.4.0 + gnome_pnp_ids_get_type@Base 3.4.0 + gnome_pnp_ids_new@Base 3.4.0 + gnome_rr_config_applicable@Base 3.7.3 + gnome_rr_config_apply_from_filename_with_time@Base 3.7.3 + gnome_rr_config_apply_with_time@Base 3.7.3 + gnome_rr_config_ensure_primary@Base 3.7.3 + gnome_rr_config_equal@Base 3.7.3 + gnome_rr_config_get_backup_filename@Base 3.7.3 + gnome_rr_config_get_clone@Base 3.7.3 + gnome_rr_config_get_intended_filename@Base 3.7.3 + gnome_rr_config_get_outputs@Base 3.7.3 + gnome_rr_config_get_type@Base 3.7.3 + gnome_rr_config_load_current@Base 3.7.3 + gnome_rr_config_load_filename@Base 3.7.3 + gnome_rr_config_match@Base 3.7.3 + gnome_rr_config_new_current@Base 3.7.3 + gnome_rr_config_new_stored@Base 3.7.3 + gnome_rr_config_sanitize@Base 3.7.3 + gnome_rr_config_save@Base 3.7.3 + gnome_rr_config_set_clone@Base 3.7.3 + gnome_rr_crtc_can_drive_output@Base 3.7.3 + gnome_rr_crtc_get_current_mode@Base 3.7.3 + gnome_rr_crtc_get_current_rotation@Base 3.7.3 + gnome_rr_crtc_get_gamma@Base 3.7.3 + gnome_rr_crtc_get_id@Base 3.7.3 + gnome_rr_crtc_get_position@Base 3.7.3 + gnome_rr_crtc_get_rotations@Base 3.7.3 + gnome_rr_crtc_get_type@Base 3.7.3 + gnome_rr_crtc_set_config_with_time@Base 3.7.3 + gnome_rr_crtc_set_gamma@Base 3.7.3 + gnome_rr_crtc_supports_rotation@Base 3.7.3 + gnome_rr_error_quark@Base 3.7.3 + gnome_rr_mode_get_freq@Base 3.7.3 + gnome_rr_mode_get_height@Base 3.7.3 + gnome_rr_mode_get_id@Base 3.7.3 + gnome_rr_mode_get_type@Base 3.7.3 + gnome_rr_mode_get_width@Base 3.7.3 + gnome_rr_output_can_clone@Base 3.7.3 + gnome_rr_output_get_backlight@Base 3.7.3 + gnome_rr_output_get_backlight_max@Base 3.7.3 + gnome_rr_output_get_backlight_min@Base 3.7.3 + gnome_rr_output_get_connector_type@Base 3.7.3 + gnome_rr_output_get_crtc@Base 3.7.3 + gnome_rr_output_get_current_mode@Base 3.7.3 + gnome_rr_output_get_display_name@Base 3.7.90 + gnome_rr_output_get_edid_data@Base 3.7.3 + gnome_rr_output_get_height_mm@Base 3.7.3 + gnome_rr_output_get_id@Base 3.7.3 + gnome_rr_output_get_ids_from_edid@Base 3.7.3 + gnome_rr_output_get_is_primary@Base 3.7.3 + gnome_rr_output_get_name@Base 3.7.3 + gnome_rr_output_get_position@Base 3.7.3 + gnome_rr_output_get_preferred_mode@Base 3.7.3 + gnome_rr_output_get_type@Base 3.7.3 + gnome_rr_output_get_width_mm@Base 3.7.3 + gnome_rr_output_info_get_aspect_ratio@Base 3.7.3 + gnome_rr_output_info_get_display_name@Base 3.7.3 + gnome_rr_output_info_get_geometry@Base 3.7.3 + gnome_rr_output_info_get_name@Base 3.7.3 + gnome_rr_output_info_get_preferred_height@Base 3.7.3 + gnome_rr_output_info_get_preferred_width@Base 3.7.3 + gnome_rr_output_info_get_primary@Base 3.7.3 + gnome_rr_output_info_get_product@Base 3.7.3 + gnome_rr_output_info_get_refresh_rate@Base 3.7.3 + gnome_rr_output_info_get_rotation@Base 3.7.3 + gnome_rr_output_info_get_serial@Base 3.7.3 + gnome_rr_output_info_get_type@Base 3.7.3 + gnome_rr_output_info_get_vendor@Base 3.7.3 + gnome_rr_output_info_is_active@Base 3.7.3 + gnome_rr_output_info_is_connected@Base 3.7.3 + gnome_rr_output_info_set_active@Base 3.7.3 + gnome_rr_output_info_set_geometry@Base 3.7.3 + gnome_rr_output_info_set_primary@Base 3.7.3 + gnome_rr_output_info_set_refresh_rate@Base 3.7.3 + gnome_rr_output_info_set_rotation@Base 3.7.3 + gnome_rr_output_is_connected@Base 3.7.3 + gnome_rr_output_is_laptop@Base 3.7.3 + gnome_rr_output_list_modes@Base 3.7.3 + gnome_rr_output_set_backlight@Base 3.7.3 + gnome_rr_output_supports_mode@Base 3.7.3 + gnome_rr_screen_get_crtc_by_id@Base 3.7.3 + gnome_rr_screen_get_dpms_mode@Base 3.7.3 + gnome_rr_screen_get_output_by_id@Base 3.7.3 + gnome_rr_screen_get_output_by_name@Base 3.7.3 + gnome_rr_screen_get_ranges@Base 3.7.3 + gnome_rr_screen_get_timestamps@Base 3.7.3 + gnome_rr_screen_get_type@Base 3.7.3 + gnome_rr_screen_list_clone_modes@Base 3.7.3 + gnome_rr_screen_list_crtcs@Base 3.7.3 + gnome_rr_screen_list_modes@Base 3.7.3 + gnome_rr_screen_list_outputs@Base 3.7.3 + gnome_rr_screen_new@Base 3.7.3 + gnome_rr_screen_refresh@Base 3.7.3 + gnome_rr_screen_set_dpms_mode@Base 3.7.3 + gnome_rr_screen_set_primary_output@Base 3.7.3 + gnome_rr_screen_set_size@Base 3.7.3 + gnome_wall_clock_get_clock@Base 3.2.0 + gnome_wall_clock_get_timezone@Base 3.7.90 + gnome_wall_clock_get_type@Base 3.2.0 + gnome_wall_clock_new@Base 3.7.90 + gnome_xkb_info_description_for_group@Base 3.7.2 + gnome_xkb_info_description_for_option@Base 3.5.90 + gnome_xkb_info_free_var_defs@Base 3.5.2 + gnome_xkb_info_get_all_layouts@Base 3.5.2 + gnome_xkb_info_get_all_option_groups@Base 3.5.90 + gnome_xkb_info_get_layout_info@Base 3.5.2 + gnome_xkb_info_get_layouts_for_country@Base 3.7.90 + gnome_xkb_info_get_layouts_for_language@Base 3.7.90 + gnome_xkb_info_get_options_for_group@Base 3.5.90 + gnome_xkb_info_get_type@Base 3.5.2 + gnome_xkb_info_get_var_defs@Base 3.5.2 + gnome_xkb_info_new@Base 3.5.2 diff -Nru gnome-desktop3-3.12.0/debian/patches/02_refuse_to_break_GL_compositors.patch gnome-desktop3-3.8.4/debian/patches/02_refuse_to_break_GL_compositors.patch --- gnome-desktop3-3.12.0/debian/patches/02_refuse_to_break_GL_compositors.patch 2013-08-24 06:28:14.000000000 +0000 +++ gnome-desktop3-3.8.4/debian/patches/02_refuse_to_break_GL_compositors.patch 2014-03-17 04:30:24.000000000 +0000 @@ -2,8 +2,10 @@ Bug-Ubuntu: https://launchpad.net/bugs/824099 === modified file 'libgnome-desktop/gnome-rr-config.c' ---- a/libgnome-desktop/gnome-rr-config.c -+++ b/libgnome-desktop/gnome-rr-config.c +Index: gnome-desktop3-3.8.2/libgnome-desktop/gnome-rr-config.c +=================================================================== +--- gnome-desktop3-3.8.2.orig/libgnome-desktop/gnome-rr-config.c 2013-05-25 11:00:14.920199433 -0400 ++++ gnome-desktop3-3.8.2/libgnome-desktop/gnome-rr-config.c 2013-05-25 11:00:14.916199433 -0400 @@ -36,6 +36,10 @@ #include #include @@ -15,7 +17,7 @@ #include "gnome-rr-config.h" #include "edid.h" -@@ -1040,6 +1044,121 @@ +@@ -1805,6 +1809,121 @@ g_list_free (active_crtcs); } @@ -135,9 +137,9 @@ +} + static CrtcAssignment * - crtc_assignment_new (GnomeRRScreen *screen, - GnomeRROutputInfo **outputs, -@@ -1055,6 +1174,7 @@ + crtc_assignment_new (GnomeRRScreen *screen, GnomeRROutputInfo **outputs, GError **error) + { +@@ -1817,6 +1936,7 @@ { int width, height; int min_width, max_width, min_height, max_height; @@ -145,7 +147,7 @@ get_required_virtual_size (assignment, &width, &height); -@@ -1076,6 +1196,29 @@ +@@ -1838,6 +1958,29 @@ goto fail; } @@ -175,8 +177,10 @@ assignment->screen = screen; return assignment; ---- a/configure.ac -+++ b/configure.ac +Index: gnome-desktop3-3.8.2/configure.ac +=================================================================== +--- gnome-desktop3-3.8.2.orig/configure.ac 2013-05-25 11:00:14.920199433 -0400 ++++ gnome-desktop3-3.8.2/configure.ac 2013-05-25 11:00:14.920199433 -0400 @@ -143,6 +143,8 @@ AC_SUBST(XLIB_CFLAGS) AC_SUBST(XLIB_LIBS) @@ -186,8 +190,10 @@ dnl pkg-config dependency checks PKG_CHECK_MODULES(GNOME_DESKTOP, gdk-pixbuf-2.0 >= $GDK_PIXBUF_REQUIRED ---- a/libgnome-desktop/Makefile.am -+++ b/libgnome-desktop/Makefile.am +Index: gnome-desktop3-3.8.2/libgnome-desktop/Makefile.am +=================================================================== +--- gnome-desktop3-3.8.2.orig/libgnome-desktop/Makefile.am 2013-05-25 11:00:14.920199433 -0400 ++++ gnome-desktop3-3.8.2/libgnome-desktop/Makefile.am 2013-05-25 11:00:14.920199433 -0400 @@ -13,6 +13,7 @@ -DISO_CODES_PREFIX=\""$(ISO_CODES_PREFIX)"\" \ -DLIBLOCALEDIR=\""$(prefix)/lib/locale"\" \ @@ -196,7 +202,7 @@ -DXKB_BASE=\""$(XKB_BASE)"\" \ $(DISABLE_DEPRECATED_CFLAGS) -@@ -76,6 +77,14 @@ +@@ -64,6 +65,14 @@ pkgconfigdir = $(libdir)/pkgconfig pkgconfig_DATA = gnome-desktop-3.0.pc @@ -211,7 +217,7 @@ libgnome_desktopdir = $(includedir)/gnome-desktop-3.0/libgnome-desktop libgnome_desktop_HEADERS = \ gnome-bg.h \ -@@ -139,6 +148,7 @@ +@@ -126,6 +135,7 @@ pnp.ids libexec_PROGRAMS = \ @@ -219,8 +225,10 @@ gnome-rr-debug gnome_rr_debug_SOURCES = \ ---- /dev/null -+++ b/libgnome-desktop/check_gl_texture_size.c +Index: gnome-desktop3-3.8.2/libgnome-desktop/check_gl_texture_size.c +=================================================================== +--- /dev/null 1970-01-01 00:00:00.000000000 +0000 ++++ gnome-desktop3-3.8.2/libgnome-desktop/check_gl_texture_size.c 2013-05-25 11:00:14.920199433 -0400 @@ -0,0 +1,86 @@ +#include +#include diff -Nru gnome-desktop3-3.12.0/debian/patches/backlight-property-name.patch gnome-desktop3-3.8.4/debian/patches/backlight-property-name.patch --- gnome-desktop3-3.12.0/debian/patches/backlight-property-name.patch 1970-01-01 00:00:00.000000000 +0000 +++ gnome-desktop3-3.8.4/debian/patches/backlight-property-name.patch 2014-03-17 04:30:24.000000000 +0000 @@ -0,0 +1,35 @@ +Description: Use the corrent backlight property name as specified in http://cgit.freedesktop.org/xorg/proto/randrproto/tree/randrproto.txt section 9.1 +Author: Robert Ancell +Bug: https://bugs.launchpad.net/bugs/947919 + +Index: gnome-desktop3-3.8.4/libgnome-desktop/gnome-rr.c +=================================================================== +--- gnome-desktop3-3.8.4.orig/libgnome-desktop/gnome-rr.c 2014-02-04 12:25:02.196794500 +0000 ++++ gnome-desktop3-3.8.4/libgnome-desktop/gnome-rr.c 2014-02-04 12:25:57.388793974 +0000 +@@ -1530,7 +1530,7 @@ + XRRPropertyInfo *info; + + gdk_error_trap_push (); +- atom = XInternAtom (DISPLAY (output), "BACKLIGHT", FALSE); ++ atom = XInternAtom (DISPLAY (output), "Backlight", FALSE); + info = XRRQueryOutputProperty (DISPLAY (output), output->id, atom); + rc = gdk_error_trap_pop (); + if (rc != Success) +@@ -1844,7 +1844,7 @@ + g_return_val_if_fail (output != NULL, -1); + + gdk_error_trap_push (); +- atom = XInternAtom (DISPLAY (output), "BACKLIGHT", FALSE); ++ atom = XInternAtom (DISPLAY (output), "Backlight", FALSE); + retval = XRRGetOutputProperty (DISPLAY (output), output->id, atom, + 0, 4, False, False, None, + &actual_type, &actual_format, +@@ -1914,7 +1914,7 @@ + + /* don't abort on error */ + gdk_error_trap_push (); +- atom = XInternAtom (DISPLAY (output), "BACKLIGHT", FALSE); ++ atom = XInternAtom (DISPLAY (output), "Backlight", FALSE); + XRRChangeOutputProperty (DISPLAY (output), output->id, atom, + XA_INTEGER, 32, PropModeReplace, + (unsigned char *) &value, 1); diff -Nru gnome-desktop3-3.12.0/debian/patches/fixes/0093-GnomeRR-fix-gnome-rr-debug-test-case.patch gnome-desktop3-3.8.4/debian/patches/fixes/0093-GnomeRR-fix-gnome-rr-debug-test-case.patch --- gnome-desktop3-3.12.0/debian/patches/fixes/0093-GnomeRR-fix-gnome-rr-debug-test-case.patch 1970-01-01 00:00:00.000000000 +0000 +++ gnome-desktop3-3.8.4/debian/patches/fixes/0093-GnomeRR-fix-gnome-rr-debug-test-case.patch 2014-06-25 13:52:27.000000000 +0000 @@ -0,0 +1,114 @@ +From 65b69264c2b6d54bede4f3747fb5f1440c4a9662 Mon Sep 17 00:00:00 2001 +From: Giovanni Campagna +Date: Sat, 17 Aug 2013 12:35:58 +0200 +Subject: [PATCH 093/215] GnomeRR: fix gnome-rr-debug test case + +Use GnomeRR facilities to read the EDID instead of direct X access, +because the actual XID is not exposed in the API (although it is +exported on the bus) + +https://bugzilla.gnome.org/show_bug.cgi?id=705510 +--- + libgnome-desktop/gnome-rr-debug.c | 60 ++------------------------------------- + 1 file changed, 2 insertions(+), 58 deletions(-) + +diff --git a/libgnome-desktop/gnome-rr-debug.c b/libgnome-desktop/gnome-rr-debug.c +index 0395ecc..21995d8 100644 +--- a/libgnome-desktop/gnome-rr-debug.c ++++ b/libgnome-desktop/gnome-rr-debug.c +@@ -24,52 +24,15 @@ + #include + #include + #include +-#include +-#include + +-/** +- * get_property: +- **/ +-static guint8 * +-get_property (Display *dpy, +- RROutput output, +- Atom atom, +- gsize *len) +-{ +- unsigned char *prop; +- int actual_format; +- unsigned long nitems, bytes_after; +- Atom actual_type; +- guint8 *result = NULL; +- +- XRRGetOutputProperty (dpy, output, atom, +- 0, 100, False, False, +- AnyPropertyType, +- &actual_type, &actual_format, +- &nitems, &bytes_after, &prop); +- +- if (actual_type == XA_INTEGER && actual_format == 8) { +- result = g_memdup (prop, nitems); +- if (len) +- *len = nitems; +- } +- XFree (prop); +- return result; +-} +- +-/** +- * main: +- **/ + int + main (int argc, char *argv[]) + { +- Atom edid_atom; +- Display *display; + GError *error = NULL; + GnomeRROutput **outputs; + GnomeRRScreen *screen; + gsize len = 0; +- guint8 *result = NULL; ++ const guint8 *result = NULL; + guint i; + + gtk_init (&argc, &argv); +@@ -79,7 +42,6 @@ main (int argc, char *argv[]) + g_error_free (error); + goto out; + } +- display = GDK_SCREEN_XDISPLAY (gdk_screen_get_default ()); + outputs = gnome_rr_screen_list_outputs (screen); + for (i = 0; outputs[i] != NULL; i++) { + g_print ("[%s]\n", gnome_rr_output_get_name (outputs[i])); +@@ -89,29 +51,11 @@ main (int argc, char *argv[]) + g_print ("\tid: %i\n", gnome_rr_output_get_id (outputs[i])); + + /* get EDID (first try) */ +- edid_atom = XInternAtom (display, "EDID", FALSE); +- result = get_property (display, +- gnome_rr_output_get_id (outputs[i]), +- edid_atom, +- &len); ++ result = gnome_rr_output_get_edid_data (outputs[i], &len); + if (result != NULL) { + g_print ("\tedid: %" G_GSIZE_FORMAT " bytes [%i:%i:%i:%i]\n", + len, result[0], result[1], + result[2], result[3]); +- g_free (result); +- } +- +- /* get EDID (second try) */ +- edid_atom = XInternAtom (display, "EDID_DATA", FALSE); +- result = get_property (display, +- gnome_rr_output_get_id (outputs[i]), +- edid_atom, +- &len); +- if (result != NULL) { +- g_print ("\tedid2: %" G_GSIZE_FORMAT " bytes [%i:%i:%i:%i]\n", +- len, result[0], result[1], +- result[2], result[3]); +- g_free (result); + } + } + out: +-- +2.0.0 + diff -Nru gnome-desktop3-3.12.0/debian/patches/fixes/0168-gnome-bg-Fix-memory-leaks-when-using-get_as_slidesho.patch gnome-desktop3-3.8.4/debian/patches/fixes/0168-gnome-bg-Fix-memory-leaks-when-using-get_as_slidesho.patch --- gnome-desktop3-3.12.0/debian/patches/fixes/0168-gnome-bg-Fix-memory-leaks-when-using-get_as_slidesho.patch 1970-01-01 00:00:00.000000000 +0000 +++ gnome-desktop3-3.8.4/debian/patches/fixes/0168-gnome-bg-Fix-memory-leaks-when-using-get_as_slidesho.patch 2014-06-25 14:12:14.000000000 +0000 @@ -0,0 +1,49 @@ +From af0f0fbb835e5bb22b7bce4581d3f081462b5f5b Mon Sep 17 00:00:00 2001 +From: Bastien Nocera +Date: Wed, 2 Oct 2013 16:35:44 +0200 +Subject: [PATCH 168/215] gnome-bg: Fix memory leaks when using + get_as_slideshow() + +get_as_slideshow() returns a reference to the slideshow, +which we need to get rid of when we're not using it anymore. + +https://bugzilla.gnome.org/show_bug.cgi?id=709271 +--- + libgnome-desktop/gnome-bg.c | 11 ++++++++--- + 1 file changed, 8 insertions(+), 3 deletions(-) + +--- a/libgnome-desktop/gnome-bg.c ++++ b/libgnome-desktop/gnome-bg.c +@@ -1267,6 +1267,8 @@ + } + + gnome_bg_slide_show_get_current_slide (show, best_width, best_height, NULL, NULL, NULL, &file, NULL); ++ g_object_unref (show); ++ + return file; + } + +@@ -2777,6 +2779,7 @@ + gnome_bg_changes_with_time (GnomeBG *bg) + { + GnomeBGSlideShow *show; ++ gboolean ret = FALSE; + + g_return_val_if_fail (bg != NULL, FALSE); + +@@ -2784,10 +2787,12 @@ + return FALSE; + + show = get_as_slideshow (bg, bg->filename); +- if (show) +- return gnome_bg_slide_show_get_num_slides (show) > 1; ++ if (show) { ++ ret = gnome_bg_slide_show_get_num_slides (show) > 1; ++ g_object_unref (show); ++ } + +- return FALSE; ++ return ret; + } + + /** diff -Nru gnome-desktop3-3.12.0/debian/patches/fixes/0169-gnome-bg-slideshow-Fix-memory-leak-of-a-filename.patch gnome-desktop3-3.8.4/debian/patches/fixes/0169-gnome-bg-slideshow-Fix-memory-leak-of-a-filename.patch --- gnome-desktop3-3.12.0/debian/patches/fixes/0169-gnome-bg-slideshow-Fix-memory-leak-of-a-filename.patch 1970-01-01 00:00:00.000000000 +0000 +++ gnome-desktop3-3.8.4/debian/patches/fixes/0169-gnome-bg-slideshow-Fix-memory-leak-of-a-filename.patch 2014-06-25 13:52:27.000000000 +0000 @@ -0,0 +1,26 @@ +From dfc4ecac06eed41cd655e48ba01a7842409c3ad1 Mon Sep 17 00:00:00 2001 +From: Bastien Nocera +Date: Wed, 2 Oct 2013 16:36:32 +0200 +Subject: [PATCH 169/215] gnome-bg-slideshow: Fix memory leak of a filename + +https://bugzilla.gnome.org/show_bug.cgi?id=709271 +--- + libgnome-desktop/gnome-bg-slide-show.c | 2 ++ + 1 file changed, 2 insertions(+) + +diff --git a/libgnome-desktop/gnome-bg-slide-show.c b/libgnome-desktop/gnome-bg-slide-show.c +index 0d38ddf..c96c271 100644 +--- a/libgnome-desktop/gnome-bg-slide-show.c ++++ b/libgnome-desktop/gnome-bg-slide-show.c +@@ -166,6 +166,8 @@ gnome_bg_slide_show_finalize (GObject *object) + + g_list_foreach (self->priv->stack->head, (GFunc) g_free, NULL); + g_queue_free (self->priv->stack); ++ ++ g_free (self->priv->filename); + } + + static void +-- +2.0.0 + diff -Nru gnome-desktop3-3.12.0/debian/patches/fixes/0175-thumbnailer-Fix-a-signed-unsigned-comparison.patch gnome-desktop3-3.8.4/debian/patches/fixes/0175-thumbnailer-Fix-a-signed-unsigned-comparison.patch --- gnome-desktop3-3.12.0/debian/patches/fixes/0175-thumbnailer-Fix-a-signed-unsigned-comparison.patch 1970-01-01 00:00:00.000000000 +0000 +++ gnome-desktop3-3.8.4/debian/patches/fixes/0175-thumbnailer-Fix-a-signed-unsigned-comparison.patch 2014-06-25 14:12:42.000000000 +0000 @@ -0,0 +1,26 @@ +From 40ecc92f964540d4475febd96a7663f68fbdc3b1 Mon Sep 17 00:00:00 2001 +From: Philip Withnall +Date: Thu, 10 Oct 2013 14:21:46 +0100 +Subject: [PATCH 175/215] thumbnailer: Fix a signed/unsigned comparison +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +This shuts up a gcc warning but shouldn’t result in functional changes. + +https://bugzilla.gnome.org/show_bug.cgi?id=709819 +--- + libgnome-desktop/gnome-desktop-thumbnail.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +--- a/libgnome-desktop/gnome-desktop-thumbnail.c ++++ b/libgnome-desktop/gnome-desktop-thumbnail.c +@@ -339,7 +339,7 @@ + { + gboolean result; + guchar buffer[LOAD_BUFFER_SIZE]; +- gsize bytes_read; ++ gssize bytes_read; + GdkPixbufLoader *loader = NULL; + GdkPixbuf *pixbuf; + GdkPixbufAnimation *animation; diff -Nru gnome-desktop3-3.12.0/debian/patches/git_fileutil-Handle-recent-and-trash-URIs.patch gnome-desktop3-3.8.4/debian/patches/git_fileutil-Handle-recent-and-trash-URIs.patch --- gnome-desktop3-3.12.0/debian/patches/git_fileutil-Handle-recent-and-trash-URIs.patch 2013-09-20 18:33:07.000000000 +0000 +++ gnome-desktop3-3.8.4/debian/patches/git_fileutil-Handle-recent-and-trash-URIs.patch 1970-01-01 00:00:00.000000000 +0000 @@ -1,64 +0,0 @@ -From c20b38e1197700db940d3be3805d2fbcce3e465b Mon Sep 17 00:00:00 2001 -From: Bastien Nocera -Date: Fri, 20 Sep 2013 12:59:23 +0200 -Subject: [PATCH] fileutil: Handle recent: and trash: URIs - -The gs_file_get_path_cached() was rather brittle in its handling -of URIs. It would assert() when a GFile didn't have a backing path -(such as when handling trash: or recent: URIs), and didn't know -how to get the target URI for those items either. - -Make sure that we do not assert() when a backing path cannot be -found, and handle recent: and trash: URIs. - -https://bugzilla.gnome.org/show_bug.cgi?id=708435 ---- - gsystem-file-utils.c | 26 ++++++++++++++++++++++++-- - 1 file changed, 24 insertions(+), 2 deletions(-) - -diff --git a/gsystem-file-utils.c b/gsystem-file-utils.c -index 18b7bc1..7894aee 100644 ---- a/libgnome-desktop/libgsystem/gsystem-file-utils.c -+++ b/libgnome-desktop/libgsystem/gsystem-file-utils.c -@@ -762,6 +762,23 @@ gs_file_linkcopy_sync_data (GFile *src, - return linkcopy_internal (src, dest, flags, TRUE, cancellable, error); - } - -+static char * -+gs_file_get_target_path (GFile *file) -+{ -+ GFileInfo *info; -+ const char *target; -+ char *path; -+ -+ info = g_file_query_info (file, G_FILE_ATTRIBUTE_STANDARD_TARGET_URI, G_FILE_QUERY_INFO_NONE, NULL, NULL); -+ if (info == NULL) -+ return NULL; -+ target = g_file_info_get_attribute_string (info, G_FILE_ATTRIBUTE_STANDARD_TARGET_URI); -+ path = g_filename_from_uri (target, NULL, NULL); -+ g_object_unref (info); -+ -+ return path; -+} -+ - G_LOCK_DEFINE_STATIC (pathname_cache); - - /** -@@ -784,8 +801,13 @@ gs_file_get_path_cached (GFile *file) - path = g_object_get_qdata ((GObject*)file, _file_path_quark); - if (!path) - { -- path = g_file_get_path (file); -- g_assert (path != NULL); -+ if (g_file_has_uri_scheme (file, "trash") || -+ g_file_has_uri_scheme (file, "recent")) -+ path = gs_file_get_target_path (file); -+ else -+ path = g_file_get_path (file); -+ if (path == NULL) -+ return NULL; - g_object_set_qdata_full ((GObject*)file, _file_path_quark, (char*)path, (GDestroyNotify)g_free); - } - --- -1.8.3.1 diff -Nru gnome-desktop3-3.12.0/debian/patches/git_no_filename_warning.patch gnome-desktop3-3.8.4/debian/patches/git_no_filename_warning.patch --- gnome-desktop3-3.12.0/debian/patches/git_no_filename_warning.patch 1970-01-01 00:00:00.000000000 +0000 +++ gnome-desktop3-3.8.4/debian/patches/git_no_filename_warning.patch 2014-03-17 04:30:24.000000000 +0000 @@ -0,0 +1,27 @@ +From e19df898281f83aa6db3d8fe57c720b29d98abee Mon Sep 17 00:00:00 2001 +From: Sebastien Bacher +Date: Tue, 11 Jun 2013 18:23:26 +0200 +Subject: [PATCH] gnome-bg: objects without a filename are not slideshows + +https://bugzilla.gnome.org/show_bug.cgi?id=702010 +--- + libgnome-desktop/gnome-bg.c | 3 +++ + 1 file changed, 3 insertions(+) + +diff --git a/libgnome-desktop/gnome-bg.c b/libgnome-desktop/gnome-bg.c +index 5d1cab1..7e4878b 100644 +--- a/libgnome-desktop/gnome-bg.c ++++ b/libgnome-desktop/gnome-bg.c +@@ -2612,6 +2612,9 @@ gnome_bg_changes_with_time (GnomeBG *bg) + + g_return_val_if_fail (bg != NULL, FALSE); + ++ if (!bg->filename) ++ return FALSE; ++ + show = get_as_slideshow (bg, bg->filename); + if (show) + return gnome_bg_slide_show_get_num_slides (show) > 1; +-- +1.8.3 + diff -Nru gnome-desktop3-3.12.0/debian/patches/ignore_errors_with_primary_outputs.patch gnome-desktop3-3.8.4/debian/patches/ignore_errors_with_primary_outputs.patch --- gnome-desktop3-3.12.0/debian/patches/ignore_errors_with_primary_outputs.patch 1970-01-01 00:00:00.000000000 +0000 +++ gnome-desktop3-3.8.4/debian/patches/ignore_errors_with_primary_outputs.patch 2014-03-17 04:30:24.000000000 +0000 @@ -0,0 +1,38 @@ +From b55e67080d05bd21097f684c91b1e7cbc0a991fc Mon Sep 17 00:00:00 2001 +From: Alberto Milone +Date: Tue, 3 Dec 2013 15:48:04 +0100 +Subject: [PATCH 1/1] gnome-rr.c: ignore the error if setting the primary + output fails + +We already trap and ignore the error when detecting the primary +output, so, according to the same logic, we should do the same +when trying to set the primary output. + +This helps with drivers such as modesetting that do not play +well with primary outputs (LP: #1224254). + +Upstream bug report: https://bugzilla.gnome.org/show_bug.cgi?id=719784 +--- + libgnome-desktop/gnome-rr.c | 5 ++++- + 1 file changed, 4 insertions(+), 1 deletion(-) + +diff --git a/libgnome-desktop/gnome-rr.c b/libgnome-desktop/gnome-rr.c +index 5ae52b2..09e44cd 100644 +--- a/libgnome-desktop/gnome-rr.c ++++ b/libgnome-desktop/gnome-rr.c +@@ -2148,8 +2148,11 @@ gnome_rr_screen_set_primary_output (GnomeRRScreen *screen, + else + id = None; + +- if (SERVERS_RANDR_IS_AT_LEAST_1_3 (priv)) ++ if (SERVERS_RANDR_IS_AT_LEAST_1_3 (priv)) { ++ gdk_error_trap_push (); + XRRSetOutputPrimary (priv->xdisplay, priv->xroot, id); ++ gdk_error_trap_pop_ignored (); ++ } + } + + /* GnomeRRCrtc */ +-- +1.7.9.5 + diff -Nru gnome-desktop3-3.12.0/debian/patches/series gnome-desktop3-3.8.4/debian/patches/series --- gnome-desktop3-3.12.0/debian/patches/series 2013-09-24 11:48:51.000000000 +0000 +++ gnome-desktop3-3.8.4/debian/patches/series 2014-06-25 14:36:12.000000000 +0000 @@ -1,7 +1,15 @@ #99_ltmain_as-needed.patch -#02_refuse_to_break_GL_compositors.patch +02_refuse_to_break_GL_compositors.patch 04_compute_average_color.patch tweak_color_computation.patch git_revert_draw_background.patch ubuntu_language.patch ubuntu_language_list_from_SUPPORTED.patch +git_no_filename_warning.patch +ignore_errors_with_primary_outputs.patch +backlight-property-name.patch + +fixes/0093-GnomeRR-fix-gnome-rr-debug-test-case.patch +fixes/0168-gnome-bg-Fix-memory-leaks-when-using-get_as_slidesho.patch +fixes/0169-gnome-bg-slideshow-Fix-memory-leak-of-a-filename.patch +fixes/0175-thumbnailer-Fix-a-signed-unsigned-comparison.patch diff -Nru gnome-desktop3-3.12.0/debian/patches/ubuntu_language.patch gnome-desktop3-3.8.4/debian/patches/ubuntu_language.patch --- gnome-desktop3-3.12.0/debian/patches/ubuntu_language.patch 2013-10-30 12:05:13.000000000 +0000 +++ gnome-desktop3-3.8.4/debian/patches/ubuntu_language.patch 2014-03-17 04:30:24.000000000 +0000 @@ -19,11 +19,11 @@ libgnome-desktop/gnome-languages.c | 75 +++++++++++++++++++++++++++++--------- 1 file changed, 57 insertions(+), 18 deletions(-) -Index: gnome-desktop3-3.10.1/libgnome-desktop/gnome-languages.c -=================================================================== ---- gnome-desktop3-3.10.1.orig/libgnome-desktop/gnome-languages.c -+++ gnome-desktop3-3.10.1/libgnome-desktop/gnome-languages.c -@@ -94,6 +94,7 @@ +diff --git a/libgnome-desktop/gnome-languages.c b/libgnome-desktop/gnome-languages.c +index 18e3705..eaa6622 100644 +--- a/libgnome-desktop/gnome-languages.c ++++ b/libgnome-desktop/gnome-languages.c +@@ -97,6 +97,7 @@ normalize_codeset (const char *codeset) char *q; normalized_codeset = g_strdup (codeset); @@ -31,7 +31,7 @@ if (codeset != NULL) { for (p = codeset, q = normalized_codeset; -@@ -239,6 +240,7 @@ +@@ -242,6 +243,7 @@ construct_language_name (const char *language, const char *codeset, const char *modifier) { @@ -39,7 +39,7 @@ char *name; g_assert (language[0] != 0); -@@ -246,12 +248,17 @@ +@@ -249,12 +251,17 @@ construct_language_name (const char *language, g_assert (codeset == NULL || codeset[0] != 0); g_assert (modifier == NULL || modifier[0] != 0); @@ -58,7 +58,15 @@ modifier != NULL? "@" : "", modifier != NULL? modifier : ""); -@@ -340,8 +347,7 @@ +@@ -315,7 +322,6 @@ language_name_is_valid (const char *language_name) + #else + int lc_type_id = LC_MESSAGES; + #endif +- + old_locale = g_strdup (setlocale (lc_type_id, NULL)); + is_valid = setlocale (lc_type_id, language_name) != NULL; + setlocale (lc_type_id, old_locale); +@@ -347,8 +353,7 @@ language_name_get_codeset_details (const char *language_name, if (is_utf8 != NULL) { codeset = normalize_codeset (codeset); @@ -68,7 +76,7 @@ g_free (codeset); } -@@ -412,8 +418,7 @@ +@@ -419,8 +424,7 @@ add_locale (const char *language_name, if (is_utf8) { name = g_strdup (language_name); } else if (utf8_only) { @@ -78,7 +86,7 @@ language_name_get_codeset_details (name, NULL, &is_utf8); if (!is_utf8) { g_free (name); -@@ -552,6 +557,30 @@ +@@ -631,6 +635,30 @@ collect_locales_from_directory (void) return found_locales; } @@ -109,29 +117,34 @@ static void count_languages_and_territories (void) { -@@ -588,18 +617,15 @@ +@@ -667,23 +695,16 @@ count_languages_and_territories (void) static void collect_locales (void) { -- gboolean found_localebin_locales = FALSE; +- gboolean found_archive_locales = FALSE; - gboolean found_dir_locales = FALSE; + gboolean found_locales; + GError *error = NULL; if (gnome_available_locales_map == NULL) { gnome_available_locales_map = g_hash_table_new_full (g_str_hash, g_str_equal, g_free, (GDestroyNotify) gnome_locale_free); } -- found_localebin_locales = collect_locales_from_localebin (); + found_locales = collect_locales_from_ubuntu (); +- if (!collect_locales_from_archive (&found_archive_locales, &error)) { +- g_warning ("Failed to load locales from archive: %s", error->message); +- g_clear_error (&error); +- } +- - found_dir_locales = collect_locales_from_directory (); - -- if (!(found_localebin_locales || found_dir_locales)) { +- if (!(found_archive_locales || found_dir_locales)) { + if (!found_locales) { + #ifndef WITH_INCOMPLETE_LOCALES g_warning ("Could not read list of available locales from libc, " "guessing possible locales from available translations, " - "but list may be incomplete!"); -@@ -791,6 +817,7 @@ +@@ -877,6 +898,7 @@ languages_parse_start_tag (GMarkupParseContext *ctx, const char *ccode_longT; const char *ccode; const char *ccode_id; @@ -139,7 +152,7 @@ const char *lang_name; if (! (g_str_equal (element_name, "iso_639_entry") || g_str_equal (element_name, "iso_639_3_entry")) -@@ -802,6 +829,7 @@ +@@ -888,6 +910,7 @@ languages_parse_start_tag (GMarkupParseContext *ctx, ccode_longB = NULL; ccode_longT = NULL; ccode_id = NULL; @@ -147,7 +160,7 @@ lang_name = NULL; while (*attr_names && *attr_values) { -@@ -838,6 +866,11 @@ +@@ -924,6 +947,11 @@ languages_parse_start_tag (GMarkupParseContext *ctx, } ccode_id = *attr_values; } @@ -159,7 +172,7 @@ } else if (g_str_equal (*attr_names, "name")) { lang_name = *attr_values; } -@@ -846,6 +879,10 @@ +@@ -932,6 +960,10 @@ languages_parse_start_tag (GMarkupParseContext *ctx, ++attr_values; } @@ -170,7 +183,7 @@ if (lang_name == NULL) { return; } -@@ -1088,6 +1125,7 @@ +@@ -1174,6 +1206,7 @@ gnome_get_language_from_locale (const char *locale, char *langinfo_codeset; char *translated_language; char *translated_territory; @@ -178,7 +191,7 @@ gboolean is_utf8 = TRUE; g_return_val_if_fail (locale != NULL, NULL); -@@ -1105,12 +1143,13 @@ +@@ -1191,12 +1224,13 @@ gnome_get_language_from_locale (const char *locale, language_code = NULL; territory_code = NULL; codeset_code = NULL; @@ -193,7 +206,7 @@ if (language_code == NULL) { goto out; -@@ -1136,7 +1175,7 @@ +@@ -1222,7 +1256,7 @@ gnome_get_language_from_locale (const char *locale, translated_territory); } @@ -202,7 +215,7 @@ if (codeset_code == NULL && langinfo_codeset != NULL) { codeset_code = g_strdup (langinfo_codeset); -@@ -1148,6 +1187,10 @@ +@@ -1234,6 +1268,10 @@ gnome_get_language_from_locale (const char *locale, codeset_code); } @@ -213,7 +226,7 @@ out: g_free (language_code); g_free (territory_code); -@@ -1155,6 +1198,7 @@ +@@ -1241,6 +1279,7 @@ gnome_get_language_from_locale (const char *locale, g_free (langinfo_codeset); g_free (translated_language); g_free (translated_territory); @@ -221,3 +234,8 @@ if (full_language->len == 0) { g_string_free (full_language, TRUE); +-- +1.8.1.2 + + + diff -Nru gnome-desktop3-3.12.0/debian/rules gnome-desktop3-3.8.4/debian/rules --- gnome-desktop3-3.12.0/debian/rules 2014-03-02 13:59:58.000000000 +0000 +++ gnome-desktop3-3.8.4/debian/rules 2014-03-17 04:30:24.000000000 +0000 @@ -13,16 +13,15 @@ DEB_DH_AUTORECONF_ARGS = --as-needed -DEB_CONFIGURE_LIBEXECDIR := /usr/lib/libgnome-desktop-3-10/ +DEB_CONFIGURE_LIBEXECDIR := /usr/lib/libgnome-desktop-3-7/ DEB_CONFIGURE_EXTRA_FLAGS += \ --with-gnome-distributor=$(shell dpkg-vendor --query vendor) \ --with-pnp-ids-path=/usr/share/hwdata/pnp.ids \ - --disable-scrollkeeper \ --enable-gtk-doc \ --enable-desktop-docs \ --enable-introspection -DEB_DH_MAKESHLIBS_ARGS_libgnome-desktop-3-10 += -- -c4 +DEB_DH_MAKESHLIBS_ARGS_libgnome-desktop-3-7 += -- -c4 common-binary-post-install-arch:: list-missing diff -Nru gnome-desktop3-3.12.0/desktop-docs/fdl/ca/ca.po gnome-desktop3-3.8.4/desktop-docs/fdl/ca/ca.po --- gnome-desktop3-3.12.0/desktop-docs/fdl/ca/ca.po 2013-11-11 17:23:17.000000000 +0000 +++ gnome-desktop3-3.8.4/desktop-docs/fdl/ca/ca.po 2013-09-04 11:15:57.000000000 +0000 @@ -2,77 +2,65 @@ # Copyright © 2009 Free Software Foundation, Inc. # # http://www.softcatala.org/wiki/Llicència_de_documentació_lliure_de_GNU -# Joan Duran , 2009. -# Gil Forcada , 2013. # msgid "" msgstr "" "Project-Id-Version: FDL\n" -"POT-Creation-Date: 2012-09-22 20:19+0000\n" -"PO-Revision-Date: 2013-04-30 18:34+0200\n" -"Last-Translator: Gil Forcada \n" -"Language-Team: Catalan \n" -"Language: ca\n" +"POT-Creation-Date: 2010-08-04 16:07+0000\n" +"PO-Revision-Date: 2011-04-02 19:05+0200\n" +"Last-Translator: Joan Duran \n" +"Language-Team: Catalan \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" -"Content-Transfer-Encoding: 8bits\n" -"Plural-Forms: nplurals=2; plural=n != 1;\n" +"Content-Transfer-Encoding: 8bit\n" -#. Put one translator per line, in the form NAME , YEAR1, YEAR2 -msgctxt "_" -msgid "translator-credits" -msgstr "" -"Joan Duran , 2009\n" -"Gil Forcada , 2011, 2013" - -#: C/index.docbook:17(articleinfo/title) +#: C/fdl.xml:17(title) msgid "GNU Free Documentation License" msgstr "Llicència de documentació lliure de GNU" -#: C/index.docbook:18(articleinfo/releaseinfo) +#: C/fdl.xml:18(releaseinfo) msgid "Version 1.1, March 2000" msgstr "Versió 1.1, Març de 2000" -#: C/index.docbook:22(articleinfo/copyright) -msgid "2000Free Software Foundation, Inc." -msgstr "2000Free Software Foundation, Inc." - -#: C/index.docbook:26(articleinfo/author) -msgid "Free Software Foundation" -msgstr "Free Software Foundation" +#: C/fdl.xml:23(year) +msgid "2000" +msgstr "2000" + +#: C/fdl.xml:23(holder) +msgid "Free Software Foundation, Inc." +msgstr "Free Software Foundation, Inc." + +#: C/fdl.xml:27(surname) +msgid "Free Software Foundation" +msgstr "Free Software Foundation" -#: C/index.docbook:31(publisher/publishername) +#: C/fdl.xml:31(publishername) msgid "GNOME Documentation Project" msgstr "Projecte de documentació del GNOME" -#: C/index.docbook:35(revhistory/revision) -msgid "1.1 2000-03" -msgstr "1.1 2000-03" - -#: C/index.docbook:43(para/address) -#, no-wrap -msgid "" -"Free Software Foundation, Inc. \n" -" 51 Franklin Street, Fifth Floor, \n" -" Boston, \n" -" MA 02110-1301\n" -"\t USA" -msgstr "" -"Free Software Foundation, Inc. \n" -" 51 Franklin Street, Fifth Floor, \n" -" Boston, \n" -" MA 02110-1301\n" -"\t USA" - -#: C/index.docbook:42(legalnotice/para) -msgid "" -"<_:address-1/>. Everyone is permitted to copy and distribute verbatim copies " -"of this license document, but changing it is not allowed." -msgstr "" -"<_:address-1/>. Es permet la còpia i la redistribució de còpies exactes " -"d'aquesta llicència, però no se'n permet la modificació." +#: C/fdl.xml:36(revnumber) +msgid "1.1" +msgstr "1.1" + +#: C/fdl.xml:37(date) +msgid "2000-03" +msgstr "2000-03" + +#: C/fdl.xml:42(para) +msgid "" +"
Free Software Foundation, Inc. 51 Franklin Street, Fifth " +"Floor, Boston, MA02110-1301USA
. Everyone is permitted to copy and " +"distribute verbatim copies of this license document, but changing it is not " +"allowed." +msgstr "" +"
Free Software Foundation, Inc. 51 Franklin Street, Fifth " +"Floor, Boston, MA02110-1301USA
. Tothom pot copiar i distribuir " +"còpies literals d'aquest document de llicència, però no es permet de fer-hi " +"modificacions." -#: C/index.docbook:53(abstract/para) C/index.docbook:67(sect1/para) +#: C/fdl.xml:53(para) C/fdl.xml:67(para) msgid "" "The purpose of this License is to make a manual, textbook, or other written " "document free in the sense of freedom: to assure everyone the " @@ -89,11 +77,11 @@ "seva obra sense ser considerat responsables de les modificacions fetes pels " "altres." -#: C/index.docbook:66(sect1/title) +#: C/fdl.xml:66(title) msgid "PREAMBLE" msgstr "PREÀMBUL" -#: C/index.docbook:78(sect1/para) +#: C/fdl.xml:78(para) msgid "" "This License is a kind of copyleft, which means that " "derivative works of the document must themselves be free in the same sense. " @@ -105,7 +93,7 @@ "mateix sentit, i complementa la Llicència pública general de GNU, que és una " "llicència de copyleft dissenyada per al programari lliure." -#: C/index.docbook:85(sect1/para) +#: C/fdl.xml:85(para) msgid "" "We have designed this License in order to use it for manuals for free " "software, because free software needs free documentation: a free program " @@ -124,11 +112,11 @@ "Recomanem aquesta Llicència especialment per a obres la finalitat de les " "quals sigui formació o consulta." -#: C/index.docbook:97(sect1/title) +#: C/fdl.xml:97(title) msgid "APPLICABILITY AND DEFINITIONS" msgstr "CAMP D'APLICACIÓ I DEFINICIONS" -#: C/index.docbook:98(sect1/para) +#: C/fdl.xml:98(para) msgid "" "This License applies to any manual or other work that contains a notice " "placed by the copyright holder saying it can be distributed under the terms " @@ -142,7 +130,7 @@ "ens referirem a aquest manual o obra. Qualsevol membre del públic és un " "autoritzat i ens hi adreçarem com a vós." -#: C/index.docbook:107(sect1/para) +#: C/fdl.xml:107(para) msgid "" "A Modified Version of the Document means any work containing " "the Document or a portion of it, either copied verbatim, or with " @@ -152,7 +140,7 @@ "que contingui el document o una part d'ell, ja sigui copiat literalment o " "amb modificacions i/o traduït a un altre idioma." -#: C/index.docbook:114(sect1/para) +#: C/fdl.xml:114(para) msgid "" "A Secondary Section is a named appendix or a front-matter " "section of the Document that deals " @@ -175,7 +163,7 @@ "amb el tema o amb assumptes relacionats, o de posicions legals, comercials, " "filosòfiques, ètiques o polítiques relatives a ells." -#: C/index.docbook:129(sect1/para) +#: C/fdl.xml:129(para) msgid "" "The Invariant Sections are certain Secondary Sections whose titles are designated, as being " @@ -187,7 +175,7 @@ "són Seccions invariables en l'avís que indica que el Document es distribueix sota aquesta Llicència." -#: C/index.docbook:138(sect1/para) +#: C/fdl.xml:138(para) msgid "" "The Cover Texts are certain short passages of text that are " "listed, as Front-Cover Texts or Back-Cover Texts, in the notice that says " @@ -199,7 +187,7 @@ "indica que el Document es distribueix " "sota aquesta Llicència." -#: C/index.docbook:146(sect1/para) +#: C/fdl.xml:146(para) msgid "" "A Transparent copy of the " "Document means a machine-readable copy, represented in a format whose " @@ -227,7 +215,7 @@ "és Transparent. Una còpia que no és Transparent s'anomena " "Opaca." -#: C/index.docbook:163(sect1/para) +#: C/fdl.xml:163(para) msgid "" "Examples of suitable formats for Transparent copies include plain ASCII " "without markup, Texinfo input format, LaTeX input format, SGML or XML using " @@ -248,7 +236,7 @@ "i HTML generat automàticament per alguns processadors de textos només per a " "la sortida." -#: C/index.docbook:176(sect1/para) +#: C/fdl.xml:176(para) msgid "" "The Title Page means, for a printed book, the title page " "itself, plus such following pages as are needed to hold, legibly, the " @@ -265,11 +253,11 @@ "Pàgina de títol significa el text proper a l'aparició més " "destacada del títol de l'obra, precedint el començament del cos del text." -#: C/index.docbook:188(sect1/title) +#: C/fdl.xml:188(title) msgid "VERBATIM COPYING" msgstr "CÒPIES LITERALS" -#: C/index.docbook:189(sect1/para) +#: C/fdl.xml:189(para) msgid "" "You may copy and distribute the Document in any medium, either commercially or noncommercially, provided that " @@ -293,7 +281,7 @@ "de seguir les condicions de la secció 3." -#: C/index.docbook:204(sect1/para) +#: C/fdl.xml:204(para) msgid "" "You may also lend copies, under the same conditions stated above, and you " "may publicly display copies." @@ -301,11 +289,11 @@ "També podeu prestar-ne còpies, amb les mateixes condicions esmentades, i " "exhibir-ne còpies públicament." -#: C/index.docbook:211(sect1/title) +#: C/fdl.xml:211(title) msgid "COPYING IN QUANTITY" msgstr "CÒPIES EN GRANS QUANTITATS" -#: C/index.docbook:212(sect1/para) +#: C/fdl.xml:212(para) msgid "" "If you publish printed copies of the Document numbering more than 100, and the Document's license " @@ -334,7 +322,7 @@ "i satisfacin aquestes condicions, es poden considerar còpies literals en " "altres aspectes." -#: C/index.docbook:230(sect1/para) +#: C/fdl.xml:230(para) msgid "" "If the required texts for either cover are too voluminous to fit legibly, " "you should put the first ones listed (as many as fit reasonably) on the " @@ -345,7 +333,7 @@ "com sigui raonablement possible) en la coberta real, i la resta en pàgines " "adjacents." -#: C/index.docbook:237(sect1/para) +#: C/fdl.xml:237(para) msgid "" "If you publish or distribute Opaque " "copies of the Document numbering more " @@ -376,7 +364,7 @@ "dels vostres representants o minoristes) l'última còpia Opaca d'aquesta " "edició." -#: C/index.docbook:257(sect1/para) +#: C/fdl.xml:257(para) msgid "" "It is requested, but not required, that you contact the authors of the Document well before redistributing any " @@ -388,11 +376,11 @@ "nombre de còpies; d'aquesta manera, els autors us podran facilitar una " "versió actualitzada del Document, si és que n'hi ha alguna." -#: C/index.docbook:266(sect1/title) +#: C/fdl.xml:266(title) msgid "MODIFICATIONS" msgstr "MODIFICACIONS" -#: C/index.docbook:267(sect1/para) +#: C/fdl.xml:267(para) msgid "" "You may copy and distribute a Modified " "Version of the Document under " @@ -412,7 +400,7 @@ "distribució i modificació de la Versió modificada a qualsevol que en " "posseeixi una còpia. A més, a la Versió modificada hi heu de fer el següent:" -#: C/index.docbook:282(listitem/para) +#: C/fdl.xml:282(para) msgid "" "Use in the Title Page (and on the " "covers, if any) a title distinct from that of the Title Page, as authors, " "one or more persons or entities responsible for authorship of the " @@ -444,7 +432,7 @@ "\"fdl-document\">Document (o tots els autors principals, si són menys " "de cinc)." -#: C/index.docbook:307(listitem/para) +#: C/fdl.xml:307(para) msgid "" "State on the Title Page the name of " "the publisher of the Modified Version, " @@ -454,7 +442,7 @@ "de l'editor de la Versió modificada, " "com a editor." -#: C/index.docbook:316(listitem/para) +#: C/fdl.xml:316(para) msgid "" "Preserve all the copyright notices of the Document." @@ -462,7 +450,7 @@ "Conserveu tots els avisos de copyright del Document." -#: C/index.docbook:323(listitem/para) +#: C/fdl.xml:323(para) msgid "" "Add an appropriate copyright notice for your modifications adjacent to the " "other copyright notices." @@ -470,7 +458,7 @@ "Afegiu, al costat dels altres avisos de copyright, un avís de copyright " "adequat per a les vostres modificacions." -#: C/index.docbook:330(listitem/para) +#: C/fdl.xml:330(para) msgid "" "Include, immediately after the copyright notices, a license notice giving " "the public permission to use the Modified " @@ -482,7 +470,7 @@ "modified\">Versió modificada d'acord amb els termes d'aquesta " "llicència, en el formulari que s'indica a l'addendum de més avall." -#: C/index.docbook:340(listitem/para) +#: C/fdl.xml:340(para) msgid "" "Preserve in that license notice the full lists of Invariant Sections and required Textos de coberta necessaris que s'indiquen a l'avís de " "llicència del Document." -#: C/index.docbook:350(listitem/para) +#: C/fdl.xml:350(para) msgid "Include an unaltered copy of this License." msgstr "Incloeu una còpia no alterada d'aquesta Llicència." -#: C/index.docbook:356(listitem/para) +#: C/fdl.xml:356(para) msgid "" "Preserve the section entitled History, and its title, and add " "to it an item stating at least the title, year, new authors, and publisher " @@ -518,7 +506,7 @@ "a la seva Pàgina de títol, descrivint-hi també la Versió modificada com " "s'indica al punt anterior." -#: C/index.docbook:372(listitem/para) +#: C/fdl.xml:372(para) msgid "" "Preserve the network location, if any, given in the Document for public access to a Acknowledgements or " "Dedications, preserve the section's title, and preserve in " @@ -550,7 +538,7 @@ "l'essència i to de cadascun dels agraïments dels col·laboradors i/o " "dedicatòries que hi apareguin. " -#: C/index.docbook:397(listitem/para) +#: C/fdl.xml:397(para) msgid "" "Preserve all the Invariant Sections " "of the Document, unaltered in their " @@ -562,7 +550,7 @@ "els textos ni els títols. La numeració de seccions o sistemes equivalents no " "es consideren part dels títols de secció." -#: C/index.docbook:407(listitem/para) +#: C/fdl.xml:407(para) msgid "" "Delete any section entitled Endorsements. Such a section may " "not be included in the Modified VersionVersió " "modificada." -#: C/index.docbook:416(listitem/para) +#: C/fdl.xml:416(para) msgid "" "Do not retitle any existing section as Endorsements or to " "conflict in title with any Invariant " @@ -582,7 +570,7 @@ "de cap altra manera que pugui entrar en conflicte amb el títol de qualsevol " "Secció invariable." -#: C/index.docbook:425(sect1/para) +#: C/fdl.xml:425(para) msgid "" "If the Modified Version includes new " "front-matter sections or appendices that qualify as Endorsements, provided it " "contains nothing but endorsements of your Front-Cover Text, and a passage of up to 25 words as a Document do not by this License give permission to use their names " @@ -649,16 +637,15 @@ "\"fdl-modified\">Modified Version ." msgstr "" "Per virtut d'aquesta Llicència, el(s) autor(s) i editor(s) del Document no us autoritza(en) a utilitzar-ne el(s) " -"nom(s) amb finalitats publicitàries, ni afirmen ni queda implícita " -"l'aprovació de qualsevol Versió modificada." +"\"fdl-document\">Document no us autoritza(en) a utilitzar-ne el(s) nom" +"(s) amb finalitats publicitàries, ni afirmen ni queda implícita l'aprovació " +"de qualsevol Versió modificada." -#: C/index.docbook:473(sect1/title) +#: C/fdl.xml:473(title) msgid "COMBINING DOCUMENTS" msgstr "COMBINACIÓ DE DOCUMENTS" -#: C/index.docbook:474(sect1/para) +#: C/fdl.xml:474(para) msgid "" "You may combine the Document with " "other documents released under this License, under the terms defined in " @@ -676,7 +663,7 @@ "relacioneu com a Seccions invariables " "de l'obra resultant en el seu avís de llicència." -#: C/index.docbook:485(sect1/para) +#: C/fdl.xml:485(para) msgid "" "The combined work need only contain one copy of this License, and multiple " "identical Invariant Sections may be " @@ -696,7 +683,7 @@ "o un nombre únic. Feu la mateixa operació als títols de la secció que són a " "la relació de Seccions invariables a l'avís de llicència de l'obra resultant." -#: C/index.docbook:498(sect1/para) +#: C/fdl.xml:498(para) msgid "" "In the combination, you must combine any sections entitled History in the various original documents, forming one section entitled " @@ -712,11 +699,11 @@ "totes les titulades Dedicatòries. Heu de suprimir totes les " "seccions titulades Aprovacions." -#: C/index.docbook:509(sect1/title) +#: C/fdl.xml:509(title) msgid "COLLECTIONS OF DOCUMENTS" msgstr "RECOPILACIONS DE DOCUMENTS" -#: C/index.docbook:510(sect1/para) +#: C/fdl.xml:510(para) msgid "" "You may make a collection consisting of the Document and other documents released under this License, and " @@ -732,7 +719,7 @@ "sempre que seguiu les normes d'aquesta Llicència pel que fa a la còpia " "literal de cadascun dels documents en tots els altres aspectes." -#: C/index.docbook:520(sect1/para) +#: C/fdl.xml:520(para) msgid "" "You may extract a single document from such a collection, and dispbibute it " "individually under this License, provided you insert a copy of this License " @@ -745,11 +732,11 @@ "Llicència en tots els altres aspectes relatius a la còpia literal del " "document." -#: C/index.docbook:530(sect1/title) +#: C/fdl.xml:530(title) msgid "AGGREGATION WITH INDEPENDENT WORKS" msgstr "AGRUPAMENT AMB OBRES INDEPENDENTS" -#: C/index.docbook:531(sect1/para) +#: C/fdl.xml:531(para) msgid "" "A compilation of the Document or its " "derivatives with other separate and independent documents or works, in or on " @@ -782,11 +769,11 @@ "contrari, han d'aparèixer en cobertes impreses que encerclin tot " "l'agrupament." -#: C/index.docbook:554(sect1/title) +#: C/fdl.xml:554(title) msgid "TRANSLATION" msgstr "TRADUCCIÓ" -#: C/index.docbook:555(sect1/para) +#: C/fdl.xml:555(para) msgid "" "Translation is considered a kind of modification, so you may distribute " "translations of the Document under the " @@ -811,11 +798,11 @@ "anglès d'aquesta Llicència. En cas de desacord entre la traducció i la " "versió original en anglès d'aquesta Llicència, prevaldrà la versió original." -#: C/index.docbook:573(sect1/title) +#: C/fdl.xml:573(title) msgid "TERMINATION" msgstr "CLOENDA" -#: C/index.docbook:574(sect1/para) +#: C/fdl.xml:574(para) msgid "" "You may not copy, modify, sublicense, or distribute the Document except as expressly provided for under this " @@ -834,11 +821,11 @@ "aquesta Llicència, en seguiran gaudint, atès que aquestes parts en segueixen " "complint els acords. " -#: C/index.docbook:587(sect1/title) +#: C/fdl.xml:587(title) msgid "FUTURE REVISIONS OF THIS LICENSE" msgstr "REVISIONS FUTURES D'AQUESTA LLICÈNCIA" -#: C/index.docbook:588(sect1/para) +#: C/fdl.xml:588(para) msgid "" "The Free " "Software Foundation may publish new, revised versions of the GNU " @@ -853,7 +840,7 @@ "els detalls per contemplar nous problemes o assumptes. Consulteu http://www." "gnu.org/copyleft/." -#: C/index.docbook:599(sect1/para) +#: C/fdl.xml:599(para) msgid "" "Each version of the License is given a distinguishing version number. If the " "Document specifies that a particular " @@ -873,11 +860,11 @@ "Llicència, podeu escollir qualsevol versió que hagi estat publicada (no com " "a esborrany) per la Free Software Foundation." -#: C/index.docbook:614(sect1/title) +#: C/fdl.xml:614(title) msgid "Addendum" msgstr "Addendum" -#: C/index.docbook:615(sect1/para) +#: C/fdl.xml:615(para) msgid "" "To use this License in a document you have written, include a copy of the " "License in the document and put the following copyright and license notices " @@ -887,11 +874,11 @@ "una còpia de la Llicència i afegiu els avisos de copyright i de llicència " "següents immediatament després de la pàgina de títol:" -#: C/index.docbook:622(blockquote/para) +#: C/fdl.xml:622(para) msgid "Copyright © YEAR YOUR NAME." msgstr "Copyright © ANY EL VOSTRE NOM." -#: C/index.docbook:625(blockquote/para) +#: C/fdl.xml:625(para) msgid "" "Permission is granted to copy, distribute and/or modify this document under " "the terms of the GNU Free Documentation License, Version 1.1 or any later " @@ -911,7 +898,7 @@ "\">Textos de contraportada sent RELACIÓ. S'inclou una còpia de la " "llicència a la secció Llicència de documentació lliure de GNU." -#: C/index.docbook:640(sect1/para) +#: C/fdl.xml:640(para) msgid "" "If you have no Invariant Sections, " "write with no Invariant Sections instead of saying which ones " @@ -927,7 +914,7 @@ "Textos de portada sent RELACIÓ; de la mateixa manera per a " "Textos de contraportada." -#: C/index.docbook:650(sect1/para) +#: C/fdl.xml:650(para) msgid "" "If your document contains nontrivial examples of program code, we recommend " "releasing these examples in parallel under your choice of free software " @@ -940,3 +927,8 @@ "lliure, com ara la Llicència General Pública de GNU, per permetre'n l'ús en " "programari lliure." + +#. Put one translator per line, in the form of NAME , YEAR1, YEAR2 +#: C/fdl.xml:0(None) +msgid "translator-credits" +msgstr "Softcatalà " diff -Nru gnome-desktop3-3.12.0/desktop-docs/fdl/ca/index.docbook gnome-desktop3-3.8.4/desktop-docs/fdl/ca/index.docbook --- gnome-desktop3-3.12.0/desktop-docs/fdl/ca/index.docbook 2014-03-24 14:31:51.000000000 +0000 +++ gnome-desktop3-3.8.4/desktop-docs/fdl/ca/index.docbook 2013-09-04 11:30:10.000000000 +0000 @@ -13,56 +13,39 @@ Llicència de documentació lliure de GNU Versió 1.1, Març de 2000 - 2000Free Software Foundation, Inc. + + 2000Free Software Foundation, Inc. + - Free Software Foundation + + Free Software Foundation + Projecte de documentació del GNOME - 1.1 2000-03 + + 1.1 + 2000-03 + -
Free Software Foundation, Inc. + +
Free Software Foundation, Inc. 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 - USA
. Es permet la còpia i la redistribució de còpies exactes d'aquesta llicència, però no se'n permet la modificació. + USA
. Everyone is permitted to + copy and distribute verbatim copies of this license + document, but changing it is not allowed. + La finalitat d'aquesta Llicència és crear manuals, llibres de text o altres documents escrits lliures pel que fa a la llibertat; per assegurar tothom la llibertat real de copiar-los i redistribuir-los, modificant-los o no, amb finalitats comercials o no. Addicionalment, aquesta Llicència assegura l'autor i l'editor una manera d'obtenir crèdit per la seva obra sense ser considerat responsables de les modificacions fetes pels altres. - - - - Joan Duran - - jodufi@gmail.com - - - - 2009 - - Joan Duran - - - - - Gil Forcada - - gilforcada@guifi.net - - - - 2011 - - 2013 - - Gil Forcada - - + diff -Nru gnome-desktop3-3.12.0/desktop-docs/fdl/pt_BR/index.docbook gnome-desktop3-3.8.4/desktop-docs/fdl/pt_BR/index.docbook --- gnome-desktop3-3.12.0/desktop-docs/fdl/pt_BR/index.docbook 2014-03-24 14:31:52.000000000 +0000 +++ gnome-desktop3-3.8.4/desktop-docs/fdl/pt_BR/index.docbook 2013-09-04 11:30:11.000000000 +0000 @@ -187,7 +187,14 @@ O trabalho combinado precisa conter somente uma cópia desta Licença, e várias Seções Invariantes idênticas podem ser substituídas por uma única cópia. Se existirem várias Seções Invariantes de mesmo nome, porém com conteúdos diferentes, você deve tornar o título de cada uma destas seções único, adicionando ao fim destes, entre parênteses, o nome do autor ou, se conhecido, o editor original desta seção, ou ainda um número único. Faça o mesmo ajuste nos títulos de seção na lista de Seções Invariantes na nota de licença do trabalho combinado. - Na combinação, você deve combinar quaisquer seções intituladas Histórico nos vários documentos originais, formando uma seção intitulada Histórico; do mesmo modo, combine quaisquer seções intituladas Agradecimentos, e quaisquer seções intituladas Dedicatórias. Você deve apagar todas as seções intituladas Apoio. + + In the combination, you must combine any sections entitled + History in the various original documents, + forming one section entitled History; likewise + combine any sections entitled Acknowledgements, + and any sections entitled Dedications. You must + delete all sections entitled Endorsements. + diff -Nru gnome-desktop3-3.12.0/desktop-docs/fdl/pt_BR/pt_BR.po gnome-desktop3-3.8.4/desktop-docs/fdl/pt_BR/pt_BR.po --- gnome-desktop3-3.12.0/desktop-docs/fdl/pt_BR/pt_BR.po 2013-09-18 08:29:39.000000000 +0000 +++ gnome-desktop3-3.8.4/desktop-docs/fdl/pt_BR/pt_BR.po 2013-09-04 11:16:04.000000000 +0000 @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: gnome-desktop docs master\n" -"POT-Creation-Date: 2013-09-09 19:28+0000\n" +"POT-Creation-Date: 2013-08-16 08:15+0000\n" "PO-Revision-Date: 2013-08-17 17:39-0300\n" "Last-Translator: Enrico Nicoletto \n" "Language-Team: Brazilian Portuguese \n" @@ -25,38 +25,31 @@ "Enrico Nicoletto , 2011, 2013.\n" "Rafael Ferreira , 2012." -#. (itstool) path: articleinfo/title -#: C/index.docbook:17 +#: C/index.docbook:17(articleinfo/title) msgid "GNU Free Documentation License" msgstr "Licença de Documentação Livre GNU" -#. (itstool) path: articleinfo/releaseinfo -#: C/index.docbook:18 +#: C/index.docbook:18(articleinfo/releaseinfo) msgid "Version 1.1, March 2000" msgstr "Versão 1.1, Março de 2000" -#. (itstool) path: articleinfo/copyright -#: C/index.docbook:22 +#: C/index.docbook:22(articleinfo/copyright) msgid "2000Free Software Foundation, Inc." msgstr "2000Free Software Foundation, Inc." -#. (itstool) path: articleinfo/author -#: C/index.docbook:26 +#: C/index.docbook:26(articleinfo/author) msgid "Free Software Foundation" msgstr "Free Software Foundation" -#. (itstool) path: publisher/publishername -#: C/index.docbook:31 +#: C/index.docbook:31(publisher/publishername) msgid "GNOME Documentation Project" msgstr "Projeto de Documentação do GNOME" -#. (itstool) path: revhistory/revision -#: C/index.docbook:35 +#: C/index.docbook:35(revhistory/revision) msgid "1.1 2000-03" msgstr "1.1 2000-03" -#. (itstool) path: para/address -#: C/index.docbook:43 +#: C/index.docbook:43(para/address) #, no-wrap msgid "" "Free Software Foundation, Inc. \n" @@ -71,8 +64,7 @@ " MA 02110-1301\n" "\t USA" -#. (itstool) path: legalnotice/para -#: C/index.docbook:42 +#: C/index.docbook:42(legalnotice/para) msgid "" "<_:address-1/>. Everyone is permitted to copy and distribute verbatim copies " "of this license document, but changing it is not allowed." @@ -80,9 +72,7 @@ "<_:address-1/> É permitido a qualquer um copiar e distribuir cópias exatas " "deste documento de licença, embora não seja permitido alterá-lo." -#. (itstool) path: abstract/para -#. (itstool) path: sect1/para -#: C/index.docbook:53 C/index.docbook:67 +#: C/index.docbook:53(abstract/para) C/index.docbook:67(sect1/para) msgid "" "The purpose of this License is to make a manual, textbook, or other written " "document free in the sense of freedom: to assure everyone the " @@ -99,13 +89,11 @@ "pelo seu trabalho, enquanto não é considerado responsável por modificações " "feitas por outros." -#. (itstool) path: sect1/title -#: C/index.docbook:66 +#: C/index.docbook:66(sect1/title) msgid "PREAMBLE" msgstr "INTRODUÇÃO" -#. (itstool) path: sect1/para -#: C/index.docbook:78 +#: C/index.docbook:78(sect1/para) msgid "" "This License is a kind of copyleft, which means that " "derivative works of the document must themselves be free in the same sense. " @@ -117,8 +105,7 @@ "sentido. Ela complementa a Licença Pública Geral GNU (GNU General Public " "License), que é uma licença copyleft projetada para softwares livres." -#. (itstool) path: sect1/para -#: C/index.docbook:85 +#: C/index.docbook:85(sect1/para) msgid "" "We have designed this License in order to use it for manuals for free " "software, because free software needs free documentation: a free program " @@ -136,13 +123,11 @@ "ou se é publicado como um livro impresso. Nós recomendamos esta Licença " "principalmente para trabalhos cujo propósito seja instrução ou referência." -#. (itstool) path: sect1/title -#: C/index.docbook:97 +#: C/index.docbook:97(sect1/title) msgid "APPLICABILITY AND DEFINITIONS" msgstr "APLICABILIDADE E DEFINIÇÕES" -#. (itstool) path: sect1/para -#: C/index.docbook:98 +#: C/index.docbook:98(sect1/para) msgid "" "This License applies to any manual or other work that contains a notice " "placed by the copyright holder saying it can be distributed under the terms " @@ -156,8 +141,7 @@ "abaixo, refere-se a qualquer manual ou trabalho. Qualquer membro do público " "é um licenciado, e será referenciado como você." -#. (itstool) path: sect1/para -#: C/index.docbook:107 +#: C/index.docbook:107(sect1/para) msgid "" "A Modified Version of the Document means any work containing " "the Document or a portion of it, either copied verbatim, or with " @@ -167,8 +151,7 @@ "trabalho contendo o Documento ou uma porção deste, seja uma cópia literal ou " "com modificações e/ou traduzido em outro idioma." -#. (itstool) path: sect1/para -#: C/index.docbook:114 +#: C/index.docbook:114(sect1/para) msgid "" "A Secondary Section is a named appendix or a front-matter " "section of the Document that deals " @@ -191,8 +174,7 @@ "assunto ou com temas relacionados, ou tratar de questões legais, comerciais, " "filosóficas, éticas ou políticas com relação a eles." -#. (itstool) path: sect1/para -#: C/index.docbook:129 +#: C/index.docbook:129(sect1/para) msgid "" "The Invariant Sections are certain Secondary Sections whose titles are designated, as being " @@ -204,8 +186,7 @@ "Seções Invariantes na nota que afirma que o Documento é publicado sob esta Licença." -#. (itstool) path: sect1/para -#: C/index.docbook:138 +#: C/index.docbook:138(sect1/para) msgid "" "The Cover Texts are certain short passages of text that are " "listed, as Front-Cover Texts or Back-Cover Texts, in the notice that says " @@ -217,8 +198,7 @@ "que afirma que o Documento é publicado " "sob esta Licença." -#. (itstool) path: sect1/para -#: C/index.docbook:146 +#: C/index.docbook:146(sect1/para) msgid "" "A Transparent copy of the " "Document means a machine-readable copy, represented in a format whose " @@ -246,8 +226,7 @@ "pelos leitores não é Transparente. Uma cópia que não é Transparente é chamada Opaca." -#. (itstool) path: sect1/para -#: C/index.docbook:163 +#: C/index.docbook:163(sect1/para) msgid "" "Examples of suitable formats for Transparent copies include plain ASCII " "without markup, Texinfo input format, LaTeX input format, SGML or XML using " @@ -268,8 +247,7 @@ "e o HTML gerado por máquina produzido por algum processador de texto com " "propósito apenas de saída." -#. (itstool) path: sect1/para -#: C/index.docbook:176 +#: C/index.docbook:176(sect1/para) msgid "" "The Title Page means, for a printed book, the title page " "itself, plus such following pages as are needed to hold, legibly, the " @@ -286,13 +264,11 @@ "próximo à ocorrência mais proeminente do título do trabalho, precedendo o " "início do corpo do texto." -#. (itstool) path: sect1/title -#: C/index.docbook:188 +#: C/index.docbook:188(sect1/title) msgid "VERBATIM COPYING" msgstr "CÓPIAS LITERAIS" -#. (itstool) path: sect1/para -#: C/index.docbook:189 +#: C/index.docbook:189(sect1/para) msgid "" "You may copy and distribute the Document in any medium, either commercially or noncommercially, provided that " @@ -317,8 +293,7 @@ "deve também respeitar as condições descritas na seção 3." -#. (itstool) path: sect1/para -#: C/index.docbook:204 +#: C/index.docbook:204(sect1/para) msgid "" "You may also lend copies, under the same conditions stated above, and you " "may publicly display copies." @@ -326,13 +301,11 @@ "Você também pode emprestar cópias, sob as mesmas condições acima " "mencionadas, e você também as pode mostrar publicamente." -#. (itstool) path: sect1/title -#: C/index.docbook:211 +#: C/index.docbook:211(sect1/title) msgid "COPYING IN QUANTITY" msgstr "CÓPIA EM QUANTIDADE" -#. (itstool) path: sect1/para -#: C/index.docbook:212 +#: C/index.docbook:212(sect1/para) msgid "" "If you publish printed copies of the Document numbering more than 100, and the Document's license " @@ -361,8 +334,7 @@ "satisfaçam estas condições podem ser tratadas como cópias literais em outros " "aspectos." -#. (itstool) path: sect1/para -#: C/index.docbook:230 +#: C/index.docbook:230(sect1/para) msgid "" "If the required texts for either cover are too voluminous to fit legibly, " "you should put the first ones listed (as many as fit reasonably) on the " @@ -373,8 +345,7 @@ "listados (quantos couberem razoavelmente) na própria capa, e continuar o " "resto em páginas adjacentes." -#. (itstool) path: sect1/para -#: C/index.docbook:237 +#: C/index.docbook:237(sect1/para) msgid "" "If you publish or distribute Opaque " "copies of the Document numbering more " @@ -406,8 +377,7 @@ "edição ao público." # Próclise facultativa na expressão "lhe fornecer" --Enrico -#. (itstool) path: sect1/para -#: C/index.docbook:257 +#: C/index.docbook:257(sect1/para) msgid "" "It is requested, but not required, that you contact the authors of the Document well before redistributing any " @@ -419,13 +389,11 @@ "grande número de cópias, para dar a eles uma chance de lhe fornecer uma " "versão atualizada do Documento." -#. (itstool) path: sect1/title -#: C/index.docbook:266 +#: C/index.docbook:266(sect1/title) msgid "MODIFICATIONS" msgstr "MODIFICAÇÕES" -#. (itstool) path: sect1/para -#: C/index.docbook:267 +#: C/index.docbook:267(sect1/para) msgid "" "You may copy and distribute a Modified " "Version of the Document under " @@ -445,8 +413,7 @@ "Modificada a quem quer que possua uma cópia desta. Além disso, você deve " "executar os seguintes procedimentos na Versão Modificada:" -#. (itstool) path: listitem/para -#: C/index.docbook:282 +#: C/index.docbook:282(listitem/para) msgid "" "Use in the Title Page (and on the " "covers, if any) a title distinct from that of the Title Page, as authors, " "one or more persons or entities responsible for authorship of the " @@ -479,8 +445,7 @@ "document\">Documento (todos seus autores principais, se houver menos " "que cinco)." -#. (itstool) path: listitem/para -#: C/index.docbook:307 +#: C/index.docbook:307(listitem/para) msgid "" "State on the Title Page the name of " "the publisher of the Modified Version, " @@ -490,8 +455,7 @@ "do editor da Versão Modificada, como " "seu editor." -#. (itstool) path: listitem/para -#: C/index.docbook:316 +#: C/index.docbook:316(listitem/para) msgid "" "Preserve all the copyright notices of the Document." @@ -499,8 +463,7 @@ "Preservar todas as notas de direitos autorais (copyright) do Documento." -#. (itstool) path: listitem/para -#: C/index.docbook:323 +#: C/index.docbook:323(listitem/para) msgid "" "Add an appropriate copyright notice for your modifications adjacent to the " "other copyright notices." @@ -508,8 +471,7 @@ "Adicionar uma nota apropriada de direitos autorais para suas modificações, " "adjacente às outras notas de direitos autorais." -#. (itstool) path: listitem/para -#: C/index.docbook:330 +#: C/index.docbook:330(listitem/para) msgid "" "Include, immediately after the copyright notices, a license notice giving " "the public permission to use the Modified " @@ -521,8 +483,7 @@ "modified\">Versão Modificada sob os termos desta Licença, na forma " "mostrada no Adendo abaixo." -#. (itstool) path: listitem/para -#: C/index.docbook:340 +#: C/index.docbook:340(listitem/para) msgid "" "Preserve in that license notice the full lists of Invariant Sections and required Textos de Capa obrigatórios, dados na nota de licença do Documento." -#. (itstool) path: listitem/para -#: C/index.docbook:350 +#: C/index.docbook:350(listitem/para) msgid "Include an unaltered copy of this License." msgstr "Incluir uma cópia inalterada desta Licença." -#. (itstool) path: listitem/para -#: C/index.docbook:356 +#: C/index.docbook:356(listitem/para) msgid "" "Preserve the section entitled History, and its title, and add " "to it an item stating at least the title, year, new authors, and publisher " @@ -561,8 +520,7 @@ "evidenciado na Página de Título, em seguida adicione um item descrevendo a " "Versão Modificada como mencionado na sentença anterior." -#. (itstool) path: listitem/para -#: C/index.docbook:372 +#: C/index.docbook:372(listitem/para) msgid "" "Preserve the network location, if any, given in the Document for public access to a Acknowledgements or " "Dedications, preserve the section's title, and preserve in " @@ -595,8 +552,7 @@ "dentro da seção toda a substância e tom de cada um dos agradecimentos e/ou " "dedicatórias lá mencionados." -#. (itstool) path: listitem/para -#: C/index.docbook:397 +#: C/index.docbook:397(listitem/para) msgid "" "Preserve all the Invariant Sections " "of the Document, unaltered in their " @@ -608,8 +564,7 @@ "textos e títulos. Números de seção ou o equivalente não são considerados " "parte dos títulos das seções." -#. (itstool) path: listitem/para -#: C/index.docbook:407 +#: C/index.docbook:407(listitem/para) msgid "" "Delete any section entitled Endorsements. Such a section may " "not be included in the Modified VersionApoio. Tal seção não deve " "ser incluída na Versão Modificada." -#. (itstool) path: listitem/para -#: C/index.docbook:416 +#: C/index.docbook:416(listitem/para) msgid "" "Do not retitle any existing section as Endorsements or to " "conflict in title with any Invariant " @@ -629,8 +583,7 @@ "ou que resulte em conflito com o título de qualquer Seção Invariante." -#. (itstool) path: sect1/para -#: C/index.docbook:425 +#: C/index.docbook:425(sect1/para) msgid "" "If the Modified Version includes new " "front-matter sections or appendices that qualify as Endorsements, provided it " "contains nothing but endorsements of your Front-Cover Text, and a passage of up to 25 words as a Document do not by this License give permission to use their names " @@ -705,13 +655,11 @@ "usados a fins de publicidade, para defesa ou para apoio implícito de " "qualquer Versão Modificada." -#. (itstool) path: sect1/title -#: C/index.docbook:473 +#: C/index.docbook:473(sect1/title) msgid "COMBINING DOCUMENTS" msgstr "COMBINANDO DOCUMENTOS" -#. (itstool) path: sect1/para -#: C/index.docbook:474 +#: C/index.docbook:474(sect1/para) msgid "" "You may combine the Document with " "other documents released under this License, under the terms defined in " @@ -729,8 +677,7 @@ "originais, sem modificações, e as liste como Seções Invariantes de seu " "trabalho combinado, na sua nota de licença." -#. (itstool) path: sect1/para -#: C/index.docbook:485 +#: C/index.docbook:485(sect1/para) msgid "" "The combined work need only contain one copy of this License, and multiple " "identical Invariant Sections may be " @@ -750,8 +697,7 @@ "ou ainda um número único. Faça o mesmo ajuste nos títulos de seção na lista " "de Seções Invariantes na nota de licença do trabalho combinado." -#. (itstool) path: sect1/para -#: C/index.docbook:498 +#: C/index.docbook:498(sect1/para) msgid "" "In the combination, you must combine any sections entitled History in the various original documents, forming one section entitled " @@ -765,15 +711,13 @@ "intitulada Histórico; do mesmo modo, combine quaisquer seções " "intituladas Agradecimentos, e quaisquer seções intituladas " "Dedicatórias. Você deve apagar todas as seções intituladas " -"Apoio." +"Apoio." -#. (itstool) path: sect1/title -#: C/index.docbook:509 +#: C/index.docbook:509(sect1/title) msgid "COLLECTIONS OF DOCUMENTS" msgstr "COLEÇÕES DE DOCUMENTOS" -#. (itstool) path: sect1/para -#: C/index.docbook:510 +#: C/index.docbook:510(sect1/para) msgid "" "You may make a collection consisting of the Document and other documents released under this License, and " @@ -789,8 +733,7 @@ "desta Licença para cópias literais de cada documento em todos os outros " "aspectos." -#. (itstool) path: sect1/para -#: C/index.docbook:520 +#: C/index.docbook:520(sect1/para) msgid "" "You may extract a single document from such a collection, and dispbibute it " "individually under this License, provided you insert a copy of this License " @@ -802,13 +745,11 @@ "Licença no documento extraído, e siga esta Licença em todos os outros " "aspectos com relação à cópia literal do documento." -#. (itstool) path: sect1/title -#: C/index.docbook:530 +#: C/index.docbook:530(sect1/title) msgid "AGGREGATION WITH INDEPENDENT WORKS" msgstr "AGREGAÇÃO A TRABALHOS INDEPENDENTES" -#. (itstool) path: sect1/para -#: C/index.docbook:531 +#: C/index.docbook:531(sect1/para) msgid "" "A compilation of the Document or its " "derivatives with other separate and independent documents or works, in or on " @@ -841,13 +782,11 @@ "Documento no agregado. Caso contrário, eles devem aparecer em capas em volta " "do agregado como um todo." -#. (itstool) path: sect1/title -#: C/index.docbook:554 +#: C/index.docbook:554(sect1/title) msgid "TRANSLATION" msgstr "TRADUÇÕES" -#. (itstool) path: sect1/para -#: C/index.docbook:555 +#: C/index.docbook:555(sect1/para) msgid "" "Translation is considered a kind of modification, so you may distribute " "translations of the Document under the " @@ -873,13 +812,11 @@ "original desta Licença ou nota de licença, a versão original em inglês " "prevalecerá." -#. (itstool) path: sect1/title -#: C/index.docbook:573 +#: C/index.docbook:573(sect1/title) msgid "TERMINATION" msgstr "TÉRMINO" -#. (itstool) path: sect1/para -#: C/index.docbook:574 +#: C/index.docbook:574(sect1/para) msgid "" "You may not copy, modify, sublicense, or distribute the Document except as expressly provided for under this " @@ -898,13 +835,11 @@ "suas licenças rescindidas enquanto tais partes permanecerem em total acordo " "com a Licença." -#. (itstool) path: sect1/title -#: C/index.docbook:587 +#: C/index.docbook:587(sect1/title) msgid "FUTURE REVISIONS OF THIS LICENSE" msgstr "REVISÕES FUTURAS DESTA LICENÇA" -#. (itstool) path: sect1/para -#: C/index.docbook:588 +#: C/index.docbook:588(sect1/para) msgid "" "The Free " "Software Foundation may publish new, revised versions of the GNU " @@ -920,8 +855,7 @@ "de abordar novos problemas ou preocupações. Consulte: http://www.gnu.org/copyleft/." -#. (itstool) path: sect1/para -#: C/index.docbook:599 +#: C/index.docbook:599(sect1/para) msgid "" "Each version of the License is given a distinguishing version number. If the " "Document specifies that a particular " @@ -942,13 +876,11 @@ "escolher qualquer versão já publicada (não como rascunho) pela Free Software " "Foundation." -#. (itstool) path: sect1/title -#: C/index.docbook:614 +#: C/index.docbook:614(sect1/title) msgid "Addendum" msgstr "Apêndice" -#. (itstool) path: sect1/para -#: C/index.docbook:615 +#: C/index.docbook:615(sect1/para) msgid "" "To use this License in a document you have written, include a copy of the " "License in the document and put the following copyright and license notices " @@ -958,13 +890,11 @@ "desta no documento e adicione as seguintes notas de direitos autorais e " "licença logo após a página de título:" -#. (itstool) path: blockquote/para -#: C/index.docbook:622 +#: C/index.docbook:622(blockquote/para) msgid "Copyright © YEAR YOUR NAME." msgstr "Copyright © ANO SEU NOME." -#. (itstool) path: blockquote/para -#: C/index.docbook:625 +#: C/index.docbook:625(blockquote/para) msgid "" "Permission is granted to copy, distribute and/or modify this document under " "the terms of the GNU Free Documentation License, Version 1.1 or any later " @@ -985,8 +915,7 @@ "cópia da licença está inclusa na seção entitulada Licença de " "Documentação Livre GNU (GNU Free Documentation License)." -#. (itstool) path: sect1/para -#: C/index.docbook:640 +#: C/index.docbook:640(sect1/para) msgid "" "If you have no Invariant Sections, " "write with no Invariant Sections instead of saying which ones " @@ -1003,8 +932,7 @@ "mesmo se aplica a Textos de Contracapa." -#. (itstool) path: sect1/para -#: C/index.docbook:650 +#: C/index.docbook:650(sect1/para) msgid "" "If your document contains nontrivial examples of program code, we recommend " "releasing these examples in parallel under your choice of free software " diff -Nru gnome-desktop3-3.12.0/desktop-docs/gpl/ca/ca.po gnome-desktop3-3.8.4/desktop-docs/gpl/ca/ca.po --- gnome-desktop3-3.12.0/desktop-docs/gpl/ca/ca.po 2013-11-11 17:23:17.000000000 +0000 +++ gnome-desktop3-3.8.4/desktop-docs/gpl/ca/ca.po 2013-09-04 11:15:57.000000000 +0000 @@ -1,65 +1,53 @@ msgid "" msgstr "" "Project-Id-Version: GPL\n" -"POT-Creation-Date: 2012-08-18 21:44+0000\n" -"PO-Revision-Date: 2013-04-30 18:39+0200\n" -"Last-Translator: Gil Forcada \n" -"Language-Team: Catalan \n" -"Language: ca\n" +"POT-Creation-Date: 2009-02-13 19:16+0000\n" +"PO-Revision-Date: 2009-02-13 18:27+0100\n" +"Last-Translator: Sílvia Miranda \n" +"Language-Team: Catalan \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" -"Content-Transfer-Encoding: 8bits\n" -"Plural-Forms: nplurals=2; plural=n != 1;\n" +"Content-Transfer-Encoding: 8bit\n" -#. Put one translator per line, in the form NAME , YEAR1, YEAR2 -msgctxt "_" -msgid "translator-credits" -msgstr "" -"Sílvia Miranda , 2007.\n" -"Gil Forcada , 2013" - -#: C/index.docbook:17(articleinfo/title) +#: C/gpl.xml:17(title) msgid "GNU General Public License" msgstr "Llicència pública general de GNU" -#: C/index.docbook:18(articleinfo/copyright) -msgid "2000 Free Software Foundation, Inc." -msgstr "2000 Free Software Foundation, Inc." - -#: C/index.docbook:23(articleinfo/author) -msgid "Free Software Foundation" -msgstr "Free Software Foundation" +#: C/gpl.xml:19(year) +msgid "2000" +msgstr "2000" + +#: C/gpl.xml:20(holder) +msgid "Free Software Foundation, Inc." +msgstr "Free Software Foundation, Inc" + +#: C/gpl.xml:24(surname) +msgid "Free Software Foundation" +msgstr "Free Software Foundation" -#: C/index.docbook:28(publisher/publishername) +#: C/gpl.xml:28(publishername) msgid "GNOME Documentation Project" msgstr "Projecte de documentació del GNOME" -#: C/index.docbook:32(revhistory/revision) -msgid "2 1991-06" -msgstr "2 1991-06" - -#: C/index.docbook:40(para/address) -#, no-wrap -msgid "" -"Free Software Foundation, Inc. \n" -"\t 51 Franklin Street, Fifth Floor, \n" -"\t Boston, \n" -"\t MA 02110-1301\n" -"\t USA\n" -"\t" -msgstr "" -"Free Software Foundation, Inc. \n" -"\t 51 Franklin Street, Fifth Floor, \n" -"\t Boston, \n" -"\t MA 02110-1301\n" -"\t USA\n" -"\t" - -#: C/index.docbook:39(legalnotice/para) -msgid "<_:address-1/>." -msgstr "<_:address-1/>." +#: C/gpl.xml:33(revnumber) +msgid "2" +msgstr "2" -#: C/index.docbook:48(legalnotice/para) +#: C/gpl.xml:34(date) +msgid "1991-06" +msgstr "1991-06" + +#: C/gpl.xml:39(para) +msgid "" +"
Free Software Foundation, Inc. 51 Franklin Street, Fifth " +"Floor, Boston, MA02110-1301USA
." +msgstr "" +"
Free Software Foundation, Inc. 51 Franklin Street, Fifth " +"Floor, Boston, MA02110-1301USA
." + +#: C/gpl.xml:48(para) msgid "" "Everyone is permitted to copy and distribute verbatim copies of this license " "document, but changing it is not allowed." @@ -67,11 +55,11 @@ "Tothom pot copiar i distribuir còpies literals d'aquest document de " "llicència, però no es permet de fer-hi modificacions." -#: C/index.docbook:54(articleinfo/releaseinfo) +#: C/gpl.xml:54(releaseinfo) msgid "Version 2, June 1991" msgstr "Versió 2, Juny de 1991" -#: C/index.docbook:58(abstract/para) +#: C/gpl.xml:58(para) msgid "" "The licenses for most software are designed to take away your freedom to " "share and change it. By contrast, the GNU General Public License is intended " @@ -84,11 +72,11 @@ "compartir i modificar el programari lliure, per tal d'assegurar que el " "programari sigui lliure per a tots els seus usuaris i usuàries." -#: C/index.docbook:67(sect1/title) +#: C/gpl.xml:67(title) msgid "Preamble" msgstr "Preàmbul" -#: C/index.docbook:69(sect1/para) +#: C/gpl.xml:69(para) msgid "" "The licenses for most software are designed to take away your freedom to " "share and change it. By contrast, the GNU General Public License is intended " @@ -111,7 +99,7 @@ "Llicència pública general per a biblioteques de GNU). També podeu aplicar-la " "als vostres programes. " -#: C/index.docbook:81(sect1/para) +#: C/gpl.xml:81(para) msgid "" "When we speak of free software, we are referring to freedom, not price. Our " "General Public Licenses are designed to make sure that you have the freedom " @@ -127,7 +115,7 @@ "pugueu rebre; que pugueu modificar el programari o fer-ne servir parts en " "programes lliures nous; i que sapigueu que podeu fer totes aquestes coses. " -#: C/index.docbook:90(sect1/para) +#: C/gpl.xml:90(para) msgid "" "To protect your rights, we need to make restrictions that forbid anyone to " "deny you these rights or to ask you to surrender the rights. These " @@ -139,7 +127,7 @@ "renuncieu. Aquestes restriccions suposen determinades responsabilitats per a " "vós si distribuïu còpies del programari o si el modifiqueu. " -#: C/index.docbook:97(sect1/para) +#: C/gpl.xml:97(para) msgid "" "For example, if you distribute copies of such a program, whether gratis or " "for a fee, you must give the recipients all the rights that you have. You " @@ -152,11 +140,11 @@ "puguin aconseguir-ne el codi font, i els heu de fer saber aquests termes per " "tal que coneguin els seus drets. " -#: C/index.docbook:109(listitem/para) +#: C/gpl.xml:109(para) msgid "copyright the software, and" msgstr "Ens reservem el copyright del programari, i " -#: C/index.docbook:114(listitem/para) +#: C/gpl.xml:114(para) msgid "" "offer you this license which gives you legal permission to copy, distribute " "and/or modify the software." @@ -164,11 +152,11 @@ "us oferim aquesta llicència que us dóna permís legal per a copiar, " "distribuir i/o modificar el programari. " -#: C/index.docbook:104(sect1/para) -msgid "We protect your rights with two steps: <_:orderedlist-1/>" -msgstr "Protegim els vostres drets amb dos passos: <_:orderedlist-1/>" +#: C/gpl.xml:104(para) +msgid "We protect your rights with two steps: " +msgstr "Protegim els vostres drets amb dos passos: " -#: C/index.docbook:122(sect1/para) +#: C/gpl.xml:122(para) msgid "" "Also, for each author's protection and ours, we want to make certain that " "everyone understands that there is no warranty for this free software. If " @@ -184,7 +172,7 @@ "qualsevol problema que hagin pogut introduir terceres persones no " "repercuteixi en la reputació de l'autor o autora original. " -#: C/index.docbook:131(sect1/para) +#: C/gpl.xml:131(para) msgid "" "Finally, any free program is threatened constantly by software patents. We " "wish to avoid the danger that redistributors of a free program will " @@ -199,7 +187,7 @@ "evitar-ho, hem deixat clar que, de qualsevol patent, se n'han d'emetre " "llicències per a tothom o no emetre'n cap. " -#: C/index.docbook:139(sect1/para) +#: C/gpl.xml:139(para) msgid "" "The precise terms and conditions for copying, distribution and modification " "follow." @@ -207,15 +195,15 @@ "Les condicions exactes per a la còpia, distribució i modificació són les " "següents." -#: C/index.docbook:147(sect1/title) +#: C/gpl.xml:147(title) msgid "TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION" msgstr "TERMES I CONDICIONS PER A LA CÒPIA, DISTRIBUCIÓ I MODIFICACIÓ" -#: C/index.docbook:150(sect2/title) +#: C/gpl.xml:150(title) msgid "Section 0" msgstr "Secció 0" -#: C/index.docbook:151(sect2/para) +#: C/gpl.xml:151(para) msgid "" "This License applies to any program or other work which contains a notice " "placed by the copyright holder saying it may be distributed under the terms " @@ -240,7 +228,7 @@ "quote>." # fuzzy; -#: C/index.docbook:163(sect2/para) +#: C/gpl.xml:163(para) msgid "" "Activities other than copying, distribution and modification are not covered " "by this License; they are outside its scope. The act of running the Program " @@ -256,11 +244,11 @@ "basada en el programa (independentment de si s'ha creat executant el " "programa). Que aquest sigui el cas o no depèn de què faci el programa." -#: C/index.docbook:173(sect2/title) +#: C/gpl.xml:173(title) msgid "Section 1" msgstr "Secció 1" -#: C/index.docbook:174(sect2/para) +#: C/gpl.xml:174(para) msgid "" "You may copy and distribute verbatim copies of the Program's source code as " "you receive it, in any medium, provided that you conspicuously and " @@ -276,7 +264,7 @@ "l'absència de garanties de cap mena; i lliureu a qualsevol altre destinatari " "del programa una còpia d'aquesta llicència juntament amb el programa. " -#: C/index.docbook:183(sect2/para) +#: C/gpl.xml:183(para) msgid "" "You may charge a fee for the physical act of transferring a copy, and you " "may at your option offer warranty protection in exchange for a fee." @@ -284,11 +272,11 @@ "Podeu cobrar un preu per l'acte físic de trametre una còpia i podeu, si així " "ho voleu, oferir alguna garantia a canvi d'un preu. " -#: C/index.docbook:190(sect2/title) +#: C/gpl.xml:190(title) msgid "Section 2" msgstr "Secció 2" -#: C/index.docbook:199(listitem/para) +#: C/gpl.xml:199(para) msgid "" "You must cause the modified files to carry prominent notices stating that " "you changed the files and the date of any change." @@ -297,7 +285,7 @@ "diguin que heu modificat els fitxers, i hi heu d'escriure la data de la " "modificació." -#: C/index.docbook:205(listitem/para) +#: C/gpl.xml:205(para) msgid "" "You must cause any work that you distribute or publish, that in whole or in " "part contains or is derived from the Program or any part thereof, to be " @@ -309,11 +297,11 @@ "publiqueu, que completament o en part contingui o sigui un derivat del " "programa o qualsevol part del programa." -#: C/index.docbook:223(note/title) +#: C/gpl.xml:223(title) msgid "Exception:" msgstr "Excepció:" -#: C/index.docbook:224(note/para) +#: C/gpl.xml:224(para) msgid "" "If the Program itself is interactive but does not normally print such an " "announcement, your work based on the Program is not required to print an " @@ -323,7 +311,7 @@ "que s'ha descrit, tampoc cal que les obres que feu basades en el programa en " "portin cap. " -#: C/index.docbook:213(listitem/para) +#: C/gpl.xml:213(para) msgid "" "If the modified program normally reads commands interactively when run, you " "must cause it, when started running for such interactive use in the most " @@ -331,7 +319,7 @@ "copyright notice and a notice that there is no warranty (or else, saying " "that you provide a warranty) and that users may redistribute the program " "under these conditions, and telling the user how to view a copy of this " -"License. <_:note-1/>" +"License. " msgstr "" "Si el programa modificat normalment llegeix instruccions interactivament " "quan s'executa, heu de fer que quan s'arrenqui per a aquest ús interactiu de " @@ -339,23 +327,23 @@ "nota de copyright adient i un avís de que no hi ha garantia (o, si no, que " "digui que la garantia l'oferiu vós mateix) i que els usuaris poden " "redistribuir el programa sota aquestes condicions, i que indiqui a l'usuari " -"o usuària com veure una còpia d'aquesta llicència. <_:note-1/>" +"o usuària com veure una còpia d'aquesta llicència. " -#: C/index.docbook:191(sect2/para) +#: C/gpl.xml:191(para) msgid "" "You may modify your copy or copies of the Program or any portion of it, thus " "forming a work based on the Program, and copy and distribute such " "modifications or work under the terms of Section 1 above, provided that you also meet all of these conditions: <_:" -"orderedlist-1/>" +"link> above, provided that you also meet all of these conditions: " +"" msgstr "" "Podeu modificar la còpia o còpies del programa o qualsevol tros del programa " "i, així, fer una obra basada en el programa, i podeu copiar i distribuir " -"aquestes modificacions o obres sota els termes de la Secció 1 anterior, sempre que també compliu les condicions " -"següents: <_:orderedlist-1/>" +"aquestes modificacions o obres sota els termes de la Secció 1 anterior, sempre que també compliu les condicions " +"següents:" -#: C/index.docbook:236(sect2/para) +#: C/gpl.xml:236(para) msgid "" "These requirements apply to the modified work as a whole. If identifiable " "sections of that work are not derived from the Program, and can be " @@ -378,7 +366,7 @@ "tant, totes i cadascuna de les parts, independentment de qui les hagi " "escrites. " -#: C/index.docbook:247(sect2/para) +#: C/gpl.xml:247(para) msgid "" "Thus, it is not the intent of this section to claim rights or contest your " "rights to work written entirely by you; rather, the intent is to exercise " @@ -390,7 +378,7 @@ "exercir el dret a controlar la distribució d'obres derivades o col·lectives " "basades en el programa." -#: C/index.docbook:253(sect2/para) +#: C/gpl.xml:253(para) msgid "" "In addition, mere aggregation of another work not based on the Program with " "the Program (or with a work based on the Program) on a volume of a storage " @@ -402,23 +390,23 @@ "d'emmagatzemament o de distribució no posa aquestes altres obres sota " "l'àmbit de la llicència." -#: C/index.docbook:261(sect2/title) +#: C/gpl.xml:261(title) msgid "Section 3" msgstr "Secció 3" -#: C/index.docbook:271(listitem/para) +#: C/gpl.xml:271(para) msgid "" "Accompany it with the complete corresponding machine-readable source code, " -"which must be distributed under the terms of Sections 1 and 2 above on a " -"medium customarily used for software interchange; or," +"which must be distributed under the terms of Sections 1 and 2 above on a medium " +"customarily used for software interchange; or," msgstr "" "L'acompanyeu amb el codi font complet corresponent, capaç de ser llegit per " "un ordinador, que es distribuirà d'acord amb els termes de les seccions 1 i 2 anteriors en " "un mitjà utilitzat habitualment per a l'intercanvi de programari; o, " -#: C/index.docbook:278(listitem/para) +#: C/gpl.xml:278(para) msgid "" "Accompany it with a written offer, valid for at least three years, to give " "any third party, for a charge no more than your cost of physically " @@ -433,7 +421,7 @@ "seccions 1 i 2 anteriors en un mitjà utilitzat habitualment per a " "l'intercanvi de programari; o, " -#: C/index.docbook:287(listitem/para) +#: C/gpl.xml:287(para) msgid "" "Accompany it with the information you received as to the offer to distribute " "corresponding source code. (This alternative is allowed only for " @@ -447,21 +435,21 @@ "executable o de codi objecte amb aquest oferiment, d'acord amb la subsecció " "b anterior)." -#: C/index.docbook:263(sect2/para) +#: C/gpl.xml:263(para) msgid "" "You may copy and distribute the Program (or a work based on it, under Section 2) in object code or executable form under " "the terms of Sections 1 and 2 above provided that you also do one of the following: <_:" -"orderedlist-1/>" +"\"sect2\">2 above provided that you also do one of the following: " +"" msgstr "" "Podeu copiar i distribuir el programa (o una obra basada en el programa, " "segons la secció 2) en forma executable o de " "codi objecte d'acord amb els termes de les seccions " "1 i 2 anteriors, amb la condició que " -"també feu una de les coses següents: <_:orderedlist-1/>" +"també feu una de les coses següents:" -#: C/index.docbook:297(sect2/para) +#: C/gpl.xml:297(para) msgid "" "The source code for a work means the preferred form of the work for making " "modifications to it. For an executable work, complete source code means all " @@ -484,7 +472,7 @@ "nucli o similars) del sistema operatiu en què s'executa el programa, tret " "que el component en qüestió acompanyi l'executable." -#: C/index.docbook:307(sect2/para) +#: C/gpl.xml:307(para) msgid "" "If distribution of executable or object code is made by offering access to " "copy from a designated place, then offering equivalent access to copy the " @@ -498,11 +486,11 @@ "terceres parts no estiguin obligades a copiar el codi font en copiar el codi " "objecte." -#: C/index.docbook:316(sect2/title) +#: C/gpl.xml:316(title) msgid "Section 4" msgstr "Secció 4" -#: C/index.docbook:318(sect2/para) +#: C/gpl.xml:318(para) msgid "" "You may not copy, modify, sublicense, or distribute the Program except as " "expressly provided under this License. Any attempt otherwise to copy, " @@ -519,11 +507,11 @@ "drets d'acord amb aquesta llicència no veuran les seves llicències " "finalitzades mentre segueixin observant-les estrictament." -#: C/index.docbook:328(sect2/title) +#: C/gpl.xml:328(title) msgid "Section 5" msgstr "Secció 5" -#: C/index.docbook:330(sect2/para) +#: C/gpl.xml:330(para) msgid "" "You are not required to accept this License, since you have not signed it. " "However, nothing else grants you permission to modify or distribute the " @@ -542,11 +530,11 @@ "per copiar, distribuir o modificar el programa o obres que hi estiguin " "basades." -#: C/index.docbook:341(sect2/title) +#: C/gpl.xml:341(title) msgid "Section 6" msgstr "Secció 6" -#: C/index.docbook:343(sect2/para) +#: C/gpl.xml:343(para) msgid "" "Each time you redistribute the Program (or any work based on the Program), " "the recipient automatically receives a license from the original licensor to " @@ -562,11 +550,11 @@ "l'exercici dels drets que aquí es confereixen. No sou responsable de fer " "complir aquesta llicència a terceres parts." -#: C/index.docbook:353(sect2/title) +#: C/gpl.xml:353(title) msgid "Section 7" msgstr "Secció 7" -#: C/index.docbook:355(sect2/para) +#: C/gpl.xml:355(para) msgid "" "If, as a consequence of a court judgment or allegation of patent " "infringement or for any other reason (not limited to patent issues), " @@ -594,7 +582,7 @@ "satisfer tant això com aquesta llicència seria abstenir-vos completament de " "distribuir el programa." -#: C/index.docbook:367(sect2/para) +#: C/gpl.xml:367(para) msgid "" "If any portion of this section is held invalid or unenforceable under any " "particular circumstance, the balance of the section is intended to apply and " @@ -605,7 +593,7 @@ "el balanç de la secció, i que s'apliqui la secció en la seva totalitat en " "altres circumstàncies." -#: C/index.docbook:373(sect2/para) +#: C/gpl.xml:373(para) msgid "" "It is not the purpose of this section to induce you to infringe any patents " "or other property right claims or to contest validity of any such claims; " @@ -627,7 +615,7 @@ "decidir si vol distribuir programari per algun altre sistema, i un " "beneficiari de la llicència no pot imposar aquesta elecció." -#: C/index.docbook:383(sect2/para) +#: C/gpl.xml:383(para) msgid "" "This section is intended to make thoroughly clear what is believed to be a " "consequence of the rest of this License." @@ -635,11 +623,11 @@ "Aquesta secció pretén deixar del tot clar el que es considera una " "conseqüència de la resta de la llicència." -#: C/index.docbook:390(sect2/title) +#: C/gpl.xml:390(title) msgid "Section 8" msgstr "Secció 8" -#: C/index.docbook:392(sect2/para) +#: C/gpl.xml:392(para) msgid "" "If the distribution and/or use of the Program is restricted in certain " "countries either by patents or by copyrighted interfaces, the original " @@ -657,11 +645,11 @@ "ells. En tal cas, aquesta llicència incorpora la limitació com si estigués " "escrita en el text de la llicència." -#: C/index.docbook:402(sect2/title) +#: C/gpl.xml:402(title) msgid "Section 9" msgstr "Secció 9" -#: C/index.docbook:404(sect2/para) +#: C/gpl.xml:404(para) msgid "" "The Free Software Foundation may publish revised and/or new versions of the " "General Public License from time to time. Such new versions will be similar " @@ -673,7 +661,7 @@ "semblants en esperit a la versió present, però poden diferir en detalls per " "tractar noves preocupacions o problemes." -#: C/index.docbook:410(sect2/para) +#: C/gpl.xml:410(para) msgid "" "Each version is given a distinguishing version number. If the Program " "specifies a version number of this License which applies to it and " @@ -692,11 +680,11 @@ "triar qualsevol versió que hagi publicat la Free Software Foundation en " "qualsevol data." -#: C/index.docbook:420(sect2/title) +#: C/gpl.xml:420(title) msgid "Section 10" msgstr "Secció 10" -#: C/index.docbook:422(sect2/para) +#: C/gpl.xml:422(para) msgid "" "If you wish to incorporate parts of the Program into other free programs " "whose distribution conditions are different, write to the author to ask for " @@ -715,15 +703,15 @@ "programari lliure i de promoure la compartició i la reutilització del " "programari en general." -#: C/index.docbook:432(sect2/title) +#: C/gpl.xml:432(title) msgid "NO WARRANTY" msgstr "SENSE GARANTIA" -#: C/index.docbook:433(sect2/subtitle) +#: C/gpl.xml:433(subtitle) msgid "Section 11" msgstr "Secció 11" -#: C/index.docbook:435(sect2/para) +#: C/gpl.xml:435(para) msgid "" "BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY FOR THE " "PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW. EXCEPT WHEN OTHERWISE " @@ -745,11 +733,11 @@ "VOSTRE. EN CAS QUE EL PROGRAMA RESULTÉS DEFECTUÓS, VÓS ASSUMIU TOT EL COST " "D'ASSISTÈNCIA, REPARACIÓ O CORRECCIÓ." -#: C/index.docbook:446(sect2/title) +#: C/gpl.xml:446(title) msgid "Section 12" msgstr "Secció 12" -#: C/index.docbook:448(sect2/para) +#: C/gpl.xml:448(para) msgid "" "IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING WILL " "ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR REDISTRIBUTE " @@ -771,3 +759,8 @@ "IMPOSSIBILITAT QUE EL PROGRAMA FUNCIONI AMB QUALSEVOL ALTRE PROGRAMA), FINS " "I TOT SI AQUEST POSSEÏDOR O ALTRA PART HA ESTAT ADVERTIDA DE LA POSSIBILITAT " "D'AQUESTS PERJUDICIS." + +#. Put one translator per line, in the form of NAME , YEAR1, YEAR2. +#: C/gpl.xml:0(None) +msgid "translator-credits" +msgstr "Sílvia Miranda , 2007." diff -Nru gnome-desktop3-3.12.0/desktop-docs/gpl/ca/index.docbook gnome-desktop3-3.8.4/desktop-docs/gpl/ca/index.docbook --- gnome-desktop3-3.12.0/desktop-docs/gpl/ca/index.docbook 2014-03-24 14:31:52.000000000 +0000 +++ gnome-desktop3-3.8.4/desktop-docs/gpl/ca/index.docbook 2013-09-04 11:30:11.000000000 +0000 @@ -11,25 +11,35 @@
Llicència pública general de GNU - 2000 Free Software Foundation, Inc. + + 2000 + Free Software Foundation, Inc. + - Free Software Foundation + + Free Software Foundation + Projecte de documentació del GNOME - 2 1991-06 + + 2 + 1991-06 + -
Free Software Foundation, Inc. + +
Free Software Foundation, Inc. 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA -
. +
. + Tothom pot copiar i distribuir còpies literals d'aquest document de llicència, però no es permet de fer-hi modificacions. @@ -37,32 +47,6 @@ Versió 2, Juny de 1991 Les llicències de la majoria de programari estan dissenyades per a prendre-us la llibertat de compartir-lo i modificar-lo. Contràriament, la Llicència pública general de GNU està pensada per a garantir-vos la llibertat de compartir i modificar el programari lliure, per tal d'assegurar que el programari sigui lliure per a tots els seus usuaris i usuàries. - - - - Sílvia Miranda - - silviamira@gmail.com - - - - 2007. - - Sílvia Miranda - - - - - Gil Forcada - - gilforcada@guifi.net - - - - 2013 - - Gil Forcada - @@ -76,14 +60,23 @@ Per exemple, si distribuïu còpies d'un programa, tant si el distribuïu de franc com si en feu pagar un preu, heu de donar als destinataris els mateixos drets que teniu vós. Us heu d'assegurar que ells també en rebin o puguin aconseguir-ne el codi font, i els heu de fer saber aquests termes per tal que coneguin els seus drets. - Protegim els vostres drets amb dos passos: + + We protect your rights with two steps: + + - Ens reservem el copyright del programari, i + + copyright the software, and + - us oferim aquesta llicència que us dóna permís legal per a copiar, distribuir i/o modificar el programari. + + offer you this license which gives you legal permission to copy, + distribute and/or modify the software. + - + + A més a més, per protegir-nos i protegir l'autor o autora, volem estar segurs que tothom entén que no hi ha cap garantia per a aquest programari lliure. Si algú modifica el programari i el passa, volem que els destinataris sàpiguen que el que tenen no és l'original, per tal que qualsevol problema que hagin pogut introduir terceres persones no repercuteixi en la reputació de l'autor o autora original. @@ -112,20 +105,50 @@ Secció 2 - Podeu modificar la còpia o còpies del programa o qualsevol tros del programa i, així, fer una obra basada en el programa, i podeu copiar i distribuir aquestes modificacions o obres sota els termes de la Secció 1 anterior, sempre que també compliu les condicions següents: - - Heu de fer que els fitxers modificats portin indicacions ben visibles que diguin que heu modificat els fitxers, i hi heu d'escriure la data de la modificació. - - - Heu d'atorgar gratuïtament a totes les terceres parts els termes d'aquesta mateixa llicència sobre la totalitat de qualsevol obra que distribuïu o publiqueu, que completament o en part contingui o sigui un derivat del programa o qualsevol part del programa. - - - Si el programa modificat normalment llegeix instruccions interactivament quan s'executa, heu de fer que quan s'arrenqui per a aquest ús interactiu de la manera més habitual, imprimeixi o mostri un missatge que inclogui una nota de copyright adient i un avís de que no hi ha garantia (o, si no, que digui que la garantia l'oferiu vós mateix) i que els usuaris poden redistribuir el programa sota aquestes condicions, i que indiqui a l'usuari o usuària com veure una còpia d'aquesta llicència. - Excepció: - Si el programa és interactiu però normalment no porta cap indicació com la que s'ha descrit, tampoc cal que les obres que feu basades en el programa en portin cap. - + + You may modify your copy or copies of the Program or any portion of it, thus + forming a work based on the Program, and copy and distribute such modifications + or work under the terms of Section 1 above, provided + that you also meet all of these conditions: + + + + + You must cause the modified files to carry prominent notices stating that + you changed the files and the date of any change. + + + + + You must cause any work that you distribute or publish, that in whole or + in part contains or is derived from the Program or any part thereof, to be + licensed as a whole at no charge to all third parties under the terms of + this License. + + + + + If the modified program normally reads commands interactively when run, you + must cause it, when started running for such interactive use in the most + ordinary way, to print or display an announcement including an appropriate + copyright notice and a notice that there is no warranty (or else, saying + that you provide a warranty) and that users may redistribute the program + under these conditions, and telling the user how to view a copy of this + License. + + + Exception: + + If the Program itself is interactive but does not normally print such an + announcement, your work based on the Program is not required to print an + announcement. + + + + - + + Aquests requeriments afecten l'obra modificada com un tot. Si hi ha parts identificables que no estan derivades del programa, i es poden considerar raonablement com a obres independents i separades en si mateixes, aleshores aquesta llicència i els seus termes no s'apliquen a aquelles parts quan les distribuïu com a obres separades. Però quan distribuïu aquestes mateixes parts integrades en un tot que sigui una obra basada en el programa, la distribució del tot s'ha de fer d'acord amb els termes d'aquesta llicència, i els permisos atorgats a altres beneficiaris abasten el tot sencer i, per tant, totes i cadascuna de les parts, independentment de qui les hagi escrites. @@ -137,17 +160,39 @@ Secció 3 - Podeu copiar i distribuir el programa (o una obra basada en el programa, segons la secció 2) en forma executable o de codi objecte d'acord amb els termes de les seccions 1 i 2 anteriors, amb la condició que també feu una de les coses següents: - - L'acompanyeu amb el codi font complet corresponent, capaç de ser llegit per un ordinador, que es distribuirà d'acord amb els termes de les seccions 1 i 2 anteriors en un mitjà utilitzat habitualment per a l'intercanvi de programari; o, - - - L'acompanyeu amb un oferiment per escrit, amb validesa com a mínim fins al cap de tres anys, de subministrar a tota tercera part, i per un preu no superior al que us costi físicament realitzar la distribució, el codi font complet corresponent, que es distribuirà d'acord amb els termes de les seccions 1 i 2 anteriors en un mitjà utilitzat habitualment per a l'intercanvi de programari; o, - - - L'acompanyeu amb la informació que hagueu rebut de l'oferiment de distribuir el codi font corresponent (aquesta alternativa només és permesa per a la distribució no comercial i només si heu rebut el programa en forma executable o de codi objecte amb aquest oferiment, d'acord amb la subsecció b anterior). + + You may copy and distribute the Program (or a work based on it, under + Section 2) in object code or executable form under the terms of + Sections 1 and 2 above provided that + you also do one of the following: + + + + + Accompany it with the complete corresponding machine-readable source code, which + must be distributed under the terms of Sections 1 and 2 above on a medium + customarily used for software interchange; or, + + + + + Accompany it with a written offer, valid for at least three years, to give any + third party, for a charge no more than your cost of physically performing source + distribution, a complete machine-readable copy of the corresponding source code, + to be distributed under the terms of Sections 1 and 2 above on a medium customarily + used for software interchange; or, + + + + + Accompany it with the information you received as to the offer to distribute + corresponding source code. (This alternative is allowed only for noncommercial + distribution and only if you received the program in object code or executable form + with such an offer, in accord with Subsection b above.) + - + + El codi font per a una obra vol dir la forma preferida de l'obra per a fer-hi modificacions. Per una obra executable, el codi font complet vol dir tot el codi font per a tots els mòduls que conté, més tots els fitxers de definició d'interfícies associats si s'escau, més els scripts que es facin servir per a controlar la compilació i la instal·lació de l'executable si s'escau. Tanmateix, com a excepció especial, el codi font que es distribueixi no cal que inclogui res del que normalment es distribueixi (sia en forma binària o de codi font) amb els components principals (compilador, nucli o similars) del sistema operatiu en què s'executa el programa, tret que el component en qüestió acompanyi l'executable. diff -Nru gnome-desktop3-3.12.0/desktop-docs/gpl/gl/gl.po gnome-desktop3-3.8.4/desktop-docs/gpl/gl/gl.po --- gnome-desktop3-3.12.0/desktop-docs/gpl/gl/gl.po 2013-11-11 17:23:17.000000000 +0000 +++ gnome-desktop3-3.8.4/desktop-docs/gpl/gl/gl.po 1970-01-01 00:00:00.000000000 +0000 @@ -1,862 +0,0 @@ -# Galician translation for gnome-desktop. -# Copyright (C) 2013 gnome-desktop's COPYRIGHT HOLDER -# This file is distributed under the same license as the gnome-desktop package. -# Fran Dieguez , 2013. -msgid "" -msgstr "" -"Project-Id-Version: gnome-desktop master\n" -"POT-Creation-Date: 2013-08-31 11:22+0000\n" -"PO-Revision-Date: 2013-09-02 23:03+0200\n" -"Last-Translator: Fran Dieguez \n" -"Language-Team: gnome-l10n-gl@gnome.org\n" -"Language: gl\n" -"MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=UTF-8\n" -"Content-Transfer-Encoding: 8bit\n" -"Plural-Forms: nplurals=2; plural=(n != 1);\n" -"X-Generator: Virtaal 0.7.1\n" -"X-Project-Style: gnome\n" - -#. Put one translator per line, in the form NAME , YEAR1, YEAR2 -msgctxt "_" -msgid "translator-credits" -msgstr "Fran Dieguez , 2013;" - -#. (itstool) path: articleinfo/title -#: C/index.docbook:17 -msgid "GNU General Public License" -msgstr "Licenza Pública Xeral de GNU" - -#. (itstool) path: articleinfo/copyright -#: C/index.docbook:18 -msgid "2000 Free Software Foundation, Inc." -msgstr "2000 Free Software Foundation, Inc." - -#. (itstool) path: articleinfo/author -#: C/index.docbook:23 -msgid "Free Software Foundation" -msgstr "Free Software Foundation" - -#. (itstool) path: publisher/publishername -#: C/index.docbook:28 -msgid "GNOME Documentation Project" -msgstr "Proxecto de documentación de GNOME" - -#. (itstool) path: revhistory/revision -#: C/index.docbook:32 -msgid "2 1991-06" -msgstr "2 1991-06" - -#. (itstool) path: para/address -#: C/index.docbook:40 -#, no-wrap -msgid "" -"Free Software Foundation, Inc. \n" -"\t 51 Franklin Street, Fifth Floor, \n" -"\t Boston, \n" -"\t MA 02110-1301\n" -"\t USA\n" -"\t" -msgstr "" -"Free Software Foundation, Inc. \n" -"\t 51 Franklin Street, Fifth Floor, \n" -"\t Boston, \n" -"\t MA 02110-1301\n" -"\t USA\n" -"\t" - -#. (itstool) path: legalnotice/para -#: C/index.docbook:39 -msgid "<_:address-1/>." -msgstr "<_:address-1/>." - -#. (itstool) path: legalnotice/para -#: C/index.docbook:48 -msgid "" -"Everyone is permitted to copy and distribute verbatim copies of this license " -"document, but changing it is not allowed." -msgstr "" -"Permítese a copia e distribución de copias textuais desta licenza, sempre " -"que non se introduza ningunha modificación." - -#. (itstool) path: articleinfo/releaseinfo -#: C/index.docbook:54 -msgid "Version 2, June 1991" -msgstr "Versión 2, Xuño de 1991" - -#. (itstool) path: abstract/para -#: C/index.docbook:58 -msgid "" -"The licenses for most software are designed to take away your freedom to " -"share and change it. By contrast, the GNU General Public License is intended " -"to guarantee your freedom to share and change free software - to make sure " -"the software is free for all its users." -msgstr "" -"A maioría das licenzas de software están concibidas para privar o usuario da " -"súa liberdade de compartir e modificar ese software. Pola contra, a " -"licenza pública xeral de GNU busca garantir a súa liberdade para compartir e " -"modificar software libre, para se asegurar de que o software é libre para " -"todos os seus usuarios." - -#. (itstool) path: sect1/title -#: C/index.docbook:67 -msgid "Preamble" -msgstr "Preámbulo" - -#. (itstool) path: sect1/para -#: C/index.docbook:69 -msgid "" -"The licenses for most software are designed to take away your freedom to " -"share and change it. By contrast, the GNU General Public License is intended " -"to guarantee your freedom to share and change free software - to make sure " -"the software is free for all its users. This General Public License applies " -"to most of the Free Software Foundation's software and to any other program " -"whose authors commit to using it. (Some other Free Software Foundation " -"software is covered by the GNU Library General Public License instead.) You " -"can apply it to your programs, too." -msgstr "" -"A maioría das licenzas de software están concibidas para privar o usuario da " -"súa liberdade de compartir e modificar ese software. Pola contra, a " -"licenza pública xeral de GNU busca garantir a súa liberdade para compartir e " -"modificar software libre, para se asegurar de que o software é libre para " -"todos os seus usuarios. Esta licenza pública xeral é de aplicación á " -"maioría do software da Free Software Foundation, así como a calquera outro " -"programa cuxos autores se comprometan a utilizala (hai outro software da " -"Free Software Foundation que se rexe, no seu lugar, pola licenza pública " -"xeral reducida de GNU). Tamén pode aplicala aos seus propios programas." - -#. (itstool) path: sect1/para -#: C/index.docbook:81 -msgid "" -"When we speak of free software, we are referring to freedom, not price. Our " -"General Public Licenses are designed to make sure that you have the freedom " -"to distribute copies of free software (and charge for this service if you " -"wish), that you receive source code or can get it if you want it, that you " -"can change the software or use pieces of it in new free programs; and that " -"you know you can do these things." -msgstr "" -"Cando se fala de software libre fálase de liberdade, non de prezo. As nosas " -"licenzas públicas xerais están deseñadas co obxectivo de asegurar a súa " -"liberdade para distribuír copias de software libre (e cobrar por este " -"servizo, se así o desexa), que recibe o código fonte ou pode recibilo se así " -"o desexa, que ten a posibilidade de modificar o software ou empregar partes " -"del en novos programas libres e que, ademais, é consciente de que pode " -"facer todo isto." - -#. (itstool) path: sect1/para -#: C/index.docbook:90 -msgid "" -"To protect your rights, we need to make restrictions that forbid anyone to " -"deny you these rights or to ask you to surrender the rights. These " -"restrictions translate to certain responsibilities for you if you distribute " -"copies of the software, or if you modify it." -msgstr "" -"Para protexer os seus dereitos, cómpre introducir certas restricións que " -"impidan que calquera outro lle poida negar estes dereitos ou pedirlle que " -"renuncie a eles. Estas restricións implican determinadas responsabilidades " -"para vostede, no caso de distribuír copias do software ou modificalo." - -#. (itstool) path: sect1/para -#: C/index.docbook:97 -msgid "" -"For example, if you distribute copies of such a program, whether gratis or " -"for a fee, you must give the recipients all the rights that you have. You " -"must make sure that they, too, receive or can get the source code. And you " -"must show them these terms so they know their rights." -msgstr "" -"Por exemplo, se distribúe copias dun programa libre, sexa gratis ou non, " -"tenlle que ceder aos receptores todos os dereitos que ten vostede. Terase " -"que asegurar de que eses receptores tamén reciben ou poden recibir o código " -"fonte e terá que mostrarlles os termos desta licenza para informalos dos " -"seus dereitos." - -#. (itstool) path: listitem/para -#: C/index.docbook:109 -msgid "copyright the software, and" -msgstr "pór o software baixo copyright e" - -#. (itstool) path: listitem/para -#: C/index.docbook:114 -msgid "" -"offer you this license which gives you legal permission to copy, distribute " -"and/or modify the software." -msgstr "" -"ofrecerlle esta licenza, que o autoriza legalmente para copiar, distribuír " -"e/ou modificar o software." - -#. (itstool) path: sect1/para -#: C/index.docbook:104 -msgid "We protect your rights with two steps: <_:orderedlist-1/>" -msgstr "Dous son os pasos para protexer os seus dereitos: <_:orderedlist-1/>" - -#. (itstool) path: sect1/para -#: C/index.docbook:122 -msgid "" -"Also, for each author's protection and ours, we want to make certain that " -"everyone understands that there is no warranty for this free software. If " -"the software is modified by someone else and passed on, we want its " -"recipients to know that what they have is not the original, so that any " -"problems introduced by others will not reflect on the original authors' " -"reputations." -msgstr "" -"Ademais, como medida de protección para todos os autores e para nós mesmos, " -"é importante deixarlles claro a todas as partes que non existe garantía para " -"este software libre. No caso de que calquera usuario modifique o software " -"e logo o distribúa a un terceiro, os receptores deben saber que o que se " -"lles entrega non é o software orixinal, de xeito que calquera problema " -"introducido pola outra parte non afecte a reputación dos autores orixinais." - -#. (itstool) path: sect1/para -#: C/index.docbook:131 -msgid "" -"Finally, any free program is threatened constantly by software patents. We " -"wish to avoid the danger that redistributors of a free program will " -"individually obtain patent licenses, in effect making the program " -"proprietary. To prevent this, we have made it clear that any patent must be " -"licensed for everyone's free use or not licensed at all." -msgstr "" -"Por último, calquera programa libre está constantemente ameazado polas " -"patentes de software. A nosa intención é evitar o perigo de que os " -"redistribuidores dun programa libre obteñan licenzas de patente pola súa " -"conta, convertendo así o seu programa en software rexistrado. Para evitar " -"que isto suceda, deixamos ben claro que calquera patente debe de garantir a " -"cesión da licenza a calquera usuario posible, de maneira que todo o mundo " -"poida usar o programa libremente ou, en caso contrario, non debe de garantir " -"licenza ningunha a ninguén." - -#. (itstool) path: sect1/para -#: C/index.docbook:139 -msgid "" -"The precise terms and conditions for copying, distribution and modification " -"follow." -msgstr "" -"A seguir detállanse os termos e condicións exactos para a copia, " -"distribución e modificación." - -#. (itstool) path: sect1/title -#: C/index.docbook:147 -msgid "TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION" -msgstr "TERMOS E CONDICIÓNS PARA A COPIA, DISTRIBUCIÓN E MODIFICACIÓN" - -#. (itstool) path: sect2/title -#: C/index.docbook:150 -msgid "Section 0" -msgstr "Sección 0" - -#. (itstool) path: sect2/para -#: C/index.docbook:151 -msgid "" -"This License applies to any program or other work which contains a notice " -"placed by the copyright holder saying it may be distributed under the terms " -"of this General Public License. The Program, below, refers to " -"any such program or work, and a work based on the Program " -"means either the Program or any derivative work under copyright law: that is " -"to say, a work containing the Program or a portion of it, either verbatim or " -"with modifications and/or translated into another language. (Hereinafter, " -"translation is included without limitation in the term modification.) Each licensee is addressed as you." -msgstr "" -"Esta licenza é aplicable a calquera programa ou produto doutro tipo no que " -"figure un aviso inserido polo titular do copyright que especifique que se " -"pode distribuír baixo os termos desta licenza pública xeral. De aquí en " -"adiante, o termo Programa referirase a calquera programa ou " -"produto deste tipo, mentres que o termo produto baseado no " -"Programa referirase tanto ao programa coma a calquera produto " -"derivado consonte a lei de propiedade intelectual, é dicir, calquera produto " -"que conteña o programa ou unha parte del, sexa textual ou con modificacións " -"e/ou traducida a outra lingua. (De aquí en adiante, a tradución inclúese " -"sen límite ningún no termo modificación.) As licenzas están " -"redactadas na forma de cortesía vostede." - -#. (itstool) path: sect2/para -#: C/index.docbook:163 -msgid "" -"Activities other than copying, distribution and modification are not covered " -"by this License; they are outside its scope. The act of running the Program " -"is not restricted, and the output from the Program is covered only if its " -"contents constitute a work based on the Program (independent of having been " -"made by running the Program). Whether that is true depends on what the " -"Program does." -msgstr "" -"Calquera actividade distinta da copia, distribución e modificación non está " -"cuberta por esta licenza, senón que queda fóra do seu ámbito de aplicación. " -" Non se restrinxe a acción de executar o Programa, e os resultados tirados " -"do Programa só están cubertos se o seu contido constitúe un produto baseado " -"no Programa (sen importar se foi realizado mediante a execución do " -"Programa). Que isto sexa certo ou non dependerá do que faga o Programa." - -#. (itstool) path: sect2/title -#: C/index.docbook:173 -msgid "Section 1" -msgstr "Sección 1" - -#. (itstool) path: sect2/para -#: C/index.docbook:174 -msgid "" -"You may copy and distribute verbatim copies of the Program's source code as " -"you receive it, in any medium, provided that you conspicuously and " -"appropriately publish on each copy an appropriate copyright notice and " -"disclaimer of warranty; keep intact all the notices that refer to this " -"License and to the absence of any warranty; and give any other recipients of " -"the Program a copy of this License along with the Program." -msgstr "" -"Pode modificar a súa copia ou copias do Programa, ou calquera parte del, e " -"obter así un produto baseado no Programa, así como copiar e distribuír as " -"devanditas modificacións ou produto de acordo cos termos do apartado 1 " -"anterior, sempre que cumpra tamén con todas as condicións seguintes:" - -#. (itstool) path: sect2/para -#: C/index.docbook:183 -msgid "" -"You may charge a fee for the physical act of transferring a copy, and you " -"may at your option offer warranty protection in exchange for a fee." -msgstr "" -"Pode cobrar unha taxa polo acto físico de transferir unha copia e, se " -"vostede quixer, pode tamén ofrecer unha determinada garantía a cambio do " -"pagamento dunha taxa." - -#. (itstool) path: sect2/title -#: C/index.docbook:190 -msgid "Section 2" -msgstr "Sección 2" - -#. (itstool) path: listitem/para -#: C/index.docbook:199 -msgid "" -"You must cause the modified files to carry prominent notices stating that " -"you changed the files and the date of any change." -msgstr "" -"Pode modificar a súa copia ou copias do Programa, ou calquera parte del, e " -"obter así un produto baseado no Programa, así como copiar e distribuír as " -"devanditas modificacións ou produto de acordo cos termos do apartado 1 " -"anterior, sempre que cumpra tamén con todas as condicións seguintes:" - -#. (itstool) path: listitem/para -#: C/index.docbook:205 -msgid "" -"You must cause any work that you distribute or publish, that in whole or in " -"part contains or is derived from the Program or any part thereof, to be " -"licensed as a whole at no charge to all third parties under the terms of " -"this License." -msgstr "" -"Debe facer que calquera produto distribuído ou publicado por vostede, que en " -"todo ou en parte conteña ou derive do Programa ou de calquera parte do " -"Programa, obteña unha licenza no seu conxunto sen que isto repercuta en " -"ningún gasto para calquera terceira parte de acordo cos termos desta " -"licenza." - -#. (itstool) path: note/title -#: C/index.docbook:223 -msgid "Exception:" -msgstr "Excepción:" - -#. (itstool) path: note/para -#: C/index.docbook:224 -msgid "" -"If the Program itself is interactive but does not normally print such an " -"announcement, your work based on the Program is not required to print an " -"announcement." -msgstr "" -"Se o Programa en si mesmo é interactivo pero non adoita mostrar avisos deste " -"tipo, non é necesario que o seu produto baseado no Programa exhiba ningún " -"aviso." - -#. (itstool) path: listitem/para -#: C/index.docbook:213 -msgid "" -"If the modified program normally reads commands interactively when run, you " -"must cause it, when started running for such interactive use in the most " -"ordinary way, to print or display an announcement including an appropriate " -"copyright notice and a notice that there is no warranty (or else, saying " -"that you provide a warranty) and that users may redistribute the program " -"under these conditions, and telling the user how to view a copy of this " -"License. <_:note-1/>" -msgstr "" -"Se o programa modificado adoita ler comandos de forma interactiva ao " -"executalo, debe facer que, cando se execute para tal uso interactivo na " -"forma máis habitual, mostre ou exhiba un aviso no que se inclúan as " -"oportunas informacións relativas á propiedade intelectual do programa e á " -"ausencia de toda garantía (ou, se for o caso, ao feito de que é vostede quen " -"proporciona a garantía), a indicación de que os usuarios poden redistribuír " -"o programa consonte estas condicións e a información necesaria para que o " -"usuario saiba como acceder a unha copia desta licenza. <_:note-1/>" - -#. (itstool) path: sect2/para -#: C/index.docbook:191 -msgid "" -"You may modify your copy or copies of the Program or any portion of it, thus " -"forming a work based on the Program, and copy and distribute such " -"modifications or work under the terms of Section 1 above, provided that you also meet all of these conditions: <_:" -"orderedlist-1/>" -msgstr "" -"Pode modificar a súa copia ou copias do Programa, ou calquera parte del, e " -"obter así un produto baseado no Programa, así como copiar e distribuír as " -"devanditas modificacións ou produto de acordo cos termos do apartado 1 anterior, sempre que cumpra tamén con " -"todas as condicións seguintes: <_:orderedlist-1/>" - -#. (itstool) path: sect2/para -#: C/index.docbook:236 -msgid "" -"These requirements apply to the modified work as a whole. If identifiable " -"sections of that work are not derived from the Program, and can be " -"reasonably considered independent and separate works in themselves, then " -"this License, and its terms, do not apply to those sections when you " -"distribute them as separate works. But when you distribute the same sections " -"as part of a whole which is a work based on the Program, the distribution of " -"the whole must be on the terms of this License, whose permissions for other " -"licensees extend to the entire whole, and thus to each and every part " -"regardless of who wrote it." -msgstr "" -"Estes requisitos aplícanse ao produto modificado no seu conxunto. Se o " -"produto contén seccións facilmente identificables non derivadas do Programa, " -"que razoablemente se poidan considerar como produtos separados e " -"independentes por si mesmos, esta licenza e mais os seus termos non serán " -"aplicables ás devanditas seccións cando se distribúan como produtos " -"separados. Pero se esas mesmas seccións se distribúen como parte dun todo " -"consistente nun produto baseado no Programa, a distribución do todo deberá " -"de se acoller aos termos desta licenza, cuxas disposicións, aplicables a " -"todos os demais titulares da licenza, abranguen o conxunto completo e, en " -"consecuencia, todas e cada unha das partes do conxunto independentemente de " -"quen as escribise." - -#. (itstool) path: sect2/para -#: C/index.docbook:247 -msgid "" -"Thus, it is not the intent of this section to claim rights or contest your " -"rights to work written entirely by you; rather, the intent is to exercise " -"the right to control the distribution of derivative or collective works " -"based on the Program." -msgstr "" -"Así, o obxectivo deste apartado non é reclamar dereitos ou rebater os seus " -"dereitos sobre calquera produto escrito por vostede na súa totalidade; máis " -"ben ao contrario, o seu obxectivo é exercer o dereito de controlar a " -"distribución de produtos derivados ou colectivos baseados no Programa." - -#. (itstool) path: sect2/para -#: C/index.docbook:253 -msgid "" -"In addition, mere aggregation of another work not based on the Program with " -"the Program (or with a work based on the Program) on a volume of a storage " -"or distribution medium does not bring the other work under the scope of this " -"License." -msgstr "" -"Ademais, a simple agregación ao Programa (ou a un produto baseado no " -"Programa) doutro produto non baseado no Programa nun volume dun medio de " -"distribución ou almacenamento non implica a inclusión do outro produto no " -"ámbito de aplicación desta licenza." - -#. (itstool) path: sect2/title -#: C/index.docbook:261 -msgid "Section 3" -msgstr "Sección 3" - -#. (itstool) path: listitem/para -#: C/index.docbook:271 -msgid "" -"Accompany it with the complete corresponding machine-readable source code, " -"which must be distributed under the terms of Sections 1 and 2 above on a " -"medium customarily used for software interchange; or," -msgstr "" -"Acompañalo do correspondente código fonte completo nun formato lexible por " -"máquina, que se ha de distribuír de acordo co estipulado nos apartados 1 e 2 " -"anteriores nun soporte tipicamente utilizado para o intercambio de " -"software." - -#. (itstool) path: listitem/para -#: C/index.docbook:278 -msgid "" -"Accompany it with a written offer, valid for at least three years, to give " -"any third party, for a charge no more than your cost of physically " -"performing source distribution, a complete machine-readable copy of the " -"corresponding source code, to be distributed under the terms of Sections 1 " -"and 2 above on a medium customarily used for software interchange; or," -msgstr "" -"Acompañalo dunha oferta por escrito, cunha validez mínima de tres anos, na " -"que se entregue a calquera terceiro interesado, por un custo nunca superior " -"aos gastos nos que vostede poida incorrer pola execución física da " -"distribución do código fonte, unha copia completa en formato lexible por " -"máquina do código fonte correspondente, que se ha de distribuír de acordo co " -"estipulado nos apartados 1 e 2 anteriores nun soporte tipicamente utilizado " -"para o intercambio de software." - -#. (itstool) path: listitem/para -#: C/index.docbook:287 -msgid "" -"Accompany it with the information you received as to the offer to distribute " -"corresponding source code. (This alternative is allowed only for " -"noncommercial distribution and only if you received the program in object " -"code or executable form with such an offer, in accord with Subsection b " -"above.)" -msgstr "" -"Acompañalo da información que recibiu vostede verbo da oferta de distribuír " -"o código fonte correspondente. (Esta opción só está permitida para a " -"distribución non-comercial, e unicamente no caso de que vostede recibise o " -"programa en código obxecto ou forma executable cunha oferta como a que se " -"acaba de explicar, de acordo co subapartado b anterior.)" - -#. (itstool) path: sect2/para -#: C/index.docbook:263 -msgid "" -"You may copy and distribute the Program (or a work based on it, under Section 2) in object code or executable form under " -"the terms of Sections 1 and 2 above provided that you also do one of the following: <_:" -"orderedlist-1/>" -msgstr "" -"Pode copiar e distribuír o Programa (ou un produto baseado nel, segundo os " -"termos do apartado 2) en código obxecto ou " -"forma executable de acordo co establecido nos apartados 1 e 2 " -"anteriores, sempre que cumpra tamén con un dos seguintes requisitos: " -"<_:orderedlist-1/>" - -#. (itstool) path: sect2/para -#: C/index.docbook:297 -msgid "" -"The source code for a work means the preferred form of the work for making " -"modifications to it. For an executable work, complete source code means all " -"the source code for all modules it contains, plus any associated interface " -"definition files, plus the scripts used to control compilation and " -"installation of the executable. However, as a special exception, the source " -"code distributed need not include anything that is normally distributed (in " -"either source or binary form) with the major components (compiler, kernel, " -"and so on) of the operating system on which the executable runs, unless that " -"component itself accompanies the executable." -msgstr "" -"Enténdese por código fonte dun traballo o seu formato máis idóneo á hora de " -"realizar modificacións nel. No caso dun traballo executable, enténdese por " -"código fonte completo todo o código fonte para todos os módulos que inclúe, " -"ademais de todos os ficheiros de definición de interfaces asociados e os " -"scripts utilizados para controlar a compilación e a instalación do " -"executable. Porén, como caso excepcional, o código fonte distribuído non " -"precisa incluír nada que se distribúa normalmente (xa sexa de forma binaria " -"ou fonte) cos compoñentes principais (compilador, núcleo etc.) do sistema " -"operativo en que se executa o executable, agás que ese propio compoñente " -"acompañe o executable." - -#. (itstool) path: sect2/para -#: C/index.docbook:307 -msgid "" -"If distribution of executable or object code is made by offering access to " -"copy from a designated place, then offering equivalent access to copy the " -"source code from the same place counts as distribution of the source code, " -"even though third parties are not compelled to copy the source along with " -"the object code." -msgstr "" -"Se a distribución do código obxecto ou executable se realiza concedendo " -"acceso de copia desde un lugar determinado, entón a concesión de acceso " -"equivalente para copiar o código fonte do mesmo lugar considérase como " -"distribución do código fonte, aínda que ningún terceiro estea obrigado a " -"copiar o código fonte xunto co obxecto." - -#. (itstool) path: sect2/title -#: C/index.docbook:316 -msgid "Section 4" -msgstr "Sección 4" - -#. (itstool) path: sect2/para -#: C/index.docbook:318 -msgid "" -"You may not copy, modify, sublicense, or distribute the Program except as " -"expressly provided under this License. Any attempt otherwise to copy, " -"modify, sublicense or distribute the Program is void, and will automatically " -"terminate your rights under this License. However, parties who have received " -"copies, or rights, from you under this License will not have their licenses " -"terminated so long as such parties remain in full compliance." -msgstr "" -"Non lle está permitido copiar, modificar, emitir unha sublicenza nin " -"distribuír o Programa agás nos termos especificamente estipulados nesta " -"licenza. Calquera outro intento de copiar, modificar, emitir unha " -"sublicenza ou distribuír o Programa será considerado nulo, e implicará a " -"cancelación automática dos dereitos que lle concede esta licenza. No " -"entanto, as partes ás que vostede concedera copias ou dereitos consonte os " -"termos desta licenza non verán resoltas as súas respectivas licenzas, sempre " -"que cumpran plenamente con todo o que nelas se estipula." - -#. (itstool) path: sect2/title -#: C/index.docbook:328 -msgid "Section 5" -msgstr "Sección 5" - -#. (itstool) path: sect2/para -#: C/index.docbook:330 -msgid "" -"You are not required to accept this License, since you have not signed it. " -"However, nothing else grants you permission to modify or distribute the " -"Program or its derivative works. These actions are prohibited by law if you " -"do not accept this License. Therefore, by modifying or distributing the " -"Program (or any work based on the Program), you indicate your acceptance of " -"this License to do so, and all its terms and conditions for copying, " -"distributing or modifying the Program or works based on it." -msgstr "" -"Dado que aínda non a asinou, non está obrigado a aceptar os termos desta " -"licenza. Porén, ela é o único que o autoriza a modificar ou distribuír o " -"Programa ou calquera outro produto derivado del. Estas accións están " -"prohibidas por lei mentres non acepte esta licenza. Xa que logo, mediante a " -"modificación ou distribución do Programa (ou de calquera produto baseado no " -"Programa) vostede expresa a súa aceptación desta licenza para a realización " -"das devanditas accións, así como de todos os termos e condicións " -"estipulados nela para a copia, distribución ou modificación do Programa ou " -"de calquera produto baseado nel." - -#. (itstool) path: sect2/title -#: C/index.docbook:341 -msgid "Section 6" -msgstr "Sección 6" - -#. (itstool) path: sect2/para -#: C/index.docbook:343 -msgid "" -"Each time you redistribute the Program (or any work based on the Program), " -"the recipient automatically receives a license from the original licensor to " -"copy, distribute or modify the Program subject to these terms and " -"conditions. You may not impose any further restrictions on the recipients' " -"exercise of the rights granted herein. You are not responsible for enforcing " -"compliance by third parties to this License." -msgstr "" -"Cada vez que redistribúa o Programa (ou calquera produto baseado no " -"Programa), o receptor recibirá automaticamente unha licenza por parte do " -"emisor da licenza orixinal que lle permitirá copiar, distribuír ou modificar " -"o Programa consonte estes termos e condicións. Vostede non poderá impor " -"ningunha outra restrición sobre o exercicio dos dereitos nela estipulados " -"por parte do receptor. Vostede non é responsable á hora de esixirlle a un " -"terceiro o cumprimento dos termos estipulados nesta licenza." - -#. (itstool) path: sect2/title -#: C/index.docbook:353 -msgid "Section 7" -msgstr "Sección 7" - -#. (itstool) path: sect2/para -#: C/index.docbook:355 -msgid "" -"If, as a consequence of a court judgment or allegation of patent " -"infringement or for any other reason (not limited to patent issues), " -"conditions are imposed on you (whether by court order, agreement or " -"otherwise) that contradict the conditions of this License, they do not " -"excuse you from the conditions of this License. If you cannot distribute so " -"as to satisfy simultaneously your obligations under this License and any " -"other pertinent obligations, then as a consequence you may not distribute " -"the Program at all. For example, if a patent license would not permit " -"royalty-free redistribution of the Program by all those who receive copies " -"directly or indirectly through you, then the only way you could satisfy both " -"it and this License would be to refrain entirely from distribution of the " -"Program." -msgstr "" -"Se, como consecuencia dun proceso xudicial ou dunha acusación por violación " -"de patentes, ou por calquera outra causa (sen restrinxirse aos temas de " -"patentes), resultase a imposición de calquera condición sobre vostede (xa " -"sexa por orde xudicial, por acordo ou por calquera outra causa) que " -"contradiga as condicións desta licenza, iso non o escusa do cumprimento das " -"condicións desta licenza. De non lle ser posible distribuír o Programa " -"respectando as obrigas contraídas baixo esta licenza e, asemade, calquera " -"outra obriga pertinente, entón terá que deixar de distribuílo en ningún " -"modo. Por exemplo, no caso de existir unha licenza de patente que non " -"permitise a redistribución do Programa exenta de dereitos de autor por parte " -"de todos aqueles que recibisen copias de maneira directa ou indirecta de " -"vostede, o único xeito de cumprir cos termos da devandita licenza de patente " -"e mais desta licenza ao mesmo tempo sería evitando por completo a " -"distribución do Programa." - -#. (itstool) path: sect2/para -#: C/index.docbook:367 -msgid "" -"If any portion of this section is held invalid or unenforceable under any " -"particular circumstance, the balance of the section is intended to apply and " -"the section as a whole is intended to apply in other circumstances." -msgstr "" -"No caso de que calquera sección deste apartado se considerase non válida ou " -"non executable baixo calquera circunstancia concreta será de aplicación o " -"resto do apartado e, en calquera outras circunstancias, aplicarase o " -"apartado no seu conxunto." - -#. (itstool) path: sect2/para -#: C/index.docbook:373 -msgid "" -"It is not the purpose of this section to induce you to infringe any patents " -"or other property right claims or to contest validity of any such claims; " -"this section has the sole purpose of protecting the integrity of the free " -"software distribution system, which is implemented by public license " -"practices. Many people have made generous contributions to the wide range of " -"software distributed through that system in reliance on consistent " -"application of that system; it is up to the author/donor to decide if he or " -"she is willing to distribute software through any other system and a " -"licensee cannot impose that choice." -msgstr "" -"O obxectivo deste apartado non é inducilo a infrinxir ningunha " -"reivindicación de patente nin de calquera outro dereito de propiedade " -"intelectual, así como tampouco impugnar a validez deste tipo de " -"reivindicacións. O único que pretende este apartado é protexer a integridade " -"do sistema de distribución do software libre, levado á práctica mediante o " -"desenvolvemento de licenzas públicas. Moitas persoas contribuíron " -"xenerosamente ao desenvolvemento do amplo abano de software distribuído a " -"través deste sistema, coa confianza de que se aplicará consistentemente. Só " -"o autor/doador pode decidir se está disposto a distribuír o seu software " -"mediante calquera outro sistema; o titular dunha licenza non pode impor este " -"tipo de elección." - -#. (itstool) path: sect2/para -#: C/index.docbook:383 -msgid "" -"This section is intended to make thoroughly clear what is believed to be a " -"consequence of the rest of this License." -msgstr "" -"Este apartado pretende deixar ben claro o que considera que é consecuencia " -"do resto desta licenza." - -#. (itstool) path: sect2/title -#: C/index.docbook:390 -msgid "Section 8" -msgstr "Sección 8" - -#. (itstool) path: sect2/para -#: C/index.docbook:392 -msgid "" -"If the distribution and/or use of the Program is restricted in certain " -"countries either by patents or by copyrighted interfaces, the original " -"copyright holder who places the Program under this License may add an " -"explicit geographical distribution limitation excluding those countries, so " -"that distribution is permitted only in or among countries not thus excluded. " -"In such case, this License incorporates the limitation as if written in the " -"body of this License." -msgstr "" -"No caso de que nalgúns países se restrinxa a distribución e/ou o uso do " -"Programa pola execución dalgunha patente ou interface protexida por " -"copyright, o titular orixinal do copyright que somete o Programa aos termos " -"desta licenza poderá engadir unha limitación explícita á distribución " -"xeográfica que exclúa aqueles países, de xeito que só se permita a " -"distribución nos ou entre os países non suxeitos á devandita exclusión. Se " -"este for o caso, a licenza incorporaría a limitación citada nos mesmos " -"termos que se fose redactada como parte do corpo desta licenza." - -#. (itstool) path: sect2/title -#: C/index.docbook:402 -msgid "Section 9" -msgstr "Sección 9" - -#. (itstool) path: sect2/para -#: C/index.docbook:404 -msgid "" -"The Free Software Foundation may publish revised and/or new versions of the " -"General Public License from time to time. Such new versions will be similar " -"in spirit to the present version, but may differ in detail to address new " -"problems or concerns." -msgstr "" -"A Free Software Foundation poderá publicar versións revisadas e/ou novas " -"desta licenza pública xeral no momento en que o estime oportuno. As novas " -"versións manterán o mesmo espírito ca a actual, se ben poden diferir nalgúns " -"detalles do contido co obxectivo de facer fronte a novos problemas ou " -"preocupacións." - -#. (itstool) path: sect2/para -#: C/index.docbook:410 -msgid "" -"Each version is given a distinguishing version number. If the Program " -"specifies a version number of this License which applies to it and " -"any later version, you have the option of following the terms " -"and conditions either of that version or of any later version published by " -"the Free Software Foundation. If the Program does not specify a version " -"number of this License, you may choose any version ever published by the " -"Free Software Foundation." -msgstr "" -"Cada versión leva un número identificativo diferente. Se o Programa " -"especifica que lle é aplicable unha versión específica desta licenza e " -"\"calquera versión posterior\", vostede poderá escoller entre cinguirse aos " -"termos e condicións ben da primeira versión ou ben de calquera versión " -"posterior publicada pola Free Software Foundation. Se o Programa non " -"especifica ningún número de versión desta licenza, vostede terá a opción de " -"escoller calquera versión de entre todas as publicadas pola Free Software " -"Foundation." - -#. (itstool) path: sect2/title -#: C/index.docbook:420 -msgid "Section 10" -msgstr "Sección 10" - -#. (itstool) path: sect2/para -#: C/index.docbook:422 -msgid "" -"If you wish to incorporate parts of the Program into other free programs " -"whose distribution conditions are different, write to the author to ask for " -"permission. For software which is copyrighted by the Free Software " -"Foundation, write to the Free Software Foundation; we sometimes make " -"exceptions for this. Our decision will be guided by the two goals of " -"preserving the free status of all derivatives of our free software and of " -"promoting the sharing and reuse of software generally." -msgstr "" -"Se desexa incluír partes do Programa noutros programas libres cunhas " -"condicións de distribución distintas, deberá de se dirixir ao autor por " -"escrito para lle pedir a súa autorización. No caso do software co copyright " -"da Free Software Foundation, diríxase por escrito á Free Software " -"Foundation, que en ocasións fai excepcións nestes casos. A decisión que " -"tomemos basearase nos nosos dous obxectivos de preservar o estatus libre de " -"calquera produto derivado do noso software libre e de promover o " -"compartimento e a reutilización do software en xeral." - -#. (itstool) path: sect2/title -#: C/index.docbook:432 -msgid "NO WARRANTY" -msgstr "AUSENCIA DE GARANTÍA" - -#. (itstool) path: sect2/subtitle -#: C/index.docbook:433 -msgid "Section 11" -msgstr "Sección 11" - -#. (itstool) path: sect2/para -#: C/index.docbook:435 -msgid "" -"BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY FOR THE " -"PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW. EXCEPT WHEN OTHERWISE " -"STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES PROVIDE THE " -"PROGRAM AS IS WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED " -"OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF " -"MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. THE ENTIRE RISK AS TO " -"THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU. SHOULD THE PROGRAM " -"PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING, REPAIR OR " -"CORRECTION." -msgstr "" -"DADO QUE SE TRATA DUN PROGRAMA ACOMPAÑADO DUNHA LICENZA GRATUÍTA, DENTRO DOS " -"LÍMITES PERMITIDOS POLA LEXISLACIÓN APLICABLE CONSIDÉRASE UN PROGRAMA " -"EXENTO DE TODA GARANTÍA. AGÁS QUE SE ESPECIFIQUE O CONTRARIO POR ESCRITO, " -"OS TITULARES DO COPYRIGHT E/OU OUTRAS PARTES CEDEN O PROGRAMA \"TAL CAL\" SEN " -"NINGÚN TIPO DE GARANTÍA, NIN EXPLÍCITA NIN IMPLÍCITA, INCLUÍDAS, AÍNDA QUE " -"SEN EXCLUSIVIDADE, AS GARANTÍAS IMPLÍCITAS DE COMERCIABILIDADE E IDONEIDADE " -"PARA UN DETERMINADO FIN. A TOTALIDADE DOS RISCOS ASOCIADOS Á CALIDADE E AO " -"RENDEMENTO DO PROGRAMA RECAE SOBRE VOSTEDE. SE O PROGRAMA RESULTASE " -"DEFECTUOSO, VOSTEDE TERÁ QUE ASUMIR OS CUSTOS DE CALQUERA REPARACIÓN, " -"ARRANXO OU EMENDA." - -#. (itstool) path: sect2/title -#: C/index.docbook:446 -msgid "Section 12" -msgstr "Sección 12" - -#. (itstool) path: sect2/para -#: C/index.docbook:448 -msgid "" -"IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING WILL " -"ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR REDISTRIBUTE " -"THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY " -"GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE USE " -"OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF DATA " -"OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD " -"PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS), " -"EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF " -"SUCH DAMAGES." -msgstr "" -"EN NINGÚN CASO, AGÁS QUE ASÍ O ESIXA A LEXISLACIÓN APLICABLE OU QUE EXISTA " -"UN ACORDO POR ESCRITO ENTRE AS PARTES, SE LLE ESIXIRÁ RESPONSABILIDADE AO " -"TITULAR DO COPYRIGHT, OU A CALQUERA OUTRA PARTE AUTORIZADA PARA MODIFICAR " -"E/OU REDISTRIBUÍR O PROGRAMA CONSONTE OS TERMOS DESCRITOS ANTERIORMENTE, " -"POLOS DANOS E PERDAS OCASIONADOS, INCLUÍDOS OS DANOS XERAIS, ESPECIAIS, " -"INCIDENTAIS OU DE IMPORTANCIA DE CALQUERA TIPO QUE POIDAN DERIVAR DO USO OU " -"DA INCAPACIDADE DE USO DO PROGRAMA (O QUE INCLÚE, AÍNDA QUE SEN RESTRICIÓN, " -"BEN A PERDA DE DATOS, OU BEN A INTERPRETACIÓN IMPRECISA DE DATOS, OU BEN AS " -"PERDAS OCASIONADAS A VOSTEDE OU A UN TERCEIRO, OU BEN A IMPOSIBILIDADE DE " -"EXECUTAR O PROGRAMA CON CALQUERA OUTRO PROGRAMA), MESMO SE O DEVANDITO " -"TITULAR OU A OUTRA PARTE FOSEN ADVERTIDOS DA POSIBILIDADE DE QUE SE " -"PRODUCISEN OS DANOS DESCRITOS ANTERIORMENTE." diff -Nru gnome-desktop3-3.12.0/desktop-docs/gpl/gl/index.docbook gnome-desktop3-3.8.4/desktop-docs/gpl/gl/index.docbook --- gnome-desktop3-3.12.0/desktop-docs/gpl/gl/index.docbook 2014-03-24 14:31:53.000000000 +0000 +++ gnome-desktop3-3.8.4/desktop-docs/gpl/gl/index.docbook 1970-01-01 00:00:00.000000000 +0000 @@ -1,207 +0,0 @@ - - - -
- - Licenza Pública Xeral de GNU - 2000 Free Software Foundation, Inc. - - Free Software Foundation - - - Proxecto de documentación de GNOME - - - - 2 1991-06 - - - -
Free Software Foundation, Inc. - 51 Franklin Street, Fifth Floor, - Boston, - MA 02110-1301 - USA -
. - - Permítese a copia e distribución de copias textuais desta licenza, sempre que non se introduza ningunha modificación. - - - Versión 2, Xuño de 1991 - - A maioría das licenzas de software están concibidas para privar o usuario da súa liberdade de compartir e modificar ese software. Pola contra, a licenza pública xeral de GNU busca garantir a súa liberdade para compartir e modificar software libre, para se asegurar de que o software é libre para todos os seus usuarios. - - - - Fran Dieguez - - frandieguez@gnome.org - - - - 2013; - - Fran Dieguez - - - - - Preámbulo - - A maioría das licenzas de software están concibidas para privar o usuario da súa liberdade de compartir e modificar ese software. Pola contra, a licenza pública xeral de GNU busca garantir a súa liberdade para compartir e modificar software libre, para se asegurar de que o software é libre para todos os seus usuarios. Esta licenza pública xeral é de aplicación á maioría do software da Free Software Foundation, así como a calquera outro programa cuxos autores se comprometan a utilizala (hai outro software da Free Software Foundation que se rexe, no seu lugar, pola licenza pública xeral reducida de GNU). Tamén pode aplicala aos seus propios programas. - - Cando se fala de software libre fálase de liberdade, non de prezo. As nosas licenzas públicas xerais están deseñadas co obxectivo de asegurar a súa liberdade para distribuír copias de software libre (e cobrar por este servizo, se así o desexa), que recibe o código fonte ou pode recibilo se así o desexa, que ten a posibilidade de modificar o software ou empregar partes del en novos programas libres e que, ademais, é consciente de que pode facer todo isto. - - Para protexer os seus dereitos, cómpre introducir certas restricións que impidan que calquera outro lle poida negar estes dereitos ou pedirlle que renuncie a eles. Estas restricións implican determinadas responsabilidades para vostede, no caso de distribuír copias do software ou modificalo. - - Por exemplo, se distribúe copias dun programa libre, sexa gratis ou non, tenlle que ceder aos receptores todos os dereitos que ten vostede. Terase que asegurar de que eses receptores tamén reciben ou poden recibir o código fonte e terá que mostrarlles os termos desta licenza para informalos dos seus dereitos. - - Dous son os pasos para protexer os seus dereitos: - - pór o software baixo copyright e - - - ofrecerlle esta licenza, que o autoriza legalmente para copiar, distribuír e/ou modificar o software. - - - - Ademais, como medida de protección para todos os autores e para nós mesmos, é importante deixarlles claro a todas as partes que non existe garantía para este software libre. No caso de que calquera usuario modifique o software e logo o distribúa a un terceiro, os receptores deben saber que o que se lles entrega non é o software orixinal, de xeito que calquera problema introducido pola outra parte non afecte a reputación dos autores orixinais. - - Por último, calquera programa libre está constantemente ameazado polas patentes de software. A nosa intención é evitar o perigo de que os redistribuidores dun programa libre obteñan licenzas de patente pola súa conta, convertendo así o seu programa en software rexistrado. Para evitar que isto suceda, deixamos ben claro que calquera patente debe de garantir a cesión da licenza a calquera usuario posible, de maneira que todo o mundo poida usar o programa libremente ou, en caso contrario, non debe de garantir licenza ningunha a ninguén. - - A seguir detállanse os termos e condicións exactos para a copia, distribución e modificación. - - - - - TERMOS E CONDICIÓNS PARA A COPIA, DISTRIBUCIÓN E MODIFICACIÓN - - - Sección 0 - Esta licenza é aplicable a calquera programa ou produto doutro tipo no que figure un aviso inserido polo titular do copyright que especifique que se pode distribuír baixo os termos desta licenza pública xeral. De aquí en adiante, o termo Programa referirase a calquera programa ou produto deste tipo, mentres que o termo produto baseado no Programa referirase tanto ao programa coma a calquera produto derivado consonte a lei de propiedade intelectual, é dicir, calquera produto que conteña o programa ou unha parte del, sexa textual ou con modificacións e/ou traducida a outra lingua. (De aquí en adiante, a tradución inclúese sen límite ningún no termo modificación.) As licenzas están redactadas na forma de cortesía vostede. - - Calquera actividade distinta da copia, distribución e modificación non está cuberta por esta licenza, senón que queda fóra do seu ámbito de aplicación. Non se restrinxe a acción de executar o Programa, e os resultados tirados do Programa só están cubertos se o seu contido constitúe un produto baseado no Programa (sen importar se foi realizado mediante a execución do Programa). Que isto sexa certo ou non dependerá do que faga o Programa. - - - - Sección 1 - Pode modificar a súa copia ou copias do Programa, ou calquera parte del, e obter así un produto baseado no Programa, así como copiar e distribuír as devanditas modificacións ou produto de acordo cos termos do apartado 1 anterior, sempre que cumpra tamén con todas as condicións seguintes: - - Pode cobrar unha taxa polo acto físico de transferir unha copia e, se vostede quixer, pode tamén ofrecer unha determinada garantía a cambio do pagamento dunha taxa. - - - - Sección 2 - Pode modificar a súa copia ou copias do Programa, ou calquera parte del, e obter así un produto baseado no Programa, así como copiar e distribuír as devanditas modificacións ou produto de acordo cos termos do apartado 1 anterior, sempre que cumpra tamén con todas as condicións seguintes: - - Pode modificar a súa copia ou copias do Programa, ou calquera parte del, e obter así un produto baseado no Programa, así como copiar e distribuír as devanditas modificacións ou produto de acordo cos termos do apartado 1 anterior, sempre que cumpra tamén con todas as condicións seguintes: - - - Debe facer que calquera produto distribuído ou publicado por vostede, que en todo ou en parte conteña ou derive do Programa ou de calquera parte do Programa, obteña unha licenza no seu conxunto sen que isto repercuta en ningún gasto para calquera terceira parte de acordo cos termos desta licenza. - - - Se o programa modificado adoita ler comandos de forma interactiva ao executalo, debe facer que, cando se execute para tal uso interactivo na forma máis habitual, mostre ou exhiba un aviso no que se inclúan as oportunas informacións relativas á propiedade intelectual do programa e á ausencia de toda garantía (ou, se for o caso, ao feito de que é vostede quen proporciona a garantía), a indicación de que os usuarios poden redistribuír o programa consonte estas condicións e a información necesaria para que o usuario saiba como acceder a unha copia desta licenza. - Excepción: - Se o Programa en si mesmo é interactivo pero non adoita mostrar avisos deste tipo, non é necesario que o seu produto baseado no Programa exhiba ningún aviso. - - - - - Estes requisitos aplícanse ao produto modificado no seu conxunto. Se o produto contén seccións facilmente identificables non derivadas do Programa, que razoablemente se poidan considerar como produtos separados e independentes por si mesmos, esta licenza e mais os seus termos non serán aplicables ás devanditas seccións cando se distribúan como produtos separados. Pero se esas mesmas seccións se distribúen como parte dun todo consistente nun produto baseado no Programa, a distribución do todo deberá de se acoller aos termos desta licenza, cuxas disposicións, aplicables a todos os demais titulares da licenza, abranguen o conxunto completo e, en consecuencia, todas e cada unha das partes do conxunto independentemente de quen as escribise. - - Así, o obxectivo deste apartado non é reclamar dereitos ou rebater os seus dereitos sobre calquera produto escrito por vostede na súa totalidade; máis ben ao contrario, o seu obxectivo é exercer o dereito de controlar a distribución de produtos derivados ou colectivos baseados no Programa. - - Ademais, a simple agregación ao Programa (ou a un produto baseado no Programa) doutro produto non baseado no Programa nun volume dun medio de distribución ou almacenamento non implica a inclusión do outro produto no ámbito de aplicación desta licenza. - - - - Sección 3 - - Pode copiar e distribuír o Programa (ou un produto baseado nel, segundo os termos do apartado 2) en código obxecto ou forma executable de acordo co establecido nos apartados 1 e 2 anteriores, sempre que cumpra tamén con un dos seguintes requisitos: - - Acompañalo do correspondente código fonte completo nun formato lexible por máquina, que se ha de distribuír de acordo co estipulado nos apartados 1 e 2 anteriores nun soporte tipicamente utilizado para o intercambio de software. - - - Acompañalo dunha oferta por escrito, cunha validez mínima de tres anos, na que se entregue a calquera terceiro interesado, por un custo nunca superior aos gastos nos que vostede poida incorrer pola execución física da distribución do código fonte, unha copia completa en formato lexible por máquina do código fonte correspondente, que se ha de distribuír de acordo co estipulado nos apartados 1 e 2 anteriores nun soporte tipicamente utilizado para o intercambio de software. - - - Acompañalo da información que recibiu vostede verbo da oferta de distribuír o código fonte correspondente. (Esta opción só está permitida para a distribución non-comercial, e unicamente no caso de que vostede recibise o programa en código obxecto ou forma executable cunha oferta como a que se acaba de explicar, de acordo co subapartado b anterior.) - - - - Enténdese por código fonte dun traballo o seu formato máis idóneo á hora de realizar modificacións nel. No caso dun traballo executable, enténdese por código fonte completo todo o código fonte para todos os módulos que inclúe, ademais de todos os ficheiros de definición de interfaces asociados e os scripts utilizados para controlar a compilación e a instalación do executable. Porén, como caso excepcional, o código fonte distribuído non precisa incluír nada que se distribúa normalmente (xa sexa de forma binaria ou fonte) cos compoñentes principais (compilador, núcleo etc.) do sistema operativo en que se executa o executable, agás que ese propio compoñente acompañe o executable. - - Se a distribución do código obxecto ou executable se realiza concedendo acceso de copia desde un lugar determinado, entón a concesión de acceso equivalente para copiar o código fonte do mesmo lugar considérase como distribución do código fonte, aínda que ningún terceiro estea obrigado a copiar o código fonte xunto co obxecto. - - - - Sección 4 - - Non lle está permitido copiar, modificar, emitir unha sublicenza nin distribuír o Programa agás nos termos especificamente estipulados nesta licenza. Calquera outro intento de copiar, modificar, emitir unha sublicenza ou distribuír o Programa será considerado nulo, e implicará a cancelación automática dos dereitos que lle concede esta licenza. No entanto, as partes ás que vostede concedera copias ou dereitos consonte os termos desta licenza non verán resoltas as súas respectivas licenzas, sempre que cumpran plenamente con todo o que nelas se estipula. - - - - Sección 5 - - Dado que aínda non a asinou, non está obrigado a aceptar os termos desta licenza. Porén, ela é o único que o autoriza a modificar ou distribuír o Programa ou calquera outro produto derivado del. Estas accións están prohibidas por lei mentres non acepte esta licenza. Xa que logo, mediante a modificación ou distribución do Programa (ou de calquera produto baseado no Programa) vostede expresa a súa aceptación desta licenza para a realización das devanditas accións, así como de todos os termos e condicións estipulados nela para a copia, distribución ou modificación do Programa ou de calquera produto baseado nel. - - - - Sección 6 - - Cada vez que redistribúa o Programa (ou calquera produto baseado no Programa), o receptor recibirá automaticamente unha licenza por parte do emisor da licenza orixinal que lle permitirá copiar, distribuír ou modificar o Programa consonte estes termos e condicións. Vostede non poderá impor ningunha outra restrición sobre o exercicio dos dereitos nela estipulados por parte do receptor. Vostede non é responsable á hora de esixirlle a un terceiro o cumprimento dos termos estipulados nesta licenza. - - - - Sección 7 - - Se, como consecuencia dun proceso xudicial ou dunha acusación por violación de patentes, ou por calquera outra causa (sen restrinxirse aos temas de patentes), resultase a imposición de calquera condición sobre vostede (xa sexa por orde xudicial, por acordo ou por calquera outra causa) que contradiga as condicións desta licenza, iso non o escusa do cumprimento das condicións desta licenza. De non lle ser posible distribuír o Programa respectando as obrigas contraídas baixo esta licenza e, asemade, calquera outra obriga pertinente, entón terá que deixar de distribuílo en ningún modo. Por exemplo, no caso de existir unha licenza de patente que non permitise a redistribución do Programa exenta de dereitos de autor por parte de todos aqueles que recibisen copias de maneira directa ou indirecta de vostede, o único xeito de cumprir cos termos da devandita licenza de patente e mais desta licenza ao mesmo tempo sería evitando por completo a distribución do Programa. - - No caso de que calquera sección deste apartado se considerase non válida ou non executable baixo calquera circunstancia concreta será de aplicación o resto do apartado e, en calquera outras circunstancias, aplicarase o apartado no seu conxunto. - - O obxectivo deste apartado non é inducilo a infrinxir ningunha reivindicación de patente nin de calquera outro dereito de propiedade intelectual, así como tampouco impugnar a validez deste tipo de reivindicacións. O único que pretende este apartado é protexer a integridade do sistema de distribución do software libre, levado á práctica mediante o desenvolvemento de licenzas públicas. Moitas persoas contribuíron xenerosamente ao desenvolvemento do amplo abano de software distribuído a través deste sistema, coa confianza de que se aplicará consistentemente. Só o autor/doador pode decidir se está disposto a distribuír o seu software mediante calquera outro sistema; o titular dunha licenza non pode impor este tipo de elección. - - Este apartado pretende deixar ben claro o que considera que é consecuencia do resto desta licenza. - - - - Sección 8 - - No caso de que nalgúns países se restrinxa a distribución e/ou o uso do Programa pola execución dalgunha patente ou interface protexida por copyright, o titular orixinal do copyright que somete o Programa aos termos desta licenza poderá engadir unha limitación explícita á distribución xeográfica que exclúa aqueles países, de xeito que só se permita a distribución nos ou entre os países non suxeitos á devandita exclusión. Se este for o caso, a licenza incorporaría a limitación citada nos mesmos termos que se fose redactada como parte do corpo desta licenza. - - - - Sección 9 - - A Free Software Foundation poderá publicar versións revisadas e/ou novas desta licenza pública xeral no momento en que o estime oportuno. As novas versións manterán o mesmo espírito ca a actual, se ben poden diferir nalgúns detalles do contido co obxectivo de facer fronte a novos problemas ou preocupacións. - - Cada versión leva un número identificativo diferente. Se o Programa especifica que lle é aplicable unha versión específica desta licenza e "calquera versión posterior", vostede poderá escoller entre cinguirse aos termos e condicións ben da primeira versión ou ben de calquera versión posterior publicada pola Free Software Foundation. Se o Programa non especifica ningún número de versión desta licenza, vostede terá a opción de escoller calquera versión de entre todas as publicadas pola Free Software Foundation. - - - - Sección 10 - - Se desexa incluír partes do Programa noutros programas libres cunhas condicións de distribución distintas, deberá de se dirixir ao autor por escrito para lle pedir a súa autorización. No caso do software co copyright da Free Software Foundation, diríxase por escrito á Free Software Foundation, que en ocasións fai excepcións nestes casos. A decisión que tomemos basearase nos nosos dous obxectivos de preservar o estatus libre de calquera produto derivado do noso software libre e de promover o compartimento e a reutilización do software en xeral. - - - - AUSENCIA DE GARANTÍA - Sección 11 - - DADO QUE SE TRATA DUN PROGRAMA ACOMPAÑADO DUNHA LICENZA GRATUÍTA, DENTRO DOS LÍMITES PERMITIDOS POLA LEXISLACIÓN APLICABLE CONSIDÉRASE UN PROGRAMA EXENTO DE TODA GARANTÍA. AGÁS QUE SE ESPECIFIQUE O CONTRARIO POR ESCRITO, OS TITULARES DO COPYRIGHT E/OU OUTRAS PARTES CEDEN O PROGRAMA "TAL CAL" SEN NINGÚN TIPO DE GARANTÍA, NIN EXPLÍCITA NIN IMPLÍCITA, INCLUÍDAS, AÍNDA QUE SEN EXCLUSIVIDADE, AS GARANTÍAS IMPLÍCITAS DE COMERCIABILIDADE E IDONEIDADE PARA UN DETERMINADO FIN. A TOTALIDADE DOS RISCOS ASOCIADOS Á CALIDADE E AO RENDEMENTO DO PROGRAMA RECAE SOBRE VOSTEDE. SE O PROGRAMA RESULTASE DEFECTUOSO, VOSTEDE TERÁ QUE ASUMIR OS CUSTOS DE CALQUERA REPARACIÓN, ARRANXO OU EMENDA. - - - - Sección 12 - - EN NINGÚN CASO, AGÁS QUE ASÍ O ESIXA A LEXISLACIÓN APLICABLE OU QUE EXISTA UN ACORDO POR ESCRITO ENTRE AS PARTES, SE LLE ESIXIRÁ RESPONSABILIDADE AO TITULAR DO COPYRIGHT, OU A CALQUERA OUTRA PARTE AUTORIZADA PARA MODIFICAR E/OU REDISTRIBUÍR O PROGRAMA CONSONTE OS TERMOS DESCRITOS ANTERIORMENTE, POLOS DANOS E PERDAS OCASIONADOS, INCLUÍDOS OS DANOS XERAIS, ESPECIAIS, INCIDENTAIS OU DE IMPORTANCIA DE CALQUERA TIPO QUE POIDAN DERIVAR DO USO OU DA INCAPACIDADE DE USO DO PROGRAMA (O QUE INCLÚE, AÍNDA QUE SEN RESTRICIÓN, BEN A PERDA DE DATOS, OU BEN A INTERPRETACIÓN IMPRECISA DE DATOS, OU BEN AS PERDAS OCASIONADAS A VOSTEDE OU A UN TERCEIRO, OU BEN A IMPOSIBILIDADE DE EXECUTAR O PROGRAMA CON CALQUERA OUTRO PROGRAMA), MESMO SE O DEVANDITO TITULAR OU A OUTRA PARTE FOSEN ADVERTIDOS DA POSIBILIDADE DE QUE SE PRODUCISEN OS DANOS DESCRITOS ANTERIORMENTE. - - -
diff -Nru gnome-desktop3-3.12.0/desktop-docs/gpl/Makefile.am gnome-desktop3-3.8.4/desktop-docs/gpl/Makefile.am --- gnome-desktop3-3.12.0/desktop-docs/gpl/Makefile.am 2013-11-11 17:23:17.000000000 +0000 +++ gnome-desktop3-3.8.4/desktop-docs/gpl/Makefile.am 2013-09-04 11:15:57.000000000 +0000 @@ -4,6 +4,6 @@ HELP_FILES = index.docbook HELP_MEDIA = -HELP_LINGUAS = ar ca cs el es eu fi fr gl hu ko nds oc pa pt_BR sl sr sr@latin uk vi zh_CN sv de +HELP_LINGUAS = ar ca cs el es eu fi fr hu ko nds oc pa sl sr sr@latin uk vi zh_CN sv de -include $(top_srcdir)/git.mk diff -Nru gnome-desktop3-3.12.0/desktop-docs/gpl/Makefile.in gnome-desktop3-3.8.4/desktop-docs/gpl/Makefile.in --- gnome-desktop3-3.12.0/desktop-docs/gpl/Makefile.in 2014-03-24 14:31:07.000000000 +0000 +++ gnome-desktop3-3.8.4/desktop-docs/gpl/Makefile.in 2013-09-04 11:29:46.000000000 +0000 @@ -310,7 +310,7 @@ HELP_ID = gpl HELP_FILES = index.docbook HELP_MEDIA = -HELP_LINGUAS = ar ca cs el es eu fi fr gl hu ko nds oc pa pt_BR sl sr sr@latin uk vi zh_CN sv de +HELP_LINGUAS = ar ca cs el es eu fi fr hu ko nds oc pa sl sr sr@latin uk vi zh_CN sv de all: all-am .SUFFIXES: diff -Nru gnome-desktop3-3.12.0/desktop-docs/gpl/pt_BR/index.docbook gnome-desktop3-3.8.4/desktop-docs/gpl/pt_BR/index.docbook --- gnome-desktop3-3.12.0/desktop-docs/gpl/pt_BR/index.docbook 2014-03-24 14:31:53.000000000 +0000 +++ gnome-desktop3-3.8.4/desktop-docs/gpl/pt_BR/index.docbook 1970-01-01 00:00:00.000000000 +0000 @@ -1,209 +0,0 @@ - - - -
- - Licença Pública Geral GNU - 2000 Free Software Foundation, Inc. - - Free Software Foundation - - - Projeto de Documentação do GNOME - - - - 2 1991-06 - - - -
Free Software Foundation, Inc. - 51 Franklin Street, Fifth Floor, - Boston, - MA 02110-1301 - USA -
. - - A qualquer pessoa é permitido copiar e distribuir cópias desse documento de licença, desde que sem qualquer alteração. - - - Versão 2, junho de 1991 - - As licenças de muitos softwares são desenvolvidas para restringir sua liberdade de compartilhá-lo e mudá-lo. Contrária a isso, a Licença Pública Geral GNU pretende garantir sua liberdade de compartilhar e alterar software livres -- garantindo que o software será livre e gratuito para os seus usuários. - - - - Rafael Ferreira - - rafael.f.f1@gmail.com - - - - 2012 - - 2013 - - Rafael Ferreira - - - - - Preâmbulo - - As licenças de muitos software são desenvolvidas para restringir sua liberdade de compartilhá-lo e mudá-lo. Contrária a isso, a Licença Pública Geral GNU pretende garantir sua liberdade de compartilhar e alterar softwares livres -- garantindo que o software será livre e gratuito para os seus usuários. Esta Licença Pública Geral aplica-se à maioria dos softwares da Free Software Foundation e a qualquer outro programa cujo autor decida aplicá-la. (Alguns outros software da FSF são cobertos pela Licença Pública Geral de Bibliotecas, no entanto.) Você pode aplicá-la também aos seus programas. - - Quando nos referimos a software livre, estamos nos referindo a liberdade, e não a preço. As nossas Licenças Públicas Gerais foram desenvolvidas para garantir que você tenha a liberdade de distribuir cópias de softwares livres (e cobrar por este serviço, se quiser); que você receba o código-fonte ou tenha acesso a ele, se quiser; que você possa alterar o software ou utilizar partes dele em novos programas livres; e que você saiba que pode fazer tudo isso. - - Para proteger seus direitos, precisamos fazer restrições que impeçam a qualquer um negar estes direitos ou solicitar que você abdique deles. Estas restrições traduzem-se em certas responsabilidades para você, se você for distribuir cópias do software ou modificá-lo. - - Por exemplo, se você distribuir cópias de um programa, gratuitamente ou por alguma quantia, você tem que fornecer aos receptores todos os direitos que você possui. Você tem que garantir que eles também recebam ou possam obter o código-fonte. E você tem que mostrar-lhes estes termos para que eles possam conhecer seus direitos. - - Nós protegemos seus direitos em dois passos: - - com direitos autorais do software; e - - - com a oferta desta licença, que lhe dá permissão legal para copiar, distribuir e/ou modificar o software. - - - - Além disso, tanto para a proteção de cada autor quanto a nossa, gostaríamos de nos certificar de que todos entendam que não há qualquer garantia nestes softwares livres. Se o software é modificado por alguém mais e passado adiante, queremos que seus recebedores saibam que o que eles obtiveram não é original, de forma que qualquer problema introduzido por terceiros não interfira na reputação do autor original. - - Finalmente, qualquer programa livre é ameaçado constantemente por patentes de software. Queremos evitar o perigo de que redistribuidores de software livre obtenham individualmente licenças de patentes, o que teria o efeito de tornar o programa proprietário. Para prevenir isso, deixamos claro que qualquer patente tem que ser licenciada para uso livre e gratuito por qualquer pessoa, ou então que não seja licenciada. - - Os precisos termos e condições para cópia, distribuição e modificação se encontram abaixo. - - - - - TERMOS E CONDIÇÕES PARA CÓPIA, DISTRIBUIÇÃO E MODIFICAÇÃO - - - Seção 0 - Esta Licença se aplica a qualquer programa ou outro trabalho que contenha um aviso colocado pelo detentor dos direitos autorais informando que aquele pode ser distribuído sob as condições desta Licença Pública Geral. O Programa abaixo refere-se a qualquer programa ou trabalho, e trabalho baseado no Programa significa tanto o Programa em si como quaisquer trabalhos derivados, de acordo com a lei de direitos autorais: isto quer dizer um trabalho que contenha o Programa ou parte dele, tanto originalmente quanto com modificações, e/ou tradução para outro idioma. (Doravante tradução está incluído sem limites no termo modificação.) Cada licenciado é mencionado como você. - - Atividades além de cópia, distribuição e modificação não estão cobertas por esta Licença; elas estão fora de seu escopo. O ato de executar o Programa não é restringido, e o resultado do Programa é coberto apenas se seu conteúdo contenha trabalhos baseados no Programa (independentemente de terem sido gerados pela execução do Programa). Se isso é verdadeiro depende do que o Programa faz. - - - - Seção 1 - Você pode copiar e distribuir cópias fiéis do código-fonte do Programa da mesma forma que você o recebeu, usando qualquer meio, desde que você conspícua e apropriadamente publique em cada cópia um aviso de direitos autorais e uma declaração de inexistência de garantias de forma apropriada; mantenha intactos todos os avisos que se referem a esta Licença e à ausência total de garantias; e forneça a outros recebedores do Programa uma cópia desta Licença, junto com o Programa. - - Você pode cobrar pelo ato físico de transferir uma cópia e pode, opcionalmente, oferecer garantia em troca de pagamento. - - - - Seção 2 - Você pode modificar sua cópia ou cópias do Programa, ou qualquer parte dele, assim gerando um trabalho baseado no Programa, e copiar e distribuir essas modificações ou trabalhos sob os termos da Seção 1 acima, desde que você também se atenda a todas estas condições: - - Você tem que fazer com que os arquivos modificados levem avisos proeminentes afirmando que você alterou os arquivos, incluindo a data de qualquer alteração. - - - Você tem que fazer com que quaisquer trabalhos que você distribua ou publique, e que integralmente ou em partes contenham ou sejam derivados do Programa ou de suas partes, sejam licenciados, integralmente e sem custo algum para quaisquer terceiros, sob os termos desta Licença. - - - Se o programa modificado normalmente lê comandos interativamente quando executados, você tem que fazer com que, quando iniciado tal uso interativo da forma mais simples, seja impresso ou mostrado um anúncio de direitos autorais um e anúncio de que não há qualquer garantia (ou então, que você fornece a garantia) e que os usuários podem redistribuir o programa sob estas condições, ainda informando os usuários como consultar uma cópia desta Licença. - Exceção: - se o Programa em si é interativo mas normalmente não imprime estes tipos de anúncios, seu trabalho baseado no Programa não precisa imprimir um anúncio. - - - - - Estas exigências aplicam-se ao trabalho modificado como um todo. Se seções identificáveis de tal trabalho não forem derivadas do Programa, e que podem ser razoavelmente consideradas trabalhos independentes e separados por si só, então esta Licença, e seus termos, não se aplicam a estas seções quando você distribuí-las como trabalhos em separado. Mas quando você distribuir as mesmas seções como parte de um todo, o qual é baseado no Programa, a distribuição como um todo deve que se enquadrar nos termos desta Licença, cujas permissões para outros licenciados se estendem ao todo, portanto para cada e toda parte, independente de quem a escreveu. - - Desta forma, esta seção não tem a intenção de reclamar direitos ou contestar seus direitos sobre o trabalho escrito inteiramente por você; ao invés disso, a intenção é a de exercitar o direito de controlar a distribuição de trabalhos, derivados ou coletivos, baseados no Programa. - - Adicionalmente, a mera agregação ao Programa de outro trabalho não baseado no Programa (ou de trabalho baseado no Programa) em um volume de armazenamento ou meio de distribuição não faz o outro trabalho parte do escopo desta Licença. - - - - Seção 3 - - Você pode copiar e distribuir o Programa (ou um trabalho baseado nele, conforme descrito na Seção 2) em código-objeto ou em forma executável sob os termos das Seções 1 e 2 acima, desde que você também faça um dos seguintes itens: - - O acompanhe com o código-fonte completo correspondente e em forma acessível por máquinas, que deve ser distribuído sob os termos das Seções 1 e 2 acima e em meio normalmente utilizado para o intercâmbio de software; ou, - - - O acompanhe com uma oferta expressa, válida por pelo menos três anos, de fornecer a qualquer terceiros, com um custo não superior ao custo de distribuição física do material, uma cópia do código-fonte completo e em forma acessível por máquinas, que deve ser distribuído sob os termos das Seções 1 e 2 acima e em meio normalmente utilizado para o intercâmbio de software; ou, - - - O acompanhe com a informação que você recebeu em relação à oferta de distribuição do código-fonte correspondente. (Esta alternativa é permitida somente em distribuição não comercial, e apenas se você recebeu o programa em forma de código-objeto ou executável, com oferta, de acordo com a Subseção b acima.) - - - - O código-fonte de um trabalho corresponde à forma de trabalho preferida para se fazer modificações. Para um trabalho em forma executável, o código-fonte completo significa todo o código-fonte de todos os módulos que ele contém, mais quaisquer arquivos de definição de "interface", mais os "scripts" utilizados para se controlar a compilação e a instalação do executável. Contudo, como exceção especial, o código-fonte distribuído não precisa incluir qualquer componente normalmente distribuído (tanto em forma original quanto binária) com os maiores componentes (o compilador, o "kernel" etc.) do sistema operacional sob o qual o executável funciona, a menos que o componente em si acompanhe o executável. - - Se a distribuição do executável ou código-objeto é feita através da oferta de acesso a cópias de algum lugar, então ofertar o acesso equivalente a cópia, do mesmo lugar, do código-fonte equivale à distribuição do código-fonte, mesmo que terceiros não sejam compelidos a copiar o código-fonte com o código-objeto. - - - - Seção 4 - - Você não pode copiar, modificar, sub-licenciar ou distribuir o Programa, exceto de acordo com as condições expressas nesta Licença. Qualquer outra tentativa de cópia, modificação, sub-licenciamento ou distribuição do Programa é vetado, e cancelará automaticamente os direitos que lhe foram fornecidos por esta Licença. No entanto, terceiros que receberam cópias ou direitos, fornecidos por você sob os termos desta Licença, não terão suas licenças canceladas, desde que permaneçam em total concordância com ela. - - - - Seção 5 - - Você não é obrigado a aceitar esta Licença, já que não a assinou. No entanto, nada mais o dará permissão para modificar ou distribuir o Programa ou trabalhos derivados deste. Estas ações são proibidas por lei, caso você não aceite esta Licença. Desta forma, ao modificar ou distribuir o Programa (ou qualquer trabalho derivado do Programa), você estará indicando sua total aceitação desta Licença para fazê-los, e todos os seus termos e condições para copiar, distribuir ou modificar o Programa, ou trabalhos baseados nele. - - - - Seção 6 - - Cada vez que você redistribuir o Programa (ou qualquer trabalho baseado nele), os recebedores adquirirão automaticamente do licenciador original uma licença para copiar, distribuir ou modificar o Programa, sujeitos a estes termos e condições. Você não poderá impor aos recebedores qualquer outra restrição ao exercício dos direitos então adquiridos. Você não é responsável em garantir a concordância de terceiros a esta Licença. - - - - Seção 7 - - Se, em consequência de decisões judiciais ou alegações de infringimento de patentes ou quaisquer outras razões (não limitadas a assuntos relacionados a patentes), condições forem impostas a você (por ordem judicial, acordos ou outras formas) e que contradigam as condições desta Licença, elas não o livram das condições desta Licença. Se você não puder distribuir de forma a satisfazer simultaneamente suas obrigações para com esta Licença e para com as outras obrigações pertinentes, então como consequência você não poderá distribuir o Programa. Por exemplo, se uma licença de patente não permitir a redistribuição, livre de "royalties", do Programa, por todos aqueles que receberem cópias direta ou indiretamente de você, então a única forma de você satisfazer a ela e a esta Licença seria a de desistir completamente de distribuir o Programa. - - Se qualquer parte desta seção for considerada inválida ou não aplicável em qualquer circunstância particular, o restante da seção se aplica, e a seção como um todo se aplica em outras circunstâncias. - - O propósito desta seção não é o de induzi-lo a infringir quaisquer patentes ou reivindicação de direitos de propriedade outros, ou a contestar a validade de quaisquer dessas reivindicações; esta seção tem como único propósito proteger a integridade dos sistemas de distribuição de software livres, o que é implementado pela prática de licenças públicas. Várias pessoas têm contribuído generosamente e em grande escala para os software distribuídos usando este sistema, na certeza de que sua aplicação é feita de forma consistente; fica a critério do autor/doador decidir se ele ou ela está disposto a distribuir software utilizando outro sistema, e um licenciado não pode impor qualquer escolha. - - Esta seção destina-se a tornar bastante claro o que se acredita ser consequência do restante desta Licença. - - - - Seção 8 - - Se a distribuição e/ou uso do Programa são restringidos em certos países por patentes ou direitos autorais, o detentor dos direitos autorais original, e que colocou o Programa sob esta Licença, pode incluir uma limitação geográfica de distribuição, excluindo aqueles países de forma a tornar a distribuição permitida apenas naqueles ou entre aqueles países então não excluídos. Nestes casos, esta Licença incorpora a limitação como se a mesma constasse escrita nesta Licença. - - - - Seção 9 - - A Free Software Foundation pode publicar versões revisadas e/ou novas da Licença Pública Geral de tempos em tempos. Estas novas versões serão similares em espírito à versão atual, mas podem diferir em detalhes que resolvem novos problemas ou situações. - - A cada versão é dada um número distinto. Se o Programa especifica um número de versão específico desta Licença que se aplica a ele e a qualquer nova versão, você tem a opção de aceitar os termos e condições daquela versão ou de qualquer outra versão publicada pela Free Software Foundation. Se o Programa não especifica um número de versão desta Licença, você pode escolher qualquer versão já publicada pela Free Software Foundation. - - - - Seção 10 - - Se você pretende incorporar partes do Programa em outros programas livres, cujas condições de distribuição são diferentes, escreva ao autor e solicite permissão. Para o software que a Free Software Foundation detém direitos autorais, escreva à Free Software Foundation; às vezes nós permitimos exceções a este caso. Nossa decisão será guiada pelos dois objetivos de preservar a condição de liberdade de todas as derivações do nosso software livre, e de promover o compartilhamento e reutilização de software em aspectos gerais. - - - - AUSÊNCIA DE GARANTIAS - Seção 11 - - UMA VEZ QUE O PROGRAMA É LICENCIADO SEM ÔNUS, NÃO HÁ QUALQUER GARANTIA PARA O PROGRAMA, NA EXTENSÃO PERMITIDA PELAS LEIS APLICÁVEIS. EXCETO QUANDO EXPRESSADO DE FORMA EXPRESSA, OS DETENTORES DOS DIREITOS AUTORAIS E/OU TERCEIROS DISPONIBILIZAM O PROGRAMA NO ESTADO, SEM QUALQUER TIPO DE GARANTIAS, EXPRESSAS OU IMPLÍCITAS, INCLUINDO, MAS NÃO LIMITADO A, AS GARANTIAS IMPLÍCITAS DE COMERCIALIZAÇÃO E AS DE ADEQUAÇÃO A QUALQUER PROPÓSITO. TODO O RISCO RELACIONADO À QUALIDADE E DESEMPENHO DO PROGRAMA É SEU. SE O PROGRAMA SE MOSTRAR DEFEITUOSO, VOCÊ ASSUME OS CUSTOS DE TODAS AS MANUTENÇÕES, REPAROS E CORREÇÕES. - - - - Seção 12 - - EM NENHUMA OCASIÃO, A MENOS QUE EXIGIDO PELAS LEIS APLICÁVEIS OU ACORDO EXPRESSO, OS DETENTORES DOS DIREITOS AUTORAIS, OU QUALQUER OUTRA PARTE QUE POSSA MODIFICAR E/OU REDISTRIBUIR O PROGRAMA CONFORME PERMITIDO ACIMA, SERÃO RESPONSABILIZADOS POR VOCÊ POR DANOS, INCLUINDO QUALQUER DANO EM GERAL, ESPECIAL, ACIDENTAL OU CONSEQUENTE, RESULTANTES DO USO OU INCAPACIDADE DE USO DO PROGRAMA (INCLUINDO, MAS NÃO LIMITADO A, PERDA DE DADOS OU DADOS TORNADOS INCORRETOS, OU PERDAS SOFRIDAS POR VOCÊ OU POR OUTRAS PARTES, OU FALHAS DO PROGRAMA AO OPERAR COM QUALQUER OUTRO PROGRAMA), MESMO QUE TAL DETENTOR OU PARTE TENHAM SIDO AVISADOS DA POSSIBILIDADE DE TAIS DANOS. - - -
diff -Nru gnome-desktop3-3.12.0/desktop-docs/gpl/pt_BR/pt_BR.po gnome-desktop3-3.8.4/desktop-docs/gpl/pt_BR/pt_BR.po --- gnome-desktop3-3.12.0/desktop-docs/gpl/pt_BR/pt_BR.po 2014-03-11 18:06:31.000000000 +0000 +++ gnome-desktop3-3.8.4/desktop-docs/gpl/pt_BR/pt_BR.po 1970-01-01 00:00:00.000000000 +0000 @@ -1,839 +0,0 @@ -# Brazilian Portuguese translation for gnome-desktop. -# Copyright (C) 2012 gnome-desktop's COPYRIGHT HOLDER -# This file is distributed under the same license as the gnome-desktop package. -# Rafael Ferreira , 2012. -# -msgid "" -msgstr "" -"Project-Id-Version: gnome-desktop master\n" -"POT-Creation-Date: 2013-08-31 11:22+0000\n" -"PO-Revision-Date: 2014-03-07 23:07-0300\n" -"Last-Translator: Rafael Ferreira \n" -"Language-Team: Brazilian Portuguese \n" -"Language: pt_BR\n" -"MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=UTF-8\n" -"Content-Transfer-Encoding: 8bit\n" -"Plural-Forms: nplurals=2; plural=(n > 1);\n" -"X-Generator: Poedit 1.6.4\n" - -#. Put one translator per line, in the form NAME , YEAR1, YEAR2 -msgctxt "_" -msgid "translator-credits" -msgstr "Rafael Ferreira , 2012, 2013" - -#. (itstool) path: articleinfo/title -#: C/index.docbook:17 -msgid "GNU General Public License" -msgstr "Licença Pública Geral GNU" - -#. (itstool) path: articleinfo/copyright -#: C/index.docbook:18 -msgid "2000 Free Software Foundation, Inc." -msgstr "2000 Free Software Foundation, Inc." - -#. (itstool) path: articleinfo/author -#: C/index.docbook:23 -msgid "Free Software Foundation" -msgstr "Free Software Foundation" - -#. (itstool) path: publisher/publishername -#: C/index.docbook:28 -msgid "GNOME Documentation Project" -msgstr "Projeto de Documentação do GNOME" - -#. (itstool) path: revhistory/revision -#: C/index.docbook:32 -msgid "2 1991-06" -msgstr "2 1991-06" - -#. (itstool) path: para/address -#: C/index.docbook:40 -#, no-wrap -msgid "" -"Free Software Foundation, Inc. \n" -"\t 51 Franklin Street, Fifth Floor, \n" -"\t Boston, \n" -"\t MA 02110-1301\n" -"\t USA\n" -"\t" -msgstr "" -"Free Software Foundation, Inc. \n" -"\t 51 Franklin Street, Fifth Floor, \n" -"\t Boston, \n" -"\t MA 02110-1301\n" -"\t USA\n" -"\t" - -#. (itstool) path: legalnotice/para -#: C/index.docbook:39 -msgid "<_:address-1/>." -msgstr "<_:address-1/>." - -#. (itstool) path: legalnotice/para -#: C/index.docbook:48 -msgid "" -"Everyone is permitted to copy and distribute verbatim copies of this license " -"document, but changing it is not allowed." -msgstr "" -"A qualquer pessoa é permitido copiar e distribuir cópias desse documento de " -"licença, desde que sem qualquer alteração." - -#. (itstool) path: articleinfo/releaseinfo -#: C/index.docbook:54 -msgid "Version 2, June 1991" -msgstr "Versão 2, junho de 1991" - -#. (itstool) path: abstract/para -#: C/index.docbook:58 -msgid "" -"The licenses for most software are designed to take away your freedom to " -"share and change it. By contrast, the GNU General Public License is intended " -"to guarantee your freedom to share and change free software - to make sure " -"the software is free for all its users." -msgstr "" -"As licenças de muitos softwares são desenvolvidas para restringir sua " -"liberdade de compartilhá-lo e mudá-lo. Contrária a isso, a Licença Pública " -"Geral GNU pretende garantir sua liberdade de compartilhar e alterar software " -"livres -- garantindo que o software será livre e gratuito para os seus " -"usuários." - -#. (itstool) path: sect1/title -#: C/index.docbook:67 -msgid "Preamble" -msgstr "Preâmbulo" - -#. (itstool) path: sect1/para -#: C/index.docbook:69 -msgid "" -"The licenses for most software are designed to take away your freedom to " -"share and change it. By contrast, the GNU General Public License is intended " -"to guarantee your freedom to share and change free software - to make sure " -"the software is free for all its users. This General Public License applies " -"to most of the Free Software Foundation's software and to any other program " -"whose authors commit to using it. (Some other Free Software Foundation " -"software is covered by the GNU Library General Public License instead.) You " -"can apply it to your programs, too." -msgstr "" -"As licenças de muitos software são desenvolvidas para restringir sua " -"liberdade de compartilhá-lo e mudá-lo. Contrária a isso, a Licença Pública " -"Geral GNU pretende garantir sua liberdade de compartilhar e alterar " -"softwares livres -- garantindo que o software será livre e gratuito para os " -"seus usuários. Esta Licença Pública Geral aplica-se à maioria dos softwares " -"da Free Software Foundation e a qualquer outro programa cujo autor decida " -"aplicá-la. (Alguns outros software da FSF são cobertos pela Licença Pública " -"Geral de Bibliotecas, no entanto.) Você pode aplicá-la também aos seus " -"programas." - -#. (itstool) path: sect1/para -#: C/index.docbook:81 -msgid "" -"When we speak of free software, we are referring to freedom, not price. Our " -"General Public Licenses are designed to make sure that you have the freedom " -"to distribute copies of free software (and charge for this service if you " -"wish), that you receive source code or can get it if you want it, that you " -"can change the software or use pieces of it in new free programs; and that " -"you know you can do these things." -msgstr "" -"Quando nos referimos a software livre, estamos nos referindo a liberdade, e " -"não a preço. As nossas Licenças Públicas Gerais foram desenvolvidas para " -"garantir que você tenha a liberdade de distribuir cópias de softwares livres " -"(e cobrar por este serviço, se quiser); que você receba o código-fonte ou " -"tenha acesso a ele, se quiser; que você possa alterar o software ou utilizar " -"partes dele em novos programas livres; e que você saiba que pode fazer tudo " -"isso." - -#. (itstool) path: sect1/para -#: C/index.docbook:90 -msgid "" -"To protect your rights, we need to make restrictions that forbid anyone to " -"deny you these rights or to ask you to surrender the rights. These " -"restrictions translate to certain responsibilities for you if you distribute " -"copies of the software, or if you modify it." -msgstr "" -"Para proteger seus direitos, precisamos fazer restrições que impeçam a " -"qualquer um negar estes direitos ou solicitar que você abdique deles. Estas " -"restrições traduzem-se em certas responsabilidades para você, se você for " -"distribuir cópias do software ou modificá-lo." - -#. (itstool) path: sect1/para -#: C/index.docbook:97 -msgid "" -"For example, if you distribute copies of such a program, whether gratis or " -"for a fee, you must give the recipients all the rights that you have. You " -"must make sure that they, too, receive or can get the source code. And you " -"must show them these terms so they know their rights." -msgstr "" -"Por exemplo, se você distribuir cópias de um programa, gratuitamente ou por " -"alguma quantia, você tem que fornecer aos receptores todos os direitos que " -"você possui. Você tem que garantir que eles também recebam ou possam obter o " -"código-fonte. E você tem que mostrar-lhes estes termos para que eles possam " -"conhecer seus direitos." - -#. (itstool) path: listitem/para -#: C/index.docbook:109 -msgid "copyright the software, and" -msgstr "com direitos autorais do software; e" - -#. (itstool) path: listitem/para -#: C/index.docbook:114 -msgid "" -"offer you this license which gives you legal permission to copy, distribute " -"and/or modify the software." -msgstr "" -"com a oferta desta licença, que lhe dá permissão legal para copiar, " -"distribuir e/ou modificar o software." - -#. (itstool) path: sect1/para -#: C/index.docbook:104 -msgid "We protect your rights with two steps: <_:orderedlist-1/>" -msgstr "Nós protegemos seus direitos em dois passos: <_:orderedlist-1/>" - -#. (itstool) path: sect1/para -#: C/index.docbook:122 -msgid "" -"Also, for each author's protection and ours, we want to make certain that " -"everyone understands that there is no warranty for this free software. If " -"the software is modified by someone else and passed on, we want its " -"recipients to know that what they have is not the original, so that any " -"problems introduced by others will not reflect on the original authors' " -"reputations." -msgstr "" -"Além disso, tanto para a proteção de cada autor quanto a nossa, gostaríamos " -"de nos certificar de que todos entendam que não há qualquer garantia nestes " -"softwares livres. Se o software é modificado por alguém mais e passado " -"adiante, queremos que seus recebedores saibam que o que eles obtiveram não é " -"original, de forma que qualquer problema introduzido por terceiros não " -"interfira na reputação do autor original." - -#. (itstool) path: sect1/para -#: C/index.docbook:131 -msgid "" -"Finally, any free program is threatened constantly by software patents. We " -"wish to avoid the danger that redistributors of a free program will " -"individually obtain patent licenses, in effect making the program " -"proprietary. To prevent this, we have made it clear that any patent must be " -"licensed for everyone's free use or not licensed at all." -msgstr "" -"Finalmente, qualquer programa livre é ameaçado constantemente por patentes " -"de software. Queremos evitar o perigo de que redistribuidores de software " -"livre obtenham individualmente licenças de patentes, o que teria o efeito de " -"tornar o programa proprietário. Para prevenir isso, deixamos claro que " -"qualquer patente tem que ser licenciada para uso livre e gratuito por " -"qualquer pessoa, ou então que não seja licenciada." - -#. (itstool) path: sect1/para -#: C/index.docbook:139 -msgid "" -"The precise terms and conditions for copying, distribution and modification " -"follow." -msgstr "" -"Os precisos termos e condições para cópia, distribuição e modificação se " -"encontram abaixo." - -#. (itstool) path: sect1/title -#: C/index.docbook:147 -msgid "TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION" -msgstr "TERMOS E CONDIÇÕES PARA CÓPIA, DISTRIBUIÇÃO E MODIFICAÇÃO" - -#. (itstool) path: sect2/title -#: C/index.docbook:150 -msgid "Section 0" -msgstr "Seção 0" - -#. (itstool) path: sect2/para -#: C/index.docbook:151 -msgid "" -"This License applies to any program or other work which contains a notice " -"placed by the copyright holder saying it may be distributed under the terms " -"of this General Public License. The Program, below, refers to " -"any such program or work, and a work based on the Program " -"means either the Program or any derivative work under copyright law: that is " -"to say, a work containing the Program or a portion of it, either verbatim or " -"with modifications and/or translated into another language. (Hereinafter, " -"translation is included without limitation in the term modification.) Each licensee is addressed as you." -msgstr "" -"Esta Licença se aplica a qualquer programa ou outro trabalho que contenha um " -"aviso colocado pelo detentor dos direitos autorais informando que aquele " -"pode ser distribuído sob as condições desta Licença Pública Geral. O " -"Programa abaixo refere-se a qualquer programa ou trabalho, e " -"trabalho baseado no Programa significa tanto o Programa em si " -"como quaisquer trabalhos derivados, de acordo com a lei de direitos " -"autorais: isto quer dizer um trabalho que contenha o Programa ou parte dele, " -"tanto originalmente quanto com modificações, e/ou tradução para outro " -"idioma. (Doravante tradução está incluído sem limites no termo " -"modificação.) Cada licenciado é mencionado como você." - -#. (itstool) path: sect2/para -#: C/index.docbook:163 -msgid "" -"Activities other than copying, distribution and modification are not covered " -"by this License; they are outside its scope. The act of running the Program " -"is not restricted, and the output from the Program is covered only if its " -"contents constitute a work based on the Program (independent of having been " -"made by running the Program). Whether that is true depends on what the " -"Program does." -msgstr "" -"Atividades além de cópia, distribuição e modificação não estão cobertas por " -"esta Licença; elas estão fora de seu escopo. O ato de executar o Programa " -"não é restringido, e o resultado do Programa é coberto apenas se seu " -"conteúdo contenha trabalhos baseados no Programa (independentemente de terem " -"sido gerados pela execução do Programa). Se isso é verdadeiro depende do que " -"o Programa faz." - -#. (itstool) path: sect2/title -#: C/index.docbook:173 -msgid "Section 1" -msgstr "Seção 1" - -#. (itstool) path: sect2/para -#: C/index.docbook:174 -msgid "" -"You may copy and distribute verbatim copies of the Program's source code as " -"you receive it, in any medium, provided that you conspicuously and " -"appropriately publish on each copy an appropriate copyright notice and " -"disclaimer of warranty; keep intact all the notices that refer to this " -"License and to the absence of any warranty; and give any other recipients of " -"the Program a copy of this License along with the Program." -msgstr "" -"Você pode copiar e distribuir cópias fiéis do código-fonte do Programa da " -"mesma forma que você o recebeu, usando qualquer meio, desde que você " -"conspícua e apropriadamente publique em cada cópia um aviso de direitos " -"autorais e uma declaração de inexistência de garantias de forma apropriada; " -"mantenha intactos todos os avisos que se referem a esta Licença e à ausência " -"total de garantias; e forneça a outros recebedores do Programa uma cópia " -"desta Licença, junto com o Programa." - -#. (itstool) path: sect2/para -#: C/index.docbook:183 -msgid "" -"You may charge a fee for the physical act of transferring a copy, and you " -"may at your option offer warranty protection in exchange for a fee." -msgstr "" -"Você pode cobrar pelo ato físico de transferir uma cópia e pode, " -"opcionalmente, oferecer garantia em troca de pagamento." - -#. (itstool) path: sect2/title -#: C/index.docbook:190 -msgid "Section 2" -msgstr "Seção 2" - -#. (itstool) path: listitem/para -#: C/index.docbook:199 -msgid "" -"You must cause the modified files to carry prominent notices stating that " -"you changed the files and the date of any change." -msgstr "" -"Você tem que fazer com que os arquivos modificados levem avisos proeminentes " -"afirmando que você alterou os arquivos, incluindo a data de qualquer " -"alteração." - -#. (itstool) path: listitem/para -#: C/index.docbook:205 -msgid "" -"You must cause any work that you distribute or publish, that in whole or in " -"part contains or is derived from the Program or any part thereof, to be " -"licensed as a whole at no charge to all third parties under the terms of " -"this License." -msgstr "" -"Você tem que fazer com que quaisquer trabalhos que você distribua ou " -"publique, e que integralmente ou em partes contenham ou sejam derivados do " -"Programa ou de suas partes, sejam licenciados, integralmente e sem custo " -"algum para quaisquer terceiros, sob os termos desta Licença." - -#. (itstool) path: note/title -#: C/index.docbook:223 -msgid "Exception:" -msgstr "Exceção:" - -#. (itstool) path: note/para -#: C/index.docbook:224 -msgid "" -"If the Program itself is interactive but does not normally print such an " -"announcement, your work based on the Program is not required to print an " -"announcement." -msgstr "" -"se o Programa em si é interativo mas normalmente não imprime estes tipos de " -"anúncios, seu trabalho baseado no Programa não precisa imprimir um anúncio." - -#. (itstool) path: listitem/para -#: C/index.docbook:213 -msgid "" -"If the modified program normally reads commands interactively when run, you " -"must cause it, when started running for such interactive use in the most " -"ordinary way, to print or display an announcement including an appropriate " -"copyright notice and a notice that there is no warranty (or else, saying " -"that you provide a warranty) and that users may redistribute the program " -"under these conditions, and telling the user how to view a copy of this " -"License. <_:note-1/>" -msgstr "" -"Se o programa modificado normalmente lê comandos interativamente quando " -"executados, você tem que fazer com que, quando iniciado tal uso interativo " -"da forma mais simples, seja impresso ou mostrado um anúncio de direitos " -"autorais um e anúncio de que não há qualquer garantia (ou então, que você " -"fornece a garantia) e que os usuários podem redistribuir o programa sob " -"estas condições, ainda informando os usuários como consultar uma cópia desta " -"Licença. <_:note-1/>" - -#. (itstool) path: sect2/para -#: C/index.docbook:191 -msgid "" -"You may modify your copy or copies of the Program or any portion of it, thus " -"forming a work based on the Program, and copy and distribute such " -"modifications or work under the terms of Section 1 above, provided that you also meet all of these conditions: <_:" -"orderedlist-1/>" -msgstr "" -"Você pode modificar sua cópia ou cópias do Programa, ou qualquer parte dele, " -"assim gerando um trabalho baseado no Programa, e copiar e distribuir essas " -"modificações ou trabalhos sob os termos da Seção 1 acima, desde que você também se atenda a todas estas condições: <_:" -"orderedlist-1/>" - -#. (itstool) path: sect2/para -#: C/index.docbook:236 -msgid "" -"These requirements apply to the modified work as a whole. If identifiable " -"sections of that work are not derived from the Program, and can be " -"reasonably considered independent and separate works in themselves, then " -"this License, and its terms, do not apply to those sections when you " -"distribute them as separate works. But when you distribute the same sections " -"as part of a whole which is a work based on the Program, the distribution of " -"the whole must be on the terms of this License, whose permissions for other " -"licensees extend to the entire whole, and thus to each and every part " -"regardless of who wrote it." -msgstr "" -"Estas exigências aplicam-se ao trabalho modificado como um todo. Se seções " -"identificáveis de tal trabalho não forem derivadas do Programa, e que podem " -"ser razoavelmente consideradas trabalhos independentes e separados por si " -"só, então esta Licença, e seus termos, não se aplicam a estas seções quando " -"você distribuí-las como trabalhos em separado. Mas quando você distribuir as " -"mesmas seções como parte de um todo, o qual é baseado no Programa, a " -"distribuição como um todo deve que se enquadrar nos termos desta Licença, " -"cujas permissões para outros licenciados se estendem ao todo, portanto para " -"cada e toda parte, independente de quem a escreveu." - -#. (itstool) path: sect2/para -#: C/index.docbook:247 -msgid "" -"Thus, it is not the intent of this section to claim rights or contest your " -"rights to work written entirely by you; rather, the intent is to exercise " -"the right to control the distribution of derivative or collective works " -"based on the Program." -msgstr "" -"Desta forma, esta seção não tem a intenção de reclamar direitos ou contestar " -"seus direitos sobre o trabalho escrito inteiramente por você; ao invés " -"disso, a intenção é a de exercitar o direito de controlar a distribuição de " -"trabalhos, derivados ou coletivos, baseados no Programa." - -#. (itstool) path: sect2/para -#: C/index.docbook:253 -msgid "" -"In addition, mere aggregation of another work not based on the Program with " -"the Program (or with a work based on the Program) on a volume of a storage " -"or distribution medium does not bring the other work under the scope of this " -"License." -msgstr "" -"Adicionalmente, a mera agregação ao Programa de outro trabalho não baseado " -"no Programa (ou de trabalho baseado no Programa) em um volume de " -"armazenamento ou meio de distribuição não faz o outro trabalho parte do " -"escopo desta Licença." - -#. (itstool) path: sect2/title -#: C/index.docbook:261 -msgid "Section 3" -msgstr "Seção 3" - -#. (itstool) path: listitem/para -#: C/index.docbook:271 -msgid "" -"Accompany it with the complete corresponding machine-readable source code, " -"which must be distributed under the terms of Sections 1 and 2 above on a " -"medium customarily used for software interchange; or," -msgstr "" -"O acompanhe com o código-fonte completo correspondente e em forma acessível " -"por máquinas, que deve ser distribuído sob os termos das Seções 1 e 2 acima e em meio " -"normalmente utilizado para o intercâmbio de software; ou," - -#. (itstool) path: listitem/para -#: C/index.docbook:278 -msgid "" -"Accompany it with a written offer, valid for at least three years, to give " -"any third party, for a charge no more than your cost of physically " -"performing source distribution, a complete machine-readable copy of the " -"corresponding source code, to be distributed under the terms of Sections 1 " -"and 2 above on a medium customarily used for software interchange; or," -msgstr "" -"O acompanhe com uma oferta expressa, válida por pelo menos três anos, de " -"fornecer a qualquer terceiros, com um custo não superior ao custo de " -"distribuição física do material, uma cópia do código-fonte completo e em " -"forma acessível por máquinas, que deve ser distribuído sob os termos das " -"Seções 1 e 2 acima e em meio normalmente utilizado para o intercâmbio de " -"software; ou," - -#. (itstool) path: listitem/para -#: C/index.docbook:287 -msgid "" -"Accompany it with the information you received as to the offer to distribute " -"corresponding source code. (This alternative is allowed only for " -"noncommercial distribution and only if you received the program in object " -"code or executable form with such an offer, in accord with Subsection b " -"above.)" -msgstr "" -"O acompanhe com a informação que você recebeu em relação à oferta de " -"distribuição do código-fonte correspondente. (Esta alternativa é permitida " -"somente em distribuição não comercial, e apenas se você recebeu o programa " -"em forma de código-objeto ou executável, com oferta, de acordo com a " -"Subseção b acima.)" - -#. (itstool) path: sect2/para -#: C/index.docbook:263 -msgid "" -"You may copy and distribute the Program (or a work based on it, under Section 2) in object code or executable form under " -"the terms of Sections 1 and 2 above provided that you also do one of the following: <_:" -"orderedlist-1/>" -msgstr "" -"Você pode copiar e distribuir o Programa (ou um trabalho baseado nele, " -"conforme descrito na Seção 2) em código-" -"objeto ou em forma executável sob os termos das Seções 1 e 2 acima, desde " -"que você também faça um dos seguintes itens: <_:orderedlist-1/>" - -#. (itstool) path: sect2/para -#: C/index.docbook:297 -msgid "" -"The source code for a work means the preferred form of the work for making " -"modifications to it. For an executable work, complete source code means all " -"the source code for all modules it contains, plus any associated interface " -"definition files, plus the scripts used to control compilation and " -"installation of the executable. However, as a special exception, the source " -"code distributed need not include anything that is normally distributed (in " -"either source or binary form) with the major components (compiler, kernel, " -"and so on) of the operating system on which the executable runs, unless that " -"component itself accompanies the executable." -msgstr "" -"O código-fonte de um trabalho corresponde à forma de trabalho preferida para " -"se fazer modificações. Para um trabalho em forma executável, o código-fonte " -"completo significa todo o código-fonte de todos os módulos que ele contém, " -"mais quaisquer arquivos de definição de \"interface\", mais os \"scripts\" " -"utilizados para se controlar a compilação e a instalação do executável. " -"Contudo, como exceção especial, o código-fonte distribuído não precisa " -"incluir qualquer componente normalmente distribuído (tanto em forma original " -"quanto binária) com os maiores componentes (o compilador, o \"kernel\" etc.) " -"do sistema operacional sob o qual o executável funciona, a menos que o " -"componente em si acompanhe o executável." - -#. (itstool) path: sect2/para -#: C/index.docbook:307 -msgid "" -"If distribution of executable or object code is made by offering access to " -"copy from a designated place, then offering equivalent access to copy the " -"source code from the same place counts as distribution of the source code, " -"even though third parties are not compelled to copy the source along with " -"the object code." -msgstr "" -"Se a distribuição do executável ou código-objeto é feita através da oferta " -"de acesso a cópias de algum lugar, então ofertar o acesso equivalente a " -"cópia, do mesmo lugar, do código-fonte equivale à distribuição do código-" -"fonte, mesmo que terceiros não sejam compelidos a copiar o código-fonte com " -"o código-objeto." - -#. (itstool) path: sect2/title -#: C/index.docbook:316 -msgid "Section 4" -msgstr "Seção 4" - -#. (itstool) path: sect2/para -#: C/index.docbook:318 -msgid "" -"You may not copy, modify, sublicense, or distribute the Program except as " -"expressly provided under this License. Any attempt otherwise to copy, " -"modify, sublicense or distribute the Program is void, and will automatically " -"terminate your rights under this License. However, parties who have received " -"copies, or rights, from you under this License will not have their licenses " -"terminated so long as such parties remain in full compliance." -msgstr "" -"Você não pode copiar, modificar, sub-licenciar ou distribuir o Programa, " -"exceto de acordo com as condições expressas nesta Licença. Qualquer outra " -"tentativa de cópia, modificação, sub-licenciamento ou distribuição do " -"Programa é vetado, e cancelará automaticamente os direitos que lhe foram " -"fornecidos por esta Licença. No entanto, terceiros que receberam cópias ou " -"direitos, fornecidos por você sob os termos desta Licença, não terão suas " -"licenças canceladas, desde que permaneçam em total concordância com ela." - -#. (itstool) path: sect2/title -#: C/index.docbook:328 -msgid "Section 5" -msgstr "Seção 5" - -#. (itstool) path: sect2/para -#: C/index.docbook:330 -msgid "" -"You are not required to accept this License, since you have not signed it. " -"However, nothing else grants you permission to modify or distribute the " -"Program or its derivative works. These actions are prohibited by law if you " -"do not accept this License. Therefore, by modifying or distributing the " -"Program (or any work based on the Program), you indicate your acceptance of " -"this License to do so, and all its terms and conditions for copying, " -"distributing or modifying the Program or works based on it." -msgstr "" -"Você não é obrigado a aceitar esta Licença, já que não a assinou. No " -"entanto, nada mais o dará permissão para modificar ou distribuir o Programa " -"ou trabalhos derivados deste. Estas ações são proibidas por lei, caso você " -"não aceite esta Licença. Desta forma, ao modificar ou distribuir o Programa " -"(ou qualquer trabalho derivado do Programa), você estará indicando sua total " -"aceitação desta Licença para fazê-los, e todos os seus termos e condições " -"para copiar, distribuir ou modificar o Programa, ou trabalhos baseados nele." - -#. (itstool) path: sect2/title -#: C/index.docbook:341 -msgid "Section 6" -msgstr "Seção 6" - -#. (itstool) path: sect2/para -#: C/index.docbook:343 -msgid "" -"Each time you redistribute the Program (or any work based on the Program), " -"the recipient automatically receives a license from the original licensor to " -"copy, distribute or modify the Program subject to these terms and " -"conditions. You may not impose any further restrictions on the recipients' " -"exercise of the rights granted herein. You are not responsible for enforcing " -"compliance by third parties to this License." -msgstr "" -"Cada vez que você redistribuir o Programa (ou qualquer trabalho baseado " -"nele), os recebedores adquirirão automaticamente do licenciador original uma " -"licença para copiar, distribuir ou modificar o Programa, sujeitos a estes " -"termos e condições. Você não poderá impor aos recebedores qualquer outra " -"restrição ao exercício dos direitos então adquiridos. Você não é responsável " -"em garantir a concordância de terceiros a esta Licença." - -#. (itstool) path: sect2/title -#: C/index.docbook:353 -msgid "Section 7" -msgstr "Seção 7" - -#. (itstool) path: sect2/para -#: C/index.docbook:355 -msgid "" -"If, as a consequence of a court judgment or allegation of patent " -"infringement or for any other reason (not limited to patent issues), " -"conditions are imposed on you (whether by court order, agreement or " -"otherwise) that contradict the conditions of this License, they do not " -"excuse you from the conditions of this License. If you cannot distribute so " -"as to satisfy simultaneously your obligations under this License and any " -"other pertinent obligations, then as a consequence you may not distribute " -"the Program at all. For example, if a patent license would not permit " -"royalty-free redistribution of the Program by all those who receive copies " -"directly or indirectly through you, then the only way you could satisfy both " -"it and this License would be to refrain entirely from distribution of the " -"Program." -msgstr "" -"Se, em consequência de decisões judiciais ou alegações de infringimento de " -"patentes ou quaisquer outras razões (não limitadas a assuntos relacionados a " -"patentes), condições forem impostas a você (por ordem judicial, acordos ou " -"outras formas) e que contradigam as condições desta Licença, elas não o " -"livram das condições desta Licença. Se você não puder distribuir de forma a " -"satisfazer simultaneamente suas obrigações para com esta Licença e para com " -"as outras obrigações pertinentes, então como consequência você não poderá " -"distribuir o Programa. Por exemplo, se uma licença de patente não permitir a " -"redistribuição, livre de \"royalties\", do Programa, por todos aqueles que " -"receberem cópias direta ou indiretamente de você, então a única forma de " -"você satisfazer a ela e a esta Licença seria a de desistir completamente de " -"distribuir o Programa." - -#. (itstool) path: sect2/para -#: C/index.docbook:367 -msgid "" -"If any portion of this section is held invalid or unenforceable under any " -"particular circumstance, the balance of the section is intended to apply and " -"the section as a whole is intended to apply in other circumstances." -msgstr "" -"Se qualquer parte desta seção for considerada inválida ou não aplicável em " -"qualquer circunstância particular, o restante da seção se aplica, e a seção " -"como um todo se aplica em outras circunstâncias." - -#. (itstool) path: sect2/para -#: C/index.docbook:373 -msgid "" -"It is not the purpose of this section to induce you to infringe any patents " -"or other property right claims or to contest validity of any such claims; " -"this section has the sole purpose of protecting the integrity of the free " -"software distribution system, which is implemented by public license " -"practices. Many people have made generous contributions to the wide range of " -"software distributed through that system in reliance on consistent " -"application of that system; it is up to the author/donor to decide if he or " -"she is willing to distribute software through any other system and a " -"licensee cannot impose that choice." -msgstr "" -"O propósito desta seção não é o de induzi-lo a infringir quaisquer patentes " -"ou reivindicação de direitos de propriedade outros, ou a contestar a " -"validade de quaisquer dessas reivindicações; esta seção tem como único " -"propósito proteger a integridade dos sistemas de distribuição de software " -"livres, o que é implementado pela prática de licenças públicas. Várias " -"pessoas têm contribuído generosamente e em grande escala para os software " -"distribuídos usando este sistema, na certeza de que sua aplicação é feita de " -"forma consistente; fica a critério do autor/doador decidir se ele ou ela " -"está disposto a distribuir software utilizando outro sistema, e um " -"licenciado não pode impor qualquer escolha." - -#. (itstool) path: sect2/para -#: C/index.docbook:383 -msgid "" -"This section is intended to make thoroughly clear what is believed to be a " -"consequence of the rest of this License." -msgstr "" -"Esta seção destina-se a tornar bastante claro o que se acredita ser " -"consequência do restante desta Licença." - -#. (itstool) path: sect2/title -#: C/index.docbook:390 -msgid "Section 8" -msgstr "Seção 8" - -#. (itstool) path: sect2/para -#: C/index.docbook:392 -msgid "" -"If the distribution and/or use of the Program is restricted in certain " -"countries either by patents or by copyrighted interfaces, the original " -"copyright holder who places the Program under this License may add an " -"explicit geographical distribution limitation excluding those countries, so " -"that distribution is permitted only in or among countries not thus excluded. " -"In such case, this License incorporates the limitation as if written in the " -"body of this License." -msgstr "" -"Se a distribuição e/ou uso do Programa são restringidos em certos países por " -"patentes ou direitos autorais, o detentor dos direitos autorais original, e " -"que colocou o Programa sob esta Licença, pode incluir uma limitação " -"geográfica de distribuição, excluindo aqueles países de forma a tornar a " -"distribuição permitida apenas naqueles ou entre aqueles países então não " -"excluídos. Nestes casos, esta Licença incorpora a limitação como se a mesma " -"constasse escrita nesta Licença." - -#. (itstool) path: sect2/title -#: C/index.docbook:402 -msgid "Section 9" -msgstr "Seção 9" - -#. (itstool) path: sect2/para -#: C/index.docbook:404 -msgid "" -"The Free Software Foundation may publish revised and/or new versions of the " -"General Public License from time to time. Such new versions will be similar " -"in spirit to the present version, but may differ in detail to address new " -"problems or concerns." -msgstr "" -"A Free Software Foundation pode publicar versões revisadas e/ou novas da " -"Licença Pública Geral de tempos em tempos. Estas novas versões serão " -"similares em espírito à versão atual, mas podem diferir em detalhes que " -"resolvem novos problemas ou situações." - -#. (itstool) path: sect2/para -#: C/index.docbook:410 -msgid "" -"Each version is given a distinguishing version number. If the Program " -"specifies a version number of this License which applies to it and " -"any later version, you have the option of following the terms " -"and conditions either of that version or of any later version published by " -"the Free Software Foundation. If the Program does not specify a version " -"number of this License, you may choose any version ever published by the " -"Free Software Foundation." -msgstr "" -"A cada versão é dada um número distinto. Se o Programa especifica um número " -"de versão específico desta Licença que se aplica a ele e a qualquer " -"nova versão, você tem a opção de aceitar os termos e condições " -"daquela versão ou de qualquer outra versão publicada pela Free Software " -"Foundation. Se o Programa não especifica um número de versão desta Licença, " -"você pode escolher qualquer versão já publicada pela Free Software " -"Foundation." - -#. (itstool) path: sect2/title -#: C/index.docbook:420 -msgid "Section 10" -msgstr "Seção 10" - -#. (itstool) path: sect2/para -#: C/index.docbook:422 -msgid "" -"If you wish to incorporate parts of the Program into other free programs " -"whose distribution conditions are different, write to the author to ask for " -"permission. For software which is copyrighted by the Free Software " -"Foundation, write to the Free Software Foundation; we sometimes make " -"exceptions for this. Our decision will be guided by the two goals of " -"preserving the free status of all derivatives of our free software and of " -"promoting the sharing and reuse of software generally." -msgstr "" -"Se você pretende incorporar partes do Programa em outros programas livres, " -"cujas condições de distribuição são diferentes, escreva ao autor e solicite " -"permissão. Para o software que a Free Software Foundation detém direitos " -"autorais, escreva à Free Software Foundation; às vezes nós permitimos " -"exceções a este caso. Nossa decisão será guiada pelos dois objetivos de " -"preservar a condição de liberdade de todas as derivações do nosso software " -"livre, e de promover o compartilhamento e reutilização de software em " -"aspectos gerais." - -#. (itstool) path: sect2/title -#: C/index.docbook:432 -msgid "NO WARRANTY" -msgstr "AUSÊNCIA DE GARANTIAS" - -#. (itstool) path: sect2/subtitle -#: C/index.docbook:433 -msgid "Section 11" -msgstr "Seção 11" - -#. (itstool) path: sect2/para -#: C/index.docbook:435 -msgid "" -"BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY FOR THE " -"PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW. EXCEPT WHEN OTHERWISE " -"STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES PROVIDE THE " -"PROGRAM AS IS WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED " -"OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF " -"MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. THE ENTIRE RISK AS TO " -"THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU. SHOULD THE PROGRAM " -"PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING, REPAIR OR " -"CORRECTION." -msgstr "" -"UMA VEZ QUE O PROGRAMA É LICENCIADO SEM ÔNUS, NÃO HÁ QUALQUER GARANTIA PARA " -"O PROGRAMA, NA EXTENSÃO PERMITIDA PELAS LEIS APLICÁVEIS. EXCETO QUANDO " -"EXPRESSADO DE FORMA EXPRESSA, OS DETENTORES DOS DIREITOS AUTORAIS E/OU " -"TERCEIROS DISPONIBILIZAM O PROGRAMA NO ESTADO, SEM QUALQUER " -"TIPO DE GARANTIAS, EXPRESSAS OU IMPLÍCITAS, INCLUINDO, MAS NÃO LIMITADO A, " -"AS GARANTIAS IMPLÍCITAS DE COMERCIALIZAÇÃO E AS DE ADEQUAÇÃO A QUALQUER " -"PROPÓSITO. TODO O RISCO RELACIONADO À QUALIDADE E DESEMPENHO DO PROGRAMA É " -"SEU. SE O PROGRAMA SE MOSTRAR DEFEITUOSO, VOCÊ ASSUME OS CUSTOS DE TODAS AS " -"MANUTENÇÕES, REPAROS E CORREÇÕES." - -#. (itstool) path: sect2/title -#: C/index.docbook:446 -msgid "Section 12" -msgstr "Seção 12" - -#. (itstool) path: sect2/para -#: C/index.docbook:448 -msgid "" -"IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING WILL " -"ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR REDISTRIBUTE " -"THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY " -"GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE USE " -"OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF DATA " -"OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD " -"PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS), " -"EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF " -"SUCH DAMAGES." -msgstr "" -"EM NENHUMA OCASIÃO, A MENOS QUE EXIGIDO PELAS LEIS APLICÁVEIS OU ACORDO " -"EXPRESSO, OS DETENTORES DOS DIREITOS AUTORAIS, OU QUALQUER OUTRA PARTE QUE " -"POSSA MODIFICAR E/OU REDISTRIBUIR O PROGRAMA CONFORME PERMITIDO ACIMA, SERÃO " -"RESPONSABILIZADOS POR VOCÊ POR DANOS, INCLUINDO QUALQUER DANO EM GERAL, " -"ESPECIAL, ACIDENTAL OU CONSEQUENTE, RESULTANTES DO USO OU INCAPACIDADE DE " -"USO DO PROGRAMA (INCLUINDO, MAS NÃO LIMITADO A, PERDA DE DADOS OU DADOS " -"TORNADOS INCORRETOS, OU PERDAS SOFRIDAS POR VOCÊ OU POR OUTRAS PARTES, OU " -"FALHAS DO PROGRAMA AO OPERAR COM QUALQUER OUTRO PROGRAMA), MESMO QUE TAL " -"DETENTOR OU PARTE TENHAM SIDO AVISADOS DA POSSIBILIDADE DE TAIS DANOS." diff -Nru gnome-desktop3-3.12.0/desktop-docs/lgpl/ca/ca.po gnome-desktop3-3.8.4/desktop-docs/lgpl/ca/ca.po --- gnome-desktop3-3.12.0/desktop-docs/lgpl/ca/ca.po 2013-11-11 17:23:17.000000000 +0000 +++ gnome-desktop3-3.8.4/desktop-docs/lgpl/ca/ca.po 1970-01-01 00:00:00.000000000 +0000 @@ -1,907 +0,0 @@ -# Catalan translation for gnome-desktop. -# Copyright (C) 2013 gnome-desktop's COPYRIGHT HOLDER -# This file is distributed under the same license as the gnome-desktop package. -# Gil Forcada , 2013. -# -msgid "" -msgstr "" -"Project-Id-Version: gnome-desktop master\n" -"POT-Creation-Date: 2013-04-30 16:43+0000\n" -"PO-Revision-Date: 2013-04-30 23:57+0200\n" -"Last-Translator: Gil Forcada \n" -"Language-Team: Catalan \n" -"Language: ca\n" -"MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=UTF-8\n" -"Content-Transfer-Encoding: 8bits\n" -"Plural-Forms: nplurals=2; plural=n != 1;\n" - -#. Put one translator per line, in the form NAME , YEAR1, YEAR2 -msgctxt "_" -msgid "translator-credits" -msgstr "Gil Forcada , 2013" - -#: C/index.docbook:17(articleinfo/title) -msgid "GNU Lesser General Public License" -msgstr "Llicència Pública General Reduïda de GNU" - -#: C/index.docbook:18(articleinfo/copyright) -msgid "2000 Free Software Foundation, Inc." -msgstr "2000 Free Software Foundation, Inc." - -#: C/index.docbook:22(articleinfo/author) -msgid "Free Software Foundation" -msgstr "Free Software Foundation" - -#: C/index.docbook:26(publisher/publishername) -msgid "GNOME Documentation Project" -msgstr "Projecte de documentació del GNOME" - -#: C/index.docbook:29(revhistory/revision) -msgid "2.1 1999-02" -msgstr "2.1 1999-02" - -#: C/index.docbook:36(para/address) -#, no-wrap -msgid "" -"Free Software Foundation, Inc. \n" -"\t 51 Franklin Street, Fifth Floor, \n" -"\t Boston, \n" -"\t MA 02110-1301\n" -"\t USA\n" -"\t " -msgstr "" -"Free Software Foundation, Inc. \n" -"\t 51 Franklin Street, Fifth Floor, \n" -"\t Boston, \n" -"\t MA 02110-1301\n" -"\t USA\n" -"\t " - -#: C/index.docbook:35(legalnotice/para) -msgid "<_:address-1/>." -msgstr "<_:address-1/>." - -#: C/index.docbook:43(legalnotice/para) -msgid "" -"Everyone is permitted to copy and distribute verbatim copies of this license " -"document, but changing it is not allowed." -msgstr "" -"Tothom pot copiar i distribuir còpies literals d'aquest document de " -"llicència, però no es permet de fer-hi modificacions." - -#: C/index.docbook:48(articleinfo/releaseinfo) -msgid "Version 2.1, February 1999" -msgstr "Versió 2.1, febrer de 1999" - -#: C/index.docbook:51(abstract/para) -msgid "" -"The licenses for most software are designed to take away your freedom to " -"share and change it. By contrast, the GNU General Public Licenses are " -"intended to guarantee your freedom to share and change free software - to " -"make sure the software is free for all its users." -msgstr "" -"Les llicències de la majoria de programari estan dissenyades per a prendre-" -"us la llibertat de compartir-lo i modificar-lo. Contràriament, les " -"Llicències públiques generals de GNU estan pensades per a garantir-vos la " -"llibertat de compartir i modificar el programari lliure, per tal d'assegurar " -"que el programari sigui lliure per a tots els seus usuaris i usuàries." - -#: C/index.docbook:61(sect1/title) -msgid "Preamble" -msgstr "Preàmbul" - -#: C/index.docbook:63(sect1/para) -msgid "" -"The licenses for most software are designed to take away your freedom to " -"share and change it. By contrast, the GNU General Public Licenses are " -"intended to guarantee your freedom to share and change free software--to " -"make sure the software is free for all its users." -msgstr "" -"Les llicències de la majoria de programari estan dissenyades per a prendre-" -"us la llibertat de compartir-lo i modificar-lo. Contràriament, les " -"Llicències públiques generals de GNU estan pensades per a garantir-vos la " -"llibertat de compartir i modificar el programari lliure, per tal d'assegurar " -"que el programari sigui lliure per a tots els seus usuaris i usuàries." - -#: C/index.docbook:70(sect1/para) -msgid "" -"When we speak of free software, we are referring to freedom, not price. Our " -"General Public Licenses are designed to make sure that you have the freedom " -"to distribute copies of free software (and charge for this service if you " -"wish), that you receive source code or can get it if you want it, that you " -"can change the software or use pieces of it in new free programs; and that " -"you know you can do these things." -msgstr "" -"Quan parlem de programari lliure ens referim a la llibertat, no al preu. Les " -"nostres llicències públiques generals estan pensades per assegurar que " -"tingueu la llibertat de distribuir còpies del programari lliure (i de cobrar " -"per aquest servei, si voleu); que rebeu el codi font o que, si el voleu, el " -"pugueu rebre; que pugueu modificar el programari o fer-ne servir parts en " -"programes lliures nous; i que sapigueu que podeu fer totes aquestes coses. " - -#: C/index.docbook:79(sect1/para) -msgid "" -"This license, the Lesser General Public License, applies to some specially " -"designated software packages--typically libraries--of the Free Software " -"Foundation and other authors who decide to use it. You can use it too, but " -"we suggest you first think carefully about whether this license or the " -"ordinary General Public License is the better strategy to use in any " -"particular case, based on the explanations below." -msgstr "" - -#: C/index.docbook:88(sect1/para) -msgid "" -"When we speak of free software, we are referring to freedom of use, not " -"price. Our General Public Licenses are designed to make sure that you have " -"the freedom to distribute copies of free software (and charge for this " -"service if you wish); that you receive source code or can get it if you want " -"it; that you can change the software and use pieces of it in new free " -"programs; and that you are informed that you can do these things." -msgstr "" -"Quan parlem de programari lliure ens referim a la llibertat, no al preu. Les " -"nostres llicències públiques generals estan pensades per assegurar que " -"tingueu la llibertat de distribuir còpies del programari lliure (i de cobrar " -"per aquest servei, si voleu); que rebeu el codi font o que, si el voleu, el " -"pugueu rebre; que pugueu modificar el programari o fer-ne servir parts en " -"programes lliures nous; i que sapigueu que podeu fer totes aquestes coses." - -#: C/index.docbook:98(sect1/para) -msgid "" -"To protect your rights, we need to make restrictions that forbid " -"distributors to deny you these rights or to ask you to surrender these " -"rights. These restrictions translate to certain responsibilities for you if " -"you distribute copies of the library or if you modify it." -msgstr "" -"Per protegir els vostres drets, cal que apliquem restriccions que " -"prohibeixin a tothom de negar-vos aquests drets o demanar-vos que hi " -"renuncieu. Aquestes restriccions suposen determinades responsabilitats per a " -"vós si distribuïu còpies del programari o si el modifiqueu." - -#: C/index.docbook:105(sect1/para) -msgid "" -"For example, if you distribute copies of the library, whether gratis or for " -"a fee, you must give the recipients all the rights that we gave you. You " -"must make sure that they, too, receive or can get the source code. If you " -"link other code with the library, you must provide complete object files to " -"the recipients, so that they can relink them with the library after making " -"changes to the library and recompiling it. And you must show them these " -"terms so they know their rights." -msgstr "" - -#: C/index.docbook:115(sect1/para) -msgid "" -"We protect your rights with a two-step method: (1) we copyright the library, " -"and (2) we offer you this license, which gives you legal permission to copy, " -"distribute and/or modify the library." -msgstr "" - -#: C/index.docbook:121(sect1/para) -msgid "" -"To protect each distributor, we want to make it very clear that there is no " -"warranty for the free library. Also, if the library is modified by someone " -"else and passed on, the recipients should know that what they have is not " -"the original version, so that the original author's reputation will not be " -"affected by problems that might be introduced by others." -msgstr "" - -#: C/index.docbook:130(sect1/para) -msgid "" -"Finally, software patents pose a constant threat to the existence of any " -"free program. We wish to make sure that a company cannot effectively " -"restrict the users of a free program by obtaining a restrictive license from " -"a patent holder. Therefore, we insist that any patent license obtained for a " -"version of the library must be consistent with the full freedom of use " -"specified in this license." -msgstr "" - -#: C/index.docbook:139(sect1/para) -msgid "" -"Most GNU software, including some libraries, is covered by the ordinary GNU " -"General Public License. This license, the GNU Lesser General Public License, " -"applies to certain designated libraries, and is quite different from the " -"ordinary General Public License. We use this license for certain libraries " -"in order to permit linking those libraries into non-free programs." -msgstr "" - -#: C/index.docbook:148(sect1/para) -msgid "" -"When a program is linked with a library, whether statically or using a " -"shared library, the combination of the two is legally speaking a combined " -"work, a derivative of the original library. The ordinary General Public " -"License therefore permits such linking only if the entire combination fits " -"its criteria of freedom. The Lesser General Public License permits more lax " -"criteria for linking other code with the library." -msgstr "" - -#: C/index.docbook:158(sect1/para) -msgid "" -"We call this license the Lesser General Public License " -"because it does Less to protect the user's freedom than the ordinary General " -"Public License. It also provides other free software developers Less of an " -"advantage over competing non-free programs. These disadvantages are the " -"reason we use the ordinary General Public License for many libraries. " -"However, the Lesser license provides advantages in certain special " -"circumstances." -msgstr "" - -#: C/index.docbook:168(sect1/para) -msgid "" -"For example, on rare occasions, there may be a special need to encourage the " -"widest possible use of a certain library, so that it becomes a de-facto " -"standard. To achieve this, non-free programs must be allowed to use the " -"library. A more frequent case is that a free library does the same job as " -"widely used non-free libraries. In this case, there is little to gain by " -"limiting the free library to free software only, so we use the Lesser " -"General Public License." -msgstr "" - -#: C/index.docbook:178(sect1/para) -msgid "" -"In other cases, permission to use a particular library in non-free programs " -"enables a greater number of people to use a large body of free software. For " -"example, permission to use the GNU C Library in non-free programs enables " -"many more people to use the whole GNU operating system, as well as its " -"variant, the GNU/Linux operating system." -msgstr "" - -#: C/index.docbook:187(sect1/para) -msgid "" -"Although the Lesser General Public License is Less protective of the users' " -"freedom, it does ensure that the user of a program that is linked with the " -"Library has the freedom and the wherewithal to run that program using a " -"modified version of the Library." -msgstr "" - -#: C/index.docbook:194(sect1/para) -msgid "" -"The precise terms and conditions for copying, distribution and modification " -"follow. Pay close attention to the difference between a work based on " -"the library and a work that uses the library. The " -"former contains code derived from the library, whereas the latter must be " -"combined with the library in order to run." -msgstr "" - -#: C/index.docbook:205(sect1/title) -msgid "TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION" -msgstr "TERMES I CONDICIONS PER A LA CÒPIA, DISTRIBUCIÓ I MODIFICACIÓ" - -#: C/index.docbook:208(sect2/title) -msgid "Section 0" -msgstr "Secció 0" - -#: C/index.docbook:209(sect2/para) -msgid "" -"This License Agreement applies to any software library or other program " -"which contains a notice placed by the copyright holder or other authorized " -"party saying it may be distributed under the terms of this Lesser General " -"Public License (also called this License). Each licensee is " -"addressed as you." -msgstr "" - -#: C/index.docbook:217(sect2/para) -msgid "" -"A library means a collection of software functions and/or " -"data prepared so as to be conveniently linked with application programs " -"(which use some of those functions and data) to form executables." -msgstr "" - -#: C/index.docbook:223(sect2/para) -msgid "" -"The Library, below, refers to any such software library or " -"work which has been distributed under these terms. A work based on " -"the Library means either the Library or any derivative work under " -"copyright law: that is to say, a work containing the Library or a portion of " -"it, either verbatim or with modifications and/or translated " -"straightforwardly into another language. (Hereinafter, translation is " -"included without limitation in the term modification.)" -msgstr "" - -#: C/index.docbook:233(sect2/para) -msgid "" -"Source code for a work means the preferred form of the work " -"for making modifications to it. For a library, complete source code means " -"all the source code for all modules it contains, plus any associated " -"interface definition files, plus the scripts used to control compilation and " -"installation of the library." -msgstr "" - -#: C/index.docbook:241(sect2/para) -msgid "" -"Activities other than copying, distribution and modification are not covered " -"by this License; they are outside its scope. The act of running a program " -"using the Library is not restricted, and output from such a program is " -"covered only if its contents constitute a work based on the Library " -"(independent of the use of the Library in a tool for writing it). Whether " -"that is true depends on what the Library does and what the program that uses " -"the Library does." -msgstr "" - -#: C/index.docbook:254(sect2/title) -msgid "Section 1" -msgstr "Secció 1" - -#: C/index.docbook:255(sect2/para) -msgid "" -"You may copy and distribute verbatim copies of the Library's complete source " -"code as you receive it, in any medium, provided that you conspicuously and " -"appropriately publish on each copy an appropriate copyright notice and " -"disclaimer of warranty; keep intact all the notices that refer to this " -"License and to the absence of any warranty; and distribute a copy of this " -"License along with the Library." -msgstr "" -"Podeu copiar i distribuir còpies literals del codi font de la biblioteca tal " -"com el rebeu, en qualsevol mitjà, sempre que publiqueu en cada còpia, de " -"manera adient i ben visible, una nota de copyright i una renúncia de " -"garantia; manteniu intactes tots els avisos que fan referència a aquesta " -"llicència i a l'absència de garanties de cap mena; i distribuïu una còpia " -"d'aquesta llicència juntament amb la biblioteca." - -#: C/index.docbook:265(sect2/para) -msgid "" -"You may charge a fee for the physical act of transferring a copy, and you " -"may at your option offer warranty protection in exchange for a fee." -msgstr "" -"Podeu cobrar un preu per l'acte físic de trametre una còpia i podeu, si així " -"ho voleu, oferir alguna garantia a canvi d'un preu. " - -#: C/index.docbook:273(sect2/title) -msgid "Section 2" -msgstr "Secció 2" - -#: C/index.docbook:283(listitem/para) -msgid "The modified work must itself be a software library." -msgstr "" - -#: C/index.docbook:288(listitem/para) -msgid "" -"You must cause the files modified to carry prominent notices stating that " -"you changed the files and the date of any change." -msgstr "" -"Heu de fer que els fitxers modificats portin indicacions ben visibles que " -"diguin que heu modificat els fitxers, i hi heu d'escriure la data de la " -"modificació." - -#: C/index.docbook:294(listitem/para) -msgid "" -"You must cause the whole of the work to be licensed at no charge to all " -"third parties under the terms of this License." -msgstr "" - -#: C/index.docbook:300(listitem/para) -msgid "" -"If a facility in the modified Library refers to a function or a table of " -"data to be supplied by an application program that uses the facility, other " -"than as an argument passed when the facility is invoked, then you must make " -"a good faith effort to ensure that, in the event an application does not " -"supply such function or table, the facility still operates, and performs " -"whatever part of its purpose remains meaningful." -msgstr "" - -#: C/index.docbook:310(listitem/para) -msgid "" -"(For example, a function in a library to compute square roots has a purpose " -"that is entirely well-defined independent of the application. Therefore, " -"Subsection 2d requires that any application-supplied function or table used " -"by this function must be optional: if the application does not supply it, " -"the square root function must still compute square roots.)" -msgstr "" - -#: C/index.docbook:319(listitem/para) -msgid "" -"These requirements apply to the modified work as a whole. If identifiable " -"sections of that work are not derived from the Library, and can be " -"reasonably considered independent and separate works in themselves, then " -"this License, and its terms, do not apply to those sections when you " -"distribute them as separate works. But when you distribute the same sections " -"as part of a whole which is a work based on the Library, the distribution of " -"the whole must be on the terms of this License, whose permissions for other " -"licensees extend to the entire whole, and thus to each and every part " -"regardless of who wrote it." -msgstr "" -"Aquests requeriments afecten l'obra modificada com un tot. Si hi ha parts " -"identificables que no estan derivades de la biblioteca, i es poden " -"considerar raonablement com a obres independents i separades en si mateixes, " -"aleshores aquesta llicència i els seus termes no s'apliquen a aquelles parts " -"quan les distribuïu com a obres separades. Però quan distribuïu aquestes " -"mateixes parts integrades en un tot que sigui una obra basada en la " -"biblioteca, la distribució del tot s'ha de fer d'acord amb els termes " -"d'aquesta llicència, i els permisos atorgats a altres beneficiaris abasten " -"el tot sencer i, per tant, totes i cadascuna de les parts, independentment " -"de qui les hagi escrites. " - -#: C/index.docbook:332(listitem/para) -msgid "" -"Thus, it is not the intent of this section to claim rights or contest your " -"rights to work written entirely by you; rather, the intent is to exercise " -"the right to control the distribution of derivative or collective works " -"based on the Library." -msgstr "" -"Així doncs, la intenció d'aquesta secció no és reclamar o disputar-vos cap " -"dret a codi que hagueu escrit del tot vós mateix. La intenció és més aviat " -"exercir el dret a controlar la distribució d'obres derivades o col·lectives " -"basades en la biblioteca." - -#: C/index.docbook:339(listitem/para) -msgid "" -"In addition, mere aggregation of another work not based on the Library with " -"the Library (or with a work based on the Library) on a volume of a storage " -"or distribution medium does not bring the other work under the scope of this " -"License." -msgstr "" - -#: C/index.docbook:274(sect2/para) -msgid "" -"You may modify your copy or copies of the Library or any portion of it, thus " -"forming a work based on the Library, and copy and distribute such " -"modifications or work under the terms of Section 1 above, provided that you also meet all of these conditions: <_:" -"orderedlist-1/>" -msgstr "" -"Podeu modificar la còpia o còpies de la biblioteca o qualsevol tros de la " -"biblioteca i, així, fer una obra basada en la biblioteca, i podeu copiar i " -"distribuir aquestes modificacions o obres sota els termes de la Secció 1 anterior, sempre que també compliu les " -"condicions següents: <_:orderedlist-1/>" - -#: C/index.docbook:352(sect2/title) -msgid "Section 3" -msgstr "Secció 3" - -#: C/index.docbook:354(sect2/para) -msgid "" -"You may opt to apply the terms of the ordinary GNU General Public License " -"instead of this License to a given copy of the Library. To do this, you must " -"alter all the notices that refer to this License, so that they refer to the " -"ordinary GNU General Public License, version 2, instead of to this License. " -"(If a newer version than version 2 of the ordinary GNU General Public " -"License has appeared, then you can specify that version instead if you " -"wish.) Do not make any other change in these notices." -msgstr "" - -#: C/index.docbook:365(sect2/para) -msgid "" -"Once this change is made in a given copy, it is irreversible for that copy, " -"so the ordinary GNU General Public License applies to all subsequent copies " -"and derivative works made from that copy." -msgstr "" - -#: C/index.docbook:371(sect2/para) -msgid "" -"This option is useful when you wish to copy part of the code of the Library " -"into a program that is not a library." -msgstr "" - -#: C/index.docbook:378(sect2/title) -msgid "Section 4" -msgstr "Secció 4" - -#: C/index.docbook:380(sect2/para) -msgid "" -"You may copy and distribute the Library (or a portion or derivative of it, " -"under Section 2 ) in object code or " -"executable form under the terms of Sections 1 " -"and 2 above provided that you accompany it " -"with the complete corresponding machine-readable source code, which must be " -"distributed under the terms of Sections 1 and " -"2 above on a medium customarily used for " -"software interchange." -msgstr "" - -#: C/index.docbook:392(sect2/para) -msgid "" -"If distribution of object code is made by offering access to copy from a " -"designated place, then offering equivalent access to copy the source code " -"from the same place satisfies the requirement to distribute the source code, " -"even though third parties are not compelled to copy the source along with " -"the object code." -msgstr "" - -#: C/index.docbook:403(sect2/title) -msgid "Section 5" -msgstr "Secció 5" - -#: C/index.docbook:405(sect2/para) -msgid "" -"A program that contains no derivative of any portion of the Library, but is " -"designed to work with the Library by being compiled or linked with it, is " -"called a work that uses the Library. Such a work, in " -"isolation, is not a derivative work of the Library, and therefore falls " -"outside the scope of this License." -msgstr "" - -#: C/index.docbook:413(sect2/para) -msgid "" -"However, linking a work that uses the Library with the " -"Library creates an executable that is a derivative of the Library (because " -"it contains portions of the Library), rather than a work that uses " -"the library. The executable is therefore covered by this License. " -"Section 6 states terms for distribution of " -"such executables." -msgstr "" - -#: C/index.docbook:422(sect2/para) -msgid "" -"When a work that uses the Library uses material from a header " -"file that is part of the Library, the object code for the work may be a " -"derivative work of the Library even though the source code is not. Whether " -"this is true is especially significant if the work can be linked without the " -"Library, or if the work is itself a library. The threshold for this to be " -"true is not precisely defined by law." -msgstr "" - -#: C/index.docbook:431(sect2/para) -msgid "" -"If such an object file uses only numerical parameters, data structure " -"layouts and accessors, and small macros and small inline functions (ten " -"lines or less in length), then the use of the object file is unrestricted, " -"regardless of whether it is legally a derivative work. (Executables " -"containing this object code plus portions of the Library will still fall " -"under Section 6.)" -msgstr "" - -#: C/index.docbook:440(sect2/para) -msgid "" -"Otherwise, if the work is a derivative of the Library, you may distribute " -"the object code for the work under the terms of Section 6. Any executables containing that work also fall " -"under Section 6, whether or not they are " -"linked directly with the Library itself." -msgstr "" - -#: C/index.docbook:451(sect2/title) -msgid "Section 6" -msgstr "Secció 6" - -#: C/index.docbook:453(sect2/para) -msgid "" -"As an exception to the Sections above, you may also combine or link a " -"work that uses the Library with the Library to produce a work " -"containing portions of the Library, and distribute that work under terms of " -"your choice, provided that the terms permit modification of the work for the " -"customer's own use and reverse engineering for debugging such modifications." -msgstr "" - -#: C/index.docbook:473(listitem/para) -msgid "" -"Accompany the work with the complete corresponding machine-readable source " -"code for the Library including whatever changes were used in the work (which " -"must be distributed under Sections 1 and " -"2 above); and, if the work is an executable " -"linked with the Library, with the complete machine-readable work that " -"uses the Library, as object code and/or source code, so that the " -"user can modify the Library and then relink to produce a modified executable " -"containing the modified Library. (It is understood that the user who changes " -"the contents of definitions files in the Library will not necessarily be " -"able to recompile the application to use the modified definitions.)" -msgstr "" - -#: C/index.docbook:489(listitem/para) -msgid "" -"Use a suitable shared library mechanism for linking with the Library. A " -"suitable mechanism is one that (1) uses at run time a copy of the library " -"already present on the user's computer system, rather than copying library " -"functions into the executable, and (2) will operate properly with a modified " -"version of the library, if the user installs one, as long as the modified " -"version is interface-compatible with the version that the work was made with." -msgstr "" - -#: C/index.docbook:500(listitem/para) -msgid "" -"Accompany the work with a written offer, valid for at least three years, to " -"give the same user the materials specified in Subsection 6a , above, for a charge no more than the cost of " -"performing this distribution." -msgstr "" - -#: C/index.docbook:509(listitem/para) -msgid "" -"If distribution of the work is made by offering access to copy from a " -"designated place, offer equivalent access to copy the above specified " -"materials from the same place." -msgstr "" - -#: C/index.docbook:516(listitem/para) -msgid "" -"Verify that the user has already received a copy of these materials or that " -"you have already sent this user a copy." -msgstr "" - -#: C/index.docbook:462(sect2/para) -msgid "" -"You must give prominent notice with each copy of the work that the Library " -"is used in it and that the Library and its use are covered by this License. " -"You must supply a copy of this License. If the work during execution " -"displays copyright notices, you must include the copyright notice for the " -"Library among them, as well as a reference directing the user to the copy of " -"this License. Also, you must do one of these things: <_:orderedlist-1/>" -msgstr "" - -#: C/index.docbook:524(sect2/para) -msgid "" -"For an executable, the required form of the work that uses the " -"Library must include any data and utility programs needed for " -"reproducing the executable from it. However, as a special exception, the " -"materials to be distributed need not include anything that is normally " -"distributed (in either source or binary form) with the major components " -"(compiler, kernel, and so on) of the operating system on which the " -"executable runs, unless that component itself accompanies the executable." -msgstr "" - -#: C/index.docbook:535(sect2/para) -msgid "" -"It may happen that this requirement contradicts the license restrictions of " -"other proprietary libraries that do not normally accompany the operating " -"system. Such a contradiction means you cannot use both them and the Library " -"together in an executable that you distribute." -msgstr "" - -#: C/index.docbook:546(sect2/title) -msgid "Section 7" -msgstr "Secció 7" - -#: C/index.docbook:548(sect2/para) -msgid "" -"You may place library facilities that are a work based on the Library side-" -"by-side in a single library together with other library facilities not " -"covered by this License, and distribute such a combined library, provided " -"that the separate distribution of the work based on the Library and of the " -"other library facilities is otherwise permitted, and provided that you do " -"these two things:" -msgstr "" - -#: C/index.docbook:559(listitem/para) -msgid "" -"Accompany the combined library with a copy of the same work based on the " -"Library, uncombined with any other library facilities. This must be " -"distributed under the terms of the Sections above." -msgstr "" - -#: C/index.docbook:567(listitem/para) -msgid "" -"Give prominent notice with the combined library of the fact that part of it " -"is a work based on the Library, and explaining where to find the " -"accompanying uncombined form of the same work." -msgstr "" - -#: C/index.docbook:577(sect2/title) -msgid "Section 8" -msgstr "Secció 8" - -#: C/index.docbook:579(sect2/para) -msgid "" -"You may not copy, modify, sublicense, link with, or distribute the Library " -"except as expressly provided under this License. Any attempt otherwise to " -"copy, modify, sublicense, link with, or distribute the Library is void, and " -"will automatically terminate your rights under this License. However, " -"parties who have received copies, or rights, from you under this License " -"will not have their licenses terminated so long as such parties remain in " -"full compliance." -msgstr "" - -#: C/index.docbook:591(sect2/title) -msgid "Section 9" -msgstr "Secció 9" - -#: C/index.docbook:593(sect2/para) -msgid "" -"You are not required to accept this License, since you have not signed it. " -"However, nothing else grants you permission to modify or distribute the " -"Library or its derivative works. These actions are prohibited by law if you " -"do not accept this License. Therefore, by modifying or distributing the " -"Library (or any work based on the Library), you indicate your acceptance of " -"this License to do so, and all its terms and conditions for copying, " -"distributing or modifying the Library or works based on it." -msgstr "" -"No esteu obligat a acceptar aquesta llicència, ja que no l'heu signada. " -"Tanmateix, no hi ha cap altra opció que us doni permís per modificar o " -"distribuir la biblioteca o les seves obres derivades. Aquestes accions " -"queden prohibides per la llei si no accepteu aquesta llicència. Així doncs, " -"en modificar o distribuir la biblioteca o les seves obres derivades, " -"indiqueu que accepteu aquesta llicència per a fer-ho, i tots els seus termes " -"i condicions per copiar, distribuir o modificar la biblioteca o obres que hi " -"estiguin basades." - -#: C/index.docbook:606(sect2/title) -msgid "Section 10" -msgstr "Secció 10" - -#: C/index.docbook:608(sect2/para) -msgid "" -"Each time you redistribute the Library (or any work based on the Library), " -"the recipient automatically receives a license from the original licensor to " -"copy, distribute, link with or modify the Library subject to these terms and " -"conditions. You may not impose any further restrictions on the recipients' " -"exercise of the rights granted herein. You are not responsible for enforcing " -"compliance by third parties with this License." -msgstr "" - -#: C/index.docbook:620(sect2/title) -msgid "Section 11" -msgstr "Secció 11" - -#: C/index.docbook:622(sect2/para) -msgid "" -"If, as a consequence of a court judgment or allegation of patent " -"infringement or for any other reason (not limited to patent issues), " -"conditions are imposed on you (whether by court order, agreement or " -"otherwise) that contradict the conditions of this License, they do not " -"excuse you from the conditions of this License. If you cannot distribute so " -"as to satisfy simultaneously your obligations under this License and any " -"other pertinent obligations, then as a consequence you may not distribute " -"the Library at all. For example, if a patent license would not permit " -"royalty-free redistribution of the Library by all those who receive copies " -"directly or indirectly through you, then the only way you could satisfy both " -"it and this License would be to refrain entirely from distribution of the " -"Library." -msgstr "" -"Si, a conseqüència d'una decisió judicial, una demanda per infracció d'una " -"patent o per qualsevol altra raó (no exclusivament relacionada amb patents), " -"se us imposen condicions (tant si és per ordre judicial, acord, o el que " -"sigui) que contradiuen les condicions d'aquesta llicència, no quedeu excusat " -"de les condicions d'aquesta llicència. Si no us és possible distribuir de " -"manera que satisfeu alhora les obligacions que us imposa aquesta llicència i " -"qualsevol altra obligació pertinent, aleshores no podeu distribuir el " -"programa en absolut. Per exemple, si una llicència de patent no permetés " -"redistribuir gratuïtament la biblioteca a aquells que hagin rebut còpies de " -"vós directament o indirecta, aleshores la única manera en què podríeu " -"satisfer tant això com aquesta llicència seria abstenir-vos completament de " -"distribuir la biblioteca." - -#: C/index.docbook:637(sect2/para) -msgid "" -"If any portion of this section is held invalid or unenforceable under any " -"particular circumstance, the balance of the section is intended to apply, " -"and the section as a whole is intended to apply in other circumstances." -msgstr "" -"Si qualsevol fragment d'aquesta secció quedés invalidat o no es pogués fer " -"complir en qualsevol circumstància particular, la intenció és que s'apliqui " -"el balanç de la secció, i que s'apliqui la secció en la seva totalitat en " -"altres circumstàncies." - -#: C/index.docbook:643(sect2/para) -msgid "" -"It is not the purpose of this section to induce you to infringe any patents " -"or other property right claims or to contest validity of any such claims; " -"this section has the sole purpose of protecting the integrity of the free " -"software distribution system which is implemented by public license " -"practices. Many people have made generous contributions to the wide range of " -"software distributed through that system in reliance on consistent " -"application of that system; it is up to the author/donor to decide if he or " -"she is willing to distribute software through any other system and a " -"licensee cannot impose that choice." -msgstr "" -"El propòsit d'aquesta secció no és induir-vos a infringir cap patent ni cap " -"altre requeriment del dret a la propietat, o a discutir-ne la validesa; " -"l'únic propòsit d'aquesta secció és protegir la integritat del sistema de " -"distribució de programari lliure, que s'implementa amb pràctiques de " -"llicència pública. Molta gent ha fet generoses contribucions a l'ampli " -"ventall de programari distribuït per aquest sistema refiant-se de " -"l'aplicació consistent del sistema; li pertoca a l'autor, autora o donant " -"decidir si vol distribuir programari per algun altre sistema, i un " -"beneficiari de la llicència no pot imposar aquesta elecció." - -#: C/index.docbook:656(sect2/para) -msgid "" -"This section is intended to make thoroughly clear what is believed to be a " -"consequence of the rest of this License." -msgstr "" -"Aquesta secció pretén deixar del tot clar el que es considera una " -"conseqüència de la resta de la llicència." - -#: C/index.docbook:663(sect2/title) -msgid "Section 12" -msgstr "Secció 12" - -#: C/index.docbook:665(sect2/para) -msgid "" -"If the distribution and/or use of the Library is restricted in certain " -"countries either by patents or by copyrighted interfaces, the original " -"copyright holder who places the Library under this License may add an " -"explicit geographical distribution limitation excluding those countries, so " -"that distribution is permitted only in or among countries not thus excluded. " -"In such case, this License incorporates the limitation as if written in the " -"body of this License." -msgstr "" -"Si hi ha països que restringeixen la distribució o l'ús de la biblioteca, ja " -"sigui per patents o per interfícies sota copyright, el posseïdor del " -"copyright original que posi la biblioteca sota aquesta llicència pot afegir " -"limitacions geogràfiques explícites que excloguin aquests països, de manera " -"que la distribució només quedi permesa dins dels països no exclosos, o entre " -"ells. En tal cas, aquesta llicència incorpora la limitació com si estigués " -"escrita en el text de la llicència." - -#: C/index.docbook:677(sect2/title) -msgid "Section 13" -msgstr "Secció 13" - -#: C/index.docbook:679(sect2/para) -msgid "" -"The Free Software Foundation may publish revised and/or new versions of the " -"Lesser General Public License from time to time. Such new versions will be " -"similar in spirit to the present version, but may differ in detail to " -"address new problems or concerns." -msgstr "" - -#: C/index.docbook:686(sect2/para) -msgid "" -"Each version is given a distinguishing version number. If the Library " -"specifies a version number of this License which applies to it and " -"any later version, you have the option of following the terms " -"and conditions either of that version or of any later version published by " -"the Free Software Foundation. If the Library does not specify a license " -"version number, you may choose any version ever published by the Free " -"Software Foundation." -msgstr "" - -#: C/index.docbook:698(sect2/title) -msgid "Section 14" -msgstr "Secció 14" - -#: C/index.docbook:700(sect2/para) -msgid "" -"If you wish to incorporate parts of the Library into other free programs " -"whose distribution conditions are incompatible with these, write to the " -"author to ask for permission. For software which is copyrighted by the Free " -"Software Foundation, write to the Free Software Foundation; we sometimes " -"make exceptions for this. Our decision will be guided by the two goals of " -"preserving the free status of all derivatives of our free software and of " -"promoting the sharing and reuse of software generally." -msgstr "" - -#: C/index.docbook:713(sect2/title) -msgid "NO WARRANTY" -msgstr "SENSE GARANTIA" - -#: C/index.docbook:714(sect2/subtitle) -msgid "Section 15" -msgstr "Secció 15" - -#: C/index.docbook:716(sect2/para) -msgid "" -"BECAUSE THE LIBRARY IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY FOR THE " -"LIBRARY, TO THE EXTENT PERMITTED BY APPLICABLE LAW. EXCEPT WHEN OTHERWISE " -"STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES PROVIDE THE " -"LIBRARY AS IS WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED " -"OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF " -"MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. THE ENTIRE RISK AS TO " -"THE QUALITY AND PERFORMANCE OF THE LIBRARY IS WITH YOU. SHOULD THE LIBRARY " -"PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING, REPAIR OR " -"CORRECTION." -msgstr "" -"ATÈS QUE LA BIBLIOTECA TÉ UNA LLICÈNCIA GRATUÏTA, NO SE N'OFEREIX CAP TIPUS " -"DE GARANTIA, EN LA MESURA PERMESA PER LES LLEIS APLICABLES. LLEVAT DELS " -"CASOS EN QUÈ S'AFIRMI EL CONTRARI PER ESCRIT, ELS LLICENCIADORS I/O LES " -"ALTRES PARTS OFEREIXEN LA BIBLIOTECA TAL COM ÉS, SENSE CAP " -"TIPUS DE GARANTIA, NI EXPLÍCITA NI IMPLÍCITA; AIXÒ INCLOU, SENSE LIMITAR-" -"S'HI, LES GARANTIES IMPLÍCITES DE COMERCIALITZACIÓ I ADEQUACIÓ A UN ÚS " -"CONCRET. TOT EL RISC PEL QUE FA A LA QUALITAT I RENDIMENT DE LA BIBLIOTECA " -"ÉS VOSTRE. EN CAS QUE LA BIBLIOTECA RESULTÉS DEFECTUOSA, VÓS ASSUMIU TOT EL " -"COST D'ASSISTÈNCIA, REPARACIÓ O CORRECCIÓ." - -#: C/index.docbook:730(sect2/title) -msgid "Section 16" -msgstr "Secció 16" - -#: C/index.docbook:732(sect2/para) -msgid "" -"IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING WILL " -"ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR REDISTRIBUTE " -"THE LIBRARY AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY " -"GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE USE " -"OR INABILITY TO USE THE LIBRARY (INCLUDING BUT NOT LIMITED TO LOSS OF DATA " -"OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD " -"PARTIES OR A FAILURE OF THE LIBRARY TO OPERATE WITH ANY OTHER SOFTWARE), " -"EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF " -"SUCH DAMAGES." -msgstr "" -"EL POSSEÏDOR DEL COPYRIGHT, O QUALSEVOL ALTRA PART QUE PUGUI MODIFICAR O " -"REDISTRIBUIR LA BIBLIOTECA TAL I COM ES PERMET MÉS AMUNT NO US HAURÀ DE " -"RESPONDRE EN CAP CAS, TRET DEL QUE REQUEREIXI LA LLEI APLICABLE O ELS ACORDS " -"PER ESCRIT, PER PERJUDICIS, INCLOSOS ELS INCIDENTALS, DERIVATS, ESPECIALS O " -"GENERALS QUE ES DERIVIN DE L'ÚS O DE LA IMPOSSIBILITAT D'ÚS DE LA BIBLIOTECA " -"(INCLOSES, ENTRE D'ALTRES, LES PÈRDUES DE DADES, LES DADES QUE LA BIBLIOTECA " -"HAGI MALMÈS, LES PÈRDUES QUE US HAGI PROVOCAT A VÓS O A TERCERS O LA " -"IMPOSSIBILITAT QUE LA BIBLIOTECA FUNCIONI AMB QUALSEVOL ALTRE PROGRAMA), " -"FINS I TOT SI AQUEST POSSEÏDOR O ALTRA PART HA ESTAT ADVERTIDA DE LA " -"POSSIBILITAT D'AQUESTS PERJUDICIS." diff -Nru gnome-desktop3-3.12.0/desktop-docs/lgpl/ca/index.docbook gnome-desktop3-3.8.4/desktop-docs/lgpl/ca/index.docbook --- gnome-desktop3-3.12.0/desktop-docs/lgpl/ca/index.docbook 2014-03-24 14:31:54.000000000 +0000 +++ gnome-desktop3-3.8.4/desktop-docs/lgpl/ca/index.docbook 1970-01-01 00:00:00.000000000 +0000 @@ -1,602 +0,0 @@ - - - -
- - Llicència Pública General Reduïda de GNU - 2000 Free Software Foundation, Inc. - Free Software Foundation - - Projecte de documentació del GNOME - - - 2.1 1999-02 - - -
Free Software Foundation, Inc. - 51 Franklin Street, Fifth Floor, - Boston, - MA 02110-1301 - USA -
. - Tothom pot copiar i distribuir còpies literals d'aquest document de llicència, però no es permet de fer-hi modificacions. - - Versió 2.1, febrer de 1999 - Les llicències de la majoria de programari estan dissenyades per a prendre-us la llibertat de compartir-lo i modificar-lo. Contràriament, les Llicències públiques generals de GNU estan pensades per a garantir-vos la llibertat de compartir i modificar el programari lliure, per tal d'assegurar que el programari sigui lliure per a tots els seus usuaris i usuàries. - - - - - Gil Forcada - - gilforcada@guifi.net - - - - 2013 - - Gil Forcada - - - - - Preàmbul - - Les llicències de la majoria de programari estan dissenyades per a prendre-us la llibertat de compartir-lo i modificar-lo. Contràriament, les Llicències públiques generals de GNU estan pensades per a garantir-vos la llibertat de compartir i modificar el programari lliure, per tal d'assegurar que el programari sigui lliure per a tots els seus usuaris i usuàries. - - Quan parlem de programari lliure ens referim a la llibertat, no al preu. Les nostres llicències públiques generals estan pensades per assegurar que tingueu la llibertat de distribuir còpies del programari lliure (i de cobrar per aquest servei, si voleu); que rebeu el codi font o que, si el voleu, el pugueu rebre; que pugueu modificar el programari o fer-ne servir parts en programes lliures nous; i que sapigueu que podeu fer totes aquestes coses. - - - This license, the Lesser General Public License, applies to some - specially designated software packages--typically libraries--of the - Free Software Foundation and other authors who decide to use it. You - can use it too, but we suggest you first think carefully about whether - this license or the ordinary General Public License is the better - strategy to use in any particular case, based on the explanations below. - - - Quan parlem de programari lliure ens referim a la llibertat, no al preu. Les nostres llicències públiques generals estan pensades per assegurar que tingueu la llibertat de distribuir còpies del programari lliure (i de cobrar per aquest servei, si voleu); que rebeu el codi font o que, si el voleu, el pugueu rebre; que pugueu modificar el programari o fer-ne servir parts en programes lliures nous; i que sapigueu que podeu fer totes aquestes coses. - - Per protegir els vostres drets, cal que apliquem restriccions que prohibeixin a tothom de negar-vos aquests drets o demanar-vos que hi renuncieu. Aquestes restriccions suposen determinades responsabilitats per a vós si distribuïu còpies del programari o si el modifiqueu. - - - For example, if you distribute copies of the library, whether gratis - or for a fee, you must give the recipients all the rights that we gave - you. You must make sure that they, too, receive or can get the source - code. If you link other code with the library, you must provide - complete object files to the recipients, so that they can relink them - with the library after making changes to the library and recompiling - it. And you must show them these terms so they know their rights. - - - - We protect your rights with a two-step method: (1) we copyright the - library, and (2) we offer you this license, which gives you legal - permission to copy, distribute and/or modify the library. - - - - To protect each distributor, we want to make it very clear that - there is no warranty for the free library. Also, if the library is - modified by someone else and passed on, the recipients should know - that what they have is not the original version, so that the original - author's reputation will not be affected by problems that might be - introduced by others. - - - - Finally, software patents pose a constant threat to the existence of - any free program. We wish to make sure that a company cannot - effectively restrict the users of a free program by obtaining a - restrictive license from a patent holder. Therefore, we insist that - any patent license obtained for a version of the library must be - consistent with the full freedom of use specified in this license. - - - - Most GNU software, including some libraries, is covered by the - ordinary GNU General Public License. This license, the GNU Lesser - General Public License, applies to certain designated libraries, and - is quite different from the ordinary General Public License. We use - this license for certain libraries in order to permit linking those - libraries into non-free programs. - - - - When a program is linked with a library, whether statically or using - a shared library, the combination of the two is legally speaking a - combined work, a derivative of the original library. The ordinary - General Public License therefore permits such linking only if the - entire combination fits its criteria of freedom. The Lesser General - Public License permits more lax criteria for linking other code with - the library. - - - - We call this license the Lesser General Public License - because it does Less to protect the user's freedom than the ordinary - General Public License. It also provides other free software developers - Less of an advantage over competing non-free programs. These - disadvantages are the reason we use the ordinary General Public License - for many libraries. However, the Lesser license provides advantages in - certain special circumstances. - - - - For example, on rare occasions, there may be a special need to - encourage the widest possible use of a certain library, so that it becomes - a de-facto standard. To achieve this, non-free programs must be - allowed to use the library. A more frequent case is that a free - library does the same job as widely used non-free libraries. In this - case, there is little to gain by limiting the free library to free - software only, so we use the Lesser General Public License. - - - - In other cases, permission to use a particular library in non-free - programs enables a greater number of people to use a large body of - free software. For example, permission to use the GNU C Library in - non-free programs enables many more people to use the whole GNU - operating system, as well as its variant, the GNU/Linux operating - system. - - - - Although the Lesser General Public License is Less protective of the - users' freedom, it does ensure that the user of a program that is - linked with the Library has the freedom and the wherewithal to run - that program using a modified version of the Library. - - - - The precise terms and conditions for copying, distribution and - modification follow. Pay close attention to the difference between a - work based on the library and a work that uses the - library. The former contains code derived from the library, - whereas the latter must be combined with the library in order to run. - - - - - - TERMES I CONDICIONS PER A LA CÒPIA, DISTRIBUCIÓ I MODIFICACIÓ - - - Secció 0 - - This License Agreement applies to any software library or other - program which contains a notice placed by the copyright holder or - other authorized party saying it may be distributed under the terms of - this Lesser General Public License (also called this License). - Each licensee is addressed as you. - - - - A library means a collection of software functions and/or data - prepared so as to be conveniently linked with application programs - (which use some of those functions and data) to form executables. - - - - The Library, below, refers to any such software library or work - which has been distributed under these terms. A work based on the - Library means either the Library or any derivative work under - copyright law: that is to say, a work containing the Library or a - portion of it, either verbatim or with modifications and/or translated - straightforwardly into another language. (Hereinafter, translation is - included without limitation in the term modification.) - - - - Source code for a work means the preferred form of the work for - making modifications to it. For a library, complete source code means - all the source code for all modules it contains, plus any associated - interface definition files, plus the scripts used to control compilation - and installation of the library. - - - - Activities other than copying, distribution and modification are not - covered by this License; they are outside its scope. The act of - running a program using the Library is not restricted, and output from - such a program is covered only if its contents constitute a work based - on the Library (independent of the use of the Library in a tool for - writing it). Whether that is true depends on what the Library does - and what the program that uses the Library does. - - - - - - Secció 1 - Podeu copiar i distribuir còpies literals del codi font de la biblioteca tal com el rebeu, en qualsevol mitjà, sempre que publiqueu en cada còpia, de manera adient i ben visible, una nota de copyright i una renúncia de garantia; manteniu intactes tots els avisos que fan referència a aquesta llicència i a l'absència de garanties de cap mena; i distribuïu una còpia d'aquesta llicència juntament amb la biblioteca. - - Podeu cobrar un preu per l'acte físic de trametre una còpia i podeu, si així ho voleu, oferir alguna garantia a canvi d'un preu. - - - - Secció 2 - Podeu modificar la còpia o còpies de la biblioteca o qualsevol tros de la biblioteca i, així, fer una obra basada en la biblioteca, i podeu copiar i distribuir aquestes modificacions o obres sota els termes de la Secció 1 anterior, sempre que també compliu les condicions següents: - - - The modified work must itself be a software library. - - - - Heu de fer que els fitxers modificats portin indicacions ben visibles que diguin que heu modificat els fitxers, i hi heu d'escriure la data de la modificació. - - - - You must cause the whole of the work to be licensed at no - charge to all third parties under the terms of this License. - - - - - If a facility in the modified Library refers to a function or a - table of data to be supplied by an application program that uses - the facility, other than as an argument passed when the facility - is invoked, then you must make a good faith effort to ensure that, - in the event an application does not supply such function or - table, the facility still operates, and performs whatever part of - its purpose remains meaningful. - - - - (For example, a function in a library to compute square roots has - a purpose that is entirely well-defined independent of the - application. Therefore, Subsection 2d requires that any - application-supplied function or table used by this function must - be optional: if the application does not supply it, the square - root function must still compute square roots.) - - - Aquests requeriments afecten l'obra modificada com un tot. Si hi ha parts identificables que no estan derivades de la biblioteca, i es poden considerar raonablement com a obres independents i separades en si mateixes, aleshores aquesta llicència i els seus termes no s'apliquen a aquelles parts quan les distribuïu com a obres separades. Però quan distribuïu aquestes mateixes parts integrades en un tot que sigui una obra basada en la biblioteca, la distribució del tot s'ha de fer d'acord amb els termes d'aquesta llicència, i els permisos atorgats a altres beneficiaris abasten el tot sencer i, per tant, totes i cadascuna de les parts, independentment de qui les hagi escrites. - - Així doncs, la intenció d'aquesta secció no és reclamar o disputar-vos cap dret a codi que hagueu escrit del tot vós mateix. La intenció és més aviat exercir el dret a controlar la distribució d'obres derivades o col·lectives basades en la biblioteca. - - - In addition, mere aggregation of another work not based on the Library - with the Library (or with a work based on the Library) on a volume of - a storage or distribution medium does not bring the other work under - the scope of this License. - - - - - - - - Secció 3 - - - You may opt to apply the terms of the ordinary GNU General Public - License instead of this License to a given copy of the Library. To do - this, you must alter all the notices that refer to this License, so - that they refer to the ordinary GNU General Public License, version 2, - instead of to this License. (If a newer version than version 2 of the - ordinary GNU General Public License has appeared, then you can specify - that version instead if you wish.) Do not make any other change in - these notices. - - - - Once this change is made in a given copy, it is irreversible for - that copy, so the ordinary GNU General Public License applies to all - subsequent copies and derivative works made from that copy. - - - - This option is useful when you wish to copy part of the code of - the Library into a program that is not a library. - - - - - Secció 4 - - - You may copy and distribute the Library (or a portion or - derivative of it, under Section 2 - ) in object code or executable form under the terms of Sections - 1 and - 2 above provided that you accompany - it with the complete corresponding machine-readable source code, which - must be distributed under the terms of Sections 1 - and 2 above on a - medium customarily used for software interchange. - - - - If distribution of object code is made by offering access to copy - from a designated place, then offering equivalent access to copy the - source code from the same place satisfies the requirement to - distribute the source code, even though third parties are not - compelled to copy the source along with the object code. - - - - - - Secció 5 - - - A program that contains no derivative of any portion of the - Library, but is designed to work with the Library by being compiled or - linked with it, is called a work that uses the Library. - Such a work, in isolation, is not a derivative work of the Library, and - therefore falls outside the scope of this License. - - - - However, linking a work that uses the Library with the Library - creates an executable that is a derivative of the Library (because it - contains portions of the Library), rather than a work that uses the - library. The executable is therefore covered by this License. - Section 6 states terms for distribution - of such executables. - - - - When a work that uses the Library uses material from a - header file that is part of the Library, the object code for the work - may be a derivative work of the Library even though the source code is not. - Whether this is true is especially significant if the work can be - linked without the Library, or if the work is itself a library. The - threshold for this to be true is not precisely defined by law. - - - - If such an object file uses only numerical parameters, data - structure layouts and accessors, and small macros and small inline - functions (ten lines or less in length), then the use of the object - file is unrestricted, regardless of whether it is legally a derivative - work. (Executables containing this object code plus portions of the - Library will still fall under Section 6.) - - - - Otherwise, if the work is a derivative of the Library, you may - distribute the object code for the work under the terms of - Section 6. - Any executables containing that work also fall under - Section 6, - whether or not they are linked directly with the Library itself. - - - - - Secció 6 - - - As an exception to the Sections above, you may also combine or - link a work that uses the Library with the Library to - produce a work containing portions of the Library, and distribute that - work under terms of your choice, provided that the terms permit - modification of the work for the customer's own use and reverse - engineering for debugging such modifications. - - - - You must give prominent notice with each copy of the work that the - Library is used in it and that the Library and its use are covered by - this License. You must supply a copy of this License. If the work - during execution displays copyright notices, you must include the - copyright notice for the Library among them, as well as a reference - directing the user to the copy of this License. Also, you must do one - of these things: - - - - - Accompany the work with the complete corresponding - machine-readable source code for the Library including whatever - changes were used in the work (which must be distributed under - Sections 1 and - 2 above); and, if the work is an - executable linked with the Library, with the complete machine-readable - work that uses the Library, as object code and/or source - code, so that the user can modify the Library and then relink to - produce a modified executable containing the modified Library. (It is - understood that the user who changes the contents of definitions files - in the Library will not necessarily be able to recompile the application - to use the modified definitions.) - - - - - Use a suitable shared library mechanism for linking with the - Library. A suitable mechanism is one that (1) uses at run time a - copy of the library already present on the user's computer system, - rather than copying library functions into the executable, and (2) - will operate properly with a modified version of the library, if - the user installs one, as long as the modified version is - interface-compatible with the version that the work was made with. - - - - - Accompany the work with a written offer, valid for at - least three years, to give the same user the materials - specified in Subsection 6a - , above, for a charge no more than the cost of performing - this distribution. - - - - - If distribution of the work is made by offering access to copy - from a designated place, offer equivalent access to copy the above - specified materials from the same place. - - - - - Verify that the user has already received a copy of these - materials or that you have already sent this user a copy. - - - - - - - For an executable, the required form of the work that uses the - Library must include any data and utility programs needed for - reproducing the executable from it. However, as a special exception, - the materials to be distributed need not include anything that is - normally distributed (in either source or binary form) with the major - components (compiler, kernel, and so on) of the operating system on - which the executable runs, unless that component itself accompanies - the executable. - - - - It may happen that this requirement contradicts the license - restrictions of other proprietary libraries that do not normally - accompany the operating system. Such a contradiction means you cannot - use both them and the Library together in an executable that you - distribute. - - - - - - Secció 7 - - - You may place library facilities that are a work based on the - Library side-by-side in a single library together with other library - facilities not covered by this License, and distribute such a combined - library, provided that the separate distribution of the work based on - the Library and of the other library facilities is otherwise - permitted, and provided that you do these two things: - - - - - - Accompany the combined library with a copy of the same work - based on the Library, uncombined with any other library - facilities. This must be distributed under the terms of the - Sections above. - - - - - Give prominent notice with the combined library of the fact - that part of it is a work based on the Library, and explaining - where to find the accompanying uncombined form of the same work. - - - - - - - Secció 8 - - - You may not copy, modify, sublicense, link with, or distribute - the Library except as expressly provided under this License. Any - attempt otherwise to copy, modify, sublicense, link with, or - distribute the Library is void, and will automatically terminate your - rights under this License. However, parties who have received copies, - or rights, from you under this License will not have their licenses - terminated so long as such parties remain in full compliance. - - - - - Secció 9 - - No esteu obligat a acceptar aquesta llicència, ja que no l'heu signada. Tanmateix, no hi ha cap altra opció que us doni permís per modificar o distribuir la biblioteca o les seves obres derivades. Aquestes accions queden prohibides per la llei si no accepteu aquesta llicència. Així doncs, en modificar o distribuir la biblioteca o les seves obres derivades, indiqueu que accepteu aquesta llicència per a fer-ho, i tots els seus termes i condicions per copiar, distribuir o modificar la biblioteca o obres que hi estiguin basades. - - - - Secció 10 - - - Each time you redistribute the Library (or any work based on the - Library), the recipient automatically receives a license from the - original licensor to copy, distribute, link with or modify the Library - subject to these terms and conditions. You may not impose any further - restrictions on the recipients' exercise of the rights granted herein. - You are not responsible for enforcing compliance by third parties with - this License. - - - - - Secció 11 - - Si, a conseqüència d'una decisió judicial, una demanda per infracció d'una patent o per qualsevol altra raó (no exclusivament relacionada amb patents), se us imposen condicions (tant si és per ordre judicial, acord, o el que sigui) que contradiuen les condicions d'aquesta llicència, no quedeu excusat de les condicions d'aquesta llicència. Si no us és possible distribuir de manera que satisfeu alhora les obligacions que us imposa aquesta llicència i qualsevol altra obligació pertinent, aleshores no podeu distribuir el programa en absolut. Per exemple, si una llicència de patent no permetés redistribuir gratuïtament la biblioteca a aquells que hagin rebut còpies de vós directament o indirecta, aleshores la única manera en què podríeu satisfer tant això com aquesta llicència seria abstenir-vos completament de distribuir la biblioteca. - - Si qualsevol fragment d'aquesta secció quedés invalidat o no es pogués fer complir en qualsevol circumstància particular, la intenció és que s'apliqui el balanç de la secció, i que s'apliqui la secció en la seva totalitat en altres circumstàncies. - - El propòsit d'aquesta secció no és induir-vos a infringir cap patent ni cap altre requeriment del dret a la propietat, o a discutir-ne la validesa; l'únic propòsit d'aquesta secció és protegir la integritat del sistema de distribució de programari lliure, que s'implementa amb pràctiques de llicència pública. Molta gent ha fet generoses contribucions a l'ampli ventall de programari distribuït per aquest sistema refiant-se de l'aplicació consistent del sistema; li pertoca a l'autor, autora o donant decidir si vol distribuir programari per algun altre sistema, i un beneficiari de la llicència no pot imposar aquesta elecció. - - Aquesta secció pretén deixar del tot clar el que es considera una conseqüència de la resta de la llicència. - - - - Secció 12 - - Si hi ha països que restringeixen la distribució o l'ús de la biblioteca, ja sigui per patents o per interfícies sota copyright, el posseïdor del copyright original que posi la biblioteca sota aquesta llicència pot afegir limitacions geogràfiques explícites que excloguin aquests països, de manera que la distribució només quedi permesa dins dels països no exclosos, o entre ells. En tal cas, aquesta llicència incorpora la limitació com si estigués escrita en el text de la llicència. - - - - Secció 13 - - - The Free Software Foundation may publish revised and/or new - versions of the Lesser General Public License from time to time. - Such new versions will be similar in spirit to the present version, - but may differ in detail to address new problems or concerns. - - - - Each version is given a distinguishing version number. If the Library - specifies a version number of this License which applies to it and - any later version, you have the option of following the terms and - conditions either of that version or of any later version published by - the Free Software Foundation. If the Library does not specify a - license version number, you may choose any version ever published by - the Free Software Foundation. - - - - - Secció 14 - - - If you wish to incorporate parts of the Library into other free - programs whose distribution conditions are incompatible with these, - write to the author to ask for permission. For software which is - copyrighted by the Free Software Foundation, write to the Free - Software Foundation; we sometimes make exceptions for this. Our - decision will be guided by the two goals of preserving the free status - of all derivatives of our free software and of promoting the sharing - and reuse of software generally. - - - - - SENSE GARANTIA - Secció 15 - - ATÈS QUE LA BIBLIOTECA TÉ UNA LLICÈNCIA GRATUÏTA, NO SE N'OFEREIX CAP TIPUS DE GARANTIA, EN LA MESURA PERMESA PER LES LLEIS APLICABLES. LLEVAT DELS CASOS EN QUÈ S'AFIRMI EL CONTRARI PER ESCRIT, ELS LLICENCIADORS I/O LES ALTRES PARTS OFEREIXEN LA BIBLIOTECA TAL COM ÉS, SENSE CAP TIPUS DE GARANTIA, NI EXPLÍCITA NI IMPLÍCITA; AIXÒ INCLOU, SENSE LIMITAR-S'HI, LES GARANTIES IMPLÍCITES DE COMERCIALITZACIÓ I ADEQUACIÓ A UN ÚS CONCRET. TOT EL RISC PEL QUE FA A LA QUALITAT I RENDIMENT DE LA BIBLIOTECA ÉS VOSTRE. EN CAS QUE LA BIBLIOTECA RESULTÉS DEFECTUOSA, VÓS ASSUMIU TOT EL COST D'ASSISTÈNCIA, REPARACIÓ O CORRECCIÓ. - - - - Secció 16 - - EL POSSEÏDOR DEL COPYRIGHT, O QUALSEVOL ALTRA PART QUE PUGUI MODIFICAR O REDISTRIBUIR LA BIBLIOTECA TAL I COM ES PERMET MÉS AMUNT NO US HAURÀ DE RESPONDRE EN CAP CAS, TRET DEL QUE REQUEREIXI LA LLEI APLICABLE O ELS ACORDS PER ESCRIT, PER PERJUDICIS, INCLOSOS ELS INCIDENTALS, DERIVATS, ESPECIALS O GENERALS QUE ES DERIVIN DE L'ÚS O DE LA IMPOSSIBILITAT D'ÚS DE LA BIBLIOTECA (INCLOSES, ENTRE D'ALTRES, LES PÈRDUES DE DADES, LES DADES QUE LA BIBLIOTECA HAGI MALMÈS, LES PÈRDUES QUE US HAGI PROVOCAT A VÓS O A TERCERS O LA IMPOSSIBILITAT QUE LA BIBLIOTECA FUNCIONI AMB QUALSEVOL ALTRE PROGRAMA), FINS I TOT SI AQUEST POSSEÏDOR O ALTRA PART HA ESTAT ADVERTIDA DE LA POSSIBILITAT D'AQUESTS PERJUDICIS. - - -
diff -Nru gnome-desktop3-3.12.0/desktop-docs/lgpl/Makefile.am gnome-desktop3-3.8.4/desktop-docs/lgpl/Makefile.am --- gnome-desktop3-3.12.0/desktop-docs/lgpl/Makefile.am 2013-11-11 17:23:17.000000000 +0000 +++ gnome-desktop3-3.8.4/desktop-docs/lgpl/Makefile.am 2013-09-04 11:15:57.000000000 +0000 @@ -4,6 +4,6 @@ HELP_FILES = index.docbook HELP_MEDIA = -HELP_LINGUAS = ar ca de el es eu fi fr hu ko oc pa pt_BR sl sv uk vi zh_CN +HELP_LINGUAS = ar de el es eu fi fr hu ko oc pa pt_BR sl sv uk vi zh_CN -include $(top_srcdir)/git.mk diff -Nru gnome-desktop3-3.12.0/desktop-docs/lgpl/Makefile.in gnome-desktop3-3.8.4/desktop-docs/lgpl/Makefile.in --- gnome-desktop3-3.12.0/desktop-docs/lgpl/Makefile.in 2014-03-24 14:31:07.000000000 +0000 +++ gnome-desktop3-3.8.4/desktop-docs/lgpl/Makefile.in 2013-09-04 11:29:46.000000000 +0000 @@ -310,7 +310,7 @@ HELP_ID = lgpl HELP_FILES = index.docbook HELP_MEDIA = -HELP_LINGUAS = ar ca de el es eu fi fr hu ko oc pa pt_BR sl sv uk vi zh_CN +HELP_LINGUAS = ar de el es eu fi fr hu ko oc pa pt_BR sl sv uk vi zh_CN all: all-am .SUFFIXES: diff -Nru gnome-desktop3-3.12.0/docs/reference/gnome-desktop3/gnome-desktop3-sections.txt gnome-desktop3-3.8.4/docs/reference/gnome-desktop3/gnome-desktop3-sections.txt --- gnome-desktop3-3.12.0/docs/reference/gnome-desktop3/gnome-desktop3-sections.txt 2014-03-24 14:32:27.000000000 +0000 +++ gnome-desktop3-3.8.4/docs/reference/gnome-desktop3/gnome-desktop3-sections.txt 2013-09-04 11:30:22.000000000 +0000 @@ -217,20 +217,24 @@ gnome_rr_output_info_set_primary gnome_rr_output_info_set_refresh_rate gnome_rr_output_info_set_rotation -gnome_rr_output_info_supports_rotation GnomeRRConfig GnomeRRConfigClass gnome_rr_config_new_current -gnome_rr_config_apply -gnome_rr_config_apply_persistent +gnome_rr_config_new_stored gnome_rr_config_match gnome_rr_config_equal +gnome_rr_config_save gnome_rr_config_sanitize +gnome_rr_config_apply_with_time +gnome_rr_config_apply_from_filename_with_time gnome_rr_config_applicable +gnome_rr_config_get_backup_filename +gnome_rr_config_get_intended_filename gnome_rr_config_ensure_primary gnome_rr_config_get_clone gnome_rr_config_get_outputs gnome_rr_config_load_current +gnome_rr_config_load_filename gnome_rr_config_set_clone GNOME_RR_CONFIG @@ -267,27 +271,33 @@ GnomeRRError GNOME_RR_CONNECTOR_TYPE_PANEL gnome_rr_screen_new -gnome_rr_screen_new_async -gnome_rr_screen_new_finish gnome_rr_screen_list_outputs gnome_rr_screen_list_crtcs gnome_rr_screen_list_modes gnome_rr_screen_list_clone_modes +gnome_rr_screen_set_size gnome_rr_screen_get_crtc_by_id gnome_rr_screen_refresh gnome_rr_screen_get_output_by_id gnome_rr_screen_get_output_by_name gnome_rr_screen_get_ranges +gnome_rr_screen_get_timestamps +gnome_rr_screen_set_primary_output gnome_rr_screen_create_clone_modes gnome_rr_screen_get_dpms_mode gnome_rr_screen_set_dpms_mode gnome_rr_output_get_id gnome_rr_output_get_name +gnome_rr_output_is_connected +gnome_rr_output_get_size_inches +gnome_rr_output_get_width_mm +gnome_rr_output_get_height_mm gnome_rr_output_get_edid_data gnome_rr_output_get_possible_crtcs gnome_rr_output_get_current_mode gnome_rr_output_get_crtc -gnome_rr_output_is_builtin_display +gnome_rr_output_get_connector_type +gnome_rr_output_is_laptop gnome_rr_output_get_position gnome_rr_output_can_clone gnome_rr_output_list_modes @@ -296,15 +306,16 @@ gnome_rr_output_get_is_primary gnome_rr_output_get_backlight gnome_rr_output_set_backlight +gnome_rr_output_get_backlight_max +gnome_rr_output_get_backlight_min gnome_rr_output_get_display_name gnome_rr_output_get_ids_from_edid -gnome_rr_output_get_min_backlight_step -gnome_rr_output_get_physical_size gnome_rr_mode_get_id gnome_rr_mode_get_width gnome_rr_mode_get_height gnome_rr_mode_get_freq gnome_rr_crtc_get_id +gnome_rr_crtc_set_config_with_time gnome_rr_crtc_can_drive_output gnome_rr_crtc_get_current_mode gnome_rr_crtc_get_position diff -Nru gnome-desktop3-3.12.0/docs/reference/gnome-desktop3/html/gnome-desktop3.devhelp2 gnome-desktop3-3.8.4/docs/reference/gnome-desktop3/html/gnome-desktop3.devhelp2 --- gnome-desktop3-3.12.0/docs/reference/gnome-desktop3/html/gnome-desktop3.devhelp2 2014-03-24 14:32:27.000000000 +0000 +++ gnome-desktop3-3.8.4/docs/reference/gnome-desktop3/html/gnome-desktop3.devhelp2 2013-09-04 11:30:22.000000000 +0000 @@ -64,27 +64,33 @@ - - + + + + + + + - + + @@ -93,15 +99,16 @@ + + - - + @@ -131,20 +138,24 @@ - - - + + + + + + + @@ -196,6 +207,8 @@ + + diff -Nru gnome-desktop3-3.12.0/docs/reference/gnome-desktop3/html/gnome-desktop3-gnome-bg.html gnome-desktop3-3.8.4/docs/reference/gnome-desktop3/html/gnome-desktop3-gnome-bg.html --- gnome-desktop3-3.12.0/docs/reference/gnome-desktop3/html/gnome-desktop3-gnome-bg.html 2014-03-24 14:32:27.000000000 +0000 +++ gnome-desktop3-3.8.4/docs/reference/gnome-desktop3/html/gnome-desktop3-gnome-bg.html 2013-09-04 11:30:22.000000000 +0000 @@ -61,10 +61,10 @@ GdkColor *secondary); const gchar * gnome_bg_get_filename (GnomeBG *bg); void gnome_bg_draw (GnomeBG *bg, - GdkPixbuf *dest, + GdkPixbuf *dest, GdkScreen *screen, gboolean is_root); -cairo_surface_t * gnome_bg_create_surface (GnomeBG *bg, +cairo_surface_t * gnome_bg_create_surface (GnomeBG *bg, GdkWindow *window, int width, int height, @@ -75,7 +75,7 @@ int best_height, int *width, int *height); -GdkPixbuf * gnome_bg_create_thumbnail (GnomeBG *bg, +GdkPixbuf * gnome_bg_create_thumbnail (GnomeBG *bg, GnomeDesktopThumbnailFactory *factory, GdkScreen *screen, int dest_width, @@ -85,18 +85,18 @@ int dest_height); gboolean gnome_bg_has_multiple_sizes (GnomeBG *bg); gboolean gnome_bg_changes_with_time (GnomeBG *bg); -GdkPixbuf * gnome_bg_create_frame_thumbnail (GnomeBG *bg, +GdkPixbuf * gnome_bg_create_frame_thumbnail (GnomeBG *bg, GnomeDesktopThumbnailFactory *factory, GdkScreen *screen, int dest_width, int dest_height, int frame_num); void gnome_bg_set_surface_as_root (GdkScreen *screen, - cairo_surface_t *surface); + cairo_surface_t *surface); GnomeBGCrossfade * gnome_bg_set_surface_as_root_with_crossfade (GdkScreen *screen, - cairo_surface_t *surface); -cairo_surface_t * gnome_bg_get_surface_from_root (GdkScreen *screen); + cairo_surface_t *surface); +cairo_surface_t * gnome_bg_get_surface_from_root (GdkScreen *screen); GnomeBG; GnomeBGClass; @@ -198,7 +198,7 @@

gnome_bg_draw ()

void                gnome_bg_draw                       (GnomeBG *bg,
-                                                         GdkPixbuf *dest,
+                                                         GdkPixbuf *dest,
                                                          GdkScreen *screen,
                                                          gboolean is_root);

@@ -207,7 +207,7 @@

gnome_bg_create_surface ()

-
cairo_surface_t *   gnome_bg_create_surface             (GnomeBG *bg,
+
cairo_surface_t *   gnome_bg_create_surface             (GnomeBG *bg,
                                                          GdkWindow *window,
                                                          int width,
                                                          int height,
@@ -231,7 +231,7 @@
 
 
Returns :

 
-NULL on error (e.g. out of X connections)
+NULL on error (e.g. out of X connections)
@@ -251,7 +251,7 @@

gnome_bg_create_thumbnail ()

-
GdkPixbuf *         gnome_bg_create_thumbnail           (GnomeBG *bg,
+
GdkPixbuf *         gnome_bg_create_thumbnail           (GnomeBG *bg,
                                                          GnomeDesktopThumbnailFactory *factory,
                                                          GdkScreen *screen,
                                                          int dest_width,
@@ -263,7 +263,7 @@
 
 
 
Returns :

-a GdkPixbuf showing the background as a thumbnail. [transfer full]
+a GdkPixbuf showing the background as a thumbnail. [transfer full]
@@ -294,7 +294,7 @@

gnome_bg_create_frame_thumbnail ()

-
GdkPixbuf *         gnome_bg_create_frame_thumbnail     (GnomeBG *bg,
+
GdkPixbuf *         gnome_bg_create_frame_thumbnail     (GnomeBG *bg,
                                                          GnomeDesktopThumbnailFactory *factory,
                                                          GdkScreen *screen,
                                                          int dest_width,
@@ -322,7 +322,7 @@
 

 
gnome_bg_set_surface_as_root ()

 
void                gnome_bg_set_surface_as_root        (GdkScreen *screen,
-                                                         cairo_surface_t *surface);

+                                                         cairo_surface_t *surface);

 

 Set the root pixmap, and properties pointing to it. We
 do this atomically with a server grab to make sure that
@@ -343,7 +343,7 @@
 
 
 
surface :

-the cairo_surface_t to set root background from.
+the cairo_surface_t to set root background from.
 Must be an xlib surface backing a pixmap.
 
 
@@ -354,7 +354,7 @@
 
gnome_bg_set_surface_as_root_with_crossfade ()

 
GnomeBGCrossfade *  gnome_bg_set_surface_as_root_with_crossfade
                                                         (GdkScreen *screen,
-                                                         cairo_surface_t *surface);

+                                                         cairo_surface_t *surface);

Set the root pixmap, and properties pointing to it. This function differs from gnome_bg_set_surface_as_root() @@ -386,7 +386,7 @@

gnome_bg_get_surface_from_root ()

-
cairo_surface_t *   gnome_bg_get_surface_from_root      (GdkScreen *screen);
+
cairo_surface_t *   gnome_bg_get_surface_from_root      (GdkScreen *screen);

This function queries the _XROOTPMAP_ID property from the root window associated with screen to determine @@ -407,7 +407,7 @@

Returns :

-a cairo_surface_t if successful or NULL +a cairo_surface_t if successful or NULL diff -Nru gnome-desktop3-3.12.0/docs/reference/gnome-desktop3/html/gnome-desktop3-gnome-pnp-ids.html gnome-desktop3-3.8.4/docs/reference/gnome-desktop3/html/gnome-desktop3-gnome-pnp-ids.html --- gnome-desktop3-3.12.0/docs/reference/gnome-desktop3/html/gnome-desktop3-gnome-pnp-ids.html 2014-03-24 14:32:27.000000000 +0000 +++ gnome-desktop3-3.8.4/docs/reference/gnome-desktop3/html/gnome-desktop3-gnome-pnp-ids.html 2013-09-04 11:30:22.000000000 +0000 @@ -110,7 +110,7 @@

Returns :

a new string representing the manufacturer name, -or NULL when not found. [transfer full] +or NULL when not found. [transfer full] diff -Nru gnome-desktop3-3.12.0/docs/reference/gnome-desktop3/html/gnome-desktop3-gnome-rr-config.html gnome-desktop3-3.8.4/docs/reference/gnome-desktop3/html/gnome-desktop3-gnome-rr-config.html --- gnome-desktop3-3.12.0/docs/reference/gnome-desktop3/html/gnome-desktop3-gnome-rr-config.html 2014-03-24 14:32:27.000000000 +0000 +++ gnome-desktop3-3.8.4/docs/reference/gnome-desktop3/html/gnome-desktop3-gnome-rr-config.html 2013-09-04 11:30:22.000000000 +0000 @@ -54,12 +54,13 @@ int gnome_rr_output_info_get_preferred_width (GnomeRROutputInfo *self); gboolean gnome_rr_output_info_get_primary (GnomeRROutputInfo *self); -const char * gnome_rr_output_info_get_product (GnomeRROutputInfo *self); +guint gnome_rr_output_info_get_product (GnomeRROutputInfo *self); int gnome_rr_output_info_get_refresh_rate (GnomeRROutputInfo *self); GnomeRRRotation gnome_rr_output_info_get_rotation (GnomeRROutputInfo *self); -const char * gnome_rr_output_info_get_serial (GnomeRROutputInfo *self); -const char * gnome_rr_output_info_get_vendor (GnomeRROutputInfo *self); +guint gnome_rr_output_info_get_serial (GnomeRROutputInfo *self); +void gnome_rr_output_info_get_vendor (GnomeRROutputInfo *self, + gchar *vendor); gboolean gnome_rr_output_info_is_active (GnomeRROutputInfo *self); gboolean gnome_rr_output_info_is_connected (GnomeRROutputInfo *self); void gnome_rr_output_info_set_active (GnomeRROutputInfo *self, @@ -76,32 +77,42 @@ int rate); void gnome_rr_output_info_set_rotation (GnomeRROutputInfo *self, GnomeRRRotation rotation); -gboolean gnome_rr_output_info_supports_rotation - (GnomeRROutputInfo *self, - GnomeRRRotation rotation); struct GnomeRRConfig; struct GnomeRRConfigClass; GnomeRRConfig * gnome_rr_config_new_current (GnomeRRScreen *screen, GError **error); -gboolean gnome_rr_config_apply (GnomeRRConfig *configuration, - GnomeRRScreen *screen, - GError **error); -gboolean gnome_rr_config_apply_persistent (GnomeRRConfig *configuration, - GnomeRRScreen *screen, +GnomeRRConfig * gnome_rr_config_new_stored (GnomeRRScreen *screen, GError **error); gboolean gnome_rr_config_match (GnomeRRConfig *config1, GnomeRRConfig *config2); gboolean gnome_rr_config_equal (GnomeRRConfig *config1, GnomeRRConfig *config2); +gboolean gnome_rr_config_save (GnomeRRConfig *configuration, + GError **error); void gnome_rr_config_sanitize (GnomeRRConfig *configuration); +gboolean gnome_rr_config_apply_with_time (GnomeRRConfig *configuration, + GnomeRRScreen *screen, + guint32 timestamp, + GError **error); +gboolean gnome_rr_config_apply_from_filename_with_time + (GnomeRRScreen *screen, + const char *filename, + guint32 timestamp, + GError **error); gboolean gnome_rr_config_applicable (GnomeRRConfig *configuration, GnomeRRScreen *screen, GError **error); +char * gnome_rr_config_get_backup_filename (void); +char * gnome_rr_config_get_intended_filename + (void); gboolean gnome_rr_config_ensure_primary (GnomeRRConfig *configuration); gboolean gnome_rr_config_get_clone (GnomeRRConfig *configuration); GnomeRROutputInfo ** gnome_rr_config_get_outputs (GnomeRRConfig *configuration); gboolean gnome_rr_config_load_current (GnomeRRConfig *self, GError **error); +gboolean gnome_rr_config_load_filename (GnomeRRConfig *self, + const gchar *filename, + GError **error); void gnome_rr_config_set_clone (GnomeRRConfig *configuration, gboolean clone); @@ -241,7 +252,7 @@

gnome_rr_output_info_get_product ()

-
const char *        gnome_rr_output_info_get_product    (GnomeRROutputInfo *self);
+
guint               gnome_rr_output_info_get_product    (GnomeRROutputInfo *self);

@@ -263,24 +274,32 @@

gnome_rr_output_info_get_serial ()

-
const char *        gnome_rr_output_info_get_serial     (GnomeRROutputInfo *self);
+
guint               gnome_rr_output_info_get_serial     (GnomeRROutputInfo *self);

gnome_rr_output_info_get_vendor ()

-
const char *        gnome_rr_output_info_get_vendor     (GnomeRROutputInfo *self);
+
void                gnome_rr_output_info_get_vendor     (GnomeRROutputInfo *self,
+                                                         gchar *vendor);
- + + - + + + + + +

self :

 a GnomeRROutputInfo

vendor :

. [out caller-allocates][array fixed-size=4] +
@@ -359,15 +378,6 @@
-

gnome_rr_output_info_supports_rotation ()

-
gboolean            gnome_rr_output_info_supports_rotation
-                                                        (GnomeRROutputInfo *self,
-                                                         GnomeRRRotation rotation);
-

-

-
-
-

struct GnomeRRConfig

struct GnomeRRConfig {
     GObject parent;
@@ -396,18 +406,8 @@
-

gnome_rr_config_apply ()

-
gboolean            gnome_rr_config_apply               (GnomeRRConfig *configuration,
-                                                         GnomeRRScreen *screen,
-                                                         GError **error);
-

-

-
-
-
-

gnome_rr_config_apply_persistent ()

-
gboolean            gnome_rr_config_apply_persistent    (GnomeRRConfig *configuration,
-                                                         GnomeRRScreen *screen,
+
gnome_rr_config_new_stored ()

+
GnomeRRConfig *     gnome_rr_config_new_stored          (GnomeRRScreen *screen,
                                                          GError **error);

 

 

@@ -430,6 +430,14 @@
+

gnome_rr_config_save ()

+
gboolean            gnome_rr_config_save                (GnomeRRConfig *configuration,
+                                                         GError **error);
+

+

+
+
+

gnome_rr_config_sanitize ()

void                gnome_rr_config_sanitize            (GnomeRRConfig *configuration);

@@ -437,6 +445,27 @@

+

gnome_rr_config_apply_with_time ()

+
gboolean            gnome_rr_config_apply_with_time     (GnomeRRConfig *configuration,
+                                                         GnomeRRScreen *screen,
+                                                         guint32 timestamp,
+                                                         GError **error);
+

+

+
+
+
+

gnome_rr_config_apply_from_filename_with_time ()

+
gboolean            gnome_rr_config_apply_from_filename_with_time
+                                                        (GnomeRRScreen *screen,
+                                                         const char *filename,
+                                                         guint32 timestamp,
+                                                         GError **error);
+

+

+
+
+

gnome_rr_config_applicable ()

gboolean            gnome_rr_config_applicable          (GnomeRRConfig *configuration,
                                                          GnomeRRScreen *screen,
@@ -446,6 +475,21 @@
+

gnome_rr_config_get_backup_filename ()

+
char *              gnome_rr_config_get_backup_filename (void);
+

+

+
+
+
+

gnome_rr_config_get_intended_filename ()

+
char *              gnome_rr_config_get_intended_filename
+                                                        (void);
+

+

+
+
+

gnome_rr_config_ensure_primary ()

gboolean            gnome_rr_config_ensure_primary      (GnomeRRConfig *configuration);

@@ -491,6 +535,15 @@ GError **error);

+
+
+
+

gnome_rr_config_load_filename ()

+
gboolean            gnome_rr_config_load_filename       (GnomeRRConfig *self,
+                                                         const gchar *filename,
+                                                         GError **error);
+

+

diff -Nru gnome-desktop3-3.12.0/docs/reference/gnome-desktop3/html/gnome-desktop3-gnome-rr.html gnome-desktop3-3.8.4/docs/reference/gnome-desktop3/html/gnome-desktop3-gnome-rr.html --- gnome-desktop3-3.12.0/docs/reference/gnome-desktop3/html/gnome-desktop3-gnome-rr.html 2014-03-24 14:32:27.000000000 +0000 +++ gnome-desktop3-3.8.4/docs/reference/gnome-desktop3/html/gnome-desktop3-gnome-rr.html 2013-09-04 11:30:22.000000000 +0000 @@ -50,15 +50,15 @@ #define GNOME_RR_CONNECTOR_TYPE_PANEL GnomeRRScreen * gnome_rr_screen_new (GdkScreen *screen, GError **error); -void gnome_rr_screen_new_async (GdkScreen *screen, - GAsyncReadyCallback callback, - gpointer user_data); -GnomeRRScreen * gnome_rr_screen_new_finish (GAsyncResult *result, - GError **error); GnomeRROutput ** gnome_rr_screen_list_outputs (GnomeRRScreen *screen); GnomeRRCrtc ** gnome_rr_screen_list_crtcs (GnomeRRScreen *screen); GnomeRRMode ** gnome_rr_screen_list_modes (GnomeRRScreen *screen); GnomeRRMode ** gnome_rr_screen_list_clone_modes (GnomeRRScreen *screen); +void gnome_rr_screen_set_size (GnomeRRScreen *screen, + int width, + int height, + int mm_width, + int mm_height); GnomeRRCrtc * gnome_rr_screen_get_crtc_by_id (GnomeRRScreen *screen, guint32 id); gboolean gnome_rr_screen_refresh (GnomeRRScreen *screen, @@ -72,6 +72,11 @@ int *max_width, int *min_height, int *max_height); +void gnome_rr_screen_get_timestamps (GnomeRRScreen *screen, + guint32 *change_timestamp_ret, + guint32 *config_timestamp_ret); +void gnome_rr_screen_set_primary_output (GnomeRRScreen *screen, + GnomeRROutput *output); GnomeRRMode ** gnome_rr_screen_create_clone_modes (GnomeRRScreen *screen); gboolean gnome_rr_screen_get_dpms_mode (GnomeRRScreen *screen, GnomeRRDpmsMode *mode, @@ -81,12 +86,17 @@ GError **error); guint32 gnome_rr_output_get_id (GnomeRROutput *output); const char * gnome_rr_output_get_name (GnomeRROutput *output); +gboolean gnome_rr_output_is_connected (GnomeRROutput *output); +int gnome_rr_output_get_size_inches (GnomeRROutput *output); +int gnome_rr_output_get_width_mm (GnomeRROutput *outout); +int gnome_rr_output_get_height_mm (GnomeRROutput *output); const guint8 * gnome_rr_output_get_edid_data (GnomeRROutput *output, gsize *size); GnomeRRCrtc ** gnome_rr_output_get_possible_crtcs (GnomeRROutput *output); GnomeRRMode * gnome_rr_output_get_current_mode (GnomeRROutput *output); GnomeRRCrtc * gnome_rr_output_get_crtc (GnomeRROutput *output); -gboolean gnome_rr_output_is_builtin_display (GnomeRROutput *output); +const char * gnome_rr_output_get_connector_type (GnomeRROutput *output); +gboolean gnome_rr_output_is_laptop (GnomeRROutput *output); void gnome_rr_output_get_position (GnomeRROutput *output, int *x, int *y); @@ -97,25 +107,32 @@ gboolean gnome_rr_output_supports_mode (GnomeRROutput *output, GnomeRRMode *mode); gboolean gnome_rr_output_get_is_primary (GnomeRROutput *output); -gint gnome_rr_output_get_backlight (GnomeRROutput *output); +gint gnome_rr_output_get_backlight (GnomeRROutput *output, + GError **error); gboolean gnome_rr_output_set_backlight (GnomeRROutput *output, gint value, GError **error); +gint gnome_rr_output_get_backlight_max (GnomeRROutput *output); +gint gnome_rr_output_get_backlight_min (GnomeRROutput *output); const char * gnome_rr_output_get_display_name (GnomeRROutput *output); -void gnome_rr_output_get_ids_from_edid (GnomeRROutput *output, +gboolean gnome_rr_output_get_ids_from_edid (GnomeRROutput *output, char **vendor, - char **product, - char **serial); -gint gnome_rr_output_get_min_backlight_step - (GnomeRROutput *output); -void gnome_rr_output_get_physical_size (GnomeRROutput *output, - int *width_mm, - int *height_mm); + int *product, + int *serial); guint32 gnome_rr_mode_get_id (GnomeRRMode *mode); guint gnome_rr_mode_get_width (GnomeRRMode *mode); guint gnome_rr_mode_get_height (GnomeRRMode *mode); int gnome_rr_mode_get_freq (GnomeRRMode *mode); guint32 gnome_rr_crtc_get_id (GnomeRRCrtc *crtc); +gboolean gnome_rr_crtc_set_config_with_time (GnomeRRCrtc *crtc, + guint32 timestamp, + int x, + int y, + GnomeRRMode *mode, + GnomeRRRotation rotation, + GnomeRROutput **outputs, + int n_outputs, + GError **error); gboolean gnome_rr_crtc_can_drive_output (GnomeRRCrtc *crtc, GnomeRROutput *output); GnomeRRMode * gnome_rr_crtc_get_current_mode (GnomeRRCrtc *crtc); @@ -131,7 +148,7 @@ unsigned short **red, unsigned short **green, unsigned short **blue); -gboolean gnome_rr_crtc_set_gamma (GnomeRRCrtc *crtc, +void gnome_rr_crtc_set_gamma (GnomeRRCrtc *crtc, int size, unsigned short *red, unsigned short *green, @@ -395,7 +412,7 @@

GNOME_RR_CONNECTOR_TYPE_PANEL

-
#define GNOME_RR_CONNECTOR_TYPE_PANEL "Panel"  /* This is a built-in LCD */
+
#define GNOME_RR_CONNECTOR_TYPE_PANEL "Panel"  /* This is a laptop's built-in LCD */
 

 

 

@@ -433,23 +450,6 @@
-

gnome_rr_screen_new_async ()

-
void                gnome_rr_screen_new_async           (GdkScreen *screen,
-                                                         GAsyncReadyCallback callback,
-                                                         gpointer user_data);
-

-

-
-
-
-

gnome_rr_screen_new_finish ()

-
GnomeRRScreen *     gnome_rr_screen_new_finish          (GAsyncResult *result,
-                                                         GError **error);
-

-

-
-
-

gnome_rr_screen_list_outputs ()

GnomeRROutput **    gnome_rr_screen_list_outputs        (GnomeRRScreen *screen);

@@ -526,6 +526,17 @@

+

gnome_rr_screen_set_size ()

+
void                gnome_rr_screen_set_size            (GnomeRRScreen *screen,
+                                                         int width,
+                                                         int height,
+                                                         int mm_width,
+                                                         int mm_height);
+

+

+
+
+

gnome_rr_screen_get_crtc_by_id ()

GnomeRRCrtc *       gnome_rr_screen_get_crtc_by_id      (GnomeRRScreen *screen,
                                                          guint32 id);
@@ -563,7 +574,7 @@

error :

-location to store error, or NULL +location to store error, or NULL @@ -657,6 +668,51 @@
+

gnome_rr_screen_get_timestamps ()

+
void                gnome_rr_screen_get_timestamps      (GnomeRRScreen *screen,
+                                                         guint32 *change_timestamp_ret,
+                                                         guint32 *config_timestamp_ret);
+

+Queries the two timestamps that the X RANDR extension maintains. The X +server will prevent change requests for stale configurations, those whose +timestamp is not equal to that of the latest request for configuration. The +X server will also prevent change requests that have an older timestamp to +the latest change request. +

+
++++ + + + + + + + + + + + + + + +

screen :

a GnomeRRScreen +

change_timestamp_ret :

Location in which to store the timestamp at which the RANDR configuration was last changed. [out] +

config_timestamp_ret :

Location in which to store the timestamp at which the RANDR configuration was last obtained. [out] +
+
+
+
+

gnome_rr_screen_set_primary_output ()

+
void                gnome_rr_screen_set_primary_output  (GnomeRRScreen *screen,
+                                                         GnomeRROutput *output);
+

+

+
+
+

gnome_rr_screen_create_clone_modes ()

GnomeRRMode **      gnome_rr_screen_create_clone_modes  (GnomeRRScreen *screen);

@@ -706,6 +762,34 @@

+

gnome_rr_output_is_connected ()

+
gboolean            gnome_rr_output_is_connected        (GnomeRROutput *output);
+

+

+
+
+
+

gnome_rr_output_get_size_inches ()

+
int                 gnome_rr_output_get_size_inches     (GnomeRROutput *output);
+

+

+
+
+
+

gnome_rr_output_get_width_mm ()

+
int                 gnome_rr_output_get_width_mm        (GnomeRROutput *outout);
+

+

+
+
+
+

gnome_rr_output_get_height_mm ()

+
int                 gnome_rr_output_get_height_mm       (GnomeRROutput *output);
+

+

+
+
+

gnome_rr_output_get_edid_data ()

const guint8 *      gnome_rr_output_get_edid_data       (GnomeRROutput *output,
                                                          gsize *size);
@@ -735,8 +819,15 @@
-

gnome_rr_output_is_builtin_display ()

-
gboolean            gnome_rr_output_is_builtin_display  (GnomeRROutput *output);
+

gnome_rr_output_get_connector_type ()

+
const char *        gnome_rr_output_get_connector_type  (GnomeRROutput *output);
+

+

+
+
+
+

gnome_rr_output_is_laptop ()

+
gboolean            gnome_rr_output_is_laptop           (GnomeRROutput *output);

@@ -810,7 +901,8 @@

gnome_rr_output_get_backlight ()

-
gint                gnome_rr_output_get_backlight       (GnomeRROutput *output);
+
gint                gnome_rr_output_get_backlight       (GnomeRROutput *output,
+                                                         GError **error);
@@ -836,7 +928,7 @@ - + @@ -848,52 +940,23 @@
-

gnome_rr_output_get_display_name ()

-
const char *        gnome_rr_output_get_display_name    (GnomeRROutput *output);
-

-

-
-
-
-

gnome_rr_output_get_ids_from_edid ()

-
void                gnome_rr_output_get_ids_from_edid   (GnomeRROutput *output,
-                                                         char **vendor,
-                                                         char **product,
-                                                         char **serial);
+

gnome_rr_output_get_backlight_max ()

+
gint                gnome_rr_output_get_backlight_max   (GnomeRROutput *output);

value :

the absolute value which is 0 >= this <= 100the absolute value which is min >= this <= max

Returns :
- - - - - - - - - - - - - - - - - - + + + +

output :

a GnomeRROutput -

vendor :

. [out][allow-none] -

product :

. [out][allow-none] -

serial :

. [out][allow-none] -

Returns :

The maximum backlight value, or -1 if not supported
-

gnome_rr_output_get_min_backlight_step ()

-
gint                gnome_rr_output_get_min_backlight_step
-                                                        (GnomeRROutput *output);
+

gnome_rr_output_get_backlight_min ()

+
gint                gnome_rr_output_get_backlight_min   (GnomeRROutput *output);
@@ -901,16 +964,24 @@ - +

Returns :

The minimum backlight step available in percentThe mimimum backlight value, or -1 if not supported
-

gnome_rr_output_get_physical_size ()

-
void                gnome_rr_output_get_physical_size   (GnomeRROutput *output,
-                                                         int *width_mm,
-                                                         int *height_mm);
+

gnome_rr_output_get_display_name ()

+
const char *        gnome_rr_output_get_display_name    (GnomeRROutput *output);
+

+

+
+
+
+

gnome_rr_output_get_ids_from_edid ()

+
gboolean            gnome_rr_output_get_ids_from_edid   (GnomeRROutput *output,
+                                                         char **vendor,
+                                                         int *product,
+                                                         int *serial);
@@ -923,12 +994,17 @@ - + + + + + - + @@ -972,6 +1048,21 @@
+

gnome_rr_crtc_set_config_with_time ()

+
gboolean            gnome_rr_crtc_set_config_with_time  (GnomeRRCrtc *crtc,
+                                                         guint32 timestamp,
+                                                         int x,
+                                                         int y,
+                                                         GnomeRRMode *mode,
+                                                         GnomeRRRotation rotation,
+                                                         GnomeRROutput **outputs,
+                                                         int n_outputs,
+                                                         GError **error);
+

+

+
+
+

gnome_rr_crtc_can_drive_output ()

gboolean            gnome_rr_crtc_can_drive_output      (GnomeRRCrtc *crtc,
                                                          GnomeRROutput *output);
@@ -1051,7 +1142,7 @@

gnome_rr_crtc_set_gamma ()

-
gboolean            gnome_rr_crtc_set_gamma             (GnomeRRCrtc *crtc,
+
void                gnome_rr_crtc_set_gamma             (GnomeRRCrtc *crtc,
                                                          int size,
                                                          unsigned short *red,
                                                          unsigned short *green,
diff -Nru gnome-desktop3-3.12.0/docs/reference/gnome-desktop3/html/gnome-desktop3-Language-Utilities.html gnome-desktop3-3.8.4/docs/reference/gnome-desktop3/html/gnome-desktop3-Language-Utilities.html
--- gnome-desktop3-3.12.0/docs/reference/gnome-desktop3/html/gnome-desktop3-Language-Utilities.html	2014-03-24 14:32:27.000000000 +0000
+++ gnome-desktop3-3.8.4/docs/reference/gnome-desktop3/html/gnome-desktop3-Language-Utilities.html	2013-09-04 11:30:22.000000000 +0000
@@ -77,7 +77,7 @@
- @@ -315,25 +315,25 @@ diff -Nru gnome-desktop3-3.12.0/docs/reference/gnome-desktop3/html/GnomeDesktopThumbnailFactory.html gnome-desktop3-3.8.4/docs/reference/gnome-desktop3/html/GnomeDesktopThumbnailFactory.html --- gnome-desktop3-3.12.0/docs/reference/gnome-desktop3/html/GnomeDesktopThumbnailFactory.html 2014-03-24 14:32:27.000000000 +0000 +++ gnome-desktop3-3.8.4/docs/reference/gnome-desktop3/html/GnomeDesktopThumbnailFactory.html 2013-09-04 11:30:22.000000000 +0000 @@ -33,21 +33,13 @@

width_mm :

vendor :

. [out][allow-none] +

product :

 . [out][allow-none]

height_mm :

serial :

 . [out][allow-none]

Returns :

a newly allocated NULL-terminated string array containing the +a newly allocated NULL-terminated string array containing the all locales. Free with g_strfreev(). [array zero-terminated=1][element-type utf8][transfer full]

language_codep :

 location to -store the language code, or NULL. [out][allow-none][transfer full] +store the language code, or NULL. [out][allow-none][transfer full]

country_codep :

 location to -store the country code, or NULL. [out][allow-none][transfer full] +store the country code, or NULL. [out][allow-none][transfer full]

codesetp :

 location to -store the codeset, or NULL. [out][allow-none][transfer full] +store the codeset, or NULL. [out][allow-none][transfer full]

modifierp :

 location to -store the modifier, or NULL. [out][allow-none][transfer full] +store the modifier, or NULL. [out][allow-none][transfer full]

GnomeDesktopThumbnailFactory

-

GnomeDesktopThumbnailFactory — Generates and looks up thumbnails of files and -directories

+

GnomeDesktopThumbnailFactory
-
-

Stability Level

-Unstable, unless otherwise indicated -

Synopsis

-
-#include <libgnome-desktop/gnome-desktop-thumbnail.h>
-
-enum                GnomeDesktopThumbnailSize;
+
enum                GnomeDesktopThumbnailSize;
 struct              GnomeDesktopThumbnailFactory;
 struct              GnomeDesktopThumbnailFactoryClass;
 GnomeDesktopThumbnailFactory * gnome_desktop_thumbnail_factory_new
@@ -65,30 +57,30 @@
                                                          const char *uri,
                                                          const char *mime_type,
                                                          time_t mtime);
-GdkPixbuf *         gnome_desktop_thumbnail_factory_generate_thumbnail
+GdkPixbuf *         gnome_desktop_thumbnail_factory_generate_thumbnail
                                                         (GnomeDesktopThumbnailFactory *factory,
                                                          const char *uri,
                                                          const char *mime_type);
 void                gnome_desktop_thumbnail_factory_save_thumbnail
                                                         (GnomeDesktopThumbnailFactory *factory,
-                                                         GdkPixbuf *thumbnail,
+                                                         GdkPixbuf *thumbnail,
                                                          const char *uri,
                                                          time_t original_mtime);
 void                gnome_desktop_thumbnail_factory_create_failed_thumbnail
                                                         (GnomeDesktopThumbnailFactory *factory,
                                                          const char *uri,
                                                          time_t mtime);
-gboolean            gnome_desktop_thumbnail_has_uri     (GdkPixbuf *pixbuf,
+gboolean            gnome_desktop_thumbnail_has_uri     (GdkPixbuf *pixbuf,
                                                          const char *uri);
-gboolean            gnome_desktop_thumbnail_is_valid    (GdkPixbuf *pixbuf,
+gboolean            gnome_desktop_thumbnail_is_valid    (GdkPixbuf *pixbuf,
                                                          const char *uri,
                                                          time_t mtime);
 char *              gnome_desktop_thumbnail_md5         (const char *uri);
 char *              gnome_desktop_thumbnail_path_for_uri
                                                         (const char *uri,
                                                          GnomeDesktopThumbnailSize size);
-GdkPixbuf *         gnome_desktop_thumbnail_scale_down_pixbuf
-                                                        (GdkPixbuf *pixbuf,
+GdkPixbuf *         gnome_desktop_thumbnail_scale_down_pixbuf
+                                                        (GdkPixbuf *pixbuf,
                                                          int dest_width,
                                                          int dest_height);
                     GnomeDesktopThumbnailFactoryPrivate;
@@ -104,135 +96,6 @@
 

 
Description

 

-GnomeDesktopThumbnailFactory allows generation and loading of thumbnails for
-local and remote files and directories. It uses a collection of programs
-called thumbnailers, each one generating thumbnails
-for a specific set of content-types of files. For example,
-totem-video-thumbnailer generates thumbnails for
-video files using GStreamer; evince-thumbnailer
-generates thumbnails for PDFs and other document files. If no specific
-thumbnailer exists for a file, or if the thumbnailer fails, gdk-pixbuf is
-used as a fallback.
-

-

-To generate a thumbnail, an appropriate thumbnailer program is selected then
-executed, passing it the URI of the file to thumbnail, plus a path to write
-the thumbnail image to. If thumbnailing succeeds, the thumbnailer should have
-written the image to disk before terminating; but if thumbnailing fails, no
-image should be written, and the thumbnailer should return a non-zero exit
-status. GnomeDesktopThumbnailFactory will then fall back to using gdk-pixbuf
-to generate a thumbnail, if possible.
-

-

-Thumbnailers are chosen by examining a series of
-.thumbnailer files in
-$PREFIX/share/thumbnailers.
-Each is in a simple key-file format:
-

-

-  
-    
-      
-        
-        
-      
-    
-  
1
-2
-3
-4
[Thumbnailer Entry]
-TryExec=evince-thumbnailer
-Exec=evince-thumbnailer -s %s %u %o
-MimeType=application/pdf;application/x-bzpdf;application/x-gzpdf;

-

-
-

-

-

-The .thumbnailer format supports three keys:
-

-

----
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-




TryExec

-Optional. The name of the the thumbnailer program in the current
-$PATH. This allows the calling code to quickly check whether
-the thumbnailer exists before trying to execute it.
-
Exec

-Required. The command to execute the thumbnailer. It supports a few different
-parameters which are replaced before calling the thumbnailer:
-u is the URI of the file being thumbnailed;
-i is its path; o
-is the path of the image file to be written to;
-s is the maximum desired size of the thumbnail
-image (the maximum width or height, in pixels); and
-%% is a literal percent character.
-
MimeType

-Required. A semicolon-separated list of MIME types which the thumbnailer
-supports generating thumbnails for.
-

-

-

-

-So in the example .thumbnailer file above, the command
-passes the requested thumbnail size, then the input file’s URI, then the
-path for the output image file to
-evince-thumbnailer.
-

-

-The code to examine and call a thumbnailer is contained in
-GnomeDesktopThumbnailFactory, which handles looking up the right thumbnailer
-script, building and executing the command for it, and loading the resulting
-thumbnail image into a GdkPixbuf.
-

-

-Thumbnail caching is also supported by GnomeDesktopThumbnailFactory. When
-calling a thumbnailer, the path passed for the output image file is in
-$XDG_CACHE_HOME/thumbnails/
-$SIZE/. The cached image file is given
-a (probably) unique filename, generated by hashing the original file’s URI,
-so the thumbnail can be looked up in future. GnomeDesktopThumbnailFactory
-supports two sizes of thumbnails: GNOME_DESKTOP_THUMBNAIL_SIZE_NORMAL and
-GNOME_DESKTOP_THUMBNAIL_SIZE_LARGE. Normal thumbnails are up to 128×128
-pixels, whereas large thumbnails are up to 256×256 pixels. Thumbnails which
-are larger than this are scaled down before being cached, and non-square
-thumbnails are scaled so their largest dimension is at most 128 or 256
-pixels.
-

-

-GnomeDesktopThumbnailFactory also handles failed thumbnails. If a
-thumbnailer can’t generate a thumbnail for a file (e.g. because the file is
-corrupt or because the right video codecs aren’t available), it returns a
-non-zero exit status. The thumbnail factory then writes an entry to
-$XDG_CACHE_HOME/thumbnails/fail/
-gnome-thumbnail-factory/ which is named after the hash of the
-input file URI (just like a successful cached thumbnail). For future queries
-for thumbnails for that file, GnomeDesktopThumbnailFactory can immediately
-return an error after looking up the fail entry.
-

-

-If a file changes content, GnomeDesktopThumbnailFactory will generate a new
-thumbnail because each cached image has associated metadata (stored as PNG
-tEXt keys) storing the full URI of the thumbnailed file (to check for hash
-collisions) and its last modification time at the point of thumbnailing. If
-the stored modification time doesn’t match the file’s current one, a new
-thumbnail is generated.
 

 

 

@@ -346,7 +209,7 @@
 
 
 
Returns :

-The absolute path of the thumbnail, or NULL if none exist.
+The absolute path of the thumbnail, or NULL if none exist.
 
 
 

@@ -443,7 +306,7 @@
 

 

 
gnome_desktop_thumbnail_factory_generate_thumbnail ()

-
GdkPixbuf *         gnome_desktop_thumbnail_factory_generate_thumbnail
+
GdkPixbuf *         gnome_desktop_thumbnail_factory_generate_thumbnail
                                                         (GnomeDesktopThumbnailFactory *factory,
                                                          const char *uri,
                                                          const char *mime_type);

@@ -475,7 +338,7 @@
 
 
 
Returns :

-thumbnail pixbuf if thumbnailing succeeded, NULL otherwise. [transfer full]
+thumbnail pixbuf if thumbnailing succeeded, NULL otherwise. [transfer full]
 
 
 
@@ -487,7 +350,7 @@
 
gnome_desktop_thumbnail_factory_save_thumbnail ()

 
void                gnome_desktop_thumbnail_factory_save_thumbnail
                                                         (GnomeDesktopThumbnailFactory *factory,
-                                                         GdkPixbuf *thumbnail,
+                                                         GdkPixbuf *thumbnail,
                                                          const char *uri,
                                                          time_t original_mtime);

 

@@ -564,7 +427,7 @@
 

 

 
gnome_desktop_thumbnail_has_uri ()

-
gboolean            gnome_desktop_thumbnail_has_uri     (GdkPixbuf *pixbuf,
+
gboolean            gnome_desktop_thumbnail_has_uri     (GdkPixbuf *pixbuf,
                                                          const char *uri);

 

 Returns whether the thumbnail has the correct uri embedded in the
@@ -596,7 +459,7 @@
 

 

 
gnome_desktop_thumbnail_is_valid ()

-
gboolean            gnome_desktop_thumbnail_is_valid    (GdkPixbuf *pixbuf,
+
gboolean            gnome_desktop_thumbnail_is_valid    (GdkPixbuf *pixbuf,
                                                          const char *uri,
                                                          time_t mtime);

 

@@ -611,7 +474,7 @@
 
 
 
pixbuf :

-an loaded thumbnail GdkPixbuf
+an loaded thumbnail GdkPixbuf
 
 
 
@@ -695,8 +558,8 @@
 

 

 
gnome_desktop_thumbnail_scale_down_pixbuf ()

-
GdkPixbuf *         gnome_desktop_thumbnail_scale_down_pixbuf
-                                                        (GdkPixbuf *pixbuf,
+
GdkPixbuf *         gnome_desktop_thumbnail_scale_down_pixbuf
+                                                        (GdkPixbuf *pixbuf,
                                                          int dest_width,
                                                          int dest_height);

 

@@ -712,7 +575,7 @@
 
 
 
pixbuf :

-a GdkPixbuf
+a GdkPixbuf
 
 
 
diff -Nru gnome-desktop3-3.12.0/docs/reference/gnome-desktop3/html/GnomeIdleMonitor.html gnome-desktop3-3.8.4/docs/reference/gnome-desktop3/html/GnomeIdleMonitor.html
--- gnome-desktop3-3.12.0/docs/reference/gnome-desktop3/html/GnomeIdleMonitor.html	2014-03-24 14:32:27.000000000 +0000
+++ gnome-desktop3-3.8.4/docs/reference/gnome-desktop3/html/GnomeIdleMonitor.html	2013-09-04 11:30:22.000000000 +0000
@@ -49,8 +49,7 @@
                                                          guint id,
                                                          gpointer user_data);
 GnomeIdleMonitor *  gnome_idle_monitor_new              (void);
-GnomeIdleMonitor *  gnome_idle_monitor_new_for_device   (GdkDevice *device,
-                                                         GError **error);
+GnomeIdleMonitor *  gnome_idle_monitor_new_for_device   (GdkDevice *device);
 guint               gnome_idle_monitor_add_idle_watch   (GnomeIdleMonitor *monitor,
                                                          guint64 interval_msec,
                                                          GnomeIdleMonitorWatchFunc callback,
@@ -63,7 +62,7 @@
                                                          GDestroyNotify notify);
 void                gnome_idle_monitor_remove_watch     (GnomeIdleMonitor *monitor,
                                                          guint id);
-guint64             gnome_idle_monitor_get_idletime     (GnomeIdleMonitor *monitor);
+gint64              gnome_idle_monitor_get_idletime     (GnomeIdleMonitor *monitor);
 

 

 

@@ -137,8 +136,7 @@
 

 

 
gnome_idle_monitor_new_for_device ()

-
GnomeIdleMonitor *  gnome_idle_monitor_new_for_device   (GdkDevice *device,
-                                                         GError **error);

+
GnomeIdleMonitor *  gnome_idle_monitor_new_for_device   (GdkDevice *device);

 
@@ -150,14 +148,10 @@
 
-
-
-
-
@@ -296,7 +290,7 @@
 

 
gnome_idle_monitor_get_idletime ()

-
guint64             gnome_idle_monitor_get_idletime     (GnomeIdleMonitor *monitor);

+
gint64              gnome_idle_monitor_get_idletime     (GnomeIdleMonitor *monitor);

 

 
 

A GdkDevice to get the idle time for.
 

 
error :
A pointer to a GError or NULL.

 
Returns :

 a new GnomeIdleMonitor that tracks the device-specific
 idletime for device. If device-specific idletime is not available,
-NULL is returned, and error is set. To track server-global
+NULL is returned, and error is set. To track server-global
 idletime for all devices, use gnome_idle_monitor_new().
 

 
 
@@ -310,7 +304,7 @@
 
-
+

 
 

 

 
Returns :
The current idle time, in millisecondsThe current idle time, in milliseconds, or -1 for not supported
 

 
 

diff -Nru gnome-desktop3-3.12.0/docs/reference/gnome-desktop3/html/GnomeXkbInfo.html gnome-desktop3-3.8.4/docs/reference/gnome-desktop3/html/GnomeXkbInfo.html
--- gnome-desktop3-3.12.0/docs/reference/gnome-desktop3/html/GnomeXkbInfo.html	2014-03-24 14:32:27.000000000 +0000
+++ gnome-desktop3-3.8.4/docs/reference/gnome-desktop3/html/GnomeXkbInfo.html	2013-09-04 11:30:22.000000000 +0000
@@ -67,6 +67,9 @@
                                                         (GnomeXkbInfo *self,
                                                          const gchar *group_id,
                                                          const gchar *id);
+void                gnome_xkb_info_get_var_defs         (gchar **rules,
+                                                         XkbRF_VarDefsRec **var_defs);
+void                gnome_xkb_info_free_var_defs        (XkbRF_VarDefsRec *var_defs);
 

 

 

@@ -240,7 +243,7 @@
 

 

 If the given layout doesn't exist the return value is FALSE and
-all the (out) parameters are set to NULL.
+all the (out) parameters are set to NULL.
 

 
@@ -260,25 +263,25 @@
 
@@ -421,6 +424,59 @@
 

 


 
display_name :

 location to store
-the layout's display name, or NULL. [out][allow-none][transfer none]
+the layout's display name, or NULL. [out][allow-none][transfer none]
 
 

 

 
short_name :

 location to store
-the layout's short name, or NULL. [out][allow-none][transfer none]
+the layout's short name, or NULL. [out][allow-none][transfer none]
 
 

 

 
xkb_layout :

 location to store
-the layout's XKB name, or NULL. [out][allow-none][transfer none]
+the layout's XKB name, or NULL. [out][allow-none][transfer none]
 
 

 

 
xkb_variant :

 location to store
-the layout's XKB variant, or NULL. [out][allow-none][transfer none]
+the layout's XKB variant, or NULL. [out][allow-none][transfer none]
 
 

 

 
Since 3.6

 

+

+

+
gnome_xkb_info_get_var_defs ()

+
void                gnome_xkb_info_get_var_defs         (gchar **rules,
+                                                         XkbRF_VarDefsRec **var_defs);

+

+Gets both the XKB rules file path and the current XKB parameters in
+use by the X server.
+

+

++++
+
+
+
+
+
+
+
+
+
+
+




rules :
location to store the rules file
+path. Use g_free() when it's no longer needed. [out][transfer full]
+
var_defs :
location to store a
+XkbRF_VarDefsRec pointer. Use gnome_xkb_info_free_var_defs() to
+free it. [out][transfer full]
+

+
Since 3.6

+

+

+

+
gnome_xkb_info_free_var_defs ()

+
void                gnome_xkb_info_free_var_defs        (XkbRF_VarDefsRec *var_defs);

+

+Frees an XkbRF_VarDefsRec instance allocated by
+gnome_xkb_info_get_var_defs().
+

+

++++
+
+
+
+
+




var_defs :

+XkbRF_VarDefsRec instance to free

+
Since 3.6

+

 

 

 

diff -Nru gnome-desktop3-3.12.0/docs/reference/gnome-desktop3/html/index.html gnome-desktop3-3.8.4/docs/reference/gnome-desktop3/html/index.html
--- gnome-desktop3-3.12.0/docs/reference/gnome-desktop3/html/index.html	2014-03-24 14:32:27.000000000 +0000
+++ gnome-desktop3-3.8.4/docs/reference/gnome-desktop3/html/index.html	2013-09-04 11:30:22.000000000 +0000
@@ -35,8 +35,7 @@
 
 
IV. Thumbnails

 

-GnomeDesktopThumbnailFactory — Generates and looks up thumbnails of files and
-directories
+GnomeDesktopThumbnailFactory
 

 
V. Idle Monitor

 

diff -Nru gnome-desktop3-3.12.0/docs/reference/gnome-desktop3/html/index.sgml gnome-desktop3-3.8.4/docs/reference/gnome-desktop3/html/index.sgml
--- gnome-desktop3-3.12.0/docs/reference/gnome-desktop3/html/index.sgml	2014-03-24 14:32:27.000000000 +0000
+++ gnome-desktop3-3.8.4/docs/reference/gnome-desktop3/html/index.sgml	2013-09-04 11:30:22.000000000 +0000
@@ -66,27 +66,33 @@
 
 
 
-
-
 
 
 
 
+
 
 
 
 
 
+
+
 
 
 
 
 
+
+
+
+
 
 
 
 
-
+
+
 
 
 
@@ -95,15 +101,16 @@
 
 
 
+
+
 
 
-
-
 
 
 
 
 
+
 
 
 
@@ -137,20 +144,24 @@
 
 
 
-
 
 
 
-
-
+
 
 
+
 
+
+
 
+
+
 
 
 
 
+
 
 
 
@@ -164,7 +175,6 @@
 
 
 
-
 
 
 
@@ -236,6 +246,8 @@
 
 
 
+
+
 
 
 
diff -Nru gnome-desktop3-3.12.0/docs/reference/gnome-desktop3/html/thumbnail.html gnome-desktop3-3.8.4/docs/reference/gnome-desktop3/html/thumbnail.html
--- gnome-desktop3-3.12.0/docs/reference/gnome-desktop3/html/thumbnail.html	2014-03-24 14:32:27.000000000 +0000
+++ gnome-desktop3-3.8.4/docs/reference/gnome-desktop3/html/thumbnail.html	2013-09-04 11:30:22.000000000 +0000
@@ -25,8 +25,7 @@
 

 
Table of Contents

 

-GnomeDesktopThumbnailFactory — Generates and looks up thumbnails of files and
-directories
+GnomeDesktopThumbnailFactory
 

 

 

diff -Nru gnome-desktop3-3.12.0/docs/reference/gnome-desktop3/Makefile.am gnome-desktop3-3.8.4/docs/reference/gnome-desktop3/Makefile.am
--- gnome-desktop3-3.12.0/docs/reference/gnome-desktop3/Makefile.am	2014-01-16 12:37:26.000000000 +0000
+++ gnome-desktop3-3.8.4/docs/reference/gnome-desktop3/Makefile.am	2012-05-09 17:13:31.000000000 +0000
@@ -47,11 +47,7 @@
 
 # Header files to ignore when scanning.
 # e.g. IGNORE_HFILES=gtkdebug.h gtkintl.h
-IGNORE_HFILES= \
-	libgsystem \
-	meta-dbus-idle-monitor.h \
-	meta-dbus-xrandr.h \
-	meta-xrandr-shared.h
+IGNORE_HFILES=
 
 # Images to copy into HTML directory.
 # e.g. HTML_IMAGES=$(top_srcdir)/gtk/stock-icons/stock_about_24.png
diff -Nru gnome-desktop3-3.12.0/docs/reference/gnome-desktop3/Makefile.in gnome-desktop3-3.8.4/docs/reference/gnome-desktop3/Makefile.in
--- gnome-desktop3-3.12.0/docs/reference/gnome-desktop3/Makefile.in	2014-03-24 14:31:08.000000000 +0000
+++ gnome-desktop3-3.8.4/docs/reference/gnome-desktop3/Makefile.in	2013-09-04 11:29:46.000000000 +0000
@@ -362,12 +362,7 @@
 
 # Header files to ignore when scanning.
 # e.g. IGNORE_HFILES=gtkdebug.h gtkintl.h
-IGNORE_HFILES = \
-	libgsystem \
-	meta-dbus-idle-monitor.h \
-	meta-dbus-xrandr.h \
-	meta-xrandr-shared.h
-
+IGNORE_HFILES = 
 
 # Images to copy into HTML directory.
 # e.g. HTML_IMAGES=$(top_srcdir)/gtk/stock-icons/stock_about_24.png
diff -Nru gnome-desktop3-3.12.0/docs/reference/gnome-desktop3/tmpl/edid.sgml gnome-desktop3-3.8.4/docs/reference/gnome-desktop3/tmpl/edid.sgml
--- gnome-desktop3-3.12.0/docs/reference/gnome-desktop3/tmpl/edid.sgml	2014-03-24 14:32:27.000000000 +0000
+++ gnome-desktop3-3.8.4/docs/reference/gnome-desktop3/tmpl/edid.sgml	2013-09-04 11:30:22.000000000 +0000
@@ -90,3 +90,12 @@
 @Returns: 
 
 
+
+
+
+
+
+@info: 
+@Returns: 
+
+
diff -Nru gnome-desktop3-3.12.0/docs/reference/gnome-desktop3/tmpl/gnome-idle-monitor.sgml gnome-desktop3-3.8.4/docs/reference/gnome-desktop3/tmpl/gnome-idle-monitor.sgml
--- gnome-desktop3-3.12.0/docs/reference/gnome-desktop3/tmpl/gnome-idle-monitor.sgml	2014-03-24 14:32:27.000000000 +0000
+++ gnome-desktop3-3.8.4/docs/reference/gnome-desktop3/tmpl/gnome-idle-monitor.sgml	2013-09-04 11:30:22.000000000 +0000
@@ -65,7 +65,6 @@
 
 
 @device: 
-@error: 
 @Returns: 
 
 
diff -Nru gnome-desktop3-3.12.0/docs/reference/gnome-desktop3/tmpl/gnome-rr-config.sgml gnome-desktop3-3.8.4/docs/reference/gnome-desktop3/tmpl/gnome-rr-config.sgml
--- gnome-desktop3-3.12.0/docs/reference/gnome-desktop3/tmpl/gnome-rr-config.sgml	2014-03-24 14:32:27.000000000 +0000
+++ gnome-desktop3-3.8.4/docs/reference/gnome-desktop3/tmpl/gnome-rr-config.sgml	2013-09-04 11:30:22.000000000 +0000
@@ -144,7 +144,7 @@
 
 
 @self: 
-@Returns: 
+@vendor: 
 
 
 
@@ -213,16 +213,6 @@
 @rotation: 
 
 
-
-
-
-
-
-@self: 
-@rotation: 
-@Returns: 
-
-
 
 
 
@@ -247,29 +237,27 @@
 @Returns: 
 
 
-
+
 
 
 
 
-@configuration: 
 @screen: 
 @error: 
 @Returns: 
 
 
-
+
 
 
 
 
-@configuration: 
-@screen: 
-@error: 
+@config1: 
+@config2: 
 @Returns: 
 
 
-
+
 
 
 
@@ -279,13 +267,13 @@
 @Returns: 
 
 
-
+
 
 
 
 
-@config1: 
-@config2: 
+@configuration: 
+@error: 
 @Returns: 
 
 
@@ -297,6 +285,30 @@
 @configuration: 
 
 
+
+
+
+
+
+@configuration: 
+@screen: 
+@timestamp: 
+@error: 
+@Returns: 
+
+
+
+
+
+
+
+@screen: 
+@filename: 
+@timestamp: 
+@error: 
+@Returns: 
+
+
 
 
 
@@ -308,6 +320,24 @@
 @Returns: 
 
 
+
+
+
+
+
+@void: 
+@Returns: 
+
+
+
+
+
+
+
+@void: 
+@Returns: 
+
+
 
 
 
@@ -344,6 +374,17 @@
 @error: 
 @Returns: 
 
+
+
+
+
+
+
+@self: 
+@filename: 
+@error: 
+@Returns: 
+
 
 
 
diff -Nru gnome-desktop3-3.12.0/docs/reference/gnome-desktop3/tmpl/gnome-rr.sgml gnome-desktop3-3.8.4/docs/reference/gnome-desktop3/tmpl/gnome-rr.sgml
--- gnome-desktop3-3.12.0/docs/reference/gnome-desktop3/tmpl/gnome-rr.sgml	2014-03-24 14:32:27.000000000 +0000
+++ gnome-desktop3-3.8.4/docs/reference/gnome-desktop3/tmpl/gnome-rr.sgml	2013-09-04 11:30:22.000000000 +0000
@@ -129,27 +129,16 @@
 @Returns: 
 
 
-
+
 
 
 
 
 @screen: 
-@callback: 
-@user_data: 
-
-
-
-
-
-
-
-@result: 
-@error: 
 @Returns: 
 
 
-
+
 
 
 
@@ -158,7 +147,7 @@
 @Returns: 
 
 
-
+
 
 
 
@@ -167,7 +156,7 @@
 @Returns: 
 
 
-
+
 
 
 
@@ -176,13 +165,16 @@
 @Returns: 
 
 
-
+
 
 
 
 
 @screen: 
-@Returns: 
+@width: 
+@height: 
+@mm_width: 
+@mm_height: 
 
 
 
@@ -237,6 +229,25 @@
 @max_height: 
 
 
+
+
+
+
+
+@screen: 
+@change_timestamp_ret: 
+@config_timestamp_ret: 
+
+
+
+
+
+
+
+@screen: 
+@output: 
+
+
 
 
 
@@ -286,6 +297,42 @@
 @Returns: 
 
 
+
+
+
+
+
+@output: 
+@Returns: 
+
+
+
+
+
+
+
+@output: 
+@Returns: 
+
+
+
+
+
+
+
+@outout: 
+@Returns: 
+
+
+
+
+
+
+
+@output: 
+@Returns: 
+
+
 
 
 
@@ -323,7 +370,16 @@
 @Returns: 
 
 
-
+
+
+
+
+
+@output: 
+@Returns: 
+
+
+
 
 
 
@@ -395,6 +451,7 @@
 
 
 @output: 
+@error: 
 @Returns: 
 
 
@@ -409,7 +466,7 @@
 @Returns: 
 
 
-
+
 
 
 
@@ -418,18 +475,16 @@
 @Returns: 
 
 
-
+
 
 
 
 
 @output: 
-@vendor: 
-@product: 
-@serial: 
+@Returns: 
 
 
-
+
 
 
 
@@ -438,14 +493,16 @@
 @Returns: 
 
 
-
+
 
 
 
 
 @output: 
-@width_mm: 
-@height_mm: 
+@vendor: 
+@product: 
+@serial: 
+@Returns: 
 
 
 
@@ -493,6 +550,23 @@
 @Returns: 
 
 
+
+
+
+
+
+@crtc: 
+@timestamp: 
+@x: 
+@y: 
+@mode: 
+@rotation: 
+@outputs: 
+@n_outputs: 
+@error: 
+@Returns: 
+
+
 
 
 
@@ -573,6 +647,5 @@
 @red: 
 @green: 
 @blue: 
-@Returns: 
 
 
diff -Nru gnome-desktop3-3.12.0/docs/reference/gnome-desktop3/tmpl/gnome-xkb-info.sgml gnome-desktop3-3.8.4/docs/reference/gnome-desktop3/tmpl/gnome-xkb-info.sgml
--- gnome-desktop3-3.12.0/docs/reference/gnome-desktop3/tmpl/gnome-xkb-info.sgml	2014-03-24 14:32:27.000000000 +0000
+++ gnome-desktop3-3.8.4/docs/reference/gnome-desktop3/tmpl/gnome-xkb-info.sgml	2013-09-04 11:30:22.000000000 +0000
@@ -127,3 +127,20 @@
 @Returns: 
 
 
+
+
+
+
+
+@rules: 
+@var_defs: 
+
+
+
+
+
+
+
+@var_defs: 
+
+
diff -Nru gnome-desktop3-3.12.0/libgnome-desktop/default-input-sources.h gnome-desktop3-3.8.4/libgnome-desktop/default-input-sources.h
--- gnome-desktop3-3.12.0/libgnome-desktop/default-input-sources.h	2013-11-11 17:23:17.000000000 +0000
+++ gnome-desktop3-3.8.4/libgnome-desktop/default-input-sources.h	2013-05-31 08:01:52.000000000 +0000
@@ -12,7 +12,6 @@
   { "ast_ES",   "xkb",          "es+ast" },
   { "az_AZ",    "xkb",          "az" },
   { "be_BY",    "xkb",          "by" },
-  { "bg_BG",    "xkb",          "bg+phonetic" },
   { "bn_IN",    "ibus",         "m17n:bn:inscript" },
   { "cat_ES",   "xkb",          "es+cat" },
   { "cs_CZ",    "xkb",          "cz" },
diff -Nru gnome-desktop3-3.12.0/libgnome-desktop/display-name.c gnome-desktop3-3.8.4/libgnome-desktop/display-name.c
--- gnome-desktop3-3.12.0/libgnome-desktop/display-name.c	1970-01-01 00:00:00.000000000 +0000
+++ gnome-desktop3-3.8.4/libgnome-desktop/display-name.c	2013-09-04 11:15:57.000000000 +0000
@@ -0,0 +1,144 @@
+/*
+ * Copyright 2007 Red Hat, Inc.
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * on the rights to use, copy, modify, merge, publish, distribute, sub
+ * license, and/or sell copies of the Software, and to permit persons to whom
+ * the Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice (including the next
+ * paragraph) shall be included in all copies or substantial portions of the
+ * Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT.  IN NO EVENT SHALL
+ * THE AUTHORS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
+ * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+ * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ */
+
+/* Author: Soren Sandmann  */
+
+#include 
+#include 
+#include 
+#include 
+#include 
+#include 
+#include 
+
+#include "gnome-pnp-ids.h"
+#include "edid.h"
+
+static const char *
+find_vendor (const char *code)
+{
+    const char *vendor_name;
+    GnomePnpIds *pnp_ids;
+
+    pnp_ids = gnome_pnp_ids_new ();
+    vendor_name = gnome_pnp_ids_get_pnp_id (pnp_ids, code);
+    g_object_unref (pnp_ids);
+
+    if (vendor_name)
+        return vendor_name;
+
+    return code;
+}
+
+static const double known_diagonals[] = {
+    12.1,
+    13.3,
+    15.6
+};
+
+static char *
+diagonal_to_str (double d)
+{
+    int i;
+
+    for (i = 0; i < G_N_ELEMENTS (known_diagonals); i++)
+    {
+        double delta;
+
+        delta = fabs(known_diagonals[i] - d);
+        if (delta < 0.1)
+            return g_strdup_printf ("%0.1lf\"", known_diagonals[i]);
+    }
+
+    return g_strdup_printf ("%d\"", (int) (d + 0.5));
+}
+
+char *
+make_display_size_string (int width_mm,
+                          int height_mm)
+{
+  char *inches = NULL;
+
+  if (width_mm > 0 && height_mm > 0)
+    {
+      double d = sqrt (width_mm * width_mm + height_mm * height_mm);
+
+      inches = diagonal_to_str (d / 25.4);
+    }
+
+  return inches;
+}
+
+char *
+make_display_name (const MonitorInfo *info)
+{
+    const char *vendor;
+    int width_mm, height_mm;
+    char *inches, *ret;
+
+    if (info)
+    {
+	vendor = find_vendor (info->manufacturer_code);
+    }
+    else
+    {
+        /* Translators: "Unknown" here is used to identify a monitor for which
+         * we don't know the vendor. When a vendor is known, the name of the
+         * vendor is used. */
+	vendor = C_("Monitor vendor", "Unknown");
+    }
+
+    if (info && info->width_mm != -1 && info->height_mm)
+    {
+	width_mm = info->width_mm;
+	height_mm = info->height_mm;
+    }
+    else if (info && info->n_detailed_timings)
+    {
+	width_mm = info->detailed_timings[0].width_mm;
+	height_mm = info->detailed_timings[0].height_mm;
+    }
+    else
+    {
+	width_mm = -1;
+	height_mm = -1;
+    }
+    
+    if (width_mm != -1 && height_mm != -1)
+    {
+	double d = sqrt (width_mm * width_mm + height_mm * height_mm);
+
+	inches = diagonal_to_str (d / 25.4);
+    }
+    else
+    {
+	inches = NULL;
+    }
+
+    if (!inches)
+	return g_strdup (vendor);
+
+    ret = g_strdup_printf ("%s %s", vendor, inches);
+    g_free (inches);
+
+    return ret;
+}
diff -Nru gnome-desktop3-3.12.0/libgnome-desktop/edid.h gnome-desktop3-3.8.4/libgnome-desktop/edid.h
--- gnome-desktop3-3.12.0/libgnome-desktop/edid.h	2013-11-11 17:23:17.000000000 +0000
+++ gnome-desktop3-3.8.4/libgnome-desktop/edid.h	2013-09-04 11:15:57.000000000 +0000
@@ -189,5 +189,7 @@
 };
 
 MonitorInfo *decode_edid (const uchar *data);
+char *make_display_name (const MonitorInfo *info);
+char *make_display_size_string (int width_mm, int height_mm);
 
 #endif
diff -Nru gnome-desktop3-3.12.0/libgnome-desktop/edid-parse.c gnome-desktop3-3.8.4/libgnome-desktop/edid-parse.c
--- gnome-desktop3-3.12.0/libgnome-desktop/edid-parse.c	2013-11-11 17:23:17.000000000 +0000
+++ gnome-desktop3-3.8.4/libgnome-desktop/edid-parse.c	2012-05-09 17:13:31.000000000 +0000
@@ -253,7 +253,7 @@
 decode_color_characteristics (const uchar *edid, MonitorInfo *info)
 {
     info->red_x = decode_fraction (edid[0x1b], get_bits (edid[0x19], 6, 7));
-    info->red_y = decode_fraction (edid[0x1c], get_bits (edid[0x19], 4, 5));
+    info->red_y = decode_fraction (edid[0x1c], get_bits (edid[0x19], 5, 4));
     info->green_x = decode_fraction (edid[0x1d], get_bits (edid[0x19], 2, 3));
     info->green_y = decode_fraction (edid[0x1e], get_bits (edid[0x19], 0, 1));
     info->blue_x = decode_fraction (edid[0x1f], get_bits (edid[0x1a], 6, 7));
diff -Nru gnome-desktop3-3.12.0/libgnome-desktop/gnome-bg.c gnome-desktop3-3.8.4/libgnome-desktop/gnome-bg.c
--- gnome-desktop3-3.12.0/libgnome-desktop/gnome-bg.c	2013-11-11 17:23:17.000000000 +0000
+++ gnome-desktop3-3.8.4/libgnome-desktop/gnome-bg.c	2013-09-04 11:15:57.000000000 +0000
@@ -1227,8 +1227,6 @@
 	}
 
         gnome_bg_slide_show_get_current_slide (show, best_width, best_height, NULL, NULL, NULL, &file, NULL);
-        g_object_unref (show);
-
         return file;
 }
 
@@ -2611,20 +2609,14 @@
 gnome_bg_changes_with_time (GnomeBG *bg)
 {
 	GnomeBGSlideShow *show;
-	gboolean ret = FALSE;
 
 	g_return_val_if_fail (bg != NULL, FALSE);
 
-	if (!bg->filename)
-		return FALSE;
-
 	show = get_as_slideshow (bg, bg->filename);
-	if (show) {
-		ret = gnome_bg_slide_show_get_num_slides (show) > 1;
-		g_object_unref (show);
-	}
+	if (show)
+		return gnome_bg_slide_show_get_num_slides (show) > 1;
 
-	return ret;
+	return FALSE;
 }
 
 /**
@@ -2648,6 +2640,7 @@
 	GnomeBGSlideShow *show;
 	GdkPixbuf *result;
 	GdkPixbuf *thumb;
+        GList *l;
         int skipped;
         gboolean is_fixed;
 
diff -Nru gnome-desktop3-3.12.0/libgnome-desktop/gnome-bg-slide-show.c gnome-desktop3-3.8.4/libgnome-desktop/gnome-bg-slide-show.c
--- gnome-desktop3-3.12.0/libgnome-desktop/gnome-bg-slide-show.c	2013-11-11 17:23:17.000000000 +0000
+++ gnome-desktop3-3.8.4/libgnome-desktop/gnome-bg-slide-show.c	2013-05-26 15:28:49.000000000 +0000
@@ -166,8 +166,6 @@
 
         g_list_foreach (self->priv->stack->head, (GFunc) g_free, NULL);
         g_queue_free (self->priv->stack);
-
-        g_free (self->priv->filename);
 }
 
 static void
@@ -684,10 +682,6 @@
 
                 /* no slides, that's not a slideshow */
                 if (len == 0) {
-                        g_set_error_literal (error,
-                                             G_MARKUP_ERROR,
-                                             G_MARKUP_ERROR_INVALID_CONTENT,
-                                             "file is not a slide show since it has no slides");
                         failed = TRUE;
                 /* one slide, there's no transition */
                 } else if (len == 1) {
diff -Nru gnome-desktop3-3.12.0/libgnome-desktop/gnome-desktop-3.0.pc.in gnome-desktop3-3.8.4/libgnome-desktop/gnome-desktop-3.0.pc.in
--- gnome-desktop3-3.12.0/libgnome-desktop/gnome-desktop-3.0.pc.in	2014-02-13 09:41:05.000000000 +0000
+++ gnome-desktop3-3.8.4/libgnome-desktop/gnome-desktop-3.0.pc.in	2012-06-26 21:07:01.000000000 +0000
@@ -6,6 +6,7 @@
 Name: gnome-desktop-3.0
 Description: Utility library for loading .desktop files
 Requires: gtk+-3.0 gsettings-desktop-schemas
+Requires.private: xkbfile
 Version: @VERSION@
 Libs: -L${libdir} -lgnome-desktop-3
 Cflags: -I${includedir}/gnome-desktop-3.0
diff -Nru gnome-desktop3-3.12.0/libgnome-desktop/gnome-desktop-thumbnail.c gnome-desktop3-3.8.4/libgnome-desktop/gnome-desktop-thumbnail.c
--- gnome-desktop3-3.12.0/libgnome-desktop/gnome-desktop-thumbnail.c	2014-01-07 13:28:22.000000000 +0000
+++ gnome-desktop3-3.8.4/libgnome-desktop/gnome-desktop-thumbnail.c	2013-05-30 09:49:47.000000000 +0000
@@ -24,108 +24,6 @@
  * Author: Alexander Larsson 
  */
 
-/**
- * SECTION:gnome-desktop-thumbnail
- * @short_description: Generates and looks up thumbnails of files and
- * directories
- * @stability: Unstable
- * @include: libgnome-desktop/gnome-desktop-thumbnail.h
- *
- * #GnomeDesktopThumbnailFactory allows generation and loading of thumbnails for
- * local and remote files and directories. It uses a collection of programs
- * called thumbnailers, each one generating thumbnails
- * for a specific set of content-types of files. For example,
- * totem-video-thumbnailer generates thumbnails for
- * video files using GStreamer; evince-thumbnailer
- * generates thumbnails for PDFs and other document files. If no specific
- * thumbnailer exists for a file, or if the thumbnailer fails, gdk-pixbuf is
- * used as a fallback.
- *
- * To generate a thumbnail, an appropriate thumbnailer program is selected then
- * executed, passing it the URI of the file to thumbnail, plus a path to write
- * the thumbnail image to. If thumbnailing succeeds, the thumbnailer should have
- * written the image to disk before terminating; but if thumbnailing fails, no
- * image should be written, and the thumbnailer should return a non-zero exit
- * status. #GnomeDesktopThumbnailFactory will then fall back to using gdk-pixbuf
- * to generate a thumbnail, if possible.
- *
- * Thumbnailers are chosen by examining a series of
- * .thumbnailer files in
- * $PREFIX/share/thumbnailers.
- * Each is in a simple key-file format:
- * 
- * [Thumbnailer Entry]
- * TryExec=evince-thumbnailer
- * Exec=evince-thumbnailer -s %s %u %o
- * MimeType=application/pdf;application/x-bzpdf;application/x-gzpdf;
- * 
- *
- * The .thumbnailer format supports three keys:
- * 
- * TryExec
- * Optional. The name of the the thumbnailer program in the current
- * $PATH. This allows the calling code to quickly check whether
- * the thumbnailer exists before trying to execute it.
- * 
- * Exec
- * Required. The command to execute the thumbnailer. It supports a few different
- * parameters which are replaced before calling the thumbnailer:
- * %u is the URI of the file being thumbnailed;
- * %i is its path; %o
- * is the path of the image file to be written to;
- * %s is the maximum desired size of the thumbnail
- * image (the maximum width or height, in pixels); and
- * %% is a literal percent character.
- * 
- * MimeType
- * Required. A semicolon-separated list of MIME types which the thumbnailer
- * supports generating thumbnails for.
- * 
- * 
- *
- * So in the example .thumbnailer file above, the command
- * passes the requested thumbnail size, then the input file’s URI, then the
- * path for the output image file to
- * evince-thumbnailer.
- *
- * The code to examine and call a thumbnailer is contained in
- * #GnomeDesktopThumbnailFactory, which handles looking up the right thumbnailer
- * script, building and executing the command for it, and loading the resulting
- * thumbnail image into a #GdkPixbuf.
- *
- * Thumbnail caching is also supported by #GnomeDesktopThumbnailFactory. When
- * calling a thumbnailer, the path passed for the output image file is in
- * $XDG_CACHE_HOME/thumbnails/
- * $SIZE/. The cached image file is given
- * a (probably) unique filename, generated by hashing the original file’s URI,
- * so the thumbnail can be looked up in future. #GnomeDesktopThumbnailFactory
- * supports two sizes of thumbnails: %GNOME_DESKTOP_THUMBNAIL_SIZE_NORMAL and
- * %GNOME_DESKTOP_THUMBNAIL_SIZE_LARGE. Normal thumbnails are up to 128×128
- * pixels, whereas large thumbnails are up to 256×256 pixels. Thumbnails which
- * are larger than this are scaled down before being cached, and non-square
- * thumbnails are scaled so their largest dimension is at most 128 or 256
- * pixels.
- *
- * #GnomeDesktopThumbnailFactory also handles failed thumbnails. If a
- * thumbnailer can’t generate a thumbnail for a file (e.g. because the file is
- * corrupt or because the right video codecs aren’t available), it returns a
- * non-zero exit status. The thumbnail factory then writes an entry to
- * $XDG_CACHE_HOME/thumbnails/fail/
- * gnome-thumbnail-factory/ which is named after the hash of the
- * input file URI (just like a successful cached thumbnail). For future queries
- * for thumbnails for that file, #GnomeDesktopThumbnailFactory can immediately
- * return an error after looking up the fail entry.
- *
- * If a file changes content, #GnomeDesktopThumbnailFactory will generate a new
- * thumbnail because each cached image has associated metadata (stored as PNG
- * tEXt keys) storing the full URI of the thumbnailed file (to check for hash
- * collisions) and its last modification time at the point of thumbnailing. If
- * the stored modification time doesn’t match the file’s current one, a new
- * thumbnail is generated.
- *
- * Since: 2.2
- */
-
 #include 
 #include 
 #include 
@@ -149,13 +47,6 @@
 
 #define SECONDS_BETWEEN_STATS 10
 
-static void
-thumbnailers_directory_changed (GFileMonitor                 *monitor,
-                                GFile                        *file,
-                                GFile                        *other_file,
-                                GFileMonitorEvent             event_type,
-                                GnomeDesktopThumbnailFactory *factory);
-
 struct _GnomeDesktopThumbnailFactoryPrivate {
   GnomeDesktopThumbnailSize size;
 
@@ -173,6 +64,9 @@
 
 static const char *appname = "gnome-thumbnail-factory";
 
+static void gnome_desktop_thumbnail_factory_init          (GnomeDesktopThumbnailFactory      *factory);
+static void gnome_desktop_thumbnail_factory_class_init    (GnomeDesktopThumbnailFactoryClass *class);
+
 G_DEFINE_TYPE (GnomeDesktopThumbnailFactory,
 	       gnome_desktop_thumbnail_factory,
 	       G_TYPE_OBJECT)
@@ -445,7 +339,7 @@
 {
     gboolean result;
     guchar buffer[LOAD_BUFFER_SIZE];
-    gssize bytes_read;
+    gsize bytes_read;
     GdkPixbufLoader *loader = NULL;
     GdkPixbuf *pixbuf;	
     GdkPixbufAnimation *animation;
@@ -485,13 +379,12 @@
     }
 
     if (input_stream == NULL) {
-        if (g_file_is_native (file))
-            input_stream = gs_file_read_noatime (file, NULL, &error);
-        else
-            input_stream = G_INPUT_STREAM (g_file_read (file, NULL, &error));
+        input_stream = gs_file_read_noatime (file, NULL, &error);
         if (input_stream == NULL) {
-            g_warning ("Unable to create an input stream for %s: %s", uri, error->message);
-            g_clear_error (&error);
+            if (error != NULL) {
+                g_warning ("Unable to create an input stream for %s: %s", uri, error->message);
+                g_clear_error (&error);
+            }
 	    g_object_unref (file);
             return NULL;
         }
@@ -507,11 +400,13 @@
 					  sizeof (buffer),
 					  NULL,
 					  &error);
-        if (bytes_read == -1) {
+        if (error != NULL) {
             g_warning ("Error reading from %s: %s", uri, error->message);
             g_clear_error (&error);
-            break;
         }
+	if (bytes_read == -1) {
+	    break;
+	}
 	result = TRUE;
 	if (bytes_read == 0) {
 	    break;
@@ -549,18 +444,10 @@
 	}
     }
 
-    if (loader == NULL) {
-        /* This can happen if the above loop was exited due to the
-         * g_input_stream_read() call failing. */
-        result = FALSE;
-    } else if (gdk_pixbuf_loader_close (loader, &error) == FALSE) {
-        g_warning ("Error creating thumbnail for %s: %s", uri, error->message);
-        g_clear_error (&error);
-        result = FALSE;
-    }
+    gdk_pixbuf_loader_close (loader, NULL);
 
     if (!result) {
-        g_clear_object (&loader);
+	g_object_unref (G_OBJECT (loader));
 	g_input_stream_close (input_stream, NULL, NULL);
 	g_object_unref (input_stream);
 	g_object_unref (file);
@@ -758,88 +645,6 @@
 }
 
 static void
-remove_thumbnailers_for_dir (GnomeDesktopThumbnailFactory *factory,
-                             const gchar                  *thumbnailer_dir,
-                             GFileMonitor                 *monitor)
-{
-  GnomeDesktopThumbnailFactoryPrivate *priv = factory->priv;
-  GList *l;
-  Thumbnailer *thumb;
-
-  g_mutex_lock (&priv->lock);
-
-  /* Remove all the thumbnailers inside this @thumbnailer_dir. */
-  for (l = priv->thumbnailers; l; l = g_list_next (l))
-    {
-      thumb = (Thumbnailer *)l->data;
-
-      if (g_str_has_prefix (thumb->path, thumbnailer_dir) == TRUE)
-        {
-          priv->thumbnailers = g_list_delete_link (priv->thumbnailers, l);
-          g_hash_table_foreach_remove (priv->mime_types_map,
-                                       (GHRFunc)remove_thumbnailer_from_mime_type_map,
-                                       (gpointer)thumb->path);
-          thumbnailer_unref (thumb);
-
-          break;
-        }
-    }
-
-  /* Remove the monitor for @thumbnailer_dir. */
-  priv->monitors = g_list_remove (priv->monitors, monitor);
-  g_signal_handlers_disconnect_by_func (monitor, thumbnailers_directory_changed, factory);
-
-  g_mutex_unlock (&priv->lock);
-}
-
-static void
-gnome_desktop_thumbnail_factory_load_thumbnailers_for_dir (GnomeDesktopThumbnailFactory *factory,
-                                                           const gchar                  *path)
-{
-  GnomeDesktopThumbnailFactoryPrivate *priv = factory->priv;
-  GDir *dir;
-  GFile *dir_file;
-  GFileMonitor *monitor;
-  const gchar *dirent;
-
-  dir = g_dir_open (path, 0, NULL);
-  if (!dir)
-      return;
-
-  /* Monitor dir */
-  dir_file = g_file_new_for_path (path);
-  monitor = g_file_monitor_directory (dir_file,
-                                      G_FILE_MONITOR_NONE,
-                                      NULL, NULL);
-  if (monitor)
-    {
-      g_signal_connect (monitor, "changed",
-                        G_CALLBACK (thumbnailers_directory_changed),
-                        factory);
-      priv->monitors = g_list_prepend (priv->monitors, monitor);
-    }
-  g_object_unref (dir_file);
-
-  while ((dirent = g_dir_read_name (dir)))
-    {
-      Thumbnailer *thumb;
-      gchar       *filename;
-
-      if (!g_str_has_suffix (dirent, THUMBNAILER_EXTENSION))
-          continue;
-
-      filename = g_build_filename (path, dirent, NULL);
-      thumb = thumbnailer_new (filename);
-      g_free (filename);
-
-      if (thumb)
-          gnome_desktop_thumbnail_factory_add_thumbnailer (factory, thumb);
-    }
-
-  g_dir_close (dir);
-}
-
-static void
 thumbnailers_directory_changed (GFileMonitor                 *monitor,
                                 GFile                        *file,
                                 GFile                        *other_file,
@@ -867,19 +672,6 @@
 
       g_free (path);
       break;
-    case G_FILE_MONITOR_EVENT_UNMOUNTED:
-    case G_FILE_MONITOR_EVENT_MOVED:
-      path = g_file_get_path (file);
-      remove_thumbnailers_for_dir (factory, path, monitor);
-
-      if (event_type == G_FILE_MONITOR_EVENT_MOVED)
-          gnome_desktop_thumbnail_factory_load_thumbnailers_for_dir (factory, path);
-
-      g_free (path);
-      break;
-    case G_FILE_MONITOR_EVENT_CHANGES_DONE_HINT:
-    case G_FILE_MONITOR_EVENT_ATTRIBUTE_CHANGED:
-    case G_FILE_MONITOR_EVENT_PRE_UNMOUNT:
     default:
       break;
     }
@@ -898,7 +690,47 @@
   dirs = get_thumbnailers_dirs ();
   for (i = 0; dirs[i]; i++)
     {
-      gnome_desktop_thumbnail_factory_load_thumbnailers_for_dir (factory, dirs[i]);
+      const gchar *path = dirs[i];
+      GDir *dir;
+      GFile *dir_file;
+      GFileMonitor *monitor;
+      const gchar *dirent;
+
+      dir = g_dir_open (path, 0, NULL);
+      if (!dir)
+        continue;
+
+      /* Monitor dir */
+      dir_file = g_file_new_for_path (path);
+      monitor = g_file_monitor_directory (dir_file,
+                                          G_FILE_MONITOR_NONE,
+                                          NULL, NULL);
+      if (monitor)
+        {
+          g_signal_connect (monitor, "changed",
+                            G_CALLBACK (thumbnailers_directory_changed),
+                            factory);
+          priv->monitors = g_list_prepend (priv->monitors, monitor);
+        }
+      g_object_unref (dir_file);
+
+      while ((dirent = g_dir_read_name (dir)))
+        {
+          Thumbnailer *thumb;
+          gchar       *filename;
+
+          if (!g_str_has_suffix (dirent, THUMBNAILER_EXTENSION))
+            continue;
+
+          filename = g_build_filename (path, dirent, NULL);
+          thumb = thumbnailer_new (filename);
+          g_free (filename);
+
+          if (thumb)
+            gnome_desktop_thumbnail_factory_add_thumbnailer (factory, thumb);
+        }
+
+      g_dir_close (dir);
     }
 
   priv->loaded = TRUE;
diff -Nru gnome-desktop3-3.12.0/libgnome-desktop/gnome-idle-monitor.c gnome-desktop3-3.8.4/libgnome-desktop/gnome-idle-monitor.c
--- gnome-desktop3-3.12.0/libgnome-desktop/gnome-idle-monitor.c	2014-02-03 15:41:40.000000000 +0000
+++ gnome-desktop3-3.8.4/libgnome-desktop/gnome-idle-monitor.c	2013-09-04 11:15:57.000000000 +0000
@@ -15,7 +15,8 @@
  * 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 .
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
  */
 
 #include "config.h"
@@ -23,13 +24,15 @@
 #include 
 #include 
 
+#include 
+#include 
+
 #include 
 #include 
 #include 
 
 #define GNOME_DESKTOP_USE_UNSTABLE_API
 #include "gnome-idle-monitor.h"
-#include "meta-dbus-idle-monitor.h"
 
 #define GNOME_IDLE_MONITOR_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), GNOME_TYPE_IDLE_MONITOR, GnomeIdleMonitorPrivate))
 
@@ -37,27 +40,26 @@
 
 struct _GnomeIdleMonitorPrivate
 {
-	GCancellable        *cancellable;
-	MetaDBusIdleMonitor *proxy;
-	MetaDBusObjectManagerClient *om;
-	int                  name_watch_id;
-	GHashTable          *watches;
-	GHashTable          *watches_by_upstream_id;
-	GdkDevice           *device;
-	gchar               *path;
+	Display	    *display;
+
+	GHashTable  *watches;
+	GHashTable  *alarms;
+	int	     sync_event_base;
+	XSyncCounter counter;
+
+	XSyncAlarm   user_active_alarm;
+
+	GdkDevice   *device;
 };
 
 typedef struct
 {
-	int                       ref_count;
-	gboolean                  dead;
 	GnomeIdleMonitor         *monitor;
 	guint			  id;
-	guint                     upstream_id;
 	GnomeIdleMonitorWatchFunc callback;
 	gpointer		  user_data;
 	GDestroyNotify		  notify;
-	guint64                   timeout_msec;
+	XSyncAlarm		  xalarm;
 } GnomeIdleMonitorWatch;
 
 enum
@@ -70,27 +72,79 @@
 static GParamSpec *obj_props[PROP_LAST];
 
 static void gnome_idle_monitor_initable_iface_init (GInitableIface *iface);
-static void gnome_idle_monitor_remove_watch_internal (GnomeIdleMonitor *monitor,
-						      guint             id);
-
-static void add_idle_watch (GnomeIdleMonitor *, GnomeIdleMonitorWatch *);
-static void add_active_watch (GnomeIdleMonitor *, GnomeIdleMonitorWatch *);
 
 G_DEFINE_TYPE_WITH_CODE (GnomeIdleMonitor, gnome_idle_monitor, G_TYPE_OBJECT,
 			 G_IMPLEMENT_INTERFACE (G_TYPE_INITABLE,
 						gnome_idle_monitor_initable_iface_init))
 
+static gint64
+_xsyncvalue_to_int64 (XSyncValue value)
+{
+	return ((guint64) XSyncValueHigh32 (value)) << 32
+		| (guint64) XSyncValueLow32 (value);
+}
+
+#define GINT64_TO_XSYNCVALUE(value, ret) XSyncIntsToValue (ret, value, ((guint64)value) >> 32)
+
+static XSyncAlarm
+_xsync_alarm_set (GnomeIdleMonitor	*monitor,
+		  XSyncTestType          test_type,
+		  guint64                interval,
+		  gboolean               want_events)
+{
+	XSyncAlarmAttributes attr;
+	XSyncValue	     delta;
+	guint		     flags;
+
+	flags = XSyncCACounter | XSyncCAValueType | XSyncCATestType |
+		XSyncCAValue | XSyncCADelta | XSyncCAEvents;
+
+	XSyncIntToValue (&delta, 0);
+	attr.trigger.counter = monitor->priv->counter;
+	attr.trigger.value_type = XSyncAbsolute;
+	attr.delta = delta;
+	attr.events = want_events;
+
+	GINT64_TO_XSYNCVALUE (interval, &attr.trigger.wait_value);
+	attr.trigger.test_type = test_type;
+	return XSyncCreateAlarm (monitor->priv->display, flags, &attr);
+}
+
 static void
-on_watch_fired (MetaDBusIdleMonitor *proxy,
-		guint                upstream_id,
-		GnomeIdleMonitor    *monitor)
+ensure_alarm_rescheduled (Display    *dpy,
+			  XSyncAlarm  alarm)
 {
-	GnomeIdleMonitorWatch *watch;
+	XSyncAlarmAttributes attr;
+
+	/* Some versions of Xorg have an issue where alarms aren't
+	 * always rescheduled. Calling XSyncChangeAlarm, even
+	 * without any attributes, will reschedule the alarm. */
+	XSyncChangeAlarm (dpy, alarm, 0, &attr);
+}
 
-	watch = g_hash_table_lookup (monitor->priv->watches_by_upstream_id, GINT_TO_POINTER (upstream_id));
-	if (!watch)
+static void
+set_alarm_enabled (Display    *dpy,
+		   XSyncAlarm  alarm,
+		   gboolean    enabled)
+{
+	XSyncAlarmAttributes attr;
+	attr.events = enabled;
+	XSyncChangeAlarm (dpy, alarm, XSyncCAEvents, &attr);
+}
+
+static void
+fire_watch (gpointer data,
+	    gpointer user_data)
+{
+	GnomeIdleMonitorWatch *watch = data;
+	XSyncAlarm alarm = (XSyncAlarm) user_data;
+	GnomeIdleMonitor *monitor;
+
+	if (watch->xalarm != alarm) {
 		return;
+	}
 
+	monitor = watch->monitor;
 	g_object_ref (monitor);
 
 	if (watch->callback) {
@@ -99,52 +153,166 @@
 				 watch->user_data);
 	}
 
-	if (watch->timeout_msec == 0)
-		gnome_idle_monitor_remove_watch_internal (monitor, watch->id);
+	if (watch->xalarm == monitor->priv->user_active_alarm) {
+		gnome_idle_monitor_remove_watch (monitor, watch->id);
+	}
 
 	g_object_unref (monitor);
 }
 
+static void
+handle_alarm_notify_event (GnomeIdleMonitor	    *monitor,
+			   XSyncAlarmNotifyEvent    *alarm_event)
+{
+	XSyncAlarm alarm;
+	GList *watches;
+	gboolean has_alarm;
+
+	if (alarm_event->state != XSyncAlarmActive) {
+		return;
+	}
+
+	alarm = alarm_event->alarm;
+
+	has_alarm = FALSE;
+
+	if (alarm == monitor->priv->user_active_alarm) {
+		set_alarm_enabled (monitor->priv->display,
+				   alarm,
+				   FALSE);
+		has_alarm = TRUE;
+	} else if (g_hash_table_contains (monitor->priv->alarms, (gpointer) alarm)) {
+		ensure_alarm_rescheduled (monitor->priv->display,
+					  alarm);
+		has_alarm = TRUE;
+	}
+
+	if (has_alarm) {
+		watches = g_hash_table_get_values (monitor->priv->watches);
+
+		g_list_foreach (watches,
+				fire_watch,
+				(gpointer) alarm);
+
+		g_list_free (watches);
+	}
+}
+
+static GdkFilterReturn
+xevent_filter (GdkXEvent	*xevent,
+	       GdkEvent		*event,
+	       GnomeIdleMonitor *monitor)
+{
+	XEvent		      *ev;
+	XSyncAlarmNotifyEvent *alarm_event;
+
+	ev = xevent;
+	if (ev->xany.type != monitor->priv->sync_event_base + XSyncAlarmNotify) {
+		return GDK_FILTER_CONTINUE;
+	}
+
+	alarm_event = xevent;
+	handle_alarm_notify_event (monitor, alarm_event);
+
+	return GDK_FILTER_CONTINUE;
+}
+
+static char *
+counter_name_for_device (GdkDevice *device)
+{
+	if (device) {
+		gint device_id = gdk_x11_device_get_id (device);
+		if (device_id > 0)
+			return g_strdup_printf ("DEVICEIDLETIME %d", device_id);
+	}
+
+	return g_strdup ("IDLETIME");
+}
+
+static XSyncCounter
+find_idletime_counter (GnomeIdleMonitor *monitor)
+{
+	int		    i;
+	int		    ncounters;
+	XSyncSystemCounter *counters;
+	XSyncCounter        counter = None;
+	char               *counter_name;
+
+	counter_name = counter_name_for_device (monitor->priv->device);
+	counters = XSyncListSystemCounters (monitor->priv->display, &ncounters);
+	for (i = 0; i < ncounters; i++) {
+		if (counters[i].name != NULL && strcmp (counters[i].name, counter_name) == 0) {
+			counter = counters[i].counter;
+			break;
+		}
+	}
+	XSyncFreeSystemCounterList (counters);
+	g_free (counter_name);
+
+	return counter;
+}
+
 static guint32
 get_next_watch_serial (void)
 {
-  static guint32 serial = 0;
-  g_atomic_int_inc (&serial);
-  return serial;
+	static guint32 serial = 0;
+	g_atomic_int_inc (&serial);
+	return serial;
 }
 
 static void
-idle_monitor_watch_unref (GnomeIdleMonitorWatch *watch)
+idle_monitor_watch_free (GnomeIdleMonitorWatch *watch)
 {
-	watch->ref_count--;
-	if (watch->ref_count)
+	GnomeIdleMonitor *monitor;
+
+	if (watch == NULL) {
 		return;
+	}
 
-	if (watch->notify != NULL)
-		watch->notify (watch->user_data);
+	monitor = watch->monitor;
 
+	if (watch->notify != NULL) {
+		watch->notify (watch->user_data);
+	}
 
-	if (watch->upstream_id != 0)
-		g_hash_table_remove (watch->monitor->priv->watches_by_upstream_id,
-				     GINT_TO_POINTER (watch->upstream_id));
+	if (watch->xalarm != monitor->priv->user_active_alarm) {
+		XSyncDestroyAlarm (monitor->priv->display, watch->xalarm);
+		g_hash_table_remove (monitor->priv->alarms, (gpointer) watch->xalarm);
+	}
 
 	g_slice_free (GnomeIdleMonitorWatch, watch);
 }
 
-static GnomeIdleMonitorWatch *
-idle_monitor_watch_ref (GnomeIdleMonitorWatch *watch)
+static void
+init_xsync (GnomeIdleMonitor *monitor)
 {
-	g_assert (watch->ref_count > 0);
+	int		    sync_error_base;
+	int		    res;
+	int		    major;
+	int		    minor;
+
+	res = XSyncQueryExtension (monitor->priv->display,
+				   &monitor->priv->sync_event_base,
+				   &sync_error_base);
+	if (! res) {
+		g_warning ("GnomeIdleMonitor: Sync extension not present");
+		return;
+	}
 
-	watch->ref_count++;
-	return watch;
-}
+	res = XSyncInitialize (monitor->priv->display, &major, &minor);
+	if (! res) {
+		g_warning ("GnomeIdleMonitor: Unable to initialize Sync extension");
+		return;
+	}
 
-static void
-idle_monitor_watch_destroy (GnomeIdleMonitorWatch *watch)
-{
-	watch->dead = TRUE;
-	idle_monitor_watch_unref (watch);
+	monitor->priv->counter = find_idletime_counter (monitor);
+	/* IDLETIME counter not found? */
+	if (monitor->priv->counter == None)
+		return;
+
+	monitor->priv->user_active_alarm = _xsync_alarm_set (monitor, XSyncNegativeTransition, 1, FALSE);
+
+	gdk_window_add_filter (NULL, (GdkFilterFunc)xevent_filter, monitor);
 }
 
 static void
@@ -154,21 +322,16 @@
 
 	monitor = GNOME_IDLE_MONITOR (object);
 
-	if (monitor->priv->cancellable)
-		g_cancellable_cancel (monitor->priv->cancellable);
-	g_clear_object (&monitor->priv->cancellable);
+	g_clear_pointer (&monitor->priv->watches, g_hash_table_destroy);
+	g_clear_pointer (&monitor->priv->alarms, g_hash_table_destroy);
+	g_clear_object (&monitor->priv->device);
 
-	if (monitor->priv->name_watch_id) {
-		g_bus_unwatch_name (monitor->priv->name_watch_id);
-		monitor->priv->name_watch_id = 0;
+	if (monitor->priv->user_active_alarm != None) {
+		XSyncDestroyAlarm (monitor->priv->display, monitor->priv->user_active_alarm);
+		monitor->priv->user_active_alarm = None;
 	}
 
-	g_clear_object (&monitor->priv->proxy);
-	g_clear_object (&monitor->priv->om);
-	g_clear_pointer (&monitor->priv->watches, g_hash_table_destroy);
-	g_clear_pointer (&monitor->priv->watches_by_upstream_id, g_hash_table_destroy);
-	g_clear_object (&monitor->priv->device);
-	g_clear_pointer (&monitor->priv->path, g_free);
+	gdk_window_remove_filter (NULL, (GdkFilterFunc)xevent_filter, monitor);
 
 	G_OBJECT_CLASS (gnome_idle_monitor_parent_class)->dispose (object);
 }
@@ -202,15 +365,6 @@
 	{
 	case PROP_DEVICE:
 		monitor->priv->device = g_value_dup_object (value);
-
-		g_free (monitor->priv->path);
-		if (monitor->priv->device) {
-			monitor->priv->path = g_strdup_printf ("/org/gnome/Mutter/IdleMonitor/Device%d",
-							       gdk_x11_device_get_id (monitor->priv->device));
-		} else {
-			monitor->priv->path = g_strdup ("/org/gnome/Mutter/IdleMonitor/Core");
-		}
-
 		break;
 	default:
 		G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
@@ -219,129 +373,12 @@
 }
 
 static void
-add_known_watch (gpointer key,
-		 gpointer value,
-		 gpointer user_data)
-{
-	GnomeIdleMonitor *monitor = user_data;
-	GnomeIdleMonitorWatch *watch = value;
-
-	if (watch->timeout_msec == 0)
-		add_active_watch (monitor, watch);
-	else
-		add_idle_watch (monitor, watch);
-}
-
-static void
-connect_proxy (GDBusObject	*object,
-	       GnomeIdleMonitor	*monitor)
+gnome_idle_monitor_constructed (GObject *object)
 {
-	MetaDBusIdleMonitor *proxy;
-
-	proxy = meta_dbus_object_get_idle_monitor (META_DBUS_OBJECT (object));
-	if (!proxy) {
-		g_critical ("Unable to get idle monitor from object at %s",
-			    g_dbus_object_get_object_path (object));
-		return;
-	}
-
-	monitor->priv->proxy = proxy;
-	g_signal_connect_object (proxy, "watch-fired", G_CALLBACK (on_watch_fired), monitor, 0);
-	g_hash_table_foreach (monitor->priv->watches, add_known_watch, monitor);
-}
-
-static void
-on_object_added (GDBusObjectManager	*manager,
-		 GDBusObject		*object,
-		 gpointer		 user_data)
-{
-	GnomeIdleMonitor *monitor = user_data;
-
-	if (!g_str_equal (monitor->priv->path, g_dbus_object_get_object_path (object)))
-		return;
-
-	connect_proxy (object, monitor);
-
-	g_signal_handlers_disconnect_by_func (manager, on_object_added, user_data);
-}
-
-static void
-get_proxy (GnomeIdleMonitor *monitor)
-{
-	GDBusObject *object;
-
-	object = g_dbus_object_manager_get_object (G_DBUS_OBJECT_MANAGER (monitor->priv->om),
-						   monitor->priv->path);
-	if (object) {
-		connect_proxy (object, monitor);
-		g_object_unref (object);
-		return;
-	}
-
-	g_signal_connect_object (monitor->priv->om, "object-added",
-				 G_CALLBACK (on_object_added), monitor, 0);
-}
-
-static void
-on_object_manager_ready (GObject	*source,
-			 GAsyncResult	*res,
-			 gpointer	 user_data)
-{
-	GnomeIdleMonitor *monitor = user_data;
-	GDBusObjectManager *om;
-	GError *error = NULL;
-
-	om = meta_dbus_object_manager_client_new_finish (res, &error);
-	if (!om) {
-		if (!g_error_matches (error, G_IO_ERROR, G_IO_ERROR_CANCELLED))
-			g_warning ("Failed to acquire idle monitor object manager: %s", error->message);
-		g_error_free (error);
-		return;
-	}
-
-	monitor->priv->om = META_DBUS_OBJECT_MANAGER_CLIENT (om);
-	get_proxy (monitor);
-}
-
-static void
-on_name_appeared (GDBusConnection *connection,
-		  const char      *name,
-		  const char      *name_owner,
-		  gpointer         user_data)
-{
-	GnomeIdleMonitor *monitor = user_data;
-
-	meta_dbus_object_manager_client_new (connection,
-					     G_DBUS_OBJECT_MANAGER_CLIENT_FLAGS_NONE,
-					     name_owner,
-					     "/org/gnome/Mutter/IdleMonitor",
-					     monitor->priv->cancellable,
-					     on_object_manager_ready,
-					     monitor);
-}
-
-static void
-clear_watch (gpointer key,
-	     gpointer value,
-	     gpointer user_data)
-{
-	GnomeIdleMonitorWatch *watch = value;
-	GnomeIdleMonitor *monitor = user_data;
-
-	g_hash_table_remove (monitor->priv->watches_by_upstream_id, GINT_TO_POINTER (watch->upstream_id));
-	watch->upstream_id = 0;
-}
-
-static void
-on_name_vanished (GDBusConnection *connection,
-		  const char      *name,
-		  gpointer         user_data)
-{
-	GnomeIdleMonitor *monitor = user_data;
+	GnomeIdleMonitor *monitor = GNOME_IDLE_MONITOR (object);
 
-	g_hash_table_foreach (monitor->priv->watches, clear_watch, monitor);
-	g_clear_object (&monitor->priv->proxy);
-	g_clear_object (&monitor->priv->om);
+	monitor->priv->display = GDK_DISPLAY_XDISPLAY (gdk_display_get_default ());
+	init_xsync (monitor);
 }
 
 static gboolean
@@ -353,12 +390,11 @@
 
 	monitor = GNOME_IDLE_MONITOR (initable);
 
-	monitor->priv->name_watch_id = g_bus_watch_name (G_BUS_TYPE_SESSION,
-							 "org.gnome.Mutter.IdleMonitor",
-							 G_BUS_NAME_WATCHER_FLAGS_NONE,
-							 on_name_appeared,
-							 on_name_vanished,
-							 monitor, NULL);
+	if (monitor->priv->counter == None) {
+		g_set_error_literal (error, G_IO_ERROR, G_IO_ERROR_NOT_SUPPORTED,
+				     "Per-device idletime is not supported");
+		return FALSE;
+	}
 
 	return TRUE;
 }
@@ -375,6 +411,7 @@
 	GObjectClass *object_class = G_OBJECT_CLASS (klass);
 
 	object_class->dispose = gnome_idle_monitor_dispose;
+	object_class->constructed = gnome_idle_monitor_constructed;
 	object_class->get_property = gnome_idle_monitor_get_property;
 	object_class->set_property = gnome_idle_monitor_set_property;
 
@@ -402,10 +439,9 @@
 	monitor->priv->watches = g_hash_table_new_full (NULL,
 							NULL,
 							NULL,
-							(GDestroyNotify)idle_monitor_watch_destroy);
-	monitor->priv->watches_by_upstream_id = g_hash_table_new (NULL, NULL);
+							(GDestroyNotify)idle_monitor_watch_free);
 
-	monitor->priv->cancellable = g_cancellable_new ();
+	monitor->priv->alarms = g_hash_table_new (NULL, NULL);
 }
 
 /**
@@ -424,7 +460,6 @@
 /**
  * gnome_idle_monitor_new_for_device:
  * @device: A #GdkDevice to get the idle time for.
- * @error: A pointer to a #GError or %NULL.
  *
  * Returns: a new #GnomeIdleMonitor that tracks the device-specific
  * idletime for @device. If device-specific idletime is not available,
@@ -432,16 +467,15 @@
  * idletime for all devices, use gnome_idle_monitor_new().
  */
 GnomeIdleMonitor *
-gnome_idle_monitor_new_for_device (GdkDevice  *device,
-				   GError    **error)
+gnome_idle_monitor_new_for_device (GdkDevice  *device)
 {
-	return GNOME_IDLE_MONITOR (g_initable_new (GNOME_TYPE_IDLE_MONITOR, NULL, error,
+	return GNOME_IDLE_MONITOR (g_initable_new (GNOME_TYPE_IDLE_MONITOR, NULL, NULL,
 						   "device", device, NULL));
 }
 
 static GnomeIdleMonitorWatch *
 make_watch (GnomeIdleMonitor          *monitor,
-	    guint64                    timeout_msec,
+	    XSyncAlarm                 xalarm,
 	    GnomeIdleMonitorWatchFunc  callback,
 	    gpointer                   user_data,
 	    GDestroyNotify             notify)
@@ -449,75 +483,19 @@
 	GnomeIdleMonitorWatch *watch;
 
 	watch = g_slice_new0 (GnomeIdleMonitorWatch);
-	watch->ref_count = 1;
-	watch->id = get_next_watch_serial ();
 	watch->monitor = monitor;
+	watch->id = get_next_watch_serial ();
 	watch->callback = callback;
 	watch->user_data = user_data;
 	watch->notify = notify;
-	watch->timeout_msec = timeout_msec;
+	watch->xalarm = xalarm;
 
+	g_hash_table_insert (monitor->priv->watches,
+			     GUINT_TO_POINTER (watch->id),
+			     watch);
 	return watch;
 }
 
-static void
-on_watch_added (GObject      *object,
-		GAsyncResult *result,
-		gpointer      user_data)
-{
-	GnomeIdleMonitorWatch *watch = user_data;
-	GnomeIdleMonitor *monitor;
-	GError *error;
-	GVariant *res;
-
-	error = NULL;
-	res = g_dbus_proxy_call_finish (G_DBUS_PROXY (object), result, &error);
-	if (!res) {
-		if (g_error_matches (error, G_IO_ERROR, G_IO_ERROR_CANCELLED)) {
-			g_error_free (error);
-			idle_monitor_watch_unref (watch);
-			return;
-		}
-
-		g_warning ("Failed to acquire idle monitor proxy: %s", error->message);
-		g_error_free (error);
-		idle_monitor_watch_unref (watch);
-		return;
-	}
-
-	if (watch->dead) {
-		idle_monitor_watch_unref (watch);
-		return;
-	}
-
-	monitor = watch->monitor;
-	g_variant_get (res, "(u)", &watch->upstream_id);
-	g_variant_unref (res);
-
-	g_hash_table_insert (monitor->priv->watches_by_upstream_id,
-			     GINT_TO_POINTER (watch->upstream_id), watch);
-	idle_monitor_watch_unref (watch);
-}
-
-static void
-add_idle_watch (GnomeIdleMonitor      *monitor,
-		GnomeIdleMonitorWatch *watch)
-{
-	meta_dbus_idle_monitor_call_add_idle_watch (monitor->priv->proxy,
-						    watch->timeout_msec,
-						    monitor->priv->cancellable,
-						    on_watch_added, idle_monitor_watch_ref (watch));
-}
-
-static void
-add_active_watch (GnomeIdleMonitor      *monitor,
-		  GnomeIdleMonitorWatch *watch)
-{
-	meta_dbus_idle_monitor_call_add_user_active_watch (monitor->priv->proxy,
-							   monitor->priv->cancellable,
-							   on_watch_added, idle_monitor_watch_ref (watch));
-}
-
 /**
  * gnome_idle_monitor_add_idle_watch:
  * @monitor: A #GnomeIdleMonitor
@@ -552,17 +530,13 @@
 	g_return_val_if_fail (GNOME_IS_IDLE_MONITOR (monitor), 0);
 
 	watch = make_watch (monitor,
-			    interval_msec,
+			    _xsync_alarm_set (monitor, XSyncPositiveTransition, interval_msec, TRUE),
 			    callback,
 			    user_data,
 			    notify);
 
-	g_hash_table_insert (monitor->priv->watches,
-			     GUINT_TO_POINTER (watch->id),
-			     watch);
-
-	if (monitor->priv->proxy)
-		add_idle_watch (monitor, watch);
+	g_hash_table_add (monitor->priv->alarms,
+			  (gpointer) watch->xalarm);
 
 	return watch->id;
 }
@@ -593,19 +567,16 @@
 
 	g_return_val_if_fail (GNOME_IS_IDLE_MONITOR (monitor), 0);
 
+	set_alarm_enabled (monitor->priv->display,
+			   monitor->priv->user_active_alarm,
+			   TRUE);
+
 	watch = make_watch (monitor,
-			    0,
+			    monitor->priv->user_active_alarm,
 			    callback,
 			    user_data,
 			    notify);
 
-	g_hash_table_insert (monitor->priv->watches,
-			     GUINT_TO_POINTER (watch->id),
-			     watch);
-
-	if (monitor->priv->proxy)
-		add_active_watch (monitor, watch);
-
 	return watch->id;
 }
 
@@ -622,26 +593,8 @@
 gnome_idle_monitor_remove_watch (GnomeIdleMonitor *monitor,
 				 guint		   id)
 {
-	GnomeIdleMonitorWatch *watch;
-
 	g_return_if_fail (GNOME_IS_IDLE_MONITOR (monitor));
 
-	watch = g_hash_table_lookup (monitor->priv->watches, GINT_TO_POINTER (id));
-	if (!watch)
-		return;
-
-	if (watch->upstream_id)
-		meta_dbus_idle_monitor_call_remove_watch (monitor->priv->proxy,
-							  watch->upstream_id,
-							  NULL, NULL, NULL);
-
-	gnome_idle_monitor_remove_watch_internal (monitor, id);
-}
-
-static void
-gnome_idle_monitor_remove_watch_internal (GnomeIdleMonitor *monitor,
-					  guint             id)
-{
 	g_hash_table_remove (monitor->priv->watches,
 			     GUINT_TO_POINTER (id));
 }
@@ -650,17 +603,15 @@
  * gnome_idle_monitor_get_idletime:
  * @monitor: A #GnomeIdleMonitor
  *
- * Returns: The current idle time, in milliseconds
+ * Returns: The current idle time, in milliseconds, or -1 for not supported
  */
-guint64
+gint64
 gnome_idle_monitor_get_idletime (GnomeIdleMonitor *monitor)
 {
-	guint64 value;
+	XSyncValue value;
 
-	value = 0;
-	if (monitor->priv->proxy)
-		meta_dbus_idle_monitor_call_get_idletime_sync (monitor->priv->proxy, &value,
-							       NULL, NULL);
+	if (!XSyncQueryCounter (monitor->priv->display, monitor->priv->counter, &value))
+		return -1;
 
-	return value;
+	return _xsyncvalue_to_int64 (value);
 }
diff -Nru gnome-desktop3-3.12.0/libgnome-desktop/gnome-idle-monitor.h gnome-desktop3-3.8.4/libgnome-desktop/gnome-idle-monitor.h
--- gnome-desktop3-3.12.0/libgnome-desktop/gnome-idle-monitor.h	2014-02-03 15:41:40.000000000 +0000
+++ gnome-desktop3-3.8.4/libgnome-desktop/gnome-idle-monitor.h	2013-09-04 11:15:57.000000000 +0000
@@ -15,7 +15,8 @@
  * 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 .
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
  *
  * Authors: William Jon McCann 
  */
@@ -61,8 +62,7 @@
 GType              gnome_idle_monitor_get_type     (void);
 
 GnomeIdleMonitor * gnome_idle_monitor_new          (void);
-GnomeIdleMonitor * gnome_idle_monitor_new_for_device (GdkDevice  *device,
-						      GError    **error);
+GnomeIdleMonitor * gnome_idle_monitor_new_for_device (GdkDevice *device);
 
 guint              gnome_idle_monitor_add_idle_watch    (GnomeIdleMonitor         *monitor,
 							 guint64                   interval_msec,
@@ -78,7 +78,7 @@
 void               gnome_idle_monitor_remove_watch (GnomeIdleMonitor         *monitor,
                                                     guint                     id);
 
-guint64            gnome_idle_monitor_get_idletime (GnomeIdleMonitor         *monitor);
+gint64             gnome_idle_monitor_get_idletime (GnomeIdleMonitor         *monitor);
 
 G_END_DECLS
 
diff -Nru gnome-desktop3-3.12.0/libgnome-desktop/gnome-languages.c gnome-desktop3-3.8.4/libgnome-desktop/gnome-languages.c
--- gnome-desktop3-3.12.0/libgnome-desktop/gnome-languages.c	2014-02-03 15:41:40.000000000 +0000
+++ gnome-desktop3-3.8.4/libgnome-desktop/gnome-languages.c	2013-03-17 01:49:53.000000000 +0000
@@ -14,7 +14,8 @@
  * 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 .
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
  *
  * Written by : William Jon McCann 
  *              Ray Strode 
@@ -43,7 +44,10 @@
 #ifndef __LC_LAST
 #define __LC_LAST       13
 #endif
+#include "locarchive.h"
 
+#define ARCHIVE_FILE LIBLOCALEDIR "/locale-archive"
+#define SYSTEM_ARCHIVE_FILE "/usr/lib/locale/locale-archive"
 #define ISO_CODES_DATADIR ISO_CODES_PREFIX "/share/xml/iso-codes"
 #define ISO_CODES_LOCALESDIR ISO_CODES_PREFIX "/share/locale"
 
@@ -306,7 +310,11 @@
 {
         char     *old_locale;
         gboolean  is_valid;
+#ifdef WITH_INCOMPLETE_LOCALES
+        int lc_type_id = LC_CTYPE;
+#else
         int lc_type_id = LC_MESSAGES;
+#endif
 
         old_locale = g_strdup (setlocale (lc_type_id, NULL));
         is_valid = setlocale (lc_type_id, language_name) != NULL;
@@ -437,11 +445,22 @@
         g_free (name);
         name = NULL;
 
+#ifdef WITH_INCOMPLETE_LOCALES
+        if (utf8_only) {
+                if (locale->territory_code == NULL || locale->modifier) {
+                        g_debug ("Ignoring '%s' as a locale, since it lacks territory code or modifier", name);
+                        gnome_locale_free (locale);
+                        return FALSE;
+                }
+        }
+#endif
+
         locale->id = construct_language_name (locale->language_code, locale->territory_code,
                                               NULL, locale->modifier);
         locale->name = construct_language_name (locale->language_code, locale->territory_code,
                                                 locale->codeset, locale->modifier);
 
+#ifndef WITH_INCOMPLETE_LOCALES
         if (!gnome_language_has_translations (locale->name) &&
             !gnome_language_has_translations (locale->id) &&
             !gnome_language_has_translations (locale->language_code) &&
@@ -450,6 +469,7 @@
                 gnome_locale_free (locale);
                 return FALSE;
         }
+#endif
 
         if (!utf8_only) {
                 g_free (locale->id);
@@ -469,6 +489,97 @@
         return TRUE;
 }
 
+struct nameent
+{
+        char    *name;
+        uint32_t locrec_offset;
+};
+
+static gboolean
+mapped_file_new_allow_noent (const char   *path,
+                             GMappedFile **out_mfile,
+                             GError      **error)
+{
+        gboolean ret = FALSE;
+        GError *tmp_error = NULL;
+        GMappedFile *mfile = NULL;
+
+        mfile = g_mapped_file_new (path, FALSE, &tmp_error);
+        if (mfile == NULL) {
+                if (!g_error_matches (tmp_error, G_FILE_ERROR, G_FILE_ERROR_NOENT)) {
+                        g_propagate_error (error, tmp_error);
+                        goto out;
+                }
+                g_clear_error (&tmp_error);
+        }
+
+        ret = TRUE;
+ out:
+        *out_mfile = mfile;
+        return ret;
+}
+
+static gboolean
+collect_locales_from_archive (gboolean  *out_found_locales,
+                              GError   **error)
+{
+        gboolean            ret = FALSE;
+        GMappedFile        *mapped;
+        char               *addr;
+        struct locarhead   *head;
+        struct namehashent *namehashtab;
+        struct nameent     *names = NULL;
+        uint32_t            used;
+        uint32_t            cnt;
+        gsize               len;
+        gboolean            locales_collected = FALSE;
+
+        if (!mapped_file_new_allow_noent (ARCHIVE_FILE, &mapped, error))
+                goto out;
+        if (!mapped) {
+                if (!mapped_file_new_allow_noent (SYSTEM_ARCHIVE_FILE, &mapped, error))
+                        goto out;
+        }
+        if (!mapped) {
+                goto out_success;
+        }
+
+        addr = g_mapped_file_get_contents (mapped);
+        len = g_mapped_file_get_length (mapped);
+
+        head = (struct locarhead *) addr;
+        if (head->namehash_offset + head->namehash_size > len
+            || head->string_offset + head->string_size > len
+            || head->locrectab_offset + head->locrectab_size > len
+            || head->sumhash_offset + head->sumhash_size > len) {
+                goto out;
+        }
+
+        namehashtab = (struct namehashent *) (addr + head->namehash_offset);
+
+        names = (struct nameent *) g_new0 (struct nameent, head->namehash_used);
+        for (cnt = used = 0; cnt < head->namehash_size; ++cnt) {
+                if (namehashtab[cnt].locrec_offset != 0) {
+                        names[used].name = addr + namehashtab[cnt].name_offset;
+                        names[used++].locrec_offset = namehashtab[cnt].locrec_offset;
+                }
+        }
+
+        for (cnt = 0; cnt < used; ++cnt) {
+                if (add_locale (names[cnt].name, TRUE))
+                        locales_collected = TRUE;
+        }
+
+
+ out_success:
+        ret = TRUE;
+        *out_found_locales = locales_collected;
+ out:
+        g_free (names);
+        g_clear_pointer (&mapped, g_mapped_file_unref);
+        return ret;
+}
+
 static int
 select_dirs (const struct dirent *dirent)
 {
@@ -520,37 +631,6 @@
         return found_locales;
 }
 
-static gboolean
-collect_locales_from_localebin (void)
-{
-        gboolean found_locales = FALSE;
-        gchar    *argv[] = { "locale", "-a", NULL };
-        gchar    *output;
-        gchar    **lines, **linep;
-
-        if (g_spawn_sync (NULL, argv, NULL,
-                          G_SPAWN_SEARCH_PATH|G_SPAWN_STDERR_TO_DEV_NULL,
-                          NULL, NULL, &output, NULL, NULL, NULL) == FALSE)
-                return FALSE;
-
-        g_return_val_if_fail (output != NULL, FALSE);
-
-        lines = g_strsplit (output, "\n", 0);
-        if (lines) {
-                linep = lines;
-                while (*linep) {
-                        if (*linep[0] && add_locale (*linep, TRUE))
-                                found_locales = TRUE;
-                        linep++;
-                }
-                g_strfreev (lines);
-        }
-
-        g_free (output);
-
-        return found_locales;
-}
-
 static void
 count_languages_and_territories (void)
 {
@@ -587,21 +667,28 @@
 static void
 collect_locales (void)
 {
-        gboolean found_localebin_locales = FALSE;
+        gboolean found_archive_locales = FALSE;
         gboolean found_dir_locales = FALSE;
+        GError *error = NULL;
 
         if (gnome_available_locales_map == NULL) {
                 gnome_available_locales_map = g_hash_table_new_full (g_str_hash, g_str_equal, g_free, (GDestroyNotify) gnome_locale_free);
         }
 
-        found_localebin_locales = collect_locales_from_localebin ();
+
+        if (!collect_locales_from_archive (&found_archive_locales, &error)) {
+                g_warning ("Failed to load locales from archive: %s", error->message);
+                g_clear_error (&error);
+        }
 
         found_dir_locales = collect_locales_from_directory ();
 
-        if (!(found_localebin_locales || found_dir_locales)) {
+        if (!(found_archive_locales || found_dir_locales)) {
+#ifndef WITH_INCOMPLETE_LOCALES
                 g_warning ("Could not read list of available locales from libc, "
                            "guessing possible locales from available translations, "
                            "but list may be incomplete!");
+#endif
         }
 
 	count_languages_and_territories ();
diff -Nru gnome-desktop3-3.12.0/libgnome-desktop/gnome-languages.h gnome-desktop3-3.8.4/libgnome-desktop/gnome-languages.h
--- gnome-desktop3-3.12.0/libgnome-desktop/gnome-languages.h	2014-02-03 15:41:40.000000000 +0000
+++ gnome-desktop3-3.8.4/libgnome-desktop/gnome-languages.h	2013-03-17 01:49:53.000000000 +0000
@@ -14,7 +14,8 @@
  * 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 .
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
  *
  * Written by: Ray Strode
  *             William Jon McCann
diff -Nru gnome-desktop3-3.12.0/libgnome-desktop/gnome-rr.c gnome-desktop3-3.8.4/libgnome-desktop/gnome-rr.c
--- gnome-desktop3-3.12.0/libgnome-desktop/gnome-rr.c	2014-03-11 18:06:31.000000000 +0000
+++ gnome-desktop3-3.8.4/libgnome-desktop/gnome-rr.c	2013-09-04 11:15:57.000000000 +0000
@@ -1,6 +1,6 @@
 /* gnome-rr.c
  *
- * Copyright 2007, 2008, 2013 Red Hat, Inc.
+ * Copyright 2007, 2008, Red Hat, Inc.
  * 
  * This file is part of the Gnome Library.
  * 
@@ -20,7 +20,6 @@
  * Boston, MA 02110-1301, USA.
  * 
  * Author: Soren Sandmann 
- *         Giovanni Campagna 
  */
 
 #define GNOME_DESKTOP_USE_UNSTABLE_API
@@ -28,9 +27,14 @@
 #include 
 #include 
 #include 
+#include 
+
+#include 
 
 #include 
 #include 
+#include 
+#include 
 
 #undef GNOME_DISABLE_DEPRECATED
 #include "gnome-rr.h"
@@ -39,6 +43,9 @@
 #include "edid.h"
 #include "gnome-rr-private.h"
 
+#define DISPLAY(o) ((o)->info->screen->priv->xdisplay)
+
+#define SERVERS_RANDR_IS_AT_LEAST_1_3(priv) (priv->rr_major_version > 1 || (priv->rr_major_version == 1 && priv->rr_minor_version >= 3))
 
 enum {
     SCREEN_PROP_0,
@@ -58,36 +65,34 @@
 struct GnomeRROutput
 {
     ScreenInfo *	info;
-    guint		id;
-    glong               winsys_id;
+    RROutput		id;
     
     char *		name;
     char *		display_name;
     GnomeRRCrtc *	current_crtc;
+    gboolean		connected;
+    gulong		width_mm;
+    gulong		height_mm;
     GnomeRRCrtc **	possible_crtcs;
     GnomeRROutput **	clones;
     GnomeRRMode **	modes;
+    int			n_preferred;
+    guint8 *		edid_data;
+    gsize		edid_size;
+    char *              connector_type;
+    gint		backlight_min;
+    gint		backlight_max;
+};
 
-    char *              vendor;
-    char *              product;
-    char *              serial;
-    int                 width_mm;
-    int                 height_mm;
-    GBytes *            edid;
-    char *              edid_file;
-
-    int                 backlight;
-    int                 min_backlight_step;
-
-    gboolean            is_primary;
-    gboolean            is_presentation;
+struct GnomeRROutputWrap
+{
+    RROutput		id;
 };
 
 struct GnomeRRCrtc
 {
     ScreenInfo *	info;
-    guint		id;
-    glong               winsys_id;
+    RRCrtc		id;
     
     GnomeRRMode *	current_mode;
     GnomeRROutput **	current_outputs;
@@ -95,16 +100,16 @@
     int			x;
     int			y;
     
-    enum wl_output_transform transform;
-    int                 all_transforms;
+    GnomeRRRotation	current_rotation;
+    GnomeRRRotation	rotations;
     int			gamma_size;
 };
 
 struct GnomeRRMode
 {
     ScreenInfo *	info;
-    guint		id;
-    glong               winsys_id;
+    RRMode		id;
+    char *		name;
     int			width;
     int			height;
     int			freq;		/* in mHz */
@@ -112,29 +117,31 @@
 
 /* GnomeRRCrtc */
 static GnomeRRCrtc *  crtc_new          (ScreenInfo         *info,
-					 guint               id);
+					 RRCrtc              id);
 static GnomeRRCrtc *  crtc_copy         (const GnomeRRCrtc  *from);
 static void           crtc_free         (GnomeRRCrtc        *crtc);
 
-static void           crtc_initialize   (GnomeRRCrtc        *crtc,
-					 GVariant           *res);
+static gboolean       crtc_initialize   (GnomeRRCrtc        *crtc,
+					 XRRScreenResources *res,
+					 GError            **error);
 
 /* GnomeRROutput */
 static GnomeRROutput *output_new        (ScreenInfo         *info,
-					 guint               id);
+					 RROutput            id);
 
-static void           output_initialize (GnomeRROutput      *output,
-					 GVariant           *res);
+static gboolean       output_initialize (GnomeRROutput      *output,
+					 XRRScreenResources *res,
+					 GError            **error);
 
 static GnomeRROutput *output_copy       (const GnomeRROutput *from);
 static void           output_free       (GnomeRROutput      *output);
 
 /* GnomeRRMode */
 static GnomeRRMode *  mode_new          (ScreenInfo         *info,
-					 guint               id);
+					 RRMode              id);
 
 static void           mode_initialize   (GnomeRRMode        *mode,
-					 GVariant           *info);
+					 XRRModeInfo        *info);
 
 static GnomeRRMode *  mode_copy         (const GnomeRRMode  *from);
 static void           mode_free         (GnomeRRMode        *mode);
@@ -144,10 +151,8 @@
 static void gnome_rr_screen_get_property (GObject*, guint, GValue*, GParamSpec*);
 static gboolean gnome_rr_screen_initable_init (GInitable*, GCancellable*, GError**);
 static void gnome_rr_screen_initable_iface_init (GInitableIface *iface);
-static void gnome_rr_screen_async_initable_init (GAsyncInitableIface *iface);
 G_DEFINE_TYPE_WITH_CODE (GnomeRRScreen, gnome_rr_screen, G_TYPE_OBJECT,
-                         G_IMPLEMENT_INTERFACE (G_TYPE_INITABLE, gnome_rr_screen_initable_iface_init)
-                         G_IMPLEMENT_INTERFACE (G_TYPE_ASYNC_INITABLE, gnome_rr_screen_async_initable_init))
+        G_IMPLEMENT_INTERFACE (G_TYPE_INITABLE, gnome_rr_screen_initable_iface_init))
 
 G_DEFINE_BOXED_TYPE (GnomeRRCrtc, gnome_rr_crtc, crtc_copy, crtc_free)
 G_DEFINE_BOXED_TYPE (GnomeRROutput, gnome_rr_output, output_copy, output_free)
@@ -171,7 +176,7 @@
 
 /* Screen */
 static GnomeRROutput *
-gnome_rr_output_by_id (ScreenInfo *info, guint id)
+gnome_rr_output_by_id (ScreenInfo *info, RROutput id)
 {
     GnomeRROutput **output;
     
@@ -187,7 +192,7 @@
 }
 
 static GnomeRRCrtc *
-crtc_by_id (ScreenInfo *info, guint id)
+crtc_by_id (ScreenInfo *info, RRCrtc id)
 {
     GnomeRRCrtc **crtc;
     
@@ -204,7 +209,7 @@
 }
 
 static GnomeRRMode *
-mode_by_id (ScreenInfo *info, guint id)
+mode_by_id (ScreenInfo *info, RRMode id)
 {
     GnomeRRMode **mode;
     
@@ -228,6 +233,13 @@
     
     g_assert (info != NULL);
 
+    if (info->resources)
+    {
+	XRRFreeScreenResources (info->resources);
+	
+	info->resources = NULL;
+    }
+    
     if (info->outputs)
     {
 	for (output = info->outputs; *output; ++output)
@@ -293,6 +305,9 @@
 
 	output1 = info->outputs[i];
 	
+	if (!output1->connected)
+	    continue;
+	
 	for (j = 0; output1->modes[j] != NULL; ++j)
 	{
 	    GnomeRRMode *mode = output1->modes[j];
@@ -304,6 +319,9 @@
 	    {
 		output2 = info->outputs[k];
 		
+		if (!output2->connected)
+		    continue;
+		
 		if (!has_similar_mode (output2, mode))
 		{
 		    valid = FALSE;
@@ -321,44 +339,25 @@
     info->clone_modes = (GnomeRRMode **)g_ptr_array_free (result, FALSE);
 }
 
-static void
+static gboolean
 fill_screen_info_from_resources (ScreenInfo *info,
-				 guint       serial,
-				 GVariant   *crtcs,
-				 GVariant   *outputs,
-				 GVariant   *modes,
-				 int         max_width,
-				 int         max_height)
+				 XRRScreenResources *resources,
+				 GError **error)
 {
     int i;
     GPtrArray *a;
     GnomeRRCrtc **crtc;
     GnomeRROutput **output;
-    GnomeRRMode **mode;
-    guint ncrtc, noutput, nmode;
-    guint id;
 
-    info->min_width = 312;
-    info->min_height = 312;
-    info->max_width = max_width;
-    info->max_height = max_height;
-    info->serial = serial;
-
-    ncrtc = g_variant_n_children (crtcs);
-    noutput = g_variant_n_children (outputs);
-    nmode = g_variant_n_children (modes);
+    info->resources = resources;
 
     /* We create all the structures before initializing them, so
      * that they can refer to each other.
      */
     a = g_ptr_array_new ();
-    for (i = 0; i < ncrtc; ++i)
+    for (i = 0; i < resources->ncrtc; ++i)
     {
-	GnomeRRCrtc *crtc;
-
-	g_variant_get_child (crtcs, i, META_CRTC_STRUCT, &id,
-			     NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL);
-	crtc = crtc_new (info, id);
+	GnomeRRCrtc *crtc = crtc_new (info, resources->crtcs[i]);
 
 	g_ptr_array_add (a, crtc);
     }
@@ -366,13 +365,9 @@
     info->crtcs = (GnomeRRCrtc **)g_ptr_array_free (a, FALSE);
 
     a = g_ptr_array_new ();
-    for (i = 0; i < noutput; ++i)
+    for (i = 0; i < resources->noutput; ++i)
     {
-	GnomeRROutput *output;
- 
-	g_variant_get_child (outputs, i, META_OUTPUT_STRUCT, &id,
-			     NULL, NULL, NULL, NULL, NULL, NULL, NULL);
-	output = output_new (info, id);
+	GnomeRROutput *output = output_new (info, resources->outputs[i]);
 
 	g_ptr_array_add (a, output);
     }
@@ -380,13 +375,9 @@
     info->outputs = (GnomeRROutput **)g_ptr_array_free (a, FALSE);
 
     a = g_ptr_array_new ();
-    for (i = 0;  i < nmode; ++i)
+    for (i = 0;  i < resources->nmode; ++i)
     {
-	GnomeRRMode *mode;
-
-	g_variant_get_child (modes, i, META_MONITOR_MODE_STRUCT, &id,
-			     NULL, NULL, NULL, NULL);
-	mode = mode_new (info, id);
+	GnomeRRMode *mode = mode_new (info, resources->modes[i].id);
 
 	g_ptr_array_add (a, mode);
     }
@@ -394,66 +385,140 @@
     info->modes = (GnomeRRMode **)g_ptr_array_free (a, FALSE);
 
     /* Initialize */
-    for (i = 0, crtc = info->crtcs; *crtc; ++i, ++crtc)
+    for (crtc = info->crtcs; *crtc; ++crtc)
     {
-	crtc_initialize (*crtc, g_variant_get_child_value (crtcs, i));
+	if (!crtc_initialize (*crtc, resources, error))
+	    return FALSE;
     }
 
-    for (i = 0, output = info->outputs; *output; ++i, ++output)
+    for (output = info->outputs; *output; ++output)
     {
-	output_initialize (*output, g_variant_get_child_value (outputs, i));
+	if (!output_initialize (*output, resources, error))
+	    return FALSE;
     }
 
-    for (i = 0, mode = info->modes; *mode; ++i, ++mode)
+    for (i = 0; i < resources->nmode; ++i)
     {
-	mode_initialize (*mode, g_variant_get_child_value (modes, i));
+	GnomeRRMode *mode = mode_by_id (info, resources->modes[i].id);
+
+	mode_initialize (mode, &(resources->modes[i]));
     }
 
     gather_clone_modes (info);
+
+    return TRUE;
 }
 
 static gboolean
-fill_out_screen_info (ScreenInfo  *info,
-		      GError     **error)
+fill_out_screen_info (Display *xdisplay,
+		      Window xroot,
+		      ScreenInfo *info,
+		      gboolean needs_reprobe,
+		      GError **error)
 {
+    XRRScreenResources *resources;
     GnomeRRScreenPrivate *priv;
-    guint serial;
-    GVariant *crtcs, *outputs, *modes;
-    int max_width, max_height;
-
+    
+    g_assert (xdisplay != NULL);
     g_assert (info != NULL);
 
     priv = info->screen->priv;
 
-    if (!meta_dbus_display_config_call_get_resources_sync (priv->proxy,
-							   &serial,
-							   &crtcs,
-							   &outputs,
-							   &modes,
-							   &max_width,
-							   &max_height,
-							   NULL,
-							   error))
+    /* First update the screen resources */
+
+    if (needs_reprobe)
+        resources = XRRGetScreenResources (xdisplay, xroot);
+    else
+    {
+	/* XRRGetScreenResourcesCurrent is less expensive than
+	 * XRRGetScreenResources, however it is available only
+	 * in RandR 1.3 or higher
+	 */
+        if (SERVERS_RANDR_IS_AT_LEAST_1_3 (priv))
+            resources = XRRGetScreenResourcesCurrent (xdisplay, xroot);
+        else
+            resources = XRRGetScreenResources (xdisplay, xroot);
+    }
+
+    if (resources)
+    {
+	if (!fill_screen_info_from_resources (info, resources, error))
+	    return FALSE;
+    }
+    else
+    {
+	g_set_error (error, GNOME_RR_ERROR, GNOME_RR_ERROR_RANDR_ERROR,
+		     /* Translators: a CRTC is a CRT Controller (this is X terminology). */
+		     _("could not get the screen resources (CRTCs, outputs, modes)"));
 	return FALSE;
+    }
+
+    /* Then update the screen size range.  We do this after XRRGetScreenResources() so that
+     * the X server will already have an updated view of the outputs.
+     */
+
+    if (needs_reprobe) {
+	gboolean success;
+
+        gdk_error_trap_push ();
+	success = XRRGetScreenSizeRange (xdisplay, xroot,
+					 &(info->min_width),
+					 &(info->min_height),
+					 &(info->max_width),
+					 &(info->max_height));
+	gdk_flush ();
+	if (gdk_error_trap_pop ()) {
+	    g_set_error (error, GNOME_RR_ERROR, GNOME_RR_ERROR_UNKNOWN,
+			 _("unhandled X error while getting the range of screen sizes"));
+	    return FALSE;
+	}
+
+	if (!success) {
+	    g_set_error (error, GNOME_RR_ERROR, GNOME_RR_ERROR_RANDR_ERROR,
+			 _("could not get the range of screen sizes"));
+            return FALSE;
+        }
+    }
+    else
+    {
+        gnome_rr_screen_get_ranges (info->screen, 
+					 &(info->min_width),
+					 &(info->max_width),
+					 &(info->min_height),
+					 &(info->max_height));
+    }
+
+    info->primary = None;
+    if (SERVERS_RANDR_IS_AT_LEAST_1_3 (priv)) {
+        gdk_error_trap_push ();
+        info->primary = XRRGetOutputPrimary (xdisplay, xroot);
+	gdk_error_trap_pop_ignored ();
+    }
+
+    /* can the screen do DPMS? */
+    gdk_error_trap_push ();
+    priv->dpms_capable = DPMSCapable (priv->xdisplay);
+    gdk_error_trap_pop_ignored ();
 
-    fill_screen_info_from_resources (info, serial, crtcs, outputs,
-				     modes, max_width, max_height);
     return TRUE;
 }
 
 static ScreenInfo *
-screen_info_new (GnomeRRScreen *screen, GError **error)
+screen_info_new (GnomeRRScreen *screen, gboolean needs_reprobe, GError **error)
 {
     ScreenInfo *info = g_new0 (ScreenInfo, 1);
+    GnomeRRScreenPrivate *priv;
 
     g_assert (screen != NULL);
 
+    priv = screen->priv;
+
     info->outputs = NULL;
     info->crtcs = NULL;
     info->modes = NULL;
     info->screen = screen;
     
-    if (fill_out_screen_info (info, error))
+    if (fill_out_screen_info (priv->xdisplay, priv->xroot, info, needs_reprobe, error))
     {
 	return info;
     }
@@ -465,13 +530,13 @@
 }
 
 static GnomeRROutput *
-find_output_by_winsys_id (GnomeRROutput **haystack, glong winsys_id)
+find_output_by_id (GnomeRROutput **haystack, guint32 id)
 {
     guint i;
 
     for (i = 0; haystack[i] != NULL; i++)
     {
-	if (haystack[i]->winsys_id == winsys_id)
+	if (gnome_rr_output_get_id (haystack[i]) == id)
 	    return haystack[i];
     }
     return NULL;
@@ -481,98 +546,183 @@
 diff_outputs_and_emit_signals (ScreenInfo *old, ScreenInfo *new)
 {
     guint i;
-    gulong winsys_id_old, winsys_id_new;
+    guint32 id_old, id_new;
     GnomeRROutput *output_old;
     GnomeRROutput *output_new;
 
-    /* have any outputs been removed/disconnected */
+    /* have any outputs been removed or disconnected */
     for (i = 0; old->outputs[i] != NULL; i++)
     {
-        winsys_id_old = old->outputs[i]->winsys_id;
-        output_new = find_output_by_winsys_id (new->outputs, winsys_id_old);
+        id_old = gnome_rr_output_get_id (old->outputs[i]);
+        output_new = find_output_by_id (new->outputs, id_old);
 	if (output_new == NULL)
 	{
+	    /* output removed (and disconnected) */
+	    if (gnome_rr_output_is_connected (old->outputs[i]))
+	     {
+	        g_signal_emit (G_OBJECT (new->screen),
+			       screen_signals[SCREEN_OUTPUT_DISCONNECTED], 0,
+			       old->outputs[i]);
+             }
+	    continue;
+	}
+	if (gnome_rr_output_is_connected (old->outputs[i]) &&
+	    !gnome_rr_output_is_connected (output_new))
+	{
+	    /* output disconnected */
 	    g_signal_emit (G_OBJECT (new->screen),
 			   screen_signals[SCREEN_OUTPUT_DISCONNECTED], 0,
 			   old->outputs[i]);
-	}
+        }
     }
 
-    /* have any outputs been created/connected */
+    /* have any outputs been created or connected */
     for (i = 0; new->outputs[i] != NULL; i++)
     {
-        winsys_id_new = new->outputs[i]->winsys_id;
-        output_old = find_output_by_winsys_id (old->outputs, winsys_id_new);
+        id_new = gnome_rr_output_get_id (new->outputs[i]);
+        output_old = find_output_by_id (old->outputs, id_new);
 	if (output_old == NULL)
 	{
+	    /* output created */
+	    if (gnome_rr_output_is_connected (new->outputs[i]))
+	     {
+	        g_signal_emit (G_OBJECT (new->screen),
+			       screen_signals[SCREEN_OUTPUT_CONNECTED], 0,
+			       new->outputs[i]);
+            }
+	    continue;
+	}
+	if (!gnome_rr_output_is_connected (output_old) &&
+	    gnome_rr_output_is_connected (new->outputs[i]))
+	{
+	    /* output connected */
 	    g_signal_emit (G_OBJECT (new->screen),
 			   screen_signals[SCREEN_OUTPUT_CONNECTED], 0,
 			   new->outputs[i]);
-	}
+         }
     }
 }
 
-typedef enum {
-    REFRESH_NONE = 0,
-    REFRESH_IGNORE_SERIAL = 1,
-    REFRESH_FORCE_CALLBACK = 2
-} RefreshFlags;
-
 static gboolean
-screen_update (GnomeRRScreen *screen, RefreshFlags flags, GError **error)
+screen_update (GnomeRRScreen *screen, gboolean force_callback, gboolean needs_reprobe, GError **error)
 {
     ScreenInfo *info;
     gboolean changed = FALSE;
     
     g_assert (screen != NULL);
 
-    info = screen_info_new (screen, error);
+    info = screen_info_new (screen, needs_reprobe, error);
     if (!info)
 	    return FALSE;
 
-    if ((flags & REFRESH_IGNORE_SERIAL) || info->serial != screen->priv->info->serial)
+    if (info->resources->configTimestamp != screen->priv->info->resources->configTimestamp)
 	    changed = TRUE;
 
     /* work out if any outputs have changed connected state */
     diff_outputs_and_emit_signals (screen->priv->info, info);
 
     screen_info_free (screen->priv->info);
+	
     screen->priv->info = info;
 
-    if (changed || (flags & REFRESH_FORCE_CALLBACK))
+    if (changed || force_callback)
         g_signal_emit (G_OBJECT (screen), screen_signals[SCREEN_CHANGED], 0);
     
     return changed;
 }
 
-static void
-screen_on_monitors_changed (MetaDBusDisplayConfig *proxy,
-			    gpointer data)
+static GdkFilterReturn
+screen_on_event (GdkXEvent *xevent,
+		 GdkEvent *event,
+		 gpointer data)
 {
     GnomeRRScreen *screen = data;
+    GnomeRRScreenPrivate *priv = screen->priv;
+    XEvent *e = xevent;
+    int event_num;
+
+    if (!e)
+	return GDK_FILTER_CONTINUE;
+
+    event_num = e->type - priv->randr_event_base;
+
+    if (event_num == RRScreenChangeNotify) {
+	/* We don't reprobe the hardware; we just fetch the X server's latest
+	 * state.  The server already knows the new state of the outputs; that's
+	 * why it sent us an event!
+	 */
+        screen_update (screen, TRUE, FALSE, NULL); /* NULL-GError */
+#if 0
+	/* Enable this code to get a dialog showing the RANDR timestamps, for debugging purposes */
+	{
+	    GtkWidget *dialog;
+	    XRRScreenChangeNotifyEvent *rr_event;
+	    static int dialog_num;
+
+	    rr_event = (XRRScreenChangeNotifyEvent *) e;
+
+	    dialog = gtk_message_dialog_new (NULL,
+					     0,
+					     GTK_MESSAGE_INFO,
+					     GTK_BUTTONS_CLOSE,
+					     "RRScreenChangeNotify timestamps (%d):\n"
+					     "event change: %u\n"
+					     "event config: %u\n"
+					     "event serial: %lu\n"
+					     "----------------------"
+					     "screen change: %u\n"
+					     "screen config: %u\n",
+					     dialog_num++,
+					     (guint32) rr_event->timestamp,
+					     (guint32) rr_event->config_timestamp,
+					     rr_event->serial,
+					     (guint32) priv->info->resources->timestamp,
+					     (guint32) priv->info->resources->configTimestamp);
+	    g_signal_connect (dialog, "response",
+			      G_CALLBACK (gtk_widget_destroy), NULL);
+	    gtk_widget_show (dialog);
+	}
+#endif
+    }
+#if 0
+    /* WHY THIS CODE IS DISABLED:
+     *
+     * Note that in gnome_rr_screen_new(), we only select for
+     * RRScreenChangeNotifyMask.  We used to select for other values in
+     * RR*NotifyMask, but we weren't really doing anything useful with those
+     * events.  We only care about "the screens changed in some way or another"
+     * for now.
+     *
+     * If we ever run into a situtation that could benefit from processing more
+     * detailed events, we can enable this code again.
+     *
+     * Note that the X server sends RRScreenChangeNotify in conjunction with the
+     * more detailed events from RANDR 1.2 - see xserver/randr/randr.c:TellChanged().
+     */
+    else if (event_num == RRNotify)
+    {
+	/* Other RandR events */
 
-    screen_update (screen, REFRESH_FORCE_CALLBACK, NULL);
-}
-
-static void
-name_owner_changed (GObject       *object,
-		    GParamSpec    *pspec,
-		    GnomeRRScreen *self)
-{
-    GError *error;
-    char *new_name_owner;
+	XRRNotifyEvent *event = (XRRNotifyEvent *)e;
 
-    new_name_owner = g_dbus_proxy_get_name_owner (G_DBUS_PROXY (object));
-    if (new_name_owner == NULL)
-	return;
+	/* Here we can distinguish between RRNotify events supported
+	 * since RandR 1.2 such as RRNotify_OutputProperty.  For now, we
+	 * don't have anything special to do for particular subevent types, so
+	 * we leave this as an empty switch().
+	 */
+	switch (event->subtype)
+	{
+	default:
+	    break;
+	}
 
-    error = NULL;
-    if (!screen_update (self, REFRESH_IGNORE_SERIAL | REFRESH_FORCE_CALLBACK, &error))
-	g_warning ("Failed to refresh screen configuration after mutter was restarted: %s",
-		   error->message);
+	/* No need to reprobe hardware here */
+	screen_update (screen, TRUE, FALSE, NULL); /* NULL-GError */
+    }
+#endif
 
-    g_clear_error (&error);
-    g_free (new_name_owner);
+    /* Pass the event on to GTK+ */
+    return GDK_FILTER_CONTINUE;
 }
 
 static gboolean
@@ -580,130 +730,64 @@
 {
     GnomeRRScreen *self = GNOME_RR_SCREEN (initable);
     GnomeRRScreenPrivate *priv = self->priv;
-    MetaDBusDisplayConfig *proxy;
+    Display *dpy = GDK_SCREEN_XDISPLAY (self->priv->gdk_screen);
+    int event_base;
+    int ignore;
+
+    priv->connector_type_atom = XInternAtom (dpy, "ConnectorType", FALSE);
+
+    if (XRRQueryExtension (dpy, &event_base, &ignore))
+    {
+        priv->randr_event_base = event_base;
+
+        XRRQueryVersion (dpy, &priv->rr_major_version, &priv->rr_minor_version);
+        if (priv->rr_major_version < 1 || (priv->rr_major_version == 1 && priv->rr_minor_version < 2)) {
+            g_set_error (error, GNOME_RR_ERROR, GNOME_RR_ERROR_NO_RANDR_EXTENSION,
+                    "RANDR extension is too old (must be at least 1.2)");
+            return FALSE;
+        }
+
+        priv->info = screen_info_new (self, TRUE, error);
+
+        if (!priv->info) {
+            return FALSE;
+        }
+
+        XRRSelectInput (priv->xdisplay,
+                priv->xroot,
+                RRScreenChangeNotifyMask);
+        gdk_x11_register_standard_event_type (gdk_screen_get_display (priv->gdk_screen),
+                          event_base,
+                          RRNotify + 1);
+        gdk_window_add_filter (priv->gdk_root, screen_on_event, self);
 
-    proxy = meta_dbus_display_config_proxy_new_for_bus_sync (G_BUS_TYPE_SESSION,
-							     G_DBUS_PROXY_FLAGS_NONE,
-							     "org.gnome.Mutter.DisplayConfig",
-							     "/org/gnome/Mutter/DisplayConfig",
-							     NULL, error);
-    if (!proxy)
-	return FALSE;
-
-    priv->proxy = META_DBUS_DISPLAY_CONFIG (proxy);
-
-    priv->info = screen_info_new (self, error);
-    if (!priv->info)
-	return FALSE;
-
-    g_signal_connect_object (priv->proxy, "notify::g-name-owner",
-			     G_CALLBACK (name_owner_changed), self, 0);
-    g_signal_connect_object (priv->proxy, "monitors-changed",
-			     G_CALLBACK (screen_on_monitors_changed), self, 0);
-    return TRUE;
-}
-
-static void
-on_proxy_acquired (GObject      *object,
-                   GAsyncResult *result,
-                   gpointer      user_data)
-{
-    GTask *task = user_data;
-    GnomeRRScreen *self = g_task_get_source_object (task);
-    GnomeRRScreenPrivate *priv = self->priv;
-    MetaDBusDisplayConfig *proxy;
-    GError *error;
-
-    error = NULL;
-    proxy = meta_dbus_display_config_proxy_new_for_bus_finish (result, &error);
-    if (!proxy)
-	return g_task_return_error (task, error);
-
-    priv->proxy = META_DBUS_DISPLAY_CONFIG (proxy);
-
-    priv->info = screen_info_new (self, &error);
-    if (!priv->info)
-	return g_task_return_error (task, error);
-
-    g_signal_connect_object (priv->proxy, "notify::g-name-owner",
-			     G_CALLBACK (name_owner_changed), self, 0);
-    g_signal_connect_object (priv->proxy, "monitors-changed",
-			     G_CALLBACK (screen_on_monitors_changed), self, 0);
-    g_task_return_boolean (task, TRUE);
-}
-
-static void
-on_name_appeared (GDBusConnection *connection,
-                  const char      *name,
-                  const char      *name_owner,
-                  gpointer         user_data)
-{
-    GTask *task = user_data;
-    GnomeRRScreen *self = g_task_get_source_object (task);
-    GnomeRRScreenPrivate *priv = self->priv;
-
-    meta_dbus_display_config_proxy_new_for_bus (G_BUS_TYPE_SESSION,
-                                                G_DBUS_PROXY_FLAGS_NONE,
-                                                "org.gnome.Mutter.DisplayConfig",
-                                                "/org/gnome/Mutter/DisplayConfig",
-                                                g_task_get_cancellable (task),
-                                                on_proxy_acquired, g_object_ref (task));
-
-    g_bus_unwatch_name (priv->init_name_watch_id);
-}
-
-static void
-gnome_rr_screen_async_initable_init_async (GAsyncInitable      *initable,
-                                           int                  io_priority,
-                                           GCancellable        *canc,
-                                           GAsyncReadyCallback  callback,
-                                           gpointer             user_data)
-{
-    GnomeRRScreen *self = GNOME_RR_SCREEN (initable);
-    GnomeRRScreenPrivate *priv = self->priv;
-    GTask *task;
-
-    task = g_task_new (self, canc, callback, user_data);
-
-    priv->init_name_watch_id = g_bus_watch_name (G_BUS_TYPE_SESSION,
-                                                 "org.gnome.Mutter.DisplayConfig",
-                                                 G_BUS_NAME_WATCHER_FLAGS_NONE,
-                                                 on_name_appeared,
-                                                 NULL,
-                                                 task, g_object_unref);
-}
+        return TRUE;
+    }
+    else
+    {
+      g_set_error (error, GNOME_RR_ERROR, GNOME_RR_ERROR_NO_RANDR_EXTENSION,
+                   _("RANDR extension is not present"));
 
-static gboolean
-gnome_rr_screen_async_initable_init_finish (GAsyncInitable    *initable,
-                                            GAsyncResult      *result,
-                                            GError           **error)
-{
-    return g_task_propagate_boolean (G_TASK (result), error);
+      return FALSE;
+   }
 }
 
-static void
+void
 gnome_rr_screen_initable_iface_init (GInitableIface *iface)
 {
     iface->init = gnome_rr_screen_initable_init;
 }
 
-static void
-gnome_rr_screen_async_initable_init (GAsyncInitableIface *iface)
-{
-    iface->init_async = gnome_rr_screen_async_initable_init_async;
-    iface->init_finish = gnome_rr_screen_async_initable_init_finish;
-}
-
 void
 gnome_rr_screen_finalize (GObject *gobject)
 {
     GnomeRRScreen *screen = GNOME_RR_SCREEN (gobject);
 
+    gdk_window_remove_filter (screen->priv->gdk_root, screen_on_event, screen);
+
     if (screen->priv->info)
       screen_info_free (screen->priv->info);
 
-    g_clear_object (&screen->priv->proxy);
-
     G_OBJECT_CLASS (gnome_rr_screen_parent_class)->finalize (gobject);
 }
 
@@ -717,6 +801,10 @@
     {
     case SCREEN_PROP_GDK_SCREEN:
         priv->gdk_screen = g_value_get_object (value);
+        priv->gdk_root = gdk_screen_get_root_window (priv->gdk_screen);
+        priv->xroot = gdk_x11_window_get_xid (priv->gdk_root);
+        priv->xdisplay = GDK_SCREEN_XDISPLAY (priv->gdk_screen);
+        priv->xscreen = gdk_x11_screen_get_xscreen (priv->gdk_screen);
         return;
     default:
         G_OBJECT_WARN_INVALID_PROPERTY_ID (gobject, property_id, property);
@@ -840,6 +928,15 @@
 {
     GnomeRRScreenPrivate *priv = G_TYPE_INSTANCE_GET_PRIVATE (self, GNOME_TYPE_RR_SCREEN, GnomeRRScreenPrivate);
     self->priv = priv;
+
+    priv->gdk_screen = NULL;
+    priv->gdk_root = NULL;
+    priv->xdisplay = NULL;
+    priv->xroot = None;
+    priv->xscreen = NULL;
+    priv->info = NULL;
+    priv->rr_major_version = 0;
+    priv->rr_minor_version = 0;
 }
 
 /* Weak reference callback set in gnome_rr_screen_new(); we remove the GObject data from the GdkScreen. */
@@ -886,29 +983,18 @@
 }
 
 void
-gnome_rr_screen_new_async (GdkScreen           *screen,
-                           GAsyncReadyCallback  callback,
-                           gpointer             user_data)
-{
-    g_return_if_fail (GDK_IS_SCREEN (screen));
-
-    g_async_initable_new_async (GNOME_TYPE_RR_SCREEN, G_PRIORITY_DEFAULT,
-                                NULL, callback, user_data,
-                                "gdk-screen", screen, NULL);
-}
-
-GnomeRRScreen *
-gnome_rr_screen_new_finish (GAsyncResult  *result,
-                            GError       **error)
+gnome_rr_screen_set_size (GnomeRRScreen *screen,
+			  int	      width,
+			  int       height,
+			  int       mm_width,
+			  int       mm_height)
 {
-    GObject *source_object;
-    GnomeRRScreen *screen;
-
-    source_object = g_async_result_get_source_object (result);
-    screen = GNOME_RR_SCREEN (g_async_initable_new_finish (G_ASYNC_INITABLE (source_object), result, error));
+    g_return_if_fail (GNOME_IS_RR_SCREEN (screen));
 
-    g_object_unref (source_object);
-    return screen;
+    gdk_error_trap_push ();
+    XRRSetScreenSize (screen->priv->xdisplay, screen->priv->xroot,
+		      width, height, mm_width, mm_height);
+    gdk_error_trap_pop_ignored ();
 }
 
 /**
@@ -948,6 +1034,83 @@
 }
 
 /**
+ * gnome_rr_screen_get_timestamps:
+ * @screen: a #GnomeRRScreen
+ * @change_timestamp_ret: (out): Location in which to store the timestamp at which the RANDR configuration was last changed
+ * @config_timestamp_ret: (out): Location in which to store the timestamp at which the RANDR configuration was last obtained
+ *
+ * Queries the two timestamps that the X RANDR extension maintains.  The X
+ * server will prevent change requests for stale configurations, those whose
+ * timestamp is not equal to that of the latest request for configuration.  The
+ * X server will also prevent change requests that have an older timestamp to
+ * the latest change request.
+ */
+void
+gnome_rr_screen_get_timestamps (GnomeRRScreen *screen,
+				guint32       *change_timestamp_ret,
+				guint32       *config_timestamp_ret)
+{
+    GnomeRRScreenPrivate *priv;
+
+    g_return_if_fail (GNOME_IS_RR_SCREEN (screen));
+
+    priv = screen->priv;
+
+    if (change_timestamp_ret)
+	*change_timestamp_ret = priv->info->resources->timestamp;
+
+    if (config_timestamp_ret)
+	*config_timestamp_ret = priv->info->resources->configTimestamp;
+}
+
+static gboolean
+force_timestamp_update (GnomeRRScreen *screen)
+{
+    GnomeRRScreenPrivate *priv = screen->priv;
+    GnomeRRCrtc *crtc;
+    XRRCrtcInfo *current_info;
+    Status status;
+    gboolean timestamp_updated;
+
+    timestamp_updated = FALSE;
+
+    crtc = priv->info->crtcs[0];
+
+    if (crtc == NULL)
+	goto out;
+
+    current_info = XRRGetCrtcInfo (priv->xdisplay,
+				   priv->info->resources,
+				   crtc->id);
+
+    if (current_info == NULL)
+	goto out;
+
+    gdk_error_trap_push ();
+    status = XRRSetCrtcConfig (priv->xdisplay,
+			       priv->info->resources,
+			       crtc->id,
+			       current_info->timestamp,
+			       current_info->x,
+			       current_info->y,
+			       current_info->mode,
+			       current_info->rotation,
+			       current_info->outputs,
+			       current_info->noutput);
+
+    XRRFreeCrtcInfo (current_info);
+
+    gdk_flush ();
+    if (gdk_error_trap_pop ())
+	goto out;
+
+    if (status == RRSetConfigSuccess)
+	timestamp_updated = TRUE;
+out:
+    return timestamp_updated;
+}
+
+/**
  * gnome_rr_screen_refresh:
  * @screen: a #GnomeRRScreen
  * @error: location to store error, or %NULL
@@ -964,9 +1127,18 @@
 gnome_rr_screen_refresh (GnomeRRScreen *screen,
 			 GError       **error)
 {
+    gboolean refreshed;
+
     g_return_val_if_fail (error == NULL || *error == NULL, FALSE);
 
-    return screen_update (screen, REFRESH_NONE, error);
+    gdk_x11_display_grab (gdk_screen_get_display (screen->priv->gdk_screen));
+
+    refreshed = screen_update (screen, FALSE, TRUE, error);
+    force_timestamp_update (screen); /* this is to keep other clients from thinking that the X server re-detected things by itself - bgo#621046 */
+
+    gdk_x11_display_ungrab (gdk_screen_get_display (screen->priv->gdk_screen));
+
+    return refreshed;
 }
 
 /**
@@ -974,43 +1146,81 @@
  * @mode: (out): The current #GnomeRRDpmsMode of this screen
  **/
 gboolean
-gnome_rr_screen_get_dpms_mode (GnomeRRScreen    *screen,
-                               GnomeRRDpmsMode  *mode,
-                               GError          **error)
-{
-    MetaPowerSave power_save;
+gnome_rr_screen_get_dpms_mode (GnomeRRScreen *screen,
+                               GnomeRRDpmsMode *mode,
+                               GError **error)
+{
+    BOOL enabled = FALSE;
+    CARD16 state;
+    gboolean ret = FALSE;
 
     g_return_val_if_fail (error == NULL || *error == NULL, FALSE);
     g_return_val_if_fail (mode != NULL, FALSE);
 
-    power_save = meta_dbus_display_config_get_power_save_mode (screen->priv->proxy);
-
-    if (power_save == META_POWER_SAVE_UNKNOWN) {
+    if (!screen->priv->dpms_capable) {
         g_set_error_literal (error,
                              GNOME_RR_ERROR,
                              GNOME_RR_ERROR_NO_DPMS_EXTENSION,
                              "Display is not DPMS capable");
-	return FALSE;
+        goto out;
+    }
+
+    if (!DPMSInfo (screen->priv->xdisplay,
+                   &state,
+                   &enabled)) {
+        g_set_error_literal (error,
+                             GNOME_RR_ERROR,
+                             GNOME_RR_ERROR_UNKNOWN,
+                             "Unable to get DPMS state");
+        goto out;
+    }
+
+    /* DPMS not enabled is a valid mode */
+    if (!enabled) {
+        *mode = GNOME_RR_DPMS_DISABLED;
+        ret = TRUE;
+        goto out;
     }
 
-    switch (power_save) {
-    case META_POWER_SAVE_ON:
+    switch (state) {
+    case DPMSModeOn:
         *mode = GNOME_RR_DPMS_ON;
         break;
-    case META_POWER_SAVE_STANDBY:
+    case DPMSModeStandby:
         *mode = GNOME_RR_DPMS_STANDBY;
         break;
-    case META_POWER_SAVE_SUSPEND:
+    case DPMSModeSuspend:
         *mode = GNOME_RR_DPMS_SUSPEND;
         break;
-    case META_POWER_SAVE_OFF:
+    case DPMSModeOff:
         *mode = GNOME_RR_DPMS_OFF;
         break;
     default:
         g_assert_not_reached ();
         break;
     }
+    ret = TRUE;
+out:
+    return ret;
+}
 
+/**
+ * gnome_rr_screen_clear_dpms_timeouts:
+ **/
+static gboolean
+gnome_rr_screen_clear_dpms_timeouts (GnomeRRScreen *screen,
+                                     GError **error)
+{
+    gdk_error_trap_push ();
+    /* DPMSSetTimeouts() return value is often a lie, so ignore it */
+    DPMSSetTimeouts (screen->priv->xdisplay, 0, 0, 0);
+    if (gdk_error_trap_pop ()) {
+        g_set_error_literal (error,
+                             GNOME_RR_ERROR,
+                             GNOME_RR_ERROR_UNKNOWN,
+                             "Could not set DPMS timeouts");
+        return FALSE;
+    }
     return TRUE;
 }
 
@@ -1020,35 +1230,61 @@
  * This method also disables the DPMS timeouts.
  **/
 gboolean
-gnome_rr_screen_set_dpms_mode (GnomeRRScreen    *screen,
-                               GnomeRRDpmsMode   mode,
-                               GError          **error)
-{
-    MetaPowerSave power_save;
+gnome_rr_screen_set_dpms_mode (GnomeRRScreen *screen,
+                               GnomeRRDpmsMode mode,
+                               GError **error)
+{
+    CARD16 state = 0;
+    gboolean ret;
+    GnomeRRDpmsMode current_mode;
 
     g_return_val_if_fail (error == NULL || *error == NULL, FALSE);
 
+    /* set, if the new mode is different */
+    ret = gnome_rr_screen_get_dpms_mode (screen, ¤t_mode, error);
+    if (!ret)
+        goto out;
+    if (current_mode == mode) {
+        ret = gnome_rr_screen_clear_dpms_timeouts (screen, error);
+        goto out;
+    }
+
     switch (mode) {
     case GNOME_RR_DPMS_ON:
-        power_save = META_POWER_SAVE_ON;
+        state = DPMSModeOn;
         break;
     case GNOME_RR_DPMS_STANDBY:
-	power_save = META_POWER_SAVE_STANDBY;
+        state = DPMSModeStandby;
         break;
     case GNOME_RR_DPMS_SUSPEND:
-	power_save = META_POWER_SAVE_SUSPEND;
+        state = DPMSModeSuspend;
         break;
     case GNOME_RR_DPMS_OFF:
-	power_save = META_POWER_SAVE_OFF;
+        state = DPMSModeOff;
         break;
     default:
         g_assert_not_reached ();
         break;
     }
 
-    meta_dbus_display_config_set_power_save_mode (screen->priv->proxy, power_save);
+    gdk_error_trap_push ();
+    /* DPMSForceLevel() return value is often a lie, so ignore it */
+    DPMSForceLevel (screen->priv->xdisplay, state);
+    XSync (screen->priv->xdisplay, False);
+    if (gdk_error_trap_pop ()) {
+        ret = FALSE;
+        g_set_error_literal (error,
+                             GNOME_RR_ERROR,
+                             GNOME_RR_ERROR_UNKNOWN,
+                             "Could not change DPMS mode");
+        goto out;
+    }
 
-    return TRUE;
+    ret = gnome_rr_screen_clear_dpms_timeouts (screen, error);
+    if (!ret)
+        goto out;
+out:
+    return ret;
 }
 
 /**
@@ -1169,7 +1405,7 @@
 
 /* GnomeRROutput */
 static GnomeRROutput *
-output_new (ScreenInfo *info, guint id)
+output_new (ScreenInfo *info, RROutput id)
 {
     GnomeRROutput *output = g_slice_new0 (GnomeRROutput);
     
@@ -1179,104 +1415,230 @@
     return output;
 }
 
-static void
-append_output_array (GnomeRROutput ***array, GnomeRROutput *output)
+static guint8 *
+get_property (Display *dpy,
+	      RROutput output,
+	      Atom atom,
+	      gsize *len)
+{
+    unsigned char *prop;
+    int actual_format;
+    unsigned long nitems, bytes_after;
+    Atom actual_type;
+    guint8 *result;
+    
+    XRRGetOutputProperty (dpy, output, atom,
+			  0, 100, False, False,
+			  AnyPropertyType,
+			  &actual_type, &actual_format,
+			  &nitems, &bytes_after, &prop);
+    
+    if (actual_type == XA_INTEGER && actual_format == 8)
+    {
+	result = g_memdup (prop, nitems);
+	if (len)
+	    *len = nitems;
+    }
+    else
+    {
+	result = NULL;
+    }
+    
+    XFree (prop);
+    
+    return result;
+}
+
+static guint8 *
+read_edid_data (GnomeRROutput *output, gsize *len)
+{
+    Atom edid_atom;
+    guint8 *result;
+
+    edid_atom = XInternAtom (DISPLAY (output), "EDID", FALSE);
+    result = get_property (DISPLAY (output),
+			   output->id, edid_atom, len);
+
+    if (!result)
+    {
+	edid_atom = XInternAtom (DISPLAY (output), "EDID_DATA", FALSE);
+	result = get_property (DISPLAY (output),
+			       output->id, edid_atom, len);
+    }
+
+    if (!result)
+    {
+	edid_atom = XInternAtom (DISPLAY (output), "XFree86_DDC_EDID1_RAWDATA", FALSE);
+	result = get_property (DISPLAY (output),
+			       output->id, edid_atom, len);
+    }
+
+    if (result)
+    {
+	if (*len % 128 == 0)
+	    return result;
+	else
+	    g_free (result);
+    }
+    
+    return NULL;
+}
+
+static char *
+get_connector_type_string (GnomeRROutput *output)
 {
-    unsigned i;
+    char *result;
+    unsigned char *prop;
+    int actual_format;
+    unsigned long nitems, bytes_after;
+    Atom actual_type;
+    Atom connector_type;
+    char *connector_type_str;
+
+    result = NULL;
+
+    if (XRRGetOutputProperty (DISPLAY (output), output->id, output->info->screen->priv->connector_type_atom,
+			      0, 100, False, False,
+			      AnyPropertyType,
+			      &actual_type, &actual_format,
+			      &nitems, &bytes_after, &prop) != Success)
+	return NULL;
+
+    if (!(actual_type == XA_ATOM && actual_format == 32 && nitems == 1))
+	goto out;
+
+    connector_type = *((Atom *) prop);
+
+    connector_type_str = XGetAtomName (DISPLAY (output), connector_type);
+    if (connector_type_str) {
+	result = g_strdup (connector_type_str); /* so the caller can g_free() it */
+	XFree (connector_type_str);
+    }
 
-    for (i = 0; (*array)[i]; i++);
+out:
 
-    *array = g_renew (GnomeRROutput *, *array, i + 2);
+    XFree (prop);
 
-    (*array)[i] = output;
-    (*array)[i + 1] = NULL;
+    return result;
 }
 
 static void
-output_initialize (GnomeRROutput *output, GVariant *info)
+update_brightness_limits (GnomeRROutput *output)
+{
+    gint rc;
+    Atom atom;
+    XRRPropertyInfo *info;
+
+    gdk_error_trap_push ();
+    atom = XInternAtom (DISPLAY (output), "BACKLIGHT", FALSE);
+    info = XRRQueryOutputProperty (DISPLAY (output), output->id, atom);
+    rc = gdk_error_trap_pop ();
+    if (rc != Success)
+    {
+        if (rc != BadName)
+          g_warning ("could not get output property for %s, rc: %i",
+		     output->name, rc);
+        goto out;
+    }
+    if (info == NULL)
+    {
+        g_warning ("could not get output property for %s",
+		   output->name);
+        goto out;
+    }
+    if (!info->range || info->num_values != 2)
+    {
+        g_debug ("backlight %s was not range", output->name);
+        goto out;
+    }
+    output->backlight_min = info->values[0];
+    output->backlight_max = info->values[1];
+out:
+    if (info != NULL)
+    {
+        XFree (info);
+    }
+}
+
+static gboolean
+output_initialize (GnomeRROutput *output, XRRScreenResources *res, GError **error)
 {
+    XRROutputInfo *info = XRRGetOutputInfo (
+	DISPLAY (output), res, output->id);
     GPtrArray *a;
-    GVariantIter *crtcs, *clones, *modes;
-    GVariant *properties, *edid;
-    int current_crtc_id;
-    guint id;
-
-    g_variant_get (info, META_OUTPUT_STRUCT,
-		   &output->id, &output->winsys_id,
-		   ¤t_crtc_id, &crtcs,
-		   &output->name,
-		   &modes, &clones, &properties);
+    int i;
+    
+#if 0
+    g_print ("Output %lx Timestamp: %u\n", output->id, (guint32)info->timestamp);
+#endif
+    
+    if (!info || !output->info)
+    {
+	/* FIXME: see the comment in crtc_initialize() */
+	/* Translators: here, an "output" is a video output */
+	g_set_error (error, GNOME_RR_ERROR, GNOME_RR_ERROR_RANDR_ERROR,
+		     _("could not get information about output %d"),
+		     (int) output->id);
+	return FALSE;
+    }
+    
+    output->name = g_strdup (info->name); /* FIXME: what is nameLen used for? */
+    output->display_name = NULL; /* set first time the getter is used */
+    output->current_crtc = crtc_by_id (output->info, info->crtc);
+    output->width_mm = info->mm_width;
+    output->height_mm = info->mm_height;
+    output->connected = (info->connection == RR_Connected);
+    output->connector_type = get_connector_type_string (output);
 
     /* Possible crtcs */
     a = g_ptr_array_new ();
-    while (g_variant_iter_loop (crtcs, "u", &id))
+    
+    for (i = 0; i < info->ncrtc; ++i)
     {
-	GnomeRRCrtc *crtc = crtc_by_id (output->info, id);
+	GnomeRRCrtc *crtc = crtc_by_id (output->info, info->crtcs[i]);
 	
-	if (!crtc)
-	    continue;
-
-	g_ptr_array_add (a, crtc);
-
-	if (crtc->id == current_crtc_id)
-	{
-	    output->current_crtc = crtc;
-	    append_output_array (&crtc->current_outputs, output);
-	}
-
-	append_output_array (&crtc->possible_outputs, output);
+	if (crtc)
+	    g_ptr_array_add (a, crtc);
     }
     g_ptr_array_add (a, NULL);
     output->possible_crtcs = (GnomeRRCrtc **)g_ptr_array_free (a, FALSE);
-    g_variant_iter_free (crtcs);
-
+    
     /* Clones */
     a = g_ptr_array_new ();
-    while (g_variant_iter_loop (clones, "u", &id))
+    for (i = 0; i < info->nclone; ++i)
     {
-	GnomeRROutput *gnome_rr_output = gnome_rr_output_by_id (output->info, id);
+	GnomeRROutput *gnome_rr_output = gnome_rr_output_by_id (output->info, info->clones[i]);
 	
 	if (gnome_rr_output)
 	    g_ptr_array_add (a, gnome_rr_output);
     }
     g_ptr_array_add (a, NULL);
     output->clones = (GnomeRROutput **)g_ptr_array_free (a, FALSE);
-    g_variant_iter_free (clones);
     
     /* Modes */
     a = g_ptr_array_new ();
-    while (g_variant_iter_loop (modes, "u", &id))
+    for (i = 0; i < info->nmode; ++i)
     {
-	GnomeRRMode *mode = mode_by_id (output->info, id);
+	GnomeRRMode *mode = mode_by_id (output->info, info->modes[i]);
 	
 	if (mode)
 	    g_ptr_array_add (a, mode);
     }
     g_ptr_array_add (a, NULL);
     output->modes = (GnomeRRMode **)g_ptr_array_free (a, FALSE);
-    g_variant_iter_free (modes);
+    
+    output->n_preferred = info->npreferred;
+    
+    /* Edid data */
+    output->edid_data = read_edid_data (output, &output->edid_size);
 
-    g_variant_lookup (properties, "vendor", "s", &output->vendor);
-    g_variant_lookup (properties, "product", "s", &output->product);
-    g_variant_lookup (properties, "serial", "s", &output->serial);
-    g_variant_lookup (properties, "width-mm", "i", &output->width_mm);
-    g_variant_lookup (properties, "height-mm", "i", &output->height_mm);
-    g_variant_lookup (properties, "display-name", "s", &output->display_name);
-    g_variant_lookup (properties, "backlight", "i", &output->backlight);
-    g_variant_lookup (properties, "min-backlight-step", "i", &output->min_backlight_step);
-    g_variant_lookup (properties, "primary", "b", &output->is_primary);
-    g_variant_lookup (properties, "presentation", "b", &output->is_presentation);
-
-    if ((edid = g_variant_lookup_value (properties, "edid", G_VARIANT_TYPE ("ay"))))
-      {
-	output->edid = g_variant_get_data_as_bytes (edid);
-	g_variant_unref (edid);
-      }
-    else
-      g_variant_lookup (properties, "edid-file", "s", &output->edid_file);
+    /* brightness data */
+    if (output->connected)
+        update_brightness_limits (output);
+
+    XRRFreeOutputInfo (info);
 
-    if (output->is_primary)
-	output->info->primary = output;
+    return TRUE;
 }
 
 static GnomeRROutput*
@@ -1291,18 +1653,14 @@
     output->id = from->id;
     output->info = from->info;
     output->name = g_strdup (from->name);
-    output->display_name = g_strdup (from->display_name);
-    output->vendor = g_strdup (from->vendor);
-    output->product = g_strdup (from->product);
-    output->serial = g_strdup (from->serial);
     output->current_crtc = from->current_crtc;
-    output->backlight = from->backlight;
-    if (from->edid)
-      output->edid = g_bytes_ref (from->edid);
-    output->edid_file = g_strdup (from->edid_file);
-
-    output->is_primary = from->is_primary;
-    output->is_presentation = from->is_presentation;
+    output->width_mm = from->width_mm;
+    output->height_mm = from->height_mm;
+    output->connected = from->connected;
+    output->n_preferred = from->n_preferred;
+    output->connector_type = g_strdup (from->connector_type);
+    output->backlight_min = -1;
+    output->backlight_max = -1;
 
     array = g_ptr_array_new ();
     for (p_crtc = from->possible_crtcs; *p_crtc != NULL; p_crtc++)
@@ -1325,6 +1683,9 @@
     }
     output->modes = (GnomeRRMode**) g_ptr_array_free (array, FALSE);
 
+    output->edid_size = from->edid_size;
+    output->edid_data = g_memdup (from->edid_data, from->edid_size);
+
     return output;
 }
 
@@ -1334,14 +1695,10 @@
     g_free (output->clones);
     g_free (output->modes);
     g_free (output->possible_crtcs);
+    g_free (output->edid_data);
     g_free (output->name);
-    g_free (output->vendor);
-    g_free (output->product);
-    g_free (output->serial);
     g_free (output->display_name);
-    g_free (output->edid_file);
-    if (output->edid)
-      g_bytes_unref (output->edid);
+    g_free (output->connector_type);
     g_slice_free (GnomeRROutput, output);
 }
 
@@ -1354,29 +1711,12 @@
 }
 
 const guint8 *
-gnome_rr_output_get_edid_data (GnomeRROutput *output,
-			       gsize         *size)
+gnome_rr_output_get_edid_data (GnomeRROutput *output, gsize *size)
 {
-  if (output->edid)
-    return g_bytes_get_data (output->edid, size);
-
-  if (output->edid_file)
-    {
-      GMappedFile *mmap;
-
-      mmap = g_mapped_file_new (output->edid_file, FALSE, NULL);
-
-      if (mmap)
-	{
-	  output->edid = g_mapped_file_get_bytes (mmap);
-
-	  g_mapped_file_unref (mmap);
-
-	  return g_bytes_get_data (output->edid, size);
-	}
-    }
-
-  return NULL;
+    g_return_val_if_fail (output != NULL, NULL);
+    if (size)
+        *size = output->edid_size;
+    return output->edid_data;
 }
 
 /**
@@ -1386,36 +1726,68 @@
  * @product: (out) (allow-none):
  * @serial: (out) (allow-none):
  */
-void
+gboolean
 gnome_rr_output_get_ids_from_edid (GnomeRROutput         *output,
                                    char                 **vendor,
-                                   char                 **product,
-                                   char                 **serial)
+                                   int                   *product,
+                                   int                   *serial)
 {
-    g_return_if_fail (output != NULL);
+    MonitorInfo *info;
+
+    g_return_val_if_fail (output != NULL, FALSE);
+
+    if (!output->edid_data)
+        return FALSE;
+    info = decode_edid (output->edid_data);
+    if (!info)
+        return FALSE;
+    if (vendor)
+        *vendor = g_memdup (info->manufacturer_code, 4);
+    if (product)
+        *product = info->product_code;
+    if (serial)
+        *serial = info->serial_number;
+
+    g_free (info);
+
+    return TRUE;
 
-    *vendor = g_strdup (output->vendor);
-    *product = g_strdup (output->product);
-    *serial = g_strdup (output->serial);
 }
 
-/**
- * gnome_rr_output_get_physical_size:
- * @output: a #GnomeRROutput
- * @width_mm: (out) (allow-none):
- * @height_mm: (out) (allow-none):
- */
-void
-gnome_rr_output_get_physical_size (GnomeRROutput *output,
-				   int           *width_mm,
-				   int           *height_mm)
+static void
+ensure_display_name (GnomeRROutput *output)
 {
-    g_return_if_fail (output != NULL);
+    if (output->display_name != NULL)
+        return;
+
+    if (gnome_rr_output_is_laptop (output))
+        output->display_name = g_strdup (_("Built-in Display"));
+
+    if (output->display_name == NULL
+        && output->edid_data != NULL) {
+        MonitorInfo *info;
+
+        info = decode_edid (output->edid_data);
+        if (info != NULL)
+            output->display_name = make_display_name (info);
+
+        g_free (info);
+    }
+
+    if (output->display_name == NULL) {
+        char *inches;
+        inches = make_display_size_string (output->width_mm, output->height_mm);
+        if (inches != NULL) {
+            /* Translators: %s is the size of the monitor in inches */
+            output->display_name = g_strdup_printf (_("%s Display"), inches);
+        }
+        g_free (inches);
+    }
 
-    if (width_mm)
-	*width_mm = output->width_mm;
-    if (height_mm)
-	*height_mm = output->height_mm;
+    /* last chance on the stairway */
+    if (output->display_name == NULL) {
+      output->display_name = g_strdup (_("Unknown Display"));
+    }
 }
 
 const char *
@@ -1423,51 +1795,142 @@
 {
     g_return_val_if_fail (output != NULL, NULL);
 
+    ensure_display_name (output);
+
     return output->display_name;
 }
 
 /**
- * gnome_rr_output_get_backlight:
+ * gnome_rr_output_get_backlight_min:
  *
- * Returns: The currently set backlight brightness
+ * Returns: The mimimum backlight value, or -1 if not supported
  */
-int
-gnome_rr_output_get_backlight (GnomeRROutput *output)
+gint
+gnome_rr_output_get_backlight_min (GnomeRROutput *output)
 {
     g_return_val_if_fail (output != NULL, -1);
+    return output->backlight_min;
+}
 
-    return output->backlight;
+/**
+ * gnome_rr_output_get_backlight_max:
+ *
+ * Returns: The maximum backlight value, or -1 if not supported
+ */
+gint
+gnome_rr_output_get_backlight_max (GnomeRROutput *output)
+{
+    g_return_val_if_fail (output != NULL, -1);
+    return output->backlight_max;
 }
 
 /**
- * gnome_rr_output_get_min_backlight_step:
+ * gnome_rr_output_get_backlight:
  *
- * Returns: The minimum backlight step available in percent
+ * Returns: The currently set backlight brightness
  */
-int
-gnome_rr_output_get_min_backlight_step (GnomeRROutput *output)
+gint
+gnome_rr_output_get_backlight (GnomeRROutput *output, GError **error)
 {
+    guint now = -1;
+    unsigned long nitems;
+    unsigned long bytes_after;
+    guint *prop;
+    Atom atom;
+    Atom actual_type;
+    int actual_format;
+    gint retval;
+
     g_return_val_if_fail (output != NULL, -1);
 
-    return output->min_backlight_step;
+    gdk_error_trap_push ();
+    atom = XInternAtom (DISPLAY (output), "BACKLIGHT", FALSE);
+    retval = XRRGetOutputProperty (DISPLAY (output), output->id, atom,
+				   0, 4, False, False, None,
+				   &actual_type, &actual_format,
+				   &nitems, &bytes_after, ((unsigned char **)&prop));
+    gdk_flush ();
+    if (gdk_error_trap_pop ())
+    {
+        g_set_error_literal (error,
+			     GNOME_RR_ERROR,
+			     GNOME_RR_ERROR_UNKNOWN,
+			     "unhandled X error while getting the range of backlight values");
+        goto out;
+    }
+
+    if (retval != Success) {
+        g_set_error_literal (error,
+			     GNOME_RR_ERROR,
+			     GNOME_RR_ERROR_RANDR_ERROR,
+			     "could not get the range of backlight values");
+        goto out;
+    }
+    if (actual_type == XA_INTEGER &&
+        nitems == 1 &&
+        actual_format == 32)
+    {
+        memcpy (&now, prop, sizeof (guint));
+    }
+    else
+    {
+	g_set_error (error,
+		     GNOME_RR_ERROR,
+		     GNOME_RR_ERROR_RANDR_ERROR,
+		     "failed to get correct property type, got %lu,%i",
+		     nitems, actual_format);
+    }
+out:
+    XFree (prop);
+    return now;
 }
 
 /**
  * gnome_rr_output_set_backlight:
- * @value: the absolute value which is 0 >= this <= 100
+ * @value: the absolute value which is min >= this <= max
  *
  * Returns: %TRUE for success
  */
 gboolean
 gnome_rr_output_set_backlight (GnomeRROutput *output, gint value, GError **error)
 {
+    gboolean ret = FALSE;
+    Atom atom;
+
     g_return_val_if_fail (output != NULL, FALSE);
 
-    return meta_dbus_display_config_call_change_backlight_sync (output->info->screen->priv->proxy,
-								output->info->serial,
-								output->id, value,
-								&output->backlight,
-								NULL, error);
+    /* check this is sane */
+    if (value < output->backlight_min ||
+        value > output->backlight_max)
+    {
+	g_set_error (error,
+		     GNOME_RR_ERROR,
+		     GNOME_RR_ERROR_BOUNDS_ERROR,
+		     "out of brightness range: %i, has to be %i -> %i",
+		     value,
+		     output->backlight_max, output->backlight_min);
+	goto out;
+    }
+
+    /* don't abort on error */
+    gdk_error_trap_push ();
+    atom = XInternAtom (DISPLAY (output), "BACKLIGHT", FALSE);
+    XRRChangeOutputProperty (DISPLAY (output), output->id, atom,
+			     XA_INTEGER, 32, PropModeReplace,
+			     (unsigned char *) &value, 1);
+    if (gdk_error_trap_pop ())
+    {
+        g_set_error_literal (error,
+			     GNOME_RR_ERROR,
+			     GNOME_RR_ERROR_UNKNOWN,
+			     "unhandled X error while setting the backlight values");
+        goto out;
+    }
+
+    /* we assume this succeeded as there's no return value */
+    ret = TRUE;
+out:
+    return ret;
 }
 
 /**
@@ -1503,8 +1966,17 @@
     return output->current_crtc;
 }
 
+/* Returns NULL if the ConnectorType property is not available */
+const char *
+gnome_rr_output_get_connector_type (GnomeRROutput *output)
+{
+    g_return_val_if_fail (output != NULL, NULL);
+
+    return output->connector_type;
+}
+
 gboolean
-_gnome_rr_output_name_is_builtin_display (const char *name)
+_gnome_rr_output_name_is_laptop (const char *name)
 {
     if (!name)
         return FALSE;
@@ -1513,18 +1985,32 @@
 	strstr (name, "LVDS") ||
 	strstr (name, "Lvds") ||
 	strstr (name, "LCD")  ||  /* ... but fglrx uses "LCD" in some versions.  Shoot me now, kthxbye. */
-	strstr (name, "eDP"))     /* eDP is for internal built-in panel connections */
+	strstr (name, "eDP")  ||  /* eDP is for internal laptop panel connections */
+	strstr (name, "default")) /* Finally, NVidia and all others that don't bother to do RANDR properly */
         return TRUE;
 
     return FALSE;
 }
 
 gboolean
-gnome_rr_output_is_builtin_display (GnomeRROutput *output)
+gnome_rr_output_is_laptop (GnomeRROutput *output)
 {
     g_return_val_if_fail (output != NULL, FALSE);
 
-    return _gnome_rr_output_name_is_builtin_display (output->name);
+    if (!output->connected)
+	return FALSE;
+
+    /* The ConnectorType property is present in RANDR 1.3 and greater */
+    if (g_strcmp0 (output->connector_type, GNOME_RR_CONNECTOR_TYPE_PANEL) == 0)
+	return TRUE;
+
+    /* Older versions of RANDR - this is a best guess, as @#$% RANDR doesn't have standard output names,
+     * so drivers can use whatever they like.
+     */
+    if (_gnome_rr_output_name_is_laptop (output->name))
+        return TRUE;
+
+    return FALSE;
 }
 
 GnomeRRMode *
@@ -1566,11 +2052,28 @@
     return output->name;
 }
 
+int
+gnome_rr_output_get_width_mm (GnomeRROutput *output)
+{
+    g_assert (output != NULL);
+    return output->width_mm;
+}
+
+int
+gnome_rr_output_get_height_mm (GnomeRROutput *output)
+{
+    g_assert (output != NULL);
+    return output->height_mm;
+}
+
 GnomeRRMode *
 gnome_rr_output_get_preferred_mode (GnomeRROutput *output)
 {
     g_return_val_if_fail (output != NULL, NULL);
-    return output->modes[0];
+    if (output->n_preferred)
+	return output->modes[0];
+    
+    return NULL;
 }
 
 GnomeRRMode **
@@ -1581,6 +2084,13 @@
 }
 
 gboolean
+gnome_rr_output_is_connected (GnomeRROutput *output)
+{
+    g_return_val_if_fail (output != NULL, FALSE);
+    return output->connected;
+}
+
+gboolean
 gnome_rr_output_supports_mode (GnomeRROutput *output,
 			       GnomeRRMode   *mode)
 {
@@ -1619,26 +2129,150 @@
 gboolean
 gnome_rr_output_get_is_primary (GnomeRROutput *output)
 {
-    return output->is_primary;
+    return output->info->primary == output->id;
+}
+
+void
+gnome_rr_screen_set_primary_output (GnomeRRScreen *screen,
+                                    GnomeRROutput *output)
+{
+    GnomeRRScreenPrivate *priv;
+    RROutput id;
+
+    g_return_if_fail (GNOME_IS_RR_SCREEN (screen));
+
+    priv = screen->priv;
+
+    if (output)
+        id = output->id;
+    else
+        id = None;
+
+    if (SERVERS_RANDR_IS_AT_LEAST_1_3 (priv))
+        XRRSetOutputPrimary (priv->xdisplay, priv->xroot, id);
 }
 
 /* GnomeRRCrtc */
-static const GnomeRRRotation rotation_map[] =
+typedef struct
 {
-    GNOME_RR_ROTATION_0,
-    GNOME_RR_ROTATION_90,
-    GNOME_RR_ROTATION_180,
-    GNOME_RR_ROTATION_270,
-    GNOME_RR_REFLECT_X | GNOME_RR_ROTATION_0,
-    GNOME_RR_REFLECT_X | GNOME_RR_ROTATION_90,
-    GNOME_RR_REFLECT_X | GNOME_RR_ROTATION_180,
-    GNOME_RR_REFLECT_X | GNOME_RR_ROTATION_270,
+    Rotation xrot;
+    GnomeRRRotation rot;
+} RotationMap;
+
+static const RotationMap rotation_map[] =
+{
+    { RR_Rotate_0, GNOME_RR_ROTATION_0 },
+    { RR_Rotate_90, GNOME_RR_ROTATION_90 },
+    { RR_Rotate_180, GNOME_RR_ROTATION_180 },
+    { RR_Rotate_270, GNOME_RR_ROTATION_270 },
+    { RR_Reflect_X, GNOME_RR_REFLECT_X },
+    { RR_Reflect_Y, GNOME_RR_REFLECT_Y },
 };
 
 static GnomeRRRotation
-gnome_rr_rotation_from_transform (enum wl_output_transform transform)
+gnome_rr_rotation_from_xrotation (Rotation r)
 {
-    return rotation_map[transform];
+    int i;
+    GnomeRRRotation result = 0;
+    
+    for (i = 0; i < G_N_ELEMENTS (rotation_map); ++i)
+    {
+	if (r & rotation_map[i].xrot)
+	    result |= rotation_map[i].rot;
+    }
+    
+    return result;
+}
+
+static Rotation
+xrotation_from_rotation (GnomeRRRotation r)
+{
+    int i;
+    Rotation result = 0;
+    
+    for (i = 0; i < G_N_ELEMENTS (rotation_map); ++i)
+    {
+	if (r & rotation_map[i].rot)
+	    result |= rotation_map[i].xrot;
+    }
+    
+    return result;
+}
+
+gboolean
+gnome_rr_crtc_set_config_with_time (GnomeRRCrtc      *crtc,
+				    guint32           timestamp,
+				    int               x,
+				    int               y,
+				    GnomeRRMode      *mode,
+				    GnomeRRRotation   rotation,
+				    GnomeRROutput   **outputs,
+				    int               n_outputs,
+				    GError          **error)
+{
+    ScreenInfo *info;
+    GArray *output_ids;
+    Status status;
+    gboolean result;
+    int i;
+    
+    g_return_val_if_fail (crtc != NULL, FALSE);
+    g_return_val_if_fail (mode != NULL || outputs == NULL || n_outputs == 0, FALSE);
+    g_return_val_if_fail (error == NULL || *error == NULL, FALSE);
+    
+    info = crtc->info;
+    
+    if (mode)
+    {
+	if (x + mode->width > info->max_width
+	    || y + mode->height > info->max_height)
+	{
+	    g_set_error (error, GNOME_RR_ERROR, GNOME_RR_ERROR_BOUNDS_ERROR,
+			 /* Translators: the "position", "size", and "maximum"
+			  * words here are not keywords; please translate them
+			  * as usual.  A CRTC is a CRT Controller (this is X terminology) */
+			 _("requested position/size for CRTC %d is outside the allowed limit: "
+			   "position=(%d, %d), size=(%d, %d), maximum=(%d, %d)"),
+			 (int) crtc->id,
+			 x, y,
+			 mode->width, mode->height,
+			 info->max_width, info->max_height);
+	    return FALSE;
+	}
+    }
+    
+    output_ids = g_array_new (FALSE, FALSE, sizeof (RROutput));
+    
+    if (outputs)
+    {
+	for (i = 0; i < n_outputs; ++i)
+	    g_array_append_val (output_ids, outputs[i]->id);
+    }
+
+    gdk_error_trap_push ();
+    status = XRRSetCrtcConfig (DISPLAY (crtc), info->resources, crtc->id,
+			       timestamp, 
+			       x, y,
+			       mode ? mode->id : None,
+			       xrotation_from_rotation (rotation),
+			       (RROutput *)output_ids->data,
+			       output_ids->len);
+    
+    g_array_free (output_ids, TRUE);
+
+    if (gdk_error_trap_pop () || status != RRSetConfigSuccess) {
+	/* Translators: CRTC is a CRT Controller (this is X terminology).
+	 * It is *very* unlikely that you'll ever get this error, so it is
+	 * only listed for completeness. */
+	g_set_error (error, GNOME_RR_ERROR, GNOME_RR_ERROR_RANDR_ERROR,
+		     _("could not set the configuration for CRTC %d"),
+		     (int) crtc->id);
+        return FALSE;
+    } else {
+        result = TRUE;
+    }
+    
+    return result;
 }
 
 GnomeRRMode *
@@ -1675,6 +2309,7 @@
     return FALSE;
 }
 
+/* FIXME: merge with get_mode()? */
 /**
  * gnome_rr_crtc_get_position:
  * @crtc: a #GnomeRRCrtc
@@ -1695,32 +2330,19 @@
 	*y = crtc->y;
 }
 
+/* FIXME: merge with get_mode()? */
 GnomeRRRotation
 gnome_rr_crtc_get_current_rotation (GnomeRRCrtc *crtc)
 {
     g_assert(crtc != NULL);
-    return gnome_rr_rotation_from_transform (crtc->transform);
-}
-
-static GnomeRRRotation
-gnome_rr_rotation_from_all_transforms (int all_transforms)
-{
-    GnomeRRRotation ret = all_transforms & 0xF;
-
-    if (all_transforms & (1 << WL_OUTPUT_TRANSFORM_FLIPPED))
-	ret |= GNOME_RR_REFLECT_X;
-
-    if (all_transforms & (1 << WL_OUTPUT_TRANSFORM_FLIPPED_180))
-	ret |= GNOME_RR_REFLECT_Y;
-
-    return ret;
+    return crtc->current_rotation;
 }
 
 GnomeRRRotation
 gnome_rr_crtc_get_rotations (GnomeRRCrtc *crtc)
 {
     g_assert(crtc != NULL);
-    return gnome_rr_rotation_from_all_transforms (crtc->all_transforms);
+    return crtc->rotations;
 }
 
 gboolean
@@ -1728,18 +2350,16 @@
 				 GnomeRRRotation rotation)
 {
     g_return_val_if_fail (crtc != NULL, FALSE);
-    return (gnome_rr_rotation_from_all_transforms (crtc->all_transforms) & rotation);
+    return (crtc->rotations & rotation);
 }
 
 static GnomeRRCrtc *
-crtc_new (ScreenInfo *info, guint id)
+crtc_new (ScreenInfo *info, RROutput id)
 {
     GnomeRRCrtc *crtc = g_slice_new0 (GnomeRRCrtc);
     
     crtc->id = id;
     crtc->info = info;
-    crtc->current_outputs = g_new0 (GnomeRROutput *, 1);
-    crtc->possible_outputs = g_new0 (GnomeRROutput *, 1);
     
     return crtc;
 }
@@ -1756,8 +2376,8 @@
     to->current_mode = from->current_mode;
     to->x = from->x;
     to->y = from->y;
-    to->transform = from->transform;
-    to->all_transforms = from->all_transforms;
+    to->current_rotation = from->current_rotation;
+    to->rotations = from->rotations;
     to->gamma_size = from->gamma_size;
 
     array = g_ptr_array_new ();
@@ -1777,26 +2397,73 @@
     return to;
 }
 
-static void
-crtc_initialize (GnomeRRCrtc *crtc, GVariant *info)
+static gboolean
+crtc_initialize (GnomeRRCrtc        *crtc,
+		 XRRScreenResources *res,
+		 GError            **error)
 {
-    GVariantIter *all_transforms;
-    int current_mode_id;
-    guint transform;
-
-    g_variant_get (info, META_CRTC_STRUCT,
-		   &crtc->id, &crtc->winsys_id,
-		   &crtc->x, &crtc->y,
-		   NULL, NULL,
-		   ¤t_mode_id,
-		   &crtc->transform, &all_transforms,
-		   NULL);
+    XRRCrtcInfo *info = XRRGetCrtcInfo (DISPLAY (crtc), res, crtc->id);
+    GPtrArray *a;
+    int i;
+    
+#if 0
+    g_print ("CRTC %lx Timestamp: %u\n", crtc->id, (guint32)info->timestamp);
+#endif
+    
+    if (!info)
+    {
+	/* FIXME: We need to reaquire the screen resources */
+	/* FIXME: can we actually catch BadRRCrtc, and does it make sense to emit that? */
 
-    if (current_mode_id >= 0)
-      crtc->current_mode = mode_by_id (crtc->info, current_mode_id);
+	/* Translators: CRTC is a CRT Controller (this is X terminology).
+	 * It is *very* unlikely that you'll ever get this error, so it is
+	 * only listed for completeness. */
+	g_set_error (error, GNOME_RR_ERROR, GNOME_RR_ERROR_RANDR_ERROR,
+		     _("could not get information about CRTC %d"),
+		     (int) crtc->id);
+	return FALSE;
+    }
+    
+    /* GnomeRRMode */
+    crtc->current_mode = mode_by_id (crtc->info, info->mode);
+    
+    crtc->x = info->x;
+    crtc->y = info->y;
+    
+    /* Current outputs */
+    a = g_ptr_array_new ();
+    for (i = 0; i < info->noutput; ++i)
+    {
+	GnomeRROutput *output = gnome_rr_output_by_id (crtc->info, info->outputs[i]);
+	
+	if (output)
+	    g_ptr_array_add (a, output);
+    }
+    g_ptr_array_add (a, NULL);
+    crtc->current_outputs = (GnomeRROutput **)g_ptr_array_free (a, FALSE);
+    
+    /* Possible outputs */
+    a = g_ptr_array_new ();
+    for (i = 0; i < info->npossible; ++i)
+    {
+	GnomeRROutput *output = gnome_rr_output_by_id (crtc->info, info->possible[i]);
+	
+	if (output)
+	    g_ptr_array_add (a, output);
+    }
+    g_ptr_array_add (a, NULL);
+    crtc->possible_outputs = (GnomeRROutput **)g_ptr_array_free (a, FALSE);
+    
+    /* Rotations */
+    crtc->current_rotation = gnome_rr_rotation_from_xrotation (info->rotation);
+    crtc->rotations = gnome_rr_rotation_from_xrotation (info->rotations);
     
-    while (g_variant_iter_loop (all_transforms, "u", &transform))
-	crtc->all_transforms |= 1 << transform;
+    XRRFreeCrtcInfo (info);
+
+    /* get an store gamma size */
+    crtc->gamma_size = XRRGetCrtcGammaSize (DISPLAY (crtc), crtc->id);
+
+    return TRUE;
 }
 
 static void
@@ -1809,7 +2476,7 @@
 
 /* GnomeRRMode */
 static GnomeRRMode *
-mode_new (ScreenInfo *info, guint id)
+mode_new (ScreenInfo *info, RRMode id)
 {
     GnomeRRMode *mode = g_slice_new0 (GnomeRRMode);
     
@@ -1848,16 +2515,15 @@
 }
 
 static void
-mode_initialize (GnomeRRMode *mode, GVariant *info)
+mode_initialize (GnomeRRMode *mode, XRRModeInfo *info)
 {
-    gdouble frequency;
-
-    g_variant_get (info, "(uxuud)",
-		   &mode->id, &mode->winsys_id,
-		   &mode->width, &mode->height,
-		   &frequency);
+    g_assert (mode != NULL);
+    g_assert (info != NULL);
     
-    mode->freq = frequency * 1000;
+    mode->name = g_strdup (info->name);
+    mode->width = info->width;
+    mode->height = info->height;
+    mode->freq = ((info->dotClock / (double)info->hTotal) / info->vTotal + 0.5) * 1000;
 }
 
 static GnomeRRMode *
@@ -1867,6 +2533,7 @@
 
     to->id = from->id;
     to->info = from->info;
+    to->name = g_strdup (from->name);
     to->width = from->width;
     to->height = from->height;
     to->freq = from->freq;
@@ -1877,109 +2544,78 @@
 static void
 mode_free (GnomeRRMode *mode)
 {
+    g_free (mode->name);
     g_slice_free (GnomeRRMode, mode);
 }
 
-gboolean
-_gnome_rr_screen_apply_configuration (GnomeRRScreen  *screen,
-				      gboolean        persistent,
-				      GVariant       *crtcs,
-				      GVariant       *outputs,
-				      GError        **error)
-{
-  return meta_dbus_display_config_call_apply_configuration_sync (screen->priv->proxy,
-								 screen->priv->info->serial,
-								 persistent,
-								 crtcs, outputs,
-								 NULL, error);
-}
-
-gboolean
-gnome_rr_crtc_set_gamma (GnomeRRCrtc    *crtc,
-			 int             size,
+void
+gnome_rr_crtc_set_gamma (GnomeRRCrtc *crtc, int size,
 			 unsigned short *red,
 			 unsigned short *green,
 			 unsigned short *blue)
 {
-  GBytes *red_bytes, *green_bytes, *blue_bytes;
-  GVariant *red_v, *green_v, *blue_v;
-  gboolean ok;
-
-  red_bytes = g_bytes_new (red, size * sizeof (unsigned short));
-  green_bytes = g_bytes_new (green, size * sizeof (unsigned short));
-  blue_bytes = g_bytes_new (blue, size * sizeof (unsigned short));
-
-  red_v = g_variant_new_from_bytes (G_VARIANT_TYPE ("aq"),
-				    red_bytes, TRUE);
-  green_v = g_variant_new_from_bytes (G_VARIANT_TYPE ("aq"),
-				      green_bytes, TRUE);
-  blue_v = g_variant_new_from_bytes (G_VARIANT_TYPE ("aq"),
-				     blue_bytes, TRUE);
-
-  ok = meta_dbus_display_config_call_set_crtc_gamma_sync (crtc->info->screen->priv->proxy,
-							  crtc->info->serial,
-							  crtc->id,
-							  red_v,
-							  green_v,
-							  blue_v,
-							  NULL, NULL);
-
-  g_bytes_unref (red_bytes);
-  g_bytes_unref (green_bytes);
-  g_bytes_unref (blue_bytes);
-  /* The variant above are floating, no need to free them */
+    int copy_size;
+    XRRCrtcGamma *gamma;
 
-  return ok;
+    g_return_if_fail (crtc != NULL);
+    g_return_if_fail (red != NULL);
+    g_return_if_fail (green != NULL);
+    g_return_if_fail (blue != NULL);
+
+    if (size != crtc->gamma_size)
+	return;
+
+    gamma = XRRAllocGamma (crtc->gamma_size);
+
+    copy_size = crtc->gamma_size * sizeof (unsigned short);
+    memcpy (gamma->red, red, copy_size);
+    memcpy (gamma->green, green, copy_size);
+    memcpy (gamma->blue, blue, copy_size);
+
+    XRRSetCrtcGamma (DISPLAY (crtc), crtc->id, gamma);
+    XRRFreeGamma (gamma);
 }
 
 gboolean
-gnome_rr_crtc_get_gamma (GnomeRRCrtc     *crtc,
-			 int             *size,
-			 unsigned short **red,
-			 unsigned short **green,
+gnome_rr_crtc_get_gamma (GnomeRRCrtc *crtc, int *size,
+			 unsigned short **red, unsigned short **green,
 			 unsigned short **blue)
 {
-  GBytes *red_bytes, *green_bytes, *blue_bytes;
-  GVariant *red_v, *green_v, *blue_v;
-  gboolean ok;
-  gsize dummy;
-
-  ok = meta_dbus_display_config_call_get_crtc_gamma_sync (crtc->info->screen->priv->proxy,
-							  crtc->info->serial,
-							  crtc->id,
-							  &red_v,
-							  &green_v,
-							  &blue_v,
-							  NULL, NULL);
-  if (!ok)
-    return FALSE;
+    int copy_size;
+    unsigned short *r, *g, *b;
+    XRRCrtcGamma *gamma;
 
-  red_bytes = g_variant_get_data_as_bytes (red_v);
-  green_bytes = g_variant_get_data_as_bytes (green_v);
-  blue_bytes = g_variant_get_data_as_bytes (blue_v);
-
-  /* Unref the variant early so that the bytes hold the only reference to
-     the data and we don't need to copy
-  */
-  g_variant_unref (red_v);
-  g_variant_unref (green_v);
-  g_variant_unref (blue_v);
-
-  if (size)
-    *size = g_bytes_get_size (red_bytes) / sizeof (unsigned short);
-
-  if (red)
-    *red = g_bytes_unref_to_data (red_bytes, &dummy);
-  else
-    g_bytes_unref (red_bytes);
-  if (green)
-    *green = g_bytes_unref_to_data (green_bytes, &dummy);
-  else
-    g_bytes_unref (green_bytes);
-  if (blue)
-    *blue = g_bytes_unref_to_data (blue_bytes, &dummy);
-  else
-    g_bytes_unref (blue_bytes);
+    g_return_val_if_fail (crtc != NULL, FALSE);
+
+    gamma = XRRGetCrtcGamma (DISPLAY (crtc), crtc->id);
+    if (!gamma)
+	return FALSE;
+
+    copy_size = crtc->gamma_size * sizeof (unsigned short);
+
+    if (red) {
+	r = g_new0 (unsigned short, crtc->gamma_size);
+	memcpy (r, gamma->red, copy_size);
+	*red = r;
+    }
+
+    if (green) {
+	g = g_new0 (unsigned short, crtc->gamma_size);
+	memcpy (g, gamma->green, copy_size);
+	*green = g;
+    }
+
+    if (blue) {
+	b = g_new0 (unsigned short, crtc->gamma_size);
+	memcpy (b, gamma->blue, copy_size);
+	*blue = b;
+    }
+
+    XRRFreeGamma (gamma);
 
-  return TRUE;
+    if (size)
+	*size = crtc->gamma_size;
+
+    return TRUE;
 }
+
diff -Nru gnome-desktop3-3.12.0/libgnome-desktop/gnome-rr-config.c gnome-desktop3-3.8.4/libgnome-desktop/gnome-rr-config.c
--- gnome-desktop3-3.12.0/libgnome-desktop/gnome-rr-config.c	2014-01-16 12:37:26.000000000 +0000
+++ gnome-desktop3-3.8.4/libgnome-desktop/gnome-rr-config.c	2013-09-04 11:15:57.000000000 +0000
@@ -1,8 +1,8 @@
 /* gnome-rr-config.c
  * -*- c-basic-offset: 4 -*-
  *
- * Copyright 2007, 2008, 2013 Red Hat, Inc.
- * Copyright 2010 Giovanni Campagna 
+ * Copyright 2007, 2008, Red Hat, Inc.
+ * Copyright 2010 Giovanni Campagna
  * 
  * This file is part of the Gnome Library.
  * 
@@ -74,10 +74,16 @@
  *   
  */
 
+/* A helper wrapper around the GMarkup parser stuff */
+static gboolean parse_file_gmarkup (const gchar *file,
+				    const GMarkupParser *parser,
+				    gpointer data,
+				    GError **err);
+
 typedef struct CrtcAssignment CrtcAssignment;
 
 static gboolean         crtc_assignment_apply (CrtcAssignment   *assign,
-					       gboolean          persistent,
+					       guint32           timestamp,
 					       GError          **error);
 static CrtcAssignment  *crtc_assignment_new   (GnomeRRScreen      *screen,
 					       GnomeRROutputInfo **outputs,
@@ -92,6 +98,357 @@
 
 G_DEFINE_TYPE (GnomeRRConfig, gnome_rr_config, G_TYPE_OBJECT)
 
+typedef struct Parser Parser;
+
+/* Parser for monitor configurations */
+struct Parser
+{
+    int			config_file_version;
+    GnomeRROutputInfo *	output;
+    GnomeRRConfig *	configuration;
+    GPtrArray *		outputs;
+    GPtrArray *		configurations;
+    GQueue *		stack;
+};
+
+static int
+parse_int (const char *text)
+{
+    return strtol (text, NULL, 0);
+}
+
+static guint
+parse_uint (const char *text)
+{
+    return strtoul (text, NULL, 0);
+}
+
+static gboolean
+stack_is (Parser *parser,
+	  const char *s1,
+	  ...)
+{
+    GList *stack = NULL;
+    const char *s;
+    GList *l1, *l2;
+    va_list args;
+    
+    stack = g_list_prepend (stack, (gpointer)s1);
+    
+    va_start (args, s1);
+    
+    s = va_arg (args, const char *);
+    while (s)
+    {
+	stack = g_list_prepend (stack, (gpointer)s);
+	s = va_arg (args, const char *);
+    }
+	
+    l1 = stack;
+    l2 = parser->stack->head;
+    
+    while (l1 && l2)
+    {
+	if (strcmp (l1->data, l2->data) != 0)
+	{
+	    g_list_free (stack);
+	    return FALSE;
+	}
+	
+	l1 = l1->next;
+	l2 = l2->next;
+    }
+    
+    g_list_free (stack);
+    
+    return (!l1 && !l2);
+}
+
+static void
+handle_start_element (GMarkupParseContext *context,
+		      const gchar         *name,
+		      const gchar        **attr_names,
+		      const gchar        **attr_values,
+		      gpointer             user_data,
+		      GError             **err)
+{
+    Parser *parser = user_data;
+
+    if (strcmp (name, "output") == 0)
+    {
+	int i;
+	g_assert (parser->output == NULL);
+
+	parser->output = g_object_new (GNOME_TYPE_RR_OUTPUT_INFO, NULL);
+	parser->output->priv->rotation = 0;
+	
+	for (i = 0; attr_names[i] != NULL; ++i)
+	{
+	    if (strcmp (attr_names[i], "name") == 0)
+	    {
+		parser->output->priv->name = g_strdup (attr_values[i]);
+		break;
+	    }
+	}
+
+	if (!parser->output->priv->name)
+	{
+	    /* This really shouldn't happen, but it's better to make
+	     * something up than to crash later.
+	     */
+	    g_warning ("Malformed monitor configuration file");
+	    
+	    parser->output->priv->name = g_strdup ("default");
+	}	
+	parser->output->priv->connected = FALSE;
+	parser->output->priv->on = FALSE;
+	parser->output->priv->primary = FALSE;
+    }
+    else if (strcmp (name, "configuration") == 0)
+    {
+	g_assert (parser->configuration == NULL);
+	
+	parser->configuration = g_object_new (GNOME_TYPE_RR_CONFIG, NULL);
+	parser->configuration->priv->clone = FALSE;
+	parser->configuration->priv->outputs = NULL;
+    }
+    else if (strcmp (name, "monitors") == 0)
+    {
+	int i;
+
+	for (i = 0; attr_names[i] != NULL; i++)
+	{
+	    if (strcmp (attr_names[i], "version") == 0)
+	    {
+		parser->config_file_version = parse_int (attr_values[i]);
+		break;
+	    }
+	}
+    }
+
+    g_queue_push_tail (parser->stack, g_strdup (name));
+}
+
+static void
+handle_end_element (GMarkupParseContext *context,
+		    const gchar         *name,
+		    gpointer             user_data,
+		    GError             **err)
+{
+    Parser *parser = user_data;
+    
+    if (strcmp (name, "output") == 0)
+    {
+	/* If no rotation properties were set, just use GNOME_RR_ROTATION_0 */
+	if (parser->output->priv->rotation == 0)
+	    parser->output->priv->rotation = GNOME_RR_ROTATION_0;
+	
+	g_ptr_array_add (parser->outputs, parser->output);
+
+	parser->output = NULL;
+    }
+    else if (strcmp (name, "configuration") == 0)
+    {
+	g_ptr_array_add (parser->outputs, NULL);
+	parser->configuration->priv->outputs =
+	    (GnomeRROutputInfo **)g_ptr_array_free (parser->outputs, FALSE);
+	parser->outputs = g_ptr_array_new ();
+	g_ptr_array_add (parser->configurations, parser->configuration);
+	parser->configuration = NULL;
+    }
+    
+    g_free (g_queue_pop_tail (parser->stack));
+}
+
+#define TOPLEVEL_ELEMENT (parser->config_file_version > 0 ? "monitors" : NULL)
+
+static void
+handle_text (GMarkupParseContext *context,
+	     const gchar         *text,
+	     gsize                text_len,
+	     gpointer             user_data,
+	     GError             **err)
+{
+    Parser *parser = user_data;
+    
+    if (stack_is (parser, "vendor", "output", "configuration", TOPLEVEL_ELEMENT, NULL))
+    {
+	parser->output->priv->connected = TRUE;
+	
+	strncpy ((gchar*) parser->output->priv->vendor, text, 3);
+	parser->output->priv->vendor[3] = 0;
+    }
+    else if (stack_is (parser, "clone", "configuration", TOPLEVEL_ELEMENT, NULL))
+    {
+	if (strcmp (text, "yes") == 0)
+	    parser->configuration->priv->clone = TRUE;
+    }
+    else if (stack_is (parser, "product", "output", "configuration", TOPLEVEL_ELEMENT, NULL))
+    {
+	parser->output->priv->connected = TRUE;
+
+	parser->output->priv->product = parse_int (text);
+    }
+    else if (stack_is (parser, "serial", "output", "configuration", TOPLEVEL_ELEMENT, NULL))
+    {
+	parser->output->priv->connected = TRUE;
+
+	parser->output->priv->serial = parse_uint (text);
+    }
+    else if (stack_is (parser, "width", "output", "configuration", TOPLEVEL_ELEMENT, NULL))
+    {
+	parser->output->priv->on = TRUE;
+
+	parser->output->priv->width = parse_int (text);
+    }
+    else if (stack_is (parser, "x", "output", "configuration", TOPLEVEL_ELEMENT, NULL))
+    {
+	parser->output->priv->on = TRUE;
+
+	parser->output->priv->x = parse_int (text);
+    }
+    else if (stack_is (parser, "y", "output", "configuration", TOPLEVEL_ELEMENT, NULL))
+    {
+	parser->output->priv->on = TRUE;
+
+	parser->output->priv->y = parse_int (text);
+    }
+    else if (stack_is (parser, "height", "output", "configuration", TOPLEVEL_ELEMENT, NULL))
+    {
+	parser->output->priv->on = TRUE;
+
+	parser->output->priv->height = parse_int (text);
+    }
+    else if (stack_is (parser, "rate", "output", "configuration", TOPLEVEL_ELEMENT, NULL))
+    {
+	parser->output->priv->on = TRUE;
+
+	parser->output->priv->rate = parse_int (text);
+    }
+    else if (stack_is (parser, "rotation", "output", "configuration", TOPLEVEL_ELEMENT, NULL))
+    {
+	if (strcmp (text, "normal") == 0)
+	{
+	    parser->output->priv->rotation |= GNOME_RR_ROTATION_0;
+	}
+	else if (strcmp (text, "left") == 0)
+	{
+	    parser->output->priv->rotation |= GNOME_RR_ROTATION_90;
+	}
+	else if (strcmp (text, "upside_down") == 0)
+	{
+	    parser->output->priv->rotation |= GNOME_RR_ROTATION_180;
+	}
+	else if (strcmp (text, "right") == 0)
+	{
+	    parser->output->priv->rotation |= GNOME_RR_ROTATION_270;
+	}
+    }
+    else if (stack_is (parser, "reflect_x", "output", "configuration", TOPLEVEL_ELEMENT, NULL))
+    {
+	if (strcmp (text, "yes") == 0)
+	{
+	    parser->output->priv->rotation |= GNOME_RR_REFLECT_X;
+	}
+    }
+    else if (stack_is (parser, "reflect_y", "output", "configuration", TOPLEVEL_ELEMENT, NULL))
+    {
+	if (strcmp (text, "yes") == 0)
+	{
+	    parser->output->priv->rotation |= GNOME_RR_REFLECT_Y;
+	}
+    }
+    else if (stack_is (parser, "primary", "output", "configuration", TOPLEVEL_ELEMENT, NULL))
+    {
+	if (strcmp (text, "yes") == 0)
+	{
+	    parser->output->priv->primary = TRUE;
+	}
+    }
+    else
+    {
+	/* Ignore other properties so we can expand the format in the future */
+    }
+}
+
+static void
+parser_free (Parser *parser)
+{
+    int i;
+    GList *list;
+
+    g_assert (parser != NULL);
+
+    if (parser->output)
+	g_object_unref (parser->output);
+
+    if (parser->configuration)
+	g_object_unref (parser->configuration);
+
+    for (i = 0; i < parser->outputs->len; ++i)
+    {
+	GnomeRROutputInfo *output = parser->outputs->pdata[i];
+
+	g_object_unref (output);
+    }
+
+    g_ptr_array_free (parser->outputs, TRUE);
+
+    for (i = 0; i < parser->configurations->len; ++i)
+    {
+	GnomeRRConfig *config = parser->configurations->pdata[i];
+
+	g_object_unref (config);
+    }
+
+    g_ptr_array_free (parser->configurations, TRUE);
+
+    for (list = parser->stack->head; list; list = list->next)
+	g_free (list->data);
+    g_queue_free (parser->stack);
+    
+    g_free (parser);
+}
+
+static GnomeRRConfig **
+configurations_read_from_file (const gchar *filename, GError **error)
+{
+    Parser *parser = g_new0 (Parser, 1);
+    GnomeRRConfig **result;
+    GMarkupParser callbacks = {
+	handle_start_element,
+	handle_end_element,
+	handle_text,
+	NULL, /* passthrough */
+	NULL, /* error */
+    };
+
+    parser->config_file_version = 0;
+    parser->configurations = g_ptr_array_new ();
+    parser->outputs = g_ptr_array_new ();
+    parser->stack = g_queue_new ();
+    
+    if (!parse_file_gmarkup (filename, &callbacks, parser, error))
+    {
+	result = NULL;
+	
+	g_assert (parser->outputs);
+	goto out;
+    }
+
+    g_assert (parser->outputs);
+    
+    g_ptr_array_add (parser->configurations, NULL);
+    result = (GnomeRRConfig **)g_ptr_array_free (parser->configurations, FALSE);
+    parser->configurations = g_ptr_array_new ();
+    
+    g_assert (parser->outputs);
+out:
+    parser_free (parser);
+
+    return result;
+}
+
 static void
 gnome_rr_config_init (GnomeRRConfig *self)
 {
@@ -159,10 +516,11 @@
 	GnomeRROutput *rr_output = rr_outputs[i];
 	GnomeRROutputInfo *output = g_object_new (GNOME_TYPE_RR_OUTPUT_INFO, NULL);
 	GnomeRRMode *mode = NULL;
+	const guint8 *edid_data = gnome_rr_output_get_edid_data (rr_output, NULL);
 	GnomeRRCrtc *crtc;
 
 	output->priv->name = g_strdup (gnome_rr_output_get_name (rr_output));
-	output->priv->connected = TRUE;
+	output->priv->connected = gnome_rr_output_is_connected (rr_output);
 	output->priv->display_name = g_strdup (gnome_rr_output_get_display_name (rr_output));
 
 	if (!output->priv->connected)
@@ -176,33 +534,49 @@
 	}
 	else
 	{
-	    gnome_rr_output_get_ids_from_edid (rr_output,
-					       &output->priv->vendor,
-					       &output->priv->product,
-					       &output->priv->serial);
+	    MonitorInfo *info = NULL;
+
+	    if (edid_data)
+		info = decode_edid (edid_data);
+
+	    if (info)
+	    {
+		memcpy (output->priv->vendor, info->manufacturer_code,
+			sizeof (output->priv->vendor));
+		
+		output->priv->product = info->product_code;
+		output->priv->serial = info->serial_number;
+		output->priv->aspect = info->aspect_ratio;
+	    }
+	    else
+	    {
+		strcpy (output->priv->vendor, "???");
+		output->priv->product = 0;
+		output->priv->serial = 0;
+	    }
+	    g_free (info);
 		
 	    crtc = gnome_rr_output_get_crtc (rr_output);
-	    mode = crtc ? gnome_rr_crtc_get_current_mode (crtc) : NULL;
-
+	    mode = crtc? gnome_rr_crtc_get_current_mode (crtc) : NULL;
+	    
 	    if (crtc && mode)
 	    {
 		output->priv->on = TRUE;
-
+		
 		gnome_rr_crtc_get_position (crtc, &output->priv->x, &output->priv->y);
 		output->priv->width = gnome_rr_mode_get_width (mode);
 		output->priv->height = gnome_rr_mode_get_height (mode);
 		output->priv->rate = gnome_rr_mode_get_freq (mode);
 		output->priv->rotation = gnome_rr_crtc_get_current_rotation (crtc);
-                output->priv->available_rotations = gnome_rr_crtc_get_rotations (crtc);
 
 		if (output->priv->x == 0 && output->priv->y == 0) {
-		    if (clone_width == -1) {
-			clone_width = output->priv->width;
-			clone_height = output->priv->height;
-		    } else if (clone_width == output->priv->width &&
-			       clone_height == output->priv->height) {
-			config->priv->clone = TRUE;
-		    }
+			if (clone_width == -1) {
+				clone_width = output->priv->width;
+				clone_height = output->priv->height;
+			} else if (clone_width == output->priv->width &&
+				   clone_height == output->priv->height) {
+				config->priv->clone = TRUE;
+			}
 		}
 	    }
 	    else
@@ -213,8 +587,36 @@
 
 	    /* Get preferred size for the monitor */
 	    mode = gnome_rr_output_get_preferred_mode (rr_output);
-	    output->priv->pref_width = gnome_rr_mode_get_width (mode);
-	    output->priv->pref_height = gnome_rr_mode_get_height (mode);
+	    
+	    if (!mode)
+	    {
+		GnomeRRMode **modes = gnome_rr_output_list_modes (rr_output);
+		
+		/* FIXME: we should pick the "best" mode here, where best is
+		 * sorted wrt
+		 *
+		 * - closest aspect ratio
+		 * - mode area
+		 * - refresh rate
+		 * - We may want to extend randrwrap so that get_preferred
+		 *   returns that - although that could also depend on
+		 *   the crtc.
+		 */
+		if (modes[0])
+		    mode = modes[0];
+	    }
+	    
+	    if (mode)
+	    {
+		output->priv->pref_width = gnome_rr_mode_get_width (mode);
+		output->priv->pref_height = gnome_rr_mode_get_height (mode);
+	    }
+	    else
+	    {
+		/* Pick some random numbers. This should basically never happen */
+		output->priv->pref_width = 1024;
+		output->priv->pref_height = 768;
+	    }
 	}
 
         output->priv->primary = gnome_rr_output_get_is_primary (rr_output);
@@ -259,6 +661,57 @@
     return TRUE;
 }
 
+gboolean
+gnome_rr_config_load_filename (GnomeRRConfig *result, const char *filename, GError **error)
+{
+    GnomeRRConfig *current;
+    GnomeRRConfig **configs;
+    gboolean found = FALSE;
+
+    g_return_val_if_fail (GNOME_IS_RR_CONFIG (result), FALSE);
+    g_return_val_if_fail (filename != NULL, FALSE);
+    g_return_val_if_fail (error == NULL || *error == NULL, FALSE);
+
+    current = gnome_rr_config_new_current (result->priv->screen, error);
+
+    configs = configurations_read_from_file (filename, error);
+
+    if (configs)
+    {
+	int i;
+
+	for (i = 0; configs[i] != NULL; ++i)
+	{
+	    if (gnome_rr_config_match (configs[i], current))
+	    {
+		int j;
+		GPtrArray *array;
+		result->priv->clone = configs[i]->priv->clone;
+
+		array = g_ptr_array_new ();
+		for (j = 0; configs[i]->priv->outputs[j] != NULL; j++) {
+                    g_object_ref (configs[i]->priv->outputs[j]);
+		    g_ptr_array_add (array, configs[i]->priv->outputs[j]);
+		}
+		g_ptr_array_add (array, NULL);
+		result->priv->outputs = (GnomeRROutputInfo **) g_ptr_array_free (array, FALSE);
+
+		found = TRUE;
+		break;
+	    }
+	    g_object_unref (configs[i]);
+	}
+	g_free (configs);
+
+	if (!found)
+	    g_set_error (error, GNOME_RR_ERROR, GNOME_RR_ERROR_NO_MATCHING_CONFIG,
+			 _("none of the saved display configurations matched the active configuration"));
+    }
+
+    g_object_unref (current);
+    return found;
+}
+
 static void
 gnome_rr_config_class_init (GnomeRRConfigClass *klass)
 {
@@ -288,22 +741,88 @@
       }
 }
 
+GnomeRRConfig *
+gnome_rr_config_new_stored (GnomeRRScreen *screen, GError **error)
+{
+    GnomeRRConfig *self = g_object_new (GNOME_TYPE_RR_CONFIG, "screen", screen, NULL);
+    char *filename;
+    gboolean success;
+
+    filename = gnome_rr_config_get_intended_filename ();
+
+    success = gnome_rr_config_load_filename (self, filename, error);
+
+    g_free (filename);
+
+    if (success)
+      return self;
+    else
+      {
+	g_object_unref (self);
+	return NULL;
+      }
+}
+
+static gboolean
+parse_file_gmarkup (const gchar          *filename,
+		    const GMarkupParser  *parser,
+		    gpointer             data,
+		    GError              **err)
+{
+    GMarkupParseContext *context = NULL;
+    gchar *contents = NULL;
+    gboolean result = TRUE;
+    gsize len;
+
+    if (!g_file_get_contents (filename, &contents, &len, err))
+    {
+	result = FALSE;
+	goto out;
+    }
+    
+    context = g_markup_parse_context_new (parser, 0, data, NULL);
+
+    if (!g_markup_parse_context_parse (context, contents, len, err))
+    {
+	result = FALSE;
+	goto out;
+    }
+
+    if (!g_markup_parse_context_end_parse (context, err))
+    {
+	result = FALSE;
+	goto out;
+    }
+
+out:
+    if (contents)
+	g_free (contents);
+
+    if (context)
+	g_markup_parse_context_free (context);
+
+    return result;
+}
+
 static gboolean
 output_match (GnomeRROutputInfo *output1, GnomeRROutputInfo *output2)
 {
     g_assert (GNOME_IS_RR_OUTPUT_INFO (output1));
     g_assert (GNOME_IS_RR_OUTPUT_INFO (output2));
 
-    if (g_strcmp0 (output1->priv->name, output2->priv->name) != 0)
+    if (strcmp (output1->priv->name, output2->priv->name) != 0)
 	return FALSE;
 
-    if (g_strcmp0 (output1->priv->vendor, output2->priv->vendor) != 0)
+    if (strcmp (output1->priv->vendor, output2->priv->vendor) != 0)
 	return FALSE;
 
-    if (g_strcmp0 (output1->priv->product, output2->priv->product) != 0)
+    if (output1->priv->product != output2->priv->product)
 	return FALSE;
 
-    if (g_strcmp0 (output1->priv->serial, output2->priv->serial) != 0)
+    if (output1->priv->serial != output2->priv->serial)
+	return FALSE;
+
+    if (output1->priv->connected != output2->priv->connected)
 	return FALSE;
     
     return TRUE;
@@ -487,6 +1006,115 @@
 
 /* Database management */
 
+static void
+ensure_config_directory (void)
+{
+    g_mkdir_with_parents (g_get_user_config_dir (), 0700);
+}
+
+char *
+gnome_rr_config_get_backup_filename (void)
+{
+    ensure_config_directory ();
+    return g_build_filename (g_get_user_config_dir (), CONFIG_BACKUP_BASENAME, NULL);
+}
+
+char *
+gnome_rr_config_get_intended_filename (void)
+{
+    ensure_config_directory ();
+    return g_build_filename (g_get_user_config_dir (), CONFIG_INTENDED_BASENAME, NULL);
+}
+
+static const char *
+get_rotation_name (GnomeRRRotation r)
+{
+    if (r & GNOME_RR_ROTATION_0)
+	return "normal";
+    if (r & GNOME_RR_ROTATION_90)
+	return "left";
+    if (r & GNOME_RR_ROTATION_180)
+	return "upside_down";
+    if (r & GNOME_RR_ROTATION_270)
+	return "right";
+
+    return "normal";
+}
+
+static const char *
+yes_no (int x)
+{
+    return x? "yes" : "no";
+}
+
+static const char *
+get_reflect_x (GnomeRRRotation r)
+{
+    return yes_no (r & GNOME_RR_REFLECT_X);
+}
+
+static const char *
+get_reflect_y (GnomeRRRotation r)
+{
+    return yes_no (r & GNOME_RR_REFLECT_Y);
+}
+
+static void
+emit_configuration (GnomeRRConfig *config,
+		    GString *string)
+{
+    int j;
+
+    g_string_append_printf (string, "  \n");
+
+    g_string_append_printf (string, "      %s\n", yes_no (config->priv->clone));
+    
+    for (j = 0; config->priv->outputs[j] != NULL; ++j)
+    {
+	GnomeRROutputInfo *output = config->priv->outputs[j];
+	
+	g_string_append_printf (
+	    string, "      \n", output->priv->name);
+	
+	if (output->priv->connected && *output->priv->vendor != '\0')
+	{
+	    g_string_append_printf (
+		string, "          %s\n", output->priv->vendor);
+	    g_string_append_printf (
+		string, "          0x%04x\n", output->priv->product);
+	    g_string_append_printf (
+		string, "          0x%08x\n", output->priv->serial);
+	}
+	
+	/* An unconnected output which is on does not make sense */
+	if (output->priv->connected && output->priv->on)
+	{
+	    g_string_append_printf (
+		string, "          %d\n", output->priv->width);
+	    g_string_append_printf (
+		string, "          %d\n", output->priv->height);
+	    g_string_append_printf (
+		string, "          %d\n", output->priv->rate);
+	    g_string_append_printf (
+		string, "          %d\n", output->priv->x);
+	    g_string_append_printf (
+		string, "          %d\n", output->priv->y);
+	    g_string_append_printf (
+		string, "          %s\n", get_rotation_name (output->priv->rotation));
+	    g_string_append_printf (
+		string, "          %s\n", get_reflect_x (output->priv->rotation));
+	    g_string_append_printf (
+		string, "          %s\n", get_reflect_y (output->priv->rotation));
+            g_string_append_printf (
+                string, "          %s\n", yes_no (output->priv->primary));
+	}
+	
+	g_string_append_printf (string, "      \n");
+    }
+    
+    g_string_append_printf (string, "  \n");
+}
+
 void
 gnome_rr_config_sanitize (GnomeRRConfig *config)
 {
@@ -542,14 +1170,14 @@
 gnome_rr_config_ensure_primary (GnomeRRConfig *configuration)
 {
         int i;
-        GnomeRROutputInfo  *builtin_display;
+        GnomeRROutputInfo  *laptop;
         GnomeRROutputInfo  *top_left;
         gboolean found;
 	GnomeRRConfigPrivate *priv;
 
 	g_return_val_if_fail (GNOME_IS_RR_CONFIG (configuration), FALSE);
 
-        builtin_display = NULL;
+        laptop = NULL;
         top_left = NULL;
         found = FALSE;
 	priv = configuration->priv;
@@ -576,17 +1204,17 @@
                         && info->priv->y < top_left->priv->y)) {
                         top_left = info;
                 }
-                if (builtin_display == NULL
-                    && _gnome_rr_output_name_is_builtin_display (info->priv->name)) {
+                if (laptop == NULL
+                    && _gnome_rr_output_name_is_laptop (info->priv->name)) {
                         /* shame we can't find the connector type
-                           as with gnome_rr_output_is_builtin_display */
-                        builtin_display = info;
+                           as with gnome_rr_output_is_laptop */
+                        laptop = info;
                 }
         }
 
         if (!found) {
-                if (builtin_display != NULL) {
-                        builtin_display->priv->primary = TRUE;
+                if (laptop != NULL) {
+                        laptop->priv->primary = TRUE;
                 } else if (top_left != NULL) {
                         /* Note: top_left can be NULL if all outputs are off */
                         top_left->priv->primary = TRUE;
@@ -596,11 +1224,63 @@
         return !found;
 }
 
-static gboolean
-gnome_rr_config_apply_helper (GnomeRRConfig *config,
-			      GnomeRRScreen *screen,
-			      gboolean       persistent,
-			      GError       **error)
+gboolean
+gnome_rr_config_save (GnomeRRConfig *configuration, GError **error)
+{
+    GnomeRRConfig **configurations;
+    GString *output;
+    int i;
+    gchar *intended_filename;
+    gchar *backup_filename;
+    gboolean result;
+
+    g_return_val_if_fail (GNOME_IS_RR_CONFIG (configuration), FALSE);
+    g_return_val_if_fail (error == NULL || *error == NULL, FALSE);
+
+    output = g_string_new ("");
+
+    backup_filename = gnome_rr_config_get_backup_filename ();
+    intended_filename = gnome_rr_config_get_intended_filename ();
+
+    configurations = configurations_read_from_file (intended_filename, NULL); /* NULL-GError */
+    
+    g_string_append_printf (output, "\n");
+
+    if (configurations)
+    {
+	for (i = 0; configurations[i] != NULL; ++i)
+	{
+	    if (!gnome_rr_config_match (configurations[i], configuration))
+		emit_configuration (configurations[i], output);
+	    g_object_unref (configurations[i]);
+	}
+
+	g_free (configurations);
+    }
+
+    emit_configuration (configuration, output);
+
+    g_string_append_printf (output, "\n");
+
+    /* backup the file first */
+    rename (intended_filename, backup_filename); /* no error checking because the intended file may not even exist */
+
+    result = g_file_set_contents (intended_filename, output->str, -1, error);
+
+    if (!result)
+	rename (backup_filename, intended_filename); /* no error checking because the backup may not even exist */
+
+    g_free (backup_filename);
+    g_free (intended_filename);
+
+    return result;
+}
+
+gboolean
+gnome_rr_config_apply_with_time (GnomeRRConfig *config,
+				 GnomeRRScreen *screen,
+				 guint32        timestamp,
+				 GError       **error)
 {
     CrtcAssignment *assignment;
     GnomeRROutputInfo **outputs;
@@ -614,35 +1294,76 @@
 
     assignment = crtc_assignment_new (screen, outputs, error);
 
+    for (i = 0; outputs[i] != NULL; i++)
+	g_object_unref (outputs[i]);
+    g_free (outputs);
+    
     if (assignment)
     {
-	if (crtc_assignment_apply (assignment, persistent, error))
+	if (crtc_assignment_apply (assignment, timestamp, error))
 	    result = TRUE;
 
 	crtc_assignment_free (assignment);
-    }
 
-    for (i = 0; outputs[i] != NULL; i++)
-	g_object_unref (outputs[i]);
-    g_free (outputs);
+	gdk_flush ();
+    }
 
     return result;
 }
 
+/* gnome_rr_config_apply_from_filename_with_time:
+ * @screen: A #GnomeRRScreen
+ * @filename: Path of the file to look in for stored RANDR configurations.
+ * @timestamp: X server timestamp from the event that causes the screen configuration to change (a user's button press, for example)
+ * @error: Location to store error, or %NULL
+ *
+ * Loads the file in @filename and looks for suitable matching RANDR
+ * configurations in the file; if one is found, that configuration will be
+ * applied to the current set of RANDR outputs.
+ *
+ * Typically, @filename is the result of gnome_rr_config_get_intended_filename() or
+ * gnome_rr_config_get_backup_filename().
+ *
+ * Returns: TRUE if the RANDR configuration was loaded and applied from
+ * the specified file, or FALSE otherwise:
+ *
+ * If the file in question is loaded successfully but the configuration cannot
+ * be applied, the @error will have a domain of #GNOME_RR_ERROR.  Note that an
+ * error code of #GNOME_RR_ERROR_NO_MATCHING_CONFIG is not a real error; it
+ * simply means that there were no stored configurations that match the current
+ * set of RANDR outputs.
+ *
+ * If the file in question cannot be loaded, the @error will have a domain of
+ * #G_FILE_ERROR.  Note that an error code of G_FILE_ERROR_NOENT is not really
+ * an error, either; it means that there was no stored configuration file and so
+ * nothing is changed.
+ */
 gboolean
-gnome_rr_config_apply (GnomeRRConfig *config,
-		       GnomeRRScreen *screen,
-		       GError       **error)
+gnome_rr_config_apply_from_filename_with_time (GnomeRRScreen *screen, const char *filename, guint32 timestamp, GError **error)
 {
-    return gnome_rr_config_apply_helper (config, screen, FALSE, error);
-}
+    GnomeRRConfig *stored;
 
-gboolean
-gnome_rr_config_apply_persistent (GnomeRRConfig *config,
-				  GnomeRRScreen *screen,
-				  GError       **error)
-{
-    return gnome_rr_config_apply_helper (config, screen, TRUE, error);
+    g_return_val_if_fail (GNOME_IS_RR_SCREEN (screen), FALSE);
+    g_return_val_if_fail (filename != NULL, FALSE);
+    g_return_val_if_fail (error == NULL || *error == NULL, FALSE);
+
+    stored = g_object_new (GNOME_TYPE_RR_CONFIG, "screen", screen, NULL);
+
+    if (gnome_rr_config_load_filename (stored, filename, error))
+    {
+	gboolean result;
+
+        gnome_rr_config_ensure_primary (stored);
+	result = gnome_rr_config_apply_with_time (stored, screen, timestamp, error);
+
+	g_object_unref (stored);
+	return result;
+    }
+    else
+    {
+	g_object_unref (stored);
+	return FALSE;
+    }
 }
 
 /**
@@ -697,7 +1418,6 @@
 
 struct CrtcAssignment
 {
-    GnomeRROutputInfo **outputs;
     GnomeRRScreen *screen;
     GHashTable *info;
     GnomeRROutput *primary;
@@ -759,8 +1479,9 @@
     if (!gnome_rr_crtc_supports_rotation (crtc, rotation))
     {
 	g_set_error (error, GNOME_RR_ERROR, GNOME_RR_ERROR_CRTC_ASSIGNMENT,
-		     _("CRTC %d does not support rotation=%d"),
-		     crtc_id, rotation);
+		     _("CRTC %d does not support rotation=%s"),
+		     crtc_id,
+		     get_rotation_name (rotation));
 	return FALSE;
     }
 
@@ -775,12 +1496,12 @@
 			 _("output %s does not have the same parameters as another cloned output:\n"
 			   "existing mode = %d, new mode = %d\n"
 			   "existing coordinates = (%d, %d), new coordinates = (%d, %d)\n"
-			   "existing rotation = %d, new rotation = %d"),
+			   "existing rotation = %s, new rotation = %s"),
 			 output_name,
 			 gnome_rr_mode_get_id (info->mode), gnome_rr_mode_get_id (mode),
 			 info->x, info->y,
 			 x, y,
-			 info->rotation, rotation);
+			 get_rotation_name (info->rotation), get_rotation_name (rotation));
 	    return FALSE;
 	}
 
@@ -853,6 +1574,35 @@
     g_free (assign);
 }
 
+typedef struct {
+    guint32 timestamp;
+    gboolean has_error;
+    GError **error;
+} ConfigureCrtcState;
+
+static void
+configure_crtc (gpointer key,
+		gpointer value,
+		gpointer data)
+{
+    GnomeRRCrtc *crtc = key;
+    CrtcInfo *info = value;
+    ConfigureCrtcState *state = data;
+
+    if (state->has_error)
+	return;
+
+    if (!gnome_rr_crtc_set_config_with_time (crtc,
+					     state->timestamp,
+					     info->x, info->y,
+					     info->mode,
+					     info->rotation,
+					     (GnomeRROutput **)info->outputs->pdata,
+					     info->outputs->len,
+					     state->error))
+	state->has_error = TRUE;
+}
+
 static gboolean
 mode_is_rotated (CrtcInfo *info)
 {
@@ -864,6 +1614,20 @@
     return FALSE;
 }
 
+static gboolean
+crtc_is_rotated (GnomeRRCrtc *crtc)
+{
+    GnomeRRRotation r = gnome_rr_crtc_get_current_rotation (crtc);
+
+    if ((r & GNOME_RR_ROTATION_270)		||
+	(r & GNOME_RR_ROTATION_90))
+    {
+	return TRUE;
+    }
+
+    return FALSE;
+}
+
 static void
 accumulate_error (GString *accumulated_error, GError *error)
 {
@@ -1042,13 +1806,10 @@
 }
 
 static CrtcAssignment *
-crtc_assignment_new (GnomeRRScreen      *screen,
-		     GnomeRROutputInfo **outputs,
-		     GError            **error)
+crtc_assignment_new (GnomeRRScreen *screen, GnomeRROutputInfo **outputs, GError **error)
 {
     CrtcAssignment *assignment = g_new0 (CrtcAssignment, 1);
 
-    assignment->outputs = outputs;
     assignment->info = g_hash_table_new_full (
 	g_direct_hash, g_direct_equal, NULL, (GFreeFunc)crtc_info_free);
 
@@ -1088,96 +1849,102 @@
     return NULL;
 }
 
-#define ROTATION_MASK 0x7F
-
-static enum wl_output_transform
-rotation_to_transform (GnomeRRRotation rotation)
-{
-  static const enum wl_output_transform y_reflected_map[] = {
-    WL_OUTPUT_TRANSFORM_FLIPPED_180,
-    WL_OUTPUT_TRANSFORM_FLIPPED_90,
-    WL_OUTPUT_TRANSFORM_FLIPPED,
-    WL_OUTPUT_TRANSFORM_FLIPPED_270
-  };
-  enum wl_output_transform ret;
-
-  switch (rotation & ROTATION_MASK)
-    {
-    default:
-    case GNOME_RR_ROTATION_0:
-      ret = WL_OUTPUT_TRANSFORM_NORMAL;
-      break;
-    case GNOME_RR_ROTATION_90:
-      ret = WL_OUTPUT_TRANSFORM_90;
-      break;
-    case GNOME_RR_ROTATION_180:
-      ret = WL_OUTPUT_TRANSFORM_180;
-      break;
-    case GNOME_RR_ROTATION_270:
-      ret = WL_OUTPUT_TRANSFORM_270;
-      break;
-    }
-
-  if (rotation & GNOME_RR_REFLECT_X)
-    return ret + 4;
-  else if (rotation & GNOME_RR_REFLECT_Y)
-    return y_reflected_map[ret];
-  else
-    return ret;
-}
-
 static gboolean
-crtc_assignment_apply (CrtcAssignment *assign, gboolean persistent, GError **error)
+crtc_assignment_apply (CrtcAssignment *assign, guint32 timestamp, GError **error)
 {
-    GVariantBuilder crtc_builder, output_builder, nested_outputs;
-    GHashTableIter iter;
-    GnomeRRCrtc *crtc;
-    CrtcInfo *info;
-    unsigned i;
+    GnomeRRCrtc **all_crtcs = gnome_rr_screen_list_crtcs (assign->screen);
+    int width, height;
+    int i;
+    int min_width, max_width, min_height, max_height;
+    int width_mm, height_mm;
+    gboolean success = TRUE;
+
+    /* Compute size of the screen */
+    get_required_virtual_size (assign, &width, &height);
+
+    gnome_rr_screen_get_ranges (
+	assign->screen, &min_width, &max_width, &min_height, &max_height);
 
-    g_variant_builder_init (&crtc_builder, G_VARIANT_TYPE ("a(uiiiuaua{sv})"));
-    g_variant_builder_init (&output_builder, G_VARIANT_TYPE ("a(ua{sv})"));
+    /* We should never get here if the dimensions don't fit in the virtual size,
+     * but just in case we do, fix it up.
+     */
+    width = MAX (min_width, width);
+    width = MIN (max_width, width);
+    height = MAX (min_height, height);
+    height = MIN (max_height, height);
+
+    /* FMQ: do we need to check the sizes instead of clamping them? */
+
+    /* Grab the server while we fiddle with the CRTCs and the screen, so that
+     * apps that listen for RANDR notifications will only receive the final
+     * status.
+     */
+
+    gdk_x11_display_grab (gdk_screen_get_display (assign->screen->priv->gdk_screen));
 
-    g_hash_table_iter_init (&iter, assign->info);
-    while (g_hash_table_iter_next (&iter, (void*) &crtc, (void*) &info))
+    /* Turn off all crtcs that are currently displaying outside the new screen,
+     * or are not used in the new setup
+     */
+    for (i = 0; all_crtcs[i] != NULL; ++i)
     {
-	g_variant_builder_init (&nested_outputs, G_VARIANT_TYPE ("au"));
-	for (i = 0; i < info->outputs->len; i++)
+	GnomeRRCrtc *crtc = all_crtcs[i];
+	GnomeRRMode *mode = gnome_rr_crtc_get_current_mode (crtc);
+	int x, y;
+
+	if (mode)
 	{
-	    GnomeRROutput *output = g_ptr_array_index (info->outputs, i);
+	    int w, h;
+	    gnome_rr_crtc_get_position (crtc, &x, &y);
 
-	    g_variant_builder_add (&nested_outputs, "u",
-				   gnome_rr_output_get_id (output));
-	}
+	    w = gnome_rr_mode_get_width (mode);
+	    h = gnome_rr_mode_get_height (mode);
 
-	g_variant_builder_add (&crtc_builder, "(uiiiuaua{sv})",
-			       gnome_rr_crtc_get_id (crtc),
-			       info->mode ?
-			       gnome_rr_mode_get_id (info->mode) : -1,
-			       info->x,
-			       info->y,
-			       rotation_to_transform (info->rotation),
-			       &nested_outputs,
-			       NULL);
+	    if (crtc_is_rotated (crtc))
+	    {
+		int tmp = h;
+		h = w;
+		w = tmp;
+	    }
+	    
+	    if (x + w > width || y + h > height || !g_hash_table_lookup (assign->info, crtc))
+	    {
+		if (!gnome_rr_crtc_set_config_with_time (crtc, timestamp, 0, 0, NULL, GNOME_RR_ROTATION_0, NULL, 0, error))
+		{
+		    success = FALSE;
+		    break;
+		}
+		
+	    }
+	}
     }
 
-    for (i = 0; assign->outputs[i]; i++)
+    /* The 'physical size' of an X screen is meaningless if that screen
+     * can consist of many monitors. So just pick a size that make the
+     * dpi 96.
+     *
+     * Firefox and Evince apparently believe what X tells them.
+     */
+    width_mm = (width / DPI_FALLBACK) * 25.4 + 0.5;
+    height_mm = (height / DPI_FALLBACK) * 25.4 + 0.5;
+
+    if (success)
     {
-	GnomeRROutputInfo *output = assign->outputs[i];
-	GnomeRROutput *gnome_rr_output = gnome_rr_screen_get_output_by_name (assign->screen,
-									     output->priv->name);
+	ConfigureCrtcState state;
 
-	g_variant_builder_add (&output_builder, "(u@a{sv})",
-			       gnome_rr_output_get_id (gnome_rr_output),
-			       g_variant_new_parsed ("{ 'primary': <%b>,"
-						     "  'presentation': <%b> }",
-						     output->priv->primary,
-						     FALSE));
+	gnome_rr_screen_set_size (assign->screen, width, height, width_mm, height_mm);
+
+	state.timestamp = timestamp;
+	state.has_error = FALSE;
+	state.error = error;
+	
+	g_hash_table_foreach (assign->info, configure_crtc, &state);
+
+	success = !state.has_error;
     }
 
-    return _gnome_rr_screen_apply_configuration (assign->screen,
-						 persistent,
-						 g_variant_builder_end (&crtc_builder),
-						 g_variant_builder_end (&output_builder),
-						 error);
+    gnome_rr_screen_set_primary_output (assign->screen, assign->primary);
+
+    gdk_x11_display_ungrab (gdk_screen_get_display (assign->screen->priv->gdk_screen));
+
+    return success;
 }
diff -Nru gnome-desktop3-3.12.0/libgnome-desktop/gnome-rr-config.h gnome-desktop3-3.8.4/libgnome-desktop/gnome-rr-config.h
--- gnome-desktop3-3.12.0/libgnome-desktop/gnome-rr-config.h	2014-01-16 12:37:26.000000000 +0000
+++ gnome-desktop3-3.8.4/libgnome-desktop/gnome-rr-config.h	2013-09-04 11:15:57.000000000 +0000
@@ -73,12 +73,11 @@
 
 GnomeRRRotation gnome_rr_output_info_get_rotation (GnomeRROutputInfo *self);
 void            gnome_rr_output_info_set_rotation (GnomeRROutputInfo *self, GnomeRRRotation rotation);
-gboolean        gnome_rr_output_info_supports_rotation (GnomeRROutputInfo *self, GnomeRRRotation rotation);
 
 gboolean gnome_rr_output_info_is_connected     (GnomeRROutputInfo *self);
-const char *gnome_rr_output_info_get_vendor    (GnomeRROutputInfo *self);
-const char *gnome_rr_output_info_get_product   (GnomeRROutputInfo *self);
-const char *gnome_rr_output_info_get_serial    (GnomeRROutputInfo *self);
+void     gnome_rr_output_info_get_vendor       (GnomeRROutputInfo *self, gchar* vendor);
+guint    gnome_rr_output_info_get_product      (GnomeRROutputInfo *self);
+guint    gnome_rr_output_info_get_serial       (GnomeRROutputInfo *self);
 double   gnome_rr_output_info_get_aspect_ratio (GnomeRROutputInfo *self);
 char    *gnome_rr_output_info_get_display_name (GnomeRROutputInfo *self);
 
@@ -116,21 +115,31 @@
 
 GnomeRRConfig      *gnome_rr_config_new_current  (GnomeRRScreen  *screen,
 						  GError        **error);
-gboolean            gnome_rr_config_load_current (GnomeRRConfig  *self,
+GnomeRRConfig      *gnome_rr_config_new_stored   (GnomeRRScreen  *screen,
 						  GError        **error);
+gboolean                gnome_rr_config_load_current (GnomeRRConfig  *self,
+						      GError        **error);
+gboolean                gnome_rr_config_load_filename (GnomeRRConfig  *self,
+						       const gchar    *filename,
+						       GError        **error);
 gboolean            gnome_rr_config_match        (GnomeRRConfig  *config1,
 						  GnomeRRConfig  *config2);
 gboolean            gnome_rr_config_equal	 (GnomeRRConfig  *config1,
 						  GnomeRRConfig  *config2);
+gboolean            gnome_rr_config_save         (GnomeRRConfig  *configuration,
+						  GError        **error);
 void                gnome_rr_config_sanitize     (GnomeRRConfig  *configuration);
 gboolean            gnome_rr_config_ensure_primary (GnomeRRConfig  *configuration);
 
-gboolean	    gnome_rr_config_apply  (GnomeRRConfig  *configuration,
-					    GnomeRRScreen  *screen,
-					    GError        **error);
-gboolean	    gnome_rr_config_apply_persistent  (GnomeRRConfig  *configuration,
-						       GnomeRRScreen  *screen,
-						       GError        **error);
+gboolean	    gnome_rr_config_apply_with_time (GnomeRRConfig  *configuration,
+						     GnomeRRScreen  *screen,
+						     guint32         timestamp,
+						     GError        **error);
+
+gboolean            gnome_rr_config_apply_from_filename_with_time (GnomeRRScreen  *screen,
+								   const char     *filename,
+								   guint32         timestamp,
+								   GError        **error);
 
 gboolean            gnome_rr_config_applicable   (GnomeRRConfig  *configuration,
 						  GnomeRRScreen  *screen,
@@ -140,4 +149,7 @@
 void                gnome_rr_config_set_clone    (GnomeRRConfig  *configuration, gboolean clone);
 GnomeRROutputInfo **gnome_rr_config_get_outputs  (GnomeRRConfig  *configuration);
 
+char *gnome_rr_config_get_backup_filename (void);
+char *gnome_rr_config_get_intended_filename (void);
+
 #endif
diff -Nru gnome-desktop3-3.12.0/libgnome-desktop/gnome-rr-debug.c gnome-desktop3-3.8.4/libgnome-desktop/gnome-rr-debug.c
--- gnome-desktop3-3.12.0/libgnome-desktop/gnome-rr-debug.c	2014-01-07 13:28:18.000000000 +0000
+++ gnome-desktop3-3.8.4/libgnome-desktop/gnome-rr-debug.c	2013-09-04 11:15:57.000000000 +0000
@@ -24,15 +24,52 @@
 #include 
 #include 
 #include 
+#include 
+#include 
 
+/**
+ * get_property:
+ **/
+static guint8 *
+get_property (Display *dpy,
+	      RROutput output,
+	      Atom atom,
+	      gsize *len)
+{
+	unsigned char *prop;
+	int actual_format;
+	unsigned long nitems, bytes_after;
+	Atom actual_type;
+	guint8 *result = NULL;
+
+	XRRGetOutputProperty (dpy, output, atom,
+			      0, 100, False, False,
+			      AnyPropertyType,
+			      &actual_type, &actual_format,
+			      &nitems, &bytes_after, &prop);
+
+	if (actual_type == XA_INTEGER && actual_format == 8) {
+		result = g_memdup (prop, nitems);
+		if (len)
+			*len = nitems;
+	}
+	XFree (prop);
+	return result;
+}
+
+/**
+ * main:
+ **/
 int
 main (int argc, char *argv[])
 {
+	Atom edid_atom;
+	Display *display;
 	GError *error = NULL;
 	GnomeRROutput **outputs;
 	GnomeRRScreen *screen;
 	gsize len = 0;
-	const guint8 *result = NULL;
+	guint8 *result = NULL;
 	guint i;
 
 	gtk_init (&argc, &argv);
@@ -42,24 +79,39 @@
 		g_error_free (error);
 		goto out;
 	}
+	display = GDK_SCREEN_XDISPLAY (gdk_screen_get_default ());
 	outputs = gnome_rr_screen_list_outputs (screen);
 	for (i = 0; outputs[i] != NULL; i++) {
-		int width_mm, height_mm;
-
 		g_print ("[%s]\n", gnome_rr_output_get_name (outputs[i]));
-		g_print ("\tconnected: %i\n", 1);
-		g_print ("\tbuilt-in: %i\n", gnome_rr_output_is_builtin_display (outputs[i]));
+		g_print ("\tconnected: %i\n", gnome_rr_output_is_connected (outputs[i]));
+		g_print ("\tlaptop: %i\n", gnome_rr_output_is_laptop (outputs[i]));
 		g_print ("\tprimary: %i\n", gnome_rr_output_get_is_primary (outputs[i]));
 		g_print ("\tid: %i\n", gnome_rr_output_get_id (outputs[i]));
-		gnome_rr_output_get_physical_size (outputs[i], &width_mm, &height_mm);
-		g_print ("\tdimensions: %ix%i", width_mm, height_mm);
 
 		/* get EDID (first try) */
-                result = gnome_rr_output_get_edid_data (outputs[i], &len);
+		edid_atom = XInternAtom (display, "EDID", FALSE);
+		result = get_property (display,
+				       gnome_rr_output_get_id (outputs[i]),
+				       edid_atom,
+				       &len);
 		if (result != NULL) {
 			g_print ("\tedid: %" G_GSIZE_FORMAT " bytes [%i:%i:%i:%i]\n",
 				 len, result[0], result[1],
 				 result[2], result[3]);
+			g_free (result);
+		}
+
+		/* get EDID (second try) */
+		edid_atom = XInternAtom (display, "EDID_DATA", FALSE);
+		result = get_property (display,
+				       gnome_rr_output_get_id (outputs[i]),
+				       edid_atom,
+				       &len);
+		if (result != NULL) {
+			g_print ("\tedid2: %" G_GSIZE_FORMAT " bytes [%i:%i:%i:%i]\n",
+				 len, result[0], result[1],
+				 result[2], result[3]);
+			g_free (result);
 		}
 	}
 out:
diff -Nru gnome-desktop3-3.12.0/libgnome-desktop/gnome-rr.h gnome-desktop3-3.8.4/libgnome-desktop/gnome-rr.h
--- gnome-desktop3-3.12.0/libgnome-desktop/gnome-rr.h	2014-01-07 13:28:18.000000000 +0000
+++ gnome-desktop3-3.8.4/libgnome-desktop/gnome-rr.h	2013-09-04 11:15:57.000000000 +0000
@@ -86,7 +86,7 @@
     GNOME_RR_ERROR_NO_DPMS_EXTENSION,	/* DPMS extension is not present */
 } GnomeRRError;
 
-#define GNOME_RR_CONNECTOR_TYPE_PANEL "Panel"  /* This is a built-in LCD */
+#define GNOME_RR_CONNECTOR_TYPE_PANEL "Panel"  /* This is a laptop's built-in LCD */
 
 #define GNOME_TYPE_RR_SCREEN                  (gnome_rr_screen_get_type())
 #define GNOME_RR_SCREEN(obj)                  (G_TYPE_CHECK_INSTANCE_CAST ((obj), GNOME_TYPE_RR_SCREEN, GnomeRRScreen))
@@ -107,15 +107,15 @@
 /* GnomeRRScreen */
 GnomeRRScreen * gnome_rr_screen_new                (GdkScreen             *screen,
 						    GError               **error);
-void            gnome_rr_screen_new_async          (GdkScreen             *screen,
-                                                    GAsyncReadyCallback    callback,
-                                                    gpointer               user_data);
-GnomeRRScreen * gnome_rr_screen_new_finish         (GAsyncResult          *result,
-                                                    GError               **error);
 GnomeRROutput **gnome_rr_screen_list_outputs       (GnomeRRScreen         *screen);
 GnomeRRCrtc **  gnome_rr_screen_list_crtcs         (GnomeRRScreen         *screen);
 GnomeRRMode **  gnome_rr_screen_list_modes         (GnomeRRScreen         *screen);
 GnomeRRMode **  gnome_rr_screen_list_clone_modes   (GnomeRRScreen	  *screen);
+void            gnome_rr_screen_set_size           (GnomeRRScreen         *screen,
+						    int                    width,
+						    int                    height,
+						    int                    mm_width,
+						    int                    mm_height);
 GnomeRRCrtc *   gnome_rr_screen_get_crtc_by_id     (GnomeRRScreen         *screen,
 						    guint32                id);
 gboolean        gnome_rr_screen_refresh            (GnomeRRScreen         *screen,
@@ -129,6 +129,12 @@
 						    int                   *max_width,
 						    int                   *min_height,
 						    int                   *max_height);
+void            gnome_rr_screen_get_timestamps     (GnomeRRScreen         *screen,
+						    guint32               *change_timestamp_ret,
+						    guint32               *config_timestamp_ret);
+
+void            gnome_rr_screen_set_primary_output (GnomeRRScreen         *screen,
+                                                    GnomeRROutput         *output);
 
 GnomeRRMode   **gnome_rr_screen_create_clone_modes (GnomeRRScreen *screen);
 
@@ -143,18 +149,21 @@
 guint32         gnome_rr_output_get_id             (GnomeRROutput         *output);
 const char *    gnome_rr_output_get_name           (GnomeRROutput         *output);
 const char *    gnome_rr_output_get_display_name   (GnomeRROutput         *output);
+gboolean        gnome_rr_output_is_connected       (GnomeRROutput         *output);
+int             gnome_rr_output_get_size_inches    (GnomeRROutput         *output);
+int             gnome_rr_output_get_width_mm       (GnomeRROutput         *outout);
+int             gnome_rr_output_get_height_mm      (GnomeRROutput         *output);
 const guint8 *  gnome_rr_output_get_edid_data      (GnomeRROutput         *output,
-						    gsize                 *size);
-void            gnome_rr_output_get_ids_from_edid  (GnomeRROutput         *output,
+                                                    gsize                 *size);
+gboolean        gnome_rr_output_get_ids_from_edid  (GnomeRROutput         *output,
                                                     char                 **vendor,
-                                                    char                 **product,
-                                                    char                 **serial);
-void            gnome_rr_output_get_physical_size  (GnomeRROutput         *output,
-                                                    int                   *width_mm,
-                                                    int                   *height_mm);
+                                                    int                   *product,
+                                                    int                   *serial);
 
-gint            gnome_rr_output_get_backlight      (GnomeRROutput         *output);
-gint            gnome_rr_output_get_min_backlight_step(GnomeRROutput      *output);
+gint            gnome_rr_output_get_backlight_min  (GnomeRROutput         *output);
+gint            gnome_rr_output_get_backlight_max  (GnomeRROutput         *output);
+gint            gnome_rr_output_get_backlight      (GnomeRROutput         *output,
+                                                    GError                **error);
 gboolean        gnome_rr_output_set_backlight      (GnomeRROutput         *output,
                                                     gint                   value,
                                                     GError                **error);
@@ -162,7 +171,8 @@
 GnomeRRCrtc **  gnome_rr_output_get_possible_crtcs (GnomeRROutput         *output);
 GnomeRRMode *   gnome_rr_output_get_current_mode   (GnomeRROutput         *output);
 GnomeRRCrtc *   gnome_rr_output_get_crtc           (GnomeRROutput         *output);
-gboolean        gnome_rr_output_is_builtin_display (GnomeRROutput         *output);
+const char *    gnome_rr_output_get_connector_type (GnomeRROutput         *output);
+gboolean        gnome_rr_output_is_laptop          (GnomeRROutput         *output);
 void            gnome_rr_output_get_position       (GnomeRROutput         *output,
 						    int                   *x,
 						    int                   *y);
@@ -183,6 +193,15 @@
 /* GnomeRRCrtc */
 guint32         gnome_rr_crtc_get_id               (GnomeRRCrtc           *crtc);
 
+gboolean        gnome_rr_crtc_set_config_with_time (GnomeRRCrtc           *crtc,
+						    guint32                timestamp,
+						    int                    x,
+						    int                    y,
+						    GnomeRRMode           *mode,
+						    GnomeRRRotation        rotation,
+						    GnomeRROutput        **outputs,
+						    int                    n_outputs,
+						    GError               **error);
 gboolean        gnome_rr_crtc_can_drive_output     (GnomeRRCrtc           *crtc,
 						    GnomeRROutput         *output);
 GnomeRRMode *   gnome_rr_crtc_get_current_mode     (GnomeRRCrtc           *crtc);
@@ -199,10 +218,9 @@
 						    unsigned short       **red,
 						    unsigned short       **green,
 						    unsigned short       **blue);
-gboolean        gnome_rr_crtc_set_gamma            (GnomeRRCrtc           *crtc,
+void            gnome_rr_crtc_set_gamma            (GnomeRRCrtc           *crtc,
 						    int                    size,
 						    unsigned short        *red,
 						    unsigned short        *green,
 						    unsigned short        *blue);
-
 #endif /* GNOME_RR_H */
diff -Nru gnome-desktop3-3.12.0/libgnome-desktop/gnome-rr-output-info.c gnome-desktop3-3.8.4/libgnome-desktop/gnome-rr-output-info.c
--- gnome-desktop3-3.12.0/libgnome-desktop/gnome-rr-output-info.c	2014-01-16 12:37:26.000000000 +0000
+++ gnome-desktop3-3.8.4/libgnome-desktop/gnome-rr-output-info.c	2013-09-04 11:15:57.000000000 +0000
@@ -154,13 +154,6 @@
     self->priv->rotation = rotation;
 }
 
-gboolean gnome_rr_output_info_supports_rotation (GnomeRROutputInfo *self, GnomeRRRotation rotation)
-{
-    g_return_val_if_fail (GNOME_IS_RR_OUTPUT_INFO (self), FALSE);
-
-    return (self->priv->available_rotations & rotation);
-}
-
 /**
  * gnome_rr_output_info_is_connected:
  *
@@ -176,27 +169,29 @@
 /**
  * gnome_rr_output_info_get_vendor:
  * @self: a #GnomeRROutputInfo
+ * @vendor: (out caller-allocates) (array fixed-size=4):
  */
-const char *
-gnome_rr_output_info_get_vendor (GnomeRROutputInfo *self)
+void gnome_rr_output_info_get_vendor (GnomeRROutputInfo *self, gchar* vendor)
 {
-    g_return_val_if_fail (GNOME_IS_RR_OUTPUT_INFO (self), NULL);
+    g_return_if_fail (GNOME_IS_RR_OUTPUT_INFO (self));
+    g_return_if_fail (vendor != NULL);
 
-    return self->priv->vendor;
+    vendor[0] = self->priv->vendor[0];
+    vendor[1] = self->priv->vendor[1];
+    vendor[2] = self->priv->vendor[2];
+    vendor[3] = self->priv->vendor[3];
 }
 
-const char *
-gnome_rr_output_info_get_product (GnomeRROutputInfo *self)
+guint gnome_rr_output_info_get_product (GnomeRROutputInfo *self)
 {
-    g_return_val_if_fail (GNOME_IS_RR_OUTPUT_INFO (self), NULL);
+    g_return_val_if_fail (GNOME_IS_RR_OUTPUT_INFO (self), 0);
 
     return self->priv->product;
 }
 
-const char *
-gnome_rr_output_info_get_serial (GnomeRROutputInfo *self)
+guint gnome_rr_output_info_get_serial (GnomeRROutputInfo *self)
 {
-    g_return_val_if_fail (GNOME_IS_RR_OUTPUT_INFO (self), NULL);
+    g_return_val_if_fail (GNOME_IS_RR_OUTPUT_INFO (self), 0);
 
     return self->priv->serial;
 }
diff -Nru gnome-desktop3-3.12.0/libgnome-desktop/gnome-rr-private.h gnome-desktop3-3.8.4/libgnome-desktop/gnome-rr-private.h
--- gnome-desktop3-3.12.0/libgnome-desktop/gnome-rr-private.h	2014-01-16 12:37:26.000000000 +0000
+++ gnome-desktop3-3.8.4/libgnome-desktop/gnome-rr-private.h	2013-09-04 11:15:57.000000000 +0000
@@ -1,23 +1,9 @@
 #ifndef GNOME_RR_PRIVATE_H
 #define GNOME_RR_PRIVATE_H
 
-#ifdef GDK_WINDOWING_WAYLAND
-#include 
-#else
-enum wl_output_transform {
-  WL_OUTPUT_TRANSFORM_NORMAL,
-  WL_OUTPUT_TRANSFORM_90,
-  WL_OUTPUT_TRANSFORM_180,
-  WL_OUTPUT_TRANSFORM_270,
-  WL_OUTPUT_TRANSFORM_FLIPPED,
-  WL_OUTPUT_TRANSFORM_FLIPPED_90,
-  WL_OUTPUT_TRANSFORM_FLIPPED_180,
-  WL_OUTPUT_TRANSFORM_FLIPPED_270
-};
-#endif
+#include 
 
-#include "meta-xrandr-shared.h"
-#include "meta-dbus-xrandr.h"
+#include 
 
 typedef struct ScreenInfo ScreenInfo;
 
@@ -28,7 +14,7 @@
     int			min_height;
     int			max_height;
 
-    guint               serial;
+    XRRScreenResources *resources;
     
     GnomeRROutput **	outputs;
     GnomeRRCrtc **	crtcs;
@@ -38,17 +24,24 @@
 
     GnomeRRMode **	clone_modes;
 
-    GnomeRROutput *     primary;
+    RROutput            primary;
 };
 
 struct GnomeRRScreenPrivate
 {
     GdkScreen *			gdk_screen;
     GdkWindow *			gdk_root;
+    Display *			xdisplay;
+    Screen *			xscreen;
+    Window			xroot;
     ScreenInfo *		info;
-
-    int                         init_name_watch_id;
-    MetaDBusDisplayConfig      *proxy;
+    
+    int				randr_event_base;
+    int				rr_major_version;
+    int				rr_minor_version;
+    
+    Atom                        connector_type_atom;
+    gboolean                    dpms_capable;
 };
 
 struct _GnomeRROutputInfoPrivate
@@ -62,12 +55,11 @@
     int			x;
     int			y;
     GnomeRRRotation	rotation;
-    GnomeRRRotation	available_rotations;
 
     gboolean		connected;
-    char *		vendor;
-    char *		product;
-    char *		serial;
+    gchar		vendor[4];
+    guint		product;
+    guint		serial;
     double		aspect;
     int			pref_width;
     int			pref_height;
@@ -82,12 +74,6 @@
   GnomeRROutputInfo **outputs;
 };
 
-gboolean _gnome_rr_output_name_is_builtin_display (const char *name);
-
-gboolean _gnome_rr_screen_apply_configuration (GnomeRRScreen  *screen,
-					       gboolean        persistent,
-					       GVariant       *crtcs,
-					       GVariant       *outputs,
-					       GError        **error);
+gboolean _gnome_rr_output_name_is_laptop (const char *name);
 
 #endif
diff -Nru gnome-desktop3-3.12.0/libgnome-desktop/gnome-wall-clock.c gnome-desktop3-3.8.4/libgnome-desktop/gnome-wall-clock.c
--- gnome-desktop3-3.12.0/libgnome-desktop/gnome-wall-clock.c	2014-02-03 17:25:59.000000000 +0000
+++ gnome-desktop3-3.8.4/libgnome-desktop/gnome-wall-clock.c	2013-09-04 11:15:57.000000000 +0000
@@ -229,32 +229,12 @@
 	g_type_class_add_private (gobject_class, sizeof (GnomeWallClockPrivate));
 }
 
-/* Some of our translations use the ratio symbol which isn't
- * convertible to non-UTF-8 locale encodings.
- */
-static char *
-filter_ratio_for_locale (const char *input)
-{
-	char **pieces = NULL;
-	char *output = NULL;
-
-	if (g_get_charset (NULL)) /* UTF-8 is ok */
-		return g_strdup (input);
-
-	/* else, we'll replace ratio with a plain colon */
-	pieces = g_strsplit (input, "∶", -1);
-	output = g_strjoinv (":", pieces);
-	g_strfreev (pieces);
-	return output;
-}
-
 static gboolean
 update_clock (gpointer data)
 {
 	GnomeWallClock   *self = data;
 	GDesktopClockFormat clock_format;
 	const char *format_string;
-	char *safe_format_string;
 	gboolean show_full_date;
 	gboolean show_weekday;
 	gboolean show_seconds;
@@ -286,47 +266,53 @@
 	    self->priv->ampm_available == FALSE) {
 		if (show_full_date) {
 			/* Translators: This is the time format with full date used
-			   in 24-hour mode. */
-			format_string = show_seconds ? _("%a %b %e, %R:%S")
+			   in 24-hour mode.
+                           The character between %R and %S is U+2236 RATIO */
+			format_string = show_seconds ? _("%a %b %e, %R∶%S")
 				: _("%a %b %e, %R");
 		} else if (show_weekday) {
 			/* Translators: This is the time format with day used
-			   in 24-hour mode. */
-			format_string = show_seconds ? _("%a %R:%S")
+			   in 24-hour mode.
+                           The character between %R and %S is U+2236 RATIO */
+			format_string = show_seconds ? _("%a %R∶%S")
 				: _("%a %R");
 		} else {
 			/* Translators: This is the time format without date used
-			   in 24-hour mode. */
-			format_string = show_seconds ? _("%R:%S") : _("%R");
+			   in 24-hour mode.
+                           The character between %R and %S is U+2236 RATIO */
+			format_string = show_seconds ? _("%R∶%S") : _("%R");
 		}
 	} else {
 		if (show_full_date) {
 			/* Translators: This is a time format with full date used
-			   for AM/PM. */
-			format_string = show_seconds ? _("%a %b %e, %l:%M:%S %p")
-				: _("%a %b %e, %l:%M %p");
+			   for AM/PM.
+                           The Unicode characters are U+2236 RATIO and
+                           U+2009 THIN SPACE */
+			format_string = show_seconds ? _("%a %b %e, %l∶%M∶%S %p")
+				: _("%a %b %e, %l∶%M %p");
 		} else if (show_weekday) {
 			/* Translators: This is a time format with day used
-			   for AM/PM. */
-			format_string = show_seconds ? _("%a %l:%M:%S %p")
-				: _("%a %l:%M %p");
+			   for AM/PM.
+                           The Unicode characters are U+2236 RATIO and
+                           U+2009 THIN SPACE */
+			format_string = show_seconds ? _("%a %l∶%M∶%S %p")
+				: _("%a %l∶%M %p");
 		} else {
 			/* Translators: This is a time format without date used
-			   for AM/PM. */
-			format_string = show_seconds ? _("%l:%M:%S %p")
-				: _("%l:%M %p");
+			   for AM/PM.
+                           The Unicode characters are U+2236 RATIO and
+                           U+2009 THIN SPACE */
+			format_string = show_seconds ? _("%l∶%M∶%S %p")
+				: _("%l∶%M %p");
 		}
 	}
 
-	safe_format_string = filter_ratio_for_locale (format_string);
-
 	g_free (self->priv->clock_string);
-	self->priv->clock_string = g_date_time_format (now, safe_format_string);
+	self->priv->clock_string = g_date_time_format (now, format_string);
 
 	g_date_time_unref (now);
 	g_date_time_unref (expiry);
-	g_free (safe_format_string);
-
+      
 	g_object_notify ((GObject*)self, "clock");
 
 	return FALSE;
diff -Nru gnome-desktop3-3.12.0/libgnome-desktop/gnome-xkb-info.c gnome-desktop3-3.8.4/libgnome-desktop/gnome-xkb-info.c
--- gnome-desktop3-3.12.0/libgnome-desktop/gnome-xkb-info.c	2014-02-18 11:02:42.000000000 +0000
+++ gnome-desktop3-3.8.4/libgnome-desktop/gnome-xkb-info.c	2013-08-13 09:47:50.000000000 +0000
@@ -25,6 +25,9 @@
 #include 
 #include 
 
+#include 
+#include 
+
 #include 
 
 #include 
@@ -37,6 +40,12 @@
 #ifndef XKB_RULES_FILE
 #define XKB_RULES_FILE "evdev"
 #endif
+#ifndef XKB_LAYOUT
+#define XKB_LAYOUT "us"
+#endif
+#ifndef XKB_MODEL
+#define XKB_MODEL "pc105+inet"
+#endif
 
 typedef struct _Layout Layout;
 struct _Layout
@@ -47,8 +56,6 @@
   gchar *description;
   gboolean is_variant;
   const Layout *main_layout;
-  GSList *iso639Ids;
-  GSList *iso3166Ids;
 };
 
 typedef struct _XkbOption XkbOption;
@@ -97,8 +104,6 @@
   g_free (layout->xkb_name);
   g_free (layout->short_desc);
   g_free (layout->description);
-  g_slist_free_full (layout->iso639Ids, g_free);
-  g_slist_free_full (layout->iso3166Ids, g_free);
   g_slice_free (Layout, layout);
 }
 
@@ -127,13 +132,88 @@
   g_slice_free (XkbOptionGroup, group);
 }
 
+/**
+ * gnome_xkb_info_get_var_defs: (skip)
+ * @rules: (out) (transfer full): location to store the rules file
+ * path. Use g_free() when it's no longer needed
+ * @var_defs: (out) (transfer full): location to store a
+ * #XkbRF_VarDefsRec pointer. Use gnome_xkb_info_free_var_defs() to
+ * free it
+ *
+ * Gets both the XKB rules file path and the current XKB parameters in
+ * use by the X server.
+ *
+ * Since: 3.6
+ */
+void
+gnome_xkb_info_get_var_defs (gchar            **rules,
+                             XkbRF_VarDefsRec **var_defs)
+{
+  Display *display = GDK_DISPLAY_XDISPLAY (gdk_display_get_default ());
+  char *tmp;
+
+  g_return_if_fail (rules != NULL);
+  g_return_if_fail (var_defs != NULL);
+
+  *rules = NULL;
+  *var_defs = g_new0 (XkbRF_VarDefsRec, 1);
+
+  gdk_error_trap_push ();
+
+  /* Get it from the X property or fallback on defaults */
+  if (!XkbRF_GetNamesProp (display, rules, *var_defs) || !*rules)
+    {
+      *rules = strdup (XKB_RULES_FILE);
+      (*var_defs)->model = strdup (XKB_MODEL);
+      (*var_defs)->layout = strdup (XKB_LAYOUT);
+      (*var_defs)->variant = NULL;
+      (*var_defs)->options = NULL;
+    }
+
+  gdk_error_trap_pop_ignored ();
+
+  tmp = *rules;
+
+  if (*rules[0] == '/')
+    *rules = g_strdup (*rules);
+  else
+    *rules = g_build_filename (XKB_BASE, "rules", *rules, NULL);
+
+  free (tmp);
+}
+
+/**
+ * gnome_xkb_info_free_var_defs: (skip)
+ * @var_defs: #XkbRF_VarDefsRec instance to free
+ *
+ * Frees an #XkbRF_VarDefsRec instance allocated by
+ * gnome_xkb_info_get_var_defs().
+ *
+ * Since: 3.6
+ */
+void
+gnome_xkb_info_free_var_defs (XkbRF_VarDefsRec *var_defs)
+{
+  g_return_if_fail (var_defs != NULL);
+
+  free (var_defs->model);
+  free (var_defs->layout);
+  free (var_defs->variant);
+  free (var_defs->options);
+
+  g_free (var_defs);
+}
+
 static gchar *
 get_xml_rules_file_path (const gchar *suffix)
 {
+  XkbRF_VarDefsRec *xkb_var_defs;
   gchar *rules_file;
   gchar *xml_rules_file;
 
-  rules_file = g_build_filename (XKB_BASE, "rules", XKB_RULES_FILE, NULL);
+  gnome_xkb_info_get_var_defs (&rules_file, &xkb_var_defs);
+  gnome_xkb_info_free_var_defs (xkb_var_defs);
+
   xml_rules_file = g_strdup_printf ("%s%s", rules_file, suffix);
   g_free (rules_file);
 
@@ -305,60 +385,6 @@
 }
 
 static void
-add_layout_to_locale_tables (Layout     *layout,
-                             GHashTable *layouts_by_language,
-                             GHashTable *layouts_by_country)
-{
-  GSList *l, *lang_codes, *country_codes;
-  gchar *language, *country;
-
-  lang_codes = layout->iso639Ids;
-  country_codes = layout->iso3166Ids;
-
-  if (layout->is_variant)
-    {
-      if (!lang_codes)
-        lang_codes = layout->main_layout->iso639Ids;
-      if (!country_codes)
-        country_codes = layout->main_layout->iso3166Ids;
-    }
-
-  for (l = lang_codes; l; l = l->next)
-    {
-      language = gnome_get_language_from_code ((gchar *) l->data, NULL);
-      if (language)
-        {
-          add_layout_to_table (layouts_by_language, language, layout);
-          g_free (language);
-        }
-    }
-
-  for (l = country_codes; l; l = l->next)
-    {
-      country = gnome_get_country_from_code ((gchar *) l->data, NULL);
-      if (country)
-        {
-          add_layout_to_table (layouts_by_country, country, layout);
-          g_free (country);
-        }
-    }
-}
-
-static void
-add_iso639 (Layout *layout,
-            gchar  *id)
-{
-  layout->iso639Ids = g_slist_prepend (layout->iso639Ids, id);
-}
-
-static void
-add_iso3166 (Layout *layout,
-             gchar  *id)
-{
-  layout->iso3166Ids = g_slist_prepend (layout->iso3166Ids, id);
-}
-
-static void
 parse_end_element (GMarkupParseContext  *context,
                    const gchar          *element_name,
                    gpointer              data,
@@ -386,9 +412,6 @@
       g_hash_table_replace (priv->layouts_table,
                             priv->current_parser_layout->id,
                             priv->current_parser_layout);
-      add_layout_to_locale_tables (priv->current_parser_layout,
-                                   priv->layouts_by_language,
-                                   priv->layouts_by_country);
       priv->current_parser_layout = NULL;
     }
   else if (strcmp (element_name, "variant") == 0)
@@ -408,13 +431,12 @@
       g_hash_table_replace (priv->layouts_table,
                             priv->current_parser_variant->id,
                             priv->current_parser_variant);
-      add_layout_to_locale_tables (priv->current_parser_variant,
-                                   priv->layouts_by_language,
-                                   priv->layouts_by_country);
       priv->current_parser_variant = NULL;
     }
   else if (strcmp (element_name, "iso639Id") == 0)
     {
+      gchar *language;
+
       if (!priv->current_parser_iso639Id)
         {
           g_set_error (error, G_MARKUP_ERROR, G_MARKUP_ERROR_INVALID_CONTENT,
@@ -422,15 +444,23 @@
           return;
         }
 
-      if (priv->current_parser_variant)
-        add_iso639 (priv->current_parser_variant, priv->current_parser_iso639Id);
-      else if (priv->current_parser_layout)
-        add_iso639 (priv->current_parser_layout, priv->current_parser_iso639Id);
+      language = gnome_get_language_from_code (priv->current_parser_iso639Id, NULL);
+      if (language)
+        {
+          if (priv->current_parser_variant)
+            add_layout_to_table (priv->layouts_by_language, language, priv->current_parser_variant);
+          else if (priv->current_parser_layout)
+            add_layout_to_table (priv->layouts_by_language, language, priv->current_parser_layout);
 
-      priv->current_parser_iso639Id = NULL;
+          g_free (language);
+        }
+
+      g_clear_pointer (&priv->current_parser_iso639Id, g_free);
     }
   else if (strcmp (element_name, "iso3166Id") == 0)
     {
+      gchar *country;
+
       if (!priv->current_parser_iso3166Id)
         {
           g_set_error (error, G_MARKUP_ERROR, G_MARKUP_ERROR_INVALID_CONTENT,
@@ -438,12 +468,18 @@
           return;
         }
 
-      if (priv->current_parser_variant)
-        add_iso3166 (priv->current_parser_variant, priv->current_parser_iso3166Id);
-      else if (priv->current_parser_layout)
-        add_iso3166 (priv->current_parser_layout, priv->current_parser_iso3166Id);
+      country = gnome_get_country_from_code (priv->current_parser_iso3166Id, NULL);
+      if (country)
+        {
+          if (priv->current_parser_variant)
+            add_layout_to_table (priv->layouts_by_country, country, priv->current_parser_variant);
+          else if (priv->current_parser_layout)
+            add_layout_to_table (priv->layouts_by_country, country, priv->current_parser_layout);
+
+          g_free (country);
+        }
 
-      priv->current_parser_iso3166Id = NULL;
+      g_clear_pointer (&priv->current_parser_iso3166Id, g_free);
     }
   else if (strcmp (element_name, "group") == 0)
     {
diff -Nru gnome-desktop3-3.12.0/libgnome-desktop/gnome-xkb-info.h gnome-desktop3-3.8.4/libgnome-desktop/gnome-xkb-info.h
--- gnome-desktop3-3.12.0/libgnome-desktop/gnome-xkb-info.h	2014-02-13 09:41:05.000000000 +0000
+++ gnome-desktop3-3.8.4/libgnome-desktop/gnome-xkb-info.h	2013-03-17 01:49:53.000000000 +0000
@@ -30,6 +30,9 @@
 
 #include 
 
+#include 
+#include 
+
 G_BEGIN_DECLS
 
 #define GNOME_TYPE_XKB_INFO            (gnome_xkb_info_get_type ())
@@ -77,6 +80,10 @@
 GList          *gnome_xkb_info_get_layouts_for_country          (GnomeXkbInfo *self,
                                                                  const gchar  *country_code);
 
+void            gnome_xkb_info_get_var_defs                     (gchar            **rules,
+                                                                 XkbRF_VarDefsRec **var_defs);
+void            gnome_xkb_info_free_var_defs                    (XkbRF_VarDefsRec  *var_defs);
+
 G_END_DECLS
 
 #endif  /* __GNOME_XKB_INFO_H__ */
diff -Nru gnome-desktop3-3.12.0/libgnome-desktop/idle-monitor.xml gnome-desktop3-3.8.4/libgnome-desktop/idle-monitor.xml
--- gnome-desktop3-3.12.0/libgnome-desktop/idle-monitor.xml	2013-11-11 17:23:17.000000000 +0000
+++ gnome-desktop3-3.8.4/libgnome-desktop/idle-monitor.xml	1970-01-01 00:00:00.000000000 +0000
@@ -1,35 +0,0 @@
-
-
-  
-
-  
-    
-      
-    
-
-    
-      
-      
-    
-
-    
-      
-    
-
-    
-      
-    
-
-    
-      
-    
-  
-
diff -Nru gnome-desktop3-3.12.0/libgnome-desktop/libgsystem/gsystem-console.c gnome-desktop3-3.8.4/libgnome-desktop/libgsystem/gsystem-console.c
--- gnome-desktop3-3.12.0/libgnome-desktop/libgsystem/gsystem-console.c	2014-01-07 13:28:56.000000000 +0000
+++ gnome-desktop3-3.8.4/libgnome-desktop/libgsystem/gsystem-console.c	1970-01-01 00:00:00.000000000 +0000
@@ -1,443 +0,0 @@
-/* -*- mode: C; c-file-style: "gnu"; indent-tabs-mode: nil; -*-
- *
- * Copyright (C) 2013 Colin Walters 
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library 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
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- */
-
-#include "config.h"
-
-#define _GSYSTEM_NO_LOCAL_ALLOC
-#include "libgsystem.h"
-
-/**
- * SECTION:gsconsole
- * @title: GSConsole
- * @short_description: Interact with standard input/output as well as terminal
- *
- * First, this class offers API to access the standard input and
- * output/error, streams as #GInputStream and #GOutputStream
- * respectively.
- *
- * In the case where the process is connected to a controlling
- * terminal, the gs_console_get() API is available, which exposes a
- * number of additional features such as no-echo password reading.
- *
- * Since: 2.36
- */
-
-#include "config.h"
-
-#include "gsystem-console.h"
-
-#include 
-#ifdef G_OS_UNIX
-#include 
-#include 
-#include 
-#include 
-#include 
-#include 
-#endif
-#include 
-
-typedef GObjectClass GSConsoleClass;
-
-struct _GSConsole
-{
-  GObject parent;
-
-  gboolean in_status_line;
-  gssize last_line_written;
-};
-
-G_DEFINE_TYPE (GSConsole, gs_console, G_TYPE_OBJECT);
-
-static void
-gs_console_init (GSConsole  *self)
-{
-  self->last_line_written = -1;
-}
-
-static void
-gs_console_class_init (GSConsoleClass *class)
-{
-}
-
-/**
- * gs_console_get:
- *
- * If the current process has an interactive console, return the
- * singleton #GSConsole instance.  On Unix, this is equivalent to
- * isatty().  For all other cases, such as pipes, sockets, /dev/null,
- * this function will return %NULL.
- *
- * Returns: (transfer none): The console instance, or %NULL if not interactive
- *
- * Since: 2.36
- */
-GSConsole *
-gs_console_get (void)
-{
-  static gsize checked = 0;
-  static GSConsole *instance = NULL;
-
-  if (g_once_init_enter (&checked))
-    {
-#ifdef G_OS_UNIX
-      if (isatty (0) && isatty (1))
-        instance = g_object_new (GS_TYPE_CONSOLE, NULL);
-#endif
-      g_once_init_leave (&checked, 1);
-    }
-  
-  return (GSConsole*) instance;
-}
-
-/**
- * gs_console_get_stdin:
- *
- * Returns: (transfer none): The singleton stream connected to standard input
- */
-GInputStream *
-gs_console_get_stdin (void)
-{
-#ifdef G_OS_UNIX
-  static gsize instance = 0;
-
-  if (g_once_init_enter (&instance))
-    g_once_init_leave (&instance, (gsize) g_unix_input_stream_new (0, FALSE));
-  
-  return (GInputStream*) instance;
-#else
-  g_error ("not implemented");
-#endif
-}
-
-/**
- * gs_console_get_stdout:
- *
- * Returns: (transfer none): The singleton stream connected to standard output
- */
-GOutputStream *
-gs_console_get_stdout (void)
-{
-#ifdef G_OS_UNIX
-  static gsize instance = 0;
-
-  if (g_once_init_enter (&instance))
-    g_once_init_leave (&instance, (gsize) g_unix_output_stream_new (1, FALSE));
-  
-  return (GOutputStream*) instance;
-#else
-  g_error ("not implemented");
-#endif
-}
-
-/**
- * gs_console_get_stderr:
- *
- * Returns: (transfer none): The singleton stream connected to standard error
- */
-GOutputStream *
-gs_console_get_stderr (void)
-{
-#ifdef G_OS_UNIX
-  static gsize instance = 0;
-
-  if (g_once_init_enter (&instance))
-    g_once_init_leave (&instance, (gsize) g_unix_output_stream_new (2, FALSE));
-  
-  return (GOutputStream*) instance;
-#else
-  g_error ("not implemented");
-#endif
-}
-
-#ifdef G_OS_UNIX
-static inline void
-_set_error_from_errno (GError **error)
-{
-  int errsv = errno;
-  g_set_error_literal (error, G_IO_ERROR, g_io_error_from_errno (errsv),
-                       g_strerror (errsv));
-}
-#endif
-
-/**
- * gs_console_read_password:
- * @console: the #GSConsole
- * @prompt: A string to output before reading the password
- * @error: a #GError
- *
- * Write @prompt to standard output, then switch output echo off, read
- * a result string, then switch output echo back on.
- *
- * Returns: A string, or %NULL on error
- */
-char *
-gs_console_read_password (GSConsole     *console,
-                          const char    *prompt,
-                          GCancellable  *cancellable,
-                          GError       **error)
-{
-#ifdef G_OS_UNIX
-  gboolean ret = FALSE;
-  /* This code is modified from that found in
-   * polkit/src/polkittextagentlistener.c, reused under the LGPL v2.1
-   */
-  int res;
-  struct termios ts, ots;
-  GInputStream *in;
-  GOutputStream *out;
-  GString *str = NULL;
-  gsize bytes_written;
-  gboolean reset_terminal = FALSE;
-
-  in = gs_console_get_stdin ();
-  out = gs_console_get_stdout ();
-
-  if (!g_output_stream_write_all (out, prompt, strlen (prompt), &bytes_written,
-                                  cancellable, error))
-    goto out;
-  if (!g_output_stream_flush (out, cancellable, error))
-    goto out;
-
-  /* TODO: We really ought to block SIGINT and STGSTP (and probably
-   *       other signals too) so we can restore the terminal (since we
-   *       turn off echoing). See e.g. Advanced Programming in the
-   *       UNIX Environment 2nd edition (Steves and Rago) section
-   *       18.10, pg 660 where this is suggested. See also various
-   *       getpass(3) implementations
-   *
-   *       However, since we are a library routine the user could have
-   *       multiple threads - in fact, typical usage of
-   *       PolkitAgentTextListener is to run it in a thread. And
-   *       unfortunately threads and POSIX signals is a royal PITA.
-   *
-   *       Maybe we could fork(2) and ask for the password in the
-   *       child and send it back to the parent over a pipe? (we are
-   *       guaranteed that there is only one thread in the child
-   *       process).
-   *
-   *       (Side benefit of doing this in a child process is that we
-   *       could avoid blocking the thread where the
-   *       PolkitAgentTextListener object is being serviced from. But
-   *       since this class is normally used in a dedicated thread
-   *       it doesn't really matter *anyway*.)
-   *
-   *       Anyway, On modern Linux not doing this doesn't seem to be a
-   *       problem - looks like modern shells restore echoing anyway
-   *       on the first input. So maybe it's not even worth solving
-   *       the problem.
-   */
-
-  do
-    res = tcgetattr (1, &ts);
-  while (G_UNLIKELY (res == -1 && errno == EINTR));
-  if (res == -1)
-    {
-      _set_error_from_errno (error);
-      goto out;
-    }
-  ots = ts;
-  ts.c_lflag &= ~(ECHO | ECHOE | ECHOK | ECHONL);
-  do
-    res = tcsetattr (1, TCSAFLUSH, &ts);
-  while (G_UNLIKELY (res == -1 && errno == EINTR));
-  if (res == -1)
-    {
-      _set_error_from_errno (error);
-      goto out;
-    }
-
-  /* After this point, we'll need to clean up the terminal in case of
-   * error.
-   */
-  reset_terminal = TRUE;
-
-  str = g_string_new (NULL);
-  while (TRUE)
-    {
-      gssize bytes_read;
-      guint8 buf[1];
-
-      /* FIXME - we should probably be converting from the system
-       * codeset, in case it's not UTF-8.
-       */
-      bytes_read = g_input_stream_read (in, buf, sizeof (buf),
-                                        cancellable, error);
-      if (bytes_read < 0)
-        goto out;
-      else if (bytes_read == 0)
-        {
-          g_set_error (error, G_IO_ERROR, G_IO_ERROR_CLOSED,
-                       "End of stream while reading password");
-          goto out;
-        }
-      else if (buf[0] == '\n')
-        {
-          break;
-        }
-      else
-        {
-          g_string_append_c (str, buf[0]);
-        }
-    }
-
-  ret = TRUE;
- out:
-  if (reset_terminal)
-    {
-      do
-        res = tcsetattr (1, TCSAFLUSH, &ots);
-      while (G_UNLIKELY (res == -1 && errno == EINTR));
-      if (res == -1)
-        {
-          _set_error_from_errno (error);
-          g_string_free (str, TRUE);
-          return NULL;
-        }
-    }
-
-  if (!ret)
-    {
-      g_string_free (str, TRUE);
-      return NULL;
-    }
-  else
-    {
-      return g_string_free (str, FALSE);
-    }
-#else
-  g_error ("not implemented");
-#endif
-}
-
-/**
- * gs_console_begin_status_line:
- * @console: the #GSConsole
- * @line: String to output
- *
- * The primary use case for this function is to output periodic
- * "status" or "progress" information.  The first time this function
- * is called, @line will be output normally.  Subsequent invocations
- * will overwrite the previous.
- *
- * You must invoke gs_console_end_status_line() to return the console
- * to normal mode.  In particular, concurrent use of this function and
- * the stream returned by gs_console_get_stdout() results in undefined
- * behavior.
- */
-gboolean
-gs_console_begin_status_line (GSConsole     *console,
-                              const char    *line,
-                              GCancellable  *cancellable,
-                              GError       **error)
-{
-#ifdef G_OS_UNIX
-  gboolean ret = FALSE;
-  gsize linelen;
-  GOutputStream *out;
-  gsize bytes_written;
-
-  out = gs_console_get_stdout ();
-
-  if (!console->in_status_line)
-    {
-      guint8 buf[2] = { 0x1B, 0x37 };
-      if (!g_output_stream_write_all (out, buf, sizeof (buf), &bytes_written,
-                                      cancellable, error))
-        goto out;
-      console->in_status_line = TRUE;
-      console->last_line_written = -1;
-    }
-
-  {
-    guint8 buf[2] = { 0x1B, 0x38 };
-    if (!g_output_stream_write_all (out, buf, sizeof (buf), &bytes_written,
-                                    cancellable, error))
-      goto out;
-  }
-
-  linelen = strlen (line);
-  if (!g_output_stream_write_all (out, line, linelen, &bytes_written,
-                                  cancellable, error))
-    goto out;
-
-  /* Now we need to pad with spaces enough to overwrite our last line
-   */
-  if (console->last_line_written >= 0
-      && linelen < (gsize) console->last_line_written)
-    {
-      gsize towrite = console->last_line_written - linelen;
-      const char c = ' ';
-      while (towrite > 0)
-        {
-          if (!g_output_stream_write_all (out, &c, 1, &bytes_written,
-                                          cancellable, error))
-            goto out;
-          towrite--;
-        }
-    }
-  
-  console->last_line_written = linelen;
-  
-  ret = TRUE;
- out:
-  return ret;
-#else
-  g_error ("not implemented");
-#endif
-}
-
-/**
- * gs_console_end_status_line:
- * @console: the #GSConsole
- *
- * Complete a series of invocations of gs_console_begin_status_line(),
- * returning the stream to normal mode.  The last printed status line
- * remains on the console; if this is not desired, print an empty
- * string to clear it before invoking this function.
- */
-gboolean
-gs_console_end_status_line (GSConsole     *console,
-                            GCancellable  *cancellable,
-                            GError       **error)
-{
-#ifdef G_OS_UNIX  
-  gboolean ret = FALSE;
-  GOutputStream *out;
-  gsize bytes_written;
-  char c = '\n';
-
-  g_return_val_if_fail (console->in_status_line, FALSE);
-
-  out = gs_console_get_stdout ();
-
-  if (!g_output_stream_write_all (out, &c, 1, &bytes_written,
-                                  cancellable, error))
-    goto out;
-
-  console->in_status_line = FALSE;
-
-  ret = TRUE;
- out:
-  return ret;
-#else
-  g_error ("not implemented");
-#endif
-}
diff -Nru gnome-desktop3-3.12.0/libgnome-desktop/libgsystem/gsystem-console.h gnome-desktop3-3.8.4/libgnome-desktop/libgsystem/gsystem-console.h
--- gnome-desktop3-3.12.0/libgnome-desktop/libgsystem/gsystem-console.h	2013-11-11 17:23:51.000000000 +0000
+++ gnome-desktop3-3.8.4/libgnome-desktop/libgsystem/gsystem-console.h	1970-01-01 00:00:00.000000000 +0000
@@ -1,59 +0,0 @@
-/* -*- mode: C; c-file-style: "gnu"; indent-tabs-mode: nil; -*-
- *
- * Copyright (C) 2013 Colin Walters 
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library 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
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- */
-
-#ifndef __GSYSTEM_CONSOLE_H__
-#define __GSYSTEM_CONSOLE_H__
-
-#include 
-
-G_BEGIN_DECLS
-
-#define GS_TYPE_CONSOLE         (gs_console_get_type ())
-#define GS_CONSOLE(o)           (G_TYPE_CHECK_INSTANCE_CAST ((o), GS_TYPE_CONSOLE, GSConsole))
-#define GS_IS_CONSOLE(o)        (G_TYPE_CHECK_INSTANCE_TYPE ((o), GS_TYPE_CONSOLE))
-
-typedef struct _GSConsole GSConsole;
-
-GType            gs_console_get_type (void) G_GNUC_CONST;
-
-GInputStream *   gs_console_get_stdin (void);
-GOutputStream *  gs_console_get_stdout (void);
-GOutputStream *  gs_console_get_stderr (void);
-
-GSConsole *      gs_console_get (void);
-
-char *           gs_console_read_password (GSConsole     *console,
-                                           const char    *prompt,
-                                           GCancellable  *cancellable,
-                                           GError       **error);
-
-gboolean         gs_console_begin_status_line (GSConsole     *console,
-                                               const char    *line,
-                                               GCancellable  *cancellable,
-                                               GError       **error);
-
-gboolean         gs_console_end_status_line (GSConsole      *console,
-                                             GCancellable   *cancellable,
-                                             GError        **error);
-
-
-G_END_DECLS
-
-#endif
diff -Nru gnome-desktop3-3.12.0/libgnome-desktop/libgsystem/gsystem-file-utils.c gnome-desktop3-3.8.4/libgnome-desktop/libgsystem/gsystem-file-utils.c
--- gnome-desktop3-3.12.0/libgnome-desktop/libgsystem/gsystem-file-utils.c	2014-01-07 13:28:56.000000000 +0000
+++ gnome-desktop3-3.8.4/libgnome-desktop/libgsystem/gsystem-file-utils.c	2012-09-02 15:39:49.000000000 +0000
@@ -21,106 +21,28 @@
 
 #include "config.h"
 
-#ifndef _GNU_SOURCE
 #define _GNU_SOURCE
-#endif
-
-#include 
 
-#define _GSYSTEM_NO_LOCAL_ALLOC
 #include "libgsystem.h"
-#include "gsystem-glib-compat.h"
 #include 
 #include 
-#include 
-#include 
 #include 
-#include 
-#include 
-#ifdef GSYSTEM_CONFIG_XATTRS
-#include 
-#endif
-
-static int
-close_nointr (int fd)
-{
-  int res;
-  /* Note this is NOT actually a retry loop.
-   * See: https://bugzilla.gnome.org/show_bug.cgi?id=682819
-   */
-  res = close (fd);
-  /* Just ignore EINTR...on Linux, retrying is wrong. */
-  if (res == EINTR)
-    res = 0;
-  return res;
-}
-
-static void
-close_nointr_noerror (int fd)
-{
-  (void) close_nointr (fd);
-}
-
+ 
 static int
-open_nointr (const char *path, int flags, mode_t mode)
-{
-  int res;
-  do
-    res = open (path, flags, mode);
-  while (G_UNLIKELY (res == -1 && errno == EINTR));
-  return res;
-}
-
-static inline void
-_set_error_from_errno (GError **error)
-{
-  int errsv = errno;
-  g_set_error_literal (error, G_IO_ERROR, g_io_error_from_errno (errsv),
-                       g_strerror (errsv));
-}
-
-/**
- * gs_file_openat_noatime:
- * @dfd: File descriptor for directory
- * @name: Pathname, relative to @dfd
- * @ret_fd: (out): Returned file descriptor
- * @cancellable: Cancellable
- * @error: Error
- *
- * Wrapper for openat() using %O_RDONLY with %O_NOATIME if available.
- */
-gboolean
-gs_file_openat_noatime (int            dfd,
-                        const char    *name,
-                        int           *ret_fd,
-                        GCancellable  *cancellable,
-                        GError       **error)
+_open_fd_noatime (const char *path)
 {
   int fd;
 
 #ifdef O_NOATIME
-  do
-    fd = openat (dfd, name, O_RDONLY | O_NOATIME, 0);
-  while (G_UNLIKELY (fd == -1 && errno == EINTR));
+  fd = g_open (path, O_RDONLY | O_NOATIME, 0);
   /* Only the owner or superuser may use O_NOATIME; so we may get
    * EPERM.  EINVAL may happen if the kernel is really old...
    */
   if (fd == -1 && (errno == EPERM || errno == EINVAL))
 #endif
-    do
-      fd = openat (dfd, name, O_RDONLY, 0);
-    while (G_UNLIKELY (fd == -1 && errno == EINTR));
+    fd = g_open (path, O_RDONLY, 0);
   
-  if (fd == -1)
-    {
-      _set_error_from_errno (error);
-      return FALSE;
-    }
-  else
-    {
-      *ret_fd = fd;
-      return TRUE;
-    }
+  return fd;
 }
 
 /**
@@ -140,1487 +62,23 @@
                       GCancellable  *cancellable,
                       GError       **error)
 {
-  const char *path = NULL;
+  gs_lfree char *path = NULL;
   int fd;
 
   if (g_cancellable_set_error_if_cancelled (cancellable, error))
     return NULL;
 
-  path = gs_file_get_path_cached (file);
-  if (path == NULL)
-    {
-      char *uri;
-      uri = g_file_get_uri (file);
-      g_set_error (error, G_FILE_ERROR, G_FILE_ERROR_NOENT,
-                   "%s has no associated path", uri);
-      g_free (uri);
-      return NULL;
-    }
-
-  if (!gs_file_openat_noatime (AT_FDCWD, path, &fd, cancellable, error))
-    return NULL;
-
-  return g_unix_input_stream_new (fd, TRUE);
-}
-
-/**
- * gs_stream_fstat:
- * @stream: A stream containing a Unix file descriptor
- * @stbuf: Memory location to write stat buffer
- * @cancellable:
- * @error:
- *
- * Some streams created via libgsystem are #GUnixInputStream; these do
- * not support e.g. g_file_input_stream_query_info().  This function
- * allows dropping to the raw unix fstat() call for these types of
- * streams, while still conveniently wrapped with the normal GLib
- * handling of @cancellable and @error.
- */
-gboolean
-gs_stream_fstat (GFileDescriptorBased *stream,
-                 struct stat          *stbuf,
-                 GCancellable         *cancellable,
-                 GError              **error)
-{
-  gboolean ret = FALSE;
-  int fd;
-
-  if (g_cancellable_set_error_if_cancelled (cancellable, error))
-    goto out;
-
-  fd = g_file_descriptor_based_get_fd (stream);
-
-  if (fstat (fd, stbuf) == -1)
-    {
-      _set_error_from_errno (error);
-      goto out;
-    }
-
-  ret = TRUE;
- out:
-  return ret;
-}
-
-/**
- * gs_file_map_noatime: (skip)
- * @file: a #GFile
- * @cancellable: a #GCancellable
- * @error: a #GError
- *
- * Like g_mapped_file_new(), but try to avoid updating the file's
- * access time.  This should be used by background scanning
- * components such as search indexers, antivirus programs, etc.
- *
- * Returns: (transfer full): A new mapped file, or %NULL on error
- */
-GMappedFile *
-gs_file_map_noatime (GFile         *file,
-                     GCancellable  *cancellable,
-                     GError       **error)
-{
-  const char *path;
-  int fd;
-  GMappedFile *ret;
-
-  if (g_cancellable_set_error_if_cancelled (cancellable, error))
-    return NULL;
-
-  path = gs_file_get_path_cached (file);
+  path = g_file_get_path (file);
   if (path == NULL)
     return NULL;
 
-  if (!gs_file_openat_noatime (AT_FDCWD, path, &fd, cancellable, error))
-    return NULL;
-  
-  ret = g_mapped_file_new_from_fd (fd, FALSE, error);
-  close_nointr_noerror (fd); /* Ignore errors - we always want to close */
-
-  return ret;
-}
-
-#if GLIB_CHECK_VERSION(2,34,0)
-/**
- * gs_file_map_readonly:
- * @file: a #GFile
- * @cancellable:
- * @error:
- *
- * Return a #GBytes which references a readonly view of the contents of
- * @file.  This function uses #GMappedFile internally.
- *
- * Returns: (transfer full): a newly referenced #GBytes
- */
-GBytes *
-gs_file_map_readonly (GFile         *file,
-                      GCancellable  *cancellable,
-                      GError       **error)
-{
-  GMappedFile *mfile;
-  GBytes *ret;
-
-  if (g_cancellable_set_error_if_cancelled (cancellable, error))
-    return NULL;
-
-  mfile = g_mapped_file_new (gs_file_get_path_cached (file), FALSE, error);
-  if (!mfile)
-    return NULL;
-
-  ret = g_mapped_file_get_bytes (mfile);
-  g_mapped_file_unref (mfile);
-  return ret;
-}
-#endif
-
-/**
- * gs_file_sync_data:
- * @file: a #GFile
- * @cancellable:
- * @error:
- *
- * Wraps the UNIX fsync() function (or fdatasync(), if available), which
- * ensures that the data in @file is on non-volatile storage.
- */
-gboolean
-gs_file_sync_data (GFile          *file,
-                   GCancellable   *cancellable,
-                   GError        **error)
-{
-  gboolean ret = FALSE;
-  int res;
-  int fd = -1; 
-
-  if (!gs_file_openat_noatime (AT_FDCWD, gs_file_get_path_cached (file), &fd,
-                               cancellable, error))
-    goto out;
-
-  do
-    {
-#ifdef __linux
-      res = fdatasync (fd);
-#else
-      res = fsync (fd);
-#endif
-    }
-  while (G_UNLIKELY (res != 0 && errno == EINTR));
-  if (res != 0)
-    {
-      _set_error_from_errno (error);
-      goto out;
-    }
-
-  res = close_nointr (fd);
-  if (res != 0)
-    {
-      _set_error_from_errno (error);
-      goto out;
-    }
-  fd = -1;
-  
-  ret = TRUE;
- out:
-  if (fd != -1)
-    close_nointr_noerror (fd);
-  return ret;
-}
-
-/**
- * gs_file_create:
- * @file: Path to non-existent file
- * @mode: Unix access permissions
- * @out_stream: (out) (transfer full) (allow-none): Newly created output, or %NULL
- * @cancellable: a #GCancellable
- * @error: a #GError
- *
- * Like g_file_create(), except this function allows specifying the
- * access mode.  This allows atomically creating private files.
- */
-gboolean
-gs_file_create (GFile          *file,
-                int             mode,
-                GOutputStream **out_stream,
-                GCancellable   *cancellable,
-                GError        **error)
-{
-  gboolean ret = FALSE;
-  int fd;
-  GOutputStream *ret_stream = NULL;
-
-  fd = open_nointr (gs_file_get_path_cached (file), O_WRONLY | O_CREAT | O_EXCL, mode);
+  fd = _open_fd_noatime (path);
   if (fd < 0)
     {
-      _set_error_from_errno (error);
-      goto out;
-    }
-
-  if (fchmod (fd, mode) < 0)
-    {
-      close (fd);
-      _set_error_from_errno (error);
-      goto out;
-    }
-  
-  ret_stream = g_unix_output_stream_new (fd, TRUE);
-  
-  ret = TRUE;
-  gs_transfer_out_value (out_stream, &ret_stream);
- out:
-  g_clear_object (&ret_stream);
-  return ret;
-}
-
-static const char *
-get_default_tmp_prefix (void)
-{
-  static char *tmpprefix = NULL;
-
-  if (g_once_init_enter (&tmpprefix))
-    {
-      const char *prgname = g_get_prgname ();
-      const char *p;
-      char *prefix;
-      char *iter;
-
-      if (prgname)
-        {
-          p = strrchr (prgname, '/');
-          if (p)
-            prgname = p + 1;
-        }
-      else
-        prgname = "";
-          
-      prefix = g_strdup_printf ("tmp-%s%u-", prgname, getuid ());
-      for (iter = prefix; *iter; iter++)
-        {
-          char c = *iter;
-          if (c == ' ')
-            *iter = '_';
-        }
-      
-      g_once_init_leave (&tmpprefix, prefix);
-    }
-
-  return tmpprefix;
-}
-
-/**
- * gs_fileutil_gen_tmp_name:
- * @prefix: (allow-none): String prepended to the result
- * @suffix: (allow-none): String suffixed to the result
- *
- * Generate a name suitable for use as a temporary file.  This
- * function does no I/O; it is not guaranteed that a file with that
- * name does not exist.
- */
-char *
-gs_fileutil_gen_tmp_name (const char *prefix,
-                          const char *suffix)
-{
-  static const char table[] = "ABCEDEFGHIJKLMNOPQRSTUVWXYZabcedefghijklmnopqrstuvwxyz0123456789";
-  GString *str = g_string_new ("");
-  guint i;
-
-  if (!prefix)
-    prefix = get_default_tmp_prefix ();
-  if (!suffix)
-    suffix = "tmp";
-
-  g_string_append (str, prefix);
-  for (i = 0; i < 8; i++)
-    {
-      int offset = g_random_int_range (0, sizeof (table) - 1);
-      g_string_append_c (str, (guint8)table[offset]);
-    }
-  g_string_append_c (str, '.');
-  g_string_append (str, suffix);
-
-  return g_string_free (str, FALSE);
-}
-
-/**
- * gs_file_open_dir_fd:
- * @path: Directory name
- * @out_fd: (out): File descriptor for directory
- * @cancellable: Cancellable
- * @error: Error
- *
- * On success, sets @out_fd to a file descriptor for the directory
- * that can be used with UNIX functions such as openat().
- */
-gboolean
-gs_file_open_dir_fd (GFile         *path,
-                     int           *out_fd,
-                     GCancellable  *cancellable,
-                     GError       **error)
-{
-  /* Linux specific probably */
-  *out_fd = open (gs_file_get_path_cached (path), O_RDONLY | O_NONBLOCK | O_DIRECTORY | O_CLOEXEC);
-  if (*out_fd == -1)
-    {
-      _set_error_from_errno (error);
-      return FALSE;
-    }
-  return TRUE;
-}
-
-/**
- * gs_file_open_in_tmpdir_at:
- * @tmpdir_fd: Directory to place temporary file
- * @mode: Default mode (will be affected by umask)
- * @out_name: (out) (transfer full): Newly created file name
- * @out_stream: (out) (transfer full) (allow-none): Newly created output stream
- * @cancellable:
- * @error:
- *
- * Like g_file_open_tmp(), except the file will be created in the
- * provided @tmpdir, and allows specification of the Unix @mode, which
- * means private files may be created.  Return values will be stored
- * in @out_name, and optionally @out_stream.
- */
-gboolean
-gs_file_open_in_tmpdir_at (int                tmpdir_fd,
-                           int                mode,
-                           char             **out_name,
-                           GOutputStream    **out_stream,
-                           GCancellable      *cancellable,
-                           GError           **error)
-{
-  gboolean ret = FALSE;
-  const int max_attempts = 128;
-  int i;
-  char *tmp_name = NULL;
-  int fd;
-
-  /* 128 attempts seems reasonable... */
-  for (i = 0; i < max_attempts; i++)
-    {
-      g_free (tmp_name);
-      tmp_name = gs_fileutil_gen_tmp_name (NULL, NULL);
-
-      do
-        fd = openat (tmpdir_fd, tmp_name, O_WRONLY | O_CREAT | O_EXCL, mode);
-      while (fd == -1 && errno == EINTR);
-      if (fd < 0 && errno != EEXIST)
-        {
-          _set_error_from_errno (error);
-          goto out;
-        }
-      else if (fd != -1)
-        break;
-    }
-  if (i == max_attempts)
-    {
-      g_set_error (error, G_IO_ERROR, G_IO_ERROR_FAILED,
-                   "Exhausted attempts to open temporary file");
-      goto out;
-    }
-
-  ret = TRUE;
-  gs_transfer_out_value (out_name, &tmp_name);
-  if (out_stream)
-    *out_stream = g_unix_output_stream_new (fd, TRUE);
-  else
-    (void) close (fd);
- out:
-  g_free (tmp_name);
-  return ret;
-}
-
-/**
- * gs_file_open_in_tmpdir:
- * @tmpdir: Directory to place temporary file
- * @mode: Default mode (will be affected by umask)
- * @out_file: (out) (transfer full): Newly created file path
- * @out_stream: (out) (transfer full) (allow-none): Newly created output stream
- * @cancellable:
- * @error:
- *
- * Like g_file_open_tmp(), except the file will be created in the
- * provided @tmpdir, and allows specification of the Unix @mode, which
- * means private files may be created.  Return values will be stored
- * in @out_file, and optionally @out_stream.
- */
-gboolean
-gs_file_open_in_tmpdir (GFile             *tmpdir,
-                        int                mode,
-                        GFile            **out_file,
-                        GOutputStream    **out_stream,
-                        GCancellable      *cancellable,
-                        GError           **error)
-{
-  gboolean ret = FALSE;
-  DIR *d = NULL;
-  int dfd = -1;
-  char *tmp_name = NULL;
-  GOutputStream *ret_stream = NULL;
-
-  d = opendir (gs_file_get_path_cached (tmpdir));
-  if (!d)
-    {
-      _set_error_from_errno (error);
-      goto out;
-    }
-  dfd = dirfd (d);
-
-  if (!gs_file_open_in_tmpdir_at (dfd, mode, &tmp_name,
-                                  out_stream ? &ret_stream : NULL,
-                                  cancellable, error))
-    goto out;
- 
-  ret = TRUE;
-  *out_file = g_file_get_child (tmpdir, tmp_name);
-  gs_transfer_out_value (out_stream, &ret_stream);
- out:
-  if (d) (void) closedir (d);
-  g_clear_object (&ret_stream);
-  g_free (tmp_name);
-  return ret;
-}
-
-static gboolean
-linkcopy_internal_attempt (GFile          *src,
-                          GFile          *dest,
-                          GFile          *dest_parent,
-                          GFileCopyFlags  flags,
-                          gboolean        sync_data,
-                          gboolean        enable_guestfs_fuse_workaround,
-                          gboolean       *out_try_again,
-                          GCancellable   *cancellable,
-                          GError        **error)
-{
-  gboolean ret = FALSE;
-  int res;
-  char *tmp_name = NULL;
-  GFile *tmp_dest = NULL;
-
-  if (g_cancellable_set_error_if_cancelled (cancellable, error))
-    goto out;
-
-  tmp_name = gs_fileutil_gen_tmp_name (NULL, NULL);
-  tmp_dest = g_file_get_child (dest_parent, tmp_name);
-
-  res = link (gs_file_get_path_cached (src), gs_file_get_path_cached (tmp_dest));
-  if (res == -1)
-    {
-      if (errno == EEXIST)
-        {
-          /* Nothing, fall through */
-          *out_try_again = TRUE;
-          ret = TRUE;
-          goto out;
-        }
-      else if (errno == EXDEV || errno == EMLINK || errno == EPERM
-               || (enable_guestfs_fuse_workaround && errno == ENOENT))
-        {
-          if (!g_file_copy (src, tmp_dest, flags,
-                            cancellable, NULL, NULL, error))
-            goto out;
-        }
-      else
-        {
-          _set_error_from_errno (error);
-          goto out;
-        }
-    }
-      
-  if (sync_data)
-    {
-      /* Now, we need to fsync */
-      if (!gs_file_sync_data (tmp_dest, cancellable, error))
-        goto out;
-    }
-
-  if (!gs_file_rename (tmp_dest, dest, cancellable, error))
-    goto out;
-
-  ret = TRUE;
-  *out_try_again = FALSE;
- out:
-  g_clear_pointer (&tmp_name, g_free);
-  g_clear_object (&tmp_dest);
-  return ret;
-}
-
-static gboolean
-linkcopy_internal (GFile          *src,
-                   GFile          *dest,
-                   GFileCopyFlags  flags,
-                   gboolean        sync_data,
-                   GCancellable   *cancellable,
-                   GError        **error)
-{
-  gboolean ret = FALSE;
-  gboolean dest_exists;
-  int i;
-  gboolean enable_guestfs_fuse_workaround;
-  struct stat src_stat;
-  struct stat dest_stat;
-  GFile *dest_parent = NULL;
-
-  flags |= G_FILE_COPY_NOFOLLOW_SYMLINKS;
-
-  g_return_val_if_fail ((flags & (G_FILE_COPY_BACKUP | G_FILE_COPY_TARGET_DEFAULT_PERMS)) == 0, FALSE);
-
-  dest_parent = g_file_get_parent (dest);
-
-  if (lstat (gs_file_get_path_cached (src), &src_stat) == -1)
-    {
-      int errsv = errno;
-      g_set_error_literal (error, G_IO_ERROR, g_io_error_from_errno (errno),
-                           g_strerror (errsv));
-      goto out;
-    }
-
-  if (lstat (gs_file_get_path_cached (dest), &dest_stat) == -1)
-    dest_exists = FALSE;
-  else
-    dest_exists = TRUE;
-  
-  if (((flags & G_FILE_COPY_OVERWRITE) == 0) && dest_exists)
-    {
-      g_set_error_literal (error, G_IO_ERROR, G_IO_ERROR_EXISTS,
-                           "File exists");
-      goto out;
-    }
-
-  /* Work around the behavior of link() where it's a no-op if src and
-   * dest are the same.
-   */
-  if (dest_exists &&
-      src_stat.st_dev == dest_stat.st_dev &&
-      src_stat.st_ino == dest_stat.st_ino)
-    {
-      ret = TRUE;
-      goto out;
-    }
-
-  enable_guestfs_fuse_workaround = getenv ("LIBGSYSTEM_ENABLE_GUESTFS_FUSE_WORKAROUND") != NULL;
-
-  /* 128 attempts seems reasonable... */
-  for (i = 0; i < 128; i++)
-    {
-      gboolean tryagain = FALSE;
-
-      if (!linkcopy_internal_attempt (src, dest, dest_parent,
-                                      flags, sync_data,
-                                      enable_guestfs_fuse_workaround,
-                                      &tryagain,
-                                      cancellable, error))
-        goto out;
-
-      if (!tryagain)
-        break;
-    }
-
-  ret = TRUE;
- out:
-  g_clear_object (&dest_parent);
-  return ret;
-
-}
-
-/**
- * gs_file_linkcopy:
- * @src: Source file
- * @dest: Destination file
- * @flags: flags
- * @cancellable:
- * @error:
- *
- * First tries to use the UNIX link() call, but if the files are on
- * separate devices, fall back to copying via g_file_copy().
- *
- * The given @flags have different semantics than those documented
- * when hardlinking is used.  Specifically, both
- * #G_FILE_COPY_TARGET_DEFAULT_PERMS and #G_FILE_COPY_BACKUP are not
- * supported.  #G_FILE_COPY_NOFOLLOW_SYMLINKS treated as if it was
- * always given - if you want to follow symbolic links, you will need
- * to resolve them manually.
- *
- * Beware - do not use this function if @src may be modified, and it's
- * undesirable for the changes to also be reflected in @dest.  The
- * best use of this function is in the case where @src and @dest are
- * read-only, or where @src is a temporary file, and you want to put
- * it in the final place.
- */
-gboolean
-gs_file_linkcopy (GFile          *src,
-                  GFile          *dest,
-                  GFileCopyFlags  flags,
-                  GCancellable   *cancellable,
-                  GError        **error)
-{
-  return linkcopy_internal (src, dest, flags, FALSE, cancellable, error);
-}
-
-/**
- * gs_file_linkcopy_sync_data:
- * @src: Source file
- * @dest: Destination file
- * @flags: flags
- * @cancellable:
- * @error:
- *
- * This function is similar to gs_file_linkcopy(), except it also uses
- * gs_file_sync_data() to ensure that @dest is in stable storage
- * before it is moved into place.
- */
-gboolean
-gs_file_linkcopy_sync_data (GFile          *src,
-                            GFile          *dest,
-                            GFileCopyFlags  flags,
-                            GCancellable   *cancellable,
-                            GError        **error)
-{
-  return linkcopy_internal (src, dest, flags, TRUE, cancellable, error);
-}
-
-static char *
-gs_file_get_target_path (GFile *file)
-{
-  GFileInfo *info;
-  const char *target;
-  char *path;
-
-  info = g_file_query_info (file, G_FILE_ATTRIBUTE_STANDARD_TARGET_URI, G_FILE_QUERY_INFO_NONE, NULL, NULL);
-  if (info == NULL)
-    return NULL;
-  target = g_file_info_get_attribute_string (info, G_FILE_ATTRIBUTE_STANDARD_TARGET_URI);
-  path = g_filename_from_uri (target, NULL, NULL);
-  g_object_unref (info);
-
-  return path;
-}
-
-G_LOCK_DEFINE_STATIC (pathname_cache);
-
-/**
- * gs_file_get_path_cached:
- *
- * Like g_file_get_path(), but returns a constant copy so callers
- * don't need to free the result.
- */
-const char *
-gs_file_get_path_cached (GFile *file)
-{
-  const char *path;
-  static GQuark _file_path_quark = 0;
-
-  if (G_UNLIKELY (_file_path_quark) == 0)
-    _file_path_quark = g_quark_from_static_string ("gsystem-file-path");
-
-  G_LOCK (pathname_cache);
-
-  path = g_object_get_qdata ((GObject*)file, _file_path_quark);
-  if (!path)
-    {
-      if (g_file_has_uri_scheme (file, "trash") ||
-          g_file_has_uri_scheme (file, "recent"))
-        path = gs_file_get_target_path (file);
-      else
-        path = g_file_get_path (file);
-      if (path == NULL)
-        {
-          G_UNLOCK (pathname_cache);
-          return NULL;
-        }
-      g_object_set_qdata_full ((GObject*)file, _file_path_quark, (char*)path, (GDestroyNotify)g_free);
-    }
-
-  G_UNLOCK (pathname_cache);
-
-  return path;
-}
-
-/**
- * gs_file_get_basename_cached:
- *
- * Like g_file_get_basename(), but returns a constant copy so callers
- * don't need to free the result.
- */
-const char *
-gs_file_get_basename_cached (GFile *file)
-{
-  const char *name;
-  static GQuark _file_name_quark = 0;
-
-  if (G_UNLIKELY (_file_name_quark) == 0)
-    _file_name_quark = g_quark_from_static_string ("gsystem-file-name");
-
-  G_LOCK (pathname_cache);
-
-  name = g_object_get_qdata ((GObject*)file, _file_name_quark);
-  if (!name)
-    {
-      name = g_file_get_basename (file);
-      g_object_set_qdata_full ((GObject*)file, _file_name_quark, (char*)name, (GDestroyNotify)g_free);
-    }
-
-  G_UNLOCK (pathname_cache);
-
-  return name;
-}
-
-/**
- * gs_file_enumerator_iterate:
- * @direnum: an open #GFileEnumerator
- * @out_info: (out) (transfer none) (allow-none): Output location for the next #GFileInfo
- * @out_child: (out) (transfer none) (allow-none): Output location for the next #GFile, or %NULL
- * @cancellable: a #GCancellable
- * @error: a #GError
- *
- * This is a version of g_file_enumerator_next_file() that's easier to
- * use correctly from C programs.  With g_file_enumerator_next_file(),
- * the gboolean return value signifies "end of iteration or error", which
- * requires allocation of a temporary #GError.
- *
- * In contrast, with this function, a %FALSE return from
- * gs_file_enumerator_iterate() always means
- * "error".  End of iteration is signaled by @out_info being %NULL.
- *
- * Another crucial difference is that the references for @out_info and
- * @out_child are owned by @direnum (they are cached as hidden
- * properties).  You must not unref them in your own code.  This makes
- * memory management significantly easier for C code in combination
- * with loops.
- *
- * Finally, this function optionally allows retrieving a #GFile as
- * well.
- *
- * The code pattern for correctly using gs_file_enumerator_iterate() from C
- * is:
- *
- * |[
- * direnum = g_file_enumerate_children (file, ...);
- * while (TRUE)
- *   {
- *     GFileInfo *info;
- *     if (!gs_file_enumerator_iterate (direnum, &info, NULL, cancellable, error))
- *       goto out;
- *     if (!info)
- *       break;
- *     ... do stuff with "info"; do not unref it! ...
- *   }
- * 
- * out:
- *   g_object_unref (direnum); // Note: frees the last @info
- * ]|
- */
-gboolean
-gs_file_enumerator_iterate (GFileEnumerator  *direnum,
-                            GFileInfo       **out_info,
-                            GFile           **out_child,
-                            GCancellable     *cancellable,
-                            GError          **error)
-{
-  gboolean ret = FALSE;
-  GError *temp_error = NULL;
-
-  static GQuark cached_info_quark;
-  static GQuark cached_child_quark;
-  static gsize quarks_initialized;
-
-  g_return_val_if_fail (direnum != NULL, FALSE);
-  g_return_val_if_fail (out_info != NULL, FALSE);
-
-  if (g_once_init_enter (&quarks_initialized))
-    {
-      cached_info_quark = g_quark_from_static_string ("gsystem-cached-info");
-      cached_child_quark = g_quark_from_static_string ("gsystem-cached-child");
-      g_once_init_leave (&quarks_initialized, 1);
-    }
-
-  
-  *out_info = g_file_enumerator_next_file (direnum, cancellable, &temp_error);
-  if (out_child)
-    *out_child = NULL;
-  if (temp_error != NULL)
-    {
-      g_propagate_error (error, temp_error);
-      goto out;
-    }
-  else if (*out_info != NULL)
-    {
-      g_object_set_qdata_full ((GObject*)direnum, cached_info_quark, *out_info, (GDestroyNotify)g_object_unref);
-      if (out_child != NULL)
-        {
-          const char *name = g_file_info_get_name (*out_info);
-          *out_child = g_file_get_child (g_file_enumerator_get_container (direnum), name);
-          g_object_set_qdata_full ((GObject*)direnum, cached_child_quark, *out_child, (GDestroyNotify)g_object_unref);
-        }
-    }
-
-  ret = TRUE;
- out:
-  return ret;
-}
-
-/**
- * gs_file_rename:
- * @from: Current path
- * @to: New path
- * @cancellable: a #GCancellable
- * @error: a #GError
- *
- * This function wraps the raw Unix function rename().
- *
- * Returns: %TRUE on success, %FALSE on error
- */
-gboolean
-gs_file_rename (GFile          *from,
-                GFile          *to,
-                GCancellable   *cancellable,
-                GError        **error)
-{
-  if (g_cancellable_set_error_if_cancelled (cancellable, error))
-    return FALSE;
-
-  if (rename (gs_file_get_path_cached (from),
-              gs_file_get_path_cached (to)) < 0)
-    {
-      _set_error_from_errno (error);
-      return FALSE;
-    }
-  return TRUE;
-}
-
-/**
- * gs_file_unlink:
- * @path: Path to file
- * @cancellable: a #GCancellable
- * @error: a #GError
- *
- * Like g_file_delete(), except this function does not follow Unix
- * symbolic links, and will delete a symbolic link even if it's
- * pointing to a nonexistent file.  In other words, this function
- * merely wraps the raw Unix function unlink().
- *
- * Returns: %TRUE on success, %FALSE on error
- */
-gboolean
-gs_file_unlink (GFile          *path,
-                GCancellable   *cancellable,
-                GError        **error)
-{
-  if (g_cancellable_set_error_if_cancelled (cancellable, error))
-    return FALSE;
-
-  if (unlink (gs_file_get_path_cached (path)) < 0)
-    {
-      _set_error_from_errno (error);
-      return FALSE;
-    }
-  return TRUE;
-}
-
-static gboolean
-chown_internal (GFile          *path,
-                gboolean        dereference_links,
-                guint32         owner,
-                guint32         group,
-                GCancellable   *cancellable,
-                GError        **error)
-{
-  gboolean ret = FALSE;
-  int res;
-
-  if (g_cancellable_set_error_if_cancelled (cancellable, error))
-    return FALSE;
-
-  do
-    if (dereference_links)
-      res = chown (gs_file_get_path_cached (path), owner, group);
-    else
-      res = lchown (gs_file_get_path_cached (path), owner, group);
-  while (G_UNLIKELY (res != 0 && errno == EINTR));
-
-  if (res < 0)
-    {
-      _set_error_from_errno (error);
-      goto out;
-    }
-
-  ret = TRUE;
- out:
-  return ret;
-}
-
-/**
- * gs_file_chown:
- * @path: Path to file
- * @owner: UNIX owner
- * @group: UNIX group
- * @cancellable: a #GCancellable
- * @error: a #GError
- *
- * Merely wraps UNIX chown().
- *
- * Returns: %TRUE on success, %FALSE on error
- */
-gboolean
-gs_file_chown (GFile          *path,
-               guint32         owner,
-               guint32         group,
-               GCancellable   *cancellable,
-               GError        **error)
-{
-  return chown_internal (path, TRUE, owner, group, cancellable, error);
-}
-
-/**
- * gs_file_lchown:
- * @path: Path to file
- * @owner: UNIX owner
- * @group: UNIX group
- * @cancellable: a #GCancellable
- * @error: a #GError
- *
- * Merely wraps UNIX lchown().
- *
- * Returns: %TRUE on success, %FALSE on error
- */
-gboolean
-gs_file_lchown (GFile          *path,
-                guint32         owner,
-                guint32         group,
-                GCancellable   *cancellable,
-                GError        **error)
-{
-  return chown_internal (path, FALSE, owner, group, cancellable, error);
-}
-
-/**
- * gs_file_chmod:
- * @path: Path to file
- * @mode: UNIX mode
- * @cancellable: a #GCancellable
- * @error: a #GError
- *
- * Merely wraps UNIX chmod().
- *
- * Returns: %TRUE on success, %FALSE on error
- */
-gboolean
-gs_file_chmod (GFile          *path,
-               guint           mode,
-               GCancellable   *cancellable,
-               GError        **error)
-{
-  gboolean ret = FALSE;
-  int res;
-
-  if (g_cancellable_set_error_if_cancelled (cancellable, error))
-    return FALSE;
-
-  do
-    res = chmod (gs_file_get_path_cached (path), mode);
-  while (G_UNLIKELY (res != 0 && errno == EINTR));
-
-  if (res < 0)
-    {
-      _set_error_from_errno (error);
-      goto out;
-    }
-
-  ret = TRUE;
- out:
-  return ret;
-}
-
-/**
- * gs_file_ensure_directory:
- * @dir: Path to create as directory
- * @with_parents: Also create parent directories
- * @cancellable: a #GCancellable
- * @error: a #GError
- *
- * Like g_file_make_directory(), except does not throw an error if the
- * directory already exists.
- */
-gboolean
-gs_file_ensure_directory (GFile         *dir,
-                          gboolean       with_parents, 
-                          GCancellable  *cancellable,
-                          GError       **error)
-{
-  gboolean ret = FALSE;
-  GError *temp_error = NULL;
-  GFile *parent = NULL;
-
-  if (!g_file_make_directory (dir, cancellable, &temp_error))
-    {
-      if (with_parents &&
-          g_error_matches (temp_error, G_IO_ERROR, G_IO_ERROR_NOT_FOUND))
-        {
-          g_clear_error (&temp_error);
-
-          parent = g_file_get_parent (dir);
-          if (parent)
-            {
-              if (!gs_file_ensure_directory (parent, TRUE, cancellable, error))
-                goto out;
-            }
-          if (!gs_file_ensure_directory (dir, FALSE, cancellable, error))
-            goto out;
-        }
-      else if (!g_error_matches (temp_error, G_IO_ERROR, G_IO_ERROR_EXISTS))
-        {
-          g_propagate_error (error, temp_error);
-          goto out;
-        }
-      else
-        g_clear_error (&temp_error);
-    }
-
-  ret = TRUE;
- out:
-  g_clear_object (&parent);
-  return ret;
-}
-
-/**
- * gs_file_ensure_directory_mode:
- * @dir: Path to create as directory
- * @mode: Create directory with these permissions
- * @cancellable: a #GCancellable
- * @error: a #GError
- *
- * Wraps UNIX mkdir() function with support for @cancellable, and
- * uses @error instead of errno.
- */
-gboolean
-gs_file_ensure_directory_mode (GFile         *dir,
-                               guint          mode,
-                               GCancellable  *cancellable,
-                               GError       **error)
-{
-  if (g_cancellable_set_error_if_cancelled (cancellable, error))
-    return FALSE;
-
-  if (mkdir (gs_file_get_path_cached (dir), mode) == -1 && errno != EEXIST)
-    {
-      _set_error_from_errno (error);
-      return FALSE;
-    }
-  return TRUE;
-}
-
-/**
- * gs_file_load_contents_utf8:
- * @file: Path to file whose contents must be UTF-8
- * @cancellable:
- * @error:
- *
- * Like g_file_load_contents(), except validates the contents are
- * UTF-8.
- */
-gchar *
-gs_file_load_contents_utf8 (GFile         *file,
-                            GCancellable  *cancellable,
-                            GError       **error)
-{
-  gboolean ret = FALSE;
-  gsize len;
-  char *ret_contents = NULL;
-
-  if (!g_file_load_contents (file, cancellable, &ret_contents, &len,
-                             NULL, error))
-    goto out;
-  if (!g_utf8_validate (ret_contents, len, NULL))
-    {
-      g_set_error (error,
-                   G_IO_ERROR,
-                   G_IO_ERROR_INVALID_DATA,
-                   "Invalid UTF-8");
-      goto out;
-    }
-
-  ret = TRUE;
- out:
-  if (!ret)
-    {
-      g_free (ret_contents);
-      return NULL;
-    }
-  return ret_contents;
-}
-
-static int
-path_common_directory (char *one,
-                       char *two)
-{
-  int dir_index = 0;
-  int i = 0;
-
-  while (*one && *two)
-    {
-      if (*one != *two)
-        break;
-      if (*one == '/')
-        dir_index = i + 1;
-
-      one++;
-      two++;
-      i++;
-    }
-
-  return dir_index;
-}
-
-/**
- * gs_file_get_relpath:
- * @one: The first #GFile
- * @two: The second #GFile
- *
- * Like gs_file_get_relative_path(), but does not mandate that
- * the two files have any parent in common. This function will
- * instead insert "../" where appropriate.
- *
- * Returns: (transfer full): The relative path between the two.
- */
-gchar *
-gs_file_get_relpath (GFile *one,
-                     GFile *two)
-{
-  gchar *simple_path;
-  gchar *one_path, *one_suffix;
-  gchar *two_path, *two_suffix;
-  GString *path;
-  int i;
-
-  simple_path = g_file_get_relative_path (one, two);
-  if (simple_path)
-    return simple_path;
-
-  one_path = g_file_get_path (one);
-  two_path = g_file_get_path (two);
-
-  i = path_common_directory (one_path, two_path);
-  one_suffix = one_path + i;
-  two_suffix = two_path + i;
-
-  path = g_string_new ("");
-
-  /* For every leftover path segment one has, append "../" so
-   * that we reach the same directory. */
-  while (*one_suffix)
-    {
-      g_string_append (path, "../");
-      one_suffix = strchr (one_suffix, '/');
-      if (one_suffix == NULL)
-        break;
-      one_suffix++;
-    }
-
-  /* And now append the leftover stuff on two's side. */
-  g_string_append (path, two_suffix);
-
-  g_free (one_path);
-  g_free (two_path);
-
-  return g_string_free (path, FALSE);
-}
-
-/**
- * gs_file_realpath:
- * @file: A #GFile
- *
- * Return a #GFile that contains the same path with symlinks
- * followed. That is, it's a #GFile whose path is the result
- * of calling realpath() on @file.
- *
- * Returns: (allow-none) (transfer full): A new #GFile or %NULL if @file is invalid
- */
-GFile *
-gs_file_realpath (GFile *file)
-{
-  gchar *path;
-  gchar path_real[PATH_MAX];
-
-  path = g_file_get_path (file);
-
-  if (realpath ((const char *) path, path_real) == NULL)
-    {
-      g_free (path);
+      g_set_error (error, G_FILE_ERROR, g_file_error_from_errno (errno),
+                   "%s", g_strerror (errno));
       return NULL;
     }
 
-  g_free (path);
-  return g_file_new_for_path (path_real);
-}
-
-#ifdef GSYSTEM_CONFIG_XATTRS
-static char *
-canonicalize_xattrs (char    *xattr_string,
-                     size_t   len)
-{
-  char *p;
-  GSList *xattrs = NULL;
-  GSList *iter;
-  GString *result;
-
-  result = g_string_new (0);
-
-  p = xattr_string;
-  while (p < xattr_string+len)
-    {
-      xattrs = g_slist_prepend (xattrs, p);
-      p += strlen (p) + 1;
-    }
-
-  xattrs = g_slist_sort (xattrs, (GCompareFunc) strcmp);
-  for (iter = xattrs; iter; iter = iter->next) {
-    g_string_append (result, iter->data);
-    g_string_append_c (result, '\0');
-  }
-
-  g_slist_free (xattrs);
-  return g_string_free (result, FALSE);
-}
-
-static GVariant *
-variant_new_ay_bytes (GBytes *bytes)
-{
-  gsize size;
-  gconstpointer data;
-  data = g_bytes_get_data (bytes, &size);
-  g_bytes_ref (bytes);
-  return g_variant_new_from_data (G_VARIANT_TYPE ("ay"), data, size,
-                                  TRUE, (GDestroyNotify)g_bytes_unref, bytes);
-}
-
-static gboolean
-read_xattr_name_array (const char *path,
-                       const char *xattrs,
-                       size_t      len,
-                       GVariantBuilder *builder,
-                       GError  **error)
-{
-  gboolean ret = FALSE;
-  const char *p;
-
-  p = xattrs;
-  while (p < xattrs+len)
-    {
-      ssize_t bytes_read;
-      char *buf;
-      GBytes *bytes = NULL;
-
-      bytes_read = lgetxattr (path, p, NULL, 0);
-      if (bytes_read < 0)
-        {
-          _set_error_from_errno (error);
-          g_prefix_error (error, "lgetxattr (%s, %s) failed: ", path, p);
-          goto out;
-        }
-      if (bytes_read == 0)
-        continue;
-
-      buf = g_malloc (bytes_read);
-      bytes = g_bytes_new_take (buf, bytes_read);
-      if (lgetxattr (path, p, buf, bytes_read) < 0)
-        {
-          g_bytes_unref (bytes);
-          _set_error_from_errno (error);
-          g_prefix_error (error, "lgetxattr (%s, %s) failed: ", path, p);
-          goto out;
-        }
-      
-      g_variant_builder_add (builder, "(@ay@ay)",
-                             g_variant_new_bytestring (p),
-                             variant_new_ay_bytes (bytes));
-
-      p = p + strlen (p) + 1;
-      g_bytes_unref (bytes);
-    }
-  
-  ret = TRUE;
- out:
-  return ret;
-}
-
-#endif
-
-/**
- * gs_file_get_all_xattrs:
- * @f: a #GFile
- * @out_xattrs: (out): A new #GVariant containing the extended attributes
- * @cancellable: Cancellable
- * @error: Error
- *
- * Read all extended attributes of @f in a canonical sorted order, and
- * set @out_xattrs with the result.
- *
- * If the filesystem does not support extended attributes, @out_xattrs
- * will have 0 elements, and this function will return successfully.
- */
-gboolean
-gs_file_get_all_xattrs (GFile         *f,
-                        GVariant     **out_xattrs,
-                        GCancellable  *cancellable,
-                        GError       **error)
-{
-  gboolean ret = FALSE;
-  const char *path;
-  ssize_t bytes_read;
-  GVariant *ret_xattrs = NULL;
-  char *xattr_names = NULL;
-  char *xattr_names_canonical = NULL;
-  GVariantBuilder builder;
-  gboolean builder_initialized = FALSE;
-
-  path = gs_file_get_path_cached (f);
-
-  g_variant_builder_init (&builder, G_VARIANT_TYPE ("a(ayay)"));
-  builder_initialized = TRUE;
-
-#ifdef GSYSTEM_CONFIG_XATTRS
-  bytes_read = llistxattr (path, NULL, 0);
-
-  if (bytes_read < 0)
-    {
-      if (errno != ENOTSUP)
-        {
-          _set_error_from_errno (error);
-          g_prefix_error (error, "llistxattr (%s) failed: ", path);
-          goto out;
-        }
-    }
-  else if (bytes_read > 0)
-    {
-      xattr_names = g_malloc (bytes_read);
-      if (llistxattr (path, xattr_names, bytes_read) < 0)
-        {
-          _set_error_from_errno (error);
-          g_prefix_error (error, "llistxattr (%s) failed: ", path);
-          goto out;
-        }
-      xattr_names_canonical = canonicalize_xattrs (xattr_names, bytes_read);
-      
-      if (!read_xattr_name_array (path, xattr_names_canonical, bytes_read, &builder, error))
-        goto out;
-    }
-
-#endif
-
-  ret_xattrs = g_variant_builder_end (&builder);
-  g_variant_ref_sink (ret_xattrs);
-  
-  ret = TRUE;
-  gs_transfer_out_value (out_xattrs, &ret_xattrs);
- out:
-  g_clear_pointer (&ret_xattrs, g_variant_unref);
-  g_clear_pointer (&xattr_names, g_free);
-  g_clear_pointer (&xattr_names_canonical, g_free);
-  if (!builder_initialized)
-    g_variant_builder_clear (&builder);
-  return ret;
-}
-
-/**
- * gs_fd_set_all_xattrs:
- * @fd: File descriptor
- * @xattrs: Extended attributes
- * @cancellable: Cancellable
- * @error: Error
- *
- * For each attribute in @xattrs, set its value on the file or
- * directory referred to by @fd.  This function does not remove any
- * attributes not in @xattrs.
- */
-gboolean
-gs_fd_set_all_xattrs (int            fd,
-                      GVariant      *xattrs,
-                      GCancellable  *cancellable,
-                      GError       **error)
-{
-#ifdef GSYSTEM_CONFIG_XATTRS
-  gboolean ret = FALSE;
-  int i, n;
-
-  n = g_variant_n_children (xattrs);
-  for (i = 0; i < n; i++)
-    {
-      const guint8* name;
-      const guint8* value_data;
-      GVariant *value = NULL;
-      gsize value_len;
-      int res;
-
-      g_variant_get_child (xattrs, i, "(^&ay@ay)",
-                           &name, &value);
-      value_data = g_variant_get_fixed_array (value, &value_len, 1);
-      
-      do
-        res = fsetxattr (fd, (char*)name, (char*)value_data, value_len, 0);
-      while (G_UNLIKELY (res == -1 && errno == EINTR));
-      g_variant_unref (value);
-      if (G_UNLIKELY (res == -1))
-        {
-          _set_error_from_errno (error);
-          goto out;
-        }
-    }
-
-  ret = TRUE;
- out:
-  return ret;
-#else
-  return TRUE;
-#endif
-}
-
-/**
- * gs_file_set_all_xattrs:
- * @file: File descriptor
- * @xattrs: Extended attributes
- * @cancellable: Cancellable
- * @error: Error
- *
- * For each attribute in @xattrs, set its value on the file or
- * directory referred to by @file.  This function does not remove any
- * attributes not in @xattrs.
- */
-gboolean
-gs_file_set_all_xattrs (GFile         *file,
-                        GVariant      *xattrs,
-                        GCancellable  *cancellable,
-                        GError       **error)
-{
-#ifdef GSYSTEM_CONFIG_XATTRS
-  gboolean ret = FALSE;
-  const char *path;
-  int i, n;
-
-  path = gs_file_get_path_cached (file);
-
-  n = g_variant_n_children (xattrs);
-  for (i = 0; i < n; i++)
-    {
-      const guint8* name;
-      GVariant *value;
-      const guint8* value_data;
-      gsize value_len;
-      gboolean loop_err;
-
-      g_variant_get_child (xattrs, i, "(^&ay@ay)",
-                           &name, &value);
-      value_data = g_variant_get_fixed_array (value, &value_len, 1);
-      
-      loop_err = lsetxattr (path, (char*)name, (char*)value_data, value_len, 0) < 0;
-      g_clear_pointer (&value, (GDestroyNotify) g_variant_unref);
-      if (loop_err)
-        {
-          _set_error_from_errno (error);
-          g_prefix_error (error, "lsetxattr (%s, %s) failed: ", path, name);
-          goto out;
-        }
-    }
-
-  ret = TRUE;
- out:
-  return ret;
-#else
-  return TRUE;
-#endif
+  return g_unix_input_stream_new (fd, TRUE);
 }
diff -Nru gnome-desktop3-3.12.0/libgnome-desktop/libgsystem/gsystem-file-utils.h gnome-desktop3-3.8.4/libgnome-desktop/libgsystem/gsystem-file-utils.h
--- gnome-desktop3-3.12.0/libgnome-desktop/libgsystem/gsystem-file-utils.h	2014-01-07 13:28:56.000000000 +0000
+++ gnome-desktop3-3.8.4/libgnome-desktop/libgsystem/gsystem-file-utils.h	2012-08-16 22:10:20.000000000 +0000
@@ -22,150 +22,12 @@
 #define __GSYSTEM_FILE_UTILS_H__
 
 #include 
-#include 
 
 G_BEGIN_DECLS
 
-const char *gs_file_get_path_cached (GFile *file);
-
-const char *gs_file_get_basename_cached (GFile *file);
-
-gboolean gs_file_enumerator_iterate (GFileEnumerator  *direnum,
-                                     GFileInfo       **out_info,
-                                     GFile           **out_child,
-                                     GCancellable     *cancellable,
-                                     GError          **error);
-
-gboolean gs_file_openat_noatime (int            dfd,
-                                 const char    *name,
-                                 int           *ret_fd,
-                                 GCancellable  *cancellable,
-                                 GError       **error);
-
-GInputStream *gs_file_read_noatime (GFile         *file,
+GInputStream *gs_file_read_noatime (GFile         *path,
                                     GCancellable  *cancellable,
                                     GError       **error);
-GMappedFile *gs_file_map_noatime (GFile         *file,
-                                  GCancellable  *cancellable,
-                                  GError       **error);
-
-#ifndef __GI_SCANNER__
-gboolean gs_stream_fstat (GFileDescriptorBased *stream,
-                          struct stat          *out_stbuf,
-                          GCancellable         *cancellable,
-                          GError              **error);
-
-#endif
-
-#if GLIB_CHECK_VERSION(2,34,0)
-GBytes *gs_file_map_readonly (GFile         *file,
-                              GCancellable  *cancellable,
-                              GError       **error);
-#endif
-
-gboolean gs_file_sync_data (GFile          *file,
-                            GCancellable   *cancellable,
-                            GError        **error);
-
-char * gs_fileutil_gen_tmp_name (const char *prefix,
-                                 const char *suffix);
-
-gboolean gs_file_open_dir_fd (GFile         *path,
-                              int           *out_fd,
-                              GCancellable  *cancellable,
-                              GError       **error);
-
-gboolean gs_file_open_in_tmpdir_at (int                tmpdir_fd,
-                                    int                mode,
-                                    char             **out_name,
-                                    GOutputStream    **out_stream,
-                                    GCancellable      *cancellable,
-                                    GError           **error);
-
-gboolean gs_file_open_in_tmpdir (GFile             *tmpdir,
-                                 int                mode,
-                                 GFile            **out_file,
-                                 GOutputStream    **out_stream,
-                                 GCancellable      *cancellable,
-                                 GError           **error);
-
-gboolean gs_file_create (GFile          *file,
-                         int             mode,
-                         GOutputStream **out_stream,
-                         GCancellable   *cancellable,
-                         GError        **error);
-
-gboolean gs_file_linkcopy (GFile          *src,
-                           GFile          *dest,
-                           GFileCopyFlags  flags,
-                           GCancellable   *cancellable,
-                           GError        **error);
-
-gboolean gs_file_linkcopy_sync_data (GFile          *src,
-                                     GFile          *dest,
-                                     GFileCopyFlags  flags,
-                                     GCancellable   *cancellable,
-                                     GError        **error);
-
-gboolean gs_file_rename (GFile          *from,
-                         GFile          *to,
-                         GCancellable   *cancellable,
-                         GError        **error);
-
-gboolean gs_file_unlink (GFile          *path,
-                         GCancellable   *cancellable,
-                         GError        **error);
-
-gboolean gs_file_chown (GFile          *path,
-                        guint32         owner,
-                        guint32         group,
-                        GCancellable   *cancellable,
-                        GError        **error);
-
-gboolean gs_file_lchown (GFile          *path,
-                         guint32         owner,
-                         guint32         group,
-                         GCancellable   *cancellable,
-                         GError        **error);
-
-gboolean gs_file_chmod (GFile          *path,
-                        guint           mode,
-                        GCancellable   *cancellable,
-                        GError        **error);
-
-gboolean gs_file_ensure_directory (GFile          *dir,
-                                   gboolean        with_parents,
-                                   GCancellable   *cancellable,
-                                   GError        **error);
-
-gboolean gs_file_ensure_directory_mode (GFile          *dir,
-                                        guint           mode,
-                                        GCancellable   *cancellable,
-                                        GError        **error);
-
-gchar *gs_file_load_contents_utf8 (GFile         *file,
-                                   GCancellable  *cancellable,
-                                   GError       **error);
-
-gchar *gs_file_get_relpath (GFile *one,
-                            GFile *two);
-
-GFile * gs_file_realpath (GFile *file);
-
-gboolean gs_file_get_all_xattrs (GFile         *f,
-                                 GVariant     **out_xattrs,
-                                 GCancellable  *cancellable,
-                                 GError       **error);
-
-gboolean gs_fd_set_all_xattrs (int            fd,
-                               GVariant      *xattrs,
-                               GCancellable  *cancellable,
-                               GError       **error);
-
-gboolean gs_file_set_all_xattrs (GFile         *file,
-                                 GVariant      *xattrs,
-                                 GCancellable  *cancellable,
-                                 GError       **error);
 
 G_END_DECLS
 
diff -Nru gnome-desktop3-3.12.0/libgnome-desktop/libgsystem/gsystem-glib-compat.h gnome-desktop3-3.8.4/libgnome-desktop/libgsystem/gsystem-glib-compat.h
--- gnome-desktop3-3.12.0/libgnome-desktop/libgsystem/gsystem-glib-compat.h	2013-11-11 17:23:51.000000000 +0000
+++ gnome-desktop3-3.8.4/libgnome-desktop/libgsystem/gsystem-glib-compat.h	1970-01-01 00:00:00.000000000 +0000
@@ -1,54 +0,0 @@
-/* -*- mode: C; c-file-style: "gnu"; indent-tabs-mode: nil; -*-
- *
- * Copyright (C) 2012,2013 Colin Walters .
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library 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
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- */
-
-#ifndef __LIBGSYSTEM_GLIB_COMPAT__
-#define __LIBGSYSTEM_GLIB_COMPAT__
-
-#include 
-
-#if !GLIB_CHECK_VERSION(2,34,0)
-static inline void
-g_type_ensure (GType type)
-{
-  if (G_UNLIKELY (type == (GType)-1))
-    g_error ("can't happen");
-}
-
-#define g_clear_pointer(pp, destroy)	  \
-	G_STMT_START { \
-		G_STATIC_ASSERT (sizeof *(pp) == sizeof (gpointer)); \
-		/* Only one access, please */ \
-		gpointer *_pp = (gpointer *) (pp); \
-		gpointer _p; \
-		/* This assignment is needed to avoid a gcc warning */ \
-		GDestroyNotify _destroy = (GDestroyNotify) (destroy); \
-	  \
-		(void) (0 ? (gpointer) *(pp) : 0); \
-		do \
-			_p = g_atomic_pointer_get (_pp); \
-		while G_UNLIKELY (!g_atomic_pointer_compare_and_exchange (_pp, _p, NULL)); \
-	  \
-		if (_p) \
-			_destroy (_p); \
-	} G_STMT_END
-
-#endif
-
-#endif
diff -Nru gnome-desktop3-3.12.0/libgnome-desktop/libgsystem/gsystem-local-alloc.c gnome-desktop3-3.8.4/libgnome-desktop/libgsystem/gsystem-local-alloc.c
--- gnome-desktop3-3.12.0/libgnome-desktop/libgsystem/gsystem-local-alloc.c	2014-01-07 13:28:56.000000000 +0000
+++ gnome-desktop3-3.8.4/libgnome-desktop/libgsystem/gsystem-local-alloc.c	2012-08-16 22:10:21.000000000 +0000
@@ -22,51 +22,44 @@
 
 #include "gsystem-local-alloc.h"
 
-/**
- * SECTION:gslocalalloc
- * @title: GSystem local allocation
- * @short_description: Release local variables automatically when they go out of scope
- *
- * These macros leverage the GCC extension __attribute__ ((cleanup))
- * to allow calling a cleanup function such as g_free() when a
- * variable goes out of scope.  See 
- * for more information on the attribute.
- *
- * The provided macros make it easy to use the cleanup attribute for
- * types that come with GLib.  The primary two are #gs_free and
- * #gs_unref_object, which correspond to g_free() and
- * g_object_unref(), respectively.
- *
- * The rationale behind this is that particularly when handling error
- * paths, it can be very tricky to ensure the right variables are
- * freed.  With this, one simply applies gs_lobj to a
- * locally-allocated #GFile for example, and it will be automatically
- * unreferenced when it goes out of scope.
- *
- * Note - you should only use these macros for stack
- * allocated variables.  They don't provide garbage
- * collection or let you avoid freeing things.  They're simply a
- * compiler assisted deterministic mechanism for calling a cleanup
- * function when a stack frame ends.
- *
- * Calling g_free automatically
- * 
- *
- * GFile *
- * create_file (GError **error)
- * {
- *   gs_free char *random_id = NULL;
- *
- *   if (!prepare_file (error))
- *     return NULL;
- *
- *   random_id = alloc_random_id ();
- *
- *   return create_file_real (error);
- *   // Note that random_id is freed here automatically
- * }
- * 
- * 
- *
- */
+void
+gs_local_free (void *loc)
+{
+  void **location = loc;
+  if (location)
+    g_free (*location);
+}
+
+#define _gs_local_free(type, function) do {           \
+    void **location = loc;                            \
+    if (location)                                     \
+      {                                               \
+        type *value = *location;                      \
+        if (value)                                    \
+          function (value);                           \
+      }                                               \
+  } while (0)
+
+void
+gs_local_obj_unref (void *loc)
+{
+  _gs_local_free(GObject, g_object_unref);
+}
+
+void
+gs_local_variant_unref (void *loc)
+{
+  _gs_local_free(GVariant, g_variant_unref);
+}
+
+void
+gs_local_ptrarray_unref (void *loc)
+{
+  _gs_local_free(GPtrArray, g_ptr_array_unref);
+}
+
+void
+gs_local_hashtable_unref (void *loc)
+{
+  _gs_local_free(GHashTable, g_hash_table_unref);
+}
diff -Nru gnome-desktop3-3.12.0/libgnome-desktop/libgsystem/gsystem-local-alloc.h gnome-desktop3-3.8.4/libgnome-desktop/libgsystem/gsystem-local-alloc.h
--- gnome-desktop3-3.12.0/libgnome-desktop/libgsystem/gsystem-local-alloc.h	2014-01-07 13:28:56.000000000 +0000
+++ gnome-desktop3-3.8.4/libgnome-desktop/libgsystem/gsystem-local-alloc.h	2012-08-16 22:10:21.000000000 +0000
@@ -25,139 +25,17 @@
 
 G_BEGIN_DECLS
 
-#define GS_DEFINE_CLEANUP_FUNCTION(Type, name, func) \
-  static inline void name (void *v) \
-  { \
-    func (*(Type*)v); \
-  }
-
-#define GS_DEFINE_CLEANUP_FUNCTION0(Type, name, func) \
-  static inline void name (void *v) \
-  { \
-    if (*(Type*)v) \
-      func (*(Type*)v); \
-  }
-
-/* These functions shouldn't be invoked directly;
- * they are stubs that:
- * 1) Take a pointer to the location (typically itself a pointer).
- * 2) Provide %NULL-safety where it doesn't exist already (e.g. g_object_unref)
- */
-GS_DEFINE_CLEANUP_FUNCTION0(GArray*, gs_local_array_unref, g_array_unref)
-GS_DEFINE_CLEANUP_FUNCTION0(GBytes*, gs_local_bytes_unref, g_bytes_unref)
-GS_DEFINE_CLEANUP_FUNCTION0(GChecksum*, gs_local_checksum_free, g_checksum_free)
-GS_DEFINE_CLEANUP_FUNCTION0(GError*, gs_local_free_error, g_error_free)
-GS_DEFINE_CLEANUP_FUNCTION0(GHashTable*, gs_local_hashtable_unref, g_hash_table_unref)
-GS_DEFINE_CLEANUP_FUNCTION0(GObject*, gs_local_obj_unref, g_object_unref)
-GS_DEFINE_CLEANUP_FUNCTION0(GPtrArray*, gs_local_ptrarray_unref, g_ptr_array_unref)
-GS_DEFINE_CLEANUP_FUNCTION0(GVariant*, gs_local_variant_unref, g_variant_unref)
-GS_DEFINE_CLEANUP_FUNCTION0(GVariantBuilder*, gs_local_variant_builder_unref, g_variant_builder_unref)
-GS_DEFINE_CLEANUP_FUNCTION0(GVariantIter*, gs_local_variant_iter_free, g_variant_iter_free)
-
-GS_DEFINE_CLEANUP_FUNCTION(char**, gs_local_strfreev, g_strfreev)
-GS_DEFINE_CLEANUP_FUNCTION(void*, gs_local_free, g_free)
-
-/**
- * gs_free:
- *
- * Call g_free() on a variable location when it goes out of scope.
- */
-#define gs_free __attribute__ ((cleanup(gs_local_free)))
-
-/**
- * gs_unref_object:
- *
- * Call g_object_unref() on a variable location when it goes out of
- * scope.  Note that unlike g_object_unref(), the variable may be
- * %NULL.
- */
-#define gs_unref_object __attribute__ ((cleanup(gs_local_obj_unref)))
-
-/**
- * gs_unref_variant:
- *
- * Call g_variant_unref() on a variable location when it goes out of
- * scope.  Note that unlike g_variant_unref(), the variable may be
- * %NULL.
- */
-#define gs_unref_variant __attribute__ ((cleanup(gs_local_variant_unref)))
-
-/**
- * gs_free_variant_iter:
- *
- * Call g_variant_iter_free() on a variable location when it goes out of
- * scope.
- */
-#define gs_free_variant_iter __attribute__ ((cleanup(gs_local_variant_iter_free)))
-
-/**
- * gs_free_variant_builder:
- *
- * Call g_variant_builder_unref() on a variable location when it goes out of
- * scope.
- */
-#define gs_unref_variant_builder __attribute__ ((cleanup(gs_local_variant_builder_unref)))
-
-/**
- * gs_unref_array:
- *
- * Call g_array_unref() on a variable location when it goes out of
- * scope.  Note that unlike g_array_unref(), the variable may be
- * %NULL.
-
- */
-#define gs_unref_array __attribute__ ((cleanup(gs_local_array_unref)))
-
-/**
- * gs_unref_ptrarray:
- *
- * Call g_ptr_array_unref() on a variable location when it goes out of
- * scope.  Note that unlike g_ptr_array_unref(), the variable may be
- * %NULL.
-
- */
-#define gs_unref_ptrarray __attribute__ ((cleanup(gs_local_ptrarray_unref)))
-
-/**
- * gs_unref_hashtable:
- *
- * Call g_hash_table_unref() on a variable location when it goes out
- * of scope.  Note that unlike g_hash_table_unref(), the variable may
- * be %NULL.
- */
-#define gs_unref_hashtable __attribute__ ((cleanup(gs_local_hashtable_unref)))
-
-/**
- * gs_free_checksum:
- *
- * Call g_checksum_free() on a variable location when it goes out
- * of scope.  Note that unlike g_checksum_free(), the variable may
- * be %NULL.
- */
-#define gs_free_checksum __attribute__ ((cleanup(gs_local_checksum_free)))
-
-/**
- * gs_unref_bytes:
- *
- * Call g_bytes_unref() on a variable location when it goes out
- * of scope.  Note that unlike g_bytes_unref(), the variable may
- * be %NULL.
- */
-#define gs_unref_bytes __attribute__ ((cleanup(gs_local_bytes_unref)))
-
-/**
- * gs_strfreev:
- *
- * Call g_strfreev() on a variable location when it goes out of scope.
- */
-#define gs_strfreev __attribute__ ((cleanup(gs_local_strfreev)))
-
-/**
- * gs_free_error:
- *
- * Call g_error_free() on a variable location when it goes out of scope.
- */
-#define gs_free_error __attribute__ ((cleanup(gs_local_free_error)))
+void gs_local_free (void *loc);
+void gs_local_obj_unref (void *loc);
+void gs_local_variant_unref (void *loc);
+void gs_local_ptrarray_unref (void *loc);
+void gs_local_hashtable_unref (void *loc);
+
+#define gs_lfree __attribute__ ((cleanup(gs_local_free)))
+#define gs_lobj __attribute__ ((cleanup(gs_local_obj_unref)))
+#define gs_lvariant __attribute__ ((cleanup(gs_local_variant_unref)))
+#define gs_lptrarray __attribute__ ((cleanup(gs_local_ptrarray_unref)))
+#define gs_lhash __attribute__ ((cleanup(gs_local_hashtable_unref)))
 
 G_END_DECLS
 
diff -Nru gnome-desktop3-3.12.0/libgnome-desktop/libgsystem/gsystem-log.c gnome-desktop3-3.8.4/libgnome-desktop/libgsystem/gsystem-log.c
--- gnome-desktop3-3.12.0/libgnome-desktop/libgsystem/gsystem-log.c	2013-11-11 17:23:51.000000000 +0000
+++ gnome-desktop3-3.8.4/libgnome-desktop/libgsystem/gsystem-log.c	1970-01-01 00:00:00.000000000 +0000
@@ -1,167 +0,0 @@
-/* -*- mode: C; c-file-style: "gnu"; indent-tabs-mode: nil; -*-
- *
- * Copyright (C) 2012 William Jon McCann 
- * Copyright (C) 2012 Colin Walters 
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library 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
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- */
-
-#include "config.h"
-
-#ifndef _GNU_SOURCE
-#define _GNU_SOURCE
-#endif
-
-#ifdef ENABLE_SYSTEMD_JOURNAL
-#define SD_JOURNAL_SUPPRESS_LOCATION
-#include 
-#endif
-#include 
-
-#define _GSYSTEM_NO_LOCAL_ALLOC
-#include "libgsystem.h"
-
-/**
- * gs_log_structured:
- * @message: Text message to send 
- * @keys: (allow-none) (array zero-terminated=1) (element-type utf8): Optional structured data
- * 
- * Log structured data in an operating-system specific fashion.  The
- * parameter @opts should be an array of UTF-8 KEY=VALUE strings.
- * This function does not support binary data.  See
- * http://www.freedesktop.org/software/systemd/man/systemd.journal-fields.html
- * for more information about fields that can be used on a systemd
- * system.
- */
-void
-gs_log_structured (const char *message,
-                   const char *const *keys)
-{
-#ifdef ENABLE_SYSTEMD_JOURNAL
-    const char *const*iter;
-    char *msgkey;
-    guint i, n_opts;
-    struct iovec *iovs;
-
-    for (n_opts = 0, iter = keys; *iter; iter++, n_opts++)
-        ;
-
-    n_opts++; /* Add one for MESSAGE= */
-    iovs = g_alloca (sizeof (struct iovec) * n_opts);
-    
-    for (i = 0, iter = keys; *iter; iter++, i++) {
-        iovs[i].iov_base = (char*)keys[i];
-        iovs[i].iov_len = strlen (keys[i]);
-    }
-    g_assert(i == n_opts-1);
-    msgkey = g_strconcat ("MESSAGE=", message, NULL);
-    iovs[i].iov_base = msgkey;
-    iovs[i].iov_len = strlen (msgkey);
-    
-    // The code location isn't useful since we're wrapping
-    sd_journal_sendv (iovs, n_opts);
-    
-    g_free (msgkey);
-#else
-    g_print ("%s\n", message);
-#endif
-}
-
-/**
- * gs_stdout_is_journal:
- *
- * Use this function when you want your code to behave differently
- * depeneding on whether your program was started as a systemd unit,
- * or e.g. interactively at a terminal.
- *
- * Returns: %TRUE if stdout is (probably) connnected to the systemd journal
- */
-gboolean
-gs_stdout_is_journal (void)
-{
-  static gsize initialized;
-  static gboolean stdout_is_socket;
-
-  if (g_once_init_enter (&initialized))
-    {
-      guint64 pid = (guint64) getpid ();
-      char *fdpath = g_strdup_printf ("/proc/%" G_GUINT64_FORMAT "/fd/1", pid);
-      char buf[1024];
-      ssize_t bytes_read;
-
-      if ((bytes_read = readlink (fdpath, buf, sizeof(buf) - 1)) != -1)
-        {
-          buf[bytes_read] = '\0';
-          stdout_is_socket = g_str_has_prefix (buf, "socket:");
-        }
-      else
-        stdout_is_socket = FALSE;
-
-      g_free (fdpath);
-      g_once_init_leave (&initialized, TRUE);
-    }
-
-  return stdout_is_socket;
-}
-
-/**
- * gs_log_structured_print:
- * @message: A message to log
- * @keys: (allow-none) (array zero-terminated=1) (element-type utf8): Optional structured data
- *
- * Like gs_log_structured(), but also print to standard output (if it
- * is not already connected to the system log).
- */
-void
-gs_log_structured_print (const char *message,
-                         const char *const *keys)
-{
-  gs_log_structured (message, keys);
-
-#ifdef ENABLE_SYSTEMD_JOURNAL
-  if (!gs_stdout_is_journal ())
-    g_print ("%s\n", message);
-#endif
-}
-
-/**
- * gs_log_structured_print_id_v:
- * @message_id: A unique MESSAGE_ID
- * @format: A format string
- *
- * The provided @message_id is a unique MESSAGE_ID (see  for more information).
- *
- * This function otherwise acts as gs_log_structured_print(), taking
- * @format as a format string.
- */
-void
-gs_log_structured_print_id_v (const char *message_id,
-                              const char *format,
-                              ...)
-{
-  char *keys[] = { NULL, NULL };
-  char *msg;
-  va_list args;
-
-  va_start (args, format);
-  msg = g_strdup_vprintf (format, args);
-  va_end (args);
-
-  keys[0] = g_strconcat ("MESSAGE_ID=", message_id, NULL);
-  gs_log_structured_print (msg, (const char *const *)keys);
-  g_free (keys[0]);
-  g_free (msg);
-}
diff -Nru gnome-desktop3-3.12.0/libgnome-desktop/libgsystem/gsystem-log.h gnome-desktop3-3.8.4/libgnome-desktop/libgsystem/gsystem-log.h
--- gnome-desktop3-3.12.0/libgnome-desktop/libgsystem/gsystem-log.h	2013-11-11 17:23:51.000000000 +0000
+++ gnome-desktop3-3.8.4/libgnome-desktop/libgsystem/gsystem-log.h	1970-01-01 00:00:00.000000000 +0000
@@ -1,42 +0,0 @@
-/* -*- mode: C; c-file-style: "gnu"; indent-tabs-mode: nil; -*-
- *
- * Copyright (C) 2013 Colin Walters .
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library 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
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- */
-
-#ifndef __GSYSTEM_LOG_H__
-#define __GSYSTEM_LOG_H__
-
-#include 
-
-G_BEGIN_DECLS
-
-gboolean gs_stdout_is_journal (void);
-
-void gs_log_structured (const char *message,
-                        const char *const *keys);
-
-void gs_log_structured_print (const char *message,
-                              const char *const *keys);
-
-void gs_log_structured_print_id_v (const char *message_id,
-                                   const char *format,
-                                   ...) G_GNUC_PRINTF (2, 3);
-
-G_END_DECLS
-
-#endif
diff -Nru gnome-desktop3-3.12.0/libgnome-desktop/libgsystem/gsystem-shutil.c gnome-desktop3-3.8.4/libgnome-desktop/libgsystem/gsystem-shutil.c
--- gnome-desktop3-3.12.0/libgnome-desktop/libgsystem/gsystem-shutil.c	2014-01-07 13:28:56.000000000 +0000
+++ gnome-desktop3-3.8.4/libgnome-desktop/libgsystem/gsystem-shutil.c	1970-01-01 00:00:00.000000000 +0000
@@ -1,459 +0,0 @@
-/* -*- mode: C; c-file-style: "gnu"; indent-tabs-mode: nil; -*-
- *
- * Copyright (C) 2012 William Jon McCann 
- * Copyright (C) 2012 Colin Walters 
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library 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
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- */
-
-#include "config.h"
-
-#ifndef _GNU_SOURCE
-#define _GNU_SOURCE
-#endif
-
-#define _GSYSTEM_NO_LOCAL_ALLOC
-#include "libgsystem.h"
-#include 
-#include 
-#include 
-#include 
-#include 
-
-/* Taken from systemd/src/shared/util.h */
-union dirent_storage {
-        struct dirent dent;
-        guint8 storage[offsetof(struct dirent, d_name) +
-                        ((NAME_MAX + 1 + sizeof(long)) & ~(sizeof(long) - 1))];
-};
-
-static inline void
-_set_error_from_errno (GError **error)
-{
-  int errsv = errno;
-  g_set_error_literal (error, G_IO_ERROR, g_io_error_from_errno (errsv),
-                       g_strerror (errsv));
-}
-
-static gboolean
-copy_xattrs_from_file_to_fd (GFile         *src,
-                             int            dest_fd,
-                             GCancellable  *cancellable,
-                             GError       **error)
-{
-  gboolean ret = FALSE;
-  GVariant *src_xattrs = NULL;
-
-  if (!gs_file_get_all_xattrs (src, &src_xattrs, cancellable, error))
-    goto out;
-
-  if (src_xattrs)
-    {
-      if (!gs_fd_set_all_xattrs (dest_fd, src_xattrs, cancellable, error))
-        goto out;
-    }
-
-  ret = TRUE;
- out:
-  g_clear_pointer (&src_xattrs, g_variant_unref);
-  return ret;
-}
-
-typedef enum {
-  GS_CP_MODE_NONE,
-  GS_CP_MODE_HARDLINK,
-  GS_CP_MODE_COPY_ALL
-} GsCpMode;
-
-static gboolean
-cp_internal (GFile         *src,
-             GFile         *dest,
-             GsCpMode       mode,
-             GCancellable  *cancellable,
-             GError       **error)
-{
-  gboolean ret = FALSE;
-  GFileEnumerator *enumerator = NULL;
-  GFileInfo *src_info = NULL;
-  GFile *dest_child = NULL;
-  int dest_dfd = -1;
-  int r;
-
-  enumerator = g_file_enumerate_children (src, "standard::type,standard::name,unix::uid,unix::gid,unix::mode",
-                                          G_FILE_QUERY_INFO_NOFOLLOW_SYMLINKS,
-                                          cancellable, error);
-  if (!enumerator)
-    goto out;
-
-  src_info = g_file_query_info (src, "standard::name,unix::mode,unix::uid,unix::gid," \
-                                "time::modified,time::modified-usec,time::access,time::access-usec",
-                                G_FILE_QUERY_INFO_NOFOLLOW_SYMLINKS,
-                                cancellable, error);
-  if (!src_info)
-    goto out;
-
-  do
-    r = mkdir (gs_file_get_path_cached (dest), 0755);
-  while (G_UNLIKELY (r == -1 && errno == EINTR));
-  if (r == -1)
-    {
-      _set_error_from_errno (error);
-      goto out;
-    }
-
-  if (mode != GS_CP_MODE_NONE)
-    {
-      if (!gs_file_open_dir_fd (dest, &dest_dfd,
-                                cancellable, error))
-        goto out;
-
-      do
-        r = fchown (dest_dfd,
-                    g_file_info_get_attribute_uint32 (src_info, "unix::uid"),
-                    g_file_info_get_attribute_uint32 (src_info, "unix::gid"));
-      while (G_UNLIKELY (r == -1 && errno == EINTR));
-      if (r == -1)
-        {
-          _set_error_from_errno (error);
-          goto out;
-        }
-
-      do
-        r = fchmod (dest_dfd, g_file_info_get_attribute_uint32 (src_info, "unix::mode"));
-      while (G_UNLIKELY (r == -1 && errno == EINTR));
-
-      if (!copy_xattrs_from_file_to_fd (src, dest_dfd, cancellable, error))
-        goto out;
-
-      if (dest_dfd != -1)
-        {
-          (void) close (dest_dfd);
-          dest_dfd = -1;
-        }
-    }
-
-  while (TRUE)
-    {
-      GFileInfo *file_info = NULL;
-      GFile *src_child = NULL;
-
-      if (!gs_file_enumerator_iterate (enumerator, &file_info, &src_child,
-                                       cancellable, error))
-        goto out;
-      if (!file_info)
-        break;
-
-      if (dest_child) g_object_unref (dest_child);
-      dest_child = g_file_get_child (dest, g_file_info_get_name (file_info));
-
-      if (g_file_info_get_file_type (file_info) == G_FILE_TYPE_DIRECTORY)
-        {
-          if (!cp_internal (src_child, dest_child, mode,
-                            cancellable, error))
-            goto out;
-        }
-      else
-        {
-          gboolean did_link = FALSE;
-          (void) unlink (gs_file_get_path_cached (dest_child));
-          if (mode == GS_CP_MODE_HARDLINK)
-            {
-              if (link (gs_file_get_path_cached (src_child), gs_file_get_path_cached (dest_child)) == -1)
-                {
-                  if (!(errno == EMLINK || errno == EXDEV))
-                    {
-                      int errsv = errno;
-                      g_set_error_literal (error, G_IO_ERROR, g_io_error_from_errno (errsv),
-                                           g_strerror (errsv));
-                      goto out;
-                    }
-                  /* We failed to hardlink; fall back to copying all; this will
-                   * affect subsequent directory copies too.
-                   */
-                  mode = GS_CP_MODE_COPY_ALL;
-                }
-              else
-                did_link = TRUE;
-            }
-          if (!did_link)
-            {
-              GFileCopyFlags copyflags = G_FILE_COPY_OVERWRITE | G_FILE_COPY_NOFOLLOW_SYMLINKS;
-              if (mode == GS_CP_MODE_COPY_ALL)
-                copyflags |= G_FILE_COPY_ALL_METADATA;
-              if (!g_file_copy (src_child, dest_child, copyflags,
-                                cancellable, NULL, NULL, error))
-                goto out;
-            }
-        }
-    }
-
-  ret = TRUE;
- out:
-  if (dest_dfd != -1)
-    (void) close (dest_dfd);
-  g_clear_object (&src_info);
-  g_clear_object (&enumerator);
-  g_clear_object (&dest_child);
-  return ret;
-}
-
-/**
- * gs_shutil_cp_al_or_fallback:
- * @src: Source path
- * @dest: Destination path
- * @cancellable:
- * @error:
- *
- * Recursively copy path @src (which must be a directory) to the
- * target @dest.  If possible, hardlinks are used; if a hardlink is
- * not possible, a regular copy is created.  Any existing files are
- * overwritten.
- *
- * Returns: %TRUE on success
- */
-gboolean
-gs_shutil_cp_al_or_fallback (GFile         *src,
-                             GFile         *dest,
-                             GCancellable  *cancellable,
-                             GError       **error)
-{
-  return cp_internal (src, dest, GS_CP_MODE_HARDLINK,
-                      cancellable, error);
-}
-
-/**
- * gs_shutil_cp_a:
- * @src: Source path
- * @dest: Destination path
- * @cancellable:
- * @error:
- *
- * Recursively copy path @src (which must be a directory) to the
- * target @dest.  Any existing files are overwritten.
- *
- * Returns: %TRUE on success
- */
-gboolean
-gs_shutil_cp_a (GFile         *src,
-                GFile         *dest,
-                GCancellable  *cancellable,
-                GError       **error)
-{
-  return cp_internal (src, dest, GS_CP_MODE_COPY_ALL,
-                      cancellable, error);
-}
-
-static unsigned char
-struct_stat_to_dt (struct stat *stbuf)
-{
-  if (S_ISDIR (stbuf->st_mode))
-    return DT_DIR;
-  if (S_ISREG (stbuf->st_mode))
-    return DT_REG;
-  if (S_ISCHR (stbuf->st_mode))
-    return DT_CHR;
-  if (S_ISBLK (stbuf->st_mode))
-    return DT_BLK;
-  if (S_ISFIFO (stbuf->st_mode))
-    return DT_FIFO;
-  if (S_ISLNK (stbuf->st_mode))
-    return DT_LNK;
-  if (S_ISSOCK (stbuf->st_mode))
-    return DT_SOCK;
-  return DT_UNKNOWN;
-}
-
-static gboolean
-gs_shutil_rm_rf_children (DIR                *dir,
-                          GCancellable       *cancellable,
-                          GError            **error)
-{
-  gboolean ret = FALSE;
-  int dfd;
-  DIR *child_dir = NULL;
-  struct dirent *dent;
-  union dirent_storage buf;
-
-  if (g_cancellable_set_error_if_cancelled (cancellable, error))
-    goto out;
-
-  dfd = dirfd (dir);
-
-  while (readdir_r (dir, &buf.dent, &dent) == 0)
-    {
-      if (dent == NULL)
-        break;
-      if (dent->d_type == DT_UNKNOWN)
-        {
-          struct stat stbuf;
-          if (fstatat (dfd, dent->d_name, &stbuf, AT_SYMLINK_NOFOLLOW) == -1)
-            {
-              int errsv = errno;
-              if (errsv == ENOENT)
-                continue;
-              else
-                {
-                  g_set_error_literal (error, G_IO_ERROR, g_io_error_from_errno (errsv),
-                                       g_strerror (errsv));
-                  goto out;
-                }
-            }
-          dent->d_type = struct_stat_to_dt (&stbuf);
-          /* Assume unknown types are just treated like regular files */
-          if (dent->d_type == DT_UNKNOWN)
-            dent->d_type = DT_REG;
-        }
-
-      if (strcmp (dent->d_name, ".") == 0 || strcmp (dent->d_name, "..") == 0)
-        continue;
-          
-      if (dent->d_type == DT_DIR)
-        {
-          int child_dfd = openat (dfd, dent->d_name, O_RDONLY | O_NONBLOCK | O_DIRECTORY | O_CLOEXEC | O_NOFOLLOW);
-
-          if (child_dfd == -1)
-            {
-              if (errno == ENOENT)
-                continue;
-              else
-                {
-                  int errsv = errno;
-                  g_set_error_literal (error, G_IO_ERROR, g_io_error_from_errno (errsv),
-                                       g_strerror (errsv));
-                  goto out;
-                }
-            }
-
-          child_dir = fdopendir (child_dfd);
-          if (!child_dir)
-            {
-              int errsv = errno;
-              g_set_error_literal (error, G_IO_ERROR, g_io_error_from_errno (errsv),
-                                   g_strerror (errsv));
-              goto out;
-            }
-
-          if (!gs_shutil_rm_rf_children (child_dir, cancellable, error))
-            goto out;
-
-          if (unlinkat (dfd, dent->d_name, AT_REMOVEDIR) == -1)
-            {
-              int errsv = errno;
-              g_set_error_literal (error, G_IO_ERROR, g_io_error_from_errno (errsv),
-                                   g_strerror (errsv));
-              goto out;
-            }
-
-          (void) closedir (child_dir);
-          child_dir = NULL;
-        }
-      else
-        {
-          if (unlinkat (dfd, dent->d_name, 0) == -1)
-            {
-              int errsv = errno;
-              if (errno != ENOENT)
-                {
-                  g_set_error_literal (error, G_IO_ERROR, g_io_error_from_errno (errsv),
-                                       g_strerror (errsv));
-                  goto out;
-                }
-            }
-        }
-    }
-  /* Ignore error result from readdir_r, that's what others
-   * seem to do =(
-   */
-
-  ret = TRUE;
- out:
-  if (child_dir) (void) closedir (child_dir);
-  return ret;
-}
-
-/**
- * gs_shutil_rm_rf:
- * @path: A file or directory
- * @cancellable:
- * @error:
- *
- * Recursively delete the filename referenced by @path; it may be a
- * file or directory.  No error is thrown if @path does not exist.
- */
-gboolean
-gs_shutil_rm_rf (GFile        *path,
-                 GCancellable *cancellable,
-                 GError      **error)
-{
-  gboolean ret = FALSE;
-  int dfd = -1;
-  DIR *d = NULL;
-
-  /* With O_NOFOLLOW first */
-  dfd = openat (AT_FDCWD, gs_file_get_path_cached (path),
-                O_RDONLY | O_NONBLOCK | O_DIRECTORY | O_CLOEXEC | O_NOFOLLOW);
-
-  if (dfd == -1)
-    {
-      int errsv = errno;
-      if (errsv == ENOENT)
-        {
-          ;
-        }
-      else if (errsv == ENOTDIR || errsv == ELOOP)
-        {
-          if (!gs_file_unlink (path, cancellable, error))
-            goto out;
-        }
-      else
-        {
-          g_set_error_literal (error, G_IO_ERROR, g_io_error_from_errno (errsv),
-                               g_strerror (errsv));
-          goto out;
-        }
-    }
-  else
-    {
-      d = fdopendir (dfd);
-      if (!d)
-        {
-          int errsv = errno;
-          g_set_error_literal (error, G_IO_ERROR, g_io_error_from_errno (errsv),
-                               g_strerror (errsv));
-          goto out;
-        }
-
-      if (!gs_shutil_rm_rf_children (d, cancellable, error))
-        goto out;
-
-      if (rmdir (gs_file_get_path_cached (path)) == -1)
-        {
-          int errsv = errno;
-          if (errsv != ENOENT)
-            {
-              g_set_error_literal (error, G_IO_ERROR, g_io_error_from_errno (errsv),
-                                   g_strerror (errsv));
-              goto out;
-            }
-        }
-    }
-
-  ret = TRUE;
- out:
-  if (d) (void) closedir (d);
-  return ret;
-}
-
diff -Nru gnome-desktop3-3.12.0/libgnome-desktop/libgsystem/gsystem-shutil.h gnome-desktop3-3.8.4/libgnome-desktop/libgsystem/gsystem-shutil.h
--- gnome-desktop3-3.12.0/libgnome-desktop/libgsystem/gsystem-shutil.h	2013-11-11 17:23:51.000000000 +0000
+++ gnome-desktop3-3.8.4/libgnome-desktop/libgsystem/gsystem-shutil.h	1970-01-01 00:00:00.000000000 +0000
@@ -1,47 +0,0 @@
-/* -*- mode: C; c-file-style: "gnu"; indent-tabs-mode: nil; -*-
- *
- * Copyright (C) 2012 Colin Walters .
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library 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
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- */
-
-#ifndef __GSYSTEM_SHUTIL_H__
-#define __GSYSTEM_SHUTIL_H__
-
-#include 
-
-G_BEGIN_DECLS
-
-gboolean
-gs_shutil_cp_al_or_fallback (GFile         *src,
-                             GFile         *dest,
-                             GCancellable  *cancellable,
-                             GError       **error);
-
-gboolean
-gs_shutil_cp_a (GFile         *src,
-                GFile         *dest,
-                GCancellable  *cancellable,
-                GError       **error);
-
-gboolean
-gs_shutil_rm_rf (GFile        *path,
-                 GCancellable *cancellable,
-                 GError      **error);
-
-G_END_DECLS
-
-#endif
diff -Nru gnome-desktop3-3.12.0/libgnome-desktop/libgsystem/gsystem-subprocess.c gnome-desktop3-3.8.4/libgnome-desktop/libgsystem/gsystem-subprocess.c
--- gnome-desktop3-3.12.0/libgnome-desktop/libgsystem/gsystem-subprocess.c	2014-01-07 13:28:56.000000000 +0000
+++ gnome-desktop3-3.8.4/libgnome-desktop/libgsystem/gsystem-subprocess.c	1970-01-01 00:00:00.000000000 +0000
@@ -1,966 +0,0 @@
-/* -*- mode: C; c-file-style: "gnu"; indent-tabs-mode: nil; -*- */
-
-/* GIO - GLib Input, Output and Streaming Library
- *
- * Copyright © 2012 Red Hat, Inc.
- * Copyright © 2012 Canonical Limited
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published
- * by the Free Software Foundation; either version 2 of the licence or (at
- * your option) any later version.
- *
- * See the included COPYING file for more information.
- *
- * Authors: Colin Walters 
- *          Ryan Lortie 
- */
-
-#include "config.h"
-
-#define _GSYSTEM_NO_LOCAL_ALLOC
-#include "libgsystem.h"
-
-#if GLIB_CHECK_VERSION(2,34,0)
-
-/**
- * SECTION:gssubprocess
- * @title: GSSubprocess
- * @short_description: Create child processes and monitor their status
- *
- * This class wraps the lower-level g_spawn_async_with_pipes() API,
- * providing a more modern GIO-style API, such as returning
- * #GInputStream objects for child output pipes.
- *
- * One major advantage that GIO brings over the core GLib library is
- * comprehensive API for asynchronous I/O, such
- * g_output_stream_splice_async().  This makes GSubprocess
- * significantly more powerful and flexible than equivalent APIs in
- * some other languages such as the subprocess.py
- * included with Python.  For example, using #GSubprocess one could
- * create two child processes, reading standard output from the first,
- * processing it, and writing to the input stream of the second, all
- * without blocking the main loop.
- *
- * Since: 2.36
- */
-
-#include "config.h"
-
-#include "gsystem-subprocess.h"
-#include "gsystem-subprocess-context-private.h"
-
-#include 
-#ifdef G_OS_UNIX
-#include 
-#include 
-#include 
-#include 
-#endif
-#include 
-#ifdef G_OS_WIN32
-#define _WIN32_WINNT 0x0500
-#include 
-#include "giowin32-priv.h"
-#endif
-
-#ifndef O_BINARY
-#define O_BINARY 0
-#endif
-
-static void initable_iface_init (GInitableIface         *initable_iface);
-
-typedef GObjectClass GSSubprocessClass;
-
-#ifdef G_OS_UNIX
-static void
-gs_subprocess_unix_queue_waitpid (GSSubprocess  *self);
-#endif
-
-struct _GSSubprocess
-{
-  GObject parent;
-
-  GSSubprocessContext *context;
-  GPid pid;
-
-  guint pid_valid : 1;
-  guint reaped_child : 1;
-  guint unused : 30;
-
-  /* These are the streams created if a pipe is requested via flags. */
-  GOutputStream *stdin_pipe;
-  GInputStream  *stdout_pipe;
-  GInputStream  *stderr_pipe;
-};
-
-G_DEFINE_TYPE_WITH_CODE (GSSubprocess, gs_subprocess, G_TYPE_OBJECT,
-                         G_IMPLEMENT_INTERFACE (G_TYPE_INITABLE, initable_iface_init));
-
-enum
-{
-  PROP_0,
-  PROP_CONTEXT,
-  N_PROPS
-};
-
-static GParamSpec *gs_subprocess_pspecs[N_PROPS];
-
-static void
-gs_subprocess_init (GSSubprocess  *self)
-{
-}
-
-static void
-gs_subprocess_finalize (GObject *object)
-{
-  GSSubprocess *self = GS_SUBPROCESS (object);
-
-  if (self->pid_valid)
-    {
-#ifdef G_OS_UNIX
-      /* Here we need to actually call waitpid() to clean up the
-       * zombie.  In case the child hasn't actually exited, defer this
-       * cleanup to the worker thread.
-       */
-      if (!self->reaped_child)
-        gs_subprocess_unix_queue_waitpid (self);
-#endif
-      g_spawn_close_pid (self->pid);
-    }
-
-  g_clear_object (&self->stdin_pipe);
-  g_clear_object (&self->stdout_pipe);
-  g_clear_object (&self->stderr_pipe);
-
-  if (G_OBJECT_CLASS (gs_subprocess_parent_class)->finalize != NULL)
-    G_OBJECT_CLASS (gs_subprocess_parent_class)->finalize (object);
-}
-
-static void
-gs_subprocess_set_property (GObject      *object,
-                           guint         prop_id,
-                           const GValue *value,
-                           GParamSpec   *pspec)
-{
-  GSSubprocess *self = GS_SUBPROCESS (object);
-
-  switch (prop_id)
-    {
-    case PROP_CONTEXT:
-      self->context = g_value_dup_object (value);
-      break;
-
-    default:
-      g_assert_not_reached ();
-    }
-}
-
-static void
-gs_subprocess_get_property (GObject    *object,
-                           guint       prop_id,
-                           GValue     *value,
-                           GParamSpec *pspec)
-{
-  GSSubprocess *self = GS_SUBPROCESS (object);
-
-  switch (prop_id)
-    {
-    case PROP_CONTEXT:
-      g_value_set_object (value, self->context);
-      break;
-
-    default:
-      g_assert_not_reached ();
-    }
-}
-
-static void
-gs_subprocess_class_init (GSSubprocessClass *class)
-{
-  GObjectClass *gobject_class = G_OBJECT_CLASS (class);
-
-  gobject_class->finalize = gs_subprocess_finalize;
-  gobject_class->get_property = gs_subprocess_get_property;
-  gobject_class->set_property = gs_subprocess_set_property;
-
-  /**
-   * GSSubprocess:context:
-   *
-   *
-   * Since: 2.36
-   */
-  gs_subprocess_pspecs[PROP_CONTEXT] = g_param_spec_object ("context", "Context", "Subprocess options", GS_TYPE_SUBPROCESS_CONTEXT,
-							   G_PARAM_READWRITE | G_PARAM_CONSTRUCT_ONLY |
-							   G_PARAM_STATIC_STRINGS);
-
-  g_object_class_install_properties (gobject_class, N_PROPS, gs_subprocess_pspecs);
-}
-
-#ifdef G_OS_UNIX
-
-static gboolean
-gs_subprocess_unix_waitpid_dummy (gpointer data)
-{
-  return FALSE;
-}
-
-static void
-gs_subprocess_unix_queue_waitpid (GSSubprocess  *self)
-{
-  GMainContext *worker_context;
-  GSource *waitpid_source;
-
-#ifdef GLIB_COMPILATION
-  worker_context = GLIB_PRIVATE_CALL (g_get_worker_context) ();
-#else
-  worker_context = g_main_context_get_thread_default ();
-#endif
-  waitpid_source = g_child_watch_source_new (self->pid); 
-  g_source_set_callback (waitpid_source, gs_subprocess_unix_waitpid_dummy, NULL, NULL);
-  g_source_attach (waitpid_source, worker_context);
-  g_source_unref (waitpid_source);
-}
-
-#endif
-
-static GInputStream *
-platform_input_stream_from_spawn_fd (gint fd)
-{
-  if (fd < 0)
-    return NULL;
-
-#ifdef G_OS_UNIX
-  return g_unix_input_stream_new (fd, TRUE);
-#else
-  return g_win32_input_stream_new_from_fd (fd, TRUE);
-#endif
-}
-
-static GOutputStream *
-platform_output_stream_from_spawn_fd (gint fd)
-{
-  if (fd < 0)
-    return NULL;
-
-#ifdef G_OS_UNIX
-  return g_unix_output_stream_new (fd, TRUE);
-#else
-  return g_win32_output_stream_new_from_fd (fd, TRUE);
-#endif
-}
-
-#ifdef G_OS_UNIX
-static gint
-unix_open_file (const char  *filename,
-                gint         mode,
-                GError     **error)
-{
-  gint my_fd;
-
-  do
-    my_fd = open (filename, mode | O_BINARY | O_CLOEXEC, 0666);
-  while (my_fd == -1 && errno == EINTR);
-
-  /* If we return -1 we should also set the error */
-  if (my_fd < 0)
-    {
-      gint saved_errno = errno;
-      char *display_name;
-
-      display_name = g_filename_display_name (filename);
-      g_set_error (error, G_IO_ERROR, g_io_error_from_errno (saved_errno),
-                   "Error opening file '%s': %s", display_name,
-                   g_strerror (saved_errno));
-      g_free (display_name);
-      /* fall through... */
-    }
-
-  return my_fd;
-}
-#endif
-
-typedef struct
-{
-  gint                   fds[3];
-  GArray                *inherit_fds;
-  GSpawnChildSetupFunc   child_setup_func;
-  gpointer               child_setup_data;
-} ChildData;
-
-static void
-child_setup (gpointer user_data)
-{
-  ChildData *child_data = user_data;
-  guint i;
-  gint result;
-
-  /* We're on the child side now.  "Rename" the file descriptors in
-   * child_data.fds[] to stdin/stdout/stderr.
-   *
-   * We don't close the originals.  It's possible that the originals
-   * should not be closed and if they should be closed then they should
-   * have been created O_CLOEXEC.
-   */
-  for (i = 0; i < 3; i++)
-    {
-      if (child_data->fds[i] != -1 && child_data->fds[i] != (int) i)
-        {
-          do
-            result = dup2 (child_data->fds[i], i);
-          while (G_UNLIKELY (result == -1 && errno == EINTR));
-        }
-    }
-
-  /* Unset the CLOEXEC flag for the child *should* inherit */
-  for (i = 0; i < child_data->inherit_fds->len; i++)
-    {
-      int fd = g_array_index (child_data->inherit_fds, int, i);
-      int flags;
-
-      do
-        flags = fcntl (fd, F_GETFL);
-      while (G_UNLIKELY (flags == -1 && errno == EINTR));
-
-      flags &= ~FD_CLOEXEC;
-      
-      do
-        result = fcntl (fd, F_SETFD, flags);
-      while (G_UNLIKELY (result == -1 && errno == EINTR));
-    }
-
-  if (child_data->child_setup_func)
-    child_data->child_setup_func (child_data->child_setup_data);
-}
-
-static gboolean
-initable_init (GInitable     *initable,
-               GCancellable  *cancellable,
-               GError       **error)
-{
-  GSSubprocess *self = GS_SUBPROCESS (initable);
-  ChildData child_data = { { -1, -1, -1 } };
-  gint *pipe_ptrs[3] = { NULL, NULL, NULL };
-  gint pipe_fds[3] = { -1, -1, -1 };
-  gint close_fds[3] = { -1, -1, -1 };
-  GSpawnFlags spawn_flags = 0;
-  gboolean success = FALSE;
-  guint i;
-
-  if (g_cancellable_set_error_if_cancelled (cancellable, error))
-    return FALSE;
-
-  /* We must setup the three fds that will end up in the child as stdin,
-   * stdout and stderr.
-   *
-   * First, stdin.
-   */
-#ifdef G_OS_UNIX
-  if (self->context->stdin_fd != -1)
-    child_data.fds[0] = self->context->stdin_fd;
-  else if (self->context->stdin_path != NULL)
-    {
-      child_data.fds[0] = close_fds[0] = unix_open_file (self->context->stdin_path, 
-							 O_RDONLY, error);
-      if (child_data.fds[0] == -1)
-	goto out;
-    }
-  else
-#endif
-  if (self->context->stdin_disposition == GS_SUBPROCESS_STREAM_DISPOSITION_NULL)
-    ; /* nothing */
-  else if (self->context->stdin_disposition == GS_SUBPROCESS_STREAM_DISPOSITION_INHERIT)
-    spawn_flags |= G_SPAWN_CHILD_INHERITS_STDIN;
-  else if (self->context->stdin_disposition == GS_SUBPROCESS_STREAM_DISPOSITION_PIPE)
-    pipe_ptrs[0] = &pipe_fds[0];
-  else
-    g_assert_not_reached ();
-
-  /* Next, stdout. */
-#ifdef G_OS_UNIX
-  if (self->context->stdout_fd != -1)
-    child_data.fds[1] = self->context->stdout_fd;
-  else if (self->context->stdout_path != NULL)
-    {
-      child_data.fds[1] = close_fds[1] = unix_open_file (self->context->stdout_path, 
-							 O_CREAT | O_WRONLY, error);
-      if (child_data.fds[1] == -1)
-	goto out;
-    }
-  else
-#endif
-  if (self->context->stdout_disposition == GS_SUBPROCESS_STREAM_DISPOSITION_NULL)
-    spawn_flags |= G_SPAWN_STDOUT_TO_DEV_NULL;
-  else if (self->context->stdout_disposition == GS_SUBPROCESS_STREAM_DISPOSITION_INHERIT)
-    ; /* Nothing */
-  else if (self->context->stdout_disposition == GS_SUBPROCESS_STREAM_DISPOSITION_PIPE)
-    pipe_ptrs[1] = &pipe_fds[1];
-  else
-    g_assert_not_reached ();
-
-  /* Finally, stderr. */
-#ifdef G_OS_UNIX
-  if (self->context->stderr_fd != -1)
-    child_data.fds[2] = self->context->stderr_fd;
-  else if (self->context->stderr_path != NULL)
-    {
-      child_data.fds[2] = close_fds[2] = unix_open_file (self->context->stderr_path, 
-							 O_CREAT | O_WRONLY, error);
-      if (child_data.fds[2] == -1)
-	goto out;
-    }
-  else
-#endif
-  if (self->context->stderr_disposition == GS_SUBPROCESS_STREAM_DISPOSITION_NULL)
-    spawn_flags |= G_SPAWN_STDERR_TO_DEV_NULL;
-  else if (self->context->stderr_disposition == GS_SUBPROCESS_STREAM_DISPOSITION_INHERIT)
-    ; /* Nothing */
-  else if (self->context->stderr_disposition == GS_SUBPROCESS_STREAM_DISPOSITION_PIPE)
-    pipe_ptrs[2] = &pipe_fds[2];
-  else if (self->context->stderr_disposition == GS_SUBPROCESS_STREAM_DISPOSITION_STDERR_MERGE)
-    /* This will work because stderr gets setup after stdout. */
-    child_data.fds[2] = 1;
-  else
-    g_assert_not_reached ();
-
-  child_data.inherit_fds = self->context->inherit_fds;
-
-  if (self->context->keep_descriptors)
-    spawn_flags |= G_SPAWN_LEAVE_DESCRIPTORS_OPEN;
-
-  if (self->context->search_path)
-    spawn_flags |= G_SPAWN_SEARCH_PATH;
-  else if (self->context->search_path_from_envp)
-    spawn_flags |= G_SPAWN_SEARCH_PATH_FROM_ENVP;
-  else if (!g_path_is_absolute (((gchar**)self->context->argv)[0]))
-    spawn_flags |= G_SPAWN_SEARCH_PATH;
-
-  if (self->context->has_argv0)
-    spawn_flags |= G_SPAWN_FILE_AND_ARGV_ZERO;
-
-  spawn_flags |= G_SPAWN_DO_NOT_REAP_CHILD;
-#ifdef GLIB_COMPILATION
-  spawn_flags |= G_SPAWN_CLOEXEC_PIPES;
-#endif
-
-  child_data.child_setup_func = self->context->child_setup_func;
-  child_data.child_setup_data = self->context->child_setup_data;
-  success = g_spawn_async_with_pipes (self->context->cwd,
-				      (char**)self->context->argv,
-				      self->context->envp,
-                                      spawn_flags,
-                                      child_setup, &child_data,
-                                      &self->pid,
-                                      pipe_ptrs[0], pipe_ptrs[1], pipe_ptrs[2],
-                                      error);
-  if (success)
-    self->pid_valid = TRUE;
-
-out:
-  for (i = 0; i < 3; i++)
-    if (close_fds[i] != -1)
-      close (close_fds[i]);
-
-  for (i = 0; i < self->context->postfork_close_fds->len; i++)
-    (void) close (g_array_index (self->context->postfork_close_fds, int, i));
-
-  self->stdin_pipe = platform_output_stream_from_spawn_fd (pipe_fds[0]);
-  self->stdout_pipe = platform_input_stream_from_spawn_fd (pipe_fds[1]);
-  self->stderr_pipe = platform_input_stream_from_spawn_fd (pipe_fds[2]);
-
-  return success;
-}
-
-static void
-initable_iface_init (GInitableIface *initable_iface)
-{
-  initable_iface->init = initable_init;
-}
-
-/**
- * gs_subprocess_new:
- *
- * Create a new process, using the parameters specified by
- * GSSubprocessContext.
- *
- * Returns: (transfer full): A newly created %GSSubprocess, or %NULL on error (and @error will be set)
- *
- * Since: 2.36
- */
-GSSubprocess *
-gs_subprocess_new (GSSubprocessContext   *context,
-                   GCancellable          *cancellable,
-                   GError               **error)
-{
-  return g_initable_new (GS_TYPE_SUBPROCESS,
-                         cancellable, error,
-                         "context", context,
-                         NULL);
-}
-
-/**
- * gs_subprocess_get_pid:
- * @self: a #GSSubprocess
- *
- * The identifier for this child process; it is valid as long as the
- * process @self is referenced.  In particular, do
- * not call g_spawn_close_pid() on this value;
- * that is handled internally.
- *
- * On some Unix versions, it is possible for there to be a race
- * condition where waitpid() may have been called to collect the child
- * before any watches (such as that installed by
- * gs_subprocess_add_watch()) have fired.  If you are planning to use
- * native functions such as kill() on the pid, your program should
- * gracefully handle an %ESRCH result to mitigate this.
- *
- * If you want to request process termination, using the high level
- * gs_subprocess_request_exit() and gs_subprocess_force_exit() API is
- * recommended.
- *
- * Returns: Operating-system specific identifier for child process
- *
- * Since: 2.36
- */
-GPid
-gs_subprocess_get_pid (GSSubprocess     *self)
-{
-  g_return_val_if_fail (GS_IS_SUBPROCESS (self), 0);
-
-  return self->pid;
-}
-
-/**
- * gs_subprocess_get_stdin_pipe:
- *
- * Returns: (transfer none): Pipe
- */
-GOutputStream *
-gs_subprocess_get_stdin_pipe (GSSubprocess       *self)
-{
-  g_return_val_if_fail (GS_IS_SUBPROCESS (self), NULL);
-  g_return_val_if_fail (self->stdin_pipe, NULL);
-
-  return self->stdin_pipe;
-}
-
-/**
- * gs_subprocess_get_stdout_pipe:
- *
- * Returns: (transfer none): Pipe
- */
-GInputStream *
-gs_subprocess_get_stdout_pipe (GSSubprocess      *self)
-{
-  g_return_val_if_fail (GS_IS_SUBPROCESS (self), NULL);
-  g_return_val_if_fail (self->stdout_pipe, NULL);
-
-  return self->stdout_pipe;
-}
-
-/**
- * gs_subprocess_get_stderr_pipe:
- *
- * Returns: (transfer none): Pipe
- */
-GInputStream *
-gs_subprocess_get_stderr_pipe (GSSubprocess      *self)
-{
-  g_return_val_if_fail (GS_IS_SUBPROCESS (self), NULL);
-  g_return_val_if_fail (self->stderr_pipe, NULL);
-
-  return self->stderr_pipe;
-}
-
-typedef struct {
-  GSSubprocess *self;
-  GCancellable *cancellable;
-  GSimpleAsyncResult *result;
-} GSSubprocessWatchData;
-
-static gboolean
-gs_subprocess_on_child_exited (GPid       pid,
-			      gint       status_code,
-			      gpointer   user_data)
-{
-  GSSubprocessWatchData *data = user_data;
-  GError *error = NULL;
-  
-  if (g_cancellable_set_error_if_cancelled (data->cancellable, &error))
-    {
-      g_simple_async_result_take_error (data->result, error);
-    }
-  else
-    {
-      data->self->reaped_child = TRUE;
-
-      g_simple_async_result_set_op_res_gssize (data->result, status_code);
-    }
-
-  g_simple_async_result_complete (data->result);
-
-  g_object_unref (data->result);
-  g_object_unref (data->self);
-  g_free (data);
-
-  return FALSE;
-}
-
-/**
- * gs_subprocess_wait:
- * @self: a #GSSubprocess
- * @cancellable: a #GCancellable
- * @callback: Invoked when process exits, or @cancellable is cancelled
- * @user_data: Data for @callback
- *
- * Start an asynchronous wait for the subprocess @self to exit.
- *
- * Since: 2.36
- */
-void
-gs_subprocess_wait (GSSubprocess                *self,
-		   GCancellable               *cancellable,
-		   GAsyncReadyCallback         callback,
-		   gpointer                    user_data)
-{
-  GSource *source;
-  GSSubprocessWatchData *data;
-
-  data = g_new0 (GSSubprocessWatchData, 1);
-
-  data->self = g_object_ref (self);
-  data->result = g_simple_async_result_new ((GObject*)self, callback, user_data,
-					    gs_subprocess_wait);
-
-  source = g_child_watch_source_new (self->pid);
-
-  g_source_set_callback (source, (GSourceFunc)gs_subprocess_on_child_exited,
-			 data, NULL);
-  if (cancellable)
-    {
-      GSource *cancellable_source;
-
-      data->cancellable = g_object_ref (cancellable);
-
-      cancellable_source = g_cancellable_source_new (cancellable);
-      g_source_add_child_source (source, cancellable_source);
-      g_source_unref (cancellable_source);
-    }
-
-  g_source_attach (source, g_main_context_get_thread_default ());
-  g_source_unref (source);
-}
-
-/**
- * gs_subprocess_wait_finish:
- * @self: a #GSSubprocess
- * @result: a #GAsyncResult
- * @out_exit_status: (out): Exit status of the process encoded in platform-specific way
- * @error: a #GError
- *
- * The exit status of the process will be stored in @out_exit_status.
- * See the documentation of g_spawn_check_exit_status() for more
- * details.
- *
- * Note that @error is not set if the process exits abnormally; you
- * must use g_spawn_check_exit_status() for that.
- *
- * Since: 2.36
- */
-gboolean
-gs_subprocess_wait_finish (GSSubprocess                *self,
-			  GAsyncResult               *result,
-			  int                        *out_exit_status,
-			  GError                    **error)
-{
-  GSimpleAsyncResult *simple;
-
-  simple = G_SIMPLE_ASYNC_RESULT (result);
-
-  if (g_simple_async_result_propagate_error (simple, error))
-    return FALSE;
-
-  *out_exit_status = g_simple_async_result_get_op_res_gssize (simple);
-  
-  return TRUE;
-}
-
-typedef struct {
-  GMainLoop *loop;
-  gint *exit_status_ptr;
-  gboolean caught_error;
-  GError **error;
-} GSSubprocessSyncWaitData;
-
-static void
-gs_subprocess_on_sync_wait_complete (GObject       *object,
-				    GAsyncResult  *result,
-				    gpointer       user_data)
-{
-  GSSubprocessSyncWaitData *data = user_data;
-
-  if (!gs_subprocess_wait_finish ((GSSubprocess*)object, result, 
-				 data->exit_status_ptr, data->error))
-    data->caught_error = TRUE;
-
-  g_main_loop_quit (data->loop);
-}
-
-/**
- * gs_subprocess_wait_sync:
- * @self: a #GSSubprocess
- * @out_exit_status: (out): Platform-specific exit code
- * @cancellable: a #GCancellable
- * @error: a #GError
- *
- * Synchronously wait for the subprocess to terminate, returning the
- * status code in @out_exit_status.  See the documentation of
- * g_spawn_check_exit_status() for how to interpret it.  Note that if
- * @error is set, then @out_exit_status will be left uninitialized.
- * 
- * Returns: %TRUE on success, %FALSE if @cancellable was cancelled
- *
- * Since: 2.36
- */
-gboolean
-gs_subprocess_wait_sync (GSSubprocess        *self,
-			int                *out_exit_status,
-			GCancellable       *cancellable,
-			GError            **error)
-{
-  gboolean ret = FALSE;
-  gboolean pushed_thread_default = FALSE;
-  GMainContext *context = NULL;
-  GSSubprocessSyncWaitData data;
-
-  memset (&data, 0, sizeof (data));
-
-  g_return_val_if_fail (GS_IS_SUBPROCESS (self), FALSE);
-
-  if (g_cancellable_set_error_if_cancelled (cancellable, error))
-    return FALSE;
-
-  context = g_main_context_new ();
-  g_main_context_push_thread_default (context);
-  pushed_thread_default = TRUE;
-
-  data.exit_status_ptr = out_exit_status;
-  data.loop = g_main_loop_new (context, TRUE);
-  data.error = error;
-
-  gs_subprocess_wait (self, cancellable,
-		     gs_subprocess_on_sync_wait_complete, &data);
-
-  g_main_loop_run (data.loop);
-
-  if (data.caught_error)
-    goto out;
-
-  ret = TRUE;
- out:
-  if (pushed_thread_default)
-    g_main_context_pop_thread_default (context);
-  if (context)
-    g_main_context_unref (context);
-  if (data.loop)
-    g_main_loop_unref (data.loop);
-
-  return ret;
-}
-
-/**
- * gs_subprocess_wait_sync_check:
- * @self: a #GSSubprocess
- * @cancellable: a #GCancellable
- * @error: a #GError
- *
- * Combines gs_subprocess_wait_sync() with g_spawn_check_exit_status().
- * 
- * Returns: %TRUE on success, %FALSE if process exited abnormally, or @cancellable was cancelled
- *
- * Since: 2.36
- */
-gboolean
-gs_subprocess_wait_sync_check (GSSubprocess        *self,
-			      GCancellable       *cancellable,
-			      GError            **error)
-{
-  gboolean ret = FALSE;
-  int exit_status;
-
-  if (!gs_subprocess_wait_sync (self, &exit_status, cancellable, error))
-    goto out;
-
-  if (!g_spawn_check_exit_status (exit_status, error))
-    goto out;
-
-  ret = TRUE;
- out:
-  return ret;
-}
-
-/**
- * gs_subprocess_request_exit:
- * @self: a #GSSubprocess
- *
- * This API uses an operating-system specific mechanism to request
- * that the subprocess gracefully exit.  This API is not available on
- * all operating systems; for those not supported, it will do nothing
- * and return %FALSE.  Portable code should handle this situation
- * gracefully.  For example, if you are communicating via input or
- * output pipe with the child, many programs will automatically exit
- * when one of their standard input or output are closed.
- *
- * On Unix, this API sends %SIGTERM.
- *
- * A %TRUE return value does not mean the
- * subprocess has exited, merely that an exit request was initiated.
- * You can use gs_subprocess_add_watch() to monitor the status of the
- * process after calling this function.
- *
- * This function returns %TRUE if the process has already exited.
- *
- * Returns: %TRUE if the operation is supported, %FALSE otherwise.
- *
- * Since: 2.36
- */
-gboolean
-gs_subprocess_request_exit (GSSubprocess *self)
-{
-  g_return_val_if_fail (GS_IS_SUBPROCESS (self), FALSE);
-
-#ifdef G_OS_UNIX
-  (void) kill (self->pid, SIGTERM);
-  return TRUE;
-#else
-  return FALSE;
-#endif
-}
-
-/**
- * gs_subprocess_force_exit:
- * @self: a #GSSubprocess
- *
- * Use an operating-system specific method to attempt an immediate,
- * forceful termination of the process.  There is no mechanism to
- * determine whether or not the request itself was successful;
- * however, you can use gs_subprocess_wait() to monitor the status of
- * the process after calling this function.
- *
- * On Unix, this function sends %SIGKILL.
- */
-void
-gs_subprocess_force_exit (GSSubprocess *self)
-{
-  g_return_if_fail (GS_IS_SUBPROCESS (self));
-
-#if !defined(GLIB_COMPIATION)
-  {
-    int ret;
-    do
-      ret = kill (self->pid, SIGKILL);
-    while (ret == -1 && errno == EINTR);
-  }
-#elif defined(G_OS_UNIX)
-  GLIB_PRIVATE_CALL (g_main_send_signal) (self->pid, SIGKILL);
-#else
-  TerminateProcess (self->pid, 1);
-#endif
-}
-
-GSSubprocess *
-gs_subprocess_new_simple_argl (GSSubprocessStreamDisposition stdout_disposition,
-			      GSSubprocessStreamDisposition  stderr_disposition,
-                               GCancellable                 *cancellable,
-			      GError                       **error,
-			      const gchar                   *first_arg,
-			      ...)
-{
-  va_list args;
-  GSSubprocess *result;
-  GSSubprocessContext *context;
-
-  va_start (args, first_arg);
-  context = gs_subprocess_context_newa (first_arg, args);
-  va_end (args);
-  result = gs_subprocess_new (context, cancellable, error);
-  g_object_unref (context);
-  
-  return result;
-}
-
-/**
- * gs_subprocess_new_simple_argv:
- * @argv: (array zero-terminated=1) (element-type utf8): Argument array
- * @stdout_disposition: Where to redirect stdout
- * @stderr_disposition: Where to redirect stdout
- * @error: a #GError
- *
- * Create a new subprocess using the provided argument array and
- * stream dispositions.
- */
-GSSubprocess *
-gs_subprocess_new_simple_argv (gchar                       **argv,
-			      GSSubprocessStreamDisposition  stdout_disposition,
-			      GSSubprocessStreamDisposition  stderr_disposition,
-                               GCancellable                 *cancellable,
-			      GError                      **error)
-{
-  GSSubprocessContext *context;
-  GSSubprocess *result;
-
-  context = gs_subprocess_context_new (argv);
-  gs_subprocess_context_set_stdout_disposition (context, stdout_disposition);
-  gs_subprocess_context_set_stderr_disposition (context, stderr_disposition);
-
-  result = gs_subprocess_new (context, cancellable, error);
-  g_object_unref (context);
-
-  return result;
-}
-
-/**
- * gs_subprocess_simple_run_sync:
- * @cwd: Current working directory
- * @stdin_disposition: What to do with standard input
- * @cancellable: a #GCancellable
- * @error: a #GError
- * @first_arg: First argument
- * @...: Remaining arguments, %NULL terminated
- *
- * Run a process synchronously, throw an error if it fails.
- */
-gboolean
-gs_subprocess_simple_run_sync (const char                    *cwd,
-                               GSSubprocessStreamDisposition  stdin_disposition,
-                               GCancellable                  *cancellable,
-                               GError                       **error,
-                               const char                    *first_arg,
-                               ...)
-{
-  gboolean ret = FALSE;
-  va_list args;
-  GSSubprocess *proc = NULL;
-  GSSubprocessContext *context = NULL;
-
-  va_start (args, first_arg);
-  context = gs_subprocess_context_newa (first_arg, args);
-  va_end (args);
-  gs_subprocess_context_set_stdin_disposition (context, stdin_disposition);
-  gs_subprocess_context_set_cwd (context, cwd);
-  proc = gs_subprocess_new (context, cancellable, error);
-  if (!proc)
-    goto out;
-
-  if (!gs_subprocess_wait_sync_check (proc, cancellable, error))
-    goto out;
-
-  ret = TRUE;
- out:
-  g_object_unref (context);
-  if (proc)
-    g_object_unref (proc);
-  return ret;
-}
-
-#endif
diff -Nru gnome-desktop3-3.12.0/libgnome-desktop/libgsystem/gsystem-subprocess-context.c gnome-desktop3-3.8.4/libgnome-desktop/libgsystem/gsystem-subprocess-context.c
--- gnome-desktop3-3.12.0/libgnome-desktop/libgsystem/gsystem-subprocess-context.c	2013-11-11 17:23:51.000000000 +0000
+++ gnome-desktop3-3.8.4/libgnome-desktop/libgsystem/gsystem-subprocess-context.c	1970-01-01 00:00:00.000000000 +0000
@@ -1,501 +0,0 @@
-/* -*- mode: C; c-file-style: "gnu"; indent-tabs-mode: nil; -*-
- *
- * Copyright (C) 2012 Colin Walters 
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library 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
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- */
-
-#include "config.h"
-
-#include "libgsystem.h"
-
-#if GLIB_CHECK_VERSION(2,34,0)
-
-#ifdef G_OS_UNIX
-#include 
-#include 
-#include 
-#include 
-#endif
-
-/**
- * SECTION:gssubprocesscontext
- * @title: GSSubprocess Context
- * @short_description: Environment options for launching a child process
- *
- * This class contains a set of options for launching child processes,
- * such as where its standard input and output will be directed, the
- * argument list, the environment, and more.
- *
- * While the #GSSubprocess class has high level functions covering
- * popular cases, use of this class allows access to more advanced
- * options.  It can also be used to launch multiple subprocesses with
- * a similar configuration.
- *
- * Since: 2.36
- */
-
-#include "config.h"
-
-#include "gsystem-subprocess-context-private.h"
-#include "gsystem-subprocess.h"
-
-#include 
-
-typedef GObjectClass GSSubprocessContextClass;
-
-G_DEFINE_TYPE (GSSubprocessContext, gs_subprocess_context, G_TYPE_OBJECT);
-
-enum
-{
-  PROP_0,
-  PROP_ARGV,
-  N_PROPS
-};
-
-static GParamSpec *gs_subprocess_context_pspecs[N_PROPS];
-
-/**
- * gs_subprocess_context_new:
- * @argv: Argument list
- *
- * Returns: (transfer full): A new instance of a #GSSubprocessContext.
- */
-GSSubprocessContext *
-gs_subprocess_context_new (gchar           **argv)
-{
-  g_return_val_if_fail (argv != NULL && argv[0] != NULL, NULL);
-
-  return g_object_new (GS_TYPE_SUBPROCESS_CONTEXT,
-		       "argv", argv,
-		       NULL);
-}
-
-GSSubprocessContext *
-gs_subprocess_context_newv (const gchar  *first_arg,
-                           ...)
-{
-  GSSubprocessContext *result;
-  va_list args;
-
-  g_return_val_if_fail (first_arg != NULL, NULL);
-
-  va_start (args, first_arg);
-  result = gs_subprocess_context_newa (first_arg, args);
-  va_end (args);
-  
-  return result;
-}
-
-/**
- * gs_subprocess_context_newa:
- * @first_arg: First argument
- * @args: a va_list
- *
- * Returns: (transfer full): A new instance of a #GSSubprocessContext.
- */
-GSSubprocessContext *
-gs_subprocess_context_newa (const gchar *first_arg,
-                           va_list      args)
-{
-  GSSubprocessContext *result;
-  GPtrArray *argv;
-
-  g_return_val_if_fail (first_arg != NULL, NULL);
-
-  argv = g_ptr_array_new ();
-  do
-    g_ptr_array_add (argv, (gchar*)first_arg);
-  while ((first_arg = va_arg (args, const gchar *)) != NULL);
-  g_ptr_array_add (argv, NULL);
-
-  result = gs_subprocess_context_new ((gchar**)argv->pdata);
-  
-  return result;
-}
-
-#ifdef G_OS_UNIX
-GSSubprocessContext *
-gs_subprocess_context_new_argv0 (const gchar      *argv0,
-                                gchar           **argv)
-{
-  GSSubprocessContext *result;
-  GPtrArray *real_argv;
-  gchar **iter;
-  
-  g_return_val_if_fail (argv0 != NULL, NULL);
-  g_return_val_if_fail (argv != NULL && argv[0] != NULL, NULL);
-  
-  real_argv = g_ptr_array_new ();
-  g_ptr_array_add (real_argv, (gchar*)argv0);
-  for (iter = argv; *iter; iter++)
-    g_ptr_array_add (real_argv, (gchar*) *iter);
-  g_ptr_array_add (real_argv, NULL);
-
-  result = g_object_new (GS_TYPE_SUBPROCESS_CONTEXT,
-                         "argv", real_argv->pdata,
-                         NULL);
-  result->has_argv0 = TRUE;
-
-  return result;
-}
-#endif
-
-static void
-gs_subprocess_context_init (GSSubprocessContext  *self)
-{
-  self->stdin_fd = -1;
-  self->stdout_fd = -1;
-  self->stderr_fd = -1;
-  self->stdout_disposition = GS_SUBPROCESS_STREAM_DISPOSITION_INHERIT;
-  self->stderr_disposition = GS_SUBPROCESS_STREAM_DISPOSITION_INHERIT;
-  self->postfork_close_fds = g_array_new (FALSE, FALSE, sizeof (int));
-  self->inherit_fds = g_array_new (FALSE, FALSE, sizeof (int));
-}
-
-static void
-gs_subprocess_context_finalize (GObject *object)
-{
-  GSSubprocessContext *self = GS_SUBPROCESS_CONTEXT (object);
-
-  g_strfreev (self->argv);
-  g_strfreev (self->envp);
-  g_free (self->cwd);
-
-  g_free (self->stdin_path);
-  g_free (self->stdout_path);
-  g_free (self->stderr_path);
-
-  g_array_unref (self->postfork_close_fds);
-  g_array_unref (self->inherit_fds);
-
-  if (G_OBJECT_CLASS (gs_subprocess_context_parent_class)->finalize != NULL)
-    G_OBJECT_CLASS (gs_subprocess_context_parent_class)->finalize (object);
-}
-
-static void
-gs_subprocess_context_set_property (GObject      *object,
-				   guint         prop_id,
-				   const GValue *value,
-				   GParamSpec   *pspec)
-{
-  GSSubprocessContext *self = GS_SUBPROCESS_CONTEXT (object);
-
-  switch (prop_id)
-    {
-    case PROP_ARGV:
-      self->argv = (gchar**) g_value_dup_boxed (value);
-      break;
-
-    default:
-      g_assert_not_reached ();
-    }
-}
-
-static void
-gs_subprocess_context_get_property (GObject    *object,
-				   guint       prop_id,
-				   GValue     *value,
-				   GParamSpec *pspec)
-{
-  GSSubprocessContext *self = GS_SUBPROCESS_CONTEXT (object);
-
-  switch (prop_id)
-    {
-    case PROP_ARGV:
-      g_value_set_boxed (value, self->argv);
-      break;
-
-    default:
-      g_assert_not_reached ();
-    }
-}
-
-static void
-gs_subprocess_context_class_init (GSSubprocessContextClass *class)
-{
-  GObjectClass *gobject_class = G_OBJECT_CLASS (class);
-
-  gobject_class->finalize = gs_subprocess_context_finalize;
-  gobject_class->get_property = gs_subprocess_context_get_property;
-  gobject_class->set_property = gs_subprocess_context_set_property;
-
-  /**
-   * GSSubprocessContext:argv:
-   *
-   * Array of arguments passed to child process; must have at least
-   * one element.  The first element has special handling - if it is
-   * an not absolute path ( as determined by g_path_is_absolute() ),
-   * then the system search path will be used.  See
-   * %G_SPAWN_SEARCH_PATH.
-   * 
-   * Note that in order to use the Unix-specific argv0 functionality,
-   * you must use the setter function
-   * gs_subprocess_context_set_args_and_argv0().  For more information
-   * about this, see %G_SPAWN_FILE_AND_ARGV_ZERO.
-   *
-   * Since: 2.36
-   */
-  gs_subprocess_context_pspecs[PROP_ARGV] = g_param_spec_boxed ("argv", "Arguments", "Arguments for child process", G_TYPE_STRV,
-							       G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS);
-
-  g_object_class_install_properties (gobject_class, N_PROPS, gs_subprocess_context_pspecs);
-}
-
-/**
- * gs_subprocess_context_argv_append:
- * @self:
- * @arg: An argument
- *
- * Append an argument to the child's argument vector.
- */
-void
-gs_subprocess_context_argv_append (GSSubprocessContext  *self,
-                                   const gchar          *arg)
-{
-  GPtrArray *new_argv = g_ptr_array_new ();
-  gchar **iter;
-
-  for (iter = self->argv; *iter; iter++)
-    g_ptr_array_add (new_argv, *iter);
-  g_ptr_array_add (new_argv, g_strdup (arg));
-  g_ptr_array_add (new_argv, NULL);
-
-  /* Don't free elements */
-  g_free (self->argv);
-  self->argv = (char**)g_ptr_array_free (new_argv, FALSE);
-}
-
-/* Environment */
-
-/**
- * gs_subprocess_context_set_environment:
- * @self:
- * @environ: (array zero-terminated=1) (element-type utf8): Environment KEY=VALUE pairs
- *
- * Replace the environment that will be used for the child process.
- * The default is to inherit the current process.
- */
-void
-gs_subprocess_context_set_environment (GSSubprocessContext           *self,
-                                       gchar                        **env)
-{
-  g_strfreev (self->envp);
-  self->envp = g_strdupv (env);
-}
-
-void
-gs_subprocess_context_set_cwd (GSSubprocessContext           *self,
-			      const gchar                  *cwd)
-{
-  g_free (self->cwd);
-  self->cwd = g_strdup (cwd);
-}
-
-void
-gs_subprocess_context_set_keep_descriptors (GSSubprocessContext           *self,
-					   gboolean                      keep_descriptors)
-
-{
-  self->keep_descriptors = keep_descriptors ? 1 : 0;
-}
-
-void
-gs_subprocess_context_set_search_path (GSSubprocessContext           *self,
-				      gboolean                      search_path,
-				      gboolean                      search_path_from_envp)
-{
-  self->search_path = search_path ? 1 : 0;
-  self->search_path_from_envp = search_path_from_envp ? 1 : 0;
-}
-
-void
-gs_subprocess_context_set_stdin_disposition (GSSubprocessContext           *self,
-					    GSSubprocessStreamDisposition  disposition)
-{
-  g_return_if_fail (disposition != GS_SUBPROCESS_STREAM_DISPOSITION_STDERR_MERGE);
-  self->stdin_disposition = disposition;
-}
-
-void
-gs_subprocess_context_set_stdout_disposition (GSSubprocessContext           *self,
-					     GSSubprocessStreamDisposition  disposition)
-{
-  g_return_if_fail (disposition != GS_SUBPROCESS_STREAM_DISPOSITION_STDERR_MERGE);
-  self->stdout_disposition = disposition;
-}
-
-void
-gs_subprocess_context_set_stderr_disposition (GSSubprocessContext           *self,
-					     GSSubprocessStreamDisposition  disposition)
-{
-  self->stderr_disposition = disposition;
-}
-
-#ifdef G_OS_UNIX
-void
-gs_subprocess_context_set_stdin_file_path (GSSubprocessContext           *self,
-					  const gchar                  *path)
-{
-  self->stdin_disposition = GS_SUBPROCESS_STREAM_DISPOSITION_NULL;
-  g_free (self->stdin_path);
-  self->stdin_path = g_strdup (path);
-}
-
-void
-gs_subprocess_context_set_stdin_fd        (GSSubprocessContext           *self,
-					  gint                          fd)
-{
-  self->stdin_disposition = GS_SUBPROCESS_STREAM_DISPOSITION_NULL;
-  self->stdin_fd = fd;
-}
-
-void
-gs_subprocess_context_set_stdout_file_path (GSSubprocessContext           *self,
-					   const gchar                  *path)
-{
-  self->stdout_disposition = GS_SUBPROCESS_STREAM_DISPOSITION_NULL;
-  g_free (self->stdout_path);
-  self->stdout_path = g_strdup (path);
-}
-
-void
-gs_subprocess_context_set_stdout_fd (GSSubprocessContext           *self,
-				    gint                          fd)
-{
-  self->stdout_disposition = GS_SUBPROCESS_STREAM_DISPOSITION_NULL;
-  self->stdout_fd = fd;
-}
-
-void
-gs_subprocess_context_set_stderr_file_path (GSSubprocessContext           *self,
-					   const gchar                  *path)
-{
-  self->stderr_disposition = GS_SUBPROCESS_STREAM_DISPOSITION_NULL;
-  g_free (self->stderr_path);
-  self->stderr_path = g_strdup (path);
-}
-
-void
-gs_subprocess_context_set_stderr_fd        (GSSubprocessContext           *self,
-					   gint                          fd)
-{
-  self->stderr_disposition = GS_SUBPROCESS_STREAM_DISPOSITION_NULL;
-  self->stderr_fd = fd;
-}
-#endif
-
-#ifdef G_OS_UNIX
-/**
- * gs_subprocess_context_set_child_setup: (skip)
- * @self:
- * @child_setup: Function to call in the newly forked child, before execve()
- * @user_data: Data passed to child
- *
- * FIXME - note extensive restricitons on GSpawnChildSetupFunc here
- */
-void
-gs_subprocess_context_set_child_setup (GSSubprocessContext           *self,
-				      GSpawnChildSetupFunc          child_setup,
-				      gpointer                      user_data)
-{
-  self->child_setup_func = child_setup;
-  self->child_setup_data = user_data;
-}
-
-static gboolean
-open_pipe_internal (GSSubprocessContext         *self,
-                    gboolean                     for_read,
-                    void                       **out_stream,
-                    gint                        *out_fdno,
-                    GError                     **error)
-{
-  int pipefds[2];
-
-  g_return_val_if_fail (out_stream != NULL, FALSE);
-  g_return_val_if_fail (out_fdno != NULL, FALSE);
-
-  if (!g_unix_open_pipe (pipefds, FD_CLOEXEC, error))
-    return FALSE;
-
-  if (for_read)
-    {
-      *out_stream = g_unix_input_stream_new (pipefds[0], TRUE);
-      *out_fdno = pipefds[1];
-    }
-  else
-    {
-      *out_stream = g_unix_output_stream_new (pipefds[1], TRUE);
-      *out_fdno = pipefds[0];
-    }
-  g_array_append_val (self->inherit_fds, *out_fdno);
-  g_array_append_val (self->postfork_close_fds, *out_fdno);
-
-  return TRUE;
-}
-
-/**
- * gs_subprocess_context_open_pipe_read:
- * @self:
- * @out_stream: (out) (transfer full): A newly referenced output stream
- * @out_fdno: (out): File descriptor number for the subprocess side of the pipe
- *
- * This allows you to open a pipe between the parent and child
- * processes, independent of the standard streams.  For this function,
- * the pipe is set up so that the parent can read, and the child can
- * write.  For the opposite version, see
- * gs_subprocess_context_open_pipe_write().
- *
- * The returned @out_fdno is the file descriptor number that the child
- * will see; you need to communicate this number via a separate
- * channel, such as the argument list.  For example, if you're using
- * this pipe to send a password, provide
- * --password-fd=<fdno string>.
- *
- * Returns: %TRUE on success, %FALSE on error (and @error will be set)
- */
-gboolean
-gs_subprocess_context_open_pipe_read (GSSubprocessContext         *self,
-                                      GInputStream               **out_stream,
-                                      gint                        *out_fdno,
-                                      GError                     **error)
-{
-  return open_pipe_internal (self, TRUE, (void**)out_stream, out_fdno, error);
-}
-
-/**
- * gs_subprocess_context_open_pipe_write:
- * @self:
- * @out_stream: (out) (transfer full): A newly referenced stream
- * @out_fdno: (out): File descriptor number for the subprocess side of the pipe
- *
- * Like gs_subprocess_context_open_pipe_read(), but returns a writable
- * channel from which the child process can read.
- *
- * Returns: %TRUE on success, %FALSE on error (and @error will be set)
- */
-gboolean
-gs_subprocess_context_open_pipe_write (GSSubprocessContext         *self,
-                                       GOutputStream              **out_stream,
-                                       gint                        *out_fdno,
-                                       GError                     **error)
-{
-  return open_pipe_internal (self, FALSE, (void**)out_stream, out_fdno, error);
-}
-
-#endif
-
-#endif
diff -Nru gnome-desktop3-3.12.0/libgnome-desktop/libgsystem/gsystem-subprocess-context.h gnome-desktop3-3.8.4/libgnome-desktop/libgsystem/gsystem-subprocess-context.h
--- gnome-desktop3-3.12.0/libgnome-desktop/libgsystem/gsystem-subprocess-context.h	2013-11-11 17:23:51.000000000 +0000
+++ gnome-desktop3-3.8.4/libgnome-desktop/libgsystem/gsystem-subprocess-context.h	1970-01-01 00:00:00.000000000 +0000
@@ -1,128 +0,0 @@
-/* -*- mode: C; c-file-style: "gnu"; indent-tabs-mode: nil; -*-
- *
- * Copyright (C) 2012 Colin Walters .
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library 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
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- */
-
-#ifndef __GSYSTEM_SUBPROCESS_CONTEXT_H__
-#define __GSYSTEM_SUBPROCESS_CONTEXT_H__
-
-#include 
-
-#if GLIB_CHECK_VERSION(2,34,0)
-
-G_BEGIN_DECLS
-
-#define GS_TYPE_SUBPROCESS_CONTEXT         (gs_subprocess_context_get_type ())
-#define GS_SUBPROCESS_CONTEXT(o)           (G_TYPE_CHECK_INSTANCE_CAST ((o), GS_TYPE_SUBPROCESS_CONTEXT, GSSubprocessContext))
-#define GS_IS_SUBPROCESS_CONTEXT(o)        (G_TYPE_CHECK_INSTANCE_TYPE ((o), GS_TYPE_SUBPROCESS_CONTEXT))
-
-typedef struct _GSSubprocessContext GSSubprocessContext;
-
-/**
- * GSSubprocessStreamDisposition:
- * @GS_SUBPROCESS_STREAM_DISPOSITION_NULL: Redirect to operating system's null output stream
- * @GS_SUBPROCESS_STREAM_DISPOSITION_INHERIT: Keep the stream from the parent process
- * @GS_SUBPROCESS_STREAM_DISPOSITION_PIPE: Open a private unidirectional channel between the processes
- * @GS_SUBPROCESS_STREAM_DISPOSITION_STDERR_MERGE: Only applicable to standard error; causes it to be merged with standard output
- *
- * Flags to define the behaviour of the standard input/output/error of
- * a #GSSubprocess.
- *
- * Since: 2.36
- **/
-typedef enum {
-  GS_SUBPROCESS_STREAM_DISPOSITION_NULL,
-  GS_SUBPROCESS_STREAM_DISPOSITION_INHERIT,
-  GS_SUBPROCESS_STREAM_DISPOSITION_PIPE,
-  GS_SUBPROCESS_STREAM_DISPOSITION_STDERR_MERGE
-} GSSubprocessStreamDisposition;
-
-GType            gs_subprocess_context_get_type (void) G_GNUC_CONST;
-
-GSSubprocessContext * gs_subprocess_context_new (gchar           **argv);
-GSSubprocessContext * gs_subprocess_context_newv (const gchar  *first_arg,
-                                                ...);
-GSSubprocessContext * gs_subprocess_context_newa (const gchar  *first_arg,
-                                                va_list       args);
-
-#ifdef G_OS_UNIX
-GSSubprocessContext * gs_subprocess_context_new_argv0 (const gchar   *argv0,
-                                                     gchar        **argv);
-#endif
-
-void             gs_subprocess_context_argv_append (GSSubprocessContext  *self,
-                                                    const gchar          *arg);
-
-/* Environment */
-
-void             gs_subprocess_context_set_environment (GSSubprocessContext           *self,
-						       gchar                       **environ);
-void             gs_subprocess_context_set_cwd (GSSubprocessContext           *self,
-					       const gchar                  *cwd);
-void             gs_subprocess_context_set_keep_descriptors (GSSubprocessContext           *self,
-							    gboolean                      keep_descriptors);
-void             gs_subprocess_context_set_search_path (GSSubprocessContext           *self,
-						       gboolean                      search_path,
-						       gboolean                      search_path_from_envp);
-
-/* Basic I/O control */
-
-void             gs_subprocess_context_set_stdin_disposition (GSSubprocessContext           *self,
-							     GSSubprocessStreamDisposition  disposition);
-void             gs_subprocess_context_set_stdout_disposition (GSSubprocessContext           *self,
-							      GSSubprocessStreamDisposition  disposition);
-void             gs_subprocess_context_set_stderr_disposition (GSSubprocessContext           *self,
-							      GSSubprocessStreamDisposition  disposition);
-
-/* Extended I/O control, only available on UNIX */
-
-#ifdef G_OS_UNIX
-void             gs_subprocess_context_set_stdin_file_path (GSSubprocessContext           *self,
-							   const gchar                  *path);
-void             gs_subprocess_context_set_stdin_fd        (GSSubprocessContext           *self,
-							   gint                          fd);
-void             gs_subprocess_context_set_stdout_file_path (GSSubprocessContext           *self,
-							    const gchar                  *path);
-void             gs_subprocess_context_set_stdout_fd        (GSSubprocessContext           *self,
-							    gint                          fd);
-void             gs_subprocess_context_set_stderr_file_path (GSSubprocessContext           *self,
-							    const gchar                  *path);
-void             gs_subprocess_context_set_stderr_fd        (GSSubprocessContext           *self,
-							    gint                          fd);
-
-gboolean         gs_subprocess_context_open_pipe_read       (GSSubprocessContext         *self,
-                                                             GInputStream               **out_stream,
-                                                             gint                        *out_fdno,
-                                                             GError                     **error);
-gboolean         gs_subprocess_context_open_pipe_write      (GSSubprocessContext         *self,
-                                                             GOutputStream              **out_stream,
-                                                             gint                        *out_fdno,
-                                                             GError                     **error);
-#endif
-
-/* Child setup, only available on UNIX */
-#ifdef G_OS_UNIX
-void             gs_subprocess_context_set_child_setup        (GSSubprocessContext           *self,
-							      GSpawnChildSetupFunc          child_setup,
-							      gpointer                      user_data);
-#endif
-
-G_END_DECLS
-
-#endif
-#endif
diff -Nru gnome-desktop3-3.12.0/libgnome-desktop/libgsystem/gsystem-subprocess-context-private.h gnome-desktop3-3.8.4/libgnome-desktop/libgsystem/gsystem-subprocess-context-private.h
--- gnome-desktop3-3.12.0/libgnome-desktop/libgsystem/gsystem-subprocess-context-private.h	2013-11-11 17:23:51.000000000 +0000
+++ gnome-desktop3-3.8.4/libgnome-desktop/libgsystem/gsystem-subprocess-context-private.h	1970-01-01 00:00:00.000000000 +0000
@@ -1,65 +0,0 @@
-/* GIO - GLib Input, Output and Streaming Library
- * 
- * Copyright (C) 2012 Colin Walters 
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library 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
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General
- * Public License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place, Suite 330,
- * Boston, MA 02111-1307, USA.
- */
-
-#ifndef __GS_SUBPROCESS_CONTEXT_PRIVATE_H__
-#define __GS_SUBPROCESS_CONTEXT_PRIVATE_H__
-
-#include "gsystem-subprocess-context.h"
-
-G_BEGIN_DECLS
-
-struct _GSSubprocessContext
-{
-  GObject parent;
-
-  GSpawnFlags flags;
-  gchar **argv;
-  gboolean has_argv0;
-  char **envp;
-  char *cwd;
-
-  GSSubprocessStreamDisposition stdin_disposition;
-  GSSubprocessStreamDisposition stdout_disposition;
-  GSSubprocessStreamDisposition stderr_disposition;
-
-  guint keep_descriptors : 1;
-  guint search_path : 1;
-  guint search_path_from_envp : 1;
-  guint unused_flags : 29;
-
-  gint stdin_fd;
-  gchar *stdin_path;
-
-  gint stdout_fd;
-  gchar *stdout_path;
-
-  gint stderr_fd;
-  gchar *stderr_path;
-
-  GArray *postfork_close_fds;
-  GArray *inherit_fds;
-
-  GSpawnChildSetupFunc child_setup_func;
-  gpointer child_setup_data;
-};
-
-G_END_DECLS
-
-#endif
diff -Nru gnome-desktop3-3.12.0/libgnome-desktop/libgsystem/gsystem-subprocess.h gnome-desktop3-3.8.4/libgnome-desktop/libgsystem/gsystem-subprocess.h
--- gnome-desktop3-3.12.0/libgnome-desktop/libgsystem/gsystem-subprocess.h	2014-01-07 13:28:56.000000000 +0000
+++ gnome-desktop3-3.8.4/libgnome-desktop/libgsystem/gsystem-subprocess.h	1970-01-01 00:00:00.000000000 +0000
@@ -1,101 +0,0 @@
-/* -*- mode: C; c-file-style: "gnu"; indent-tabs-mode: nil; -*-
- *
- * Copyright (C) 2012 Colin Walters .
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library 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
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- */
-
-#ifndef __GSYSTEM_SUBPROCESS_H__
-#define __GSYSTEM_SUBPROCESS_H__
-
-#include 
-
-#if GLIB_CHECK_VERSION(2,34,0)
-
-#include "gsystem-subprocess-context.h"
-
-G_BEGIN_DECLS
-
-#define GS_TYPE_SUBPROCESS         (gs_subprocess_get_type ())
-#define GS_SUBPROCESS(o)           (G_TYPE_CHECK_INSTANCE_CAST ((o), GS_TYPE_SUBPROCESS, GSSubprocess))
-#define GS_IS_SUBPROCESS(o)        (G_TYPE_CHECK_INSTANCE_TYPE ((o), GS_TYPE_SUBPROCESS))
-
-typedef struct _GSSubprocess GSSubprocess;
-
-GType            gs_subprocess_get_type (void) G_GNUC_CONST;
-
-/**** Core API ****/
-
-GSSubprocess *    gs_subprocess_new (GSSubprocessContext   *context,
-                                     GCancellable          *cancellable,
-                                     GError               **error);
-
-GOutputStream *  gs_subprocess_get_stdin_pipe (GSSubprocess       *self);
-
-GInputStream *   gs_subprocess_get_stdout_pipe (GSSubprocess      *self);
-
-GInputStream *   gs_subprocess_get_stderr_pipe (GSSubprocess      *self);
-
-void             gs_subprocess_wait (GSSubprocess                *self,
-				    GCancellable               *cancellable,
-				    GAsyncReadyCallback         callback,
-				    gpointer                    user_data);
-
-gboolean         gs_subprocess_wait_finish (GSSubprocess                *self,
-					   GAsyncResult               *result,
-					   int                        *out_exit_status,
-					   GError                    **error);
-
-gboolean         gs_subprocess_wait_sync (GSSubprocess   *self,
-					 int           *out_exit_status,
-					 GCancellable  *cancellable,
-					 GError       **error);
-
-gboolean         gs_subprocess_wait_sync_check (GSSubprocess   *self,
-					       GCancellable  *cancellable,
-					       GError       **error);
-
-GPid             gs_subprocess_get_pid (GSSubprocess     *self);
-
-gboolean         gs_subprocess_request_exit (GSSubprocess       *self);
-
-void             gs_subprocess_force_exit (GSSubprocess       *self);
-
-/**** High level helpers ****/
-
-GSSubprocess *    gs_subprocess_new_simple_argl (GSSubprocessStreamDisposition   stdout_disposition,
-                                                 GSSubprocessStreamDisposition   stderr_disposition,
-                                                 GCancellable                   *cancellable,
-                                                 GError                        **error,
-                                                 const char                     *first_arg,
-                                                 ...) G_GNUC_NULL_TERMINATED;
-GSSubprocess *    gs_subprocess_new_simple_argv (char                         **argv,
-                                                 GSSubprocessStreamDisposition  stdout_disposition,
-                                                 GSSubprocessStreamDisposition  stderr_disposition,
-                                                 GCancellable                  *cancellable,
-                                                 GError                       **error);
-
-gboolean          gs_subprocess_simple_run_sync (const char                    *cwd,
-                                                 GSSubprocessStreamDisposition  stdin_disposition,
-                                                 GCancellable                  *cancellable,
-                                                 GError                       **error,
-                                                 const char                    *first_arg,
-                                                 ...) G_GNUC_NULL_TERMINATED;
-
-G_END_DECLS
-
-#endif
-#endif
diff -Nru gnome-desktop3-3.12.0/libgnome-desktop/libgsystem/libgsystem.h gnome-desktop3-3.8.4/libgnome-desktop/libgsystem/libgsystem.h
--- gnome-desktop3-3.12.0/libgnome-desktop/libgsystem/libgsystem.h	2013-11-11 17:23:51.000000000 +0000
+++ gnome-desktop3-3.8.4/libgnome-desktop/libgsystem/libgsystem.h	2012-08-16 22:10:21.000000000 +0000
@@ -1,6 +1,6 @@
 /* -*- mode: C; c-file-style: "gnu"; indent-tabs-mode: nil; -*-
  *
- * Copyright (C) 2012,2013 Colin Walters .
+ * Copyright (C) 2012 Colin Walters .
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
@@ -25,24 +25,8 @@
 
 G_BEGIN_DECLS
 
-#define gs_transfer_out_value(outp, srcp) G_STMT_START {   \
-  if (outp)                                                \
-    {                                                      \
-      *(outp) = *(srcp);                                   \
-      *(srcp) = NULL;                                      \
-    }                                                      \
-  } G_STMT_END;
-
-#include 
-#include 
-#include 
-#if GLIB_CHECK_VERSION(2,34,0)
-#include 
-#endif
-#include 
-#ifndef _GSYSTEM_NO_LOCAL_ALLOC
 #include 
-#endif
+#include 
 
 G_END_DECLS
 
diff -Nru gnome-desktop3-3.12.0/libgnome-desktop/libgsystem/Makefile-libgsystem.am gnome-desktop3-3.8.4/libgnome-desktop/libgsystem/Makefile-libgsystem.am
--- gnome-desktop3-3.12.0/libgnome-desktop/libgsystem/Makefile-libgsystem.am	2013-11-11 17:23:51.000000000 +0000
+++ gnome-desktop3-3.8.4/libgnome-desktop/libgsystem/Makefile-libgsystem.am	2012-08-16 22:10:20.000000000 +0000
@@ -15,28 +15,15 @@
 # Free Software Foundation, Inc., 59 Temple Place - Suite 330,
 # Boston, MA 02111-1307, USA.
 
-EXTRA_DIST += $(libgsystem_srcpath)/README $(libgsystem_srcpath)/COPYING
+noinst_LTLIBRARIES += libgsystem.la
 
 libgsystem_la_SOURCES = \
 	$(libgsystem_srcpath)/gsystem-local-alloc.h \
 	$(libgsystem_srcpath)/gsystem-local-alloc.c \
-	$(libgsystem_srcpath)/gsystem-console.h \
-	$(libgsystem_srcpath)/gsystem-console.c \
 	$(libgsystem_srcpath)/gsystem-file-utils.h \
 	$(libgsystem_srcpath)/gsystem-file-utils.c \
-	$(libgsystem_srcpath)/gsystem-glib-compat.h \
-	$(libgsystem_srcpath)/gsystem-shutil.h \
-	$(libgsystem_srcpath)/gsystem-shutil.c \
-	$(libgsystem_srcpath)/gsystem-log.h \
-	$(libgsystem_srcpath)/gsystem-log.c \
-	$(libgsystem_srcpath)/gsystem-subprocess-context.h \
-	$(libgsystem_srcpath)/gsystem-subprocess-context-private.h \
-	$(libgsystem_srcpath)/gsystem-subprocess-context.c \
-	$(libgsystem_srcpath)/gsystem-subprocess.h \
-	$(libgsystem_srcpath)/gsystem-subprocess.c \
 	$(libgsystem_srcpath)/libgsystem.h \
 	$(NULL)
 
 libgsystem_la_CFLAGS = $(AM_CFLAGS) $(libgsystem_cflags)
-libgsystem_la_LDFLAGS = -avoid-version -Bsymbolic-functions -export-symbols-regex "^gs_" -no-undefined -export-dynamic
 libgsystem_la_LIBADD = $(libgsystem_libs)
diff -Nru gnome-desktop3-3.12.0/libgnome-desktop/locarchive.h gnome-desktop3-3.8.4/libgnome-desktop/locarchive.h
--- gnome-desktop3-3.12.0/libgnome-desktop/locarchive.h	1970-01-01 00:00:00.000000000 +0000
+++ gnome-desktop3-3.8.4/libgnome-desktop/locarchive.h	2013-03-17 01:49:53.000000000 +0000
@@ -0,0 +1,97 @@
+/* Definitions for locale archive handling.
+   Copyright (C) 2002 Free Software Foundation, Inc.
+   This file is part of the GNU C Library.
+
+   The GNU C Library is free software; you can redistribute it and/or
+   modify it under the terms of the GNU Lesser General Public
+   License as published by the Free Software Foundation; either
+   version 2.1 of the License, or (at your option) any later version.
+
+   The GNU C Library 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
+   Lesser General Public License for more details.
+
+   You should have received a copy of the GNU Lesser General Public
+   License along with the GNU C Library; if not, write to the Free
+   Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
+   02111-1307 USA.  */
+
+#ifndef _LOCARCHIVE_H
+#define _LOCARCHIVE_H 1
+
+#include 
+
+#define AR_MAGIC 0xde020109
+
+struct locarhead
+{
+  uint32_t magic;
+  /* Serial number.  */
+  uint32_t serial;
+  /* Name hash table.  */
+  uint32_t namehash_offset;
+  uint32_t namehash_used;
+  uint32_t namehash_size;
+  /* String table.  */
+  uint32_t string_offset;
+  uint32_t string_used;
+  uint32_t string_size;
+  /* Table with locale records.  */
+  uint32_t locrectab_offset;
+  uint32_t locrectab_used;
+  uint32_t locrectab_size;
+  /* MD5 sum hash table.  */
+  uint32_t sumhash_offset;
+  uint32_t sumhash_used;
+  uint32_t sumhash_size;
+};
+
+
+struct namehashent
+{
+  /* Hash value of the name.  */
+  uint32_t hashval;
+  /* Offset of the name in the string table.  */
+  uint32_t name_offset;
+  /* Offset of the locale record.  */
+  uint32_t locrec_offset;
+};
+
+
+struct sumhashent
+{
+  /* MD5 sum.  */
+  char sum[16];
+  /* Offset of the file in the archive.  */
+  uint32_t file_offset;
+};
+
+struct locrecent
+{
+  uint32_t refs;		/* # of namehashent records that point here */
+  struct
+  {
+    uint32_t offset;
+    uint32_t len;
+  } record[__LC_LAST];
+};
+
+
+struct locarhandle
+{
+  int fd;
+  void *addr;
+  size_t len;
+};
+
+
+/* In memory data for the locales with their checksums.  */
+typedef struct locale_category_data
+{
+  off_t size;
+  void *addr;
+  char sum[16];
+} locale_data_t[__LC_LAST];
+
+#endif	/* locarchive.h */
diff -Nru gnome-desktop3-3.12.0/libgnome-desktop/Makefile.am gnome-desktop3-3.8.4/libgnome-desktop/Makefile.am
--- gnome-desktop3-3.12.0/libgnome-desktop/Makefile.am	2014-02-13 09:41:05.000000000 +0000
+++ gnome-desktop3-3.8.4/libgnome-desktop/Makefile.am	2013-09-04 11:15:57.000000000 +0000
@@ -1,6 +1,5 @@
 CLEANFILES =
 
-EXTRA_DIST =
 noinst_LTLIBRARIES =
 lib_LTLIBRARIES = libgnome-desktop-3.la
 
@@ -24,14 +23,13 @@
 libgsystem_libs = $(GNOME_DESKTOP_LIBS)
 include libgsystem/Makefile-libgsystem.am
 
-noinst_LTLIBRARIES += libgsystem.la
-
 introspection_sources = 		\
 	gnome-desktop-thumbnail.c 	\
 	gnome-thumbnail-pixbuf-utils.c 	\
 	gnome-bg.c			\
 	gnome-bg-slide-show.c		\
 	gnome-bg-crossfade.c		\
+	display-name.c			\
 	gnome-rr.c			\
 	gnome-rr-config.c		\
 	gnome-rr-output-info.c		\
@@ -44,35 +42,12 @@
 
 libgnome_desktop_3_la_SOURCES = 	\
 	$(introspection_sources)	\
-	$(dbus_xrandr_built_sources)	\
-	$(dbus_idle_built_sources)	\
 	gnome-datetime-source.h		\
 	gnome-datetime-source.c		\
 	gnome-rr-private.h		\
 	default-input-sources.h		\
 	edid.h				\
-	meta-xrandr-shared.h
-
-dbus_xrandr_built_sources = meta-dbus-xrandr.c meta-dbus-xrandr.h
-
-$(dbus_xrandr_built_sources) : Makefile.am xrandr.xml
-	$(AM_V_GEN)gdbus-codegen							\
-		--interface-prefix org.gnome.Mutter					\
-		--c-namespace MetaDBus							\
-		--generate-c-code meta-dbus-xrandr					\
-		$(srcdir)/xrandr.xml
-
-dbus_idle_built_sources = meta-dbus-idle-monitor.c meta-dbus-idle-monitor.h
-
-$(dbus_idle_built_sources) : Makefile.am idle-monitor.xml
-	$(AM_V_GEN)gdbus-codegen							\
-		--interface-prefix org.gnome.Mutter					\
-		--c-namespace MetaDBus							\
-		--generate-c-code meta-dbus-idle-monitor				\
-		--c-generate-object-manager						\
-		$(srcdir)/idle-monitor.xml
-
-BUILT_SOURCES = $(dbus_xrandr_built_sources) $(dbus_idle_built_sources)
+	locarchive.h
 
 libgnome_desktop_3_la_LIBADD =	\
 	$(XLIB_LIBS)		\
@@ -143,8 +118,6 @@
 endif
 
 EXTRA_DIST = \
-	idle-monitor.xml			\
-	xrandr.xml				\
 	gnome-desktop-3.0.pc.in			\
 	gnome-desktop-3.0-uninstalled.pc.in	\
 	$(pnpdata_DATA_dist)
@@ -166,7 +139,8 @@
 noinst_PROGRAMS = test-xkb-info test-pnp-ids test-wall-clock test-desktop-thumbnail test-idle-monitor test-languages
 test_xkb_info_LDADD =		\
 	$(GNOME_DESKTOP_LIBS)	\
-	$(lib_LTLIBRARIES)
+	$(lib_LTLIBRARIES)	\
+	$(XLIB_LIBS)
 
 test_pnp_ids_LDADD = $(test_xkb_info_LDADD)
 
diff -Nru gnome-desktop3-3.12.0/libgnome-desktop/Makefile.in gnome-desktop3-3.8.4/libgnome-desktop/Makefile.in
--- gnome-desktop3-3.12.0/libgnome-desktop/Makefile.in	2014-03-24 14:31:08.000000000 +0000
+++ gnome-desktop3-3.8.4/libgnome-desktop/Makefile.in	2013-09-04 11:29:47.000000000 +0000
@@ -161,14 +161,12 @@
 	$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) libgsystem.la
 am__objects_1 = gnome-desktop-thumbnail.lo \
 	gnome-thumbnail-pixbuf-utils.lo gnome-bg.lo \
-	gnome-bg-slide-show.lo gnome-bg-crossfade.lo gnome-rr.lo \
-	gnome-rr-config.lo gnome-rr-output-info.lo gnome-pnp-ids.lo \
-	gnome-wall-clock.lo gnome-xkb-info.lo gnome-idle-monitor.lo \
-	gnome-languages.lo edid-parse.lo
-am__objects_2 = meta-dbus-xrandr.lo
-am__objects_3 = meta-dbus-idle-monitor.lo
-am_libgnome_desktop_3_la_OBJECTS = $(am__objects_1) $(am__objects_2) \
-	$(am__objects_3) gnome-datetime-source.lo
+	gnome-bg-slide-show.lo gnome-bg-crossfade.lo display-name.lo \
+	gnome-rr.lo gnome-rr-config.lo gnome-rr-output-info.lo \
+	gnome-pnp-ids.lo gnome-wall-clock.lo gnome-xkb-info.lo \
+	gnome-idle-monitor.lo gnome-languages.lo edid-parse.lo
+am_libgnome_desktop_3_la_OBJECTS = $(am__objects_1) \
+	gnome-datetime-source.lo
 libgnome_desktop_3_la_OBJECTS = $(am_libgnome_desktop_3_la_OBJECTS)
 AM_V_lt = $(am__v_lt_@AM_V@)
 am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@)
@@ -181,15 +179,11 @@
 am__DEPENDENCIES_2 = $(am__DEPENDENCIES_1)
 libgsystem_la_DEPENDENCIES = $(am__DEPENDENCIES_2)
 am_libgsystem_la_OBJECTS = libgsystem_la-gsystem-local-alloc.lo \
-	libgsystem_la-gsystem-console.lo \
-	libgsystem_la-gsystem-file-utils.lo \
-	libgsystem_la-gsystem-shutil.lo libgsystem_la-gsystem-log.lo \
-	libgsystem_la-gsystem-subprocess-context.lo \
-	libgsystem_la-gsystem-subprocess.lo
+	libgsystem_la-gsystem-file-utils.lo
 libgsystem_la_OBJECTS = $(am_libgsystem_la_OBJECTS)
 libgsystem_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
 	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(libgsystem_la_CFLAGS) \
-	$(CFLAGS) $(libgsystem_la_LDFLAGS) $(LDFLAGS) -o $@
+	$(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
 PROGRAMS = $(libexec_PROGRAMS) $(noinst_PROGRAMS)
 am_gnome_rr_debug_OBJECTS = gnome-rr-debug.$(OBJEXT)
 gnome_rr_debug_OBJECTS = $(am_gnome_rr_debug_OBJECTS)
@@ -197,7 +191,8 @@
 	$(am__DEPENDENCIES_1)
 test_desktop_thumbnail_SOURCES = test-desktop-thumbnail.c
 test_desktop_thumbnail_OBJECTS = test-desktop-thumbnail.$(OBJEXT)
-am__DEPENDENCIES_3 = $(am__DEPENDENCIES_1) $(lib_LTLIBRARIES)
+am__DEPENDENCIES_3 = $(am__DEPENDENCIES_1) $(lib_LTLIBRARIES) \
+	$(am__DEPENDENCIES_1)
 test_desktop_thumbnail_DEPENDENCIES = $(am__DEPENDENCIES_3)
 test_idle_monitor_SOURCES = test-idle-monitor.c
 test_idle_monitor_OBJECTS = test-idle-monitor.$(OBJEXT)
@@ -213,7 +208,8 @@
 test_wall_clock_DEPENDENCIES = $(am__DEPENDENCIES_3)
 test_xkb_info_SOURCES = test-xkb-info.c
 test_xkb_info_OBJECTS = test-xkb-info.$(OBJEXT)
-test_xkb_info_DEPENDENCIES = $(am__DEPENDENCIES_1) $(lib_LTLIBRARIES)
+test_xkb_info_DEPENDENCIES = $(am__DEPENDENCIES_1) $(lib_LTLIBRARIES) \
+	$(am__DEPENDENCIES_1)
 AM_V_P = $(am__v_P_@AM_V@)
 am__v_P_ = $(am__v_P_@AM_DEFAULT_V@)
 am__v_P_0 = false
@@ -479,13 +475,6 @@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
 CLEANFILES = $(am__append_3)
-EXTRA_DIST = \
-	idle-monitor.xml			\
-	xrandr.xml				\
-	gnome-desktop-3.0.pc.in			\
-	gnome-desktop-3.0-uninstalled.pc.in	\
-	$(pnpdata_DATA_dist)
-
 noinst_LTLIBRARIES = libgsystem.la
 lib_LTLIBRARIES = libgnome-desktop-3.la
 AM_CPPFLAGS = \
@@ -508,25 +497,12 @@
 libgsystem_la_SOURCES = \
 	$(libgsystem_srcpath)/gsystem-local-alloc.h \
 	$(libgsystem_srcpath)/gsystem-local-alloc.c \
-	$(libgsystem_srcpath)/gsystem-console.h \
-	$(libgsystem_srcpath)/gsystem-console.c \
 	$(libgsystem_srcpath)/gsystem-file-utils.h \
 	$(libgsystem_srcpath)/gsystem-file-utils.c \
-	$(libgsystem_srcpath)/gsystem-glib-compat.h \
-	$(libgsystem_srcpath)/gsystem-shutil.h \
-	$(libgsystem_srcpath)/gsystem-shutil.c \
-	$(libgsystem_srcpath)/gsystem-log.h \
-	$(libgsystem_srcpath)/gsystem-log.c \
-	$(libgsystem_srcpath)/gsystem-subprocess-context.h \
-	$(libgsystem_srcpath)/gsystem-subprocess-context-private.h \
-	$(libgsystem_srcpath)/gsystem-subprocess-context.c \
-	$(libgsystem_srcpath)/gsystem-subprocess.h \
-	$(libgsystem_srcpath)/gsystem-subprocess.c \
 	$(libgsystem_srcpath)/libgsystem.h \
 	$(NULL)
 
 libgsystem_la_CFLAGS = $(AM_CFLAGS) $(libgsystem_cflags)
-libgsystem_la_LDFLAGS = -avoid-version -Bsymbolic-functions -export-symbols-regex "^gs_" -no-undefined -export-dynamic
 libgsystem_la_LIBADD = $(libgsystem_libs)
 introspection_sources = \
 	gnome-desktop-thumbnail.c 	\
@@ -534,6 +510,7 @@
 	gnome-bg.c			\
 	gnome-bg-slide-show.c		\
 	gnome-bg-crossfade.c		\
+	display-name.c			\
 	gnome-rr.c			\
 	gnome-rr-config.c		\
 	gnome-rr-output-info.c		\
@@ -546,18 +523,13 @@
 
 libgnome_desktop_3_la_SOURCES = \
 	$(introspection_sources)	\
-	$(dbus_xrandr_built_sources)	\
-	$(dbus_idle_built_sources)	\
 	gnome-datetime-source.h		\
 	gnome-datetime-source.c		\
 	gnome-rr-private.h		\
 	default-input-sources.h		\
 	edid.h				\
-	meta-xrandr-shared.h
+	locarchive.h
 
-dbus_xrandr_built_sources = meta-dbus-xrandr.c meta-dbus-xrandr.h
-dbus_idle_built_sources = meta-dbus-idle-monitor.c meta-dbus-idle-monitor.h
-BUILT_SOURCES = $(dbus_xrandr_built_sources) $(dbus_idle_built_sources)
 libgnome_desktop_3_la_LIBADD = \
 	$(XLIB_LIBS)		\
 	$(LIBM)			\
@@ -604,6 +576,11 @@
 @HAVE_INTROSPECTION_TRUE@gir_DATA = $(INTROSPECTION_GIRS)
 @HAVE_INTROSPECTION_TRUE@typelibdir = $(libdir)/girepository-1.0
 @HAVE_INTROSPECTION_TRUE@typelib_DATA = $(INTROSPECTION_GIRS:.gir=.typelib)
+EXTRA_DIST = \
+	gnome-desktop-3.0.pc.in			\
+	gnome-desktop-3.0-uninstalled.pc.in	\
+	$(pnpdata_DATA_dist)
+
 MAINTAINERCLEANFILES = \
 	pnp.ids
 
@@ -617,15 +594,15 @@
 
 test_xkb_info_LDADD = \
 	$(GNOME_DESKTOP_LIBS)	\
-	$(lib_LTLIBRARIES)
+	$(lib_LTLIBRARIES)	\
+	$(XLIB_LIBS)
 
 test_pnp_ids_LDADD = $(test_xkb_info_LDADD)
 test_wall_clock_LDADD = $(test_xkb_info_LDADD)
 test_desktop_thumbnail_LDADD = $(test_xkb_info_LDADD)
 test_idle_monitor_LDADD = $(test_xkb_info_LDADD)
 test_languages_LDADD = $(test_xkb_info_LDADD)
-all: $(BUILT_SOURCES)
-	$(MAKE) $(AM_MAKEFLAGS) all-am
+all: all-am
 
 .SUFFIXES:
 .SUFFIXES: .c .lo .o .obj
@@ -809,6 +786,7 @@
 distclean-compile:
 	-rm -f *.tab.c
 
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/display-name.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/edid-parse.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gnome-bg-crossfade.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gnome-bg-slide-show.Plo@am__quote@
@@ -825,15 +803,8 @@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gnome-thumbnail-pixbuf-utils.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gnome-wall-clock.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gnome-xkb-info.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libgsystem_la-gsystem-console.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libgsystem_la-gsystem-file-utils.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libgsystem_la-gsystem-local-alloc.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libgsystem_la-gsystem-log.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libgsystem_la-gsystem-shutil.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libgsystem_la-gsystem-subprocess-context.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libgsystem_la-gsystem-subprocess.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/meta-dbus-idle-monitor.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/meta-dbus-xrandr.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test-desktop-thumbnail.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test-idle-monitor.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test-languages.Po@am__quote@
@@ -869,13 +840,6 @@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgsystem_la_CFLAGS) $(CFLAGS) -c -o libgsystem_la-gsystem-local-alloc.lo `test -f '$(libgsystem_srcpath)/gsystem-local-alloc.c' || echo '$(srcdir)/'`$(libgsystem_srcpath)/gsystem-local-alloc.c
 
-libgsystem_la-gsystem-console.lo: $(libgsystem_srcpath)/gsystem-console.c
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgsystem_la_CFLAGS) $(CFLAGS) -MT libgsystem_la-gsystem-console.lo -MD -MP -MF $(DEPDIR)/libgsystem_la-gsystem-console.Tpo -c -o libgsystem_la-gsystem-console.lo `test -f '$(libgsystem_srcpath)/gsystem-console.c' || echo '$(srcdir)/'`$(libgsystem_srcpath)/gsystem-console.c
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/libgsystem_la-gsystem-console.Tpo $(DEPDIR)/libgsystem_la-gsystem-console.Plo
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='$(libgsystem_srcpath)/gsystem-console.c' object='libgsystem_la-gsystem-console.lo' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgsystem_la_CFLAGS) $(CFLAGS) -c -o libgsystem_la-gsystem-console.lo `test -f '$(libgsystem_srcpath)/gsystem-console.c' || echo '$(srcdir)/'`$(libgsystem_srcpath)/gsystem-console.c
-
 libgsystem_la-gsystem-file-utils.lo: $(libgsystem_srcpath)/gsystem-file-utils.c
 @am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgsystem_la_CFLAGS) $(CFLAGS) -MT libgsystem_la-gsystem-file-utils.lo -MD -MP -MF $(DEPDIR)/libgsystem_la-gsystem-file-utils.Tpo -c -o libgsystem_la-gsystem-file-utils.lo `test -f '$(libgsystem_srcpath)/gsystem-file-utils.c' || echo '$(srcdir)/'`$(libgsystem_srcpath)/gsystem-file-utils.c
 @am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/libgsystem_la-gsystem-file-utils.Tpo $(DEPDIR)/libgsystem_la-gsystem-file-utils.Plo
@@ -883,34 +847,6 @@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgsystem_la_CFLAGS) $(CFLAGS) -c -o libgsystem_la-gsystem-file-utils.lo `test -f '$(libgsystem_srcpath)/gsystem-file-utils.c' || echo '$(srcdir)/'`$(libgsystem_srcpath)/gsystem-file-utils.c
 
-libgsystem_la-gsystem-shutil.lo: $(libgsystem_srcpath)/gsystem-shutil.c
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgsystem_la_CFLAGS) $(CFLAGS) -MT libgsystem_la-gsystem-shutil.lo -MD -MP -MF $(DEPDIR)/libgsystem_la-gsystem-shutil.Tpo -c -o libgsystem_la-gsystem-shutil.lo `test -f '$(libgsystem_srcpath)/gsystem-shutil.c' || echo '$(srcdir)/'`$(libgsystem_srcpath)/gsystem-shutil.c
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/libgsystem_la-gsystem-shutil.Tpo $(DEPDIR)/libgsystem_la-gsystem-shutil.Plo
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='$(libgsystem_srcpath)/gsystem-shutil.c' object='libgsystem_la-gsystem-shutil.lo' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgsystem_la_CFLAGS) $(CFLAGS) -c -o libgsystem_la-gsystem-shutil.lo `test -f '$(libgsystem_srcpath)/gsystem-shutil.c' || echo '$(srcdir)/'`$(libgsystem_srcpath)/gsystem-shutil.c
-
-libgsystem_la-gsystem-log.lo: $(libgsystem_srcpath)/gsystem-log.c
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgsystem_la_CFLAGS) $(CFLAGS) -MT libgsystem_la-gsystem-log.lo -MD -MP -MF $(DEPDIR)/libgsystem_la-gsystem-log.Tpo -c -o libgsystem_la-gsystem-log.lo `test -f '$(libgsystem_srcpath)/gsystem-log.c' || echo '$(srcdir)/'`$(libgsystem_srcpath)/gsystem-log.c
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/libgsystem_la-gsystem-log.Tpo $(DEPDIR)/libgsystem_la-gsystem-log.Plo
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='$(libgsystem_srcpath)/gsystem-log.c' object='libgsystem_la-gsystem-log.lo' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgsystem_la_CFLAGS) $(CFLAGS) -c -o libgsystem_la-gsystem-log.lo `test -f '$(libgsystem_srcpath)/gsystem-log.c' || echo '$(srcdir)/'`$(libgsystem_srcpath)/gsystem-log.c
-
-libgsystem_la-gsystem-subprocess-context.lo: $(libgsystem_srcpath)/gsystem-subprocess-context.c
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgsystem_la_CFLAGS) $(CFLAGS) -MT libgsystem_la-gsystem-subprocess-context.lo -MD -MP -MF $(DEPDIR)/libgsystem_la-gsystem-subprocess-context.Tpo -c -o libgsystem_la-gsystem-subprocess-context.lo `test -f '$(libgsystem_srcpath)/gsystem-subprocess-context.c' || echo '$(srcdir)/'`$(libgsystem_srcpath)/gsystem-subprocess-context.c
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/libgsystem_la-gsystem-subprocess-context.Tpo $(DEPDIR)/libgsystem_la-gsystem-subprocess-context.Plo
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='$(libgsystem_srcpath)/gsystem-subprocess-context.c' object='libgsystem_la-gsystem-subprocess-context.lo' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgsystem_la_CFLAGS) $(CFLAGS) -c -o libgsystem_la-gsystem-subprocess-context.lo `test -f '$(libgsystem_srcpath)/gsystem-subprocess-context.c' || echo '$(srcdir)/'`$(libgsystem_srcpath)/gsystem-subprocess-context.c
-
-libgsystem_la-gsystem-subprocess.lo: $(libgsystem_srcpath)/gsystem-subprocess.c
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgsystem_la_CFLAGS) $(CFLAGS) -MT libgsystem_la-gsystem-subprocess.lo -MD -MP -MF $(DEPDIR)/libgsystem_la-gsystem-subprocess.Tpo -c -o libgsystem_la-gsystem-subprocess.lo `test -f '$(libgsystem_srcpath)/gsystem-subprocess.c' || echo '$(srcdir)/'`$(libgsystem_srcpath)/gsystem-subprocess.c
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/libgsystem_la-gsystem-subprocess.Tpo $(DEPDIR)/libgsystem_la-gsystem-subprocess.Plo
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='$(libgsystem_srcpath)/gsystem-subprocess.c' object='libgsystem_la-gsystem-subprocess.lo' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgsystem_la_CFLAGS) $(CFLAGS) -c -o libgsystem_la-gsystem-subprocess.lo `test -f '$(libgsystem_srcpath)/gsystem-subprocess.c' || echo '$(srcdir)/'`$(libgsystem_srcpath)/gsystem-subprocess.c
-
 mostlyclean-libtool:
 	-rm -f *.lo
 
@@ -1105,15 +1041,13 @@
 	  fi; \
 	done
 check-am: all-am
-check: $(BUILT_SOURCES)
-	$(MAKE) $(AM_MAKEFLAGS) check-am
+check: check-am
 all-am: Makefile $(LTLIBRARIES) $(PROGRAMS) $(DATA) $(HEADERS)
 installdirs:
 	for dir in "$(DESTDIR)$(libdir)" "$(DESTDIR)$(libexecdir)" "$(DESTDIR)$(girdir)" "$(DESTDIR)$(pkgconfigdir)" "$(DESTDIR)$(pnpdatadir)" "$(DESTDIR)$(typelibdir)" "$(DESTDIR)$(libgnome_desktopdir)"; do \
 	  test -z "$$dir" || $(MKDIR_P) "$$dir"; \
 	done
-install: $(BUILT_SOURCES)
-	$(MAKE) $(AM_MAKEFLAGS) install-am
+install: install-am
 install-exec: install-exec-am
 install-data: install-data-am
 uninstall: uninstall-am
@@ -1144,7 +1078,6 @@
 maintainer-clean-generic:
 	@echo "This command is intended for maintainers to use"
 	@echo "it deletes files that may require special tools to rebuild."
-	-test -z "$(BUILT_SOURCES)" || rm -f $(BUILT_SOURCES)
 	-test -z "$(MAINTAINERCLEANFILES)" || rm -f $(MAINTAINERCLEANFILES)
 clean: clean-am
 
@@ -1222,7 +1155,7 @@
 	uninstall-pkgconfigDATA uninstall-pnpdataDATA \
 	uninstall-typelibDATA
 
-.MAKE: all check install install-am install-strip
+.MAKE: install-am install-strip
 
 .PHONY: CTAGS GTAGS TAGS all all-am check check-am clean clean-generic \
 	clean-libLTLIBRARIES clean-libexecPROGRAMS clean-libtool \
@@ -1246,21 +1179,6 @@
 	uninstall-typelibDATA
 
 
-$(dbus_xrandr_built_sources) : Makefile.am xrandr.xml
-	$(AM_V_GEN)gdbus-codegen							\
-		--interface-prefix org.gnome.Mutter					\
-		--c-namespace MetaDBus							\
-		--generate-c-code meta-dbus-xrandr					\
-		$(srcdir)/xrandr.xml
-
-$(dbus_idle_built_sources) : Makefile.am idle-monitor.xml
-	$(AM_V_GEN)gdbus-codegen							\
-		--interface-prefix org.gnome.Mutter					\
-		--c-namespace MetaDBus							\
-		--generate-c-code meta-dbus-idle-monitor				\
-		--c-generate-object-manager						\
-		$(srcdir)/idle-monitor.xml
-
 update-pnp-ids:
 	wget -O $(top_srcdir)/libgnome-desktop/pnp.ids "http://git.fedorahosted.org/git/?p=hwdata.git;a=blob_plain;f=pnp.ids;hb=HEAD"
 
diff -Nru gnome-desktop3-3.12.0/libgnome-desktop/meta-dbus-idle-monitor.c gnome-desktop3-3.8.4/libgnome-desktop/meta-dbus-idle-monitor.c
--- gnome-desktop3-3.12.0/libgnome-desktop/meta-dbus-idle-monitor.c	2014-03-24 14:31:23.000000000 +0000
+++ gnome-desktop3-3.8.4/libgnome-desktop/meta-dbus-idle-monitor.c	1970-01-01 00:00:00.000000000 +0000
@@ -1,2239 +0,0 @@
-/*
- * Generated by gdbus-codegen 2.39.92. DO NOT EDIT.
- *
- * The license of this code is the same as for the source it was derived from.
- */
-
-#ifdef HAVE_CONFIG_H
-#  include "config.h"
-#endif
-
-#include "meta-dbus-idle-monitor.h"
-
-#include 
-#ifdef G_OS_UNIX
-#  include 
-#endif
-
-typedef struct
-{
-  GDBusArgInfo parent_struct;
-  gboolean use_gvariant;
-} _ExtendedGDBusArgInfo;
-
-typedef struct
-{
-  GDBusMethodInfo parent_struct;
-  const gchar *signal_name;
-  gboolean pass_fdlist;
-} _ExtendedGDBusMethodInfo;
-
-typedef struct
-{
-  GDBusSignalInfo parent_struct;
-  const gchar *signal_name;
-} _ExtendedGDBusSignalInfo;
-
-typedef struct
-{
-  GDBusPropertyInfo parent_struct;
-  const gchar *hyphen_name;
-  gboolean use_gvariant;
-} _ExtendedGDBusPropertyInfo;
-
-typedef struct
-{
-  GDBusInterfaceInfo parent_struct;
-  const gchar *hyphen_name;
-} _ExtendedGDBusInterfaceInfo;
-
-typedef struct
-{
-  const _ExtendedGDBusPropertyInfo *info;
-  guint prop_id;
-  GValue orig_value; /* the value before the change */
-} ChangedProperty;
-
-static void
-_changed_property_free (ChangedProperty *data)
-{
-  g_value_unset (&data->orig_value);
-  g_free (data);
-}
-
-static gboolean
-_g_strv_equal0 (gchar **a, gchar **b)
-{
-  gboolean ret = FALSE;
-  guint n;
-  if (a == NULL && b == NULL)
-    {
-      ret = TRUE;
-      goto out;
-    }
-  if (a == NULL || b == NULL)
-    goto out;
-  if (g_strv_length (a) != g_strv_length (b))
-    goto out;
-  for (n = 0; a[n] != NULL; n++)
-    if (g_strcmp0 (a[n], b[n]) != 0)
-      goto out;
-  ret = TRUE;
-out:
-  return ret;
-}
-
-static gboolean
-_g_variant_equal0 (GVariant *a, GVariant *b)
-{
-  gboolean ret = FALSE;
-  if (a == NULL && b == NULL)
-    {
-      ret = TRUE;
-      goto out;
-    }
-  if (a == NULL || b == NULL)
-    goto out;
-  ret = g_variant_equal (a, b);
-out:
-  return ret;
-}
-
-G_GNUC_UNUSED static gboolean
-_g_value_equal (const GValue *a, const GValue *b)
-{
-  gboolean ret = FALSE;
-  g_assert (G_VALUE_TYPE (a) == G_VALUE_TYPE (b));
-  switch (G_VALUE_TYPE (a))
-    {
-      case G_TYPE_BOOLEAN:
-        ret = (g_value_get_boolean (a) == g_value_get_boolean (b));
-        break;
-      case G_TYPE_UCHAR:
-        ret = (g_value_get_uchar (a) == g_value_get_uchar (b));
-        break;
-      case G_TYPE_INT:
-        ret = (g_value_get_int (a) == g_value_get_int (b));
-        break;
-      case G_TYPE_UINT:
-        ret = (g_value_get_uint (a) == g_value_get_uint (b));
-        break;
-      case G_TYPE_INT64:
-        ret = (g_value_get_int64 (a) == g_value_get_int64 (b));
-        break;
-      case G_TYPE_UINT64:
-        ret = (g_value_get_uint64 (a) == g_value_get_uint64 (b));
-        break;
-      case G_TYPE_DOUBLE:
-        {
-          /* Avoid -Wfloat-equal warnings by doing a direct bit compare */
-          gdouble da = g_value_get_double (a);
-          gdouble db = g_value_get_double (b);
-          ret = memcmp (&da, &db, sizeof (gdouble)) == 0;
-        }
-        break;
-      case G_TYPE_STRING:
-        ret = (g_strcmp0 (g_value_get_string (a), g_value_get_string (b)) == 0);
-        break;
-      case G_TYPE_VARIANT:
-        ret = _g_variant_equal0 (g_value_get_variant (a), g_value_get_variant (b));
-        break;
-      default:
-        if (G_VALUE_TYPE (a) == G_TYPE_STRV)
-          ret = _g_strv_equal0 (g_value_get_boxed (a), g_value_get_boxed (b));
-        else
-          g_critical ("_g_value_equal() does not handle type %s", g_type_name (G_VALUE_TYPE (a)));
-        break;
-    }
-  return ret;
-}
-
-/* ------------------------------------------------------------------------
- * Code for interface org.gnome.Mutter.IdleMonitor
- * ------------------------------------------------------------------------
- */
-
-/**
- * SECTION:MetaDBusIdleMonitor
- * @title: MetaDBusIdleMonitor
- * @short_description: Generated C code for the org.gnome.Mutter.IdleMonitor D-Bus interface
- *
- * This section contains code for working with the org.gnome.Mutter.IdleMonitor D-Bus interface in C.
- */
-
-/* ---- Introspection data for org.gnome.Mutter.IdleMonitor ---- */
-
-static const _ExtendedGDBusArgInfo _meta_dbus_idle_monitor_method_info_get_idletime_OUT_ARG_idletime =
-{
-  {
-    -1,
-    (gchar *) "idletime",
-    (gchar *) "t",
-    NULL
-  },
-  FALSE
-};
-
-static const _ExtendedGDBusArgInfo * const _meta_dbus_idle_monitor_method_info_get_idletime_OUT_ARG_pointers[] =
-{
-  &_meta_dbus_idle_monitor_method_info_get_idletime_OUT_ARG_idletime,
-  NULL
-};
-
-static const _ExtendedGDBusMethodInfo _meta_dbus_idle_monitor_method_info_get_idletime =
-{
-  {
-    -1,
-    (gchar *) "GetIdletime",
-    NULL,
-    (GDBusArgInfo **) &_meta_dbus_idle_monitor_method_info_get_idletime_OUT_ARG_pointers,
-    NULL
-  },
-  "handle-get-idletime",
-  FALSE
-};
-
-static const _ExtendedGDBusArgInfo _meta_dbus_idle_monitor_method_info_add_idle_watch_IN_ARG_interval =
-{
-  {
-    -1,
-    (gchar *) "interval",
-    (gchar *) "t",
-    NULL
-  },
-  FALSE
-};
-
-static const _ExtendedGDBusArgInfo * const _meta_dbus_idle_monitor_method_info_add_idle_watch_IN_ARG_pointers[] =
-{
-  &_meta_dbus_idle_monitor_method_info_add_idle_watch_IN_ARG_interval,
-  NULL
-};
-
-static const _ExtendedGDBusArgInfo _meta_dbus_idle_monitor_method_info_add_idle_watch_OUT_ARG_id =
-{
-  {
-    -1,
-    (gchar *) "id",
-    (gchar *) "u",
-    NULL
-  },
-  FALSE
-};
-
-static const _ExtendedGDBusArgInfo * const _meta_dbus_idle_monitor_method_info_add_idle_watch_OUT_ARG_pointers[] =
-{
-  &_meta_dbus_idle_monitor_method_info_add_idle_watch_OUT_ARG_id,
-  NULL
-};
-
-static const _ExtendedGDBusMethodInfo _meta_dbus_idle_monitor_method_info_add_idle_watch =
-{
-  {
-    -1,
-    (gchar *) "AddIdleWatch",
-    (GDBusArgInfo **) &_meta_dbus_idle_monitor_method_info_add_idle_watch_IN_ARG_pointers,
-    (GDBusArgInfo **) &_meta_dbus_idle_monitor_method_info_add_idle_watch_OUT_ARG_pointers,
-    NULL
-  },
-  "handle-add-idle-watch",
-  FALSE
-};
-
-static const _ExtendedGDBusArgInfo _meta_dbus_idle_monitor_method_info_add_user_active_watch_OUT_ARG_id =
-{
-  {
-    -1,
-    (gchar *) "id",
-    (gchar *) "u",
-    NULL
-  },
-  FALSE
-};
-
-static const _ExtendedGDBusArgInfo * const _meta_dbus_idle_monitor_method_info_add_user_active_watch_OUT_ARG_pointers[] =
-{
-  &_meta_dbus_idle_monitor_method_info_add_user_active_watch_OUT_ARG_id,
-  NULL
-};
-
-static const _ExtendedGDBusMethodInfo _meta_dbus_idle_monitor_method_info_add_user_active_watch =
-{
-  {
-    -1,
-    (gchar *) "AddUserActiveWatch",
-    NULL,
-    (GDBusArgInfo **) &_meta_dbus_idle_monitor_method_info_add_user_active_watch_OUT_ARG_pointers,
-    NULL
-  },
-  "handle-add-user-active-watch",
-  FALSE
-};
-
-static const _ExtendedGDBusArgInfo _meta_dbus_idle_monitor_method_info_remove_watch_IN_ARG_id =
-{
-  {
-    -1,
-    (gchar *) "id",
-    (gchar *) "u",
-    NULL
-  },
-  FALSE
-};
-
-static const _ExtendedGDBusArgInfo * const _meta_dbus_idle_monitor_method_info_remove_watch_IN_ARG_pointers[] =
-{
-  &_meta_dbus_idle_monitor_method_info_remove_watch_IN_ARG_id,
-  NULL
-};
-
-static const _ExtendedGDBusMethodInfo _meta_dbus_idle_monitor_method_info_remove_watch =
-{
-  {
-    -1,
-    (gchar *) "RemoveWatch",
-    (GDBusArgInfo **) &_meta_dbus_idle_monitor_method_info_remove_watch_IN_ARG_pointers,
-    NULL,
-    NULL
-  },
-  "handle-remove-watch",
-  FALSE
-};
-
-static const _ExtendedGDBusMethodInfo * const _meta_dbus_idle_monitor_method_info_pointers[] =
-{
-  &_meta_dbus_idle_monitor_method_info_get_idletime,
-  &_meta_dbus_idle_monitor_method_info_add_idle_watch,
-  &_meta_dbus_idle_monitor_method_info_add_user_active_watch,
-  &_meta_dbus_idle_monitor_method_info_remove_watch,
-  NULL
-};
-
-static const _ExtendedGDBusArgInfo _meta_dbus_idle_monitor_signal_info_watch_fired_ARG_id =
-{
-  {
-    -1,
-    (gchar *) "id",
-    (gchar *) "u",
-    NULL
-  },
-  FALSE
-};
-
-static const _ExtendedGDBusArgInfo * const _meta_dbus_idle_monitor_signal_info_watch_fired_ARG_pointers[] =
-{
-  &_meta_dbus_idle_monitor_signal_info_watch_fired_ARG_id,
-  NULL
-};
-
-static const _ExtendedGDBusSignalInfo _meta_dbus_idle_monitor_signal_info_watch_fired =
-{
-  {
-    -1,
-    (gchar *) "WatchFired",
-    (GDBusArgInfo **) &_meta_dbus_idle_monitor_signal_info_watch_fired_ARG_pointers,
-    NULL
-  },
-  "watch-fired"
-};
-
-static const _ExtendedGDBusSignalInfo * const _meta_dbus_idle_monitor_signal_info_pointers[] =
-{
-  &_meta_dbus_idle_monitor_signal_info_watch_fired,
-  NULL
-};
-
-static const _ExtendedGDBusInterfaceInfo _meta_dbus_idle_monitor_interface_info =
-{
-  {
-    -1,
-    (gchar *) "org.gnome.Mutter.IdleMonitor",
-    (GDBusMethodInfo **) &_meta_dbus_idle_monitor_method_info_pointers,
-    (GDBusSignalInfo **) &_meta_dbus_idle_monitor_signal_info_pointers,
-    NULL,
-    NULL
-  },
-  "idle-monitor",
-};
-
-
-/**
- * meta_dbus_idle_monitor_interface_info:
- *
- * Gets a machine-readable description of the org.gnome.Mutter.IdleMonitor D-Bus interface.
- *
- * Returns: (transfer none): A #GDBusInterfaceInfo. Do not free.
- */
-GDBusInterfaceInfo *
-meta_dbus_idle_monitor_interface_info (void)
-{
-  return (GDBusInterfaceInfo *) &_meta_dbus_idle_monitor_interface_info.parent_struct;
-}
-
-/**
- * meta_dbus_idle_monitor_override_properties:
- * @klass: The class structure for a #GObject-derived class.
- * @property_id_begin: The property id to assign to the first overridden property.
- *
- * Overrides all #GObject properties in the #MetaDBusIdleMonitor interface for a concrete class.
- * The properties are overridden in the order they are defined.
- *
- * Returns: The last property id.
- */
-guint
-meta_dbus_idle_monitor_override_properties (GObjectClass *klass, guint property_id_begin)
-{
-  return property_id_begin - 1;
-}
-
-
-
-/**
- * MetaDBusIdleMonitor:
- *
- * Abstract interface type for the D-Bus interface org.gnome.Mutter.IdleMonitor.
- */
-
-/**
- * MetaDBusIdleMonitorIface:
- * @parent_iface: The parent interface.
- * @handle_add_idle_watch: Handler for the #MetaDBusIdleMonitor::handle-add-idle-watch signal.
- * @handle_add_user_active_watch: Handler for the #MetaDBusIdleMonitor::handle-add-user-active-watch signal.
- * @handle_get_idletime: Handler for the #MetaDBusIdleMonitor::handle-get-idletime signal.
- * @handle_remove_watch: Handler for the #MetaDBusIdleMonitor::handle-remove-watch signal.
- * @watch_fired: Handler for the #MetaDBusIdleMonitor::watch-fired signal.
- *
- * Virtual table for the D-Bus interface org.gnome.Mutter.IdleMonitor.
- */
-
-typedef MetaDBusIdleMonitorIface MetaDBusIdleMonitorInterface;
-G_DEFINE_INTERFACE (MetaDBusIdleMonitor, meta_dbus_idle_monitor, G_TYPE_OBJECT);
-
-static void
-meta_dbus_idle_monitor_default_init (MetaDBusIdleMonitorIface *iface)
-{
-  /* GObject signals for incoming D-Bus method calls: */
-  /**
-   * MetaDBusIdleMonitor::handle-get-idletime:
-   * @object: A #MetaDBusIdleMonitor.
-   * @invocation: A #GDBusMethodInvocation.
-   *
-   * Signal emitted when a remote caller is invoking the GetIdletime() D-Bus method.
-   *
-   * If a signal handler returns %TRUE, it means the signal handler will handle the invocation (e.g. take a reference to @invocation and eventually call meta_dbus_idle_monitor_complete_get_idletime() or e.g. g_dbus_method_invocation_return_error() on it) and no order signal handlers will run. If no signal handler handles the invocation, the %G_DBUS_ERROR_UNKNOWN_METHOD error is returned.
-   *
-   * Returns: %TRUE if the invocation was handled, %FALSE to let other signal handlers run.
-   */
-  g_signal_new ("handle-get-idletime",
-    G_TYPE_FROM_INTERFACE (iface),
-    G_SIGNAL_RUN_LAST,
-    G_STRUCT_OFFSET (MetaDBusIdleMonitorIface, handle_get_idletime),
-    g_signal_accumulator_true_handled,
-    NULL,
-    g_cclosure_marshal_generic,
-    G_TYPE_BOOLEAN,
-    1,
-    G_TYPE_DBUS_METHOD_INVOCATION);
-
-  /**
-   * MetaDBusIdleMonitor::handle-add-idle-watch:
-   * @object: A #MetaDBusIdleMonitor.
-   * @invocation: A #GDBusMethodInvocation.
-   * @arg_interval: Argument passed by remote caller.
-   *
-   * Signal emitted when a remote caller is invoking the AddIdleWatch() D-Bus method.
-   *
-   * If a signal handler returns %TRUE, it means the signal handler will handle the invocation (e.g. take a reference to @invocation and eventually call meta_dbus_idle_monitor_complete_add_idle_watch() or e.g. g_dbus_method_invocation_return_error() on it) and no order signal handlers will run. If no signal handler handles the invocation, the %G_DBUS_ERROR_UNKNOWN_METHOD error is returned.
-   *
-   * Returns: %TRUE if the invocation was handled, %FALSE to let other signal handlers run.
-   */
-  g_signal_new ("handle-add-idle-watch",
-    G_TYPE_FROM_INTERFACE (iface),
-    G_SIGNAL_RUN_LAST,
-    G_STRUCT_OFFSET (MetaDBusIdleMonitorIface, handle_add_idle_watch),
-    g_signal_accumulator_true_handled,
-    NULL,
-    g_cclosure_marshal_generic,
-    G_TYPE_BOOLEAN,
-    2,
-    G_TYPE_DBUS_METHOD_INVOCATION, G_TYPE_UINT64);
-
-  /**
-   * MetaDBusIdleMonitor::handle-add-user-active-watch:
-   * @object: A #MetaDBusIdleMonitor.
-   * @invocation: A #GDBusMethodInvocation.
-   *
-   * Signal emitted when a remote caller is invoking the AddUserActiveWatch() D-Bus method.
-   *
-   * If a signal handler returns %TRUE, it means the signal handler will handle the invocation (e.g. take a reference to @invocation and eventually call meta_dbus_idle_monitor_complete_add_user_active_watch() or e.g. g_dbus_method_invocation_return_error() on it) and no order signal handlers will run. If no signal handler handles the invocation, the %G_DBUS_ERROR_UNKNOWN_METHOD error is returned.
-   *
-   * Returns: %TRUE if the invocation was handled, %FALSE to let other signal handlers run.
-   */
-  g_signal_new ("handle-add-user-active-watch",
-    G_TYPE_FROM_INTERFACE (iface),
-    G_SIGNAL_RUN_LAST,
-    G_STRUCT_OFFSET (MetaDBusIdleMonitorIface, handle_add_user_active_watch),
-    g_signal_accumulator_true_handled,
-    NULL,
-    g_cclosure_marshal_generic,
-    G_TYPE_BOOLEAN,
-    1,
-    G_TYPE_DBUS_METHOD_INVOCATION);
-
-  /**
-   * MetaDBusIdleMonitor::handle-remove-watch:
-   * @object: A #MetaDBusIdleMonitor.
-   * @invocation: A #GDBusMethodInvocation.
-   * @arg_id: Argument passed by remote caller.
-   *
-   * Signal emitted when a remote caller is invoking the RemoveWatch() D-Bus method.
-   *
-   * If a signal handler returns %TRUE, it means the signal handler will handle the invocation (e.g. take a reference to @invocation and eventually call meta_dbus_idle_monitor_complete_remove_watch() or e.g. g_dbus_method_invocation_return_error() on it) and no order signal handlers will run. If no signal handler handles the invocation, the %G_DBUS_ERROR_UNKNOWN_METHOD error is returned.
-   *
-   * Returns: %TRUE if the invocation was handled, %FALSE to let other signal handlers run.
-   */
-  g_signal_new ("handle-remove-watch",
-    G_TYPE_FROM_INTERFACE (iface),
-    G_SIGNAL_RUN_LAST,
-    G_STRUCT_OFFSET (MetaDBusIdleMonitorIface, handle_remove_watch),
-    g_signal_accumulator_true_handled,
-    NULL,
-    g_cclosure_marshal_generic,
-    G_TYPE_BOOLEAN,
-    2,
-    G_TYPE_DBUS_METHOD_INVOCATION, G_TYPE_UINT);
-
-  /* GObject signals for received D-Bus signals: */
-  /**
-   * MetaDBusIdleMonitor::watch-fired:
-   * @object: A #MetaDBusIdleMonitor.
-   * @arg_id: Argument.
-   *
-   * On the client-side, this signal is emitted whenever the D-Bus signal "WatchFired" is received.
-   *
-   * On the service-side, this signal can be used with e.g. g_signal_emit_by_name() to make the object emit the D-Bus signal.
-   */
-  g_signal_new ("watch-fired",
-    G_TYPE_FROM_INTERFACE (iface),
-    G_SIGNAL_RUN_LAST,
-    G_STRUCT_OFFSET (MetaDBusIdleMonitorIface, watch_fired),
-    NULL,
-    NULL,
-    g_cclosure_marshal_generic,
-    G_TYPE_NONE,
-    1, G_TYPE_UINT);
-
-}
-
-/**
- * meta_dbus_idle_monitor_emit_watch_fired:
- * @object: A #MetaDBusIdleMonitor.
- * @arg_id: Argument to pass with the signal.
- *
- * Emits the "WatchFired" D-Bus signal.
- */
-void
-meta_dbus_idle_monitor_emit_watch_fired (
-    MetaDBusIdleMonitor *object,
-    guint arg_id)
-{
-  g_signal_emit_by_name (object, "watch-fired", arg_id);
-}
-
-/**
- * meta_dbus_idle_monitor_call_get_idletime:
- * @proxy: A #MetaDBusIdleMonitorProxy.
- * @cancellable: (allow-none): A #GCancellable or %NULL.
- * @callback: A #GAsyncReadyCallback to call when the request is satisfied or %NULL.
- * @user_data: User data to pass to @callback.
- *
- * Asynchronously invokes the GetIdletime() D-Bus method on @proxy.
- * When the operation is finished, @callback will be invoked in the thread-default main loop of the thread you are calling this method from.
- * You can then call meta_dbus_idle_monitor_call_get_idletime_finish() to get the result of the operation.
- *
- * See meta_dbus_idle_monitor_call_get_idletime_sync() for the synchronous, blocking version of this method.
- */
-void
-meta_dbus_idle_monitor_call_get_idletime (
-    MetaDBusIdleMonitor *proxy,
-    GCancellable *cancellable,
-    GAsyncReadyCallback callback,
-    gpointer user_data)
-{
-  g_dbus_proxy_call (G_DBUS_PROXY (proxy),
-    "GetIdletime",
-    g_variant_new ("()"),
-    G_DBUS_CALL_FLAGS_NONE,
-    -1,
-    cancellable,
-    callback,
-    user_data);
-}
-
-/**
- * meta_dbus_idle_monitor_call_get_idletime_finish:
- * @proxy: A #MetaDBusIdleMonitorProxy.
- * @out_idletime: (out): Return location for return parameter or %NULL to ignore.
- * @res: The #GAsyncResult obtained from the #GAsyncReadyCallback passed to meta_dbus_idle_monitor_call_get_idletime().
- * @error: Return location for error or %NULL.
- *
- * Finishes an operation started with meta_dbus_idle_monitor_call_get_idletime().
- *
- * Returns: (skip): %TRUE if the call succeded, %FALSE if @error is set.
- */
-gboolean
-meta_dbus_idle_monitor_call_get_idletime_finish (
-    MetaDBusIdleMonitor *proxy,
-    guint64 *out_idletime,
-    GAsyncResult *res,
-    GError **error)
-{
-  GVariant *_ret;
-  _ret = g_dbus_proxy_call_finish (G_DBUS_PROXY (proxy), res, error);
-  if (_ret == NULL)
-    goto _out;
-  g_variant_get (_ret,
-                 "(t)",
-                 out_idletime);
-  g_variant_unref (_ret);
-_out:
-  return _ret != NULL;
-}
-
-/**
- * meta_dbus_idle_monitor_call_get_idletime_sync:
- * @proxy: A #MetaDBusIdleMonitorProxy.
- * @out_idletime: (out): Return location for return parameter or %NULL to ignore.
- * @cancellable: (allow-none): A #GCancellable or %NULL.
- * @error: Return location for error or %NULL.
- *
- * Synchronously invokes the GetIdletime() D-Bus method on @proxy. The calling thread is blocked until a reply is received.
- *
- * See meta_dbus_idle_monitor_call_get_idletime() for the asynchronous version of this method.
- *
- * Returns: (skip): %TRUE if the call succeded, %FALSE if @error is set.
- */
-gboolean
-meta_dbus_idle_monitor_call_get_idletime_sync (
-    MetaDBusIdleMonitor *proxy,
-    guint64 *out_idletime,
-    GCancellable *cancellable,
-    GError **error)
-{
-  GVariant *_ret;
-  _ret = g_dbus_proxy_call_sync (G_DBUS_PROXY (proxy),
-    "GetIdletime",
-    g_variant_new ("()"),
-    G_DBUS_CALL_FLAGS_NONE,
-    -1,
-    cancellable,
-    error);
-  if (_ret == NULL)
-    goto _out;
-  g_variant_get (_ret,
-                 "(t)",
-                 out_idletime);
-  g_variant_unref (_ret);
-_out:
-  return _ret != NULL;
-}
-
-/**
- * meta_dbus_idle_monitor_call_add_idle_watch:
- * @proxy: A #MetaDBusIdleMonitorProxy.
- * @arg_interval: Argument to pass with the method invocation.
- * @cancellable: (allow-none): A #GCancellable or %NULL.
- * @callback: A #GAsyncReadyCallback to call when the request is satisfied or %NULL.
- * @user_data: User data to pass to @callback.
- *
- * Asynchronously invokes the AddIdleWatch() D-Bus method on @proxy.
- * When the operation is finished, @callback will be invoked in the thread-default main loop of the thread you are calling this method from.
- * You can then call meta_dbus_idle_monitor_call_add_idle_watch_finish() to get the result of the operation.
- *
- * See meta_dbus_idle_monitor_call_add_idle_watch_sync() for the synchronous, blocking version of this method.
- */
-void
-meta_dbus_idle_monitor_call_add_idle_watch (
-    MetaDBusIdleMonitor *proxy,
-    guint64 arg_interval,
-    GCancellable *cancellable,
-    GAsyncReadyCallback callback,
-    gpointer user_data)
-{
-  g_dbus_proxy_call (G_DBUS_PROXY (proxy),
-    "AddIdleWatch",
-    g_variant_new ("(t)",
-                   arg_interval),
-    G_DBUS_CALL_FLAGS_NONE,
-    -1,
-    cancellable,
-    callback,
-    user_data);
-}
-
-/**
- * meta_dbus_idle_monitor_call_add_idle_watch_finish:
- * @proxy: A #MetaDBusIdleMonitorProxy.
- * @out_id: (out): Return location for return parameter or %NULL to ignore.
- * @res: The #GAsyncResult obtained from the #GAsyncReadyCallback passed to meta_dbus_idle_monitor_call_add_idle_watch().
- * @error: Return location for error or %NULL.
- *
- * Finishes an operation started with meta_dbus_idle_monitor_call_add_idle_watch().
- *
- * Returns: (skip): %TRUE if the call succeded, %FALSE if @error is set.
- */
-gboolean
-meta_dbus_idle_monitor_call_add_idle_watch_finish (
-    MetaDBusIdleMonitor *proxy,
-    guint *out_id,
-    GAsyncResult *res,
-    GError **error)
-{
-  GVariant *_ret;
-  _ret = g_dbus_proxy_call_finish (G_DBUS_PROXY (proxy), res, error);
-  if (_ret == NULL)
-    goto _out;
-  g_variant_get (_ret,
-                 "(u)",
-                 out_id);
-  g_variant_unref (_ret);
-_out:
-  return _ret != NULL;
-}
-
-/**
- * meta_dbus_idle_monitor_call_add_idle_watch_sync:
- * @proxy: A #MetaDBusIdleMonitorProxy.
- * @arg_interval: Argument to pass with the method invocation.
- * @out_id: (out): Return location for return parameter or %NULL to ignore.
- * @cancellable: (allow-none): A #GCancellable or %NULL.
- * @error: Return location for error or %NULL.
- *
- * Synchronously invokes the AddIdleWatch() D-Bus method on @proxy. The calling thread is blocked until a reply is received.
- *
- * See meta_dbus_idle_monitor_call_add_idle_watch() for the asynchronous version of this method.
- *
- * Returns: (skip): %TRUE if the call succeded, %FALSE if @error is set.
- */
-gboolean
-meta_dbus_idle_monitor_call_add_idle_watch_sync (
-    MetaDBusIdleMonitor *proxy,
-    guint64 arg_interval,
-    guint *out_id,
-    GCancellable *cancellable,
-    GError **error)
-{
-  GVariant *_ret;
-  _ret = g_dbus_proxy_call_sync (G_DBUS_PROXY (proxy),
-    "AddIdleWatch",
-    g_variant_new ("(t)",
-                   arg_interval),
-    G_DBUS_CALL_FLAGS_NONE,
-    -1,
-    cancellable,
-    error);
-  if (_ret == NULL)
-    goto _out;
-  g_variant_get (_ret,
-                 "(u)",
-                 out_id);
-  g_variant_unref (_ret);
-_out:
-  return _ret != NULL;
-}
-
-/**
- * meta_dbus_idle_monitor_call_add_user_active_watch:
- * @proxy: A #MetaDBusIdleMonitorProxy.
- * @cancellable: (allow-none): A #GCancellable or %NULL.
- * @callback: A #GAsyncReadyCallback to call when the request is satisfied or %NULL.
- * @user_data: User data to pass to @callback.
- *
- * Asynchronously invokes the AddUserActiveWatch() D-Bus method on @proxy.
- * When the operation is finished, @callback will be invoked in the thread-default main loop of the thread you are calling this method from.
- * You can then call meta_dbus_idle_monitor_call_add_user_active_watch_finish() to get the result of the operation.
- *
- * See meta_dbus_idle_monitor_call_add_user_active_watch_sync() for the synchronous, blocking version of this method.
- */
-void
-meta_dbus_idle_monitor_call_add_user_active_watch (
-    MetaDBusIdleMonitor *proxy,
-    GCancellable *cancellable,
-    GAsyncReadyCallback callback,
-    gpointer user_data)
-{
-  g_dbus_proxy_call (G_DBUS_PROXY (proxy),
-    "AddUserActiveWatch",
-    g_variant_new ("()"),
-    G_DBUS_CALL_FLAGS_NONE,
-    -1,
-    cancellable,
-    callback,
-    user_data);
-}
-
-/**
- * meta_dbus_idle_monitor_call_add_user_active_watch_finish:
- * @proxy: A #MetaDBusIdleMonitorProxy.
- * @out_id: (out): Return location for return parameter or %NULL to ignore.
- * @res: The #GAsyncResult obtained from the #GAsyncReadyCallback passed to meta_dbus_idle_monitor_call_add_user_active_watch().
- * @error: Return location for error or %NULL.
- *
- * Finishes an operation started with meta_dbus_idle_monitor_call_add_user_active_watch().
- *
- * Returns: (skip): %TRUE if the call succeded, %FALSE if @error is set.
- */
-gboolean
-meta_dbus_idle_monitor_call_add_user_active_watch_finish (
-    MetaDBusIdleMonitor *proxy,
-    guint *out_id,
-    GAsyncResult *res,
-    GError **error)
-{
-  GVariant *_ret;
-  _ret = g_dbus_proxy_call_finish (G_DBUS_PROXY (proxy), res, error);
-  if (_ret == NULL)
-    goto _out;
-  g_variant_get (_ret,
-                 "(u)",
-                 out_id);
-  g_variant_unref (_ret);
-_out:
-  return _ret != NULL;
-}
-
-/**
- * meta_dbus_idle_monitor_call_add_user_active_watch_sync:
- * @proxy: A #MetaDBusIdleMonitorProxy.
- * @out_id: (out): Return location for return parameter or %NULL to ignore.
- * @cancellable: (allow-none): A #GCancellable or %NULL.
- * @error: Return location for error or %NULL.
- *
- * Synchronously invokes the AddUserActiveWatch() D-Bus method on @proxy. The calling thread is blocked until a reply is received.
- *
- * See meta_dbus_idle_monitor_call_add_user_active_watch() for the asynchronous version of this method.
- *
- * Returns: (skip): %TRUE if the call succeded, %FALSE if @error is set.
- */
-gboolean
-meta_dbus_idle_monitor_call_add_user_active_watch_sync (
-    MetaDBusIdleMonitor *proxy,
-    guint *out_id,
-    GCancellable *cancellable,
-    GError **error)
-{
-  GVariant *_ret;
-  _ret = g_dbus_proxy_call_sync (G_DBUS_PROXY (proxy),
-    "AddUserActiveWatch",
-    g_variant_new ("()"),
-    G_DBUS_CALL_FLAGS_NONE,
-    -1,
-    cancellable,
-    error);
-  if (_ret == NULL)
-    goto _out;
-  g_variant_get (_ret,
-                 "(u)",
-                 out_id);
-  g_variant_unref (_ret);
-_out:
-  return _ret != NULL;
-}
-
-/**
- * meta_dbus_idle_monitor_call_remove_watch:
- * @proxy: A #MetaDBusIdleMonitorProxy.
- * @arg_id: Argument to pass with the method invocation.
- * @cancellable: (allow-none): A #GCancellable or %NULL.
- * @callback: A #GAsyncReadyCallback to call when the request is satisfied or %NULL.
- * @user_data: User data to pass to @callback.
- *
- * Asynchronously invokes the RemoveWatch() D-Bus method on @proxy.
- * When the operation is finished, @callback will be invoked in the thread-default main loop of the thread you are calling this method from.
- * You can then call meta_dbus_idle_monitor_call_remove_watch_finish() to get the result of the operation.
- *
- * See meta_dbus_idle_monitor_call_remove_watch_sync() for the synchronous, blocking version of this method.
- */
-void
-meta_dbus_idle_monitor_call_remove_watch (
-    MetaDBusIdleMonitor *proxy,
-    guint arg_id,
-    GCancellable *cancellable,
-    GAsyncReadyCallback callback,
-    gpointer user_data)
-{
-  g_dbus_proxy_call (G_DBUS_PROXY (proxy),
-    "RemoveWatch",
-    g_variant_new ("(u)",
-                   arg_id),
-    G_DBUS_CALL_FLAGS_NONE,
-    -1,
-    cancellable,
-    callback,
-    user_data);
-}
-
-/**
- * meta_dbus_idle_monitor_call_remove_watch_finish:
- * @proxy: A #MetaDBusIdleMonitorProxy.
- * @res: The #GAsyncResult obtained from the #GAsyncReadyCallback passed to meta_dbus_idle_monitor_call_remove_watch().
- * @error: Return location for error or %NULL.
- *
- * Finishes an operation started with meta_dbus_idle_monitor_call_remove_watch().
- *
- * Returns: (skip): %TRUE if the call succeded, %FALSE if @error is set.
- */
-gboolean
-meta_dbus_idle_monitor_call_remove_watch_finish (
-    MetaDBusIdleMonitor *proxy,
-    GAsyncResult *res,
-    GError **error)
-{
-  GVariant *_ret;
-  _ret = g_dbus_proxy_call_finish (G_DBUS_PROXY (proxy), res, error);
-  if (_ret == NULL)
-    goto _out;
-  g_variant_get (_ret,
-                 "()");
-  g_variant_unref (_ret);
-_out:
-  return _ret != NULL;
-}
-
-/**
- * meta_dbus_idle_monitor_call_remove_watch_sync:
- * @proxy: A #MetaDBusIdleMonitorProxy.
- * @arg_id: Argument to pass with the method invocation.
- * @cancellable: (allow-none): A #GCancellable or %NULL.
- * @error: Return location for error or %NULL.
- *
- * Synchronously invokes the RemoveWatch() D-Bus method on @proxy. The calling thread is blocked until a reply is received.
- *
- * See meta_dbus_idle_monitor_call_remove_watch() for the asynchronous version of this method.
- *
- * Returns: (skip): %TRUE if the call succeded, %FALSE if @error is set.
- */
-gboolean
-meta_dbus_idle_monitor_call_remove_watch_sync (
-    MetaDBusIdleMonitor *proxy,
-    guint arg_id,
-    GCancellable *cancellable,
-    GError **error)
-{
-  GVariant *_ret;
-  _ret = g_dbus_proxy_call_sync (G_DBUS_PROXY (proxy),
-    "RemoveWatch",
-    g_variant_new ("(u)",
-                   arg_id),
-    G_DBUS_CALL_FLAGS_NONE,
-    -1,
-    cancellable,
-    error);
-  if (_ret == NULL)
-    goto _out;
-  g_variant_get (_ret,
-                 "()");
-  g_variant_unref (_ret);
-_out:
-  return _ret != NULL;
-}
-
-/**
- * meta_dbus_idle_monitor_complete_get_idletime:
- * @object: A #MetaDBusIdleMonitor.
- * @invocation: (transfer full): A #GDBusMethodInvocation.
- * @idletime: Parameter to return.
- *
- * Helper function used in service implementations to finish handling invocations of the GetIdletime() D-Bus method. If you instead want to finish handling an invocation by returning an error, use g_dbus_method_invocation_return_error() or similar.
- *
- * This method will free @invocation, you cannot use it afterwards.
- */
-void
-meta_dbus_idle_monitor_complete_get_idletime (
-    MetaDBusIdleMonitor *object,
-    GDBusMethodInvocation *invocation,
-    guint64 idletime)
-{
-  g_dbus_method_invocation_return_value (invocation,
-    g_variant_new ("(t)",
-                   idletime));
-}
-
-/**
- * meta_dbus_idle_monitor_complete_add_idle_watch:
- * @object: A #MetaDBusIdleMonitor.
- * @invocation: (transfer full): A #GDBusMethodInvocation.
- * @id: Parameter to return.
- *
- * Helper function used in service implementations to finish handling invocations of the AddIdleWatch() D-Bus method. If you instead want to finish handling an invocation by returning an error, use g_dbus_method_invocation_return_error() or similar.
- *
- * This method will free @invocation, you cannot use it afterwards.
- */
-void
-meta_dbus_idle_monitor_complete_add_idle_watch (
-    MetaDBusIdleMonitor *object,
-    GDBusMethodInvocation *invocation,
-    guint id)
-{
-  g_dbus_method_invocation_return_value (invocation,
-    g_variant_new ("(u)",
-                   id));
-}
-
-/**
- * meta_dbus_idle_monitor_complete_add_user_active_watch:
- * @object: A #MetaDBusIdleMonitor.
- * @invocation: (transfer full): A #GDBusMethodInvocation.
- * @id: Parameter to return.
- *
- * Helper function used in service implementations to finish handling invocations of the AddUserActiveWatch() D-Bus method. If you instead want to finish handling an invocation by returning an error, use g_dbus_method_invocation_return_error() or similar.
- *
- * This method will free @invocation, you cannot use it afterwards.
- */
-void
-meta_dbus_idle_monitor_complete_add_user_active_watch (
-    MetaDBusIdleMonitor *object,
-    GDBusMethodInvocation *invocation,
-    guint id)
-{
-  g_dbus_method_invocation_return_value (invocation,
-    g_variant_new ("(u)",
-                   id));
-}
-
-/**
- * meta_dbus_idle_monitor_complete_remove_watch:
- * @object: A #MetaDBusIdleMonitor.
- * @invocation: (transfer full): A #GDBusMethodInvocation.
- *
- * Helper function used in service implementations to finish handling invocations of the RemoveWatch() D-Bus method. If you instead want to finish handling an invocation by returning an error, use g_dbus_method_invocation_return_error() or similar.
- *
- * This method will free @invocation, you cannot use it afterwards.
- */
-void
-meta_dbus_idle_monitor_complete_remove_watch (
-    MetaDBusIdleMonitor *object,
-    GDBusMethodInvocation *invocation)
-{
-  g_dbus_method_invocation_return_value (invocation,
-    g_variant_new ("()"));
-}
-
-/* ------------------------------------------------------------------------ */
-
-/**
- * MetaDBusIdleMonitorProxy:
- *
- * The #MetaDBusIdleMonitorProxy structure contains only private data and should only be accessed using the provided API.
- */
-
-/**
- * MetaDBusIdleMonitorProxyClass:
- * @parent_class: The parent class.
- *
- * Class structure for #MetaDBusIdleMonitorProxy.
- */
-
-struct _MetaDBusIdleMonitorProxyPrivate
-{
-  GData *qdata;
-};
-
-static void meta_dbus_idle_monitor_proxy_iface_init (MetaDBusIdleMonitorIface *iface);
-
-#if GLIB_VERSION_MAX_ALLOWED >= GLIB_VERSION_2_38
-G_DEFINE_TYPE_WITH_CODE (MetaDBusIdleMonitorProxy, meta_dbus_idle_monitor_proxy, G_TYPE_DBUS_PROXY,
-                         G_ADD_PRIVATE (MetaDBusIdleMonitorProxy)
-                         G_IMPLEMENT_INTERFACE (META_DBUS_TYPE_IDLE_MONITOR, meta_dbus_idle_monitor_proxy_iface_init));
-
-#else
-G_DEFINE_TYPE_WITH_CODE (MetaDBusIdleMonitorProxy, meta_dbus_idle_monitor_proxy, G_TYPE_DBUS_PROXY,
-                         G_IMPLEMENT_INTERFACE (META_DBUS_TYPE_IDLE_MONITOR, meta_dbus_idle_monitor_proxy_iface_init));
-
-#endif
-static void
-meta_dbus_idle_monitor_proxy_finalize (GObject *object)
-{
-  MetaDBusIdleMonitorProxy *proxy = META_DBUS_IDLE_MONITOR_PROXY (object);
-  g_datalist_clear (&proxy->priv->qdata);
-  G_OBJECT_CLASS (meta_dbus_idle_monitor_proxy_parent_class)->finalize (object);
-}
-
-static void
-meta_dbus_idle_monitor_proxy_get_property (GObject      *object,
-  guint         prop_id,
-  GValue       *value,
-  GParamSpec   *pspec G_GNUC_UNUSED)
-{
-}
-
-static void
-meta_dbus_idle_monitor_proxy_set_property (GObject      *object,
-  guint         prop_id,
-  const GValue *value,
-  GParamSpec   *pspec G_GNUC_UNUSED)
-{
-}
-
-static void
-meta_dbus_idle_monitor_proxy_g_signal (GDBusProxy *proxy,
-  const gchar *sender_name G_GNUC_UNUSED,
-  const gchar *signal_name,
-  GVariant *parameters)
-{
-  _ExtendedGDBusSignalInfo *info;
-  GVariantIter iter;
-  GVariant *child;
-  GValue *paramv;
-  guint num_params;
-  guint n;
-  guint signal_id;
-  info = (_ExtendedGDBusSignalInfo *) g_dbus_interface_info_lookup_signal ((GDBusInterfaceInfo *) &_meta_dbus_idle_monitor_interface_info.parent_struct, signal_name);
-  if (info == NULL)
-    return;
-  num_params = g_variant_n_children (parameters);
-  paramv = g_new0 (GValue, num_params + 1);
-  g_value_init (¶mv[0], META_DBUS_TYPE_IDLE_MONITOR);
-  g_value_set_object (¶mv[0], proxy);
-  g_variant_iter_init (&iter, parameters);
-  n = 1;
-  while ((child = g_variant_iter_next_value (&iter)) != NULL)
-    {
-      _ExtendedGDBusArgInfo *arg_info = (_ExtendedGDBusArgInfo *) info->parent_struct.args[n - 1];
-      if (arg_info->use_gvariant)
-        {
-          g_value_init (¶mv[n], G_TYPE_VARIANT);
-          g_value_set_variant (¶mv[n], child);
-          n++;
-        }
-      else
-        g_dbus_gvariant_to_gvalue (child, ¶mv[n++]);
-      g_variant_unref (child);
-    }
-  signal_id = g_signal_lookup (info->signal_name, META_DBUS_TYPE_IDLE_MONITOR);
-  g_signal_emitv (paramv, signal_id, 0, NULL);
-  for (n = 0; n < num_params + 1; n++)
-    g_value_unset (¶mv[n]);
-  g_free (paramv);
-}
-
-static void
-meta_dbus_idle_monitor_proxy_g_properties_changed (GDBusProxy *_proxy,
-  GVariant *changed_properties,
-  const gchar *const *invalidated_properties)
-{
-  MetaDBusIdleMonitorProxy *proxy = META_DBUS_IDLE_MONITOR_PROXY (_proxy);
-  guint n;
-  const gchar *key;
-  GVariantIter *iter;
-  _ExtendedGDBusPropertyInfo *info;
-  g_variant_get (changed_properties, "a{sv}", &iter);
-  while (g_variant_iter_next (iter, "{&sv}", &key, NULL))
-    {
-      info = (_ExtendedGDBusPropertyInfo *) g_dbus_interface_info_lookup_property ((GDBusInterfaceInfo *) &_meta_dbus_idle_monitor_interface_info.parent_struct, key);
-      g_datalist_remove_data (&proxy->priv->qdata, key);
-      if (info != NULL)
-        g_object_notify (G_OBJECT (proxy), info->hyphen_name);
-    }
-  g_variant_iter_free (iter);
-  for (n = 0; invalidated_properties[n] != NULL; n++)
-    {
-      info = (_ExtendedGDBusPropertyInfo *) g_dbus_interface_info_lookup_property ((GDBusInterfaceInfo *) &_meta_dbus_idle_monitor_interface_info.parent_struct, invalidated_properties[n]);
-      g_datalist_remove_data (&proxy->priv->qdata, invalidated_properties[n]);
-      if (info != NULL)
-        g_object_notify (G_OBJECT (proxy), info->hyphen_name);
-    }
-}
-
-static void
-meta_dbus_idle_monitor_proxy_init (MetaDBusIdleMonitorProxy *proxy)
-{
-#if GLIB_VERSION_MAX_ALLOWED >= GLIB_VERSION_2_38
-  proxy->priv = meta_dbus_idle_monitor_proxy_get_instance_private (proxy);
-#else
-  proxy->priv = G_TYPE_INSTANCE_GET_PRIVATE (proxy, META_DBUS_TYPE_IDLE_MONITOR_PROXY, MetaDBusIdleMonitorProxyPrivate);
-#endif
-
-  g_dbus_proxy_set_interface_info (G_DBUS_PROXY (proxy), meta_dbus_idle_monitor_interface_info ());
-}
-
-static void
-meta_dbus_idle_monitor_proxy_class_init (MetaDBusIdleMonitorProxyClass *klass)
-{
-  GObjectClass *gobject_class;
-  GDBusProxyClass *proxy_class;
-
-  gobject_class = G_OBJECT_CLASS (klass);
-  gobject_class->finalize     = meta_dbus_idle_monitor_proxy_finalize;
-  gobject_class->get_property = meta_dbus_idle_monitor_proxy_get_property;
-  gobject_class->set_property = meta_dbus_idle_monitor_proxy_set_property;
-
-  proxy_class = G_DBUS_PROXY_CLASS (klass);
-  proxy_class->g_signal = meta_dbus_idle_monitor_proxy_g_signal;
-  proxy_class->g_properties_changed = meta_dbus_idle_monitor_proxy_g_properties_changed;
-
-#if GLIB_VERSION_MAX_ALLOWED < GLIB_VERSION_2_38
-  g_type_class_add_private (klass, sizeof (MetaDBusIdleMonitorProxyPrivate));
-#endif
-}
-
-static void
-meta_dbus_idle_monitor_proxy_iface_init (MetaDBusIdleMonitorIface *iface)
-{
-}
-
-/**
- * meta_dbus_idle_monitor_proxy_new:
- * @connection: A #GDBusConnection.
- * @flags: Flags from the #GDBusProxyFlags enumeration.
- * @name: (allow-none): A bus name (well-known or unique) or %NULL if @connection is not a message bus connection.
- * @object_path: An object path.
- * @cancellable: (allow-none): A #GCancellable or %NULL.
- * @callback: A #GAsyncReadyCallback to call when the request is satisfied.
- * @user_data: User data to pass to @callback.
- *
- * Asynchronously creates a proxy for the D-Bus interface org.gnome.Mutter.IdleMonitor. See g_dbus_proxy_new() for more details.
- *
- * When the operation is finished, @callback will be invoked in the thread-default main loop of the thread you are calling this method from.
- * You can then call meta_dbus_idle_monitor_proxy_new_finish() to get the result of the operation.
- *
- * See meta_dbus_idle_monitor_proxy_new_sync() for the synchronous, blocking version of this constructor.
- */
-void
-meta_dbus_idle_monitor_proxy_new (
-    GDBusConnection     *connection,
-    GDBusProxyFlags      flags,
-    const gchar         *name,
-    const gchar         *object_path,
-    GCancellable        *cancellable,
-    GAsyncReadyCallback  callback,
-    gpointer             user_data)
-{
-  g_async_initable_new_async (META_DBUS_TYPE_IDLE_MONITOR_PROXY, G_PRIORITY_DEFAULT, cancellable, callback, user_data, "g-flags", flags, "g-name", name, "g-connection", connection, "g-object-path", object_path, "g-interface-name", "org.gnome.Mutter.IdleMonitor", NULL);
-}
-
-/**
- * meta_dbus_idle_monitor_proxy_new_finish:
- * @res: The #GAsyncResult obtained from the #GAsyncReadyCallback passed to meta_dbus_idle_monitor_proxy_new().
- * @error: Return location for error or %NULL
- *
- * Finishes an operation started with meta_dbus_idle_monitor_proxy_new().
- *
- * Returns: (transfer full) (type MetaDBusIdleMonitorProxy): The constructed proxy object or %NULL if @error is set.
- */
-MetaDBusIdleMonitor *
-meta_dbus_idle_monitor_proxy_new_finish (
-    GAsyncResult        *res,
-    GError             **error)
-{
-  GObject *ret;
-  GObject *source_object;
-  source_object = g_async_result_get_source_object (res);
-  ret = g_async_initable_new_finish (G_ASYNC_INITABLE (source_object), res, error);
-  g_object_unref (source_object);
-  if (ret != NULL)
-    return META_DBUS_IDLE_MONITOR (ret);
-  else
-    return NULL;
-}
-
-/**
- * meta_dbus_idle_monitor_proxy_new_sync:
- * @connection: A #GDBusConnection.
- * @flags: Flags from the #GDBusProxyFlags enumeration.
- * @name: (allow-none): A bus name (well-known or unique) or %NULL if @connection is not a message bus connection.
- * @object_path: An object path.
- * @cancellable: (allow-none): A #GCancellable or %NULL.
- * @error: Return location for error or %NULL
- *
- * Synchronously creates a proxy for the D-Bus interface org.gnome.Mutter.IdleMonitor. See g_dbus_proxy_new_sync() for more details.
- *
- * The calling thread is blocked until a reply is received.
- *
- * See meta_dbus_idle_monitor_proxy_new() for the asynchronous version of this constructor.
- *
- * Returns: (transfer full) (type MetaDBusIdleMonitorProxy): The constructed proxy object or %NULL if @error is set.
- */
-MetaDBusIdleMonitor *
-meta_dbus_idle_monitor_proxy_new_sync (
-    GDBusConnection     *connection,
-    GDBusProxyFlags      flags,
-    const gchar         *name,
-    const gchar         *object_path,
-    GCancellable        *cancellable,
-    GError             **error)
-{
-  GInitable *ret;
-  ret = g_initable_new (META_DBUS_TYPE_IDLE_MONITOR_PROXY, cancellable, error, "g-flags", flags, "g-name", name, "g-connection", connection, "g-object-path", object_path, "g-interface-name", "org.gnome.Mutter.IdleMonitor", NULL);
-  if (ret != NULL)
-    return META_DBUS_IDLE_MONITOR (ret);
-  else
-    return NULL;
-}
-
-
-/**
- * meta_dbus_idle_monitor_proxy_new_for_bus:
- * @bus_type: A #GBusType.
- * @flags: Flags from the #GDBusProxyFlags enumeration.
- * @name: A bus name (well-known or unique).
- * @object_path: An object path.
- * @cancellable: (allow-none): A #GCancellable or %NULL.
- * @callback: A #GAsyncReadyCallback to call when the request is satisfied.
- * @user_data: User data to pass to @callback.
- *
- * Like meta_dbus_idle_monitor_proxy_new() but takes a #GBusType instead of a #GDBusConnection.
- *
- * When the operation is finished, @callback will be invoked in the thread-default main loop of the thread you are calling this method from.
- * You can then call meta_dbus_idle_monitor_proxy_new_for_bus_finish() to get the result of the operation.
- *
- * See meta_dbus_idle_monitor_proxy_new_for_bus_sync() for the synchronous, blocking version of this constructor.
- */
-void
-meta_dbus_idle_monitor_proxy_new_for_bus (
-    GBusType             bus_type,
-    GDBusProxyFlags      flags,
-    const gchar         *name,
-    const gchar         *object_path,
-    GCancellable        *cancellable,
-    GAsyncReadyCallback  callback,
-    gpointer             user_data)
-{
-  g_async_initable_new_async (META_DBUS_TYPE_IDLE_MONITOR_PROXY, G_PRIORITY_DEFAULT, cancellable, callback, user_data, "g-flags", flags, "g-name", name, "g-bus-type", bus_type, "g-object-path", object_path, "g-interface-name", "org.gnome.Mutter.IdleMonitor", NULL);
-}
-
-/**
- * meta_dbus_idle_monitor_proxy_new_for_bus_finish:
- * @res: The #GAsyncResult obtained from the #GAsyncReadyCallback passed to meta_dbus_idle_monitor_proxy_new_for_bus().
- * @error: Return location for error or %NULL
- *
- * Finishes an operation started with meta_dbus_idle_monitor_proxy_new_for_bus().
- *
- * Returns: (transfer full) (type MetaDBusIdleMonitorProxy): The constructed proxy object or %NULL if @error is set.
- */
-MetaDBusIdleMonitor *
-meta_dbus_idle_monitor_proxy_new_for_bus_finish (
-    GAsyncResult        *res,
-    GError             **error)
-{
-  GObject *ret;
-  GObject *source_object;
-  source_object = g_async_result_get_source_object (res);
-  ret = g_async_initable_new_finish (G_ASYNC_INITABLE (source_object), res, error);
-  g_object_unref (source_object);
-  if (ret != NULL)
-    return META_DBUS_IDLE_MONITOR (ret);
-  else
-    return NULL;
-}
-
-/**
- * meta_dbus_idle_monitor_proxy_new_for_bus_sync:
- * @bus_type: A #GBusType.
- * @flags: Flags from the #GDBusProxyFlags enumeration.
- * @name: A bus name (well-known or unique).
- * @object_path: An object path.
- * @cancellable: (allow-none): A #GCancellable or %NULL.
- * @error: Return location for error or %NULL
- *
- * Like meta_dbus_idle_monitor_proxy_new_sync() but takes a #GBusType instead of a #GDBusConnection.
- *
- * The calling thread is blocked until a reply is received.
- *
- * See meta_dbus_idle_monitor_proxy_new_for_bus() for the asynchronous version of this constructor.
- *
- * Returns: (transfer full) (type MetaDBusIdleMonitorProxy): The constructed proxy object or %NULL if @error is set.
- */
-MetaDBusIdleMonitor *
-meta_dbus_idle_monitor_proxy_new_for_bus_sync (
-    GBusType             bus_type,
-    GDBusProxyFlags      flags,
-    const gchar         *name,
-    const gchar         *object_path,
-    GCancellable        *cancellable,
-    GError             **error)
-{
-  GInitable *ret;
-  ret = g_initable_new (META_DBUS_TYPE_IDLE_MONITOR_PROXY, cancellable, error, "g-flags", flags, "g-name", name, "g-bus-type", bus_type, "g-object-path", object_path, "g-interface-name", "org.gnome.Mutter.IdleMonitor", NULL);
-  if (ret != NULL)
-    return META_DBUS_IDLE_MONITOR (ret);
-  else
-    return NULL;
-}
-
-
-/* ------------------------------------------------------------------------ */
-
-/**
- * MetaDBusIdleMonitorSkeleton:
- *
- * The #MetaDBusIdleMonitorSkeleton structure contains only private data and should only be accessed using the provided API.
- */
-
-/**
- * MetaDBusIdleMonitorSkeletonClass:
- * @parent_class: The parent class.
- *
- * Class structure for #MetaDBusIdleMonitorSkeleton.
- */
-
-struct _MetaDBusIdleMonitorSkeletonPrivate
-{
-  GValue *properties;
-  GList *changed_properties;
-  GSource *changed_properties_idle_source;
-  GMainContext *context;
-  GMutex lock;
-};
-
-static void
-_meta_dbus_idle_monitor_skeleton_handle_method_call (
-  GDBusConnection *connection G_GNUC_UNUSED,
-  const gchar *sender G_GNUC_UNUSED,
-  const gchar *object_path G_GNUC_UNUSED,
-  const gchar *interface_name,
-  const gchar *method_name,
-  GVariant *parameters,
-  GDBusMethodInvocation *invocation,
-  gpointer user_data)
-{
-  MetaDBusIdleMonitorSkeleton *skeleton = META_DBUS_IDLE_MONITOR_SKELETON (user_data);
-  _ExtendedGDBusMethodInfo *info;
-  GVariantIter iter;
-  GVariant *child;
-  GValue *paramv;
-  guint num_params;
-  guint num_extra;
-  guint n;
-  guint signal_id;
-  GValue return_value = G_VALUE_INIT;
-  info = (_ExtendedGDBusMethodInfo *) g_dbus_method_invocation_get_method_info (invocation);
-  g_assert (info != NULL);
-  num_params = g_variant_n_children (parameters);
-  num_extra = info->pass_fdlist ? 3 : 2;  paramv = g_new0 (GValue, num_params + num_extra);
-  n = 0;
-  g_value_init (¶mv[n], META_DBUS_TYPE_IDLE_MONITOR);
-  g_value_set_object (¶mv[n++], skeleton);
-  g_value_init (¶mv[n], G_TYPE_DBUS_METHOD_INVOCATION);
-  g_value_set_object (¶mv[n++], invocation);
-  if (info->pass_fdlist)
-    {
-#ifdef G_OS_UNIX
-      g_value_init (¶mv[n], G_TYPE_UNIX_FD_LIST);
-      g_value_set_object (¶mv[n++], g_dbus_message_get_unix_fd_list (g_dbus_method_invocation_get_message (invocation)));
-#else
-      g_assert_not_reached ();
-#endif
-    }
-  g_variant_iter_init (&iter, parameters);
-  while ((child = g_variant_iter_next_value (&iter)) != NULL)
-    {
-      _ExtendedGDBusArgInfo *arg_info = (_ExtendedGDBusArgInfo *) info->parent_struct.in_args[n - num_extra];
-      if (arg_info->use_gvariant)
-        {
-          g_value_init (¶mv[n], G_TYPE_VARIANT);
-          g_value_set_variant (¶mv[n], child);
-          n++;
-        }
-      else
-        g_dbus_gvariant_to_gvalue (child, ¶mv[n++]);
-      g_variant_unref (child);
-    }
-  signal_id = g_signal_lookup (info->signal_name, META_DBUS_TYPE_IDLE_MONITOR);
-  g_value_init (&return_value, G_TYPE_BOOLEAN);
-  g_signal_emitv (paramv, signal_id, 0, &return_value);
-  if (!g_value_get_boolean (&return_value))
-    g_dbus_method_invocation_return_error (invocation, G_DBUS_ERROR, G_DBUS_ERROR_UNKNOWN_METHOD, "Method %s is not implemented on interface %s", method_name, interface_name);
-  g_value_unset (&return_value);
-  for (n = 0; n < num_params + num_extra; n++)
-    g_value_unset (¶mv[n]);
-  g_free (paramv);
-}
-
-static GVariant *
-_meta_dbus_idle_monitor_skeleton_handle_get_property (
-  GDBusConnection *connection G_GNUC_UNUSED,
-  const gchar *sender G_GNUC_UNUSED,
-  const gchar *object_path G_GNUC_UNUSED,
-  const gchar *interface_name G_GNUC_UNUSED,
-  const gchar *property_name,
-  GError **error,
-  gpointer user_data)
-{
-  MetaDBusIdleMonitorSkeleton *skeleton = META_DBUS_IDLE_MONITOR_SKELETON (user_data);
-  GValue value = G_VALUE_INIT;
-  GParamSpec *pspec;
-  _ExtendedGDBusPropertyInfo *info;
-  GVariant *ret;
-  ret = NULL;
-  info = (_ExtendedGDBusPropertyInfo *) g_dbus_interface_info_lookup_property ((GDBusInterfaceInfo *) &_meta_dbus_idle_monitor_interface_info.parent_struct, property_name);
-  g_assert (info != NULL);
-  pspec = g_object_class_find_property (G_OBJECT_GET_CLASS (skeleton), info->hyphen_name);
-  if (pspec == NULL)
-    {
-      g_set_error (error, G_DBUS_ERROR, G_DBUS_ERROR_INVALID_ARGS, "No property with name %s", property_name);
-    }
-  else
-    {
-      g_value_init (&value, pspec->value_type);
-      g_object_get_property (G_OBJECT (skeleton), info->hyphen_name, &value);
-      ret = g_dbus_gvalue_to_gvariant (&value, G_VARIANT_TYPE (info->parent_struct.signature));
-      g_value_unset (&value);
-    }
-  return ret;
-}
-
-static gboolean
-_meta_dbus_idle_monitor_skeleton_handle_set_property (
-  GDBusConnection *connection G_GNUC_UNUSED,
-  const gchar *sender G_GNUC_UNUSED,
-  const gchar *object_path G_GNUC_UNUSED,
-  const gchar *interface_name G_GNUC_UNUSED,
-  const gchar *property_name,
-  GVariant *variant,
-  GError **error,
-  gpointer user_data)
-{
-  MetaDBusIdleMonitorSkeleton *skeleton = META_DBUS_IDLE_MONITOR_SKELETON (user_data);
-  GValue value = G_VALUE_INIT;
-  GParamSpec *pspec;
-  _ExtendedGDBusPropertyInfo *info;
-  gboolean ret;
-  ret = FALSE;
-  info = (_ExtendedGDBusPropertyInfo *) g_dbus_interface_info_lookup_property ((GDBusInterfaceInfo *) &_meta_dbus_idle_monitor_interface_info.parent_struct, property_name);
-  g_assert (info != NULL);
-  pspec = g_object_class_find_property (G_OBJECT_GET_CLASS (skeleton), info->hyphen_name);
-  if (pspec == NULL)
-    {
-      g_set_error (error, G_DBUS_ERROR, G_DBUS_ERROR_INVALID_ARGS, "No property with name %s", property_name);
-    }
-  else
-    {
-      if (info->use_gvariant)
-        g_value_set_variant (&value, variant);
-      else
-        g_dbus_gvariant_to_gvalue (variant, &value);
-      g_object_set_property (G_OBJECT (skeleton), info->hyphen_name, &value);
-      g_value_unset (&value);
-      ret = TRUE;
-    }
-  return ret;
-}
-
-static const GDBusInterfaceVTable _meta_dbus_idle_monitor_skeleton_vtable =
-{
-  _meta_dbus_idle_monitor_skeleton_handle_method_call,
-  _meta_dbus_idle_monitor_skeleton_handle_get_property,
-  _meta_dbus_idle_monitor_skeleton_handle_set_property,
-  {NULL}
-};
-
-static GDBusInterfaceInfo *
-meta_dbus_idle_monitor_skeleton_dbus_interface_get_info (GDBusInterfaceSkeleton *skeleton G_GNUC_UNUSED)
-{
-  return meta_dbus_idle_monitor_interface_info ();
-}
-
-static GDBusInterfaceVTable *
-meta_dbus_idle_monitor_skeleton_dbus_interface_get_vtable (GDBusInterfaceSkeleton *skeleton G_GNUC_UNUSED)
-{
-  return (GDBusInterfaceVTable *) &_meta_dbus_idle_monitor_skeleton_vtable;
-}
-
-static GVariant *
-meta_dbus_idle_monitor_skeleton_dbus_interface_get_properties (GDBusInterfaceSkeleton *_skeleton)
-{
-  MetaDBusIdleMonitorSkeleton *skeleton = META_DBUS_IDLE_MONITOR_SKELETON (_skeleton);
-
-  GVariantBuilder builder;
-  guint n;
-  g_variant_builder_init (&builder, G_VARIANT_TYPE ("a{sv}"));
-  if (_meta_dbus_idle_monitor_interface_info.parent_struct.properties == NULL)
-    goto out;
-  for (n = 0; _meta_dbus_idle_monitor_interface_info.parent_struct.properties[n] != NULL; n++)
-    {
-      GDBusPropertyInfo *info = _meta_dbus_idle_monitor_interface_info.parent_struct.properties[n];
-      if (info->flags & G_DBUS_PROPERTY_INFO_FLAGS_READABLE)
-        {
-          GVariant *value;
-          value = _meta_dbus_idle_monitor_skeleton_handle_get_property (g_dbus_interface_skeleton_get_connection (G_DBUS_INTERFACE_SKELETON (skeleton)), NULL, g_dbus_interface_skeleton_get_object_path (G_DBUS_INTERFACE_SKELETON (skeleton)), "org.gnome.Mutter.IdleMonitor", info->name, NULL, skeleton);
-          if (value != NULL)
-            {
-              g_variant_take_ref (value);
-              g_variant_builder_add (&builder, "{sv}", info->name, value);
-              g_variant_unref (value);
-            }
-        }
-    }
-out:
-  return g_variant_builder_end (&builder);
-}
-
-static void
-meta_dbus_idle_monitor_skeleton_dbus_interface_flush (GDBusInterfaceSkeleton *_skeleton)
-{
-}
-
-static void
-_meta_dbus_idle_monitor_on_signal_watch_fired (
-    MetaDBusIdleMonitor *object,
-    guint arg_id)
-{
-  MetaDBusIdleMonitorSkeleton *skeleton = META_DBUS_IDLE_MONITOR_SKELETON (object);
-
-  GList      *connections, *l;
-  GVariant   *signal_variant;
-  connections = g_dbus_interface_skeleton_get_connections (G_DBUS_INTERFACE_SKELETON (skeleton));
-
-  signal_variant = g_variant_ref_sink (g_variant_new ("(u)",
-                   arg_id));
-  for (l = connections; l != NULL; l = l->next)
-    {
-      GDBusConnection *connection = l->data;
-      g_dbus_connection_emit_signal (connection,
-        NULL, g_dbus_interface_skeleton_get_object_path (G_DBUS_INTERFACE_SKELETON (skeleton)), "org.gnome.Mutter.IdleMonitor", "WatchFired",
-        signal_variant, NULL);
-    }
-  g_variant_unref (signal_variant);
-  g_list_free_full (connections, g_object_unref);
-}
-
-static void meta_dbus_idle_monitor_skeleton_iface_init (MetaDBusIdleMonitorIface *iface);
-#if GLIB_VERSION_MAX_ALLOWED >= GLIB_VERSION_2_38
-G_DEFINE_TYPE_WITH_CODE (MetaDBusIdleMonitorSkeleton, meta_dbus_idle_monitor_skeleton, G_TYPE_DBUS_INTERFACE_SKELETON,
-                         G_ADD_PRIVATE (MetaDBusIdleMonitorSkeleton)
-                         G_IMPLEMENT_INTERFACE (META_DBUS_TYPE_IDLE_MONITOR, meta_dbus_idle_monitor_skeleton_iface_init));
-
-#else
-G_DEFINE_TYPE_WITH_CODE (MetaDBusIdleMonitorSkeleton, meta_dbus_idle_monitor_skeleton, G_TYPE_DBUS_INTERFACE_SKELETON,
-                         G_IMPLEMENT_INTERFACE (META_DBUS_TYPE_IDLE_MONITOR, meta_dbus_idle_monitor_skeleton_iface_init));
-
-#endif
-static void
-meta_dbus_idle_monitor_skeleton_finalize (GObject *object)
-{
-  MetaDBusIdleMonitorSkeleton *skeleton = META_DBUS_IDLE_MONITOR_SKELETON (object);
-  g_list_free_full (skeleton->priv->changed_properties, (GDestroyNotify) _changed_property_free);
-  if (skeleton->priv->changed_properties_idle_source != NULL)
-    g_source_destroy (skeleton->priv->changed_properties_idle_source);
-  g_main_context_unref (skeleton->priv->context);
-  g_mutex_clear (&skeleton->priv->lock);
-  G_OBJECT_CLASS (meta_dbus_idle_monitor_skeleton_parent_class)->finalize (object);
-}
-
-static void
-meta_dbus_idle_monitor_skeleton_init (MetaDBusIdleMonitorSkeleton *skeleton)
-{
-#if GLIB_VERSION_MAX_ALLOWED >= GLIB_VERSION_2_38
-  skeleton->priv = meta_dbus_idle_monitor_skeleton_get_instance_private (skeleton);
-#else
-  skeleton->priv = G_TYPE_INSTANCE_GET_PRIVATE (skeleton, META_DBUS_TYPE_IDLE_MONITOR_SKELETON, MetaDBusIdleMonitorSkeletonPrivate);
-#endif
-
-  g_mutex_init (&skeleton->priv->lock);
-  skeleton->priv->context = g_main_context_ref_thread_default ();
-}
-
-static void
-meta_dbus_idle_monitor_skeleton_class_init (MetaDBusIdleMonitorSkeletonClass *klass)
-{
-  GObjectClass *gobject_class;
-  GDBusInterfaceSkeletonClass *skeleton_class;
-
-  gobject_class = G_OBJECT_CLASS (klass);
-  gobject_class->finalize = meta_dbus_idle_monitor_skeleton_finalize;
-
-  skeleton_class = G_DBUS_INTERFACE_SKELETON_CLASS (klass);
-  skeleton_class->get_info = meta_dbus_idle_monitor_skeleton_dbus_interface_get_info;
-  skeleton_class->get_properties = meta_dbus_idle_monitor_skeleton_dbus_interface_get_properties;
-  skeleton_class->flush = meta_dbus_idle_monitor_skeleton_dbus_interface_flush;
-  skeleton_class->get_vtable = meta_dbus_idle_monitor_skeleton_dbus_interface_get_vtable;
-
-#if GLIB_VERSION_MAX_ALLOWED < GLIB_VERSION_2_38
-  g_type_class_add_private (klass, sizeof (MetaDBusIdleMonitorSkeletonPrivate));
-#endif
-}
-
-static void
-meta_dbus_idle_monitor_skeleton_iface_init (MetaDBusIdleMonitorIface *iface)
-{
-  iface->watch_fired = _meta_dbus_idle_monitor_on_signal_watch_fired;
-}
-
-/**
- * meta_dbus_idle_monitor_skeleton_new:
- *
- * Creates a skeleton object for the D-Bus interface org.gnome.Mutter.IdleMonitor.
- *
- * Returns: (transfer full) (type MetaDBusIdleMonitorSkeleton): The skeleton object.
- */
-MetaDBusIdleMonitor *
-meta_dbus_idle_monitor_skeleton_new (void)
-{
-  return META_DBUS_IDLE_MONITOR (g_object_new (META_DBUS_TYPE_IDLE_MONITOR_SKELETON, NULL));
-}
-
-/* ------------------------------------------------------------------------
- * Code for Object, ObjectProxy and ObjectSkeleton
- * ------------------------------------------------------------------------
- */
-
-/**
- * SECTION:MetaDBusObject
- * @title: MetaDBusObject
- * @short_description: Specialized GDBusObject types
- *
- * This section contains the #MetaDBusObject, #MetaDBusObjectProxy, and #MetaDBusObjectSkeleton types which make it easier to work with objects implementing generated types for D-Bus interfaces.
- */
-
-/**
- * MetaDBusObject:
- *
- * The #MetaDBusObject type is a specialized container of interfaces.
- */
-
-/**
- * MetaDBusObjectIface:
- * @parent_iface: The parent interface.
- *
- * Virtual table for the #MetaDBusObject interface.
- */
-
-typedef MetaDBusObjectIface MetaDBusObjectInterface;
-G_DEFINE_INTERFACE_WITH_CODE (MetaDBusObject, meta_dbus_object, G_TYPE_OBJECT, g_type_interface_add_prerequisite (g_define_type_id, G_TYPE_DBUS_OBJECT));
-
-static void
-meta_dbus_object_default_init (MetaDBusObjectIface *iface)
-{
-  /**
-   * MetaDBusObject:idle-monitor:
-   *
-   * The #MetaDBusIdleMonitor instance corresponding to the D-Bus interface org.gnome.Mutter.IdleMonitor, if any.
-   *
-   * Connect to the #GObject::notify signal to get informed of property changes.
-   */
-  g_object_interface_install_property (iface, g_param_spec_object ("idle-monitor", "idle-monitor", "idle-monitor", META_DBUS_TYPE_IDLE_MONITOR, G_PARAM_READWRITE|G_PARAM_STATIC_STRINGS));
-
-}
-
-/**
- * meta_dbus_object_get_idle_monitor:
- * @object: A #MetaDBusObject.
- *
- * Gets the #MetaDBusIdleMonitor instance for the D-Bus interface org.gnome.Mutter.IdleMonitor on @object, if any.
- *
- * Returns: (transfer full): A #MetaDBusIdleMonitor that must be freed with g_object_unref() or %NULL if @object does not implement the interface.
- */
-MetaDBusIdleMonitor *meta_dbus_object_get_idle_monitor (MetaDBusObject *object)
-{
-  GDBusInterface *ret;
-  ret = g_dbus_object_get_interface (G_DBUS_OBJECT (object), "org.gnome.Mutter.IdleMonitor");
-  if (ret == NULL)
-    return NULL;
-  return META_DBUS_IDLE_MONITOR (ret);
-}
-
-
-/**
- * meta_dbus_object_peek_idle_monitor: (skip)
- * @object: A #MetaDBusObject.
- *
- * Like meta_dbus_object_get_idle_monitor() but doesn't increase the reference count on the returned object.
- *
- * It is not safe to use the returned object if you are on another thread than the one where the #GDBusObjectManagerClient or #GDBusObjectManagerServer for @object is running.
- *
- * Returns: (transfer none): A #MetaDBusIdleMonitor or %NULL if @object does not implement the interface. Do not free the returned object, it is owned by @object.
- */
-MetaDBusIdleMonitor *meta_dbus_object_peek_idle_monitor (MetaDBusObject *object)
-{
-  GDBusInterface *ret;
-  ret = g_dbus_object_get_interface (G_DBUS_OBJECT (object), "org.gnome.Mutter.IdleMonitor");
-  if (ret == NULL)
-    return NULL;
-  g_object_unref (ret);
-  return META_DBUS_IDLE_MONITOR (ret);
-}
-
-
-static void
-meta_dbus_object_notify (GDBusObject *object, GDBusInterface *interface)
-{
-  _ExtendedGDBusInterfaceInfo *info = (_ExtendedGDBusInterfaceInfo *) g_dbus_interface_get_info (interface);
-  /* info can be NULL if the other end is using a D-Bus interface we don't know
-   * anything about, for example old generated code in this process talking to
-   * newer generated code in the other process. */
-  if (info != NULL)
-    g_object_notify (G_OBJECT (object), info->hyphen_name);
-}
-
-/**
- * MetaDBusObjectProxy:
- *
- * The #MetaDBusObjectProxy structure contains only private data and should only be accessed using the provided API.
- */
-
-/**
- * MetaDBusObjectProxyClass:
- * @parent_class: The parent class.
- *
- * Class structure for #MetaDBusObjectProxy.
- */
-
-static void
-meta_dbus_object_proxy__meta_dbus_object_iface_init (MetaDBusObjectIface *iface G_GNUC_UNUSED)
-{
-}
-
-static void
-meta_dbus_object_proxy__g_dbus_object_iface_init (GDBusObjectIface *iface)
-{
-  iface->interface_added = meta_dbus_object_notify;
-  iface->interface_removed = meta_dbus_object_notify;
-}
-
-
-G_DEFINE_TYPE_WITH_CODE (MetaDBusObjectProxy, meta_dbus_object_proxy, G_TYPE_DBUS_OBJECT_PROXY,
-                         G_IMPLEMENT_INTERFACE (META_DBUS_TYPE_OBJECT, meta_dbus_object_proxy__meta_dbus_object_iface_init)
-                         G_IMPLEMENT_INTERFACE (G_TYPE_DBUS_OBJECT, meta_dbus_object_proxy__g_dbus_object_iface_init));
-
-static void
-meta_dbus_object_proxy_init (MetaDBusObjectProxy *object G_GNUC_UNUSED)
-{
-}
-
-static void
-meta_dbus_object_proxy_set_property (GObject      *gobject,
-  guint         prop_id,
-  const GValue *value G_GNUC_UNUSED,
-  GParamSpec   *pspec)
-{
-  G_OBJECT_WARN_INVALID_PROPERTY_ID (gobject, prop_id, pspec);
-}
-
-static void
-meta_dbus_object_proxy_get_property (GObject      *gobject,
-  guint         prop_id,
-  GValue       *value,
-  GParamSpec   *pspec)
-{
-  MetaDBusObjectProxy *object = META_DBUS_OBJECT_PROXY (gobject);
-  GDBusInterface *interface;
-
-  switch (prop_id)
-    {
-    case 1:
-      interface = g_dbus_object_get_interface (G_DBUS_OBJECT (object), "org.gnome.Mutter.IdleMonitor");
-      g_value_take_object (value, interface);
-      break;
-
-    default:
-      G_OBJECT_WARN_INVALID_PROPERTY_ID (gobject, prop_id, pspec);
-      break;
-  }
-}
-
-static void
-meta_dbus_object_proxy_class_init (MetaDBusObjectProxyClass *klass)
-{
-  GObjectClass *gobject_class = G_OBJECT_CLASS (klass);
-
-  gobject_class->set_property = meta_dbus_object_proxy_set_property;
-  gobject_class->get_property = meta_dbus_object_proxy_get_property;
-
-  g_object_class_override_property (gobject_class, 1, "idle-monitor");
-}
-
-/**
- * meta_dbus_object_proxy_new:
- * @connection: A #GDBusConnection.
- * @object_path: An object path.
- *
- * Creates a new proxy object.
- *
- * Returns: (transfer full): The proxy object.
- */
-MetaDBusObjectProxy *
-meta_dbus_object_proxy_new (GDBusConnection *connection,
-  const gchar *object_path)
-{
-  g_return_val_if_fail (G_IS_DBUS_CONNECTION (connection), NULL);
-  g_return_val_if_fail (g_variant_is_object_path (object_path), NULL);
-  return META_DBUS_OBJECT_PROXY (g_object_new (META_DBUS_TYPE_OBJECT_PROXY, "g-connection", connection, "g-object-path", object_path, NULL));
-}
-
-/**
- * MetaDBusObjectSkeleton:
- *
- * The #MetaDBusObjectSkeleton structure contains only private data and should only be accessed using the provided API.
- */
-
-/**
- * MetaDBusObjectSkeletonClass:
- * @parent_class: The parent class.
- *
- * Class structure for #MetaDBusObjectSkeleton.
- */
-
-static void
-meta_dbus_object_skeleton__meta_dbus_object_iface_init (MetaDBusObjectIface *iface G_GNUC_UNUSED)
-{
-}
-
-
-static void
-meta_dbus_object_skeleton__g_dbus_object_iface_init (GDBusObjectIface *iface)
-{
-  iface->interface_added = meta_dbus_object_notify;
-  iface->interface_removed = meta_dbus_object_notify;
-}
-
-G_DEFINE_TYPE_WITH_CODE (MetaDBusObjectSkeleton, meta_dbus_object_skeleton, G_TYPE_DBUS_OBJECT_SKELETON,
-                         G_IMPLEMENT_INTERFACE (META_DBUS_TYPE_OBJECT, meta_dbus_object_skeleton__meta_dbus_object_iface_init)
-                         G_IMPLEMENT_INTERFACE (G_TYPE_DBUS_OBJECT, meta_dbus_object_skeleton__g_dbus_object_iface_init));
-
-static void
-meta_dbus_object_skeleton_init (MetaDBusObjectSkeleton *object G_GNUC_UNUSED)
-{
-}
-
-static void
-meta_dbus_object_skeleton_set_property (GObject      *gobject,
-  guint         prop_id,
-  const GValue *value,
-  GParamSpec   *pspec)
-{
-  MetaDBusObjectSkeleton *object = META_DBUS_OBJECT_SKELETON (gobject);
-  GDBusInterfaceSkeleton *interface;
-
-  switch (prop_id)
-    {
-    case 1:
-      interface = g_value_get_object (value);
-      if (interface != NULL)
-        {
-          g_warn_if_fail (META_DBUS_IS_IDLE_MONITOR (interface));
-          g_dbus_object_skeleton_add_interface (G_DBUS_OBJECT_SKELETON (object), interface);
-        }
-      else
-        {
-          g_dbus_object_skeleton_remove_interface_by_name (G_DBUS_OBJECT_SKELETON (object), "org.gnome.Mutter.IdleMonitor");
-        }
-      break;
-
-    default:
-      G_OBJECT_WARN_INVALID_PROPERTY_ID (gobject, prop_id, pspec);
-      break;
-  }
-}
-
-static void
-meta_dbus_object_skeleton_get_property (GObject      *gobject,
-  guint         prop_id,
-  GValue       *value,
-  GParamSpec   *pspec)
-{
-  MetaDBusObjectSkeleton *object = META_DBUS_OBJECT_SKELETON (gobject);
-  GDBusInterface *interface;
-
-  switch (prop_id)
-    {
-    case 1:
-      interface = g_dbus_object_get_interface (G_DBUS_OBJECT (object), "org.gnome.Mutter.IdleMonitor");
-      g_value_take_object (value, interface);
-      break;
-
-    default:
-      G_OBJECT_WARN_INVALID_PROPERTY_ID (gobject, prop_id, pspec);
-      break;
-  }
-}
-
-static void
-meta_dbus_object_skeleton_class_init (MetaDBusObjectSkeletonClass *klass)
-{
-  GObjectClass *gobject_class = G_OBJECT_CLASS (klass);
-
-  gobject_class->set_property = meta_dbus_object_skeleton_set_property;
-  gobject_class->get_property = meta_dbus_object_skeleton_get_property;
-
-  g_object_class_override_property (gobject_class, 1, "idle-monitor");
-}
-
-/**
- * meta_dbus_object_skeleton_new:
- * @object_path: An object path.
- *
- * Creates a new skeleton object.
- *
- * Returns: (transfer full): The skeleton object.
- */
-MetaDBusObjectSkeleton *
-meta_dbus_object_skeleton_new (const gchar *object_path)
-{
-  g_return_val_if_fail (g_variant_is_object_path (object_path), NULL);
-  return META_DBUS_OBJECT_SKELETON (g_object_new (META_DBUS_TYPE_OBJECT_SKELETON, "g-object-path", object_path, NULL));
-}
-
-/**
- * meta_dbus_object_skeleton_set_idle_monitor:
- * @object: A #MetaDBusObjectSkeleton.
- * @interface_: (allow-none): A #MetaDBusIdleMonitor or %NULL to clear the interface.
- *
- * Sets the #MetaDBusIdleMonitor instance for the D-Bus interface org.gnome.Mutter.IdleMonitor on @object.
- */
-void meta_dbus_object_skeleton_set_idle_monitor (MetaDBusObjectSkeleton *object, MetaDBusIdleMonitor *interface_)
-{
-  g_object_set (G_OBJECT (object), "idle-monitor", interface_, NULL);
-}
-
-
-/* ------------------------------------------------------------------------
- * Code for ObjectManager client
- * ------------------------------------------------------------------------
- */
-
-/**
- * SECTION:MetaDBusObjectManagerClient
- * @title: MetaDBusObjectManagerClient
- * @short_description: Generated GDBusObjectManagerClient type
- *
- * This section contains a #GDBusObjectManagerClient that uses meta_dbus_object_manager_client_get_proxy_type() as the #GDBusProxyTypeFunc.
- */
-
-/**
- * MetaDBusObjectManagerClient:
- *
- * The #MetaDBusObjectManagerClient structure contains only private data and should only be accessed using the provided API.
- */
-
-/**
- * MetaDBusObjectManagerClientClass:
- * @parent_class: The parent class.
- *
- * Class structure for #MetaDBusObjectManagerClient.
- */
-
-G_DEFINE_TYPE (MetaDBusObjectManagerClient, meta_dbus_object_manager_client, G_TYPE_DBUS_OBJECT_MANAGER_CLIENT);
-
-static void
-meta_dbus_object_manager_client_init (MetaDBusObjectManagerClient *manager G_GNUC_UNUSED)
-{
-}
-
-static void
-meta_dbus_object_manager_client_class_init (MetaDBusObjectManagerClientClass *klass G_GNUC_UNUSED)
-{
-}
-
-/**
- * meta_dbus_object_manager_client_get_proxy_type:
- * @manager: A #GDBusObjectManagerClient.
- * @object_path: The object path of the remote object (unused).
- * @interface_name: (allow-none): Interface name of the remote object or %NULL to get the object proxy #GType.
- * @user_data: User data (unused).
- *
- * A #GDBusProxyTypeFunc that maps @interface_name to the generated #GDBusObjectProxy- and #GDBusProxy-derived types.
- *
- * Returns: A #GDBusProxy-derived #GType if @interface_name is not %NULL, otherwise the #GType for #MetaDBusObjectProxy.
- */
-GType
-meta_dbus_object_manager_client_get_proxy_type (GDBusObjectManagerClient *manager G_GNUC_UNUSED, const gchar *object_path G_GNUC_UNUSED, const gchar *interface_name, gpointer user_data G_GNUC_UNUSED)
-{
-  static gsize once_init_value = 0;
-  static GHashTable *lookup_hash;
-  GType ret;
-
-  if (interface_name == NULL)
-    return META_DBUS_TYPE_OBJECT_PROXY;
-  if (g_once_init_enter (&once_init_value))
-    {
-      lookup_hash = g_hash_table_new (g_str_hash, g_str_equal);
-      g_hash_table_insert (lookup_hash, (gpointer) "org.gnome.Mutter.IdleMonitor", GSIZE_TO_POINTER (META_DBUS_TYPE_IDLE_MONITOR_PROXY));
-      g_once_init_leave (&once_init_value, 1);
-    }
-  ret = (GType) GPOINTER_TO_SIZE (g_hash_table_lookup (lookup_hash, interface_name));
-  if (ret == (GType) 0)
-    ret = G_TYPE_DBUS_PROXY;
-  return ret;
-}
-
-/**
- * meta_dbus_object_manager_client_new:
- * @connection: A #GDBusConnection.
- * @flags: Flags from the #GDBusObjectManagerClientFlags enumeration.
- * @name: (allow-none): A bus name (well-known or unique) or %NULL if @connection is not a message bus connection.
- * @object_path: An object path.
- * @cancellable: (allow-none): A #GCancellable or %NULL.
- * @callback: A #GAsyncReadyCallback to call when the request is satisfied.
- * @user_data: User data to pass to @callback.
- *
- * Asynchronously creates #GDBusObjectManagerClient using meta_dbus_object_manager_client_get_proxy_type() as the #GDBusProxyTypeFunc. See g_dbus_object_manager_client_new() for more details.
- *
- * When the operation is finished, @callback will be invoked in the thread-default main loop of the thread you are calling this method from.
- * You can then call meta_dbus_object_manager_client_new_finish() to get the result of the operation.
- *
- * See meta_dbus_object_manager_client_new_sync() for the synchronous, blocking version of this constructor.
- */
-void
-meta_dbus_object_manager_client_new (
-    GDBusConnection        *connection,
-    GDBusObjectManagerClientFlags  flags,
-    const gchar            *name,
-    const gchar            *object_path,
-    GCancellable           *cancellable,
-    GAsyncReadyCallback     callback,
-    gpointer                user_data)
-{
-  g_async_initable_new_async (META_DBUS_TYPE_OBJECT_MANAGER_CLIENT, G_PRIORITY_DEFAULT, cancellable, callback, user_data, "flags", flags, "name", name, "connection", connection, "object-path", object_path, "get-proxy-type-func", meta_dbus_object_manager_client_get_proxy_type, NULL);
-}
-
-/**
- * meta_dbus_object_manager_client_new_finish:
- * @res: The #GAsyncResult obtained from the #GAsyncReadyCallback passed to meta_dbus_object_manager_client_new().
- * @error: Return location for error or %NULL
- *
- * Finishes an operation started with meta_dbus_object_manager_client_new().
- *
- * Returns: (transfer full) (type MetaDBusObjectManagerClient): The constructed object manager client or %NULL if @error is set.
- */
-GDBusObjectManager *
-meta_dbus_object_manager_client_new_finish (
-    GAsyncResult        *res,
-    GError             **error)
-{
-  GObject *ret;
-  GObject *source_object;
-  source_object = g_async_result_get_source_object (res);
-  ret = g_async_initable_new_finish (G_ASYNC_INITABLE (source_object), res, error);
-  g_object_unref (source_object);
-  if (ret != NULL)
-    return G_DBUS_OBJECT_MANAGER (ret);
-  else
-    return NULL;
-}
-
-/**
- * meta_dbus_object_manager_client_new_sync:
- * @connection: A #GDBusConnection.
- * @flags: Flags from the #GDBusObjectManagerClientFlags enumeration.
- * @name: (allow-none): A bus name (well-known or unique) or %NULL if @connection is not a message bus connection.
- * @object_path: An object path.
- * @cancellable: (allow-none): A #GCancellable or %NULL.
- * @error: Return location for error or %NULL
- *
- * Synchronously creates #GDBusObjectManagerClient using meta_dbus_object_manager_client_get_proxy_type() as the #GDBusProxyTypeFunc. See g_dbus_object_manager_client_new_sync() for more details.
- *
- * The calling thread is blocked until a reply is received.
- *
- * See meta_dbus_object_manager_client_new() for the asynchronous version of this constructor.
- *
- * Returns: (transfer full) (type MetaDBusObjectManagerClient): The constructed object manager client or %NULL if @error is set.
- */
-GDBusObjectManager *
-meta_dbus_object_manager_client_new_sync (
-    GDBusConnection        *connection,
-    GDBusObjectManagerClientFlags  flags,
-    const gchar            *name,
-    const gchar            *object_path,
-    GCancellable           *cancellable,
-    GError                **error)
-{
-  GInitable *ret;
-  ret = g_initable_new (META_DBUS_TYPE_OBJECT_MANAGER_CLIENT, cancellable, error, "flags", flags, "name", name, "connection", connection, "object-path", object_path, "get-proxy-type-func", meta_dbus_object_manager_client_get_proxy_type, NULL);
-  if (ret != NULL)
-    return G_DBUS_OBJECT_MANAGER (ret);
-  else
-    return NULL;
-}
-
-
-/**
- * meta_dbus_object_manager_client_new_for_bus:
- * @bus_type: A #GBusType.
- * @flags: Flags from the #GDBusObjectManagerClientFlags enumeration.
- * @name: A bus name (well-known or unique).
- * @object_path: An object path.
- * @cancellable: (allow-none): A #GCancellable or %NULL.
- * @callback: A #GAsyncReadyCallback to call when the request is satisfied.
- * @user_data: User data to pass to @callback.
- *
- * Like meta_dbus_object_manager_client_new() but takes a #GBusType instead of a #GDBusConnection.
- *
- * When the operation is finished, @callback will be invoked in the thread-default main loop of the thread you are calling this method from.
- * You can then call meta_dbus_object_manager_client_new_for_bus_finish() to get the result of the operation.
- *
- * See meta_dbus_object_manager_client_new_for_bus_sync() for the synchronous, blocking version of this constructor.
- */
-void
-meta_dbus_object_manager_client_new_for_bus (
-    GBusType                bus_type,
-    GDBusObjectManagerClientFlags  flags,
-    const gchar            *name,
-    const gchar            *object_path,
-    GCancellable           *cancellable,
-    GAsyncReadyCallback     callback,
-    gpointer                user_data)
-{
-  g_async_initable_new_async (META_DBUS_TYPE_OBJECT_MANAGER_CLIENT, G_PRIORITY_DEFAULT, cancellable, callback, user_data, "flags", flags, "name", name, "bus-type", bus_type, "object-path", object_path, "get-proxy-type-func", meta_dbus_object_manager_client_get_proxy_type, NULL);
-}
-
-/**
- * meta_dbus_object_manager_client_new_for_bus_finish:
- * @res: The #GAsyncResult obtained from the #GAsyncReadyCallback passed to meta_dbus_object_manager_client_new_for_bus().
- * @error: Return location for error or %NULL
- *
- * Finishes an operation started with meta_dbus_object_manager_client_new_for_bus().
- *
- * Returns: (transfer full) (type MetaDBusObjectManagerClient): The constructed object manager client or %NULL if @error is set.
- */
-GDBusObjectManager *
-meta_dbus_object_manager_client_new_for_bus_finish (
-    GAsyncResult        *res,
-    GError             **error)
-{
-  GObject *ret;
-  GObject *source_object;
-  source_object = g_async_result_get_source_object (res);
-  ret = g_async_initable_new_finish (G_ASYNC_INITABLE (source_object), res, error);
-  g_object_unref (source_object);
-  if (ret != NULL)
-    return G_DBUS_OBJECT_MANAGER (ret);
-  else
-    return NULL;
-}
-
-/**
- * meta_dbus_object_manager_client_new_for_bus_sync:
- * @bus_type: A #GBusType.
- * @flags: Flags from the #GDBusObjectManagerClientFlags enumeration.
- * @name: A bus name (well-known or unique).
- * @object_path: An object path.
- * @cancellable: (allow-none): A #GCancellable or %NULL.
- * @error: Return location for error or %NULL
- *
- * Like meta_dbus_object_manager_client_new_sync() but takes a #GBusType instead of a #GDBusConnection.
- *
- * The calling thread is blocked until a reply is received.
- *
- * See meta_dbus_object_manager_client_new_for_bus() for the asynchronous version of this constructor.
- *
- * Returns: (transfer full) (type MetaDBusObjectManagerClient): The constructed object manager client or %NULL if @error is set.
- */
-GDBusObjectManager *
-meta_dbus_object_manager_client_new_for_bus_sync (
-    GBusType                bus_type,
-    GDBusObjectManagerClientFlags  flags,
-    const gchar            *name,
-    const gchar            *object_path,
-    GCancellable           *cancellable,
-    GError                **error)
-{
-  GInitable *ret;
-  ret = g_initable_new (META_DBUS_TYPE_OBJECT_MANAGER_CLIENT, cancellable, error, "flags", flags, "name", name, "bus-type", bus_type, "object-path", object_path, "get-proxy-type-func", meta_dbus_object_manager_client_get_proxy_type, NULL);
-  if (ret != NULL)
-    return G_DBUS_OBJECT_MANAGER (ret);
-  else
-    return NULL;
-}
-
-
diff -Nru gnome-desktop3-3.12.0/libgnome-desktop/meta-dbus-idle-monitor.h gnome-desktop3-3.8.4/libgnome-desktop/meta-dbus-idle-monitor.h
--- gnome-desktop3-3.12.0/libgnome-desktop/meta-dbus-idle-monitor.h	2014-03-24 14:31:23.000000000 +0000
+++ gnome-desktop3-3.8.4/libgnome-desktop/meta-dbus-idle-monitor.h	1970-01-01 00:00:00.000000000 +0000
@@ -1,408 +0,0 @@
-/*
- * Generated by gdbus-codegen 2.39.92. DO NOT EDIT.
- *
- * The license of this code is the same as for the source it was derived from.
- */
-
-#ifndef __META_DBUS_IDLE_MONITOR_H__
-#define __META_DBUS_IDLE_MONITOR_H__
-
-#include 
-
-G_BEGIN_DECLS
-
-
-/* ------------------------------------------------------------------------ */
-/* Declarations for org.gnome.Mutter.IdleMonitor */
-
-#define META_DBUS_TYPE_IDLE_MONITOR (meta_dbus_idle_monitor_get_type ())
-#define META_DBUS_IDLE_MONITOR(o) (G_TYPE_CHECK_INSTANCE_CAST ((o), META_DBUS_TYPE_IDLE_MONITOR, MetaDBusIdleMonitor))
-#define META_DBUS_IS_IDLE_MONITOR(o) (G_TYPE_CHECK_INSTANCE_TYPE ((o), META_DBUS_TYPE_IDLE_MONITOR))
-#define META_DBUS_IDLE_MONITOR_GET_IFACE(o) (G_TYPE_INSTANCE_GET_INTERFACE ((o), META_DBUS_TYPE_IDLE_MONITOR, MetaDBusIdleMonitorIface))
-
-struct _MetaDBusIdleMonitor;
-typedef struct _MetaDBusIdleMonitor MetaDBusIdleMonitor;
-typedef struct _MetaDBusIdleMonitorIface MetaDBusIdleMonitorIface;
-
-struct _MetaDBusIdleMonitorIface
-{
-  GTypeInterface parent_iface;
-
-
-  gboolean (*handle_add_idle_watch) (
-    MetaDBusIdleMonitor *object,
-    GDBusMethodInvocation *invocation,
-    guint64 arg_interval);
-
-  gboolean (*handle_add_user_active_watch) (
-    MetaDBusIdleMonitor *object,
-    GDBusMethodInvocation *invocation);
-
-  gboolean (*handle_get_idletime) (
-    MetaDBusIdleMonitor *object,
-    GDBusMethodInvocation *invocation);
-
-  gboolean (*handle_remove_watch) (
-    MetaDBusIdleMonitor *object,
-    GDBusMethodInvocation *invocation,
-    guint arg_id);
-
-  void (*watch_fired) (
-    MetaDBusIdleMonitor *object,
-    guint arg_id);
-
-};
-
-GType meta_dbus_idle_monitor_get_type (void) G_GNUC_CONST;
-
-GDBusInterfaceInfo *meta_dbus_idle_monitor_interface_info (void);
-guint meta_dbus_idle_monitor_override_properties (GObjectClass *klass, guint property_id_begin);
-
-
-/* D-Bus method call completion functions: */
-void meta_dbus_idle_monitor_complete_get_idletime (
-    MetaDBusIdleMonitor *object,
-    GDBusMethodInvocation *invocation,
-    guint64 idletime);
-
-void meta_dbus_idle_monitor_complete_add_idle_watch (
-    MetaDBusIdleMonitor *object,
-    GDBusMethodInvocation *invocation,
-    guint id);
-
-void meta_dbus_idle_monitor_complete_add_user_active_watch (
-    MetaDBusIdleMonitor *object,
-    GDBusMethodInvocation *invocation,
-    guint id);
-
-void meta_dbus_idle_monitor_complete_remove_watch (
-    MetaDBusIdleMonitor *object,
-    GDBusMethodInvocation *invocation);
-
-
-
-/* D-Bus signal emissions functions: */
-void meta_dbus_idle_monitor_emit_watch_fired (
-    MetaDBusIdleMonitor *object,
-    guint arg_id);
-
-
-
-/* D-Bus method calls: */
-void meta_dbus_idle_monitor_call_get_idletime (
-    MetaDBusIdleMonitor *proxy,
-    GCancellable *cancellable,
-    GAsyncReadyCallback callback,
-    gpointer user_data);
-
-gboolean meta_dbus_idle_monitor_call_get_idletime_finish (
-    MetaDBusIdleMonitor *proxy,
-    guint64 *out_idletime,
-    GAsyncResult *res,
-    GError **error);
-
-gboolean meta_dbus_idle_monitor_call_get_idletime_sync (
-    MetaDBusIdleMonitor *proxy,
-    guint64 *out_idletime,
-    GCancellable *cancellable,
-    GError **error);
-
-void meta_dbus_idle_monitor_call_add_idle_watch (
-    MetaDBusIdleMonitor *proxy,
-    guint64 arg_interval,
-    GCancellable *cancellable,
-    GAsyncReadyCallback callback,
-    gpointer user_data);
-
-gboolean meta_dbus_idle_monitor_call_add_idle_watch_finish (
-    MetaDBusIdleMonitor *proxy,
-    guint *out_id,
-    GAsyncResult *res,
-    GError **error);
-
-gboolean meta_dbus_idle_monitor_call_add_idle_watch_sync (
-    MetaDBusIdleMonitor *proxy,
-    guint64 arg_interval,
-    guint *out_id,
-    GCancellable *cancellable,
-    GError **error);
-
-void meta_dbus_idle_monitor_call_add_user_active_watch (
-    MetaDBusIdleMonitor *proxy,
-    GCancellable *cancellable,
-    GAsyncReadyCallback callback,
-    gpointer user_data);
-
-gboolean meta_dbus_idle_monitor_call_add_user_active_watch_finish (
-    MetaDBusIdleMonitor *proxy,
-    guint *out_id,
-    GAsyncResult *res,
-    GError **error);
-
-gboolean meta_dbus_idle_monitor_call_add_user_active_watch_sync (
-    MetaDBusIdleMonitor *proxy,
-    guint *out_id,
-    GCancellable *cancellable,
-    GError **error);
-
-void meta_dbus_idle_monitor_call_remove_watch (
-    MetaDBusIdleMonitor *proxy,
-    guint arg_id,
-    GCancellable *cancellable,
-    GAsyncReadyCallback callback,
-    gpointer user_data);
-
-gboolean meta_dbus_idle_monitor_call_remove_watch_finish (
-    MetaDBusIdleMonitor *proxy,
-    GAsyncResult *res,
-    GError **error);
-
-gboolean meta_dbus_idle_monitor_call_remove_watch_sync (
-    MetaDBusIdleMonitor *proxy,
-    guint arg_id,
-    GCancellable *cancellable,
-    GError **error);
-
-
-
-/* ---- */
-
-#define META_DBUS_TYPE_IDLE_MONITOR_PROXY (meta_dbus_idle_monitor_proxy_get_type ())
-#define META_DBUS_IDLE_MONITOR_PROXY(o) (G_TYPE_CHECK_INSTANCE_CAST ((o), META_DBUS_TYPE_IDLE_MONITOR_PROXY, MetaDBusIdleMonitorProxy))
-#define META_DBUS_IDLE_MONITOR_PROXY_CLASS(k) (G_TYPE_CHECK_CLASS_CAST ((k), META_DBUS_TYPE_IDLE_MONITOR_PROXY, MetaDBusIdleMonitorProxyClass))
-#define META_DBUS_IDLE_MONITOR_PROXY_GET_CLASS(o) (G_TYPE_INSTANCE_GET_CLASS ((o), META_DBUS_TYPE_IDLE_MONITOR_PROXY, MetaDBusIdleMonitorProxyClass))
-#define META_DBUS_IS_IDLE_MONITOR_PROXY(o) (G_TYPE_CHECK_INSTANCE_TYPE ((o), META_DBUS_TYPE_IDLE_MONITOR_PROXY))
-#define META_DBUS_IS_IDLE_MONITOR_PROXY_CLASS(k) (G_TYPE_CHECK_CLASS_TYPE ((k), META_DBUS_TYPE_IDLE_MONITOR_PROXY))
-
-typedef struct _MetaDBusIdleMonitorProxy MetaDBusIdleMonitorProxy;
-typedef struct _MetaDBusIdleMonitorProxyClass MetaDBusIdleMonitorProxyClass;
-typedef struct _MetaDBusIdleMonitorProxyPrivate MetaDBusIdleMonitorProxyPrivate;
-
-struct _MetaDBusIdleMonitorProxy
-{
-  /*< private >*/
-  GDBusProxy parent_instance;
-  MetaDBusIdleMonitorProxyPrivate *priv;
-};
-
-struct _MetaDBusIdleMonitorProxyClass
-{
-  GDBusProxyClass parent_class;
-};
-
-GType meta_dbus_idle_monitor_proxy_get_type (void) G_GNUC_CONST;
-
-void meta_dbus_idle_monitor_proxy_new (
-    GDBusConnection     *connection,
-    GDBusProxyFlags      flags,
-    const gchar         *name,
-    const gchar         *object_path,
-    GCancellable        *cancellable,
-    GAsyncReadyCallback  callback,
-    gpointer             user_data);
-MetaDBusIdleMonitor *meta_dbus_idle_monitor_proxy_new_finish (
-    GAsyncResult        *res,
-    GError             **error);
-MetaDBusIdleMonitor *meta_dbus_idle_monitor_proxy_new_sync (
-    GDBusConnection     *connection,
-    GDBusProxyFlags      flags,
-    const gchar         *name,
-    const gchar         *object_path,
-    GCancellable        *cancellable,
-    GError             **error);
-
-void meta_dbus_idle_monitor_proxy_new_for_bus (
-    GBusType             bus_type,
-    GDBusProxyFlags      flags,
-    const gchar         *name,
-    const gchar         *object_path,
-    GCancellable        *cancellable,
-    GAsyncReadyCallback  callback,
-    gpointer             user_data);
-MetaDBusIdleMonitor *meta_dbus_idle_monitor_proxy_new_for_bus_finish (
-    GAsyncResult        *res,
-    GError             **error);
-MetaDBusIdleMonitor *meta_dbus_idle_monitor_proxy_new_for_bus_sync (
-    GBusType             bus_type,
-    GDBusProxyFlags      flags,
-    const gchar         *name,
-    const gchar         *object_path,
-    GCancellable        *cancellable,
-    GError             **error);
-
-
-/* ---- */
-
-#define META_DBUS_TYPE_IDLE_MONITOR_SKELETON (meta_dbus_idle_monitor_skeleton_get_type ())
-#define META_DBUS_IDLE_MONITOR_SKELETON(o) (G_TYPE_CHECK_INSTANCE_CAST ((o), META_DBUS_TYPE_IDLE_MONITOR_SKELETON, MetaDBusIdleMonitorSkeleton))
-#define META_DBUS_IDLE_MONITOR_SKELETON_CLASS(k) (G_TYPE_CHECK_CLASS_CAST ((k), META_DBUS_TYPE_IDLE_MONITOR_SKELETON, MetaDBusIdleMonitorSkeletonClass))
-#define META_DBUS_IDLE_MONITOR_SKELETON_GET_CLASS(o) (G_TYPE_INSTANCE_GET_CLASS ((o), META_DBUS_TYPE_IDLE_MONITOR_SKELETON, MetaDBusIdleMonitorSkeletonClass))
-#define META_DBUS_IS_IDLE_MONITOR_SKELETON(o) (G_TYPE_CHECK_INSTANCE_TYPE ((o), META_DBUS_TYPE_IDLE_MONITOR_SKELETON))
-#define META_DBUS_IS_IDLE_MONITOR_SKELETON_CLASS(k) (G_TYPE_CHECK_CLASS_TYPE ((k), META_DBUS_TYPE_IDLE_MONITOR_SKELETON))
-
-typedef struct _MetaDBusIdleMonitorSkeleton MetaDBusIdleMonitorSkeleton;
-typedef struct _MetaDBusIdleMonitorSkeletonClass MetaDBusIdleMonitorSkeletonClass;
-typedef struct _MetaDBusIdleMonitorSkeletonPrivate MetaDBusIdleMonitorSkeletonPrivate;
-
-struct _MetaDBusIdleMonitorSkeleton
-{
-  /*< private >*/
-  GDBusInterfaceSkeleton parent_instance;
-  MetaDBusIdleMonitorSkeletonPrivate *priv;
-};
-
-struct _MetaDBusIdleMonitorSkeletonClass
-{
-  GDBusInterfaceSkeletonClass parent_class;
-};
-
-GType meta_dbus_idle_monitor_skeleton_get_type (void) G_GNUC_CONST;
-
-MetaDBusIdleMonitor *meta_dbus_idle_monitor_skeleton_new (void);
-
-
-/* ---- */
-
-#define META_DBUS_TYPE_OBJECT (meta_dbus_object_get_type ())
-#define META_DBUS_OBJECT(o) (G_TYPE_CHECK_INSTANCE_CAST ((o), META_DBUS_TYPE_OBJECT, MetaDBusObject))
-#define META_DBUS_IS_OBJECT(o) (G_TYPE_CHECK_INSTANCE_TYPE ((o), META_DBUS_TYPE_OBJECT))
-#define META_DBUS_OBJECT_GET_IFACE(o) (G_TYPE_INSTANCE_GET_INTERFACE ((o), META_DBUS_TYPE_OBJECT, MetaDBusObject))
-
-struct _MetaDBusObject;
-typedef struct _MetaDBusObject MetaDBusObject;
-typedef struct _MetaDBusObjectIface MetaDBusObjectIface;
-
-struct _MetaDBusObjectIface
-{
-  GTypeInterface parent_iface;
-};
-
-GType meta_dbus_object_get_type (void) G_GNUC_CONST;
-
-MetaDBusIdleMonitor *meta_dbus_object_get_idle_monitor (MetaDBusObject *object);
-MetaDBusIdleMonitor *meta_dbus_object_peek_idle_monitor (MetaDBusObject *object);
-
-#define META_DBUS_TYPE_OBJECT_PROXY (meta_dbus_object_proxy_get_type ())
-#define META_DBUS_OBJECT_PROXY(o) (G_TYPE_CHECK_INSTANCE_CAST ((o), META_DBUS_TYPE_OBJECT_PROXY, MetaDBusObjectProxy))
-#define META_DBUS_OBJECT_PROXY_CLASS(k) (G_TYPE_CHECK_CLASS_CAST ((k), META_DBUS_TYPE_OBJECT_PROXY, MetaDBusObjectProxyClass))
-#define META_DBUS_OBJECT_PROXY_GET_CLASS(o) (G_TYPE_INSTANCE_GET_CLASS ((o), META_DBUS_TYPE_OBJECT_PROXY, MetaDBusObjectProxyClass))
-#define META_DBUS_IS_OBJECT_PROXY(o) (G_TYPE_CHECK_INSTANCE_TYPE ((o), META_DBUS_TYPE_OBJECT_PROXY))
-#define META_DBUS_IS_OBJECT_PROXY_CLASS(k) (G_TYPE_CHECK_CLASS_TYPE ((k), META_DBUS_TYPE_OBJECT_PROXY))
-
-typedef struct _MetaDBusObjectProxy MetaDBusObjectProxy;
-typedef struct _MetaDBusObjectProxyClass MetaDBusObjectProxyClass;
-typedef struct _MetaDBusObjectProxyPrivate MetaDBusObjectProxyPrivate;
-
-struct _MetaDBusObjectProxy
-{
-  /*< private >*/
-  GDBusObjectProxy parent_instance;
-  MetaDBusObjectProxyPrivate *priv;
-};
-
-struct _MetaDBusObjectProxyClass
-{
-  GDBusObjectProxyClass parent_class;
-};
-
-GType meta_dbus_object_proxy_get_type (void) G_GNUC_CONST;
-MetaDBusObjectProxy *meta_dbus_object_proxy_new (GDBusConnection *connection, const gchar *object_path);
-
-#define META_DBUS_TYPE_OBJECT_SKELETON (meta_dbus_object_skeleton_get_type ())
-#define META_DBUS_OBJECT_SKELETON(o) (G_TYPE_CHECK_INSTANCE_CAST ((o), META_DBUS_TYPE_OBJECT_SKELETON, MetaDBusObjectSkeleton))
-#define META_DBUS_OBJECT_SKELETON_CLASS(k) (G_TYPE_CHECK_CLASS_CAST ((k), META_DBUS_TYPE_OBJECT_SKELETON, MetaDBusObjectSkeletonClass))
-#define META_DBUS_OBJECT_SKELETON_GET_CLASS(o) (G_TYPE_INSTANCE_GET_CLASS ((o), META_DBUS_TYPE_OBJECT_SKELETON, MetaDBusObjectSkeletonClass))
-#define META_DBUS_IS_OBJECT_SKELETON(o) (G_TYPE_CHECK_INSTANCE_TYPE ((o), META_DBUS_TYPE_OBJECT_SKELETON))
-#define META_DBUS_IS_OBJECT_SKELETON_CLASS(k) (G_TYPE_CHECK_CLASS_TYPE ((k), META_DBUS_TYPE_OBJECT_SKELETON))
-
-typedef struct _MetaDBusObjectSkeleton MetaDBusObjectSkeleton;
-typedef struct _MetaDBusObjectSkeletonClass MetaDBusObjectSkeletonClass;
-typedef struct _MetaDBusObjectSkeletonPrivate MetaDBusObjectSkeletonPrivate;
-
-struct _MetaDBusObjectSkeleton
-{
-  /*< private >*/
-  GDBusObjectSkeleton parent_instance;
-  MetaDBusObjectSkeletonPrivate *priv;
-};
-
-struct _MetaDBusObjectSkeletonClass
-{
-  GDBusObjectSkeletonClass parent_class;
-};
-
-GType meta_dbus_object_skeleton_get_type (void) G_GNUC_CONST;
-MetaDBusObjectSkeleton *meta_dbus_object_skeleton_new (const gchar *object_path);
-void meta_dbus_object_skeleton_set_idle_monitor (MetaDBusObjectSkeleton *object, MetaDBusIdleMonitor *interface_);
-
-/* ---- */
-
-#define META_DBUS_TYPE_OBJECT_MANAGER_CLIENT (meta_dbus_object_manager_client_get_type ())
-#define META_DBUS_OBJECT_MANAGER_CLIENT(o) (G_TYPE_CHECK_INSTANCE_CAST ((o), META_DBUS_TYPE_OBJECT_MANAGER_CLIENT, MetaDBusObjectManagerClient))
-#define META_DBUS_OBJECT_MANAGER_CLIENT_CLASS(k) (G_TYPE_CHECK_CLASS_CAST ((k), META_DBUS_TYPE_OBJECT_MANAGER_CLIENT, MetaDBusObjectManagerClientClass))
-#define META_DBUS_OBJECT_MANAGER_CLIENT_GET_CLASS(o) (G_TYPE_INSTANCE_GET_CLASS ((o), META_DBUS_TYPE_OBJECT_MANAGER_CLIENT, MetaDBusObjectManagerClientClass))
-#define META_DBUS_IS_OBJECT_MANAGER_CLIENT(o) (G_TYPE_CHECK_INSTANCE_TYPE ((o), META_DBUS_TYPE_OBJECT_MANAGER_CLIENT))
-#define META_DBUS_IS_OBJECT_MANAGER_CLIENT_CLASS(k) (G_TYPE_CHECK_CLASS_TYPE ((k), META_DBUS_TYPE_OBJECT_MANAGER_CLIENT))
-
-typedef struct _MetaDBusObjectManagerClient MetaDBusObjectManagerClient;
-typedef struct _MetaDBusObjectManagerClientClass MetaDBusObjectManagerClientClass;
-typedef struct _MetaDBusObjectManagerClientPrivate MetaDBusObjectManagerClientPrivate;
-
-struct _MetaDBusObjectManagerClient
-{
-  /*< private >*/
-  GDBusObjectManagerClient parent_instance;
-  MetaDBusObjectManagerClientPrivate *priv;
-};
-
-struct _MetaDBusObjectManagerClientClass
-{
-  GDBusObjectManagerClientClass parent_class;
-};
-
-GType meta_dbus_object_manager_client_get_type (void) G_GNUC_CONST;
-
-GType meta_dbus_object_manager_client_get_proxy_type (GDBusObjectManagerClient *manager, const gchar *object_path, const gchar *interface_name, gpointer user_data);
-
-void meta_dbus_object_manager_client_new (
-    GDBusConnection        *connection,
-    GDBusObjectManagerClientFlags  flags,
-    const gchar            *name,
-    const gchar            *object_path,
-    GCancellable           *cancellable,
-    GAsyncReadyCallback     callback,
-    gpointer                user_data);
-GDBusObjectManager *meta_dbus_object_manager_client_new_finish (
-    GAsyncResult        *res,
-    GError             **error);
-GDBusObjectManager *meta_dbus_object_manager_client_new_sync (
-    GDBusConnection        *connection,
-    GDBusObjectManagerClientFlags  flags,
-    const gchar            *name,
-    const gchar            *object_path,
-    GCancellable           *cancellable,
-    GError                **error);
-
-void meta_dbus_object_manager_client_new_for_bus (
-    GBusType                bus_type,
-    GDBusObjectManagerClientFlags  flags,
-    const gchar            *name,
-    const gchar            *object_path,
-    GCancellable           *cancellable,
-    GAsyncReadyCallback     callback,
-    gpointer                user_data);
-GDBusObjectManager *meta_dbus_object_manager_client_new_for_bus_finish (
-    GAsyncResult        *res,
-    GError             **error);
-GDBusObjectManager *meta_dbus_object_manager_client_new_for_bus_sync (
-    GBusType                bus_type,
-    GDBusObjectManagerClientFlags  flags,
-    const gchar            *name,
-    const gchar            *object_path,
-    GCancellable           *cancellable,
-    GError                **error);
-
-
-G_END_DECLS
-
-#endif /* __META_DBUS_IDLE_MONITOR_H__ */
diff -Nru gnome-desktop3-3.12.0/libgnome-desktop/meta-dbus-xrandr.c gnome-desktop3-3.8.4/libgnome-desktop/meta-dbus-xrandr.c
--- gnome-desktop3-3.12.0/libgnome-desktop/meta-dbus-xrandr.c	2014-03-24 14:31:23.000000000 +0000
+++ gnome-desktop3-3.8.4/libgnome-desktop/meta-dbus-xrandr.c	1970-01-01 00:00:00.000000000 +0000
@@ -1,2494 +0,0 @@
-/*
- * Generated by gdbus-codegen 2.39.92. DO NOT EDIT.
- *
- * The license of this code is the same as for the source it was derived from.
- */
-
-#ifdef HAVE_CONFIG_H
-#  include "config.h"
-#endif
-
-#include "meta-dbus-xrandr.h"
-
-#include 
-#ifdef G_OS_UNIX
-#  include 
-#endif
-
-typedef struct
-{
-  GDBusArgInfo parent_struct;
-  gboolean use_gvariant;
-} _ExtendedGDBusArgInfo;
-
-typedef struct
-{
-  GDBusMethodInfo parent_struct;
-  const gchar *signal_name;
-  gboolean pass_fdlist;
-} _ExtendedGDBusMethodInfo;
-
-typedef struct
-{
-  GDBusSignalInfo parent_struct;
-  const gchar *signal_name;
-} _ExtendedGDBusSignalInfo;
-
-typedef struct
-{
-  GDBusPropertyInfo parent_struct;
-  const gchar *hyphen_name;
-  gboolean use_gvariant;
-} _ExtendedGDBusPropertyInfo;
-
-typedef struct
-{
-  GDBusInterfaceInfo parent_struct;
-  const gchar *hyphen_name;
-} _ExtendedGDBusInterfaceInfo;
-
-typedef struct
-{
-  const _ExtendedGDBusPropertyInfo *info;
-  guint prop_id;
-  GValue orig_value; /* the value before the change */
-} ChangedProperty;
-
-static void
-_changed_property_free (ChangedProperty *data)
-{
-  g_value_unset (&data->orig_value);
-  g_free (data);
-}
-
-static gboolean
-_g_strv_equal0 (gchar **a, gchar **b)
-{
-  gboolean ret = FALSE;
-  guint n;
-  if (a == NULL && b == NULL)
-    {
-      ret = TRUE;
-      goto out;
-    }
-  if (a == NULL || b == NULL)
-    goto out;
-  if (g_strv_length (a) != g_strv_length (b))
-    goto out;
-  for (n = 0; a[n] != NULL; n++)
-    if (g_strcmp0 (a[n], b[n]) != 0)
-      goto out;
-  ret = TRUE;
-out:
-  return ret;
-}
-
-static gboolean
-_g_variant_equal0 (GVariant *a, GVariant *b)
-{
-  gboolean ret = FALSE;
-  if (a == NULL && b == NULL)
-    {
-      ret = TRUE;
-      goto out;
-    }
-  if (a == NULL || b == NULL)
-    goto out;
-  ret = g_variant_equal (a, b);
-out:
-  return ret;
-}
-
-G_GNUC_UNUSED static gboolean
-_g_value_equal (const GValue *a, const GValue *b)
-{
-  gboolean ret = FALSE;
-  g_assert (G_VALUE_TYPE (a) == G_VALUE_TYPE (b));
-  switch (G_VALUE_TYPE (a))
-    {
-      case G_TYPE_BOOLEAN:
-        ret = (g_value_get_boolean (a) == g_value_get_boolean (b));
-        break;
-      case G_TYPE_UCHAR:
-        ret = (g_value_get_uchar (a) == g_value_get_uchar (b));
-        break;
-      case G_TYPE_INT:
-        ret = (g_value_get_int (a) == g_value_get_int (b));
-        break;
-      case G_TYPE_UINT:
-        ret = (g_value_get_uint (a) == g_value_get_uint (b));
-        break;
-      case G_TYPE_INT64:
-        ret = (g_value_get_int64 (a) == g_value_get_int64 (b));
-        break;
-      case G_TYPE_UINT64:
-        ret = (g_value_get_uint64 (a) == g_value_get_uint64 (b));
-        break;
-      case G_TYPE_DOUBLE:
-        {
-          /* Avoid -Wfloat-equal warnings by doing a direct bit compare */
-          gdouble da = g_value_get_double (a);
-          gdouble db = g_value_get_double (b);
-          ret = memcmp (&da, &db, sizeof (gdouble)) == 0;
-        }
-        break;
-      case G_TYPE_STRING:
-        ret = (g_strcmp0 (g_value_get_string (a), g_value_get_string (b)) == 0);
-        break;
-      case G_TYPE_VARIANT:
-        ret = _g_variant_equal0 (g_value_get_variant (a), g_value_get_variant (b));
-        break;
-      default:
-        if (G_VALUE_TYPE (a) == G_TYPE_STRV)
-          ret = _g_strv_equal0 (g_value_get_boxed (a), g_value_get_boxed (b));
-        else
-          g_critical ("_g_value_equal() does not handle type %s", g_type_name (G_VALUE_TYPE (a)));
-        break;
-    }
-  return ret;
-}
-
-/* ------------------------------------------------------------------------
- * Code for interface org.gnome.Mutter.DisplayConfig
- * ------------------------------------------------------------------------
- */
-
-/**
- * SECTION:MetaDBusDisplayConfig
- * @title: MetaDBusDisplayConfig
- * @short_description: Generated C code for the org.gnome.Mutter.DisplayConfig D-Bus interface
- *
- * This section contains code for working with the org.gnome.Mutter.DisplayConfig D-Bus interface in C.
- */
-
-/* ---- Introspection data for org.gnome.Mutter.DisplayConfig ---- */
-
-static const _ExtendedGDBusArgInfo _meta_dbus_display_config_method_info_get_resources_OUT_ARG_serial =
-{
-  {
-    -1,
-    (gchar *) "serial",
-    (gchar *) "u",
-    NULL
-  },
-  FALSE
-};
-
-static const _ExtendedGDBusArgInfo _meta_dbus_display_config_method_info_get_resources_OUT_ARG_crtcs =
-{
-  {
-    -1,
-    (gchar *) "crtcs",
-    (gchar *) "a(uxiiiiiuaua{sv})",
-    NULL
-  },
-  FALSE
-};
-
-static const _ExtendedGDBusArgInfo _meta_dbus_display_config_method_info_get_resources_OUT_ARG_outputs =
-{
-  {
-    -1,
-    (gchar *) "outputs",
-    (gchar *) "a(uxiausauaua{sv})",
-    NULL
-  },
-  FALSE
-};
-
-static const _ExtendedGDBusArgInfo _meta_dbus_display_config_method_info_get_resources_OUT_ARG_modes =
-{
-  {
-    -1,
-    (gchar *) "modes",
-    (gchar *) "a(uxuud)",
-    NULL
-  },
-  FALSE
-};
-
-static const _ExtendedGDBusArgInfo _meta_dbus_display_config_method_info_get_resources_OUT_ARG_max_screen_width =
-{
-  {
-    -1,
-    (gchar *) "max_screen_width",
-    (gchar *) "i",
-    NULL
-  },
-  FALSE
-};
-
-static const _ExtendedGDBusArgInfo _meta_dbus_display_config_method_info_get_resources_OUT_ARG_max_screen_height =
-{
-  {
-    -1,
-    (gchar *) "max_screen_height",
-    (gchar *) "i",
-    NULL
-  },
-  FALSE
-};
-
-static const _ExtendedGDBusArgInfo * const _meta_dbus_display_config_method_info_get_resources_OUT_ARG_pointers[] =
-{
-  &_meta_dbus_display_config_method_info_get_resources_OUT_ARG_serial,
-  &_meta_dbus_display_config_method_info_get_resources_OUT_ARG_crtcs,
-  &_meta_dbus_display_config_method_info_get_resources_OUT_ARG_outputs,
-  &_meta_dbus_display_config_method_info_get_resources_OUT_ARG_modes,
-  &_meta_dbus_display_config_method_info_get_resources_OUT_ARG_max_screen_width,
-  &_meta_dbus_display_config_method_info_get_resources_OUT_ARG_max_screen_height,
-  NULL
-};
-
-static const _ExtendedGDBusMethodInfo _meta_dbus_display_config_method_info_get_resources =
-{
-  {
-    -1,
-    (gchar *) "GetResources",
-    NULL,
-    (GDBusArgInfo **) &_meta_dbus_display_config_method_info_get_resources_OUT_ARG_pointers,
-    NULL
-  },
-  "handle-get-resources",
-  FALSE
-};
-
-static const _ExtendedGDBusArgInfo _meta_dbus_display_config_method_info_apply_configuration_IN_ARG_serial =
-{
-  {
-    -1,
-    (gchar *) "serial",
-    (gchar *) "u",
-    NULL
-  },
-  FALSE
-};
-
-static const _ExtendedGDBusArgInfo _meta_dbus_display_config_method_info_apply_configuration_IN_ARG_persistent =
-{
-  {
-    -1,
-    (gchar *) "persistent",
-    (gchar *) "b",
-    NULL
-  },
-  FALSE
-};
-
-static const _ExtendedGDBusArgInfo _meta_dbus_display_config_method_info_apply_configuration_IN_ARG_crtcs =
-{
-  {
-    -1,
-    (gchar *) "crtcs",
-    (gchar *) "a(uiiiuaua{sv})",
-    NULL
-  },
-  FALSE
-};
-
-static const _ExtendedGDBusArgInfo _meta_dbus_display_config_method_info_apply_configuration_IN_ARG_outputs =
-{
-  {
-    -1,
-    (gchar *) "outputs",
-    (gchar *) "a(ua{sv})",
-    NULL
-  },
-  FALSE
-};
-
-static const _ExtendedGDBusArgInfo * const _meta_dbus_display_config_method_info_apply_configuration_IN_ARG_pointers[] =
-{
-  &_meta_dbus_display_config_method_info_apply_configuration_IN_ARG_serial,
-  &_meta_dbus_display_config_method_info_apply_configuration_IN_ARG_persistent,
-  &_meta_dbus_display_config_method_info_apply_configuration_IN_ARG_crtcs,
-  &_meta_dbus_display_config_method_info_apply_configuration_IN_ARG_outputs,
-  NULL
-};
-
-static const _ExtendedGDBusMethodInfo _meta_dbus_display_config_method_info_apply_configuration =
-{
-  {
-    -1,
-    (gchar *) "ApplyConfiguration",
-    (GDBusArgInfo **) &_meta_dbus_display_config_method_info_apply_configuration_IN_ARG_pointers,
-    NULL,
-    NULL
-  },
-  "handle-apply-configuration",
-  FALSE
-};
-
-static const _ExtendedGDBusArgInfo _meta_dbus_display_config_method_info_change_backlight_IN_ARG_serial =
-{
-  {
-    -1,
-    (gchar *) "serial",
-    (gchar *) "u",
-    NULL
-  },
-  FALSE
-};
-
-static const _ExtendedGDBusArgInfo _meta_dbus_display_config_method_info_change_backlight_IN_ARG_output =
-{
-  {
-    -1,
-    (gchar *) "output",
-    (gchar *) "u",
-    NULL
-  },
-  FALSE
-};
-
-static const _ExtendedGDBusArgInfo _meta_dbus_display_config_method_info_change_backlight_IN_ARG_value =
-{
-  {
-    -1,
-    (gchar *) "value",
-    (gchar *) "i",
-    NULL
-  },
-  FALSE
-};
-
-static const _ExtendedGDBusArgInfo * const _meta_dbus_display_config_method_info_change_backlight_IN_ARG_pointers[] =
-{
-  &_meta_dbus_display_config_method_info_change_backlight_IN_ARG_serial,
-  &_meta_dbus_display_config_method_info_change_backlight_IN_ARG_output,
-  &_meta_dbus_display_config_method_info_change_backlight_IN_ARG_value,
-  NULL
-};
-
-static const _ExtendedGDBusArgInfo _meta_dbus_display_config_method_info_change_backlight_OUT_ARG_new_value =
-{
-  {
-    -1,
-    (gchar *) "new_value",
-    (gchar *) "i",
-    NULL
-  },
-  FALSE
-};
-
-static const _ExtendedGDBusArgInfo * const _meta_dbus_display_config_method_info_change_backlight_OUT_ARG_pointers[] =
-{
-  &_meta_dbus_display_config_method_info_change_backlight_OUT_ARG_new_value,
-  NULL
-};
-
-static const _ExtendedGDBusMethodInfo _meta_dbus_display_config_method_info_change_backlight =
-{
-  {
-    -1,
-    (gchar *) "ChangeBacklight",
-    (GDBusArgInfo **) &_meta_dbus_display_config_method_info_change_backlight_IN_ARG_pointers,
-    (GDBusArgInfo **) &_meta_dbus_display_config_method_info_change_backlight_OUT_ARG_pointers,
-    NULL
-  },
-  "handle-change-backlight",
-  FALSE
-};
-
-static const _ExtendedGDBusArgInfo _meta_dbus_display_config_method_info_get_crtc_gamma_IN_ARG_serial =
-{
-  {
-    -1,
-    (gchar *) "serial",
-    (gchar *) "u",
-    NULL
-  },
-  FALSE
-};
-
-static const _ExtendedGDBusArgInfo _meta_dbus_display_config_method_info_get_crtc_gamma_IN_ARG_crtc =
-{
-  {
-    -1,
-    (gchar *) "crtc",
-    (gchar *) "u",
-    NULL
-  },
-  FALSE
-};
-
-static const _ExtendedGDBusArgInfo * const _meta_dbus_display_config_method_info_get_crtc_gamma_IN_ARG_pointers[] =
-{
-  &_meta_dbus_display_config_method_info_get_crtc_gamma_IN_ARG_serial,
-  &_meta_dbus_display_config_method_info_get_crtc_gamma_IN_ARG_crtc,
-  NULL
-};
-
-static const _ExtendedGDBusArgInfo _meta_dbus_display_config_method_info_get_crtc_gamma_OUT_ARG_red =
-{
-  {
-    -1,
-    (gchar *) "red",
-    (gchar *) "aq",
-    NULL
-  },
-  FALSE
-};
-
-static const _ExtendedGDBusArgInfo _meta_dbus_display_config_method_info_get_crtc_gamma_OUT_ARG_green =
-{
-  {
-    -1,
-    (gchar *) "green",
-    (gchar *) "aq",
-    NULL
-  },
-  FALSE
-};
-
-static const _ExtendedGDBusArgInfo _meta_dbus_display_config_method_info_get_crtc_gamma_OUT_ARG_blue =
-{
-  {
-    -1,
-    (gchar *) "blue",
-    (gchar *) "aq",
-    NULL
-  },
-  FALSE
-};
-
-static const _ExtendedGDBusArgInfo * const _meta_dbus_display_config_method_info_get_crtc_gamma_OUT_ARG_pointers[] =
-{
-  &_meta_dbus_display_config_method_info_get_crtc_gamma_OUT_ARG_red,
-  &_meta_dbus_display_config_method_info_get_crtc_gamma_OUT_ARG_green,
-  &_meta_dbus_display_config_method_info_get_crtc_gamma_OUT_ARG_blue,
-  NULL
-};
-
-static const _ExtendedGDBusMethodInfo _meta_dbus_display_config_method_info_get_crtc_gamma =
-{
-  {
-    -1,
-    (gchar *) "GetCrtcGamma",
-    (GDBusArgInfo **) &_meta_dbus_display_config_method_info_get_crtc_gamma_IN_ARG_pointers,
-    (GDBusArgInfo **) &_meta_dbus_display_config_method_info_get_crtc_gamma_OUT_ARG_pointers,
-    NULL
-  },
-  "handle-get-crtc-gamma",
-  FALSE
-};
-
-static const _ExtendedGDBusArgInfo _meta_dbus_display_config_method_info_set_crtc_gamma_IN_ARG_serial =
-{
-  {
-    -1,
-    (gchar *) "serial",
-    (gchar *) "u",
-    NULL
-  },
-  FALSE
-};
-
-static const _ExtendedGDBusArgInfo _meta_dbus_display_config_method_info_set_crtc_gamma_IN_ARG_crtc =
-{
-  {
-    -1,
-    (gchar *) "crtc",
-    (gchar *) "u",
-    NULL
-  },
-  FALSE
-};
-
-static const _ExtendedGDBusArgInfo _meta_dbus_display_config_method_info_set_crtc_gamma_IN_ARG_red =
-{
-  {
-    -1,
-    (gchar *) "red",
-    (gchar *) "aq",
-    NULL
-  },
-  FALSE
-};
-
-static const _ExtendedGDBusArgInfo _meta_dbus_display_config_method_info_set_crtc_gamma_IN_ARG_green =
-{
-  {
-    -1,
-    (gchar *) "green",
-    (gchar *) "aq",
-    NULL
-  },
-  FALSE
-};
-
-static const _ExtendedGDBusArgInfo _meta_dbus_display_config_method_info_set_crtc_gamma_IN_ARG_blue =
-{
-  {
-    -1,
-    (gchar *) "blue",
-    (gchar *) "aq",
-    NULL
-  },
-  FALSE
-};
-
-static const _ExtendedGDBusArgInfo * const _meta_dbus_display_config_method_info_set_crtc_gamma_IN_ARG_pointers[] =
-{
-  &_meta_dbus_display_config_method_info_set_crtc_gamma_IN_ARG_serial,
-  &_meta_dbus_display_config_method_info_set_crtc_gamma_IN_ARG_crtc,
-  &_meta_dbus_display_config_method_info_set_crtc_gamma_IN_ARG_red,
-  &_meta_dbus_display_config_method_info_set_crtc_gamma_IN_ARG_green,
-  &_meta_dbus_display_config_method_info_set_crtc_gamma_IN_ARG_blue,
-  NULL
-};
-
-static const _ExtendedGDBusMethodInfo _meta_dbus_display_config_method_info_set_crtc_gamma =
-{
-  {
-    -1,
-    (gchar *) "SetCrtcGamma",
-    (GDBusArgInfo **) &_meta_dbus_display_config_method_info_set_crtc_gamma_IN_ARG_pointers,
-    NULL,
-    NULL
-  },
-  "handle-set-crtc-gamma",
-  FALSE
-};
-
-static const _ExtendedGDBusMethodInfo * const _meta_dbus_display_config_method_info_pointers[] =
-{
-  &_meta_dbus_display_config_method_info_get_resources,
-  &_meta_dbus_display_config_method_info_apply_configuration,
-  &_meta_dbus_display_config_method_info_change_backlight,
-  &_meta_dbus_display_config_method_info_get_crtc_gamma,
-  &_meta_dbus_display_config_method_info_set_crtc_gamma,
-  NULL
-};
-
-static const _ExtendedGDBusSignalInfo _meta_dbus_display_config_signal_info_monitors_changed =
-{
-  {
-    -1,
-    (gchar *) "MonitorsChanged",
-    NULL,
-    NULL
-  },
-  "monitors-changed"
-};
-
-static const _ExtendedGDBusSignalInfo * const _meta_dbus_display_config_signal_info_pointers[] =
-{
-  &_meta_dbus_display_config_signal_info_monitors_changed,
-  NULL
-};
-
-static const _ExtendedGDBusPropertyInfo _meta_dbus_display_config_property_info_power_save_mode =
-{
-  {
-    -1,
-    (gchar *) "PowerSaveMode",
-    (gchar *) "i",
-    G_DBUS_PROPERTY_INFO_FLAGS_READABLE | G_DBUS_PROPERTY_INFO_FLAGS_WRITABLE,
-    NULL
-  },
-  "power-save-mode",
-  FALSE
-};
-
-static const _ExtendedGDBusPropertyInfo * const _meta_dbus_display_config_property_info_pointers[] =
-{
-  &_meta_dbus_display_config_property_info_power_save_mode,
-  NULL
-};
-
-static const _ExtendedGDBusInterfaceInfo _meta_dbus_display_config_interface_info =
-{
-  {
-    -1,
-    (gchar *) "org.gnome.Mutter.DisplayConfig",
-    (GDBusMethodInfo **) &_meta_dbus_display_config_method_info_pointers,
-    (GDBusSignalInfo **) &_meta_dbus_display_config_signal_info_pointers,
-    (GDBusPropertyInfo **) &_meta_dbus_display_config_property_info_pointers,
-    NULL
-  },
-  "display-config",
-};
-
-
-/**
- * meta_dbus_display_config_interface_info:
- *
- * Gets a machine-readable description of the org.gnome.Mutter.DisplayConfig D-Bus interface.
- *
- * Returns: (transfer none): A #GDBusInterfaceInfo. Do not free.
- */
-GDBusInterfaceInfo *
-meta_dbus_display_config_interface_info (void)
-{
-  return (GDBusInterfaceInfo *) &_meta_dbus_display_config_interface_info.parent_struct;
-}
-
-/**
- * meta_dbus_display_config_override_properties:
- * @klass: The class structure for a #GObject-derived class.
- * @property_id_begin: The property id to assign to the first overridden property.
- *
- * Overrides all #GObject properties in the #MetaDBusDisplayConfig interface for a concrete class.
- * The properties are overridden in the order they are defined.
- *
- * Returns: The last property id.
- */
-guint
-meta_dbus_display_config_override_properties (GObjectClass *klass, guint property_id_begin)
-{
-  g_object_class_override_property (klass, property_id_begin++, "power-save-mode");
-  return property_id_begin - 1;
-}
-
-
-
-/**
- * MetaDBusDisplayConfig:
- *
- * Abstract interface type for the D-Bus interface org.gnome.Mutter.DisplayConfig.
- */
-
-/**
- * MetaDBusDisplayConfigIface:
- * @parent_iface: The parent interface.
- * @handle_apply_configuration: Handler for the #MetaDBusDisplayConfig::handle-apply-configuration signal.
- * @handle_change_backlight: Handler for the #MetaDBusDisplayConfig::handle-change-backlight signal.
- * @handle_get_crtc_gamma: Handler for the #MetaDBusDisplayConfig::handle-get-crtc-gamma signal.
- * @handle_get_resources: Handler for the #MetaDBusDisplayConfig::handle-get-resources signal.
- * @handle_set_crtc_gamma: Handler for the #MetaDBusDisplayConfig::handle-set-crtc-gamma signal.
- * @get_power_save_mode: Getter for the #MetaDBusDisplayConfig:power-save-mode property.
- * @monitors_changed: Handler for the #MetaDBusDisplayConfig::monitors-changed signal.
- *
- * Virtual table for the D-Bus interface org.gnome.Mutter.DisplayConfig.
- */
-
-typedef MetaDBusDisplayConfigIface MetaDBusDisplayConfigInterface;
-G_DEFINE_INTERFACE (MetaDBusDisplayConfig, meta_dbus_display_config, G_TYPE_OBJECT);
-
-static void
-meta_dbus_display_config_default_init (MetaDBusDisplayConfigIface *iface)
-{
-  /* GObject signals for incoming D-Bus method calls: */
-  /**
-   * MetaDBusDisplayConfig::handle-get-resources:
-   * @object: A #MetaDBusDisplayConfig.
-   * @invocation: A #GDBusMethodInvocation.
-   *
-   * Signal emitted when a remote caller is invoking the GetResources() D-Bus method.
-   *
-   * If a signal handler returns %TRUE, it means the signal handler will handle the invocation (e.g. take a reference to @invocation and eventually call meta_dbus_display_config_complete_get_resources() or e.g. g_dbus_method_invocation_return_error() on it) and no order signal handlers will run. If no signal handler handles the invocation, the %G_DBUS_ERROR_UNKNOWN_METHOD error is returned.
-   *
-   * Returns: %TRUE if the invocation was handled, %FALSE to let other signal handlers run.
-   */
-  g_signal_new ("handle-get-resources",
-    G_TYPE_FROM_INTERFACE (iface),
-    G_SIGNAL_RUN_LAST,
-    G_STRUCT_OFFSET (MetaDBusDisplayConfigIface, handle_get_resources),
-    g_signal_accumulator_true_handled,
-    NULL,
-    g_cclosure_marshal_generic,
-    G_TYPE_BOOLEAN,
-    1,
-    G_TYPE_DBUS_METHOD_INVOCATION);
-
-  /**
-   * MetaDBusDisplayConfig::handle-apply-configuration:
-   * @object: A #MetaDBusDisplayConfig.
-   * @invocation: A #GDBusMethodInvocation.
-   * @arg_serial: Argument passed by remote caller.
-   * @arg_persistent: Argument passed by remote caller.
-   * @arg_crtcs: Argument passed by remote caller.
-   * @arg_outputs: Argument passed by remote caller.
-   *
-   * Signal emitted when a remote caller is invoking the ApplyConfiguration() D-Bus method.
-   *
-   * If a signal handler returns %TRUE, it means the signal handler will handle the invocation (e.g. take a reference to @invocation and eventually call meta_dbus_display_config_complete_apply_configuration() or e.g. g_dbus_method_invocation_return_error() on it) and no order signal handlers will run. If no signal handler handles the invocation, the %G_DBUS_ERROR_UNKNOWN_METHOD error is returned.
-   *
-   * Returns: %TRUE if the invocation was handled, %FALSE to let other signal handlers run.
-   */
-  g_signal_new ("handle-apply-configuration",
-    G_TYPE_FROM_INTERFACE (iface),
-    G_SIGNAL_RUN_LAST,
-    G_STRUCT_OFFSET (MetaDBusDisplayConfigIface, handle_apply_configuration),
-    g_signal_accumulator_true_handled,
-    NULL,
-    g_cclosure_marshal_generic,
-    G_TYPE_BOOLEAN,
-    5,
-    G_TYPE_DBUS_METHOD_INVOCATION, G_TYPE_UINT, G_TYPE_BOOLEAN, G_TYPE_VARIANT, G_TYPE_VARIANT);
-
-  /**
-   * MetaDBusDisplayConfig::handle-change-backlight:
-   * @object: A #MetaDBusDisplayConfig.
-   * @invocation: A #GDBusMethodInvocation.
-   * @arg_serial: Argument passed by remote caller.
-   * @arg_output: Argument passed by remote caller.
-   * @arg_value: Argument passed by remote caller.
-   *
-   * Signal emitted when a remote caller is invoking the ChangeBacklight() D-Bus method.
-   *
-   * If a signal handler returns %TRUE, it means the signal handler will handle the invocation (e.g. take a reference to @invocation and eventually call meta_dbus_display_config_complete_change_backlight() or e.g. g_dbus_method_invocation_return_error() on it) and no order signal handlers will run. If no signal handler handles the invocation, the %G_DBUS_ERROR_UNKNOWN_METHOD error is returned.
-   *
-   * Returns: %TRUE if the invocation was handled, %FALSE to let other signal handlers run.
-   */
-  g_signal_new ("handle-change-backlight",
-    G_TYPE_FROM_INTERFACE (iface),
-    G_SIGNAL_RUN_LAST,
-    G_STRUCT_OFFSET (MetaDBusDisplayConfigIface, handle_change_backlight),
-    g_signal_accumulator_true_handled,
-    NULL,
-    g_cclosure_marshal_generic,
-    G_TYPE_BOOLEAN,
-    4,
-    G_TYPE_DBUS_METHOD_INVOCATION, G_TYPE_UINT, G_TYPE_UINT, G_TYPE_INT);
-
-  /**
-   * MetaDBusDisplayConfig::handle-get-crtc-gamma:
-   * @object: A #MetaDBusDisplayConfig.
-   * @invocation: A #GDBusMethodInvocation.
-   * @arg_serial: Argument passed by remote caller.
-   * @arg_crtc: Argument passed by remote caller.
-   *
-   * Signal emitted when a remote caller is invoking the GetCrtcGamma() D-Bus method.
-   *
-   * If a signal handler returns %TRUE, it means the signal handler will handle the invocation (e.g. take a reference to @invocation and eventually call meta_dbus_display_config_complete_get_crtc_gamma() or e.g. g_dbus_method_invocation_return_error() on it) and no order signal handlers will run. If no signal handler handles the invocation, the %G_DBUS_ERROR_UNKNOWN_METHOD error is returned.
-   *
-   * Returns: %TRUE if the invocation was handled, %FALSE to let other signal handlers run.
-   */
-  g_signal_new ("handle-get-crtc-gamma",
-    G_TYPE_FROM_INTERFACE (iface),
-    G_SIGNAL_RUN_LAST,
-    G_STRUCT_OFFSET (MetaDBusDisplayConfigIface, handle_get_crtc_gamma),
-    g_signal_accumulator_true_handled,
-    NULL,
-    g_cclosure_marshal_generic,
-    G_TYPE_BOOLEAN,
-    3,
-    G_TYPE_DBUS_METHOD_INVOCATION, G_TYPE_UINT, G_TYPE_UINT);
-
-  /**
-   * MetaDBusDisplayConfig::handle-set-crtc-gamma:
-   * @object: A #MetaDBusDisplayConfig.
-   * @invocation: A #GDBusMethodInvocation.
-   * @arg_serial: Argument passed by remote caller.
-   * @arg_crtc: Argument passed by remote caller.
-   * @arg_red: Argument passed by remote caller.
-   * @arg_green: Argument passed by remote caller.
-   * @arg_blue: Argument passed by remote caller.
-   *
-   * Signal emitted when a remote caller is invoking the SetCrtcGamma() D-Bus method.
-   *
-   * If a signal handler returns %TRUE, it means the signal handler will handle the invocation (e.g. take a reference to @invocation and eventually call meta_dbus_display_config_complete_set_crtc_gamma() or e.g. g_dbus_method_invocation_return_error() on it) and no order signal handlers will run. If no signal handler handles the invocation, the %G_DBUS_ERROR_UNKNOWN_METHOD error is returned.
-   *
-   * Returns: %TRUE if the invocation was handled, %FALSE to let other signal handlers run.
-   */
-  g_signal_new ("handle-set-crtc-gamma",
-    G_TYPE_FROM_INTERFACE (iface),
-    G_SIGNAL_RUN_LAST,
-    G_STRUCT_OFFSET (MetaDBusDisplayConfigIface, handle_set_crtc_gamma),
-    g_signal_accumulator_true_handled,
-    NULL,
-    g_cclosure_marshal_generic,
-    G_TYPE_BOOLEAN,
-    6,
-    G_TYPE_DBUS_METHOD_INVOCATION, G_TYPE_UINT, G_TYPE_UINT, G_TYPE_VARIANT, G_TYPE_VARIANT, G_TYPE_VARIANT);
-
-  /* GObject signals for received D-Bus signals: */
-  /**
-   * MetaDBusDisplayConfig::monitors-changed:
-   * @object: A #MetaDBusDisplayConfig.
-   *
-   * On the client-side, this signal is emitted whenever the D-Bus signal "MonitorsChanged" is received.
-   *
-   * On the service-side, this signal can be used with e.g. g_signal_emit_by_name() to make the object emit the D-Bus signal.
-   */
-  g_signal_new ("monitors-changed",
-    G_TYPE_FROM_INTERFACE (iface),
-    G_SIGNAL_RUN_LAST,
-    G_STRUCT_OFFSET (MetaDBusDisplayConfigIface, monitors_changed),
-    NULL,
-    NULL,
-    g_cclosure_marshal_generic,
-    G_TYPE_NONE,
-    0);
-
-  /* GObject properties for D-Bus properties: */
-  /**
-   * MetaDBusDisplayConfig:power-save-mode:
-   *
-   * Represents the D-Bus property "PowerSaveMode".
-   *
-   * Since the D-Bus property for this #GObject property is both readable and writable, it is meaningful to both read from it and write to it on both the service- and client-side.
-   */
-  g_object_interface_install_property (iface,
-    g_param_spec_int ("power-save-mode", "PowerSaveMode", "PowerSaveMode", G_MININT32, G_MAXINT32, 0, G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
-}
-
-/**
- * meta_dbus_display_config_get_power_save_mode: (skip)
- * @object: A #MetaDBusDisplayConfig.
- *
- * Gets the value of the "PowerSaveMode" D-Bus property.
- *
- * Since this D-Bus property is both readable and writable, it is meaningful to use this function on both the client- and service-side.
- *
- * Returns: The property value.
- */
-gint 
-meta_dbus_display_config_get_power_save_mode (MetaDBusDisplayConfig *object)
-{
-  return META_DBUS_DISPLAY_CONFIG_GET_IFACE (object)->get_power_save_mode (object);
-}
-
-/**
- * meta_dbus_display_config_set_power_save_mode: (skip)
- * @object: A #MetaDBusDisplayConfig.
- * @value: The value to set.
- *
- * Sets the "PowerSaveMode" D-Bus property to @value.
- *
- * Since this D-Bus property is both readable and writable, it is meaningful to use this function on both the client- and service-side.
- */
-void
-meta_dbus_display_config_set_power_save_mode (MetaDBusDisplayConfig *object, gint value)
-{
-  g_object_set (G_OBJECT (object), "power-save-mode", value, NULL);
-}
-
-/**
- * meta_dbus_display_config_emit_monitors_changed:
- * @object: A #MetaDBusDisplayConfig.
- *
- * Emits the "MonitorsChanged" D-Bus signal.
- */
-void
-meta_dbus_display_config_emit_monitors_changed (
-    MetaDBusDisplayConfig *object)
-{
-  g_signal_emit_by_name (object, "monitors-changed");
-}
-
-/**
- * meta_dbus_display_config_call_get_resources:
- * @proxy: A #MetaDBusDisplayConfigProxy.
- * @cancellable: (allow-none): A #GCancellable or %NULL.
- * @callback: A #GAsyncReadyCallback to call when the request is satisfied or %NULL.
- * @user_data: User data to pass to @callback.
- *
- * Asynchronously invokes the GetResources() D-Bus method on @proxy.
- * When the operation is finished, @callback will be invoked in the thread-default main loop of the thread you are calling this method from.
- * You can then call meta_dbus_display_config_call_get_resources_finish() to get the result of the operation.
- *
- * See meta_dbus_display_config_call_get_resources_sync() for the synchronous, blocking version of this method.
- */
-void
-meta_dbus_display_config_call_get_resources (
-    MetaDBusDisplayConfig *proxy,
-    GCancellable *cancellable,
-    GAsyncReadyCallback callback,
-    gpointer user_data)
-{
-  g_dbus_proxy_call (G_DBUS_PROXY (proxy),
-    "GetResources",
-    g_variant_new ("()"),
-    G_DBUS_CALL_FLAGS_NONE,
-    -1,
-    cancellable,
-    callback,
-    user_data);
-}
-
-/**
- * meta_dbus_display_config_call_get_resources_finish:
- * @proxy: A #MetaDBusDisplayConfigProxy.
- * @out_serial: (out): Return location for return parameter or %NULL to ignore.
- * @out_crtcs: (out): Return location for return parameter or %NULL to ignore.
- * @out_outputs: (out): Return location for return parameter or %NULL to ignore.
- * @out_modes: (out): Return location for return parameter or %NULL to ignore.
- * @out_max_screen_width: (out): Return location for return parameter or %NULL to ignore.
- * @out_max_screen_height: (out): Return location for return parameter or %NULL to ignore.
- * @res: The #GAsyncResult obtained from the #GAsyncReadyCallback passed to meta_dbus_display_config_call_get_resources().
- * @error: Return location for error or %NULL.
- *
- * Finishes an operation started with meta_dbus_display_config_call_get_resources().
- *
- * Returns: (skip): %TRUE if the call succeded, %FALSE if @error is set.
- */
-gboolean
-meta_dbus_display_config_call_get_resources_finish (
-    MetaDBusDisplayConfig *proxy,
-    guint *out_serial,
-    GVariant **out_crtcs,
-    GVariant **out_outputs,
-    GVariant **out_modes,
-    gint *out_max_screen_width,
-    gint *out_max_screen_height,
-    GAsyncResult *res,
-    GError **error)
-{
-  GVariant *_ret;
-  _ret = g_dbus_proxy_call_finish (G_DBUS_PROXY (proxy), res, error);
-  if (_ret == NULL)
-    goto _out;
-  g_variant_get (_ret,
-                 "(u@a(uxiiiiiuaua{sv})@a(uxiausauaua{sv})@a(uxuud)ii)",
-                 out_serial,
-                 out_crtcs,
-                 out_outputs,
-                 out_modes,
-                 out_max_screen_width,
-                 out_max_screen_height);
-  g_variant_unref (_ret);
-_out:
-  return _ret != NULL;
-}
-
-/**
- * meta_dbus_display_config_call_get_resources_sync:
- * @proxy: A #MetaDBusDisplayConfigProxy.
- * @out_serial: (out): Return location for return parameter or %NULL to ignore.
- * @out_crtcs: (out): Return location for return parameter or %NULL to ignore.
- * @out_outputs: (out): Return location for return parameter or %NULL to ignore.
- * @out_modes: (out): Return location for return parameter or %NULL to ignore.
- * @out_max_screen_width: (out): Return location for return parameter or %NULL to ignore.
- * @out_max_screen_height: (out): Return location for return parameter or %NULL to ignore.
- * @cancellable: (allow-none): A #GCancellable or %NULL.
- * @error: Return location for error or %NULL.
- *
- * Synchronously invokes the GetResources() D-Bus method on @proxy. The calling thread is blocked until a reply is received.
- *
- * See meta_dbus_display_config_call_get_resources() for the asynchronous version of this method.
- *
- * Returns: (skip): %TRUE if the call succeded, %FALSE if @error is set.
- */
-gboolean
-meta_dbus_display_config_call_get_resources_sync (
-    MetaDBusDisplayConfig *proxy,
-    guint *out_serial,
-    GVariant **out_crtcs,
-    GVariant **out_outputs,
-    GVariant **out_modes,
-    gint *out_max_screen_width,
-    gint *out_max_screen_height,
-    GCancellable *cancellable,
-    GError **error)
-{
-  GVariant *_ret;
-  _ret = g_dbus_proxy_call_sync (G_DBUS_PROXY (proxy),
-    "GetResources",
-    g_variant_new ("()"),
-    G_DBUS_CALL_FLAGS_NONE,
-    -1,
-    cancellable,
-    error);
-  if (_ret == NULL)
-    goto _out;
-  g_variant_get (_ret,
-                 "(u@a(uxiiiiiuaua{sv})@a(uxiausauaua{sv})@a(uxuud)ii)",
-                 out_serial,
-                 out_crtcs,
-                 out_outputs,
-                 out_modes,
-                 out_max_screen_width,
-                 out_max_screen_height);
-  g_variant_unref (_ret);
-_out:
-  return _ret != NULL;
-}
-
-/**
- * meta_dbus_display_config_call_apply_configuration:
- * @proxy: A #MetaDBusDisplayConfigProxy.
- * @arg_serial: Argument to pass with the method invocation.
- * @arg_persistent: Argument to pass with the method invocation.
- * @arg_crtcs: Argument to pass with the method invocation.
- * @arg_outputs: Argument to pass with the method invocation.
- * @cancellable: (allow-none): A #GCancellable or %NULL.
- * @callback: A #GAsyncReadyCallback to call when the request is satisfied or %NULL.
- * @user_data: User data to pass to @callback.
- *
- * Asynchronously invokes the ApplyConfiguration() D-Bus method on @proxy.
- * When the operation is finished, @callback will be invoked in the thread-default main loop of the thread you are calling this method from.
- * You can then call meta_dbus_display_config_call_apply_configuration_finish() to get the result of the operation.
- *
- * See meta_dbus_display_config_call_apply_configuration_sync() for the synchronous, blocking version of this method.
- */
-void
-meta_dbus_display_config_call_apply_configuration (
-    MetaDBusDisplayConfig *proxy,
-    guint arg_serial,
-    gboolean arg_persistent,
-    GVariant *arg_crtcs,
-    GVariant *arg_outputs,
-    GCancellable *cancellable,
-    GAsyncReadyCallback callback,
-    gpointer user_data)
-{
-  g_dbus_proxy_call (G_DBUS_PROXY (proxy),
-    "ApplyConfiguration",
-    g_variant_new ("(ub@a(uiiiuaua{sv})@a(ua{sv}))",
-                   arg_serial,
-                   arg_persistent,
-                   arg_crtcs,
-                   arg_outputs),
-    G_DBUS_CALL_FLAGS_NONE,
-    -1,
-    cancellable,
-    callback,
-    user_data);
-}
-
-/**
- * meta_dbus_display_config_call_apply_configuration_finish:
- * @proxy: A #MetaDBusDisplayConfigProxy.
- * @res: The #GAsyncResult obtained from the #GAsyncReadyCallback passed to meta_dbus_display_config_call_apply_configuration().
- * @error: Return location for error or %NULL.
- *
- * Finishes an operation started with meta_dbus_display_config_call_apply_configuration().
- *
- * Returns: (skip): %TRUE if the call succeded, %FALSE if @error is set.
- */
-gboolean
-meta_dbus_display_config_call_apply_configuration_finish (
-    MetaDBusDisplayConfig *proxy,
-    GAsyncResult *res,
-    GError **error)
-{
-  GVariant *_ret;
-  _ret = g_dbus_proxy_call_finish (G_DBUS_PROXY (proxy), res, error);
-  if (_ret == NULL)
-    goto _out;
-  g_variant_get (_ret,
-                 "()");
-  g_variant_unref (_ret);
-_out:
-  return _ret != NULL;
-}
-
-/**
- * meta_dbus_display_config_call_apply_configuration_sync:
- * @proxy: A #MetaDBusDisplayConfigProxy.
- * @arg_serial: Argument to pass with the method invocation.
- * @arg_persistent: Argument to pass with the method invocation.
- * @arg_crtcs: Argument to pass with the method invocation.
- * @arg_outputs: Argument to pass with the method invocation.
- * @cancellable: (allow-none): A #GCancellable or %NULL.
- * @error: Return location for error or %NULL.
- *
- * Synchronously invokes the ApplyConfiguration() D-Bus method on @proxy. The calling thread is blocked until a reply is received.
- *
- * See meta_dbus_display_config_call_apply_configuration() for the asynchronous version of this method.
- *
- * Returns: (skip): %TRUE if the call succeded, %FALSE if @error is set.
- */
-gboolean
-meta_dbus_display_config_call_apply_configuration_sync (
-    MetaDBusDisplayConfig *proxy,
-    guint arg_serial,
-    gboolean arg_persistent,
-    GVariant *arg_crtcs,
-    GVariant *arg_outputs,
-    GCancellable *cancellable,
-    GError **error)
-{
-  GVariant *_ret;
-  _ret = g_dbus_proxy_call_sync (G_DBUS_PROXY (proxy),
-    "ApplyConfiguration",
-    g_variant_new ("(ub@a(uiiiuaua{sv})@a(ua{sv}))",
-                   arg_serial,
-                   arg_persistent,
-                   arg_crtcs,
-                   arg_outputs),
-    G_DBUS_CALL_FLAGS_NONE,
-    -1,
-    cancellable,
-    error);
-  if (_ret == NULL)
-    goto _out;
-  g_variant_get (_ret,
-                 "()");
-  g_variant_unref (_ret);
-_out:
-  return _ret != NULL;
-}
-
-/**
- * meta_dbus_display_config_call_change_backlight:
- * @proxy: A #MetaDBusDisplayConfigProxy.
- * @arg_serial: Argument to pass with the method invocation.
- * @arg_output: Argument to pass with the method invocation.
- * @arg_value: Argument to pass with the method invocation.
- * @cancellable: (allow-none): A #GCancellable or %NULL.
- * @callback: A #GAsyncReadyCallback to call when the request is satisfied or %NULL.
- * @user_data: User data to pass to @callback.
- *
- * Asynchronously invokes the ChangeBacklight() D-Bus method on @proxy.
- * When the operation is finished, @callback will be invoked in the thread-default main loop of the thread you are calling this method from.
- * You can then call meta_dbus_display_config_call_change_backlight_finish() to get the result of the operation.
- *
- * See meta_dbus_display_config_call_change_backlight_sync() for the synchronous, blocking version of this method.
- */
-void
-meta_dbus_display_config_call_change_backlight (
-    MetaDBusDisplayConfig *proxy,
-    guint arg_serial,
-    guint arg_output,
-    gint arg_value,
-    GCancellable *cancellable,
-    GAsyncReadyCallback callback,
-    gpointer user_data)
-{
-  g_dbus_proxy_call (G_DBUS_PROXY (proxy),
-    "ChangeBacklight",
-    g_variant_new ("(uui)",
-                   arg_serial,
-                   arg_output,
-                   arg_value),
-    G_DBUS_CALL_FLAGS_NONE,
-    -1,
-    cancellable,
-    callback,
-    user_data);
-}
-
-/**
- * meta_dbus_display_config_call_change_backlight_finish:
- * @proxy: A #MetaDBusDisplayConfigProxy.
- * @out_new_value: (out): Return location for return parameter or %NULL to ignore.
- * @res: The #GAsyncResult obtained from the #GAsyncReadyCallback passed to meta_dbus_display_config_call_change_backlight().
- * @error: Return location for error or %NULL.
- *
- * Finishes an operation started with meta_dbus_display_config_call_change_backlight().
- *
- * Returns: (skip): %TRUE if the call succeded, %FALSE if @error is set.
- */
-gboolean
-meta_dbus_display_config_call_change_backlight_finish (
-    MetaDBusDisplayConfig *proxy,
-    gint *out_new_value,
-    GAsyncResult *res,
-    GError **error)
-{
-  GVariant *_ret;
-  _ret = g_dbus_proxy_call_finish (G_DBUS_PROXY (proxy), res, error);
-  if (_ret == NULL)
-    goto _out;
-  g_variant_get (_ret,
-                 "(i)",
-                 out_new_value);
-  g_variant_unref (_ret);
-_out:
-  return _ret != NULL;
-}
-
-/**
- * meta_dbus_display_config_call_change_backlight_sync:
- * @proxy: A #MetaDBusDisplayConfigProxy.
- * @arg_serial: Argument to pass with the method invocation.
- * @arg_output: Argument to pass with the method invocation.
- * @arg_value: Argument to pass with the method invocation.
- * @out_new_value: (out): Return location for return parameter or %NULL to ignore.
- * @cancellable: (allow-none): A #GCancellable or %NULL.
- * @error: Return location for error or %NULL.
- *
- * Synchronously invokes the ChangeBacklight() D-Bus method on @proxy. The calling thread is blocked until a reply is received.
- *
- * See meta_dbus_display_config_call_change_backlight() for the asynchronous version of this method.
- *
- * Returns: (skip): %TRUE if the call succeded, %FALSE if @error is set.
- */
-gboolean
-meta_dbus_display_config_call_change_backlight_sync (
-    MetaDBusDisplayConfig *proxy,
-    guint arg_serial,
-    guint arg_output,
-    gint arg_value,
-    gint *out_new_value,
-    GCancellable *cancellable,
-    GError **error)
-{
-  GVariant *_ret;
-  _ret = g_dbus_proxy_call_sync (G_DBUS_PROXY (proxy),
-    "ChangeBacklight",
-    g_variant_new ("(uui)",
-                   arg_serial,
-                   arg_output,
-                   arg_value),
-    G_DBUS_CALL_FLAGS_NONE,
-    -1,
-    cancellable,
-    error);
-  if (_ret == NULL)
-    goto _out;
-  g_variant_get (_ret,
-                 "(i)",
-                 out_new_value);
-  g_variant_unref (_ret);
-_out:
-  return _ret != NULL;
-}
-
-/**
- * meta_dbus_display_config_call_get_crtc_gamma:
- * @proxy: A #MetaDBusDisplayConfigProxy.
- * @arg_serial: Argument to pass with the method invocation.
- * @arg_crtc: Argument to pass with the method invocation.
- * @cancellable: (allow-none): A #GCancellable or %NULL.
- * @callback: A #GAsyncReadyCallback to call when the request is satisfied or %NULL.
- * @user_data: User data to pass to @callback.
- *
- * Asynchronously invokes the GetCrtcGamma() D-Bus method on @proxy.
- * When the operation is finished, @callback will be invoked in the thread-default main loop of the thread you are calling this method from.
- * You can then call meta_dbus_display_config_call_get_crtc_gamma_finish() to get the result of the operation.
- *
- * See meta_dbus_display_config_call_get_crtc_gamma_sync() for the synchronous, blocking version of this method.
- */
-void
-meta_dbus_display_config_call_get_crtc_gamma (
-    MetaDBusDisplayConfig *proxy,
-    guint arg_serial,
-    guint arg_crtc,
-    GCancellable *cancellable,
-    GAsyncReadyCallback callback,
-    gpointer user_data)
-{
-  g_dbus_proxy_call (G_DBUS_PROXY (proxy),
-    "GetCrtcGamma",
-    g_variant_new ("(uu)",
-                   arg_serial,
-                   arg_crtc),
-    G_DBUS_CALL_FLAGS_NONE,
-    -1,
-    cancellable,
-    callback,
-    user_data);
-}
-
-/**
- * meta_dbus_display_config_call_get_crtc_gamma_finish:
- * @proxy: A #MetaDBusDisplayConfigProxy.
- * @out_red: (out): Return location for return parameter or %NULL to ignore.
- * @out_green: (out): Return location for return parameter or %NULL to ignore.
- * @out_blue: (out): Return location for return parameter or %NULL to ignore.
- * @res: The #GAsyncResult obtained from the #GAsyncReadyCallback passed to meta_dbus_display_config_call_get_crtc_gamma().
- * @error: Return location for error or %NULL.
- *
- * Finishes an operation started with meta_dbus_display_config_call_get_crtc_gamma().
- *
- * Returns: (skip): %TRUE if the call succeded, %FALSE if @error is set.
- */
-gboolean
-meta_dbus_display_config_call_get_crtc_gamma_finish (
-    MetaDBusDisplayConfig *proxy,
-    GVariant **out_red,
-    GVariant **out_green,
-    GVariant **out_blue,
-    GAsyncResult *res,
-    GError **error)
-{
-  GVariant *_ret;
-  _ret = g_dbus_proxy_call_finish (G_DBUS_PROXY (proxy), res, error);
-  if (_ret == NULL)
-    goto _out;
-  g_variant_get (_ret,
-                 "(@aq@aq@aq)",
-                 out_red,
-                 out_green,
-                 out_blue);
-  g_variant_unref (_ret);
-_out:
-  return _ret != NULL;
-}
-
-/**
- * meta_dbus_display_config_call_get_crtc_gamma_sync:
- * @proxy: A #MetaDBusDisplayConfigProxy.
- * @arg_serial: Argument to pass with the method invocation.
- * @arg_crtc: Argument to pass with the method invocation.
- * @out_red: (out): Return location for return parameter or %NULL to ignore.
- * @out_green: (out): Return location for return parameter or %NULL to ignore.
- * @out_blue: (out): Return location for return parameter or %NULL to ignore.
- * @cancellable: (allow-none): A #GCancellable or %NULL.
- * @error: Return location for error or %NULL.
- *
- * Synchronously invokes the GetCrtcGamma() D-Bus method on @proxy. The calling thread is blocked until a reply is received.
- *
- * See meta_dbus_display_config_call_get_crtc_gamma() for the asynchronous version of this method.
- *
- * Returns: (skip): %TRUE if the call succeded, %FALSE if @error is set.
- */
-gboolean
-meta_dbus_display_config_call_get_crtc_gamma_sync (
-    MetaDBusDisplayConfig *proxy,
-    guint arg_serial,
-    guint arg_crtc,
-    GVariant **out_red,
-    GVariant **out_green,
-    GVariant **out_blue,
-    GCancellable *cancellable,
-    GError **error)
-{
-  GVariant *_ret;
-  _ret = g_dbus_proxy_call_sync (G_DBUS_PROXY (proxy),
-    "GetCrtcGamma",
-    g_variant_new ("(uu)",
-                   arg_serial,
-                   arg_crtc),
-    G_DBUS_CALL_FLAGS_NONE,
-    -1,
-    cancellable,
-    error);
-  if (_ret == NULL)
-    goto _out;
-  g_variant_get (_ret,
-                 "(@aq@aq@aq)",
-                 out_red,
-                 out_green,
-                 out_blue);
-  g_variant_unref (_ret);
-_out:
-  return _ret != NULL;
-}
-
-/**
- * meta_dbus_display_config_call_set_crtc_gamma:
- * @proxy: A #MetaDBusDisplayConfigProxy.
- * @arg_serial: Argument to pass with the method invocation.
- * @arg_crtc: Argument to pass with the method invocation.
- * @arg_red: Argument to pass with the method invocation.
- * @arg_green: Argument to pass with the method invocation.
- * @arg_blue: Argument to pass with the method invocation.
- * @cancellable: (allow-none): A #GCancellable or %NULL.
- * @callback: A #GAsyncReadyCallback to call when the request is satisfied or %NULL.
- * @user_data: User data to pass to @callback.
- *
- * Asynchronously invokes the SetCrtcGamma() D-Bus method on @proxy.
- * When the operation is finished, @callback will be invoked in the thread-default main loop of the thread you are calling this method from.
- * You can then call meta_dbus_display_config_call_set_crtc_gamma_finish() to get the result of the operation.
- *
- * See meta_dbus_display_config_call_set_crtc_gamma_sync() for the synchronous, blocking version of this method.
- */
-void
-meta_dbus_display_config_call_set_crtc_gamma (
-    MetaDBusDisplayConfig *proxy,
-    guint arg_serial,
-    guint arg_crtc,
-    GVariant *arg_red,
-    GVariant *arg_green,
-    GVariant *arg_blue,
-    GCancellable *cancellable,
-    GAsyncReadyCallback callback,
-    gpointer user_data)
-{
-  g_dbus_proxy_call (G_DBUS_PROXY (proxy),
-    "SetCrtcGamma",
-    g_variant_new ("(uu@aq@aq@aq)",
-                   arg_serial,
-                   arg_crtc,
-                   arg_red,
-                   arg_green,
-                   arg_blue),
-    G_DBUS_CALL_FLAGS_NONE,
-    -1,
-    cancellable,
-    callback,
-    user_data);
-}
-
-/**
- * meta_dbus_display_config_call_set_crtc_gamma_finish:
- * @proxy: A #MetaDBusDisplayConfigProxy.
- * @res: The #GAsyncResult obtained from the #GAsyncReadyCallback passed to meta_dbus_display_config_call_set_crtc_gamma().
- * @error: Return location for error or %NULL.
- *
- * Finishes an operation started with meta_dbus_display_config_call_set_crtc_gamma().
- *
- * Returns: (skip): %TRUE if the call succeded, %FALSE if @error is set.
- */
-gboolean
-meta_dbus_display_config_call_set_crtc_gamma_finish (
-    MetaDBusDisplayConfig *proxy,
-    GAsyncResult *res,
-    GError **error)
-{
-  GVariant *_ret;
-  _ret = g_dbus_proxy_call_finish (G_DBUS_PROXY (proxy), res, error);
-  if (_ret == NULL)
-    goto _out;
-  g_variant_get (_ret,
-                 "()");
-  g_variant_unref (_ret);
-_out:
-  return _ret != NULL;
-}
-
-/**
- * meta_dbus_display_config_call_set_crtc_gamma_sync:
- * @proxy: A #MetaDBusDisplayConfigProxy.
- * @arg_serial: Argument to pass with the method invocation.
- * @arg_crtc: Argument to pass with the method invocation.
- * @arg_red: Argument to pass with the method invocation.
- * @arg_green: Argument to pass with the method invocation.
- * @arg_blue: Argument to pass with the method invocation.
- * @cancellable: (allow-none): A #GCancellable or %NULL.
- * @error: Return location for error or %NULL.
- *
- * Synchronously invokes the SetCrtcGamma() D-Bus method on @proxy. The calling thread is blocked until a reply is received.
- *
- * See meta_dbus_display_config_call_set_crtc_gamma() for the asynchronous version of this method.
- *
- * Returns: (skip): %TRUE if the call succeded, %FALSE if @error is set.
- */
-gboolean
-meta_dbus_display_config_call_set_crtc_gamma_sync (
-    MetaDBusDisplayConfig *proxy,
-    guint arg_serial,
-    guint arg_crtc,
-    GVariant *arg_red,
-    GVariant *arg_green,
-    GVariant *arg_blue,
-    GCancellable *cancellable,
-    GError **error)
-{
-  GVariant *_ret;
-  _ret = g_dbus_proxy_call_sync (G_DBUS_PROXY (proxy),
-    "SetCrtcGamma",
-    g_variant_new ("(uu@aq@aq@aq)",
-                   arg_serial,
-                   arg_crtc,
-                   arg_red,
-                   arg_green,
-                   arg_blue),
-    G_DBUS_CALL_FLAGS_NONE,
-    -1,
-    cancellable,
-    error);
-  if (_ret == NULL)
-    goto _out;
-  g_variant_get (_ret,
-                 "()");
-  g_variant_unref (_ret);
-_out:
-  return _ret != NULL;
-}
-
-/**
- * meta_dbus_display_config_complete_get_resources:
- * @object: A #MetaDBusDisplayConfig.
- * @invocation: (transfer full): A #GDBusMethodInvocation.
- * @serial: Parameter to return.
- * @crtcs: Parameter to return.
- * @outputs: Parameter to return.
- * @modes: Parameter to return.
- * @max_screen_width: Parameter to return.
- * @max_screen_height: Parameter to return.
- *
- * Helper function used in service implementations to finish handling invocations of the GetResources() D-Bus method. If you instead want to finish handling an invocation by returning an error, use g_dbus_method_invocation_return_error() or similar.
- *
- * This method will free @invocation, you cannot use it afterwards.
- */
-void
-meta_dbus_display_config_complete_get_resources (
-    MetaDBusDisplayConfig *object,
-    GDBusMethodInvocation *invocation,
-    guint serial,
-    GVariant *crtcs,
-    GVariant *outputs,
-    GVariant *modes,
-    gint max_screen_width,
-    gint max_screen_height)
-{
-  g_dbus_method_invocation_return_value (invocation,
-    g_variant_new ("(u@a(uxiiiiiuaua{sv})@a(uxiausauaua{sv})@a(uxuud)ii)",
-                   serial,
-                   crtcs,
-                   outputs,
-                   modes,
-                   max_screen_width,
-                   max_screen_height));
-}
-
-/**
- * meta_dbus_display_config_complete_apply_configuration:
- * @object: A #MetaDBusDisplayConfig.
- * @invocation: (transfer full): A #GDBusMethodInvocation.
- *
- * Helper function used in service implementations to finish handling invocations of the ApplyConfiguration() D-Bus method. If you instead want to finish handling an invocation by returning an error, use g_dbus_method_invocation_return_error() or similar.
- *
- * This method will free @invocation, you cannot use it afterwards.
- */
-void
-meta_dbus_display_config_complete_apply_configuration (
-    MetaDBusDisplayConfig *object,
-    GDBusMethodInvocation *invocation)
-{
-  g_dbus_method_invocation_return_value (invocation,
-    g_variant_new ("()"));
-}
-
-/**
- * meta_dbus_display_config_complete_change_backlight:
- * @object: A #MetaDBusDisplayConfig.
- * @invocation: (transfer full): A #GDBusMethodInvocation.
- * @new_value: Parameter to return.
- *
- * Helper function used in service implementations to finish handling invocations of the ChangeBacklight() D-Bus method. If you instead want to finish handling an invocation by returning an error, use g_dbus_method_invocation_return_error() or similar.
- *
- * This method will free @invocation, you cannot use it afterwards.
- */
-void
-meta_dbus_display_config_complete_change_backlight (
-    MetaDBusDisplayConfig *object,
-    GDBusMethodInvocation *invocation,
-    gint new_value)
-{
-  g_dbus_method_invocation_return_value (invocation,
-    g_variant_new ("(i)",
-                   new_value));
-}
-
-/**
- * meta_dbus_display_config_complete_get_crtc_gamma:
- * @object: A #MetaDBusDisplayConfig.
- * @invocation: (transfer full): A #GDBusMethodInvocation.
- * @red: Parameter to return.
- * @green: Parameter to return.
- * @blue: Parameter to return.
- *
- * Helper function used in service implementations to finish handling invocations of the GetCrtcGamma() D-Bus method. If you instead want to finish handling an invocation by returning an error, use g_dbus_method_invocation_return_error() or similar.
- *
- * This method will free @invocation, you cannot use it afterwards.
- */
-void
-meta_dbus_display_config_complete_get_crtc_gamma (
-    MetaDBusDisplayConfig *object,
-    GDBusMethodInvocation *invocation,
-    GVariant *red,
-    GVariant *green,
-    GVariant *blue)
-{
-  g_dbus_method_invocation_return_value (invocation,
-    g_variant_new ("(@aq@aq@aq)",
-                   red,
-                   green,
-                   blue));
-}
-
-/**
- * meta_dbus_display_config_complete_set_crtc_gamma:
- * @object: A #MetaDBusDisplayConfig.
- * @invocation: (transfer full): A #GDBusMethodInvocation.
- *
- * Helper function used in service implementations to finish handling invocations of the SetCrtcGamma() D-Bus method. If you instead want to finish handling an invocation by returning an error, use g_dbus_method_invocation_return_error() or similar.
- *
- * This method will free @invocation, you cannot use it afterwards.
- */
-void
-meta_dbus_display_config_complete_set_crtc_gamma (
-    MetaDBusDisplayConfig *object,
-    GDBusMethodInvocation *invocation)
-{
-  g_dbus_method_invocation_return_value (invocation,
-    g_variant_new ("()"));
-}
-
-/* ------------------------------------------------------------------------ */
-
-/**
- * MetaDBusDisplayConfigProxy:
- *
- * The #MetaDBusDisplayConfigProxy structure contains only private data and should only be accessed using the provided API.
- */
-
-/**
- * MetaDBusDisplayConfigProxyClass:
- * @parent_class: The parent class.
- *
- * Class structure for #MetaDBusDisplayConfigProxy.
- */
-
-struct _MetaDBusDisplayConfigProxyPrivate
-{
-  GData *qdata;
-};
-
-static void meta_dbus_display_config_proxy_iface_init (MetaDBusDisplayConfigIface *iface);
-
-#if GLIB_VERSION_MAX_ALLOWED >= GLIB_VERSION_2_38
-G_DEFINE_TYPE_WITH_CODE (MetaDBusDisplayConfigProxy, meta_dbus_display_config_proxy, G_TYPE_DBUS_PROXY,
-                         G_ADD_PRIVATE (MetaDBusDisplayConfigProxy)
-                         G_IMPLEMENT_INTERFACE (META_DBUS_TYPE_DISPLAY_CONFIG, meta_dbus_display_config_proxy_iface_init));
-
-#else
-G_DEFINE_TYPE_WITH_CODE (MetaDBusDisplayConfigProxy, meta_dbus_display_config_proxy, G_TYPE_DBUS_PROXY,
-                         G_IMPLEMENT_INTERFACE (META_DBUS_TYPE_DISPLAY_CONFIG, meta_dbus_display_config_proxy_iface_init));
-
-#endif
-static void
-meta_dbus_display_config_proxy_finalize (GObject *object)
-{
-  MetaDBusDisplayConfigProxy *proxy = META_DBUS_DISPLAY_CONFIG_PROXY (object);
-  g_datalist_clear (&proxy->priv->qdata);
-  G_OBJECT_CLASS (meta_dbus_display_config_proxy_parent_class)->finalize (object);
-}
-
-static void
-meta_dbus_display_config_proxy_get_property (GObject      *object,
-  guint         prop_id,
-  GValue       *value,
-  GParamSpec   *pspec G_GNUC_UNUSED)
-{
-  const _ExtendedGDBusPropertyInfo *info;
-  GVariant *variant;
-  g_assert (prop_id != 0 && prop_id - 1 < 1);
-  info = _meta_dbus_display_config_property_info_pointers[prop_id - 1];
-  variant = g_dbus_proxy_get_cached_property (G_DBUS_PROXY (object), info->parent_struct.name);
-  if (info->use_gvariant)
-    {
-      g_value_set_variant (value, variant);
-    }
-  else
-    {
-      if (variant != NULL)
-        g_dbus_gvariant_to_gvalue (variant, value);
-    }
-  if (variant != NULL)
-    g_variant_unref (variant);
-}
-
-static void
-meta_dbus_display_config_proxy_set_property_cb (GDBusProxy *proxy,
-  GAsyncResult *res,
-  gpointer      user_data)
-{
-  const _ExtendedGDBusPropertyInfo *info = user_data;
-  GError *error;
-  GVariant *_ret;
-  error = NULL;
-  _ret = g_dbus_proxy_call_finish (proxy, res, &error);
-  if (!_ret)
-    {
-      g_warning ("Error setting property '%s' on interface org.gnome.Mutter.DisplayConfig: %s (%s, %d)",
-                 info->parent_struct.name, 
-                 error->message, g_quark_to_string (error->domain), error->code);
-      g_error_free (error);
-    }
-  else
-    {
-      g_variant_unref (_ret);
-    }
-}
-
-static void
-meta_dbus_display_config_proxy_set_property (GObject      *object,
-  guint         prop_id,
-  const GValue *value,
-  GParamSpec   *pspec G_GNUC_UNUSED)
-{
-  const _ExtendedGDBusPropertyInfo *info;
-  GVariant *variant;
-  g_assert (prop_id != 0 && prop_id - 1 < 1);
-  info = _meta_dbus_display_config_property_info_pointers[prop_id - 1];
-  variant = g_dbus_gvalue_to_gvariant (value, G_VARIANT_TYPE (info->parent_struct.signature));
-  g_dbus_proxy_call (G_DBUS_PROXY (object),
-    "org.freedesktop.DBus.Properties.Set",
-    g_variant_new ("(ssv)", "org.gnome.Mutter.DisplayConfig", info->parent_struct.name, variant),
-    G_DBUS_CALL_FLAGS_NONE,
-    -1,
-    NULL, (GAsyncReadyCallback) meta_dbus_display_config_proxy_set_property_cb, (GDBusPropertyInfo *) &info->parent_struct);
-  g_variant_unref (variant);
-}
-
-static void
-meta_dbus_display_config_proxy_g_signal (GDBusProxy *proxy,
-  const gchar *sender_name G_GNUC_UNUSED,
-  const gchar *signal_name,
-  GVariant *parameters)
-{
-  _ExtendedGDBusSignalInfo *info;
-  GVariantIter iter;
-  GVariant *child;
-  GValue *paramv;
-  guint num_params;
-  guint n;
-  guint signal_id;
-  info = (_ExtendedGDBusSignalInfo *) g_dbus_interface_info_lookup_signal ((GDBusInterfaceInfo *) &_meta_dbus_display_config_interface_info.parent_struct, signal_name);
-  if (info == NULL)
-    return;
-  num_params = g_variant_n_children (parameters);
-  paramv = g_new0 (GValue, num_params + 1);
-  g_value_init (¶mv[0], META_DBUS_TYPE_DISPLAY_CONFIG);
-  g_value_set_object (¶mv[0], proxy);
-  g_variant_iter_init (&iter, parameters);
-  n = 1;
-  while ((child = g_variant_iter_next_value (&iter)) != NULL)
-    {
-      _ExtendedGDBusArgInfo *arg_info = (_ExtendedGDBusArgInfo *) info->parent_struct.args[n - 1];
-      if (arg_info->use_gvariant)
-        {
-          g_value_init (¶mv[n], G_TYPE_VARIANT);
-          g_value_set_variant (¶mv[n], child);
-          n++;
-        }
-      else
-        g_dbus_gvariant_to_gvalue (child, ¶mv[n++]);
-      g_variant_unref (child);
-    }
-  signal_id = g_signal_lookup (info->signal_name, META_DBUS_TYPE_DISPLAY_CONFIG);
-  g_signal_emitv (paramv, signal_id, 0, NULL);
-  for (n = 0; n < num_params + 1; n++)
-    g_value_unset (¶mv[n]);
-  g_free (paramv);
-}
-
-static void
-meta_dbus_display_config_proxy_g_properties_changed (GDBusProxy *_proxy,
-  GVariant *changed_properties,
-  const gchar *const *invalidated_properties)
-{
-  MetaDBusDisplayConfigProxy *proxy = META_DBUS_DISPLAY_CONFIG_PROXY (_proxy);
-  guint n;
-  const gchar *key;
-  GVariantIter *iter;
-  _ExtendedGDBusPropertyInfo *info;
-  g_variant_get (changed_properties, "a{sv}", &iter);
-  while (g_variant_iter_next (iter, "{&sv}", &key, NULL))
-    {
-      info = (_ExtendedGDBusPropertyInfo *) g_dbus_interface_info_lookup_property ((GDBusInterfaceInfo *) &_meta_dbus_display_config_interface_info.parent_struct, key);
-      g_datalist_remove_data (&proxy->priv->qdata, key);
-      if (info != NULL)
-        g_object_notify (G_OBJECT (proxy), info->hyphen_name);
-    }
-  g_variant_iter_free (iter);
-  for (n = 0; invalidated_properties[n] != NULL; n++)
-    {
-      info = (_ExtendedGDBusPropertyInfo *) g_dbus_interface_info_lookup_property ((GDBusInterfaceInfo *) &_meta_dbus_display_config_interface_info.parent_struct, invalidated_properties[n]);
-      g_datalist_remove_data (&proxy->priv->qdata, invalidated_properties[n]);
-      if (info != NULL)
-        g_object_notify (G_OBJECT (proxy), info->hyphen_name);
-    }
-}
-
-static gint 
-meta_dbus_display_config_proxy_get_power_save_mode (MetaDBusDisplayConfig *object)
-{
-  MetaDBusDisplayConfigProxy *proxy = META_DBUS_DISPLAY_CONFIG_PROXY (object);
-  GVariant *variant;
-  gint value = 0;
-  variant = g_dbus_proxy_get_cached_property (G_DBUS_PROXY (proxy), "PowerSaveMode");
-  if (variant != NULL)
-    {
-      value = g_variant_get_int32 (variant);
-      g_variant_unref (variant);
-    }
-  return value;
-}
-
-static void
-meta_dbus_display_config_proxy_init (MetaDBusDisplayConfigProxy *proxy)
-{
-#if GLIB_VERSION_MAX_ALLOWED >= GLIB_VERSION_2_38
-  proxy->priv = meta_dbus_display_config_proxy_get_instance_private (proxy);
-#else
-  proxy->priv = G_TYPE_INSTANCE_GET_PRIVATE (proxy, META_DBUS_TYPE_DISPLAY_CONFIG_PROXY, MetaDBusDisplayConfigProxyPrivate);
-#endif
-
-  g_dbus_proxy_set_interface_info (G_DBUS_PROXY (proxy), meta_dbus_display_config_interface_info ());
-}
-
-static void
-meta_dbus_display_config_proxy_class_init (MetaDBusDisplayConfigProxyClass *klass)
-{
-  GObjectClass *gobject_class;
-  GDBusProxyClass *proxy_class;
-
-  gobject_class = G_OBJECT_CLASS (klass);
-  gobject_class->finalize     = meta_dbus_display_config_proxy_finalize;
-  gobject_class->get_property = meta_dbus_display_config_proxy_get_property;
-  gobject_class->set_property = meta_dbus_display_config_proxy_set_property;
-
-  proxy_class = G_DBUS_PROXY_CLASS (klass);
-  proxy_class->g_signal = meta_dbus_display_config_proxy_g_signal;
-  proxy_class->g_properties_changed = meta_dbus_display_config_proxy_g_properties_changed;
-
-  meta_dbus_display_config_override_properties (gobject_class, 1);
-
-#if GLIB_VERSION_MAX_ALLOWED < GLIB_VERSION_2_38
-  g_type_class_add_private (klass, sizeof (MetaDBusDisplayConfigProxyPrivate));
-#endif
-}
-
-static void
-meta_dbus_display_config_proxy_iface_init (MetaDBusDisplayConfigIface *iface)
-{
-  iface->get_power_save_mode = meta_dbus_display_config_proxy_get_power_save_mode;
-}
-
-/**
- * meta_dbus_display_config_proxy_new:
- * @connection: A #GDBusConnection.
- * @flags: Flags from the #GDBusProxyFlags enumeration.
- * @name: (allow-none): A bus name (well-known or unique) or %NULL if @connection is not a message bus connection.
- * @object_path: An object path.
- * @cancellable: (allow-none): A #GCancellable or %NULL.
- * @callback: A #GAsyncReadyCallback to call when the request is satisfied.
- * @user_data: User data to pass to @callback.
- *
- * Asynchronously creates a proxy for the D-Bus interface org.gnome.Mutter.DisplayConfig. See g_dbus_proxy_new() for more details.
- *
- * When the operation is finished, @callback will be invoked in the thread-default main loop of the thread you are calling this method from.
- * You can then call meta_dbus_display_config_proxy_new_finish() to get the result of the operation.
- *
- * See meta_dbus_display_config_proxy_new_sync() for the synchronous, blocking version of this constructor.
- */
-void
-meta_dbus_display_config_proxy_new (
-    GDBusConnection     *connection,
-    GDBusProxyFlags      flags,
-    const gchar         *name,
-    const gchar         *object_path,
-    GCancellable        *cancellable,
-    GAsyncReadyCallback  callback,
-    gpointer             user_data)
-{
-  g_async_initable_new_async (META_DBUS_TYPE_DISPLAY_CONFIG_PROXY, G_PRIORITY_DEFAULT, cancellable, callback, user_data, "g-flags", flags, "g-name", name, "g-connection", connection, "g-object-path", object_path, "g-interface-name", "org.gnome.Mutter.DisplayConfig", NULL);
-}
-
-/**
- * meta_dbus_display_config_proxy_new_finish:
- * @res: The #GAsyncResult obtained from the #GAsyncReadyCallback passed to meta_dbus_display_config_proxy_new().
- * @error: Return location for error or %NULL
- *
- * Finishes an operation started with meta_dbus_display_config_proxy_new().
- *
- * Returns: (transfer full) (type MetaDBusDisplayConfigProxy): The constructed proxy object or %NULL if @error is set.
- */
-MetaDBusDisplayConfig *
-meta_dbus_display_config_proxy_new_finish (
-    GAsyncResult        *res,
-    GError             **error)
-{
-  GObject *ret;
-  GObject *source_object;
-  source_object = g_async_result_get_source_object (res);
-  ret = g_async_initable_new_finish (G_ASYNC_INITABLE (source_object), res, error);
-  g_object_unref (source_object);
-  if (ret != NULL)
-    return META_DBUS_DISPLAY_CONFIG (ret);
-  else
-    return NULL;
-}
-
-/**
- * meta_dbus_display_config_proxy_new_sync:
- * @connection: A #GDBusConnection.
- * @flags: Flags from the #GDBusProxyFlags enumeration.
- * @name: (allow-none): A bus name (well-known or unique) or %NULL if @connection is not a message bus connection.
- * @object_path: An object path.
- * @cancellable: (allow-none): A #GCancellable or %NULL.
- * @error: Return location for error or %NULL
- *
- * Synchronously creates a proxy for the D-Bus interface org.gnome.Mutter.DisplayConfig. See g_dbus_proxy_new_sync() for more details.
- *
- * The calling thread is blocked until a reply is received.
- *
- * See meta_dbus_display_config_proxy_new() for the asynchronous version of this constructor.
- *
- * Returns: (transfer full) (type MetaDBusDisplayConfigProxy): The constructed proxy object or %NULL if @error is set.
- */
-MetaDBusDisplayConfig *
-meta_dbus_display_config_proxy_new_sync (
-    GDBusConnection     *connection,
-    GDBusProxyFlags      flags,
-    const gchar         *name,
-    const gchar         *object_path,
-    GCancellable        *cancellable,
-    GError             **error)
-{
-  GInitable *ret;
-  ret = g_initable_new (META_DBUS_TYPE_DISPLAY_CONFIG_PROXY, cancellable, error, "g-flags", flags, "g-name", name, "g-connection", connection, "g-object-path", object_path, "g-interface-name", "org.gnome.Mutter.DisplayConfig", NULL);
-  if (ret != NULL)
-    return META_DBUS_DISPLAY_CONFIG (ret);
-  else
-    return NULL;
-}
-
-
-/**
- * meta_dbus_display_config_proxy_new_for_bus:
- * @bus_type: A #GBusType.
- * @flags: Flags from the #GDBusProxyFlags enumeration.
- * @name: A bus name (well-known or unique).
- * @object_path: An object path.
- * @cancellable: (allow-none): A #GCancellable or %NULL.
- * @callback: A #GAsyncReadyCallback to call when the request is satisfied.
- * @user_data: User data to pass to @callback.
- *
- * Like meta_dbus_display_config_proxy_new() but takes a #GBusType instead of a #GDBusConnection.
- *
- * When the operation is finished, @callback will be invoked in the thread-default main loop of the thread you are calling this method from.
- * You can then call meta_dbus_display_config_proxy_new_for_bus_finish() to get the result of the operation.
- *
- * See meta_dbus_display_config_proxy_new_for_bus_sync() for the synchronous, blocking version of this constructor.
- */
-void
-meta_dbus_display_config_proxy_new_for_bus (
-    GBusType             bus_type,
-    GDBusProxyFlags      flags,
-    const gchar         *name,
-    const gchar         *object_path,
-    GCancellable        *cancellable,
-    GAsyncReadyCallback  callback,
-    gpointer             user_data)
-{
-  g_async_initable_new_async (META_DBUS_TYPE_DISPLAY_CONFIG_PROXY, G_PRIORITY_DEFAULT, cancellable, callback, user_data, "g-flags", flags, "g-name", name, "g-bus-type", bus_type, "g-object-path", object_path, "g-interface-name", "org.gnome.Mutter.DisplayConfig", NULL);
-}
-
-/**
- * meta_dbus_display_config_proxy_new_for_bus_finish:
- * @res: The #GAsyncResult obtained from the #GAsyncReadyCallback passed to meta_dbus_display_config_proxy_new_for_bus().
- * @error: Return location for error or %NULL
- *
- * Finishes an operation started with meta_dbus_display_config_proxy_new_for_bus().
- *
- * Returns: (transfer full) (type MetaDBusDisplayConfigProxy): The constructed proxy object or %NULL if @error is set.
- */
-MetaDBusDisplayConfig *
-meta_dbus_display_config_proxy_new_for_bus_finish (
-    GAsyncResult        *res,
-    GError             **error)
-{
-  GObject *ret;
-  GObject *source_object;
-  source_object = g_async_result_get_source_object (res);
-  ret = g_async_initable_new_finish (G_ASYNC_INITABLE (source_object), res, error);
-  g_object_unref (source_object);
-  if (ret != NULL)
-    return META_DBUS_DISPLAY_CONFIG (ret);
-  else
-    return NULL;
-}
-
-/**
- * meta_dbus_display_config_proxy_new_for_bus_sync:
- * @bus_type: A #GBusType.
- * @flags: Flags from the #GDBusProxyFlags enumeration.
- * @name: A bus name (well-known or unique).
- * @object_path: An object path.
- * @cancellable: (allow-none): A #GCancellable or %NULL.
- * @error: Return location for error or %NULL
- *
- * Like meta_dbus_display_config_proxy_new_sync() but takes a #GBusType instead of a #GDBusConnection.
- *
- * The calling thread is blocked until a reply is received.
- *
- * See meta_dbus_display_config_proxy_new_for_bus() for the asynchronous version of this constructor.
- *
- * Returns: (transfer full) (type MetaDBusDisplayConfigProxy): The constructed proxy object or %NULL if @error is set.
- */
-MetaDBusDisplayConfig *
-meta_dbus_display_config_proxy_new_for_bus_sync (
-    GBusType             bus_type,
-    GDBusProxyFlags      flags,
-    const gchar         *name,
-    const gchar         *object_path,
-    GCancellable        *cancellable,
-    GError             **error)
-{
-  GInitable *ret;
-  ret = g_initable_new (META_DBUS_TYPE_DISPLAY_CONFIG_PROXY, cancellable, error, "g-flags", flags, "g-name", name, "g-bus-type", bus_type, "g-object-path", object_path, "g-interface-name", "org.gnome.Mutter.DisplayConfig", NULL);
-  if (ret != NULL)
-    return META_DBUS_DISPLAY_CONFIG (ret);
-  else
-    return NULL;
-}
-
-
-/* ------------------------------------------------------------------------ */
-
-/**
- * MetaDBusDisplayConfigSkeleton:
- *
- * The #MetaDBusDisplayConfigSkeleton structure contains only private data and should only be accessed using the provided API.
- */
-
-/**
- * MetaDBusDisplayConfigSkeletonClass:
- * @parent_class: The parent class.
- *
- * Class structure for #MetaDBusDisplayConfigSkeleton.
- */
-
-struct _MetaDBusDisplayConfigSkeletonPrivate
-{
-  GValue *properties;
-  GList *changed_properties;
-  GSource *changed_properties_idle_source;
-  GMainContext *context;
-  GMutex lock;
-};
-
-static void
-_meta_dbus_display_config_skeleton_handle_method_call (
-  GDBusConnection *connection G_GNUC_UNUSED,
-  const gchar *sender G_GNUC_UNUSED,
-  const gchar *object_path G_GNUC_UNUSED,
-  const gchar *interface_name,
-  const gchar *method_name,
-  GVariant *parameters,
-  GDBusMethodInvocation *invocation,
-  gpointer user_data)
-{
-  MetaDBusDisplayConfigSkeleton *skeleton = META_DBUS_DISPLAY_CONFIG_SKELETON (user_data);
-  _ExtendedGDBusMethodInfo *info;
-  GVariantIter iter;
-  GVariant *child;
-  GValue *paramv;
-  guint num_params;
-  guint num_extra;
-  guint n;
-  guint signal_id;
-  GValue return_value = G_VALUE_INIT;
-  info = (_ExtendedGDBusMethodInfo *) g_dbus_method_invocation_get_method_info (invocation);
-  g_assert (info != NULL);
-  num_params = g_variant_n_children (parameters);
-  num_extra = info->pass_fdlist ? 3 : 2;  paramv = g_new0 (GValue, num_params + num_extra);
-  n = 0;
-  g_value_init (¶mv[n], META_DBUS_TYPE_DISPLAY_CONFIG);
-  g_value_set_object (¶mv[n++], skeleton);
-  g_value_init (¶mv[n], G_TYPE_DBUS_METHOD_INVOCATION);
-  g_value_set_object (¶mv[n++], invocation);
-  if (info->pass_fdlist)
-    {
-#ifdef G_OS_UNIX
-      g_value_init (¶mv[n], G_TYPE_UNIX_FD_LIST);
-      g_value_set_object (¶mv[n++], g_dbus_message_get_unix_fd_list (g_dbus_method_invocation_get_message (invocation)));
-#else
-      g_assert_not_reached ();
-#endif
-    }
-  g_variant_iter_init (&iter, parameters);
-  while ((child = g_variant_iter_next_value (&iter)) != NULL)
-    {
-      _ExtendedGDBusArgInfo *arg_info = (_ExtendedGDBusArgInfo *) info->parent_struct.in_args[n - num_extra];
-      if (arg_info->use_gvariant)
-        {
-          g_value_init (¶mv[n], G_TYPE_VARIANT);
-          g_value_set_variant (¶mv[n], child);
-          n++;
-        }
-      else
-        g_dbus_gvariant_to_gvalue (child, ¶mv[n++]);
-      g_variant_unref (child);
-    }
-  signal_id = g_signal_lookup (info->signal_name, META_DBUS_TYPE_DISPLAY_CONFIG);
-  g_value_init (&return_value, G_TYPE_BOOLEAN);
-  g_signal_emitv (paramv, signal_id, 0, &return_value);
-  if (!g_value_get_boolean (&return_value))
-    g_dbus_method_invocation_return_error (invocation, G_DBUS_ERROR, G_DBUS_ERROR_UNKNOWN_METHOD, "Method %s is not implemented on interface %s", method_name, interface_name);
-  g_value_unset (&return_value);
-  for (n = 0; n < num_params + num_extra; n++)
-    g_value_unset (¶mv[n]);
-  g_free (paramv);
-}
-
-static GVariant *
-_meta_dbus_display_config_skeleton_handle_get_property (
-  GDBusConnection *connection G_GNUC_UNUSED,
-  const gchar *sender G_GNUC_UNUSED,
-  const gchar *object_path G_GNUC_UNUSED,
-  const gchar *interface_name G_GNUC_UNUSED,
-  const gchar *property_name,
-  GError **error,
-  gpointer user_data)
-{
-  MetaDBusDisplayConfigSkeleton *skeleton = META_DBUS_DISPLAY_CONFIG_SKELETON (user_data);
-  GValue value = G_VALUE_INIT;
-  GParamSpec *pspec;
-  _ExtendedGDBusPropertyInfo *info;
-  GVariant *ret;
-  ret = NULL;
-  info = (_ExtendedGDBusPropertyInfo *) g_dbus_interface_info_lookup_property ((GDBusInterfaceInfo *) &_meta_dbus_display_config_interface_info.parent_struct, property_name);
-  g_assert (info != NULL);
-  pspec = g_object_class_find_property (G_OBJECT_GET_CLASS (skeleton), info->hyphen_name);
-  if (pspec == NULL)
-    {
-      g_set_error (error, G_DBUS_ERROR, G_DBUS_ERROR_INVALID_ARGS, "No property with name %s", property_name);
-    }
-  else
-    {
-      g_value_init (&value, pspec->value_type);
-      g_object_get_property (G_OBJECT (skeleton), info->hyphen_name, &value);
-      ret = g_dbus_gvalue_to_gvariant (&value, G_VARIANT_TYPE (info->parent_struct.signature));
-      g_value_unset (&value);
-    }
-  return ret;
-}
-
-static gboolean
-_meta_dbus_display_config_skeleton_handle_set_property (
-  GDBusConnection *connection G_GNUC_UNUSED,
-  const gchar *sender G_GNUC_UNUSED,
-  const gchar *object_path G_GNUC_UNUSED,
-  const gchar *interface_name G_GNUC_UNUSED,
-  const gchar *property_name,
-  GVariant *variant,
-  GError **error,
-  gpointer user_data)
-{
-  MetaDBusDisplayConfigSkeleton *skeleton = META_DBUS_DISPLAY_CONFIG_SKELETON (user_data);
-  GValue value = G_VALUE_INIT;
-  GParamSpec *pspec;
-  _ExtendedGDBusPropertyInfo *info;
-  gboolean ret;
-  ret = FALSE;
-  info = (_ExtendedGDBusPropertyInfo *) g_dbus_interface_info_lookup_property ((GDBusInterfaceInfo *) &_meta_dbus_display_config_interface_info.parent_struct, property_name);
-  g_assert (info != NULL);
-  pspec = g_object_class_find_property (G_OBJECT_GET_CLASS (skeleton), info->hyphen_name);
-  if (pspec == NULL)
-    {
-      g_set_error (error, G_DBUS_ERROR, G_DBUS_ERROR_INVALID_ARGS, "No property with name %s", property_name);
-    }
-  else
-    {
-      if (info->use_gvariant)
-        g_value_set_variant (&value, variant);
-      else
-        g_dbus_gvariant_to_gvalue (variant, &value);
-      g_object_set_property (G_OBJECT (skeleton), info->hyphen_name, &value);
-      g_value_unset (&value);
-      ret = TRUE;
-    }
-  return ret;
-}
-
-static const GDBusInterfaceVTable _meta_dbus_display_config_skeleton_vtable =
-{
-  _meta_dbus_display_config_skeleton_handle_method_call,
-  _meta_dbus_display_config_skeleton_handle_get_property,
-  _meta_dbus_display_config_skeleton_handle_set_property,
-  {NULL}
-};
-
-static GDBusInterfaceInfo *
-meta_dbus_display_config_skeleton_dbus_interface_get_info (GDBusInterfaceSkeleton *skeleton G_GNUC_UNUSED)
-{
-  return meta_dbus_display_config_interface_info ();
-}
-
-static GDBusInterfaceVTable *
-meta_dbus_display_config_skeleton_dbus_interface_get_vtable (GDBusInterfaceSkeleton *skeleton G_GNUC_UNUSED)
-{
-  return (GDBusInterfaceVTable *) &_meta_dbus_display_config_skeleton_vtable;
-}
-
-static GVariant *
-meta_dbus_display_config_skeleton_dbus_interface_get_properties (GDBusInterfaceSkeleton *_skeleton)
-{
-  MetaDBusDisplayConfigSkeleton *skeleton = META_DBUS_DISPLAY_CONFIG_SKELETON (_skeleton);
-
-  GVariantBuilder builder;
-  guint n;
-  g_variant_builder_init (&builder, G_VARIANT_TYPE ("a{sv}"));
-  if (_meta_dbus_display_config_interface_info.parent_struct.properties == NULL)
-    goto out;
-  for (n = 0; _meta_dbus_display_config_interface_info.parent_struct.properties[n] != NULL; n++)
-    {
-      GDBusPropertyInfo *info = _meta_dbus_display_config_interface_info.parent_struct.properties[n];
-      if (info->flags & G_DBUS_PROPERTY_INFO_FLAGS_READABLE)
-        {
-          GVariant *value;
-          value = _meta_dbus_display_config_skeleton_handle_get_property (g_dbus_interface_skeleton_get_connection (G_DBUS_INTERFACE_SKELETON (skeleton)), NULL, g_dbus_interface_skeleton_get_object_path (G_DBUS_INTERFACE_SKELETON (skeleton)), "org.gnome.Mutter.DisplayConfig", info->name, NULL, skeleton);
-          if (value != NULL)
-            {
-              g_variant_take_ref (value);
-              g_variant_builder_add (&builder, "{sv}", info->name, value);
-              g_variant_unref (value);
-            }
-        }
-    }
-out:
-  return g_variant_builder_end (&builder);
-}
-
-static gboolean _meta_dbus_display_config_emit_changed (gpointer user_data);
-
-static void
-meta_dbus_display_config_skeleton_dbus_interface_flush (GDBusInterfaceSkeleton *_skeleton)
-{
-  MetaDBusDisplayConfigSkeleton *skeleton = META_DBUS_DISPLAY_CONFIG_SKELETON (_skeleton);
-  gboolean emit_changed = FALSE;
-
-  g_mutex_lock (&skeleton->priv->lock);
-  if (skeleton->priv->changed_properties_idle_source != NULL)
-    {
-      g_source_destroy (skeleton->priv->changed_properties_idle_source);
-      skeleton->priv->changed_properties_idle_source = NULL;
-      emit_changed = TRUE;
-    }
-  g_mutex_unlock (&skeleton->priv->lock);
-
-  if (emit_changed)
-    _meta_dbus_display_config_emit_changed (skeleton);
-}
-
-static void
-_meta_dbus_display_config_on_signal_monitors_changed (
-    MetaDBusDisplayConfig *object)
-{
-  MetaDBusDisplayConfigSkeleton *skeleton = META_DBUS_DISPLAY_CONFIG_SKELETON (object);
-
-  GList      *connections, *l;
-  GVariant   *signal_variant;
-  connections = g_dbus_interface_skeleton_get_connections (G_DBUS_INTERFACE_SKELETON (skeleton));
-
-  signal_variant = g_variant_ref_sink (g_variant_new ("()"));
-  for (l = connections; l != NULL; l = l->next)
-    {
-      GDBusConnection *connection = l->data;
-      g_dbus_connection_emit_signal (connection,
-        NULL, g_dbus_interface_skeleton_get_object_path (G_DBUS_INTERFACE_SKELETON (skeleton)), "org.gnome.Mutter.DisplayConfig", "MonitorsChanged",
-        signal_variant, NULL);
-    }
-  g_variant_unref (signal_variant);
-  g_list_free_full (connections, g_object_unref);
-}
-
-static void meta_dbus_display_config_skeleton_iface_init (MetaDBusDisplayConfigIface *iface);
-#if GLIB_VERSION_MAX_ALLOWED >= GLIB_VERSION_2_38
-G_DEFINE_TYPE_WITH_CODE (MetaDBusDisplayConfigSkeleton, meta_dbus_display_config_skeleton, G_TYPE_DBUS_INTERFACE_SKELETON,
-                         G_ADD_PRIVATE (MetaDBusDisplayConfigSkeleton)
-                         G_IMPLEMENT_INTERFACE (META_DBUS_TYPE_DISPLAY_CONFIG, meta_dbus_display_config_skeleton_iface_init));
-
-#else
-G_DEFINE_TYPE_WITH_CODE (MetaDBusDisplayConfigSkeleton, meta_dbus_display_config_skeleton, G_TYPE_DBUS_INTERFACE_SKELETON,
-                         G_IMPLEMENT_INTERFACE (META_DBUS_TYPE_DISPLAY_CONFIG, meta_dbus_display_config_skeleton_iface_init));
-
-#endif
-static void
-meta_dbus_display_config_skeleton_finalize (GObject *object)
-{
-  MetaDBusDisplayConfigSkeleton *skeleton = META_DBUS_DISPLAY_CONFIG_SKELETON (object);
-  guint n;
-  for (n = 0; n < 1; n++)
-    g_value_unset (&skeleton->priv->properties[n]);
-  g_free (skeleton->priv->properties);
-  g_list_free_full (skeleton->priv->changed_properties, (GDestroyNotify) _changed_property_free);
-  if (skeleton->priv->changed_properties_idle_source != NULL)
-    g_source_destroy (skeleton->priv->changed_properties_idle_source);
-  g_main_context_unref (skeleton->priv->context);
-  g_mutex_clear (&skeleton->priv->lock);
-  G_OBJECT_CLASS (meta_dbus_display_config_skeleton_parent_class)->finalize (object);
-}
-
-static void
-meta_dbus_display_config_skeleton_get_property (GObject      *object,
-  guint         prop_id,
-  GValue       *value,
-  GParamSpec   *pspec G_GNUC_UNUSED)
-{
-  MetaDBusDisplayConfigSkeleton *skeleton = META_DBUS_DISPLAY_CONFIG_SKELETON (object);
-  g_assert (prop_id != 0 && prop_id - 1 < 1);
-  g_mutex_lock (&skeleton->priv->lock);
-  g_value_copy (&skeleton->priv->properties[prop_id - 1], value);
-  g_mutex_unlock (&skeleton->priv->lock);
-}
-
-static gboolean
-_meta_dbus_display_config_emit_changed (gpointer user_data)
-{
-  MetaDBusDisplayConfigSkeleton *skeleton = META_DBUS_DISPLAY_CONFIG_SKELETON (user_data);
-  GList *l;
-  GVariantBuilder builder;
-  GVariantBuilder invalidated_builder;
-  guint num_changes;
-
-  g_mutex_lock (&skeleton->priv->lock);
-  g_variant_builder_init (&builder, G_VARIANT_TYPE ("a{sv}"));
-  g_variant_builder_init (&invalidated_builder, G_VARIANT_TYPE ("as"));
-  for (l = skeleton->priv->changed_properties, num_changes = 0; l != NULL; l = l->next)
-    {
-      ChangedProperty *cp = l->data;
-      GVariant *variant;
-      const GValue *cur_value;
-
-      cur_value = &skeleton->priv->properties[cp->prop_id - 1];
-      if (!_g_value_equal (cur_value, &cp->orig_value))
-        {
-          variant = g_dbus_gvalue_to_gvariant (cur_value, G_VARIANT_TYPE (cp->info->parent_struct.signature));
-          g_variant_builder_add (&builder, "{sv}", cp->info->parent_struct.name, variant);
-          g_variant_unref (variant);
-          num_changes++;
-        }
-    }
-  if (num_changes > 0)
-    {
-      GList *connections, *ll;
-      GVariant *signal_variant;
-      signal_variant = g_variant_ref_sink (g_variant_new ("(sa{sv}as)", "org.gnome.Mutter.DisplayConfig",
-                                           &builder, &invalidated_builder));
-      connections = g_dbus_interface_skeleton_get_connections (G_DBUS_INTERFACE_SKELETON (skeleton));
-      for (ll = connections; ll != NULL; ll = ll->next)
-        {
-          GDBusConnection *connection = ll->data;
-
-          g_dbus_connection_emit_signal (connection,
-                                         NULL, g_dbus_interface_skeleton_get_object_path (G_DBUS_INTERFACE_SKELETON (skeleton)),
-                                         "org.freedesktop.DBus.Properties",
-                                         "PropertiesChanged",
-                                         signal_variant,
-                                         NULL);
-        }
-      g_variant_unref (signal_variant);
-      g_list_free_full (connections, g_object_unref);
-    }
-  else
-    {
-      g_variant_builder_clear (&builder);
-      g_variant_builder_clear (&invalidated_builder);
-    }
-  g_list_free_full (skeleton->priv->changed_properties, (GDestroyNotify) _changed_property_free);
-  skeleton->priv->changed_properties = NULL;
-  skeleton->priv->changed_properties_idle_source = NULL;
-  g_mutex_unlock (&skeleton->priv->lock);
-  return FALSE;
-}
-
-static void
-_meta_dbus_display_config_schedule_emit_changed (MetaDBusDisplayConfigSkeleton *skeleton, const _ExtendedGDBusPropertyInfo *info, guint prop_id, const GValue *orig_value)
-{
-  ChangedProperty *cp;
-  GList *l;
-  cp = NULL;
-  for (l = skeleton->priv->changed_properties; l != NULL; l = l->next)
-    {
-      ChangedProperty *i_cp = l->data;
-      if (i_cp->info == info)
-        {
-          cp = i_cp;
-          break;
-        }
-    }
-  if (cp == NULL)
-    {
-      cp = g_new0 (ChangedProperty, 1);
-      cp->prop_id = prop_id;
-      cp->info = info;
-      skeleton->priv->changed_properties = g_list_prepend (skeleton->priv->changed_properties, cp);
-      g_value_init (&cp->orig_value, G_VALUE_TYPE (orig_value));
-      g_value_copy (orig_value, &cp->orig_value);
-    }
-}
-
-static void
-meta_dbus_display_config_skeleton_notify (GObject      *object,
-  GParamSpec *pspec G_GNUC_UNUSED)
-{
-  MetaDBusDisplayConfigSkeleton *skeleton = META_DBUS_DISPLAY_CONFIG_SKELETON (object);
-  g_mutex_lock (&skeleton->priv->lock);
-  if (skeleton->priv->changed_properties != NULL &&
-      skeleton->priv->changed_properties_idle_source == NULL)
-    {
-      skeleton->priv->changed_properties_idle_source = g_idle_source_new ();
-      g_source_set_priority (skeleton->priv->changed_properties_idle_source, G_PRIORITY_DEFAULT);
-      g_source_set_callback (skeleton->priv->changed_properties_idle_source, _meta_dbus_display_config_emit_changed, g_object_ref (skeleton), (GDestroyNotify) g_object_unref);
-      g_source_attach (skeleton->priv->changed_properties_idle_source, skeleton->priv->context);
-      g_source_unref (skeleton->priv->changed_properties_idle_source);
-    }
-  g_mutex_unlock (&skeleton->priv->lock);
-}
-
-static void
-meta_dbus_display_config_skeleton_set_property (GObject      *object,
-  guint         prop_id,
-  const GValue *value,
-  GParamSpec   *pspec)
-{
-  MetaDBusDisplayConfigSkeleton *skeleton = META_DBUS_DISPLAY_CONFIG_SKELETON (object);
-  g_assert (prop_id != 0 && prop_id - 1 < 1);
-  g_mutex_lock (&skeleton->priv->lock);
-  g_object_freeze_notify (object);
-  if (!_g_value_equal (value, &skeleton->priv->properties[prop_id - 1]))
-    {
-      if (g_dbus_interface_skeleton_get_connection (G_DBUS_INTERFACE_SKELETON (skeleton)) != NULL)
-        _meta_dbus_display_config_schedule_emit_changed (skeleton, _meta_dbus_display_config_property_info_pointers[prop_id - 1], prop_id, &skeleton->priv->properties[prop_id - 1]);
-      g_value_copy (value, &skeleton->priv->properties[prop_id - 1]);
-      g_object_notify_by_pspec (object, pspec);
-    }
-  g_mutex_unlock (&skeleton->priv->lock);
-  g_object_thaw_notify (object);
-}
-
-static void
-meta_dbus_display_config_skeleton_init (MetaDBusDisplayConfigSkeleton *skeleton)
-{
-#if GLIB_VERSION_MAX_ALLOWED >= GLIB_VERSION_2_38
-  skeleton->priv = meta_dbus_display_config_skeleton_get_instance_private (skeleton);
-#else
-  skeleton->priv = G_TYPE_INSTANCE_GET_PRIVATE (skeleton, META_DBUS_TYPE_DISPLAY_CONFIG_SKELETON, MetaDBusDisplayConfigSkeletonPrivate);
-#endif
-
-  g_mutex_init (&skeleton->priv->lock);
-  skeleton->priv->context = g_main_context_ref_thread_default ();
-  skeleton->priv->properties = g_new0 (GValue, 1);
-  g_value_init (&skeleton->priv->properties[0], G_TYPE_INT);
-}
-
-static gint 
-meta_dbus_display_config_skeleton_get_power_save_mode (MetaDBusDisplayConfig *object)
-{
-  MetaDBusDisplayConfigSkeleton *skeleton = META_DBUS_DISPLAY_CONFIG_SKELETON (object);
-  gint value;
-  g_mutex_lock (&skeleton->priv->lock);
-  value = g_value_get_int (&(skeleton->priv->properties[0]));
-  g_mutex_unlock (&skeleton->priv->lock);
-  return value;
-}
-
-static void
-meta_dbus_display_config_skeleton_class_init (MetaDBusDisplayConfigSkeletonClass *klass)
-{
-  GObjectClass *gobject_class;
-  GDBusInterfaceSkeletonClass *skeleton_class;
-
-  gobject_class = G_OBJECT_CLASS (klass);
-  gobject_class->finalize = meta_dbus_display_config_skeleton_finalize;
-  gobject_class->get_property = meta_dbus_display_config_skeleton_get_property;
-  gobject_class->set_property = meta_dbus_display_config_skeleton_set_property;
-  gobject_class->notify       = meta_dbus_display_config_skeleton_notify;
-
-
-  meta_dbus_display_config_override_properties (gobject_class, 1);
-
-  skeleton_class = G_DBUS_INTERFACE_SKELETON_CLASS (klass);
-  skeleton_class->get_info = meta_dbus_display_config_skeleton_dbus_interface_get_info;
-  skeleton_class->get_properties = meta_dbus_display_config_skeleton_dbus_interface_get_properties;
-  skeleton_class->flush = meta_dbus_display_config_skeleton_dbus_interface_flush;
-  skeleton_class->get_vtable = meta_dbus_display_config_skeleton_dbus_interface_get_vtable;
-
-#if GLIB_VERSION_MAX_ALLOWED < GLIB_VERSION_2_38
-  g_type_class_add_private (klass, sizeof (MetaDBusDisplayConfigSkeletonPrivate));
-#endif
-}
-
-static void
-meta_dbus_display_config_skeleton_iface_init (MetaDBusDisplayConfigIface *iface)
-{
-  iface->monitors_changed = _meta_dbus_display_config_on_signal_monitors_changed;
-  iface->get_power_save_mode = meta_dbus_display_config_skeleton_get_power_save_mode;
-}
-
-/**
- * meta_dbus_display_config_skeleton_new:
- *
- * Creates a skeleton object for the D-Bus interface org.gnome.Mutter.DisplayConfig.
- *
- * Returns: (transfer full) (type MetaDBusDisplayConfigSkeleton): The skeleton object.
- */
-MetaDBusDisplayConfig *
-meta_dbus_display_config_skeleton_new (void)
-{
-  return META_DBUS_DISPLAY_CONFIG (g_object_new (META_DBUS_TYPE_DISPLAY_CONFIG_SKELETON, NULL));
-}
-
diff -Nru gnome-desktop3-3.12.0/libgnome-desktop/meta-dbus-xrandr.h gnome-desktop3-3.8.4/libgnome-desktop/meta-dbus-xrandr.h
--- gnome-desktop3-3.12.0/libgnome-desktop/meta-dbus-xrandr.h	2014-03-24 14:31:23.000000000 +0000
+++ gnome-desktop3-3.8.4/libgnome-desktop/meta-dbus-xrandr.h	1970-01-01 00:00:00.000000000 +0000
@@ -1,353 +0,0 @@
-/*
- * Generated by gdbus-codegen 2.39.92. DO NOT EDIT.
- *
- * The license of this code is the same as for the source it was derived from.
- */
-
-#ifndef __META_DBUS_XRANDR_H__
-#define __META_DBUS_XRANDR_H__
-
-#include 
-
-G_BEGIN_DECLS
-
-
-/* ------------------------------------------------------------------------ */
-/* Declarations for org.gnome.Mutter.DisplayConfig */
-
-#define META_DBUS_TYPE_DISPLAY_CONFIG (meta_dbus_display_config_get_type ())
-#define META_DBUS_DISPLAY_CONFIG(o) (G_TYPE_CHECK_INSTANCE_CAST ((o), META_DBUS_TYPE_DISPLAY_CONFIG, MetaDBusDisplayConfig))
-#define META_DBUS_IS_DISPLAY_CONFIG(o) (G_TYPE_CHECK_INSTANCE_TYPE ((o), META_DBUS_TYPE_DISPLAY_CONFIG))
-#define META_DBUS_DISPLAY_CONFIG_GET_IFACE(o) (G_TYPE_INSTANCE_GET_INTERFACE ((o), META_DBUS_TYPE_DISPLAY_CONFIG, MetaDBusDisplayConfigIface))
-
-struct _MetaDBusDisplayConfig;
-typedef struct _MetaDBusDisplayConfig MetaDBusDisplayConfig;
-typedef struct _MetaDBusDisplayConfigIface MetaDBusDisplayConfigIface;
-
-struct _MetaDBusDisplayConfigIface
-{
-  GTypeInterface parent_iface;
-
-
-
-  gboolean (*handle_apply_configuration) (
-    MetaDBusDisplayConfig *object,
-    GDBusMethodInvocation *invocation,
-    guint arg_serial,
-    gboolean arg_persistent,
-    GVariant *arg_crtcs,
-    GVariant *arg_outputs);
-
-  gboolean (*handle_change_backlight) (
-    MetaDBusDisplayConfig *object,
-    GDBusMethodInvocation *invocation,
-    guint arg_serial,
-    guint arg_output,
-    gint arg_value);
-
-  gboolean (*handle_get_crtc_gamma) (
-    MetaDBusDisplayConfig *object,
-    GDBusMethodInvocation *invocation,
-    guint arg_serial,
-    guint arg_crtc);
-
-  gboolean (*handle_get_resources) (
-    MetaDBusDisplayConfig *object,
-    GDBusMethodInvocation *invocation);
-
-  gboolean (*handle_set_crtc_gamma) (
-    MetaDBusDisplayConfig *object,
-    GDBusMethodInvocation *invocation,
-    guint arg_serial,
-    guint arg_crtc,
-    GVariant *arg_red,
-    GVariant *arg_green,
-    GVariant *arg_blue);
-
-  gint  (*get_power_save_mode) (MetaDBusDisplayConfig *object);
-
-  void (*monitors_changed) (
-    MetaDBusDisplayConfig *object);
-
-};
-
-GType meta_dbus_display_config_get_type (void) G_GNUC_CONST;
-
-GDBusInterfaceInfo *meta_dbus_display_config_interface_info (void);
-guint meta_dbus_display_config_override_properties (GObjectClass *klass, guint property_id_begin);
-
-
-/* D-Bus method call completion functions: */
-void meta_dbus_display_config_complete_get_resources (
-    MetaDBusDisplayConfig *object,
-    GDBusMethodInvocation *invocation,
-    guint serial,
-    GVariant *crtcs,
-    GVariant *outputs,
-    GVariant *modes,
-    gint max_screen_width,
-    gint max_screen_height);
-
-void meta_dbus_display_config_complete_apply_configuration (
-    MetaDBusDisplayConfig *object,
-    GDBusMethodInvocation *invocation);
-
-void meta_dbus_display_config_complete_change_backlight (
-    MetaDBusDisplayConfig *object,
-    GDBusMethodInvocation *invocation,
-    gint new_value);
-
-void meta_dbus_display_config_complete_get_crtc_gamma (
-    MetaDBusDisplayConfig *object,
-    GDBusMethodInvocation *invocation,
-    GVariant *red,
-    GVariant *green,
-    GVariant *blue);
-
-void meta_dbus_display_config_complete_set_crtc_gamma (
-    MetaDBusDisplayConfig *object,
-    GDBusMethodInvocation *invocation);
-
-
-
-/* D-Bus signal emissions functions: */
-void meta_dbus_display_config_emit_monitors_changed (
-    MetaDBusDisplayConfig *object);
-
-
-
-/* D-Bus method calls: */
-void meta_dbus_display_config_call_get_resources (
-    MetaDBusDisplayConfig *proxy,
-    GCancellable *cancellable,
-    GAsyncReadyCallback callback,
-    gpointer user_data);
-
-gboolean meta_dbus_display_config_call_get_resources_finish (
-    MetaDBusDisplayConfig *proxy,
-    guint *out_serial,
-    GVariant **out_crtcs,
-    GVariant **out_outputs,
-    GVariant **out_modes,
-    gint *out_max_screen_width,
-    gint *out_max_screen_height,
-    GAsyncResult *res,
-    GError **error);
-
-gboolean meta_dbus_display_config_call_get_resources_sync (
-    MetaDBusDisplayConfig *proxy,
-    guint *out_serial,
-    GVariant **out_crtcs,
-    GVariant **out_outputs,
-    GVariant **out_modes,
-    gint *out_max_screen_width,
-    gint *out_max_screen_height,
-    GCancellable *cancellable,
-    GError **error);
-
-void meta_dbus_display_config_call_apply_configuration (
-    MetaDBusDisplayConfig *proxy,
-    guint arg_serial,
-    gboolean arg_persistent,
-    GVariant *arg_crtcs,
-    GVariant *arg_outputs,
-    GCancellable *cancellable,
-    GAsyncReadyCallback callback,
-    gpointer user_data);
-
-gboolean meta_dbus_display_config_call_apply_configuration_finish (
-    MetaDBusDisplayConfig *proxy,
-    GAsyncResult *res,
-    GError **error);
-
-gboolean meta_dbus_display_config_call_apply_configuration_sync (
-    MetaDBusDisplayConfig *proxy,
-    guint arg_serial,
-    gboolean arg_persistent,
-    GVariant *arg_crtcs,
-    GVariant *arg_outputs,
-    GCancellable *cancellable,
-    GError **error);
-
-void meta_dbus_display_config_call_change_backlight (
-    MetaDBusDisplayConfig *proxy,
-    guint arg_serial,
-    guint arg_output,
-    gint arg_value,
-    GCancellable *cancellable,
-    GAsyncReadyCallback callback,
-    gpointer user_data);
-
-gboolean meta_dbus_display_config_call_change_backlight_finish (
-    MetaDBusDisplayConfig *proxy,
-    gint *out_new_value,
-    GAsyncResult *res,
-    GError **error);
-
-gboolean meta_dbus_display_config_call_change_backlight_sync (
-    MetaDBusDisplayConfig *proxy,
-    guint arg_serial,
-    guint arg_output,
-    gint arg_value,
-    gint *out_new_value,
-    GCancellable *cancellable,
-    GError **error);
-
-void meta_dbus_display_config_call_get_crtc_gamma (
-    MetaDBusDisplayConfig *proxy,
-    guint arg_serial,
-    guint arg_crtc,
-    GCancellable *cancellable,
-    GAsyncReadyCallback callback,
-    gpointer user_data);
-
-gboolean meta_dbus_display_config_call_get_crtc_gamma_finish (
-    MetaDBusDisplayConfig *proxy,
-    GVariant **out_red,
-    GVariant **out_green,
-    GVariant **out_blue,
-    GAsyncResult *res,
-    GError **error);
-
-gboolean meta_dbus_display_config_call_get_crtc_gamma_sync (
-    MetaDBusDisplayConfig *proxy,
-    guint arg_serial,
-    guint arg_crtc,
-    GVariant **out_red,
-    GVariant **out_green,
-    GVariant **out_blue,
-    GCancellable *cancellable,
-    GError **error);
-
-void meta_dbus_display_config_call_set_crtc_gamma (
-    MetaDBusDisplayConfig *proxy,
-    guint arg_serial,
-    guint arg_crtc,
-    GVariant *arg_red,
-    GVariant *arg_green,
-    GVariant *arg_blue,
-    GCancellable *cancellable,
-    GAsyncReadyCallback callback,
-    gpointer user_data);
-
-gboolean meta_dbus_display_config_call_set_crtc_gamma_finish (
-    MetaDBusDisplayConfig *proxy,
-    GAsyncResult *res,
-    GError **error);
-
-gboolean meta_dbus_display_config_call_set_crtc_gamma_sync (
-    MetaDBusDisplayConfig *proxy,
-    guint arg_serial,
-    guint arg_crtc,
-    GVariant *arg_red,
-    GVariant *arg_green,
-    GVariant *arg_blue,
-    GCancellable *cancellable,
-    GError **error);
-
-
-
-/* D-Bus property accessors: */
-gint meta_dbus_display_config_get_power_save_mode (MetaDBusDisplayConfig *object);
-void meta_dbus_display_config_set_power_save_mode (MetaDBusDisplayConfig *object, gint value);
-
-
-/* ---- */
-
-#define META_DBUS_TYPE_DISPLAY_CONFIG_PROXY (meta_dbus_display_config_proxy_get_type ())
-#define META_DBUS_DISPLAY_CONFIG_PROXY(o) (G_TYPE_CHECK_INSTANCE_CAST ((o), META_DBUS_TYPE_DISPLAY_CONFIG_PROXY, MetaDBusDisplayConfigProxy))
-#define META_DBUS_DISPLAY_CONFIG_PROXY_CLASS(k) (G_TYPE_CHECK_CLASS_CAST ((k), META_DBUS_TYPE_DISPLAY_CONFIG_PROXY, MetaDBusDisplayConfigProxyClass))
-#define META_DBUS_DISPLAY_CONFIG_PROXY_GET_CLASS(o) (G_TYPE_INSTANCE_GET_CLASS ((o), META_DBUS_TYPE_DISPLAY_CONFIG_PROXY, MetaDBusDisplayConfigProxyClass))
-#define META_DBUS_IS_DISPLAY_CONFIG_PROXY(o) (G_TYPE_CHECK_INSTANCE_TYPE ((o), META_DBUS_TYPE_DISPLAY_CONFIG_PROXY))
-#define META_DBUS_IS_DISPLAY_CONFIG_PROXY_CLASS(k) (G_TYPE_CHECK_CLASS_TYPE ((k), META_DBUS_TYPE_DISPLAY_CONFIG_PROXY))
-
-typedef struct _MetaDBusDisplayConfigProxy MetaDBusDisplayConfigProxy;
-typedef struct _MetaDBusDisplayConfigProxyClass MetaDBusDisplayConfigProxyClass;
-typedef struct _MetaDBusDisplayConfigProxyPrivate MetaDBusDisplayConfigProxyPrivate;
-
-struct _MetaDBusDisplayConfigProxy
-{
-  /*< private >*/
-  GDBusProxy parent_instance;
-  MetaDBusDisplayConfigProxyPrivate *priv;
-};
-
-struct _MetaDBusDisplayConfigProxyClass
-{
-  GDBusProxyClass parent_class;
-};
-
-GType meta_dbus_display_config_proxy_get_type (void) G_GNUC_CONST;
-
-void meta_dbus_display_config_proxy_new (
-    GDBusConnection     *connection,
-    GDBusProxyFlags      flags,
-    const gchar         *name,
-    const gchar         *object_path,
-    GCancellable        *cancellable,
-    GAsyncReadyCallback  callback,
-    gpointer             user_data);
-MetaDBusDisplayConfig *meta_dbus_display_config_proxy_new_finish (
-    GAsyncResult        *res,
-    GError             **error);
-MetaDBusDisplayConfig *meta_dbus_display_config_proxy_new_sync (
-    GDBusConnection     *connection,
-    GDBusProxyFlags      flags,
-    const gchar         *name,
-    const gchar         *object_path,
-    GCancellable        *cancellable,
-    GError             **error);
-
-void meta_dbus_display_config_proxy_new_for_bus (
-    GBusType             bus_type,
-    GDBusProxyFlags      flags,
-    const gchar         *name,
-    const gchar         *object_path,
-    GCancellable        *cancellable,
-    GAsyncReadyCallback  callback,
-    gpointer             user_data);
-MetaDBusDisplayConfig *meta_dbus_display_config_proxy_new_for_bus_finish (
-    GAsyncResult        *res,
-    GError             **error);
-MetaDBusDisplayConfig *meta_dbus_display_config_proxy_new_for_bus_sync (
-    GBusType             bus_type,
-    GDBusProxyFlags      flags,
-    const gchar         *name,
-    const gchar         *object_path,
-    GCancellable        *cancellable,
-    GError             **error);
-
-
-/* ---- */
-
-#define META_DBUS_TYPE_DISPLAY_CONFIG_SKELETON (meta_dbus_display_config_skeleton_get_type ())
-#define META_DBUS_DISPLAY_CONFIG_SKELETON(o) (G_TYPE_CHECK_INSTANCE_CAST ((o), META_DBUS_TYPE_DISPLAY_CONFIG_SKELETON, MetaDBusDisplayConfigSkeleton))
-#define META_DBUS_DISPLAY_CONFIG_SKELETON_CLASS(k) (G_TYPE_CHECK_CLASS_CAST ((k), META_DBUS_TYPE_DISPLAY_CONFIG_SKELETON, MetaDBusDisplayConfigSkeletonClass))
-#define META_DBUS_DISPLAY_CONFIG_SKELETON_GET_CLASS(o) (G_TYPE_INSTANCE_GET_CLASS ((o), META_DBUS_TYPE_DISPLAY_CONFIG_SKELETON, MetaDBusDisplayConfigSkeletonClass))
-#define META_DBUS_IS_DISPLAY_CONFIG_SKELETON(o) (G_TYPE_CHECK_INSTANCE_TYPE ((o), META_DBUS_TYPE_DISPLAY_CONFIG_SKELETON))
-#define META_DBUS_IS_DISPLAY_CONFIG_SKELETON_CLASS(k) (G_TYPE_CHECK_CLASS_TYPE ((k), META_DBUS_TYPE_DISPLAY_CONFIG_SKELETON))
-
-typedef struct _MetaDBusDisplayConfigSkeleton MetaDBusDisplayConfigSkeleton;
-typedef struct _MetaDBusDisplayConfigSkeletonClass MetaDBusDisplayConfigSkeletonClass;
-typedef struct _MetaDBusDisplayConfigSkeletonPrivate MetaDBusDisplayConfigSkeletonPrivate;
-
-struct _MetaDBusDisplayConfigSkeleton
-{
-  /*< private >*/
-  GDBusInterfaceSkeleton parent_instance;
-  MetaDBusDisplayConfigSkeletonPrivate *priv;
-};
-
-struct _MetaDBusDisplayConfigSkeletonClass
-{
-  GDBusInterfaceSkeletonClass parent_class;
-};
-
-GType meta_dbus_display_config_skeleton_get_type (void) G_GNUC_CONST;
-
-MetaDBusDisplayConfig *meta_dbus_display_config_skeleton_new (void);
-
-
-G_END_DECLS
-
-#endif /* __META_DBUS_XRANDR_H__ */
diff -Nru gnome-desktop3-3.12.0/libgnome-desktop/meta-xrandr-shared.h gnome-desktop3-3.8.4/libgnome-desktop/meta-xrandr-shared.h
--- gnome-desktop3-3.12.0/libgnome-desktop/meta-xrandr-shared.h	2014-02-03 15:41:40.000000000 +0000
+++ gnome-desktop3-3.8.4/libgnome-desktop/meta-xrandr-shared.h	1970-01-01 00:00:00.000000000 +0000
@@ -1,41 +0,0 @@
-/* -*- mode: C; c-file-style: "gnu"; indent-tabs-mode: nil; -*- */
-/* 
- * Copyright (C) 2013 Red Hat 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 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, see .
- */
-
-/* This file is shared between mutter (src/core/meta-xrandr-shared.h)
-   and gnome-desktop (libgnome-desktop/meta-xrandr-shared.h).
-
-   The canonical place for all changes is mutter.
-
-   There should be no includes in this file.
-*/
-
-#ifndef META_XRANDR_SHARED_H
-#define META_XRANDR_SHARED_H
-
-typedef enum {
-  META_POWER_SAVE_UNKNOWN = -1,
-  META_POWER_SAVE_ON = 0,
-  META_POWER_SAVE_STANDBY,
-  META_POWER_SAVE_SUSPEND,
-  META_POWER_SAVE_OFF,
-} MetaPowerSave;
-
-#define META_OUTPUT_STRUCT         "(uxiausauau@a{sv})"
-#define META_CRTC_STRUCT           "(uxiiiiiuau@a{sv})"
-#define META_MONITOR_MODE_STRUCT   "(uxuud)"
-#endif
diff -Nru gnome-desktop3-3.12.0/libgnome-desktop/test-idle-monitor.c gnome-desktop3-3.8.4/libgnome-desktop/test-idle-monitor.c
--- gnome-desktop3-3.12.0/libgnome-desktop/test-idle-monitor.c	2013-11-27 15:22:39.000000000 +0000
+++ gnome-desktop3-3.8.4/libgnome-desktop/test-idle-monitor.c	2013-09-04 11:15:57.000000000 +0000
@@ -70,13 +70,11 @@
 	GnomeIdleMonitor *monitor;
 	guint watch_id;
 	int device_id;
-	GError *error = NULL;
 
 	device_id = gdk_x11_device_get_id (device);
-	monitor = gnome_idle_monitor_new_for_device (device, &error);
+	monitor = gnome_idle_monitor_new_for_device (device);
 	if (!monitor) {
-		g_warning ("Per-device idletime monitor not available: %s", error->message);
-		g_error_free (error);
+		g_warning ("Per-device idletime monitor not available");
 		return;
 	}
 
diff -Nru gnome-desktop3-3.12.0/libgnome-desktop/test-wall-clock.c gnome-desktop3-3.8.4/libgnome-desktop/test-wall-clock.c
--- gnome-desktop3-3.12.0/libgnome-desktop/test-wall-clock.c	2013-11-11 17:23:17.000000000 +0000
+++ gnome-desktop3-3.8.4/libgnome-desktop/test-wall-clock.c	2013-09-04 11:15:57.000000000 +0000
@@ -28,8 +28,6 @@
 	g_signal_connect (G_OBJECT (clock), "notify::clock",
 			  G_CALLBACK (clock_changed), NULL);
 
-	clock_changed (clock, NULL, NULL);
-
 	g_main_loop_run (loop);
 
 	return 0;
diff -Nru gnome-desktop3-3.12.0/libgnome-desktop/test-xkb-info.c gnome-desktop3-3.8.4/libgnome-desktop/test-xkb-info.c
--- gnome-desktop3-3.12.0/libgnome-desktop/test-xkb-info.c	2014-02-13 09:41:05.000000000 +0000
+++ gnome-desktop3-3.8.4/libgnome-desktop/test-xkb-info.c	2013-01-23 16:38:30.000000000 +0000
@@ -1,3 +1,4 @@
+#include 
 #define GNOME_DESKTOP_USE_UNSTABLE_API
 #include 
 int
@@ -8,6 +9,8 @@
 	GList *option_groups, *g;
 	GList *options, *o;
 
+	gtk_init (&argc, &argv);
+
 	info = gnome_xkb_info_new ();
 
 	layouts = gnome_xkb_info_get_all_layouts (info);
diff -Nru gnome-desktop3-3.12.0/libgnome-desktop/xrandr.xml gnome-desktop3-3.8.4/libgnome-desktop/xrandr.xml
--- gnome-desktop3-3.12.0/libgnome-desktop/xrandr.xml	2013-11-11 17:23:17.000000000 +0000
+++ gnome-desktop3-3.8.4/libgnome-desktop/xrandr.xml	1970-01-01 00:00:00.000000000 +0000
@@ -1,293 +0,0 @@
-
-
-  
-
-  
-
-    
-    
-      
-      
-      
-      
-      
-      
-    
-
-    
-    
-      
-      
-      
-      
-    
-
-    
-    
-      
-      
-      
-      
-    
-
-    
-    
-      
-      
-      
-      
-      
-    
-
-    
-    
-      
-      
-      
-      
-      
-    
-
-    
-    
-
-    
-    
-  
-
diff -Nru gnome-desktop3-3.12.0/m4/libtool.m4 gnome-desktop3-3.8.4/m4/libtool.m4
--- gnome-desktop3-3.12.0/m4/libtool.m4	2014-03-24 14:31:01.000000000 +0000
+++ gnome-desktop3-3.8.4/m4/libtool.m4	2013-09-04 11:29:41.000000000 +0000
@@ -1312,7 +1312,7 @@
   rm -rf conftest*
   ;;
 
-x86_64-*kfreebsd*-gnu|x86_64-*linux*|powerpc*-*linux*| \
+x86_64-*kfreebsd*-gnu|x86_64-*linux*|ppc*-*linux*|powerpc*-*linux*| \
 s390*-*linux*|s390*-*tpf*|sparc*-*linux*)
   # Find out which ABI we are using.
   echo 'int i;' > conftest.$ac_ext
@@ -1326,10 +1326,7 @@
 	  x86_64-*linux*)
 	    LD="${LD-ld} -m elf_i386"
 	    ;;
-	  powerpc64le-*linux*)
-	    LD="${LD-ld} -m elf32lppclinux"
-	    ;;
-	  powerpc64-*linux*)
+	  ppc64-*linux*|powerpc64-*linux*)
 	    LD="${LD-ld} -m elf32ppclinux"
 	    ;;
 	  s390x-*linux*)
@@ -1348,10 +1345,7 @@
 	  x86_64-*linux*)
 	    LD="${LD-ld} -m elf_x86_64"
 	    ;;
-	  powerpcle-*linux*)
-	    LD="${LD-ld} -m elf64lppc"
-	    ;;
-	  powerpc-*linux*)
+	  ppc*-*linux*|powerpc*-*linux*)
 	    LD="${LD-ld} -m elf64ppc"
 	    ;;
 	  s390*-*linux*|s390*-*tpf*)
diff -Nru gnome-desktop3-3.12.0/NEWS gnome-desktop3-3.8.4/NEWS
--- gnome-desktop3-3.12.0/NEWS	2014-03-24 14:27:06.000000000 +0000
+++ gnome-desktop3-3.8.4/NEWS	2013-09-04 11:22:56.000000000 +0000
@@ -1,122 +1,64 @@
-===============
-Version  3.12.0
-===============
-
-- Version bump for the GNOME 3.12.0 stable release
-
-================
-Version  3.11.91
-================
-
-- Always set the DPMS mode when requested
-- Translation updates
-
-================
-Version  3.11.90
-================
-
-- gnome-xkb-info: Remove xkbfile dependency (#719942) - API and ABI break
-- gnome-xkb-info: Apply main layout locale metadata to variants (#711291)
-
-===============
-Version  3.11.5
-===============
-
-- wall-clock: Replace ratio with colon on non-UTF-8 locales (#722664)
-
-===============
-Version  3.11.4
-===============
-
-- more new gnome-rr api
-- drop using glibc internal headers
-- docs for thumbnailers
-- idle monitor fixes
-- use newer libgsystem internally
-
-===============
-Version  3.11.2
-===============
-
-- gnome-rr: Improve debug output
-- Translation updates
+=============
+Version 3.8.4
+=============
+
+* Initialize gettext before constructing a wall clock (#699325)
+* Update pnp.ids from upstream hwdata (#699730)
+* Fix crash when XRRSetCrtcConfig() fails (#703034)
+* Prevent a crash with unknown language/country codes (#705885)
+* Ensure strings from xkeyboard-config are UTF-8 (#703247)
+* Translation updates
+
+=============
+Version 3.8.3
+=============
+
+* Fix a memory leak (#701326)
+* Fix compile-time warning on x32 (#700548)
+* Translation updates
 
-===============
-Version  3.11.1
-===============
-
-- Add gnome_rr_output_get_min_backlight_step() API
-
-===============
-Version  3.10.1
-===============
-
-- gnome-bg: Fix memory leaks (#709271)
-- gnome-bg: set error when parsing XML file that's not a slide show (#708877)
-- languages: Obtain supported locales from "locale -a" output (#698383)
-- thumbnailer: Bail if no pixbuf loader could be created (#709819)
-- thumbnailer: Support loading thumbnails from remote locations (#708824)
-- Translation updates
-
-===============
-Version  3.10.0
-===============
+=============
+Version 3.8.2
+==============
 
-- libsystem: Update from master ($708435)
-- gnome-rr: refresh when mutter restarts (#708284)
-- Translation updates
+* Fix a memory leak (#695116)
+* Add some more defaults for input sources
+* Translation updates
 
 ===============
-Version  3.9.92
+Version 3.8.0.1
 ===============
 
-- IdleMonitor: protect watches from being freed while in flight (#707396)
-- thumbnailer: Always print errors from gs_file_read_noatime() (#699252)
-- thumbnailer: Correctly check for errors (#699252)
-- thumbnailer: Check gdk_pixbuf_loader_close()'s retval (#699252)
-- Correct the transposed bits of the red chromacity in the EDID parser
-- Translation updates
+* Fix a potential use-after-free corruption and crash (#696719)
 
-===============
-Version  3.9.91
-===============
+=============
+Version 3.8.0
+=============
 
-- gnome-rr: don't assume 'default' means built-in (#706738)
-- gnome-rr: Read back new backlight value after changes (#706729)
-- idle: Use mutter api instead of direct X clals (#706006)
-- Translation updates
-
-===============
-Version  3.9.90
-===============
-
-- gnome-rr: Add api to get physical size
-- gnome-rr: Add async constructor
-- gnome-rr: Port to mutter dbus api (#705510)
-- xkb: Prevent a crash (#705885)
-- Translation updates
+* idle-monitor: Allow multiple watches per alarm (#696522)
+* idle-monitor: Make per-device monitor fallible (#696118)
+* Translation updates
 
 ==============
-Version  3.9.5
+Version 3.7.92
 ==============
 
-- xkb: Ensure strings are UTF-8
-- gnome-rr: Fix a crash
-- gnome-rr: Be more careful when parsing EDID
-- wall-clock: Initialize gettext
-- gnome-bg: Objects without a filename are not slideshows
-- gnome-xkb-info: Fix memory leaks
-- Translation updates
+* Don't store duplicated layouts in locale tables
+* Translation updates
 
 ==============
-Version  3.9.1
+Version 3.7.91
 ==============
 
-- gnome-xkb-info: Don't store duplicated layouts in locale tables
-- idle-monitor: Make per-device monitor fallible
-- wall-clock: Move ratio from msg id's to translations
-- idle-monitor: Allow multiple watches per alarm
-- Translation updates
+* GnomeBg:
+- remove ability to not draw background (#690378)
+
+* GnomeRR:
+- use 'Built-in Display' instead of 'Laptop' (#679794)
+
+* Translation updates: Punjabi, Russian, Hebrew, Norwegian bokmål,
+  Slovak, Gujarati, Brazilian Portuguese, Vietnamese, Spanish,
+  Polish
 
 ==============
 Version 3.7.90
diff -Nru gnome-desktop3-3.12.0/po/ar.po gnome-desktop3-3.8.4/po/ar.po
--- gnome-desktop3-3.12.0/po/ar.po	2013-11-11 17:23:17.000000000 +0000
+++ gnome-desktop3-3.8.4/po/ar.po	2013-09-04 11:15:57.000000000 +0000
@@ -3,15 +3,15 @@
 # Copyright (C) 2004 THE PACKAGE'S COPYRIGHT HOLDER
 # Sayed Jaffer Al-Mosawi , 2002.
 # Djihed Afifi , 2006.
-# Khaled Hosny , 2006, 2007, 2008, 2009, 2010, 2012, 2013.
+# Khaled Hosny , 2006, 2007, 2008, 2009, 2010, 2012.
 # Anas Husseini , 2007.
 msgid ""
 msgstr ""
 "Project-Id-Version: gnome-desktop.HEAD.ar\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-09-22 10:06+0200\n"
-"PO-Revision-Date: 2013-09-22 10:08+0200\n"
-"Last-Translator: Khaled Hosny \n"
+"POT-Creation-Date: 2012-12-24 13:59+0200\n"
+"PO-Revision-Date: 2012-09-27 02:38-0000\n"
+"Last-Translator: Mohamed Touhami MAHDI \n"
 "Language-Team: Arabic \n"
 "Language: ar\n"
 "MIME-Version: 1.0\n"
@@ -19,53 +19,119 @@
 "Content-Transfer-Encoding: 8bit\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-rc1\n"
+"X-Generator: Virtaal 0.7.0\n"
 "X-Project-Style: gnome\n"
 
-#: ../libgnome-desktop/gnome-languages.c:804
-msgid "Unspecified"
-msgstr "غير محددة"
+#. Translators: "Unknown" here is used to identify a monitor for which
+#. * we don't know the vendor. When a vendor is known, the name of the
+#. * vendor is used.
+#: ../libgnome-desktop/display-name.c:91
+msgctxt "Monitor vendor"
+msgid "Unknown"
+msgstr "مجهول"
 
-#: ../libgnome-desktop/gnome-rr-config.c:743
+#: ../libgnome-desktop/gnome-desktop-utils.c:135
+msgid "Cannot find a terminal, using xterm, even if it may not work"
+msgstr "تعذّر العثور على طرفية، سأستعمل xterm، حتى وإن كان قد لا يعمل"
+
+#. Translators: a CRTC is a CRT Controller (this is X terminology).
+#: ../libgnome-desktop/gnome-rr.c:452
+#, c-format
+msgid "could not get the screen resources (CRTCs, outputs, modes)"
+msgstr "تعذّرت معرفة موارد الشاشة (CRTC، الخرج، الأوضاع)"
+
+#: ../libgnome-desktop/gnome-rr.c:472
+#, c-format
+msgid "unhandled X error while getting the range of screen sizes"
+msgstr "حدث خطأ X غير معروف أثناء جلب مدى أحجام الشاشة"
+
+#: ../libgnome-desktop/gnome-rr.c:478
+#, c-format
+msgid "could not get the range of screen sizes"
+msgstr "تعذّر جلب مدى أحجام الشاشة"
+
+#: ../libgnome-desktop/gnome-rr.c:769
+#, c-format
+msgid "RANDR extension is not present"
+msgstr "امتداد RANDR غير موجود"
+
+#: ../libgnome-desktop/gnome-rr.c:1577
+#, c-format
+msgid "could not get information about output %d"
+msgstr "تعذّر جلب معلومات عن الخرْج %d"
+
+#. Translators: the "position", "size", and "maximum"
+#. * words here are not keywords; please translate them
+#. * as usual.  A CRTC is a CRT Controller (this is X terminology)
+#: ../libgnome-desktop/gnome-rr.c:2170
+#, c-format
+msgid ""
+"requested position/size for CRTC %d is outside the allowed limit: position="
+"(%d, %d), size=(%d, %d), maximum=(%d, %d)"
+msgstr ""
+"الموضع\\الحجم المطلوب ل‍ CRTC %d خارج المدى المسموح: الموضع=(%d، %d)، الحجم="
+"(%d، %d)، الأقصي=(%d، %d)"
+
+#: ../libgnome-desktop/gnome-rr.c:2206
+#, c-format
+msgid "could not set the configuration for CRTC %d"
+msgstr "تعذّر ضبط إعدادات CRTC %d"
+
+#: ../libgnome-desktop/gnome-rr.c:2351
+#, c-format
+msgid "could not get information about CRTC %d"
+msgstr "تعذّر جلب معلومات عن CRTC %d"
+
+#: ../libgnome-desktop/gnome-rr-config.c:558
+msgid "Laptop"
+msgstr "حاسوب محمول"
+
+#: ../libgnome-desktop/gnome-rr-config.c:713
+#, c-format
+msgid ""
+"none of the saved display configurations matched the active configuration"
+msgstr "لم يطابق أي من تضبيطات العرض المحفوظة التضبيط النشط"
+
+#: ../libgnome-desktop/gnome-rr-config.c:1469
 #, c-format
 msgid "CRTC %d cannot drive output %s"
 msgstr ""
 
-#: ../libgnome-desktop/gnome-rr-config.c:750
+#: ../libgnome-desktop/gnome-rr-config.c:1476
 #, c-format
 msgid "output %s does not support mode %dx%d@%dHz"
 msgstr ""
 
-#: ../libgnome-desktop/gnome-rr-config.c:761
+#: ../libgnome-desktop/gnome-rr-config.c:1487
 #, c-format
-msgid "CRTC %d does not support rotation=%d"
-msgstr ""
+msgid "CRTC %d does not support rotation=%s"
+msgstr "CRTC %d لايحتمل التدور=%s"
 
-#: ../libgnome-desktop/gnome-rr-config.c:774
+#: ../libgnome-desktop/gnome-rr-config.c:1501
 #, c-format
 msgid ""
 "output %s does not have the same parameters as another cloned output:\n"
 "existing mode = %d, new mode = %d\n"
 "existing coordinates = (%d, %d), new coordinates = (%d, %d)\n"
-"existing rotation = %d, new rotation = %d"
+"existing rotation = %s, new rotation = %s"
 msgstr ""
 
-#: ../libgnome-desktop/gnome-rr-config.c:789
+#: ../libgnome-desktop/gnome-rr-config.c:1516
 #, c-format
 msgid "cannot clone to output %s"
 msgstr "تعذر نسخ المحصول %s"
 
-#: ../libgnome-desktop/gnome-rr-config.c:915
+#: ../libgnome-desktop/gnome-rr-config.c:1685
 #, c-format
 msgid "Trying modes for CRTC %d\n"
 msgstr "تجريب أنماط من أجل CRTC%d\n"
 
-#: ../libgnome-desktop/gnome-rr-config.c:939
+#: ../libgnome-desktop/gnome-rr-config.c:1709
 #, c-format
 msgid "CRTC %d: trying mode %dx%d@%dHz with output at %dx%d@%dHz (pass %d)\n"
 msgstr ""
 
-#: ../libgnome-desktop/gnome-rr-config.c:986
+#: ../libgnome-desktop/gnome-rr-config.c:1756
 #, c-format
 msgid ""
 "could not assign CRTCs to outputs:\n"
@@ -74,7 +140,7 @@
 "إستحالة تعين CRTCs إلى المخرجات: \n"
 "%s"
 
-#: ../libgnome-desktop/gnome-rr-config.c:990
+#: ../libgnome-desktop/gnome-rr-config.c:1760
 #, c-format
 msgid ""
 "none of the selected modes were compatible with the possible modes:\n"
@@ -86,7 +152,7 @@
 #. Translators: the "requested", "minimum", and
 #. * "maximum" words here are not keywords; please
 #. * translate them as usual.
-#: ../libgnome-desktop/gnome-rr-config.c:1071
+#: ../libgnome-desktop/gnome-rr-config.c:1838
 #, c-format
 msgid ""
 "required virtual size does not fit available size: requested=(%d, %d), "
@@ -97,135 +163,84 @@
 
 #. Translators: This is the time format with full date used
 #. in 24-hour mode.
-#: ../libgnome-desktop/gnome-wall-clock.c:270
-msgid "%a %b %e, %R:%S"
+#. The character between %R and %S is U+2236 RATIO
+#: ../libgnome-desktop/gnome-wall-clock.c:247
+msgid "%a %b %e, %R∶%S"
 msgstr "%A %e %B، %R:%S"
 
-#: ../libgnome-desktop/gnome-wall-clock.c:271
+#: ../libgnome-desktop/gnome-wall-clock.c:248
 msgid "%a %b %e, %R"
 msgstr "%A %e %B، %R"
 
 #. Translators: This is the time format with day used
 #. in 24-hour mode.
-#: ../libgnome-desktop/gnome-wall-clock.c:275
-msgid "%a %R:%S"
+#. The character between %R and %S is U+2236 RATIO
+#: ../libgnome-desktop/gnome-wall-clock.c:253
+msgid "%a %R∶%S"
 msgstr "%A %R:%S"
 
-#: ../libgnome-desktop/gnome-wall-clock.c:276
+#: ../libgnome-desktop/gnome-wall-clock.c:254
 msgid "%a %R"
 msgstr "%A %R"
 
 #. Translators: This is the time format without date used
 #. in 24-hour mode.
-#: ../libgnome-desktop/gnome-wall-clock.c:280
-msgid "%R:%S"
+#. The character between %R and %S is U+2236 RATIO
+#: ../libgnome-desktop/gnome-wall-clock.c:259
+msgid "%R∶%S"
 msgstr "%R:%S"
 
-#: ../libgnome-desktop/gnome-wall-clock.c:280
+#: ../libgnome-desktop/gnome-wall-clock.c:259
 msgid "%R"
 msgstr "%R"
 
 #. Translators: This is a time format with full date used
 #. for AM/PM.
-#: ../libgnome-desktop/gnome-wall-clock.c:286
-msgid "%a %b %e, %l:%M:%S %p"
+#. The Unicode characters are U+2236 RATIO and
+#. U+2009 THIN SPACE
+#: ../libgnome-desktop/gnome-wall-clock.c:267
+msgid "%a %b %e, %l∶%M∶%S %p"
 msgstr "%A %e %B، %l:%M:%S %p"
 
-#: ../libgnome-desktop/gnome-wall-clock.c:287
-msgid "%a %b %e, %l:%M %p"
+#: ../libgnome-desktop/gnome-wall-clock.c:268
+msgid "%a %b %e, %l∶%M %p"
 msgstr "%A %e %B، %l:%M %p"
 
 #. Translators: This is a time format with day used
 #. for AM/PM.
-#: ../libgnome-desktop/gnome-wall-clock.c:291
-msgid "%a %l:%M:%S %p"
+#. The Unicode characters are U+2236 RATIO and
+#. U+2009 THIN SPACE
+#: ../libgnome-desktop/gnome-wall-clock.c:274
+msgid "%a %l∶%M∶%S %p"
 msgstr "%A %l:%M:%S %p"
 
-#: ../libgnome-desktop/gnome-wall-clock.c:292
-msgid "%a %l:%M %p"
-msgstr "%A %l:%M %p"
+#: ../libgnome-desktop/gnome-wall-clock.c:275
+msgid "%a %l∶%M %p"
+msgstr "%A %Ol:%OM %p"
 
 #. Translators: This is a time format without date used
 #. for AM/PM.
-#: ../libgnome-desktop/gnome-wall-clock.c:296
-msgid "%l:%M:%S %p"
+#. The Unicode characters are U+2236 RATIO and
+#. U+2009 THIN SPACE
+#: ../libgnome-desktop/gnome-wall-clock.c:281
+msgid "%l∶%M∶%S %p"
 msgstr "%l:%M:%S %p"
 
-#: ../libgnome-desktop/gnome-wall-clock.c:297
-msgid "%l:%M %p"
+#: ../libgnome-desktop/gnome-wall-clock.c:282
+msgid "%l∶%M %p"
 msgstr "%l:%M %p"
 
-#~ msgctxt "Monitor vendor"
-#~ msgid "Unknown"
-#~ msgstr "مجهول"
-
-#~ msgid "could not get the screen resources (CRTCs, outputs, modes)"
-#~ msgstr "تعذّرت معرفة موارد الشاشة (CRTC، الخرج، الأوضاع)"
-
-#~ msgid "unhandled X error while getting the range of screen sizes"
-#~ msgstr "حدث خطأ X غير معروف أثناء جلب مدى أحجام الشاشة"
-
-#~ msgid "could not get the range of screen sizes"
-#~ msgstr "تعذّر جلب مدى أحجام الشاشة"
-
-#~ msgid "RANDR extension is not present"
-#~ msgstr "امتداد RANDR غير موجود"
-
-#~ msgid "could not get information about output %d"
-#~ msgstr "تعذّر جلب معلومات عن الخرْج %d"
-
-#~ msgid "Built-in Display"
-#~ msgstr "شاشة مدمجة"
-
-#~ msgid "%s Display"
-#~ msgstr "شاشة %s"
-
-#~ msgid "Unknown Display"
-#~ msgstr "شاشة غير معروفة"
-
-#~ msgid ""
-#~ "requested position/size for CRTC %d is outside the allowed limit: "
-#~ "position=(%d, %d), size=(%d, %d), maximum=(%d, %d)"
-#~ msgstr ""
-#~ "الموضع\\الحجم المطلوب ل‍ CRTC %d خارج المدى المسموح: الموضع=(%d، %d)، "
-#~ "الحجم=(%d، %d)، الأقصي=(%d، %d)"
-
-#~ msgid "could not set the configuration for CRTC %d"
-#~ msgstr "تعذّر ضبط إعدادات CRTC %d"
-
-#~ msgid "could not get information about CRTC %d"
-#~ msgstr "تعذّر جلب معلومات عن CRTC %d"
-
-#~ msgid ""
-#~ "none of the saved display configurations matched the active configuration"
-#~ msgstr "لم يطابق أي من تضبيطات العرض المحفوظة التضبيط النشط"
-
-#~ msgid "%a %b %e, %R∶%S"
-#~ msgstr "%A %e %B، %R:%S"
+#~ msgid "Mirrored Displays"
+#~ msgstr "شاشات متطابقة"
 
-#~ msgid "%R∶%S"
+#~ msgid "%R:%S"
 #~ msgstr "%R:%S"
 
-#~ msgid "%a %l∶%M∶%S %p"
-#~ msgstr "%A %l:%M:%S %p"
-
-#~ msgid "%a %l∶%M %p"
-#~ msgstr "%A %Ol:%OM %p"
-
-#~ msgid "%l∶%M∶%S %p"
+#~ msgid "%l:%M:%S %p"
 #~ msgstr "%l:%M:%S %p"
 
-#~ msgid "%l∶%M %p"
+#~ msgid "%l:%M %p"
 #~ msgstr "%l:%M %p"
 
-#~ msgid "Cannot find a terminal, using xterm, even if it may not work"
-#~ msgstr "تعذّر العثور على طرفية، سأستعمل xterm، حتى وإن كان قد لا يعمل"
-
-#~ msgid "Laptop"
-#~ msgstr "حاسوب محمول"
-
-#~ msgid "Mirrored Displays"
-#~ msgstr "شاشات متطابقة"
-
 #~ msgid "Mirror Screens"
 #~ msgstr "شاشات متطابقة"
diff -Nru gnome-desktop3-3.12.0/po/as.po gnome-desktop3-3.8.4/po/as.po
--- gnome-desktop3-3.12.0/po/as.po	2013-11-11 17:23:17.000000000 +0000
+++ gnome-desktop3-3.8.4/po/as.po	2013-09-04 11:15:57.000000000 +0000
@@ -8,8 +8,8 @@
 "Project-Id-Version: as\n"
 "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=gnome-"
 "desktop&keywords=I18N+L10N&component=general\n"
-"POT-Creation-Date: 2013-09-11 19:11+0000\n"
-"PO-Revision-Date: 2013-09-12 18:17+0530\n"
+"POT-Creation-Date: 2013-03-04 10:03+0000\n"
+"PO-Revision-Date: 2013-03-07 15:43+0530\n"
 "Last-Translator: Nilamdyuti Goswami \n"
 "Language-Team: Assamese \n"
 "Language: as\n"
@@ -19,55 +19,132 @@
 "X-Generator: Lokalize 1.5\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
 
+#. Translators: "Unknown" here is used to identify a monitor for which
+#. * we don't know the vendor. When a vendor is known, the name of the
+#. * vendor is used.
+#: ../libgnome-desktop/display-name.c:107
+msgctxt "Monitor vendor"
+msgid "Unknown"
+msgstr "অজ্ঞাত"
+
 #: ../libgnome-desktop/gnome-languages.c:804
 msgid "Unspecified"
 msgstr "অধাৰ্য্যত"
 
-#: ../libgnome-desktop/gnome-rr-config.c:743
+#. Translators: a CRTC is a CRT Controller (this is X terminology).
+#: ../libgnome-desktop/gnome-rr.c:452
+#, c-format
+msgid "could not get the screen resources (CRTCs, outputs, modes)"
+msgstr "পৰ্দা সম্পদসমূহ (CRTC, আউটপুট, অৱস্থা) পোৱা নাযায়"
+
+#: ../libgnome-desktop/gnome-rr.c:472
+#, c-format
+msgid "unhandled X error while getting the range of screen sizes"
+msgstr ""
+"পৰ্দাৰ মাপৰ সীমা প্ৰাপ্ত কৰাৰ সময় উৎপন্ন X সংক্ৰান্ত এটা ত্ৰুটিৰ ব্যৱস্থাপনা "
+"কৰা সম্ভব "
+"নহয়"
+
+#: ../libgnome-desktop/gnome-rr.c:478
+#, c-format
+msgid "could not get the range of screen sizes"
+msgstr "পৰ্দাৰ মাপৰ সীমা প্ৰাপ্ত কৰিবলৈ ব্যৰ্থ"
+
+#: ../libgnome-desktop/gnome-rr.c:769
+#, c-format
+msgid "RANDR extension is not present"
+msgstr "RANDR সম্প্ৰসাৰন উপস্থিত নাই"
+
+#: ../libgnome-desktop/gnome-rr.c:1580
+#, c-format
+msgid "could not get information about output %d"
+msgstr "আউটপুট %d সম্বন্ধে কোনো তথ্য পোৱা নাযায়"
+
+#: ../libgnome-desktop/gnome-rr.c:1764
+msgid "Built-in Display"
+msgstr "বিল্ট-ইন প্ৰদৰ্শন"
+
+#. Translators: %s is the size of the monitor in inches
+#: ../libgnome-desktop/gnome-rr.c:1782
+#, c-format
+msgid "%s Display"
+msgstr "%s প্ৰদৰ্শন"
+
+#: ../libgnome-desktop/gnome-rr.c:1789
+#| msgctxt "Monitor vendor"
+#| msgid "Unknown"
+msgid "Unknown Display"
+msgstr "অজ্ঞাত প্ৰদৰ্শন"
+
+#. Translators: the "position", "size", and "maximum"
+#. * words here are not keywords; please translate them
+#. * as usual.  A CRTC is a CRT Controller (this is X terminology)
+#: ../libgnome-desktop/gnome-rr.c:2234
+#, c-format
+msgid ""
+"requested position/size for CRTC %d is outside the allowed limit: position="
+"(%d, %d), size=(%d, %d), maximum=(%d, %d)"
+msgstr ""
+"CRTC %d ৰ বাবে অনুৰোধ কৰা অবস্থান/মাপ সীমাবহিৰ্ভূত: অবস্থান=(%d, %d), মাপ=(%"
+"d, "
+"%d), সৰ্বাধিক=(%d, %d)"
+
+#: ../libgnome-desktop/gnome-rr.c:2270
+#, c-format
+msgid "could not set the configuration for CRTC %d"
+msgstr "CRTC %d ৰ বিন্যাস নিৰ্ধাৰণ কৰিবলৈ ব্যৰ্থ"
+
+#: ../libgnome-desktop/gnome-rr.c:2421
+#, c-format
+msgid "could not get information about CRTC %d"
+msgstr "CRTC %d সংক্ৰান্ত তথ্য প্ৰাপ্ত কৰিবলৈ ব্যৰ্থ"
+
+#: ../libgnome-desktop/gnome-rr-config.c:708
+#, c-format
+msgid ""
+"none of the saved display configurations matched the active configuration"
+msgstr ""
+"প্ৰদৰ্শন সংক্ৰান্ত সংৰক্ষিত কোনো বিন্যাসৰ সৈতে সক্ৰিয় বিন্যাসৰ মিল পোৱা নাযায়"
+
+#: ../libgnome-desktop/gnome-rr-config.c:1464
 #, c-format
 msgid "CRTC %d cannot drive output %s"
 msgstr "CRTC %d এ আউটপুট %s চলাব নোৱাৰে"
 
-#: ../libgnome-desktop/gnome-rr-config.c:750
+#: ../libgnome-desktop/gnome-rr-config.c:1471
 #, c-format
 msgid "output %s does not support mode %dx%d@%dHz"
 msgstr "আউটপুট %s এ %dx%d@%dHz অৱস্থা সমৰ্থন নকৰে"
 
-#: ../libgnome-desktop/gnome-rr-config.c:761
+#: ../libgnome-desktop/gnome-rr-config.c:1482
+#, c-format
+msgid "CRTC %d does not support rotation=%s"
+msgstr "CRTC %d এ ঘূৰ্ণন=%s সমৰ্থন নকৰে"
+
+#: ../libgnome-desktop/gnome-rr-config.c:1496
 #, c-format
-#| msgid "CRTC %d does not support rotation=%s"
-msgid "CRTC %d does not support rotation=%d"
-msgstr "CRTC %d এ ঘূৰ্ণন=%d সমৰ্থন নকৰে"
-
-#: ../libgnome-desktop/gnome-rr-config.c:774
-#, c-format
-#| msgid ""
-#| "output %s does not have the same parameters as another cloned output:\n"
-#| "existing mode = %d, new mode = %d\n"
-#| "existing coordinates = (%d, %d), new coordinates = (%d, %d)\n"
-#| "existing rotation = %s, new rotation = %s"
 msgid ""
 "output %s does not have the same parameters as another cloned output:\n"
 "existing mode = %d, new mode = %d\n"
 "existing coordinates = (%d, %d), new coordinates = (%d, %d)\n"
-"existing rotation = %d, new rotation = %d"
+"existing rotation = %s, new rotation = %s"
 msgstr ""
 "আউটপুট %s ৰ অন্য ক্লন্ড আউটপুটৰ নিচিনা একে প্ৰাচল নাই:\n"
 "উপলব্ধ অৱস্থা = %d, নতুন অৱস্থা = %d\n"
-"উপলব্ধ অক্ষসমূহ= (%d, %d), নতুন অক্ষসমূহ = (%d, %d)\n"
-"উপলব্ধ ঘূৰ্ণন = %d, নতুন ঘূৰ্ণন = %d"
+"উপলব্ধ স্থানাংকসমূহ= (%d, %d), নতুন স্থানাংকসমূহ = (%d, %d)\n"
+"উপলব্ধ ঘূৰ্ণন = %s, নতুন ঘূৰ্ণন = %s"
 
-#: ../libgnome-desktop/gnome-rr-config.c:789
+#: ../libgnome-desktop/gnome-rr-config.c:1511
 #, c-format
 msgid "cannot clone to output %s"
 msgstr "আউটপুট %s লে ক্লন কৰিব নোৱাৰি"
 
-#: ../libgnome-desktop/gnome-rr-config.c:915
+#: ../libgnome-desktop/gnome-rr-config.c:1680
 #, c-format
 msgid "Trying modes for CRTC %d\n"
 msgstr "CRTC %d ৰ কাৰণে অৱস্থাসমূহ চেষ্টা কৰা হৈ আছে\n"
 
-#: ../libgnome-desktop/gnome-rr-config.c:939
+#: ../libgnome-desktop/gnome-rr-config.c:1704
 #, c-format
 msgid "CRTC %d: trying mode %dx%d@%dHz with output at %dx%d@%dHz (pass %d)\n"
 msgstr ""
@@ -75,7 +152,7 @@
 "(pass "
 "%d)\n"
 
-#: ../libgnome-desktop/gnome-rr-config.c:986
+#: ../libgnome-desktop/gnome-rr-config.c:1751
 #, c-format
 msgid ""
 "could not assign CRTCs to outputs:\n"
@@ -84,7 +161,7 @@
 "CRTCসমূহক আউটপুটসমূহলে ধাৰ্য্য কৰিব নোৱাৰি:\n"
 "%s"
 
-#: ../libgnome-desktop/gnome-rr-config.c:990
+#: ../libgnome-desktop/gnome-rr-config.c:1755
 #, c-format
 msgid ""
 "none of the selected modes were compatible with the possible modes:\n"
@@ -96,7 +173,7 @@
 #. Translators: the "requested", "minimum", and
 #. * "maximum" words here are not keywords; please
 #. * translate them as usual.
-#: ../libgnome-desktop/gnome-rr-config.c:1071
+#: ../libgnome-desktop/gnome-rr-config.c:1833
 #, c-format
 msgid ""
 "required virtual size does not fit available size: requested=(%d, %d), "
@@ -108,31 +185,32 @@
 
 #. Translators: This is the time format with full date used
 #. in 24-hour mode.
-#: ../libgnome-desktop/gnome-wall-clock.c:270
-#| msgid "%a %b %e, %R"
-msgid "%a %b %e, %R:%S"
-msgstr "%a %b %e, %R:%S"
+#. The character between %R and %S is U+2236 RATIO
+#: ../libgnome-desktop/gnome-wall-clock.c:268
+msgid "%a %b %e, %R∶%S"
+msgstr "%a %b %e, %R∶%S"
 
-#: ../libgnome-desktop/gnome-wall-clock.c:271
+#: ../libgnome-desktop/gnome-wall-clock.c:269
 msgid "%a %b %e, %R"
 msgstr "%a %b %e, %R"
 
 #. Translators: This is the time format with day used
 #. in 24-hour mode.
-#: ../libgnome-desktop/gnome-wall-clock.c:275
-#| msgid "%a %R∶%S"
-msgid "%a %R:%S"
-msgstr "%a %R:%S"
+#. The character between %R and %S is U+2236 RATIO
+#: ../libgnome-desktop/gnome-wall-clock.c:274
+msgid "%a %R∶%S"
+msgstr "%a %R∶%S"
 
-#: ../libgnome-desktop/gnome-wall-clock.c:276
+#: ../libgnome-desktop/gnome-wall-clock.c:275
 msgid "%a %R"
 msgstr "%a %R"
 
 #. Translators: This is the time format without date used
 #. in 24-hour mode.
+#. The character between %R and %S is U+2236 RATIO
 #: ../libgnome-desktop/gnome-wall-clock.c:280
-msgid "%R:%S"
-msgstr "%R:%S"
+msgid "%R∶%S"
+msgstr "%R∶%S"
 
 #: ../libgnome-desktop/gnome-wall-clock.c:280
 msgid "%R"
@@ -140,105 +218,39 @@
 
 #. Translators: This is a time format with full date used
 #. for AM/PM.
-#: ../libgnome-desktop/gnome-wall-clock.c:286
-#| msgid "%a %b %e, %l∶%M∶%S %p"
-msgid "%a %b %e, %l:%M:%S %p"
-msgstr "%a %b %e, %l:%M:%S %p"
-
-#: ../libgnome-desktop/gnome-wall-clock.c:287
-#| msgid "%a %b %e, %l∶%M %p"
-msgid "%a %b %e, %l:%M %p"
-msgstr "%a %b %e, %l:%M %p"
+#. The Unicode characters are U+2236 RATIO and
+#. U+2009 THIN SPACE
+#: ../libgnome-desktop/gnome-wall-clock.c:288
+msgid "%a %b %e, %l∶%M∶%S %p"
+msgstr "%a %b %e, %l∶%M∶%S %p"
+
+#: ../libgnome-desktop/gnome-wall-clock.c:289
+msgid "%a %b %e, %l∶%M %p"
+msgstr "%a %b %e, %l∶%M %p"
 
 #. Translators: This is a time format with day used
 #. for AM/PM.
-#: ../libgnome-desktop/gnome-wall-clock.c:291
-#| msgid "%l:%M:%S %p"
-msgid "%a %l:%M:%S %p"
-msgstr "%a %l:%M:%S %p"
-
-#: ../libgnome-desktop/gnome-wall-clock.c:292
-#| msgid "%l:%M %p"
-msgid "%a %l:%M %p"
-msgstr "%a %l:%M %p"
+#. The Unicode characters are U+2236 RATIO and
+#. U+2009 THIN SPACE
+#: ../libgnome-desktop/gnome-wall-clock.c:295
+msgid "%a %l∶%M∶%S %p"
+msgstr "%a %l∶%M∶%S %p"
 
-#. Translators: This is a time format without date used
-#. for AM/PM.
 #: ../libgnome-desktop/gnome-wall-clock.c:296
-msgid "%l:%M:%S %p"
-msgstr "%l:%M:%S %p"
-
-#: ../libgnome-desktop/gnome-wall-clock.c:297
-msgid "%l:%M %p"
-msgstr "%l:%M %p"
-
-#~ msgctxt "Monitor vendor"
-#~ msgid "Unknown"
-#~ msgstr "অজ্ঞাত"
-
-#~ msgid "could not get the screen resources (CRTCs, outputs, modes)"
-#~ msgstr "পৰ্দা সম্পদসমূহ (CRTC, আউটপুট, অৱস্থা) পোৱা নাযায়"
-
-#~ msgid "unhandled X error while getting the range of screen sizes"
-#~ msgstr ""
-#~ "পৰ্দাৰ মাপৰ সীমা প্ৰাপ্ত কৰাৰ সময় উৎপন্ন X সংক্ৰান্ত এটা ত্ৰুটিৰ ব্যৱস্থাপনা কৰা "
-#~ "সম্ভব নহয়"
-
-#~ msgid "could not get the range of screen sizes"
-#~ msgstr "পৰ্দাৰ মাপৰ সীমা প্ৰাপ্ত কৰিবলৈ ব্যৰ্থ"
-
-#~ msgid "RANDR extension is not present"
-#~ msgstr "RANDR সম্প্ৰসাৰন উপস্থিত নাই"
-
-#~ msgid "could not get information about output %d"
-#~ msgstr "আউটপুট %d সম্বন্ধে কোনো তথ্য পোৱা নাযায়"
-
-#~ msgid "Built-in Display"
-#~ msgstr "বিল্ট-ইন প্ৰদৰ্শন"
-
-#~ msgid "%s Display"
-#~ msgstr "%s প্ৰদৰ্শন"
-
-#~| msgctxt "Monitor vendor"
-#~| msgid "Unknown"
-#~ msgid "Unknown Display"
-#~ msgstr "অজ্ঞাত প্ৰদৰ্শন"
-
-#~ msgid ""
-#~ "requested position/size for CRTC %d is outside the allowed limit: "
-#~ "position=(%d, %d), size=(%d, %d), maximum=(%d, %d)"
-#~ msgstr ""
-#~ "CRTC %d ৰ বাবে অনুৰোধ কৰা অবস্থান/মাপ সীমাবহিৰ্ভূত: অবস্থান=(%d, %d), মাপ=(%d, "
-#~ "%d), সৰ্বাধিক=(%d, %d)"
-
-#~ msgid "could not set the configuration for CRTC %d"
-#~ msgstr "CRTC %d ৰ বিন্যাস নিৰ্ধাৰণ কৰিবলৈ ব্যৰ্থ"
-
-#~ msgid "could not get information about CRTC %d"
-#~ msgstr "CRTC %d সংক্ৰান্ত তথ্য প্ৰাপ্ত কৰিবলৈ ব্যৰ্থ"
-
-#~ msgid ""
-#~ "none of the saved display configurations matched the active configuration"
-#~ msgstr ""
-#~ "প্ৰদৰ্শন সংক্ৰান্ত সংৰক্ষিত কোনো বিন্যাসৰ সৈতে সক্ৰিয় বিন্যাসৰ মিল পোৱা নাযায়"
-
-#~ msgid "%a %b %e, %R∶%S"
-#~ msgstr "%a %b %e, %R∶%S"
-
-#~ msgid "%R∶%S"
-#~ msgstr "%R∶%S"
-
-#~ msgid "%a %l∶%M∶%S %p"
-#~ msgstr "%a %l∶%M∶%S %p"
+msgid "%a %l∶%M %p"
+msgstr "%a %l∶%M %p"
 
-#~ msgid "%a %l∶%M %p"
-#~ msgstr "%a %l∶%M %p"
-
-#~ msgid "%l∶%M∶%S %p"
-#~ msgstr "%l∶%M∶%S %p"
-
-#~ msgid "%l∶%M %p"
-#~ msgstr "%l∶%M %p"
+#. Translators: This is a time format without date used
+#. for AM/PM.
+#. The Unicode characters are U+2236 RATIO and
+#. U+2009 THIN SPACE
+#: ../libgnome-desktop/gnome-wall-clock.c:302
+msgid "%l∶%M∶%S %p"
+msgstr "%l∶%M∶%S %p"
+
+#: ../libgnome-desktop/gnome-wall-clock.c:303
+msgid "%l∶%M %p"
+msgstr "%l∶%M %p"
 
 #~ msgid "Cannot find a terminal, using xterm, even if it may not work"
 #~ msgstr ""
@@ -251,6 +263,15 @@
 #~ msgid "Mirrored Displays"
 #~ msgstr "আইনা কৰা প্ৰদৰ্শনসমূহ"
 
+#~ msgid "%R:%S"
+#~ msgstr "%R:%S"
+
+#~ msgid "%l:%M:%S %p"
+#~ msgstr "%l:%M:%S %p"
+
+#~ msgid "%l:%M %p"
+#~ msgstr "%l:%M %p"
+
 #~ msgid "Mirror Screens"
 #~ msgstr "আইনা পৰ্দাসমূহ"
 
diff -Nru gnome-desktop3-3.12.0/po/be.po gnome-desktop3-3.8.4/po/be.po
--- gnome-desktop3-3.12.0/po/be.po	2013-11-11 17:23:17.000000000 +0000
+++ gnome-desktop3-3.8.4/po/be.po	2013-03-18 09:50:35.000000000 +0000
@@ -1,5 +1,5 @@
 # Vital Khilko , 2002, 2003.
-# Ihar Hrachyshka , 2007, 2013.
+# Ihar Hrachyshka , 2007.
 # Alexander Nyakhaychyk , 2008.
 # Yuri Matsuk , 2011.
 #
@@ -8,9 +8,9 @@
 "Project-Id-Version: gnome-desktop.master\n"
 "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=gnome-"
 "desktop&keywords=I18N+L10N&component=general\n"
-"POT-Creation-Date: 2013-08-27 10:49+0000\n"
+"POT-Creation-Date: 2013-03-16 18:37+0000\n"
 "PO-Revision-Date: 2012-09-07 18:54+0300\n"
-"Last-Translator: Ihar Hrachyshka \n"
+"Last-Translator: Yuri Matsuk \n"
 "Language-Team: Belarusian \n"
 "Language: be\n"
 "MIME-Version: 1.0\n"
@@ -19,57 +19,137 @@
 "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"
 
+#. Translators: "Unknown" here is used to identify a monitor for which
+#. * we don't know the vendor. When a vendor is known, the name of the
+#. * vendor is used.
+#: ../libgnome-desktop/display-name.c:107
+msgctxt "Monitor vendor"
+msgid "Unknown"
+msgstr "Невядомы"
+
 #: ../libgnome-desktop/gnome-languages.c:804
 msgid "Unspecified"
 msgstr "Невядома"
 
-#: ../libgnome-desktop/gnome-rr-config.c:743
+#. Translators: a CRTC is a CRT Controller (this is X terminology).
+#: ../libgnome-desktop/gnome-rr.c:452
+#, c-format
+msgid "could not get the screen resources (CRTCs, outputs, modes)"
+msgstr ""
+"не ўдалося сабраць звесткі аб рэсурсах экрана (кантролеры ЭПТ, выхады, "
+"рэжымы)"
+
+#: ../libgnome-desktop/gnome-rr.c:472
+#, c-format
+msgid "unhandled X error while getting the range of screen sizes"
+msgstr ""
+"падчас збору звестак аб дыяпазоне памераў экрана ўзнікла неапрацаваная "
+"памылка сістэмы X"
+
+#: ../libgnome-desktop/gnome-rr.c:478
+#, c-format
+msgid "could not get the range of screen sizes"
+msgstr "не ўдалося сабраць звесткі аб дыяпазоне памераў экрана"
+
+#: ../libgnome-desktop/gnome-rr.c:769
+#, c-format
+msgid "RANDR extension is not present"
+msgstr "пашырэнне RANDR адсутнічае"
+
+#: ../libgnome-desktop/gnome-rr.c:1580
+#, c-format
+msgid "could not get information about output %d"
+msgstr "не ўдалося атрымаць звесткі аб выхадзе %d"
+
+#: ../libgnome-desktop/gnome-rr.c:1764
+msgid "Built-in Display"
+msgstr "Убудаваны дысплей"
+
+#. Translators: %s is the size of the monitor in inches
+#: ../libgnome-desktop/gnome-rr.c:1782
+#, c-format
+msgid "%s Display"
+msgstr "%s-дысплей"
+
+#: ../libgnome-desktop/gnome-rr.c:1789
+msgid "Unknown Display"
+msgstr "Невядомы дысплей"
+
+#. Translators: the "position", "size", and "maximum"
+#. * words here are not keywords; please translate them
+#. * as usual.  A CRTC is a CRT Controller (this is X terminology)
+#: ../libgnome-desktop/gnome-rr.c:2234
+#, c-format
+msgid ""
+"requested position/size for CRTC %d is outside the allowed limit: position="
+"(%d, %d), size=(%d, %d), maximum=(%d, %d)"
+msgstr ""
+"запатрабаваная пазіцыя/памер ЭПТ %d па-за дазволенымі межамі: пазіцыя=(%d, "
+"%d), памер=(%d, %d), максімум=(%d, %d)"
+
+#: ../libgnome-desktop/gnome-rr.c:2270
+#, c-format
+msgid "could not set the configuration for CRTC %d"
+msgstr "не ўдалося настроіць кантролер ЭПТ %d"
+
+#: ../libgnome-desktop/gnome-rr.c:2421
+#, c-format
+msgid "could not get information about CRTC %d"
+msgstr "не ўдалося атрымаць звесткі пра кантролер ЭПТ %d"
+
+#: ../libgnome-desktop/gnome-rr-config.c:708
+#, c-format
+msgid ""
+"none of the saved display configurations matched the active configuration"
+msgstr "ні адна з захаваных канфігурацый экрана не адпавядае актыўнай"
+
+#: ../libgnome-desktop/gnome-rr-config.c:1464
 #, c-format
 msgid "CRTC %d cannot drive output %s"
 msgstr "кантролер ЭПТ %d не можа кіраваць выхадам %s"
 
-#: ../libgnome-desktop/gnome-rr-config.c:750
+#: ../libgnome-desktop/gnome-rr-config.c:1471
 #, c-format
 msgid "output %s does not support mode %dx%d@%dHz"
 msgstr "выхад %s не падтрымлівае рэжым %dx%d@%dГц"
 
-#: ../libgnome-desktop/gnome-rr-config.c:761
+#: ../libgnome-desktop/gnome-rr-config.c:1482
 #, c-format
-msgid "CRTC %d does not support rotation=%d"
-msgstr "кантролер ЭПТ %d не падтрымлівае паварот=%d"
+msgid "CRTC %d does not support rotation=%s"
+msgstr "кантролер ЭПТ %d не падтрымлівае паварот=%s"
 
-#: ../libgnome-desktop/gnome-rr-config.c:774
+#: ../libgnome-desktop/gnome-rr-config.c:1496
 #, c-format
 msgid ""
 "output %s does not have the same parameters as another cloned output:\n"
 "existing mode = %d, new mode = %d\n"
 "existing coordinates = (%d, %d), new coordinates = (%d, %d)\n"
-"existing rotation = %d, new rotation = %d"
+"existing rotation = %s, new rotation = %s"
 msgstr ""
 "параметры выхаду %s адрозніваюцца ад параметраў іншага кланіраванага "
 "выхаду:\n"
 "наяўны рэжым = %d, новы рэжым = %d\n"
 "наяўныя каардынаты = (%d, %d), новыя каардынаты = (%d, %d)\n"
-"наяўны паварот = %d, новы паварот = %d"
+"наяўны паварот = %s, новы паварот = %s"
 
-#: ../libgnome-desktop/gnome-rr-config.c:789
+#: ../libgnome-desktop/gnome-rr-config.c:1511
 #, c-format
 msgid "cannot clone to output %s"
 msgstr "не ўдалося кланіраваць у выхад %s"
 
-#: ../libgnome-desktop/gnome-rr-config.c:915
+#: ../libgnome-desktop/gnome-rr-config.c:1680
 #, c-format
 msgid "Trying modes for CRTC %d\n"
 msgstr "Выпрабоўванне рэжымаў кантролера ЭПТ %d\n"
 
-#: ../libgnome-desktop/gnome-rr-config.c:939
+#: ../libgnome-desktop/gnome-rr-config.c:1704
 #, c-format
 msgid "CRTC %d: trying mode %dx%d@%dHz with output at %dx%d@%dHz (pass %d)\n"
 msgstr ""
 "кантролер ЭПТ %d: выпрабоўванне рэжыму %dx%d@%dГц з выхадам на %dx%d@%dГц "
 "(спроба %d)\n"
 
-#: ../libgnome-desktop/gnome-rr-config.c:986
+#: ../libgnome-desktop/gnome-rr-config.c:1751
 #, c-format
 msgid ""
 "could not assign CRTCs to outputs:\n"
@@ -78,7 +158,7 @@
 "не ўдалося прызначыць кантролеры ЭПТ для выхадаў:\n"
 "%s"
 
-#: ../libgnome-desktop/gnome-rr-config.c:990
+#: ../libgnome-desktop/gnome-rr-config.c:1755
 #, c-format
 msgid ""
 "none of the selected modes were compatible with the possible modes:\n"
@@ -90,7 +170,7 @@
 #. Translators: the "requested", "minimum", and
 #. * "maximum" words here are not keywords; please
 #. * translate them as usual.
-#: ../libgnome-desktop/gnome-rr-config.c:1071
+#: ../libgnome-desktop/gnome-rr-config.c:1833
 #, c-format
 msgid ""
 "required virtual size does not fit available size: requested=(%d, %d), "
@@ -101,29 +181,32 @@
 
 #. Translators: This is the time format with full date used
 #. in 24-hour mode.
-#: ../libgnome-desktop/gnome-wall-clock.c:270
-msgid "%a %b %e, %R:%S"
-msgstr "%a, %e %b, %R:%S"
+#. The character between %R and %S is U+2236 RATIO
+#: ../libgnome-desktop/gnome-wall-clock.c:268
+msgid "%a %b %e, %R∶%S"
+msgstr "%a, %e %b, %R∶%S"
 
-#: ../libgnome-desktop/gnome-wall-clock.c:271
+#: ../libgnome-desktop/gnome-wall-clock.c:269
 msgid "%a %b %e, %R"
 msgstr "%a, %e %b, %R"
 
 #. Translators: This is the time format with day used
 #. in 24-hour mode.
-#: ../libgnome-desktop/gnome-wall-clock.c:275
-msgid "%a %R:%S"
-msgstr "%a %R:%S"
+#. The character between %R and %S is U+2236 RATIO
+#: ../libgnome-desktop/gnome-wall-clock.c:274
+msgid "%a %R∶%S"
+msgstr "%a %R∶%S"
 
-#: ../libgnome-desktop/gnome-wall-clock.c:276
+#: ../libgnome-desktop/gnome-wall-clock.c:275
 msgid "%a %R"
 msgstr "%a %R"
 
 #. Translators: This is the time format without date used
 #. in 24-hour mode.
+#. The character between %R and %S is U+2236 RATIO
 #: ../libgnome-desktop/gnome-wall-clock.c:280
-msgid "%R:%S"
-msgstr "%R:%S"
+msgid "%R∶%S"
+msgstr "%R∶%S"
 
 #: ../libgnome-desktop/gnome-wall-clock.c:280
 msgid "%R"
@@ -131,31 +214,37 @@
 
 #. Translators: This is a time format with full date used
 #. for AM/PM.
-#: ../libgnome-desktop/gnome-wall-clock.c:286
-msgid "%a %b %e, %l:%M:%S %p"
-msgstr "%a, %e %b, %l:%M:%S %p"
-
-#: ../libgnome-desktop/gnome-wall-clock.c:287
-msgid "%a %b %e, %l:%M %p"
-msgstr "%a, %e %b, %l:%M %p"
+#. The Unicode characters are U+2236 RATIO and
+#. U+2009 THIN SPACE
+#: ../libgnome-desktop/gnome-wall-clock.c:288
+msgid "%a %b %e, %l∶%M∶%S %p"
+msgstr "%a, %e %b, %l∶%M∶%S %p"
+
+#: ../libgnome-desktop/gnome-wall-clock.c:289
+msgid "%a %b %e, %l∶%M %p"
+msgstr "%a, %e %b, %l∶%M %p"
 
 #. Translators: This is a time format with day used
 #. for AM/PM.
-#: ../libgnome-desktop/gnome-wall-clock.c:291
-msgid "%a %l:%M:%S %p"
-msgstr "%a %l:%M:%S %p"
-
-#: ../libgnome-desktop/gnome-wall-clock.c:292
-msgid "%a %l:%M %p"
-msgstr "%a %l:%M %p"
+#. The Unicode characters are U+2236 RATIO and
+#. U+2009 THIN SPACE
+#: ../libgnome-desktop/gnome-wall-clock.c:295
+msgid "%a %l∶%M∶%S %p"
+msgstr "%a %l∶%M∶%S %p"
 
-#. Translators: This is a time format without date used
-#. for AM/PM.
 #: ../libgnome-desktop/gnome-wall-clock.c:296
-msgid "%l:%M:%S %p"
-msgstr "%l:%M:%S %p"
+msgid "%a %l∶%M %p"
+msgstr "%a %l∶%M %p"
 
-#: ../libgnome-desktop/gnome-wall-clock.c:297
-msgid "%l:%M %p"
-msgstr "%l:%M %p"
+#. Translators: This is a time format without date used
+#. for AM/PM.
+#. The Unicode characters are U+2236 RATIO and
+#. U+2009 THIN SPACE
+#: ../libgnome-desktop/gnome-wall-clock.c:302
+msgid "%l∶%M∶%S %p"
+msgstr "%l∶%M∶%S %p"
+
+#: ../libgnome-desktop/gnome-wall-clock.c:303
+msgid "%l∶%M %p"
+msgstr "%l∶%M %p"
 
diff -Nru gnome-desktop3-3.12.0/po/ca.po gnome-desktop3-3.8.4/po/ca.po
--- gnome-desktop3-3.12.0/po/ca.po	2013-11-11 17:23:17.000000000 +0000
+++ gnome-desktop3-3.8.4/po/ca.po	2013-03-17 01:49:53.000000000 +0000
@@ -10,8 +10,8 @@
 "Project-Id-Version: gnome-desktop 2.12.0\n"
 "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=gnome-"
 "desktop&keywords=I18N+L10N&component=general\n"
-"POT-Creation-Date: 2013-09-11 19:11+0000\n"
-"PO-Revision-Date: 2013-09-14 01:18+0200\n"
+"POT-Creation-Date: 2013-03-11 20:54+0000\n"
+"PO-Revision-Date: 2013-01-18 01:49+0100\n"
 "Last-Translator: Gil Forcada \n"
 "Language-Team: Catalan \n"
 "Language: ca\n"
@@ -20,57 +20,137 @@
 "Content-Transfer-Encoding: 8bits\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
 
+#. Translators: "Unknown" here is used to identify a monitor for which
+#. * we don't know the vendor. When a vendor is known, the name of the
+#. * vendor is used.
+#: ../libgnome-desktop/display-name.c:107
+msgctxt "Monitor vendor"
+msgid "Unknown"
+msgstr "Desconegut"
+
 #: ../libgnome-desktop/gnome-languages.c:804
 msgid "Unspecified"
 msgstr "Sense especificar"
 
-#: ../libgnome-desktop/gnome-rr-config.c:743
+#. Translators: a CRTC is a CRT Controller (this is X terminology).
+#: ../libgnome-desktop/gnome-rr.c:452
+#, c-format
+msgid "could not get the screen resources (CRTCs, outputs, modes)"
+msgstr ""
+"no s'han pogut obtenir els recursos de la pantalla (CRTC, sortides, modes)"
+
+#: ../libgnome-desktop/gnome-rr.c:472
+#, c-format
+msgid "unhandled X error while getting the range of screen sizes"
+msgstr ""
+"s'ha produït un error no gestionat de l'X en obtenir les mides de pantalla"
+
+#: ../libgnome-desktop/gnome-rr.c:478
+#, c-format
+msgid "could not get the range of screen sizes"
+msgstr "no s'ha pogut obtenir el rang de les mides de pantalla"
+
+#: ../libgnome-desktop/gnome-rr.c:769
+#, c-format
+msgid "RANDR extension is not present"
+msgstr "no hi ha l'extensió RANDR"
+
+#: ../libgnome-desktop/gnome-rr.c:1580
+#, c-format
+msgid "could not get information about output %d"
+msgstr "no s'ha pogut obtenir la informació sobre la sortida %d"
+
+#: ../libgnome-desktop/gnome-rr.c:1764
+msgid "Built-in Display"
+msgstr "Pantalla integrada"
+
+#. Translators: %s is the size of the monitor in inches
+#: ../libgnome-desktop/gnome-rr.c:1782
+#, c-format
+msgid "%s Display"
+msgstr "Pantalla de %s"
+
+#: ../libgnome-desktop/gnome-rr.c:1789
+msgid "Unknown Display"
+msgstr "Pantalla desconeguda"
+
+#. Translators: the "position", "size", and "maximum"
+#. * words here are not keywords; please translate them
+#. * as usual.  A CRTC is a CRT Controller (this is X terminology)
+#: ../libgnome-desktop/gnome-rr.c:2234
+#, c-format
+msgid ""
+"requested position/size for CRTC %d is outside the allowed limit: position="
+"(%d, %d), size=(%d, %d), maximum=(%d, %d)"
+msgstr ""
+"la posició/mida sol·licitades per al CRTC %d són fora dels límits permesos: "
+"posició=(%d, %d), mida=(%d, %d), màxim=(%d, %d)"
+
+#: ../libgnome-desktop/gnome-rr.c:2270
+#, c-format
+msgid "could not set the configuration for CRTC %d"
+msgstr "no s'ha pogut establir la configuració per al CRTC %d"
+
+#: ../libgnome-desktop/gnome-rr.c:2421
+#, c-format
+msgid "could not get information about CRTC %d"
+msgstr "no s'ha pogut obtenir la informació sobre el CRTC %d"
+
+#: ../libgnome-desktop/gnome-rr-config.c:708
+#, c-format
+msgid ""
+"none of the saved display configurations matched the active configuration"
+msgstr ""
+"cap de les configuracions desades de la pantalla coincideix amb la "
+"configuració activa"
+
+#: ../libgnome-desktop/gnome-rr-config.c:1464
 #, c-format
 msgid "CRTC %d cannot drive output %s"
 msgstr "la pantalla CRTC %d no pot mostrar la sortida %s"
 
-#: ../libgnome-desktop/gnome-rr-config.c:750
+#: ../libgnome-desktop/gnome-rr-config.c:1471
 #, c-format
 msgid "output %s does not support mode %dx%d@%dHz"
 msgstr "la sortida %s no pot utilitzar el mode %dx%d@%dHz"
 
-#: ../libgnome-desktop/gnome-rr-config.c:761
+#: ../libgnome-desktop/gnome-rr-config.c:1482
 #, c-format
-msgid "CRTC %d does not support rotation=%d"
-msgstr "la pantalla CRTC %d no permet la rotació = %d"
+msgid "CRTC %d does not support rotation=%s"
+msgstr "la pantalla CRTC %d no permet la rotació = %s»"
 
-#: ../libgnome-desktop/gnome-rr-config.c:774
+#: ../libgnome-desktop/gnome-rr-config.c:1496
 #, c-format
 msgid ""
 "output %s does not have the same parameters as another cloned output:\n"
 "existing mode = %d, new mode = %d\n"
 "existing coordinates = (%d, %d), new coordinates = (%d, %d)\n"
-"existing rotation = %d, new rotation = %d"
+"existing rotation = %s, new rotation = %s"
 msgstr ""
 "la sortida %s no permet utilitzar els mateixos paràmetres que l'altra "
 "sortida clonada:\n"
 "el mode existent = %d, el mode nou = %d\n"
 "les coordenades existents = (%d, %d), les coordenades noves (%d, %d)\n"
-"la rotació existent = %d, la rotació nova = %d"
+"la rotació existent = %s, la rotació nova = %s"
 
-#: ../libgnome-desktop/gnome-rr-config.c:789
+#: ../libgnome-desktop/gnome-rr-config.c:1511
 #, c-format
 msgid "cannot clone to output %s"
 msgstr "no s'ha pogut clonar cap a la sortida %s"
 
-#: ../libgnome-desktop/gnome-rr-config.c:915
+#: ../libgnome-desktop/gnome-rr-config.c:1680
 #, c-format
 msgid "Trying modes for CRTC %d\n"
 msgstr "S'estan provant els modes per la pantalla CRTC %d\n"
 
-#: ../libgnome-desktop/gnome-rr-config.c:939
+#: ../libgnome-desktop/gnome-rr-config.c:1704
 #, c-format
 msgid "CRTC %d: trying mode %dx%d@%dHz with output at %dx%d@%dHz (pass %d)\n"
 msgstr ""
 "Pantalla CRTC %d: s'està provant el mode %dx%d@%dHz amb la sortida a %dx%d@"
 "%dHz (intent %d)\n"
 
-#: ../libgnome-desktop/gnome-rr-config.c:986
+#: ../libgnome-desktop/gnome-rr-config.c:1751
 #, c-format
 msgid ""
 "could not assign CRTCs to outputs:\n"
@@ -79,7 +159,7 @@
 "no s'han pogut assignar les pantalles CRTC a les sortides:\n"
 "%s"
 
-#: ../libgnome-desktop/gnome-rr-config.c:990
+#: ../libgnome-desktop/gnome-rr-config.c:1755
 #, c-format
 msgid ""
 "none of the selected modes were compatible with the possible modes:\n"
@@ -91,40 +171,43 @@
 #. Translators: the "requested", "minimum", and
 #. * "maximum" words here are not keywords; please
 #. * translate them as usual.
-#: ../libgnome-desktop/gnome-rr-config.c:1071
+#: ../libgnome-desktop/gnome-rr-config.c:1833
 #, c-format
 msgid ""
 "required virtual size does not fit available size: requested=(%d, %d), "
 "minimum=(%d, %d), maximum=(%d, %d)"
 msgstr ""
-"la mida virtual sol·licitada no s'ajusta a la mida disponible: "
-"sol·licitada=(%d, %d), mínima=(%d, %d), màxima=(%d, %d)"
+"la mida virtual sol·licitada no s'ajusta a la mida disponible: sol·licitada="
+"(%d, %d), mínima=(%d, %d), màxima=(%d, %d)"
 
 #. Translators: This is the time format with full date used
 #. in 24-hour mode.
-#: ../libgnome-desktop/gnome-wall-clock.c:270
-msgid "%a %b %e, %R:%S"
-msgstr "%a %d de %b, %R:%S"
+#. The character between %R and %S is U+2236 RATIO
+#: ../libgnome-desktop/gnome-wall-clock.c:268
+msgid "%a %b %e, %R∶%S"
+msgstr "%a %e de %b, %R∶%S"
 
-#: ../libgnome-desktop/gnome-wall-clock.c:271
+#: ../libgnome-desktop/gnome-wall-clock.c:269
 msgid "%a %b %e, %R"
 msgstr "%a %d de %b, %R"
 
 #. Translators: This is the time format with day used
 #. in 24-hour mode.
-#: ../libgnome-desktop/gnome-wall-clock.c:275
-msgid "%a %R:%S"
+#. The character between %R and %S is U+2236 RATIO
+#: ../libgnome-desktop/gnome-wall-clock.c:274
+msgid "%a %R∶%S"
 msgstr "%a %R∶%S"
 
-#: ../libgnome-desktop/gnome-wall-clock.c:276
+#: ../libgnome-desktop/gnome-wall-clock.c:275
 msgid "%a %R"
 msgstr "%a %R"
 
 #. Translators: This is the time format without date used
 #. in 24-hour mode.
+#. The character between %R and %S is U+2236 RATIO
 #: ../libgnome-desktop/gnome-wall-clock.c:280
-msgid "%R:%S"
-msgstr "%R:%S"
+msgid "%R∶%S"
+msgstr "%R∶%S"
 
 #: ../libgnome-desktop/gnome-wall-clock.c:280
 msgid "%R"
@@ -132,30 +215,469 @@
 
 #. Translators: This is a time format with full date used
 #. for AM/PM.
-#: ../libgnome-desktop/gnome-wall-clock.c:286
-msgid "%a %b %e, %l:%M:%S %p"
-msgstr "%a, %e de %b, %H:%M:%S"
-
-#: ../libgnome-desktop/gnome-wall-clock.c:287
-msgid "%a %b %e, %l:%M %p"
-msgstr "%a, %e de %b, %H:%M"
+#. The Unicode characters are U+2236 RATIO and
+#. U+2009 THIN SPACE
+#: ../libgnome-desktop/gnome-wall-clock.c:288
+msgid "%a %b %e, %l∶%M∶%S %p"
+msgstr "%a %e de %b, %l∶%M∶%S %p"
+
+#: ../libgnome-desktop/gnome-wall-clock.c:289
+msgid "%a %b %e, %l∶%M %p"
+msgstr "%a %b de %e, %l∶%M %p"
 
 #. Translators: This is a time format with day used
 #. for AM/PM.
-#: ../libgnome-desktop/gnome-wall-clock.c:291
-msgid "%a %l:%M:%S %p"
-msgstr "%a %H:%M:%S"
-
-#: ../libgnome-desktop/gnome-wall-clock.c:292
-msgid "%a %l:%M %p"
-msgstr "%a %l:%M %p"
+#. The Unicode characters are U+2236 RATIO and
+#. U+2009 THIN SPACE
+#: ../libgnome-desktop/gnome-wall-clock.c:295
+msgid "%a %l∶%M∶%S %p"
+msgstr "%a %l∶%M∶%S %p"
+
+#: ../libgnome-desktop/gnome-wall-clock.c:296
+msgid "%a %l∶%M %p"
+msgstr "%a %l∶%M %p"
 
 #. Translators: This is a time format without date used
 #. for AM/PM.
-#: ../libgnome-desktop/gnome-wall-clock.c:296
-msgid "%l:%M:%S %p"
-msgstr "%l:%M:%S %p"
+#. The Unicode characters are U+2236 RATIO and
+#. U+2009 THIN SPACE
+#: ../libgnome-desktop/gnome-wall-clock.c:302
+msgid "%l∶%M∶%S %p"
+msgstr "%l∶%M∶%S %p"
+
+#: ../libgnome-desktop/gnome-wall-clock.c:303
+msgid "%l∶%M %p"
+msgstr "%l∶%M %p"
+
+#~ msgid "Cannot find a terminal, using xterm, even if it may not work"
+#~ msgstr ""
+#~ "No s'ha trobat cap terminal, s'utilitzarà l'xterm encara que potser no "
+#~ "funcioni"
+
+#~ msgid "Laptop"
+#~ msgstr "Portàtil"
+
+#~ msgid "Mirrored Displays"
+#~ msgstr "Pantalles duplicades"
+
+#~ msgid "%R:%S"
+#~ msgstr "%R:%S"
+
+#~ msgid "%l:%M:%S %p"
+#~ msgstr "%l:%M:%S %p"
+
+#~ msgid "%l:%M %p"
+#~ msgstr "%l:%M %p"
+
+#~ msgid "About GNOME"
+#~ msgstr "Quant al GNOME"
+
+#~ msgid "Learn more about GNOME"
+#~ msgstr "Apreneu més coses sobre el GNOME"
+
+#~ msgid "News"
+#~ msgstr "Notícies"
+
+#~ msgid "GNOME Library"
+#~ msgstr "Biblioteca del GNOME"
+
+#~ msgid "Friends of GNOME"
+#~ msgstr "Amics del GNOME"
+
+#~ msgid "Contact"
+#~ msgstr "Contacte"
+
+#~ msgid "The Mysterious GEGL"
+#~ msgstr "El misteriós GEGL"
+
+#~ msgid "The Squeaky Rubber GNOME"
+#~ msgstr "El GNOME de goma estrident"
+
+#~ msgid "Wanda The GNOME Fish"
+#~ msgstr "Wanda el peix del GNOME"
+
+#~ msgid "_Open URL"
+#~ msgstr "_Obre l'URL"
+
+#~ msgid "_Copy URL"
+#~ msgstr "_Copia l'URL"
+
+#~ msgid "About the GNOME Desktop"
+#~ msgstr "Quant a l'escriptori GNOME"
+
+#~ msgid "%(name)s: %(value)s"
+#~ msgstr "%(name)s: %(value)s"
+
+#~ msgid "Welcome to the GNOME Desktop"
+#~ msgstr "Benvingut a l'escriptori GNOME"
+
+#~ msgid "Brought to you by:"
+#~ msgstr "Tot això ha estat possible gràcies a:"
+
+#~ msgid "%(name)s: %(value)s"
+#~ msgstr "%(name)s: %(value)s"
+
+#~ msgid "Version"
+#~ msgstr "Versió"
+
+#~ msgid "Distributor"
+#~ msgstr "Distribuïdor"
+
+#~ msgid "Build Date"
+#~ msgstr "Data de muntatge"
+
+#~ msgid "Display information on this GNOME version"
+#~ msgstr "Mostra informació d'aquesta versió del GNOME"
+
+#~ msgid ""
+#~ "GNOME also includes a complete development platform for applications "
+#~ "programmers, allowing the creation of powerful and complex applications."
+#~ msgstr ""
+#~ "El GNOME també inclou una plataforma de desenvolupament completa per a "
+#~ "programadors d'aplicacions, que permet crear-ne de tot tipus."
+
+#~ msgid ""
+#~ "GNOME includes most of what you see on your computer, including the file "
+#~ "manager, web browser, menus, and many applications."
+#~ msgstr ""
+#~ "El GNOME inclou gairebé tot el que veieu al vostre ordinador: el gestor "
+#~ "de fitxers, el navegador web, els menús i moltes altres aplicacions."
+
+#~ msgid ""
+#~ "GNOME is a Free, usable, stable, accessible desktop environment for the "
+#~ "Unix-like family of operating systems."
+#~ msgstr ""
+#~ "El GNOME és un entorn d'escriptori lliure, usable, estable i accessible "
+#~ "per a la família de sistemes operatius tipus Unix."
+
+#~ msgid ""
+#~ "GNOME's focus on usability and accessibility, regular release cycle, and "
+#~ "strong corporate backing make it unique among Free Software desktops."
+#~ msgstr ""
+#~ "El focus del GNOME en la usabilitat i accessibilitat, el seu cicle "
+#~ "regular de llançaments, i un fort suport per part de corporacions el fan "
+#~ "únic dins dels escriptoris del programari lliure."
+
+#~ msgid ""
+#~ "GNOME's greatest strength is our strong community. Virtually anyone, with "
+#~ "or without coding skills, can contribute to making GNOME better."
+#~ msgstr ""
+#~ "El punt més fort del GNOME és la seva gran comunitat. Gairebé tothom, amb "
+#~ "coneixements o sense de programació, pot contribuir a millorar el GNOME."
+
+#~ msgid ""
+#~ "Hundreds of people have contributed code to GNOME since it was started in "
+#~ "1997; many more have contributed in other important ways, including "
+#~ "translations, documentation, and quality assurance."
+#~ msgstr ""
+#~ "Centenars de persones han contribuït codi al GNOME des que es va començar "
+#~ "al 1997; molts més hi han contribuït d'altres maneres importants, que "
+#~ "inclouen traduccions, documentació i control de qualitat."
+
+#~ msgid "Error reading file '%s': %s"
+#~ msgstr "S'ha produït un error en llegir el fitxer «%s»: %s"
+
+#~ msgid "Error rewinding file '%s': %s"
+#~ msgstr "S'ha produït un error en rebobinar el fitxer «%s»: %s"
+
+#~ msgid "No name"
+#~ msgstr "Sense nom"
+
+#~ msgid "File '%s' is not a regular file or directory."
+#~ msgstr "El fitxer «%s» no és un fitxer o directori normal."
+
+#~ msgid "Cannot find file '%s'"
+#~ msgstr "No s'ha pogut trobar el fitxer «%s»"
+
+#~ msgid "No filename to save to"
+#~ msgstr "No hi ha un nom de fitxer per a desar"
+
+#~ msgid "Starting %s"
+#~ msgstr "S'està iniciant %s"
+
+#~ msgid "No URL to launch"
+#~ msgstr "No hi ha un URL per a obrir"
+
+#~ msgid "Not a launchable item"
+#~ msgstr "No és un element llançable"
+
+#~ msgid "No command (Exec) to launch"
+#~ msgstr "No hi ha una ordre (Exec) per a llançar"
+
+#~ msgid "Bad command (Exec) to launch"
+#~ msgstr "Ordre errònia (Exec) per a llançar"
+
+#~ msgid "Unknown encoding of: %s"
+#~ msgstr "Codificació desconeguda de: %s"
+
+#~ msgid "Mirror Screens"
+#~ msgstr "Pantalles duplicades"
+
+#~ msgid "could not find a suitable configuration of screens"
+#~ msgstr "no s'ha pogut trobar una configuració adequada de les pantalles"
+
+#~ msgid "Directory"
+#~ msgstr "Directori"
+
+#~ msgid "Application"
+#~ msgstr "Aplicació"
+
+#~ msgid "Link"
+#~ msgstr "Enllaç"
+
+#~ msgid "FSDevice"
+#~ msgstr "DispositiuFS"
+
+#~ msgid "MIME Type"
+#~ msgstr "Tipus MIME"
+
+# No, res de "servici", Saplana. jm
+#~ msgid "Service"
+#~ msgstr "Servei"
+
+#~ msgid "ServiceType"
+#~ msgstr "TipusDeServei"
+
+#~ msgid "_URL:"
+#~ msgstr "_URL:"
+
+#~ msgid "Comm_and:"
+#~ msgstr "_Ordre:"
+
+#~ msgid "_Name:"
+#~ msgstr "_Nom:"
+
+#~ msgid "_Generic name:"
+#~ msgstr "Nom _genèric:"
+
+#~ msgid "Co_mment:"
+#~ msgstr "Co_mentari:"
+
+#~ msgid "Browse"
+#~ msgstr "Navega"
+
+#~ msgid "_Type:"
+#~ msgstr "_Tipus:"
+
+#~ msgid "_Icon:"
+#~ msgstr "_Icona:"
+
+#~ msgid "Browse icons"
+#~ msgstr "Navega per les icones"
+
+#~ msgid "Run in t_erminal"
+#~ msgstr "Executa en un t_erminal"
+
+#~ msgid "Language"
+#~ msgstr "Llengua"
+
+#~ msgid "Name"
+#~ msgstr "Nom"
+
+#~ msgid "Generic name"
+#~ msgstr "Nom genèric"
+
+#~ msgid "Comment"
+#~ msgstr "Comentari"
+
+#~ msgid "_Try this before using:"
+#~ msgstr "_Prova això abans d'utilitzar:"
+
+#~ msgid "_Documentation:"
+#~ msgstr "_Documentació:"
+
+#~ msgid "_Name/Comment translations:"
+#~ msgstr "Traduccions del _nom/comentari:"
+
+#~ msgid "_Add/Set"
+#~ msgstr "_Afegeix/Estableix"
+
+#~ msgid "Add or Set Name/Comment Translations"
+#~ msgstr "Afegeix o estableix traduccions del nom/comentari"
+
+#~ msgid "Re_move"
+#~ msgstr "Supri_meix"
+
+#~ msgid "Remove Name/Comment Translation"
+#~ msgstr "Suprimeix la traducció de nom/comentari"
+
+#~ msgid "Basic"
+#~ msgstr "Bàsic"
+
+#~ msgid "Advanced"
+#~ msgstr "Avançat"
+
+#~ msgid "_Show Hints at Startup"
+#~ msgstr "_Mostra consells en iniciar"
+
+#~ msgid "Could not locate the directory with header images."
+#~ msgstr "No s'ha trobat el directori amb les imatges de la capçalera."
+
+#~ msgid "Failed to open directory with header images: %s"
+#~ msgstr ""
+#~ "No s'ha pogut obrir el directori amb les imatges de la capçalera: %s"
+
+#~ msgid "Unable to load header image: %s"
+#~ msgstr "No s'ha pogut carregar la imatge de capçalera: %s"
+
+#~ msgid "Could not locate the GNOME logo."
+#~ msgstr "No s'ha trobat el logotip del GNOME."
+
+#~ msgid "Unable to load '%s': %s"
+#~ msgstr "No s'ha pogut carregar «%s»: %s"
+
+#~ msgid "Could not open the address \"%s\": %s"
+#~ msgstr "No s'ha pogut obrir l'adreça «%s»: %s"
+
+#~ msgid "%s: %s\n"
+#~ msgstr "%s: %s\n"
+
+#~ msgid "%s: "
+#~ msgstr "%s: "
+
+#~ msgid "Software"
+#~ msgstr "Programari"
+
+#~ msgid "Developers"
+#~ msgstr "Desenvolupadors"
+
+#~ msgid "Error writing file '%s': %s"
+#~ msgstr "S'ha produït un error en escriure «%s»: %s"
+
+#~ msgid "The End!"
+#~ msgstr "Fi!"
+
+#~ msgid "Accessories"
+#~ msgstr "Accessoris"
+
+#~ msgid "Accessories menu"
+#~ msgstr "Menú d'accessoris"
+
+#~ msgid "Applications"
+#~ msgstr "Aplicacions"
+
+#~ msgid "Programming"
+#~ msgstr "Programació"
+
+#~ msgid "Tools for software development"
+#~ msgstr "Eines per al desenvolupament de programari"
+
+#~ msgid "Games"
+#~ msgstr "Jocs"
+
+#~ msgid "Games menu"
+#~ msgstr "Menú de jocs"
+
+#~ msgid "Graphics"
+#~ msgstr "Gràfics"
+
+#~ msgid "Graphics menu"
+#~ msgstr "Menú de gràfics"
+
+#~ msgid "Internet"
+#~ msgstr "Internet"
+
+#~ msgid "Programs for Internet and networks"
+#~ msgstr "Programes per a Internet i xarxes"
+
+#~ msgid "Multimedia"
+#~ msgstr "Multimèdia"
+
+#~ msgid "Multimedia menu"
+#~ msgstr "Menú multimèdia"
+
+#~ msgid "Office"
+#~ msgstr "Oficina"
+
+#~ msgid "Office Applications"
+#~ msgstr "Aplicacions d'ofimàtica"
+
+#~ msgid "Applications without a category"
+#~ msgstr "Aplicacions sense una categoria"
+
+#~ msgid "Other"
+#~ msgstr "Altres"
+
+#~ msgid "Programs"
+#~ msgstr "Programes"
+
+#~ msgid "Programs menu"
+#~ msgstr "Menú de programes"
+
+#~ msgid "Desktop Preferences"
+#~ msgstr "Preferències de l'escriptori"
+
+#~ msgid "Preferences that affect the whole GNOME desktop"
+#~ msgstr "Preferències que afecten a tot l'escriptori del GNOME"
+
+#~ msgid "System Tools"
+#~ msgstr "Sistema"
+
+#~ msgid "System menu"
+#~ msgstr "Menú de sistema"
+
+#~ msgid ""
+#~ "GNOME is developed by an active community of volunteers who want to "
+#~ "provide a desktop and a suite of user friendly applications. Because "
+#~ "GNOME needs documentors, translators, and many other types of people, "
+#~ "virtually anyone, with or without coding skills, can contribute to GNOME."
+#~ msgstr ""
+#~ "GNOME és desenvolupat per una comunitat activa de voluntaris que volen "
+#~ "proveir un escriptori i una col·lecció d'aplicacions amigables. Perquè "
+#~ "GNOME necessita documentadors, traductors i molts altres tipus de gent, "
+#~ "virtualment tothom, amb i sense coneiximents de programació, pot "
+#~ "contribuir al GNOME."
+
+#~ msgid "Download"
+#~ msgstr "Descarrega"
+
+#~ msgid "Users"
+#~ msgstr "Usuaris"
+
+#~ msgid "Foundation"
+#~ msgstr "Fundació"
+
+#~ msgid "Sound & Video"
+#~ msgstr "So i vídeo"
+
+#~ msgid "Click here to visit the site : "
+#~ msgstr "Feu clic ací per a visitar el lloc: "
+
+#~ msgid "List of GNOME Contributors"
+#~ msgstr "Llista de contribuïdors al GNOME"
+
+#~ msgid "GNOME Logo Image"
+#~ msgstr "Imatge del logo del GNOME"
+
+#~ msgid "Contributors' Names"
+#~ msgstr "Noms dels contribuïdors"
+
+#~ msgid "GNOME %s Was Brought To You By"
+#~ msgstr "GNOME %s us ha estat portat per"
+
+#~ msgid "And Many More ..."
+#~ msgstr "I molts altres ..."
+
+#~ msgid "GNOME News Site"
+#~ msgstr "Lloc de notícies del GNOME"
+
+#~ msgid "http://www.gnome.org/"
+#~ msgstr "http://www.gnome.org/"
+
+#~ msgid "GNOME Main Site"
+#~ msgstr "Lloc principal del GNOME"
+
+#~ msgid "GNOME is a part of the GNU Project"
+#~ msgstr "GNOME és una part del Projecte GNU"
+
+#~ msgid "File '%s' has invalid MIME type: %s"
+#~ msgstr "El fitxer «%s» té un tipus MIME invàlid: %s"
+
+#~ msgid "Home"
+#~ msgstr "Hogar"
+
+#~ msgid "Home Applications"
+#~ msgstr "Aplicacions domèstiques"
 
-#: ../libgnome-desktop/gnome-wall-clock.c:297
-msgid "%l:%M %p"
-msgstr "%l:%M %p"
+#~ msgid "MimeType"
+#~ msgstr "TipusDeMime"
diff -Nru gnome-desktop3-3.12.0/po/ca@valencia.po gnome-desktop3-3.8.4/po/ca@valencia.po
--- gnome-desktop3-3.12.0/po/ca@valencia.po	2013-11-11 17:23:17.000000000 +0000
+++ gnome-desktop3-3.8.4/po/ca@valencia.po	2013-09-04 11:15:57.000000000 +0000
@@ -9,8 +9,8 @@
 msgstr ""
 "Project-Id-Version: gnome-desktop 2.12.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-10-13 23:57+0200\n"
-"PO-Revision-Date: 2013-09-14 01:18+0200\n"
+"POT-Creation-Date: 2013-03-11 23:33+0100\n"
+"PO-Revision-Date: 2013-01-18 01:49+0100\n"
 "Last-Translator: Gil Forcada \n"
 "Language-Team: Catalan \n"
 "Language: ca-XV\n"
@@ -19,57 +19,137 @@
 "Content-Transfer-Encoding: 8bits\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
 
-#: ../libgnome-desktop/gnome-languages.c:718
+#. Translators: "Unknown" here is used to identify a monitor for which
+#. * we don't know the vendor. When a vendor is known, the name of the
+#. * vendor is used.
+#: ../libgnome-desktop/display-name.c:107
+msgctxt "Monitor vendor"
+msgid "Unknown"
+msgstr "Desconegut"
+
+#: ../libgnome-desktop/gnome-languages.c:804
 msgid "Unspecified"
 msgstr "Sense especificar"
 
-#: ../libgnome-desktop/gnome-rr-config.c:743
+#. Translators: a CRTC is a CRT Controller (this is X terminology).
+#: ../libgnome-desktop/gnome-rr.c:452
+#, c-format
+msgid "could not get the screen resources (CRTCs, outputs, modes)"
+msgstr ""
+"no s'han pogut obtindre els recursos de la pantalla (CRTC, eixides, modes)"
+
+#: ../libgnome-desktop/gnome-rr.c:472
+#, c-format
+msgid "unhandled X error while getting the range of screen sizes"
+msgstr ""
+"s'ha produït un error no gestionat de l'X en obtindre les mides de pantalla"
+
+#: ../libgnome-desktop/gnome-rr.c:478
+#, c-format
+msgid "could not get the range of screen sizes"
+msgstr "no s'ha pogut obtindre el rang de les mides de pantalla"
+
+#: ../libgnome-desktop/gnome-rr.c:769
+#, c-format
+msgid "RANDR extension is not present"
+msgstr "no hi ha l'extensió RANDR"
+
+#: ../libgnome-desktop/gnome-rr.c:1580
+#, c-format
+msgid "could not get information about output %d"
+msgstr "no s'ha pogut obtindre la informació sobre l'eixida %d"
+
+#: ../libgnome-desktop/gnome-rr.c:1764
+msgid "Built-in Display"
+msgstr "Pantalla integrada"
+
+#. Translators: %s is the size of the monitor in inches
+#: ../libgnome-desktop/gnome-rr.c:1782
+#, c-format
+msgid "%s Display"
+msgstr "Pantalla de %s"
+
+#: ../libgnome-desktop/gnome-rr.c:1789
+msgid "Unknown Display"
+msgstr "Pantalla desconeguda"
+
+#. Translators: the "position", "size", and "maximum"
+#. * words here are not keywords; please translate them
+#. * as usual.  A CRTC is a CRT Controller (this is X terminology)
+#: ../libgnome-desktop/gnome-rr.c:2234
+#, c-format
+msgid ""
+"requested position/size for CRTC %d is outside the allowed limit: position="
+"(%d, %d), size=(%d, %d), maximum=(%d, %d)"
+msgstr ""
+"la posició/mida sol·licitades per al CRTC %d són fora dels límits permesos: "
+"posició=(%d, %d), mida=(%d, %d), màxim=(%d, %d)"
+
+#: ../libgnome-desktop/gnome-rr.c:2270
+#, c-format
+msgid "could not set the configuration for CRTC %d"
+msgstr "no s'ha pogut establir la configuració per al CRTC %d"
+
+#: ../libgnome-desktop/gnome-rr.c:2421
+#, c-format
+msgid "could not get information about CRTC %d"
+msgstr "no s'ha pogut obtindre la informació sobre el CRTC %d"
+
+#: ../libgnome-desktop/gnome-rr-config.c:708
+#, c-format
+msgid ""
+"none of the saved display configurations matched the active configuration"
+msgstr ""
+"cap de les configuracions guardades de la pantalla coincideix amb la "
+"configuració activa"
+
+#: ../libgnome-desktop/gnome-rr-config.c:1464
 #, c-format
 msgid "CRTC %d cannot drive output %s"
 msgstr "la pantalla CRTC %d no pot mostrar l'eixida %s"
 
-#: ../libgnome-desktop/gnome-rr-config.c:750
+#: ../libgnome-desktop/gnome-rr-config.c:1471
 #, c-format
 msgid "output %s does not support mode %dx%d@%dHz"
 msgstr "l'eixida %s no pot utilitzar el mode %dx%d@%dHz"
 
-#: ../libgnome-desktop/gnome-rr-config.c:761
+#: ../libgnome-desktop/gnome-rr-config.c:1482
 #, c-format
-msgid "CRTC %d does not support rotation=%d"
-msgstr "la pantalla CRTC %d no permet la rotació = %d"
+msgid "CRTC %d does not support rotation=%s"
+msgstr "la pantalla CRTC %d no permet la rotació = %s»"
 
-#: ../libgnome-desktop/gnome-rr-config.c:774
+#: ../libgnome-desktop/gnome-rr-config.c:1496
 #, c-format
 msgid ""
 "output %s does not have the same parameters as another cloned output:\n"
 "existing mode = %d, new mode = %d\n"
 "existing coordinates = (%d, %d), new coordinates = (%d, %d)\n"
-"existing rotation = %d, new rotation = %d"
+"existing rotation = %s, new rotation = %s"
 msgstr ""
 "l'eixida %s no permet utilitzar els mateixos paràmetres que l'altra eixida "
 "clonada:\n"
 "el mode existent = %d, el mode nou = %d\n"
 "les coordenades existents = (%d, %d), les coordenades noves (%d, %d)\n"
-"la rotació existent = %d, la rotació nova = %d"
+"la rotació existent = %s, la rotació nova = %s"
 
-#: ../libgnome-desktop/gnome-rr-config.c:789
+#: ../libgnome-desktop/gnome-rr-config.c:1511
 #, c-format
 msgid "cannot clone to output %s"
 msgstr "no s'ha pogut clonar cap a l'eixida %s"
 
-#: ../libgnome-desktop/gnome-rr-config.c:915
+#: ../libgnome-desktop/gnome-rr-config.c:1680
 #, c-format
 msgid "Trying modes for CRTC %d\n"
 msgstr "S'estan provant els modes per la pantalla CRTC %d\n"
 
-#: ../libgnome-desktop/gnome-rr-config.c:939
+#: ../libgnome-desktop/gnome-rr-config.c:1704
 #, c-format
 msgid "CRTC %d: trying mode %dx%d@%dHz with output at %dx%d@%dHz (pass %d)\n"
 msgstr ""
 "Pantalla CRTC %d: s'està provant el mode %dx%d@%dHz amb l'eixida a %dx%d@"
 "%dHz (intent %d)\n"
 
-#: ../libgnome-desktop/gnome-rr-config.c:986
+#: ../libgnome-desktop/gnome-rr-config.c:1751
 #, c-format
 msgid ""
 "could not assign CRTCs to outputs:\n"
@@ -78,7 +158,7 @@
 "no s'han pogut assignar les pantalles CRTC a les eixides:\n"
 "%s"
 
-#: ../libgnome-desktop/gnome-rr-config.c:990
+#: ../libgnome-desktop/gnome-rr-config.c:1755
 #, c-format
 msgid ""
 "none of the selected modes were compatible with the possible modes:\n"
@@ -90,40 +170,43 @@
 #. Translators: the "requested", "minimum", and
 #. * "maximum" words here are not keywords; please
 #. * translate them as usual.
-#: ../libgnome-desktop/gnome-rr-config.c:1071
+#: ../libgnome-desktop/gnome-rr-config.c:1833
 #, c-format
 msgid ""
 "required virtual size does not fit available size: requested=(%d, %d), "
 "minimum=(%d, %d), maximum=(%d, %d)"
 msgstr ""
-"la mida virtual sol·licitada no s'ajusta a la mida disponible: "
-"sol·licitada=(%d, %d), mínima=(%d, %d), màxima=(%d, %d)"
+"la mida virtual sol·licitada no s'ajusta a la mida disponible: sol·licitada="
+"(%d, %d), mínima=(%d, %d), màxima=(%d, %d)"
 
 #. Translators: This is the time format with full date used
 #. in 24-hour mode.
-#: ../libgnome-desktop/gnome-wall-clock.c:270
-msgid "%a %b %e, %R:%S"
-msgstr "%a %d de %b, %R:%S"
+#. The character between %R and %S is U+2236 RATIO
+#: ../libgnome-desktop/gnome-wall-clock.c:268
+msgid "%a %b %e, %R∶%S"
+msgstr "%a %e de %b, %R∶%S"
 
-#: ../libgnome-desktop/gnome-wall-clock.c:271
+#: ../libgnome-desktop/gnome-wall-clock.c:269
 msgid "%a %b %e, %R"
 msgstr "%a %d de %b, %R"
 
 #. Translators: This is the time format with day used
 #. in 24-hour mode.
-#: ../libgnome-desktop/gnome-wall-clock.c:275
-msgid "%a %R:%S"
+#. The character between %R and %S is U+2236 RATIO
+#: ../libgnome-desktop/gnome-wall-clock.c:274
+msgid "%a %R∶%S"
 msgstr "%a %R∶%S"
 
-#: ../libgnome-desktop/gnome-wall-clock.c:276
+#: ../libgnome-desktop/gnome-wall-clock.c:275
 msgid "%a %R"
 msgstr "%a %R"
 
 #. Translators: This is the time format without date used
 #. in 24-hour mode.
+#. The character between %R and %S is U+2236 RATIO
 #: ../libgnome-desktop/gnome-wall-clock.c:280
-msgid "%R:%S"
-msgstr "%R:%S"
+msgid "%R∶%S"
+msgstr "%R∶%S"
 
 #: ../libgnome-desktop/gnome-wall-clock.c:280
 msgid "%R"
@@ -131,30 +214,469 @@
 
 #. Translators: This is a time format with full date used
 #. for AM/PM.
-#: ../libgnome-desktop/gnome-wall-clock.c:286
-msgid "%a %b %e, %l:%M:%S %p"
-msgstr "%a, %e de %b, %H:%M:%S"
-
-#: ../libgnome-desktop/gnome-wall-clock.c:287
-msgid "%a %b %e, %l:%M %p"
-msgstr "%a, %e de %b, %H:%M"
+#. The Unicode characters are U+2236 RATIO and
+#. U+2009 THIN SPACE
+#: ../libgnome-desktop/gnome-wall-clock.c:288
+msgid "%a %b %e, %l∶%M∶%S %p"
+msgstr "%a %e de %b, %l∶%M∶%S %p"
+
+#: ../libgnome-desktop/gnome-wall-clock.c:289
+msgid "%a %b %e, %l∶%M %p"
+msgstr "%a %b de %e, %l∶%M %p"
 
 #. Translators: This is a time format with day used
 #. for AM/PM.
-#: ../libgnome-desktop/gnome-wall-clock.c:291
-msgid "%a %l:%M:%S %p"
-msgstr "%a %H:%M:%S"
-
-#: ../libgnome-desktop/gnome-wall-clock.c:292
-msgid "%a %l:%M %p"
-msgstr "%a %l:%M %p"
+#. The Unicode characters are U+2236 RATIO and
+#. U+2009 THIN SPACE
+#: ../libgnome-desktop/gnome-wall-clock.c:295
+msgid "%a %l∶%M∶%S %p"
+msgstr "%a %l∶%M∶%S %p"
+
+#: ../libgnome-desktop/gnome-wall-clock.c:296
+msgid "%a %l∶%M %p"
+msgstr "%a %l∶%M %p"
 
 #. Translators: This is a time format without date used
 #. for AM/PM.
-#: ../libgnome-desktop/gnome-wall-clock.c:296
-msgid "%l:%M:%S %p"
-msgstr "%l:%M:%S %p"
+#. The Unicode characters are U+2236 RATIO and
+#. U+2009 THIN SPACE
+#: ../libgnome-desktop/gnome-wall-clock.c:302
+msgid "%l∶%M∶%S %p"
+msgstr "%l∶%M∶%S %p"
+
+#: ../libgnome-desktop/gnome-wall-clock.c:303
+msgid "%l∶%M %p"
+msgstr "%l∶%M %p"
+
+#~ msgid "Cannot find a terminal, using xterm, even if it may not work"
+#~ msgstr ""
+#~ "No s'ha trobat cap terminal, s'utilitzarà l'xterm encara que potser no "
+#~ "funcioni"
+
+#~ msgid "Laptop"
+#~ msgstr "Portàtil"
+
+#~ msgid "Mirrored Displays"
+#~ msgstr "Pantalles duplicades"
+
+#~ msgid "%R:%S"
+#~ msgstr "%R:%S"
+
+#~ msgid "%l:%M:%S %p"
+#~ msgstr "%l:%M:%S %p"
+
+#~ msgid "%l:%M %p"
+#~ msgstr "%l:%M %p"
+
+#~ msgid "About GNOME"
+#~ msgstr "Quant al GNOME"
+
+#~ msgid "Learn more about GNOME"
+#~ msgstr "Apreneu més coses sobre el GNOME"
+
+#~ msgid "News"
+#~ msgstr "Notícies"
+
+#~ msgid "GNOME Library"
+#~ msgstr "Biblioteca del GNOME"
+
+#~ msgid "Friends of GNOME"
+#~ msgstr "Amics del GNOME"
+
+#~ msgid "Contact"
+#~ msgstr "Contacte"
+
+#~ msgid "The Mysterious GEGL"
+#~ msgstr "El misteriós GEGL"
+
+#~ msgid "The Squeaky Rubber GNOME"
+#~ msgstr "El GNOME de goma estrident"
+
+#~ msgid "Wanda The GNOME Fish"
+#~ msgstr "Wanda el peix del GNOME"
+
+#~ msgid "_Open URL"
+#~ msgstr "_Obre l'URL"
+
+#~ msgid "_Copy URL"
+#~ msgstr "_Copia l'URL"
+
+#~ msgid "About the GNOME Desktop"
+#~ msgstr "Quant a l'escriptori GNOME"
+
+#~ msgid "%(name)s: %(value)s"
+#~ msgstr "%(name)s: %(value)s"
+
+#~ msgid "Welcome to the GNOME Desktop"
+#~ msgstr "Benvingut a l'escriptori GNOME"
+
+#~ msgid "Brought to you by:"
+#~ msgstr "Tot això ha estat possible gràcies a:"
+
+#~ msgid "%(name)s: %(value)s"
+#~ msgstr "%(name)s: %(value)s"
+
+#~ msgid "Version"
+#~ msgstr "Versió"
+
+#~ msgid "Distributor"
+#~ msgstr "Distribuïdor"
+
+#~ msgid "Build Date"
+#~ msgstr "Data de muntatge"
+
+#~ msgid "Display information on this GNOME version"
+#~ msgstr "Mostra informació d'aquesta versió del GNOME"
+
+#~ msgid ""
+#~ "GNOME also includes a complete development platform for applications "
+#~ "programmers, allowing the creation of powerful and complex applications."
+#~ msgstr ""
+#~ "El GNOME també inclou una plataforma de desenvolupament completa per a "
+#~ "programadors d'aplicacions, que permet crear-ne de tot tipus."
+
+#~ msgid ""
+#~ "GNOME includes most of what you see on your computer, including the file "
+#~ "manager, web browser, menus, and many applications."
+#~ msgstr ""
+#~ "El GNOME inclou gairebé tot el que veieu al vostre ordinador: el gestor "
+#~ "de fitxers, el navegador web, els menús i moltes altres aplicacions."
+
+#~ msgid ""
+#~ "GNOME is a Free, usable, stable, accessible desktop environment for the "
+#~ "Unix-like family of operating systems."
+#~ msgstr ""
+#~ "El GNOME és un entorn d'escriptori lliure, usable, estable i accessible "
+#~ "per a la família de sistemes operatius tipus Unix."
+
+#~ msgid ""
+#~ "GNOME's focus on usability and accessibility, regular release cycle, and "
+#~ "strong corporate backing make it unique among Free Software desktops."
+#~ msgstr ""
+#~ "El focus del GNOME en la usabilitat i accessibilitat, el seu cicle "
+#~ "regular de llançaments, i un fort suport per part de corporacions el fan "
+#~ "únic dins dels escriptoris del programari lliure."
+
+#~ msgid ""
+#~ "GNOME's greatest strength is our strong community. Virtually anyone, with "
+#~ "or without coding skills, can contribute to making GNOME better."
+#~ msgstr ""
+#~ "El punt més fort del GNOME és la seva gran comunitat. Gairebé tothom, amb "
+#~ "coneixements o sense de programació, pot contribuir a millorar el GNOME."
+
+#~ msgid ""
+#~ "Hundreds of people have contributed code to GNOME since it was started in "
+#~ "1997; many more have contributed in other important ways, including "
+#~ "translations, documentation, and quality assurance."
+#~ msgstr ""
+#~ "Centenars de persones han contribuït codi al GNOME des que es va començar "
+#~ "al 1997; molts més hi han contribuït d'altres maneres importants, que "
+#~ "inclouen traduccions, documentació i control de qualitat."
+
+#~ msgid "Error reading file '%s': %s"
+#~ msgstr "S'ha produït un error en llegir el fitxer «%s»: %s"
+
+#~ msgid "Error rewinding file '%s': %s"
+#~ msgstr "S'ha produït un error en rebobinar el fitxer «%s»: %s"
+
+#~ msgid "No name"
+#~ msgstr "Sense nom"
+
+#~ msgid "File '%s' is not a regular file or directory."
+#~ msgstr "El fitxer «%s» no és un fitxer o directori normal."
+
+#~ msgid "Cannot find file '%s'"
+#~ msgstr "No s'ha pogut trobar el fitxer «%s»"
+
+#~ msgid "No filename to save to"
+#~ msgstr "No hi ha un nom de fitxer per a desar"
+
+#~ msgid "Starting %s"
+#~ msgstr "S'està iniciant %s"
+
+#~ msgid "No URL to launch"
+#~ msgstr "No hi ha un URL per a obrir"
+
+#~ msgid "Not a launchable item"
+#~ msgstr "No és un element llançable"
+
+#~ msgid "No command (Exec) to launch"
+#~ msgstr "No hi ha una ordre (Exec) per a llançar"
+
+#~ msgid "Bad command (Exec) to launch"
+#~ msgstr "Ordre errònia (Exec) per a llançar"
+
+#~ msgid "Unknown encoding of: %s"
+#~ msgstr "Codificació desconeguda de: %s"
+
+#~ msgid "Mirror Screens"
+#~ msgstr "Pantalles duplicades"
+
+#~ msgid "could not find a suitable configuration of screens"
+#~ msgstr "no s'ha pogut trobar una configuració adequada de les pantalles"
+
+#~ msgid "Directory"
+#~ msgstr "Directori"
+
+#~ msgid "Application"
+#~ msgstr "Aplicació"
+
+#~ msgid "Link"
+#~ msgstr "Enllaç"
+
+#~ msgid "FSDevice"
+#~ msgstr "DispositiuFS"
+
+#~ msgid "MIME Type"
+#~ msgstr "Tipus MIME"
+
+# No, res de "servici", Saplana. jm
+#~ msgid "Service"
+#~ msgstr "Servei"
+
+#~ msgid "ServiceType"
+#~ msgstr "TipusDeServei"
+
+#~ msgid "_URL:"
+#~ msgstr "_URL:"
+
+#~ msgid "Comm_and:"
+#~ msgstr "_Ordre:"
+
+#~ msgid "_Name:"
+#~ msgstr "_Nom:"
+
+#~ msgid "_Generic name:"
+#~ msgstr "Nom _genèric:"
+
+#~ msgid "Co_mment:"
+#~ msgstr "Co_mentari:"
+
+#~ msgid "Browse"
+#~ msgstr "Navega"
+
+#~ msgid "_Type:"
+#~ msgstr "_Tipus:"
+
+#~ msgid "_Icon:"
+#~ msgstr "_Icona:"
+
+#~ msgid "Browse icons"
+#~ msgstr "Navega per les icones"
+
+#~ msgid "Run in t_erminal"
+#~ msgstr "Executa en un t_erminal"
+
+#~ msgid "Language"
+#~ msgstr "Llengua"
+
+#~ msgid "Name"
+#~ msgstr "Nom"
+
+#~ msgid "Generic name"
+#~ msgstr "Nom genèric"
+
+#~ msgid "Comment"
+#~ msgstr "Comentari"
+
+#~ msgid "_Try this before using:"
+#~ msgstr "_Prova això abans d'utilitzar:"
+
+#~ msgid "_Documentation:"
+#~ msgstr "_Documentació:"
+
+#~ msgid "_Name/Comment translations:"
+#~ msgstr "Traduccions del _nom/comentari:"
+
+#~ msgid "_Add/Set"
+#~ msgstr "_Afegeix/Estableix"
+
+#~ msgid "Add or Set Name/Comment Translations"
+#~ msgstr "Afegeix o estableix traduccions del nom/comentari"
+
+#~ msgid "Re_move"
+#~ msgstr "Supri_meix"
+
+#~ msgid "Remove Name/Comment Translation"
+#~ msgstr "Suprimeix la traducció de nom/comentari"
+
+#~ msgid "Basic"
+#~ msgstr "Bàsic"
+
+#~ msgid "Advanced"
+#~ msgstr "Avançat"
+
+#~ msgid "_Show Hints at Startup"
+#~ msgstr "_Mostra consells en iniciar"
+
+#~ msgid "Could not locate the directory with header images."
+#~ msgstr "No s'ha trobat el directori amb les imatges de la capçalera."
+
+#~ msgid "Failed to open directory with header images: %s"
+#~ msgstr ""
+#~ "No s'ha pogut obrir el directori amb les imatges de la capçalera: %s"
+
+#~ msgid "Unable to load header image: %s"
+#~ msgstr "No s'ha pogut carregar la imatge de capçalera: %s"
+
+#~ msgid "Could not locate the GNOME logo."
+#~ msgstr "No s'ha trobat el logotip del GNOME."
+
+#~ msgid "Unable to load '%s': %s"
+#~ msgstr "No s'ha pogut carregar «%s»: %s"
+
+#~ msgid "Could not open the address \"%s\": %s"
+#~ msgstr "No s'ha pogut obrir l'adreça «%s»: %s"
+
+#~ msgid "%s: %s\n"
+#~ msgstr "%s: %s\n"
+
+#~ msgid "%s: "
+#~ msgstr "%s: "
+
+#~ msgid "Software"
+#~ msgstr "Programari"
+
+#~ msgid "Developers"
+#~ msgstr "Desenvolupadors"
+
+#~ msgid "Error writing file '%s': %s"
+#~ msgstr "S'ha produït un error en escriure «%s»: %s"
+
+#~ msgid "The End!"
+#~ msgstr "Fi!"
+
+#~ msgid "Accessories"
+#~ msgstr "Accessoris"
+
+#~ msgid "Accessories menu"
+#~ msgstr "Menú d'accessoris"
+
+#~ msgid "Applications"
+#~ msgstr "Aplicacions"
+
+#~ msgid "Programming"
+#~ msgstr "Programació"
+
+#~ msgid "Tools for software development"
+#~ msgstr "Eines per al desenvolupament de programari"
+
+#~ msgid "Games"
+#~ msgstr "Jocs"
+
+#~ msgid "Games menu"
+#~ msgstr "Menú de jocs"
+
+#~ msgid "Graphics"
+#~ msgstr "Gràfics"
+
+#~ msgid "Graphics menu"
+#~ msgstr "Menú de gràfics"
+
+#~ msgid "Internet"
+#~ msgstr "Internet"
+
+#~ msgid "Programs for Internet and networks"
+#~ msgstr "Programes per a Internet i xarxes"
+
+#~ msgid "Multimedia"
+#~ msgstr "Multimèdia"
+
+#~ msgid "Multimedia menu"
+#~ msgstr "Menú multimèdia"
+
+#~ msgid "Office"
+#~ msgstr "Oficina"
+
+#~ msgid "Office Applications"
+#~ msgstr "Aplicacions d'ofimàtica"
+
+#~ msgid "Applications without a category"
+#~ msgstr "Aplicacions sense una categoria"
+
+#~ msgid "Other"
+#~ msgstr "Altres"
+
+#~ msgid "Programs"
+#~ msgstr "Programes"
+
+#~ msgid "Programs menu"
+#~ msgstr "Menú de programes"
+
+#~ msgid "Desktop Preferences"
+#~ msgstr "Preferències de l'escriptori"
+
+#~ msgid "Preferences that affect the whole GNOME desktop"
+#~ msgstr "Preferències que afecten a tot l'escriptori del GNOME"
+
+#~ msgid "System Tools"
+#~ msgstr "Sistema"
+
+#~ msgid "System menu"
+#~ msgstr "Menú de sistema"
+
+#~ msgid ""
+#~ "GNOME is developed by an active community of volunteers who want to "
+#~ "provide a desktop and a suite of user friendly applications. Because "
+#~ "GNOME needs documentors, translators, and many other types of people, "
+#~ "virtually anyone, with or without coding skills, can contribute to GNOME."
+#~ msgstr ""
+#~ "GNOME és desenvolupat per una comunitat activa de voluntaris que volen "
+#~ "proveir un escriptori i una col·lecció d'aplicacions amigables. Perquè "
+#~ "GNOME necessita documentadors, traductors i molts altres tipus de gent, "
+#~ "virtualment tothom, amb i sense coneiximents de programació, pot "
+#~ "contribuir al GNOME."
+
+#~ msgid "Download"
+#~ msgstr "Descarrega"
+
+#~ msgid "Users"
+#~ msgstr "Usuaris"
+
+#~ msgid "Foundation"
+#~ msgstr "Fundació"
+
+#~ msgid "Sound & Video"
+#~ msgstr "So i vídeo"
+
+#~ msgid "Click here to visit the site : "
+#~ msgstr "Feu clic ací per a visitar el lloc: "
+
+#~ msgid "List of GNOME Contributors"
+#~ msgstr "Llista de contribuïdors al GNOME"
+
+#~ msgid "GNOME Logo Image"
+#~ msgstr "Imatge del logo del GNOME"
+
+#~ msgid "Contributors' Names"
+#~ msgstr "Noms dels contribuïdors"
+
+#~ msgid "GNOME %s Was Brought To You By"
+#~ msgstr "GNOME %s us ha estat portat per"
+
+#~ msgid "And Many More ..."
+#~ msgstr "I molts altres ..."
+
+#~ msgid "GNOME News Site"
+#~ msgstr "Lloc de notícies del GNOME"
+
+#~ msgid "http://www.gnome.org/"
+#~ msgstr "http://www.gnome.org/"
+
+#~ msgid "GNOME Main Site"
+#~ msgstr "Lloc principal del GNOME"
+
+#~ msgid "GNOME is a part of the GNU Project"
+#~ msgstr "GNOME és una part del Projecte GNU"
+
+#~ msgid "File '%s' has invalid MIME type: %s"
+#~ msgstr "El fitxer «%s» té un tipus MIME invàlid: %s"
+
+#~ msgid "Home"
+#~ msgstr "Hogar"
+
+#~ msgid "Home Applications"
+#~ msgstr "Aplicacions domèstiques"
 
-#: ../libgnome-desktop/gnome-wall-clock.c:297
-msgid "%l:%M %p"
-msgstr "%l:%M %p"
+#~ msgid "MimeType"
+#~ msgstr "TipusDeMime"
diff -Nru gnome-desktop3-3.12.0/po/cs.po gnome-desktop3-3.8.4/po/cs.po
--- gnome-desktop3-3.12.0/po/cs.po	2013-11-11 17:23:17.000000000 +0000
+++ gnome-desktop3-3.8.4/po/cs.po	2013-09-04 11:15:57.000000000 +0000
@@ -2,7 +2,6 @@
 # Copyright (C) 1999, 2006, 2007, 2008, 2009, 2010 the author(s) of gnome-desktop.
 # Copyright (C) 2004, 2005 Miloslav Trmac .
 # This file is distributed under the same license as the gnome-desktop package.
-#
 # GIS , 1999.
 # David Šauer , 1999.
 # George Lebl , 2000, 2001.
@@ -12,74 +11,151 @@
 # Jakub Friedl , 2006, 2007.
 # Petr Tomeš , 2006.
 # Petr Kovar , 2007, 2008, 2009, 2010, 2013.
-# Marek Černocký , 2012, 2013.
-#
+# Marek Černocký , 2012.
 msgid ""
 msgstr ""
 "Project-Id-Version: gnome-desktop\n"
 "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=gnome-"
 "desktop&keywords=I18N+L10N&component=general\n"
-"POT-Creation-Date: 2013-08-19 17:24+0000\n"
-"PO-Revision-Date: 2013-08-20 08:47+0200\n"
-"Last-Translator: Marek Černocký \n"
+"POT-Creation-Date: 2013-03-04 10:03+0000\n"
+"PO-Revision-Date: 2013-03-24 18:40+0200\n"
+"Last-Translator: Petr Kovar \n"
 "Language-Team: Czech \n"
 "Language: cs\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==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n"
-"X-Generator: Gtranslator 2.91.6\n"
+"X-Generator: Virtaal 0.7.1\n"
 "X-Project-Style: gnome\n"
 
+#. Translators: "Unknown" here is used to identify a monitor for which
+#. * we don't know the vendor. When a vendor is known, the name of the
+#. * vendor is used.
+#: ../libgnome-desktop/display-name.c:107
+msgctxt "Monitor vendor"
+msgid "Unknown"
+msgstr "Neznámý"
+
 #: ../libgnome-desktop/gnome-languages.c:804
 msgid "Unspecified"
 msgstr "Neurčeno"
 
-#: ../libgnome-desktop/gnome-rr-config.c:789
+#. Translators: a CRTC is a CRT Controller (this is X terminology).
+#: ../libgnome-desktop/gnome-rr.c:452
+#, c-format
+msgid "could not get the screen resources (CRTCs, outputs, modes)"
+msgstr "nelze získat zdroje obrazovky (CRTC, výstupy, režimy)"
+
+#: ../libgnome-desktop/gnome-rr.c:472
+#, c-format
+msgid "unhandled X error while getting the range of screen sizes"
+msgstr "nezpracovaná chyba X při získávání rozsahu velikostí obrazovky"
+
+#: ../libgnome-desktop/gnome-rr.c:478
+#, c-format
+msgid "could not get the range of screen sizes"
+msgstr "nelze získat rozsah velikostí obrazovky"
+
+#: ../libgnome-desktop/gnome-rr.c:769
+#, c-format
+msgid "RANDR extension is not present"
+msgstr "Rozšíření RANDR není přítomno"
+
+#: ../libgnome-desktop/gnome-rr.c:1580
+#, c-format
+msgid "could not get information about output %d"
+msgstr "nelze získat informace o výstupu %d"
+
+#: ../libgnome-desktop/gnome-rr.c:1764
+msgid "Built-in Display"
+msgstr "Zabudovaný displej"
+
+#. Translators: %s is the size of the monitor in inches
+#: ../libgnome-desktop/gnome-rr.c:1782
+#, c-format
+msgid "%s Display"
+msgstr "Displej %s"
+
+#: ../libgnome-desktop/gnome-rr.c:1789
+#| msgctxt "Monitor vendor"
+#| msgid "Unknown"
+msgid "Unknown Display"
+msgstr "Neznámý displej"
+
+#. Translators: the "position", "size", and "maximum"
+#. * words here are not keywords; please translate them
+#. * as usual.  A CRTC is a CRT Controller (this is X terminology)
+#: ../libgnome-desktop/gnome-rr.c:2234
+#, c-format
+msgid ""
+"requested position/size for CRTC %d is outside the allowed limit: position="
+"(%d, %d), size=(%d, %d), maximum=(%d, %d)"
+msgstr ""
+"požadovaná poloha/velikost CRTC %d je mimo povolený limit: poloha=(%d, %d), "
+"velikost=(%d, %d), maximum=(%d, %d)"
+
+#: ../libgnome-desktop/gnome-rr.c:2270
+#, c-format
+msgid "could not set the configuration for CRTC %d"
+msgstr "nelze nastavit konfiguraci CRTC %d"
+
+#: ../libgnome-desktop/gnome-rr.c:2421
+#, c-format
+msgid "could not get information about CRTC %d"
+msgstr "nelze získat informace o CRTC %d"
+
+#: ../libgnome-desktop/gnome-rr-config.c:708
+#, c-format
+msgid ""
+"none of the saved display configurations matched the active configuration"
+msgstr "žádná z uložených konfigurací displeje neodpovídá aktivní konfiguraci"
+
+#: ../libgnome-desktop/gnome-rr-config.c:1464
 #, c-format
 msgid "CRTC %d cannot drive output %s"
 msgstr "CRTC %d nemůže řídit výstup %s"
 
-#: ../libgnome-desktop/gnome-rr-config.c:796
+#: ../libgnome-desktop/gnome-rr-config.c:1471
 #, c-format
 msgid "output %s does not support mode %dx%d@%dHz"
 msgstr "výstup %s nepodporuje režim %dx%d@%dHz"
 
-#: ../libgnome-desktop/gnome-rr-config.c:807
+#: ../libgnome-desktop/gnome-rr-config.c:1482
 #, c-format
-msgid "CRTC %d does not support rotation=%d"
-msgstr "CRTC %d nepodporuje otočení = %d"
+msgid "CRTC %d does not support rotation=%s"
+msgstr "CRTC %d nepodporuje rotation=%s"
 
-#: ../libgnome-desktop/gnome-rr-config.c:820
+#: ../libgnome-desktop/gnome-rr-config.c:1496
 #, c-format
 msgid ""
 "output %s does not have the same parameters as another cloned output:\n"
 "existing mode = %d, new mode = %d\n"
 "existing coordinates = (%d, %d), new coordinates = (%d, %d)\n"
-"existing rotation = %d, new rotation = %d"
+"existing rotation = %s, new rotation = %s"
 msgstr ""
 "výstup %s nemá parametry stejné jako další klonovaný výstup:\n"
-"stávající režim = %d, nový režim = %d\n"
-"stávající souřadnice = (%d, %d), nové souřadnice = (%d, %d)\n"
-"stávající otočení = %d, nové otočení = %d"
+"existující režim = %d, nový režim = %d\n"
+"existující souřadnice = (%d, %d), nové souřadnice = (%d, %d)\n"
+"existující otočení = %s, nové otočení = %s"
 
-#: ../libgnome-desktop/gnome-rr-config.c:835
+#: ../libgnome-desktop/gnome-rr-config.c:1511
 #, c-format
 msgid "cannot clone to output %s"
 msgstr "nelze klonovat na výstup %s"
 
-#: ../libgnome-desktop/gnome-rr-config.c:961
+#: ../libgnome-desktop/gnome-rr-config.c:1680
 #, c-format
 msgid "Trying modes for CRTC %d\n"
 msgstr "Zkouší se režimy CRTC %d\n"
 
-#: ../libgnome-desktop/gnome-rr-config.c:985
+#: ../libgnome-desktop/gnome-rr-config.c:1704
 #, c-format
 msgid "CRTC %d: trying mode %dx%d@%dHz with output at %dx%d@%dHz (pass %d)\n"
 msgstr ""
 "CRTC %d: zkouší se režim %d×%d@%dHz s výstupem na %d×%d@%dHz (průchod %d)\n"
 
-#: ../libgnome-desktop/gnome-rr-config.c:1032
+#: ../libgnome-desktop/gnome-rr-config.c:1751
 #, c-format
 msgid ""
 "could not assign CRTCs to outputs:\n"
@@ -88,7 +164,7 @@
 "k výstupům nelze přiřadit CRTC:\n"
 "%s"
 
-#: ../libgnome-desktop/gnome-rr-config.c:1036
+#: ../libgnome-desktop/gnome-rr-config.c:1755
 #, c-format
 msgid ""
 "none of the selected modes were compatible with the possible modes:\n"
@@ -100,7 +176,7 @@
 #. Translators: the "requested", "minimum", and
 #. * "maximum" words here are not keywords; please
 #. * translate them as usual.
-#: ../libgnome-desktop/gnome-rr-config.c:1117
+#: ../libgnome-desktop/gnome-rr-config.c:1833
 #, c-format
 msgid ""
 "required virtual size does not fit available size: requested=(%d, %d), "
@@ -112,70 +188,104 @@
 # Not sure whether we've enough space for it, but anyway, looks more aesthetically with "%A".
 #. Translators: This is the time format with full date used
 #. in 24-hour mode.
-#: ../libgnome-desktop/gnome-wall-clock.c:270
-msgid "%a %b %e, %R:%S"
-msgstr "%A, %e. %B, %k∶%M∶%S"
+#. The character between %R and %S is U+2236 RATIO
+#: ../libgnome-desktop/gnome-wall-clock.c:268
+#| msgid "%a %b %e, %R:%S"
+msgid "%a %b %e, %R∶%S"
+msgstr "%A, %e. %B, %k:%M:%S"
 
 # Not sure whether we've enough space for it, but anyway, looks more aesthetically with "%A".
-#: ../libgnome-desktop/gnome-wall-clock.c:271
+#: ../libgnome-desktop/gnome-wall-clock.c:269
 msgid "%a %b %e, %R"
-msgstr "%A, %e. %B, %k∶%M"
+msgstr "%A, %e. %B, %k:%M"
 
 # Not sure whether we've enough space for it, but anyway, looks more aesthetically with "%A".
 #. Translators: This is the time format with day used
 #. in 24-hour mode.
-#: ../libgnome-desktop/gnome-wall-clock.c:275
-msgid "%a %R:%S"
-msgstr "%A, %k∶%M∶%S"
+#. The character between %R and %S is U+2236 RATIO
+#: ../libgnome-desktop/gnome-wall-clock.c:274
+#| msgid "%a %R:%S"
+msgid "%a %R∶%S"
+msgstr "%A, %k:%M:%S"
 
 # Not sure whether we've enough space for it, but anyway, looks more aesthetically with "%A".
-#: ../libgnome-desktop/gnome-wall-clock.c:276
+#: ../libgnome-desktop/gnome-wall-clock.c:275
 msgid "%a %R"
-msgstr "%A, %k∶%M"
+msgstr "%A, %k:%M"
 
-# Not sure whether we've enough space for it, but anyway, looks more aesthetically with "%A".
 #. Translators: This is the time format without date used
 #. in 24-hour mode.
+#. The character between %R and %S is U+2236 RATIO
 #: ../libgnome-desktop/gnome-wall-clock.c:280
-msgid "%R:%S"
-msgstr "%k∶%M∶%S"
+msgid "%R∶%S"
+msgstr "%k:%M:%S"
 
 #: ../libgnome-desktop/gnome-wall-clock.c:280
 msgid "%R"
-msgstr "%k∶%M"
+msgstr "%k:%M"
 
 # Not sure whether we've enough space for it, but anyway, looks more aesthetically with "%A".
 #. Translators: This is a time format with full date used
 #. for AM/PM.
-#: ../libgnome-desktop/gnome-wall-clock.c:286
-msgid "%a %b %e, %l:%M:%S %p"
-msgstr "%A, %e. %B, %l∶%M∶%S %p"
+#. The Unicode characters are U+2236 RATIO and
+#. U+2009 THIN SPACE
+#: ../libgnome-desktop/gnome-wall-clock.c:288
+#| msgid "%a %b %e, %l:%M:%S %p"
+msgid "%a %b %e, %l∶%M∶%S %p"
+msgstr "%A, %e. %B, %l:%M:%S %p"
 
 # Not sure whether we've enough space for it, but anyway, looks more aesthetically with "%A".
-#: ../libgnome-desktop/gnome-wall-clock.c:287
-msgid "%a %b %e, %l:%M %p"
-msgstr "%A, %e. %B, %l∶%M %p"
+#: ../libgnome-desktop/gnome-wall-clock.c:289
+#| msgid "%a %b %e, %l:%M %p"
+msgid "%a %b %e, %l∶%M %p"
+msgstr "%A, %e. %B, %l:%M %p"
 
 # Not sure whether we've enough space for it, but anyway, looks more aesthetically with "%A".
 #. Translators: This is a time format with day used
 #. for AM/PM.
-#: ../libgnome-desktop/gnome-wall-clock.c:291
-msgid "%a %l:%M:%S %p"
-msgstr "%A %l∶%M∶%S %p"
+#. The Unicode characters are U+2236 RATIO and
+#. U+2009 THIN SPACE
+#: ../libgnome-desktop/gnome-wall-clock.c:295
+#| msgid "%a %l:%M:%S %p"
+msgid "%a %l∶%M∶%S %p"
+msgstr "%A, %l:%M:%S %p"
 
 # Not sure whether we've enough space for it, but anyway, looks more aesthetically with "%A".
-#: ../libgnome-desktop/gnome-wall-clock.c:292
-msgid "%a %l:%M %p"
-msgstr "%A, %l∶%M %p"
+#: ../libgnome-desktop/gnome-wall-clock.c:296
+#| msgid "%a %l:%M %p"
+msgid "%a %l∶%M %p"
+msgstr "%A, %l:%M %p"
 
-# Not sure whether we've enough space for it, but anyway, looks more aesthetically with "%A".
 #. Translators: This is a time format without date used
 #. for AM/PM.
-#: ../libgnome-desktop/gnome-wall-clock.c:296
-msgid "%l:%M:%S %p"
-msgstr "%l∶%M∶%S %p"
+#. The Unicode characters are U+2236 RATIO and
+#. U+2009 THIN SPACE
+#: ../libgnome-desktop/gnome-wall-clock.c:302
+msgid "%l∶%M∶%S %p"
+msgstr "%l:%M:%S %p"
+
+#: ../libgnome-desktop/gnome-wall-clock.c:303
+msgid "%l∶%M %p"
+msgstr "%l:%M %p"
+
+#~ msgid "Cannot find a terminal, using xterm, even if it may not work"
+#~ msgstr ""
+#~ "Nelze nalézt terminál, používá se xterm, přestože možná nebude funkční"
+
+#~ msgid "Laptop"
+#~ msgstr "Notebook"
+
+#~ msgid "Mirrored Displays"
+#~ msgstr "Zrcadlené displeje"
+
+# Not sure whether we've enough space for it, but anyway, looks more aesthetically with "%A".
+#~ msgid "%R:%S"
+#~ msgstr "%k:%M:%S"
+
+# Not sure whether we've enough space for it, but anyway, looks more aesthetically with "%A".
+#~ msgid "%l:%M:%S %p"
+#~ msgstr "%l:%M:%S %p"
 
 # Not sure whether we've enough space for it, but anyway, looks more aesthetically with "%A".
-#: ../libgnome-desktop/gnome-wall-clock.c:297
-msgid "%l:%M %p"
-msgstr "%l∶%M %p"
+#~ msgid "%l:%M %p"
+#~ msgstr "%A, %l:%M %p"
diff -Nru gnome-desktop3-3.12.0/po/da.po gnome-desktop3-3.8.4/po/da.po
--- gnome-desktop3-3.12.0/po/da.po	2013-11-11 17:23:17.000000000 +0000
+++ gnome-desktop3-3.8.4/po/da.po	2013-03-18 09:50:35.000000000 +0000
@@ -22,8 +22,8 @@
 msgstr ""
 "Project-Id-Version: gnome-desktop\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-09-17 18:40+0200\n"
-"PO-Revision-Date: 2013-09-17 00:06+0200\n"
+"POT-Creation-Date: 2013-03-17 14:50+0100\n"
+"PO-Revision-Date: 2013-03-16 18:01+0100\n"
 "Last-Translator: Ask Hjorth Larsen \n"
 "Language-Team: Danish \n"
 "Language: da\n"
@@ -34,55 +34,133 @@
 "X-Poedit-Country: DENMARK\n"
 "X-Poedit-SourceCharset: utf-8\n"
 
+#. Translators: "Unknown" here is used to identify a monitor for which
+#. * we don't know the vendor. When a vendor is known, the name of the
+#. * vendor is used.
+#: ../libgnome-desktop/display-name.c:107
+msgctxt "Monitor vendor"
+msgid "Unknown"
+msgstr "Ukendt"
+
 #: ../libgnome-desktop/gnome-languages.c:804
 msgid "Unspecified"
 msgstr "Ikke angivet"
 
-#: ../libgnome-desktop/gnome-rr-config.c:743
+#. Translators: a CRTC is a CRT Controller (this is X terminology).
+#: ../libgnome-desktop/gnome-rr.c:452
+#, c-format
+msgid "could not get the screen resources (CRTCs, outputs, modes)"
+msgstr "kunne ikke hente skærmresourcerne (CRTC'er, uddataene, tilstandende)"
+
+#: ../libgnome-desktop/gnome-rr.c:472
+#, c-format
+msgid "unhandled X error while getting the range of screen sizes"
+msgstr "uhåndterbar X-fejl under hentning af tabeller til skærmstørrelser"
+
+#: ../libgnome-desktop/gnome-rr.c:478
+#, c-format
+msgid "could not get the range of screen sizes"
+msgstr "kunne ikke hente tabeller til skærmstørrelser"
+
+#: ../libgnome-desktop/gnome-rr.c:769
+#, c-format
+msgid "RANDR extension is not present"
+msgstr "RANDR-udvidelsen er ikke tilstede"
+
+#: ../libgnome-desktop/gnome-rr.c:1580
+#, c-format
+msgid "could not get information about output %d"
+msgstr "kunne ikke hente information om uddata %d"
+
+#: ../libgnome-desktop/gnome-rr.c:1764
+msgid "Built-in Display"
+msgstr "Indbygget skærm"
+
+#. Translators: %s is the size of the monitor in inches
+#: ../libgnome-desktop/gnome-rr.c:1782
+#, c-format
+msgid "%s Display"
+msgstr "%s-skærm"
+
+#: ../libgnome-desktop/gnome-rr.c:1789
+msgid "Unknown Display"
+msgstr "Ukendt skærm"
+
+#. Translators: the "position", "size", and "maximum"
+#. * words here are not keywords; please translate them
+#. * as usual.  A CRTC is a CRT Controller (this is X terminology)
+#: ../libgnome-desktop/gnome-rr.c:2234
+#, c-format
+msgid ""
+"requested position/size for CRTC %d is outside the allowed limit: position="
+"(%d, %d), size=(%d, %d), maximum=(%d, %d)"
+msgstr ""
+"anmodet placering/størrelse til CRTC %d er uden for de tilladte grænser: "
+"Position=(%d, %d), størrelse=(%d, %d), maksimum=(%d, %d)"
+
+#: ../libgnome-desktop/gnome-rr.c:2270
+#, c-format
+msgid "could not set the configuration for CRTC %d"
+msgstr "kunne ikke sætte indstillinger til CRTC %d"
+
+#: ../libgnome-desktop/gnome-rr.c:2421
+#, c-format
+msgid "could not get information about CRTC %d"
+msgstr "kunne ikke hente information om CRTC %d"
+
+#: ../libgnome-desktop/gnome-rr-config.c:708
+#, c-format
+msgid ""
+"none of the saved display configurations matched the active configuration"
+msgstr ""
+"ingen af de gemte skærmindstillinger stemmer overens med nuværende "
+"indstilling"
+
+#: ../libgnome-desktop/gnome-rr-config.c:1464
 #, c-format
 msgid "CRTC %d cannot drive output %s"
 msgstr "CRTC %d kan ikke drive output %s"
 
-#: ../libgnome-desktop/gnome-rr-config.c:750
+#: ../libgnome-desktop/gnome-rr-config.c:1471
 #, c-format
 msgid "output %s does not support mode %dx%d@%dHz"
 msgstr "output %s understøtter ikke tilstanden %dx%d@%dHz"
 
-#: ../libgnome-desktop/gnome-rr-config.c:761
+#: ../libgnome-desktop/gnome-rr-config.c:1482
 #, c-format
-msgid "CRTC %d does not support rotation=%d"
-msgstr "CRTC %d understøtter ikke rotation=%d"
+msgid "CRTC %d does not support rotation=%s"
+msgstr "CRTC %d understøtter ikke rotation=%s"
 
-#: ../libgnome-desktop/gnome-rr-config.c:774
+#: ../libgnome-desktop/gnome-rr-config.c:1496
 #, c-format
 msgid ""
 "output %s does not have the same parameters as another cloned output:\n"
 "existing mode = %d, new mode = %d\n"
 "existing coordinates = (%d, %d), new coordinates = (%d, %d)\n"
-"existing rotation = %d, new rotation = %d"
+"existing rotation = %s, new rotation = %s"
 msgstr ""
 "output %s har ikke de samme parametre som et andet klonet output:\n"
 "eksisterende tilstand = %d, ny tilstand = %d\n"
 "eksisterende koordinater = (%d, %d), nye koordinater = (%d, %d)\n"
-"eksisterende rotation = %d, ny rotation = %d"
+"eksisterende rotation = %s, ny rotation = %s"
 
-#: ../libgnome-desktop/gnome-rr-config.c:789
+#: ../libgnome-desktop/gnome-rr-config.c:1511
 #, c-format
 msgid "cannot clone to output %s"
 msgstr "kan ikke klone til output %s"
 
-#: ../libgnome-desktop/gnome-rr-config.c:915
+#: ../libgnome-desktop/gnome-rr-config.c:1680
 #, c-format
 msgid "Trying modes for CRTC %d\n"
 msgstr "Prøver tilstande for CRTC %d\n"
 
-#: ../libgnome-desktop/gnome-rr-config.c:939
+#: ../libgnome-desktop/gnome-rr-config.c:1704
 #, c-format
 msgid "CRTC %d: trying mode %dx%d@%dHz with output at %dx%d@%dHz (pass %d)\n"
 msgstr ""
 "CRTC %d: prøver tilstand %dx%d@%dHz med output på %dx%d@%dHz (gennemløb %d)\n"
 
-#: ../libgnome-desktop/gnome-rr-config.c:986
+#: ../libgnome-desktop/gnome-rr-config.c:1751
 #, c-format
 msgid ""
 "could not assign CRTCs to outputs:\n"
@@ -91,7 +169,7 @@
 "kunne ikke tildele CTRC'er til output:\n"
 "%s"
 
-#: ../libgnome-desktop/gnome-rr-config.c:990
+#: ../libgnome-desktop/gnome-rr-config.c:1755
 #, c-format
 msgid ""
 "none of the selected modes were compatible with the possible modes:\n"
@@ -103,7 +181,7 @@
 #. Translators: the "requested", "minimum", and
 #. * "maximum" words here are not keywords; please
 #. * translate them as usual.
-#: ../libgnome-desktop/gnome-rr-config.c:1071
+#: ../libgnome-desktop/gnome-rr-config.c:1833
 #, c-format
 msgid ""
 "required virtual size does not fit available size: requested=(%d, %d), "
@@ -114,29 +192,32 @@
 
 #. Translators: This is the time format with full date used
 #. in 24-hour mode.
-#: ../libgnome-desktop/gnome-wall-clock.c:270
-msgid "%a %b %e, %R:%S"
-msgstr "%a %e. %b, %R:%S"
+#. The character between %R and %S is U+2236 RATIO
+#: ../libgnome-desktop/gnome-wall-clock.c:268
+msgid "%a %b %e, %R∶%S"
+msgstr "%a %e. %b, %R∶%S"
 
-#: ../libgnome-desktop/gnome-wall-clock.c:271
+#: ../libgnome-desktop/gnome-wall-clock.c:269
 msgid "%a %b %e, %R"
 msgstr "%a %e. %b, %R"
 
 #. Translators: This is the time format with day used
 #. in 24-hour mode.
-#: ../libgnome-desktop/gnome-wall-clock.c:275
-msgid "%a %R:%S"
-msgstr "%a %R:%S"
+#. The character between %R and %S is U+2236 RATIO
+#: ../libgnome-desktop/gnome-wall-clock.c:274
+msgid "%a %R∶%S"
+msgstr "%a %R∶%S"
 
-#: ../libgnome-desktop/gnome-wall-clock.c:276
+#: ../libgnome-desktop/gnome-wall-clock.c:275
 msgid "%a %R"
 msgstr "%a %R"
 
 #. Translators: This is the time format without date used
 #. in 24-hour mode.
+#. The character between %R and %S is U+2236 RATIO
 #: ../libgnome-desktop/gnome-wall-clock.c:280
-msgid "%R:%S"
-msgstr "%R:%S"
+msgid "%R∶%S"
+msgstr "%R∶%S"
 
 #: ../libgnome-desktop/gnome-wall-clock.c:280
 msgid "%R"
@@ -144,99 +225,39 @@
 
 #. Translators: This is a time format with full date used
 #. for AM/PM.
-#: ../libgnome-desktop/gnome-wall-clock.c:286
-msgid "%a %b %e, %l:%M:%S %p"
-msgstr "%a %e. %b, %l:%M:%S"
-
-#: ../libgnome-desktop/gnome-wall-clock.c:287
-msgid "%a %b %e, %l:%M %p"
-msgstr "%a %e. %b, %l:%M"
+#. The Unicode characters are U+2236 RATIO and
+#. U+2009 THIN SPACE
+#: ../libgnome-desktop/gnome-wall-clock.c:288
+msgid "%a %b %e, %l∶%M∶%S %p"
+msgstr "%a %e. %b, %l∶%M∶%S %p"
+
+#: ../libgnome-desktop/gnome-wall-clock.c:289
+msgid "%a %b %e, %l∶%M %p"
+msgstr "%a %e. %b, %l∶%M %p"
 
 #. Translators: This is a time format with day used
 #. for AM/PM.
-#: ../libgnome-desktop/gnome-wall-clock.c:291
-msgid "%a %l:%M:%S %p"
-msgstr "%a %l:%M:%S"
-
-#: ../libgnome-desktop/gnome-wall-clock.c:292
-msgid "%a %l:%M %p"
-msgstr "%a %l:%M"
+#. The Unicode characters are U+2236 RATIO and
+#. U+2009 THIN SPACE
+#: ../libgnome-desktop/gnome-wall-clock.c:295
+msgid "%a %l∶%M∶%S %p"
+msgstr "%a %l∶%M∶%S %p"
 
-#. Translators: This is a time format without date used
-#. for AM/PM.
 #: ../libgnome-desktop/gnome-wall-clock.c:296
-msgid "%l:%M:%S %p"
-msgstr "%l:%M:%S"
-
-#: ../libgnome-desktop/gnome-wall-clock.c:297
-msgid "%l:%M %p"
-msgstr "%l:%M"
-
-#~ msgctxt "Monitor vendor"
-#~ msgid "Unknown"
-#~ msgstr "Ukendt"
-
-#~ msgid "could not get the screen resources (CRTCs, outputs, modes)"
-#~ msgstr ""
-#~ "kunne ikke hente skærmresourcerne (CRTC'er, uddataene, tilstandende)"
-
-#~ msgid "unhandled X error while getting the range of screen sizes"
-#~ msgstr "uhåndterbar X-fejl under hentning af tabeller til skærmstørrelser"
-
-#~ msgid "could not get the range of screen sizes"
-#~ msgstr "kunne ikke hente tabeller til skærmstørrelser"
-
-#~ msgid "RANDR extension is not present"
-#~ msgstr "RANDR-udvidelsen er ikke tilstede"
-
-#~ msgid "could not get information about output %d"
-#~ msgstr "kunne ikke hente information om uddata %d"
-
-#~ msgid "Built-in Display"
-#~ msgstr "Indbygget skærm"
-
-#~ msgid "%s Display"
-#~ msgstr "%s-skærm"
-
-#~ msgid "Unknown Display"
-#~ msgstr "Ukendt skærm"
-
-#~ msgid ""
-#~ "requested position/size for CRTC %d is outside the allowed limit: "
-#~ "position=(%d, %d), size=(%d, %d), maximum=(%d, %d)"
-#~ msgstr ""
-#~ "anmodet placering/størrelse til CRTC %d er uden for de tilladte grænser: "
-#~ "Position=(%d, %d), størrelse=(%d, %d), maksimum=(%d, %d)"
+msgid "%a %l∶%M %p"
+msgstr "%a %l∶%M %p"
 
-#~ msgid "could not set the configuration for CRTC %d"
-#~ msgstr "kunne ikke sætte indstillinger til CRTC %d"
-
-#~ msgid "could not get information about CRTC %d"
-#~ msgstr "kunne ikke hente information om CRTC %d"
-
-#~ msgid ""
-#~ "none of the saved display configurations matched the active configuration"
-#~ msgstr ""
-#~ "ingen af de gemte skærmindstillinger stemmer overens med nuværende "
-#~ "indstilling"
-
-#~ msgid "%a %b %e, %R∶%S"
-#~ msgstr "%a %e. %b, %R∶%S"
-
-#~ msgid "%R∶%S"
-#~ msgstr "%R∶%S"
-
-#~ msgid "%a %l∶%M∶%S %p"
-#~ msgstr "%a %l∶%M∶%S %p"
-
-#~ msgid "%a %l∶%M %p"
-#~ msgstr "%a %l∶%M %p"
-
-#~ msgid "%l∶%M∶%S %p"
-#~ msgstr "%l∶%M∶%S %p"
-
-#~ msgid "%l∶%M %p"
-#~ msgstr "%l∶%M %p"
+#. Translators: This is a time format without date used
+#. for AM/PM.
+#. The Unicode characters are U+2236 RATIO and
+#. U+2009 THIN SPACE
+#: ../libgnome-desktop/gnome-wall-clock.c:302
+msgid "%l∶%M∶%S %p"
+msgstr "%l∶%M∶%S %p"
+
+#: ../libgnome-desktop/gnome-wall-clock.c:303
+msgid "%l∶%M %p"
+msgstr "%l∶%M %p"
 
 #~ msgid "Cannot find a terminal, using xterm, even if it may not work"
 #~ msgstr ""
@@ -249,6 +270,15 @@
 #~ msgid "Mirrored Displays"
 #~ msgstr "Klonede skærme"
 
+#~ msgid "%R:%S"
+#~ msgstr "%R:%S"
+
+#~ msgid "%l:%M:%S %p"
+#~ msgstr "%l:%M:%S %p"
+
+#~ msgid "%l:%M %p"
+#~ msgstr "%l:%M %p"
+
 #~ msgid "About GNOME"
 #~ msgstr "Om Gnome"
 
diff -Nru gnome-desktop3-3.12.0/po/de.po gnome-desktop3-3.8.4/po/de.po
--- gnome-desktop3-3.12.0/po/de.po	2013-11-11 17:23:17.000000000 +0000
+++ gnome-desktop3-3.8.4/po/de.po	2013-09-04 11:15:57.000000000 +0000
@@ -15,81 +15,152 @@
 # Paul Seyfert , 2010.
 # Christian Kirbach , 2009, 2010.
 # Hedda Peters , 2012.
-# Benjamin Steinwender , 2013.
 #
 msgid ""
 msgstr ""
 "Project-Id-Version: gnome-desktop\n"
 "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=gnome-"
 "desktop&keywords=I18N+L10N&component=general\n"
-"POT-Creation-Date: 2013-09-11 19:11+0000\n"
-"PO-Revision-Date: 2013-09-16 18:44+0100\n"
-"Last-Translator: Benjamin Steinwender \n"
+"POT-Creation-Date: 2013-03-04 10:03+0000\n"
+"PO-Revision-Date: 2013-03-08 17:11+0100\n"
+"Last-Translator: Mario Blättermann \n"
 "Language-Team: German \n"
-"Language: de\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
-"X-Generator: Poedit 1.5.7\n"
+"X-Generator: Lokalize 1.0\n"
+
+#. Translators: "Unknown" here is used to identify a monitor for which
+#. * we don't know the vendor. When a vendor is known, the name of the
+#. * vendor is used.
+#: ../libgnome-desktop/display-name.c:107
+msgctxt "Monitor vendor"
+msgid "Unknown"
+msgstr "Unbekannt"
 
 #: ../libgnome-desktop/gnome-languages.c:804
 msgid "Unspecified"
 msgstr "Nicht angegeben"
 
-#: ../libgnome-desktop/gnome-rr-config.c:743
+#. Translators: a CRTC is a CRT Controller (this is X terminology).
+#: ../libgnome-desktop/gnome-rr.c:452
+#, c-format
+msgid "could not get the screen resources (CRTCs, outputs, modes)"
+msgstr ""
+"Es konnten keine Informationen über den Bildschirm gesammelt werden (CRTCs, "
+"Ausgaben, Auflösungen)"
+
+#: ../libgnome-desktop/gnome-rr.c:472
+#, c-format
+msgid "unhandled X error while getting the range of screen sizes"
+msgstr "Unbehandelter X-Fehler beim Abfragen der Bildschirmgrößen"
+
+#: ../libgnome-desktop/gnome-rr.c:478
+#, c-format
+msgid "could not get the range of screen sizes"
+msgstr "Mögliche Bildschirmgrößen konnten nicht abgefragt werden"
+
+#: ../libgnome-desktop/gnome-rr.c:769
+#, c-format
+msgid "RANDR extension is not present"
+msgstr "Die RANDR-Erweiterung ist nicht vorhanden"
+
+#: ../libgnome-desktop/gnome-rr.c:1580
+#, c-format
+msgid "could not get information about output %d"
+msgstr "Es konnten keine Informationen über die Ausgabe »%d« erfragt werden"
+
+#: ../libgnome-desktop/gnome-rr.c:1764
+msgid "Built-in Display"
+msgstr "Eingebaute Anzeige"
+
+#. Translators: %s is the size of the monitor in inches
+#: ../libgnome-desktop/gnome-rr.c:1782
+#, c-format
+msgid "%s Display"
+msgstr "Anzeige %s"
+
+#: ../libgnome-desktop/gnome-rr.c:1789
+msgid "Unknown Display"
+msgstr "Unbekannte Anzeige"
+
+#. Translators: the "position", "size", and "maximum"
+#. * words here are not keywords; please translate them
+#. * as usual.  A CRTC is a CRT Controller (this is X terminology)
+#: ../libgnome-desktop/gnome-rr.c:2234
+#, c-format
+msgid ""
+"requested position/size for CRTC %d is outside the allowed limit: position="
+"(%d, %d), size=(%d, %d), maximum=(%d, %d)"
+msgstr ""
+"Gewählte Position/Größe für CRTC »%d« ist über dem erlaubten Limit: Position="
+"(%d, %d), Größe=(%d, %d), Maximum=(%d, %d)"
+
+#: ../libgnome-desktop/gnome-rr.c:2270
+#, c-format
+msgid "could not set the configuration for CRTC %d"
+msgstr "Konfiguration für CRTC »%d« konnte nicht angewendet werden"
+
+#: ../libgnome-desktop/gnome-rr.c:2421
+#, c-format
+msgid "could not get information about CRTC %d"
+msgstr "Informationen über CRTC »%d« konnten nicht erfragt werden"
+
+#: ../libgnome-desktop/gnome-rr-config.c:708
+#, c-format
+msgid ""
+"none of the saved display configurations matched the active configuration"
+msgstr "Keine der gespeicherten Bildschirmkonfigurationen gleichen der Aktiven"
+
+#: ../libgnome-desktop/gnome-rr-config.c:1464
 #, c-format
 msgid "CRTC %d cannot drive output %s"
 msgstr "CRTC »%d« unterstützt die Ausgabe »%s« nicht"
 
-#: ../libgnome-desktop/gnome-rr-config.c:750
+#: ../libgnome-desktop/gnome-rr-config.c:1471
 #, c-format
 msgid "output %s does not support mode %dx%d@%dHz"
 msgstr "Ausgabe »%s« unterstützt den Modus »%dx%d@%dHz« nicht"
 
-#: ../libgnome-desktop/gnome-rr-config.c:761
+#: ../libgnome-desktop/gnome-rr-config.c:1482
+#, c-format
+msgid "CRTC %d does not support rotation=%s"
+msgstr "CRTC »%d« unterstützt Drehung um %s nicht"
+
+#: ../libgnome-desktop/gnome-rr-config.c:1496
 #, c-format
-#| msgid "CRTC %d does not support rotation=%s"
-msgid "CRTC %d does not support rotation=%d"
-msgstr "CRTC »%d« unterstützt Drehung=%d nicht"
-
-#: ../libgnome-desktop/gnome-rr-config.c:774
-#, c-format
-#| msgid ""
-#| "output %s does not have the same parameters as another cloned output:\n"
-#| "existing mode = %d, new mode = %d\n"
-#| "existing coordinates = (%d, %d), new coordinates = (%d, %d)\n"
-#| "existing rotation = %s, new rotation = %s"
 msgid ""
 "output %s does not have the same parameters as another cloned output:\n"
 "existing mode = %d, new mode = %d\n"
 "existing coordinates = (%d, %d), new coordinates = (%d, %d)\n"
-"existing rotation = %d, new rotation = %d"
+"existing rotation = %s, new rotation = %s"
 msgstr ""
 "Ausgabe »%s« hat nicht die gleichen Parameter wie eine andere duplizierte "
 "Ausgabe:\n"
 "bestehender Modus = %d, neuer Modus = %d\n"
 "bestehende Koordinaten = (%d, %d), neue Koordinaten = (%d, %d)\n"
-"bestehende Drehung = %d, neue Drehung = %d"
+"bestehende Drehung = %s, neue Drehung = %s"
 
-#: ../libgnome-desktop/gnome-rr-config.c:789
+#: ../libgnome-desktop/gnome-rr-config.c:1511
 #, c-format
 msgid "cannot clone to output %s"
 msgstr "Auf Ausgabe »%s« kann nicht dupliziert werden"
 
-#: ../libgnome-desktop/gnome-rr-config.c:915
+#: ../libgnome-desktop/gnome-rr-config.c:1680
 #, c-format
 msgid "Trying modes for CRTC %d\n"
 msgstr "Teste Modi für CRTC »%d«\n"
 
-#: ../libgnome-desktop/gnome-rr-config.c:939
+#: ../libgnome-desktop/gnome-rr-config.c:1704
 #, c-format
 msgid "CRTC %d: trying mode %dx%d@%dHz with output at %dx%d@%dHz (pass %d)\n"
 msgstr ""
 "CRTC »%d«: Teste Modus »%dx%d@%dHz« mit Ausgabe bei »%dx%d@%dHz« (Durchlauf "
 "%d)\n"
 
-#: ../libgnome-desktop/gnome-rr-config.c:986
+#: ../libgnome-desktop/gnome-rr-config.c:1751
 #, c-format
 msgid ""
 "could not assign CRTCs to outputs:\n"
@@ -98,7 +169,7 @@
 "CRTCs konnten nicht als Ausgaben festgelegt werden:\n"
 "%s"
 
-#: ../libgnome-desktop/gnome-rr-config.c:990
+#: ../libgnome-desktop/gnome-rr-config.c:1755
 #, c-format
 msgid ""
 "none of the selected modes were compatible with the possible modes:\n"
@@ -110,7 +181,7 @@
 #. Translators: the "requested", "minimum", and
 #. * "maximum" words here are not keywords; please
 #. * translate them as usual.
-#: ../libgnome-desktop/gnome-rr-config.c:1071
+#: ../libgnome-desktop/gnome-rr-config.c:1833
 #, c-format
 msgid ""
 "required virtual size does not fit available size: requested=(%d, %d), "
@@ -121,29 +192,32 @@
 
 #. Translators: This is the time format with full date used
 #. in 24-hour mode.
-#: ../libgnome-desktop/gnome-wall-clock.c:270
-msgid "%a %b %e, %R:%S"
+#. The character between %R and %S is U+2236 RATIO
+#: ../libgnome-desktop/gnome-wall-clock.c:268
+msgid "%a %b %e, %R∶%S"
 msgstr "%a, %e. %b, %R:%S"
 
-#: ../libgnome-desktop/gnome-wall-clock.c:271
+#: ../libgnome-desktop/gnome-wall-clock.c:269
 msgid "%a %b %e, %R"
 msgstr "%a, %e. %b, %R"
 
 #. Translators: This is the time format with day used
 #. in 24-hour mode.
-#: ../libgnome-desktop/gnome-wall-clock.c:275
-msgid "%a %R:%S"
+#. The character between %R and %S is U+2236 RATIO
+#: ../libgnome-desktop/gnome-wall-clock.c:274
+msgid "%a %R∶%S"
 msgstr "%a %R:%S"
 
-#: ../libgnome-desktop/gnome-wall-clock.c:276
+#: ../libgnome-desktop/gnome-wall-clock.c:275
 msgid "%a %R"
 msgstr "%a %R"
 
 #. Translators: This is the time format without date used
 #. in 24-hour mode.
+#. The character between %R and %S is U+2236 RATIO
 #: ../libgnome-desktop/gnome-wall-clock.c:280
-msgid "%R:%S"
-msgstr "%R:%S"
+msgid "%R∶%S"
+msgstr "%R∶%S"
 
 #: ../libgnome-desktop/gnome-wall-clock.c:280
 msgid "%R"
@@ -151,99 +225,39 @@
 
 #. Translators: This is a time format with full date used
 #. for AM/PM.
-#: ../libgnome-desktop/gnome-wall-clock.c:286
-msgid "%a %b %e, %l:%M:%S %p"
-msgstr "%a, %e. %b, %H:%M:%S"
-
-#: ../libgnome-desktop/gnome-wall-clock.c:287
-msgid "%a %b %e, %l:%M %p"
-msgstr "%a, %e. %b, %H:%M"
+#. The Unicode characters are U+2236 RATIO and
+#. U+2009 THIN SPACE
+#: ../libgnome-desktop/gnome-wall-clock.c:288
+msgid "%a %b %e, %l∶%M∶%S %p"
+msgstr "%a, %e. %b, %l:%M:%S"
+
+#: ../libgnome-desktop/gnome-wall-clock.c:289
+msgid "%a %b %e, %l∶%M %p"
+msgstr "%a, %e. %b, %l:%M"
 
 #. Translators: This is a time format with day used
 #. for AM/PM.
-#: ../libgnome-desktop/gnome-wall-clock.c:291
-msgid "%a %l:%M:%S %p"
-msgstr "%a %H:%M:%S"
-
-#: ../libgnome-desktop/gnome-wall-clock.c:292
-msgid "%a %l:%M %p"
-msgstr "%a %H:%M"
+#. The Unicode characters are U+2236 RATIO and
+#. U+2009 THIN SPACE
+#: ../libgnome-desktop/gnome-wall-clock.c:295
+msgid "%a %l∶%M∶%S %p"
+msgstr "%a %l:%M:%S"
 
-#. Translators: This is a time format without date used
-#. for AM/PM.
 #: ../libgnome-desktop/gnome-wall-clock.c:296
-msgid "%l:%M:%S %p"
-msgstr "%H:%M:%S"
-
-#: ../libgnome-desktop/gnome-wall-clock.c:297
-msgid "%l:%M %p"
-msgstr "%H:%M"
-
-#~ msgctxt "Monitor vendor"
-#~ msgid "Unknown"
-#~ msgstr "Unbekannt"
-
-#~ msgid "could not get the screen resources (CRTCs, outputs, modes)"
-#~ msgstr ""
-#~ "Es konnten keine Informationen über den Bildschirm gesammelt werden "
-#~ "(CRTCs, Ausgaben, Auflösungen)"
-
-#~ msgid "unhandled X error while getting the range of screen sizes"
-#~ msgstr "Unbehandelter X-Fehler beim Abfragen der Bildschirmgrößen"
-
-#~ msgid "could not get the range of screen sizes"
-#~ msgstr "Mögliche Bildschirmgrößen konnten nicht abgefragt werden"
-
-#~ msgid "RANDR extension is not present"
-#~ msgstr "Die RANDR-Erweiterung ist nicht vorhanden"
-
-#~ msgid "could not get information about output %d"
-#~ msgstr "Es konnten keine Informationen über die Ausgabe »%d« erfragt werden"
-
-#~ msgid "Built-in Display"
-#~ msgstr "Eingebaute Anzeige"
-
-#~ msgid "%s Display"
-#~ msgstr "Anzeige %s"
-
-#~ msgid "Unknown Display"
-#~ msgstr "Unbekannte Anzeige"
-
-#~ msgid ""
-#~ "requested position/size for CRTC %d is outside the allowed limit: "
-#~ "position=(%d, %d), size=(%d, %d), maximum=(%d, %d)"
-#~ msgstr ""
-#~ "Gewählte Position/Größe für CRTC »%d« ist über dem erlaubten Limit: "
-#~ "Position=(%d, %d), Größe=(%d, %d), Maximum=(%d, %d)"
+msgid "%a %l∶%M %p"
+msgstr "%a %l:%M"
 
-#~ msgid "could not set the configuration for CRTC %d"
-#~ msgstr "Konfiguration für CRTC »%d« konnte nicht angewendet werden"
-
-#~ msgid "could not get information about CRTC %d"
-#~ msgstr "Informationen über CRTC »%d« konnten nicht erfragt werden"
-
-#~ msgid ""
-#~ "none of the saved display configurations matched the active configuration"
-#~ msgstr ""
-#~ "Keine der gespeicherten Bildschirmkonfigurationen gleichen der Aktiven"
-
-#~ msgid "%a %b %e, %R∶%S"
-#~ msgstr "%a, %e. %b, %R:%S"
-
-#~ msgid "%R∶%S"
-#~ msgstr "%R∶%S"
-
-#~ msgid "%a %l∶%M∶%S %p"
-#~ msgstr "%a %l:%M:%S"
-
-#~ msgid "%a %l∶%M %p"
-#~ msgstr "%a %l:%M"
-
-#~ msgid "%l∶%M∶%S %p"
-#~ msgstr "%l∶%M∶%S"
-
-#~ msgid "%l∶%M %p"
-#~ msgstr "%l∶%M"
+#. Translators: This is a time format without date used
+#. for AM/PM.
+#. The Unicode characters are U+2236 RATIO and
+#. U+2009 THIN SPACE
+#: ../libgnome-desktop/gnome-wall-clock.c:302
+msgid "%l∶%M∶%S %p"
+msgstr "%l∶%M∶%S"
+
+#: ../libgnome-desktop/gnome-wall-clock.c:303
+msgid "%l∶%M %p"
+msgstr "%l∶%M"
 
 #~ msgid "Cannot find a terminal, using xterm, even if it may not work"
 #~ msgstr ""
@@ -255,3 +269,12 @@
 
 #~ msgid "Mirrored Displays"
 #~ msgstr "Gespiegelte Bildschirme"
+
+#~ msgid "%R:%S"
+#~ msgstr "%R:%S"
+
+#~ msgid "%l:%M:%S %p"
+#~ msgstr "%l:%M:%S"
+
+#~ msgid "%l:%M %p"
+#~ msgstr "%l:%M"
diff -Nru gnome-desktop3-3.12.0/po/el.po gnome-desktop3-3.8.4/po/el.po
--- gnome-desktop3-3.12.0/po/el.po	2014-01-07 13:28:18.000000000 +0000
+++ gnome-desktop3-3.8.4/po/el.po	2013-09-04 11:15:57.000000000 +0000
@@ -30,14 +30,13 @@
 # kostas: 12Nov2003, fixes
 # Μάριος Ζηντίλης , 2010.
 # Dimitris Spingos (Δημήτρης Σπίγγος) , 2012, 2013.
-# Efstathios Iosifidis , 2013.
 msgid ""
 msgstr ""
 "Project-Id-Version: gnome-desktop.HEAD\n"
 "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=gnome-"
 "desktop&keywords=I18N+L10N&component=general\n"
-"POT-Creation-Date: 2013-10-21 21:26+0000\n"
-"PO-Revision-Date: 2013-11-06 08:17+0300\n"
+"POT-Creation-Date: 2013-03-04 10:03+0000\n"
+"PO-Revision-Date: 2013-03-09 08:57+0300\n"
 "Last-Translator: Dimitris Spingos (Δημήτρης Σπίγγος) \n"
 "Language-Team: team@gnome.gr\n"
 "Language: el\n"
@@ -48,57 +47,137 @@
 "X-Generator: Virtaal 0.7.1\n"
 "X-Project-Style: gnome\n"
 
-#: ../libgnome-desktop/gnome-languages.c:718
+#. Translators: "Unknown" here is used to identify a monitor for which
+#. * we don't know the vendor. When a vendor is known, the name of the
+#. * vendor is used.
+#: ../libgnome-desktop/display-name.c:107
+msgctxt "Monitor vendor"
+msgid "Unknown"
+msgstr "Άγνωστος"
+
+#: ../libgnome-desktop/gnome-languages.c:804
 msgid "Unspecified"
 msgstr "Ακαθόριστο"
 
-#: ../libgnome-desktop/gnome-rr-config.c:743
+#. Translators: a CRTC is a CRT Controller (this is X terminology).
+#: ../libgnome-desktop/gnome-rr.c:452
+#, c-format
+msgid "could not get the screen resources (CRTCs, outputs, modes)"
+msgstr "αδυναμία λήψης των πηγών οθόνης (CRTCs, έξοδοι, λειτουργίες)"
+
+#: ../libgnome-desktop/gnome-rr.c:472
+#, c-format
+msgid "unhandled X error while getting the range of screen sizes"
+msgstr "Απρόσμενο σφάλμα X κατά τη λήψη του εύρους των μεγεθών οθόνης"
+
+#: ../libgnome-desktop/gnome-rr.c:478
+#, c-format
+msgid "could not get the range of screen sizes"
+msgstr "αδύνατη η λήψη του εύρους των μεγεθών οθόνης"
+
+#: ../libgnome-desktop/gnome-rr.c:769
+#, c-format
+msgid "RANDR extension is not present"
+msgstr "Δεν υπάρχει η επέκταση RANDR"
+
+#: ../libgnome-desktop/gnome-rr.c:1580
+#, c-format
+msgid "could not get information about output %d"
+msgstr "Αδυναμία εύρεσης πληροφοριών για την έξοδο %d"
+
+#: ../libgnome-desktop/gnome-rr.c:1764
+msgid "Built-in Display"
+msgstr "Ενσωματωμένη οθόνη"
+
+#. Translators: %s is the size of the monitor in inches
+#: ../libgnome-desktop/gnome-rr.c:1782
+#, c-format
+msgid "%s Display"
+msgstr "%s οθόνη"
+
+#: ../libgnome-desktop/gnome-rr.c:1789
+#| msgctxt "Monitor vendor"
+#| msgid "Unknown"
+msgid "Unknown Display"
+msgstr "Άγνωστη οθόνη"
+
+#. Translators: the "position", "size", and "maximum"
+#. * words here are not keywords; please translate them
+#. * as usual.  A CRTC is a CRT Controller (this is X terminology)
+#: ../libgnome-desktop/gnome-rr.c:2234
+#, c-format
+msgid ""
+"requested position/size for CRTC %d is outside the allowed limit: position="
+"(%d, %d), size=(%d, %d), maximum=(%d, %d)"
+msgstr ""
+"η ζητούμενη θέση/μέγεθος για το CRTC %d είναι έξω από το επιτρεπτό όριο: "
+"θέση=(%d, %d), μέγεθος=(%d, %d), μέγιστο=(%d, %d)"
+
+#: ../libgnome-desktop/gnome-rr.c:2270
+#, c-format
+msgid "could not set the configuration for CRTC %d"
+msgstr "αδυναμία ορισμού της ρύθμισης για το CRTC %d"
+
+#: ../libgnome-desktop/gnome-rr.c:2421
+#, c-format
+msgid "could not get information about CRTC %d"
+msgstr "αδυναμία εύρεσης πληροφοριών για το CRTC %d"
+
+#: ../libgnome-desktop/gnome-rr-config.c:708
+#, c-format
+msgid ""
+"none of the saved display configurations matched the active configuration"
+msgstr ""
+"καμία από τις αποθηκευμένες ρυθμίσεις οθόνης δεν ταίριαζε με την ενεργή "
+"ρύθμιση"
+
+#: ../libgnome-desktop/gnome-rr-config.c:1464
 #, c-format
 msgid "CRTC %d cannot drive output %s"
 msgstr "Το CRTC %d δεν μπορεί να οδηγήσει την έξοδο %s"
 
-#: ../libgnome-desktop/gnome-rr-config.c:750
+#: ../libgnome-desktop/gnome-rr-config.c:1471
 #, c-format
 msgid "output %s does not support mode %dx%d@%dHz"
 msgstr "η έξοδος %s δεν υποστηρίζει την κατάσταση λειτουργίας %dx%d@%dHz"
 
-#: ../libgnome-desktop/gnome-rr-config.c:761
+#: ../libgnome-desktop/gnome-rr-config.c:1482
 #, c-format
-msgid "CRTC %d does not support rotation=%d"
-msgstr "Το CRTC %d δεν υποστηρίζει περιστροφή=%d"
+msgid "CRTC %d does not support rotation=%s"
+msgstr "Το CRTC %d δεν υποστηρίζει περιστροφή=%s"
 
-#: ../libgnome-desktop/gnome-rr-config.c:774
+#: ../libgnome-desktop/gnome-rr-config.c:1496
 #, c-format
 msgid ""
 "output %s does not have the same parameters as another cloned output:\n"
 "existing mode = %d, new mode = %d\n"
 "existing coordinates = (%d, %d), new coordinates = (%d, %d)\n"
-"existing rotation = %d, new rotation = %d"
+"existing rotation = %s, new rotation = %s"
 msgstr ""
 "η έξοδος %s δεν έχει τις ίδιες παραμέτρους όπως μια άλλη κλωνοποιημένη "
 "έξοδος:\n"
 "υπάρχουσα κατάσταση = %d, νέα κατάσταση = %d\n"
-"υπάρχουσες συντεταγμένες =  (%d, %d), νέες συντεταγμένες = (%d, %d)\n"
-"υπάρχουσα περιστροφή = %d, νέα περιστροφή = %d"
+"υπάρχουσες συντεταγμένες = (%d, %d), νέες συντεταγμένες = (%d, %d)\n"
+"υπάρχουσα περιστροφή = %s, νέα περιστροφή = %s"
 
-#: ../libgnome-desktop/gnome-rr-config.c:789
+#: ../libgnome-desktop/gnome-rr-config.c:1511
 #, c-format
 msgid "cannot clone to output %s"
 msgstr "αδυναμία κλωνοποίησης στην έξοδο %s"
 
-#: ../libgnome-desktop/gnome-rr-config.c:915
+#: ../libgnome-desktop/gnome-rr-config.c:1680
 #, c-format
 msgid "Trying modes for CRTC %d\n"
 msgstr "Δοκιμή καταστάσεων λειτουργίας για το CRTC %d\n"
 
-#: ../libgnome-desktop/gnome-rr-config.c:939
+#: ../libgnome-desktop/gnome-rr-config.c:1704
 #, c-format
 msgid "CRTC %d: trying mode %dx%d@%dHz with output at %dx%d@%dHz (pass %d)\n"
 msgstr ""
 "Το CRTC %d: δοκιμάζει την κατάσταση λειτουργίας %dx%d@%dHz με την έξοδο στα "
 "%dx%d@%dHz (επιτυχής %d)\n"
 
-#: ../libgnome-desktop/gnome-rr-config.c:986
+#: ../libgnome-desktop/gnome-rr-config.c:1751
 #, c-format
 msgid ""
 "could not assign CRTCs to outputs:\n"
@@ -107,7 +186,7 @@
 "αδύνατη η αντιστοίχιση CRTC σε εξόδους\n"
 "%s"
 
-#: ../libgnome-desktop/gnome-rr-config.c:990
+#: ../libgnome-desktop/gnome-rr-config.c:1755
 #, c-format
 msgid ""
 "none of the selected modes were compatible with the possible modes:\n"
@@ -120,7 +199,7 @@
 #. Translators: the "requested", "minimum", and
 #. * "maximum" words here are not keywords; please
 #. * translate them as usual.
-#: ../libgnome-desktop/gnome-rr-config.c:1071
+#: ../libgnome-desktop/gnome-rr-config.c:1833
 #, c-format
 msgid ""
 "required virtual size does not fit available size: requested=(%d, %d), "
@@ -131,29 +210,32 @@
 
 #. Translators: This is the time format with full date used
 #. in 24-hour mode.
-#: ../libgnome-desktop/gnome-wall-clock.c:270
-msgid "%a %b %e, %R:%S"
+#. The character between %R and %S is U+2236 RATIO
+#: ../libgnome-desktop/gnome-wall-clock.c:268
+msgid "%a %b %e, %R∶%S"
 msgstr "%a %e %b, %R:%S"
 
-#: ../libgnome-desktop/gnome-wall-clock.c:271
+#: ../libgnome-desktop/gnome-wall-clock.c:269
 msgid "%a %b %e, %R"
 msgstr "%a %e %b, %R"
 
 #. Translators: This is the time format with day used
 #. in 24-hour mode.
-#: ../libgnome-desktop/gnome-wall-clock.c:275
-msgid "%a %R:%S"
+#. The character between %R and %S is U+2236 RATIO
+#: ../libgnome-desktop/gnome-wall-clock.c:274
+msgid "%a %R∶%S"
 msgstr "%a %R∶%S"
 
-#: ../libgnome-desktop/gnome-wall-clock.c:276
+#: ../libgnome-desktop/gnome-wall-clock.c:275
 msgid "%a %R"
 msgstr "%a %R"
 
 #. Translators: This is the time format without date used
 #. in 24-hour mode.
+#. The character between %R and %S is U+2236 RATIO
 #: ../libgnome-desktop/gnome-wall-clock.c:280
-msgid "%R:%S"
-msgstr "%R:%S"
+msgid "%R∶%S"
+msgstr "%R∶%S"
 
 #: ../libgnome-desktop/gnome-wall-clock.c:280
 msgid "%R"
@@ -161,82 +243,39 @@
 
 #. Translators: This is a time format with full date used
 #. for AM/PM.
-#: ../libgnome-desktop/gnome-wall-clock.c:286
-msgid "%a %b %e, %l:%M:%S %p"
+#. The Unicode characters are U+2236 RATIO and
+#. U+2009 THIN SPACE
+#: ../libgnome-desktop/gnome-wall-clock.c:288
+msgid "%a %b %e, %l∶%M∶%S %p"
 msgstr "%a %e %b, %l:%M:%S %p"
 
-#: ../libgnome-desktop/gnome-wall-clock.c:287
-msgid "%a %b %e, %l:%M %p"
+#: ../libgnome-desktop/gnome-wall-clock.c:289
+msgid "%a %b %e, %l∶%M %p"
 msgstr "%a %e %b, %l:%M %p"
 
 #. Translators: This is a time format with day used
 #. for AM/PM.
-#: ../libgnome-desktop/gnome-wall-clock.c:291
-msgid "%a %l:%M:%S %p"
+#. The Unicode characters are U+2236 RATIO and
+#. U+2009 THIN SPACE
+#: ../libgnome-desktop/gnome-wall-clock.c:295
+msgid "%a %l∶%M∶%S %p"
 msgstr "%a %l:%M:%S %p"
 
-#: ../libgnome-desktop/gnome-wall-clock.c:292
-msgid "%a %l:%M %p"
+#: ../libgnome-desktop/gnome-wall-clock.c:296
+msgid "%a %l∶%M %p"
 msgstr "%a %l:%M %p"
 
 #. Translators: This is a time format without date used
 #. for AM/PM.
-#: ../libgnome-desktop/gnome-wall-clock.c:296
-msgid "%l:%M:%S %p"
-msgstr "%l:%M:%S %p"
-
-#: ../libgnome-desktop/gnome-wall-clock.c:297
-msgid "%l:%M %p"
-msgstr "%l:%M %p"
-
-#~ msgctxt "Monitor vendor"
-#~ msgid "Unknown"
-#~ msgstr "Άγνωστος"
-
-#~ msgid "could not get the screen resources (CRTCs, outputs, modes)"
-#~ msgstr "αδυναμία λήψης των πηγών οθόνης (CRTCs, έξοδοι, λειτουργίες)"
-
-#~ msgid "unhandled X error while getting the range of screen sizes"
-#~ msgstr "Απρόσμενο σφάλμα X κατά τη λήψη του εύρους των μεγεθών οθόνης"
-
-#~ msgid "could not get the range of screen sizes"
-#~ msgstr "αδύνατη η λήψη του εύρους των μεγεθών οθόνης"
-
-#~ msgid "RANDR extension is not present"
-#~ msgstr "Δεν υπάρχει η επέκταση RANDR"
-
-#~ msgid "could not get information about output %d"
-#~ msgstr "Αδυναμία εύρεσης πληροφοριών για την έξοδο %d"
-
-#~ msgid "Built-in Display"
-#~ msgstr "Ενσωματωμένη οθόνη"
-
-#~ msgid "%s Display"
-#~ msgstr "%s οθόνη"
-
-#~| msgctxt "Monitor vendor"
-#~| msgid "Unknown"
-#~ msgid "Unknown Display"
-#~ msgstr "Άγνωστη οθόνη"
-
-#~ msgid ""
-#~ "requested position/size for CRTC %d is outside the allowed limit: "
-#~ "position=(%d, %d), size=(%d, %d), maximum=(%d, %d)"
-#~ msgstr ""
-#~ "η ζητούμενη θέση/μέγεθος για το CRTC %d είναι έξω από το επιτρεπτό όριο. "
-#~ "θέση=(%d, %d), μέγεθος=(%d, %d), μέγιστο=(%d, %d)"
-
-#~ msgid "could not set the configuration for CRTC %d"
-#~ msgstr "αδυναμία ορισμού της ρύθμισης για το CRTC %d"
-
-#~ msgid "could not get information about CRTC %d"
-#~ msgstr "αδυναμία εύρεσης πληροφοριών για το CRTC %d"
-
-#~ msgid ""
-#~ "none of the saved display configurations matched the active configuration"
-#~ msgstr ""
-#~ "καμία από τις αποθηκευμένες ρυθμίσεις οθόνης δεν ταίριαζε με την ενεργή "
-#~ "ρύθμιση"
+#. The Unicode characters are U+2236 RATIO and
+#. U+2009 THIN SPACE
+#: ../libgnome-desktop/gnome-wall-clock.c:302
+msgid "%l∶%M∶%S %p"
+msgstr "%l∶%M∶%S %p"
+
+#: ../libgnome-desktop/gnome-wall-clock.c:303
+msgid "%l∶%M %p"
+msgstr "%l∶%M %p"
 
 #~ msgid "Cannot find a terminal, using xterm, even if it may not work"
 #~ msgstr ""
@@ -246,29 +285,17 @@
 #~ msgid "Laptop"
 #~ msgstr "Φορητός υπολογιστής"
 
-#~| msgid "%a %b %e, %R:%S"
-#~ msgid "%a %b %e, %R∶%S"
-#~ msgstr "%a %e %b, %R:%S"
-
-#~ msgid "%R∶%S"
-#~ msgstr "%R∶%S"
-
-#~| msgid "%a %l:%M:%S %p"
-#~ msgid "%a %l∶%M∶%S %p"
-#~ msgstr "%a %l:%M:%S %p"
-
-#~| msgid "%a %l:%M %p"
-#~ msgid "%a %l∶%M %p"
-#~ msgstr "%a %l:%M %p"
+#~ msgid "Mirrored Displays"
+#~ msgstr "Κατοπτρισμός οθονών"
 
-#~ msgid "%l∶%M∶%S %p"
-#~ msgstr "%l∶%M∶%S %p"
+#~ msgid "%R:%S"
+#~ msgstr "%R:%S"
 
-#~ msgid "%l∶%M %p"
-#~ msgstr "%l∶%M %p"
+#~ msgid "%l:%M:%S %p"
+#~ msgstr "%l:%M:%S %p"
 
-#~ msgid "Mirrored Displays"
-#~ msgstr "Κατοπτρισμός οθονών"
+#~ msgid "%l:%M %p"
+#~ msgstr "%l:%M %p"
 
 #~ msgid "Mirror Screens"
 #~ msgstr "Καθρεπτισμός οθονών"
diff -Nru gnome-desktop3-3.12.0/po/en.po gnome-desktop3-3.8.4/po/en.po
--- gnome-desktop3-3.12.0/po/en.po	2013-11-11 17:23:17.000000000 +0000
+++ gnome-desktop3-3.8.4/po/en.po	1970-01-01 00:00:00.000000000 +0000
@@ -1,74 +0,0 @@
-msgid ""
-msgstr ""
-"Project-Id-Version: gnome-desktop\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-03-31 19:28+0100\n"
-"PO-Revision-Date: 2012-03-31 19:30+0100\n"
-"Last-Translator: Matthias Clasen \n"
-"Language-Team: English \n"
-"Language: en_US\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-"X-Project-Style: gnome\n"
-
-#. Translators: This is the time format with full date used
-#. in 24-hour mode.
-#: ../libgnome-desktop/gnome-wall-clock.c:238
-msgid "%a %b %e, %R:%S"
-msgstr "%a %e %b, %H∶%M∶%S"
-
-#: ../libgnome-desktop/gnome-wall-clock.c:239
-msgid "%a %b %e, %R"
-msgstr "%a %e %b, %H∶%M"
-
-#. Translators: This is the time format with day used
-#. in 24-hour mode.
-#: ../libgnome-desktop/gnome-wall-clock.c:243
-msgid "%a %R:%S"
-msgstr "%a %H∶%M∶%S"
-
-#: ../libgnome-desktop/gnome-wall-clock.c:244
-msgid "%a %R"
-msgstr "%a %H∶%M"
-
-#. Translators: This is the time format without date used
-#. in 24-hour mode.
-#: ../libgnome-desktop/gnome-wall-clock.c:248
-msgid "%R:%S"
-msgstr "%H∶%M∶%S"
-
-#: ../libgnome-desktop/gnome-wall-clock.c:248
-msgid "%R"
-msgstr "%H∶%M"
-
-#. Translators: This is a time format with full date used
-#. for AM/PM.
-#: ../libgnome-desktop/gnome-wall-clock.c:254
-msgid "%a %b %e, %l:%M:%S %p"
-msgstr "%a %e %b, %l∶%M∶%S %p"
-
-#: ../libgnome-desktop/gnome-wall-clock.c:255
-msgid "%a %b %e, %l:%M %p"
-msgstr "%a %e %b, %l∶%M %p"
-
-#. Translators: This is a time format with day used
-#. for AM/PM.
-#: ../libgnome-desktop/gnome-wall-clock.c:259
-msgid "%a %l:%M:%S %p"
-msgstr "%a %l∶%M∶%S %p"
-
-#: ../libgnome-desktop/gnome-wall-clock.c:260
-msgid "%a %l:%M %p"
-msgstr "%a %l∶%M %p"
-
-#. Translators: This is a time format without date used
-#. for AM/PM.
-#: ../libgnome-desktop/gnome-wall-clock.c:264
-msgid "%l:%M:%S %p"
-msgstr "%l∶%M∶%S %p"
-
-#: ../libgnome-desktop/gnome-wall-clock.c:265
-msgid "%l:%M %p"
-msgstr "%l∶%M %p"
diff -Nru gnome-desktop3-3.12.0/po/es.po gnome-desktop3-3.8.4/po/es.po
--- gnome-desktop3-3.12.0/po/es.po	2013-11-11 17:23:17.000000000 +0000
+++ gnome-desktop3-3.8.4/po/es.po	2013-09-04 11:15:57.000000000 +0000
@@ -18,8 +18,8 @@
 "Project-Id-Version: gnome-desktop.HEAD\n"
 "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=gnome-"
 "desktop&keywords=I18N+L10N&component=general\n"
-"POT-Creation-Date: 2013-08-19 17:24+0000\n"
-"PO-Revision-Date: 2013-08-20 17:36+0200\n"
+"POT-Creation-Date: 2013-03-04 10:03+0000\n"
+"PO-Revision-Date: 2013-03-04 14:12+0100\n"
 "Last-Translator: Daniel Mustieles \n"
 "Language-Team: Español \n"
 "Language: \n"
@@ -29,61 +29,136 @@
 "X-Generator: Gtranslator 2.91.5\n"
 "Plural-Forms: nplurals=2; plural=(n!=1);\n"
 
+#. Translators: "Unknown" here is used to identify a monitor for which
+#. * we don't know the vendor. When a vendor is known, the name of the
+#. * vendor is used.
+#: ../libgnome-desktop/display-name.c:107
+msgctxt "Monitor vendor"
+msgid "Unknown"
+msgstr "Desconocida"
+
 #: ../libgnome-desktop/gnome-languages.c:804
 msgid "Unspecified"
 msgstr "Sin especificar"
 
-#: ../libgnome-desktop/gnome-rr-config.c:789
+#. Translators: a CRTC is a CRT Controller (this is X terminology).
+#: ../libgnome-desktop/gnome-rr.c:452
+#, c-format
+msgid "could not get the screen resources (CRTCs, outputs, modes)"
+msgstr ""
+"no se pudieron obtener los recursos de las pantallas (CRTCs, salidas, modos)"
+
+#: ../libgnome-desktop/gnome-rr.c:472
+#, c-format
+msgid "unhandled X error while getting the range of screen sizes"
+msgstr ""
+"error X no manejado al obtener el rango de los tamaños de las pantallas"
+
+#: ../libgnome-desktop/gnome-rr.c:478
+#, c-format
+msgid "could not get the range of screen sizes"
+msgstr "no se pudo obtener el rango de los tamaños de las pantallas"
+
+#: ../libgnome-desktop/gnome-rr.c:769
+#, c-format
+msgid "RANDR extension is not present"
+msgstr "la extensión RANDR no está presente"
+
+#: ../libgnome-desktop/gnome-rr.c:1580
+#, c-format
+msgid "could not get information about output %d"
+msgstr "no se pudo obtener información acerca de la salida %d"
+
+#: ../libgnome-desktop/gnome-rr.c:1764
+#| msgid "%s Display"
+msgid "Built-in Display"
+msgstr "Pantalla integrada"
+
+#. Translators: %s is the size of the monitor in inches
+#: ../libgnome-desktop/gnome-rr.c:1782
+#, c-format
+msgid "%s Display"
+msgstr "Pantalla de %s"
+
+#: ../libgnome-desktop/gnome-rr.c:1789
+msgid "Unknown Display"
+msgstr "Pantalla desconocida"
+
+#. Translators: the "position", "size", and "maximum"
+#. * words here are not keywords; please translate them
+#. * as usual.  A CRTC is a CRT Controller (this is X terminology)
+#: ../libgnome-desktop/gnome-rr.c:2234
+#, c-format
+msgid ""
+"requested position/size for CRTC %d is outside the allowed limit: position=(%"
+"d, %d), size=(%d, %d), maximum=(%d, %d)"
+msgstr ""
+"la posición y/o tamaño requeridos para el CRTC %d está fuera de los límites "
+"permitidos: posición=(%d, %d), tamaño=(%d, %d), máximo=(%d, %d)"
+
+#: ../libgnome-desktop/gnome-rr.c:2270
+#, c-format
+msgid "could not set the configuration for CRTC %d"
+msgstr "no se pudo establecer la configuración para el CRTC %d"
+
+#: ../libgnome-desktop/gnome-rr.c:2421
+#, c-format
+msgid "could not get information about CRTC %d"
+msgstr "no se pudo obtener información acerca del CRTC %d"
+
+#: ../libgnome-desktop/gnome-rr-config.c:708
+#, c-format
+msgid ""
+"none of the saved display configurations matched the active configuration"
+msgstr ""
+"ninguna de las configuraciones de pantalla guardadas coincide con la "
+"configuración activa"
+
+#: ../libgnome-desktop/gnome-rr-config.c:1464
 #, c-format
 msgid "CRTC %d cannot drive output %s"
 msgstr "el CRTC %d no puede conducir la salida %s"
 
-#: ../libgnome-desktop/gnome-rr-config.c:796
+#: ../libgnome-desktop/gnome-rr-config.c:1471
 #, c-format
 msgid "output %s does not support mode %dx%d@%dHz"
 msgstr "la salida %s no soporta el modo %dx%d@%dHz"
 
-#: ../libgnome-desktop/gnome-rr-config.c:807
+#: ../libgnome-desktop/gnome-rr-config.c:1482
+#, c-format
+msgid "CRTC %d does not support rotation=%s"
+msgstr "el CRTC %d no soporta la rotación=%s"
+
+#: ../libgnome-desktop/gnome-rr-config.c:1496
 #, c-format
-#| msgid "CRTC %d does not support rotation=%s"
-msgid "CRTC %d does not support rotation=%d"
-msgstr "el CRTC %d no soporta la rotación=%d"
-
-#: ../libgnome-desktop/gnome-rr-config.c:820
-#, c-format
-#| msgid ""
-#| "output %s does not have the same parameters as another cloned output:\n"
-#| "existing mode = %d, new mode = %d\n"
-#| "existing coordinates = (%d, %d), new coordinates = (%d, %d)\n"
-#| "existing rotation = %s, new rotation = %s"
 msgid ""
 "output %s does not have the same parameters as another cloned output:\n"
 "existing mode = %d, new mode = %d\n"
 "existing coordinates = (%d, %d), new coordinates = (%d, %d)\n"
-"existing rotation = %d, new rotation = %d"
+"existing rotation = %s, new rotation = %s"
 msgstr ""
 "la salida %s no tiene los mismos parámetros que otra salida clonada:\n"
 "modo existente = %d, modo nuevo = %d\n"
 "coordenadas existentes = (%d, %d), coordenadas nuevas = (%d, %d)\n"
-"rotación existente = %d, rotación nueva = %d"
+"rotación existente = %s, rotación nueva = %s"
 
-#: ../libgnome-desktop/gnome-rr-config.c:835
+#: ../libgnome-desktop/gnome-rr-config.c:1511
 #, c-format
 msgid "cannot clone to output %s"
 msgstr "no se puede clonar la salida en %s"
 
-#: ../libgnome-desktop/gnome-rr-config.c:961
+#: ../libgnome-desktop/gnome-rr-config.c:1680
 #, c-format
 msgid "Trying modes for CRTC %d\n"
 msgstr "Intentando modos para el CRTC %d\n"
 
-#: ../libgnome-desktop/gnome-rr-config.c:985
+#: ../libgnome-desktop/gnome-rr-config.c:1704
 #, c-format
 msgid "CRTC %d: trying mode %dx%d@%dHz with output at %dx%d@%dHz (pass %d)\n"
 msgstr ""
 "CRTC %d: intentando el modo %dx%d@%dHz con salida en %dx%d@%dHz (pasada %d)\n"
 
-#: ../libgnome-desktop/gnome-rr-config.c:1032
+#: ../libgnome-desktop/gnome-rr-config.c:1751
 #, c-format
 msgid ""
 "could not assign CRTCs to outputs:\n"
@@ -92,7 +167,7 @@
 "no se pudieron asignar los CRTC a las salidas:\n"
 "%s"
 
-#: ../libgnome-desktop/gnome-rr-config.c:1036
+#: ../libgnome-desktop/gnome-rr-config.c:1755
 #, c-format
 msgid ""
 "none of the selected modes were compatible with the possible modes:\n"
@@ -104,7 +179,7 @@
 #. Translators: the "requested", "minimum", and
 #. * "maximum" words here are not keywords; please
 #. * translate them as usual.
-#: ../libgnome-desktop/gnome-rr-config.c:1117
+#: ../libgnome-desktop/gnome-rr-config.c:1833
 #, c-format
 msgid ""
 "required virtual size does not fit available size: requested=(%d, %d), "
@@ -115,29 +190,32 @@
 
 #. Translators: This is the time format with full date used
 #. in 24-hour mode.
-#: ../libgnome-desktop/gnome-wall-clock.c:270
-msgid "%a %b %e, %R:%S"
-msgstr "%a %b %e, %R:%S"
+#. The character between %R and %S is U+2236 RATIO
+#: ../libgnome-desktop/gnome-wall-clock.c:268
+msgid "%a %b %e, %R∶%S"
+msgstr "%a %b %e, %R∶%S"
 
-#: ../libgnome-desktop/gnome-wall-clock.c:271
+#: ../libgnome-desktop/gnome-wall-clock.c:269
 msgid "%a %b %e, %R"
 msgstr "%a, %e de %b, %R"
 
 #. Translators: This is the time format with day used
 #. in 24-hour mode.
-#: ../libgnome-desktop/gnome-wall-clock.c:275
-msgid "%a %R:%S"
-msgstr "%a %R:%S"
+#. The character between %R and %S is U+2236 RATIO
+#: ../libgnome-desktop/gnome-wall-clock.c:274
+msgid "%a %R∶%S"
+msgstr "%a %R∶%S"
 
-#: ../libgnome-desktop/gnome-wall-clock.c:276
+#: ../libgnome-desktop/gnome-wall-clock.c:275
 msgid "%a %R"
 msgstr "%a %R"
 
 #. Translators: This is the time format without date used
 #. in 24-hour mode.
+#. The character between %R and %S is U+2236 RATIO
 #: ../libgnome-desktop/gnome-wall-clock.c:280
-msgid "%R:%S"
-msgstr "%R:%S"
+msgid "%R∶%S"
+msgstr "%R∶%S"
 
 #: ../libgnome-desktop/gnome-wall-clock.c:280
 msgid "%R"
@@ -145,106 +223,43 @@
 
 #. Translators: This is a time format with full date used
 #. for AM/PM.
-#: ../libgnome-desktop/gnome-wall-clock.c:286
-msgid "%a %b %e, %l:%M:%S %p"
-msgstr "%a %b %e, %l:%M:%S %p"
-
-#: ../libgnome-desktop/gnome-wall-clock.c:287
-msgid "%a %b %e, %l:%M %p"
-msgstr "%a %b %e, %l:%M %p"
+#. The Unicode characters are U+2236 RATIO and
+#. U+2009 THIN SPACE
+#: ../libgnome-desktop/gnome-wall-clock.c:288
+msgid "%a %b %e, %l∶%M∶%S %p"
+msgstr "%a %b %e, %l∶%M∶%S %p"
+
+#: ../libgnome-desktop/gnome-wall-clock.c:289
+msgid "%a %b %e, %l∶%M %p"
+msgstr "%a %b %e, %l∶%M %p"
 
 #. Translators: This is a time format with day used
 #. for AM/PM.
-#: ../libgnome-desktop/gnome-wall-clock.c:291
-msgid "%a %l:%M:%S %p"
-msgstr "%a %l:%M:%S %p"
-
-#: ../libgnome-desktop/gnome-wall-clock.c:292
-msgid "%a %l:%M %p"
-msgstr "%a %l:%M %p"
+#. The Unicode characters are U+2236 RATIO and
+#. U+2009 THIN SPACE
+#: ../libgnome-desktop/gnome-wall-clock.c:295
+msgid "%a %l∶%M∶%S %p"
+msgstr "%a %l∶%M∶%S %p"
 
-#. Translators: This is a time format without date used
-#. for AM/PM.
 #: ../libgnome-desktop/gnome-wall-clock.c:296
-msgid "%l:%M:%S %p"
-msgstr "%l:%M:%S %p"
-
-#: ../libgnome-desktop/gnome-wall-clock.c:297
-msgid "%l:%M %p"
-msgstr "%l:%M %p"
-
-#~ msgctxt "Monitor vendor"
-#~ msgid "Unknown"
-#~ msgstr "Desconocida"
-
-#~ msgid "could not get the screen resources (CRTCs, outputs, modes)"
-#~ msgstr ""
-#~ "no se pudieron obtener los recursos de las pantallas (CRTCs, salidas, "
-#~ "modos)"
-
-#~ msgid "unhandled X error while getting the range of screen sizes"
-#~ msgstr ""
-#~ "error X no manejado al obtener el rango de los tamaños de las pantallas"
-
-#~ msgid "could not get the range of screen sizes"
-#~ msgstr "no se pudo obtener el rango de los tamaños de las pantallas"
-
-#~ msgid "RANDR extension is not present"
-#~ msgstr "la extensión RANDR no está presente"
-
-#~ msgid "could not get information about output %d"
-#~ msgstr "no se pudo obtener información acerca de la salida %d"
-
-#~| msgid "%s Display"
-#~ msgid "Built-in Display"
-#~ msgstr "Pantalla integrada"
-
-#~ msgid "%s Display"
-#~ msgstr "Pantalla de %s"
-
-#~ msgid "Unknown Display"
-#~ msgstr "Pantalla desconocida"
-
-#~ msgid ""
-#~ "requested position/size for CRTC %d is outside the allowed limit: "
-#~ "position=(%d, %d), size=(%d, %d), maximum=(%d, %d)"
-#~ msgstr ""
-#~ "la posición y/o tamaño requeridos para el CRTC %d está fuera de los "
-#~ "límites permitidos: posición=(%d, %d), tamaño=(%d, %d), máximo=(%d, %d)"
-
-#~ msgid "could not set the configuration for CRTC %d"
-#~ msgstr "no se pudo establecer la configuración para el CRTC %d"
+msgid "%a %l∶%M %p"
+msgstr "%a %l∶%M %p"
 
-#~ msgid "could not get information about CRTC %d"
-#~ msgstr "no se pudo obtener información acerca del CRTC %d"
-
-#~ msgid ""
-#~ "none of the saved display configurations matched the active configuration"
-#~ msgstr ""
-#~ "ninguna de las configuraciones de pantalla guardadas coincide con la "
-#~ "configuración activa"
+#. Translators: This is a time format without date used
+#. for AM/PM.
+#. The Unicode characters are U+2236 RATIO and
+#. U+2009 THIN SPACE
+#: ../libgnome-desktop/gnome-wall-clock.c:302
+msgid "%l∶%M∶%S %p"
+msgstr "%l∶%M∶%S %p"
+
+#: ../libgnome-desktop/gnome-wall-clock.c:303
+msgid "%l∶%M %p"
+msgstr "%l∶%M %p"
 
 #~ msgid "Laptop"
 #~ msgstr "Portátil"
 
-#~ msgid "%a %b %e, %R∶%S"
-#~ msgstr "%a %b %e, %R∶%S"
-
-#~ msgid "%R∶%S"
-#~ msgstr "%R∶%S"
-
-#~ msgid "%a %l∶%M∶%S %p"
-#~ msgstr "%a %l∶%M∶%S %p"
-
-#~ msgid "%a %l∶%M %p"
-#~ msgstr "%a %l∶%M %p"
-
-#~ msgid "%l∶%M∶%S %p"
-#~ msgstr "%l∶%M∶%S %p"
-
-#~ msgid "%l∶%M %p"
-#~ msgstr "%l∶%M %p"
-
 #~ msgid "Cannot find a terminal, using xterm, even if it may not work"
 #~ msgstr ""
 #~ "No se puede encontrar un terminal, usando xterm, incluso aunque puede que "
@@ -253,6 +268,15 @@
 #~ msgid "Mirrored Displays"
 #~ msgstr "Pantallas en espejo"
 
+#~ msgid "%R:%S"
+#~ msgstr "%R:%S"
+
+#~ msgid "%l:%M:%S %p"
+#~ msgstr "%l:%M:%S %p"
+
+#~ msgid "%l:%M %p"
+#~ msgstr "%l:%M %p"
+
 #~ msgid "Mirror Screens"
 #~ msgstr "Espejar pantallas"
 
diff -Nru gnome-desktop3-3.12.0/po/et.po gnome-desktop3-3.8.4/po/et.po
--- gnome-desktop3-3.12.0/po/et.po	2013-11-11 17:23:18.000000000 +0000
+++ gnome-desktop3-3.8.4/po/et.po	2013-09-04 11:15:57.000000000 +0000
@@ -17,8 +17,8 @@
 "Project-Id-Version: gnome-desktop HEAD\n"
 "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=gnome-"
 "desktop&keywords=I18N+L10N&component=general\n"
-"POT-Creation-Date: 2013-09-20 19:07+0000\n"
-"PO-Revision-Date: 2013-09-21 10:04+0300\n"
+"POT-Creation-Date: 2013-03-12 20:57+0000\n"
+"PO-Revision-Date: 2013-03-12 20:50+0300\n"
 "Last-Translator: Mattias Põldaru \n"
 "Language-Team: Estonian <>\n"
 "Language: et\n"
@@ -26,11 +26,73 @@
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n!=1);\n"
-"X-Generator: Poedit 1.5.4\n"
+
+#. Translators: "Unknown" here is used to identify a monitor for which
+#. * we don't know the vendor. When a vendor is known, the name of the
+#. * vendor is used.
+msgctxt "Monitor vendor"
+msgid "Unknown"
+msgstr "Tundmatu"
 
 msgid "Unspecified"
 msgstr "Määramata"
 
+#. Translators: a CRTC is a CRT Controller (this is X terminology).
+#, c-format
+msgid "could not get the screen resources (CRTCs, outputs, modes)"
+msgstr "ekraani ressursse (CRTC-d, väljundeid, režiime) pole võimalik hankida"
+
+#, c-format
+msgid "unhandled X error while getting the range of screen sizes"
+msgstr "X-serveri käsitlematu viga ekraanisuuruste vahemiku hankimisel"
+
+#, c-format
+msgid "could not get the range of screen sizes"
+msgstr "ekraanisuuruste vahemikku pole võimalik hankida"
+
+#, c-format
+msgid "RANDR extension is not present"
+msgstr "RANRD-laiendus pole saadaval"
+
+#, c-format
+msgid "could not get information about output %d"
+msgstr "väljundi %d kohta pole võimalik teavet hankida"
+
+msgid "Built-in Display"
+msgstr "Sisseehitatud ekraan"
+
+#. Translators: %s is the size of the monitor in inches
+#, c-format
+msgid "%s Display"
+msgstr "%s ekraan"
+
+msgid "Unknown Display"
+msgstr "Tundmatu ekraan"
+
+#. Translators: the "position", "size", and "maximum"
+#. * words here are not keywords; please translate them
+#. * as usual.  A CRTC is a CRT Controller (this is X terminology)
+#, c-format
+msgid ""
+"requested position/size for CRTC %d is outside the allowed limit: position="
+"(%d, %d), size=(%d, %d), maximum=(%d, %d)"
+msgstr ""
+"CRTC %d jaoks määratud asukoht või suurus ületab lubatud piire: asukoht=(%d, "
+"%d), suurus=(%d, %d), suurim=(%d, %d)"
+
+#, c-format
+msgid "could not set the configuration for CRTC %d"
+msgstr "CRTC %d jaoks pole võimalik sätteid määrata"
+
+#, c-format
+msgid "could not get information about CRTC %d"
+msgstr "CRTC %d kohta pole võimalik teavet hankida"
+
+#, c-format
+msgid ""
+"none of the saved display configurations matched the active configuration"
+msgstr "salvestatud kuvasätete hulgast ei sobi aktiivsete sätetega mitte ükski"
+
 #, c-format
 msgid "CRTC %d cannot drive output %s"
 msgstr "CRTC %d ei suuda juhtida väljundit %s"
@@ -40,20 +102,20 @@
 msgstr "väljund %s ei toeta režiimi %dx%d@%dHz"
 
 #, c-format
-msgid "CRTC %d does not support rotation=%d"
-msgstr "CRTC %d ei toeta pöördenurka=%d"
+msgid "CRTC %d does not support rotation=%s"
+msgstr "CRTC %d ei toeta pöördenurka=%s"
 
 #, c-format
 msgid ""
 "output %s does not have the same parameters as another cloned output:\n"
 "existing mode = %d, new mode = %d\n"
 "existing coordinates = (%d, %d), new coordinates = (%d, %d)\n"
-"existing rotation = %d, new rotation = %d"
+"existing rotation = %s, new rotation = %s"
 msgstr ""
 "väljundil %s ei ole samad parameetrid nagu teisel kloonitud väljundil:\n"
 "praegune režiim = %d, uus režiim = %d\n"
 "praegused koordinaadid = (%d, %d), uued koordinaadid = (%d, %d)\n"
-"praegune pöördenurk = %d, uus pöördenurk %d"
+"praegune pöördenurk = %s, uus pöördenurk %s"
 
 #, c-format
 msgid "cannot clone to output %s"
@@ -99,116 +161,60 @@
 
 #. Translators: This is the time format with full date used
 #. in 24-hour mode.
-msgid "%a %b %e, %R:%S"
-msgstr "%a, %e. %b, %R:%S"
+#. The character between %R and %S is U+2236 RATIO
+msgid "%a %b %e, %R∶%S"
+msgstr "%a, %e. %b, %R∶%S"
 
 msgid "%a %b %e, %R"
 msgstr "%a, %e. %b, %R"
 
 #. Translators: This is the time format with day used
 #. in 24-hour mode.
-msgid "%a %R:%S"
-msgstr "%a %R:%S"
+#. The character between %R and %S is U+2236 RATIO
+msgid "%a %R∶%S"
+msgstr "%a %R∶%S"
 
 msgid "%a %R"
 msgstr "%a %R"
 
 #. Translators: This is the time format without date used
 #. in 24-hour mode.
-msgid "%R:%S"
-msgstr "%R:%S"
+#. The character between %R and %S is U+2236 RATIO
+msgid "%R∶%S"
+msgstr "%R∶%S"
 
 msgid "%R"
 msgstr "%R"
 
 #. Translators: This is a time format with full date used
 #. for AM/PM.
-msgid "%a %b %e, %l:%M:%S %p"
-msgstr "%a, %e. %b, %l:%M:%S %p"
+#. The Unicode characters are U+2236 RATIO and
+#. U+2009 THIN SPACE
+msgid "%a %b %e, %l∶%M∶%S %p"
+msgstr "%a, %e. %b, %l∶%M∶%S %p"
 
-msgid "%a %b %e, %l:%M %p"
-msgstr "%a, %e. %b, %l:%M %p"
+msgid "%a %b %e, %l∶%M %p"
+msgstr "%a, %e. %b, %l∶%M %p"
 
 #. Translators: This is a time format with day used
 #. for AM/PM.
-msgid "%a %l:%M:%S %p"
-msgstr "%a %l:%M:%S %p"
+#. The Unicode characters are U+2236 RATIO and
+#. U+2009 THIN SPACE
+msgid "%a %l∶%M∶%S %p"
+msgstr "%a %l∶%M∶%S %p"
 
-msgid "%a %l:%M %p"
-msgstr "%a %l:%M %p"
+msgid "%a %l∶%M %p"
+msgstr "%a %l∶%M %p"
 
 #. Translators: This is a time format without date used
 #. for AM/PM.
-msgid "%l:%M:%S %p"
-msgstr "%l:%M:%S %p"
+#. The Unicode characters are U+2236 RATIO and
+#. U+2009 THIN SPACE
+msgid "%l∶%M∶%S %p"
+msgstr "%l∶%M∶%S %p"
 
-msgid "%l:%M %p"
-msgstr "%l:%M %p"
-
-#~ msgctxt "Monitor vendor"
-#~ msgid "Unknown"
-#~ msgstr "Tundmatu"
-
-#~ msgid "could not get the screen resources (CRTCs, outputs, modes)"
-#~ msgstr ""
-#~ "ekraani ressursse (CRTC-d, väljundeid, režiime) pole võimalik hankida"
-
-#~ msgid "unhandled X error while getting the range of screen sizes"
-#~ msgstr "X-serveri käsitlematu viga ekraanisuuruste vahemiku hankimisel"
-
-#~ msgid "could not get the range of screen sizes"
-#~ msgstr "ekraanisuuruste vahemikku pole võimalik hankida"
-
-#~ msgid "RANDR extension is not present"
-#~ msgstr "RANRD-laiendus pole saadaval"
-
-#~ msgid "could not get information about output %d"
-#~ msgstr "väljundi %d kohta pole võimalik teavet hankida"
-
-#~ msgid "Built-in Display"
-#~ msgstr "Sisseehitatud ekraan"
-
-#~ msgid "%s Display"
-#~ msgstr "%s ekraan"
-
-#~ msgid "Unknown Display"
-#~ msgstr "Tundmatu ekraan"
-
-#~ msgid ""
-#~ "requested position/size for CRTC %d is outside the allowed limit: "
-#~ "position=(%d, %d), size=(%d, %d), maximum=(%d, %d)"
-#~ msgstr ""
-#~ "CRTC %d jaoks määratud asukoht või suurus ületab lubatud piire: asukoht="
-#~ "(%d, %d), suurus=(%d, %d), suurim=(%d, %d)"
-
-#~ msgid "could not set the configuration for CRTC %d"
-#~ msgstr "CRTC %d jaoks pole võimalik sätteid määrata"
-
-#~ msgid "could not get information about CRTC %d"
-#~ msgstr "CRTC %d kohta pole võimalik teavet hankida"
-
-#~ msgid ""
-#~ "none of the saved display configurations matched the active configuration"
-#~ msgstr ""
-#~ "salvestatud kuvasätete hulgast ei sobi aktiivsete sätetega mitte ükski"
-
-#~ msgid "%a %b %e, %R∶%S"
-#~ msgstr "%a, %e. %b, %R∶%S"
-
-#~ msgid "%R∶%S"
-#~ msgstr "%R∶%S"
-
-#~ msgid "%a %l∶%M∶%S %p"
-#~ msgstr "%a %l∶%M∶%S %p"
-
-#~ msgid "%a %l∶%M %p"
-#~ msgstr "%a %l∶%M %p"
-
-#~ msgid "%l∶%M∶%S %p"
-#~ msgstr "%l∶%M∶%S %p"
-
-#~ msgid "%l∶%M %p"
-#~ msgstr "%l∶%M %p"
+msgid "%l∶%M %p"
+msgstr "%l∶%M %p"
 
 #~ msgid "Cannot find a terminal, using xterm, even if it may not work"
 #~ msgstr ""
@@ -220,3 +226,12 @@
 
 #~ msgid "Mirrored Displays"
 #~ msgstr "Kuvad on peegeldatud"
+
+#~ msgid "%R:%S"
+#~ msgstr "%R:%S"
+
+#~ msgid "%l:%M:%S %p"
+#~ msgstr "%l:%M:%S %p"
+
+#~ msgid "%l:%M %p"
+#~ msgstr "%l:%M %p"
diff -Nru gnome-desktop3-3.12.0/po/eu.po gnome-desktop3-3.8.4/po/eu.po
--- gnome-desktop3-3.12.0/po/eu.po	2013-11-11 17:23:18.000000000 +0000
+++ gnome-desktop3-3.8.4/po/eu.po	2013-09-04 11:15:57.000000000 +0000
@@ -1,87 +1,162 @@
 # translation of eu_to_be_translate.po to Basque
 # Copyright (C) 1999, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software Foundation, Inc.
 #
-# Joseba Bidaurrazaga van Dierdonck , 2000, 2002.
+# Joseba Bidaurrazaga van Dierdonck , 2000,2002.
 # Hizkuntza Politikarako Sailburuordetza , 2004.
 # Mikel Olasagasti Uranga , 2005.
 # Iñaki Larrañaga Murgoitio , 2005, 2006, 2007, 2008, 2009, 2010, 2011.
-# Iñaki Larrañaga Murgoitio , 2013.
-# Asier Sarasua Garmendia , 2013.
-#
+# Iñaki Larrañaga Murgoitio , 2007, 2013.
 msgid ""
 msgstr ""
 "Project-Id-Version: eu_to_be_translate\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-09-14 12:15+0200\n"
-"PO-Revision-Date: 2013-09-14 12:18+0200\n"
+"POT-Creation-Date: 2013-03-26 09:59+0100\n"
+"PO-Revision-Date: 2013-03-24 13:11+0100\n"
 "Last-Translator: Iñaki Larrañaga Murgoitio \n"
-"Language-Team: Basque \n"
+"Language-Team: Basque \n"
 "Language: eu\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: Lokalize 1.4\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
-"\n"
+
+#. Translators: "Unknown" here is used to identify a monitor for which
+#. * we don't know the vendor. When a vendor is known, the name of the
+#. * vendor is used.
+#: ../libgnome-desktop/display-name.c:107
+msgctxt "Monitor vendor"
+msgid "Unknown"
+msgstr "Ezezaguna"
 
 #: ../libgnome-desktop/gnome-languages.c:804
 msgid "Unspecified"
 msgstr "Zehaztu gabea"
 
-#: ../libgnome-desktop/gnome-rr-config.c:743
+#. Translators: a CRTC is a CRT Controller (this is X terminology).
+#: ../libgnome-desktop/gnome-rr.c:452
+#, c-format
+msgid "could not get the screen resources (CRTCs, outputs, modes)"
+msgstr "ezin izan da pantailen baliabideak lortu (CRTCak, irteerak, moduak)"
+
+#: ../libgnome-desktop/gnome-rr.c:472
+#, c-format
+msgid "unhandled X error while getting the range of screen sizes"
+msgstr "kudeatu gabeko X errorea pantailen tamainen barrutia lortzean"
+
+#: ../libgnome-desktop/gnome-rr.c:478
+#, c-format
+msgid "could not get the range of screen sizes"
+msgstr "ezin izan da pantailen tamainen barrutia lortu"
+
+#: ../libgnome-desktop/gnome-rr.c:769
+#, c-format
+msgid "RANDR extension is not present"
+msgstr "RANDR hedapena ez dago"
+
+#: ../libgnome-desktop/gnome-rr.c:1580
+#, c-format
+msgid "could not get information about output %d"
+msgstr "ezin izan da %d irteerari buruzko informazioa lortu"
+
+#: ../libgnome-desktop/gnome-rr.c:1764
+msgid "Built-in Display"
+msgstr "Integratutako pantaila"
+
+#. Translators: %s is the size of the monitor in inches
+#: ../libgnome-desktop/gnome-rr.c:1782
+#, c-format
+msgid "%s Display"
+msgstr "%s pantaila"
+
+#: ../libgnome-desktop/gnome-rr.c:1789
+msgid "Unknown Display"
+msgstr "Pantaila ezezaguna"
+
+#. Translators: the "position", "size", and "maximum"
+#. * words here are not keywords; please translate them
+#. * as usual.  A CRTC is a CRT Controller (this is X terminology)
+#: ../libgnome-desktop/gnome-rr.c:2234
+#, c-format
+msgid ""
+"requested position/size for CRTC %d is outside the allowed limit: position="
+"(%d, %d), size=(%d, %d), maximum=(%d, %d)"
+msgstr ""
+"eskatutako %d. CRTCaren posizioa/tamaina baimendutako mugatik at dago: "
+"posizioa=(%d, %d), tamaina=(%d, %d), gehienezkoa=(%d, %d)"
+
+#: ../libgnome-desktop/gnome-rr.c:2270
+#, c-format
+msgid "could not set the configuration for CRTC %d"
+msgstr "ezin izan da %d. CRTCaren konfigurazioa ezarri"
+
+#: ../libgnome-desktop/gnome-rr.c:2421
+#, c-format
+msgid "could not get information about CRTC %d"
+msgstr "ezin izan da %d. CRTCari buruzko informazioa lortu"
+
+#: ../libgnome-desktop/gnome-rr-config.c:708
+#, c-format
+msgid ""
+"none of the saved display configurations matched the active configuration"
+msgstr ""
+"pantailaren gordetako konfiguraziotariko bat bera ere ez dator bat "
+"konfigurazio aktiboarekin"
+
+#: ../libgnome-desktop/gnome-rr-config.c:1464
 #, c-format
 msgid "CRTC %d cannot drive output %s"
-msgstr "%d. CRTCk ezin du %s irteera bideratu"
+msgstr "%d CRTC ezin du %s irteera bideratu"
 
-#: ../libgnome-desktop/gnome-rr-config.c:750
+#: ../libgnome-desktop/gnome-rr-config.c:1471
 #, c-format
 msgid "output %s does not support mode %dx%d@%dHz"
 msgstr "%s irteerak ez du %dx%d@%dHz modua onartzen"
 
-#: ../libgnome-desktop/gnome-rr-config.c:761
+#: ../libgnome-desktop/gnome-rr-config.c:1482
 #, c-format
-msgid "CRTC %d does not support rotation=%d"
-msgstr "%d CRTCk ez du biraketa=%d onartzen"
+msgid "CRTC %d does not support rotation=%s"
+msgstr "%d CRTCek ez du biraketa=%s onartzen"
 
-#: ../libgnome-desktop/gnome-rr-config.c:774
+#: ../libgnome-desktop/gnome-rr-config.c:1496
 #, c-format
 msgid ""
 "output %s does not have the same parameters as another cloned output:\n"
 "existing mode = %d, new mode = %d\n"
 "existing coordinates = (%d, %d), new coordinates = (%d, %d)\n"
-"existing rotation = %d, new rotation = %d"
+"existing rotation = %s, new rotation = %s"
 msgstr ""
 "%s irteerak ez dauka klonatutako beste irteeren parametro berdinak:\n"
 "dagoen modua = %d, modu berria = %d\n"
 "dauden koordenatuak = (%d, %d), koordenatu berriak = (%d, %d)\n"
-"dagoen biraketa = %d, biraketa berria = %d"
+"dagoen biraketa = %s, biraketa berria = %s"
 
-#: ../libgnome-desktop/gnome-rr-config.c:789
+#: ../libgnome-desktop/gnome-rr-config.c:1511
 #, c-format
 msgid "cannot clone to output %s"
 msgstr "ezin da %s irteerara klonatu"
 
-#: ../libgnome-desktop/gnome-rr-config.c:915
+#: ../libgnome-desktop/gnome-rr-config.c:1680
 #, c-format
 msgid "Trying modes for CRTC %d\n"
-msgstr "%d. CRTCren moduak saiatzen\n"
+msgstr "Moduak saiatzen %d CRTCrentzako\n"
 
-#: ../libgnome-desktop/gnome-rr-config.c:939
+#: ../libgnome-desktop/gnome-rr-config.c:1704
 #, c-format
 msgid "CRTC %d: trying mode %dx%d@%dHz with output at %dx%d@%dHz (pass %d)\n"
 msgstr ""
-"%d. CRTC: %dx%d@%dHz modua saiatzen %dx%d@%dHz irteerarekin (%d. pasaldia)\n"
+"%d CRTC: %dx%d@%dHz modua saiatzen %dx%d@%dHz irteerarekin (%d. pasaldia)\n"
 
-#: ../libgnome-desktop/gnome-rr-config.c:986
+#: ../libgnome-desktop/gnome-rr-config.c:1751
 #, c-format
 msgid ""
 "could not assign CRTCs to outputs:\n"
 "%s"
 msgstr ""
-"ezin izan da CRTCrik esleitu irteeretara:\n"
+"ezin izan da CRTrik esleitu irteeretara:\n"
 "%s"
 
-#: ../libgnome-desktop/gnome-rr-config.c:990
+#: ../libgnome-desktop/gnome-rr-config.c:1755
 #, c-format
 msgid ""
 "none of the selected modes were compatible with the possible modes:\n"
@@ -93,7 +168,7 @@
 #. Translators: the "requested", "minimum", and
 #. * "maximum" words here are not keywords; please
 #. * translate them as usual.
-#: ../libgnome-desktop/gnome-rr-config.c:1071
+#: ../libgnome-desktop/gnome-rr-config.c:1833
 #, c-format
 msgid ""
 "required virtual size does not fit available size: requested=(%d, %d), "
@@ -104,29 +179,32 @@
 
 #. Translators: This is the time format with full date used
 #. in 24-hour mode.
-#: ../libgnome-desktop/gnome-wall-clock.c:270
-msgid "%a %b %e, %R:%S"
-msgstr "%a, %b %e, %R:%S"
+#. The character between %R and %S is U+2236 RATIO
+#: ../libgnome-desktop/gnome-wall-clock.c:268
+msgid "%a %b %e, %R∶%S"
+msgstr "%a %b %e, %R∶%S"
 
-#: ../libgnome-desktop/gnome-wall-clock.c:271
+#: ../libgnome-desktop/gnome-wall-clock.c:269
 msgid "%a %b %e, %R"
-msgstr "%a, %b %e, %R"
+msgstr "%a %b %e, %R"
 
 #. Translators: This is the time format with day used
 #. in 24-hour mode.
-#: ../libgnome-desktop/gnome-wall-clock.c:275
-msgid "%a %R:%S"
-msgstr "%a, %R∶%S"
+#. The character between %R and %S is U+2236 RATIO
+#: ../libgnome-desktop/gnome-wall-clock.c:274
+msgid "%a %R∶%S"
+msgstr "%a %R∶%S"
 
-#: ../libgnome-desktop/gnome-wall-clock.c:276
+#: ../libgnome-desktop/gnome-wall-clock.c:275
 msgid "%a %R"
-msgstr "%a, %R"
+msgstr "%a %R"
 
 #. Translators: This is the time format without date used
 #. in 24-hour mode.
+#. The character between %R and %S is U+2236 RATIO
 #: ../libgnome-desktop/gnome-wall-clock.c:280
-msgid "%R:%S"
-msgstr "%R:%S"
+msgid "%R∶%S"
+msgstr "%R∶%S"
 
 #: ../libgnome-desktop/gnome-wall-clock.c:280
 msgid "%R"
@@ -134,95 +212,48 @@
 
 #. Translators: This is a time format with full date used
 #. for AM/PM.
-#: ../libgnome-desktop/gnome-wall-clock.c:286
-msgid "%a %b %e, %l:%M:%S %p"
-msgstr "%a, %b %e, %l:%M:%S %p"
-
-#: ../libgnome-desktop/gnome-wall-clock.c:287
-msgid "%a %b %e, %l:%M %p"
-msgstr "%a, %b %e, %l:%M %p"
+#. The Unicode characters are U+2236 RATIO and
+#. U+2009 THIN SPACE
+#: ../libgnome-desktop/gnome-wall-clock.c:288
+msgid "%a %b %e, %l∶%M∶%S %p"
+msgstr "%a %b %e, %l∶%M∶%S %p"
+
+#: ../libgnome-desktop/gnome-wall-clock.c:289
+msgid "%a %b %e, %l∶%M %p"
+msgstr "%a %b %e, %l∶%M %p"
 
 #. Translators: This is a time format with day used
 #. for AM/PM.
-#: ../libgnome-desktop/gnome-wall-clock.c:291
-msgid "%a %l:%M:%S %p"
-msgstr "%a, %l:%M:%S %p"
-
-#: ../libgnome-desktop/gnome-wall-clock.c:292
-msgid "%a %l:%M %p"
-msgstr "%a, %l:%M %p"
+#. The Unicode characters are U+2236 RATIO and
+#. U+2009 THIN SPACE
+#: ../libgnome-desktop/gnome-wall-clock.c:295
+msgid "%a %l∶%M∶%S %p"
+msgstr "%a %l∶%M∶%S %p"
+
+#: ../libgnome-desktop/gnome-wall-clock.c:296
+msgid "%a %l∶%M %p"
+msgstr "%a %l∶%M %p"
 
 #. Translators: This is a time format without date used
 #. for AM/PM.
-#: ../libgnome-desktop/gnome-wall-clock.c:296
-msgid "%l:%M:%S %p"
-msgstr "%l:%M:%S %p"
+#. The Unicode characters are U+2236 RATIO and
+#. U+2009 THIN SPACE
+#: ../libgnome-desktop/gnome-wall-clock.c:302
+msgid "%l∶%M∶%S %p"
+msgstr "%l∶%M∶%S %p"
+
+#: ../libgnome-desktop/gnome-wall-clock.c:303
+msgid "%l∶%M %p"
+msgstr "%l∶%M %p"
 
-#: ../libgnome-desktop/gnome-wall-clock.c:297
-msgid "%l:%M %p"
-msgstr "%l:%M %p"
-
-#~ msgctxt "Monitor vendor"
-#~ msgid "Unknown"
-#~ msgstr "Ezezaguna"
+#~ msgid "Laptop"
+#~ msgstr "Eramangarria"
 
 #~ msgid "Cannot find a terminal, using xterm, even if it may not work"
 #~ msgstr ""
 #~ "Ezin izan da terminala aurkitu, xterm erabiliko da, nahiz eta agian ez "
 #~ "funtzionatu"
 
-#~ msgid "could not get the screen resources (CRTCs, outputs, modes)"
-#~ msgstr "ezin izan da pantailen baliabideak lortu (CRTCak, irteerak, moduak)"
-
-#~ msgid "unhandled X error while getting the range of screen sizes"
-#~ msgstr "kudeatu gabeko X errorea pantailaren tamainen barrutia lortzean"
-
-#~ msgid "could not get the range of screen sizes"
-#~ msgstr "ezin izan da pantailaren tamainen barrutia lortu"
-
-#~ msgid "RANDR extension is not present"
-#~ msgstr "RANDR hedapena ez dago"
-
-#~ msgid "could not get information about output %d"
-#~ msgstr "ezin izan da %d irteerari buruzko informazioa lortu"
-
-#~ msgid ""
-#~ "requested position/size for CRTC %d is outside the allowed limit: "
-#~ "position=(%d, %d), size=(%d, %d), maximum=(%d, %d)"
-#~ msgstr ""
-#~ "eskatutako %d. CRTCaren posizioa/tamaina baimendutako mugatik at dago: "
-#~ "posizioa=(%d, %d), tamaina=(%d, %d), gehienezkoa=(%d, %d)"
-
-#~ msgid "could not set the configuration for CRTC %d"
-#~ msgstr "ezin izan da %d. CRTCaren konfigurazioa ezarri"
-
-#~ msgid "could not get information about CRTC %d"
-#~ msgstr "ezin izan da %d. CRTCari buruzko informazioa lortu"
-
-#~ msgid "Laptop"
-#~ msgstr "Eramangarria"
-
-#~ msgid ""
-#~ "none of the saved display configurations matched the active configuration"
-#~ msgstr ""
-#~ "pantailaren gordetako konfiguraziotariko bat bera ere ez dator bat "
-#~ "konfigurazio aktiboarekin"
-
-# %a, %b %e, %R∶%S ==
-# lr, ira 14, 12:14
-#~| msgid "%a %b %e, %R:%S"
-#~ msgid "%a %b %e, %R∶%S"
-#~ msgstr "%a, %b %e, %R∶%S"
-
-#~ msgid "%R∶%S"
-#~ msgstr "%R∶%S"
-
-#~ msgid "%l∶%M∶%S %p"
-#~ msgstr "%l∶%M∶%S %p"
-
-#~ msgid "%l∶%M %p"
-#~ msgstr "%l∶%M %p"
-
 #~ msgid "Mirror Screens"
 #~ msgstr "Ispilu-pantailak"
 
diff -Nru gnome-desktop3-3.12.0/po/fa.po gnome-desktop3-3.8.4/po/fa.po
--- gnome-desktop3-3.12.0/po/fa.po	2013-11-11 17:23:18.000000000 +0000
+++ gnome-desktop3-3.8.4/po/fa.po	2013-04-15 09:26:23.000000000 +0000
@@ -6,81 +6,153 @@
 # Elnaz Sarbar , 2006.
 # Farzaneh Sarafraz , 2006.
 # Mahyar Moghimi , 2010.
-# Arash Mousavi , 2012, 2013.
+# Arash Mousavi , 2012, 2013.
 #
 msgid ""
 msgstr ""
 "Project-Id-Version: gnome-desktop HEAD\n"
 "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=gnome-"
 "desktop&keywords=I18N+L10N&component=general\n"
-"POT-Creation-Date: 2013-09-20 18:49+0000\n"
-"PO-Revision-Date: 2013-10-11 16:22+0330\n"
+"POT-Creation-Date: 2013-03-04 10:03+0000\n"
+"PO-Revision-Date: 2013-03-22 17:55+0330\n"
 "Last-Translator: Arash Mousavi \n"
-"Language-Team: Persian <>\n"
-"Language: Persian\n"
+"Language-Team: Persian\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "X-Poedit-SourceCharset: UTF-8\n"
-"X-Generator: Gtranslator 2.91.6\n"
-"Plural-Forms: nplurals=1; plural=0;\n"
+"X-Generator: Poedit 1.5.4\n"
+
+#. Translators: "Unknown" here is used to identify a monitor for which
+#. * we don't know the vendor. When a vendor is known, the name of the
+#. * vendor is used.
+#: ../libgnome-desktop/display-name.c:107
+msgctxt "Monitor vendor"
+msgid "Unknown"
+msgstr "ناشناخته"
 
 #: ../libgnome-desktop/gnome-languages.c:804
 msgid "Unspecified"
 msgstr "نامشخص"
 
-#: ../libgnome-desktop/gnome-rr-config.c:743
+#. Translators: a CRTC is a CRT Controller (this is X terminology).
+#: ../libgnome-desktop/gnome-rr.c:452
+#, c-format
+msgid "could not get the screen resources (CRTCs, outputs, modes)"
+msgstr "منابع صفحه نمایش گرفته نشد(کنترل کننده‌ی سی‌آر‌تی، خروجی‌ها، حالت‌ها)"
+
+#: ../libgnome-desktop/gnome-rr.c:472
+#, c-format
+msgid "unhandled X error while getting the range of screen sizes"
+msgstr "خطای تصدی نشدهٔ ایکس هنگام گرفتن گسترهٔ اندازه‌ی صفحه‌نمایش"
+
+#: ../libgnome-desktop/gnome-rr.c:478
+#, c-format
+msgid "could not get the range of screen sizes"
+msgstr "گسترهٔ اندازه‌های صفحه نمایش گرفته نشد."
+
+#: ../libgnome-desktop/gnome-rr.c:769
+#, c-format
+msgid "RANDR extension is not present"
+msgstr "پسوند RANDR موجود نیست."
+
+#: ../libgnome-desktop/gnome-rr.c:1580
+#, c-format
+msgid "could not get information about output %d"
+msgstr "اطلاعات درباره‌ی خروجی %d بدست نیامد."
+
+#: ../libgnome-desktop/gnome-rr.c:1764
+msgid "Built-in Display"
+msgstr "نمایشگر توکار"
+
+#. Translators: %s is the size of the monitor in inches
+#: ../libgnome-desktop/gnome-rr.c:1782
+#, c-format
+msgid "%s Display"
+msgstr "نمایشگر %s"
+
+#: ../libgnome-desktop/gnome-rr.c:1789
+#| msgctxt "Monitor vendor"
+#| msgid "Unknown"
+msgid "Unknown Display"
+msgstr "نمایشگر ناشناس"
+
+#. Translators: the "position", "size", and "maximum"
+#. * words here are not keywords; please translate them
+#. * as usual.  A CRTC is a CRT Controller (this is X terminology)
+#: ../libgnome-desktop/gnome-rr.c:2234
+#, c-format
+msgid ""
+"requested position/size for CRTC %d is outside the allowed limit: "
+"position=(%d, %d), size=(%d, %d), maximum=(%d, %d)"
+msgstr ""
+"موقعیت/اندازه‌ی درخواست شده برای کنترل‌کننده‌ی سی‌آر‌تی %d در خارج از حد مجاز "
+"است: موقعیت=(%d, %d) ، , اندازه=(%d, %d), بیشینه=(%d, %d)"
+
+#: ../libgnome-desktop/gnome-rr.c:2270
+#, c-format
+msgid "could not set the configuration for CRTC %d"
+msgstr "پیکر‌بندی برای کنترلر سی‌آر‌تی %d تنظیم نشد"
+
+#: ../libgnome-desktop/gnome-rr.c:2421
+#, c-format
+msgid "could not get information about CRTC %d"
+msgstr "اطلاعات درباره‌ی کنترلر سی‌آر‌تی %d گرفته نشد"
+
+#: ../libgnome-desktop/gnome-rr-config.c:708
+#, c-format
+msgid ""
+"none of the saved display configurations matched the active configuration"
+msgstr ""
+"هیچ‌کدام از پیکربندی‌های ذخیره شده برای صفحهٔ نمایش با پیکربندی فعال فعلی "
+"مطابقت نیافت."
+
+#: ../libgnome-desktop/gnome-rr-config.c:1464
 #, c-format
 msgid "CRTC %d cannot drive output %s"
 msgstr "کنترلر سی‌آر‌تی %d نمی‌تواند خروجی %s را بگرداند"
 
-#: ../libgnome-desktop/gnome-rr-config.c:750
+#: ../libgnome-desktop/gnome-rr-config.c:1471
 #, c-format
 msgid "output %s does not support mode %dx%d@%dHz"
 msgstr "خروجی %s از حالت %dx%d@%dHz پشتیبانی نمی‌کند."
 
-#: ../libgnome-desktop/gnome-rr-config.c:761
+#: ../libgnome-desktop/gnome-rr-config.c:1482
+#, c-format
+msgid "CRTC %d does not support rotation=%s"
+msgstr "کنترلر سی‌آر‌تی %d از چرخاندن=%s پشتیبانی نمی‌کند"
+
+#: ../libgnome-desktop/gnome-rr-config.c:1496
 #, c-format
-#| msgid "CRTC %d does not support rotation=%s"
-msgid "CRTC %d does not support rotation=%d"
-msgstr "کنترلر سی‌آر‌تی %d از چرخاندن=%d پشتیبانی نمی‌کند"
-
-#: ../libgnome-desktop/gnome-rr-config.c:774
-#, c-format
-#| msgid ""
-#| "output %s does not have the same parameters as another cloned output:\n"
-#| "existing mode = %d, new mode = %d\n"
-#| "existing coordinates = (%d, %d), new coordinates = (%d, %d)\n"
-#| "existing rotation = %s, new rotation = %s"
 msgid ""
 "output %s does not have the same parameters as another cloned output:\n"
 "existing mode = %d, new mode = %d\n"
 "existing coordinates = (%d, %d), new coordinates = (%d, %d)\n"
-"existing rotation = %d, new rotation = %d"
+"existing rotation = %s, new rotation = %s"
 msgstr ""
-"خروجی %s دارای پارامتر‌های همانند با خروجی دیگری (که کپی‌برابر است) نیست:\n"
+"خروجی %s دارای پارامتر‌های همانند با خروجی دیگری (که کپی‌برابر است) نیست: \n"
 "حالت موجود = %d ، حالت جدید= %d\n"
 "مختصات موجود = (%d, %d), مختصات جدید = (%d, %d)\n"
-"چرخش موجود =  %d, چرخش جدید = %d"
+"چرخش موجود =  %s, چرخش جدید = %s"
 
-#: ../libgnome-desktop/gnome-rr-config.c:789
+#: ../libgnome-desktop/gnome-rr-config.c:1511
 #, c-format
 msgid "cannot clone to output %s"
 msgstr "کپی‌برابر به خروجی %s انجام نمی‌شود."
 
-#: ../libgnome-desktop/gnome-rr-config.c:915
+#: ../libgnome-desktop/gnome-rr-config.c:1680
 #, c-format
 msgid "Trying modes for CRTC %d\n"
-msgstr "در حال آزمودن حالت‌ها برای کنترلر سی‌آر‌تی %d\n"
+msgstr "در حال آزمودن حالت‌ها برای کنترلر سی‌آر‌تی %d  \n"
 
-#: ../libgnome-desktop/gnome-rr-config.c:939
+#: ../libgnome-desktop/gnome-rr-config.c:1704
 #, c-format
 msgid "CRTC %d: trying mode %dx%d@%dHz with output at %dx%d@%dHz (pass %d)\n"
 msgstr ""
 "کنترلر سی‌آر‌تی %d: در حال امتحان کردن حالت %dx%d@%dHz با خروجی در %dx%d@%dHz "
 "(گذر %d )\n"
 
-#: ../libgnome-desktop/gnome-rr-config.c:986
+#: ../libgnome-desktop/gnome-rr-config.c:1751
 #, c-format
 msgid ""
 "could not assign CRTCs to outputs:\n"
@@ -89,7 +161,7 @@
 "کنترلرهای سی‌آر‌تی به خروجی‌ها منتسب نشد:\n"
 "%s"
 
-#: ../libgnome-desktop/gnome-rr-config.c:990
+#: ../libgnome-desktop/gnome-rr-config.c:1755
 #, c-format
 msgid ""
 "none of the selected modes were compatible with the possible modes:\n"
@@ -101,7 +173,7 @@
 #. Translators: the "requested", "minimum", and
 #. * "maximum" words here are not keywords; please
 #. * translate them as usual.
-#: ../libgnome-desktop/gnome-rr-config.c:1071
+#: ../libgnome-desktop/gnome-rr-config.c:1833
 #, c-format
 msgid ""
 "required virtual size does not fit available size: requested=(%d, %d), "
@@ -112,30 +184,33 @@
 
 #. Translators: This is the time format with full date used
 #. in 24-hour mode.
-#: ../libgnome-desktop/gnome-wall-clock.c:270
-#| msgid "%a %b %e, %R"
-msgid "%a %b %e, %R:%S"
-msgstr "%a %Od %b %OH:%OM"
+#. The character between %R and %S is U+2236 RATIO
+#: ../libgnome-desktop/gnome-wall-clock.c:268
+#| msgid "%a %b %e, %R:%S"
+msgid "%a %b %e, %R∶%S"
+msgstr "%a %Oe %b %OH:%OM:%OS"
 
-#: ../libgnome-desktop/gnome-wall-clock.c:271
+#: ../libgnome-desktop/gnome-wall-clock.c:269
 msgid "%a %b %e, %R"
 msgstr "%a %Od %b %OH:%OM"
 
 #. Translators: This is the time format with day used
 #. in 24-hour mode.
-#: ../libgnome-desktop/gnome-wall-clock.c:275
-#| msgid "%a %R∶%S"
-msgid "%a %R:%S"
+#. The character between %R and %S is U+2236 RATIO
+#: ../libgnome-desktop/gnome-wall-clock.c:274
+#| msgid "%a %R:%S"
+msgid "%a %R∶%S"
 msgstr "%a %OH:%OM:%OS"
 
-#: ../libgnome-desktop/gnome-wall-clock.c:276
+#: ../libgnome-desktop/gnome-wall-clock.c:275
 msgid "%a %R"
 msgstr "%a %OH:%OM"
 
 #. Translators: This is the time format without date used
 #. in 24-hour mode.
+#. The character between %R and %S is U+2236 RATIO
 #: ../libgnome-desktop/gnome-wall-clock.c:280
-msgid "%R:%S"
+msgid "%R∶%S"
 msgstr "%OH:%OM:%OS"
 
 #: ../libgnome-desktop/gnome-wall-clock.c:280
@@ -144,99 +219,43 @@
 
 #. Translators: This is a time format with full date used
 #. for AM/PM.
-#: ../libgnome-desktop/gnome-wall-clock.c:286
-#| msgid "%a %b %e, %l∶%M∶%S %p"
-msgid "%a %b %e, %l:%M:%S %p"
+#. The Unicode characters are U+2236 RATIO and
+#. U+2009 THIN SPACE
+#: ../libgnome-desktop/gnome-wall-clock.c:288
+#| msgid "%a %b %e, %l:%M:%S %p"
+msgid "%a %b %e, %l∶%M∶%S %p"
 msgstr "%a Oe% %b، %OI:%OM:%OS %p"
 
-#: ../libgnome-desktop/gnome-wall-clock.c:287
-#| msgid "%a %b %e, %l∶%M %p"
-msgid "%a %b %e, %l:%M %p"
+#: ../libgnome-desktop/gnome-wall-clock.c:289
+#| msgid "%a %b %e, %l:%M %p"
+msgid "%a %b %e, %l∶%M %p"
 msgstr "%a %Oe %b، %OI:%OM %p"
 
 #. Translators: This is a time format with day used
 #. for AM/PM.
-#: ../libgnome-desktop/gnome-wall-clock.c:291
-#| msgid "%a %l∶%M∶%S %p"
-msgid "%a %l:%M:%S %p"
+#. The Unicode characters are U+2236 RATIO and
+#. U+2009 THIN SPACE
+#: ../libgnome-desktop/gnome-wall-clock.c:295
+#| msgid "%a %l:%M:%S %p"
+msgid "%a %l∶%M∶%S %p"
 msgstr "%a %OI:%OM:%OS %p"
 
-#: ../libgnome-desktop/gnome-wall-clock.c:292
-#| msgid "%a %l∶%M %p"
-msgid "%a %l:%M %p"
+#: ../libgnome-desktop/gnome-wall-clock.c:296
+#| msgid "%a %l:%M %p"
+msgid "%a %l∶%M %p"
 msgstr "%a %OI:%OM %p"
 
 #. Translators: This is a time format without date used
 #. for AM/PM.
-#: ../libgnome-desktop/gnome-wall-clock.c:296
-msgid "%l:%M:%S %p"
-msgstr "%OI:%OM:%OS %p"
-
-#: ../libgnome-desktop/gnome-wall-clock.c:297
-msgid "%l:%M %p"
-msgstr "%OI:%OM %p"
-
-#~ msgctxt "Monitor vendor"
-#~ msgid "Unknown"
-#~ msgstr "ناشناخته"
-
-#~ msgid "could not get the screen resources (CRTCs, outputs, modes)"
-#~ msgstr "منابع صفحه نمایش گرفته نشد(کنترل کننده‌ی سی‌آر‌تی، خروجی‌ها، حالت‌ها)"
-
-#~ msgid "unhandled X error while getting the range of screen sizes"
-#~ msgstr "خطای تصدی نشدهٔ ایکس هنگام گرفتن گسترهٔ اندازه‌ی صفحه‌نمایش"
-
-#~ msgid "could not get the range of screen sizes"
-#~ msgstr "گسترهٔ اندازه‌های صفحه نمایش گرفته نشد."
-
-#~ msgid "RANDR extension is not present"
-#~ msgstr "پسوند RANDR موجود نیست."
-
-#~ msgid "could not get information about output %d"
-#~ msgstr "اطلاعات درباره‌ی خروجی %d بدست نیامد."
-
-#~ msgid "Built-in Display"
-#~ msgstr "نمایشگر توکار"
-
-#~ msgid "%s Display"
-#~ msgstr "نمایشگر %s"
-
-#~| msgctxt "Monitor vendor"
-#~| msgid "Unknown"
-#~ msgid "Unknown Display"
-#~ msgstr "نمایشگر ناشناس"
-
-#~ msgid ""
-#~ "requested position/size for CRTC %d is outside the allowed limit: "
-#~ "position=(%d, %d), size=(%d, %d), maximum=(%d, %d)"
-#~ msgstr ""
-#~ "موقعیت/اندازه‌ی درخواست شده برای کنترل‌کننده‌ی سی‌آر‌تی %d در خارج از حد مجاز "
-#~ "است: موقعیت=(%d, %d) ، , اندازه=(%d, %d), بیشینه=(%d, %d)"
-
-#~ msgid "could not set the configuration for CRTC %d"
-#~ msgstr "پیکر‌بندی برای کنترلر سی‌آر‌تی %d تنظیم نشد"
-
-#~ msgid "could not get information about CRTC %d"
-#~ msgstr "اطلاعات درباره‌ی کنترلر سی‌آر‌تی %d گرفته نشد"
-
-#~ msgid ""
-#~ "none of the saved display configurations matched the active configuration"
-#~ msgstr ""
-#~ "هیچ‌کدام از پیکربندی‌های ذخیره شده برای صفحهٔ نمایش با پیکربندی فعال فعلی "
-#~ "مطابقت نیافت."
-
-#~| msgid "%a %b %e, %R:%S"
-#~ msgid "%a %b %e, %R∶%S"
-#~ msgstr "%a %Oe %b %OH:%OM:%OS"
-
-#~ msgid "%R∶%S"
-#~ msgstr "%OH:%OM:%OS"
-
-#~ msgid "%l∶%M∶%S %p"
-#~ msgstr "%Ol∶%OM∶%OS %p"
-
-#~ msgid "%l∶%M %p"
-#~ msgstr "%Ol∶%OM %p"
+#. The Unicode characters are U+2236 RATIO and
+#. U+2009 THIN SPACE
+#: ../libgnome-desktop/gnome-wall-clock.c:302
+msgid "%l∶%M∶%S %p"
+msgstr "%Ol∶%OM∶%OS %p"
+
+#: ../libgnome-desktop/gnome-wall-clock.c:303
+msgid "%l∶%M %p"
+msgstr "%Ol∶%OM %p"
 
 #~ msgid "Cannot find a terminal, using xterm, even if it may not work"
 #~ msgstr ""
diff -Nru gnome-desktop3-3.12.0/po/fi.po gnome-desktop3-3.8.4/po/fi.po
--- gnome-desktop3-3.12.0/po/fi.po	2013-11-11 17:23:18.000000000 +0000
+++ gnome-desktop3-3.8.4/po/fi.po	2013-09-04 11:15:57.000000000 +0000
@@ -8,79 +8,151 @@
 # Pauli Virtanen , 2000-2005.
 # Ilkka Tuohela , 2005-2009.
 # Tommi Vainikainen , 2009-2011.
-# Jiri Grönroos , 2012, 2013.
-#
+# Jiri Grönroos , 2012, 2013.
 msgid ""
 msgstr ""
 "Project-Id-Version: gnome-desktop\n"
 "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=gnome-"
 "desktop&keywords=I18N+L10N&component=general\n"
-"POT-Creation-Date: 2013-09-04 21:57+0000\n"
-"PO-Revision-Date: 2013-09-05 22:53+0300\n"
+"POT-Creation-Date: 2013-03-04 10:03+0000\n"
+"PO-Revision-Date: 2013-03-05 21:14+0200\n"
 "Last-Translator: Jiri Grönroos \n"
-"Language-Team: suomi \n"
+"Language-Team: Finnish \n"
 "Language: fi\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
-"X-Generator: Gtranslator 2.91.6\n"
+"X-Generator: Lokalize 1.5\n"
+
+#. Translators: "Unknown" here is used to identify a monitor for which
+#. * we don't know the vendor. When a vendor is known, the name of the
+#. * vendor is used.
+#: ../libgnome-desktop/display-name.c:107
+msgctxt "Monitor vendor"
+msgid "Unknown"
+msgstr "Tuntematon"
 
 #: ../libgnome-desktop/gnome-languages.c:804
 msgid "Unspecified"
 msgstr "Määrittämätön"
 
-#: ../libgnome-desktop/gnome-rr-config.c:743
+#. Translators: a CRTC is a CRT Controller (this is X terminology).
+#: ../libgnome-desktop/gnome-rr.c:452
+#, c-format
+msgid "could not get the screen resources (CRTCs, outputs, modes)"
+msgstr "Näyttöresurssien tietoja ei saatu (CRTCt, ulostuloa, tilat)"
+
+#: ../libgnome-desktop/gnome-rr.c:472
+#, c-format
+msgid "unhandled X error while getting the range of screen sizes"
+msgstr "käsittelemätön X-virhe noudettaessa kelvollisia näytön kokoja"
+
+#: ../libgnome-desktop/gnome-rr.c:478
+#, c-format
+msgid "could not get the range of screen sizes"
+msgstr "näytön kokoluetteloa ei saatu noudettua"
+
+#: ../libgnome-desktop/gnome-rr.c:769
+#, c-format
+msgid "RANDR extension is not present"
+msgstr "RANDR-laajennos ei ole saatavilla"
+
+#: ../libgnome-desktop/gnome-rr.c:1580
+#, c-format
+msgid "could not get information about output %d"
+msgstr "Tietoja ulostulosta %d ei saatu."
+
+#: ../libgnome-desktop/gnome-rr.c:1764
+msgid "Built-in Display"
+msgstr "Sisäänrakennettu näyttö"
+
+#. Translators: %s is the size of the monitor in inches
+#: ../libgnome-desktop/gnome-rr.c:1782
+#, c-format
+msgid "%s Display"
+msgstr "%s näyttö"
+
+#: ../libgnome-desktop/gnome-rr.c:1789
+#| msgctxt "Monitor vendor"
+#| msgid "Unknown"
+msgid "Unknown Display"
+msgstr "Tuntematon näyttö"
+
+#. Translators: the "position", "size", and "maximum"
+#. * words here are not keywords; please translate them
+#. * as usual.  A CRTC is a CRT Controller (this is X terminology)
+#: ../libgnome-desktop/gnome-rr.c:2234
+#, c-format
+msgid ""
+"requested position/size for CRTC %d is outside the allowed limit: position="
+"(%d, %d), size=(%d, %d), maximum=(%d, %d)"
+msgstr ""
+"pyydetty sijainti tai koko CRTC:lle %d ei ole sallituissa rajoissa: sijainti="
+"(%d,%d), koko=(%d,%d), maksimi=(%d,%d)"
+
+#: ../libgnome-desktop/gnome-rr.c:2270
+#, c-format
+msgid "could not set the configuration for CRTC %d"
+msgstr "Asetuksia CRTC:lle %d ei voitu asettaa"
+
+#: ../libgnome-desktop/gnome-rr.c:2421
+#, c-format
+msgid "could not get information about CRTC %d"
+msgstr "Tietoja CRTC:stä %d ei saatu."
+
+#: ../libgnome-desktop/gnome-rr-config.c:708
+#, c-format
+msgid ""
+"none of the saved display configurations matched the active configuration"
+msgstr ""
+"yksikään tallennetuista näyttöasetuksista ei vastaa aktiivista määrittelyä"
+
+#: ../libgnome-desktop/gnome-rr-config.c:1464
 #, c-format
 msgid "CRTC %d cannot drive output %s"
 msgstr "CRTC %d ei voi ajaa ulostuloa %s"
 
-#: ../libgnome-desktop/gnome-rr-config.c:750
+#: ../libgnome-desktop/gnome-rr-config.c:1471
 #, c-format
 msgid "output %s does not support mode %dx%d@%dHz"
 msgstr "ulostulo %s ei tue tilaa %d×%d@%d Hz"
 
-#: ../libgnome-desktop/gnome-rr-config.c:761
+#: ../libgnome-desktop/gnome-rr-config.c:1482
+#, c-format
+msgid "CRTC %d does not support rotation=%s"
+msgstr "CRTC %d ei tue kiertoa %s"
+
+#: ../libgnome-desktop/gnome-rr-config.c:1496
 #, c-format
-#| msgid "CRTC %d does not support rotation=%s"
-msgid "CRTC %d does not support rotation=%d"
-msgstr "CRTC %d ei tue kiertoa=%d"
-
-#: ../libgnome-desktop/gnome-rr-config.c:774
-#, c-format
-#| msgid ""
-#| "output %s does not have the same parameters as another cloned output:\n"
-#| "existing mode = %d, new mode = %d\n"
-#| "existing coordinates = (%d, %d), new coordinates = (%d, %d)\n"
-#| "existing rotation = %s, new rotation = %s"
 msgid ""
 "output %s does not have the same parameters as another cloned output:\n"
 "existing mode = %d, new mode = %d\n"
 "existing coordinates = (%d, %d), new coordinates = (%d, %d)\n"
-"existing rotation = %d, new rotation = %d"
+"existing rotation = %s, new rotation = %s"
 msgstr ""
 "ulostulolla %s ei ole samat parametrit kuin kloonatulla ulostulolla:\n"
 "nykyinen tila = %d, uusi tila = %d\n"
 "nykyiset koordinaatit = (%d, %d), uudet koordinaatit = (%d, %d)\n"
-"nykyinen kierto = %d, uusi kierto = %d"
+"nykyinen kierto = %s, uusi kierto = %s"
 
-#: ../libgnome-desktop/gnome-rr-config.c:789
+#: ../libgnome-desktop/gnome-rr-config.c:1511
 #, c-format
 msgid "cannot clone to output %s"
 msgstr "ei voi kloonata ulostuloon %s"
 
-#: ../libgnome-desktop/gnome-rr-config.c:915
+#: ../libgnome-desktop/gnome-rr-config.c:1680
 #, c-format
 msgid "Trying modes for CRTC %d\n"
 msgstr "Yritetään tiloja CRTC %d:lle\n"
 
-#: ../libgnome-desktop/gnome-rr-config.c:939
+#: ../libgnome-desktop/gnome-rr-config.c:1704
 #, c-format
 msgid "CRTC %d: trying mode %dx%d@%dHz with output at %dx%d@%dHz (pass %d)\n"
 msgstr ""
 "CRTC %d: yritetään tilaa %d×%d@%d Hz ulostulolla %d×%d@%d Hz (vaihe %d)\n"
 
-#: ../libgnome-desktop/gnome-rr-config.c:986
+#: ../libgnome-desktop/gnome-rr-config.c:1751
 #, c-format
 msgid ""
 "could not assign CRTCs to outputs:\n"
@@ -89,7 +161,7 @@
 "ei voitu sijoittaa CRTC:itä ulostuloihin:\n"
 "%s"
 
-#: ../libgnome-desktop/gnome-rr-config.c:990
+#: ../libgnome-desktop/gnome-rr-config.c:1755
 #, c-format
 msgid ""
 "none of the selected modes were compatible with the possible modes:\n"
@@ -102,7 +174,7 @@
 #. Translators: the "requested", "minimum", and
 #. * "maximum" words here are not keywords; please
 #. * translate them as usual.
-#: ../libgnome-desktop/gnome-rr-config.c:1071
+#: ../libgnome-desktop/gnome-rr-config.c:1833
 #, c-format
 msgid ""
 "required virtual size does not fit available size: requested=(%d, %d), "
@@ -114,33 +186,39 @@
 # msgstr "%a %-d.%-m., %-H.%M.%S"
 #. Translators: This is the time format with full date used
 #. in 24-hour mode.
-#: ../libgnome-desktop/gnome-wall-clock.c:270
-msgid "%a %b %e, %R:%S"
+#. The character between %R and %S is U+2236 RATIO
+#: ../libgnome-desktop/gnome-wall-clock.c:268
+#, fuzzy
+#| msgid "%a %b %e, %R:%S"
+msgid "%a %b %e, %R∶%S"
 msgstr "%a %d.%m., %H.%M.%S"
 
 # msgstr "%a %-d.%-m., %-H.%M"
-#: ../libgnome-desktop/gnome-wall-clock.c:271
+#: ../libgnome-desktop/gnome-wall-clock.c:269
 msgid "%a %b %e, %R"
 msgstr "%a %d.%m., %H.%M"
 
 # msgstr "%a %-H.%M.%S"
 #. Translators: This is the time format with day used
 #. in 24-hour mode.
-#: ../libgnome-desktop/gnome-wall-clock.c:275
-msgid "%a %R:%S"
+#. The character between %R and %S is U+2236 RATIO
+#: ../libgnome-desktop/gnome-wall-clock.c:274
+#, fuzzy
+#| msgid "%a %R:%S"
+msgid "%a %R∶%S"
 msgstr "%a %H.%M.%S"
 
 # msgstr "%a %-H.%M"
-#: ../libgnome-desktop/gnome-wall-clock.c:276
+#: ../libgnome-desktop/gnome-wall-clock.c:275
 msgid "%a %R"
 msgstr "%a %H.%M"
 
-# msgstr "%a %-H.%M.%S"
 #. Translators: This is the time format without date used
 #. in 24-hour mode.
+#. The character between %R and %S is U+2236 RATIO
 #: ../libgnome-desktop/gnome-wall-clock.c:280
-msgid "%R:%S"
-msgstr "%H.%M.%S"
+msgid "%R∶%S"
+msgstr ""
 
 #: ../libgnome-desktop/gnome-wall-clock.c:280
 msgid "%R"
@@ -149,85 +227,75 @@
 # msgstr "%a %-d.%-m., %-I.%M.%S %p"
 #. Translators: This is a time format with full date used
 #. for AM/PM.
-#: ../libgnome-desktop/gnome-wall-clock.c:286
-msgid "%a %b %e, %l:%M:%S %p"
+#. The Unicode characters are U+2236 RATIO and
+#. U+2009 THIN SPACE
+#: ../libgnome-desktop/gnome-wall-clock.c:288
+#, fuzzy
+#| msgid "%a %b %e, %l:%M:%S %p"
+msgid "%a %b %e, %l∶%M∶%S %p"
 msgstr "%a %d.%m., %I.%M.%S %p"
 
 # msgstr "%a %-d.%-m., %-I.%M %p"
-#: ../libgnome-desktop/gnome-wall-clock.c:287
-msgid "%a %b %e, %l:%M %p"
+#: ../libgnome-desktop/gnome-wall-clock.c:289
+#, fuzzy
+#| msgid "%a %b %e, %l:%M %p"
+msgid "%a %b %e, %l∶%M %p"
 msgstr "%a %d.%m., %I.%M %p"
 
 # msgstr "%a %-I.%M.%S %p"
 #. Translators: This is a time format with day used
 #. for AM/PM.
-#: ../libgnome-desktop/gnome-wall-clock.c:291
-msgid "%a %l:%M:%S %p"
+#. The Unicode characters are U+2236 RATIO and
+#. U+2009 THIN SPACE
+#: ../libgnome-desktop/gnome-wall-clock.c:295
+#, fuzzy
+#| msgid "%a %l:%M:%S %p"
+msgid "%a %l∶%M∶%S %p"
 msgstr "%a %I.%M.%S %p"
 
 # msgstr "%a %-I.%M %p"
-#: ../libgnome-desktop/gnome-wall-clock.c:292
-msgid "%a %l:%M %p"
+#: ../libgnome-desktop/gnome-wall-clock.c:296
+#, fuzzy
+#| msgid "%a %l:%M %p"
+msgid "%a %l∶%M %p"
 msgstr "%a %I.%M %p"
 
-# msgstr "%a %-I.%M.%S %p"
 #. Translators: This is a time format without date used
 #. for AM/PM.
-#: ../libgnome-desktop/gnome-wall-clock.c:296
-msgid "%l:%M:%S %p"
-msgstr "%l:%M:%S %p"
+#. The Unicode characters are U+2236 RATIO and
+#. U+2009 THIN SPACE
+#: ../libgnome-desktop/gnome-wall-clock.c:302
+msgid "%l∶%M∶%S %p"
+msgstr ""
 
-# msgstr "%a %-I.%M %p"
-#: ../libgnome-desktop/gnome-wall-clock.c:297
-msgid "%l:%M %p"
-msgstr "%l:%M %p"
-
-#~ msgctxt "Monitor vendor"
-#~ msgid "Unknown"
-#~ msgstr "Tuntematon"
+#: ../libgnome-desktop/gnome-wall-clock.c:303
+msgid "%l∶%M %p"
+msgstr ""
 
 #~ msgid "Cannot find a terminal, using xterm, even if it may not work"
 #~ msgstr "Päätettä ei löytynyt, käytetään xtermiä vaikka se ei ehkä toimi"
 
-#~ msgid "could not get the screen resources (CRTCs, outputs, modes)"
-#~ msgstr "Näyttöresurssien tietoja ei saatu (CRTCt, ulostuloa, tilat)"
-
-#~ msgid "unhandled X error while getting the range of screen sizes"
-#~ msgstr "käsittelemätön X-virhe noudettaessa kelvollisia näytön kokoja"
-
-#~ msgid "could not get the range of screen sizes"
-#~ msgstr "näytön kokoluetteloa ei saatu noudettua"
-
-#~ msgid "RANDR extension is not present"
-#~ msgstr "RANDR-laajennos ei ole saatavilla"
-
-#~ msgid "could not get information about output %d"
-#~ msgstr "Tietoja ulostulosta %d ei saatu."
-
-#~ msgid ""
-#~ "requested position/size for CRTC %d is outside the allowed limit: "
-#~ "position=(%d, %d), size=(%d, %d), maximum=(%d, %d)"
-#~ msgstr ""
-#~ "pyydetty sijainti tai koko CRTC:lle %d ei ole sallituissa rajoissa: "
-#~ "sijainti=(%d,%d), koko=(%d,%d), maksimi=(%d,%d)"
-
-#~ msgid "could not set the configuration for CRTC %d"
-#~ msgstr "Asetuksia CRTC:lle %d ei voitu asettaa"
-
-#~ msgid "could not get information about CRTC %d"
-#~ msgstr "Tietoja CRTC:stä %d ei saatu."
-
 #~ msgid "Laptop"
 #~ msgstr "Kannettava"
 
-#~ msgid ""
-#~ "none of the saved display configurations matched the active configuration"
-#~ msgstr ""
-#~ "yksikään tallennetuista näyttöasetuksista ei vastaa aktiivista määrittelyä"
-
 #~ msgid "Mirrored Displays"
 #~ msgstr "Peilatut näytöt"
 
+# msgstr "%a %-H.%M.%S"
+#~| msgid "%a %R:%S"
+#~ msgid "%R:%S"
+#~ msgstr "%H.%M.%S"
+
+# msgstr "%a %-I.%M.%S %p"
+#~| msgid "%a %l:%M:%S %p"
+#~ msgid "%l:%M:%S %p"
+#~ msgstr "%l:%M:%S %p"
+
+# msgstr "%a %-I.%M %p"
+#~| msgid "%a %l:%M %p"
+#~ msgid "%l:%M %p"
+#~ msgstr "%l:%M %p"
+
 #~ msgid "Mirror Screens"
 #~ msgstr "Peilatut näytöt"
 
diff -Nru gnome-desktop3-3.12.0/po/fr.po gnome-desktop3-3.8.4/po/fr.po
--- gnome-desktop3-3.12.0/po/fr.po	2013-11-11 17:23:18.000000000 +0000
+++ gnome-desktop3-3.8.4/po/fr.po	2013-09-04 11:15:57.000000000 +0000
@@ -18,8 +18,8 @@
 "Project-Id-Version: gnome-desktop HEAD\n"
 "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=gnome-"
 "desktop&keywords=I18N+L10N&component=general\n"
-"POT-Creation-Date: 2013-08-19 17:24+0000\n"
-"PO-Revision-Date: 2013-08-22 12:13+0200\n"
+"POT-Creation-Date: 2013-03-04 10:03+0000\n"
+"PO-Revision-Date: 2013-03-14 15:59+0100\n"
 "Last-Translator: Claude Paroz \n"
 "Language-Team: GNOME French Team \n"
 "Language: \n"
@@ -27,55 +27,136 @@
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
+#. Translators: "Unknown" here is used to identify a monitor for which
+#. * we don't know the vendor. When a vendor is known, the name of the
+#. * vendor is used.
+#: ../libgnome-desktop/display-name.c:107
+msgctxt "Monitor vendor"
+msgid "Unknown"
+msgstr "Inconnu"
+
 #: ../libgnome-desktop/gnome-languages.c:804
 msgid "Unspecified"
 msgstr "Non précisé"
 
-#: ../libgnome-desktop/gnome-rr-config.c:789
+#. Translators: a CRTC is a CRT Controller (this is X terminology).
+#: ../libgnome-desktop/gnome-rr.c:452
+#, c-format
+msgid "could not get the screen resources (CRTCs, outputs, modes)"
+msgstr "impossible d'obtenir les ressources d'écran (CRTC, sorties, modes)"
+
+#: ../libgnome-desktop/gnome-rr.c:472
+#, c-format
+msgid "unhandled X error while getting the range of screen sizes"
+msgstr ""
+"erreur X non gérée lors de l'obtention de la liste des tailles d'écran "
+"disponibles"
+
+#: ../libgnome-desktop/gnome-rr.c:478
+#, c-format
+msgid "could not get the range of screen sizes"
+msgstr "impossible d'obtenir la liste des tailles d'écran disponibles"
+
+#: ../libgnome-desktop/gnome-rr.c:769
+#, c-format
+msgid "RANDR extension is not present"
+msgstr "l'extension RANDR n'est pas présente"
+
+#: ../libgnome-desktop/gnome-rr.c:1580
+#, c-format
+msgid "could not get information about output %d"
+msgstr "impossible d'obtenir des informations sur la sortie %d"
+
+#: ../libgnome-desktop/gnome-rr.c:1764
+msgid "Built-in Display"
+msgstr "Affichage intégré"
+
+#. Translators: %s is the size of the monitor in inches
+#: ../libgnome-desktop/gnome-rr.c:1782
+#, c-format
+msgid "%s Display"
+msgstr "Affichage %s"
+
+#: ../libgnome-desktop/gnome-rr.c:1789
+#| msgid "Unknown"
+msgid "Unknown Display"
+msgstr "Affichage inconnu"
+
+#. Translators: the "position", "size", and "maximum"
+#. * words here are not keywords; please translate them
+#. * as usual.  A CRTC is a CRT Controller (this is X terminology)
+#: ../libgnome-desktop/gnome-rr.c:2234
+#, c-format
+msgid ""
+"requested position/size for CRTC %d is outside the allowed limit: position="
+"(%d, %d), size=(%d, %d), maximum=(%d, %d)"
+msgstr ""
+"la taille et la position demandées au CRTC %d sont hors des limites "
+"autorisées : position=(%d, %d), taille=(%d, %d), maximum=(%d, %d)"
+
+#: ../libgnome-desktop/gnome-rr.c:2270
+#, c-format
+msgid "could not set the configuration for CRTC %d"
+msgstr "impossible de définir la configuration pour le CRTC %d"
+
+#: ../libgnome-desktop/gnome-rr.c:2421
+#, c-format
+msgid "could not get information about CRTC %d"
+msgstr "impossible d'obtenir des informations sur le CRTC %d"
+
+#: ../libgnome-desktop/gnome-rr-config.c:708
+#, c-format
+msgid ""
+"none of the saved display configurations matched the active configuration"
+msgstr ""
+"aucune des configurations d'affichage enregistrées ne correspond à la "
+"configuration active"
+
+#: ../libgnome-desktop/gnome-rr-config.c:1464
 #, c-format
 msgid "CRTC %d cannot drive output %s"
 msgstr "le CRTC %d ne peut pas piloter une sortie %s"
 
-#: ../libgnome-desktop/gnome-rr-config.c:796
+#: ../libgnome-desktop/gnome-rr-config.c:1471
 #, c-format
 msgid "output %s does not support mode %dx%d@%dHz"
 msgstr "la sortie %s ne prend pas en charge le mode %dx%d@%dHz"
 
-#: ../libgnome-desktop/gnome-rr-config.c:807
+#: ../libgnome-desktop/gnome-rr-config.c:1482
 #, c-format
-msgid "CRTC %d does not support rotation=%d"
-msgstr "le CRTC %d ne prend pas en charge la rotation = %d"
+msgid "CRTC %d does not support rotation=%s"
+msgstr "le CRTC %d ne prend pas en charge la rotation = %s"
 
-#: ../libgnome-desktop/gnome-rr-config.c:820
+#: ../libgnome-desktop/gnome-rr-config.c:1496
 #, c-format
 msgid ""
 "output %s does not have the same parameters as another cloned output:\n"
 "existing mode = %d, new mode = %d\n"
 "existing coordinates = (%d, %d), new coordinates = (%d, %d)\n"
-"existing rotation = %d, new rotation = %d"
+"existing rotation = %s, new rotation = %s"
 msgstr ""
 "La sortie %s ne possède pas les mêmes paramètres que l'autre sortie clone :\n"
 "mode actuel = %d, nouveau mode = %d\n"
 "coordonnées actuelles = (%d, %d), nouvelles coordonnées = (%d, %d)\n"
-"rotation actuelle = %d, nouvelle rotation = %d"
+"rotation actuelle = %s, nouvelle rotation = %s"
 
-#: ../libgnome-desktop/gnome-rr-config.c:835
+#: ../libgnome-desktop/gnome-rr-config.c:1511
 #, c-format
 msgid "cannot clone to output %s"
 msgstr "impossible de cloner sur la sortie %s"
 
-#: ../libgnome-desktop/gnome-rr-config.c:961
+#: ../libgnome-desktop/gnome-rr-config.c:1680
 #, c-format
 msgid "Trying modes for CRTC %d\n"
 msgstr "Tests des modes pour le CRTC %d\n"
 
-#: ../libgnome-desktop/gnome-rr-config.c:985
+#: ../libgnome-desktop/gnome-rr-config.c:1704
 #, c-format
 msgid "CRTC %d: trying mode %dx%d@%dHz with output at %dx%d@%dHz (pass %d)\n"
 msgstr ""
 "CRTC %d : test du mode %dx%d@%dHz avec une sortie à %dx%d@%dHz (passe %d)\n"
 
-#: ../libgnome-desktop/gnome-rr-config.c:1032
+#: ../libgnome-desktop/gnome-rr-config.c:1751
 #, c-format
 msgid ""
 "could not assign CRTCs to outputs:\n"
@@ -84,7 +165,7 @@
 "impossible d'assigner des CRTC aux sorties :\n"
 "%s"
 
-#: ../libgnome-desktop/gnome-rr-config.c:1036
+#: ../libgnome-desktop/gnome-rr-config.c:1755
 #, c-format
 msgid ""
 "none of the selected modes were compatible with the possible modes:\n"
@@ -96,7 +177,7 @@
 #. Translators: the "requested", "minimum", and
 #. * "maximum" words here are not keywords; please
 #. * translate them as usual.
-#: ../libgnome-desktop/gnome-rr-config.c:1117
+#: ../libgnome-desktop/gnome-rr-config.c:1833
 #, c-format
 msgid ""
 "required virtual size does not fit available size: requested=(%d, %d), "
@@ -107,29 +188,32 @@
 
 #. Translators: This is the time format with full date used
 #. in 24-hour mode.
-#: ../libgnome-desktop/gnome-wall-clock.c:270
-msgid "%a %b %e, %R:%S"
-msgstr "%a %e %b, %R:%S"
+#. The character between %R and %S is U+2236 RATIO
+#: ../libgnome-desktop/gnome-wall-clock.c:268
+msgid "%a %b %e, %R∶%S"
+msgstr "%a %e %b, %R∶%S"
 
-#: ../libgnome-desktop/gnome-wall-clock.c:271
+#: ../libgnome-desktop/gnome-wall-clock.c:269
 msgid "%a %b %e, %R"
 msgstr "%a %e %b, %R"
 
 #. Translators: This is the time format with day used
 #. in 24-hour mode.
-#: ../libgnome-desktop/gnome-wall-clock.c:275
-msgid "%a %R:%S"
-msgstr "%a %R:%S"
+#. The character between %R and %S is U+2236 RATIO
+#: ../libgnome-desktop/gnome-wall-clock.c:274
+msgid "%a %R∶%S"
+msgstr "%a %R∶%S"
 
-#: ../libgnome-desktop/gnome-wall-clock.c:276
+#: ../libgnome-desktop/gnome-wall-clock.c:275
 msgid "%a %R"
 msgstr "%a %R"
 
 #. Translators: This is the time format without date used
 #. in 24-hour mode.
+#. The character between %R and %S is U+2236 RATIO
 #: ../libgnome-desktop/gnome-wall-clock.c:280
-msgid "%R:%S"
-msgstr "%R:%S"
+msgid "%R∶%S"
+msgstr "%R∶%S"
 
 #: ../libgnome-desktop/gnome-wall-clock.c:280
 msgid "%R"
@@ -137,100 +221,39 @@
 
 #. Translators: This is a time format with full date used
 #. for AM/PM.
-#: ../libgnome-desktop/gnome-wall-clock.c:286
-msgid "%a %b %e, %l:%M:%S %p"
-msgstr "%a %e %b, %l:%M:%S %p"
-
-#: ../libgnome-desktop/gnome-wall-clock.c:287
-msgid "%a %b %e, %l:%M %p"
-msgstr "%a %e %b, %l:%M %p"
+#. The Unicode characters are U+2236 RATIO and
+#. U+2009 THIN SPACE
+#: ../libgnome-desktop/gnome-wall-clock.c:288
+msgid "%a %b %e, %l∶%M∶%S %p"
+msgstr "%a %e %b, %l∶%M∶%S %p"
+
+#: ../libgnome-desktop/gnome-wall-clock.c:289
+msgid "%a %b %e, %l∶%M %p"
+msgstr "%a %e %b, %l∶%M %p"
 
 #. Translators: This is a time format with day used
 #. for AM/PM.
-#: ../libgnome-desktop/gnome-wall-clock.c:291
-msgid "%a %l:%M:%S %p"
-msgstr "%a %l:%M:%S %p"
-
-#: ../libgnome-desktop/gnome-wall-clock.c:292
-msgid "%a %l:%M %p"
-msgstr "%a %l:%M %p"
+#. The Unicode characters are U+2236 RATIO and
+#. U+2009 THIN SPACE
+#: ../libgnome-desktop/gnome-wall-clock.c:295
+msgid "%a %l∶%M∶%S %p"
+msgstr "%a %l∶%M∶%S %p"
 
-#. Translators: This is a time format without date used
-#. for AM/PM.
 #: ../libgnome-desktop/gnome-wall-clock.c:296
-msgid "%l:%M:%S %p"
-msgstr "%l:%M:%S %p"
-
-#: ../libgnome-desktop/gnome-wall-clock.c:297
-msgid "%l:%M %p"
-msgstr "%l:%M %p"
-
-#~ msgctxt "Monitor vendor"
-#~ msgid "Unknown"
-#~ msgstr "Inconnu"
-
-#~ msgid "could not get the screen resources (CRTCs, outputs, modes)"
-#~ msgstr "impossible d'obtenir les ressources d'écran (CRTC, sorties, modes)"
-
-#~ msgid "unhandled X error while getting the range of screen sizes"
-#~ msgstr ""
-#~ "erreur X non gérée lors de l'obtention de la liste des tailles d'écran "
-#~ "disponibles"
-
-#~ msgid "could not get the range of screen sizes"
-#~ msgstr "impossible d'obtenir la liste des tailles d'écran disponibles"
-
-#~ msgid "RANDR extension is not present"
-#~ msgstr "l'extension RANDR n'est pas présente"
-
-#~ msgid "could not get information about output %d"
-#~ msgstr "impossible d'obtenir des informations sur la sortie %d"
-
-#~ msgid "Built-in Display"
-#~ msgstr "Affichage intégré"
-
-#~ msgid "%s Display"
-#~ msgstr "Affichage %s"
-
-#~ msgid "Unknown Display"
-#~ msgstr "Affichage inconnu"
-
-#~ msgid ""
-#~ "requested position/size for CRTC %d is outside the allowed limit: "
-#~ "position=(%d, %d), size=(%d, %d), maximum=(%d, %d)"
-#~ msgstr ""
-#~ "la taille et la position demandées au CRTC %d sont hors des limites "
-#~ "autorisées : position=(%d, %d), taille=(%d, %d), maximum=(%d, %d)"
+msgid "%a %l∶%M %p"
+msgstr "%a %l∶%M %p"
 
-#~ msgid "could not set the configuration for CRTC %d"
-#~ msgstr "impossible de définir la configuration pour le CRTC %d"
-
-#~ msgid "could not get information about CRTC %d"
-#~ msgstr "impossible d'obtenir des informations sur le CRTC %d"
-
-#~ msgid ""
-#~ "none of the saved display configurations matched the active configuration"
-#~ msgstr ""
-#~ "aucune des configurations d'affichage enregistrées ne correspond à la "
-#~ "configuration active"
-
-#~ msgid "%a %b %e, %R∶%S"
-#~ msgstr "%a %e %b, %R∶%S"
-
-#~ msgid "%R∶%S"
-#~ msgstr "%R∶%S"
-
-#~ msgid "%a %l∶%M∶%S %p"
-#~ msgstr "%a %l∶%M∶%S %p"
-
-#~ msgid "%a %l∶%M %p"
-#~ msgstr "%a %l∶%M %p"
-
-#~ msgid "%l∶%M∶%S %p"
-#~ msgstr "%l∶%M∶%S %p"
-
-#~ msgid "%l∶%M %p"
-#~ msgstr "%l∶%M %p"
+#. Translators: This is a time format without date used
+#. for AM/PM.
+#. The Unicode characters are U+2236 RATIO and
+#. U+2009 THIN SPACE
+#: ../libgnome-desktop/gnome-wall-clock.c:302
+msgid "%l∶%M∶%S %p"
+msgstr "%l∶%M∶%S %p"
+
+#: ../libgnome-desktop/gnome-wall-clock.c:303
+msgid "%l∶%M %p"
+msgstr "%l∶%M %p"
 
 #~ msgid "Cannot find a terminal, using xterm, even if it may not work"
 #~ msgstr ""
@@ -243,6 +266,15 @@
 #~ msgid "Mirrored Displays"
 #~ msgstr "Écrans clones"
 
+#~ msgid "%R:%S"
+#~ msgstr "%R:%S"
+
+#~ msgid "%l:%M:%S %p"
+#~ msgstr "%l:%M:%S %p"
+
+#~ msgid "%l:%M %p"
+#~ msgstr "%l:%M %p"
+
 #~ msgid "About GNOME"
 #~ msgstr "À propos de GNOME"
 
diff -Nru gnome-desktop3-3.12.0/po/ga.po gnome-desktop3-3.8.4/po/ga.po
--- gnome-desktop3-3.12.0/po/ga.po	2013-11-11 17:23:18.000000000 +0000
+++ gnome-desktop3-3.8.4/po/ga.po	2013-09-04 11:15:57.000000000 +0000
@@ -3,98 +3,282 @@
 # This file is distributed under the same license as the gnome-desktop package.
 # Seán Ó Ceallaigh , 2000.
 # Paul Duffy , 2003.
-# Seán de Búrca , 2007-2013.
+# Seán de Búrca , 2007, 2009.
 #
 msgid ""
 msgstr ""
 "Project-Id-Version: gnome-desktop.master\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-08-16 01:59-0600\n"
-"PO-Revision-Date: 2013-08-16 02:04-0600\n"
+"POT-Creation-Date: 2009-08-21 02:58-0600\n"
+"PO-Revision-Date: 2009-08-21 03:00-0600\n"
 "Last-Translator: Seán de Búrca \n"
 "Language-Team: Irish \n"
-"Language: ga\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=5; plural=n==1 ? 0 : n==2 ? 1 : n<7 ? 2 : n<11 ? 3 : "
-"4;\n"
+"Plural-Forms: nplurals=5; plural=n==1 ? 0 : (n%10==1 || n%10==2) ? 1 : (n"
+"%10>=3 && n%10<= 6) ? 2 : ((n%10>=7 && n%10<=9) || n==10) ? 3 : 4;\n"
 
-#. Translators: "Unknown" here is used to identify a monitor for which
-#. * we don't know the vendor. When a vendor is known, the name of the
-#. * vendor is used.
-#: ../libgnome-desktop/display-name.c:107
-msgctxt "Monitor vendor"
+#: ../gnome-about/gnome-about.desktop.in.in.h:1
+#: ../gnome-about/gnome-about.in:60
+msgid "About GNOME"
+msgstr "Maidir le GNOME"
+
+#: ../gnome-about/gnome-about.desktop.in.in.h:2
+msgid "Learn more about GNOME"
+msgstr "Faigh tuilleadh eolais faoi GNOME"
+
+#: ../gnome-about/gnome-about.in:61
+msgid "News"
+msgstr "Nuacht"
+
+#: ../gnome-about/gnome-about.in:62
+msgid "GNOME Library"
+msgstr "Leabharlann GNOME"
+
+#: ../gnome-about/gnome-about.in:63
+msgid "Friends of GNOME"
+msgstr "Cairde GNOME"
+
+#: ../gnome-about/gnome-about.in:64
+msgid "Contact"
+msgstr "Déan Teagmháil"
+
+#: ../gnome-about/gnome-about.in:68
+msgid "The Mysterious GEGL"
+msgstr "An GEGL Rúndiamhair"
+
+#: ../gnome-about/gnome-about.in:69
+msgid "The Squeaky Rubber GNOME"
+msgstr "An GNOME Rubair Díoscánach"
+
+#: ../gnome-about/gnome-about.in:70
+msgid "Wanda The GNOME Fish"
+msgstr "Wanda an t-Iasc GNOME"
+
+#: ../gnome-about/gnome-about.in:567
+msgid "_Open URL"
+msgstr "_Oscail URL"
+
+#: ../gnome-about/gnome-about.in:574
+msgid "_Copy URL"
+msgstr "_Cóipeáil URL"
+
+#: ../gnome-about/gnome-about.in:826
+msgid "About the GNOME Desktop"
+msgstr "Maidir Leis an Deasc GNOME"
+
+#: ../gnome-about/gnome-about.in:859
+msgid "%(name)s: %(value)s"
+msgstr "%(name)s: %(value)s"
+
+#: ../gnome-about/gnome-about.in:873
+msgid "Welcome to the GNOME Desktop"
+msgstr "Fáilte go dtí an Deasc GNOME"
+
+#: ../gnome-about/gnome-about.in:890
+msgid "Brought to you by:"
+msgstr "Curtha ar fáil duit ag:"
+
+#: ../gnome-about/gnome-about.in:914
+msgid "%(name)s: %(value)s"
+msgstr "%(name)s: %(value)s"
+
+#: ../gnome-about/gnome-about.in:975
+msgid "Version"
+msgstr "Leagan"
+
+#: ../gnome-about/gnome-about.in:977
+msgid "Distributor"
+msgstr "Dáileoir"
+
+#: ../gnome-about/gnome-about.in:979
+msgid "Build Date"
+msgstr "Dáta Tógála"
+
+#: ../gnome-about/gnome-about.in:1024
+msgid "Display information on this GNOME version"
+msgstr "Taispeáin eolas faoin leagan GNOME seo"
+
+#: ../gnome-version.xml.in.in.h:1
+msgid ""
+"GNOME also includes a complete development platform for applications "
+"programmers, allowing the creation of powerful and complex applications."
+msgstr ""
+"Tá ardán forbartha iomlán do ríomhchláraitheoirí feidhmchlár curtha san "
+"áireamh i GNOME chomh maith, a ligeann cruthú feidhmchlár cumhachtacha "
+"coimpléascacha."
+
+#: ../gnome-version.xml.in.in.h:2
+msgid ""
+"GNOME includes most of what you see on your computer, including the file "
+"manager, web browser, menus, and many applications."
+msgstr ""
+"Tá an chuid is mó de na rudaí a fheiceann tú ar do ríomhaire curtha san "
+"áireamh i GNOME, an bainisteoir comhad, an brabhsálaí gréasáin, na "
+"roghchláir, agus cuid mhór feidhmchlár san áireamh."
+
+#. NOTE TO AUTHORS: Do not put anything in the following paragraphs that
+#. will be substituted by the configure script. Otherwise you will break
+#. the translations.
+#: ../gnome-version.xml.in.in.h:6
+msgid ""
+"GNOME is a Free, usable, stable, accessible desktop environment for the Unix-"
+"like family of operating systems."
+msgstr ""
+"Is timpeallacht deisce Saor inúsáidte cobhsaí inrochtana é GNOME don "
+"teaghlach chóras oibriúcháin cosúil le Unix."
+
+#: ../gnome-version.xml.in.in.h:7
+msgid ""
+"GNOME's focus on usability and accessibility, regular release cycle, and "
+"strong corporate backing make it unique among Free Software desktops."
+msgstr ""
+"Tá GNOME leithleach i measc na deasc Bogearraí Saor mar gheall ar a fhócas "
+"ar inúsáidteacht agus ar inrochtaineacht, a thimthriall eisiúna rialta, agus "
+"a thacaíocht chorporáide láidir."
+
+#: ../gnome-version.xml.in.in.h:8
+msgid ""
+"GNOME's greatest strength is our strong community. Virtually anyone, with or "
+"without coding skills, can contribute to making GNOME better."
+msgstr ""
+"Is é an neart GNOME is mó ná ár gcomhphobal láidir. Is féidir le hionann is "
+"duine ar bith, le scileanna códaithe nó gan, páirt a ghlacadh chun GNOME a "
+"fheabhsú."
+
+#: ../gnome-version.xml.in.in.h:9
+msgid ""
+"Hundreds of people have contributed code to GNOME since it was started in "
+"1997; many more have contributed in other important ways, including "
+"translations, documentation, and quality assurance."
+msgstr ""
+"Thug na céadta daoine cód do GNOME ó thosaíodh é i 1997; ghlac cuid mhór "
+"eile páirt ar chaíonna tábhachtacha eile, aistriúcháin, doiciméadú, agus "
+"dearbhú cáilíochta san áireamh."
+
+#: ../libgnome-desktop/display-name.c:262
+msgid "Laptop"
+msgstr "Ríomhaire glúine"
+
+#: ../libgnome-desktop/display-name.c:270
 msgid "Unknown"
 msgstr "Anaithnid"
 
-#: ../libgnome-desktop/gnome-languages.c:804
-msgid "Unspecified"
-msgstr "Gan sonrú"
+#: ../libgnome-desktop/gnome-desktop-item.c:220
+#, c-format
+msgid "Error reading file '%s': %s"
+msgstr "Earráid agus comhad '%s' á léamh: %s"
+
+#: ../libgnome-desktop/gnome-desktop-item.c:288
+#, c-format
+msgid "Error rewinding file '%s': %s"
+msgstr "Earráid agus comhad '%s' á atochras: %s"
+
+#: ../libgnome-desktop/gnome-desktop-item.c:377
+#: ../libgnome-desktop/gnome-desktop-item.c:3519
+msgid "No name"
+msgstr "Gan ainm"
 
-#. Translators: a CRTC is a CRT Controller (this is X terminology).
-#: ../libgnome-desktop/gnome-rr.c:452
+#: ../libgnome-desktop/gnome-desktop-item.c:604
+#, c-format
+msgid "File '%s' is not a regular file or directory."
+msgstr "Ní gnáthchomhad nó gnáthfhillteán é '%s'."
+
+#: ../libgnome-desktop/gnome-desktop-item.c:788
+#, c-format
+msgid "Error cannot find file id '%s'"
+msgstr "Earráid: ní féidir ca comhaid '%s' a fháil"
+
+#: ../libgnome-desktop/gnome-desktop-item.c:834
+#, c-format
+msgid "No filename to save to"
+msgstr "Gan ainm comhaid a shábháil go"
+
+#: ../libgnome-desktop/gnome-desktop-item.c:1819
+#, c-format
+msgid "Starting %s"
+msgstr "%s á Thosú"
+
+#: ../libgnome-desktop/gnome-desktop-item.c:2055
+#, c-format
+msgid "No URL to launch"
+msgstr "Gan URL a thosú"
+
+#: ../libgnome-desktop/gnome-desktop-item.c:2071
+#, c-format
+msgid "Not a launchable item"
+msgstr "Ní mír inthosaithe"
+
+#: ../libgnome-desktop/gnome-desktop-item.c:2081
+#, c-format
+msgid "No command (Exec) to launch"
+msgstr "Gan órdu (Exec) a thosú"
+
+#: ../libgnome-desktop/gnome-desktop-item.c:2094
+#, c-format
+msgid "Bad command (Exec) to launch"
+msgstr "Drochordú (Exec) a thosú"
+
+#: ../libgnome-desktop/gnome-desktop-item.c:3575
+#, c-format
+msgid "Unknown encoding of: %s"
+msgstr "Ionchódú anaithnid de: %s"
+
+#: ../libgnome-desktop/gnome-desktop-utils.c:133
+msgid "Cannot find a terminal, using xterm, even if it may not work"
+msgstr ""
+"Ní féidir teirminéal, agus xterm á úsáid, a aimsiú, cé go mb'fhéidir go "
+"oibríonn sé"
+
+#: ../libgnome-desktop/gnome-rr.c:405
 #, c-format
 msgid "could not get the screen resources (CRTCs, outputs, modes)"
 msgstr "níorbh fhéidir acmhainní an scáileáin a fháil (CRTCanna, aschur, móid)"
 
-#: ../libgnome-desktop/gnome-rr.c:472
+#: ../libgnome-desktop/gnome-rr.c:425
 #, c-format
 msgid "unhandled X error while getting the range of screen sizes"
 msgstr "earráid X gan láimhseáil agus raon méideanna scáileáin á fháil"
 
-#: ../libgnome-desktop/gnome-rr.c:478
+#: ../libgnome-desktop/gnome-rr.c:431
 #, c-format
 msgid "could not get the range of screen sizes"
 msgstr "níorbh fhéidir raon méideanna scáileáin a fháil"
 
-#: ../libgnome-desktop/gnome-rr.c:769
+#: ../libgnome-desktop/gnome-rr.c:657
 #, c-format
 msgid "RANDR extension is not present"
 msgstr "níl an eisínteacht RANDR ann"
 
-#: ../libgnome-desktop/gnome-rr.c:1580
+#: ../libgnome-desktop/gnome-rr.c:923
 #, c-format
 msgid "could not get information about output %d"
 msgstr "níorbh fhéidir eolas a fháil faoi aschur %d"
 
-#: ../libgnome-desktop/gnome-rr.c:1764
-msgid "Built-in Display"
-msgstr "Taispeáint Ionsuite"
-
-#. Translators: %s is the size of the monitor in inches
-#: ../libgnome-desktop/gnome-rr.c:1782
-#, c-format
-msgid "%s Display"
-msgstr "Taispeáint %s"
-
-#: ../libgnome-desktop/gnome-rr.c:1789
-msgid "Unknown Display"
-msgstr "Taispeáint Anaithnid"
-
 #. Translators: the "position", "size", and "maximum"
 #. * words here are not keywords; please translate them
 #. * as usual.  A CRTC is a CRT Controller (this is X terminology)
-#: ../libgnome-desktop/gnome-rr.c:2234
+#: ../libgnome-desktop/gnome-rr.c:1261
 #, c-format
 msgid ""
-"requested position/size for CRTC %d is outside the allowed limit: "
-"position=(%d, %d), size=(%d, %d), maximum=(%d, %d)"
+"requested position/size for CRTC %d is outside the allowed limit: position="
+"(%d, %d), size=(%d, %d), maximum=(%d, %d)"
 msgstr ""
-"tá an ionad/mhéid iarrtha don CRTC %d lasmuigh den teorainn ceadaithe: "
-"ionad=(%d, %d), méid=(%d, %d), uasta=(%d, %d)"
+"tá an ionad/mhéid iarrtha don CRTC %d lasmuigh den teorainn ceadaithe: ionad="
+"(%d, %d), méid=(%d, %d), uasta=(%d, %d)"
 
-#: ../libgnome-desktop/gnome-rr.c:2268
+#: ../libgnome-desktop/gnome-rr.c:1297
 #, c-format
 msgid "could not set the configuration for CRTC %d"
 msgstr "níorbh fhéidir an chumraíocht a shocrú do CRTC %d"
 
-#: ../libgnome-desktop/gnome-rr.c:2422
+#: ../libgnome-desktop/gnome-rr.c:1409
 #, c-format
 msgid "could not get information about CRTC %d"
 msgstr "níorbh fhéidir eolas a fháil faoi CRTC %d"
 
-#: ../libgnome-desktop/gnome-rr-config.c:708
+#: ../libgnome-desktop/gnome-rr-config.c:1159
 #, c-format
 msgid ""
 "none of the saved display configurations matched the active configuration"
@@ -102,127 +286,69 @@
 "ní raibh aon ag na cumraíochtaí taispeána sábháilte comhoiriúnach don "
 "chumraíocht ghníomhach"
 
-#: ../libgnome-desktop/gnome-rr-config.c:1464
-#, c-format
-msgid "CRTC %d cannot drive output %s"
-msgstr ""
-
-#: ../libgnome-desktop/gnome-rr-config.c:1471
-#, c-format
-msgid "output %s does not support mode %dx%d@%dHz"
-msgstr ""
-
-#: ../libgnome-desktop/gnome-rr-config.c:1482
-#, c-format
-msgid "CRTC %d does not support rotation=%s"
-msgstr ""
-
-#: ../libgnome-desktop/gnome-rr-config.c:1496
-#, c-format
-msgid ""
-"output %s does not have the same parameters as another cloned output:\n"
-"existing mode = %d, new mode = %d\n"
-"existing coordinates = (%d, %d), new coordinates = (%d, %d)\n"
-"existing rotation = %s, new rotation = %s"
-msgstr ""
-
-#: ../libgnome-desktop/gnome-rr-config.c:1511
-#, c-format
-msgid "cannot clone to output %s"
-msgstr ""
-
-#: ../libgnome-desktop/gnome-rr-config.c:1680
-#, c-format
-msgid "Trying modes for CRTC %d\n"
-msgstr ""
-
-#: ../libgnome-desktop/gnome-rr-config.c:1704
-#, c-format
-msgid "CRTC %d: trying mode %dx%d@%dHz with output at %dx%d@%dHz (pass %d)\n"
-msgstr ""
-
-#: ../libgnome-desktop/gnome-rr-config.c:1751
-#, c-format
-msgid ""
-"could not assign CRTCs to outputs:\n"
-"%s"
-msgstr ""
-
-#: ../libgnome-desktop/gnome-rr-config.c:1755
-#, c-format
-msgid ""
-"none of the selected modes were compatible with the possible modes:\n"
-"%s"
-msgstr ""
-
 #. Translators: the "requested", "minimum", and
 #. * "maximum" words here are not keywords; please
 #. * translate them as usual.
-#: ../libgnome-desktop/gnome-rr-config.c:1833
+#: ../libgnome-desktop/gnome-rr-config.c:1682
 #, c-format
 msgid ""
 "required virtual size does not fit available size: requested=(%d, %d), "
 "minimum=(%d, %d), maximum=(%d, %d)"
 msgstr ""
-"ní oiriúnaíonn an mhéid fhíorúil riachtanach an mhéid atá le fáil: "
-"iarrtha=(%d, %d), íosta=(%d, %d), uasta=(%d, %d)"
+"ní oiriúnaíonn an mhéid fhíorúil riachtanach an mhéid atá le fáil: iarrtha="
+"(%d, %d), íosta=(%d, %d), uasta=(%d, %d)"
+
+#: ../libgnome-desktop/gnome-rr-config.c:1696
+#, c-format
+msgid "could not find a suitable configuration of screens"
+msgstr "níorbh fhéidir cumraíocht scáileán oiriúnach a aimsiú"
+
+#. Keep this string in sync with gnome-control-center/capplets/display/xrandr-capplet.c:get_display_name()
+#. Translators:  this is the feature where what you see on your laptop's
+#. * screen is the same as your external monitor.  Here, "Mirror" is being
+#. * used as an adjective, not as a verb.  For example, the Spanish
+#. * translation could be "Pantallas en Espejo", *not* "Espejar Pantallas".
+#.
+#: ../libgnome-desktop/gnome-rr-labeler.c:210
+msgid "Mirror Screens"
+msgstr "Scáileáin Scáthánaithe"
 
-#. Translators: This is the time format with full date used
+#. Translators: This is the time format with date used
 #. in 24-hour mode.
-#: ../libgnome-desktop/gnome-wall-clock.c:270
+#: ../js/ui/dateMenu.js:162
 msgid "%a %b %e, %R:%S"
 msgstr "%a %e %b, %R:%S"
 
-#: ../libgnome-desktop/gnome-wall-clock.c:271
+#: ../js/ui/dateMenu.js:163
 msgid "%a %b %e, %R"
 msgstr "%a %e %b, %R"
 
-#. Translators: This is the time format with day used
+#. Translators: This is the time format without date used
 #. in 24-hour mode.
-#: ../libgnome-desktop/gnome-wall-clock.c:275
+#: ../js/ui/dateMenu.js:167
 msgid "%a %R:%S"
 msgstr "%a %R:%S"
 
-#: ../libgnome-desktop/gnome-wall-clock.c:276
+#: ../js/ui/dateMenu.js:168
 msgid "%a %R"
 msgstr "%a %R"
 
-#. Translators: This is the time format without date used
-#. in 24-hour mode.
-#: ../libgnome-desktop/gnome-wall-clock.c:280
-msgid "%R:%S"
-msgstr "%R:%S"
-
-#: ../libgnome-desktop/gnome-wall-clock.c:280
-msgid "%R"
-msgstr "%R"
-
-#. Translators: This is a time format with full date used
+#. Translators: This is a time format with date used
 #. for AM/PM.
-#: ../libgnome-desktop/gnome-wall-clock.c:286
+#: ../js/ui/dateMenu.js:175
 msgid "%a %b %e, %l:%M:%S %p"
 msgstr "%a %e %b, %l:%M:%S %p"
 
-#: ../libgnome-desktop/gnome-wall-clock.c:287
+#: ../js/ui/dateMenu.js:176
 msgid "%a %b %e, %l:%M %p"
 msgstr "%a %e %b, %l:%M %p"
 
-#. Translators: This is a time format with day used
+#. Translators: This is a time format without date used
 #. for AM/PM.
-#: ../libgnome-desktop/gnome-wall-clock.c:291
+#: ../js/ui/dateMenu.js:180
 msgid "%a %l:%M:%S %p"
 msgstr "%a %l:%M:%S %p"
 
-#: ../libgnome-desktop/gnome-wall-clock.c:292
+#: ../js/ui/dateMenu.js:181
 msgid "%a %l:%M %p"
 msgstr "%a %l:%M %p"
-
-#. Translators: This is a time format without date used
-#. for AM/PM.
-#: ../libgnome-desktop/gnome-wall-clock.c:296
-msgid "%l:%M:%S %p"
-msgstr "%l:%M:%S %p"
-
-#: ../libgnome-desktop/gnome-wall-clock.c:297
-msgid "%l:%M %p"
-msgstr "%l:%M %p"
diff -Nru gnome-desktop3-3.12.0/po/gd.po gnome-desktop3-3.8.4/po/gd.po
--- gnome-desktop3-3.12.0/po/gd.po	2014-02-03 15:41:40.000000000 +0000
+++ gnome-desktop3-3.8.4/po/gd.po	1970-01-01 00:00:00.000000000 +0000
@@ -1,252 +0,0 @@
-# Gaelic; Scottish translation for gnome-desktop3
-# Copyright (c) 2011 Rosetta Contributors and Canonical Ltd 2011
-# This file is distributed under the same license as the gnome-desktop3 package.
-# FIRST AUTHOR , 2011.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: gnome-desktop3\n"
-"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=gnome-desktop&keywords=I18N+L10N&component=general\n"
-"POT-Creation-Date: 2013-09-14 22:42+0000\n"
-"PO-Revision-Date: 2013-09-17 11:38+0100\n"
-"Last-Translator: GunChleoc \n"
-"Language-Team: Gaelic; Scottish \n"
-"Language: \n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-09-15 06:28+0000\n"
-"X-Generator: Launchpad (build 16761)\n"
-
-#: ../libgnome-desktop/gnome-languages.c:804
-msgid "Unspecified"
-msgstr "Cha deach gin a shònrachadh"
-
-#: ../libgnome-desktop/gnome-rr-config.c:743
-#, c-format
-msgid "CRTC %d cannot drive output %s"
-msgstr "chan urrainn do CRTC %d an às-chur %s a chleachdadh"
-
-#: ../libgnome-desktop/gnome-rr-config.c:750
-#, c-format
-msgid "output %s does not support mode %dx%d@%dHz"
-msgstr "cha toir an t-às-chur %s taic dhan mhodh %dx%d@%dHz"
-
-#: ../libgnome-desktop/gnome-rr-config.c:761
-#, c-format
-msgid "CRTC %d does not support rotation=%d"
-msgstr "cha toir CRTC %d taic ri cuairteachadh=%d"
-
-#: ../libgnome-desktop/gnome-rr-config.c:774
-#, c-format
-msgid ""
-"output %s does not have the same parameters as another cloned output:\n"
-"existing mode = %d, new mode = %d\n"
-"existing coordinates = (%d, %d), new coordinates = (%d, %d)\n"
-"existing rotation = %d, new rotation = %d"
-msgstr ""
-"chan eil na h-aon roghainnean aig an às-chur %s 's a tha air às-chur clònaichte eile:\n"
-"am modh làithreach = %d, am modh ùr = %d\n"
-"na co-chomharran làithreach = (%d, %d), na co-chomharran ùra = (%d, %d)\n"
-"an cuairteachadh làithreach = %d, an cuairteachadh ùr = %d"
-
-#: ../libgnome-desktop/gnome-rr-config.c:789
-#, c-format
-msgid "cannot clone to output %s"
-msgstr "chan urrainn dhuinn clònachadh gun às-chur %s"
-
-#: ../libgnome-desktop/gnome-rr-config.c:915
-#, c-format
-msgid "Trying modes for CRTC %d\n"
-msgstr "A' feuchainn na modhan airson CRTC %d\n"
-
-#: ../libgnome-desktop/gnome-rr-config.c:939
-#, c-format
-msgid "CRTC %d: trying mode %dx%d@%dHz with output at %dx%d@%dHz (pass %d)\n"
-msgstr "CRTC %d: a' feuchainn am modh %dx%d@%dHz leis an às-chur aig %dx%d@%dHz (pas %d)\n"
-
-#: ../libgnome-desktop/gnome-rr-config.c:986
-#, c-format
-msgid ""
-"could not assign CRTCs to outputs:\n"
-"%s"
-msgstr ""
-"cha deach leinn na CRTCan a shònrachadh dhan às-chur:\n"
-"%s"
-
-#: ../libgnome-desktop/gnome-rr-config.c:990
-#, c-format
-msgid ""
-"none of the selected modes were compatible with the possible modes:\n"
-"%s"
-msgstr ""
-"cha robh gin dhe na modhan a chaidh a thaghadh co-chòrdail air na modhan a ghabhas cleachdadh:\n"
-"%s"
-
-#. Translators: the "requested", "minimum", and
-#. * "maximum" words here are not keywords; please
-#. * translate them as usual.
-#: ../libgnome-desktop/gnome-rr-config.c:1071
-#, c-format
-msgid "required virtual size does not fit available size: requested=(%d, %d), minimum=(%d, %d), maximum=(%d, %d)"
-msgstr "tha am meud biortail a chaidh iarraidh ro mhòr airson a' mheud a tha ri làimh: air iarraidh=(%d, %d), am fear as lugha=(%d, %d), am fear as motha=(%d, %d)"
-
-#. Translators: This is the time format with full date used
-#. in 24-hour mode.
-#: ../libgnome-desktop/gnome-wall-clock.c:270
-msgid "%a %b %e, %R:%S"
-msgstr "%a %b %e, %R:%S"
-
-#: ../libgnome-desktop/gnome-wall-clock.c:271
-msgid "%a %b %e, %R"
-msgstr "%a %b %e, %R"
-
-#. Translators: This is the time format with day used
-#. in 24-hour mode.
-#: ../libgnome-desktop/gnome-wall-clock.c:275
-msgid "%a %R:%S"
-msgstr "%a %R:%S"
-
-#: ../libgnome-desktop/gnome-wall-clock.c:276
-msgid "%a %R"
-msgstr "%a %R"
-
-#. Translators: This is the time format without date used
-#. in 24-hour mode.
-#: ../libgnome-desktop/gnome-wall-clock.c:280
-msgid "%R:%S"
-msgstr "%R:%S"
-
-#: ../libgnome-desktop/gnome-wall-clock.c:280
-msgid "%R"
-msgstr "%R"
-
-#. Translators: This is a time format with full date used
-#. for AM/PM.
-#: ../libgnome-desktop/gnome-wall-clock.c:286
-msgid "%a %b %e, %l:%M:%S %p"
-msgstr "%a %b %e, %l:%M:%S %p"
-
-#: ../libgnome-desktop/gnome-wall-clock.c:287
-msgid "%a %b %e, %l:%M %p"
-msgstr "%a %b %e, %l:%M %p"
-
-#. Translators: This is a time format with day used
-#. for AM/PM.
-#: ../libgnome-desktop/gnome-wall-clock.c:291
-msgid "%a %l:%M:%S %p"
-msgstr "%a %l:%M:%S %p"
-
-#: ../libgnome-desktop/gnome-wall-clock.c:292
-msgid "%a %l:%M %p"
-msgstr "%a %l:%M %p"
-
-#. Translators: This is a time format without date used
-#. for AM/PM.
-#: ../libgnome-desktop/gnome-wall-clock.c:296
-msgid "%l:%M:%S %p"
-msgstr "%l:%M:%S %p"
-
-#: ../libgnome-desktop/gnome-wall-clock.c:297
-msgid "%l:%M %p"
-msgstr "%l:%M %p"
-
-#~ msgctxt "Monitor vendor"
-
-#~ msgid "Unknown"
-#~ msgstr "Chan eil fhios"
-
-#~ msgid "could not get the screen resources (CRTCs, outputs, modes)"
-#~ msgstr ""
-#~ "cha b' urrainn dhuinn goireasan na sgrìn fhaighinn (CRTCan, às-chur, "
-#~ "modhan)"
-
-#~ msgid "unhandled X error while getting the range of screen sizes"
-#~ msgstr ""
-#~ "thachair mearachd X gun làimhseachadh nuair a fhuair sinn an rainse dhe "
-#~ "mheudan sgrìn"
-
-#~ msgid "could not get the range of screen sizes"
-#~ msgstr "cha b' urrainn dhuinn an rainse dhe mheudan sgrìn fhaighinn"
-
-#~ msgid "RANDR extension is not present"
-#~ msgstr "chan eil an leudachan RANDR ann"
-
-#~ msgid "could not get information about output %d"
-#~ msgstr "cha b' urrainn dhuinn fiosrachadh fhaighinn mun às-chur %d"
-
-#~ msgid "Built-in Display"
-#~ msgstr "Sgrìn na bhroinn"
-
-#~ msgid "%s Display"
-#~ msgstr "Sgrìn %s"
-
-#~ msgid "Unknown Display"
-#~ msgstr "Sgrìn neo-aithnichte"
-
-#~ msgid ""
-#~ "requested position/size for CRTC %d is outside the allowed limit: "
-#~ "position=(%d, %d), size=(%d, %d), maximum=(%d, %d)"
-#~ msgstr ""
-#~ "tha an t-ionad/meud airson CRTC %d a chaidh iarraidh tabh a-muigh nan "
-#~ "crìochan ceadaichte: ionad=(%d, %d), meud=(%d, %d), am fear as motha=(%d, "
-#~ "%d)"
-
-#~ msgid "could not set the configuration for CRTC %d"
-#~ msgstr "cha b' urrainn dhuinn an rèiteachadh airson CRTC %d a shuidheachadh"
-
-#~ msgid "could not get information about CRTC %d"
-#~ msgstr "cha b' urrainn dhuinn fiosrachadh fhaighinn mun CRTC %d"
-
-#~ msgid ""
-#~ "none of the saved display configurations matched the active configuration"
-#~ msgstr ""
-#~ "Cha do fhreagair gin dhe na rèiteachaidhean sgrìn air an sàbhaladh ris an "
-#~ "rèiteachadh ghnìomhach"
-
-#~ msgid ""
-#~ "Requested size (%d, %d) exceeds 3D hardware limit (%d, %d).\n"
-#~ "You must either rearrange the displays so that they fit within a (%d, %d) "
-#~ "square."
-#~ msgstr ""
-#~ "Tha am meud a chaidh iarraidh (%d, %d) nas motha na cuingeachaidhean a' "
-#~ "bhathair-chruaidh 3D (%d, %d).\n"
-#~ "Feumaidh tu òrdugh ùr a chur air na sgrìnichean ach am bith iad beag gu "
-#~ "leòr airson ceàrnag dhe (%d, %d)."
-
-#~ msgid "%a %b %e, %R∶%S"
-#~ msgstr "%a %b %e, %R∶%S"
-
-#~ msgid "%a %R∶%S"
-#~ msgstr "%a %R∶%S"
-
-#~ msgid "%R∶%S"
-#~ msgstr "%R∶%S"
-
-#~ msgid "%a %b %e, %l∶%M∶%S %p"
-#~ msgstr "%a %b %e, %l∶%M∶%S %p"
-
-#~ msgid "%a %b %e, %l∶%M %p"
-#~ msgstr "%a %b %e, %l∶%M %p"
-
-#~ msgid "%a %l∶%M∶%S %p"
-#~ msgstr "%a %l∶%M∶%S %p"
-
-#~ msgid "%a %l∶%M %p"
-#~ msgstr "%a %l∶%M %p"
-
-#~ msgid "%l∶%M∶%S %p"
-#~ msgstr "%l∶%M∶%S %p"
-
-#~ msgid "%l∶%M %p"
-#~ msgstr "%l∶%M %p"
-
-#~ msgid "Cannot find a terminal, using xterm, even if it may not work"
-#~ msgstr ""
-#~ "Chan fhaigh lorg air tèirmineal. cleachdadh xterm. 's dòcha nach obraich e"
-
-#~ msgid "Laptop"
-#~ msgstr "Coimpiutair glùin"
-
-#~ msgid "Mirrored Displays"
-#~ msgstr "Taisbeanan sgàthanaichte"
diff -Nru gnome-desktop3-3.12.0/po/gl.po gnome-desktop3-3.8.4/po/gl.po
--- gnome-desktop3-3.12.0/po/gl.po	2013-11-11 17:23:18.000000000 +0000
+++ gnome-desktop3-3.8.4/po/gl.po	2013-09-04 11:15:57.000000000 +0000
@@ -17,8 +17,8 @@
 msgstr ""
 "Project-Id-Version: gnome-desktop-master-po-gl-54183.merged\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-08-21 00:53+0200\n"
-"PO-Revision-Date: 2013-08-21 00:54+0200\n"
+"POT-Creation-Date: 2013-03-07 15:58+0100\n"
+"PO-Revision-Date: 2013-03-07 15:59+0200\n"
 "Last-Translator: Fran Dieguez \n"
 "Language-Team: gnome-l10n-gl@gnome.org\n"
 "Language: gl\n"
@@ -29,55 +29,135 @@
 "X-Generator: Virtaal 0.7.1\n"
 "X-Project-Style: gnome\n"
 
+#. Translators: "Unknown" here is used to identify a monitor for which
+#. * we don't know the vendor. When a vendor is known, the name of the
+#. * vendor is used.
+#: ../libgnome-desktop/display-name.c:107
+msgctxt "Monitor vendor"
+msgid "Unknown"
+msgstr "Descoñecido"
+
 #: ../libgnome-desktop/gnome-languages.c:804
 msgid "Unspecified"
 msgstr "Non especificado"
 
-#: ../libgnome-desktop/gnome-rr-config.c:743
+#. Translators: a CRTC is a CRT Controller (this is X terminology).
+#: ../libgnome-desktop/gnome-rr.c:452
+#, c-format
+msgid "could not get the screen resources (CRTCs, outputs, modes)"
+msgstr "non foi posíbel obter os recursos da pantalla (CRTC, saídas, modos)"
+
+#: ../libgnome-desktop/gnome-rr.c:472
+#, c-format
+msgid "unhandled X error while getting the range of screen sizes"
+msgstr ""
+"produciuse un erro de X non manipulado ao obter o intervalo de tamaños de "
+"pantalla"
+
+#: ../libgnome-desktop/gnome-rr.c:478
+#, c-format
+msgid "could not get the range of screen sizes"
+msgstr "non foi posíbel obter o intervalo de tamaños de pantalla"
+
+#: ../libgnome-desktop/gnome-rr.c:769
+#, c-format
+msgid "RANDR extension is not present"
+msgstr "A extensión RANDR non está presente"
+
+#: ../libgnome-desktop/gnome-rr.c:1580
+#, c-format
+msgid "could not get information about output %d"
+msgstr "non foi posíbel obter información sobre a saída %d"
+
+#: ../libgnome-desktop/gnome-rr.c:1764
+msgid "Built-in Display"
+msgstr "Pantalla embebida"
+
+#. Translators: %s is the size of the monitor in inches
+#: ../libgnome-desktop/gnome-rr.c:1782
+#, c-format
+msgid "%s Display"
+msgstr "Pantalla %s"
+
+#: ../libgnome-desktop/gnome-rr.c:1789
+msgid "Unknown Display"
+msgstr "Pantalla descoñecida"
+
+#. Translators: the "position", "size", and "maximum"
+#. * words here are not keywords; please translate them
+#. * as usual.  A CRTC is a CRT Controller (this is X terminology)
+#: ../libgnome-desktop/gnome-rr.c:2234
+#, c-format
+msgid ""
+"requested position/size for CRTC %d is outside the allowed limit: position="
+"(%d, %d), size=(%d, %d), maximum=(%d, %d)"
+msgstr ""
+"a posición ou tamaño solicitados ao CRTC %d está fóra do límite permitido: "
+"posición=(%d, %d), tamaño=(%d, %d), máximo=(%d, %d)"
+
+#: ../libgnome-desktop/gnome-rr.c:2270
+#, c-format
+msgid "could not set the configuration for CRTC %d"
+msgstr "non foi posíbel definir a configuración do CRTC %d"
+
+#: ../libgnome-desktop/gnome-rr.c:2421
+#, c-format
+msgid "could not get information about CRTC %d"
+msgstr "non foi posíbel obter información sobre o CRTC %d"
+
+#: ../libgnome-desktop/gnome-rr-config.c:708
+#, c-format
+msgid ""
+"none of the saved display configurations matched the active configuration"
+msgstr ""
+"ningunha das configuracións de pantalla gardadas coincide coa configuración "
+"activa"
+
+#: ../libgnome-desktop/gnome-rr-config.c:1464
 #, c-format
 msgid "CRTC %d cannot drive output %s"
 msgstr "o CRTC %d non pode conducir a saída %s"
 
-#: ../libgnome-desktop/gnome-rr-config.c:750
+#: ../libgnome-desktop/gnome-rr-config.c:1471
 #, c-format
 msgid "output %s does not support mode %dx%d@%dHz"
 msgstr "a saída %s non admite o modo %dx%d@%dHz"
 
-#: ../libgnome-desktop/gnome-rr-config.c:761
+#: ../libgnome-desktop/gnome-rr-config.c:1482
 #, c-format
-msgid "CRTC %d does not support rotation=%d"
-msgstr "CRTC %d non admite rotation=%d"
+msgid "CRTC %d does not support rotation=%s"
+msgstr "CRTC %d non é admite rotation=%s"
 
-#: ../libgnome-desktop/gnome-rr-config.c:774
+#: ../libgnome-desktop/gnome-rr-config.c:1496
 #, c-format
 msgid ""
 "output %s does not have the same parameters as another cloned output:\n"
 "existing mode = %d, new mode = %d\n"
 "existing coordinates = (%d, %d), new coordinates = (%d, %d)\n"
-"existing rotation = %d, new rotation = %d"
+"existing rotation = %s, new rotation = %s"
 msgstr ""
 "a saída %s non ten os mesmos parámetros que a outra saída clonada:\n"
 "modo existente = %d, new mode = %d\n"
 "coordenadas existentes = (%d, %d), novas coordenadas = (%d, %d)\n"
-"rotación existente = %d, nova rotación = %d"
+"rotación existente = %s, nova rotación = %s"
 
-#: ../libgnome-desktop/gnome-rr-config.c:789
+#: ../libgnome-desktop/gnome-rr-config.c:1511
 #, c-format
 msgid "cannot clone to output %s"
 msgstr "non é posíbel clonar a saída %s"
 
-#: ../libgnome-desktop/gnome-rr-config.c:915
+#: ../libgnome-desktop/gnome-rr-config.c:1680
 #, c-format
 msgid "Trying modes for CRTC %d\n"
 msgstr "Tentando os modos para CRTC %d\n"
 
-#: ../libgnome-desktop/gnome-rr-config.c:939
+#: ../libgnome-desktop/gnome-rr-config.c:1704
 #, c-format
 msgid "CRTC %d: trying mode %dx%d@%dHz with output at %dx%d@%dHz (pass %d)\n"
 msgstr ""
 "CRTC %d: tentando o modo %dx%d@%dHz coa saída en %dx%d@%dHz (paso %d)\n"
 
-#: ../libgnome-desktop/gnome-rr-config.c:986
+#: ../libgnome-desktop/gnome-rr-config.c:1751
 #, c-format
 msgid ""
 "could not assign CRTCs to outputs:\n"
@@ -86,7 +166,7 @@
 "non foi posíbel asignar os CRTC a saídas:\n"
 "%s"
 
-#: ../libgnome-desktop/gnome-rr-config.c:990
+#: ../libgnome-desktop/gnome-rr-config.c:1755
 #, c-format
 msgid ""
 "none of the selected modes were compatible with the possible modes:\n"
@@ -98,7 +178,7 @@
 #. Translators: the "requested", "minimum", and
 #. * "maximum" words here are not keywords; please
 #. * translate them as usual.
-#: ../libgnome-desktop/gnome-rr-config.c:1071
+#: ../libgnome-desktop/gnome-rr-config.c:1833
 #, c-format
 msgid ""
 "required virtual size does not fit available size: requested=(%d, %d), "
@@ -109,29 +189,32 @@
 
 #. Translators: This is the time format with full date used
 #. in 24-hour mode.
-#: ../libgnome-desktop/gnome-wall-clock.c:270
-msgid "%a %b %e, %R:%S"
+#. The character between %R and %S is U+2236 RATIO
+#: ../libgnome-desktop/gnome-wall-clock.c:268
+msgid "%a %b %e, %R∶%S"
 msgstr "%a %e de %b, %R:%S"
 
-#: ../libgnome-desktop/gnome-wall-clock.c:271
+#: ../libgnome-desktop/gnome-wall-clock.c:269
 msgid "%a %b %e, %R"
 msgstr "%a %e de %b, %R"
 
 #. Translators: This is the time format with day used
 #. in 24-hour mode.
-#: ../libgnome-desktop/gnome-wall-clock.c:275
-msgid "%a %R:%S"
+#. The character between %R and %S is U+2236 RATIO
+#: ../libgnome-desktop/gnome-wall-clock.c:274
+msgid "%a %R∶%S"
 msgstr "%a %R:%S"
 
-#: ../libgnome-desktop/gnome-wall-clock.c:276
+#: ../libgnome-desktop/gnome-wall-clock.c:275
 msgid "%a %R"
 msgstr "%a %R"
 
 #. Translators: This is the time format without date used
 #. in 24-hour mode.
+#. The character between %R and %S is U+2236 RATIO
 #: ../libgnome-desktop/gnome-wall-clock.c:280
-msgid "%R:%S"
-msgstr "%R:%S"
+msgid "%R∶%S"
+msgstr "%R∶%S"
 
 #: ../libgnome-desktop/gnome-wall-clock.c:280
 msgid "%R"
@@ -139,100 +222,39 @@
 
 #. Translators: This is a time format with full date used
 #. for AM/PM.
-#: ../libgnome-desktop/gnome-wall-clock.c:286
-msgid "%a %b %e, %l:%M:%S %p"
-msgstr "%a %e de %b, %l:%M:%S"
+#. The Unicode characters are U+2236 RATIO and
+#. U+2009 THIN SPACE
+#: ../libgnome-desktop/gnome-wall-clock.c:288
+msgid "%a %b %e, %l∶%M∶%S %p"
+msgstr "%a %e de %b, %l:%M:%S %p"
 
-#: ../libgnome-desktop/gnome-wall-clock.c:287
-msgid "%a %b %e, %l:%M %p"
+#: ../libgnome-desktop/gnome-wall-clock.c:289
+msgid "%a %b %e, %l∶%M %p"
 msgstr "%a %e de %b, %l:%M %p"
 
 #. Translators: This is a time format with day used
 #. for AM/PM.
-#: ../libgnome-desktop/gnome-wall-clock.c:291
-msgid "%a %l:%M:%S %p"
-msgstr "%a de %l:%M:%S %p"
-
-#: ../libgnome-desktop/gnome-wall-clock.c:292
-msgid "%a %l:%M %p"
-msgstr "O %A ás %k:%M"
+#. The Unicode characters are U+2236 RATIO and
+#. U+2009 THIN SPACE
+#: ../libgnome-desktop/gnome-wall-clock.c:295
+msgid "%a %l∶%M∶%S %p"
+msgstr "%a %l:%M:%S %p"
 
-#. Translators: This is a time format without date used
-#. for AM/PM.
 #: ../libgnome-desktop/gnome-wall-clock.c:296
-msgid "%l:%M:%S %p"
-msgstr "%l:%M:%S %p"
-
-#: ../libgnome-desktop/gnome-wall-clock.c:297
-msgid "%l:%M %p"
-msgstr "%l:%M %p"
-
-#~ msgctxt "Monitor vendor"
-#~ msgid "Unknown"
-#~ msgstr "Descoñecido"
-
-#~ msgid "could not get the screen resources (CRTCs, outputs, modes)"
-#~ msgstr "non foi posíbel obter os recursos da pantalla (CRTC, saídas, modos)"
-
-#~ msgid "unhandled X error while getting the range of screen sizes"
-#~ msgstr ""
-#~ "produciuse un erro de X non manipulado ao obter o intervalo de tamaños de "
-#~ "pantalla"
-
-#~ msgid "could not get the range of screen sizes"
-#~ msgstr "non foi posíbel obter o intervalo de tamaños de pantalla"
-
-#~ msgid "RANDR extension is not present"
-#~ msgstr "A extensión RANDR non está presente"
-
-#~ msgid "could not get information about output %d"
-#~ msgstr "non foi posíbel obter información sobre a saída %d"
-
-#~ msgid "Built-in Display"
-#~ msgstr "Pantalla embebida"
-
-#~ msgid "%s Display"
-#~ msgstr "Pantalla %s"
-
-#~ msgid "Unknown Display"
-#~ msgstr "Pantalla descoñecida"
-
-#~ msgid ""
-#~ "requested position/size for CRTC %d is outside the allowed limit: "
-#~ "position=(%d, %d), size=(%d, %d), maximum=(%d, %d)"
-#~ msgstr ""
-#~ "a posición ou tamaño solicitados ao CRTC %d está fóra do límite "
-#~ "permitido: posición=(%d, %d), tamaño=(%d, %d), máximo=(%d, %d)"
+msgid "%a %l∶%M %p"
+msgstr "%a %l:%M %p"
 
-#~ msgid "could not set the configuration for CRTC %d"
-#~ msgstr "non foi posíbel definir a configuración do CRTC %d"
-
-#~ msgid "could not get information about CRTC %d"
-#~ msgstr "non foi posíbel obter información sobre o CRTC %d"
-
-#~ msgid ""
-#~ "none of the saved display configurations matched the active configuration"
-#~ msgstr ""
-#~ "ningunha das configuracións de pantalla gardadas coincide coa "
-#~ "configuración activa"
-
-#~ msgid "%a %b %e, %R∶%S"
-#~ msgstr "%a %e de %b, %R:%S"
-
-#~ msgid "%R∶%S"
-#~ msgstr "%R∶%S"
-
-#~ msgid "%a %l∶%M∶%S %p"
-#~ msgstr "%a %l:%M:%S %p"
-
-#~ msgid "%a %l∶%M %p"
-#~ msgstr "%a %l:%M %p"
-
-#~ msgid "%l∶%M∶%S %p"
-#~ msgstr "%l∶%M∶%S %p"
-
-#~ msgid "%l∶%M %p"
-#~ msgstr "%l∶%M %p"
+#. Translators: This is a time format without date used
+#. for AM/PM.
+#. The Unicode characters are U+2236 RATIO and
+#. U+2009 THIN SPACE
+#: ../libgnome-desktop/gnome-wall-clock.c:302
+msgid "%l∶%M∶%S %p"
+msgstr "%l∶%M∶%S %p"
+
+#: ../libgnome-desktop/gnome-wall-clock.c:303
+msgid "%l∶%M %p"
+msgstr "%l∶%M %p"
 
 #~ msgid "Laptop"
 #~ msgstr "Portátil"
@@ -244,6 +266,15 @@
 #~ msgid "Mirrored Displays"
 #~ msgstr "Espellar pantallas"
 
+#~ msgid "%R:%S"
+#~ msgstr "%R:%S"
+
+#~ msgid "%l:%M:%S %p"
+#~ msgstr "%l:%M:%S %p"
+
+#~ msgid "%l:%M %p"
+#~ msgstr "%l:%M %p"
+
 #~ msgid "Mirror Screens"
 #~ msgstr "Pantallas de réplica"
 
diff -Nru gnome-desktop3-3.12.0/po/gu.po gnome-desktop3-3.8.4/po/gu.po
--- gnome-desktop3-3.12.0/po/gu.po	2013-11-11 17:23:18.000000000 +0000
+++ gnome-desktop3-3.8.4/po/gu.po	2013-09-04 11:15:57.000000000 +0000
@@ -8,8 +8,8 @@
 "Project-Id-Version: gu\n"
 "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug."
 "cgi?product=gnome-desktop&keywords=I18N+L10N&component=general\n"
-"POT-Creation-Date: 2013-02-15 15:29+0000\n"
-"PO-Revision-Date: 2013-02-28 11:50+0530\n"
+"POT-Creation-Date: 2013-03-09 06:58+0000\n"
+"PO-Revision-Date: 2013-03-14 12:24+0530\n"
 "Last-Translator: \n"
 "Language-Team: American English \n"
 "Language: \n"
@@ -31,7 +31,7 @@
 msgid "Unknown"
 msgstr "અજ્ઞાત"
 
-#: ../libgnome-desktop/gnome-languages.c:761
+#: ../libgnome-desktop/gnome-languages.c:804
 msgid "Unspecified"
 msgstr "સ્પષ્ટ થયેલ નથી"
 
@@ -62,8 +62,9 @@
 msgstr "આઉટપુટ %d વિશે જાણકારી મેળવી શકાતી નથી"
 
 #: ../libgnome-desktop/gnome-rr.c:1764
-msgid "Laptop"
-msgstr "લેપટોપ"
+#| msgid "%s Display"
+msgid "Built-in Display"
+msgstr "બિલ્ટ-ઇન દર્શાવ"
 
 #. Translators: %s is the size of the monitor in inches
 #: ../libgnome-desktop/gnome-rr.c:1782
@@ -72,8 +73,6 @@
 msgstr "%s દર્શાવ"
 
 #: ../libgnome-desktop/gnome-rr.c:1789
-#| msgctxt "Monitor vendor"
-#| msgid "Unknown"
 msgid "Unknown Display"
 msgstr "અજ્ઞાત દર્શાવ"
 
@@ -183,7 +182,6 @@
 #. in 24-hour mode.
 #. The character between %R and %S is U+2236 RATIO
 #: ../libgnome-desktop/gnome-wall-clock.c:268
-#| msgid "%a %b %e, %R:%S"
 msgid "%a %b %e, %R∶%S"
 msgstr "%a %b %e, %R∶%S"
 
@@ -195,7 +193,6 @@
 #. in 24-hour mode.
 #. The character between %R and %S is U+2236 RATIO
 #: ../libgnome-desktop/gnome-wall-clock.c:274
-#| msgid "%a %R:%S"
 msgid "%a %R∶%S"
 msgstr "%a %R∶%S"
 
@@ -219,12 +216,10 @@
 #. The Unicode characters are U+2236 RATIO and
 #. U+2009 THIN SPACE
 #: ../libgnome-desktop/gnome-wall-clock.c:288
-#| msgid "%a %b %e, %l:%M:%S %p"
 msgid "%a %b %e, %l∶%M∶%S %p"
 msgstr "%a %b %e, %l∶%M∶%S %p"
 
 #: ../libgnome-desktop/gnome-wall-clock.c:289
-#| msgid "%a %b %e, %l:%M %p"
 msgid "%a %b %e, %l∶%M %p"
 msgstr "%a %b %e, %l∶%M %p"
 
@@ -233,12 +228,10 @@
 #. The Unicode characters are U+2236 RATIO and
 #. U+2009 THIN SPACE
 #: ../libgnome-desktop/gnome-wall-clock.c:295
-#| msgid "%a %l:%M:%S %p"
 msgid "%a %l∶%M∶%S %p"
 msgstr "%a %l∶%M∶%S %p"
 
 #: ../libgnome-desktop/gnome-wall-clock.c:296
-#| msgid "%a %l:%M %p"
 msgid "%a %l∶%M %p"
 msgstr "%a %l∶%M %p"
 
@@ -254,6 +247,9 @@
 msgid "%l∶%M %p"
 msgstr "%l∶%M %p"
 
+#~ msgid "Laptop"
+#~ msgstr "લેપટોપ"
+
 #~ msgid "Cannot find a terminal, using xterm, even if it may not work"
 #~ msgstr ""
 #~ "ટર્મિનલ ને શોધી શકાતુ નથી, xterm ને વાપરી રહ્યા છે, જો તે કામ ન કરી શકતુ હોય"
diff -Nru gnome-desktop3-3.12.0/po/he.po gnome-desktop3-3.8.4/po/he.po
--- gnome-desktop3-3.12.0/po/he.po	2013-11-11 17:23:18.000000000 +0000
+++ gnome-desktop3-3.8.4/po/he.po	2013-09-04 11:15:57.000000000 +0000
@@ -4,71 +4,141 @@
 # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER.
 # Gil Osher , 2002, 2005.
 # Gil 'Dolfin' Osher , 2002,2003.
-# Yosef Or Boczko , 2013.
 #
 msgid ""
 msgstr ""
 "Project-Id-Version: gnome-desktop.HEAD.he\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-09-22 12:50+0300\n"
-"PO-Revision-Date: 2013-09-22 12:50+0300\n"
-"Last-Translator: Yosef Or Boczko \n"
-"Language-Team: עברית <>\n"
+"POT-Creation-Date: 2013-02-23 16:19+0200\n"
+"PO-Revision-Date: 2013-02-23 16:20+0200\n"
+"Last-Translator: Yaron Shahrabani \n"
+"Language-Team: Hebrew \n"
 "Language: he\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: Gtranslator 2.91.6\n"
+"X-Generator: KBabel 1.9.1\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
+#. Translators: "Unknown" here is used to identify a monitor for which
+#. * we don't know the vendor. When a vendor is known, the name of the
+#. * vendor is used.
+#: ../libgnome-desktop/display-name.c:107
+msgctxt "Monitor vendor"
+msgid "Unknown"
+msgstr "לא ידוע"
+
 #: ../libgnome-desktop/gnome-languages.c:804
 msgid "Unspecified"
 msgstr "לא צוין"
 
-#: ../libgnome-desktop/gnome-rr-config.c:743
+#. Translators: a CRTC is a CRT Controller (this is X terminology).
+#: ../libgnome-desktop/gnome-rr.c:452
+#, c-format
+msgid "could not get the screen resources (CRTCs, outputs, modes)"
+msgstr "could not get the screen resources (CRTCs, outputs, modes)"
+
+#: ../libgnome-desktop/gnome-rr.c:472
+#, c-format
+msgid "unhandled X error while getting the range of screen sizes"
+msgstr "unhandled X error while getting the range of screen sizes"
+
+#: ../libgnome-desktop/gnome-rr.c:478
+#, c-format
+msgid "could not get the range of screen sizes"
+msgstr "could not get the range of screen sizes"
+
+#: ../libgnome-desktop/gnome-rr.c:769
+#, c-format
+msgid "RANDR extension is not present"
+msgstr "RANDR extension is not present"
+
+#: ../libgnome-desktop/gnome-rr.c:1580
+#, c-format
+msgid "could not get information about output %d"
+msgstr "could not get information about output %d"
+
+#: ../libgnome-desktop/gnome-rr.c:1764
+msgid "Laptop"
+msgstr "מחשב נייד"
+
+#. Translators: %s is the size of the monitor in inches
+#: ../libgnome-desktop/gnome-rr.c:1782
+#, c-format
+msgid "%s Display"
+msgstr "תצוגה בגודל %s"
+
+#: ../libgnome-desktop/gnome-rr.c:1789
+msgid "Unknown Display"
+msgstr "תצוגה בלתי ידועה"
+
+#. Translators: the "position", "size", and "maximum"
+#. * words here are not keywords; please translate them
+#. * as usual.  A CRTC is a CRT Controller (this is X terminology)
+#: ../libgnome-desktop/gnome-rr.c:2234
+#, c-format
+msgid "requested position/size for CRTC %d is outside the allowed limit: position=(%d, %d), size=(%d, %d), maximum=(%d, %d)"
+msgstr "requested position/size for CRTC %d is outside the allowed limit: position=(%d, %d), size=(%d, %d), maximum=(%d, %d)"
+
+#: ../libgnome-desktop/gnome-rr.c:2270
+#, c-format
+msgid "could not set the configuration for CRTC %d"
+msgstr "could not set the configuration for CRTC %d"
+
+#: ../libgnome-desktop/gnome-rr.c:2421
+#, c-format
+msgid "could not get information about CRTC %d"
+msgstr "could not get information about CRTC %d"
+
+#: ../libgnome-desktop/gnome-rr-config.c:708
+#, c-format
+msgid "none of the saved display configurations matched the active configuration"
+msgstr "none of the saved display configurations matched the active configuration"
+
+#: ../libgnome-desktop/gnome-rr-config.c:1464
 #, c-format
 msgid "CRTC %d cannot drive output %s"
 msgstr "CRTC %d cannot drive output %s"
 
-#: ../libgnome-desktop/gnome-rr-config.c:750
+#: ../libgnome-desktop/gnome-rr-config.c:1471
 #, c-format
 msgid "output %s does not support mode %dx%d@%dHz"
 msgstr "output %s does not support mode %dx%d@%dHz"
 
-#: ../libgnome-desktop/gnome-rr-config.c:761
+#: ../libgnome-desktop/gnome-rr-config.c:1482
 #, c-format
-msgid "CRTC %d does not support rotation=%d"
-msgstr "CRTC %d does not support rotation=%d"
+msgid "CRTC %d does not support rotation=%s"
+msgstr "CRTC %d does not support rotation=%s"
 
-#: ../libgnome-desktop/gnome-rr-config.c:774
+#: ../libgnome-desktop/gnome-rr-config.c:1496
 #, c-format
 msgid ""
 "output %s does not have the same parameters as another cloned output:\n"
 "existing mode = %d, new mode = %d\n"
 "existing coordinates = (%d, %d), new coordinates = (%d, %d)\n"
-"existing rotation = %d, new rotation = %d"
+"existing rotation = %s, new rotation = %s"
 msgstr ""
 "output %s does not have the same parameters as another cloned output:\n"
 "existing mode = %d, new mode = %d\n"
 "existing coordinates = (%d, %d), new coordinates = (%d, %d)\n"
-"existing rotation = %d, new rotation = %d"
+"existing rotation = %s, new rotation = %s"
 
-#: ../libgnome-desktop/gnome-rr-config.c:789
+#: ../libgnome-desktop/gnome-rr-config.c:1511
 #, c-format
 msgid "cannot clone to output %s"
 msgstr "cannot clone to output %s"
 
-#: ../libgnome-desktop/gnome-rr-config.c:915
+#: ../libgnome-desktop/gnome-rr-config.c:1680
 #, c-format
 msgid "Trying modes for CRTC %d\n"
 msgstr "Trying modes for CRTC %d\n"
 
-#: ../libgnome-desktop/gnome-rr-config.c:939
+#: ../libgnome-desktop/gnome-rr-config.c:1704
 #, c-format
 msgid "CRTC %d: trying mode %dx%d@%dHz with output at %dx%d@%dHz (pass %d)\n"
 msgstr "CRTC %d: trying mode %dx%d@%dHz with output at %dx%d@%dHz (pass %d)\n"
 
-#: ../libgnome-desktop/gnome-rr-config.c:986
+#: ../libgnome-desktop/gnome-rr-config.c:1751
 #, c-format
 msgid ""
 "could not assign CRTCs to outputs:\n"
@@ -77,7 +147,7 @@
 "could not assign CRTCs to outputs:\n"
 "%s"
 
-#: ../libgnome-desktop/gnome-rr-config.c:990
+#: ../libgnome-desktop/gnome-rr-config.c:1755
 #, c-format
 msgid ""
 "none of the selected modes were compatible with the possible modes:\n"
@@ -89,40 +159,39 @@
 #. Translators: the "requested", "minimum", and
 #. * "maximum" words here are not keywords; please
 #. * translate them as usual.
-#: ../libgnome-desktop/gnome-rr-config.c:1071
+#: ../libgnome-desktop/gnome-rr-config.c:1833
 #, c-format
-msgid ""
-"required virtual size does not fit available size: requested=(%d, %d), "
-"minimum=(%d, %d), maximum=(%d, %d)"
-msgstr ""
-"required virtual size does not fit available size: requested=(%d, %d), "
-"minimum=(%d, %d), maximum=(%d, %d)"
+msgid "required virtual size does not fit available size: requested=(%d, %d), minimum=(%d, %d), maximum=(%d, %d)"
+msgstr "required virtual size does not fit available size: requested=(%d, %d), minimum=(%d, %d), maximum=(%d, %d)"
 
 #. Translators: This is the time format with full date used
 #. in 24-hour mode.
-#: ../libgnome-desktop/gnome-wall-clock.c:270
-msgid "%a %b %e, %R:%S"
-msgstr "%a ה־%e ב%b, %R:%S"
+#. The character between %R and %S is U+2236 RATIO
+#: ../libgnome-desktop/gnome-wall-clock.c:268
+msgid "%a %b %e, %R∶%S"
+msgstr "ה־%e ב%b %a ,%R:%S"
 
-#: ../libgnome-desktop/gnome-wall-clock.c:271
+#: ../libgnome-desktop/gnome-wall-clock.c:269
 msgid "%a %b %e, %R"
-msgstr "%a ה־%e ב%b, %R"
+msgstr "%a %b %e, %R"
 
 #. Translators: This is the time format with day used
 #. in 24-hour mode.
-#: ../libgnome-desktop/gnome-wall-clock.c:275
-msgid "%a %R:%S"
-msgstr "%a %R:%S"
+#. The character between %R and %S is U+2236 RATIO
+#: ../libgnome-desktop/gnome-wall-clock.c:274
+msgid "%a %R∶%S"
+msgstr "%a %R∶%S"
 
-#: ../libgnome-desktop/gnome-wall-clock.c:276
+#: ../libgnome-desktop/gnome-wall-clock.c:275
 msgid "%a %R"
 msgstr "%a %R"
 
 #. Translators: This is the time format without date used
 #. in 24-hour mode.
+#. The character between %R and %S is U+2236 RATIO
 #: ../libgnome-desktop/gnome-wall-clock.c:280
-msgid "%R:%S"
-msgstr "%R:%S"
+msgid "%R∶%S"
+msgstr "%R∶%S"
 
 #: ../libgnome-desktop/gnome-wall-clock.c:280
 msgid "%R"
@@ -130,100 +199,39 @@
 
 #. Translators: This is a time format with full date used
 #. for AM/PM.
-#: ../libgnome-desktop/gnome-wall-clock.c:286
-msgid "%a %b %e, %l:%M:%S %p"
-msgstr "%a ה־%e ב%b, %H:%M:%S"
-
-#: ../libgnome-desktop/gnome-wall-clock.c:287
-msgid "%a %b %e, %l:%M %p"
-msgstr "%a ה־%e ב%b, %H:%M"
+#. The Unicode characters are U+2236 RATIO and
+#. U+2009 THIN SPACE
+#: ../libgnome-desktop/gnome-wall-clock.c:288
+msgid "%a %b %e, %l∶%M∶%S %p"
+msgstr "ה־%e ב%b %a, %l:%M:%S %p"
+
+#: ../libgnome-desktop/gnome-wall-clock.c:289
+msgid "%a %b %e, %l∶%M %p"
+msgstr "ה־%e ב%b %a, %l:%M %p"
 
 #. Translators: This is a time format with day used
 #. for AM/PM.
-#: ../libgnome-desktop/gnome-wall-clock.c:291
-msgid "%a %l:%M:%S %p"
-msgstr "%a %H:%M:%S"
-
-#: ../libgnome-desktop/gnome-wall-clock.c:292
-msgid "%a %l:%M %p"
-msgstr "%a %H:%M"
+#. The Unicode characters are U+2236 RATIO and
+#. U+2009 THIN SPACE
+#: ../libgnome-desktop/gnome-wall-clock.c:295
+msgid "%a %l∶%M∶%S %p"
+msgstr "%a %l∶%M∶%S %p"
 
-#. Translators: This is a time format without date used
-#. for AM/PM.
 #: ../libgnome-desktop/gnome-wall-clock.c:296
-msgid "%l:%M:%S %p"
-msgstr "%H:%M:%S"
-
-#: ../libgnome-desktop/gnome-wall-clock.c:297
-msgid "%l:%M %p"
-msgstr "%H:%M"
-
-#~ msgctxt "Monitor vendor"
-#~ msgid "Unknown"
-#~ msgstr "לא ידוע"
-
-#~ msgid "could not get the screen resources (CRTCs, outputs, modes)"
-#~ msgstr "could not get the screen resources (CRTCs, outputs, modes)"
-
-#~ msgid "unhandled X error while getting the range of screen sizes"
-#~ msgstr "unhandled X error while getting the range of screen sizes"
-
-#~ msgid "could not get the range of screen sizes"
-#~ msgstr "could not get the range of screen sizes"
-
-#~ msgid "RANDR extension is not present"
-#~ msgstr "RANDR extension is not present"
-
-#~ msgid "could not get information about output %d"
-#~ msgstr "could not get information about output %d"
-
-#~ msgid "Built-in Display"
-#~ msgstr "תצוגה מובנית"
-
-#~ msgid "%s Display"
-#~ msgstr "תצוגה בגודל %s"
-
-#~ msgid "Unknown Display"
-#~ msgstr "תצוגה בלתי ידועה"
-
-#~ msgid ""
-#~ "requested position/size for CRTC %d is outside the allowed limit: "
-#~ "position=(%d, %d), size=(%d, %d), maximum=(%d, %d)"
-#~ msgstr ""
-#~ "requested position/size for CRTC %d is outside the allowed limit: "
-#~ "position=(%d, %d), size=(%d, %d), maximum=(%d, %d)"
-
-#~ msgid "could not set the configuration for CRTC %d"
-#~ msgstr "could not set the configuration for CRTC %d"
+msgid "%a %l∶%M %p"
+msgstr "%a %l∶%M %p"
 
-#~ msgid "could not get information about CRTC %d"
-#~ msgstr "could not get information about CRTC %d"
-
-#~ msgid ""
-#~ "none of the saved display configurations matched the active configuration"
-#~ msgstr ""
-#~ "none of the saved display configurations matched the active configuration"
-
-#~ msgid "Laptop"
-#~ msgstr "מחשב נייד"
-
-#~ msgid "%a %b %e, %R∶%S"
-#~ msgstr "ה־%e ב%b %a ,%R:%S"
-
-#~ msgid "%R∶%S"
-#~ msgstr "%R∶%S"
-
-#~ msgid "%a %l∶%M∶%S %p"
-#~ msgstr "%a %l∶%M∶%S %p"
-
-#~ msgid "%a %l∶%M %p"
-#~ msgstr "%a %l∶%M %p"
-
-#~ msgid "%l∶%M∶%S %p"
-#~ msgstr "%l∶%M∶%S %p"
-
-#~ msgid "%l∶%M %p"
-#~ msgstr "%l∶%M %p"
+#. Translators: This is a time format without date used
+#. for AM/PM.
+#. The Unicode characters are U+2236 RATIO and
+#. U+2009 THIN SPACE
+#: ../libgnome-desktop/gnome-wall-clock.c:302
+msgid "%l∶%M∶%S %p"
+msgstr "%l∶%M∶%S %p"
+
+#: ../libgnome-desktop/gnome-wall-clock.c:303
+msgid "%l∶%M %p"
+msgstr "%l∶%M %p"
 
 #~ msgid "Cannot find a terminal, using xterm, even if it may not work"
 #~ msgstr "לא ניתן למצוא את המסוף, משתמש ב-xterm, למרות שזה עלול לא לעבוד"
@@ -231,6 +239,15 @@
 #~ msgid "Mirrored Displays"
 #~ msgstr "שכפול צגים"
 
+#~ msgid "%R:%S"
+#~ msgstr "%R:%S"
+
+#~ msgid "%l:%M:%S %p"
+#~ msgstr "%l:%M:%S %p"
+
+#~ msgid "%l:%M %p"
+#~ msgstr "%l:%M %p"
+
 #~ msgid "Mirror Screens"
 #~ msgstr "שכפול הצגים"
 
diff -Nru gnome-desktop3-3.12.0/po/hi.po gnome-desktop3-3.8.4/po/hi.po
--- gnome-desktop3-3.12.0/po/hi.po	2013-11-11 17:23:18.000000000 +0000
+++ gnome-desktop3-3.8.4/po/hi.po	2013-09-04 11:15:57.000000000 +0000
@@ -7,22 +7,22 @@
 # Rajesh Ranjan , 2005, 2006, 2008, 2009.
 # Rajesh Ranjan , 2009.
 # rajesh , 2012.
-# rajesh , 2012.
+# rajesh , 2012, 2013.
 msgid ""
 msgstr ""
 "Project-Id-Version: gnome-desktop.master\n"
 "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=gnome-"
 "desktop&keywords=I18N+L10N&component=general\n"
-"POT-Creation-Date: 2012-09-03 19:06+0000\n"
-"PO-Revision-Date: 2012-09-21 14:08+0530\n"
-"Last-Translator: rajesh \n"
-"Language-Team: Hindi \n"
+"POT-Creation-Date: 2013-03-04 10:03+0000\n"
+"PO-Revision-Date: 2013-03-21 15:06+0530\n"
+"Last-Translator: raj \n"
+"Language-Team: Hindi \n"
 "Language: hi\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "net>\n"
-"X-Generator: Lokalize 1.2\n"
+"X-Generator: Lokalize 1.5\n"
 "Plural-Forms: nplurals=2; plural=(n!=1);\n"
 "\n"
 "\n"
@@ -34,17 +34,14 @@
 #. Translators: "Unknown" here is used to identify a monitor for which
 #. * we don't know the vendor. When a vendor is known, the name of the
 #. * vendor is used.
-#: ../libgnome-desktop/display-name.c:91
+#: ../libgnome-desktop/display-name.c:107
 msgctxt "Monitor vendor"
 msgid "Unknown"
 msgstr "अज्ञात"
 
-#: ../libgnome-desktop/gnome-desktop-utils.c:134
-msgid "Cannot find a terminal, using xterm, even if it may not work"
-msgstr ""
-"कोई टर्मिनल नहीं ढूँढ़ नहीं सकता है, xterm का प्रयोग कर रहा है, बावजूद कि यह "
-"काम नहीं "
-"करता है"
+#: ../libgnome-desktop/gnome-languages.c:804
+msgid "Unspecified"
+msgstr "गैर निर्दिष्ट"
 
 #. Translators: a CRTC is a CRT Controller (this is X terminology).
 #: ../libgnome-desktop/gnome-rr.c:452
@@ -67,15 +64,31 @@
 msgid "RANDR extension is not present"
 msgstr "RANDR विस्तार मौजूद नहीं है"
 
-#: ../libgnome-desktop/gnome-rr.c:1570
+#: ../libgnome-desktop/gnome-rr.c:1580
 #, c-format
 msgid "could not get information about output %d"
 msgstr "%d आउटपुट के बारे में सूचना नहीं पा सका"
 
+#: ../libgnome-desktop/gnome-rr.c:1764
+msgid "Built-in Display"
+msgstr "अंतर्निमित प्रदर्शन"
+
+#. Translators: %s is the size of the monitor in inches
+#: ../libgnome-desktop/gnome-rr.c:1782
+#, c-format
+msgid "%s Display"
+msgstr "%s प्रदर्शन"
+
+#: ../libgnome-desktop/gnome-rr.c:1789
+#| msgctxt "Monitor vendor"
+#| msgid "Unknown"
+msgid "Unknown Display"
+msgstr "अज्ञात प्रदर्शन"
+
 #. Translators: the "position", "size", and "maximum"
 #. * words here are not keywords; please translate them
 #. * as usual.  A CRTC is a CRT Controller (this is X terminology)
-#: ../libgnome-desktop/gnome-rr.c:2163
+#: ../libgnome-desktop/gnome-rr.c:2234
 #, c-format
 msgid ""
 "requested position/size for CRTC %d is outside the allowed limit: position="
@@ -84,42 +97,38 @@
 "requested position/size for CRTC %d is outside the allowed limit: position="
 "(%d, %d), size=(%d, %d), maximum=(%d, %d)"
 
-#: ../libgnome-desktop/gnome-rr.c:2199
+#: ../libgnome-desktop/gnome-rr.c:2270
 #, c-format
 msgid "could not set the configuration for CRTC %d"
 msgstr "CRTC %d के लिए विन्यास सेट नहीं कर सका"
 
-#: ../libgnome-desktop/gnome-rr.c:2344
+#: ../libgnome-desktop/gnome-rr.c:2421
 #, c-format
 msgid "could not get information about CRTC %d"
 msgstr "CRTC %d के बारे में सूचना नहीं पा सका"
 
-#: ../libgnome-desktop/gnome-rr-config.c:558
-msgid "Laptop"
-msgstr "लैपटॉप"
-
-#: ../libgnome-desktop/gnome-rr-config.c:713
+#: ../libgnome-desktop/gnome-rr-config.c:708
 #, c-format
 msgid ""
 "none of the saved display configurations matched the active configuration"
 msgstr "सक्रिय विन्यास से मेल खाता कोई सहेजा प्रदर्शन विन्यास सहेजा नहीं था"
 
-#: ../libgnome-desktop/gnome-rr-config.c:1469
+#: ../libgnome-desktop/gnome-rr-config.c:1464
 #, c-format
 msgid "CRTC %d cannot drive output %s"
 msgstr "CRTC %d आउटपुट %s ड्राइव नहीं कर सकता है"
 
-#: ../libgnome-desktop/gnome-rr-config.c:1476
+#: ../libgnome-desktop/gnome-rr-config.c:1471
 #, c-format
 msgid "output %s does not support mode %dx%d@%dHz"
 msgstr "आउटपुट %s अवस्था %dx%d@%dHz का समर्थन नहीं करता है"
 
-#: ../libgnome-desktop/gnome-rr-config.c:1487
+#: ../libgnome-desktop/gnome-rr-config.c:1482
 #, c-format
 msgid "CRTC %d does not support rotation=%s"
 msgstr "CRTC %d घुमाव का समर्थन नहीं करता है=%s"
 
-#: ../libgnome-desktop/gnome-rr-config.c:1501
+#: ../libgnome-desktop/gnome-rr-config.c:1496
 #, c-format
 msgid ""
 "output %s does not have the same parameters as another cloned output:\n"
@@ -132,17 +141,17 @@
 "मौजूदा निर्देशांक = (%d, %d), नया निर्देशांक = (%d, %d)\n"
 "मौजूदा घुमाव = %s, नए घुमाव = %s"
 
-#: ../libgnome-desktop/gnome-rr-config.c:1516
+#: ../libgnome-desktop/gnome-rr-config.c:1511
 #, c-format
 msgid "cannot clone to output %s"
 msgstr "आउटपुट %s में क्लोन नहीं कर सकता है"
 
-#: ../libgnome-desktop/gnome-rr-config.c:1685
+#: ../libgnome-desktop/gnome-rr-config.c:1680
 #, c-format
 msgid "Trying modes for CRTC %d\n"
 msgstr "CRTC %d के लिए अवस्था कोशिश कर रहा है\n"
 
-#: ../libgnome-desktop/gnome-rr-config.c:1709
+#: ../libgnome-desktop/gnome-rr-config.c:1704
 #, c-format
 msgid "CRTC %d: trying mode %dx%d@%dHz with output at %dx%d@%dHz (pass %d)\n"
 msgstr ""
@@ -150,7 +159,7 @@
 "कर "
 "रहा है\n"
 
-#: ../libgnome-desktop/gnome-rr-config.c:1756
+#: ../libgnome-desktop/gnome-rr-config.c:1751
 #, c-format
 msgid ""
 "could not assign CRTCs to outputs:\n"
@@ -159,7 +168,7 @@
 "CRTC को आउटपुट में नियत नहीं कर सकता है:\n"
 "%s"
 
-#: ../libgnome-desktop/gnome-rr-config.c:1760
+#: ../libgnome-desktop/gnome-rr-config.c:1755
 #, c-format
 msgid ""
 "none of the selected modes were compatible with the possible modes:\n"
@@ -171,7 +180,7 @@
 #. Translators: the "requested", "minimum", and
 #. * "maximum" words here are not keywords; please
 #. * translate them as usual.
-#: ../libgnome-desktop/gnome-rr-config.c:1838
+#: ../libgnome-desktop/gnome-rr-config.c:1833
 #, c-format
 msgid ""
 "required virtual size does not fit available size: requested=(%d, %d), "
@@ -180,78 +189,103 @@
 "required virtual size does not fit available size: requested=(%d, %d), "
 "minimum=(%d, %d), maximum=(%d, %d)"
 
-#. Keep this string in sync with gnome-control-center/capplets/display/xrandr-capplet.c:get_display_name()
-#. Translators:  this is the feature where what you see on your
-#. * laptop's screen is the same as your external projector.
-#. * Here, "Mirrored" is being used as an adjective.  For example,
-#. * the Spanish translation could be "Pantallas en Espejo".
-#.
-#: ../libgnome-desktop/gnome-rr-labeler.c:381
-msgid "Mirrored Displays"
-msgstr "मिरर किया प्रदर्शन"
-
 #. Translators: This is the time format with full date used
 #. in 24-hour mode.
-#: ../libgnome-desktop/gnome-wall-clock.c:238
-msgid "%a %b %e, %R:%S"
-msgstr "%a %b %e, %R:%S"
+#. The character between %R and %S is U+2236 RATIO
+#: ../libgnome-desktop/gnome-wall-clock.c:268
+#| msgid "%a %b %e, %R:%S"
+msgid "%a %b %e, %R∶%S"
+msgstr "%a %b %e, %R∶%S"
 
-#: ../libgnome-desktop/gnome-wall-clock.c:239
+#: ../libgnome-desktop/gnome-wall-clock.c:269
 msgid "%a %b %e, %R"
 msgstr "%a %b %e, %R"
 
 #. Translators: This is the time format with day used
 #. in 24-hour mode.
-#: ../libgnome-desktop/gnome-wall-clock.c:243
-msgid "%a %R:%S"
-msgstr "%a %R:%S"
+#. The character between %R and %S is U+2236 RATIO
+#: ../libgnome-desktop/gnome-wall-clock.c:274
+#| msgid "%a %R:%S"
+msgid "%a %R∶%S"
+msgstr "%a %R∶%S"
 
-#: ../libgnome-desktop/gnome-wall-clock.c:244
+#: ../libgnome-desktop/gnome-wall-clock.c:275
 msgid "%a %R"
 msgstr "%a %R"
 
 #. Translators: This is the time format without date used
 #. in 24-hour mode.
-#: ../libgnome-desktop/gnome-wall-clock.c:248
-#| msgid "%a %R:%S"
-msgid "%R:%S"
-msgstr "%R:%S"
+#. The character between %R and %S is U+2236 RATIO
+#: ../libgnome-desktop/gnome-wall-clock.c:280
+msgid "%R∶%S"
+msgstr "%R∶%S"
 
-#: ../libgnome-desktop/gnome-wall-clock.c:248
+#: ../libgnome-desktop/gnome-wall-clock.c:280
 msgid "%R"
 msgstr "%R"
 
 #. Translators: This is a time format with full date used
 #. for AM/PM.
-#: ../libgnome-desktop/gnome-wall-clock.c:254
-msgid "%a %b %e, %l:%M:%S %p"
-msgstr "%a %b %e, %l:%M:%S %p"
-
-#: ../libgnome-desktop/gnome-wall-clock.c:255
-msgid "%a %b %e, %l:%M %p"
-msgstr "%a %b %e, %l:%M %p"
+#. The Unicode characters are U+2236 RATIO and
+#. U+2009 THIN SPACE
+#: ../libgnome-desktop/gnome-wall-clock.c:288
+#| msgid "%a %b %e, %l:%M:%S %p"
+msgid "%a %b %e, %l∶%M∶%S %p"
+msgstr "%a %b %e, %l∶%M∶%S %p"
+
+#: ../libgnome-desktop/gnome-wall-clock.c:289
+#| msgid "%a %b %e, %l:%M %p"
+msgid "%a %b %e, %l∶%M %p"
+msgstr "%a %b %e, %l∶%M %p"
 
 #. Translators: This is a time format with day used
 #. for AM/PM.
-#: ../libgnome-desktop/gnome-wall-clock.c:259
-msgid "%a %l:%M:%S %p"
-msgstr "%a %l:%M:%S %p"
-
-#: ../libgnome-desktop/gnome-wall-clock.c:260
-msgid "%a %l:%M %p"
-msgstr "%a %l:%M %p"
-
-#. Translators: This is a time format without date used
-#. for AM/PM.
-#: ../libgnome-desktop/gnome-wall-clock.c:264
+#. The Unicode characters are U+2236 RATIO and
+#. U+2009 THIN SPACE
+#: ../libgnome-desktop/gnome-wall-clock.c:295
 #| msgid "%a %l:%M:%S %p"
-msgid "%l:%M:%S %p"
-msgstr "%l:%M:%S %p"
+msgid "%a %l∶%M∶%S %p"
+msgstr "%a %l∶%M∶%S %p"
 
-#: ../libgnome-desktop/gnome-wall-clock.c:265
+#: ../libgnome-desktop/gnome-wall-clock.c:296
 #| msgid "%a %l:%M %p"
-msgid "%l:%M %p"
-msgstr "%l:%M %p"
+msgid "%a %l∶%M %p"
+msgstr "%a %l∶%M %p"
+
+#. Translators: This is a time format without date used
+#. for AM/PM.
+#. The Unicode characters are U+2236 RATIO and
+#. U+2009 THIN SPACE
+#: ../libgnome-desktop/gnome-wall-clock.c:302
+msgid "%l∶%M∶%S %p"
+msgstr "%l∶%M∶%S %p"
+
+#: ../libgnome-desktop/gnome-wall-clock.c:303
+msgid "%l∶%M %p"
+msgstr "%l∶%M %p"
+
+#~ msgid "Cannot find a terminal, using xterm, even if it may not work"
+#~ msgstr ""
+#~ "कोई टर्मिनल नहीं ढूँढ़ नहीं सकता है, xterm का प्रयोग कर रहा है, बावजूद कि यह काम "
+#~ "नहीं करता है"
+
+#~ msgid "Laptop"
+#~ msgstr "लैपटॉप"
+
+#~ msgid "Mirrored Displays"
+#~ msgstr "मिरर किया प्रदर्शन"
+
+#~| msgid "%a %R:%S"
+#~ msgid "%R:%S"
+#~ msgstr "%R:%S"
+
+#~| msgid "%a %l:%M:%S %p"
+#~ msgid "%l:%M:%S %p"
+#~ msgstr "%l:%M:%S %p"
+
+#~| msgid "%a %l:%M %p"
+#~ msgid "%l:%M %p"
+#~ msgstr "%l:%M %p"
 
 #~ msgid "Mirror Screens"
 #~ msgstr "मिरर स्क्रीन"
diff -Nru gnome-desktop3-3.12.0/po/hu.po gnome-desktop3-3.8.4/po/hu.po
--- gnome-desktop3-3.12.0/po/hu.po	2013-11-11 17:23:18.000000000 +0000
+++ gnome-desktop3-3.8.4/po/hu.po	2013-09-04 11:15:57.000000000 +0000
@@ -14,8 +14,8 @@
 "Project-Id-Version: gnome-desktop master\n"
 "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=gnome-"
 "desktop&keywords=I18N+L10N&component=general\n"
-"POT-Creation-Date: 2013-08-19 17:24+0000\n"
-"PO-Revision-Date: 2013-08-25 09:57+0200\n"
+"POT-Creation-Date: 2013-03-04 09:41+0000\n"
+"PO-Revision-Date: 2013-03-16 19:36+0100\n"
 "Last-Translator: Balázs Úr \n"
 "Language-Team: Hungarian \n"
 "Language: hu\n"
@@ -25,63 +25,136 @@
 "X-Generator: Lokalize 1.2\n"
 "Plural-Forms:  nplurals=2; plural=(n != 1);\n"
 
+#. Translators: "Unknown" here is used to identify a monitor for which
+#. * we don't know the vendor. When a vendor is known, the name of the
+#. * vendor is used.
+#: ../libgnome-desktop/display-name.c:107
+msgctxt "Monitor vendor"
+msgid "Unknown"
+msgstr "Ismeretlen"
+
 #: ../libgnome-desktop/gnome-languages.c:804
 msgid "Unspecified"
 msgstr "Nincs megadva"
 
-#: ../libgnome-desktop/gnome-rr-config.c:789
+#. Translators: a CRTC is a CRT Controller (this is X terminology).
+#: ../libgnome-desktop/gnome-rr.c:452
+#, c-format
+msgid "could not get the screen resources (CRTCs, outputs, modes)"
+msgstr "A képernyő erőforrásai nem kérhetők le (CRTC-k, kimenetek, módok)"
+
+#: ../libgnome-desktop/gnome-rr.c:472
+#, c-format
+msgid "unhandled X error while getting the range of screen sizes"
+msgstr "Kezeletlen X hiba történt a képméretek tartományának lekérése közben"
+
+#: ../libgnome-desktop/gnome-rr.c:478
+#, c-format
+msgid "could not get the range of screen sizes"
+msgstr "Nem kérhető le a képméretek tartománya"
+
+#: ../libgnome-desktop/gnome-rr.c:769
+#, c-format
+msgid "RANDR extension is not present"
+msgstr "A RANDR kiterjesztés nincs jelen"
+
+#: ../libgnome-desktop/gnome-rr.c:1580
+#, c-format
+msgid "could not get information about output %d"
+msgstr "Nem lehet információkat lekérni a kimenetről: %d"
+
+#: ../libgnome-desktop/gnome-rr.c:1764
+msgid "Built-in Display"
+msgstr "Beépített kijelző"
+
+#. Translators: %s is the size of the monitor in inches
+#: ../libgnome-desktop/gnome-rr.c:1782
+#, c-format
+msgid "%s Display"
+msgstr "%s kijelző"
+
+#: ../libgnome-desktop/gnome-rr.c:1789
+#| msgctxt "Monitor vendor"
+#| msgid "Unknown"
+msgid "Unknown Display"
+msgstr "Ismeretlen kijelző"
+
+#. Translators: the "position", "size", and "maximum"
+#. * words here are not keywords; please translate them
+#. * as usual.  A CRTC is a CRT Controller (this is X terminology)
+#: ../libgnome-desktop/gnome-rr.c:2234
+#, c-format
+msgid ""
+"requested position/size for CRTC %d is outside the allowed limit: position="
+"(%d, %d), size=(%d, %d), maximum=(%d, %d)"
+msgstr ""
+"A kért pozíció/méret a(z) %d. CRTC-hez kívül esik az engedélyezett korláton: "
+"pozíció=(%d, %d), méret=(%d, %d), maximum=(%d, %d)"
+
+#: ../libgnome-desktop/gnome-rr.c:2270
+#, c-format
+msgid "could not set the configuration for CRTC %d"
+msgstr "Nem állítható be a(z) %d. CRTC konfigurációja"
+
+#: ../libgnome-desktop/gnome-rr.c:2421
+#, c-format
+msgid "could not get information about CRTC %d"
+msgstr "Nem kérhető információ a(z) %d. CRTC-ről"
+
+#: ../libgnome-desktop/gnome-rr-config.c:708
+#, c-format
+msgid ""
+"none of the saved display configurations matched the active configuration"
+msgstr ""
+"A mentett képernyő-beállítások egyike sem felel meg az aktív konfigurációnak"
+
+#: ../libgnome-desktop/gnome-rr-config.c:1464
 #, c-format
 msgid "CRTC %d cannot drive output %s"
 msgstr "A(z) %d. CRTC nem képes %s kimenet meghajtására"
 
-#: ../libgnome-desktop/gnome-rr-config.c:796
+#: ../libgnome-desktop/gnome-rr-config.c:1471
 #, c-format
 msgid "output %s does not support mode %dx%d@%dHz"
 msgstr "A(z) %s kimenet nem támogatja ezt a módot: %dx%d@%dHz"
 
-#: ../libgnome-desktop/gnome-rr-config.c:807
+#: ../libgnome-desktop/gnome-rr-config.c:1482
+#, c-format
+msgid "CRTC %d does not support rotation=%s"
+msgstr "A(z) %d. CRTC nem támogatja a(z) %s forgatásértéket"
+
+#: ../libgnome-desktop/gnome-rr-config.c:1496
 #, c-format
-#| msgid "CRTC %d does not support rotation=%s"
-msgid "CRTC %d does not support rotation=%d"
-msgstr "A(z) %d. CRTC nem támogatja a(z) %d forgatásértéket"
-
-#: ../libgnome-desktop/gnome-rr-config.c:820
-#, c-format
-#| msgid ""
-#| "output %s does not have the same parameters as another cloned output:\n"
-#| "existing mode = %d, new mode = %d\n"
-#| "existing coordinates = (%d, %d), new coordinates = (%d, %d)\n"
-#| "existing rotation = %s, new rotation = %s"
 msgid ""
 "output %s does not have the same parameters as another cloned output:\n"
 "existing mode = %d, new mode = %d\n"
 "existing coordinates = (%d, %d), new coordinates = (%d, %d)\n"
-"existing rotation = %d, new rotation = %d"
+"existing rotation = %s, new rotation = %s"
 msgstr ""
 "%s kimenet nem rendelkezik egy másik klónozott kimenetével egyező "
 "paraméterekkel:\n"
 "létező mód = %d, új mód = %d\n"
 "létező koordináták = (%d, %d), új koordináták = (%d, %d)\n"
-"létező forgatás = %d, új forgatás = %d"
+"létező forgatás = %s, új forgatás = %s"
 
-#: ../libgnome-desktop/gnome-rr-config.c:835
+#: ../libgnome-desktop/gnome-rr-config.c:1511
 #, c-format
 msgid "cannot clone to output %s"
 msgstr "nem lehet klónozni a(z) %s kimenetre"
 
-#: ../libgnome-desktop/gnome-rr-config.c:961
+#: ../libgnome-desktop/gnome-rr-config.c:1680
 #, c-format
 msgid "Trying modes for CRTC %d\n"
 msgstr "Módok kipróbálása a(z) %d. CRTC-hez\n"
 
-#: ../libgnome-desktop/gnome-rr-config.c:985
+#: ../libgnome-desktop/gnome-rr-config.c:1704
 #, c-format
 msgid "CRTC %d: trying mode %dx%d@%dHz with output at %dx%d@%dHz (pass %d)\n"
 msgstr ""
 "%d. CRTC: %dx%d@%dHz mód kipróbálása a(z) %dx%d@%dHz módú kimenettel (%d. "
 "lépés)\n"
 
-#: ../libgnome-desktop/gnome-rr-config.c:1032
+#: ../libgnome-desktop/gnome-rr-config.c:1751
 #, c-format
 msgid ""
 "could not assign CRTCs to outputs:\n"
@@ -90,7 +163,7 @@
 "nem rendelhetők CRTC-k a kimenetekhez:\n"
 "%s"
 
-#: ../libgnome-desktop/gnome-rr-config.c:1036
+#: ../libgnome-desktop/gnome-rr-config.c:1755
 #, c-format
 msgid ""
 "none of the selected modes were compatible with the possible modes:\n"
@@ -102,7 +175,7 @@
 #. Translators: the "requested", "minimum", and
 #. * "maximum" words here are not keywords; please
 #. * translate them as usual.
-#: ../libgnome-desktop/gnome-rr-config.c:1117
+#: ../libgnome-desktop/gnome-rr-config.c:1833
 #, c-format
 msgid ""
 "required virtual size does not fit available size: requested=(%d, %d), "
@@ -113,28 +186,33 @@
 
 #. Translators: This is the time format with full date used
 #. in 24-hour mode.
-#: ../libgnome-desktop/gnome-wall-clock.c:270
-msgid "%a %b %e, %R:%S"
+#. The character between %R and %S is U+2236 RATIO
+#: ../libgnome-desktop/gnome-wall-clock.c:268
+#| msgid "%a %b %e, %R:%S"
+msgid "%a %b %e, %R∶%S"
 msgstr "%a %b %e, %R.%S"
 
-#: ../libgnome-desktop/gnome-wall-clock.c:271
+#: ../libgnome-desktop/gnome-wall-clock.c:269
 msgid "%a %b %e, %R"
 msgstr "%a %b %e, %k.%M"
 
 #. Translators: This is the time format with day used
 #. in 24-hour mode.
-#: ../libgnome-desktop/gnome-wall-clock.c:275
-msgid "%a %R:%S"
+#. The character between %R and %S is U+2236 RATIO
+#: ../libgnome-desktop/gnome-wall-clock.c:274
+#| msgid "%a %R:%S"
+msgid "%a %R∶%S"
 msgstr "%a %R.%S"
 
-#: ../libgnome-desktop/gnome-wall-clock.c:276
+#: ../libgnome-desktop/gnome-wall-clock.c:275
 msgid "%a %R"
 msgstr "%a %k.%M"
 
 #. Translators: This is the time format without date used
 #. in 24-hour mode.
+#. The character between %R and %S is U+2236 RATIO
 #: ../libgnome-desktop/gnome-wall-clock.c:280
-msgid "%R:%S"
+msgid "%R∶%S"
 msgstr "%R.%S"
 
 #: ../libgnome-desktop/gnome-wall-clock.c:280
@@ -143,102 +221,43 @@
 
 #. Translators: This is a time format with full date used
 #. for AM/PM.
-#: ../libgnome-desktop/gnome-wall-clock.c:286
-msgid "%a %b %e, %l:%M:%S %p"
+#. The Unicode characters are U+2236 RATIO and
+#. U+2009 THIN SPACE
+#: ../libgnome-desktop/gnome-wall-clock.c:288
+#| msgid "%a %b %e, %l:%M:%S %p"
+msgid "%a %b %e, %l∶%M∶%S %p"
 msgstr "%a %b %e, %p %l.%M.%S"
 
-#: ../libgnome-desktop/gnome-wall-clock.c:287
-msgid "%a %b %e, %l:%M %p"
+#: ../libgnome-desktop/gnome-wall-clock.c:289
+#| msgid "%a %b %e, %l:%M %p"
+msgid "%a %b %e, %l∶%M %p"
 msgstr "%a %b %e, %p %l.%M"
 
 #. Translators: This is a time format with day used
 #. for AM/PM.
-#: ../libgnome-desktop/gnome-wall-clock.c:291
-msgid "%a %l:%M:%S %p"
-msgstr "%a %l.%M.%S %p"
-
-#: ../libgnome-desktop/gnome-wall-clock.c:292
-msgid "%a %l:%M %p"
-msgstr "%a %l.%M %p"
+#. The Unicode characters are U+2236 RATIO and
+#. U+2009 THIN SPACE
+#: ../libgnome-desktop/gnome-wall-clock.c:295
+#| msgid "%a %l:%M:%S %p"
+msgid "%a %l∶%M∶%S %p"
+msgstr "%a, %p %l.%M.%S"
 
-#. Translators: This is a time format without date used
-#. for AM/PM.
 #: ../libgnome-desktop/gnome-wall-clock.c:296
-msgid "%l:%M:%S %p"
-msgstr "%l.%M.%S %p"
-
-#: ../libgnome-desktop/gnome-wall-clock.c:297
-msgid "%l:%M %p"
-msgstr "%l.%M %p"
-
-#~ msgctxt "Monitor vendor"
-#~ msgid "Unknown"
-#~ msgstr "Ismeretlen"
-
-#~ msgid "could not get the screen resources (CRTCs, outputs, modes)"
-#~ msgstr "A képernyő erőforrásai nem kérhetők le (CRTC-k, kimenetek, módok)"
-
-#~ msgid "unhandled X error while getting the range of screen sizes"
-#~ msgstr ""
-#~ "Kezeletlen X hiba történt a képméretek tartományának lekérése közben"
-
-#~ msgid "could not get the range of screen sizes"
-#~ msgstr "Nem kérhető le a képméretek tartománya"
-
-#~ msgid "RANDR extension is not present"
-#~ msgstr "A RANDR kiterjesztés nincs jelen"
-
-#~ msgid "could not get information about output %d"
-#~ msgstr "Nem lehet információkat lekérni a kimenetről: %d"
-
-#~ msgid "Built-in Display"
-#~ msgstr "Beépített kijelző"
-
-#~ msgid "%s Display"
-#~ msgstr "%s kijelző"
-
-#~ msgid "Unknown Display"
-#~ msgstr "Ismeretlen kijelző"
-
-#~ msgid ""
-#~ "requested position/size for CRTC %d is outside the allowed limit: "
-#~ "position=(%d, %d), size=(%d, %d), maximum=(%d, %d)"
-#~ msgstr ""
-#~ "A kért pozíció/méret a(z) %d. CRTC-hez kívül esik az engedélyezett "
-#~ "korláton: pozíció=(%d, %d), méret=(%d, %d), maximum=(%d, %d)"
+#| msgid "%a %l:%M %p"
+msgid "%a %l∶%M %p"
+msgstr "%a, %p %l.%M"
 
-#~ msgid "could not set the configuration for CRTC %d"
-#~ msgstr "Nem állítható be a(z) %d. CRTC konfigurációja"
-
-#~ msgid "could not get information about CRTC %d"
-#~ msgstr "Nem kérhető információ a(z) %d. CRTC-ről"
-
-#~ msgid ""
-#~ "none of the saved display configurations matched the active configuration"
-#~ msgstr ""
-#~ "A mentett képernyő-beállítások egyike sem felel meg az aktív "
-#~ "konfigurációnak"
-
-#~| msgid "%a %b %e, %R:%S"
-#~ msgid "%a %b %e, %R∶%S"
-#~ msgstr "%a %b %e, %R.%S"
-
-#~ msgid "%R∶%S"
-#~ msgstr "%R.%S"
-
-#~| msgid "%a %l:%M:%S %p"
-#~ msgid "%a %l∶%M∶%S %p"
-#~ msgstr "%a, %p %l.%M.%S"
-
-#~| msgid "%a %l:%M %p"
-#~ msgid "%a %l∶%M %p"
-#~ msgstr "%a, %p %l.%M"
-
-#~ msgid "%l∶%M∶%S %p"
-#~ msgstr "%p %l.%M.%S"
-
-#~ msgid "%l∶%M %p"
-#~ msgstr "%p %l.%M"
+#. Translators: This is a time format without date used
+#. for AM/PM.
+#. The Unicode characters are U+2236 RATIO and
+#. U+2009 THIN SPACE
+#: ../libgnome-desktop/gnome-wall-clock.c:302
+msgid "%l∶%M∶%S %p"
+msgstr "%p %l.%M.%S"
+
+#: ../libgnome-desktop/gnome-wall-clock.c:303
+msgid "%l∶%M %p"
+msgstr "%p %l.%M"
 
 #~ msgid "Cannot find a terminal, using xterm, even if it may not work"
 #~ msgstr ""
@@ -250,3 +269,12 @@
 
 #~ msgid "Mirrored Displays"
 #~ msgstr "Tükrözött kijelzők"
+
+#~ msgid "%R:%S"
+#~ msgstr "%R.%S"
+
+#~ msgid "%l:%M:%S %p"
+#~ msgstr "%l.%M.%S %p"
+
+#~ msgid "%l:%M %p"
+#~ msgstr "%l.%M %p"
diff -Nru gnome-desktop3-3.12.0/po/id.po gnome-desktop3-3.8.4/po/id.po
--- gnome-desktop3-3.12.0/po/id.po	2013-11-11 17:23:18.000000000 +0000
+++ gnome-desktop3-3.8.4/po/id.po	2013-09-04 11:15:57.000000000 +0000
@@ -5,75 +5,152 @@
 #
 # Mohammad DAMT , 2005.
 # Dirgita , 2010.
-# Dirgita , 2010, 2012.
-# Andika Triwidada , 2013.
+# Dirgita , 2010, 2012, 2013.
 msgid ""
 msgstr ""
 "Project-Id-Version: gnome-desktop master\n"
 "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=gnome-"
 "desktop&keywords=I18N+L10N&component=general\n"
-"POT-Creation-Date: 2013-09-11 19:11+0000\n"
-"PO-Revision-Date: 2013-09-12 11:05+0700\n"
-"Last-Translator: Andika Triwidada \n"
-"Language-Team: Indonesian \n"
+"POT-Creation-Date: 2013-03-23 05:44+0000\n"
+"PO-Revision-Date: 2013-03-24 20:45+0700\n"
+"Last-Translator: Dirgita \n"
+"Language-Team: Indonesian \n"
 "Language: id\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: Poedit 1.5.7\n"
+"X-Generator: Lokalize 1.2\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
+#. Translators: "Unknown" here is used to identify a monitor for which
+#. * we don't know the vendor. When a vendor is known, the name of the
+#. * vendor is used.
+#: ../libgnome-desktop/display-name.c:107
+msgctxt "Monitor vendor"
+msgid "Unknown"
+msgstr "Tak Dikenal"
+
 #: ../libgnome-desktop/gnome-languages.c:804
 msgid "Unspecified"
 msgstr "Tak dinyatakan"
 
-#: ../libgnome-desktop/gnome-rr-config.c:743
+#. Translators: a CRTC is a CRT Controller (this is X terminology).
+#: ../libgnome-desktop/gnome-rr.c:452
+#, c-format
+msgid "could not get the screen resources (CRTCs, outputs, modes)"
+msgstr "tidak dapat memperoleh sumber daya monitor (CRTC, keluaran, modus)"
+
+#: ../libgnome-desktop/gnome-rr.c:472
+#, c-format
+msgid "unhandled X error while getting the range of screen sizes"
+msgstr "galat pada X sewaktu memperoleh jangkauan luas layar"
+
+#: ../libgnome-desktop/gnome-rr.c:478
+#, c-format
+msgid "could not get the range of screen sizes"
+msgstr "tidak dapat memperoleh jangkauan luas monitor"
+
+#: ../libgnome-desktop/gnome-rr.c:769
+#, c-format
+msgid "RANDR extension is not present"
+msgstr "ekstensi RANDR tidak tersedia"
+
+#: ../libgnome-desktop/gnome-rr.c:1580
+#, c-format
+msgid "could not get information about output %d"
+msgstr "tidak dapat memperoleh informasi mengenai keluaran %d"
+
+#: ../libgnome-desktop/gnome-rr.c:1764
+msgid "Built-in Display"
+msgstr "Tampilan Bawaan"
+
+#. Translators: %s is the size of the monitor in inches
+#: ../libgnome-desktop/gnome-rr.c:1782
+#, c-format
+msgid "%s Display"
+msgstr "Monitor %s"
+
+#: ../libgnome-desktop/gnome-rr.c:1789
+msgid "Unknown Display"
+msgstr "Tampilan Tak Dikenal"
+
+#. Translators: the "position", "size", and "maximum"
+#. * words here are not keywords; please translate them
+#. * as usual.  A CRTC is a CRT Controller (this is X terminology)
+#: ../libgnome-desktop/gnome-rr.c:2234
+#, c-format
+msgid ""
+"requested position/size for CRTC %d is outside the allowed limit: position="
+"(%d, %d), size=(%d, %d), maximum=(%d, %d)"
+msgstr ""
+"posisi/ukuran CRTC %d yang dipinta lebih besar dari batas yang "
+"diperbolehkan: posisi=(%d, %d), ukuran=(%d, %d), maksimal=(%d, %d)"
+
+#: ../libgnome-desktop/gnome-rr.c:2270
+#, c-format
+msgid "could not set the configuration for CRTC %d"
+msgstr "tidak dapat menyetel kondigurasi untuk CRTC %d"
+
+#: ../libgnome-desktop/gnome-rr.c:2421
+#, c-format
+msgid "could not get information about CRTC %d"
+msgstr "tidak dapat memperoleh informasi mengenai CRTC %d"
+
+#: ../libgnome-desktop/gnome-rr-config.c:708
+#, c-format
+msgid ""
+"none of the saved display configurations matched the active configuration"
+msgstr ""
+"konfigurasi yang saat ini aktif sama sekali tidak cocok dengan konfigurasi "
+"yang telah disimpan"
+
+#: ../libgnome-desktop/gnome-rr-config.c:1464
 #, c-format
 msgid "CRTC %d cannot drive output %s"
 msgstr "CRTC %d tidak dapat memacu keluaran %s"
 
-#: ../libgnome-desktop/gnome-rr-config.c:750
+#: ../libgnome-desktop/gnome-rr-config.c:1471
 #, c-format
 msgid "output %s does not support mode %dx%d@%dHz"
 msgstr "keluaran %s tidak mendukung modus %dx%d@%dHz"
 
-#: ../libgnome-desktop/gnome-rr-config.c:761
+#: ../libgnome-desktop/gnome-rr-config.c:1482
 #, c-format
-msgid "CRTC %d does not support rotation=%d"
-msgstr "CRTC %d tidak mendukung rotasi=%d"
+msgid "CRTC %d does not support rotation=%s"
+msgstr "CRTC %d tidak mendukung rotasi=%s"
 
-#: ../libgnome-desktop/gnome-rr-config.c:774
+#: ../libgnome-desktop/gnome-rr-config.c:1496
 #, c-format
 msgid ""
 "output %s does not have the same parameters as another cloned output:\n"
 "existing mode = %d, new mode = %d\n"
 "existing coordinates = (%d, %d), new coordinates = (%d, %d)\n"
-"existing rotation = %d, new rotation = %d"
+"existing rotation = %s, new rotation = %s"
 msgstr ""
 "keluaran %s tidak memiliki parameter yang sama seperti keluaran hasil "
 "duplikasi:\n"
 "modus yang ada = %d, modus yang baru = %d\n"
 "koordinat yang ada = (%d, %d), koordinat yang baru = (%d, %d)\n"
-"rotasi yang ada = %d, rotasi yang baru = %d"
+"rotasi yang ada = %s, rotasi yang baru = %s"
 
-#: ../libgnome-desktop/gnome-rr-config.c:789
+#: ../libgnome-desktop/gnome-rr-config.c:1511
 #, c-format
 msgid "cannot clone to output %s"
 msgstr "duplikasi untuk %s tidak dapat dilakukan"
 
-#: ../libgnome-desktop/gnome-rr-config.c:915
+#: ../libgnome-desktop/gnome-rr-config.c:1680
 #, c-format
 msgid "Trying modes for CRTC %d\n"
 msgstr "Mencoba modus untuk CRTC %d\n"
 
-#: ../libgnome-desktop/gnome-rr-config.c:939
+#: ../libgnome-desktop/gnome-rr-config.c:1704
 #, c-format
 msgid "CRTC %d: trying mode %dx%d@%dHz with output at %dx%d@%dHz (pass %d)\n"
 msgstr ""
 "CRTC %d: mencoba modus %dx%d@%dHz dengan keluaran pada %dx%d@%dHz (lewat "
 "%d)\n"
 
-#: ../libgnome-desktop/gnome-rr-config.c:986
+#: ../libgnome-desktop/gnome-rr-config.c:1751
 #, c-format
 msgid ""
 "could not assign CRTCs to outputs:\n"
@@ -82,7 +159,7 @@
 "tidak dapat menetapkan CRTC pada keluaran:\n"
 "%s"
 
-#: ../libgnome-desktop/gnome-rr-config.c:990
+#: ../libgnome-desktop/gnome-rr-config.c:1755
 #, c-format
 msgid ""
 "none of the selected modes were compatible with the possible modes:\n"
@@ -94,7 +171,7 @@
 #. Translators: the "requested", "minimum", and
 #. * "maximum" words here are not keywords; please
 #. * translate them as usual.
-#: ../libgnome-desktop/gnome-rr-config.c:1071
+#: ../libgnome-desktop/gnome-rr-config.c:1833
 #, c-format
 msgid ""
 "required virtual size does not fit available size: requested=(%d, %d), "
@@ -105,29 +182,32 @@
 
 #. Translators: This is the time format with full date used
 #. in 24-hour mode.
-#: ../libgnome-desktop/gnome-wall-clock.c:270
-msgid "%a %b %e, %R:%S"
+#. The character between %R and %S is U+2236 RATIO
+#: ../libgnome-desktop/gnome-wall-clock.c:268
+msgid "%a %b %e, %R∶%S"
 msgstr "%a %e %b, %R:%S"
 
-#: ../libgnome-desktop/gnome-wall-clock.c:271
+#: ../libgnome-desktop/gnome-wall-clock.c:269
 msgid "%a %b %e, %R"
 msgstr "%a %e %b, %R"
 
 #. Translators: This is the time format with day used
 #. in 24-hour mode.
-#: ../libgnome-desktop/gnome-wall-clock.c:275
-msgid "%a %R:%S"
-msgstr "%a %R:%S"
+#. The character between %R and %S is U+2236 RATIO
+#: ../libgnome-desktop/gnome-wall-clock.c:274
+msgid "%a %R∶%S"
+msgstr "%a %R∶%S"
 
-#: ../libgnome-desktop/gnome-wall-clock.c:276
+#: ../libgnome-desktop/gnome-wall-clock.c:275
 msgid "%a %R"
 msgstr "%a %R"
 
 #. Translators: This is the time format without date used
 #. in 24-hour mode.
+#. The character between %R and %S is U+2236 RATIO
 #: ../libgnome-desktop/gnome-wall-clock.c:280
-msgid "%R:%S"
-msgstr "%R:%S"
+msgid "%R∶%S"
+msgstr "%R∶%S"
 
 #: ../libgnome-desktop/gnome-wall-clock.c:280
 msgid "%R"
@@ -135,30 +215,36 @@
 
 #. Translators: This is a time format with full date used
 #. for AM/PM.
-#: ../libgnome-desktop/gnome-wall-clock.c:286
-msgid "%a %b %e, %l:%M:%S %p"
-msgstr "%a %e %b, %k:%M:%S"
+#. The Unicode characters are U+2236 RATIO and
+#. U+2009 THIN SPACE
+#: ../libgnome-desktop/gnome-wall-clock.c:288
+msgid "%a %b %e, %l∶%M∶%S %p"
+msgstr "%a %e %b, %l∶%M∶%S %p"
 
-#: ../libgnome-desktop/gnome-wall-clock.c:287
-msgid "%a %b %e, %l:%M %p"
+#: ../libgnome-desktop/gnome-wall-clock.c:289
+msgid "%a %b %e, %l∶%M %p"
 msgstr "%a %e %b, %k:%M"
 
 #. Translators: This is a time format with day used
 #. for AM/PM.
-#: ../libgnome-desktop/gnome-wall-clock.c:291
-msgid "%a %l:%M:%S %p"
-msgstr "%a %k:%M:%S"
-
-#: ../libgnome-desktop/gnome-wall-clock.c:292
-msgid "%a %l:%M %p"
-msgstr "%a %k:%M"
+#. The Unicode characters are U+2236 RATIO and
+#. U+2009 THIN SPACE
+#: ../libgnome-desktop/gnome-wall-clock.c:295
+msgid "%a %l∶%M∶%S %p"
+msgstr "%a %l∶%M∶%S %p"
 
-#. Translators: This is a time format without date used
-#. for AM/PM.
 #: ../libgnome-desktop/gnome-wall-clock.c:296
-msgid "%l:%M:%S %p"
-msgstr "%l:%M:%S %p"
+msgid "%a %l∶%M %p"
+msgstr "%a %l∶%M %p"
 
-#: ../libgnome-desktop/gnome-wall-clock.c:297
-msgid "%l:%M %p"
-msgstr "%l:%M %p"
+#. Translators: This is a time format without date used
+#. for AM/PM.
+#. The Unicode characters are U+2236 RATIO and
+#. U+2009 THIN SPACE
+#: ../libgnome-desktop/gnome-wall-clock.c:302
+msgid "%l∶%M∶%S %p"
+msgstr "%l∶%M∶%S %p"
+
+#: ../libgnome-desktop/gnome-wall-clock.c:303
+msgid "%l∶%M %p"
+msgstr "%l∶%M %p"
diff -Nru gnome-desktop3-3.12.0/po/it.po gnome-desktop3-3.8.4/po/it.po
--- gnome-desktop3-3.12.0/po/it.po	2013-11-11 17:23:18.000000000 +0000
+++ gnome-desktop3-3.8.4/po/it.po	2013-03-17 01:49:53.000000000 +0000
@@ -3,74 +3,155 @@
 # Copyright (C) 1997-2011, 2012, 2013 Free Software Foundation, Inc.
 # Christopher R. Gabriel , 1997, 1998, 1999, 2000, 2001, 2002.
 # Alessio Frusciante , 2003.
-# Milo Casagrande , 2010, 2012, 2013.
 # Luca Ferretti , 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2011, 2012, 2013.
+# Milo Casagrande , 2010, 2012, 2013.
 #
 msgid ""
 msgstr ""
 "Project-Id-Version: gnome-desktop\n"
-"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=gnome-"
-"desktop&keywords=I18N+L10N&component=general\n"
-"POT-Creation-Date: 2013-09-06 08:22+0000\n"
-"PO-Revision-Date: 2013-09-06 22:24+0200\n"
-"Last-Translator: Luca Ferretti \n"
-"Language-Team: Italiano \n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2013-03-11 21:52+0100\n"
+"PO-Revision-Date: 2013-03-11 21:52+0100\n"
+"Last-Translator: Milo Casagrande \n"
+"Language-Team: Italian \n"
 "Language: it\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-"X-Generator: Gtranslator 2.91.6\n"
+"Content-Transfer-Encoding: 8-bit\n"
+"Plural-Forms: nplurals=2; plural=(n!=1);\n"
+
+#. Translators: "Unknown" here is used to identify a monitor for which
+#. * we don't know the vendor. When a vendor is known, the name of the
+#. * vendor is used.
+#: ../libgnome-desktop/display-name.c:107
+msgctxt "Monitor vendor"
+msgid "Unknown"
+msgstr "Sconosciuto"
 
 #: ../libgnome-desktop/gnome-languages.c:804
 msgid "Unspecified"
 msgstr "Non specificato"
 
-#: ../libgnome-desktop/gnome-rr-config.c:743
+#. Translators: a CRTC is a CRT Controller (this is X terminology).
+#: ../libgnome-desktop/gnome-rr.c:452
+#, c-format
+msgid "could not get the screen resources (CRTCs, outputs, modes)"
+msgstr ""
+"impossibile ottenere le risorse di schermo (i CRTC, gli output, i modi)"
+
+#: ../libgnome-desktop/gnome-rr.c:472
+#, c-format
+msgid "unhandled X error while getting the range of screen sizes"
+msgstr ""
+"errore X non gestito durante il recupero dell'intervallo delle dimensioni di "
+"schermo"
+
+#: ../libgnome-desktop/gnome-rr.c:478
+#, c-format
+msgid "could not get the range of screen sizes"
+msgstr "impossibile ottenere l'intervallo delle dimensioni di schermo"
+
+# la prima lettera è minuscolo per omogeneità con gli
+# altri messaggi d'errore.
+#: ../libgnome-desktop/gnome-rr.c:769
+#, c-format
+msgid "RANDR extension is not present"
+msgstr "l'estensione RANDR non è presente"
+
+#: ../libgnome-desktop/gnome-rr.c:1580
+#, c-format
+msgid "could not get information about output %d"
+msgstr "impossibile ottenere informazioni sull'uscita %d"
+
+#: ../libgnome-desktop/gnome-rr.c:1764
+msgid "Built-in Display"
+msgstr "Monitor integrato"
+
+#. Translators: %s is the size of the monitor in inches
+#: ../libgnome-desktop/gnome-rr.c:1782
+#, c-format
+msgid "%s Display"
+msgstr "Monitor %s"
+
+#: ../libgnome-desktop/gnome-rr.c:1789
+msgid "Unknown Display"
+msgstr "Monitor sconosciuto"
+
+#. Translators: the "position", "size", and "maximum"
+#. * words here are not keywords; please translate them
+#. * as usual.  A CRTC is a CRT Controller (this is X terminology)
+#: ../libgnome-desktop/gnome-rr.c:2234
+#, c-format
+msgid ""
+"requested position/size for CRTC %d is outside the allowed limit: position="
+"(%d, %d), size=(%d, %d), maximum=(%d, %d)"
+msgstr ""
+"la posizione/dimensione richiesta per il CRTC %d è fuori dal limite "
+"consentito: posizione=(%d, %d), dimensione=(%d, %d), massimo=(%d, %d)"
+
+#: ../libgnome-desktop/gnome-rr.c:2270
+#, c-format
+msgid "could not set the configuration for CRTC %d"
+msgstr "impossibile impostare la configurazione per il CRTC %d"
+
+#: ../libgnome-desktop/gnome-rr.c:2421
+#, c-format
+msgid "could not get information about CRTC %d"
+msgstr "impossibile ottenere informazioni sul CRTC %d"
+
+#: ../libgnome-desktop/gnome-rr-config.c:708
+#, c-format
+msgid ""
+"none of the saved display configurations matched the active configuration"
+msgstr ""
+"nessuna della configurazioni di display salvate corrisponde alla "
+"configurazione attiva"
+
+#: ../libgnome-desktop/gnome-rr-config.c:1464
 #, c-format
 msgid "CRTC %d cannot drive output %s"
 msgstr "il CRTC %d non può gestire l'uscita %s"
 
-#: ../libgnome-desktop/gnome-rr-config.c:750
+#: ../libgnome-desktop/gnome-rr-config.c:1471
 #, c-format
 msgid "output %s does not support mode %dx%d@%dHz"
 msgstr "l'uscita %s non supporta la modalità %d×%d@%dHz"
 
-#: ../libgnome-desktop/gnome-rr-config.c:761
+#: ../libgnome-desktop/gnome-rr-config.c:1482
 #, c-format
-msgid "CRTC %d does not support rotation=%d"
-msgstr "il CRTC %d non supporta rotation=%d"
+msgid "CRTC %d does not support rotation=%s"
+msgstr "il CRTC %d non supporta rotation=%s"
 
-#: ../libgnome-desktop/gnome-rr-config.c:774
+#: ../libgnome-desktop/gnome-rr-config.c:1496
 #, c-format
 msgid ""
 "output %s does not have the same parameters as another cloned output:\n"
 "existing mode = %d, new mode = %d\n"
 "existing coordinates = (%d, %d), new coordinates = (%d, %d)\n"
-"existing rotation = %d, new rotation = %d"
+"existing rotation = %s, new rotation = %s"
 msgstr ""
 "l'uscita %s non presenta gli stessi parametri dell'altra uscita duplicata:\n"
 "modalità esistente: %d; nuova modalità: %d\n"
 "coordinate esistenti: (%d, %d); nuove coordinate: (%d, %d)\n"
-"rotazione esistente: %d; nuova rotazione: %d"
+"rotazione esistente: %s; nuova rotazione: %s"
 
-#: ../libgnome-desktop/gnome-rr-config.c:789
+#: ../libgnome-desktop/gnome-rr-config.c:1511
 #, c-format
 msgid "cannot clone to output %s"
 msgstr "impossibile duplicare sull'uscita %s"
 
-#: ../libgnome-desktop/gnome-rr-config.c:915
+#: ../libgnome-desktop/gnome-rr-config.c:1680
 #, c-format
 msgid "Trying modes for CRTC %d\n"
 msgstr "Prova delle modalità per il CRTC %d\n"
 
-#: ../libgnome-desktop/gnome-rr-config.c:939
+#: ../libgnome-desktop/gnome-rr-config.c:1704
 #, c-format
 msgid "CRTC %d: trying mode %dx%d@%dHz with output at %dx%d@%dHz (pass %d)\n"
 msgstr ""
 "CRTC %d: prova modalità %d×%d@%dHz con uscita a %d×%d@%dHz (passaggio %d)\n"
 
-#: ../libgnome-desktop/gnome-rr-config.c:986
+#: ../libgnome-desktop/gnome-rr-config.c:1751
 #, c-format
 msgid ""
 "could not assign CRTCs to outputs:\n"
@@ -79,7 +160,7 @@
 "impossibile assegnare i CRTC alle uscite:\n"
 "%s"
 
-#: ../libgnome-desktop/gnome-rr-config.c:990
+#: ../libgnome-desktop/gnome-rr-config.c:1755
 #, c-format
 msgid ""
 "none of the selected modes were compatible with the possible modes:\n"
@@ -92,7 +173,7 @@
 #. Translators: the "requested", "minimum", and
 #. * "maximum" words here are not keywords; please
 #. * translate them as usual.
-#: ../libgnome-desktop/gnome-rr-config.c:1071
+#: ../libgnome-desktop/gnome-rr-config.c:1833
 #, c-format
 msgid ""
 "required virtual size does not fit available size: requested=(%d, %d), "
@@ -103,29 +184,32 @@
 
 #. Translators: This is the time format with full date used
 #. in 24-hour mode.
-#: ../libgnome-desktop/gnome-wall-clock.c:270
-msgid "%a %b %e, %R:%S"
+#. The character between %R and %S is U+2236 RATIO
+#: ../libgnome-desktop/gnome-wall-clock.c:268
+msgid "%a %b %e, %R∶%S"
 msgstr "%a %e %b, %k.%M.%S"
 
-#: ../libgnome-desktop/gnome-wall-clock.c:271
+#: ../libgnome-desktop/gnome-wall-clock.c:269
 msgid "%a %b %e, %R"
 msgstr "%a %e %b, %k.%M"
 
 #. Translators: This is the time format with day used
 #. in 24-hour mode.
-#: ../libgnome-desktop/gnome-wall-clock.c:275
-msgid "%a %R:%S"
+#. The character between %R and %S is U+2236 RATIO
+#: ../libgnome-desktop/gnome-wall-clock.c:274
+msgid "%a %R∶%S"
 msgstr "%a %k.%M.%S"
 
-#: ../libgnome-desktop/gnome-wall-clock.c:276
+#: ../libgnome-desktop/gnome-wall-clock.c:275
 msgid "%a %R"
 msgstr "%a %k.%M"
 
 #. Translators: This is the time format without date used
 #. in 24-hour mode.
+#. The character between %R and %S is U+2236 RATIO
 #: ../libgnome-desktop/gnome-wall-clock.c:280
-msgid "%R:%S"
-msgstr "%k.%M.%S"
+msgid "%R∶%S"
+msgstr "%k.%m.%S"
 
 #: ../libgnome-desktop/gnome-wall-clock.c:280
 msgid "%R"
@@ -133,94 +217,36 @@
 
 #. Translators: This is a time format with full date used
 #. for AM/PM.
-#: ../libgnome-desktop/gnome-wall-clock.c:286
-msgid "%a %b %e, %l:%M:%S %p"
+#. The Unicode characters are U+2236 RATIO and
+#. U+2009 THIN SPACE
+#: ../libgnome-desktop/gnome-wall-clock.c:288
+msgid "%a %b %e, %l∶%M∶%S %p"
 msgstr "%a %e %b, %l.%M.%S %P"
 
-#: ../libgnome-desktop/gnome-wall-clock.c:287
-msgid "%a %b %e, %l:%M %p"
+#: ../libgnome-desktop/gnome-wall-clock.c:289
+msgid "%a %b %e, %l∶%M %p"
 msgstr "%a %e %b, %l.%M %P"
 
 #. Translators: This is a time format with day used
 #. for AM/PM.
-#: ../libgnome-desktop/gnome-wall-clock.c:291
-msgid "%a %l:%M:%S %p"
+#. The Unicode characters are U+2236 RATIO and
+#. U+2009 THIN SPACE
+#: ../libgnome-desktop/gnome-wall-clock.c:295
+msgid "%a %l∶%M∶%S %p"
 msgstr "%a %l.%M.%S %P"
 
-#: ../libgnome-desktop/gnome-wall-clock.c:292
-msgid "%a %l:%M %p"
+#: ../libgnome-desktop/gnome-wall-clock.c:296
+msgid "%a %l∶%M %p"
 msgstr "%a %l.%M %P"
 
 #. Translators: This is a time format without date used
 #. for AM/PM.
-#: ../libgnome-desktop/gnome-wall-clock.c:296
-msgid "%l:%M:%S %p"
+#. The Unicode characters are U+2236 RATIO and
+#. U+2009 THIN SPACE
+#: ../libgnome-desktop/gnome-wall-clock.c:302
+msgid "%l∶%M∶%S %p"
 msgstr "%l.%M.%S %P"
 
-#: ../libgnome-desktop/gnome-wall-clock.c:297
-msgid "%l:%M %p"
-msgstr "%l.%M %p"
-
-#~ msgctxt "Monitor vendor"
-#~ msgid "Unknown"
-#~ msgstr "Sconosciuto"
-
-#~ msgid "could not get the screen resources (CRTCs, outputs, modes)"
-#~ msgstr ""
-#~ "impossibile ottenere le risorse di schermo (i CRTC, gli output, i modi)"
-
-#~ msgid "unhandled X error while getting the range of screen sizes"
-#~ msgstr ""
-#~ "errore X non gestito durante il recupero dell'intervallo delle dimensioni "
-#~ "di schermo"
-
-#~ msgid "could not get the range of screen sizes"
-#~ msgstr "impossibile ottenere l'intervallo delle dimensioni di schermo"
-
-# la prima lettera è minuscolo per omogeneità con gli
-# altri messaggi d'errore.
-#~ msgid "RANDR extension is not present"
-#~ msgstr "l'estensione RANDR non è presente"
-
-#~ msgid "could not get information about output %d"
-#~ msgstr "impossibile ottenere informazioni sull'uscita %d"
-
-#~ msgid "Built-in Display"
-#~ msgstr "Monitor integrato"
-
-#~ msgid "%s Display"
-#~ msgstr "Monitor %s"
-
-#~ msgid "Unknown Display"
-#~ msgstr "Monitor sconosciuto"
-
-#~ msgid ""
-#~ "requested position/size for CRTC %d is outside the allowed limit: "
-#~ "position=(%d, %d), size=(%d, %d), maximum=(%d, %d)"
-#~ msgstr ""
-#~ "la posizione/dimensione richiesta per il CRTC %d è fuori dal limite "
-#~ "consentito: posizione=(%d, %d), dimensione=(%d, %d), massimo=(%d, %d)"
-
-#~ msgid "could not set the configuration for CRTC %d"
-#~ msgstr "impossibile impostare la configurazione per il CRTC %d"
-
-#~ msgid "could not get information about CRTC %d"
-#~ msgstr "impossibile ottenere informazioni sul CRTC %d"
-
-#~ msgid ""
-#~ "none of the saved display configurations matched the active configuration"
-#~ msgstr ""
-#~ "nessuna della configurazioni di display salvate corrisponde alla "
-#~ "configurazione attiva"
-
-#~ msgid "%a %b %e, %R∶%S"
-#~ msgstr "%a %e %b, %k.%M.%S"
-
-#~ msgid "%R∶%S"
-#~ msgstr "%k.%m.%S"
-
-#~ msgid "%l∶%M∶%S %p"
-#~ msgstr "%l.%M.%S %P"
-
-#~ msgid "%l∶%M %p"
-#~ msgstr "%l.%M %P"
+#: ../libgnome-desktop/gnome-wall-clock.c:303
+msgid "%l∶%M %p"
+msgstr "%l.%M %P"
diff -Nru gnome-desktop3-3.12.0/po/ja.po gnome-desktop3-3.8.4/po/ja.po
--- gnome-desktop3-3.12.0/po/ja.po	2013-11-11 17:23:18.000000000 +0000
+++ gnome-desktop3-3.8.4/po/ja.po	2013-04-15 09:26:23.000000000 +0000
@@ -18,7 +18,7 @@
 msgstr ""
 "Project-Id-Version: gnome-desktop master\n"
 "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=gnome-desktop&keywords=I18N+L10N&component=general\n"
-"POT-Creation-Date: 2013-09-18 15:52+0000\n"
+"POT-Creation-Date: 2013-03-04 10:03+0000\n"
 "PO-Revision-Date: 2013-03-24 22:43+0900\n"
 "Last-Translator: Jiro Matsuzawa \n"
 "Language-Team: Japanese \n"
@@ -28,54 +28,126 @@
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
+#. Translators: "Unknown" here is used to identify a monitor for which
+#. * we don't know the vendor. When a vendor is known, the name of the
+#. * vendor is used.
+#: ../libgnome-desktop/display-name.c:107
+msgctxt "Monitor vendor"
+msgid "Unknown"
+msgstr "不明"
+
 #: ../libgnome-desktop/gnome-languages.c:804
 msgid "Unspecified"
 msgstr "指定なし"
 
-#: ../libgnome-desktop/gnome-rr-config.c:743
+#. Translators: a CRTC is a CRT Controller (this is X terminology).
+#: ../libgnome-desktop/gnome-rr.c:452
+#, c-format
+msgid "could not get the screen resources (CRTCs, outputs, modes)"
+msgstr "画面のリソース (いろいろな CRTC、出力、モード等) を取得できませんでした"
+
+# 'X' という1文字は固有名詞なので大文字にすること
+#: ../libgnome-desktop/gnome-rr.c:472
+#, c-format
+msgid "unhandled X error while getting the range of screen sizes"
+msgstr "画面の解像度を取得する際にXサーバーで原因不明のエラーが発生しました"
+
+#: ../libgnome-desktop/gnome-rr.c:478
+#, c-format
+msgid "could not get the range of screen sizes"
+msgstr "画面の解像度を取得できませんでした"
+
+#: ../libgnome-desktop/gnome-rr.c:769
+#, c-format
+msgid "RANDR extension is not present"
+msgstr "RANDR 拡張がインストールされていません"
+
+#: ../libgnome-desktop/gnome-rr.c:1580
+#, c-format
+msgid "could not get information about output %d"
+msgstr "出力 %d に関する情報を取得できませんでした"
+
+#: ../libgnome-desktop/gnome-rr.c:1764
+msgid "Built-in Display"
+msgstr "組み込みディスプレイ"
+
+#. Translators: %s is the size of the monitor in inches
+#: ../libgnome-desktop/gnome-rr.c:1782
+#, c-format
+msgid "%s Display"
+msgstr "%s ディスプレイ"
+
+#: ../libgnome-desktop/gnome-rr.c:1789
+msgid "Unknown Display"
+msgstr "不明なディスプレイ"
+
+#. Translators: the "position", "size", and "maximum"
+#. * words here are not keywords; please translate them
+#. * as usual.  A CRTC is a CRT Controller (this is X terminology)
+#: ../libgnome-desktop/gnome-rr.c:2234
+#, c-format
+msgid "requested position/size for CRTC %d is outside the allowed limit: position=(%d, %d), size=(%d, %d), maximum=(%d, %d)"
+msgstr "要求した CRTC %d の位置やサイズが許容範囲を超えました: 位置 (%d, %d)、サイズ (%d, %d) / 許容範囲 (%d, %d)"
+
+#: ../libgnome-desktop/gnome-rr.c:2270
+#, c-format
+msgid "could not set the configuration for CRTC %d"
+msgstr "CRTC %d の設定をセットできませんでした"
+
+#: ../libgnome-desktop/gnome-rr.c:2421
+#, c-format
+msgid "could not get information about CRTC %d"
+msgstr "CRTC %d に関する情報を取得できませんでした"
+
+#: ../libgnome-desktop/gnome-rr-config.c:708
+#, c-format
+msgid "none of the saved display configurations matched the active configuration"
+msgstr "保存したディスプレイの設定に一致する現在の設定はありません"
+
+#: ../libgnome-desktop/gnome-rr-config.c:1464
 #, c-format
 msgid "CRTC %d cannot drive output %s"
 msgstr "CRTC %d は出力 %s をドライブできません"
 
-#: ../libgnome-desktop/gnome-rr-config.c:750
+#: ../libgnome-desktop/gnome-rr-config.c:1471
 #, c-format
 msgid "output %s does not support mode %dx%d@%dHz"
 msgstr "出力 %s は %dx%d@%dHz のモードをサポートしていません"
 
-#: ../libgnome-desktop/gnome-rr-config.c:761
+#: ../libgnome-desktop/gnome-rr-config.c:1482
 #, c-format
-msgid "CRTC %d does not support rotation=%d"
-msgstr "CRTC %d は rotation=%d をサポートしていません"
+msgid "CRTC %d does not support rotation=%s"
+msgstr "CRTC %d は rotation=%s をサポートしていません"
 
-#: ../libgnome-desktop/gnome-rr-config.c:774
+#: ../libgnome-desktop/gnome-rr-config.c:1496
 #, c-format
 msgid ""
 "output %s does not have the same parameters as another cloned output:\n"
 "existing mode = %d, new mode = %d\n"
 "existing coordinates = (%d, %d), new coordinates = (%d, %d)\n"
-"existing rotation = %d, new rotation = %d"
+"existing rotation = %s, new rotation = %s"
 msgstr ""
 "出力 %s は他のクローン出力と同じパラメーターを持っていません:\n"
 "現在 mode = %d, 新 mode = %d\n"
 "現在 coordinates = (%d, %d), 新 coordinates = (%d, %d)\n"
-"現在 rotation = %d, 新 rotation = %d"
+"現在 rotation = %s, 新 rotation = %s"
 
-#: ../libgnome-desktop/gnome-rr-config.c:789
+#: ../libgnome-desktop/gnome-rr-config.c:1511
 #, c-format
 msgid "cannot clone to output %s"
 msgstr "出力 %s をクローンできません"
 
-#: ../libgnome-desktop/gnome-rr-config.c:915
+#: ../libgnome-desktop/gnome-rr-config.c:1680
 #, c-format
 msgid "Trying modes for CRTC %d\n"
 msgstr "CRTC %d のモードを試します\n"
 
-#: ../libgnome-desktop/gnome-rr-config.c:939
+#: ../libgnome-desktop/gnome-rr-config.c:1704
 #, c-format
 msgid "CRTC %d: trying mode %dx%d@%dHz with output at %dx%d@%dHz (pass %d)\n"
 msgstr "CRTC %d: %dx%d@%dHz のモードを %dx%d@%dHz (%d パス) の出力で試します\n"
 
-#: ../libgnome-desktop/gnome-rr-config.c:986
+#: ../libgnome-desktop/gnome-rr-config.c:1751
 #, c-format
 msgid ""
 "could not assign CRTCs to outputs:\n"
@@ -84,7 +156,7 @@
 "CRTC を出力に割り当てできませんでした:\n"
 "%s"
 
-#: ../libgnome-desktop/gnome-rr-config.c:990
+#: ../libgnome-desktop/gnome-rr-config.c:1755
 #, c-format
 msgid ""
 "none of the selected modes were compatible with the possible modes:\n"
@@ -96,129 +168,79 @@
 #. Translators: the "requested", "minimum", and
 #. * "maximum" words here are not keywords; please
 #. * translate them as usual.
-#: ../libgnome-desktop/gnome-rr-config.c:1071
+#: ../libgnome-desktop/gnome-rr-config.c:1833
 #, c-format
 msgid "required virtual size does not fit available size: requested=(%d, %d), minimum=(%d, %d), maximum=(%d, %d)"
 msgstr "要求した仮想サイズと実際のサイズがマッチしません: 要求したサイズ (%d, %d) / 最小サイズ (%d, %d)、最大サイズ (%d, %d)"
 
 #. Translators: This is the time format with full date used
 #. in 24-hour mode.
-#: ../libgnome-desktop/gnome-wall-clock.c:270
-msgid "%a %b %e, %R:%S"
-msgstr "%B%e日 (%a) %R:%S"
+#. The character between %R and %S is U+2236 RATIO
+#: ../libgnome-desktop/gnome-wall-clock.c:268
+msgid "%a %b %e, %R∶%S"
+msgstr "%B%-e日 (%a) %H∶%M∶%S"
 
-#: ../libgnome-desktop/gnome-wall-clock.c:271
+#: ../libgnome-desktop/gnome-wall-clock.c:269
 msgid "%a %b %e, %R"
-msgstr "%B%e日 (%a) %R"
+msgstr "%B%e日 (%a) %H∶%M"
 
 #. Translators: This is the time format with day used
 #. in 24-hour mode.
-#: ../libgnome-desktop/gnome-wall-clock.c:275
-msgid "%a %R:%S"
-msgstr "%A %R:%S"
+#. The character between %R and %S is U+2236 RATIO
+#: ../libgnome-desktop/gnome-wall-clock.c:274
+msgid "%a %R∶%S"
+msgstr "%A %H∶%M∶%S"
 
-#: ../libgnome-desktop/gnome-wall-clock.c:276
+#: ../libgnome-desktop/gnome-wall-clock.c:275
 msgid "%a %R"
-msgstr "%A %R"
+msgstr "%A %H∶%M"
 
 #. Translators: This is the time format without date used
 #. in 24-hour mode.
+#. The character between %R and %S is U+2236 RATIO
 #: ../libgnome-desktop/gnome-wall-clock.c:280
-msgid "%R:%S"
-msgstr "%R:%S"
+msgid "%R∶%S"
+msgstr "%H∶%M∶%S"
 
 #: ../libgnome-desktop/gnome-wall-clock.c:280
 msgid "%R"
-msgstr "%R"
+msgstr "%H∶%M"
 
 #. Translators: This is a time format with full date used
 #. for AM/PM.
-#: ../libgnome-desktop/gnome-wall-clock.c:286
-msgid "%a %b %e, %l:%M:%S %p"
-msgstr "%B%e日 (%a) %p%I:%M:%S"
-
-#: ../libgnome-desktop/gnome-wall-clock.c:287
-msgid "%a %b %e, %l:%M %p"
-msgstr "%B%e日 (%a) %p%I:%M"
+#. The Unicode characters are U+2236 RATIO and
+#. U+2009 THIN SPACE
+#: ../libgnome-desktop/gnome-wall-clock.c:288
+msgid "%a %b %e, %l∶%M∶%S %p"
+msgstr "%B%e日 (%a) %p%I∶%M∶%S"
+
+#: ../libgnome-desktop/gnome-wall-clock.c:289
+msgid "%a %b %e, %l∶%M %p"
+msgstr "%B%e日 (%a) %p%I∶%M"
 
 #. Translators: This is a time format with day used
 #. for AM/PM.
-#: ../libgnome-desktop/gnome-wall-clock.c:291
-msgid "%a %l:%M:%S %p"
-msgstr "%A %p%I:%M:%S"
-
-#: ../libgnome-desktop/gnome-wall-clock.c:292
-msgid "%a %l:%M %p"
-msgstr "%A %p%I:%M"
+#. The Unicode characters are U+2236 RATIO and
+#. U+2009 THIN SPACE
+#: ../libgnome-desktop/gnome-wall-clock.c:295
+msgid "%a %l∶%M∶%S %p"
+msgstr "%A %p%I∶%M∶%S "
 
-#. Translators: This is a time format without date used
-#. for AM/PM.
 #: ../libgnome-desktop/gnome-wall-clock.c:296
-msgid "%l:%M:%S %p"
-msgstr "%p %l:%M:%S"
-
-#: ../libgnome-desktop/gnome-wall-clock.c:297
-msgid "%l:%M %p"
-msgstr "%p %l:%M"
-
-#~ msgctxt "Monitor vendor"
-#~ msgid "Unknown"
-#~ msgstr "不明"
-
-#~ msgid "could not get the screen resources (CRTCs, outputs, modes)"
-#~ msgstr "画面のリソース (いろいろな CRTC、出力、モード等) を取得できませんでした"
-
-# 'X' という1文字は固有名詞なので大文字にすること
-#~ msgid "unhandled X error while getting the range of screen sizes"
-#~ msgstr "画面の解像度を取得する際にXサーバーで原因不明のエラーが発生しました"
-
-#~ msgid "could not get the range of screen sizes"
-#~ msgstr "画面の解像度を取得できませんでした"
-
-#~ msgid "RANDR extension is not present"
-#~ msgstr "RANDR 拡張がインストールされていません"
-
-#~ msgid "could not get information about output %d"
-#~ msgstr "出力 %d に関する情報を取得できませんでした"
-
-#~ msgid "Built-in Display"
-#~ msgstr "組み込みディスプレイ"
-
-#~ msgid "%s Display"
-#~ msgstr "%s ディスプレイ"
-
-#~ msgid "Unknown Display"
-#~ msgstr "不明なディスプレイ"
-
-#~ msgid "requested position/size for CRTC %d is outside the allowed limit: position=(%d, %d), size=(%d, %d), maximum=(%d, %d)"
-#~ msgstr "要求した CRTC %d の位置やサイズが許容範囲を超えました: 位置 (%d, %d)、サイズ (%d, %d) / 許容範囲 (%d, %d)"
+msgid "%a %l∶%M %p"
+msgstr "%A %p%I∶%M"
 
-#~ msgid "could not set the configuration for CRTC %d"
-#~ msgstr "CRTC %d の設定をセットできませんでした"
-
-#~ msgid "could not get information about CRTC %d"
-#~ msgstr "CRTC %d に関する情報を取得できませんでした"
-
-#~ msgid "none of the saved display configurations matched the active configuration"
-#~ msgstr "保存したディスプレイの設定に一致する現在の設定はありません"
-
-#~ msgid "%a %b %e, %R∶%S"
-#~ msgstr "%B%-e日 (%a) %H∶%M∶%S"
-
-#~ msgid "%R∶%S"
-#~ msgstr "%H∶%M∶%S"
-
-#~ msgid "%a %l∶%M∶%S %p"
-#~ msgstr "%A %p%I∶%M∶%S "
-
-#~ msgid "%a %l∶%M %p"
-#~ msgstr "%A %p%I∶%M"
-
-#~ msgid "%l∶%M∶%S %p"
-#~ msgstr "%p%I∶%M∶%S"
-
-#~ msgid "%l∶%M %p"
-#~ msgstr "%p%I∶%M"
+#. Translators: This is a time format without date used
+#. for AM/PM.
+#. The Unicode characters are U+2236 RATIO and
+#. U+2009 THIN SPACE
+#: ../libgnome-desktop/gnome-wall-clock.c:302
+msgid "%l∶%M∶%S %p"
+msgstr "%p%I∶%M∶%S"
+
+#: ../libgnome-desktop/gnome-wall-clock.c:303
+msgid "%l∶%M %p"
+msgstr "%p%I∶%M"
 
 #~ msgid "Cannot find a terminal, using xterm, even if it may not work"
 #~ msgstr "端末が見つからなかったので強制的に xterm を使用します (正しく動作しないかもしれません)"
@@ -229,6 +251,15 @@
 #~ msgid "Mirrored Displays"
 #~ msgstr "ミラーされたディスプレイ"
 
+#~ msgid "%R:%S"
+#~ msgstr "%R:%S"
+
+#~ msgid "%l:%M:%S %p"
+#~ msgstr "%p %l:%M:%S"
+
+#~ msgid "%l:%M %p"
+#~ msgstr "%p %l:%M"
+
 #~ msgid "Mirror Screens"
 #~ msgstr "複数の画面をミラーする"
 
diff -Nru gnome-desktop3-3.12.0/po/kk.po gnome-desktop3-3.8.4/po/kk.po
--- gnome-desktop3-3.12.0/po/kk.po	2013-11-11 17:23:18.000000000 +0000
+++ gnome-desktop3-3.8.4/po/kk.po	2013-09-04 11:15:57.000000000 +0000
@@ -7,73 +7,304 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: \n"
-"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=gnome-"
-"desktop&keywords=I18N+L10N&component=general\n"
-"POT-Creation-Date: 2013-08-27 10:49+0000\n"
-"PO-Revision-Date: 2013-08-31 15:59+0600\n"
+"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=gnome-desktop&component=general\n"
+"POT-Creation-Date: 2010-08-04 12:41+0000\n"
+"PO-Revision-Date: 2010-09-15 12:34+0600\n"
 "Last-Translator: Baurzhan Muftakhidinov \n"
 "Language-Team: Kazakh \n"
-"Language: kk\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=1; plural=0;\n"
-"X-Generator: Poedit 1.5.4\n"
+"Plural-Forms: nplurals=1; plural=0\n"
+"X-Poedit-Language: Kazakh\n"
+"X-Poedit-Country: KAZAKHSTAN\n"
+
+#: ../gnome-about/gnome-about.desktop.in.in.h:1
+#: ../gnome-about/gnome-about.in:60
+msgid "About GNOME"
+msgstr "GNOME туралы"
+
+#: ../gnome-about/gnome-about.desktop.in.in.h:2
+msgid "Learn more about GNOME"
+msgstr "GNOME туралы көбірек біліңіз"
+
+#: ../gnome-about/gnome-about.in:61
+msgid "News"
+msgstr "Жаңалықтар"
+
+#: ../gnome-about/gnome-about.in:62
+msgid "GNOME Library"
+msgstr "GNOME кітапханасы"
+
+#: ../gnome-about/gnome-about.in:63
+msgid "Friends of GNOME"
+msgstr "GNOME достары"
+
+#: ../gnome-about/gnome-about.in:64
+msgid "Contact"
+msgstr "Контакт"
+
+#: ../gnome-about/gnome-about.in:68
+msgid "The Mysterious GEGL"
+msgstr "Құпия GEGL"
+
+#: ../gnome-about/gnome-about.in:69
+msgid "The Squeaky Rubber GNOME"
+msgstr "Шиқылдайтын резеңке GNOME"
+
+#: ../gnome-about/gnome-about.in:70
+msgid "Wanda The GNOME Fish"
+msgstr "Wanda - GNOME балығы"
+
+#: ../gnome-about/gnome-about.in:567
+msgid "_Open URL"
+msgstr "Сілтемені _ашу"
+
+#: ../gnome-about/gnome-about.in:574
+msgid "_Copy URL"
+msgstr "Сілтемені _көшіру"
+
+#: ../gnome-about/gnome-about.in:826
+msgid "About the GNOME Desktop"
+msgstr "GNOME ортасы туралы"
+
+#: ../gnome-about/gnome-about.in:859
+msgid "%(name)s: %(value)s"
+msgstr "%(name)s: %(value)s"
+
+#: ../gnome-about/gnome-about.in:873
+msgid "Welcome to the GNOME Desktop"
+msgstr "GNOME ортасына қош келдіңіз"
+
+#: ../gnome-about/gnome-about.in:890
+msgid "Brought to you by:"
+msgstr "Осыны қолжетерлік қылған:"
+
+#: ../gnome-about/gnome-about.in:914
+msgid "%(name)s: %(value)s"
+msgstr "%(name)s: %(value)s"
+
+#: ../gnome-about/gnome-about.in:975
+msgid "Version"
+msgstr "Нұсқасы"
+
+#: ../gnome-about/gnome-about.in:977
+msgid "Distributor"
+msgstr "Таратушы"
+
+#: ../gnome-about/gnome-about.in:979
+msgid "Build Date"
+msgstr "Құрастыру уақыты"
+
+#: ../gnome-about/gnome-about.in:1024
+msgid "Display information on this GNOME version"
+msgstr "GNOME нұсқасына байланысты ақпаратты көрсету"
+
+#: ../gnome-version.xml.in.in.h:1
+msgid "GNOME also includes a complete development platform for applications programmers, allowing the creation of powerful and complex applications."
+msgstr "GNOME құрамында бағдарламаларды жасаушылар үшін дайын кешен бар, оның көмегімен мүмкіндіктері көп бағдарламаларды жасауға болады."
+
+#: ../gnome-version.xml.in.in.h:2
+msgid "GNOME includes most of what you see on your computer, including the file manager, web browser, menus, and many applications."
+msgstr "GNOME ортасының құрамында файлдар басқарушысын, веб-беттерді ашатын браузерді, мәзір панелін және т.б. қолданбаларды кездестіре аласыз."
+
+#. NOTE TO AUTHORS: Do not put anything in the following paragraphs that
+#. will be substituted by the configure script. Otherwise you will break
+#. the translations.
+#: ../gnome-version.xml.in.in.h:6
+msgid "GNOME is a Free, usable, stable, accessible desktop environment for the Unix-like family of operating systems."
+msgstr "GNOME - UNIX-тәріздес операциялық жүйелер үшін еркін, тұрақты, қолдануға қолайлы жұмыс үстелінің ортасы."
+
+#: ../gnome-version.xml.in.in.h:7
+msgid "GNOME's focus on usability and accessibility, regular release cycle, and strong corporate backing make it unique among Free Software desktops."
+msgstr "GNOME қолайлы меңгерілуіне (шектеулі мүмкіндіктері бар адамдарға да) және тұрақты шығару мерзіміне аса үлкен көңіл бөледі."
+
+#: ../gnome-version.xml.in.in.h:8
+msgid "GNOME's greatest strength is our strong community. Virtually anyone, with or without coding skills, can contribute to making GNOME better."
+msgstr "GNOME күші - оның қоғамдастықта. GNOME жобасы ерекшеліктерінен бірі - бағдарлама құра алмайтын адам да оны көркейтуде өз үлесін қоса алады."
+
+#: ../gnome-version.xml.in.in.h:9
+msgid "Hundreds of people have contributed code to GNOME since it was started in 1997; many more have contributed in other important ways, including translations, documentation, and quality assurance."
+msgstr "GNOME жобасы 1997 жылда басталғаннан бері бастапқы кодты жазуға жүздеген адам өз үлестерін қосқан, бірақ оны аудару мен көркейтуде одан да көп адам атсалысты."
+
+#. Translators: "Unknown" here is used to identify a monitor for which
+#. * we don't know the vendor. When a vendor is known, the name of the
+#. * vendor is used.
+#: ../libgnome-desktop/display-name.c:265
+#| msgid "Unknown"
+msgctxt "Monitor vendor"
+msgid "Unknown"
+msgstr "Белгісіз"
 
-#: ../libgnome-desktop/gnome-languages.c:804
-msgid "Unspecified"
-msgstr "Анықталмаған"
+#: ../libgnome-desktop/gnome-desktop-item.c:220
+#, c-format
+msgid "Error reading file '%s': %s"
+msgstr "'%s' файлын оқу қатесі: %s"
+
+#: ../libgnome-desktop/gnome-desktop-item.c:288
+#, c-format
+msgid "Error rewinding file '%s': %s"
+msgstr "'%s' файлын айналдыру қатесі: %s"
+
+#. Translators: the "name" mentioned
+#. * here is the name of an application or
+#. * a document
+#. Translators: the "name" mentioned here is the name of
+#. * an application or a document
+#: ../libgnome-desktop/gnome-desktop-item.c:380
+#: ../libgnome-desktop/gnome-desktop-item.c:3524
+msgid "No name"
+msgstr "Аты жоқ"
+
+#: ../libgnome-desktop/gnome-desktop-item.c:607
+#, c-format
+msgid "File '%s' is not a regular file or directory."
+msgstr "'%s' файлы қалыпты файл не бума емес"
+
+#: ../libgnome-desktop/gnome-desktop-item.c:791
+#, c-format
+#| msgid "Error cannot find file id '%s'"
+msgid "Cannot find file '%s'"
+msgstr "'%s' файлы табылмады"
+
+#: ../libgnome-desktop/gnome-desktop-item.c:837
+#, c-format
+msgid "No filename to save to"
+msgstr "Сақтау үшін файлдың аты берілмеген"
+
+#: ../libgnome-desktop/gnome-desktop-item.c:1822
+#, c-format
+msgid "Starting %s"
+msgstr "%s іске қосылуда"
+
+#: ../libgnome-desktop/gnome-desktop-item.c:2058
+#, c-format
+msgid "No URL to launch"
+msgstr "Жөнелту үшін сілтеме көрсетілмеген"
+
+#: ../libgnome-desktop/gnome-desktop-item.c:2074
+#, c-format
+msgid "Not a launchable item"
+msgstr "Жөнелтілетін элемент емес"
+
+#: ../libgnome-desktop/gnome-desktop-item.c:2084
+#, c-format
+msgid "No command (Exec) to launch"
+msgstr "Жөнелту үшін (Exec) командасы жоқ"
+
+#: ../libgnome-desktop/gnome-desktop-item.c:2097
+#, c-format
+msgid "Bad command (Exec) to launch"
+msgstr "Жөнелту үшін қате (Exec) командасы"
+
+#: ../libgnome-desktop/gnome-desktop-item.c:3581
+#, c-format
+msgid "Unknown encoding of: %s"
+msgstr "Кодталуы белгісіз: %s"
+
+#: ../libgnome-desktop/gnome-desktop-utils.c:133
+msgid "Cannot find a terminal, using xterm, even if it may not work"
+msgstr "Терминал табылмады, жұмыс істемеу мүмкін болса да, xterm қолданылады"
+
+#. Translators: a CRTC is a CRT Controller (this is X terminology).
+#: ../libgnome-desktop/gnome-rr.c:444
+#, c-format
+msgid "could not get the screen resources (CRTCs, outputs, modes)"
+msgstr "экран ресурстарына қатынау мүмкін емес (CRTC, шығыстар, режимдер)"
+
+#: ../libgnome-desktop/gnome-rr.c:464
+#, c-format
+msgid "unhandled X error while getting the range of screen sizes"
+msgstr "экранның мүмкін өлшемдер шегін алу кезінде қате орын алды"
 
-#: ../libgnome-desktop/gnome-rr-config.c:743
+#: ../libgnome-desktop/gnome-rr.c:470
+#, c-format
+msgid "could not get the range of screen sizes"
+msgstr "экран шеттерінің шегін анықтау мүмкін емес"
+
+#: ../libgnome-desktop/gnome-rr.c:715
+#, c-format
+msgid "RANDR extension is not present"
+msgstr "RANDR кеңейтілуі жоқ"
+
+#: ../libgnome-desktop/gnome-rr.c:1037
+#, c-format
+#| msgid "Could not get information about GNOME version."
+msgid "could not get information about output %d"
+msgstr "%d шығысы жөнінде ақпаратты алу мүмкін емес"
+
+#. Translators: the "position", "size", and "maximum"
+#. * words here are not keywords; please translate them
+#. * as usual.  A CRTC is a CRT Controller (this is X terminology)
+#: ../libgnome-desktop/gnome-rr.c:1424
+#, c-format
+msgid "requested position/size for CRTC %d is outside the allowed limit: position=(%d, %d), size=(%d, %d), maximum=(%d, %d)"
+msgstr "CRTC %d үшін сұралған орналасуы не өлшемі рұқсат етілген шегінен асып тұр: орналасуы=(%d, %d), өлшемі=(%d, %d), максимум=(%d, %d)"
+
+#: ../libgnome-desktop/gnome-rr.c:1460
+#, c-format
+msgid "could not set the configuration for CRTC %d"
+msgstr "CRT %d контроллері жөнінде ақпаратты орнату мүмкін емес"
+
+#: ../libgnome-desktop/gnome-rr.c:1576
+#, c-format
+#| msgid "Could not get information about GNOME version."
+msgid "could not get information about CRTC %d"
+msgstr "CRT %d контроллері жөнінде ақпаратты алу мүмкін емес"
+
+#: ../libgnome-desktop/gnome-rr-config.c:501
+msgid "Laptop"
+msgstr "Ноутбук"
+
+#: ../libgnome-desktop/gnome-rr-config.c:1162
+#, c-format
+msgid "none of the saved display configurations matched the active configuration"
+msgstr "сақталып тұрған экран баптауларының ешқайсысы да белсенді болып тұрған баптауға сәйкес емес"
+
+#: ../libgnome-desktop/gnome-rr-config.c:1423
 #, c-format
 msgid "CRTC %d cannot drive output %s"
 msgstr "CRT %d контроллері %s шығысын басқара алмайды"
 
-#: ../libgnome-desktop/gnome-rr-config.c:750
+#: ../libgnome-desktop/gnome-rr-config.c:1430
 #, c-format
 msgid "output %s does not support mode %dx%d@%dHz"
 msgstr "%s шығысы %dx%d@%dГц режимін қолдамайды"
 
-#: ../libgnome-desktop/gnome-rr-config.c:761
+#: ../libgnome-desktop/gnome-rr-config.c:1441
+#, c-format
+msgid "CRTC %d does not support rotation=%s"
+msgstr "CRT %d контроллері айналдыру=%s қолдамайды"
+
+#: ../libgnome-desktop/gnome-rr-config.c:1455
 #, c-format
-#| msgid "CRTC %d does not support rotation=%s"
-msgid "CRTC %d does not support rotation=%d"
-msgstr "CRT %d rotation=%d қолдамайды"
-
-#: ../libgnome-desktop/gnome-rr-config.c:774
-#, c-format
-#| msgid ""
-#| "output %s does not have the same parameters as another cloned output:\n"
-#| "existing mode = %d, new mode = %d\n"
-#| "existing coordinates = (%d, %d), new coordinates = (%d, %d)\n"
-#| "existing rotation = %s, new rotation = %s"
 msgid ""
 "output %s does not have the same parameters as another cloned output:\n"
 "existing mode = %d, new mode = %d\n"
 "existing coordinates = (%d, %d), new coordinates = (%d, %d)\n"
-"existing rotation = %d, new rotation = %d"
+"existing rotation = %s, new rotation = %s"
 msgstr ""
 "%s шығысының баптаулары басқа клондалған баптауларынан өзгеше:\n"
-"бар режимі = %d, жаңа режим = %d\n"
-"бар координаттар = (%d, %d), жаңа координаттар = (%d, %d)\n"
-"бар айналдыру = %d, жаңа айналдыру = %d"
+"режим = %d, жаңа режим = %d\n"
+"координаттар = (%d, %d), жаңа координаттар = (%d, %d)\n"
+"айналдыру = %s, жаңа айналдыру = %s"
 
-#: ../libgnome-desktop/gnome-rr-config.c:789
+#: ../libgnome-desktop/gnome-rr-config.c:1470
 #, c-format
 msgid "cannot clone to output %s"
 msgstr "%s шығысына клондау мүмкін емес"
 
-#: ../libgnome-desktop/gnome-rr-config.c:915
+#: ../libgnome-desktop/gnome-rr-config.c:1639
 #, c-format
 msgid "Trying modes for CRTC %d\n"
 msgstr "CRT %d контроллері үшін режимдерді тексеру\n"
 
-#: ../libgnome-desktop/gnome-rr-config.c:939
+#: ../libgnome-desktop/gnome-rr-config.c:1663
 #, c-format
 msgid "CRTC %d: trying mode %dx%d@%dHz with output at %dx%d@%dHz (pass %d)\n"
 msgstr "CRTC %d: %dx%d@%dГц режимін көру, %dx%d@%dГц шығысымен (%d-талабы)\n"
 
-#: ../libgnome-desktop/gnome-rr-config.c:986
+#: ../libgnome-desktop/gnome-rr-config.c:1710
 #, c-format
 msgid ""
 "could not assign CRTCs to outputs:\n"
@@ -82,7 +313,7 @@
 "шығыстар үшін CRT контроллерларын орнату сәтсіз:\n"
 "%s"
 
-#: ../libgnome-desktop/gnome-rr-config.c:990
+#: ../libgnome-desktop/gnome-rr-config.c:1714
 #, c-format
 msgid ""
 "none of the selected modes were compatible with the possible modes:\n"
@@ -94,96 +325,144 @@
 #. Translators: the "requested", "minimum", and
 #. * "maximum" words here are not keywords; please
 #. * translate them as usual.
-#: ../libgnome-desktop/gnome-rr-config.c:1071
+#: ../libgnome-desktop/gnome-rr-config.c:1796
 #, c-format
-msgid ""
-"required virtual size does not fit available size: requested=(%d, %d), "
-"minimum=(%d, %d), maximum=(%d, %d)"
-msgstr ""
-"сұралған виртуалды өлшемі қолжетерлік өлшемге сыймайды: сұралған=(%d, %d), "
-"минимум=(%d, %d), максимум=(%d, %d)"
+msgid "required virtual size does not fit available size: requested=(%d, %d), minimum=(%d, %d), maximum=(%d, %d)"
+msgstr "сұралған виртуалды өлшемі қолжетерлік өлшемге сыймайды: сұралған=(%d, %d), минимум=(%d, %d), максимум=(%d, %d)"
+
+#. Keep this string in sync with gnome-control-center/capplets/display/xrandr-capplet.c:get_display_name()
+#. Translators:  this is the feature where what you see on your laptop's
+#. * screen is the same as your external monitor.  Here, "Mirror" is being
+#. * used as an adjective, not as a verb.  For example, the Spanish
+#. * translation could be "Pantallas en Espejo", *not* "Espejar Pantallas".
+#.
+#: ../libgnome-desktop/gnome-rr-labeler.c:212
+msgid "Mirror Screens"
+msgstr "Айналы экрандар"
+
+#~ msgid "Directory"
+#~ msgstr "Папка"
+
+#~ msgid "Application"
+#~ msgstr "Программа"
+
+#~ msgid "Link"
+#~ msgstr "Нұсқау"
+
+#~ msgid "FSDevice"
+#~ msgstr "FSDevice"
+
+#~ msgid "MIME Type"
+#~ msgstr "MIME түрі"
+
+#~ msgid "Service"
+#~ msgstr "Сервис"
+
+#~ msgid "ServiceType"
+#~ msgstr "Сервис түрі"
+
+#~ msgid "_URL:"
+#~ msgstr "_URL:"
+
+#~ msgid "Comm_and:"
+#~ msgstr "Ком_анда:"
+
+#~ msgid "_Name:"
+#~ msgstr "Аты:"
+
+#~ msgid "_Generic name:"
+#~ msgstr "Типтік аты:"
+
+#~ msgid "Co_mment:"
+#~ msgstr "Түсіндірме:"
+
+#~ msgid "Browse"
+#~ msgstr "Қарап шығу"
+
+#~ msgid "_Type:"
+#~ msgstr "Түр:"
+
+#~ msgid "_Icon:"
+#~ msgstr "Белгі:"
+
+#~ msgid "Browse icons"
+#~ msgstr "Белгілерді қарап шығу"
+
+#~ msgid "Run in t_erminal"
+#~ msgstr "Терминалда іске қосу"
+
+#~ msgid "Language"
+#~ msgstr "Тіл"
+
+#~ msgid "Name"
+#~ msgstr "Аты"
+
+#~ msgid "Generic name"
+#~ msgstr "Типтік аты"
+
+#~ msgid "Comment"
+#~ msgstr "Түсіндірме"
+
+#~ msgid "_Try this before using:"
+#~ msgstr "Қолданудың алдында сынап көру:"
+
+#~ msgid "_Documentation:"
+#~ msgstr "Құжаттама:"
+
+#~ msgid "_Name/Comment translations:"
+#~ msgstr "Атының аудармасы:"
+
+#~ msgid "_Add/Set"
+#~ msgstr "Қосу/Құру"
+
+#~ msgid "Add or Set Name/Comment Translations"
+#~ msgstr "Аударманың атын қосу/құру"
+
+#~ msgid "Re_move"
+#~ msgstr "Өшіру"
+
+#~ msgid "Remove Name/Comment Translation"
+#~ msgstr "Аударманың атын өшіру"
+
+#~ msgid "Basic"
+#~ msgstr "Негізгі"
+
+#~ msgid "Advanced"
+#~ msgstr "Қосымша"
+
+#~ msgid "_Show Hints at Startup"
+#~ msgstr "Іске қосқанда кеңестерді көрсету"
+
+#~ msgid "Error writing file '%s': %s"
+#~ msgstr "Ошибка записи в файл \"%s\": %s"
+
+#~ msgid "Could not locate the directory with header images."
+#~ msgstr "Не удалось обнаружить каталог с изображениями для заголовка."
+
+#~ msgid "Failed to open directory with header images: %s"
+#~ msgstr ""
+#~ "Произошёл сбой при открытии каталога с изображениями для заголовка: %s"
+
+#~ msgid "Unable to load header image: %s"
+#~ msgstr "Невозможно загрузить изображение для заголовка: %s"
+
+#~ msgid "Could not locate the GNOME logo."
+#~ msgstr "Не удается обнаружить логотип  GNOME."
+
+#~ msgid "Unable to load '%s': %s"
+#~ msgstr "Невозможно загрузить \"%s\": %s"
+
+#~ msgid "Could not open the address \"%s\": %s"
+#~ msgstr "Не удалось открыть адрес \"%s\": %s"
 
-#. Translators: This is the time format with full date used
-#. in 24-hour mode.
-#: ../libgnome-desktop/gnome-wall-clock.c:270
-msgid "%a %b %e, %R:%S"
-msgstr "%a %b %e, %R:%S"
-
-#: ../libgnome-desktop/gnome-wall-clock.c:271
-msgid "%a %b %e, %R"
-msgstr "%a %b %e, %R"
-
-#. Translators: This is the time format with day used
-#. in 24-hour mode.
-#: ../libgnome-desktop/gnome-wall-clock.c:275
-msgid "%a %R:%S"
-msgstr "%a %R:%S"
-
-#: ../libgnome-desktop/gnome-wall-clock.c:276
-msgid "%a %R"
-msgstr "%a %R"
-
-#. Translators: This is the time format without date used
-#. in 24-hour mode.
-#: ../libgnome-desktop/gnome-wall-clock.c:280
-msgid "%R:%S"
-msgstr "%R:%S"
-
-#: ../libgnome-desktop/gnome-wall-clock.c:280
-msgid "%R"
-msgstr "%R"
-
-#. Translators: This is a time format with full date used
-#. for AM/PM.
-#: ../libgnome-desktop/gnome-wall-clock.c:286
-msgid "%a %b %e, %l:%M:%S %p"
-msgstr "%a %b %e, %l:%M:%S %p"
-
-#: ../libgnome-desktop/gnome-wall-clock.c:287
-msgid "%a %b %e, %l:%M %p"
-msgstr "%a %b %e, %l:%M %p"
-
-#. Translators: This is a time format with day used
-#. for AM/PM.
-#: ../libgnome-desktop/gnome-wall-clock.c:291
-msgid "%a %l:%M:%S %p"
-msgstr "%a %l:%M:%S %p"
-
-#: ../libgnome-desktop/gnome-wall-clock.c:292
-msgid "%a %l:%M %p"
-msgstr "%a %l:%M %p"
-
-#. Translators: This is a time format without date used
-#. for AM/PM.
-#: ../libgnome-desktop/gnome-wall-clock.c:296
-msgid "%l:%M:%S %p"
-msgstr "%l:%M:%S %p"
-
-#: ../libgnome-desktop/gnome-wall-clock.c:297
-msgid "%l:%M %p"
-msgstr "%l:%M %p"
-
-#~ msgctxt "Monitor vendor"
-#~ msgid "Unknown"
-#~ msgstr "Белгісіз"
-
-#~ msgid "could not get the screen resources (CRTCs, outputs, modes)"
-#~ msgstr "экран ресурстарына қатынау мүмкін емес (CRTC, шығыстар, режимдер)"
-
-#~ msgid "unhandled X error while getting the range of screen sizes"
-#~ msgstr "экранның мүмкін өлшемдер шегін алу кезінде қате орын алды"
-
-#~ msgid "could not get the range of screen sizes"
-#~ msgstr "экран шеттерінің шегін анықтау мүмкін емес"
-
-#~ msgid "RANDR extension is not present"
-#~ msgstr "RANDR кеңейтілуі жоқ"
+#~ msgid "%s: %s\n"
+#~ msgstr "%s: %s\n"
 
-#~ msgid "could not get information about output %d"
-#~ msgstr "%d шығысы жөнінде ақпаратты алу мүмкін емес"
+#~ msgid "%s: "
+#~ msgstr "%s: "
 
-#~ msgid "Built-in Display"
-#~ msgstr "Құрамындағы дисплей"
+#~ msgid "Software"
+#~ msgstr "Программное обеспечение"
 
-#~ msgid "%s Display"
-#~ msgstr "%s дисплейі"
+#~ msgid "Developers"
+#~ msgstr "Разработчики"
diff -Nru gnome-desktop3-3.12.0/po/kn.po gnome-desktop3-3.8.4/po/kn.po
--- gnome-desktop3-3.12.0/po/kn.po	2013-11-11 17:23:18.000000000 +0000
+++ gnome-desktop3-3.8.4/po/kn.po	2013-09-04 11:15:57.000000000 +0000
@@ -9,7 +9,7 @@
 "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=gnome-"
 "desktop&keywords=I18N+L10N&component=general\n"
 "POT-Creation-Date: 2013-03-04 10:03+0000\n"
-"PO-Revision-Date: 2013-03-12 16:46+0530\n"
+"PO-Revision-Date: 2013-03-12 16:45+0530\n"
 "Last-Translator: Shankar Prasad \n"
 "Language-Team: Kannada \n"
 "Language: kn\n"
diff -Nru gnome-desktop3-3.12.0/po/ko.po gnome-desktop3-3.8.4/po/ko.po
--- gnome-desktop3-3.12.0/po/ko.po	2013-11-11 17:23:18.000000000 +0000
+++ gnome-desktop3-3.8.4/po/ko.po	2013-03-17 01:49:53.000000000 +0000
@@ -9,65 +9,142 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: gnome-desktop\n"
-"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=gnome-desktop&keywords=I18N+L10N&component=general\n"
-"POT-Creation-Date: 2013-08-27 10:49+0000\n"
-"PO-Revision-Date: 2013-09-09 05:13+0900\n"
+"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=gnome-"
+"desktop&keywords=I18N+L10N&component=general\n"
+"POT-Creation-Date: 2013-03-04 10:03+0000\n"
+"PO-Revision-Date: 2013-03-13 01:44+0900\n"
 "Last-Translator: Changwoo Ryu \n"
 "Language-Team: GNOME Korea \n"
-"Language: ko\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
+#. Translators: "Unknown" here is used to identify a monitor for which
+#. * we don't know the vendor. When a vendor is known, the name of the
+#. * vendor is used.
+#: ../libgnome-desktop/display-name.c:107
+msgctxt "Monitor vendor"
+msgid "Unknown"
+msgstr "알 수 없음"
+
 #: ../libgnome-desktop/gnome-languages.c:804
 msgid "Unspecified"
 msgstr "지정하지 않음"
 
-#: ../libgnome-desktop/gnome-rr-config.c:743
+#. Translators: a CRTC is a CRT Controller (this is X terminology).
+#: ../libgnome-desktop/gnome-rr.c:452
+#, c-format
+msgid "could not get the screen resources (CRTCs, outputs, modes)"
+msgstr "화면 정보를 읽어 올 수 없습니다(CRTC, 출력, 모드)"
+
+#: ../libgnome-desktop/gnome-rr.c:472
+#, c-format
+msgid "unhandled X error while getting the range of screen sizes"
+msgstr "스크린 크기의 범위를 가져오는 데 처리하지 못하는 X 오류가 발생했습니다"
+
+#: ../libgnome-desktop/gnome-rr.c:478
+#, c-format
+msgid "could not get the range of screen sizes"
+msgstr "화면 크기의 목록을 읽어 올 수 없습니다"
+
+#: ../libgnome-desktop/gnome-rr.c:769
+#, c-format
+msgid "RANDR extension is not present"
+msgstr "RANDR 확장 기능이 없습니다"
+
+#: ../libgnome-desktop/gnome-rr.c:1580
+#, c-format
+msgid "could not get information about output %d"
+msgstr "출력 %d번에 대한 정보를 읽어 올 수 없습니다"
+
+#: ../libgnome-desktop/gnome-rr.c:1764
+msgid "Built-in Display"
+msgstr "내장 화면"
+
+#. Translators: %s is the size of the monitor in inches
+#: ../libgnome-desktop/gnome-rr.c:1782
+#, c-format
+msgid "%s Display"
+msgstr "%s 화면"
+
+#: ../libgnome-desktop/gnome-rr.c:1789
+msgid "Unknown Display"
+msgstr "알 수 없는 화면"
+
+#. Translators: the "position", "size", and "maximum"
+#. * words here are not keywords; please translate them
+#. * as usual.  A CRTC is a CRT Controller (this is X terminology)
+#: ../libgnome-desktop/gnome-rr.c:2234
+#, c-format
+msgid ""
+"requested position/size for CRTC %d is outside the allowed limit: position="
+"(%d, %d), size=(%d, %d), maximum=(%d, %d)"
+msgstr ""
+"CRTC %d번의 요청한 위치/크기가 허용하는 크기 제한을 넘어갑니다. 위치=(%d, "
+"%d), 크기=(%d, %d), 최대=(%d, %d)"
+
+#: ../libgnome-desktop/gnome-rr.c:2270
+#, c-format
+msgid "could not set the configuration for CRTC %d"
+msgstr "CRTC %d번을 설정할 수 없습니다"
+
+#: ../libgnome-desktop/gnome-rr.c:2421
+#, c-format
+msgid "could not get information about CRTC %d"
+msgstr "CRTC %d번에 대한 정보를 읽어 올 수 없습니다"
+
+#: ../libgnome-desktop/gnome-rr-config.c:708
+#, c-format
+msgid ""
+"none of the saved display configurations matched the active configuration"
+msgstr "저장한 화면 설정은 사용 가능한 설정 중에 일치하는 설정이 없습니다."
+
+#: ../libgnome-desktop/gnome-rr-config.c:1464
 #, c-format
 msgid "CRTC %d cannot drive output %s"
 msgstr "CRTC %d번은 %s 출력을 할 수 없습니다"
 
-#: ../libgnome-desktop/gnome-rr-config.c:750
+#: ../libgnome-desktop/gnome-rr-config.c:1471
 #, c-format
 msgid "output %s does not support mode %dx%d@%dHz"
 msgstr "%s 출력은 %dx%d@%dHz 모드를 지원하지 않습니다"
 
-#: ../libgnome-desktop/gnome-rr-config.c:761
+#: ../libgnome-desktop/gnome-rr-config.c:1482
 #, c-format
-msgid "CRTC %d does not support rotation=%d"
-msgstr "CRTC %d번은 회전값 %d을(를) 지원하지 않습니다"
+msgid "CRTC %d does not support rotation=%s"
+msgstr "CRTC %d번은 %s 회전을 지원하지 않습니다"
 
-#: ../libgnome-desktop/gnome-rr-config.c:774
+#: ../libgnome-desktop/gnome-rr-config.c:1496
 #, c-format
 msgid ""
 "output %s does not have the same parameters as another cloned output:\n"
 "existing mode = %d, new mode = %d\n"
 "existing coordinates = (%d, %d), new coordinates = (%d, %d)\n"
-"existing rotation = %d, new rotation = %d"
+"existing rotation = %s, new rotation = %s"
 msgstr ""
 "%s 출력에 복사한 출력과 같은 파라미터가 없습니다:\n"
 "현재 모드 = %d, 새 모드 = %d\n"
 "현재 좌표 = (%d, %d), 새 좌표 = (%d, %d)\n"
-"현재 회전 = %d, 새 회전 = %d"
+"현재 회전 = %s, 새 회전 = %s"
 
-#: ../libgnome-desktop/gnome-rr-config.c:789
+#: ../libgnome-desktop/gnome-rr-config.c:1511
 #, c-format
 msgid "cannot clone to output %s"
 msgstr "%s 출력에 복사할 수 없습니다"
 
-#: ../libgnome-desktop/gnome-rr-config.c:915
+#: ../libgnome-desktop/gnome-rr-config.c:1680
 #, c-format
 msgid "Trying modes for CRTC %d\n"
 msgstr "CRTC %d번에 화면 모드 시도\n"
 
-#: ../libgnome-desktop/gnome-rr-config.c:939
+#: ../libgnome-desktop/gnome-rr-config.c:1704
 #, c-format
 msgid "CRTC %d: trying mode %dx%d@%dHz with output at %dx%d@%dHz (pass %d)\n"
 msgstr "CRTC %d: %dx%d@%dHz 모드를 %dx%d@%dHz 출력에 시도(패스 %d)\n"
 
-#: ../libgnome-desktop/gnome-rr-config.c:986
+#: ../libgnome-desktop/gnome-rr-config.c:1751
 #, c-format
 msgid ""
 "could not assign CRTCs to outputs:\n"
@@ -76,7 +153,7 @@
 "CRTC를 출력에 할당할 수 없습니다:\n"
 "%s"
 
-#: ../libgnome-desktop/gnome-rr-config.c:990
+#: ../libgnome-desktop/gnome-rr-config.c:1755
 #, c-format
 msgid ""
 "none of the selected modes were compatible with the possible modes:\n"
@@ -88,7 +165,7 @@
 #. Translators: the "requested", "minimum", and
 #. * "maximum" words here are not keywords; please
 #. * translate them as usual.
-#: ../libgnome-desktop/gnome-rr-config.c:1071
+#: ../libgnome-desktop/gnome-rr-config.c:1833
 #, c-format
 msgid ""
 "required virtual size does not fit available size: requested=(%d, %d), "
@@ -99,29 +176,32 @@
 
 #. Translators: This is the time format with full date used
 #. in 24-hour mode.
-#: ../libgnome-desktop/gnome-wall-clock.c:270
-msgid "%a %b %e, %R:%S"
-msgstr "%b %e일 (%a), %R:%S"
+#. The character between %R and %S is U+2236 RATIO
+#: ../libgnome-desktop/gnome-wall-clock.c:268
+msgid "%a %b %e, %R∶%S"
+msgstr "%b %e일 (%a), %R∶%S"
 
-#: ../libgnome-desktop/gnome-wall-clock.c:271
+#: ../libgnome-desktop/gnome-wall-clock.c:269
 msgid "%a %b %e, %R"
 msgstr "%b %e일 (%a), %R"
 
 #. Translators: This is the time format with day used
 #. in 24-hour mode.
-#: ../libgnome-desktop/gnome-wall-clock.c:275
-msgid "%a %R:%S"
-msgstr "(%a) %R:%S"
+#. The character between %R and %S is U+2236 RATIO
+#: ../libgnome-desktop/gnome-wall-clock.c:274
+msgid "%a %R∶%S"
+msgstr "(%a) %R∶%S"
 
-#: ../libgnome-desktop/gnome-wall-clock.c:276
+#: ../libgnome-desktop/gnome-wall-clock.c:275
 msgid "%a %R"
 msgstr "(%a) %R"
 
 #. Translators: This is the time format without date used
 #. in 24-hour mode.
+#. The character between %R and %S is U+2236 RATIO
 #: ../libgnome-desktop/gnome-wall-clock.c:280
-msgid "%R:%S"
-msgstr "%R:%S"
+msgid "%R∶%S"
+msgstr "%R∶%S"
 
 #: ../libgnome-desktop/gnome-wall-clock.c:280
 msgid "%R"
@@ -129,30 +209,327 @@
 
 #. Translators: This is a time format with full date used
 #. for AM/PM.
-#: ../libgnome-desktop/gnome-wall-clock.c:286
-msgid "%a %b %e, %l:%M:%S %p"
-msgstr "%b %e일 (%a), %p %l:%M:%S"
-
-#: ../libgnome-desktop/gnome-wall-clock.c:287
-msgid "%a %b %e, %l:%M %p"
-msgstr "%b %e일 (%a), %p %l:%M"
+#. The Unicode characters are U+2236 RATIO and
+#. U+2009 THIN SPACE
+#: ../libgnome-desktop/gnome-wall-clock.c:288
+msgid "%a %b %e, %l∶%M∶%S %p"
+msgstr "%b %e일 (%a), %p %l∶%M∶%S"
+
+#: ../libgnome-desktop/gnome-wall-clock.c:289
+msgid "%a %b %e, %l∶%M %p"
+msgstr "%b %e일 (%a), %p %l∶%M"
 
 #. Translators: This is a time format with day used
 #. for AM/PM.
-#: ../libgnome-desktop/gnome-wall-clock.c:291
-msgid "%a %l:%M:%S %p"
-msgstr "(%a) %p %l:%M:%S"
-
-#: ../libgnome-desktop/gnome-wall-clock.c:292
-msgid "%a %l:%M %p"
-msgstr "(%a) %p %l:%M"
+#. The Unicode characters are U+2236 RATIO and
+#. U+2009 THIN SPACE
+#: ../libgnome-desktop/gnome-wall-clock.c:295
+msgid "%a %l∶%M∶%S %p"
+msgstr "(%a) %p %l∶%M∶%S"
+
+#: ../libgnome-desktop/gnome-wall-clock.c:296
+msgid "%a %l∶%M %p"
+msgstr "(%a) %p %l∶%M"
 
 #. Translators: This is a time format without date used
 #. for AM/PM.
-#: ../libgnome-desktop/gnome-wall-clock.c:296
-msgid "%l:%M:%S %p"
-msgstr "%p %l:%M:%S"
+#. The Unicode characters are U+2236 RATIO and
+#. U+2009 THIN SPACE
+#: ../libgnome-desktop/gnome-wall-clock.c:302
+msgid "%l∶%M∶%S %p"
+msgstr "%p %l∶%M∶%S"
+
+#: ../libgnome-desktop/gnome-wall-clock.c:303
+msgid "%l∶%M %p"
+msgstr "%p %l∶%M"
+
+#~ msgid "Cannot find a terminal, using xterm, even if it may not work"
+#~ msgstr "터미널이 없으므로, xterm을 (동작하지 않더라도) 사용합니다"
+
+#~ msgid "Laptop"
+#~ msgstr "노트북 컴퓨터"
+
+#~ msgid "Mirrored Displays"
+#~ msgstr "동일한 화면"
+
+#~ msgid "%R:%S"
+#~ msgstr "%R:%S"
+
+#~ msgid "%l:%M:%S %p"
+#~ msgstr "%p %l:%M:%S"
+
+#~ msgid "%l:%M %p"
+#~ msgstr "%p %l:%M"
+
+#~ msgid "About GNOME"
+#~ msgstr "그놈 정보"
+
+#~ msgid "Learn more about GNOME"
+#~ msgstr "그놈을 좀 더 알고 싶을 때"
+
+#~ msgid "News"
+#~ msgstr "새소식"
+
+#~ msgid "GNOME Library"
+#~ msgstr "그놈 라이브러리"
+
+#~ msgid "Friends of GNOME"
+#~ msgstr "그놈 친구"
+
+#~ msgid "Contact"
+#~ msgstr "연락처"
+
+#~ msgid "The Mysterious GEGL"
+#~ msgstr "불가사의한 GEGL"
+
+#~ msgid "The Squeaky Rubber GNOME"
+#~ msgstr "The Squeaky Rubber GNOME"
+
+#~ msgid "Wanda The GNOME Fish"
+#~ msgstr "그놈 물고기 완다"
+
+#~ msgid "_Open URL"
+#~ msgstr "URL 열기(_O)"
+
+#~ msgid "_Copy URL"
+#~ msgstr "URL 복사(_C)"
+
+#~ msgid "About the GNOME Desktop"
+#~ msgstr "그놈 데스크톱 정보"
+
+#~ msgid "%(name)s: %(value)s"
+#~ msgstr "%(name)s: %(value)s"
+
+#~ msgid "Welcome to the GNOME Desktop"
+#~ msgstr "그놈 데스크톱에 오신 것을 환영합니다"
+
+#~ msgid "Brought to you by:"
+#~ msgstr "여기에 오기까지 애썼던 사람들:"
+
+#~ msgid "%(name)s: %(value)s"
+#~ msgstr "%(name)s: %(value)s"
+
+#~ msgid "Version"
+#~ msgstr "버전"
+
+#~ msgid "Distributor"
+#~ msgstr "배포자"
+
+#~ msgid "Build Date"
+#~ msgstr "빌드 날짜"
+
+#~ msgid "Display information on this GNOME version"
+#~ msgstr "그놈 버전 정보를 보여줍니다"
+
+#~ msgid ""
+#~ "GNOME also includes a complete development platform for applications "
+#~ "programmers, allowing the creation of powerful and complex applications."
+#~ msgstr ""
+#~ "그놈에는 응용 프로그램 개발자가 이용할 수 있는 완전한 개발 플랫폼이 들어 "
+#~ "있습니다. 이 플랫폼으로 강력하고 방대한 응용 프로그램을 만들 수 있습니다."
+
+#~ msgid ""
+#~ "GNOME includes most of what you see on your computer, including the file "
+#~ "manager, web browser, menus, and many applications."
+#~ msgstr ""
+#~ "그놈에는 컴퓨터에서 할 수 있는 모든 것이 들어 있습니다. 파일 관리자, 웹 브"
+#~ "라우저, 메뉴, 그리고 많은 응용 프로그램들까지."
+
+#~ msgid ""
+#~ "GNOME is a Free, usable, stable, accessible desktop environment for the "
+#~ "Unix-like family of operating systems."
+#~ msgstr ""
+#~ "그놈은 유닉스와 같은 운영체제를 위한 자유롭고, 사용 가능하고, 안정적이고, "
+#~ "누구나 접근할 수 있는 데스크톱 환경입니다."
+
+#~ msgid ""
+#~ "GNOME's focus on usability and accessibility, regular release cycle, and "
+#~ "strong corporate backing make it unique among Free Software desktops."
+#~ msgstr ""
+#~ "그놈의 사용성과 접근성에 대한 관심, 정기적인 릴리즈 주기, 강력한 기업의 후"
+#~ "원 때문에 그놈은 자유 소프트웨어 데스크톱 중에서도 비할 바가 없는 데스크탑"
+#~ "입니다."
+
+#~ msgid ""
+#~ "GNOME's greatest strength is our strong community. Virtually anyone, with "
+#~ "or without coding skills, can contribute to making GNOME better."
+#~ msgstr ""
+#~ "그놈의 최고의 힘은 우리의 강력한 커뮤니티입니다. 코딩 기술이 있던, 없던, "
+#~ "그 누구든 간에 그놈을 더 낫게 만드는 데 공헌할 수 있습니다."
+
+#~ msgid ""
+#~ "Hundreds of people have contributed code to GNOME since it was started in "
+#~ "1997; many more have contributed in other important ways, including "
+#~ "translations, documentation, and quality assurance."
+#~ msgstr ""
+#~ "1997년에 시작된 이래로 수백명이 사람들이 그놈의 코드에 공헌했습니다; 그보"
+#~ "다 훨씬 많은 사람들이 번역, 문서화, 품질 보증 등의 다른 중요한 방식으로 그"
+#~ "놈에 공헌했습니다."
+
+#~ msgid "Error reading file '%s': %s"
+#~ msgstr "'%s' 파일을 읽는 중 오류: %s"
+
+#~ msgid "Error rewinding file '%s': %s"
+#~ msgstr "'%s' 파일을 뒤로 감는 데 오류 발생: %s"
+
+#~ msgid "No name"
+#~ msgstr "이름 없음"
+
+#~ msgid "File '%s' is not a regular file or directory."
+#~ msgstr "'%s' 파일은 일반 파일이나 디렉터리가 아닙니다."
+
+#~ msgid "Cannot find file '%s'"
+#~ msgstr "'%s' 파일을 찾을 수 없습니다"
+
+#~ msgid "No filename to save to"
+#~ msgstr "저장할 파일 이름이 없습니다"
+
+#~ msgid "Starting %s"
+#~ msgstr "%s 시작 중"
+
+#~ msgid "No URL to launch"
+#~ msgstr "실행할 URL이 없습니다"
+
+#~ msgid "Not a launchable item"
+#~ msgstr "실행할 수 있는 항목이 아닙니다"
+
+#~ msgid "No command (Exec) to launch"
+#~ msgstr "실행할 명령이 없습니다"
+
+#~ msgid "Bad command (Exec) to launch"
+#~ msgstr "실행할 수 있는 명령이 잘못되었습니다"
+
+#~ msgid "Unknown encoding of: %s"
+#~ msgstr "알 수 없는 인코딩: %s"
+
+#~ msgid "Mirror Screens"
+#~ msgstr "동일한 화면"
+
+#~ msgid "could not find a suitable configuration of screens"
+#~ msgstr "적당한 화면 설정이 없습니다"
+
+#~ msgid "Directory"
+#~ msgstr "디렉터리"
+
+#~ msgid "Application"
+#~ msgstr "프로그램"
+
+#~ msgid "Link"
+#~ msgstr "링크"
+
+#~ msgid "FSDevice"
+#~ msgstr "FS장치"
+
+#~ msgid "MIME Type"
+#~ msgstr "MIME 형식"
+
+#~ msgid "Service"
+#~ msgstr "서비스"
+
+#~ msgid "ServiceType"
+#~ msgstr "서비스형식"
+
+#~ msgid "_URL:"
+#~ msgstr "URL(_U):"
+
+#~ msgid "Comm_and:"
+#~ msgstr "명령(_A):"
+
+#~ msgid "_Name:"
+#~ msgstr "이름(_N):"
+
+#~ msgid "_Generic name:"
+#~ msgstr "일반 이름(_G):"
+
+#~ msgid "Co_mment:"
+#~ msgstr "설명(_M):"
+
+#~ msgid "Browse"
+#~ msgstr "찾아보기"
+
+#~ msgid "_Type:"
+#~ msgstr "형식(_T):"
+
+#~ msgid "_Icon:"
+#~ msgstr "아이콘(_I):"
+
+#~ msgid "Browse icons"
+#~ msgstr "아이콘 찾아보기"
+
+#~ msgid "Run in t_erminal"
+#~ msgstr "터미널에서 실행(_E)"
+
+#~ msgid "Language"
+#~ msgstr "언어"
+
+#~ msgid "Name"
+#~ msgstr "이름"
+
+#~ msgid "Generic name"
+#~ msgstr "일반 이름"
+
+#~ msgid "Comment"
+#~ msgstr "설명"
+
+#~ msgid "_Try this before using:"
+#~ msgstr "사용하기 전에 이것을 해보기(_T):"
+
+#~ msgid "_Documentation:"
+#~ msgstr "문서(_D):"
+
+#~ msgid "_Name/Comment translations:"
+#~ msgstr "이름/설명 번역(_N):"
+
+#~ msgid "_Add/Set"
+#~ msgstr "추가/설정(_A)"
+
+#~ msgid "Add or Set Name/Comment Translations"
+#~ msgstr "이름/설명 번역을 추가하거나 설정합니다"
+
+#~ msgid "Re_move"
+#~ msgstr "제거(_M)"
+
+#~ msgid "Remove Name/Comment Translation"
+#~ msgstr "이름/설명 번역을 제거합니다"
+
+#~ msgid "Basic"
+#~ msgstr "기본"
+
+#~ msgid "Advanced"
+#~ msgstr "고급"
+
+#~ msgid "_Show Hints at Startup"
+#~ msgstr "시작할 때 힌트 표시(_S)"
+
+#~ msgid "Could not locate the directory with header images."
+#~ msgstr "헤더 이미지가 들어 있는 디렉토리를 찾을 수 없습니다."
+
+#~ msgid "Failed to open directory with header images: %s"
+#~ msgstr "헤더 이미지가 들어 있는 디렉토리를 여는 데 실패했습니다: %s"
+
+#~ msgid "Unable to load header image: %s"
+#~ msgstr "헤더 이미지를 읽어들일 수 없습니다: %s"
+
+#~ msgid "Could not locate the GNOME logo."
+#~ msgstr "그놈 로고를 찾을 수 없습니다."
+
+#~ msgid "Unable to load '%s': %s"
+#~ msgstr "'%s'을(를) 읽어들일 수 없습니다: %s"
+
+#~ msgid "Could not open the address \"%s\": %s"
+#~ msgstr "다음 주소를 열 수 없습니다. \"%s\": %s"
+
+#~ msgid "%s: %s\n"
+#~ msgstr "%s: %s\n"
+
+#~ msgid "%s: "
+#~ msgstr "%s: "
+
+#~ msgid "Software"
+#~ msgstr "소프트웨어"
+
+#~ msgid "Developers"
+#~ msgstr "개발자"
 
-#: ../libgnome-desktop/gnome-wall-clock.c:297
-msgid "%l:%M %p"
-msgstr "%p %l:%M"
+#~ msgid "Error writing file '%s': %s"
+#~ msgstr "파일 '%s'을(를) 쓰는 중 오류: %s"
diff -Nru gnome-desktop3-3.12.0/po/LINGUAS gnome-desktop3-3.8.4/po/LINGUAS
--- gnome-desktop3-3.12.0/po/LINGUAS	2014-02-03 15:41:40.000000000 +0000
+++ gnome-desktop3-3.8.4/po/LINGUAS	2013-09-04 11:15:57.000000000 +0000
@@ -24,7 +24,6 @@
 de
 dz
 el
-en
 en_CA
 en_GB
 en@shaw
@@ -38,7 +37,6 @@
 fur
 fy
 ga
-gd
 gl
 gu
 ha
@@ -97,7 +95,6 @@
 sv
 ta
 te
-tg
 th
 tk
 tr
diff -Nru gnome-desktop3-3.12.0/po/lt.po gnome-desktop3-3.8.4/po/lt.po
--- gnome-desktop3-3.12.0/po/lt.po	2013-11-11 17:23:18.000000000 +0000
+++ gnome-desktop3-3.8.4/po/lt.po	2013-09-04 11:15:57.000000000 +0000
@@ -11,8 +11,8 @@
 "Project-Id-Version: lt\n"
 "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=gnome-"
 "desktop&keywords=I18N+L10N&component=general\n"
-"POT-Creation-Date: 2013-08-27 10:49+0000\n"
-"PO-Revision-Date: 2013-08-27 23:59+0300\n"
+"POT-Creation-Date: 2013-03-09 06:58+0000\n"
+"PO-Revision-Date: 2013-03-09 17:10+0200\n"
 "Last-Translator: Aurimas Černius \n"
 "Language-Team: Lietuvių \n"
 "Language: lt\n"
@@ -23,62 +23,134 @@
 "%100<10 || n%100>=20) ? 1 : 2);\n"
 "X-Generator: Gtranslator 2.91.6\n"
 
+#. Translators: "Unknown" here is used to identify a monitor for which
+#. * we don't know the vendor. When a vendor is known, the name of the
+#. * vendor is used.
+#: ../libgnome-desktop/display-name.c:107
+msgctxt "Monitor vendor"
+msgid "Unknown"
+msgstr "Nežinomas"
+
 #: ../libgnome-desktop/gnome-languages.c:804
 msgid "Unspecified"
 msgstr "Nenurodyta"
 
-#: ../libgnome-desktop/gnome-rr-config.c:743
+#. Translators: a CRTC is a CRT Controller (this is X terminology).
+#: ../libgnome-desktop/gnome-rr.c:452
+#, c-format
+msgid "could not get the screen resources (CRTCs, outputs, modes)"
+msgstr "nepavyko gauti ekrano resursų (CRTC, išvedimų, veiksenų)"
+
+#: ../libgnome-desktop/gnome-rr.c:472
+#, c-format
+msgid "unhandled X error while getting the range of screen sizes"
+msgstr "neapdorota X klaida gaunant ekrano dydžių ruožą"
+
+#: ../libgnome-desktop/gnome-rr.c:478
+#, c-format
+msgid "could not get the range of screen sizes"
+msgstr "nepavyko gauti ekrano dydžių ruožo"
+
+#: ../libgnome-desktop/gnome-rr.c:769
+#, c-format
+msgid "RANDR extension is not present"
+msgstr "nėra RANDR plėtinio"
+
+#: ../libgnome-desktop/gnome-rr.c:1580
+#, c-format
+msgid "could not get information about output %d"
+msgstr "nepavyko gauti informacijos apie išvestį %d"
+
+#: ../libgnome-desktop/gnome-rr.c:1764
+#| msgid "%s Display"
+msgid "Built-in Display"
+msgstr "Integruotas vaizduoklis"
+
+#. Translators: %s is the size of the monitor in inches
+#: ../libgnome-desktop/gnome-rr.c:1782
+#, c-format
+msgid "%s Display"
+msgstr "%s vaizduoklis"
+
+#: ../libgnome-desktop/gnome-rr.c:1789
+msgid "Unknown Display"
+msgstr "Nežinomas vaizduoklis"
+
+#. Translators: the "position", "size", and "maximum"
+#. * words here are not keywords; please translate them
+#. * as usual.  A CRTC is a CRT Controller (this is X terminology)
+#: ../libgnome-desktop/gnome-rr.c:2234
+#, c-format
+msgid ""
+"requested position/size for CRTC %d is outside the allowed limit: position="
+"(%d, %d), size=(%d, %d), maximum=(%d, %d)"
+msgstr ""
+"prašoma pozicija/dydis CRTC %d už leistinos ribos: pozicija=(%d, %d), dydis="
+"(%d, %d), maksimumas=(%d, %d)"
+
+#: ../libgnome-desktop/gnome-rr.c:2270
+#, c-format
+msgid "could not set the configuration for CRTC %d"
+msgstr "nepavyko nustatyti CRTC %d konfigūracijos"
+
+#: ../libgnome-desktop/gnome-rr.c:2421
+#, c-format
+msgid "could not get information about CRTC %d"
+msgstr "nepavyko gauti informacijos apie CRTC %d"
+
+#: ../libgnome-desktop/gnome-rr-config.c:708
+#, c-format
+msgid ""
+"none of the saved display configurations matched the active configuration"
+msgstr ""
+"jokia iš įrašytų ekranų konfigūracijų neatitiko aktyvios konfigūracijos"
+
+#: ../libgnome-desktop/gnome-rr-config.c:1464
 #, c-format
 msgid "CRTC %d cannot drive output %s"
 msgstr "CRTC %d negali valdyti išvesties %s"
 
-#: ../libgnome-desktop/gnome-rr-config.c:750
+#: ../libgnome-desktop/gnome-rr-config.c:1471
 #, c-format
 msgid "output %s does not support mode %dx%d@%dHz"
 msgstr "išvestis %s nepalaiko %dx%d@%dHz veiksenos"
 
-#: ../libgnome-desktop/gnome-rr-config.c:761
+#: ../libgnome-desktop/gnome-rr-config.c:1482
+#, c-format
+msgid "CRTC %d does not support rotation=%s"
+msgstr "CRTC %d nepalaiko pasukimo=%s"
+
+#: ../libgnome-desktop/gnome-rr-config.c:1496
 #, c-format
-#| msgid "CRTC %d does not support rotation=%s"
-msgid "CRTC %d does not support rotation=%d"
-msgstr "CRTC %d nepalaiko pasukimo=%d"
-
-#: ../libgnome-desktop/gnome-rr-config.c:774
-#, c-format
-#| msgid ""
-#| "output %s does not have the same parameters as another cloned output:\n"
-#| "existing mode = %d, new mode = %d\n"
-#| "existing coordinates = (%d, %d), new coordinates = (%d, %d)\n"
-#| "existing rotation = %s, new rotation = %s"
 msgid ""
 "output %s does not have the same parameters as another cloned output:\n"
 "existing mode = %d, new mode = %d\n"
 "existing coordinates = (%d, %d), new coordinates = (%d, %d)\n"
-"existing rotation = %d, new rotation = %d"
+"existing rotation = %s, new rotation = %s"
 msgstr ""
 "išvestis %s neturi tų pačių parametrų kaip kita klonuota išvestis:\n"
 "dabartinė veiksena = %d, naujoji veiksena = %d\n"
 "dabartinės koordinatės = (%d, %d), naujosios koordinatės = (%d, %d)\n"
-"dabartinis pasukimas = %d, naujasis pasukimas = %d"
+"dabartinis pasukimas = %s, naujasis pasukimas = %s"
 
-#: ../libgnome-desktop/gnome-rr-config.c:789
+#: ../libgnome-desktop/gnome-rr-config.c:1511
 #, c-format
 msgid "cannot clone to output %s"
 msgstr "nepavyko klonuoti į išvestį %s"
 
-#: ../libgnome-desktop/gnome-rr-config.c:915
+#: ../libgnome-desktop/gnome-rr-config.c:1680
 #, c-format
 msgid "Trying modes for CRTC %d\n"
 msgstr "Bandomos CRTC %d veiksenos\n"
 
-#: ../libgnome-desktop/gnome-rr-config.c:939
+#: ../libgnome-desktop/gnome-rr-config.c:1704
 #, c-format
 msgid "CRTC %d: trying mode %dx%d@%dHz with output at %dx%d@%dHz (pass %d)\n"
 msgstr ""
 "CRTC %d: bandoma %dx%d@%dHz veiksena su išvestimi esant %dx%d@%dHz (%d "
 "bandymas)\n"
 
-#: ../libgnome-desktop/gnome-rr-config.c:986
+#: ../libgnome-desktop/gnome-rr-config.c:1751
 #, c-format
 msgid ""
 "could not assign CRTCs to outputs:\n"
@@ -87,7 +159,7 @@
 "nepavyko priskirti CRTC išvestims:\n"
 "%s"
 
-#: ../libgnome-desktop/gnome-rr-config.c:990
+#: ../libgnome-desktop/gnome-rr-config.c:1755
 #, c-format
 msgid ""
 "none of the selected modes were compatible with the possible modes:\n"
@@ -99,7 +171,7 @@
 #. Translators: the "requested", "minimum", and
 #. * "maximum" words here are not keywords; please
 #. * translate them as usual.
-#: ../libgnome-desktop/gnome-rr-config.c:1071
+#: ../libgnome-desktop/gnome-rr-config.c:1833
 #, c-format
 msgid ""
 "required virtual size does not fit available size: requested=(%d, %d), "
@@ -110,29 +182,32 @@
 
 #. Translators: This is the time format with full date used
 #. in 24-hour mode.
-#: ../libgnome-desktop/gnome-wall-clock.c:270
-msgid "%a %b %e, %R:%S"
-msgstr "%a %b %e d., %R:%S"
+#. The character between %R and %S is U+2236 RATIO
+#: ../libgnome-desktop/gnome-wall-clock.c:268
+msgid "%a %b %e, %R∶%S"
+msgstr "%a %b %e, %R∶%S"
 
-#: ../libgnome-desktop/gnome-wall-clock.c:271
+#: ../libgnome-desktop/gnome-wall-clock.c:269
 msgid "%a %b %e, %R"
-msgstr "%a %b %e d., %R"
+msgstr "%a %b %e, %R"
 
 #. Translators: This is the time format with day used
 #. in 24-hour mode.
-#: ../libgnome-desktop/gnome-wall-clock.c:275
-msgid "%a %R:%S"
+#. The character between %R and %S is U+2236 RATIO
+#: ../libgnome-desktop/gnome-wall-clock.c:274
+msgid "%a %R∶%S"
 msgstr "%a %R:%S"
 
-#: ../libgnome-desktop/gnome-wall-clock.c:276
+#: ../libgnome-desktop/gnome-wall-clock.c:275
 msgid "%a %R"
 msgstr "%a %R"
 
 #. Translators: This is the time format without date used
 #. in 24-hour mode.
+#. The character between %R and %S is U+2236 RATIO
 #: ../libgnome-desktop/gnome-wall-clock.c:280
-msgid "%R:%S"
-msgstr "%R:%S"
+msgid "%R∶%S"
+msgstr "%R∶%S"
 
 #: ../libgnome-desktop/gnome-wall-clock.c:280
 msgid "%R"
@@ -140,31 +215,37 @@
 
 #. Translators: This is a time format with full date used
 #. for AM/PM.
-#: ../libgnome-desktop/gnome-wall-clock.c:286
-msgid "%a %b %e, %l:%M:%S %p"
-msgstr "%a %b %e d., %l:%M:%S %p"
-
-#: ../libgnome-desktop/gnome-wall-clock.c:287
-msgid "%a %b %e, %l:%M %p"
-msgstr "%a %b %e d., %l:%M %p"
+#. The Unicode characters are U+2236 RATIO and
+#. U+2009 THIN SPACE
+#: ../libgnome-desktop/gnome-wall-clock.c:288
+msgid "%a %b %e, %l∶%M∶%S %p"
+msgstr "%a %b %e, %l:%M:%S %p"
+
+#: ../libgnome-desktop/gnome-wall-clock.c:289
+msgid "%a %b %e, %l∶%M %p"
+msgstr "%a %b %e, %l:%M %p"
 
 #. Translators: This is a time format with day used
 #. for AM/PM.
-#: ../libgnome-desktop/gnome-wall-clock.c:291
-msgid "%a %l:%M:%S %p"
+#. The Unicode characters are U+2236 RATIO and
+#. U+2009 THIN SPACE
+#: ../libgnome-desktop/gnome-wall-clock.c:295
+msgid "%a %l∶%M∶%S %p"
 msgstr "%a %l:%M:%S %p"
 
-#: ../libgnome-desktop/gnome-wall-clock.c:292
-msgid "%a %l:%M %p"
+#: ../libgnome-desktop/gnome-wall-clock.c:296
+msgid "%a %l∶%M %p"
 msgstr "%a %l:%M %p"
 
 #. Translators: This is a time format without date used
 #. for AM/PM.
-#: ../libgnome-desktop/gnome-wall-clock.c:296
-msgid "%l:%M:%S %p"
-msgstr "%l:%M:%S %p"
-
-#: ../libgnome-desktop/gnome-wall-clock.c:297
-msgid "%l:%M %p"
-msgstr "%l:%M %p"
+#. The Unicode characters are U+2236 RATIO and
+#. U+2009 THIN SPACE
+#: ../libgnome-desktop/gnome-wall-clock.c:302
+msgid "%l∶%M∶%S %p"
+msgstr "%l∶%M∶%S %p"
+
+#: ../libgnome-desktop/gnome-wall-clock.c:303
+msgid "%l∶%M %p"
+msgstr "%l∶%M %p"
 
diff -Nru gnome-desktop3-3.12.0/po/lv.po gnome-desktop3-3.8.4/po/lv.po
--- gnome-desktop3-3.12.0/po/lv.po	2013-11-11 17:23:18.000000000 +0000
+++ gnome-desktop3-3.8.4/po/lv.po	2013-09-04 11:15:57.000000000 +0000
@@ -13,8 +13,8 @@
 "Project-Id-Version: lv\n"
 "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=gnome-"
 "desktop&keywords=I18N+L10N&component=general\n"
-"POT-Creation-Date: 2013-09-04 21:57+0000\n"
-"PO-Revision-Date: 2013-09-11 16:04+0300\n"
+"POT-Creation-Date: 2013-03-04 10:03+0000\n"
+"PO-Revision-Date: 2013-03-18 17:38+0200\n"
 "Last-Translator: Rūdolfs Mazurs \n"
 "Language-Team: Latvian \n"
 "Language: lv\n"
@@ -23,64 +23,138 @@
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms:  nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n != 0 ? 1 : "
 "2);\n"
-"X-Generator: Lokalize 1.5\n"
+"X-Generator: Lokalize 1.4\n"
+
+#. Translators: "Unknown" here is used to identify a monitor for which
+#. * we don't know the vendor. When a vendor is known, the name of the
+#. * vendor is used.
+#: ../libgnome-desktop/display-name.c:107
+msgctxt "Monitor vendor"
+msgid "Unknown"
+msgstr "Nezināms"
 
 #: ../libgnome-desktop/gnome-languages.c:804
 msgid "Unspecified"
 msgstr "Nenorādīts"
 
-#: ../libgnome-desktop/gnome-rr-config.c:743
+#. Translators: a CRTC is a CRT Controller (this is X terminology).
+#: ../libgnome-desktop/gnome-rr.c:452
+#, c-format
+msgid "could not get the screen resources (CRTCs, outputs, modes)"
+msgstr "neizdevās iegūt ekrāna resursus (CRTC, izvadus, režīmus)"
+
+#: ../libgnome-desktop/gnome-rr.c:472
+#, c-format
+msgid "unhandled X error while getting the range of screen sizes"
+msgstr "neapstrādāta X kļūda, iegūstot ekrāna izmēru diapazonu"
+
+#: ../libgnome-desktop/gnome-rr.c:478
+#, c-format
+msgid "could not get the range of screen sizes"
+msgstr "neizdevās iegūt ekrāna izmēru diapazonu"
+
+#: ../libgnome-desktop/gnome-rr.c:769
+#, c-format
+msgid "RANDR extension is not present"
+msgstr "RANDR paplašinājums nav pieejams"
+
+#: ../libgnome-desktop/gnome-rr.c:1580
+#, c-format
+msgid "could not get information about output %d"
+msgstr "neizdevās atrast informāciju par izvadi %d"
+
+#: ../libgnome-desktop/gnome-rr.c:1764
+msgid "Built-in Display"
+msgstr "Iebūvēts displejs"
+
+#. Translators: %s is the size of the monitor in inches
+#: ../libgnome-desktop/gnome-rr.c:1782
+#, c-format
+msgid "%s Display"
+msgstr "%s displejs"
+
+#: ../libgnome-desktop/gnome-rr.c:1789
+#| msgctxt "Monitor vendor"
+#| msgid "Unknown"
+msgid "Unknown Display"
+msgstr "Nezināms displejs"
+
+#. Translators: the "position", "size", and "maximum"
+#. * words here are not keywords; please translate them
+#. * as usual.  A CRTC is a CRT Controller (this is X terminology)
+#: ../libgnome-desktop/gnome-rr.c:2234
+#, c-format
+msgid ""
+"requested position/size for CRTC %d is outside the allowed limit: position="
+"(%d, %d), size=(%d, %d), maximum=(%d, %d)"
+msgstr ""
+"pieprasītā CRTC %d pozīcija/izmērs ir ārpus pieļaujamās robežas — pozīcija="
+"(%d, %d), izmērs=(%d, %d), maksimums=(%d, %d)"
+
+#: ../libgnome-desktop/gnome-rr.c:2270
+#, c-format
+msgid "could not set the configuration for CRTC %d"
+msgstr "neizdevās iestatīt CRTC %d konfigurāciju"
+
+#: ../libgnome-desktop/gnome-rr.c:2421
+#, c-format
+msgid "could not get information about CRTC %d"
+msgstr "neizdevās atrast informāciju par CRTC %d"
+
+#: ../libgnome-desktop/gnome-rr-config.c:708
+#, c-format
+msgid ""
+"none of the saved display configurations matched the active configuration"
+msgstr ""
+"neviena no saglabātajām ekrāna konfigurācijām neatbilst aktīvajai "
+"konfigurācijai"
+
+#: ../libgnome-desktop/gnome-rr-config.c:1464
 #, c-format
 msgid "CRTC %d cannot drive output %s"
 msgstr "CRT %d kontrolieris nevar vadīt izeju %s"
 
-#: ../libgnome-desktop/gnome-rr-config.c:750
+#: ../libgnome-desktop/gnome-rr-config.c:1471
 #, c-format
 msgid "output %s does not support mode %dx%d@%dHz"
 msgstr "izeja %s neatbalsta režīmu %dx%d@%dHz"
 
-#: ../libgnome-desktop/gnome-rr-config.c:761
+#: ../libgnome-desktop/gnome-rr-config.c:1482
+#, c-format
+msgid "CRTC %d does not support rotation=%s"
+msgstr "CRT %d kontrolieris neatbalsta rotāciju=%s"
+
+#: ../libgnome-desktop/gnome-rr-config.c:1496
 #, c-format
-#| msgid "CRTC %d does not support rotation=%s"
-msgid "CRTC %d does not support rotation=%d"
-msgstr "CRT %d kontrolieris neatbalsta rotāciju=%d"
-
-#: ../libgnome-desktop/gnome-rr-config.c:774
-#, c-format
-#| msgid ""
-#| "output %s does not have the same parameters as another cloned output:\n"
-#| "existing mode = %d, new mode = %d\n"
-#| "existing coordinates = (%d, %d), new coordinates = (%d, %d)\n"
-#| "existing rotation = %s, new rotation = %s"
 msgid ""
 "output %s does not have the same parameters as another cloned output:\n"
 "existing mode = %d, new mode = %d\n"
 "existing coordinates = (%d, %d), new coordinates = (%d, %d)\n"
-"existing rotation = %d, new rotation = %d"
+"existing rotation = %s, new rotation = %s"
 msgstr ""
 "izvadei %s nav tie paši parametri kā citai klonētajai izvadei:\n"
 "esošais režīms = %d, jaunais režīms = %d\n"
 "esošās koordinātas = (%d, %d), jaunās koordinātas = (%d, %d)\n"
-"esošā rotācija = %d, jaunā rotācija = %d"
+"esošā rotācija = %s, jaunā rotācija = %s"
 
-#: ../libgnome-desktop/gnome-rr-config.c:789
+#: ../libgnome-desktop/gnome-rr-config.c:1511
 #, c-format
 msgid "cannot clone to output %s"
 msgstr "nevar klonēt izeju %s"
 
-#: ../libgnome-desktop/gnome-rr-config.c:915
+#: ../libgnome-desktop/gnome-rr-config.c:1680
 #, c-format
 msgid "Trying modes for CRTC %d\n"
 msgstr "Mēģina režīmus CRT %d kontrolierim\n"
 
-#: ../libgnome-desktop/gnome-rr-config.c:939
+#: ../libgnome-desktop/gnome-rr-config.c:1704
 #, c-format
 msgid "CRTC %d: trying mode %dx%d@%dHz with output at %dx%d@%dHz (pass %d)\n"
 msgstr ""
 "CRT %d kontrolieris — mēģina režīmu %dx%d@%dHz ar izeju pie %dx%d@%dHz (pass "
 "%d)\n"
 
-#: ../libgnome-desktop/gnome-rr-config.c:986
+#: ../libgnome-desktop/gnome-rr-config.c:1751
 #, c-format
 msgid ""
 "could not assign CRTCs to outputs:\n"
@@ -89,7 +163,7 @@
 "nevarēja piešķirt CRT kontrolieri pie izejām:\n"
 "%s"
 
-#: ../libgnome-desktop/gnome-rr-config.c:990
+#: ../libgnome-desktop/gnome-rr-config.c:1755
 #, c-format
 msgid ""
 "none of the selected modes were compatible with the possible modes:\n"
@@ -102,7 +176,7 @@
 #. Translators: the "requested", "minimum", and
 #. * "maximum" words here are not keywords; please
 #. * translate them as usual.
-#: ../libgnome-desktop/gnome-rr-config.c:1071
+#: ../libgnome-desktop/gnome-rr-config.c:1833
 #, c-format
 msgid ""
 "required virtual size does not fit available size: requested=(%d, %d), "
@@ -113,31 +187,34 @@
 
 #. Translators: This is the time format with full date used
 #. in 24-hour mode.
-#: ../libgnome-desktop/gnome-wall-clock.c:270
-#| msgid "%a %b %e, %R"
-msgid "%a %b %e, %R:%S"
+#. The character between %R and %S is U+2236 RATIO
+#: ../libgnome-desktop/gnome-wall-clock.c:268
+#| msgid "%a %b %e, %R:%S"
+msgid "%a %b %e, %R∶%S"
 msgstr "%a %e %b, %R.%S"
 
-#: ../libgnome-desktop/gnome-wall-clock.c:271
+#: ../libgnome-desktop/gnome-wall-clock.c:269
 msgid "%a %b %e, %R"
 msgstr "%a %e %b, %R"
 
 #. Translators: This is the time format with day used
 #. in 24-hour mode.
-#: ../libgnome-desktop/gnome-wall-clock.c:275
-#| msgid "%a %R∶%S"
-msgid "%a %R:%S"
+#. The character between %R and %S is U+2236 RATIO
+#: ../libgnome-desktop/gnome-wall-clock.c:274
+#| msgid "%a %R:%S"
+msgid "%a %R∶%S"
 msgstr "%a %R.%S"
 
-#: ../libgnome-desktop/gnome-wall-clock.c:276
+#: ../libgnome-desktop/gnome-wall-clock.c:275
 msgid "%a %R"
 msgstr "%a %R"
 
 #. Translators: This is the time format without date used
 #. in 24-hour mode.
+#. The character between %R and %S is U+2236 RATIO
 #: ../libgnome-desktop/gnome-wall-clock.c:280
-msgid "%R:%S"
-msgstr "%R:%S"
+msgid "%R∶%S"
+msgstr "%R.%S"
 
 #: ../libgnome-desktop/gnome-wall-clock.c:280
 msgid "%R"
@@ -145,107 +222,43 @@
 
 #. Translators: This is a time format with full date used
 #. for AM/PM.
-#: ../libgnome-desktop/gnome-wall-clock.c:286
-#| msgid "%a %b %e, %l∶%M∶%S %p"
-msgid "%a %b %e, %l:%M:%S %p"
-msgstr "%a %e %b, %H.%M.%S"
-
-#: ../libgnome-desktop/gnome-wall-clock.c:287
-#| msgid "%a %b %e, %l∶%M %p"
-msgid "%a %b %e, %l:%M %p"
-msgstr "%a %e %b, %H.%M"
+#. The Unicode characters are U+2236 RATIO and
+#. U+2009 THIN SPACE
+#: ../libgnome-desktop/gnome-wall-clock.c:288
+#| msgid "%a %b %e, %l:%M:%S %p"
+msgid "%a %b %e, %l∶%M∶%S %p"
+msgstr "%a %e %b, %l∶%M∶%S %p"
+
+#: ../libgnome-desktop/gnome-wall-clock.c:289
+#| msgid "%a %b %e, %l:%M %p"
+msgid "%a %b %e, %l∶%M %p"
+msgstr "%a %e %b, %l.%M %p"
 
 #. Translators: This is a time format with day used
 #. for AM/PM.
-#: ../libgnome-desktop/gnome-wall-clock.c:291
-#| msgid "%l:%M:%S %p"
-msgid "%a %l:%M:%S %p"
-msgstr "%H.%M.%S"
-
-#: ../libgnome-desktop/gnome-wall-clock.c:292
-#| msgid "%l:%M %p"
-msgid "%a %l:%M %p"
-msgstr "%H.%M"
+#. The Unicode characters are U+2236 RATIO and
+#. U+2009 THIN SPACE
+#: ../libgnome-desktop/gnome-wall-clock.c:295
+#| msgid "%a %l:%M:%S %p"
+msgid "%a %l∶%M∶%S %p"
+msgstr "%a %l∶%M∶%S %p"
 
-#. Translators: This is a time format without date used
-#. for AM/PM.
 #: ../libgnome-desktop/gnome-wall-clock.c:296
-msgid "%l:%M:%S %p"
-msgstr "%H.%M.%S"
-
-#: ../libgnome-desktop/gnome-wall-clock.c:297
-msgid "%l:%M %p"
-msgstr "%H.%M"
-
-#~ msgctxt "Monitor vendor"
-#~ msgid "Unknown"
-#~ msgstr "Nezināms"
-
-#~ msgid "could not get the screen resources (CRTCs, outputs, modes)"
-#~ msgstr "neizdevās iegūt ekrāna resursus (CRTC, izvadus, režīmus)"
-
-#~ msgid "unhandled X error while getting the range of screen sizes"
-#~ msgstr "neapstrādāta X kļūda, iegūstot ekrāna izmēru diapazonu"
-
-#~ msgid "could not get the range of screen sizes"
-#~ msgstr "neizdevās iegūt ekrāna izmēru diapazonu"
-
-#~ msgid "RANDR extension is not present"
-#~ msgstr "RANDR paplašinājums nav pieejams"
-
-#~ msgid "could not get information about output %d"
-#~ msgstr "neizdevās atrast informāciju par izvadi %d"
-
-#~ msgid "Built-in Display"
-#~ msgstr "Iebūvēts displejs"
-
-#~ msgid "%s Display"
-#~ msgstr "%s displejs"
-
-#~| msgctxt "Monitor vendor"
-#~| msgid "Unknown"
-#~ msgid "Unknown Display"
-#~ msgstr "Nezināms displejs"
+#| msgid "%a %l:%M %p"
+msgid "%a %l∶%M %p"
+msgstr "%a %l.%M %p"
 
-#~ msgid ""
-#~ "requested position/size for CRTC %d is outside the allowed limit: "
-#~ "position=(%d, %d), size=(%d, %d), maximum=(%d, %d)"
-#~ msgstr ""
-#~ "pieprasītā CRTC %d pozīcija/izmērs ir ārpus pieļaujamās robežas — "
-#~ "pozīcija=(%d, %d), izmērs=(%d, %d), maksimums=(%d, %d)"
-
-#~ msgid "could not set the configuration for CRTC %d"
-#~ msgstr "neizdevās iestatīt CRTC %d konfigurāciju"
-
-#~ msgid "could not get information about CRTC %d"
-#~ msgstr "neizdevās atrast informāciju par CRTC %d"
-
-#~ msgid ""
-#~ "none of the saved display configurations matched the active configuration"
-#~ msgstr ""
-#~ "neviena no saglabātajām ekrāna konfigurācijām neatbilst aktīvajai "
-#~ "konfigurācijai"
-
-#~| msgid "%a %b %e, %R:%S"
-#~ msgid "%a %b %e, %R∶%S"
-#~ msgstr "%a %e %b, %R.%S"
-
-#~ msgid "%R∶%S"
-#~ msgstr "%R.%S"
-
-#~| msgid "%a %l:%M:%S %p"
-#~ msgid "%a %l∶%M∶%S %p"
-#~ msgstr "%a %l∶%M∶%S %p"
-
-#~| msgid "%a %l:%M %p"
-#~ msgid "%a %l∶%M %p"
-#~ msgstr "%a %l.%M %p"
-
-#~ msgid "%l∶%M∶%S %p"
-#~ msgstr "%l∶%M∶%S %p"
-
-#~ msgid "%l∶%M %p"
-#~ msgstr "%l.%M %p"
+#. Translators: This is a time format without date used
+#. for AM/PM.
+#. The Unicode characters are U+2236 RATIO and
+#. U+2009 THIN SPACE
+#: ../libgnome-desktop/gnome-wall-clock.c:302
+msgid "%l∶%M∶%S %p"
+msgstr "%l∶%M∶%S %p"
+
+#: ../libgnome-desktop/gnome-wall-clock.c:303
+msgid "%l∶%M %p"
+msgstr "%l.%M %p"
 
 #~ msgid "Cannot find a terminal, using xterm, even if it may not work"
 #~ msgstr "Nevar atrast termināli; lieto xterm, lai gan tas varētu nestrādāt"
@@ -256,6 +269,15 @@
 #~ msgid "Mirrored Displays"
 #~ msgstr "Dublēti displeji"
 
+#~ msgid "%R:%S"
+#~ msgstr "%R:%S"
+
+#~ msgid "%l:%M:%S %p"
+#~ msgstr "%l:%M:%S %p"
+
+#~ msgid "%l:%M %p"
+#~ msgstr "%l:%M %p"
+
 #~ msgid "About GNOME"
 #~ msgstr "Par GNOME"
 
diff -Nru gnome-desktop3-3.12.0/po/ml.po gnome-desktop3-3.8.4/po/ml.po
--- gnome-desktop3-3.12.0/po/ml.po	2013-11-11 17:23:18.000000000 +0000
+++ gnome-desktop3-3.8.4/po/ml.po	2013-09-04 11:15:57.000000000 +0000
@@ -3,7 +3,7 @@
 # Copyright (C) 2007 gnome-desktop'S COPYRIGHT HOLDER.
 # Reviewed by  Anivar Aravind , Santhosh Thottingal 
 # FSF-India , 2003.
-# Ani Peter , 2006, 2007, 2012.
+# Ani Peter , 2006, 2007, 2012, 2013.
 # Praveen|പ്രവീണ്‍ A|എ , 2007, 2008, 2009, 2012.
 # Anish A , 2013.
 msgid ""
@@ -11,33 +11,27 @@
 "Project-Id-Version: gnome-desktop.master.ml\n"
 "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=gnome-"
 "desktop&keywords=I18N+L10N&component=general\n"
-"POT-Creation-Date: 2013-02-12 08:06+0000\n"
-"PO-Revision-Date: 2013-02-13 00:52+0530\n"
-"Last-Translator: Anish A \n"
-"Language-Team: Swatantra Malayalam Computing\n"
+"POT-Creation-Date: 2013-03-16 18:37+0000\n"
+"PO-Revision-Date: 2013-03-25 16:27+0530\n"
+"Last-Translator: Ani Peter \n"
+"Language-Team: American English \n"
 "Language: ml\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
-"X-Generator: Virtaal 0.7.1\n"
+"X-Generator: Lokalize 1.5\n"
 "X-Project-Style: gnome\n"
 
 #. Translators: "Unknown" here is used to identify a monitor for which
 #. * we don't know the vendor. When a vendor is known, the name of the
 #. * vendor is used.
-#: ../libgnome-desktop/display-name.c:91
+#: ../libgnome-desktop/display-name.c:107
 msgctxt "Monitor vendor"
 msgid "Unknown"
 msgstr "അപരിചിതം"
 
-#: ../libgnome-desktop/gnome-desktop-utils.c:135
-msgid "Cannot find a terminal, using xterm, even if it may not work"
-msgstr ""
-"ഒരു ടെര്‍മിനല്‍ കണ്ടുപിടിയ്ക്കാന്‍ സാധിച്ചില്ല, പ്രവര്‍ത്തിയ്ക്കാതിരിയ്ക്കാന്‍ സാധ്യതയുണ്ടെങ്കിലും, "
-"xterm ഉപയോഗിയ്ക്കുന്നു"
-
-#: ../libgnome-desktop/gnome-languages.c:761
+#: ../libgnome-desktop/gnome-languages.c:804
 msgid "Unspecified"
 msgstr "പറയാത്തത്"
 
@@ -45,13 +39,15 @@
 #: ../libgnome-desktop/gnome-rr.c:452
 #, c-format
 msgid "could not get the screen resources (CRTCs, outputs, modes)"
-msgstr "സ്ക്രീനിലെ വിഭവങ്ങള്‍ (സിആര്‍ടികള്‍, ഔട്ട്പുട്ടുകള്‍, ദശകള്‍) കിട്ടിയില്ല"
+msgstr ""
+"സ്ക്രീനിലെ വിഭവങ്ങള്‍ (സിആര്‍ടികള്‍, ഔട്ട്പുട്ടുകള്‍, ദശകള്‍) കിട്ടിയില്ല"
 
 #: ../libgnome-desktop/gnome-rr.c:472
 #, c-format
 msgid "unhandled X error while getting the range of screen sizes"
 msgstr ""
-"സ്ക്രീനിന്റെ വലിപ്പത്തിന്റെ പരിധി കിട്ടിക്കൊണ്ടിരിയ്ക്കുമ്പോള്‍ കൈകാര്യം ചെയ്യാത്ത എക്സിലെ പിശകു്"
+"സ്ക്രീനിന്റെ വലിപ്പത്തിന്റെ പരിധി കിട്ടിക്കൊണ്ടിരിയ്ക്കുമ്പോള്‍ കൈകാര്യം "
+"ചെയ്യാത്ത എക്സിലെ പിശകു്"
 
 #: ../libgnome-desktop/gnome-rr.c:478
 #, c-format
@@ -63,59 +59,73 @@
 msgid "RANDR extension is not present"
 msgstr "RANDR എക്സ്‌റ്റന്‍ഷന്‍ നിലവിലില്ല"
 
-#: ../libgnome-desktop/gnome-rr.c:1579
+#: ../libgnome-desktop/gnome-rr.c:1580
 #, c-format
 msgid "could not get information about output %d"
 msgstr "ഔട്ട്പുട്ട് %d നെക്കുറിച്ചു് വിവരം കിട്ടിയില്ല"
 
+#: ../libgnome-desktop/gnome-rr.c:1764
+msgid "Built-in Display"
+msgstr "ബിള്‍ട്ടിന്‍ പ്രദര്‍ശനം"
+
+#. Translators: %s is the size of the monitor in inches
+#: ../libgnome-desktop/gnome-rr.c:1782
+#, c-format
+msgid "%s Display"
+msgstr "%s പ്രദര്‍ശനം"
+
+#: ../libgnome-desktop/gnome-rr.c:1789
+#| msgctxt "Monitor vendor"
+#| msgid "Unknown"
+msgid "Unknown Display"
+msgstr "അപരിചിതമായ പ്രദര്‍ശനം"
+
 #. Translators: the "position", "size", and "maximum"
 #. * words here are not keywords; please translate them
 #. * as usual.  A CRTC is a CRT Controller (this is X terminology)
-#: ../libgnome-desktop/gnome-rr.c:2172
+#: ../libgnome-desktop/gnome-rr.c:2234
 #, c-format
 msgid ""
 "requested position/size for CRTC %d is outside the allowed limit: position="
 "(%d, %d), size=(%d, %d), maximum=(%d, %d)"
 msgstr ""
-"സിആര്‍ടിസി %d നു് അപേക്ഷിച്ച സ്ഥാനം/വലിപ്പം പരധിയ്ക്കു് പുറത്താണു്: സ്ഥാനം=(%d, %d), വലിപ്പം="
+"സിആര്‍ടിസി %d നു് അപേക്ഷിച്ച സ്ഥാനം/വലിപ്പം പരധിയ്ക്കു് പുറത്താണു്: സ്ഥാനം=(%"
+"d, %d), വലിപ്പം="
 "(%d, %d), കൂടിയതു്=(%d, %d)"
 
-#: ../libgnome-desktop/gnome-rr.c:2208
+#: ../libgnome-desktop/gnome-rr.c:2270
 #, c-format
 msgid "could not set the configuration for CRTC %d"
 msgstr "സിആര്‍ടിസി %d നുള്ള ക്രമീകരണം സജ്ജീകരിയ്ക്കാന്‍ സാധിച്ചില്ല"
 
-#: ../libgnome-desktop/gnome-rr.c:2353
+#: ../libgnome-desktop/gnome-rr.c:2421
 #, c-format
 msgid "could not get information about CRTC %d"
 msgstr "സിആര്‍ടിസി %d നെക്കുറിച്ചു് വിവരം കിട്ടിയില്ല"
 
-#: ../libgnome-desktop/gnome-rr-config.c:558
-msgid "Laptop"
-msgstr "ലാപ്‌ടോപ്"
-
-#: ../libgnome-desktop/gnome-rr-config.c:713
+#: ../libgnome-desktop/gnome-rr-config.c:708
 #, c-format
 msgid ""
 "none of the saved display configurations matched the active configuration"
-msgstr "സൂക്ഷിച്ച ഡിസ്പ്ലേ ക്രമീകരണങ്ങളിലൊന്നും സജീവ ക്രമീകരണവുമായി പൊരുത്തമില്ല"
+msgstr ""
+"സൂക്ഷിച്ച ഡിസ്പ്ലേ ക്രമീകരണങ്ങളിലൊന്നും സജീവ ക്രമീകരണവുമായി പൊരുത്തമില്ല"
 
-#: ../libgnome-desktop/gnome-rr-config.c:1469
+#: ../libgnome-desktop/gnome-rr-config.c:1464
 #, c-format
 msgid "CRTC %d cannot drive output %s"
 msgstr "സിആര്‍ടിസി %d നു് %s ഔട്ട്പുട്ട് പ്രവര്‍ത്തിപ്പിയ്ക്കാനാവില്ല"
 
-#: ../libgnome-desktop/gnome-rr-config.c:1476
+#: ../libgnome-desktop/gnome-rr-config.c:1471
 #, c-format
 msgid "output %s does not support mode %dx%d@%dHz"
 msgstr "ഔട്ട്പുട്ട് %s നു് %dx%d@%dHz ദശയ്ക്കുള്ള പിന്തുണയില്ല"
 
-#: ../libgnome-desktop/gnome-rr-config.c:1487
+#: ../libgnome-desktop/gnome-rr-config.c:1482
 #, c-format
 msgid "CRTC %d does not support rotation=%s"
 msgstr "സിആര്‍ടിസി %d കറക്കം=%s പിന്തുണയ്ക്കുന്നില്ല"
 
-#: ../libgnome-desktop/gnome-rr-config.c:1501
+#: ../libgnome-desktop/gnome-rr-config.c:1496
 #, c-format
 msgid ""
 "output %s does not have the same parameters as another cloned output:\n"
@@ -128,22 +138,22 @@
 "നിലവിലെ കോര്‍ഡിനേറ്റുകള്‍ = (%d, %d), പുതിയ കോര്‍ഡിനേറ്റുകള്‍  = (%d, %d)\n"
 "നിലവിലെ കറക്കം = %s, പുതിയ കറക്കം = %s"
 
-#: ../libgnome-desktop/gnome-rr-config.c:1516
+#: ../libgnome-desktop/gnome-rr-config.c:1511
 #, c-format
 msgid "cannot clone to output %s"
 msgstr "ഔട്ട്പുട്ട് %s ലേയ്ക്കു് ക്ലോണ്‍ ചെയ്യുവാന്‍ സാധ്യമല്ല"
 
-#: ../libgnome-desktop/gnome-rr-config.c:1685
+#: ../libgnome-desktop/gnome-rr-config.c:1680
 #, c-format
 msgid "Trying modes for CRTC %d\n"
 msgstr "സിആര്‍ടിസി %d യ്ക്കുള്ള ദശകള്‍ ശ്രമിയ്ക്കുന്നു\n"
 
-#: ../libgnome-desktop/gnome-rr-config.c:1709
+#: ../libgnome-desktop/gnome-rr-config.c:1704
 #, c-format
 msgid "CRTC %d: trying mode %dx%d@%dHz with output at %dx%d@%dHz (pass %d)\n"
 msgstr "സിആര്‍ടിസി %d: %dx%d@%dHz ദശ %dx%d@%dHz (പാസ് %d) ഔട്ട്പുട്ടിനൊപ്പം\n"
 
-#: ../libgnome-desktop/gnome-rr-config.c:1756
+#: ../libgnome-desktop/gnome-rr-config.c:1751
 #, c-format
 msgid ""
 "could not assign CRTCs to outputs:\n"
@@ -152,7 +162,7 @@
 "സിആര്‍ടികള്‍ കിട്ടാത്ത ഔട്ട്പുട്ടുകള്‍:\n"
 "%s"
 
-#: ../libgnome-desktop/gnome-rr-config.c:1760
+#: ../libgnome-desktop/gnome-rr-config.c:1755
 #, c-format
 msgid ""
 "none of the selected modes were compatible with the possible modes:\n"
@@ -164,13 +174,14 @@
 #. Translators: the "requested", "minimum", and
 #. * "maximum" words here are not keywords; please
 #. * translate them as usual.
-#: ../libgnome-desktop/gnome-rr-config.c:1838
+#: ../libgnome-desktop/gnome-rr-config.c:1833
 #, c-format
 msgid ""
 "required virtual size does not fit available size: requested=(%d, %d), "
 "minimum=(%d, %d), maximum=(%d, %d)"
 msgstr ""
-"അപേക്ഷിച്ച മായാ വലിപ്പം ലഭ്യമായ വലിപ്പത്തിലൊതുങ്ങുന്നില്ല: അപേക്ഷിച്ചതു്=(%d, %d), ചുരുങ്ങിയതു്="
+"അപേക്ഷിച്ച മായാ വലിപ്പം ലഭ്യമായ വലിപ്പത്തിലൊതുങ്ങുന്നില്ല: അപേക്ഷിച്ചതു്=(%d, "
+"%d), ചുരുങ്ങിയതു്="
 "(%d, %d), കൂടിയതു്=(%d, %d)"
 
 #. Translators: This is the time format with full date used
@@ -242,6 +253,14 @@
 msgid "%l∶%M %p"
 msgstr "%l∶%M %p"
 
+#~ msgid "Cannot find a terminal, using xterm, even if it may not work"
+#~ msgstr ""
+#~ "ഒരു ടെര്‍മിനല്‍ കണ്ടുപിടിയ്ക്കാന്‍ സാധിച്ചില്ല, പ്രവര്‍ത്തിയ്ക്കാതിരിയ്ക്കാന്‍ സാധ്യതയുണ്ടെങ്കിലും, "
+#~ "xterm ഉപയോഗിയ്ക്കുന്നു"
+
+#~ msgid "Laptop"
+#~ msgstr "ലാപ്‌ടോപ്"
+
 #~ msgid "Mirrored Displays"
 #~ msgstr "മിറര്‍ ചെയ്ത പ്രദര്‍ശനങ്ങള്‍"
 
diff -Nru gnome-desktop3-3.12.0/po/nb.po gnome-desktop3-3.8.4/po/nb.po
--- gnome-desktop3-3.12.0/po/nb.po	2013-11-11 17:23:18.000000000 +0000
+++ gnome-desktop3-3.8.4/po/nb.po	2013-09-04 11:15:57.000000000 +0000
@@ -5,10 +5,10 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: gnome-desktop 3.9.x\n"
+"Project-Id-Version: gnome-desktop 3.7.x\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-08-22 15:55+0200\n"
-"PO-Revision-Date: 2013-08-22 15:56+0200\n"
+"POT-Creation-Date: 2013-03-04 14:49+0100\n"
+"PO-Revision-Date: 2013-03-04 14:49+0100\n"
 "Last-Translator: Kjartan Maraas \n"
 "Language-Team: Norwegian bokmål \n"
 "Language: \n"
@@ -16,54 +16,130 @@
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
+#. Translators: "Unknown" here is used to identify a monitor for which
+#. * we don't know the vendor. When a vendor is known, the name of the
+#. * vendor is used.
+#: ../libgnome-desktop/display-name.c:107
+msgctxt "Monitor vendor"
+msgid "Unknown"
+msgstr "Ukjent"
+
 #: ../libgnome-desktop/gnome-languages.c:804
 msgid "Unspecified"
 msgstr "Ikke spesifisert"
 
-#: ../libgnome-desktop/gnome-rr-config.c:743
+#. Translators: a CRTC is a CRT Controller (this is X terminology).
+#: ../libgnome-desktop/gnome-rr.c:452
+#, c-format
+msgid "could not get the screen resources (CRTCs, outputs, modes)"
+msgstr "kunne ikke hente skjermressurser (CRTCer, utdata, modus)"
+
+#: ../libgnome-desktop/gnome-rr.c:472
+#, c-format
+msgid "unhandled X error while getting the range of screen sizes"
+msgstr "uhåndtert X-feil under henting av område med skjermstørrelser"
+
+#: ../libgnome-desktop/gnome-rr.c:478
+#, c-format
+msgid "could not get the range of screen sizes"
+msgstr "kunne ikke hente område med skjermstørrelser"
+
+#: ../libgnome-desktop/gnome-rr.c:769
+#, c-format
+msgid "RANDR extension is not present"
+msgstr "RANDR-tillegget er ikke tilstede"
+
+#: ../libgnome-desktop/gnome-rr.c:1580
+#, c-format
+msgid "could not get information about output %d"
+msgstr "kunne ikke hente informasjon om utdata %d"
+
+#: ../libgnome-desktop/gnome-rr.c:1764
+msgid "Built-in Display"
+msgstr "Innebygget skjerm"
+
+#. Translators: %s is the size of the monitor in inches
+#: ../libgnome-desktop/gnome-rr.c:1782
+#, c-format
+msgid "%s Display"
+msgstr "%s skjerm"
+
+#: ../libgnome-desktop/gnome-rr.c:1789
+msgid "Unknown Display"
+msgstr "Ukjent skjerm"
+
+#. Translators: the "position", "size", and "maximum"
+#. * words here are not keywords; please translate them
+#. * as usual.  A CRTC is a CRT Controller (this is X terminology)
+#: ../libgnome-desktop/gnome-rr.c:2234
+#, c-format
+msgid ""
+"requested position/size for CRTC %d is outside the allowed limit: position="
+"(%d, %d), size=(%d, %d), maximum=(%d, %d)"
+msgstr ""
+"forespurt posisjon/størrelse for CRTC %d er utenfor tillatt område: posisjon="
+"(%d, %d), størrelse=(%d, %d), maksimum=(%d, %d)"
+
+#: ../libgnome-desktop/gnome-rr.c:2270
+#, c-format
+msgid "could not set the configuration for CRTC %d"
+msgstr "kunne ikke sette konfigurasjon for CRTC %d"
+
+#: ../libgnome-desktop/gnome-rr.c:2421
+#, c-format
+msgid "could not get information about CRTC %d"
+msgstr "kunne ikke hente informasjon om CRTC %d"
+
+#: ../libgnome-desktop/gnome-rr-config.c:708
+#, c-format
+msgid ""
+"none of the saved display configurations matched the active configuration"
+msgstr "ingen av de lagrede skjermkonfigurasjonene var lik aktiv konfigurasjon"
+
+#: ../libgnome-desktop/gnome-rr-config.c:1464
 #, c-format
 msgid "CRTC %d cannot drive output %s"
 msgstr "CRTC %d kan ikke drive utdata %s"
 
-#: ../libgnome-desktop/gnome-rr-config.c:750
+#: ../libgnome-desktop/gnome-rr-config.c:1471
 #, c-format
 msgid "output %s does not support mode %dx%d@%dHz"
 msgstr "utdata %s støtter ikke modus %dx%d@%dHz"
 
-#: ../libgnome-desktop/gnome-rr-config.c:761
+#: ../libgnome-desktop/gnome-rr-config.c:1482
 #, c-format
-msgid "CRTC %d does not support rotation=%d"
-msgstr "CRTC %d støtter ikke rotation=%d"
+msgid "CRTC %d does not support rotation=%s"
+msgstr "CRTC %d støtter ikke rotation=%s"
 
-#: ../libgnome-desktop/gnome-rr-config.c:774
+#: ../libgnome-desktop/gnome-rr-config.c:1496
 #, c-format
 msgid ""
 "output %s does not have the same parameters as another cloned output:\n"
 "existing mode = %d, new mode = %d\n"
 "existing coordinates = (%d, %d), new coordinates = (%d, %d)\n"
-"existing rotation = %d, new rotation = %d"
+"existing rotation = %s, new rotation = %s"
 msgstr ""
 "utdata %s har ikke samme parametere som en annen klonet utdata:\n"
 "eksisterende modus = %d, ny modus = %d\n"
 "eksisterende koordinater = (%d, %d), nye koordinater = (%d, %d)\n"
-"eksisterende rotasjon = %d, ny rotasjon = %d"
+"eksisterende rotasjon = %s, ny rotasjon = %s"
 
-#: ../libgnome-desktop/gnome-rr-config.c:789
+#: ../libgnome-desktop/gnome-rr-config.c:1511
 #, c-format
 msgid "cannot clone to output %s"
 msgstr "kan ikke klone til utgang %s"
 
-#: ../libgnome-desktop/gnome-rr-config.c:915
+#: ../libgnome-desktop/gnome-rr-config.c:1680
 #, c-format
 msgid "Trying modes for CRTC %d\n"
 msgstr "Prøver modus for CRTC %d\n"
 
-#: ../libgnome-desktop/gnome-rr-config.c:939
+#: ../libgnome-desktop/gnome-rr-config.c:1704
 #, c-format
 msgid "CRTC %d: trying mode %dx%d@%dHz with output at %dx%d@%dHz (pass %d)\n"
 msgstr "CRTC %d: prøver modus %dx%d@%dHz med utdata %dx%d@%dHz (forsøk %d)\n"
 
-#: ../libgnome-desktop/gnome-rr-config.c:986
+#: ../libgnome-desktop/gnome-rr-config.c:1751
 #, c-format
 msgid ""
 "could not assign CRTCs to outputs:\n"
@@ -72,7 +148,7 @@
 "kunne ikke tilegne CRTCer til utdata:\n"
 "%s"
 
-#: ../libgnome-desktop/gnome-rr-config.c:990
+#: ../libgnome-desktop/gnome-rr-config.c:1755
 #, c-format
 msgid ""
 "none of the selected modes were compatible with the possible modes:\n"
@@ -84,7 +160,7 @@
 #. Translators: the "requested", "minimum", and
 #. * "maximum" words here are not keywords; please
 #. * translate them as usual.
-#: ../libgnome-desktop/gnome-rr-config.c:1071
+#: ../libgnome-desktop/gnome-rr-config.c:1833
 #, c-format
 msgid ""
 "required virtual size does not fit available size: requested=(%d, %d), "
@@ -95,28 +171,31 @@
 
 #. Translators: This is the time format with full date used
 #. in 24-hour mode.
-#: ../libgnome-desktop/gnome-wall-clock.c:270
-msgid "%a %b %e, %R:%S"
+#. The character between %R and %S is U+2236 RATIO
+#: ../libgnome-desktop/gnome-wall-clock.c:268
+msgid "%a %b %e, %R∶%S"
 msgstr "%a %e %b, %R.%S"
 
-#: ../libgnome-desktop/gnome-wall-clock.c:271
+#: ../libgnome-desktop/gnome-wall-clock.c:269
 msgid "%a %b %e, %R"
 msgstr "%a %e %b, %R"
 
 #. Translators: This is the time format with day used
 #. in 24-hour mode.
-#: ../libgnome-desktop/gnome-wall-clock.c:275
-msgid "%a %R:%S"
+#. The character between %R and %S is U+2236 RATIO
+#: ../libgnome-desktop/gnome-wall-clock.c:274
+msgid "%a %R∶%S"
 msgstr "%a %R.%S"
 
-#: ../libgnome-desktop/gnome-wall-clock.c:276
+#: ../libgnome-desktop/gnome-wall-clock.c:275
 msgid "%a %R"
 msgstr "%a %R"
 
 #. Translators: This is the time format without date used
 #. in 24-hour mode.
+#. The character between %R and %S is U+2236 RATIO
 #: ../libgnome-desktop/gnome-wall-clock.c:280
-msgid "%R:%S"
+msgid "%R∶%S"
 msgstr "%R.%S"
 
 #: ../libgnome-desktop/gnome-wall-clock.c:280
@@ -125,30 +204,36 @@
 
 #. Translators: This is a time format with full date used
 #. for AM/PM.
-#: ../libgnome-desktop/gnome-wall-clock.c:286
-msgid "%a %b %e, %l:%M:%S %p"
+#. The Unicode characters are U+2236 RATIO and
+#. U+2009 THIN SPACE
+#: ../libgnome-desktop/gnome-wall-clock.c:288
+msgid "%a %b %e, %l∶%M∶%S %p"
 msgstr "%a %e %b, %H.%M.%S"
 
-#: ../libgnome-desktop/gnome-wall-clock.c:287
-msgid "%a %b %e, %l:%M %p"
+#: ../libgnome-desktop/gnome-wall-clock.c:289
+msgid "%a %b %e, %l∶%M %p"
 msgstr "%a %e %b, %H.%M"
 
 #. Translators: This is a time format with day used
 #. for AM/PM.
-#: ../libgnome-desktop/gnome-wall-clock.c:291
-msgid "%a %l:%M:%S %p"
+#. The Unicode characters are U+2236 RATIO and
+#. U+2009 THIN SPACE
+#: ../libgnome-desktop/gnome-wall-clock.c:295
+msgid "%a %l∶%M∶%S %p"
 msgstr "%a %H.%M.%S"
 
-#: ../libgnome-desktop/gnome-wall-clock.c:292
-msgid "%a %l:%M %p"
+#: ../libgnome-desktop/gnome-wall-clock.c:296
+msgid "%a %l∶%M %p"
 msgstr "%a %H.%M"
 
 #. Translators: This is a time format without date used
 #. for AM/PM.
-#: ../libgnome-desktop/gnome-wall-clock.c:296
-msgid "%l:%M:%S %p"
+#. The Unicode characters are U+2236 RATIO and
+#. U+2009 THIN SPACE
+#: ../libgnome-desktop/gnome-wall-clock.c:302
+msgid "%l∶%M∶%S %p"
 msgstr "%H.%M.%S"
 
-#: ../libgnome-desktop/gnome-wall-clock.c:297
-msgid "%l:%M %p"
+#: ../libgnome-desktop/gnome-wall-clock.c:303
+msgid "%l∶%M %p"
 msgstr "%H.%M"
diff -Nru gnome-desktop3-3.12.0/po/nl.po gnome-desktop3-3.8.4/po/nl.po
--- gnome-desktop3-3.12.0/po/nl.po	2013-11-11 17:23:18.000000000 +0000
+++ gnome-desktop3-3.8.4/po/nl.po	2013-05-10 15:08:06.000000000 +0000
@@ -9,70 +9,148 @@
 # Taco Witte , 2002
 # Tino Meinen , 2002, 2003, 2005, 2006
 # Wouter Bolsterlee , 2007–2013
-# Reinout van Schouwen , 2013
 #
 msgid ""
 msgstr ""
 "Project-Id-Version: gnome-desktop\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-09-22 00:39+0200\n"
-"PO-Revision-Date: 2013-09-22 00:40+0200\n"
-"Last-Translator: Reinout van Schouwen \n"
-"Language-Team: Dutch \n"
+"POT-Creation-Date: 2013-04-19 22:37+0200\n"
+"PO-Revision-Date: 2013-04-19 22:37+0200\n"
+"Last-Translator: Wouter Bolsterlee \n"
+"Language-Team: Dutch \n"
 "Language: nl\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
+#. Translators: "Unknown" here is used to identify a monitor for which
+#. * we don't know the vendor. When a vendor is known, the name of the
+#. * vendor is used.
+#: ../libgnome-desktop/display-name.c:107
+msgctxt "Monitor vendor"
+msgid "Unknown"
+msgstr "Onbekend"
+
 #: ../libgnome-desktop/gnome-languages.c:804
 msgid "Unspecified"
 msgstr "Niet opgegeven"
 
-#: ../libgnome-desktop/gnome-rr-config.c:743
+#. Translators: a CRTC is a CRT Controller (this is X terminology).
+#: ../libgnome-desktop/gnome-rr.c:452
+#, c-format
+msgid "could not get the screen resources (CRTCs, outputs, modes)"
+msgstr "kon de schermhulpbronnen niet verkrijgen (CRTCs, outputs, modes)"
+
+#: ../libgnome-desktop/gnome-rr.c:472
+#, c-format
+msgid "unhandled X error while getting the range of screen sizes"
+msgstr ""
+"onafgehandelde X-fout bij het opvragen van het bereik van de schermafmetingen"
+
+#: ../libgnome-desktop/gnome-rr.c:478
+#, c-format
+msgid "could not get the range of screen sizes"
+msgstr "Kon het bereik van de schermafmetingen niet opvragen"
+
+#: ../libgnome-desktop/gnome-rr.c:769
+#, c-format
+msgid "RANDR extension is not present"
+msgstr "RANDR-extensie niet aanwezig"
+
+#: ../libgnome-desktop/gnome-rr.c:1580
+#, c-format
+msgid "could not get information about output %d"
+msgstr "kon informatie over uitvoer %d niet verkrijgen"
+
+#: ../libgnome-desktop/gnome-rr.c:1764
+msgid "Built-in Display"
+msgstr "Ingebouwd scherm"
+
+#. Translators: %s is the size of the monitor in inches
+#: ../libgnome-desktop/gnome-rr.c:1782
+#, c-format
+msgid "%s Display"
+msgstr "%s scherm"
+
+#: ../libgnome-desktop/gnome-rr.c:1789
+msgid "Unknown Display"
+msgstr "Onbekend scherm"
+
+#. Translators: the "position", "size", and "maximum"
+#. * words here are not keywords; please translate them
+#. * as usual.  A CRTC is a CRT Controller (this is X terminology)
+#: ../libgnome-desktop/gnome-rr.c:2234
+#, c-format
+msgid ""
+"requested position/size for CRTC %d is outside the allowed limit: position="
+"(%d, %d), size=(%d, %d), maximum=(%d, %d)"
+msgstr ""
+"aangevraagde positie/afmeting voor CRTC %d ligt buiten de toegestane "
+"limieten: positie=(%d, %d), afmeting=(%d, %d), maximum=(%d, %d)"
+
+#: ../libgnome-desktop/gnome-rr.c:2270
+#, c-format
+msgid "could not set the configuration for CRTC %d"
+msgstr "kon de instellingen voor CRTC %d niet doorvoeren"
+
+#: ../libgnome-desktop/gnome-rr.c:2421
+#, c-format
+msgid "could not get information about CRTC %d"
+msgstr "kon informatie over CRTC %d niet verkrijgen"
+
+#: ../libgnome-desktop/gnome-rr-config.c:708
+#, c-format
+msgid ""
+"none of the saved display configurations matched the active configuration"
+msgstr ""
+"geen van de opgeslagen schermconfiguraties kwam overeen met de actieve "
+"configuratie"
+
+#: ../libgnome-desktop/gnome-rr-config.c:1464
 #, c-format
 msgid "CRTC %d cannot drive output %s"
 msgstr "CRTC %d kan uitvoer %s niet aansturen"
 
-#: ../libgnome-desktop/gnome-rr-config.c:750
+#: ../libgnome-desktop/gnome-rr-config.c:1471
 #, c-format
 msgid "output %s does not support mode %dx%d@%dHz"
 msgstr "uitvoer %s ondersteunt modus %dx%d@%dHz niet"
 
-#: ../libgnome-desktop/gnome-rr-config.c:761
+#: ../libgnome-desktop/gnome-rr-config.c:1482
 #, c-format
-msgid "CRTC %d does not support rotation=%d"
-msgstr "CRTC %d ondersteunt rotation=%d niet"
+msgid "CRTC %d does not support rotation=%s"
+msgstr "CRTC %d ondersteunt rotation=%s niet"
 
-#: ../libgnome-desktop/gnome-rr-config.c:774
+#: ../libgnome-desktop/gnome-rr-config.c:1496
 #, c-format
 msgid ""
 "output %s does not have the same parameters as another cloned output:\n"
 "existing mode = %d, new mode = %d\n"
 "existing coordinates = (%d, %d), new coordinates = (%d, %d)\n"
-"existing rotation = %d, new rotation = %d"
+"existing rotation = %s, new rotation = %s"
 msgstr ""
 "uitvoer %s heeft niet dezelfde parameters als een andere gekloonde uitvoer:\n"
 "huidige modus = %d, nieuwe modus = %d\n"
 "huidige coördinaten = (%d, %d), nieuwe coördinaten = (%d, %d)\n"
-"huidige rotatie = %d, nieuwe rotatie = %d"
+"huidige rotatie = %s, nieuwe rotatie = %s"
 
-#: ../libgnome-desktop/gnome-rr-config.c:789
+#: ../libgnome-desktop/gnome-rr-config.c:1511
 #, c-format
 msgid "cannot clone to output %s"
 msgstr "kan niet klonen naar uitvoer %s"
 
-#: ../libgnome-desktop/gnome-rr-config.c:915
+#: ../libgnome-desktop/gnome-rr-config.c:1680
 #, c-format
 msgid "Trying modes for CRTC %d\n"
 msgstr "Proberen modi voor CRTC %d\n"
 
-#: ../libgnome-desktop/gnome-rr-config.c:939
+#: ../libgnome-desktop/gnome-rr-config.c:1704
 #, c-format
 msgid "CRTC %d: trying mode %dx%d@%dHz with output at %dx%d@%dHz (pass %d)\n"
 msgstr ""
 "CRTC %d: uitproberen modus %dx%d@%dHz met uitvoer op %dx%d@%dHz (ronde %d)\n"
 
-#: ../libgnome-desktop/gnome-rr-config.c:986
+#: ../libgnome-desktop/gnome-rr-config.c:1751
 #, c-format
 msgid ""
 "could not assign CRTCs to outputs:\n"
@@ -81,7 +159,7 @@
 "kon CRTC's niet aan uitvoer toewijzen:\n"
 "%s"
 
-#: ../libgnome-desktop/gnome-rr-config.c:990
+#: ../libgnome-desktop/gnome-rr-config.c:1755
 #, c-format
 msgid ""
 "none of the selected modes were compatible with the possible modes:\n"
@@ -93,7 +171,7 @@
 #. Translators: the "requested", "minimum", and
 #. * "maximum" words here are not keywords; please
 #. * translate them as usual.
-#: ../libgnome-desktop/gnome-rr-config.c:1071
+#: ../libgnome-desktop/gnome-rr-config.c:1833
 #, c-format
 msgid ""
 "required virtual size does not fit available size: requested=(%d, %d), "
@@ -104,29 +182,32 @@
 
 #. Translators: This is the time format with full date used
 #. in 24-hour mode.
-#: ../libgnome-desktop/gnome-wall-clock.c:270
-msgid "%a %b %e, %R:%S"
-msgstr "%a %e %b, %R:%S"
+#. The character between %R and %S is U+2236 RATIO
+#: ../libgnome-desktop/gnome-wall-clock.c:268
+msgid "%a %b %e, %R∶%S"
+msgstr "%a %e %b, %R∶%S"
 
-#: ../libgnome-desktop/gnome-wall-clock.c:271
+#: ../libgnome-desktop/gnome-wall-clock.c:269
 msgid "%a %b %e, %R"
 msgstr "%a %e %b, %R"
 
 #. Translators: This is the time format with day used
 #. in 24-hour mode.
-#: ../libgnome-desktop/gnome-wall-clock.c:275
-msgid "%a %R:%S"
+#. The character between %R and %S is U+2236 RATIO
+#: ../libgnome-desktop/gnome-wall-clock.c:274
+msgid "%a %R∶%S"
 msgstr "%a %R∶%S"
 
-#: ../libgnome-desktop/gnome-wall-clock.c:276
+#: ../libgnome-desktop/gnome-wall-clock.c:275
 msgid "%a %R"
 msgstr "%a %R"
 
 #. Translators: This is the time format without date used
 #. in 24-hour mode.
+#. The character between %R and %S is U+2236 RATIO
 #: ../libgnome-desktop/gnome-wall-clock.c:280
-msgid "%R:%S"
-msgstr "%R:%S"
+msgid "%R∶%S"
+msgstr "%R∶%S"
 
 #: ../libgnome-desktop/gnome-wall-clock.c:280
 msgid "%R"
@@ -134,100 +215,51 @@
 
 #. Translators: This is a time format with full date used
 #. for AM/PM.
-#: ../libgnome-desktop/gnome-wall-clock.c:286
-msgid "%a %b %e, %l:%M:%S %p"
+#. The Unicode characters are U+2236 RATIO and
+#. U+2009 THIN SPACE
+#: ../libgnome-desktop/gnome-wall-clock.c:288
+msgid "%a %b %e, %l∶%M∶%S %p"
 msgstr "%a %e %b, %l∶%M∶%S %p"
 
-#: ../libgnome-desktop/gnome-wall-clock.c:287
-msgid "%a %b %e, %l:%M %p"
+#: ../libgnome-desktop/gnome-wall-clock.c:289
+msgid "%a %b %e, %l∶%M %p"
 msgstr "%a %e %b, %l∶%M %p"
 
 #. Translators: This is a time format with day used
 #. for AM/PM.
-#: ../libgnome-desktop/gnome-wall-clock.c:291
-msgid "%a %l:%M:%S %p"
-msgstr "%a %l:%M:%S %p"
-
-#: ../libgnome-desktop/gnome-wall-clock.c:292
-msgid "%a %l:%M %p"
-msgstr "%a %l:%M %p"
+#. The Unicode characters are U+2236 RATIO and
+#. U+2009 THIN SPACE
+#: ../libgnome-desktop/gnome-wall-clock.c:295
+msgid "%a %l∶%M∶%S %p"
+msgstr "%a %l∶%M∶%S %p"
 
-#. Translators: This is a time format without date used
-#. for AM/PM.
 #: ../libgnome-desktop/gnome-wall-clock.c:296
-msgid "%l:%M:%S %p"
-msgstr "%l:%M:%S %p"
-
-#: ../libgnome-desktop/gnome-wall-clock.c:297
-msgid "%l:%M %p"
-msgstr "%l:%M %p"
-
-#~ msgctxt "Monitor vendor"
-#~ msgid "Unknown"
-#~ msgstr "Onbekend"
-
-#~ msgid "could not get the screen resources (CRTCs, outputs, modes)"
-#~ msgstr "kon de schermhulpbronnen niet verkrijgen (CRTCs, outputs, modes)"
-
-#~ msgid "unhandled X error while getting the range of screen sizes"
-#~ msgstr ""
-#~ "onafgehandelde X-fout bij het opvragen van het bereik van de "
-#~ "schermafmetingen"
-
-#~ msgid "could not get the range of screen sizes"
-#~ msgstr "Kon het bereik van de schermafmetingen niet opvragen"
-
-#~ msgid "RANDR extension is not present"
-#~ msgstr "RANDR-extensie niet aanwezig"
-
-#~ msgid "could not get information about output %d"
-#~ msgstr "kon informatie over uitvoer %d niet verkrijgen"
-
-#~ msgid "Built-in Display"
-#~ msgstr "Ingebouwd scherm"
+msgid "%a %l∶%M %p"
+msgstr "%a %l∶%M %p"
 
-#~ msgid "%s Display"
-#~ msgstr "%s scherm"
-
-#~ msgid "Unknown Display"
-#~ msgstr "Onbekend scherm"
-
-#~ msgid ""
-#~ "requested position/size for CRTC %d is outside the allowed limit: "
-#~ "position=(%d, %d), size=(%d, %d), maximum=(%d, %d)"
-#~ msgstr ""
-#~ "aangevraagde positie/afmeting voor CRTC %d ligt buiten de toegestane "
-#~ "limieten: positie=(%d, %d), afmeting=(%d, %d), maximum=(%d, %d)"
-
-#~ msgid "could not set the configuration for CRTC %d"
-#~ msgstr "kon de instellingen voor CRTC %d niet doorvoeren"
-
-#~ msgid "could not get information about CRTC %d"
-#~ msgstr "kon informatie over CRTC %d niet verkrijgen"
-
-#~ msgid ""
-#~ "none of the saved display configurations matched the active configuration"
-#~ msgstr ""
-#~ "geen van de opgeslagen schermconfiguraties kwam overeen met de actieve "
-#~ "configuratie"
-
-#~ msgid "%a %b %e, %R∶%S"
-#~ msgstr "%a %e %b, %R∶%S"
-
-#~ msgid "%R∶%S"
-#~ msgstr "%R∶%S"
-
-#~ msgid "%a %l∶%M∶%S %p"
-#~ msgstr "%a %l∶%M∶%S %p"
-
-#~ msgid "%a %l∶%M %p"
-#~ msgstr "%a %l∶%M %p"
-
-#~ msgid "%l∶%M∶%S %p"
-#~ msgstr "%l∶%M∶%S %p"
-
-#~ msgid "%l∶%M %p"
-#~ msgstr "%l∶%M %p"
+#. Translators: This is a time format without date used
+#. for AM/PM.
+#. The Unicode characters are U+2236 RATIO and
+#. U+2009 THIN SPACE
+#: ../libgnome-desktop/gnome-wall-clock.c:302
+msgid "%l∶%M∶%S %p"
+msgstr "%l∶%M∶%S %p"
+
+#: ../libgnome-desktop/gnome-wall-clock.c:303
+msgid "%l∶%M %p"
+msgstr "%l∶%M %p"
+
+#, fuzzy
+#~ msgid "%R:%S"
+#~ msgstr "%a %R:%S"
+
+#, fuzzy
+#~ msgid "%l:%M:%S %p"
+#~ msgstr "%a %l:%M:%S %p"
+
+#, fuzzy
+#~ msgid "%l:%M %p"
+#~ msgstr "%a %l:%M %p"
 
 #~ msgid "About GNOME"
 #~ msgstr "Info over Gnome"
diff -Nru gnome-desktop3-3.12.0/po/pa.po gnome-desktop3-3.8.4/po/pa.po
--- gnome-desktop3-3.12.0/po/pa.po	2013-11-11 17:23:18.000000000 +0000
+++ gnome-desktop3-3.8.4/po/pa.po	2013-09-04 11:15:57.000000000 +0000
@@ -10,8 +10,8 @@
 "Project-Id-Version: gnome-desktop.HEAD\n"
 "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=gnome-"
 "desktop&keywords=I18N+L10N&component=general\n"
-"POT-Creation-Date: 2013-09-04 21:57+0000\n"
-"PO-Revision-Date: 2013-09-09 14:27-0500\n"
+"POT-Creation-Date: 2013-03-04 10:03+0000\n"
+"PO-Revision-Date: 2013-03-06 17:45+0530\n"
 "Last-Translator: A S Alam \n"
 "Language-Team: Punjabi/Panjabi \n"
 "Language: pa\n"
@@ -22,61 +22,133 @@
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
 "\n"
 
+#. Translators: "Unknown" here is used to identify a monitor for which
+#. * we don't know the vendor. When a vendor is known, the name of the
+#. * vendor is used.
+#: ../libgnome-desktop/display-name.c:107
+msgctxt "Monitor vendor"
+msgid "Unknown"
+msgstr "ਅਣਜਾਣ"
+
 #: ../libgnome-desktop/gnome-languages.c:804
 msgid "Unspecified"
 msgstr "ਦਿੱਤਾ ਨਹੀਂ"
 
-#: ../libgnome-desktop/gnome-rr-config.c:743
+#. Translators: a CRTC is a CRT Controller (this is X terminology).
+#: ../libgnome-desktop/gnome-rr.c:452
+#, c-format
+msgid "could not get the screen resources (CRTCs, outputs, modes)"
+msgstr "ਸਕਰੀਨ ਸਰੋਤ ਲਏ ਨਹੀਂ ਜਾ ਸਕੇ (CRTC,ਆਉਟਪੁੱਟ,ਮੋਡ)"
+
+#: ../libgnome-desktop/gnome-rr.c:472
+#, c-format
+msgid "unhandled X error while getting the range of screen sizes"
+msgstr "ਸਕਰੀਨ ਅਕਾਰ ਦੀ ਸੀਮਾ ਲੈਣ ਲਈ ਨਾ-ਸੰਭਾਲੀ X ਗਲਤੀ"
+
+#: ../libgnome-desktop/gnome-rr.c:478
+#, c-format
+msgid "could not get the range of screen sizes"
+msgstr "ਸਕਰੀਨ ਅਕਾਰ ਦੀ ਸੀਮਾ ਨਹੀਂ ਲਈ ਜਾ ਸਕੀ"
+
+#: ../libgnome-desktop/gnome-rr.c:769
+#, c-format
+msgid "RANDR extension is not present"
+msgstr "RANDR ਸਹਿਯੋਗੀ ਮੌਜੂਦ ਨਹੀਂ"
+
+#: ../libgnome-desktop/gnome-rr.c:1580
+#, c-format
+msgid "could not get information about output %d"
+msgstr "ਆਉਟਪੁੱਟ %d ਬਾਰੇ ਜਾਣਕਾਰੀ ਨਹੀਂ ਲਈ ਜਾ ਸਕੀ"
+
+#: ../libgnome-desktop/gnome-rr.c:1764
+#| msgid "%s Display"
+msgid "Built-in Display"
+msgstr "ਬਿਲਟ-ਇਨ ਡਿਸਪਲੇਅ"
+
+#. Translators: %s is the size of the monitor in inches
+#: ../libgnome-desktop/gnome-rr.c:1782
+#, c-format
+msgid "%s Display"
+msgstr "%s ਡਿਸਪਲੇਅ"
+
+#: ../libgnome-desktop/gnome-rr.c:1789
+msgid "Unknown Display"
+msgstr "ਅਣਜਾਣ ਡਿਸਪਲੇਅ"
+
+#. Translators: the "position", "size", and "maximum"
+#. * words here are not keywords; please translate them
+#. * as usual.  A CRTC is a CRT Controller (this is X terminology)
+#: ../libgnome-desktop/gnome-rr.c:2234
+#, c-format
+msgid ""
+"requested position/size for CRTC %d is outside the allowed limit: position="
+"(%d, %d), size=(%d, %d), maximum=(%d, %d)"
+msgstr ""
+"CRTC %d ਲਈ ਲੋੜੀਦੀ ਸਥਿਤੀ/ਅਕਾਰ ਮਨਜ਼ੂਰਸ਼ੁਦਾ ਸੀਮਾ ਤੋਂ ਬਾਹਰ ਸਥਿਤੀ=(%d, %d), ਆਕਾਰ=(%"
+"d, "
+"%d), ਵੱਧੋ-ਵੱਧ=(%d, %d)"
+
+#: ../libgnome-desktop/gnome-rr.c:2270
+#, c-format
+msgid "could not set the configuration for CRTC %d"
+msgstr "CRTC %d ਲਈ ਸੰਰਚਨਾ ਸੈੱਟ ਨਹੀਂ ਕੀਤੀ ਜਾ ਸਕੀ"
+
+#: ../libgnome-desktop/gnome-rr.c:2421
+#, c-format
+msgid "could not get information about CRTC %d"
+msgstr "CRTC %d ਬਾਰੇ ਜਾਣਕਾਰੀ ਨਹੀਂ ਲਈ ਜਾ ਸਕੀ"
+
+#: ../libgnome-desktop/gnome-rr-config.c:708
+#, c-format
+msgid ""
+"none of the saved display configurations matched the active configuration"
+msgstr "ਕੋਈ ਵੀ ਸੰਭਾਲੀ ਵੇਖਣ ਸੰਰਚਨਾ ਚਾਲੂ ਸੰਰਚਨਾ ਨਾਲ ਮੇਲ ਨਹੀਂ ਖਾਂਦੀ"
+
+#: ../libgnome-desktop/gnome-rr-config.c:1464
 #, c-format
 msgid "CRTC %d cannot drive output %s"
 msgstr "CRTC %d ਆਉਟਪੁੱਟ %s ਡਰਾਇਵ ਨਹੀਂ ਕਰ ਸਕਦਾ"
 
-#: ../libgnome-desktop/gnome-rr-config.c:750
+#: ../libgnome-desktop/gnome-rr-config.c:1471
 #, c-format
 msgid "output %s does not support mode %dx%d@%dHz"
 msgstr "ਆਉਟਪੁੱਟ %s %dx%d@%dHz ਮੋਡ ਲਈ ਸਹਾਇਕ ਨਹੀਂ ਹੈ"
 
-#: ../libgnome-desktop/gnome-rr-config.c:761
+#: ../libgnome-desktop/gnome-rr-config.c:1482
+#, c-format
+msgid "CRTC %d does not support rotation=%s"
+msgstr "CRTC %d ਘੁੰਮਾਉਣ=%s ਲਈ ਸਹਾਇਕ ਨਹੀਂ ਹੈ"
+
+#: ../libgnome-desktop/gnome-rr-config.c:1496
 #, c-format
-#| msgid "CRTC %d does not support rotation=%s"
-msgid "CRTC %d does not support rotation=%d"
-msgstr "CRTC %d ਘੁੰਮਾਉਣ=%d ਲਈ ਸਹਾਇਕ ਨਹੀਂ ਹੈ"
-
-#: ../libgnome-desktop/gnome-rr-config.c:774
-#, c-format
-#| msgid ""
-#| "output %s does not have the same parameters as another cloned output:\n"
-#| "existing mode = %d, new mode = %d\n"
-#| "existing coordinates = (%d, %d), new coordinates = (%d, %d)\n"
-#| "existing rotation = %s, new rotation = %s"
 msgid ""
 "output %s does not have the same parameters as another cloned output:\n"
 "existing mode = %d, new mode = %d\n"
 "existing coordinates = (%d, %d), new coordinates = (%d, %d)\n"
-"existing rotation = %d, new rotation = %d"
+"existing rotation = %s, new rotation = %s"
 msgstr ""
 "ਆਉਟਪੁੱਟ %s ਦੇ ਉਹੀ ਪੈਰਾਮੀਟਰ ਨਹੀਂ ਹਨ, ਜੋ ਕਿ ਹੋਰ ਕਲੋਨ ਕੀਤੀ ਆਉਟਪੁੱਟ ਦੇ ਹਨ:\n"
 "ਮੌਜੂਦਾ ਮੋਡ:  %d, ਨਵਾਂ ਮੋਡ = %d\n"
 "ਮੌਜੂਦਾ ਕੋਆਰਡੀਨੇਟ = (%d, %d), ਨਵੇਂ ਕੋਆਰਡੀਨੇਟ = (%d, %d)\n"
-"ਮੌਜੂਦਾ ਘੁੰਮਾਉਣ ਦਿਸ਼ਾ= %d, ਨਵੀਂ ਘੁੰਮਾਉਣ ਦਿਸ਼ਾ = %d"
+"ਮੌਜੂਦਾ ਘੁੰਮਾਉਣ ਦਿਸ਼ਾ= %s, ਨਵੀਂ ਘੁੰਮਾਉਣ ਦਿਸ਼ਾ = %s"
 
-#: ../libgnome-desktop/gnome-rr-config.c:789
+#: ../libgnome-desktop/gnome-rr-config.c:1511
 #, c-format
 msgid "cannot clone to output %s"
 msgstr "%s ਆਉਟਪੁੱਟ ਕਲੋਨ ਨਹੀਂ ਕੀਤੀ ਜਾ ਸਕਦੀ"
 
-#: ../libgnome-desktop/gnome-rr-config.c:915
+#: ../libgnome-desktop/gnome-rr-config.c:1680
 #, c-format
 msgid "Trying modes for CRTC %d\n"
 msgstr "CRTC %d ਲਈ ਮੋਡ ਨਾਲ ਕੋਸ਼ਿਸ਼ ਜਾਰੀ\n"
 
-#: ../libgnome-desktop/gnome-rr-config.c:939
+#: ../libgnome-desktop/gnome-rr-config.c:1704
 #, c-format
 msgid "CRTC %d: trying mode %dx%d@%dHz with output at %dx%d@%dHz (pass %d)\n"
 msgstr ""
 "CRTC %d: %dx%d@%dHz ਮੋਡ ਨਾਲ %dx%d@%dHz ਉੱਤੇ ਆਉਟਪੁੱਟ ਨਾਲ ਕੋਸ਼ਿਸ਼(ਪਾਸ %d)\n"
 
-#: ../libgnome-desktop/gnome-rr-config.c:986
+#: ../libgnome-desktop/gnome-rr-config.c:1751
 #, c-format
 msgid ""
 "could not assign CRTCs to outputs:\n"
@@ -85,7 +157,7 @@
 "CRTCs ਆਉਟਪੁੱਟ ਨੂੰ ਦਿੱਤਾ ਨਹੀਂ ਜਾ ਸਕਿਆ:\n"
 "%s"
 
-#: ../libgnome-desktop/gnome-rr-config.c:990
+#: ../libgnome-desktop/gnome-rr-config.c:1755
 #, c-format
 msgid ""
 "none of the selected modes were compatible with the possible modes:\n"
@@ -97,7 +169,7 @@
 #. Translators: the "requested", "minimum", and
 #. * "maximum" words here are not keywords; please
 #. * translate them as usual.
-#: ../libgnome-desktop/gnome-rr-config.c:1071
+#: ../libgnome-desktop/gnome-rr-config.c:1833
 #, c-format
 msgid ""
 "required virtual size does not fit available size: requested=(%d, %d), "
@@ -109,31 +181,32 @@
 
 #. Translators: This is the time format with full date used
 #. in 24-hour mode.
-#: ../libgnome-desktop/gnome-wall-clock.c:270
-#| msgid "%a %b %e, %R"
-msgid "%a %b %e, %R:%S"
-msgstr "%a %e %b, %R:%S"
+#. The character between %R and %S is U+2236 RATIO
+#: ../libgnome-desktop/gnome-wall-clock.c:268
+msgid "%a %b %e, %R∶%S"
+msgstr "%a, %e %b %R:%S"
 
-#: ../libgnome-desktop/gnome-wall-clock.c:271
+#: ../libgnome-desktop/gnome-wall-clock.c:269
 msgid "%a %b %e, %R"
 msgstr "%a %e %b, %R"
 
 #. Translators: This is the time format with day used
 #. in 24-hour mode.
-#: ../libgnome-desktop/gnome-wall-clock.c:275
-#| msgid "%a %R∶%S"
-msgid "%a %R:%S"
+#. The character between %R and %S is U+2236 RATIO
+#: ../libgnome-desktop/gnome-wall-clock.c:274
+msgid "%a %R∶%S"
 msgstr "%a %R:%S"
 
-#: ../libgnome-desktop/gnome-wall-clock.c:276
+#: ../libgnome-desktop/gnome-wall-clock.c:275
 msgid "%a %R"
 msgstr "%a %R"
 
 #. Translators: This is the time format without date used
 #. in 24-hour mode.
+#. The character between %R and %S is U+2236 RATIO
 #: ../libgnome-desktop/gnome-wall-clock.c:280
-msgid "%R:%S"
-msgstr "%R:%S"
+msgid "%R∶%S"
+msgstr "%R∶%S"
 
 #: ../libgnome-desktop/gnome-wall-clock.c:280
 msgid "%R"
@@ -141,109 +214,58 @@
 
 #. Translators: This is a time format with full date used
 #. for AM/PM.
-#: ../libgnome-desktop/gnome-wall-clock.c:286
-#| msgid "%a %b %e, %l∶%M∶%S %p"
-msgid "%a %b %e, %l:%M:%S %p"
+#. The Unicode characters are U+2236 RATIO and
+#. U+2009 THIN SPACE
+#: ../libgnome-desktop/gnome-wall-clock.c:288
+msgid "%a %b %e, %l∶%M∶%S %p"
 msgstr "%a %e %b, %l:%M:%S %p"
 
-#: ../libgnome-desktop/gnome-wall-clock.c:287
-#| msgid "%a %b %e, %l∶%M %p"
-msgid "%a %b %e, %l:%M %p"
+#: ../libgnome-desktop/gnome-wall-clock.c:289
+msgid "%a %b %e, %l∶%M %p"
 msgstr "%a %e %b, %l:%M %p"
 
 #. Translators: This is a time format with day used
 #. for AM/PM.
-#: ../libgnome-desktop/gnome-wall-clock.c:291
-#| msgid "%l:%M:%S %p"
-msgid "%a %l:%M:%S %p"
+#. The Unicode characters are U+2236 RATIO and
+#. U+2009 THIN SPACE
+#: ../libgnome-desktop/gnome-wall-clock.c:295
+msgid "%a %l∶%M∶%S %p"
 msgstr "%a %l:%M:%S %p"
 
-#: ../libgnome-desktop/gnome-wall-clock.c:292
-#| msgid "%l:%M %p"
-msgid "%a %l:%M %p"
+#: ../libgnome-desktop/gnome-wall-clock.c:296
+msgid "%a %l∶%M %p"
 msgstr "%a %l:%M %p"
 
 #. Translators: This is a time format without date used
 #. for AM/PM.
-#: ../libgnome-desktop/gnome-wall-clock.c:296
-msgid "%l:%M:%S %p"
-msgstr "%l:%M:%S %p"
-
-#: ../libgnome-desktop/gnome-wall-clock.c:297
-msgid "%l:%M %p"
-msgstr "%l:%M %p"
-
-#~ msgctxt "Monitor vendor"
-#~ msgid "Unknown"
-#~ msgstr "ਅਣਜਾਣ"
-
-#~ msgid "could not get the screen resources (CRTCs, outputs, modes)"
-#~ msgstr "ਸਕਰੀਨ ਸਰੋਤ ਲਏ ਨਹੀਂ ਜਾ ਸਕੇ (CRTC,ਆਉਟਪੁੱਟ,ਮੋਡ)"
-
-#~ msgid "unhandled X error while getting the range of screen sizes"
-#~ msgstr "ਸਕਰੀਨ ਅਕਾਰ ਦੀ ਸੀਮਾ ਲੈਣ ਲਈ ਨਾ-ਸੰਭਾਲੀ X ਗਲਤੀ"
-
-#~ msgid "could not get the range of screen sizes"
-#~ msgstr "ਸਕਰੀਨ ਅਕਾਰ ਦੀ ਸੀਮਾ ਨਹੀਂ ਲਈ ਜਾ ਸਕੀ"
-
-#~ msgid "RANDR extension is not present"
-#~ msgstr "RANDR ਸਹਿਯੋਗੀ ਮੌਜੂਦ ਨਹੀਂ"
-
-#~ msgid "could not get information about output %d"
-#~ msgstr "ਆਉਟਪੁੱਟ %d ਬਾਰੇ ਜਾਣਕਾਰੀ ਨਹੀਂ ਲਈ ਜਾ ਸਕੀ"
+#. The Unicode characters are U+2236 RATIO and
+#. U+2009 THIN SPACE
+#: ../libgnome-desktop/gnome-wall-clock.c:302
+msgid "%l∶%M∶%S %p"
+msgstr "%l∶%M∶%S %p"
+
+#: ../libgnome-desktop/gnome-wall-clock.c:303
+msgid "%l∶%M %p"
+msgstr "%l∶%M %p"
 
 #~ msgid "Laptop"
 #~ msgstr "ਲੈਪਟਾਪ"
 
-#~ msgid "%s Display"
-#~ msgstr "%s ਡਿਸਪਲੇਅ"
-
-#~| msgctxt "Monitor vendor"
-#~| msgid "Unknown"
-#~ msgid "Unknown Display"
-#~ msgstr "ਅਣਜਾਣ ਡਿਸਪਲੇਅ"
-
-#~ msgid ""
-#~ "requested position/size for CRTC %d is outside the allowed limit: "
-#~ "position=(%d, %d), size=(%d, %d), maximum=(%d, %d)"
-#~ msgstr ""
-#~ "CRTC %d ਲਈ ਲੋੜੀਦੀ ਸਥਿਤੀ/ਅਕਾਰ ਮਨਜ਼ੂਰਸ਼ੁਦਾ ਸੀਮਾ ਤੋਂ ਬਾਹਰ ਸਥਿਤੀ=(%d, %d), ਆਕਾਰ=(%d, "
-#~ "%d), ਵੱਧੋ-ਵੱਧ=(%d, %d)"
-
-#~ msgid "could not set the configuration for CRTC %d"
-#~ msgstr "CRTC %d ਲਈ ਸੰਰਚਨਾ ਸੈੱਟ ਨਹੀਂ ਕੀਤੀ ਜਾ ਸਕੀ"
-
-#~ msgid "could not get information about CRTC %d"
-#~ msgstr "CRTC %d ਬਾਰੇ ਜਾਣਕਾਰੀ ਨਹੀਂ ਲਈ ਜਾ ਸਕੀ"
-
-#~ msgid ""
-#~ "none of the saved display configurations matched the active configuration"
-#~ msgstr "ਕੋਈ ਵੀ ਸੰਭਾਲੀ ਵੇਖਣ ਸੰਰਚਨਾ ਚਾਲੂ ਸੰਰਚਨਾ ਨਾਲ ਮੇਲ ਨਹੀਂ ਖਾਂਦੀ"
-
-#~ msgid "%a %b %e, %R∶%S"
-#~ msgstr "%a, %e %b %R:%S"
-
-#~ msgid "%R∶%S"
-#~ msgstr "%R∶%S"
-
-#~ msgid "%a %l∶%M∶%S %p"
-#~ msgstr "%a %l:%M:%S %p"
-
-#~ msgid "%a %l∶%M %p"
-#~ msgstr "%a %l:%M %p"
-
-#~ msgid "%l∶%M∶%S %p"
-#~ msgstr "%l∶%M∶%S %p"
-
-#~ msgid "%l∶%M %p"
-#~ msgstr "%l∶%M %p"
-
 #~ msgid "Cannot find a terminal, using xterm, even if it may not work"
 #~ msgstr "ਟਰਮੀਨਲ ਨਹੀਂ ਲੱਭਿਆ ਜਾ ਸਕਦਾ, xtrerm ਦੀ ਵਰਤੋਂ, ਭਾਵੇਂ ਇਹ ਵੀ ਸ਼ਾਇਦ ਹੀ ਕੰਮ ਕਰੇ"
 
 #~ msgid "Mirrored Displays"
 #~ msgstr "ਮਿਰਰ ਕੀਤੇ ਡਿਸਪਲੇਅ"
 
+#~ msgid "%R:%S"
+#~ msgstr "%R:%S"
+
+#~ msgid "%l:%M:%S %p"
+#~ msgstr "%l:%M:%S %p"
+
+#~ msgid "%l:%M %p"
+#~ msgstr "%l:%M %p"
+
 #~ msgid "Mirror Screens"
 #~ msgstr "ਮਿੱਰਰ ਸਕਰੀਨਾਂ"
 
diff -Nru gnome-desktop3-3.12.0/po/pl.po gnome-desktop3-3.8.4/po/pl.po
--- gnome-desktop3-3.12.0/po/pl.po	2013-11-11 17:23:18.000000000 +0000
+++ gnome-desktop3-3.8.4/po/pl.po	2013-09-04 11:15:57.000000000 +0000
@@ -14,8 +14,8 @@
 msgstr ""
 "Project-Id-Version: gnome-desktop\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-08-20 22:39+0200\n"
-"PO-Revision-Date: 2013-08-20 22:40+0200\n"
+"POT-Creation-Date: 2013-03-04 22:01+0100\n"
+"PO-Revision-Date: 2013-03-04 22:02+0100\n"
 "Last-Translator: Piotr Drąg \n"
 "Language-Team: Polish \n"
 "Language: pl\n"
@@ -27,57 +27,135 @@
 "X-Poedit-Language: Polish\n"
 "X-Poedit-Country: Poland\n"
 
+#. Translators: "Unknown" here is used to identify a monitor for which
+#. * we don't know the vendor. When a vendor is known, the name of the
+#. * vendor is used.
+#: ../libgnome-desktop/display-name.c:107
+msgctxt "Monitor vendor"
+msgid "Unknown"
+msgstr "Nieznany"
+
 #: ../libgnome-desktop/gnome-languages.c:804
 msgid "Unspecified"
 msgstr "Nieokreślony"
 
-#: ../libgnome-desktop/gnome-rr-config.c:743
+#. Translators: a CRTC is a CRT Controller (this is X terminology).
+#: ../libgnome-desktop/gnome-rr.c:452
+#, c-format
+msgid "could not get the screen resources (CRTCs, outputs, modes)"
+msgstr "nie można uzyskać zasobów ekranu (CRTC, wyjść, trybów)"
+
+#: ../libgnome-desktop/gnome-rr.c:472
+#, c-format
+msgid "unhandled X error while getting the range of screen sizes"
+msgstr "nieobsługiwany błąd X podczas uzyskiwania zakresu rozmiarów ekranu"
+
+#: ../libgnome-desktop/gnome-rr.c:478
+#, c-format
+msgid "could not get the range of screen sizes"
+msgstr "nie można uzyskać zakresu rozmiarów ekranu"
+
+#: ../libgnome-desktop/gnome-rr.c:769
+#, c-format
+msgid "RANDR extension is not present"
+msgstr "rozszerzenie RandR jest niedostępne"
+
+#: ../libgnome-desktop/gnome-rr.c:1580
+#, c-format
+msgid "could not get information about output %d"
+msgstr "nie można uzyskać informacji o wyjściu %d"
+
+#: ../libgnome-desktop/gnome-rr.c:1764
+msgid "Built-in Display"
+msgstr "Wbudowany ekran"
+
+#. Translators: %s is the size of the monitor in inches
+#: ../libgnome-desktop/gnome-rr.c:1782
+#, c-format
+msgid "%s Display"
+msgstr "Ekran %s"
+
+#: ../libgnome-desktop/gnome-rr.c:1789
+msgid "Unknown Display"
+msgstr "Nieznany ekran"
+
+#. Translators: the "position", "size", and "maximum"
+#. * words here are not keywords; please translate them
+#. * as usual.  A CRTC is a CRT Controller (this is X terminology)
+#: ../libgnome-desktop/gnome-rr.c:2234
+#, c-format
+msgid ""
+"requested position/size for CRTC %d is outside the allowed limit: position="
+"(%d, %d), size=(%d, %d), maximum=(%d, %d)"
+msgstr ""
+"żądane położenie/rozmiar dla CRTC %d znajduje się poza dozwolonym "
+"ograniczeniem: położenie=(%d, %d), rozmiar=(%d, %d), maksymalny=(%d, %d)"
+
+#: ../libgnome-desktop/gnome-rr.c:2270
+#, c-format
+msgid "could not set the configuration for CRTC %d"
+msgstr "nie można ustawić konfiguracji dla CRTC %d"
+
+#: ../libgnome-desktop/gnome-rr.c:2421
+#, c-format
+msgid "could not get information about CRTC %d"
+msgstr "nie można uzyskać informacji o CRTC %d"
+
+#: ../libgnome-desktop/gnome-rr-config.c:708
+#, c-format
+msgid ""
+"none of the saved display configurations matched the active configuration"
+msgstr ""
+"żadna z zapisanych konfiguracji wyświetlania nie pasuje do aktywnej "
+"konfiguracji"
+
+#: ../libgnome-desktop/gnome-rr-config.c:1464
 #, c-format
 msgid "CRTC %d cannot drive output %s"
 msgstr "CRTC %d nie może prowadzić wyjścia %s"
 
-#: ../libgnome-desktop/gnome-rr-config.c:750
+#: ../libgnome-desktop/gnome-rr-config.c:1471
 #, c-format
 msgid "output %s does not support mode %dx%d@%dHz"
 msgstr "wyjście %s nie obsługuje trybu %dx%d@%dHz"
 
-#: ../libgnome-desktop/gnome-rr-config.c:761
+#: ../libgnome-desktop/gnome-rr-config.c:1482
 #, c-format
-msgid "CRTC %d does not support rotation=%d"
-msgstr "CRTC %d nie obsługuje rotation=%d"
+msgid "CRTC %d does not support rotation=%s"
+msgstr "CRTC %d nie obsługuje rotation=%s"
 
-#: ../libgnome-desktop/gnome-rr-config.c:774
+#: ../libgnome-desktop/gnome-rr-config.c:1496
 #, c-format
 msgid ""
 "output %s does not have the same parameters as another cloned output:\n"
 "existing mode = %d, new mode = %d\n"
 "existing coordinates = (%d, %d), new coordinates = (%d, %d)\n"
-"existing rotation = %d, new rotation = %d"
+"existing rotation = %s, new rotation = %s"
 msgstr ""
 "wyjście %s nie posiada takich samych parametrów, co inne sklonowane "
 "wyjście:\n"
 "istniejący tryb = %d, nowy tryb = %d\n"
 "istniejące współrzędne = (%d, %d), nowe współrzędne = (%d, %d)\n"
-"istniejący obrót = %d, nowy obrót = %d"
+"istniejący obrót = %s, nowy obrót = %s"
 
-#: ../libgnome-desktop/gnome-rr-config.c:789
+#: ../libgnome-desktop/gnome-rr-config.c:1511
 #, c-format
 msgid "cannot clone to output %s"
 msgstr "nie można sklonować do wyjścia %s"
 
-#: ../libgnome-desktop/gnome-rr-config.c:915
+#: ../libgnome-desktop/gnome-rr-config.c:1680
 #, c-format
 msgid "Trying modes for CRTC %d\n"
 msgstr "Próbowanie trybów dla CRTC %d\n"
 
-#: ../libgnome-desktop/gnome-rr-config.c:939
+#: ../libgnome-desktop/gnome-rr-config.c:1704
 #, c-format
 msgid "CRTC %d: trying mode %dx%d@%dHz with output at %dx%d@%dHz (pass %d)\n"
 msgstr ""
 "CRTC %d: próbowanie trybu %dx%d@%dHz za pomocą wyjścia w %dx%d@%dHz "
 "(przeszło %d)\n"
 
-#: ../libgnome-desktop/gnome-rr-config.c:986
+#: ../libgnome-desktop/gnome-rr-config.c:1751
 #, c-format
 msgid ""
 "could not assign CRTCs to outputs:\n"
@@ -86,7 +164,7 @@
 "nie można przydzielić CRTC do wyjść:\n"
 "%s"
 
-#: ../libgnome-desktop/gnome-rr-config.c:990
+#: ../libgnome-desktop/gnome-rr-config.c:1755
 #, c-format
 msgid ""
 "none of the selected modes were compatible with the possible modes:\n"
@@ -98,7 +176,7 @@
 #. Translators: the "requested", "minimum", and
 #. * "maximum" words here are not keywords; please
 #. * translate them as usual.
-#: ../libgnome-desktop/gnome-rr-config.c:1071
+#: ../libgnome-desktop/gnome-rr-config.c:1833
 #, c-format
 msgid ""
 "required virtual size does not fit available size: requested=(%d, %d), "
@@ -109,60 +187,69 @@
 
 #. Translators: This is the time format with full date used
 #. in 24-hour mode.
-#: ../libgnome-desktop/gnome-wall-clock.c:270
-msgid "%a %b %e, %R:%S"
-msgstr "%a %e %b, %H∶%M∶%S"
+#. The character between %R and %S is U+2236 RATIO
+#: ../libgnome-desktop/gnome-wall-clock.c:268
+msgid "%a %b %e, %R∶%S"
+msgstr "%a %e %b, %R∶%S"
 
-#: ../libgnome-desktop/gnome-wall-clock.c:271
+#: ../libgnome-desktop/gnome-wall-clock.c:269
 msgid "%a %b %e, %R"
-msgstr "%a %e %b, %H∶%M"
+msgstr "%a %e %b, %R"
 
 #. Translators: This is the time format with day used
 #. in 24-hour mode.
-#: ../libgnome-desktop/gnome-wall-clock.c:275
-msgid "%a %R:%S"
-msgstr "%a, %H∶%M∶%S"
+#. The character between %R and %S is U+2236 RATIO
+#: ../libgnome-desktop/gnome-wall-clock.c:274
+msgid "%a %R∶%S"
+msgstr "%a, %R∶%S"
 
-#: ../libgnome-desktop/gnome-wall-clock.c:276
+#: ../libgnome-desktop/gnome-wall-clock.c:275
 msgid "%a %R"
-msgstr "%a, %H∶%M"
+msgstr "%a, %R"
 
 #. Translators: This is the time format without date used
 #. in 24-hour mode.
+#. The character between %R and %S is U+2236 RATIO
 #: ../libgnome-desktop/gnome-wall-clock.c:280
-msgid "%R:%S"
-msgstr "%H∶%M∶%S"
+msgid "%R∶%S"
+msgstr "%R∶%S"
 
 #: ../libgnome-desktop/gnome-wall-clock.c:280
 msgid "%R"
-msgstr "%H∶%M"
+msgstr "%R"
 
 #. Translators: This is a time format with full date used
 #. for AM/PM.
-#: ../libgnome-desktop/gnome-wall-clock.c:286
-msgid "%a %b %e, %l:%M:%S %p"
-msgstr "%a %e %b, %l∶%M∶%S %p"
-
-#: ../libgnome-desktop/gnome-wall-clock.c:287
-msgid "%a %b %e, %l:%M %p"
-msgstr "%a %e %b, %l∶%M %p"
+#. The Unicode characters are U+2236 RATIO and
+#. U+2009 THIN SPACE
+#: ../libgnome-desktop/gnome-wall-clock.c:288
+msgid "%a %b %e, %l∶%M∶%S %p"
+msgstr "%a %e %b, %l∶%M∶%S %p"
+
+#: ../libgnome-desktop/gnome-wall-clock.c:289
+msgid "%a %b %e, %l∶%M %p"
+msgstr "%a %e %b, %l∶%M %p"
 
 #. Translators: This is a time format with day used
 #. for AM/PM.
-#: ../libgnome-desktop/gnome-wall-clock.c:291
-msgid "%a %l:%M:%S %p"
-msgstr "%a, %l∶%M∶%S %p"
-
-#: ../libgnome-desktop/gnome-wall-clock.c:292
-msgid "%a %l:%M %p"
-msgstr "%a, %l∶%M %p"
+#. The Unicode characters are U+2236 RATIO and
+#. U+2009 THIN SPACE
+#: ../libgnome-desktop/gnome-wall-clock.c:295
+msgid "%a %l∶%M∶%S %p"
+msgstr "%a, %l∶%M∶%S %p"
 
-#. Translators: This is a time format without date used
-#. for AM/PM.
 #: ../libgnome-desktop/gnome-wall-clock.c:296
-msgid "%l:%M:%S %p"
-msgstr "%l∶%M∶%S %p"
+msgid "%a %l∶%M %p"
+msgstr "%a, %l∶%M %p"
 
-#: ../libgnome-desktop/gnome-wall-clock.c:297
-msgid "%l:%M %p"
-msgstr "%l∶%M %p"
+#. Translators: This is a time format without date used
+#. for AM/PM.
+#. The Unicode characters are U+2236 RATIO and
+#. U+2009 THIN SPACE
+#: ../libgnome-desktop/gnome-wall-clock.c:302
+msgid "%l∶%M∶%S %p"
+msgstr "%l∶%M∶%S %p"
+
+#: ../libgnome-desktop/gnome-wall-clock.c:303
+msgid "%l∶%M %p"
+msgstr "%l∶%M %p"
diff -Nru gnome-desktop3-3.12.0/po/POTFILES.in gnome-desktop3-3.8.4/po/POTFILES.in
--- gnome-desktop3-3.12.0/po/POTFILES.in	2013-11-11 17:23:17.000000000 +0000
+++ gnome-desktop3-3.8.4/po/POTFILES.in	2013-09-04 11:15:57.000000000 +0000
@@ -2,6 +2,7 @@
 # Please keep this file sorted alphabetically.
 # When adding a file here, make sure that the entry point in the API of this
 # file calls _gnome_desktop_init_i18n ()
+libgnome-desktop/display-name.c
 libgnome-desktop/gnome-languages.c
 libgnome-desktop/gnome-rr.c
 libgnome-desktop/gnome-rr-config.c
diff -Nru gnome-desktop3-3.12.0/po/pt_BR.po gnome-desktop3-3.8.4/po/pt_BR.po
--- gnome-desktop3-3.12.0/po/pt_BR.po	2013-11-11 17:23:18.000000000 +0000
+++ gnome-desktop3-3.8.4/po/pt_BR.po	2013-09-04 11:15:57.000000000 +0000
@@ -24,9 +24,9 @@
 "Project-Id-Version: gnome-desktop\n"
 "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=gnome-"
 "desktop&keywords=I18N+L10N&component=general\n"
-"POT-Creation-Date: 2013-08-20 08:16+0000\n"
-"PO-Revision-Date: 2013-08-19 22:53-0300\n"
-"Last-Translator: Enrico Nicoletto \n"
+"POT-Creation-Date: 2013-03-06 12:22+0000\n"
+"PO-Revision-Date: 2013-03-07 02:12-0300\n"
+"Last-Translator: Rafael Ferreira \n"
 "Language-Team: Brazilian Portuguese \n"
 "Language: pt_BR\n"
 "MIME-Version: 1.0\n"
@@ -35,55 +35,132 @@
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
 "X-Generator: Poedit 1.5.4\n"
 
+#. Translators: "Unknown" here is used to identify a monitor for which
+#. * we don't know the vendor. When a vendor is known, the name of the
+#. * vendor is used.
+#: ../libgnome-desktop/display-name.c:107
+msgctxt "Monitor vendor"
+msgid "Unknown"
+msgstr "Desconhecido"
+
 #: ../libgnome-desktop/gnome-languages.c:804
 msgid "Unspecified"
 msgstr "Não especificado"
 
-#: ../libgnome-desktop/gnome-rr-config.c:743
+#. Translators: a CRTC is a CRT Controller (this is X terminology).
+#: ../libgnome-desktop/gnome-rr.c:452
+#, c-format
+msgid "could not get the screen resources (CRTCs, outputs, modes)"
+msgstr "não foi possível obter os recursos da tela (CRTCs, saídas, modos)"
+
+#: ../libgnome-desktop/gnome-rr.c:472
+#, c-format
+msgid "unhandled X error while getting the range of screen sizes"
+msgstr "erro não manipulado do X ao obter o intervalo de tamanhos da tela"
+
+#: ../libgnome-desktop/gnome-rr.c:478
+#, c-format
+msgid "could not get the range of screen sizes"
+msgstr "não foi possível obter o intervalo de tamanhos da tela"
+
+#: ../libgnome-desktop/gnome-rr.c:769
+#, c-format
+msgid "RANDR extension is not present"
+msgstr "Extensão RANDR não está presente"
+
+#: ../libgnome-desktop/gnome-rr.c:1580
+#, c-format
+msgid "could not get information about output %d"
+msgstr "não foi possível obter informações sobre a saída %d"
+
+#: ../libgnome-desktop/gnome-rr.c:1764
+msgid "Built-in Display"
+msgstr "Monitor embutido"
+
+#. Translators: %s is the size of the monitor in inches
+#: ../libgnome-desktop/gnome-rr.c:1782
+#, c-format
+msgid "%s Display"
+msgstr "Monitor de %s polegadas"
+
+#: ../libgnome-desktop/gnome-rr.c:1789
+msgid "Unknown Display"
+msgstr "Monitor desconhecido"
+
+#. Translators: the "position", "size", and "maximum"
+#. * words here are not keywords; please translate them
+#. * as usual.  A CRTC is a CRT Controller (this is X terminology)
+#: ../libgnome-desktop/gnome-rr.c:2234
+#, c-format
+msgid ""
+"requested position/size for CRTC %d is outside the allowed limit: "
+"position=(%d, %d), size=(%d, %d), maximum=(%d, %d)"
+msgstr ""
+"a posição requisitada/tamanho para CRTC %d está fora do limite permitido: "
+"posição=(%d, %d), tamanho=(%d, %d), máximo=(%d, %d)"
+
+#: ../libgnome-desktop/gnome-rr.c:2270
+#, c-format
+msgid "could not set the configuration for CRTC %d"
+msgstr "não foi possível definir a configuração para CRTC %d"
+
+#: ../libgnome-desktop/gnome-rr.c:2421
+#, c-format
+msgid "could not get information about CRTC %d"
+msgstr "não foi possível obter informações sobre CRTC %d"
+
+#: ../libgnome-desktop/gnome-rr-config.c:708
+#, c-format
+msgid ""
+"none of the saved display configurations matched the active configuration"
+msgstr ""
+"nenhuma das configurações de exibição correspondem a configuração ativa"
+
+#: ../libgnome-desktop/gnome-rr-config.c:1464
 #, c-format
 msgid "CRTC %d cannot drive output %s"
 msgstr "CRTC %d não pode se conectar à saída %s"
 
-#: ../libgnome-desktop/gnome-rr-config.c:750
+#: ../libgnome-desktop/gnome-rr-config.c:1471
 #, c-format
 msgid "output %s does not support mode %dx%d@%dHz"
 msgstr "a saída %s não suporta o modo %dx%d@%dHz"
 
-#: ../libgnome-desktop/gnome-rr-config.c:761
+#: ../libgnome-desktop/gnome-rr-config.c:1482
 #, c-format
-msgid "CRTC %d does not support rotation=%d"
-msgstr "CRTC %d não suporta rotação=%d"
+msgid "CRTC %d does not support rotation=%s"
+msgstr "CRTC %d não suporta rotação=%s"
 
-#: ../libgnome-desktop/gnome-rr-config.c:774
+#: ../libgnome-desktop/gnome-rr-config.c:1496
 #, c-format
 msgid ""
 "output %s does not have the same parameters as another cloned output:\n"
 "existing mode = %d, new mode = %d\n"
 "existing coordinates = (%d, %d), new coordinates = (%d, %d)\n"
-"existing rotation = %d, new rotation = %d"
+"existing rotation = %s, new rotation = %s"
 msgstr ""
-"a saída %s não possui os mesmos parâmetros que a outra saída clonada:\n"
-"modo atual = %d, novo modo = %d\n"
-"coordenadas atuais = (%d,%d), novas coordenadas = (%d,%d)\n"
-"rotação atual = %d, nova rotação = %d"
+"a saída %s não tem os mesmos parâmetros que a outra saída clonada:\n"
+"modo existente = %d, novo modo %d\n"
+"coordenadas existentes = (%d,%d), novas coordenadas = (%d,%d)\n"
+"rotação existente = %s, nova rotação = %s"
 
-#: ../libgnome-desktop/gnome-rr-config.c:789
+#: ../libgnome-desktop/gnome-rr-config.c:1511
 #, c-format
 msgid "cannot clone to output %s"
 msgstr "não pode clonar para a saída %s"
 
-#: ../libgnome-desktop/gnome-rr-config.c:915
+#: ../libgnome-desktop/gnome-rr-config.c:1680
 #, c-format
 msgid "Trying modes for CRTC %d\n"
 msgstr "Tentando modos para CRTC: %d\n"
 
-#: ../libgnome-desktop/gnome-rr-config.c:939
+#: ../libgnome-desktop/gnome-rr-config.c:1704
 #, c-format
 msgid "CRTC %d: trying mode %dx%d@%dHz with output at %dx%d@%dHz (pass %d)\n"
 msgstr ""
 "CRTC %d: tentando o modo %dx%d@%dHz com saída em %dx%d@%dHz (passo %d)\n"
 
-#: ../libgnome-desktop/gnome-rr-config.c:986
+#: ../libgnome-desktop/gnome-rr-config.c:1751
 #, c-format
 msgid ""
 "could not assign CRTCs to outputs:\n"
@@ -92,7 +169,7 @@
 "não foi possível atribuir CRTCs para as saídas:\n"
 "%s"
 
-#: ../libgnome-desktop/gnome-rr-config.c:990
+#: ../libgnome-desktop/gnome-rr-config.c:1755
 #, c-format
 msgid ""
 "none of the selected modes were compatible with the possible modes:\n"
@@ -104,7 +181,7 @@
 #. Translators: the "requested", "minimum", and
 #. * "maximum" words here are not keywords; please
 #. * translate them as usual.
-#: ../libgnome-desktop/gnome-rr-config.c:1071
+#: ../libgnome-desktop/gnome-rr-config.c:1833
 #, c-format
 msgid ""
 "required virtual size does not fit available size: requested=(%d, %d), "
@@ -113,109 +190,332 @@
 "o tamanho virtual requisitado não se encaixa no tamanho disponível: "
 "requisitado=(%d, %d), mínimo=(%d, %d), máximo=(%d, %d)"
 
+# Há suporte para formatos de hora 12 e 24. No Brasil é adotado 24h, porém devem ser mantidos os dois formatos possível. Para maiores referências, consulte a página man date.
 #. Translators: This is the time format with full date used
 #. in 24-hour mode.
-#: ../libgnome-desktop/gnome-wall-clock.c:270
-msgid "%a %b %e, %R:%S"
-msgstr "%a, %e de %b, %R:%S"
+#. The character between %R and %S is U+2236 RATIO
+#: ../libgnome-desktop/gnome-wall-clock.c:268
+msgid "%a %b %e, %R∶%S"
+msgstr "%a, %e de %b, %R∶%S"
 
-#: ../libgnome-desktop/gnome-wall-clock.c:271
+#: ../libgnome-desktop/gnome-wall-clock.c:269
 msgid "%a %b %e, %R"
 msgstr "%a, %e de %b, %R"
 
 #. Translators: This is the time format with day used
 #. in 24-hour mode.
-#: ../libgnome-desktop/gnome-wall-clock.c:275
-msgid "%a %R:%S"
-msgstr "%a, %R:%S"
+#. The character between %R and %S is U+2236 RATIO
+#: ../libgnome-desktop/gnome-wall-clock.c:274
+msgid "%a %R∶%S"
+msgstr "%a, %R∶%S"
 
-#: ../libgnome-desktop/gnome-wall-clock.c:276
+#: ../libgnome-desktop/gnome-wall-clock.c:275
 msgid "%a %R"
 msgstr "%a, %R"
 
 #. Translators: This is the time format without date used
 #. in 24-hour mode.
+#. The character between %R and %S is U+2236 RATIO
 #: ../libgnome-desktop/gnome-wall-clock.c:280
-msgid "%R:%S"
-msgstr "%R:%S"
+msgid "%R∶%S"
+msgstr "%R∶%S"
 
 #: ../libgnome-desktop/gnome-wall-clock.c:280
 msgid "%R"
 msgstr "%R"
 
-# Havia uma formatação de caractere diferente aqui, para manter compatibilidade, usei a mesma que o original --Enrico
 #. Translators: This is a time format with full date used
 #. for AM/PM.
-#: ../libgnome-desktop/gnome-wall-clock.c:286
-msgid "%a %b %e, %l:%M:%S %p"
-msgstr "%a, %e de %b, %l:%M:%S %p"
-
-#: ../libgnome-desktop/gnome-wall-clock.c:287
-msgid "%a %b %e, %l:%M %p"
-msgstr "%a, %e de %b, %l:%M %p"
+#. The Unicode characters are U+2236 RATIO and
+#. U+2009 THIN SPACE
+#: ../libgnome-desktop/gnome-wall-clock.c:288
+msgid "%a %b %e, %l∶%M∶%S %p"
+msgstr "%a, %e de %b, %l∶%M∶%S %p"
+
+#: ../libgnome-desktop/gnome-wall-clock.c:289
+msgid "%a %b %e, %l∶%M %p"
+msgstr "%a, %e de %b, %l∶%M %p"
 
 #. Translators: This is a time format with day used
 #. for AM/PM.
-#: ../libgnome-desktop/gnome-wall-clock.c:291
-msgid "%a %l:%M:%S %p"
-msgstr "%a, %l:%M:%S %p"
-
-#: ../libgnome-desktop/gnome-wall-clock.c:292
-msgid "%a %l:%M %p"
-msgstr "%a, %l:%M %p"
+#. The Unicode characters are U+2236 RATIO and
+#. U+2009 THIN SPACE
+#: ../libgnome-desktop/gnome-wall-clock.c:295
+msgid "%a %l∶%M∶%S %p"
+msgstr "%a, %l∶%M∶%S %p"
+
+#: ../libgnome-desktop/gnome-wall-clock.c:296
+msgid "%a %l∶%M %p"
+msgstr "%a, %l∶%M %p"
 
 #. Translators: This is a time format without date used
 #. for AM/PM.
-#: ../libgnome-desktop/gnome-wall-clock.c:296
-msgid "%l:%M:%S %p"
-msgstr "%l:%M:%S %p"
+#. The Unicode characters are U+2236 RATIO and
+#. U+2009 THIN SPACE
+#: ../libgnome-desktop/gnome-wall-clock.c:302
+msgid "%l∶%M∶%S %p"
+msgstr "%l∶%M∶%S %p"
+
+#: ../libgnome-desktop/gnome-wall-clock.c:303
+msgid "%l∶%M %p"
+msgstr "%l∶%M %p"
+
+#~ msgid "Laptop"
+#~ msgstr "Laptop"
+
+#~ msgid "Cannot find a terminal, using xterm, even if it may not work"
+#~ msgstr ""
+#~ "Não foi possível localizar um terminal, usando xterm, mesmo que isso "
+#~ "possa não funcionar"
+
+#~ msgid "Mirrored Displays"
+#~ msgstr "Telas espelhadas"
+
+#~ msgid "%R:%S"
+#~ msgstr "%R:%S"
+
+#~ msgid "%l:%M:%S %p"
+#~ msgstr "%R:%S"
+
+#~ msgid "%l:%M %p"
+#~ msgstr "%R"
+
+#~ msgid "About GNOME"
+#~ msgstr "Sobre o GNOME"
 
-#: ../libgnome-desktop/gnome-wall-clock.c:297
-msgid "%l:%M %p"
-msgstr "%l:%M %p"
+#~ msgid "Learn more about GNOME"
+#~ msgstr "Saiba mais sobre o GNOME"
 
-#~ msgctxt "Monitor vendor"
-#~ msgid "Unknown"
-#~ msgstr "Desconhecido"
+#~ msgid "News"
+#~ msgstr "Notícias"
 
-#~ msgid "could not get the screen resources (CRTCs, outputs, modes)"
-#~ msgstr "não foi possível obter os recursos da tela (CRTCs, saídas, modos)"
+#~ msgid "GNOME Library"
+#~ msgstr "Biblioteca do GNOME"
 
-#~ msgid "unhandled X error while getting the range of screen sizes"
-#~ msgstr "erro não manipulado do X ao obter o intervalo de tamanhos da tela"
+#~ msgid "Friends of GNOME"
+#~ msgstr "Amigos do GNOME"
 
-#~ msgid "could not get the range of screen sizes"
-#~ msgstr "não foi possível obter o intervalo de tamanhos da tela"
+#~ msgid "Contact"
+#~ msgstr "Contato"
 
-#~ msgid "RANDR extension is not present"
-#~ msgstr "Extensão RANDR não está presente"
+#~ msgid "The Mysterious GEGL"
+#~ msgstr "O misterioso GEGL"
 
-#~ msgid "could not get information about output %d"
-#~ msgstr "não foi possível obter informações sobre a saída %d"
+#~ msgid "The Squeaky Rubber GNOME"
+#~ msgstr "O GNOME de borracha barulhento"
 
-#~ msgid "Built-in Display"
-#~ msgstr "Monitor embutido"
+#~ msgid "Wanda The GNOME Fish"
+#~ msgstr "Wanda, o peixe do GNOME"
 
-#~ msgid "%s Display"
-#~ msgstr "Monitor de %s polegadas"
+#~ msgid "_Open URL"
+#~ msgstr "_Abrir URL"
 
-#~ msgid "Unknown Display"
-#~ msgstr "Monitor desconhecido"
+#~ msgid "_Copy URL"
+#~ msgstr "_Copiar URL"
+
+#~ msgid "About the GNOME Desktop"
+#~ msgstr "Sobre o ambiente GNOME"
+
+#~ msgid "%(name)s: %(value)s"
+#~ msgstr "%(name)s: %(value)s"
+
+#~ msgid "Welcome to the GNOME Desktop"
+#~ msgstr "Bem-vindo ao ambiente GNOME"
+
+#~ msgid "Brought to you by:"
+#~ msgstr "Trazido para você por:"
+
+#~ msgid "%(name)s: %(value)s"
+#~ msgstr "%(name)s: %(value)s"
+
+#~ msgid "Version"
+#~ msgstr "Versão"
+
+#~ msgid "Distributor"
+#~ msgstr "Distribuidor"
+
+#~ msgid "Build Date"
+#~ msgstr "Data de compilação"
+
+#~ msgid "Display information on this GNOME version"
+#~ msgstr "Exibe informações sobre esta versão do GNOME"
 
 #~ msgid ""
-#~ "requested position/size for CRTC %d is outside the allowed limit: "
-#~ "position=(%d, %d), size=(%d, %d), maximum=(%d, %d)"
+#~ "GNOME also includes a complete development platform for applications "
+#~ "programmers, allowing the creation of powerful and complex applications."
 #~ msgstr ""
-#~ "a posição requisitada/tamanho para CRTC %d está fora do limite permitido: "
-#~ "posição=(%d, %d), tamanho=(%d, %d), máximo=(%d, %d)"
+#~ "O GNOME também inclui uma plataforma de desenvolvimento completa para "
+#~ "programadores, permitindo a criação de aplicativos complexos e poderosos."
 
-#~ msgid "could not set the configuration for CRTC %d"
-#~ msgstr "não foi possível definir a configuração para CRTC %d"
+#~ msgid ""
+#~ "GNOME includes most of what you see on your computer, including the file "
+#~ "manager, web browser, menus, and many applications."
+#~ msgstr ""
+#~ "O GNOME inclui a maior parte do que você vê no seu computador, como o "
+#~ "gerenciador de arquivos, o navegador da Internet, e muitos aplicativos."
 
-#~ msgid "could not get information about CRTC %d"
-#~ msgstr "não foi possível obter informações sobre CRTC %d"
+#~ msgid ""
+#~ "GNOME is a Free, usable, stable, accessible desktop environment for the "
+#~ "Unix-like family of operating systems."
+#~ msgstr ""
+#~ "O GNOME é um ambiente de trabalho livre, estável, acessível, e com boa "
+#~ "usabilidade para sistemas operacionais da família dos Unix e similares."
 
 #~ msgid ""
-#~ "none of the saved display configurations matched the active configuration"
+#~ "GNOME's focus on usability and accessibility, regular release cycle, and "
+#~ "strong corporate backing make it unique among Free Software desktops."
 #~ msgstr ""
-#~ "nenhuma das configurações de exibição correspondem a configuração ativa"
+#~ "O foco do GNOME em usabilidade, acessibilidade, um ciclo regular de "
+#~ "lançamentos e um forte apoio corporativo o torna único entre os ambientes "
+#~ "de trabalho livres."
+
+#~ msgid ""
+#~ "GNOME's greatest strength is our strong community. Virtually anyone, with "
+#~ "or without coding skills, can contribute to making GNOME better."
+#~ msgstr ""
+#~ "A maior vantagem do GNOME é a nossa comunidade. Praticamente qualquer um, "
+#~ "sendo ou não um programador, pode contribuir para fazer o GNOME melhor."
+
+#~ msgid ""
+#~ "Hundreds of people have contributed code to GNOME since it was started in "
+#~ "1997; many more have contributed in other important ways, including "
+#~ "translations, documentation, and quality assurance."
+#~ msgstr ""
+#~ "Centenas de pessoas contribuíram código para o GNOME desde o seu início "
+#~ "em 1997; muitos outros contribuíram de outras formas importantes, como "
+#~ "incluindo traduções, documentação e garantia de qualidade."
+
+#~ msgid "Error reading file '%s': %s"
+#~ msgstr "Erro ao ler arquivo \"%s\": %s"
+
+#~ msgid "Error rewinding file '%s': %s"
+#~ msgstr "Erro ao voltar no arquivo \"%s\": %s"
+
+#~ msgid "No name"
+#~ msgstr "Sem nome"
+
+#~ msgid "File '%s' is not a regular file or directory."
+#~ msgstr "Arquivo \"%s\" não é um arquivo comum ou diretório."
+
+#~ msgid "Cannot find file '%s'"
+#~ msgstr "Não foi possível localizar o arquivo \"%s\""
+
+#~ msgid "No filename to save to"
+#~ msgstr "Nenhum nome de arquivo para salvar"
+
+#~ msgid "Starting %s"
+#~ msgstr "Iniciando %s"
+
+#~ msgid "No URL to launch"
+#~ msgstr "Nenhuma URL para abrir"
+
+#~ msgid "Not a launchable item"
+#~ msgstr "Não é um item executável"
+
+#~ msgid "No command (Exec) to launch"
+#~ msgstr "Nenhum comando (Exec) para lançar"
+
+#~ msgid "Bad command (Exec) to launch"
+#~ msgstr "Comando (Exec) para lançar incorreto"
+
+#~ msgid "Unknown encoding of: %s"
+#~ msgstr "Codificação desconhecida: %s"
+
+#~ msgid "Mirror Screens"
+#~ msgstr "Telas espelhadas"
+
+#~ msgid "could not find a suitable configuration of screens"
+#~ msgstr "não foi possível encontrar configurações de tela adequadas"
+
+#~ msgid "Directory"
+#~ msgstr "Diretório"
+
+#~ msgid "Application"
+#~ msgstr "Aplicativo"
+
+#~ msgid "Link"
+#~ msgstr "Link"
+
+#~ msgid "FSDevice"
+#~ msgstr "FSDevice"
+
+#~ msgid "MIME Type"
+#~ msgstr "Tipo MIME"
+
+#~ msgid "Service"
+#~ msgstr "Serviço"
+
+#~ msgid "ServiceType"
+#~ msgstr "Tipo de serviço"
+
+#~ msgid "_URL:"
+#~ msgstr "_URL:"
+
+#~ msgid "Comm_and:"
+#~ msgstr "Co_mando:"
+
+#~ msgid "_Name:"
+#~ msgstr "_Nome:"
+
+#~ msgid "_Generic name:"
+#~ msgstr "Nome _genérico:"
+
+#~ msgid "Co_mment:"
+#~ msgstr "Co_mentário:"
+
+#~ msgid "Browse"
+#~ msgstr "Navegar"
+
+#~ msgid "_Type:"
+#~ msgstr "_Tipo:"
+
+#~ msgid "_Icon:"
+#~ msgstr "Íc_one:"
+
+#~ msgid "Browse icons"
+#~ msgstr "Pesquisar ícones"
+
+#~ msgid "Run in t_erminal"
+#~ msgstr "Executar em um t_erminal"
+
+#~ msgid "Language"
+#~ msgstr "Idioma"
+
+#~ msgid "Name"
+#~ msgstr "Nome"
+
+#~ msgid "Generic name"
+#~ msgstr "Nome genérico"
+
+#~ msgid "Comment"
+#~ msgstr "Comentário"
+
+#~ msgid "_Try this before using:"
+#~ msgstr "_Tentar antes de usar:"
+
+#~ msgid "_Documentation:"
+#~ msgstr "_Documentação:"
+
+#~ msgid "_Name/Comment translations:"
+#~ msgstr "Traduções para _nome/comentário:"
+
+#~ msgid "_Add/Set"
+#~ msgstr "_Adicionar/Definir"
+
+#~ msgid "Add or Set Name/Comment Translations"
+#~ msgstr "Adicionar ou Definir traduções para Nome/Comentário"
+
+#~ msgid "Re_move"
+#~ msgstr "Re_mover"
+
+#~ msgid "Remove Name/Comment Translation"
+#~ msgstr "Remover tradução de nome/comentário"
+
+#~ msgid "Basic"
+#~ msgstr "Básico"
+
+#~ msgid "Advanced"
+#~ msgstr "Avançado"
+
+#~ msgid "_Show Hints at Startup"
+#~ msgstr "_Mostrar dicas ao iniciar"
diff -Nru gnome-desktop3-3.12.0/po/pt.po gnome-desktop3-3.8.4/po/pt.po
--- gnome-desktop3-3.12.0/po/pt.po	2013-11-11 17:23:18.000000000 +0000
+++ gnome-desktop3-3.8.4/po/pt.po	2013-09-04 11:15:57.000000000 +0000
@@ -6,10 +6,10 @@
 # 
 msgid ""
 msgstr ""
-"Project-Id-Version: 3.10\n"
+"Project-Id-Version: 3.8\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-09-22 01:33+0100\n"
-"PO-Revision-Date: 2013-09-22 01:35+0000\n"
+"POT-Creation-Date: 2013-03-11 22:18+0000\n"
+"PO-Revision-Date: 2013-03-11 22:20+0000\n"
 "Last-Translator: Duarte Loreto \n"
 "Language-Team: Português \n"
 "Language: \n"
@@ -17,55 +17,132 @@
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
+#. Translators: "Unknown" here is used to identify a monitor for which
+#. * we don't know the vendor. When a vendor is known, the name of the
+#. * vendor is used.
+#: ../libgnome-desktop/display-name.c:107
+msgctxt "Monitor vendor"
+msgid "Unknown"
+msgstr "Desconhecido"
+
 #: ../libgnome-desktop/gnome-languages.c:804
 msgid "Unspecified"
 msgstr "Não especificado"
 
-#: ../libgnome-desktop/gnome-rr-config.c:743
+#. Translators: a CRTC is a CRT Controller (this is X terminology).
+#: ../libgnome-desktop/gnome-rr.c:452
+#, c-format
+msgid "could not get the screen resources (CRTCs, outputs, modes)"
+msgstr "incapaz de obter os recursos de ecrã (CRTCs, saídas, modos)"
+
+#: ../libgnome-desktop/gnome-rr.c:472
+#, c-format
+msgid "unhandled X error while getting the range of screen sizes"
+msgstr "erro X não-gerido ao obter o intervalo de tamanhos de ecrã"
+
+#: ../libgnome-desktop/gnome-rr.c:478
+#, c-format
+msgid "could not get the range of screen sizes"
+msgstr "incapaz de obter o intervalo de tamanhos de ecrã"
+
+#: ../libgnome-desktop/gnome-rr.c:769
+#, c-format
+msgid "RANDR extension is not present"
+msgstr "a extensão RANDR não está disponível"
+
+#: ../libgnome-desktop/gnome-rr.c:1580
+#, c-format
+msgid "could not get information about output %d"
+msgstr "Incapaz de obter a informação sobre a saída %d"
+
+#: ../libgnome-desktop/gnome-rr.c:1764
+msgid "Built-in Display"
+msgstr "Ecrã Embutido"
+
+#. Translators: %s is the size of the monitor in inches
+#: ../libgnome-desktop/gnome-rr.c:1782
+#, c-format
+msgid "%s Display"
+msgstr "Ecrã de %s"
+
+#: ../libgnome-desktop/gnome-rr.c:1789
+msgid "Unknown Display"
+msgstr "Ecrã Desconhecido"
+
+#. Translators: the "position", "size", and "maximum"
+#. * words here are not keywords; please translate them
+#. * as usual.  A CRTC is a CRT Controller (this is X terminology)
+#: ../libgnome-desktop/gnome-rr.c:2234
+#, c-format
+msgid ""
+"requested position/size for CRTC %d is outside the allowed limit: position="
+"(%d, %d), size=(%d, %d), maximum=(%d, %d)"
+msgstr ""
+"posição/tamanho pedido para o CRTC %d está fora dos limites permitidos: "
+"posição=(%d, %d), tamanho=(%d, %d), máximo=(%d, %d)"
+
+#: ../libgnome-desktop/gnome-rr.c:2270
+#, c-format
+msgid "could not set the configuration for CRTC %d"
+msgstr "incapaz de definir a configuração para o CRTC %d"
+
+#: ../libgnome-desktop/gnome-rr.c:2421
+#, c-format
+msgid "could not get information about CRTC %d"
+msgstr "incapaz de obter informação sobre o CRTC %d"
+
+#: ../libgnome-desktop/gnome-rr-config.c:708
+#, c-format
+msgid ""
+"none of the saved display configurations matched the active configuration"
+msgstr ""
+"nenhuma das configurações de ecrã gravadas coincidia com a configuração ativa"
+
+#: ../libgnome-desktop/gnome-rr-config.c:1464
 #, c-format
 msgid "CRTC %d cannot drive output %s"
 msgstr "CRTC %d incapaz de controlar a saída %s"
 
-#: ../libgnome-desktop/gnome-rr-config.c:750
+#: ../libgnome-desktop/gnome-rr-config.c:1471
 #, c-format
 msgid "output %s does not support mode %dx%d@%dHz"
 msgstr "saída %s não suporta o modo %dx%d@%dHz"
 
-#: ../libgnome-desktop/gnome-rr-config.c:761
+#: ../libgnome-desktop/gnome-rr-config.c:1482
 #, c-format
-msgid "CRTC %d does not support rotation=%d"
-msgstr "CRTC %d não suporta rotação=%d"
+msgid "CRTC %d does not support rotation=%s"
+msgstr "CRTC %d não suporta rotação=%s"
 
-#: ../libgnome-desktop/gnome-rr-config.c:774
+#: ../libgnome-desktop/gnome-rr-config.c:1496
 #, c-format
 msgid ""
 "output %s does not have the same parameters as another cloned output:\n"
 "existing mode = %d, new mode = %d\n"
 "existing coordinates = (%d, %d), new coordinates = (%d, %d)\n"
-"existing rotation = %d, new rotation = %d"
+"existing rotation = %s, new rotation = %s"
 msgstr ""
 "saída %s não tem os mesmos parâmetros que outra saída clonada:\n"
 "modo existente = %d, novo modo = %d\n"
 "coordenadas existentes = (%d, %d), novas coordenadas = (%d, %d)\n"
-"rotação existente = %d, nova rotação = %d"
+"rotação existente = %s, nova rotação = %s"
 
-#: ../libgnome-desktop/gnome-rr-config.c:789
+#: ../libgnome-desktop/gnome-rr-config.c:1511
 #, c-format
 msgid "cannot clone to output %s"
 msgstr "incapaz de clonar para a saída %s"
 
-#: ../libgnome-desktop/gnome-rr-config.c:915
+#: ../libgnome-desktop/gnome-rr-config.c:1680
 #, c-format
 msgid "Trying modes for CRTC %d\n"
 msgstr "A tentar modos para CRTC %d\n"
 
-#: ../libgnome-desktop/gnome-rr-config.c:939
+#: ../libgnome-desktop/gnome-rr-config.c:1704
 #, c-format
 msgid "CRTC %d: trying mode %dx%d@%dHz with output at %dx%d@%dHz (pass %d)\n"
 msgstr ""
 "CRTC %d: a tentar o modo %dx%d@%dHz com a saída a %dx%d@%dHz (passagem %d)\n"
 
-#: ../libgnome-desktop/gnome-rr-config.c:986
+#: ../libgnome-desktop/gnome-rr-config.c:1751
 #, c-format
 msgid ""
 "could not assign CRTCs to outputs:\n"
@@ -74,7 +151,7 @@
 "incapaz de atribuir CRTCs às saídas:\n"
 "%s"
 
-#: ../libgnome-desktop/gnome-rr-config.c:990
+#: ../libgnome-desktop/gnome-rr-config.c:1755
 #, c-format
 msgid ""
 "none of the selected modes were compatible with the possible modes:\n"
@@ -86,7 +163,7 @@
 #. Translators: the "requested", "minimum", and
 #. * "maximum" words here are not keywords; please
 #. * translate them as usual.
-#: ../libgnome-desktop/gnome-rr-config.c:1071
+#: ../libgnome-desktop/gnome-rr-config.c:1833
 #, c-format
 msgid ""
 "required virtual size does not fit available size: requested=(%d, %d), "
@@ -97,29 +174,32 @@
 
 #. Translators: This is the time format with full date used
 #. in 24-hour mode.
-#: ../libgnome-desktop/gnome-wall-clock.c:270
-msgid "%a %b %e, %R:%S"
-msgstr "%a %b %e, %R:%S"
+#. The character between %R and %S is U+2236 RATIO
+#: ../libgnome-desktop/gnome-wall-clock.c:268
+msgid "%a %b %e, %R∶%S"
+msgstr "%a %b %e, %R∶%S"
 
-#: ../libgnome-desktop/gnome-wall-clock.c:271
+#: ../libgnome-desktop/gnome-wall-clock.c:269
 msgid "%a %b %e, %R"
 msgstr "%a %b %e, %R"
 
 #. Translators: This is the time format with day used
 #. in 24-hour mode.
-#: ../libgnome-desktop/gnome-wall-clock.c:275
-msgid "%a %R:%S"
-msgstr "%a %R:%S"
+#. The character between %R and %S is U+2236 RATIO
+#: ../libgnome-desktop/gnome-wall-clock.c:274
+msgid "%a %R∶%S"
+msgstr "%a %R∶%S"
 
-#: ../libgnome-desktop/gnome-wall-clock.c:276
+#: ../libgnome-desktop/gnome-wall-clock.c:275
 msgid "%a %R"
 msgstr "%a %R"
 
 #. Translators: This is the time format without date used
 #. in 24-hour mode.
+#. The character between %R and %S is U+2236 RATIO
 #: ../libgnome-desktop/gnome-wall-clock.c:280
-msgid "%R:%S"
-msgstr "%R:%S"
+msgid "%R∶%S"
+msgstr "%R∶%S"
 
 #: ../libgnome-desktop/gnome-wall-clock.c:280
 msgid "%R"
@@ -127,98 +207,39 @@
 
 #. Translators: This is a time format with full date used
 #. for AM/PM.
-#: ../libgnome-desktop/gnome-wall-clock.c:286
-msgid "%a %b %e, %l:%M:%S %p"
-msgstr "%a %b %e, %l:%M:%S %p"
-
-#: ../libgnome-desktop/gnome-wall-clock.c:287
-msgid "%a %b %e, %l:%M %p"
-msgstr "%a %b %e, %l:%M %p"
+#. The Unicode characters are U+2236 RATIO and
+#. U+2009 THIN SPACE
+#: ../libgnome-desktop/gnome-wall-clock.c:288
+msgid "%a %b %e, %l∶%M∶%S %p"
+msgstr "%a %b %e, %l∶%M∶%S %p"
+
+#: ../libgnome-desktop/gnome-wall-clock.c:289
+msgid "%a %b %e, %l∶%M %p"
+msgstr "%a %b %e, %l∶%M %p"
 
 #. Translators: This is a time format with day used
 #. for AM/PM.
-#: ../libgnome-desktop/gnome-wall-clock.c:291
-msgid "%a %l:%M:%S %p"
-msgstr "%a %l:%M:%S %p"
-
-#: ../libgnome-desktop/gnome-wall-clock.c:292
-msgid "%a %l:%M %p"
-msgstr "%a %l:%M %p"
+#. The Unicode characters are U+2236 RATIO and
+#. U+2009 THIN SPACE
+#: ../libgnome-desktop/gnome-wall-clock.c:295
+msgid "%a %l∶%M∶%S %p"
+msgstr "%a %l∶%M∶%S %p"
 
-#. Translators: This is a time format without date used
-#. for AM/PM.
 #: ../libgnome-desktop/gnome-wall-clock.c:296
-msgid "%l:%M:%S %p"
-msgstr "%l:%M:%S %p"
-
-#: ../libgnome-desktop/gnome-wall-clock.c:297
-msgid "%l:%M %p"
-msgstr "%l:%M %p"
-
-#~ msgctxt "Monitor vendor"
-#~ msgid "Unknown"
-#~ msgstr "Desconhecido"
-
-#~ msgid "could not get the screen resources (CRTCs, outputs, modes)"
-#~ msgstr "incapaz de obter os recursos de ecrã (CRTCs, saídas, modos)"
-
-#~ msgid "unhandled X error while getting the range of screen sizes"
-#~ msgstr "erro X não-gerido ao obter o intervalo de tamanhos de ecrã"
-
-#~ msgid "could not get the range of screen sizes"
-#~ msgstr "incapaz de obter o intervalo de tamanhos de ecrã"
-
-#~ msgid "RANDR extension is not present"
-#~ msgstr "a extensão RANDR não está disponível"
-
-#~ msgid "could not get information about output %d"
-#~ msgstr "Incapaz de obter a informação sobre a saída %d"
-
-#~ msgid "Built-in Display"
-#~ msgstr "Ecrã Embutido"
-
-#~ msgid "%s Display"
-#~ msgstr "Ecrã de %s"
-
-#~ msgid "Unknown Display"
-#~ msgstr "Ecrã Desconhecido"
-
-#~ msgid ""
-#~ "requested position/size for CRTC %d is outside the allowed limit: "
-#~ "position=(%d, %d), size=(%d, %d), maximum=(%d, %d)"
-#~ msgstr ""
-#~ "posição/tamanho pedido para o CRTC %d está fora dos limites permitidos: "
-#~ "posição=(%d, %d), tamanho=(%d, %d), máximo=(%d, %d)"
+msgid "%a %l∶%M %p"
+msgstr "%a %l∶%M %p"
 
-#~ msgid "could not set the configuration for CRTC %d"
-#~ msgstr "incapaz de definir a configuração para o CRTC %d"
-
-#~ msgid "could not get information about CRTC %d"
-#~ msgstr "incapaz de obter informação sobre o CRTC %d"
-
-#~ msgid ""
-#~ "none of the saved display configurations matched the active configuration"
-#~ msgstr ""
-#~ "nenhuma das configurações de ecrã gravadas coincidia com a configuração "
-#~ "ativa"
-
-#~ msgid "%a %b %e, %R∶%S"
-#~ msgstr "%a %b %e, %R∶%S"
-
-#~ msgid "%R∶%S"
-#~ msgstr "%R∶%S"
-
-#~ msgid "%a %l∶%M∶%S %p"
-#~ msgstr "%a %l∶%M∶%S %p"
-
-#~ msgid "%a %l∶%M %p"
-#~ msgstr "%a %l∶%M %p"
-
-#~ msgid "%l∶%M∶%S %p"
-#~ msgstr "%l∶%M∶%S %p"
-
-#~ msgid "%l∶%M %p"
-#~ msgstr "%l∶%M %p"
+#. Translators: This is a time format without date used
+#. for AM/PM.
+#. The Unicode characters are U+2236 RATIO and
+#. U+2009 THIN SPACE
+#: ../libgnome-desktop/gnome-wall-clock.c:302
+msgid "%l∶%M∶%S %p"
+msgstr "%l∶%M∶%S %p"
+
+#: ../libgnome-desktop/gnome-wall-clock.c:303
+msgid "%l∶%M %p"
+msgstr "%l∶%M %p"
 
 #~ msgid "Cannot find a terminal, using xterm, even if it may not work"
 #~ msgstr ""
@@ -231,6 +252,15 @@
 #~ msgid "Mirrored Displays"
 #~ msgstr "Ecrãs em Espelho"
 
+#~ msgid "%R:%S"
+#~ msgstr "%R:%S"
+
+#~ msgid "%l:%M:%S %p"
+#~ msgstr "%l:%M:%S %p"
+
+#~ msgid "%l:%M %p"
+#~ msgstr "%l:%M %p"
+
 #~ msgid "Mirror Screens"
 #~ msgstr "Ecrãs em Espelho"
 
diff -Nru gnome-desktop3-3.12.0/po/ru.po gnome-desktop3-3.8.4/po/ru.po
--- gnome-desktop3-3.12.0/po/ru.po	2013-11-11 17:23:18.000000000 +0000
+++ gnome-desktop3-3.8.4/po/ru.po	2013-09-04 11:15:57.000000000 +0000
@@ -18,10 +18,10 @@
 "Project-Id-Version: ru\n"
 "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=gnome-"
 "desktop&keywords=I18N+L10N&component=general\n"
-"POT-Creation-Date: 2013-08-31 11:22+0000\n"
-"PO-Revision-Date: 2013-09-02 21:47+0300\n"
+"POT-Creation-Date: 2013-03-12 20:57+0000\n"
+"PO-Revision-Date: 2013-03-13 00:25+0300\n"
 "Last-Translator: Stas Solovey \n"
-"Language-Team: Русский \n"
+"Language-Team: Russian \n"
 "Language: ru\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -30,56 +30,136 @@
 "%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2)\n"
 "X-Generator: Gtranslator 2.91.6\n"
 
+#. Translators: "Unknown" here is used to identify a monitor for which
+#. * we don't know the vendor. When a vendor is known, the name of the
+#. * vendor is used.
+#: ../libgnome-desktop/display-name.c:107
+msgctxt "Monitor vendor"
+msgid "Unknown"
+msgstr "Неизвестный"
+
 #: ../libgnome-desktop/gnome-languages.c:804
 msgid "Unspecified"
 msgstr "Неопределённый"
 
-#: ../libgnome-desktop/gnome-rr-config.c:743
+#. Translators: a CRTC is a CRT Controller (this is X terminology).
+#: ../libgnome-desktop/gnome-rr.c:452
+#, c-format
+msgid "could not get the screen resources (CRTCs, outputs, modes)"
+msgstr ""
+"не удалось получить доступ к ресурсам экрана (контроллеры ЭЛТ, выходы, "
+"режимы)"
+
+#: ../libgnome-desktop/gnome-rr.c:472
+#, c-format
+msgid "unhandled X error while getting the range of screen sizes"
+msgstr ""
+"при получении диапазона размеров экрана получена необработанная ошибка "
+"системы X"
+
+#: ../libgnome-desktop/gnome-rr.c:478
+#, c-format
+msgid "could not get the range of screen sizes"
+msgstr "не удалось получить диапазон размеров экрана"
+
+#: ../libgnome-desktop/gnome-rr.c:769
+#, c-format
+msgid "RANDR extension is not present"
+msgstr "Расширение RANDR отсутствует"
+
+#: ../libgnome-desktop/gnome-rr.c:1580
+#, c-format
+msgid "could not get information about output %d"
+msgstr "не удалось получить информацию о выходе %d"
+
+#: ../libgnome-desktop/gnome-rr.c:1764
+msgid "Built-in Display"
+msgstr "Встроенный монитор"
+
+#. Translators: %s is the size of the monitor in inches
+#: ../libgnome-desktop/gnome-rr.c:1782
+#, c-format
+msgid "%s Display"
+msgstr "Монитор %s"
+
+#: ../libgnome-desktop/gnome-rr.c:1789
+msgid "Unknown Display"
+msgstr "Неизвестный монитор"
+
+#. Translators: the "position", "size", and "maximum"
+#. * words here are not keywords; please translate them
+#. * as usual.  A CRTC is a CRT Controller (this is X terminology)
+#: ../libgnome-desktop/gnome-rr.c:2234
+#, c-format
+msgid ""
+"requested position/size for CRTC %d is outside the allowed limit: position="
+"(%d, %d), size=(%d, %d), maximum=(%d, %d)"
+msgstr ""
+"требуемое положение или размер для контроллера ЭЛТ %d выходит за рамки "
+"допустимых пределов: положение=(%d, %d), размер=(%d, %d), максимум=(%d, %d)"
+
+#: ../libgnome-desktop/gnome-rr.c:2270
+#, c-format
+msgid "could not set the configuration for CRTC %d"
+msgstr "не удалось установить настройки для контроллера ЭЛТ %d"
+
+#: ../libgnome-desktop/gnome-rr.c:2421
+#, c-format
+msgid "could not get information about CRTC %d"
+msgstr "не удалось получить информацию о контроллере ЭЛТ %d"
+
+#: ../libgnome-desktop/gnome-rr-config.c:708
+#, c-format
+msgid ""
+"none of the saved display configurations matched the active configuration"
+msgstr "ни одна из сохранённых настроек не совпадает с текущей"
+
+#: ../libgnome-desktop/gnome-rr-config.c:1464
 #, c-format
 msgid "CRTC %d cannot drive output %s"
 msgstr "контроллер ЭЛТ %d не может управлять выходом %s"
 
-#: ../libgnome-desktop/gnome-rr-config.c:750
+#: ../libgnome-desktop/gnome-rr-config.c:1471
 #, c-format
 msgid "output %s does not support mode %dx%d@%dHz"
 msgstr "выход %s не поддерживает режим %dx%d@%dГц"
 
-#: ../libgnome-desktop/gnome-rr-config.c:761
+#: ../libgnome-desktop/gnome-rr-config.c:1482
 #, c-format
-msgid "CRTC %d does not support rotation=%d"
-msgstr "контроллер ЭЛТ %d не поддерживает вращение=%d"
+msgid "CRTC %d does not support rotation=%s"
+msgstr "контроллер ЭЛТ %d не поддерживает вращение=%s"
 
-#: ../libgnome-desktop/gnome-rr-config.c:774
+#: ../libgnome-desktop/gnome-rr-config.c:1496
 #, c-format
 msgid ""
 "output %s does not have the same parameters as another cloned output:\n"
 "existing mode = %d, new mode = %d\n"
 "existing coordinates = (%d, %d), new coordinates = (%d, %d)\n"
-"existing rotation = %d, new rotation = %d"
+"existing rotation = %s, new rotation = %s"
 msgstr ""
 "параметры выхода %s отличаются от параметров другого клонированного выхода:\n"
 "существующий режим = %d, новый режим = %d\n"
 "существующие координаты = (%d, %d), новые координаты = (%d, %d)\n"
-"существующее вращение = %d, новое вращение = %d"
+"существующее вращение = %s, новое вращение = %s"
 
-#: ../libgnome-desktop/gnome-rr-config.c:789
+#: ../libgnome-desktop/gnome-rr-config.c:1511
 #, c-format
 msgid "cannot clone to output %s"
 msgstr "не удалось клонировать в выход %s"
 
-#: ../libgnome-desktop/gnome-rr-config.c:915
+#: ../libgnome-desktop/gnome-rr-config.c:1680
 #, c-format
 msgid "Trying modes for CRTC %d\n"
 msgstr "Проверка режимов контроллера ЭЛТ %d\n"
 
-#: ../libgnome-desktop/gnome-rr-config.c:939
+#: ../libgnome-desktop/gnome-rr-config.c:1704
 #, c-format
 msgid "CRTC %d: trying mode %dx%d@%dHz with output at %dx%d@%dHz (pass %d)\n"
 msgstr ""
 "контроллер ЭЛТ %d: проверка режима %dx%d@%dГц с выходом на %dx%d@%dГц "
 "(попытка %d)\n"
 
-#: ../libgnome-desktop/gnome-rr-config.c:986
+#: ../libgnome-desktop/gnome-rr-config.c:1751
 #, c-format
 msgid ""
 "could not assign CRTCs to outputs:\n"
@@ -88,7 +168,7 @@
 "не удалось назначить контроллеры ЭЛТ для выходов:\n"
 "%s"
 
-#: ../libgnome-desktop/gnome-rr-config.c:990
+#: ../libgnome-desktop/gnome-rr-config.c:1755
 #, c-format
 msgid ""
 "none of the selected modes were compatible with the possible modes:\n"
@@ -100,7 +180,7 @@
 #. Translators: the "requested", "minimum", and
 #. * "maximum" words here are not keywords; please
 #. * translate them as usual.
-#: ../libgnome-desktop/gnome-rr-config.c:1071
+#: ../libgnome-desktop/gnome-rr-config.c:1833
 #, c-format
 msgid ""
 "required virtual size does not fit available size: requested=(%d, %d), "
@@ -112,32 +192,35 @@
 # %A, %e %b., —  fix для часов на верхней панели gnome-shell — Вторник, 10 мар., 21:00
 #. Translators: This is the time format with full date used
 #. in 24-hour mode.
-#: ../libgnome-desktop/gnome-wall-clock.c:270
-msgid "%a %b %e, %R:%S"
-msgstr "%A, %e %b., %R:%S"
+#. The character between %R and %S is U+2236 RATIO
+#: ../libgnome-desktop/gnome-wall-clock.c:268
+msgid "%a %b %e, %R∶%S"
+msgstr "%A, %e %b., %R∶%S"
 
 # %A, %e %b., —  fix для часов на верхней панели gnome-shell — Вторник, 10 мар., 21:00
-#: ../libgnome-desktop/gnome-wall-clock.c:271
+#: ../libgnome-desktop/gnome-wall-clock.c:269
 msgid "%a %b %e, %R"
 msgstr "%A, %e %b., %R"
 
 # %A, %e %b., —  fix для часов на верхней панели gnome-shell — Вторник, 10 мар., 21:00
 #. Translators: This is the time format with day used
 #. in 24-hour mode.
-#: ../libgnome-desktop/gnome-wall-clock.c:275
-msgid "%a %R:%S"
-msgstr "%A, %R:%S"
+#. The character between %R and %S is U+2236 RATIO
+#: ../libgnome-desktop/gnome-wall-clock.c:274
+msgid "%a %R∶%S"
+msgstr "%A, %R∶%S"
 
 # %A, %e %b., —  fix для часов на верхней панели gnome-shell — Вторник, 10 мар., 21:00
-#: ../libgnome-desktop/gnome-wall-clock.c:276
+#: ../libgnome-desktop/gnome-wall-clock.c:275
 msgid "%a %R"
 msgstr "%A, %R"
 
 #. Translators: This is the time format without date used
 #. in 24-hour mode.
+#. The character between %R and %S is U+2236 RATIO
 #: ../libgnome-desktop/gnome-wall-clock.c:280
-msgid "%R:%S"
-msgstr "%R:%S"
+msgid "%R∶%S"
+msgstr "%R∶%S"
 
 #: ../libgnome-desktop/gnome-wall-clock.c:280
 msgid "%R"
@@ -146,83 +229,39 @@
 # %A, %e %b., —  fix для часов на верхней панели gnome-shell — Вторник, 10 мар., 21:00
 #. Translators: This is a time format with full date used
 #. for AM/PM.
-#: ../libgnome-desktop/gnome-wall-clock.c:286
-msgid "%a %b %e, %l:%M:%S %p"
-msgstr "%A, %e %b., %l:%M:%S %p"
+#. The Unicode characters are U+2236 RATIO and
+#. U+2009 THIN SPACE
+#: ../libgnome-desktop/gnome-wall-clock.c:288
+msgid "%a %b %e, %l∶%M∶%S %p"
+msgstr "%A, %e %b., %l∶%M∶%S %p"
 
 # %A, %e %b., —  fix для часов на верхней панели gnome-shell — Вторник, 10 мар., 21:00
-#: ../libgnome-desktop/gnome-wall-clock.c:287
-msgid "%a %b %e, %l:%M %p"
-msgstr "%A, %e %b., %l:%M %p"
+#: ../libgnome-desktop/gnome-wall-clock.c:289
+msgid "%a %b %e, %l∶%M %p"
+msgstr "%A, %e %b., %l∶%M %p"
 
 # %A, %e %b., —  fix для часов на верхней панели gnome-shell — Вторник, 10 мар., 21:00
 #. Translators: This is a time format with day used
 #. for AM/PM.
-#: ../libgnome-desktop/gnome-wall-clock.c:291
-msgid "%a %l:%M:%S %p"
-msgstr "%A, %l:%M:%S %p"
+#. The Unicode characters are U+2236 RATIO and
+#. U+2009 THIN SPACE
+#: ../libgnome-desktop/gnome-wall-clock.c:295
+msgid "%a %l∶%M∶%S %p"
+msgstr "%A, %l∶%M∶%S %p"
 
 # %A, %e %b., —  fix для часов на верхней панели gnome-shell — Вторник, 10 мар., 21:00
-#: ../libgnome-desktop/gnome-wall-clock.c:292
-msgid "%a %l:%M %p"
-msgstr "%A, %l:%M %p"
+#: ../libgnome-desktop/gnome-wall-clock.c:296
+msgid "%a %l∶%M %p"
+msgstr "%A, %l∶%M %p"
 
 #. Translators: This is a time format without date used
 #. for AM/PM.
-#: ../libgnome-desktop/gnome-wall-clock.c:296
-msgid "%l:%M:%S %p"
-msgstr "%l:%M:%S %p"
-
-#: ../libgnome-desktop/gnome-wall-clock.c:297
-msgid "%l:%M %p"
-msgstr "%l:%M %p"
-
-#~ msgctxt "Monitor vendor"
-#~ msgid "Unknown"
-#~ msgstr "Неизвестный"
-
-#~ msgid "could not get the screen resources (CRTCs, outputs, modes)"
-#~ msgstr ""
-#~ "не удалось получить доступ к ресурсам экрана (контроллеры ЭЛТ, выходы, "
-#~ "режимы)"
-
-#~ msgid "unhandled X error while getting the range of screen sizes"
-#~ msgstr ""
-#~ "при получении диапазона размеров экрана получена необработанная ошибка "
-#~ "системы X"
-
-#~ msgid "could not get the range of screen sizes"
-#~ msgstr "не удалось получить диапазон размеров экрана"
-
-#~ msgid "RANDR extension is not present"
-#~ msgstr "Расширение RANDR отсутствует"
-
-#~ msgid "could not get information about output %d"
-#~ msgstr "не удалось получить информацию о выходе %d"
-
-#~ msgid "Built-in Display"
-#~ msgstr "Встроенный монитор"
-
-#~ msgid "%s Display"
-#~ msgstr "Монитор %s"
-
-#~ msgid "Unknown Display"
-#~ msgstr "Неизвестный монитор"
-
-#~ msgid ""
-#~ "requested position/size for CRTC %d is outside the allowed limit: "
-#~ "position=(%d, %d), size=(%d, %d), maximum=(%d, %d)"
-#~ msgstr ""
-#~ "требуемое положение или размер для контроллера ЭЛТ %d выходит за рамки "
-#~ "допустимых пределов: положение=(%d, %d), размер=(%d, %d), максимум=(%d, "
-#~ "%d)"
-
-#~ msgid "could not set the configuration for CRTC %d"
-#~ msgstr "не удалось установить настройки для контроллера ЭЛТ %d"
-
-#~ msgid "could not get information about CRTC %d"
-#~ msgstr "не удалось получить информацию о контроллере ЭЛТ %d"
-
-#~ msgid ""
-#~ "none of the saved display configurations matched the active configuration"
-#~ msgstr "ни одна из сохранённых настроек не совпадает с текущей"
+#. The Unicode characters are U+2236 RATIO and
+#. U+2009 THIN SPACE
+#: ../libgnome-desktop/gnome-wall-clock.c:302
+msgid "%l∶%M∶%S %p"
+msgstr "%l∶%M∶%S %p"
+
+#: ../libgnome-desktop/gnome-wall-clock.c:303
+msgid "%l∶%M %p"
+msgstr "%l∶%M %p"
diff -Nru gnome-desktop3-3.12.0/po/sk.po gnome-desktop3-3.8.4/po/sk.po
--- gnome-desktop3-3.12.0/po/sk.po	2013-11-11 17:23:18.000000000 +0000
+++ gnome-desktop3-3.8.4/po/sk.po	2013-03-17 01:49:53.000000000 +0000
@@ -11,60 +11,139 @@
 "Project-Id-Version: gnome-desktop\n"
 "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=gnome-"
 "desktop&keywords=I18N+L10N&component=general\n"
-"POT-Creation-Date: 2013-08-20 08:16+0000\n"
-"PO-Revision-Date: 2013-08-20 12:44+0100\n"
-"Last-Translator: Dušan Kazik \n"
+"POT-Creation-Date: 2013-03-09 15:12+0000\n"
+"PO-Revision-Date: 2013-03-11 19:07+0100\n"
+"Last-Translator: Ján Kyselica \n"
 "Language-Team: Slovak \n"
 "Language: sk\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: Poedit 1.5.4\n"
+
+#. Translators: "Unknown" here is used to identify a monitor for which
+#. * we don't know the vendor. When a vendor is known, the name of the
+#. * vendor is used.
+#: ../libgnome-desktop/display-name.c:107
+msgctxt "Monitor vendor"
+msgid "Unknown"
+msgstr "Neznámy"
 
 # JK: týka sa jazyka (language)
 #: ../libgnome-desktop/gnome-languages.c:804
 msgid "Unspecified"
 msgstr "Nešpecifikovaný"
 
-#: ../libgnome-desktop/gnome-rr-config.c:743
+# * https://bugzilla.gnome.org/show_bug.cgi?id=610571
+#. Translators: a CRTC is a CRT Controller (this is X terminology).
+#: ../libgnome-desktop/gnome-rr.c:452
+#, c-format
+msgid "could not get the screen resources (CRTCs, outputs, modes)"
+msgstr "nepodarilo sa získať zdroje obrazovky (CRTC, výstupy, režimy)"
+
+# PM: nezvykneme tomuto hovoriť neošetrená?; Prečo sú všetky tieto chybové hlasenia malým písmenom? Sú súčasť inej vety? Prosím nahlás Bug;
+# JK: https://bugzilla.gnome.org/show_bug.cgi?id=694706
+#: ../libgnome-desktop/gnome-rr.c:472
+#, c-format
+msgid "unhandled X error while getting the range of screen sizes"
+msgstr "neošetrená chyba X pri získavaní rozsahu veľkostí obrazovky"
+
+#: ../libgnome-desktop/gnome-rr.c:478
+#, c-format
+msgid "could not get the range of screen sizes"
+msgstr "nepodarilo sa získať rozsah veľkostí obrazovky"
+
+#: ../libgnome-desktop/gnome-rr.c:769
+#, c-format
+msgid "RANDR extension is not present"
+msgstr "rozšírenie RANDR nie je prítomné"
+
+#: ../libgnome-desktop/gnome-rr.c:1580
+#, c-format
+msgid "could not get information about output %d"
+msgstr "nepodarilo sa získať informácie o výstupe %d"
+
+#: ../libgnome-desktop/gnome-rr.c:1764
+msgid "Built-in Display"
+msgstr "Zabudovaný displej"
+
+#. Translators: %s is the size of the monitor in inches
+#: ../libgnome-desktop/gnome-rr.c:1782
+#, c-format
+msgid "%s Display"
+msgstr "%s displej"
+
+#: ../libgnome-desktop/gnome-rr.c:1789
+msgid "Unknown Display"
+msgstr "Neznámy displej"
+
+#. Translators: the "position", "size", and "maximum"
+#. * words here are not keywords; please translate them
+#. * as usual.  A CRTC is a CRT Controller (this is X terminology)
+#: ../libgnome-desktop/gnome-rr.c:2234
+#, c-format
+msgid ""
+"requested position/size for CRTC %d is outside the allowed limit: position="
+"(%d, %d), size=(%d, %d), maximum=(%d, %d)"
+msgstr ""
+"vyžiadaná poloha/veľkosť pre CRTC %d je mimo povolenú hranicu: poloha=(%d, "
+"%d), veľkosť=(%d, %d), maximum=(%d, %d)"
+
+#: ../libgnome-desktop/gnome-rr.c:2270
+#, c-format
+msgid "could not set the configuration for CRTC %d"
+msgstr "nepodarilo sa nastaviť konfiguráciu pre CRTC %d"
+
+#: ../libgnome-desktop/gnome-rr.c:2421
+#, c-format
+msgid "could not get information about CRTC %d"
+msgstr "nepodarilo sa získať informáciu o CRTC %d"
+
+#: ../libgnome-desktop/gnome-rr-config.c:708
+#, c-format
+msgid ""
+"none of the saved display configurations matched the active configuration"
+msgstr ""
+"žiadna z uložených konfigurácií displeja nezodpovedá aktívnej konfigurácii"
+
+#: ../libgnome-desktop/gnome-rr-config.c:1464
 #, c-format
 msgid "CRTC %d cannot drive output %s"
 msgstr "CRTC %d nemôže obsluhovať výstup %s"
 
-#: ../libgnome-desktop/gnome-rr-config.c:750
+#: ../libgnome-desktop/gnome-rr-config.c:1471
 #, c-format
 msgid "output %s does not support mode %dx%d@%dHz"
 msgstr "výstup %s nepodporuje režim %dx%d@%dHz"
 
-#: ../libgnome-desktop/gnome-rr-config.c:761
+#: ../libgnome-desktop/gnome-rr-config.c:1482
 #, c-format
-msgid "CRTC %d does not support rotation=%d"
-msgstr "CRTC %d nepodporuje otočenie=%d"
+msgid "CRTC %d does not support rotation=%s"
+msgstr "CRTC %d nepodporuje otočenie=%s"
 
-#: ../libgnome-desktop/gnome-rr-config.c:774
+#: ../libgnome-desktop/gnome-rr-config.c:1496
 #, c-format
 msgid ""
 "output %s does not have the same parameters as another cloned output:\n"
 "existing mode = %d, new mode = %d\n"
 "existing coordinates = (%d, %d), new coordinates = (%d, %d)\n"
-"existing rotation = %d, new rotation = %d"
+"existing rotation = %s, new rotation = %s"
 msgstr ""
 "výstup %s nemá rovnaké parametre ako iný klonovaný výstup:\n"
 "existujúci režim = %d, nový režim = %d\n"
 "existujúce súradnice = (%d, %d), nové súradnice = (%d, %d)\n"
-"existujúce otočenie = %d, nové otočenie = %d"
+"existujúca otočenie = %s, nové otočenie = %s"
 
-#: ../libgnome-desktop/gnome-rr-config.c:789
+#: ../libgnome-desktop/gnome-rr-config.c:1511
 #, c-format
 msgid "cannot clone to output %s"
 msgstr "nepodarilo sa klonovať na výstup %s"
 
-#: ../libgnome-desktop/gnome-rr-config.c:915
+#: ../libgnome-desktop/gnome-rr-config.c:1680
 #, c-format
 msgid "Trying modes for CRTC %d\n"
 msgstr "Skúšanie režimov pre CRTC %d\n"
 
-#: ../libgnome-desktop/gnome-rr-config.c:939
+#: ../libgnome-desktop/gnome-rr-config.c:1704
 #, c-format
 msgid "CRTC %d: trying mode %dx%d@%dHz with output at %dx%d@%dHz (pass %d)\n"
 msgstr ""
@@ -72,7 +151,7 @@
 
 # PM: podľa významu skratky CRTC by som skôr volil predložku "k";  Rozmýšlam tiež či by sme tomu veľmi ublížili keby sme použili "ovládač(e) CRTC" alebo "ovládač(e) CRT"
 # JK: CRTC je HW časť, ovládač (driver) je SW - z tohto dôvodu by som to nepoužil
-#: ../libgnome-desktop/gnome-rr-config.c:986
+#: ../libgnome-desktop/gnome-rr-config.c:1751
 #, c-format
 msgid ""
 "could not assign CRTCs to outputs:\n"
@@ -81,7 +160,7 @@
 "nepodarilo sa priradiť CRTC k výstupom:\n"
 "%s"
 
-#: ../libgnome-desktop/gnome-rr-config.c:990
+#: ../libgnome-desktop/gnome-rr-config.c:1755
 #, c-format
 msgid ""
 "none of the selected modes were compatible with the possible modes:\n"
@@ -93,7 +172,7 @@
 #. Translators: the "requested", "minimum", and
 #. * "maximum" words here are not keywords; please
 #. * translate them as usual.
-#: ../libgnome-desktop/gnome-rr-config.c:1071
+#: ../libgnome-desktop/gnome-rr-config.c:1833
 #, c-format
 msgid ""
 "required virtual size does not fit available size: requested=(%d, %d), "
@@ -104,29 +183,32 @@
 
 #. Translators: This is the time format with full date used
 #. in 24-hour mode.
-#: ../libgnome-desktop/gnome-wall-clock.c:270
-msgid "%a %b %e, %R:%S"
+#. The character between %R and %S is U+2236 RATIO
+#: ../libgnome-desktop/gnome-wall-clock.c:268
+msgid "%a %b %e, %R∶%S"
 msgstr "%A %e. %B, %R:%S"
 
-#: ../libgnome-desktop/gnome-wall-clock.c:271
+#: ../libgnome-desktop/gnome-wall-clock.c:269
 msgid "%a %b %e, %R"
 msgstr "%A %e. %B, %R"
 
 #. Translators: This is the time format with day used
 #. in 24-hour mode.
-#: ../libgnome-desktop/gnome-wall-clock.c:275
-msgid "%a %R:%S"
-msgstr "%A %R:%S"
+#. The character between %R and %S is U+2236 RATIO
+#: ../libgnome-desktop/gnome-wall-clock.c:274
+msgid "%a %R∶%S"
+msgstr "%A, %R:%S"
 
-#: ../libgnome-desktop/gnome-wall-clock.c:276
+#: ../libgnome-desktop/gnome-wall-clock.c:275
 msgid "%a %R"
-msgstr "%A %R"
+msgstr "%A, %R"
 
 #. Translators: This is the time format without date used
 #. in 24-hour mode.
+#. The character between %R and %S is U+2236 RATIO
 #: ../libgnome-desktop/gnome-wall-clock.c:280
-msgid "%R:%S"
-msgstr "%R:%S"
+msgid "%R∶%S"
+msgstr "%R∶%S"
 
 #: ../libgnome-desktop/gnome-wall-clock.c:280
 msgid "%R"
@@ -147,34 +229,191 @@
 # JK: Ostatné sú dostupné na adrese: http://developer.gnome.org/glib/2.30/glib-GDateTime.html#g-date-time-format
 #. Translators: This is a time format with full date used
 #. for AM/PM.
-#: ../libgnome-desktop/gnome-wall-clock.c:286
-msgid "%a %b %e, %l:%M:%S %p"
-msgstr "%A %e. %B, %k:%M:%S"
-
-#: ../libgnome-desktop/gnome-wall-clock.c:287
-msgid "%a %b %e, %l:%M %p"
-msgstr "%A %e. %B, %k:%M"
+#. The Unicode characters are U+2236 RATIO and
+#. U+2009 THIN SPACE
+#: ../libgnome-desktop/gnome-wall-clock.c:288
+msgid "%a %b %e, %l∶%M∶%S %p"
+msgstr "%A, %e. %B, %k:%M:%S"
+
+#: ../libgnome-desktop/gnome-wall-clock.c:289
+msgid "%a %b %e, %l∶%M %p"
+msgstr "%A, %e. %B, %k:%M"
 
 #. Translators: This is a time format with day used
 #. for AM/PM.
-#: ../libgnome-desktop/gnome-wall-clock.c:291
-msgid "%a %l:%M:%S %p"
-msgstr "%A %k:%M:%S"
-
-#: ../libgnome-desktop/gnome-wall-clock.c:292
-msgid "%a %l:%M %p"
-msgstr "%A %k:%M"
+#. The Unicode characters are U+2236 RATIO and
+#. U+2009 THIN SPACE
+#: ../libgnome-desktop/gnome-wall-clock.c:295
+msgid "%a %l∶%M∶%S %p"
+msgstr "%A, %k:%M:%S"
+
+#: ../libgnome-desktop/gnome-wall-clock.c:296
+msgid "%a %l∶%M %p"
+msgstr "%A, %k:%M"
 
 #. Translators: This is a time format without date used
 #. for AM/PM.
-#: ../libgnome-desktop/gnome-wall-clock.c:296
-msgid "%l:%M:%S %p"
-msgstr "%k:%M:%S"
+#. The Unicode characters are U+2236 RATIO and
+#. U+2009 THIN SPACE
+#: ../libgnome-desktop/gnome-wall-clock.c:302
+msgid "%l∶%M∶%S %p"
+msgstr "%k∶%M∶%S"
+
+#: ../libgnome-desktop/gnome-wall-clock.c:303
+msgid "%l∶%M %p"
+msgstr "%k∶%M"
+
+#~ msgid "Laptop"
+#~ msgstr "Prenosný počítač"
+
+#~ msgid "Cannot find a terminal, using xterm, even if it may not work"
+#~ msgstr ""
+#~ "Nepodarilo sa nájsť terminál. Použije sa xterm, aj napriek tomu, že "
+#~ "nemusí fungovať"
+
+#~ msgid "About GNOME"
+#~ msgstr "O GNOME"
+
+#~ msgid "Learn more about GNOME"
+#~ msgstr "Naučiť sa viac o GNOME"
+
+#~ msgid "News"
+#~ msgstr "Novinky"
+
+#~ msgid "GNOME Library"
+#~ msgstr "Knižnica GNOME"
+
+#~ msgid "Friends of GNOME"
+#~ msgstr "Priatelia GNOME"
+
+#~ msgid "Contact"
+#~ msgstr "Kontakt"
+
+#~ msgid "The Mysterious GEGL"
+#~ msgstr "Tajomný GEGL"
+
+#~ msgid "The Squeaky Rubber GNOME"
+#~ msgstr "GNOME vŕzgavá guma"
+
+#~ msgid "Wanda The GNOME Fish"
+#~ msgstr "GNOME ryba menom Wanda"
+
+#~ msgid "_Open URL"
+#~ msgstr "_Otvoriť URL"
+
+#~ msgid "_Copy URL"
+#~ msgstr "_Kopírovať URL"
+
+#~ msgid "About the GNOME Desktop"
+#~ msgstr "O prostredí GNOME"
+
+#~ msgid "%(name)s: %(value)s"
+#~ msgstr "%(name)s: %(value)s"
+
+#~ msgid "Welcome to the GNOME Desktop"
+#~ msgstr "Víta vás prostredie GNOME"
+
+#~ msgid "Brought to you by:"
+#~ msgstr "Vám priniesli:"
+
+#~ msgid "%(name)s: %(value)s"
+#~ msgstr "%(name)s: %(value)s"
+
+#~ msgid "Version"
+#~ msgstr "Verzia"
+
+#~ msgid "Distributor"
+#~ msgstr "Distribútor"
+
+#~ msgid "Build Date"
+#~ msgstr "Dátum zostavenia"
+
+#~ msgid "Display information on this GNOME version"
+#~ msgstr "Zobraziť informácie o tejto verzii GNOME"
+
+#~ msgid ""
+#~ "GNOME also includes a complete development platform for applications "
+#~ "programmers, allowing the creation of powerful and complex applications."
+#~ msgstr ""
+#~ "GNOME obsahuje aj kompletnú vývojovú platformu pre programátorov "
+#~ "aplikácií, ktorá umožňuje vytváranie výkonných a zložitých aplikácií."
+
+#~ msgid ""
+#~ "GNOME includes most of what you see on your computer, including the file "
+#~ "manager, web browser, menus, and many applications."
+#~ msgstr ""
+#~ "GNOME obsahuje väčšinu toho, čo vidíte na svojom počítači, vrátane "
+#~ "správcu súborov, internetového prehliadača, ponúk a veľa aplikácií."
+
+#~ msgid ""
+#~ "GNOME is a Free, usable, stable, accessible desktop environment for the "
+#~ "Unix-like family of operating systems."
+#~ msgstr ""
+#~ "GNOME je slobodné, použiteľné, stabilné a dostupné pracovné prostredie "
+#~ "pre rodinu operačných systémov podobných Unix-u."
+
+#~ msgid ""
+#~ "GNOME's focus on usability and accessibility, regular release cycle, and "
+#~ "strong corporate backing make it unique among Free Software desktops."
+#~ msgstr ""
+#~ "Zameranie GNOME na použiteľnosť a prístupnosť, pravidelné uvoľňovanie "
+#~ "nových verzií a silné firemné zázemie ho robí jedinečným medzi ostatnými "
+#~ "slobodnými prostrediami."
+
+#~ msgid ""
+#~ "GNOME's greatest strength is our strong community. Virtually anyone, with "
+#~ "or without coding skills, can contribute to making GNOME better."
+#~ msgstr ""
+#~ "Najväčšia sila GNOME je silná komunita. Prakticky každý, programátor "
+#~ "alebo neprogramátor, sa môže zapojiť do vylepšovania GNOME."
+
+#~ msgid ""
+#~ "Hundreds of people have contributed code to GNOME since it was started in "
+#~ "1997; many more have contributed in other important ways, including "
+#~ "translations, documentation, and quality assurance."
+#~ msgstr ""
+#~ "Stovky ľudí prispeli kódom do GNOME od doby, ako vzniklo v roku 1997. "
+#~ "Veľa ďalších prispelo iným významným spôsobom, napríklad prekladmi, "
+#~ "dokumentáciou a kontrolou kvality."
+
+#~ msgid "Error reading file '%s': %s"
+#~ msgstr "Chyba pri čítaní súboru '%s': %s"
+
+#~ msgid "Error rewinding file '%s': %s"
+#~ msgstr "Chyba pri presune v súbore '%s': %s"
+
+#~ msgid "No name"
+#~ msgstr "Bez názvu"
+
+#~ msgid "File '%s' is not a regular file or directory."
+#~ msgstr "Súbor '%s' nie je normálny súbor alebo adresár."
+
+#~ msgid "Cannot find file '%s'"
+#~ msgstr "Nepodarilo sa nájsť súbor '%s'"
+
+#~ msgid "No filename to save to"
+#~ msgstr "Nezadaný názov súboru pre uloženie"
+
+#~ msgid "Starting %s"
+#~ msgstr "Spúšťa sa %s"
+
+#~ msgid "No URL to launch"
+#~ msgstr "Nezadané URL, ktoré sa má spustiť"
+
+#~ msgid "Not a launchable item"
+#~ msgstr "Položka nie je spustiteľná"
+
+#~ msgid "No command (Exec) to launch"
+#~ msgstr "Nezadaný príkaz (Exec), ktorý sa má spustiť"
+
+#~ msgid "Bad command (Exec) to launch"
+#~ msgstr "Neplatný príkaz (Exec), ktorý sa má spustiť"
+
+#~ msgid "Unknown encoding of: %s"
+#~ msgstr "Neznáme kódovanie pre: %s"
+
+#~ msgid "Mirror Screens"
+#~ msgstr "Zrkadliť obrazovky"
 
-#: ../libgnome-desktop/gnome-wall-clock.c:297
-msgid "%l:%M %p"
-msgstr "%k:%M"
-
-#~ msgctxt "Monitor vendor"
-#~ msgid "Unknown"
-#~ msgstr "Neznámy"
+#~ msgid "could not find a suitable configuration of screens"
+#~ msgstr "nepodarilo sa nájsť použiteľnú konfiguráciu obrazoviek"
diff -Nru gnome-desktop3-3.12.0/po/sl.po gnome-desktop3-3.8.4/po/sl.po
--- gnome-desktop3-3.12.0/po/sl.po	2013-11-11 17:23:18.000000000 +0000
+++ gnome-desktop3-3.8.4/po/sl.po	2013-09-04 11:15:57.000000000 +0000
@@ -5,15 +5,15 @@
 # Andraž Tori , 2000.
 # Matjaž Horvat , 2006.
 # Matic Žgur , 2006.
-# Matej Urbančič , 2007-2013.
+# Matej Urbančič , 2007 - 2013.
 #
 msgid ""
 msgstr ""
 "Project-Id-Version: gnome-desktop master\n"
 "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=gnome-"
 "desktop&keywords=I18N+L10N&component=general\n"
-"POT-Creation-Date: 2013-08-19 17:24+0000\n"
-"PO-Revision-Date: 2013-08-19 23:10+0100\n"
+"POT-Creation-Date: 2013-03-04 10:03+0000\n"
+"PO-Revision-Date: 2013-03-07 17:18+0100\n"
 "Last-Translator: Matej Urbančič \n"
 "Language-Team: Slovenian GNOME Translation Team \n"
 "Language: sl_SI\n"
@@ -25,55 +25,135 @@
 "X-Poedit-SourceCharset: utf-8\n"
 "X-Generator: Poedit 1.5.4\n"
 
+#. Translators: "Unknown" here is used to identify a monitor for which
+#. * we don't know the vendor. When a vendor is known, the name of the
+#. * vendor is used.
+#: ../libgnome-desktop/display-name.c:107
+msgctxt "Monitor vendor"
+msgid "Unknown"
+msgstr "Neznano"
+
 #: ../libgnome-desktop/gnome-languages.c:804
 msgid "Unspecified"
 msgstr "Nedoločeno"
 
-#: ../libgnome-desktop/gnome-rr-config.c:789
+#. Translators: a CRTC is a CRT Controller (this is X terminology).
+#: ../libgnome-desktop/gnome-rr.c:452
+#, c-format
+msgid "could not get the screen resources (CRTCs, outputs, modes)"
+msgstr "ni mogoče dobiti virov zaslonov (CRTC, odvodi, načini)"
+
+#: ../libgnome-desktop/gnome-rr.c:472
+#, c-format
+msgid "unhandled X error while getting the range of screen sizes"
+msgstr "nepričakovana X napaka med pridobivanjem območja velikosti zaslonov"
+
+#: ../libgnome-desktop/gnome-rr.c:478
+#, c-format
+msgid "could not get the range of screen sizes"
+msgstr "ni mogoče dobiti območja velikosti zaslonov"
+
+#: ../libgnome-desktop/gnome-rr.c:769
+#, c-format
+msgid "RANDR extension is not present"
+msgstr "Razširitev RANDR ni na voljo"
+
+#: ../libgnome-desktop/gnome-rr.c:1580
+#, c-format
+msgid "could not get information about output %d"
+msgstr "ni mogoče dobiti podatkov o odvodu %d"
+
+#: ../libgnome-desktop/gnome-rr.c:1764
+msgid "Built-in Display"
+msgstr "Vgradni zaslon"
+
+#. Translators: %s is the size of the monitor in inches
+#: ../libgnome-desktop/gnome-rr.c:1782
+#, c-format
+msgid "%s Display"
+msgstr "%s zaslon"
+
+#: ../libgnome-desktop/gnome-rr.c:1789
+#| msgctxt "Monitor vendor"
+#| msgid "Unknown"
+msgid "Unknown Display"
+msgstr "Neznan zaslon"
+
+#. Translators: the "position", "size", and "maximum"
+#. * words here are not keywords; please translate them
+#. * as usual.  A CRTC is a CRT Controller (this is X terminology)
+#: ../libgnome-desktop/gnome-rr.c:2234
+#, c-format
+msgid ""
+"requested position/size for CRTC %d is outside the allowed limit: position="
+"(%d, %d), size=(%d, %d), maximum=(%d, %d)"
+msgstr ""
+"zahtevan podatek položaja ali velikosti za CRTC %d je izven dovoljenih "
+"omejitev: položaj=(%d, %d), velikost=(%d, %d), največja dovoljena vrednost="
+"(%d, %d)"
+
+#: ../libgnome-desktop/gnome-rr.c:2270
+#, c-format
+msgid "could not set the configuration for CRTC %d"
+msgstr "ni mogoče določiti nastavitev za CRTC %d"
+
+#: ../libgnome-desktop/gnome-rr.c:2421
+#, c-format
+msgid "could not get information about CRTC %d"
+msgstr "ni mogoče dobiti podatkov o CRTC %d"
+
+#: ../libgnome-desktop/gnome-rr-config.c:708
+#, c-format
+msgid ""
+"none of the saved display configurations matched the active configuration"
+msgstr ""
+"nobena od shranjenih nastavitev zaslona ni primerna za dejavno nastavitev"
+
+#: ../libgnome-desktop/gnome-rr-config.c:1464
 #, c-format
 msgid "CRTC %d cannot drive output %s"
 msgstr "CRTC %d ne podpira odvoda %s"
 
-#: ../libgnome-desktop/gnome-rr-config.c:796
+#: ../libgnome-desktop/gnome-rr-config.c:1471
 #, c-format
 msgid "output %s does not support mode %dx%d@%dHz"
 msgstr "odvod %s ne podpira načina %dx%d@%dHz"
 
-#: ../libgnome-desktop/gnome-rr-config.c:807
+#: ../libgnome-desktop/gnome-rr-config.c:1482
 #, c-format
-msgid "CRTC %d does not support rotation=%d"
-msgstr "CRTC %d ne podpira vrtenja=%d"
+msgid "CRTC %d does not support rotation=%s"
+msgstr "CRTC %d ne podpira vrtenja=%s"
 
-#: ../libgnome-desktop/gnome-rr-config.c:820
+#: ../libgnome-desktop/gnome-rr-config.c:1496
 #, c-format
 msgid ""
 "output %s does not have the same parameters as another cloned output:\n"
 "existing mode = %d, new mode = %d\n"
 "existing coordinates = (%d, %d), new coordinates = (%d, %d)\n"
-"existing rotation = %d, new rotation = %d"
+"existing rotation = %s, new rotation = %s"
 msgstr ""
 "odvod %s nima določenih enakih parametrov kot drugi kloniran odvod:\n"
 "obstoječi način = %d, novi način = %d\n"
 "obstoječe koordinate = (%d, %d), nove koordinate = (%d, %d)\n"
-"obstoječe vrtenje = %d, novo vrtenje = %d"
+"obstoječe vrtenje = %s, novo vrtenje = %s"
 
-#: ../libgnome-desktop/gnome-rr-config.c:835
+#: ../libgnome-desktop/gnome-rr-config.c:1511
 #, c-format
 msgid "cannot clone to output %s"
 msgstr "ni mogoče klonirati na odvod %s"
 
-#: ../libgnome-desktop/gnome-rr-config.c:961
+#: ../libgnome-desktop/gnome-rr-config.c:1680
 #, c-format
 msgid "Trying modes for CRTC %d\n"
 msgstr "Preizkušanje načinov CRTC %d\n"
 
-#: ../libgnome-desktop/gnome-rr-config.c:985
+#: ../libgnome-desktop/gnome-rr-config.c:1704
 #, c-format
 msgid "CRTC %d: trying mode %dx%d@%dHz with output at %dx%d@%dHz (pass %d)\n"
 msgstr ""
 "CRTC %d: preizkusni način %dx%d@%dHz z odvodom pri %dx%d@%dHz (prehod %d)\n"
 
-#: ../libgnome-desktop/gnome-rr-config.c:1032
+#: ../libgnome-desktop/gnome-rr-config.c:1751
 #, c-format
 msgid ""
 "could not assign CRTCs to outputs:\n"
@@ -82,7 +162,7 @@
 "ni mogoče dodeliti CRTC odvodom:\n"
 "%s"
 
-#: ../libgnome-desktop/gnome-rr-config.c:1036
+#: ../libgnome-desktop/gnome-rr-config.c:1755
 #, c-format
 msgid ""
 "none of the selected modes were compatible with the possible modes:\n"
@@ -94,7 +174,7 @@
 #. Translators: the "requested", "minimum", and
 #. * "maximum" words here are not keywords; please
 #. * translate them as usual.
-#: ../libgnome-desktop/gnome-rr-config.c:1117
+#: ../libgnome-desktop/gnome-rr-config.c:1833
 #, c-format
 msgid ""
 "required virtual size does not fit available size: requested=(%d, %d), "
@@ -105,29 +185,32 @@
 
 #. Translators: This is the time format with full date used
 #. in 24-hour mode.
-#: ../libgnome-desktop/gnome-wall-clock.c:270
-msgid "%a %b %e, %R:%S"
-msgstr "%a %b %e, %R:%S"
+#. The character between %R and %S is U+2236 RATIO
+#: ../libgnome-desktop/gnome-wall-clock.c:268
+msgid "%a %b %e, %R∶%S"
+msgstr "%a %b %e, %R∶%S"
 
-#: ../libgnome-desktop/gnome-wall-clock.c:271
+#: ../libgnome-desktop/gnome-wall-clock.c:269
 msgid "%a %b %e, %R"
 msgstr "%a %b %e, %R"
 
 #. Translators: This is the time format with day used
 #. in 24-hour mode.
-#: ../libgnome-desktop/gnome-wall-clock.c:275
-msgid "%a %R:%S"
-msgstr "%a %R:%S"
+#. The character between %R and %S is U+2236 RATIO
+#: ../libgnome-desktop/gnome-wall-clock.c:274
+msgid "%a %R∶%S"
+msgstr "%a %R∶%S"
 
-#: ../libgnome-desktop/gnome-wall-clock.c:276
+#: ../libgnome-desktop/gnome-wall-clock.c:275
 msgid "%a %R"
 msgstr "%a %R"
 
 #. Translators: This is the time format without date used
 #. in 24-hour mode.
+#. The character between %R and %S is U+2236 RATIO
 #: ../libgnome-desktop/gnome-wall-clock.c:280
-msgid "%R:%S"
-msgstr "%R:%S"
+msgid "%R∶%S"
+msgstr "%R∶%S"
 
 #: ../libgnome-desktop/gnome-wall-clock.c:280
 msgid "%R"
@@ -135,80 +218,39 @@
 
 #. Translators: This is a time format with full date used
 #. for AM/PM.
-#: ../libgnome-desktop/gnome-wall-clock.c:286
-msgid "%a %b %e, %l:%M:%S %p"
-msgstr "%a %b %e, %l:%M:%S %p"
-
-#: ../libgnome-desktop/gnome-wall-clock.c:287
-msgid "%a %b %e, %l:%M %p"
-msgstr "%a %b %e, %l:%M %p"
+#. The Unicode characters are U+2236 RATIO and
+#. U+2009 THIN SPACE
+#: ../libgnome-desktop/gnome-wall-clock.c:288
+msgid "%a %b %e, %l∶%M∶%S %p"
+msgstr "%a %b %e, %l∶%M∶%S %p"
+
+#: ../libgnome-desktop/gnome-wall-clock.c:289
+msgid "%a %b %e, %l∶%M %p"
+msgstr "%a %b %e, %l∶%M %p"
 
 #. Translators: This is a time format with day used
 #. for AM/PM.
-#: ../libgnome-desktop/gnome-wall-clock.c:291
-msgid "%a %l:%M:%S %p"
-msgstr "%a %l:%M:%S %p"
-
-#: ../libgnome-desktop/gnome-wall-clock.c:292
-msgid "%a %l:%M %p"
-msgstr "%a %l:%M %p"
+#. The Unicode characters are U+2236 RATIO and
+#. U+2009 THIN SPACE
+#: ../libgnome-desktop/gnome-wall-clock.c:295
+msgid "%a %l∶%M∶%S %p"
+msgstr "%a %l∶%M∶%S %p"
 
-#. Translators: This is a time format without date used
-#. for AM/PM.
 #: ../libgnome-desktop/gnome-wall-clock.c:296
-msgid "%l:%M:%S %p"
-msgstr "%l:%M:%S %p"
-
-#: ../libgnome-desktop/gnome-wall-clock.c:297
-msgid "%l:%M %p"
-msgstr "%l:%M %p"
-
-#~ msgctxt "Monitor vendor"
-#~ msgid "Unknown"
-#~ msgstr "Neznano"
-
-#~ msgid "could not get the screen resources (CRTCs, outputs, modes)"
-#~ msgstr "ni mogoče dobiti virov zaslonov (CRTC, odvodi, načini)"
-
-#~ msgid "unhandled X error while getting the range of screen sizes"
-#~ msgstr "nepričakovana X napaka med pridobivanjem območja velikosti zaslonov"
+msgid "%a %l∶%M %p"
+msgstr "%a %l∶%M %p"
 
-#~ msgid "could not get the range of screen sizes"
-#~ msgstr "ni mogoče dobiti območja velikosti zaslonov"
-
-#~ msgid "RANDR extension is not present"
-#~ msgstr "Razširitev RANDR ni na voljo"
-
-#~ msgid "could not get information about output %d"
-#~ msgstr "ni mogoče dobiti podatkov o odvodu %d"
-
-#~ msgid "Built-in Display"
-#~ msgstr "Vgrajen zaslon"
-
-#~ msgid "%s Display"
-#~ msgstr "%s zaslon"
-
-#~ msgid "Unknown Display"
-#~ msgstr "Neznana vrsta zaslona"
-
-#~ msgid ""
-#~ "requested position/size for CRTC %d is outside the allowed limit: "
-#~ "position=(%d, %d), size=(%d, %d), maximum=(%d, %d)"
-#~ msgstr ""
-#~ "zahtevan podatek položaja ali velikosti za CRTC %d je izven dovoljenih "
-#~ "omejitev: položaj=(%d, %d), velikost=(%d, %d), največja dovoljena "
-#~ "vrednost=(%d, %d)"
-
-#~ msgid "could not set the configuration for CRTC %d"
-#~ msgstr "ni mogoče določiti nastavitev za CRTC %d"
-
-#~ msgid "could not get information about CRTC %d"
-#~ msgstr "ni mogoče dobiti podatkov o CRTC %d"
-
-#~ msgid ""
-#~ "none of the saved display configurations matched the active configuration"
-#~ msgstr ""
-#~ "nobena od shranjenih nastavitev zaslona ni primerna za dejavno nastavitev"
+#. Translators: This is a time format without date used
+#. for AM/PM.
+#. The Unicode characters are U+2236 RATIO and
+#. U+2009 THIN SPACE
+#: ../libgnome-desktop/gnome-wall-clock.c:302
+msgid "%l∶%M∶%S %p"
+msgstr "%l∶%M∶%S %p"
+
+#: ../libgnome-desktop/gnome-wall-clock.c:303
+msgid "%l∶%M %p"
+msgstr "%l∶%M %p"
 
 #~ msgid "Cannot find a terminal, using xterm, even if it may not work"
 #~ msgstr ""
@@ -218,26 +260,17 @@
 #~ msgid "Laptop"
 #~ msgstr "Prenosni računalnik"
 
-#~ msgid "%a %b %e, %R∶%S"
-#~ msgstr "%a %b %e, %R∶%S"
-
-#~ msgid "%R∶%S"
-#~ msgstr "%R∶%S"
-
-#~ msgid "%a %l∶%M∶%S %p"
-#~ msgstr "%a %l∶%M∶%S %p"
-
-#~ msgid "%a %l∶%M %p"
-#~ msgstr "%a %l∶%M %p"
+#~ msgid "Mirrored Displays"
+#~ msgstr "Zrcaljena zaslona"
 
-#~ msgid "%l∶%M∶%S %p"
-#~ msgstr "%l∶%M∶%S %p"
+#~ msgid "%R:%S"
+#~ msgstr "%R:%S"
 
-#~ msgid "%l∶%M %p"
-#~ msgstr "%l∶%M %p"
+#~ msgid "%l:%M:%S %p"
+#~ msgstr "%l:%M:%S %p"
 
-#~ msgid "Mirrored Displays"
-#~ msgstr "Zrcaljena zaslona"
+#~ msgid "%l:%M %p"
+#~ msgstr "%l:%M %p"
 
 #~ msgid "Mirror Screens"
 #~ msgstr "Zrcalni zasloni"
diff -Nru gnome-desktop3-3.12.0/po/sr@latin.po gnome-desktop3-3.8.4/po/sr@latin.po
--- gnome-desktop3-3.12.0/po/sr@latin.po	2013-11-11 17:23:18.000000000 +0000
+++ gnome-desktop3-3.8.4/po/sr@latin.po	2013-09-04 11:15:57.000000000 +0000
@@ -9,8 +9,8 @@
 "Project-Id-Version: gnome-desktop\n"
 "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=gnome-"
 "desktop&keywords=I18N+L10N&component=general\n"
-"POT-Creation-Date: 2013-09-02 21:04+0000\n"
-"PO-Revision-Date: 2013-09-04 05:35+0200\n"
+"POT-Creation-Date: 2013-03-04 10:03+0000\n"
+"PO-Revision-Date: 2013-03-07 10:48+0200\n"
 "Last-Translator: Miroslav Nikolić \n"
 "Language-Team: Serbian \n"
 "Language: sr\n"
@@ -21,62 +21,135 @@
 "n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n"
 "X-Project-Style: gnome\n"
 
+#. Translators: "Unknown" here is used to identify a monitor for which
+#. * we don't know the vendor. When a vendor is known, the name of the
+#. * vendor is used.
+#: ../libgnome-desktop/display-name.c:107
+msgctxt "Monitor vendor"
+msgid "Unknown"
+msgstr "Nepoznat"
+
 #: ../libgnome-desktop/gnome-languages.c:804
 msgid "Unspecified"
 msgstr "Neodređeno"
 
-#: ../libgnome-desktop/gnome-rr-config.c:743
+#. Translators: a CRTC is a CRT Controller (this is X terminology).
+#: ../libgnome-desktop/gnome-rr.c:452
+#, c-format
+msgid "could not get the screen resources (CRTCs, outputs, modes)"
+msgstr "ne mogu da dobijem resurse za ekran (CRTC, izlazi, režimi)"
+
+#: ../libgnome-desktop/gnome-rr.c:472
+#, c-format
+msgid "unhandled X error while getting the range of screen sizes"
+msgstr ""
+"neutvrđena greška u X serveru prilikom dobavljanja opsega veličine ekrana"
+
+#: ../libgnome-desktop/gnome-rr.c:478
+#, c-format
+msgid "could not get the range of screen sizes"
+msgstr "ne mogu da dobijem opseg veličina za ekran"
+
+#: ../libgnome-desktop/gnome-rr.c:769
+#, c-format
+msgid "RANDR extension is not present"
+msgstr "Nije prisutno RANDR proširenje"
+
+#: ../libgnome-desktop/gnome-rr.c:1580
+#, c-format
+msgid "could not get information about output %d"
+msgstr "ne mogu da dobijem podatke o izlazu „%d“"
+
+#: ../libgnome-desktop/gnome-rr.c:1764
+#| msgid "%s Display"
+msgid "Built-in Display"
+msgstr "Ugrađeni ekran"
+
+#. Translators: %s is the size of the monitor in inches
+#: ../libgnome-desktop/gnome-rr.c:1782
+#, c-format
+msgid "%s Display"
+msgstr "Ekran od %s"
+
+#: ../libgnome-desktop/gnome-rr.c:1789
+msgid "Unknown Display"
+msgstr "Nepoznat ekran"
+
+#. Translators: the "position", "size", and "maximum"
+#. * words here are not keywords; please translate them
+#. * as usual.  A CRTC is a CRT Controller (this is X terminology)
+#: ../libgnome-desktop/gnome-rr.c:2234
+#, c-format
+msgid ""
+"requested position/size for CRTC %d is outside the allowed limit: position="
+"(%d, %d), size=(%d, %d), maximum=(%d, %d)"
+msgstr ""
+"zahtevan položaj/veličina za CRTC %d je izvan dozvoljenog ograničenja: položaj="
+"(%d, %d), veličina=(%d, %d), najviše=(%d, %d)"
+
+#: ../libgnome-desktop/gnome-rr.c:2270
+#, c-format
+msgid "could not set the configuration for CRTC %d"
+msgstr "ne mogu da postavim podešavanja za CRTC „%d“ ekran"
+
+#: ../libgnome-desktop/gnome-rr.c:2421
+#, c-format
+msgid "could not get information about CRTC %d"
+msgstr "ne mogu da dobijem podatke o CRTC „%d“ ekranu"
+
+#: ../libgnome-desktop/gnome-rr-config.c:708
+#, c-format
+msgid ""
+"none of the saved display configurations matched the active configuration"
+msgstr ""
+"ni jedno od sačuvanih podešavanja ekrana se ne poklapa sa tekućim podešavanjem"
+
+#: ../libgnome-desktop/gnome-rr-config.c:1464
 #, c-format
 msgid "CRTC %d cannot drive output %s"
 msgstr "CRTC „%d“ ne može dobije izlaz „%s“"
 
-#: ../libgnome-desktop/gnome-rr-config.c:750
+#: ../libgnome-desktop/gnome-rr-config.c:1471
 #, c-format
 msgid "output %s does not support mode %dx%d@%dHz"
 msgstr "izlaz „%s“ ne podržava režim %dx%d@%dHz"
 
-#: ../libgnome-desktop/gnome-rr-config.c:761
+#: ../libgnome-desktop/gnome-rr-config.c:1482
+#, c-format
+msgid "CRTC %d does not support rotation=%s"
+msgstr "CRTC „%d“ ne podržava rotaciju = %s"
+
+#: ../libgnome-desktop/gnome-rr-config.c:1496
 #, c-format
-#| msgid "CRTC %d does not support rotation=%s"
-msgid "CRTC %d does not support rotation=%d"
-msgstr "CRTC „%d“ ne podržava rotaciju =%d"
-
-#: ../libgnome-desktop/gnome-rr-config.c:774
-#, c-format
-#| msgid ""
-#| "output %s does not have the same parameters as another cloned output:\n"
-#| "existing mode = %d, new mode = %d\n"
-#| "existing coordinates = (%d, %d), new coordinates = (%d, %d)\n"
-#| "existing rotation = %s, new rotation = %s"
 msgid ""
 "output %s does not have the same parameters as another cloned output:\n"
 "existing mode = %d, new mode = %d\n"
 "existing coordinates = (%d, %d), new coordinates = (%d, %d)\n"
-"existing rotation = %d, new rotation = %d"
+"existing rotation = %s, new rotation = %s"
 msgstr ""
 "izlaz „%s“ nema iste parametre kao drugi klonirani uređaj:\n"
 "postojeći režim = %d, novi režim = %d\n"
 "postojeće koordinate = (%d, %d), nove koordinate = (%d, %d)\n"
-"postojeća rotacija = %d, nova rotacija = %d"
+"postojeća rotacija = %s, nova rotacija = %s"
 
-#: ../libgnome-desktop/gnome-rr-config.c:789
+#: ../libgnome-desktop/gnome-rr-config.c:1511
 #, c-format
 msgid "cannot clone to output %s"
 msgstr "ne mogu da kloniram u izlaz „%s“"
 
-#: ../libgnome-desktop/gnome-rr-config.c:915
+#: ../libgnome-desktop/gnome-rr-config.c:1680
 #, c-format
 msgid "Trying modes for CRTC %d\n"
 msgstr "Isprobavam režime za CRTC „%d“\n"
 
-#: ../libgnome-desktop/gnome-rr-config.c:939
+#: ../libgnome-desktop/gnome-rr-config.c:1704
 #, c-format
 msgid "CRTC %d: trying mode %dx%d@%dHz with output at %dx%d@%dHz (pass %d)\n"
 msgstr ""
 "CRTC „%d“: isprobavam režim %dx%d@%dHz bez izlaza na %dx%d@%dHz (%d. "
 "pokušaj)\n"
 
-#: ../libgnome-desktop/gnome-rr-config.c:986
+#: ../libgnome-desktop/gnome-rr-config.c:1751
 #, c-format
 msgid ""
 "could not assign CRTCs to outputs:\n"
@@ -85,7 +158,7 @@
 "ne mogu da pridružim CRTC-e izlazima:\n"
 "%s"
 
-#: ../libgnome-desktop/gnome-rr-config.c:990
+#: ../libgnome-desktop/gnome-rr-config.c:1755
 #, c-format
 msgid ""
 "none of the selected modes were compatible with the possible modes:\n"
@@ -97,7 +170,7 @@
 #. Translators: the "requested", "minimum", and
 #. * "maximum" words here are not keywords; please
 #. * translate them as usual.
-#: ../libgnome-desktop/gnome-rr-config.c:1071
+#: ../libgnome-desktop/gnome-rr-config.c:1833
 #, c-format
 msgid ""
 "required virtual size does not fit available size: requested=(%d, %d), "
@@ -108,31 +181,32 @@
 
 #. Translators: This is the time format with full date used
 #. in 24-hour mode.
-#: ../libgnome-desktop/gnome-wall-clock.c:270
-#| msgid "%a %b %e, %R"
-msgid "%a %b %e, %R:%S"
+#. The character between %R and %S is U+2236 RATIO
+#: ../libgnome-desktop/gnome-wall-clock.c:268
+msgid "%a %b %e, %R∶%S"
 msgstr "%A, %e. %b, %R:%S"
 
-#: ../libgnome-desktop/gnome-wall-clock.c:271
+#: ../libgnome-desktop/gnome-wall-clock.c:269
 msgid "%a %b %e, %R"
 msgstr "%A, %e. %b, %R"
 
 #. Translators: This is the time format with day used
 #. in 24-hour mode.
-#: ../libgnome-desktop/gnome-wall-clock.c:275
-#| msgid "%a %R∶%S"
-msgid "%a %R:%S"
+#. The character between %R and %S is U+2236 RATIO
+#: ../libgnome-desktop/gnome-wall-clock.c:274
+msgid "%a %R∶%S"
 msgstr "%A, %R:%S"
 
-#: ../libgnome-desktop/gnome-wall-clock.c:276
+#: ../libgnome-desktop/gnome-wall-clock.c:275
 msgid "%a %R"
 msgstr "%A, %R"
 
 #. Translators: This is the time format without date used
 #. in 24-hour mode.
+#. The character between %R and %S is U+2236 RATIO
 #: ../libgnome-desktop/gnome-wall-clock.c:280
-msgid "%R:%S"
-msgstr "%R:%S"
+msgid "%R∶%S"
+msgstr "%R∶%S"
 
 #: ../libgnome-desktop/gnome-wall-clock.c:280
 msgid "%R"
@@ -140,34 +214,36 @@
 
 #. Translators: This is a time format with full date used
 #. for AM/PM.
-#: ../libgnome-desktop/gnome-wall-clock.c:286
-#| msgid "%a %b %e, %l∶%M∶%S %p"
-msgid "%a %b %e, %l:%M:%S %p"
-msgstr "%A, %e. %b, %l:%M:%S"
-
-#: ../libgnome-desktop/gnome-wall-clock.c:287
-#| msgid "%a %b %e, %l∶%M %p"
-msgid "%a %b %e, %l:%M %p"
+#. The Unicode characters are U+2236 RATIO and
+#. U+2009 THIN SPACE
+#: ../libgnome-desktop/gnome-wall-clock.c:288
+msgid "%a %b %e, %l∶%M∶%S %p"
+msgstr "%A, %e. %b, %l:%M:S"
+
+#: ../libgnome-desktop/gnome-wall-clock.c:289
+msgid "%a %b %e, %l∶%M %p"
 msgstr "%A, %e. %b, %l:%M"
 
 #. Translators: This is a time format with day used
 #. for AM/PM.
-#: ../libgnome-desktop/gnome-wall-clock.c:291
-#| msgid "%a %l∶%M∶%S %p"
-msgid "%a %l:%M:%S %p"
+#. The Unicode characters are U+2236 RATIO and
+#. U+2009 THIN SPACE
+#: ../libgnome-desktop/gnome-wall-clock.c:295
+msgid "%a %l∶%M∶%S %p"
 msgstr "%A, %l:%M:%S"
 
-#: ../libgnome-desktop/gnome-wall-clock.c:292
-#| msgid "%a %l∶%M %p"
-msgid "%a %l:%M %p"
+#: ../libgnome-desktop/gnome-wall-clock.c:296
+msgid "%a %l∶%M %p"
 msgstr "%A, %l:%M"
 
 #. Translators: This is a time format without date used
 #. for AM/PM.
-#: ../libgnome-desktop/gnome-wall-clock.c:296
-msgid "%l:%M:%S %p"
+#. The Unicode characters are U+2236 RATIO and
+#. U+2009 THIN SPACE
+#: ../libgnome-desktop/gnome-wall-clock.c:302
+msgid "%l∶%M∶%S %p"
 msgstr "%l:%M:%S"
 
-#: ../libgnome-desktop/gnome-wall-clock.c:297
-msgid "%l:%M %p"
+#: ../libgnome-desktop/gnome-wall-clock.c:303
+msgid "%l∶%M %p"
 msgstr "%l:%M"
diff -Nru gnome-desktop3-3.12.0/po/sr.po gnome-desktop3-3.8.4/po/sr.po
--- gnome-desktop3-3.12.0/po/sr.po	2013-11-11 17:23:18.000000000 +0000
+++ gnome-desktop3-3.8.4/po/sr.po	2013-09-04 11:15:57.000000000 +0000
@@ -9,8 +9,8 @@
 "Project-Id-Version: gnome-desktop\n"
 "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=gnome-"
 "desktop&keywords=I18N+L10N&component=general\n"
-"POT-Creation-Date: 2013-09-02 21:04+0000\n"
-"PO-Revision-Date: 2013-09-04 05:35+0200\n"
+"POT-Creation-Date: 2013-03-04 10:03+0000\n"
+"PO-Revision-Date: 2013-03-07 10:48+0200\n"
 "Last-Translator: Мирослав Николић \n"
 "Language-Team: Serbian \n"
 "Language: sr\n"
@@ -21,62 +21,135 @@
 "n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n"
 "X-Project-Style: gnome\n"
 
+#. Translators: "Unknown" here is used to identify a monitor for which
+#. * we don't know the vendor. When a vendor is known, the name of the
+#. * vendor is used.
+#: ../libgnome-desktop/display-name.c:107
+msgctxt "Monitor vendor"
+msgid "Unknown"
+msgstr "Непознат"
+
 #: ../libgnome-desktop/gnome-languages.c:804
 msgid "Unspecified"
 msgstr "Неодређено"
 
-#: ../libgnome-desktop/gnome-rr-config.c:743
+#. Translators: a CRTC is a CRT Controller (this is X terminology).
+#: ../libgnome-desktop/gnome-rr.c:452
+#, c-format
+msgid "could not get the screen resources (CRTCs, outputs, modes)"
+msgstr "не могу да добијем ресурсе за екран (ЦРТЦ, излази, режими)"
+
+#: ../libgnome-desktop/gnome-rr.c:472
+#, c-format
+msgid "unhandled X error while getting the range of screen sizes"
+msgstr ""
+"неутврђена грешка у X серверу приликом добављања опсега величине екрана"
+
+#: ../libgnome-desktop/gnome-rr.c:478
+#, c-format
+msgid "could not get the range of screen sizes"
+msgstr "не могу да добијем опсег величина за екран"
+
+#: ../libgnome-desktop/gnome-rr.c:769
+#, c-format
+msgid "RANDR extension is not present"
+msgstr "Није присутно РАНДР проширење"
+
+#: ../libgnome-desktop/gnome-rr.c:1580
+#, c-format
+msgid "could not get information about output %d"
+msgstr "не могу да добијем податке о излазу „%d“"
+
+#: ../libgnome-desktop/gnome-rr.c:1764
+#| msgid "%s Display"
+msgid "Built-in Display"
+msgstr "Уграђени екран"
+
+#. Translators: %s is the size of the monitor in inches
+#: ../libgnome-desktop/gnome-rr.c:1782
+#, c-format
+msgid "%s Display"
+msgstr "Екран од %s"
+
+#: ../libgnome-desktop/gnome-rr.c:1789
+msgid "Unknown Display"
+msgstr "Непознат екран"
+
+#. Translators: the "position", "size", and "maximum"
+#. * words here are not keywords; please translate them
+#. * as usual.  A CRTC is a CRT Controller (this is X terminology)
+#: ../libgnome-desktop/gnome-rr.c:2234
+#, c-format
+msgid ""
+"requested position/size for CRTC %d is outside the allowed limit: position="
+"(%d, %d), size=(%d, %d), maximum=(%d, %d)"
+msgstr ""
+"захтеван положај/величина за ЦРТЦ %d је изван дозвољеног ограничења: положај="
+"(%d, %d), величина=(%d, %d), највише=(%d, %d)"
+
+#: ../libgnome-desktop/gnome-rr.c:2270
+#, c-format
+msgid "could not set the configuration for CRTC %d"
+msgstr "не могу да поставим подешавања за ЦРТЦ „%d“ екран"
+
+#: ../libgnome-desktop/gnome-rr.c:2421
+#, c-format
+msgid "could not get information about CRTC %d"
+msgstr "не могу да добијем податке о ЦРТЦ „%d“ екрану"
+
+#: ../libgnome-desktop/gnome-rr-config.c:708
+#, c-format
+msgid ""
+"none of the saved display configurations matched the active configuration"
+msgstr ""
+"ни једно од сачуваних подешавања екрана се не поклапа са текућим подешавањем"
+
+#: ../libgnome-desktop/gnome-rr-config.c:1464
 #, c-format
 msgid "CRTC %d cannot drive output %s"
 msgstr "ЦРТЦ „%d“ не може добије излаз „%s“"
 
-#: ../libgnome-desktop/gnome-rr-config.c:750
+#: ../libgnome-desktop/gnome-rr-config.c:1471
 #, c-format
 msgid "output %s does not support mode %dx%d@%dHz"
 msgstr "излаз „%s“ не подржава режим %dx%d@%dHz"
 
-#: ../libgnome-desktop/gnome-rr-config.c:761
+#: ../libgnome-desktop/gnome-rr-config.c:1482
+#, c-format
+msgid "CRTC %d does not support rotation=%s"
+msgstr "ЦРТЦ „%d“ не подржава ротацију = %s"
+
+#: ../libgnome-desktop/gnome-rr-config.c:1496
 #, c-format
-#| msgid "CRTC %d does not support rotation=%s"
-msgid "CRTC %d does not support rotation=%d"
-msgstr "ЦРТЦ „%d“ не подржава ротацију =%d"
-
-#: ../libgnome-desktop/gnome-rr-config.c:774
-#, c-format
-#| msgid ""
-#| "output %s does not have the same parameters as another cloned output:\n"
-#| "existing mode = %d, new mode = %d\n"
-#| "existing coordinates = (%d, %d), new coordinates = (%d, %d)\n"
-#| "existing rotation = %s, new rotation = %s"
 msgid ""
 "output %s does not have the same parameters as another cloned output:\n"
 "existing mode = %d, new mode = %d\n"
 "existing coordinates = (%d, %d), new coordinates = (%d, %d)\n"
-"existing rotation = %d, new rotation = %d"
+"existing rotation = %s, new rotation = %s"
 msgstr ""
 "излаз „%s“ нема исте параметре као други клонирани уређај:\n"
 "постојећи режим = %d, нови режим = %d\n"
 "постојеће координате = (%d, %d), нове координате = (%d, %d)\n"
-"постојећа ротација = %d, нова ротација = %d"
+"постојећа ротација = %s, нова ротација = %s"
 
-#: ../libgnome-desktop/gnome-rr-config.c:789
+#: ../libgnome-desktop/gnome-rr-config.c:1511
 #, c-format
 msgid "cannot clone to output %s"
 msgstr "не могу да клонирам у излаз „%s“"
 
-#: ../libgnome-desktop/gnome-rr-config.c:915
+#: ../libgnome-desktop/gnome-rr-config.c:1680
 #, c-format
 msgid "Trying modes for CRTC %d\n"
 msgstr "Испробавам режиме за ЦРТЦ „%d“\n"
 
-#: ../libgnome-desktop/gnome-rr-config.c:939
+#: ../libgnome-desktop/gnome-rr-config.c:1704
 #, c-format
 msgid "CRTC %d: trying mode %dx%d@%dHz with output at %dx%d@%dHz (pass %d)\n"
 msgstr ""
 "ЦРТЦ „%d“: испробавам режим %dx%d@%dHz без излаза на %dx%d@%dHz (%d. "
 "покушај)\n"
 
-#: ../libgnome-desktop/gnome-rr-config.c:986
+#: ../libgnome-desktop/gnome-rr-config.c:1751
 #, c-format
 msgid ""
 "could not assign CRTCs to outputs:\n"
@@ -85,7 +158,7 @@
 "не могу да придружим ЦРТЦ-е излазима:\n"
 "%s"
 
-#: ../libgnome-desktop/gnome-rr-config.c:990
+#: ../libgnome-desktop/gnome-rr-config.c:1755
 #, c-format
 msgid ""
 "none of the selected modes were compatible with the possible modes:\n"
@@ -97,7 +170,7 @@
 #. Translators: the "requested", "minimum", and
 #. * "maximum" words here are not keywords; please
 #. * translate them as usual.
-#: ../libgnome-desktop/gnome-rr-config.c:1071
+#: ../libgnome-desktop/gnome-rr-config.c:1833
 #, c-format
 msgid ""
 "required virtual size does not fit available size: requested=(%d, %d), "
@@ -108,31 +181,32 @@
 
 #. Translators: This is the time format with full date used
 #. in 24-hour mode.
-#: ../libgnome-desktop/gnome-wall-clock.c:270
-#| msgid "%a %b %e, %R"
-msgid "%a %b %e, %R:%S"
+#. The character between %R and %S is U+2236 RATIO
+#: ../libgnome-desktop/gnome-wall-clock.c:268
+msgid "%a %b %e, %R∶%S"
 msgstr "%A, %e. %b, %R:%S"
 
-#: ../libgnome-desktop/gnome-wall-clock.c:271
+#: ../libgnome-desktop/gnome-wall-clock.c:269
 msgid "%a %b %e, %R"
 msgstr "%A, %e. %b, %R"
 
 #. Translators: This is the time format with day used
 #. in 24-hour mode.
-#: ../libgnome-desktop/gnome-wall-clock.c:275
-#| msgid "%a %R∶%S"
-msgid "%a %R:%S"
+#. The character between %R and %S is U+2236 RATIO
+#: ../libgnome-desktop/gnome-wall-clock.c:274
+msgid "%a %R∶%S"
 msgstr "%A, %R:%S"
 
-#: ../libgnome-desktop/gnome-wall-clock.c:276
+#: ../libgnome-desktop/gnome-wall-clock.c:275
 msgid "%a %R"
 msgstr "%A, %R"
 
 #. Translators: This is the time format without date used
 #. in 24-hour mode.
+#. The character between %R and %S is U+2236 RATIO
 #: ../libgnome-desktop/gnome-wall-clock.c:280
-msgid "%R:%S"
-msgstr "%R:%S"
+msgid "%R∶%S"
+msgstr "%R∶%S"
 
 #: ../libgnome-desktop/gnome-wall-clock.c:280
 msgid "%R"
@@ -140,34 +214,36 @@
 
 #. Translators: This is a time format with full date used
 #. for AM/PM.
-#: ../libgnome-desktop/gnome-wall-clock.c:286
-#| msgid "%a %b %e, %l∶%M∶%S %p"
-msgid "%a %b %e, %l:%M:%S %p"
-msgstr "%A, %e. %b, %l:%M:%S"
-
-#: ../libgnome-desktop/gnome-wall-clock.c:287
-#| msgid "%a %b %e, %l∶%M %p"
-msgid "%a %b %e, %l:%M %p"
+#. The Unicode characters are U+2236 RATIO and
+#. U+2009 THIN SPACE
+#: ../libgnome-desktop/gnome-wall-clock.c:288
+msgid "%a %b %e, %l∶%M∶%S %p"
+msgstr "%A, %e. %b, %l:%M:S"
+
+#: ../libgnome-desktop/gnome-wall-clock.c:289
+msgid "%a %b %e, %l∶%M %p"
 msgstr "%A, %e. %b, %l:%M"
 
 #. Translators: This is a time format with day used
 #. for AM/PM.
-#: ../libgnome-desktop/gnome-wall-clock.c:291
-#| msgid "%a %l∶%M∶%S %p"
-msgid "%a %l:%M:%S %p"
+#. The Unicode characters are U+2236 RATIO and
+#. U+2009 THIN SPACE
+#: ../libgnome-desktop/gnome-wall-clock.c:295
+msgid "%a %l∶%M∶%S %p"
 msgstr "%A, %l:%M:%S"
 
-#: ../libgnome-desktop/gnome-wall-clock.c:292
-#| msgid "%a %l∶%M %p"
-msgid "%a %l:%M %p"
+#: ../libgnome-desktop/gnome-wall-clock.c:296
+msgid "%a %l∶%M %p"
 msgstr "%A, %l:%M"
 
 #. Translators: This is a time format without date used
 #. for AM/PM.
-#: ../libgnome-desktop/gnome-wall-clock.c:296
-msgid "%l:%M:%S %p"
+#. The Unicode characters are U+2236 RATIO and
+#. U+2009 THIN SPACE
+#: ../libgnome-desktop/gnome-wall-clock.c:302
+msgid "%l∶%M∶%S %p"
 msgstr "%l:%M:%S"
 
-#: ../libgnome-desktop/gnome-wall-clock.c:297
-msgid "%l:%M %p"
+#: ../libgnome-desktop/gnome-wall-clock.c:303
+msgid "%l∶%M %p"
 msgstr "%l:%M"
diff -Nru gnome-desktop3-3.12.0/po/ta.po gnome-desktop3-3.8.4/po/ta.po
--- gnome-desktop3-3.12.0/po/ta.po	2014-01-07 13:28:18.000000000 +0000
+++ gnome-desktop3-3.8.4/po/ta.po	2013-09-04 11:15:57.000000000 +0000
@@ -5,87 +5,158 @@
 # Dinesh Nadarajah , 2001.
 # Dinesh Nadarajah , 2004.
 # Felix , 2006.
-# Dr.T.Vasudevan , 2007.
+# Dr.T.Vasudevan , 2007, 2012.
 # I. Felix , 2008, 2009.
 # Dr,T,Vasudevan , 2010, 2011.
-# Shantha kumar , 2012, 2013.
+# Shantha kumar , 2013.
 msgid ""
 msgstr ""
 "Project-Id-Version: gnome-desktop.master.ta\n"
-"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=gnome-"
-"desktop&keywords=I18N+L10N&component=general\n"
-"POT-Creation-Date: 2013-10-21 21:26+0000\n"
-"PO-Revision-Date: 2013-11-21 17:06+0530\n"
+"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug."
+"cgi?product=gnome-desktop&keywords=I18N+L10N&component=general\n"
+"POT-Creation-Date: 2013-03-22 09:59+0000\n"
+"PO-Revision-Date: 2013-03-22 15:35+0530\n"
 "Last-Translator: Shantha kumar \n"
 "Language-Team: American English <>\n"
 "Language: en_US\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: Lokalize 1.5\n"
+"X-Generator: Lokalize 1.0\n"
 "Plural-Forms: nplurals=2; plural=(n!=1);\\n"
 "\n"
 "\n"
 "\n"
 "\n"
 
-#: ../libgnome-desktop/gnome-languages.c:718
+#. Translators: "Unknown" here is used to identify a monitor for which
+#. * we don't know the vendor. When a vendor is known, the name of the
+#. * vendor is used.
+#: ../libgnome-desktop/display-name.c:107
+msgctxt "Monitor vendor"
+msgid "Unknown"
+msgstr "தெரியாத"
+
+#: ../libgnome-desktop/gnome-languages.c:804
 msgid "Unspecified"
 msgstr "குறிப்பிடப்படாத"
 
-#: ../libgnome-desktop/gnome-rr-config.c:743
+#. Translators: a CRTC is a CRT Controller (this is X terminology).
+#: ../libgnome-desktop/gnome-rr.c:452
+#, c-format
+msgid "could not get the screen resources (CRTCs, outputs, modes)"
+msgstr "திரை மூலங்களை பெற முடியவில்லை (CRTCs, outputs, modes)"
+
+#: ../libgnome-desktop/gnome-rr.c:472
+#, c-format
+msgid "unhandled X error while getting the range of screen sizes"
+msgstr "கையாளப்படாத X பிழை திரை அளவுகளின் வரம்பை பெறும் போது"
+
+#: ../libgnome-desktop/gnome-rr.c:478
+#, c-format
+msgid "could not get the range of screen sizes"
+msgstr "திரை அளவுகளின் வரம்பை பெற முடியவில்லை"
+
+#: ../libgnome-desktop/gnome-rr.c:769
+#, c-format
+msgid "RANDR extension is not present"
+msgstr "RANDR விரிவாக்கம் இல்லை"
+
+#: ../libgnome-desktop/gnome-rr.c:1580
+#, c-format
+msgid "could not get information about output %d"
+msgstr "வெளிப்பாடு %d பற்றிய தகவலை பெற முடியவில்லை"
+
+#: ../libgnome-desktop/gnome-rr.c:1764
+msgid "Built-in Display"
+msgstr "உள்ளமைந்த காட்சி"
+
+#. Translators: %s is the size of the monitor in inches
+#: ../libgnome-desktop/gnome-rr.c:1782
+#, c-format
+#| msgctxt "Monitor vendor"
+#| msgid "Unknown"
+msgid "%s Display"
+msgstr "%s காட்சி"
+
+#: ../libgnome-desktop/gnome-rr.c:1789
+#| msgctxt "Monitor vendor"
+#| msgid "Unknown"
+msgid "Unknown Display"
+msgstr "தெரியாத காட்சி"
+
+#. Translators: the "position", "size", and "maximum"
+#. * words here are not keywords; please translate them
+#. * as usual.  A CRTC is a CRT Controller (this is X terminology)
+#: ../libgnome-desktop/gnome-rr.c:2234
+#, c-format
+msgid ""
+"requested position/size for CRTC %d is outside the allowed limit: position="
+"(%d, %d), size=(%d, %d), maximum=(%d, %d)"
+msgstr ""
+"கோரப்பட்ட நிலை/அளவு CRTC %dக்கு வெளியேயுள்ள அனுமதிக்கபட்ட வரம்பாகும்: position=(%d, "
+"%d), size=(%d, %d), maximum=(%d, %d)"
+
+#: ../libgnome-desktop/gnome-rr.c:2270
+#, c-format
+msgid "could not set the configuration for CRTC %d"
+msgstr "CRTC %dக்கு கட்டமைப்பை அமைக்க முடியவில்லை"
+
+#: ../libgnome-desktop/gnome-rr.c:2421
+#, c-format
+msgid "could not get information about CRTC %d"
+msgstr "CRTC %d பற்றிய தகவலைப் பெற முடியவில்லை"
+
+#: ../libgnome-desktop/gnome-rr-config.c:708
+#, c-format
+msgid "none of the saved display configurations matched the active configuration"
+msgstr "செயலிலுள்ள கட்டமைப்புடன் சேமிக்கப்பட்ட காட்சி கட்டமைப்புகள் ஒன்றும் பொருந்தவில்லை"
+
+#: ../libgnome-desktop/gnome-rr-config.c:1464
 #, c-format
 msgid "CRTC %d cannot drive output %s"
 msgstr "CRTC %d, வெளியீடு  %s ஐ இயக்க முடியவில்லை"
 
-#: ../libgnome-desktop/gnome-rr-config.c:750
+#: ../libgnome-desktop/gnome-rr-config.c:1471
 #, c-format
 msgid "output %s does not support mode %dx%d@%dHz"
 msgstr "வெளியீடு %s,  %dx%d@%dHz பாங்கை ஆதரிக்கவில்லை"
 
-#: ../libgnome-desktop/gnome-rr-config.c:761
+#: ../libgnome-desktop/gnome-rr-config.c:1482
+#, c-format
+msgid "CRTC %d does not support rotation=%s"
+msgstr "CRTC %d சுழற்சியை ஆதரிக்கவில்லை=%s"
+
+#: ../libgnome-desktop/gnome-rr-config.c:1496
 #, c-format
-#| msgid "CRTC %d does not support rotation=%s"
-msgid "CRTC %d does not support rotation=%d"
-msgstr "CRTC %d இல் rotation=%d ஐ வசதி இல்லை"
-
-#: ../libgnome-desktop/gnome-rr-config.c:774
-#, c-format
-#| msgid ""
-#| "output %s does not have the same parameters as another cloned output:\n"
-#| "existing mode = %d, new mode = %d\n"
-#| "existing coordinates = (%d, %d), new coordinates = (%d, %d)\n"
-#| "existing rotation = %s, new rotation = %s"
 msgid ""
 "output %s does not have the same parameters as another cloned output:\n"
 "existing mode = %d, new mode = %d\n"
 "existing coordinates = (%d, %d), new coordinates = (%d, %d)\n"
-"existing rotation = %d, new rotation = %d"
+"existing rotation = %s, new rotation = %s"
 msgstr ""
-"வெளியீடு %s இல் குளோன் செய்யப்பட்ட மற்றொரு வெளியீட்டின் அளவுருக்களைப் போன்ற "
-"அதே அளவுருக்கள் இல்லை:\n"
-"தற்போதைய பயன்முறை = %d, புதிய பயன்முறை = %d\n"
+"வெளியீடு %s க்கு நகலெடுத்த இன்னொரு வெளியீட்டுக்கு உள்ள அதே தரு மதிப்புகள் இல்லை:\n"
+"தற்போதைய பாங்கு = %d, புதிய பாங்கு = %d\n"
 "தற்போதைய ஆயத்தொலைவுகள் = (%d, %d), புதிய ஆயத்தொலைவுகள் = (%d, %d)\n"
-"தற்போதைய சுழற்சி = %d, புதிய சுழற்சி = %d"
+"தற்போதைய சுழற்சி = %s, புதிய சுழற்சி = %s"
 
-#: ../libgnome-desktop/gnome-rr-config.c:789
+#: ../libgnome-desktop/gnome-rr-config.c:1511
 #, c-format
 msgid "cannot clone to output %s"
 msgstr "வெளியீடு %s ஐ நகலாக்க முடியவில்லை"
 
-#: ../libgnome-desktop/gnome-rr-config.c:915
+#: ../libgnome-desktop/gnome-rr-config.c:1680
 #, c-format
 msgid "Trying modes for CRTC %d\n"
 msgstr "CRTC %d க்கு பாங்குகளை முயற்சிக்கிறது\n"
 
-#: ../libgnome-desktop/gnome-rr-config.c:939
+#: ../libgnome-desktop/gnome-rr-config.c:1704
 #, c-format
 msgid "CRTC %d: trying mode %dx%d@%dHz with output at %dx%d@%dHz (pass %d)\n"
 msgstr ""
-"CRTC %d: %dx%d@%dHz பாங்கை வெளியீட்டுடன் %dx%d@%dHz இல் முயற்சிக்கிறது (pass %"
-"d)\n"
+"CRTC %d: %dx%d@%dHz பாங்கை வெளியீட்டுடன் %dx%d@%dHz இல் முயற்சிக்கிறது (pass %d)\n"
 
-#: ../libgnome-desktop/gnome-rr-config.c:986
+#: ../libgnome-desktop/gnome-rr-config.c:1751
 #, c-format
 msgid ""
 "could not assign CRTCs to outputs:\n"
@@ -94,7 +165,7 @@
 "வெளியீடுகளுக்கு எந்த சிஆர்டிசி க்களையும் பொறுப்பாக்க முடியவில்லை:\n"
 "%s"
 
-#: ../libgnome-desktop/gnome-rr-config.c:990
+#: ../libgnome-desktop/gnome-rr-config.c:1755
 #, c-format
 msgid ""
 "none of the selected modes were compatible with the possible modes:\n"
@@ -106,42 +177,45 @@
 #. Translators: the "requested", "minimum", and
 #. * "maximum" words here are not keywords; please
 #. * translate them as usual.
-#: ../libgnome-desktop/gnome-rr-config.c:1071
+#: ../libgnome-desktop/gnome-rr-config.c:1833
 #, c-format
 msgid ""
 "required virtual size does not fit available size: requested=(%d, %d), "
 "minimum=(%d, %d), maximum=(%d, %d)"
 msgstr ""
-"தேவையான மெய்நிகர் அளவு இருக்கும் அளவுடன் பொருந்தவில்லை: requested=(%d, %d), "
-"minimum=(%d, %d), maximum=(%d, %d)"
+"தேவையான மெய்நிகர் அளவு இருக்கும் அளவுடன் பொருந்தவில்லை: requested=(%d, %d), minimum="
+"(%d, %d), maximum=(%d, %d)"
 
 #. Translators: This is the time format with full date used
 #. in 24-hour mode.
-#: ../libgnome-desktop/gnome-wall-clock.c:270
-#| msgid "%a %b %e, %R"
-msgid "%a %b %e, %R:%S"
-msgstr "%a %b %e, %R:%S"
+#. The character between %R and %S is U+2236 RATIO
+#: ../libgnome-desktop/gnome-wall-clock.c:268
+#| msgid "%a %b %e, %R:%S"
+msgid "%a %b %e, %R∶%S"
+msgstr "%a %b %e, %R∶%S"
 
-#: ../libgnome-desktop/gnome-wall-clock.c:271
+#: ../libgnome-desktop/gnome-wall-clock.c:269
 msgid "%a %b %e, %R"
 msgstr "%a %b %e, %R"
 
 #. Translators: This is the time format with day used
 #. in 24-hour mode.
-#: ../libgnome-desktop/gnome-wall-clock.c:275
-#| msgid "%a %R∶%S"
-msgid "%a %R:%S"
-msgstr "%a %R:%S"
+#. The character between %R and %S is U+2236 RATIO
+#: ../libgnome-desktop/gnome-wall-clock.c:274
+#| msgid "%a %R:%S"
+msgid "%a %R∶%S"
+msgstr "%a %R∶%S"
 
-#: ../libgnome-desktop/gnome-wall-clock.c:276
+#: ../libgnome-desktop/gnome-wall-clock.c:275
 msgid "%a %R"
 msgstr "%a %R"
 
 #. Translators: This is the time format without date used
 #. in 24-hour mode.
+#. The character between %R and %S is U+2236 RATIO
 #: ../libgnome-desktop/gnome-wall-clock.c:280
-msgid "%R:%S"
-msgstr "%R:%S"
+msgid "%R∶%S"
+msgstr "%R∶%S"
 
 #: ../libgnome-desktop/gnome-wall-clock.c:280
 msgid "%R"
@@ -149,114 +223,75 @@
 
 #. Translators: This is a time format with full date used
 #. for AM/PM.
-#: ../libgnome-desktop/gnome-wall-clock.c:286
-#| msgid "%a %b %e, %l∶%M∶%S %p"
-msgid "%a %b %e, %l:%M:%S %p"
-msgstr "%a %b %e, %l:%M:%S %p"
-
-#: ../libgnome-desktop/gnome-wall-clock.c:287
-#| msgid "%a %b %e, %l∶%M %p"
-msgid "%a %b %e, %l:%M %p"
-msgstr "%a %b %e, %l:%M %p"
+#. The Unicode characters are U+2236 RATIO and
+#. U+2009 THIN SPACE
+#: ../libgnome-desktop/gnome-wall-clock.c:288
+#| msgid "%a %l:%M:%S %p"
+msgid "%a %b %e, %l∶%M∶%S %p"
+msgstr "%a %b %e, %l∶%M∶%S %p"
+
+#: ../libgnome-desktop/gnome-wall-clock.c:289
+#| msgid "%a %l:%M %p"
+msgid "%a %b %e, %l∶%M %p"
+msgstr "%a %b %e, %l∶%M %p"
 
 #. Translators: This is a time format with day used
 #. for AM/PM.
-#: ../libgnome-desktop/gnome-wall-clock.c:291
-#| msgid "%l:%M:%S %p"
-msgid "%a %l:%M:%S %p"
-msgstr "%a %l:%M:%S %p"
-
-#: ../libgnome-desktop/gnome-wall-clock.c:292
-#| msgid "%l:%M %p"
-msgid "%a %l:%M %p"
-msgstr "%a %l:%M %p"
+#. The Unicode characters are U+2236 RATIO and
+#. U+2009 THIN SPACE
+#: ../libgnome-desktop/gnome-wall-clock.c:295
+#| msgid "%a %l:%M:%S %p"
+msgid "%a %l∶%M∶%S %p"
+msgstr "%a %l∶%M∶%S %p"
 
-#. Translators: This is a time format without date used
-#. for AM/PM.
 #: ../libgnome-desktop/gnome-wall-clock.c:296
-msgid "%l:%M:%S %p"
-msgstr "%l:%M:%S %p"
-
-#: ../libgnome-desktop/gnome-wall-clock.c:297
-msgid "%l:%M %p"
-msgstr "%l:%M %p"
-
-#~ msgctxt "Monitor vendor"
-#~ msgid "Unknown"
-#~ msgstr "தெரியாத"
-
-#~ msgid "could not get the screen resources (CRTCs, outputs, modes)"
-#~ msgstr "திரை மூலங்களை பெற முடியவில்லை (CRTCs, outputs, modes)"
-
-#~ msgid "unhandled X error while getting the range of screen sizes"
-#~ msgstr "கையாளப்படாத X பிழை திரை அளவுகளின் வரம்பை பெறும் போது"
-
-#~ msgid "could not get the range of screen sizes"
-#~ msgstr "திரை அளவுகளின் வரம்பை பெற முடியவில்லை"
-
-#~ msgid "RANDR extension is not present"
-#~ msgstr "RANDR விரிவாக்கம் இல்லை"
-
-#~ msgid "could not get information about output %d"
-#~ msgstr "வெளிப்பாடு %d பற்றிய தகவலை பெற முடியவில்லை"
-
-#~ msgid "Built-in Display"
-#~ msgstr "உள்ளமைந்த காட்சி"
-
-#~ msgid "%s Display"
-#~ msgstr "%s காட்சி"
+#| msgid "%a %l:%M %p"
+msgid "%a %l∶%M %p"
+msgstr "%a %l∶%M %p"
 
-#~| msgctxt "Monitor vendor"
-#~| msgid "Unknown"
-#~ msgid "Unknown Display"
-#~ msgstr "தெரியாத காட்சி"
-
-#~ msgid ""
-#~ "requested position/size for CRTC %d is outside the allowed limit: "
-#~ "position=(%d, %d), size=(%d, %d), maximum=(%d, %d)"
-#~ msgstr ""
-#~ "கோரப்பட்ட நிலை/அளவு CRTC %dக்கு வெளியேயுள்ள அனுமதிக்கபட்ட வரம்பாகும்: "
-#~ "position=(%d, %d), size=(%d, %d), maximum=(%d, %d)"
-
-#~ msgid "could not set the configuration for CRTC %d"
-#~ msgstr "CRTC %dக்கு கட்டமைப்பை அமைக்க முடியவில்லை"
-
-#~ msgid "could not get information about CRTC %d"
-#~ msgstr "CRTC %d பற்றிய தகவலைப் பெற முடியவில்லை"
+#. Translators: This is a time format without date used
+#. for AM/PM.
+#. The Unicode characters are U+2236 RATIO and
+#. U+2009 THIN SPACE
+#: ../libgnome-desktop/gnome-wall-clock.c:302
+#| msgid "%a %l:%M:%S %p"
+msgid "%l∶%M∶%S %p"
+msgstr "%l∶%M∶%S %p"
+
+#: ../libgnome-desktop/gnome-wall-clock.c:303
+#| msgid "%a %l:%M %p"
+msgid "%l∶%M %p"
+msgstr "%l∶%M %p"
 
-#~ msgid ""
-#~ "none of the saved display configurations matched the active configuration"
-#~ msgstr "செயலிலுள்ள கட்டமைப்புடன் சேமிக்கப்பட்ட காட்சி கட்டமைப்புகள் ஒன்றும் பொருந்தவில்லை"
+#~ msgid "Cannot find a terminal, using xterm, even if it may not work"
+#~ msgstr "வேலை செய்யவில்லை என்றாலும் xtermஐ பயன்படுத்தி ஒரு முனையத்தை தேட முடியவில்லை"
 
-#~| msgid "%a %b %e, %R:%S"
-#~ msgid "%a %b %e, %R∶%S"
-#~ msgstr "%a %b %e, %R∶%S"
+#~ msgid "Laptop"
+#~ msgstr "மடிக்கணினி"
 
-#~ msgid "%R∶%S"
-#~ msgstr "%R∶%S"
+#~ msgid "%a %b %e, %R:%S"
+#~ msgstr "%a %b %e, %R:%S"
 
-#~| msgid "%a %l:%M:%S %p"
-#~ msgid "%a %l∶%M∶%S %p"
-#~ msgstr "%a %l∶%M∶%S %p"
+#~ msgid "%R:%S"
+#~ msgstr "%R:%S"
 
-#~| msgid "%a %l:%M %p"
-#~ msgid "%a %l∶%M %p"
-#~ msgstr "%a %l∶%M %p"
+#~ msgid "%a %b %e, %l:%M:%S %p"
+#~ msgstr "%a %b %e, %l:%M:%S %p"
 
-#~ msgid "%l∶%M∶%S %p"
-#~ msgstr "%l∶%M∶%S %p"
+#~ msgid "%a %b %e, %l:%M %p"
+#~ msgstr "%a %b %e, %l:%M %p"
 
-#~ msgid "%l∶%M %p"
-#~ msgstr "%l∶%M %p"
+#~ msgid "%a %l:%M:%S %p"
+#~ msgstr "%a %l:%M:%S %p"
 
-#~ msgid "Cannot find a terminal, using xterm, even if it may not work"
-#~ msgstr "வேலை செய்யவில்லை என்றாலும் xtermஐ பயன்படுத்தி ஒரு முனையத்தை தேட முடியவில்லை"
+#~ msgid "%a %l:%M %p"
+#~ msgstr "%a %l:%M %p"
 
-#~ msgid "Laptop"
-#~ msgstr "மடிக்கணினி"
+#~ msgid "%l:%M:%S %p"
+#~ msgstr "%l:%M:%S %p"
 
-#~ msgid "Mirrored Displays"
-#~ msgstr "பிரதிபலிக்கும் டிஸ்ப்ளேக்கள்"
+#~ msgid "%l:%M %p"
+#~ msgstr "%l:%M %p"
 
 #~ msgid "Mirror Screens"
 #~ msgstr "பிரதிபலிப்பு திரைகள்"
diff -Nru gnome-desktop3-3.12.0/po/te.po gnome-desktop3-3.8.4/po/te.po
--- gnome-desktop3-3.12.0/po/te.po	2013-11-11 17:23:18.000000000 +0000
+++ gnome-desktop3-3.8.4/po/te.po	2013-09-04 11:15:57.000000000 +0000
@@ -3,39 +3,39 @@
 # This file is distributed under the same license as the gnome-desktop package.
 # Copyright (C) 2005,2007,2011 Free Software Foundation, Andhra Pradesh.
 #
+#
 # Prajasakti Localisation Team , 2005.
 # Swecha Telugu Localisation Team , 2007.
-# Krishna Babu K , 2009.
+# Krishna Babu K , 2009, 2013.
 # Hari Krishna , 2011.
 # Praveen Illa , 2012.
-#
 msgid ""
 msgstr ""
 "Project-Id-Version: gnome-desktop.master.te\n"
 "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=gnome-"
 "desktop&keywords=I18N+L10N&component=general\n"
-"POT-Creation-Date: 2012-09-20 11:08+0000\n"
-"PO-Revision-Date: 2012-09-20 23:43+0530\n"
-"Last-Translator: Praveen Illa \n"
-"Language-Team: Telugu \n"
+"POT-Creation-Date: 2013-03-04 10:03+0000\n"
+"PO-Revision-Date: 2013-03-25 14:37+0530\n"
+"Last-Translator: Krishnababu Krothapalli \n"
+"Language-Team: Telugu \n"
 "Language: te\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: Gtranslator 2.91.5\n"
+"X-Generator: Lokalize 1.5\n"
 "Plural-Forms: nplurals=2; plural=(n!=1);\n"
 
 #. Translators: "Unknown" here is used to identify a monitor for which
 #. * we don't know the vendor. When a vendor is known, the name of the
 #. * vendor is used.
-#: ../libgnome-desktop/display-name.c:91
+#: ../libgnome-desktop/display-name.c:107
 msgctxt "Monitor vendor"
 msgid "Unknown"
 msgstr "తెలియదు"
 
-#: ../libgnome-desktop/gnome-desktop-utils.c:134
-msgid "Cannot find a terminal, using xterm, even if it may not work"
-msgstr "xపదమును వుపయోగించి, టెర్మినల్‌ను కనుగొనలేదు, వుపయోగించినా పనిచేయక పోవచ్చు"
+#: ../libgnome-desktop/gnome-languages.c:804
+msgid "Unspecified"
+msgstr "తెలుపని"
 
 #. Translators: a CRTC is a CRT Controller (this is X terminology).
 #: ../libgnome-desktop/gnome-rr.c:452
@@ -58,59 +58,72 @@
 msgid "RANDR extension is not present"
 msgstr "RANDR పొడిగింపు లేదు"
 
-#: ../libgnome-desktop/gnome-rr.c:1570
+#: ../libgnome-desktop/gnome-rr.c:1580
 #, c-format
 msgid "could not get information about output %d"
 msgstr "అవుట్పుట్ %d గురించి సమాచారము పొందలేక పోయింది"
 
+#: ../libgnome-desktop/gnome-rr.c:1764
+msgid "Built-in Display"
+msgstr "అంతర్నిర్మిత ప్రదర్శన"
+
+#. Translators: %s is the size of the monitor in inches
+#: ../libgnome-desktop/gnome-rr.c:1782
+#, c-format
+msgid "%s Display"
+msgstr "%s ప్రదర్శన"
+
+#: ../libgnome-desktop/gnome-rr.c:1789
+#| msgctxt "Monitor vendor"
+#| msgid "Unknown"
+msgid "Unknown Display"
+msgstr "తెలియని ప్రదర్శన"
+
 #. Translators: the "position", "size", and "maximum"
 #. * words here are not keywords; please translate them
 #. * as usual.  A CRTC is a CRT Controller (this is X terminology)
-#: ../libgnome-desktop/gnome-rr.c:2163
+#: ../libgnome-desktop/gnome-rr.c:2234
 #, c-format
 msgid ""
 "requested position/size for CRTC %d is outside the allowed limit: position="
 "(%d, %d), size=(%d, %d), maximum=(%d, %d)"
 msgstr ""
-"CRTC %d కొరకు అభ్యర్దించిన స్థానము/పరిమాణం అనుమతించిన పరిమితికి బయటవుంది: position=(%d, %d), "
+"CRTC %d కొరకు అభ్యర్దించిన స్థానము/పరిమాణం అనుమతించిన పరిమితికి బయటవుంది: "
+"position=(%d, %d), "
 "size=(%d, %d), maximum=(%d, %d)"
 
-#: ../libgnome-desktop/gnome-rr.c:2199
+#: ../libgnome-desktop/gnome-rr.c:2270
 #, c-format
 msgid "could not set the configuration for CRTC %d"
 msgstr "CRTC %d కొరకు ఆకృతీకరణను అమర్చలేక పోయింది"
 
-#: ../libgnome-desktop/gnome-rr.c:2344
+#: ../libgnome-desktop/gnome-rr.c:2421
 #, c-format
 msgid "could not get information about CRTC %d"
 msgstr "CRTC %d గురించి సమాచారమును పొందలేక పోయింది"
 
-#: ../libgnome-desktop/gnome-rr-config.c:558
-msgid "Laptop"
-msgstr "ల్యాప్‌టాప్"
-
-#: ../libgnome-desktop/gnome-rr-config.c:713
+#: ../libgnome-desktop/gnome-rr-config.c:708
 #, c-format
 msgid ""
 "none of the saved display configurations matched the active configuration"
 msgstr "దాయబడిన ప్రదర్శన ఆకృతీకరణలు క్రియాశీల ఆకృతీకరణతో సరిపోలలేదు"
 
-#: ../libgnome-desktop/gnome-rr-config.c:1469
+#: ../libgnome-desktop/gnome-rr-config.c:1464
 #, c-format
 msgid "CRTC %d cannot drive output %s"
 msgstr "CRTC %d %s అవుట్ పుట్ ని ఇవ్వలేకపోతుంది "
 
-#: ../libgnome-desktop/gnome-rr-config.c:1476
+#: ../libgnome-desktop/gnome-rr-config.c:1471
 #, c-format
 msgid "output %s does not support mode %dx%d@%dHz"
 msgstr "అవుట్ పుట్ %s %dx%d@%dHz రీతిని సహకరించదు"
 
-#: ../libgnome-desktop/gnome-rr-config.c:1487
+#: ../libgnome-desktop/gnome-rr-config.c:1482
 #, c-format
 msgid "CRTC %d does not support rotation=%s"
 msgstr "CRTC %d %s పరిభ్రమమును సహకరించదు"
 
-#: ../libgnome-desktop/gnome-rr-config.c:1501
+#: ../libgnome-desktop/gnome-rr-config.c:1496
 #, c-format
 msgid ""
 "output %s does not have the same parameters as another cloned output:\n"
@@ -123,23 +136,24 @@
 "ప్రస్తుతసమన్వయం  = (%d,%d), కొత్త సమన్వయం = (%d,%d)\n"
 "ప్రస్తుత భ్రమణం=%s, కొత్త భ్రమణం = %s"
 
-#: ../libgnome-desktop/gnome-rr-config.c:1516
+#: ../libgnome-desktop/gnome-rr-config.c:1511
 #, c-format
 msgid "cannot clone to output %s"
 msgstr "%s అవుట్‌పుట్‌కి క్లోన్ చేయలేకపోతున్నాము"
 
-#: ../libgnome-desktop/gnome-rr-config.c:1685
+#: ../libgnome-desktop/gnome-rr-config.c:1680
 #, c-format
 msgid "Trying modes for CRTC %d\n"
 msgstr "CRTC %d కి రీతులను ప్రయత్నిస్తునాం\n"
 
-#: ../libgnome-desktop/gnome-rr-config.c:1709
+#: ../libgnome-desktop/gnome-rr-config.c:1704
 #, c-format
 msgid "CRTC %d: trying mode %dx%d@%dHz with output at %dx%d@%dHz (pass %d)\n"
 msgstr ""
-"CRTC %d:  %dx%d@%dHz మోడ్ ను  %dx%d@%dHz అవుట్ పుట్ వద్ద ప్రయత్నిస్తున్నాము (పాస్ %d)\n"
+"CRTC %d:  %dx%d@%dHz మోడ్ ను  %dx%d@%dHz అవుట్ పుట్ వద్ద ప్రయత్నిస్తున్నాము "
+"(పాస్ %d)\n"
 
-#: ../libgnome-desktop/gnome-rr-config.c:1756
+#: ../libgnome-desktop/gnome-rr-config.c:1751
 #, c-format
 msgid ""
 "could not assign CRTCs to outputs:\n"
@@ -148,7 +162,7 @@
 "అవుట్‌పుట్లను CRTCల స్థానమివ్వలేనున్నాము:\n"
 "%s"
 
-#: ../libgnome-desktop/gnome-rr-config.c:1760
+#: ../libgnome-desktop/gnome-rr-config.c:1755
 #, c-format
 msgid ""
 "none of the selected modes were compatible with the possible modes:\n"
@@ -160,84 +174,108 @@
 #. Translators: the "requested", "minimum", and
 #. * "maximum" words here are not keywords; please
 #. * translate them as usual.
-#: ../libgnome-desktop/gnome-rr-config.c:1838
+#: ../libgnome-desktop/gnome-rr-config.c:1833
 #, c-format
 msgid ""
 "required virtual size does not fit available size: requested=(%d, %d), "
 "minimum=(%d, %d), maximum=(%d, %d)"
 msgstr ""
-"కావలిసిన వర్చ్యువల్ పరిమాణము అందుబాటులో వున్న పరిమాణముకు సరిపోదు: requested=(%d, %d), "
+"కావలిసిన వర్చ్యువల్ పరిమాణము అందుబాటులో వున్న పరిమాణముకు సరిపోదు: requested=(%"
+"d, %d), "
 "minimum=(%d, %d), maximum=(%d, %d)"
 
-#. Keep this string in sync with gnome-control-center/capplets/display/xrandr-capplet.c:get_display_name()
-#. Translators:  this is the feature where what you see on your
-#. * laptop's screen is the same as your external projector.
-#. * Here, "Mirrored" is being used as an adjective.  For example,
-#. * the Spanish translation could be "Pantallas en Espejo".
-#.
-#: ../libgnome-desktop/gnome-rr-labeler.c:381
-msgid "Mirrored Displays"
-msgstr "ప్రతిబింబించిన ప్రదర్శనలు"
-
 #. Translators: This is the time format with full date used
 #. in 24-hour mode.
-#: ../libgnome-desktop/gnome-wall-clock.c:238
-msgid "%a %b %e, %R:%S"
-msgstr "%a %b %e, %R:%S"
+#. The character between %R and %S is U+2236 RATIO
+#: ../libgnome-desktop/gnome-wall-clock.c:268
+#| msgid "%a %b %e, %R:%S"
+msgid "%a %b %e, %R∶%S"
+msgstr "%a %b %e, %R∶%S"
 
-#: ../libgnome-desktop/gnome-wall-clock.c:239
+#: ../libgnome-desktop/gnome-wall-clock.c:269
 msgid "%a %b %e, %R"
 msgstr "%a %b %e, %R"
 
 #. Translators: This is the time format with day used
 #. in 24-hour mode.
-#: ../libgnome-desktop/gnome-wall-clock.c:243
-msgid "%a %R:%S"
-msgstr "%a %R:%S"
+#. The character between %R and %S is U+2236 RATIO
+#: ../libgnome-desktop/gnome-wall-clock.c:274
+#| msgid "%a %R:%S"
+msgid "%a %R∶%S"
+msgstr "%a %R∶%S"
 
-#: ../libgnome-desktop/gnome-wall-clock.c:244
+#: ../libgnome-desktop/gnome-wall-clock.c:275
 msgid "%a %R"
 msgstr "%a %R"
 
 #. Translators: This is the time format without date used
 #. in 24-hour mode.
-#: ../libgnome-desktop/gnome-wall-clock.c:248
-msgid "%R:%S"
-msgstr "%R:%S"
+#. The character between %R and %S is U+2236 RATIO
+#: ../libgnome-desktop/gnome-wall-clock.c:280
+msgid "%R∶%S"
+msgstr "%R∶%S"
 
-#: ../libgnome-desktop/gnome-wall-clock.c:248
+#: ../libgnome-desktop/gnome-wall-clock.c:280
 msgid "%R"
 msgstr "%R"
 
 #. Translators: This is a time format with full date used
 #. for AM/PM.
-#: ../libgnome-desktop/gnome-wall-clock.c:254
-msgid "%a %b %e, %l:%M:%S %p"
-msgstr "%a %b %e, %l:%M:%S %p"
-
-#: ../libgnome-desktop/gnome-wall-clock.c:255
-msgid "%a %b %e, %l:%M %p"
-msgstr "%a %b %e, %l:%M %p"
+#. The Unicode characters are U+2236 RATIO and
+#. U+2009 THIN SPACE
+#: ../libgnome-desktop/gnome-wall-clock.c:288
+#| msgid "%a %b %e, %l:%M:%S %p"
+msgid "%a %b %e, %l∶%M∶%S %p"
+msgstr "%a %b %e, %l∶%M∶%S %p"
+
+#: ../libgnome-desktop/gnome-wall-clock.c:289
+#| msgid "%a %b %e, %l:%M %p"
+msgid "%a %b %e, %l∶%M %p"
+msgstr "%a %b %e, %l∶%M %p"
 
 #. Translators: This is a time format with day used
 #. for AM/PM.
-#: ../libgnome-desktop/gnome-wall-clock.c:259
-msgid "%a %l:%M:%S %p"
-msgstr "%a %l:%M:%S %p"
-
-#: ../libgnome-desktop/gnome-wall-clock.c:260
-msgid "%a %l:%M %p"
-msgstr "%a %l:%M %p"
+#. The Unicode characters are U+2236 RATIO and
+#. U+2009 THIN SPACE
+#: ../libgnome-desktop/gnome-wall-clock.c:295
+#| msgid "%a %l:%M:%S %p"
+msgid "%a %l∶%M∶%S %p"
+msgstr "%a %l∶%M∶%S %p"
+
+#: ../libgnome-desktop/gnome-wall-clock.c:296
+#| msgid "%a %l:%M %p"
+msgid "%a %l∶%M %p"
+msgstr "%a %l∶%M %p"
 
 #. Translators: This is a time format without date used
 #. for AM/PM.
-#: ../libgnome-desktop/gnome-wall-clock.c:264
-msgid "%l:%M:%S %p"
-msgstr "%l:%M:%S %p"
-
-#: ../libgnome-desktop/gnome-wall-clock.c:265
-msgid "%l:%M %p"
-msgstr "%l:%M %p"
+#. The Unicode characters are U+2236 RATIO and
+#. U+2009 THIN SPACE
+#: ../libgnome-desktop/gnome-wall-clock.c:302
+msgid "%l∶%M∶%S %p"
+msgstr "%l∶%M∶%S %p"
+
+#: ../libgnome-desktop/gnome-wall-clock.c:303
+msgid "%l∶%M %p"
+msgstr "%l∶%M %p"
+
+#~ msgid "Cannot find a terminal, using xterm, even if it may not work"
+#~ msgstr "xపదమును వుపయోగించి, టెర్మినల్‌ను కనుగొనలేదు, వుపయోగించినా పనిచేయక పోవచ్చు"
+
+#~ msgid "Laptop"
+#~ msgstr "ల్యాప్‌టాప్"
+
+#~ msgid "Mirrored Displays"
+#~ msgstr "ప్రతిబింబించిన ప్రదర్శనలు"
+
+#~ msgid "%R:%S"
+#~ msgstr "%R:%S"
+
+#~ msgid "%l:%M:%S %p"
+#~ msgstr "%l:%M:%S %p"
+
+#~ msgid "%l:%M %p"
+#~ msgstr "%l:%M %p"
 
 #~ msgid "Mirror Screens"
 #~ msgstr "మిర్రర్ తెరలు"
diff -Nru gnome-desktop3-3.12.0/po/tg.po gnome-desktop3-3.8.4/po/tg.po
--- gnome-desktop3-3.12.0/po/tg.po	2013-11-11 17:23:18.000000000 +0000
+++ gnome-desktop3-3.8.4/po/tg.po	1970-01-01 00:00:00.000000000 +0000
@@ -1,211 +0,0 @@
-# Tajik translation for gnome-desktop.
-# Copyright (C) 2013 gnome-desktop's COPYRIGHT HOLDER
-# This file is distributed under the same license as the gnome-desktop package.
-# Victor Ibragimov , 2013.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: gnome-desktop master\n"
-"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=gnome-"
-"desktop&keywords=I18N+L10N&component=general\n"
-"POT-Creation-Date: 2013-08-19 17:24+0000\n"
-"PO-Revision-Date: 2013-08-26 11:44+0500\n"
-"Last-Translator: Victor Ibragimov \n"
-"Language-Team: Tajik \n"
-"Language: tg\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"X-Generator: Poedit 1.5.7\n"
-
-#: ../libgnome-desktop/gnome-languages.c:804
-msgid "Unspecified"
-msgstr "Номуайян"
-
-#: ../libgnome-desktop/gnome-rr-config.c:789
-#, c-format
-msgid "CRTC %d cannot drive output %s"
-msgstr "CRTC %d хуруҷии %s-ро  ронда наметавонад"
-
-#: ../libgnome-desktop/gnome-rr-config.c:796
-#, c-format
-msgid "output %s does not support mode %dx%d@%dHz"
-msgstr "хуруҷии %s ҳолати %dx%d@%dHz-ро дастгирӣ карда наметавонад"
-
-#: ../libgnome-desktop/gnome-rr-config.c:807
-#, c-format
-#| msgid "CRTC %d does not support rotation=%s"
-msgid "CRTC %d does not support rotation=%d"
-msgstr "CRTC %d чархиши=%d -ро дастгирӣ карда наметавонад"
-
-#: ../libgnome-desktop/gnome-rr-config.c:820
-#, c-format
-#| msgid ""
-#| "output %s does not have the same parameters as another cloned output:\n"
-#| "existing mode = %d, new mode = %d\n"
-#| "existing coordinates = (%d, %d), new coordinates = (%d, %d)\n"
-#| "existing rotation = %s, new rotation = %s"
-msgid ""
-"output %s does not have the same parameters as another cloned output:\n"
-"existing mode = %d, new mode = %d\n"
-"existing coordinates = (%d, %d), new coordinates = (%d, %d)\n"
-"existing rotation = %d, new rotation = %d"
-msgstr ""
-"хуруҷии %s бо хуруҷии такроршудаи дигар параметри якхела надорад:\n"
-"ҳолати мавҷудбуда = %d, ҳолати нав = %d\n"
-"координатҳои мавҷудбуда = (%d, %d), координатҳои нав = (%d, %d)\n"
-"чархиши мавҷудбуда = %d, чархиши нав = %d"
-
-#: ../libgnome-desktop/gnome-rr-config.c:835
-#, c-format
-msgid "cannot clone to output %s"
-msgstr "ба хуруҷии %s клон намешавад"
-
-#: ../libgnome-desktop/gnome-rr-config.c:961
-#, c-format
-msgid "Trying modes for CRTC %d\n"
-msgstr "Кӯшиши ҳолатҳо барои CRTC %d\n"
-
-#: ../libgnome-desktop/gnome-rr-config.c:985
-#, c-format
-msgid "CRTC %d: trying mode %dx%d@%dHz with output at %dx%d@%dHz (pass %d)\n"
-msgstr ""
-"CRTC %d: ҳолати %dx%d@%dHz-ро бо хуруҷӣ дар %dx%d@%dHz (pass %d) кӯшиш "
-"мекунад\n"
-
-#: ../libgnome-desktop/gnome-rr-config.c:1032
-#, c-format
-msgid ""
-"could not assign CRTCs to outputs:\n"
-"%s"
-msgstr ""
-"CRTC­-ро барои хуруҷиҳо муайян карда наметавонад:\n"
-"%s"
-
-#: ../libgnome-desktop/gnome-rr-config.c:1036
-#, c-format
-msgid ""
-"none of the selected modes were compatible with the possible modes:\n"
-"%s"
-msgstr ""
-"ҳеҷ кадоми ҳолатҳои интихобшуда ба ҳолатҳои эҳтимолӣ мувофиқат намекунад:\n"
-"%s"
-
-#. Translators: the "requested", "minimum", and
-#. * "maximum" words here are not keywords; please
-#. * translate them as usual.
-#: ../libgnome-desktop/gnome-rr-config.c:1117
-#, c-format
-msgid ""
-"required virtual size does not fit available size: requested=(%d, %d), "
-"minimum=(%d, %d), maximum=(%d, %d)"
-msgstr ""
-"андозаи виртуалии дархостшуда бо андозаи дастрас мутобиқ нест: дархостшуда="
-"(%d, %d), ҳадди ақал=(%d, %d), ҳадди аксар=(%d, %d)"
-
-#. Translators: This is the time format with full date used
-#. in 24-hour mode.
-#: ../libgnome-desktop/gnome-wall-clock.c:270
-msgid "%a %b %e, %R:%S"
-msgstr "%a %b %e, %R:%S"
-
-#: ../libgnome-desktop/gnome-wall-clock.c:271
-msgid "%a %b %e, %R"
-msgstr "%a %b %e, %R"
-
-#. Translators: This is the time format with day used
-#. in 24-hour mode.
-#: ../libgnome-desktop/gnome-wall-clock.c:275
-msgid "%a %R:%S"
-msgstr "%a %R:%S"
-
-#: ../libgnome-desktop/gnome-wall-clock.c:276
-msgid "%a %R"
-msgstr "%a %R"
-
-#. Translators: This is the time format without date used
-#. in 24-hour mode.
-#: ../libgnome-desktop/gnome-wall-clock.c:280
-msgid "%R:%S"
-msgstr "%R:%S"
-
-#: ../libgnome-desktop/gnome-wall-clock.c:280
-msgid "%R"
-msgstr "%R"
-
-#. Translators: This is a time format with full date used
-#. for AM/PM.
-#: ../libgnome-desktop/gnome-wall-clock.c:286
-msgid "%a %b %e, %l:%M:%S %p"
-msgstr "%a %b %e, %l:%M:%S %p"
-
-#: ../libgnome-desktop/gnome-wall-clock.c:287
-msgid "%a %b %e, %l:%M %p"
-msgstr "%a %b %e, %l:%M %p"
-
-#. Translators: This is a time format with day used
-#. for AM/PM.
-#: ../libgnome-desktop/gnome-wall-clock.c:291
-msgid "%a %l:%M:%S %p"
-msgstr "%a %l:%M:%S %p"
-
-#: ../libgnome-desktop/gnome-wall-clock.c:292
-msgid "%a %l:%M %p"
-msgstr "%a %l:%M %p"
-
-#. Translators: This is a time format without date used
-#. for AM/PM.
-#: ../libgnome-desktop/gnome-wall-clock.c:296
-msgid "%l:%M:%S %p"
-msgstr "%l:%M:%S %p"
-
-#: ../libgnome-desktop/gnome-wall-clock.c:297
-msgid "%l:%M %p"
-msgstr "%l:%M %p"
-
-#~ msgctxt "Monitor vendor"
-#~ msgid "Unknown"
-#~ msgstr "Номаълум"
-
-#~ msgid "could not get the screen resources (CRTCs, outputs, modes)"
-#~ msgstr "Манобеи экран (назоратчии CRT, хуруҷиҳо, ҳолатҳо) дарёфт нашуд"
-
-#~ msgid "unhandled X error while getting the range of screen sizes"
-#~ msgstr "Хатои X-и идоранашванда ҳангоми дарёфти маҳдудаи андозаҳои экран"
-
-#~ msgid "could not get the range of screen sizes"
-#~ msgstr "маҳдудаи андозаҳои экран дарёфт нашуд"
-
-#~ msgid "RANDR extension is not present"
-#~ msgstr "Густариши RANDR вуҷуд надорад"
-
-#~ msgid "could not get information about output %d"
-#~ msgstr "Иттилоот дар бораи хуруҷии %d дарёфт нашуд"
-
-#~ msgid "Built-in Display"
-#~ msgstr "Дисплейи дарунсохт"
-
-#~ msgid "%s Display"
-#~ msgstr "Дисплейи %s"
-
-#~ msgid "Unknown Display"
-#~ msgstr "Дисплейи номаълум"
-
-#~ msgid ""
-#~ "requested position/size for CRTC %d is outside the allowed limit: "
-#~ "position=(%d, %d), size=(%d, %d), maximum=(%d, %d)"
-#~ msgstr ""
-#~ "мавқеият/андоза барои CRTC %d брун аз меъёри иҷозатшуда аст: мавқеият="
-#~ "(%d, %d), андоза=(%d, %d), ҳадди аксар=(%d, %d)"
-
-#~ msgid "could not set the configuration for CRTC %d"
-#~ msgstr "конфигуратсия барои CRTC %d танзим нашуд"
-
-#~ msgid "could not get information about CRTC %d"
-#~ msgstr "иттилоот дар бораи CRTC %d-ро дарёфт карда натавонист"
-
-#~ msgid ""
-#~ "none of the saved display configurations matched the active configuration"
-#~ msgstr ""
-#~ "ҳеҷ кадоми конфигуратсияҳои дисплейҳои захирашуда бо конфигуратсияи фаъол "
-#~ "мутобиқат накард"
diff -Nru gnome-desktop3-3.12.0/po/th.po gnome-desktop3-3.8.4/po/th.po
--- gnome-desktop3-3.12.0/po/th.po	2013-11-11 17:23:18.000000000 +0000
+++ gnome-desktop3-3.8.4/po/th.po	2013-01-17 13:48:35.000000000 +0000
@@ -3,70 +3,135 @@
 # This file is distributed under the same license as the gnome-desktop package.
 # Paisa Seeluangsawat , 2003, 2004.
 # Theppitak Karoonboonyanan  2005-2012.
-# Akom Chotiphantawanon , 2013.
 #
 msgid ""
 msgstr ""
 "Project-Id-Version: gnome-desktop\n"
 "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=gnome-"
 "desktop&keywords=I18N+L10N&component=general\n"
-"POT-Creation-Date: 2013-10-11 12:59+0000\n"
-"PO-Revision-Date: 2013-10-14 21:45+0700\n"
-"Last-Translator: Akom Chotiphantawanon \n"
+"POT-Creation-Date: 2012-09-03 19:06+0000\n"
+"PO-Revision-Date: 2012-09-07 15:21+0700\n"
+"Last-Translator: Theppitak Karoonboonyanan \n"
 "Language-Team: Thai \n"
 "Language: th\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: ../libgnome-desktop/gnome-languages.c:718
-msgid "Unspecified"
-msgstr "ไม่ระบุ"
+#. Translators: "Unknown" here is used to identify a monitor for which
+#. * we don't know the vendor. When a vendor is known, the name of the
+#. * vendor is used.
+#: ../libgnome-desktop/display-name.c:91
+msgctxt "Monitor vendor"
+msgid "Unknown"
+msgstr "ไม่ทราบ"
 
-#: ../libgnome-desktop/gnome-rr-config.c:743
+#: ../libgnome-desktop/gnome-desktop-utils.c:134
+msgid "Cannot find a terminal, using xterm, even if it may not work"
+msgstr "ไม่พบเทอร์มินัล จะใช้ xterm แม้อาจไม่ได้ผล"
+
+#. Translators: a CRTC is a CRT Controller (this is X terminology).
+#: ../libgnome-desktop/gnome-rr.c:452
+#, c-format
+msgid "could not get the screen resources (CRTCs, outputs, modes)"
+msgstr "ไม่สามารถอ่านค่าทรัพยากรของหน้าจอ (CRTC, เอาต์พุต, โหมด)"
+
+#: ../libgnome-desktop/gnome-rr.c:472
+#, c-format
+msgid "unhandled X error while getting the range of screen sizes"
+msgstr "เกิดข้อผิดพลาดของ X ที่ไม่ได้เตรียมรับมือไว้ขณะอ่านค่าช่วงของขนาดหน้าจอ"
+
+#: ../libgnome-desktop/gnome-rr.c:478
+#, c-format
+msgid "could not get the range of screen sizes"
+msgstr "ไม่สามารถอ่านค่าช่วงของขนาดหน้าจอ"
+
+#: ../libgnome-desktop/gnome-rr.c:769
+#, c-format
+msgid "RANDR extension is not present"
+msgstr "ไม่มีส่วนขยาย RANDR"
+
+#: ../libgnome-desktop/gnome-rr.c:1570
+#, c-format
+msgid "could not get information about output %d"
+msgstr "ไม่สามารถอ่านข้อมูลเกี่ยวกับเอาต์พุต %d"
+
+#. Translators: the "position", "size", and "maximum"
+#. * words here are not keywords; please translate them
+#. * as usual.  A CRTC is a CRT Controller (this is X terminology)
+#: ../libgnome-desktop/gnome-rr.c:2163
+#, c-format
+msgid ""
+"requested position/size for CRTC %d is outside the allowed limit: position="
+"(%d, %d), size=(%d, %d), maximum=(%d, %d)"
+msgstr ""
+"ตำแหน่ง/ขนาดสำหรับ CRTC %d ที่ร้องขอ มีค่าอยู่นอกขีดจำกัดที่กำหนด: ตำแหน่ง=(%d, %d), ขนาด="
+"(%d, %d), ค่าสูงสุด=(%d, %d)"
+
+#: ../libgnome-desktop/gnome-rr.c:2199
+#, c-format
+msgid "could not set the configuration for CRTC %d"
+msgstr "ไม่สามารถกำหนดค่าสำหรับ CRTC %d"
+
+#: ../libgnome-desktop/gnome-rr.c:2344
+#, c-format
+msgid "could not get information about CRTC %d"
+msgstr "ไม่สามารถอ่านข้อมูลเกี่ยวกับ CRTC %d"
+
+#: ../libgnome-desktop/gnome-rr-config.c:558
+msgid "Laptop"
+msgstr "แล็ปท็อป"
+
+#: ../libgnome-desktop/gnome-rr-config.c:713
+#, c-format
+msgid ""
+"none of the saved display configurations matched the active configuration"
+msgstr "ไม่มีค่าตั้งดิสเพลย์ที่บันทึกไว้รายการใดที่ตรงกับค่าตั้งที่ใช้งานอยู่"
+
+#: ../libgnome-desktop/gnome-rr-config.c:1469
 #, c-format
 msgid "CRTC %d cannot drive output %s"
 msgstr "CRTC %d ไม่สามารถสั่งการอุปกรณ์แสดงผล %s ได้"
 
-#: ../libgnome-desktop/gnome-rr-config.c:750
+#: ../libgnome-desktop/gnome-rr-config.c:1476
 #, c-format
 msgid "output %s does not support mode %dx%d@%dHz"
 msgstr "อุปกรณ์แสดงผล %s ไม่รองรับโหมด %dx%d@%dHz"
 
-#: ../libgnome-desktop/gnome-rr-config.c:761
+#: ../libgnome-desktop/gnome-rr-config.c:1487
 #, c-format
-msgid "CRTC %d does not support rotation=%d"
-msgstr "CTRC %d ไม่รองรับมุมหมุน=%d"
+msgid "CRTC %d does not support rotation=%s"
+msgstr "CTRC %d ไม่รองรับมุมหมุน=%s"
 
-#: ../libgnome-desktop/gnome-rr-config.c:774
+#: ../libgnome-desktop/gnome-rr-config.c:1501
 #, c-format
 msgid ""
 "output %s does not have the same parameters as another cloned output:\n"
 "existing mode = %d, new mode = %d\n"
 "existing coordinates = (%d, %d), new coordinates = (%d, %d)\n"
-"existing rotation = %d, new rotation = %d"
+"existing rotation = %s, new rotation = %s"
 msgstr ""
 "อุปกรณ์แสดงผล %s มีพารามิเตอร์ไม่ตรงกับอุปกรณ์แสดงผลอีกอันที่ผลิตซ้ำออกไป:\n"
 "โหมดเดิม = %d, โหมดใหม่ = %d\n"
 "พิกัดเดิม = (%d, %d), พิกัดใหม่ = (%d, %d)\n"
-"มุมหมุนเดิม = %d, มุมหมุนใหม่ = %d"
+"มุมหมุนเดิม = %s, มุมหมุนใหม่ = %s"
 
-#: ../libgnome-desktop/gnome-rr-config.c:789
+#: ../libgnome-desktop/gnome-rr-config.c:1516
 #, c-format
 msgid "cannot clone to output %s"
 msgstr "ไม่สามารถผลิตซ้ำอุปกรณ์แสดงผล %s"
 
-#: ../libgnome-desktop/gnome-rr-config.c:915
+#: ../libgnome-desktop/gnome-rr-config.c:1685
 #, c-format
 msgid "Trying modes for CRTC %d\n"
 msgstr "กำลังลองโหมดต่างๆ สำหรับ CRTC %d\n"
 
-#: ../libgnome-desktop/gnome-rr-config.c:939
+#: ../libgnome-desktop/gnome-rr-config.c:1709
 #, c-format
 msgid "CRTC %d: trying mode %dx%d@%dHz with output at %dx%d@%dHz (pass %d)\n"
 msgstr "CRTC %d: กำลังลองใช้โหมด %dx%d@%dHz โดยแสดงผลที่ %dx%d@%dHz (รอบที่ %d)\n"
 
-#: ../libgnome-desktop/gnome-rr-config.c:986
+#: ../libgnome-desktop/gnome-rr-config.c:1756
 #, c-format
 msgid ""
 "could not assign CRTCs to outputs:\n"
@@ -75,7 +140,7 @@
 "ไม่สามารถกำหนด CRTC ให้กับอุปกรณ์แสดงผล:\n"
 "%s"
 
-#: ../libgnome-desktop/gnome-rr-config.c:990
+#: ../libgnome-desktop/gnome-rr-config.c:1760
 #, c-format
 msgid ""
 "none of the selected modes were compatible with the possible modes:\n"
@@ -87,7 +152,7 @@
 #. Translators: the "requested", "minimum", and
 #. * "maximum" words here are not keywords; please
 #. * translate them as usual.
-#: ../libgnome-desktop/gnome-rr-config.c:1071
+#: ../libgnome-desktop/gnome-rr-config.c:1838
 #, c-format
 msgid ""
 "required virtual size does not fit available size: requested=(%d, %d), "
@@ -96,111 +161,76 @@
 "ขนาดเสมือนที่ต้องการไม่เข้ากับขนาดที่มี: ที่ร้องขอ=(%d, %d), ค่าต่ำสุด=(%d, %d), ค่าสูงสุด=(%d, "
 "%d)"
 
+#. Keep this string in sync with gnome-control-center/capplets/display/xrandr-capplet.c:get_display_name()
+#. Translators:  this is the feature where what you see on your
+#. * laptop's screen is the same as your external projector.
+#. * Here, "Mirrored" is being used as an adjective.  For example,
+#. * the Spanish translation could be "Pantallas en Espejo".
+#.
+#: ../libgnome-desktop/gnome-rr-labeler.c:381
+msgid "Mirrored Displays"
+msgstr "จอแสดงผลแสดงเหมือนกัน"
+
 #. Translators: This is the time format with full date used
 #. in 24-hour mode.
-#: ../libgnome-desktop/gnome-wall-clock.c:270
+#: ../libgnome-desktop/gnome-wall-clock.c:238
 msgid "%a %b %e, %R:%S"
 msgstr "%a %d %b, %R:%S"
 
-#: ../libgnome-desktop/gnome-wall-clock.c:271
+#: ../libgnome-desktop/gnome-wall-clock.c:239
 msgid "%a %b %e, %R"
 msgstr "%a %d %b, %R"
 
 #. Translators: This is the time format with day used
 #. in 24-hour mode.
-#: ../libgnome-desktop/gnome-wall-clock.c:275
+#: ../libgnome-desktop/gnome-wall-clock.c:243
 msgid "%a %R:%S"
 msgstr "%a %R:%S"
 
-#: ../libgnome-desktop/gnome-wall-clock.c:276
+#: ../libgnome-desktop/gnome-wall-clock.c:244
 msgid "%a %R"
 msgstr "%a %R"
 
 #. Translators: This is the time format without date used
 #. in 24-hour mode.
-#: ../libgnome-desktop/gnome-wall-clock.c:280
+#: ../libgnome-desktop/gnome-wall-clock.c:248
 msgid "%R:%S"
 msgstr "%R:%S"
 
-#: ../libgnome-desktop/gnome-wall-clock.c:280
+#: ../libgnome-desktop/gnome-wall-clock.c:248
 msgid "%R"
 msgstr "%R"
 
 #. Translators: This is a time format with full date used
 #. for AM/PM.
-#: ../libgnome-desktop/gnome-wall-clock.c:286
+#: ../libgnome-desktop/gnome-wall-clock.c:254
 msgid "%a %b %e, %l:%M:%S %p"
 msgstr "%a %d %b, %l:%M:%S %p"
 
-#: ../libgnome-desktop/gnome-wall-clock.c:287
+#: ../libgnome-desktop/gnome-wall-clock.c:255
 msgid "%a %b %e, %l:%M %p"
 msgstr "%a %d %b, %l:%M %p"
 
 #. Translators: This is a time format with day used
 #. for AM/PM.
-#: ../libgnome-desktop/gnome-wall-clock.c:291
+#: ../libgnome-desktop/gnome-wall-clock.c:259
 msgid "%a %l:%M:%S %p"
 msgstr "%a %l:%M:%S %p"
 
-#: ../libgnome-desktop/gnome-wall-clock.c:292
+#: ../libgnome-desktop/gnome-wall-clock.c:260
 msgid "%a %l:%M %p"
 msgstr "%a %l:%M %p"
 
 #. Translators: This is a time format without date used
 #. for AM/PM.
-#: ../libgnome-desktop/gnome-wall-clock.c:296
+#: ../libgnome-desktop/gnome-wall-clock.c:264
 msgid "%l:%M:%S %p"
 msgstr "%l:%M:%S %p"
 
-#: ../libgnome-desktop/gnome-wall-clock.c:297
+#: ../libgnome-desktop/gnome-wall-clock.c:265
 msgid "%l:%M %p"
 msgstr "%l:%M %p"
 
-#~ msgctxt "Monitor vendor"
-#~ msgid "Unknown"
-#~ msgstr "ไม่ทราบ"
-
-#~ msgid "Cannot find a terminal, using xterm, even if it may not work"
-#~ msgstr "ไม่พบเทอร์มินัล จะใช้ xterm แม้อาจไม่ได้ผล"
-
-#~ msgid "could not get the screen resources (CRTCs, outputs, modes)"
-#~ msgstr "ไม่สามารถอ่านค่าทรัพยากรของหน้าจอ (CRTC, เอาต์พุต, โหมด)"
-
-#~ msgid "unhandled X error while getting the range of screen sizes"
-#~ msgstr "เกิดข้อผิดพลาดของ X ที่ไม่ได้เตรียมรับมือไว้ขณะอ่านค่าช่วงของขนาดหน้าจอ"
-
-#~ msgid "could not get the range of screen sizes"
-#~ msgstr "ไม่สามารถอ่านค่าช่วงของขนาดหน้าจอ"
-
-#~ msgid "RANDR extension is not present"
-#~ msgstr "ไม่มีส่วนขยาย RANDR"
-
-#~ msgid "could not get information about output %d"
-#~ msgstr "ไม่สามารถอ่านข้อมูลเกี่ยวกับเอาต์พุต %d"
-
-#~ msgid ""
-#~ "requested position/size for CRTC %d is outside the allowed limit: "
-#~ "position=(%d, %d), size=(%d, %d), maximum=(%d, %d)"
-#~ msgstr ""
-#~ "ตำแหน่ง/ขนาดสำหรับ CRTC %d ที่ร้องขอ มีค่าอยู่นอกขีดจำกัดที่กำหนด: ตำแหน่ง=(%d, %d), "
-#~ "ขนาด=(%d, %d), ค่าสูงสุด=(%d, %d)"
-
-#~ msgid "could not set the configuration for CRTC %d"
-#~ msgstr "ไม่สามารถกำหนดค่าสำหรับ CRTC %d"
-
-#~ msgid "could not get information about CRTC %d"
-#~ msgstr "ไม่สามารถอ่านข้อมูลเกี่ยวกับ CRTC %d"
-
-#~ msgid "Laptop"
-#~ msgstr "แล็ปท็อป"
-
-#~ msgid ""
-#~ "none of the saved display configurations matched the active configuration"
-#~ msgstr "ไม่มีค่าตั้งดิสเพลย์ที่บันทึกไว้รายการใดที่ตรงกับค่าตั้งที่ใช้งานอยู่"
-
-#~ msgid "Mirrored Displays"
-#~ msgstr "จอแสดงผลแสดงเหมือนกัน"
-
 #~ msgid "About GNOME"
 #~ msgstr "เกี่ยวกับ GNOME"
 
diff -Nru gnome-desktop3-3.12.0/po/tr.po gnome-desktop3-3.8.4/po/tr.po
--- gnome-desktop3-3.12.0/po/tr.po	2013-11-11 17:23:18.000000000 +0000
+++ gnome-desktop3-3.8.4/po/tr.po	2012-05-09 17:13:31.000000000 +0000
@@ -4,81 +4,139 @@
 # Fatih Demir , 2000.
 # Görkem Çetin , 2002/2003.
 # Baris Cicek , 2004, 2008, 2009.
-# Osman Karagöz , 2013.
-# Gökhan Gurbetoğlu , 2013.
-# Muhammet Kara , 2011, 2013.
+# Muhammet Kara , 2011.
 #
 msgid ""
 msgstr ""
 "Project-Id-Version: gnome-desktop\n"
 "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=gnome-"
-"desktop&keywords=I18N+L10N&component=general\n"
-"POT-Creation-Date: 2013-09-29 17:15+0000\n"
-"PO-Revision-Date: 2013-09-29 20:20+0300\n"
-"Last-Translator: Muhammet Kara \n"
-"Language-Team: Türkçe \n"
-"Language: tr\n"
+"desktop&component=general\n"
+"POT-Creation-Date: 2010-11-27 02:14+0000\n"
+"PO-Revision-Date: 2011-06-25 18:18+0300\n"
+"Last-Translator: Muhammet Kara \n"
+"Language-Team: Turkish \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
-"X-Generator: Gtranslator 2.91.6\n"
 
-#: ../libgnome-desktop/gnome-languages.c:804
-msgid "Unspecified"
-msgstr "Belirtilmemiş"
+#. Translators: "Unknown" here is used to identify a monitor for which
+#. * we don't know the vendor. When a vendor is known, the name of the
+#. * vendor is used.
+#: ../libgnome-desktop/display-name.c:265
+#| msgid "Unknown"
+msgctxt "Monitor vendor"
+msgid "Unknown"
+msgstr "Bilinmeyen"
+
+#: ../libgnome-desktop/gnome-desktop-utils.c:133
+msgid "Cannot find a terminal, using xterm, even if it may not work"
+msgstr "Terminal bulunamadı.Çalışmıyor olsa bile xterm kullanılıyor."
+
+#. Translators: a CRTC is a CRT Controller (this is X terminology).
+#: ../libgnome-desktop/gnome-rr.c:444
+#, c-format
+msgid "could not get the screen resources (CRTCs, outputs, modes)"
+msgstr "Ekran kaynakları alınamadı(CRTC'ler, çıkışlar, kipler)"
+
+#: ../libgnome-desktop/gnome-rr.c:464
+#, c-format
+msgid "unhandled X error while getting the range of screen sizes"
+msgstr ""
+"Ekran boyutlarının aralığı alınırken idare edilemeyen bir X hatası oluştu"
+
+#: ../libgnome-desktop/gnome-rr.c:470
+#, c-format
+msgid "could not get the range of screen sizes"
+msgstr "Ekran boyutlarının aralığı alınamadı"
+
+#: ../libgnome-desktop/gnome-rr.c:714
+#, c-format
+msgid "RANDR extension is not present"
+msgstr "RANDR uzantısı mevcut değil"
+
+#: ../libgnome-desktop/gnome-rr.c:1090
+#, c-format
+msgid "could not get information about output %d"
+msgstr "Çıktı hakkında bilgi alınamadı %d"
+
+#. Translators: the "position", "size", and "maximum"
+#. * words here are not keywords; please translate them
+#. * as usual.  A CRTC is a CRT Controller (this is X terminology)
+#: ../libgnome-desktop/gnome-rr.c:1477
+#, c-format
+msgid ""
+"requested position/size for CRTC %d is outside the allowed limit: position="
+"(%d, %d), size=(%d, %d), maximum=(%d, %d)"
+msgstr ""
+"CRTC %d için istenilen konum/boyut izin verilen limitlerin dışında: pozisyon="
+"(%d, %d), boyut=(%d, %d), en fazla=(%d, %d)"
 
-#: ../libgnome-desktop/gnome-rr-config.c:743
+#: ../libgnome-desktop/gnome-rr.c:1513
+#, c-format
+msgid "could not set the configuration for CRTC %d"
+msgstr "CRTC %d için yapılandırma ayarları tanımlanamadı"
+
+#: ../libgnome-desktop/gnome-rr.c:1629
+#, c-format
+msgid "could not get information about CRTC %d"
+msgstr "CRTC %d hakkında bilgi alınamadı"
+
+#: ../libgnome-desktop/gnome-rr-config.c:501
+msgid "Laptop"
+msgstr "Dizüstü"
+
+#: ../libgnome-desktop/gnome-rr-config.c:1227
+#, c-format
+msgid ""
+"none of the saved display configurations matched the active configuration"
+msgstr "Hiçbir kayıtlı ekran yapılandırması aktif yapılandırma ile eşleşmiyor"
+
+#: ../libgnome-desktop/gnome-rr-config.c:1489
 #, c-format
 msgid "CRTC %d cannot drive output %s"
 msgstr "CRTC %d, %s çıktısını kullanamıyor"
 
-#: ../libgnome-desktop/gnome-rr-config.c:750
+#: ../libgnome-desktop/gnome-rr-config.c:1496
 #, c-format
 msgid "output %s does not support mode %dx%d@%dHz"
 msgstr "%s çıktısı, %dx%d@%dHz kipini desteklemiyor"
 
-#: ../libgnome-desktop/gnome-rr-config.c:761
+#: ../libgnome-desktop/gnome-rr-config.c:1507
+#, c-format
+msgid "CRTC %d does not support rotation=%s"
+msgstr "CRTC %d, rotasyon=%s özelliğini desteklemiyor"
+
+#: ../libgnome-desktop/gnome-rr-config.c:1521
 #, c-format
-#| msgid "CRTC %d does not support rotation=%s"
-msgid "CRTC %d does not support rotation=%d"
-msgstr "CRTC %d, rotasyon=%d özelliğini desteklemiyor"
-
-#: ../libgnome-desktop/gnome-rr-config.c:774
-#, c-format
-#| msgid ""
-#| "output %s does not have the same parameters as another cloned output:\n"
-#| "existing mode = %d, new mode = %d\n"
-#| "existing coordinates = (%d, %d), new coordinates = (%d, %d)\n"
-#| "existing rotation = %s, new rotation = %s"
 msgid ""
 "output %s does not have the same parameters as another cloned output:\n"
 "existing mode = %d, new mode = %d\n"
 "existing coordinates = (%d, %d), new coordinates = (%d, %d)\n"
-"existing rotation = %d, new rotation = %d"
+"existing rotation = %s, new rotation = %s"
 msgstr ""
-"%s çıktısı, birebir kopyalanmış başka bir çıktıyla aynı değiştirgelere sahip "
+"%s çıktısı, birebir kopyalanmış başka bir çıktıyla aynı parametrelere sahip "
 "değil:\n"
 "geçerli kip = %d, yeni kip = %d\n"
 "geçerli koordinatlar = (%d, %d), yeni koordinatlar = (%d, %d)\n"
-"geçerli rotasyon = %d, yeni rotasyon = %d"
+"geçerli rotasyon = %s, yeni rotasyon = %s"
 
-#: ../libgnome-desktop/gnome-rr-config.c:789
+#: ../libgnome-desktop/gnome-rr-config.c:1536
 #, c-format
 msgid "cannot clone to output %s"
 msgstr "%s çıktısına birebir kopyalama yapılamıyor"
 
-#: ../libgnome-desktop/gnome-rr-config.c:915
+#: ../libgnome-desktop/gnome-rr-config.c:1705
 #, c-format
 msgid "Trying modes for CRTC %d\n"
 msgstr "CRTC %d kipleri deneniyor\n"
 
-#: ../libgnome-desktop/gnome-rr-config.c:939
+#: ../libgnome-desktop/gnome-rr-config.c:1729
 #, c-format
 msgid "CRTC %d: trying mode %dx%d@%dHz with output at %dx%d@%dHz (pass %d)\n"
 msgstr "CRTC %d: %dx%d@%dHz kipi, %dx%d@%dHz çıkışıyla (pass %d) deneniyor\n"
 
-#: ../libgnome-desktop/gnome-rr-config.c:986
+#: ../libgnome-desktop/gnome-rr-config.c:1776
 #, c-format
 msgid ""
 "could not assign CRTCs to outputs:\n"
@@ -87,7 +145,7 @@
 "CRTC'ler çıktılara atanamadı:\n"
 "%s"
 
-#: ../libgnome-desktop/gnome-rr-config.c:990
+#: ../libgnome-desktop/gnome-rr-config.c:1780
 #, c-format
 msgid ""
 "none of the selected modes were compatible with the possible modes:\n"
@@ -99,7 +157,7 @@
 #. Translators: the "requested", "minimum", and
 #. * "maximum" words here are not keywords; please
 #. * translate them as usual.
-#: ../libgnome-desktop/gnome-rr-config.c:1071
+#: ../libgnome-desktop/gnome-rr-config.c:1862
 #, c-format
 msgid ""
 "required virtual size does not fit available size: requested=(%d, %d), "
@@ -108,139 +166,55 @@
 "Gerekli sanal boyut mevcut boyuta uymuyor: istenilen=(%d, %d), en az=(%d, "
 "%d), en fazla=(%d, %d)"
 
-#. Translators: This is the time format with full date used
+#. Keep this string in sync with gnome-control-center/capplets/display/xrandr-capplet.c:get_display_name()
+#. Translators:  this is the feature where what you see on your laptop's
+#. * screen is the same as your external monitor.  Here, "Mirror" is being
+#. * used as an adjective, not as a verb.  For example, the Spanish
+#. * translation could be "Pantallas en Espejo", *not* "Espejar Pantallas".
+#.
+#: ../libgnome-desktop/gnome-rr-labeler.c:336
+msgid "Mirror Screens"
+msgstr "Yansı Ekranlar"
+
+#. Translators: This is the time format with date used
 #. in 24-hour mode.
-#: ../libgnome-desktop/gnome-wall-clock.c:270
-#| msgid "%a %b %e, %R"
+#: ../js/ui/dateMenu.js:164
 msgid "%a %b %e, %R:%S"
-msgstr "%e %b %a, %R:%S"
+msgstr "%a %b %e, %R:%S"
 
-#: ../libgnome-desktop/gnome-wall-clock.c:271
+#: ../js/ui/dateMenu.js:165
 msgid "%a %b %e, %R"
-msgstr "%e %b %a, %R"
+msgstr "%a %b %e, %R"
 
-#. Translators: This is the time format with day used
+#. Translators: This is the time format without date used
 #. in 24-hour mode.
-#: ../libgnome-desktop/gnome-wall-clock.c:275
-#| msgid "%a %R∶%S"
+#: ../js/ui/dateMenu.js:169
 msgid "%a %R:%S"
-msgstr "%a %R∶%S"
+msgstr "%a %R:%S"
 
-#: ../libgnome-desktop/gnome-wall-clock.c:276
+#: ../js/ui/dateMenu.js:170
 msgid "%a %R"
 msgstr "%a %R"
 
-#. Translators: This is the time format without date used
-#. in 24-hour mode.
-#: ../libgnome-desktop/gnome-wall-clock.c:280
-msgid "%R:%S"
-msgstr "%R:%S"
-
-#: ../libgnome-desktop/gnome-wall-clock.c:280
-msgid "%R"
-msgstr "%R"
-
-#. Translators: This is a time format with full date used
+#. Translators: This is a time format with date used
 #. for AM/PM.
-#: ../libgnome-desktop/gnome-wall-clock.c:286
-#| msgid "%a %b %e, %l∶%M∶%S %p"
+#: ../js/ui/dateMenu.js:177
 msgid "%a %b %e, %l:%M:%S %p"
-msgstr "%e %b %a, %l∶%M∶%S %p"
+msgstr "%a %b %e, %l:%M:%S %p"
 
-#: ../libgnome-desktop/gnome-wall-clock.c:287
-#| msgid "%a %b %e, %l∶%M %p"
+#: ../js/ui/dateMenu.js:178
 msgid "%a %b %e, %l:%M %p"
-msgstr "%e %b %a, %l∶%M %p"
+msgstr "%a %b %e, %l:%M %p"
 
-#. Translators: This is a time format with day used
+#. Translators: This is a time format without date used
 #. for AM/PM.
-#: ../libgnome-desktop/gnome-wall-clock.c:291
-#| msgid "%a %l∶%M∶%S %p"
+#: ../js/ui/dateMenu.js:182
 msgid "%a %l:%M:%S %p"
-msgstr "%a %l∶%M∶%S %p"
+msgstr "%a %l:%M:%S %p"
 
-#: ../libgnome-desktop/gnome-wall-clock.c:292
-#| msgid "%a %l∶%M %p"
+#: ../js/ui/dateMenu.js:183
 msgid "%a %l:%M %p"
-msgstr "%a %l∶%M %p"
-
-#. Translators: This is a time format without date used
-#. for AM/PM.
-#: ../libgnome-desktop/gnome-wall-clock.c:296
-msgid "%l:%M:%S %p"
-msgstr "%l:%M:%S %p"
-
-#: ../libgnome-desktop/gnome-wall-clock.c:297
-msgid "%l:%M %p"
-msgstr "%l:%M %p"
-
-#~ msgctxt "Monitor vendor"
-#~ msgid "Unknown"
-#~ msgstr "Bilinmeyen"
-
-#~ msgid "could not get the screen resources (CRTCs, outputs, modes)"
-#~ msgstr "Ekran kaynakları alınamadı(CRTC'ler, çıkışlar, kipler)"
-
-#~ msgid "unhandled X error while getting the range of screen sizes"
-#~ msgstr ""
-#~ "Ekran boyutlarının aralığı alınırken idare edilemeyen bir X hatası oluştu"
-
-#~ msgid "could not get the range of screen sizes"
-#~ msgstr "Ekran boyutlarının aralığı alınamadı"
-
-#~ msgid "RANDR extension is not present"
-#~ msgstr "RANDR uzantısı mevcut değil"
-
-#~ msgid "could not get information about output %d"
-#~ msgstr "Çıktı hakkında bilgi alınamadı %d"
-
-#~ msgid "Built-in Display"
-#~ msgstr "Dahili Ekran"
-
-#~ msgid "%s Display"
-#~ msgstr "%s Ekran"
-
-#~ msgid "Unknown Display"
-#~ msgstr "Bilinmeyen Ekran"
-
-#~ msgid ""
-#~ "requested position/size for CRTC %d is outside the allowed limit: "
-#~ "position=(%d, %d), size=(%d, %d), maximum=(%d, %d)"
-#~ msgstr ""
-#~ "CRTC %d için istenilen konum/boyut izin verilen limitlerin dışında: "
-#~ "pozisyon=(%d, %d), boyut=(%d, %d), en fazla=(%d, %d)"
-
-#~ msgid "could not set the configuration for CRTC %d"
-#~ msgstr "CRTC %d için yapılandırma ayarları tanımlanamadı"
-
-#~ msgid "could not get information about CRTC %d"
-#~ msgstr "CRTC %d hakkında bilgi alınamadı"
-
-#~ msgid ""
-#~ "none of the saved display configurations matched the active configuration"
-#~ msgstr ""
-#~ "Hiçbir kayıtlı ekran yapılandırması aktif yapılandırma ile eşleşmiyor"
-
-#~ msgid "%a %b %e, %R∶%S"
-#~ msgstr "%e %b %a, %R∶%S"
-
-#~ msgid "%R∶%S"
-#~ msgstr "%R∶%S"
-
-#~ msgid "%l∶%M∶%S %p"
-#~ msgstr "%l∶%M∶%S %p"
-
-#~ msgid "%l∶%M %p"
-#~ msgstr "%l∶%M %p"
-
-#~ msgid "Cannot find a terminal, using xterm, even if it may not work"
-#~ msgstr "Terminal bulunamadı.Çalışmıyor olsa bile xterm kullanılıyor."
-
-#~ msgid "Laptop"
-#~ msgstr "Dizüstü"
-
-#~ msgid "Mirror Screens"
-#~ msgstr "Yansı Ekranlar"
+msgstr "%a %l:%M %p"
 
 #~ msgid "About GNOME"
 #~ msgstr "GNOME Hakkında"
diff -Nru gnome-desktop3-3.12.0/po/ug.po gnome-desktop3-3.8.4/po/ug.po
--- gnome-desktop3-3.12.0/po/ug.po	2013-11-11 17:23:18.000000000 +0000
+++ gnome-desktop3-3.8.4/po/ug.po	2013-09-04 11:15:57.000000000 +0000
@@ -8,8 +8,8 @@
 msgstr ""
 "Project-Id-Version: gnome-desktop HEAD\n"
 "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=gnome-desktop&keywords=I18N+L10N&component=general\n"
-"POT-Creation-Date: 2013-02-15 15:29+0000\n"
-"PO-Revision-Date: 2013-02-16 10:05+0900\n"
+"POT-Creation-Date: 2013-03-04 10:03+0000\n"
+"PO-Revision-Date: 2013-03-07 20:34+0900\n"
 "Last-Translator: Gheyret Kenji \n"
 "Language-Team: GNOME Uighur Translation Project \n"
 "Language: \n"
@@ -25,7 +25,7 @@
 msgid "Unknown"
 msgstr "نامەلۇم"
 
-#: ../libgnome-desktop/gnome-languages.c:761
+#: ../libgnome-desktop/gnome-languages.c:804
 msgid "Unspecified"
 msgstr "بەلگىلەنمىگەن"
 
@@ -56,8 +56,9 @@
 msgstr "%d  نىڭغا مۇناسىۋەتلىك ئۇچۇرغا ئېرىشەلمىدى"
 
 #: ../libgnome-desktop/gnome-rr.c:1764
-msgid "Laptop"
-msgstr "يان كومپيۇتېر"
+#| msgid "%s Display"
+msgid "Built-in Display"
+msgstr "ئۆزىدىكى كۆرسەتكۈچ"
 
 #. Translators: %s is the size of the monitor in inches
 #: ../libgnome-desktop/gnome-rr.c:1782
@@ -66,8 +67,6 @@
 msgstr "%s كۆرسەتكۈچ"
 
 #: ../libgnome-desktop/gnome-rr.c:1789
-#| msgctxt "Monitor vendor"
-#| msgid "Unknown"
 msgid "Unknown Display"
 msgstr "نامەلۇم كۆرسەتكۈچ"
 
@@ -234,6 +233,9 @@
 msgid "%l∶%M %p"
 msgstr "%l:%M %p"
 
+#~ msgid "Laptop"
+#~ msgstr "يان كومپيۇتېر"
+
 #~ msgid "Cannot find a terminal, using xterm, even if it may not work"
 #~ msgstr "تېرمىنال تېپىلمىدى، xterm ئىشلىتىدۇ، ئەمما ئۇمۇ ئىشلىمەسلىكى مۇمكىن"
 
diff -Nru gnome-desktop3-3.12.0/po/uk.po gnome-desktop3-3.8.4/po/uk.po
--- gnome-desktop3-3.12.0/po/uk.po	2014-01-07 13:28:18.000000000 +0000
+++ gnome-desktop3-3.8.4/po/uk.po	2013-01-17 13:48:35.000000000 +0000
@@ -3,73 +3,142 @@
 # Yuri Syrota , 1999-2002.
 # Maxim Dziumanenko , 2004-2009
 # Korostil Daniel , 2011.
-# Mykola Tkach , 2013.
-# Daniel Korostil , 2013.
+# Re. , 2012.
 msgid ""
 msgstr ""
 "Project-Id-Version: gnome-desktop\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-11-16 10:57+0200\n"
-"PO-Revision-Date: 2013-11-16 10:59+0300\n"
-"Last-Translator: Daniel Korostil \n"
+"POT-Creation-Date: 2012-09-26 09:18+0300\n"
+"PO-Revision-Date: 2012-09-26 09:05+0300\n"
+"Last-Translator: Re. \n"
 "Language-Team: linux.org.ua\n"
 "Language: uk\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"
+"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"
 "X-Generator: Virtaal 0.7.1\n"
 "X-Project-Style: gnome\n"
 
-#: ../libgnome-desktop/gnome-languages.c:718
-msgid "Unspecified"
-msgstr "Невизначений"
+#. Translators: "Unknown" here is used to identify a monitor for which
+#. * we don't know the vendor. When a vendor is known, the name of the
+#. * vendor is used.
+#: ../libgnome-desktop/display-name.c:91
+msgctxt "Monitor vendor"
+msgid "Unknown"
+msgstr "Невідомий"
 
-#: ../libgnome-desktop/gnome-rr-config.c:743
+#: ../libgnome-desktop/gnome-desktop-utils.c:134
+msgid "Cannot find a terminal, using xterm, even if it may not work"
+msgstr ""
+"Не вдалось знайти термінал, який використовує програма xterm, хоча й вона "
+"може не працювати"
+
+#. Translators: a CRTC is a CRT Controller (this is X terminology).
+#: ../libgnome-desktop/gnome-rr.c:452
+#, c-format
+msgid "could not get the screen resources (CRTCs, outputs, modes)"
+msgstr "не вдалось отримати доступ до ресурсів (CRTC, виходи, режими)"
+
+#: ../libgnome-desktop/gnome-rr.c:472
+#, c-format
+msgid "unhandled X error while getting the range of screen sizes"
+msgstr "при спробі отримання допустимих розмірів екрана виникла помилка"
+
+#: ../libgnome-desktop/gnome-rr.c:478
+#, c-format
+msgid "could not get the range of screen sizes"
+msgstr "не вдалось отримати допустимі розміри екрана"
+
+#: ../libgnome-desktop/gnome-rr.c:769
+#, c-format
+msgid "RANDR extension is not present"
+msgstr "Розширення RANDR не підтримується"
+
+#: ../libgnome-desktop/gnome-rr.c:1570
+#, c-format
+msgid "could not get information about output %d"
+msgstr "не вдалось отримати інформацію про вихід %d"
+
+#. Translators: the "position", "size", and "maximum"
+#. * words here are not keywords; please translate them
+#. * as usual.  A CRTC is a CRT Controller (this is X terminology)
+#: ../libgnome-desktop/gnome-rr.c:2163
+#, c-format
+msgid ""
+"requested position/size for CRTC %d is outside the allowed limit: position="
+"(%d, %d), size=(%d, %d), maximum=(%d, %d)"
+msgstr ""
+"потрібна програма та розмір CRTC %d виходить за рамки дозволених меж: "
+"позиція=(%d, %d), розмір=(%d, %d), максимально=(%d, %d)"
+
+#: ../libgnome-desktop/gnome-rr.c:2199
+#, c-format
+msgid "could not set the configuration for CRTC %d"
+msgstr "не вдалось встановити конфігурацію контролера CRTC %d"
+
+#: ../libgnome-desktop/gnome-rr.c:2344
+#, c-format
+msgid "could not get information about CRTC %d"
+msgstr "не вдалось отримати інформацію про контролер CRTC %d"
+
+#: ../libgnome-desktop/gnome-rr-config.c:558
+msgid "Laptop"
+msgstr "Ноутбук"
+
+#: ../libgnome-desktop/gnome-rr-config.c:713
+#, c-format
+msgid ""
+"none of the saved display configurations matched the active configuration"
+msgstr "жодна із збережених конфігурацій не збігається з наявною"
+
+#: ../libgnome-desktop/gnome-rr-config.c:1469
 #, c-format
 msgid "CRTC %d cannot drive output %s"
-msgstr "CRTC %d не може керувати виводом %s"
+msgstr "CRTC %d неможливо керувати виводом %s"
 
-#: ../libgnome-desktop/gnome-rr-config.c:750
+#: ../libgnome-desktop/gnome-rr-config.c:1476
 #, c-format
 msgid "output %s does not support mode %dx%d@%dHz"
 msgstr "вивід %s не підтримує режим %dx%d@%dHz"
 
-#: ../libgnome-desktop/gnome-rr-config.c:761
+#: ../libgnome-desktop/gnome-rr-config.c:1487
 #, c-format
-msgid "CRTC %d does not support rotation=%d"
-msgstr "CRTC %d не підтримує обертання=%d"
+msgid "CRTC %d does not support rotation=%s"
+msgstr "CRTC %d не підтримує обертання=%s"
 
-#: ../libgnome-desktop/gnome-rr-config.c:774
+#: ../libgnome-desktop/gnome-rr-config.c:1501
 #, c-format
 msgid ""
 "output %s does not have the same parameters as another cloned output:\n"
 "existing mode = %d, new mode = %d\n"
 "existing coordinates = (%d, %d), new coordinates = (%d, %d)\n"
-"existing rotation = %d, new rotation = %d"
+"existing rotation = %s, new rotation = %s"
 msgstr ""
 "вивід %s не підтримує однакові параметри як інший клонований вивід:\n"
 "наявний режим = %d, новий режим = %d\n"
 "наявні координати = (%d, %d), нові координати = (%d, %d)\n"
-"наявне обертання = %d, нове обертання = %d"
+"наявне обертання = %s, нове обертання = %s"
 
-#: ../libgnome-desktop/gnome-rr-config.c:789
+#: ../libgnome-desktop/gnome-rr-config.c:1516
 #, c-format
 msgid "cannot clone to output %s"
 msgstr "неможливо клонувати вивід %s"
 
-#: ../libgnome-desktop/gnome-rr-config.c:915
+#: ../libgnome-desktop/gnome-rr-config.c:1685
 #, c-format
 msgid "Trying modes for CRTC %d\n"
 msgstr "Випробування режимів для CRTC %d\n"
 
-#: ../libgnome-desktop/gnome-rr-config.c:939
+#: ../libgnome-desktop/gnome-rr-config.c:1709
 #, c-format
 msgid "CRTC %d: trying mode %dx%d@%dHz with output at %dx%d@%dHz (pass %d)\n"
-msgstr "CRTC %d: випробування режиму %dx%d@%dHz з виводом на %dx%d@%dHz (пропуск %d)\n"
+msgstr ""
+"CRTC %d: випробування режиму %dx%d@%dHz з виводом на %dx%d@%dHz (пропуск "
+"%d)\n"
 
-#: ../libgnome-desktop/gnome-rr-config.c:986
+#: ../libgnome-desktop/gnome-rr-config.c:1756
 #, c-format
 msgid ""
 "could not assign CRTCs to outputs:\n"
@@ -78,7 +147,7 @@
 "неможливо призначити CRTC для виводів:\n"
 "%s"
 
-#: ../libgnome-desktop/gnome-rr-config.c:990
+#: ../libgnome-desktop/gnome-rr-config.c:1760
 #, c-format
 msgid ""
 "none of the selected modes were compatible with the possible modes:\n"
@@ -90,7 +159,7 @@
 #. Translators: the "requested", "minimum", and
 #. * "maximum" words here are not keywords; please
 #. * translate them as usual.
-#: ../libgnome-desktop/gnome-rr-config.c:1071
+#: ../libgnome-desktop/gnome-rr-config.c:1838
 #, c-format
 msgid ""
 "required virtual size does not fit available size: requested=(%d, %d), "
@@ -99,113 +168,76 @@
 "потрібний віртуальний розмір не вміщується у доступний розмір: потрібно=(%d, "
 "%d), мінімум=(%d, %d), максимум=(%d, %d)"
 
+#. Keep this string in sync with gnome-control-center/capplets/display/xrandr-capplet.c:get_display_name()
+#. Translators:  this is the feature where what you see on your
+#. * laptop's screen is the same as your external projector.
+#. * Here, "Mirrored" is being used as an adjective.  For example,
+#. * the Spanish translation could be "Pantallas en Espejo".
+#.
+#: ../libgnome-desktop/gnome-rr-labeler.c:381
+msgid "Mirrored Displays"
+msgstr "Дзеркальні покази"
+
 #. Translators: This is the time format with full date used
 #. in 24-hour mode.
-#: ../libgnome-desktop/gnome-wall-clock.c:270
+#: ../libgnome-desktop/gnome-wall-clock.c:238
 msgid "%a %b %e, %R:%S"
 msgstr "%a %b %e, %R:%S"
 
-#: ../libgnome-desktop/gnome-wall-clock.c:271
+#: ../libgnome-desktop/gnome-wall-clock.c:239
 msgid "%a %b %e, %R"
 msgstr "%a %b %e, %R"
 
 #. Translators: This is the time format with day used
 #. in 24-hour mode.
-#: ../libgnome-desktop/gnome-wall-clock.c:275
+#: ../libgnome-desktop/gnome-wall-clock.c:243
 msgid "%a %R:%S"
 msgstr "%a %R:%S"
 
-#: ../libgnome-desktop/gnome-wall-clock.c:276
+#: ../libgnome-desktop/gnome-wall-clock.c:244
 msgid "%a %R"
 msgstr "%a %R"
 
 #. Translators: This is the time format without date used
 #. in 24-hour mode.
-#: ../libgnome-desktop/gnome-wall-clock.c:280
+#: ../libgnome-desktop/gnome-wall-clock.c:248
 msgid "%R:%S"
 msgstr "%R:%S"
 
-#: ../libgnome-desktop/gnome-wall-clock.c:280
+#: ../libgnome-desktop/gnome-wall-clock.c:248
 msgid "%R"
 msgstr "%R"
 
 #. Translators: This is a time format with full date used
 #. for AM/PM.
-#: ../libgnome-desktop/gnome-wall-clock.c:286
+#: ../libgnome-desktop/gnome-wall-clock.c:254
 msgid "%a %b %e, %l:%M:%S %p"
 msgstr "%a %b %e, %l:%M:%S %p"
 
-#: ../libgnome-desktop/gnome-wall-clock.c:287
+#: ../libgnome-desktop/gnome-wall-clock.c:255
 msgid "%a %b %e, %l:%M %p"
 msgstr "%a %b %e, %l:%M %p"
 
 #. Translators: This is a time format with day used
 #. for AM/PM.
-#: ../libgnome-desktop/gnome-wall-clock.c:291
+#: ../libgnome-desktop/gnome-wall-clock.c:259
 msgid "%a %l:%M:%S %p"
 msgstr "%a %l:%M:%S %p"
 
-#: ../libgnome-desktop/gnome-wall-clock.c:292
+#: ../libgnome-desktop/gnome-wall-clock.c:260
 msgid "%a %l:%M %p"
 msgstr "%a %l:%M %p"
 
 #. Translators: This is a time format without date used
 #. for AM/PM.
-#: ../libgnome-desktop/gnome-wall-clock.c:296
+#: ../libgnome-desktop/gnome-wall-clock.c:264
 msgid "%l:%M:%S %p"
 msgstr "%l:%M:%S %p"
 
-#: ../libgnome-desktop/gnome-wall-clock.c:297
+#: ../libgnome-desktop/gnome-wall-clock.c:265
 msgid "%l:%M %p"
 msgstr "%l:%M %p"
 
-#~ msgctxt "Monitor vendor"
-#~ msgid "Unknown"
-#~ msgstr "Невідомий"
-
-#~ msgid "Cannot find a terminal, using xterm, even if it may not work"
-#~ msgstr ""
-#~ "Не вдалось знайти термінал, який використовує програма xterm, хоча й вона "
-#~ "може не працювати"
-
-#~ msgid "could not get the screen resources (CRTCs, outputs, modes)"
-#~ msgstr "не вдалось отримати доступ до ресурсів (CRTC, виходи, режими)"
-
-#~ msgid "unhandled X error while getting the range of screen sizes"
-#~ msgstr "при спробі отримання допустимих розмірів екрана виникла помилка"
-
-#~ msgid "could not get the range of screen sizes"
-#~ msgstr "не вдалось отримати допустимі розміри екрана"
-
-#~ msgid "RANDR extension is not present"
-#~ msgstr "Розширення RANDR не підтримується"
-
-#~ msgid "could not get information about output %d"
-#~ msgstr "не вдалось отримати інформацію про вихід %d"
-
-#~ msgid ""
-#~ "requested position/size for CRTC %d is outside the allowed limit: "
-#~ "position=(%d, %d), size=(%d, %d), maximum=(%d, %d)"
-#~ msgstr ""
-#~ "потрібна програма та розмір CRTC %d виходить за рамки дозволених меж: "
-#~ "позиція=(%d, %d), розмір=(%d, %d), максимально=(%d, %d)"
-
-#~ msgid "could not set the configuration for CRTC %d"
-#~ msgstr "не вдалось встановити конфігурацію контролера CRTC %d"
-
-#~ msgid "could not get information about CRTC %d"
-#~ msgstr "не вдалось отримати інформацію про контролер CRTC %d"
-
-#~ msgid "Laptop"
-#~ msgstr "Ноутбук"
-
-#~ msgid ""
-#~ "none of the saved display configurations matched the active configuration"
-#~ msgstr "жодна із збережених конфігурацій не збігається з наявною"
-
-#~ msgid "Mirrored Displays"
-#~ msgstr "Дзеркальні покази"
-
 #~ msgid "Mirror Screens"
 #~ msgstr "Дзеркальні екрани"
 
diff -Nru gnome-desktop3-3.12.0/po/zh_CN.po gnome-desktop3-3.8.4/po/zh_CN.po
--- gnome-desktop3-3.12.0/po/zh_CN.po	2014-01-07 13:28:18.000000000 +0000
+++ gnome-desktop3-3.8.4/po/zh_CN.po	2013-04-15 09:26:23.000000000 +0000
@@ -1,81 +1,159 @@
-# Chinese simplified translation for gnome-desktop.
-# Copyright (C) 2009-2013 Freesoftware Fundation, Inc.
+# Simplified Chinese translation to gnome-desktop
+# Copyright (C) 2009 Free Software Foundation, Inc.
 # This file is distributed under the same license as the gnome-desktop package.
-# Dillion Chen 			
-#   Updated and QA by Wang Jian 			
-#   Updated and QA by Jiang Xiong 			
-#   Updated and QA by Zipeco 			
-#   Updated and QA by He Qiangqiang 			
-#   Updated and QA by Funda Wang , 2003.			
-# 甘露(Gan Lu) , 2009.			
-# Aron Xu , 2009.			
-# lainme , 2010.			
-# vicwjb , 2010.			
+#
+# Dillion Chen 
+#   Updated and QA by Wang Jian 
+#   Updated and QA by Jiang Xiong 
+#   Updated and QA by Zipeco 
+#   Updated and QA by He Qiangqiang 
+#   Updated and QA by Funda Wang , 2003.
+# 甘露(Gan Lu) , 2009.
+# Aron Xu , 2009.
+# lainme , 2010.
+# vicwjb , 2010.
 # YunQiang Su , 2012.
-# Sphinx Jiang , 2013.
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: gnome-desktop 3.10\n"
+"Project-Id-Version: gnome-desktop master\n"
 "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=gnome-"
 "desktop&keywords=I18N+L10N&component=general\n"
-"POT-Creation-Date: 2013-11-16 08:49+0000\n"
-"PO-Revision-Date: 2013-11-17 19:29+0800\n"
-"Last-Translator: Sphinx Jiang \n"
+"POT-Creation-Date: 2013-03-27 17:54+0000\n"
+"PO-Revision-Date: 2013-03-31 12:13+0800\n"
+"Last-Translator: tuhaihe <1132321739qq@gmail.com>\n"
 "Language-Team: Chinese (simplified) \n"
 "Language: zh_CN\n"
 "MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=utf-8\n"
+"Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
+"X-Generator: Poedit 1.5.4\n"
+
+#. Translators: "Unknown" here is used to identify a monitor for which
+#. * we don't know the vendor. When a vendor is known, the name of the
+#. * vendor is used.
+#: ../libgnome-desktop/display-name.c:107
+msgctxt "Monitor vendor"
+msgid "Unknown"
+msgstr "未知"
 
-#: ../libgnome-desktop/gnome-languages.c:718
+#: ../libgnome-desktop/gnome-languages.c:804
 msgid "Unspecified"
 msgstr "未指定"
 
-#: ../libgnome-desktop/gnome-rr-config.c:743
+#. Translators: a CRTC is a CRT Controller (this is X terminology).
+#: ../libgnome-desktop/gnome-rr.c:452
+#, c-format
+msgid "could not get the screen resources (CRTCs, outputs, modes)"
+msgstr "无法得到屏幕来源(CRTC，输出，模式)"
+
+#: ../libgnome-desktop/gnome-rr.c:472
+#, c-format
+msgid "unhandled X error while getting the range of screen sizes"
+msgstr "试图得到屏幕大小范围时出现无法处理的 X 错误"
+
+#: ../libgnome-desktop/gnome-rr.c:478
+#, c-format
+msgid "could not get the range of screen sizes"
+msgstr "无法得到屏幕大小范围"
+
+#: ../libgnome-desktop/gnome-rr.c:769
+#, c-format
+msgid "RANDR extension is not present"
+msgstr "没有 RANDR 扩展"
+
+#: ../libgnome-desktop/gnome-rr.c:1580
+#, c-format
+msgid "could not get information about output %d"
+msgstr "无法得到输出 %d 的有关信息"
+
+#: ../libgnome-desktop/gnome-rr.c:1764
+msgid "Built-in Display"
+msgstr "内置显示器"
+
+#. Translators: %s is the size of the monitor in inches
+#: ../libgnome-desktop/gnome-rr.c:1782
+#, c-format
+msgid "%s Display"
+msgstr "%s 显示器"
+
+#: ../libgnome-desktop/gnome-rr.c:1789
+msgid "Unknown Display"
+msgstr "未知显示器"
+
+#. Translators: the "position", "size", and "maximum"
+#. * words here are not keywords; please translate them
+#. * as usual.  A CRTC is a CRT Controller (this is X terminology)
+#: ../libgnome-desktop/gnome-rr.c:2234
+#, c-format
+msgid ""
+"requested position/size for CRTC %d is outside the allowed limit: position="
+"(%d, %d), size=(%d, %d), maximum=(%d, %d)"
+msgstr ""
+"CRTC %d 需要的位置/大小在限制允许之外：位置=(%d, %d)，大小=(%d, %d)，最大="
+"(%d, %d)"
+
+#: ../libgnome-desktop/gnome-rr.c:2270
+#, c-format
+msgid "could not set the configuration for CRTC %d"
+msgstr "无法为 CRTC %d 设定配置"
+
+#: ../libgnome-desktop/gnome-rr.c:2421
+#, c-format
+msgid "could not get information about CRTC %d"
+msgstr "无法获得CRTC %d的相关信息。"
+
+#: ../libgnome-desktop/gnome-rr-config.c:708
+#, c-format
+msgid ""
+"none of the saved display configurations matched the active configuration"
+msgstr "已保存的设置中没有匹配活动设置的"
+
+#: ../libgnome-desktop/gnome-rr-config.c:1464
 #, c-format
 msgid "CRTC %d cannot drive output %s"
 msgstr "CRTC %d 不能驱动输出 %s"
 
-#: ../libgnome-desktop/gnome-rr-config.c:750
+#: ../libgnome-desktop/gnome-rr-config.c:1471
 #, c-format
 msgid "output %s does not support mode %dx%d@%dHz"
-msgstr "输出 %s 不支持 %dx%d@%dHz 模式"
+msgstr "输出 %s 不支持模式 %dx%d@%dHz"
 
-#: ../libgnome-desktop/gnome-rr-config.c:761
+#: ../libgnome-desktop/gnome-rr-config.c:1482
 #, c-format
-msgid "CRTC %d does not support rotation=%d"
-msgstr "CRTC %d 不支持旋转=%d"
+msgid "CRTC %d does not support rotation=%s"
+msgstr "CRTC %d 不支持旋转 =%s"
 
-#: ../libgnome-desktop/gnome-rr-config.c:774
+#: ../libgnome-desktop/gnome-rr-config.c:1496
 #, c-format
 msgid ""
 "output %s does not have the same parameters as another cloned output:\n"
 "existing mode = %d, new mode = %d\n"
 "existing coordinates = (%d, %d), new coordinates = (%d, %d)\n"
-"existing rotation = %d, new rotation = %d"
+"existing rotation = %s, new rotation = %s"
 msgstr ""
-"输出 %s 和另一个克隆输出的参数不相同:\n"
-"当前模式= %d，新模式= %d\n"
-"当前坐标= (%d, %d)，新坐标= (%d, %d)当前旋转= %d，新旋转= %d"
+"输出 %s 和另一个克隆的输出没有相同参数：\n"
+"当前模式 = %d，新模式 = %d\n"
+"当前坐标 = (%d，%d)，新坐标 = (%d，%d)\n"
+"当前旋转 = %s，新旋转 = %s"
 
-#: ../libgnome-desktop/gnome-rr-config.c:789
+#: ../libgnome-desktop/gnome-rr-config.c:1511
 #, c-format
 msgid "cannot clone to output %s"
-msgstr "不能克隆到输出 %s"
+msgstr "无法克隆到输出 %s"
 
-#: ../libgnome-desktop/gnome-rr-config.c:915
+#: ../libgnome-desktop/gnome-rr-config.c:1680
 #, c-format
 msgid "Trying modes for CRTC %d\n"
-msgstr "正在尝试 CRTC %d 的各种模式\n"
+msgstr "为 CRTC %d 尝试模式\n"
 
-#: ../libgnome-desktop/gnome-rr-config.c:939
+#: ../libgnome-desktop/gnome-rr-config.c:1704
 #, c-format
 msgid "CRTC %d: trying mode %dx%d@%dHz with output at %dx%d@%dHz (pass %d)\n"
-msgstr "CRTC %d: 正在尝试 %dx%d@%dHz 模式，使用 %dx%d@%dHz 输出(第 %d 回)\n"
+msgstr "CRTC %d：尝试 %dx%d@%dHz 模式输出在 %dx%d@%dHz (通过 %d)\n"
 
-#: ../libgnome-desktop/gnome-rr-config.c:986
+#: ../libgnome-desktop/gnome-rr-config.c:1751
 #, c-format
 msgid ""
 "could not assign CRTCs to outputs:\n"
@@ -84,7 +162,7 @@
 "无法指定 CRTC 到输出：\n"
 "%s"
 
-#: ../libgnome-desktop/gnome-rr-config.c:990
+#: ../libgnome-desktop/gnome-rr-config.c:1755
 #, c-format
 msgid ""
 "none of the selected modes were compatible with the possible modes:\n"
@@ -96,39 +174,42 @@
 #. Translators: the "requested", "minimum", and
 #. * "maximum" words here are not keywords; please
 #. * translate them as usual.
-#: ../libgnome-desktop/gnome-rr-config.c:1071
+#: ../libgnome-desktop/gnome-rr-config.c:1833
 #, c-format
 msgid ""
 "required virtual size does not fit available size: requested=(%d, %d), "
 "minimum=(%d, %d), maximum=(%d, %d)"
 msgstr ""
-"要求的虚拟尺寸不符合可用尺寸： 要求=(%d, %d)， 最小=(%d, %d)，最大=(%d, %d)"
+"需要的虚拟大小大于可用大小：需求=(%d, %d)，最小=(%d, %d)，最大=(%d, %d)"
 
 #. Translators: This is the time format with full date used
 #. in 24-hour mode.
-#: ../libgnome-desktop/gnome-wall-clock.c:270
-msgid "%a %b %e, %R:%S"
-msgstr "%b %e %a, %R:%S"
+#. The character between %R and %S is U+2236 RATIO
+#: ../libgnome-desktop/gnome-wall-clock.c:268
+msgid "%a %b %e, %R∶%S"
+msgstr "%m月%d日%A，%R∶%S"
 
-#: ../libgnome-desktop/gnome-wall-clock.c:271
+#: ../libgnome-desktop/gnome-wall-clock.c:269
 msgid "%a %b %e, %R"
-msgstr "%b %e %a, %R"
+msgstr "%m月%d日%A，%R"
 
 #. Translators: This is the time format with day used
 #. in 24-hour mode.
-#: ../libgnome-desktop/gnome-wall-clock.c:275
-msgid "%a %R:%S"
-msgstr "%a %R:%S"
+#. The character between %R and %S is U+2236 RATIO
+#: ../libgnome-desktop/gnome-wall-clock.c:274
+msgid "%a %R∶%S"
+msgstr "%A %R:%S"
 
-#: ../libgnome-desktop/gnome-wall-clock.c:276
+#: ../libgnome-desktop/gnome-wall-clock.c:275
 msgid "%a %R"
-msgstr "%a %R"
+msgstr "%A %R"
 
 #. Translators: This is the time format without date used
 #. in 24-hour mode.
+#. The character between %R and %S is U+2236 RATIO
 #: ../libgnome-desktop/gnome-wall-clock.c:280
-msgid "%R:%S"
-msgstr "%R:%S"
+msgid "%R∶%S"
+msgstr "%R∶%S"
 
 #: ../libgnome-desktop/gnome-wall-clock.c:280
 msgid "%R"
@@ -136,30 +217,45 @@
 
 #. Translators: This is a time format with full date used
 #. for AM/PM.
-#: ../libgnome-desktop/gnome-wall-clock.c:286
-msgid "%a %b %e, %l:%M:%S %p"
-msgstr "%b %e %a, %p %l:%M:%S"
-
-#: ../libgnome-desktop/gnome-wall-clock.c:287
-msgid "%a %b %e, %l:%M %p"
-msgstr "%b %e %a, %p %l:%M"
+#. The Unicode characters are U+2236 RATIO and
+#. U+2009 THIN SPACE
+#: ../libgnome-desktop/gnome-wall-clock.c:288
+msgid "%a %b %e, %l∶%M∶%S %p"
+msgstr "%m月%d日%A，%p %I:%M:%S"
+
+#: ../libgnome-desktop/gnome-wall-clock.c:289
+msgid "%a %b %e, %l∶%M %p"
+msgstr "%m月%d日%A，%p %I:%M"
 
 #. Translators: This is a time format with day used
 #. for AM/PM.
-#: ../libgnome-desktop/gnome-wall-clock.c:291
-msgid "%a %l:%M:%S %p"
-msgstr "%a %p %l:%M:%S"
-
-#: ../libgnome-desktop/gnome-wall-clock.c:292
-msgid "%a %l:%M %p"
-msgstr "%a %p %l:%M"
+#. The Unicode characters are U+2236 RATIO and
+#. U+2009 THIN SPACE
+#: ../libgnome-desktop/gnome-wall-clock.c:295
+msgid "%a %l∶%M∶%S %p"
+msgstr "%A %p %I:%M:%S"
+
+#: ../libgnome-desktop/gnome-wall-clock.c:296
+msgid "%a %l∶%M %p"
+msgstr "%A %p %I:%M"
 
 #. Translators: This is a time format without date used
 #. for AM/PM.
-#: ../libgnome-desktop/gnome-wall-clock.c:296
-msgid "%l:%M:%S %p"
-msgstr "%p %l:%M:%S"
+#. The Unicode characters are U+2236 RATIO and
+#. U+2009 THIN SPACE
+#: ../libgnome-desktop/gnome-wall-clock.c:302
+msgid "%l∶%M∶%S %p"
+msgstr "%p %l∶%M∶%S"
+
+#: ../libgnome-desktop/gnome-wall-clock.c:303
+msgid "%l∶%M %p"
+msgstr "%p %l∶%M"
+
+#~ msgid "Cannot find a terminal, using xterm, even if it may not work"
+#~ msgstr "无法找到正在使用xterm的终端程序，可能他无法工作"
+
+#~ msgid "Laptop"
+#~ msgstr "笔记本电脑"
 
-#: ../libgnome-desktop/gnome-wall-clock.c:297
-msgid "%l:%M %p"
-msgstr "%p %l:%M"
+#~ msgid "Mirrored Displays"
+#~ msgstr "镜像显示"
diff -Nru gnome-desktop3-3.12.0/po/zh_HK.po gnome-desktop3-3.8.4/po/zh_HK.po
--- gnome-desktop3-3.12.0/po/zh_HK.po	2013-11-11 17:23:18.000000000 +0000
+++ gnome-desktop3-3.8.4/po/zh_HK.po	2013-09-04 11:15:57.000000000 +0000
@@ -15,65 +15,140 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: gnome-desktop 2.91.4\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-09-06 16:21+0800\n"
-"PO-Revision-Date: 2013-09-06 16:21+0800\n"
-"Last-Translator: Chao-Hsiung Liao \n"
+"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=gnome-"
+"desktop&keywords=I18N+L10N&component=general\n"
+"POT-Creation-Date: 2013-04-06 16:30+0000\n"
+"PO-Revision-Date: 2013-06-04 21:08+0800\n"
+"Last-Translator: Cheng-Chia Tseng \n"
 "Language-Team: Chinese (Hong Kong) \n"
 "Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: Poedit 1.5.5\n"
+"X-Generator: Poedit 1.5.4\n"
+
+#. Translators: "Unknown" here is used to identify a monitor for which
+#. * we don't know the vendor. When a vendor is known, the name of the
+#. * vendor is used.
+#: ../libgnome-desktop/display-name.c:107
+msgctxt "Monitor vendor"
+msgid "Unknown"
+msgstr "不明"
 
 #: ../libgnome-desktop/gnome-languages.c:804
 msgid "Unspecified"
 msgstr "未指定"
 
-#: ../libgnome-desktop/gnome-rr-config.c:743
+#. Translators: a CRTC is a CRT Controller (this is X terminology).
+#: ../libgnome-desktop/gnome-rr.c:452
+#, c-format
+msgid "could not get the screen resources (CRTCs, outputs, modes)"
+msgstr "無法取得螢幕資源 (CTRCs、輸出、模式)"
+
+#: ../libgnome-desktop/gnome-rr.c:472
+#, c-format
+msgid "unhandled X error while getting the range of screen sizes"
+msgstr "在取得螢幕大小的範圍發生無法處理的 X 錯誤"
+
+#: ../libgnome-desktop/gnome-rr.c:478
+#, c-format
+msgid "could not get the range of screen sizes"
+msgstr "無法取得螢幕大小的範圍"
+
+#: ../libgnome-desktop/gnome-rr.c:769
+#, c-format
+msgid "RANDR extension is not present"
+msgstr "沒有 RANDR 擴充功能"
+
+#: ../libgnome-desktop/gnome-rr.c:1580
+#, c-format
+msgid "could not get information about output %d"
+msgstr "無法取得輸出 %d 的資訊"
+
+#: ../libgnome-desktop/gnome-rr.c:1764
+msgid "Built-in Display"
+msgstr "內置顯示器"
+
+#. Translators: %s is the size of the monitor in inches
+#: ../libgnome-desktop/gnome-rr.c:1782
+#, c-format
+msgid "%s Display"
+msgstr "%s 吋顯示器"
+
+#: ../libgnome-desktop/gnome-rr.c:1789
+msgid "Unknown Display"
+msgstr "不明顯示器"
+
+#. Translators: the "position", "size", and "maximum"
+#. * words here are not keywords; please translate them
+#. * as usual.  A CRTC is a CRT Controller (this is X terminology)
+#: ../libgnome-desktop/gnome-rr.c:2234
+#, c-format
+msgid ""
+"requested position/size for CRTC %d is outside the allowed limit: position="
+"(%d, %d), size=(%d, %d), maximum=(%d, %d)"
+msgstr "對 CTRC %d 要求的位置/大小超出允許的限制：位置 =(%d, %d)，大小 =(%d, %d)，最大值=(%d, %d)"
+
+#: ../libgnome-desktop/gnome-rr.c:2270
+#, c-format
+msgid "could not set the configuration for CRTC %d"
+msgstr "無法設定 CRTC %d 的組態"
+
+#: ../libgnome-desktop/gnome-rr.c:2421
+#, c-format
+msgid "could not get information about CRTC %d"
+msgstr "無法取得 CRTC %d 的資訊"
+
+#: ../libgnome-desktop/gnome-rr-config.c:708
+#, c-format
+msgid ""
+"none of the saved display configurations matched the active configuration"
+msgstr "已儲存的顯示組態沒有一個符合使用中的組態"
+
+#: ../libgnome-desktop/gnome-rr-config.c:1464
 #, c-format
 msgid "CRTC %d cannot drive output %s"
 msgstr "CRTC %d 不能驅動輸出裝置 %s"
 
-#: ../libgnome-desktop/gnome-rr-config.c:750
+#: ../libgnome-desktop/gnome-rr-config.c:1471
 #, c-format
 msgid "output %s does not support mode %dx%d@%dHz"
 msgstr "輸出裝置 %s 不支援模式 %dx%d@%dHz"
 
-#: ../libgnome-desktop/gnome-rr-config.c:761
+#: ../libgnome-desktop/gnome-rr-config.c:1482
 #, c-format
-msgid "CRTC %d does not support rotation=%d"
-msgstr "CRTC %d 不支援 rotation=%d"
+msgid "CRTC %d does not support rotation=%s"
+msgstr "CRTC %d 不支援 rotation=%s"
 
-#: ../libgnome-desktop/gnome-rr-config.c:774
+#: ../libgnome-desktop/gnome-rr-config.c:1496
 #, c-format
 msgid ""
 "output %s does not have the same parameters as another cloned output:\n"
 "existing mode = %d, new mode = %d\n"
 "existing coordinates = (%d, %d), new coordinates = (%d, %d)\n"
-"existing rotation = %d, new rotation = %d"
+"existing rotation = %s, new rotation = %s"
 msgstr ""
 "輸出裝置 %s 沒有和另一個複製輸出裝置同樣的參數：\n"
 "現有的模式 = %d，新的模式 = %d\n"
 "現有的坐標 = (%d, %d)，新的坐標 = (%d, %d)\n"
-"現有的旋轉 = %d，新的旋轉 = %d"
+"現有的旋轉 = %s，新的旋轉 = %s"
 
-#: ../libgnome-desktop/gnome-rr-config.c:789
+#: ../libgnome-desktop/gnome-rr-config.c:1511
 #, c-format
 msgid "cannot clone to output %s"
 msgstr "不能複製到輸出裝置 %s"
 
-#: ../libgnome-desktop/gnome-rr-config.c:915
+#: ../libgnome-desktop/gnome-rr-config.c:1680
 #, c-format
 msgid "Trying modes for CRTC %d\n"
 msgstr "正在嘗試 CRTC %d 的模式\n"
 
-#: ../libgnome-desktop/gnome-rr-config.c:939
+#: ../libgnome-desktop/gnome-rr-config.c:1704
 #, c-format
 msgid "CRTC %d: trying mode %dx%d@%dHz with output at %dx%d@%dHz (pass %d)\n"
 msgstr "CRTC %d：正在嘗試模式 %dx%d@%dHz 於輸出裝置 %dx%d@%dHz (通過 %d)\n"
 
-#: ../libgnome-desktop/gnome-rr-config.c:986
+#: ../libgnome-desktop/gnome-rr-config.c:1751
 #, c-format
 msgid ""
 "could not assign CRTCs to outputs:\n"
@@ -82,7 +157,7 @@
 "無法指派 CRTC 給輸出裝置：\n"
 "%s"
 
-#: ../libgnome-desktop/gnome-rr-config.c:990
+#: ../libgnome-desktop/gnome-rr-config.c:1755
 #, c-format
 msgid ""
 "none of the selected modes were compatible with the possible modes:\n"
@@ -94,7 +169,7 @@
 #. Translators: the "requested", "minimum", and
 #. * "maximum" words here are not keywords; please
 #. * translate them as usual.
-#: ../libgnome-desktop/gnome-rr-config.c:1071
+#: ../libgnome-desktop/gnome-rr-config.c:1833
 #, c-format
 msgid ""
 "required virtual size does not fit available size: requested=(%d, %d), "
@@ -103,29 +178,32 @@
 
 #. Translators: This is the time format with full date used
 #. in 24-hour mode.
-#: ../libgnome-desktop/gnome-wall-clock.c:270
-msgid "%a %b %e, %R:%S"
-msgstr "%b%e日 (%a) %R:%S"
+#. The character between %R and %S is U+2236 RATIO
+#: ../libgnome-desktop/gnome-wall-clock.c:268
+msgid "%a %b %e, %R∶%S"
+msgstr "%b%e日 (%a) %R∶%S"
 
-#: ../libgnome-desktop/gnome-wall-clock.c:271
+#: ../libgnome-desktop/gnome-wall-clock.c:269
 msgid "%a %b %e, %R"
 msgstr "%b%e日 (%a) %R"
 
 #. Translators: This is the time format with day used
 #. in 24-hour mode.
-#: ../libgnome-desktop/gnome-wall-clock.c:275
-msgid "%a %R:%S"
+#. The character between %R and %S is U+2236 RATIO
+#: ../libgnome-desktop/gnome-wall-clock.c:274
+msgid "%a %R∶%S"
 msgstr "%A %R∶%S"
 
-#: ../libgnome-desktop/gnome-wall-clock.c:276
+#: ../libgnome-desktop/gnome-wall-clock.c:275
 msgid "%a %R"
 msgstr "%A %R"
 
 #. Translators: This is the time format without date used
 #. in 24-hour mode.
+#. The character between %R and %S is U+2236 RATIO
 #: ../libgnome-desktop/gnome-wall-clock.c:280
-msgid "%R:%S"
-msgstr "%R:%S"
+msgid "%R∶%S"
+msgstr "%R∶%S"
 
 #: ../libgnome-desktop/gnome-wall-clock.c:280
 msgid "%R"
@@ -133,96 +211,39 @@
 
 #. Translators: This is a time format with full date used
 #. for AM/PM.
-#: ../libgnome-desktop/gnome-wall-clock.c:286
-msgid "%a %b %e, %l:%M:%S %p"
+#. The Unicode characters are U+2236 RATIO and
+#. U+2009 THIN SPACE
+#: ../libgnome-desktop/gnome-wall-clock.c:288
+msgid "%a %b %e, %l∶%M∶%S %p"
 msgstr "%b%e日 (%a) %p%l∶%M∶%S"
 
-#: ../libgnome-desktop/gnome-wall-clock.c:287
-msgid "%a %b %e, %l:%M %p"
+#: ../libgnome-desktop/gnome-wall-clock.c:289
+msgid "%a %b %e, %l∶%M %p"
 msgstr "%b%e日 (%a) %p%l∶%M"
 
 #. Translators: This is a time format with day used
 #. for AM/PM.
-#: ../libgnome-desktop/gnome-wall-clock.c:291
-msgid "%a %l:%M:%S %p"
-msgstr "%A %p%l:%M:%S"
-
-#: ../libgnome-desktop/gnome-wall-clock.c:292
-msgid "%a %l:%M %p"
-msgstr "%A %p%l:%M"
+#. The Unicode characters are U+2236 RATIO and
+#. U+2009 THIN SPACE
+#: ../libgnome-desktop/gnome-wall-clock.c:295
+msgid "%a %l∶%M∶%S %p"
+msgstr "%A %p%l∶%M∶%S"
 
-#. Translators: This is a time format without date used
-#. for AM/PM.
 #: ../libgnome-desktop/gnome-wall-clock.c:296
-msgid "%l:%M:%S %p"
-msgstr "%p%l:%M:%S"
-
-#: ../libgnome-desktop/gnome-wall-clock.c:297
-msgid "%l:%M %p"
-msgstr "%p%l:%M"
-
-#~ msgctxt "Monitor vendor"
-#~ msgid "Unknown"
-#~ msgstr "不明"
-
-#~ msgid "could not get the screen resources (CRTCs, outputs, modes)"
-#~ msgstr "無法取得螢幕資源 (CTRCs、輸出、模式)"
-
-#~ msgid "unhandled X error while getting the range of screen sizes"
-#~ msgstr "在取得螢幕大小的範圍發生無法處理的 X 錯誤"
-
-#~ msgid "could not get the range of screen sizes"
-#~ msgstr "無法取得螢幕大小的範圍"
-
-#~ msgid "RANDR extension is not present"
-#~ msgstr "沒有 RANDR 擴充功能"
-
-#~ msgid "could not get information about output %d"
-#~ msgstr "無法取得輸出 %d 的資訊"
-
-#~ msgid "Built-in Display"
-#~ msgstr "內建顯示器"
-
-#~ msgid "%s Display"
-#~ msgstr "%s 吋顯示器"
-
-#~ msgid "Unknown Display"
-#~ msgstr "不明顯示器"
-
-#~ msgid ""
-#~ "requested position/size for CRTC %d is outside the allowed limit: "
-#~ "position=(%d, %d), size=(%d, %d), maximum=(%d, %d)"
-#~ msgstr ""
-#~ "對 CTRC %d 要求的位置/大小超出允許的限制：位置 =(%d, %d)，大小 =(%d, %d)，"
-#~ "最大值=(%d, %d)"
+msgid "%a %l∶%M %p"
+msgstr "%A %p%l∶%M"
 
-#~ msgid "could not set the configuration for CRTC %d"
-#~ msgstr "無法設定 CRTC %d 的組態"
-
-#~ msgid "could not get information about CRTC %d"
-#~ msgstr "無法取得 CRTC %d 的資訊"
-
-#~ msgid ""
-#~ "none of the saved display configurations matched the active configuration"
-#~ msgstr "已儲存的顯示組態沒有一個符合使用中的組態"
-
-#~ msgid "%a %b %e, %R∶%S"
-#~ msgstr "%b%e日 (%a) %R∶%S"
-
-#~ msgid "%R∶%S"
-#~ msgstr "%R∶%S"
-
-#~ msgid "%a %l∶%M∶%S %p"
-#~ msgstr "%A %p%l∶%M∶%S"
-
-#~ msgid "%a %l∶%M %p"
-#~ msgstr "%A %p%l∶%M"
-
-#~ msgid "%l∶%M∶%S %p"
-#~ msgstr "%p%l∶%M∶%S"
-
-#~ msgid "%l∶%M %p"
-#~ msgstr "%p%l∶%M"
+#. Translators: This is a time format without date used
+#. for AM/PM.
+#. The Unicode characters are U+2236 RATIO and
+#. U+2009 THIN SPACE
+#: ../libgnome-desktop/gnome-wall-clock.c:302
+msgid "%l∶%M∶%S %p"
+msgstr "%p%l∶%M∶%S"
+
+#: ../libgnome-desktop/gnome-wall-clock.c:303
+msgid "%l∶%M %p"
+msgstr "%p%l∶%M"
 
 #~ msgid "Laptop"
 #~ msgstr "筆記型電腦"
@@ -233,6 +254,15 @@
 #~ msgid "Mirrored Displays"
 #~ msgstr "鏡射顯示器"
 
+#~ msgid "%R:%S"
+#~ msgstr "%R:%S"
+
+#~ msgid "%l:%M:%S %p"
+#~ msgstr "%p %l:%M:%S"
+
+#~ msgid "%l:%M %p"
+#~ msgstr "%p %l:%M"
+
 #~ msgid "Mirror Screens"
 #~ msgstr "鏡射螢幕"
 
diff -Nru gnome-desktop3-3.12.0/po/zh_TW.po gnome-desktop3-3.8.4/po/zh_TW.po
--- gnome-desktop3-3.12.0/po/zh_TW.po	2013-11-11 17:23:18.000000000 +0000
+++ gnome-desktop3-3.8.4/po/zh_TW.po	2013-09-04 11:15:57.000000000 +0000
@@ -15,65 +15,142 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: gnome-desktop 2.91.4\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-09-06 16:21+0800\n"
-"PO-Revision-Date: 2013-09-04 15:59+0800\n"
-"Last-Translator: Chao-Hsiung Liao \n"
+"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=gnome-"
+"desktop&keywords=I18N+L10N&component=general\n"
+"POT-Creation-Date: 2013-04-06 16:30+0000\n"
+"PO-Revision-Date: 2013-04-13 13:01+0800\n"
+"Last-Translator: Cheng-Chia Tseng \n"
 "Language-Team: Chinese/Traditional \n"
 "Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: Poedit 1.5.5\n"
+"X-Generator: Poedit 1.5.4\n"
+
+#. Translators: "Unknown" here is used to identify a monitor for which
+#. * we don't know the vendor. When a vendor is known, the name of the
+#. * vendor is used.
+#: ../libgnome-desktop/display-name.c:107
+msgctxt "Monitor vendor"
+msgid "Unknown"
+msgstr "不明"
 
 #: ../libgnome-desktop/gnome-languages.c:804
 msgid "Unspecified"
 msgstr "未指定"
 
-#: ../libgnome-desktop/gnome-rr-config.c:743
+#. Translators: a CRTC is a CRT Controller (this is X terminology).
+#: ../libgnome-desktop/gnome-rr.c:452
+#, c-format
+msgid "could not get the screen resources (CRTCs, outputs, modes)"
+msgstr "無法取得螢幕資源 (CTRCs、輸出、模式)"
+
+#: ../libgnome-desktop/gnome-rr.c:472
+#, c-format
+msgid "unhandled X error while getting the range of screen sizes"
+msgstr "在取得螢幕大小的範圍發生無法處理的 X 錯誤"
+
+#: ../libgnome-desktop/gnome-rr.c:478
+#, c-format
+msgid "could not get the range of screen sizes"
+msgstr "無法取得螢幕大小的範圍"
+
+#: ../libgnome-desktop/gnome-rr.c:769
+#, c-format
+msgid "RANDR extension is not present"
+msgstr "沒有 RANDR 擴充功能"
+
+#: ../libgnome-desktop/gnome-rr.c:1580
+#, c-format
+msgid "could not get information about output %d"
+msgstr "無法取得輸出 %d 的資訊"
+
+#: ../libgnome-desktop/gnome-rr.c:1764
+msgid "Built-in Display"
+msgstr "內建顯示器"
+
+#. Translators: %s is the size of the monitor in inches
+#: ../libgnome-desktop/gnome-rr.c:1782
+#, c-format
+msgid "%s Display"
+msgstr "%s 吋顯示器"
+
+#: ../libgnome-desktop/gnome-rr.c:1789
+msgid "Unknown Display"
+msgstr "不明顯示器"
+
+#. Translators: the "position", "size", and "maximum"
+#. * words here are not keywords; please translate them
+#. * as usual.  A CRTC is a CRT Controller (this is X terminology)
+#: ../libgnome-desktop/gnome-rr.c:2234
+#, c-format
+msgid ""
+"requested position/size for CRTC %d is outside the allowed limit: position="
+"(%d, %d), size=(%d, %d), maximum=(%d, %d)"
+msgstr ""
+"對 CTRC %d 要求的位置/大小超出允許的限制：位置 =(%d, %d)，大小 =(%d, %d)，最"
+"大值=(%d, %d)"
+
+#: ../libgnome-desktop/gnome-rr.c:2270
+#, c-format
+msgid "could not set the configuration for CRTC %d"
+msgstr "無法設定 CRTC %d 的組態"
+
+#: ../libgnome-desktop/gnome-rr.c:2421
+#, c-format
+msgid "could not get information about CRTC %d"
+msgstr "無法取得 CRTC %d 的資訊"
+
+#: ../libgnome-desktop/gnome-rr-config.c:708
+#, c-format
+msgid ""
+"none of the saved display configurations matched the active configuration"
+msgstr "已儲存的顯示組態沒有一個符合使用中的組態"
+
+#: ../libgnome-desktop/gnome-rr-config.c:1464
 #, c-format
 msgid "CRTC %d cannot drive output %s"
 msgstr "CRTC %d 不能驅動輸出裝置 %s"
 
-#: ../libgnome-desktop/gnome-rr-config.c:750
+#: ../libgnome-desktop/gnome-rr-config.c:1471
 #, c-format
 msgid "output %s does not support mode %dx%d@%dHz"
 msgstr "輸出裝置 %s 不支援模式 %dx%d@%dHz"
 
-#: ../libgnome-desktop/gnome-rr-config.c:761
+#: ../libgnome-desktop/gnome-rr-config.c:1482
 #, c-format
-msgid "CRTC %d does not support rotation=%d"
-msgstr "CRTC %d 不支援 rotation=%d"
+msgid "CRTC %d does not support rotation=%s"
+msgstr "CRTC %d 不支援 rotation=%s"
 
-#: ../libgnome-desktop/gnome-rr-config.c:774
+#: ../libgnome-desktop/gnome-rr-config.c:1496
 #, c-format
 msgid ""
 "output %s does not have the same parameters as another cloned output:\n"
 "existing mode = %d, new mode = %d\n"
 "existing coordinates = (%d, %d), new coordinates = (%d, %d)\n"
-"existing rotation = %d, new rotation = %d"
+"existing rotation = %s, new rotation = %s"
 msgstr ""
 "輸出裝置 %s 沒有和另一個複製輸出裝置同樣的參數：\n"
 "現有的模式 = %d，新的模式 = %d\n"
 "現有的坐標 = (%d, %d)，新的坐標 = (%d, %d)\n"
-"現有的旋轉 = %d，新的旋轉 = %d"
+"現有的旋轉 = %s，新的旋轉 = %s"
 
-#: ../libgnome-desktop/gnome-rr-config.c:789
+#: ../libgnome-desktop/gnome-rr-config.c:1511
 #, c-format
 msgid "cannot clone to output %s"
 msgstr "不能複製到輸出裝置 %s"
 
-#: ../libgnome-desktop/gnome-rr-config.c:915
+#: ../libgnome-desktop/gnome-rr-config.c:1680
 #, c-format
 msgid "Trying modes for CRTC %d\n"
 msgstr "正在嘗試 CRTC %d 的模式\n"
 
-#: ../libgnome-desktop/gnome-rr-config.c:939
+#: ../libgnome-desktop/gnome-rr-config.c:1704
 #, c-format
 msgid "CRTC %d: trying mode %dx%d@%dHz with output at %dx%d@%dHz (pass %d)\n"
 msgstr "CRTC %d：正在嘗試模式 %dx%d@%dHz 於輸出裝置 %dx%d@%dHz (通過 %d)\n"
 
-#: ../libgnome-desktop/gnome-rr-config.c:986
+#: ../libgnome-desktop/gnome-rr-config.c:1751
 #, c-format
 msgid ""
 "could not assign CRTCs to outputs:\n"
@@ -82,7 +159,7 @@
 "無法指派 CRTC 給輸出裝置：\n"
 "%s"
 
-#: ../libgnome-desktop/gnome-rr-config.c:990
+#: ../libgnome-desktop/gnome-rr-config.c:1755
 #, c-format
 msgid ""
 "none of the selected modes were compatible with the possible modes:\n"
@@ -94,7 +171,7 @@
 #. Translators: the "requested", "minimum", and
 #. * "maximum" words here are not keywords; please
 #. * translate them as usual.
-#: ../libgnome-desktop/gnome-rr-config.c:1071
+#: ../libgnome-desktop/gnome-rr-config.c:1833
 #, c-format
 msgid ""
 "required virtual size does not fit available size: requested=(%d, %d), "
@@ -105,29 +182,32 @@
 
 #. Translators: This is the time format with full date used
 #. in 24-hour mode.
-#: ../libgnome-desktop/gnome-wall-clock.c:270
-msgid "%a %b %e, %R:%S"
-msgstr "%b%e日 (%a) %R:%S"
+#. The character between %R and %S is U+2236 RATIO
+#: ../libgnome-desktop/gnome-wall-clock.c:268
+msgid "%a %b %e, %R∶%S"
+msgstr "%b%e日 (%a) %R∶%S"
 
-#: ../libgnome-desktop/gnome-wall-clock.c:271
+#: ../libgnome-desktop/gnome-wall-clock.c:269
 msgid "%a %b %e, %R"
 msgstr "%b%e日 (%a) %R"
 
 #. Translators: This is the time format with day used
 #. in 24-hour mode.
-#: ../libgnome-desktop/gnome-wall-clock.c:275
-msgid "%a %R:%S"
+#. The character between %R and %S is U+2236 RATIO
+#: ../libgnome-desktop/gnome-wall-clock.c:274
+msgid "%a %R∶%S"
 msgstr "%A %R∶%S"
 
-#: ../libgnome-desktop/gnome-wall-clock.c:276
+#: ../libgnome-desktop/gnome-wall-clock.c:275
 msgid "%a %R"
 msgstr "%A %R"
 
 #. Translators: This is the time format without date used
 #. in 24-hour mode.
+#. The character between %R and %S is U+2236 RATIO
 #: ../libgnome-desktop/gnome-wall-clock.c:280
-msgid "%R:%S"
-msgstr "%R:%S"
+msgid "%R∶%S"
+msgstr "%R∶%S"
 
 #: ../libgnome-desktop/gnome-wall-clock.c:280
 msgid "%R"
@@ -135,96 +215,39 @@
 
 #. Translators: This is a time format with full date used
 #. for AM/PM.
-#: ../libgnome-desktop/gnome-wall-clock.c:286
-msgid "%a %b %e, %l:%M:%S %p"
+#. The Unicode characters are U+2236 RATIO and
+#. U+2009 THIN SPACE
+#: ../libgnome-desktop/gnome-wall-clock.c:288
+msgid "%a %b %e, %l∶%M∶%S %p"
 msgstr "%b%e日 (%a) %p%l∶%M∶%S"
 
-#: ../libgnome-desktop/gnome-wall-clock.c:287
-msgid "%a %b %e, %l:%M %p"
+#: ../libgnome-desktop/gnome-wall-clock.c:289
+msgid "%a %b %e, %l∶%M %p"
 msgstr "%b%e日 (%a) %p%l∶%M"
 
 #. Translators: This is a time format with day used
 #. for AM/PM.
-#: ../libgnome-desktop/gnome-wall-clock.c:291
-msgid "%a %l:%M:%S %p"
-msgstr "%A %p%l:%M:%S"
-
-#: ../libgnome-desktop/gnome-wall-clock.c:292
-msgid "%a %l:%M %p"
-msgstr "%A %p%l:%M"
+#. The Unicode characters are U+2236 RATIO and
+#. U+2009 THIN SPACE
+#: ../libgnome-desktop/gnome-wall-clock.c:295
+msgid "%a %l∶%M∶%S %p"
+msgstr "%A %p%l∶%M∶%S"
 
-#. Translators: This is a time format without date used
-#. for AM/PM.
 #: ../libgnome-desktop/gnome-wall-clock.c:296
-msgid "%l:%M:%S %p"
-msgstr "%p%l:%M:%S"
-
-#: ../libgnome-desktop/gnome-wall-clock.c:297
-msgid "%l:%M %p"
-msgstr "%p%l:%M"
-
-#~ msgctxt "Monitor vendor"
-#~ msgid "Unknown"
-#~ msgstr "不明"
-
-#~ msgid "could not get the screen resources (CRTCs, outputs, modes)"
-#~ msgstr "無法取得螢幕資源 (CTRCs、輸出、模式)"
-
-#~ msgid "unhandled X error while getting the range of screen sizes"
-#~ msgstr "在取得螢幕大小的範圍發生無法處理的 X 錯誤"
-
-#~ msgid "could not get the range of screen sizes"
-#~ msgstr "無法取得螢幕大小的範圍"
-
-#~ msgid "RANDR extension is not present"
-#~ msgstr "沒有 RANDR 擴充功能"
-
-#~ msgid "could not get information about output %d"
-#~ msgstr "無法取得輸出 %d 的資訊"
-
-#~ msgid "Built-in Display"
-#~ msgstr "內建顯示器"
-
-#~ msgid "%s Display"
-#~ msgstr "%s 吋顯示器"
-
-#~ msgid "Unknown Display"
-#~ msgstr "不明顯示器"
-
-#~ msgid ""
-#~ "requested position/size for CRTC %d is outside the allowed limit: "
-#~ "position=(%d, %d), size=(%d, %d), maximum=(%d, %d)"
-#~ msgstr ""
-#~ "對 CTRC %d 要求的位置/大小超出允許的限制：位置 =(%d, %d)，大小 =(%d, %d)，"
-#~ "最大值=(%d, %d)"
+msgid "%a %l∶%M %p"
+msgstr "%A %p%l∶%M"
 
-#~ msgid "could not set the configuration for CRTC %d"
-#~ msgstr "無法設定 CRTC %d 的組態"
-
-#~ msgid "could not get information about CRTC %d"
-#~ msgstr "無法取得 CRTC %d 的資訊"
-
-#~ msgid ""
-#~ "none of the saved display configurations matched the active configuration"
-#~ msgstr "已儲存的顯示組態沒有一個符合使用中的組態"
-
-#~ msgid "%a %b %e, %R∶%S"
-#~ msgstr "%b%e日 (%a) %R∶%S"
-
-#~ msgid "%R∶%S"
-#~ msgstr "%R∶%S"
-
-#~ msgid "%a %l∶%M∶%S %p"
-#~ msgstr "%A %p%l∶%M∶%S"
-
-#~ msgid "%a %l∶%M %p"
-#~ msgstr "%A %p%l∶%M"
-
-#~ msgid "%l∶%M∶%S %p"
-#~ msgstr "%p%l∶%M∶%S"
-
-#~ msgid "%l∶%M %p"
-#~ msgstr "%p%l∶%M"
+#. Translators: This is a time format without date used
+#. for AM/PM.
+#. The Unicode characters are U+2236 RATIO and
+#. U+2009 THIN SPACE
+#: ../libgnome-desktop/gnome-wall-clock.c:302
+msgid "%l∶%M∶%S %p"
+msgstr "%p%l∶%M∶%S"
+
+#: ../libgnome-desktop/gnome-wall-clock.c:303
+msgid "%l∶%M %p"
+msgstr "%p%l∶%M"
 
 #~ msgid "Laptop"
 #~ msgstr "筆記型電腦"
@@ -235,6 +258,15 @@
 #~ msgid "Mirrored Displays"
 #~ msgstr "鏡射顯示器"
 
+#~ msgid "%R:%S"
+#~ msgstr "%R:%S"
+
+#~ msgid "%l:%M:%S %p"
+#~ msgstr "%p %l:%M:%S"
+
+#~ msgid "%l:%M %p"
+#~ msgstr "%p %l:%M"
+
 #~ msgid "Mirror Screens"
 #~ msgstr "鏡射螢幕"