diff -Nru d-conf-0.16.1/Makefile.in d-conf-0.18.0/Makefile.in --- d-conf-0.16.1/Makefile.in 2013-07-16 16:43:48.000000000 +0000 +++ d-conf-0.18.0/Makefile.in 2013-09-23 21:29:28.000000000 +0000 @@ -78,8 +78,8 @@ DIST_COMMON = $(srcdir)/Makefile.gtester $(srcdir)/Makefile.in \ $(srcdir)/Makefile.am $(top_srcdir)/configure \ $(am__configure_deps) $(srcdir)/config.h.in COPYING NEWS \ - README aux/depcomp aux/install-sh aux/missing \ - $(top_srcdir)/aux/install-sh $(top_srcdir)/aux/missing + README aux/install-sh aux/missing $(top_srcdir)/aux/install-sh \ + $(top_srcdir)/aux/missing @ENABLE_EDITOR_TRUE@am__append_1 = editor subdir = . ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 @@ -218,6 +218,7 @@ EGREP = @EGREP@ EXEEXT = @EXEEXT@ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ +GLIB_COMPILE_RESOURCES = @GLIB_COMPILE_RESOURCES@ GLIB_COMPILE_SCHEMAS = @GLIB_COMPILE_SCHEMAS@ GMOFILES = @GMOFILES@ GMSGFMT = @GMSGFMT@ diff -Nru d-conf-0.16.1/NEWS d-conf-0.18.0/NEWS --- d-conf-0.16.1/NEWS 2013-07-16 16:25:29.000000000 +0000 +++ d-conf-0.18.0/NEWS 2013-09-23 21:28:40.000000000 +0000 @@ -1,10 +1,69 @@ -Changes in dconf 0.16.1 +Changes in dconf 0.18.0 ======================== -Fix a crash when using DConfChangeset in two threads (as can happen -during normal writes to dconf). +Translations updates: + Basque + Danish + Japanese + Korean + Portuguese + Punjabi + +Changes in dconf 0.17.1 +======================== + +Documentation updates, including better coverage of profiles. + +Translations updates: + Assamese + Belarusian + Catalan + Dutch + Estonian + Finnish + French + German + Hungarian + Indonesian + Italian + Korean + Latvian + Polish + Russian + Serbian + Tajik + Thai + Traditional Chinese + +Changes in dconf 0.17.0 +======================== + +Fix a semi-serious thread safety issue: -Updated Indonesian translation + https://bugzilla.gnome.org/show_bug.cgi?id=703073 + +Some improvements to the editor: + + - fix some compile warnings + - use gresource + - cancel searches on escape + +Translation updates: + Brazilian Portuguese + Czech + Esperanto + Friulian + Galician + German + Hebrew + Indonesian + Lithuanian + Malayalam + Norwegian bokmål + Slovak + Slovenian + Spanish + Tajik Changes in dconf 0.16.0 ======================== diff -Nru d-conf-0.16.1/aclocal.m4 d-conf-0.18.0/aclocal.m4 --- d-conf-0.16.1/aclocal.m4 2013-07-16 16:43:48.000000000 +0000 +++ d-conf-0.18.0/aclocal.m4 2013-09-23 21:29:27.000000000 +0000 @@ -20,239 +20,6 @@ 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. -# -# 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. - -# 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]) -# -# 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]) - -# _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]) -# -# -# 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 - -pkg_failed=no -AC_MSG_CHECKING([for $1]) - -_PKG_CONFIG([$1][_CFLAGS], [cflags], [$2]) -_PKG_CONFIG([$1][_LIBS], [libs], [$2]) - -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.]) - -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 - - m4_default([$4], [AC_MSG_ERROR( -[Package requirements ($2) were not met: - -$$1_PKG_ERRORS - -Consider adjusting the PKG_CONFIG_PATH environment variable if you -installed software in a non-standard prefix. - -_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 - ]) -else - $1[]_CFLAGS=$pkg_cv_[]$1[]_CFLAGS - $1[]_LIBS=$pkg_cv_[]$1[]_LIBS - AC_MSG_RESULT([yes]) - $3 -fi[]dnl -])# PKG_CHECK_MODULES - - -# PKG_INSTALLDIR(DIRECTORY) -# ------------------------- -# Substitutes the variable pkgconfigdir as the location where a module -# should install pkg-config .pc files. By default the directory is -# $libdir/pkgconfig, but the default can be changed by passing -# DIRECTORY. The user can override through the --with-pkgconfigdir -# parameter. -AC_DEFUN([PKG_INSTALLDIR], -[m4_pushdef([pkg_default], [m4_default([$1], ['${libdir}/pkgconfig'])]) -m4_pushdef([pkg_description], - [pkg-config installation directory @<:@]pkg_default[@:>@]) -AC_ARG_WITH([pkgconfigdir], - [AS_HELP_STRING([--with-pkgconfigdir], pkg_description)],, - [with_pkgconfigdir=]pkg_default) -AC_SUBST([pkgconfigdir], [$with_pkgconfigdir]) -m4_popdef([pkg_default]) -m4_popdef([pkg_description]) -]) dnl PKG_INSTALLDIR - - -# PKG_NOARCH_INSTALLDIR(DIRECTORY) -# ------------------------- -# Substitutes the variable noarch_pkgconfigdir as the location where a -# module should install arch-independent pkg-config .pc files. By -# default the directory is $datadir/pkgconfig, but the default can be -# changed by passing DIRECTORY. The user can override through the -# --with-noarch-pkgconfigdir parameter. -AC_DEFUN([PKG_NOARCH_INSTALLDIR], -[m4_pushdef([pkg_default], [m4_default([$1], ['${datadir}/pkgconfig'])]) -m4_pushdef([pkg_description], - [pkg-config arch-independent installation directory @<:@]pkg_default[@:>@]) -AC_ARG_WITH([noarch-pkgconfigdir], - [AS_HELP_STRING([--with-noarch-pkgconfigdir], pkg_description)],, - [with_noarch_pkgconfigdir=]pkg_default) -AC_SUBST([noarch_pkgconfigdir], [$with_noarch_pkgconfigdir]) -m4_popdef([pkg_default]) -m4_popdef([pkg_description]) -]) dnl PKG_NOARCH_INSTALLDIR - # Copyright (C) 1995-2002 Free Software Foundation, Inc. # Copyright (C) 2001-2003,2004 Red Hat, Inc. # @@ -570,6 +337,7 @@ dnl glib_DEFUN([GLIB_GNU_GETTEXT], [AC_REQUIRE([AC_PROG_CC])dnl + AC_REQUIRE([AC_HEADER_STDC])dnl GLIB_LC_MESSAGES GLIB_WITH_NLS @@ -773,6 +541,239 @@ ] ) +# 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. +# +# 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. + +# 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]) +# +# 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]) + +# _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]) +# +# +# 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 + +pkg_failed=no +AC_MSG_CHECKING([for $1]) + +_PKG_CONFIG([$1][_CFLAGS], [cflags], [$2]) +_PKG_CONFIG([$1][_LIBS], [libs], [$2]) + +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.]) + +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 + + m4_default([$4], [AC_MSG_ERROR( +[Package requirements ($2) were not met: + +$$1_PKG_ERRORS + +Consider adjusting the PKG_CONFIG_PATH environment variable if you +installed software in a non-standard prefix. + +_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 + ]) +else + $1[]_CFLAGS=$pkg_cv_[]$1[]_CFLAGS + $1[]_LIBS=$pkg_cv_[]$1[]_LIBS + AC_MSG_RESULT([yes]) + $3 +fi[]dnl +])# PKG_CHECK_MODULES + + +# PKG_INSTALLDIR(DIRECTORY) +# ------------------------- +# Substitutes the variable pkgconfigdir as the location where a module +# should install pkg-config .pc files. By default the directory is +# $libdir/pkgconfig, but the default can be changed by passing +# DIRECTORY. The user can override through the --with-pkgconfigdir +# parameter. +AC_DEFUN([PKG_INSTALLDIR], +[m4_pushdef([pkg_default], [m4_default([$1], ['${libdir}/pkgconfig'])]) +m4_pushdef([pkg_description], + [pkg-config installation directory @<:@]pkg_default[@:>@]) +AC_ARG_WITH([pkgconfigdir], + [AS_HELP_STRING([--with-pkgconfigdir], pkg_description)],, + [with_pkgconfigdir=]pkg_default) +AC_SUBST([pkgconfigdir], [$with_pkgconfigdir]) +m4_popdef([pkg_default]) +m4_popdef([pkg_description]) +]) dnl PKG_INSTALLDIR + + +# PKG_NOARCH_INSTALLDIR(DIRECTORY) +# ------------------------- +# Substitutes the variable noarch_pkgconfigdir as the location where a +# module should install arch-independent pkg-config .pc files. By +# default the directory is $datadir/pkgconfig, but the default can be +# changed by passing DIRECTORY. The user can override through the +# --with-noarch-pkgconfigdir parameter. +AC_DEFUN([PKG_NOARCH_INSTALLDIR], +[m4_pushdef([pkg_default], [m4_default([$1], ['${datadir}/pkgconfig'])]) +m4_pushdef([pkg_description], + [pkg-config arch-independent installation directory @<:@]pkg_default[@:>@]) +AC_ARG_WITH([noarch-pkgconfigdir], + [AS_HELP_STRING([--with-noarch-pkgconfigdir], pkg_description)],, + [with_noarch_pkgconfigdir=]pkg_default) +AC_SUBST([noarch_pkgconfigdir], [$with_noarch_pkgconfigdir]) +m4_popdef([pkg_default]) +m4_popdef([pkg_description]) +]) dnl PKG_NOARCH_INSTALLDIR + # Copyright (C) 2002-2013 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation diff -Nru d-conf-0.16.1/bin/Makefile.am d-conf-0.18.0/bin/Makefile.am --- d-conf-0.16.1/bin/Makefile.am 2013-07-16 16:20:20.000000000 +0000 +++ d-conf-0.18.0/bin/Makefile.am 2013-07-17 20:01:30.000000000 +0000 @@ -1,6 +1,6 @@ include $(top_srcdir)/Makefile.gtester -INCLUDES = -I$(top_srcdir) -I$(top_srcdir)/client +AM_CPPFLAGS = -I$(top_srcdir) -I$(top_srcdir)/client bin_PROGRAMS = dconf diff -Nru d-conf-0.16.1/bin/Makefile.in d-conf-0.18.0/bin/Makefile.in --- d-conf-0.16.1/bin/Makefile.in 2013-07-16 16:43:48.000000000 +0000 +++ d-conf-0.18.0/bin/Makefile.in 2013-09-23 21:29:28.000000000 +0000 @@ -218,6 +218,7 @@ EGREP = @EGREP@ EXEEXT = @EXEEXT@ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ +GLIB_COMPILE_RESOURCES = @GLIB_COMPILE_RESOURCES@ GLIB_COMPILE_SCHEMAS = @GLIB_COMPILE_SCHEMAS@ GMOFILES = @GMOFILES@ GMSGFMT = @GMSGFMT@ @@ -344,7 +345,7 @@ # initialize variables for unconditional += appending TEST_PROGS = -INCLUDES = -I$(top_srcdir) -I$(top_srcdir)/client +AM_CPPFLAGS = -I$(top_srcdir) -I$(top_srcdir)/client dconf_VALAFLAGS = --vapidir ../client --pkg=gio-2.0 --pkg=posix --pkg=dconf dconf_CFLAGS = \ $(gio_CFLAGS) \ diff -Nru d-conf-0.16.1/client/Makefile.in d-conf-0.18.0/client/Makefile.in --- d-conf-0.16.1/client/Makefile.in 2013-07-16 16:43:48.000000000 +0000 +++ d-conf-0.18.0/client/Makefile.in 2013-09-23 21:29:28.000000000 +0000 @@ -235,6 +235,7 @@ EGREP = @EGREP@ EXEEXT = @EXEEXT@ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ +GLIB_COMPILE_RESOURCES = @GLIB_COMPILE_RESOURCES@ GLIB_COMPILE_SCHEMAS = @GLIB_COMPILE_SCHEMAS@ GMOFILES = @GMOFILES@ GMSGFMT = @GMSGFMT@ diff -Nru d-conf-0.16.1/common/Makefile.in d-conf-0.18.0/common/Makefile.in --- d-conf-0.16.1/common/Makefile.in 2013-07-16 16:43:48.000000000 +0000 +++ d-conf-0.18.0/common/Makefile.in 2013-09-23 21:29:28.000000000 +0000 @@ -234,6 +234,7 @@ EGREP = @EGREP@ EXEEXT = @EXEEXT@ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ +GLIB_COMPILE_RESOURCES = @GLIB_COMPILE_RESOURCES@ GLIB_COMPILE_SCHEMAS = @GLIB_COMPILE_SCHEMAS@ GMOFILES = @GMOFILES@ GMSGFMT = @GMSGFMT@ diff -Nru d-conf-0.16.1/configure d-conf-0.18.0/configure --- d-conf-0.16.1/configure 2013-07-16 16:43:49.000000000 +0000 +++ d-conf-0.18.0/configure 2013-09-23 21:29:29.000000000 +0000 @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.69 for dconf 0.16.1. +# Generated by GNU Autoconf 2.69 for dconf 0.18.0. # # Report bugs to . # @@ -641,8 +641,8 @@ # Identity of this package. PACKAGE_NAME='dconf' PACKAGE_TARNAME='dconf' -PACKAGE_VERSION='0.16.1' -PACKAGE_STRING='dconf 0.16.1' +PACKAGE_VERSION='0.18.0' +PACKAGE_STRING='dconf 0.18.0' PACKAGE_BUGREPORT='https://bugzilla.gnome.org/enter_bug.cgi?product=dconf' PACKAGE_URL='' @@ -780,6 +780,7 @@ PKG_CONFIG_PATH PKG_CONFIG GSETTINGS_DISABLE_SCHEMAS_COMPILE +GLIB_COMPILE_RESOURCES ENABLE_MAN_FALSE ENABLE_MAN_TRUE XSLTPROC @@ -1451,7 +1452,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 dconf 0.16.1 to adapt to many kinds of systems. +\`configure' configures dconf 0.18.0 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1517,7 +1518,7 @@ if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of dconf 0.16.1:";; + short | recursive ) echo "Configuration of dconf 0.18.0:";; esac cat <<\_ACEOF @@ -1649,7 +1650,7 @@ test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -dconf configure 0.16.1 +dconf configure 0.18.0 generated by GNU Autoconf 2.69 Copyright (C) 2012 Free Software Foundation, Inc. @@ -1738,6 +1739,48 @@ } # ac_fn_c_try_cpp +# ac_fn_c_try_run LINENO +# ---------------------- +# Try to link conftest.$ac_ext, and return whether this succeeded. Assumes +# that executables *can* be run. +ac_fn_c_try_run () +{ + as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack + if { { ac_try="$ac_link" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" +$as_echo "$ac_try_echo"; } >&5 + (eval "$ac_link") 2>&5 + ac_status=$? + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; } && { ac_try='./conftest$ac_exeext' + { { case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" +$as_echo "$ac_try_echo"; } >&5 + (eval "$ac_try") 2>&5 + ac_status=$? + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; }; }; then : + ac_retval=0 +else + $as_echo "$as_me: program exited with status $ac_status" >&5 + $as_echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + ac_retval=$ac_status +fi + rm -rf conftest.dSYM conftest_ipa8_conftest.oo + eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno + as_fn_set_status $ac_retval + +} # ac_fn_c_try_run + # ac_fn_c_check_header_mongrel LINENO HEADER VAR INCLUDES # ------------------------------------------------------- # Tests whether HEADER exists, giving a warning if it cannot be compiled using @@ -1829,48 +1872,6 @@ } # ac_fn_c_check_header_mongrel -# ac_fn_c_try_run LINENO -# ---------------------- -# Try to link conftest.$ac_ext, and return whether this succeeded. Assumes -# that executables *can* be run. -ac_fn_c_try_run () -{ - as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack - if { { ac_try="$ac_link" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" -$as_echo "$ac_try_echo"; } >&5 - (eval "$ac_link") 2>&5 - ac_status=$? - $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 - test $ac_status = 0; } && { ac_try='./conftest$ac_exeext' - { { case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" -$as_echo "$ac_try_echo"; } >&5 - (eval "$ac_try") 2>&5 - ac_status=$? - $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 - test $ac_status = 0; }; }; then : - ac_retval=0 -else - $as_echo "$as_me: program exited with status $ac_status" >&5 - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_retval=$ac_status -fi - rm -rf conftest.dSYM conftest_ipa8_conftest.oo - eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno - as_fn_set_status $ac_retval - -} # ac_fn_c_try_run - # ac_fn_c_check_header_compile LINENO HEADER VAR INCLUDES # ------------------------------------------------------- # Tests whether HEADER exists and can be compiled using the include files in @@ -2018,7 +2019,7 @@ This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by dconf $as_me 0.16.1, which was +It was created by dconf $as_me 0.18.0, which was generated by GNU Autoconf 2.69. Invocation command line was $ $0 $@ @@ -2887,7 +2888,7 @@ # Define the identity of the package. PACKAGE='dconf' - VERSION='0.16.1' + VERSION='0.18.0' cat >>confdefs.h <<_ACEOF @@ -4193,6 +4194,48 @@ fi +# Use GLib resources +# Extract the first word of "glib-compile-resources", so it can be a program name with args. +set dummy glib-compile-resources; ac_word=$2 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if ${ac_cv_path_GLIB_COMPILE_RESOURCES+:} false; then : + $as_echo_n "(cached) " >&6 +else + case $GLIB_COMPILE_RESOURCES in + [\\/]* | ?:[\\/]*) + ac_cv_path_GLIB_COMPILE_RESOURCES="$GLIB_COMPILE_RESOURCES" # Let the user override the test with a path. + ;; + *) + as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + ac_cv_path_GLIB_COMPILE_RESOURCES="$as_dir/$ac_word$ac_exec_ext" + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done + done +IFS=$as_save_IFS + + ;; +esac +fi +GLIB_COMPILE_RESOURCES=$ac_cv_path_GLIB_COMPILE_RESOURCES +if test -n "$GLIB_COMPILE_RESOURCES"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $GLIB_COMPILE_RESOURCES" >&5 +$as_echo "$GLIB_COMPILE_RESOURCES" >&6; } +else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } +fi + + + # Use GSettings @@ -5033,12 +5076,12 @@ pkg_cv_gtk_CFLAGS="$gtk_CFLAGS" elif test -n "$PKG_CONFIG"; then if test -n "$PKG_CONFIG" && \ - { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gtk+-3.0\""; } >&5 - ($PKG_CONFIG --exists --print-errors "gtk+-3.0") 2>&5 + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gtk+-3.0 >= 3.4\""; } >&5 + ($PKG_CONFIG --exists --print-errors "gtk+-3.0 >= 3.4") 2>&5 ac_status=$? $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then - pkg_cv_gtk_CFLAGS=`$PKG_CONFIG --cflags "gtk+-3.0" 2>/dev/null` + pkg_cv_gtk_CFLAGS=`$PKG_CONFIG --cflags "gtk+-3.0 >= 3.4" 2>/dev/null` test "x$?" != "x0" && pkg_failed=yes else pkg_failed=yes @@ -5050,12 +5093,12 @@ pkg_cv_gtk_LIBS="$gtk_LIBS" elif test -n "$PKG_CONFIG"; then if test -n "$PKG_CONFIG" && \ - { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gtk+-3.0\""; } >&5 - ($PKG_CONFIG --exists --print-errors "gtk+-3.0") 2>&5 + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gtk+-3.0 >= 3.4\""; } >&5 + ($PKG_CONFIG --exists --print-errors "gtk+-3.0 >= 3.4") 2>&5 ac_status=$? $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then - pkg_cv_gtk_LIBS=`$PKG_CONFIG --libs "gtk+-3.0" 2>/dev/null` + pkg_cv_gtk_LIBS=`$PKG_CONFIG --libs "gtk+-3.0 >= 3.4" 2>/dev/null` test "x$?" != "x0" && pkg_failed=yes else pkg_failed=yes @@ -5076,14 +5119,14 @@ _pkg_short_errors_supported=no fi if test $_pkg_short_errors_supported = yes; then - gtk_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "gtk+-3.0" 2>&1` + gtk_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "gtk+-3.0 >= 3.4" 2>&1` else - gtk_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "gtk+-3.0" 2>&1` + gtk_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "gtk+-3.0 >= 3.4" 2>&1` fi # Put the nasty error message in config.log where it belongs echo "$gtk_PKG_ERRORS" >&5 - as_fn_error $? "Package requirements (gtk+-3.0) were not met: + as_fn_error $? "Package requirements (gtk+-3.0 >= 3.4) were not met: $gtk_PKG_ERRORS @@ -7643,7 +7686,7 @@ # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by dconf $as_me 0.16.1, which was +This file was extended by dconf $as_me 0.18.0, which was generated by GNU Autoconf 2.69. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -7709,7 +7752,7 @@ cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`" ac_cs_version="\\ -dconf config.status 0.16.1 +dconf config.status 0.18.0 configured by $0, generated by GNU Autoconf 2.69, with options \\"\$ac_cs_config\\" diff -Nru d-conf-0.16.1/configure.ac d-conf-0.18.0/configure.ac --- d-conf-0.16.1/configure.ac 2013-07-16 16:24:09.000000000 +0000 +++ d-conf-0.18.0/configure.ac 2013-09-23 21:29:03.000000000 +0000 @@ -1,5 +1,5 @@ AC_INIT([dconf], - [0.16.1], + [0.18.0], [https://bugzilla.gnome.org/enter_bug.cgi?product=dconf], [dconf]) @@ -33,6 +33,9 @@ ]) AM_CONDITIONAL(ENABLE_MAN, test "$enable_man" != no) +# Use GLib resources +AC_PATH_PROG(GLIB_COMPILE_RESOURCES, glib-compile-resources) + # Use GSettings GLIB_GSETTINGS @@ -50,7 +53,7 @@ AM_CONDITIONAL(ENABLE_EDITOR, test "x$enable_editor" != "xno") if test "x$enable_editor" != "xno"; then - PKG_CHECK_MODULES(gtk, gtk+-3.0) + PKG_CHECK_MODULES(gtk, gtk+-3.0 >= 3.4) PKG_CHECK_MODULES(gmodule, gmodule-2.0) PKG_CHECK_MODULES(libxml, libxml-2.0) fi diff -Nru d-conf-0.16.1/dbus-1/Makefile.in d-conf-0.18.0/dbus-1/Makefile.in --- d-conf-0.16.1/dbus-1/Makefile.in 2013-07-16 16:43:49.000000000 +0000 +++ d-conf-0.18.0/dbus-1/Makefile.in 2013-09-23 21:29:28.000000000 +0000 @@ -245,6 +245,7 @@ EGREP = @EGREP@ EXEEXT = @EXEEXT@ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ +GLIB_COMPILE_RESOURCES = @GLIB_COMPILE_RESOURCES@ GLIB_COMPILE_SCHEMAS = @GLIB_COMPILE_SCHEMAS@ GMOFILES = @GMOFILES@ GMSGFMT = @GMSGFMT@ diff -Nru d-conf-0.16.1/debian/changelog d-conf-0.18.0/debian/changelog --- d-conf-0.16.1/debian/changelog 2013-07-17 09:52:08.000000000 +0000 +++ d-conf-0.18.0/debian/changelog 2013-10-21 14:13:38.000000000 +0000 @@ -1,3 +1,18 @@ +d-conf (0.18.0-1~saucy1) saucy; urgency=medium + + * Copied from debian + + -- Rico Tzschichholz Mon, 21 Oct 2013 16:13:38 +0200 + +d-conf (0.18.0-1) unstable; urgency=low + + * New upstream release. + * Bump build-dependency on libgtk-3-dev to >= 3.4.0 + * debian/dconf-editor.install: don't install usr/bin/dconf-editor + - GLib UI resources are now embedded using glib-compile-resources + + -- Andreas Henriksson Thu, 17 Oct 2013 17:42:48 +0200 + d-conf (0.16.1-1) unstable; urgency=low [ Jeremy Bicha ] diff -Nru d-conf-0.16.1/debian/control d-conf-0.18.0/debian/control --- d-conf-0.16.1/debian/control 2013-07-17 09:57:11.000000000 +0000 +++ d-conf-0.18.0/debian/control 2013-10-21 14:13:44.000000000 +0000 @@ -2,12 +2,11 @@ # # Modifications should be made to debian/control.in instead. # This file is regenerated automatically in the clean target. - Source: d-conf Section: libs Priority: optional Maintainer: Debian GNOME Maintainers -Uploaders: Emilio Pozuelo Monfort , Josselin Mouette , Michael Biebl , Sebastien Bacher +Uploaders: Andreas Henriksson , Emilio Pozuelo Monfort , Josselin Mouette , Michael Biebl , Sebastien Bacher Build-Depends: debhelper (>= 8.1.3), cdbs (>= 0.4.93), autotools-dev, @@ -18,11 +17,11 @@ valac (>= 0.17.0), libglib2.0-dev (>= 2.35.2), libdbus-1-dev, - libgtk-3-dev (>= 3.0.0), + libgtk-3-dev (>= 3.4.0), libxml2-dev Standards-Version: 3.9.4 Homepage: https://wiki.gnome.org/dconf -Vcs-Svn: svn://anonscm.debian.org/svn/pkg-gnome/desktop/unstable/d-conf +Vcs-Svn: svn://anonscm.debian.org/pkg-gnome/desktop/unstable/d-conf Vcs-Browser: http://anonscm.debian.org/viewvc/pkg-gnome/desktop/unstable/d-conf/ XS-Testsuite: autopkgtest diff -Nru d-conf-0.16.1/debian/control.in d-conf-0.18.0/debian/control.in --- d-conf-0.16.1/debian/control.in 2013-06-28 23:05:44.000000000 +0000 +++ d-conf-0.18.0/debian/control.in 2013-10-17 15:41:58.000000000 +0000 @@ -13,11 +13,11 @@ valac (>= 0.17.0), libglib2.0-dev (>= 2.35.2), libdbus-1-dev, - libgtk-3-dev (>= 3.0.0), + libgtk-3-dev (>= 3.4.0), libxml2-dev Standards-Version: 3.9.4 Homepage: https://wiki.gnome.org/dconf -Vcs-Svn: svn://anonscm.debian.org/svn/pkg-gnome/desktop/unstable/d-conf +Vcs-Svn: svn://anonscm.debian.org/pkg-gnome/desktop/unstable/d-conf Vcs-Browser: http://anonscm.debian.org/viewvc/pkg-gnome/desktop/unstable/d-conf/ XS-Testsuite: autopkgtest diff -Nru d-conf-0.16.1/debian/dconf-editor.install d-conf-0.18.0/debian/dconf-editor.install --- d-conf-0.16.1/debian/dconf-editor.install 2013-05-31 14:19:33.000000000 +0000 +++ d-conf-0.18.0/debian/dconf-editor.install 2013-10-17 15:51:01.000000000 +0000 @@ -1,5 +1,4 @@ usr/bin/dconf-editor -usr/share/dconf-editor usr/share/applications/dconf-editor.desktop usr/share/glib-2.0/schemas/*dconf-editor* usr/share/icons diff -Nru d-conf-0.16.1/docs/Makefile.am d-conf-0.18.0/docs/Makefile.am --- d-conf-0.16.1/docs/Makefile.am 2013-07-16 16:20:20.000000000 +0000 +++ d-conf-0.18.0/docs/Makefile.am 2013-07-17 20:01:30.000000000 +0000 @@ -12,7 +12,7 @@ MKDB_OPTIONS = --output-format=xml -INCLUDES = $(gio_CFLAGS) +AM_CPPFLAGS = $(gio_CFLAGS) GTKDOC_LIBS = $(gio_LIBS) -L../client -ldconf -Wl,-rpath=../client content_files = \ diff -Nru d-conf-0.16.1/docs/Makefile.in d-conf-0.18.0/docs/Makefile.in --- d-conf-0.16.1/docs/Makefile.in 2013-07-16 16:43:49.000000000 +0000 +++ d-conf-0.18.0/docs/Makefile.in 2013-09-23 21:29:28.000000000 +0000 @@ -177,6 +177,7 @@ EGREP = @EGREP@ EXEEXT = @EXEEXT@ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ +GLIB_COMPILE_RESOURCES = @GLIB_COMPILE_RESOURCES@ GLIB_COMPILE_SCHEMAS = @GLIB_COMPILE_SCHEMAS@ GMOFILES = @GMOFILES@ GMSGFMT = @GMSGFMT@ @@ -383,7 +384,7 @@ HFILE_GLOB = $(top_srcdir)/client/*.h $(top_srcdir)/common/*.h CFILE_GLOB = $(top_srcdir)/client/*.c $(top_srcdir)/common/*.c MKDB_OPTIONS = --output-format=xml -INCLUDES = $(gio_CFLAGS) +AM_CPPFLAGS = $(gio_CFLAGS) GTKDOC_LIBS = $(gio_LIBS) -L../client -ldconf -Wl,-rpath=../client content_files = \ dconf-overview.xml \ diff -Nru d-conf-0.16.1/docs/dconf-overview.xml d-conf-0.18.0/docs/dconf-overview.xml --- d-conf-0.16.1/docs/dconf-overview.xml 2013-03-14 18:27:40.000000000 +0000 +++ d-conf-0.18.0/docs/dconf-overview.xml 2013-07-17 20:01:34.000000000 +0000 @@ -61,6 +61,121 @@ client libraries through a clever "fast" mechanism that records the outstanding changes locally (so they can be read back immediately) until the service signals that a write has completed. + + The binary database format that dconf uses by default is not suitable for use on NFS, where mmap does not + work well. To handle this common use case, dconf can be configured to place its binary database in + XDG_RUNTIME_DIR (which is guaranteed to be local, but non-persistent) and synchronize it + with a plain text keyfile in the users home directory. + + + + + Profiles + + + A profile is a list of configuration databases that dconf consults to find the value for a key. The user's personal + database always takes the highest priority, followed by the system databases in the order prescribed by the profile. + + + + On startup, dconf consults the DCONF_PROFILE environment variable. If set, dconf will attempt to open + the named profile, aborting if that fails. If the environment variable is not set, it will attempt to open the profile + named "user" and if that fails, it will fall back to an internal hard-wired configuration. dconf stores its profiles + in text files. DCONF_PROFILE can specify a relative path to a file in /etc/dconf/profile/, + or an absolute path (such as in a user's home directory). The profile name can only use alphanumeric characters or '_'. + + + + A profile file might look like the following: + +user-db:user +system-db:local +system-db:site + + + + + Each line in a profile specifies one dconf database. The first line indicates the database used to write changes, and the + remaining lines indicate read-only databases. (The first line should specify a user-db or service-db, so that users can actually + make configuration changes.) + + + + A "user-db" line specifies a user database. These databases are found in $XDG_CONFIG_HOME/dconf/. + The name of the file to open in that directory is exactly as it is written in the profile. This file is expected to be in the binary + dconf database format. Note that XDG_CONFIG_HOME cannot be set/modified per terminal or session, because then the writer + and reader would be working on different DBs (the writer is started by DBus and cannot see that variable). + + + + A "service-db" line instructs dconf to place the binary database file for the user database in XDG_RUNTIME_DIR. + Since this location is not persistent, the rest of the line instructs dconf how to store the database persistently. A typical + line is service-db:keyfile/user, which tells dconf to synchronize the binary database with a plain text + keyfile in $XDG_CONFIG_HOME/dconf/user.txt. The synchronization is bi-directional. + + + + A "system-db" line specifies a system database. These databases are found in /etc/dconf/db/. Again, the name of + the file to open in that directory is exactly as it is written in the profile and the file is expected to be in the dconf database + format. + + + + If the DCONF_PROFILE environment variable is unset and the "user" profile can not be opened, then the effect is as if + the profile was specified by this file: + +user-db:user + + That is, the user's personal database is consulted and there are no system settings. + + + + + Key Files + + + To facilitate system configuration with a text editor, dconf can populate databases from plain text keyfiles. For any given system + database, keyfiles can be placed into the /etc/dconf/db/database.d/ directory. The + keyfiles contain groups of settings as follows: + + +# Some useful default settings for our site + +[system/proxy/http] +host='172.16.0.1' +enabled=true + +[org/gnome/desktop/background] +picture-uri='file:///usr/local/rupert-corp/company-wallpaper.jpeg' + + + After changing keyfiles, the database needs to be updated with the + dconf1 tool. + + + + + Locks + + + System databases can contain 'locks' for keys. If a lock for a particular key or subpath is installed into a database + then no database listed above that one in the profile will be able to modify any of the affected settings. This can be + used to enforce mandatory settings. + + + + To add locks to a database, place text files in the /etc/dconf/db/database.d/locks + directory, where database is the name of a system database, as specified in the profile. The files + contain list of keys to lock, on per line. Lines starting with a # are ignored. Here is an example: + + +# prevent changes to the company wallpaper +/org/gnome/desktop/background/picture-uri + + + After changing locks, the database needs to be updated with the + dconf1 tool. + diff -Nru d-conf-0.16.1/docs/dconf-tool.xml d-conf-0.18.0/docs/dconf-tool.xml --- d-conf-0.16.1/docs/dconf-tool.xml 2013-03-14 18:27:40.000000000 +0000 +++ d-conf-0.18.0/docs/dconf-tool.xml 2013-09-10 14:13:01.000000000 +0000 @@ -83,10 +83,10 @@ The dconf program can perform various operations on a dconf database, such as reading - or writing individual values or entire directories. This tool operates directly on the dconf database and - does not read gsettings schema information. Therefore, it cannot perform type and consistency checks on - values. The gsettings1 - utility is an alternative if such checks are needed. + or writing individual values or entire directories. This tool operates on dconf directly, without using + gsettings schema information. Therefore, it cannot perform type and consistency checks on values. The + gsettings1 utility is + an alternative if such checks are needed. @@ -99,6 +99,10 @@ VALUE arguments must be in GVariant format, so e.g. a string must include explicit quotes: "'foo'". This format is also used when printing out values. + + + Note that dconf needs a D-Bus session bus connection to write changes to the dconf database. + @@ -164,6 +168,20 @@ + Environment + + + + DCONF_PROFILE + + This environment variable determines which dconf profile to use. See + dconf7. + + + + + + See Also dconf7, diff -Nru d-conf-0.16.1/docs/html/DConfClient.html d-conf-0.18.0/docs/html/DConfClient.html --- d-conf-0.16.1/docs/html/DConfClient.html 2013-07-16 16:46:17.000000000 +0000 +++ d-conf-0.18.0/docs/html/DConfClient.html 2013-09-23 21:29:39.000000000 +0000 @@ -8,7 +8,7 @@ - + @@ -58,7 +58,7 @@ const gchar *key, GVariant *value, gchar **tag, - GCancellable *cancellable, + GCancellable *cancellable, GError **error); gboolean dconf_client_change_fast (DConfClient *client, DConfChangeset *changeset, @@ -66,7 +66,7 @@ gboolean dconf_client_change_sync (DConfClient *client, DConfChangeset *changeset, gchar **tag, - GCancellable *cancellable, + GCancellable *cancellable, GError **error); void dconf_client_watch_fast (DConfClient *client, const gchar *path); @@ -103,7 +103,7 @@

Most applications probably don't want to access dconf directly and -would be better off using something like GSettings. +would be better off using something like GSettings.

Please note that the API of libdconf is not stable in any way. It @@ -331,7 +331,7 @@ const gchar *key, GVariant *value, gchar **tag, - GCancellable *cancellable, + GCancellable *cancellable, GError **error);

Write value to the given key, or reset key to its default value. @@ -377,7 +377,7 @@

cancellable :

-a GCancellable, or NULL +a GCancellable, or NULL @@ -457,7 +457,7 @@ 
gboolean            dconf_client_change_sync            (DConfClient *client,
                                                          DConfChangeset *changeset,
                                                          gchar **tag,
-                                                         GCancellable *cancellable,
+                                                         GCancellable *cancellable,
                                                          GError **error);

Performs the change operation described by changeset. @@ -500,7 +500,7 @@

cancellable :

