Hello community,
here is the log from the commit of package five-or-more for openSUSE:Factory checked in at 2016-08-05 18:17:21
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/five-or-more (Old)
and /work/SRC/openSUSE:Factory/.five-or-more.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "five-or-more"
Changes:
--------
--- /work/SRC/openSUSE:Factory/five-or-more/five-or-more.changes 2016-03-29 14:41:06.000000000 +0200
+++ /work/SRC/openSUSE:Factory/.five-or-more.new/five-or-more.changes 2016-08-05 18:17:27.000000000 +0200
@@ -1,0 +2,8 @@
+Sun Jul 31 06:46:30 UTC 2016 - zaitor@opensuse.org
+
+- Update to version 3.20.1:
+ + Fix Quit menu item and keyboard shortcut.
+ + Fix window size growing out of control with GTK+ 3.20.
+ + Updated translations.
+
+-------------------------------------------------------------------
Old:
----
five-or-more-3.20.0.tar.xz
New:
----
five-or-more-3.20.1.tar.xz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ five-or-more.spec ++++++
--- /var/tmp/diff_new_pack.acXUXy/_old 2016-08-05 18:17:28.000000000 +0200
+++ /var/tmp/diff_new_pack.acXUXy/_new 2016-08-05 18:17:28.000000000 +0200
@@ -17,7 +17,7 @@
Name: five-or-more
-Version: 3.20.0
+Version: 3.20.1
Release: 0
Summary: "Five or More" Game for GNOME
License: GPL-2.0+
++++++ five-or-more-3.20.0.tar.xz -> five-or-more-3.20.1.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/five-or-more-3.20.0/NEWS new/five-or-more-3.20.1/NEWS
--- old/five-or-more-3.20.0/NEWS 2016-03-22 08:20:46.000000000 +0100
+++ new/five-or-more-3.20.1/NEWS 2016-07-31 06:06:49.000000000 +0200
@@ -1,3 +1,10 @@
+3.20.1 - July 30, 2016
+======================
+
+* Fix Quit menu item and keyboard shortcut
+* Fix window size growing out of control with GTK+ 3.20
+* Updated translations
+
3.20.0 - March 22, 2016
==================
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/five-or-more-3.20.0/configure new/five-or-more-3.20.1/configure
--- old/five-or-more-3.20.0/configure 2016-03-22 08:22:02.000000000 +0100
+++ new/five-or-more-3.20.1/configure 2016-07-31 06:07:32.000000000 +0200
@@ -1,6 +1,6 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.69 for Five or More 3.20.0.
+# Generated by GNU Autoconf 2.69 for Five or More 3.20.1.
#
# Report bugs to https://bugzilla.gnome.org/.
#
@@ -579,8 +579,8 @@
# Identity of this package.
PACKAGE_NAME='Five or More'
PACKAGE_TARNAME='five-or-more'
-PACKAGE_VERSION='3.20.0'
-PACKAGE_STRING='Five or More 3.20.0'
+PACKAGE_VERSION='3.20.1'
+PACKAGE_STRING='Five or More 3.20.1'
PACKAGE_BUGREPORT='https://bugzilla.gnome.org/'
PACKAGE_URL='https://wiki.gnome.org/Apps/Five%20or%20more'
@@ -1295,7 +1295,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 Five or More 3.20.0 to adapt to many kinds of systems.
+\`configure' configures Five or More 3.20.1 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@@ -1361,7 +1361,7 @@
if test -n "$ac_init_help"; then
case $ac_init_help in
- short | recursive ) echo "Configuration of Five or More 3.20.0:";;
+ short | recursive ) echo "Configuration of Five or More 3.20.1:";;
esac
cat <<\_ACEOF
@@ -1477,7 +1477,7 @@
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
-Five or More configure 3.20.0
+Five or More configure 3.20.1
generated by GNU Autoconf 2.69
Copyright (C) 2012 Free Software Foundation, Inc.
@@ -1532,7 +1532,7 @@
This file contains any messages produced by compilers while
running configure, to aid debugging if configure makes a mistake.
-It was created by Five or More $as_me 3.20.0, which was
+It was created by Five or More $as_me 3.20.1, which was
generated by GNU Autoconf 2.69. Invocation command line was
$ $0 $@
@@ -2397,7 +2397,7 @@
# Define the identity of the package.
PACKAGE='five-or-more'
- VERSION='3.20.0'
+ VERSION='3.20.1'
cat >>confdefs.h <<_ACEOF
@@ -5527,7 +5527,7 @@
# report actual input values of CONFIG_FILES etc. instead of their
# values after options handling.
ac_log="
-This file was extended by Five or More $as_me 3.20.0, which was
+This file was extended by Five or More $as_me 3.20.1, which was
generated by GNU Autoconf 2.69. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@@ -5594,7 +5594,7 @@
cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
ac_cs_version="\\
-Five or More config.status 3.20.0
+Five or More config.status 3.20.1
configured by $0, generated by GNU Autoconf 2.69,
with options \\"\$ac_cs_config\\"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/five-or-more-3.20.0/configure.ac new/five-or-more-3.20.1/configure.ac
--- old/five-or-more-3.20.0/configure.ac 2016-03-22 08:20:47.000000000 +0100
+++ new/five-or-more-3.20.1/configure.ac 2016-07-31 06:07:10.000000000 +0200
@@ -1,5 +1,5 @@
AC_PREREQ([2.63])
-AC_INIT([Five or More], [3.20.0], [https://bugzilla.gnome.org/],
+AC_INIT([Five or More], [3.20.1], [https://bugzilla.gnome.org/],
[five-or-more], [https://wiki.gnome.org/Apps/Five%20or%20more])
AC_CONFIG_MACRO_DIR([m4])
Files old/five-or-more-3.20.0/help/ca/figures/glines-gameover.png and new/five-or-more-3.20.1/help/ca/figures/glines-gameover.png differ
Files old/five-or-more-3.20.0/help/cs/figures/glines-gameover.png and new/five-or-more-3.20.1/help/cs/figures/glines-gameover.png differ
Files old/five-or-more-3.20.0/help/el/figures/glines-gameover.png and new/five-or-more-3.20.1/help/el/figures/glines-gameover.png differ
Files old/five-or-more-3.20.0/help/es/figures/glines-gameover.png and new/five-or-more-3.20.1/help/es/figures/glines-gameover.png differ
Files old/five-or-more-3.20.0/help/eu/figures/glines-gameover.png and new/five-or-more-3.20.1/help/eu/figures/glines-gameover.png differ
Files old/five-or-more-3.20.0/help/fr/figures/glines-gameover.png and new/five-or-more-3.20.1/help/fr/figures/glines-gameover.png differ
Files old/five-or-more-3.20.0/help/it/figures/glines-gameover.png and new/five-or-more-3.20.1/help/it/figures/glines-gameover.png differ
Files old/five-or-more-3.20.0/help/sr/figures/glines-gameover.png and new/five-or-more-3.20.1/help/sr/figures/glines-gameover.png differ
Files old/five-or-more-3.20.0/help/sr@latin/figures/glines-gameover.png and new/five-or-more-3.20.1/help/sr@latin/figures/glines-gameover.png differ
Files old/five-or-more-3.20.0/help/sv/figures/glines-gameover.png and new/five-or-more-3.20.1/help/sv/figures/glines-gameover.png differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/five-or-more-3.20.0/help/sv/legal.xml new/five-or-more-3.20.1/help/sv/legal.xml
--- old/five-or-more-3.20.0/help/sv/legal.xml 2016-03-22 08:22:20.000000000 +0100
+++ new/five-or-more-3.20.1/help/sv/legal.xml 2016-07-31 05:52:19.000000000 +0200
@@ -1,4 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
<license xmlns="http://projectmallard.org/1.0/" href="http://creativecommons.org/licenses/by-sa/3.0/">
- <p>Detta verk är licensierat under <link href="http://creativecommons.org/licenses/by-sa/3.0/">licensen Creative Commons Erkännande-DelaLika 3.0 Unported</link>.</p>
+ <p>Detta verk är licensierat under licensen <link href="http://creativecommons.org/licenses/by-sa/3.0/">Creative Commons Erkännande-DelaLika 3.0 Unported</link>.</p>
</license>
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/five-or-more-3.20.0/help/sv/license.page new/five-or-more-3.20.1/help/sv/license.page
--- old/five-or-more-3.20.0/help/sv/license.page 2016-03-22 08:22:20.000000000 +0100
+++ new/five-or-more-3.20.1/help/sv/license.page 2016-07-31 05:52:19.000000000 +0200
@@ -22,7 +22,7 @@
<title>Licens</title>
<p>Det här verket är distribuerat under licensen CreativeCommons Erkännande-DelaLika 3.0 Unported.</p>
- <p>Du har rätt:</p>
+ <p>Du har tillstånd:</p>
<terms>
<item>
<title><em>Att dela</em></title>
@@ -33,14 +33,14 @@
<p>Att anpassa programmet.</p>
</item>
</terms>
- <p>Under följande förhållanden:</p>
+ <p>På följande villkor:</p>
<terms>
<item>
<title><em>Erkännande</em></title>
<p>Du måste ge erkännande åt verket på det sätt som anges av författaren eller licensgivaren (men inte på ett sätt som antyder att de godkänt eller rekommenderar din användning av verket).</p>
</item>
<item>
- <title><em>Dela vidare</em></title>
+ <title><em>Dela lika</em></title>
<p>Om du ändrar, bearbetar eller bygger vidare på verket, får du distribuera resultatet endast under samma, liknande, eller en kompatibel licens.</p>
</item>
</terms>
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/five-or-more-3.20.0/help/sv/sv.po new/five-or-more-3.20.1/help/sv/sv.po
--- old/five-or-more-3.20.0/help/sv/sv.po 2016-03-22 08:19:55.000000000 +0100
+++ new/five-or-more-3.20.1/help/sv/sv.po 2016-07-31 05:45:28.000000000 +0200
@@ -4,16 +4,16 @@
msgid ""
msgstr ""
"Project-Id-Version: five-or-more.DOC\n"
-"POT-Creation-Date: 2016-02-28 18:25+0000\n"
-"PO-Revision-Date: 2016-02-29 13:53+0100\n"
-"Last-Translator: Erik Sköldås \n"
+"POT-Creation-Date: 2016-05-07 05:32+0000\n"
+"PO-Revision-Date: 2016-06-14 21:45+0200\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"
+"X-Generator: Poedit 1.8.8\n"
#. Put one translator per line, in the form NAME <EMAIL>, YEAR1, YEAR2
msgctxt "_"
@@ -521,12 +521,12 @@
#. (itstool) path: p/link
#: C/legal.xml:3
msgid "Creative Commons Attribution-ShareAlike 3.0 Unported License"
-msgstr "licensen Creative Commons Erkännande-DelaLika 3.0 Unported"
+msgstr "Creative Commons Erkännande-DelaLika 3.0 Unported"
#. (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/>."
+msgstr "Detta verk är licensierat under licensen <_:link-1/>."
#. (itstool) path: info/desc
#: C/license.page:9
@@ -550,7 +550,7 @@
#. (itstool) path: page/p
#: C/license.page:21
msgid "You are free:"
-msgstr "Du har rätt:"
+msgstr "Du har tillstånd:"
#. (itstool) path: item/title
#: C/license.page:26
@@ -575,7 +575,7 @@
#. (itstool) path: page/p
#: C/license.page:34
msgid "Under the following conditions:"
-msgstr "Under följande förhållanden:"
+msgstr "På följande villkor:"
#. (itstool) path: item/title
#: C/license.page:39
@@ -596,7 +596,7 @@
#. (itstool) path: item/title
#: C/license.page:47
msgid "<em>Share Alike</em>"
-msgstr "<em>Dela vidare</em>"
+msgstr "<em>Dela lika</em>"
#. (itstool) path: item/p
#: C/license.page:48
Files old/five-or-more-3.20.0/help/tr/figures/glines-gameover.png and new/five-or-more-3.20.1/help/tr/figures/glines-gameover.png differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/five-or-more-3.20.0/m4/nls.m4 new/five-or-more-3.20.1/m4/nls.m4
--- old/five-or-more-3.20.0/m4/nls.m4 2016-03-22 08:21:54.000000000 +0100
+++ new/five-or-more-3.20.1/m4/nls.m4 2016-07-31 06:07:29.000000000 +0200
@@ -1,6 +1,6 @@
# nls.m4 serial 5 (gettext-0.18)
-dnl Copyright (C) 1995-2003, 2005-2006, 2008-2014 Free Software Foundation,
-dnl Inc.
+dnl Copyright (C) 1995-2003, 2005-2006, 2008-2014, 2016 Free Software
+dnl Foundation, 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.
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/five-or-more-3.20.0/m4/pkg.m4 new/five-or-more-3.20.1/m4/pkg.m4
--- old/five-or-more-3.20.0/m4/pkg.m4 2016-03-22 08:21:54.000000000 +0100
+++ new/five-or-more-3.20.1/m4/pkg.m4 2016-07-31 06:07:29.000000000 +0200
@@ -1,29 +1,60 @@
-# 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])
-# ----------------------------------
+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)))?$])
@@ -45,18 +76,19 @@
PKG_CONFIG=""
fi
fi[]dnl
-])# PKG_PROG_PKG_CONFIG
+])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
-# --------------------------------------------------------------
+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" && \
@@ -66,8 +98,10 @@
$3])dnl
fi])
-# _PKG_CONFIG([VARIABLE], [COMMAND], [MODULES])
-# ---------------------------------------------
+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"
@@ -79,10 +113,11 @@
else
pkg_failed=untried
fi[]dnl
-])# _PKG_CONFIG
+])dnl _PKG_CONFIG
-# _PKG_SHORT_ERRORS_SUPPORTED
-# -----------------------------
+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
@@ -90,19 +125,17 @@
else
_pkg_short_errors_supported=no
fi[]dnl
-])# _PKG_SHORT_ERRORS_SUPPORTED
+])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
-#
-#
-# --------------------------------------------------------------
+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
@@ -156,16 +189,40 @@
AC_MSG_RESULT([yes])
$3
fi[]dnl
-])# PKG_CHECK_MODULES
+])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.
+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],
@@ -176,16 +233,18 @@
AC_SUBST([pkgconfigdir], [$with_pkgconfigdir])
m4_popdef([pkg_default])
m4_popdef([pkg_description])
-]) dnl PKG_INSTALLDIR
+])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.
+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],
@@ -196,13 +255,15 @@
AC_SUBST([noarch_pkgconfigdir], [$with_noarch_pkgconfigdir])
m4_popdef([pkg_default])
m4_popdef([pkg_description])
-]) dnl PKG_NOARCH_INSTALLDIR
+])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.
+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
@@ -211,4 +272,4 @@
AS_VAR_COPY([$1], [pkg_cv_][$1])
AS_VAR_IF([$1], [""], [$5], [$4])dnl
-])# PKG_CHECK_VAR
+])dnl PKG_CHECK_VAR
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/five-or-more-3.20.0/po/am.po new/five-or-more-3.20.1/po/am.po
--- old/five-or-more-3.20.0/po/am.po 2016-03-22 08:19:55.000000000 +0100
+++ new/five-or-more-3.20.1/po/am.po 2016-07-31 05:45:28.000000000 +0200
@@ -12,6 +12,7 @@
"PO-Revision-Date: 2003-01-14 11:02+EDT\n"
"Last-Translator: Ge'ez Frontier Foundation \n"
"Language-Team: Amharic \n"
+"Language: am\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/five-or-more-3.20.0/po/az.po new/five-or-more-3.20.1/po/az.po
--- old/five-or-more-3.20.0/po/az.po 2016-03-22 08:19:55.000000000 +0100
+++ new/five-or-more-3.20.1/po/az.po 2016-07-31 05:45:28.000000000 +0200
@@ -13,6 +13,7 @@
"Last-Translator: Elxan İsmayılov \n"
"Language-Team: Azerbaijani Turkish \n"
+"Language: az\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/five-or-more-3.20.0/po/bn.po new/five-or-more-3.20.1/po/bn.po
--- old/five-or-more-3.20.0/po/bn.po 2016-03-22 08:19:55.000000000 +0100
+++ new/five-or-more-3.20.1/po/bn.po 2016-07-31 05:45:28.000000000 +0200
@@ -14,6 +14,7 @@
"PO-Revision-Date: 2010-03-29 18:57+0600\n"
"Last-Translator: Sadia Afroz \n"
"Language-Team: Bangla \n"
+"Language: bn\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/five-or-more-3.20.0/po/bn_IN.po new/five-or-more-3.20.1/po/bn_IN.po
--- old/five-or-more-3.20.0/po/bn_IN.po 2016-03-22 08:19:55.000000000 +0100
+++ new/five-or-more-3.20.1/po/bn_IN.po 2016-07-31 05:45:28.000000000 +0200
@@ -15,6 +15,7 @@
"PO-Revision-Date: 2009-09-17 19:17+0530\n"
"Last-Translator: Runa Bhattacharjee \n"
"Language-Team: Bengali INDIA \n"
+"Language: bn_IN\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/five-or-more-3.20.0/po/br.po new/five-or-more-3.20.1/po/br.po
--- old/five-or-more-3.20.0/po/br.po 2016-03-22 08:19:55.000000000 +0100
+++ new/five-or-more-3.20.1/po/br.po 2016-07-31 05:45:28.000000000 +0200
@@ -12,6 +12,7 @@
"PO-Revision-Date: 2009-09-05 22:02+0100\n"
"Last-Translator: Denis\n"
"Language-Team: Breton
\n"
+"Language: br\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/five-or-more-3.20.0/po/ca@valencia.po new/five-or-more-3.20.1/po/ca@valencia.po
--- old/five-or-more-3.20.0/po/ca@valencia.po 2016-03-22 08:19:55.000000000 +0100
+++ new/five-or-more-3.20.1/po/ca@valencia.po 2016-07-31 05:45:28.000000000 +0200
@@ -18,7 +18,7 @@
"PO-Revision-Date: 2014-09-05 00:02+0200\n"
"Last-Translator: Gil Forcada \n"
"Language-Team: Catalan \n"
-"Language: ca-XV\n"
+"Language: ca@valencia\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bits\n"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/five-or-more-3.20.0/po/cy.po new/five-or-more-3.20.1/po/cy.po
--- old/five-or-more-3.20.0/po/cy.po 2016-03-22 08:19:55.000000000 +0100
+++ new/five-or-more-3.20.1/po/cy.po 2016-07-31 05:45:28.000000000 +0200
@@ -36,6 +36,7 @@
"PO-Revision-Date: 2009-06-14 16:31+0100\n"
"Last-Translator: Telsa Gwynne \n"
"Language-Team: Cymraeg \n"
+"Language: cy\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/five-or-more-3.20.0/po/de.po new/five-or-more-3.20.1/po/de.po
--- old/five-or-more-3.20.0/po/de.po 2016-03-22 08:19:55.000000000 +0100
+++ new/five-or-more-3.20.1/po/de.po 2016-07-31 05:45:28.000000000 +0200
@@ -28,7 +28,7 @@
"PO-Revision-Date: 2015-04-04 18:47+0200\n"
"Last-Translator: Bernd Homuth \n"
"Language-Team: Deutsch \n"
-"Language: de_DE\n"
+"Language: de\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/five-or-more-3.20.0/po/dz.po new/five-or-more-3.20.1/po/dz.po
--- old/five-or-more-3.20.0/po/dz.po 2016-03-22 08:19:55.000000000 +0100
+++ new/five-or-more-3.20.1/po/dz.po 2016-07-31 05:45:28.000000000 +0200
@@ -10,6 +10,7 @@
"PO-Revision-Date: 2008-09-17 14:12+0530\n"
"Last-Translator: Dawa pemo \n"
"Language-Team: DZONGKHA \n"
+"Language: dz\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/five-or-more-3.20.0/po/en@shaw.po new/five-or-more-3.20.1/po/en@shaw.po
--- old/five-or-more-3.20.0/po/en@shaw.po 2016-03-22 08:19:55.000000000 +0100
+++ new/five-or-more-3.20.1/po/en@shaw.po 2016-07-31 05:45:28.000000000 +0200
@@ -11,6 +11,7 @@
"PO-Revision-Date: 2010-05-16 16:05 -0400\n"
"Last-Translator: Thomas Thurman \n"
"Language-Team: Shavian \n"
+"Language: en@shaw\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/five-or-more-3.20.0/po/fa.po new/five-or-more-3.20.1/po/fa.po
--- old/five-or-more-3.20.0/po/fa.po 2016-03-22 08:19:55.000000000 +0100
+++ new/five-or-more-3.20.1/po/fa.po 2016-07-31 05:45:28.000000000 +0200
@@ -17,7 +17,7 @@
"PO-Revision-Date: 2013-03-23 11:15+0330\n"
"Last-Translator: Arash Mousavi \n"
"Language-Team: Persian\n"
-"Language: fa_IR\n"
+"Language: fa\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/five-or-more-3.20.0/po/fur.po new/five-or-more-3.20.1/po/fur.po
--- old/five-or-more-3.20.0/po/fur.po 2016-03-22 08:19:55.000000000 +0100
+++ new/five-or-more-3.20.1/po/fur.po 2016-07-31 05:45:28.000000000 +0200
@@ -8,8 +8,8 @@
"Project-Id-Version: five-or-more master\n"
"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=five-"
"or-more&keywords=I18N+L10N&component=general\n"
-"POT-Creation-Date: 2015-10-28 06:24+0000\n"
-"PO-Revision-Date: 2015-10-12 13:25+0200\n"
+"POT-Creation-Date: 2016-04-15 17:38+0000\n"
+"PO-Revision-Date: 2016-04-16 01:22+0200\n"
"Last-Translator: Fabio Tomat \n"
"Language-Team: Friulian \n"
"Language: fur\n"
@@ -62,7 +62,7 @@
#: ../data/five-or-more-preferences.ui.h:3
msgid "_Image:"
-msgstr "_Inmagjin:"
+msgstr "_Imagjin:"
#: ../data/five-or-more-preferences.ui.h:4
msgid "B_ackground color:"
@@ -145,8 +145,7 @@
#: ../data/org.gnome.five-or-more.gschema.xml.h:4
msgid "Ball style. The filename of the images to use for the balls."
-msgstr ""
-"Stîl des balutis. Il non dal file des inmagjinis di doprâ par lis balutis."
+msgstr "Stîl des balutis. Il non dal file des imagjins di doprâ pes balutis."
#: ../data/org.gnome.five-or-more.gschema.xml.h:5
msgid "Background color"
@@ -276,7 +275,7 @@
#: ../src/five-or-more.c:1304
msgid "Are you sure you want to restart the game?"
-msgstr "Sêstu sigûr di tornâ a tacâ la partide?"
+msgstr "Sigûrs di tornâ a tacâ la partide?"
#: ../src/five-or-more.c:1307
msgid "_Cancel"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/five-or-more-3.20.0/po/ga.po new/five-or-more-3.20.1/po/ga.po
--- old/five-or-more-3.20.0/po/ga.po 2016-03-22 08:19:55.000000000 +0100
+++ new/five-or-more-3.20.1/po/ga.po 2016-07-31 05:45:28.000000000 +0200
@@ -14,6 +14,7 @@
"PO-Revision-Date: 2009-08-16 18:23-0600\n"
"Last-Translator: Seán de Búrca \n"
"Language-Team: Irish \n"
+"Language: ga\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/five-or-more-3.20.0/po/gu.po new/five-or-more-3.20.1/po/gu.po
--- old/five-or-more-3.20.0/po/gu.po 2016-03-22 08:19:55.000000000 +0100
+++ new/five-or-more-3.20.1/po/gu.po 2016-07-31 05:45:28.000000000 +0200
@@ -10,6 +10,7 @@
"PO-Revision-Date: 2009-09-16 11:39+0530\n"
"Last-Translator: Sweta Kothari \n"
"Language-Team: Gujarati\n"
+"Language: gu\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/five-or-more-3.20.0/po/hr.po new/five-or-more-3.20.1/po/hr.po
--- old/five-or-more-3.20.0/po/hr.po 2016-03-22 08:19:55.000000000 +0100
+++ new/five-or-more-3.20.1/po/hr.po 2016-07-31 05:45:28.000000000 +0200
@@ -10,6 +10,7 @@
"Last-Translator: Launchpad Translations Administrators \n"
"Language-Team: Croatian \n"
+"Language: hr\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/five-or-more-3.20.0/po/id.po new/five-or-more-3.20.1/po/id.po
--- old/five-or-more-3.20.0/po/id.po 2016-03-22 08:19:55.000000000 +0100
+++ new/five-or-more-3.20.1/po/id.po 2016-07-31 05:45:28.000000000 +0200
@@ -14,7 +14,7 @@
"PO-Revision-Date: 2014-09-05 11:18+0700\n"
"Last-Translator: Andika Triwidada \n"
"Language-Team: Indonesian \n"
-"Language: id_ID\n"
+"Language: id\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/five-or-more-3.20.0/po/is.po new/five-or-more-3.20.1/po/is.po
--- old/five-or-more-3.20.0/po/is.po 2016-03-22 08:19:55.000000000 +0100
+++ new/five-or-more-3.20.1/po/is.po 2016-07-31 05:45:28.000000000 +0200
@@ -13,6 +13,7 @@
"PO-Revision-Date: 2004-05-27 22:28-0000\n"
"Last-Translator: Samuel Jon Gunnarsson \n"
"Language-Team: Icelandic \n"
+"Language: is\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/five-or-more-3.20.0/po/ka.po new/five-or-more-3.20.1/po/ka.po
--- old/five-or-more-3.20.0/po/ka.po 2016-03-22 08:19:55.000000000 +0100
+++ new/five-or-more-3.20.1/po/ka.po 2016-07-31 05:45:28.000000000 +0200
@@ -14,6 +14,7 @@
"PO-Revision-Date: 2006-04-10 12:30+0200\n"
"Last-Translator: Alexander Didebulidze \n"
"Language-Team: Georgian \n"
+"Language: ka\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/five-or-more-3.20.0/po/km.po new/five-or-more-3.20.1/po/km.po
--- old/five-or-more-3.20.0/po/km.po 2016-03-22 08:19:55.000000000 +0100
+++ new/five-or-more-3.20.1/po/km.po 2016-07-31 05:45:28.000000000 +0200
@@ -14,7 +14,7 @@
"PO-Revision-Date: 2012-09-28 14:28+0700\n"
"Last-Translator: sutha \n"
"Language-Team: Khmer \n"
-"Language: \n"
+"Language: km\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/five-or-more-3.20.0/po/kn.po new/five-or-more-3.20.1/po/kn.po
--- old/five-or-more-3.20.0/po/kn.po 2016-03-22 08:19:55.000000000 +0100
+++ new/five-or-more-3.20.1/po/kn.po 2016-07-31 05:45:28.000000000 +0200
@@ -12,6 +12,7 @@
"PO-Revision-Date: 2011-04-02 17:40+0530\n"
"Last-Translator: Shankar Prasad \n"
"Language-Team: Kannada \n"
+"Language: kn\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/five-or-more-3.20.0/po/ko.po new/five-or-more-3.20.1/po/ko.po
--- old/five-or-more-3.20.0/po/ko.po 2016-03-22 08:19:55.000000000 +0100
+++ new/five-or-more-3.20.1/po/ko.po 2016-07-31 05:45:28.000000000 +0200
@@ -29,7 +29,7 @@
"PO-Revision-Date: 2015-03-08 04:03+0900\n"
"Last-Translator: Changwoo Ryu \n"
"Language-Team: GNOME Korea \n"
-"Language: Korean\n"
+"Language: ko\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/five-or-more-3.20.0/po/ku.po new/five-or-more-3.20.1/po/ku.po
--- old/five-or-more-3.20.0/po/ku.po 2016-03-22 08:19:55.000000000 +0100
+++ new/five-or-more-3.20.1/po/ku.po 2016-07-31 05:45:28.000000000 +0200
@@ -11,6 +11,7 @@
"PO-Revision-Date: 2008-01-02 06:03+0100\n"
"Last-Translator: Erdal Ronahi \n"
"Language-Team: Kurdish \n"
+"Language: ku\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/five-or-more-3.20.0/po/mai.po new/five-or-more-3.20.1/po/mai.po
--- old/five-or-more-3.20.0/po/mai.po 2016-03-22 08:19:55.000000000 +0100
+++ new/five-or-more-3.20.1/po/mai.po 2016-07-31 05:45:28.000000000 +0200
@@ -10,6 +10,7 @@
"PO-Revision-Date: 2008-01-25 13:49+0530\n"
"Last-Translator: Sangeeta Kumari\n"
"Language-Team: \n"
+"Language: mai\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/five-or-more-3.20.0/po/mk.po new/five-or-more-3.20.1/po/mk.po
--- old/five-or-more-3.20.0/po/mk.po 2016-03-22 08:19:55.000000000 +0100
+++ new/five-or-more-3.20.1/po/mk.po 2016-07-31 05:45:28.000000000 +0200
@@ -25,6 +25,7 @@
"PO-Revision-Date: 2011-12-28 22:37+0100\n"
"Last-Translator: Jovan N\n"
"Language-Team: Macedonian \n"
+"Language: mk\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/five-or-more-3.20.0/po/mn.po new/five-or-more-3.20.1/po/mn.po
--- old/five-or-more-3.20.0/po/mn.po 2016-03-22 08:19:55.000000000 +0100
+++ new/five-or-more-3.20.1/po/mn.po 2016-07-31 05:45:28.000000000 +0200
@@ -12,6 +12,7 @@
"PO-Revision-Date: 2004-03-10 17:06+0100\n"
"Last-Translator: Sanlig Badral \n"
"Language-Team: Mongolian \n"
+"Language: mn\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/five-or-more-3.20.0/po/mr.po new/five-or-more-3.20.1/po/mr.po
--- old/five-or-more-3.20.0/po/mr.po 2016-03-22 08:19:55.000000000 +0100
+++ new/five-or-more-3.20.1/po/mr.po 2016-07-31 05:45:28.000000000 +0200
@@ -13,6 +13,7 @@
"PO-Revision-Date: 2009-09-11 14:11+0530\n"
"Last-Translator: Sandeep Shedmake \n"
"Language-Team: Marathi \n"
+"Language: mr\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/five-or-more-3.20.0/po/ms.po new/five-or-more-3.20.1/po/ms.po
--- old/five-or-more-3.20.0/po/ms.po 2016-03-22 08:19:55.000000000 +0100
+++ new/five-or-more-3.20.1/po/ms.po 2016-07-31 05:45:28.000000000 +0200
@@ -9,6 +9,7 @@
"PO-Revision-Date: 2003-11-24 01:54+0800\n"
"Last-Translator: Hasbullah Bin Pit \n"
"Language-Team: Projek Gabai \n"
+"Language: ms\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/five-or-more-3.20.0/po/ne.po new/five-or-more-3.20.1/po/ne.po
--- old/five-or-more-3.20.0/po/ne.po 2016-03-22 08:19:55.000000000 +0100
+++ new/five-or-more-3.20.1/po/ne.po 2016-07-31 05:45:28.000000000 +0200
@@ -11,6 +11,7 @@
"PO-Revision-Date: 2008-02-01 12:10+0545\n"
"Last-Translator: Nabin Gautam \n"
"Language-Team: Nepali \n"
+"Language: ne\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/five-or-more-3.20.0/po/nn.po new/five-or-more-3.20.1/po/nn.po
--- old/five-or-more-3.20.0/po/nn.po 2016-03-22 08:19:55.000000000 +0100
+++ new/five-or-more-3.20.1/po/nn.po 2016-07-31 05:45:28.000000000 +0200
@@ -15,6 +15,7 @@
"PO-Revision-Date: 2010-02-24 15:40+0000\n"
"Last-Translator: Torstein Adolf Winterseth \n"
"Language-Team: Norwegian Nynorsk \n"
+"Language: nn\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/five-or-more-3.20.0/po/oc.po new/five-or-more-3.20.1/po/oc.po
--- old/five-or-more-3.20.0/po/oc.po 2016-03-22 08:19:55.000000000 +0100
+++ new/five-or-more-3.20.1/po/oc.po 2016-07-31 05:45:28.000000000 +0200
@@ -10,8 +10,8 @@
"Project-Id-Version: oc\n"
"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=five-"
"or-more&keywords=I18N+L10N&component=general\n"
-"POT-Creation-Date: 2015-01-25 21:28+0000\n"
-"PO-Revision-Date: 2016-02-29 22:11+0100\n"
+"POT-Creation-Date: 2016-05-19 05:37+0000\n"
+"PO-Revision-Date: 2016-05-29 20:34+0200\n"
"Last-Translator: Cédric Valmary (totenoc.eu) \n"
"Language-Team: Tot En Òc\n"
"Language: oc\n"
@@ -19,7 +19,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.8.4\n"
+"X-Generator: Virtaal 0.7.1\n"
"X-Project-Style: gnome\n"
#: ../data/five-or-more.appdata.xml.in.h:1 ../data/five-or-more.desktop.in.h:1
@@ -108,7 +108,6 @@
msgstr "_Jòc novèl"
#: ../data/five-or-more.ui.h:6
-#| msgid "Start a new game"
msgid "Start a new puzzle"
msgstr "Començar un puzzle novèl"
@@ -186,12 +185,10 @@
msgstr ""
#: ../data/org.gnome.five-or-more.gschema.xml.h:15
-#| msgid "The width of the window"
msgid "Width of the window in pixels"
msgstr "Largor de la fenèstra en pixèls"
#: ../data/org.gnome.five-or-more.gschema.xml.h:16
-#| msgid "The width of the window"
msgid "Height of the window in pixels"
msgstr "Nautor de la fenèstra en pixèls"
@@ -200,19 +197,16 @@
msgstr ""
#: ../src/five-or-more.c:80
-#| msgid "Small"
msgctxt "board size"
msgid "Small"
msgstr "Pichon"
#: ../src/five-or-more.c:81
-#| msgid "Medium"
msgctxt "board size"
msgid "Medium"
msgstr "Mejan"
#: ../src/five-or-more.c:82
-#| msgid "Large"
msgctxt "board size"
msgid "Large"
msgstr "Grand"
@@ -244,7 +238,6 @@
msgstr ""
#: ../src/five-or-more.c:468
-#| msgid "Five or More"
msgid "Five or More Scores"
msgstr "Marcas de Cinc o mai"
@@ -272,7 +265,6 @@
"Cédric Valmary (totenoc.eu) "
#: ../src/five-or-more.c:1304
-#| msgid "Are you sure you want to quit?"
msgid "Are you sure you want to restart the game?"
msgstr "Sètz segur que volètz reaviar lo jòc ?"
@@ -286,14 +278,12 @@
#. Score dialog column header for the score time (e.g. 1 minute)
#: ../src/games-scores-dialog.c:132
-#| msgid "Time"
msgctxt "score-dialog"
msgid "Time"
msgstr "Ora"
#. Score dialog column header for the score value (e.g. 30 moves)
#: ../src/games-scores-dialog.c:138
-#| msgid "Score"
msgctxt "score-dialog"
msgid "Score"
msgstr "Marca"
@@ -301,13 +291,11 @@
#. Score format for time based scores. %1$d is the time in minutes, %2$d is the time in seconds
#: ../src/games-scores-dialog.c:225
#, c-format
-#| msgid "%dm %ds"
msgctxt "score-dialog"
msgid "%1$dm %2$ds"
msgstr "%1$dm %2$ds"
#: ../src/games-scores-dialog.c:371
-#| msgid "Quit"
msgid "_Quit"
msgstr "_Quitar"
@@ -339,7 +327,7 @@
#~ msgid ""
#~ "Select whether to drag the cards or to click on the source then the "
#~ "destination."
-#~ msgstr "Causir se volètz rossegar las cartas o clicar la font puèi la tòca."
+#~ msgstr "Causir se volètz retalhar las cartas o clicar la font puèi la tòca."
#~ msgid "Sound"
#~ msgstr "Son"
@@ -348,7 +336,7 @@
#~ msgstr "Estatisticas de las partidas jogadas"
#~ msgid "The game file to use"
-#~ msgstr "Lo fichièr de jòc a utilizar"
+#~ msgstr "Lo fichièr de jòc d'utilizar"
#~ msgid "The name of the file with the graphics for the cards."
#~ msgstr "Lo nom del fichièr que cap los grafismes de las cartas."
@@ -360,10 +348,10 @@
#~ msgstr "Nom del fichièr de tèma"
#~ msgid "Whether or not to show the toolbar"
-#~ msgstr "Indica se cal visualizar o non la barra d'aisinas"
+#~ msgstr "Indica se cal visualizar o pas la barra d'aisinas"
#~ msgid "Whether or not to show the toolbar."
-#~ msgstr "Indica se cal visualizar o non la barra d'aisinas."
+#~ msgstr "Indica se cal visualizar o pas la barra d'aisinas."
#~ msgid "FreeCell Solitaire"
#~ msgstr "Solitari FreeCell"
@@ -378,7 +366,7 @@
#~ msgstr "NOM"
#~ msgid "NUMBER"
-#~ msgstr "NUMERÒ"
+#~ msgstr "NUMÈRO"
#~ msgid "AisleRiot"
#~ msgstr "AisleRiot"
@@ -393,7 +381,7 @@
#~ msgstr "Valor desconeguda"
#~ msgid "ace"
-#~ msgstr "ase"
+#~ msgstr "as"
#~ msgid "black joker"
#~ msgstr "joker negre"
@@ -405,7 +393,7 @@
#~ msgstr "caires"
#~ msgid "eight"
-#~ msgstr "uèch"
+#~ msgstr "uèit"
#~ msgid "five"
#~ msgstr "cinc"
@@ -444,28 +432,28 @@
#~ msgstr "dètz"
#~ msgid "the ace of clubs"
-#~ msgstr "l'ase de flor"
+#~ msgstr "l'as de flor"
#~ msgid "the ace of diamonds"
#~ msgstr "l'as de caire"
#~ msgid "the ace of hearts"
-#~ msgstr "l'ase de còr"
+#~ msgstr "l'as de còr"
#~ msgid "the ace of spades"
-#~ msgstr "l'ase de picas"
+#~ msgstr "l'as de picas"
#~ msgid "the eight of clubs"
-#~ msgstr "l'uèch de flor"
+#~ msgstr "l'uèit de flor"
#~ msgid "the eight of diamonds"
-#~ msgstr "l'uèch de caire"
+#~ msgstr "l'uèit de caire"
#~ msgid "the eight of hearts"
-#~ msgstr "l'uèch de còr"
+#~ msgstr "l'uèit de còr"
#~ msgid "the eight of spades"
-#~ msgstr "l'uèch de picas"
+#~ msgstr "l'uèit de picas"
#~ msgid "the five of clubs"
#~ msgstr "lo cinc de flor"
@@ -642,7 +630,7 @@
#~ msgstr "Anhès"
#~ msgid "Athena"
-#~ msgstr "Atenà"
+#~ msgstr "Atèna"
#~ msgid "Auld Lang Syne"
#~ msgstr "Auld Lang Syne"
@@ -717,7 +705,7 @@
#~ msgstr "_Jòc"
#~ msgid "_View"
-#~ msgstr "_Visualizacion"
+#~ msgstr "_Afichatge"
#~ msgid "_Control"
#~ msgstr "_Contraròtle"
@@ -876,7 +864,7 @@
#~ msgstr "Victòria"
#~ msgid "Lose"
-#~ msgstr "Desfacha"
+#~ msgstr "Desfaita"
#~ msgid "Hit"
#~ msgstr "Tocat"
@@ -885,7 +873,7 @@
#~ msgstr "Doble"
#~ msgid "Split"
-#~ msgstr "Dividir"
+#~ msgstr "Devesir"
#~ msgid "New password"
#~ msgstr "Senhal novèl"
@@ -1035,10 +1023,10 @@
#~ msgstr "Proprietats"
#~ msgid "View"
-#~ msgstr "Visualizacion"
+#~ msgstr "Afichatge"
#~ msgid "Player List"
-#~ msgstr "Tièra de jogaires"
+#~ msgstr "Lista de jogaires"
#~ msgid "Contents"
#~ msgstr "Ensenhador"
@@ -1083,13 +1071,13 @@
#~ msgstr "Seleccionar una poliça"
#~ msgid "%s: option `%s' is ambiguous\n"
-#~ msgstr "%s : l'option '%s' es ambigüa\n"
+#~ msgstr "%s : l'opcion '%s' es ambigüa\n"
#~ msgid "%s: option `--%s' doesn't allow an argument\n"
-#~ msgstr "%s : l'option '--%s' permet pas de paramètre\n"
+#~ msgstr "%s : l'opcion '--%s' permet pas de paramètre\n"
#~ msgid "%s: option `%c%s' doesn't allow an argument\n"
-#~ msgstr "%s : l'option '%c%s' permet pas de paramètre\n"
+#~ msgstr "%s : l'opcion '%c%s' permet pas de paramètre\n"
#~ msgid "%s: option `%s' requires an argument\n"
#~ msgstr "%s : l'opcion '%s' a besonh d'un paramètre\n"
@@ -1110,7 +1098,7 @@
#~ msgstr "%s : l'opcion a besonh d'un paramètre -- %c\n"
#~ msgid "%s: option `-W %s' is ambiguous\n"
-#~ msgstr "%s : l'option '-W %s' es ambigüa\n"
+#~ msgstr "%s : l'opcion '-W %s' es ambigüa\n"
#~ msgid "%s: option `-W %s' doesn't allow an argument\n"
#~ msgstr "%s : l'opcion '-W %s' permet pas de paramètre\n"
@@ -1254,7 +1242,7 @@
#~ msgstr "Desplaçar cap a esquèrra"
#~ msgid "Move right"
-#~ msgstr "Desplaçar cap a drecha"
+#~ msgstr "Desplaçar cap a dreita"
#~ msgid ""
#~ "Unable to load image:\n"
@@ -1497,7 +1485,7 @@
#~ msgstr "Jòc novèl"
#~ msgid "_Tools"
-#~ msgstr "_Espleches"
+#~ msgstr "_Aisinas"
#~ msgid "_Hint"
#~ msgstr "_Astúcia"
@@ -1672,7 +1660,7 @@
#~ msgstr "Iagno"
#~ msgid "_Player list"
-#~ msgstr "Tièra de _jogaires"
+#~ msgstr "Lista de _jogaires"
#~ msgid "Dark:"
#~ msgstr "Negres :"
@@ -1738,7 +1726,7 @@
#~ msgstr "Ecran complet"
#~ msgid "Player _List"
-#~ msgstr "_Tièra de jogaires"
+#~ msgstr "_Lista de jogaires"
#~ msgid "Res_ume"
#~ msgstr "_Contunhar"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/five-or-more-3.20.0/po/or.po new/five-or-more-3.20.1/po/or.po
--- old/five-or-more-3.20.0/po/or.po 2016-03-22 08:19:55.000000000 +0100
+++ new/five-or-more-3.20.1/po/or.po 2016-07-31 05:45:28.000000000 +0200
@@ -13,6 +13,7 @@
"PO-Revision-Date: 2011-03-17 14:18+0530\n"
"Last-Translator: Manoj Kumar Giri \n"
"Language-Team: Oriya \n"
+"Language: or\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/five-or-more-3.20.0/po/rw.po new/five-or-more-3.20.1/po/rw.po
--- old/five-or-more-3.20.0/po/rw.po 2016-03-22 08:19:55.000000000 +0100
+++ new/five-or-more-3.20.1/po/rw.po 2016-07-31 05:45:28.000000000 +0200
@@ -19,6 +19,7 @@
"PO-Revision-Date: 2005-03-28 19:35-0700\n"
"Last-Translator: Steve Murphy \n"
"Language-Team: Kinyarwanda \n"
+"Language: rw\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/five-or-more-3.20.0/po/si.po new/five-or-more-3.20.1/po/si.po
--- old/five-or-more-3.20.0/po/si.po 2016-03-22 08:19:55.000000000 +0100
+++ new/five-or-more-3.20.1/po/si.po 2016-07-31 05:45:28.000000000 +0200
@@ -11,6 +11,7 @@
"PO-Revision-Date: 2007-09-17 12:46+0530\n"
"Last-Translator: Danishka Navin \n"
"Language-Team: Sinhala \n"
+"Language: si\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/five-or-more-3.20.0/po/sl.po new/five-or-more-3.20.1/po/sl.po
--- old/five-or-more-3.20.0/po/sl.po 2016-03-22 08:19:55.000000000 +0100
+++ new/five-or-more-3.20.1/po/sl.po 2016-07-31 05:45:28.000000000 +0200
@@ -16,7 +16,7 @@
"PO-Revision-Date: 2015-03-09 21:05+0100\n"
"Last-Translator: Matej Urbančič \n"
"Language-Team: Slovenian GNOME Translation Team \n"
-"Language: sl_SI\n"
+"Language: sl\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/five-or-more-3.20.0/po/sq.po new/five-or-more-3.20.1/po/sq.po
--- old/five-or-more-3.20.0/po/sq.po 2016-03-22 08:19:55.000000000 +0100
+++ new/five-or-more-3.20.1/po/sq.po 2016-07-31 05:45:28.000000000 +0200
@@ -11,6 +11,7 @@
"PO-Revision-Date: 2006-03-02 21:11+0100\n"
"Last-Translator: Elian Myftiu \n"
"Language-Team: Albanian \n"
+"Language: sq\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/five-or-more-3.20.0/po/sr@latin.po new/five-or-more-3.20.1/po/sr@latin.po
--- old/five-or-more-3.20.0/po/sr@latin.po 2016-03-22 08:19:55.000000000 +0100
+++ new/five-or-more-3.20.1/po/sr@latin.po 2016-07-31 05:45:28.000000000 +0200
@@ -15,7 +15,7 @@
"PO-Revision-Date: 2015-03-03 19:09+0200\n"
"Last-Translator: Miroslav Nikolić \n"
"Language-Team: Serbian \n"
-"Language: sr\n"
+"Language: sr@latin\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/five-or-more-3.20.0/po/tg.po new/five-or-more-3.20.1/po/tg.po
--- old/five-or-more-3.20.0/po/tg.po 2016-03-22 08:19:55.000000000 +0100
+++ new/five-or-more-3.20.1/po/tg.po 2016-07-31 05:45:28.000000000 +0200
@@ -12,7 +12,7 @@
"PO-Revision-Date: 2013-01-19 18:34+0500\n"
"Last-Translator: Victor Ibragimov \n"
"Language-Team: \n"
-"Language: Tajik\n"
+"Language: tg\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/five-or-more-3.20.0/po/ug.po new/five-or-more-3.20.1/po/ug.po
--- old/five-or-more-3.20.0/po/ug.po 2016-03-22 08:19:55.000000000 +0100
+++ new/five-or-more-3.20.1/po/ug.po 2016-07-31 05:45:28.000000000 +0200
@@ -13,7 +13,7 @@
"PO-Revision-Date: 2013-02-02 11:55+0900\n"
"Last-Translator: Gheyret Kenji \n"
"Language-Team: Uyghur Computer Science Association \n"
-"Language: \n"
+"Language: ug\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/five-or-more-3.20.0/po/wa.po new/five-or-more-3.20.1/po/wa.po
--- old/five-or-more-3.20.0/po/wa.po 2016-03-22 08:19:55.000000000 +0100
+++ new/five-or-more-3.20.1/po/wa.po 2016-07-31 05:45:28.000000000 +0200
@@ -17,6 +17,7 @@
"PO-Revision-Date: 2003-08-03 15:17+0200\n"
"Last-Translator: Lorint Hendschel \n"
"Language-Team: Walon \n"
+"Language: wa\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/five-or-more-3.20.0/po/xh.po new/five-or-more-3.20.1/po/xh.po
--- old/five-or-more-3.20.0/po/xh.po 2016-03-22 08:19:55.000000000 +0100
+++ new/five-or-more-3.20.1/po/xh.po 2016-07-31 05:45:28.000000000 +0200
@@ -12,6 +12,7 @@
"PO-Revision-Date: 2005-02-28 16:05+0200\n"
"Last-Translator: Canonical Ltd \n"
"Language-Team: Xhosa \n"
+"Language: xh\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/five-or-more-3.20.0/po/zh_HK.po new/five-or-more-3.20.1/po/zh_HK.po
--- old/five-or-more-3.20.0/po/zh_HK.po 2016-03-22 08:19:55.000000000 +0100
+++ new/five-or-more-3.20.1/po/zh_HK.po 2016-07-31 05:45:28.000000000 +0200
@@ -15,7 +15,7 @@
"PO-Revision-Date: 2014-08-25 14:00+0800\n"
"Last-Translator: Chao-Hsiung Liao \n"
"Language-Team: Chinese (Hong Kong) \n"
-"Language: zh_TW\n"
+"Language: zh_HK\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/five-or-more-3.20.0/src/five-or-more.c new/five-or-more-3.20.1/src/five-or-more.c
--- old/five-or-more-3.20.0/src/five-or-more.c 2016-03-22 08:19:55.000000000 +0100
+++ new/five-or-more-3.20.1/src/five-or-more.c 2016-07-31 06:03:06.000000000 +0200
@@ -287,7 +287,7 @@
cairo_surface_t *preview_surface = NULL;
context = gtk_widget_get_style_context (widget);
- gtk_style_context_get_background_color (context, GTK_STATE_FLAG_NORMAL, &bg);
+ gtk_style_context_get_background_color (context, gtk_style_context_get_state (context), &bg);
/* Like the refresh_pixmaps() function, we may be called before
* the window is ready. */
@@ -1457,25 +1457,12 @@
gtk_dialog_run (GTK_DIALOG (pref_dialog));
}
-static void cleanup ()
-{
- int i = 0;
-
- for (i = 0; i < G_N_ELEMENTS (preview_images); i++)
- if (preview_pixbufs[i])
- g_object_unref (preview_pixbufs[i]);
-
- g_clear_object (&ball_preimage);
- g_object_unref (highscores);
-
-}
-
void
game_quit_callback (GSimpleAction *action,
GVariant *parameter,
gpointer user_data)
{
- cleanup ();
+ g_application_quit (G_APPLICATION (user_data));
}
void
@@ -1547,13 +1534,10 @@
}
static gboolean
-window_configure_event_cb (GtkWidget *widget, GdkEventConfigure *event)
+window_size_allocate_cb (GtkWidget *widget, GdkRectangle *allocation)
{
if (!window_is_maximized && !window_is_fullscreen)
- {
- window_width = event->width;
- window_height = event->height;
- }
+ gtk_window_get_size (GTK_WINDOW (widget), &window_width, &window_height);
return FALSE;
}
@@ -1629,7 +1613,7 @@
app = GTK_WIDGET (gtk_builder_get_object (builder, "glines_window"));
gtk_window_set_icon_name (GTK_WINDOW (app), "five-or-more");
- g_signal_connect (GTK_WINDOW (app), "configure-event", G_CALLBACK (window_configure_event_cb), NULL);
+ g_signal_connect (GTK_WINDOW (app), "size-allocate", G_CALLBACK (window_size_allocate_cb), NULL);
g_signal_connect (GTK_WINDOW (app), "window-state-event", G_CALLBACK (window_state_event_cb), NULL);
gtk_window_set_default_size (GTK_WINDOW (app), g_settings_get_int (settings, "window-width"), g_settings_get_int (settings, "window-height"));
if (g_settings_get_boolean (settings, "window-is-maximized"))
@@ -1692,10 +1676,18 @@
static void
shutdown_cb (GApplication *application)
{
+ int i = 0;
+
+ for (i = 0; i < G_N_ELEMENTS (preview_images); i++)
+ if (preview_pixbufs[i])
+ g_object_unref (preview_pixbufs[i]);
+
+ g_clear_object (&ball_preimage);
+ g_object_unref (highscores);
+
g_settings_set_int (settings, "window-width", window_width);
g_settings_set_int (settings, "window-height", window_height);
g_settings_set_boolean (settings, "window-is-maximized", window_is_maximized);
- cleanup ();
}
int