diff -Nru gnome-taquin-3.18.1.1/aclocal.m4 gnome-taquin-3.20.2/aclocal.m4 --- gnome-taquin-3.18.1.1/aclocal.m4 2015-10-15 03:55:10.000000000 +0000 +++ gnome-taquin-3.20.2/aclocal.m4 2016-05-09 00:14:05.000000000 +0000 @@ -20,862 +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'.])]) - -dnl IT_PROG_INTLTOOL([MINIMUM-VERSION], [no-xml]) -# serial 42 IT_PROG_INTLTOOL -AC_DEFUN([IT_PROG_INTLTOOL], [ -AC_PREREQ([2.50])dnl -AC_REQUIRE([AM_NLS])dnl - -case "$am__api_version" in - 1.[01234]) - AC_MSG_ERROR([Automake 1.5 or newer is required to use intltool]) - ;; - *) - ;; -esac - -INTLTOOL_REQUIRED_VERSION_AS_INT=`echo $1 | awk -F. '{ print $ 1 * 1000 + $ 2 * 100 + $ 3; }'` -INTLTOOL_APPLIED_VERSION=`intltool-update --version | head -1 | cut -d" " -f3` -INTLTOOL_APPLIED_VERSION_AS_INT=`echo $INTLTOOL_APPLIED_VERSION | awk -F. '{ print $ 1 * 1000 + $ 2 * 100 + $ 3; }'` -if test -n "$1"; then - AC_MSG_CHECKING([for intltool >= $1]) - AC_MSG_RESULT([$INTLTOOL_APPLIED_VERSION found]) - test "$INTLTOOL_APPLIED_VERSION_AS_INT" -ge "$INTLTOOL_REQUIRED_VERSION_AS_INT" || - AC_MSG_ERROR([Your intltool is too old. You need intltool $1 or later.]) -fi - -AC_PATH_PROG(INTLTOOL_UPDATE, [intltool-update]) -AC_PATH_PROG(INTLTOOL_MERGE, [intltool-merge]) -AC_PATH_PROG(INTLTOOL_EXTRACT, [intltool-extract]) -if test -z "$INTLTOOL_UPDATE" -o -z "$INTLTOOL_MERGE" -o -z "$INTLTOOL_EXTRACT"; then - AC_MSG_ERROR([The intltool scripts were not found. Please install intltool.]) -fi - -if test -z "$AM_DEFAULT_VERBOSITY"; then - AM_DEFAULT_VERBOSITY=1 -fi -AC_SUBST([AM_DEFAULT_VERBOSITY]) - -INTLTOOL_V_MERGE='$(INTLTOOL__v_MERGE_$(V))' -INTLTOOL__v_MERGE_='$(INTLTOOL__v_MERGE_$(AM_DEFAULT_VERBOSITY))' -INTLTOOL__v_MERGE_0='@echo " ITMRG " [$]@;' -AC_SUBST(INTLTOOL_V_MERGE) -AC_SUBST(INTLTOOL__v_MERGE_) -AC_SUBST(INTLTOOL__v_MERGE_0) - -INTLTOOL_V_MERGE_OPTIONS='$(intltool__v_merge_options_$(V))' -intltool__v_merge_options_='$(intltool__v_merge_options_$(AM_DEFAULT_VERBOSITY))' -intltool__v_merge_options_0='-q' -AC_SUBST(INTLTOOL_V_MERGE_OPTIONS) -AC_SUBST(intltool__v_merge_options_) -AC_SUBST(intltool__v_merge_options_0) - - INTLTOOL_DESKTOP_RULE='%.desktop: %.desktop.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' -INTLTOOL_DIRECTORY_RULE='%.directory: %.directory.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' - INTLTOOL_KEYS_RULE='%.keys: %.keys.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -k -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' - INTLTOOL_PROP_RULE='%.prop: %.prop.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' - INTLTOOL_OAF_RULE='%.oaf: %.oaf.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -o -p $(top_srcdir)/po $< [$]@' - INTLTOOL_PONG_RULE='%.pong: %.pong.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' - INTLTOOL_SERVER_RULE='%.server: %.server.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -o -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' - INTLTOOL_SHEET_RULE='%.sheet: %.sheet.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' -INTLTOOL_SOUNDLIST_RULE='%.soundlist: %.soundlist.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' - INTLTOOL_UI_RULE='%.ui: %.ui.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' - INTLTOOL_XML_RULE='%.xml: %.xml.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' -if test "$INTLTOOL_APPLIED_VERSION_AS_INT" -ge 5000; then - INTLTOOL_XML_NOMERGE_RULE='%.xml: %.xml.in $(INTLTOOL_MERGE) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -x -u --no-translations $< [$]@' -else - INTLTOOL_XML_NOMERGE_RULE='%.xml: %.xml.in $(INTLTOOL_MERGE) ; $(INTLTOOL_V_MERGE)_it_tmp_dir=tmp.intltool.[$][$]RANDOM && mkdir [$][$]_it_tmp_dir && LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -x -u [$][$]_it_tmp_dir $< [$]@ && rmdir [$][$]_it_tmp_dir' -fi - INTLTOOL_XAM_RULE='%.xam: %.xml.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' - INTLTOOL_KBD_RULE='%.kbd: %.kbd.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -x -u -m -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' - INTLTOOL_CAVES_RULE='%.caves: %.caves.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' - INTLTOOL_SCHEMAS_RULE='%.schemas: %.schemas.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -s -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' - INTLTOOL_THEME_RULE='%.theme: %.theme.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' - INTLTOOL_SERVICE_RULE='%.service: %.service.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' - INTLTOOL_POLICY_RULE='%.policy: %.policy.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' - -_IT_SUBST(INTLTOOL_DESKTOP_RULE) -_IT_SUBST(INTLTOOL_DIRECTORY_RULE) -_IT_SUBST(INTLTOOL_KEYS_RULE) -_IT_SUBST(INTLTOOL_PROP_RULE) -_IT_SUBST(INTLTOOL_OAF_RULE) -_IT_SUBST(INTLTOOL_PONG_RULE) -_IT_SUBST(INTLTOOL_SERVER_RULE) -_IT_SUBST(INTLTOOL_SHEET_RULE) -_IT_SUBST(INTLTOOL_SOUNDLIST_RULE) -_IT_SUBST(INTLTOOL_UI_RULE) -_IT_SUBST(INTLTOOL_XAM_RULE) -_IT_SUBST(INTLTOOL_KBD_RULE) -_IT_SUBST(INTLTOOL_XML_RULE) -_IT_SUBST(INTLTOOL_XML_NOMERGE_RULE) -_IT_SUBST(INTLTOOL_CAVES_RULE) -_IT_SUBST(INTLTOOL_SCHEMAS_RULE) -_IT_SUBST(INTLTOOL_THEME_RULE) -_IT_SUBST(INTLTOOL_SERVICE_RULE) -_IT_SUBST(INTLTOOL_POLICY_RULE) - -# Check the gettext tools to make sure they are GNU -AC_PATH_PROG(XGETTEXT, xgettext) -AC_PATH_PROG(MSGMERGE, msgmerge) -AC_PATH_PROG(MSGFMT, msgfmt) -AC_PATH_PROG(GMSGFMT, gmsgfmt, $MSGFMT) -if test -z "$XGETTEXT" -o -z "$MSGMERGE" -o -z "$MSGFMT"; then - AC_MSG_ERROR([GNU gettext tools not found; required for intltool]) -fi -xgversion="`$XGETTEXT --version|grep '(GNU ' 2> /dev/null`" -mmversion="`$MSGMERGE --version|grep '(GNU ' 2> /dev/null`" -mfversion="`$MSGFMT --version|grep '(GNU ' 2> /dev/null`" -if test -z "$xgversion" -o -z "$mmversion" -o -z "$mfversion"; then - AC_MSG_ERROR([GNU gettext tools not found; required for intltool]) -fi - -AC_PATH_PROG(INTLTOOL_PERL, perl) -if test -z "$INTLTOOL_PERL"; then - AC_MSG_ERROR([perl not found]) -fi -AC_MSG_CHECKING([for perl >= 5.8.1]) -$INTLTOOL_PERL -e "use 5.8.1;" > /dev/null 2>&1 -if test $? -ne 0; then - AC_MSG_ERROR([perl 5.8.1 is required for intltool]) -else - IT_PERL_VERSION=`$INTLTOOL_PERL -e "printf '%vd', $^V"` - AC_MSG_RESULT([$IT_PERL_VERSION]) -fi -if test "x$2" != "xno-xml"; then - AC_MSG_CHECKING([for XML::Parser]) - if `$INTLTOOL_PERL -e "require XML::Parser" 2>/dev/null`; then - AC_MSG_RESULT([ok]) - else - AC_MSG_ERROR([XML::Parser perl module is required for intltool]) - fi -fi - -# Substitute ALL_LINGUAS so we can use it in po/Makefile -AC_SUBST(ALL_LINGUAS) - -IT_PO_SUBDIR([po]) - -]) - - -# IT_PO_SUBDIR(DIRNAME) -# --------------------- -# All po subdirs have to be declared with this macro; the subdir "po" is -# declared by IT_PROG_INTLTOOL. -# -AC_DEFUN([IT_PO_SUBDIR], -[AC_PREREQ([2.53])dnl We use ac_top_srcdir inside AC_CONFIG_COMMANDS. -dnl -dnl The following CONFIG_COMMANDS should be executed at the very end -dnl of config.status. -AC_CONFIG_COMMANDS_PRE([ - AC_CONFIG_COMMANDS([$1/stamp-it], [ - if [ ! grep "^# INTLTOOL_MAKEFILE$" "$1/Makefile.in" > /dev/null ]; then - AC_MSG_ERROR([$1/Makefile.in.in was not created by intltoolize.]) - fi - rm -f "$1/stamp-it" "$1/stamp-it.tmp" "$1/POTFILES" "$1/Makefile.tmp" - >"$1/stamp-it.tmp" - [sed '/^#/d - s/^[[].*] *// - /^[ ]*$/d - '"s|^| $ac_top_srcdir/|" \ - "$srcdir/$1/POTFILES.in" | sed '$!s/$/ \\/' >"$1/POTFILES" - ] - [sed '/^POTFILES =/,/[^\\]$/ { - /^POTFILES =/!d - r $1/POTFILES - } - ' "$1/Makefile.in" >"$1/Makefile"] - rm -f "$1/Makefile.tmp" - mv "$1/stamp-it.tmp" "$1/stamp-it" - ]) -])dnl -]) - -# _IT_SUBST(VARIABLE) -# ------------------- -# Abstract macro to do either _AM_SUBST_NOTMAKE or AC_SUBST -# -AC_DEFUN([_IT_SUBST], -[ -AC_SUBST([$1]) -m4_ifdef([_AM_SUBST_NOTMAKE], [_AM_SUBST_NOTMAKE([$1])]) -] -) - -# deprecated macros -AU_ALIAS([AC_PROG_INTLTOOL], [IT_PROG_INTLTOOL]) -# A hint is needed for aclocal from Automake <= 1.9.4: -# AC_DEFUN([AC_PROG_INTLTOOL], ...) - - -# nls.m4 serial 5 (gettext-0.18) -dnl Copyright (C) 1995-2003, 2005-2006, 2008-2014 Free Software Foundation, -dnl Inc. -dnl This file is free software; the Free Software Foundation -dnl gives unlimited permission to copy and/or distribute it, -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 - - -# PKG_CHECK_VAR(VARIABLE, MODULE, CONFIG-VARIABLE, -# [ACTION-IF-FOUND], [ACTION-IF-NOT-FOUND]) -# ------------------------------------------- -# Retrieves the value of the pkg-config variable for the given module. -AC_DEFUN([PKG_CHECK_VAR], -[AC_REQUIRE([PKG_PROG_PKG_CONFIG])dnl -AC_ARG_VAR([$1], [value of $3 for $2, overriding pkg-config])dnl - -_PKG_CONFIG([$1], [variable="][$3]["], [$2]) -AS_VAR_COPY([$1], [pkg_cv_][$1]) - -AS_VAR_IF([$1], [""], [$5], [$4])dnl -])# PKG_CHECK_VAR - -# appstream-xml.m4 -# -# serial 6 - -dnl APPSTREAM_XML -dnl Installs and validates AppData XML files. -dnl -dnl Call APPSTREAM_XML in configure.ac to check for the appstream-util tool. -dnl Add @APPSTREAM_XML_RULES@ to a Makefile.am to substitute the make rules. Add -dnl .appdata.xml files to appstream_XML in Makefile.am and they will be validated -dnl at make check time, if appstream-util is installed, as well as installed -dnl to the correct location automatically. Add --enable-appstream-util to -dnl DISTCHECK_CONFIGURE_FLAGS in Makefile.am to require valid AppData XML when -dnl doing a distcheck. -dnl -dnl Adding files to appstream_XML does not distribute them automatically. - -AC_DEFUN([APPSTREAM_XML], -[ - m4_pattern_allow([AM_V_GEN]) - AC_ARG_ENABLE([appstream-util], - [AS_HELP_STRING([--disable-appstream-util], - [Disable validating AppData XML files during check phase])]) - - AS_IF([test "x$enable_appstream_validate" != "xno"], - [AC_PATH_PROG([APPSTREAM_UTIL], [appstream-util]) - AS_IF([test "x$APPSTREAM_UTIL" = "x"], - [have_appstream_validate=no], - [have_appstream_validate=yes - AC_SUBST([APPSTREAM_UTIL])])], - [have_appstream_validate=no]) - - AS_IF([test "x$have_appstream_validate" != "xno"], - [appstream_validate=yes], - [appstream_validate=no - AS_IF([test "x$enable_appstream_validate" = "xyes"], - [AC_MSG_ERROR([AppData validation was requested but appstream-util was not found])])]) - - AC_SUBST([appstreamxmldir], [${datadir}/appdata]) - - APPSTREAM_XML_RULES=' -.PHONY : uninstall-appstream-xml install-appstream-xml clean-appstream-xml - -mostlyclean-am: clean-appstream-xml - -%.appdata.valid: %.appdata.xml - $(AM_V_GEN) if test -f "$<"; then d=; else d="$(srcdir)/"; fi; \ - if test -n "$(APPSTREAM_UTIL)"; \ - then $(APPSTREAM_UTIL) --nonet validate $${d}$<; fi \ - && touch [$]@ - -check-am: $(appstream_XML:.appdata.xml=.appdata.valid) -uninstall-am: uninstall-appstream-xml -install-data-am: install-appstream-xml - -.SECONDARY: $(appstream_XML) - -install-appstream-xml: $(appstream_XML) - @$(NORMAL_INSTALL) - if test -n "$^"; then \ - test -z "$(appstreamxmldir)" || $(MKDIR_P) "$(DESTDIR)$(appstreamxmldir)"; \ - $(INSTALL_DATA) $^ "$(DESTDIR)$(appstreamxmldir)"; \ - fi - -uninstall-appstream-xml: - @$(NORMAL_UNINSTALL) - @list='\''$(appstream_XML)'\''; test -n "$(appstreamxmldir)" || list=; \ - files=`for p in $$list; do echo $$p; done | sed -e '\''s|^.*/||'\''`; \ - test -n "$$files" || exit 0; \ - echo " ( cd '\''$(DESTDIR)$(appstreamxmldir)'\'' && rm -f" $$files ")"; \ - cd "$(DESTDIR)$(appstreamxmldir)" && rm -f $$files - -clean-appstream-xml: - rm -f $(appstream_XML:.appdata.xml=.appdata.valid) -' - _APPSTREAM_XML_SUBST(APPSTREAM_XML_RULES) -]) - -dnl _APPSTREAM_XML_SUBST(VARIABLE) -dnl Abstract macro to do either _AM_SUBST_NOTMAKE or AC_SUBST -AC_DEFUN([_APPSTREAM_XML_SUBST], -[ -AC_SUBST([$1]) -m4_ifdef([_AM_SUBST_NOTMAKE], [_AM_SUBST_NOTMAKE([$1])]) -] -) - -# gnome-common.m4 -# -# serial 3 -# - -AU_DEFUN([GNOME_DEBUG_CHECK], -[ - AX_CHECK_ENABLE_DEBUG([no],[GNOME_ENABLE_DEBUG]) -], -[[$0: This macro is deprecated. You should use AX_CHECK_ENABLE_DEBUG instead and -replace uses of GNOME_ENABLE_DEBUG with ENABLE_DEBUG. -See: http://www.gnu.org/software/autoconf-archive/ax_check_enable_debug.html#ax_check_enable_debug]]) - -dnl GNOME_MAINTAINER_MODE_DEFINES () -dnl define DISABLE_DEPRECATED -dnl -AU_DEFUN([GNOME_MAINTAINER_MODE_DEFINES], -[ - AC_REQUIRE([AM_MAINTAINER_MODE]) - - DISABLE_DEPRECATED="" - if test $USE_MAINTAINER_MODE = yes; then - DOMAINS="GCONF BONOBO BONOBO_UI GNOME LIBGLADE GNOME_VFS WNCK LIBSOUP" - for DOMAIN in $DOMAINS; do - DISABLE_DEPRECATED="$DISABLE_DEPRECATED -D${DOMAIN}_DISABLE_DEPRECATED -D${DOMAIN}_DISABLE_SINGLE_INCLUDES" - done - fi - - AC_SUBST(DISABLE_DEPRECATED) -], -[[$0: This macro is deprecated. All of the modules it disables deprecations for -are obsolete. Remove it and all uses of DISABLE_DEPRECATED.]]) - -dnl GLIB_GSETTINGS -dnl Defines GSETTINGS_SCHEMAS_INSTALL which controls whether -dnl the schema should be compiled -dnl - -AC_DEFUN([GLIB_GSETTINGS], -[ - m4_pattern_allow([AM_V_GEN]) - AC_ARG_ENABLE(schemas-compile, - AS_HELP_STRING([--disable-schemas-compile], - [Disable regeneration of gschemas.compiled on install]), - [case ${enableval} in - yes) GSETTINGS_DISABLE_SCHEMAS_COMPILE="" ;; - no) GSETTINGS_DISABLE_SCHEMAS_COMPILE="1" ;; - *) AC_MSG_ERROR([bad value ${enableval} for --enable-schemas-compile]) ;; - esac]) - AC_SUBST([GSETTINGS_DISABLE_SCHEMAS_COMPILE]) - PKG_PROG_PKG_CONFIG([0.16]) - AC_SUBST(gsettingsschemadir, [${datadir}/glib-2.0/schemas]) - if test x$cross_compiling != xyes; then - GLIB_COMPILE_SCHEMAS=`$PKG_CONFIG --variable glib_compile_schemas gio-2.0` - else - AC_PATH_PROG(GLIB_COMPILE_SCHEMAS, glib-compile-schemas) - fi - AC_SUBST(GLIB_COMPILE_SCHEMAS) - if test "x$GLIB_COMPILE_SCHEMAS" = "x"; then - ifelse([$2],,[AC_MSG_ERROR([glib-compile-schemas not found.])],[$2]) - else - ifelse([$1],,[:],[$1]) - fi - - GSETTINGS_RULES=' -.PHONY : uninstall-gsettings-schemas install-gsettings-schemas clean-gsettings-schemas - -mostlyclean-am: clean-gsettings-schemas - -gsettings__enum_file = $(addsuffix .enums.xml,$(gsettings_ENUM_NAMESPACE)) - -%.gschema.valid: %.gschema.xml $(gsettings__enum_file) - $(AM_V_GEN) $(GLIB_COMPILE_SCHEMAS) --strict --dry-run $(addprefix --schema-file=,$(gsettings__enum_file)) --schema-file=$< && mkdir -p [$](@D) && touch [$]@ - -all-am: $(gsettings_SCHEMAS:.xml=.valid) -uninstall-am: uninstall-gsettings-schemas -install-data-am: install-gsettings-schemas - -.SECONDARY: $(gsettings_SCHEMAS) - -install-gsettings-schemas: $(gsettings_SCHEMAS) $(gsettings__enum_file) - @$(NORMAL_INSTALL) - if test -n "$^"; then \ - test -z "$(gsettingsschemadir)" || $(MKDIR_P) "$(DESTDIR)$(gsettingsschemadir)"; \ - $(INSTALL_DATA) $^ "$(DESTDIR)$(gsettingsschemadir)"; \ - test -n "$(GSETTINGS_DISABLE_SCHEMAS_COMPILE)$(DESTDIR)" || $(GLIB_COMPILE_SCHEMAS) $(gsettingsschemadir); \ - fi - -uninstall-gsettings-schemas: - @$(NORMAL_UNINSTALL) - @list='\''$(gsettings_SCHEMAS) $(gsettings__enum_file)'\''; test -n "$(gsettingsschemadir)" || list=; \ - files=`for p in $$list; do echo $$p; done | sed -e '\''s|^.*/||'\''`; \ - test -n "$$files" || exit 0; \ - echo " ( cd '\''$(DESTDIR)$(gsettingsschemadir)'\'' && rm -f" $$files ")"; \ - cd "$(DESTDIR)$(gsettingsschemadir)" && rm -f $$files - test -n "$(GSETTINGS_DISABLE_SCHEMAS_COMPILE)$(DESTDIR)" || $(GLIB_COMPILE_SCHEMAS) $(gsettingsschemadir) - -clean-gsettings-schemas: - rm -f $(gsettings_SCHEMAS:.xml=.valid) $(gsettings__enum_file) - -ifdef gsettings_ENUM_NAMESPACE -$(gsettings__enum_file): $(gsettings_ENUM_FILES) - $(AM_V_GEN) glib-mkenums --comments '\'''\'' --fhead "" --vhead " <@type@ id='\''$(gsettings_ENUM_NAMESPACE).@EnumName@'\''>" --vprod " " --vtail " " --ftail "" [$]^ > [$]@.tmp && mv [$]@.tmp [$]@ -endif -' - _GSETTINGS_SUBST(GSETTINGS_RULES) -]) - -dnl _GSETTINGS_SUBST(VARIABLE) -dnl Abstract macro to do either _AM_SUBST_NOTMAKE or AC_SUBST -AC_DEFUN([_GSETTINGS_SUBST], -[ -AC_SUBST([$1]) -m4_ifdef([_AM_SUBST_NOTMAKE], [_AM_SUBST_NOTMAKE([$1])]) -] -) - -AC_DEFUN([YELP_HELP_INIT], -[ -AC_REQUIRE([AC_PROG_LN_S]) -m4_pattern_allow([AM_V_at]) -m4_pattern_allow([AM_V_GEN]) -m4_pattern_allow([AM_DEFAULT_VERBOSITY]) - -YELP_LC_MEDIA_LINKS=true -YELP_LC_DIST=true - -for yelpopt in [$1]; do - case $yelpopt in - lc-media-links) YELP_LC_MEDIA_LINKS=true ;; - no-lc-media-links) YELP_LC_MEDIA_LINKS= ;; - lc-dist) YELP_LC_DIST=true ;; - no-lc-dist) YELP_LC_DIST= ;; - *) AC_MSG_ERROR([Unrecognized [YELP_HELP_INIT] option $yelpopt"]) ;; - esac -done; -AC_SUBST([YELP_LC_MEDIA_LINKS]) -AC_SUBST([YELP_LC_DIST]) - -AC_ARG_WITH([help-dir], - AS_HELP_STRING([--with-help-dir=DIR], - [path where help files are installed]),, - [with_help_dir='${datadir}/help']) -HELP_DIR="$with_help_dir" -AC_SUBST(HELP_DIR) - -AC_ARG_VAR([ITSTOOL], [Path to the `itstool` command]) -AC_CHECK_PROG([ITSTOOL], [itstool], [itstool]) -if test x"$ITSTOOL" = x; then - AC_MSG_ERROR([itstool not found]) -fi - -AC_ARG_VAR([XMLLINT], [Path to the `xmllint` command]) -AC_CHECK_PROG([XMLLINT], [xmllint], [xmllint]) -if test x"$XMLLINT" = x; then - AC_MSG_ERROR([xmllint not found]) -fi - -YELP_HELP_RULES=' -HELP_ID ?= -HELP_POT ?= -HELP_FILES ?= -HELP_EXTRA ?= -HELP_MEDIA ?= -HELP_LINGUAS ?= - -_HELP_LINGUAS = $(if $(filter environment,$(origin LINGUAS)),$(filter $(LINGUAS),$(HELP_LINGUAS)),$(HELP_LINGUAS)) -_HELP_POTFILE = $(if $(HELP_POT),$(HELP_POT),$(if $(HELP_ID),$(HELP_ID).pot)) -_HELP_POFILES = $(if $(HELP_ID),$(foreach lc,$(_HELP_LINGUAS),$(lc)/$(lc).po)) -_HELP_MOFILES = $(patsubst %.po,%.mo,$(_HELP_POFILES)) -_HELP_C_FILES = $(foreach f,$(HELP_FILES),C/$(f)) -_HELP_C_EXTRA = $(foreach f,$(HELP_EXTRA),C/$(f)) -_HELP_C_MEDIA = $(foreach f,$(HELP_MEDIA),C/$(f)) -_HELP_LC_FILES = $(foreach lc,$(_HELP_LINGUAS),$(foreach f,$(HELP_FILES),$(lc)/$(f))) -_HELP_LC_STAMPS = $(foreach lc,$(_HELP_LINGUAS),$(lc)/$(lc).stamp) - -_HELP_DEFAULT_V = $(if $(AM_DEFAULT_VERBOSITY),$(AM_DEFAULT_VERBOSITY),1) -_HELP_V = $(if $(V),$(V),$(_HELP_DEFAULT_V)) -_HELP_LC_VERBOSE = $(_HELP_LC_VERBOSE_$(_HELP_V)) -_HELP_LC_VERBOSE_ = $(_HELP_LC_VERBOSE_$(_HELP_DEFAULT_V)) -_HELP_LC_VERBOSE_0 = @echo " GEN "$(dir [$]@); - -all: $(_HELP_C_FILES) $(_HELP_C_EXTRA) $(_HELP_C_MEDIA) $(_HELP_LC_FILES) $(_HELP_POFILES) - -.PHONY: pot -pot: $(_HELP_POTFILE) -$(_HELP_POTFILE): $(_HELP_C_FILES) $(_HELP_C_EXTRA) $(_HELP_C_MEDIA) - $(AM_V_GEN)if test -d "C"; then d=; else d="$(srcdir)/"; fi; \ - $(ITSTOOL) -o "[$]@" $(foreach f,$(_HELP_C_FILES),"$${d}$(f)") - -.PHONY: repo -repo: $(_HELP_POTFILE) - $(AM_V_at)for po in $(_HELP_POFILES); do \ - if test "x[$](_HELP_V)" = "x0"; then echo " GEN $${po}"; fi; \ - msgmerge -q -o "$${po}" "$${po}" "$(_HELP_POTFILE)"; \ - done - -$(_HELP_POFILES): - $(AM_V_at)if ! test -d "$(dir [$]@)"; then mkdir "$(dir [$]@)"; fi - $(AM_V_at)if test ! -f "[$]@" -a -f "$(srcdir)/[$]@"; then cp "$(srcdir)/[$]@" "[$]@"; fi - $(AM_V_GEN)if ! test -f "[$]@"; then \ - (cd "$(dir [$]@)" && \ - $(ITSTOOL) -o "$(notdir [$]@).tmp" $(_HELP_C_FILES) && \ - mv "$(notdir [$]@).tmp" "$(notdir [$]@)"); \ - else \ - (cd "$(dir [$]@)" && \ - $(ITSTOOL) -o "$(notdir [$]@).tmp" $(_HELP_C_FILES) && \ - msgmerge -o "$(notdir [$]@)" "$(notdir [$]@)" "$(notdir [$]@).tmp" && \ - rm "$(notdir [$]@).tmp"); \ - fi - -$(_HELP_MOFILES): %.mo: %.po - $(AM_V_at)if ! test -d "$(dir [$]@)"; then mkdir "$(dir [$]@)"; fi - $(AM_V_GEN)msgfmt -o "[$]@" "$<" - -$(_HELP_LC_FILES): $(_HELP_LINGUAS) -$(_HELP_LINGUAS): $(_HELP_LC_STAMPS) -$(_HELP_LC_STAMPS): %.stamp: %.mo -$(_HELP_LC_STAMPS): $(_HELP_C_FILES) $(_HELP_C_EXTRA) - $(AM_V_at)if ! test -d "$(dir [$]@)"; then mkdir "$(dir [$]@)"; fi - $(_HELP_LC_VERBOSE)if test -d "C"; then d="../"; else d="$(abs_srcdir)/"; fi; \ - mo="$(dir [$]@)$(patsubst %/$(notdir [$]@),%,[$]@).mo"; \ - if test -f "$${mo}"; then mo="../$${mo}"; else mo="$(abs_srcdir)/$${mo}"; fi; \ - (cd "$(dir [$]@)" && $(ITSTOOL) -m "$${mo}" $(foreach f,$(_HELP_C_FILES),$${d}/$(f))) && \ - touch "[$]@" - -.PHONY: clean-help -mostlyclean-am: $(if $(HELP_ID),clean-help) -clean-help: - rm -f $(_HELP_LC_FILES) $(_HELP_LC_STAMPS) $(_HELP_MOFILES) - -EXTRA_DIST ?= -EXTRA_DIST += $(_HELP_C_EXTRA) $(_HELP_C_MEDIA) -EXTRA_DIST += $(if $(YELP_LC_DIST),$(foreach lc,$(HELP_LINGUAS),$(lc)/$(lc).stamp)) -EXTRA_DIST += $(foreach lc,$(HELP_LINGUAS),$(lc)/$(lc).po) -EXTRA_DIST += $(foreach f,$(HELP_MEDIA),$(foreach lc,$(HELP_LINGUAS),$(wildcard $(lc)/$(f)))) - -distdir: distdir-help-files -distdir-help-files: $(_HELP_LC_FILES) - @for lc in C $(if $(YELP_LC_DIST),$(HELP_LINGUAS)) ; do \ - $(MKDIR_P) "$(distdir)/$$lc"; \ - for file in $(HELP_FILES); do \ - if test -f "$$lc/$$file"; then d=./; else d=$(srcdir)/; fi; \ - cp -p "$$d$$lc/$$file" "$(distdir)/$$lc/" || exit 1; \ - done; \ - done; \ - -.PHONY: check-help -check: check-help -check-help: - for lc in C $(_HELP_LINGUAS); do \ - if test -d "$$lc"; \ - then d=; \ - xmlpath="$$lc"; \ - else \ - d="$(srcdir)/"; \ - xmlpath="$$lc:$(srcdir)/$$lc"; \ - fi; \ - for page in $(HELP_FILES); do \ - echo "$(XMLLINT) --noout --noent --path $$xmlpath --xinclude $$d$$lc/$$page"; \ - $(XMLLINT) --noout --noent --path "$$xmlpath" --xinclude "$$d$$lc/$$page"; \ - done; \ - done - - -.PHONY: install-help -install-data-am: $(if $(HELP_ID),install-help) -install-help: $(_HELP_LC_FILES) - @for lc in C $(_HELP_LINGUAS); do \ - $(mkinstalldirs) "$(DESTDIR)$(HELP_DIR)/$$lc/$(HELP_ID)" || exit 1; \ - done - @for lc in C $(_HELP_LINGUAS); do for f in $(HELP_FILES); do \ - if test -f "$$lc/$$f"; then d=; else d="$(srcdir)/"; fi; \ - helpdir="$(DESTDIR)$(HELP_DIR)/$$lc/$(HELP_ID)/"; \ - if ! test -d "$$helpdir"; then $(mkinstalldirs) "$$helpdir"; fi; \ - echo "$(INSTALL_DATA) $$d$$lc/$$f $$helpdir`basename $$f`"; \ - $(INSTALL_DATA) "$$d$$lc/$$f" "$$helpdir`basename $$f`" || exit 1; \ - done; done - @for f in $(_HELP_C_EXTRA); do \ - lc=`dirname "$$f"`; lc=`basename "$$lc"`; \ - if test -f "$$f"; then d=; else d="$(srcdir)/"; fi; \ - helpdir="$(DESTDIR)$(HELP_DIR)/$$lc/$(HELP_ID)/"; \ - if ! test -d "$$helpdir"; then $(mkinstalldirs) "$$helpdir"; fi; \ - echo "$(INSTALL_DATA) $$d$$f $$helpdir`basename $$f`"; \ - $(INSTALL_DATA) "$$d$$f" "$$helpdir`basename $$f`" || exit 1; \ - done - @for f in $(HELP_MEDIA); do \ - for lc in C $(_HELP_LINGUAS); do \ - if test -f "$$lc$$f"; then d=; else d="$(srcdir)/"; fi; \ - helpdir="$(DESTDIR)$(HELP_DIR)/$$lc/$(HELP_ID)/"; \ - mdir=`dirname "$$f"`; \ - if test "x$mdir" = "x."; then mdir=""; fi; \ - if ! test -d "$$helpdir$$mdir"; then $(mkinstalldirs) "$$helpdir$$mdir"; fi; \ - if test -f "$$d$$lc/$$f"; then \ - echo "$(INSTALL_DATA) $$d$$lc/$$f $$helpdir$$f"; \ - $(INSTALL_DATA) "$$d$$lc/$$f" "$$helpdir$$f" || exit 1; \ - elif test "x$$lc" != "xC"; then \ - if test "x$(YELP_LC_MEDIA_LINKS)" != "x"; then \ - echo "$(LN_S) -f $(HELP_DIR)/C/$(HELP_ID)/$$f $$helpdir$$f"; \ - $(LN_S) -f "$(HELP_DIR)/C/$(HELP_ID)/$$f" "$$helpdir$$f" || exit 1; \ - fi; \ - fi; \ - done; \ - done - -.PHONY: uninstall-help -uninstall-am: $(if $(HELP_ID),uninstall-help) -uninstall-help: - for lc in C $(_HELP_LINGUAS); do for f in $(HELP_FILES); do \ - helpdir="$(DESTDIR)$(HELP_DIR)/$$lc/$(HELP_ID)/"; \ - echo "rm -f $$helpdir`basename $$f`"; \ - rm -f "$$helpdir`basename $$f`"; \ - done; done - @for f in $(_HELP_C_EXTRA); do \ - lc=`dirname "$$f"`; lc=`basename "$$lc"`; \ - helpdir="$(DESTDIR)$(HELP_DIR)/$$lc/$(HELP_ID)/"; \ - echo "rm -f $$helpdir`basename $$f`"; \ - rm -f "$$helpdir`basename $$f`"; \ - done - @for f in $(HELP_MEDIA); do \ - for lc in C $(_HELP_LINGUAS); do \ - helpdir="$(DESTDIR)$(HELP_DIR)/$$lc/$(HELP_ID)/"; \ - echo "rm -f $$helpdir$$f"; \ - rm -f "$$helpdir$$f"; \ - done; \ - done; -' -AC_SUBST([YELP_HELP_RULES]) -m4_ifdef([_AM_SUBST_NOTMAKE], [_AM_SUBST_NOTMAKE([YELP_HELP_RULES])]) -]) - # Copyright (C) 2002-2014 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation @@ -2080,3 +1224,9 @@ m4_default([$2], [:]) fi]) +m4_include([m4/appstream-xml.m4]) +m4_include([m4/gsettings.m4]) +m4_include([m4/intltool.m4]) +m4_include([m4/nls.m4]) +m4_include([m4/pkg.m4]) +m4_include([m4/yelp.m4]) diff -Nru gnome-taquin-3.18.1.1/configure gnome-taquin-3.20.2/configure --- gnome-taquin-3.18.1.1/configure 2015-10-15 03:55:12.000000000 +0000 +++ gnome-taquin-3.20.2/configure 2016-05-09 00:14:06.000000000 +0000 @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.69 for GNOME Taquin 3.18.1.1. +# Generated by GNU Autoconf 2.69 for GNOME Taquin 3.20.2. # # Report bugs to . # @@ -639,8 +639,8 @@ # Identity of this package. PACKAGE_NAME='GNOME Taquin' PACKAGE_TARNAME='gnome-taquin' -PACKAGE_VERSION='3.18.1.1' -PACKAGE_STRING='GNOME Taquin 3.18.1.1' +PACKAGE_VERSION='3.20.2' +PACKAGE_STRING='GNOME Taquin 3.20.2' PACKAGE_BUGREPORT='https://bugzilla.gnome.org/' PACKAGE_URL='https://wiki.gnome.org/Apps/Taquin' @@ -724,7 +724,6 @@ CFLAGS CC VALAC -DISABLE_DEPRECATED MAINT MAINTAINER_MODE_FALSE MAINTAINER_MODE_TRUE @@ -1359,7 +1358,7 @@ # Omit some internal or obsolete options to make the list less imposing. # This message is too long to be a string in the A/UX 3.1 sh. cat <<_ACEOF -\`configure' configures GNOME Taquin 3.18.1.1 to adapt to many kinds of systems. +\`configure' configures GNOME Taquin 3.20.2 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1425,7 +1424,7 @@ if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of GNOME Taquin 3.18.1.1:";; + short | recursive ) echo "Configuration of GNOME Taquin 3.20.2:";; esac cat <<\_ACEOF @@ -1541,7 +1540,7 @@ test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -GNOME Taquin configure 3.18.1.1 +GNOME Taquin configure 3.20.2 generated by GNU Autoconf 2.69 Copyright (C) 2012 Free Software Foundation, Inc. @@ -1596,7 +1595,7 @@ This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by GNOME Taquin $as_me 3.18.1.1, which was +It was created by GNOME Taquin $as_me 3.20.2, which was generated by GNU Autoconf 2.69. Invocation command line was $ $0 $@ @@ -1944,6 +1943,8 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu + + am__api_version='1.15' ac_aux_dir= @@ -2459,7 +2460,7 @@ # Define the identity of the package. PACKAGE='gnome-taquin' - VERSION='3.18.1.1' + VERSION='3.20.2' cat >>confdefs.h <<_ACEOF @@ -2615,19 +2616,6 @@ - - - DISABLE_DEPRECATED="" - if test $USE_MAINTAINER_MODE = yes; then - DOMAINS="GCONF BONOBO BONOBO_UI GNOME LIBGLADE GNOME_VFS WNCK LIBSOUP" - for DOMAIN in $DOMAINS; do - DISABLE_DEPRECATED="$DISABLE_DEPRECATED -D${DOMAIN}_DISABLE_DEPRECATED -D${DOMAIN}_DISABLE_SINGLE_INCLUDES" - done - fi - - - - # Extract the first word of "valac", so it can be a program name with args. set dummy valac; ac_word=$2 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 @@ -5738,7 +5726,7 @@ # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by GNOME Taquin $as_me 3.18.1.1, which was +This file was extended by GNOME Taquin $as_me 3.20.2, which was generated by GNU Autoconf 2.69. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -5796,7 +5784,7 @@ cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`" ac_cs_version="\\ -GNOME Taquin config.status 3.18.1.1 +GNOME Taquin config.status 3.20.2 configured by $0, generated by GNU Autoconf 2.69, with options \\"\$ac_cs_config\\" diff -Nru gnome-taquin-3.18.1.1/configure.ac gnome-taquin-3.20.2/configure.ac --- gnome-taquin-3.18.1.1/configure.ac 2015-10-15 03:52:28.000000000 +0000 +++ gnome-taquin-3.20.2/configure.ac 2016-05-09 00:11:01.000000000 +0000 @@ -1,10 +1,11 @@ AC_PREREQ([2.63]) -AC_INIT([GNOME Taquin], [3.18.1.1], [https://bugzilla.gnome.org/], +AC_INIT([GNOME Taquin], [3.20.2], [https://bugzilla.gnome.org/], [gnome-taquin], [https://wiki.gnome.org/Apps/Taquin]) +AC_CONFIG_MACRO_DIR([m4]) + AM_INIT_AUTOMAKE([1.11 no-dist-gzip dist-xz foreign]) AM_SILENT_RULES([yes]) AM_MAINTAINER_MODE -GNOME_MAINTAINER_MODE_DEFINES AM_PROG_VALAC([0.27.1]) AM_PROG_CC_C_O diff -Nru gnome-taquin-3.18.1.1/COPYING.themes gnome-taquin-3.20.2/COPYING.themes --- gnome-taquin-3.18.1.1/COPYING.themes 2015-10-02 20:04:26.000000000 +0000 +++ gnome-taquin-3.20.2/COPYING.themes 2016-03-24 10:46:09.000000000 +0000 @@ -2,7 +2,15 @@ * author: Arnaud Bonatti * part of the program, same licence -cats/1-Jasmina.jpg : +cats/1-Cat_face_day.jpg +* author: Abelard (user:Abelard~commonswiki) on Wikimedia Commons + "origin" : https://commons.wikimedia.org/wiki/File:Cat_face_day.jpg + "licence" : Creative Commons Attribution-Share Alike 3.0 Unported +** summary: https://creativecommons.org/licenses/by-sa/3.0/deed.en +** complete: https://creativecommons.org/licenses/by-sa/3.0/legalcode +* changes: cropped + +cats/1-Jasmina.jpg * author: Ruskis on Wikimedia Commons "origin" : https://commons.wikimedia.org/wiki/File:Jasmina.JPG "licence" : Creative Commons Attribution-Share Alike 3.0 Unported @@ -10,12 +18,12 @@ ** complete: https://creativecommons.org/licenses/by-sa/3.0/legalcode * changes: cropped -cats/1-kitten.jpg -* author: Ola Einang from Oslo, Norway (olaeinang on Flickr) - "origin" : https://commons.wikimedia.org/wiki/File:Kitten4.jpg - "licence" : Creative Commons Attribution-Share Alike 2.0 Generic -** summary: https://creativecommons.org/licenses/by-sa/2.0/deed.en -** complete: https://creativecommons.org/licenses/by-sa/2.0/legalcode +cats/1-maine.jpg +* author: Mueller-rech.muenchen on Wikimedia Commons + "origin" : https://commons.wikimedia.org/wiki/File:Old_Maine_Coon.JPG + "licence" : Creative Commons Attribution-Share Alike 3.0 Unported +** summary: https://creativecommons.org/licenses/by-sa/3.0/deed.en +** complete: https://creativecommons.org/licenses/by-sa/3.0/legalcode * changes: cropped cats/1-march.jpg @@ -26,18 +34,8 @@ ** complete: https://creativecommons.org/licenses/by-sa/3.0/legalcode * changes: cropped -cats/1-olhos.jpg -* author: Mark J. Sebastian (markjsebastian on Flickr) - "origin" : https://commons.wikimedia.org/wiki/File:Olhos_de_um_gato.jpg - "licence" : Creative Commons Attribution-Share Alike 2.0 Generic -** summary: https://creativecommons.org/licenses/by-sa/2.0/deed.en -** complete: https://creativecommons.org/licenses/by-sa/2.0/legalcode -* changes: cropped - -cats/1-maine.jpg -* author: Mueller-rech.muenchen on Wikimedia Commons - "origin" : https://commons.wikimedia.org/wiki/File:Old_Maine_Coon.JPG - "licence" : Creative Commons Attribution-Share Alike 3.0 Unported -** summary: https://creativecommons.org/licenses/by-sa/3.0/deed.en -** complete: https://creativecommons.org/licenses/by-sa/3.0/legalcode +cats/1-Tortoiseshell.jpg +* author: Toyah on Wikimedia Commons + "origin" : https://commons.wikimedia.org/wiki/File:Tortoiseshell_she-cat.JPG + "licence" : public domain * changes: cropped diff -Nru gnome-taquin-3.18.1.1/data/gnome-taquin.6 gnome-taquin-3.20.2/data/gnome-taquin.6 --- gnome-taquin-3.18.1.1/data/gnome-taquin.6 2015-10-02 20:04:26.000000000 +0000 +++ gnome-taquin-3.20.2/data/gnome-taquin.6 2016-03-24 10:46:09.000000000 +0000 @@ -1,4 +1,4 @@ -.\" Copyright (C) 2014 Arnaud Bonatti +.\" Copyright (C) 2014-2016 Arnaud Bonatti .\" .\" This file is part of Taquin. .\" diff -Nru gnome-taquin-3.18.1.1/data/icons/hicolor/Makefile.in gnome-taquin-3.20.2/data/icons/hicolor/Makefile.in --- gnome-taquin-3.18.1.1/data/icons/hicolor/Makefile.in 2015-10-15 03:55:13.000000000 +0000 +++ gnome-taquin-3.20.2/data/icons/hicolor/Makefile.in 2016-05-09 00:14:07.000000000 +0000 @@ -88,7 +88,10 @@ POST_UNINSTALL = : subdir = data/icons/hicolor ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -am__aclocal_m4_deps = $(top_srcdir)/configure.ac +am__aclocal_m4_deps = $(top_srcdir)/m4/appstream-xml.m4 \ + $(top_srcdir)/m4/gsettings.m4 $(top_srcdir)/m4/intltool.m4 \ + $(top_srcdir)/m4/nls.m4 $(top_srcdir)/m4/pkg.m4 \ + $(top_srcdir)/m4/yelp.m4 $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) DIST_COMMON = $(srcdir)/Makefile.am $(am__DIST_COMMON) @@ -167,7 +170,6 @@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ DESKTOP_FILE_VALIDATE = @DESKTOP_FILE_VALIDATE@ -DISABLE_DEPRECATED = @DISABLE_DEPRECATED@ ECHO_C = @ECHO_C@ ECHO_N = @ECHO_N@ ECHO_T = @ECHO_T@ diff -Nru gnome-taquin-3.18.1.1/data/icons/Makefile.in gnome-taquin-3.20.2/data/icons/Makefile.in --- gnome-taquin-3.18.1.1/data/icons/Makefile.in 2015-10-15 03:55:13.000000000 +0000 +++ gnome-taquin-3.20.2/data/icons/Makefile.in 2016-05-09 00:14:07.000000000 +0000 @@ -87,7 +87,10 @@ POST_UNINSTALL = : subdir = data/icons ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -am__aclocal_m4_deps = $(top_srcdir)/configure.ac +am__aclocal_m4_deps = $(top_srcdir)/m4/appstream-xml.m4 \ + $(top_srcdir)/m4/gsettings.m4 $(top_srcdir)/m4/intltool.m4 \ + $(top_srcdir)/m4/nls.m4 $(top_srcdir)/m4/pkg.m4 \ + $(top_srcdir)/m4/yelp.m4 $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) DIST_COMMON = $(srcdir)/Makefile.am $(am__DIST_COMMON) @@ -193,7 +196,6 @@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ DESKTOP_FILE_VALIDATE = @DESKTOP_FILE_VALIDATE@ -DISABLE_DEPRECATED = @DISABLE_DEPRECATED@ ECHO_C = @ECHO_C@ ECHO_N = @ECHO_N@ ECHO_T = @ECHO_T@ diff -Nru gnome-taquin-3.18.1.1/data/Makefile.in gnome-taquin-3.20.2/data/Makefile.in --- gnome-taquin-3.18.1.1/data/Makefile.in 2015-10-15 03:55:13.000000000 +0000 +++ gnome-taquin-3.20.2/data/Makefile.in 2016-05-09 00:14:07.000000000 +0000 @@ -88,7 +88,10 @@ POST_UNINSTALL = : subdir = data ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -am__aclocal_m4_deps = $(top_srcdir)/configure.ac +am__aclocal_m4_deps = $(top_srcdir)/m4/appstream-xml.m4 \ + $(top_srcdir)/m4/gsettings.m4 $(top_srcdir)/m4/intltool.m4 \ + $(top_srcdir)/m4/nls.m4 $(top_srcdir)/m4/pkg.m4 \ + $(top_srcdir)/m4/yelp.m4 $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) DIST_COMMON = $(srcdir)/Makefile.am $(dist_noinst_DATA) \ @@ -229,7 +232,6 @@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ DESKTOP_FILE_VALIDATE = @DESKTOP_FILE_VALIDATE@ -DISABLE_DEPRECATED = @DISABLE_DEPRECATED@ ECHO_C = @ECHO_C@ ECHO_N = @ECHO_N@ ECHO_T = @ECHO_T@ diff -Nru gnome-taquin-3.18.1.1/data/org.gnome.taquin.appdata.xml.in gnome-taquin-3.20.2/data/org.gnome.taquin.appdata.xml.in --- gnome-taquin-3.18.1.1/data/org.gnome.taquin.appdata.xml.in 2015-10-02 20:04:26.000000000 +0000 +++ gnome-taquin-3.20.2/data/org.gnome.taquin.appdata.xml.in 2016-03-24 10:46:09.000000000 +0000 @@ -1,9 +1,9 @@ - + org.gnome.taquin.desktop CC0-1.0 - GPL-3.0+ and CC-BY-SA-2.0 and CC-BY-SA-3.0 + GPL-3.0+ and CC-BY-SA-3.0 and CC-BY-SA-4.0 <_name>GNOME Taquin <_summary>Slide tiles to their correct places @@ -19,6 +19,13 @@ https://git.gnome.org/browse/gnome-taquin/plain/data/appdata-screenshot.png https://wiki.gnome.org/Apps/Taquin - games-list_at_gnome.org + mcatanzaro_at_gnome.org GNOME + + AppMenu + HiDpiIcon + ModernToolkit + UserDocs + + gnome-taquin diff -Nru gnome-taquin-3.18.1.1/data/org.gnome.taquin.desktop.in gnome-taquin-3.20.2/data/org.gnome.taquin.desktop.in --- gnome-taquin-3.18.1.1/data/org.gnome.taquin.desktop.in 2015-10-15 03:50:44.000000000 +0000 +++ gnome-taquin-3.20.2/data/org.gnome.taquin.desktop.in 2016-03-24 10:46:09.000000000 +0000 @@ -1,6 +1,7 @@ [Desktop Entry] Icon=gnome-taquin _Name=Taquin +_GenericName=15-puzzle _Comment=Slide tiles to their correct places _Keywords=puzzle; Exec=gnome-taquin diff -Nru gnome-taquin-3.18.1.1/data/taquin.css gnome-taquin-3.20.2/data/taquin.css --- gnome-taquin-3.18.1.1/data/taquin.css 2015-10-02 20:04:26.000000000 +0000 +++ gnome-taquin-3.20.2/data/taquin.css 2016-03-24 10:46:09.000000000 +0000 @@ -1,20 +1,45 @@ -GtkModelButton.radio-like-toggle#radio-fifteen { +/* Copyright (C) 2015-2016 Arnaud Bonatti + * + * This file is part of GNOME Taquin. + * + * GNOME Taquin is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * GNOME Taquin 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 application. If not, see . + */ + +/* GtkXyz is pre-3.19.n */ + +GtkModelButton.radio-like-toggle#radio-fifteen, +button.radio-like-toggle#radio-fifteen { background-image: url("resource://org/gnome/taquin/images/15-Puzzle.png"); } -GtkModelButton.radio-like-toggle#radio-sixteen { +GtkModelButton.radio-like-toggle#radio-sixteen, +button.radio-like-toggle#radio-sixteen { background-image: url("resource://org/gnome/taquin/images/16-Puzzle.png"); } -GtkModelButton.radio-like-toggle { +GtkModelButton.radio-like-toggle, +button.radio-like-toggle { background-repeat: no-repeat; background-position: center 25px; color: @theme_fg_color; background-color: transparent; } -GtkModelButton.radio-like-toggle GtkLabel { +GtkModelButton.radio-like-toggle GtkLabel, +button.radio-like-toggle label { padding-bottom: 165px; } -GtkModelButton.radio-like-toggle:backdrop { +GtkModelButton.radio-like-toggle:backdrop, +button.radio-like-toggle:backdrop { color: @theme_unfocused_fg_color; } @@ -23,14 +48,23 @@ border-radius:15px; outline-radius:13px; } +button.radio-like-toggle, +button.menubutton-like-combo { + border-radius:15px; + -gtk-outline-radius:13px; +} GtkMenuButton.menubutton-like-combo:checked, -GtkMenuButton.menubutton-like-combo:prelight { +GtkMenuButton.menubutton-like-combo:prelight, +button.menubutton-like-combo:checked, +button.menubutton-like-combo:hover { color:#2e3436; /* gtk-contained.css’ theme_fg_color */ background:-gtk-gradient (radial, center center, 0, center center, 0.5, from(rgba (255, 255, 255, 1)), to(rgba (255, 255, 255, 0))); } GtkMenuButton.menubutton-like-combo:checked:backdrop, -GtkMenuButton.menubutton-like-combo:prelight:backdrop { +GtkMenuButton.menubutton-like-combo:prelight:backdrop, +button.menubutton-like-combo:checked:backdrop, +button.menubutton-like-combo:hover:backdrop { color:@theme_unfocused_fg_color; background:-gtk-gradient (radial, center center, 0, center center, 0.5, from(rgba (255, 255, 255, 0.3)), to(rgba (255, 255, 255, 0))); } Binary files /tmp/tmpqnCqLs/BuiK5h7JLu/gnome-taquin-3.18.1.1/data/themes/cats/1-Cat_face_day.jpg and /tmp/tmpqnCqLs/FauufVgtMb/gnome-taquin-3.20.2/data/themes/cats/1-Cat_face_day.jpg differ Binary files /tmp/tmpqnCqLs/BuiK5h7JLu/gnome-taquin-3.18.1.1/data/themes/cats/1-kitten.jpg and /tmp/tmpqnCqLs/FauufVgtMb/gnome-taquin-3.20.2/data/themes/cats/1-kitten.jpg differ Binary files /tmp/tmpqnCqLs/BuiK5h7JLu/gnome-taquin-3.18.1.1/data/themes/cats/1-olhos.jpg and /tmp/tmpqnCqLs/FauufVgtMb/gnome-taquin-3.20.2/data/themes/cats/1-olhos.jpg differ Binary files /tmp/tmpqnCqLs/BuiK5h7JLu/gnome-taquin-3.18.1.1/data/themes/cats/1-Tortoiseshell.jpg and /tmp/tmpqnCqLs/FauufVgtMb/gnome-taquin-3.20.2/data/themes/cats/1-Tortoiseshell.jpg differ diff -Nru gnome-taquin-3.18.1.1/data/themes/Makefile.am gnome-taquin-3.20.2/data/themes/Makefile.am --- gnome-taquin-3.18.1.1/data/themes/Makefile.am 2015-10-02 20:04:26.000000000 +0000 +++ gnome-taquin-3.20.2/data/themes/Makefile.am 2016-03-24 10:46:09.000000000 +0000 @@ -6,11 +6,11 @@ catsdir=$(datadir)/gnome-taquin/themes/cats cats_DATA = \ + cats/1-Cat_face_day.jpg \ cats/1-Jasmina.jpg \ - cats/1-kitten.jpg \ cats/1-maine.jpg \ cats/1-march.jpg \ - cats/1-olhos.jpg + cats/1-Tortoiseshell.jpg EXTRA_DIST = $(numbers_DATA) $(cats_DATA) diff -Nru gnome-taquin-3.18.1.1/data/themes/Makefile.in gnome-taquin-3.20.2/data/themes/Makefile.in --- gnome-taquin-3.18.1.1/data/themes/Makefile.in 2015-10-15 03:55:13.000000000 +0000 +++ gnome-taquin-3.20.2/data/themes/Makefile.in 2016-05-09 00:14:07.000000000 +0000 @@ -88,7 +88,10 @@ POST_UNINSTALL = : subdir = data/themes ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -am__aclocal_m4_deps = $(top_srcdir)/configure.ac +am__aclocal_m4_deps = $(top_srcdir)/m4/appstream-xml.m4 \ + $(top_srcdir)/m4/gsettings.m4 $(top_srcdir)/m4/intltool.m4 \ + $(top_srcdir)/m4/nls.m4 $(top_srcdir)/m4/pkg.m4 \ + $(top_srcdir)/m4/yelp.m4 $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) DIST_COMMON = $(srcdir)/Makefile.am $(am__DIST_COMMON) @@ -163,7 +166,6 @@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ DESKTOP_FILE_VALIDATE = @DESKTOP_FILE_VALIDATE@ -DISABLE_DEPRECATED = @DISABLE_DEPRECATED@ ECHO_C = @ECHO_C@ ECHO_N = @ECHO_N@ ECHO_T = @ECHO_T@ @@ -277,11 +279,11 @@ catsdir = $(datadir)/gnome-taquin/themes/cats cats_DATA = \ + cats/1-Cat_face_day.jpg \ cats/1-Jasmina.jpg \ - cats/1-kitten.jpg \ cats/1-maine.jpg \ cats/1-march.jpg \ - cats/1-olhos.jpg + cats/1-Tortoiseshell.jpg EXTRA_DIST = $(numbers_DATA) $(cats_DATA) all: all-am diff -Nru gnome-taquin-3.18.1.1/debian/changelog gnome-taquin-3.20.2/debian/changelog --- gnome-taquin-3.18.1.1/debian/changelog 2016-04-13 07:32:36.000000000 +0000 +++ gnome-taquin-3.20.2/debian/changelog 2016-06-16 01:27:37.000000000 +0000 @@ -1,3 +1,19 @@ +gnome-taquin (3.20.2-0ubuntu0.16.04.1) xenial; urgency=medium + + * New upstream release (LP: #1588938) + - Replace two cat photos because of license incompatibility with the + Debian Free Software Guidelines + - Fix help licensing + - Update theming for compatibility with GTK+ 3.20 (GTK+ 3.18 compatibility + is preserved.) + - Drop appdata-tag.diff patch since it's applied in new version + * Backport select packaging changes from yakkety: + - Install to /usr/games/ as per FHS and Debian policy + - Add debian/docs to install NEWS, COPYING.sounds, and COPYING.themes + - Update debian/copyright and debian/watch + + -- Jeremy Bicha Fri, 03 Jun 2016 14:09:54 -0400 + gnome-taquin (3.18.1.1-0ubuntu2) xenial; urgency=medium * debian/patches/appdata-tag.diff: Grab patch from upstream Git to add diff -Nru gnome-taquin-3.18.1.1/debian/copyright gnome-taquin-3.20.2/debian/copyright --- gnome-taquin-3.18.1.1/debian/copyright 2015-10-27 04:59:40.000000000 +0000 +++ gnome-taquin-3.20.2/debian/copyright 2016-06-16 01:27:20.000000000 +0000 @@ -1,24 +1,630 @@ -Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/ +Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/ Upstream-Name: gnome-taquin -Source: http://ftp.gnome.org/pub/GNOME/sources/gnome-taquin/ +Source: https://download.gnome.org/sources/gnome-taquin/ Files: * -Copyright: 2014-2013 Arnaud Bonatti -License: GPL-3.0+ - -License: GPL-3.0+ - This program is free software: you can redistribute it and/or modify +Copyright: 2014-2015 Arnaud Bonatti +License: GPL-3+ + +Files: data/sliding-*.ogg +Copyright: Wildfire Games +License: GPL-3+ +Comment: See COPYING.sounds + +Files: data/gameover.ogg +Copyright: GNOME Games +License: GPL-3+ +Comment: See COPYING.sounds + +Files: help/* +Copyright: Gnome Translation Project contributors +License: CC-BY-SA-4.0 + +Files: data/themes/cats/1-Cat_face_day.jpg +Copyright: Abelard (user:Abelard~commonswiki) on Wikimedia Commons +License: CC-BY-SA-3.0 +Comment: See COPYING.themes + +Files: data/themes/cats/1-Jasmina.jpg +Copyright: Ruskis on Wikimedia Commons +License: CC-BY-SA-3.0 +Comment: See COPYING.themes + +Files: data/themes/cats/1-maine.jpg +Copyright: Mueller-rech.muenchen on Wikimedia Commons +License: CC-BY-SA-3.0 +Comment: See COPYING.themes + +Files: data/themes/cats/1-march.jpg +Copyright: Alvesgaspar on Wikimedia Commons +License: CC-BY-SA-3.0 +Comment: See COPYING.themes + +Files: data/themes/cats/1-Tortoiseshell.jpg +Copyright: Toyah on Wikimedia Commons +License: public-domain + I, the copyright holder of this work, release this work into the public + domain. This applies worldwide. + . + In some countries this may not be legally possible; if so: + . + I grant anyone the right to use this work for any purpose, without any + conditions, unless such conditions are required by law. +Comment: See COPYING.themes + +Files: debian/* +Copyright: 2015 Andreas Henriksson +License: GPL-3+ + +License: GPL-3+ + Taquin is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. . - This package is distributed in the hope that it will be useful, + Taquin is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. . - You should have received a copy of the GNU General Public License - along with this program. If not, see . - . On Debian systems, the complete text of the GNU General - Public License version 3 can be found in "/usr/share/common-licenses/GPL-3". + Public License can be found in `/usr/share/common-licenses/GPL-3'. + +License: CC-BY-SA-3.0 + THE WORK (AS DEFINED BELOW) IS PROVIDED UNDER THE TERMS OF THIS + CREATIVE COMMONS PUBLIC LICENSE ("CCPL" OR "LICENSE"). THE WORK IS + PROTECTED BY COPYRIGHT AND/OR OTHER APPLICABLE LAW. ANY USE OF THE WORK + OTHER THAN AS AUTHORIZED UNDER THIS LICENSE OR COPYRIGHT LAW IS + PROHIBITED. + . + BY EXERCISING ANY RIGHTS TO THE WORK PROVIDED HERE, YOU ACCEPT AND + AGREE TO BE BOUND BY THE TERMS OF THIS LICENSE. TO THE EXTENT THIS + LICENSE MAY BE CONSIDERED TO BE A CONTRACT, THE LICENSOR GRANTS YOU THE + RIGHTS CONTAINED HERE IN CONSIDERATION OF YOUR ACCEPTANCE OF SUCH TERMS + AND CONDITIONS. + . + 1. Definitions + . + "Adaptation" means a work based upon the Work, or upon the Work and + other pre-existing works, such as a translation, adaptation, derivative + work, arrangement of music or other alterations of a literary or + artistic work, or phonogram or performance and includes cinematographic + adaptations or any other form in which the Work may be recast, + transformed, or adapted including in any form recognizably derived from + the original, except that a work that constitutes a Collection will not + be considered an Adaptation for the purpose of this License. For the + avoidance of doubt, where the Work is a musical work, performance or + phonogram, the synchronization of the Work in timed-relation with a + moving image ("synching") will be considered an Adaptation for the + purpose of this License. "Collection" means a collection of literary or + artistic works, such as encyclopedias and anthologies, or performances, + phonograms or broadcasts, or other works or subject matter other than + works listed in Section 1(f) below, which, by reason of the selection + and arrangement of their contents, constitute intellectual creations, in + which the Work is included in its entirety in unmodified form along with + one or more other contributions, each constituting separate and + independent works in themselves, which together are assembled into a + collective whole. A work that constitutes a Collection will not be + considered an Adaptation (as defined below) for the purposes of this + License. + "Creative Commons Compatible License" means a license that is listed at + https://creativecommons.org/compatiblelicenses that has been approved by + Creative Commons as being essentially equivalent to this License, + including, at a minimum, because that license: (i) contains terms that + have the same purpose, meaning and effect as the License Elements of + this License; and, (ii) explicitly permits the relicensing of + adaptations of works made available under that license under this + License or a Creative Commons jurisdiction license with the same License + Elements as this License. "Distribute" means to make available to the + public the original and copies of the Work or Adaptation, as + appropriate, through sale or other transfer of ownership. + "License Elements" means the following high-level license attributes as + selected by Licensor and indicated in the title of this License: + Attribution, ShareAlike. "Licensor" means the individual, individuals, + entity or entities that offer(s) the Work under the terms of this + License. + "Original Author" means, in the case of a literary or artistic work, + the individual, individuals, entity or entities who created the Work or + if no individual or entity can be identified, the publisher; and in + addition (i) in the case of a performance the actors, singers, + musicians, dancers, and other persons who act, sing, deliver, declaim, + play in, interpret or otherwise perform literary or artistic works or + expressions of folklore; (ii) in the case of a phonogram the producer + being the person or legal entity who first fixes the sounds of a + performance or other sounds; and, (iii) in the case of broadcasts, the + organization that transmits the broadcast. "Work" means the literary + and/or artistic work offered under the terms of this License including + without limitation any production in the literary, scientific and + artistic domain, whatever may be the mode or form of its expression + including digital form, such as a book, pamphlet and other writing; a + lecture, address, sermon or other work of the same nature; a dramatic or + dramatico-musical work; a choreographic work or entertainment in dumb + show; a musical composition with or without words; a cinematographic + work to which are assimilated works expressed by a process analogous to + cinematography; a work of drawing, painting, architecture, sculpture, + engraving or lithography; a photographic work to which are assimilated + works expressed by a process analogous to photography; a work of applied + art; an illustration, map, plan, sketch or three-dimensional work + relative to geography, topography, architecture or science; a + performance; a broadcast; a phonogram; a compilation of data to the + extent it is protected as a copyrightable work; or a work performed by a + variety or circus performer to the extent it is not otherwise considered + a literary or artistic work. + "You" means an individual or entity exercising rights under this + License who has not previously violated the terms of this License with + respect to the Work, or who has received express permission from the + Licensor to exercise rights under this License despite a previous + violation. "Publicly Perform" means to perform public recitations of + the Work and to communicate to the public those public recitations, by + any means or process, including by wire or wireless means or public + digital performances; to make available to the public Works in such a + way that members of the public may access these Works from a place and + at a place individually chosen by them; to perform the Work to the + public by any means or process and the communication to the public of + the performances of the Work, including by public digital performance; + to broadcast and rebroadcast the Work by any means including signs, + sounds or images. + "Reproduce" means to make copies of the Work by any means including + without limitation by sound or visual recordings and the right of + fixation and reproducing fixations of the Work, including storage of a + protected performance or phonogram in digital form or other electronic + medium. 2. Fair Dealing Rights. Nothing in this License is intended to + reduce, limit, or restrict any uses free from copyright or rights + arising from limitations or exceptions that are provided for in + connection with the copyright protection under copyright law or other + applicable laws. + . + 3. License Grant. Subject to the terms and conditions of this License, + Licensor hereby grants You a worldwide, royalty-free, non-exclusive, + perpetual (for the duration of the applicable copyright) license to + exercise the rights in the Work as stated below: + . + to Reproduce the Work, to incorporate the Work into one or more + Collections, and to Reproduce the Work as incorporated in the + Collections; to create and Reproduce Adaptations provided that any such + Adaptation, including any translation in any medium, takes reasonable + steps to clearly label, demarcate or otherwise identify that changes + were made to the original Work. For example, a translation could be + marked "The original work was translated from English to Spanish," or a + modification could indicate "The original work has been modified."; + to Distribute and Publicly Perform the Work including as incorporated + in Collections; and, to Distribute and Publicly Perform Adaptations. + For the avoidance of doubt: + . + Non-waivable Compulsory License Schemes. In those jurisdictions in + which the right to collect royalties through any statutory or compulsory + licensing scheme cannot be waived, the Licensor reserves the exclusive + right to collect such royalties for any exercise by You of the rights + granted under this License; Waivable Compulsory License Schemes. In + those jurisdictions in which the right to collect royalties through any + statutory or compulsory licensing scheme can be waived, the Licensor + waives the exclusive right to collect such royalties for any exercise by + You of the rights granted under this License; and, + Voluntary License Schemes. The Licensor waives the right to collect + royalties, whether individually or, in the event that the Licensor is a + member of a collecting society that administers voluntary licensing + schemes, via that society, from any exercise by You of the rights + granted under this License. The above rights may be exercised in all + media and formats whether now known or hereafter devised. The above + rights include the right to make such modifications as are technically + necessary to exercise the rights in other media and formats. Subject to + Section 8(f), all rights not expressly granted by Licensor are hereby + reserved. + . + 4. Restrictions. The license granted in Section 3 above is expressly + made subject to and limited by the following restrictions: + . + You may Distribute or Publicly Perform the Work only under the terms of + this License. You must include a copy of, or the Uniform Resource + Identifier (URI) for, this License with every copy of the Work You + Distribute or Publicly Perform. You may not offer or impose any terms on + the Work that restrict the terms of this License or the ability of the + recipient of the Work to exercise the rights granted to that recipient + under the terms of the License. You may not sublicense the Work. You + must keep intact all notices that refer to this License and to the + disclaimer of warranties with every copy of the Work You Distribute or + Publicly Perform. When You Distribute or Publicly Perform the Work, You + may not impose any effective technological measures on the Work that + restrict the ability of a recipient of the Work from You to exercise the + rights granted to that recipient under the terms of the License. This + Section 4(a) applies to the Work as incorporated in a Collection, but + this does not require the Collection apart from the Work itself to be + made subject to the terms of this License. If You create a Collection, + upon notice from any Licensor You must, to the extent practicable, + remove from the Collection any credit as required by Section 4(c), as + requested. If You create an Adaptation, upon notice from any Licensor + You must, to the extent practicable, remove from the Adaptation any + credit as required by Section 4(c), as requested. You may Distribute or + Publicly Perform an Adaptation only under the terms of: (i) this + License; (ii) a later version of this License with the same License + Elements as this License; (iii) a Creative Commons jurisdiction license + (either this or a later license version) that contains the same License + Elements as this License (e.g., Attribution-ShareAlike 3.0 US)); (iv) a + Creative Commons Compatible License. If you license the Adaptation under + one of the licenses mentioned in (iv), you must comply with the terms of + that license. If you license the Adaptation under the terms of any of + the licenses mentioned in (i), (ii) or (iii) (the "Applicable License"), + you must comply with the terms of the Applicable License generally and + the following provisions: (I) You must include a copy of, or the URI + for, the Applicable License with every copy of each Adaptation You + Distribute or Publicly Perform; (II) You may not offer or impose any + terms on the Adaptation that restrict the terms of the Applicable + License or the ability of the recipient of the Adaptation to exercise + the rights granted to that recipient under the terms of the Applicable + License; (III) You must keep intact all notices that refer to the + Applicable License and to the disclaimer of warranties with every copy + of the Work as included in the Adaptation You Distribute or Publicly + Perform; (IV) when You Distribute or Publicly Perform the Adaptation, + You may not impose any effective technological measures on the + Adaptation that restrict the ability of a recipient of the Adaptation + from You to exercise the rights granted to that recipient under the + terms of the Applicable License. This Section 4(b) applies to the + Adaptation as incorporated in a Collection, but this does not require + the Collection apart from the Adaptation itself to be made subject to + the terms of the Applicable License. + If You Distribute, or Publicly Perform the Work or any Adaptations or + Collections, You must, unless a request has been made pursuant to + Section 4(a), keep intact all copyright notices for the Work and + provide, reasonable to the medium or means You are utilizing: (i) the + name of the Original Author (or pseudonym, if applicable) if supplied, + and/or if the Original Author and/or Licensor designate another party or + parties (e.g., a sponsor institute, publishing entity, journal) for + attribution ("Attribution Parties") in Licensor's copyright notice, + terms of service or by other reasonable means, the name of such party or + parties; (ii) the title of the Work if supplied; (iii) to the extent + reasonably practicable, the URI, if any, that Licensor specifies to be + associated with the Work, unless such URI does not refer to the + copyright notice or licensing information for the Work; and (iv) , + consistent with Ssection 3(b), in the case of an Adaptation, a credit + identifying the use of the Work in the Adaptation (e.g., "French + translation of the Work by Original Author," or "Screenplay based on + original Work by Original Author"). The credit required by this Section + 4(c) may be implemented in any reasonable manner; provided, however, + that in the case of a Adaptation or Collection, at a minimum such credit + will appear, if a credit for all contributing authors of the Adaptation + or Collection appears, then as part of these credits and in a manner at + least as prominent as the credits for the other contributing authors. + For the avoidance of doubt, You may only use the credit required by this + Section for the purpose of attribution in the manner set out above and, + by exercising Your rights under this License, You may not implicitly or + explicitly assert or imply any connection with, sponsorship or + endorsement by the Original Author, Licensor and/or Attribution Parties, + as appropriate, of You or Your use of the Work, without the separate, + express prior written permission of the Original Author, Licensor and/or + Attribution Parties. Except as otherwise agreed in writing by the + Licensor or as may be otherwise permitted by applicable law, if You + Reproduce, Distribute or Publicly Perform the Work either by itself or + as part of any Adaptations or Collections, You must not distort, + mutilate, modify or take other derogatory action in relation to the Work + which would be prejudicial to the Original Author's honor or reputation. + Licensor agrees that in those jurisdictions (e.g. Japan), in which any + exercise of the right granted in Section 3(b) of this License (the right + to make Adaptations) would be deemed to be a distortion, mutilation, + modification or other derogatory action prejudicial to the Original + Author's honor and reputation, the Licensor will waive or not assert, as + appropriate, this Section, to the fullest extent permitted by the + applicable national law, to enable You to reasonably exercise Your right + under Section 3(b) of this License (right to make Adaptations) but not + otherwise. + 5. Representations, Warranties and Disclaimer + . + UNLESS OTHERWISE MUTUALLY AGREED TO BY THE PARTIES IN WRITING, LICENSOR + OFFERS THE WORK AS-IS AND MAKES NO REPRESENTATIONS OR WARRANTIES OF ANY + KIND CONCERNING THE WORK, EXPRESS, IMPLIED, STATUTORY OR OTHERWISE, + INCLUDING, WITHOUT LIMITATION, WARRANTIES OF TITLE, MERCHANTIBILITY, + FITNESS FOR A PARTICULAR PURPOSE, NONINFRINGEMENT, OR THE ABSENCE OF + LATENT OR OTHER DEFECTS, ACCURACY, OR THE PRESENCE OF ABSENCE OF ERRORS, + WHETHER OR NOT DISCOVERABLE. SOME JURISDICTIONS DO NOT ALLOW THE + EXCLUSION OF IMPLIED WARRANTIES, SO SUCH EXCLUSION MAY NOT APPLY TO YOU. + . + 6. Limitation on Liability. EXCEPT TO THE EXTENT REQUIRED BY APPLICABLE + LAW, IN NO EVENT WILL LICENSOR BE LIABLE TO YOU ON ANY LEGAL THEORY FOR + ANY SPECIAL, INCIDENTAL, CONSEQUENTIAL, PUNITIVE OR EXEMPLARY DAMAGES + ARISING OUT OF THIS LICENSE OR THE USE OF THE WORK, EVEN IF LICENSOR HAS + BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES. + . + 7. Termination + . + This License and the rights granted hereunder will terminate + automatically upon any breach by You of the terms of this License. + Individuals or entities who have received Adaptations or Collections + from You under this License, however, will not have their licenses + terminated provided such individuals or entities remain in full + compliance with those licenses. Sections 1, 2, 5, 6, 7, and 8 will + survive any termination of this License. Subject to the above terms and + conditions, the license granted here is perpetual (for the duration of + the applicable copyright in the Work). Notwithstanding the above, + Licensor reserves the right to release the Work under different license + terms or to stop distributing the Work at any time; provided, however + that any such election will not serve to withdraw this License (or any + other license that has been, or is required to be, granted under the + terms of this License), and this License will continue in full force and + effect unless terminated as stated above. + 8. Miscellaneous + . + Each time You Distribute or Publicly Perform the Work or a Collection, + the Licensor offers to the recipient a license to the Work on the same + terms and conditions as the license granted to You under this License. + Each time You Distribute or Publicly Perform an Adaptation, Licensor + offers to the recipient a license to the original Work on the same terms + and conditions as the license granted to You under this License. + If any provision of this License is invalid or unenforceable under + applicable law, it shall not affect the validity or enforceability of + the remainder of the terms of this License, and without further action + by the parties to this agreement, such provision shall be reformed to + the minimum extent necessary to make such provision valid and + enforceable. No term or provision of this License shall be deemed + waived and no breach consented to unless such waiver or consent shall be + in writing and signed by the party to be charged with such waiver or + consent. + This License constitutes the entire agreement between the parties with + respect to the Work licensed here. There are no understandings, + agreements or representations with respect to the Work not specified + here. Licensor shall not be bound by any additional provisions that may + appear in any communication from You. This License may not be modified + without the mutual written agreement of the Licensor and You. The + rights granted under, and the subject matter referenced, in this License + were drafted utilizing the terminology of the Berne Convention for the + Protection of Literary and Artistic Works (as amended on September 28, + 1979), the Rome Convention of 1961, the WIPO Copyright Treaty of 1996, + the WIPO Performances and Phonograms Treaty of 1996 and the Universal + Copyright Convention (as revised on July 24, 1971). These rights and + subject matter take effect in the relevant jurisdiction in which the + License terms are sought to be enforced according to the corresponding + provisions of the implementation of those treaty provisions in the + applicable national law. If the standard suite of rights granted under + applicable copyright law includes additional rights not granted under + this License, such additional rights are deemed to be included in the + License; this License is not intended to restrict the license of any + rights under applicable law. + +License: CC-BY-SA-4.0 + Creative Commons Attribution-ShareAlike 4.0 International Public License + . + By exercising the Licensed Rights (defined below), You accept and agree + to be bound by the terms and conditions of this Creative Commons + Attribution-ShareAlike 4.0 International Public License ("Public + License"). To the extent this Public License may be interpreted as a + contract, You are granted the Licensed Rights in consideration of Your + acceptance of these terms and conditions, and the Licensor grants You + such rights in consideration of benefits the Licensor receives from + making the Licensed Material available under these terms and conditions. + . + Section 1 – Definitions. + . + Adapted Material means material subject to Copyright and Similar Rights + that is derived from or based upon the Licensed Material and in which + the Licensed Material is translated, altered, arranged, transformed, or + otherwise modified in a manner requiring permission under the Copyright + and Similar Rights held by the Licensor. For purposes of this Public + License, where the Licensed Material is a musical work, performance, or + sound recording, Adapted Material is always produced where the Licensed + Material is synched in timed relation with a moving image. Adapter's + License means the license You apply to Your Copyright and Similar Rights + in Your contributions to Adapted Material in accordance with the terms + and conditions of this Public License. + BY-SA Compatible License means a license listed at + creativecommons.org/compatiblelicenses, approved by Creative Commons as + essentially the equivalent of this Public License. Copyright and + Similar Rights means copyright and/or similar rights closely related to + copyright including, without limitation, performance, broadcast, sound + recording, and Sui Generis Database Rights, without regard to how the + rights are labeled or categorized. For purposes of this Public License, + the rights specified in Section 2(b)(1)-(2) are not Copyright and + Similar Rights. + Effective Technological Measures means those measures that, in the + absence of proper authority, may not be circumvented under laws + fulfilling obligations under Article 11 of the WIPO Copyright Treaty + adopted on December 20, 1996, and/or similar international agreements. + Exceptions and Limitations means fair use, fair dealing, and/or any + other exception or limitation to Copyright and Similar Rights that + applies to Your use of the Licensed Material. + License Elements means the license attributes listed in the name of a + Creative Commons Public License. The License Elements of this Public + License are Attribution and ShareAlike. Licensed Material means the + artistic or literary work, database, or other material to which the + Licensor applied this Public License. + Licensed Rights means the rights granted to You subject to the terms + and conditions of this Public License, which are limited to all + Copyright and Similar Rights that apply to Your use of the Licensed + Material and that the Licensor has authority to license. Licensor means + the individual(s) or entity(ies) granting rights under this Public + License. + Share means to provide material to the public by any means or process + that requires permission under the Licensed Rights, such as + reproduction, public display, public performance, distribution, + dissemination, communication, or importation, and to make material + available to the public including in ways that members of the public may + access the material from a place and at a time individually chosen by + them. Sui Generis Database Rights means rights other than copyright + resulting from Directive 96/9/EC of the European Parliament and of the + Council of 11 March 1996 on the legal protection of databases, as + amended and/or succeeded, as well as other essentially equivalent rights + anywhere in the world. + You means the individual or entity exercising the Licensed Rights under + this Public License. Your has a corresponding meaning. + . + Section 2 – Scope. + . + License grant. + Subject to the terms and conditions of this Public License, the + Licensor hereby grants You a worldwide, royalty-free, non-sublicensable, + non-exclusive, irrevocable license to exercise the Licensed Rights in + the Licensed Material to: reproduce and Share the Licensed Material, in + whole or in part; and + produce, reproduce, and Share Adapted Material. + Exceptions and Limitations. For the avoidance of doubt, where + Exceptions and Limitations apply to Your use, this Public License does + not apply, and You do not need to comply with its terms and conditions. + Term. The term of this Public License is specified in Section 6(a). + Media and formats; technical modifications allowed. The Licensor + authorizes You to exercise the Licensed Rights in all media and formats + whether now known or hereafter created, and to make technical + modifications necessary to do so. The Licensor waives and/or agrees not + to assert any right or authority to forbid You from making technical + modifications necessary to exercise the Licensed Rights, including + technical modifications necessary to circumvent Effective Technological + Measures. For purposes of this Public License, simply making + modifications authorized by this Section 2(a)(4) never produces Adapted + Material. Downstream recipients. + Offer from the Licensor – Licensed Material. Every recipient of the + Licensed Material automatically receives an offer from the Licensor to + exercise the Licensed Rights under the terms and conditions of this + Public License. Additional offer from the Licensor – Adapted Material. + Every recipient of Adapted Material from You automatically receives an + offer from the Licensor to exercise the Licensed Rights in the Adapted + Material under the conditions of the Adapter’s License You apply. + No downstream restrictions. You may not offer or impose any additional + or different terms or conditions on, or apply any Effective + Technological Measures to, the Licensed Material if doing so restricts + exercise of the Licensed Rights by any recipient of the Licensed + Material. No endorsement. Nothing in this Public License constitutes or + may be construed as permission to assert or imply that You are, or that + Your use of the Licensed Material is, connected with, or sponsored, + endorsed, or granted official status by, the Licensor or others + designated to receive attribution as provided in Section 3(a)(1)(A)(i). + Other rights. + . + Moral rights, such as the right of integrity, are not licensed under + this Public License, nor are publicity, privacy, and/or other similar + personality rights; however, to the extent possible, the Licensor waives + and/or agrees not to assert any such rights held by the Licensor to the + limited extent necessary to allow You to exercise the Licensed Rights, + but not otherwise. Patent and trademark rights are not licensed under + this Public License. + To the extent possible, the Licensor waives any right to collect + royalties from You for the exercise of the Licensed Rights, whether + directly or through a collecting society under any voluntary or waivable + statutory or compulsory licensing scheme. In all other cases the + Licensor expressly reserves any right to collect such royalties. + . + Section 3 – License Conditions. + . + Your exercise of the Licensed Rights is expressly made subject to the + following conditions. + . + Attribution. + . + If You Share the Licensed Material (including in modified form), You must: + . + retain the following if it is supplied by the Licensor with the + Licensed Material: identification of the creator(s) of the Licensed + Material and any others designated to receive attribution, in any + reasonable manner requested by the Licensor (including by pseudonym if + designated); + a copyright notice; + a notice that refers to this Public License; + a notice that refers to the disclaimer of warranties; + a URI or hyperlink to the Licensed Material to the extent reasonably + practicable; indicate if You modified the Licensed Material and retain + an indication of any previous modifications; and + indicate the Licensed Material is licensed under this Public License, + and include the text of, or the URI or hyperlink to, this Public + License. You may satisfy the conditions in Section 3(a)(1) in any + reasonable manner based on the medium, means, and context in which You + Share the Licensed Material. For example, it may be reasonable to + satisfy the conditions by providing a URI or hyperlink to a resource + that includes the required information. + If requested by the Licensor, You must remove any of the information + required by Section 3(a)(1)(A) to the extent reasonably practicable. + ShareAlike. + In addition to the conditions in Section 3(a), if You Share Adapted + Material You produce, the following conditions also apply. + . + The Adapter’s License You apply must be a Creative Commons license with + the same License Elements, this version or later, or a BY-SA Compatible + License. You must include the text of, or the URI or hyperlink to, the + Adapter's License You apply. You may satisfy this condition in any + reasonable manner based on the medium, means, and context in which You + Share Adapted Material. + You may not offer or impose any additional or different terms or + conditions on, or apply any Effective Technological Measures to, Adapted + Material that restrict exercise of the rights granted under the + Adapter's License You apply. + . + Section 4 – Sui Generis Database Rights. + . + Where the Licensed Rights include Sui Generis Database Rights that + apply to Your use of the Licensed Material: + . + for the avoidance of doubt, Section 2(a)(1) grants You the right to + extract, reuse, reproduce, and Share all or a substantial portion of the + contents of the database; if You include all or a substantial portion of + the database contents in a database in which You have Sui Generis + Database Rights, then the database in which You have Sui Generis + Database Rights (but not its individual contents) is Adapted Material, + including for purposes of Section 3(b); and + You must comply with the conditions in Section 3(a) if You Share all or + a substantial portion of the contents of the database. For the + avoidance of doubt, this Section 4 supplements and does not replace Your + obligations under this Public License where the Licensed Rights include + other Copyright and Similar Rights. + . + Section 5 – Disclaimer of Warranties and Limitation of Liability. + . + Unless otherwise separately undertaken by the Licensor, to the extent + possible, the Licensor offers the Licensed Material as-is and + as-available, and makes no representations or warranties of any kind + concerning the Licensed Material, whether express, implied, statutory, + or other. This includes, without limitation, warranties of title, + merchantability, fitness for a particular purpose, non-infringement, + absence of latent or other defects, accuracy, or the presence or absence + of errors, whether or not known or discoverable. Where disclaimers of + warranties are not allowed in full or in part, this disclaimer may not + apply to You. To the extent possible, in no event will the Licensor be + liable to You on any legal theory (including, without limitation, + negligence) or otherwise for any direct, special, indirect, incidental, + consequential, punitive, exemplary, or other losses, costs, expenses, or + damages arising out of this Public License or use of the Licensed + Material, even if the Licensor has been advised of the possibility of + such losses, costs, expenses, or damages. Where a limitation of + liability is not allowed in full or in part, this limitation may not + apply to You. + The disclaimer of warranties and limitation of liability provided above + shall be interpreted in a manner that, to the extent possible, most + closely approximates an absolute disclaimer and waiver of all liability. + . + Section 6 – Term and Termination. + . + This Public License applies for the term of the Copyright and Similar + Rights licensed here. However, if You fail to comply with this Public + License, then Your rights under this Public License terminate + automatically. Where Your right to use the Licensed Material has + terminated under Section 6(a), it reinstates: + . + automatically as of the date the violation is cured, provided it is + cured within 30 days of Your discovery of the violation; or upon express + reinstatement by the Licensor. + For the avoidance of doubt, this Section 6(b) does not affect any right + the Licensor may have to seek remedies for Your violations of this + Public License. For the avoidance of doubt, the Licensor may also offer + the Licensed Material under separate terms or conditions or stop + distributing the Licensed Material at any time; however, doing so will + not terminate this Public License. + Sections 1, 5, 6, 7, and 8 survive termination of this Public License. + . + Section 7 – Other Terms and Conditions. + . + The Licensor shall not be bound by any additional or different terms or + conditions communicated by You unless expressly agreed. Any + arrangements, understandings, or agreements regarding the Licensed + Material not stated herein are separate from and independent of the + terms and conditions of this Public License. + . + Section 8 – Interpretation. + . + For the avoidance of doubt, this Public License does not, and shall not + be interpreted to, reduce, limit, restrict, or impose conditions on any + use of the Licensed Material that could lawfully be made without + permission under this Public License. To the extent possible, if any + provision of this Public License is deemed unenforceable, it shall be + automatically reformed to the minimum extent necessary to make it + enforceable. If the provision cannot be reformed, it shall be severed + from this Public License without affecting the enforceability of the + remaining terms and conditions. + No term or condition of this Public License will be waived and no + failure to comply consented to unless expressly agreed to by the + Licensor. Nothing in this Public License constitutes or may be + interpreted as a limitation upon, or waiver of, any privileges and + immunities that apply to the Licensor or You, including from the legal + processes of any jurisdiction or authority. diff -Nru gnome-taquin-3.18.1.1/debian/docs gnome-taquin-3.20.2/debian/docs --- gnome-taquin-3.18.1.1/debian/docs 1970-01-01 00:00:00.000000000 +0000 +++ gnome-taquin-3.20.2/debian/docs 2016-06-16 01:27:20.000000000 +0000 @@ -0,0 +1,3 @@ +COPYING.sounds +COPYING.themes +NEWS diff -Nru gnome-taquin-3.18.1.1/debian/patches/appdata-tag.diff gnome-taquin-3.20.2/debian/patches/appdata-tag.diff --- gnome-taquin-3.18.1.1/debian/patches/appdata-tag.diff 2016-04-13 07:31:53.000000000 +0000 +++ gnome-taquin-3.20.2/debian/patches/appdata-tag.diff 1970-01-01 00:00:00.000000000 +0000 @@ -1,17 +0,0 @@ -From f8fa5848b066398ede9a4cbb715bf81b2c6831d8 Mon Sep 17 00:00:00 2001 -From: Richard Hughes -Date: Mon, 25 Jan 2016 16:15:15 +0000 -Subject: Add a missing tag to the AppData file - ---- - data/org.gnome.taquin.appdata.xml.in | 1 + - 1 file changed, 1 insertion(+) - ---- a/data/org.gnome.taquin.appdata.xml.in -+++ b/data/org.gnome.taquin.appdata.xml.in -@@ -21,4 +21,5 @@ - https://wiki.gnome.org/Apps/Taquin - games-list_at_gnome.org - GNOME -+ gnome-taquin - diff -Nru gnome-taquin-3.18.1.1/debian/patches/series gnome-taquin-3.20.2/debian/patches/series --- gnome-taquin-3.18.1.1/debian/patches/series 2016-04-13 07:30:32.000000000 +0000 +++ gnome-taquin-3.20.2/debian/patches/series 1970-01-01 00:00:00.000000000 +0000 @@ -1 +0,0 @@ -appdata-tag.diff diff -Nru gnome-taquin-3.18.1.1/debian/rules gnome-taquin-3.20.2/debian/rules --- gnome-taquin-3.18.1.1/debian/rules 2015-10-27 04:59:40.000000000 +0000 +++ gnome-taquin-3.20.2/debian/rules 2016-06-16 01:27:20.000000000 +0000 @@ -1,4 +1,7 @@ #!/usr/bin/make -f %: - dh $@ --with=autoreconf + dh $@ --with autoreconf + +override_dh_auto_configure: + dh_auto_configure -- --bindir=\$${prefix}/games diff -Nru gnome-taquin-3.18.1.1/debian/watch gnome-taquin-3.20.2/debian/watch --- gnome-taquin-3.18.1.1/debian/watch 2015-10-27 04:59:40.000000000 +0000 +++ gnome-taquin-3.20.2/debian/watch 2016-06-16 01:27:20.000000000 +0000 @@ -1,3 +1,3 @@ -version=3 -http://ftp.gnome.org/pub/GNOME/sources/gnome-taquin/([\d\.]+[02468])/ \ - gnome-taquin-(.*)\.tar\.xz +version=4 +https://download.gnome.org/sources/@PACKAGE@/([\d\.]+[02468])/ \ + @PACKAGE@@ANY_VERSION@\.tar\.xz diff -Nru gnome-taquin-3.18.1.1/help/C/legal.xml gnome-taquin-3.20.2/help/C/legal.xml --- gnome-taquin-3.18.1.1/help/C/legal.xml 2015-10-02 20:04:26.000000000 +0000 +++ gnome-taquin-3.20.2/help/C/legal.xml 2016-03-24 10:46:09.000000000 +0000 @@ -1,5 +1,5 @@ + href="http://creativecommons.org/licenses/by-sa/4.0/">

This work is licensed under a Creative - Commons Attribution-ShareAlike 4.0 Unported License.

+ Commons Attribution-ShareAlike 4.0 International license.

 diff -Nru gnome-taquin-3.18.1.1/help/C/license.page gnome-taquin-3.20.2/help/C/license.page --- gnome-taquin-3.18.1.1/help/C/license.page 2015-10-02 20:04:26.000000000 +0000 +++ gnome-taquin-3.20.2/help/C/license.page 2016-03-24 10:46:09.000000000 +0000 @@ -14,8 +14,8 @@ Translators: try to use the same translation as the one provided by the CreativeCommons website. If there is no translation for your language, consider providing one to CreativeCommons. --> - This work is distributed under a CreativeCommons Attribution-Share Alike - 4.0 Unported license. + This work is distributed under a Creative Commons Attribution-ShareAlike 4.0 + International license.

You are free: @@ -53,7 +53,7 @@

For the full text of the license, see the - CreativeCommons website, - or read the full Commons Deed. + CreativeCommons website, + or read the full Commons Deed.

diff -Nru gnome-taquin-3.18.1.1/help/cs/cs.po gnome-taquin-3.20.2/help/cs/cs.po --- gnome-taquin-3.18.1.1/help/cs/cs.po 2015-10-02 20:04:26.000000000 +0000 +++ gnome-taquin-3.20.2/help/cs/cs.po 2016-03-24 10:46:09.000000000 +0000 @@ -348,8 +348,8 @@ #. (itstool) path: p/link #: C/legal.xml:3 -msgid "Creative Commons Attribution-ShareAlike 4.0 Unported License" -msgstr "Creative Commons Attribution-ShareAlike 4.0 Unported License" +msgid "Creative Commons Attribution-ShareAlike 4.0 International license" +msgstr "Creative Commons Attribution-ShareAlike 4.0 International license" #. (itstool) path: license/p #: C/legal.xml:3 @@ -369,11 +369,11 @@ #. (itstool) path: page/p #: C/license.page:12 msgid "" -"This work is distributed under a CreativeCommons Attribution-Share Alike 4.0 " -"Unported license." +"This work is distributed under a Creative Commons Attribution-ShareAlike 4.0 " +"International license." msgstr "" -"Toto dílo je šířeno pod licencí CreativeCommons Attribution-Share Alike 4.0 " -"Unported license." +"Toto dílo je šířeno pod licencí Creative Commons Attribution-ShareAlike 4.0 " +"International license." #. (itstool) path: page/p #: C/license.page:20 @@ -438,13 +438,13 @@ #: C/license.page:53 msgid "" "For the full text of the license, see the CreativeCommons websiteCreativeCommons website, or read the full Commons Deed." +"sa/4.0/\">Commons Deed." msgstr "" "Text licence v plném znění najdete na webových stránkách CreativeCommons " -"nebo si přečtěte webových stránkách CreativeCommons " +"nebo si přečtěte výtah dokumentu pro neprávníky." #. (itstool) path: page/title diff -Nru gnome-taquin-3.18.1.1/help/cs/legal.xml gnome-taquin-3.20.2/help/cs/legal.xml --- gnome-taquin-3.18.1.1/help/cs/legal.xml 2015-10-15 03:55:23.000000000 +0000 +++ gnome-taquin-3.20.2/help/cs/legal.xml 2016-05-09 00:14:10.000000000 +0000 @@ -1,4 +1,4 @@ - -

Toto dílo je šířeno pod licencí Creative Commons Attribution-ShareAlike 4.0 Unported License.

+ +

Toto dílo je šířeno pod licencí Creative Commons Attribution-ShareAlike 4.0 International license.

 diff -Nru gnome-taquin-3.18.1.1/help/cs/license.page gnome-taquin-3.20.2/help/cs/license.page --- gnome-taquin-3.18.1.1/help/cs/license.page 2015-10-15 03:55:23.000000000 +0000 +++ gnome-taquin-3.20.2/help/cs/license.page 2016-05-09 00:14:10.000000000 +0000 @@ -8,7 +8,7 @@ Licence -

Toto dílo je šířeno pod licencí CreativeCommons Attribution-Share Alike 4.0 Unported license.

+

Toto dílo je šířeno pod licencí Creative Commons Attribution-ShareAlike 4.0 International license.

Můžete volně:

@@ -31,5 +31,5 @@

Pokud dílo změníte, převedete nebo na něm založíte jiné, můžete výsledek této práce šířit pouze pod stejnou, podobnou nebo kompatibilní licencí.

 -

Text licence v plném znění najdete na webových stránkách CreativeCommons nebo si přečtěte výtah dokumentu pro neprávníky.

+

Text licence v plném znění najdete na webových stránkách CreativeCommons nebo si přečtěte výtah dokumentu pro neprávníky.

diff -Nru gnome-taquin-3.18.1.1/help/de/de.po gnome-taquin-3.20.2/help/de/de.po --- gnome-taquin-3.18.1.1/help/de/de.po 2015-10-15 03:50:55.000000000 +0000 +++ gnome-taquin-3.20.2/help/de/de.po 2016-03-24 10:46:09.000000000 +0000 @@ -354,10 +354,10 @@ #. (itstool) path: p/link #: C/legal.xml:3 -msgid "Creative Commons Attribution-ShareAlike 4.0 Unported License" +msgid "Creative Commons Attribution-ShareAlike 4.0 International license" msgstr "" "Creative Commons Namensnennung - Weitergabe unter gleichen Bedingungen 4.0 " -"Unported Lizenz" +"International Lizenz" #. (itstool) path: license/p #: C/legal.xml:3 @@ -377,11 +377,11 @@ #. (itstool) path: page/p #: C/license.page:12 msgid "" -"This work is distributed under a CreativeCommons Attribution-Share Alike 4.0 " -"Unported license." +"This work is distributed under a Creative Commons Attribution-ShareAlike 4.0 " +"International license." msgstr "" -"Dieses Werk wird unter einer CreativeCommons-Lizenz »Attribution-Share Alike " -"3.0 Unported« verbreitet." +"Dieses Werk wird unter einer Creative Commons-Lizenz »Attribution-ShareAlike " +"4.0 International« verbreitet." #. (itstool) path: page/p #: C/license.page:20 @@ -452,14 +452,14 @@ #: C/license.page:53 msgid "" "For the full text of the license, see the CreativeCommons websiteCreativeCommons website, or read the full Commons Deed." +"sa/4.0/\">Commons Deed." msgstr "" "Den vollständigen Text der Lizenz finden Sie auf der CreativeCommons-WebseiteCreativeCommons-Webseite. Oder Sie können den vollständigen Commons Deed lesen." +"org/licenses/by-sa/4.0/\">Commons Deed lesen." #. (itstool) path: page/title #: C/shortcuts.page:18 diff -Nru gnome-taquin-3.18.1.1/help/de/legal.xml gnome-taquin-3.20.2/help/de/legal.xml --- gnome-taquin-3.18.1.1/help/de/legal.xml 2015-10-15 03:55:23.000000000 +0000 +++ gnome-taquin-3.20.2/help/de/legal.xml 2016-05-09 00:14:10.000000000 +0000 @@ -1,4 +1,4 @@ - -

Dieses Werk wird unter einer Creative Commons Namensnennung - Weitergabe unter gleichen Bedingungen 4.0 Unported Lizenz verbreitet.

+ +

Dieses Werk wird unter einer Creative Commons Namensnennung - Weitergabe unter gleichen Bedingungen 4.0 International Lizenz verbreitet.

 diff -Nru gnome-taquin-3.18.1.1/help/de/license.page gnome-taquin-3.20.2/help/de/license.page --- gnome-taquin-3.18.1.1/help/de/license.page 2015-10-15 03:55:23.000000000 +0000 +++ gnome-taquin-3.20.2/help/de/license.page 2016-05-09 00:14:10.000000000 +0000 @@ -20,7 +20,7 @@ Nutzungsbedingungen - Lizenz -

Dieses Werk wird unter einer CreativeCommons-Lizenz »Attribution-Share Alike 3.0 Unported« verbreitet.

+

Dieses Werk wird unter einer Creative Commons-Lizenz »Attribution-ShareAlike 4.0 International« verbreitet.

Es ist Ihnen gestattet:

@@ -43,5 +43,5 @@

Wenn Sie das lizenzierte Werk bzw. den lizenzierten Inhalt bearbeiten, abwandeln oder in anderer Weise erkennbar als Grundlage für eigenes Schaffen verwenden, dürfen Sie die daraufhin neu entstandenen Werke bzw. Inhalte nur unter Verwendung von Lizenzbedingungen weitergeben, die mit denen dieses Lizenzvertrages identisch, vergleichbar oder kompatibel sind.

 -

Den vollständigen Text der Lizenz finden Sie auf der CreativeCommons-Webseite. Oder Sie können den vollständigen Commons Deed lesen.

+

Den vollständigen Text der Lizenz finden Sie auf der CreativeCommons-Webseite. Oder Sie können den vollständigen Commons Deed lesen.

diff -Nru gnome-taquin-3.18.1.1/help/el/el.po gnome-taquin-3.20.2/help/el/el.po --- gnome-taquin-3.18.1.1/help/el/el.po 2015-10-02 20:04:26.000000000 +0000 +++ gnome-taquin-3.20.2/help/el/el.po 2016-03-24 10:46:09.000000000 +0000 @@ -360,8 +360,8 @@ #. (itstool) path: p/link #: C/legal.xml:3 -msgid "Creative Commons Attribution-ShareAlike 4.0 Unported License" -msgstr "Άδεια Creative Commons Attribution-ShareAlike 4.0 Unported" +msgid "Creative Commons Attribution-ShareAlike 4.0 International license" +msgstr "Άδεια Creative Commons Attribution-ShareAlike 4.0 International" #. (itstool) path: license/p #: C/legal.xml:3 @@ -381,11 +381,11 @@ #. (itstool) path: page/p #: C/license.page:12 msgid "" -"This work is distributed under a CreativeCommons Attribution-Share Alike 4.0 " -"Unported license." +"This work is distributed under a Creative Commons Attribution-ShareAlike 4.0 " +"International license." msgstr "" -"Το έργο διανέμεται υπό τους όρους της άδειας CreativeCommons Attribution-" -"Share Alike 4.0 Unported." +"Το έργο διανέμεται υπό τους όρους της άδειας Creative Commons Attribution-" +"ShareAlike 4.0 International." #. (itstool) path: page/p #: C/license.page:20 @@ -451,14 +451,14 @@ #: C/license.page:53 msgid "" "For the full text of the license, see the CreativeCommons websiteCreativeCommons website, or read the full Commons Deed." +"sa/4.0/\">Commons Deed." msgstr "" "Για το πλήρες κείμενο της άδειας, δείτε τον ιστότοπο CreativeCommonsιστότοπο CreativeCommons, ή διαβάστε όλη την Πράξη Commons." +"by-sa/4.0/\">Πράξη Commons." #. (itstool) path: page/title #: C/shortcuts.page:18 diff -Nru gnome-taquin-3.18.1.1/help/el/legal.xml gnome-taquin-3.20.2/help/el/legal.xml --- gnome-taquin-3.18.1.1/help/el/legal.xml 2015-10-15 03:55:22.000000000 +0000 +++ gnome-taquin-3.20.2/help/el/legal.xml 2016-05-09 00:14:10.000000000 +0000 @@ -1,4 +1,4 @@ - -

Αυτό το έργο έχει αδειοδοτηθεί υπό την Άδεια Creative Commons Attribution-ShareAlike 4.0 Unported.

+ +

Αυτό το έργο έχει αδειοδοτηθεί υπό την Άδεια Creative Commons Attribution-ShareAlike 4.0 International.

 diff -Nru gnome-taquin-3.18.1.1/help/el/license.page gnome-taquin-3.20.2/help/el/license.page --- gnome-taquin-3.18.1.1/help/el/license.page 2015-10-15 03:55:23.000000000 +0000 +++ gnome-taquin-3.20.2/help/el/license.page 2016-05-09 00:14:10.000000000 +0000 @@ -20,7 +20,7 @@ Άδεια -

Το έργο διανέμεται υπό τους όρους της άδειας CreativeCommons Attribution-Share Alike 4.0 Unported.

+

Το έργο διανέμεται υπό τους όρους της άδειας Creative Commons Attribution-ShareAlike 4.0 International.

Είστε ελεύθεροι:

@@ -43,5 +43,5 @@

Αν μετατρέψετε, μετασχηματίσετε ή επεκτείνετε αυτό το έργο, μπορείτε να αναδιανείμετε το αποτέλεσμα υπό την ίδια, παρόμοια ή συμβατή άδεια χρήσης.

 -

Για το πλήρες κείμενο της άδειας, δείτε τον ιστότοπο CreativeCommons, ή διαβάστε όλη την Πράξη Commons.

+

Για το πλήρες κείμενο της άδειας, δείτε τον ιστότοπο CreativeCommons, ή διαβάστε όλη την Πράξη Commons.

diff -Nru gnome-taquin-3.18.1.1/help/es/15-Puzzle.page gnome-taquin-3.20.2/help/es/15-Puzzle.page --- gnome-taquin-3.18.1.1/help/es/15-Puzzle.page 1970-01-01 00:00:00.000000000 +0000 +++ gnome-taquin-3.20.2/help/es/15-Puzzle.page 2016-05-09 00:14:11.000000000 +0000 @@ -0,0 +1,77 @@ + + + + + + + + + Arnaud Bonatti + arnaud.bonatti@gmail.com + 2014 + + + + + + Daniel Mustieles + daniel.mustieles@gmail.com + 2015 + + + + Puzle 15 + +

El Puzle 15 es el puzle predeterminado de Taquin. Se muestra cada vez que se abre la aplicación. Puede iniciar una partida en cualquier momento desde la Pantalla de inicio.

+ +
+ Desarrollo del juego + +

El objetivo es mover todas las fichas a sus lugares correspondientes.

+ +

Hay un espacio vacío al que puede mover las fichas adyacentes empujándolas. Puede empujar una o más fichas a la vez en la dirección del espacio vacío.

+ +
+
+ Fin de la partida +

Al final de la partida, Taquin lo notifica y le muestra la imagen completa.

+

Puede pulsar el botón Iniciar or ir a la Pantalla de inicio.

+
+ +
+ Cómo jugar con el ratón + +

Para hacer un movimiento:

+ +

Pulse sobre una ficha en la misma fila o columna que la del espacio vacío.

+

Si pulsa sobre una ficha que no se puede mover, el juego le informa de que el movimiento no es posible.

+ + +

Siempre puede deshacer un movimiento pulsando el botón Deshacer en la parte izquierda de la barra de cabecera.

+ +

Al final de la partida, o cuando cambie entre partidas, pulse el botón Iniciar o vaya a la Pantalla de inicio.

+ + + +

También puede usar el teclado.

+
+ +
+ Cómo jugar con el teclado + +

Para hacer un movimiento:

+ +

Use las flechas Izquierda, Derecha, Arriba y Abajo para ir a la ficha que quiere mover. La ficha seleccionada actualmente se indica con cuatro flechas alrededor del teclado, una en cada lado de su fila y columna.

 +

Use la tecla Espacio pra mover la ficha seleccionada en la dirección del espacio vacío.

+

Si pulsa sobre una ficha que no se puede mover, el juego le informa de que el movimiento no es posible.

+ + +

Siempre puede deshacer un movimiento con la tecla combinación de teclas CtrlZ.

+ +

Al final de la partida, o cuando cambie entre partidas, use las teclas CtrlN o vaya a la Pantalla de inicio.

+ + + +

También puede usar el ratón

+
+ diff -Nru gnome-taquin-3.18.1.1/help/es/16-Puzzle.page gnome-taquin-3.20.2/help/es/16-Puzzle.page --- gnome-taquin-3.18.1.1/help/es/16-Puzzle.page 1970-01-01 00:00:00.000000000 +0000 +++ gnome-taquin-3.20.2/help/es/16-Puzzle.page 2016-05-09 00:14:11.000000000 +0000 @@ -0,0 +1,73 @@ + + + + + + + + + Arnaud Bonatti + arnaud.bonatti@gmail.com + 2014 + + + + + + Daniel Mustieles + daniel.mustieles@gmail.com + 2015 + + + + Puzle 16 + +

El Puzle 16 es una variante de Taquin. Puede jugarlo en cualquier momento desde la Pantalla de inicio.

+ +
+ Desarrollo del juego + +

El objetivo es mover todas las fichas a sus lugares correspondientes.

+ +

Se mueven todas las fichas de una misma fila o columna en una dirección. La ficha que se sale del tablero vuelve por el lado opuesto de la fila o la columna.

+ +
+
+ Fin de la partida +

Al final de la partida, Taquin lo notifica y le muestra la imagen completa.

+

Puede pulsar el botón Iniciar or ir a la Pantalla de inicio.

+
+ +
+ Cómo jugar con el ratón + +

Para hacer un movimiento:

+ +

Pulse en una de las flechas mostradas alrededor del teclado. La fila o la columna en la que está la flecha se mueve en esta dirección, y la ficha que estaba junto a la flecha se coloca en el lado opuesto.

+ +

Siempre puede deshacer un movimiento pulsando el botón Deshacer en la parte izquierda de la barra de cabecera.

+ +

Al final de la partida, o cuando cambie entre partidas, pulse el botón Iniciar o vaya a la Pantalla de inicio.

+ + + +

También puede usar el teclado.

+
+ +
+ Cómo jugar con el teclado + +

Para hacer un movimiento:

+ +

Use las flechas Izquierda, Derecha, Arriba y Abajo para ir a la fila o a la columna que quiere mover. La fila y columna seleccionadas actualmente se indican con dos luces alrededor del teclado.

 +

Use las teclas CtrlIzquierda o CtrlDerecha para mover una fila, o las teclas CtrlArriba y CtrlAbajo para mover una columna.

+ +

Siempre puede deshacer un movimiento con la tecla combinación de teclas CtrlZ.

+ +

Al final de la partida, o cuando cambie entre partidas, use las teclas CtrlN o vaya a la Pantalla de inicio.

+ + + +

También puede usar el ratón

+
+ diff -Nru gnome-taquin-3.18.1.1/help/es/beginning.page gnome-taquin-3.20.2/help/es/beginning.page --- gnome-taquin-3.18.1.1/help/es/beginning.page 1970-01-01 00:00:00.000000000 +0000 +++ gnome-taquin-3.20.2/help/es/beginning.page 2016-05-09 00:14:11.000000000 +0000 @@ -0,0 +1,42 @@ + + + + + + + + + Arnaud Bonatti + arnaud.bonatti@gmail.com + 2014 + + + + + + Daniel Mustieles + daniel.mustieles@gmail.com + 2015 + + + + Inicio + +

Cuando se abre Taquin por primera vez, muestra una partida del tradicional Puzle 15.

+ +

Se juega usando el ratón. Para hacer un movimiento:

+ + +

Pulse sobre una ficha en la misma fila o columna que la del espacio vacío.

+

Si pulsa sobre una ficha que no se puede mover, el juego le informa de que el movimiento no es posible.

+ + +

Siempre puede deshacer un movimiento pulsando el botón Deshacer en la parte izquierda de la barra de cabecera.

+ +

Al final de la partida, o cuando cambie entre partidas, pulse el botón Iniciar o vaya a la Pantalla de inicio.

+ + + +

Después de abrirlo por primera vez, Taquin muestra un puzle con las mismas reglas y las mismas dimensiones que el jugado la última vez cuando se abrió, por lo que podría ser una partida de Puzle 16.

+ + diff -Nru gnome-taquin-3.18.1.1/help/es/es.po gnome-taquin-3.20.2/help/es/es.po --- gnome-taquin-3.18.1.1/help/es/es.po 1970-01-01 00:00:00.000000000 +0000 +++ gnome-taquin-3.20.2/help/es/es.po 2016-03-24 10:46:09.000000000 +0000 @@ -0,0 +1,629 @@ +# +# Daniel Mustieles , 2015. +# +msgid "" +msgstr "" +"Project-Id-Version: PACKAGE VERSION\n" +"POT-Creation-Date: 2015-11-17 22:28+0000\n" +"PO-Revision-Date: 2015-11-23 16:04+0100\n" +"Last-Translator: Daniel Mustieles \n" +"Language-Team: Español; Castellano \n" +"Language: \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Plural-Forms: nplurals=2; plural=(n != 1);\n" +"X-Generator: Gtranslator 2.91.6\n" + +#. Put one translator per line, in the form NAME , YEAR1, YEAR2 +msgctxt "_" +msgid "translator-credits" +msgstr "Daniel Mustieles , 2015" + +#. (itstool) path: credit/name +#: C/15-Puzzle.page:10 C/16-Puzzle.page:10 C/beginning.page:10 C/index.page:12 +#: C/shortcuts.page:10 C/start-screen.page:10 +msgid "Arnaud Bonatti" +msgstr "Arnaud Bonatti" + +#. (itstool) path: credit/years +#: C/15-Puzzle.page:12 C/16-Puzzle.page:12 C/beginning.page:12 +#: C/shortcuts.page:12 C/start-screen.page:12 +msgid "2014" +msgstr "2014" + +#. (itstool) path: page/title +#: C/15-Puzzle.page:18 +msgid "15-Puzzle" +msgstr "Puzle 15" + +#. (itstool) path: page/p +#: C/15-Puzzle.page:20 +msgid "" +"The 15-Puzzle is the default puzzle of Taquin. It is " +"displayed the first time the application is opened. You can start one at any " +"time from the Start Screen." +msgstr "" +"El Puzle 15 es el puzle predeterminado de Taquin. Se " +"muestra cada vez que se abre la aplicación. Puede iniciar una partida en " +"cualquier momento desde la Pantalla de inicio." + +#. (itstool) path: section/title +#: C/15-Puzzle.page:23 C/16-Puzzle.page:23 +msgid "Gameplay" +msgstr "Desarrollo del juego" + +#. (itstool) path: section/p +#: C/15-Puzzle.page:25 C/16-Puzzle.page:25 +msgid "The goal is to move all the tiles to their proper places." +msgstr "El objetivo es mover todas las fichas a sus lugares correspondientes." + +#. (itstool) path: section/p +#: C/15-Puzzle.page:27 +msgid "" +"There’s an empty space where you can move adjacent tiles by pushing them " +"onto it. You can push more than one tile at the same time in the empty " +"space’s direction." +msgstr "" +"Hay un espacio vacío al que puede mover las fichas adyacentes empujándolas. " +"Puede empujar una o más fichas a la vez en la dirección del espacio vacío." + +#. (itstool) path: section/title +#: C/15-Puzzle.page:31 C/16-Puzzle.page:31 +msgid "End of the game" +msgstr "Fin de la partida" + +#. (itstool) path: section/p +#: C/15-Puzzle.page:32 C/16-Puzzle.page:32 +msgid "" +"At the end of the game, Taquin notifies you and displays the " +"complete image." +msgstr "" +"Al final de la partida, Taquin lo notifica y le muestra la imagen " +"completa." + +#. (itstool) path: section/p +#: C/15-Puzzle.page:33 C/16-Puzzle.page:33 +msgid "" +"You can click the Start Over button to go to the Start Screen." +msgstr "" +"Puede pulsar el botón Iniciar or ir a la Pantalla de inicio." + +#. (itstool) path: section/title +#: C/15-Puzzle.page:37 C/16-Puzzle.page:37 +msgid "How to play with a mouse" +msgstr "Cómo jugar con el ratón" + +#. (itstool) path: section/p +#: C/15-Puzzle.page:39 C/15-Puzzle.page:57 C/16-Puzzle.page:39 +#: C/16-Puzzle.page:55 +msgid "To make a move:" +msgstr "Para hacer un movimiento:" + +#. (itstool) path: item/p +#: C/15-Puzzle.page:41 C/beginning.page:25 +msgid "Click on a tile on the same row or column as the empty space." +msgstr "" +"Pulse sobre una ficha en la misma fila o columna que la del espacio vacío." + +#. (itstool) path: note/p +#: C/15-Puzzle.page:42 C/15-Puzzle.page:61 C/beginning.page:26 +msgid "" +"If you click on a tile that cannot move, the game notifies you that the move " +"is impossible." +msgstr "" +"Si pulsa sobre una ficha que no se puede mover, el juego le informa de que " +"el movimiento no es posible." + +#. (itstool) path: item/p +#: C/15-Puzzle.page:45 C/16-Puzzle.page:43 +msgid "" +"You can always undo a move by clicking the Undo button at the " +"left of the header bar." +msgstr "" +"Siempre puede deshacer un movimiento pulsando el botón Deshacer " +"en la parte izquierda de la barra de cabecera." + +#. (itstool) path: item/p +#: C/15-Puzzle.page:47 C/16-Puzzle.page:45 C/beginning.page:31 +msgid "" +"At the end of the game, or when you want to switch games, click the " +"Start Over button to go to the Start " +"Screen." +msgstr "" +"Al final de la partida, o cuando cambie entre partidas, pulse el botón " +"Iniciar o vaya a la Pantalla de " +"inicio." + +#. (itstool) path: section/p +#: C/15-Puzzle.page:51 C/16-Puzzle.page:49 +msgid "You can also use the keyboard." +msgstr "También puede usar el teclado." + +#. (itstool) path: section/title +#: C/15-Puzzle.page:55 C/16-Puzzle.page:53 +msgid "How to play with the keyboard" +msgstr "Cómo jugar con el teclado" + +#. (itstool) path: item/p +#: C/15-Puzzle.page:59 +msgid "" +"Use the Left, Right, Up and Down " +"arrows to go at the tile you want to move. The currently selected tile is " +"indicated with four arrows around the board, on each side of its row and " +"column." +msgstr "" +"Use las flechas Izquierda, Derecha, Arriba " +"y Abajo para ir a la ficha que quiere mover. La ficha " +"seleccionada actualmente se indica con cuatro flechas alrededor del teclado, " +"una en cada lado de su fila y columna." + +#. (itstool) path: item/p +#: C/15-Puzzle.page:60 +msgid "" +"Use the Space key to move the selected tile in the direction of " +"the empty space." +msgstr "" +"Use la tecla Espacio pra mover la ficha seleccionada en la " +"dirección del espacio vacío." + +#. (itstool) path: item/p +#: C/15-Puzzle.page:64 C/16-Puzzle.page:60 +msgid "" +"You can always undo a move with the CtrlZ keys." +msgstr "" +"Siempre puede deshacer un movimiento con la tecla combinación de teclas " +"CtrlZ." + +#. (itstool) path: item/p +#: C/15-Puzzle.page:66 C/16-Puzzle.page:62 +msgid "" +"At the end of the game, or when you want to switch games, use the the " +"CtrlN keys to go to the Start Screen." +msgstr "" +"Al final de la partida, o cuando cambie entre partidas, use las teclas " +"CtrlN o vaya a la Pantalla de inicio." + +#. (itstool) path: section/p +#: C/15-Puzzle.page:70 C/16-Puzzle.page:66 +msgid "You can also use a mouse." +msgstr "También puede usar el ratón" + +#. (itstool) path: page/title +#: C/16-Puzzle.page:18 +msgid "16-Puzzle" +msgstr "Puzle 16" + +#. (itstool) path: page/p +#: C/16-Puzzle.page:20 +msgid "" +"The 16-Puzzle is the variant puzzle of Taquin. You can " +"launch it at any time from the Start Screen." +msgstr "" +"El Puzle 16 es una variante de Taquin. Puede jugarlo en " +"cualquier momento desde la Pantalla de inicio." + +#. (itstool) path: section/p +#: C/16-Puzzle.page:27 +msgid "" +"You move all the tiles of a row or a column in one direction. The tile that " +"is pushed out of the board is placed at the opposite side of the row or " +"column." +msgstr "" +"Se mueven todas las fichas de una misma fila o columna en una dirección. La " +"ficha que se sale del tablero vuelve por el lado opuesto de la fila o la " +"columna." + +#. (itstool) path: item/p +#: C/16-Puzzle.page:41 +msgid "" +"Click on one of the arrows displayed around the board. The row or column at " +"the end of which this arrow is moves in this direction, and the tile that " +"was next to the arrow is placed at the opposite side." +msgstr "" +"Pulse en una de las flechas mostradas alrededor del teclado. La fila o la " +"columna en la que está la flecha se mueve en esta dirección, y la ficha que " +"estaba junto a la flecha se coloca en el lado opuesto." + +#. (itstool) path: item/p +#: C/16-Puzzle.page:57 +msgid "" +"Use the Left, Right, Up and Down " +"arrows to go at the row or the column you want to move. The currently " +"selected row and column are indicated with two lights around the board." +msgstr "" +"Use las flechas Izquierda, Derecha, Arriba " +"y Abajo para ir a la fila o a la columna que quiere mover. La " +"fila y columna seleccionadas actualmente se indican con dos luces alrededor " +"del teclado." + +#. (itstool) path: item/p +#: C/16-Puzzle.page:58 +msgid "" +"Use the CtrlLeft or " +"CtrlRight keys to move a row, or the " +"CtrlUp and CtrlDown keys to move a column." +msgstr "" +"Use las teclas CtrlIzquierda o " +"CtrlDerecha para mover una fila, o " +"las teclas CtrlArriba y " +"CtrlAbajo para mover una columna." + +#. (itstool) path: page/title +#: C/beginning.page:18 +msgid "Beginning" +msgstr "Inicio" + +#. (itstool) path: page/p +#: C/beginning.page:20 +msgid "" +"When Taquin is opened for the first time, it displays a " +"traditional 15-Puzzle game." +msgstr "" +"Cuando se abre Taquin por primera vez, muestra una partida del " +"tradicional Puzle 15." + +#. (itstool) path: page/p +#: C/beginning.page:22 +msgid "The game is played using the mouse. To make a move:" +msgstr "Se juega usando el ratón. Para hacer un movimiento:" + +#. (itstool) path: item/p +#: C/beginning.page:29 +msgid "" +"You can always undo a move by clicking the Undo button on the " +"left of the header bar." +msgstr "" +"Siempre puede deshacer un movimiento pulsando el botón Deshacer " +"en la parte izquierda de la barra de cabecera." + +#. (itstool) path: page/p +#: C/beginning.page:35 +msgid "" +"After the first time it is opened, Taquin displays a puzzle with " +"the same rules and dimensions as the last one played when it is opened, so " +"it could be a 16-Puzzle game." +msgstr "" +"Después de abrirlo por primera vez, Taquin muestra un puzle con " +"las mismas reglas y las mismas dimensiones que el jugado la última vez " +"cuando se abrió, por lo que podría ser una partida de Puzle 16." + +#. (itstool) path: info/title +#: C/index.page:8 +msgctxt "link" +msgid "Taquin" +msgstr "Taquin" + +#. (itstool) path: info/title +#: C/index.page:9 +msgctxt "text" +msgid "Taquin" +msgstr "Taquin" + +#. (itstool) path: license/p +#: C/index.page:16 +msgid "" +"Creative Commons Attribution-ShareAlike 4.0 International (CC BY-SA 4.0)" +msgstr "" +"Liencia Creative Commons Compartir Igual-Atribución 4.0 internacional (CC BY-" +"SA 4.0)" + +#. (itstool) path: media/span +#: C/index.page:20 +msgid "Taquin logo" +msgstr "Logo de Taquin" + +#. (itstool) path: page/title +#: C/index.page:20 +msgid "<_:media-1/> Taquin" +msgstr "<_:media-1/> Taquin" + +#. (itstool) path: page/p +#: C/index.page:22 +msgid "" +"Taquin is a sliding-block puzzle game. It includes the " +"traditional 15-Puzzle invented in the early 1880s, and the more recent 16-" +"Puzzle variant." +msgstr "" +"Taquin es un juego de puzle deslizante. Incluye el juego Puzle 15 " +"tradicional, inventado a principios de 1880, y su variante más reciente, " +"Puzle 16." + +#. (itstool) path: section/title +#: C/index.page:26 +msgid "How to Play" +msgstr "Cómo jugar" + +#. (itstool) path: section/title +#: C/index.page:38 +msgid "Advanced" +msgstr "Avanzado" + +#. (itstool) path: p/link +#: C/legal.xml:3 +msgid "Creative Commons Attribution-ShareAlike 4.0 International license" +msgstr "licencia Creative Commons Compartir Igual-Atribución 4.0 internacional" + +#. (itstool) path: license/p +#: C/legal.xml:3 +msgid "This work is licensed under a <_:link-1/>." +msgstr "Este trabajo está licenciado bajo la <_:link-1/>." + +#. (itstool) path: info/desc +#: C/license.page:8 +msgid "Legal information." +msgstr "Información legal." + +#. (itstool) path: page/title +#: C/license.page:11 +msgid "License" +msgstr "Licencia" + +#. (itstool) path: page/p +#: C/license.page:12 +msgid "" +"This work is distributed under a Creative Commons Attribution-ShareAlike 4.0 " +"International license." +msgstr "" +"Este trabajo está licenciado bajo la licencia Creative Commons Compartir " +"Igual-Atribución 4.0 internacional." + +#. (itstool) path: page/p +#: C/license.page:20 +msgid "You are free:" +msgstr "Es libre de:" + +#. (itstool) path: item/title +#: C/license.page:25 +msgid "To share" +msgstr "Compartir" + +#. (itstool) path: item/p +#: C/license.page:26 +msgid "To copy, distribute and transmit the work." +msgstr "Copiar, distribuir y transmitir el trabajo." + +#. (itstool) path: item/title +#: C/license.page:29 +msgid "To remix" +msgstr "Modificar" + +#. (itstool) path: item/p +#: C/license.page:30 +msgid "To adapt the work." +msgstr "Adaptar el trabajo." + +#. (itstool) path: page/p +#: C/license.page:33 +msgid "Under the following conditions:" +msgstr "Bajo las siguientes condiciones:" + +#. (itstool) path: item/title +#: C/license.page:38 +msgid "Attribution" +msgstr "Atribución" + +#. (itstool) path: item/p +#: C/license.page:39 +msgid "" +"You must attribute the work in the manner specified by the author or " +"licensor (but not in any way that suggests that they endorse you or your use " +"of the work)." +msgstr "" +"Debe reconocer los créditos de la obra de la manera especificada por el " +"autor o el licenciador (pero no de una manera que sugiera que tiene su apoyo " +"o apoyan el uso que hace de su obra)." + +#. (itstool) path: item/title +#: C/license.page:46 +msgid "Share Alike" +msgstr "Compartir igual" + +#. (itstool) path: item/p +#: C/license.page:47 +msgid "" +"If you alter, transform, or build upon this work, you may distribute the " +"resulting work only under the same, similar or a compatible license." +msgstr "" +"Si altera, transforma o amplía esta obra para crear una obra derivada, sólo " +"puede distribuir la obra resultante bajo la misma licencia, una similar o " +"una compatible." + +#. (itstool) path: page/p +#: C/license.page:53 +msgid "" +"For the full text of the license, see the CreativeCommons website, or read the full Commons Deed." +msgstr "" +"Para ver el texto completo de la licencia consulte la página web de Creative " +"Commons o lea el Escrito de Commons." + +#. (itstool) path: page/title +#: C/shortcuts.page:18 +msgid "Keyboard Shortcuts" +msgstr "Atajos del teclado" + +#. (itstool) path: page/p +#: C/shortcuts.page:20 +msgid "" +"Taquin can easily be used with keyboard. The 15-Puzzle and 16-Puzzle both have specific shortcuts." +msgstr "" +"Taquin se puede manejar fácilmente con el teclado. El Puzzle 15 y el Puzzle 16 tienen ambos atajos específicos." + +#. (itstool) path: section/title +#: C/shortcuts.page:23 +msgid "In-game shortcuts" +msgstr "Atajos de la partida" + +#. (itstool) path: td/p +#: C/shortcuts.page:26 +msgid "Show new-game screen" +msgstr "Mostrar la pantalla de partida nueva" + +#. (itstool) path: td/p +#: C/shortcuts.page:27 +msgid "CtrlN" +msgstr "CtrlN" + +#. (itstool) path: td/p +#: C/shortcuts.page:30 +msgid "Undo last move" +msgstr "Deshacer el último movimiento" + +#. (itstool) path: td/p +#: C/shortcuts.page:31 +msgid "CtrlZ" +msgstr "CtrlZ" + +#. (itstool) path: section/title +#: C/shortcuts.page:36 +msgid "15-Puzzle shortcuts" +msgstr "Atajos de Puzle 15" + +#. (itstool) path: td/p +#: C/shortcuts.page:39 C/shortcuts.page:52 +msgid "Change selected tile" +msgstr "Cambiar la ficha seleccionada" + +#. (itstool) path: td/p +#: C/shortcuts.page:40 C/shortcuts.page:53 +msgid "Left, Right, Up and Down" +msgstr "" +"Izquierda, Derecha, Arriba y Abajo" + +#. (itstool) path: td/p +#: C/shortcuts.page:43 +msgid "Push tile in empty space’s direction" +msgstr "Empujar una ficha en la dirección del espacio vacío" + +#. (itstool) path: td/p +#: C/shortcuts.page:44 +msgid "Space or KP_Enter" +msgstr "Espacio o TN_Intro" + +#. (itstool) path: section/title +#: C/shortcuts.page:49 +msgid "16-Puzzle shortcuts" +msgstr "Atajos de Puzle 16" + +#. (itstool) path: td/p +#: C/shortcuts.page:56 +msgid "Move row" +msgstr "Mover columna" + +#. (itstool) path: td/p +#: C/shortcuts.page:57 +msgid "" +"CtrlLeft and CtrlRight" +msgstr "" +"CtrlIzquierda y CtrlDerecha" + +#. (itstool) path: td/p +#: C/shortcuts.page:60 +msgid "Move column" +msgstr "Mover columna" + +#. (itstool) path: td/p +#: C/shortcuts.page:61 +msgid "" +"CtrlUp and CtrlDown" +msgstr "" +"CtrlArriba y CtrlAbajo" + +#. (itstool) path: section/title +#: C/shortcuts.page:66 +msgid "Start Screen shortcuts" +msgstr "Atajos de la pantalla de inicio" + +#. (itstool) path: td/p +#: C/shortcuts.page:69 +msgid "New Game" +msgstr "Partida nueva" + +#. (itstool) path: td/p +#: C/shortcuts.page:70 +msgid "CtrlShiftN" +msgstr "CtrlMayúsN" + +#. (itstool) path: td/p +#: C/shortcuts.page:73 +msgid "Back to previous game (if any)" +msgstr "Volver a la partida anterior (si hay)" + +#. (itstool) path: td/p +#: C/shortcuts.page:74 +msgid "Escape" +msgstr "Esc" + +#. (itstool) path: section/title +#: C/shortcuts.page:79 +msgid "General shortcuts" +msgstr "Atajos generales" + +#. (itstool) path: td/p +#: C/shortcuts.page:82 +msgid "Help" +msgstr "Ayuda" + +#. (itstool) path: td/p +#: C/shortcuts.page:83 +msgid "F1" +msgstr "F1" + +#. (itstool) path: td/p +#: C/shortcuts.page:86 +msgid "Quit" +msgstr "Salir" + +#. (itstool) path: td/p +#: C/shortcuts.page:87 +msgid "CtrlQ" +msgstr "CtrlQ" + +#. (itstool) path: page/title +#: C/start-screen.page:18 +msgid "Start Screen" +msgstr "Pantalla de inicio" + +#. (itstool) path: page/p +#: C/start-screen.page:19 +msgid "" +"The Start Screen is the place to select your options and launch a " +"new game, either a 15-Puzzle or a 16-Puzzle." +msgstr "" +"La Pantalla de inicio es el lugar donde seleccionar las opciones y " +"lanzar una partida nueva, bien de Puzle 15 o " +"de Puzle 16." + +#. (itstool) path: page/p +#: C/start-screen.page:20 +msgid "" +"It can be accessed at any time from a game by pressing the Start Over button." +msgstr "" +"Puede acceder a ella en cualquier momento pulsando el botón Iniciar." diff -Nru gnome-taquin-3.18.1.1/help/es/index.page gnome-taquin-3.20.2/help/es/index.page --- gnome-taquin-3.18.1.1/help/es/index.page 1970-01-01 00:00:00.000000000 +0000 +++ gnome-taquin-3.20.2/help/es/index.page 2016-05-09 00:14:11.000000000 +0000 @@ -0,0 +1,44 @@ + + + + + <media type="image" src="figures/logo.png" its:translate="no"/> + Taquin + Taquin + + + Arnaud Bonatti + arnaud.bonatti@gmail.com + + +

Liencia Creative Commons Compartir Igual-Atribución 4.0 internacional (CC BY-SA 4.0)

+ + + + Daniel Mustieles + daniel.mustieles@gmail.com + 2015 + + + + <media type="image" src="figures/logo32.png" its:translate="no"><span its:translate="yes">Logo de Taquin</span></media> Taquin + +

Taquin es un juego de puzle deslizante. Incluye el juego Puzle 15 tradicional, inventado a principios de 1880, y su variante más reciente, Puzle 16.

+ +
+ Cómo jugar +
+ +
+ Avanzado +
+ + diff -Nru gnome-taquin-3.18.1.1/help/es/legal.xml gnome-taquin-3.20.2/help/es/legal.xml --- gnome-taquin-3.18.1.1/help/es/legal.xml 1970-01-01 00:00:00.000000000 +0000 +++ gnome-taquin-3.20.2/help/es/legal.xml 2016-05-09 00:14:11.000000000 +0000 @@ -0,0 +1,4 @@ + + +

Este trabajo está licenciado bajo la licencia Creative Commons Compartir Igual-Atribución 4.0 internacional.

+ diff -Nru gnome-taquin-3.18.1.1/help/es/license.page gnome-taquin-3.20.2/help/es/license.page --- gnome-taquin-3.18.1.1/help/es/license.page 1970-01-01 00:00:00.000000000 +0000 +++ gnome-taquin-3.20.2/help/es/license.page 2016-05-09 00:14:11.000000000 +0000 @@ -0,0 +1,41 @@ + + + + + + + Información legal. + + + Daniel Mustieles + daniel.mustieles@gmail.com + 2015 + + + + Licencia +

Este trabajo está licenciado bajo la licencia Creative Commons Compartir Igual-Atribución 4.0 internacional.

+

Es libre de:

+ + + <em>Compartir</em> +

Copiar, distribuir y transmitir el trabajo.

+ + + <em>Modificar</em> +

Adaptar el trabajo.

+ + +

Bajo las siguientes condiciones:

+ + + <em>Atribución</em> +

Debe reconocer los créditos de la obra de la manera especificada por el autor o el licenciador (pero no de una manera que sugiera que tiene su apoyo o apoyan el uso que hace de su obra).

+ + + <em>Compartir igual</em> +

Si altera, transforma o amplía esta obra para crear una obra derivada, sólo puede distribuir la obra resultante bajo la misma licencia, una similar o una compatible.

+ + +

Para ver el texto completo de la licencia consulte la página web de Creative Commons o lea el Escrito de Commons.

+ diff -Nru gnome-taquin-3.18.1.1/help/es/shortcuts.page gnome-taquin-3.20.2/help/es/shortcuts.page --- gnome-taquin-3.18.1.1/help/es/shortcuts.page 1970-01-01 00:00:00.000000000 +0000 +++ gnome-taquin-3.20.2/help/es/shortcuts.page 2016-05-09 00:14:11.000000000 +0000 @@ -0,0 +1,96 @@ + + + + + + + + + Arnaud Bonatti + arnaud.bonatti@gmail.com + 2014 + + + + + + Daniel Mustieles + daniel.mustieles@gmail.com + 2015 + + + + Atajos del teclado + +

Taquin se puede manejar fácilmente con el teclado. El Puzzle 15 y el Puzzle 16 tienen ambos atajos específicos.

+ +
+ Atajos de la partida + + + + + + + + + +

Mostrar la pantalla de partida nueva

CtrlN

Deshacer el último movimiento

CtrlZ

+
+
+ Atajos de Puzle 15 + + + + + + + + + +

Cambiar la ficha seleccionada

Izquierda, Derecha, Arriba y Abajo

Empujar una ficha en la dirección del espacio vacío

Espacio o TN_Intro

+
+
+ Atajos de Puzle 16 + + + + + + + + + + + + + +

Cambiar la ficha seleccionada

Izquierda, Derecha, Arriba y Abajo

Mover columna

CtrlIzquierda y CtrlDerecha

Mover columna

CtrlArriba y CtrlAbajo

+
+
+ Atajos de la pantalla de inicio + + + + + + + + + +

Partida nueva

CtrlMayúsN

Volver a la partida anterior (si hay)

Esc

+
+
+ Atajos generales + + + + + + + + + +

Ayuda

F1

Salir

CtrlQ

+
+ diff -Nru gnome-taquin-3.18.1.1/help/es/start-screen.page gnome-taquin-3.20.2/help/es/start-screen.page --- gnome-taquin-3.18.1.1/help/es/start-screen.page 1970-01-01 00:00:00.000000000 +0000 +++ gnome-taquin-3.20.2/help/es/start-screen.page 2016-05-09 00:14:11.000000000 +0000 @@ -0,0 +1,27 @@ + + + + + + + + + Arnaud Bonatti + arnaud.bonatti@gmail.com + 2014 + + + + + + Daniel Mustieles + daniel.mustieles@gmail.com + 2015 + + + + Pantalla de inicio +

La Pantalla de inicio es el lugar donde seleccionar las opciones y lanzar una partida nueva, bien de Puzle 15 o de Puzle 16.

+

Puede acceder a ella en cualquier momento pulsando el botón Iniciar.

+ + diff -Nru gnome-taquin-3.18.1.1/help/fr/15-Puzzle.page gnome-taquin-3.20.2/help/fr/15-Puzzle.page --- gnome-taquin-3.18.1.1/help/fr/15-Puzzle.page 1970-01-01 00:00:00.000000000 +0000 +++ gnome-taquin-3.20.2/help/fr/15-Puzzle.page 2016-05-09 00:14:11.000000000 +0000 @@ -0,0 +1,71 @@ + + + + + + + + + Arnaud Bonatti + arnaud.bonatti@gmail.com + 2014 + + + + + + Pousse-pousse + +

Pousse-pousse est le puzzle par défaut de Taquin. Il est affiché lors de la première ouverture de l'application. Vous pouvez commencer une partie à tout moment à partir de l'Écran de démarrage.

+ +
+ Règle du jeu + +

Le but du jeu est de placer toutes les tuiles au bon endroit.

+ +

Il y a un espace vide où vous pouvez déplacer les tuiles adjacentes en les poussant dessus. Vous pouvez pousser plus d'une tuile en même temps dans la direction de l'espace vide.

+ +
+
+ Fin de partie +

À la fin du jeu, Taquin vous avertit et affiche l'image complète.

+

Vous pouvez cliquer sur le bouton Recommencer pour aller sur l'Écran de démarrage.

+
+ +
+ Comment jouer avec la souris + +

Pour effectuer un déplacement :

+ +

Cliquez sur une tuile sur la même ligne ou colonne que l'espace vide.

+

Si vous cliquez sur une tuile non-mobilisable, le jeu indiquera que le déplacement est impossible.

+ + +

Vous pouvez toujours annuler un déplacement en cliquant sur le bouton Annuler à gauche de la barre d'en-tête.

+ +

À la fin d'une partie, ou si vous souhaitez en recommencer une autre, cliquez sur le bouton Recommencer pour retourner à l'Écran de démarrage.

+ + + +

Vous pouvez également utiliser le clavier.

+
+ +
+ Comment jouer avec le clavier. + +

Pour effectuer un déplacement :

+ +

Utilisez les flèches du clavier Gauche, Droit, Haut et Bas pour sélectionner une tuile. La tuile sélectionnée est indiquée par des flèches de chaque côté de sa ligne et de sa colonne.

 +

Utilisez la touche Espace pour déplacer la tuile sélectionnée dans le sens de l'espace vide.

+

Si vous cliquez sur une tuile non-mobilisable, le jeu indiquera que le déplacement est impossible.

+ + +

Vous pouvez toujours annuler un déplacement avec les touches du clavier CtrlZ.

+ +

À la fin d'une partie, ou si vous voulez basculer vers un nouveau jeu, utilisez les touches clavier CtrlN pour retourner à l'Écran de Démarrage.

+ + + +

Vous pouvez utiliser la souris.

+
+ diff -Nru gnome-taquin-3.18.1.1/help/fr/16-Puzzle.page gnome-taquin-3.20.2/help/fr/16-Puzzle.page --- gnome-taquin-3.18.1.1/help/fr/16-Puzzle.page 1970-01-01 00:00:00.000000000 +0000 +++ gnome-taquin-3.20.2/help/fr/16-Puzzle.page 2016-05-09 00:14:11.000000000 +0000 @@ -0,0 +1,67 @@ + + + + + + + + + Arnaud Bonatti + arnaud.bonatti@gmail.com + 2014 + + + + + + Glisse-glisse + +

Glisse-glisse est une variante du puzzle Taquin. Vous pouvez la lancer depuis l'Écran de Démarrage.

+ +
+ Règle du jeu + +

Le but du jeu est de placer toutes les tuiles au bon endroit.

+ +

Vous pouvez déplacer toutes les tuiles d'une ligne ou d'une colonne dans une direction. La tuile qui est poussée hors du plateau est placée sur le côté opposé de la ligne ou de la colonne.

+ +
+
+ Fin de partie +

À la fin du jeu, Taquin vous avertit et affiche l'image complète.

+

Vous pouvez cliquer sur le bouton Recommencer pour aller sur l'Écran de démarrage.

+
+ +
+ Comment jouer avec la souris + +

Pour effectuer un déplacement :

+ +

Cliquez sur une des flèches affichées autour du plateau. La ligne ou la colonne à la fin de laquelle se trouve cette flèche se déplace dans cette direction et la tuile qui était à côté de la flèche est placée sur le côté opposé.

+ +

Vous pouvez toujours annuler un déplacement en cliquant sur le bouton Annuler à gauche de la barre d'en-tête.

+ +

À la fin d'une partie, ou si vous souhaitez en recommencer une autre, cliquez sur le bouton Recommencer pour retourner à l'Écran de démarrage.

+ + + +

Vous pouvez également utiliser le clavier.

+
+ +
+ Comment jouer avec le clavier. + +

Pour effectuer un déplacement :

+ +

Utilisez les touches clavier Flèche gauche, Flèche droite, Flèche haut et Flèche bas pour sélectionner la ligne ou la colonne que vous souhaitez déplacer. La ligne et la colonne sélectionnées sont indiquées par un éclairage des flèches de bordure.

 +

Utilisez les touches clavier CtrlFlèche gauche ou CtrlFlèche droite pour déplacer une ligne, ou CtrlFlèche haut et CtrlFlèche bas pour déplacer une colonne.

+ +

Vous pouvez toujours annuler un déplacement avec les touches du clavier CtrlZ.

+ +

À la fin d'une partie, ou si vous voulez basculer vers un nouveau jeu, utilisez les touches clavier CtrlN pour retourner à l'Écran de Démarrage.

+ + + +

Vous pouvez utiliser la souris.

+
+ diff -Nru gnome-taquin-3.18.1.1/help/fr/beginning.page gnome-taquin-3.20.2/help/fr/beginning.page --- gnome-taquin-3.18.1.1/help/fr/beginning.page 1970-01-01 00:00:00.000000000 +0000 +++ gnome-taquin-3.20.2/help/fr/beginning.page 2016-05-09 00:14:11.000000000 +0000 @@ -0,0 +1,36 @@ + + + + + + + + + Arnaud Bonatti + arnaud.bonatti@gmail.com + 2014 + + + + + + Commencer + +

Quand Taquin est ouvert pour la première fois, il affiche un traditionnel Pousse-pousse.

+ +

Le jeu utilise la souris. Pour se déplacer :

+ + +

Cliquez sur une tuile sur la même ligne ou colonne que l'espace vide.

+

Si vous cliquez sur une tuile non-mobilisable, le jeu indiquera que le déplacement est impossible.

+ + +

Vous pouvez toujours annuler un déplacement en cliquant sur le bouton Annuler sur la gauche de la barre d'en-tête.

+ +

À la fin d'une partie, ou si vous souhaitez en recommencer une autre, cliquez sur le bouton Recommencer pour retourner à l'Écran de démarrage.

+ + + +

Après la première ouverture, Taquin affiche un puzzle avec les mêmes règles et dimensions que lors de la dernière partie, de sorte qu'il pourrait s'agir d'un jeu de Glisse-glisse.

+ + diff -Nru gnome-taquin-3.18.1.1/help/fr/fr.po gnome-taquin-3.20.2/help/fr/fr.po --- gnome-taquin-3.18.1.1/help/fr/fr.po 1970-01-01 00:00:00.000000000 +0000 +++ gnome-taquin-3.20.2/help/fr/fr.po 2016-03-24 10:46:09.000000000 +0000 @@ -0,0 +1,636 @@ +# French translation for gnome-taquin. +# Copyright (C) 2015 gnome-taquin's COPYRIGHT HOLDER +# This file is distributed under the same license as the gnome-taquin package. +# +# Arnaud , 2015. +# Julien Hardelin , 2015. +msgid "" +msgstr "" +"Project-Id-Version: gnome-taquin gnome-3-18\n" +"POT-Creation-Date: 2015-11-16 10:29+0000\n" +"PO-Revision-Date: 2015-11-16 08:19+0100\n" +"Last-Translator: Julien Hardelin \n" +"Language-Team: French \n" +"Language: fr\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 2.0\n" + +#. Put one translator per line, in the form NAME , YEAR1, YEAR2 +msgctxt "_" +msgid "translator-credits" +msgstr "Arnaud Outtier /n" + +#. (itstool) path: credit/name +#: C/15-Puzzle.page:10 C/16-Puzzle.page:10 C/beginning.page:10 C/index.page:12 +#: C/shortcuts.page:10 C/start-screen.page:10 +msgid "Arnaud Bonatti" +msgstr "Arnaud Bonatti" + +#. (itstool) path: credit/years +#: C/15-Puzzle.page:12 C/16-Puzzle.page:12 C/beginning.page:12 +#: C/shortcuts.page:12 C/start-screen.page:12 +msgid "2014" +msgstr "2014" + +#. (itstool) path: page/title +#: C/15-Puzzle.page:18 +msgid "15-Puzzle" +msgstr "Pousse-pousse" + +#. (itstool) path: page/p +#: C/15-Puzzle.page:20 +msgid "" +"The 15-Puzzle is the default puzzle of Taquin. It is " +"displayed the first time the application is opened. You can start one at any " +"time from the Start Screen." +msgstr "" +"Pousse-pousse est le puzzle par défaut de Taquin. Il est " +"affiché lors de la première ouverture de l'application. Vous pouvez " +"commencer une partie à tout moment à partir de l'Écran de démarrage." + +#. (itstool) path: section/title +#: C/15-Puzzle.page:23 C/16-Puzzle.page:23 +msgid "Gameplay" +msgstr "Règle du jeu" + +#. (itstool) path: section/p +#: C/15-Puzzle.page:25 C/16-Puzzle.page:25 +msgid "The goal is to move all the tiles to their proper places." +msgstr "Le but du jeu est de placer toutes les tuiles au bon endroit." + +#. (itstool) path: section/p +#: C/15-Puzzle.page:27 +msgid "" +"There’s an empty space where you can move adjacent tiles by pushing them " +"onto it. You can push more than one tile at the same time in the empty " +"space’s direction." +msgstr "" +"Il y a un espace vide où vous pouvez déplacer les tuiles adjacentes en les " +"poussant dessus. Vous pouvez pousser plus d'une tuile en même temps dans la " +"direction de l'espace vide." + +#. (itstool) path: section/title +#: C/15-Puzzle.page:31 C/16-Puzzle.page:31 +msgid "End of the game" +msgstr "Fin de partie" + +#. (itstool) path: section/p +#: C/15-Puzzle.page:32 C/16-Puzzle.page:32 +msgid "" +"At the end of the game, Taquin notifies you and displays the " +"complete image." +msgstr "" +"À la fin du jeu, Taquin vous avertit et affiche " +"l'image complète." + +#. (itstool) path: section/p +#: C/15-Puzzle.page:33 C/16-Puzzle.page:33 +msgid "" +"You can click the Start Over button to go to the Start Screen." +msgstr "" +"Vous pouvez cliquer sur le bouton Recommencer pour aller sur " +"l'Écran de démarrage." + +#. (itstool) path: section/title +#: C/15-Puzzle.page:37 C/16-Puzzle.page:37 +msgid "How to play with a mouse" +msgstr "Comment jouer avec la souris" + +#. (itstool) path: section/p +#: C/15-Puzzle.page:39 C/15-Puzzle.page:57 C/16-Puzzle.page:39 +#: C/16-Puzzle.page:55 +msgid "To make a move:" +msgstr "Pour effectuer un déplacement :" + +#. (itstool) path: item/p +#: C/15-Puzzle.page:41 C/beginning.page:25 +msgid "Click on a tile on the same row or column as the empty space." +msgstr "Cliquez sur une tuile sur la même ligne ou colonne que l'espace vide." + +#. (itstool) path: note/p +#: C/15-Puzzle.page:42 C/15-Puzzle.page:61 C/beginning.page:26 +msgid "" +"If you click on a tile that cannot move, the game notifies you that the move " +"is impossible." +msgstr "" +"Si vous cliquez sur une tuile non-mobilisable, le jeu indiquera que le " +"déplacement est impossible." + +#. (itstool) path: item/p +#: C/15-Puzzle.page:45 C/16-Puzzle.page:43 +msgid "" +"You can always undo a move by clicking the Undo button at the " +"left of the header bar." +msgstr "" +"Vous pouvez toujours annuler un déplacement en cliquant sur le bouton " +"Annuler à gauche de la barre d'en-tête." + +#. (itstool) path: item/p +#: C/15-Puzzle.page:47 C/16-Puzzle.page:45 C/beginning.page:31 +msgid "" +"At the end of the game, or when you want to switch games, click the " +"Start Over button to go to the Start " +"Screen." +msgstr "" +"À la fin d'une partie, ou si vous souhaitez en recommencer une autre, " +"cliquez sur le bouton Recommencer pour retourner à l'Écran de démarrage. " + +#. (itstool) path: section/p +#: C/15-Puzzle.page:51 C/16-Puzzle.page:49 +msgid "You can also use the keyboard." +msgstr "Vous pouvez également utiliser le clavier. " + +#. (itstool) path: section/title +#: C/15-Puzzle.page:55 C/16-Puzzle.page:53 +msgid "How to play with the keyboard" +msgstr "Comment jouer avec le clavier." + +#. (itstool) path: item/p +#: C/15-Puzzle.page:59 +msgid "" +"Use the Left, Right, Up and Down " +"arrows to go at the tile you want to move. The currently selected tile is " +"indicated with four arrows around the board, on each side of its row and " +"column." +msgstr "" +"Utilisez les flèches du clavier Gauche, Droit, " +"Haut et Bas pour sélectionner une tuile. La tuile " +"sélectionnée est indiquée par des flèches de chaque côté de sa ligne et de " +"sa colonne." + +#. (itstool) path: item/p +#: C/15-Puzzle.page:60 +msgid "" +"Use the Space key to move the selected tile in the direction of " +"the empty space." +msgstr "" +"Utilisez la touche Espace pour déplacer la tuile sélectionnée " +"dans le sens de l'espace vide." + +#. (itstool) path: item/p +#: C/15-Puzzle.page:64 C/16-Puzzle.page:60 +msgid "" +"You can always undo a move with the CtrlZ keys." +msgstr "" +"Vous pouvez toujours annuler un déplacement avec les touches du clavier " +"CtrlZ." + +#. (itstool) path: item/p +#: C/15-Puzzle.page:66 C/16-Puzzle.page:62 +msgid "" +"At the end of the game, or when you want to switch games, use the the " +"CtrlN keys to go to the Start Screen." +msgstr "" +"À la fin d'une partie, ou si vous voulez basculer vers un nouveau jeu, " +"utilisez les touches clavier CtrlN " +"pour retourner à l'Écran de Démarrage." + +#. (itstool) path: section/p +#: C/15-Puzzle.page:70 C/16-Puzzle.page:66 +msgid "You can also use a mouse." +msgstr "Vous pouvez utiliser la souris." + +#. (itstool) path: page/title +#: C/16-Puzzle.page:18 +msgid "16-Puzzle" +msgstr "Glisse-glisse" + +#. (itstool) path: page/p +#: C/16-Puzzle.page:20 +msgid "" +"The 16-Puzzle is the variant puzzle of Taquin. You can " +"launch it at any time from the Start Screen." +msgstr "" +"Glisse-glisse est une variante du puzzle Taquin. Vous " +"pouvez la lancer depuis l'Écran de Démarrage." + +#. (itstool) path: section/p +#: C/16-Puzzle.page:27 +msgid "" +"You move all the tiles of a row or a column in one direction. The tile that " +"is pushed out of the board is placed at the opposite side of the row or " +"column." +msgstr "" +"Vous pouvez déplacer toutes les tuiles d'une ligne ou d'une colonne dans une " +"direction. La tuile qui est poussée hors du plateau est placée sur le côté " +"opposé de la ligne ou de la colonne." + +#. (itstool) path: item/p +#: C/16-Puzzle.page:41 +msgid "" +"Click on one of the arrows displayed around the board. The row or column at " +"the end of which this arrow is moves in this direction, and the tile that " +"was next to the arrow is placed at the opposite side." +msgstr "" +"Cliquez sur une des flèches affichées autour du plateau. La ligne ou la " +"colonne à la fin de laquelle se trouve cette flèche se déplace dans cette " +"direction et la tuile qui était à côté de la flèche est placée sur le côté " +"opposé." + +#. (itstool) path: item/p +#: C/16-Puzzle.page:57 +msgid "" +"Use the Left, Right, Up and Down " +"arrows to go at the row or the column you want to move. The currently " +"selected row and column are indicated with two lights around the board." +msgstr "" +"Utilisez les touches clavier Flèche gauche, Flèche droite, Flèche haut et Flèche bas pour sélectionner la " +"ligne ou la colonne que vous souhaitez déplacer. La ligne et la colonne " +"sélectionnées sont indiquées par un éclairage des flèches de bordure." + +#. (itstool) path: item/p +#: C/16-Puzzle.page:58 +msgid "" +"Use the CtrlLeft or " +"CtrlRight keys to move a row, or the " +"CtrlUp and CtrlDown keys to move a column." +msgstr "" +"Utilisez les touches clavier CtrlFlèche gauche ou CtrlFlèche droite " +"pour déplacer une ligne, ou CtrlFlèche haut et CtrlFlèche bas pour " +"déplacer une colonne." + +#. (itstool) path: page/title +#: C/beginning.page:18 +msgid "Beginning" +msgstr "Commencer" + +#. (itstool) path: page/p +#: C/beginning.page:20 +msgid "" +"When Taquin is opened for the first time, it displays a " +"traditional 15-Puzzle game." +msgstr "" +"Quand Taquin est ouvert pour la première fois, il affiche un " +"traditionnel Pousse-pousse." + +#. (itstool) path: page/p +#: C/beginning.page:22 +msgid "The game is played using the mouse. To make a move:" +msgstr "Le jeu utilise la souris. Pour se déplacer :" + +#. (itstool) path: item/p +#: C/beginning.page:29 +msgid "" +"You can always undo a move by clicking the Undo button on the " +"left of the header bar." +msgstr "" +"Vous pouvez toujours annuler un déplacement en cliquant sur le bouton " +"Annuler sur la gauche de la barre d'en-tête." + +#. (itstool) path: page/p +#: C/beginning.page:35 +msgid "" +"After the first time it is opened, Taquin displays a puzzle with " +"the same rules and dimensions as the last one played when it is opened, so " +"it could be a 16-Puzzle game." +msgstr "" +"Après la première ouverture, Taquin affiche un puzzle avec les " +"mêmes règles et dimensions que lors de la dernière partie, de sorte qu'il " +"pourrait s'agir d'un jeu de Glisse-glisse." + +#. (itstool) path: info/title +#: C/index.page:8 +msgctxt "link" +msgid "Taquin" +msgstr "Taquin" + +#. (itstool) path: info/title +#: C/index.page:9 +msgctxt "text" +msgid "Taquin" +msgstr "Taquin" + +#. (itstool) path: license/p +#: C/index.page:16 +msgid "" +"Creative Commons Attribution-ShareAlike 4.0 International (CC BY-SA 4.0)" +msgstr "" +"Creative Commons Paternité-Partage dans des conditions identiques à " +"l'Internationale 4.0 (CC BY-SA 4.0)" + +#. (itstool) path: media/span +#: C/index.page:20 +msgid "Taquin logo" +msgstr "Logo Taquin" + +#. (itstool) path: page/title +#: C/index.page:20 +msgid "<_:media-1/> Taquin" +msgstr "<_:media-1/> Taquin" + +#. (itstool) path: page/p +#: C/index.page:22 +msgid "" +"Taquin is a sliding-block puzzle game. It includes the " +"traditional 15-Puzzle invented in the early 1880s, and the more recent 16-" +"Puzzle variant." +msgstr "" +"Taquin est un jeu de puzzle coulissant. Il inclut le traditionnel " +"Pousse-pousse inventé dans les années 1880, et la variante plus récente " +"Glisse-glisse." + +#. (itstool) path: section/title +#: C/index.page:26 +msgid "How to Play" +msgstr "Comment jouer" + +#. (itstool) path: section/title +#: C/index.page:38 +msgid "Advanced" +msgstr "À propos" + +#. (itstool) path: p/link +#: C/legal.xml:3 +msgid "Creative Commons Attribution-ShareAlike 4.0 Unported License" +msgstr "" +"Creative Commons Paternité-Partage dans des conditions identiques à la " +"licence 4.0 non-transposée" + +#. (itstool) path: license/p +#: C/legal.xml:3 +msgid "This work is licensed under a <_:link-1/>." +msgstr "Ce travail est sous licence <_:link-1/>." + +#. (itstool) path: info/desc +#: C/license.page:8 +msgid "Legal information." +msgstr "Informations légales " + +#. (itstool) path: page/title +#: C/license.page:11 +msgid "License" +msgstr "Licence" + +#. (itstool) path: page/p +#: C/license.page:12 +msgid "" +"This work is distributed under a CreativeCommons Attribution-Share Alike 4.0 " +"Unported license." +msgstr "" +"Ce travail est distribué sous licence CreativeCommons Paternité-Partage dans " +"des conditions identiques à la licence 4.0 non-transposée" + +#. (itstool) path: page/p +#: C/license.page:20 +msgid "You are free:" +msgstr "Vous êtes libre de : " + +#. (itstool) path: item/title +#: C/license.page:25 +msgid "To share" +msgstr "Partager" + +#. (itstool) path: item/p +#: C/license.page:26 +msgid "To copy, distribute and transmit the work." +msgstr "Copier, distribuer et transmettre l’œuvre." + +#. (itstool) path: item/title +#: C/license.page:29 +msgid "To remix" +msgstr "Modifier" + +#. (itstool) path: item/p +#: C/license.page:30 +msgid "To adapt the work." +msgstr "Adapter l’œuvre." + +#. (itstool) path: page/p +#: C/license.page:33 +msgid "Under the following conditions:" +msgstr "Sous les conditions suivantes :" + +#. (itstool) path: item/title +#: C/license.page:38 +msgid "Attribution" +msgstr "Paternité" + +#. (itstool) path: item/p +#: C/license.page:39 +msgid "" +"You must attribute the work in the manner specified by the author or " +"licensor (but not in any way that suggests that they endorse you or your use " +"of the work)." +msgstr "" +"Vous devez attribuer l’œuvre de la manière indiquée par l'auteur ou le " +"concédant (mais pas d'une manière qui suggérerait qu'ils vous soutiennent " +"vous et votre utilisation de l'œuvre)." + +#. (itstool) path: item/title +#: C/license.page:46 +msgid "Share Alike" +msgstr "Partage dans des conditions identiques" + +#. (itstool) path: item/p +#: C/license.page:47 +msgid "" +"If you alter, transform, or build upon this work, you may distribute the " +"resulting work only under the same, similar or a compatible license." +msgstr "" +"Si vous modifiez, transformez ou adaptez cette création, vous devez " +"distribuer l'œuvre résultante sous la même licence, ou une licence similaire " +"et compatible. " + +#. (itstool) path: page/p +#: C/license.page:53 +msgid "" +"For the full text of the license, see the CreativeCommons website, or read the full Commons Deed." +msgstr "" +"Pour connaître l'intégralité de la licence, reportez-vous au site web CreativeCommons website, ou lisez la section Commons Deed." + +#. (itstool) path: page/title +#: C/shortcuts.page:18 +msgid "Keyboard Shortcuts" +msgstr "Raccourcis clavier" + +#. (itstool) path: page/p +#: C/shortcuts.page:20 +msgid "" +"Taquin can easily be used with keyboard. The 15-Puzzle and 16-Puzzle both have specific shortcuts." +msgstr "" +"Taquin peut être facilement utilisé avec le clavier. Le Pousse-pousse et Glisse-glisse ont tous deux des raccourcis " +"spécifiques." + +#. (itstool) path: section/title +#: C/shortcuts.page:23 +msgid "In-game shortcuts" +msgstr "Raccourcis pendant une partie" + +#. (itstool) path: td/p +#: C/shortcuts.page:26 +msgid "Show new-game screen" +msgstr "Afficher l'écran nouveau-jeu" + +#. (itstool) path: td/p +#: C/shortcuts.page:27 +msgid "CtrlN" +msgstr "CtrlN" + +#. (itstool) path: td/p +#: C/shortcuts.page:30 +msgid "Undo last move" +msgstr "Annuler le dernier coup" + +#. (itstool) path: td/p +#: C/shortcuts.page:31 +msgid "CtrlZ" +msgstr "CtrlZ" + +#. (itstool) path: section/title +#: C/shortcuts.page:36 +msgid "15-Puzzle shortcuts" +msgstr "Raccourcis du pousse-pousse" + +#. (itstool) path: td/p +#: C/shortcuts.page:39 C/shortcuts.page:52 +msgid "Change selected tile" +msgstr "Changer de tuile" + +#. (itstool) path: td/p +#: C/shortcuts.page:40 C/shortcuts.page:53 +msgid "Left, Right, Up and Down" +msgstr "" +"Flèche gauche, Flèche droite, Flèche haut " +"et Flèche bas" + +#. (itstool) path: td/p +#: C/shortcuts.page:43 +msgid "Push tile in empty space’s direction" +msgstr "Déplacer la tuile en direction de l'espace vide" + +#. (itstool) path: td/p +#: C/shortcuts.page:44 +msgid "Space or KP_Enter" +msgstr "Espace ou la touche Entrée du clavier numérique" + +#. (itstool) path: section/title +#: C/shortcuts.page:49 +msgid "16-Puzzle shortcuts" +msgstr "Raccourcis du glisse-glisse" + +#. (itstool) path: td/p +#: C/shortcuts.page:56 +msgid "Move row" +msgstr "Déplacer une ligne" + +#. (itstool) path: td/p +#: C/shortcuts.page:57 +msgid "" +"CtrlLeft and CtrlRight" +msgstr "" +"CtrlFlèche gauche et " +"CtrlFlèche droite" + +#. (itstool) path: td/p +#: C/shortcuts.page:60 +msgid "Move column" +msgstr "Déplacer une colonne" + +#. (itstool) path: td/p +#: C/shortcuts.page:61 +msgid "" +"CtrlUp and CtrlDown" +msgstr "" +"CtrlFlèche haut et CtrlFlèche bas" + +#. (itstool) path: section/title +#: C/shortcuts.page:66 +msgid "Start Screen shortcuts" +msgstr "Raccourcis d'écran de démarrage" + +#. (itstool) path: td/p +#: C/shortcuts.page:69 +msgid "New Game" +msgstr "Nouvelle partie" + +#. (itstool) path: td/p +#: C/shortcuts.page:70 +msgid "CtrlShiftN" +msgstr "CtrlShiftN" + +#. (itstool) path: td/p +#: C/shortcuts.page:73 +msgid "Back to previous game (if any)" +msgstr "Retour à la partie précédente (si jamais)" + +#. (itstool) path: td/p +#: C/shortcuts.page:74 +msgid "Escape" +msgstr "Échap" + +#. (itstool) path: section/title +#: C/shortcuts.page:79 +msgid "General shortcuts" +msgstr "Raccourcis généraux" + +#. (itstool) path: td/p +#: C/shortcuts.page:82 +msgid "Help" +msgstr "Aide" + +#. (itstool) path: td/p +#: C/shortcuts.page:83 +msgid "F1" +msgstr "F1" + +#. (itstool) path: td/p +#: C/shortcuts.page:86 +msgid "Quit" +msgstr "Quitter" + +#. (itstool) path: td/p +#: C/shortcuts.page:87 +msgid "CtrlQ" +msgstr "CtrlQ" + +#. (itstool) path: page/title +#: C/start-screen.page:18 +msgid "Start Screen" +msgstr "Écran de démarrage. " + +#. (itstool) path: page/p +#: C/start-screen.page:19 +msgid "" +"The Start Screen is the place to select your options and launch a " +"new game, either a 15-Puzzle or a 16-Puzzle." +msgstr "" +"L'Écran de démarrage permet de sélectionner les options et de " +"lancer un nouveau jeu, soit un Pousse-pousse, soit un Glisse-glisse." + +#. (itstool) path: page/p +#: C/start-screen.page:20 +msgid "" +"It can be accessed at any time from a game by pressing the Start Over button." +msgstr "" +"L'écran de démarrage peut être consulté à tout moment au cours d'une partie " +"en cliquant sur le bouton Recommencer." diff -Nru gnome-taquin-3.18.1.1/help/fr/index.page gnome-taquin-3.20.2/help/fr/index.page --- gnome-taquin-3.18.1.1/help/fr/index.page 1970-01-01 00:00:00.000000000 +0000 +++ gnome-taquin-3.20.2/help/fr/index.page 2016-05-09 00:14:11.000000000 +0000 @@ -0,0 +1,38 @@ + + + + + <media type="image" src="figures/logo.png" its:translate="no"/> + Taquin + Taquin + + + Arnaud Bonatti + arnaud.bonatti@gmail.com + + +

Creative Commons Paternité-Partage dans des conditions identiques à l'Internationale 4.0 (CC BY-SA 4.0)

+ + + + <media type="image" src="figures/logo32.png" its:translate="no"><span its:translate="yes">Logo Taquin</span></media> Taquin + +

Taquin est un jeu de puzzle coulissant. Il inclut le traditionnel Pousse-pousse inventé dans les années 1880, et la variante plus récente Glisse-glisse.

+ +
+ Comment jouer +
+ +
+ À propos +
+ + diff -Nru gnome-taquin-3.18.1.1/help/fr/legal.xml gnome-taquin-3.20.2/help/fr/legal.xml --- gnome-taquin-3.18.1.1/help/fr/legal.xml 1970-01-01 00:00:00.000000000 +0000 +++ gnome-taquin-3.20.2/help/fr/legal.xml 2016-05-09 00:14:11.000000000 +0000 @@ -0,0 +1,5 @@ + + +

Ce travail est sous licence Creative + Commons Attribution-ShareAlike 4.0 International license.

+ diff -Nru gnome-taquin-3.18.1.1/help/fr/license.page gnome-taquin-3.20.2/help/fr/license.page --- gnome-taquin-3.18.1.1/help/fr/license.page 1970-01-01 00:00:00.000000000 +0000 +++ gnome-taquin-3.20.2/help/fr/license.page 2016-05-09 00:14:11.000000000 +0000 @@ -0,0 +1,47 @@ + + + + + + + Informations légales + + + Licence +

+ + This work is distributed under a Creative Commons Attribution-ShareAlike 4.0 + International license. +

+

Vous êtes libre de :

+ + + <em>Partager</em> +

Copier, distribuer et transmettre l’œuvre.

+ + + Modifier +

Adapter l’œuvre.

+ + +

Sous les conditions suivantes :

+ + + <em>Paternité</em> +

Vous devez attribuer l’œuvre de la manière indiquée par l'auteur ou le concédant (mais pas d'une manière qui suggérerait qu'ils vous soutiennent vous et votre utilisation de l'œuvre).

+ + + <em>Partage dans des conditions identiques</em> +

Si vous modifiez, transformez ou adaptez cette création, vous devez distribuer l'œuvre résultante sous la même licence, ou une licence similaire et compatible.

+ + +

+ + For the full text of the license, see the + CreativeCommons website, + or read the full Commons Deed. +

+ diff -Nru gnome-taquin-3.18.1.1/help/fr/shortcuts.page gnome-taquin-3.20.2/help/fr/shortcuts.page --- gnome-taquin-3.18.1.1/help/fr/shortcuts.page 1970-01-01 00:00:00.000000000 +0000 +++ gnome-taquin-3.20.2/help/fr/shortcuts.page 2016-05-09 00:14:11.000000000 +0000 @@ -0,0 +1,90 @@ + + + + + + + + + Arnaud Bonatti + arnaud.bonatti@gmail.com + 2014 + + + + + + Raccourcis clavier + +

Taquin peut être facilement utilisé avec le clavier. Le Pousse-pousse et Glisse-glisse ont tous deux des raccourcis spécifiques.

+ +
+ Raccourcis pendant une partie + + + + + + + + + +

Afficher l'écran nouveau-jeu

CtrlN

Annuler le dernier coup

CtrlZ

+
+
+ Raccourcis du pousse-pousse + + + + + + + + + +

Changer de tuile

Flèche gauche, Flèche droite, Flèche haut et Flèche bas

Déplacer la tuile en direction de l'espace vide

Espace ou la touche Entrée du clavier numérique

+
+
+ Raccourcis du glisse-glisse + + + + + + + + + + + + + +

Changer de tuile

Flèche gauche, Flèche droite, Flèche haut et Flèche bas

Déplacer une ligne

CtrlFlèche gauche et CtrlFlèche droite

Déplacer une colonne

CtrlFlèche haut et CtrlFlèche bas

+
+
+ Raccourcis d'écran de démarrage + + + + + + + + + +

Nouvelle partie

CtrlShiftN

Retour à la partie précédente (si jamais)

Échap

+
+
+ Raccourcis généraux + + + + + + + + + +

Aide

F1

Quitter

CtrlQ

+
+ diff -Nru gnome-taquin-3.18.1.1/help/fr/start-screen.page gnome-taquin-3.20.2/help/fr/start-screen.page --- gnome-taquin-3.18.1.1/help/fr/start-screen.page 1970-01-01 00:00:00.000000000 +0000 +++ gnome-taquin-3.20.2/help/fr/start-screen.page 2016-05-09 00:14:11.000000000 +0000 @@ -0,0 +1,21 @@ + + + + + + + + + Arnaud Bonatti + arnaud.bonatti@gmail.com + 2014 + + + + + + Écran de démarrage. +

L'Écran de démarrage permet de sélectionner les options et de lancer un nouveau jeu, soit un Pousse-pousse, soit un Glisse-glisse.

+

L'écran de démarrage peut être consulté à tout moment au cours d'une partie en cliquant sur le bouton Recommencer.

+ + diff -Nru gnome-taquin-3.18.1.1/help/hu/15-Puzzle.page gnome-taquin-3.20.2/help/hu/15-Puzzle.page --- gnome-taquin-3.18.1.1/help/hu/15-Puzzle.page 1970-01-01 00:00:00.000000000 +0000 +++ gnome-taquin-3.20.2/help/hu/15-Puzzle.page 2016-05-09 00:14:11.000000000 +0000 @@ -0,0 +1,77 @@ + + + + + + + + + Arnaud Bonatti + arnaud.bonatti@gmail.com + 2014 + + + + + + Kelemen Gábor + kelemeng at ubuntu dot com + 2016. + + + + 15-ös kirakó + +

A 15-ös kirakó a Taquin alapértelmezett feladványa. Az alkalmazás megnyitásakor jelenik meg. A Kezdőképernyőről bármikor elindíthatja.

+ +
+ Játékmenet + +

A játék célja az összes csempe megfelelő helyre mozgatása.

+ +

Van egy üres hely, ahová a szomszédos csempéket áttolhatja. Egyszerre több csempét is áttolhat a hely irányába.

+ +
+
+ A játék vége +

A játék végén a Taquin értesítést jelenít meg, a teljes képpel együtt.

+

A Kezdőképernyőre való visszatéréshez kattintson az Újrakezdés gombra.

+
+ +
+ Játék az egér használatával + +

Lépéshez:

+ +

Kattintson egy csempére ugyanabban a sorban vagy oszlopban, mint ahol az üres hely van.

+

Ha egy nem mozgatható csempére kattint, a játék értesíti, hogy a mozgatás nem lehetséges.

+ + +

Bármikor visszavonhat egy lépést a fejlécsáv bal oldalán lévő Visszavonás gombbal.

+ +

A játék végén, vagy ha a játékmódok közt szeretne váltani, kattintson az Újrakezdés gombra a Kezdőképernyőre való visszatéréshez.

+ + + +

A billentyűzetet is használhatja.

+
+ +
+ Játék a billentyűzet használatával + +

Lépéshez:

+ +

Használja a Balra, Jobbra, Fel és Le nyilakat a mozgatni kívánt csempe kiválasztásához. Az éppen kijelölt csempét négy nyíl jelöli a tábla körül, a sora és oszlopa oldalain.

 +

A Szóköz billentyűvel mozgathatja a kijelölt csempét az üres hely irányába.

+

Ha egy nem mozgatható csempére kattint, a játék értesíti, hogy a mozgatás nem lehetséges.

+ + +

Egy lépést bármikor visszavonhat a CtrlZ kombinációval.

+ +

A játék végén, vagy ha a játékmódok közt szeretne váltani, nyomja meg a CtrlN kombinációt a Kezdőképernyőre való visszatéréshez.

+ + + +

Használhatja az egeret is.

+
+ diff -Nru gnome-taquin-3.18.1.1/help/hu/16-Puzzle.page gnome-taquin-3.20.2/help/hu/16-Puzzle.page --- gnome-taquin-3.18.1.1/help/hu/16-Puzzle.page 1970-01-01 00:00:00.000000000 +0000 +++ gnome-taquin-3.20.2/help/hu/16-Puzzle.page 2016-05-09 00:14:11.000000000 +0000 @@ -0,0 +1,73 @@ + + + + + + + + + Arnaud Bonatti + arnaud.bonatti@gmail.com + 2014 + + + + + + Kelemen Gábor + kelemeng at ubuntu dot com + 2016. + + + + 16-os kirakó + +

A 16-os kirakó a Taquin módosított feladványa. A Kezdőképernyőről bármikor elindíthatja.

+ +
+ Játékmenet + +

A játék célja az összes csempe megfelelő helyre mozgatása.

+ +

A sor vagy oszlop összes csempéje egy irányba fog mozdulni. A tábláról kitolt csempe a sor vagy oszlop másik végére kerül.

+ +
+
+ A játék vége +

A játék végén a Taquin értesítést jelenít meg, a teljes képpel együtt.

+

A Kezdőképernyőre való visszatéréshez kattintson az Újrakezdés gombra.

+
+ +
+ Játék az egér használatával + +

Lépéshez:

+ +

Kattintson a tábla körül megjelenő nyilak egyikére. A sor vagy oszlop a nyíl irányába mozdul, és a nyíl melletti csempe átkerül a másik oldalra.

+ +

Bármikor visszavonhat egy lépést a fejlécsáv bal oldalán lévő Visszavonás gombbal.

+ +

A játék végén, vagy ha a játékmódok közt szeretne váltani, kattintson az Újrakezdés gombra a Kezdőképernyőre való visszatéréshez.

+ + + +

A billentyűzetet is használhatja.

+
+ +
+ Játék a billentyűzet használatával + +

Lépéshez:

+ +

Használja a Balra, Jobbra, Fel és Le nyilakat a mozgatni kívánt sor vagy oszlop kiválasztásához. Az éppen kijelölt sort és oszlopot két fény jelöli a tábla körül.

 +

Használja a CtrlBalra és CtrlJobbra kombinációt egy sor mozgatására, vagy a CtrlFel és CtrlLe kombinációt egy oszlop mozgatására.

+ +

Egy lépést bármikor visszavonhat a CtrlZ kombinációval.

+ +

A játék végén, vagy ha a játékmódok közt szeretne váltani, nyomja meg a CtrlN kombinációt a Kezdőképernyőre való visszatéréshez.

+ + + +

Használhatja az egeret is.

+
+ diff -Nru gnome-taquin-3.18.1.1/help/hu/beginning.page gnome-taquin-3.20.2/help/hu/beginning.page --- gnome-taquin-3.18.1.1/help/hu/beginning.page 1970-01-01 00:00:00.000000000 +0000 +++ gnome-taquin-3.20.2/help/hu/beginning.page 2016-05-09 00:14:11.000000000 +0000 @@ -0,0 +1,42 @@ + + + + + + + + + Arnaud Bonatti + arnaud.bonatti@gmail.com + 2014 + + + + + + Kelemen Gábor + kelemeng at ubuntu dot com + 2016. + + + + Kezdés + +

A Taquin első megnyitásakor egy hagyományos 15-ös kirakó játékot jelenít meg.

+ +

A játékot az egérrel kell játszani. A lépéshez:

+ + +

Kattintson egy csempére ugyanabban a sorban vagy oszlopban, mint ahol az üres hely van.

+

Ha egy nem mozgatható csempére kattint, a játék értesíti, hogy a mozgatás nem lehetséges.

+ + +

Bármikor visszavonhat egy lépést a fejlécsáv bal oldalán lévő Visszavonás gombbal.

+ +

A játék végén, vagy ha a játékmódok közt szeretne váltani, kattintson az Újrakezdés gombra a Kezdőképernyőre való visszatéréshez.

+ + + +

Az első megnyitása után a Taquin az utoljára játszottal egyező típusú és méretű kirakót jelenít meg, így ez egy 16-os kirakó is lehet.

+ + diff -Nru gnome-taquin-3.18.1.1/help/hu/hu.po gnome-taquin-3.20.2/help/hu/hu.po --- gnome-taquin-3.18.1.1/help/hu/hu.po 1970-01-01 00:00:00.000000000 +0000 +++ gnome-taquin-3.20.2/help/hu/hu.po 2016-03-24 10:46:09.000000000 +0000 @@ -0,0 +1,622 @@ +# Hungarian translation of gnome-taquin help +# Copyright (C) 2016. Free Software Foundation, Inc. +# This file is distributed under the same license as the user help. +# +# Gabor Kelemen , 2016. +msgid "" +msgstr "" +"Project-Id-Version: gnome-taquin_help master\n" +"POT-Creation-Date: 2016-03-05 10:34+0000\n" +"PO-Revision-Date: 2016-03-07 22:07+0100\n" +"Last-Translator: Gabor Kelemen \n" +"Language-Team: Hungarian \n" +"Language: hu\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" + +#. Put one translator per line, in the form NAME , YEAR1, YEAR2 +msgctxt "_" +msgid "translator-credits" +msgstr "Kelemen Gábor , 2016." + +#. (itstool) path: credit/name +#: C/15-Puzzle.page:10 C/16-Puzzle.page:10 C/beginning.page:10 C/index.page:12 +#: C/shortcuts.page:10 C/start-screen.page:10 +msgid "Arnaud Bonatti" +msgstr "Arnaud Bonatti" + +#. (itstool) path: credit/years +#: C/15-Puzzle.page:12 C/16-Puzzle.page:12 C/beginning.page:12 +#: C/shortcuts.page:12 C/start-screen.page:12 +msgid "2014" +msgstr "2014" + +#. (itstool) path: page/title +#: C/15-Puzzle.page:18 +msgid "15-Puzzle" +msgstr "15-ös kirakó" + +#. (itstool) path: page/p +#: C/15-Puzzle.page:20 +msgid "" +"The 15-Puzzle is the default puzzle of Taquin. It is " +"displayed the first time the application is opened. You can start one at any " +"time from the Start Screen." +msgstr "" +"A 15-ös kirakó a Taquin alapértelmezett feladványa. Az " +"alkalmazás megnyitásakor jelenik meg. A Kezdőképernyőről bármikor elindíthatja." + +#. (itstool) path: section/title +#: C/15-Puzzle.page:23 C/16-Puzzle.page:23 +msgid "Gameplay" +msgstr "Játékmenet" + +#. (itstool) path: section/p +#: C/15-Puzzle.page:25 C/16-Puzzle.page:25 +msgid "The goal is to move all the tiles to their proper places." +msgstr "A játék célja az összes csempe megfelelő helyre mozgatása." + +#. (itstool) path: section/p +#: C/15-Puzzle.page:27 +msgid "" +"There’s an empty space where you can move adjacent tiles by pushing them " +"onto it. You can push more than one tile at the same time in the empty " +"space’s direction." +msgstr "" +"Van egy üres hely, ahová a szomszédos csempéket áttolhatja. Egyszerre több " +"csempét is áttolhat a hely irányába." + +#. (itstool) path: section/title +#: C/15-Puzzle.page:31 C/16-Puzzle.page:31 +msgid "End of the game" +msgstr "A játék vége" + +#. (itstool) path: section/p +#: C/15-Puzzle.page:32 C/16-Puzzle.page:32 +msgid "" +"At the end of the game, Taquin notifies you and displays the " +"complete image." +msgstr "" +"A játék végén a Taquin értesítést jelenít meg, a teljes képpel " +"együtt." + +#. (itstool) path: section/p +#: C/15-Puzzle.page:33 C/16-Puzzle.page:33 +msgid "" +"You can click the Start Over button to go to the Start Screen." +msgstr "" +"A Kezdőképernyőre való visszatéréshez " +"kattintson az Újrakezdés gombra." + +#. (itstool) path: section/title +#: C/15-Puzzle.page:37 C/16-Puzzle.page:37 +msgid "How to play with a mouse" +msgstr "Játék az egér használatával" + +#. (itstool) path: section/p +#: C/15-Puzzle.page:39 C/15-Puzzle.page:57 C/16-Puzzle.page:39 +#: C/16-Puzzle.page:55 +msgid "To make a move:" +msgstr "Lépéshez:" + +#. (itstool) path: item/p +#: C/15-Puzzle.page:41 C/beginning.page:25 +msgid "Click on a tile on the same row or column as the empty space." +msgstr "" +"Kattintson egy csempére ugyanabban a sorban vagy oszlopban, mint ahol az " +"üres hely van." + +#. (itstool) path: note/p +#: C/15-Puzzle.page:42 C/15-Puzzle.page:61 C/beginning.page:26 +msgid "" +"If you click on a tile that cannot move, the game notifies you that the move " +"is impossible." +msgstr "" +"Ha egy nem mozgatható csempére kattint, a játék értesíti, hogy a mozgatás " +"nem lehetséges." + +#. (itstool) path: item/p +#: C/15-Puzzle.page:45 C/16-Puzzle.page:43 +msgid "" +"You can always undo a move by clicking the Undo button at the " +"left of the header bar." +msgstr "" +"Bármikor visszavonhat egy lépést a fejlécsáv bal oldalán lévő " +"Visszavonás gombbal." + +#. (itstool) path: item/p +#: C/15-Puzzle.page:47 C/16-Puzzle.page:45 C/beginning.page:31 +msgid "" +"At the end of the game, or when you want to switch games, click the " +"Start Over button to go to the Start " +"Screen." +msgstr "" +"A játék végén, vagy ha a játékmódok közt szeretne váltani, kattintson az " +"Újrakezdés gombra a Kezdőképernyőre való visszatéréshez." + +#. (itstool) path: section/p +#: C/15-Puzzle.page:51 C/16-Puzzle.page:49 +msgid "You can also use the keyboard." +msgstr "A billentyűzetet is használhatja." + +#. (itstool) path: section/title +#: C/15-Puzzle.page:55 C/16-Puzzle.page:53 +msgid "How to play with the keyboard" +msgstr "Játék a billentyűzet használatával" + +#. (itstool) path: item/p +#: C/15-Puzzle.page:59 +msgid "" +"Use the Left, Right, Up and Down " +"arrows to go at the tile you want to move. The currently selected tile is " +"indicated with four arrows around the board, on each side of its row and " +"column." +msgstr "" +"Használja a Balra, Jobbra, Fel és Le nyilakat a mozgatni kívánt csempe kiválasztásához. Az éppen kijelölt " +"csempét négy nyíl jelöli a tábla körül, a sora és oszlopa oldalain." + +#. (itstool) path: item/p +#: C/15-Puzzle.page:60 +msgid "" +"Use the Space key to move the selected tile in the direction of " +"the empty space." +msgstr "" +"A Szóköz billentyűvel mozgathatja a kijelölt csempét az üres hely " +"irányába." + +#. (itstool) path: item/p +#: C/15-Puzzle.page:64 C/16-Puzzle.page:60 +msgid "" +"You can always undo a move with the CtrlZ keys." +msgstr "" +"Egy lépést bármikor visszavonhat a CtrlZ kombinációval." + +#. (itstool) path: item/p +#: C/15-Puzzle.page:66 C/16-Puzzle.page:62 +msgid "" +"At the end of the game, or when you want to switch games, use the the " +"CtrlN keys to go to the Start Screen." +msgstr "" +"A játék végén, vagy ha a játékmódok közt szeretne váltani, nyomja meg a " +"CtrlN kombinációt a Kezdőképernyőre való visszatéréshez." + +#. (itstool) path: section/p +#: C/15-Puzzle.page:70 C/16-Puzzle.page:66 +msgid "You can also use a mouse." +msgstr "Használhatja az egeret is." + +#. (itstool) path: page/title +#: C/16-Puzzle.page:18 +msgid "16-Puzzle" +msgstr "16-os kirakó" + +#. (itstool) path: page/p +#: C/16-Puzzle.page:20 +msgid "" +"The 16-Puzzle is the variant puzzle of Taquin. You can " +"launch it at any time from the Start Screen." +msgstr "" +"A 16-os kirakó a Taquin módosított feladványa. A Kezdőképernyőről bármikor elindíthatja." + +#. (itstool) path: section/p +#: C/16-Puzzle.page:27 +msgid "" +"You move all the tiles of a row or a column in one direction. The tile that " +"is pushed out of the board is placed at the opposite side of the row or " +"column." +msgstr "" +"A sor vagy oszlop összes csempéje egy irányba fog mozdulni. A tábláról kitolt " +"csempe a sor vagy oszlop másik végére kerül." + +#. (itstool) path: item/p +#: C/16-Puzzle.page:41 +msgid "" +"Click on one of the arrows displayed around the board. The row or column at " +"the end of which this arrow is moves in this direction, and the tile that " +"was next to the arrow is placed at the opposite side." +msgstr "" +"Kattintson a tábla körül megjelenő nyilak egyikére. A sor vagy oszlop a nyíl " +"irányába mozdul, és a nyíl melletti csempe átkerül a másik oldalra." + +#. (itstool) path: item/p +#: C/16-Puzzle.page:57 +msgid "" +"Use the Left, Right, Up and Down " +"arrows to go at the row or the column you want to move. The currently " +"selected row and column are indicated with two lights around the board." +msgstr "" +"Használja a Balra, Jobbra, Fel és Le nyilakat a mozgatni kívánt sor vagy oszlop kiválasztásához. Az éppen " +"kijelölt " +"sort és oszlopot két fény jelöli a tábla körül." + +#. (itstool) path: item/p +#: C/16-Puzzle.page:58 +msgid "" +"Use the CtrlLeft or " +"CtrlRight keys to move a row, or the " +"CtrlUp and CtrlDown keys to move a column." +msgstr "" +"Használja a CtrlBalra és " +"CtrlJobbra kombinációt egy sor mozgatására, vagy a " +"CtrlFel és Ctrl" +"Le kombinációt egy oszlop mozgatására." + +#. (itstool) path: page/title +#: C/beginning.page:18 +msgid "Beginning" +msgstr "Kezdés" + +#. (itstool) path: page/p +#: C/beginning.page:20 +msgid "" +"When Taquin is opened for the first time, it displays a " +"traditional 15-Puzzle game." +msgstr "" +"A Taquin első megnyitásakor egy hagyományos 15-ös kirakó játékot jelenít meg." + +#. (itstool) path: page/p +#: C/beginning.page:22 +msgid "The game is played using the mouse. To make a move:" +msgstr "A játékot az egérrel kell játszani. A lépéshez:" + +#. (itstool) path: item/p +#: C/beginning.page:29 +msgid "" +"You can always undo a move by clicking the Undo button on the " +"left of the header bar." +msgstr "" +"Bármikor visszavonhat egy lépést a fejlécsáv bal oldalán lévő " +"Visszavonás gombbal." + +#. (itstool) path: page/p +#: C/beginning.page:35 +msgid "" +"After the first time it is opened, Taquin displays a puzzle with " +"the same rules and dimensions as the last one played when it is opened, so " +"it could be a 16-Puzzle game." +msgstr "" +"Az első megnyitása után a Taquin az utoljára játszottal egyező " +"típusú és méretű kirakót jelenít meg, így ez egy " +"16-os kirakó is lehet." + +#. (itstool) path: info/title +#: C/index.page:8 +msgctxt "link" +msgid "Taquin" +msgstr "Taquin" + +#. (itstool) path: info/title +#: C/index.page:9 +msgctxt "text" +msgid "Taquin" +msgstr "Taquin" + +#. (itstool) path: license/p +#: C/index.page:16 +msgid "" +"Creative Commons Attribution-ShareAlike 4.0 International (CC BY-SA 4.0)" +msgstr "" +"Creative Commons Attribution-ShareAlike 4.0 International (CC BY-SA 4.0)" + +#. (itstool) path: media/span +#: C/index.page:20 +msgid "Taquin logo" +msgstr "Taquin logó" + +#. (itstool) path: page/title +#: C/index.page:20 +msgid "<_:media-1/> Taquin" +msgstr "<_:media-1/> Taquin" + +#. (itstool) path: page/p +#: C/index.page:22 +msgid "" +"Taquin is a sliding-block puzzle game. It includes the " +"traditional 15-Puzzle invented in the early 1880s, and the more recent 16-" +"Puzzle variant." +msgstr "" +"A Taquin egy csempecsúsztatós kirakós játék. Tartalmazza az " +"1880-as évek elején kitalált hagyományos 15-ös kirakót, és a későbbi 16-os " +"változatot is." + +#. (itstool) path: section/title +#: C/index.page:26 +msgid "How to Play" +msgstr "Hogyan kell játszani?" + +#. (itstool) path: section/title +#: C/index.page:38 +msgid "Advanced" +msgstr "Speciális" + +#. (itstool) path: p/link +#: C/legal.xml:3 +msgid "Creative Commons Attribution-ShareAlike 4.0 International license" +msgstr "Creative Commons Attribution-ShareAlike 4.0 International license" + +#. (itstool) path: license/p +#: C/legal.xml:3 +msgid "This work is licensed under a <_:link-1/>." +msgstr "Ez a munka a <_:link-1/> feltételei szerint használható." + +#. (itstool) path: info/desc +#: C/license.page:8 +msgid "Legal information." +msgstr "Jogi információk." + +#. (itstool) path: page/title +#: C/license.page:11 +msgid "License" +msgstr "Licenc" + +#. (itstool) path: page/p +#: C/license.page:12 +msgid "" +"This work is distributed under a Creative Commons Attribution-ShareAlike 4.0 " +"International license." +msgstr "" +"Ez a munka a Creative Commons Attribution-ShareAlike 4.0 International " +"licenc alatt érhető el." + +#. (itstool) path: page/p +#: C/license.page:20 +msgid "You are free:" +msgstr "Jogában áll:" + +#. (itstool) path: item/title +#: C/license.page:25 +msgid "To share" +msgstr "Megosztani" + +#. (itstool) path: item/p +#: C/license.page:26 +msgid "To copy, distribute and transmit the work." +msgstr "Másolni, terjeszteni és továbbítani a művet." + +#. (itstool) path: item/title +#: C/license.page:29 +msgid "To remix" +msgstr "Feldolgozni" + +#. (itstool) path: item/p +#: C/license.page:30 +msgid "To adapt the work." +msgstr "Módosítani a művet." + +#. (itstool) path: page/p +#: C/license.page:33 +msgid "Under the following conditions:" +msgstr "A következő feltételek szerint:" + +#. (itstool) path: item/title +#: C/license.page:38 +msgid "Attribution" +msgstr "Nevezd meg!" + +#. (itstool) path: item/p +#: C/license.page:39 +msgid "" +"You must attribute the work in the manner specified by the author or " +"licensor (but not in any way that suggests that they endorse you or your use " +"of the work)." +msgstr "" +"A szerző vagy a jogosult által meghatározott módon fel kell tüntetnie a " +"műhöz kapcsolódó információkat (pl. a szerző nevét vagy álnevét, a Mű címét)." + +#. (itstool) path: item/title +#: C/license.page:46 +msgid "Share Alike" +msgstr "Így add tovább!" + +#. (itstool) path: item/p +#: C/license.page:47 +msgid "" +"If you alter, transform, or build upon this work, you may distribute the " +"resulting work only under the same, similar or a compatible license." +msgstr "" +"Ha megváltoztatja, átalakítja, feldolgozza ezt a művet, az így létrejött " +"alkotást csak a jelenlegivel megegyező licenc alatt terjesztheti." + +#. (itstool) path: page/p +#: C/license.page:53 +msgid "" +"For the full text of the license, see the CreativeCommons website, or read the full Commons Deed." +msgstr "" +"A licenc teljes szövegéért lásd a CreativeCommons weboldalát, vagy a " +"teljes Commons " +"összefoglalót." + +#. (itstool) path: page/title +#: C/shortcuts.page:18 +msgid "Keyboard Shortcuts" +msgstr "Gyorsbillentyűk" + +#. (itstool) path: page/p +#: C/shortcuts.page:20 +msgid "" +"Taquin can easily be used with keyboard. The 15-Puzzle and 16-Puzzle both have specific shortcuts." +msgstr "" +"A Taquin egyszerűen használható a billentyűzetről is. A 15-ös kirakó és a 16-os kirakó is rendelkezik csak rájuk jellemző " +"gyorsbillentyűkkel." + +#. (itstool) path: section/title +#: C/shortcuts.page:23 +msgid "In-game shortcuts" +msgstr "Gyorsbillentyűk a játék közben" + +#. (itstool) path: td/p +#: C/shortcuts.page:26 +msgid "Show new-game screen" +msgstr "új játék képernyő megjelenítése" + +#. (itstool) path: td/p +#: C/shortcuts.page:27 +msgid "CtrlN" +msgstr "CtrlN" + +#. (itstool) path: td/p +#: C/shortcuts.page:30 +msgid "Undo last move" +msgstr "Az utolsó lépés visszavonása" + +#. (itstool) path: td/p +#: C/shortcuts.page:31 +msgid "CtrlZ" +msgstr "CtrlZ" + +#. (itstool) path: section/title +#: C/shortcuts.page:36 +msgid "15-Puzzle shortcuts" +msgstr "15-ös kirakó gyorsbillentyűi" + +#. (itstool) path: td/p +#: C/shortcuts.page:39 C/shortcuts.page:52 +msgid "Change selected tile" +msgstr "Kijelölt csempe módosítása" + +#. (itstool) path: td/p +#: C/shortcuts.page:40 C/shortcuts.page:53 +msgid "Left, Right, Up and Down" +msgstr "Balra, Jobbra, Fel és Le" + +#. (itstool) path: td/p +#: C/shortcuts.page:43 +msgid "Push tile in empty space’s direction" +msgstr "Csempe eltolása az üres hely felé" + +#. (itstool) path: td/p +#: C/shortcuts.page:44 +msgid "Space or KP_Enter" +msgstr "Szóköz vagy a numerikus Enter" + +#. (itstool) path: section/title +#: C/shortcuts.page:49 +msgid "16-Puzzle shortcuts" +msgstr "16-os kirakó gyorsbillentyűi" + +#. (itstool) path: td/p +#: C/shortcuts.page:56 +msgid "Move row" +msgstr "Sor mozgatása" + +#. (itstool) path: td/p +#: C/shortcuts.page:57 +msgid "" +"CtrlLeft and CtrlRight" +msgstr "" +"CtrlBalra és CtrlJobbra" + +#. (itstool) path: td/p +#: C/shortcuts.page:60 +msgid "Move column" +msgstr "Oszlop áthelyezése" + +#. (itstool) path: td/p +#: C/shortcuts.page:61 +msgid "" +"CtrlUp and CtrlDown" +msgstr "" +"CtrlFel és CtrlLe" + +#. (itstool) path: section/title +#: C/shortcuts.page:66 +msgid "Start Screen shortcuts" +msgstr "Kezdőképernyő gyorsbillentyűi" + +#. (itstool) path: td/p +#: C/shortcuts.page:69 +msgid "New Game" +msgstr "Új játék" + +#. (itstool) path: td/p +#: C/shortcuts.page:70 +msgid "CtrlShiftN" +msgstr "CtrlShiftN" + +#. (itstool) path: td/p +#: C/shortcuts.page:73 +msgid "Back to previous game (if any)" +msgstr "Vissza az előző játékra (ha volt)" + +#. (itstool) path: td/p +#: C/shortcuts.page:74 +msgid "Escape" +msgstr "Escape" + +#. (itstool) path: section/title +#: C/shortcuts.page:79 +msgid "General shortcuts" +msgstr "Általános gyorsbillentyűk" + +#. (itstool) path: td/p +#: C/shortcuts.page:82 +msgid "Help" +msgstr "Súgó" + +#. (itstool) path: td/p +#: C/shortcuts.page:83 +msgid "F1" +msgstr "F1" + +#. (itstool) path: td/p +#: C/shortcuts.page:86 +msgid "Quit" +msgstr "Kilépés" + +#. (itstool) path: td/p +#: C/shortcuts.page:87 +msgid "CtrlQ" +msgstr "CtrlQ" + +#. (itstool) path: page/title +#: C/start-screen.page:18 +msgid "Start Screen" +msgstr "Kezdőképernyő" + +#. (itstool) path: page/p +#: C/start-screen.page:19 +msgid "" +"The Start Screen is the place to select your options and launch a " +"new game, either a 15-Puzzle or a 16-Puzzle." +msgstr "" +"A Kezdőképernyőn választhat a beállítások közül, és indíthat új <" +"link xref=\"15-Puzzle\">15-ös vagy 16-os<" +"/link> kirakót." + +#. (itstool) path: page/p +#: C/start-screen.page:20 +msgid "" +"It can be accessed at any time from a game by pressing the Start Over button." +msgstr "" +"Bármikor elérhető a játékból az Újrakezdés gomb megnyomásával." + diff -Nru gnome-taquin-3.18.1.1/help/hu/index.page gnome-taquin-3.20.2/help/hu/index.page --- gnome-taquin-3.18.1.1/help/hu/index.page 1970-01-01 00:00:00.000000000 +0000 +++ gnome-taquin-3.20.2/help/hu/index.page 2016-05-09 00:14:11.000000000 +0000 @@ -0,0 +1,44 @@ + + + + + <media type="image" src="figures/logo.png" its:translate="no"/> + Taquin + Taquin + + + Arnaud Bonatti + arnaud.bonatti@gmail.com + + +

Creative Commons Attribution-ShareAlike 4.0 International (CC BY-SA 4.0)

+ + + + Kelemen Gábor + kelemeng at ubuntu dot com + 2016. + + + + <media type="image" src="figures/logo32.png" its:translate="no"><span its:translate="yes">Taquin logó</span></media> Taquin + +

A Taquin egy csempecsúsztatós kirakós játék. Tartalmazza az 1880-as évek elején kitalált hagyományos 15-ös kirakót, és a későbbi 16-os változatot is.

+ +
+ Hogyan kell játszani? +
+ +
+ Speciális +
+ + diff -Nru gnome-taquin-3.18.1.1/help/hu/legal.xml gnome-taquin-3.20.2/help/hu/legal.xml --- gnome-taquin-3.18.1.1/help/hu/legal.xml 1970-01-01 00:00:00.000000000 +0000 +++ gnome-taquin-3.20.2/help/hu/legal.xml 2016-05-09 00:14:11.000000000 +0000 @@ -0,0 +1,4 @@ + + +

Ez a munka a Creative Commons Attribution-ShareAlike 4.0 International license feltételei szerint használható.

+ diff -Nru gnome-taquin-3.18.1.1/help/hu/license.page gnome-taquin-3.20.2/help/hu/license.page --- gnome-taquin-3.18.1.1/help/hu/license.page 1970-01-01 00:00:00.000000000 +0000 +++ gnome-taquin-3.20.2/help/hu/license.page 2016-05-09 00:14:11.000000000 +0000 @@ -0,0 +1,41 @@ + + + + + + + Jogi információk. + + + Kelemen Gábor + kelemeng at ubuntu dot com + 2016. + + + + Licenc +

Ez a munka a Creative Commons Attribution-ShareAlike 4.0 International licenc alatt érhető el.

+

Jogában áll:

+ + + <em>Megosztani</em> +

Másolni, terjeszteni és továbbítani a művet.

+ + + <em>Feldolgozni</em> +

Módosítani a művet.

+ + +

A következő feltételek szerint:

+ + + <em>Nevezd meg!</em> +

A szerző vagy a jogosult által meghatározott módon fel kell tüntetnie a műhöz kapcsolódó információkat (pl. a szerző nevét vagy álnevét, a Mű címét).

+ + + <em>Így add tovább!</em> +

Ha megváltoztatja, átalakítja, feldolgozza ezt a művet, az így létrejött alkotást csak a jelenlegivel megegyező licenc alatt terjesztheti.

+ + +

A licenc teljes szövegéért lásd a CreativeCommons weboldalát, vagy a teljes Commons összefoglalót.

+ diff -Nru gnome-taquin-3.18.1.1/help/hu/shortcuts.page gnome-taquin-3.20.2/help/hu/shortcuts.page --- gnome-taquin-3.18.1.1/help/hu/shortcuts.page 1970-01-01 00:00:00.000000000 +0000 +++ gnome-taquin-3.20.2/help/hu/shortcuts.page 2016-05-09 00:14:11.000000000 +0000 @@ -0,0 +1,96 @@ + + + + + + + + + Arnaud Bonatti + arnaud.bonatti@gmail.com + 2014 + + + + + + Kelemen Gábor + kelemeng at ubuntu dot com + 2016. + + + + Gyorsbillentyűk + +

A Taquin egyszerűen használható a billentyűzetről is. A 15-ös kirakó és a 16-os kirakó is rendelkezik csak rájuk jellemző gyorsbillentyűkkel.

+ +
+ Gyorsbillentyűk a játék közben + + + + + + + + + +

új játék képernyő megjelenítése

CtrlN

Az utolsó lépés visszavonása

CtrlZ

+
+
+ 15-ös kirakó gyorsbillentyűi + + + + + + + + + +

Kijelölt csempe módosítása

Balra, Jobbra, Fel és Le

Csempe eltolása az üres hely felé

Szóköz vagy a numerikus Enter

+
+
+ 16-os kirakó gyorsbillentyűi + + + + + + + + + + + + + +

Kijelölt csempe módosítása

Balra, Jobbra, Fel és Le

Sor mozgatása

CtrlBalra és CtrlJobbra

Oszlop áthelyezése

CtrlFel és CtrlLe

+
+
+ Kezdőképernyő gyorsbillentyűi + + + + + + + + + +

Új játék

CtrlShiftN

Vissza az előző játékra (ha volt)

Escape

+
+
+ Általános gyorsbillentyűk + + + + + + + + + +

Súgó

F1

Kilépés

CtrlQ

+
+ diff -Nru gnome-taquin-3.18.1.1/help/hu/start-screen.page gnome-taquin-3.20.2/help/hu/start-screen.page --- gnome-taquin-3.18.1.1/help/hu/start-screen.page 1970-01-01 00:00:00.000000000 +0000 +++ gnome-taquin-3.20.2/help/hu/start-screen.page 2016-05-09 00:14:11.000000000 +0000 @@ -0,0 +1,27 @@ + + + + + + + + + Arnaud Bonatti + arnaud.bonatti@gmail.com + 2014 + + + + + + Kelemen Gábor + kelemeng at ubuntu dot com + 2016. + + + + Kezdőképernyő +

A Kezdőképernyőn választhat a beállítások közül, és indíthat új 15-ös vagy 16-os kirakót.

+

Bármikor elérhető a játékból az Újrakezdés gomb megnyomásával.

+ + diff -Nru gnome-taquin-3.18.1.1/help/Makefile.am gnome-taquin-3.20.2/help/Makefile.am --- gnome-taquin-3.18.1.1/help/Makefile.am 2015-10-15 03:50:55.000000000 +0000 +++ gnome-taquin-3.20.2/help/Makefile.am 2016-03-24 10:46:09.000000000 +0000 @@ -18,6 +18,6 @@ shortcuts.page \ start-screen.page -HELP_LINGUAS = cs de el +HELP_LINGUAS = cs de el es fr hu sv -include $(top_srcdir)/git.mk diff -Nru gnome-taquin-3.18.1.1/help/Makefile.in gnome-taquin-3.20.2/help/Makefile.in --- gnome-taquin-3.18.1.1/help/Makefile.in 2015-10-15 03:55:13.000000000 +0000 +++ gnome-taquin-3.20.2/help/Makefile.in 2016-05-09 00:14:07.000000000 +0000 @@ -87,7 +87,10 @@ POST_UNINSTALL = : subdir = help ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -am__aclocal_m4_deps = $(top_srcdir)/configure.ac +am__aclocal_m4_deps = $(top_srcdir)/m4/appstream-xml.m4 \ + $(top_srcdir)/m4/gsettings.m4 $(top_srcdir)/m4/intltool.m4 \ + $(top_srcdir)/m4/nls.m4 $(top_srcdir)/m4/pkg.m4 \ + $(top_srcdir)/m4/yelp.m4 $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) DIST_COMMON = $(srcdir)/Makefile.am $(am__DIST_COMMON) @@ -133,7 +136,6 @@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ DESKTOP_FILE_VALIDATE = @DESKTOP_FILE_VALIDATE@ -DISABLE_DEPRECATED = @DISABLE_DEPRECATED@ ECHO_C = @ECHO_C@ ECHO_N = @ECHO_N@ ECHO_T = @ECHO_T@ @@ -257,7 +259,7 @@ shortcuts.page \ start-screen.page -HELP_LINGUAS = cs de el +HELP_LINGUAS = cs de el es fr hu sv all: all-am .SUFFIXES: diff -Nru gnome-taquin-3.18.1.1/help/sv/15-Puzzle.page gnome-taquin-3.20.2/help/sv/15-Puzzle.page --- gnome-taquin-3.18.1.1/help/sv/15-Puzzle.page 1970-01-01 00:00:00.000000000 +0000 +++ gnome-taquin-3.20.2/help/sv/15-Puzzle.page 2016-05-09 00:14:12.000000000 +0000 @@ -0,0 +1,77 @@ + + + + + + + + + Arnaud Bonatti + arnaud.bonatti@gmail.com + 2014 + + + + + + Sebastian Rasmussen + sebras@gmail.com + 2015 + + + + 15-pussel + +

Standardpusslet i Taquin är ett 15-pussel. Det visas första gången programmet öppnas. Du kan starta ett när som helst från startskärmen.

+ +
+ Spelidé + +

Målet är att flytta alla brickor till deras korrekta positioner.

+ +

Det finns en tom plats dit du kan flytta intilliggande brickor genom att skjuta dem dit. Du kan skjuta mer än en bricka åt gången åt det håll som den tomma platsen finns.

+ +
+
+ Hur spelet slutar +

När spelet tar slut så aviserar Taquin dig om detta och visar den fullständiga bilden.

+

Du kan klicka på knappen Börja om för att gå till startskärmen.

+
+ +
+ Hur man spelar med en mus + +

För att göra ett drag:

+ +

Klicka på en bricka i samma rad eller kolumn som den tomma platsen.

+

Om du klickar på en bricka som inte kan flyttas så aviserar spelet dig om att draget är omöjligt.

+ + +

Du kan alltid göra ett drag ogjort genom att klicka på Ångra-knappen till vänster om rubrikraden.

+ +

Vid spelets slut, eller när du vill byta spel, klicka på knappen Börja om för att gå till startskärmen.

+ + + +

Du kan även använda tangentbordet.

+
+ +
+ Hur man spelar med ett tangentbord + +

För att göra ett drag:

+ +

Använd piltangenterna Vänster, Höger, Upp och Ned för att navigera till brickan du vill flytta. Den valda brickan indikeras med fyra pilar runt spelbrädet på varje sida om dess rad och kolumn.

 +

Använd blanksteg för att flytta den markerade brickan i riktning mot den tomma platsen.

+

Om du klickar på en bricka som inte kan flyttas så aviserar spelet dig om att draget är omöjligt.

+ + +

Du kan alltid ångra ett drag med tangenterna CtrlZ.

+ +

Vid spelets slut, eller när du vill byta spel, använd tangenterna CtrlN för att gå till startskärmen.

+ + + +

Du kan också använda en mus.

+
+ diff -Nru gnome-taquin-3.18.1.1/help/sv/16-Puzzle.page gnome-taquin-3.20.2/help/sv/16-Puzzle.page --- gnome-taquin-3.18.1.1/help/sv/16-Puzzle.page 1970-01-01 00:00:00.000000000 +0000 +++ gnome-taquin-3.20.2/help/sv/16-Puzzle.page 2016-05-09 00:14:12.000000000 +0000 @@ -0,0 +1,73 @@ + + + + + + + + + Arnaud Bonatti + arnaud.bonatti@gmail.com + 2014 + + + + + + Sebastian Rasmussen + sebras@gmail.com + 2015 + + + + 16-pussel + +

16-pussel är en spelvariant som finns i Taquin. Du kan starta det när du vill från startskärmen.

+ +
+ Spelidé + +

Målet är att flytta alla brickor till deras korrekta positioner.

+ +

Du flyttar alla brickorna i en rad eller kolumn i en riktning. Brickan som knuffas ut från spelplanen placera på motsatt sida av raden eller kolumnen.

+ +
+
+ Hur spelet slutar +

När spelet tar slut så aviserar Taquin dig om detta och visar den fullständiga bilden.

+

Du kan klicka på knappen Börja om för att gå till startskärmen.

+
+ +
+ Hur man spelar med en mus + +

För att göra ett drag:

+ +

Klicka på en av pilarna som visas runt brädet. Raden eller kolumnen i slutet på pilen kommer att flytta i denna riktning, och brickan som fanns intill pilen placeras på motsatt sida.

+ +

Du kan alltid göra ett drag ogjort genom att klicka på Ångra-knappen till vänster om rubrikraden.

+ +

Vid spelets slut, eller när du vill byta spel, klicka på knappen Börja om för att gå till startskärmen.

+ + + +

Du kan även använda tangentbordet.

+
+ +
+ Hur man spelar med ett tangentbord + +

För att göra ett drag:

+ +

Använd piltangenterna Vänster, Höger, Upp och Ned för att navigera till raden eller kolumnen du vill flytta. Den valda raden och kolumnen indikeras med två lampor runt brädet.

 +

Använd tangenterna CtrlVänster eller CtrlHöger för att flytta en rad, eller tangenterna CtrlUpp och CtrlNed för att flytta en kolumn.

+ +

Du kan alltid ångra ett drag med tangenterna CtrlZ.

+ +

Vid spelets slut, eller när du vill byta spel, använd tangenterna CtrlN för att gå till startskärmen.

+ + + +

Du kan också använda en mus.

+
+ diff -Nru gnome-taquin-3.18.1.1/help/sv/beginning.page gnome-taquin-3.20.2/help/sv/beginning.page --- gnome-taquin-3.18.1.1/help/sv/beginning.page 1970-01-01 00:00:00.000000000 +0000 +++ gnome-taquin-3.20.2/help/sv/beginning.page 2016-05-09 00:14:12.000000000 +0000 @@ -0,0 +1,42 @@ + + + + + + + + + Arnaud Bonatti + arnaud.bonatti@gmail.com + 2014 + + + + + + Sebastian Rasmussen + sebras@gmail.com + 2015 + + + + Inledning + +

När Taquin öppnas för första gången visas ett traditionellt 15-pussel.

+ +

Spelet spelas med musen. För att göra ett drag:

+ + +

Klicka på en bricka i samma rad eller kolumn som den tomma platsen.

+

Om du klickar på en bricka som inte kan flyttas så aviserar spelet dig om att draget är omöjligt.

+ + +

Du kan alltid ångra ett drag genom att klicka på Ångra-knappen till vänster i rubrikraden.

+ +

Vid spelets slut, eller när du vill byta spel, klicka på knappen Börja om för att gå till startskärmen.

+ + + +

Efter att det öppnats för första gången kommer Taquin att visa ett pussel med samma regler och dimensioner som det som spelades senast det var öppet, så det skulle kunna vara ett 16-pussel.

+ + diff -Nru gnome-taquin-3.18.1.1/help/sv/index.page gnome-taquin-3.20.2/help/sv/index.page --- gnome-taquin-3.18.1.1/help/sv/index.page 1970-01-01 00:00:00.000000000 +0000 +++ gnome-taquin-3.20.2/help/sv/index.page 2016-05-09 00:14:12.000000000 +0000 @@ -0,0 +1,44 @@ + + + + + <media type="image" src="figures/logo.png" its:translate="no"/> + Taquin + Taquin + + + Arnaud Bonatti + arnaud.bonatti@gmail.com + + +

Creative Commons Erkännande-DelaLika 4.0 Internationell (CC BY-SA 4.0)

+ + + + Sebastian Rasmussen + sebras@gmail.com + 2015 + + + + <media type="image" src="figures/logo32.png" its:translate="no"><span its:translate="yes">Logo för Taquin</span></media> Taquin + +

Taquin är ett pusselspel där man flyttar brickor. Både det traditionella 15-pusslet som uppfanns redan under det tidiga 1880-talet och den senare varianten 16-pussel ingår.

+ +
+ Hur man spelar +
+ +
+ Avancerat +
+ + diff -Nru gnome-taquin-3.18.1.1/help/sv/legal.xml gnome-taquin-3.20.2/help/sv/legal.xml --- gnome-taquin-3.18.1.1/help/sv/legal.xml 1970-01-01 00:00:00.000000000 +0000 +++ gnome-taquin-3.20.2/help/sv/legal.xml 2016-05-09 00:14:12.000000000 +0000 @@ -0,0 +1,4 @@ + + +

Detta verk är licensierat under licensen Creative Commons Erkännande-DelaLika 4.0 Internationell.

+ diff -Nru gnome-taquin-3.18.1.1/help/sv/license.page gnome-taquin-3.20.2/help/sv/license.page --- gnome-taquin-3.18.1.1/help/sv/license.page 1970-01-01 00:00:00.000000000 +0000 +++ gnome-taquin-3.20.2/help/sv/license.page 2016-05-09 00:14:12.000000000 +0000 @@ -0,0 +1,41 @@ + + + + + + + Juridisk information. + + + Sebastian Rasmussen + sebras@gmail.com + 2015 + + + + Licens +

Detta verk distribueras under licensen CreativeCommons Erkännande-DelaLika 4.0 Internationell.

+

Du får lov att:

+ + + <em>Dela</em> +

Att kopiera, distribuera och överföra verket.

+ + + <em>Förändra</em> +

Anpassa verket.

+ + +

Under följande villkor:

+ + + <em>Erkännande</em> +

Du måste ge upphovsmannen eller licensgivaren erkännande på det sätt som begärts (men inte på ett sätt som antyder att de stödjer dig eller din användning av verket).

+ + + <em>Dela lika</em> +

Om du förändrar, transformerar eller bygger vidare på detta verk, så får du distribuera det resulterande verkar under samma, liknande eller en kompatibel licens.

+ + +

För den fullständiga texten för licensen, se vidare på CreativeCommons webbplats, eller läs det fullständiga Commons-kontraktet.

+ diff -Nru gnome-taquin-3.18.1.1/help/sv/shortcuts.page gnome-taquin-3.20.2/help/sv/shortcuts.page --- gnome-taquin-3.18.1.1/help/sv/shortcuts.page 1970-01-01 00:00:00.000000000 +0000 +++ gnome-taquin-3.20.2/help/sv/shortcuts.page 2016-05-09 00:14:12.000000000 +0000 @@ -0,0 +1,96 @@ + + + + + + + + + Arnaud Bonatti + arnaud.bonatti@gmail.com + 2014 + + + + + + Sebastian Rasmussen + sebras@gmail.com + 2015 + + + + Tangentbordsgenvägar + +

Taquin kan lätt användas från tangentbordet. Både 15-pusslet och 16-pusslet har speciella genvägar.

+ +
+ Genvägar i spelet + + + + + + + + + +

Via skärmen för att starta ett nytt spel

CtrlN

Ångra senaste draget

CtrlZ

+
+
+ Genvägar för 15-pussel + + + + + + + + + +

Ändra markerad bricka

Vänster, Höger, Upp och Ned

Skjut brickan i den riktning som den tomma platsen finns

Blanksteg eller retur på numeriska tangentbordet

+
+
+ Genvägar för 16-pussel + + + + + + + + + + + + + +

Ändra markerad bricka

Vänster, Höger, Upp och Ned

Flytta rad

CtrlVänster och CtrlHöger

Flytta kolumn

CtrlUpp och CtrlNed

+
+
+ Genvägar för startskärmen + + + + + + + + + +

Nytt spel

CtrlSkiftN

Tillbaka till föregående spel (om sådant finns)

Escape

+
+
+ Allmänna genvägar + + + + + + + + + +

Hjälp

F1

Avsluta

CtrlQ

+
+ diff -Nru gnome-taquin-3.18.1.1/help/sv/start-screen.page gnome-taquin-3.20.2/help/sv/start-screen.page --- gnome-taquin-3.18.1.1/help/sv/start-screen.page 1970-01-01 00:00:00.000000000 +0000 +++ gnome-taquin-3.20.2/help/sv/start-screen.page 2016-05-09 00:14:12.000000000 +0000 @@ -0,0 +1,27 @@ + + + + + + + + + Arnaud Bonatti + arnaud.bonatti@gmail.com + 2014 + + + + + + Sebastian Rasmussen + sebras@gmail.com + 2015 + + + + Startskärmen +

Startskärmen är stället där du väljer dina inställningar och startar ett nytt spel, antingen ett 15-pussel eller ett 16-pussel.

+

Den kan nås när som helst från spelet genom att trycka på knappen Börja om.

+ + diff -Nru gnome-taquin-3.18.1.1/help/sv/sv.po gnome-taquin-3.20.2/help/sv/sv.po --- gnome-taquin-3.18.1.1/help/sv/sv.po 1970-01-01 00:00:00.000000000 +0000 +++ gnome-taquin-3.20.2/help/sv/sv.po 2016-03-24 10:46:09.000000000 +0000 @@ -0,0 +1,623 @@ +# Swedish translation for gnome-taquin. +# Copyright © 2015-2016 gnome-taquin's COPYRIGHT HOLDER +# This file is distributed under the same license as the gnome-taquin package. +# Sebastian Rasmussen , 2015-2016. +# +msgid "" +msgstr "" +"Project-Id-Version: gnome-taquin master\n" +"POT-Creation-Date: 2016-02-17 10:32+0000\n" +"PO-Revision-Date: 2016-02-17 23:10+0100\n" +"Last-Translator: Anders Jonsson \n" +"Language-Team: Swedish \n" +"Language: sv\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.8.7\n" + +#. Put one translator per line, in the form NAME , YEAR1, YEAR2 +msgctxt "_" +msgid "translator-credits" +msgstr "Sebastian Rasmussen , 2015" + +#. (itstool) path: credit/name +#: C/15-Puzzle.page:10 C/16-Puzzle.page:10 C/beginning.page:10 C/index.page:12 +#: C/shortcuts.page:10 C/start-screen.page:10 +msgid "Arnaud Bonatti" +msgstr "Arnaud Bonatti" + +#. (itstool) path: credit/years +#: C/15-Puzzle.page:12 C/16-Puzzle.page:12 C/beginning.page:12 +#: C/shortcuts.page:12 C/start-screen.page:12 +msgid "2014" +msgstr "2014" + +#. (itstool) path: page/title +#: C/15-Puzzle.page:18 +msgid "15-Puzzle" +msgstr "15-pussel" + +#. (itstool) path: page/p +#: C/15-Puzzle.page:20 +msgid "" +"The 15-Puzzle is the default puzzle of Taquin. It is " +"displayed the first time the application is opened. You can start one at any " +"time from the Start Screen." +msgstr "" +"Standardpusslet i Taquin är ett 15-pussel. Det visas " +"första gången programmet öppnas. Du kan starta ett när som helst från startskärmen." + +#. (itstool) path: section/title +#: C/15-Puzzle.page:23 C/16-Puzzle.page:23 +msgid "Gameplay" +msgstr "Spelidé" + +#. (itstool) path: section/p +#: C/15-Puzzle.page:25 C/16-Puzzle.page:25 +msgid "The goal is to move all the tiles to their proper places." +msgstr "Målet är att flytta alla brickor till deras korrekta positioner." + +#. (itstool) path: section/p +#: C/15-Puzzle.page:27 +msgid "" +"There’s an empty space where you can move adjacent tiles by pushing them " +"onto it. You can push more than one tile at the same time in the empty " +"space’s direction." +msgstr "" +"Det finns en tom plats dit du kan flytta intilliggande brickor genom att " +"skjuta dem dit. Du kan skjuta mer än en bricka åt gången åt det håll som den " +"tomma platsen finns." + +#. (itstool) path: section/title +#: C/15-Puzzle.page:31 C/16-Puzzle.page:31 +msgid "End of the game" +msgstr "Hur spelet slutar" + +#. (itstool) path: section/p +#: C/15-Puzzle.page:32 C/16-Puzzle.page:32 +msgid "" +"At the end of the game, Taquin notifies you and displays the " +"complete image." +msgstr "" +"När spelet tar slut så aviserar Taquin dig om detta och visar den " +"fullständiga bilden." + +#. (itstool) path: section/p +#: C/15-Puzzle.page:33 C/16-Puzzle.page:33 +msgid "" +"You can click the Start Over button to go to the Start Screen." +msgstr "" +"Du kan klicka på knappen Börja om för att gå till startskärmen." + +#. (itstool) path: section/title +#: C/15-Puzzle.page:37 C/16-Puzzle.page:37 +msgid "How to play with a mouse" +msgstr "Hur man spelar med en mus" + +#. (itstool) path: section/p +#: C/15-Puzzle.page:39 C/15-Puzzle.page:57 C/16-Puzzle.page:39 +#: C/16-Puzzle.page:55 +msgid "To make a move:" +msgstr "För att göra ett drag:" + +#. (itstool) path: item/p +#: C/15-Puzzle.page:41 C/beginning.page:25 +msgid "Click on a tile on the same row or column as the empty space." +msgstr "Klicka på en bricka i samma rad eller kolumn som den tomma platsen." + +#. (itstool) path: note/p +#: C/15-Puzzle.page:42 C/15-Puzzle.page:61 C/beginning.page:26 +msgid "" +"If you click on a tile that cannot move, the game notifies you that the move " +"is impossible." +msgstr "" +"Om du klickar på en bricka som inte kan flyttas så aviserar spelet dig om " +"att draget är omöjligt." + +#. (itstool) path: item/p +#: C/15-Puzzle.page:45 C/16-Puzzle.page:43 +msgid "" +"You can always undo a move by clicking the Undo button at the " +"left of the header bar." +msgstr "" +"Du kan alltid göra ett drag ogjort genom att klicka på Ångra-" +"knappen till vänster om rubrikraden." + +#. (itstool) path: item/p +#: C/15-Puzzle.page:47 C/16-Puzzle.page:45 C/beginning.page:31 +msgid "" +"At the end of the game, or when you want to switch games, click the " +"Start Over button to go to the Start " +"Screen." +msgstr "" +"Vid spelets slut, eller när du vill byta spel, klicka på knappen Börja " +"om för att gå till startskärmen." + +#. (itstool) path: section/p +#: C/15-Puzzle.page:51 C/16-Puzzle.page:49 +msgid "You can also use the keyboard." +msgstr "Du kan även använda tangentbordet." + +#. (itstool) path: section/title +#: C/15-Puzzle.page:55 C/16-Puzzle.page:53 +msgid "How to play with the keyboard" +msgstr "Hur man spelar med ett tangentbord" + +#. (itstool) path: item/p +#: C/15-Puzzle.page:59 +msgid "" +"Use the Left, Right, Up and Down " +"arrows to go at the tile you want to move. The currently selected tile is " +"indicated with four arrows around the board, on each side of its row and " +"column." +msgstr "" +"Använd piltangenterna Vänster, Höger, Upp " +"och Ned för att navigera till brickan du vill flytta. Den valda " +"brickan indikeras med fyra pilar runt spelbrädet på varje sida om dess rad " +"och kolumn." + +#. (itstool) path: item/p +#: C/15-Puzzle.page:60 +msgid "" +"Use the Space key to move the selected tile in the direction of " +"the empty space." +msgstr "" +"Använd blanksteg för att flytta den markerade brickan i riktning " +"mot den tomma platsen." + +#. (itstool) path: item/p +#: C/15-Puzzle.page:64 C/16-Puzzle.page:60 +msgid "" +"You can always undo a move with the CtrlZ keys." +msgstr "" +"Du kan alltid ångra ett drag med tangenterna CtrlZ." + +#. (itstool) path: item/p +#: C/15-Puzzle.page:66 C/16-Puzzle.page:62 +msgid "" +"At the end of the game, or when you want to switch games, use the the " +"CtrlN keys to go to the Start Screen." +msgstr "" +"Vid spelets slut, eller när du vill byta spel, använd tangenterna " +"CtrlN för att gå till startskärmen." + +#. (itstool) path: section/p +#: C/15-Puzzle.page:70 C/16-Puzzle.page:66 +msgid "You can also use a mouse." +msgstr "Du kan också använda en mus." + +#. (itstool) path: page/title +#: C/16-Puzzle.page:18 +msgid "16-Puzzle" +msgstr "16-pussel" + +#. (itstool) path: page/p +#: C/16-Puzzle.page:20 +msgid "" +"The 16-Puzzle is the variant puzzle of Taquin. You can " +"launch it at any time from the Start Screen." +msgstr "" +"16-pussel är en spelvariant som finns i Taquin. Du kan " +"starta det när du vill från startskärmen." + +#. (itstool) path: section/p +#: C/16-Puzzle.page:27 +msgid "" +"You move all the tiles of a row or a column in one direction. The tile that " +"is pushed out of the board is placed at the opposite side of the row or " +"column." +msgstr "" +"Du flyttar alla brickorna i en rad eller kolumn i en riktning. Brickan som " +"knuffas ut från spelplanen placera på motsatt sida av raden eller kolumnen." + +#. (itstool) path: item/p +#: C/16-Puzzle.page:41 +msgid "" +"Click on one of the arrows displayed around the board. The row or column at " +"the end of which this arrow is moves in this direction, and the tile that " +"was next to the arrow is placed at the opposite side." +msgstr "" +"Klicka på en av pilarna som visas runt brädet. Raden eller kolumnen i slutet " +"på pilen kommer att flytta i denna riktning, och brickan som fanns intill " +"pilen placeras på motsatt sida." + +#. (itstool) path: item/p +#: C/16-Puzzle.page:57 +msgid "" +"Use the Left, Right, Up and Down " +"arrows to go at the row or the column you want to move. The currently " +"selected row and column are indicated with two lights around the board." +msgstr "" +"Använd piltangenterna Vänster, Höger, Upp " +"och Ned för att navigera till raden eller kolumnen du vill " +"flytta. Den valda raden och kolumnen indikeras med två lampor runt brädet." + +#. (itstool) path: item/p +#: C/16-Puzzle.page:58 +msgid "" +"Use the CtrlLeft or " +"CtrlRight keys to move a row, or the " +"CtrlUp and CtrlDown keys to move a column." +msgstr "" +"Använd tangenterna CtrlVänster eller " +"CtrlHöger för att flytta en rad, " +"eller tangenterna CtrlUpp och " +"CtrlNed för att flytta en kolumn." + +#. (itstool) path: page/title +#: C/beginning.page:18 +msgid "Beginning" +msgstr "Inledning" + +#. (itstool) path: page/p +#: C/beginning.page:20 +msgid "" +"When Taquin is opened for the first time, it displays a " +"traditional 15-Puzzle game." +msgstr "" +"När Taquin öppnas för första gången visas ett traditionellt 15-pussel." + +#. (itstool) path: page/p +#: C/beginning.page:22 +msgid "The game is played using the mouse. To make a move:" +msgstr "Spelet spelas med musen. För att göra ett drag:" + +#. (itstool) path: item/p +#: C/beginning.page:29 +msgid "" +"You can always undo a move by clicking the Undo button on the " +"left of the header bar." +msgstr "" +"Du kan alltid ångra ett drag genom att klicka på Ångra-knappen " +"till vänster i rubrikraden." + +#. (itstool) path: page/p +#: C/beginning.page:35 +msgid "" +"After the first time it is opened, Taquin displays a puzzle with " +"the same rules and dimensions as the last one played when it is opened, so " +"it could be a 16-Puzzle game." +msgstr "" +"Efter att det öppnats för första gången kommer Taquin att visa " +"ett pussel med samma regler och dimensioner som det som spelades senast det " +"var öppet, så det skulle kunna vara ett 16-pussel." + +#. (itstool) path: info/title +#: C/index.page:8 +msgctxt "link" +msgid "Taquin" +msgstr "Taquin" + +#. (itstool) path: info/title +#: C/index.page:9 +msgctxt "text" +msgid "Taquin" +msgstr "Taquin" + +#. (itstool) path: license/p +#: C/index.page:16 +msgid "" +"Creative Commons Attribution-ShareAlike 4.0 International (CC BY-SA 4.0)" +msgstr "Creative Commons Erkännande-DelaLika 4.0 Internationell (CC BY-SA 4.0)" + +#. (itstool) path: media/span +#: C/index.page:20 +msgid "Taquin logo" +msgstr "Logo för Taquin" + +#. (itstool) path: page/title +#: C/index.page:20 +msgid "<_:media-1/> Taquin" +msgstr "<_:media-1/> Taquin" + +#. (itstool) path: page/p +#: C/index.page:22 +msgid "" +"Taquin is a sliding-block puzzle game. It includes the " +"traditional 15-Puzzle invented in the early 1880s, and the more recent 16-" +"Puzzle variant." +msgstr "" +"Taquin är ett pusselspel där man flyttar brickor. Både det " +"traditionella 15-pusslet som uppfanns redan under det tidiga 1880-talet och " +"den senare varianten 16-pussel ingår." + +#. (itstool) path: section/title +#: C/index.page:26 +msgid "How to Play" +msgstr "Hur man spelar" + +#. (itstool) path: section/title +#: C/index.page:38 +msgid "Advanced" +msgstr "Avancerat" + +#. (itstool) path: p/link +#: C/legal.xml:3 +msgid "Creative Commons Attribution-ShareAlike 4.0 International license" +msgstr "licensen Creative Commons Erkännande-DelaLika 4.0 Internationell" + +#. (itstool) path: license/p +#: C/legal.xml:3 +msgid "This work is licensed under a <_:link-1/>." +msgstr "Detta verk är licensierat under <_:link-1/>." + +#. (itstool) path: info/desc +#: C/license.page:8 +msgid "Legal information." +msgstr "Juridisk information." + +#. (itstool) path: page/title +#: C/license.page:11 +msgid "License" +msgstr "Licens" + +#. (itstool) path: page/p +#: C/license.page:12 +msgid "" +"This work is distributed under a Creative Commons Attribution-ShareAlike 4.0 " +"International license." +msgstr "" +"Detta verk distribueras under licensen CreativeCommons Erkännande-DelaLika " +"4.0 Internationell." + +#. (itstool) path: page/p +#: C/license.page:20 +msgid "You are free:" +msgstr "Du får lov att:" + +#. (itstool) path: item/title +#: C/license.page:25 +msgid "To share" +msgstr "Dela" + +#. (itstool) path: item/p +#: C/license.page:26 +msgid "To copy, distribute and transmit the work." +msgstr "Att kopiera, distribuera och överföra verket." + +#. (itstool) path: item/title +#: C/license.page:29 +msgid "To remix" +msgstr "Förändra" + +#. (itstool) path: item/p +#: C/license.page:30 +msgid "To adapt the work." +msgstr "Anpassa verket." + +#. (itstool) path: page/p +#: C/license.page:33 +msgid "Under the following conditions:" +msgstr "Under följande villkor:" + +#. (itstool) path: item/title +#: C/license.page:38 +msgid "Attribution" +msgstr "Erkännande" + +#. (itstool) path: item/p +#: C/license.page:39 +msgid "" +"You must attribute the work in the manner specified by the author or " +"licensor (but not in any way that suggests that they endorse you or your use " +"of the work)." +msgstr "" +"Du måste ge upphovsmannen eller licensgivaren erkännande på det sätt som " +"begärts (men inte på ett sätt som antyder att de stödjer dig eller din " +"användning av verket)." + +#. (itstool) path: item/title +#: C/license.page:46 +msgid "Share Alike" +msgstr "Dela lika" + +#. (itstool) path: item/p +#: C/license.page:47 +msgid "" +"If you alter, transform, or build upon this work, you may distribute the " +"resulting work only under the same, similar or a compatible license." +msgstr "" +"Om du förändrar, transformerar eller bygger vidare på detta verk, så får du " +"distribuera det resulterande verkar under samma, liknande eller en " +"kompatibel licens." + +#. (itstool) path: page/p +#: C/license.page:53 +msgid "" +"For the full text of the license, see the CreativeCommons website, or read the full Commons Deed." +msgstr "" +"För den fullständiga texten för licensen, se vidare på CreativeCommons " +"webbplats, eller läs det fullständiga Commons-kontraktet." + +#. (itstool) path: page/title +#: C/shortcuts.page:18 +msgid "Keyboard Shortcuts" +msgstr "Tangentbordsgenvägar" + +#. (itstool) path: page/p +#: C/shortcuts.page:20 +msgid "" +"Taquin can easily be used with keyboard. The 15-Puzzle and 16-Puzzle both have specific shortcuts." +msgstr "" +"Taquin kan lätt användas från tangentbordet. Både 15-pusslet och 16-pusslet har speciella genvägar." + +#. (itstool) path: section/title +#: C/shortcuts.page:23 +msgid "In-game shortcuts" +msgstr "Genvägar i spelet" + +#. (itstool) path: td/p +#: C/shortcuts.page:26 +msgid "Show new-game screen" +msgstr "Via skärmen för att starta ett nytt spel" + +#. (itstool) path: td/p +#: C/shortcuts.page:27 +msgid "CtrlN" +msgstr "CtrlN" + +#. (itstool) path: td/p +#: C/shortcuts.page:30 +msgid "Undo last move" +msgstr "Ångra senaste draget" + +#. (itstool) path: td/p +#: C/shortcuts.page:31 +msgid "CtrlZ" +msgstr "CtrlZ" + +#. (itstool) path: section/title +#: C/shortcuts.page:36 +msgid "15-Puzzle shortcuts" +msgstr "Genvägar för 15-pussel" + +#. (itstool) path: td/p +#: C/shortcuts.page:39 C/shortcuts.page:52 +msgid "Change selected tile" +msgstr "Ändra markerad bricka" + +#. (itstool) path: td/p +#: C/shortcuts.page:40 C/shortcuts.page:53 +msgid "Left, Right, Up and Down" +msgstr "" +"Vänster, Höger, Upp och Ned" + +#. (itstool) path: td/p +#: C/shortcuts.page:43 +msgid "Push tile in empty space’s direction" +msgstr "Skjut brickan i den riktning som den tomma platsen finns" + +#. (itstool) path: td/p +#: C/shortcuts.page:44 +msgid "Space or KP_Enter" +msgstr "Blanksteg eller retur på numeriska tangentbordet" + +#. (itstool) path: section/title +#: C/shortcuts.page:49 +msgid "16-Puzzle shortcuts" +msgstr "Genvägar för 16-pussel" + +#. (itstool) path: td/p +#: C/shortcuts.page:56 +msgid "Move row" +msgstr "Flytta rad" + +#. (itstool) path: td/p +#: C/shortcuts.page:57 +msgid "" +"CtrlLeft and CtrlRight" +msgstr "" +"CtrlVänster och CtrlHöger" + +#. (itstool) path: td/p +#: C/shortcuts.page:60 +msgid "Move column" +msgstr "Flytta kolumn" + +#. (itstool) path: td/p +#: C/shortcuts.page:61 +msgid "" +"CtrlUp and CtrlDown" +msgstr "" +"CtrlUpp och CtrlNed" + +#. (itstool) path: section/title +#: C/shortcuts.page:66 +msgid "Start Screen shortcuts" +msgstr "Genvägar för startskärmen" + +#. (itstool) path: td/p +#: C/shortcuts.page:69 +msgid "New Game" +msgstr "Nytt spel" + +#. (itstool) path: td/p +#: C/shortcuts.page:70 +msgid "CtrlShiftN" +msgstr "CtrlSkiftN" + +#. (itstool) path: td/p +#: C/shortcuts.page:73 +msgid "Back to previous game (if any)" +msgstr "Tillbaka till föregående spel (om sådant finns)" + +#. (itstool) path: td/p +#: C/shortcuts.page:74 +msgid "Escape" +msgstr "Escape" + +#. (itstool) path: section/title +#: C/shortcuts.page:79 +msgid "General shortcuts" +msgstr "Allmänna genvägar" + +#. (itstool) path: td/p +#: C/shortcuts.page:82 +msgid "Help" +msgstr "Hjälp" + +#. (itstool) path: td/p +#: C/shortcuts.page:83 +msgid "F1" +msgstr "F1" + +#. (itstool) path: td/p +#: C/shortcuts.page:86 +msgid "Quit" +msgstr "Avsluta" + +#. (itstool) path: td/p +#: C/shortcuts.page:87 +msgid "CtrlQ" +msgstr "CtrlQ" + +#. (itstool) path: page/title +#: C/start-screen.page:18 +msgid "Start Screen" +msgstr "Startskärmen" + +#. (itstool) path: page/p +#: C/start-screen.page:19 +msgid "" +"The Start Screen is the place to select your options and launch a " +"new game, either a 15-Puzzle or a 16-Puzzle." +msgstr "" +"Startskärmen är stället där du väljer dina inställningar och " +"startar ett nytt spel, antingen ett 15-pussel eller ett 16-pussel." + +#. (itstool) path: page/p +#: C/start-screen.page:20 +msgid "" +"It can be accessed at any time from a game by pressing the Start Over button." +msgstr "" +"Den kan nås när som helst från spelet genom att trycka på knappen Börja " +"om." diff -Nru gnome-taquin-3.18.1.1/m4/appstream-xml.m4 gnome-taquin-3.20.2/m4/appstream-xml.m4 --- gnome-taquin-3.18.1.1/m4/appstream-xml.m4 1970-01-01 00:00:00.000000000 +0000 +++ gnome-taquin-3.20.2/m4/appstream-xml.m4 2016-05-09 00:13:59.000000000 +0000 @@ -0,0 +1,86 @@ +# appstream-xml.m4 +# +# serial 6 + +dnl APPSTREAM_XML +dnl Installs and validates AppData XML files. +dnl +dnl Call APPSTREAM_XML in configure.ac to check for the appstream-util tool. +dnl Add @APPSTREAM_XML_RULES@ to a Makefile.am to substitute the make rules. Add +dnl .appdata.xml files to appstream_XML in Makefile.am and they will be validated +dnl at make check time, if appstream-util is installed, as well as installed +dnl to the correct location automatically. Add --enable-appstream-util to +dnl DISTCHECK_CONFIGURE_FLAGS in Makefile.am to require valid AppData XML when +dnl doing a distcheck. +dnl +dnl Adding files to appstream_XML does not distribute them automatically. + +AC_DEFUN([APPSTREAM_XML], +[ + m4_pattern_allow([AM_V_GEN]) + AC_ARG_ENABLE([appstream-util], + [AS_HELP_STRING([--disable-appstream-util], + [Disable validating AppData XML files during check phase])]) + + AS_IF([test "x$enable_appstream_validate" != "xno"], + [AC_PATH_PROG([APPSTREAM_UTIL], [appstream-util]) + AS_IF([test "x$APPSTREAM_UTIL" = "x"], + [have_appstream_validate=no], + [have_appstream_validate=yes + AC_SUBST([APPSTREAM_UTIL])])], + [have_appstream_validate=no]) + + AS_IF([test "x$have_appstream_validate" != "xno"], + [appstream_validate=yes], + [appstream_validate=no + AS_IF([test "x$enable_appstream_validate" = "xyes"], + [AC_MSG_ERROR([AppData validation was requested but appstream-util was not found])])]) + + AC_SUBST([appstreamxmldir], [${datadir}/appdata]) + + APPSTREAM_XML_RULES=' +.PHONY : uninstall-appstream-xml install-appstream-xml clean-appstream-xml + +mostlyclean-am: clean-appstream-xml + +%.appdata.valid: %.appdata.xml + $(AM_V_GEN) if test -f "$<"; then d=; else d="$(srcdir)/"; fi; \ + if test -n "$(APPSTREAM_UTIL)"; \ + then $(APPSTREAM_UTIL) --nonet validate $${d}$<; fi \ + && touch [$]@ + +check-am: $(appstream_XML:.appdata.xml=.appdata.valid) +uninstall-am: uninstall-appstream-xml +install-data-am: install-appstream-xml + +.SECONDARY: $(appstream_XML) + +install-appstream-xml: $(appstream_XML) + @$(NORMAL_INSTALL) + if test -n "$^"; then \ + test -z "$(appstreamxmldir)" || $(MKDIR_P) "$(DESTDIR)$(appstreamxmldir)"; \ + $(INSTALL_DATA) $^ "$(DESTDIR)$(appstreamxmldir)"; \ + fi + +uninstall-appstream-xml: + @$(NORMAL_UNINSTALL) + @list='\''$(appstream_XML)'\''; test -n "$(appstreamxmldir)" || list=; \ + files=`for p in $$list; do echo $$p; done | sed -e '\''s|^.*/||'\''`; \ + test -n "$$files" || exit 0; \ + echo " ( cd '\''$(DESTDIR)$(appstreamxmldir)'\'' && rm -f" $$files ")"; \ + cd "$(DESTDIR)$(appstreamxmldir)" && rm -f $$files + +clean-appstream-xml: + rm -f $(appstream_XML:.appdata.xml=.appdata.valid) +' + _APPSTREAM_XML_SUBST(APPSTREAM_XML_RULES) +]) + +dnl _APPSTREAM_XML_SUBST(VARIABLE) +dnl Abstract macro to do either _AM_SUBST_NOTMAKE or AC_SUBST +AC_DEFUN([_APPSTREAM_XML_SUBST], +[ +AC_SUBST([$1]) +m4_ifdef([_AM_SUBST_NOTMAKE], [_AM_SUBST_NOTMAKE([$1])]) +] +) diff -Nru gnome-taquin-3.18.1.1/m4/gsettings.m4 gnome-taquin-3.20.2/m4/gsettings.m4 --- gnome-taquin-3.18.1.1/m4/gsettings.m4 1970-01-01 00:00:00.000000000 +0000 +++ gnome-taquin-3.20.2/m4/gsettings.m4 2016-05-09 00:13:59.000000000 +0000 @@ -0,0 +1,83 @@ +dnl GLIB_GSETTINGS +dnl Defines GSETTINGS_SCHEMAS_INSTALL which controls whether +dnl the schema should be compiled +dnl + +AC_DEFUN([GLIB_GSETTINGS], +[ + m4_pattern_allow([AM_V_GEN]) + AC_ARG_ENABLE(schemas-compile, + AS_HELP_STRING([--disable-schemas-compile], + [Disable regeneration of gschemas.compiled on install]), + [case ${enableval} in + yes) GSETTINGS_DISABLE_SCHEMAS_COMPILE="" ;; + no) GSETTINGS_DISABLE_SCHEMAS_COMPILE="1" ;; + *) AC_MSG_ERROR([bad value ${enableval} for --enable-schemas-compile]) ;; + esac]) + AC_SUBST([GSETTINGS_DISABLE_SCHEMAS_COMPILE]) + PKG_PROG_PKG_CONFIG([0.16]) + AC_SUBST(gsettingsschemadir, [${datadir}/glib-2.0/schemas]) + if test x$cross_compiling != xyes; then + GLIB_COMPILE_SCHEMAS=`$PKG_CONFIG --variable glib_compile_schemas gio-2.0` + else + AC_PATH_PROG(GLIB_COMPILE_SCHEMAS, glib-compile-schemas) + fi + AC_SUBST(GLIB_COMPILE_SCHEMAS) + if test "x$GLIB_COMPILE_SCHEMAS" = "x"; then + ifelse([$2],,[AC_MSG_ERROR([glib-compile-schemas not found.])],[$2]) + else + ifelse([$1],,[:],[$1]) + fi + + GSETTINGS_RULES=' +.PHONY : uninstall-gsettings-schemas install-gsettings-schemas clean-gsettings-schemas + +mostlyclean-am: clean-gsettings-schemas + +gsettings__enum_file = $(addsuffix .enums.xml,$(gsettings_ENUM_NAMESPACE)) + +%.gschema.valid: %.gschema.xml $(gsettings__enum_file) + $(AM_V_GEN) $(GLIB_COMPILE_SCHEMAS) --strict --dry-run $(addprefix --schema-file=,$(gsettings__enum_file)) --schema-file=$< && mkdir -p [$](@D) && touch [$]@ + +all-am: $(gsettings_SCHEMAS:.xml=.valid) +uninstall-am: uninstall-gsettings-schemas +install-data-am: install-gsettings-schemas + +.SECONDARY: $(gsettings_SCHEMAS) + +install-gsettings-schemas: $(gsettings_SCHEMAS) $(gsettings__enum_file) + @$(NORMAL_INSTALL) + if test -n "$^"; then \ + test -z "$(gsettingsschemadir)" || $(MKDIR_P) "$(DESTDIR)$(gsettingsschemadir)"; \ + $(INSTALL_DATA) $^ "$(DESTDIR)$(gsettingsschemadir)"; \ + test -n "$(GSETTINGS_DISABLE_SCHEMAS_COMPILE)$(DESTDIR)" || $(GLIB_COMPILE_SCHEMAS) $(gsettingsschemadir); \ + fi + +uninstall-gsettings-schemas: + @$(NORMAL_UNINSTALL) + @list='\''$(gsettings_SCHEMAS) $(gsettings__enum_file)'\''; test -n "$(gsettingsschemadir)" || list=; \ + files=`for p in $$list; do echo $$p; done | sed -e '\''s|^.*/||'\''`; \ + test -n "$$files" || exit 0; \ + echo " ( cd '\''$(DESTDIR)$(gsettingsschemadir)'\'' && rm -f" $$files ")"; \ + cd "$(DESTDIR)$(gsettingsschemadir)" && rm -f $$files + test -n "$(GSETTINGS_DISABLE_SCHEMAS_COMPILE)$(DESTDIR)" || $(GLIB_COMPILE_SCHEMAS) $(gsettingsschemadir) + +clean-gsettings-schemas: + rm -f $(gsettings_SCHEMAS:.xml=.valid) $(gsettings__enum_file) + +ifdef gsettings_ENUM_NAMESPACE +$(gsettings__enum_file): $(gsettings_ENUM_FILES) + $(AM_V_GEN) glib-mkenums --comments '\'''\'' --fhead "" --vhead " <@type@ id='\''$(gsettings_ENUM_NAMESPACE).@EnumName@'\''>" --vprod " " --vtail " " --ftail "" [$]^ > [$]@.tmp && mv [$]@.tmp [$]@ +endif +' + _GSETTINGS_SUBST(GSETTINGS_RULES) +]) + +dnl _GSETTINGS_SUBST(VARIABLE) +dnl Abstract macro to do either _AM_SUBST_NOTMAKE or AC_SUBST +AC_DEFUN([_GSETTINGS_SUBST], +[ +AC_SUBST([$1]) +m4_ifdef([_AM_SUBST_NOTMAKE], [_AM_SUBST_NOTMAKE([$1])]) +] +) diff -Nru gnome-taquin-3.18.1.1/m4/intltool.m4 gnome-taquin-3.20.2/m4/intltool.m4 --- gnome-taquin-3.18.1.1/m4/intltool.m4 1970-01-01 00:00:00.000000000 +0000 +++ gnome-taquin-3.20.2/m4/intltool.m4 2016-05-09 00:14:01.000000000 +0000 @@ -0,0 +1,212 @@ +## intltool.m4 - Configure intltool for the target system. -*-Shell-script-*- +## Copyright (C) 2001 Eazel, Inc. +## Author: Maciej Stachowiak +## Kenneth Christiansen +## +## 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. + +dnl IT_PROG_INTLTOOL([MINIMUM-VERSION], [no-xml]) +# serial 42 IT_PROG_INTLTOOL +AC_DEFUN([IT_PROG_INTLTOOL], [ +AC_PREREQ([2.50])dnl +AC_REQUIRE([AM_NLS])dnl + +case "$am__api_version" in + 1.[01234]) + AC_MSG_ERROR([Automake 1.5 or newer is required to use intltool]) + ;; + *) + ;; +esac + +INTLTOOL_REQUIRED_VERSION_AS_INT=`echo $1 | awk -F. '{ print $ 1 * 1000 + $ 2 * 100 + $ 3; }'` +INTLTOOL_APPLIED_VERSION=`intltool-update --version | head -1 | cut -d" " -f3` +INTLTOOL_APPLIED_VERSION_AS_INT=`echo $INTLTOOL_APPLIED_VERSION | awk -F. '{ print $ 1 * 1000 + $ 2 * 100 + $ 3; }'` +if test -n "$1"; then + AC_MSG_CHECKING([for intltool >= $1]) + AC_MSG_RESULT([$INTLTOOL_APPLIED_VERSION found]) + test "$INTLTOOL_APPLIED_VERSION_AS_INT" -ge "$INTLTOOL_REQUIRED_VERSION_AS_INT" || + AC_MSG_ERROR([Your intltool is too old. You need intltool $1 or later.]) +fi + +AC_PATH_PROG(INTLTOOL_UPDATE, [intltool-update]) +AC_PATH_PROG(INTLTOOL_MERGE, [intltool-merge]) +AC_PATH_PROG(INTLTOOL_EXTRACT, [intltool-extract]) +if test -z "$INTLTOOL_UPDATE" -o -z "$INTLTOOL_MERGE" -o -z "$INTLTOOL_EXTRACT"; then + AC_MSG_ERROR([The intltool scripts were not found. Please install intltool.]) +fi + +if test -z "$AM_DEFAULT_VERBOSITY"; then + AM_DEFAULT_VERBOSITY=1 +fi +AC_SUBST([AM_DEFAULT_VERBOSITY]) + +INTLTOOL_V_MERGE='$(INTLTOOL__v_MERGE_$(V))' +INTLTOOL__v_MERGE_='$(INTLTOOL__v_MERGE_$(AM_DEFAULT_VERBOSITY))' +INTLTOOL__v_MERGE_0='@echo " ITMRG " [$]@;' +AC_SUBST(INTLTOOL_V_MERGE) +AC_SUBST(INTLTOOL__v_MERGE_) +AC_SUBST(INTLTOOL__v_MERGE_0) + +INTLTOOL_V_MERGE_OPTIONS='$(intltool__v_merge_options_$(V))' +intltool__v_merge_options_='$(intltool__v_merge_options_$(AM_DEFAULT_VERBOSITY))' +intltool__v_merge_options_0='-q' +AC_SUBST(INTLTOOL_V_MERGE_OPTIONS) +AC_SUBST(intltool__v_merge_options_) +AC_SUBST(intltool__v_merge_options_0) + + INTLTOOL_DESKTOP_RULE='%.desktop: %.desktop.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' +INTLTOOL_DIRECTORY_RULE='%.directory: %.directory.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' + INTLTOOL_KEYS_RULE='%.keys: %.keys.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -k -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' + INTLTOOL_PROP_RULE='%.prop: %.prop.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' + INTLTOOL_OAF_RULE='%.oaf: %.oaf.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -o -p $(top_srcdir)/po $< [$]@' + INTLTOOL_PONG_RULE='%.pong: %.pong.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' + INTLTOOL_SERVER_RULE='%.server: %.server.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -o -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' + INTLTOOL_SHEET_RULE='%.sheet: %.sheet.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' +INTLTOOL_SOUNDLIST_RULE='%.soundlist: %.soundlist.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' + INTLTOOL_UI_RULE='%.ui: %.ui.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' + INTLTOOL_XML_RULE='%.xml: %.xml.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' +if test "$INTLTOOL_APPLIED_VERSION_AS_INT" -ge 5000; then + INTLTOOL_XML_NOMERGE_RULE='%.xml: %.xml.in $(INTLTOOL_MERGE) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -x -u --no-translations $< [$]@' +else + INTLTOOL_XML_NOMERGE_RULE='%.xml: %.xml.in $(INTLTOOL_MERGE) ; $(INTLTOOL_V_MERGE)_it_tmp_dir=tmp.intltool.[$][$]RANDOM && mkdir [$][$]_it_tmp_dir && LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -x -u [$][$]_it_tmp_dir $< [$]@ && rmdir [$][$]_it_tmp_dir' +fi + INTLTOOL_XAM_RULE='%.xam: %.xml.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' + INTLTOOL_KBD_RULE='%.kbd: %.kbd.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -x -u -m -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' + INTLTOOL_CAVES_RULE='%.caves: %.caves.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' + INTLTOOL_SCHEMAS_RULE='%.schemas: %.schemas.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -s -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' + INTLTOOL_THEME_RULE='%.theme: %.theme.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' + INTLTOOL_SERVICE_RULE='%.service: %.service.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' + INTLTOOL_POLICY_RULE='%.policy: %.policy.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' + +_IT_SUBST(INTLTOOL_DESKTOP_RULE) +_IT_SUBST(INTLTOOL_DIRECTORY_RULE) +_IT_SUBST(INTLTOOL_KEYS_RULE) +_IT_SUBST(INTLTOOL_PROP_RULE) +_IT_SUBST(INTLTOOL_OAF_RULE) +_IT_SUBST(INTLTOOL_PONG_RULE) +_IT_SUBST(INTLTOOL_SERVER_RULE) +_IT_SUBST(INTLTOOL_SHEET_RULE) +_IT_SUBST(INTLTOOL_SOUNDLIST_RULE) +_IT_SUBST(INTLTOOL_UI_RULE) +_IT_SUBST(INTLTOOL_XAM_RULE) +_IT_SUBST(INTLTOOL_KBD_RULE) +_IT_SUBST(INTLTOOL_XML_RULE) +_IT_SUBST(INTLTOOL_XML_NOMERGE_RULE) +_IT_SUBST(INTLTOOL_CAVES_RULE) +_IT_SUBST(INTLTOOL_SCHEMAS_RULE) +_IT_SUBST(INTLTOOL_THEME_RULE) +_IT_SUBST(INTLTOOL_SERVICE_RULE) +_IT_SUBST(INTLTOOL_POLICY_RULE) + +# Check the gettext tools to make sure they are GNU +AC_PATH_PROG(XGETTEXT, xgettext) +AC_PATH_PROG(MSGMERGE, msgmerge) +AC_PATH_PROG(MSGFMT, msgfmt) +AC_PATH_PROG(GMSGFMT, gmsgfmt, $MSGFMT) +if test -z "$XGETTEXT" -o -z "$MSGMERGE" -o -z "$MSGFMT"; then + AC_MSG_ERROR([GNU gettext tools not found; required for intltool]) +fi +xgversion="`$XGETTEXT --version|grep '(GNU ' 2> /dev/null`" +mmversion="`$MSGMERGE --version|grep '(GNU ' 2> /dev/null`" +mfversion="`$MSGFMT --version|grep '(GNU ' 2> /dev/null`" +if test -z "$xgversion" -o -z "$mmversion" -o -z "$mfversion"; then + AC_MSG_ERROR([GNU gettext tools not found; required for intltool]) +fi + +AC_PATH_PROG(INTLTOOL_PERL, perl) +if test -z "$INTLTOOL_PERL"; then + AC_MSG_ERROR([perl not found]) +fi +AC_MSG_CHECKING([for perl >= 5.8.1]) +$INTLTOOL_PERL -e "use 5.8.1;" > /dev/null 2>&1 +if test $? -ne 0; then + AC_MSG_ERROR([perl 5.8.1 is required for intltool]) +else + IT_PERL_VERSION=`$INTLTOOL_PERL -e "printf '%vd', $^V"` + AC_MSG_RESULT([$IT_PERL_VERSION]) +fi +if test "x$2" != "xno-xml"; then + AC_MSG_CHECKING([for XML::Parser]) + if `$INTLTOOL_PERL -e "require XML::Parser" 2>/dev/null`; then + AC_MSG_RESULT([ok]) + else + AC_MSG_ERROR([XML::Parser perl module is required for intltool]) + fi +fi + +# Substitute ALL_LINGUAS so we can use it in po/Makefile +AC_SUBST(ALL_LINGUAS) + +IT_PO_SUBDIR([po]) + +]) + + +# IT_PO_SUBDIR(DIRNAME) +# --------------------- +# All po subdirs have to be declared with this macro; the subdir "po" is +# declared by IT_PROG_INTLTOOL. +# +AC_DEFUN([IT_PO_SUBDIR], +[AC_PREREQ([2.53])dnl We use ac_top_srcdir inside AC_CONFIG_COMMANDS. +dnl +dnl The following CONFIG_COMMANDS should be executed at the very end +dnl of config.status. +AC_CONFIG_COMMANDS_PRE([ + AC_CONFIG_COMMANDS([$1/stamp-it], [ + if [ ! grep "^# INTLTOOL_MAKEFILE$" "$1/Makefile.in" > /dev/null ]; then + AC_MSG_ERROR([$1/Makefile.in.in was not created by intltoolize.]) + fi + rm -f "$1/stamp-it" "$1/stamp-it.tmp" "$1/POTFILES" "$1/Makefile.tmp" + >"$1/stamp-it.tmp" + [sed '/^#/d + s/^[[].*] *// + /^[ ]*$/d + '"s|^| $ac_top_srcdir/|" \ + "$srcdir/$1/POTFILES.in" | sed '$!s/$/ \\/' >"$1/POTFILES" + ] + [sed '/^POTFILES =/,/[^\\]$/ { + /^POTFILES =/!d + r $1/POTFILES + } + ' "$1/Makefile.in" >"$1/Makefile"] + rm -f "$1/Makefile.tmp" + mv "$1/stamp-it.tmp" "$1/stamp-it" + ]) +])dnl +]) + +# _IT_SUBST(VARIABLE) +# ------------------- +# Abstract macro to do either _AM_SUBST_NOTMAKE or AC_SUBST +# +AC_DEFUN([_IT_SUBST], +[ +AC_SUBST([$1]) +m4_ifdef([_AM_SUBST_NOTMAKE], [_AM_SUBST_NOTMAKE([$1])]) +] +) + +# deprecated macros +AU_ALIAS([AC_PROG_INTLTOOL], [IT_PROG_INTLTOOL]) +# A hint is needed for aclocal from Automake <= 1.9.4: +# AC_DEFUN([AC_PROG_INTLTOOL], ...) + diff -Nru gnome-taquin-3.18.1.1/m4/nls.m4 gnome-taquin-3.20.2/m4/nls.m4 --- gnome-taquin-3.18.1.1/m4/nls.m4 1970-01-01 00:00:00.000000000 +0000 +++ gnome-taquin-3.20.2/m4/nls.m4 2016-05-09 00:13:59.000000000 +0000 @@ -0,0 +1,32 @@ +# nls.m4 serial 5 (gettext-0.18) +dnl Copyright (C) 1995-2003, 2005-2006, 2008-2014 Free Software Foundation, +dnl Inc. +dnl This file is free software; the Free Software Foundation +dnl gives unlimited permission to copy and/or distribute it, +dnl with or without modifications, as long as this notice is preserved. +dnl +dnl This file 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 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]) +]) diff -Nru gnome-taquin-3.18.1.1/m4/pkg.m4 gnome-taquin-3.20.2/m4/pkg.m4 --- gnome-taquin-3.18.1.1/m4/pkg.m4 1970-01-01 00:00:00.000000000 +0000 +++ gnome-taquin-3.20.2/m4/pkg.m4 2016-05-09 00:13:59.000000000 +0000 @@ -0,0 +1,275 @@ +dnl pkg.m4 - Macros to locate and utilise pkg-config. -*- Autoconf -*- +dnl serial 11 (pkg-config-0.29) +dnl +dnl Copyright © 2004 Scott James Remnant . +dnl Copyright © 2012-2015 Dan Nicholson +dnl +dnl This program is free software; you can redistribute it and/or modify +dnl it under the terms of the GNU General Public License as published by +dnl the Free Software Foundation; either version 2 of the License, or +dnl (at your option) any later version. +dnl +dnl This program is distributed in the hope that it will be useful, but +dnl WITHOUT ANY WARRANTY; without even the implied warranty of +dnl MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +dnl General Public License for more details. +dnl +dnl You should have received a copy of the GNU General Public License +dnl along with this program; if not, write to the Free Software +dnl Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA +dnl 02111-1307, USA. +dnl +dnl As a special exception to the GNU General Public License, if you +dnl distribute this file as part of a program that contains a +dnl configuration script generated by Autoconf, you may include it under +dnl the same distribution terms that you use for the rest of that +dnl program. + +dnl PKG_PREREQ(MIN-VERSION) +dnl ----------------------- +dnl Since: 0.29 +dnl +dnl Verify that the version of the pkg-config macros are at least +dnl MIN-VERSION. Unlike PKG_PROG_PKG_CONFIG, which checks the user's +dnl installed version of pkg-config, this checks the developer's version +dnl of pkg.m4 when generating configure. +dnl +dnl To ensure that this macro is defined, also add: +dnl m4_ifndef([PKG_PREREQ], +dnl [m4_fatal([must install pkg-config 0.29 or later before running autoconf/autogen])]) +dnl +dnl See the "Since" comment for each macro you use to see what version +dnl of the macros you require. +m4_defun([PKG_PREREQ], +[m4_define([PKG_MACROS_VERSION], [0.29]) +m4_if(m4_version_compare(PKG_MACROS_VERSION, [$1]), -1, + [m4_fatal([pkg.m4 version $1 or higher is required but ]PKG_MACROS_VERSION[ found])]) +])dnl PKG_PREREQ + +dnl PKG_PROG_PKG_CONFIG([MIN-VERSION]) +dnl ---------------------------------- +dnl Since: 0.16 +dnl +dnl Search for the pkg-config tool and set the PKG_CONFIG variable to +dnl first found in the path. Checks that the version of pkg-config found +dnl is at least MIN-VERSION. If MIN-VERSION is not specified, 0.9.0 is +dnl used since that's the first version where most current features of +dnl pkg-config existed. +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 +])dnl PKG_PROG_PKG_CONFIG + +dnl PKG_CHECK_EXISTS(MODULES, [ACTION-IF-FOUND], [ACTION-IF-NOT-FOUND]) +dnl ------------------------------------------------------------------- +dnl Since: 0.18 +dnl +dnl Check to see whether a particular set of modules exists. Similar to +dnl PKG_CHECK_MODULES(), but does not set variables or print errors. +dnl +dnl Please remember that m4 expands AC_REQUIRE([PKG_PROG_PKG_CONFIG]) +dnl only at the first occurence in configure.ac, so if the first place +dnl it's called might be skipped (such as if it is within an "if", you +dnl 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]) + +dnl _PKG_CONFIG([VARIABLE], [COMMAND], [MODULES]) +dnl --------------------------------------------- +dnl Internal wrapper calling pkg-config via PKG_CONFIG and setting +dnl pkg_failed based on the result. +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 +])dnl _PKG_CONFIG + +dnl _PKG_SHORT_ERRORS_SUPPORTED +dnl --------------------------- +dnl Internal check to see if pkg-config supports short errors. +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 +])dnl _PKG_SHORT_ERRORS_SUPPORTED + + +dnl PKG_CHECK_MODULES(VARIABLE-PREFIX, MODULES, [ACTION-IF-FOUND], +dnl [ACTION-IF-NOT-FOUND]) +dnl -------------------------------------------------------------- +dnl Since: 0.4.0 +dnl +dnl Note that if there is a possibility the first call to +dnl PKG_CHECK_MODULES might not happen, you should be sure to include an +dnl 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 +])dnl PKG_CHECK_MODULES + + +dnl PKG_CHECK_MODULES_STATIC(VARIABLE-PREFIX, MODULES, [ACTION-IF-FOUND], +dnl [ACTION-IF-NOT-FOUND]) +dnl --------------------------------------------------------------------- +dnl Since: 0.29 +dnl +dnl Checks for existence of MODULES and gathers its build flags with +dnl static libraries enabled. Sets VARIABLE-PREFIX_CFLAGS from --cflags +dnl and VARIABLE-PREFIX_LIBS from --libs. +dnl +dnl Note that if there is a possibility the first call to +dnl PKG_CHECK_MODULES_STATIC might not happen, you should be sure to +dnl include an explicit call to PKG_PROG_PKG_CONFIG in your +dnl configure.ac. +AC_DEFUN([PKG_CHECK_MODULES_STATIC], +[AC_REQUIRE([PKG_PROG_PKG_CONFIG])dnl +_save_PKG_CONFIG=$PKG_CONFIG +PKG_CONFIG="$PKG_CONFIG --static" +PKG_CHECK_MODULES($@) +PKG_CONFIG=$_save_PKG_CONFIG[]dnl +])dnl PKG_CHECK_MODULES_STATIC + + +dnl PKG_INSTALLDIR([DIRECTORY]) +dnl ------------------------- +dnl Since: 0.27 +dnl +dnl Substitutes the variable pkgconfigdir as the location where a module +dnl should install pkg-config .pc files. By default the directory is +dnl $libdir/pkgconfig, but the default can be changed by passing +dnl DIRECTORY. The user can override through the --with-pkgconfigdir +dnl 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 + + +dnl PKG_NOARCH_INSTALLDIR([DIRECTORY]) +dnl -------------------------------- +dnl Since: 0.27 +dnl +dnl Substitutes the variable noarch_pkgconfigdir as the location where a +dnl module should install arch-independent pkg-config .pc files. By +dnl default the directory is $datadir/pkgconfig, but the default can be +dnl changed by passing DIRECTORY. The user can override through the +dnl --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 + + +dnl PKG_CHECK_VAR(VARIABLE, MODULE, CONFIG-VARIABLE, +dnl [ACTION-IF-FOUND], [ACTION-IF-NOT-FOUND]) +dnl ------------------------------------------- +dnl Since: 0.28 +dnl +dnl Retrieves the value of the pkg-config variable for the given module. +AC_DEFUN([PKG_CHECK_VAR], +[AC_REQUIRE([PKG_PROG_PKG_CONFIG])dnl +AC_ARG_VAR([$1], [value of $3 for $2, overriding pkg-config])dnl + +_PKG_CONFIG([$1], [variable="][$3]["], [$2]) +AS_VAR_COPY([$1], [pkg_cv_][$1]) + +AS_VAR_IF([$1], [""], [$5], [$4])dnl +])dnl PKG_CHECK_VAR diff -Nru gnome-taquin-3.18.1.1/m4/yelp.m4 gnome-taquin-3.20.2/m4/yelp.m4 --- gnome-taquin-3.18.1.1/m4/yelp.m4 1970-01-01 00:00:00.000000000 +0000 +++ gnome-taquin-3.20.2/m4/yelp.m4 2016-05-09 00:13:59.000000000 +0000 @@ -0,0 +1,213 @@ +AC_DEFUN([YELP_HELP_INIT], +[ +AC_REQUIRE([AC_PROG_LN_S]) +m4_pattern_allow([AM_V_at]) +m4_pattern_allow([AM_V_GEN]) +m4_pattern_allow([AM_DEFAULT_VERBOSITY]) + +YELP_LC_MEDIA_LINKS=true +YELP_LC_DIST=true + +for yelpopt in [$1]; do + case $yelpopt in + lc-media-links) YELP_LC_MEDIA_LINKS=true ;; + no-lc-media-links) YELP_LC_MEDIA_LINKS= ;; + lc-dist) YELP_LC_DIST=true ;; + no-lc-dist) YELP_LC_DIST= ;; + *) AC_MSG_ERROR([Unrecognized [YELP_HELP_INIT] option $yelpopt"]) ;; + esac +done; +AC_SUBST([YELP_LC_MEDIA_LINKS]) +AC_SUBST([YELP_LC_DIST]) + +AC_ARG_WITH([help-dir], + AS_HELP_STRING([--with-help-dir=DIR], + [path where help files are installed]),, + [with_help_dir='${datadir}/help']) +HELP_DIR="$with_help_dir" +AC_SUBST(HELP_DIR) + +AC_ARG_VAR([ITSTOOL], [Path to the `itstool` command]) +AC_CHECK_PROG([ITSTOOL], [itstool], [itstool]) +if test x"$ITSTOOL" = x; then + AC_MSG_ERROR([itstool not found]) +fi + +AC_ARG_VAR([XMLLINT], [Path to the `xmllint` command]) +AC_CHECK_PROG([XMLLINT], [xmllint], [xmllint]) +if test x"$XMLLINT" = x; then + AC_MSG_ERROR([xmllint not found]) +fi + +YELP_HELP_RULES=' +HELP_ID ?= +HELP_POT ?= +HELP_FILES ?= +HELP_EXTRA ?= +HELP_MEDIA ?= +HELP_LINGUAS ?= + +_HELP_LINGUAS = $(if $(filter environment,$(origin LINGUAS)),$(filter $(LINGUAS),$(HELP_LINGUAS)),$(HELP_LINGUAS)) +_HELP_POTFILE = $(if $(HELP_POT),$(HELP_POT),$(if $(HELP_ID),$(HELP_ID).pot)) +_HELP_POFILES = $(if $(HELP_ID),$(foreach lc,$(_HELP_LINGUAS),$(lc)/$(lc).po)) +_HELP_MOFILES = $(patsubst %.po,%.mo,$(_HELP_POFILES)) +_HELP_C_FILES = $(foreach f,$(HELP_FILES),C/$(f)) +_HELP_C_EXTRA = $(foreach f,$(HELP_EXTRA),C/$(f)) +_HELP_C_MEDIA = $(foreach f,$(HELP_MEDIA),C/$(f)) +_HELP_LC_FILES = $(foreach lc,$(_HELP_LINGUAS),$(foreach f,$(HELP_FILES),$(lc)/$(f))) +_HELP_LC_STAMPS = $(foreach lc,$(_HELP_LINGUAS),$(lc)/$(lc).stamp) + +_HELP_DEFAULT_V = $(if $(AM_DEFAULT_VERBOSITY),$(AM_DEFAULT_VERBOSITY),1) +_HELP_V = $(if $(V),$(V),$(_HELP_DEFAULT_V)) +_HELP_LC_VERBOSE = $(_HELP_LC_VERBOSE_$(_HELP_V)) +_HELP_LC_VERBOSE_ = $(_HELP_LC_VERBOSE_$(_HELP_DEFAULT_V)) +_HELP_LC_VERBOSE_0 = @echo " GEN "$(dir [$]@); + +all: $(_HELP_C_FILES) $(_HELP_C_EXTRA) $(_HELP_C_MEDIA) $(_HELP_LC_FILES) $(_HELP_POFILES) + +.PHONY: pot +pot: $(_HELP_POTFILE) +$(_HELP_POTFILE): $(_HELP_C_FILES) $(_HELP_C_EXTRA) $(_HELP_C_MEDIA) + $(AM_V_GEN)if test -d "C"; then d=; else d="$(srcdir)/"; fi; \ + $(ITSTOOL) -o "[$]@" $(foreach f,$(_HELP_C_FILES),"$${d}$(f)") + +.PHONY: repo +repo: $(_HELP_POTFILE) + $(AM_V_at)for po in $(_HELP_POFILES); do \ + if test "x[$](_HELP_V)" = "x0"; then echo " GEN $${po}"; fi; \ + msgmerge -q -o "$${po}" "$${po}" "$(_HELP_POTFILE)"; \ + done + +$(_HELP_POFILES): + $(AM_V_at)if ! test -d "$(dir [$]@)"; then mkdir "$(dir [$]@)"; fi + $(AM_V_at)if test ! -f "[$]@" -a -f "$(srcdir)/[$]@"; then cp "$(srcdir)/[$]@" "[$]@"; fi + $(AM_V_GEN)if ! test -f "[$]@"; then \ + (cd "$(dir [$]@)" && \ + $(ITSTOOL) -o "$(notdir [$]@).tmp" $(_HELP_C_FILES) && \ + mv "$(notdir [$]@).tmp" "$(notdir [$]@)"); \ + else \ + (cd "$(dir [$]@)" && \ + $(ITSTOOL) -o "$(notdir [$]@).tmp" $(_HELP_C_FILES) && \ + msgmerge -o "$(notdir [$]@)" "$(notdir [$]@)" "$(notdir [$]@).tmp" && \ + rm "$(notdir [$]@).tmp"); \ + fi + +$(_HELP_MOFILES): %.mo: %.po + $(AM_V_at)if ! test -d "$(dir [$]@)"; then mkdir "$(dir [$]@)"; fi + $(AM_V_GEN)msgfmt -o "[$]@" "$<" + +$(_HELP_LC_FILES): $(_HELP_LINGUAS) +$(_HELP_LINGUAS): $(_HELP_LC_STAMPS) +$(_HELP_LC_STAMPS): %.stamp: %.mo +$(_HELP_LC_STAMPS): $(_HELP_C_FILES) $(_HELP_C_EXTRA) + $(AM_V_at)if ! test -d "$(dir [$]@)"; then mkdir "$(dir [$]@)"; fi + $(_HELP_LC_VERBOSE)if test -d "C"; then d="../"; else d="$(abs_srcdir)/"; fi; \ + mo="$(dir [$]@)$(patsubst %/$(notdir [$]@),%,[$]@).mo"; \ + if test -f "$${mo}"; then mo="../$${mo}"; else mo="$(abs_srcdir)/$${mo}"; fi; \ + (cd "$(dir [$]@)" && $(ITSTOOL) -m "$${mo}" $(foreach f,$(_HELP_C_FILES),$${d}/$(f))) && \ + touch "[$]@" + +.PHONY: clean-help +mostlyclean-am: $(if $(HELP_ID),clean-help) +clean-help: + rm -f $(_HELP_LC_FILES) $(_HELP_LC_STAMPS) $(_HELP_MOFILES) + +EXTRA_DIST ?= +EXTRA_DIST += $(_HELP_C_EXTRA) $(_HELP_C_MEDIA) +EXTRA_DIST += $(if $(YELP_LC_DIST),$(foreach lc,$(HELP_LINGUAS),$(lc)/$(lc).stamp)) +EXTRA_DIST += $(foreach lc,$(HELP_LINGUAS),$(lc)/$(lc).po) +EXTRA_DIST += $(foreach f,$(HELP_MEDIA),$(foreach lc,$(HELP_LINGUAS),$(wildcard $(lc)/$(f)))) + +distdir: distdir-help-files +distdir-help-files: $(_HELP_LC_FILES) + @for lc in C $(if $(YELP_LC_DIST),$(HELP_LINGUAS)) ; do \ + $(MKDIR_P) "$(distdir)/$$lc"; \ + for file in $(HELP_FILES); do \ + if test -f "$$lc/$$file"; then d=./; else d=$(srcdir)/; fi; \ + cp -p "$$d$$lc/$$file" "$(distdir)/$$lc/" || exit 1; \ + done; \ + done; \ + +.PHONY: check-help +check: check-help +check-help: + for lc in C $(_HELP_LINGUAS); do \ + if test -d "$$lc"; \ + then d=; \ + xmlpath="$$lc"; \ + else \ + d="$(srcdir)/"; \ + xmlpath="$$lc:$(srcdir)/$$lc"; \ + fi; \ + for page in $(HELP_FILES); do \ + echo "$(XMLLINT) --noout --noent --path $$xmlpath --xinclude $$d$$lc/$$page"; \ + $(XMLLINT) --noout --noent --path "$$xmlpath" --xinclude "$$d$$lc/$$page"; \ + done; \ + done + + +.PHONY: install-help +install-data-am: $(if $(HELP_ID),install-help) +install-help: $(_HELP_LC_FILES) + @for lc in C $(_HELP_LINGUAS); do \ + $(mkinstalldirs) "$(DESTDIR)$(HELP_DIR)/$$lc/$(HELP_ID)" || exit 1; \ + done + @for lc in C $(_HELP_LINGUAS); do for f in $(HELP_FILES); do \ + if test -f "$$lc/$$f"; then d=; else d="$(srcdir)/"; fi; \ + helpdir="$(DESTDIR)$(HELP_DIR)/$$lc/$(HELP_ID)/"; \ + if ! test -d "$$helpdir"; then $(mkinstalldirs) "$$helpdir"; fi; \ + echo "$(INSTALL_DATA) $$d$$lc/$$f $$helpdir`basename $$f`"; \ + $(INSTALL_DATA) "$$d$$lc/$$f" "$$helpdir`basename $$f`" || exit 1; \ + done; done + @for f in $(_HELP_C_EXTRA); do \ + lc=`dirname "$$f"`; lc=`basename "$$lc"`; \ + if test -f "$$f"; then d=; else d="$(srcdir)/"; fi; \ + helpdir="$(DESTDIR)$(HELP_DIR)/$$lc/$(HELP_ID)/"; \ + if ! test -d "$$helpdir"; then $(mkinstalldirs) "$$helpdir"; fi; \ + echo "$(INSTALL_DATA) $$d$$f $$helpdir`basename $$f`"; \ + $(INSTALL_DATA) "$$d$$f" "$$helpdir`basename $$f`" || exit 1; \ + done + @for f in $(HELP_MEDIA); do \ + for lc in C $(_HELP_LINGUAS); do \ + if test -f "$$lc$$f"; then d=; else d="$(srcdir)/"; fi; \ + helpdir="$(DESTDIR)$(HELP_DIR)/$$lc/$(HELP_ID)/"; \ + mdir=`dirname "$$f"`; \ + if test "x$mdir" = "x."; then mdir=""; fi; \ + if ! test -d "$$helpdir$$mdir"; then $(mkinstalldirs) "$$helpdir$$mdir"; fi; \ + if test -f "$$d$$lc/$$f"; then \ + echo "$(INSTALL_DATA) $$d$$lc/$$f $$helpdir$$f"; \ + $(INSTALL_DATA) "$$d$$lc/$$f" "$$helpdir$$f" || exit 1; \ + elif test "x$$lc" != "xC"; then \ + if test "x$(YELP_LC_MEDIA_LINKS)" != "x"; then \ + echo "$(LN_S) -f $(HELP_DIR)/C/$(HELP_ID)/$$f $$helpdir$$f"; \ + $(LN_S) -f "$(HELP_DIR)/C/$(HELP_ID)/$$f" "$$helpdir$$f" || exit 1; \ + fi; \ + fi; \ + done; \ + done + +.PHONY: uninstall-help +uninstall-am: $(if $(HELP_ID),uninstall-help) +uninstall-help: + for lc in C $(_HELP_LINGUAS); do for f in $(HELP_FILES); do \ + helpdir="$(DESTDIR)$(HELP_DIR)/$$lc/$(HELP_ID)/"; \ + echo "rm -f $$helpdir`basename $$f`"; \ + rm -f "$$helpdir`basename $$f`"; \ + done; done + @for f in $(_HELP_C_EXTRA); do \ + lc=`dirname "$$f"`; lc=`basename "$$lc"`; \ + helpdir="$(DESTDIR)$(HELP_DIR)/$$lc/$(HELP_ID)/"; \ + echo "rm -f $$helpdir`basename $$f`"; \ + rm -f "$$helpdir`basename $$f`"; \ + done + @for f in $(HELP_MEDIA); do \ + for lc in C $(_HELP_LINGUAS); do \ + helpdir="$(DESTDIR)$(HELP_DIR)/$$lc/$(HELP_ID)/"; \ + echo "rm -f $$helpdir$$f"; \ + rm -f "$$helpdir$$f"; \ + done; \ + done; +' +AC_SUBST([YELP_HELP_RULES]) +m4_ifdef([_AM_SUBST_NOTMAKE], [_AM_SUBST_NOTMAKE([YELP_HELP_RULES])]) +]) diff -Nru gnome-taquin-3.18.1.1/Makefile.am gnome-taquin-3.20.2/Makefile.am --- gnome-taquin-3.18.1.1/Makefile.am 2015-10-02 20:04:26.000000000 +0000 +++ gnome-taquin-3.20.2/Makefile.am 2016-03-24 10:46:09.000000000 +0000 @@ -6,4 +6,7 @@ EXTRA_DIST = COPYING.sounds COPYING.themes +# We currently have no custom macros +GITIGNOREFILES = m4 + -include $(top_srcdir)/git.mk diff -Nru gnome-taquin-3.18.1.1/Makefile.in gnome-taquin-3.20.2/Makefile.in --- gnome-taquin-3.18.1.1/Makefile.in 2015-10-15 03:55:13.000000000 +0000 +++ gnome-taquin-3.20.2/Makefile.in 2016-05-09 00:14:07.000000000 +0000 @@ -87,7 +87,10 @@ POST_UNINSTALL = : subdir = . ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -am__aclocal_m4_deps = $(top_srcdir)/configure.ac +am__aclocal_m4_deps = $(top_srcdir)/m4/appstream-xml.m4 \ + $(top_srcdir)/m4/gsettings.m4 $(top_srcdir)/m4/intltool.m4 \ + $(top_srcdir)/m4/nls.m4 $(top_srcdir)/m4/pkg.m4 \ + $(top_srcdir)/m4/yelp.m4 $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) DIST_COMMON = $(srcdir)/Makefile.am $(top_srcdir)/configure \ @@ -214,7 +217,6 @@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ DESKTOP_FILE_VALIDATE = @DESKTOP_FILE_VALIDATE@ -DISABLE_DEPRECATED = @DISABLE_DEPRECATED@ ECHO_C = @ECHO_C@ ECHO_N = @ECHO_N@ ECHO_T = @ECHO_T@ @@ -326,6 +328,9 @@ $(GITIGNORE_MAINTAINERCLEANFILES_MAKEFILE_IN) EXTRA_DIST = COPYING.sounds COPYING.themes + +# We currently have no custom macros +GITIGNOREFILES = m4 all: all-recursive .SUFFIXES: diff -Nru gnome-taquin-3.18.1.1/NEWS gnome-taquin-3.20.2/NEWS --- gnome-taquin-3.18.1.1/NEWS 2015-10-15 03:53:04.000000000 +0000 +++ gnome-taquin-3.20.2/NEWS 2016-05-09 00:12:40.000000000 +0000 @@ -1,3 +1,99 @@ +3.20.2 – May 9, 2016 +========================= + +Two translations updated. + +Translations updated: + Occitan: Cédric Valmary + Portuguese: Sérgio Cardeira + +3.20.1 – April 14, 2016 +========================= + +Just one translation update. + +Translation updated: + Friulian: Fabio Tomat + +3.20.0 – March 21, 2016 +========================= + +Just translations updates since the last beta. No big change for this new stable +release 3.20, just two cats changed and bug corrections. :·) + +Translations updated: + Basque: Inaki Larranaga Murgoitio + Danish: Ask Hjorth Larsen + Korean: Changwoo Ryu + Russian: Stas Solovey + +3.19.92 – March 15, 2016 +========================= + +A problem related to the french translation of help, reported (bug #762466) by +Anders Jonsson, has (hopefully) be corrected by Alexandre Franke. Also, the +“valign” property of some buttons of the headerbar has been set to “center”, to +look better on some rare configurations. + +Translations updated: + Greek: Efstathios Iosifidis + Hebrew: Yosef Or Boczko + Hungarian: Gábor Kelemen + Occitan: Cédric Valmary + Slovak: Dušan Kazik + Ukrainian: Daniel Korostil + +3.19.91 – March 1, 2016 +========================= + +Help licensing (CC By-SA 4.0 International) has been correctly documented, and +copyright has been updated in the files headers and in the About dialog. + +Translations: + Brazilian Portuguese: Artur de Aquino Morais + Galician: Fran Dieguez + Hungarian: Gabor Kelemen (new) + Italian: Milo Casagrande + Serbian: Мирослав Николић + Swedish: Anders Jonsson + +3.19.90 – February 17, 2016 +========================= + +Two cats have been replaced, for DFSG compatibility. Other changes include some +metadata updates, and corrections caused by recent GTK+. + +New translations: + Bulgarian: Alexander Shopov + Occitan: Cédric Valmary + +Translations updated: + Chinese (Taiwan): Chao-Hsiung Liao + Finnish: Jiri Grönroos + French: Alexandre Franke + Friulian: Fabio Tomat + German: Mario Blättermann + Hungarian: Balázs Meskó + Latvian: Rūdolfs Mazurs + Lithuanian: Aurimas Černius + Norwegian bokmål: Kjartan Maraas + Polish: Piotr Drąg + Portuguese: Pedro Albuquerque + Slovenian: Matej Urbančič + Spanish: Daniel Mustieles + Swedish: Anders Jonsson and Sebastian Rasmussen (help added) + +3.19.1 – October 27, 2015 +========================= + +Changes since 3.18.1 +* Updated czech translation +* Adaptation to current CSS-nodes + +Known issue +* Narrow no-break space (U+202F) looks not rendered in some locales +* CSS-nodes will break again + 3.18.1.1 - October 15, 2015 ========================= diff -Nru gnome-taquin-3.18.1.1/po/bg.po gnome-taquin-3.20.2/po/bg.po --- gnome-taquin-3.18.1.1/po/bg.po 1970-01-01 00:00:00.000000000 +0000 +++ gnome-taquin-3.20.2/po/bg.po 2016-03-24 10:46:09.000000000 +0000 @@ -0,0 +1,225 @@ +# Bulgarian translation of gnome-taquin po-file +# Copyright (C) 2016 Free Software Foundation, Inc. +# This file is distributed under the same license as the gnome-taguin package. +# Alexander Shopov , 2016. +msgid "" +msgstr "" +"Project-Id-Version: gnome-taquin master\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2016-01-15 21:39+0200\n" +"PO-Revision-Date: 2016-01-15 21:39+0200\n" +"Last-Translator: Alexander Shopov \n" +"Language-Team: Bulgarian \n" +"Language: bg\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" + +#: ../data/taquin-menus.ui.h:1 +msgid "_Sound" +msgstr "_Звук" + +#: ../data/taquin-menus.ui.h:2 +msgid "_Help" +msgstr "Помо_щ" + +#: ../data/taquin-menus.ui.h:3 +msgid "_About" +msgstr "_Относно" + +#: ../data/taquin-menus.ui.h:4 +msgid "_Quit" +msgstr "_Спиране на програмата" + +#: ../data/taquin-screens.ui.h:1 +msgid "3 × 3" +msgstr "3 × 3" + +#: ../data/taquin-screens.ui.h:2 +msgid "4 × 4" +msgstr "4 × 4" + +#: ../data/taquin-screens.ui.h:3 +msgid "5 × 5" +msgstr "5 × 5" + +#: ../data/taquin-screens.ui.h:4 +msgid "Cats" +msgstr "Котки" + +#: ../data/taquin-screens.ui.h:5 +msgid "Numbers" +msgstr "Числа" + +#: ../data/taquin-screens.ui.h:6 ../data/org.gnome.taquin.desktop.in.h:5 +msgid "15-Puzzle" +msgstr "15 плочки" + +#: ../data/taquin-screens.ui.h:7 ../data/org.gnome.taquin.desktop.in.h:6 +msgid "16-Puzzle" +msgstr "16 плочки" + +#: ../data/taquin.ui.h:1 +msgid "Go back to the current game" +msgstr "Към текущата игра" + +#: ../data/taquin.ui.h:2 +msgid "_Start Over" +msgstr "Отна_чало" + +#: ../data/taquin.ui.h:3 +msgid "Configure a new game" +msgstr "Настройване на нова игра" + +#: ../data/taquin.ui.h:4 +msgid "Start a new game" +msgstr "Започване на нова игра" + +#: ../data/org.gnome.taquin.appdata.xml.in.h:1 +msgid "GNOME Taquin" +msgstr "Пет6найсе" + +#: ../data/org.gnome.taquin.appdata.xml.in.h:2 +#: ../data/org.gnome.taquin.desktop.in.h:3 +msgid "Slide tiles to their correct places" +msgstr "Поставете плочките на правилните места чрез плъзгане" + +#: ../data/org.gnome.taquin.appdata.xml.in.h:3 +msgid "" +"Taquin is a computer version of the 15-puzzle and other sliding puzzles." +msgstr "„Пет6найсе“ е версия на популярната игра с 15 плъзгащи се блокчета" + +#: ../data/org.gnome.taquin.appdata.xml.in.h:4 +msgid "" +"The object of Taquin is to move tiles so that they reach their places, " +"either indicated with numbers, or with parts of a great image." +msgstr "" +"Целта е да подредите плочките като ги плъзгате и те да се подредят " +"последователно или като част от картинка." + +#: ../data/org.gnome.taquin.desktop.in.h:1 ../src/taquin-main.vala:76 +#: ../src/taquin-main.vala:133 ../src/taquin-main.vala:237 +msgid "Taquin" +msgstr "Пет6найсе" + +#: ../data/org.gnome.taquin.desktop.in.h:2 +msgid "15-puzzle" +msgstr "Квадрат с 15-16 плочки" + +#: ../data/org.gnome.taquin.desktop.in.h:4 +msgid "puzzle;" +msgstr "петнадесет;загадка;плочки;15;16;puzzle;" + +#: ../data/org.gnome.taquin.gschema.xml.h:1 +msgid "Number of tiles on each edge." +msgstr "Брой плочки на всяка страна" + +#: ../data/org.gnome.taquin.gschema.xml.h:2 +msgid "" +"The game offers to play with a board size from 3 to 5. The setting could be " +"set from 2 (good for testing) to 9, limited by the way files are selected." +msgstr "" +"Стандартно можете да играете с размер на ръба на дъската от 3 до 5 плочки. 2 " +"е добре при тестване на играта, а над 5 до 9 е са по-трудни варианти и има " +"определени ограничения." + +#: ../data/org.gnome.taquin.gschema.xml.h:3 +msgid "Name of the theme folder." +msgstr "Име на папката с темата." + +#: ../data/org.gnome.taquin.gschema.xml.h:4 +msgid "Taquin has two default themes: 'cats' and 'numbers'." +msgstr "„Пет6найсе“ идва с две стандартни теми: „Котки“ и „Числа“." + +#: ../data/org.gnome.taquin.gschema.xml.h:5 +msgid "Sound" +msgstr "Звук" + +#: ../data/org.gnome.taquin.gschema.xml.h:6 +msgid "Whether or not to play event sounds." +msgstr "Дали събитията да се придружават с изпълнение на звук" + +#: ../data/org.gnome.taquin.gschema.xml.h:7 +msgid "Width of the window in pixels." +msgstr "Широчина на прозореца в пиксели." + +#: ../data/org.gnome.taquin.gschema.xml.h:8 +msgid "Height of the window in pixels." +msgstr "Височина на прозореца в пиксели." + +#: ../data/org.gnome.taquin.gschema.xml.h:9 +msgid "true if the window is maximized." +msgstr "истина, ако прозорецът е максимизиран." + +#: ../src/game-window.vala:128 +msgid "_Start Game" +msgstr "_Начало на играта" + +#: ../src/game-window.vala:153 +msgid "Undo your most recent move" +msgstr "Отмяна на последния ход" + +#: ../src/taquin-main.vala:45 +msgid "Play the classical 1880s’ 15-puzzle" +msgstr "Класическата игра от 80-те години на 19 век" + +#: ../src/taquin-main.vala:46 +msgid "Try this fun alternative 16-puzzle" +msgstr "Алтернативен вариант с всички плочки" + +#: ../src/taquin-main.vala:47 +msgid "Sets the puzzle edges’ size (3-5, 2-9 for debug)" +msgstr "Задаване на броя плочки по страните (3-5, 2-9 за трасиране)" + +#: ../src/taquin-main.vala:48 +msgid "Turn off the sound" +msgstr "Без звук" + +#: ../src/taquin-main.vala:49 +msgid "Turn on the sound" +msgstr "Със звук" + +#: ../src/taquin-main.vala:50 +msgid "Print release version and exit" +msgstr "Извеждане на версията и спиране на програмата" + +#: ../src/taquin-main.vala:233 +msgid "(see COPYING.themes for informations)" +msgstr "(за информация погледнете файла „COPYING.themes“)" + +#: ../src/taquin-main.vala:241 +msgid "A classic 15-puzzle game" +msgstr "Класическата игра с 15 плочки" + +#: ../src/taquin-main.vala:245 +msgid "translator-credits" +msgstr "" +"Александър Шопов \n" +"\n" +"Проектът за превод на GNOME има нужда от подкрепа.\n" +"Научете повече за нас на http://gnome.cult." +"bg\n" +"Докладвайте за грешки на http://gnome." +"cult.bg/bugs" + +#: ../src/taquin-main.vala:286 +msgid "You can’t move this tile!" +msgstr "Не може да местите тази плочка!" + +#: ../src/taquin-main.vala:292 +msgid "Bravo! You finished the game!" +msgstr "Браво, подредихте плочките!" + +#: ../src/taquin-main.vala:310 +#, c-format +msgid "Size: %d × %d ▾" +msgstr "Размер: %d × %d ▾" + +#: ../src/taquin-main.vala:324 +msgid "Theme: Cats ▾" +msgstr "Тема: Котки ▾" + +#: ../src/taquin-main.vala:325 +msgid "Theme: Numbers ▾" +msgstr "Тема: Числа ▾" diff -Nru gnome-taquin-3.18.1.1/po/cs.po gnome-taquin-3.20.2/po/cs.po --- gnome-taquin-3.18.1.1/po/cs.po 2015-10-02 20:04:26.000000000 +0000 +++ gnome-taquin-3.20.2/po/cs.po 2016-03-24 10:46:09.000000000 +0000 @@ -8,8 +8,8 @@ "Project-Id-Version: gnome-taquin master\n" "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=gnome-" "taquin&keywords=I18N+L10N&component=general\n" -"POT-Creation-Date: 2015-03-01 04:45+0000\n" -"PO-Revision-Date: 2015-03-02 22:07+0100\n" +"POT-Creation-Date: 2015-10-24 09:21+0000\n" +"PO-Revision-Date: 2015-10-24 22:38+0200\n" "Last-Translator: Marek Černocký \n" "Language-Team: Czech \n" "Language: cs\n" @@ -55,11 +55,11 @@ msgid "Numbers" msgstr "Čísla" -#: ../data/taquin-screens.ui.h:6 ../data/org.gnome.taquin.desktop.in.h:4 +#: ../data/taquin-screens.ui.h:6 ../data/org.gnome.taquin.desktop.in.h:5 msgid "15-Puzzle" msgstr "Skládačka s 15 díly" -#: ../data/taquin-screens.ui.h:7 ../data/org.gnome.taquin.desktop.in.h:5 +#: ../data/taquin-screens.ui.h:7 ../data/org.gnome.taquin.desktop.in.h:6 msgid "16-Puzzle" msgstr "Skládačka s 16 díly" @@ -68,22 +68,14 @@ msgstr "Zpátky na současnou hru" #: ../data/taquin.ui.h:2 -msgid "_Start Game" -msgstr "_Začít hru" - -#: ../data/taquin.ui.h:3 -msgid "Start a new game as configured" -msgstr "Začít novou hru, tak jak je nastavená" - -#: ../data/taquin.ui.h:4 msgid "_Start Over" msgstr "_Začít jinou hru" -#: ../data/taquin.ui.h:5 +#: ../data/taquin.ui.h:3 msgid "Configure a new game" msgstr "Nastavit novou hru" -#: ../data/taquin.ui.h:6 +#: ../data/taquin.ui.h:4 msgid "Start a new game" msgstr "Začít novou hru" @@ -92,7 +84,7 @@ msgstr "Taquin GNOME" #: ../data/org.gnome.taquin.appdata.xml.in.h:2 -#: ../data/org.gnome.taquin.desktop.in.h:2 +#: ../data/org.gnome.taquin.desktop.in.h:3 msgid "Slide tiles to their correct places" msgstr "Presuňte díly na jejich správné místo" @@ -107,16 +99,19 @@ "The object of Taquin is to move tiles so that they reach their places, " "either indicated with numbers, or with parts of a great image." msgstr "" -"Cílem hlavolamu Taquin je přesunout díly na jejich správná místa, která " -"jsou daná buď číslem nebo částmi velkého obrázku." +"Cílem hlavolamu Taquin je přesunout díly na jejich správná místa, která jsou " +"daná buď číslem nebo částmi velkého obrázku." -#. Window -#: ../data/org.gnome.taquin.desktop.in.h:1 ../src/taquin-main.vala:78 -#: ../src/taquin-main.vala:138 ../src/taquin-main.vala:254 +#: ../data/org.gnome.taquin.desktop.in.h:1 ../src/taquin-main.vala:76 +#: ../src/taquin-main.vala:133 ../src/taquin-main.vala:237 msgid "Taquin" msgstr "Taquin" -#: ../data/org.gnome.taquin.desktop.in.h:3 +#: ../data/org.gnome.taquin.desktop.in.h:2 +msgid "15-puzzle" +msgstr "Skládačka s 15 díly" + +#: ../data/org.gnome.taquin.desktop.in.h:4 msgid "puzzle;" msgstr "posuvné;posuvná;puzzle;hlavolam;skládačka;" @@ -161,63 +156,67 @@ msgid "true if the window is maximized." msgstr "Zapnuto, když je okno maximalizováno." -#: ../src/game-window.vala:134 +#: ../src/game-window.vala:128 +msgid "_Start Game" +msgstr "_Začít hru" + +#: ../src/game-window.vala:153 msgid "Undo your most recent move" msgstr "Vrátit zpět poslední tah" -#: ../src/taquin-main.vala:46 +#: ../src/taquin-main.vala:45 msgid "Play the classical 1880s’ 15-puzzle" msgstr "Hrát klasický posuvný hlavolam z 80 let s 15 díly" -#: ../src/taquin-main.vala:47 +#: ../src/taquin-main.vala:46 msgid "Try this fun alternative 16-puzzle" msgstr "Zkusit vtipnou alternativu posuvného hlavolamu s 16 díly" -#: ../src/taquin-main.vala:48 +#: ../src/taquin-main.vala:47 msgid "Sets the puzzle edges’ size (3-5, 2-9 for debug)" msgstr "Nastavit velikost stran (3 až 5, pro účely ladění 2 až 9)" -#: ../src/taquin-main.vala:49 +#: ../src/taquin-main.vala:48 msgid "Turn off the sound" msgstr "Vypnout zvuk" -#: ../src/taquin-main.vala:50 +#: ../src/taquin-main.vala:49 msgid "Turn on the sound" msgstr "Zapnout zvuk" -#: ../src/taquin-main.vala:51 +#: ../src/taquin-main.vala:50 msgid "Print release version and exit" msgstr "Vypsat verzi vydání a skončit" -#: ../src/taquin-main.vala:250 +#: ../src/taquin-main.vala:233 msgid "(see COPYING.themes for informations)" msgstr "(viz COPYING.themes ohledně informací)" -#: ../src/taquin-main.vala:258 +#: ../src/taquin-main.vala:241 msgid "A classic 15-puzzle game" msgstr "Klasický posuvný hlavolam s 15 díly" -#: ../src/taquin-main.vala:262 +#: ../src/taquin-main.vala:245 msgid "translator-credits" msgstr "Marek Černocký " -#: ../src/taquin-main.vala:303 +#: ../src/taquin-main.vala:286 msgid "You can’t move this tile!" msgstr "Tímto dílem nemůžete táhnout!" -#: ../src/taquin-main.vala:309 +#: ../src/taquin-main.vala:292 msgid "Bravo! You finished the game!" msgstr "Výborně! Dokončili jste hru." -#: ../src/taquin-main.vala:333 +#: ../src/taquin-main.vala:310 #, c-format msgid "Size: %d × %d ▾" msgstr "Velikost: %d × %d ▾" -#: ../src/taquin-main.vala:347 +#: ../src/taquin-main.vala:324 msgid "Theme: Cats ▾" msgstr "Motiv: Kočky ▾" -#: ../src/taquin-main.vala:348 +#: ../src/taquin-main.vala:325 msgid "Theme: Numbers ▾" -msgstr "Motiv: Čísla ▾" \ No newline at end of file +msgstr "Motiv: Čísla ▾" diff -Nru gnome-taquin-3.18.1.1/po/da.po gnome-taquin-3.20.2/po/da.po --- gnome-taquin-3.18.1.1/po/da.po 2015-10-02 20:04:26.000000000 +0000 +++ gnome-taquin-3.20.2/po/da.po 2016-03-24 10:46:09.000000000 +0000 @@ -1,14 +1,14 @@ # Danish translation for gnome-taquin. -# Copyright (C) 2015 gnome-taquin's COPYRIGHT HOLDER +# Copyright (C) 2015, 2016 gnome-taquin's developers and the below translators # This file is distributed under the same license as the gnome-taquin package. -# Ask Hjorth Larsen , 2015. +# Ask Hjorth Larsen , 2015, 2016. # msgid "" msgstr "" "Project-Id-Version: gnome-taquin master\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2015-03-14 19:46+0100\n" -"PO-Revision-Date: 2015-03-14 01:07+0100\n" +"POT-Creation-Date: 2016-03-20 23:33+0100\n" +"PO-Revision-Date: 2016-03-20 03:30+0100\n" "Last-Translator: Ask Hjorth Larsen \n" "Language-Team: Danish \n" "Language: da\n" @@ -53,11 +53,11 @@ msgid "Numbers" msgstr "Tal" -#: ../data/taquin-screens.ui.h:6 ../data/org.gnome.taquin.desktop.in.h:4 +#: ../data/taquin-screens.ui.h:6 ../data/org.gnome.taquin.desktop.in.h:5 msgid "15-Puzzle" msgstr "15-spil" -#: ../data/taquin-screens.ui.h:7 ../data/org.gnome.taquin.desktop.in.h:5 +#: ../data/taquin-screens.ui.h:7 ../data/org.gnome.taquin.desktop.in.h:6 msgid "16-Puzzle" msgstr "16-spil" @@ -66,22 +66,14 @@ msgstr "Gå tilbage til nuværende spil" #: ../data/taquin.ui.h:2 -msgid "_Start Game" -msgstr "_Start spil" - -#: ../data/taquin.ui.h:3 -msgid "Start a new game as configured" -msgstr "Start et nyt spil ifølge opsætning" - -#: ../data/taquin.ui.h:4 msgid "_Start Over" msgstr "_Start forfra" -#: ../data/taquin.ui.h:5 +#: ../data/taquin.ui.h:3 msgid "Configure a new game" msgstr "Sæt nyt spil op" -#: ../data/taquin.ui.h:6 +#: ../data/taquin.ui.h:4 msgid "Start a new game" msgstr "Start et nyt spil" @@ -90,7 +82,7 @@ msgstr "GNOME Taquin" #: ../data/org.gnome.taquin.appdata.xml.in.h:2 -#: ../data/org.gnome.taquin.desktop.in.h:2 +#: ../data/org.gnome.taquin.desktop.in.h:3 msgid "Slide tiles to their correct places" msgstr "Flyt brikker til deres rigtige pladser" @@ -107,12 +99,16 @@ "Målet med Taquin er at flytte brikker, så de når deres pladser angivet enten " "ved tal eller dele af et stort billede." -#: ../data/org.gnome.taquin.desktop.in.h:1 ../src/taquin-main.vala:78 -#: ../src/taquin-main.vala:135 ../src/taquin-main.vala:250 +#: ../data/org.gnome.taquin.desktop.in.h:1 ../src/taquin-main.vala:76 +#: ../src/taquin-main.vala:133 ../src/taquin-main.vala:237 msgid "Taquin" msgstr "Taquin" -#: ../data/org.gnome.taquin.desktop.in.h:3 +#: ../data/org.gnome.taquin.desktop.in.h:2 +msgid "15-puzzle" +msgstr "15-spil" + +#: ../data/org.gnome.taquin.desktop.in.h:4 msgid "puzzle;" msgstr "spil;opgave;tænkespil;puslespil;" @@ -157,43 +153,47 @@ msgid "true if the window is maximized." msgstr "true hvis vinduet er maksimeret." -#: ../src/game-window.vala:141 +#: ../src/game-window.vala:128 +msgid "_Start Game" +msgstr "_Start spil" + +#: ../src/game-window.vala:153 msgid "Undo your most recent move" msgstr "Fortryd dit seneste træk" -#: ../src/taquin-main.vala:46 +#: ../src/taquin-main.vala:45 msgid "Play the classical 1880s’ 15-puzzle" msgstr "Spil det klassiske 15-spil fra 1880'erne" -#: ../src/taquin-main.vala:47 +#: ../src/taquin-main.vala:46 msgid "Try this fun alternative 16-puzzle" msgstr "Prøv dette underholdende 16-spil som alternativ" -#: ../src/taquin-main.vala:48 +#: ../src/taquin-main.vala:47 msgid "Sets the puzzle edges’ size (3-5, 2-9 for debug)" msgstr "Angiver spillets kantstørrelse (3-5, eller 2-9 for fejlsøgning)" -#: ../src/taquin-main.vala:49 +#: ../src/taquin-main.vala:48 msgid "Turn off the sound" msgstr "Slå lyden fra" -#: ../src/taquin-main.vala:50 +#: ../src/taquin-main.vala:49 msgid "Turn on the sound" msgstr "Slå lyden til" -#: ../src/taquin-main.vala:51 +#: ../src/taquin-main.vala:50 msgid "Print release version and exit" msgstr "Udskriv versionsinformation og afslut" -#: ../src/taquin-main.vala:246 +#: ../src/taquin-main.vala:233 msgid "(see COPYING.themes for informations)" msgstr "(se COPYING.themes for oplysninger)" -#: ../src/taquin-main.vala:254 +#: ../src/taquin-main.vala:241 msgid "A classic 15-puzzle game" msgstr "Et klassisk 15-spil" -#: ../src/taquin-main.vala:258 +#: ../src/taquin-main.vala:245 msgid "translator-credits" msgstr "" "Ask Hjorth Larsen \n" @@ -202,23 +202,26 @@ "\n" "Mere info: http://www.dansk-gruppen.dk" -#: ../src/taquin-main.vala:299 +#: ../src/taquin-main.vala:286 msgid "You can’t move this tile!" msgstr "Du kan ikke flytte denne brik!" -#: ../src/taquin-main.vala:305 +#: ../src/taquin-main.vala:292 msgid "Bravo! You finished the game!" msgstr "Bravo! Du har gennemført spillet!" -#: ../src/taquin-main.vala:329 +#: ../src/taquin-main.vala:310 #, c-format msgid "Size: %d × %d ▾" msgstr "Størrelse: %d × %d ▾" -#: ../src/taquin-main.vala:343 +#: ../src/taquin-main.vala:324 msgid "Theme: Cats ▾" msgstr "Tema: Katte ▾" -#: ../src/taquin-main.vala:344 +#: ../src/taquin-main.vala:325 msgid "Theme: Numbers ▾" msgstr "Tema: Tal ▾" + +#~ msgid "Start a new game as configured" +#~ msgstr "Start et nyt spil ifølge opsætning" diff -Nru gnome-taquin-3.18.1.1/po/de.po gnome-taquin-3.20.2/po/de.po --- gnome-taquin-3.18.1.1/po/de.po 2015-10-02 20:04:26.000000000 +0000 +++ gnome-taquin-3.20.2/po/de.po 2016-03-24 10:46:09.000000000 +0000 @@ -3,22 +3,23 @@ # This file is distributed under the same license as the gnome-taquin package. # Christian Kirbach , 2015. # Bernd Homuth , 2015. +# Mario Blättermann , 2015. # msgid "" msgstr "" "Project-Id-Version: gnome-taquin master\n" "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=gnome-" "taquin&keywords=I18N+L10N&component=general\n" -"POT-Creation-Date: 2015-09-18 08:32+0000\n" -"PO-Revision-Date: 2015-09-19 09:43+0100\n" -"Last-Translator: Christian Kirbach \n" +"POT-Creation-Date: 2015-12-28 10:29+0000\n" +"PO-Revision-Date: 2015-12-28 20:46+0100\n" +"Last-Translator: Mario Blättermann \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-Generator: Poedit 1.5.4\n" +"X-Generator: Poedit 1.8.5\n" #: ../data/taquin-menus.ui.h:1 msgid "_Sound" @@ -56,11 +57,11 @@ msgid "Numbers" msgstr "Zahlen" -#: ../data/taquin-screens.ui.h:6 ../data/org.gnome.taquin.desktop.in.h:4 +#: ../data/taquin-screens.ui.h:6 ../data/org.gnome.taquin.desktop.in.h:5 msgid "15-Puzzle" msgstr "15-teiliges Puzzle" -#: ../data/taquin-screens.ui.h:7 ../data/org.gnome.taquin.desktop.in.h:5 +#: ../data/taquin-screens.ui.h:7 ../data/org.gnome.taquin.desktop.in.h:6 msgid "16-Puzzle" msgstr "16-teiliges Puzzle" @@ -85,7 +86,7 @@ msgstr "GNOME Taquin" #: ../data/org.gnome.taquin.appdata.xml.in.h:2 -#: ../data/org.gnome.taquin.desktop.in.h:2 +#: ../data/org.gnome.taquin.desktop.in.h:3 msgid "Slide tiles to their correct places" msgstr "Verschieben Sie Kacheln an ihren richtigen Ort" @@ -110,7 +111,11 @@ msgid "Taquin" msgstr "Taquin" -#: ../data/org.gnome.taquin.desktop.in.h:3 +#: ../data/org.gnome.taquin.desktop.in.h:2 +msgid "15-puzzle" +msgstr "15-teiliges Puzzle" + +#: ../data/org.gnome.taquin.desktop.in.h:4 msgid "puzzle;" msgstr "Puzzle;" @@ -198,8 +203,9 @@ #: ../src/taquin-main.vala:245 msgid "translator-credits" msgstr "" -"Christian Kirbach , 2015\\n\n" +"Christian Kirbach , 2015\n" "Bernd Homuth , 2015" +"Mario Blättermann , 2015" #: ../src/taquin-main.vala:286 msgid "You can’t move this tile!" diff -Nru gnome-taquin-3.18.1.1/po/el.po gnome-taquin-3.20.2/po/el.po --- gnome-taquin-3.18.1.1/po/el.po 2015-10-02 20:04:26.000000000 +0000 +++ gnome-taquin-3.20.2/po/el.po 2016-03-24 10:46:09.000000000 +0000 @@ -3,23 +3,23 @@ # This file is distributed under the same license as the gnome-taquin package. # Dimitris Spingos , 2014. # Dimitris Spingos (Δημήτρης Σπίγγος) , 2014, 2015. -# Efstathios Iosifidis , 2015. +# Efstathios Iosifidis , 2015, 2016. # msgid "" msgstr "" "Project-Id-Version: gnome-taquin master\n" "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=gnome-" "taquin&keywords=I18N+L10N&component=general\n" -"POT-Creation-Date: 2015-03-01 04:45+0000\n" -"PO-Revision-Date: 2015-03-01 12:30+0200\n" -"Last-Translator: Tom Tryfonidis \n" +"POT-Creation-Date: 2016-03-02 08:25+0000\n" +"PO-Revision-Date: 2016-03-06 14:05+0200\n" +"Last-Translator: Efstathios Iosifidis \n" "Language-Team: Greek, Modern (1453-) \n" "Language: el\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.7.4\n" +"X-Generator: Gtranslator 2.91.7\n" "X-Project-Style: gnome\n" #: ../data/taquin-menus.ui.h:1 @@ -58,11 +58,11 @@ msgid "Numbers" msgstr "Αριθμοί" -#: ../data/taquin-screens.ui.h:6 ../data/org.gnome.taquin.desktop.in.h:4 +#: ../data/taquin-screens.ui.h:6 ../data/org.gnome.taquin.desktop.in.h:5 msgid "15-Puzzle" msgstr "Γρίφος 15" -#: ../data/taquin-screens.ui.h:7 ../data/org.gnome.taquin.desktop.in.h:5 +#: ../data/taquin-screens.ui.h:7 ../data/org.gnome.taquin.desktop.in.h:6 msgid "16-Puzzle" msgstr "Γρίφος 16" @@ -71,22 +71,14 @@ msgstr "Επιστροφή στο τρέχον παιχνίδι" #: ../data/taquin.ui.h:2 -msgid "_Start Game" -msgstr "Ένα_ρξη παιχνιδιού" - -#: ../data/taquin.ui.h:3 -msgid "Start a new game as configured" -msgstr "Εκκίνηση νέου παιχνιδιού όπως ρυθμίστηκε" - -#: ../data/taquin.ui.h:4 msgid "_Start Over" msgstr "Επανε_κκίνηση" -#: ../data/taquin.ui.h:5 +#: ../data/taquin.ui.h:3 msgid "Configure a new game" msgstr "Ρύθμιση νέου παιχνιδιού" -#: ../data/taquin.ui.h:6 +#: ../data/taquin.ui.h:4 msgid "Start a new game" msgstr "Έναρξη ενός νέου παιχνιδιού" @@ -95,7 +87,7 @@ msgstr "GNOME Taquin" #: ../data/org.gnome.taquin.appdata.xml.in.h:2 -#: ../data/org.gnome.taquin.desktop.in.h:2 +#: ../data/org.gnome.taquin.desktop.in.h:3 msgid "Slide tiles to their correct places" msgstr "Μετακινήστε τα πλακίδια στις σωστές τους θέσεις." @@ -115,13 +107,17 @@ "στις θέσεις τους, που δείχνονται είτε με αριθμούς, ή με τμήματα μιας μεγάλης " "εικόνας." -#. Window -#: ../data/org.gnome.taquin.desktop.in.h:1 ../src/taquin-main.vala:78 -#: ../src/taquin-main.vala:138 ../src/taquin-main.vala:254 +#: ../data/org.gnome.taquin.desktop.in.h:1 ../src/taquin-main.vala:76 +#: ../src/taquin-main.vala:133 ../src/taquin-main.vala:237 msgid "Taquin" msgstr "Taquin" -#: ../data/org.gnome.taquin.desktop.in.h:3 +#: ../data/org.gnome.taquin.desktop.in.h:2 +#| msgid "15-Puzzle" +msgid "15-puzzle" +msgstr "Γρίφος 15" + +#: ../data/org.gnome.taquin.desktop.in.h:4 msgid "puzzle;" msgstr "γρίφος;puzzle;" @@ -166,43 +162,47 @@ msgid "true if the window is maximized." msgstr "αληθές αν το παράθυρο είναι μεγιστοποιημένο." -#: ../src/game-window.vala:134 +#: ../src/game-window.vala:128 +msgid "_Start Game" +msgstr "Ένα_ρξη παιχνιδιού" + +#: ../src/game-window.vala:153 msgid "Undo your most recent move" msgstr "Αναίρεση της πιο πρόσφατης κίνησης" -#: ../src/taquin-main.vala:46 +#: ../src/taquin-main.vala:45 msgid "Play the classical 1880s’ 15-puzzle" msgstr "Παίξτε τον κλασικό γρίφο 15 του 1880" -#: ../src/taquin-main.vala:47 +#: ../src/taquin-main.vala:46 msgid "Try this fun alternative 16-puzzle" msgstr "Δοκιμάστε αυτόν τον διασκεδαστικό εναλλακτικό γρίφο 16" -#: ../src/taquin-main.vala:48 +#: ../src/taquin-main.vala:47 msgid "Sets the puzzle edges’ size (3-5, 2-9 for debug)" msgstr "Ορίζει το μέγεθος των άκρων του γρίφου (3-5, 2-9 για αποσφαλμάτωση)" -#: ../src/taquin-main.vala:49 +#: ../src/taquin-main.vala:48 msgid "Turn off the sound" msgstr "Απενεργοποίηση του ήχου" -#: ../src/taquin-main.vala:50 +#: ../src/taquin-main.vala:49 msgid "Turn on the sound" msgstr "Ενεργοποίηση του ήχου" -#: ../src/taquin-main.vala:51 +#: ../src/taquin-main.vala:50 msgid "Print release version and exit" msgstr "Εμφάνιση της έκδοσης και έξοδος" -#: ../src/taquin-main.vala:250 +#: ../src/taquin-main.vala:233 msgid "(see COPYING.themes for informations)" msgstr "(δείτε COPYING.themes για πληροφορίες)" -#: ../src/taquin-main.vala:258 +#: ../src/taquin-main.vala:241 msgid "A classic 15-puzzle game" msgstr "Ένα κλασικό παιχνίδι γρίφου 15" -#: ../src/taquin-main.vala:262 +#: ../src/taquin-main.vala:245 msgid "translator-credits" msgstr "" "Ελληνική μεταφραστική ομάδα του GNOME\n" @@ -211,27 +211,30 @@ "Για περισσότερες πληροφορίες, επισκεφθείτε τη σελίδα\n" "http://gnome.gr/" -#: ../src/taquin-main.vala:303 +#: ../src/taquin-main.vala:286 msgid "You can’t move this tile!" msgstr "Δεν μπορείτε να μετακινήσετε αυτό το πλακίδιο!" -#: ../src/taquin-main.vala:309 +#: ../src/taquin-main.vala:292 msgid "Bravo! You finished the game!" msgstr "Μπράβο! Τελειώσατε το παιχνίδι!" -#: ../src/taquin-main.vala:333 +#: ../src/taquin-main.vala:310 #, c-format msgid "Size: %d × %d ▾" msgstr "Μέγεθος: %d × %d ▾" -#: ../src/taquin-main.vala:347 +#: ../src/taquin-main.vala:324 msgid "Theme: Cats ▾" msgstr "Θέμα: Γάτες ▾" -#: ../src/taquin-main.vala:348 +#: ../src/taquin-main.vala:325 msgid "Theme: Numbers ▾" msgstr "Θέμα: Αριθμοί ▾" +#~ msgid "Start a new game as configured" +#~ msgstr "Εκκίνηση νέου παιχνιδιού όπως ρυθμίστηκε" + #~ msgid "15-Puzzle with hole" #~ msgstr "Γρίφος 15 με οπή" diff -Nru gnome-taquin-3.18.1.1/po/es.po gnome-taquin-3.20.2/po/es.po --- gnome-taquin-3.18.1.1/po/es.po 2015-10-02 20:04:26.000000000 +0000 +++ gnome-taquin-3.20.2/po/es.po 2016-03-24 10:46:09.000000000 +0000 @@ -9,8 +9,8 @@ "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=gnome-" "taquin&keywords=I18N+L10N&component=general\n" -"POT-Creation-Date: 2015-03-01 04:45+0000\n" -"PO-Revision-Date: 2015-03-02 18:38+0100\n" +"POT-Creation-Date: 2015-09-21 18:49+0000\n" +"PO-Revision-Date: 2015-11-16 16:49+0100\n" "Last-Translator: Daniel Mustieles \n" "Language-Team: Español; Castellano \n" "Language: \n" @@ -56,11 +56,11 @@ msgid "Numbers" msgstr "Números" -#: ../data/taquin-screens.ui.h:6 ../data/org.gnome.taquin.desktop.in.h:4 +#: ../data/taquin-screens.ui.h:6 ../data/org.gnome.taquin.desktop.in.h:5 msgid "15-Puzzle" msgstr "Puzle-15" -#: ../data/taquin-screens.ui.h:7 ../data/org.gnome.taquin.desktop.in.h:5 +#: ../data/taquin-screens.ui.h:7 ../data/org.gnome.taquin.desktop.in.h:6 msgid "16-Puzzle" msgstr "Puzle-16" @@ -69,24 +69,14 @@ msgstr "Volver al juego actual" #: ../data/taquin.ui.h:2 -msgid "_Start Game" -msgstr "_Iniciar juego" - -#: ../data/taquin.ui.h:3 -#| msgid "Start a new game" -msgid "Start a new game as configured" -msgstr "Iniciar un juego nuevo como está configurado" - -#: ../data/taquin.ui.h:4 msgid "_Start Over" msgstr "_Iniciar" -#: ../data/taquin.ui.h:5 -#| msgid "Start a new game" +#: ../data/taquin.ui.h:3 msgid "Configure a new game" msgstr "Configurar un juego nuevo" -#: ../data/taquin.ui.h:6 +#: ../data/taquin.ui.h:4 msgid "Start a new game" msgstr "Iniciar un juego nuevo" @@ -95,7 +85,7 @@ msgstr "GNOME Taquin" #: ../data/org.gnome.taquin.appdata.xml.in.h:2 -#: ../data/org.gnome.taquin.desktop.in.h:2 +#: ../data/org.gnome.taquin.desktop.in.h:3 msgid "Slide tiles to their correct places" msgstr "Deslice las fichas a los lugares correctos" @@ -113,13 +103,17 @@ "El objetivo de Taquin es mover las fichas a sus lugares correspondientes, " "indicados por números o por partes de una bonita imagen." -#. Window -#: ../data/org.gnome.taquin.desktop.in.h:1 ../src/taquin-main.vala:78 -#: ../src/taquin-main.vala:138 ../src/taquin-main.vala:254 +#: ../data/org.gnome.taquin.desktop.in.h:1 ../src/taquin-main.vala:76 +#: ../src/taquin-main.vala:133 ../src/taquin-main.vala:237 msgid "Taquin" msgstr "Taquin" -#: ../data/org.gnome.taquin.desktop.in.h:3 +#: ../data/org.gnome.taquin.desktop.in.h:2 +#| msgid "15-Puzzle" +msgid "15-puzzle" +msgstr "Puzle-15" + +#: ../data/org.gnome.taquin.desktop.in.h:4 msgid "puzzle;" msgstr "puzle;juego;" @@ -164,68 +158,76 @@ msgid "true if the window is maximized." msgstr "cierto si la ventana está maximizada" -#: ../src/game-window.vala:134 +#: ../src/game-window.vala:128 +msgid "_Start Game" +msgstr "_Iniciar juego" + +#: ../src/game-window.vala:153 msgid "Undo your most recent move" msgstr "Deshacer el movimiento más reciente" -#: ../src/taquin-main.vala:46 +#: ../src/taquin-main.vala:45 msgid "Play the classical 1880s’ 15-puzzle" msgstr "Juegue al clásico puzle-15 de 1880" -#: ../src/taquin-main.vala:47 +#: ../src/taquin-main.vala:46 msgid "Try this fun alternative 16-puzzle" msgstr "Pruebe este divertido puzle-16 alternativo" -#: ../src/taquin-main.vala:48 +#: ../src/taquin-main.vala:47 msgid "Sets the puzzle edges’ size (3-5, 2-9 for debug)" msgstr "" "Establece el tamaño de los bordes del puzle (3-5, 2-9 para depuración))" -#: ../src/taquin-main.vala:49 +#: ../src/taquin-main.vala:48 msgid "Turn off the sound" msgstr "Apagar el sonido" -#: ../src/taquin-main.vala:50 +#: ../src/taquin-main.vala:49 msgid "Turn on the sound" msgstr "Activar el sonido" -#: ../src/taquin-main.vala:51 +#: ../src/taquin-main.vala:50 msgid "Print release version and exit" msgstr "Mostrar información de la versión y salir" -#: ../src/taquin-main.vala:250 +#: ../src/taquin-main.vala:233 msgid "(see COPYING.themes for informations)" msgstr "(consulte COPYING.themes para obtener más información)" -#: ../src/taquin-main.vala:258 +#: ../src/taquin-main.vala:241 msgid "A classic 15-puzzle game" msgstr "Un juego clásico de puzle-15" -#: ../src/taquin-main.vala:262 +#: ../src/taquin-main.vala:245 msgid "translator-credits" msgstr "Daniel Mustieles , 2015" -#: ../src/taquin-main.vala:303 +#: ../src/taquin-main.vala:286 msgid "You can’t move this tile!" msgstr "No puede mover esta ficha" -#: ../src/taquin-main.vala:309 +#: ../src/taquin-main.vala:292 msgid "Bravo! You finished the game!" msgstr "¡Enhorabuena, ha terminado el juego!" -#: ../src/taquin-main.vala:333 +#: ../src/taquin-main.vala:310 #, c-format msgid "Size: %d × %d ▾" msgstr "Tamaño: %d × %d ▾" -#: ../src/taquin-main.vala:347 +#: ../src/taquin-main.vala:324 msgid "Theme: Cats ▾" msgstr "Tema: gatos ▾" -#: ../src/taquin-main.vala:348 +#: ../src/taquin-main.vala:325 msgid "Theme: Numbers ▾" msgstr "Tema: números ▾" +#~| msgid "Start a new game" +#~ msgid "Start a new game as configured" +#~ msgstr "Iniciar un juego nuevo como está configurado" + #~ msgid "15-Puzzle with hole" #~ msgstr "Puzle-15 con agujero" diff -Nru gnome-taquin-3.18.1.1/po/eu.po gnome-taquin-3.20.2/po/eu.po --- gnome-taquin-3.18.1.1/po/eu.po 2015-10-02 20:04:26.000000000 +0000 +++ gnome-taquin-3.20.2/po/eu.po 2016-03-24 10:46:09.000000000 +0000 @@ -2,23 +2,22 @@ # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER # This file is distributed under the same license as the PACKAGE package. # -# Iñaki Larrañaga Murgoitio , 2015. # +# Iñaki Larrañaga Murgoitio , 2015, 2016. msgid "" msgstr "" "Project-Id-Version: gnome-taquin master\n" -"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=gnome-" -"taquin&keywords=I18N+L10N&component=general\n" -"POT-Creation-Date: 2015-03-24 14:53+0100\n" -"PO-Revision-Date: 2015-03-24 14:55+0100\n" -"Last-Translator: Iñaki Larrañaga Murgoitio \n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2016-03-20 19:55+0100\n" +"PO-Revision-Date: 2016-03-20 19:55+0100\n" +"Last-Translator: dooteo \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.5\n" +"X-Generator: Lokalize 2.0\n" #: ../data/taquin-menus.ui.h:1 msgid "_Sound" @@ -56,11 +55,11 @@ msgid "Numbers" msgstr "Zenbakiak" -#: ../data/taquin-screens.ui.h:6 ../data/org.gnome.taquin.desktop.in.h:4 +#: ../data/taquin-screens.ui.h:6 ../data/org.gnome.taquin.desktop.in.h:5 msgid "15-Puzzle" msgstr "15-Puzzlea" -#: ../data/taquin-screens.ui.h:7 ../data/org.gnome.taquin.desktop.in.h:5 +#: ../data/taquin-screens.ui.h:7 ../data/org.gnome.taquin.desktop.in.h:6 msgid "16-Puzzle" msgstr "16-Puzzlea" @@ -69,22 +68,14 @@ msgstr "Uneko jokora itzultzen da" #: ../data/taquin.ui.h:2 -msgid "_Start Game" -msgstr "_Hasi jokoa" - -#: ../data/taquin.ui.h:3 -msgid "Start a new game as configured" -msgstr "Hasi joko berria (konfiguratuta dagoen bezala)" - -#: ../data/taquin.ui.h:4 msgid "_Start Over" msgstr "_Hasi berriro" -#: ../data/taquin.ui.h:5 +#: ../data/taquin.ui.h:3 msgid "Configure a new game" msgstr "Konfiguratu joko berria" -#: ../data/taquin.ui.h:6 +#: ../data/taquin.ui.h:4 msgid "Start a new game" msgstr "Hasi joko berria" @@ -93,7 +84,7 @@ msgstr "GNOME Taquin" #: ../data/org.gnome.taquin.appdata.xml.in.h:2 -#: ../data/org.gnome.taquin.desktop.in.h:2 +#: ../data/org.gnome.taquin.desktop.in.h:3 msgid "Slide tiles to their correct places" msgstr "Lerratu lauzak dagokien lekuetara" @@ -112,12 +103,16 @@ "Taquin-en helburua lauzak lekuz aldatzea da bakoitza dagokion lekura " "eramanez, irudi handi baten zati gisa edo zenbaki gisa adierazita." -#: ../data/org.gnome.taquin.desktop.in.h:1 ../src/taquin-main.vala:78 -#: ../src/taquin-main.vala:135 ../src/taquin-main.vala:250 +#: ../data/org.gnome.taquin.desktop.in.h:1 ../src/taquin-main.vala:76 +#: ../src/taquin-main.vala:133 ../src/taquin-main.vala:237 msgid "Taquin" msgstr "Taquin" -#: ../data/org.gnome.taquin.desktop.in.h:3 +#: ../data/org.gnome.taquin.desktop.in.h:2 +msgid "15-puzzle" +msgstr "15-puzzlea" + +#: ../data/org.gnome.taquin.desktop.in.h:4 msgid "puzzle;" msgstr "puzzlea;" @@ -161,67 +156,74 @@ msgid "true if the window is maximized." msgstr "True (egia) leihoa maximizatuta badago." -#: ../src/game-window.vala:141 +#: ../src/game-window.vala:128 +msgid "_Start Game" +msgstr "_Hasi jokoa" + +#: ../src/game-window.vala:153 msgid "Undo your most recent move" msgstr "Desegin zure azken mugimendua" -#: ../src/taquin-main.vala:46 +#: ../src/taquin-main.vala:45 msgid "Play the classical 1880s’ 15-puzzle" msgstr "Jokatu 1880 garaiko 15-puzzlera" -#: ../src/taquin-main.vala:47 +#: ../src/taquin-main.vala:46 msgid "Try this fun alternative 16-puzzle" msgstr "Saiatu bestelako 16-puzzle honekin" -#: ../src/taquin-main.vala:48 +#: ../src/taquin-main.vala:47 msgid "Sets the puzzle edges’ size (3-5, 2-9 for debug)" msgstr "Puzzlearen ertzen tamaina ezartzen du (3-5, 2-9 arazketarako)" -#: ../src/taquin-main.vala:49 +#: ../src/taquin-main.vala:48 msgid "Turn off the sound" msgstr "Desaktibatu soinua" -#: ../src/taquin-main.vala:50 +#: ../src/taquin-main.vala:49 msgid "Turn on the sound" msgstr "Aktibatu soinua" -#: ../src/taquin-main.vala:51 +#: ../src/taquin-main.vala:50 msgid "Print release version and exit" msgstr "Erakutsi bertsioaren informazioa eta irten" -#: ../src/taquin-main.vala:246 +#: ../src/taquin-main.vala:233 msgid "(see COPYING.themes for informations)" msgstr "(ikusi 'COPYING.themes' informazio gehiagorako)" -#: ../src/taquin-main.vala:254 +#: ../src/taquin-main.vala:241 msgid "A classic 15-puzzle game" msgstr "15-puzzle joko klasikoa" -#: ../src/taquin-main.vala:258 +#: ../src/taquin-main.vala:245 msgid "translator-credits" msgstr "Iñaki Larrañaga Murgoitio " -#: ../src/taquin-main.vala:299 +#: ../src/taquin-main.vala:286 msgid "You can’t move this tile!" msgstr "Ezin duzu lauza hau lekuz aldatu!" -#: ../src/taquin-main.vala:305 +#: ../src/taquin-main.vala:292 msgid "Bravo! You finished the game!" msgstr "Oso ondo! Jokoa amaitu duzu!" -#: ../src/taquin-main.vala:329 +#: ../src/taquin-main.vala:310 #, c-format msgid "Size: %d × %d ▾" msgstr "Tamaina : %d × %d ▾" -#: ../src/taquin-main.vala:343 +#: ../src/taquin-main.vala:324 msgid "Theme: Cats ▾" msgstr "Gaia: Katuak ▾" -#: ../src/taquin-main.vala:344 +#: ../src/taquin-main.vala:325 msgid "Theme: Numbers ▾" msgstr "Gaia: Zenbakiak ▾" +#~ msgid "Start a new game as configured" +#~ msgstr "Hasi joko berria (konfiguratuta dagoen bezala)" + #~ msgid "15-Puzzle with hole" #~ msgstr "15-Puzzlea zuloarekin" diff -Nru gnome-taquin-3.18.1.1/po/fi.po gnome-taquin-3.20.2/po/fi.po --- gnome-taquin-3.18.1.1/po/fi.po 2015-10-02 20:04:26.000000000 +0000 +++ gnome-taquin-3.20.2/po/fi.po 2016-03-24 10:46:09.000000000 +0000 @@ -9,8 +9,8 @@ "Project-Id-Version: gnome-taquin master\n" "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=gnome-" "taquin&keywords=I18N+L10N&component=general\n" -"POT-Creation-Date: 2015-03-25 01:35+0000\n" -"PO-Revision-Date: 2015-09-05 15:25+0300\n" +"POT-Creation-Date: 2015-10-31 10:26+0000\n" +"PO-Revision-Date: 2015-10-31 13:34+0200\n" "Last-Translator: Jiri Grönroos \n" "Language-Team: suomi \n" "Language: fi\n" @@ -18,7 +18,7 @@ "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -"X-Generator: Gtranslator 2.91.6\n" +"X-Generator: Gtranslator 2.91.7\n" #: ../data/taquin-menus.ui.h:1 msgid "_Sound" @@ -56,11 +56,11 @@ msgid "Numbers" msgstr "Numerot" -#: ../data/taquin-screens.ui.h:6 ../data/org.gnome.taquin.desktop.in.h:4 +#: ../data/taquin-screens.ui.h:6 ../data/org.gnome.taquin.desktop.in.h:5 msgid "15-Puzzle" msgstr "15-peli" -#: ../data/taquin-screens.ui.h:7 ../data/org.gnome.taquin.desktop.in.h:5 +#: ../data/taquin-screens.ui.h:7 ../data/org.gnome.taquin.desktop.in.h:6 msgid "16-Puzzle" msgstr "16-peli" @@ -73,7 +73,6 @@ msgstr "Aloita _uudelleen" #: ../data/taquin.ui.h:3 -#| msgid "Start a new game" msgid "Configure a new game" msgstr "Määritä uusi peli" @@ -86,7 +85,7 @@ msgstr "Gnomen Taquin" #: ../data/org.gnome.taquin.appdata.xml.in.h:2 -#: ../data/org.gnome.taquin.desktop.in.h:2 +#: ../data/org.gnome.taquin.desktop.in.h:3 msgid "Slide tiles to their correct places" msgstr "Liu'uta laatat oikeille kohdilleen" @@ -105,12 +104,17 @@ "Tavoite Taquinissa on siirtää laatat oikeille kohdilleen siten, että ne " "muodostavat numerojatkumon tai kuvan." -#: ../data/org.gnome.taquin.desktop.in.h:1 ../src/taquin-main.vala:78 -#: ../src/taquin-main.vala:135 ../src/taquin-main.vala:250 +#: ../data/org.gnome.taquin.desktop.in.h:1 ../src/taquin-main.vala:76 +#: ../src/taquin-main.vala:133 ../src/taquin-main.vala:237 msgid "Taquin" msgstr "Taquin" -#: ../data/org.gnome.taquin.desktop.in.h:3 +#: ../data/org.gnome.taquin.desktop.in.h:2 +#| msgid "15-Puzzle" +msgid "15-puzzle" +msgstr "15-peli" + +#: ../data/org.gnome.taquin.desktop.in.h:4 msgid "puzzle;" msgstr "puzzle;pulma;" @@ -163,59 +167,59 @@ msgid "Undo your most recent move" msgstr "Kumoa viimeisin siirtosi" -#: ../src/taquin-main.vala:46 +#: ../src/taquin-main.vala:45 msgid "Play the classical 1880s’ 15-puzzle" msgstr "Pelaa klassista 1870-luvun 15-peliä" -#: ../src/taquin-main.vala:47 +#: ../src/taquin-main.vala:46 msgid "Try this fun alternative 16-puzzle" msgstr "Kokeile tätä hauskaa vaihtoehtoista 16-peliä" -#: ../src/taquin-main.vala:48 +#: ../src/taquin-main.vala:47 msgid "Sets the puzzle edges’ size (3-5, 2-9 for debug)" msgstr "Aseta pulman sivujen koko (3-5, 2-9 vianselvitystä varten)" -#: ../src/taquin-main.vala:49 +#: ../src/taquin-main.vala:48 msgid "Turn off the sound" msgstr "Poista äänet käytöstä" -#: ../src/taquin-main.vala:50 +#: ../src/taquin-main.vala:49 msgid "Turn on the sound" msgstr "Ota äänet käyttöön" -#: ../src/taquin-main.vala:51 +#: ../src/taquin-main.vala:50 msgid "Print release version and exit" msgstr "Tulosta julkaisuversio ja poistu" -#: ../src/taquin-main.vala:246 +#: ../src/taquin-main.vala:233 msgid "(see COPYING.themes for informations)" msgstr "(lisätietoja tiedostossa COPYING.themes)" -#: ../src/taquin-main.vala:254 +#: ../src/taquin-main.vala:241 msgid "A classic 15-puzzle game" msgstr "Klassinen 15-pulmapeli" -#: ../src/taquin-main.vala:258 +#: ../src/taquin-main.vala:245 msgid "translator-credits" msgstr "Jiri Grönroos" -#: ../src/taquin-main.vala:299 +#: ../src/taquin-main.vala:286 msgid "You can’t move this tile!" msgstr "Et voi siirtää tätä laattaa!" -#: ../src/taquin-main.vala:305 +#: ../src/taquin-main.vala:292 msgid "Bravo! You finished the game!" msgstr "Onnittelut, läpäisit pelin!" -#: ../src/taquin-main.vala:329 +#: ../src/taquin-main.vala:310 #, c-format msgid "Size: %d × %d ▾" msgstr "Koko: %d × %d ▾" -#: ../src/taquin-main.vala:343 +#: ../src/taquin-main.vala:324 msgid "Theme: Cats ▾" msgstr "Teema: kissat ▾" -#: ../src/taquin-main.vala:344 +#: ../src/taquin-main.vala:325 msgid "Theme: Numbers ▾" msgstr "Teema: numerot ▾" diff -Nru gnome-taquin-3.18.1.1/po/fr.po gnome-taquin-3.20.2/po/fr.po --- gnome-taquin-3.18.1.1/po/fr.po 2015-10-02 20:04:26.000000000 +0000 +++ gnome-taquin-3.20.2/po/fr.po 2016-03-24 10:46:09.000000000 +0000 @@ -9,8 +9,8 @@ "Project-Id-Version: taquin master\n" "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=gnome-" "taquin&keywords=I18N+L10N&component=general\n" -"POT-Creation-Date: 2015-03-01 04:45+0000\n" -"PO-Revision-Date: 2015-03-02 18:34+0100\n" +"POT-Creation-Date: 2016-02-07 10:32+0000\n" +"PO-Revision-Date: 2016-02-07 22:24+0100\n" "Last-Translator: Arnaud Bonatti \n" "Language-Team: GNOME French Team \n" "Language: fr\n" @@ -45,7 +45,7 @@ #: ../data/taquin-screens.ui.h:3 msgid "5 × 5" -msgstr "5 × 5" +msgstr "5 × 5" #: ../data/taquin-screens.ui.h:4 msgid "Cats" @@ -55,11 +55,11 @@ msgid "Numbers" msgstr "Nombres" -#: ../data/taquin-screens.ui.h:6 ../data/org.gnome.taquin.desktop.in.h:4 +#: ../data/taquin-screens.ui.h:6 ../data/org.gnome.taquin.desktop.in.h:5 msgid "15-Puzzle" msgstr "Pousse-pousse" -#: ../data/taquin-screens.ui.h:7 ../data/org.gnome.taquin.desktop.in.h:5 +#: ../data/taquin-screens.ui.h:7 ../data/org.gnome.taquin.desktop.in.h:6 msgid "16-Puzzle" msgstr "Glisse-glisse" @@ -68,22 +68,14 @@ msgstr "Revenir au jeu en cours" #: ../data/taquin.ui.h:2 -msgid "_Start Game" -msgstr "_Lancer le jeu" - -#: ../data/taquin.ui.h:3 -msgid "Start a new game as configured" -msgstr "Commence une nouvelle partie telle que configurée" - -#: ../data/taquin.ui.h:4 msgid "_Start Over" msgstr "_Recommencer" -#: ../data/taquin.ui.h:5 +#: ../data/taquin.ui.h:3 msgid "Configure a new game" msgstr "Configurer une nouvelle partie" -#: ../data/taquin.ui.h:6 +#: ../data/taquin.ui.h:4 msgid "Start a new game" msgstr "Commence une nouvelle partie" @@ -92,7 +84,7 @@ msgstr "GNOME Taquin" #: ../data/org.gnome.taquin.appdata.xml.in.h:2 -#: ../data/org.gnome.taquin.desktop.in.h:2 +#: ../data/org.gnome.taquin.desktop.in.h:3 msgid "Slide tiles to their correct places" msgstr "Glisser les pièces jusqu’à leur position correcte" @@ -112,13 +104,16 @@ "leur position correcte, devinable soit par un nombre, soit par les morceaux " "d’une chouette image." -#. Window -#: ../data/org.gnome.taquin.desktop.in.h:1 ../src/taquin-main.vala:78 -#: ../src/taquin-main.vala:138 ../src/taquin-main.vala:254 +#: ../data/org.gnome.taquin.desktop.in.h:1 ../src/taquin-main.vala:76 +#: ../src/taquin-main.vala:133 ../src/taquin-main.vala:237 msgid "Taquin" msgstr "Taquin" -#: ../data/org.gnome.taquin.desktop.in.h:3 +#: ../data/org.gnome.taquin.desktop.in.h:2 +msgid "15-puzzle" +msgstr "Pousse-pousse" + +#: ../data/org.gnome.taquin.desktop.in.h:4 msgid "puzzle;" msgstr "puzzle; pousse-pousse; taquin;" @@ -165,67 +160,74 @@ msgid "true if the window is maximized." msgstr "Vrai si la fenêtre est maximisée." -#: ../src/game-window.vala:134 +#: ../src/game-window.vala:128 +msgid "_Start Game" +msgstr "_Lancer le jeu" + +#: ../src/game-window.vala:153 msgid "Undo your most recent move" msgstr "Annule votre dernier déplacement" -#: ../src/taquin-main.vala:46 +#: ../src/taquin-main.vala:45 msgid "Play the classical 1880s’ 15-puzzle" msgstr "Jouer au pousse-pousse classique des années 1880." -#: ../src/taquin-main.vala:47 +#: ../src/taquin-main.vala:46 msgid "Try this fun alternative 16-puzzle" msgstr "Essaye cet amusant puzzle alternatif à 16 pièces" -#: ../src/taquin-main.vala:48 +#: ../src/taquin-main.vala:47 msgid "Sets the puzzle edges’ size (3-5, 2-9 for debug)" msgstr "Configure la taille du côté du puzzle (3 à 5, 2 à 9 pour débugger)" -#: ../src/taquin-main.vala:49 +#: ../src/taquin-main.vala:48 msgid "Turn off the sound" msgstr "Coupe le son" -#: ../src/taquin-main.vala:50 +#: ../src/taquin-main.vala:49 msgid "Turn on the sound" msgstr "Active le son" -#: ../src/taquin-main.vala:51 +#: ../src/taquin-main.vala:50 msgid "Print release version and exit" msgstr "Affiche le numéro de version et quitte" -#: ../src/taquin-main.vala:250 +#: ../src/taquin-main.vala:233 msgid "(see COPYING.themes for informations)" msgstr "(voir COPYING.themes pour plus d’informations)" -#: ../src/taquin-main.vala:258 +#: ../src/taquin-main.vala:241 msgid "A classic 15-puzzle game" msgstr "Un taquin classique" -#: ../src/taquin-main.vala:262 +#: ../src/taquin-main.vala:245 msgid "translator-credits" msgstr "Arnaud Bonatti " -#: ../src/taquin-main.vala:303 +#: ../src/taquin-main.vala:286 msgid "You can’t move this tile!" msgstr "Impossible de déplacer cette pièce !" -#: ../src/taquin-main.vala:309 +#: ../src/taquin-main.vala:292 msgid "Bravo! You finished the game!" msgstr "Bravo ! Vous avez terminé le jeu !" -#: ../src/taquin-main.vala:333 +#: ../src/taquin-main.vala:310 #, c-format msgid "Size: %d × %d ▾" msgstr "Taille : %d × %d ▾" -#: ../src/taquin-main.vala:347 +#: ../src/taquin-main.vala:324 msgid "Theme: Cats ▾" msgstr "Thème : Chats ▾" -#: ../src/taquin-main.vala:348 +#: ../src/taquin-main.vala:325 msgid "Theme: Numbers ▾" msgstr "Thème : Nombres ▾" +#~ msgid "Start a new game as configured" +#~ msgstr "Commence une nouvelle partie telle que configurée" + #~ msgid "15-Puzzle with hole" #~ msgstr "Pousse-pousse, avec un trou" diff -Nru gnome-taquin-3.18.1.1/po/fur.po gnome-taquin-3.20.2/po/fur.po --- gnome-taquin-3.18.1.1/po/fur.po 2015-10-02 20:04:26.000000000 +0000 +++ gnome-taquin-3.20.2/po/fur.po 2016-04-06 22:09:03.000000000 +0000 @@ -8,15 +8,15 @@ "Project-Id-Version: gnome-taquin gnome-3-16\n" "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=gnome-" "taquin&keywords=I18N+L10N&component=general\n" -"POT-Creation-Date: 2015-04-12 20:08+0000\n" -"PO-Revision-Date: 2015-04-15 09:52+0100\n" +"POT-Creation-Date: 2016-04-05 09:51+0000\n" +"PO-Revision-Date: 2016-04-05 13:50+0200\n" "Last-Translator: Fabio Tomat \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" -"X-Generator: Poedit 1.5.4\n" +"X-Generator: Poedit 1.8.5\n" #: ../data/taquin-menus.ui.h:1 msgid "_Sound" @@ -54,11 +54,11 @@ msgid "Numbers" msgstr "Numars" -#: ../data/taquin-screens.ui.h:6 ../data/org.gnome.taquin.desktop.in.h:4 +#: ../data/taquin-screens.ui.h:6 ../data/org.gnome.taquin.desktop.in.h:5 msgid "15-Puzzle" msgstr "Zûc dal 15" -#: ../data/taquin-screens.ui.h:7 ../data/org.gnome.taquin.desktop.in.h:5 +#: ../data/taquin-screens.ui.h:7 ../data/org.gnome.taquin.desktop.in.h:6 msgid "16-Puzzle" msgstr "Zûc dal 16" @@ -67,22 +67,14 @@ msgstr "Torne te partide in pîts" #: ../data/taquin.ui.h:2 -msgid "_Start Game" -msgstr "_Tache partide" - -#: ../data/taquin.ui.h:3 -msgid "Start a new game as configured" -msgstr "Tache une gnove partide" - -#: ../data/taquin.ui.h:4 msgid "_Start Over" msgstr "_Torne partìs" -#: ../data/taquin.ui.h:5 +#: ../data/taquin.ui.h:3 msgid "Configure a new game" msgstr "Configure une gnove partide" -#: ../data/taquin.ui.h:6 +#: ../data/taquin.ui.h:4 msgid "Start a new game" msgstr "Tache une gnove partide" @@ -91,7 +83,7 @@ msgstr "GNOME Taquin" #: ../data/org.gnome.taquin.appdata.xml.in.h:2 -#: ../data/org.gnome.taquin.desktop.in.h:2 +#: ../data/org.gnome.taquin.desktop.in.h:3 msgid "Slide tiles to their correct places" msgstr "Fâs cori lis tessaris te lôr posizion juste" @@ -110,12 +102,16 @@ "L'obietîf di Taquin al è chel di spostâ lis tessaris in mût che si placin te " "lôr posizion juste, indicade da numars o di parts di une figure" -#: ../data/org.gnome.taquin.desktop.in.h:1 ../src/taquin-main.vala:78 -#: ../src/taquin-main.vala:135 ../src/taquin-main.vala:250 +#: ../data/org.gnome.taquin.desktop.in.h:1 ../src/taquin-main.vala:76 +#: ../src/taquin-main.vala:133 ../src/taquin-main.vala:237 msgid "Taquin" msgstr "Taquin" -#: ../data/org.gnome.taquin.desktop.in.h:3 +#: ../data/org.gnome.taquin.desktop.in.h:2 +msgid "15-puzzle" +msgstr "zûc dal 15" + +#: ../data/org.gnome.taquin.desktop.in.h:4 msgid "puzzle;" msgstr "puzzle;gredei;" @@ -160,63 +156,70 @@ msgid "true if the window is maximized." msgstr "VÊR se il barcon al è slargjât." -#: ../src/game-window.vala:141 +#: ../src/game-window.vala:128 +msgid "_Start Game" +msgstr "_Tache partide" + +#: ../src/game-window.vala:153 msgid "Undo your most recent move" msgstr "Anule le ultime mosse" -#: ../src/taquin-main.vala:46 +#: ../src/taquin-main.vala:45 msgid "Play the classical 1880s’ 15-puzzle" msgstr "Zuie al classic puzzle dai 15" -#: ../src/taquin-main.vala:47 +#: ../src/taquin-main.vala:46 msgid "Try this fun alternative 16-puzzle" msgstr "Prove cheste alternative divertent dal 16" -#: ../src/taquin-main.vala:48 +#: ../src/taquin-main.vala:47 msgid "Sets the puzzle edges’ size (3-5, 2-9 for debug)" -msgstr "Imposte la dimension dai flancs (3-5, 2-9 par debug)" +msgstr "Impueste la dimension dai flancs (3-5, 2-9 pal debug)" -#: ../src/taquin-main.vala:49 +#: ../src/taquin-main.vala:48 msgid "Turn off the sound" msgstr "Stude suns" -#: ../src/taquin-main.vala:50 +#: ../src/taquin-main.vala:49 msgid "Turn on the sound" msgstr "Pie suns" -#: ../src/taquin-main.vala:51 +#: ../src/taquin-main.vala:50 msgid "Print release version and exit" msgstr "Stampe la version e jes" -#: ../src/taquin-main.vala:246 +#: ../src/taquin-main.vala:233 msgid "(see COPYING.themes for informations)" msgstr "Viodi COPYING.themes par informazions)" -#: ../src/taquin-main.vala:254 +#: ../src/taquin-main.vala:241 msgid "A classic 15-puzzle game" msgstr "Il classic zûc dal 15" -#: ../src/taquin-main.vala:258 +#: ../src/taquin-main.vala:245 msgid "translator-credits" msgstr "Fabio Tomat " -#: ../src/taquin-main.vala:299 +#: ../src/taquin-main.vala:286 msgid "You can’t move this tile!" msgstr "No tu puedis movi cheste tessare!" -#: ../src/taquin-main.vala:305 +#: ../src/taquin-main.vala:292 msgid "Bravo! You finished the game!" msgstr "Brâf! Tu âs finît la partide!" -#: ../src/taquin-main.vala:329 +#: ../src/taquin-main.vala:310 #, c-format msgid "Size: %d × %d ▾" msgstr "Dimension: %d × %d ▾" -#: ../src/taquin-main.vala:343 +#: ../src/taquin-main.vala:324 msgid "Theme: Cats ▾" msgstr "Teme: Gjats ▾" -#: ../src/taquin-main.vala:344 +#: ../src/taquin-main.vala:325 msgid "Theme: Numbers ▾" msgstr "Teme: Numars ▾" + +#~ msgid "Start a new game as configured" +#~ msgstr "Tache une gnove partide" diff -Nru gnome-taquin-3.18.1.1/po/gl.po gnome-taquin-3.20.2/po/gl.po --- gnome-taquin-3.18.1.1/po/gl.po 2015-10-02 20:04:26.000000000 +0000 +++ gnome-taquin-3.20.2/po/gl.po 2016-03-24 10:46:09.000000000 +0000 @@ -2,22 +2,21 @@ # English (United Kingdom) translations for PACKAGE package. # Copyright (C) 2015 THE PACKAGE'S COPYRIGHT HOLDER # This file is distributed under the same license as the PACKAGE package. -# Fran Dieguez , 2015. -# +# Fran Dieguez , 2015, 2016. msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2015-03-03 00:19+0100\n" -"PO-Revision-Date: 2015-03-03 00:19+0100\n" +"POT-Creation-Date: 2016-02-23 19:23+0100\n" +"PO-Revision-Date: 2016-02-23 19:45+0200\n" "Last-Translator: Fran Dieguez \n" -"Language-Team: Galician <>\n" +"Language-Team: gnome-l10n-gl@gnome.org\n" "Language: en_GB\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -"X-Generator: Gtranslator 2.91.6\n" +"X-Generator: Virtaal 0.7.1\n" #: ../data/taquin-menus.ui.h:1 msgid "_Sound" @@ -55,11 +54,11 @@ msgid "Numbers" msgstr "Números" -#: ../data/taquin-screens.ui.h:6 ../data/org.gnome.taquin.desktop.in.h:4 +#: ../data/taquin-screens.ui.h:6 ../data/org.gnome.taquin.desktop.in.h:5 msgid "15-Puzzle" msgstr "Quebracabezas 15" -#: ../data/taquin-screens.ui.h:7 ../data/org.gnome.taquin.desktop.in.h:5 +#: ../data/taquin-screens.ui.h:7 ../data/org.gnome.taquin.desktop.in.h:6 msgid "16-Puzzle" msgstr "Quebracabezas 16" @@ -68,22 +67,14 @@ msgstr "Volver ao xogo actual" #: ../data/taquin.ui.h:2 -msgid "_Start Game" -msgstr "_Comezar xogo" - -#: ../data/taquin.ui.h:3 -msgid "Start a new game as configured" -msgstr "Comezar un novo xogo como foi configurado" - -#: ../data/taquin.ui.h:4 msgid "_Start Over" msgstr "_Comezar de novo" -#: ../data/taquin.ui.h:5 +#: ../data/taquin.ui.h:3 msgid "Configure a new game" msgstr "Configurar un novo xogo" -#: ../data/taquin.ui.h:6 +#: ../data/taquin.ui.h:4 msgid "Start a new game" msgstr "Comezar un novo xogo" @@ -92,7 +83,7 @@ msgstr "GNOME Taquin" #: ../data/org.gnome.taquin.appdata.xml.in.h:2 -#: ../data/org.gnome.taquin.desktop.in.h:2 +#: ../data/org.gnome.taquin.desktop.in.h:3 msgid "Slide tiles to their correct places" msgstr "Desprace teselas ao seu lugar correcto " @@ -111,13 +102,16 @@ "O obxectivo de Taquin é mover teselas para que alcancen os seus lugares, ou " "indicados por números ou con partes dunha imaxe máis grande." -#. Window -#: ../data/org.gnome.taquin.desktop.in.h:1 ../src/taquin-main.vala:78 -#: ../src/taquin-main.vala:138 ../src/taquin-main.vala:253 +#: ../data/org.gnome.taquin.desktop.in.h:1 ../src/taquin-main.vala:76 +#: ../src/taquin-main.vala:133 ../src/taquin-main.vala:237 msgid "Taquin" msgstr "Taquin" -#: ../data/org.gnome.taquin.desktop.in.h:3 +#: ../data/org.gnome.taquin.desktop.in.h:2 +msgid "15-puzzle" +msgstr "Quebracabezas 15" + +#: ../data/org.gnome.taquin.desktop.in.h:4 msgid "puzzle;" msgstr "quebracabezas;" @@ -162,68 +156,75 @@ msgid "true if the window is maximized." msgstr "verdadeiro se a xanela está maximizada." -#: ../src/game-window.vala:134 +#: ../src/game-window.vala:128 +msgid "_Start Game" +msgstr "_Comezar xogo" + +#: ../src/game-window.vala:153 msgid "Undo your most recent move" msgstr "Desfacer o movemento máis recente" -#: ../src/taquin-main.vala:46 +#: ../src/taquin-main.vala:45 msgid "Play the classical 1880s’ 15-puzzle" msgstr "Xogue o quebracabezas clasico do 1880" -#: ../src/taquin-main.vala:47 +#: ../src/taquin-main.vala:46 msgid "Try this fun alternative 16-puzzle" msgstr "Tente esta alternativa de quebracabezas de 16 divertida" -#: ../src/taquin-main.vala:48 +#: ../src/taquin-main.vala:47 msgid "Sets the puzzle edges’ size (3-5, 2-9 for debug)" msgstr "" "Estabelece o tamaño dos bordos do quebracabezas (3-4, 2-9 para depuración)" -#: ../src/taquin-main.vala:49 +#: ../src/taquin-main.vala:48 msgid "Turn off the sound" msgstr "Desactivar o son" -#: ../src/taquin-main.vala:50 +#: ../src/taquin-main.vala:49 msgid "Turn on the sound" msgstr "Activar o son" -#: ../src/taquin-main.vala:51 +#: ../src/taquin-main.vala:50 msgid "Print release version and exit" msgstr "Mostra a versión de publicación e sae" -#: ../src/taquin-main.vala:249 +#: ../src/taquin-main.vala:233 msgid "(see COPYING.themes for informations)" msgstr "(vexa COPYING.themes para obter máis información)" -#: ../src/taquin-main.vala:257 +#: ../src/taquin-main.vala:241 msgid "A classic 15-puzzle game" msgstr "Un xogo de quebracabezas 15 clásico" -#: ../src/taquin-main.vala:261 +#: ../src/taquin-main.vala:245 msgid "translator-credits" msgstr "Fran Dieguez " -#: ../src/taquin-main.vala:302 +#: ../src/taquin-main.vala:286 msgid "You can’t move this tile!" msgstr "Pode mover esta tesela!" -#: ../src/taquin-main.vala:308 +#: ../src/taquin-main.vala:292 msgid "Bravo! You finished the game!" msgstr "Bravo! Rematou o xogo!" -#: ../src/taquin-main.vala:332 +#: ../src/taquin-main.vala:310 #, c-format msgid "Size: %d × %d ▾" msgstr "Tamaño: %d × %d ▾" -#: ../src/taquin-main.vala:346 +#: ../src/taquin-main.vala:324 msgid "Theme: Cats ▾" msgstr "Tema: Gatos ▾" -#: ../src/taquin-main.vala:347 +#: ../src/taquin-main.vala:325 msgid "Theme: Numbers ▾" msgstr "Tema: Números ▾" +#~ msgid "Start a new game as configured" +#~ msgstr "Comezar un novo xogo como foi configurado" + #~ msgid "15-Puzzle with hole" #~ msgstr "Quebracabezas 15 con buraco" diff -Nru gnome-taquin-3.18.1.1/po/he.po gnome-taquin-3.20.2/po/he.po --- gnome-taquin-3.18.1.1/po/he.po 2015-10-02 20:04:26.000000000 +0000 +++ gnome-taquin-3.20.2/po/he.po 2016-03-24 10:46:09.000000000 +0000 @@ -8,8 +8,8 @@ msgstr "" "Project-Id-Version: taquin master\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2015-03-02 16:08+0200\n" -"PO-Revision-Date: 2015-03-02 16:10+0200\n" +"POT-Creation-Date: 2016-03-03 15:24+0200\n" +"PO-Revision-Date: 2016-03-03 15:24+0200\n" "Last-Translator: Yosef Or Boczko \n" "Language-Team: עברית <>\n" "Language: he\n" @@ -55,11 +55,11 @@ msgid "Numbers" msgstr "מספרים" -#: ../data/taquin-screens.ui.h:6 ../data/org.gnome.taquin.desktop.in.h:4 +#: ../data/taquin-screens.ui.h:6 ../data/org.gnome.taquin.desktop.in.h:5 msgid "15-Puzzle" msgstr "לוח 15" -#: ../data/taquin-screens.ui.h:7 ../data/org.gnome.taquin.desktop.in.h:5 +#: ../data/taquin-screens.ui.h:7 ../data/org.gnome.taquin.desktop.in.h:6 msgid "16-Puzzle" msgstr "לוח 16" @@ -68,22 +68,14 @@ msgstr "חזרה למשחק הנוכחי" #: ../data/taquin.ui.h:2 -msgid "_Start Game" -msgstr "ה_תחלת משחק" - -#: ../data/taquin.ui.h:3 -msgid "Start a new game as configured" -msgstr "התחלת משחק חדש כפי שהוגדר" - -#: ../data/taquin.ui.h:4 msgid "_Start Over" msgstr "ה_תחלה מחדש" -#: ../data/taquin.ui.h:5 +#: ../data/taquin.ui.h:3 msgid "Configure a new game" msgstr "הגדרת משחק חדש" -#: ../data/taquin.ui.h:6 +#: ../data/taquin.ui.h:4 msgid "Start a new game" msgstr "התחלת משחק חדש" @@ -92,7 +84,7 @@ msgstr "GNOME Taquin" #: ../data/org.gnome.taquin.appdata.xml.in.h:2 -#: ../data/org.gnome.taquin.desktop.in.h:2 +#: ../data/org.gnome.taquin.desktop.in.h:3 msgid "Slide tiles to their correct places" msgstr "להחליק אריחים למקום הנכון שלהם" @@ -109,13 +101,16 @@ "הרעיון של Taquin הוא להזיז אריחים כך שהם יגיעו למקומם, המצוינים במספרים, או " "כחלק של תמונה גדולה." -#. Window -#: ../data/org.gnome.taquin.desktop.in.h:1 ../src/taquin-main.vala:78 -#: ../src/taquin-main.vala:138 ../src/taquin-main.vala:254 +#: ../data/org.gnome.taquin.desktop.in.h:1 ../src/taquin-main.vala:76 +#: ../src/taquin-main.vala:133 ../src/taquin-main.vala:237 msgid "Taquin" msgstr "Taquin" -#: ../data/org.gnome.taquin.desktop.in.h:3 +#: ../data/org.gnome.taquin.desktop.in.h:2 +msgid "15-puzzle" +msgstr "תצרף־15" + +#: ../data/org.gnome.taquin.desktop.in.h:4 msgid "puzzle;" msgstr "לוח;תצרף;פאזל;" @@ -159,67 +154,74 @@ msgid "true if the window is maximized." msgstr "true if the window is maximized." -#: ../src/game-window.vala:134 +#: ../src/game-window.vala:128 +msgid "_Start Game" +msgstr "ה_תחלת משחק" + +#: ../src/game-window.vala:153 msgid "Undo your most recent move" msgstr "ביטול המהלך האחרון שלך" -#: ../src/taquin-main.vala:46 +#: ../src/taquin-main.vala:45 msgid "Play the classical 1880s’ 15-puzzle" msgstr "Play the classical 1880s’ 15-puzzle" -#: ../src/taquin-main.vala:47 +#: ../src/taquin-main.vala:46 msgid "Try this fun alternative 16-puzzle" msgstr "Try this fun alternative 16-puzzle" -#: ../src/taquin-main.vala:48 +#: ../src/taquin-main.vala:47 msgid "Sets the puzzle edges’ size (3-5, 2-9 for debug)" msgstr "Sets the puzzle edges’ size (3-5, 2-9 for debug)" -#: ../src/taquin-main.vala:49 +#: ../src/taquin-main.vala:48 msgid "Turn off the sound" msgstr "Turn off the sound" -#: ../src/taquin-main.vala:50 +#: ../src/taquin-main.vala:49 msgid "Turn on the sound" msgstr "Turn on the sound" -#: ../src/taquin-main.vala:51 +#: ../src/taquin-main.vala:50 msgid "Print release version and exit" msgstr "Print release version and exit" -#: ../src/taquin-main.vala:250 +#: ../src/taquin-main.vala:233 msgid "(see COPYING.themes for informations)" msgstr "(‏COPYING.themes עבור מידע)" -#: ../src/taquin-main.vala:258 +#: ../src/taquin-main.vala:241 msgid "A classic 15-puzzle game" msgstr "משחק חידת ה־15 הקלאסי" -#: ../src/taquin-main.vala:262 +#: ../src/taquin-main.vala:245 msgid "translator-credits" msgstr "יוסף אור בוצ׳קו " -#: ../src/taquin-main.vala:303 +#: ../src/taquin-main.vala:286 msgid "You can’t move this tile!" msgstr "לא ניתן להזיז אריח זה!" -#: ../src/taquin-main.vala:309 +#: ../src/taquin-main.vala:292 msgid "Bravo! You finished the game!" msgstr "הידד! סיימת את המשחק!" -#: ../src/taquin-main.vala:333 +#: ../src/taquin-main.vala:310 #, c-format msgid "Size: %d × %d ▾" msgstr "גודל: %d × %d ▾" -#: ../src/taquin-main.vala:347 +#: ../src/taquin-main.vala:324 msgid "Theme: Cats ▾" msgstr "ערכת נושא: חתולים ▾" -#: ../src/taquin-main.vala:348 +#: ../src/taquin-main.vala:325 msgid "Theme: Numbers ▾" msgstr "ערכת נושא: מספרים ▾" +#~ msgid "Start a new game as configured" +#~ msgstr "התחלת משחק חדש כפי שהוגדר" + #~ msgid "15-Puzzle with hole" #~ msgstr "חידת ה־15 עם חור" diff -Nru gnome-taquin-3.18.1.1/po/hu.po gnome-taquin-3.20.2/po/hu.po --- gnome-taquin-3.18.1.1/po/hu.po 2015-10-02 20:04:26.000000000 +0000 +++ gnome-taquin-3.20.2/po/hu.po 2016-03-24 10:46:09.000000000 +0000 @@ -8,16 +8,16 @@ "Project-Id-Version: gnome-taquin master\n" "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=gnome-" "taquin&keywords=I18N+L10N&component=general\n" -"POT-Creation-Date: 2015-03-01 04:45+0000\n" -"PO-Revision-Date: 2015-03-01 16:12+0100\n" -"Last-Translator: Balázs Úr \n" +"POT-Creation-Date: 2015-09-21 18:49+0000\n" +"PO-Revision-Date: 2015-10-25 19:03+0100\n" +"Last-Translator: Meskó Balázs \n" "Language-Team: Hungarian \n" "Language: hu\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.2\n" +"X-Generator: Poedit 1.8.5\n" #: ../data/taquin-menus.ui.h:1 msgid "_Sound" @@ -55,11 +55,11 @@ msgid "Numbers" msgstr "Számok" -#: ../data/taquin-screens.ui.h:6 ../data/org.gnome.taquin.desktop.in.h:4 +#: ../data/taquin-screens.ui.h:6 ../data/org.gnome.taquin.desktop.in.h:5 msgid "15-Puzzle" msgstr "15-ös kirakó" -#: ../data/taquin-screens.ui.h:7 ../data/org.gnome.taquin.desktop.in.h:5 +#: ../data/taquin-screens.ui.h:7 ../data/org.gnome.taquin.desktop.in.h:6 msgid "16-Puzzle" msgstr "16-os kirakó" @@ -68,24 +68,14 @@ msgstr "Vissza a jelenlegi játékhoz" #: ../data/taquin.ui.h:2 -msgid "_Start Game" -msgstr "Játék _indítása" - -#: ../data/taquin.ui.h:3 -#| msgid "Start a new game" -msgid "Start a new game as configured" -msgstr "Új játék indítása a beállítás szerint" - -#: ../data/taquin.ui.h:4 msgid "_Start Over" msgstr "Újra_kezdés" -#: ../data/taquin.ui.h:5 -#| msgid "Start a new game" +#: ../data/taquin.ui.h:3 msgid "Configure a new game" msgstr "Új játék beállítása" -#: ../data/taquin.ui.h:6 +#: ../data/taquin.ui.h:4 msgid "Start a new game" msgstr "Új játék indítása" @@ -94,7 +84,7 @@ msgstr "GNOME Taquin" #: ../data/org.gnome.taquin.appdata.xml.in.h:2 -#: ../data/org.gnome.taquin.desktop.in.h:2 +#: ../data/org.gnome.taquin.desktop.in.h:3 msgid "Slide tiles to their correct places" msgstr "Csúsztassa a csempéket a megfelelő helyükre" @@ -113,13 +103,16 @@ "A Taquin lényege a csempék mozgatása, hogy azok elérjenek saját helyükre, " "amelyek vagy számokkal vannak jelölve, vagy egy nagy kép részleteivel." -#. Window -#: ../data/org.gnome.taquin.desktop.in.h:1 ../src/taquin-main.vala:78 -#: ../src/taquin-main.vala:138 ../src/taquin-main.vala:254 +#: ../data/org.gnome.taquin.desktop.in.h:1 ../src/taquin-main.vala:76 +#: ../src/taquin-main.vala:133 ../src/taquin-main.vala:237 msgid "Taquin" msgstr "Taquin" -#: ../data/org.gnome.taquin.desktop.in.h:3 +#: ../data/org.gnome.taquin.desktop.in.h:2 +msgid "15-puzzle" +msgstr "15-ös kirakó" + +#: ../data/org.gnome.taquin.desktop.in.h:4 msgid "puzzle;" msgstr "puzzle;kirakó;fejtörő;" @@ -164,67 +157,75 @@ msgid "true if the window is maximized." msgstr "igaz, ha az ablak teljes méretű." -#: ../src/game-window.vala:134 +#: ../src/game-window.vala:128 +msgid "_Start Game" +msgstr "Játék _indítása" + +#: ../src/game-window.vala:153 msgid "Undo your most recent move" msgstr "A legutóbbi lépés visszavonása" -#: ../src/taquin-main.vala:46 +#: ../src/taquin-main.vala:45 msgid "Play the classical 1880s’ 15-puzzle" msgstr "Az 1880-as klasszikus 15-ös kirakó indítása" -#: ../src/taquin-main.vala:47 +#: ../src/taquin-main.vala:46 msgid "Try this fun alternative 16-puzzle" msgstr "Próbálja ki ezt a vicces alternatív 16-os kirakót" -#: ../src/taquin-main.vala:48 +#: ../src/taquin-main.vala:47 msgid "Sets the puzzle edges’ size (3-5, 2-9 for debug)" msgstr "Beállítja a kirakó széleinek méretét (3-5, 2-9 a hibakereséshez)" -#: ../src/taquin-main.vala:49 +#: ../src/taquin-main.vala:48 msgid "Turn off the sound" msgstr "Hang kikapcsolása" -#: ../src/taquin-main.vala:50 +#: ../src/taquin-main.vala:49 msgid "Turn on the sound" msgstr "Hang bekapcsolása" -#: ../src/taquin-main.vala:51 +#: ../src/taquin-main.vala:50 msgid "Print release version and exit" msgstr "Kiadási verzió kiírása és kilépés" -#: ../src/taquin-main.vala:250 +#: ../src/taquin-main.vala:233 msgid "(see COPYING.themes for informations)" msgstr "(további információkért lásd a COPYING.themes fájlt)" -#: ../src/taquin-main.vala:258 +#: ../src/taquin-main.vala:241 msgid "A classic 15-puzzle game" msgstr "Egy klasszikus 15-ös kirakós játék" -#: ../src/taquin-main.vala:262 +#: ../src/taquin-main.vala:245 msgid "translator-credits" msgstr "Úr Balázs , 2014." -#: ../src/taquin-main.vala:303 +#: ../src/taquin-main.vala:286 msgid "You can’t move this tile!" msgstr "Ezt a csempét nem mozdíthatja!" -#: ../src/taquin-main.vala:309 +#: ../src/taquin-main.vala:292 msgid "Bravo! You finished the game!" msgstr "Bravó! Befejezte a játékot!" -#: ../src/taquin-main.vala:333 +#: ../src/taquin-main.vala:310 #, c-format msgid "Size: %d × %d ▾" msgstr "Méret: %d × %d ▾" -#: ../src/taquin-main.vala:347 +#: ../src/taquin-main.vala:324 msgid "Theme: Cats ▾" msgstr "Téma: Macskák ▾" -#: ../src/taquin-main.vala:348 +#: ../src/taquin-main.vala:325 msgid "Theme: Numbers ▾" msgstr "Téma: Számok ▾" +#~| msgid "Start a new game" +#~ msgid "Start a new game as configured" +#~ msgstr "Új játék indítása a beállítás szerint" + #~ msgid "15-Puzzle with hole" #~ msgstr "15-ös kirakó lyukkal" diff -Nru gnome-taquin-3.18.1.1/po/it.po gnome-taquin-3.20.2/po/it.po --- gnome-taquin-3.18.1.1/po/it.po 2015-10-02 20:04:26.000000000 +0000 +++ gnome-taquin-3.20.2/po/it.po 2016-03-24 10:46:09.000000000 +0000 @@ -1,23 +1,23 @@ # Italian translation for gnome-taquin. -# Copyright (C) 2015 gnome-taquin's COPYRIGHT HOLDER +# Copyright (C) 2015, 2016 gnome-taquin's COPYRIGHT HOLDER # This file is distributed under the same license as the gnome-taquin package. -# Milo Casagrande , 2015. +# Milo Casagrande , 2015, 2016. # msgid "" msgstr "" "Project-Id-Version: gnome-taquin\n" "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=gnome-" "taquin&keywords=I18N+L10N&component=general\n" -"POT-Creation-Date: 2015-03-20 08:49+0000\n" -"PO-Revision-Date: 2015-03-20 13:59+0100\n" +"POT-Creation-Date: 2015-09-21 18:49+0000\n" +"PO-Revision-Date: 2016-02-23 17:24+0100\n" +"Last-Translator: Milo Casagrande \n" "Language-Team: Italian \n" "Language: it\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -"Last-Translator: Milo Casagrande \n" -"X-Generator: Poedit 1.7.5\n" +"X-Generator: Poedit 1.8.7\n" #: ../data/taquin-menus.ui.h:1 msgid "_Sound" @@ -55,11 +55,11 @@ msgid "Numbers" msgstr "Numeri" -#: ../data/taquin-screens.ui.h:6 ../data/org.gnome.taquin.desktop.in.h:4 +#: ../data/taquin-screens.ui.h:6 ../data/org.gnome.taquin.desktop.in.h:5 msgid "15-Puzzle" msgstr "Gioco del 15" -#: ../data/taquin-screens.ui.h:7 ../data/org.gnome.taquin.desktop.in.h:5 +#: ../data/taquin-screens.ui.h:7 ../data/org.gnome.taquin.desktop.in.h:6 msgid "16-Puzzle" msgstr "Gioco del 16" @@ -68,22 +68,14 @@ msgstr "Torna alla partita in corso" #: ../data/taquin.ui.h:2 -msgid "_Start Game" -msgstr "_Avvia partita" - -#: ../data/taquin.ui.h:3 -msgid "Start a new game as configured" -msgstr "Inizia una nuova partita" - -#: ../data/taquin.ui.h:4 msgid "_Start Over" msgstr "_Riparti" -#: ../data/taquin.ui.h:5 +#: ../data/taquin.ui.h:3 msgid "Configure a new game" msgstr "Configura una nuova partita" -#: ../data/taquin.ui.h:6 +#: ../data/taquin.ui.h:4 msgid "Start a new game" msgstr "Avvia _nuova partita" @@ -92,7 +84,7 @@ msgstr "Taquin GNOME" #: ../data/org.gnome.taquin.appdata.xml.in.h:2 -#: ../data/org.gnome.taquin.desktop.in.h:2 +#: ../data/org.gnome.taquin.desktop.in.h:3 msgid "Slide tiles to their correct places" msgstr "Fai scorrere le tessere nella loro corretta posizione" @@ -112,12 +104,16 @@ "raggiungano la loro designata posizione, indicata da numeri o da parti di " "un'immagine." -#: ../data/org.gnome.taquin.desktop.in.h:1 ../src/taquin-main.vala:78 -#: ../src/taquin-main.vala:135 ../src/taquin-main.vala:250 +#: ../data/org.gnome.taquin.desktop.in.h:1 ../src/taquin-main.vala:76 +#: ../src/taquin-main.vala:133 ../src/taquin-main.vala:237 msgid "Taquin" msgstr "Taquin" -#: ../data/org.gnome.taquin.desktop.in.h:3 +#: ../data/org.gnome.taquin.desktop.in.h:2 +msgid "15-puzzle" +msgstr "Gioco del 15" + +#: ../data/org.gnome.taquin.desktop.in.h:4 msgid "puzzle;" msgstr "puzzle;rompicapo;" @@ -162,63 +158,67 @@ msgid "true if the window is maximized." msgstr "VERO se la finestra è massimizzata" -#: ../src/game-window.vala:141 +#: ../src/game-window.vala:128 +msgid "_Start Game" +msgstr "_Avvia partita" + +#: ../src/game-window.vala:153 msgid "Undo your most recent move" msgstr "Annulla la mossa più recente" -#: ../src/taquin-main.vala:46 +#: ../src/taquin-main.vala:45 msgid "Play the classical 1880s’ 15-puzzle" msgstr "Gioca al classico puzzle dei 15" -#: ../src/taquin-main.vala:47 +#: ../src/taquin-main.vala:46 msgid "Try this fun alternative 16-puzzle" msgstr "Prova questa alternativa divertente del 16" -#: ../src/taquin-main.vala:48 +#: ../src/taquin-main.vala:47 msgid "Sets the puzzle edges’ size (3-5, 2-9 for debug)" msgstr "Imposta la dimensione dei lati del puzzle (3-5, 2-9 per debug)" -#: ../src/taquin-main.vala:49 +#: ../src/taquin-main.vala:48 msgid "Turn off the sound" msgstr "Disattiva audio" -#: ../src/taquin-main.vala:50 +#: ../src/taquin-main.vala:49 msgid "Turn on the sound" msgstr "Attiva audio" -#: ../src/taquin-main.vala:51 +#: ../src/taquin-main.vala:50 msgid "Print release version and exit" msgstr "Stampa la versione ed esce" -#: ../src/taquin-main.vala:246 +#: ../src/taquin-main.vala:233 msgid "(see COPYING.themes for informations)" msgstr "(consultare COPYING.themes per informazioni)" -#: ../src/taquin-main.vala:254 +#: ../src/taquin-main.vala:241 msgid "A classic 15-puzzle game" msgstr "Il classico gioco del 15" -#: ../src/taquin-main.vala:258 +#: ../src/taquin-main.vala:245 msgid "translator-credits" msgstr "Milo Casagrande " -#: ../src/taquin-main.vala:299 +#: ../src/taquin-main.vala:286 msgid "You can’t move this tile!" msgstr "Non puoi muovere questa tessera!" -#: ../src/taquin-main.vala:305 +#: ../src/taquin-main.vala:292 msgid "Bravo! You finished the game!" msgstr "Ottimo! Hai terminato la partita!" -#: ../src/taquin-main.vala:329 +#: ../src/taquin-main.vala:310 #, c-format msgid "Size: %d × %d ▾" msgstr "Dimensione: %d × %d ▾" -#: ../src/taquin-main.vala:343 +#: ../src/taquin-main.vala:324 msgid "Theme: Cats ▾" msgstr "Tema: Gatti ▾" -#: ../src/taquin-main.vala:344 +#: ../src/taquin-main.vala:325 msgid "Theme: Numbers ▾" msgstr "Tema: Numeri ▾" diff -Nru gnome-taquin-3.18.1.1/po/ko.po gnome-taquin-3.20.2/po/ko.po --- gnome-taquin-3.18.1.1/po/ko.po 2015-10-02 20:04:26.000000000 +0000 +++ gnome-taquin-3.20.2/po/ko.po 2016-03-24 10:46:09.000000000 +0000 @@ -3,14 +3,15 @@ # Korean translation for gnome-taquin. # This file is distributed under the same license as the gnome-taquin package. # -# Changwoo Ryu , 2015. +# Changwoo Ryu , 2015-2016. # msgid "" msgstr "" "Project-Id-Version: gnome-taquin master\n" -"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=gnome-taquin&keywords=I18N+L10N&component=general\n" -"POT-Creation-Date: 2015-03-07 08:53+0000\n" -"PO-Revision-Date: 2015-03-08 04:42+0900\n" +"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=gnome-" +"taquin&keywords=I18N+L10N&component=general\n" +"POT-Creation-Date: 2016-03-02 08:25+0000\n" +"PO-Revision-Date: 2016-03-17 05:21+0900\n" "Last-Translator: Changwoo Ryu \n" "Language-Team: GNOME Korea \n" "Language: ko\n" @@ -55,11 +56,11 @@ msgid "Numbers" msgstr "숫자" -#: ../data/taquin-screens.ui.h:6 ../data/org.gnome.taquin.desktop.in.h:4 +#: ../data/taquin-screens.ui.h:6 ../data/org.gnome.taquin.desktop.in.h:5 msgid "15-Puzzle" msgstr "15-퍼즐" -#: ../data/taquin-screens.ui.h:7 ../data/org.gnome.taquin.desktop.in.h:5 +#: ../data/taquin-screens.ui.h:7 ../data/org.gnome.taquin.desktop.in.h:6 msgid "16-Puzzle" msgstr "16-퍼즐" @@ -68,22 +69,14 @@ msgstr "현재 게임으로 돌아가기" #: ../data/taquin.ui.h:2 -msgid "_Start Game" -msgstr "게임 시작(_S)" - -#: ../data/taquin.ui.h:3 -msgid "Start a new game as configured" -msgstr "설정한 대로 새 게임을 시작합니다" - -#: ../data/taquin.ui.h:4 msgid "_Start Over" msgstr "처음부터 시작(_S)" -#: ../data/taquin.ui.h:5 +#: ../data/taquin.ui.h:3 msgid "Configure a new game" msgstr "새 게임을 설정합니다" -#: ../data/taquin.ui.h:6 +#: ../data/taquin.ui.h:4 msgid "Start a new game" msgstr "새 게임을 시작합니다" @@ -92,7 +85,7 @@ msgstr "그놈 타킨" #: ../data/org.gnome.taquin.appdata.xml.in.h:2 -#: ../data/org.gnome.taquin.desktop.in.h:2 +#: ../data/org.gnome.taquin.desktop.in.h:3 msgid "Slide tiles to their correct places" msgstr "타일을 밀어서 올바른 위치에 놓습니다" @@ -105,14 +98,20 @@ msgid "" "The object of Taquin is to move tiles so that they reach their places, " "either indicated with numbers, or with parts of a great image." -msgstr "타킨의 목표는 타일을 움직여서 자기 위치에 놓는 것입니다. 숫자로 표시된 위치에 놓거나, 전체 그림을 맞추는 방식으로 놓습니다." +msgstr "" +"타킨의 목표는 타일을 움직여서 자기 위치에 놓는 것입니다. 숫자로 표시된 위치" +"에 놓거나, 전체 그림을 맞추는 방식으로 놓습니다." -#: ../data/org.gnome.taquin.desktop.in.h:1 ../src/taquin-main.vala:78 -#: ../src/taquin-main.vala:135 ../src/taquin-main.vala:250 +#: ../data/org.gnome.taquin.desktop.in.h:1 ../src/taquin-main.vala:76 +#: ../src/taquin-main.vala:133 ../src/taquin-main.vala:237 msgid "Taquin" msgstr "타킨" -#: ../data/org.gnome.taquin.desktop.in.h:3 +#: ../data/org.gnome.taquin.desktop.in.h:2 +msgid "15-puzzle" +msgstr "15-퍼즐" + +#: ../data/org.gnome.taquin.desktop.in.h:4 msgid "puzzle;" msgstr "puzzle;퍼즐;" @@ -124,7 +123,9 @@ msgid "" "The game offers to play with a board size from 3 to 5. The setting could be " "set from 2 (good for testing) to 9, limited by the way files are selected." -msgstr "게임에서는 3에서 5까지 크기로 게임할 수 있습니다. 설정은 2(테스트용)에서 9까지 할 수 있습니다. 파일 선택 방식에 따라서 제한될 수 잇습니다." +msgstr "" +"게임에서는 3에서 5까지 크기로 게임할 수 있습니다. 설정은 2(테스트용)에서 9까" +"지 할 수 있습니다. 파일 선택 방식에 따라서 제한될 수 잇습니다." #: ../data/org.gnome.taquin.gschema.xml.h:3 msgid "Name of the theme folder." @@ -154,63 +155,70 @@ msgid "true if the window is maximized." msgstr "참이면 창을 최대화." -#: ../src/game-window.vala:141 +#: ../src/game-window.vala:128 +msgid "_Start Game" +msgstr "게임 시작(_S)" + +#: ../src/game-window.vala:153 msgid "Undo your most recent move" msgstr "가장 최근의 움직임을 실행 취소합니다" -#: ../src/taquin-main.vala:46 +#: ../src/taquin-main.vala:45 msgid "Play the classical 1880s’ 15-puzzle" msgstr "전통적인 1880년대 스타일 15-퍼즐을 플레이합니다" -#: ../src/taquin-main.vala:47 +#: ../src/taquin-main.vala:46 msgid "Try this fun alternative 16-puzzle" msgstr "새로운 16-퍼즐을 해 보십시오" -#: ../src/taquin-main.vala:48 +#: ../src/taquin-main.vala:47 msgid "Sets the puzzle edges’ size (3-5, 2-9 for debug)" msgstr "퍼즐 가장자리 크기를 설정합니다 (3-5, 디버깅용으로 2-9)" -#: ../src/taquin-main.vala:49 +#: ../src/taquin-main.vala:48 msgid "Turn off the sound" msgstr "소리를 끕니다" -#: ../src/taquin-main.vala:50 +#: ../src/taquin-main.vala:49 msgid "Turn on the sound" msgstr "소리를 켭니다" -#: ../src/taquin-main.vala:51 +#: ../src/taquin-main.vala:50 msgid "Print release version and exit" msgstr "릴리스 버전을 표시하고 끝납니다" -#: ../src/taquin-main.vala:246 +#: ../src/taquin-main.vala:233 msgid "(see COPYING.themes for informations)" msgstr "(정보는 COPYING.themes 파일을 참고하십시오)" -#: ../src/taquin-main.vala:254 +#: ../src/taquin-main.vala:241 msgid "A classic 15-puzzle game" msgstr "전통적인 15-퍼즐 게임" -#: ../src/taquin-main.vala:258 +#: ../src/taquin-main.vala:245 msgid "translator-credits" msgstr "류창우 " -#: ../src/taquin-main.vala:299 +#: ../src/taquin-main.vala:286 msgid "You can’t move this tile!" msgstr "이 타일을 움직일 수 없습니다!" -#: ../src/taquin-main.vala:305 +#: ../src/taquin-main.vala:292 msgid "Bravo! You finished the game!" msgstr "만세! 게임을 마쳤습니다!" -#: ../src/taquin-main.vala:329 +#: ../src/taquin-main.vala:310 #, c-format msgid "Size: %d × %d ▾" msgstr "크기: %d × %d ▾" -#: ../src/taquin-main.vala:343 +#: ../src/taquin-main.vala:324 msgid "Theme: Cats ▾" msgstr "테마: Cats ▾" -#: ../src/taquin-main.vala:344 +#: ../src/taquin-main.vala:325 msgid "Theme: Numbers ▾" msgstr "테마: 숫자 ▾" + +#~ msgid "Start a new game as configured" +#~ msgstr "설정한 대로 새 게임을 시작합니다" diff -Nru gnome-taquin-3.18.1.1/po/LINGUAS gnome-taquin-3.20.2/po/LINGUAS --- gnome-taquin-3.18.1.1/po/LINGUAS 2015-10-02 20:04:26.000000000 +0000 +++ gnome-taquin-3.20.2/po/LINGUAS 2016-03-24 10:46:09.000000000 +0000 @@ -1,6 +1,7 @@ # please keep this list sorted alphabetically # an +bg bs ca cs @@ -20,7 +21,9 @@ it ko lt +lv nb +oc pa pl pt diff -Nru gnome-taquin-3.18.1.1/po/lt.po gnome-taquin-3.20.2/po/lt.po --- gnome-taquin-3.18.1.1/po/lt.po 2015-10-02 20:04:26.000000000 +0000 +++ gnome-taquin-3.20.2/po/lt.po 2016-03-24 10:46:09.000000000 +0000 @@ -9,8 +9,8 @@ "Project-Id-Version: gnome-taquin master\n" "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=gnome-" "taquin&keywords=I18N+L10N&component=general\n" -"POT-Creation-Date: 2015-03-01 04:45+0000\n" -"PO-Revision-Date: 2015-03-08 19:59+0200\n" +"POT-Creation-Date: 2015-11-13 10:26+0000\n" +"PO-Revision-Date: 2015-11-13 12:57+0200\n" "Last-Translator: Aurimas Černius \n" "Language-Team: Lithuanian \n" "Language: lt\n" @@ -19,7 +19,7 @@ "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && (n" "%100<10 || n%100>=20) ? 1 : 2);\n" -"X-Generator: Gtranslator 2.91.6\n" +"X-Generator: Poedit 1.8.5\n" #: ../data/taquin-menus.ui.h:1 msgid "_Sound" @@ -57,11 +57,11 @@ msgid "Numbers" msgstr "Skaičiai" -#: ../data/taquin-screens.ui.h:6 ../data/org.gnome.taquin.desktop.in.h:4 +#: ../data/taquin-screens.ui.h:6 ../data/org.gnome.taquin.desktop.in.h:5 msgid "15-Puzzle" msgstr "15-galvosūkis" -#: ../data/taquin-screens.ui.h:7 ../data/org.gnome.taquin.desktop.in.h:5 +#: ../data/taquin-screens.ui.h:7 ../data/org.gnome.taquin.desktop.in.h:6 msgid "16-Puzzle" msgstr "16-galvosūkis" @@ -70,24 +70,14 @@ msgstr "Grįžti į dabartinį žaidimą" #: ../data/taquin.ui.h:2 -msgid "_Start Game" -msgstr "_Pradėti žaidimą" - -#: ../data/taquin.ui.h:3 -#| msgid "Start a new game" -msgid "Start a new game as configured" -msgstr "Pradėti naują žaidimą kaip sukonfigūruota" - -#: ../data/taquin.ui.h:4 msgid "_Start Over" msgstr "Žaisti iš _naujo" -#: ../data/taquin.ui.h:5 -#| msgid "Start a new game" +#: ../data/taquin.ui.h:3 msgid "Configure a new game" msgstr "Konfigūruoti naują žaidimą" -#: ../data/taquin.ui.h:6 +#: ../data/taquin.ui.h:4 msgid "Start a new game" msgstr "Pradėti naują žaidimą" @@ -96,7 +86,7 @@ msgstr "GNOME Taquin" #: ../data/org.gnome.taquin.appdata.xml.in.h:2 -#: ../data/org.gnome.taquin.desktop.in.h:2 +#: ../data/org.gnome.taquin.desktop.in.h:3 msgid "Slide tiles to their correct places" msgstr "Tempkite koklius į jų teisingas vietas" @@ -114,13 +104,16 @@ "Taquin tikslas yra perkelti koklius taip, kad kiekvienas atsidurtų savo " "vietoje, nurodytoje skaičiais arba didesnio paveikslėlio dalimis." -#. Window -#: ../data/org.gnome.taquin.desktop.in.h:1 ../src/taquin-main.vala:78 -#: ../src/taquin-main.vala:138 ../src/taquin-main.vala:254 +#: ../data/org.gnome.taquin.desktop.in.h:1 ../src/taquin-main.vala:76 +#: ../src/taquin-main.vala:133 ../src/taquin-main.vala:237 msgid "Taquin" msgstr "Taquin" -#: ../data/org.gnome.taquin.desktop.in.h:3 +#: ../data/org.gnome.taquin.desktop.in.h:2 +msgid "15-puzzle" +msgstr "15-galvosūkis" + +#: ../data/org.gnome.taquin.desktop.in.h:4 msgid "puzzle;" msgstr "galvosūkis;" @@ -164,69 +157,77 @@ msgid "true if the window is maximized." msgstr "Teigiama, jei langas yra išdidintas." -#: ../src/game-window.vala:134 +#: ../src/game-window.vala:128 +msgid "_Start Game" +msgstr "_Pradėti žaidimą" + +#: ../src/game-window.vala:153 msgid "Undo your most recent move" msgstr "Atšaukti paskutinį ėjimą" -#: ../src/taquin-main.vala:46 +#: ../src/taquin-main.vala:45 msgid "Play the classical 1880s’ 15-puzzle" msgstr "Žaisti klasikinį 1880-ųjų 15-galvosūkį" -#: ../src/taquin-main.vala:47 +#: ../src/taquin-main.vala:46 msgid "Try this fun alternative 16-puzzle" msgstr "Bandyti šį smagų alternatyvų 16-galvosūkį" -#: ../src/taquin-main.vala:48 +#: ../src/taquin-main.vala:47 msgid "Sets the puzzle edges’ size (3-5, 2-9 for debug)" msgstr "Nustato galvosūkio pakraščių dydį (3-5, 2-9 derinimui)" -#: ../src/taquin-main.vala:49 +#: ../src/taquin-main.vala:48 msgid "Turn off the sound" msgstr "Išjungti garsą" -#: ../src/taquin-main.vala:50 +#: ../src/taquin-main.vala:49 msgid "Turn on the sound" msgstr "Įjungti garsą" -#: ../src/taquin-main.vala:51 +#: ../src/taquin-main.vala:50 msgid "Print release version and exit" msgstr "Atspausdinti leidimo versiją ir išeiti" -#: ../src/taquin-main.vala:250 +#: ../src/taquin-main.vala:233 msgid "(see COPYING.themes for informations)" msgstr "(daugiau informacijos rasite faile COPYING.themes)" -#: ../src/taquin-main.vala:258 +#: ../src/taquin-main.vala:241 msgid "A classic 15-puzzle game" msgstr "Klasikinis 15-galvosūkio žaidimas" -#: ../src/taquin-main.vala:262 +#: ../src/taquin-main.vala:245 msgid "translator-credits" msgstr "" "Išvertė:\n" "Aurimas Černius " -#: ../src/taquin-main.vala:303 +#: ../src/taquin-main.vala:286 msgid "You can’t move this tile!" msgstr "Negalima perkelti šio koklio!" -#: ../src/taquin-main.vala:309 +#: ../src/taquin-main.vala:292 msgid "Bravo! You finished the game!" msgstr "Sveikiname! Jūs užbaigėte žaidimą!" -#: ../src/taquin-main.vala:333 +#: ../src/taquin-main.vala:310 #, c-format msgid "Size: %d × %d ▾" msgstr "Dydis: %d × %d ▾" -#: ../src/taquin-main.vala:347 +#: ../src/taquin-main.vala:324 msgid "Theme: Cats ▾" msgstr "Tema: katinai ▾" -#: ../src/taquin-main.vala:348 +#: ../src/taquin-main.vala:325 msgid "Theme: Numbers ▾" msgstr "Tema: skaičiai ▾" +#~| msgid "Start a new game" +#~ msgid "Start a new game as configured" +#~ msgstr "Pradėti naują žaidimą kaip sukonfigūruota" + #~ msgid "15-Puzzle with hole" #~ msgstr "15-galvosūkis su skyle" diff -Nru gnome-taquin-3.18.1.1/po/lv.po gnome-taquin-3.20.2/po/lv.po --- gnome-taquin-3.18.1.1/po/lv.po 1970-01-01 00:00:00.000000000 +0000 +++ gnome-taquin-3.20.2/po/lv.po 2016-03-24 10:46:09.000000000 +0000 @@ -0,0 +1,221 @@ +# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER +# This file is distributed under the same license as the PACKAGE package. +# +# Rūdolfs Mazurs , 2016. +msgid "" +msgstr "" +"Project-Id-Version: \n" +"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=gnome-ta" +"quin&keywords=I18N+L10N&component=general\n" +"POT-Creation-Date: 2016-02-04 10:32+0000\n" +"PO-Revision-Date: 2016-02-06 19:23+0200\n" +"Last-Translator: Rūdolfs Mazurs \n" +"Language-Team: Latvian \n" +"Language: lv\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 != 0 ? 1 : " +"2);\n" +"X-Generator: Lokalize 2.0\n" + +#: ../data/taquin-menus.ui.h:1 +msgid "_Sound" +msgstr "_Skaņa" + +#: ../data/taquin-menus.ui.h:2 +msgid "_Help" +msgstr "_Palīdzība" + +#: ../data/taquin-menus.ui.h:3 +msgid "_About" +msgstr "P_ar" + +#: ../data/taquin-menus.ui.h:4 +msgid "_Quit" +msgstr "_Iziet" + +#: ../data/taquin-screens.ui.h:1 +msgid "3 × 3" +msgstr "3 × 3" + +#: ../data/taquin-screens.ui.h:2 +msgid "4 × 4" +msgstr "4 × 4" + +#: ../data/taquin-screens.ui.h:3 +msgid "5 × 5" +msgstr "5 × 5" + +#: ../data/taquin-screens.ui.h:4 +msgid "Cats" +msgstr "Kaķi" + +#: ../data/taquin-screens.ui.h:5 +msgid "Numbers" +msgstr "Skaitļi" + +#: ../data/taquin-screens.ui.h:6 ../data/org.gnome.taquin.desktop.in.h:5 +msgid "15-Puzzle" +msgstr "15-mīkla" + +#: ../data/taquin-screens.ui.h:7 ../data/org.gnome.taquin.desktop.in.h:6 +msgid "16-Puzzle" +msgstr "16-mīkla" + +#: ../data/taquin.ui.h:1 +msgid "Go back to the current game" +msgstr "Iet uz pašreizējo spēli" + +#: ../data/taquin.ui.h:2 +msgid "_Start Over" +msgstr "_Sākt no jauna" + +#: ../data/taquin.ui.h:3 +msgid "Configure a new game" +msgstr "Konfigurēt jaunu spēli" + +#: ../data/taquin.ui.h:4 +msgid "Start a new game" +msgstr "Sākt jaunu spēli" + +#: ../data/org.gnome.taquin.appdata.xml.in.h:1 +msgid "GNOME Taquin" +msgstr "GNOME Taquin" + +#: ../data/org.gnome.taquin.appdata.xml.in.h:2 +#: ../data/org.gnome.taquin.desktop.in.h:3 +msgid "Slide tiles to their correct places" +msgstr "Slidiniet kauliņus uz tiem paredzētajām vietām" + +#: ../data/org.gnome.taquin.appdata.xml.in.h:3 +msgid "" +"Taquin is a computer version of the 15-puzzle and other sliding puzzles." +msgstr "Taquin ir datora variants 15-mīklai un citām slidināšanas spēlēm." + +#: ../data/org.gnome.taquin.appdata.xml.in.h:4 +msgid "" +"The object of Taquin is to move tiles so that they reach their places, " +"either indicated with numbers, or with parts of a great image." +msgstr "" +"Taquin mērķis ir pārvietot kauliņus, lai tie sasniegtu savu vietu, vai nu tie " +"ir numuri, vai daļa no lielāka attēla." + +#: ../data/org.gnome.taquin.desktop.in.h:1 ../src/taquin-main.vala:76 +#: ../src/taquin-main.vala:133 ../src/taquin-main.vala:237 +msgid "Taquin" +msgstr "Taquin" + +#: ../data/org.gnome.taquin.desktop.in.h:2 +msgid "15-puzzle" +msgstr "15-mīkla" + +#: ../data/org.gnome.taquin.desktop.in.h:4 +msgid "puzzle;" +msgstr "puzle;mīkla;" + +#: ../data/org.gnome.taquin.gschema.xml.h:1 +msgid "Number of tiles on each edge." +msgstr "Kauliņu skaits katrā malā." + +#: ../data/org.gnome.taquin.gschema.xml.h:2 +msgid "" +"The game offers to play with a board size from 3 to 5. The setting could be " +"set from 2 (good for testing) to 9, limited by the way files are selected." +msgstr "" +"Spēle piedāvā spēlēt ar laukuma izmēru no 3 līdz 5. Iestatījumu var mainīt no " +"2 (noder testēšanai) līdz 9, ierobežo veids, kādā tiek izvēlētas datnes." + +#: ../data/org.gnome.taquin.gschema.xml.h:3 +msgid "Name of the theme folder." +msgstr "Motīvu mapes nosaukums." + +#: ../data/org.gnome.taquin.gschema.xml.h:4 +msgid "Taquin has two default themes: 'cats' and 'numbers'." +msgstr "Taquin ir divi noklusējuma motīvi — “cats” un “numbers”." + +#: ../data/org.gnome.taquin.gschema.xml.h:5 +msgid "Sound" +msgstr "Skaņa" + +#: ../data/org.gnome.taquin.gschema.xml.h:6 +msgid "Whether or not to play event sounds." +msgstr "Vai atskaņot notikumu skaņas." + +#: ../data/org.gnome.taquin.gschema.xml.h:7 +msgid "Width of the window in pixels." +msgstr "Galvenā loga platums pikseļos." + +#: ../data/org.gnome.taquin.gschema.xml.h:8 +msgid "Height of the window in pixels." +msgstr "Galvenā loga augstums pikseļos." + +#: ../data/org.gnome.taquin.gschema.xml.h:9 +msgid "true if the window is maximized." +msgstr "patiess, ja logs ir maksimizēts." + +#: ../src/game-window.vala:128 +msgid "_Start Game" +msgstr "_Sākt spēli" + +#: ../src/game-window.vala:153 +msgid "Undo your most recent move" +msgstr "Atsaukt savu pēdējo gājienu" + +#: ../src/taquin-main.vala:45 +msgid "Play the classical 1880s’ 15-puzzle" +msgstr "Spēlēt klasisko 1880-to gadu 15-mīklu" + +#: ../src/taquin-main.vala:46 +msgid "Try this fun alternative 16-puzzle" +msgstr "Pamēģiniet šo jautro alternatīvo 16-mīklu" + +#: ../src/taquin-main.vala:47 +msgid "Sets the puzzle edges’ size (3-5, 2-9 for debug)" +msgstr "Iestata mīklas malu izmēru (3–5, 2–9 atkļūdošanai)" + +#: ../src/taquin-main.vala:48 +msgid "Turn off the sound" +msgstr "Izslēgt skaņu" + +#: ../src/taquin-main.vala:49 +msgid "Turn on the sound" +msgstr "Ieslēgt skaņu" + +#: ../src/taquin-main.vala:50 +msgid "Print release version and exit" +msgstr "Parādīt informāciju par laidienu un iziet" + +#: ../src/taquin-main.vala:233 +msgid "(see COPYING.themes for informations)" +msgstr "(skatiet COPYING.themes, lai uzzinātu vairāk)" + +#: ../src/taquin-main.vala:241 +msgid "A classic 15-puzzle game" +msgstr "Klasiskā 15-mīklas spēle" + +#: ../src/taquin-main.vala:245 +msgid "translator-credits" +msgstr "Rūdolfs Mazurs " + +#: ../src/taquin-main.vala:286 +msgid "You can’t move this tile!" +msgstr "Jūs nevarat pārvietot šo kauliņu!" + +#: ../src/taquin-main.vala:292 +msgid "Bravo! You finished the game!" +msgstr "Bravo! Jūs pabeidzāt spēli!" + +#: ../src/taquin-main.vala:310 +#, c-format +msgid "Size: %d × %d ▾" +msgstr "Izmērs: %d × %d ▾" + +#: ../src/taquin-main.vala:324 +msgid "Theme: Cats ▾" +msgstr "Motīvs: kaķi ▾" + +#: ../src/taquin-main.vala:325 +msgid "Theme: Numbers ▾" +msgstr "Motīvs: skaitļi ▾" + diff -Nru gnome-taquin-3.18.1.1/po/nb.po gnome-taquin-3.20.2/po/nb.po --- gnome-taquin-3.18.1.1/po/nb.po 2015-10-02 20:04:26.000000000 +0000 +++ gnome-taquin-3.20.2/po/nb.po 2016-03-24 10:46:09.000000000 +0000 @@ -5,10 +5,10 @@ # Torstein Adolf Winterseth , 2010. msgid "" msgstr "" -"Project-Id-Version: gnome-taquin 3.17.x\n" +"Project-Id-Version: gnome-taquin 3.19.x\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2015-08-11 19:12+0200\n" -"PO-Revision-Date: 2015-08-11 19:16+0200\n" +"POT-Creation-Date: 2015-11-16 00:22+0100\n" +"PO-Revision-Date: 2015-11-16 00:23+0100\n" "Last-Translator: Kjartan Maraas \n" "Language-Team: Norwegian bokmål \n" "Language: nb\n" @@ -53,11 +53,11 @@ msgid "Numbers" msgstr "Tall" -#: ../data/taquin-screens.ui.h:6 ../data/org.gnome.taquin.desktop.in.h:4 +#: ../data/taquin-screens.ui.h:6 ../data/org.gnome.taquin.desktop.in.h:5 msgid "15-Puzzle" msgstr "15-puslespill" -#: ../data/taquin-screens.ui.h:7 ../data/org.gnome.taquin.desktop.in.h:5 +#: ../data/taquin-screens.ui.h:7 ../data/org.gnome.taquin.desktop.in.h:6 msgid "16-Puzzle" msgstr "16-puslespill" @@ -82,27 +82,34 @@ msgstr "GNOME Taquin" #: ../data/org.gnome.taquin.appdata.xml.in.h:2 -#: ../data/org.gnome.taquin.desktop.in.h:2 +#: ../data/org.gnome.taquin.desktop.in.h:3 msgid "Slide tiles to their correct places" msgstr "Flytt fliser til rett plass" #: ../data/org.gnome.taquin.appdata.xml.in.h:3 msgid "" "Taquin is a computer version of the 15-puzzle and other sliding puzzles." -msgstr "Taquin er datamaskinversjonen av 15-puslespill og andre skyvepuslespill." +msgstr "" +"Taquin er datamaskinversjonen av 15-puslespill og andre skyvepuslespill." #: ../data/org.gnome.taquin.appdata.xml.in.h:4 msgid "" "The object of Taquin is to move tiles so that they reach their places, " "either indicated with numbers, or with parts of a great image." -msgstr "Målet i Taquin er å skyve flisene slik at de når sine plasser som er indikert med tall eller deler av et større bilde." +msgstr "" +"Målet i Taquin er å skyve flisene slik at de når sine plasser som er " +"indikert med tall eller deler av et større bilde." #: ../data/org.gnome.taquin.desktop.in.h:1 ../src/taquin-main.vala:76 #: ../src/taquin-main.vala:133 ../src/taquin-main.vala:237 msgid "Taquin" msgstr "Taquin" -#: ../data/org.gnome.taquin.desktop.in.h:3 +#: ../data/org.gnome.taquin.desktop.in.h:2 +msgid "15-puzzle" +msgstr "15-puslespill" + +#: ../data/org.gnome.taquin.desktop.in.h:4 msgid "puzzle;" msgstr "puslespill;" @@ -114,7 +121,9 @@ msgid "" "The game offers to play with a board size from 3 to 5. The setting could be " "set from 2 (good for testing) to 9, limited by the way files are selected." -msgstr "Spillet tilbyr å spille med brettstørrelse på 3 til 5. Denne innstillingen kan settes til 2 (bra for testing) til 9, begrenset av måten filene velges." +msgstr "" +"Spillet tilbyr å spille med brettstørrelse på 3 til 5. Denne innstillingen " +"kan settes til 2 (bra for testing) til 9, begrenset av måten filene velges." #: ../data/org.gnome.taquin.gschema.xml.h:3 msgid "Name of the theme folder." diff -Nru gnome-taquin-3.18.1.1/po/oc.po gnome-taquin-3.20.2/po/oc.po --- gnome-taquin-3.18.1.1/po/oc.po 1970-01-01 00:00:00.000000000 +0000 +++ gnome-taquin-3.20.2/po/oc.po 2016-05-09 00:10:22.000000000 +0000 @@ -0,0 +1,246 @@ +# Occitan translation of gnome-taquin. +# Copyright (C) 2014 Arnaud Bonatti +# This file is distributed under the same license as the gnome-taquin package. +# Cédric Valmary , 2015. +# Cédric Valmary (Tot en òc) , 2015. +# Cédric Valmary (totenoc.eu) , 2016. +msgid "" +msgstr "" +"Project-Id-Version: taquin master\n" +"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=gnome-" +"taquin&keywords=I18N+L10N&component=general\n" +"POT-Creation-Date: 2016-03-05 16:23+0000\n" +"PO-Revision-Date: 2016-05-05 21:47+0200\n" +"Last-Translator: Cédric Valmary (totenoc.eu) \n" +"Language-Team: Tot En Òc\n" +"Language: oc\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Plural-Forms: nplurals=2; plural=(n > 1);\n" +"X-Generator: Virtaal 0.7.1\n" +"X-Project-Style: gnome\n" + +#: ../data/taquin-menus.ui.h:1 +msgid "_Sound" +msgstr "_Son" + +#: ../data/taquin-menus.ui.h:2 +msgid "_Help" +msgstr "Ajud_a" + +#: ../data/taquin-menus.ui.h:3 +msgid "_About" +msgstr "A _prepaus" + +#: ../data/taquin-menus.ui.h:4 +msgid "_Quit" +msgstr "_Quitar" + +#: ../data/taquin-screens.ui.h:1 +msgid "3 × 3" +msgstr "3 × 3" + +#: ../data/taquin-screens.ui.h:2 +msgid "4 × 4" +msgstr "4 × 4" + +#: ../data/taquin-screens.ui.h:3 +msgid "5 × 5" +msgstr "5 × 5" + +#: ../data/taquin-screens.ui.h:4 +msgid "Cats" +msgstr "Gats" + +#: ../data/taquin-screens.ui.h:5 +msgid "Numbers" +msgstr "Nombres" + +#: ../data/taquin-screens.ui.h:6 ../data/org.gnome.taquin.desktop.in.h:5 +msgid "15-Puzzle" +msgstr "Buta-buta" + +#: ../data/taquin-screens.ui.h:7 ../data/org.gnome.taquin.desktop.in.h:6 +msgid "16-Puzzle" +msgstr "Lisa-lisa" + +#: ../data/taquin.ui.h:1 +msgid "Go back to the current game" +msgstr "Tornar al jòc en cors" + +#: ../data/taquin.ui.h:2 +msgid "_Start Over" +msgstr "_Recomençar" + +#: ../data/taquin.ui.h:3 +msgid "Configure a new game" +msgstr "Configurar una novèla partida" + +#: ../data/taquin.ui.h:4 +msgid "Start a new game" +msgstr "Comença una novèla partida" + +#: ../data/org.gnome.taquin.appdata.xml.in.h:1 +msgid "GNOME Taquin" +msgstr "GNOME Taquin" + +#: ../data/org.gnome.taquin.appdata.xml.in.h:2 +#: ../data/org.gnome.taquin.desktop.in.h:3 +msgid "Slide tiles to their correct places" +msgstr "Lisar las pèças fins a lor posicion corrècta" + +#: ../data/org.gnome.taquin.appdata.xml.in.h:3 +msgid "" +"Taquin is a computer version of the 15-puzzle and other sliding puzzles." +msgstr "" +"Taquin es una version informatizada del taquin e d’autres copacaps del genre." + +#: ../data/org.gnome.taquin.appdata.xml.in.h:4 +msgid "" +"The object of Taquin is to move tiles so that they reach their places, " +"either indicated with numbers, or with parts of a great image." +msgstr "" +"L’objectiu de Taquin es de desplaçar las pèças per qu’atenhan lor posicion " +"corrècta, endevinabla siá per un nombre, siá pels tròces d’un polit imatge." + +#: ../data/org.gnome.taquin.desktop.in.h:1 ../src/taquin-main.vala:76 +#: ../src/taquin-main.vala:133 ../src/taquin-main.vala:237 +msgid "Taquin" +msgstr "Taquin" + +#: ../data/org.gnome.taquin.desktop.in.h:2 +msgid "15-puzzle" +msgstr "Buta-buta" + +#: ../data/org.gnome.taquin.desktop.in.h:4 +msgid "puzzle;" +msgstr "puzzle; Buta-buta; taquin;" + +#: ../data/org.gnome.taquin.gschema.xml.h:1 +msgid "Number of tiles on each edge." +msgstr "Nombre de pèças sus cada costat." + +#: ../data/org.gnome.taquin.gschema.xml.h:2 +msgid "" +"The game offers to play with a board size from 3 to 5. The setting could be " +"set from 2 (good for testing) to 9, limited by the way files are selected." +msgstr "" +"Aqueste jòc permet de jogar amb un platèu de 3 a 5 pèças de costat. Pòt " +"èsser parametrat de 2 (plan per ensajar) a 9, segon lo biais que los " +"fichièrs son seleccionats." + +#: ../data/org.gnome.taquin.gschema.xml.h:3 +msgid "Name of the theme folder." +msgstr "Nom del dorsièr de tèmas." + +#: ../data/org.gnome.taquin.gschema.xml.h:4 +msgid "Taquin has two default themes: 'cats' and 'numbers'." +msgstr "" +"Taquin a dos tèmas prepausats per defaut : « cats » e " +"« numbers » (literalament « gats » e « nombres »)" + +#: ../data/org.gnome.taquin.gschema.xml.h:5 +msgid "Sound" +msgstr "Son" + +#: ../data/org.gnome.taquin.gschema.xml.h:6 +msgid "Whether or not to play event sounds." +msgstr "Se cal o pas jogar los sons del jòc." + +#: ../data/org.gnome.taquin.gschema.xml.h:7 +msgid "Width of the window in pixels." +msgstr "Largor de la fenèstra en pixèls." + +#: ../data/org.gnome.taquin.gschema.xml.h:8 +msgid "Height of the window in pixels." +msgstr "Nautor de la fenèstra en pixèls." + +#: ../data/org.gnome.taquin.gschema.xml.h:9 +msgid "true if the window is maximized." +msgstr "Verai se la fenèstra es maximizada." + +#: ../src/game-window.vala:128 +msgid "_Start Game" +msgstr "_Aviar lo jòc" + +#: ../src/game-window.vala:153 +msgid "Undo your most recent move" +msgstr "Anulla vòstre darrièr desplaçament" + +#: ../src/taquin-main.vala:45 +msgid "Play the classical 1880s’ 15-puzzle" +msgstr "Jogar al buta-buta classic dels ans 1880." + +#: ../src/taquin-main.vala:46 +msgid "Try this fun alternative 16-puzzle" +msgstr "Ensaja aqueste amusant puzzle alternatiu de 16 pèças" + +#: ../src/taquin-main.vala:47 +msgid "Sets the puzzle edges’ size (3-5, 2-9 for debug)" +msgstr "Configura la talha del costat del puzzle (3 a 5, 2 a 9 per desbugar)" + +#: ../src/taquin-main.vala:48 +msgid "Turn off the sound" +msgstr "Copa lo son" + +#: ../src/taquin-main.vala:49 +msgid "Turn on the sound" +msgstr "Activa lo son" + +#: ../src/taquin-main.vala:50 +msgid "Print release version and exit" +msgstr "Aficha lo numèro de version e quita" + +#: ../src/taquin-main.vala:233 +msgid "(see COPYING.themes for informations)" +msgstr "(veire COPYING.themes per mai d’informacions)" + +#: ../src/taquin-main.vala:241 +msgid "A classic 15-puzzle game" +msgstr "Un taquin classic" + +#: ../src/taquin-main.vala:245 +msgid "translator-credits" +msgstr "Cédric Valmary (totenoc.eu) " + +#: ../src/taquin-main.vala:286 +msgid "You can’t move this tile!" +msgstr "Impossible de desplaçar aquesta pèça !" + +#: ../src/taquin-main.vala:292 +msgid "Bravo! You finished the game!" +msgstr "Òsca ! Avètz acabat lo jòc !" + +#: ../src/taquin-main.vala:310 +#, c-format +msgid "Size: %d × %d ▾" +msgstr "Talha : %d × %d ▾" + +#: ../src/taquin-main.vala:324 +msgid "Theme: Cats ▾" +msgstr "Tèma : Gats ▾" + +#: ../src/taquin-main.vala:325 +msgid "Theme: Numbers ▾" +msgstr "Tèma : Nombres ▾" + +#~ msgid "Start a new game as configured" +#~ msgstr "Comença una novèla partida tala coma configurada" + +#~ msgid "15-Puzzle with hole" +#~ msgstr "Buta-buta, amb un trauc" + +#~ msgid "Puzzle with arrays" +#~ msgstr "Puzzle amb de sagetas" + +#~ msgid "" +#~ "The game is tested and offers to select a size from 3 to 5. There is a " +#~ "human-understandable maximum value to avoid some bugs. Maximum size is 9 " +#~ "as the image files are randomly selected depending on the first character " +#~ "of their filename." +#~ msgstr "" +#~ "Lo jòc es testat e prepausa de causir una talha entre 3 e 5. Cal una " +#~ "valor maximala a talha umana per evitar certans bugs. La talha " +#~ "maximala es de 9 perque los imatges son seleccionats a l'azard segon lo " +#~ "primièr caractèr de lor nom de fichièr." diff -Nru gnome-taquin-3.18.1.1/po/pl.po gnome-taquin-3.20.2/po/pl.po --- gnome-taquin-3.18.1.1/po/pl.po 2015-10-02 20:04:26.000000000 +0000 +++ gnome-taquin-3.20.2/po/pl.po 2016-03-24 10:46:09.000000000 +0000 @@ -5,14 +5,14 @@ # gnomepl@aviary.pl # -=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=- # Joanna Lisek , 2015. -# Piotr Drąg , 2015. -# Aviary.pl , 2015. +# Piotr Drąg , 2015-2016. +# Aviary.pl , 2015-2016. msgid "" msgstr "" "Project-Id-Version: gnome-taquin\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2015-08-25 14:25+0200\n" -"PO-Revision-Date: 2015-08-25 14:27+0200\n" +"POT-Creation-Date: 2016-02-06 15:24+0100\n" +"PO-Revision-Date: 2016-02-06 15:25+0100\n" "Last-Translator: Piotr Drąg \n" "Language-Team: Polish \n" "Language: pl\n" @@ -60,11 +60,11 @@ msgid "Numbers" msgstr "Liczby" -#: ../data/taquin-screens.ui.h:6 ../data/org.gnome.taquin.desktop.in.h:4 +#: ../data/taquin-screens.ui.h:6 ../data/org.gnome.taquin.desktop.in.h:5 msgid "15-Puzzle" msgstr "15-częściowe puzzle" -#: ../data/taquin-screens.ui.h:7 ../data/org.gnome.taquin.desktop.in.h:5 +#: ../data/taquin-screens.ui.h:7 ../data/org.gnome.taquin.desktop.in.h:6 msgid "16-Puzzle" msgstr "16-częściowe puzzle" @@ -89,7 +89,7 @@ msgstr "GNOME Taquin" #: ../data/org.gnome.taquin.appdata.xml.in.h:2 -#: ../data/org.gnome.taquin.desktop.in.h:2 +#: ../data/org.gnome.taquin.desktop.in.h:3 msgid "Slide tiles to their correct places" msgstr "Przesuwanie elementów na właściwe miejsca" @@ -111,7 +111,11 @@ msgid "Taquin" msgstr "Taquin" -#: ../data/org.gnome.taquin.desktop.in.h:3 +#: ../data/org.gnome.taquin.desktop.in.h:2 +msgid "15-puzzle" +msgstr "15-częściowe puzzle" + +#: ../data/org.gnome.taquin.desktop.in.h:4 msgid "puzzle;" msgstr "puzzle;puzle;" @@ -200,8 +204,8 @@ msgid "translator-credits" msgstr "" "Joanna Lisek , 2015\n" -"Piotr Drąg , 2015\n" -"Aviary.pl , 2015" +"Piotr Drąg , 2015-2016\n" +"Aviary.pl , 2015-2016" #: ../src/taquin-main.vala:286 msgid "You can’t move this tile!" diff -Nru gnome-taquin-3.18.1.1/po/pt_BR.po gnome-taquin-3.20.2/po/pt_BR.po --- gnome-taquin-3.18.1.1/po/pt_BR.po 2015-10-02 20:04:26.000000000 +0000 +++ gnome-taquin-3.20.2/po/pt_BR.po 2016-03-24 10:46:09.000000000 +0000 @@ -3,22 +3,23 @@ # This file is distributed under the same license as the gnome-taquin package. # Rafael Ferreira , 2014. # Enrico Nicoletto , 2015. +# Artur de Aquino Morais , 2016. # msgid "" msgstr "" "Project-Id-Version: gnome-taquin master\n" "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=gnome-" "taquin&keywords=I18N+L10N&component=general\n" -"POT-Creation-Date: 2015-03-01 04:45+0000\n" -"PO-Revision-Date: 2015-03-23 20:11-0300\n" -"Last-Translator: Enrico Nicoletto \n" +"POT-Creation-Date: 2015-09-21 18:49+0000\n" +"PO-Revision-Date: 2016-02-19 13:41-0300\n" +"Last-Translator: Artur de Aquino Morais \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.7.5\n" +"X-Generator: Poedit 1.8.4\n" #: ../data/taquin-menus.ui.h:1 msgid "_Sound" @@ -56,11 +57,11 @@ msgid "Numbers" msgstr "Números" -#: ../data/taquin-screens.ui.h:6 ../data/org.gnome.taquin.desktop.in.h:4 +#: ../data/taquin-screens.ui.h:6 ../data/org.gnome.taquin.desktop.in.h:5 msgid "15-Puzzle" msgstr "Quebra-cabeça de 15 peças" -#: ../data/taquin-screens.ui.h:7 ../data/org.gnome.taquin.desktop.in.h:5 +#: ../data/taquin-screens.ui.h:7 ../data/org.gnome.taquin.desktop.in.h:6 msgid "16-Puzzle" msgstr "Quebra-cabeça de 16 peças" @@ -69,22 +70,14 @@ msgstr "Voltar para o jogo atual" #: ../data/taquin.ui.h:2 -msgid "_Start Game" -msgstr "_Inicia jogo" - -#: ../data/taquin.ui.h:3 -msgid "Start a new game as configured" -msgstr "Inicia um novo jogo conforme configurado" - -#: ../data/taquin.ui.h:4 msgid "_Start Over" msgstr "_Reiniciar jogo" -#: ../data/taquin.ui.h:5 +#: ../data/taquin.ui.h:3 msgid "Configure a new game" msgstr "Configurar um novo jogo" -#: ../data/taquin.ui.h:6 +#: ../data/taquin.ui.h:4 msgid "Start a new game" msgstr "Inicia um novo jogo" @@ -93,7 +86,7 @@ msgstr "GNOME Taquin" #: ../data/org.gnome.taquin.appdata.xml.in.h:2 -#: ../data/org.gnome.taquin.desktop.in.h:2 +#: ../data/org.gnome.taquin.desktop.in.h:3 msgid "Slide tiles to their correct places" msgstr "Deslize peças para seu devido lugar" @@ -112,13 +105,16 @@ "O objetivo do Taquin é mover as peças de forma que elas alcancem seus " "devidos lugares, indicados com números ou com partes de uma imagem legal." -#. Window -#: ../data/org.gnome.taquin.desktop.in.h:1 ../src/taquin-main.vala:78 -#: ../src/taquin-main.vala:138 ../src/taquin-main.vala:254 +#: ../data/org.gnome.taquin.desktop.in.h:1 ../src/taquin-main.vala:76 +#: ../src/taquin-main.vala:133 ../src/taquin-main.vala:237 msgid "Taquin" msgstr "Taquin" -#: ../data/org.gnome.taquin.desktop.in.h:3 +#: ../data/org.gnome.taquin.desktop.in.h:2 +msgid "15-puzzle" +msgstr "quebra-cabeça de 15 peças" + +#: ../data/org.gnome.taquin.desktop.in.h:4 msgid "puzzle;" msgstr "quebra-cabeça;puzzle;" @@ -163,69 +159,76 @@ msgid "true if the window is maximized." msgstr "verdadeiro se a janela está maximizada." -#: ../src/game-window.vala:134 +#: ../src/game-window.vala:128 +msgid "_Start Game" +msgstr "_Inicia jogo" + +#: ../src/game-window.vala:153 msgid "Undo your most recent move" msgstr "Desfazer seu movimento mais recente" -#: ../src/taquin-main.vala:46 +#: ../src/taquin-main.vala:45 msgid "Play the classical 1880s’ 15-puzzle" msgstr "Jogar o quebra-cabeça de 15 peças clássico" -#: ../src/taquin-main.vala:47 +#: ../src/taquin-main.vala:46 msgid "Try this fun alternative 16-puzzle" msgstr "Tente essa divertida alternativa de 16 peças" -#: ../src/taquin-main.vala:48 +#: ../src/taquin-main.vala:47 msgid "Sets the puzzle edges’ size (3-5, 2-9 for debug)" msgstr "Define o tamanho das bordas do quebra-cabeça (3-5, 2-9 para depuração)" -#: ../src/taquin-main.vala:49 +#: ../src/taquin-main.vala:48 msgid "Turn off the sound" msgstr "Desligar o som" -#: ../src/taquin-main.vala:50 +#: ../src/taquin-main.vala:49 msgid "Turn on the sound" msgstr "Ligar o som" -#: ../src/taquin-main.vala:51 +#: ../src/taquin-main.vala:50 msgid "Print release version and exit" msgstr "Exibe informação da versão e sai" -#: ../src/taquin-main.vala:250 +#: ../src/taquin-main.vala:233 msgid "(see COPYING.themes for informations)" msgstr "(veja o COPYING.themes para informações)" -#: ../src/taquin-main.vala:258 +#: ../src/taquin-main.vala:241 msgid "A classic 15-puzzle game" msgstr "Um clássico jogo de quebra-cabeça de 15 peças" -#: ../src/taquin-main.vala:262 +#: ../src/taquin-main.vala:245 msgid "translator-credits" msgstr "" "Rafael Ferreira \n" "Enrico Nicoletto " -#: ../src/taquin-main.vala:303 +#: ../src/taquin-main.vala:286 msgid "You can’t move this tile!" msgstr "Você não pode mover essa peça!" -#: ../src/taquin-main.vala:309 +#: ../src/taquin-main.vala:292 msgid "Bravo! You finished the game!" msgstr "Bravo! Você finalizou o jogo!" -#: ../src/taquin-main.vala:333 +#: ../src/taquin-main.vala:310 #, c-format msgid "Size: %d × %d ▾" msgstr "Tamanho: %d × %d ▾" -#: ../src/taquin-main.vala:347 +#: ../src/taquin-main.vala:324 msgid "Theme: Cats ▾" msgstr "Tema: Gatos ▾" -#: ../src/taquin-main.vala:348 +#: ../src/taquin-main.vala:325 msgid "Theme: Numbers ▾" msgstr "Tema: Números ▾" +#~ msgid "Start a new game as configured" +#~ msgstr "Inicia um novo jogo conforme configurado" + #~ msgid "15-Puzzle with hole" #~ msgstr "Quebra-cabeça de 15 peças com buraco" diff -Nru gnome-taquin-3.18.1.1/po/pt.po gnome-taquin-3.20.2/po/pt.po --- gnome-taquin-3.18.1.1/po/pt.po 2015-10-02 20:04:26.000000000 +0000 +++ gnome-taquin-3.20.2/po/pt.po 2016-05-09 00:10:13.000000000 +0000 @@ -2,22 +2,23 @@ # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER # This file is distributed under the same license as the PACKAGE package. # Pedro Albuquerque , 2015. +# Sérgio Cardeira , 2016. # msgid "" msgstr "" "Project-Id-Version: Taquin\n" "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=gnome-" "taquin&keywords=I18N+L10N&component=general\n" -"POT-Creation-Date: 2015-06-07 20:14+0000\n" -"PO-Revision-Date: 2015-06-27 08:29+0100\n" -"Last-Translator: Pedro Albuquerque \n" -"Language-Team: Pedro Albuquerque\n" +"POT-Creation-Date: 2016-02-20 10:32+0000\n" +"PO-Revision-Date: 2016-02-20 20:00-0100\n" +"Last-Translator: Sérgio Cardeira \n" +"Language-Team: Português <>\n" "Language: pt\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -"X-Generator: Gtranslator 2.91.6\n" +"X-Generator: Gtranslator 2.91.7\n" "X-Project-Style: gnome\n" #: ../data/taquin-menus.ui.h:1 @@ -26,7 +27,7 @@ #: ../data/taquin-menus.ui.h:2 msgid "_Help" -msgstr "A_Juda" +msgstr "A_juda" #: ../data/taquin-menus.ui.h:3 msgid "_About" @@ -56,11 +57,11 @@ msgid "Numbers" msgstr "Números" -#: ../data/taquin-screens.ui.h:6 ../data/org.gnome.taquin.desktop.in.h:4 +#: ../data/taquin-screens.ui.h:6 ../data/org.gnome.taquin.desktop.in.h:5 msgid "15-Puzzle" msgstr "Puzzle 15" -#: ../data/taquin-screens.ui.h:7 ../data/org.gnome.taquin.desktop.in.h:5 +#: ../data/taquin-screens.ui.h:7 ../data/org.gnome.taquin.desktop.in.h:6 msgid "16-Puzzle" msgstr "Puzzle 16" @@ -85,7 +86,7 @@ msgstr "GNOME Taquin" #: ../data/org.gnome.taquin.appdata.xml.in.h:2 -#: ../data/org.gnome.taquin.desktop.in.h:2 +#: ../data/org.gnome.taquin.desktop.in.h:3 msgid "Slide tiles to their correct places" msgstr "Deslize peças para os seus lugares" @@ -108,7 +109,11 @@ msgid "Taquin" msgstr "Taquin" -#: ../data/org.gnome.taquin.desktop.in.h:3 +#: ../data/org.gnome.taquin.desktop.in.h:2 +msgid "15-puzzle" +msgstr "Puzzle 15" + +#: ../data/org.gnome.taquin.desktop.in.h:4 msgid "puzzle;" msgstr "puzzle;jogo;" @@ -194,7 +199,9 @@ #: ../src/taquin-main.vala:245 msgid "translator-credits" -msgstr "Pedro Albuquerque " +msgstr "" +"Tiago S. \n" +"Pedro Albuquerque " #: ../src/taquin-main.vala:286 msgid "You can’t move this tile!" diff -Nru gnome-taquin-3.18.1.1/po/ru.po gnome-taquin-3.20.2/po/ru.po --- gnome-taquin-3.18.1.1/po/ru.po 2015-10-02 20:04:26.000000000 +0000 +++ gnome-taquin-3.20.2/po/ru.po 2016-03-24 10:46:09.000000000 +0000 @@ -3,15 +3,15 @@ # This file is distributed under the same license as the gnome-taquin package. # Иван , 2015. # Yuri Myasoedov , 2015. -# Stas Solovey , 2015. +# Stas Solovey , 2015, 2016. # msgid "" msgstr "" "Project-Id-Version: gnome-taquin master\n" "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=gnome-" "taquin&keywords=I18N+L10N&component=general\n" -"POT-Creation-Date: 2015-09-13 18:07+0000\n" -"PO-Revision-Date: 2015-09-21 00:14+0300\n" +"POT-Creation-Date: 2016-03-15 10:36+0000\n" +"PO-Revision-Date: 2016-03-15 15:42+0300\n" "Last-Translator: Stas Solovey \n" "Language-Team: Русский \n" "Language: ru\n" @@ -58,11 +58,11 @@ msgid "Numbers" msgstr "Числа" -#: ../data/taquin-screens.ui.h:6 ../data/org.gnome.taquin.desktop.in.h:4 +#: ../data/taquin-screens.ui.h:6 ../data/org.gnome.taquin.desktop.in.h:5 msgid "15-Puzzle" msgstr "Пятнашки (15-фишек)" -#: ../data/taquin-screens.ui.h:7 ../data/org.gnome.taquin.desktop.in.h:5 +#: ../data/taquin-screens.ui.h:7 ../data/org.gnome.taquin.desktop.in.h:6 msgid "16-Puzzle" msgstr "16-фишек" @@ -75,7 +75,6 @@ msgstr "_Начать заново" #: ../data/taquin.ui.h:3 -#| msgid "Start a new game" msgid "Configure a new game" msgstr "Настроить новую игру" @@ -88,7 +87,7 @@ msgstr "GNOME Taquin" #: ../data/org.gnome.taquin.appdata.xml.in.h:2 -#: ../data/org.gnome.taquin.desktop.in.h:2 +#: ../data/org.gnome.taquin.desktop.in.h:3 msgid "Slide tiles to their correct places" msgstr "Передвиньте фишки на правильные места" @@ -112,7 +111,12 @@ msgid "Taquin" msgstr "Taquin" -#: ../data/org.gnome.taquin.desktop.in.h:3 +#: ../data/org.gnome.taquin.desktop.in.h:2 +#| msgid "15-Puzzle" +msgid "15-puzzle" +msgstr "Пятнашки (15-фишек)" + +#: ../data/org.gnome.taquin.desktop.in.h:4 msgid "puzzle;" msgstr "головоломка;пятнашки;" @@ -200,7 +204,7 @@ msgid "translator-credits" msgstr "" "Ivan Komaritsyn , 2015.\n" -"Stas Solovey , 2015." +"Stas Solovey , 2015-2016." #: ../src/taquin-main.vala:286 msgid "You can’t move this tile!" diff -Nru gnome-taquin-3.18.1.1/po/sk.po gnome-taquin-3.20.2/po/sk.po --- gnome-taquin-3.18.1.1/po/sk.po 2015-10-02 20:04:26.000000000 +0000 +++ gnome-taquin-3.20.2/po/sk.po 2016-03-24 10:46:09.000000000 +0000 @@ -8,8 +8,8 @@ "Project-Id-Version: gnome-taquin master\n" "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=gnome-" "taquin&keywords=I18N+L10N&component=general\n" -"POT-Creation-Date: 2015-03-01 04:45+0000\n" -"PO-Revision-Date: 2015-03-01 11:28+0100\n" +"POT-Creation-Date: 2015-09-21 18:49+0000\n" +"PO-Revision-Date: 2016-03-01 20:52+0100\n" "Last-Translator: Dušan Kazik \n" "Language-Team: Slovak \n" "Language: sk\n" @@ -17,7 +17,7 @@ "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=3; plural=(n==1) ? 1 : (n>=2 && n<=4) ? 2 : 0;\n" -"X-Generator: Poedit 1.7.4\n" +"X-Generator: Poedit 1.8.7\n" #: ../data/taquin-menus.ui.h:1 msgid "_Sound" @@ -55,11 +55,11 @@ msgid "Numbers" msgstr "Čísla" -#: ../data/taquin-screens.ui.h:6 ../data/org.gnome.taquin.desktop.in.h:4 +#: ../data/taquin-screens.ui.h:6 ../data/org.gnome.taquin.desktop.in.h:5 msgid "15-Puzzle" msgstr "Hlavolam s 15 dielmi" -#: ../data/taquin-screens.ui.h:7 ../data/org.gnome.taquin.desktop.in.h:5 +#: ../data/taquin-screens.ui.h:7 ../data/org.gnome.taquin.desktop.in.h:6 msgid "16-Puzzle" msgstr "Hlavolam s 16 dielmi" @@ -68,23 +68,15 @@ msgstr "Prejde späť na aktuálnu hru" #: ../data/taquin.ui.h:2 -msgid "_Start Game" -msgstr "_Začať hru" - -#: ../data/taquin.ui.h:3 -msgid "Start a new game as configured" -msgstr "Začne novú hru s danými nastaveniami" - -#: ../data/taquin.ui.h:4 msgid "_Start Over" msgstr "_Začať odznovu" # tooltip -#: ../data/taquin.ui.h:5 +#: ../data/taquin.ui.h:3 msgid "Configure a new game" msgstr "Nastaví novú hru" -#: ../data/taquin.ui.h:6 +#: ../data/taquin.ui.h:4 msgid "Start a new game" msgstr "Začne novú hru" @@ -93,7 +85,7 @@ msgstr "Taquin GNOME" #: ../data/org.gnome.taquin.appdata.xml.in.h:2 -#: ../data/org.gnome.taquin.desktop.in.h:2 +#: ../data/org.gnome.taquin.desktop.in.h:3 msgid "Slide tiles to their correct places" msgstr "Posúvajte diely na ich správne miesto" @@ -112,13 +104,16 @@ "Cieľom hry Taquin je presunúť diely tak, aby bol každý na správnom mieste. " "Diely sú označené buď číslami, alebo ich tvoria časti obrázku." -#. Window -#: ../data/org.gnome.taquin.desktop.in.h:1 ../src/taquin-main.vala:78 -#: ../src/taquin-main.vala:138 ../src/taquin-main.vala:254 +#: ../data/org.gnome.taquin.desktop.in.h:1 ../src/taquin-main.vala:76 +#: ../src/taquin-main.vala:133 ../src/taquin-main.vala:237 msgid "Taquin" msgstr "Taquin" -#: ../data/org.gnome.taquin.desktop.in.h:3 +#: ../data/org.gnome.taquin.desktop.in.h:2 +msgid "15-puzzle" +msgstr "Hlavolam s 15 dielmi" + +#: ../data/org.gnome.taquin.desktop.in.h:4 msgid "puzzle;" msgstr "puzzle;hlavolam;" @@ -162,67 +157,74 @@ msgid "true if the window is maximized." msgstr "hodnota „true“ ak je okno maximalizované" -#: ../src/game-window.vala:134 +#: ../src/game-window.vala:128 +msgid "_Start Game" +msgstr "_Začať hru" + +#: ../src/game-window.vala:153 msgid "Undo your most recent move" msgstr "Vráti späť váš posledný posun" -#: ../src/taquin-main.vala:46 +#: ../src/taquin-main.vala:45 msgid "Play the classical 1880s’ 15-puzzle" msgstr "Spustí klasický hlavolam s 15 dielmi z roku 1880" -#: ../src/taquin-main.vala:47 +#: ../src/taquin-main.vala:46 msgid "Try this fun alternative 16-puzzle" msgstr "Skúsi zábavnú alternatívu hlavolamu s 16 dielmi" -#: ../src/taquin-main.vala:48 +#: ../src/taquin-main.vala:47 msgid "Sets the puzzle edges’ size (3-5, 2-9 for debug)" msgstr "Nastaví veľkosť strán hlavolamu (3-5, 2-9 pre ladenie)" -#: ../src/taquin-main.vala:49 +#: ../src/taquin-main.vala:48 msgid "Turn off the sound" msgstr "Vypne zvuk" -#: ../src/taquin-main.vala:50 +#: ../src/taquin-main.vala:49 msgid "Turn on the sound" msgstr "Zapne zvuk" -#: ../src/taquin-main.vala:51 +#: ../src/taquin-main.vala:50 msgid "Print release version and exit" msgstr "Vypíše verziu vydania a skončí" -#: ../src/taquin-main.vala:250 +#: ../src/taquin-main.vala:233 msgid "(see COPYING.themes for informations)" msgstr "(pozrite COPYING.themes pre viac informácií)" -#: ../src/taquin-main.vala:258 +#: ../src/taquin-main.vala:241 msgid "A classic 15-puzzle game" msgstr "Klasický hlavolam s 15 dielmi" -#: ../src/taquin-main.vala:262 +#: ../src/taquin-main.vala:245 msgid "translator-credits" msgstr "Dušan Kazik " -#: ../src/taquin-main.vala:303 +#: ../src/taquin-main.vala:286 msgid "You can’t move this tile!" msgstr "Nemôžete posunúť tento diel!" -#: ../src/taquin-main.vala:309 +#: ../src/taquin-main.vala:292 msgid "Bravo! You finished the game!" msgstr "Gratulujeme! Dokončili ste hru!" -#: ../src/taquin-main.vala:333 +#: ../src/taquin-main.vala:310 #, c-format msgid "Size: %d × %d ▾" msgstr "Veľkosť: %d × %d ▾" -#: ../src/taquin-main.vala:347 +#: ../src/taquin-main.vala:324 msgid "Theme: Cats ▾" msgstr "Téma: Mačky ▾" -#: ../src/taquin-main.vala:348 +#: ../src/taquin-main.vala:325 msgid "Theme: Numbers ▾" msgstr "Téma: Čísla ▾" +#~ msgid "Start a new game as configured" +#~ msgstr "Začne novú hru s danými nastaveniami" + #~ msgid "15-Puzzle with hole" #~ msgstr "Hlavolam s 15 dielmi a voľným dielom" diff -Nru gnome-taquin-3.18.1.1/po/sl.po gnome-taquin-3.20.2/po/sl.po --- gnome-taquin-3.18.1.1/po/sl.po 2015-10-02 20:04:26.000000000 +0000 +++ gnome-taquin-3.20.2/po/sl.po 2016-03-24 10:46:09.000000000 +0000 @@ -9,8 +9,8 @@ "Project-Id-Version: gnome-taquin master\n" "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=gnome-" "taquin&keywords=I18N+L10N&component=general\n" -"POT-Creation-Date: 2015-03-09 08:54+0000\n" -"PO-Revision-Date: 2015-03-22 10:07+0100\n" +"POT-Creation-Date: 2015-12-13 10:30+0000\n" +"PO-Revision-Date: 2015-12-13 20:01+0100\n" "Last-Translator: Matej Urbančič \n" "Language-Team: Slovenian \n" "Language: sl\n" @@ -19,7 +19,7 @@ "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=4; plural=(n%100==1 ? 1 : n%100==2 ? 2 : n%100==3 || n" "%100==4 ? 3 : 0);\n" -"X-Generator: Poedit 1.5.4\n" +"X-Generator: Poedit 1.7.5\n" #: ../data/taquin-menus.ui.h:1 msgid "_Sound" @@ -57,11 +57,11 @@ msgid "Numbers" msgstr "Numbers" -#: ../data/taquin-screens.ui.h:6 ../data/org.gnome.taquin.desktop.in.h:4 +#: ../data/taquin-screens.ui.h:6 ../data/org.gnome.taquin.desktop.in.h:5 msgid "15-Puzzle" msgstr "15 drsečih ploščic" -#: ../data/taquin-screens.ui.h:7 ../data/org.gnome.taquin.desktop.in.h:5 +#: ../data/taquin-screens.ui.h:7 ../data/org.gnome.taquin.desktop.in.h:6 msgid "16-Puzzle" msgstr "16 drsečih ploščic" @@ -70,22 +70,14 @@ msgstr "Skoči na začetek trenutne igre" #: ../data/taquin.ui.h:2 -msgid "_Start Game" -msgstr "_Start Game" - -#: ../data/taquin.ui.h:3 -msgid "Start a new game as configured" -msgstr "Začni novo igro kot nastavljeno" - -#: ../data/taquin.ui.h:4 msgid "_Start Over" msgstr "_Začni znova" -#: ../data/taquin.ui.h:5 +#: ../data/taquin.ui.h:3 msgid "Configure a new game" msgstr "Začni novo igro" -#: ../data/taquin.ui.h:6 +#: ../data/taquin.ui.h:4 msgid "Start a new game" msgstr "Start a new game" @@ -94,7 +86,7 @@ msgstr "Slikovna sestavljanka GNOME" #: ../data/org.gnome.taquin.appdata.xml.in.h:2 -#: ../data/org.gnome.taquin.desktop.in.h:2 +#: ../data/org.gnome.taquin.desktop.in.h:3 msgid "Slide tiles to their correct places" msgstr "Premakni ploščice na ustrezna mesta" @@ -114,12 +106,16 @@ "na prava (urejena) mesta. Ploščice so lahko označene s številkami, lahko pa " "skupaj sestavljajo sliko." -#: ../data/org.gnome.taquin.desktop.in.h:1 ../src/taquin-main.vala:78 -#: ../src/taquin-main.vala:135 ../src/taquin-main.vala:250 +#: ../data/org.gnome.taquin.desktop.in.h:1 ../src/taquin-main.vala:76 +#: ../src/taquin-main.vala:133 ../src/taquin-main.vala:237 msgid "Taquin" msgstr "Premičnica Taquin ali Igra 15" -#: ../data/org.gnome.taquin.desktop.in.h:3 +#: ../data/org.gnome.taquin.desktop.in.h:2 +msgid "15-puzzle" +msgstr "15 ugank" + +#: ../data/org.gnome.taquin.desktop.in.h:4 msgid "puzzle;" msgstr "sestavljanka;" @@ -164,67 +160,74 @@ msgid "true if the window is maximized." msgstr "prav, če je okno razpeto." -#: ../src/game-window.vala:141 +#: ../src/game-window.vala:128 +msgid "_Start Game" +msgstr "_Start Game" + +#: ../src/game-window.vala:153 msgid "Undo your most recent move" msgstr "Razveljavi zadnjo potezo" -#: ../src/taquin-main.vala:46 +#: ../src/taquin-main.vala:45 msgid "Play the classical 1880s’ 15-puzzle" msgstr "Začni klasično igro iz leta 1880 s 15 polji." -#: ../src/taquin-main.vala:47 +#: ../src/taquin-main.vala:46 msgid "Try this fun alternative 16-puzzle" msgstr "Preizkusite to drugačno sestavljanko s 16 polji." -#: ../src/taquin-main.vala:48 +#: ../src/taquin-main.vala:47 msgid "Sets the puzzle edges’ size (3-5, 2-9 for debug)" msgstr "Nastavi velikost plošče (3-5, 2-9 za razhroščevanje)" -#: ../src/taquin-main.vala:49 +#: ../src/taquin-main.vala:48 msgid "Turn off the sound" msgstr "Izklopi zvok" -#: ../src/taquin-main.vala:50 +#: ../src/taquin-main.vala:49 msgid "Turn on the sound" msgstr "Vklopi zvok" -#: ../src/taquin-main.vala:51 +#: ../src/taquin-main.vala:50 msgid "Print release version and exit" msgstr "Izpiši različico programa in končaj" -#: ../src/taquin-main.vala:246 +#: ../src/taquin-main.vala:233 msgid "(see COPYING.themes for informations)" msgstr "(za več informacij si oglejte vsebino datoteke COPYING.themes)" -#: ../src/taquin-main.vala:254 +#: ../src/taquin-main.vala:241 msgid "A classic 15-puzzle game" msgstr "Običajna sestavljanka s 15 drsečimi bloki" -#: ../src/taquin-main.vala:258 +#: ../src/taquin-main.vala:245 msgid "translator-credits" msgstr "Matej Urbančič " -#: ../src/taquin-main.vala:299 +#: ../src/taquin-main.vala:286 msgid "You can’t move this tile!" msgstr "Te ploščice ni mogoče premakniti!" -#: ../src/taquin-main.vala:305 +#: ../src/taquin-main.vala:292 msgid "Bravo! You finished the game!" msgstr "Bravo! Igra je končana!" -#: ../src/taquin-main.vala:329 +#: ../src/taquin-main.vala:310 #, c-format msgid "Size: %d × %d ▾" msgstr "Velikost: %d × %d ▾" -#: ../src/taquin-main.vala:343 +#: ../src/taquin-main.vala:324 msgid "Theme: Cats ▾" msgstr "Tema: mačke ▾" -#: ../src/taquin-main.vala:344 +#: ../src/taquin-main.vala:325 msgid "Theme: Numbers ▾" msgstr "Tema: številke ▾" +#~ msgid "Start a new game as configured" +#~ msgstr "Začni novo igro kot nastavljeno" + #, fuzzy #~ msgid "Puzzle with arrays" #~ msgstr "Odpri _del z %s" diff -Nru gnome-taquin-3.18.1.1/po/sr@latin.po gnome-taquin-3.20.2/po/sr@latin.po --- gnome-taquin-3.18.1.1/po/sr@latin.po 2015-10-02 20:04:26.000000000 +0000 +++ gnome-taquin-3.20.2/po/sr@latin.po 2016-03-24 10:46:09.000000000 +0000 @@ -1,14 +1,14 @@ # Serbian translation for gnome-taquin. -# Courtesy of Prevod.org team (http://prevod.org/) -- 2014—2015. +# Courtesy of Prevod.org team (http://prevod.org/) -- 2014—2016. # This file is distributed under the same license as the gnome-taquin package. -# Miroslav Nikolić , 2014—2015. +# Miroslav Nikolić , 2014—2016. msgid "" msgstr "" "Project-Id-Version: gnome-taquin master\n" "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=gnome-" "taquin&keywords=I18N+L10N&component=general\n" -"POT-Creation-Date: 2015-03-01 04:45+0000\n" -"PO-Revision-Date: 2015-03-05 23:05+0200\n" +"POT-Creation-Date: 2015-09-21 18:49+0000\n" +"PO-Revision-Date: 2016-02-17 21:22+0200\n" "Last-Translator: Miroslav Nikolić \n" "Language-Team: Serbian \n" "Language: sr\n" @@ -55,11 +55,11 @@ msgid "Numbers" msgstr "Brojevi" -#: ../data/taquin-screens.ui.h:6 ../data/org.gnome.taquin.desktop.in.h:4 +#: ../data/taquin-screens.ui.h:6 ../data/org.gnome.taquin.desktop.in.h:5 msgid "15-Puzzle" msgstr "15-slagalica" -#: ../data/taquin-screens.ui.h:7 ../data/org.gnome.taquin.desktop.in.h:5 +#: ../data/taquin-screens.ui.h:7 ../data/org.gnome.taquin.desktop.in.h:6 msgid "16-Puzzle" msgstr "16-slagalica" @@ -68,24 +68,14 @@ msgstr "Vratite se na tekuću igru" #: ../data/taquin.ui.h:2 -msgid "_Start Game" -msgstr "Počni _igru" - -#: ../data/taquin.ui.h:3 -#| msgid "Start a new game" -msgid "Start a new game as configured" -msgstr "Započnite novu igru kao što je podešeno" - -#: ../data/taquin.ui.h:4 msgid "_Start Over" msgstr "_Počni" -#: ../data/taquin.ui.h:5 -#| msgid "Start a new game" +#: ../data/taquin.ui.h:3 msgid "Configure a new game" msgstr "Podesite novu igru" -#: ../data/taquin.ui.h:6 +#: ../data/taquin.ui.h:4 msgid "Start a new game" msgstr "Započnite novu igru" @@ -94,7 +84,7 @@ msgstr "Gnomovo Peckalo" #: ../data/org.gnome.taquin.appdata.xml.in.h:2 -#: ../data/org.gnome.taquin.desktop.in.h:2 +#: ../data/org.gnome.taquin.desktop.in.h:3 msgid "Slide tiles to their correct places" msgstr "Dogurajte pločice na njihova odgovarajuća mesta." @@ -111,13 +101,17 @@ "Predmet Peckala je premeštanje pločica tako da stignu do svojih mesta, bilo " "naznačenih brojevima, ili delovima velike slike." -#. Window -#: ../data/org.gnome.taquin.desktop.in.h:1 ../src/taquin-main.vala:78 -#: ../src/taquin-main.vala:138 ../src/taquin-main.vala:254 +#: ../data/org.gnome.taquin.desktop.in.h:1 ../src/taquin-main.vala:76 +#: ../src/taquin-main.vala:133 ../src/taquin-main.vala:237 msgid "Taquin" msgstr "Peckalo" -#: ../data/org.gnome.taquin.desktop.in.h:3 +#: ../data/org.gnome.taquin.desktop.in.h:2 +#| msgid "15-Puzzle" +msgid "15-puzzle" +msgstr "15-slagalica" + +#: ../data/org.gnome.taquin.desktop.in.h:4 msgid "puzzle;" msgstr "slagalica;" @@ -161,70 +155,78 @@ msgid "true if the window is maximized." msgstr "štiklirano ako je prozor uvećan." -#: ../src/game-window.vala:134 +#: ../src/game-window.vala:128 +msgid "_Start Game" +msgstr "Počni _igru" + +#: ../src/game-window.vala:153 msgid "Undo your most recent move" msgstr "Poništite vaš poslednji potez" -#: ../src/taquin-main.vala:46 +#: ../src/taquin-main.vala:45 msgid "Play the classical 1880s’ 15-puzzle" msgstr "Igrajte klasičnu igru 15-slagalica iz 1880." -#: ../src/taquin-main.vala:47 +#: ../src/taquin-main.vala:46 msgid "Try this fun alternative 16-puzzle" msgstr "Probajte ovu zabavnu zamenu 16-slagalica" -#: ../src/taquin-main.vala:48 +#: ../src/taquin-main.vala:47 msgid "Sets the puzzle edges’ size (3-5, 2-9 for debug)" msgstr "Podesite veličinu ivica slagalice (3-5, 2-9 je samo za pročišćavanje)" -#: ../src/taquin-main.vala:49 +#: ../src/taquin-main.vala:48 msgid "Turn off the sound" msgstr "Isključuje zvuk" -#: ../src/taquin-main.vala:50 +#: ../src/taquin-main.vala:49 msgid "Turn on the sound" msgstr "Uključuje zvuk" -#: ../src/taquin-main.vala:51 +#: ../src/taquin-main.vala:50 msgid "Print release version and exit" msgstr "Ispisuje broj izdanja i izlazi" -#: ../src/taquin-main.vala:250 +#: ../src/taquin-main.vala:233 msgid "(see COPYING.themes for informations)" msgstr "(za podatke pogledajte „COPYING.themes“)" -#: ../src/taquin-main.vala:258 +#: ../src/taquin-main.vala:241 msgid "A classic 15-puzzle game" msgstr "Klasična igra 15-slagalica" -#: ../src/taquin-main.vala:262 +#: ../src/taquin-main.vala:245 msgid "translator-credits" msgstr "" " Miroslav Nikolić \n" "\n" "http://prevod.org — prevod na srpski jezik" -#: ../src/taquin-main.vala:303 +#: ../src/taquin-main.vala:286 msgid "You can’t move this tile!" msgstr "Ne možete da pomerite ovu pločicu!" -#: ../src/taquin-main.vala:309 +#: ../src/taquin-main.vala:292 msgid "Bravo! You finished the game!" msgstr "Odlično! Završili ste igru!" -#: ../src/taquin-main.vala:333 +#: ../src/taquin-main.vala:310 #, c-format msgid "Size: %d × %d ▾" msgstr "Veličina: %d × %d ▾" -#: ../src/taquin-main.vala:347 +#: ../src/taquin-main.vala:324 msgid "Theme: Cats ▾" msgstr "Tema: Mačke ▾" -#: ../src/taquin-main.vala:348 +#: ../src/taquin-main.vala:325 msgid "Theme: Numbers ▾" msgstr "Tema: Brojevi ▾" +#~| msgid "Start a new game" +#~ msgid "Start a new game as configured" +#~ msgstr "Započnite novu igru kao što je podešeno" + #~ msgid "15-Puzzle with hole" #~ msgstr "15-slagalica sa prazninom" diff -Nru gnome-taquin-3.18.1.1/po/sr.po gnome-taquin-3.20.2/po/sr.po --- gnome-taquin-3.18.1.1/po/sr.po 2015-10-02 20:04:26.000000000 +0000 +++ gnome-taquin-3.20.2/po/sr.po 2016-03-24 10:46:09.000000000 +0000 @@ -1,14 +1,14 @@ # Serbian translation for gnome-taquin. -# Courtesy of Prevod.org team (http://prevod.org/) -- 2014—2015. +# Courtesy of Prevod.org team (http://prevod.org/) -- 2014—2016. # This file is distributed under the same license as the gnome-taquin package. -# Мирослав Николић , 2014—2015. +# Мирослав Николић , 2014—2016. msgid "" msgstr "" "Project-Id-Version: gnome-taquin master\n" "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=gnome-" "taquin&keywords=I18N+L10N&component=general\n" -"POT-Creation-Date: 2015-03-01 04:45+0000\n" -"PO-Revision-Date: 2015-03-05 23:05+0200\n" +"POT-Creation-Date: 2015-09-21 18:49+0000\n" +"PO-Revision-Date: 2016-02-17 21:22+0200\n" "Last-Translator: Мирослав Николић \n" "Language-Team: Serbian \n" "Language: sr\n" @@ -55,11 +55,11 @@ msgid "Numbers" msgstr "Бројеви" -#: ../data/taquin-screens.ui.h:6 ../data/org.gnome.taquin.desktop.in.h:4 +#: ../data/taquin-screens.ui.h:6 ../data/org.gnome.taquin.desktop.in.h:5 msgid "15-Puzzle" msgstr "15-слагалица" -#: ../data/taquin-screens.ui.h:7 ../data/org.gnome.taquin.desktop.in.h:5 +#: ../data/taquin-screens.ui.h:7 ../data/org.gnome.taquin.desktop.in.h:6 msgid "16-Puzzle" msgstr "16-слагалица" @@ -68,24 +68,14 @@ msgstr "Вратите се на текућу игру" #: ../data/taquin.ui.h:2 -msgid "_Start Game" -msgstr "Почни _игру" - -#: ../data/taquin.ui.h:3 -#| msgid "Start a new game" -msgid "Start a new game as configured" -msgstr "Започните нову игру као што је подешено" - -#: ../data/taquin.ui.h:4 msgid "_Start Over" msgstr "_Почни" -#: ../data/taquin.ui.h:5 -#| msgid "Start a new game" +#: ../data/taquin.ui.h:3 msgid "Configure a new game" msgstr "Подесите нову игру" -#: ../data/taquin.ui.h:6 +#: ../data/taquin.ui.h:4 msgid "Start a new game" msgstr "Започните нову игру" @@ -94,7 +84,7 @@ msgstr "Гномово Пецкало" #: ../data/org.gnome.taquin.appdata.xml.in.h:2 -#: ../data/org.gnome.taquin.desktop.in.h:2 +#: ../data/org.gnome.taquin.desktop.in.h:3 msgid "Slide tiles to their correct places" msgstr "Догурајте плочице на њихова одговарајућа места." @@ -111,13 +101,17 @@ "Предмет Пецкала је премештање плочица тако да стигну до својих места, било " "назначених бројевима, или деловима велике слике." -#. Window -#: ../data/org.gnome.taquin.desktop.in.h:1 ../src/taquin-main.vala:78 -#: ../src/taquin-main.vala:138 ../src/taquin-main.vala:254 +#: ../data/org.gnome.taquin.desktop.in.h:1 ../src/taquin-main.vala:76 +#: ../src/taquin-main.vala:133 ../src/taquin-main.vala:237 msgid "Taquin" msgstr "Пецкало" -#: ../data/org.gnome.taquin.desktop.in.h:3 +#: ../data/org.gnome.taquin.desktop.in.h:2 +#| msgid "15-Puzzle" +msgid "15-puzzle" +msgstr "15-слагалица" + +#: ../data/org.gnome.taquin.desktop.in.h:4 msgid "puzzle;" msgstr "слагалица;" @@ -161,70 +155,78 @@ msgid "true if the window is maximized." msgstr "штиклирано ако је прозор увећан." -#: ../src/game-window.vala:134 +#: ../src/game-window.vala:128 +msgid "_Start Game" +msgstr "Почни _игру" + +#: ../src/game-window.vala:153 msgid "Undo your most recent move" msgstr "Поништите ваш последњи потез" -#: ../src/taquin-main.vala:46 +#: ../src/taquin-main.vala:45 msgid "Play the classical 1880s’ 15-puzzle" msgstr "Играјте класичну игру 15-слагалица из 1880." -#: ../src/taquin-main.vala:47 +#: ../src/taquin-main.vala:46 msgid "Try this fun alternative 16-puzzle" msgstr "Пробајте ову забавну замену 16-слагалица" -#: ../src/taquin-main.vala:48 +#: ../src/taquin-main.vala:47 msgid "Sets the puzzle edges’ size (3-5, 2-9 for debug)" msgstr "Подесите величину ивица слагалице (3-5, 2-9 је само за прочишћавање)" -#: ../src/taquin-main.vala:49 +#: ../src/taquin-main.vala:48 msgid "Turn off the sound" msgstr "Искључује звук" -#: ../src/taquin-main.vala:50 +#: ../src/taquin-main.vala:49 msgid "Turn on the sound" msgstr "Укључује звук" -#: ../src/taquin-main.vala:51 +#: ../src/taquin-main.vala:50 msgid "Print release version and exit" msgstr "Исписује број издања и излази" -#: ../src/taquin-main.vala:250 +#: ../src/taquin-main.vala:233 msgid "(see COPYING.themes for informations)" msgstr "(за податке погледајте „COPYING.themes“)" -#: ../src/taquin-main.vala:258 +#: ../src/taquin-main.vala:241 msgid "A classic 15-puzzle game" msgstr "Класична игра 15-слагалица" -#: ../src/taquin-main.vala:262 +#: ../src/taquin-main.vala:245 msgid "translator-credits" msgstr "" " Мирослав Николић \n" "\n" "http://prevod.org — превод на српски језик" -#: ../src/taquin-main.vala:303 +#: ../src/taquin-main.vala:286 msgid "You can’t move this tile!" msgstr "Не можете да померите ову плочицу!" -#: ../src/taquin-main.vala:309 +#: ../src/taquin-main.vala:292 msgid "Bravo! You finished the game!" msgstr "Одлично! Завршили сте игру!" -#: ../src/taquin-main.vala:333 +#: ../src/taquin-main.vala:310 #, c-format msgid "Size: %d × %d ▾" msgstr "Величина: %d × %d ▾" -#: ../src/taquin-main.vala:347 +#: ../src/taquin-main.vala:324 msgid "Theme: Cats ▾" msgstr "Тема: Мачке ▾" -#: ../src/taquin-main.vala:348 +#: ../src/taquin-main.vala:325 msgid "Theme: Numbers ▾" msgstr "Тема: Бројеви ▾" +#~| msgid "Start a new game" +#~ msgid "Start a new game as configured" +#~ msgstr "Започните нову игру као што је подешено" + #~ msgid "15-Puzzle with hole" #~ msgstr "15-слагалица са празнином" diff -Nru gnome-taquin-3.18.1.1/po/sv.po gnome-taquin-3.20.2/po/sv.po --- gnome-taquin-3.18.1.1/po/sv.po 2015-10-02 20:04:26.000000000 +0000 +++ gnome-taquin-3.20.2/po/sv.po 2016-03-24 10:46:09.000000000 +0000 @@ -8,8 +8,8 @@ "Project-Id-Version: gnome-taquin master\n" "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=gnome-" "taquin&keywords=I18N+L10N&component=general\n" -"POT-Creation-Date: 2015-03-03 20:33+0000\n" -"PO-Revision-Date: 2015-03-08 22:05+0100\n" +"POT-Creation-Date: 2015-09-21 18:49+0000\n" +"PO-Revision-Date: 2015-11-02 13:23+0100\n" "Last-Translator: Anders Jonsson \n" "Language-Team: Swedish \n" "Language: sv\n" @@ -17,7 +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.7.3\n" +"X-Generator: Poedit 1.8.6\n" #: ../data/taquin-menus.ui.h:1 msgid "_Sound" @@ -55,11 +55,11 @@ msgid "Numbers" msgstr "Siffror" -#: ../data/taquin-screens.ui.h:6 ../data/org.gnome.taquin.desktop.in.h:4 +#: ../data/taquin-screens.ui.h:6 ../data/org.gnome.taquin.desktop.in.h:5 msgid "15-Puzzle" msgstr "15-pussel" -#: ../data/taquin-screens.ui.h:7 ../data/org.gnome.taquin.desktop.in.h:5 +#: ../data/taquin-screens.ui.h:7 ../data/org.gnome.taquin.desktop.in.h:6 msgid "16-Puzzle" msgstr "16-pussel" @@ -68,22 +68,14 @@ msgstr "Gå tillbaka till aktuellt spel" #: ../data/taquin.ui.h:2 -msgid "_Start Game" -msgstr "_Starta spel" - -#: ../data/taquin.ui.h:3 -msgid "Start a new game as configured" -msgstr "Starta ett nytt spel enligt konfiguration" - -#: ../data/taquin.ui.h:4 msgid "_Start Over" msgstr "_Börja om" -#: ../data/taquin.ui.h:5 +#: ../data/taquin.ui.h:3 msgid "Configure a new game" msgstr "Konfigurera ett nytt spel" -#: ../data/taquin.ui.h:6 +#: ../data/taquin.ui.h:4 msgid "Start a new game" msgstr "Starta ett nytt spel" @@ -92,7 +84,7 @@ msgstr "GNOME Taquin" #: ../data/org.gnome.taquin.appdata.xml.in.h:2 -#: ../data/org.gnome.taquin.desktop.in.h:2 +#: ../data/org.gnome.taquin.desktop.in.h:3 msgid "Slide tiles to their correct places" msgstr "Dra brickor till deras rätta platser" @@ -109,12 +101,16 @@ "Målet i Taquin är att flytta brickor så att de når sina platser, vilka " "antingen markeras med siffror eller med delar av en stor bild." -#: ../data/org.gnome.taquin.desktop.in.h:1 ../src/taquin-main.vala:78 -#: ../src/taquin-main.vala:135 ../src/taquin-main.vala:250 +#: ../data/org.gnome.taquin.desktop.in.h:1 ../src/taquin-main.vala:76 +#: ../src/taquin-main.vala:133 ../src/taquin-main.vala:237 msgid "Taquin" msgstr "Taquin" -#: ../data/org.gnome.taquin.desktop.in.h:3 +#: ../data/org.gnome.taquin.desktop.in.h:2 +msgid "15-puzzle" +msgstr "15-pussel" + +#: ../data/org.gnome.taquin.desktop.in.h:4 msgid "puzzle;" msgstr "pussel;" @@ -158,43 +154,47 @@ msgid "true if the window is maximized." msgstr "true (sant) om fönstret är maximerat." -#: ../src/game-window.vala:141 +#: ../src/game-window.vala:128 +msgid "_Start Game" +msgstr "_Starta spel" + +#: ../src/game-window.vala:153 msgid "Undo your most recent move" msgstr "Ångra ditt senaste drag" -#: ../src/taquin-main.vala:46 +#: ../src/taquin-main.vala:45 msgid "Play the classical 1880s’ 15-puzzle" msgstr "Spela det klassiska 15-pusslet från 1880-talet" -#: ../src/taquin-main.vala:47 +#: ../src/taquin-main.vala:46 msgid "Try this fun alternative 16-puzzle" msgstr "Pröva detta roliga alternativa 16-pussel" -#: ../src/taquin-main.vala:48 +#: ../src/taquin-main.vala:47 msgid "Sets the puzzle edges’ size (3-5, 2-9 for debug)" msgstr "Ställer in kantstorlek på pusslet (3-5, 2-9 för felsökning)" -#: ../src/taquin-main.vala:49 +#: ../src/taquin-main.vala:48 msgid "Turn off the sound" msgstr "Slå av ljudet" -#: ../src/taquin-main.vala:50 +#: ../src/taquin-main.vala:49 msgid "Turn on the sound" msgstr "Slå på ljudet" -#: ../src/taquin-main.vala:51 +#: ../src/taquin-main.vala:50 msgid "Print release version and exit" msgstr "Visa utgåvans version och avsluta" -#: ../src/taquin-main.vala:246 +#: ../src/taquin-main.vala:233 msgid "(see COPYING.themes for informations)" msgstr "(se COPYING.themes för information)" -#: ../src/taquin-main.vala:254 +#: ../src/taquin-main.vala:241 msgid "A classic 15-puzzle game" msgstr "Ett klassiskt 15-pusselspel" -#: ../src/taquin-main.vala:258 +#: ../src/taquin-main.vala:245 msgid "translator-credits" msgstr "" "Anders Jonsson \n" @@ -202,27 +202,30 @@ "Skicka synpunkter på översättningen till\n" "." -#: ../src/taquin-main.vala:299 +#: ../src/taquin-main.vala:286 msgid "You can’t move this tile!" msgstr "Du kan inte flytta den här brickan!" -#: ../src/taquin-main.vala:305 +#: ../src/taquin-main.vala:292 msgid "Bravo! You finished the game!" msgstr "Bravo! Du har klarat spelet!" -#: ../src/taquin-main.vala:329 +#: ../src/taquin-main.vala:310 #, c-format msgid "Size: %d × %d ▾" msgstr "Storlek: %d × %d ▾" -#: ../src/taquin-main.vala:343 +#: ../src/taquin-main.vala:324 msgid "Theme: Cats ▾" msgstr "Tema: Katter ▾" -#: ../src/taquin-main.vala:344 +#: ../src/taquin-main.vala:325 msgid "Theme: Numbers ▾" msgstr "Tema: Siffror ▾" +#~ msgid "Start a new game as configured" +#~ msgstr "Starta ett nytt spel enligt konfiguration" + #~ msgid "15-Puzzle with hole" #~ msgstr "15-pussel med hål" diff -Nru gnome-taquin-3.18.1.1/po/uk.po gnome-taquin-3.20.2/po/uk.po --- gnome-taquin-3.18.1.1/po/uk.po 2015-10-02 20:04:26.000000000 +0000 +++ gnome-taquin-3.20.2/po/uk.po 2016-03-24 10:46:09.000000000 +0000 @@ -1,22 +1,21 @@ # Ukrainian translation for gnome-taquin. # Copyright (C) 2015 gnome-taquin's COPYRIGHT HOLDER # This file is distributed under the same license as the gnome-taquin package. -# Daniel Korostil , 2015. +# Daniel Korostil , 2015, 2016. msgid "" msgstr "" "Project-Id-Version: gnome-taquin master\n" -"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=gnome-" -"taquin&keywords=I18N+L10N&component=general\n" -"POT-Creation-Date: 2015-03-03 08:51+0000\n" -"PO-Revision-Date: 2015-03-18 19:43+0300\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2016-03-06 20:45+0200\n" +"PO-Revision-Date: 2016-03-06 20:46+0300\n" "Last-Translator: Daniel Korostil \n" "Language-Team: linux.org.ua\n" "Language: uk\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%" -"10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n" +"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && " +"n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n" "X-Generator: Virtaal 0.7.1\n" "X-Project-Style: gnome\n" @@ -56,11 +55,11 @@ msgid "Numbers" msgstr "Кількість" -#: ../data/taquin-screens.ui.h:6 ../data/org.gnome.taquin.desktop.in.h:4 +#: ../data/taquin-screens.ui.h:6 ../data/org.gnome.taquin.desktop.in.h:5 msgid "15-Puzzle" msgstr "15" -#: ../data/taquin-screens.ui.h:7 ../data/org.gnome.taquin.desktop.in.h:5 +#: ../data/taquin-screens.ui.h:7 ../data/org.gnome.taquin.desktop.in.h:6 msgid "16-Puzzle" msgstr "16" @@ -69,22 +68,14 @@ msgstr "Повернутись до поточної гри" #: ../data/taquin.ui.h:2 -msgid "_Start Game" -msgstr "_Почати гру" - -#: ../data/taquin.ui.h:3 -msgid "Start a new game as configured" -msgstr "Почати нову гру як налаштовано" - -#: ../data/taquin.ui.h:4 msgid "_Start Over" msgstr "_Почати знову" -#: ../data/taquin.ui.h:5 +#: ../data/taquin.ui.h:3 msgid "Configure a new game" msgstr "Налаштувати нову гру" -#: ../data/taquin.ui.h:6 +#: ../data/taquin.ui.h:4 msgid "Start a new game" msgstr "Розпочати нову гру" @@ -93,7 +84,7 @@ msgstr "Дратун GNOME" #: ../data/org.gnome.taquin.appdata.xml.in.h:2 -#: ../data/org.gnome.taquin.desktop.in.h:2 +#: ../data/org.gnome.taquin.desktop.in.h:3 msgid "Slide tiles to their correct places" msgstr "Перетягніть плиточки на їхні місця" @@ -110,13 +101,16 @@ "Ціль Дратуна — розставити мозаїки на свої місця, вони позначені числами або " "частинами великого малюнка." -#. Window -#: ../data/org.gnome.taquin.desktop.in.h:1 ../src/taquin-main.vala:78 -#: ../src/taquin-main.vala:138 ../src/taquin-main.vala:253 +#: ../data/org.gnome.taquin.desktop.in.h:1 ../src/taquin-main.vala:76 +#: ../src/taquin-main.vala:133 ../src/taquin-main.vala:237 msgid "Taquin" msgstr "Дратун" -#: ../data/org.gnome.taquin.desktop.in.h:3 +#: ../data/org.gnome.taquin.desktop.in.h:2 +msgid "15-puzzle" +msgstr "15" + +#: ../data/org.gnome.taquin.desktop.in.h:4 msgid "puzzle;" msgstr "головоломка;" @@ -160,63 +154,70 @@ msgid "true if the window is maximized." msgstr "вказано, коли вікно розгорнуто." -#: ../src/game-window.vala:134 +#: ../src/game-window.vala:128 +msgid "_Start Game" +msgstr "_Почати гру" + +#: ../src/game-window.vala:153 msgid "Undo your most recent move" msgstr "Повернути ваш останній хід" -#: ../src/taquin-main.vala:46 +#: ../src/taquin-main.vala:45 msgid "Play the classical 1880s’ 15-puzzle" msgstr "Зіграти класичну п'ятнадцятку з 1880-тих" -#: ../src/taquin-main.vala:47 +#: ../src/taquin-main.vala:46 msgid "Try this fun alternative 16-puzzle" msgstr "Спробувати альтернативну шістнадцятку" -#: ../src/taquin-main.vala:48 +#: ../src/taquin-main.vala:47 msgid "Sets the puzzle edges’ size (3-5, 2-9 for debug)" msgstr "Вказати розмір країв (3-5, 2-9 для тестування)" -#: ../src/taquin-main.vala:49 +#: ../src/taquin-main.vala:48 msgid "Turn off the sound" msgstr "Вимкнути звук" -#: ../src/taquin-main.vala:50 +#: ../src/taquin-main.vala:49 msgid "Turn on the sound" msgstr "Увімкнути звук" -#: ../src/taquin-main.vala:51 +#: ../src/taquin-main.vala:50 msgid "Print release version and exit" msgstr "Показати версію випуску та вийти" -#: ../src/taquin-main.vala:249 +#: ../src/taquin-main.vala:233 msgid "(see COPYING.themes for informations)" msgstr "(докладніше дивіться у COPYING.themes)" -#: ../src/taquin-main.vala:257 +#: ../src/taquin-main.vala:241 msgid "A classic 15-puzzle game" msgstr "Класична п'ятнадцятка" -#: ../src/taquin-main.vala:261 +#: ../src/taquin-main.vala:245 msgid "translator-credits" msgstr "Daniel Korostil " -#: ../src/taquin-main.vala:302 +#: ../src/taquin-main.vala:286 msgid "You can’t move this tile!" msgstr "Ви не можете пересунути цю плиточку!" -#: ../src/taquin-main.vala:308 +#: ../src/taquin-main.vala:292 msgid "Bravo! You finished the game!" msgstr "Браво! Ви завершили гру!" -#: ../src/taquin-main.vala:332 +#: ../src/taquin-main.vala:310 #, c-format msgid "Size: %d × %d ▾" msgstr "Розмір: %d × %d ▾" -#: ../src/taquin-main.vala:346 +#: ../src/taquin-main.vala:324 msgid "Theme: Cats ▾" msgstr "Тема: котики ▾" -#: ../src/taquin-main.vala:347 +#: ../src/taquin-main.vala:325 msgid "Theme: Numbers ▾" msgstr "Тема: числа ▾" + +#~ msgid "Start a new game as configured" +#~ msgstr "Почати нову гру як налаштовано" diff -Nru gnome-taquin-3.18.1.1/po/vi.po gnome-taquin-3.20.2/po/vi.po --- gnome-taquin-3.18.1.1/po/vi.po 2015-10-15 03:50:44.000000000 +0000 +++ gnome-taquin-3.20.2/po/vi.po 2016-03-24 10:46:09.000000000 +0000 @@ -6,11 +6,11 @@ # msgid "" msgstr "" -"Project-Id-Version: gnome-taquin GNOME-3-18\n" +"Project-Id-Version: gnome-taquin gnome-master\n" "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=gnome-" "taquin&keywords=I18N+L10N&component=general\n" "POT-Creation-Date: 2015-09-26 21:06+0000\n" -"PO-Revision-Date: 2015-09-27 08:00+0700\n" +"PO-Revision-Date: 2015-09-27 07:55+0700\n" "Last-Translator: Trần Ngọc Quân \n" "Language-Team: Vietnamese \n" "Language: vi\n" @@ -56,11 +56,11 @@ msgid "Numbers" msgstr "Con số" -#: ../data/taquin-screens.ui.h:6 ../data/org.gnome.taquin.desktop.in.h:4 +#: ../data/taquin-screens.ui.h:6 ../data/org.gnome.taquin.desktop.in.h:5 msgid "15-Puzzle" msgstr "15-Puzzle" -#: ../data/taquin-screens.ui.h:7 ../data/org.gnome.taquin.desktop.in.h:5 +#: ../data/taquin-screens.ui.h:7 ../data/org.gnome.taquin.desktop.in.h:6 msgid "16-Puzzle" msgstr "16-Puzzle" @@ -85,7 +85,7 @@ msgstr "Xếp hình GNOME" #: ../data/org.gnome.taquin.appdata.xml.in.h:2 -#: ../data/org.gnome.taquin.desktop.in.h:2 +#: ../data/org.gnome.taquin.desktop.in.h:3 msgid "Slide tiles to their correct places" msgstr "Di chuyển các miếng ghép vào đúng chỗ dành cho nó" @@ -110,7 +110,11 @@ msgid "Taquin" msgstr "Xếp hình" -#: ../data/org.gnome.taquin.desktop.in.h:3 +#: ../data/org.gnome.taquin.desktop.in.h:2 +msgid "15-puzzle" +msgstr "15-puzzle" + +#: ../data/org.gnome.taquin.desktop.in.h:4 msgid "puzzle;" msgstr "puzzle;ghép;ghep;xếp;hình;xep;hinh;" @@ -219,8 +223,5 @@ msgid "Theme: Numbers ▾" msgstr "Chủ đề: Con số ▾" -#~ msgid "15-puzzle" -#~ msgstr "15-puzzle" - #~ msgid "Start a new game as configured" #~ msgstr "Bắt đầu ván chơi đã cấu hình mới" diff -Nru gnome-taquin-3.18.1.1/po/zh_TW.po gnome-taquin-3.20.2/po/zh_TW.po --- gnome-taquin-3.18.1.1/po/zh_TW.po 2015-10-02 20:04:26.000000000 +0000 +++ gnome-taquin-3.20.2/po/zh_TW.po 2016-03-24 10:46:09.000000000 +0000 @@ -8,15 +8,15 @@ "Project-Id-Version: gnome-taquin master\n" "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=gnome-" "taquin&keywords=I18N+L10N&component=general\n" -"POT-Creation-Date: 2015-03-01 04:45+0000\n" -"PO-Revision-Date: 2015-03-17 20:56+0800\n" +"POT-Creation-Date: 2015-09-21 18:49+0000\n" +"PO-Revision-Date: 2016-02-13 08:37+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.7.4\n" +"X-Generator: Poedit 1.8.6\n" #: ../data/taquin-menus.ui.h:1 msgid "_Sound" @@ -54,11 +54,11 @@ msgid "Numbers" msgstr "數字" -#: ../data/taquin-screens.ui.h:6 ../data/org.gnome.taquin.desktop.in.h:4 +#: ../data/taquin-screens.ui.h:6 ../data/org.gnome.taquin.desktop.in.h:5 msgid "15-Puzzle" msgstr "15 塊" -#: ../data/taquin-screens.ui.h:7 ../data/org.gnome.taquin.desktop.in.h:5 +#: ../data/taquin-screens.ui.h:7 ../data/org.gnome.taquin.desktop.in.h:6 msgid "16-Puzzle" msgstr "16 塊" @@ -67,22 +67,14 @@ msgstr "回到目前的遊戲" #: ../data/taquin.ui.h:2 -msgid "_Start Game" -msgstr "開始遊戲(_S)" - -#: ../data/taquin.ui.h:3 -msgid "Start a new game as configured" -msgstr "開始設定好的另一局遊戲" - -#: ../data/taquin.ui.h:4 msgid "_Start Over" msgstr "重新開始(_S)" -#: ../data/taquin.ui.h:5 +#: ../data/taquin.ui.h:3 msgid "Configure a new game" msgstr "設定新的遊戲" -#: ../data/taquin.ui.h:6 +#: ../data/taquin.ui.h:4 msgid "Start a new game" msgstr "開始另一局遊戲" @@ -91,7 +83,7 @@ msgstr "GNOME Taquin" #: ../data/org.gnome.taquin.appdata.xml.in.h:2 -#: ../data/org.gnome.taquin.desktop.in.h:2 +#: ../data/org.gnome.taquin.desktop.in.h:3 msgid "Slide tiles to their correct places" msgstr "將棋子滑到他們正確的位置上" @@ -108,13 +100,16 @@ "Taquin 的目標是將棋子移動以讓它們到達自己的位置，可能是數字的順序，或是組成" "一幅大型影像。" -#. Window -#: ../data/org.gnome.taquin.desktop.in.h:1 ../src/taquin-main.vala:78 -#: ../src/taquin-main.vala:138 ../src/taquin-main.vala:254 +#: ../data/org.gnome.taquin.desktop.in.h:1 ../src/taquin-main.vala:76 +#: ../src/taquin-main.vala:133 ../src/taquin-main.vala:237 msgid "Taquin" msgstr "Taquin" -#: ../data/org.gnome.taquin.desktop.in.h:3 +#: ../data/org.gnome.taquin.desktop.in.h:2 +msgid "15-puzzle" +msgstr "15 塊" + +#: ../data/org.gnome.taquin.desktop.in.h:4 msgid "puzzle;" msgstr "puzzle;益智遊戲;" @@ -158,63 +153,70 @@ msgid "true if the window is maximized." msgstr "如果視窗為最大化則設定為‘TRUE’" -#: ../src/game-window.vala:134 +#: ../src/game-window.vala:128 +msgid "_Start Game" +msgstr "開始遊戲(_S)" + +#: ../src/game-window.vala:153 msgid "Undo your most recent move" msgstr "恢復您最後一步棋" -#: ../src/taquin-main.vala:46 +#: ../src/taquin-main.vala:45 msgid "Play the classical 1880s’ 15-puzzle" msgstr "玩經典的 1880 15 塊棋局" -#: ../src/taquin-main.vala:47 +#: ../src/taquin-main.vala:46 msgid "Try this fun alternative 16-puzzle" msgstr "試試這個替代的 16 塊棋局" -#: ../src/taquin-main.vala:48 +#: ../src/taquin-main.vala:47 msgid "Sets the puzzle edges’ size (3-5, 2-9 for debug)" msgstr "設定棋局邊緣大小 (3-5, 2-9 用於除錯)" -#: ../src/taquin-main.vala:49 +#: ../src/taquin-main.vala:48 msgid "Turn off the sound" msgstr "關閉音效" -#: ../src/taquin-main.vala:50 +#: ../src/taquin-main.vala:49 msgid "Turn on the sound" msgstr "開啟音效" -#: ../src/taquin-main.vala:51 +#: ../src/taquin-main.vala:50 msgid "Print release version and exit" msgstr "顯示釋出版本並離開" -#: ../src/taquin-main.vala:250 +#: ../src/taquin-main.vala:233 msgid "(see COPYING.themes for informations)" msgstr "(請查閱 COPYING.themes 資訊)" -#: ../src/taquin-main.vala:258 +#: ../src/taquin-main.vala:241 msgid "A classic 15-puzzle game" msgstr "經典 15 塊棋局" -#: ../src/taquin-main.vala:262 +#: ../src/taquin-main.vala:245 msgid "translator-credits" msgstr "Chao-Hsiung Liao , 2015" -#: ../src/taquin-main.vala:303 +#: ../src/taquin-main.vala:286 msgid "You can’t move this tile!" msgstr "您不能移動這片棋子！" -#: ../src/taquin-main.vala:309 +#: ../src/taquin-main.vala:292 msgid "Bravo! You finished the game!" msgstr "太棒了！您完成了這個遊戲！" -#: ../src/taquin-main.vala:333 +#: ../src/taquin-main.vala:310 #, c-format msgid "Size: %d × %d ▾" msgstr "大小：%d x %d" -#: ../src/taquin-main.vala:347 +#: ../src/taquin-main.vala:324 msgid "Theme: Cats ▾" msgstr "布景主題：貓 ▾" -#: ../src/taquin-main.vala:348 +#: ../src/taquin-main.vala:325 msgid "Theme: Numbers ▾" msgstr "布景主題：數字 ▾" + +#~ msgid "Start a new game as configured" +#~ msgstr "開始設定好的另一局遊戲" diff -Nru gnome-taquin-3.18.1.1/src/game-window.c gnome-taquin-3.20.2/src/game-window.c --- gnome-taquin-3.18.1.1/src/game-window.c 2015-10-15 03:55:25.000000000 +0000 +++ gnome-taquin-3.20.2/src/game-window.c 2016-05-09 00:14:14.000000000 +0000 @@ -1,9 +1,9 @@ -/* game-window.c generated by valac 0.30.0.3-b11d, the Vala compiler +/* game-window.c generated by valac 0.32.0.13-d82f, the Vala compiler * generated from game-window.vala, do not modify */ /* -*- Mode: vala; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- * - * Copyright (C) 2015 Arnaud Bonatti + * Copyright (C) 2015-2016 Arnaud Bonatti * * This file is part of a GNOME game. * @@ -29,7 +29,6 @@ #include #include #include -#include #define TYPE_GAME_WINDOW_FLAGS (game_window_flags_get_type ()) @@ -106,7 +105,7 @@ static void _game_window_hint_cb_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self); GameWindow* game_window_new (const gchar* css_resource, const gchar* name, gint width, gint height, gboolean maximized, gboolean start_now, GameWindowFlags flags, GtkBox* new_game_screen, GtkWidget* _view); GameWindow* game_window_construct (GType object_type, const gchar* css_resource, const gchar* name, gint width, gint height, gboolean maximized, gboolean start_now, GameWindowFlags flags, GtkBox* new_game_screen, GtkWidget* _view); -static void game_window_size_allocate_cb (GameWindow* self, GtkAllocation* allocation); +static void game_window_size_allocate_cb (GameWindow* self); static void _game_window_size_allocate_cb_gtk_widget_size_allocate (GtkWidget* _sender, GtkAllocation* allocation, gpointer self); static gboolean game_window_window_state_event_cb (GameWindow* self, GdkEventWindowState* event); static gboolean _game_window_window_state_event_cb_gtk_widget_window_state_event (GtkWidget* _sender, GdkEventWindowState* event, gpointer self); @@ -136,56 +135,56 @@ static void _game_window_new_game_cb_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self) { #line 75 "/run/media/triton/Guerre/jhbuild/jhbuild/gnome-taquin/src/game-window.vala" game_window_new_game_cb ((GameWindow*) self); -#line 140 "game-window.c" +#line 139 "game-window.c" } static void _game_window_start_game_cb_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self) { #line 75 "/run/media/triton/Guerre/jhbuild/jhbuild/gnome-taquin/src/game-window.vala" game_window_start_game_cb ((GameWindow*) self); -#line 147 "game-window.c" +#line 146 "game-window.c" } static void _game_window_back_cb_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self) { #line 75 "/run/media/triton/Guerre/jhbuild/jhbuild/gnome-taquin/src/game-window.vala" game_window_back_cb ((GameWindow*) self); -#line 154 "game-window.c" +#line 153 "game-window.c" } static void _game_window_undo_cb_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self) { #line 75 "/run/media/triton/Guerre/jhbuild/jhbuild/gnome-taquin/src/game-window.vala" game_window_undo_cb ((GameWindow*) self); -#line 161 "game-window.c" +#line 160 "game-window.c" } static void _game_window_redo_cb_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self) { #line 75 "/run/media/triton/Guerre/jhbuild/jhbuild/gnome-taquin/src/game-window.vala" game_window_redo_cb ((GameWindow*) self); -#line 168 "game-window.c" +#line 167 "game-window.c" } static void _game_window_hint_cb_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self) { #line 75 "/run/media/triton/Guerre/jhbuild/jhbuild/gnome-taquin/src/game-window.vala" game_window_hint_cb ((GameWindow*) self); -#line 175 "game-window.c" +#line 174 "game-window.c" } static gpointer _g_object_ref0 (gpointer self) { #line 100 "/run/media/triton/Guerre/jhbuild/jhbuild/gnome-taquin/src/game-window.vala" return self ? g_object_ref (self) : NULL; -#line 182 "game-window.c" +#line 181 "game-window.c" } static void _game_window_size_allocate_cb_gtk_widget_size_allocate (GtkWidget* _sender, GtkAllocation* allocation, gpointer self) { #line 121 "/run/media/triton/Guerre/jhbuild/jhbuild/gnome-taquin/src/game-window.vala" - game_window_size_allocate_cb ((GameWindow*) self, allocation); -#line 189 "game-window.c" + game_window_size_allocate_cb ((GameWindow*) self); +#line 188 "game-window.c" } @@ -194,7 +193,7 @@ result = game_window_window_state_event_cb ((GameWindow*) self, event); #line 122 "/run/media/triton/Guerre/jhbuild/jhbuild/gnome-taquin/src/game-window.vala" return result; -#line 198 "game-window.c" +#line 197 "game-window.c" } @@ -229,7 +228,7 @@ GtkWidget* _tmp42_ = NULL; GtkWidget* _tmp43_ = NULL; GameWindowFlags _tmp44_ = 0; - gboolean _tmp58_ = FALSE; + gboolean _tmp59_ = FALSE; #line 91 "/run/media/triton/Guerre/jhbuild/jhbuild/gnome-taquin/src/game-window.vala" g_return_val_if_fail (name != NULL, NULL); #line 91 "/run/media/triton/Guerre/jhbuild/jhbuild/gnome-taquin/src/game-window.vala" @@ -242,7 +241,7 @@ _tmp0_ = css_resource; #line 93 "/run/media/triton/Guerre/jhbuild/jhbuild/gnome-taquin/src/game-window.vala" if (_tmp0_ != NULL) { -#line 246 "game-window.c" +#line 245 "game-window.c" GtkCssProvider* css_provider = NULL; GtkCssProvider* _tmp1_ = NULL; GtkCssProvider* _tmp2_ = NULL; @@ -267,7 +266,7 @@ gtk_style_context_add_provider_for_screen (_tmp4_, (GtkStyleProvider*) _tmp5_, (guint) GTK_STYLE_PROVIDER_PRIORITY_APPLICATION); #line 93 "/run/media/triton/Guerre/jhbuild/jhbuild/gnome-taquin/src/game-window.vala" _g_object_unref0 (css_provider); -#line 271 "game-window.c" +#line 270 "game-window.c" } #line 100 "/run/media/triton/Guerre/jhbuild/jhbuild/gnome-taquin/src/game-window.vala" _tmp6_ = _view; @@ -337,7 +336,7 @@ if (_tmp22_) { #line 119 "/run/media/triton/Guerre/jhbuild/jhbuild/gnome-taquin/src/game-window.vala" gtk_window_maximize ((GtkWindow*) self); -#line 341 "game-window.c" +#line 340 "game-window.c" } #line 121 "/run/media/triton/Guerre/jhbuild/jhbuild/gnome-taquin/src/game-window.vala" g_signal_connect_object ((GtkWidget*) self, "size-allocate", (GCallback) _game_window_size_allocate_cb_gtk_widget_size_allocate, self, 0); @@ -353,7 +352,7 @@ _tmp25_ = flags; #line 126 "/run/media/triton/Guerre/jhbuild/jhbuild/gnome-taquin/src/game-window.vala" if ((_tmp25_ & GAME_WINDOW_FLAGS_SHOW_START_BUTTON) == GAME_WINDOW_FLAGS_SHOW_START_BUTTON) { -#line 357 "game-window.c" +#line 356 "game-window.c" const gchar* _tmp26_ = NULL; GtkButton* _tmp27_ = NULL; GtkButton* _tmp28_ = NULL; @@ -407,7 +406,7 @@ _tmp36_ = self->priv->start_game_button; #line 136 "/run/media/triton/Guerre/jhbuild/jhbuild/gnome-taquin/src/game-window.vala" gtk_box_pack_end (_tmp35_, (GtkWidget*) _tmp36_, FALSE, FALSE, (guint) 0); -#line 411 "game-window.c" +#line 410 "game-window.c" } #line 139 "/run/media/triton/Guerre/jhbuild/jhbuild/gnome-taquin/src/game-window.vala" _tmp37_ = self->priv->game_box; @@ -437,7 +436,7 @@ _tmp44_ = flags; #line 146 "/run/media/triton/Guerre/jhbuild/jhbuild/gnome-taquin/src/game-window.vala" if ((_tmp44_ & GAME_WINDOW_FLAGS_SHOW_UNDO) == GAME_WINDOW_FLAGS_SHOW_UNDO) { -#line 441 "game-window.c" +#line 440 "game-window.c" GtkBox* history_box = NULL; GtkBox* _tmp45_ = NULL; GtkBox* _tmp46_ = NULL; @@ -448,11 +447,12 @@ GtkButton* _tmp50_ = NULL; const gchar* _tmp51_ = NULL; GtkButton* _tmp52_ = NULL; - GtkBox* _tmp53_ = NULL; - GtkButton* _tmp54_ = NULL; - GtkBox* _tmp55_ = NULL; + GtkButton* _tmp53_ = NULL; + GtkBox* _tmp54_ = NULL; + GtkButton* _tmp55_ = NULL; GtkBox* _tmp56_ = NULL; GtkBox* _tmp57_ = NULL; + GtkBox* _tmp58_ = NULL; #line 148 "/run/media/triton/Guerre/jhbuild/jhbuild/gnome-taquin/src/game-window.vala" _tmp45_ = (GtkBox*) gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 0); #line 148 "/run/media/triton/Guerre/jhbuild/jhbuild/gnome-taquin/src/game-window.vala" @@ -484,99 +484,93 @@ #line 154 "/run/media/triton/Guerre/jhbuild/jhbuild/gnome-taquin/src/game-window.vala" _tmp52_ = undo_button; #line 154 "/run/media/triton/Guerre/jhbuild/jhbuild/gnome-taquin/src/game-window.vala" - gtk_widget_show ((GtkWidget*) _tmp52_); + gtk_widget_set_valign ((GtkWidget*) _tmp52_, GTK_ALIGN_CENTER); #line 155 "/run/media/triton/Guerre/jhbuild/jhbuild/gnome-taquin/src/game-window.vala" - _tmp53_ = history_box; + _tmp53_ = undo_button; #line 155 "/run/media/triton/Guerre/jhbuild/jhbuild/gnome-taquin/src/game-window.vala" - _tmp54_ = undo_button; -#line 155 "/run/media/triton/Guerre/jhbuild/jhbuild/gnome-taquin/src/game-window.vala" - gtk_box_pack_start (_tmp53_, (GtkWidget*) _tmp54_, TRUE, TRUE, (guint) 0); -#line 166 "/run/media/triton/Guerre/jhbuild/jhbuild/gnome-taquin/src/game-window.vala" - _tmp55_ = history_box; -#line 166 "/run/media/triton/Guerre/jhbuild/jhbuild/gnome-taquin/src/game-window.vala" - gtk_widget_show ((GtkWidget*) _tmp55_); -#line 167 "/run/media/triton/Guerre/jhbuild/jhbuild/gnome-taquin/src/game-window.vala" - _tmp56_ = self->priv->controls_box; -#line 167 "/run/media/triton/Guerre/jhbuild/jhbuild/gnome-taquin/src/game-window.vala" - _tmp57_ = history_box; -#line 167 "/run/media/triton/Guerre/jhbuild/jhbuild/gnome-taquin/src/game-window.vala" - gtk_box_pack_start (_tmp56_, (GtkWidget*) _tmp57_, TRUE, TRUE, (guint) 0); + gtk_widget_show ((GtkWidget*) _tmp53_); +#line 156 "/run/media/triton/Guerre/jhbuild/jhbuild/gnome-taquin/src/game-window.vala" + _tmp54_ = history_box; +#line 156 "/run/media/triton/Guerre/jhbuild/jhbuild/gnome-taquin/src/game-window.vala" + _tmp55_ = undo_button; +#line 156 "/run/media/triton/Guerre/jhbuild/jhbuild/gnome-taquin/src/game-window.vala" + gtk_box_pack_start (_tmp54_, (GtkWidget*) _tmp55_, TRUE, TRUE, (guint) 0); +#line 168 "/run/media/triton/Guerre/jhbuild/jhbuild/gnome-taquin/src/game-window.vala" + _tmp56_ = history_box; +#line 168 "/run/media/triton/Guerre/jhbuild/jhbuild/gnome-taquin/src/game-window.vala" + gtk_widget_show ((GtkWidget*) _tmp56_); +#line 169 "/run/media/triton/Guerre/jhbuild/jhbuild/gnome-taquin/src/game-window.vala" + _tmp57_ = self->priv->controls_box; +#line 169 "/run/media/triton/Guerre/jhbuild/jhbuild/gnome-taquin/src/game-window.vala" + _tmp58_ = history_box; +#line 169 "/run/media/triton/Guerre/jhbuild/jhbuild/gnome-taquin/src/game-window.vala" + gtk_box_pack_start (_tmp57_, (GtkWidget*) _tmp58_, TRUE, TRUE, (guint) 0); #line 146 "/run/media/triton/Guerre/jhbuild/jhbuild/gnome-taquin/src/game-window.vala" _g_object_unref0 (undo_button); #line 146 "/run/media/triton/Guerre/jhbuild/jhbuild/gnome-taquin/src/game-window.vala" _g_object_unref0 (history_box); -#line 509 "game-window.c" +#line 513 "game-window.c" } -#line 179 "/run/media/triton/Guerre/jhbuild/jhbuild/gnome-taquin/src/game-window.vala" - _tmp58_ = start_now; -#line 179 "/run/media/triton/Guerre/jhbuild/jhbuild/gnome-taquin/src/game-window.vala" - if (_tmp58_) { -#line 180 "/run/media/triton/Guerre/jhbuild/jhbuild/gnome-taquin/src/game-window.vala" +#line 182 "/run/media/triton/Guerre/jhbuild/jhbuild/gnome-taquin/src/game-window.vala" + _tmp59_ = start_now; +#line 182 "/run/media/triton/Guerre/jhbuild/jhbuild/gnome-taquin/src/game-window.vala" + if (_tmp59_) { +#line 183 "/run/media/triton/Guerre/jhbuild/jhbuild/gnome-taquin/src/game-window.vala" game_window_show_view (self); -#line 517 "game-window.c" +#line 521 "game-window.c" } else { -#line 182 "/run/media/triton/Guerre/jhbuild/jhbuild/gnome-taquin/src/game-window.vala" +#line 185 "/run/media/triton/Guerre/jhbuild/jhbuild/gnome-taquin/src/game-window.vala" game_window_show_new_game_screen (self); -#line 521 "game-window.c" +#line 525 "game-window.c" } #line 91 "/run/media/triton/Guerre/jhbuild/jhbuild/gnome-taquin/src/game-window.vala" return self; -#line 525 "game-window.c" +#line 529 "game-window.c" } GameWindow* game_window_new (const gchar* css_resource, const gchar* name, gint width, gint height, gboolean maximized, gboolean start_now, GameWindowFlags flags, GtkBox* new_game_screen, GtkWidget* _view) { #line 91 "/run/media/triton/Guerre/jhbuild/jhbuild/gnome-taquin/src/game-window.vala" return game_window_construct (TYPE_GAME_WINDOW, css_resource, name, width, height, maximized, start_now, flags, new_game_screen, _view); -#line 532 "game-window.c" +#line 536 "game-window.c" } -static void game_window_size_allocate_cb (GameWindow* self, GtkAllocation* allocation) { +static void game_window_size_allocate_cb (GameWindow* self) { gboolean _tmp0_ = FALSE; gboolean _tmp1_ = FALSE; - GtkAllocation _tmp3_ = {0}; + gint _tmp3_ = 0; gint _tmp4_ = 0; - GtkAllocation _tmp5_ = {0}; - gint _tmp6_ = 0; -#line 189 "/run/media/triton/Guerre/jhbuild/jhbuild/gnome-taquin/src/game-window.vala" +#line 192 "/run/media/triton/Guerre/jhbuild/jhbuild/gnome-taquin/src/game-window.vala" g_return_if_fail (self != NULL); -#line 189 "/run/media/triton/Guerre/jhbuild/jhbuild/gnome-taquin/src/game-window.vala" - g_return_if_fail (allocation != NULL); -#line 191 "/run/media/triton/Guerre/jhbuild/jhbuild/gnome-taquin/src/game-window.vala" +#line 194 "/run/media/triton/Guerre/jhbuild/jhbuild/gnome-taquin/src/game-window.vala" _tmp1_ = self->priv->maximized_state; -#line 191 "/run/media/triton/Guerre/jhbuild/jhbuild/gnome-taquin/src/game-window.vala" +#line 194 "/run/media/triton/Guerre/jhbuild/jhbuild/gnome-taquin/src/game-window.vala" if (_tmp1_) { -#line 191 "/run/media/triton/Guerre/jhbuild/jhbuild/gnome-taquin/src/game-window.vala" +#line 194 "/run/media/triton/Guerre/jhbuild/jhbuild/gnome-taquin/src/game-window.vala" _tmp0_ = TRUE; #line 553 "game-window.c" } else { gboolean _tmp2_ = FALSE; -#line 191 "/run/media/triton/Guerre/jhbuild/jhbuild/gnome-taquin/src/game-window.vala" +#line 194 "/run/media/triton/Guerre/jhbuild/jhbuild/gnome-taquin/src/game-window.vala" _tmp2_ = self->priv->tiled_state; -#line 191 "/run/media/triton/Guerre/jhbuild/jhbuild/gnome-taquin/src/game-window.vala" +#line 194 "/run/media/triton/Guerre/jhbuild/jhbuild/gnome-taquin/src/game-window.vala" _tmp0_ = _tmp2_; #line 560 "game-window.c" } -#line 191 "/run/media/triton/Guerre/jhbuild/jhbuild/gnome-taquin/src/game-window.vala" +#line 194 "/run/media/triton/Guerre/jhbuild/jhbuild/gnome-taquin/src/game-window.vala" if (_tmp0_) { -#line 192 "/run/media/triton/Guerre/jhbuild/jhbuild/gnome-taquin/src/game-window.vala" +#line 195 "/run/media/triton/Guerre/jhbuild/jhbuild/gnome-taquin/src/game-window.vala" return; #line 566 "game-window.c" } -#line 193 "/run/media/triton/Guerre/jhbuild/jhbuild/gnome-taquin/src/game-window.vala" - _tmp3_ = *allocation; -#line 193 "/run/media/triton/Guerre/jhbuild/jhbuild/gnome-taquin/src/game-window.vala" - _tmp4_ = _tmp3_.width; -#line 193 "/run/media/triton/Guerre/jhbuild/jhbuild/gnome-taquin/src/game-window.vala" - self->priv->window_width = _tmp4_; -#line 194 "/run/media/triton/Guerre/jhbuild/jhbuild/gnome-taquin/src/game-window.vala" - _tmp5_ = *allocation; -#line 194 "/run/media/triton/Guerre/jhbuild/jhbuild/gnome-taquin/src/game-window.vala" - _tmp6_ = _tmp5_.height; -#line 194 "/run/media/triton/Guerre/jhbuild/jhbuild/gnome-taquin/src/game-window.vala" - self->priv->window_height = _tmp6_; -#line 580 "game-window.c" +#line 196 "/run/media/triton/Guerre/jhbuild/jhbuild/gnome-taquin/src/game-window.vala" + gtk_window_get_size ((GtkWindow*) self, &_tmp3_, &_tmp4_); +#line 196 "/run/media/triton/Guerre/jhbuild/jhbuild/gnome-taquin/src/game-window.vala" + self->priv->window_width = _tmp3_; +#line 196 "/run/media/triton/Guerre/jhbuild/jhbuild/gnome-taquin/src/game-window.vala" + self->priv->window_height = _tmp4_; +#line 574 "game-window.c" } @@ -586,49 +580,49 @@ GdkWindowState _tmp1_ = 0; GdkEventWindowState* _tmp4_ = NULL; GdkWindowState _tmp5_ = 0; -#line 197 "/run/media/triton/Guerre/jhbuild/jhbuild/gnome-taquin/src/game-window.vala" +#line 199 "/run/media/triton/Guerre/jhbuild/jhbuild/gnome-taquin/src/game-window.vala" g_return_val_if_fail (self != NULL, FALSE); -#line 197 "/run/media/triton/Guerre/jhbuild/jhbuild/gnome-taquin/src/game-window.vala" - g_return_val_if_fail (event != NULL, FALSE); #line 199 "/run/media/triton/Guerre/jhbuild/jhbuild/gnome-taquin/src/game-window.vala" + g_return_val_if_fail (event != NULL, FALSE); +#line 201 "/run/media/triton/Guerre/jhbuild/jhbuild/gnome-taquin/src/game-window.vala" _tmp0_ = event; -#line 199 "/run/media/triton/Guerre/jhbuild/jhbuild/gnome-taquin/src/game-window.vala" +#line 201 "/run/media/triton/Guerre/jhbuild/jhbuild/gnome-taquin/src/game-window.vala" _tmp1_ = _tmp0_->changed_mask; -#line 199 "/run/media/triton/Guerre/jhbuild/jhbuild/gnome-taquin/src/game-window.vala" +#line 201 "/run/media/triton/Guerre/jhbuild/jhbuild/gnome-taquin/src/game-window.vala" if ((_tmp1_ & GDK_WINDOW_STATE_MAXIMIZED) != 0) { -#line 600 "game-window.c" +#line 594 "game-window.c" GdkEventWindowState* _tmp2_ = NULL; GdkWindowState _tmp3_ = 0; -#line 200 "/run/media/triton/Guerre/jhbuild/jhbuild/gnome-taquin/src/game-window.vala" +#line 202 "/run/media/triton/Guerre/jhbuild/jhbuild/gnome-taquin/src/game-window.vala" _tmp2_ = event; -#line 200 "/run/media/triton/Guerre/jhbuild/jhbuild/gnome-taquin/src/game-window.vala" +#line 202 "/run/media/triton/Guerre/jhbuild/jhbuild/gnome-taquin/src/game-window.vala" _tmp3_ = _tmp2_->new_window_state; -#line 200 "/run/media/triton/Guerre/jhbuild/jhbuild/gnome-taquin/src/game-window.vala" +#line 202 "/run/media/triton/Guerre/jhbuild/jhbuild/gnome-taquin/src/game-window.vala" self->priv->maximized_state = (_tmp3_ & GDK_WINDOW_STATE_MAXIMIZED) != 0; -#line 609 "game-window.c" +#line 603 "game-window.c" } -#line 202 "/run/media/triton/Guerre/jhbuild/jhbuild/gnome-taquin/src/game-window.vala" +#line 204 "/run/media/triton/Guerre/jhbuild/jhbuild/gnome-taquin/src/game-window.vala" _tmp4_ = event; -#line 202 "/run/media/triton/Guerre/jhbuild/jhbuild/gnome-taquin/src/game-window.vala" +#line 204 "/run/media/triton/Guerre/jhbuild/jhbuild/gnome-taquin/src/game-window.vala" _tmp5_ = _tmp4_->changed_mask; -#line 202 "/run/media/triton/Guerre/jhbuild/jhbuild/gnome-taquin/src/game-window.vala" +#line 204 "/run/media/triton/Guerre/jhbuild/jhbuild/gnome-taquin/src/game-window.vala" if ((_tmp5_ & GDK_WINDOW_STATE_TILED) != 0) { -#line 617 "game-window.c" +#line 611 "game-window.c" GdkEventWindowState* _tmp6_ = NULL; GdkWindowState _tmp7_ = 0; -#line 203 "/run/media/triton/Guerre/jhbuild/jhbuild/gnome-taquin/src/game-window.vala" +#line 205 "/run/media/triton/Guerre/jhbuild/jhbuild/gnome-taquin/src/game-window.vala" _tmp6_ = event; -#line 203 "/run/media/triton/Guerre/jhbuild/jhbuild/gnome-taquin/src/game-window.vala" +#line 205 "/run/media/triton/Guerre/jhbuild/jhbuild/gnome-taquin/src/game-window.vala" _tmp7_ = _tmp6_->new_window_state; -#line 203 "/run/media/triton/Guerre/jhbuild/jhbuild/gnome-taquin/src/game-window.vala" +#line 205 "/run/media/triton/Guerre/jhbuild/jhbuild/gnome-taquin/src/game-window.vala" self->priv->tiled_state = (_tmp7_ & GDK_WINDOW_STATE_TILED) != 0; -#line 626 "game-window.c" +#line 620 "game-window.c" } -#line 204 "/run/media/triton/Guerre/jhbuild/jhbuild/gnome-taquin/src/game-window.vala" +#line 206 "/run/media/triton/Guerre/jhbuild/jhbuild/gnome-taquin/src/game-window.vala" result = FALSE; -#line 204 "/run/media/triton/Guerre/jhbuild/jhbuild/gnome-taquin/src/game-window.vala" +#line 206 "/run/media/triton/Guerre/jhbuild/jhbuild/gnome-taquin/src/game-window.vala" return result; -#line 632 "game-window.c" +#line 626 "game-window.c" } @@ -639,94 +633,94 @@ gint _tmp3_ = 0; GSettings* _tmp4_ = NULL; gboolean _tmp5_ = FALSE; -#line 207 "/run/media/triton/Guerre/jhbuild/jhbuild/gnome-taquin/src/game-window.vala" +#line 209 "/run/media/triton/Guerre/jhbuild/jhbuild/gnome-taquin/src/game-window.vala" g_return_if_fail (self != NULL); -#line 207 "/run/media/triton/Guerre/jhbuild/jhbuild/gnome-taquin/src/game-window.vala" - g_return_if_fail (settings != NULL); #line 209 "/run/media/triton/Guerre/jhbuild/jhbuild/gnome-taquin/src/game-window.vala" + g_return_if_fail (settings != NULL); +#line 211 "/run/media/triton/Guerre/jhbuild/jhbuild/gnome-taquin/src/game-window.vala" _tmp0_ = settings; -#line 209 "/run/media/triton/Guerre/jhbuild/jhbuild/gnome-taquin/src/game-window.vala" +#line 211 "/run/media/triton/Guerre/jhbuild/jhbuild/gnome-taquin/src/game-window.vala" _tmp1_ = self->priv->window_width; -#line 209 "/run/media/triton/Guerre/jhbuild/jhbuild/gnome-taquin/src/game-window.vala" +#line 211 "/run/media/triton/Guerre/jhbuild/jhbuild/gnome-taquin/src/game-window.vala" g_settings_set_int (_tmp0_, "window-width", _tmp1_); -#line 210 "/run/media/triton/Guerre/jhbuild/jhbuild/gnome-taquin/src/game-window.vala" +#line 212 "/run/media/triton/Guerre/jhbuild/jhbuild/gnome-taquin/src/game-window.vala" _tmp2_ = settings; -#line 210 "/run/media/triton/Guerre/jhbuild/jhbuild/gnome-taquin/src/game-window.vala" +#line 212 "/run/media/triton/Guerre/jhbuild/jhbuild/gnome-taquin/src/game-window.vala" _tmp3_ = self->priv->window_height; -#line 210 "/run/media/triton/Guerre/jhbuild/jhbuild/gnome-taquin/src/game-window.vala" +#line 212 "/run/media/triton/Guerre/jhbuild/jhbuild/gnome-taquin/src/game-window.vala" g_settings_set_int (_tmp2_, "window-height", _tmp3_); -#line 211 "/run/media/triton/Guerre/jhbuild/jhbuild/gnome-taquin/src/game-window.vala" +#line 213 "/run/media/triton/Guerre/jhbuild/jhbuild/gnome-taquin/src/game-window.vala" _tmp4_ = settings; -#line 211 "/run/media/triton/Guerre/jhbuild/jhbuild/gnome-taquin/src/game-window.vala" +#line 213 "/run/media/triton/Guerre/jhbuild/jhbuild/gnome-taquin/src/game-window.vala" _tmp5_ = self->priv->maximized_state; -#line 211 "/run/media/triton/Guerre/jhbuild/jhbuild/gnome-taquin/src/game-window.vala" +#line 213 "/run/media/triton/Guerre/jhbuild/jhbuild/gnome-taquin/src/game-window.vala" g_settings_set_boolean (_tmp4_, "window-is-maximized", _tmp5_); -#line 212 "/run/media/triton/Guerre/jhbuild/jhbuild/gnome-taquin/src/game-window.vala" +#line 214 "/run/media/triton/Guerre/jhbuild/jhbuild/gnome-taquin/src/game-window.vala" gtk_widget_destroy ((GtkWidget*) self); -#line 667 "game-window.c" +#line 661 "game-window.c" } void game_window_add_to_sidebox (GameWindow* self, GtkWidget* widget) { GtkBox* _tmp0_ = NULL; GtkWidget* _tmp1_ = NULL; -#line 219 "/run/media/triton/Guerre/jhbuild/jhbuild/gnome-taquin/src/game-window.vala" +#line 221 "/run/media/triton/Guerre/jhbuild/jhbuild/gnome-taquin/src/game-window.vala" g_return_if_fail (self != NULL); -#line 219 "/run/media/triton/Guerre/jhbuild/jhbuild/gnome-taquin/src/game-window.vala" - g_return_if_fail (widget != NULL); #line 221 "/run/media/triton/Guerre/jhbuild/jhbuild/gnome-taquin/src/game-window.vala" + g_return_if_fail (widget != NULL); +#line 223 "/run/media/triton/Guerre/jhbuild/jhbuild/gnome-taquin/src/game-window.vala" _tmp0_ = self->priv->side_box; -#line 221 "/run/media/triton/Guerre/jhbuild/jhbuild/gnome-taquin/src/game-window.vala" +#line 223 "/run/media/triton/Guerre/jhbuild/jhbuild/gnome-taquin/src/game-window.vala" _tmp1_ = widget; -#line 221 "/run/media/triton/Guerre/jhbuild/jhbuild/gnome-taquin/src/game-window.vala" +#line 223 "/run/media/triton/Guerre/jhbuild/jhbuild/gnome-taquin/src/game-window.vala" gtk_box_pack_start (_tmp0_, _tmp1_, FALSE, FALSE, (guint) 0); -#line 684 "game-window.c" +#line 678 "game-window.c" } void game_window_cannot_undo_more (GameWindow* self) { GSimpleAction* _tmp0_ = NULL; GtkWidget* _tmp1_ = NULL; -#line 224 "/run/media/triton/Guerre/jhbuild/jhbuild/gnome-taquin/src/game-window.vala" - g_return_if_fail (self != NULL); #line 226 "/run/media/triton/Guerre/jhbuild/jhbuild/gnome-taquin/src/game-window.vala" + g_return_if_fail (self != NULL); +#line 228 "/run/media/triton/Guerre/jhbuild/jhbuild/gnome-taquin/src/game-window.vala" _tmp0_ = self->undo_action; -#line 226 "/run/media/triton/Guerre/jhbuild/jhbuild/gnome-taquin/src/game-window.vala" +#line 228 "/run/media/triton/Guerre/jhbuild/jhbuild/gnome-taquin/src/game-window.vala" g_simple_action_set_enabled (_tmp0_, FALSE); -#line 227 "/run/media/triton/Guerre/jhbuild/jhbuild/gnome-taquin/src/game-window.vala" +#line 229 "/run/media/triton/Guerre/jhbuild/jhbuild/gnome-taquin/src/game-window.vala" _tmp1_ = self->priv->view; -#line 227 "/run/media/triton/Guerre/jhbuild/jhbuild/gnome-taquin/src/game-window.vala" +#line 229 "/run/media/triton/Guerre/jhbuild/jhbuild/gnome-taquin/src/game-window.vala" gtk_widget_grab_focus (_tmp1_); -#line 701 "game-window.c" +#line 695 "game-window.c" } void game_window_set_subtitle (GameWindow* self, const gchar* subtitle) { GtkHeaderBar* _tmp0_ = NULL; const gchar* _tmp1_ = NULL; -#line 230 "/run/media/triton/Guerre/jhbuild/jhbuild/gnome-taquin/src/game-window.vala" - g_return_if_fail (self != NULL); #line 232 "/run/media/triton/Guerre/jhbuild/jhbuild/gnome-taquin/src/game-window.vala" + g_return_if_fail (self != NULL); +#line 234 "/run/media/triton/Guerre/jhbuild/jhbuild/gnome-taquin/src/game-window.vala" _tmp0_ = self->priv->headerbar; -#line 232 "/run/media/triton/Guerre/jhbuild/jhbuild/gnome-taquin/src/game-window.vala" +#line 234 "/run/media/triton/Guerre/jhbuild/jhbuild/gnome-taquin/src/game-window.vala" _tmp1_ = subtitle; -#line 232 "/run/media/triton/Guerre/jhbuild/jhbuild/gnome-taquin/src/game-window.vala" +#line 234 "/run/media/triton/Guerre/jhbuild/jhbuild/gnome-taquin/src/game-window.vala" gtk_header_bar_set_subtitle (_tmp0_, _tmp1_); -#line 716 "game-window.c" +#line 710 "game-window.c" } void game_window_finish_game (GameWindow* self) { GtkButton* _tmp0_ = NULL; -#line 235 "/run/media/triton/Guerre/jhbuild/jhbuild/gnome-taquin/src/game-window.vala" - g_return_if_fail (self != NULL); #line 237 "/run/media/triton/Guerre/jhbuild/jhbuild/gnome-taquin/src/game-window.vala" + g_return_if_fail (self != NULL); +#line 239 "/run/media/triton/Guerre/jhbuild/jhbuild/gnome-taquin/src/game-window.vala" self->priv->game_finished = TRUE; -#line 238 "/run/media/triton/Guerre/jhbuild/jhbuild/gnome-taquin/src/game-window.vala" +#line 240 "/run/media/triton/Guerre/jhbuild/jhbuild/gnome-taquin/src/game-window.vala" _tmp0_ = self->priv->new_game_button; -#line 238 "/run/media/triton/Guerre/jhbuild/jhbuild/gnome-taquin/src/game-window.vala" +#line 240 "/run/media/triton/Guerre/jhbuild/jhbuild/gnome-taquin/src/game-window.vala" gtk_widget_grab_focus ((GtkWidget*) _tmp0_); -#line 730 "game-window.c" +#line 724 "game-window.c" } @@ -736,64 +730,64 @@ GtkBox* _tmp2_ = NULL; gboolean _tmp3_ = FALSE; gboolean _tmp4_ = FALSE; -#line 250 "/run/media/triton/Guerre/jhbuild/jhbuild/gnome-taquin/src/game-window.vala" - g_return_if_fail (self != NULL); #line 252 "/run/media/triton/Guerre/jhbuild/jhbuild/gnome-taquin/src/game-window.vala" + g_return_if_fail (self != NULL); +#line 254 "/run/media/triton/Guerre/jhbuild/jhbuild/gnome-taquin/src/game-window.vala" _tmp0_ = self->priv->headerbar; -#line 252 "/run/media/triton/Guerre/jhbuild/jhbuild/gnome-taquin/src/game-window.vala" - gtk_header_bar_set_subtitle (_tmp0_, NULL); #line 254 "/run/media/triton/Guerre/jhbuild/jhbuild/gnome-taquin/src/game-window.vala" + gtk_header_bar_set_subtitle (_tmp0_, NULL); +#line 256 "/run/media/triton/Guerre/jhbuild/jhbuild/gnome-taquin/src/game-window.vala" _tmp1_ = self->priv->stack; -#line 254 "/run/media/triton/Guerre/jhbuild/jhbuild/gnome-taquin/src/game-window.vala" +#line 256 "/run/media/triton/Guerre/jhbuild/jhbuild/gnome-taquin/src/game-window.vala" gtk_stack_set_visible_child_name (_tmp1_, "start-box"); -#line 255 "/run/media/triton/Guerre/jhbuild/jhbuild/gnome-taquin/src/game-window.vala" +#line 257 "/run/media/triton/Guerre/jhbuild/jhbuild/gnome-taquin/src/game-window.vala" _tmp2_ = self->priv->controls_box; -#line 255 "/run/media/triton/Guerre/jhbuild/jhbuild/gnome-taquin/src/game-window.vala" - gtk_widget_hide ((GtkWidget*) _tmp2_); #line 257 "/run/media/triton/Guerre/jhbuild/jhbuild/gnome-taquin/src/game-window.vala" + gtk_widget_hide ((GtkWidget*) _tmp2_); +#line 259 "/run/media/triton/Guerre/jhbuild/jhbuild/gnome-taquin/src/game-window.vala" _tmp4_ = self->priv->game_finished; -#line 257 "/run/media/triton/Guerre/jhbuild/jhbuild/gnome-taquin/src/game-window.vala" +#line 259 "/run/media/triton/Guerre/jhbuild/jhbuild/gnome-taquin/src/game-window.vala" if (!_tmp4_) { -#line 758 "game-window.c" +#line 752 "game-window.c" GtkButton* _tmp5_ = NULL; gboolean _tmp6_ = FALSE; gboolean _tmp7_ = FALSE; -#line 257 "/run/media/triton/Guerre/jhbuild/jhbuild/gnome-taquin/src/game-window.vala" +#line 259 "/run/media/triton/Guerre/jhbuild/jhbuild/gnome-taquin/src/game-window.vala" _tmp5_ = self->priv->back_button; -#line 257 "/run/media/triton/Guerre/jhbuild/jhbuild/gnome-taquin/src/game-window.vala" +#line 259 "/run/media/triton/Guerre/jhbuild/jhbuild/gnome-taquin/src/game-window.vala" _tmp6_ = gtk_widget_get_visible ((GtkWidget*) _tmp5_); -#line 257 "/run/media/triton/Guerre/jhbuild/jhbuild/gnome-taquin/src/game-window.vala" +#line 259 "/run/media/triton/Guerre/jhbuild/jhbuild/gnome-taquin/src/game-window.vala" _tmp7_ = _tmp6_; -#line 257 "/run/media/triton/Guerre/jhbuild/jhbuild/gnome-taquin/src/game-window.vala" +#line 259 "/run/media/triton/Guerre/jhbuild/jhbuild/gnome-taquin/src/game-window.vala" _tmp3_ = _tmp7_; -#line 770 "game-window.c" +#line 764 "game-window.c" } else { -#line 257 "/run/media/triton/Guerre/jhbuild/jhbuild/gnome-taquin/src/game-window.vala" +#line 259 "/run/media/triton/Guerre/jhbuild/jhbuild/gnome-taquin/src/game-window.vala" _tmp3_ = FALSE; -#line 774 "game-window.c" +#line 768 "game-window.c" } -#line 257 "/run/media/triton/Guerre/jhbuild/jhbuild/gnome-taquin/src/game-window.vala" +#line 259 "/run/media/triton/Guerre/jhbuild/jhbuild/gnome-taquin/src/game-window.vala" if (_tmp3_) { -#line 778 "game-window.c" +#line 772 "game-window.c" GtkButton* _tmp8_ = NULL; -#line 258 "/run/media/triton/Guerre/jhbuild/jhbuild/gnome-taquin/src/game-window.vala" +#line 260 "/run/media/triton/Guerre/jhbuild/jhbuild/gnome-taquin/src/game-window.vala" _tmp8_ = self->priv->back_button; -#line 258 "/run/media/triton/Guerre/jhbuild/jhbuild/gnome-taquin/src/game-window.vala" +#line 260 "/run/media/triton/Guerre/jhbuild/jhbuild/gnome-taquin/src/game-window.vala" gtk_widget_grab_focus ((GtkWidget*) _tmp8_); -#line 784 "game-window.c" +#line 778 "game-window.c" } else { GtkButton* _tmp9_ = NULL; -#line 259 "/run/media/triton/Guerre/jhbuild/jhbuild/gnome-taquin/src/game-window.vala" +#line 261 "/run/media/triton/Guerre/jhbuild/jhbuild/gnome-taquin/src/game-window.vala" _tmp9_ = self->priv->start_game_button; -#line 259 "/run/media/triton/Guerre/jhbuild/jhbuild/gnome-taquin/src/game-window.vala" +#line 261 "/run/media/triton/Guerre/jhbuild/jhbuild/gnome-taquin/src/game-window.vala" if (_tmp9_ != NULL) { -#line 791 "game-window.c" +#line 785 "game-window.c" GtkButton* _tmp10_ = NULL; -#line 260 "/run/media/triton/Guerre/jhbuild/jhbuild/gnome-taquin/src/game-window.vala" +#line 262 "/run/media/triton/Guerre/jhbuild/jhbuild/gnome-taquin/src/game-window.vala" _tmp10_ = self->priv->start_game_button; -#line 260 "/run/media/triton/Guerre/jhbuild/jhbuild/gnome-taquin/src/game-window.vala" +#line 262 "/run/media/triton/Guerre/jhbuild/jhbuild/gnome-taquin/src/game-window.vala" gtk_widget_grab_focus ((GtkWidget*) _tmp10_); -#line 797 "game-window.c" +#line 791 "game-window.c" } } } @@ -804,38 +798,38 @@ GtkButton* _tmp1_ = NULL; GtkBox* _tmp2_ = NULL; gboolean _tmp3_ = FALSE; -#line 263 "/run/media/triton/Guerre/jhbuild/jhbuild/gnome-taquin/src/game-window.vala" - g_return_if_fail (self != NULL); #line 265 "/run/media/triton/Guerre/jhbuild/jhbuild/gnome-taquin/src/game-window.vala" + g_return_if_fail (self != NULL); +#line 267 "/run/media/triton/Guerre/jhbuild/jhbuild/gnome-taquin/src/game-window.vala" _tmp0_ = self->priv->stack; -#line 265 "/run/media/triton/Guerre/jhbuild/jhbuild/gnome-taquin/src/game-window.vala" +#line 267 "/run/media/triton/Guerre/jhbuild/jhbuild/gnome-taquin/src/game-window.vala" gtk_stack_set_visible_child_name (_tmp0_, "frame"); -#line 266 "/run/media/triton/Guerre/jhbuild/jhbuild/gnome-taquin/src/game-window.vala" +#line 268 "/run/media/triton/Guerre/jhbuild/jhbuild/gnome-taquin/src/game-window.vala" _tmp1_ = self->priv->back_button; -#line 266 "/run/media/triton/Guerre/jhbuild/jhbuild/gnome-taquin/src/game-window.vala" +#line 268 "/run/media/triton/Guerre/jhbuild/jhbuild/gnome-taquin/src/game-window.vala" gtk_widget_hide ((GtkWidget*) _tmp1_); -#line 267 "/run/media/triton/Guerre/jhbuild/jhbuild/gnome-taquin/src/game-window.vala" +#line 269 "/run/media/triton/Guerre/jhbuild/jhbuild/gnome-taquin/src/game-window.vala" _tmp2_ = self->priv->controls_box; -#line 267 "/run/media/triton/Guerre/jhbuild/jhbuild/gnome-taquin/src/game-window.vala" - gtk_widget_show ((GtkWidget*) _tmp2_); #line 269 "/run/media/triton/Guerre/jhbuild/jhbuild/gnome-taquin/src/game-window.vala" + gtk_widget_show ((GtkWidget*) _tmp2_); +#line 271 "/run/media/triton/Guerre/jhbuild/jhbuild/gnome-taquin/src/game-window.vala" _tmp3_ = self->priv->game_finished; -#line 269 "/run/media/triton/Guerre/jhbuild/jhbuild/gnome-taquin/src/game-window.vala" +#line 271 "/run/media/triton/Guerre/jhbuild/jhbuild/gnome-taquin/src/game-window.vala" if (_tmp3_) { -#line 826 "game-window.c" +#line 820 "game-window.c" GtkButton* _tmp4_ = NULL; -#line 270 "/run/media/triton/Guerre/jhbuild/jhbuild/gnome-taquin/src/game-window.vala" +#line 272 "/run/media/triton/Guerre/jhbuild/jhbuild/gnome-taquin/src/game-window.vala" _tmp4_ = self->priv->new_game_button; -#line 270 "/run/media/triton/Guerre/jhbuild/jhbuild/gnome-taquin/src/game-window.vala" +#line 272 "/run/media/triton/Guerre/jhbuild/jhbuild/gnome-taquin/src/game-window.vala" gtk_widget_grab_focus ((GtkWidget*) _tmp4_); -#line 832 "game-window.c" +#line 826 "game-window.c" } else { GtkWidget* _tmp5_ = NULL; -#line 272 "/run/media/triton/Guerre/jhbuild/jhbuild/gnome-taquin/src/game-window.vala" +#line 274 "/run/media/triton/Guerre/jhbuild/jhbuild/gnome-taquin/src/game-window.vala" _tmp5_ = self->priv->view; -#line 272 "/run/media/triton/Guerre/jhbuild/jhbuild/gnome-taquin/src/game-window.vala" +#line 274 "/run/media/triton/Guerre/jhbuild/jhbuild/gnome-taquin/src/game-window.vala" gtk_widget_grab_focus (_tmp5_); -#line 839 "game-window.c" +#line 833 "game-window.c" } } @@ -847,39 +841,39 @@ GtkStack* _tmp3_ = NULL; GtkButton* _tmp4_ = NULL; GSimpleAction* _tmp5_ = NULL; -#line 279 "/run/media/triton/Guerre/jhbuild/jhbuild/gnome-taquin/src/game-window.vala" - g_return_if_fail (self != NULL); #line 281 "/run/media/triton/Guerre/jhbuild/jhbuild/gnome-taquin/src/game-window.vala" + g_return_if_fail (self != NULL); +#line 283 "/run/media/triton/Guerre/jhbuild/jhbuild/gnome-taquin/src/game-window.vala" _tmp0_ = self->priv->stack; -#line 281 "/run/media/triton/Guerre/jhbuild/jhbuild/gnome-taquin/src/game-window.vala" +#line 283 "/run/media/triton/Guerre/jhbuild/jhbuild/gnome-taquin/src/game-window.vala" _tmp1_ = gtk_stack_get_visible_child_name (_tmp0_); -#line 281 "/run/media/triton/Guerre/jhbuild/jhbuild/gnome-taquin/src/game-window.vala" +#line 283 "/run/media/triton/Guerre/jhbuild/jhbuild/gnome-taquin/src/game-window.vala" if (g_strcmp0 (_tmp1_, "frame") != 0) { -#line 282 "/run/media/triton/Guerre/jhbuild/jhbuild/gnome-taquin/src/game-window.vala" +#line 284 "/run/media/triton/Guerre/jhbuild/jhbuild/gnome-taquin/src/game-window.vala" return; -#line 861 "game-window.c" +#line 855 "game-window.c" } -#line 284 "/run/media/triton/Guerre/jhbuild/jhbuild/gnome-taquin/src/game-window.vala" - g_signal_emit_by_name (self, "wait"); #line 286 "/run/media/triton/Guerre/jhbuild/jhbuild/gnome-taquin/src/game-window.vala" + g_signal_emit_by_name (self, "wait"); +#line 288 "/run/media/triton/Guerre/jhbuild/jhbuild/gnome-taquin/src/game-window.vala" _tmp2_ = self->priv->stack; -#line 286 "/run/media/triton/Guerre/jhbuild/jhbuild/gnome-taquin/src/game-window.vala" +#line 288 "/run/media/triton/Guerre/jhbuild/jhbuild/gnome-taquin/src/game-window.vala" gtk_stack_set_transition_type (_tmp2_, GTK_STACK_TRANSITION_TYPE_SLIDE_LEFT); -#line 287 "/run/media/triton/Guerre/jhbuild/jhbuild/gnome-taquin/src/game-window.vala" +#line 289 "/run/media/triton/Guerre/jhbuild/jhbuild/gnome-taquin/src/game-window.vala" _tmp3_ = self->priv->stack; -#line 287 "/run/media/triton/Guerre/jhbuild/jhbuild/gnome-taquin/src/game-window.vala" - gtk_stack_set_transition_duration (_tmp3_, (guint) 800); #line 289 "/run/media/triton/Guerre/jhbuild/jhbuild/gnome-taquin/src/game-window.vala" + gtk_stack_set_transition_duration (_tmp3_, (guint) 800); +#line 291 "/run/media/triton/Guerre/jhbuild/jhbuild/gnome-taquin/src/game-window.vala" _tmp4_ = self->priv->back_button; -#line 289 "/run/media/triton/Guerre/jhbuild/jhbuild/gnome-taquin/src/game-window.vala" +#line 291 "/run/media/triton/Guerre/jhbuild/jhbuild/gnome-taquin/src/game-window.vala" gtk_widget_show ((GtkWidget*) _tmp4_); -#line 290 "/run/media/triton/Guerre/jhbuild/jhbuild/gnome-taquin/src/game-window.vala" +#line 292 "/run/media/triton/Guerre/jhbuild/jhbuild/gnome-taquin/src/game-window.vala" _tmp5_ = self->priv->back_action; -#line 290 "/run/media/triton/Guerre/jhbuild/jhbuild/gnome-taquin/src/game-window.vala" - g_simple_action_set_enabled (_tmp5_, TRUE); #line 292 "/run/media/triton/Guerre/jhbuild/jhbuild/gnome-taquin/src/game-window.vala" + g_simple_action_set_enabled (_tmp5_, TRUE); +#line 294 "/run/media/triton/Guerre/jhbuild/jhbuild/gnome-taquin/src/game-window.vala" game_window_show_new_game_screen (self); -#line 883 "game-window.c" +#line 877 "game-window.c" } @@ -890,41 +884,41 @@ GSimpleAction* _tmp3_ = NULL; GtkStack* _tmp4_ = NULL; GtkStack* _tmp5_ = NULL; -#line 295 "/run/media/triton/Guerre/jhbuild/jhbuild/gnome-taquin/src/game-window.vala" - g_return_if_fail (self != NULL); #line 297 "/run/media/triton/Guerre/jhbuild/jhbuild/gnome-taquin/src/game-window.vala" + g_return_if_fail (self != NULL); +#line 299 "/run/media/triton/Guerre/jhbuild/jhbuild/gnome-taquin/src/game-window.vala" _tmp0_ = self->priv->stack; -#line 297 "/run/media/triton/Guerre/jhbuild/jhbuild/gnome-taquin/src/game-window.vala" +#line 299 "/run/media/triton/Guerre/jhbuild/jhbuild/gnome-taquin/src/game-window.vala" _tmp1_ = gtk_stack_get_visible_child_name (_tmp0_); -#line 297 "/run/media/triton/Guerre/jhbuild/jhbuild/gnome-taquin/src/game-window.vala" +#line 299 "/run/media/triton/Guerre/jhbuild/jhbuild/gnome-taquin/src/game-window.vala" if (g_strcmp0 (_tmp1_, "start-box") != 0) { -#line 298 "/run/media/triton/Guerre/jhbuild/jhbuild/gnome-taquin/src/game-window.vala" +#line 300 "/run/media/triton/Guerre/jhbuild/jhbuild/gnome-taquin/src/game-window.vala" return; -#line 904 "game-window.c" +#line 898 "game-window.c" } -#line 300 "/run/media/triton/Guerre/jhbuild/jhbuild/gnome-taquin/src/game-window.vala" - self->priv->game_finished = FALSE; #line 302 "/run/media/triton/Guerre/jhbuild/jhbuild/gnome-taquin/src/game-window.vala" + self->priv->game_finished = FALSE; +#line 304 "/run/media/triton/Guerre/jhbuild/jhbuild/gnome-taquin/src/game-window.vala" _tmp2_ = self->undo_action; -#line 302 "/run/media/triton/Guerre/jhbuild/jhbuild/gnome-taquin/src/game-window.vala" +#line 304 "/run/media/triton/Guerre/jhbuild/jhbuild/gnome-taquin/src/game-window.vala" g_simple_action_set_enabled (_tmp2_, FALSE); -#line 303 "/run/media/triton/Guerre/jhbuild/jhbuild/gnome-taquin/src/game-window.vala" +#line 305 "/run/media/triton/Guerre/jhbuild/jhbuild/gnome-taquin/src/game-window.vala" _tmp3_ = self->redo_action; -#line 303 "/run/media/triton/Guerre/jhbuild/jhbuild/gnome-taquin/src/game-window.vala" - g_simple_action_set_enabled (_tmp3_, FALSE); #line 305 "/run/media/triton/Guerre/jhbuild/jhbuild/gnome-taquin/src/game-window.vala" - g_signal_emit_by_name (self, "play"); + g_simple_action_set_enabled (_tmp3_, FALSE); #line 307 "/run/media/triton/Guerre/jhbuild/jhbuild/gnome-taquin/src/game-window.vala" + g_signal_emit_by_name (self, "play"); +#line 309 "/run/media/triton/Guerre/jhbuild/jhbuild/gnome-taquin/src/game-window.vala" _tmp4_ = self->priv->stack; -#line 307 "/run/media/triton/Guerre/jhbuild/jhbuild/gnome-taquin/src/game-window.vala" +#line 309 "/run/media/triton/Guerre/jhbuild/jhbuild/gnome-taquin/src/game-window.vala" gtk_stack_set_transition_type (_tmp4_, GTK_STACK_TRANSITION_TYPE_SLIDE_DOWN); -#line 308 "/run/media/triton/Guerre/jhbuild/jhbuild/gnome-taquin/src/game-window.vala" +#line 310 "/run/media/triton/Guerre/jhbuild/jhbuild/gnome-taquin/src/game-window.vala" _tmp5_ = self->priv->stack; -#line 308 "/run/media/triton/Guerre/jhbuild/jhbuild/gnome-taquin/src/game-window.vala" +#line 310 "/run/media/triton/Guerre/jhbuild/jhbuild/gnome-taquin/src/game-window.vala" gtk_stack_set_transition_duration (_tmp5_, (guint) 1000); -#line 309 "/run/media/triton/Guerre/jhbuild/jhbuild/gnome-taquin/src/game-window.vala" +#line 311 "/run/media/triton/Guerre/jhbuild/jhbuild/gnome-taquin/src/game-window.vala" game_window_show_view (self); -#line 928 "game-window.c" +#line 922 "game-window.c" } @@ -933,31 +927,31 @@ const gchar* _tmp1_ = NULL; GtkStack* _tmp2_ = NULL; GtkStack* _tmp3_ = NULL; -#line 312 "/run/media/triton/Guerre/jhbuild/jhbuild/gnome-taquin/src/game-window.vala" - g_return_if_fail (self != NULL); #line 314 "/run/media/triton/Guerre/jhbuild/jhbuild/gnome-taquin/src/game-window.vala" + g_return_if_fail (self != NULL); +#line 316 "/run/media/triton/Guerre/jhbuild/jhbuild/gnome-taquin/src/game-window.vala" _tmp0_ = self->priv->stack; -#line 314 "/run/media/triton/Guerre/jhbuild/jhbuild/gnome-taquin/src/game-window.vala" +#line 316 "/run/media/triton/Guerre/jhbuild/jhbuild/gnome-taquin/src/game-window.vala" _tmp1_ = gtk_stack_get_visible_child_name (_tmp0_); -#line 314 "/run/media/triton/Guerre/jhbuild/jhbuild/gnome-taquin/src/game-window.vala" +#line 316 "/run/media/triton/Guerre/jhbuild/jhbuild/gnome-taquin/src/game-window.vala" if (g_strcmp0 (_tmp1_, "start-box") != 0) { -#line 315 "/run/media/triton/Guerre/jhbuild/jhbuild/gnome-taquin/src/game-window.vala" +#line 317 "/run/media/triton/Guerre/jhbuild/jhbuild/gnome-taquin/src/game-window.vala" return; -#line 947 "game-window.c" +#line 941 "game-window.c" } -#line 317 "/run/media/triton/Guerre/jhbuild/jhbuild/gnome-taquin/src/game-window.vala" +#line 319 "/run/media/triton/Guerre/jhbuild/jhbuild/gnome-taquin/src/game-window.vala" _tmp2_ = self->priv->stack; -#line 317 "/run/media/triton/Guerre/jhbuild/jhbuild/gnome-taquin/src/game-window.vala" +#line 319 "/run/media/triton/Guerre/jhbuild/jhbuild/gnome-taquin/src/game-window.vala" gtk_stack_set_transition_type (_tmp2_, GTK_STACK_TRANSITION_TYPE_SLIDE_RIGHT); -#line 318 "/run/media/triton/Guerre/jhbuild/jhbuild/gnome-taquin/src/game-window.vala" +#line 320 "/run/media/triton/Guerre/jhbuild/jhbuild/gnome-taquin/src/game-window.vala" _tmp3_ = self->priv->stack; -#line 318 "/run/media/triton/Guerre/jhbuild/jhbuild/gnome-taquin/src/game-window.vala" +#line 320 "/run/media/triton/Guerre/jhbuild/jhbuild/gnome-taquin/src/game-window.vala" gtk_stack_set_transition_duration (_tmp3_, (guint) 800); -#line 319 "/run/media/triton/Guerre/jhbuild/jhbuild/gnome-taquin/src/game-window.vala" - game_window_show_view (self); #line 321 "/run/media/triton/Guerre/jhbuild/jhbuild/gnome-taquin/src/game-window.vala" + game_window_show_view (self); +#line 323 "/run/media/triton/Guerre/jhbuild/jhbuild/gnome-taquin/src/game-window.vala" g_signal_emit_by_name (self, "back"); -#line 961 "game-window.c" +#line 955 "game-window.c" } @@ -968,43 +962,43 @@ gboolean _tmp3_ = FALSE; gboolean _tmp4_ = FALSE; GSimpleAction* _tmp6_ = NULL; -#line 328 "/run/media/triton/Guerre/jhbuild/jhbuild/gnome-taquin/src/game-window.vala" - g_return_if_fail (self != NULL); #line 330 "/run/media/triton/Guerre/jhbuild/jhbuild/gnome-taquin/src/game-window.vala" + g_return_if_fail (self != NULL); +#line 332 "/run/media/triton/Guerre/jhbuild/jhbuild/gnome-taquin/src/game-window.vala" _tmp0_ = self->priv->stack; -#line 330 "/run/media/triton/Guerre/jhbuild/jhbuild/gnome-taquin/src/game-window.vala" +#line 332 "/run/media/triton/Guerre/jhbuild/jhbuild/gnome-taquin/src/game-window.vala" _tmp1_ = gtk_stack_get_visible_child_name (_tmp0_); -#line 330 "/run/media/triton/Guerre/jhbuild/jhbuild/gnome-taquin/src/game-window.vala" +#line 332 "/run/media/triton/Guerre/jhbuild/jhbuild/gnome-taquin/src/game-window.vala" if (g_strcmp0 (_tmp1_, "frame") != 0) { -#line 331 "/run/media/triton/Guerre/jhbuild/jhbuild/gnome-taquin/src/game-window.vala" +#line 333 "/run/media/triton/Guerre/jhbuild/jhbuild/gnome-taquin/src/game-window.vala" return; -#line 982 "game-window.c" +#line 976 "game-window.c" } -#line 333 "/run/media/triton/Guerre/jhbuild/jhbuild/gnome-taquin/src/game-window.vala" - self->priv->game_finished = FALSE; #line 335 "/run/media/triton/Guerre/jhbuild/jhbuild/gnome-taquin/src/game-window.vala" + self->priv->game_finished = FALSE; +#line 337 "/run/media/triton/Guerre/jhbuild/jhbuild/gnome-taquin/src/game-window.vala" _tmp2_ = self->priv->new_game_button; -#line 335 "/run/media/triton/Guerre/jhbuild/jhbuild/gnome-taquin/src/game-window.vala" +#line 337 "/run/media/triton/Guerre/jhbuild/jhbuild/gnome-taquin/src/game-window.vala" g_object_get ((GtkWidget*) _tmp2_, "is-focus", &_tmp3_, NULL); -#line 335 "/run/media/triton/Guerre/jhbuild/jhbuild/gnome-taquin/src/game-window.vala" +#line 337 "/run/media/triton/Guerre/jhbuild/jhbuild/gnome-taquin/src/game-window.vala" _tmp4_ = _tmp3_; -#line 335 "/run/media/triton/Guerre/jhbuild/jhbuild/gnome-taquin/src/game-window.vala" +#line 337 "/run/media/triton/Guerre/jhbuild/jhbuild/gnome-taquin/src/game-window.vala" if (_tmp4_) { -#line 994 "game-window.c" +#line 988 "game-window.c" GtkWidget* _tmp5_ = NULL; -#line 336 "/run/media/triton/Guerre/jhbuild/jhbuild/gnome-taquin/src/game-window.vala" +#line 338 "/run/media/triton/Guerre/jhbuild/jhbuild/gnome-taquin/src/game-window.vala" _tmp5_ = self->priv->view; -#line 336 "/run/media/triton/Guerre/jhbuild/jhbuild/gnome-taquin/src/game-window.vala" +#line 338 "/run/media/triton/Guerre/jhbuild/jhbuild/gnome-taquin/src/game-window.vala" gtk_widget_grab_focus (_tmp5_); -#line 1000 "game-window.c" +#line 994 "game-window.c" } -#line 337 "/run/media/triton/Guerre/jhbuild/jhbuild/gnome-taquin/src/game-window.vala" +#line 339 "/run/media/triton/Guerre/jhbuild/jhbuild/gnome-taquin/src/game-window.vala" _tmp6_ = self->redo_action; -#line 337 "/run/media/triton/Guerre/jhbuild/jhbuild/gnome-taquin/src/game-window.vala" +#line 339 "/run/media/triton/Guerre/jhbuild/jhbuild/gnome-taquin/src/game-window.vala" g_simple_action_set_enabled (_tmp6_, TRUE); -#line 338 "/run/media/triton/Guerre/jhbuild/jhbuild/gnome-taquin/src/game-window.vala" +#line 340 "/run/media/triton/Guerre/jhbuild/jhbuild/gnome-taquin/src/game-window.vala" g_signal_emit_by_name (self, "undo"); -#line 1008 "game-window.c" +#line 1002 "game-window.c" } @@ -1015,62 +1009,62 @@ gboolean _tmp3_ = FALSE; gboolean _tmp4_ = FALSE; GSimpleAction* _tmp6_ = NULL; -#line 341 "/run/media/triton/Guerre/jhbuild/jhbuild/gnome-taquin/src/game-window.vala" - g_return_if_fail (self != NULL); #line 343 "/run/media/triton/Guerre/jhbuild/jhbuild/gnome-taquin/src/game-window.vala" + g_return_if_fail (self != NULL); +#line 345 "/run/media/triton/Guerre/jhbuild/jhbuild/gnome-taquin/src/game-window.vala" _tmp0_ = self->priv->stack; -#line 343 "/run/media/triton/Guerre/jhbuild/jhbuild/gnome-taquin/src/game-window.vala" +#line 345 "/run/media/triton/Guerre/jhbuild/jhbuild/gnome-taquin/src/game-window.vala" _tmp1_ = gtk_stack_get_visible_child_name (_tmp0_); -#line 343 "/run/media/triton/Guerre/jhbuild/jhbuild/gnome-taquin/src/game-window.vala" +#line 345 "/run/media/triton/Guerre/jhbuild/jhbuild/gnome-taquin/src/game-window.vala" if (g_strcmp0 (_tmp1_, "frame") != 0) { -#line 344 "/run/media/triton/Guerre/jhbuild/jhbuild/gnome-taquin/src/game-window.vala" +#line 346 "/run/media/triton/Guerre/jhbuild/jhbuild/gnome-taquin/src/game-window.vala" return; -#line 1029 "game-window.c" +#line 1023 "game-window.c" } -#line 346 "/run/media/triton/Guerre/jhbuild/jhbuild/gnome-taquin/src/game-window.vala" +#line 348 "/run/media/triton/Guerre/jhbuild/jhbuild/gnome-taquin/src/game-window.vala" _tmp2_ = self->priv->new_game_button; -#line 346 "/run/media/triton/Guerre/jhbuild/jhbuild/gnome-taquin/src/game-window.vala" +#line 348 "/run/media/triton/Guerre/jhbuild/jhbuild/gnome-taquin/src/game-window.vala" g_object_get ((GtkWidget*) _tmp2_, "is-focus", &_tmp3_, NULL); -#line 346 "/run/media/triton/Guerre/jhbuild/jhbuild/gnome-taquin/src/game-window.vala" +#line 348 "/run/media/triton/Guerre/jhbuild/jhbuild/gnome-taquin/src/game-window.vala" _tmp4_ = _tmp3_; -#line 346 "/run/media/triton/Guerre/jhbuild/jhbuild/gnome-taquin/src/game-window.vala" +#line 348 "/run/media/triton/Guerre/jhbuild/jhbuild/gnome-taquin/src/game-window.vala" if (_tmp4_) { -#line 1039 "game-window.c" +#line 1033 "game-window.c" GtkWidget* _tmp5_ = NULL; -#line 347 "/run/media/triton/Guerre/jhbuild/jhbuild/gnome-taquin/src/game-window.vala" +#line 349 "/run/media/triton/Guerre/jhbuild/jhbuild/gnome-taquin/src/game-window.vala" _tmp5_ = self->priv->view; -#line 347 "/run/media/triton/Guerre/jhbuild/jhbuild/gnome-taquin/src/game-window.vala" +#line 349 "/run/media/triton/Guerre/jhbuild/jhbuild/gnome-taquin/src/game-window.vala" gtk_widget_grab_focus (_tmp5_); -#line 1045 "game-window.c" +#line 1039 "game-window.c" } -#line 348 "/run/media/triton/Guerre/jhbuild/jhbuild/gnome-taquin/src/game-window.vala" +#line 350 "/run/media/triton/Guerre/jhbuild/jhbuild/gnome-taquin/src/game-window.vala" _tmp6_ = self->undo_action; -#line 348 "/run/media/triton/Guerre/jhbuild/jhbuild/gnome-taquin/src/game-window.vala" +#line 350 "/run/media/triton/Guerre/jhbuild/jhbuild/gnome-taquin/src/game-window.vala" g_simple_action_set_enabled (_tmp6_, TRUE); -#line 349 "/run/media/triton/Guerre/jhbuild/jhbuild/gnome-taquin/src/game-window.vala" +#line 351 "/run/media/triton/Guerre/jhbuild/jhbuild/gnome-taquin/src/game-window.vala" g_signal_emit_by_name (self, "redo"); -#line 1053 "game-window.c" +#line 1047 "game-window.c" } static void game_window_hint_cb (GameWindow* self) { GtkStack* _tmp0_ = NULL; const gchar* _tmp1_ = NULL; -#line 352 "/run/media/triton/Guerre/jhbuild/jhbuild/gnome-taquin/src/game-window.vala" - g_return_if_fail (self != NULL); #line 354 "/run/media/triton/Guerre/jhbuild/jhbuild/gnome-taquin/src/game-window.vala" + g_return_if_fail (self != NULL); +#line 356 "/run/media/triton/Guerre/jhbuild/jhbuild/gnome-taquin/src/game-window.vala" _tmp0_ = self->priv->stack; -#line 354 "/run/media/triton/Guerre/jhbuild/jhbuild/gnome-taquin/src/game-window.vala" +#line 356 "/run/media/triton/Guerre/jhbuild/jhbuild/gnome-taquin/src/game-window.vala" _tmp1_ = gtk_stack_get_visible_child_name (_tmp0_); -#line 354 "/run/media/triton/Guerre/jhbuild/jhbuild/gnome-taquin/src/game-window.vala" +#line 356 "/run/media/triton/Guerre/jhbuild/jhbuild/gnome-taquin/src/game-window.vala" if (g_strcmp0 (_tmp1_, "frame") != 0) { -#line 355 "/run/media/triton/Guerre/jhbuild/jhbuild/gnome-taquin/src/game-window.vala" +#line 357 "/run/media/triton/Guerre/jhbuild/jhbuild/gnome-taquin/src/game-window.vala" return; -#line 1070 "game-window.c" +#line 1064 "game-window.c" } -#line 356 "/run/media/triton/Guerre/jhbuild/jhbuild/gnome-taquin/src/game-window.vala" +#line 358 "/run/media/triton/Guerre/jhbuild/jhbuild/gnome-taquin/src/game-window.vala" g_signal_emit_by_name (self, "hint"); -#line 1074 "game-window.c" +#line 1068 "game-window.c" } @@ -1114,7 +1108,7 @@ gtk_widget_class_bind_template_child_full (GTK_WIDGET_CLASS (klass), "new_game_box", FALSE, GameWindow_private_offset + G_STRUCT_OFFSET (GameWindowPrivate, new_game_box)); #line 32 "/run/media/triton/Guerre/jhbuild/jhbuild/gnome-taquin/src/game-window.vala" gtk_widget_class_bind_template_child_full (GTK_WIDGET_CLASS (klass), "side_box", FALSE, GameWindow_private_offset + G_STRUCT_OFFSET (GameWindowPrivate, side_box)); -#line 1118 "game-window.c" +#line 1112 "game-window.c" } @@ -1127,7 +1121,7 @@ self->priv->start_game_button = NULL; #line 32 "/run/media/triton/Guerre/jhbuild/jhbuild/gnome-taquin/src/game-window.vala" gtk_widget_init_template (GTK_WIDGET (self)); -#line 1131 "game-window.c" +#line 1125 "game-window.c" } @@ -1163,7 +1157,7 @@ _g_object_unref0 (self->redo_action); #line 32 "/run/media/triton/Guerre/jhbuild/jhbuild/gnome-taquin/src/game-window.vala" G_OBJECT_CLASS (game_window_parent_class)->finalize (obj); -#line 1167 "game-window.c" +#line 1161 "game-window.c" } diff -Nru gnome-taquin-3.18.1.1/src/game-window.vala gnome-taquin-3.20.2/src/game-window.vala --- gnome-taquin-3.18.1.1/src/game-window.vala 2015-10-02 20:04:26.000000000 +0000 +++ gnome-taquin-3.20.2/src/game-window.vala 2016-03-24 10:46:09.000000000 +0000 @@ -1,6 +1,6 @@ /* -*- Mode: vala; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- * - * Copyright (C) 2015 Arnaud Bonatti + * Copyright (C) 2015-2016 Arnaud Bonatti * * This file is part of a GNOME game. * @@ -151,6 +151,7 @@ Button undo_button = new Button.from_icon_name ("edit-undo-symbolic", Gtk.IconSize.BUTTON); undo_button.action_name = "win.undo"; undo_button.set_tooltip_text (_("Undo your most recent move")); + undo_button.valign = Align.CENTER; undo_button.show (); history_box.pack_start (undo_button, true, true, 0); @@ -159,6 +160,7 @@ Button redo_button = new Button.from_icon_name ("edit-redo-symbolic", Gtk.IconSize.BUTTON); redo_button.action_name = "app.redo"; redo_button.set_tooltip_text (_("Redo your most recent undone move")); + redo_button.valign = Align.CENTER; redo_button.show (); history_box.pack_start (redo_button, true, true, 0); } */ @@ -171,6 +173,7 @@ Button hint_button = new Button.from_icon_name ("dialog-question-symbolic", Gtk.IconSize.BUTTON); hint_button.action_name = "app.hint"; hint_button.set_tooltip_text (_("Receive a hint for your next move")); + hint_button.valign = Align.CENTER; hint_button.show (); controls_box.pack_start (hint_button, true, true, 0); } */ @@ -186,12 +189,11 @@ * * Window events \*/ - private void size_allocate_cb (Allocation allocation) + private void size_allocate_cb () { if (maximized_state || tiled_state) return; - window_width = allocation.width; - window_height = allocation.height; + get_size (out window_width, out window_height); } private bool window_state_event_cb (Gdk.EventWindowState event) diff -Nru gnome-taquin-3.18.1.1/src/Makefile.in gnome-taquin-3.20.2/src/Makefile.in --- gnome-taquin-3.18.1.1/src/Makefile.in 2015-10-15 03:55:13.000000000 +0000 +++ gnome-taquin-3.20.2/src/Makefile.in 2016-05-09 00:14:07.000000000 +0000 @@ -89,7 +89,10 @@ bin_PROGRAMS = gnome-taquin$(EXEEXT) subdir = src ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -am__aclocal_m4_deps = $(top_srcdir)/configure.ac +am__aclocal_m4_deps = $(top_srcdir)/m4/appstream-xml.m4 \ + $(top_srcdir)/m4/gsettings.m4 $(top_srcdir)/m4/intltool.m4 \ + $(top_srcdir)/m4/nls.m4 $(top_srcdir)/m4/pkg.m4 \ + $(top_srcdir)/m4/yelp.m4 $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) DIST_COMMON = $(srcdir)/Makefile.am $(am__DIST_COMMON) @@ -192,7 +195,6 @@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ DESKTOP_FILE_VALIDATE = @DESKTOP_FILE_VALIDATE@ -DISABLE_DEPRECATED = @DISABLE_DEPRECATED@ ECHO_C = @ECHO_C@ ECHO_N = @ECHO_N@ ECHO_T = @ECHO_T@ diff -Nru gnome-taquin-3.18.1.1/src/taquin-game.c gnome-taquin-3.20.2/src/taquin-game.c --- gnome-taquin-3.18.1.1/src/taquin-game.c 2015-10-15 03:55:25.000000000 +0000 +++ gnome-taquin-3.20.2/src/taquin-game.c 2016-05-09 00:14:14.000000000 +0000 @@ -1,9 +1,9 @@ -/* taquin-game.c generated by valac 0.30.0.3-b11d, the Vala compiler +/* taquin-game.c generated by valac 0.32.0.13-d82f, the Vala compiler * generated from taquin-game.vala, do not modify */ /* -*- Mode: vala; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- * - * Copyright (C) 2014 Arnaud Bonatti + * Copyright (C) 2014-2016 Arnaud Bonatti * * This file is part of Taquin. * diff -Nru gnome-taquin-3.18.1.1/src/taquin-game.vala gnome-taquin-3.20.2/src/taquin-game.vala --- gnome-taquin-3.18.1.1/src/taquin-game.vala 2015-10-02 20:04:26.000000000 +0000 +++ gnome-taquin-3.20.2/src/taquin-game.vala 2016-03-24 10:46:09.000000000 +0000 @@ -1,6 +1,6 @@ /* -*- Mode: vala; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- * - * Copyright (C) 2014 Arnaud Bonatti + * Copyright (C) 2014-2016 Arnaud Bonatti * * This file is part of Taquin. * diff -Nru gnome-taquin-3.18.1.1/src/taquin-main.c gnome-taquin-3.20.2/src/taquin-main.c --- gnome-taquin-3.18.1.1/src/taquin-main.c 2015-10-15 03:55:25.000000000 +0000 +++ gnome-taquin-3.20.2/src/taquin-main.c 2016-05-09 00:14:14.000000000 +0000 @@ -1,9 +1,9 @@ -/* taquin-main.c generated by valac 0.30.0.3-b11d, the Vala compiler +/* taquin-main.c generated by valac 0.32.0.13-d82f, the Vala compiler * generated from taquin-main.vala, do not modify */ /* -*- Mode: vala; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- * - * Copyright (C) 2014-2015 Arnaud Bonatti + * Copyright (C) 2014-2016 Arnaud Bonatti * * This file is part of Taquin. * @@ -948,15 +948,15 @@ gchar result = '\0'; glong _tmp0_ = 0L; gchar _tmp1_ = '\0'; -#line 996 "/run/media/triton/Guerre/jhbuild/slash/share/vala-0.30/vapi/glib-2.0.vapi" +#line 1086 "/run/media/triton/Guerre/jhbuild/slash/share/vala-0.32/vapi/glib-2.0.vapi" g_return_val_if_fail (self != NULL, '\0'); -#line 997 "/run/media/triton/Guerre/jhbuild/slash/share/vala-0.30/vapi/glib-2.0.vapi" +#line 1087 "/run/media/triton/Guerre/jhbuild/slash/share/vala-0.32/vapi/glib-2.0.vapi" _tmp0_ = index; -#line 997 "/run/media/triton/Guerre/jhbuild/slash/share/vala-0.30/vapi/glib-2.0.vapi" +#line 1087 "/run/media/triton/Guerre/jhbuild/slash/share/vala-0.32/vapi/glib-2.0.vapi" _tmp1_ = ((gchar*) self)[_tmp0_]; -#line 997 "/run/media/triton/Guerre/jhbuild/slash/share/vala-0.30/vapi/glib-2.0.vapi" +#line 1087 "/run/media/triton/Guerre/jhbuild/slash/share/vala-0.32/vapi/glib-2.0.vapi" result = _tmp1_; -#line 997 "/run/media/triton/Guerre/jhbuild/slash/share/vala-0.30/vapi/glib-2.0.vapi" +#line 1087 "/run/media/triton/Guerre/jhbuild/slash/share/vala-0.32/vapi/glib-2.0.vapi" return result; #line 962 "taquin-main.c" } @@ -1310,15 +1310,15 @@ #line 227 "/run/media/triton/Guerre/jhbuild/jhbuild/gnome-taquin/src/taquin-main.vala" _authors_size_ = authors_length1; #line 228 "/run/media/triton/Guerre/jhbuild/jhbuild/gnome-taquin/src/taquin-main.vala" - _tmp2_ = g_strdup ("Ola Einang (Flickr)"); + _tmp2_ = g_strdup ("Abelard (Wikimedia)"); #line 228 "/run/media/triton/Guerre/jhbuild/jhbuild/gnome-taquin/src/taquin-main.vala" - _tmp3_ = g_strdup ("Ruskis (Wikimedia)"); + _tmp3_ = g_strdup ("Alvesgaspar (Wikimedia)"); #line 228 "/run/media/triton/Guerre/jhbuild/jhbuild/gnome-taquin/src/taquin-main.vala" - _tmp4_ = g_strdup ("Alvesgaspar (Wikimedia)"); + _tmp4_ = g_strdup ("Mueller-rech.muenchen (Wikimedia)"); #line 228 "/run/media/triton/Guerre/jhbuild/jhbuild/gnome-taquin/src/taquin-main.vala" - _tmp5_ = g_strdup ("Mark J. Sebastian (Flickr)"); + _tmp5_ = g_strdup ("Ruskis (Wikimedia)"); #line 228 "/run/media/triton/Guerre/jhbuild/jhbuild/gnome-taquin/src/taquin-main.vala" - _tmp6_ = g_strdup ("Mueller-rech.muenchen (Wikimedia)"); + _tmp6_ = g_strdup ("Toyah (Wikimedia)"); #line 228 "/run/media/triton/Guerre/jhbuild/jhbuild/gnome-taquin/src/taquin-main.vala" _tmp7_ = _ ("(see COPYING.themes for informations)"); #line 228 "/run/media/triton/Guerre/jhbuild/jhbuild/gnome-taquin/src/taquin-main.vala" @@ -1368,7 +1368,7 @@ #line 236 "/run/media/triton/Guerre/jhbuild/jhbuild/gnome-taquin/src/taquin-main.vala" _tmp15_ = _ ("translator-credits"); #line 236 "/run/media/triton/Guerre/jhbuild/jhbuild/gnome-taquin/src/taquin-main.vala" - gtk_show_about_dialog ((GtkWindow*) _tmp12_, "name", _tmp13_, "version", VERSION, "copyright", "Copyright © 2014-2015 Arnaud Bonatti", "license-type", GTK_LICENSE_GPL_3_0, "comments", _tmp14_, "authors", authors, "artists", artists, "documenters", documenters, "translator-credits", _tmp15_, "logo-icon-name", "gnome-taquin", "website", "https://wiki.gnome.org/Apps/Taquin", NULL, NULL); + gtk_show_about_dialog ((GtkWindow*) _tmp12_, "name", _tmp13_, "version", VERSION, "copyright", "Copyright © 2014-2016 Arnaud Bonatti", "license-type", GTK_LICENSE_GPL_3_0, "comments", _tmp14_, "authors", authors, "artists", artists, "documenters", documenters, "translator-credits", _tmp15_, "logo-icon-name", "gnome-taquin", "website", "https://wiki.gnome.org/Apps/Taquin", NULL, NULL); #line 225 "/run/media/triton/Guerre/jhbuild/jhbuild/gnome-taquin/src/taquin-main.vala" documenters = (_vala_array_free (documenters, documenters_length1, (GDestroyNotify) g_free), NULL); #line 225 "/run/media/triton/Guerre/jhbuild/jhbuild/gnome-taquin/src/taquin-main.vala" diff -Nru gnome-taquin-3.18.1.1/src/taquin-main.vala gnome-taquin-3.20.2/src/taquin-main.vala --- gnome-taquin-3.18.1.1/src/taquin-main.vala 2015-10-02 20:04:26.000000000 +0000 +++ gnome-taquin-3.20.2/src/taquin-main.vala 2016-03-24 10:46:09.000000000 +0000 @@ -1,6 +1,6 @@ /* -*- Mode: vala; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- * - * Copyright (C) 2014-2015 Arnaud Bonatti + * Copyright (C) 2014-2016 Arnaud Bonatti * * This file is part of Taquin. * @@ -225,18 +225,18 @@ private void about_cb () { string[] authors = { "Arnaud Bonatti", null }; - string[] artists = { "Ola Einang (Flickr)", - "Ruskis (Wikimedia)", + string[] artists = { "Abelard (Wikimedia)", "Alvesgaspar (Wikimedia)", - "Mark J. Sebastian (Flickr)", "Mueller-rech.muenchen (Wikimedia)", + "Ruskis (Wikimedia)", + "Toyah (Wikimedia)", _("(see COPYING.themes for informations)"), null }; string[] documenters = { "Arnaud Bonatti", null }; show_about_dialog (window, "name", _("Taquin"), "version", VERSION, - "copyright", "Copyright © 2014-2015 Arnaud Bonatti", + "copyright", "Copyright © 2014-2016 Arnaud Bonatti", "license-type", License.GPL_3_0, "comments", _("A classic 15-puzzle game"), "authors", authors, diff -Nru gnome-taquin-3.18.1.1/src/taquin-resources.c gnome-taquin-3.20.2/src/taquin-resources.c --- gnome-taquin-3.18.1.1/src/taquin-resources.c 2015-10-15 03:55:24.000000000 +0000 +++ gnome-taquin-3.20.2/src/taquin-resources.c 2016-05-09 00:14:12.000000000 +0000 @@ -6,7 +6,7 @@ # define SECTION #endif -static const SECTION union { const guint8 data[329872]; const double alignment; void * const ptr;} taquin_resource_data = { { +static const SECTION union { const guint8 data[331120]; const double alignment; void * const ptr;} taquin_resource_data = { { 0x47, 0x56, 0x61, 0x72, 0x69, 0x61, 0x6e, 0x74, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x18, 0x00, 0x00, 0x00, 0x8c, 0x01, 0x00, 0x00, @@ -38,25 +38,25 @@ 0xd8, 0x75, 0x02, 0x00, 0xe7, 0x2e, 0xb8, 0x71, 0x09, 0x00, 0x00, 0x00, 0xd8, 0x75, 0x02, 0x00, 0x0a, 0x00, 0x76, 0x00, 0xe8, 0x75, 0x02, 0x00, - 0x07, 0x7b, 0x02, 0x00, 0xc6, 0x14, 0x1c, 0xd3, - 0x0c, 0x00, 0x00, 0x00, 0x07, 0x7b, 0x02, 0x00, - 0x0d, 0x00, 0x76, 0x00, 0x18, 0x7b, 0x02, 0x00, - 0x40, 0xec, 0x04, 0x00, 0xbc, 0x66, 0xfc, 0x2f, - 0x09, 0x00, 0x00, 0x00, 0x40, 0xec, 0x04, 0x00, - 0x11, 0x00, 0x76, 0x00, 0x58, 0xec, 0x04, 0x00, - 0xd4, 0xfa, 0x04, 0x00, 0x3e, 0x5a, 0x9f, 0x0e, - 0x0a, 0x00, 0x00, 0x00, 0xd4, 0xfa, 0x04, 0x00, - 0x03, 0x00, 0x4c, 0x00, 0xd8, 0xfa, 0x04, 0x00, - 0xe4, 0xfa, 0x04, 0x00, 0x71, 0xe4, 0xf9, 0x67, - 0x03, 0x00, 0x00, 0x00, 0xe4, 0xfa, 0x04, 0x00, - 0x07, 0x00, 0x4c, 0x00, 0xec, 0xfa, 0x04, 0x00, - 0xf8, 0xfa, 0x04, 0x00, 0xe9, 0x85, 0x66, 0x87, - 0x09, 0x00, 0x00, 0x00, 0xf8, 0xfa, 0x04, 0x00, - 0x0e, 0x00, 0x76, 0x00, 0x08, 0xfb, 0x04, 0x00, - 0x7e, 0x08, 0x05, 0x00, 0x96, 0x13, 0x7b, 0x18, - 0x0a, 0x00, 0x00, 0x00, 0x7e, 0x08, 0x05, 0x00, - 0x07, 0x00, 0x4c, 0x00, 0x88, 0x08, 0x05, 0x00, - 0x90, 0x08, 0x05, 0x00, 0x2f, 0x00, 0x00, 0x00, + 0xe6, 0x7f, 0x02, 0x00, 0xc6, 0x14, 0x1c, 0xd3, + 0x0c, 0x00, 0x00, 0x00, 0xe6, 0x7f, 0x02, 0x00, + 0x0d, 0x00, 0x76, 0x00, 0xf8, 0x7f, 0x02, 0x00, + 0x20, 0xf1, 0x04, 0x00, 0xbc, 0x66, 0xfc, 0x2f, + 0x09, 0x00, 0x00, 0x00, 0x20, 0xf1, 0x04, 0x00, + 0x11, 0x00, 0x76, 0x00, 0x38, 0xf1, 0x04, 0x00, + 0xb4, 0xff, 0x04, 0x00, 0x3e, 0x5a, 0x9f, 0x0e, + 0x0a, 0x00, 0x00, 0x00, 0xb4, 0xff, 0x04, 0x00, + 0x03, 0x00, 0x4c, 0x00, 0xb8, 0xff, 0x04, 0x00, + 0xc4, 0xff, 0x04, 0x00, 0x71, 0xe4, 0xf9, 0x67, + 0x03, 0x00, 0x00, 0x00, 0xc4, 0xff, 0x04, 0x00, + 0x07, 0x00, 0x4c, 0x00, 0xcc, 0xff, 0x04, 0x00, + 0xd8, 0xff, 0x04, 0x00, 0xe9, 0x85, 0x66, 0x87, + 0x09, 0x00, 0x00, 0x00, 0xd8, 0xff, 0x04, 0x00, + 0x0e, 0x00, 0x76, 0x00, 0xe8, 0xff, 0x04, 0x00, + 0x5e, 0x0d, 0x05, 0x00, 0x96, 0x13, 0x7b, 0x18, + 0x0a, 0x00, 0x00, 0x00, 0x5e, 0x0d, 0x05, 0x00, + 0x07, 0x00, 0x4c, 0x00, 0x68, 0x0d, 0x05, 0x00, + 0x70, 0x0d, 0x05, 0x00, 0x2f, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x67, 0x74, 0x6b, 0x2f, 0x04, 0x00, 0x00, 0x00, 0x6f, 0x72, 0x67, 0x2f, 0x03, 0x00, 0x00, 0x00, 0x67, 0x6e, 0x6f, 0x6d, @@ -20164,72 +20164,193 @@ 0x00, 0x00, 0x28, 0x75, 0x75, 0x61, 0x79, 0x29, 0x74, 0x61, 0x71, 0x75, 0x69, 0x6e, 0x2e, 0x63, 0x73, 0x73, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x0f, 0x05, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0xee, 0x09, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x2f, 0x2a, 0x20, 0x43, 0x6f, 0x70, 0x79, 0x72, + 0x69, 0x67, 0x68, 0x74, 0x20, 0x28, 0x43, 0x29, + 0x20, 0x32, 0x30, 0x31, 0x35, 0x2d, 0x32, 0x30, + 0x31, 0x36, 0x20, 0x41, 0x72, 0x6e, 0x61, 0x75, + 0x64, 0x20, 0x42, 0x6f, 0x6e, 0x61, 0x74, 0x74, + 0x69, 0x20, 0x3c, 0x61, 0x72, 0x6e, 0x61, 0x75, + 0x64, 0x2e, 0x62, 0x6f, 0x6e, 0x61, 0x74, 0x74, + 0x69, 0x40, 0x67, 0x6d, 0x61, 0x69, 0x6c, 0x2e, + 0x63, 0x6f, 0x6d, 0x3e, 0x0a, 0x20, 0x2a, 0x0a, + 0x20, 0x2a, 0x20, 0x54, 0x68, 0x69, 0x73, 0x20, + 0x66, 0x69, 0x6c, 0x65, 0x20, 0x69, 0x73, 0x20, + 0x70, 0x61, 0x72, 0x74, 0x20, 0x6f, 0x66, 0x20, + 0x47, 0x4e, 0x4f, 0x4d, 0x45, 0x20, 0x54, 0x61, + 0x71, 0x75, 0x69, 0x6e, 0x2e, 0x0a, 0x20, 0x2a, + 0x0a, 0x20, 0x2a, 0x20, 0x47, 0x4e, 0x4f, 0x4d, + 0x45, 0x20, 0x54, 0x61, 0x71, 0x75, 0x69, 0x6e, + 0x20, 0x69, 0x73, 0x20, 0x66, 0x72, 0x65, 0x65, + 0x20, 0x73, 0x6f, 0x66, 0x74, 0x77, 0x61, 0x72, + 0x65, 0x3a, 0x20, 0x79, 0x6f, 0x75, 0x20, 0x63, + 0x61, 0x6e, 0x20, 0x72, 0x65, 0x64, 0x69, 0x73, + 0x74, 0x72, 0x69, 0x62, 0x75, 0x74, 0x65, 0x20, + 0x69, 0x74, 0x20, 0x61, 0x6e, 0x64, 0x2f, 0x6f, + 0x72, 0x20, 0x6d, 0x6f, 0x64, 0x69, 0x66, 0x79, + 0x0a, 0x20, 0x2a, 0x20, 0x69, 0x74, 0x20, 0x75, + 0x6e, 0x64, 0x65, 0x72, 0x20, 0x74, 0x68, 0x65, + 0x20, 0x74, 0x65, 0x72, 0x6d, 0x73, 0x20, 0x6f, + 0x66, 0x20, 0x74, 0x68, 0x65, 0x20, 0x47, 0x4e, + 0x55, 0x20, 0x47, 0x65, 0x6e, 0x65, 0x72, 0x61, + 0x6c, 0x20, 0x50, 0x75, 0x62, 0x6c, 0x69, 0x63, + 0x20, 0x4c, 0x69, 0x63, 0x65, 0x6e, 0x73, 0x65, + 0x20, 0x61, 0x73, 0x20, 0x70, 0x75, 0x62, 0x6c, + 0x69, 0x73, 0x68, 0x65, 0x64, 0x20, 0x62, 0x79, + 0x0a, 0x20, 0x2a, 0x20, 0x74, 0x68, 0x65, 0x20, + 0x46, 0x72, 0x65, 0x65, 0x20, 0x53, 0x6f, 0x66, + 0x74, 0x77, 0x61, 0x72, 0x65, 0x20, 0x46, 0x6f, + 0x75, 0x6e, 0x64, 0x61, 0x74, 0x69, 0x6f, 0x6e, + 0x2c, 0x20, 0x65, 0x69, 0x74, 0x68, 0x65, 0x72, + 0x20, 0x76, 0x65, 0x72, 0x73, 0x69, 0x6f, 0x6e, + 0x20, 0x33, 0x20, 0x6f, 0x66, 0x20, 0x74, 0x68, + 0x65, 0x20, 0x4c, 0x69, 0x63, 0x65, 0x6e, 0x73, + 0x65, 0x2c, 0x20, 0x6f, 0x72, 0x0a, 0x20, 0x2a, + 0x20, 0x28, 0x61, 0x74, 0x20, 0x79, 0x6f, 0x75, + 0x72, 0x20, 0x6f, 0x70, 0x74, 0x69, 0x6f, 0x6e, + 0x29, 0x20, 0x61, 0x6e, 0x79, 0x20, 0x6c, 0x61, + 0x74, 0x65, 0x72, 0x20, 0x76, 0x65, 0x72, 0x73, + 0x69, 0x6f, 0x6e, 0x2e, 0x0a, 0x20, 0x2a, 0x0a, + 0x20, 0x2a, 0x20, 0x47, 0x4e, 0x4f, 0x4d, 0x45, + 0x20, 0x54, 0x61, 0x71, 0x75, 0x69, 0x6e, 0x20, + 0x69, 0x73, 0x20, 0x64, 0x69, 0x73, 0x74, 0x72, + 0x69, 0x62, 0x75, 0x74, 0x65, 0x64, 0x20, 0x69, + 0x6e, 0x20, 0x74, 0x68, 0x65, 0x20, 0x68, 0x6f, + 0x70, 0x65, 0x20, 0x74, 0x68, 0x61, 0x74, 0x20, + 0x69, 0x74, 0x20, 0x77, 0x69, 0x6c, 0x6c, 0x20, + 0x62, 0x65, 0x20, 0x75, 0x73, 0x65, 0x66, 0x75, + 0x6c, 0x2c, 0x0a, 0x20, 0x2a, 0x20, 0x62, 0x75, + 0x74, 0x20, 0x57, 0x49, 0x54, 0x48, 0x4f, 0x55, + 0x54, 0x20, 0x41, 0x4e, 0x59, 0x20, 0x57, 0x41, + 0x52, 0x52, 0x41, 0x4e, 0x54, 0x59, 0x3b, 0x20, + 0x77, 0x69, 0x74, 0x68, 0x6f, 0x75, 0x74, 0x20, + 0x65, 0x76, 0x65, 0x6e, 0x20, 0x74, 0x68, 0x65, + 0x20, 0x69, 0x6d, 0x70, 0x6c, 0x69, 0x65, 0x64, + 0x20, 0x77, 0x61, 0x72, 0x72, 0x61, 0x6e, 0x74, + 0x79, 0x20, 0x6f, 0x66, 0x0a, 0x20, 0x2a, 0x20, + 0x4d, 0x45, 0x52, 0x43, 0x48, 0x41, 0x4e, 0x54, + 0x41, 0x42, 0x49, 0x4c, 0x49, 0x54, 0x59, 0x20, + 0x6f, 0x72, 0x20, 0x46, 0x49, 0x54, 0x4e, 0x45, + 0x53, 0x53, 0x20, 0x46, 0x4f, 0x52, 0x20, 0x41, + 0x20, 0x50, 0x41, 0x52, 0x54, 0x49, 0x43, 0x55, + 0x4c, 0x41, 0x52, 0x20, 0x50, 0x55, 0x52, 0x50, + 0x4f, 0x53, 0x45, 0x2e, 0x20, 0x20, 0x53, 0x65, + 0x65, 0x20, 0x74, 0x68, 0x65, 0x0a, 0x20, 0x2a, + 0x20, 0x47, 0x4e, 0x55, 0x20, 0x47, 0x65, 0x6e, + 0x65, 0x72, 0x61, 0x6c, 0x20, 0x50, 0x75, 0x62, + 0x6c, 0x69, 0x63, 0x20, 0x4c, 0x69, 0x63, 0x65, + 0x6e, 0x73, 0x65, 0x20, 0x66, 0x6f, 0x72, 0x20, + 0x6d, 0x6f, 0x72, 0x65, 0x20, 0x64, 0x65, 0x74, + 0x61, 0x69, 0x6c, 0x73, 0x2e, 0x0a, 0x20, 0x2a, + 0x0a, 0x20, 0x2a, 0x20, 0x59, 0x6f, 0x75, 0x20, + 0x73, 0x68, 0x6f, 0x75, 0x6c, 0x64, 0x20, 0x68, + 0x61, 0x76, 0x65, 0x20, 0x72, 0x65, 0x63, 0x65, + 0x69, 0x76, 0x65, 0x64, 0x20, 0x61, 0x20, 0x63, + 0x6f, 0x70, 0x79, 0x20, 0x6f, 0x66, 0x20, 0x74, + 0x68, 0x65, 0x20, 0x47, 0x4e, 0x55, 0x20, 0x47, + 0x65, 0x6e, 0x65, 0x72, 0x61, 0x6c, 0x20, 0x50, + 0x75, 0x62, 0x6c, 0x69, 0x63, 0x20, 0x4c, 0x69, + 0x63, 0x65, 0x6e, 0x73, 0x65, 0x20, 0x61, 0x6c, + 0x6f, 0x6e, 0x67, 0x0a, 0x20, 0x2a, 0x20, 0x77, + 0x69, 0x74, 0x68, 0x20, 0x74, 0x68, 0x69, 0x73, + 0x20, 0x61, 0x70, 0x70, 0x6c, 0x69, 0x63, 0x61, + 0x74, 0x69, 0x6f, 0x6e, 0x2e, 0x20, 0x49, 0x66, + 0x20, 0x6e, 0x6f, 0x74, 0x2c, 0x20, 0x73, 0x65, + 0x65, 0x20, 0x3c, 0x68, 0x74, 0x74, 0x70, 0x3a, + 0x2f, 0x2f, 0x77, 0x77, 0x77, 0x2e, 0x67, 0x6e, + 0x75, 0x2e, 0x6f, 0x72, 0x67, 0x2f, 0x6c, 0x69, + 0x63, 0x65, 0x6e, 0x73, 0x65, 0x73, 0x2f, 0x3e, + 0x2e, 0x0a, 0x20, 0x2a, 0x2f, 0x0a, 0x0a, 0x2f, + 0x2a, 0x20, 0x47, 0x74, 0x6b, 0x58, 0x79, 0x7a, + 0x20, 0x69, 0x73, 0x20, 0x70, 0x72, 0x65, 0x2d, + 0x33, 0x2e, 0x31, 0x39, 0x2e, 0x6e, 0x20, 0x2a, + 0x2f, 0x0a, 0x0a, 0x47, 0x74, 0x6b, 0x4d, 0x6f, + 0x64, 0x65, 0x6c, 0x42, 0x75, 0x74, 0x74, 0x6f, + 0x6e, 0x2e, 0x72, 0x61, 0x64, 0x69, 0x6f, 0x2d, + 0x6c, 0x69, 0x6b, 0x65, 0x2d, 0x74, 0x6f, 0x67, + 0x67, 0x6c, 0x65, 0x23, 0x72, 0x61, 0x64, 0x69, + 0x6f, 0x2d, 0x66, 0x69, 0x66, 0x74, 0x65, 0x65, + 0x6e, 0x2c, 0x0a, 0x62, 0x75, 0x74, 0x74, 0x6f, + 0x6e, 0x2e, 0x72, 0x61, 0x64, 0x69, 0x6f, 0x2d, + 0x6c, 0x69, 0x6b, 0x65, 0x2d, 0x74, 0x6f, 0x67, + 0x67, 0x6c, 0x65, 0x23, 0x72, 0x61, 0x64, 0x69, + 0x6f, 0x2d, 0x66, 0x69, 0x66, 0x74, 0x65, 0x65, + 0x6e, 0x20, 0x7b, 0x0a, 0x20, 0x20, 0x20, 0x20, + 0x62, 0x61, 0x63, 0x6b, 0x67, 0x72, 0x6f, 0x75, + 0x6e, 0x64, 0x2d, 0x69, 0x6d, 0x61, 0x67, 0x65, + 0x3a, 0x20, 0x75, 0x72, 0x6c, 0x28, 0x22, 0x72, + 0x65, 0x73, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x3a, + 0x2f, 0x2f, 0x6f, 0x72, 0x67, 0x2f, 0x67, 0x6e, + 0x6f, 0x6d, 0x65, 0x2f, 0x74, 0x61, 0x71, 0x75, + 0x69, 0x6e, 0x2f, 0x69, 0x6d, 0x61, 0x67, 0x65, + 0x73, 0x2f, 0x31, 0x35, 0x2d, 0x50, 0x75, 0x7a, + 0x7a, 0x6c, 0x65, 0x2e, 0x70, 0x6e, 0x67, 0x22, + 0x29, 0x3b, 0x0a, 0x7d, 0x0a, 0x47, 0x74, 0x6b, + 0x4d, 0x6f, 0x64, 0x65, 0x6c, 0x42, 0x75, 0x74, + 0x74, 0x6f, 0x6e, 0x2e, 0x72, 0x61, 0x64, 0x69, + 0x6f, 0x2d, 0x6c, 0x69, 0x6b, 0x65, 0x2d, 0x74, + 0x6f, 0x67, 0x67, 0x6c, 0x65, 0x23, 0x72, 0x61, + 0x64, 0x69, 0x6f, 0x2d, 0x73, 0x69, 0x78, 0x74, + 0x65, 0x65, 0x6e, 0x2c, 0x0a, 0x62, 0x75, 0x74, + 0x74, 0x6f, 0x6e, 0x2e, 0x72, 0x61, 0x64, 0x69, + 0x6f, 0x2d, 0x6c, 0x69, 0x6b, 0x65, 0x2d, 0x74, + 0x6f, 0x67, 0x67, 0x6c, 0x65, 0x23, 0x72, 0x61, + 0x64, 0x69, 0x6f, 0x2d, 0x73, 0x69, 0x78, 0x74, + 0x65, 0x65, 0x6e, 0x20, 0x7b, 0x0a, 0x20, 0x20, + 0x20, 0x20, 0x62, 0x61, 0x63, 0x6b, 0x67, 0x72, + 0x6f, 0x75, 0x6e, 0x64, 0x2d, 0x69, 0x6d, 0x61, + 0x67, 0x65, 0x3a, 0x20, 0x75, 0x72, 0x6c, 0x28, + 0x22, 0x72, 0x65, 0x73, 0x6f, 0x75, 0x72, 0x63, + 0x65, 0x3a, 0x2f, 0x2f, 0x6f, 0x72, 0x67, 0x2f, + 0x67, 0x6e, 0x6f, 0x6d, 0x65, 0x2f, 0x74, 0x61, + 0x71, 0x75, 0x69, 0x6e, 0x2f, 0x69, 0x6d, 0x61, + 0x67, 0x65, 0x73, 0x2f, 0x31, 0x36, 0x2d, 0x50, + 0x75, 0x7a, 0x7a, 0x6c, 0x65, 0x2e, 0x70, 0x6e, + 0x67, 0x22, 0x29, 0x3b, 0x0a, 0x7d, 0x0a, 0x0a, 0x47, 0x74, 0x6b, 0x4d, 0x6f, 0x64, 0x65, 0x6c, 0x42, 0x75, 0x74, 0x74, 0x6f, 0x6e, 0x2e, 0x72, 0x61, 0x64, 0x69, 0x6f, 0x2d, 0x6c, 0x69, 0x6b, 0x65, 0x2d, 0x74, 0x6f, 0x67, 0x67, 0x6c, 0x65, - 0x23, 0x72, 0x61, 0x64, 0x69, 0x6f, 0x2d, 0x66, - 0x69, 0x66, 0x74, 0x65, 0x65, 0x6e, 0x20, 0x7b, - 0x0a, 0x20, 0x20, 0x20, 0x20, 0x62, 0x61, 0x63, - 0x6b, 0x67, 0x72, 0x6f, 0x75, 0x6e, 0x64, 0x2d, - 0x69, 0x6d, 0x61, 0x67, 0x65, 0x3a, 0x20, 0x75, - 0x72, 0x6c, 0x28, 0x22, 0x72, 0x65, 0x73, 0x6f, - 0x75, 0x72, 0x63, 0x65, 0x3a, 0x2f, 0x2f, 0x6f, - 0x72, 0x67, 0x2f, 0x67, 0x6e, 0x6f, 0x6d, 0x65, - 0x2f, 0x74, 0x61, 0x71, 0x75, 0x69, 0x6e, 0x2f, - 0x69, 0x6d, 0x61, 0x67, 0x65, 0x73, 0x2f, 0x31, - 0x35, 0x2d, 0x50, 0x75, 0x7a, 0x7a, 0x6c, 0x65, - 0x2e, 0x70, 0x6e, 0x67, 0x22, 0x29, 0x3b, 0x0a, - 0x7d, 0x0a, 0x47, 0x74, 0x6b, 0x4d, 0x6f, 0x64, - 0x65, 0x6c, 0x42, 0x75, 0x74, 0x74, 0x6f, 0x6e, + 0x2c, 0x0a, 0x62, 0x75, 0x74, 0x74, 0x6f, 0x6e, 0x2e, 0x72, 0x61, 0x64, 0x69, 0x6f, 0x2d, 0x6c, 0x69, 0x6b, 0x65, 0x2d, 0x74, 0x6f, 0x67, 0x67, - 0x6c, 0x65, 0x23, 0x72, 0x61, 0x64, 0x69, 0x6f, - 0x2d, 0x73, 0x69, 0x78, 0x74, 0x65, 0x65, 0x6e, - 0x20, 0x7b, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x62, - 0x61, 0x63, 0x6b, 0x67, 0x72, 0x6f, 0x75, 0x6e, - 0x64, 0x2d, 0x69, 0x6d, 0x61, 0x67, 0x65, 0x3a, - 0x20, 0x75, 0x72, 0x6c, 0x28, 0x22, 0x72, 0x65, - 0x73, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x3a, 0x2f, - 0x2f, 0x6f, 0x72, 0x67, 0x2f, 0x67, 0x6e, 0x6f, - 0x6d, 0x65, 0x2f, 0x74, 0x61, 0x71, 0x75, 0x69, - 0x6e, 0x2f, 0x69, 0x6d, 0x61, 0x67, 0x65, 0x73, - 0x2f, 0x31, 0x36, 0x2d, 0x50, 0x75, 0x7a, 0x7a, - 0x6c, 0x65, 0x2e, 0x70, 0x6e, 0x67, 0x22, 0x29, - 0x3b, 0x0a, 0x7d, 0x0a, 0x0a, 0x47, 0x74, 0x6b, - 0x4d, 0x6f, 0x64, 0x65, 0x6c, 0x42, 0x75, 0x74, - 0x74, 0x6f, 0x6e, 0x2e, 0x72, 0x61, 0x64, 0x69, - 0x6f, 0x2d, 0x6c, 0x69, 0x6b, 0x65, 0x2d, 0x74, - 0x6f, 0x67, 0x67, 0x6c, 0x65, 0x20, 0x7b, 0x0a, - 0x20, 0x20, 0x20, 0x20, 0x62, 0x61, 0x63, 0x6b, - 0x67, 0x72, 0x6f, 0x75, 0x6e, 0x64, 0x2d, 0x72, - 0x65, 0x70, 0x65, 0x61, 0x74, 0x3a, 0x20, 0x6e, - 0x6f, 0x2d, 0x72, 0x65, 0x70, 0x65, 0x61, 0x74, - 0x3b, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x62, 0x61, - 0x63, 0x6b, 0x67, 0x72, 0x6f, 0x75, 0x6e, 0x64, - 0x2d, 0x70, 0x6f, 0x73, 0x69, 0x74, 0x69, 0x6f, - 0x6e, 0x3a, 0x20, 0x63, 0x65, 0x6e, 0x74, 0x65, - 0x72, 0x20, 0x32, 0x35, 0x70, 0x78, 0x3b, 0x0a, - 0x20, 0x20, 0x20, 0x20, 0x63, 0x6f, 0x6c, 0x6f, - 0x72, 0x3a, 0x20, 0x40, 0x74, 0x68, 0x65, 0x6d, - 0x65, 0x5f, 0x66, 0x67, 0x5f, 0x63, 0x6f, 0x6c, - 0x6f, 0x72, 0x3b, 0x0a, 0x20, 0x20, 0x20, 0x20, - 0x62, 0x61, 0x63, 0x6b, 0x67, 0x72, 0x6f, 0x75, - 0x6e, 0x64, 0x2d, 0x63, 0x6f, 0x6c, 0x6f, 0x72, - 0x3a, 0x20, 0x74, 0x72, 0x61, 0x6e, 0x73, 0x70, - 0x61, 0x72, 0x65, 0x6e, 0x74, 0x3b, 0x0a, 0x7d, - 0x0a, 0x47, 0x74, 0x6b, 0x4d, 0x6f, 0x64, 0x65, - 0x6c, 0x42, 0x75, 0x74, 0x74, 0x6f, 0x6e, 0x2e, + 0x6c, 0x65, 0x20, 0x7b, 0x0a, 0x20, 0x20, 0x20, + 0x20, 0x62, 0x61, 0x63, 0x6b, 0x67, 0x72, 0x6f, + 0x75, 0x6e, 0x64, 0x2d, 0x72, 0x65, 0x70, 0x65, + 0x61, 0x74, 0x3a, 0x20, 0x6e, 0x6f, 0x2d, 0x72, + 0x65, 0x70, 0x65, 0x61, 0x74, 0x3b, 0x0a, 0x20, + 0x20, 0x20, 0x20, 0x62, 0x61, 0x63, 0x6b, 0x67, + 0x72, 0x6f, 0x75, 0x6e, 0x64, 0x2d, 0x70, 0x6f, + 0x73, 0x69, 0x74, 0x69, 0x6f, 0x6e, 0x3a, 0x20, + 0x63, 0x65, 0x6e, 0x74, 0x65, 0x72, 0x20, 0x32, + 0x35, 0x70, 0x78, 0x3b, 0x0a, 0x20, 0x20, 0x20, + 0x20, 0x63, 0x6f, 0x6c, 0x6f, 0x72, 0x3a, 0x20, + 0x40, 0x74, 0x68, 0x65, 0x6d, 0x65, 0x5f, 0x66, + 0x67, 0x5f, 0x63, 0x6f, 0x6c, 0x6f, 0x72, 0x3b, + 0x0a, 0x20, 0x20, 0x20, 0x20, 0x62, 0x61, 0x63, + 0x6b, 0x67, 0x72, 0x6f, 0x75, 0x6e, 0x64, 0x2d, + 0x63, 0x6f, 0x6c, 0x6f, 0x72, 0x3a, 0x20, 0x74, + 0x72, 0x61, 0x6e, 0x73, 0x70, 0x61, 0x72, 0x65, + 0x6e, 0x74, 0x3b, 0x0a, 0x7d, 0x0a, 0x47, 0x74, + 0x6b, 0x4d, 0x6f, 0x64, 0x65, 0x6c, 0x42, 0x75, + 0x74, 0x74, 0x6f, 0x6e, 0x2e, 0x72, 0x61, 0x64, + 0x69, 0x6f, 0x2d, 0x6c, 0x69, 0x6b, 0x65, 0x2d, + 0x74, 0x6f, 0x67, 0x67, 0x6c, 0x65, 0x20, 0x47, + 0x74, 0x6b, 0x4c, 0x61, 0x62, 0x65, 0x6c, 0x2c, + 0x0a, 0x62, 0x75, 0x74, 0x74, 0x6f, 0x6e, 0x2e, 0x72, 0x61, 0x64, 0x69, 0x6f, 0x2d, 0x6c, 0x69, 0x6b, 0x65, 0x2d, 0x74, 0x6f, 0x67, 0x67, 0x6c, - 0x65, 0x20, 0x47, 0x74, 0x6b, 0x4c, 0x61, 0x62, - 0x65, 0x6c, 0x20, 0x7b, 0x0a, 0x20, 0x20, 0x20, - 0x20, 0x70, 0x61, 0x64, 0x64, 0x69, 0x6e, 0x67, - 0x2d, 0x62, 0x6f, 0x74, 0x74, 0x6f, 0x6d, 0x3a, - 0x20, 0x31, 0x36, 0x35, 0x70, 0x78, 0x3b, 0x0a, - 0x7d, 0x0a, 0x47, 0x74, 0x6b, 0x4d, 0x6f, 0x64, - 0x65, 0x6c, 0x42, 0x75, 0x74, 0x74, 0x6f, 0x6e, + 0x65, 0x20, 0x6c, 0x61, 0x62, 0x65, 0x6c, 0x20, + 0x7b, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x70, 0x61, + 0x64, 0x64, 0x69, 0x6e, 0x67, 0x2d, 0x62, 0x6f, + 0x74, 0x74, 0x6f, 0x6d, 0x3a, 0x20, 0x31, 0x36, + 0x35, 0x70, 0x78, 0x3b, 0x0a, 0x7d, 0x0a, 0x47, + 0x74, 0x6b, 0x4d, 0x6f, 0x64, 0x65, 0x6c, 0x42, + 0x75, 0x74, 0x74, 0x6f, 0x6e, 0x2e, 0x72, 0x61, + 0x64, 0x69, 0x6f, 0x2d, 0x6c, 0x69, 0x6b, 0x65, + 0x2d, 0x74, 0x6f, 0x67, 0x67, 0x6c, 0x65, 0x3a, + 0x62, 0x61, 0x63, 0x6b, 0x64, 0x72, 0x6f, 0x70, + 0x2c, 0x0a, 0x62, 0x75, 0x74, 0x74, 0x6f, 0x6e, 0x2e, 0x72, 0x61, 0x64, 0x69, 0x6f, 0x2d, 0x6c, 0x69, 0x6b, 0x65, 0x2d, 0x74, 0x6f, 0x67, 0x67, 0x6c, 0x65, 0x3a, 0x62, 0x61, 0x63, 0x6b, 0x64, @@ -20254,82 +20375,117 @@ 0x20, 0x20, 0x20, 0x6f, 0x75, 0x74, 0x6c, 0x69, 0x6e, 0x65, 0x2d, 0x72, 0x61, 0x64, 0x69, 0x75, 0x73, 0x3a, 0x31, 0x33, 0x70, 0x78, 0x3b, 0x0a, - 0x7d, 0x0a, 0x0a, 0x47, 0x74, 0x6b, 0x4d, 0x65, - 0x6e, 0x75, 0x42, 0x75, 0x74, 0x74, 0x6f, 0x6e, - 0x2e, 0x6d, 0x65, 0x6e, 0x75, 0x62, 0x75, 0x74, - 0x74, 0x6f, 0x6e, 0x2d, 0x6c, 0x69, 0x6b, 0x65, - 0x2d, 0x63, 0x6f, 0x6d, 0x62, 0x6f, 0x3a, 0x63, - 0x68, 0x65, 0x63, 0x6b, 0x65, 0x64, 0x2c, 0x0a, - 0x47, 0x74, 0x6b, 0x4d, 0x65, 0x6e, 0x75, 0x42, + 0x7d, 0x0a, 0x62, 0x75, 0x74, 0x74, 0x6f, 0x6e, + 0x2e, 0x72, 0x61, 0x64, 0x69, 0x6f, 0x2d, 0x6c, + 0x69, 0x6b, 0x65, 0x2d, 0x74, 0x6f, 0x67, 0x67, + 0x6c, 0x65, 0x2c, 0x0a, 0x62, 0x75, 0x74, 0x74, + 0x6f, 0x6e, 0x2e, 0x6d, 0x65, 0x6e, 0x75, 0x62, + 0x75, 0x74, 0x74, 0x6f, 0x6e, 0x2d, 0x6c, 0x69, + 0x6b, 0x65, 0x2d, 0x63, 0x6f, 0x6d, 0x62, 0x6f, + 0x20, 0x7b, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x62, + 0x6f, 0x72, 0x64, 0x65, 0x72, 0x2d, 0x72, 0x61, + 0x64, 0x69, 0x75, 0x73, 0x3a, 0x31, 0x35, 0x70, + 0x78, 0x3b, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x2d, + 0x67, 0x74, 0x6b, 0x2d, 0x6f, 0x75, 0x74, 0x6c, + 0x69, 0x6e, 0x65, 0x2d, 0x72, 0x61, 0x64, 0x69, + 0x75, 0x73, 0x3a, 0x31, 0x33, 0x70, 0x78, 0x3b, + 0x0a, 0x7d, 0x0a, 0x0a, 0x47, 0x74, 0x6b, 0x4d, + 0x65, 0x6e, 0x75, 0x42, 0x75, 0x74, 0x74, 0x6f, + 0x6e, 0x2e, 0x6d, 0x65, 0x6e, 0x75, 0x62, 0x75, + 0x74, 0x74, 0x6f, 0x6e, 0x2d, 0x6c, 0x69, 0x6b, + 0x65, 0x2d, 0x63, 0x6f, 0x6d, 0x62, 0x6f, 0x3a, + 0x63, 0x68, 0x65, 0x63, 0x6b, 0x65, 0x64, 0x2c, + 0x0a, 0x47, 0x74, 0x6b, 0x4d, 0x65, 0x6e, 0x75, + 0x42, 0x75, 0x74, 0x74, 0x6f, 0x6e, 0x2e, 0x6d, + 0x65, 0x6e, 0x75, 0x62, 0x75, 0x74, 0x74, 0x6f, + 0x6e, 0x2d, 0x6c, 0x69, 0x6b, 0x65, 0x2d, 0x63, + 0x6f, 0x6d, 0x62, 0x6f, 0x3a, 0x70, 0x72, 0x65, + 0x6c, 0x69, 0x67, 0x68, 0x74, 0x2c, 0x0a, 0x62, 0x75, 0x74, 0x74, 0x6f, 0x6e, 0x2e, 0x6d, 0x65, 0x6e, 0x75, 0x62, 0x75, 0x74, 0x74, 0x6f, 0x6e, 0x2d, 0x6c, 0x69, 0x6b, 0x65, 0x2d, 0x63, 0x6f, - 0x6d, 0x62, 0x6f, 0x3a, 0x70, 0x72, 0x65, 0x6c, - 0x69, 0x67, 0x68, 0x74, 0x20, 0x7b, 0x0a, 0x20, - 0x20, 0x20, 0x20, 0x63, 0x6f, 0x6c, 0x6f, 0x72, - 0x3a, 0x23, 0x32, 0x65, 0x33, 0x34, 0x33, 0x36, - 0x3b, 0x20, 0x2f, 0x2a, 0x20, 0x67, 0x74, 0x6b, - 0x2d, 0x63, 0x6f, 0x6e, 0x74, 0x61, 0x69, 0x6e, - 0x65, 0x64, 0x2e, 0x63, 0x73, 0x73, 0xe2, 0x80, - 0x99, 0x20, 0x74, 0x68, 0x65, 0x6d, 0x65, 0x5f, - 0x66, 0x67, 0x5f, 0x63, 0x6f, 0x6c, 0x6f, 0x72, - 0x20, 0x2a, 0x2f, 0x0a, 0x20, 0x20, 0x20, 0x20, - 0x62, 0x61, 0x63, 0x6b, 0x67, 0x72, 0x6f, 0x75, - 0x6e, 0x64, 0x3a, 0x2d, 0x67, 0x74, 0x6b, 0x2d, - 0x67, 0x72, 0x61, 0x64, 0x69, 0x65, 0x6e, 0x74, - 0x20, 0x28, 0x72, 0x61, 0x64, 0x69, 0x61, 0x6c, - 0x2c, 0x20, 0x63, 0x65, 0x6e, 0x74, 0x65, 0x72, - 0x20, 0x63, 0x65, 0x6e, 0x74, 0x65, 0x72, 0x2c, - 0x20, 0x30, 0x2c, 0x20, 0x63, 0x65, 0x6e, 0x74, - 0x65, 0x72, 0x20, 0x63, 0x65, 0x6e, 0x74, 0x65, - 0x72, 0x2c, 0x20, 0x30, 0x2e, 0x35, 0x2c, 0x20, - 0x66, 0x72, 0x6f, 0x6d, 0x28, 0x72, 0x67, 0x62, + 0x6d, 0x62, 0x6f, 0x3a, 0x63, 0x68, 0x65, 0x63, + 0x6b, 0x65, 0x64, 0x2c, 0x0a, 0x62, 0x75, 0x74, + 0x74, 0x6f, 0x6e, 0x2e, 0x6d, 0x65, 0x6e, 0x75, + 0x62, 0x75, 0x74, 0x74, 0x6f, 0x6e, 0x2d, 0x6c, + 0x69, 0x6b, 0x65, 0x2d, 0x63, 0x6f, 0x6d, 0x62, + 0x6f, 0x3a, 0x68, 0x6f, 0x76, 0x65, 0x72, 0x20, + 0x7b, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x63, 0x6f, + 0x6c, 0x6f, 0x72, 0x3a, 0x23, 0x32, 0x65, 0x33, + 0x34, 0x33, 0x36, 0x3b, 0x20, 0x2f, 0x2a, 0x20, + 0x67, 0x74, 0x6b, 0x2d, 0x63, 0x6f, 0x6e, 0x74, + 0x61, 0x69, 0x6e, 0x65, 0x64, 0x2e, 0x63, 0x73, + 0x73, 0xe2, 0x80, 0x99, 0x20, 0x74, 0x68, 0x65, + 0x6d, 0x65, 0x5f, 0x66, 0x67, 0x5f, 0x63, 0x6f, + 0x6c, 0x6f, 0x72, 0x20, 0x2a, 0x2f, 0x0a, 0x20, + 0x20, 0x20, 0x20, 0x62, 0x61, 0x63, 0x6b, 0x67, + 0x72, 0x6f, 0x75, 0x6e, 0x64, 0x3a, 0x2d, 0x67, + 0x74, 0x6b, 0x2d, 0x67, 0x72, 0x61, 0x64, 0x69, + 0x65, 0x6e, 0x74, 0x20, 0x28, 0x72, 0x61, 0x64, + 0x69, 0x61, 0x6c, 0x2c, 0x20, 0x63, 0x65, 0x6e, + 0x74, 0x65, 0x72, 0x20, 0x63, 0x65, 0x6e, 0x74, + 0x65, 0x72, 0x2c, 0x20, 0x30, 0x2c, 0x20, 0x63, + 0x65, 0x6e, 0x74, 0x65, 0x72, 0x20, 0x63, 0x65, + 0x6e, 0x74, 0x65, 0x72, 0x2c, 0x20, 0x30, 0x2e, + 0x35, 0x2c, 0x20, 0x66, 0x72, 0x6f, 0x6d, 0x28, + 0x72, 0x67, 0x62, 0x61, 0x20, 0x28, 0x32, 0x35, + 0x35, 0x2c, 0x20, 0x32, 0x35, 0x35, 0x2c, 0x20, + 0x32, 0x35, 0x35, 0x2c, 0x20, 0x31, 0x29, 0x29, + 0x2c, 0x20, 0x74, 0x6f, 0x28, 0x72, 0x67, 0x62, 0x61, 0x20, 0x28, 0x32, 0x35, 0x35, 0x2c, 0x20, 0x32, 0x35, 0x35, 0x2c, 0x20, 0x32, 0x35, 0x35, - 0x2c, 0x20, 0x31, 0x29, 0x29, 0x2c, 0x20, 0x74, - 0x6f, 0x28, 0x72, 0x67, 0x62, 0x61, 0x20, 0x28, - 0x32, 0x35, 0x35, 0x2c, 0x20, 0x32, 0x35, 0x35, - 0x2c, 0x20, 0x32, 0x35, 0x35, 0x2c, 0x20, 0x30, - 0x29, 0x29, 0x29, 0x3b, 0x0a, 0x7d, 0x0a, 0x47, - 0x74, 0x6b, 0x4d, 0x65, 0x6e, 0x75, 0x42, 0x75, + 0x2c, 0x20, 0x30, 0x29, 0x29, 0x29, 0x3b, 0x0a, + 0x7d, 0x0a, 0x47, 0x74, 0x6b, 0x4d, 0x65, 0x6e, + 0x75, 0x42, 0x75, 0x74, 0x74, 0x6f, 0x6e, 0x2e, + 0x6d, 0x65, 0x6e, 0x75, 0x62, 0x75, 0x74, 0x74, + 0x6f, 0x6e, 0x2d, 0x6c, 0x69, 0x6b, 0x65, 0x2d, + 0x63, 0x6f, 0x6d, 0x62, 0x6f, 0x3a, 0x63, 0x68, + 0x65, 0x63, 0x6b, 0x65, 0x64, 0x3a, 0x62, 0x61, + 0x63, 0x6b, 0x64, 0x72, 0x6f, 0x70, 0x2c, 0x0a, + 0x47, 0x74, 0x6b, 0x4d, 0x65, 0x6e, 0x75, 0x42, + 0x75, 0x74, 0x74, 0x6f, 0x6e, 0x2e, 0x6d, 0x65, + 0x6e, 0x75, 0x62, 0x75, 0x74, 0x74, 0x6f, 0x6e, + 0x2d, 0x6c, 0x69, 0x6b, 0x65, 0x2d, 0x63, 0x6f, + 0x6d, 0x62, 0x6f, 0x3a, 0x70, 0x72, 0x65, 0x6c, + 0x69, 0x67, 0x68, 0x74, 0x3a, 0x62, 0x61, 0x63, + 0x6b, 0x64, 0x72, 0x6f, 0x70, 0x2c, 0x0a, 0x62, + 0x75, 0x74, 0x74, 0x6f, 0x6e, 0x2e, 0x6d, 0x65, + 0x6e, 0x75, 0x62, 0x75, 0x74, 0x74, 0x6f, 0x6e, + 0x2d, 0x6c, 0x69, 0x6b, 0x65, 0x2d, 0x63, 0x6f, + 0x6d, 0x62, 0x6f, 0x3a, 0x63, 0x68, 0x65, 0x63, + 0x6b, 0x65, 0x64, 0x3a, 0x62, 0x61, 0x63, 0x6b, + 0x64, 0x72, 0x6f, 0x70, 0x2c, 0x0a, 0x62, 0x75, 0x74, 0x74, 0x6f, 0x6e, 0x2e, 0x6d, 0x65, 0x6e, 0x75, 0x62, 0x75, 0x74, 0x74, 0x6f, 0x6e, 0x2d, 0x6c, 0x69, 0x6b, 0x65, 0x2d, 0x63, 0x6f, 0x6d, - 0x62, 0x6f, 0x3a, 0x63, 0x68, 0x65, 0x63, 0x6b, - 0x65, 0x64, 0x3a, 0x62, 0x61, 0x63, 0x6b, 0x64, - 0x72, 0x6f, 0x70, 0x2c, 0x0a, 0x47, 0x74, 0x6b, - 0x4d, 0x65, 0x6e, 0x75, 0x42, 0x75, 0x74, 0x74, - 0x6f, 0x6e, 0x2e, 0x6d, 0x65, 0x6e, 0x75, 0x62, - 0x75, 0x74, 0x74, 0x6f, 0x6e, 0x2d, 0x6c, 0x69, - 0x6b, 0x65, 0x2d, 0x63, 0x6f, 0x6d, 0x62, 0x6f, - 0x3a, 0x70, 0x72, 0x65, 0x6c, 0x69, 0x67, 0x68, - 0x74, 0x3a, 0x62, 0x61, 0x63, 0x6b, 0x64, 0x72, - 0x6f, 0x70, 0x20, 0x7b, 0x0a, 0x20, 0x20, 0x20, - 0x20, 0x63, 0x6f, 0x6c, 0x6f, 0x72, 0x3a, 0x40, - 0x74, 0x68, 0x65, 0x6d, 0x65, 0x5f, 0x75, 0x6e, - 0x66, 0x6f, 0x63, 0x75, 0x73, 0x65, 0x64, 0x5f, - 0x66, 0x67, 0x5f, 0x63, 0x6f, 0x6c, 0x6f, 0x72, - 0x3b, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x62, 0x61, - 0x63, 0x6b, 0x67, 0x72, 0x6f, 0x75, 0x6e, 0x64, - 0x3a, 0x2d, 0x67, 0x74, 0x6b, 0x2d, 0x67, 0x72, - 0x61, 0x64, 0x69, 0x65, 0x6e, 0x74, 0x20, 0x28, - 0x72, 0x61, 0x64, 0x69, 0x61, 0x6c, 0x2c, 0x20, - 0x63, 0x65, 0x6e, 0x74, 0x65, 0x72, 0x20, 0x63, - 0x65, 0x6e, 0x74, 0x65, 0x72, 0x2c, 0x20, 0x30, - 0x2c, 0x20, 0x63, 0x65, 0x6e, 0x74, 0x65, 0x72, - 0x20, 0x63, 0x65, 0x6e, 0x74, 0x65, 0x72, 0x2c, - 0x20, 0x30, 0x2e, 0x35, 0x2c, 0x20, 0x66, 0x72, - 0x6f, 0x6d, 0x28, 0x72, 0x67, 0x62, 0x61, 0x20, - 0x28, 0x32, 0x35, 0x35, 0x2c, 0x20, 0x32, 0x35, - 0x35, 0x2c, 0x20, 0x32, 0x35, 0x35, 0x2c, 0x20, - 0x30, 0x2e, 0x33, 0x29, 0x29, 0x2c, 0x20, 0x74, - 0x6f, 0x28, 0x72, 0x67, 0x62, 0x61, 0x20, 0x28, + 0x62, 0x6f, 0x3a, 0x68, 0x6f, 0x76, 0x65, 0x72, + 0x3a, 0x62, 0x61, 0x63, 0x6b, 0x64, 0x72, 0x6f, + 0x70, 0x20, 0x7b, 0x0a, 0x20, 0x20, 0x20, 0x20, + 0x63, 0x6f, 0x6c, 0x6f, 0x72, 0x3a, 0x40, 0x74, + 0x68, 0x65, 0x6d, 0x65, 0x5f, 0x75, 0x6e, 0x66, + 0x6f, 0x63, 0x75, 0x73, 0x65, 0x64, 0x5f, 0x66, + 0x67, 0x5f, 0x63, 0x6f, 0x6c, 0x6f, 0x72, 0x3b, + 0x0a, 0x20, 0x20, 0x20, 0x20, 0x62, 0x61, 0x63, + 0x6b, 0x67, 0x72, 0x6f, 0x75, 0x6e, 0x64, 0x3a, + 0x2d, 0x67, 0x74, 0x6b, 0x2d, 0x67, 0x72, 0x61, + 0x64, 0x69, 0x65, 0x6e, 0x74, 0x20, 0x28, 0x72, + 0x61, 0x64, 0x69, 0x61, 0x6c, 0x2c, 0x20, 0x63, + 0x65, 0x6e, 0x74, 0x65, 0x72, 0x20, 0x63, 0x65, + 0x6e, 0x74, 0x65, 0x72, 0x2c, 0x20, 0x30, 0x2c, + 0x20, 0x63, 0x65, 0x6e, 0x74, 0x65, 0x72, 0x20, + 0x63, 0x65, 0x6e, 0x74, 0x65, 0x72, 0x2c, 0x20, + 0x30, 0x2e, 0x35, 0x2c, 0x20, 0x66, 0x72, 0x6f, + 0x6d, 0x28, 0x72, 0x67, 0x62, 0x61, 0x20, 0x28, 0x32, 0x35, 0x35, 0x2c, 0x20, 0x32, 0x35, 0x35, 0x2c, 0x20, 0x32, 0x35, 0x35, 0x2c, 0x20, 0x30, - 0x29, 0x29, 0x29, 0x3b, 0x0a, 0x7d, 0x0a, 0x00, - 0x00, 0x28, 0x75, 0x75, 0x61, 0x79, 0x29, 0x31, - 0x35, 0x2d, 0x50, 0x75, 0x7a, 0x7a, 0x6c, 0x65, - 0x2e, 0x70, 0x6e, 0x67, 0x00, 0x00, 0x00, 0x00, + 0x2e, 0x33, 0x29, 0x29, 0x2c, 0x20, 0x74, 0x6f, + 0x28, 0x72, 0x67, 0x62, 0x61, 0x20, 0x28, 0x32, + 0x35, 0x35, 0x2c, 0x20, 0x32, 0x35, 0x35, 0x2c, + 0x20, 0x32, 0x35, 0x35, 0x2c, 0x20, 0x30, 0x29, + 0x29, 0x29, 0x3b, 0x0a, 0x7d, 0x0a, 0x00, 0x00, + 0x28, 0x75, 0x75, 0x61, 0x79, 0x29, 0x31, 0x35, + 0x2d, 0x50, 0x75, 0x7a, 0x7a, 0x6c, 0x65, 0x2e, + 0x70, 0x6e, 0x67, 0x00, 0x00, 0x00, 0x00, 0x00, 0x18, 0x71, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x47, 0x64, 0x6b, 0x50, 0x00, 0x02, 0x71, 0x18, 0x01, 0x01, 0x00, 0x02, 0x00, 0x00, 0x03, 0x20, @@ -41281,17 +41437,43 @@ #define G_HAS_CONSTRUCTORS 1 -#define G_DEFINE_CONSTRUCTOR(_func) \ +/* We do some weird things to avoid the constructors being optimized + * away on VS2015 if WholeProgramOptimization is enabled. First we + * make a reference to the array from the wrapper to make sure its + * references. Then we use a pragma to make sure the wrapper function + * symbol is always included at the link stage. Also, the symbols + * need to be extern (but not dllexport), even though they are not + * really used from another object file. + */ + +/* We need to account for differences between the mangling of symbols + * for Win32 (x86) and x64 programs, as symbols on Win32 are prefixed + * with an underscore but symbols on x64 are not. + */ +#ifdef _WIN64 +#define G_MSVC_SYMBOL_PREFIX "" +#else +#define G_MSVC_SYMBOL_PREFIX "_" +#endif + +#define G_DEFINE_CONSTRUCTOR(_func) G_MSVC_CTOR (_func, G_MSVC_SYMBOL_PREFIX) +#define G_DEFINE_DESTRUCTOR(_func) G_MSVC_DTOR (_func, G_MSVC_SYMBOL_PREFIX) + +#define G_MSVC_CTOR(_func,_sym_prefix) \ static void _func(void); \ - static int _func ## _wrapper(void) { _func(); return 0; } \ + extern int (* _array ## _func)(void); \ + int _func ## _wrapper(void) { _func(); g_slist_find (NULL, _array ## _func); return 0; } \ + __pragma(comment(linker,"/include:" _sym_prefix # _func "_wrapper")) \ __pragma(section(".CRT$XCU",read)) \ - __declspec(allocate(".CRT$XCU")) static int (* _array ## _func)(void) = _func ## _wrapper; + __declspec(allocate(".CRT$XCU")) int (* _array ## _func)(void) = _func ## _wrapper; -#define G_DEFINE_DESTRUCTOR(_func) \ +#define G_MSVC_DTOR(_func,_sym_prefix) \ static void _func(void); \ - static int _func ## _constructor(void) { atexit (_func); return 0; } \ + extern int (* _array ## _func)(void); \ + int _func ## _constructor(void) { atexit (_func); g_slist_find (NULL, _array ## _func); return 0; } \ + __pragma(comment(linker,"/include:" _sym_prefix # _func "_constructor")) \ __pragma(section(".CRT$XCU",read)) \ - __declspec(allocate(".CRT$XCU")) static int (* _array ## _func)(void) = _func ## _constructor; + __declspec(allocate(".CRT$XCU")) int (* _array ## _func)(void) = _func ## _constructor; #elif defined (_MSC_VER) diff -Nru gnome-taquin-3.18.1.1/src/taquin-view.c gnome-taquin-3.20.2/src/taquin-view.c --- gnome-taquin-3.18.1.1/src/taquin-view.c 2015-10-15 03:55:25.000000000 +0000 +++ gnome-taquin-3.20.2/src/taquin-view.c 2016-05-09 00:14:14.000000000 +0000 @@ -1,9 +1,9 @@ -/* taquin-view.c generated by valac 0.30.0.3-b11d, the Vala compiler +/* taquin-view.c generated by valac 0.32.0.13-d82f, the Vala compiler * generated from taquin-view.vala, do not modify */ /* -*- Mode: vala; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- * - * Copyright (C) 2014 Arnaud Bonatti + * Copyright (C) 2014-2016 Arnaud Bonatti * * This file is part of Taquin. * diff -Nru gnome-taquin-3.18.1.1/src/taquin-view.vala gnome-taquin-3.20.2/src/taquin-view.vala --- gnome-taquin-3.18.1.1/src/taquin-view.vala 2015-10-02 20:04:26.000000000 +0000 +++ gnome-taquin-3.20.2/src/taquin-view.vala 2016-03-24 10:46:09.000000000 +0000 @@ -1,6 +1,6 @@ /* -*- Mode: vala; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- * - * Copyright (C) 2014 Arnaud Bonatti + * Copyright (C) 2014-2016 Arnaud Bonatti * * This file is part of Taquin. *