-a GCancellable, or NULL +a GCancellable, or NULL @@ -768,6 +768,6 @@
- Generated by GTK-Doc V1.19.1
+ Generated by GTK-Doc V1.19 \ No newline at end of file diff -Nru d-conf-0.16.1/docs/html/annotation-glossary.html d-conf-0.18.0/docs/html/annotation-glossary.html --- d-conf-0.16.1/docs/html/annotation-glossary.html 2013-07-16 16:46:17.000000000 +0000 +++ d-conf-0.18.0/docs/html/annotation-glossary.html 2013-09-23 21:29:39.000000000 +0000 @@ -7,7 +7,7 @@ - + @@ -42,6 +42,6 @@
- Generated by GTK-Doc V1.19.1
+ Generated by GTK-Doc V1.19 \ No newline at end of file diff -Nru d-conf-0.16.1/docs/html/api-index-full.html d-conf-0.18.0/docs/html/api-index-full.html --- d-conf-0.16.1/docs/html/api-index-full.html 2013-07-16 16:46:17.000000000 +0000 +++ d-conf-0.18.0/docs/html/api-index-full.html 2013-09-23 21:29:39.000000000 +0000 @@ -8,7 +8,7 @@ - + @@ -191,6 +191,6 @@
- Generated by GTK-Doc V1.19.1
+ Generated by GTK-Doc V1.19 \ No newline at end of file diff -Nru d-conf-0.16.1/docs/html/ch01.html d-conf-0.18.0/docs/html/ch01.html --- d-conf-0.16.1/docs/html/ch01.html 2013-07-16 16:46:17.000000000 +0000 +++ d-conf-0.18.0/docs/html/ch01.html 2013-09-23 21:29:39.000000000 +0000 @@ -8,7 +8,7 @@ - + @@ -36,6 +36,6 @@
- Generated by GTK-Doc V1.19.1
+ Generated by GTK-Doc V1.19 \ No newline at end of file diff -Nru d-conf-0.16.1/docs/html/dconf-DConfChangeset.html d-conf-0.18.0/docs/html/dconf-DConfChangeset.html --- d-conf-0.16.1/docs/html/dconf-DConfChangeset.html 2013-07-16 16:46:17.000000000 +0000 +++ d-conf-0.18.0/docs/html/dconf-DConfChangeset.html 2013-09-23 21:29:39.000000000 +0000 @@ -8,7 +8,7 @@ - + @@ -728,6 +728,6 @@
- Generated by GTK-Doc V1.19.1
+ Generated by GTK-Doc V1.19 \ No newline at end of file diff -Nru d-conf-0.16.1/docs/html/dconf-dconf-Paths.html d-conf-0.18.0/docs/html/dconf-dconf-Paths.html --- d-conf-0.16.1/docs/html/dconf-dconf-Paths.html 2013-07-16 16:46:17.000000000 +0000 +++ d-conf-0.18.0/docs/html/dconf-dconf-Paths.html 2013-09-23 21:29:39.000000000 +0000 @@ -8,7 +8,7 @@ - + @@ -299,6 +299,6 @@
- Generated by GTK-Doc V1.19.1
+ Generated by GTK-Doc V1.19 \ No newline at end of file diff -Nru d-conf-0.16.1/docs/html/dconf-editor.html d-conf-0.18.0/docs/html/dconf-editor.html --- d-conf-0.16.1/docs/html/dconf-editor.html 2013-07-16 16:46:17.000000000 +0000 +++ d-conf-0.18.0/docs/html/dconf-editor.html 2013-09-23 21:29:39.000000000 +0000 @@ -8,7 +8,7 @@ - + @@ -55,6 +55,6 @@
- Generated by GTK-Doc V1.19.1
+ Generated by GTK-Doc V1.19 \ No newline at end of file diff -Nru d-conf-0.16.1/docs/html/dconf-overview.html d-conf-0.18.0/docs/html/dconf-overview.html --- d-conf-0.16.1/docs/html/dconf-overview.html 2013-07-16 16:46:17.000000000 +0000 +++ d-conf-0.18.0/docs/html/dconf-overview.html 2013-09-23 21:29:39.000000000 +0000 @@ -8,7 +8,7 @@ - + @@ -59,9 +59,114 @@ client libraries through a clever "fast" mechanism that records the outstanding changes locally (so they can be read back immediately) until the service signals that a write has completed.

+

+ The binary database format that dconf uses by default is not suitable for use on NFS, where mmap does not + work well. To handle this common use case, dconf can be configured to place its binary database in + XDG_RUNTIME_DIR (which is guaranteed to be local, but non-persistent) and synchronize it + with a plain text keyfile in the users home directory. +

+ +
+

Profiles

+

+ A profile is a list of configuration databases that dconf consults to find the value for a key. The user's personal + database always takes the highest priority, followed by the system databases in the order prescribed by the profile. +

+

+ On startup, dconf consults the DCONF_PROFILE environment variable. If set, dconf will attempt to open + the named profile, aborting if that fails. If the environment variable is not set, it will attempt to open the profile + named "user" and if that fails, it will fall back to an internal hard-wired configuration. dconf stores its profiles + in text files. DCONF_PROFILE can specify a relative path to a file in /etc/dconf/profile/, + or an absolute path (such as in a user's home directory). The profile name can only use alphanumeric characters or '_'. +

+

+ A profile file might look like the following: +

+
+user-db:user
+system-db:local
+system-db:site
+
+

+

+

+ Each line in a profile specifies one dconf database. The first line indicates the database used to write changes, and the + remaining lines indicate read-only databases. (The first line should specify a user-db or service-db, so that users can actually + make configuration changes.) +

+

+ A "user-db" line specifies a user database. These databases are found in $XDG_CONFIG_HOME/dconf/. + The name of the file to open in that directory is exactly as it is written in the profile. This file is expected to be in the binary + dconf database format. Note that XDG_CONFIG_HOME cannot be set/modified per terminal or session, because then the writer + and reader would be working on different DBs (the writer is started by DBus and cannot see that variable). +

+

+ A "service-db" line instructs dconf to place the binary database file for the user database in XDG_RUNTIME_DIR. + Since this location is not persistent, the rest of the line instructs dconf how to store the database persistently. A typical + line is service-db:keyfile/user, which tells dconf to synchronize the binary database with a plain text + keyfile in $XDG_CONFIG_HOME/dconf/user.txt. The synchronization is bi-directional. +

+

+ A "system-db" line specifies a system database. These databases are found in /etc/dconf/db/. Again, the name of + the file to open in that directory is exactly as it is written in the profile and the file is expected to be in the dconf database + format. +

+

+ If the DCONF_PROFILE environment variable is unset and the "user" profile can not be opened, then the effect is as if + the profile was specified by this file: +

+
+user-db:user
+
+

+ That is, the user's personal database is consulted and there are no system settings. +

+
+
+

Key Files

+

+ To facilitate system configuration with a text editor, dconf can populate databases from plain text keyfiles. For any given system + database, keyfiles can be placed into the /etc/dconf/db/database.d/ directory. The + keyfiles contain groups of settings as follows: +

+
+# Some useful default settings for our site
+
+[system/proxy/http]
+host='172.16.0.1'
+enabled=true
+
+[org/gnome/desktop/background]
+picture-uri='file:///usr/local/rupert-corp/company-wallpaper.jpeg'
+
+

+ After changing keyfiles, the database needs to be updated with the + dconf(1) tool. +

+
+
+

Locks

+

+ System databases can contain 'locks' for keys. If a lock for a particular key or subpath is installed into a database + then no database listed above that one in the profile will be able to modify any of the affected settings. This can be + used to enforce mandatory settings. +

+

+ To add locks to a database, place text files in the /etc/dconf/db/database.d/locks + directory, where database is the name of a system database, as specified in the profile. The files + contain list of keys to lock, on per line. Lines starting with a # are ignored. Here is an example: +

+
+# prevent changes to the company wallpaper
+/org/gnome/desktop/background/picture-uri
+
+

+ After changing locks, the database needs to be updated with the + dconf(1) tool. +

-

Portability

+

Portability

dconf mostly targets Free Software operating systems. It will theoretically run on Mac OS but there isn't much point to that (since Mac OS applications want to store preferences in plist files). It is not @@ -70,7 +175,7 @@

-

API stability

+

API stability

The dconf API is not particularly friendly, and is not guaranteed to be stable. Because of this and the lack of portability, you almost certainly want to use some sort of wrapper API around it. The wrapper API @@ -81,7 +186,7 @@

-

See Also

+

See Also

dconf-service(1), dconf-editor(1), @@ -92,6 +197,6 @@

- Generated by GTK-Doc V1.19.1
+ Generated by GTK-Doc V1.19 \ No newline at end of file diff -Nru d-conf-0.16.1/docs/html/dconf-service.html d-conf-0.18.0/docs/html/dconf-service.html --- d-conf-0.16.1/docs/html/dconf-service.html 2013-07-16 16:46:17.000000000 +0000 +++ d-conf-0.18.0/docs/html/dconf-service.html 2013-09-23 21:29:39.000000000 +0000 @@ -8,7 +8,7 @@ - + @@ -57,6 +57,6 @@
- Generated by GTK-Doc V1.19.1
+ Generated by GTK-Doc V1.19 \ No newline at end of file diff -Nru d-conf-0.16.1/docs/html/dconf-tool.html d-conf-0.18.0/docs/html/dconf-tool.html --- d-conf-0.16.1/docs/html/dconf-tool.html 2013-07-16 16:46:17.000000000 +0000 +++ d-conf-0.18.0/docs/html/dconf-tool.html 2013-09-23 21:29:39.000000000 +0000 @@ -8,7 +8,7 @@ - + @@ -44,10 +44,10 @@

Description

The dconf program can perform various operations on a dconf database, such as reading - or writing individual values or entire directories. This tool operates directly on the dconf database and - does not read gsettings schema information. Therefore, it cannot perform type and consistency checks on - values. The gsettings(1) - utility is an alternative if such checks are needed. + or writing individual values or entire directories. This tool operates on dconf directly, without using + gsettings schema information. Therefore, it cannot perform type and consistency checks on values. The + gsettings(1) utility is + an alternative if such checks are needed.

The DIR arguments must be directory paths (starting and ending with '/'), the @@ -58,6 +58,9 @@ VALUE arguments must be in GVariant format, so e.g. a string must include explicit quotes: "'foo'". This format is also used when printing out values.

+

+ Note that dconf needs a D-Bus session bus connection to write changes to the dconf database. +

Commands

@@ -107,7 +110,23 @@
-

See Also

+

Environment

+
++++ + + + + +

DCONF_PROFILE

+ This environment variable determines which dconf profile to use. See + dconf(7). +

+
+
+

See Also

dconf(7), gsettings(1), @@ -117,6 +136,6 @@

- Generated by GTK-Doc V1.19.1
+ Generated by GTK-Doc V1.19 \ No newline at end of file diff -Nru d-conf-0.16.1/docs/html/index.html d-conf-0.18.0/docs/html/index.html --- d-conf-0.16.1/docs/html/index.html 2013-07-16 16:46:17.000000000 +0000 +++ d-conf-0.18.0/docs/html/index.html 2013-09-23 21:29:39.000000000 +0000 @@ -6,7 +6,7 @@ - + @@ -56,6 +56,6 @@
- Generated by GTK-Doc V1.19.1
+ Generated by GTK-Doc V1.19 \ No newline at end of file diff -Nru d-conf-0.16.1/docs/html/object-tree.html d-conf-0.18.0/docs/html/object-tree.html --- d-conf-0.16.1/docs/html/object-tree.html 2013-07-16 16:46:17.000000000 +0000 +++ d-conf-0.18.0/docs/html/object-tree.html 2013-09-23 21:29:39.000000000 +0000 @@ -8,7 +8,7 @@ - + @@ -41,6 +41,6 @@
- Generated by GTK-Doc V1.19.1
+ Generated by GTK-Doc V1.19 \ No newline at end of file diff -Nru d-conf-0.16.1/docs/html/programs.html d-conf-0.18.0/docs/html/programs.html --- d-conf-0.16.1/docs/html/programs.html 2013-07-16 16:46:17.000000000 +0000 +++ d-conf-0.18.0/docs/html/programs.html 2013-09-23 21:29:39.000000000 +0000 @@ -8,7 +8,7 @@ - + @@ -36,6 +36,6 @@
- Generated by GTK-Doc V1.19.1
+ Generated by GTK-Doc V1.19 \ No newline at end of file diff -Nru d-conf-0.16.1/editor/Makefile.am d-conf-0.18.0/editor/Makefile.am --- d-conf-0.16.1/editor/Makefile.am 2013-07-16 16:20:20.000000000 +0000 +++ d-conf-0.18.0/editor/Makefile.am 2013-07-17 20:01:30.000000000 +0000 @@ -1,6 +1,6 @@ include $(top_srcdir)/Makefile.gtester -INCLUDES = -I$(top_srcdir) -I$(top_srcdir)/client +AM_CPPFLAGS = -I$(top_srcdir) -I$(top_srcdir)/client bin_PROGRAMS = dconf-editor @@ -23,6 +23,16 @@ -DGETTEXT_PACKAGE=\"$(GETTEXT_PACKAGE)\"\ -w +resource_data = \ + dconf-editor.gresource.xml \ + dconf-editor-menu.ui \ + dconf-editor.ui + +resources.c: $(resource_data) + $(AM_V_GEN) $(GLIB_COMPILE_RESOURCES) --sourcedir=$(srcdir) --target=$@ --generate-source $< + +nodist_dconf_editor_SOURCES = resources.c + dconf_editor_SOURCES = \ config.vapi \ dconf-editor.vala \ @@ -33,7 +43,7 @@ desktopdir = $(datadir)/applications desktop_in_files = dconf-editor.desktop.in.in desktop_DATA = $(desktop_in_files:.desktop.in.in=.desktop) -CLEANFILES = $(desktop_DATA) +CLEANFILES = $(desktop_DATA) resources.c @INTLTOOL_DESKTOP_RULE@ gsettings_SCHEMAS = ca.desrt.dconf-editor.gschema.xml @@ -64,7 +74,4 @@ gtk-update-icon-cache -f -t $(datadir)/icons/hicolor; \ fi -pkgdatadir = $(datadir)/dconf-editor -dist_pkgdata_DATA = dconf-editor.ui dconf-editor-menu.ui - -EXTRA_DIST = $(gsettings_SCHEMAS) $(icons) +EXTRA_DIST = $(gsettings_SCHEMAS) $(icons) $(resource_data) diff -Nru d-conf-0.16.1/editor/Makefile.in d-conf-0.18.0/editor/Makefile.in --- d-conf-0.16.1/editor/Makefile.in 2013-07-16 16:43:49.000000000 +0000 +++ d-conf-0.18.0/editor/Makefile.in 2013-09-23 21:29:28.000000000 +0000 @@ -61,6 +61,7 @@ test $$has_opt = yes am__make_dryrun = (target_option=n; $(am__make_running_with_option)) am__make_keepgoing = (target_option=k; $(am__make_running_with_option)) +pkgdatadir = $(datadir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ pkglibexecdir = $(libexecdir)/@PACKAGE@ @@ -79,8 +80,7 @@ DIST_COMMON = $(top_srcdir)/Makefile.gtester $(srcdir)/Makefile.in \ $(srcdir)/Makefile.am $(srcdir)/dconf-editor.desktop.in.in \ dconf-editor.c dconf-model.c dconf-schema.c dconf-view.c \ - $(top_srcdir)/aux/depcomp $(srcdir)/dconf_editor_vala.stamp \ - $(dist_pkgdata_DATA) + $(top_srcdir)/aux/depcomp $(srcdir)/dconf_editor_vala.stamp bin_PROGRAMS = dconf-editor$(EXEEXT) subdir = editor ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 @@ -93,13 +93,15 @@ CONFIG_CLEAN_FILES = dconf-editor.desktop.in CONFIG_CLEAN_VPATH_FILES = am__installdirs = "$(DESTDIR)$(bindir)" "$(DESTDIR)$(desktopdir)" \ - "$(DESTDIR)$(pkgdatadir)" "$(DESTDIR)$(datadir)" + "$(DESTDIR)$(datadir)" PROGRAMS = $(bin_PROGRAMS) am_dconf_editor_OBJECTS = dconf_editor-dconf-editor.$(OBJEXT) \ dconf_editor-dconf-model.$(OBJEXT) \ dconf_editor-dconf-schema.$(OBJEXT) \ dconf_editor-dconf-view.$(OBJEXT) -dconf_editor_OBJECTS = $(am_dconf_editor_OBJECTS) +nodist_dconf_editor_OBJECTS = dconf_editor-resources.$(OBJEXT) +dconf_editor_OBJECTS = $(am_dconf_editor_OBJECTS) \ + $(nodist_dconf_editor_OBJECTS) am__DEPENDENCIES_1 = dconf_editor_DEPENDENCIES = ../client/libdconf.so.1 \ $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \ @@ -143,7 +145,7 @@ am__v_VALAC_ = $(am__v_VALAC_@AM_DEFAULT_V@) am__v_VALAC_0 = @echo " VALAC " $@; am__v_VALAC_1 = -SOURCES = $(dconf_editor_SOURCES) +SOURCES = $(dconf_editor_SOURCES) $(nodist_dconf_editor_SOURCES) DIST_SOURCES = $(dconf_editor_SOURCES) am__can_run_installinfo = \ case $$AM_UPDATE_INFO_DIR in \ @@ -177,7 +179,7 @@ || { echo " ( cd '$$dir' && rm -f" $$files ")"; \ $(am__cd) "$$dir" && rm -f $$files; }; \ } -DATA = $(desktop_DATA) $(dist_pkgdata_DATA) $(nobase_data_DATA) +DATA = $(desktop_DATA) $(nobase_data_DATA) am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP) # Read a list of newline-separated strings from the standard input, # and print each of them once, without duplicates. Input order is @@ -198,7 +200,6 @@ ETAGS = etags CTAGS = ctags DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) -pkgdatadir = $(datadir)/dconf-editor ACLOCAL = @ACLOCAL@ ALL_LINGUAS = @ALL_LINGUAS@ AMTAR = @AMTAR@ @@ -224,6 +225,7 @@ EGREP = @EGREP@ EXEEXT = @EXEEXT@ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ +GLIB_COMPILE_RESOURCES = @GLIB_COMPILE_RESOURCES@ GLIB_COMPILE_SCHEMAS = @GLIB_COMPILE_SCHEMAS@ GMOFILES = @GMOFILES@ GMSGFMT = @GMSGFMT@ @@ -350,7 +352,7 @@ # initialize variables for unconditional += appending TEST_PROGS = -INCLUDES = -I$(top_srcdir) -I$(top_srcdir)/client +AM_CPPFLAGS = -I$(top_srcdir) -I$(top_srcdir)/client dconf_editor_VALAFLAGS = --vapidir ../client --pkg gtk+-3.0 --pkg gmodule-2.0 --pkg libxml-2.0 --pkg dconf dconf_editor_LDADD = \ ../client/libdconf.so.1 \ @@ -369,6 +371,12 @@ -DGETTEXT_PACKAGE=\"$(GETTEXT_PACKAGE)\"\ -w +resource_data = \ + dconf-editor.gresource.xml \ + dconf-editor-menu.ui \ + dconf-editor.ui + +nodist_dconf_editor_SOURCES = resources.c dconf_editor_SOURCES = \ config.vapi \ dconf-editor.vala \ @@ -379,7 +387,7 @@ desktopdir = $(datadir)/applications desktop_in_files = dconf-editor.desktop.in.in desktop_DATA = $(desktop_in_files:.desktop.in.in=.desktop) -CLEANFILES = $(desktop_DATA) +CLEANFILES = $(desktop_DATA) resources.c gsettings_SCHEMAS = ca.desrt.dconf-editor.gschema.xml nobase_data_DATA = $(icons) icons = \ @@ -397,8 +405,7 @@ icons/hicolor/64x64/apps/dconf-editor.png \ icons/hicolor/256x256/apps/dconf-editor.png -dist_pkgdata_DATA = dconf-editor.ui dconf-editor-menu.ui -EXTRA_DIST = $(gsettings_SCHEMAS) $(icons) +EXTRA_DIST = $(gsettings_SCHEMAS) $(icons) $(resource_data) all: all-am .SUFFIXES: @@ -493,6 +500,7 @@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/dconf_editor-dconf-model.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/dconf_editor-dconf-schema.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/dconf_editor-dconf-view.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/dconf_editor-resources.Po@am__quote@ .c.o: @am__fastdepCC_TRUE@ $(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< @@ -563,6 +571,20 @@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='dconf-view.c' object='dconf_editor-dconf-view.obj' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ @am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(dconf_editor_CFLAGS) $(CFLAGS) -c -o dconf_editor-dconf-view.obj `if test -f 'dconf-view.c'; then $(CYGPATH_W) 'dconf-view.c'; else $(CYGPATH_W) '$(srcdir)/dconf-view.c'; fi` + +dconf_editor-resources.o: resources.c +@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(dconf_editor_CFLAGS) $(CFLAGS) -MT dconf_editor-resources.o -MD -MP -MF $(DEPDIR)/dconf_editor-resources.Tpo -c -o dconf_editor-resources.o `test -f 'resources.c' || echo '$(srcdir)/'`resources.c +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/dconf_editor-resources.Tpo $(DEPDIR)/dconf_editor-resources.Po +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='resources.c' object='dconf_editor-resources.o' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(dconf_editor_CFLAGS) $(CFLAGS) -c -o dconf_editor-resources.o `test -f 'resources.c' || echo '$(srcdir)/'`resources.c + +dconf_editor-resources.obj: resources.c +@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(dconf_editor_CFLAGS) $(CFLAGS) -MT dconf_editor-resources.obj -MD -MP -MF $(DEPDIR)/dconf_editor-resources.Tpo -c -o dconf_editor-resources.obj `if test -f 'resources.c'; then $(CYGPATH_W) 'resources.c'; else $(CYGPATH_W) '$(srcdir)/resources.c'; fi` +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/dconf_editor-resources.Tpo $(DEPDIR)/dconf_editor-resources.Po +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='resources.c' object='dconf_editor-resources.obj' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(dconf_editor_CFLAGS) $(CFLAGS) -c -o dconf_editor-resources.obj `if test -f 'resources.c'; then $(CYGPATH_W) 'resources.c'; else $(CYGPATH_W) '$(srcdir)/resources.c'; fi` $(srcdir)/dconf-editor.c: $(srcdir)/dconf_editor_vala.stamp @if test -f $@; then :; else rm -f $(srcdir)/dconf_editor_vala.stamp; fi @if test -f $@; then :; else \ @@ -608,27 +630,6 @@ @list='$(desktop_DATA)'; test -n "$(desktopdir)" || list=; \ files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \ dir='$(DESTDIR)$(desktopdir)'; $(am__uninstall_files_from_dir) -install-dist_pkgdataDATA: $(dist_pkgdata_DATA) - @$(NORMAL_INSTALL) - @list='$(dist_pkgdata_DATA)'; test -n "$(pkgdatadir)" || list=; \ - if test -n "$$list"; then \ - echo " $(MKDIR_P) '$(DESTDIR)$(pkgdatadir)'"; \ - $(MKDIR_P) "$(DESTDIR)$(pkgdatadir)" || exit 1; \ - fi; \ - for p in $$list; do \ - if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ - echo "$$d$$p"; \ - done | $(am__base_list) | \ - while read files; do \ - echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(pkgdatadir)'"; \ - $(INSTALL_DATA) $$files "$(DESTDIR)$(pkgdatadir)" || exit $$?; \ - done - -uninstall-dist_pkgdataDATA: - @$(NORMAL_UNINSTALL) - @list='$(dist_pkgdata_DATA)'; test -n "$(pkgdatadir)" || list=; \ - files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \ - dir='$(DESTDIR)$(pkgdatadir)'; $(am__uninstall_files_from_dir) install-nobase_dataDATA: $(nobase_data_DATA) @$(NORMAL_INSTALL) @list='$(nobase_data_DATA)'; test -n "$(datadir)" || list=; \ @@ -741,7 +742,7 @@ check: check-am all-am: Makefile $(PROGRAMS) $(DATA) installdirs: - for dir in "$(DESTDIR)$(bindir)" "$(DESTDIR)$(desktopdir)" "$(DESTDIR)$(pkgdatadir)" "$(DESTDIR)$(datadir)"; do \ + for dir in "$(DESTDIR)$(bindir)" "$(DESTDIR)$(desktopdir)" "$(DESTDIR)$(datadir)"; do \ test -z "$$dir" || $(MKDIR_P) "$$dir"; \ done install: install-am @@ -806,8 +807,7 @@ info-am: -install-data-am: install-desktopDATA install-dist_pkgdataDATA \ - install-nobase_dataDATA +install-data-am: install-desktopDATA install-nobase_dataDATA @$(NORMAL_INSTALL) $(MAKE) $(AM_MAKEFLAGS) install-data-hook install-dvi: install-dvi-am @@ -854,7 +854,7 @@ ps-am: uninstall-am: uninstall-binPROGRAMS uninstall-desktopDATA \ - uninstall-dist_pkgdataDATA uninstall-nobase_dataDATA + uninstall-nobase_dataDATA @$(NORMAL_INSTALL) $(MAKE) $(AM_MAKEFLAGS) uninstall-hook .MAKE: check-am install-am install-data-am install-strip uninstall-am @@ -864,16 +864,15 @@ distclean distclean-compile distclean-generic distclean-tags \ distdir dvi dvi-am html html-am info info-am install \ install-am install-binPROGRAMS install-data install-data-am \ - install-data-hook install-desktopDATA install-dist_pkgdataDATA \ - install-dvi install-dvi-am install-exec install-exec-am \ - install-html install-html-am install-info install-info-am \ - install-man install-nobase_dataDATA install-pdf install-pdf-am \ - install-ps install-ps-am install-strip installcheck \ - installcheck-am installdirs maintainer-clean \ - maintainer-clean-generic mostlyclean mostlyclean-compile \ - mostlyclean-generic pdf pdf-am ps ps-am tags tags-am uninstall \ - uninstall-am uninstall-binPROGRAMS uninstall-desktopDATA \ - uninstall-dist_pkgdataDATA uninstall-hook \ + install-data-hook install-desktopDATA install-dvi \ + install-dvi-am install-exec install-exec-am install-html \ + install-html-am install-info install-info-am install-man \ + install-nobase_dataDATA install-pdf install-pdf-am install-ps \ + install-ps-am install-strip installcheck installcheck-am \ + installdirs maintainer-clean maintainer-clean-generic \ + mostlyclean mostlyclean-compile mostlyclean-generic pdf pdf-am \ + ps ps-am tags tags-am uninstall uninstall-am \ + uninstall-binPROGRAMS uninstall-desktopDATA uninstall-hook \ uninstall-nobase_dataDATA @@ -940,6 +939,9 @@ # run tests in cwd as part of make check check-local: test-nonrecursive + +resources.c: $(resource_data) + $(AM_V_GEN) $(GLIB_COMPILE_RESOURCES) --sourcedir=$(srcdir) --target=$@ --generate-source $< @INTLTOOL_DESKTOP_RULE@ @GSETTINGS_RULES@ diff -Nru d-conf-0.16.1/editor/dconf-editor-menu.ui d-conf-0.18.0/editor/dconf-editor-menu.ui --- d-conf-0.16.1/editor/dconf-editor-menu.ui 2013-07-16 16:20:20.000000000 +0000 +++ d-conf-0.18.0/editor/dconf-editor-menu.ui 2013-07-17 20:01:30.000000000 +0000 @@ -2,7 +2,7 @@
- _Find + _Find… app.find <Primary>f diff -Nru d-conf-0.16.1/editor/dconf-editor.c d-conf-0.18.0/editor/dconf-editor.c --- d-conf-0.16.1/editor/dconf-editor.c 2013-07-16 16:43:55.000000000 +0000 +++ d-conf-0.18.0/editor/dconf-editor.c 2013-09-23 21:29:37.000000000 +0000 @@ -1,4 +1,4 @@ -/* dconf-editor.c generated by valac 0.18.1, the Vala compiler +/* dconf-editor.c generated by valac 0.20.1, the Vala compiler * generated from dconf-editor.vala, do not modify */ @@ -7,12 +7,12 @@ #include #include #include +#include #include #include -#include "config.h" -#include #include #include +#include "config.h" #include @@ -47,7 +47,6 @@ typedef struct _Key Key; typedef struct _KeyClass KeyClass; #define _g_object_unref0(var) ((var == NULL) ? NULL : (var = (g_object_unref (var), NULL))) -#define _g_free0(var) (var = (g_free (var), NULL)) #define _g_error_free0(var) ((var == NULL) ? NULL : (var = (g_error_free (var), NULL))) #define TYPE_DCONF_DIR_VIEW (dconf_dir_view_get_type ()) @@ -133,6 +132,7 @@ typedef struct _SchemaChoiceClass SchemaChoiceClass; typedef struct _SchemaValueRangePrivate SchemaValueRangePrivate; #define _g_variant_unref0(var) ((var == NULL) ? NULL : (var = (g_variant_unref (var), NULL))) +#define _g_free0(var) (var = (g_free (var), NULL)) typedef struct _SchemaPrivate SchemaPrivate; #define TYPE_SCHEMA_LIST (schema_list_get_type ()) @@ -295,10 +295,12 @@ static void _configuration_editor_key_selected_cb_gtk_tree_selection_changed (GtkTreeSelection* _sender, gpointer self); static void configuration_editor_set_default_cb (ConfigurationEditor* self, GtkAction* action); static void _configuration_editor_set_default_cb_gtk_action_activate (GtkAction* _sender, gpointer self); +static gboolean __lambda2_ (ConfigurationEditor* self, GdkEventKey* event); +static gboolean ___lambda2__gtk_widget_key_press_event (GtkWidget* _sender, GdkEventKey* event, gpointer self); static void configuration_editor_find_next_cb (ConfigurationEditor* self); static void _configuration_editor_find_next_cb_gtk_entry_activate (GtkEntry* _sender, gpointer self); -static void configuration_editor_close_search_cb (ConfigurationEditor* self); -static void _configuration_editor_close_search_cb_gtk_button_clicked (GtkButton* _sender, gpointer self); +static void __lambda3_ (ConfigurationEditor* self); +static void ___lambda3__gtk_button_clicked (GtkButton* _sender, gpointer self); static void _configuration_editor_find_next_cb_gtk_button_clicked (GtkButton* _sender, gpointer self); static void configuration_editor_real_activate (GApplication* base); static void configuration_editor_real_shutdown (GApplication* base); @@ -420,13 +422,46 @@ } +static gboolean __lambda2_ (ConfigurationEditor* self, GdkEventKey* event) { + gboolean result = FALSE; + GdkEventKey _tmp0_; + guint _tmp1_; + g_return_val_if_fail (event != NULL, FALSE); + _tmp0_ = *event; + _tmp1_ = _tmp0_.keyval; + if (_tmp1_ == ((guint) GDK_KEY_Escape)) { + GtkBox* _tmp2_; + _tmp2_ = self->priv->search_box; + gtk_widget_hide ((GtkWidget*) _tmp2_); + result = TRUE; + return result; + } + result = FALSE; + return result; +} + + +static gboolean ___lambda2__gtk_widget_key_press_event (GtkWidget* _sender, GdkEventKey* event, gpointer self) { + gboolean result; + result = __lambda2_ (self, event); + return result; +} + + static void _configuration_editor_find_next_cb_gtk_entry_activate (GtkEntry* _sender, gpointer self) { configuration_editor_find_next_cb (self); } -static void _configuration_editor_close_search_cb_gtk_button_clicked (GtkButton* _sender, gpointer self) { - configuration_editor_close_search_cb (self); +static void __lambda3_ (ConfigurationEditor* self) { + GtkBox* _tmp0_; + _tmp0_ = self->priv->search_box; + gtk_widget_hide ((GtkWidget*) _tmp0_); +} + + +static void ___lambda3__gtk_button_clicked (GtkButton* _sender, gpointer self) { + __lambda3_ (self); } @@ -441,92 +476,93 @@ GSettings* _tmp1_; SettingsModel* _tmp2_; GtkBuilder* _tmp3_; + GtkApplicationWindow* _tmp6_; + GtkApplicationWindow* _tmp7_; + GtkApplicationWindow* _tmp8_; + const gchar* _tmp9_ = NULL; + GtkApplicationWindow* _tmp10_; + GtkApplicationWindow* _tmp11_; GtkApplicationWindow* _tmp12_; - GtkApplicationWindow* _tmp13_; - GtkApplicationWindow* _tmp14_; - const gchar* _tmp15_ = NULL; - GtkApplicationWindow* _tmp16_; - GtkApplicationWindow* _tmp17_; - GtkApplicationWindow* _tmp18_; - GtkBuilder* _tmp19_; - GObject* _tmp20_ = NULL; - GtkBuilder* _tmp21_; + GtkBuilder* _tmp13_; + GObject* _tmp14_ = NULL; + GtkBuilder* _tmp15_; GtkBuilder* menu_ui; - GObject* _tmp25_ = NULL; - GtkApplicationWindow* _tmp26_; - GSettings* _tmp27_; - gint _tmp28_ = 0; - GSettings* _tmp29_; - gint _tmp30_ = 0; - GSettings* _tmp31_; - gboolean _tmp32_ = FALSE; - DConfDirView* _tmp37_; - GtkTreeView* _tmp38_; - SettingsModel* _tmp39_; - GtkTreeView* _tmp40_; - GtkTreeSelection* _tmp41_ = NULL; - GtkTreeView* _tmp42_; - GtkBuilder* _tmp43_; - GObject* _tmp44_ = NULL; - GtkScrolledWindow* _tmp45_; + GObject* _tmp17_ = NULL; + GtkApplicationWindow* _tmp18_; + GSettings* _tmp19_; + gint _tmp20_ = 0; + GSettings* _tmp21_; + gint _tmp22_ = 0; + GSettings* _tmp23_; + gboolean _tmp24_ = FALSE; + DConfDirView* _tmp29_; + GtkTreeView* _tmp30_; + SettingsModel* _tmp31_; + GtkTreeView* _tmp32_; + GtkTreeSelection* _tmp33_ = NULL; + GtkTreeView* _tmp34_; + GtkBuilder* _tmp35_; + GObject* _tmp36_ = NULL; + GtkScrolledWindow* _tmp37_; GtkScrolledWindow* scroll; + GtkScrolledWindow* _tmp38_; + GtkTreeView* _tmp39_; + DConfKeyView* _tmp40_; + GtkTreeView* _tmp41_; + GtkTreeView* _tmp42_; + GtkTreeSelection* _tmp43_ = NULL; + GtkBuilder* _tmp44_; + GObject* _tmp45_ = NULL; GtkScrolledWindow* _tmp46_; - GtkTreeView* _tmp47_; - DConfKeyView* _tmp48_; - GtkTreeView* _tmp49_; - GtkTreeView* _tmp50_; - GtkTreeSelection* _tmp51_ = NULL; + GtkScrolledWindow* _tmp47_; + GtkTreeView* _tmp48_; + GtkBuilder* _tmp49_; + GObject* _tmp50_ = NULL; + GtkGrid* _tmp51_; GtkBuilder* _tmp52_; GObject* _tmp53_ = NULL; - GtkScrolledWindow* _tmp54_; - GtkScrolledWindow* _tmp55_; - GtkTreeView* _tmp56_; - GtkBuilder* _tmp57_; - GObject* _tmp58_ = NULL; - GtkGrid* _tmp59_; - GtkBuilder* _tmp60_; - GObject* _tmp61_ = NULL; - GtkLabel* _tmp62_; - GtkBuilder* _tmp63_; - GObject* _tmp64_ = NULL; - GtkLabel* _tmp65_; - GtkBuilder* _tmp66_; - GObject* _tmp67_ = NULL; - GtkLabel* _tmp68_; - GtkBuilder* _tmp69_; - GObject* _tmp70_ = NULL; - GtkLabel* _tmp71_; - GtkBuilder* _tmp72_; - GObject* _tmp73_ = NULL; - GtkLabel* _tmp74_; + GtkLabel* _tmp54_; + GtkBuilder* _tmp55_; + GObject* _tmp56_ = NULL; + GtkLabel* _tmp57_; + GtkBuilder* _tmp58_; + GObject* _tmp59_ = NULL; + GtkLabel* _tmp60_; + GtkBuilder* _tmp61_; + GObject* _tmp62_ = NULL; + GtkLabel* _tmp63_; + GtkBuilder* _tmp64_; + GObject* _tmp65_ = NULL; + GtkLabel* _tmp66_; + GtkBuilder* _tmp67_; + GObject* _tmp68_ = NULL; + GtkAction* _tmp69_; + GtkAction* _tmp70_; + GtkBuilder* _tmp71_; + GObject* _tmp72_ = NULL; + GtkBox* _tmp73_; + GtkBox* _tmp74_; GtkBuilder* _tmp75_; GObject* _tmp76_ = NULL; - GtkAction* _tmp77_; - GtkAction* _tmp78_; - GtkBuilder* _tmp79_; - GObject* _tmp80_ = NULL; - GtkBox* _tmp81_; + GtkEntry* _tmp77_; + GtkBuilder* _tmp78_; + GObject* _tmp79_ = NULL; + GtkLabel* _tmp80_; + GtkEntry* _tmp81_; GtkBuilder* _tmp82_; GObject* _tmp83_ = NULL; - GtkEntry* _tmp84_; - GtkBuilder* _tmp85_; - GObject* _tmp86_ = NULL; - GtkLabel* _tmp87_; - GtkEntry* _tmp88_; - GtkBuilder* _tmp89_; - GObject* _tmp90_ = NULL; - GtkButton* _tmp91_; + GtkButton* _tmp84_; GtkButton* search_box_close_button; - GtkButton* _tmp92_; - GtkBuilder* _tmp93_; - GObject* _tmp94_ = NULL; - GtkButton* _tmp95_; + GtkButton* _tmp85_; + GtkBuilder* _tmp86_; + GObject* _tmp87_ = NULL; + GtkButton* _tmp88_; GtkButton* search_next_button; - GtkButton* _tmp96_; + GtkButton* _tmp89_; GtkTreeIter iter = {0}; - SettingsModel* _tmp97_; - GtkTreeIter _tmp98_ = {0}; - gboolean _tmp99_ = FALSE; + SettingsModel* _tmp90_; + GtkTreeIter _tmp91_ = {0}; + gboolean _tmp92_ = FALSE; GError * _inner_error_ = NULL; self = (ConfigurationEditor*) base; G_APPLICATION_CLASS (configuration_editor_parent_class)->startup ((GApplication*) G_TYPE_CHECK_INSTANCE_CAST (self, GTK_TYPE_APPLICATION, GtkApplication)); @@ -543,46 +579,22 @@ _g_object_unref0 (self->priv->ui); self->priv->ui = _tmp3_; { - gchar* _tmp4_; - gchar* _tmp5_; - gchar* _tmp6_; - gchar** _tmp7_ = NULL; - gchar** objects; - gint objects_length1; - gint _objects_size_; - GtkBuilder* _tmp8_; - gchar* _tmp9_ = NULL; - gchar* _tmp10_; - _tmp4_ = g_strdup ("set_default_action"); - _tmp5_ = g_strdup ("box1"); - _tmp6_ = g_strdup ("menu"); - _tmp7_ = g_new0 (gchar*, 3 + 1); - _tmp7_[0] = _tmp4_; - _tmp7_[1] = _tmp5_; - _tmp7_[2] = _tmp6_; - objects = _tmp7_; - objects_length1 = 3; - _objects_size_ = objects_length1; - _tmp8_ = self->priv->ui; - _tmp9_ = g_build_filename (PKGDATADIR, "dconf-editor.ui", NULL); - _tmp10_ = _tmp9_; - gtk_builder_add_objects_from_file (_tmp8_, _tmp10_, objects, &_inner_error_); - _g_free0 (_tmp10_); + GtkBuilder* _tmp4_; + _tmp4_ = self->priv->ui; + gtk_builder_add_from_resource (_tmp4_, "/ca/desrt/dconf-editor/dconf-editor.ui", &_inner_error_); if (_inner_error_ != NULL) { - objects = (_vala_array_free (objects, objects_length1, (GDestroyNotify) g_free), NULL); goto __catch0_g_error; } - objects = (_vala_array_free (objects, objects_length1, (GDestroyNotify) g_free), NULL); } goto __finally0; __catch0_g_error: { GError* e = NULL; - const gchar* _tmp11_; + const gchar* _tmp5_; e = _inner_error_; _inner_error_ = NULL; - _tmp11_ = e->message; - g_error ("dconf-editor.vala:59: Failed to load UI: %s", _tmp11_); + _tmp5_ = e->message; + g_error ("dconf-editor.vala:58: Failed to load UI: %s", _tmp5_); _g_error_free0 (e); } __finally0: @@ -591,32 +603,27 @@ g_clear_error (&_inner_error_); return; } - _tmp12_ = (GtkApplicationWindow*) gtk_application_window_new ((GtkApplication*) self); - g_object_ref_sink (_tmp12_); + _tmp6_ = (GtkApplicationWindow*) gtk_application_window_new ((GtkApplication*) self); + g_object_ref_sink (_tmp6_); _g_object_unref0 (self->priv->window); - self->priv->window = _tmp12_; - _tmp13_ = self->priv->window; - gtk_window_set_default_size ((GtkWindow*) _tmp13_, 600, 300); - _tmp14_ = self->priv->window; - _tmp15_ = _ ("dconf Editor"); - gtk_window_set_title ((GtkWindow*) _tmp14_, _tmp15_); - _tmp16_ = self->priv->window; - g_signal_connect_object ((GtkWidget*) _tmp16_, "window-state-event", (GCallback) _configuration_editor_main_window_window_state_event_cb_gtk_widget_window_state_event, self, 0); - _tmp17_ = self->priv->window; - g_signal_connect_object ((GtkWidget*) _tmp17_, "configure-event", (GCallback) _configuration_editor_main_window_configure_event_cb_gtk_widget_configure_event, self, 0); - _tmp18_ = self->priv->window; - _tmp19_ = self->priv->ui; - _tmp20_ = gtk_builder_get_object (_tmp19_, "box1"); - gtk_container_add ((GtkContainer*) _tmp18_, (GtkWidget*) G_TYPE_CHECK_INSTANCE_CAST (_tmp20_, GTK_TYPE_BOX, GtkBox)); - _tmp21_ = gtk_builder_new (); - menu_ui = _tmp21_; + self->priv->window = _tmp6_; + _tmp7_ = self->priv->window; + gtk_window_set_default_size ((GtkWindow*) _tmp7_, 600, 300); + _tmp8_ = self->priv->window; + _tmp9_ = _ ("dconf Editor"); + gtk_window_set_title ((GtkWindow*) _tmp8_, _tmp9_); + _tmp10_ = self->priv->window; + g_signal_connect_object ((GtkWidget*) _tmp10_, "window-state-event", (GCallback) _configuration_editor_main_window_window_state_event_cb_gtk_widget_window_state_event, self, 0); + _tmp11_ = self->priv->window; + g_signal_connect_object ((GtkWidget*) _tmp11_, "configure-event", (GCallback) _configuration_editor_main_window_configure_event_cb_gtk_widget_configure_event, self, 0); + _tmp12_ = self->priv->window; + _tmp13_ = self->priv->ui; + _tmp14_ = gtk_builder_get_object (_tmp13_, "box1"); + gtk_container_add ((GtkContainer*) _tmp12_, (GtkWidget*) (G_TYPE_CHECK_INSTANCE_TYPE (_tmp14_, GTK_TYPE_BOX) ? ((GtkBox*) _tmp14_) : NULL)); + _tmp15_ = gtk_builder_new (); + menu_ui = _tmp15_; { - gchar* _tmp22_ = NULL; - gchar* _tmp23_; - _tmp22_ = g_build_filename (PKGDATADIR, "dconf-editor-menu.ui", NULL); - _tmp23_ = _tmp22_; - gtk_builder_add_from_file (menu_ui, _tmp23_, &_inner_error_); - _g_free0 (_tmp23_); + gtk_builder_add_from_resource (menu_ui, "/ca/desrt/dconf-editor/dconf-editor-menu.ui", &_inner_error_); if (_inner_error_ != NULL) { goto __catch1_g_error; } @@ -625,11 +632,11 @@ __catch1_g_error: { GError* e = NULL; - const gchar* _tmp24_; + const gchar* _tmp16_; e = _inner_error_; _inner_error_ = NULL; - _tmp24_ = e->message; - g_error ("dconf-editor.vala:75: Failed to load menu UI: %s", _tmp24_); + _tmp16_ = e->message; + g_error ("dconf-editor.vala:74: Failed to load menu UI: %s", _tmp16_); _g_error_free0 (e); } __finally1: @@ -639,144 +646,146 @@ g_clear_error (&_inner_error_); return; } - _tmp25_ = gtk_builder_get_object (menu_ui, "menu"); - gtk_application_set_app_menu ((GtkApplication*) self, G_TYPE_CHECK_INSTANCE_CAST (_tmp25_, g_menu_model_get_type (), GMenuModel)); - _tmp26_ = self->priv->window; - _tmp27_ = self->priv->settings; - _tmp28_ = g_settings_get_int (_tmp27_, "window-width"); - _tmp29_ = self->priv->settings; - _tmp30_ = g_settings_get_int (_tmp29_, "window-height"); - gtk_window_set_default_size ((GtkWindow*) _tmp26_, _tmp28_, _tmp30_); - _tmp31_ = self->priv->settings; - _tmp32_ = g_settings_get_boolean (_tmp31_, "window-is-fullscreen"); - if (_tmp32_) { - GtkApplicationWindow* _tmp33_; - _tmp33_ = self->priv->window; - gtk_window_fullscreen ((GtkWindow*) _tmp33_); + _tmp17_ = gtk_builder_get_object (menu_ui, "menu"); + gtk_application_set_app_menu ((GtkApplication*) self, G_TYPE_CHECK_INSTANCE_CAST (_tmp17_, g_menu_model_get_type (), GMenuModel)); + _tmp18_ = self->priv->window; + _tmp19_ = self->priv->settings; + _tmp20_ = g_settings_get_int (_tmp19_, "window-width"); + _tmp21_ = self->priv->settings; + _tmp22_ = g_settings_get_int (_tmp21_, "window-height"); + gtk_window_set_default_size ((GtkWindow*) _tmp18_, _tmp20_, _tmp22_); + _tmp23_ = self->priv->settings; + _tmp24_ = g_settings_get_boolean (_tmp23_, "window-is-fullscreen"); + if (_tmp24_) { + GtkApplicationWindow* _tmp25_; + _tmp25_ = self->priv->window; + gtk_window_fullscreen ((GtkWindow*) _tmp25_); } else { - GSettings* _tmp34_; - gboolean _tmp35_ = FALSE; - _tmp34_ = self->priv->settings; - _tmp35_ = g_settings_get_boolean (_tmp34_, "window-is-maximized"); - if (_tmp35_) { - GtkApplicationWindow* _tmp36_; - _tmp36_ = self->priv->window; - gtk_window_maximize ((GtkWindow*) _tmp36_); + GSettings* _tmp26_; + gboolean _tmp27_ = FALSE; + _tmp26_ = self->priv->settings; + _tmp27_ = g_settings_get_boolean (_tmp26_, "window-is-maximized"); + if (_tmp27_) { + GtkApplicationWindow* _tmp28_; + _tmp28_ = self->priv->window; + gtk_window_maximize ((GtkWindow*) _tmp28_); } } - _tmp37_ = dconf_dir_view_new (); - g_object_ref_sink (_tmp37_); + _tmp29_ = dconf_dir_view_new (); + g_object_ref_sink (_tmp29_); _g_object_unref0 (self->priv->dir_tree_view); - self->priv->dir_tree_view = (GtkTreeView*) _tmp37_; - _tmp38_ = self->priv->dir_tree_view; - _tmp39_ = self->priv->model; - gtk_tree_view_set_model (_tmp38_, (GtkTreeModel*) _tmp39_); - _tmp40_ = self->priv->dir_tree_view; - _tmp41_ = gtk_tree_view_get_selection (_tmp40_); - g_signal_connect_object (_tmp41_, "changed", (GCallback) _configuration_editor_dir_selected_cb_gtk_tree_selection_changed, self, 0); - _tmp42_ = self->priv->dir_tree_view; - gtk_widget_show ((GtkWidget*) _tmp42_); - _tmp43_ = self->priv->ui; - _tmp44_ = gtk_builder_get_object (_tmp43_, "directory_scrolledwindow"); - _tmp45_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp44_, GTK_TYPE_SCROLLED_WINDOW, GtkScrolledWindow)); - scroll = _tmp45_; - _tmp46_ = scroll; - _tmp47_ = self->priv->dir_tree_view; - gtk_container_add ((GtkContainer*) _tmp46_, (GtkWidget*) _tmp47_); - _tmp48_ = dconf_key_view_new (); - g_object_ref_sink (_tmp48_); + self->priv->dir_tree_view = (GtkTreeView*) _tmp29_; + _tmp30_ = self->priv->dir_tree_view; + _tmp31_ = self->priv->model; + gtk_tree_view_set_model (_tmp30_, (GtkTreeModel*) _tmp31_); + _tmp32_ = self->priv->dir_tree_view; + _tmp33_ = gtk_tree_view_get_selection (_tmp32_); + g_signal_connect_object (_tmp33_, "changed", (GCallback) _configuration_editor_dir_selected_cb_gtk_tree_selection_changed, self, 0); + _tmp34_ = self->priv->dir_tree_view; + gtk_widget_show ((GtkWidget*) _tmp34_); + _tmp35_ = self->priv->ui; + _tmp36_ = gtk_builder_get_object (_tmp35_, "directory_scrolledwindow"); + _tmp37_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp36_, GTK_TYPE_SCROLLED_WINDOW) ? ((GtkScrolledWindow*) _tmp36_) : NULL); + scroll = _tmp37_; + _tmp38_ = scroll; + _tmp39_ = self->priv->dir_tree_view; + gtk_container_add ((GtkContainer*) _tmp38_, (GtkWidget*) _tmp39_); + _tmp40_ = dconf_key_view_new (); + g_object_ref_sink (_tmp40_); _g_object_unref0 (self->priv->key_tree_view); - self->priv->key_tree_view = (GtkTreeView*) _tmp48_; - _tmp49_ = self->priv->key_tree_view; - gtk_widget_show ((GtkWidget*) _tmp49_); - _tmp50_ = self->priv->key_tree_view; - _tmp51_ = gtk_tree_view_get_selection (_tmp50_); - g_signal_connect_object (_tmp51_, "changed", (GCallback) _configuration_editor_key_selected_cb_gtk_tree_selection_changed, self, 0); - _tmp52_ = self->priv->ui; - _tmp53_ = gtk_builder_get_object (_tmp52_, "key_scrolledwindow"); - _tmp54_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp53_, GTK_TYPE_SCROLLED_WINDOW, GtkScrolledWindow)); + self->priv->key_tree_view = (GtkTreeView*) _tmp40_; + _tmp41_ = self->priv->key_tree_view; + gtk_widget_show ((GtkWidget*) _tmp41_); + _tmp42_ = self->priv->key_tree_view; + _tmp43_ = gtk_tree_view_get_selection (_tmp42_); + g_signal_connect_object (_tmp43_, "changed", (GCallback) _configuration_editor_key_selected_cb_gtk_tree_selection_changed, self, 0); + _tmp44_ = self->priv->ui; + _tmp45_ = gtk_builder_get_object (_tmp44_, "key_scrolledwindow"); + _tmp46_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp45_, GTK_TYPE_SCROLLED_WINDOW) ? ((GtkScrolledWindow*) _tmp45_) : NULL); _g_object_unref0 (scroll); - scroll = _tmp54_; - _tmp55_ = scroll; - _tmp56_ = self->priv->key_tree_view; - gtk_container_add ((GtkContainer*) _tmp55_, (GtkWidget*) _tmp56_); - _tmp57_ = self->priv->ui; - _tmp58_ = gtk_builder_get_object (_tmp57_, "key_info_grid"); - _tmp59_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp58_, GTK_TYPE_GRID, GtkGrid)); + scroll = _tmp46_; + _tmp47_ = scroll; + _tmp48_ = self->priv->key_tree_view; + gtk_container_add ((GtkContainer*) _tmp47_, (GtkWidget*) _tmp48_); + _tmp49_ = self->priv->ui; + _tmp50_ = gtk_builder_get_object (_tmp49_, "key_info_grid"); + _tmp51_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp50_, GTK_TYPE_GRID) ? ((GtkGrid*) _tmp50_) : NULL); _g_object_unref0 (self->priv->key_info_grid); - self->priv->key_info_grid = _tmp59_; - _tmp60_ = self->priv->ui; - _tmp61_ = gtk_builder_get_object (_tmp60_, "schema_label"); - _tmp62_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp61_, GTK_TYPE_LABEL, GtkLabel)); + self->priv->key_info_grid = _tmp51_; + _tmp52_ = self->priv->ui; + _tmp53_ = gtk_builder_get_object (_tmp52_, "schema_label"); + _tmp54_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp53_, GTK_TYPE_LABEL) ? ((GtkLabel*) _tmp53_) : NULL); _g_object_unref0 (self->priv->schema_label); - self->priv->schema_label = _tmp62_; - _tmp63_ = self->priv->ui; - _tmp64_ = gtk_builder_get_object (_tmp63_, "summary_label"); - _tmp65_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp64_, GTK_TYPE_LABEL, GtkLabel)); + self->priv->schema_label = _tmp54_; + _tmp55_ = self->priv->ui; + _tmp56_ = gtk_builder_get_object (_tmp55_, "summary_label"); + _tmp57_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp56_, GTK_TYPE_LABEL) ? ((GtkLabel*) _tmp56_) : NULL); _g_object_unref0 (self->priv->summary_label); - self->priv->summary_label = _tmp65_; - _tmp66_ = self->priv->ui; - _tmp67_ = gtk_builder_get_object (_tmp66_, "description_label"); - _tmp68_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp67_, GTK_TYPE_LABEL, GtkLabel)); + self->priv->summary_label = _tmp57_; + _tmp58_ = self->priv->ui; + _tmp59_ = gtk_builder_get_object (_tmp58_, "description_label"); + _tmp60_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp59_, GTK_TYPE_LABEL) ? ((GtkLabel*) _tmp59_) : NULL); _g_object_unref0 (self->priv->description_label); - self->priv->description_label = _tmp68_; - _tmp69_ = self->priv->ui; - _tmp70_ = gtk_builder_get_object (_tmp69_, "type_label"); - _tmp71_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp70_, GTK_TYPE_LABEL, GtkLabel)); + self->priv->description_label = _tmp60_; + _tmp61_ = self->priv->ui; + _tmp62_ = gtk_builder_get_object (_tmp61_, "type_label"); + _tmp63_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp62_, GTK_TYPE_LABEL) ? ((GtkLabel*) _tmp62_) : NULL); _g_object_unref0 (self->priv->type_label); - self->priv->type_label = _tmp71_; - _tmp72_ = self->priv->ui; - _tmp73_ = gtk_builder_get_object (_tmp72_, "default_label"); - _tmp74_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp73_, GTK_TYPE_LABEL, GtkLabel)); + self->priv->type_label = _tmp63_; + _tmp64_ = self->priv->ui; + _tmp65_ = gtk_builder_get_object (_tmp64_, "default_label"); + _tmp66_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp65_, GTK_TYPE_LABEL) ? ((GtkLabel*) _tmp65_) : NULL); _g_object_unref0 (self->priv->default_label); - self->priv->default_label = _tmp74_; - _tmp75_ = self->priv->ui; - _tmp76_ = gtk_builder_get_object (_tmp75_, "set_default_action"); - _tmp77_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp76_, GTK_TYPE_ACTION, GtkAction)); + self->priv->default_label = _tmp66_; + _tmp67_ = self->priv->ui; + _tmp68_ = gtk_builder_get_object (_tmp67_, "set_default_action"); + _tmp69_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp68_, GTK_TYPE_ACTION) ? ((GtkAction*) _tmp68_) : NULL); _g_object_unref0 (self->priv->set_default_action); - self->priv->set_default_action = _tmp77_; - _tmp78_ = self->priv->set_default_action; - g_signal_connect_object (_tmp78_, "activate", (GCallback) _configuration_editor_set_default_cb_gtk_action_activate, self, 0); - _tmp79_ = self->priv->ui; - _tmp80_ = gtk_builder_get_object (_tmp79_, "search_box"); - _tmp81_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp80_, GTK_TYPE_BOX, GtkBox)); + self->priv->set_default_action = _tmp69_; + _tmp70_ = self->priv->set_default_action; + g_signal_connect_object (_tmp70_, "activate", (GCallback) _configuration_editor_set_default_cb_gtk_action_activate, self, 0); + _tmp71_ = self->priv->ui; + _tmp72_ = gtk_builder_get_object (_tmp71_, "search_box"); + _tmp73_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp72_, GTK_TYPE_BOX) ? ((GtkBox*) _tmp72_) : NULL); _g_object_unref0 (self->priv->search_box); - self->priv->search_box = _tmp81_; - _tmp82_ = self->priv->ui; - _tmp83_ = gtk_builder_get_object (_tmp82_, "search_entry"); - _tmp84_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp83_, GTK_TYPE_ENTRY, GtkEntry)); + self->priv->search_box = _tmp73_; + _tmp74_ = self->priv->search_box; + g_signal_connect_object ((GtkWidget*) _tmp74_, "key-press-event", (GCallback) ___lambda2__gtk_widget_key_press_event, self, 0); + _tmp75_ = self->priv->ui; + _tmp76_ = gtk_builder_get_object (_tmp75_, "search_entry"); + _tmp77_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp76_, GTK_TYPE_ENTRY) ? ((GtkEntry*) _tmp76_) : NULL); _g_object_unref0 (self->priv->search_entry); - self->priv->search_entry = _tmp84_; - _tmp85_ = self->priv->ui; - _tmp86_ = gtk_builder_get_object (_tmp85_, "search_label"); - _tmp87_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp86_, GTK_TYPE_LABEL, GtkLabel)); + self->priv->search_entry = _tmp77_; + _tmp78_ = self->priv->ui; + _tmp79_ = gtk_builder_get_object (_tmp78_, "search_label"); + _tmp80_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp79_, GTK_TYPE_LABEL) ? ((GtkLabel*) _tmp79_) : NULL); _g_object_unref0 (self->priv->search_label); - self->priv->search_label = _tmp87_; - _tmp88_ = self->priv->search_entry; - g_signal_connect_object (_tmp88_, "activate", (GCallback) _configuration_editor_find_next_cb_gtk_entry_activate, self, 0); - _tmp89_ = self->priv->ui; - _tmp90_ = gtk_builder_get_object (_tmp89_, "search_box_close_button"); - _tmp91_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp90_, GTK_TYPE_BUTTON, GtkButton)); - search_box_close_button = _tmp91_; - _tmp92_ = search_box_close_button; - g_signal_connect_object (_tmp92_, "clicked", (GCallback) _configuration_editor_close_search_cb_gtk_button_clicked, self, 0); - _tmp93_ = self->priv->ui; - _tmp94_ = gtk_builder_get_object (_tmp93_, "search_next_button"); - _tmp95_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp94_, GTK_TYPE_BUTTON, GtkButton)); - search_next_button = _tmp95_; - _tmp96_ = search_next_button; - g_signal_connect_object (_tmp96_, "clicked", (GCallback) _configuration_editor_find_next_cb_gtk_button_clicked, self, 0); - _tmp97_ = self->priv->model; - _tmp99_ = gtk_tree_model_get_iter_first ((GtkTreeModel*) _tmp97_, &_tmp98_); - iter = _tmp98_; - if (_tmp99_) { - GtkTreeView* _tmp100_; - GtkTreeSelection* _tmp101_ = NULL; - GtkTreeIter _tmp102_; - _tmp100_ = self->priv->dir_tree_view; - _tmp101_ = gtk_tree_view_get_selection (_tmp100_); - _tmp102_ = iter; - gtk_tree_selection_select_iter (_tmp101_, &_tmp102_); + self->priv->search_label = _tmp80_; + _tmp81_ = self->priv->search_entry; + g_signal_connect_object (_tmp81_, "activate", (GCallback) _configuration_editor_find_next_cb_gtk_entry_activate, self, 0); + _tmp82_ = self->priv->ui; + _tmp83_ = gtk_builder_get_object (_tmp82_, "search_box_close_button"); + _tmp84_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp83_, GTK_TYPE_BUTTON) ? ((GtkButton*) _tmp83_) : NULL); + search_box_close_button = _tmp84_; + _tmp85_ = search_box_close_button; + g_signal_connect_object (_tmp85_, "clicked", (GCallback) ___lambda3__gtk_button_clicked, self, 0); + _tmp86_ = self->priv->ui; + _tmp87_ = gtk_builder_get_object (_tmp86_, "search_next_button"); + _tmp88_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp87_, GTK_TYPE_BUTTON) ? ((GtkButton*) _tmp87_) : NULL); + search_next_button = _tmp88_; + _tmp89_ = search_next_button; + g_signal_connect_object (_tmp89_, "clicked", (GCallback) _configuration_editor_find_next_cb_gtk_button_clicked, self, 0); + _tmp90_ = self->priv->model; + _tmp92_ = gtk_tree_model_get_iter_first ((GtkTreeModel*) _tmp90_, &_tmp91_); + iter = _tmp91_; + if (_tmp92_) { + GtkTreeView* _tmp93_; + GtkTreeSelection* _tmp94_ = NULL; + GtkTreeIter _tmp95_; + _tmp93_ = self->priv->dir_tree_view; + _tmp94_ = gtk_tree_view_get_selection (_tmp93_); + _tmp95_ = iter; + gtk_tree_selection_select_iter (_tmp94_, &_tmp95_); } _g_object_unref0 (search_next_button); _g_object_unref0 (search_box_close_button); @@ -785,14 +794,6 @@ } -static void configuration_editor_close_search_cb (ConfigurationEditor* self) { - GtkBox* _tmp0_; - g_return_if_fail (self != NULL); - _tmp0_ = self->priv->search_box; - gtk_widget_hide ((GtkWidget*) _tmp0_); -} - - static void configuration_editor_real_activate (GApplication* base) { ConfigurationEditor * self; GtkApplicationWindow* _tmp0_; diff -Nru d-conf-0.16.1/editor/dconf-editor.gresource.xml d-conf-0.18.0/editor/dconf-editor.gresource.xml --- d-conf-0.16.1/editor/dconf-editor.gresource.xml 1970-01-01 00:00:00.000000000 +0000 +++ d-conf-0.18.0/editor/dconf-editor.gresource.xml 2013-07-17 20:01:30.000000000 +0000 @@ -0,0 +1,7 @@ + + + + dconf-editor.ui + dconf-editor-menu.ui + + diff -Nru d-conf-0.16.1/editor/dconf-editor.ui d-conf-0.18.0/editor/dconf-editor.ui --- d-conf-0.16.1/editor/dconf-editor.ui 2013-07-16 16:20:20.000000000 +0000 +++ d-conf-0.18.0/editor/dconf-editor.ui 2013-07-17 20:01:30.000000000 +0000 @@ -5,155 +5,189 @@ Set to Default False - + + True False - 6 + vertical + 6 - + True - False - vertical - 6 + True + 100 - + True True - 100 + never + in - - True - True - never - in - - - - - - True - False - + + + + True + False + + + + + True + False + 6 - + True + False False - 6 + 6 + 6 + 6 + 6 - + True - False False - 6 - 6 - - - True - False - 0 - 0 - Schema: - - - 0 - 0 - 1 - 1 - - - - - True - False - 0 - 0 - Summary: - - - 0 - 1 - 1 - 1 - - - - - True - False - 0 - 0 - Description: - - - 0 - 2 - 1 - 1 - - - - - True - False - 0 - 0 - Type: - - - 0 - 3 - 1 - 1 - - - - - True - False - 0 - 0 - Default: - - - 0 - 4 - 1 - 1 - - - - - True - False - 0 - 0 - True - - - 1 - 0 - 1 - 1 - - - - - True - False - 0 - 0 - True - True - - - 1 - 1 - 1 - 1 - - + 0 + 0 + Schema: + + + 0 + 0 + 1 + 1 + + + + + True + False + 0 + 0 + Summary: + + + 0 + 1 + 1 + 1 + + + + + True + False + 0 + 0 + Description: + + + 0 + 2 + 1 + 1 + + + + + True + False + 0 + 0 + Type: + + + 0 + 3 + 1 + 1 + + + + + True + False + 0 + 0 + Default: + + + 0 + 4 + 1 + 1 + + + + + True + False + 0 + 0 + True + + + 1 + 0 + 1 + 1 + + + + + True + False + 0 + 0 + True + True + + + 1 + 1 + 1 + 1 + + + + + True + False + 0 + 0 + True + True + + + 1 + 2 + 1 + 1 + + + + + True + False + 0 + 0 + True + + + 1 + 3 + 1 + 1 + + + + + True + False + 6 - + True False 0 @@ -162,191 +196,153 @@ True - 1 - 2 - 1 - 1 - - - - - True - False - 0 - 0 - True - - - 1 - 3 - 1 - 1 + True + True + 0 - + + set_default_action True - False - 6 - - - True - False - 0 - 0 - True - True - - - True - True - 0 - - - - - set_default_action - True - True - True - set_default_action - - - False - True - 1 - - + True + True + set_default_action - 1 - 4 - 1 - 1 + False + True + 1 - False - True - end - 0 - - - - - True - True - in - - - - - - True - True - 1 + 1 + 4 + 1 + 1 - True - False - - - - - True - True - 0 - - - - - False - 5 - - - False - True - True - True - False - none - - - True - False - gtk-close - - - - False True + end 0 - + True True - • + in + + + - False + True True 1 + + + True + False + + + + + True + True + 0 + + + + + False + 5 + + + False + True + True + True + False + none - + True False - 6 - True - - - Next - False - True - True - True - False - - - False - True - 1 - - + gtk-close - - False - True - 2 - + + + False + True + 0 + + + + + True + True + • + + + False + True + 1 + + + + + True + False + 6 + True - + + Next + False True - False - 0 + True + True + False - True + False True - 3 + 1 False True - 1 + 2 + + + + + True + False + 0 + + + True + True + 3 + + False + True + 1 + diff -Nru d-conf-0.16.1/editor/dconf-editor.vala d-conf-0.18.0/editor/dconf-editor.vala --- d-conf-0.16.1/editor/dconf-editor.vala 2013-07-16 16:20:20.000000000 +0000 +++ d-conf-0.18.0/editor/dconf-editor.vala 2013-07-17 20:01:30.000000000 +0000 @@ -51,8 +51,7 @@ ui = new Gtk.Builder(); try { - string[] objects = { "set_default_action", "box1", "menu" }; - ui.add_objects_from_file(Path.build_filename(Config.PKGDATADIR, "dconf-editor.ui"), objects); + ui.add_from_resource("/ca/desrt/dconf-editor/dconf-editor.ui"); } catch (Error e) { @@ -63,12 +62,12 @@ window.title = _("dconf Editor"); window.window_state_event.connect(main_window_window_state_event_cb); window.configure_event.connect(main_window_configure_event_cb); - window.add((Gtk.Box)ui.get_object("box1")); + window.add(ui.get_object("box1") as Gtk.Box); var menu_ui = new Gtk.Builder(); try { - menu_ui.add_from_file(Path.build_filename(Config.PKGDATADIR, "dconf-editor-menu.ui")); + menu_ui.add_from_resource("/ca/desrt/dconf-editor/dconf-editor-menu.ui"); } catch (Error e) { @@ -86,32 +85,44 @@ dir_tree_view.set_model(model); dir_tree_view.get_selection().changed.connect(dir_selected_cb); // FIXME: Put in view dir_tree_view.show(); - var scroll = (Gtk.ScrolledWindow)ui.get_object("directory_scrolledwindow"); + var scroll = ui.get_object("directory_scrolledwindow") as Gtk.ScrolledWindow; scroll.add(dir_tree_view); key_tree_view = new DConfKeyView(); key_tree_view.show(); key_tree_view.get_selection().changed.connect(key_selected_cb); - scroll = (Gtk.ScrolledWindow)ui.get_object("key_scrolledwindow"); + scroll = ui.get_object("key_scrolledwindow") as Gtk.ScrolledWindow; scroll.add(key_tree_view); - key_info_grid = (Gtk.Grid)ui.get_object("key_info_grid"); - schema_label = (Gtk.Label)ui.get_object("schema_label"); - summary_label = (Gtk.Label)ui.get_object("summary_label"); - description_label = (Gtk.Label)ui.get_object("description_label"); - type_label = (Gtk.Label)ui.get_object("type_label"); - default_label = (Gtk.Label)ui.get_object("default_label"); - set_default_action = (Gtk.Action)ui.get_object("set_default_action"); + key_info_grid = ui.get_object("key_info_grid") as Gtk.Grid; + schema_label = ui.get_object("schema_label") as Gtk.Label; + summary_label = ui.get_object("summary_label") as Gtk.Label; + description_label = ui.get_object("description_label") as Gtk.Label; + type_label = ui.get_object("type_label") as Gtk.Label; + default_label = ui.get_object("default_label") as Gtk.Label; + set_default_action = ui.get_object("set_default_action") as Gtk.Action; set_default_action.activate.connect(set_default_cb); - search_box = (Gtk.Box)ui.get_object("search_box"); - search_entry = (Gtk.Entry)ui.get_object("search_entry"); - search_label = (Gtk.Label)ui.get_object("search_label"); + search_box = ui.get_object("search_box") as Gtk.Box; + search_box.key_press_event.connect ((event) => + { + if (event.keyval == Gdk.Key.Escape) + { + search_box.hide(); + return true; + } + return false; + }); + search_entry = ui.get_object("search_entry") as Gtk.Entry; + search_label = ui.get_object("search_label") as Gtk.Label; search_entry.activate.connect(find_next_cb); - var search_box_close_button = (Gtk.Button)ui.get_object("search_box_close_button"); - search_box_close_button.clicked.connect(close_search_cb); + var search_box_close_button = ui.get_object("search_box_close_button") as Gtk.Button; + search_box_close_button.clicked.connect(() => + { + search_box.hide(); + }); - var search_next_button = (Gtk.Button)ui.get_object("search_next_button"); + var search_next_button = ui.get_object("search_next_button") as Gtk.Button; search_next_button.clicked.connect(find_next_cb); /* Always select something */ @@ -119,11 +130,6 @@ if (model.get_iter_first(out iter)) dir_tree_view.get_selection().select_iter(iter); } - - private void close_search_cb () - { - search_box.hide(); - } protected override void activate() { diff -Nru d-conf-0.16.1/editor/dconf-model.c d-conf-0.18.0/editor/dconf-model.c --- d-conf-0.16.1/editor/dconf-model.c 2013-07-16 16:43:55.000000000 +0000 +++ d-conf-0.18.0/editor/dconf-model.c 2013-09-23 21:29:38.000000000 +0000 @@ -1,4 +1,4 @@ -/* dconf-model.c generated by valac 0.18.1, the Vala compiler +/* dconf-model.c generated by valac 0.20.1, the Vala compiler * generated from dconf-model.vala, do not modify */ @@ -1996,6 +1996,7 @@ static gboolean key_model_real_get_iter (GtkTreeModel* base, GtkTreeIter* iter, GtkTreePath* path) { KeyModel * self; + GtkTreeIter _vala_iter = {0}; gboolean result = FALSE; GtkTreePath* _tmp0_; gint _tmp1_ = 0; @@ -2006,20 +2007,26 @@ GtkTreeIter _tmp6_ = {0}; gboolean _tmp7_ = FALSE; self = (KeyModel*) base; - g_return_val_if_fail (iter != NULL, FALSE); g_return_val_if_fail (path != NULL, FALSE); + memset (&_vala_iter, 0, sizeof (GtkTreeIter)); _tmp0_ = path; _tmp1_ = gtk_tree_path_get_depth (_tmp0_); if (_tmp1_ != 1) { result = FALSE; + if (iter) { + *iter = _vala_iter; + } return result; } _tmp2_ = path; _tmp4_ = gtk_tree_path_get_indices_with_depth (_tmp2_, &_tmp3_); _tmp5_ = _tmp4_[0]; _tmp7_ = gtk_tree_model_iter_nth_child ((GtkTreeModel*) self, &_tmp6_, NULL, _tmp5_); - *iter = _tmp6_; + _vala_iter = _tmp6_; result = _tmp7_; + if (iter) { + *iter = _vala_iter; + } return result; } @@ -2209,6 +2216,7 @@ static gboolean key_model_real_iter_children (GtkTreeModel* base, GtkTreeIter* iter, GtkTreeIter* parent) { KeyModel * self; + GtkTreeIter _vala_iter = {0}; gboolean result = FALSE; gboolean _tmp0_ = FALSE; GtkTreeIter* _tmp1_; @@ -2218,7 +2226,7 @@ GList* _tmp9_; gconstpointer _tmp10_ = NULL; self = (KeyModel*) base; - g_return_val_if_fail (iter != NULL, FALSE); + memset (&_vala_iter, 0, sizeof (GtkTreeIter)); _tmp1_ = parent; if (_tmp1_ != NULL) { _tmp0_ = TRUE; @@ -2236,14 +2244,20 @@ _tmp6_ = _tmp0_; if (_tmp6_) { result = FALSE; + if (iter) { + *iter = _vala_iter; + } return result; } _tmp7_ = self->priv->directory; _tmp8_ = directory_get_keys (_tmp7_); _tmp9_ = _tmp8_; _tmp10_ = g_list_nth_data (_tmp9_, (guint) 0); - key_model_set_iter (self, iter, (Key*) _tmp10_); + key_model_set_iter (self, &_vala_iter, (Key*) _tmp10_); result = TRUE; + if (iter) { + *iter = _vala_iter; + } return result; } @@ -2284,6 +2298,7 @@ static gboolean key_model_real_iter_nth_child (GtkTreeModel* base, GtkTreeIter* iter, GtkTreeIter* parent, gint n) { KeyModel * self; + GtkTreeIter _vala_iter = {0}; gboolean result = FALSE; GtkTreeIter* _tmp0_; gint _tmp1_; @@ -2297,10 +2312,13 @@ gint _tmp9_; gconstpointer _tmp10_ = NULL; self = (KeyModel*) base; - g_return_val_if_fail (iter != NULL, FALSE); + memset (&_vala_iter, 0, sizeof (GtkTreeIter)); _tmp0_ = parent; if (_tmp0_ != NULL) { result = FALSE; + if (iter) { + *iter = _vala_iter; + } return result; } _tmp1_ = n; @@ -2310,6 +2328,9 @@ _tmp5_ = g_list_length (_tmp4_); if (((guint) _tmp1_) >= _tmp5_) { result = FALSE; + if (iter) { + *iter = _vala_iter; + } return result; } _tmp6_ = self->priv->directory; @@ -2317,19 +2338,26 @@ _tmp8_ = _tmp7_; _tmp9_ = n; _tmp10_ = g_list_nth_data (_tmp8_, (guint) _tmp9_); - key_model_set_iter (self, iter, (Key*) _tmp10_); + key_model_set_iter (self, &_vala_iter, (Key*) _tmp10_); result = TRUE; + if (iter) { + *iter = _vala_iter; + } return result; } static gboolean key_model_real_iter_parent (GtkTreeModel* base, GtkTreeIter* iter, GtkTreeIter* child) { KeyModel * self; + GtkTreeIter _vala_iter = {0}; gboolean result = FALSE; self = (KeyModel*) base; - g_return_val_if_fail (iter != NULL, FALSE); g_return_val_if_fail (child != NULL, FALSE); + memset (&_vala_iter, 0, sizeof (GtkTreeIter)); result = FALSE; + if (iter) { + *iter = _vala_iter; + } return result; } @@ -2509,6 +2537,7 @@ static gboolean enum_model_real_get_iter (GtkTreeModel* base, GtkTreeIter* iter, GtkTreePath* path) { EnumModel * self; + GtkTreeIter _vala_iter = {0}; gboolean result = FALSE; GtkTreePath* _tmp0_; gint _tmp1_ = 0; @@ -2519,20 +2548,26 @@ GtkTreeIter _tmp6_ = {0}; gboolean _tmp7_ = FALSE; self = (EnumModel*) base; - g_return_val_if_fail (iter != NULL, FALSE); g_return_val_if_fail (path != NULL, FALSE); + memset (&_vala_iter, 0, sizeof (GtkTreeIter)); _tmp0_ = path; _tmp1_ = gtk_tree_path_get_depth (_tmp0_); if (_tmp1_ != 1) { result = FALSE; + if (iter) { + *iter = _vala_iter; + } return result; } _tmp2_ = path; _tmp4_ = gtk_tree_path_get_indices_with_depth (_tmp2_, &_tmp3_); _tmp5_ = _tmp4_[0]; _tmp7_ = gtk_tree_model_iter_nth_child ((GtkTreeModel*) self, &_tmp6_, NULL, _tmp5_); - *iter = _tmp6_; + _vala_iter = _tmp6_; result = _tmp7_; + if (iter) { + *iter = _vala_iter; + } return result; } @@ -2663,6 +2698,7 @@ static gboolean enum_model_real_iter_children (GtkTreeModel* base, GtkTreeIter* iter, GtkTreeIter* parent) { EnumModel * self; + GtkTreeIter _vala_iter = {0}; gboolean result = FALSE; gboolean _tmp0_ = FALSE; GtkTreeIter* _tmp1_; @@ -2671,7 +2707,7 @@ GList* _tmp7_; gconstpointer _tmp8_ = NULL; self = (EnumModel*) base; - g_return_val_if_fail (iter != NULL, FALSE); + memset (&_vala_iter, 0, sizeof (GtkTreeIter)); _tmp1_ = parent; if (_tmp1_ != NULL) { _tmp0_ = TRUE; @@ -2687,13 +2723,19 @@ _tmp5_ = _tmp0_; if (_tmp5_) { result = FALSE; + if (iter) { + *iter = _vala_iter; + } return result; } _tmp6_ = self->priv->schema_enum; _tmp7_ = _tmp6_->values; _tmp8_ = g_list_nth_data (_tmp7_, (guint) 0); - enum_model_set_iter (self, iter, (SchemaValue*) _tmp8_); + enum_model_set_iter (self, &_vala_iter, (SchemaValue*) _tmp8_); result = TRUE; + if (iter) { + *iter = _vala_iter; + } return result; } @@ -2732,6 +2774,7 @@ static gboolean enum_model_real_iter_nth_child (GtkTreeModel* base, GtkTreeIter* iter, GtkTreeIter* parent, gint n) { EnumModel * self; + GtkTreeIter _vala_iter = {0}; gboolean result = FALSE; GtkTreeIter* _tmp0_; gint _tmp1_; @@ -2743,10 +2786,13 @@ gint _tmp7_; gconstpointer _tmp8_ = NULL; self = (EnumModel*) base; - g_return_val_if_fail (iter != NULL, FALSE); + memset (&_vala_iter, 0, sizeof (GtkTreeIter)); _tmp0_ = parent; if (_tmp0_ != NULL) { result = FALSE; + if (iter) { + *iter = _vala_iter; + } return result; } _tmp1_ = n; @@ -2755,25 +2801,35 @@ _tmp4_ = g_list_length (_tmp3_); if (((guint) _tmp1_) >= _tmp4_) { result = FALSE; + if (iter) { + *iter = _vala_iter; + } return result; } _tmp5_ = self->priv->schema_enum; _tmp6_ = _tmp5_->values; _tmp7_ = n; _tmp8_ = g_list_nth_data (_tmp6_, (guint) _tmp7_); - enum_model_set_iter (self, iter, (SchemaValue*) _tmp8_); + enum_model_set_iter (self, &_vala_iter, (SchemaValue*) _tmp8_); result = TRUE; + if (iter) { + *iter = _vala_iter; + } return result; } static gboolean enum_model_real_iter_parent (GtkTreeModel* base, GtkTreeIter* iter, GtkTreeIter* child) { EnumModel * self; + GtkTreeIter _vala_iter = {0}; gboolean result = FALSE; self = (EnumModel*) base; - g_return_val_if_fail (iter != NULL, FALSE); g_return_val_if_fail (child != NULL, FALSE); + memset (&_vala_iter, 0, sizeof (GtkTreeIter)); result = FALSE; + if (iter) { + *iter = _vala_iter; + } return result; } @@ -3052,7 +3108,7 @@ _inner_error_ = NULL; _tmp29_ = e; _tmp30_ = _tmp29_->message; - g_warning ("dconf-model.vala:605: Failed to parse schemas: %s", _tmp30_); + g_warning ("dconf-model.vala:622: Failed to parse schemas: %s", _tmp30_); _g_error_free0 (e); } __finally4: @@ -3185,6 +3241,7 @@ static gboolean settings_model_real_get_iter (GtkTreeModel* base, GtkTreeIter* iter, GtkTreePath* path) { SettingsModel * self; + GtkTreeIter _vala_iter = {0}; gboolean result = FALSE; GtkTreePath* _tmp0_; gint _tmp1_ = 0; @@ -3193,15 +3250,18 @@ GtkTreeIter _tmp4_ = {0}; gboolean _tmp5_ = FALSE; self = (SettingsModel*) base; - g_return_val_if_fail (iter != NULL, FALSE); g_return_val_if_fail (path != NULL, FALSE); + memset (&_vala_iter, 0, sizeof (GtkTreeIter)); _tmp0_ = path; _tmp2_ = gtk_tree_path_get_indices_with_depth (_tmp0_, &_tmp1_); _tmp3_ = _tmp2_[0]; _tmp5_ = gtk_tree_model_iter_nth_child ((GtkTreeModel*) self, &_tmp4_, NULL, _tmp3_); - *iter = _tmp4_; + _vala_iter = _tmp4_; if (!_tmp5_) { result = FALSE; + if (iter) { + *iter = _vala_iter; + } return result; } { @@ -3238,7 +3298,7 @@ if (!(_tmp9_ < _tmp11_)) { break; } - _tmp12_ = *iter; + _tmp12_ = _vala_iter; parent = _tmp12_; _tmp13_ = parent; _tmp14_ = path; @@ -3246,15 +3306,21 @@ _tmp17_ = i; _tmp18_ = _tmp16_[_tmp17_]; _tmp20_ = gtk_tree_model_iter_nth_child ((GtkTreeModel*) self, &_tmp19_, &_tmp13_, _tmp18_); - *iter = _tmp19_; + _vala_iter = _tmp19_; if (!_tmp20_) { result = FALSE; + if (iter) { + *iter = _vala_iter; + } return result; } } } } result = TRUE; + if (iter) { + *iter = _vala_iter; + } return result; } @@ -3415,6 +3481,7 @@ static gboolean settings_model_real_iter_children (GtkTreeModel* base, GtkTreeIter* iter, GtkTreeIter* parent) { SettingsModel * self; + GtkTreeIter _vala_iter = {0}; gboolean result = FALSE; GtkTreeIter* _tmp0_; Directory* _tmp1_ = NULL; @@ -3428,7 +3495,7 @@ GList* _tmp8_; gconstpointer _tmp9_ = NULL; self = (SettingsModel*) base; - g_return_val_if_fail (iter != NULL, FALSE); + memset (&_vala_iter, 0, sizeof (GtkTreeIter)); _tmp0_ = parent; _tmp1_ = settings_model_get_directory (self, _tmp0_); directory = _tmp1_; @@ -3439,15 +3506,21 @@ if (_tmp5_ == ((guint) 0)) { result = FALSE; _g_object_unref0 (directory); + if (iter) { + *iter = _vala_iter; + } return result; } _tmp6_ = directory; _tmp7_ = directory_get_children (_tmp6_); _tmp8_ = _tmp7_; _tmp9_ = g_list_nth_data (_tmp8_, (guint) 0); - settings_model_set_iter (self, iter, (Directory*) _tmp9_); + settings_model_set_iter (self, &_vala_iter, (Directory*) _tmp9_); result = TRUE; _g_object_unref0 (directory); + if (iter) { + *iter = _vala_iter; + } return result; } @@ -3503,6 +3576,7 @@ static gboolean settings_model_real_iter_nth_child (GtkTreeModel* base, GtkTreeIter* iter, GtkTreeIter* parent, gint n) { SettingsModel * self; + GtkTreeIter _vala_iter = {0}; gboolean result = FALSE; GtkTreeIter* _tmp0_; Directory* _tmp1_ = NULL; @@ -3518,7 +3592,7 @@ gint _tmp10_; gconstpointer _tmp11_ = NULL; self = (SettingsModel*) base; - g_return_val_if_fail (iter != NULL, FALSE); + memset (&_vala_iter, 0, sizeof (GtkTreeIter)); _tmp0_ = parent; _tmp1_ = settings_model_get_directory (self, _tmp0_); directory = _tmp1_; @@ -3530,6 +3604,9 @@ if (((guint) _tmp2_) >= _tmp6_) { result = FALSE; _g_object_unref0 (directory); + if (iter) { + *iter = _vala_iter; + } return result; } _tmp7_ = directory; @@ -3537,15 +3614,19 @@ _tmp9_ = _tmp8_; _tmp10_ = n; _tmp11_ = g_list_nth_data (_tmp9_, (guint) _tmp10_); - settings_model_set_iter (self, iter, (Directory*) _tmp11_); + settings_model_set_iter (self, &_vala_iter, (Directory*) _tmp11_); result = TRUE; _g_object_unref0 (directory); + if (iter) { + *iter = _vala_iter; + } return result; } static gboolean settings_model_real_iter_parent (GtkTreeModel* base, GtkTreeIter* iter, GtkTreeIter* child) { SettingsModel * self; + GtkTreeIter _vala_iter = {0}; gboolean result = FALSE; GtkTreeIter _tmp0_; Directory* _tmp1_ = NULL; @@ -3556,8 +3637,8 @@ Directory* _tmp5_; Directory* _tmp6_; self = (SettingsModel*) base; - g_return_val_if_fail (iter != NULL, FALSE); g_return_val_if_fail (child != NULL, FALSE); + memset (&_vala_iter, 0, sizeof (GtkTreeIter)); _tmp0_ = *child; _tmp1_ = settings_model_get_directory (self, &_tmp0_); directory = _tmp1_; @@ -3567,13 +3648,19 @@ if (_tmp3_ == _tmp4_) { result = FALSE; _g_object_unref0 (directory); + if (iter) { + *iter = _vala_iter; + } return result; } _tmp5_ = directory; _tmp6_ = _tmp5_->parent; - settings_model_set_iter (self, iter, _tmp6_); + settings_model_set_iter (self, &_vala_iter, _tmp6_); result = TRUE; _g_object_unref0 (directory); + if (iter) { + *iter = _vala_iter; + } return result; } diff -Nru d-conf-0.16.1/editor/dconf-model.vala d-conf-0.18.0/editor/dconf-model.vala --- d-conf-0.16.1/editor/dconf-model.vala 2013-07-16 16:20:20.000000000 +0000 +++ d-conf-0.18.0/editor/dconf-model.vala 2013-07-17 20:01:30.000000000 +0000 @@ -254,7 +254,7 @@ string[] tokens = path.split("/", 2); string name = tokens[0]; - Directory directory = get_child(name); + var directory = get_child(name); directory.load_schema(schema, tokens[1]); } } @@ -341,8 +341,10 @@ return (Key)iter.user_data; } - public bool get_iter(ref Gtk.TreeIter iter, Gtk.TreePath path) + public bool get_iter(out Gtk.TreeIter iter, Gtk.TreePath path) { + iter = Gtk.TreeIter(); + if (path.get_depth() != 1) return false; @@ -391,11 +393,14 @@ return true; } - public bool iter_children(ref Gtk.TreeIter iter, Gtk.TreeIter? parent) + public bool iter_children(out Gtk.TreeIter iter, Gtk.TreeIter? parent) { + iter = Gtk.TreeIter(); + if (parent != null || directory.keys.length() == 0) return false; set_iter(ref iter, directory.keys.nth_data(0)); + return true; } @@ -412,8 +417,10 @@ return 0; } - public bool iter_nth_child(ref Gtk.TreeIter iter, Gtk.TreeIter? parent, int n) + public bool iter_nth_child(out Gtk.TreeIter iter, Gtk.TreeIter? parent, int n) { + iter = Gtk.TreeIter(); + if (parent != null) return false; @@ -423,8 +430,9 @@ return true; } - public bool iter_parent(ref Gtk.TreeIter iter, Gtk.TreeIter child) + public bool iter_parent(out Gtk.TreeIter iter, Gtk.TreeIter child) { + iter = Gtk.TreeIter(); return false; } @@ -479,8 +487,10 @@ return (SchemaValue)iter.user_data; } - public bool get_iter(ref Gtk.TreeIter iter, Gtk.TreePath path) + public bool get_iter(out Gtk.TreeIter iter, Gtk.TreePath path) { + iter = Gtk.TreeIter(); + if (path.get_depth() != 1) return false; @@ -513,11 +523,15 @@ return true; } - public bool iter_children(ref Gtk.TreeIter iter, Gtk.TreeIter? parent) + public bool iter_children(out Gtk.TreeIter iter, Gtk.TreeIter? parent) { + iter = Gtk.TreeIter(); + if (parent != null || schema_enum.values.length() == 0) return false; + set_iter(ref iter, schema_enum.values.nth_data(0)); + return true; } @@ -534,8 +548,10 @@ return 0; } - public bool iter_nth_child(ref Gtk.TreeIter iter, Gtk.TreeIter? parent, int n) + public bool iter_nth_child(out Gtk.TreeIter iter, Gtk.TreeIter? parent, int n) { + iter = Gtk.TreeIter(); + if (parent != null) return false; @@ -545,8 +561,9 @@ return true; } - public bool iter_parent(ref Gtk.TreeIter iter, Gtk.TreeIter child) + public bool iter_parent(out Gtk.TreeIter iter, Gtk.TreeIter child) { + iter = Gtk.TreeIter(); return false; } @@ -644,8 +661,10 @@ return (Directory)iter.user_data; } - public bool get_iter(ref Gtk.TreeIter iter, Gtk.TreePath path) + public bool get_iter(out Gtk.TreeIter iter, Gtk.TreePath path) { + iter = Gtk.TreeIter(); + if (!iter_nth_child(out iter, null, path.get_indices()[0])) return false; @@ -677,19 +696,23 @@ public bool iter_next(ref Gtk.TreeIter iter) { - Directory directory = get_directory(iter); + var directory = get_directory(iter); if (directory.index >= directory.parent.children.length() - 1) return false; set_iter(ref iter, directory.parent.children.nth_data(directory.index+1)); + return true; } - public bool iter_children(ref Gtk.TreeIter iter, Gtk.TreeIter? parent) + public bool iter_children(out Gtk.TreeIter iter, Gtk.TreeIter? parent) { - Directory directory = get_directory(parent); + iter = Gtk.TreeIter(); + + var directory = get_directory(parent); if (directory.children.length() == 0) return false; set_iter(ref iter, directory.children.nth_data(0)); + return true; } @@ -703,21 +726,28 @@ return (int) get_directory(iter).children.length(); } - public bool iter_nth_child(ref Gtk.TreeIter iter, Gtk.TreeIter? parent, int n) + public bool iter_nth_child(out Gtk.TreeIter iter, Gtk.TreeIter? parent, int n) { - Directory directory = get_directory(parent); + iter = Gtk.TreeIter(); + + var directory = get_directory(parent); if (n >= directory.children.length()) return false; set_iter(ref iter, directory.children.nth_data(n)); + return true; } - public bool iter_parent(ref Gtk.TreeIter iter, Gtk.TreeIter child) + public bool iter_parent(out Gtk.TreeIter iter, Gtk.TreeIter child) { - Directory directory = get_directory(child); + iter = Gtk.TreeIter(); + + var directory = get_directory(child); if (directory.parent == root) return false; + set_iter(ref iter, directory.parent); + return true; } diff -Nru d-conf-0.16.1/editor/dconf-schema.c d-conf-0.18.0/editor/dconf-schema.c --- d-conf-0.16.1/editor/dconf-schema.c 2013-07-16 16:43:55.000000000 +0000 +++ d-conf-0.18.0/editor/dconf-schema.c 2013-09-23 21:29:38.000000000 +0000 @@ -1,4 +1,4 @@ -/* dconf-schema.c generated by valac 0.18.1, the Vala compiler +/* dconf-schema.c generated by valac 0.20.1, the Vala compiler * generated from dconf-schema.vala, do not modify */ diff -Nru d-conf-0.16.1/editor/dconf-view.c d-conf-0.18.0/editor/dconf-view.c --- d-conf-0.16.1/editor/dconf-view.c 2013-07-16 16:43:55.000000000 +0000 +++ d-conf-0.18.0/editor/dconf-view.c 2013-09-23 21:29:38.000000000 +0000 @@ -1,4 +1,4 @@ -/* dconf-view.c generated by valac 0.18.1, the Vala compiler +/* dconf-view.c generated by valac 0.20.1, the Vala compiler * generated from dconf-view.vala, do not modify */ diff -Nru d-conf-0.16.1/editor/dconf-view.vala d-conf-0.18.0/editor/dconf-view.vala --- d-conf-0.16.1/editor/dconf-view.vala 2013-07-16 16:20:20.000000000 +0000 +++ d-conf-0.18.0/editor/dconf-view.vala 2013-07-17 20:01:30.000000000 +0000 @@ -270,7 +270,7 @@ private void spin_edited_cb(Gtk.CellRendererText renderer, string path, string text) { - Key key = get_key_from_path(path); + var key = get_key_from_path(path); switch (key.type_string) { case "y": diff -Nru d-conf-0.16.1/engine/Makefile.in d-conf-0.18.0/engine/Makefile.in --- d-conf-0.16.1/engine/Makefile.in 2013-07-16 16:43:49.000000000 +0000 +++ d-conf-0.18.0/engine/Makefile.in 2013-09-23 21:29:28.000000000 +0000 @@ -203,6 +203,7 @@ EGREP = @EGREP@ EXEEXT = @EXEEXT@ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ +GLIB_COMPILE_RESOURCES = @GLIB_COMPILE_RESOURCES@ GLIB_COMPILE_SCHEMAS = @GLIB_COMPILE_SCHEMAS@ GMOFILES = @GMOFILES@ GMSGFMT = @GMSGFMT@ diff -Nru d-conf-0.16.1/gdbus/Makefile.in d-conf-0.18.0/gdbus/Makefile.in --- d-conf-0.16.1/gdbus/Makefile.in 2013-07-16 16:43:49.000000000 +0000 +++ d-conf-0.18.0/gdbus/Makefile.in 2013-09-23 21:29:28.000000000 +0000 @@ -211,6 +211,7 @@ EGREP = @EGREP@ EXEEXT = @EXEEXT@ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ +GLIB_COMPILE_RESOURCES = @GLIB_COMPILE_RESOURCES@ GLIB_COMPILE_SCHEMAS = @GLIB_COMPILE_SCHEMAS@ GMOFILES = @GMOFILES@ GMSGFMT = @GMSGFMT@ diff -Nru d-conf-0.16.1/gsettings/Makefile.in d-conf-0.18.0/gsettings/Makefile.in --- d-conf-0.16.1/gsettings/Makefile.in 2013-07-16 16:43:49.000000000 +0000 +++ d-conf-0.18.0/gsettings/Makefile.in 2013-09-23 21:29:29.000000000 +0000 @@ -391,6 +391,7 @@ EGREP = @EGREP@ EXEEXT = @EXEEXT@ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ +GLIB_COMPILE_RESOURCES = @GLIB_COMPILE_RESOURCES@ GLIB_COMPILE_SCHEMAS = @GLIB_COMPILE_SCHEMAS@ GMOFILES = @GMOFILES@ GMSGFMT = @GMSGFMT@ diff -Nru d-conf-0.16.1/gvdb/Makefile.in d-conf-0.18.0/gvdb/Makefile.in --- d-conf-0.16.1/gvdb/Makefile.in 2013-07-16 16:43:49.000000000 +0000 +++ d-conf-0.18.0/gvdb/Makefile.in 2013-09-23 21:29:29.000000000 +0000 @@ -190,6 +190,7 @@ EGREP = @EGREP@ EXEEXT = @EXEEXT@ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ +GLIB_COMPILE_RESOURCES = @GLIB_COMPILE_RESOURCES@ GLIB_COMPILE_SCHEMAS = @GLIB_COMPILE_SCHEMAS@ GMOFILES = @GMOFILES@ GMSGFMT = @GMSGFMT@ diff -Nru d-conf-0.16.1/po/LINGUAS d-conf-0.18.0/po/LINGUAS --- d-conf-0.16.1/po/LINGUAS 2013-07-16 16:20:20.000000000 +0000 +++ d-conf-0.18.0/po/LINGUAS 2013-09-16 18:14:30.000000000 +0000 @@ -19,6 +19,7 @@ fa fi fr +fur gl he hi @@ -32,6 +33,7 @@ ml mr nb +nl pa pl pt diff -Nru d-conf-0.16.1/po/as.po d-conf-0.18.0/po/as.po --- d-conf-0.16.1/po/as.po 2013-03-14 18:27:40.000000000 +0000 +++ d-conf-0.18.0/po/as.po 2013-09-16 18:14:30.000000000 +0000 @@ -8,8 +8,8 @@ "Project-Id-Version: dconf master\n" "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?" "product=dconf&keywords=I18N+L10N&component=general\n" -"POT-Creation-Date: 2012-11-24 15:52+0000\n" -"PO-Revision-Date: 2013-03-07 14:51+0530\n" +"POT-Creation-Date: 2013-08-06 16:14+0000\n" +"PO-Revision-Date: 2013-09-12 17:56+0530\n" "Last-Translator: Nilamdyuti Goswami \n" "Language-Team: Assamese \n" "Language: as\n" @@ -20,11 +20,11 @@ "Plural-Forms: nplurals=2; plural=n != 1;\n" #: ../editor/dconf-editor.desktop.in.in.h:1 ../editor/dconf-editor.vala:43 -#: ../editor/dconf-editor.vala:63 ../editor/dconf-editor.vala:394 +#: ../editor/dconf-editor.vala:62 ../editor/dconf-editor.vala:400 msgid "dconf Editor" msgstr "dconf সম্পাদক" -#: ../editor/dconf-editor.desktop.in.in.h:2 ../editor/dconf-editor.vala:397 +#: ../editor/dconf-editor.desktop.in.in.h:2 ../editor/dconf-editor.vala:403 msgid "Directly edit your entire configuration database" msgstr "আপোনাৰ সম্পূৰ্ণ সংৰূপ ডাটাবেইচ প্ৰত্যক্ষভাৱে সম্পাদন কৰক" @@ -32,32 +32,32 @@ msgid "settings;configuration;" msgstr "settings;configuration;" -#: ../editor/dconf-editor.vala:180 +#: ../editor/dconf-editor.vala:186 #, c-format msgid "Integer [%s..%s]" msgstr "পূৰ্ণ সংখ্যা [%s..%s]" -#: ../editor/dconf-editor.vala:182 +#: ../editor/dconf-editor.vala:188 msgid "Boolean" msgstr "বুলিয়ান" -#: ../editor/dconf-editor.vala:184 +#: ../editor/dconf-editor.vala:190 msgid "String" msgstr "স্ট্ৰিং" -#: ../editor/dconf-editor.vala:186 +#: ../editor/dconf-editor.vala:192 msgid "Enumeration" msgstr "ইনুমাৰেষণ" -#: ../editor/dconf-editor.vala:234 +#: ../editor/dconf-editor.vala:240 msgid "No schema" msgstr "কোনো স্কিমা নাই" -#: ../editor/dconf-editor.vala:344 +#: ../editor/dconf-editor.vala:350 msgid "Not found" msgstr "পোৱা নগল" -#: ../editor/dconf-editor.vala:392 +#: ../editor/dconf-editor.vala:398 msgid "" "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 " @@ -89,11 +89,11 @@ "পোৱা, Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, " "Boston, MA 02110-1301 USA লে লিখক" -#: ../editor/dconf-editor.vala:398 +#: ../editor/dconf-editor.vala:404 msgid "Copyright © Canonical Ltd" msgstr "স্বত্বাধিকাৰ © Canonical Ltd" -#: ../editor/dconf-editor.vala:402 +#: ../editor/dconf-editor.vala:408 msgid "translator-credits" msgstr "নীলমদ্যুতি গোস্বামী (ngoswami@redhat.com)" @@ -142,8 +142,9 @@ msgstr "পৰৱৰ্তী" #: ../editor/dconf-editor-menu.ui.h:1 -msgid "_Find" -msgstr "সন্ধান কৰক (_F)" +#| msgid "_Find" +msgid "_Find…" +msgstr "সন্ধান কৰক (_F)…" #: ../editor/dconf-editor-menu.ui.h:2 msgid "_About" @@ -174,7 +175,6 @@ msgstr "সৰ্বাধিক অৱস্থা সামৰ্থবান কৰিবলে এটা ফ্লেগ" #: ../editor/ca.desrt.dconf-editor.gschema.xml.h:6 -#| msgid "A flag to enable maximized mode" msgid "A flag to enable fullscreen mode" msgstr "সম্পূৰ্ণপৰ্দা অৱস্থা সামৰ্থবান কৰিবলে এটা ফ্লেগ" diff -Nru d-conf-0.16.1/po/be.po d-conf-0.18.0/po/be.po --- d-conf-0.16.1/po/be.po 2013-03-25 21:40:52.000000000 +0000 +++ d-conf-0.18.0/po/be.po 2013-09-16 18:14:30.000000000 +0000 @@ -1,14 +1,14 @@ # Belarusian translation for dconf. # Copyright (C) 2012 dconf's COPYRIGHT HOLDER # This file is distributed under the same license as the dconf package. -# Ihar Hrachyshka , 2012. +# Ihar Hrachyshka , 2012, 2013. # msgid "" msgstr "" "Project-Id-Version: dconf master\n" "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?" "product=dconf&keywords=I18N+L10N&component=general\n" -"POT-Creation-Date: 2012-11-24 15:52+0000\n" +"POT-Creation-Date: 2013-08-06 16:14+0000\n" "PO-Revision-Date: 2012-09-09 13:51+0300\n" "Last-Translator: Ihar Hrachyshka \n" "Language-Team: Belarusian \n" @@ -18,11 +18,11 @@ "Content-Transfer-Encoding: 8bit\n" #: ../editor/dconf-editor.desktop.in.in.h:1 ../editor/dconf-editor.vala:43 -#: ../editor/dconf-editor.vala:63 ../editor/dconf-editor.vala:394 +#: ../editor/dconf-editor.vala:62 ../editor/dconf-editor.vala:400 msgid "dconf Editor" msgstr "Рэдактар dconf-настроек" -#: ../editor/dconf-editor.desktop.in.in.h:2 ../editor/dconf-editor.vala:397 +#: ../editor/dconf-editor.desktop.in.in.h:2 ../editor/dconf-editor.vala:403 msgid "Directly edit your entire configuration database" msgstr "Непасрэднае рэдагаванне ўсёй канфігурацыйнай базы" @@ -30,32 +30,32 @@ msgid "settings;configuration;" msgstr "настройкі;канфігурацыя;" -#: ../editor/dconf-editor.vala:180 +#: ../editor/dconf-editor.vala:186 #, c-format msgid "Integer [%s..%s]" msgstr "Цэлы лік [%s..%s]" -#: ../editor/dconf-editor.vala:182 +#: ../editor/dconf-editor.vala:188 msgid "Boolean" msgstr "Булева значэнне" -#: ../editor/dconf-editor.vala:184 +#: ../editor/dconf-editor.vala:190 msgid "String" msgstr "Тэкставы ланцужок" -#: ../editor/dconf-editor.vala:186 +#: ../editor/dconf-editor.vala:192 msgid "Enumeration" msgstr "Пералік" -#: ../editor/dconf-editor.vala:234 +#: ../editor/dconf-editor.vala:240 msgid "No schema" msgstr "Без схемы" -#: ../editor/dconf-editor.vala:344 +#: ../editor/dconf-editor.vala:350 msgid "Not found" msgstr "Не знойдзена" -#: ../editor/dconf-editor.vala:392 +#: ../editor/dconf-editor.vala:398 msgid "" "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 " @@ -85,11 +85,11 @@ "свабоднага апраграмавання на адрас: the Free Software Foundation, Inc., 51 " "Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA" -#: ../editor/dconf-editor.vala:398 +#: ../editor/dconf-editor.vala:404 msgid "Copyright © Canonical Ltd" msgstr "Аўтарскія правы © Canonical Ltd" -#: ../editor/dconf-editor.vala:402 +#: ../editor/dconf-editor.vala:408 msgid "translator-credits" msgstr "Ігар Грачышка " @@ -138,8 +138,8 @@ msgstr "Далей" #: ../editor/dconf-editor-menu.ui.h:1 -msgid "_Find" -msgstr "_Шукаць" +msgid "_Find…" +msgstr "_Шукаць..." #: ../editor/dconf-editor-menu.ui.h:2 msgid "_About" diff -Nru d-conf-0.16.1/po/ca.po d-conf-0.18.0/po/ca.po --- d-conf-0.16.1/po/ca.po 2013-03-14 18:27:40.000000000 +0000 +++ d-conf-0.18.0/po/ca.po 2013-09-16 18:14:30.000000000 +0000 @@ -8,8 +8,8 @@ "Project-Id-Version: dconf master\n" "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?" "product=dconf&keywords=I18N+L10N&component=general\n" -"POT-Creation-Date: 2013-01-14 11:53+0000\n" -"PO-Revision-Date: 2013-01-18 01:42+0100\n" +"POT-Creation-Date: 2013-08-06 16:14+0000\n" +"PO-Revision-Date: 2013-09-14 00:10+0200\n" "Last-Translator: Gil Forcada \n" "Language-Team: Catalan \n" "Language: ca\n" @@ -19,11 +19,11 @@ "Plural-Forms: nplurals=2; plural=n != 1;\n" #: ../editor/dconf-editor.desktop.in.in.h:1 ../editor/dconf-editor.vala:43 -#: ../editor/dconf-editor.vala:63 ../editor/dconf-editor.vala:394 +#: ../editor/dconf-editor.vala:62 ../editor/dconf-editor.vala:400 msgid "dconf Editor" msgstr "Editor del dconf" -#: ../editor/dconf-editor.desktop.in.in.h:2 ../editor/dconf-editor.vala:397 +#: ../editor/dconf-editor.desktop.in.in.h:2 ../editor/dconf-editor.vala:403 msgid "Directly edit your entire configuration database" msgstr "Editeu directament la base de dades de configuració" @@ -31,32 +31,32 @@ msgid "settings;configuration;" msgstr "paràmetres;configuració;" -#: ../editor/dconf-editor.vala:180 +#: ../editor/dconf-editor.vala:186 #, c-format msgid "Integer [%s..%s]" msgstr "Enter [%s..%s]" -#: ../editor/dconf-editor.vala:182 +#: ../editor/dconf-editor.vala:188 msgid "Boolean" msgstr "Booleà" -#: ../editor/dconf-editor.vala:184 +#: ../editor/dconf-editor.vala:190 msgid "String" msgstr "Text" -#: ../editor/dconf-editor.vala:186 +#: ../editor/dconf-editor.vala:192 msgid "Enumeration" msgstr "Enumeració" -#: ../editor/dconf-editor.vala:234 +#: ../editor/dconf-editor.vala:240 msgid "No schema" msgstr "Cap esquema" -#: ../editor/dconf-editor.vala:344 +#: ../editor/dconf-editor.vala:350 msgid "Not found" msgstr "No s'ha trobat" -#: ../editor/dconf-editor.vala:392 +#: ../editor/dconf-editor.vala:398 msgid "" "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 " @@ -86,11 +86,11 @@ "juntament amb aquest programa; en cas contrari, escriviu a la Free Software " "Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA" -#: ../editor/dconf-editor.vala:398 +#: ../editor/dconf-editor.vala:404 msgid "Copyright © Canonical Ltd" msgstr "Copyright © Canonical Ltd" -#: ../editor/dconf-editor.vala:402 +#: ../editor/dconf-editor.vala:408 msgid "translator-credits" msgstr "Gil Forcada " @@ -139,8 +139,8 @@ msgstr "Següent" #: ../editor/dconf-editor-menu.ui.h:1 -msgid "_Find" -msgstr "_Cerca" +msgid "_Find…" +msgstr "_Cerca…" #: ../editor/dconf-editor-menu.ui.h:2 msgid "_About" diff -Nru d-conf-0.16.1/po/cs.po d-conf-0.18.0/po/cs.po --- d-conf-0.16.1/po/cs.po 2013-07-16 16:20:20.000000000 +0000 +++ d-conf-0.18.0/po/cs.po 2013-07-17 20:01:30.000000000 +0000 @@ -1,6 +1,7 @@ # Czech translation for dconf. # Copyright (C) 2012 dconf's COPYRIGHT HOLDER # This file is distributed under the same license as the dconf package. +# # Marek Černocký , 2012, 2013. # msgid "" @@ -8,8 +9,8 @@ "Project-Id-Version: dconf master\n" "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?" "product=dconf&keywords=I18N+L10N&component=general\n" -"POT-Creation-Date: 2012-11-24 15:52+0000\n" -"PO-Revision-Date: 2013-02-19 10:56+0100\n" +"POT-Creation-Date: 2013-05-09 14:24+0000\n" +"PO-Revision-Date: 2013-05-29 12:28+0200\n" "Last-Translator: Marek Černocký \n" "Language-Team: Czech \n" "Language: cs\n" @@ -139,8 +140,8 @@ msgstr "Následující" #: ../editor/dconf-editor-menu.ui.h:1 -msgid "_Find" -msgstr "_Hledat" +msgid "_Find…" +msgstr "_Hledat…" #: ../editor/dconf-editor-menu.ui.h:2 msgid "_About" @@ -171,6 +172,5 @@ msgstr "Příznak zapnutého režimu maximalizace" #: ../editor/ca.desrt.dconf-editor.gschema.xml.h:6 -#| msgid "A flag to enable maximized mode" msgid "A flag to enable fullscreen mode" msgstr "Příznak zapnutého režimu celé obrazovky" diff -Nru d-conf-0.16.1/po/da.po d-conf-0.18.0/po/da.po --- d-conf-0.16.1/po/da.po 2013-03-25 21:40:52.000000000 +0000 +++ d-conf-0.18.0/po/da.po 2013-09-23 21:27:13.000000000 +0000 @@ -7,8 +7,8 @@ msgstr "" "Project-Id-Version: dconf master\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2013-03-17 14:49+0100\n" -"PO-Revision-Date: 2013-03-16 18:03+0100\n" +"POT-Creation-Date: 2013-09-17 18:38+0200\n" +"PO-Revision-Date: 2013-09-17 00:21+0200\n" "Last-Translator: Kenneth Nielsen \n" "Language-Team: Danish \n" "Language: da\n" @@ -18,11 +18,11 @@ "Plural-Forms: nplurals=2; plural=(n != 1);\n" #: ../editor/dconf-editor.desktop.in.in.h:1 ../editor/dconf-editor.vala:43 -#: ../editor/dconf-editor.vala:63 ../editor/dconf-editor.vala:394 +#: ../editor/dconf-editor.vala:62 ../editor/dconf-editor.vala:400 msgid "dconf Editor" msgstr "dconf-redigering" -#: ../editor/dconf-editor.desktop.in.in.h:2 ../editor/dconf-editor.vala:397 +#: ../editor/dconf-editor.desktop.in.in.h:2 ../editor/dconf-editor.vala:403 msgid "Directly edit your entire configuration database" msgstr "Redigér direkte i hele din konfigurationsdatabase" @@ -30,32 +30,32 @@ msgid "settings;configuration;" msgstr "indstillinger;valgmuligheder;valg;konfiguration;" -#: ../editor/dconf-editor.vala:180 +#: ../editor/dconf-editor.vala:186 #, c-format msgid "Integer [%s..%s]" msgstr "Heltal [%s..%s]" -#: ../editor/dconf-editor.vala:182 +#: ../editor/dconf-editor.vala:188 msgid "Boolean" msgstr "Boolesk" -#: ../editor/dconf-editor.vala:184 +#: ../editor/dconf-editor.vala:190 msgid "String" msgstr "Streng" -#: ../editor/dconf-editor.vala:186 +#: ../editor/dconf-editor.vala:192 msgid "Enumeration" msgstr "Nummerering" -#: ../editor/dconf-editor.vala:234 +#: ../editor/dconf-editor.vala:240 msgid "No schema" msgstr "Intet skema" -#: ../editor/dconf-editor.vala:344 +#: ../editor/dconf-editor.vala:350 msgid "Not found" msgstr "Ikke fundet" -#: ../editor/dconf-editor.vala:392 +#: ../editor/dconf-editor.vala:398 msgid "" "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 " @@ -85,11 +85,11 @@ "program. Hvis ikke, så skriv til Free software Foundation, Inc., 51 Franklin " "Street, Fifth Floor, Boston, MA 02110-1301, USA" -#: ../editor/dconf-editor.vala:398 +#: ../editor/dconf-editor.vala:404 msgid "Copyright © Canonical Ltd" msgstr "Ophavsret © Canonical Ltd" -#: ../editor/dconf-editor.vala:402 +#: ../editor/dconf-editor.vala:408 msgid "translator-credits" msgstr "" "Kenneth Nielsen\n" @@ -142,8 +142,8 @@ msgstr "Næste" #: ../editor/dconf-editor-menu.ui.h:1 -msgid "_Find" -msgstr "_Find" +msgid "_Find…" +msgstr "_Find…" #: ../editor/dconf-editor-menu.ui.h:2 msgid "_About" diff -Nru d-conf-0.16.1/po/de.po d-conf-0.18.0/po/de.po --- d-conf-0.16.1/po/de.po 2013-07-16 16:20:20.000000000 +0000 +++ d-conf-0.18.0/po/de.po 2013-09-16 18:14:30.000000000 +0000 @@ -2,30 +2,30 @@ # Copyright (C) 2012 dconf's COPYRIGHT HOLDER # This file is distributed under the same license as the dconf package. # Mario Blättermann , 2012, 2013. +# Christian Kirbach , 2013. # msgid "" msgstr "" "Project-Id-Version: dconf master\n" "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?" "product=dconf&keywords=I18N+L10N&component=general\n" -"POT-Creation-Date: 2012-11-24 15:52+0000\n" -"PO-Revision-Date: 2013-03-03 21:39+0100\n" -"Last-Translator: Mario Blättermann \n" -"Language-Team: German \n" +"POT-Creation-Date: 2013-09-12 04:02+0000\n" +"PO-Revision-Date: 2013-09-16 18:46+0100\n" +"Last-Translator: Benjamin Steinwender \n" +"Language-Team: Deutsch \n" "Language: de\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-Poedit-Language: German\n" -"X-Poedit-Country: GERMANY\n" +"X-Generator: Poedit 1.5.7\n" #: ../editor/dconf-editor.desktop.in.in.h:1 ../editor/dconf-editor.vala:43 -#: ../editor/dconf-editor.vala:63 ../editor/dconf-editor.vala:394 +#: ../editor/dconf-editor.vala:62 ../editor/dconf-editor.vala:400 msgid "dconf Editor" msgstr "dconf-Editor" -#: ../editor/dconf-editor.desktop.in.in.h:2 ../editor/dconf-editor.vala:397 +#: ../editor/dconf-editor.desktop.in.in.h:2 ../editor/dconf-editor.vala:403 msgid "Directly edit your entire configuration database" msgstr "Direkter Zugriff auf Ihre gesamte Konfigurationsdatenbank" @@ -33,42 +33,42 @@ msgid "settings;configuration;" msgstr "Einstellungen;Konfiguration;" -#: ../editor/dconf-editor.vala:180 +#: ../editor/dconf-editor.vala:186 #, c-format msgid "Integer [%s..%s]" msgstr "Ganzzahl [%s..%s]" -#: ../editor/dconf-editor.vala:182 +#: ../editor/dconf-editor.vala:188 msgid "Boolean" -msgstr "Boolesch" +msgstr "Wahrheitswert" -#: ../editor/dconf-editor.vala:184 +#: ../editor/dconf-editor.vala:190 msgid "String" msgstr "Zeichenkette" -#: ../editor/dconf-editor.vala:186 +#: ../editor/dconf-editor.vala:192 msgid "Enumeration" msgstr "Aufzählung" -#: ../editor/dconf-editor.vala:234 +#: ../editor/dconf-editor.vala:240 msgid "No schema" msgstr "Kein Schema" -#: ../editor/dconf-editor.vala:344 +#: ../editor/dconf-editor.vala:350 msgid "Not found" msgstr "Nicht gefunden" -#: ../editor/dconf-editor.vala:392 +#: ../editor/dconf-editor.vala:398 msgid "" -"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.\n" +"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.\n" "\n" "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.\n" +"ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or " +"FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for " +"more details.\n" "\n" "You should have received a copy of the GNU General Public License along with " "this program; if not, write to the Free Software Foundation, Inc., 51 " @@ -78,7 +78,7 @@ "verändern, solange Sie sich an die Regeln der GNU General Public License " "halten, so wie sie von der Free Software Foundation festgelegt wurden; " "entweder in Version 2 der Lizenz oder (nach Ihrem Ermessen) in jeder " -"folgenden Lizenz.\n" +"folgenden Version.\n" "\n" "Dieses Programm wurde mit dem Ziel veröffentlicht, dass Sie es nützlich " "finden, jedoch OHNE JEDWEDE GARANTIE, sogar ohne eine implizite Garantie der " @@ -91,13 +91,15 @@ "Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA " "02110-1301, USA." -#: ../editor/dconf-editor.vala:398 +#: ../editor/dconf-editor.vala:404 msgid "Copyright © Canonical Ltd" msgstr "Copyright © Canonical Ltd" -#: ../editor/dconf-editor.vala:402 +#: ../editor/dconf-editor.vala:408 msgid "translator-credits" -msgstr "Mario Blättermann " +msgstr "" +"Mario Blättermann \n" +"Christian Kirbach " #: ../editor/dconf-view.vala:264 #, c-format @@ -116,7 +118,7 @@ #: ../editor/dconf-editor.ui.h:1 msgid "Set to Default" -msgstr "Als Vorgabe verwenden" +msgstr "Auf Standardwert setzen" #: ../editor/dconf-editor.ui.h:2 msgid "Schema:" @@ -137,15 +139,16 @@ #: ../editor/dconf-editor.ui.h:7 msgid "Default:" -msgstr "Standard:" +msgstr "Standardwert:" #: ../editor/dconf-editor.ui.h:8 msgid "Next" msgstr "Weiter" #: ../editor/dconf-editor-menu.ui.h:1 -msgid "_Find" -msgstr "_Suchen" +#| msgid "_Find" +msgid "_Find…" +msgstr "_Suchen …" #: ../editor/dconf-editor-menu.ui.h:2 msgid "_About" diff -Nru d-conf-0.16.1/po/eo.po d-conf-0.18.0/po/eo.po --- d-conf-0.16.1/po/eo.po 2013-07-16 16:20:20.000000000 +0000 +++ d-conf-0.18.0/po/eo.po 2013-07-17 20:01:30.000000000 +0000 @@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: dconf\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2012-08-07 10:10-0400\n" +"POT-Creation-Date: 2013-07-12 10:02-0400\n" "PO-Revision-Date: 2012-08-06 13:21-0400\n" "Last-Translator: Ryan Lortie \n" "Language-Team: Ryan Lortie \n" @@ -16,41 +16,45 @@ "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -#: ../editor/dconf-editor.desktop.in.in.h:1 ../editor/dconf-editor.vala:39 -#: ../editor/dconf-editor.vala:59 ../editor/dconf-editor.vala:338 +#: ../editor/dconf-editor.desktop.in.in.h:1 ../editor/dconf-editor.vala:43 +#: ../editor/dconf-editor.vala:62 ../editor/dconf-editor.vala:400 msgid "dconf Editor" msgstr "dconf Redaktilo" -#: ../editor/dconf-editor.desktop.in.in.h:2 ../editor/dconf-editor.vala:341 +#: ../editor/dconf-editor.desktop.in.in.h:2 ../editor/dconf-editor.vala:403 msgid "Directly edit your entire configuration database" msgstr "Rekte redakti vian totan agordan datumbazon" -#: ../editor/dconf-editor.vala:165 +#: ../editor/dconf-editor.desktop.in.in.h:3 +msgid "settings;configuration;" +msgstr "agordoj;" + +#: ../editor/dconf-editor.vala:186 #, c-format msgid "Integer [%s..%s]" msgstr "Entjera [%s..%s]" -#: ../editor/dconf-editor.vala:167 +#: ../editor/dconf-editor.vala:188 msgid "Boolean" msgstr "Bulea" -#: ../editor/dconf-editor.vala:169 +#: ../editor/dconf-editor.vala:190 msgid "String" msgstr "Ĉena" -#: ../editor/dconf-editor.vala:171 +#: ../editor/dconf-editor.vala:192 msgid "Enumeration" msgstr "Listigita" -#: ../editor/dconf-editor.vala:214 +#: ../editor/dconf-editor.vala:240 msgid "No schema" msgstr "Nenion skemon" -#: ../editor/dconf-editor.vala:310 +#: ../editor/dconf-editor.vala:350 msgid "Not found" msgstr "Ne trovita" -#: ../editor/dconf-editor.vala:336 +#: ../editor/dconf-editor.vala:398 msgid "" "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 " @@ -80,11 +84,11 @@ "kun ĉi tiu programo; icevis, turnu vin al Free Software Foundation, Inc., 51 " "Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA" -#: ../editor/dconf-editor.vala:342 +#: ../editor/dconf-editor.vala:404 msgid "Copyright © Canonical Ltd" msgstr "Kopirajto © Canonical Ltd" -#: ../editor/dconf-editor.vala:346 +#: ../editor/dconf-editor.vala:408 msgid "translator-credits" msgstr "Ryan Lortie" @@ -133,8 +137,8 @@ msgstr "Sekvanta" #: ../editor/dconf-editor-menu.ui.h:1 -msgid "_Find" -msgstr "_Trovi" +msgid "_Find…" +msgstr "_Trovi…" #: ../editor/dconf-editor-menu.ui.h:2 msgid "_About" @@ -163,3 +167,7 @@ #: ../editor/ca.desrt.dconf-editor.gschema.xml.h:5 msgid "A flag to enable maximized mode" msgstr "Flago por ŝalti maksimuman reĝimon" + +#: ../editor/ca.desrt.dconf-editor.gschema.xml.h:6 +msgid "A flag to enable fullscreen mode" +msgstr "Flago por ŝalti plenekranan reĝimon" diff -Nru d-conf-0.16.1/po/es.po d-conf-0.18.0/po/es.po --- d-conf-0.16.1/po/es.po 2013-07-16 16:20:20.000000000 +0000 +++ d-conf-0.18.0/po/es.po 2013-07-17 20:01:30.000000000 +0000 @@ -1,22 +1,22 @@ # Spanish translation for dconf. # Copyright (C) 2012 dconf's COPYRIGHT HOLDER # This file is distributed under the same license as the dconf package. -# Daniel Mustieles , 2012. +# Daniel Mustieles , 2012, 2013. # msgid "" msgstr "" "Project-Id-Version: dconf master\n" "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?" "product=dconf&keywords=I18N+L10N&component=general\n" -"POT-Creation-Date: 2012-11-24 15:52+0000\n" -"PO-Revision-Date: 2012-12-05 19:09+0100\n" +"POT-Creation-Date: 2013-05-09 14:24+0000\n" +"PO-Revision-Date: 2013-05-09 17:30+0200\n" "Last-Translator: Daniel Mustieles \n" -"Language-Team: Español; Castellano \n" +"Language-Team: Español \n" "Language: es\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" +"Plural-Forms: nplurals=2; plural=(n!=1);\n" "X-Generator: Gtranslator 2.91.5\n" #: ../editor/dconf-editor.desktop.in.in.h:1 ../editor/dconf-editor.vala:43 @@ -140,8 +140,9 @@ msgstr "Siguiente" #: ../editor/dconf-editor-menu.ui.h:1 -msgid "_Find" -msgstr "_Buscar" +#| msgid "_Find" +msgid "_Find…" +msgstr "_Buscar…" #: ../editor/dconf-editor-menu.ui.h:2 msgid "_About" diff -Nru d-conf-0.16.1/po/et.po d-conf-0.18.0/po/et.po --- d-conf-0.16.1/po/et.po 2013-03-14 18:27:40.000000000 +0000 +++ d-conf-0.18.0/po/et.po 2013-09-16 18:14:30.000000000 +0000 @@ -8,8 +8,8 @@ "Project-Id-Version: dconf master\n" "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?" "product=dconf&keywords=I18N+L10N&component=general\n" -"POT-Creation-Date: 2013-03-11 22:14+0000\n" -"PO-Revision-Date: 2012-12-18 18:45+0300\n" +"POT-Creation-Date: 2013-09-11 20:04+0000\n" +"PO-Revision-Date: 2013-09-11 23:18+0300\n" "Last-Translator: Mattias Põldaru \n" "Language-Team: Estonian \n" "Language: et\n" @@ -17,6 +17,7 @@ "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" msgid "dconf Editor" msgstr "dconf redaktor" @@ -116,8 +117,8 @@ msgid "Next" msgstr "Järgmine" -msgid "_Find" -msgstr "_Otsi" +msgid "_Find…" +msgstr "_Otsi…" msgid "_About" msgstr "_Lähemalt" diff -Nru d-conf-0.16.1/po/eu.po d-conf-0.18.0/po/eu.po --- d-conf-0.16.1/po/eu.po 2013-03-14 18:27:40.000000000 +0000 +++ d-conf-0.18.0/po/eu.po 2013-09-23 21:27:13.000000000 +0000 @@ -1,6 +1,7 @@ # Basque translation for dconf. # Copyright (C) 2013 dconf's COPYRIGHT HOLDER # This file is distributed under the same license as the dconf package. +# # Asier Sarasua Garmendia , 2013. # Iñaki Larrañaga Murgoitio , 2013. # @@ -8,21 +9,23 @@ msgstr "" "Project-Id-Version: dconf master\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2013-02-21 18:27+0100\n" -"PO-Revision-Date: 2013-01-24 21:45+0000\n" -"Last-Translator: Asier Sarasua Garmendia \n" -"Language-Team: Basque \n" +"POT-Creation-Date: 2013-09-22 11:29+0200\n" +"PO-Revision-Date: 2013-09-21 21:57+0200\n" +"Last-Translator: \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" +"Plural-Forms: nplurals=2; plural=n != 1;\n" +"X-Generator: Lokalize 1.4\n" #: ../editor/dconf-editor.desktop.in.in.h:1 ../editor/dconf-editor.vala:43 -#: ../editor/dconf-editor.vala:63 ../editor/dconf-editor.vala:394 +#: ../editor/dconf-editor.vala:62 ../editor/dconf-editor.vala:400 msgid "dconf Editor" msgstr "dconf editorea" -#: ../editor/dconf-editor.desktop.in.in.h:2 ../editor/dconf-editor.vala:397 +#: ../editor/dconf-editor.desktop.in.in.h:2 ../editor/dconf-editor.vala:403 msgid "Directly edit your entire configuration database" msgstr "Editatu zuzenean zure konfigurazioaren datu-base osoa" @@ -30,32 +33,32 @@ msgid "settings;configuration;" msgstr "ezarpenak;konfigurazioa;" -#: ../editor/dconf-editor.vala:180 +#: ../editor/dconf-editor.vala:186 #, c-format msgid "Integer [%s..%s]" msgstr "Osokoa [%s..%s]" -#: ../editor/dconf-editor.vala:182 +#: ../editor/dconf-editor.vala:188 msgid "Boolean" msgstr "Boolearra" -#: ../editor/dconf-editor.vala:184 +#: ../editor/dconf-editor.vala:190 msgid "String" msgstr "Katea" -#: ../editor/dconf-editor.vala:186 +#: ../editor/dconf-editor.vala:192 msgid "Enumeration" msgstr "Zerrendatzea" -#: ../editor/dconf-editor.vala:234 +#: ../editor/dconf-editor.vala:240 msgid "No schema" msgstr "Eskemarik ez" -#: ../editor/dconf-editor.vala:344 +#: ../editor/dconf-editor.vala:350 msgid "Not found" msgstr "Ez da aurkitu" -#: ../editor/dconf-editor.vala:392 +#: ../editor/dconf-editor.vala:398 msgid "" "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 " @@ -84,11 +87,11 @@ "zenuen; hala ez bada, idatzi hona: Free Software Foundation, Inc., 51 " "Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA." -#: ../editor/dconf-editor.vala:398 +#: ../editor/dconf-editor.vala:404 msgid "Copyright © Canonical Ltd" msgstr "Copyright © Canonical Ltd" -#: ../editor/dconf-editor.vala:402 +#: ../editor/dconf-editor.vala:408 msgid "translator-credits" msgstr "" "Asier Sarasua Garmendia \n" @@ -139,8 +142,8 @@ msgstr "Hurrengoa" #: ../editor/dconf-editor-menu.ui.h:1 -msgid "_Find" -msgstr "_Bilatu" +msgid "_Find…" +msgstr "_Bilatu…" #: ../editor/dconf-editor-menu.ui.h:2 msgid "_About" @@ -173,4 +176,3 @@ #: ../editor/ca.desrt.dconf-editor.gschema.xml.h:6 msgid "A flag to enable fullscreen mode" msgstr "Pantaila osoko modua gaitzeko bandera" - diff -Nru d-conf-0.16.1/po/fi.po d-conf-0.18.0/po/fi.po --- d-conf-0.16.1/po/fi.po 2013-03-14 18:27:40.000000000 +0000 +++ d-conf-0.18.0/po/fi.po 2013-09-10 14:09:41.000000000 +0000 @@ -1,29 +1,29 @@ # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER # This file is distributed under the same license as the PACKAGE package. +# Jiri Grönroos , 2012, 2013. # -# Jiri Grönroos , 2012, 2013. msgid "" msgstr "" "Project-Id-Version: \n" "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?" "product=dconf&keywords=I18N+L10N&component=general\n" -"POT-Creation-Date: 2012-11-24 15:52+0000\n" -"PO-Revision-Date: 2013-03-05 21:09+0200\n" +"POT-Creation-Date: 2013-08-06 16:14+0000\n" +"PO-Revision-Date: 2013-09-05 22:50+0300\n" "Last-Translator: Jiri Grönroos \n" -"Language-Team: Finnish \n" +"Language-Team: suomi \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: Lokalize 1.5\n" +"X-Generator: Gtranslator 2.91.6\n" #: ../editor/dconf-editor.desktop.in.in.h:1 ../editor/dconf-editor.vala:43 -#: ../editor/dconf-editor.vala:63 ../editor/dconf-editor.vala:394 +#: ../editor/dconf-editor.vala:62 ../editor/dconf-editor.vala:400 msgid "dconf Editor" msgstr "dconf-muokkain" -#: ../editor/dconf-editor.desktop.in.in.h:2 ../editor/dconf-editor.vala:397 +#: ../editor/dconf-editor.desktop.in.in.h:2 ../editor/dconf-editor.vala:403 msgid "Directly edit your entire configuration database" msgstr "Muokkaa suoraan koko asetustietokantaasi" @@ -31,32 +31,32 @@ msgid "settings;configuration;" msgstr "settings;configuration;asetukset;määritykset;" -#: ../editor/dconf-editor.vala:180 +#: ../editor/dconf-editor.vala:186 #, c-format msgid "Integer [%s..%s]" msgstr "Kokonaisluku [%s..%s]" -#: ../editor/dconf-editor.vala:182 +#: ../editor/dconf-editor.vala:188 msgid "Boolean" msgstr "Totuusarvo" -#: ../editor/dconf-editor.vala:184 +#: ../editor/dconf-editor.vala:190 msgid "String" msgstr "Merkkijono" -#: ../editor/dconf-editor.vala:186 +#: ../editor/dconf-editor.vala:192 msgid "Enumeration" -msgstr "" +msgstr "Enumeraatio" -#: ../editor/dconf-editor.vala:234 +#: ../editor/dconf-editor.vala:240 msgid "No schema" msgstr "Ei skeemaa" -#: ../editor/dconf-editor.vala:344 +#: ../editor/dconf-editor.vala:350 msgid "Not found" msgstr "Ei löytynyt" -#: ../editor/dconf-editor.vala:392 +#: ../editor/dconf-editor.vala:398 msgid "" "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 " @@ -73,11 +73,11 @@ "Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA" msgstr "" -#: ../editor/dconf-editor.vala:398 +#: ../editor/dconf-editor.vala:404 msgid "Copyright © Canonical Ltd" msgstr "Tekijänoikeus © Canonical Ltd" -#: ../editor/dconf-editor.vala:402 +#: ../editor/dconf-editor.vala:408 msgid "translator-credits" msgstr "Jiri Grönroos" @@ -126,8 +126,9 @@ msgstr "Seuraava" #: ../editor/dconf-editor-menu.ui.h:1 -msgid "_Find" -msgstr "_Etsi" +#| msgid "_Find" +msgid "_Find…" +msgstr "_Etsi…" #: ../editor/dconf-editor-menu.ui.h:2 msgid "_About" @@ -160,4 +161,3 @@ #: ../editor/ca.desrt.dconf-editor.gschema.xml.h:6 msgid "A flag to enable fullscreen mode" msgstr "" - diff -Nru d-conf-0.16.1/po/fr.po d-conf-0.18.0/po/fr.po --- d-conf-0.16.1/po/fr.po 2013-03-14 18:27:40.000000000 +0000 +++ d-conf-0.18.0/po/fr.po 2013-09-10 14:09:41.000000000 +0000 @@ -8,8 +8,8 @@ "Project-Id-Version: dconf master\n" "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?" "product=dconf&keywords=I18N+L10N&component=general\n" -"POT-Creation-Date: 2013-02-21 18:13+0000\n" -"PO-Revision-Date: 2013-02-25 20:15+0100\n" +"POT-Creation-Date: 2013-08-06 16:14+0000\n" +"PO-Revision-Date: 2013-08-22 12:09+0200\n" "Last-Translator: Frederic Peters \n" "Language-Team: GNOME French Team \n" "Language: \n" @@ -18,11 +18,11 @@ "Content-Transfer-Encoding: 8bit\n" #: ../editor/dconf-editor.desktop.in.in.h:1 ../editor/dconf-editor.vala:43 -#: ../editor/dconf-editor.vala:63 ../editor/dconf-editor.vala:394 +#: ../editor/dconf-editor.vala:62 ../editor/dconf-editor.vala:400 msgid "dconf Editor" msgstr "Éditeur dconf" -#: ../editor/dconf-editor.desktop.in.in.h:2 ../editor/dconf-editor.vala:397 +#: ../editor/dconf-editor.desktop.in.in.h:2 ../editor/dconf-editor.vala:403 msgid "Directly edit your entire configuration database" msgstr "Modifier directement toute votre base de données de configuration" @@ -30,32 +30,32 @@ msgid "settings;configuration;" msgstr "paramètres;configuration;" -#: ../editor/dconf-editor.vala:180 +#: ../editor/dconf-editor.vala:186 #, c-format msgid "Integer [%s..%s]" msgstr "Entier [%s..%s]" -#: ../editor/dconf-editor.vala:182 +#: ../editor/dconf-editor.vala:188 msgid "Boolean" msgstr "Booléen" -#: ../editor/dconf-editor.vala:184 +#: ../editor/dconf-editor.vala:190 msgid "String" msgstr "Chaîne" -#: ../editor/dconf-editor.vala:186 +#: ../editor/dconf-editor.vala:192 msgid "Enumeration" msgstr "Énumération" -#: ../editor/dconf-editor.vala:234 +#: ../editor/dconf-editor.vala:240 msgid "No schema" msgstr "Aucun schéma" -#: ../editor/dconf-editor.vala:344 +#: ../editor/dconf-editor.vala:350 msgid "Not found" msgstr "Non trouvé" -#: ../editor/dconf-editor.vala:392 +#: ../editor/dconf-editor.vala:398 msgid "" "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 " @@ -86,11 +86,11 @@ "Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, " "États-Unis." -#: ../editor/dconf-editor.vala:398 +#: ../editor/dconf-editor.vala:404 msgid "Copyright © Canonical Ltd" msgstr "Copyright © Canonical Ltd" -#: ../editor/dconf-editor.vala:402 +#: ../editor/dconf-editor.vala:408 msgid "translator-credits" msgstr "Frédéric Péters " @@ -139,8 +139,8 @@ msgstr "Suivant" #: ../editor/dconf-editor-menu.ui.h:1 -msgid "_Find" -msgstr "_Rechercher" +msgid "_Find…" +msgstr "_Rechercher…" #: ../editor/dconf-editor-menu.ui.h:2 msgid "_About" diff -Nru d-conf-0.16.1/po/fur.po d-conf-0.18.0/po/fur.po --- d-conf-0.16.1/po/fur.po 1970-01-01 00:00:00.000000000 +0000 +++ d-conf-0.18.0/po/fur.po 2013-03-14 18:27:40.000000000 +0000 @@ -0,0 +1,166 @@ +# Friulian translation for dconf. +# Copyright (C) 2012 dconf's COPYRIGHT HOLDER +# This file is distributed under the same license as the dconf package. +# TmTFx , 2012. +# +msgid "" +msgstr "" +"Project-Id-Version: dconf dconf-0.14\n" +"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?" +"product=dconf&keywords=I18N+L10N&component=general\n" +"POT-Creation-Date: 2012-12-12 23:22+0000\n" +"PO-Revision-Date: 2012-12-28 01:27+0100\n" +"Last-Translator: TmTFx \n" +"Language-Team: Friulian \n" +"Language: fur\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" + +#: ../editor/dconf-editor.desktop.in.in.h:1 ../editor/dconf-editor.vala:39 +#: ../editor/dconf-editor.vala:59 ../editor/dconf-editor.vala:338 +msgid "dconf Editor" +msgstr "Editôr di dconf" + +#: ../editor/dconf-editor.desktop.in.in.h:2 ../editor/dconf-editor.vala:341 +msgid "Directly edit your entire configuration database" +msgstr "Modifiche diretementri l'intîr database de configurazion" + +#: ../editor/dconf-editor.vala:165 +#, c-format +msgid "Integer [%s..%s]" +msgstr "Intîr [%s..%s]" + +#: ../editor/dconf-editor.vala:167 +msgid "Boolean" +msgstr "Bulean" + +#: ../editor/dconf-editor.vala:169 +msgid "String" +msgstr "Stringhe" + +#: ../editor/dconf-editor.vala:171 +msgid "Enumeration" +msgstr "Enumerazion" + +#: ../editor/dconf-editor.vala:214 +msgid "No schema" +msgstr "No scheme" + +#: ../editor/dconf-editor.vala:310 +msgid "Not found" +msgstr "No cjatât" + +#: ../editor/dconf-editor.vala:336 +msgid "" +"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.\n" +"\n" +"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.\n" +"\n" +"You should have received a copy of the GNU General Public License along with " +"this program; if not, write to the Free Software Foundation, Inc., 51 " +"Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA" +msgstr "" +"Chest program al è software libar; tu puedis redistribuilu e/o modificalu " +"secont i termins de GNU General Public License come ch'a jè publicade dae " +"Free Software Foundation; o le version 2 de licenze o (a lôr scielte) une " +"version seguitive.\n" +"\n" +"Chest program al è distribuît te sperance di sedi util, ma CENCE NISSUNE " +"GARANZÌE; cence neacje la garanzìe implicite di NEGOZIABILITÂT o di " +"APLICABILITÂT PAR UN PARTICOLÂR FIN. Consultâ la GNU General Public License " +"par vê plui informazions.\n" +"\n" +"Chest program al a di sedi distribuît insiemit a une còpie de GNU General " +"Public License; in câs contrari, a si puès vê une scrivint ae Free Software " +"Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA" + +#: ../editor/dconf-editor.vala:342 +msgid "Copyright © Canonical Ltd" +msgstr "" + +#: ../editor/dconf-editor.vala:346 +msgid "translator-credits" +msgstr "" + +#: ../editor/dconf-view.vala:264 +#, c-format +msgid "Error setting value: %s" +msgstr "Erôr tal impostâ il valôr: %s" + +#. Translators: this is the column header label in the main view +#: ../editor/dconf-view.vala:318 +msgid "Name" +msgstr "Non" + +#. Translators: this is the column header label in the main view +#: ../editor/dconf-view.vala:322 +msgid "Value" +msgstr "Valôr" + +#: ../editor/dconf-editor.ui.h:1 +msgid "Set to Default" +msgstr "Imposte ai valôrs di Default" + +#: ../editor/dconf-editor.ui.h:2 +msgid "Schema:" +msgstr "Scheme:" + +#: ../editor/dconf-editor.ui.h:3 +msgid "Summary:" +msgstr "Sumari:" + +#: ../editor/dconf-editor.ui.h:4 +msgid "Description:" +msgstr "Descrizion:" + +#. Translators: as in datatype (integer, boolean, string, etc) +#: ../editor/dconf-editor.ui.h:6 +msgid "Type:" +msgstr "Tipo:" + +#: ../editor/dconf-editor.ui.h:7 +msgid "Default:" +msgstr "Default:" + +#: ../editor/dconf-editor.ui.h:8 +msgid "Next" +msgstr "Prossim" + +#: ../editor/dconf-editor-menu.ui.h:1 +msgid "_Find" +msgstr "_Cjate" + +#: ../editor/dconf-editor-menu.ui.h:2 +msgid "_About" +msgstr "_Par chest cont" + +#: ../editor/dconf-editor-menu.ui.h:3 +msgid "_Quit" +msgstr "_Jessi" + +#: ../editor/ca.desrt.dconf-editor.gschema.xml.h:1 +msgid "The width of the window" +msgstr "La largjece dal barcon" + +#: ../editor/ca.desrt.dconf-editor.gschema.xml.h:2 +msgid "The width of the main window in pixels." +msgstr "La largjece dal barcon principâl in pixel." + +#: ../editor/ca.desrt.dconf-editor.gschema.xml.h:3 +msgid "The height of the window" +msgstr "L'altece dal barcon" + +#: ../editor/ca.desrt.dconf-editor.gschema.xml.h:4 +msgid "The height of the main window in pixels." +msgstr "L'altece dal barcon principâl in pixel." + +#: ../editor/ca.desrt.dconf-editor.gschema.xml.h:5 +msgid "A flag to enable maximized mode" +msgstr "Un flag par abilitâ la modalitât massimizade" diff -Nru d-conf-0.16.1/po/gl.po d-conf-0.18.0/po/gl.po --- d-conf-0.16.1/po/gl.po 2013-07-16 16:20:20.000000000 +0000 +++ d-conf-0.18.0/po/gl.po 2013-07-17 20:01:30.000000000 +0000 @@ -4,13 +4,13 @@ # Proxecto Trasno - Adaptación do software libre á lingua galega: Se desexas # colaborar connosco, podes atopar máis información en http://www.trasno.net # Leandro Regueiro , 2012. -# Fran Dieguez , 2012. +# Fran Dieguez , 2012, 2013. msgid "" msgstr "" "Project-Id-Version: dconf master\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2012-12-11 02:01+0100\n" -"PO-Revision-Date: 2012-12-11 02:01+0200\n" +"POT-Creation-Date: 2013-06-01 23:19+0200\n" +"PO-Revision-Date: 2013-06-01 23:19+0200\n" "Last-Translator: Fran Dieguez \n" "Language-Team: gnome-l10n-gl@gnome.org\n" "Language: gl\n" @@ -22,11 +22,11 @@ "X-Project-Style: gnome\n" #: ../editor/dconf-editor.desktop.in.in.h:1 ../editor/dconf-editor.vala:43 -#: ../editor/dconf-editor.vala:63 ../editor/dconf-editor.vala:394 +#: ../editor/dconf-editor.vala:62 ../editor/dconf-editor.vala:400 msgid "dconf Editor" msgstr "Editor dconf" -#: ../editor/dconf-editor.desktop.in.in.h:2 ../editor/dconf-editor.vala:397 +#: ../editor/dconf-editor.desktop.in.in.h:2 ../editor/dconf-editor.vala:403 msgid "Directly edit your entire configuration database" msgstr "Edite directamente toda a súa base de datos de configuración" @@ -34,32 +34,32 @@ msgid "settings;configuration;" msgstr "preferencias;configuración;" -#: ../editor/dconf-editor.vala:180 +#: ../editor/dconf-editor.vala:186 #, c-format msgid "Integer [%s..%s]" msgstr "Enteiro [%s..%s]" -#: ../editor/dconf-editor.vala:182 +#: ../editor/dconf-editor.vala:188 msgid "Boolean" msgstr "Booleano" -#: ../editor/dconf-editor.vala:184 +#: ../editor/dconf-editor.vala:190 msgid "String" msgstr "Cadea" -#: ../editor/dconf-editor.vala:186 +#: ../editor/dconf-editor.vala:192 msgid "Enumeration" msgstr "Enumeración" -#: ../editor/dconf-editor.vala:234 +#: ../editor/dconf-editor.vala:240 msgid "No schema" msgstr "Sen esquema" -#: ../editor/dconf-editor.vala:344 +#: ../editor/dconf-editor.vala:350 msgid "Not found" msgstr "Non atopado" -#: ../editor/dconf-editor.vala:392 +#: ../editor/dconf-editor.vala:398 msgid "" "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 " @@ -93,11 +93,11 @@ "enderezo seguinte: 51 Franklin Street, Fifth Floor, Boston, MA\n" "02110-1301 USA." -#: ../editor/dconf-editor.vala:398 +#: ../editor/dconf-editor.vala:404 msgid "Copyright © Canonical Ltd" msgstr "Copyright © Canonical Ltd" -#: ../editor/dconf-editor.vala:402 +#: ../editor/dconf-editor.vala:408 msgid "translator-credits" msgstr "" "Leandro Regueiro , 2012.\n" @@ -150,8 +150,8 @@ msgstr "Seguinte" #: ../editor/dconf-editor-menu.ui.h:1 -msgid "_Find" -msgstr "_Buscar" +msgid "_Find…" +msgstr "_Buscar…" #: ../editor/dconf-editor-menu.ui.h:2 msgid "_About" diff -Nru d-conf-0.16.1/po/he.po d-conf-0.18.0/po/he.po --- d-conf-0.16.1/po/he.po 2013-07-16 16:20:20.000000000 +0000 +++ d-conf-0.18.0/po/he.po 2013-07-17 20:01:30.000000000 +0000 @@ -7,8 +7,8 @@ msgstr "" "Project-Id-Version: dconf Editor\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2012-12-27 01:01+0200\n" -"PO-Revision-Date: 2012-12-27 01:01+0200\n" +"POT-Creation-Date: 2013-05-25 11:28+0300\n" +"PO-Revision-Date: 2013-05-25 11:28+0200\n" "Last-Translator: Yaron Shahrabani \n" "Language-Team: Hebrew \n" "Language: he\n" @@ -22,13 +22,13 @@ #: ../editor/dconf-editor.desktop.in.in.h:1 #: ../editor/dconf-editor.vala:43 -#: ../editor/dconf-editor.vala:63 -#: ../editor/dconf-editor.vala:394 +#: ../editor/dconf-editor.vala:62 +#: ../editor/dconf-editor.vala:400 msgid "dconf Editor" msgstr "עורך dconf" #: ../editor/dconf-editor.desktop.in.in.h:2 -#: ../editor/dconf-editor.vala:397 +#: ../editor/dconf-editor.vala:403 msgid "Directly edit your entire configuration database" msgstr "עריכה ישירה של כל מסד נתוני התצורה שלך" @@ -36,32 +36,32 @@ msgid "settings;configuration;" msgstr "הגדרות;תצורה;קונפיגורציה;" -#: ../editor/dconf-editor.vala:180 +#: ../editor/dconf-editor.vala:186 #, c-format msgid "Integer [%s..%s]" msgstr "מספר חיובי שלם [%s..%s]" -#: ../editor/dconf-editor.vala:182 +#: ../editor/dconf-editor.vala:188 msgid "Boolean" msgstr "בוליאני" -#: ../editor/dconf-editor.vala:184 +#: ../editor/dconf-editor.vala:190 msgid "String" msgstr "מחרוזת" -#: ../editor/dconf-editor.vala:186 +#: ../editor/dconf-editor.vala:192 msgid "Enumeration" msgstr "מנייה" -#: ../editor/dconf-editor.vala:234 +#: ../editor/dconf-editor.vala:240 msgid "No schema" msgstr "אין ערכה" -#: ../editor/dconf-editor.vala:344 +#: ../editor/dconf-editor.vala:350 msgid "Not found" msgstr "לא נמצא" -#: ../editor/dconf-editor.vala:392 +#: ../editor/dconf-editor.vala:398 msgid "" "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.\n" "\n" @@ -75,11 +75,11 @@ "\n" "לתכנית זו אמור היה להיות מצורף עותק של הרישיון הציבורי הכללי של GNU; אם לא כך הדבר, נא לכתוב ל־Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA" -#: ../editor/dconf-editor.vala:398 +#: ../editor/dconf-editor.vala:404 msgid "Copyright © Canonical Ltd" msgstr "כל הזכויות שמורות © Canonical בע״מ" -#: ../editor/dconf-editor.vala:402 +#: ../editor/dconf-editor.vala:408 msgid "translator-credits" msgstr "ירון שהרבני " @@ -128,8 +128,8 @@ msgstr "הבא" #: ../editor/dconf-editor-menu.ui.h:1 -msgid "_Find" -msgstr "_חיפוש" +msgid "_Find…" +msgstr "_חיפוש…" #: ../editor/dconf-editor-menu.ui.h:2 msgid "_About" diff -Nru d-conf-0.16.1/po/hu.po d-conf-0.18.0/po/hu.po --- d-conf-0.16.1/po/hu.po 2013-03-14 18:27:40.000000000 +0000 +++ d-conf-0.18.0/po/hu.po 2013-09-10 14:09:41.000000000 +0000 @@ -3,14 +3,14 @@ # This file is distributed under the same license as the dconf package. # # Gabor Kelemen , 2012. -# Balázs Úr , 2012. +# Balázs Úr , 2012, 2013. msgid "" msgstr "" "Project-Id-Version: dconf master\n" "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?" "product=dconf&keywords=I18N+L10N&component=general\n" -"POT-Creation-Date: 2012-11-24 15:52+0000\n" -"PO-Revision-Date: 2012-12-31 18:29+0100\n" +"POT-Creation-Date: 2013-08-06 16:14+0000\n" +"PO-Revision-Date: 2013-08-21 18:35+0200\n" "Last-Translator: Balázs Úr \n" "Language-Team: Hungarian \n" "Language: hu\n" @@ -21,11 +21,11 @@ "Plural-Forms: nplurals=2; plural=(n != 1);\n" #: ../editor/dconf-editor.desktop.in.in.h:1 ../editor/dconf-editor.vala:43 -#: ../editor/dconf-editor.vala:63 ../editor/dconf-editor.vala:394 +#: ../editor/dconf-editor.vala:62 ../editor/dconf-editor.vala:400 msgid "dconf Editor" msgstr "dconf szerkesztő" -#: ../editor/dconf-editor.desktop.in.in.h:2 ../editor/dconf-editor.vala:397 +#: ../editor/dconf-editor.desktop.in.in.h:2 ../editor/dconf-editor.vala:403 msgid "Directly edit your entire configuration database" msgstr "A konfigurációs adatbázis közvetlen szerkesztése" @@ -33,32 +33,32 @@ msgid "settings;configuration;" msgstr "beállítások;konfiguráció;" -#: ../editor/dconf-editor.vala:180 +#: ../editor/dconf-editor.vala:186 #, c-format msgid "Integer [%s..%s]" msgstr "Egész [%s..%s]" -#: ../editor/dconf-editor.vala:182 +#: ../editor/dconf-editor.vala:188 msgid "Boolean" msgstr "Logikai" -#: ../editor/dconf-editor.vala:184 +#: ../editor/dconf-editor.vala:190 msgid "String" msgstr "Karakterlánc" -#: ../editor/dconf-editor.vala:186 +#: ../editor/dconf-editor.vala:192 msgid "Enumeration" msgstr "Felsorolás" -#: ../editor/dconf-editor.vala:234 +#: ../editor/dconf-editor.vala:240 msgid "No schema" msgstr "Nincs séma" -#: ../editor/dconf-editor.vala:344 +#: ../editor/dconf-editor.vala:350 msgid "Not found" msgstr "Nem található" -#: ../editor/dconf-editor.vala:392 +#: ../editor/dconf-editor.vala:398 msgid "" "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 " @@ -87,11 +87,11 @@ "meg, írjon a Free Software Foundation Inc.-nek. Levélcímük: 51 Franklin " "Street, Fifth Floor, Boston, MA 02110-1301, USA" -#: ../editor/dconf-editor.vala:398 +#: ../editor/dconf-editor.vala:404 msgid "Copyright © Canonical Ltd" msgstr "Copyright © Canonical Ltd" -#: ../editor/dconf-editor.vala:402 +#: ../editor/dconf-editor.vala:408 msgid "translator-credits" msgstr "Kelemen Gábor " @@ -140,8 +140,9 @@ msgstr "Következő" #: ../editor/dconf-editor-menu.ui.h:1 -msgid "_Find" -msgstr "_Keresés" +#| msgid "_Find" +msgid "_Find…" +msgstr "_Keresés…" #: ../editor/dconf-editor-menu.ui.h:2 msgid "_About" @@ -172,7 +173,6 @@ msgstr "A teljes méretű mód engedélyezése" #: ../editor/ca.desrt.dconf-editor.gschema.xml.h:6 -#| msgid "A flag to enable maximized mode" msgid "A flag to enable fullscreen mode" msgstr "Teljes képernyős mód engedélyezése" diff -Nru d-conf-0.16.1/po/id.po d-conf-0.18.0/po/id.po --- d-conf-0.16.1/po/id.po 2013-07-16 16:20:20.000000000 +0000 +++ d-conf-0.18.0/po/id.po 2013-09-16 18:14:30.000000000 +0000 @@ -6,11 +6,11 @@ # Andika Triwidada , 2012, 2013. msgid "" msgstr "" -"Project-Id-Version: dconf dconf-0.16\n" +"Project-Id-Version: dconf master\n" "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?" "product=dconf&keywords=I18N+L10N&component=general\n" -"POT-Creation-Date: 2013-05-09 17:16+0000\n" -"PO-Revision-Date: 2013-07-02 19:49+0700\n" +"POT-Creation-Date: 2013-08-06 16:14+0000\n" +"PO-Revision-Date: 2013-09-12 10:34+0700\n" "Last-Translator: Andika Triwidada \n" "Language-Team: Indonesian \n" "Language: id\n" @@ -18,14 +18,14 @@ "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.5\n" +"X-Generator: Poedit 1.5.7\n" #: ../editor/dconf-editor.desktop.in.in.h:1 ../editor/dconf-editor.vala:43 -#: ../editor/dconf-editor.vala:63 ../editor/dconf-editor.vala:394 +#: ../editor/dconf-editor.vala:62 ../editor/dconf-editor.vala:400 msgid "dconf Editor" msgstr "Penyunting dconf" -#: ../editor/dconf-editor.desktop.in.in.h:2 ../editor/dconf-editor.vala:397 +#: ../editor/dconf-editor.desktop.in.in.h:2 ../editor/dconf-editor.vala:403 msgid "Directly edit your entire configuration database" msgstr "Menyunting langsung seluruh basis data konfigurasi Anda" @@ -33,32 +33,32 @@ msgid "settings;configuration;" msgstr "pengaturan;konfigurasi;" -#: ../editor/dconf-editor.vala:180 +#: ../editor/dconf-editor.vala:186 #, c-format msgid "Integer [%s..%s]" msgstr "Integer [%s..%s]" -#: ../editor/dconf-editor.vala:182 +#: ../editor/dconf-editor.vala:188 msgid "Boolean" msgstr "Boolean" -#: ../editor/dconf-editor.vala:184 +#: ../editor/dconf-editor.vala:190 msgid "String" msgstr "String" -#: ../editor/dconf-editor.vala:186 +#: ../editor/dconf-editor.vala:192 msgid "Enumeration" msgstr "Enumerasi" -#: ../editor/dconf-editor.vala:234 +#: ../editor/dconf-editor.vala:240 msgid "No schema" msgstr "Tidak ada skema" -#: ../editor/dconf-editor.vala:344 +#: ../editor/dconf-editor.vala:350 msgid "Not found" msgstr "Tak ditemukan" -#: ../editor/dconf-editor.vala:392 +#: ../editor/dconf-editor.vala:398 msgid "" "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 " @@ -87,11 +87,11 @@ "dengan program ini; jika tidak, kirimkan surat Anda ke Free Software " "Foundation, Inc, 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA" -#: ../editor/dconf-editor.vala:398 +#: ../editor/dconf-editor.vala:404 msgid "Copyright © Canonical Ltd" msgstr "Hak Cipta © Canonical Ltd" -#: ../editor/dconf-editor.vala:402 +#: ../editor/dconf-editor.vala:408 msgid "translator-credits" msgstr "" "Dirgita , 2012.\n" @@ -142,8 +142,8 @@ msgstr "Selanjutnya" #: ../editor/dconf-editor-menu.ui.h:1 -msgid "_Find" -msgstr "_Cari" +msgid "_Find…" +msgstr "_Cari…" #: ../editor/dconf-editor-menu.ui.h:2 msgid "_About" diff -Nru d-conf-0.16.1/po/it.po d-conf-0.18.0/po/it.po --- d-conf-0.16.1/po/it.po 2013-03-14 18:27:40.000000000 +0000 +++ d-conf-0.18.0/po/it.po 2013-07-17 20:01:34.000000000 +0000 @@ -10,8 +10,8 @@ msgstr "" "Project-Id-Version: dconf\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2013-01-24 22:43+0100\n" -"PO-Revision-Date: 2013-01-24 22:44+0100\n" +"POT-Creation-Date: 2013-07-15 10:19+0200\n" +"PO-Revision-Date: 2013-07-15 10:19+0200\n" "Last-Translator: Milo Casagrande \n" "Language-Team: Italian \n" "Language: \n" @@ -19,13 +19,14 @@ "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8-bit\n" "Plural-Forms: nplurals=2; plural=(n!=1);\n" +"X-Generator: Gtranslator 2.91.6\n" #: ../editor/dconf-editor.desktop.in.in.h:1 ../editor/dconf-editor.vala:43 -#: ../editor/dconf-editor.vala:63 ../editor/dconf-editor.vala:394 +#: ../editor/dconf-editor.vala:62 ../editor/dconf-editor.vala:400 msgid "dconf Editor" msgstr "dconf Editor" -#: ../editor/dconf-editor.desktop.in.in.h:2 ../editor/dconf-editor.vala:397 +#: ../editor/dconf-editor.desktop.in.in.h:2 ../editor/dconf-editor.vala:403 msgid "Directly edit your entire configuration database" msgstr "Modifica direttamente l'intero database di configurazione" @@ -33,32 +34,32 @@ msgid "settings;configuration;" msgstr "impostazione;impostazioni;configurazione;" -#: ../editor/dconf-editor.vala:180 +#: ../editor/dconf-editor.vala:186 #, c-format msgid "Integer [%s..%s]" msgstr "Intero [%s...%s]" -#: ../editor/dconf-editor.vala:182 +#: ../editor/dconf-editor.vala:188 msgid "Boolean" msgstr "Booleano" -#: ../editor/dconf-editor.vala:184 +#: ../editor/dconf-editor.vala:190 msgid "String" msgstr "Stringa" -#: ../editor/dconf-editor.vala:186 +#: ../editor/dconf-editor.vala:192 msgid "Enumeration" msgstr "Enumerazione" -#: ../editor/dconf-editor.vala:234 +#: ../editor/dconf-editor.vala:240 msgid "No schema" msgstr "Nessuno schema" -#: ../editor/dconf-editor.vala:344 +#: ../editor/dconf-editor.vala:350 msgid "Not found" msgstr "Non trovato" -#: ../editor/dconf-editor.vala:392 +#: ../editor/dconf-editor.vala:398 msgid "" "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 " @@ -89,11 +90,11 @@ "alla Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, " "Boston, MA 02110-1301 USA" -#: ../editor/dconf-editor.vala:398 +#: ../editor/dconf-editor.vala:404 msgid "Copyright © Canonical Ltd" msgstr "Copyright © Canonical Ltd" -#: ../editor/dconf-editor.vala:402 +#: ../editor/dconf-editor.vala:408 msgid "translator-credits" msgstr "" "Milo Casagrande \n" @@ -145,8 +146,8 @@ msgstr "Successivo" #: ../editor/dconf-editor-menu.ui.h:1 -msgid "_Find" -msgstr "Tr_ova" +msgid "_Find…" +msgstr "Tr_ova..." #: ../editor/dconf-editor-menu.ui.h:2 msgid "_About" diff -Nru d-conf-0.16.1/po/ja.po d-conf-0.18.0/po/ja.po --- d-conf-0.16.1/po/ja.po 2013-03-14 18:27:40.000000000 +0000 +++ d-conf-0.18.0/po/ja.po 2013-09-23 21:27:13.000000000 +0000 @@ -2,89 +2,82 @@ # Copyright (C) 2012 dconf's COPYRIGHT HOLDER # This file is distributed under the same license as the dconf package. # Takeshi AIHANA , 2012. +# Jiro Matsuzawa , 2013. # msgid "" msgstr "" "Project-Id-Version: dconf master\n" -"Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2012-08-31 15:56+0900\n" -"PO-Revision-Date: 2012-08-31 15:55+0900\n" -"Last-Translator: Takeshi AIHANA \n" +"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=dconf&keywords=I18N+L10N&component=general\n" +"POT-Creation-Date: 2013-09-18 13:35+0000\n" +"PO-Revision-Date: 2013-09-20 12:14+0900\n" +"Last-Translator: Jiro Matsuzawa \n" "Language-Team: Japanese \n" "Language: ja\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -#: ../editor/dconf-editor.desktop.in.in.h:1 ../editor/dconf-editor.vala:39 -#: ../editor/dconf-editor.vala:59 ../editor/dconf-editor.vala:338 +#: ../editor/dconf-editor.desktop.in.in.h:1 ../editor/dconf-editor.vala:43 +#: ../editor/dconf-editor.vala:62 ../editor/dconf-editor.vala:400 msgid "dconf Editor" -msgstr "dconf エディタ" +msgstr "dconf エディター" -#: ../editor/dconf-editor.desktop.in.in.h:2 ../editor/dconf-editor.vala:341 +#: ../editor/dconf-editor.desktop.in.in.h:2 ../editor/dconf-editor.vala:403 msgid "Directly edit your entire configuration database" msgstr "設定データベースを直接編集します" -#: ../editor/dconf-editor.vala:165 +#: ../editor/dconf-editor.desktop.in.in.h:3 +msgid "settings;configuration;" +msgstr "settings;configuration;設定;gsettings;" + +#: ../editor/dconf-editor.vala:186 #, c-format msgid "Integer [%s..%s]" msgstr "整数値 [%s..%s]" -#: ../editor/dconf-editor.vala:167 +#: ../editor/dconf-editor.vala:188 msgid "Boolean" msgstr "論理値" -#: ../editor/dconf-editor.vala:169 +#: ../editor/dconf-editor.vala:190 msgid "String" msgstr "文字列" -#: ../editor/dconf-editor.vala:171 +#: ../editor/dconf-editor.vala:192 msgid "Enumeration" msgstr "列挙値" -#: ../editor/dconf-editor.vala:214 +#: ../editor/dconf-editor.vala:240 msgid "No schema" msgstr "スキーマなし" -#: ../editor/dconf-editor.vala:310 +#: ../editor/dconf-editor.vala:350 msgid "Not found" msgstr "なし" -#: ../editor/dconf-editor.vala:336 +#: ../editor/dconf-editor.vala:398 msgid "" -"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.\n" +"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.\n" "\n" -"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.\n" +"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.\n" "\n" -"You should have received a copy of the GNU General Public License along with " -"this program; if not, write to the Free Software Foundation, Inc., 51 " -"Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA" +"You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA" msgstr "" -"このプログラムはフリーソフトウェアです。フリーソフトウェア財団が提供する GNU " -"一般公衆利用許諾契約書の第二版、あるいはそれ以降の版が定める条項の下で本プロ" -"グラムを再頒布または変更することができます。\n" +"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.\n" "\n" -"本プログラムは有用とは思いますが、その頒布にあたり商用での利用や特定の目的に" -"対する適用については暗黙の保証を含めて、いかなる保証も行ないません。詳細には " -"GNU 一般公衆利用許諾契約書をご覧下さい。\n" +"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.\n" "\n" -"あなたは本プログラムと一緒に GNU 一般公衆利用許諾契約書の写しを受け取っている" -"はずです。そうでない場合は、Free Software Foundation, Inc.,51 Franklin " -"Street, Fifth Floor, Boston, MA 02110-1301, USA まで連絡して下さい。" +"You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA" -#: ../editor/dconf-editor.vala:342 +#: ../editor/dconf-editor.vala:404 msgid "Copyright © Canonical Ltd" msgstr "Copyright © Canonical Ltd" -#: ../editor/dconf-editor.vala:346 +#: ../editor/dconf-editor.vala:408 msgid "translator-credits" -msgstr "相花 毅 " +msgstr "" +"相花 毅 \n" +"松澤 二郎 " #: ../editor/dconf-view.vala:264 #, c-format @@ -103,7 +96,7 @@ #: ../editor/dconf-editor.ui.h:1 msgid "Set to Default" -msgstr "デフォルトにする" +msgstr "デフォルトにリセット" #: ../editor/dconf-editor.ui.h:2 msgid "Schema:" @@ -120,7 +113,7 @@ #. Translators: as in datatype (integer, boolean, string, etc) #: ../editor/dconf-editor.ui.h:6 msgid "Type:" -msgstr "種類:" +msgstr "型:" #: ../editor/dconf-editor.ui.h:7 msgid "Default:" @@ -131,12 +124,12 @@ msgstr "次へ" #: ../editor/dconf-editor-menu.ui.h:1 -msgid "_Find" -msgstr "検索(_F)" +msgid "_Find…" +msgstr "検索(_F)…" #: ../editor/dconf-editor-menu.ui.h:2 msgid "_About" -msgstr "情報(_A)" +msgstr "このアプリケーションについて(_A)" #: ../editor/dconf-editor-menu.ui.h:3 msgid "_Quit" @@ -148,7 +141,7 @@ #: ../editor/ca.desrt.dconf-editor.gschema.xml.h:2 msgid "The width of the main window in pixels." -msgstr "メイン・ウィンドウの幅 (ピクセル単位) です。" +msgstr "メインウィンドウの幅 (ピクセル単位) です。" #: ../editor/ca.desrt.dconf-editor.gschema.xml.h:3 msgid "The height of the window" @@ -156,8 +149,12 @@ #: ../editor/ca.desrt.dconf-editor.gschema.xml.h:4 msgid "The height of the main window in pixels." -msgstr "メイン・ウィンドウの高さ (ピクセル単位) です。" +msgstr "メインウィンドウの高さ (ピクセル単位) です。" #: ../editor/ca.desrt.dconf-editor.gschema.xml.h:5 msgid "A flag to enable maximized mode" -msgstr "最大化モードにするかどうかのフラグ" +msgstr "フルスクリーンモードを有効にする" + +#: ../editor/ca.desrt.dconf-editor.gschema.xml.h:6 +msgid "A flag to enable fullscreen mode" +msgstr "フルスクリーンモードを有効にするフラグです。" diff -Nru d-conf-0.16.1/po/ko.po d-conf-0.18.0/po/ko.po --- d-conf-0.16.1/po/ko.po 2013-03-25 21:40:52.000000000 +0000 +++ d-conf-0.18.0/po/ko.po 2013-09-23 21:27:13.000000000 +0000 @@ -2,15 +2,15 @@ # Copyright (C) 2012, 2013 Seong-ho Cho et al. # This file is distributed under the same license as the dconf package. # Seong-ho Cho , 2012, 2013 +# Changwoo Ryu , 2013. # msgid "" msgstr "" "Project-Id-Version: dconf master\n" -"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?" -"product=dconf&keywords=I18N+L10N&component=general\n" -"POT-Creation-Date: 2013-03-17 13:49+0000\n" -"PO-Revision-Date: 2013-03-17 23:35+0900\n" -"Last-Translator: Seong-ho Cho \n" +"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=dconf&keywords=I18N+L10N&component=general\n" +"POT-Creation-Date: 2013-08-06 16:14+0000\n" +"PO-Revision-Date: 2013-09-17 19:29+0900\n" +"Last-Translator: Changwoo Ryu \n" "Language-Team: Korean \n" "Language: ko\n" "MIME-Version: 1.0\n" @@ -20,11 +20,11 @@ "X-Generator: Poedit 1.5.5\n" #: ../editor/dconf-editor.desktop.in.in.h:1 ../editor/dconf-editor.vala:43 -#: ../editor/dconf-editor.vala:63 ../editor/dconf-editor.vala:394 +#: ../editor/dconf-editor.vala:62 ../editor/dconf-editor.vala:400 msgid "dconf Editor" msgstr "dconf 편집기" -#: ../editor/dconf-editor.desktop.in.in.h:2 ../editor/dconf-editor.vala:397 +#: ../editor/dconf-editor.desktop.in.in.h:2 ../editor/dconf-editor.vala:403 msgid "Directly edit your entire configuration database" msgstr "모든 설정 데이터베이스를 직접 편집합니다" @@ -32,32 +32,32 @@ msgid "settings;configuration;" msgstr "settings;configuration;설정;" -#: ../editor/dconf-editor.vala:180 +#: ../editor/dconf-editor.vala:186 #, c-format msgid "Integer [%s..%s]" msgstr "정수형 [%s..%s]" -#: ../editor/dconf-editor.vala:182 +#: ../editor/dconf-editor.vala:188 msgid "Boolean" -msgstr "부울린" +msgstr "불리언" -#: ../editor/dconf-editor.vala:184 +#: ../editor/dconf-editor.vala:190 msgid "String" msgstr "문자" -#: ../editor/dconf-editor.vala:186 +#: ../editor/dconf-editor.vala:192 msgid "Enumeration" msgstr "열거형" -#: ../editor/dconf-editor.vala:234 +#: ../editor/dconf-editor.vala:240 msgid "No schema" msgstr "스키마 없음" -#: ../editor/dconf-editor.vala:344 +#: ../editor/dconf-editor.vala:350 msgid "Not found" msgstr "찾을 수 없음" -#: ../editor/dconf-editor.vala:392 +#: ../editor/dconf-editor.vala:398 msgid "" "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 " @@ -85,11 +85,11 @@ "면 자유 소프트웨어 재단에 알려주십시오. Free Software Foundation, Inc., 51 " "Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA" -#: ../editor/dconf-editor.vala:398 +#: ../editor/dconf-editor.vala:404 msgid "Copyright © Canonical Ltd" msgstr "Copyright © Canonical Ltd" -#: ../editor/dconf-editor.vala:402 +#: ../editor/dconf-editor.vala:408 msgid "translator-credits" msgstr "Seong-ho Cho , 2012, 2013" @@ -138,8 +138,8 @@ msgstr "다음" #: ../editor/dconf-editor-menu.ui.h:1 -msgid "_Find" -msgstr "찾기(_F)" +msgid "_Find…" +msgstr "찾기(_F)…" #: ../editor/dconf-editor-menu.ui.h:2 msgid "_About" @@ -155,7 +155,7 @@ #: ../editor/ca.desrt.dconf-editor.gschema.xml.h:2 msgid "The width of the main window in pixels." -msgstr "픽셀 단위의 메인 창 너비입니다." +msgstr "메인창 너비, 픽셀 단위." #: ../editor/ca.desrt.dconf-editor.gschema.xml.h:3 msgid "The height of the window" @@ -163,7 +163,7 @@ #: ../editor/ca.desrt.dconf-editor.gschema.xml.h:4 msgid "The height of the main window in pixels." -msgstr "픽셀 단위의 메인 창 높이입니다." +msgstr "메인창 높이, 픽셀 단위." #: ../editor/ca.desrt.dconf-editor.gschema.xml.h:5 msgid "A flag to enable maximized mode" diff -Nru d-conf-0.16.1/po/lt.po d-conf-0.18.0/po/lt.po --- d-conf-0.16.1/po/lt.po 2013-07-16 16:20:20.000000000 +0000 +++ d-conf-0.18.0/po/lt.po 2013-07-17 20:01:30.000000000 +0000 @@ -8,8 +8,8 @@ "Project-Id-Version: dconf master\n" "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?" "product=dconf&keywords=I18N+L10N&component=general\n" -"POT-Creation-Date: 2012-11-24 15:52+0000\n" -"PO-Revision-Date: 2013-01-23 22:08+0200\n" +"POT-Creation-Date: 2013-05-09 14:24+0000\n" +"PO-Revision-Date: 2013-06-16 17:57+0300\n" "Last-Translator: Aurimas Černius \n" "Language-Team: Lietuvių \n" "Language: lt\n" @@ -140,8 +140,9 @@ msgstr "Kitas" #: ../editor/dconf-editor-menu.ui.h:1 -msgid "_Find" -msgstr "_Rasti" +#| msgid "_Find" +msgid "_Find…" +msgstr "_Rasti…" #: ../editor/dconf-editor-menu.ui.h:2 msgid "_About" @@ -172,6 +173,5 @@ msgstr "Požymis išdidinimo veiksenai įjungti" #: ../editor/ca.desrt.dconf-editor.gschema.xml.h:6 -#| msgid "A flag to enable maximized mode" msgid "A flag to enable fullscreen mode" msgstr "Požymis viso ekrano veiksenai įjungti" diff -Nru d-conf-0.16.1/po/lv.po d-conf-0.18.0/po/lv.po --- d-conf-0.16.1/po/lv.po 2013-03-25 21:40:52.000000000 +0000 +++ d-conf-0.18.0/po/lv.po 2013-09-16 18:14:30.000000000 +0000 @@ -8,8 +8,8 @@ "Project-Id-Version: dconf master\n" "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?" "product=dconf&keywords=I18N+L10N&component=general\n" -"POT-Creation-Date: 2012-11-24 15:52+0000\n" -"PO-Revision-Date: 2013-03-17 20:00+0200\n" +"POT-Creation-Date: 2013-08-06 16:14+0000\n" +"PO-Revision-Date: 2013-09-11 13:05+0300\n" "Last-Translator: Rūdolfs Mazurs \n" "Language-Team: Latvian \n" "Language: lv\n" @@ -18,14 +18,14 @@ "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.4\n" +"X-Generator: Lokalize 1.5\n" #: ../editor/dconf-editor.desktop.in.in.h:1 ../editor/dconf-editor.vala:43 -#: ../editor/dconf-editor.vala:63 ../editor/dconf-editor.vala:394 +#: ../editor/dconf-editor.vala:62 ../editor/dconf-editor.vala:400 msgid "dconf Editor" msgstr "dconf redaktors" -#: ../editor/dconf-editor.desktop.in.in.h:2 ../editor/dconf-editor.vala:397 +#: ../editor/dconf-editor.desktop.in.in.h:2 ../editor/dconf-editor.vala:403 msgid "Directly edit your entire configuration database" msgstr "Tieši rediģē visu savu konfigurācijas datubāzi" @@ -33,32 +33,32 @@ msgid "settings;configuration;" msgstr "iestatījumi;konfigurācija;" -#: ../editor/dconf-editor.vala:180 +#: ../editor/dconf-editor.vala:186 #, c-format msgid "Integer [%s..%s]" msgstr "Vesels skaitlis [%s..%s]" -#: ../editor/dconf-editor.vala:182 +#: ../editor/dconf-editor.vala:188 msgid "Boolean" msgstr "Būla" -#: ../editor/dconf-editor.vala:184 +#: ../editor/dconf-editor.vala:190 msgid "String" msgstr "Virkne" -#: ../editor/dconf-editor.vala:186 +#: ../editor/dconf-editor.vala:192 msgid "Enumeration" msgstr "Uzskaitījums" -#: ../editor/dconf-editor.vala:234 +#: ../editor/dconf-editor.vala:240 msgid "No schema" msgstr "Nav shēmas" -#: ../editor/dconf-editor.vala:344 +#: ../editor/dconf-editor.vala:350 msgid "Not found" msgstr "Nav atrasts" -#: ../editor/dconf-editor.vala:392 +#: ../editor/dconf-editor.vala:398 msgid "" "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 " @@ -87,11 +87,11 @@ "instalāciju. Ja tā jums nav pieejama, jūs to varat iegūt no Free Software " "Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA" -#: ../editor/dconf-editor.vala:398 +#: ../editor/dconf-editor.vala:404 msgid "Copyright © Canonical Ltd" msgstr "Autortiesības © Canonical Ltd" -#: ../editor/dconf-editor.vala:402 +#: ../editor/dconf-editor.vala:408 msgid "translator-credits" msgstr "Rūdolfs Mazurs " @@ -140,8 +140,9 @@ msgstr "Nākamais" #: ../editor/dconf-editor-menu.ui.h:1 -msgid "_Find" -msgstr "_Meklēt" +#| msgid "_Find" +msgid "_Find…" +msgstr "_Meklēt…" #: ../editor/dconf-editor-menu.ui.h:2 msgid "_About" @@ -172,7 +173,6 @@ msgstr "Aktivizēt maksimizētu režīmu" #: ../editor/ca.desrt.dconf-editor.gschema.xml.h:6 -#| msgid "A flag to enable maximized mode" msgid "A flag to enable fullscreen mode" msgstr "Karogs, lai aktivētu pilnekrāna režīmu" diff -Nru d-conf-0.16.1/po/ml.po d-conf-0.18.0/po/ml.po --- d-conf-0.16.1/po/ml.po 2013-07-16 16:20:20.000000000 +0000 +++ d-conf-0.18.0/po/ml.po 2013-07-17 20:01:30.000000000 +0000 @@ -1,58 +1,63 @@ # Malayalam translation for dconf. # Copyright (C) 2012 dconf's COPYRIGHT HOLDER # This file is distributed under the same license as the dconf package. -# Anish A , 2012. +# Anish A , 2012, 2013. msgid "" msgstr "" "Project-Id-Version: dconf master\n" "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?" "product=dconf&keywords=I18N+L10N&component=general\n" -"POT-Creation-Date: 2012-09-20 09:21+0000\n" -"PO-Revision-Date: 2012-09-20 15:10+0530\n" -"Last-Translator: Anish A \n" +"POT-Creation-Date: 2013-04-19 12:59+0000\n" +"PO-Revision-Date: 2013-04-26 23:03+0530\n" +"Last-Translator: Balasankar C \n" "Language-Team: Swatantra Malayalam Computing\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.6.1\n" +"X-Generator: Virtaal 0.7.1\n" +"X-Project-Style: gnome\n" -#: ../editor/dconf-editor.desktop.in.in.h:1 ../editor/dconf-editor.vala:39 -#: ../editor/dconf-editor.vala:59 ../editor/dconf-editor.vala:338 +#: ../editor/dconf-editor.desktop.in.in.h:1 ../editor/dconf-editor.vala:43 +#: ../editor/dconf-editor.vala:63 ../editor/dconf-editor.vala:394 msgid "dconf Editor" msgstr "dconf എഡിറ്റര്‍" -#: ../editor/dconf-editor.desktop.in.in.h:2 ../editor/dconf-editor.vala:341 +#: ../editor/dconf-editor.desktop.in.in.h:2 ../editor/dconf-editor.vala:397 msgid "Directly edit your entire configuration database" msgstr "മൊത്തം ക്രമീകരണ ഡാറ്റാബൈസും നേരിട്ട് തിരുത്തുക" -#: ../editor/dconf-editor.vala:165 +#: ../editor/dconf-editor.desktop.in.in.h:3 +msgid "settings;configuration;" +msgstr "settings;configuration;" + +#: ../editor/dconf-editor.vala:180 #, c-format msgid "Integer [%s..%s]" msgstr "ഇന്റിജെര്‍ [%s..%s]" -#: ../editor/dconf-editor.vala:167 +#: ../editor/dconf-editor.vala:182 msgid "Boolean" msgstr "ബൂളിയന്‍" -#: ../editor/dconf-editor.vala:169 +#: ../editor/dconf-editor.vala:184 msgid "String" msgstr "വാക്യം" -#: ../editor/dconf-editor.vala:171 +#: ../editor/dconf-editor.vala:186 msgid "Enumeration" msgstr "പട്ടിക" -#: ../editor/dconf-editor.vala:214 +#: ../editor/dconf-editor.vala:234 msgid "No schema" msgstr "സ്കീമ ഇല്ല" -#: ../editor/dconf-editor.vala:310 +#: ../editor/dconf-editor.vala:344 msgid "Not found" msgstr "കാണാനില്ല." -#: ../editor/dconf-editor.vala:336 +#: ../editor/dconf-editor.vala:392 msgid "" "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 " @@ -77,11 +82,11 @@ "ഈ പ്രോഗ്രാമിനൊപ്പം നിങ്ങള്‍ക്ക് GNU ജനറല്‍ പബ്ലിക് ലൈസന്‍സിന്റെ ഒരു പകര്‍പ്പും ലഭിച്ചിരിക്കണം. " "ഇല്ലായെങ്കില്‍, കാണുക.‌" -#: ../editor/dconf-editor.vala:342 +#: ../editor/dconf-editor.vala:398 msgid "Copyright © Canonical Ltd" msgstr "പകര്‍പ്പവകാശം © കാനോനിക്കല്‍ ലിമിറ്റഡ്" -#: ../editor/dconf-editor.vala:346 +#: ../editor/dconf-editor.vala:402 msgid "translator-credits" msgstr "അനീഷ് എ | Anish A " @@ -160,3 +165,7 @@ #: ../editor/ca.desrt.dconf-editor.gschema.xml.h:5 msgid "A flag to enable maximized mode" msgstr "വലുതാക്കുന്ന മോഡ് സജ്ജമാക്കുന്നതിനുള്ള ഫ്ളാഗ്" + +#: ../editor/ca.desrt.dconf-editor.gschema.xml.h:6 +msgid "A flag to enable fullscreen mode" +msgstr "സ്ക്രീനിന്റെ മുഴുവൻ രൂപം സജ്ജമാക്കുന്നതിനുള്ള ഒരു ഫ്ളാഗ്" diff -Nru d-conf-0.16.1/po/nb.po d-conf-0.18.0/po/nb.po --- d-conf-0.16.1/po/nb.po 2013-07-16 16:20:20.000000000 +0000 +++ d-conf-0.18.0/po/nb.po 2013-07-17 20:01:30.000000000 +0000 @@ -5,10 +5,10 @@ # msgid "" msgstr "" -"Project-Id-Version: dconf 3.7.x\n" +"Project-Id-Version: dconf 3.9.x\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2013-01-21 11:50+0100\n" -"PO-Revision-Date: 2013-01-21 11:50+0100\n" +"POT-Creation-Date: 2013-05-20 14:37+0200\n" +"PO-Revision-Date: 2013-05-20 14:38+0200\n" "Last-Translator: Kjartan Maraas \n" "Language-Team: Norwegian bokmål \n" "Language: no\n" @@ -18,11 +18,11 @@ "Plural-Forms: nplurals=2; plural=n != 1;\n" #: ../editor/dconf-editor.desktop.in.in.h:1 ../editor/dconf-editor.vala:43 -#: ../editor/dconf-editor.vala:63 ../editor/dconf-editor.vala:394 +#: ../editor/dconf-editor.vala:62 ../editor/dconf-editor.vala:400 msgid "dconf Editor" msgstr "dconf redigering" -#: ../editor/dconf-editor.desktop.in.in.h:2 ../editor/dconf-editor.vala:397 +#: ../editor/dconf-editor.desktop.in.in.h:2 ../editor/dconf-editor.vala:403 msgid "Directly edit your entire configuration database" msgstr "Rediger konfigurasjonsdatabasen direkte" @@ -30,32 +30,32 @@ msgid "settings;configuration;" msgstr "innstillinger;konfigurasjon;" -#: ../editor/dconf-editor.vala:180 +#: ../editor/dconf-editor.vala:186 #, c-format msgid "Integer [%s..%s]" msgstr "Heltall [%s..%s]" -#: ../editor/dconf-editor.vala:182 +#: ../editor/dconf-editor.vala:188 msgid "Boolean" msgstr "Boolean" -#: ../editor/dconf-editor.vala:184 +#: ../editor/dconf-editor.vala:190 msgid "String" msgstr "Streng" -#: ../editor/dconf-editor.vala:186 +#: ../editor/dconf-editor.vala:192 msgid "Enumeration" msgstr "Oppregning" -#: ../editor/dconf-editor.vala:234 +#: ../editor/dconf-editor.vala:240 msgid "No schema" msgstr "Ingen skjema" -#: ../editor/dconf-editor.vala:344 +#: ../editor/dconf-editor.vala:350 msgid "Not found" msgstr "Ikke funnet" -#: ../editor/dconf-editor.vala:392 +#: ../editor/dconf-editor.vala:398 msgid "" "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 " @@ -84,11 +84,11 @@ "programmet. Hvis dette ikke er tilfelle, kan du skrive til Free Software " "Foundation, Inc. 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA" -#: ../editor/dconf-editor.vala:398 +#: ../editor/dconf-editor.vala:404 msgid "Copyright © Canonical Ltd" msgstr "Opphavsrett © Canonical Ltd" -#: ../editor/dconf-editor.vala:402 +#: ../editor/dconf-editor.vala:408 msgid "translator-credits" msgstr "Kjartan Maraas " @@ -137,8 +137,8 @@ msgstr "Neste" #: ../editor/dconf-editor-menu.ui.h:1 -msgid "_Find" -msgstr "_Finn" +msgid "_Find…" +msgstr "_Finn …" #: ../editor/dconf-editor-menu.ui.h:2 msgid "_About" diff -Nru d-conf-0.16.1/po/nl.po d-conf-0.18.0/po/nl.po --- d-conf-0.16.1/po/nl.po 1970-01-01 00:00:00.000000000 +0000 +++ d-conf-0.18.0/po/nl.po 2013-09-16 18:14:30.000000000 +0000 @@ -0,0 +1,179 @@ +# Dutch translation for d-conf +# Copyright (c) 2013 Rosetta Contributors and Canonical Ltd 2013 +# This file is distributed under the same license as the d-conf package. +# FIRST AUTHOR , 2013. +# Reinout van Schouwen , 2013. +msgid "" +msgstr "" +"Project-Id-Version: d-conf\n" +"Report-Msgid-Bugs-To: FULL NAME \n" +"POT-Creation-Date: 2013-05-31 19:53+0000\n" +"PO-Revision-Date: 2013-09-15 23:12+0200\n" +"Last-Translator: Reinout van Schouwen \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" +"Plural-Forms: nplurals=2; plural=(n != 1);\n" +"X-Generator: Virtaal 0.7.1\n" +"X-Launchpad-Export-Date: 2013-09-15 20:52+0000\n" + +#: ../editor/dconf-editor.desktop.in.in.h:1 ../editor/dconf-editor.vala:43 +#: ../editor/dconf-editor.vala:63 ../editor/dconf-editor.vala:394 +msgid "dconf Editor" +msgstr "dconf-editor" + +#: ../editor/dconf-editor.desktop.in.in.h:2 ../editor/dconf-editor.vala:397 +msgid "Directly edit your entire configuration database" +msgstr "De gehele configuratie-database rechtstreeks bewerken" + +#: ../editor/dconf-editor.desktop.in.in.h:3 +msgid "settings;configuration;" +msgstr "instellingen;configuratie;settings;configuration;" + +#: ../editor/dconf-editor.vala:180 +#, c-format +msgid "Integer [%s..%s]" +msgstr "Geheel getal [%s..%s]" + +#: ../editor/dconf-editor.vala:182 +msgid "Boolean" +msgstr "Booleaanse waarde" + +#: ../editor/dconf-editor.vala:184 +msgid "String" +msgstr "Tekenreeks" + +#: ../editor/dconf-editor.vala:186 +msgid "Enumeration" +msgstr "Enumeratie" + +#: ../editor/dconf-editor.vala:234 +msgid "No schema" +msgstr "Geen schema" + +#: ../editor/dconf-editor.vala:344 +msgid "Not found" +msgstr "Niet gevonden" + +#: ../editor/dconf-editor.vala:392 +msgid "" +"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.\n" +"\n" +"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.\n" +"\n" +"You should have received a copy of the GNU General Public License along with " +"this program; if not, write to the Free Software Foundation, Inc., 51 " +"Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA" +msgstr "" +"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.\n" +"\n" +"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.\n" +"\n" +"You should have received a copy of the GNU General Public License along with " +"this program; if not, write to the Free Software Foundation, Inc., 51 " +"Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA" + +#: ../editor/dconf-editor.vala:398 +msgid "Copyright © Canonical Ltd" +msgstr "Copyright © Canonical Ltd" + +#: ../editor/dconf-editor.vala:402 +msgid "translator-credits" +msgstr "" +"Reinout van Schouwen \n" +"Launchpad Contributions:\n" +" Tico https://launchpad.net/~co-ti" + +#: ../editor/dconf-view.vala:264 +#, c-format +msgid "Error setting value: %s" +msgstr "Fout bij instellen waarde: %s" + +#. Translators: this is the column header label in the main view +#: ../editor/dconf-view.vala:318 +msgid "Name" +msgstr "Naam" + +#. Translators: this is the column header label in the main view +#: ../editor/dconf-view.vala:322 +msgid "Value" +msgstr "Waarde" + +#: ../editor/dconf-editor.ui.h:1 +msgid "Set to Default" +msgstr "Naar standaardinstellingen" + +#: ../editor/dconf-editor.ui.h:2 +msgid "Schema:" +msgstr "Schema:" + +#: ../editor/dconf-editor.ui.h:3 +msgid "Summary:" +msgstr "Samenvatting:" + +#: ../editor/dconf-editor.ui.h:4 +msgid "Description:" +msgstr "Beschrijving:" + +#. Translators: as in datatype (integer, boolean, string, etc) +#: ../editor/dconf-editor.ui.h:6 +msgid "Type:" +msgstr "Soort:" + +#: ../editor/dconf-editor.ui.h:7 +msgid "Default:" +msgstr "Standaard:" + +#: ../editor/dconf-editor.ui.h:8 +msgid "Next" +msgstr "Volgende" + +#: ../editor/dconf-editor-menu.ui.h:1 +msgid "_Find" +msgstr "_Zoeken" + +#: ../editor/dconf-editor-menu.ui.h:2 +msgid "_About" +msgstr "I_nfo" + +#: ../editor/dconf-editor-menu.ui.h:3 +msgid "_Quit" +msgstr "A_fsluiten" + +#: ../editor/ca.desrt.dconf-editor.gschema.xml.h:1 +msgid "The width of the window" +msgstr "De breedte van het venster" + +#: ../editor/ca.desrt.dconf-editor.gschema.xml.h:2 +msgid "The width of the main window in pixels." +msgstr "De breedte van het hoofdvenster in beeldpunten." + +#: ../editor/ca.desrt.dconf-editor.gschema.xml.h:3 +msgid "The height of the window" +msgstr "De hoogte van het venster" + +#: ../editor/ca.desrt.dconf-editor.gschema.xml.h:4 +msgid "The height of the main window in pixels." +msgstr "De hoogte van het hoofdvenster in beeldpunten." + +#: ../editor/ca.desrt.dconf-editor.gschema.xml.h:5 +msgid "A flag to enable maximized mode" +msgstr "Een markering om gemaximaliseerde modus in te schakelen" + +#: ../editor/ca.desrt.dconf-editor.gschema.xml.h:6 +msgid "A flag to enable fullscreen mode" +msgstr "Een markering om volledig-schermmodus in te schakelen" diff -Nru d-conf-0.16.1/po/pa.po d-conf-0.18.0/po/pa.po --- d-conf-0.16.1/po/pa.po 2013-03-14 18:27:40.000000000 +0000 +++ d-conf-0.18.0/po/pa.po 2013-09-23 21:27:13.000000000 +0000 @@ -8,8 +8,8 @@ "Project-Id-Version: dconf master\n" "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?" "product=dconf&keywords=I18N+L10N&component=general\n" -"POT-Creation-Date: 2012-11-24 15:52+0000\n" -"PO-Revision-Date: 2013-02-26 07:35+0530\n" +"POT-Creation-Date: 2013-08-06 16:14+0000\n" +"PO-Revision-Date: 2013-09-18 08:34-0500\n" "Last-Translator: A S Alam \n" "Language-Team: Punjabi/Panjabi \n" "Language: pa\n" @@ -20,11 +20,11 @@ "X-Generator: Lokalize 1.5\n" #: ../editor/dconf-editor.desktop.in.in.h:1 ../editor/dconf-editor.vala:43 -#: ../editor/dconf-editor.vala:63 ../editor/dconf-editor.vala:394 +#: ../editor/dconf-editor.vala:62 ../editor/dconf-editor.vala:400 msgid "dconf Editor" msgstr "dconf ਐਡੀਟਰ" -#: ../editor/dconf-editor.desktop.in.in.h:2 ../editor/dconf-editor.vala:397 +#: ../editor/dconf-editor.desktop.in.in.h:2 ../editor/dconf-editor.vala:403 msgid "Directly edit your entire configuration database" msgstr "ਆਪਣੇ ਪੂਰੇ ਸੰਰਚਨਾ ਡਾਟਾਬੇਸ ਨੂੰ ਸਿੱਧਾ ਸੋਧੋ" @@ -32,32 +32,32 @@ msgid "settings;configuration;" msgstr "ਸੈਟਿੰਗ;ਸੰਰਚਨਾ;settings;configuration;" -#: ../editor/dconf-editor.vala:180 +#: ../editor/dconf-editor.vala:186 #, c-format msgid "Integer [%s..%s]" msgstr "ਪੂਰਨ ਅੰਕ [%s..%s]" -#: ../editor/dconf-editor.vala:182 +#: ../editor/dconf-editor.vala:188 msgid "Boolean" msgstr "ਬੂਲੀਅਨ" -#: ../editor/dconf-editor.vala:184 +#: ../editor/dconf-editor.vala:190 msgid "String" msgstr "ਸਤਰ" -#: ../editor/dconf-editor.vala:186 +#: ../editor/dconf-editor.vala:192 msgid "Enumeration" msgstr "Enumeration" -#: ../editor/dconf-editor.vala:234 +#: ../editor/dconf-editor.vala:240 msgid "No schema" msgstr "ਕੋਈ ਸਕੀਮਾ ਨਹੀਂ" -#: ../editor/dconf-editor.vala:344 +#: ../editor/dconf-editor.vala:350 msgid "Not found" msgstr "ਨਹੀਂ ਲੱਭਿਆ" -#: ../editor/dconf-editor.vala:392 +#: ../editor/dconf-editor.vala:398 msgid "" "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 " @@ -92,11 +92,11 @@ "੦੨੧੧੦-੧੩੦੧, " "ਅਮਰੀਕਾ ਨੂੰ ਲਿਖੋ।" -#: ../editor/dconf-editor.vala:398 +#: ../editor/dconf-editor.vala:404 msgid "Copyright © Canonical Ltd" msgstr "Copyright © Canonical Ltd" -#: ../editor/dconf-editor.vala:402 +#: ../editor/dconf-editor.vala:408 msgid "translator-credits" msgstr "" "ਅਮਨਪਰੀਤ ਸਿੰਘ ਆਲਮ\n" @@ -147,8 +147,9 @@ msgstr "ਅੱਗੇ" #: ../editor/dconf-editor-menu.ui.h:1 -msgid "_Find" -msgstr "ਖੋਜ(_F)" +#| msgid "_Find" +msgid "_Find…" +msgstr "…ਖੋਜ(_F)" #: ../editor/dconf-editor-menu.ui.h:2 msgid "_About" @@ -179,7 +180,6 @@ msgstr "ਵੱਧੋ-ਵੱਧ ਮੋਡ ਯੋਗ ਕਰਨ ਲਈ ਇੱਕ ਫਲੈਗ" #: ../editor/ca.desrt.dconf-editor.gschema.xml.h:6 -#| msgid "A flag to enable maximized mode" msgid "A flag to enable fullscreen mode" msgstr "ਪੂਰੀ ਸਕਰੀਨ ਢੰਗ ਚਾਲੂ ਕਰਨ ਲਈ ਨਿਸ਼ਾਨ" diff -Nru d-conf-0.16.1/po/pl.po d-conf-0.18.0/po/pl.po --- d-conf-0.16.1/po/pl.po 2013-03-14 18:27:40.000000000 +0000 +++ d-conf-0.18.0/po/pl.po 2013-09-10 14:09:41.000000000 +0000 @@ -4,14 +4,14 @@ # pomóc w jego rozwijaniu i pielęgnowaniu, napisz do nas: # gnomepl@aviary.pl # -=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=- -# Piotr Drąg , 2012. -# Aviary.pl , 2012. +# Piotr Drąg , 2012-2013. +# Aviary.pl , 2012-2013. msgid "" msgstr "" "Project-Id-Version: dconf\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2012-11-27 17:01+0100\n" -"PO-Revision-Date: 2012-11-27 17:02+0100\n" +"POT-Creation-Date: 2013-08-24 03:10+0200\n" +"PO-Revision-Date: 2013-08-24 03:11+0200\n" "Last-Translator: Piotr Drąg \n" "Language-Team: Polish \n" "Language: pl\n" @@ -24,44 +24,44 @@ "X-Poedit-Country: Poland\n" #: ../editor/dconf-editor.desktop.in.in.h:1 ../editor/dconf-editor.vala:43 -#: ../editor/dconf-editor.vala:63 ../editor/dconf-editor.vala:394 +#: ../editor/dconf-editor.vala:62 ../editor/dconf-editor.vala:400 msgid "dconf Editor" msgstr "Edytor dconf" -#: ../editor/dconf-editor.desktop.in.in.h:2 ../editor/dconf-editor.vala:397 +#: ../editor/dconf-editor.desktop.in.in.h:2 ../editor/dconf-editor.vala:403 msgid "Directly edit your entire configuration database" msgstr "Bezpośrednia modyfikacja bazy danych konfiguracji" #: ../editor/dconf-editor.desktop.in.in.h:3 msgid "settings;configuration;" -msgstr "ustawienia;konfiguracja;preferencje;opcje;" +msgstr "ustawienia;konfiguracja;preferencje;opcje;rejestr;" -#: ../editor/dconf-editor.vala:180 +#: ../editor/dconf-editor.vala:186 #, c-format msgid "Integer [%s..%s]" msgstr "Wartość całkowita [%s..%s]" -#: ../editor/dconf-editor.vala:182 +#: ../editor/dconf-editor.vala:188 msgid "Boolean" msgstr "Zmienna logiczna" -#: ../editor/dconf-editor.vala:184 +#: ../editor/dconf-editor.vala:190 msgid "String" msgstr "Tekst" -#: ../editor/dconf-editor.vala:186 +#: ../editor/dconf-editor.vala:192 msgid "Enumeration" msgstr "Wyliczenie" -#: ../editor/dconf-editor.vala:234 +#: ../editor/dconf-editor.vala:240 msgid "No schema" msgstr "Brak schematu" -#: ../editor/dconf-editor.vala:344 +#: ../editor/dconf-editor.vala:350 msgid "Not found" msgstr "Nie odnaleziono" -#: ../editor/dconf-editor.vala:392 +#: ../editor/dconf-editor.vala:398 msgid "" "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 " @@ -93,15 +93,15 @@ "- proszę napisać do Free Software Foundation, Inc., 51 Franklin Street, " "Fifth Floor, Boston, MA 02110-1301, USA." -#: ../editor/dconf-editor.vala:398 +#: ../editor/dconf-editor.vala:404 msgid "Copyright © Canonical Ltd" msgstr "Copyright © Canonical Ltd" -#: ../editor/dconf-editor.vala:402 +#: ../editor/dconf-editor.vala:408 msgid "translator-credits" msgstr "" -"Piotr Drąg , 2012\n" -"Aviary.pl , 2012" +"Piotr Drąg , 2012-2013\n" +"Aviary.pl , 2012-2013" #: ../editor/dconf-view.vala:264 #, c-format @@ -148,8 +148,8 @@ msgstr "Następny" #: ../editor/dconf-editor-menu.ui.h:1 -msgid "_Find" -msgstr "_Znajdź" +msgid "_Find…" +msgstr "_Znajdź…" #: ../editor/dconf-editor-menu.ui.h:2 msgid "_About" diff -Nru d-conf-0.16.1/po/pt.po d-conf-0.18.0/po/pt.po --- d-conf-0.16.1/po/pt.po 2013-03-14 18:27:40.000000000 +0000 +++ d-conf-0.18.0/po/pt.po 2013-09-23 21:27:13.000000000 +0000 @@ -5,10 +5,10 @@ # msgid "" msgstr "" -"Project-Id-Version: 3.8\n" +"Project-Id-Version: 3.10\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2013-03-12 23:39+0000\n" -"PO-Revision-Date: 2013-03-12 23:40+0100\n" +"POT-Creation-Date: 2013-09-22 01:31+0100\n" +"PO-Revision-Date: 2013-09-22 01:35+0100\n" "Last-Translator: Duarte Loreto \n" "Language-Team: Portuguese \n" "Language: pt\n" @@ -17,11 +17,11 @@ "Content-Transfer-Encoding: 8bit\n" #: ../editor/dconf-editor.desktop.in.in.h:1 ../editor/dconf-editor.vala:43 -#: ../editor/dconf-editor.vala:63 ../editor/dconf-editor.vala:394 +#: ../editor/dconf-editor.vala:62 ../editor/dconf-editor.vala:400 msgid "dconf Editor" msgstr "Editor dconf" -#: ../editor/dconf-editor.desktop.in.in.h:2 ../editor/dconf-editor.vala:397 +#: ../editor/dconf-editor.desktop.in.in.h:2 ../editor/dconf-editor.vala:403 msgid "Directly edit your entire configuration database" msgstr "Edite diretamente toda a sua base de dados de configuração" @@ -29,32 +29,32 @@ msgid "settings;configuration;" msgstr "definições;configuração;" -#: ../editor/dconf-editor.vala:180 +#: ../editor/dconf-editor.vala:186 #, c-format msgid "Integer [%s..%s]" msgstr "Inteiro [%s..%s]" -#: ../editor/dconf-editor.vala:182 +#: ../editor/dconf-editor.vala:188 msgid "Boolean" msgstr "Boleano" -#: ../editor/dconf-editor.vala:184 +#: ../editor/dconf-editor.vala:190 msgid "String" msgstr "Expressão" -#: ../editor/dconf-editor.vala:186 +#: ../editor/dconf-editor.vala:192 msgid "Enumeration" msgstr "Enumeração" -#: ../editor/dconf-editor.vala:234 +#: ../editor/dconf-editor.vala:240 msgid "No schema" msgstr "Nenhum esquema" -#: ../editor/dconf-editor.vala:344 +#: ../editor/dconf-editor.vala:350 msgid "Not found" msgstr "Não encontrado" -#: ../editor/dconf-editor.vala:392 +#: ../editor/dconf-editor.vala:398 msgid "" "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 " @@ -84,11 +84,11 @@ "o Glade; caso contrário, escreva para a Free Software Foundation, Inc., 51 " "Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA (em inglês)" -#: ../editor/dconf-editor.vala:398 +#: ../editor/dconf-editor.vala:404 msgid "Copyright © Canonical Ltd" msgstr "Copyright © Canonical Ltd" -#: ../editor/dconf-editor.vala:402 +#: ../editor/dconf-editor.vala:408 msgid "translator-credits" msgstr "Duarte Loreto " @@ -137,8 +137,8 @@ msgstr "Seguinte" #: ../editor/dconf-editor-menu.ui.h:1 -msgid "_Find" -msgstr "_Procurar" +msgid "_Find…" +msgstr "_Procurar…" #: ../editor/dconf-editor-menu.ui.h:2 msgid "_About" diff -Nru d-conf-0.16.1/po/pt_BR.po d-conf-0.18.0/po/pt_BR.po --- d-conf-0.16.1/po/pt_BR.po 2013-07-16 16:20:20.000000000 +0000 +++ d-conf-0.18.0/po/pt_BR.po 2013-07-17 20:01:30.000000000 +0000 @@ -8,16 +8,16 @@ "Project-Id-Version: dconf master\n" "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?" "product=dconf&keywords=I18N+L10N&component=general\n" -"POT-Creation-Date: 2013-03-03 20:40+0000\n" -"PO-Revision-Date: 2013-02-28 09:25-0300\n" -"Last-Translator: Enrico Nicoletto \n" +"POT-Creation-Date: 2013-05-09 14:24+0000\n" +"PO-Revision-Date: 2013-05-09 11:28-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.5.4\n" +"X-Generator: Poedit 1.5.5\n" #: ../editor/dconf-editor.desktop.in.in.h:1 ../editor/dconf-editor.vala:43 #: ../editor/dconf-editor.vala:63 ../editor/dconf-editor.vala:394 @@ -140,8 +140,9 @@ msgstr "Próximo" #: ../editor/dconf-editor-menu.ui.h:1 -msgid "_Find" -msgstr "_Pesquisar" +#| msgid "_Find" +msgid "_Find…" +msgstr "_Pesquisar…" #: ../editor/dconf-editor-menu.ui.h:2 msgid "_About" diff -Nru d-conf-0.16.1/po/ru.po d-conf-0.18.0/po/ru.po --- d-conf-0.16.1/po/ru.po 2013-03-25 21:40:52.000000000 +0000 +++ d-conf-0.18.0/po/ru.po 2013-09-10 14:09:41.000000000 +0000 @@ -7,26 +7,27 @@ msgid "" msgstr "" "Project-Id-Version: dconf master\n" -"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?" -"product=dconf&keywords=I18N+L10N&component=general\n" -"POT-Creation-Date: 2013-03-19 21:14+0000\n" -"PO-Revision-Date: 2013-03-23 09:37+0400\n" +"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=dconf&keywords=I18N+L10N&component=general\n" +"POT-Creation-Date: 2013-09-05 04:50+0000\n" +"PO-Revision-Date: 2013-09-09 20:45+0300\n" "Last-Translator: Yuri Myasoedov \n" "Language-Team: русский \n" "Language: ru\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" -"X-Generator: Poedit 1.5.5\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: Poedit 1.5.7\n" -#: ../editor/dconf-editor.desktop.in.in.h:1 ../editor/dconf-editor.vala:43 -#: ../editor/dconf-editor.vala:63 ../editor/dconf-editor.vala:394 +#: ../editor/dconf-editor.desktop.in.in.h:1 +#: ../editor/dconf-editor.vala:43 +#: ../editor/dconf-editor.vala:62 +#: ../editor/dconf-editor.vala:400 msgid "dconf Editor" msgstr "Редактор dconf" -#: ../editor/dconf-editor.desktop.in.in.h:2 ../editor/dconf-editor.vala:397 +#: ../editor/dconf-editor.desktop.in.in.h:2 +#: ../editor/dconf-editor.vala:403 msgid "Directly edit your entire configuration database" msgstr "Прямое редактирование базы данных настроек среды" @@ -34,68 +35,50 @@ msgid "settings;configuration;" msgstr "настройка;параметры;конфигурация;" -#: ../editor/dconf-editor.vala:180 +#: ../editor/dconf-editor.vala:186 #, c-format msgid "Integer [%s..%s]" msgstr "Целое [%s..%s]" -#: ../editor/dconf-editor.vala:182 +#: ../editor/dconf-editor.vala:188 msgid "Boolean" msgstr "Логическое" -#: ../editor/dconf-editor.vala:184 +#: ../editor/dconf-editor.vala:190 msgid "String" msgstr "Строка" -#: ../editor/dconf-editor.vala:186 +#: ../editor/dconf-editor.vala:192 msgid "Enumeration" msgstr "Перечисление" -#: ../editor/dconf-editor.vala:234 +#: ../editor/dconf-editor.vala:240 msgid "No schema" msgstr "Без схемы" -#: ../editor/dconf-editor.vala:344 +#: ../editor/dconf-editor.vala:350 msgid "Not found" msgstr "Не найдено" -#: ../editor/dconf-editor.vala:392 +#: ../editor/dconf-editor.vala:398 msgid "" -"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.\n" +"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.\n" "\n" -"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.\n" +"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.\n" "\n" -"You should have received a copy of the GNU General Public License along with " -"this program; if not, write to the Free Software Foundation, Inc., 51 " -"Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA" +"You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA" msgstr "" -"Это свободное программное обеспечение; вы можете распространять и/или " -"изменять его на условиях лицензии GNU General Public License, опубликованной " -"Фондом свободного программного обеспечения; либо версии 2 этой лицензии, " -"либо (по вашему выбору) любой более поздней версии.\n" +"Это свободное программное обеспечение; вы можете распространять и/или изменять его на условиях лицензии GNU General Public License, опубликованной Фондом свободного программного обеспечения; либо версии 2 этой лицензии, либо (по вашему выбору) любой более поздней версии.\n" "\n" -"Это программа распространяется в надежде, что она может быть полезна, но БЕЗ " -"КАКОГО-ЛИБО ВИДА ГАРАНТИЙ, ВЫРАЖЕННЫХ ЯВНО ИЛИ ПОДРАЗУМЕВАЕМЫХ, ВКЛЮЧАЯ, НО " -"НЕ ОГРАНИЧИВАЯСЬ, ПОДРАЗУМЕВАЕМЫМИ ГАРАНТИЯМИ КОММЕРЧЕСКОЙ ЦЕННОСТИ И " -"ПРИГОДНОСТИ ДЛЯ КОНКРЕТНОЙ ЦЕЛИ. Для получения дополнительных сведений " -"обратитесь к лицензии GNU General Public License.\n" +"Это программа распространяется в надежде, что она может быть полезна, но БЕЗ КАКОГО-ЛИБО ВИДА ГАРАНТИЙ, ВЫРАЖЕННЫХ ЯВНО ИЛИ ПОДРАЗУМЕВАЕМЫХ, ВКЛЮЧАЯ, НО НЕ ОГРАНИЧИВАЯСЬ, ПОДРАЗУМЕВАЕМЫМИ ГАРАНТИЯМИ КОММЕРЧЕСКОЙ ЦЕННОСТИ И ПРИГОДНОСТИ ДЛЯ КОНКРЕТНОЙ ЦЕЛИ. Для получения дополнительных сведений обратитесь к лицензии GNU General Public License.\n" "\n" -"Вы должны были получить копию лицензии GNU General Public License c этой " -"программой. Если это не так, известите об этом Фонд свободного программного " -"обеспечения по адресу Free Software Foundation, Inc., 51 Franklin Street, " -"Fifth Floor, Boston, MA 02110-1301, USA" +"Вы должны были получить копию лицензии GNU General Public License c этой программой. Если это не так, известите об этом Фонд свободного программного обеспечения по адресу Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA" -#: ../editor/dconf-editor.vala:398 +#: ../editor/dconf-editor.vala:404 msgid "Copyright © Canonical Ltd" msgstr "Авторские права © Canonical Ltd" -#: ../editor/dconf-editor.vala:402 +#: ../editor/dconf-editor.vala:408 msgid "translator-credits" msgstr "Alexsey Nadtochey , 2012" @@ -144,8 +127,8 @@ msgstr "Далее" #: ../editor/dconf-editor-menu.ui.h:1 -msgid "_Find" -msgstr "_Найти" +msgid "_Find…" +msgstr "_Найти…" #: ../editor/dconf-editor-menu.ui.h:2 msgid "_About" @@ -178,3 +161,4 @@ #: ../editor/ca.desrt.dconf-editor.gschema.xml.h:6 msgid "A flag to enable fullscreen mode" msgstr "Флаг включения полноэкранного режима" + diff -Nru d-conf-0.16.1/po/sk.po d-conf-0.18.0/po/sk.po --- d-conf-0.16.1/po/sk.po 2013-07-16 16:20:20.000000000 +0000 +++ d-conf-0.18.0/po/sk.po 2013-07-17 20:01:30.000000000 +0000 @@ -1,15 +1,15 @@ # Slovak translation for dconf. -# Copyright (C) 2012 dconf's COPYRIGHT HOLDER +# Copyright (C) 2012-2013 dconf's COPYRIGHT HOLDER # This file is distributed under the same license as the dconf package. -# Pavol Klačanský , 2012. +# Pavol Klačanský , 2012-2013. # msgid "" msgstr "" "Project-Id-Version: dconf\n" "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?" "product=dconf&keywords=I18N+L10N&component=general\n" -"POT-Creation-Date: 2012-12-05 19:06+0000\n" -"PO-Revision-Date: 2012-11-25 19:41+0000\n" +"POT-Creation-Date: 2013-05-09 22:39+0000\n" +"PO-Revision-Date: 2013-05-18 12:47+0100\n" "Last-Translator: Pavol Klačanský \n" "Language-Team: Slovak \n" "Language: sk\n" @@ -20,12 +20,12 @@ "X-Generator: Poedit 1.5.4\n" #: ../editor/dconf-editor.desktop.in.in.h:1 ../editor/dconf-editor.vala:43 -#: ../editor/dconf-editor.vala:63 ../editor/dconf-editor.vala:394 +#: ../editor/dconf-editor.vala:62 ../editor/dconf-editor.vala:400 msgid "dconf Editor" msgstr "Editor pre systém dconf" # about dialog desc -#: ../editor/dconf-editor.desktop.in.in.h:2 ../editor/dconf-editor.vala:397 +#: ../editor/dconf-editor.desktop.in.in.h:2 ../editor/dconf-editor.vala:403 msgid "Directly edit your entire configuration database" msgstr "Priama úprava celej vašej databázy nastavení" @@ -34,34 +34,34 @@ msgstr "nastavenia;konfigurácia;" # %s %s range -#: ../editor/dconf-editor.vala:180 +#: ../editor/dconf-editor.vala:186 #, c-format msgid "Integer [%s..%s]" msgstr "Celé číslo [%s..%s]" -#: ../editor/dconf-editor.vala:182 +#: ../editor/dconf-editor.vala:188 msgid "Boolean" msgstr "Logická hodnota" -#: ../editor/dconf-editor.vala:184 +#: ../editor/dconf-editor.vala:190 msgid "String" msgstr "Reťazec" -#: ../editor/dconf-editor.vala:186 +#: ../editor/dconf-editor.vala:192 msgid "Enumeration" msgstr "Vymenovanie hodnôt" # Schema: -#: ../editor/dconf-editor.vala:234 +#: ../editor/dconf-editor.vala:240 msgid "No schema" msgstr "Žiadna" # vyskyt -#: ../editor/dconf-editor.vala:344 +#: ../editor/dconf-editor.vala:350 msgid "Not found" msgstr "Nenajdený" -#: ../editor/dconf-editor.vala:392 +#: ../editor/dconf-editor.vala:398 msgid "" "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 " @@ -91,11 +91,11 @@ "programom Ak sa tak nestalo, napíšte na adresu Free Software Foundation, " "Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA" -#: ../editor/dconf-editor.vala:398 +#: ../editor/dconf-editor.vala:404 msgid "Copyright © Canonical Ltd" msgstr "Autorské práva © Canonical Ltd" -#: ../editor/dconf-editor.vala:402 +#: ../editor/dconf-editor.vala:408 msgid "translator-credits" msgstr "Pavol Klačanský " @@ -147,8 +147,8 @@ msgstr "Ďalší" #: ../editor/dconf-editor-menu.ui.h:1 -msgid "_Find" -msgstr "_Nájsť" +msgid "_Find…" +msgstr "_Nájsť…" #: ../editor/dconf-editor-menu.ui.h:2 msgid "_About" diff -Nru d-conf-0.16.1/po/sl.po d-conf-0.18.0/po/sl.po --- d-conf-0.16.1/po/sl.po 2013-07-16 16:20:20.000000000 +0000 +++ d-conf-0.18.0/po/sl.po 2013-07-17 20:01:30.000000000 +0000 @@ -9,8 +9,8 @@ "Project-Id-Version: dconf master\n" "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?" "product=dconf&keywords=I18N+L10N&component=general\n" -"POT-Creation-Date: 2012-11-24 15:52+0000\n" -"PO-Revision-Date: 2012-11-26 21:01+0100\n" +"POT-Creation-Date: 2013-05-25 20:42+0000\n" +"PO-Revision-Date: 2013-05-28 22:15+0100\n" "Last-Translator: Matej Urbančič \n" "Language-Team: Slovenian GNOME Translation Team \n" "Language: sl_SI\n" @@ -23,11 +23,11 @@ "X-Generator: Poedit 1.5.4\n" #: ../editor/dconf-editor.desktop.in.in.h:1 ../editor/dconf-editor.vala:43 -#: ../editor/dconf-editor.vala:63 ../editor/dconf-editor.vala:394 +#: ../editor/dconf-editor.vala:62 ../editor/dconf-editor.vala:400 msgid "dconf Editor" msgstr "Urejevalnik dConf" -#: ../editor/dconf-editor.desktop.in.in.h:2 ../editor/dconf-editor.vala:397 +#: ../editor/dconf-editor.desktop.in.in.h:2 ../editor/dconf-editor.vala:403 msgid "Directly edit your entire configuration database" msgstr "Neposredno urejanje celotne podatkovne zbirke nastavitev" @@ -35,32 +35,32 @@ msgid "settings;configuration;" msgstr "nastavitve;konfiguracija;sistem;" -#: ../editor/dconf-editor.vala:180 +#: ../editor/dconf-editor.vala:186 #, c-format msgid "Integer [%s..%s]" msgstr "Celo število [%s ... %s]" -#: ../editor/dconf-editor.vala:182 +#: ../editor/dconf-editor.vala:188 msgid "Boolean" msgstr "Boolova vrednost" -#: ../editor/dconf-editor.vala:184 +#: ../editor/dconf-editor.vala:190 msgid "String" msgstr "Niz" -#: ../editor/dconf-editor.vala:186 +#: ../editor/dconf-editor.vala:192 msgid "Enumeration" msgstr "Oštevilčenje" -#: ../editor/dconf-editor.vala:234 +#: ../editor/dconf-editor.vala:240 msgid "No schema" msgstr "Ni sheme" -#: ../editor/dconf-editor.vala:344 +#: ../editor/dconf-editor.vala:350 msgid "Not found" msgstr "Ni zadetkov" -#: ../editor/dconf-editor.vala:392 +#: ../editor/dconf-editor.vala:398 msgid "" "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 " @@ -89,11 +89,11 @@ "General Public License); če ga niste pišite na Free Software Foundation, " "Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA." -#: ../editor/dconf-editor.vala:398 +#: ../editor/dconf-editor.vala:404 msgid "Copyright © Canonical Ltd" msgstr "Avtorske pravice © Canonical Ltd" -#: ../editor/dconf-editor.vala:402 +#: ../editor/dconf-editor.vala:408 msgid "translator-credits" msgstr "Matej Urbančič " @@ -142,8 +142,8 @@ msgstr "Naprej" #: ../editor/dconf-editor-menu.ui.h:1 -msgid "_Find" -msgstr "_Najdi" +msgid "_Find…" +msgstr "_Najdi ..." #: ../editor/dconf-editor-menu.ui.h:2 msgid "_About" diff -Nru d-conf-0.16.1/po/sr.po d-conf-0.18.0/po/sr.po --- d-conf-0.16.1/po/sr.po 2013-03-14 18:27:40.000000000 +0000 +++ d-conf-0.18.0/po/sr.po 2013-09-10 14:09:41.000000000 +0000 @@ -7,24 +7,25 @@ "Project-Id-Version: dconf\n" "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=dconf&" "keywords=I18N+L10N&component=general\n" -"POT-Creation-Date: 2012-11-24 15:52+0000\n" -"PO-Revision-Date: 2013-01-18 08:43+0200\n" +"POT-Creation-Date: 2013-08-06 16:14+0000\n" +"PO-Revision-Date: 2013-09-05 06:46+0200\n" "Last-Translator: Мирослав Николић \n" "Language-Team: Serbian \n" "Language: sr\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"Plural-Forms: nplurals=4; plural=n==1? 3 : 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.6.1\n" "X-Project-Style: gnome\n" #: ../editor/dconf-editor.desktop.in.in.h:1 ../editor/dconf-editor.vala:43 -#: ../editor/dconf-editor.vala:63 ../editor/dconf-editor.vala:394 +#: ../editor/dconf-editor.vala:62 ../editor/dconf-editor.vala:400 msgid "dconf Editor" msgstr "Уређивач д-подешавања" -#: ../editor/dconf-editor.desktop.in.in.h:2 ../editor/dconf-editor.vala:397 +#: ../editor/dconf-editor.desktop.in.in.h:2 ../editor/dconf-editor.vala:403 msgid "Directly edit your entire configuration database" msgstr "Непосредно уредите вашу базу са подешавањима" @@ -32,32 +33,32 @@ msgid "settings;configuration;" msgstr "подешавања;поставке;конфигурација;" -#: ../editor/dconf-editor.vala:180 +#: ../editor/dconf-editor.vala:186 #, c-format msgid "Integer [%s..%s]" msgstr "Цео број [%s..%s]" -#: ../editor/dconf-editor.vala:182 +#: ../editor/dconf-editor.vala:188 msgid "Boolean" msgstr "Логичка вредност" -#: ../editor/dconf-editor.vala:184 +#: ../editor/dconf-editor.vala:190 msgid "String" msgstr "Ниска" -#: ../editor/dconf-editor.vala:186 +#: ../editor/dconf-editor.vala:192 msgid "Enumeration" msgstr "Набрајање" -#: ../editor/dconf-editor.vala:234 +#: ../editor/dconf-editor.vala:240 msgid "No schema" msgstr "Нема шеме" -#: ../editor/dconf-editor.vala:344 +#: ../editor/dconf-editor.vala:350 msgid "Not found" msgstr "Нисам нашао" -#: ../editor/dconf-editor.vala:392 +#: ../editor/dconf-editor.vala:398 msgid "" "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 " @@ -90,11 +91,11 @@ "Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, " "USA“" -#: ../editor/dconf-editor.vala:398 +#: ../editor/dconf-editor.vala:404 msgid "Copyright © Canonical Ltd" msgstr "Ауторска права © Каноникал Лтд" -#: ../editor/dconf-editor.vala:402 +#: ../editor/dconf-editor.vala:408 msgid "translator-credits" msgstr "" " Мирослав Николић \n" @@ -146,8 +147,9 @@ msgstr "Следеће" #: ../editor/dconf-editor-menu.ui.h:1 -msgid "_Find" -msgstr "_Нађи" +#| msgid "_Find" +msgid "_Find…" +msgstr "_Нађи…" #: ../editor/dconf-editor-menu.ui.h:2 msgid "_About" @@ -178,6 +180,5 @@ msgstr "Опција за укључивање увећаног режима" #: ../editor/ca.desrt.dconf-editor.gschema.xml.h:6 -#| msgid "A flag to enable maximized mode" msgid "A flag to enable fullscreen mode" msgstr "Опција за укључивање режима целог екрана" diff -Nru d-conf-0.16.1/po/sr@latin.po d-conf-0.18.0/po/sr@latin.po --- d-conf-0.16.1/po/sr@latin.po 2013-03-14 18:27:40.000000000 +0000 +++ d-conf-0.18.0/po/sr@latin.po 2013-09-10 14:09:41.000000000 +0000 @@ -7,24 +7,25 @@ "Project-Id-Version: dconf\n" "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=dconf&" "keywords=I18N+L10N&component=general\n" -"POT-Creation-Date: 2012-11-24 15:52+0000\n" -"PO-Revision-Date: 2013-01-18 08:43+0200\n" +"POT-Creation-Date: 2013-08-06 16:14+0000\n" +"PO-Revision-Date: 2013-09-05 06:46+0200\n" "Last-Translator: Miroslav Nikolić \n" "Language-Team: Serbian \n" "Language: sr\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"Plural-Forms: nplurals=4; plural=n==1? 3 : 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.6.1\n" "X-Project-Style: gnome\n" #: ../editor/dconf-editor.desktop.in.in.h:1 ../editor/dconf-editor.vala:43 -#: ../editor/dconf-editor.vala:63 ../editor/dconf-editor.vala:394 +#: ../editor/dconf-editor.vala:62 ../editor/dconf-editor.vala:400 msgid "dconf Editor" msgstr "Uređivač d-podešavanja" -#: ../editor/dconf-editor.desktop.in.in.h:2 ../editor/dconf-editor.vala:397 +#: ../editor/dconf-editor.desktop.in.in.h:2 ../editor/dconf-editor.vala:403 msgid "Directly edit your entire configuration database" msgstr "Neposredno uredite vašu bazu sa podešavanjima" @@ -32,32 +33,32 @@ msgid "settings;configuration;" msgstr "podešavanja;postavke;konfiguracija;" -#: ../editor/dconf-editor.vala:180 +#: ../editor/dconf-editor.vala:186 #, c-format msgid "Integer [%s..%s]" msgstr "Ceo broj [%s..%s]" -#: ../editor/dconf-editor.vala:182 +#: ../editor/dconf-editor.vala:188 msgid "Boolean" msgstr "Logička vrednost" -#: ../editor/dconf-editor.vala:184 +#: ../editor/dconf-editor.vala:190 msgid "String" msgstr "Niska" -#: ../editor/dconf-editor.vala:186 +#: ../editor/dconf-editor.vala:192 msgid "Enumeration" msgstr "Nabrajanje" -#: ../editor/dconf-editor.vala:234 +#: ../editor/dconf-editor.vala:240 msgid "No schema" msgstr "Nema šeme" -#: ../editor/dconf-editor.vala:344 +#: ../editor/dconf-editor.vala:350 msgid "Not found" msgstr "Nisam našao" -#: ../editor/dconf-editor.vala:392 +#: ../editor/dconf-editor.vala:398 msgid "" "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 " @@ -90,11 +91,11 @@ "Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, " "USA“" -#: ../editor/dconf-editor.vala:398 +#: ../editor/dconf-editor.vala:404 msgid "Copyright © Canonical Ltd" msgstr "Autorska prava © Kanonikal Ltd" -#: ../editor/dconf-editor.vala:402 +#: ../editor/dconf-editor.vala:408 msgid "translator-credits" msgstr "" " Miroslav Nikolić \n" @@ -146,8 +147,9 @@ msgstr "Sledeće" #: ../editor/dconf-editor-menu.ui.h:1 -msgid "_Find" -msgstr "_Nađi" +#| msgid "_Find" +msgid "_Find…" +msgstr "_Nađi…" #: ../editor/dconf-editor-menu.ui.h:2 msgid "_About" @@ -178,6 +180,5 @@ msgstr "Opcija za uključivanje uvećanog režima" #: ../editor/ca.desrt.dconf-editor.gschema.xml.h:6 -#| msgid "A flag to enable maximized mode" msgid "A flag to enable fullscreen mode" msgstr "Opcija za uključivanje režima celog ekrana" diff -Nru d-conf-0.16.1/po/tg.po d-conf-0.18.0/po/tg.po --- d-conf-0.16.1/po/tg.po 2013-07-16 16:20:20.000000000 +0000 +++ d-conf-0.18.0/po/tg.po 2013-09-10 14:09:41.000000000 +0000 @@ -8,55 +8,55 @@ "Project-Id-Version: Tajik Gnome\n" "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?" "product=dconf&keywords=I18N+L10N&component=general\n" -"POT-Creation-Date: 2013-01-18 07:47+0000\n" -"PO-Revision-Date: 2013-01-19 17:41+0500\n" +"POT-Creation-Date: 2013-07-12 14:34+0000\n" +"PO-Revision-Date: 2013-07-30 22:50-0000\n" "Last-Translator: Victor Ibragimov \n" "Language-Team: \n" "Language: Tajik\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" +"X-Generator: Poedit 1.5.7\n" #: ../editor/dconf-editor.desktop.in.in.h:1 ../editor/dconf-editor.vala:43 -#: ../editor/dconf-editor.vala:63 ../editor/dconf-editor.vala:394 +#: ../editor/dconf-editor.vala:62 ../editor/dconf-editor.vala:400 msgid "dconf Editor" msgstr "Муҳаррири dconf" -#: ../editor/dconf-editor.desktop.in.in.h:2 ../editor/dconf-editor.vala:397 +#: ../editor/dconf-editor.desktop.in.in.h:2 ../editor/dconf-editor.vala:403 msgid "Directly edit your entire configuration database" -msgstr "" +msgstr "Тамоми пойгоҳи иттилооти танзимоти худро бевосита таҳрир кунед" #: ../editor/dconf-editor.desktop.in.in.h:3 msgid "settings;configuration;" -msgstr "" +msgstr "танзимот;конфигуратсия;" -#: ../editor/dconf-editor.vala:180 +#: ../editor/dconf-editor.vala:186 #, c-format msgid "Integer [%s..%s]" -msgstr "" +msgstr "Адади бутун [%s..%s]" -#: ../editor/dconf-editor.vala:182 +#: ../editor/dconf-editor.vala:188 msgid "Boolean" msgstr "Қимати мантиқӣ" -#: ../editor/dconf-editor.vala:184 +#: ../editor/dconf-editor.vala:190 msgid "String" msgstr "Сатр" -#: ../editor/dconf-editor.vala:186 +#: ../editor/dconf-editor.vala:192 msgid "Enumeration" -msgstr "" +msgstr "Шуморагузорӣ" -#: ../editor/dconf-editor.vala:234 +#: ../editor/dconf-editor.vala:240 msgid "No schema" -msgstr "" +msgstr "Ягон нақша нест" -#: ../editor/dconf-editor.vala:344 +#: ../editor/dconf-editor.vala:350 msgid "Not found" msgstr "Вуҷуд надорад" -#: ../editor/dconf-editor.vala:392 +#: ../editor/dconf-editor.vala:398 msgid "" "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 " @@ -72,19 +72,33 @@ "this program; if not, write to the Free Software Foundation, Inc., 51 " "Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA" msgstr "" +"Ин нармафзор ройгон аст. Шумо метавонед онро мувофиқи шартҳои Иҷозатномаи " +"иҷтимоии умумии GNU, чи тавре ки Иҷозатномаи мазкур аз ҷониби Фонди " +"нармафзори ройнгон нашр шудааст (версияи дуюми Иҷозатнома (аз интихоби шумо) " +"ё ягон версияи охирин) пахш кунед ва/ё тағйир диҳед.\n" +"\n" +"Мо умедворем, ки шумо аз истифодабарии ин нармафзор фоида мегиред, вале мо " +"ба шумо ЯГОН КАФОЛАТ НАМЕДИҲЕМ; ҳатто барои мақсадҳои ТИҶОРӢ шумо ё ягон " +"МАҚСАДҲОИ МАХСУСИ ШУМО ягон кафолат намедиҳем. Барои маълумоти муфассал " +"Иҷозатномаи иҷтимоии умумии GNU-ро мутолиа кунед.\n" +"\n" +"Шумо бояд нусхаи Иҷозатномаи иҷтимоии умумии GNU-ро якҷоя бо ин нармафзор " +"қабул кунед. Агар қабул накунед, метавонед барои гирифтани нусхаи иҷозатнома " +"ба суроғаи мо нависед: The Free Software Foundation, Inc., 51 Franklin " +"Street, Fifth Floor, Boston, MA 02110-1301, USA" -#: ../editor/dconf-editor.vala:398 +#: ../editor/dconf-editor.vala:404 msgid "Copyright © Canonical Ltd" -msgstr "" +msgstr "Ҳуқуқи муаллиф © Canonical Ltd" -#: ../editor/dconf-editor.vala:402 +#: ../editor/dconf-editor.vala:408 msgid "translator-credits" -msgstr "" +msgstr "Victor Ibragimov" #: ../editor/dconf-view.vala:264 #, c-format msgid "Error setting value: %s" -msgstr "" +msgstr "Қимати танзими хатогӣ: %s" #. Translators: this is the column header label in the main view #: ../editor/dconf-view.vala:318 @@ -98,7 +112,7 @@ #: ../editor/dconf-editor.ui.h:1 msgid "Set to Default" -msgstr "" +msgstr "Насб кардан ба пешфарз" #: ../editor/dconf-editor.ui.h:2 msgid "Schema:" @@ -126,8 +140,9 @@ msgstr "Навбатӣ" #: ../editor/dconf-editor-menu.ui.h:1 -msgid "_Find" -msgstr "_Ёфтан" +#| msgid "_Find" +msgid "_Find…" +msgstr "_Ёфтан..." #: ../editor/dconf-editor-menu.ui.h:2 msgid "_About" @@ -143,7 +158,7 @@ #: ../editor/ca.desrt.dconf-editor.gschema.xml.h:2 msgid "The width of the main window in pixels." -msgstr "" +msgstr "Бари равзанаи асосӣ дар пикселҳо." #: ../editor/ca.desrt.dconf-editor.gschema.xml.h:3 msgid "The height of the window" @@ -151,12 +166,12 @@ #: ../editor/ca.desrt.dconf-editor.gschema.xml.h:4 msgid "The height of the main window in pixels." -msgstr "" +msgstr "Баландии равзанаи асосӣ дар пикселҳо." #: ../editor/ca.desrt.dconf-editor.gschema.xml.h:5 msgid "A flag to enable maximized mode" -msgstr "" +msgstr "Байрақча барои фаъол кардани ҳотали васеъ" #: ../editor/ca.desrt.dconf-editor.gschema.xml.h:6 msgid "A flag to enable fullscreen mode" -msgstr "" +msgstr "Байрақча барои фаъол кардани ҳотали экрани васеъ" diff -Nru d-conf-0.16.1/po/th.po d-conf-0.18.0/po/th.po --- d-conf-0.16.1/po/th.po 2013-03-14 18:27:40.000000000 +0000 +++ d-conf-0.18.0/po/th.po 2013-09-10 14:09:41.000000000 +0000 @@ -9,8 +9,8 @@ "Project-Id-Version: dconf master\n" "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?" "product=dconf&keywords=I18N+L10N&component=general\n" -"POT-Creation-Date: 2012-11-24 15:52+0000\n" -"PO-Revision-Date: 2013-01-14 18:52+0700\n" +"POT-Creation-Date: 2013-08-06 16:14+0000\n" +"PO-Revision-Date: 2013-08-14 16:38+0700\n" "Last-Translator: Theppitak Karoonboonyanan \n" "Language-Team: Thai \n" "Language: th\n" @@ -19,11 +19,11 @@ "Content-Transfer-Encoding: 8bit\n" #: ../editor/dconf-editor.desktop.in.in.h:1 ../editor/dconf-editor.vala:43 -#: ../editor/dconf-editor.vala:63 ../editor/dconf-editor.vala:394 +#: ../editor/dconf-editor.vala:62 ../editor/dconf-editor.vala:400 msgid "dconf Editor" msgstr "เครื่องมือแก้ไข dconf" -#: ../editor/dconf-editor.desktop.in.in.h:2 ../editor/dconf-editor.vala:397 +#: ../editor/dconf-editor.desktop.in.in.h:2 ../editor/dconf-editor.vala:403 msgid "Directly edit your entire configuration database" msgstr "แก้ไขฐานข้อมูลค่าตั้งของคุณทั้งหมดโดยตรง" @@ -31,32 +31,32 @@ msgid "settings;configuration;" msgstr "ค่าตั้ง;ตั้งค่า;" -#: ../editor/dconf-editor.vala:180 +#: ../editor/dconf-editor.vala:186 #, c-format msgid "Integer [%s..%s]" msgstr "จำนวนเต็ม [%s..%s]" -#: ../editor/dconf-editor.vala:182 +#: ../editor/dconf-editor.vala:188 msgid "Boolean" msgstr "บูลีน" -#: ../editor/dconf-editor.vala:184 +#: ../editor/dconf-editor.vala:190 msgid "String" msgstr "สตริง" -#: ../editor/dconf-editor.vala:186 +#: ../editor/dconf-editor.vala:192 msgid "Enumeration" msgstr "การแจงนับ" -#: ../editor/dconf-editor.vala:234 +#: ../editor/dconf-editor.vala:240 msgid "No schema" msgstr "ไม่มี schema" -#: ../editor/dconf-editor.vala:344 +#: ../editor/dconf-editor.vala:350 msgid "Not found" msgstr "ไม่พบ" -#: ../editor/dconf-editor.vala:392 +#: ../editor/dconf-editor.vala:398 msgid "" "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 " @@ -85,11 +85,11 @@ "กรุณาติดต่อไปที่ Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, " "Boston, MA 02110-1301 USA" -#: ../editor/dconf-editor.vala:398 +#: ../editor/dconf-editor.vala:404 msgid "Copyright © Canonical Ltd" msgstr "Copyright © Canonical Ltd" -#: ../editor/dconf-editor.vala:402 +#: ../editor/dconf-editor.vala:408 msgid "translator-credits" msgstr "Akom Chotiphantawanon " @@ -138,8 +138,8 @@ msgstr "ถัดไป" #: ../editor/dconf-editor-menu.ui.h:1 -msgid "_Find" -msgstr "_หา" +msgid "_Find…" +msgstr "_หา…" #: ../editor/dconf-editor-menu.ui.h:2 msgid "_About" diff -Nru d-conf-0.16.1/po/zh_HK.po d-conf-0.18.0/po/zh_HK.po --- d-conf-0.16.1/po/zh_HK.po 2013-03-14 18:27:40.000000000 +0000 +++ d-conf-0.18.0/po/zh_HK.po 2013-09-10 14:09:41.000000000 +0000 @@ -7,22 +7,22 @@ msgstr "" "Project-Id-Version: dconf master\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2013-02-04 21:26+0800\n" -"PO-Revision-Date: 2013-02-04 21:28+0800\n" +"POT-Creation-Date: 2013-08-07 12:34+0800\n" +"PO-Revision-Date: 2013-08-07 12:34+0800\n" "Last-Translator: Chao-Hsiung Liao \n" "Language-Team: Chinese (Hong Kong) \n" "Language: zh_TW\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" +"X-Generator: Poedit 1.5.5\n" #: ../editor/dconf-editor.desktop.in.in.h:1 ../editor/dconf-editor.vala:43 -#: ../editor/dconf-editor.vala:63 ../editor/dconf-editor.vala:394 +#: ../editor/dconf-editor.vala:62 ../editor/dconf-editor.vala:400 msgid "dconf Editor" msgstr "dconf 編輯器" -#: ../editor/dconf-editor.desktop.in.in.h:2 ../editor/dconf-editor.vala:397 +#: ../editor/dconf-editor.desktop.in.in.h:2 ../editor/dconf-editor.vala:403 msgid "Directly edit your entire configuration database" msgstr "直接編輯你的整個組態資料庫" @@ -30,32 +30,32 @@ msgid "settings;configuration;" msgstr "settings;configuration;設定值;組態;" -#: ../editor/dconf-editor.vala:180 +#: ../editor/dconf-editor.vala:186 #, c-format msgid "Integer [%s..%s]" msgstr "整數 [%s..%s]" -#: ../editor/dconf-editor.vala:182 +#: ../editor/dconf-editor.vala:188 msgid "Boolean" msgstr "邏輯值" -#: ../editor/dconf-editor.vala:184 +#: ../editor/dconf-editor.vala:190 msgid "String" msgstr "字串" -#: ../editor/dconf-editor.vala:186 +#: ../editor/dconf-editor.vala:192 msgid "Enumeration" msgstr "列舉" -#: ../editor/dconf-editor.vala:234 +#: ../editor/dconf-editor.vala:240 msgid "No schema" msgstr "沒有 schema" -#: ../editor/dconf-editor.vala:344 +#: ../editor/dconf-editor.vala:350 msgid "Not found" msgstr "找不到" -#: ../editor/dconf-editor.vala:392 +#: ../editor/dconf-editor.vala:398 msgid "" "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 " @@ -77,11 +77,11 @@ "\n" "你應該已經和程式一起收到一份 GNU 通用公共許可證的副本。如果還沒有，寫信給：Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA" -#: ../editor/dconf-editor.vala:398 +#: ../editor/dconf-editor.vala:404 msgid "Copyright © Canonical Ltd" msgstr "版權所有 © Canonical Ltd" -#: ../editor/dconf-editor.vala:402 +#: ../editor/dconf-editor.vala:408 msgid "translator-credits" msgstr "Chao-Hsiung Liao , 2012" @@ -130,8 +130,8 @@ msgstr "下一個" #: ../editor/dconf-editor-menu.ui.h:1 -msgid "_Find" -msgstr "尋找(_F)" +msgid "_Find…" +msgstr "尋找(_F)…" #: ../editor/dconf-editor-menu.ui.h:2 msgid "_About" diff -Nru d-conf-0.16.1/po/zh_TW.po d-conf-0.18.0/po/zh_TW.po --- d-conf-0.16.1/po/zh_TW.po 2013-03-14 18:27:40.000000000 +0000 +++ d-conf-0.18.0/po/zh_TW.po 2013-09-10 14:09:41.000000000 +0000 @@ -7,22 +7,22 @@ msgstr "" "Project-Id-Version: dconf master\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2013-02-04 21:26+0800\n" -"PO-Revision-Date: 2013-02-04 18:50+0800\n" +"POT-Creation-Date: 2013-08-07 12:34+0800\n" +"PO-Revision-Date: 2013-08-07 09:28+0800\n" "Last-Translator: Chao-Hsiung Liao \n" "Language-Team: Chinese (Taiwan) \n" "Language: zh_TW\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" +"X-Generator: Poedit 1.5.5\n" #: ../editor/dconf-editor.desktop.in.in.h:1 ../editor/dconf-editor.vala:43 -#: ../editor/dconf-editor.vala:63 ../editor/dconf-editor.vala:394 +#: ../editor/dconf-editor.vala:62 ../editor/dconf-editor.vala:400 msgid "dconf Editor" msgstr "dconf 編輯器" -#: ../editor/dconf-editor.desktop.in.in.h:2 ../editor/dconf-editor.vala:397 +#: ../editor/dconf-editor.desktop.in.in.h:2 ../editor/dconf-editor.vala:403 msgid "Directly edit your entire configuration database" msgstr "直接編輯您的整個組態資料庫" @@ -30,32 +30,32 @@ msgid "settings;configuration;" msgstr "settings;configuration;設定值;組態;" -#: ../editor/dconf-editor.vala:180 +#: ../editor/dconf-editor.vala:186 #, c-format msgid "Integer [%s..%s]" msgstr "整數 [%s..%s]" -#: ../editor/dconf-editor.vala:182 +#: ../editor/dconf-editor.vala:188 msgid "Boolean" msgstr "布林值" -#: ../editor/dconf-editor.vala:184 +#: ../editor/dconf-editor.vala:190 msgid "String" msgstr "字串" -#: ../editor/dconf-editor.vala:186 +#: ../editor/dconf-editor.vala:192 msgid "Enumeration" msgstr "列舉" -#: ../editor/dconf-editor.vala:234 +#: ../editor/dconf-editor.vala:240 msgid "No schema" msgstr "沒有 schema" -#: ../editor/dconf-editor.vala:344 +#: ../editor/dconf-editor.vala:350 msgid "Not found" msgstr "找不到" -#: ../editor/dconf-editor.vala:392 +#: ../editor/dconf-editor.vala:398 msgid "" "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 " @@ -82,11 +82,11 @@ "Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA " "02110-1301, USA" -#: ../editor/dconf-editor.vala:398 +#: ../editor/dconf-editor.vala:404 msgid "Copyright © Canonical Ltd" msgstr "版權所有 © Canonical Ltd" -#: ../editor/dconf-editor.vala:402 +#: ../editor/dconf-editor.vala:408 msgid "translator-credits" msgstr "Chao-Hsiung Liao , 2012" @@ -135,8 +135,8 @@ msgstr "下一個" #: ../editor/dconf-editor-menu.ui.h:1 -msgid "_Find" -msgstr "尋找(_F)" +msgid "_Find…" +msgstr "尋找(_F)…" #: ../editor/dconf-editor-menu.ui.h:2 msgid "_About" diff -Nru d-conf-0.16.1/service/Makefile.in d-conf-0.18.0/service/Makefile.in --- d-conf-0.16.1/service/Makefile.in 2013-07-16 16:43:49.000000000 +0000 +++ d-conf-0.18.0/service/Makefile.in 2013-09-23 21:29:29.000000000 +0000 @@ -220,6 +220,7 @@ EGREP = @EGREP@ EXEEXT = @EXEEXT@ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ +GLIB_COMPILE_RESOURCES = @GLIB_COMPILE_RESOURCES@ GLIB_COMPILE_SCHEMAS = @GLIB_COMPILE_SCHEMAS@ GMOFILES = @GMOFILES@ GMSGFMT = @GMSGFMT@ diff -Nru d-conf-0.16.1/service/dconf-blame.h d-conf-0.18.0/service/dconf-blame.h --- d-conf-0.16.1/service/dconf-blame.h 2013-07-16 16:20:20.000000000 +0000 +++ d-conf-0.18.0/service/dconf-blame.h 2013-07-17 20:01:30.000000000 +0000 @@ -34,6 +34,7 @@ #define DCONF_BLAME_GET_CLASS(inst) (G_TYPE_INSTANCE_GET_CLASS ((inst), \ DCONF_TYPE_BLAME, DConfBlameClass)) +GType dconf_blame_get_type (void); DConfBlame *dconf_blame_get (void); void dconf_blame_record (GDBusMethodInvocation *invocation); diff -Nru d-conf-0.16.1/service/dconf-generated.c d-conf-0.18.0/service/dconf-generated.c --- d-conf-0.16.1/service/dconf-generated.c 2013-07-16 16:46:04.000000000 +0000 +++ d-conf-0.18.0/service/dconf-generated.c 2013-09-23 21:29:32.000000000 +0000 @@ -1,5 +1,5 @@ /* - * Generated by gdbus-codegen 2.37.5. DO NOT EDIT. + * Generated by gdbus-codegen 2.36.3. DO NOT EDIT. * * The license of this code is the same as for the source it was derived from. */ @@ -349,9 +349,6 @@ * Virtual table for the D-Bus interface ca.desrt.dconf.Writer. */ -typedef DConfDBusWriterIface DConfDBusWriterInterface; -G_DEFINE_INTERFACE (DConfDBusWriter, dconf_dbus_writer, G_TYPE_OBJECT); - static void dconf_dbus_writer_default_init (DConfDBusWriterIface *iface) { @@ -425,6 +422,9 @@ } +typedef DConfDBusWriterIface DConfDBusWriterInterface; +G_DEFINE_INTERFACE (DConfDBusWriter, dconf_dbus_writer, G_TYPE_OBJECT); + /** * dconf_dbus_writer_emit_notify_signal: * @object: A #DConfDBusWriter. @@ -702,7 +702,6 @@ static void dconf_dbus_writer_proxy_iface_init (DConfDBusWriterIface *iface); G_DEFINE_TYPE_WITH_CODE (DConfDBusWriterProxy, dconf_dbus_writer_proxy, G_TYPE_DBUS_PROXY, - G_ADD_PRIVATE (DConfDBusWriterProxy) G_IMPLEMENT_INTERFACE (DCONF_DBUS_TYPE_WRITER, dconf_dbus_writer_proxy_iface_init)); static void @@ -717,7 +716,7 @@ dconf_dbus_writer_proxy_get_property (GObject *object, guint prop_id, GValue *value, - GParamSpec *pspec G_GNUC_UNUSED) + GParamSpec *pspec) { } @@ -725,13 +724,13 @@ dconf_dbus_writer_proxy_set_property (GObject *object, guint prop_id, const GValue *value, - GParamSpec *pspec G_GNUC_UNUSED) + GParamSpec *pspec) { } static void dconf_dbus_writer_proxy_g_signal (GDBusProxy *proxy, - const gchar *sender_name G_GNUC_UNUSED, + const gchar *sender_name, const gchar *signal_name, GVariant *parameters) { @@ -802,7 +801,7 @@ static void dconf_dbus_writer_proxy_init (DConfDBusWriterProxy *proxy) { - proxy->priv = dconf_dbus_writer_proxy_get_instance_private (proxy); + proxy->priv = G_TYPE_INSTANCE_GET_PRIVATE (proxy, DCONF_DBUS_TYPE_WRITER_PROXY, DConfDBusWriterProxyPrivate); g_dbus_proxy_set_interface_info (G_DBUS_PROXY (proxy), dconf_dbus_writer_interface_info ()); } @@ -812,6 +811,8 @@ GObjectClass *gobject_class; GDBusProxyClass *proxy_class; + g_type_class_add_private (klass, sizeof (DConfDBusWriterProxyPrivate)); + gobject_class = G_OBJECT_CLASS (klass); gobject_class->finalize = dconf_dbus_writer_proxy_finalize; gobject_class->get_property = dconf_dbus_writer_proxy_get_property; @@ -1034,9 +1035,9 @@ static void _dconf_dbus_writer_skeleton_handle_method_call ( - GDBusConnection *connection G_GNUC_UNUSED, - const gchar *sender G_GNUC_UNUSED, - const gchar *object_path G_GNUC_UNUSED, + GDBusConnection *connection, + const gchar *sender, + const gchar *object_path, const gchar *interface_name, const gchar *method_name, GVariant *parameters, @@ -1098,10 +1099,10 @@ static GVariant * _dconf_dbus_writer_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, + GDBusConnection *connection, + const gchar *sender, + const gchar *object_path, + const gchar *interface_name, const gchar *property_name, GError **error, gpointer user_data) @@ -1131,10 +1132,10 @@ static gboolean _dconf_dbus_writer_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, + GDBusConnection *connection, + const gchar *sender, + const gchar *object_path, + const gchar *interface_name, const gchar *property_name, GVariant *variant, GError **error, @@ -1175,13 +1176,13 @@ }; static GDBusInterfaceInfo * -dconf_dbus_writer_skeleton_dbus_interface_get_info (GDBusInterfaceSkeleton *skeleton G_GNUC_UNUSED) +dconf_dbus_writer_skeleton_dbus_interface_get_info (GDBusInterfaceSkeleton *skeleton) { return dconf_dbus_writer_interface_info (); } static GDBusInterfaceVTable * -dconf_dbus_writer_skeleton_dbus_interface_get_vtable (GDBusInterfaceSkeleton *skeleton G_GNUC_UNUSED) +dconf_dbus_writer_skeleton_dbus_interface_get_vtable (GDBusInterfaceSkeleton *skeleton) { return (GDBusInterfaceVTable *) &_dconf_dbus_writer_skeleton_vtable; } @@ -1250,7 +1251,6 @@ static void dconf_dbus_writer_skeleton_iface_init (DConfDBusWriterIface *iface); G_DEFINE_TYPE_WITH_CODE (DConfDBusWriterSkeleton, dconf_dbus_writer_skeleton, G_TYPE_DBUS_INTERFACE_SKELETON, - G_ADD_PRIVATE (DConfDBusWriterSkeleton) G_IMPLEMENT_INTERFACE (DCONF_DBUS_TYPE_WRITER, dconf_dbus_writer_skeleton_iface_init)); static void @@ -1268,7 +1268,7 @@ static void dconf_dbus_writer_skeleton_init (DConfDBusWriterSkeleton *skeleton) { - skeleton->priv = dconf_dbus_writer_skeleton_get_instance_private (skeleton); + skeleton->priv = G_TYPE_INSTANCE_GET_PRIVATE (skeleton, DCONF_DBUS_TYPE_WRITER_SKELETON, DConfDBusWriterSkeletonPrivate); g_mutex_init (&skeleton->priv->lock); skeleton->priv->context = g_main_context_ref_thread_default (); } @@ -1279,6 +1279,8 @@ GObjectClass *gobject_class; GDBusInterfaceSkeletonClass *skeleton_class; + g_type_class_add_private (klass, sizeof (DConfDBusWriterSkeletonPrivate)); + gobject_class = G_OBJECT_CLASS (klass); gobject_class->finalize = dconf_dbus_writer_skeleton_finalize; @@ -1418,9 +1420,6 @@ * Virtual table for the D-Bus interface ca.desrt.dconf.ServiceInfo. */ -typedef DConfDBusServiceInfoIface DConfDBusServiceInfoInterface; -G_DEFINE_INTERFACE (DConfDBusServiceInfo, dconf_dbus_service_info, G_TYPE_OBJECT); - static void dconf_dbus_service_info_default_init (DConfDBusServiceInfoIface *iface) { @@ -1449,6 +1448,9 @@ } +typedef DConfDBusServiceInfoIface DConfDBusServiceInfoInterface; +G_DEFINE_INTERFACE (DConfDBusServiceInfo, dconf_dbus_service_info, G_TYPE_OBJECT); + /** * dconf_dbus_service_info_call_blame: * @proxy: A #DConfDBusServiceInfoProxy. @@ -1591,7 +1593,6 @@ static void dconf_dbus_service_info_proxy_iface_init (DConfDBusServiceInfoIface *iface); G_DEFINE_TYPE_WITH_CODE (DConfDBusServiceInfoProxy, dconf_dbus_service_info_proxy, G_TYPE_DBUS_PROXY, - G_ADD_PRIVATE (DConfDBusServiceInfoProxy) G_IMPLEMENT_INTERFACE (DCONF_DBUS_TYPE_SERVICE_INFO, dconf_dbus_service_info_proxy_iface_init)); static void @@ -1606,7 +1607,7 @@ dconf_dbus_service_info_proxy_get_property (GObject *object, guint prop_id, GValue *value, - GParamSpec *pspec G_GNUC_UNUSED) + GParamSpec *pspec) { } @@ -1614,13 +1615,13 @@ dconf_dbus_service_info_proxy_set_property (GObject *object, guint prop_id, const GValue *value, - GParamSpec *pspec G_GNUC_UNUSED) + GParamSpec *pspec) { } static void dconf_dbus_service_info_proxy_g_signal (GDBusProxy *proxy, - const gchar *sender_name G_GNUC_UNUSED, + const gchar *sender_name, const gchar *signal_name, GVariant *parameters) { @@ -1691,7 +1692,7 @@ static void dconf_dbus_service_info_proxy_init (DConfDBusServiceInfoProxy *proxy) { - proxy->priv = dconf_dbus_service_info_proxy_get_instance_private (proxy); + proxy->priv = G_TYPE_INSTANCE_GET_PRIVATE (proxy, DCONF_DBUS_TYPE_SERVICE_INFO_PROXY, DConfDBusServiceInfoProxyPrivate); g_dbus_proxy_set_interface_info (G_DBUS_PROXY (proxy), dconf_dbus_service_info_interface_info ()); } @@ -1701,6 +1702,8 @@ GObjectClass *gobject_class; GDBusProxyClass *proxy_class; + g_type_class_add_private (klass, sizeof (DConfDBusServiceInfoProxyPrivate)); + gobject_class = G_OBJECT_CLASS (klass); gobject_class->finalize = dconf_dbus_service_info_proxy_finalize; gobject_class->get_property = dconf_dbus_service_info_proxy_get_property; @@ -1923,9 +1926,9 @@ static void _dconf_dbus_service_info_skeleton_handle_method_call ( - GDBusConnection *connection G_GNUC_UNUSED, - const gchar *sender G_GNUC_UNUSED, - const gchar *object_path G_GNUC_UNUSED, + GDBusConnection *connection, + const gchar *sender, + const gchar *object_path, const gchar *interface_name, const gchar *method_name, GVariant *parameters, @@ -1987,10 +1990,10 @@ static GVariant * _dconf_dbus_service_info_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, + GDBusConnection *connection, + const gchar *sender, + const gchar *object_path, + const gchar *interface_name, const gchar *property_name, GError **error, gpointer user_data) @@ -2020,10 +2023,10 @@ static gboolean _dconf_dbus_service_info_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, + GDBusConnection *connection, + const gchar *sender, + const gchar *object_path, + const gchar *interface_name, const gchar *property_name, GVariant *variant, GError **error, @@ -2064,13 +2067,13 @@ }; static GDBusInterfaceInfo * -dconf_dbus_service_info_skeleton_dbus_interface_get_info (GDBusInterfaceSkeleton *skeleton G_GNUC_UNUSED) +dconf_dbus_service_info_skeleton_dbus_interface_get_info (GDBusInterfaceSkeleton *skeleton) { return dconf_dbus_service_info_interface_info (); } static GDBusInterfaceVTable * -dconf_dbus_service_info_skeleton_dbus_interface_get_vtable (GDBusInterfaceSkeleton *skeleton G_GNUC_UNUSED) +dconf_dbus_service_info_skeleton_dbus_interface_get_vtable (GDBusInterfaceSkeleton *skeleton) { return (GDBusInterfaceVTable *) &_dconf_dbus_service_info_skeleton_vtable; } @@ -2111,7 +2114,6 @@ static void dconf_dbus_service_info_skeleton_iface_init (DConfDBusServiceInfoIface *iface); G_DEFINE_TYPE_WITH_CODE (DConfDBusServiceInfoSkeleton, dconf_dbus_service_info_skeleton, G_TYPE_DBUS_INTERFACE_SKELETON, - G_ADD_PRIVATE (DConfDBusServiceInfoSkeleton) G_IMPLEMENT_INTERFACE (DCONF_DBUS_TYPE_SERVICE_INFO, dconf_dbus_service_info_skeleton_iface_init)); static void @@ -2129,7 +2131,7 @@ static void dconf_dbus_service_info_skeleton_init (DConfDBusServiceInfoSkeleton *skeleton) { - skeleton->priv = dconf_dbus_service_info_skeleton_get_instance_private (skeleton); + skeleton->priv = G_TYPE_INSTANCE_GET_PRIVATE (skeleton, DCONF_DBUS_TYPE_SERVICE_INFO_SKELETON, DConfDBusServiceInfoSkeletonPrivate); g_mutex_init (&skeleton->priv->lock); skeleton->priv->context = g_main_context_ref_thread_default (); } @@ -2140,6 +2142,8 @@ GObjectClass *gobject_class; GDBusInterfaceSkeletonClass *skeleton_class; + g_type_class_add_private (klass, sizeof (DConfDBusServiceInfoSkeletonPrivate)); + gobject_class = G_OBJECT_CLASS (klass); gobject_class->finalize = dconf_dbus_service_info_skeleton_finalize; diff -Nru d-conf-0.16.1/service/dconf-generated.h d-conf-0.18.0/service/dconf-generated.h --- d-conf-0.16.1/service/dconf-generated.h 2013-07-16 16:46:04.000000000 +0000 +++ d-conf-0.18.0/service/dconf-generated.h 2013-09-23 21:29:32.000000000 +0000 @@ -1,5 +1,5 @@ /* - * Generated by gdbus-codegen 2.37.5. DO NOT EDIT. + * Generated by gdbus-codegen 2.36.3. DO NOT EDIT. * * The license of this code is the same as for the source it was derived from. */ diff -Nru d-conf-0.16.1/service/dconf-keyfile-writer.c d-conf-0.18.0/service/dconf-keyfile-writer.c --- d-conf-0.16.1/service/dconf-keyfile-writer.c 2013-07-16 16:20:20.000000000 +0000 +++ d-conf-0.18.0/service/dconf-keyfile-writer.c 2013-07-17 20:01:30.000000000 +0000 @@ -43,7 +43,7 @@ G_DEFINE_TYPE (DConfKeyfileWriter, dconf_keyfile_writer, DCONF_TYPE_WRITER) -DConfChangeset * +static DConfChangeset * dconf_keyfile_to_changeset (GKeyFile *keyfile, const gchar *filename_fyi) { diff -Nru d-conf-0.16.1/service/dconf-service.c d-conf-0.18.0/service/dconf-service.c --- d-conf-0.16.1/service/dconf-service.c 2013-07-16 16:20:20.000000000 +0000 +++ d-conf-0.18.0/service/dconf-service.c 2013-07-17 20:01:30.000000000 +0000 @@ -144,7 +144,7 @@ return string_set_free (set); } -GDBusInterfaceInfo ** +static GDBusInterfaceInfo ** dconf_service_subtree_introspect (GDBusConnection *connection, const gchar *sender, const gchar *object_path, @@ -193,7 +193,7 @@ return writer; } -const GDBusInterfaceVTable * +static const GDBusInterfaceVTable * dconf_service_subtree_dispatch (GDBusConnection *connection, const gchar *sender, const gchar *object_path, diff -Nru d-conf-0.16.1/service/dconf-writer.c d-conf-0.18.0/service/dconf-writer.c --- d-conf-0.16.1/service/dconf-writer.c 2013-07-16 16:20:20.000000000 +0000 +++ d-conf-0.18.0/service/dconf-writer.c 2013-07-17 20:01:30.000000000 +0000 @@ -223,14 +223,14 @@ g_clear_pointer (&writer->priv->uncommited_values, dconf_changeset_unref); } -gboolean +static gboolean dconf_writer_begin (DConfWriter *writer, GError **error) { return DCONF_WRITER_GET_CLASS (writer)->begin (writer, error); } -void +static void dconf_writer_change (DConfWriter *writer, DConfChangeset *changeset, const gchar *tag) @@ -238,14 +238,14 @@ DCONF_WRITER_GET_CLASS (writer)->change (writer, changeset, tag); } -gboolean +static gboolean dconf_writer_commit (DConfWriter *writer, GError **error) { return DCONF_WRITER_GET_CLASS (writer)->commit (writer, error); } -void +static void dconf_writer_end (DConfWriter *writer) { return DCONF_WRITER_GET_CLASS (writer)->end (writer); @@ -260,7 +260,8 @@ dconf_blame_record (invocation); - dconf_writer_begin (writer, &error) && dconf_writer_commit (writer, &error); + if (dconf_writer_begin (writer, &error)) + dconf_writer_commit (writer, &error); if (error) { diff -Nru d-conf-0.16.1/shm/Makefile.in d-conf-0.18.0/shm/Makefile.in --- d-conf-0.16.1/shm/Makefile.in 2013-07-16 16:43:49.000000000 +0000 +++ d-conf-0.18.0/shm/Makefile.in 2013-09-23 21:29:29.000000000 +0000 @@ -189,6 +189,7 @@ EGREP = @EGREP@ EXEEXT = @EXEEXT@ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ +GLIB_COMPILE_RESOURCES = @GLIB_COMPILE_RESOURCES@ GLIB_COMPILE_SCHEMAS = @GLIB_COMPILE_SCHEMAS@ GMOFILES = @GMOFILES@ GMSGFMT = @GMSGFMT@ diff -Nru d-conf-0.16.1/tests/Makefile.in d-conf-0.18.0/tests/Makefile.in --- d-conf-0.16.1/tests/Makefile.in 2013-07-16 16:43:49.000000000 +0000 +++ d-conf-0.18.0/tests/Makefile.in 2013-09-23 21:29:29.000000000 +0000 @@ -255,6 +255,7 @@ EGREP = @EGREP@ EXEEXT = @EXEEXT@ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ +GLIB_COMPILE_RESOURCES = @GLIB_COMPILE_RESOURCES@ GLIB_COMPILE_SCHEMAS = @GLIB_COMPILE_SCHEMAS@ GMOFILES = @GMOFILES@ GMSGFMT = @GMSGFMT@